Purchase - Reports

Merge lp:~camptocamp/purchase-report/purchase_report_port_date_planned_fix_vre into lp:~purchase-core-editors/purchase-report/7.0

  1. purchase_report_port_date_planned_fix_vre
  2. Merge into 7.0
Proposed by Vincent Renaville@camptocamp
Status: Merged
Approved by: Yannick Vaucher @ Camptocamp
Approved revision: 14
Merged at revision: 14
Proposed branch: lp:~camptocamp/purchase-report/purchase_report_port_date_planned_fix_vre
Merge into: lp:~purchase-core-editors/purchase-report/7.0
Diff against target: 25 lines (+2/-2)
2 files modified
purchase_order_webkit/report/purchase_order.mako (+1/-1)
purchase_order_webkit_with_notes/report/purchase_order.mako (+1/-1)
To merge this branch: bzr merge lp:~camptocamp/purchase-report/purchase_report_port_date_planned_fix_vre
Reviewer Review Type Date Requested Status
Yannick Vaucher @ Camptocamp code review, no tests Approve
Nicolas Bessi - Camptocamp (community) Approve
Joël Grand-Guillaume @ camptocamp code review, no tests Approve
Review via email: mp+202640@code.launchpad.net

Description of the change

This change the line from date-order to date_planned in line

To post a comment you must log in.
Revision history for this message
Joël Grand-Guillaume @ camptocamp (jgrandguillaume-c2c) wrote :

LGTM, thanks for the contribs

review: Approve (code review, no tests)
Revision history for this message
Nicolas Bessi - Camptocamp (nbessi-c2c-deactivatedaccount) wrote :

LGTM

review: Approve
Revision history for this message
Yannick Vaucher @ Camptocamp (yvaucher-c2c) wrote :

LGTM

review: Approve (code review, no tests)

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-01-15 08:25:48 +0000
3+++ purchase_order_webkit/report/purchase_order.mako 2014-01-22 10:42:45 +0000
4@@ -299,7 +299,7 @@
5 <tr>
6 <td class="main_col1">${line.name}</td>
7 <td style="text-align:center" class="main_col2">${ ', '.join([ tax.name or '' for tax in line.taxes_id ])}</td>
8- <td style="text-align:center" class="main_col3">${formatLang(line.date_order, date=True)}</td>
9+ <td style="text-align:center" class="main_col3">${formatLang(line.date_planned, date=True)}</td>
10 <td class="amount main_col4">${line.product_qty}</td>
11 <td class="main_col5">${line.product_uom.name}</td>
12 <td class="amount main col6">${formatLang(line.price_unit, digits=get_digits(dp='Purchase Price'))}</td>
13
14=== modified file 'purchase_order_webkit_with_notes/report/purchase_order.mako'
15--- purchase_order_webkit_with_notes/report/purchase_order.mako 2014-01-17 15:26:14 +0000
16+++ purchase_order_webkit_with_notes/report/purchase_order.mako 2014-01-22 10:42:45 +0000
17@@ -302,7 +302,7 @@
18 <tr>
19 <td class="main_col1">${line.name}</td>
20 <td style="text-align:center" class="main_col2">${ ', '.join([ tax.name or '' for tax in line.taxes_id ])}</td>
21- <td style="text-align:center" class="main_col3">${formatLang(line.date_order, date=True)}</td>
22+ <td style="text-align:center" class="main_col3">${formatLang(line.date_planned, date=True)}</td>
23 <td class="amount main_col4">${line.product_qty}</td>
24 <td class="main_col5">${line.product_uom.name}</td>
25 <td class="amount main col6">${formatLang(line.price_unit, digits=get_digits(dp='Purchase Price'))}</td>

Subscribers

People subscribed via source and target branches