Accept Merge Request #1701: (feature/制造功能优化 -> develop)

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

Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1701?initial=true

jikimo_purchase_tier_validation/__manifest__.py

@@ -20,7 +20,7 @@
     'version': '0.1',
 
     # any module necessary for this one to work correctly
-    'depends': ['purchase', 'base_tier_validation', 'documents', 'purchase_request', 'account'],
+    'depends': ['purchase', 'base_tier_validation', 'documents', 'purchase_request', 'account', 'purchase_order_approved'],
 
     # always loaded
     'data': [

jikimo_purchase_tier_validation/models/models.py

@@ -23,6 +23,10 @@ class jikimo_purchase_tier_validation(models.Model):
         for record in self:
             if record.need_validation and record.validation_status != 'validated':
                 raise ValidationError(_('此操作需要至少对一条记录进行审批。\n请发起审批申请。'))
+            if record.state in ['to approve']:
+                raise ValidationError(_('请先完成审批。'))
+            if record.state == 'approved':
+                record.state = 'purchase'
         return super().button_confirm()
 
     # def button_confirm(self):

jikimo_purchase_tier_validation/views/views.xml

@@ -1,11 +1,23 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <odoo>
     <data>
+        <record model="ir.ui.view" id="tier_validation_view_approved_purchase_order_form_inherit">
+            <field name="name">tier_validation_view_approved_purchase_order_form_inherit</field>
+            <field name="model">purchase.order</field>
+            <field name="inherit_id" ref="purchase_order_approved.purchase_order_form"/>
+            <field name="arch" type="xml">
+                <xpath expr="//button[@name='button_release']" position="replace">
+                </xpath>
+            </field>
+        </record>
+
         <record model="ir.ui.view" id="tier_validation_view_purchase_order_form_inherit">
             <field name="name">tier_validation_view_purchase_order_form_inherit</field>
             <field name="model">purchase.order</field>
             <field name="inherit_id" ref="purchase.purchase_order_form"/>
             <field name="arch" type="xml">
+                <xpath expr="//header/button[@name='button_approve']" position="replace">
+                </xpath>
                 <xpath expr="//header/button[@name='button_cancel']" position="replace">
                 </xpath>
                 <xpath expr="//header/field[@name='state']" position="replace">