diff --git a/sf_base/__manifest__.py b/sf_base/__manifest__.py
index 4a493cd2..77165cde 100644
--- a/sf_base/__manifest__.py
+++ b/sf_base/__manifest__.py
@@ -10,7 +10,7 @@
""",
'category': 'YZ',
'website': 'https://www.sf.jikimo.com',
- 'depends': ['account', 'base', 'mrp', 'sf_bpm_api'],
+ 'depends': ['account', 'base', 'mrp'],
'data': [
'security/group_security.xml',
'security/ir.model.access.csv',
diff --git a/sf_base/views/menu_view.xml b/sf_base/views/menu_view.xml
index 0b9f6ec0..29dcfa59 100644
--- a/sf_base/views/menu_view.xml
+++ b/sf_base/views/menu_view.xml
@@ -133,13 +133,13 @@
sequence="1"
action="action_mrs_machine_control_system"/>
-
+
+
+
+
+
+
+
diff --git a/sf_base/views/mrs_common_view.xml b/sf_base/views/mrs_common_view.xml
index 331b890f..b05cd135 100644
--- a/sf_base/views/mrs_common_view.xml
+++ b/sf_base/views/mrs_common_view.xml
@@ -313,38 +313,37 @@
-
- 合作伙伴
- ir.actions.act_window
- [('sf_token', '!=', False),('sf_secret_key', '!=', False)]
- res.partner
- tree,form
-
-
- 加工工厂！
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-
- view_partner_form
- res.partner
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
+
+
\ No newline at end of file
diff --git a/sf_bpm_api/__manifest__.py b/sf_bpm_api/__manifest__.py
index 73b2410f..b659bd14 100644
--- a/sf_bpm_api/__manifest__.py
+++ b/sf_bpm_api/__manifest__.py
@@ -10,12 +10,11 @@
""",
'category': 'sf',
'website': 'https://www.sf.cs.jikimo.com',
- 'depends': ['sale', 'product'],
+ 'depends': ['sale', 'sf_base'],
'data': [
'data/product_data.xml',
'views/product_template_view.xml',
- 'views/sale_order_view.xml',
-
+ 'views/sale_order_view.xml'
],
'demo': [
],
diff --git a/sf_bpm_api/data/product_data.xml b/sf_bpm_api/data/product_data.xml
index b76cc00c..53fb6216 100644
--- a/sf_bpm_api/data/product_data.xml
+++ b/sf_bpm_api/data/product_data.xml
@@ -2,7 +2,7 @@
- CNC加工產品模板
+ CNC加工产品模板
delivery
product
diff --git a/sf_bpm_api/models/product_template.py b/sf_bpm_api/models/product_template.py
index 0cf42bac..e602b97e 100644
--- a/sf_bpm_api/models/product_template.py
+++ b/sf_bpm_api/models/product_template.py
@@ -23,7 +23,7 @@ class ResProductTemplate(models.Model):
'model_height': item['model_height'],
'model_volume': item['model_volume'],
'list_price': item['price'],
- 'materials_id': self.env['mrs.production.materials'].sudo().search(
+ 'materials_id': self.env['mrs.production.materials'].search(
[('materials_no', '=', item['texture_code'])]).id,
'default_code': '%s-%s' % (order_number, i),
'barcode': item['barcode'],
diff --git a/sf_bpm_api/models/sale_order.py b/sf_bpm_api/models/sale_order.py
index 6f0cdb6f..dd2b2ac1 100644
--- a/sf_bpm_api/models/sale_order.py
+++ b/sf_bpm_api/models/sale_order.py
@@ -8,8 +8,6 @@ class ReSaleOrder(models.Model):
deadline_of_delivery = fields.Date('交货截止日期')
- # product_line_ids = fields.One2many('product.template', 'sale_order_id')
-
# 业务平台分配工厂后在智能工厂先创建销售订单
def sale_order_create(self, deadline_of_delivery, company_id):
now_time = datetime.datetime.now()
@@ -29,8 +27,7 @@ class ReSaleOrder(models.Model):
vals = {
'order_id': self.id,
'product_id': product.id,
- 'name': '%s/%s/%s/%s/%s' % (
- item['model_long'], item['model_width'], item['model_height'], item['model_volume'], product.materials_id.name),
+ 'name': '%s/%s/%s/%s/%s' % (item['model_long'], item['model_width'], item['model_height'], item['model_volume'], product.materials_id.name),
'price_unit': item['price'],
'product_uom_qty': item['number']
}
diff --git a/sf_bpm_api/views/product_template_view.xml b/sf_bpm_api/views/product_template_view.xml
index 92620d4e..d68f2039 100644
--- a/sf_bpm_api/views/product_template_view.xml
+++ b/sf_bpm_api/views/product_template_view.xml
@@ -17,7 +17,7 @@
-
+