← Back to team overview

openerp-community-reviewer team mailing list archive

lp:~camptocamp/purchase-report/purchase_report_port_date_planned_fix_vre into lp:purchase-report

 

Vincent Renaville@camptocamp has proposed merging lp:~camptocamp/purchase-report/purchase_report_port_date_planned_fix_vre into lp:purchase-report.

Requested reviews:
  Purchase Core Editors (purchase-core-editors)

For more details, see:
https://code.launchpad.net/~camptocamp/purchase-report/purchase_report_port_date_planned_fix_vre/+merge/202640

This change the line from date-order to date_planned in line
-- 
https://code.launchpad.net/~camptocamp/purchase-report/purchase_report_port_date_planned_fix_vre/+merge/202640
Your team Purchase Core Editors is requested to review the proposed merge of lp:~camptocamp/purchase-report/purchase_report_port_date_planned_fix_vre into lp:purchase-report.
=== modified file 'purchase_order_webkit/report/purchase_order.mako'
--- purchase_order_webkit/report/purchase_order.mako	2014-01-15 08:25:48 +0000
+++ purchase_order_webkit/report/purchase_order.mako	2014-01-22 10:42:45 +0000
@@ -299,7 +299,7 @@
                   <tr>
                     <td class="main_col1">${line.name}</td>
                     <td style="text-align:center" class="main_col2">${ ', '.join([ tax.name or '' for tax in line.taxes_id ])}</td>
-                    <td style="text-align:center" class="main_col3">${formatLang(line.date_order, date=True)}</td>
+                    <td style="text-align:center" class="main_col3">${formatLang(line.date_planned, date=True)}</td>
                     <td class="amount main_col4">${line.product_qty}</td>
                     <td class="main_col5">${line.product_uom.name}</td>
                     <td class="amount main col6">${formatLang(line.price_unit, digits=get_digits(dp='Purchase Price'))}</td>

=== modified file 'purchase_order_webkit_with_notes/report/purchase_order.mako'
--- purchase_order_webkit_with_notes/report/purchase_order.mako	2014-01-17 15:26:14 +0000
+++ purchase_order_webkit_with_notes/report/purchase_order.mako	2014-01-22 10:42:45 +0000
@@ -302,7 +302,7 @@
                   <tr>
                     <td class="main_col1">${line.name}</td>
                     <td style="text-align:center" class="main_col2">${ ', '.join([ tax.name or '' for tax in line.taxes_id ])}</td>
-                    <td style="text-align:center" class="main_col3">${formatLang(line.date_order, date=True)}</td>
+                    <td style="text-align:center" class="main_col3">${formatLang(line.date_planned, date=True)}</td>
                     <td class="amount main_col4">${line.product_qty}</td>
                     <td class="main_col5">${line.product_uom.name}</td>
                     <td class="amount main col6">${formatLang(line.price_unit, digits=get_digits(dp='Purchase Price'))}</td>


Follow ups