Unifield Server

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

  1. us-2036
  2. Merge into trunk
Proposed by jftempo
Status: Merged
Merged at revision: 4100
Proposed branch: lp:~unifield-team/unifield-server/us-2036
Merge into: lp:unifield-server
Diff against target: 39 lines (+7/-4)
2 files modified
bin/addons/msf_doc_import/wizard/wizard_po_simulation_screen.py (+3/-0)
bin/addons/msf_supply_doc_export/report/report_validated_purchase_order_xml.mako (+4/-4)
To merge this branch: bzr merge lp:~unifield-team/unifield-server/us-2036
Reviewer Review Type Date Requested Status
UniField Reviewer Team Pending
Review via email: mp+312445@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/wizard_po_simulation_screen.py'
2--- bin/addons/msf_doc_import/wizard/wizard_po_simulation_screen.py 2016-11-30 13:17:56 +0000
3+++ bin/addons/msf_doc_import/wizard/wizard_po_simulation_screen.py 2016-12-05 09:11:27 +0000
4@@ -338,6 +338,9 @@
5 if isinstance(ids, (int, long)):
6 ids = [ids]
7
8+ if ids and self.browse(cr, uid, ids, context=context)[0].state == 'done':
9+ return self.return_to_po(cr, uid, ids, context=context)
10+
11 return {'type': 'ir.actions.act_window',
12 'res_model': self._name,
13 'view_mode': 'form',
14
15=== modified file 'bin/addons/msf_supply_doc_export/report/report_validated_purchase_order_xml.mako'
16--- bin/addons/msf_supply_doc_export/report/report_validated_purchase_order_xml.mako 2016-07-05 08:19:21 +0000
17+++ bin/addons/msf_supply_doc_export/report/report_validated_purchase_order_xml.mako 2016-12-05 09:11:27 +0000
18@@ -45,8 +45,8 @@
19 <field name="analytic_distribution_id">
20 % if need_ad and o.analytic_distribution_id:
21 % for ccl in o.analytic_distribution_id.cost_center_lines:
22- <field name="ad_destination_name">${(ccl.destination_id.name or '')|x}</field>
23- <field name="ad_cost_center_name">${(ccl.analytic_id.name or '')|x}</field>
24+ <field name="ad_destination_name">${(ccl.destination_id.code or '')|x}</field>
25+ <field name="ad_cost_center_name">${(ccl.analytic_id.code or '')|x}</field>
26 <field name="ad_percentage">${(ccl.percentage or 0.00)|x}</field>
27 <field name="ad_subtotal">${((ccl.percentage/100.00)*o.amount_total or 0.00)|x}</field>
28 % endfor
29@@ -97,8 +97,8 @@
30 <field name="analytic_distribution_id">
31 % if need_ad and l.analytic_distribution_id:
32 % for ccl in l.analytic_distribution_id.cost_center_lines:
33- <field name="ad_destination_name">${(ccl.destination_id.name or '')|x}</field>
34- <field name="ad_cost_center_name">${(ccl.analytic_id.name or '')|x}</field>
35+ <field name="ad_destination_name">${(ccl.destination_id.code or '')|x}</field>
36+ <field name="ad_cost_center_name">${(ccl.analytic_id.code or '')|x}</field>
37 <field name="ad_percentage">${(ccl.percentage or 0.00)|x}</field>
38 <field name="ad_subtotal">${((ccl.percentage/100.00)*l.price_subtotal or 0.00)|x}</field>
39 % endfor

Subscribers

People subscribed via source and target branches

to all changes: