Unifield Server

Merge lp:~dorian-kemps/unifield-server/US-6408 into lp:unifield-server

  1. US-6408
  2. Merge into trunk
Proposed by jftempo
Status: Merged
Merged at revision: 5693
Proposed branch: lp:~dorian-kemps/unifield-server/US-6408
Merge into: lp:unifield-server
Diff against target: 80 lines (+10/-6)
4 files modified
bin/addons/msf_supply_doc_export/msf_supply_doc_export.py (+7/-4)
bin/addons/msf_supply_doc_export/report/report_po_follow_up.rml (+1/-1)
bin/addons/msf_supply_doc_export/report/report_po_follow_up_xls.mako (+1/-1)
bin/addons/msf_supply_doc_export/wizard/po_follow_up.py (+1/-0)
To merge this branch: bzr merge lp:~dorian-kemps/unifield-server/US-6408
Reviewer Review Type Date Requested Status
UniField Reviewer Team Pending
Review via email: mp+381114@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_supply_doc_export/msf_supply_doc_export.py'
2--- bin/addons/msf_supply_doc_export/msf_supply_doc_export.py 2020-02-04 09:44:26 +0000
3+++ bin/addons/msf_supply_doc_export/msf_supply_doc_export.py 2020-03-24 15:50:02 +0000
4@@ -732,7 +732,7 @@
5 res.append(line)
6 return res
7
8- def getPOLines(self, po_id, pending_only_ok=False):
9+ def getPOLines(self, export_format, po_id, pending_only_ok=False):
10 ''' developer note: would be a lot easier to write this as a single sql and then use on-break '''
11 pol_obj = self.pool.get('purchase.order.line')
12 prod_obj = self.pool.get('product.product')
13@@ -817,7 +817,8 @@
14 'total_func_currency': '',
15 }
16 report_lines.append(report_line)
17- report_lines.extend(self.printAnalyticLines(analytic_lines))
18+ if export_format != 'xls':
19+ report_lines.extend(self.printAnalyticLines(analytic_lines))
20 first_line = False
21
22 for spsul in sorted(same_product_same_uom, key=lambda spsu: spsu.get('backorder_id'), reverse=True):
23@@ -867,7 +868,8 @@
24 # report_line['qty_backordered'] = spsul.get('product_qty', '')
25
26 if first_line:
27- report_lines.extend(self.printAnalyticLines(analytic_lines))
28+ if export_format != 'xls':
29+ report_lines.extend(self.printAnalyticLines(analytic_lines))
30 first_line = False
31
32 for spl in sorted(same_product, key=lambda spsu: spsu.get('backorder_id'), reverse=True):
33@@ -916,7 +918,8 @@
34 # report_line['qty_backordered'] = spl.get('product_qty', '')
35
36 if first_line:
37- report_lines.extend(self.printAnalyticLines(analytic_lines))
38+ if export_format != 'xls':
39+ report_lines.extend(self.printAnalyticLines(analytic_lines))
40 first_line = False
41
42 for ol in other_product:
43
44=== modified file 'bin/addons/msf_supply_doc_export/report/report_po_follow_up.rml'
45--- bin/addons/msf_supply_doc_export/report/report_po_follow_up.rml 2019-05-17 10:15:25 +0000
46+++ bin/addons/msf_supply_doc_export/report/report_po_follow_up.rml 2020-03-24 15:50:02 +0000
47@@ -134,7 +134,7 @@
48 </td>
49 </tr>
50 <tr>
51- <para style="P4">[[ repeatIn(getPOLines(o.id, getRunParmsRML('pending_only_ok')), 'line') ]]</para>
52+ <para style="P4">[[ repeatIn(getPOLines(getRunParmsRML('export_format'), o.id, getRunParmsRML('pending_only_ok')), 'line') ]]</para>
53 <td>
54 <para style="P4Center">[[ line['raw_state'] not in ['cancel', 'cancel_r'] and line['item'] or removeParentNode('para') ]]</para>
55 <para style="P4CenterGrey">[[ line['raw_state'] in ['cancel', 'cancel_r'] and line['item'] or removeParentNode('para') ]]</para>
56
57=== modified file 'bin/addons/msf_supply_doc_export/report/report_po_follow_up_xls.mako'
58--- bin/addons/msf_supply_doc_export/report/report_po_follow_up_xls.mako 2019-08-05 12:28:46 +0000
59+++ bin/addons/msf_supply_doc_export/report/report_po_follow_up_xls.mako 2020-03-24 15:50:02 +0000
60@@ -221,7 +221,7 @@
61 </Row>
62
63 % for o in objects:
64- % for line in getPOLines(o.id):
65+ % for line in getPOLines(getRunParms()['export_format'], o.id):
66 % if (getRunParms()['pending_only_ok'] and float(line['qty_backordered']) > 0) or not getRunParms()['pending_only_ok']:
67 <Row ss:AutoFitHeight="1">
68 <Cell ss:StyleID="${getLineStyle(line)|x}"><Data ss:Type="String">${(line['order_ref'])|x}</Data></Cell>
69
70=== modified file 'bin/addons/msf_supply_doc_export/wizard/po_follow_up.py'
71--- bin/addons/msf_supply_doc_export/wizard/po_follow_up.py 2019-07-30 10:00:15 +0000
72+++ bin/addons/msf_supply_doc_export/wizard/po_follow_up.py 2020-03-24 15:50:02 +0000
73@@ -254,6 +254,7 @@
74 'supplier': '',
75 'pending_only_ok': wiz.pending_only_ok,
76 'include_notes_ok': wiz.include_notes_ok,
77+ 'export_format': wiz.export_format,
78 }
79
80 # PO number

Subscribers

People subscribed via source and target branches