Accept Merge Request #1653: (feature/sale_order_route_pick -> develop)

Merge Request: 修改消息通知

Created By: @胡尧
Accepted By: @胡尧
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1653

jikimo_workorder_exception_notify/models/jikimo_workorder_exception.py

@@ -51,11 +51,11 @@ class JikimoWorkorderException(models.Model):
         return res
 
     def _get_message(self, message_queue_ids):
-        contents = super(JikimoWorkorderException, self)._get_message(message_queue_ids)
+        contents, _ = super(JikimoWorkorderException, self)._get_message(message_queue_ids)
         url = self.env['ir.config_parameter'].get_param('web.base.url')
         action_id = self.env.ref('mrp.mrp_production_action').id
         for index, content in enumerate(contents):
             exception_id = self.env['jikimo.workorder.exception'].browse(message_queue_ids[index].res_id)
             url = url + '/web#id=%s&view_type=form&action=%s' % (exception_id.workorder_id.production_id.id, action_id)
             contents[index] = content.replace('{{url}}', url)
-        return contents
+        return contents, message_queue_ids

sf_message/models/sf_message_maintenance_logs.py

@@ -13,11 +13,11 @@ class SFMessageMaintenanceLogs(models.Model):
         return res
 
     def _get_message(self, message_queue_ids):
-        contents = super(SFMessageMaintenanceLogs, self)._get_message(message_queue_ids)
+        contents, _ = super(SFMessageMaintenanceLogs, self)._get_message(message_queue_ids)
         url = self.env['ir.config_parameter'].get_param('web.base.url')
         action_id = self.env.ref('sf_maintenance.action_maintenance_logs').id
         for index, content in enumerate(contents):
             maintenance_logs_id = self.env['sf.maintenance.logs'].browse(message_queue_ids[index].res_id)
             url = url + '/web#id=%s&view_type=form&action=%s' % (maintenance_logs_id.id, action_id)
             contents[index] = content.replace('{{url}}', url)
-        return contents
+        return contents, message_queue_ids

sf_message/models/sf_message_mrp_production.py

@@ -81,7 +81,7 @@ class SFMessageMrpProduction(models.Model):
                                                                         action_id)
             contents.extend(technology_to_confirmed_contents)
         logging.info('生产完工入库提醒: %s' % contents)
-        return contents
+        return contents, message_queue_ids
 
     def get_production_info(self, content, product_ids, state, action_id):
         contents = []

sf_message/models/sf_message_purchase.py

@@ -58,7 +58,7 @@ class SFMessagePurchase(models.Model):
                                    .replace('{{url}}', url_with_id)
                                    .replace('{{num}}', str(production_num)))
                     contents.append(new_content)
-        return contents
+        return contents, message_queue_ids
 
     def request_url(self, id):
         url = self.env['ir.config_parameter'].get_param('web.base.url')

sf_message/models/sf_message_quality_cnc_test.py

@@ -33,4 +33,4 @@ class SFMessageQualityCncTest(models.Model):
             content_template = content.replace('{{judge_num}}', str(i))
             content_template = content_template.replace('{{url}}', url_with_id)
             contents.append(content_template)
-        return contents
+        return contents, message_queue_ids

sf_message/models/sf_message_sale.py

@@ -58,7 +58,7 @@ class SFMessageSale(models.Model):
         i = 0
         for item in message_queue_ids:
             if item.message_template_id.bussiness_node_id.name in ('待接单', '待确认供货方式'):
-                content = super(SFMessageSale, self)._get_message(item)
+                content, _ = super(SFMessageSale, self)._get_message(item)
                 action_id = self.env.ref('sale.action_quotations_with_onboarding').id \
                     if item.message_template_id.bussiness_node_id.name == '待接单' \
                     else self.env.ref('sale.action_orders').id
@@ -66,7 +66,7 @@ class SFMessageSale(models.Model):
                 content = content[0].replace('{{url}}', url_with_id)
                 contents.append(content)
             elif item.message_template_id.bussiness_node_id.name == '确认接单':
-                content = super(SFMessageSale, self)._get_message(item)
+                content, _ = super(SFMessageSale, self)._get_message(item)
                 sale_order_line = self.env['sale.order.line'].sudo().search([('order_id', '=', int(item.res_id))])
                 product = sale_order_line[0].product_id.name if len(sale_order_line) == 1 else '%s...' % \
                                                                                                sale_order_line[
@@ -103,7 +103,7 @@ class SFMessageSale(models.Model):
             elif bussiness_node == '销售订单已逾期':
                 content = content_template.replace('{{overdue_num}}', str(i))
             contents.append(content)
-        return contents
+        return contents, message_queue_ids
 
     # # 销售订单逾期预警和已逾期
     def _overdue_or_warning_func(self):

sf_message/models/sf_message_stock_picking.py

@@ -83,7 +83,7 @@ class SFMessageStockPicking(models.Model):
                 content = self.deal_stock_picking_sfp(message_queue_id)
                 if content:
                     contents.append(content)
-            return contents
+            return contents, message_queue_ids
 
     def get_special_url(self, id, tmplate_name, special_name, model_id):
         menu_id = 0

sf_message/models/sf_message_workorder.py

@@ -91,7 +91,7 @@ class SFMessageWork(models.Model):
             elif bussiness_node in template_names['已逾期']:
                 content = content_template.replace('{{overdue_num}}', str(i))
             contents.append(content)
-        return contents
+        return contents, message_queue_ids
 
     def _overdue_or_warning_func(self):
         workorders = self.env['mrp.workorder'].search(

sf_plan_management/i18n/zh_CN.po

@@ -6678,7 +6678,7 @@ msgstr "账单状态"
 #: model_terms:ir.ui.view,arch_db:account.account_journal_dashboard_kanban_view
 #, python-format
 msgid "Bills"
-msgstr "账单"
+msgstr "发票账单"
 
 #. module: account
 #: model_terms:ir.ui.view,arch_db:account.account_journal_dashboard_kanban_view
@@ -23023,7 +23023,7 @@ msgstr "支付：支付收据"
 #: model_terms:ir.ui.view,arch_db:account.view_account_payment_search
 #, python-format
 msgid "Payments"
-msgstr "支付"
+msgstr "付款单"
 
 #. module: account
 #: model_terms:ir.actions.act_window,help:account.action_account_payments