jikimo/jikimo_sf
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/页面优化

Browse Source 
# Conflicts:
#	sf_manufacturing/models/stock.py
This commit is contained in:
jinling.yang
2023-09-14 09:46:28 +08:00
parent ad0603f921 4613dc791b
commit eb0d83aa3a
19 changed files with 410 additions and 208 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sf_sale/__manifest__.py
View File

@@ -10,7 +10,7 @@
""",
'category': 'sf',
'website': 'https://www.sf.jikimo.com',
'depends': ['sale_management', 'web_widget_model_viewer',],
'depends': ['sale_management', 'web_widget_model_viewer', 'sale_stock'],
'data': [
'security/group_security.xml',
'security/ir.model.access.csv',

2
sf_sale/views/sale_order_view.xml
View File

@@ -4,7 +4,7 @@
<record id="view_order_tree_inherit_sf" model="ir.ui.view">
<field name="name">sale.order.tree</field>
<field name="model">sale.order</field>
<field name="inherit_id" ref="sale.view_order_tree"/>
<field name="inherit_id" ref="sale_stock.view_order_tree"/>
<field name="arch" type="xml">
<xpath expr="//field[@name='name']" position="after">
<!-- <attribute name="string">订单号</attribute>-->