Skip to content

H
hh_ccs
提交 0c229c5e authored 作者: 贺阳's avatar 贺阳
浏览文件
操作

转单号重复的提示和翻译优化

上级 c093c4a1
显示空白字符变更
内嵌 并排
正在显示 包含 59 行增加 和 43 行删除
ccs_base/i18n/zh_CN.po
浏览文件 @ 0c229c5e
...@@ -6,14 +6,16 @@ msgid "" ...@@ -6,14 +6,16 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: Odoo Server 16.0\n" "Project-Id-Version: Odoo Server 16.0\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2025-07-14 08:55+0000\n" "POT-Creation-Date: 2025-07-15 02:39+0000\n"
"PO-Revision-Date: 2025-07-14 08:55+0000\n" "PO-Revision-Date: 2025-07-15 10:45+0800\n"
"Last-Translator: \n" "Last-Translator: \n"
"Language-Team: \n" "Language-Team: \n"
"Language: zh_CN\n"
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: \n" "Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: \n" "Plural-Forms: nplurals=1; plural=0;\n"
"X-Generator: Poedit 3.5\n"
#. module: ccs_base #. module: ccs_base
#. odoo-python #. odoo-python
...@@ -65,23 +67,29 @@ msgid "" ...@@ -65,23 +67,29 @@ msgid ""
" <br>\n" " <br>\n"
" <!-- 检查 big_package_ids 是否有值 -->\n" " <!-- 检查 big_package_ids 是否有值 -->\n"
" <t t-if=\"object.big_package_ids\">\n" " <t t-if=\"object.big_package_ids\">\n"
" <t t-foreach=\"object.big_package_ids\" t-as=\"big_package_id\">\n" " <t t-foreach=\"object.big_package_ids\" t-"
"as=\"big_package_id\">\n"
" <div>Package:\n" " <div>Package:\n"
" <t t-esc=\"big_package_id.big_package_no or ''\"></t>\n" " <t t-esc=\"big_package_id.big_package_no or "
"''\"></t>\n"
" </div>\n" " </div>\n"
" </t>\n" " </t>\n"
" </t>\n" " </t>\n"
" <!-- 检查 ship_package_ids 是否有值 -->\n" " <!-- 检查 ship_package_ids 是否有值 -->\n"
" <t t-if=\"object.ship_package_ids\">\n" " <t t-if=\"object.ship_package_ids\">\n"
" <t t-foreach=\"object.ship_package_ids\" t-as=\"ship_package_id\">\n" " <t t-foreach=\"object.ship_package_ids\" t-"
"as=\"ship_package_id\">\n"
" <div>Package:\n" " <div>Package:\n"
" <t t-esc=\"ship_package_id.logistic_order_no or ''\"></t>\n" " <t t-esc=\"ship_package_id."
"logistic_order_no or ''\"></t>\n"
" </div>\n" " </div>\n"
" </t>\n" " </t>\n"
" </t>\n" " </t>\n"
" <div>Please know that there is an exception and the cause of the exception is\n" " <div>Please know that there is an exception and the "
"cause of the exception is\n"
" <t t-if=\"object.exception_ids\">\n" " <t t-if=\"object.exception_ids\">\n"
" <t t-esc=\"'/'.join([ex.reason for ex in object.exception_ids])\"></t>\n" " <t t-esc=\"'/'.join([ex.reason for ex in object."
"exception_ids])\"></t>\n"
" </t>\n" " </t>\n"
" <t t-if=\"not object.exception_ids\">\n" " <t t-if=\"not object.exception_ids\">\n"
" No Exception\n" " No Exception\n"
...@@ -102,23 +110,28 @@ msgid "" ...@@ -102,23 +110,28 @@ msgid ""
" <br>\n" " <br>\n"
" <!-- 检查 big_package_ids 是否有值 -->\n" " <!-- 检查 big_package_ids 是否有值 -->\n"
" <t t-if=\"object.big_package_ids\">\n" " <t t-if=\"object.big_package_ids\">\n"
" <t t-foreach=\"object.big_package_ids\" t-as=\"big_package_id\">\n" " <t t-foreach=\"object.big_package_ids\" t-"
"as=\"big_package_id\">\n"
" <div>包裹:\n" " <div>包裹:\n"
" <t t-esc=\"big_package_id.big_package_no or ''\"></t>\n" " <t t-esc=\"big_package_id.big_package_no or "
"''\"></t>\n"
" </div>\n" " </div>\n"
" </t>\n" " </t>\n"
" </t>\n" " </t>\n"
" <!-- 检查 ship_package_ids 是否有值 -->\n" " <!-- 检查 ship_package_ids 是否有值 -->\n"
" <t t-if=\"object.ship_package_ids\">\n" " <t t-if=\"object.ship_package_ids\">\n"
" <t t-foreach=\"object.ship_package_ids\" t-as=\"ship_package_id\">\n" " <t t-foreach=\"object.ship_package_ids\" t-"
"as=\"ship_package_id\">\n"
" <div>包裹:\n" " <div>包裹:\n"
" <t t-esc=\"ship_package_id.logistic_order_no or ''\"></t>\n" " <t t-esc=\"ship_package_id."
"logistic_order_no or ''\"></t>\n"
" </div>\n" " </div>\n"
" </t>\n" " </t>\n"
" </t>\n" " </t>\n"
" <div>出现异常，异常原因：\n" " <div>出现异常，异常原因：\n"
" <t t-if=\"object.exception_ids\">\n" " <t t-if=\"object.exception_ids\">\n"
" <t t-esc=\"'/'.join([ex.reason for ex in object.exception_ids])\"></t>，请知晓。\n" " <t t-esc=\"'/'.join([ex.reason for ex in object."
"exception_ids])\"></t>，请知晓。\n"
" </t>\n" " </t>\n"
" <t t-if=\"not object.exception_ids\">\n" " <t t-if=\"not object.exception_ids\">\n"
" 无异常，请知晓。\n" " 无异常，请知晓。\n"
...@@ -134,11 +147,13 @@ msgstr "" ...@@ -134,11 +147,13 @@ msgstr ""
#: model_terms:ir.ui.view,arch_db:ccs_base.view_batch_update_transfer_bl_no_wizard #: model_terms:ir.ui.view,arch_db:ccs_base.view_batch_update_transfer_bl_no_wizard
msgid "" msgid ""
"<span class=\"label label-warning\">\n" "<span class=\"label label-warning\">\n"
" If there is abnormal data, please download the error file, fix the data as prompted, and re-import!\n" " If there is abnormal data, please download "
"the error file, fix the data as prompted, and re-import!\n"
" </span>" " </span>"
msgstr "" msgstr ""
"<span class=\"label label-warning\">\n" "<span class=\"label label-warning\">\n"
" 如果数据异常，请下载错误文件，按提示修正数据，然后重新导入！\n" " 如果数据异常，请下载错误文件，按提示修正数"
"据，然后重新导入！\n"
" </span>" " </span>"
#. module: ccs_base #. module: ccs_base
...@@ -173,10 +188,13 @@ msgstr "<span class=\"o_stat_text\">已理货大包</span>" ...@@ -173,10 +188,13 @@ msgstr "<span class=\"o_stat_text\">已理货大包</span>"
#. module: ccs_base #. module: ccs_base
#: model_terms:ir.ui.view,arch_db:ccs_base.view_batch_update_transfer_bl_no_wizard #: model_terms:ir.ui.view,arch_db:ccs_base.view_batch_update_transfer_bl_no_wizard
msgid "" msgid ""
"<span style=\"color:red;font-size:15px;\">Tip: Please fill in the information strictly according to the template, otherwise the system will not recognize it.\n" "<span style=\"color:red;font-size:15px;\">Tip: Please fill in the "
"information strictly according to the template, otherwise the system will "
"not recognize it.\n"
" </span>" " </span>"
msgstr "" msgstr ""
"<span style=\"color:red;font-size:15px;\">提示:请务必按照模板填写信息，否则系统无法识别。\n" "<span style=\"color:red;font-size:15px;\">提示:请务必按照模板填写信息，否则"
"系统无法识别。\n"
" </span>" " </span>"
#. module: ccs_base #. module: ccs_base
...@@ -401,7 +419,6 @@ msgstr "添加异常信息" ...@@ -401,7 +419,6 @@ msgstr "添加异常信息"
#. module: ccs_base #. module: ccs_base
#. odoo-python #. odoo-python
#: code:addons/ccs_base/models/cc_bill_loading.py:0 #: code:addons/ccs_base/models/cc_bill_loading.py:0
#: code:addons/ccs_base/models/cc_bill_loading.py:0
#: model_terms:ir.ui.view,arch_db:ccs_base.form_cc_big_package_view #: model_terms:ir.ui.view,arch_db:ccs_base.form_cc_big_package_view
#: model_terms:ir.ui.view,arch_db:ccs_base.form_cc_ship_package_view #: model_terms:ir.ui.view,arch_db:ccs_base.form_cc_ship_package_view
#, python-format #, python-format
...@@ -472,7 +489,6 @@ msgstr "提单列表" ...@@ -472,7 +489,6 @@ msgstr "提单列表"
#. module: ccs_base #. module: ccs_base
#. odoo-python #. odoo-python
#: code:addons/ccs_base/wizard/batch_update_transfer_bl_no_wizard.py:0 #: code:addons/ccs_base/wizard/batch_update_transfer_bl_no_wizard.py:0
#: code:addons/ccs_base/wizard/batch_update_transfer_bl_no_wizard.py:0
#: model:ir.model.fields,field_description:ccs_base.field_cc_bl__bl_no #: model:ir.model.fields,field_description:ccs_base.field_cc_bl__bl_no
#: model:ir.model.fields.selection,name:ccs_base.selection__export_bl_big_package_xlsx_wizard__file_name_type__bl_no #: model:ir.model.fields.selection,name:ccs_base.selection__export_bl_big_package_xlsx_wizard__file_name_type__bl_no
#, python-format #, python-format
...@@ -891,7 +907,6 @@ msgstr "已理货" ...@@ -891,7 +907,6 @@ msgstr "已理货"
#. module: ccs_base #. module: ccs_base
#. odoo-python #. odoo-python
#: code:addons/ccs_base/wizard/add_exception_info_wizard.py:0 #: code:addons/ccs_base/wizard/add_exception_info_wizard.py:0
#: code:addons/ccs_base/wizard/add_exception_info_wizard.py:0
#: model:ir.model.fields.selection,name:ccs_base.selection__add_exception_info_wizard__email_language__zh_cn #: model:ir.model.fields.selection,name:ccs_base.selection__add_exception_info_wizard__email_language__zh_cn
#, python-format #, python-format
msgid "Chinese" msgid "Chinese"
...@@ -1313,7 +1328,6 @@ msgstr "目的地港口代码" ...@@ -1313,7 +1328,6 @@ msgstr "目的地港口代码"
#. module: ccs_base #. module: ccs_base
#. odoo-python #. odoo-python
#: code:addons/ccs_base/wizard/add_exception_info_wizard.py:0 #: code:addons/ccs_base/wizard/add_exception_info_wizard.py:0
#: code:addons/ccs_base/wizard/add_exception_info_wizard.py:0
#: model:ir.model.fields.selection,name:ccs_base.selection__add_exception_info_wizard__email_language__en_us #: model:ir.model.fields.selection,name:ccs_base.selection__add_exception_info_wizard__email_language__en_us
#, python-format #, python-format
msgid "English" msgid "English"
...@@ -1322,7 +1336,6 @@ msgstr "英文" ...@@ -1322,7 +1336,6 @@ msgstr "英文"
#. module: ccs_base #. module: ccs_base
#. odoo-python #. odoo-python
#: code:addons/ccs_base/wizard/batch_update_transfer_bl_no_wizard.py:0 #: code:addons/ccs_base/wizard/batch_update_transfer_bl_no_wizard.py:0
#: code:addons/ccs_base/wizard/batch_update_transfer_bl_no_wizard.py:0
#: model:ir.model.fields,field_description:ccs_base.field_batch_update_transfer_bl_no_wizard__error_file_ids #: model:ir.model.fields,field_description:ccs_base.field_batch_update_transfer_bl_no_wizard__error_file_ids
#, python-format #, python-format
msgid "Error Data" msgid "Error Data"
...@@ -1531,8 +1544,6 @@ msgstr "商品税号" ...@@ -1531,8 +1544,6 @@ msgstr "商品税号"
#. module: ccs_base #. module: ccs_base
#. odoo-python #. odoo-python
#: code:addons/ccs_base/models/cc_bill_loading.py:0 #: code:addons/ccs_base/models/cc_bill_loading.py:0
#: code:addons/ccs_base/models/cc_bill_loading.py:0
#: code:addons/ccs_base/models/cc_bill_loading.py:0
#: code:addons/ccs_base/models/cc_history_big_package.py:0 #: code:addons/ccs_base/models/cc_history_big_package.py:0
#: model:ir.model.fields,field_description:ccs_base.field_cc_big_package__goods_ids #: model:ir.model.fields,field_description:ccs_base.field_cc_big_package__goods_ids
#: model:ir.model.fields,field_description:ccs_base.field_cc_bl__good_ids #: model:ir.model.fields,field_description:ccs_base.field_cc_bl__good_ids
...@@ -2545,8 +2556,8 @@ msgstr "请检查导入文件和内容是否正确，请根据模板文件导入 ...@@ -2545,8 +2556,8 @@ msgstr "请检查导入文件和内容是否正确，请根据模板文件导入
#: code:addons/ccs_base/models/cc_bill_loading.py:0 #: code:addons/ccs_base/models/cc_bill_loading.py:0
#, python-format #, python-format
msgid "" msgid ""
"Please configure the default customs clearance status of the bill of loading" "Please configure the default customs clearance status of the bill of "
" node type first." "loading node type first."
msgstr "请先配置默认的提单节点类型的清关节点" msgstr "请先配置默认的提单节点类型的清关节点"
#. module: ccs_base #. module: ccs_base
...@@ -3068,7 +3079,6 @@ msgstr "节点序号" ...@@ -3068,7 +3079,6 @@ msgstr "节点序号"
#. module: ccs_base #. module: ccs_base
#. odoo-python #. odoo-python
#: code:addons/ccs_base/models/cc_bill_loading.py:0 #: code:addons/ccs_base/models/cc_bill_loading.py:0
#: code:addons/ccs_base/models/cc_bill_loading.py:0
#: code:addons/ccs_base/models/cc_history_big_package.py:0 #: code:addons/ccs_base/models/cc_history_big_package.py:0
#: model:ir.actions.act_window,name:ccs_base.action_cc_ship_package #: model:ir.actions.act_window,name:ccs_base.action_cc_ship_package
#: model:ir.model,name:ccs_base.model_cc_history_ship_package #: model:ir.model,name:ccs_base.model_cc_history_ship_package
...@@ -3317,14 +3327,6 @@ msgstr "商品号必须唯一。" ...@@ -3317,14 +3327,6 @@ msgstr "商品号必须唯一。"
msgid "The Logistic Order No must be unique." msgid "The Logistic Order No must be unique."
msgstr "物流订单号必须唯一。" msgstr "物流订单号必须唯一。"
#. module: ccs_base
#. odoo-python
#: code:addons/ccs_base/models/cc_bill_loading.py:0
#: code:addons/ccs_base/models/cc_bill_loading.py:0
#, python-format
msgid "The Transfer B/L No. cannot be the same as the B/L No."
msgstr "转单号不能与本单提单号重复"
#. module: ccs_base #. module: ccs_base
#: model:ir.model.constraint,message:ccs_base.constraint_cc_bl_transfer_bl_no_uniq #: model:ir.model.constraint,message:ccs_base.constraint_cc_bl_transfer_bl_no_uniq
msgid "The Transfer B/L No. must be unique." msgid "The Transfer B/L No. must be unique."
...@@ -3500,7 +3502,6 @@ msgstr "交易类型" ...@@ -3500,7 +3502,6 @@ msgstr "交易类型"
#. module: ccs_base #. module: ccs_base
#. odoo-python #. odoo-python
#: code:addons/ccs_base/wizard/batch_update_transfer_bl_no_wizard.py:0 #: code:addons/ccs_base/wizard/batch_update_transfer_bl_no_wizard.py:0
#: code:addons/ccs_base/wizard/batch_update_transfer_bl_no_wizard.py:0
#: model:ir.model.fields,field_description:ccs_base.field_cc_bl__transfer_bl_no #: model:ir.model.fields,field_description:ccs_base.field_cc_bl__transfer_bl_no
#: model:ir.model.fields.selection,name:ccs_base.selection__export_bl_big_package_xlsx_wizard__file_name_type__transfer_bl_no #: model:ir.model.fields.selection,name:ccs_base.selection__export_bl_big_package_xlsx_wizard__file_name_type__transfer_bl_no
#, python-format #, python-format
...@@ -3514,6 +3515,20 @@ msgstr "转单号" ...@@ -3514,6 +3515,20 @@ msgstr "转单号"
msgid "Transfer B/L No is required" msgid "Transfer B/L No is required"
msgstr "转单号必填" msgstr "转单号必填"
#. module: ccs_base
#. odoo-python
#: code:addons/ccs_base/models/cc_bill_loading.py:0
#, python-format
msgid "Transfer B/L No. cannot be the same as B/L No."
msgstr "转单号不能与提单号相同。"
#. module: ccs_base
#. odoo-python
#: code:addons/ccs_base/models/cc_bill_loading.py:0
#, python-format
msgid "Transfer B/L No. cannot be the same as B/L No. or Transfer B/L No."
msgstr "转单号不能与提单号或转单号相同。"
#. module: ccs_base #. module: ccs_base
#: model_terms:ir.ui.view,arch_db:ccs_base.tree_cc_bl_view #: model_terms:ir.ui.view,arch_db:ccs_base.tree_cc_bl_view
msgid "Transfer Bill of Loading No." msgid "Transfer Bill of Loading No."
...@@ -3756,8 +3771,8 @@ msgstr "【清关公司】还没！点击左上角的创建按钮，沙发就是 ...@@ -3756,8 +3771,8 @@ msgstr "【清关公司】还没！点击左上角的创建按钮，沙发就是
#. module: ccs_base #. module: ccs_base
#: model_terms:ir.actions.act_window,help:ccs_base.action_cc_clearance_file #: model_terms:ir.actions.act_window,help:ccs_base.action_cc_clearance_file
msgid "" msgid ""
"[Clearance File] Not yet! Click the Create button in the top left corner and" "[Clearance File] Not yet! Click the Create button in the top left corner "
" the sofa is yours!" "and the sofa is yours!"
msgstr "【清关文件】 还没有！点击左上角的“创建”按钮，沙发就是你的了！" msgstr "【清关文件】 还没有！点击左上角的“创建”按钮，沙发就是你的了！"
#. module: ccs_base #. module: ccs_base
...@@ -3832,7 +3847,8 @@ msgstr "" ...@@ -3832,7 +3847,8 @@ msgstr ""
#. module: ccs_base #. module: ccs_base
#: model:mail.template,subject:ccs_base.email_template_exception_notification #: model:mail.template,subject:ccs_base.email_template_exception_notification
msgid "{{ ('大包异常' if object.action_type == 'big package' else '小包异常') }}" msgid ""
"{{ ('大包异常' if object.action_type == 'big package' else '小包异常') }}"
msgstr "" msgstr ""
#. module: ccs_base #. module: ccs_base
......
ccs_base/models/cc_bill_loading.py
浏览文件 @ 0c229c5e
...@@ -575,12 +575,12 @@ class CcBL(models.Model): ...@@ -575,12 +575,12 @@ class CcBL(models.Model):
bl_no = self.env['common.common'].sudo().process_match_str(record.bl_no) bl_no = self.env['common.common'].sudo().process_match_str(record.bl_no)
transfer_bl_no = self.env['common.common'].sudo().process_match_str(record.transfer_bl_no) transfer_bl_no = self.env['common.common'].sudo().process_match_str(record.transfer_bl_no)
if bl_no and transfer_bl_no == bl_no: if bl_no and transfer_bl_no == bl_no:
raise ValidationError(_('The Transfer B/L No. cannot be the same as the B/L No.')) raise ValidationError(_('Transfer B/L No. cannot be the same as B/L No.'))#转单号不能与提单号重复
# 2. 不能与其他单据的提单号重复 # 2. 不能与其他单据的提单号重复
other = self.env['cc.bl'].deal_bl_no_and_transfer_bl_no(transfer_bl_no, other = self.env['cc.bl'].deal_bl_no_and_transfer_bl_no(transfer_bl_no,
domain=[('id', '!=', record.id)]) domain=[('id', '!=', record.id)])
if other: if other:
raise ValidationError(_('The Transfer B/L No. cannot be the same as the B/L No.')) raise ValidationError(_('Transfer B/L No. cannot be the same as B/L No. or Transfer B/L No.'))#转单号不能与提单号或转单号重复
@api.depends('big_package_ids', 'big_package_ids.tally_state', 'big_package_ids.is_cancel') @api.depends('big_package_ids', 'big_package_ids.tally_state', 'big_package_ids.is_cancel')
def cal_tally_big_package_qty(self): def cal_tally_big_package_qty(self):
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论