ARA(OpenERP) has proposed merging lp:~openerp-commiter/openobject-addons/trunk-dev-addons3-ara into lp:~openerp-dev/openobject-addons/trunk-dev-addons3.
Requested reviews: OpenERP R&D Team (openerp-dev) Related bugs: #615522 Report Of Invoice : Payment Term + Due date not printed https://bugs.launchpad.net/bugs/615522 #649029 [sale] incoterm field poorly implemented [direct sql / not translatable] https://bugs.launchpad.net/bugs/649029 hello, I have add payment term and due date in invoice report and intrastate report. thank you, ara -- https://code.launchpad.net/~openerp-commiter/openobject-addons/trunk-dev-addons3-ara/+merge/40699 Your team OpenERP R&D Team is requested to review the proposed merge of lp:~openerp-commiter/openobject-addons/trunk-dev-addons3-ara into lp:~openerp-dev/openobject-addons/trunk-dev-addons3.
=== modified file 'account/report/account_print_invoice.rml' --- account/report/account_print_invoice.rml 2010-10-14 10:14:59 +0000 +++ account/report/account_print_invoice.rml 2010-11-12 09:41:19 +0000 @@ -1,6 +1,6 @@ <?xml version="1.0"?> -<document filename="Invoices.pdf"> - <template pageSize="(595.0,842.0)" title="Invoices" author="OpenERP S.A.([email protected])" allowSplitting="20"> +<document filename="test.pdf"> + <template pageSize="(595.0,842.0)" title="Test" author="Martin Simon" allowSplitting="20"> <pageTemplate id="first"> <frame id="first" x1="34.0" y1="28.0" width="530" height="786"/> </pageTemplate> @@ -24,9 +24,15 @@ <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="1,0" stop="1,0"/> <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/> <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="2,0" stop="2,-1"/> - <lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="2,0" stop="2,-1"/> <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="2,0" stop="2,0"/> <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="2,-1" stop="2,-1"/> + <lineStyle kind="LINEBEFORE" 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"/> @@ -38,9 +44,15 @@ <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="1,0" stop="1,0"/> <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/> <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="2,0" stop="2,-1"/> - <lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="2,0" stop="2,-1"/> <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="2,0" stop="2,0"/> <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="2,-1" stop="2,-1"/> + <lineStyle kind="LINEBEFORE" 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"/> @@ -165,7 +177,7 @@ <para style="terp_default_8"> <font color="white"> </font> </para> - <blockTable colWidths="177.0,177.0,177.0" style="Table_Invoice_General_Header"> + <blockTable colWidths="106.0,106.0,106.0,106.0,106.0" style="Table_Invoice_General_Header"> <tr> <td> <para style="terp_tblheader_General_Centre">Document</para> @@ -174,11 +186,17 @@ <para style="terp_tblheader_General_Centre">Invoice Date</para> </td> <td> + <para style="terp_tblheader_General_Centre">Due Date</para> + </td> + <td> + <para style="terp_tblheader_General_Centre">Payment Term</para> + </td> + <td> <para style="terp_tblheader_General_Centre">Partner Ref.</para> </td> </tr> </blockTable> - <blockTable colWidths="177.0,177.0,177.0" style="Table_General_Detail_Content"> + <blockTable colWidths="106.0,106.0,106.0,106.0,106.0" style="Table_General_Detail_Content"> <tr> <td> <para style="terp_default_Centre_9">[[ o.name or ' ' ]]</para> @@ -187,6 +205,12 @@ <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.payment_term.name or ' ' ]]</para> + </td> + <td> <para style="terp_default_Centre_9">[[ (o.address_invoice_id and o.address_invoice_id.partner_id and o.address_invoice_id.partner_id.ref) or ' ' ]]</para> </td> </tr> @@ -379,4 +403,4 @@ <font color="white"> </font> </para> </story> -</document> \ No newline at end of file +</document> === modified file 'account/report/account_print_invoice.sxw' Binary files account/report/account_print_invoice.sxw 2010-10-14 10:14:59 +0000 and account/report/account_print_invoice.sxw 2010-11-12 09:41:19 +0000 differ === modified file 'report_intrastat/report/invoice.rml' --- report_intrastat/report/invoice.rml 2010-10-15 10:57:57 +0000 +++ report_intrastat/report/invoice.rml 2010-11-12 09:41:19 +0000 @@ -24,9 +24,16 @@ <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="1,0" stop="1,0"/> <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/> <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="2,0" stop="2,-1"/> - <lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="2,0" stop="2,-1"/> <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="2,0" stop="2,0"/> - <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="2,-1" stop="2,-1"/> + <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="2,-1" stop="2,-1"/> + <lineStyle kind="LINEBEFORE" 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"/> @@ -38,9 +45,16 @@ <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="1,0" stop="1,0"/> <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/> <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="2,0" stop="2,-1"/> - <lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="2,0" stop="2,-1"/> <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="2,0" stop="2,0"/> <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="2,-1" stop="2,-1"/> + <lineStyle kind="LINEBEFORE" 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_Header_Invoice_Line"> <blockAlignment value="LEFT"/> @@ -271,7 +285,7 @@ <para style="terp_default_8"> <font color="white"> </font> </para> - <blockTable colWidths="177.0,177.0,177.0" style="Table_Invoice_General_Header"> + <blockTable colWidths="106.0,106.0,106.0,106.0,106.0" style="Table_Invoice_General_Header"> <tr> <td> <para style="terp_tblheader_General_Centre">Document</para> @@ -280,20 +294,32 @@ <para style="terp_tblheader_General_Centre">Invoice Date</para> </td> <td> + <para style="terp_tblheader_General_Centre">Due Date</para> + </td> + <td> + <para style="terp_tblheader_General_Centre">Payment Term</para> + </td> + <td> <para style="terp_tblheader_General_Centre">Partner Ref.</para> </td> </tr> </blockTable> - <blockTable colWidths="177.0,177.0,177.0" style="Table_General_Detail_Content"> + <blockTable colWidths="106.0,106.0,106.0,106.0,106.0" style="Table_General_Detail_Content"> <tr> <td> - <para style="terp_default_Centre_9">[[ o.name ]]</para> + <para style="terp_default_Centre_9">[[ o.name or ' ' ]]</para> </td> <td> <para style="terp_default_Centre_9">[[ formatLang(o.date_invoice,date=True) ]]</para> </td> <td> - <para style="terp_default_Centre_9">[[ o.address_invoice_id.partner_id.ref or '' ]]</para> + <para style="terp_default_Centre_9">[[ formatLang(o.date_due,date=True) ]]</para> + </td> + <td> + <para style="terp_default_Centre_9">[[ o.payment_term.name or ' ' ]]</para> + </td> + <td> + <para style="terp_default_Centre_9">[[ (o.address_invoice_id and o.address_invoice_id.partner_id and o.address_invoice_id.partner_id.ref) or ' ' ]]</para> </td> </tr> </blockTable> === modified file 'report_intrastat/report/invoice.sxw' Binary files report_intrastat/report/invoice.sxw 2009-03-05 12:52:29 +0000 and report_intrastat/report/invoice.sxw 2010-11-12 09:41:19 +0000 differ
_______________________________________________ Mailing list: https://launchpad.net/~openerp-dev-gtk Post to : [email protected] Unsubscribe : https://launchpad.net/~openerp-dev-gtk More help : https://help.launchpad.net/ListHelp
