Merge lp:~unifield-team/unifield-server/us-2275 into lp:unifield-server

Proposed by jftempo
Status: Merged
Merged at revision: 4290
Proposed branch: lp:~unifield-team/unifield-server/us-2275
Merge into: lp:unifield-server
Diff against target: 23 lines (+6/-0)
1 file modified
bin/addons/msf_supply_doc_export/msf_supply_doc_export.py (+6/-0)
To merge this branch: bzr merge lp:~unifield-team/unifield-server/us-2275
Reviewer Review Type Date Requested Status
UniField Reviewer Team Pending
Review via email: mp+320362@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
=== modified file 'bin/addons/msf_supply_doc_export/msf_supply_doc_export.py'
--- bin/addons/msf_supply_doc_export/msf_supply_doc_export.py 2017-02-17 15:16:45 +0000
+++ bin/addons/msf_supply_doc_export/msf_supply_doc_export.py 2017-03-20 14:10:17 +0000
@@ -122,6 +122,9 @@
122# VALIDATED PURCHASE ORDER (Excel XML)122# VALIDATED PURCHASE ORDER (Excel XML)
123class validated_purchase_order_report_xls(report_sxw.rml_parse):123class validated_purchase_order_report_xls(report_sxw.rml_parse):
124 def __init__(self, cr, uid, name, context):124 def __init__(self, cr, uid, name, context):
125 if context is None:
126 context = {}
127 context['lang'] = 'en_MF'
125 super(validated_purchase_order_report_xls, self).__init__(cr, uid, name, context=context)128 super(validated_purchase_order_report_xls, self).__init__(cr, uid, name, context=context)
126 self.localcontext.update({129 self.localcontext.update({
127 'time': time,130 'time': time,
@@ -146,6 +149,9 @@
146# VALIDATE PURCHASE ORDER (Pure XML)149# VALIDATE PURCHASE ORDER (Pure XML)
147class parser_validated_purchase_order_report_xml(report_sxw.rml_parse):150class parser_validated_purchase_order_report_xml(report_sxw.rml_parse):
148 def __init__(self, cr, uid, name, context):151 def __init__(self, cr, uid, name, context):
152 if context is None:
153 context = {}
154 context['lang'] = 'en_MF'
149 super(parser_validated_purchase_order_report_xml, self).__init__(cr, uid, name, context=context)155 super(parser_validated_purchase_order_report_xml, self).__init__(cr, uid, name, context=context)
150 self.localcontext.update({156 self.localcontext.update({
151 'time': time,157 'time': time,

Subscribers

People subscribed via source and target branches

to all changes: