Accept Merge Request #1383: (feature/销售和排程添加消息推送 -> develop)

Merge Request: 消息推送url链接逻辑修改

Created By: @廖丹龙
Reviewed By: @胡尧 @胡嘉莹
Approved By: @胡尧 
Accepted By: @廖丹龙
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1383

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

sf_message/data/template_data.xml

@@ -66,8 +66,8 @@
 
 
         <record id="template_transfer_inventory_remind" model="jikimo.message.template">
-            <field name="menu_id" ref="stock.menu_stock_root"/>
-            <field name="action_id" ref="stock.action_picking_tree_ready"/>
+<!--            <field name="menu_id" ref="stock.menu_stock_root"/>-->
+<!--            <field name="action_id" ref="stock.action_picking_tree_ready"/>-->
             <field name="name">调拨入库</field>
             <field name="model_id" ref="stock.model_stock_picking"/>
             <field name="model">stock.picking</field>
@@ -75,13 +75,13 @@
             <field name="msgtype">markdown</field>
             <field name="urgency">normal</field>
             <field name="content">### 调拨入库通知：
-单号：调拨入库单[{{name}}]({{request_url}})
+单号：调拨入库单[{{name}}]({{transfer_inventory_special_url}})
 事项：完成刀具物料上架入库</field>
         </record>
 
         <record id="template_tool_expired_remind" model="jikimo.message.template">
-            <field name="menu_id" ref="mrp.menu_mrp_root"/>
-            <field name="action_id" ref="sf_tool_management.sf_functional_tool_dismantle_view_act"/>
+<!--            <field name="menu_id" ref="mrp.menu_mrp_root"/>-->
+<!--            <field name="action_id" ref="sf_tool_management.sf_functional_tool_dismantle_view_act"/>-->
             <field name="name">功能刀具寿命到期</field>
             <field name="model_id" ref="sf_tool_management.model_sf_functional_tool_dismantle"/>
             <field name="model">sf.functional.tool.dismantle</field>
@@ -89,13 +89,13 @@
             <field name="msgtype">markdown</field>
             <field name="urgency">normal</field>
             <field name="content">### 功能刀具寿命到期提醒：
-单号：拆解单[{{code}}]({{request_url}})
+单号：拆解单[{{code}}]({{tool_expired_remind_special_url}})
 事项：{{functional_tool_id.tool_name_id.name}}寿命已到期，需拆解</field>
         </record>
 
         <record id="template_tool_assembly_remind" model="jikimo.message.template">
-            <field name="menu_id" ref="mrp.menu_mrp_root"/>
-            <field name="action_id" ref="sf_tool_management.sf_functional_tool_assembly_view_act"/>
+<!--            <field name="menu_id" ref="mrp.menu_mrp_root"/>-->
+<!--            <field name="action_id" ref="sf_tool_management.sf_functional_tool_assembly_view_act"/>-->
             <field name="name">功能刀具组装</field>
             <field name="model_id" ref="sf_tool_management.model_sf_functional_tool_assembly"/>
             <field name="model">sf.functional.tool.assembly</field>
@@ -103,7 +103,7 @@
             <field name="msgtype">markdown</field>
             <field name="urgency">normal</field>
             <field name="content">### 功能刀具组装通知：
-单号：组装任务单[{{name}}]({{request_url}})
+单号：组装任务单[{{name}}]({{tool_assembly_special_url}})
 事项：{{use_tool_time}}前完成组装</field>
         </record>
     </data>

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)

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)

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')