From d4a01d9b8a21f388841d4e91061b0ff749200227 Mon Sep 17 00:00:00 2001 From: liaodanlong Date: Sun, 29 Sep 2024 17:11:37 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=A4=84=E7=90=86=E4=BC=9A=E8=AE=A1?= =?UTF-8?q?=E5=87=AD=E8=AF=81=E7=94=9F=E6=88=90=E9=87=8D=E5=A4=8D=E5=90=8D?= =?UTF-8?q?=E7=A7=B0=E6=8A=A5=E9=94=99=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jikimo_account_process/__manifest__.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/jikimo_account_process/__manifest__.py b/jikimo_account_process/__manifest__.py index f701deb7..0c1b521c 100644 --- a/jikimo_account_process/__manifest__.py +++ b/jikimo_account_process/__manifest__.py @@ -3,8 +3,8 @@ 'name': "jikimo_account_process", 'summary': """ - Short (1 phrase/line) summary of the module's purpose, used as - subtitle on modules listing or apps.openerp.com""", + 处理会计凭证生成重复名称报错问题 + """, 'description': """ Long description of module's purpose From 5aff8c1737497ba991a139b6704d5c826200e0af Mon Sep 17 00:00:00 2001 From: liaodanlong Date: Wed, 9 Oct 2024 10:14:48 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E6=B6=88=E6=81=AF=E6=8E=A8=E9=80=81url?= =?UTF-8?q?=E9=93=BE=E6=8E=A5=E9=80=BB=E8=BE=91=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sf_message/data/template_data.xml | 18 +++++++++--------- .../sf_message_functional_tool_assembly.py | 11 +++++++++++ .../sf_message_functional_tool_dismantle.py | 10 ++++++++++ sf_message/models/sf_message_stock_picking.py | 9 +++++++++ 4 files changed, 39 insertions(+), 9 deletions(-) diff --git a/sf_message/data/template_data.xml b/sf_message/data/template_data.xml index 868b3f52..c93a6efd 100644 --- a/sf_message/data/template_data.xml +++ b/sf_message/data/template_data.xml @@ -40,8 +40,8 @@ - - + + 调拨入库 stock.picking @@ -49,13 +49,13 @@ markdown normal ### 调拨入库通知： -单号：调拨入库单[{{name}}]({{request_url}}) +单号：调拨入库单[{{name}}]({{transfer_inventory_special_url}}) 事项：完成刀具物料上架入库 - - + + 功能刀具寿命到期 sf.functional.tool.dismantle @@ -63,13 +63,13 @@ markdown normal ### 功能刀具寿命到期提醒： -单号：拆解单[{{code}}]({{request_url}}) +单号：拆解单[{{code}}]({{tool_expired_remind_special_url}}) 事项：{{functional_tool_id.tool_name_id.name}}寿命已到期，需拆解 - - + + 功能刀具组装 sf.functional.tool.assembly @@ -77,7 +77,7 @@ markdown normal ### 功能刀具组装通知： -单号：组装任务单[{{name}}]({{request_url}}) +单号：组装任务单[{{name}}]({{tool_assembly_special_url}}) 事项：{{use_tool_time}}前完成组装 diff --git a/sf_message/models/sf_message_functional_tool_assembly.py b/sf_message/models/sf_message_functional_tool_assembly.py index bf745b53..d850f031 100644 --- a/sf_message/models/sf_message_functional_tool_assembly.py +++ b/sf_message/models/sf_message_functional_tool_assembly.py @@ -13,3 +13,14 @@ class SFMessagefunctionalToolAssembly(models.Model): if obj.loading_task_source == '0' and obj.assemble_status == '0': obj.add_queue('功能刀具组装') return result + + + def get_special_url(self,id,tmplate_name,special_name,model_id): + menu_id = 0 + action_id = 0 + if tmplate_name=='调拨入库' and special_name== 'tool_assembly_special_url': + menu_id = self.env.ref('mrp.menu_mrp_root').id + action_id = self.env.ref('sf_tool_management.sf_functional_tool_assembly_view_act').id + return super(SFMessagefunctionalToolAssembly, self).get_url(id, menu_id, action_id,model_id) + else: + return super(SFMessagefunctionalToolAssembly, self).get_url(id, tmplate_name, special_name, model_id) \ No newline at end of file diff --git a/sf_message/models/sf_message_functional_tool_dismantle.py b/sf_message/models/sf_message_functional_tool_dismantle.py index f6edb995..62b1176e 100644 --- a/sf_message/models/sf_message_functional_tool_dismantle.py +++ b/sf_message/models/sf_message_functional_tool_dismantle.py @@ -17,3 +17,13 @@ class SFMessagefunctionalToolDismantle(models.Model): if obj.dismantle_cause in ['寿命到期报废', '崩刀报废'] and obj.state == '待拆解': obj.add_queue('功能刀具寿命到期') return result + + def get_special_url(self,id,tmplate_name,special_name,model_id): + menu_id = 0 + action_id = 0 + if tmplate_name=='调拨入库' and special_name== 'tool_expired_remind_special_url': + menu_id = self.env.ref('mrp.menu_mrp_root').id + action_id = self.env.ref('sf_tool_management.sf_functional_tool_dismantle_view_act').id + return super(SFMessagefunctionalToolDismantle, self).get_url(id, menu_id, action_id,model_id) + else: + return super(SFMessagefunctionalToolDismantle, self).get_url(id, tmplate_name, special_name, model_id) \ No newline at end of file diff --git a/sf_message/models/sf_message_stock_picking.py b/sf_message/models/sf_message_stock_picking.py index 0ff32f77..1a52d3f2 100644 --- a/sf_message/models/sf_message_stock_picking.py +++ b/sf_message/models/sf_message_stock_picking.py @@ -50,6 +50,15 @@ class SFMessageStockPicking(models.Model): else: res = super(SFMessageStockPicking, self)._get_message(message_queue_id) return res + def get_special_url(self,id,tmplate_name,special_name,model_id): + menu_id = 0 + action_id = 0 + if tmplate_name=='调拨入库' and special_name== 'transfer_inventory_special_url': + menu_id = self.env.ref('stock.menu_stock_root').id + action_id = self.env.ref('stock.action_picking_tree_ready').id + return super(SFMessageStockPicking, self).get_url(id, menu_id, action_id,model_id) + else: + return super(SFMessageStockPicking, self).get_url(id, tmplate_name, special_name, model_id) def request_url(self): url = self.env['ir.config_parameter'].get_param('web.base.url') From cc5452d14cd3ac90f0fed33f30e5fabd2aab914b Mon Sep 17 00:00:00 2001 From: liaodanlong Date: Wed, 9 Oct 2024 10:26:20 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E6=B6=88=E6=81=AF=E6=8E=A8=E9=80=81url?= =?UTF-8?q?=E9=93=BE=E6=8E=A5=E9=80=BB=E8=BE=91=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sf_message/models/sf_message_functional_tool_assembly.py | 2 +- sf_message/models/sf_message_functional_tool_dismantle.py | 2 +- sf_message/models/sf_message_stock_picking.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/sf_message/models/sf_message_functional_tool_assembly.py b/sf_message/models/sf_message_functional_tool_assembly.py index d850f031..49ddc957 100644 --- a/sf_message/models/sf_message_functional_tool_assembly.py +++ b/sf_message/models/sf_message_functional_tool_assembly.py @@ -23,4 +23,4 @@ class SFMessagefunctionalToolAssembly(models.Model): action_id = self.env.ref('sf_tool_management.sf_functional_tool_assembly_view_act').id return super(SFMessagefunctionalToolAssembly, self).get_url(id, menu_id, action_id,model_id) else: - return super(SFMessagefunctionalToolAssembly, self).get_url(id, tmplate_name, special_name, model_id) \ No newline at end of file + return super(SFMessagefunctionalToolAssembly, self).get_special_url(id, tmplate_name, special_name, model_id) \ No newline at end of file diff --git a/sf_message/models/sf_message_functional_tool_dismantle.py b/sf_message/models/sf_message_functional_tool_dismantle.py index 62b1176e..5f844064 100644 --- a/sf_message/models/sf_message_functional_tool_dismantle.py +++ b/sf_message/models/sf_message_functional_tool_dismantle.py @@ -26,4 +26,4 @@ class SFMessagefunctionalToolDismantle(models.Model): action_id = self.env.ref('sf_tool_management.sf_functional_tool_dismantle_view_act').id return super(SFMessagefunctionalToolDismantle, self).get_url(id, menu_id, action_id,model_id) else: - return super(SFMessagefunctionalToolDismantle, self).get_url(id, tmplate_name, special_name, model_id) \ No newline at end of file + return super(SFMessagefunctionalToolDismantle, self).get_special_url(id, tmplate_name, special_name, model_id) \ No newline at end of file diff --git a/sf_message/models/sf_message_stock_picking.py b/sf_message/models/sf_message_stock_picking.py index 1a52d3f2..c0dac130 100644 --- a/sf_message/models/sf_message_stock_picking.py +++ b/sf_message/models/sf_message_stock_picking.py @@ -58,7 +58,7 @@ class SFMessageStockPicking(models.Model): action_id = self.env.ref('stock.action_picking_tree_ready').id return super(SFMessageStockPicking, self).get_url(id, menu_id, action_id,model_id) else: - return super(SFMessageStockPicking, self).get_url(id, tmplate_name, special_name, model_id) + return super(SFMessageStockPicking, self).get_special_url(id, tmplate_name, special_name, model_id) def request_url(self): url = self.env['ir.config_parameter'].get_param('web.base.url')