Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修复报废

2024-08-27 08:53:29 +08:00
parent e662490cb5 6d4d393b9b
commit 9b957848c2
18 changed files with 169 additions and 36 deletions
--- a/sf_sale/views/sale_order_view.xml
+++ b/sf_sale/views/sale_order_view.xml
@@ -50,6 +50,7 @@
                        ('check_status', '!=', 'approved'),('state', 'in', ['draft','cancel']),'&amp;','&amp;',('check_status',
                        '=', 'approved'),('state', 'in', ['sale','cancel']),('delivery_status', '!=', False)]}
                    </attribute>
+                    <attribute name="string">拒绝接单</attribute>
                </xpath>
                <xpath expr="//form/header/button[@name='action_draft']" position="attributes">
                    <attribute name="invisible">1</attribute>