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
diff --git a/sf_message/data/template_data.xml b/sf_message/data/template_data.xml
index 3033e687..b08a3fdd 100644
--- a/sf_message/data/template_data.xml
+++ b/sf_message/data/template_data.xml
@@ -66,8 +66,8 @@
-
-
+
+
调拨入库
stock.picking
@@ -75,13 +75,13 @@
markdown
normal
### 调拨入库通知：
-单号：调拨入库单[{{name}}]({{request_url}})
+单号：调拨入库单[{{name}}]({{transfer_inventory_special_url}})
事项：完成刀具物料上架入库
-
-
+
+
功能刀具寿命到期
sf.functional.tool.dismantle
@@ -89,13 +89,13 @@
markdown
normal
### 功能刀具寿命到期提醒：
-单号：拆解单[{{code}}]({{request_url}})
+单号：拆解单[{{code}}]({{tool_expired_remind_special_url}})
事项：{{functional_tool_id.tool_name_id.name}}寿命已到期，需拆解
-
-
+
+
功能刀具组装
sf.functional.tool.assembly
@@ -103,7 +103,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..49ddc957 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_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 f6edb995..5f844064 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_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 0ff32f77..c0dac130 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_special_url(id, tmplate_name, special_name, model_id)
def request_url(self):
url = self.env['ir.config_parameter'].get_param('web.base.url')