Unifield Server

Merge lp:~jfb-tempo-consulting/unifield-server/US-7811 into lp:unifield-server

  1. US-7811
  2. Merge into trunk
Proposed by jftempo
Status: Merged
Merged at revision: 5804
Proposed branch: lp:~jfb-tempo-consulting/unifield-server/US-7811
Merge into: lp:unifield-server
Diff against target: 54 lines (+6/-5)
4 files modified
bin/addons/msf_doc_import/wizard/wiz_common_import.py (+1/-0)
bin/addons/msf_doc_import/wizard/wizard_import_fo_line.py (+1/-1)
bin/addons/msf_outgoing/msf_outgoing.py (+2/-2)
bin/addons/msf_profile/i18n/fr_MF.po (+2/-2)
To merge this branch: bzr merge lp:~jfb-tempo-consulting/unifield-server/US-7811
Reviewer Review Type Date Requested Status
UniField Reviewer Team Pending
Review via email: mp+389800@code.launchpad.net
To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'bin/addons/msf_doc_import/wizard/wiz_common_import.py'
2--- bin/addons/msf_doc_import/wizard/wiz_common_import.py 2020-02-10 17:16:32 +0000
3+++ bin/addons/msf_doc_import/wizard/wiz_common_import.py 2020-08-25 15:55:47 +0000
4@@ -596,6 +596,7 @@
5 'pricelist': order.pricelist_id.id,
6 'warehouse': order.warehouse_id.id,
7 'categ': order.categ,
8+ 'sale_id': order.id,
9 }
10 context.update(context_update)
11
12
13=== modified file 'bin/addons/msf_doc_import/wizard/wizard_import_fo_line.py'
14--- bin/addons/msf_doc_import/wizard/wizard_import_fo_line.py 2019-12-05 09:11:26 +0000
15+++ bin/addons/msf_doc_import/wizard/wizard_import_fo_line.py 2020-08-25 15:55:47 +0000
16@@ -260,7 +260,7 @@
17
18 # Check product restrictions
19 if p_value.get('default_code') and fo_browse.partner_id:
20- product_obj._get_restriction_error(cr, uid, [p_value['default_code']], {'partner_id': fo_browse.partner_id.id}, context=dict(context, noraise=False))
21+ product_obj._get_restriction_error(cr, uid, [p_value['default_code']], {'partner_id': fo_browse.partner_id.id, 'obj_type': 'sale.order'}, context=dict(context, noraise=False))
22
23 # write order line on FO
24 vals['order_line'].append((0, 0, to_write))
25
26=== modified file 'bin/addons/msf_outgoing/msf_outgoing.py'
27--- bin/addons/msf_outgoing/msf_outgoing.py 2020-08-07 13:04:21 +0000
28+++ bin/addons/msf_outgoing/msf_outgoing.py 2020-08-25 15:55:47 +0000
29@@ -1612,8 +1612,8 @@
30 self.shipment_create_invoice(cr, uid, shipment.id, context=context)
31
32 # log validate action
33- self.log(cr, uid, shipment.id, _('The Shipment %s has been closed.') % (shipment.name,))
34- self.infolog(cr, uid, "The Shipment id:%s (%s) has been closed." % (
35+ self.log(cr, uid, shipment.id, _('The Shipment %s has been dispatched.') % (shipment.name,))
36+ self.infolog(cr, uid, "The Shipment id:%s (%s) has been dispatched." % (
37 shipment.id, shipment.name,
38 ))
39
40
41=== modified file 'bin/addons/msf_profile/i18n/fr_MF.po'
42--- bin/addons/msf_profile/i18n/fr_MF.po 2020-08-24 13:15:44 +0000
43+++ bin/addons/msf_profile/i18n/fr_MF.po 2020-08-25 15:55:47 +0000
44@@ -17640,8 +17640,8 @@
45 #. module: msf_outgoing
46 #: code:addons/msf_outgoing/msf_outgoing.py:1761
47 #, python-format
48-msgid "The Shipment %s has been closed."
49-msgstr "Les %s de l'expédition ont été fermés."
50+msgid "The Shipment %s has been dispatched."
51+msgstr "%s a été expédié."
52
53 #. module: msf_supply_doc_export
54 #: report:po.follow.up_rml:0

Subscribers

People subscribed via source and target branches