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

Accept Merge Request #761: (feature/制造代码优化 -> develop)

Browse Source 
Merge Request: 修复批量排程缺少工具包的问题，修改标签翻译

Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/761?initial=true
This commit is contained in:
马广威
2024-01-09 14:52:17 +08:00
committed by Coding
parent 00541c1c8f f5805ce6ae
commit e11976bb61
2 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
sf_manufacturing/models/mrp_production.py
View File

@@ -6,6 +6,7 @@ import requests
from odoo import api, fields, models, _ from odoo import api, fields, models, _
from odoo.exceptions import UserError from odoo.exceptions import UserError
from odoo.addons.sf_base.commons.common import Common from odoo.addons.sf_base.commons.common import Common
from odoo.tools import float_compare, float_round, float_is_zero, format_datetime
from odoo.tools import float_compare, float_is_zero from odoo.tools import float_compare, float_is_zero

11
sf_plan_management/i18n/zh_CN.po
View File

@@ -39704,7 +39704,7 @@ msgstr "付款中"
#: model_terms:ir.ui.view,arch_db:quality.quality_alert_view_search #: model_terms:ir.ui.view,arch_db:quality.quality_alert_view_search
#: model_terms:ir.ui.view,arch_db:quality_control.quality_check_view_search #: model_terms:ir.ui.view,arch_db:quality_control.quality_check_view_search
msgid "In Progress" msgid "In Progress"
msgstr "待排程" msgstr "进行中"
#. module: stock #. module: stock
#: model:ir.model.fields,field_description:stock.field_stock_warehouse__in_type_id #: model:ir.model.fields,field_description:stock.field_stock_warehouse__in_type_id
@@ -55392,7 +55392,7 @@ msgstr "覆盖作者EMail"
#: model_terms:ir.ui.view,arch_db:mrp.mrp_bom_form_view #: model_terms:ir.ui.view,arch_db:mrp.mrp_bom_form_view
#: model_terms:ir.ui.view,arch_db:stock.view_stock_rules_report #: model_terms:ir.ui.view,arch_db:stock.view_stock_rules_report
msgid "Overview" msgid "Overview"
msgstr "概述" msgstr "驾驶舱"
#. module: base #. module: base
#: model:ir.model.fields,field_description:base.field_base_language_import__overwrite #: model:ir.model.fields,field_description:base.field_base_language_import__overwrite
@@ -114487,6 +114487,11 @@ msgstr ""
msgid "径跳精度(mm)" msgid "径跳精度(mm)"
msgstr "" msgstr ""
#. module: sf_manufacturing
#: model:ir.model.fields.selection,name:sf_manufacturing.selection__mrp_production__state__progress
msgid "待排程"
msgstr "待排程"
#. module: sf_base #. module: sf_base
#: model:ir.model.fields,field_description:sf_base.field_sf_cutting_tool_model__jump_accuracy #: model:ir.model.fields,field_description:sf_base.field_sf_cutting_tool_model__jump_accuracy
msgid "径跳精度(um)" msgid "径跳精度(um)"
@@ -116186,7 +116191,7 @@ msgstr ""
#: model:ir.actions.act_window,name:sf_manufacturing.mrp_workcenter_kanban_action1 #: model:ir.actions.act_window,name:sf_manufacturing.mrp_workcenter_kanban_action1
#: model:ir.ui.menu,name:sf_manufacturing.menu_mrp_dashboard #: model:ir.ui.menu,name:sf_manufacturing.menu_mrp_dashboard
msgid "生产线驾驶舱" msgid "生产线驾驶舱"
msgstr "" msgstr "生产线驾驶舱"
#. module: sf_warehouse #. module: sf_warehouse
#: model_terms:ir.ui.view,arch_db:sf_warehouse.view_location_form_sf_inherit #: model_terms:ir.ui.view,arch_db:sf_warehouse.view_location_form_sf_inherit