Merge lp:~sylvain-legal/openobject-addons/7.0-fix-bug-1240963-add-due-date-on-account-invoice-report into lp:openobject-addons/7.0

[Sylvain LE GAL (GRAP)]

[FIX] Add account_invoice.due_date on rml report 'account_print_invoice'.

This branch aims to fix the bug #1240963 adding the due date on invoice report.

Thanks for your reviews.

[Amit Parik (amit-parik)]

Hello,

Better If you makes the changes on .SXW file, because If someone wants to edit report via openoffice plugin then rml changes won't usable.

Please make relavent changes on SXW too.

Thank you!

review: Needs Fixing

[Sylvain LE GAL (GRAP) (sylvain-legal)]

Hello,

Thanks a lot, i didn't see that. I'll work on it.

[lp:~sylvain-legal/openobject-addons/7.0-fix-bug-1240963-add-due-date-on-account-invoice-report]

9529. By Sylvain LE GAL (GRAP) on 2013-10-17

[FIX] fixing the bug in the sxw file too, courtesy of Amit Parik.

[Sylvain LE GAL (GRAP) (sylvain-legal)]

Hello,

I did modifications in the sxw file too.
By the Way, in the rml file, there was 4 column and I added 1 (due_date)
In the sxw file, there was only 3 columns.
('Source' column based on account_invoice.origin wasn't present, so I added it too).

Best regards.

[Amit Parik (amit-parik)]

Hello Sylvain,

Thanks you very much!

review: Approve

[Sylvain LE GAL (GRAP) (sylvain-legal)]

Hi,

I wanna to know If these was something wrong in my Merge Proposal.
I propose it one month ago, but there is no change on the status.

I'm ready to change the code if there is some change to do.

Thanks a lot for your answer.

Regards.

[Fabien (Open ERP) (fp-tinyerp)]

Sylvain,

We can not merge it because:

  - it's a new feature, it's not a bug (only bug fixes are allowed on a stable branch as people use it in production and we can not change the behaviour of their server used in production) --> this MP should better be in trunk
  - it's not correct; we display the payment term and not the due date on the invoice report because payment terms can be more complex than just a date. (30% within 20 days, the balance within 60 days) The due date on an invoice is there for information purpose; the real information come from the payment term. If we put both on the invice report, this can be confusing for the customer.

Sorry if we are late reviewing MP, we have a huge backlog to process.

review: Disapprove

[Fabien (Open ERP) (fp-tinyerp)]

More over, it's better not to port such a change to trunk as we are reviewing all reports in trunk to port them to web/webkit instead of RML/reportlab.

[Sylvain LE GAL (GRAP) (sylvain-legal)]

Fabien,

Thanks a lot for your complete answer.

I'm agree with your remarks on payment terms. I didn't see that because I only use basic payment terms in my company.

About your last comment (the format of the reports), does exist some doc in openerp.com that describe this kind of decision ? (like leave "rml" report and use "webkit" report)
I searched in https://doc.openerp.com/contribute/15_guidelines/ and https://doc.openerp.com/v6.1/developer/05_reports/ but I didn't found.

If it doesn't exist, this kind of guidelines could very usefull for the community to avoid developing new modules with "obsolete" / "no desired" technologies.

Regards.

Unmerged revisions

9529. By Sylvain LE GAL (GRAP) on 2013-10-17

[FIX] fixing the bug in the sxw file too, courtesy of Amit Parik.

9528. By Sylvain LE GAL (GRAP) on 2013-10-17

[FIX] Add account_invoice.due_date on rml report 'account_print_invoice'.

=== modified file 'account/i18n/fr.po'
--- account/i18n/fr.po	2013-08-30 05:25:00 +0000
+++ account/i18n/fr.po	2013-10-17 17:09:45 +0000
@@ -9306,6 +9306,7 @@
 #: view:account.invoice.report:0
 #: field:account.invoice.report,date_due:0
 #: field:report.invoice.created,date_due:0
+#: report:account.invoice:0
 msgid "Due Date"
 msgstr "Date d'échéance"
 

=== modified file 'account/report/account_print_invoice.rml'
--- account/report/account_print_invoice.rml	2013-05-27 16:30:46 +0000
+++ account/report/account_print_invoice.rml	2013-10-17 17:09:45 +0000
@@ -31,6 +31,10 @@
       <lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="3,0" stop="3,-1"/>
       <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="3,0" stop="3,0"/>
       <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="3,-1" stop="3,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="4,0" stop="4,-1"/>
+      <lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="4,0" stop="4,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="4,0" stop="4,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="4,-1" stop="4,-1"/>
     </blockTableStyle>
     <blockTableStyle id="Table_General_Detail_Content">
       <blockAlignment value="LEFT"/>
@@ -49,6 +53,10 @@
       <lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="3,0" stop="3,-1"/>
       <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="3,0" stop="3,0"/>
       <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="3,-1" stop="3,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="4,0" stop="4,-1"/>
+      <lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="4,0" stop="4,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="4,0" stop="4,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="4,-1" stop="4,-1"/>
     </blockTableStyle>
     <blockTableStyle id="Table7">
       <blockAlignment value="LEFT"/>
@@ -179,7 +187,7 @@
     <para style="terp_default_8">
       <font color="white"> </font>
     </para>
-    <blockTable colWidths="132.50,132.50,132.50,132.50" style="Table_Invoice_General_Header">
+    <blockTable colWidths="106,106,106,106,106" style="Table_Invoice_General_Header">
       <tr>
         <td>
           <para style="terp_tblheader_General_Centre"><b>Description</b></para>
@@ -188,6 +196,9 @@
           <para style="terp_tblheader_General_Centre"><b>Invoice Date</b></para>
         </td>
         <td>
+          <para style="terp_tblheader_General_Centre"><b>Due Date</b></para>
+        </td>
+    <td>
           <para style="terp_tblheader_General_Centre"><b>Source</b></para>
         </td>
         <td>
@@ -195,7 +206,7 @@
         </td>
       </tr>
     </blockTable>
-    <blockTable colWidths="132.50,132.50,132.50,132.50" style="Table_General_Detail_Content">
+    <blockTable colWidths="106,106,106,106,106" style="Table_General_Detail_Content">
       <tr>
         <td>
           <para style="terp_default_Centre_9">[[ o.name or ' ' ]]</para>
@@ -203,6 +214,9 @@
         <td>
           <para style="terp_default_Centre_9">[[ formatLang(o.date_invoice,date=True) ]]</para>
         </td>
+        <td>
+          <para style="terp_default_Centre_9">[[ formatLang(o.date_due,date=True) ]]</para>
+        </td>
     <td>
           <para style="terp_default_Centre_9">[[ o.origin or '' ]]</para>
         </td>

=== modified file 'account/report/account_print_invoice.sxw'
Binary files account/report/account_print_invoice.sxw	2013-09-02 11:49:40 +0000 and account/report/account_print_invoice.sxw	2013-10-17 17:09:45 +0000 differ