解决冲突

This commit is contained in:
胡尧
2025-05-23 09:42:52 +08:00
21 changed files with 189 additions and 26 deletions

View File

@@ -8,19 +8,21 @@
'category': 'purchase',
'depends': ['sf_manufacturing', 'purchase_request'],
'data': [
'security/ir.model.access.csv',
'views/sale_order_view.xml',
'views/mrp_production.xml',
'views/purchase_request_view.xml',
'wizard/purchase_request_line_make_purchase_order_view.xml',
'views/purchase_request_line_view.xml',
'views/stock_picking_views.xml',
'views/stock_picking_views.xml'
'wizard/purchase_request_wizard_views.xml',
'views/purchase_request_menu_views.xml',
],
'assets': {
'web.assets_backend': [
'jikimo_purchase_request/static/src/**/*'
],
},
'web.assets_backend': [
'jikimo_purchase_request/static/src/**/*'
],
},
'application': True,
'installable': True,
'auto_install': False,