Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化制造功能

sf_hr/__init__.py

@@ -0,0 +1,3 @@
+# -*- coding: utf-8 -*-
+
+from . import models

sf_hr/__manifest__.py

@@ -0,0 +1,22 @@
+# -*- coding: utf-8 -*-
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+{
+    'name': '机企猫智能工厂 员工管理',
+    'version': '1.0',
+    'summary': '智能工厂员工模块',
+    'sequence': 1,
+    'category': 'sf',
+    'website': 'https://www.sf.jikimo.com',
+    'depends': ['hr'],
+    'data': [
+        'views/hr_employee.xml',
+    ],
+    'demo': [
+    ],
+    'qweb': [
+    ],
+    'license': 'LGPL-3',
+    'installable': True,
+    'application': False,
+    'auto_install': False,
+}

sf_hr/models/__init__.py

@@ -0,0 +1,2 @@
+# -*- coding: utf-8 -*-
+

sf_hr/views/hr_employee.xml

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<odoo>
+    <data>
+        <record id="view_form_employee_extend" model="ir.ui.view">
+            <field name="name">employee_form</field>
+            <field name="model">hr.employee</field>
+            <field name="inherit_id" ref="hr.view_employee_form"/>
+            <field name="arch" type="xml">
+                <xpath expr="//group//field[@name='work_email']" position="attributes">
+                   <attribute name="required">1</attribute>
+                </xpath>
+            </field>
+        </record>
+    </data>
+</odoo>

sf_manufacturing/models/mrp_production.py

@@ -128,7 +128,7 @@ class MrpProduction(models.Model):
         for item in self:
             item.manual_quotation = item.product_id.manual_quotation
 
-    manual_quotation = fields.Boolean('人工编程', default=False, compute=_compute_manual_quotation)
+    manual_quotation = fields.Boolean('人工编程', default=False, compute=_compute_manual_quotation, store=True)
     is_scrap = fields.Boolean('是否报废', default=False)
     is_remanufacture = fields.Boolean('是否重新制造', default=False)
 

sf_manufacturing/models/mrp_workorder.py

@@ -65,7 +65,7 @@ class ResMrpWorkOrder(models.Model):
         for item in self:
             item.manual_quotation = item.production_id.manual_quotation
 
-    manual_quotation = fields.Boolean('人工编程', default=False, compute=_compute_manual_quotation)
+    manual_quotation = fields.Boolean('人工编程', default=False, compute=_compute_manual_quotation, store=True)
 
     def _compute_working_users(self):
         super()._compute_working_users()

sf_sale/views/sale_order_view.xml

@@ -130,6 +130,9 @@
                 <field name="signature" position="attributes">
                     <attribute name="attrs">{'readonly': [('state', 'in', ['cancel','sale'])]}</attribute>
                 </field>
+                <xpath expr="//button[@name='action_cancel']" position="attributes">
+                    <attribute name="string">拒绝接单</attribute>
+                </xpath>
             </field>
         </record>