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

# Conflicts:
#	quality_control/security/ir.model.access.csv
#	quality_control/wizard/quality_check_wizard.py
#	sf_quality/__manifest__.py
#	sf_quality/models/__init__.py
#	sf_quality/models/stock.py

quality_control/wizard/quality_check_wizard.py

@@ -62,7 +62,8 @@ class QualityCheckWizard(models.TransientModel):
 
     def do_pass(self):
         if self.test_type == 'picture' and not self.picture:
-            raise UserError('You must provide a picture before validating')
+            raise UserError('请先上传照片')
+            # raise UserError('You must provide a picture before validating')
         self.current_check_id.do_pass()
         return self.action_generate_next_window()
 
@@ -116,3 +117,18 @@ class QualityCheckWizard(models.TransientModel):
     # 对于成品出库的出厂检验报告，增加发布按钮
     def publish(self): 
         self.current_check_id._do_publish_implementation()
+
+
+class PickingCheckCancelWizard(models.TransientModel):
+    _name = 'picking.check.cancel.wizard'
+    _description = 'picking check cancel wizard'
+
+    picking_id = fields.Many2one('stock.picking', 'stock picking')
+
+    def confirm_picking_check(self):
+        res = self.picking_id.action_cancel()
+        return res
+
+    def cancel_picking_check(self):
+        # 这里是取消后的逻辑
+        return {'type': 'ir.actions.act_window_close'}

quality_control/wizard/quality_check_wizard_views.xml

@@ -121,4 +121,21 @@
         <field name="context">{}</field>
         <field name="target">new</field>
     </record>
+
+
+    <!--  ==================================================================================================  -->
+    <record id="picking_check_cancel_wizard_form" model="ir.ui.view">
+        <field name="name">picking.check.cancel.wizard</field>
+        <field name="model">picking.check.cancel.wizard</field>
+        <field name="arch" type="xml">
+            <form string="Quality Check Failed">
+                <div>质量检查单已完成，继续取消吗？</div>
+                <div class="'color': 'red'">注意：关联质量检查单也将被取消。</div>
+                <footer>
+                    <button name="confirm_picking_check" type="object" class="btn-primary" string="确认"/>
+                    <button name="cancel_picking_check" type="object" string="取消"/>
+                </footer>
+            </form>
+        </field>
+    </record>
 </odoo>