!3022 添加功能

Merge pull request !3022 from 李鹏宇/dev_zhou

yuthon_salary/views/inherit_hr_payslip_views.xml

@@ -340,11 +340,11 @@
                     <button name="action_salary_payslip_wizard" string="导入累计专项" type="object" class="oe_highlight"/>
                 </header>
                 <field name="employee_id" string="姓名" options="{'no_open': True}"/>
-                <field name="tax_payable" decoration-danger="1" decoration-bf="1"/>
                 <field name="struct_id" string="职级"/>
                 <field name="post_salary" optional="show"/>
                 <field name="card_type" optional="show"/>
                 <field name="identification_id" optional="show"/>
+                <field name="tax_payable" decoration-danger="1" decoration-bf="1"/>
                 <field name="total_before_tax" string="本期收入" optional="show"/>
                 <field name="basic_endowment_insurance" optional="show"/>
                 <field name="basic_medical_insurance" optional="show"/>

yuthon_sps_approval/models/inherit_product_template.py

@@ -9,4 +9,4 @@ class ProductTemplate(models.Model):
         template_ids = self.env["product.template"].browse(self._context.get('active_ids', self._context.get('active_id')))
         company_id = self.env['res.company'].search([('name', '=', '集团本部')])
         for template in template_ids:
-            template.company_id = company_id.id
+            template.write({'company_id': company_id.id})