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

Merge branch 'feature/隐藏返工入口' into feature/界面优化

Browse Source
This commit is contained in:
yuxianghui
2024-12-04 15:39:05 +08:00
parent 7f3e6de127 6366904c91
commit 8f3cd9ff36
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sf_manufacturing/models/stock.py
View File

@@ -965,7 +965,7 @@ class ReStockMove(models.Model):
合并制造订单的完成move单据
"""
res = super(ReStockMove, self)._merge_moves_fields()
if self[0].origin and self.picking_type_id.name in ['生产发料', '内部调拨', '生产入库']:
if self[0].origin and self.picking_type_id.name in ['生产发料', '内部调拨', '生产入库', '客供料入库']:
production = self.env['mrp.production'].search([('name', '=', self[0].origin)], limit=1, order='id asc')
productions = self.env['mrp.production'].search(
[('origin', '=', production.origin), ('product_id', '=', production.product_id.id)])

2
sf_plan/views/view.xml
View File

@@ -257,7 +257,7 @@
<record id="sf_production_plan_action" model="ir.actions.act_window">
<field name="name">制造订单生产计划</field>
<field name="name">CNC产线计划排程</field>
<field name="type">ir.actions.act_window</field>
<field name="res_model">sf.production.plan</field>
<field name="view_mode">gantt,tree,form</field>

8
sf_sale/views/quick_easy_order_view.xml
View File

@@ -128,9 +128,9 @@
<!-- action="account.res_partner_action_customer"-->
<!-- groups="sales_team.group_sale_salesman"-->
<!-- sequence="40"/>-->
<menuitem sequence="21" name="快速订单" id="menu_quick_easy_order"
action="action_quick_easy_order"
parent="sale.sale_order_menu"
groups="sales_team.group_sale_salesman,sf_base.group_sale_salemanager,sf_base.group_sale_director"/>
<!-- <menuitem sequence="21" name="快速订单" id="menu_quick_easy_order"-->
<!-- action="action_quick_easy_order"-->
<!-- parent="sale.sale_order_menu"-->
<!-- groups="sales_team.group_sale_salesman,sf_base.group_sale_salemanager,sf_base.group_sale_director"/>-->
</data>
</odoo>