Purchase - Reports

Merge lp:~agilebg/purchase-report/7_fix_1331394 into lp:~purchase-core-editors/purchase-report/7.0

  1. 7_fix_1331394
  2. Merge into 7.0
Proposed by Lorenzo Battistini
Status: Needs review
Proposed branch: lp:~agilebg/purchase-report/7_fix_1331394
Merge into: lp:~purchase-core-editors/purchase-report/7.0
Diff against target: 228 lines (+72/-98)
2 files modified
purchase_order_webkit/report/purchase_order.mako (+59/-71)
purchase_order_webkit/report/request_quotation.mako (+13/-27)
To merge this branch: bzr merge lp:~agilebg/purchase-report/7_fix_1331394
Reviewer Review Type Date Requested Status
Alexandre Fayolle - camptocamp Needs Resubmitting
Review via email: mp+223799@code.launchpad.net
To post a comment you must log in.
lp:~agilebg/purchase-report/7_fix_1331394 updated
22. By Lorenzo Battistini

[MERGE] [FIX] purchase_order_webkit: ImportError: cannot import name purchase_order

23. By Lorenzo Battistini

[IMP] table footer

Revision history for this message
Alexandre Fayolle - camptocamp (alexandre-fayolle-c2c) wrote :

Hello,

The management of the project has moved to Github: https://github.com/OCA/purchase-reporting

Please migrate your merge proposal to Github. You may want to check https://github.com/OCA/maintainers-tools/wiki/How-to-move-a-Merge-Proposal-to-GitHub for an explanation on how to proceed.

Thanks for contributing to the project

review: Needs Resubmitting
Reply
Revision history for this message
Lorenzo Battistini (elbati) wrote :

Done at https://github.com/OCA/purchase-reporting/pull/1

Reply

Unmerged revisions

23. By Lorenzo Battistini

[IMP] table footer

22. By Lorenzo Battistini

[MERGE] [FIX] purchase_order_webkit: ImportError: cannot import name purchase_order

21. By Lorenzo Battistini

[FIX] purchase_order_webkit - 'Description' field overlaps the next one 'Qty' when it is very long

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'purchase_order_webkit/report/purchase_order.mako'
2--- purchase_order_webkit/report/purchase_order.mako 2014-04-17 10:55:08 +0000
3+++ purchase_order_webkit/report/purchase_order.mako 2014-06-20 07:13:28 +0000
4@@ -40,11 +40,18 @@
5 .list_main_lines td,
6 .list_main_footers td,
7 .list_main_footers th {
8- border-style: none;
9 text-align:left;
10 font-size:12;
11- padding:0;
12-}
13+}
14+
15+.list_main_lines td {
16+ border-bottom:thin solid #EEEEEE
17+}
18+
19+.list_main_footers td {
20+ border: thin solid #ffffff;
21+}
22+
23 .list_main_footers th {
24 text-align:right;
25 }
26@@ -56,6 +63,10 @@
27 width: 13%;
28 }
29
30+tfoot.totals tr:first-child td{
31+ padding-top: 15px;
32+}
33+
34 .nobreak {
35 page-break-inside: avoid;
36 }
37@@ -209,7 +220,6 @@
38 vertical-align:top;
39 }
40
41-
42 </style>
43
44 </head>
45@@ -288,79 +298,57 @@
46 </table>
47 <table class="list_main_table" width="100%" >
48 <thead>
49- <tr>
50- <th class="list_main_headers" style="width: 100%">
51- <table style="width:100%">
52- <tr>
53- <th class="main_col1">${_("Description")}</th>
54- <th class="main_col2">${_("Taxes")}</th>
55- <th class="main_col3">${_("Date Req.")}</th>
56- <th style="text-align:center" class="amount main_col4">${_("Qty")}</th>
57- <th class="main_col5">${_("UoM")}</th>
58- <th class="amount main_col6">${_("Unit Price")}</th>
59- <th class="amount main_col7">${_("Net Price")}</th>
60- </tr>
61- </table>
62- </th>
63- </tr>
64+ <tr class="list_main_headers">
65+ <th class="main_col1">${_("Description")}</th>
66+ <th class="main_col2">${_("Taxes")}</th>
67+ <th class="main_col3">${_("Date Req.")}</th>
68+ <th style="text-align:center" class="amount main_col4">${_("Qty")}</th>
69+ <th class="main_col5">${_("UoM")}</th>
70+ <th class="amount main_col6">${_("Unit Price")}</th>
71+ <th class="amount main_col7">${_("Net Price")}</th>
72+ </tr>
73 </thead>
74 <tbody>
75 %for line in purch.order_line :
76- <tr>
77- <td class="list_main_lines" style="width: 100%">
78- <div class="nobreak">
79- <table style="width:100%">
80- <tr>
81- <td class="main_col1">${line.name.replace('\n','<br/>') or '' | n}</td>
82- <td style="text-align:center" class="main_col2">${ ', '.join([ tax.name or '' for tax in line.taxes_id ])}</td>
83- <td style="text-align:center" class="main_col3">${formatLang(line.date_planned, date=True)}</td>
84- <td class="amount main_col4">${line.product_qty}</td>
85- <td class="main_col5">${line.product_uom.name}</td>
86- <td class="amount main_col6">${formatLang(line.price_unit, digits=get_digits(dp='Purchase Price'))}</td>
87- <td class="amount main_col7">${formatLang(line.price_subtotal, digits=get_digits(dp='Purchase Price'))} ${purch.pricelist_id.currency_id.symbol}</td>
88- </tr>
89- </table>
90- </div>
91- </td>
92- </tr>
93+ <tr class="list_main_lines">
94+ <td class="main_col1">${line.name.replace('\n','<br/>') or '' | n}</td>
95+ <td style="text-align:center" class="main_col2">${ ', '.join([ tax.name or '' for tax in line.taxes_id ])}</td>
96+ <td style="text-align:center" class="main_col3">${formatLang(line.date_planned, date=True)}</td>
97+ <td class="amount main_col4">${line.product_qty}</td>
98+ <td class="main_col5">${line.product_uom.name}</td>
99+ <td class="amount main_col6">${formatLang(line.price_unit, digits=get_digits(dp='Purchase Price'))}</td>
100+ <td class="amount main_col7">${formatLang(line.price_subtotal, digits=get_digits(dp='Purchase Price'))} ${purch.pricelist_id.currency_id.symbol}</td>
101+ </tr>
102 %endfor
103 </tbody>
104 <tfoot class="totals">
105- <tr>
106- <td class="list_main_footers" style="width: 100%">
107- <div class="nobreak">
108- <table style="width:100%">
109- <tr>
110- <td class="total_empty_cell"/>
111- <th>
112- ${_("Net :")}
113- </th>
114- <td class="amount total_sum_cell">
115- ${formatLang(purch.amount_untaxed, digits=get_digits(dp='Purchase Price'))} ${purch.pricelist_id.currency_id.symbol}
116- </td>
117- </tr>
118- <tr>
119- <td class="total_empty_cell"/>
120- <th>
121- ${_("Taxes:")}
122- </th>
123- <td class="amount total_sum_cell">
124- ${formatLang(purch.amount_tax, digits=get_digits(dp='Purchase Price'))} ${purch.pricelist_id.currency_id.symbol}
125- </td>
126- </tr>
127- <tr>
128- <td class="total_empty_cell"/>
129- <th>
130- ${_("Total:")}
131- </th>
132- <td class="amount total_sum_cell">
133- ${formatLang(purch.amount_total, digits=get_digits(dp='Purchase Price'))} ${purch.pricelist_id.currency_id.symbol}
134- </td>
135- </tr>
136- </table>
137- </div>
138- </td>
139- </tr>
140+ <tr class="list_main_footers">
141+ <td colspan="5" class="total_empty_cell"/>
142+ <td style="font-weight:bold; text-align: right">
143+ ${_("Net :")}
144+ </td>
145+ <td class="amount total_sum_cell">
146+ ${formatLang(purch.amount_untaxed, digits=get_digits(dp='Purchase Price'))} ${purch.pricelist_id.currency_id.symbol}
147+ </td>
148+ </tr>
149+ <tr class="list_main_footers">
150+ <td colspan="5" class="total_empty_cell"/>
151+ <td style="font-weight:bold; text-align: right">
152+ ${_("Taxes:")}
153+ </td>
154+ <td class="amount total_sum_cell">
155+ ${formatLang(purch.amount_tax, digits=get_digits(dp='Purchase Price'))} ${purch.pricelist_id.currency_id.symbol}
156+ </td>
157+ </tr>
158+ <tr class="list_main_footers">
159+ <td colspan="5" class="total_empty_cell"/>
160+ <td style="font-weight:bold; text-align: right">
161+ ${_("Total:")}
162+ </td>
163+ <td class="amount total_sum_cell">
164+ ${formatLang(purch.amount_total, digits=get_digits(dp='Purchase Price'))} ${purch.pricelist_id.currency_id.symbol}
165+ </td>
166+ </tr>
167 </tfoot>
168 </table>
169 <p style="page-break-after:always"/>
170
171=== modified file 'purchase_order_webkit/report/request_quotation.mako'
172--- purchase_order_webkit/report/request_quotation.mako 2014-04-17 10:55:08 +0000
173+++ purchase_order_webkit/report/request_quotation.mako 2014-06-20 07:13:28 +0000
174@@ -43,7 +43,7 @@
175 border-style: none;
176 text-align:left;
177 font-size:12;
178- padding:0;
179+ border-bottom:thin solid #EEEEEE
180 }
181 .list_main_footers th {
182 text-align:right;
183@@ -274,34 +274,20 @@
184 <h3 style="clear:both; padding-top: 20px;">${_("Request for Quotation:")} ${purch.name}</h3>
185 <table class="list_main_table" width="100%" >
186 <thead>
187- <tr>
188- <th class="list_main_headers" style="width: 100%">
189- <table style="width:100%">
190- <tr>
191- <th class="main_col1">${_("Description")}</th>
192- <th class="main_col3">${_("Expected Date")}</th>
193- <th style="text-align:center" class="amount main_col4">${_("Qty")}</th>
194- </tr>
195- </table>
196- </th>
197- </tr>
198+ <tr class="list_main_headers">
199+ <th class="main_col1">${_("Description")}</th>
200+ <th class="main_col3">${_("Expected Date")}</th>
201+ <th style="text-align:center" class="amount main_col4">${_("Qty")}</th>
202+ </tr>
203 </thead>
204 <tbody>
205- <tr>
206- <td class="list_main_lines" style="width: 100%">
207- <div class="nobreak">
208- <table style="width:100%">
209- %for line in purch.order_line :
210- <tr class="line">
211- <td class="main_col1">${line.name.replace('\n','<br/>') or '' | n}</td>
212- <td style="text-align:center" class="main_col3">${formatLang(line.date_planned, date=True)}</td>
213- <td class="amount main_col4">${line.product_qty} ${line.product_uom and line.product_uom.name or ''}</td>
214- </tr>
215- %endfor
216- </table>
217- </div>
218- </td>
219- </tr>
220+ %for line in purch.order_line :
221+ <tr class="line list_main_lines">
222+ <td class="main_col1"><div class="nobreak">${line.name.replace('\n','<br/>') or '' | n}</div></td>
223+ <td style="text-align:center" class="main_col3">${formatLang(line.date_planned, date=True)}</td>
224+ <td class="amount main_col4">${line.product_qty} ${line.product_uom and line.product_uom.name or ''}</td>
225+ </tr>
226+ %endfor
227 </tbody>
228 </table>
229

Subscribers

People subscribed via source and target branches