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
=== modified file 'purchase_order_webkit/report/purchase_order.mako'
--- purchase_order_webkit/report/purchase_order.mako 2014-04-17 10:55:08 +0000
+++ purchase_order_webkit/report/purchase_order.mako 2014-06-20 07:13:28 +0000
@@ -40,11 +40,18 @@
40.list_main_lines td,40.list_main_lines td,
41.list_main_footers td,41.list_main_footers td,
42.list_main_footers th {42.list_main_footers th {
43 border-style: none;
44 text-align:left;43 text-align:left;
45 font-size:12;44 font-size:12;
46 padding:0;45}
47}46
47.list_main_lines td {
48 border-bottom:thin solid #EEEEEE
49}
50
51.list_main_footers td {
52 border: thin solid #ffffff;
53}
54
48.list_main_footers th {55.list_main_footers th {
49 text-align:right;56 text-align:right;
50}57}
@@ -56,6 +63,10 @@
56 width: 13%;63 width: 13%;
57}64}
5865
66tfoot.totals tr:first-child td{
67 padding-top: 15px;
68}
69
59.nobreak {70.nobreak {
60 page-break-inside: avoid;71 page-break-inside: avoid;
61}72}
@@ -209,7 +220,6 @@
209 vertical-align:top;220 vertical-align:top;
210}221}
211222
212
213 </style>223 </style>
214224
215</head>225</head>
@@ -288,79 +298,57 @@
288 </table>298 </table>
289 <table class="list_main_table" width="100%" >299 <table class="list_main_table" width="100%" >
290 <thead>300 <thead>
291 <tr>301 <tr class="list_main_headers">
292 <th class="list_main_headers" style="width: 100%">302 <th class="main_col1">${_("Description")}</th>
293 <table style="width:100%">303 <th class="main_col2">${_("Taxes")}</th>
294 <tr>304 <th class="main_col3">${_("Date Req.")}</th>
295 <th class="main_col1">${_("Description")}</th>305 <th style="text-align:center" class="amount main_col4">${_("Qty")}</th>
296 <th class="main_col2">${_("Taxes")}</th>306 <th class="main_col5">${_("UoM")}</th>
297 <th class="main_col3">${_("Date Req.")}</th>307 <th class="amount main_col6">${_("Unit Price")}</th>
298 <th style="text-align:center" class="amount main_col4">${_("Qty")}</th>308 <th class="amount main_col7">${_("Net Price")}</th>
299 <th class="main_col5">${_("UoM")}</th>309 </tr>
300 <th class="amount main_col6">${_("Unit Price")}</th>
301 <th class="amount main_col7">${_("Net Price")}</th>
302 </tr>
303 </table>
304 </th>
305 </tr>
306 </thead>310 </thead>
307 <tbody>311 <tbody>
308 %for line in purch.order_line :312 %for line in purch.order_line :
309 <tr>313 <tr class="list_main_lines">
310 <td class="list_main_lines" style="width: 100%">314 <td class="main_col1">${line.name.replace('\n','<br/>') or '' | n}</td>
311 <div class="nobreak">315 <td style="text-align:center" class="main_col2">${ ', '.join([ tax.name or '' for tax in line.taxes_id ])}</td>
312 <table style="width:100%">316 <td style="text-align:center" class="main_col3">${formatLang(line.date_planned, date=True)}</td>
313 <tr>317 <td class="amount main_col4">${line.product_qty}</td>
314 <td class="main_col1">${line.name.replace('\n','<br/>') or '' | n}</td>318 <td class="main_col5">${line.product_uom.name}</td>
315 <td style="text-align:center" class="main_col2">${ ', '.join([ tax.name or '' for tax in line.taxes_id ])}</td>319 <td class="amount main_col6">${formatLang(line.price_unit, digits=get_digits(dp='Purchase Price'))}</td>
316 <td style="text-align:center" class="main_col3">${formatLang(line.date_planned, date=True)}</td>320 <td class="amount main_col7">${formatLang(line.price_subtotal, digits=get_digits(dp='Purchase Price'))} ${purch.pricelist_id.currency_id.symbol}</td>
317 <td class="amount main_col4">${line.product_qty}</td>321 </tr>
318 <td class="main_col5">${line.product_uom.name}</td>
319 <td class="amount main_col6">${formatLang(line.price_unit, digits=get_digits(dp='Purchase Price'))}</td>
320 <td class="amount main_col7">${formatLang(line.price_subtotal, digits=get_digits(dp='Purchase Price'))} ${purch.pricelist_id.currency_id.symbol}</td>
321 </tr>
322 </table>
323 </div>
324 </td>
325 </tr>
326 %endfor322 %endfor
327 </tbody>323 </tbody>
328 <tfoot class="totals">324 <tfoot class="totals">
329 <tr>325 <tr class="list_main_footers">
330 <td class="list_main_footers" style="width: 100%">326 <td colspan="5" class="total_empty_cell"/>
331 <div class="nobreak">327 <td style="font-weight:bold; text-align: right">
332 <table style="width:100%">328 ${_("Net :")}
333 <tr>329 </td>
334 <td class="total_empty_cell"/>330 <td class="amount total_sum_cell">
335 <th>331 ${formatLang(purch.amount_untaxed, digits=get_digits(dp='Purchase Price'))} ${purch.pricelist_id.currency_id.symbol}
336 ${_("Net :")}332 </td>
337 </th>333 </tr>
338 <td class="amount total_sum_cell">334 <tr class="list_main_footers">
339 ${formatLang(purch.amount_untaxed, digits=get_digits(dp='Purchase Price'))} ${purch.pricelist_id.currency_id.symbol}335 <td colspan="5" class="total_empty_cell"/>
340 </td>336 <td style="font-weight:bold; text-align: right">
341 </tr>337 ${_("Taxes:")}
342 <tr>338 </td>
343 <td class="total_empty_cell"/>339 <td class="amount total_sum_cell">
344 <th>340 ${formatLang(purch.amount_tax, digits=get_digits(dp='Purchase Price'))} ${purch.pricelist_id.currency_id.symbol}
345 ${_("Taxes:")}341 </td>
346 </th>342 </tr>
347 <td class="amount total_sum_cell">343 <tr class="list_main_footers">
348 ${formatLang(purch.amount_tax, digits=get_digits(dp='Purchase Price'))} ${purch.pricelist_id.currency_id.symbol}344 <td colspan="5" class="total_empty_cell"/>
349 </td>345 <td style="font-weight:bold; text-align: right">
350 </tr>346 ${_("Total:")}
351 <tr>347 </td>
352 <td class="total_empty_cell"/>348 <td class="amount total_sum_cell">
353 <th>349 ${formatLang(purch.amount_total, digits=get_digits(dp='Purchase Price'))} ${purch.pricelist_id.currency_id.symbol}
354 ${_("Total:")}350 </td>
355 </th>351 </tr>
356 <td class="amount total_sum_cell">
357 ${formatLang(purch.amount_total, digits=get_digits(dp='Purchase Price'))} ${purch.pricelist_id.currency_id.symbol}
358 </td>
359 </tr>
360 </table>
361 </div>
362 </td>
363 </tr>
364 </tfoot>352 </tfoot>
365 </table>353 </table>
366 <p style="page-break-after:always"/>354 <p style="page-break-after:always"/>
367355
=== modified file 'purchase_order_webkit/report/request_quotation.mako'
--- purchase_order_webkit/report/request_quotation.mako 2014-04-17 10:55:08 +0000
+++ purchase_order_webkit/report/request_quotation.mako 2014-06-20 07:13:28 +0000
@@ -43,7 +43,7 @@
43 border-style: none;43 border-style: none;
44 text-align:left;44 text-align:left;
45 font-size:12;45 font-size:12;
46 padding:0;46 border-bottom:thin solid #EEEEEE
47}47}
48.list_main_footers th {48.list_main_footers th {
49 text-align:right;49 text-align:right;
@@ -274,34 +274,20 @@
274 <h3 style="clear:both; padding-top: 20px;">${_("Request for Quotation:")} ${purch.name}</h3>274 <h3 style="clear:both; padding-top: 20px;">${_("Request for Quotation:")} ${purch.name}</h3>
275 <table class="list_main_table" width="100%" >275 <table class="list_main_table" width="100%" >
276 <thead>276 <thead>
277 <tr>277 <tr class="list_main_headers">
278 <th class="list_main_headers" style="width: 100%">278 <th class="main_col1">${_("Description")}</th>
279 <table style="width:100%">279 <th class="main_col3">${_("Expected Date")}</th>
280 <tr>280 <th style="text-align:center" class="amount main_col4">${_("Qty")}</th>
281 <th class="main_col1">${_("Description")}</th>281 </tr>
282 <th class="main_col3">${_("Expected Date")}</th>
283 <th style="text-align:center" class="amount main_col4">${_("Qty")}</th>
284 </tr>
285 </table>
286 </th>
287 </tr>
288 </thead>282 </thead>
289 <tbody>283 <tbody>
290 <tr>284 %for line in purch.order_line :
291 <td class="list_main_lines" style="width: 100%">285 <tr class="line list_main_lines">
292 <div class="nobreak">286 <td class="main_col1"><div class="nobreak">${line.name.replace('\n','<br/>') or '' | n}</div></td>
293 <table style="width:100%">287 <td style="text-align:center" class="main_col3">${formatLang(line.date_planned, date=True)}</td>
294 %for line in purch.order_line :288 <td class="amount main_col4">${line.product_qty} ${line.product_uom and line.product_uom.name or ''}</td>
295 <tr class="line">289 </tr>
296 <td class="main_col1">${line.name.replace('\n','<br/>') or '' | n}</td>290 %endfor
297 <td style="text-align:center" class="main_col3">${formatLang(line.date_planned, date=True)}</td>
298 <td class="amount main_col4">${line.product_qty} ${line.product_uom and line.product_uom.name or ''}</td>
299 </tr>
300 %endfor
301 </table>
302 </div>
303 </td>
304 </tr>
305 </tbody>291 </tbody>
306 </table>292 </table>
307293

Subscribers

People subscribed via source and target branches