diff --git a/odoo.conf b/odoo.conf index 51d61064..3e914f52 100644 --- a/odoo.conf +++ b/odoo.conf @@ -4,7 +4,7 @@ csv_internal_sep = , data_dir = /var/lib/odoo db_host = 172.17.0.2 db_maxconn = 64 -db_name = sf_cs_dev937 +db_name = sf_cs937 db_password = sf db_port = 5432 db_sslmode = prefer diff --git a/sf_sale/models/auto_quatotion_common.py b/sf_sale/models/auto_quatotion_common.py index 2d34a76e..4631fdee 100644 --- a/sf_sale/models/auto_quatotion_common.py +++ b/sf_sale/models/auto_quatotion_common.py @@ -2,7 +2,7 @@ import logging from odoo.modules import get_resource_path from odoo import fields, models, api -#from quatotion import readSql, feature_recognize, auto_quatotion +from quatotion import readSql, feature_recognize, auto_quatotion __author__ = 'jinling.yang' _logger = logging.getLogger(__name__) diff --git a/sf_warehouse/models/model.py b/sf_warehouse/models/model.py index 65bdc0ea..aa11a0a3 100644 --- a/sf_warehouse/models/model.py +++ b/sf_warehouse/models/model.py @@ -235,7 +235,7 @@ class SfProcurementGroup(models.Model): if warehouse_routes: res_list = Rule.search(expression.AND([[('route_id', 'in', warehouse_routes.ids)], domain]), order='route_sequence, sequence') for res1 in res_list: - if product_id.categ_id in res1.location_dest_id.product_type: + if product_id.categ_id in res1.location_dest_id.product_type or product_id.categ_id in res1.location_src_id.product_type: res = res1 if not res: res = Rule.search(expression.AND([[('route_id', 'in', warehouse_routes.ids)], domain]), order='route_sequence, sequence', limit=1)