diff options
| author | qdp-launchpad@tinyerp.com <> | 2010-11-12 17:58:02 +0100 |
|---|---|---|
| committer | qdp-launchpad@tinyerp.com <> | 2010-11-12 17:58:02 +0100 |
| commit | dd856bd4fd6256fa500cfd1fc5844b1ced9e8686 (patch) | |
| tree | f1509af9b4080f79d84edadd3c8365929d2949a9 | |
| parent | 9566084f4588118ec566b80948d30dffa7f68415 (diff) | |
| parent | 67e41070a1997a92628d7f62b93d6ee70f75267a (diff) | |
[MERGE] merged the report team branch
bzr revid: qdp-launchpad@tinyerp.com-20101112165802-wnhaqyjpmesh01d6
96 files changed, 1229 insertions, 1271 deletions
diff --git a/addons/account/__openerp__.py b/addons/account/__openerp__.py index b0ef5bc6641..c170076cfc8 100644 --- a/addons/account/__openerp__.py +++ b/addons/account/__openerp__.py @@ -119,7 +119,7 @@ module named account_voucher. 'project/project_demo.xml', 'project/analytic_account_demo.xml', 'demo/account_minimal.xml', - #'account_unit_test.xml', +# 'account_unit_test.xml', ], 'test': [ 'test/account_customer_invoice.yml', diff --git a/addons/account/board_account_view.xml b/addons/account/board_account_view.xml index f6de415fd9a..528d986d729 100644 --- a/addons/account/board_account_view.xml +++ b/addons/account/board_account_view.xml @@ -44,7 +44,7 @@ <form string="Account Board"> <hpaned> <child1> - <action colspan="4" height="160" width="400" name="%(account.action_invoice_tree1)d" string="Customer Invoices to Validate" domain="[('state','=','draft'),('type','=','out_invoice')]"/> + <action colspan="4" height="160" width="400" name="%(account.action_invoice_tree1)d" string="Customer Invoices to Approve" domain="[('state','=','draft'),('type','=','out_invoice')]"/> <action colspan="4" height="160" width="400" name="%(action_company_analysis_tree)d" string="Company Analysis" /> </child1> <child2> diff --git a/addons/account/project/report/analytic_balance.rml b/addons/account/project/report/analytic_balance.rml index bbd7e409dc0..77182b5bb9f 100644 --- a/addons/account/project/report/analytic_balance.rml +++ b/addons/account/project/report/analytic_balance.rml @@ -1,8 +1,8 @@ <?xml version="1.0"?> -<document filename="test.pdf"> - <template pageSize="(595.0,842.0)" title="Analytic Balance" author="OpenERP S.A. (sales@openerp.com)" allowSplitting="20"> +<document filename="Analytic Balance.pdf"> + <template pageSize="(595.0,842.0)" title="Analytic Balance" author="OpenERP S.A.(sales@openerp.com)" allowSplitting="20"> <pageTemplate id="first"> - <frame id="first" x1="57.0" y1="57.0" width="481" height="728"/> + <frame id="first" x1="31.0" y1="30.0" width="531" height="779"/> </pageTemplate> </template> <stylesheet> @@ -34,13 +34,13 @@ <lineStyle kind="LINEBELOW" colorName="#000000" start="4,-1" stop="4,-1"/> <lineStyle kind="LINEBELOW" colorName="#000000" start="5,-1" stop="5,-1"/> </blockTableStyle> - <blockTableStyle id="Table3"> + <blockTableStyle id="Table2"> <blockAlignment value="LEFT"/> <blockValign value="TOP"/> <lineStyle kind="LINEBELOW" colorName="#b3b3b3" start="0,-1" stop="0,-1"/> <lineStyle kind="LINEBELOW" colorName="#b3b3b3" start="1,-1" stop="1,-1"/> </blockTableStyle> - <blockTableStyle id="Table2"> + <blockTableStyle id="Table3"> <blockAlignment value="LEFT"/> <blockValign value="TOP"/> <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/> @@ -88,7 +88,33 @@ <images/> </stylesheet> <story> - <blockTable colWidths="482.0" style="Table_Header_analytic"> + <pto> + <pto_header> + <blockTable colWidths="57.0,192.0,71.0,71.0,71.0,71.0" style="Table_Header_Tile"> + <tr> + <td> + <para style="terp_tblheader_Details">Code</para> + </td> + <td> + <para style="terp_tblheader_Details">Account Name</para> + </td> + <td> + <para style="terp_tblheader_Details_Right">Debit</para> + </td> + <td> + <para style="terp_tblheader_Details_Right">Credit</para> + </td> + <td> + <para style="terp_tblheader_Details_Right">Balance</para> + </td> + <td> + <para style="terp_tblheader_Details_Right">Quantity</para> + </td> + </tr> + </blockTable> + </pto_header> + + <blockTable colWidths="532.0" style="Table_Header_analytic"> <tr> <td> <para style="terp_header_Centre">Analytic Balance - [[ company.currency_id.name ]]</para> @@ -98,7 +124,7 @@ <para style="terp_default_space"> <font color="white"> </font> </para> - <blockTable colWidths="55.0,221.0,55.0,52.0,60.0,39.0" style="Table_Header_Tile"> + <blockTable colWidths="57.0,192.0,71.0,71.0,71.0,71.0" style="Table_Header_Tile"> <tr> <td> <para style="terp_tblheader_Details">Code</para> @@ -120,24 +146,21 @@ </td> </tr> </blockTable> - <para style="terp_default_2"> - <font color="white"> </font> - </para> - <blockTable colWidths="54.0,222.0,56.0,51.0,62.0,38.0" style="Table1"> + <blockTable colWidths="57.0,192.0,71.0,71.0,71.0,71.0" style="Table1"> <tr> <td> <para style="terp_tblheader_Details">Total</para> </td> <td> <para style="terp_tblheader_Details"> - <font color="white"></font> + <font color="white"> </font> </para> </td> <td> - <para style="terp_tblheader_Details_Right">[[ formatLang(sum_all(get_objects(data['form']['empty_acc']),data['form']['date1'],data['form']['date2'],'debit')) ]]</para> + <para style="terp_tblheader_Details_Right">[[ formatLang(sum_all(get_objects(data['form']['empty_acc']),data['form']['date1'],data['form']['date2'],'debit')) ]] </para> </td> <td> - <para style="terp_tblheader_Details_Right">[[ formatLang(sum_all(get_objects(data['form']['empty_acc']),data['form']['date1'],data['form']['date2'],'credit')) ]]</para> + <para style="terp_tblheader_Details_Right">[[ formatLang(sum_all(get_objects(data['form']['empty_acc']),data['form']['date1'],data['form']['date2'],'credit')) ]] </para> </td> <td> <para style="terp_tblheader_Details_Right">[[ formatLang(sum_balance(get_objects(data['form']['empty_acc']),data['form']['date1'],data['form']['date2'])) ]] [[ company.currency_id.symbol]]</para> @@ -148,8 +171,8 @@ </tr> </blockTable> <section> - <para style="terp_default_8">[[ repeatIn(get_objects(data['form']['empty_acc']),'o') ]]</para> - <blockTable colWidths="55.0,221.0,56.0,50.0,62.0,38.0" style="Table3"> + <para style="terp_default_2">[[ repeatIn(get_objects(data['form']['empty_acc']),'o') ]]</para> + <blockTable colWidths="57.0,192.0,71.0,71.0,71.0,71.0" style="Table2"> <tr> <td> <para style="terp_default_Bold_9">[[ o['code'] ]]</para> @@ -158,10 +181,10 @@ <para style="terp_default_Bold_9">[[ o['complete_name'] ]]</para> </td> <td> - <para style="terp_default_Right_9_Bold">[[ formatLang(move_sum(o['id'],data['form']['date1'],data['form']['date2'],'debit')) ]]</para> + <para style="terp_default_Right_9_Bold">[[ formatLang(move_sum(o['id'],data['form']['date1'],data['form']['date2'],'debit')) ]] </para> </td> <td> - <para style="terp_default_Right_9_Bold">[[ formatLang(move_sum(o['id'],data['form']['date1'],data['form']['date2'],'credit')) ]]</para> + <para style="terp_default_Right_9_Bold">[[ formatLang(move_sum(o['id'],data['form']['date1'],data['form']['date2'],'credit')) ]] </para> </td> <td> <para style="terp_default_Right_9_Bold">[[ formatLang(move_sum_balance(o['id'],data['form']['date1'],data['form']['date2'])) ]] [[ company.currency_id.symbol]]</para> @@ -171,12 +194,9 @@ </td> </tr> </blockTable> - <para style="terp_default_2"> - <font color="white"> </font> - </para> <section> - <para style="terp_default_8">[[ repeatIn(lines_g(o['id'],data['form']['date1'],data['form']['date2']),'move_g') ]]</para> - <blockTable colWidths="55.0,222.0,56.0,49.0,63.0,37.0" style="Table2"> + <para style="terp_default_2">[[ repeatIn(lines_g(o['id'],data['form']['date1'],data['form']['date2']),'move_g') ]]</para> + <blockTable colWidths="57.0,192.0,71.0,71.0,71.0,71.0" style="Table3"> <tr> <td> <para style="terp_default_9">[[ move_g['code'] ]]</para> @@ -188,7 +208,7 @@ <para style="terp_default_Right_9">[[ formatLang(move_g['debit'])]] </para> </td> <td> - <para style="terp_default_Right_9">[[ formatLang(move_g['credit']) ]]</para> + <para style="terp_default_Right_9">[[ formatLang(move_g['credit']) ]] </para> </td> <td> <para style="terp_default_Right_9">[[ formatLang(move_g['balance'])]] [[ company.currency_id.symbol ]]</para> @@ -202,21 +222,13 @@ <font color="white"> </font> </para> </section> - <para style="terp_default_2"> - <font color="white"> </font> - </para> </section> <para style="terp_default_9"> <font color="white"> </font> </para> - <para style="terp_default_9"> - <font color="white"> </font> - </para> - <para style="terp_default_9"> - <font color="white"> </font> - </para> <para style="Standard"> <font color="white"> </font> </para> + </pto> </story> </document>
\ No newline at end of file diff --git a/addons/account/project/report/cost_ledger.rml b/addons/account/project/report/cost_ledger.rml index a59e95724d0..90ff16be217 100644 --- a/addons/account/project/report/cost_ledger.rml +++ b/addons/account/project/report/cost_ledger.rml @@ -1,8 +1,8 @@ <?xml version="1.0"?> -<document filename="test.pdf"> - <template pageSize="(595.0,842.0)" title="Cost Ledger" author="OpenERP S.A. (sales@openerp.com)" allowSplitting="20"> +<document filename="Cost Ledger.pdf"> + <template pageSize="(595.0,842.0)" title="Cost Ledger" author="OpenERP S.A.(sales@openerp.com)" allowSplitting="20"> <pageTemplate id="first"> - <frame id="first" x1="57.0" y1="57.0" width="481" height="728"/> + <frame id="first" x1="28.0" y1="30.0" width="539" height="785"/> </pageTemplate> </template> <stylesheet> @@ -120,7 +120,29 @@ <images/> </stylesheet> <story> - <blockTable colWidths="161.0,161.0,161.0" repeatRows="1" style="Table1"> + <pto> + <pto_header> + <blockTable colWidths="53.0,276.0,70.0,71.0,68.0" style="Table_Header_Title"> + <tr> + <td> + <para style="terp_tblheader_Details">Date/Code</para> + </td> + <td> + <para style="terp_tblheader_Details">J.C. /Move name</para> + </td> + <td> + <para style="terp_tblheader_Details_Right">Debit</para> + </td> + <td> + <para style="terp_tblheader_Details_Right">Credit</para> + </td> + <td> + <para style="terp_tblheader_Details_Right">Balance</para> + </td> + </tr> + </blockTable> + </pto_header> + <blockTable colWidths="179.0,179.0,180.0" repeatRows="1" style="Table1"> <tr> <td> <para style="terp_default_9"> @@ -137,7 +159,7 @@ </td> </tr> </blockTable> - <blockTable colWidths="161.0,161.0,161.0" style="Table_Date_Sub_detail"> + <blockTable colWidths="179.0,179.0,179.0" style="Table_Date_Sub_detail"> <tr> <td> <para style="terp_tblheader_General_Centre">Period from </para> @@ -150,7 +172,7 @@ </td> </tr> </blockTable> - <blockTable colWidths="161.0,161.0,161.0" style="Table_Sub_Content"> + <blockTable colWidths="179.0,179.0,179.0" style="Table_Sub_Content"> <tr> <td> <para style="terp_default_Centre_8">[[ formatLang(data['form']['date1'],date = True) ]]</para> @@ -166,7 +188,7 @@ <para style="terp_default_8"> <font color="white"> </font> </para> - <blockTable colWidths="63.0,249.0,57.0,57.0,57.0" style="Table_Header_Title"> + <blockTable colWidths="53.0,276.0,70.0,71.0,68.0" style="Table_Header_Title"> <tr> <td> <para style="terp_tblheader_Details">Date/Code</para> @@ -181,11 +203,11 @@ <para style="terp_tblheader_Details_Right">Credit</para> </td> <td> - <para style="terp_tblheader_Details_Centre">Balance</para> + <para style="terp_tblheader_Details_Right">Balance</para> </td> </tr> </blockTable> - <blockTable colWidths="62.0,250.0,57.0,56.0,57.0" style="Table_Grant_Total"> + <blockTable colWidths="56.0,273.0,70.0,70.0,70.0" style="Table_Grant_Total"> <tr> <td> <para style="terp_default_Bold_9">Total:</para> @@ -208,7 +230,7 @@ </blockTable> <section> <para style="terp_default_2">[[ repeatIn(objects,'o') ]]</para> - <blockTable colWidths="62.0,249.0,57.0,57.0,57.0" style="Table_Account_Detail"> + <blockTable colWidths="56.0,273.0,70.0,70.0,70.0" style="Table_Account_Detail"> <tr> <td> <para style="terp_default_Bold_9">[[ o.code ]]</para> @@ -229,7 +251,7 @@ </blockTable> <section> <para style="terp_default_2">[[ repeatIn(lines_g(o.id,data['form']['date1'],data['form']['date2']),'move_g') ]]</para> - <blockTable colWidths="62.0,249.0,58.0,56.0,57.0" style="Table_Move_Line_Detail"> + <blockTable colWidths="56.0,273.0,70.0,70.0,70.0" style="Table_Move_Line_Detail"> <tr> <td> <para style="terp_default_Bold_9">[[ move_g['code'] ]]</para> @@ -250,7 +272,7 @@ </blockTable> <section> <para style="terp_default_2">[[ repeatIn(lines_a(move_g['id'],o.id,data['form']['date1'],data['form']['date2']),'move_a') ]]</para> - <blockTable colWidths="60.0,46.0,204.0,59.0,55.0,58.0" style="Table_Move_Line_Content"> + <blockTable colWidths="56.0,56.0,217.0,70.0,70.0,70.0" style="Table_Move_Line_Content"> <tr> <td> <para style="terp_default_9_Italic">[[ formatLang(move_a['date'],date = True) ]]</para> @@ -278,5 +300,6 @@ </section> </section> </section> + </pto> </story> </document>
\ No newline at end of file diff --git a/addons/account/project/report/inverted_analytic_balance.rml b/addons/account/project/report/inverted_analytic_balance.rml index 6de2e28d46e..25a79aa63f9 100644 --- a/addons/account/project/report/inverted_analytic_balance.rml +++ b/addons/account/project/report/inverted_analytic_balance.rml @@ -87,6 +87,31 @@ <images/> </stylesheet> <story> + <pto> + <pto_header> + <blockTable colWidths="58.0,238.0,62.0,62.0,60.0,59.0" style="Table_Header_table"> + <tr> + <td> + <para style="terp_tblheader_Details">Code</para> + </td> + <td> + <para style="terp_tblheader_Details">Name</para> + </td> + <td> + <para style="terp_tblheader_Details_Right">Debit</para> + </td> + <td> + <para style="terp_tblheader_Details_Right">Credit</para> + </td> + <td> + <para style="terp_tblheader_Details_Right">Balance</para> + </td> + <td> + <para style="terp_tblheader_Details_Right">Quantity</para> + </td> + </tr> + </blockTable> + </pto_header> <blockTable colWidths="539.0" style="Table_Title"> <tr> <td> @@ -199,5 +224,6 @@ </para> </section> </section> + </pto> </story> </document>
\ No newline at end of file diff --git a/addons/account/project/report/quantity_cost_ledger.rml b/addons/account/project/report/quantity_cost_ledger.rml index 68e391223b4..8d83b9512ab 100644 --- a/addons/account/project/report/quantity_cost_ledger.rml +++ b/addons/account/project/report/quantity_cost_ledger.rml @@ -1,8 +1,8 @@ <?xml version="1.0"?> -<document filename="test.pdf"> - <template pageSize="(595.0,842.0)" title="Cost Ledger" author="OpenERP S.A. (sales@openerp.com)" allowSplitting="20"> +<document filename="Cost Ledger.pdf"> + <template pageSize="(595.0,842.0)" title="Cost Ledger" author="OpenERP S.A.(sales@openerp.com)" allowSplitting="20"> <pageTemplate id="first"> - <frame id="first" x1="57.0" y1="57.0" width="481" height="728"/> + <frame id="first" x1="30.0" y1="29.0" width="534" height="783"/> </pageTemplate> </template> <stylesheet> @@ -117,7 +117,26 @@ <images/> </stylesheet> <story> - <blockTable colWidths="161.0,161.0,161.0" repeatRows="1" style="Table_Header_Detail"> + <pto> + <pto_header> + <blockTable colWidths="57.0,322.0,85.0,71.0" style="Table_Header_Move_Line"> + <tr> + <td> + <para style="terp_tblheader_Details">Code/Date</para> + </td> + <td> + <para style="terp_tblheader_Details">J.C./Move name</para> + </td> + <td> + <para style="terp_tblheader_Details_Centre">Quantity</para> + </td> + <td> + <para style="terp_tblheader_Details_Right">Total</para> + </td> + </tr> + </blockTable> + </pto_header> + <blockTable colWidths="178.0,178.0,178.0" repeatRows="1" style="Table_Header_Detail"> <tr> <td> <para style="terp_default_9"> @@ -134,7 +153,7 @@ </td> </tr> </blockTable> - <blockTable colWidths="161.0,161.0,161.0" style="Table_Date_Detail"> + <blockTable colWidths="178.0,178.0,178.0" style="Table_Date_Detail"> <tr> <td> <para style="terp_tblheader_General_Centre">Period from</para> @@ -147,7 +166,7 @@ </td> </tr> </blockTable> - <blockTable colWidths="161.0,161.0,161.0" style="Table_Date_Content"> + <blockTable colWidths="178.0,178.0,178.0" style="Table_Date_Content"> <tr> <td> <para style="terp_default_Centre_8">[[ formatLang(data['form']['date1'],date = True) ]]</para> @@ -166,7 +185,7 @@ <para style="terp_default_8"> <font color="white"> </font> </para> - <blockTable colWidths="57.0,288.0,77.0,60.0" style="Table_Header_Move_Line"> + <blockTable colWidths="57.0,322.0,85.0,71.0" style="Table_Header_Move_Line"> <tr> <td> <para style="terp_tblheader_Details">Code/Date</para> @@ -175,14 +194,14 @@ <para style="terp_tblheader_Details">J.C./Move name</para> </td> <td> - <para style="terp_tblheader_Details">Quantity</para> + <para style="terp_tblheader_Details_Centre">Quantity</para> </td> <td> <para style="terp_tblheader_Details_Right">Total</para> </td> </tr> </blockTable> - <blockTable colWidths="57.0,288.0,77.0,60.0" style="Table_Final_Total"> + <blockTable colWidths="57.0,322.0,85.0,71.0" style="Table_Final_Total"> <tr> <td> <para style="terp_default_Bold_9">Total:</para> @@ -203,8 +222,8 @@ </tr> </blockTable> <section> - <para style="terp_default_8">[[ repeatIn(objects,'o') ]]</para> - <blockTable colWidths="58.0,287.0,78.0,59.0" style="Table_Account_Detail"> + <para style="terp_default_2">[[ repeatIn(objects,'o') ]]</para> + <blockTable colWidths="57.0,322.0,85.0,71.0" style="Table_Account_Detail"> <tr> <td> <para style="terp_default_Bold_9">[[ o.code ]]<font face="Helvetica" size="10.0"/></para> @@ -221,8 +240,8 @@ </tr> </blockTable> <section> - <para style="terp_default_8">[[ repeatIn(lines_g(o.id,data['form']['date1'],data['form']['date2'],data['form']['journal']),'move_g') ]]</para> - <blockTable colWidths="58.0,365.0,59.0" style="Table_Analytical_Detail"> + <para style="terp_default_2">[[ repeatIn(lines_g(o.id,data['form']['date1'],data['form']['date2'],data['form']['journal']),'move_g') ]]</para> + <blockTable colWidths="57.0,407.0,71.0" style="Table_Analytical_Detail"> <tr> <td> <para style="terp_default_Bold_9">[[ move_g['code'] ]] </para> @@ -235,7 +254,7 @@ </td> </tr> </blockTable> - <blockTable colWidths="59.0,32.0,332.0,59.0" style="Table_Move_Line_Content"> + <blockTable colWidths="57.0,71.0,336.0,71.0" style="Table_Move_Line_Content"> <tr> <td> <para style="terp_default_9_Italic">[[ repeatIn(lines_a(move_g['id'],o.id,data['form']['date1'],data['form']['date2'],data['form']['journal']),'move_a') ]]</para> @@ -257,5 +276,6 @@ </para> </section> </section> + </pto> </story> </document>
\ No newline at end of file diff --git a/addons/account/report/account_aged_partner_balance.py b/addons/account/report/account_aged_partner_balance.py index 879560a5b4a..b99070330f7 100644 --- a/addons/account/report/account_aged_partner_balance.py +++ b/addons/account/report/account_aged_partner_balance.py @@ -20,12 +20,10 @@ ############################################################################## import time - -import rml_parse from report import report_sxw from common_report_header import common_report_header -class aged_trial_report(rml_parse.rml_parse, common_report_header): +class aged_trial_report(report_sxw.rml_parse, common_report_header): def __init__(self, cr, uid, name, context): super(aged_trial_report, self).__init__(cr, uid, name, context=context) diff --git a/addons/account/report/account_aged_partner_balance.rml b/addons/account/report/account_aged_partner_balance.rml index 8b8336d1c06..cbc4688c368 100644 --- a/addons/account/report/account_aged_partner_balance.rml +++ b/addons/account/report/account_aged_partner_balance.rml @@ -1,6 +1,6 @@ <?xml version="1.0"?> -<document filename="test.pdf"> - <template pageSize="(1120.0,770.0)" title="Aged Trial balance" author="OpenERP S.A. (sales@openerp.com)" allowSplitting="20"> +<document filename="Aged Trial Balance.pdf"> + <template pageSize="(1120.0,770.0)" title="Aged Trial Balance" author="OpenERP S.A.(sales@openerp.com)" allowSplitting="20"> <pageTemplate id="first"> <frame id="first" x1="20.0" y1="35.0" width="1080" height="650"/> </pageTemplate> @@ -107,7 +107,7 @@ <tr> <td><para style="terp_header"><font color="white"> </font></para> </td> - <td><para style="terp_header_Centre">Aged Trial balance</para></td> + <td><para style="terp_header_Centre">Aged Trial Balance</para></td> <td><para style="terp_header"><font color="white"> </font></para></td> </tr> </blockTable> diff --git a/addons/account/report/account_balance.py b/addons/account/report/account_balance.py index 5a6c7700b9d..f9697710f8f 100644 --- a/addons/account/report/account_balance.py +++ b/addons/account/report/account_balance.py @@ -20,7 +20,6 @@ ############################################################################## import time - from report import report_sxw from common_report_header import common_report_header diff --git a/addons/account/report/account_balance.rml b/addons/account/report/account_balance.rml index 277d568330c..7c9aa13da2e 100644 --- a/addons/account/report/account_balance.rml +++ b/addons/account/report/account_balance.rml @@ -1,6 +1,6 @@ <?xml version="1.0"?> -<document filename="test.pdf"> - <template pageSize="(595.0,842.0)" title="Account Balance" author="OpenERP S.A. (sales@openerp.com)" allowSplitting="20"> +<document filename="Account Balance.pdf"> + <template pageSize="(595.0,842.0)" title="Account Balance" author="OpenERP S.A.(sales@openerp.com)" allowSplitting="20"> <pageTemplate id="first"> <frame id="first" x1="35.0" y1="35.0" width="525" height="772"/> </pageTemplate> @@ -18,7 +18,7 @@ <blockValign value="TOP"/> <blockAlignment value="RIGHT"/> <lineStyle kind="LINEBELOW" colorName="#000000" start="0,0" stop="-1,0"/> - <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,1" stop="-1,-1"/> + <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,1" stop="-1,-1"/> </blockTableStyle> <blockTableStyle id="Table8"> @@ -148,11 +148,11 @@ <paraStyle name="P7" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="6.0" spaceAfter="6.0"/> <paraStyle name="P8" fontName="Helvetica"/> <paraStyle name="P9" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/> - <paraStyle name="P10" fontName="Helvetica-Bold" fontSize="8.0" leading="14" spaceBefore="0.0" spaceAfter="6.0" alignment="RIGHT"/> + <paraStyle name="P10" fontName="Helvetica-Bold" fontSize="8.0" leading="10" spaceBefore="0.0" spaceAfter="0.0" alignment="RIGHT"/> <paraStyle name="P11" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> <paraStyle name="P12" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/> <paraStyle name="P13" fontName="Helvetica-Bold" fontSize="2.0" leading="3" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0" textColor="#ffffff"/> - <paraStyle name="P14" rightIndent="17.0" leftIndent="-0.0" fontName="Helvetica-Bold" fontSize="8.0" leading="10" spaceBefore="0.0" spaceAfter="6.0"/> + <paraStyle name="P14" rightIndent="17.0" leftIndent="-0.0" fontName="Helvetica-Bold" fontSize="8.0" leading="10" spaceBefore="0.0" spaceAfter="6.0"/> <paraStyle name="P15" fontName="Helvetica-Bold" fontSize="12.0" leading="15" alignment="CENTER" spaceBefore="12.0" spaceAfter="6.0"/> <paraStyle name="P16" fontName="Helvetica" fontSize="2.0" leading="3" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> <paraStyle name="P17" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/> @@ -189,7 +189,7 @@ <paraStyle name="terp_default_2" fontName="Helvetica" fontSize="2.0" leading="3" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> <paraStyle name="terp_default_Right_9_Bold" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/> <paraStyle name="Heading 3" fontName="Helvetica-Bold" fontSize="14.0" leading="17" spaceBefore="12.0" spaceAfter="6.0"/> - <paraStyle name="P12a" fontName="Helvetica-Bold" fontSize="8.0" leading="14" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/> + <paraStyle name="P12a" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> <images/> </stylesheet> <story> @@ -283,7 +283,7 @@ <para style="P11"> <font color="white"> </font> </para> - <blockTable colWidths="67,295.0,60.0,60.0,60.0" style="Table2" repeatRows="1"> + <blockTable colWidths="80,215.0,80.0,80.0,80.0" style="Table2" repeatRows="1"> <tr noRowsplits="1"> <td><para style="P12a">Code</para></td> <td><para style="P12a">Account</para></td> diff --git a/addons/account/report/account_balance_landscape.py b/addons/account/report/account_balance_landscape.py index 6ec7ec7c10e..8576850ff5e 100644 --- a/addons/account/report/account_balance_landscape.py +++ b/addons/account/report/account_balance_landscape.py @@ -22,7 +22,6 @@ import time import locale from report import report_sxw -import rml_parse parents = { 'tr':1, @@ -31,7 +30,7 @@ parents = { 'section': 0 } -class account_balance_landscape(rml_parse.rml_parse): +class account_balance_landscape(report_sxw.rml_parse): def __init__(self, cr, uid, name, context): super(account_balance_landscape, self).__init__(cr, uid, name, context=context) self.flag=1 diff --git a/addons/account/report/account_balance_landscape.rml b/addons/account/report/account_balance_landscape.rml index 1f695eb36a8..d8e4881bbbe 100644 --- a/addons/account/report/account_balance_landscape.rml +++ b/addons/account/report/account_balance_landscape.rml @@ -1,6 +1,6 @@ <?xml version="1.0"?> -<document filename="test.pdf"> - <template pageSize="(842.0,595.0)" title="Account Balance" author="OpenERP S.A. (sales@openerp.com)" allowSplitting="20"> +<document filename="Account Balance.pdf"> + <template pageSize="(842.0,595.0)" title="Account Balance" author="OpenERP S.A.(sales@openerp.com)" allowSplitting="20"> <pageTemplate id="first"> <frame id="first" x1="28.0" y1="28.0" width="786" height="539"/> </pageTemplate> diff --git a/addons/account/report/account_balance_landscape_old_backup.rml b/addons/account/report/account_balance_landscape_old_backup.rml index cd7e9edc860..6790082f8dd 100755 --- a/addons/account/report/account_balance_landscape_old_backup.rml +++ b/addons/account/report/account_balance_landscape_old_backup.rml @@ -1,6 +1,6 @@ <?xml version="1.0"?> -<document filename="test.pdf"> - <template pageSize="(1120.0,770.0)" title="Account balance" author="OpenERP S.A. (sales@openerp.com)" allowSplitting="20" > +<document filename="Account Balance.pdf"> + <template pageSize="(1120.0,770.0)" title="Account Balance" author="OpenERP S.A.(sales@openerp.com)" allowSplitting="20" > <pageTemplate id="first"> <frame id="first" x1="22.0" y1="31.0" width="1080" height="680"/> </pageTemplate> @@ -80,7 +80,7 @@ </para> </td> <td> - <para style="P1">Account balance</para> + <para style="P1">Account Balance</para> </td> <td> <para style="P3"> diff --git a/addons/account/report/account_balance_old_backup.rml b/addons/account/report/account_balance_old_backup.rml index 1d40e58cbfb..cf67cb6bc3d 100755 --- a/addons/account/report/account_balance_old_backup.rml +++ b/addons/account/report/account_balance_old_backup.rml @@ -1,6 +1,6 @@ <?xml version="1.0"?> -<document filename="test.pdf"> - <template pageSize="(635.0,842.0)" title="Account balance" author="OpenERP S.A. (sales@openerp.com)" allowSplitting="20"> +<document filename="Account Balance.pdf"> + <template pageSize="(635.0,842.0)" title="Account Balance" author="OpenERP S.A.(sales@openerp.com)" allowSplitting="20"> <pageTemplate id="first"> <frame id="first" x1="15.0" y1="15.0" width="615" height="772"/> </pageTemplate> diff --git a/addons/account/report/account_balance_sheet.py b/addons/account/report/account_balance_sheet.py index 4d3e06dee05..b6f39fbbebd 100644 --- a/addons/account/report/account_balance_sheet.py +++ b/addons/account/report/account_balance_sheet.py @@ -22,13 +22,12 @@ import time import pooler -import rml_parse from report import report_sxw from account.report import account_profit_loss from common_report_header import common_report_header from tools.translate import _ -class report_balancesheet_horizontal(rml_parse.rml_parse, common_report_header): +class report_balancesheet_horizontal(report_sxw.rml_parse, common_report_header): def __init__(self, cr, uid, name, context=None): super(report_balancesheet_horizontal, self).__init__(cr, uid, name, context=context) self.obj_pl = account_profit_loss.report_pl_account_horizontal(cr, uid, name, context=context) diff --git a/addons/account/report/account_balance_sheet.rml b/addons/account/report/account_balance_sheet.rml index 076de7bdcd4..74b3bf81190 100644 --- a/addons/account/report/account_balance_sheet.rml +++ b/addons/account/report/account_balance_sheet.rml @@ -1,6 +1,6 @@ <?xml version="1.0"?> -<document filename="test.pdf"> - <template pageSize="(595.0,842.0)" title="Balance sheet" author="OpenERP S.A. (sales@openerp.com)" allowSplitting="20"> +<document filename="Balance Sheet.pdf"> + <template pageSize="(595.0,842.0)" title="Balance Sheet" author="OpenERP S.A.(sales@openerp.com)" allowSplitting="20"> <pageTemplate id="first"> <frame id="first" x1="28.0" y1="28.0" width="539" height="786"/> </pageTemplate> @@ -35,19 +35,7 @@ <blockTableStyle id="Table_Net_Profit_Loss"> <blockAlignment value="LEFT"/> <blockValign value="TOP"/> - <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="0,0" stop="0,-1"/> - <lineStyle kind="LINEABOVE" colorName="#cccccc" start="0,0" stop="0,0"/> - <lineStyle kind="LINEBELOW" colorName="#cccccc" start="0,-1" stop="0,-1"/> - <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="1,0" stop="1,-1"/> - <lineStyle kind="LINEABOVE" colorName="#cccccc" start="1,0" stop="1,0"/> - <lineStyle kind="LINEBELOW" colorName="#cccccc" start="1,-1" stop="1,-1"/> - <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="2,0" stop="2,-1"/> - <lineStyle kind="LINEABOVE" colorName="#cccccc" start="2,0" stop="2,0"/> - <lineStyle kind="LINEBELOW" colorName="#cccccc" start="2,-1" stop="2,-1"/> - <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="3,0" stop="3,-1"/> - <lineStyle kind="LINEAFTER" colorName="#cccccc" start="3,0" stop="3,-1"/> - <lineStyle kind="LINEABOVE" colorName="#cccccc" start="3,0" stop="3,0"/> - <lineStyle kind="LINEBELOW" colorName="#cccccc" start="3,-1" stop="3,-1"/> + <lineStyle kind="LINEBELOW" colorName="#cccccc" start="0,0" stop="-1,-1"/> </blockTableStyle> <blockTableStyle id="Table1"> <blockAlignment value="LEFT"/> @@ -230,7 +218,7 @@ </td> </tr> </blockTable> - <blockTable colWidths="426.0,113.0" style="Table3"> + <blockTable colWidths="426.0,113.0" style="Table_Net_Profit_Loss"> <tr> <td> <para style="terp_default_Bold_9">Balance:</para> diff --git a/addons/account/report/account_balance_sheet_horizontal.rml b/addons/account/report/account_balance_sheet_horizontal.rml index bde0d2786d0..7bfaeb9f33e 100644 --- a/addons/account/report/account_balance_sheet_horizontal.rml +++ b/addons/account/report/account_balance_sheet_horizontal.rml @@ -1,6 +1,6 @@ <?xml version="1.0"?> -<document filename="test.pdf"> - <template pageSize="(1120.0,770.0)" title="Balance sheet" author="OpenERP S.A. (sales@openerp.com)" allowSplitting="20" > +<document filename="Balance Sheet.pdf"> + <template pageSize="(1120.0,770.0)" title="Balance Sheet" author="OpenERP S.A.(sales@openerp.com)" allowSplitting="20" > <pageTemplate id="first"> <frame id="first" x1="22.0" y1="15.0" width="1080" height="680"/> diff --git a/addons/account/report/account_central_journal.py b/addons/account/report/account_central_journal.py index 6ab5b38d03d..d3113b63133 100644 --- a/addons/account/report/account_central_journal.py +++ b/addons/account/report/account_central_journal.py @@ -20,7 +20,6 @@ ############################################################################## import time - from report import report_sxw from common_report_header import common_report_header # diff --git a/addons/account/report/account_central_journal.rml b/addons/account/report/account_central_journal.rml index 28cb68fcce3..320a38370a2 100644 --- a/addons/account/report/account_central_journal.rml +++ b/addons/account/report/account_central_journal.rml @@ -1,6 +1,6 @@ <?xml version="1.0"?> -<document filename="central_journal.pdf"> - <template pageSize="(595.0,842.0)" title="Centralized Journal" author="OpenERP S.A. (sales@openerp.com)" allowSplitting="20"> +<document filename="Centralized Journal.pdf"> + <template pageSize="(595.0,842.0)" title="Centralized Journal" author="OpenERP S.A.(sales@openerp.com)" allowSplitting="20"> <pageTemplate id="first"> <frame id="first" x1="28.0" y1="42.0" width="539" height="758"/> </pageTemplate> @@ -274,7 +274,7 @@ <para style="P9"> <font color="white"> </font> </para> - <blockTable colWidths="50.0,300.0,70.0,70.0,70.0" style="Table_Account_detail_Title">[[ display_currency(data) == False or removeParentNode('blockTable') ]] + <blockTable colWidths="50.0,260.0,80.0,80.0,80.0" style="Table_Account_detail_Title">[[ display_currency(data) == False or removeParentNode('blockTable') ]] <tr> <td><para style="terp_tblheader_Details">A/C No.</para></td> <td><para style="terp_tblheader_Details">Account Name</para></td> @@ -283,7 +283,7 @@ <td><para style="terp_tblheader_Details_Right">Balance</para></td> </tr> </blockTable> - <blockTable colWidths="50.0,220.0,70.0,70.0,70.0,80.0" style="Table_Account_detail_Title_Currency">[[ display_currency(data) or removeParentNode('blockTable') ]] + <blockTable colWidths="50.0,180.0,80.0,80.0,80.0,80.0" style="Table_Account_detail_Title_Currency">[[ display_currency(data) or removeParentNode('blockTable') ]] <tr> <td><para style="terp_tblheader_Details">A/C No.</para></td> <td><para style="terp_tblheader_Details">Account Name</para></td> @@ -293,7 +293,7 @@ <td><para style="terp_tblheader_Details_Right">Currency</para></td> </tr> </blockTable> - <blockTable colWidths="50.0,300.0,70.0,70.0,70.0" style="Table_Final_Total">[[ display_currency(data) == False or removeParentNode('blockTable') ]] + <blockTable colWidths="50.0,260.0,80.0,80.0,80.0" style="Table_Final_Total">[[ display_currency(data) == False or removeParentNode('blockTable') ]] <tr> <td><para style="terp_default_Bold_9">Total:</para></td> <td><para style="terp_default_Bold_9"><font color="white"> </font></para></td> @@ -302,7 +302,7 @@ <td><para style="terp_default_Bold_9_Right">[[ formatLang( sum_credit(o.period_id.id, o.journal_id.id)-sum_debit(o.period_id.id, o.journal_id.id) ) ]] [[ company.currency_id.symbol ]]</para></td> </tr> </blockTable> - <blockTable colWidths="50.0,220.0,70.0,70.0,70.0,80.0" style="Table_Final_Total_currency">[[ display_currency(data) or removeParentNode('blockTable') ]] + <blockTable colWidths="50.0,180.0,80.0,80.0,80.0,80.0" style="Table_Final_Total_currency">[[ display_currency(data) or removeParentNode('blockTable') ]] <tr> <td><para style="terp_default_Bold_9">Total:</para></td> <td><para style="terp_default_Bold_9"><font color="white"> </font></para></td> @@ -314,7 +314,7 @@ </blockTable> <section> <para style="terp_default_8">[[ repeatIn(lines(o.period_id.id,o.journal_id.id),'line') ]]</para> - <blockTable colWidths="50.0,300.0,70.0,70.0,70.0" style="Table_Journal_Line_Content">[[ display_currency(data) == False or removeParentNode('blockTable') ]] + <blockTable colWidths="50.0,260.0,80.0,80.0,80.0" style="Table_Journal_Line_Content">[[ display_currency(data) == False or removeParentNode('blockTable') ]] <tr> <td><para style="terp_default_9">[[ line['code'] ]]</para></td> <td><para style="terp_default_9">[[ line['name'] ]]</para></td> @@ -323,7 +323,7 @@ <td><para style="terp_default_Right_9">[[ formatLang(line['credit']-line['debit']) ]] [[ company.currency_id.symbol ]]</para></td> </tr> </blockTable> - <blockTable colWidths="50.0,220.0,70.0,70.0,70.0,80.0" style="Table_Journal_Line_Content_currency">[[ display_currency(data) or removeParentNode('blockTable') ]] + <blockTable colWidths="50.0,180.0,80.0,80.0,80.0,80.0" style="Table_Journal_Line_Content_currency">[[ display_currency(data) or removeParentNode('blockTable') ]] <tr> <td><para style="terp_default_9">[[ line['code'] ]]</para></td> <td><para style="terp_default_9">[[ line['name'] ]]</para></td> diff --git a/addons/account/report/account_general_journal.py b/addons/account/report/account_general_journal.py index 4a20ac9ebc4..9eb81157dba 100644 --- a/addons/account/report/account_general_journal.py +++ b/addons/account/report/account_general_journal.py @@ -20,7 +20,6 @@ ############################################################################## import time - from common_report_header import common_report_header from report import report_sxw diff --git a/addons/account/report/account_general_journal.rml b/addons/account/report/account_general_journal.rml index f41302408c5..a98eda3fff3 100644 --- a/addons/account/report/account_general_journal.rml +++ b/addons/account/report/account_general_journal.rml @@ -1,6 +1,6 @@ <?xml version="1.0"?> -<document filename="general_journal.pdf"> - <template pageSize="(596.0,842.0)" title="General Journal" author="OpenERP S.A. (sales@openerp.com)" allowSplitting="20"> +<document filename="General Journal.pdf"> + <template pageSize="(596.0,842.0)" title="General Journal" author="OpenERP S.A.(sales@openerp.com)" allowSplitting="20"> <pageTemplate id="first"> <frame id="first" x1="28.0" y1="42.0" width="540" height="758"/> </pageTemplate> diff --git a/addons/account/report/account_general_ledger.py b/addons/account/report/account_general_ledger.py index 434f9f800cd..6ccfb9343a2 100644 --- a/addons/account/report/account_general_ledger.py +++ b/addons/account/report/account_general_ledger.py @@ -28,12 +28,10 @@ ############################################################################## import time - from report import report_sxw from common_report_header import common_report_header -import rml_parse -class general_ledger(rml_parse.rml_parse, common_report_header): +class general_ledger(report_sxw.rml_parse, common_report_header): _name = 'report.account.general.ledger' def set_context(self, objects, data, ids, report_type=None): @@ -88,9 +86,20 @@ class general_ledger(rml_parse.rml_parse, common_report_header): 'get_start_date':self._get_start_date, 'get_end_date':self._get_end_date, 'get_target_move': self._get_target_move, + 'strip_name': self._strip_name, }) self.context = context + def _ellipsis(self, orig_str, maxlen=100, ellipsis='...'): + maxlen = maxlen - len(ellipsis) + if maxlen <= 0: + maxlen = 1 + new_str = orig_str[:maxlen] + return new_str + + def _strip_name(self, name, maxlen=50): + return self._ellipsis(name, maxlen, ' ...') + def _sum_currency_amount_account(self, account): self.cr.execute('SELECT sum(l.amount_currency) AS tot_currency \ FROM account_move_line l \ diff --git a/addons/account/report/account_general_ledger.rml b/addons/account/report/account_general_ledger.rml index 917ffa214d8..2a3bfda8e48 100644 --- a/addons/account/report/account_general_ledger.rml +++ b/addons/account/report/account_general_ledger.rml @@ -1,6 +1,6 @@ <?xml version="1.0"?> -<document filename="test.pdf"> - <template pageSize="(595.0,842.0)" title="General Ledger" author="OpenERP S.A. (sales@openerp.com)" allowSplitting="20"> +<document filename="General Ledger.pdf"> + <template pageSize="(595.0,842.0)" title="General Ledger" author="OpenERP S.A.(sales@openerp.com)" allowSplitting="20"> <pageTemplate id="first"> <frame id="first" x1="57.0" y1="57.0" width="481" height="728"/> <pageGraphics> @@ -177,6 +177,34 @@ <paraStyle name="terp_tblheader_Details_Centre" fontName="Helvetica-Bold" fontSize="8.0" leading="11" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/> </stylesheet> <story> + <pto> + <pto_header> + <blockTable colWidths="66.0,44.0,80.0,60.0,92.5,66.5,64.5,71.5" style="tbl_header">[[data['form']['amount_currency'] == False or removeParentNode('blockTable')]] + <tr> + <td><para style="date">Date</para></td> + <td><para style="P3b">Partner</para></td> + <td><para style="P3b">Ref</para></td> + <td><para style="P3b">Move</para></td> + <td><para style="P3b">Entry Label</para></td> + <td><para style="P9b">Debit</para></td> + <td><para style="P9b">Credit</para></td> + <td><para style="P9b">Balance</para></td> + </tr> + </blockTable> + <blockTable colWidths="70.0,40.0,60.0,55.0,89.0,58.0,58.0,58.0,58.0" style="tbl_header">[[ data['form']['amount_currency'] == True or removeParentNode('blockTable') ]] + <tr> + <td><para style="date">Date</para></td> + <td><para style="P3b">Partner</para></td> + <td><para style="P3b">Ref</para></td> + <td><para style="P3b">Move</para></td> + <td><para style="P3b">Entry Label</para></td> + <td><para style="P9b">Debit</para></td> + <td><para style="P9b">Credit</para></td> + <td><para style="P9b">Balance</para></td> + <td><para style="P9b">Currency</para></td> + </tr> + </blockTable> + </pto_header> <blockTable colWidths="539.0" style="Table_Company_Name"> <tr> <td> @@ -334,9 +362,10 @@ <td><para style="P4">[[ formatLang(line['debit']) ]]</para></td> <td><para style="P4">[[ formatLang(line['credit']) ]]</para></td> <td><para style="P4">[[ formatLang(line['progress']) ]] [[ company.currency_id.symbol ]]</para></td> - <td><para style="P4"><font>[[ (line['currency_id']==None or line['amount_currency']==None) and removeParentNode('font') ]] [[ formatLang(line['amount_currency'])]] [[ line['currency_code'] or '']]</font></para></td> + <td><para style="P4"><font>[[ (line.has_key('currency_id') and line['currency_id']==None or line['amount_currency']==None) and removeParentNode('font') ]] [[ formatLang(line['amount_currency'])]] [[ line['currency_code'] or '']]</font></para></td> </tr> </blockTable> </section> + </pto> </story> </document> diff --git a/addons/account/report/account_general_ledger_landscape.rml b/addons/account/report/account_general_ledger_landscape.rml index 75dc04c507b..430bde219e1 100644 --- a/addons/account/report/account_general_ledger_landscape.rml +++ b/addons/account/report/account_general_ledger_landscape.rml @@ -1,6 +1,6 @@ <?xml version="1.0"?> -<document filename="test.pdf"> - <template pageSize="(1120.5,767.8)" title="General Ledger" author="OpenERP S.A. (sales@openerp.com)" allowSplitting="20" > +<document filename="General Ledger.pdf"> + <template pageSize="(1120.5,767.8)" title="General Ledger" author="OpenERP S.A.(sales@openerp.com)" allowSplitting="20" > <pageTemplate id="first"> <frame id="first" x1="22.0" y1="31.0" width="1080" height="680"/> </pageTemplate> @@ -140,7 +140,7 @@ </initialize> <paraStyle name="P1" fontName="Helvetica" fontSize="20.0" leading="25" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/> <paraStyle name="P2" fontName="Helvetica-Bold" fontSize="9.0" leading="10" spaceBefore="0.0" spaceAfter="6.0"/> - <paraStyle name="date" fontName="Helvetica-Bold" fontSize="9.0" leading="10" spaceBefore="0.0" spaceAfter="6.0" alignment="CENTER"/> + <paraStyle name="date" leftIndent="6.0" fontName="Helvetica-Bold" fontSize="9.0" leading="10" spaceBefore="6.0" spaceAfter="0.0" alignment="LEFT"/> <paraStyle name="P2_content" fontName="Helvetica" fontSize="8.0" leading="10" spaceBefore="0.0" spaceAfter="6.0"/> <paraStyle name="P3" fontName="Helvetica-Bold" fontSize="9.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/> <paraStyle name="P3_center" fontName="Helvetica-Bold" fontSize="9.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/> @@ -178,6 +178,38 @@ <paraStyle name="terp_tblheader_General_Right" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="6.0" spaceAfter="6.0"/> </stylesheet> <story> + <pto> + <pto_header> + <blockTable colWidths="66.0,35.0,120.0,90.0,60.0,200.0,180.0,73.0,73.0,73.0,85.00" style="tbl_header">[[data['form']['amount_currency'] == True or removeParentNode('blockTable')]] + <tr> + <td><para style="date">Date</para></td> + <td><para style="P2">JNRL</para></td> + <td><para style="P2">Partner</para></td> + <td><para style="P2">Ref</para></td> + <td><para style="P2">Move</para></td> + <td><para style="P3">Entry Label</para></td> + <td><para style="P3_center">Counterpart</para></td> + <td><para style="P4">Debit</para></td> + <td><para style="P4">Credit</para></td> + <td><para style="P4">Balance</para></td> + <td><para style="P4">Currency</para></td> + </tr> + </blockTable> + <blockTable colWidths="66.0,35.0,166.0,90.0,60.0,245.0,148.0,80.0,80.0,80.0" style="tbl_header">[[ data['form']['amount_currency'] == False or removeParentNode('blockTable') ]] + <tr> + <td><para style="date">Date</para></td> + <td><para style="P2">JNRL</para></td> + <td><para style="P2">Partner</para></td> + <td><para style="P2">Ref</para></td> + <td><para style="P2">Move</para></td> + <td><para style="P3">Entry Label</para></td> + <td><para style="P3_center">Counterpart</para></td> + <td><para style="P4">Debit</para></td> + <td><para style="P4">Credit</para></td> + <td><para style="P4">Balance</para></td> + </tr> + </blockTable> + </pto_header> <blockTable colWidths="539.0" style="Table_Company_Name"> <tr> <td> @@ -295,16 +327,16 @@ <td><para style="P4_content">[[ formatLang(line['debit'], digits=get_digits(dp='Account')) ]]</para></td> <td><para style="P4_content">[[ formatLang(line['credit'], digits=get_digits(dp='Account')) ]]</para></td> <td><para style="P4_content">[[ formatLang(line['progress'], digits=get_digits(dp='Account')) ]] [[ company.currency_id.symbol ]]</para></td> - <td><para style="P4_content"><font>[[ (line['currency_id']==None or line['amount_currency']==None) and removeParentNode('font') ]] [[ formatLang(line['amount_currency'])]] [[ line['currency_code'] or '']]</font></para></td> + <td><para style="P4_content"><font>[[ (line.has_key('currency_id') and line['currency_id']==None or line['amount_currency']==None) and removeParentNode('font') ]] [[ formatLang(line['amount_currency'])]] [[ line['currency_code'] or '']]</font></para></td> </tr> </blockTable> </section> - <blockTable colWidths="66.0,35.0,166.0,90.0,60.0,280.0,148.0,69.0,72.0,64.0" style="tbl_header" repeatRows="1">[[ data['form']['amount_currency'] == False or removeParentNode('blockTable') ]] + <blockTable colWidths="66.0,35.0,166.0,90.0,60.0,245.0,148.0,80.0,80.0,80.0" style="tbl_header" repeatRows="1">[[ data['form']['amount_currency'] == False or removeParentNode('blockTable') ]] <tr> - <td><para style="P2">Date</para></td> - <td><para style="date">JNRL</para></td> + <td><para style="date">Date</para></td> + <td><para style="P2">JNRL</para></td> <td><para style="P2">Partner</para></td> <td><para style="P2">Ref</para></td> <td><para style="P2">Move</para></td> @@ -320,10 +352,10 @@ <para>[[ repeatIn(get_children_accounts(a), 'o') ]]</para> - <blockTable colWidths="66.0,35.0,166.0,90.0,60.0,280.0,148.0,69.0,72.0,64.0" style="tbl_content">[[data['form']['amount_currency'] == False or removeParentNode('blockTable')]] + <blockTable colWidths="66.0,35.0,166.0,90.0,60.0,245.0,148.0,80.0,80.0,80.0" style="tbl_content">[[data['form']['amount_currency'] == False or removeParentNode('blockTable')]] <tr> <td> - <blockTable colWidths="405.0,435.0,69.0,72.0,63.0" style="Table5"> + <blockTable colWidths="405.0,399.0,80.0,80.0,80.0" style="Table5"> <tr> <td><para style="Standard"><font color="white">[[ '..'*(o.level-1) ]]</font>[[ o.code ]] [[ o.name ]]</para></td> <td><para style="Standard"></para></td> @@ -362,5 +394,6 @@ <para style="terp_default_8"> <font color="white"> </font> </para> + </pto> </story> </document> diff --git a/addons/account/report/account_journal.py b/addons/account/report/account_journal.py index 2a699b20f84..82af01cdb0b 100644 --- a/addons/account/report/account_journal.py +++ b/addons/account/report/account_journal.py @@ -20,7 +20,6 @@ ############################################################################## import time - from common_report_header import common_report_header from report import report_sxw diff --git a/addons/account/report/account_journal.rml b/addons/account/report/account_journal.rml index ba343f389b9..cb37b4e83f5 100644 --- a/addons/account/report/account_journal.rml +++ b/addons/account/report/account_journal.rml @@ -1,6 +1,6 @@ <?xml version="1.0"?> -<document filename="print_journal.pdf"> - <template pageSize="(595.0,842.0)" title="Journal" author="OpenERP S.A. (sales@openerp.com)" allowSplitting="20"> +<document filename="Journal.pdf"> + <template pageSize="(595.0,842.0)" title="Journal" author="OpenERP S.A.(sales@openerp.com)" allowSplitting="20"> <pageTemplate id="first"> <frame id="first" x1="57.0" y1="57.0" width="481" height="728"/> </pageTemplate> diff --git a/addons/account/report/account_partner_balance.rml b/addons/account/report/account_partner_balance.rml index 19eef489507..6425d6a4db6 100644 --- a/addons/account/report/account_partner_balance.rml +++ b/addons/account/report/account_partner_balance.rml @@ -1,6 +1,6 @@ <?xml version="1.0"?> -<document filename="partner_balance.pdf"> - <template pageSize="(595.0,842.0)" title="Partner Balance" author="OpenERP S.A. (sales@openerp.com)" allowSplitting="20"> +<document filename="Partner Balance.pdf"> + <template pageSize="(595.0,842.0)" title="Partner Balance" author="OpenERP S.A.(sales@openerp.com)" allowSplitting="20"> <pageTemplate id="first"> <frame id="first" x1="57.0" y1="57.0" width="481" height="728"/> </pageTemplate> @@ -227,7 +227,7 @@ <font color="white"> </font> </para> <para style="P12a"></para> - <blockTable colWidths="80.0,170.0,70.0,70.0,70.0,80.0" repeatRows="1" style="Table2"> + <blockTable colWidths="80.0,140.0,80.0,80.0,80.0,80.0" repeatRows="1" style="Table2"> <tr> <td><para style="P12a">Code</para></td> <td><para style="P12a">(Account/Partner) Name</para></td> diff --git a/addons/account/report/account_partner_ledger.py b/addons/account/report/account_partner_ledger.py index 06475311bf3..e66c3a9d523 100644 --- a/addons/account/report/account_partner_ledger.py +++ b/addons/account/report/account_partner_ledger.py @@ -21,12 +21,10 @@ import time import re - -import rml_parse from report import report_sxw from common_report_header import common_report_header -class third_party_ledger(rml_parse.rml_parse, common_report_header): +class third_party_ledger(report_sxw.rml_parse, common_report_header): def __init__(self, cr, uid, name, context=None): super(third_party_ledger, self).__init__(cr, uid, name, context=context) diff --git a/addons/account/report/account_partner_ledger.rml b/addons/account/report/account_partner_ledger.rml index 139d9bb16cd..b3a8e9f7fdc 100644 --- a/addons/account/report/account_partner_ledger.rml +++ b/addons/account/report/account_partner_ledger.rml @@ -1,6 +1,6 @@ <?xml version="1.0"?> -<document filename="test.pdf"> - <template pageSize="(595.0,842.0)" title="Partner Ledger" author="OpenERP S.A. (sales@openerp.com)" allowSplitting="20"> +<document filename="Partner Ledger.pdf"> + <template pageSize="(595.0,842.0)" title="Partner Ledger" author="OpenERP S.A.(sales@openerp.com)" allowSplitting="20"> <pageTemplate id="first"> <frame id="first" x1="28.0" y1="28.0" width="539" height="786"/> </pageTemplate> @@ -175,6 +175,68 @@ </stylesheet> <images/> <story> + <pto> + <pto_header> + <blockTable colWidths="55.0,28.0,60.0,81.0,125.0,57.0,58.0,80.0" style="Table_header_1">[[ display_currency(data) == False or removeParentNode('blockTable') ]] + <tr> + <td> + <para style="terp_tblheader_Details">Date</para> + </td> + <td> + <para style="terp_tblheader_Details">JNRL</para> + </td> + <td> + <para style="terp_tblheader_Details">Ref.</para> + </td> + <td> + <para style="terp_tblheader_Details">Account</para> + </td> + <td> + <para style="terp_tblheader_Details">Entry Label</para> + </td> + <td> + <para style="terp_tblheader_Details_Right">Debit</para> + </td> + <td> + <para style="terp_tblheader_Details_Right">Credit</para> + </td> + <td> + <para style="terp_tblheader_Details_Right">Balance</para> + </td> + </tr> + </blockTable> + <blockTable colWidths="50.0,25.0,60.0,81.0,97.0,56.0,58.0,63.0,53.0" style="Table4">[[ display_currency(data) == True or removeParentNode('blockTable') ]] + <tr> + <td> + <para style="terp_tblheader_Details">Date</para> + </td> + <td> + <para style="terp_tblheader_Details">JNRL</para> + </td> + <td> + <para style="terp_tblheader_Details">Ref.</para> + </td> + <td> + <para style="terp_tblheader_Details">Account</para> + </td> + <td> + <para style="terp_tblheader_Details">Entry Label</para> + </td> + <td> + <para style="terp_tblheader_Details_Right">Debit</para> + </td> + <td> + <para style="terp_tblheader_Details_Right">Credit</para> + </td> + <td> + <para style="terp_tblheader_Details_Right">Balance</para> + </td> + <td> + <para style="terp_tblheader_Details_Right">Currency</para> + </td> + </tr> + </blockTable> + </pto_header> <para style="terp_default_2"> <font color="white"> </font> </para> @@ -277,7 +339,7 @@ <para style="P4"> <font color="white"> </font> </para> - <blockTable colWidths="55.0,28.0,60.0,81.0,125.0,57.0,58.0,65.0" style="Table_header_1">[[ display_currency(data) == False or removeParentNode('blockTable') ]] + <blockTable colWidths="55.0,28.0,60.0,81.0,125.0,57.0,58.0,80.0" style="Table_header_1">[[ display_currency(data) == False or removeParentNode('blockTable') ]] <tr> <td> <para style="terp_tblheader_Details">Date</para> @@ -311,20 +373,20 @@ <para style="terp_default_2"> <font color="white"> </font> </para> - <blockTable colWidths="349.0,57.0,58.0,65.0" style="Table2">[[ display_currency(data) == False or removeParentNode('blockTable') ]] + <blockTable colWidths="344.0,60.0,60.0,80.0" style="Table2">[[ display_currency(data) == False or removeParentNode('blockTable') ]] <tr> <td> <para style="P2">[[ p.ref ]] - [[ p.name ]]</para> </td> <td> - <para style="P5">[[ formatLang((sum_debit_partner(p))) ]]</para> + <para style="P5"><u>[[ formatLang((sum_debit_partner(p))) ]]</u></para> </td> <td> - <para style="P5">[[ formatLang((sum_credit_partner(p))) ]] </para> + <para style="P5"><u>[[ formatLang((sum_credit_partner(p))) ]]</u></para> </td> <td> - <para style="P5">[[ formatLang((sum_debit_partner(p) - sum_credit_partner(p))) ]] [[ company.currency_id.symbol ]]</para> + <para style="P5"><u>[[ formatLang((sum_debit_partner(p) - sum_credit_partner(p))) ]] [[ company.currency_id.symbol ]]</u></para> </td> </tr> <tr> @@ -347,7 +409,7 @@ </para> <section> <para style="P1">[[ repeatIn(lines(p), 'line') ]]</para> - <blockTable colWidths="55.0,28.0,60.0,81.0,125.0,57.0,58.0,65.0" style="Table3">[[ display_currency(data) == False or removeParentNode('blockTable') ]] + <blockTable colWidths="55.0,28.0,60.0,80.0,121.0,60.0,60.0,80.0" style="Table3">[[ display_currency(data) == False or removeParentNode('blockTable') ]] <tr> <td> <para style="P3">[[ formatLang(line['date'],date=True) ]]</para> @@ -499,5 +561,6 @@ <para style="terp_default_9"> <font color="white"> </font> </para> + </pto> </story> </document> diff --git a/addons/account/report/account_partner_ledger_other.rml b/addons/account/report/account_partner_ledger_other.rml index 644077eec84..c3315dde64d 100644 --- a/addons/account/report/account_partner_ledger_other.rml +++ b/addons/account/report/account_partner_ledger_other.rml @@ -1,6 +1,6 @@ <?xml version="1.0"?> -<document filename="test.pdf"> - <template pageSize="(595.0,842.0)" title="Partner Ledger" author="OpenERP S.A. (sales@openerp.com)" allowSplitting="20"> +<document filename="Partner Ledger.pdf"> + <template pageSize="(595.0,842.0)" title="Partner Ledger" author="OpenERP S.A.(sales@openerp.com)" allowSplitting="20"> <pageTemplate id="first"> <frame id="first" x1="28.0" y1="28.0" width="539" height="786"/> </pageTemplate> @@ -331,6 +331,68 @@ <images/> </stylesheet> <story> + <pto> + <pto_header> + <blockTable colWidths="50.0,28.0,65.0,61.0,145.0,60.0,60.0,80.0" style="Table_header_1">[[ display_currency(data) == False or removeParentNode('blockTable') ]] + <tr> + <td> + <para style="terp_tblheader_Details">Date</para> + </td> + <td> + <para style="terp_tblheader_Details">JNRL</para> + </td> + <td> + <para style="terp_tblheader_Details">Ref.</para> + </td> + <td> + <para style="terp_tblheader_Details">Account</para> + </td> + <td> + <para style="terp_tblheader_Details">Entry Label</para> + </td> + <td> + <para style="terp_tblheader_Details_Right">Debit</para> + </td> + <td> + <para style="terp_tblheader_Details_Right">Credit</para> + </td> + <td> + <para style="terp_tblheader_Details_Right">Balance</para> + </td> + </tr> + </blockTable> + <blockTable colWidths="50.0,28.0,65.0,65.0,112.0,53.0,53.0,60.0,53.0" style="Table4">[[ display_currency(data) == True or removeParentNode('blockTable') ]] + <tr> + <td> + <para style="terp_tblheader_Details">Date</para> + </td> + <td> + <para style="terp_tblheader_Details">JNRL</para> + </td> + <td> + <para style="terp_tblheader_Details">Ref.</para> + </td> + <td> + <para style="terp_tblheader_Details">Account</para> + </td> + <td> + <para style="terp_tblheader_Details">Entry Label</para> + </td> + <td> + <para style="terp_tblheader_Details_Right">Debit</para> + </td> + <td> + <para style="terp_tblheader_Details_Right">Credit</para> + </td> + <td> + <para style="terp_tblheader_Details_Right">Balance</para> + </td> + <td> + <para style="terp_tblheader_Details_Right">Currency</para> + </td> + </tr> + </blockTable> + </pto_header> <blockTable colWidths="539.0" style="Table_header"> <tr> <td> @@ -432,7 +494,7 @@ <para style="P5"> <font color="white"> </font> </para> - <blockTable colWidths="50.0,28.0,65.0,61.0,145.0,60.0,60.0,60.0" style="Table_header_1">[[ display_currency(data) == False or removeParentNode('blockTable') ]] + <blockTable colWidths="50.0,28.0,65.0,61.0,145.0,60.0,60.0,80.0" style="Table_header_1">[[ display_currency(data) == False or removeParentNode('blockTable') ]] <tr> <td> <para style="terp_tblheader_Details">Date</para> @@ -462,7 +524,7 @@ </blockTable> <section> <para style="P3">[[ repeatIn(objects, 'p') ]] [[ setLang(p.lang) ]]</para> - <blockTable colWidths="349.0,60.0,60.0,60.0" style="Table2">[[ display_currency(data) == False or removeParentNode('blockTable') ]] + <blockTable colWidths="349.0,60.0,60.0,80.0" style="Table2">[[ display_currency(data) == False or removeParentNode('blockTable') ]] <tr> <td> @@ -495,7 +557,7 @@ </blockTable> <section> <para style="P1">[[ repeatIn(lines(p), 'line') ]]</para> - <blockTable colWidths="50.0,28.0,65.0,61.0,145.0,60.0,60.0,60.0" style="Table3">[[ display_currency(data) == False or removeParentNode('blockTable') ]] + <blockTable colWidths="50.0,28.0,65.0,61.0,145.0,60.0,60.0,80.0" style="Table3">[[ display_currency(data) == False or removeParentNode('blockTable') ]] <tr> <td> <para style="P3">[[ formatLang(line['date'],date=True) ]]</para> @@ -636,5 +698,6 @@ <font color="white"> </font> </para> </section> + </pto> </story> </document> diff --git a/addons/account/report/account_print_invoice.rml b/addons/account/report/account_print_invoice.rml index 87f3bb770ba..c6057627b32 100644 --- a/addons/account/report/account_print_invoice.rml +++ b/addons/account/report/account_print_invoice.rml @@ -194,7 +194,7 @@ <para style="terp_default_8"> <font color="white"> </font> </para> - <blockTable colWidths="219.0,87.0,62.0,56.0,46.0,62.0" style="Table7"> + <blockTable colWidths="202.0,87.0,71.0,57.0,42.0,71.0" style="Table7"> <tr> <td> <para style="terp_tblheader_Details">Description</para> @@ -218,7 +218,7 @@ </blockTable> <section> <para style="terp_default_2">[[ repeatIn(o.invoice_line,'l') ]]</para> - <blockTable colWidths="218.0,88.0,62.0,55.0,46.0,62.0" style="Table8"> + <blockTable colWidths="202.0,88.0,71.0,57.0,42.0,71.0" style="Table8"> <tr> <td> <para style="terp_default_9">[[ l.name ]]</para> @@ -271,7 +271,7 @@ </tr> </blockTable> </section> - <blockTable colWidths="407.0,54.0,69.0" style="Table10"> + <blockTable colWidths="391.0,54.0,85.0" style="Table10"> <tr> <td> <para style="terp_default_8"> @@ -315,7 +315,7 @@ <para style="Text body"> <font color="white"> </font> </para> - <blockTable colWidths="206.0,51.0,49.0,225.0" style="Table9"> + <blockTable colWidths="205.0,71.0,71.0,183.0" style="Table9"> <tr> <td> <para style="terp_tblheader_Details">Tax [[ o.tax_line==[] and removeParentNode('blockTable') ]]</para> @@ -335,7 +335,7 @@ </blockTable> <section> <para style="terp_default_2">[[ repeatIn(o.tax_line,'t') ]]</para> - <blockTable colWidths="205.0,52.0,49.0,224.0" style="Table2"> + <blockTable colWidths="205.0,71.0,71.0,184.0" style="Table2"> <tr> <td> <para style="terp_default_8">[[ t.name ]]</para> diff --git a/addons/account/report/account_print_overdue.rml b/addons/account/report/account_print_overdue.rml index 81a9f072b51..61533a2966c 100644 --- a/addons/account/report/account_print_overdue.rml +++ b/addons/account/report/account_print_overdue.rml @@ -1,5 +1,5 @@ <?xml version="1.0"?> -<document filename="test.pdf"> +<document filename="Overdue Payments.pdf"> <template pageSize="(595.0,842.0)" title="Overdue Payments" author="OpenERP S.A. (sales@openerp.com)" allowSplitting="20"> <pageTemplate id="first"> <frame id="first" x1="42.0" y1="28.0" width="511" height="786"/> diff --git a/addons/account/report/account_profit_horizontal.rml b/addons/account/report/account_profit_horizontal.rml index 89cbc4f8502..c7c4a94bcd7 100644 --- a/addons/account/report/account_profit_horizontal.rml +++ b/addons/account/report/account_profit_horizontal.rml @@ -1,6 +1,6 @@ <?xml version="1.0"?> -<document filename="test.pdf"> - <template pageSize="(1120.0,770.0)" title="Profit and Loss" author="OpenERP S.A. (sales@openerp.com)" allowSplitting="20" > +<document filename="Profit and Loss.pdf"> + <template pageSize="(1120.0,770.0)" title="Profit and Loss" author="OpenERP S.A.(sales@openerp.com)" allowSplitting="20" > <pageTemplate id="first"> <frame id="first" x1="22.0" y1="15.0" width="1080" height="680"/> </pageTemplate> diff --git a/addons/account/report/account_profit_loss.py b/addons/account/report/account_profit_loss.py index 0bfaea7a570..117f9e351fb 100644 --- a/addons/account/report/account_profit_loss.py +++ b/addons/account/report/account_profit_loss.py @@ -19,14 +19,12 @@ ############################################################################## import time - import pooler -import rml_parse from report import report_sxw from common_report_header import common_report_header from tools.translate import _ -class report_pl_account_horizontal(rml_parse.rml_parse, common_report_header): +class report_pl_account_horizontal(report_sxw.rml_parse, common_report_header): def __init__(self, cr, uid, name, context=None): super(report_pl_account_horizontal, self).__init__(cr, uid, name, context=context) diff --git a/addons/account/report/account_profit_loss.rml b/addons/account/report/account_profit_loss.rml index c371ab4c638..33e69d02e96 100644 --- a/addons/account/report/account_profit_loss.rml +++ b/addons/account/report/account_profit_loss.rml @@ -1,5 +1,5 @@ <?xml version="1.0"?> -<document filename="test.pdf"> +<document filename="Profit and Loss.pdf"> <template pageSize="(595.0,842.0)" title="Profit and Loss" author="OpenERP S.A. (sales@openerp.com)" allowSplitting="20"> <pageTemplate id="first"> <frame id="first" x1="28.0" y1="28.0" width="539" height="786"/> @@ -238,7 +238,7 @@ <blockTable colWidths="426.0,113.0" style="Table_Net_Profit_Loss"> <tr> <td> - <para style="terp_default_Bold_9">Total:([[ get_currency(data) ]])</para> + <para style="terp_default_Bold_9">Total:</para> </td> <td> <para style="terp_default_Right_9_Bold"><u>[[ formatLang(abs(sum_dr())) ]] [[ company.currency_id.symbol ]]</u></para> diff --git a/addons/account/report/account_tax_code.py b/addons/account/report/account_tax_code.py index 42bbe305381..86d3128cfe7 100644 --- a/addons/account/report/account_tax_code.py +++ b/addons/account/report/account_tax_code.py @@ -21,8 +21,6 @@ ############################################################################## import time - -import rml_parse from report import report_sxw def _get_country(record): @@ -44,7 +42,7 @@ def _record_to_report_line(record): 'country': _get_country(record) } -class account_tax_code_report(rml_parse.rml_parse): +class account_tax_code_report(report_sxw.rml_parse): def __init__(self, cr, uid, name, context): super(account_tax_code_report, self).__init__(cr, uid, name, context=context) self.localcontext.update({ diff --git a/addons/account/report/account_tax_code.rml b/addons/account/report/account_tax_code.rml index 82297022fb4..7489ac72a39 100644 --- a/addons/account/report/account_tax_code.rml +++ b/addons/account/report/account_tax_code.rml @@ -1,6 +1,6 @@ <?xml version="1.0"?> -<document filename="test.pdf"> - <template pageSize="(595.0,842.0)" title="Accounting Entries" author="OpenERP S.A. (sales@openerp.com)" allowSplitting="20"> +<document filename="Accounting Entries.pdf"> + <template pageSize="(595.0,842.0)" title="Accounting Entries" author="OpenERP S.A.(sales@openerp.com)" allowSplitting="20"> <pageTemplate id="first"> <frame id="first" x1="28.0" y1="42.0" width="539" height="758"/> </pageTemplate> diff --git a/addons/account/report/account_tax_report.py b/addons/account/report/account_tax_report.py index 4361448790c..a3bdc1a75f6 100644 --- a/addons/account/report/account_tax_report.py +++ b/addons/account/report/account_tax_report.py @@ -21,11 +21,10 @@ import time -import rml_parse from common_report_header import common_report_header from report import report_sxw -class tax_report(rml_parse.rml_parse, common_report_header): +class tax_report(report_sxw.rml_parse, common_report_header): _name = 'report.account.vat.declaration' def set_context(self, objects, data, ids, report_type=None): @@ -61,7 +60,6 @@ class tax_report(rml_parse.rml_parse, common_report_header): 'get_basedon': self._get_basedon, }) - def _get_basedon(self, form): return form['form']['based_on'] diff --git a/addons/account/report/account_tax_report.rml b/addons/account/report/account_tax_report.rml index 41790ea6f07..de4aa415fef 100644 --- a/addons/account/report/account_tax_report.rml +++ b/addons/account/report/account_tax_report.rml @@ -1,38 +1,11 @@ <?xml version="1.0"?> -<document filename="test.pdf"> - <template pageSize="(595.0,842.0)" title="Taxes" author="OpenERP S.A. (sales@openerp.com)" allowSplitting="20"> +<document filename="Taxes.pdf"> + <template pageSize="(595.0,842.0)" title="Taxes" author="OpenERP S.A.(sales@openerp.com)" allowSplitting="20"> <pageTemplate id="first"> <frame id="first" x1="42.0" y1="62.0" width="511" height="728"/> - <pageGraphics> - <!--logo--> - <!--<fill color="darkblue"/>--> - <!--<stroke color="darkblue"/>--> - - <!--TITLE COMPANY--> - <!-- <drawString x="4.6cm" y="28.7cm">[[ company.partner_id.name ]]</drawString> --> - - <setFont name="Helvetica-Bold" size="9"/> - - - <!--COL 1--> - <drawString x="1.0cm" y="28.1cm">[[ company.name ]]</drawString> - <drawRightString x="20cm" y="28.1cm">Tax Report</drawRightString> - - - <setFont name="Helvetica" size="9"/> - <drawString x="1.0cm" y="1cm"> [[ formatLang(time.strftime("%Y-%m-%d %H:%M:%S", time.localtime()),date_time = True) ]]</drawString> - <drawString x="19.0cm" y="1cm">Page <pageNumber/></drawString> - <!--<drawRightString x="19.8cm" y="28cm">[[ company.rml_header1 ]]</drawRightString>--> - - - <lineMode width="0.7"/> - <lines>1cm 27.7cm 20cm 27.7cm</lines> - <setFont name="Helvetica" size="8"/> - </pageGraphics> - </pageTemplate> </template> - <stylesheet> + <stylesheet> <blockTableStyle id="Standard_Outline"> <blockAlignment value="LEFT"/> <blockValign value="TOP"/> diff --git a/addons/account/report/account_voucher_print.py b/addons/account/report/account_voucher_print.py index a174a6ad680..912e0794a9c 100644 --- a/addons/account/report/account_voucher_print.py +++ b/addons/account/report/account_voucher_print.py @@ -21,7 +21,6 @@ ############################################################################## import time - from report import report_sxw from tools import amount_to_text_en diff --git a/addons/account/report/rml_parse.py b/addons/account/report/rml_parse.py deleted file mode 100644 index cf33d1c6ae0..00000000000 --- a/addons/account/report/rml_parse.py +++ /dev/null @@ -1,148 +0,0 @@ -# -*- coding: utf-8 -*- -############################################################################## -# -# OpenERP, Open Source Management Solution -# Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>). -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as -# published by the Free Software Foundation, either version 3 of the -# License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Affero General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. -# -############################################################################## - -import time - -import re -import sys - -from report import report_sxw - -class rml_parse(report_sxw.rml_parse): - def __init__(self, cr, uid, name, context): - super(rml_parse, self).__init__(cr, uid, name, context=context) - self.localcontext.update({ - 'comma_me': self.comma_me, - 'format_date': self._get_and_change_date_format_for_swiss, - 'strip_name': self._strip_name, - 'explode_name': self._explode_name, - }) - - def comma_me(self,amount): - #print "#" + str(amount) + "#" - if not amount: - amount = 0.0 - if type(amount) is float: - amount = str('%.2f'%amount) - else: - amount = str(amount) - if (amount == '0'): - return ' ' - orig = amount - new = re.sub("^(-?\d+)(\d{3})", "\g<1>'\g<2>", amount) - if orig == new: - return new - else: - return self.comma_me(new) - def _ellipsis(self, string, maxlen=100, ellipsis = '...'): - ellipsis = ellipsis or '' - try: - return string[:maxlen - len(ellipsis) ] + (ellipsis, '')[len(string) < maxlen] - except: - return False - def _strip_name(self, name, maxlen=50): - return self._ellipsis(name, maxlen, '...') - - def _get_and_change_date_format_for_swiss(self,date_to_format): - date_formatted='' - if date_to_format: - date_formatted = strptime(date_to_format,'%Y-%m-%d').strftime('%d.%m.%Y') - return date_formatted - - def _explode_name(self,chaine,length): - # We will test if the size is less then account - full_string = '' - if (len(str(chaine)) <= length): - return chaine - # - else: - chaine = unicode(chaine,'utf8').encode('iso-8859-1') - rup = 0 - for carac in chaine: - rup = rup + 1 - if rup == length: - full_string = full_string + '\n' - full_string = full_string + carac - rup = 0 - else: - full_string = full_string + carac - - return full_string - - def makeAscii(self,str): - try: - Stringer = str.encode("utf-8") - except UnicodeDecodeError: - try: - Stringer = str.encode("utf-16") - except UnicodeDecodeError: - print "UTF_16 Error" - Stringer = str - else: - return Stringer - else: - return Stringer - return Stringer - def explode_this(self,chaine,length): - chaine = chaine.rstrip() - ast = list(chaine) - i = length - while i <= len(ast): - ast.insert(i,'\n') - i = i + length - chaine = str("".join(ast)) - return chaine - def repair_string(self, chaine): - ast = list(chaine) - UnicodeAst = [] - i = 0 - while i < len(ast): - elem = ast[i] - try: - elem.encode("utf-8") - except UnicodeDecodeError: - to_reencode = elem + ast[i+1] - print str(to_reencode) - Good_char = to_reencode.decode('utf-8') - UnicodeAst.append(Good_char) - i += i +2 - else: - UnicodeAst.append(elem) - i += i + 1 - - - return "".join(UnicodeAst) - - def ReencodeAscii(self,str): - print sys.stdin.encoding - try: - Stringer = str.decode("ascii") - except UnicodeEncodeError: - print "REENCODING ERROR" - return str.encode("ascii") - except UnicodeDecodeError: - print "DECODING ERROR" - return str.encode("ascii") - - else: - return Stringer - -# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file diff --git a/addons/account/test/account_report.yml b/addons/account/test/account_report.yml index 9fcd976a235..0e0ddfb3e99 100644 --- a/addons/account/test/account_report.yml +++ b/addons/account/test/account_report.yml @@ -16,7 +16,7 @@ - !python {model: account.invoice}: | import netsvc, tools, os - (data, format) = netsvc.LocalService('report.account.invoice').create(cr, uid, [ref('test_invoice_1')], {}, {}) + (data, format) = netsvc.LocalService('report.account.invoice').create(cr, uid, [ref('account.account_invoice_customer0')], {}, {}) if tools.config['test_report_directory']: file(os.path.join(tools.config['test_report_directory'], 'account-invoice.'+format), 'wb+').write(data) @@ -39,41 +39,6 @@ file(os.path.join(tools.config['test_report_directory'], 'account-voucher-report.'+format), 'wb+').write(data) - - Demo data for Account tax code -- - !record {model: account.tax.code, id: account_tax_code_0}: - name : Tax Code Test - sign : 10.00 -- - Print Tax Code entries report -- - !python {model: account.tax.code}: | - import netsvc, tools, os - (data, format) = netsvc.LocalService('report.account.tax.code.entries').create(cr, uid, [ref('account_tax_code_0')], {}, {}) - if tools.config['test_report_directory']: - file(os.path.join(tools.config['test_report_directory'], 'account-tax-code-entries.'+format), 'wb+').write(data) - - -- - Print Vat Declaration Report -- - !python {model: account.tax.code}: | - import netsvc, tools, os - data_dict = {'model': 'ir.ui.menu', 'form': {'based_on': 'invoices','company_id':ref('base.main_company'),'periods':[]}} - (data, format) = netsvc.LocalService('report.account.vat.declaration').create(cr, uid, [ref("account_move_0")], data_dict, {}) - if tools.config['test_report_directory']: - file(os.path.join(tools.config['test_report_directory'], 'account-vat-declaration.'+format), 'wb+').write(data) - -- - In order to test the PDF reports defined on an invoice, we will print an invoice -- - !python {model: account.invoice}: | - import netsvc, tools, os - (data, format) = netsvc.LocalService('report.account.invoice').create(cr, uid, [ref('test_invoice_1')], {}, {}) - if tools.config['test_report_directory']: - file(os.path.join(tools.config['test_report_directory'], 'account-invoice.'+format), 'wb+').write(data) - -- Print the Aged Partner Balance Report - !python {model: res.partner}: | diff --git a/addons/account_analytic_plans/report/crossovered_analytic.rml b/addons/account_analytic_plans/report/crossovered_analytic.rml index 1abde7093b8..0292522206d 100644 --- a/addons/account_analytic_plans/report/crossovered_analytic.rml +++ b/addons/account_analytic_plans/report/crossovered_analytic.rml @@ -133,6 +133,28 @@ <images/> </stylesheet> <story> + <pto> + <pto_header> + <blockTable colWidths="292.0,63.0,57.0,71.0,57.0" repeatRows="1" style="Table3"> + <tr> + <td> + <para style="terp_tblheader_Details">Account Name</para> + </td> + <td> + <para style="terp_tblheader_Details_Centre">Code</para> + </td> + <td> + <para style="terp_tblheader_Details_Right">Quantity</para> + </td> + <td> + <para style="terp_tblheader_Details_Right">Amount</para> + </td> + <td> + <para style="terp_tblheader_Details_Right">Percentage</para> + </td> + </tr> + </blockTable> + </pto_header> <para style="terp_default_8"> <font color="white"> </font> </para> @@ -277,5 +299,6 @@ <font color="white"> </font> </para> </section> + </pto> </story> </document>
\ No newline at end of file diff --git a/addons/account_budget/report/analytic_account_budget_report.rml b/addons/account_budget/report/analytic_account_budget_report.rml index 10b54482ae7..a8b957f52a5 100644 --- a/addons/account_budget/report/analytic_account_budget_report.rml +++ b/addons/account_budget/report/analytic_account_budget_report.rml @@ -1,8 +1,8 @@ <?xml version="1.0"?> <document filename="Analytic Budget.pdf"> - <template pageSize="(595.0,842.0)" title="Analytic Budget" author="OpenERP S.A. (sales@openerp.com)" allowSplitting="20"> + <template pageSize="(595.0,842.0)" title="Analytic Budget" author="OpenERP S.A.(sales@openerp.com)" allowSplitting="20"> <pageTemplate id="first"> - <frame id="first" x1="57.0" y1="57.0" width="481" height="728"/> + <frame id="first" x1="35.0" y1="25.0" width="528" height="793"/> </pageTemplate> </template> <stylesheet> @@ -10,30 +10,41 @@ <blockAlignment value="LEFT"/> <blockValign value="TOP"/> </blockTableStyle> - <blockTableStyle id="Table2"> + <blockTableStyle id="Table1"> <blockAlignment value="LEFT"/> <blockValign value="TOP"/> - <lineStyle kind="LINEBELOW" colorName="#b3b3b3" start="0,-1" stop="0,-1"/> + <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="0,0" stop="0,-1"/> + <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="0,0" stop="0,0"/> + <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/> + <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="1,0" stop="1,-1"/> + <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"/> </blockTableStyle> - <blockTableStyle id="Table1"> + <blockTableStyle id="Table8"> <blockAlignment value="LEFT"/> <blockValign value="TOP"/> - <lineStyle kind="LINEABOVE" colorName="#cccccc" start="0,0" stop="0,0"/> - <lineStyle kind="LINEABOVE" colorName="#cccccc" start="1,0" stop="1,0"/> - <lineStyle kind="LINEBELOW" colorName="#cccccc" start="0,-1" stop="0,-1"/> - <lineStyle kind="LINEBELOW" colorName="#cccccc" start="1,-1" stop="1,-1"/> + <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="0,0" stop="0,-1"/> + <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="0,0" stop="0,0"/> + <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/> + <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="1,0" stop="1,-1"/> + <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"/> </blockTableStyle> <blockTableStyle id="Table3"> <blockAlignment value="LEFT"/> <blockValign value="TOP"/> <lineStyle kind="LINEBELOW" colorName="#000000" start="0,-1" stop="0,-1"/> - <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="1,0" stop="1,-1"/> <lineStyle kind="LINEBELOW" colorName="#000000" start="1,-1" stop="1,-1"/> - <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="2,0" stop="2,-1"/> <lineStyle kind="LINEBELOW" colorName="#000000" start="2,-1" stop="2,-1"/> - <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="3,0" stop="3,-1"/> <lineStyle kind="LINEBELOW" colorName="#000000" start="3,-1" stop="3,-1"/> - <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="4,0" stop="4,-1"/> <lineStyle kind="LINEBELOW" colorName="#000000" start="4,-1" stop="4,-1"/> </blockTableStyle> <blockTableStyle id="Table4"> @@ -69,7 +80,7 @@ <paraStyle name="Index" fontName="Helvetica"/> <paraStyle name="Horizontal Line" fontName="Helvetica" fontSize="6.0" leading="8" spaceBefore="0.0" spaceAfter="14.0"/> <paraStyle name="terp_header" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/> - <paraStyle name="terp_header_Centre" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="CENTER" spaceBefore="12.0" spaceAfter="6.0"/> + <paraStyle name="terp_header_Centre" fontName="Helvetica-Bold" fontSize="12.0" leading="15" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/> <paraStyle name="terp_default_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> <paraStyle name="terp_default_address" fontName="Helvetica" fontSize="10.0" leading="13" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> <paraStyle name="terp_tblheader_General" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/> @@ -78,7 +89,7 @@ <paraStyle name="terp_tblheader_General_Centre" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/> <paraStyle name="terp_tblheader_General_Right" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="6.0" spaceAfter="6.0"/> <paraStyle name="terp_tblheader_Details_Centre" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/> - <paraStyle name="terp_tblheader_Details_Right" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="6.0" spaceAfter="6.0"/> + <paraStyle name="terp_tblheader_Details_Right" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/> <paraStyle name="terp_default_Right_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/> <paraStyle name="terp_default_Centre_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/> <paraStyle name="terp_header_Right" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/> @@ -87,86 +98,111 @@ <paraStyle name="terp_default_Centre_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/> <paraStyle name="terp_default_Right_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/> <paraStyle name="terp_default_Bold_right_9" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/> + <paraStyle name="terp_default_2" fontName="Helvetica" fontSize="2.0" leading="3" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> <images/> </stylesheet> <story> - <para style="terp_default_8">[[repeatIn(objects,'o')]]</para> - <blockTable colWidths="482.0" style="Table2"> + <pto> + <pto_header> + <blockTable colWidths="221.0,82.0,83.0,85.0,57.0" style="Table3"> <tr> <td> - <para style="terp_header_Centre">Analytic Budget</para> + <para style="terp_tblheader_Details">Description</para> + </td> + <td> + <para style="terp_tblheader_Details_Centre">Theoretical Amt</para> + </td> + <td> + <para style="terp_tblheader_Details_Centre">Planned Amt</para> + </td> + <td> + <para style="terp_tblheader_Details_Centre">Practical Amt</para> + </td> + <td> + <para style="terp_tblheader_Details_Centre">Perc(%)</para> </td> </tr> </blockTable> - <blockTable colWidths="241.0,241.0" style="Table1"> + </pto_header> + <para style="terp_default_8">[[repeatIn(objects,'o')]]</para> + <para style="terp_header_Centre">Analytic Budget</para> + <para style="terp_default_8"> + <font color="white"> </font> + </para> + <blockTable colWidths="206.0,223.0,99.0" style="Table1"> <tr> <td> - <para style="terp_default_8"><font face="Helvetica-Bold">Currency:</font> [[ company.currency_id.name ]]</para> + <para style="terp_tblheader_General_Centre">Analysis from</para> </td> <td> - <para style="terp_default_Right_8"><b>Printed at:</b> [[ formatLang(time.strftime('%Y-%m-%d'),date=True) ]] at [[ time.strftime('%H:%M:%S')]]</para> + <para style="terp_tblheader_General_Centre">Analytic Account</para> + </td> + <td> + <para style="terp_tblheader_General_Centre">Currency</para> </td> </tr> + </blockTable> + <blockTable colWidths="206.0,223.0,99.0" style="Table8"> <tr> <td> - <para style="terp_default_8"><font face="Helvetica-Bold">Analysis from</font> [[ formatLang(data['form']['date_from'],date=True) ]] to [[ formatLang(data['form']['date_to'],date=True) ]]</para> + <para style="terp_default_Centre_8">[[ formatLang(data['form']['date_from'],date=True) ]] to [[ formatLang(data['form']['date_to'],date=True) ]]</para> + </td> + <td> + <para style="terp_default_Centre_8">[[ o.name ]]</para> </td> <td> - <para style="terp_default_Bold_right_9">Analytic Account : <font color="blue">[[ o.name ]]</font></para> + <para style="terp_default_Centre_8">[[ company.currency_id.name ]]</para> </td> </tr> </blockTable> - <para style="terp_default_8"> - <font color="white"> </font> - </para> - <para style="terp_default_8"> + <para style="Standard"> <font color="white"> </font> </para> - <blockTable colWidths="209.0,77.0,78.0,80.0,54.0" style="Table3"> + <blockTable colWidths="221.0,82.0,83.0,85.0,57.0" style="Table3"> <tr> <td> <para style="terp_tblheader_Details">Description</para> </td> <td> - <para style="terp_tblheader_General_Right">Theoretical Amt </para> + <para style="terp_tblheader_Details_Centre">Theoretical Amt</para> </td> <td> - <para style="terp_tblheader_General_Right">Planned Amt</para> + <para style="terp_tblheader_Details_Centre">Planned Amt</para> </td> <td> - <para style="terp_tblheader_General_Right">Practical Amt</para> + <para style="terp_tblheader_Details_Centre">Practical Amt</para> </td> <td> - <para style="terp_tblheader_General_Right">Perc(%)</para> + <para style="terp_tblheader_Details_Centre">Perc(%)</para> </td> </tr> </blockTable> <section> <para style="terp_default_8">[[ repeatIn(funct(o,data['form']),'a') ]]</para> - <blockTable colWidths="201.0,75.0,76.0,77.0,52.0" style="Table4"> + <blockTable colWidths="221.0,82.0,83.0,85.0,57.0" style="Table4"> <tr> <td> - <para style="terp_default_9"><font color="white">[['.....' *(a['status']-1) ]]</font><font face="Helvetica"> [[ (a['status']==1 and (setTag('para','para',{'fontName':'Helvetica-bold'}))) or removeParentNode('font') ]]</font> [[ a['name'] ]]</para> + <para style="terp_default_9"><font face="Helvetica" size="9.0" color="white">[['.....' *(a['status']-1) ]]</font><font face="Helvetica" size="8.0"> [[ (a['status']==1 and (setTag('para','para',{'fontName':'Helvetica-bold'}))) or removeParentNode('font') ]]</font> [[ a['name'] ]]</para> </td> <td> - <para style="terp_default_Right_9"><font face="Helvetica">[[ (a['status']==1 and ( setTag('para','para',{'fontName':'Helvetica-bold'}))) or removeParentNode('font') ]]</font> [[ formatLang(a['theo']) ]] [[ company.currency_id.symbol ]]</para> + <para style="terp_default_Right_9"><font face="Helvetica" size="8.0">[[ (a['status']==1 and ( setTag('para','para',{'fontName':'Helvetica-bold'}))) or removeParentNode('font') ]]</font> [[ formatLang(a['theo']) ]] [[ company.currency_id.symbol ]]</para> </td> <td> - <para style="terp_default_Right_9"><font face="Helvetica">[[ (a['status']==1 and ( setTag('para','para',{'fontName':'Helvetica-bold'}))) or removeParentNode('font') ]] [[ formatLang(a['pln']) ]]</font> [[ company.currency_id.symbol ]]</para> + <para style="terp_default_Right_9"><font face="Helvetica" size="8.0">[[ (a['status']==1 and ( setTag('para','para',{'fontName':'Helvetica-bold'}))) or removeParentNode('font') ]]</font> [[ formatLang(a['pln']) ]] [[ company.currency_id.symbol ]]</para> </td> <td> - <para style="terp_default_Right_9"><font face="Helvetica">[[ (a['status']==1 and ( setTag('para','para',{'fontName':'Helvetica-bold'}))) or removeParentNode('font') ]] [[ formatLang(a['prac']) ]]</font> [[ company.currency_id.symbol ]]</para> + <para style="terp_default_Right_9"><font face="Helvetica" size="8.0">[[ (a['status']==1 and ( setTag('para','para',{'fontName':'Helvetica-bold'}))) or removeParentNode('font') ]]</font> [[ formatLang(a['prac']) ]] [[ company.currency_id.symbol ]]</para> </td> <td> - <para style="terp_default_Right_9"><font face="Helvetica">[[ (a['status']==1 and ( setTag('para','para',{'fontName':'Helvetica-bold'}))) or removeParentNode('font') ]] [[ formatLang(a['perc']) ]]</font>%</para> + <para style="terp_default_Centre_9"><font face="Helvetica" size="8.0">[[ (a['status']==1 and ( setTag('para','para',{'fontName':'Helvetica-bold'}))) or removeParentNode('font') ]]</font> [[ formatLang(a['perc']) ]]%</para> </td> </tr> </blockTable> </section> - <blockTable colWidths="202.0,75.0,75.0,78.0,52.0" style="Table5"> + <blockTable colWidths="221.0,82.0,83.0,85.0,57.0" style="Table5"> <tr> <td> - <para style="terp_default_Bold_9">[[ repeatIn(funct_total(data['form']),'b') ]] Total:</para> + <para style="terp_tblheader_Details">[[ repeatIn(funct_total(data['form']),'b') ]] Total:</para> </td> <td> <para style="terp_default_Bold_right_9">[[ formatLang(b['tot_theo']) ]] [[ company.currency_id.symbol ]]</para> @@ -178,12 +214,13 @@ <para style="terp_default_Bold_right_9">[[ formatLang(b['tot_prac']) ]] [[ company.currency_id.symbol ]]</para> </td> <td> - <para style="terp_default_Bold_right_9">[[ formatLang(b['tot_perc']) ]]%</para> + <para style="terp_tblheader_Details_Centre">[[ formatLang(b['tot_perc']) ]]%</para> </td> </tr> </blockTable> <para style="terp_default_8"> <font color="white"> </font> </para> + </pto> </story> -</document> +</document>
\ No newline at end of file diff --git a/addons/account_budget/report/crossovered_budget_report.rml b/addons/account_budget/report/crossovered_budget_report.rml index 0533042822a..ef45c1bd2a6 100644 --- a/addons/account_budget/report/crossovered_budget_report.rml +++ b/addons/account_budget/report/crossovered_budget_report.rml @@ -1,8 +1,8 @@ <?xml version="1.0"?> -<document filename="Budgets.pdf"> - <template pageSize="(595.0,842.0)" title="Budgets" author="OpenERP S.A. (sales@openerp.com)" allowSplitting="20"> +<document filename="Budget.pdf"> + <template pageSize="(595.0,842.0)" title="Budget" author="OpenERP S.A.(sales@openerp.com)" allowSplitting="20"> <pageTemplate id="first"> - <frame id="first" x1="57.0" y1="57.0" width="481" height="728"/> + <frame id="first" x1="28.0" y1="33.0" width="535" height="778"/> </pageTemplate> </template> <stylesheet> @@ -10,28 +10,41 @@ <blockAlignment value="LEFT"/> <blockValign value="TOP"/> </blockTableStyle> - <blockTableStyle id="Table2"> + <blockTableStyle id="Table6"> <blockAlignment value="LEFT"/> <blockValign value="TOP"/> - <lineStyle kind="LINEBELOW" colorName="#b3b3b3" start="0,-1" stop="0,-1"/> + <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="0,0" stop="0,-1"/> + <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="0,0" stop="0,0"/> + <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/> + <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="1,0" stop="1,-1"/> + <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"/> </blockTableStyle> - <blockTableStyle id="Table1"> + <blockTableStyle id="Table7"> <blockAlignment value="LEFT"/> <blockValign value="TOP"/> + <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="0,0" stop="0,-1"/> + <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="0,0" stop="0,0"/> <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/> + <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="1,0" stop="1,-1"/> + <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"/> </blockTableStyle> <blockTableStyle id="Table3"> <blockAlignment value="LEFT"/> <blockValign value="TOP"/> <lineStyle kind="LINEBELOW" colorName="#000000" start="0,-1" stop="0,-1"/> - <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="1,0" stop="1,-1"/> <lineStyle kind="LINEBELOW" colorName="#000000" start="1,-1" stop="1,-1"/> - <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="2,0" stop="2,-1"/> <lineStyle kind="LINEBELOW" colorName="#000000" start="2,-1" stop="2,-1"/> - <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="3,0" stop="3,-1"/> <lineStyle kind="LINEBELOW" colorName="#000000" start="3,-1" stop="3,-1"/> - <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="4,0" stop="4,-1"/> <lineStyle kind="LINEBELOW" colorName="#000000" start="4,-1" stop="4,-1"/> </blockTableStyle> <blockTableStyle id="Table4"> @@ -67,16 +80,16 @@ <paraStyle name="Index" fontName="Helvetica"/> <paraStyle name="Horizontal Line" fontName="Helvetica" fontSize="6.0" leading="8" spaceBefore="0.0" spaceAfter="14.0"/> <paraStyle name="terp_header" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/> - <paraStyle name="terp_header_Centre" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="CENTER" spaceBefore="12.0" spaceAfter="6.0"/> + <paraStyle name="terp_header_Centre" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/> <paraStyle name="terp_default_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> <paraStyle name="terp_default_address" fontName="Helvetica" fontSize="10.0" leading="13" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> <paraStyle name="terp_tblheader_General" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/> - <paraStyle name="terp_tblheader_Details" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/> + <paraStyle name="terp_tblheader_Details" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> <paraStyle name="terp_default_Bold_8" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> <paraStyle name="terp_tblheader_General_Centre" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/> <paraStyle name="terp_tblheader_General_Right" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="6.0" spaceAfter="6.0"/> - <paraStyle name="terp_tblheader_Details_Centre" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/> - <paraStyle name="terp_tblheader_Details_Right" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="6.0" spaceAfter="6.0"/> + <paraStyle name="terp_tblheader_Details_Centre" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/> + <paraStyle name="terp_tblheader_Details_Right" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/> <paraStyle name="terp_default_Right_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/> <paraStyle name="terp_default_Centre_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/> <paraStyle name="terp_header_Right" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/> @@ -90,38 +103,40 @@ </stylesheet> <story> <para style="terp_default_8">[[ repeatIn(objects,'o') ]]</para> - <blockTable colWidths="482.0" style="Table2"> + <para style="terp_header_Centre">Budget</para> + <para style="terp_default_8"> + <font color="white"> </font> + </para> + <blockTable colWidths="198.0,252.0,85.0" style="Table6"> <tr> <td> - <para style="terp_header_Centre">Budget</para> + <para style="terp_tblheader_General_Centre">Analysis from</para> </td> - </tr> - </blockTable> - <blockTable colWidths="241.0,241.0" style="Table1"> - <tr> <td> - <para style="terp_default_9"><font face="Helvetica-Bold">Currency: </font>[[ company.currency_id.name ]]</para> + <para style="terp_tblheader_General_Centre">Budget</para> </td> <td> - <para style="terp_default_Right_9">Printed at: [[ formatLang(time.strftime('%Y-%m-%d'),date=True) ]] at [[ time.strftime('%H:%M:%S')]]</para> + <para style="terp_tblheader_General_Centre">Currency</para> </td> </tr> + </blockTable> + <blockTable colWidths="198.0,252.0,85.0" style="Table7"> <tr> <td> - <para style="terp_default_9"><font face="Helvetica-Bold">Analysis from</font> [[ formatLang(data['form']['date_from'],date=True) ]] to [[ formatLang(data['form']['date_to'],date=True) ]]</para> + <para style="terp_default_Centre_8">[[ formatLang(data['form']['date_from'],date=True) ]] to [[ formatLang(data['form']['date_to'],date=True) ]]</para> </td> <td> - <para style="terp_default_Bold_right_9">Budget : <font color="Blue">[[ o.name ]]</font></para> + <para style="terp_default_Centre_8">[[ o.name ]]</para> + </td> + <td> + <para style="terp_default_Centre_8">[[ company.currency_id.name ]]</para> </td> </tr> </blockTable> <para style="terp_default_8"> <font color="white"> </font> </para> - <para style="terp_default_8"> - <font color="white"> </font> - </para> - <blockTable colWidths="191.0,82.0,81.0,83.0,62.0" style="Table3"> + <blockTable colWidths="205.0,88.0,87.0,89.0,67.0" style="Table3"> <tr> <td> <para style="terp_tblheader_Details">Description</para> @@ -136,36 +151,36 @@ <para style="terp_tblheader_Details_Right">Practical Amt</para> </td> <td> - <para style="terp_tblheader_Details_Right">Perc(%)</para> + <para style="terp_tblheader_Details_Centre">Perc(%)</para> </td> </tr> </blockTable> <section> <para style="terp_default_8">[[ repeatIn(funct(o,data['form']),'a') ]]</para> - <blockTable colWidths="185.0,79.0,78.0,81.0,59.0" style="Table4"> + <blockTable colWidths="205.0,88.0,87.0,90.0,66.0" style="Table4"> <tr> <td> - <para style="terp_default_9"><font color="white">[['.....' *(a['status']-1) ]]</font><font face="Helvetica">[[ (a['status']==1 and (setTag('para','para',{'fontName':'Helvetica-bold'}))) or removeParentNode('font') ]] </font>[[ a['name'] ]]</para> + <para style="terp_default_9"><font face="Helvetica" size="10.0" color="white">[['.....' *(a['status']-1) ]]</font><font face="Helvetica" size="8.0">[[ (a['status']==1 and (setTag('para','para',{'fontName':'Helvetica-bold'}))) or removeParentNode('font') ]]</font> [[ a['name'] ]]</para> </td> <td> - <para style="terp_default_Right_9"><font face="Helvetica">[[ (a['status']==1 and ( setTag('para','para',{'fontName':'Helvetica-bold'}))) or removeParentNode('font') ]]</font> [[ formatLang(a['theo'], digits=get_digits(dp='Account')) ]] [[ company.currency_id.symbol ]]</para> + <para style="terp_default_Right_9"><font face="Helvetica" size="8.0">[[ (a['status']==1 and ( setTag('para','para',{'fontName':'Helvetica-bold'}))) or removeParentNode('font') ]]</font> [[ formatLang(a['theo'], digits=get_digits(dp='Account')) ]] [[ company.currency_id.symbol ]]</para> </td> <td> - <para style="terp_default_Right_9"><font face="Helvetica">[[ (a['status']==1 and ( setTag('para','para',{'fontName':'Helvetica-bold'}))) or removeParentNode('font') ]] </font>[[ formatLang(a['pln'], digits=get_digits(dp='Account')) ]] [[ company.currency_id.symbol ]]</para> + <para style="terp_default_Right_9"><font face="Helvetica" size="8.0">[[ (a['status']==1 and ( setTag('para','para',{'fontName':'Helvetica-bold'}))) or removeParentNode('font') ]]</font> [[ formatLang(a['pln'], digits=get_digits(dp='Account')) ]] [[ company.currency_id.symbol ]]</para> </td> <td> - <para style="terp_default_Right_9"><font face="Helvetica">[[ (a['status']==1 and ( setTag('para','para',{'fontName':'Helvetica-bold'}))) or removeParentNode('font') ]] </font>[[ formatLang(a['prac'], digits=get_digits(dp='Account')) ]] [[ company.currency_id.symbol ]]</para> + <para style="terp_default_Right_9"><font face="Helvetica" size="8.0">[[ (a['status']==1 and ( setTag('para','para',{'fontName':'Helvetica-bold'}))) or removeParentNode('font') ]]</font> [[ formatLang(a['prac'], digits=get_digits(dp='Account')) ]] [[ company.currency_id.symbol ]]</para> </td> <td> - <para style="terp_default_Right_9"><font face="Helvetica">[[ (a['status']==1 and ( setTag('para','para',{'fontName':'Helvetica-bold'}))) or removeParentNode('font') ]] </font>[[ formatLang(a['perc'], digits=2) ]]%</para> + <para style="terp_default_Centre_9"><font face="Helvetica" size="8.0">[[ (a['status']==1 and ( setTag('para','para',{'fontName':'Helvetica-bold'}))) or removeParentNode('font') ]]</font> [[ formatLang(a['perc'],digits=2) ]]%</para> </td> </tr> </blockTable> </section> - <blockTable colWidths="185.0,82.0,80.0,81.0,60.0" style="Table5"> + <blockTable colWidths="203.0,90.0,88.0,89.0,66.0" style="Table5"> <tr> <td> - <para style="terp_default_Bold_9"><font face="Helvetica">[[ repeatIn(funct_total(data['form']),'b') ]]</font>Total:</para> + <para style="terp_tblheader_Details">[[ repeatIn(funct_total(data['form']),'b') ]] Total :</para> </td> <td> <para style="terp_default_Bold_right_9">[[ formatLang(b['tot_theo'], digits=get_digits(dp='Account')) ]] [[ company.currency_id.symbol ]]</para> @@ -177,7 +192,7 @@ <para style="terp_default_Bold_right_9">[[ formatLang(b['tot_prac'], digits=get_digits(dp='Account')) ]] [[ company.currency_id.symbol ]]</para> </td> <td> - <para style="terp_default_Bold_right_9">[[ formatLang(b['tot_perc'], digits=2) ]]%</para> + <para style="terp_tblheader_Details_Centre">[[ formatLang(b['tot_perc'],digits=2) ]]%</para> </td> </tr> </blockTable> @@ -185,4 +200,4 @@ <font color="white"> </font> </para> </story> -</document> +</document>
\ No newline at end of file diff --git a/addons/account_invoice_layout/report/report_account_invoice_layout.rml b/addons/account_invoice_layout/report/report_account_invoice_layout.rml index df7c25f3de8..1eac32853e5 100644 --- a/addons/account_invoice_layout/report/report_account_invoice_layout.rml +++ b/addons/account_invoice_layout/report/report_account_invoice_layout.rml @@ -60,7 +60,6 @@ <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="3,-1" stop="3,-1"/> <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="4,-1" stop="4,-1"/> <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="5,-1" stop="5,-1"/> - <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="6,-1" stop="6,-1"/> </blockTableStyle> <blockTableStyle id="Table1"> <blockAlignment value="LEFT"/> @@ -245,7 +244,7 @@ <para style="Standard"> <font color="white"> </font> </para> - <blockTable colWidths="284.0,64.0,64.0,52.0,75.0" style="Tableau6"> + <blockTable colWidths="283.0,71.0,57.0,57.0,71.0" style="Tableau6"> <tr> <td> <para style="terp_tblheader_Details">Description / Taxes</para> @@ -266,7 +265,7 @@ </blockTable> <section> <para style="terp_default_8">[[ repeatIn(invoice_lines(o), 'a') ]]</para> - <blockTable colWidths="4.0,280.0,44.0,21.0,66.0,53.0,71.0" style="Table_Invoice_Line_Content"> + <blockTable colWidths="4.0,280.0,71.0,57.0,57.0,71.0" style="Table_Invoice_Line_Content"> <tr> <td> <para style="terp_default_9">[[ a['type']=='text' and removeParentNode('blockTable')]]</para> @@ -275,10 +274,7 @@ <para style="terp_default_9"><font face="Helvetica">[[ ((a['type']=='title' or a['type']=='subtotal') and ( setTag('para','para',{'fontName':'Helvetica-bold'}))) or removeParentNode('font') ]]</font>[[ a['name'] ]] [[ a['type']=='article' and ('/ (' + a['tax_types'] + ')' ) ]]</para> </td> <td> - <para style="terp_default_Right_9"><font face="Helvetica">[[ (a['type']=='subtotal' and ( setTag('para','para',{'fontName':'Helvetica-bold'}))) or removeParentNode('font') ]]</font>[[ a['quantity'] ]]</para> - </td> - <td> - <para style="terp_default_Right_9">[[ a['uos'] ]]</para> + <para style="terp_default_Right_9"><font face="Helvetica">[[ (a['type']=='subtotal' and ( setTag('para','para',{'fontName':'Helvetica-bold'}))) or removeParentNode('font') ]]</font>[[ a['quantity'] ]] [[ a['uos'] ]]</para> </td> <td> <para style="terp_default_Right_9"><font face="Helvetica">[[ (a['type']=='subtotal' and ( setTag('para','para',{'fontName':'Helvetica-bold'}))) or removeParentNode('font') ]]</font>[[ a['price_unit'] ]]</para> @@ -322,11 +318,6 @@ <font color="white"> </font> </para> </td> - <td> - <para style="terp_default_Note"> - <font color="white"> </font> - </para> - </td> </tr> </blockTable> <blockTable colWidths="4.0,278.0,257.0" style="Table1"> @@ -344,8 +335,8 @@ </td> </tr> </blockTable> - <para style="terp_default_1">[[ a['type']!='break' and removeParentNode('pageBreak')]]</para> - <blockTable colWidths="284.0,64.0,64.0,52.0,75.0" style="Table2"> + <pageBreak style="terp_default_1">[[ a['type']!='break' and removeParentNode('pageBreak')]]</pageBreak> + <blockTable colWidths="283.0,71.0,57.0,57.0,71.0" style="Table2"> <tr> <td> <para style="terp_tblheader_Details">Description / Taxes [[ a['type']!='break' and removeParentNode('blockTable')]]</para> @@ -365,7 +356,7 @@ </tr> </blockTable> </section> - <blockTable colWidths="405.0,59.0,74.0" style="Tableau3"> + <blockTable colWidths="395.0,59.0,85.0" style="Tableau3"> <tr> <td> <para style="terp_default_9"> @@ -380,7 +371,7 @@ </td> </tr> </blockTable> - <blockTable colWidths="405.0,59.0,74.0" style="Table4"> + <blockTable colWidths="395.0,59.0,85.0" style="Table4"> <tr> <td> <para style="terp_default_9"> @@ -395,7 +386,7 @@ </td> </tr> </blockTable> - <blockTable colWidths="405.0,59.0,74.0" style="Table6"> + <blockTable colWidths="395.0,59.0,85.0" style="Table6"> <tr> <td> <para style="terp_default_9"> @@ -416,7 +407,7 @@ <para style="terp_default_8"> <font color="white"> </font> </para> - <blockTable colWidths="206.0,50.0,52.0,230.0" style="Table7"> + <blockTable colWidths="205.0,71.0,71.0,191.0" style="Table7"> <tr> <td> <para style="terp_tblheader_Details">Tax [[ o.tax_line==[] and removeParentNode('blockTable') ]]</para> @@ -436,7 +427,7 @@ </blockTable> <section> <para style="terp_default_8">[[ repeatIn(o.tax_line,'t') ]]</para> - <blockTable colWidths="206.0,49.0,52.0,230.0" style="Table8"> + <blockTable colWidths="206.0,71.0,71.0,191.0" style="Table8"> <tr> <td> <para style="terp_default_8">[[ t.name ]]</para> diff --git a/addons/account_invoice_layout/report/special_message_invoice.rml b/addons/account_invoice_layout/report/special_message_invoice.rml index 2925b3526b8..282dce2d988 100644 --- a/addons/account_invoice_layout/report/special_message_invoice.rml +++ b/addons/account_invoice_layout/report/special_message_invoice.rml @@ -60,7 +60,6 @@ <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="3,-1" stop="3,-1"/> <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="4,-1" stop="4,-1"/> <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="5,-1" stop="5,-1"/> - <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="6,-1" stop="6,-1"/> </blockTableStyle> <blockTableStyle id="Table1"> <blockAlignment value="LEFT"/> @@ -249,7 +248,7 @@ <para style="Standard"> <font color="white"> </font> </para> - <blockTable colWidths="284.0,64.0,64.0,52.0,75.0" style="Tableau6"> + <blockTable colWidths="283.0,71.0,57.0,57.0,71.0" style="Tableau6"> <tr> <td> <para style="terp_tblheader_Details">Description / Taxes</para> @@ -270,7 +269,7 @@ </blockTable> <section> <para style="terp_default_8">[[ repeatIn(invoice_lines(o), 'a') ]]</para> - <blockTable colWidths="4.0,280.0,44.0,21.0,66.0,53.0,71.0" style="Table_Invoice_Line_Content"> + <blockTable colWidths="4.0,280.0,71.0,57.0,57.0,71.0" style="Table_Invoice_Line_Content"> <tr> <td> <para style="terp_default_9">[[ a['type']=='text' and removeParentNode('blockTable')]]</para> @@ -279,10 +278,7 @@ <para style="terp_default_9"><font face="Helvetica">[[ ((a['type']=='title' or a['type']=='subtotal') and ( setTag('para','para',{'fontName':'Helvetica-bold'}))) or removeParentNode('font') ]]</font>[[ a['name'] ]] [[ a['type']=='article' and ('/ (' + a['tax_types'] +' )' ) ]]</para> </td> <td> - <para style="terp_default_Right_9"><font face="Helvetica">[[ (a['type']=='subtotal' and ( setTag('para','para',{'fontName':'Helvetica-bold'}))) or removeParentNode('font') ]]</font>[[ a['quantity'] ]]</para> - </td> - <td> - <para style="terp_default_Right_9">[[ a['uos'] ]]</para> + <para style="terp_default_Right_9"><font face="Helvetica">[[ (a['type']=='subtotal' and ( setTag('para','para',{'fontName':'Helvetica-bold'}))) or removeParentNode('font') ]]</font>[[ a['quantity'] ]] [[ a['uos'] ]]</para> </td> <td> <para style="terp_default_Right_9"><font face="Helvetica">[[ (a['type']=='subtotal' and ( setTag('para','para',{'fontName':'Helvetica-bold'}))) or removeParentNode('font') ]]</font>[[ a['price_unit'] ]]</para> @@ -326,11 +322,6 @@ <font color="white"> </font> </para> </td> - <td> - <para style="terp_default_Note"> - <font color="white"> </font> - </para> - </td> </tr> </blockTable> <blockTable colWidths="4.0,278.0,257.0" style="Table1"> @@ -348,8 +339,8 @@ </td> </tr> </blockTable> - <para style="terp_default_1">[[ a['type']!='break' and removeParentNode('pageBreak')]]</para> - <blockTable colWidths="284.0,64.0,64.0,52.0,75.0" style="Table2"> + <pageBreak style="terp_default_1">[[ a['type']!='break' and removeParentNode('pageBreak')]]</pageBreak> + <blockTable colWidths="283.0,71.0,57.0,57.0,71.0" style="Table2"> <tr> <td> <para style="terp_tblheader_Details">Description / Taxes [[ a['type']!='break' and removeParentNode('blockTable')]]</para> @@ -369,7 +360,7 @@ </tr> </blockTable> </section> - <blockTable colWidths="405.0,59.0,74.0" style="Tableau3"> + <blockTable colWidths="395.0,59.0,85.0" style="Tableau3"> <tr> <td> <para style="terp_default_9"> @@ -384,7 +375,7 @@ </td> </tr> </blockTable> - <blockTable colWidths="405.0,59.0,74.0" style="Table4"> + <blockTable colWidths="395.0,59.0,85.0" style="Table4"> <tr> <td> <para style="terp_default_9"> @@ -399,7 +390,7 @@ </td> </tr> </blockTable> - <blockTable colWidths="405.0,59.0,74.0" style="Table6"> + <blockTable colWidths="395.0,59.0,85.0" style="Table6"> <tr> <td> <para style="terp_default_9"> @@ -420,7 +411,7 @@ <para style="terp_default_8"> <font color="white"> </font> </para> - <blockTable colWidths="209.0,54.0,46.0,229.0" style="Table7"> + <blockTable colWidths="209.0,71.0,71.0,188.0" style="Table7"> <tr> <td> <para style="terp_tblheader_Details">Tax [[ o.tax_line==[] and removeParentNode('blockTable') ]]</para> @@ -440,7 +431,7 @@ </blockTable> <section> <para style="terp_default_1">[[ repeatIn(o.tax_line,'t') ]]</para> - <blockTable colWidths="209.0,55.0,46.0,229.0" style="Table8"> + <blockTable colWidths="209.0,71.0,71.0,188.0" style="Table8"> <tr> <td> <para style="terp_default_8">[[ t.name ]]</para> diff --git a/addons/account_voucher/report/rml_parse.py b/addons/account_voucher/report/rml_parse.py deleted file mode 100644 index 84b4fabc401..00000000000 --- a/addons/account_voucher/report/rml_parse.py +++ /dev/null @@ -1,150 +0,0 @@ -# -*- coding: utf-8 -*- -############################################################################## -# -# OpenERP, Open Source Management Solution -# Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>). -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as -# published by the Free Software Foundation, either version 3 of the -# License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Affero General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. -# -############################################################################## - -from report import report_sxw - -from datetime import datetime -import re - -class rml_parse(report_sxw.rml_parse): - def __init__(self, cr, uid, name, context): - super(rml_parse, self).__init__(cr, uid, name, context=None) - self.localcontext.update({ - 'comma_me': self.comma_me, - 'format_date': self._get_and_change_date_format_for_swiss, - 'strip_name': self._strip_name, - 'explode_name': self._explode_name, - }) - - def comma_me(self, amount): - if not amount: - amount = 0.0 - if type(amount) is float: - amount = str('%.2f'%amount) - else: - amount = str(amount) - if (amount == '0'): - return ' ' - orig = amount - new = re.sub("^(-?\d+)(\d{3})", "\g<1>'\g<2>", amount) - if orig == new: - return new - else: - return self.comma_me(new) - - def _ellipsis(self, string, maxlen=100, ellipsis = '...'): - ellipsis = ellipsis or '' - try: - return string[:maxlen - len(ellipsis) ] + (ellipsis, '')[len(string) < maxlen] - except: - return False - - def _strip_name(self, name, maxlen=50): - return self._ellipsis(name, maxlen, '...') - - def _get_and_change_date_format_for_swiss (self, date_to_format): - date_formatted = '' - if date_to_format: - date_formatted = datetime.strptime(date_to_format,'%Y-%m-%d').strftime('%d.%m.%Y') - return date_formatted - - def _explode_name(self, chaine, length): - # We will test if the size is less then account - full_string = '' - if (len(str(chaine)) <= length): - return chaine - # - else: - chaine = unicode(chaine,'utf8').encode('iso-8859-1') - rup = 0 - for carac in chaine: - rup = rup + 1 - if rup == length: - full_string = full_string + '\n' - full_string = full_string + carac - rup = 0 - else: - full_string = full_string + carac - - return full_string - - def makeAscii(self, str): - try: - Stringer = str.encode("utf-8") - except UnicodeDecodeError: - try: - Stringer = str.encode("utf-16") - except UnicodeDecodeError: - Stringer = str - else: - return Stringer - else: - return Stringer - return Stringer - - def explode_this(self, chaine, length): - chaine = chaine.rstrip() - ast = list(chaine) - i = length - while i <= len(ast): - ast.insert(i,'\n') - i = i + length - chaine = str("".join(ast)) - return chaine - - def repair_string(self, chaine): - ast = list(chaine) - UnicodeAst = [] - _previouslyfound = False - i = 0 - while i < len(ast): - elem = ast[i] - try: - Stringer = elem.encode("utf-8") - except UnicodeDecodeError: - to_reencode = elem + ast[i+1] - Good_char = to_reencode.decode('utf-8') - UnicodeAst.append(Good_char) - i += i +2 - else: - UnicodeAst.append(elem) - i += i + 1 - return "".join(UnicodeAst) - - def ReencodeAscii(self, str): - try: - Stringer = str.decode("ascii") - except UnicodeEncodeError: - return str.encode("ascii") - except UnicodeDecodeError: - return str.encode("ascii") - else: - return Stringer - - def _add_header(self, node, header=1): - if header == 2: - rml_head = self.rml_header2 - else: - rml_head = self.rml_header - rml_head = rml_head.replace('<pageGraphics>','''<pageGraphics> <image x="10" y="26cm" height="770.0" width="1120.0" >[[company.logo]] </image> ''') - return True - -# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file diff --git a/addons/board/board.py b/addons/board/board.py index 230954d942b..9677c8aaa17 100644 --- a/addons/board/board.py +++ b/addons/board/board.py @@ -21,6 +21,7 @@ from osv import fields, osv import time +import tools class board_board(osv.osv): """ @@ -223,4 +224,45 @@ class board_note(osv.osv): board_note() +class res_log_report(osv.osv): + """ Log Report """ + _name = "res.log.report" + _auto = False + _description = "Log Report" + _columns = { + 'name': fields.char('Year', size=64, required=False, readonly=True), + 'month':fields.selection([('01', 'January'), ('02', 'February'), \ + ('03', 'March'), ('04', 'April'),\ + ('05', 'May'), ('06', 'June'), \ + ('07', 'July'), ('08', 'August'),\ + ('09', 'September'), ('10', 'October'),\ + ('11', 'November'), ('12', 'December')], 'Month', readonly=True), + 'day': fields.char('Day', size=128, readonly=True), + 'creation_date': fields.date('Creation Date', readonly=True), + 'res_model': fields.char('Object', size=128), + 'nbr': fields.integer('# of Entries', readonly=True) + } + + def init(self, cr): + """ + Log Report + @param cr: the current row, from the database cursor + """ + tools.drop_view_if_exists(cr,'res_log_report') + cr.execute(""" + CREATE OR REPLACE VIEW res_log_report AS ( + SELECT + l.id as id, + 1 as nbr, + to_char(l.create_date, 'YYYY') as name, + to_char(l.create_date, 'MM') as month, + to_char(l.create_date, 'YYYY-MM-DD') as day, + to_char(l.create_date, 'YYYY-MM-DD') as creation_date, + l.res_model as res_model, + date_trunc('day',l.create_date) as create_date + FROM + res_log l + )""") +res_log_report() + # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/board/board_administration_view.xml b/addons/board/board_administration_view.xml index 7c7c0da57cf..337ca63dab8 100644 --- a/addons/board/board_administration_view.xml +++ b/addons/board/board_administration_view.xml @@ -1,6 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <openerp> <data> + <!-- User Connection --> <record model="ir.ui.view" id="view_user_connection_tree"> <field name="name">user.connection.tree</field> @@ -14,7 +15,7 @@ </field> </record> <record model="ir.actions.act_window" id="action_user_connection_tree"> - <field name="name">Latest Connections</field> + <field name="name">User Connections</field> <field name="res_model">res.users</field> <field name="view_type">form</field> <field name="view_mode">tree,form</field> @@ -28,6 +29,108 @@ <field name="view_type">form</field> <field name="view_mode">tree,form</field> </record> + + <!-- Log report search view --> + <record id="view_res_log_report_filter" model="ir.ui.view"> + <field name="name">res.log.report.select</field> + <field name="model">res.log.report</field> + <field name="type">search</field> + <field name="arch" type="xml"> + <search string="Log Analysis"> + <group col="20" colspan="8"> + <filter icon="terp-go-year" string=" Year " + domain="[('create_date','<=', time.strftime('%%Y-%%m-%%d')),('create_date','>=',time.strftime('%%Y-01-01'))]" + help="Log created in current year"/> + <filter icon="terp-go-month" string=" Month " + name="month" + domain="[('create_date','<=',(datetime.date.today()+relativedelta(day=31)).strftime('%%Y-%%m-%%d')),('create_date','>=',(datetime.date.today()-relativedelta(day=1)).strftime('%%Y-%%m-%%d'))]" + help="Log created in current month"/> + <filter icon="terp-go-month" + string=" Month-1 " + separator="1" + domain="[('create_date','<=', (datetime.date.today() - relativedelta(day=31, months=1)).strftime('%%Y-%%m-%%d')),('create_date','>=',(datetime.date.today() - relativedelta(day=1,months=1)).strftime('%%Y-%%m-%%d'))]" + help="Log created in last month"/> + </group> + <newline/> + <group expand="0" string="Extended Filters..." groups="base.group_extended"> + <field name="creation_date"/> + </group> + <newline/> + <group expand="1" string="Group By..."> + <filter string="Model" icon="terp-go-home" context="{'group_by':'res_model'}" /> + <separator orientation="vertical"/> + <filter string="Day" icon="terp-go-today" + domain="[]" context="{'group_by':'day'}"/> + <filter string="Month" icon="terp-go-month" + domain="[]" context="{'group_by':'month'}" /> + <filter string="Year" icon="terp-go-year" + domain="[]" context="{'group_by':'name'}" /> + </group> + </search> + </field> + </record> + + <!-- Log report Tree view --> + <record id="view_res_log_report_tree" model="ir.ui.view"> + <field name="name">res.log.report.tree</field> + <field name="model">res.log.report</field> + <field name="type">tree</field> + <field name="arch" type="xml"> + <tree string="Log Analysis"> + <field name="name" invisible="1"/> + <field name="month" invisible="1"/> + <field name="day" invisible="1"/> + <field name="res_model" invisible="1"/> + <field name="nbr" /> + <field name="creation_date" invisible="1"/> + </tree> + </field> + </record> + + <!-- Monthly Activity per Document --> + <record id="board_res_log_report_graph" model="ir.ui.view"> + <field name="name">board.res.log.report.graph</field> + <field name="model">res.log.report</field> + <field name="type">graph</field> + <field name="arch" type="xml"> + <graph string="Monthly Activity per Document" type="bar"> + <field name="res_model"/> + <field name="nbr" operator="+"/> + </graph> + </field> + </record> + <record id="board_monthly_res_log_report_action" model="ir.actions.act_window"> + <field name="name">Monthly Activity per Document</field> + <field name="res_model">res.log.report</field> + <field name="view_type">form</field> + <field name="view_mode">graph,tree</field> + <field name="domain">[('create_date','>',(datetime.date.today()-datetime.timedelta(days=30)).strftime('%Y-%m-%d'))]</field> + <field name="context">{'group_by':['res_model'],'group_by_no_leaf':1}</field> + <field name="view_id" ref="board_res_log_report_graph"></field> + </record> + + <!-- Weekly Global Activity --> + <record id="board_weekly_res_log_report_graph" model="ir.ui.view"> + <field name="name">board.weekly.res.log.report.graph</field> + <field name="model">res.log.report</field> + <field name="type">graph</field> + <field name="arch" type="xml"> + <graph string="Weekly Global Activity" type="bar"> + <field name="day"/> + <field name="nbr" operator="+"/> + </graph> + </field> + </record> + <record id="board_weekly_res_log_report_action" model="ir.actions.act_window"> + <field name="name">Weekly Global Activity</field> + <field name="res_model">res.log.report</field> + <field name="view_type">form</field> + <field name="view_mode">graph,tree</field> + <field name="domain">[('create_date','>',(datetime.date.today()-datetime.timedelta(days=7)).strftime('%Y-%m-%d'))]</field> + <field name="context">{'group_by':['day'],'group_by_no_leaf':1}</field> + <field name="view_id" ref="board_weekly_res_log_report_graph"></field> + </record> + <record id="board_administration_form" model="ir.ui.view"> <field name="name">board.administration.form</field> <field name="model">board.board</field> @@ -36,15 +139,18 @@ <form string="Administration Dashboard"> <hpaned position="100"> <child1> - <action name="%(action_latest_activities_tree)d" string="Latest Activities" sequence="1"/> - <action width="510" name="%(action_user_connection_tree)d" string="Latest Connections" /> + <action width="510" name="%(action_user_connection_tree)d" string="User Connections" /> + <action width="510" name="%(action_latest_activities_tree)d" string="Latest Activities" /> </child1> <child2> + <action name="%(board_monthly_res_log_report_action)d" string="Monthly Activity per Document"/> + <action name="%(board_weekly_res_log_report_action)d" string="Weekly Global Activity" /> </child2> </hpaned> </form> </field> </record> + <record id="open_board_administration_form" model="ir.actions.act_window"> <field name="name">Administration Dashboard</field> <field name="res_model">board.board</field> @@ -52,8 +158,12 @@ <field name="view_mode">form</field> <field name="view_id" ref="board_administration_form"/> </record> - <menuitem id="board.admin_menu_dasboard" name="Dashboard" sequence="0" parent="base.menu_reporting"/> - <menuitem id="menu_board_admin" action="open_board_administration_form" icon="terp-graph" parent="board.admin_menu_dasboard" /> + + <menuitem id="base.menu_reporting" name="Reporting" parent="base.menu_administration" sequence="11" + groups="base.group_extended"/> + <menuitem id="board.admin_menu_dasboard" name="Dashboard" sequence="0" parent="base.menu_reporting"/> + <menuitem id="menu_board_admin" action="open_board_administration_form" icon="terp-graph" parent="board.admin_menu_dasboard" /> + <menuitem icon="terp-administration" id="base.menu_administration" name="Administration" sequence="50" action="open_board_administration_form"/> </data> </openerp> diff --git a/addons/board/security/ir.model.access.csv b/addons/board/security/ir.model.access.csv index 44b9c3cfb6d..f4f4ccd0d3d 100644 --- a/addons/board/security/ir.model.access.csv +++ b/addons/board/security/ir.model.access.csv @@ -4,3 +4,4 @@ "access_board_note_type","board.note.type","model_board_note_type","base.group_user",1,1,1,1 "access_board_note","board.note","model_board_note","base.group_user",1,1,1,1 "access_board_board_sale_salesman","board.board.sale.salesman","model_board_board","base.group_sale_salesman",1,1,1,1 +"access_res_log_report","res.log.report","model_res_log_report","base.group_user",1,1,1,1
\ No newline at end of file diff --git a/addons/crm/board_crm_view.xml b/addons/crm/board_crm_view.xml index ee9a78109c8..f316ed4e26a 100644 --- a/addons/crm/board_crm_view.xml +++ b/addons/crm/board_crm_view.xml @@ -18,6 +18,17 @@ </field> </record> + <record id="view_report_crm_oppor_tree" model="ir.ui.view"> + <field name="name">crm.lead.report.tree</field> + <field name="model">crm.lead.report</field> + <field name="type">tree</field> + <field name="arch" type="xml"> + <tree string="Opportunity Analysis"> + <field name="stage_id"/> + <field name="planned_revenue"/> + </tree> + </field> + </record> <record id="view_report_crm_oppor_graph" model="ir.ui.view"> <field name="name">crm.lead.report.graph</field> <field name="model">crm.lead.report</field> @@ -100,7 +111,20 @@ <field name="view_mode">graph,tree,form</field> <field name="view_id" ref="view_report_crm_oppor_graph"/> <field name="domain">['&', '&', ('user_id','=',uid), ('type', '=', 'opportunity'), '!' , '&', ('state', '=', 'done'), ('date_closed','>',(datetime.date.today()-datetime.timedelta(days=30)).strftime('%Y-%m-%d'))]</field> + <field name="context">{'group_by_no_leaf':1,'group_by':['stage_id']}</field> </record> + <record id="open_view_report_crm_oppor_graph" model="ir.actions.act_window.view"> + <field eval="1" name="sequence"/> + <field name="view_mode">graph</field> + <field name="view_id" ref="view_report_crm_oppor_graph"/> + <field name="act_window_id" ref="act_my_oppor_stage"/> + </record> + <record id="open_view_report_crm_oppor_tree" model="ir.actions.act_window.view"> + <field eval="2" name="sequence"/> + <field name="view_mode">tree</field> + <field name="view_id" ref="view_report_crm_oppor_tree"/> + <field name="act_window_id" ref="act_my_oppor_stage"/> + </record> <record model="ir.actions.act_window" id="act_sales_pipeline"> <field name="res_model">crm.lead.report</field> @@ -159,6 +183,7 @@ sequence="1" id="menu_board_crm" icon="terp-graph" groups="base.group_sale_salesman"/> + <menuitem icon="terp-partner" id="base.menu_base_partner" name="Sales" sequence="0" action="open_board_crm"/> </data> </openerp> diff --git a/addons/crm/report/crm_lead_report_view.xml b/addons/crm/report/crm_lead_report_view.xml index 6f24d89bec2..f099ceede8b 100644 --- a/addons/crm/report/crm_lead_report_view.xml +++ b/addons/crm/report/crm_lead_report_view.xml @@ -29,6 +29,7 @@ <field name="email" sum="# Mails"/> <field name="delay_open"/> <field name="delay_close"/> + <field name="planned_revenue"/> </tree> </field> </record> @@ -79,7 +80,7 @@ <filter icon="terp-go-month" string=" Month-1 " separator="1" domain="[('create_date','<=', (datetime.date.today() - relativedelta(day=31, months=1)).strftime('%%Y-%%m-%%d')),('create_date','>=',(datetime.date.today() - relativedelta(day=1,months=1)).strftime('%%Y-%%m-%%d'))]" help="Leads/Opportunities created in last month"/> - + <separator orientation="vertical" /> <filter icon="terp-check" string="Active" @@ -93,7 +94,7 @@ string="Closed" domain="[('state','=','done')]" help="Leads/Opportunities which are in done state"/> - + <separator orientation="vertical" /> <field name="section_id" default="context.get('section_id', False)" @@ -127,7 +128,7 @@ <filter string="Salesman" name="user" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}" /> <filter string="Sales Team" icon="terp-personal+" - domain="[]" + domain="[]" context="{'group_by':'section_id'}" /> <filter string="Partner" icon="terp-partner" context="{'group_by':'partner_id'}" /> <filter string="Country" icon="terp-go-home" context="{'group_by':'country_id'}" /> diff --git a/addons/hr_attendance/report/attendance_errors.py b/addons/hr_attendance/report/attendance_errors.py index b0113aa88d4..29586ba5524 100644 --- a/addons/hr_attendance/report/attendance_errors.py +++ b/addons/hr_attendance/report/attendance_errors.py @@ -75,7 +75,7 @@ class attendance_print(report_sxw.rml_parse): } return [result_dict] -report_sxw.report_sxw('report.hr.attendance.error', 'hr.employee', 'addons/hr_attendance/report/attendance_errors.rml', parser=attendance_print, header=2) +report_sxw.report_sxw('report.hr.attendance.error', 'hr.employee', 'addons/hr_attendance/report/attendance_errors.rml', parser=attendance_print, header='internal') # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/hr_holidays/board_hr_holidays_view.xml b/addons/hr_holidays/board_hr_holidays_view.xml index aa654f1aa4c..f90607f3cc7 100644 --- a/addons/hr_holidays/board_hr_holidays_view.xml +++ b/addons/hr_holidays/board_hr_holidays_view.xml @@ -54,7 +54,7 @@ <field name="view_type">form</field> <field name="view_mode">graph,tree</field> <field name="domain">[('user_id','=',uid)]</field> - <field name="context">{'group_by_no_leaf':1}</field> + <field name="context">{'group_by':['holiday_status_id'],'group_by_no_leaf':1}</field> <field name="view_id" ref="hr_holidays.view_hr_available_holidays_report_graph"/> </record> <record id="board_hr_holidays_leave_by_month_form" model="ir.ui.view"> @@ -64,7 +64,7 @@ <field name="inherit_id" ref="hr.board_hr_form"/> <field name="arch" type="xml"> <xpath expr="/form/hpaned/child2" position="inside"> - <action colspan="4" height="220" name="%(action_hr_holidays_leaves_by_month)d" string="My Leaves by Type" /> + <action colspan="4" height="220" name="%(action_hr_holidays_leaves_by_month)d" string="Leaves By Month" /> </xpath> </field> </record> diff --git a/addons/hr_payroll/report/report_employees_detail.py b/addons/hr_payroll/report/report_employees_detail.py index 0ee57545daf..0e1451e469c 100644 --- a/addons/hr_payroll/report/report_employees_detail.py +++ b/addons/hr_payroll/report/report_employees_detail.py @@ -28,9 +28,8 @@ import datetime from report import report_sxw import time import pooler -import rml_parse -class employees_salary_report(rml_parse.rml_parse): +class employees_salary_report(report_sxw.rml_parse): def __init__(self, cr, uid, name, context): super(employees_salary_report, self).__init__(cr, uid, name, context) diff --git a/addons/hr_payroll/report/report_payroll_advice.py b/addons/hr_payroll/report/report_payroll_advice.py index d5019a82c50..5ac20d91d71 100644 --- a/addons/hr_payroll/report/report_payroll_advice.py +++ b/addons/hr_payroll/report/report_payroll_advice.py @@ -24,7 +24,6 @@ import time from datetime import datetime - from report import report_sxw from tools import amount_to_text_en diff --git a/addons/hr_payroll/report/report_payslip.py b/addons/hr_payroll/report/report_payslip.py index 9eb5204624b..d5cd6532251 100755 --- a/addons/hr_payroll/report/report_payslip.py +++ b/addons/hr_payroll/report/report_payslip.py @@ -23,7 +23,6 @@ ############################################################################## from datetime import datetime - from report import report_sxw from tools import amount_to_text_en diff --git a/addons/hr_payroll/report/report_year_salary.py b/addons/hr_payroll/report/report_year_salary.py index a11e1aa44ad..bc7ac8fc93a 100755 --- a/addons/hr_payroll/report/report_year_salary.py +++ b/addons/hr_payroll/report/report_year_salary.py @@ -26,9 +26,8 @@ import datetime from report import report_sxw import time import pooler -import rml_parse -class year_salary_report(rml_parse.rml_parse): +class year_salary_report(report_sxw.rml_parse): def __init__(self, cr, uid, name, context): super(year_salary_report, self).__init__(cr, uid, name, context) diff --git a/addons/hr_payroll/report/rml_parse.py b/addons/hr_payroll/report/rml_parse.py deleted file mode 100755 index b8a1791768e..00000000000 --- a/addons/hr_payroll/report/rml_parse.py +++ /dev/null @@ -1,154 +0,0 @@ -# -*- encoding: utf-8 -*- -############################################################################## -# -# OpenERP, Open Source Management Solution -# Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>). All Rights Reserved -# $Id$ -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Affero General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. -# -############################################################################## -from time import strptime - -from report import report_sxw -import re -from lxml import etree - - -class rml_parse(report_sxw.rml_parse): - def __init__(self, cr, uid, name, context): - super(rml_parse, self).__init__(cr, uid, name, context=None) - self.localcontext.update({ - 'comma_me': self.comma_me, - 'format_date': self._get_and_change_date_format_for_swiss, - 'strip_name': self._strip_name, - 'explode_name': self._explode_name, - }) - - def comma_me(self,amount): - if not amount: - amount = 0.0 - if type(amount) is float: - amount = str('%.2f'%amount) - else: - amount = str(amount) - if (amount == '0'): - return ' ' - orig = amount - new = re.sub("^(-?\d+)(\d{3})", "\g<1>'\g<2>", amount) - if orig == new: - return new - else: - return self.comma_me(new) - - def _ellipsis(self, string, maxlen=100, ellipsis = '...'): - ellipsis = ellipsis or '' - try: - return string[:maxlen - len(ellipsis) ] + (ellipsis, '')[len(string) < maxlen] - except Exception: - return False - - def _strip_name(self, name, maxlen=50): - return self._ellipsis(name, maxlen, '...') - - def _get_and_change_date_format_for_swiss (self,date_to_format): - date_formatted='' - if date_to_format: - date_formatted = strptime(date_to_format,'%Y-%m-%d').strftime('%d.%m.%Y') - return date_formatted - - def _explode_name(self,chaine,length): - # We will test if the size is less then account - full_string = '' - if (len(str(chaine)) <= length): - return chaine - # - else: - chaine = unicode(chaine,'utf8').encode('iso-8859-1') - rup = 0 - for carac in chaine: - rup = rup + 1 - if rup == length: - full_string = full_string + '\n' - full_string = full_string + carac - rup = 0 - else: - full_string = full_string + carac - - return full_string - - def makeAscii(self,str): - try: - Stringer = str.encode("utf-8") - except UnicodeDecodeError: - try: - Stringer = str.encode("utf-16") - except UnicodeDecodeError: - print "UTF_16 Error" - Stringer = str - else: - return Stringer - else: - return Stringer - return Stringer - - def explode_this(self,chaine,length): - chaine = chaine.rstrip() - ast = list(chaine) - i = length - while i <= len(ast): - ast.insert(i,'\n') - i = i + length - chaine = str("".join(ast)) - return chaine - - def repair_string(self,chaine): - ast = list(chaine) - UnicodeAst = [] - i = 0 - while i < len(ast): - elem = ast[i] - try: - Stringer = elem.encode("utf-8") - except UnicodeDecodeError: - to_reencode = elem + ast[i+1] - print str(to_reencode) - Good_char = to_reencode.decode('utf-8') - UnicodeAst.append(Good_char) - i += i +2 - else: - UnicodeAst.append(elem) - i += i + 1 - return "".join(UnicodeAst) - - def _add_header(self, node, header='external'): - if header=='internal': - rml_head = self.rml_header2 - elif header=='internal landscape': - rml_head = self.rml_header3 - else: - rml_head = self.rml_header - rml_head = rml_head.replace('<pageGraphics>','''<pageGraphics> <image x="10" y="26cm" height="770.0" width="1120.0" >[[company.logo]] </image> ''') - rml_dom = node - head_dom = etree.XML(rml_head) - for tag in head_dom: - found = rml_dom.find('.//'+tag.tag) - if found is not None and found: - if tag.get('position'): - found.append(tag) - else: - found.getparent().replace(found,tag) - return True - -# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file diff --git a/addons/lunch/report/order.py b/addons/lunch/report/order.py index 29c9d381745..11ca7f79dbc 100644 --- a/addons/lunch/report/order.py +++ b/addons/lunch/report/order.py @@ -41,8 +41,12 @@ class order(report_sxw.rml_parse): total=0.0 for line in lines: total+=line.price + self.net_total+=total return total + def get_nettotal(self): + return self.net_total + def get_users(self, objects): users=[] for obj in objects: @@ -52,12 +56,13 @@ class order(report_sxw.rml_parse): def __init__(self, cr, uid, name, context): super(order, self).__init__(cr, uid, name, context) - + self.net_total=0.0 self.localcontext.update({ 'time': time, 'get_lines': self.get_lines, 'get_users': self.get_users, 'get_total': self.get_total, + 'get_nettotal': self.get_nettotal, }) report_sxw.report_sxw('report.lunch.order', 'lunch.order', diff --git a/addons/lunch/report/order.rml b/addons/lunch/report/order.rml index d47816abd9c..ba66dcddb03 100644 --- a/addons/lunch/report/order.rml +++ b/addons/lunch/report/order.rml @@ -14,25 +14,28 @@ <blockAlignment value="LEFT"/> <blockValign value="TOP"/> </blockTableStyle> - <blockTableStyle id="Table2"> + <blockTableStyle id="Table5"> <blockAlignment value="LEFT"/> <blockValign value="TOP"/> <lineStyle kind="LINEBELOW" colorName="#000000" start="0,-1" stop="0,-1"/> <lineStyle kind="LINEBELOW" colorName="#000000" start="1,-1" stop="1,-1"/> <lineStyle kind="LINEBELOW" colorName="#000000" start="2,-1" stop="2,-1"/> <lineStyle kind="LINEBELOW" colorName="#000000" start="3,-1" stop="3,-1"/> - <lineStyle kind="LINEBELOW" colorName="#000000" start="4,-1" stop="4,-1"/> </blockTableStyle> - <blockTableStyle id="Table3"> + <blockTableStyle id="Table6"> + <blockAlignment value="LEFT"/> + <blockValign value="TOP"/> + <lineStyle kind="LINEBELOW" colorName="#b3b3b3" start="0,-1" stop="0,-1"/> + </blockTableStyle> + <blockTableStyle id="Table7"> <blockAlignment value="LEFT"/> <blockValign value="TOP"/> <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/> <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/> <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="2,-1" stop="2,-1"/> <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="3,-1" stop="3,-1"/> - <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="4,-1" stop="4,-1"/> </blockTableStyle> - <blockTableStyle id="Table4"> + <blockTableStyle id="Table2"> <blockAlignment value="LEFT"/> <blockValign value="TOP"/> <lineStyle kind="LINEABOVE" colorName="#000000" start="1,0" stop="1,0"/> @@ -63,9 +66,14 @@ <paraStyle name="terp_default_9_right_bold" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/> <paraStyle name="terp_header_center" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/> <paraStyle name="terp_default_9_center" fontName="Helvetica" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/> + <paraStyle name="terp_default_2" fontName="Helvetica" fontSize="2.0" leading="3" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> + <paraStyle name="terp_default_9_left9" rightIndent="0.0" leftIndent="9.0" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> <images/> </stylesheet> <story> + <para style="terp_default_8"> + <font color="white"> </font> + </para> <blockTable colWidths="293.0,235.0" style="Table1"> <tr> <td> @@ -84,16 +92,10 @@ </tr> </blockTable> <para style="terp_header">Lunch Order</para> - - <section> - <para style="terp_default_8">[[repeatIn(get_users(objects),'o')]]</para> - <blockTable colWidths="80.0,70.0,141.0,172.0,65.0" style="Table2"> + <blockTable colWidths="149.0,114.0,201.0,63.0" style="Table5"> <tr> <td> - <para style="terp_tbl_detail_header">Name</para> - </td> - <td> - <para style="terp_tbl_detail_header_center">Date</para> + <para style="terp_tbl_detail_header">Name/Date</para> </td> <td> <para style="terp_tbl_detail_header">Order</para> @@ -107,28 +109,43 @@ </tr> </blockTable> <section> - <para style="terp_default_8">[[ repeatIn(get_lines(o,objects),'lines') ]]</para> - <blockTable colWidths="80.0,70.0,141.0,172.0,64.0" style="Table3"> + <para style="terp_default_2">[[repeatIn(get_users(objects),'o')]]</para> + <blockTable colWidths="263.0,201.0,63.0" style="Table6"> <tr> <td> - <para style="terp_default_9">[[ (lines.user_id and lines.user_id.name) or '']]</para> - </td> - <td> - <para style="terp_default_9_center">[[ formatLang(lines.date,date='True') ]]</para> + <para style="terp_tbl_detail_header">[[ o.name ]]</para> </td> <td> - <para style="terp_default_9">[[ (lines.product and lines.product.name) or '' ]]</para> + <para style="terp_default_8"> + <font color="white"> </font> + </para> </td> <td> - <para style="terp_default_9">[[ lines.descript]]</para> - </td> - <td> - <para style="terp_default_9_right">[[ lines.price ]] [[ (o.company_id and o.company_id.currency_id and o.company_id.currency_id.symbol) or '' ]]</para> + <para style="terp_default_9_right_bold"><u>[[ formatLang(get_total(o,objects)) ]] [[ (o.company_id and o.company_id.currency_id and o.company_id.currency_id.symbol) or '' ]]</u></para> </td> </tr> </blockTable> + <section> + <para style="terp_default_2">[[ repeatIn(get_lines(o,objects),'lines') ]]</para> + <blockTable colWidths="151.0,113.0,216.0,49.0" style="Table7"> + <tr> + <td> + <para style="terp_default_9_left9">[[ formatLang(lines.date,date='True') ]]</para> + </td> + <td> + <para style="terp_default_9">[[ (lines.product and lines.product.name) or '' ]]</para> + </td> + <td> + <para style="terp_default_9">[[ lines.descript]]</para> + </td> + <td> + <para style="terp_default_9_right">[[ lines.price ]] [[ (o.company_id and o.company_id.currency_id and o.company_id.currency_id.symbol) or '' ]]</para> + </td> + </tr> + </blockTable> + </section> </section> - <blockTable colWidths="409.0,55.0,64.0" style="Table4"> + <blockTable colWidths="421.0,44.0,63.0" style="Table2"> <tr> <td> <para style="terp_default_8"> @@ -136,16 +153,15 @@ </para> </td> <td> - <para style="terp_tbl_detail_header">Total:</para> + <para style="terp_tbl_detail_header">Total :</para> </td> <td> - <para style="terp_default_9_right_bold">[[ formatLang(get_total(o,objects)) ]] [[ (o.company_id and o.company_id.currency_id and o.company_id.currency_id.symbol) or '' ]]</para> + <para style="terp_default_9_right_bold">[[ formatLang(get_nettotal()) ]] [[ (o.company_id and o.company_id.currency_id and o.company_id.currency_id.symbol) or '' ]]</para> </td> </tr> </blockTable> - <para style="terp_default_8"> + <para style="terp_default_2"> <font color="white"> </font> </para> - </section> </story> -</document> +</document>
\ No newline at end of file diff --git a/addons/mrp/board_manufacturing_view.xml b/addons/mrp/board_manufacturing_view.xml index f118eda7158..75b2379d414 100644 --- a/addons/mrp/board_manufacturing_view.xml +++ b/addons/mrp/board_manufacturing_view.xml @@ -14,10 +14,10 @@ <hpaned position="100"> <child1> <action colspan="4" height="200" name="%(mrp.mrp_production_action2)d" string="Next Production Orders" width="510"/> - <action colspan="4" name="%(procurement.procurement_exceptions)d" string="Procurements in Exception"/> + <action colspan="4" name="%(procurement.procurement_exceptions)d" string="Procurements in Exception" domain="[('state','=','exception')]"/> </child1> <child2> - <action colspan="4" name="%(mrp.action_report_workcenter_load_tree)d" string="Work Center Future load"/> + <action colspan="4" name="%(mrp.action_report_workcenter_load_tree)d" string="Work Center Future Load" groups="base.group_extended"/> <action colspan="4" name="%(mrp.action_report_in_out_picking_tree)d" string="Stock Value Variation"/> </child2> diff --git a/addons/mrp/mrp_report.xml b/addons/mrp/mrp_report.xml index ee552abad59..2d7ca5d0102 100644 --- a/addons/mrp/mrp_report.xml +++ b/addons/mrp/mrp_report.xml @@ -13,5 +13,11 @@ auto="False" /> + <report id="report_cost_structure" + model="product.product" + menu="False" + name="product.price" + string="Cost Structure" + xsl="mrp/report/price.xsl"/> </data> </openerp> diff --git a/addons/mrp/report/bom_structure.rml b/addons/mrp/report/bom_structure.rml index 533d7454943..b3930f9d51a 100644 --- a/addons/mrp/report/bom_structure.rml +++ b/addons/mrp/report/bom_structure.rml @@ -1,8 +1,8 @@ <?xml version="1.0"?> -<document filename="test.pdf"> - <template pageSize="(595.0,842.0)" title="BOM Structure" author="OpenERP S.A. (sales@openerp.com)" allowSplitting="20"> +<document filename="BOM Structure.pdf"> + <template pageSize="(595.0,842.0)" title="BOM Structure" author="OpenERP S.A.(sales@openerp.com)" allowSplitting="20"> <pageTemplate id="first"> - <frame id="first" x1="34.0" y1="42.0" width="527" height="758"/> + <frame id="first" x1="31.0" y1="30.0" width="532" height="781"/> </pageTemplate> </template> <stylesheet> @@ -10,7 +10,7 @@ <blockAlignment value="LEFT"/> <blockValign value="TOP"/> </blockTableStyle> - <blockTableStyle id="Table3"> + <blockTableStyle id="Table2"> <blockAlignment value="LEFT"/> <blockValign value="TOP"/> <lineStyle kind="LINEBELOW" colorName="#000000" start="0,-1" stop="0,-1"/> @@ -18,15 +18,15 @@ <lineStyle kind="LINEBELOW" colorName="#000000" start="2,-1" stop="2,-1"/> <lineStyle kind="LINEBELOW" colorName="#000000" start="3,-1" stop="3,-1"/> </blockTableStyle> - <blockTableStyle id="Table4"> + <blockTableStyle id="Table1"> <blockAlignment value="LEFT"/> <blockValign value="TOP"/> - <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/> - <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/> - <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="2,-1" stop="2,-1"/> - <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="3,-1" stop="3,-1"/> + <lineStyle kind="LINEBELOW" colorName="#999999" start="0,-1" stop="0,-1"/> + <lineStyle kind="LINEBELOW" colorName="#999999" start="1,-1" stop="1,-1"/> + <lineStyle kind="LINEBELOW" colorName="#999999" start="2,-1" stop="2,-1"/> + <lineStyle kind="LINEBELOW" colorName="#999999" start="3,-1" stop="3,-1"/> </blockTableStyle> - <blockTableStyle id="Table1"> + <blockTableStyle id="Table3"> <blockAlignment value="LEFT"/> <blockValign value="TOP"/> <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/> @@ -37,16 +37,14 @@ <initialize> <paraStyle name="all" alignment="justify"/> </initialize> - <paraStyle name="P1" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> - <paraStyle name="P2" fontName="Helvetica" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/> - <paraStyle name="Standard" fontName="Times-Roman"/> + <paraStyle name="Standard" fontName="Helvetica"/> <paraStyle name="Heading" fontName="Helvetica" fontSize="14.0" leading="17" spaceBefore="12.0" spaceAfter="6.0"/> - <paraStyle name="Text body" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/> - <paraStyle name="List" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/> - <paraStyle name="Caption" fontName="Times-Roman" fontSize="12.0" leading="15" spaceBefore="6.0" spaceAfter="6.0"/> - <paraStyle name="Index" fontName="Times-Roman"/> - <paraStyle name="Table Contents" fontName="Times-Roman" fontSize="6.0" leading="8" alignment="LEFT"/> - <paraStyle name="Table Heading" fontName="Times-Roman" fontSize="6.0" leading="8" alignment="CENTER"/> + <paraStyle name="Text body" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/> + <paraStyle name="List" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/> + <paraStyle name="Caption" fontName="Helvetica" fontSize="12.0" leading="15" spaceBefore="6.0" spaceAfter="6.0"/> + <paraStyle name="Index" fontName="Helvetica"/> + <paraStyle name="Table Contents" fontName="Helvetica" fontSize="6.0" leading="8" alignment="LEFT"/> + <paraStyle name="Table Heading" fontName="Helvetica" fontSize="6.0" leading="8" alignment="CENTER"/> <paraStyle name="terp_header" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/> <paraStyle name="terp_default_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> <paraStyle name="terp_default_Bold_8" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> @@ -56,8 +54,8 @@ <paraStyle name="terp_tblheader_General_Centre" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/> <paraStyle name="terp_default_Centre_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/> <paraStyle name="terp_tblheader_Details" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/> - <paraStyle name="Footer" fontName="Times-Roman"/> - <paraStyle name="Horizontal Line" fontName="Times-Roman" fontSize="6.0" leading="8" spaceBefore="0.0" spaceAfter="14.0"/> + <paraStyle name="Footer" fontName="Helvetica"/> + <paraStyle name="Horizontal Line" fontName="Helvetica" fontSize="6.0" leading="8" spaceBefore="0.0" spaceAfter="14.0"/> <paraStyle name="Heading 9" fontName="Helvetica-Bold" fontSize="75%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/> <paraStyle name="terp_tblheader_General_Right" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="6.0" spaceAfter="6.0"/> <paraStyle name="terp_tblheader_Details_Centre" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/> @@ -67,74 +65,90 @@ <paraStyle name="terp_header_Centre" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="CENTER" spaceBefore="12.0" spaceAfter="6.0"/> <paraStyle name="terp_default_address" fontName="Helvetica" fontSize="10.0" leading="13" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> <paraStyle name="terp_default_Centre_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/> - <paraStyle name="terp_default_Bold_Centre_9" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/> <paraStyle name="terp_default_Right_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/> - <paraStyle name="terp_default_Bold_Right_9" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/> <paraStyle name="terp_default_1" fontName="Helvetica" fontSize="2.0" leading="3" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> <paraStyle name="terp_default_Right_9_Bold" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/> <paraStyle name="terp_default_8_Italic" fontName="Helvetica-Oblique" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> <paraStyle name="Heading 2" fontName="Helvetica-BoldOblique" fontSize="14.0" leading="17" spaceBefore="12.0" spaceAfter="6.0"/> - <paraStyle name="terp_remove_space" fontName="Times-Roman" fontSize="2.0" leading="3" spaceBefore="0.0" spaceAfter="0.0"/> + <paraStyle name="terp_remove_space" fontName="Helvetica" fontSize="2.0" leading="3" spaceBefore="0.0" spaceAfter="0.0"/> + <images/> </stylesheet> - <images/> <story> + <pto> + <pto_header> + <blockTable colWidths="192.0,198.0,71.0,71.0" style="Table2"> + <tr> + <td> + <para style="terp_tblheader_Details">BOM Name</para> + </td> + <td> + <para style="terp_tblheader_Details">Product Name</para> + </td> + <td> + <para style="terp_tblheader_Details_Right">Quantity</para> + </td> + <td> + <para style="terp_tblheader_General_Centre">BOM Ref</para> + </td> + </tr> + </blockTable> + </pto_header> + <para style="terp_header_Centre">BOM Structure</para> + <blockTable colWidths="192.0,198.0,71.0,71.0" style="Table2"> + <tr> + <td> + <para style="terp_tblheader_Details">BOM Name</para> + </td> + <td> + <para style="terp_tblheader_Details">Product Name</para> + </td> + <td> + <para style="terp_tblheader_Details_Right">Quantity</para> + </td> + <td> + <para style="terp_tblheader_General_Centre">BOM Ref</para> + </td> + </tr> + </blockTable> <section> - <para style="terp_default_9">[[ repeatIn(objects, 'o') ]]</para> - <blockTable colWidths="166.0,208.0,79.0,55.0" style="Table3"> - <tr> - <td> - <para style="terp_tblheader_General">BOM Name</para> - </td> - <td> - <para style="terp_tblheader_General">Product Name</para> - </td> - <td> - <para style="terp_tblheader_General_Right">Quantity</para> - </td> - <td> - <para style="terp_tblheader_General_Centre">BOM Ref</para> - </td> - </tr> - </blockTable> - <blockTable colWidths="166.0,208.0,79.0,55.0" style="Table4"> + <para style="terp_default_8">[[ repeatIn(objects, 'o') ]]</para> + <blockTable colWidths="192.0,198.0,71.0,71.0" style="Table1"> <tr> <td> <para style="terp_default_Bold_9">[[ o.name ]]</para> </td> <td> - <para style="terp_default_Bold_9"><font> [ [[ (o.product_id.default_code) or removeParentNode('font') ]] ] </font> <font> [[ o.product_id.name ]] </font> </para> + <para style="terp_default_Bold_9">[ [[ (o.product_id.default_code) or removeParentNode('font') ]] ] [[ o.product_id.name ]]</para> </td> <td> - <para style="terp_default_Bold_Right_9">[[ o.product_qty ]] [[ o.product_uom.name ]]</para> + <para style="terp_default_Right_9_Bold">[[ o.product_qty ]] [[ o.product_uom.name ]]</para> </td> <td> - <para style="terp_default_Bold_Centre_9">[[ o.code ]]</para> + <para style="terp_tblheader_Details_Centre">[[ o.code ]]</para> </td> </tr> </blockTable> <section> - <para style="terp_default_9">[[ repeatIn(get_children(o.bom_lines), 'l') ]]</para> - <blockTable colWidths="166.0,208.0,79.0,55.0" style="Table1"> + <para style="terp_default_8">[[ repeatIn(get_children(o.bom_lines), 'l') ]]</para> + <blockTable colWidths="192.0,198.0,71.0,71.0" style="Table3"> <tr> <td> - <para style="P1"><font color="white">[[ '... '*2*(l['level']) ]]</font>-[[ l['name'] ]]</para> + <para style="terp_default_9"><font face="Helvetica" size="8.0" color="white">[[ '... '*(l['level']) ]]</font> - [[ l['name'] ]]</para> </td> <td> - <para style="P1"><font> [ [[ (l['pcode']) or removeParentNode('font') ]] ] </font> <font> [[ l['pname'] ]] </font> </para> + <para style="terp_default_9">[ [[ (l['pcode']) or removeParentNode('font') ]] ] [[ l['pname'] ]]</para> </td> <td> - <para style="P2">[[ l['pqty'] ]] [[ l['uname'] ]]</para> + <para style="terp_default_Right_9">[[ l['pqty'] ]] [[ l['uname'] ]]</para> </td> <td> <para style="terp_default_Centre_9">[[ l['code'] ]]</para> </td> </tr> </blockTable> - <para style="terp_remove_space"> - <font color="white"> </font> - </para> </section> </section> + </pto> </story> </document>
\ No newline at end of file diff --git a/addons/mrp/report/mrp_report.py b/addons/mrp/report/mrp_report.py index d677184586e..68487527966 100644 --- a/addons/mrp/report/mrp_report.py +++ b/addons/mrp/report/mrp_report.py @@ -39,7 +39,7 @@ class report_workcenter_load(osv.osv): create or replace view report_workcenter_load as ( SELECT min(wl.id) as id, - to_char(p.date_planned,'YYYY:IW') as name, + to_char(p.date_planned,'YYYY:mm:dd') as name, SUM(wl.hour) AS hour, SUM(wl.cycle) AS cycle, wl.workcenter_id as workcenter_id @@ -49,7 +49,7 @@ class report_workcenter_load(osv.osv): ON p.id = wl.production_id GROUP BY wl.workcenter_id, - to_char(p.date_planned,'YYYY:IW') + to_char(p.date_planned,'YYYY:mm:dd') )""") report_workcenter_load() diff --git a/addons/mrp/report/mrp_report_view.xml b/addons/mrp/report/mrp_report_view.xml index 71389233391..a1e3f7174bd 100644 --- a/addons/mrp/report/mrp_report_view.xml +++ b/addons/mrp/report/mrp_report_view.xml @@ -22,7 +22,7 @@ <field name="type">graph</field> <field name="arch" type="xml"> <graph string="Work Center load" type="bar"> - <field group="True" name="name"/> + <field name="name"/> <field name="cycle" operator="+"/> <field name="hour" operator="+"/> <field group="True" name="workcenter_id"/> diff --git a/addons/mrp/report/order.py b/addons/mrp/report/order.py index 4481c2c121b..1c631806dde 100644 --- a/addons/mrp/report/order.py +++ b/addons/mrp/report/order.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ############################################################################## -# +# # OpenERP, Open Source Management Solution # Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>). # @@ -15,7 +15,7 @@ # GNU Affero General Public License for more details. # # You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. +# along with this program. If not, see <http://www.gnu.org/licenses/>. # ############################################################################## @@ -29,6 +29,6 @@ class order(report_sxw.rml_parse): 'time': time, }) -report_sxw.report_sxw('report.mrp.production.order','mrp.production','addons/mrp/report/order.rml',parser=order,header=1) +report_sxw.report_sxw('report.mrp.production.order','mrp.production','addons/mrp/report/order.rml',parser=order,header='internal') # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/mrp/report/price.py b/addons/mrp/report/price.py index d41ee26bba9..9a7bb532acc 100644 --- a/addons/mrp/report/price.py +++ b/addons/mrp/report/price.py @@ -149,7 +149,7 @@ class report_custom(report_rml): <col para='yes'>-</col> </row></lines>""" xml += """<lines style='total'> <row> - <col> """ + _('Total Cost ') + _('of ') + str(number) +' '+ product.uom_id.name + """: </col> + <col> """ + _('Total Cost of ') + str(number) +' '+ product.uom_id.name + """: </col> <col/> <col f='yes'/> <col t='yes'>"""+ rml_obj.formatLang(total_strd, digits=purchase_price_digits) +' '+ company_currency.symbol + """</col> @@ -176,11 +176,11 @@ class report_custom(report_rml): xml += "<lines style='lines'>" + xml_tmp + '</lines>' xml += """<lines style='sub_total'> <row> - <col> """ + _('Cost ') + _('of ') + str(number) +' '+ product.uom_id.name + """: </col> + <col> """ + _('Component Cost of ') + str(number) +' '+ product.uom_id.name + """: </col> <col/> <col t='yes'/> <col t='yes'>"""+ rml_obj.formatLang(total_strd, digits=purchase_price_digits) +' '+ company_currency.symbol + """</col> - <col t='yes'>"""+ rml_obj.formatLang(total, digits=purchase_price_digits) +' '+ company_currency.symbol + """</col> + <col t='yes'></col> </row></lines>'""" total2 = 0 @@ -193,18 +193,18 @@ class report_custom(report_rml): xml += workcenter_header xml += "<lines style='lines'>" + xml_tmp + '</lines>' xml += """<lines style='sub_total'> <row> - <col> """ + _('Work Cost ') + _('of ') + str(number) +' '+ product.uom_id.name +""": </col> + <col> """ + _('Work Cost of ') + str(number) +' '+ product.uom_id.name +""": </col> <col/> <col/> <col/> <col t='yes'>"""+ rml_obj.formatLang(total2, digits=purchase_price_digits) +' '+ company_currency.symbol +"""</col> </row></lines>'""" xml += """<lines style='total'> <row> - <col> """ + _('Total Cost ') + _('of ') + str(number) +' '+ product.uom_id.name + """: </col> + <col> """ + _('Total Cost of ') + str(number) +' '+ product.uom_id.name + """: </col> <col/> <col t='yes'/> <col t='yes'>"""+ rml_obj.formatLang(total_strd+total2, digits=purchase_price_digits) +' '+ company_currency.symbol + """</col> - <col t='yes'>"""+ rml_obj.formatLang(total+total2, digits=purchase_price_digits) +' '+ company_currency.symbol + """</col> + <col t='yes'></col> </row></lines>'""" xml = '<?xml version="1.0" ?><report>' + config_start + config_stop + xml + '</report>' diff --git a/addons/mrp/report/price.xsl b/addons/mrp/report/price.xsl index 8e7d244d590..edf98a08e9a 100644 --- a/addons/mrp/report/price.xsl +++ b/addons/mrp/report/price.xsl @@ -11,7 +11,7 @@ <!-- stylesheet --> <xsl:template name="stylesheet"> - <paraStyle name="title" fontName="Helvetica-Bold" fontSize="22.0" leftIndent="-8.0cm" alignment="center"/> + <paraStyle name="title" fontName="Helvetica-Bold" fontSize="15.0" leftIndent="-8.0cm" alignment="center"/> <paraStyle name="terp_tblheader_General" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT"/> <paraStyle name="terp_default_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> <paraStyle name="terp_tblheader_Details_Right" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT"/> diff --git a/addons/mrp/report/workcenter_load.py b/addons/mrp/report/workcenter_load.py index 922e460ab6d..9be42edd860 100644 --- a/addons/mrp/report/workcenter_load.py +++ b/addons/mrp/report/workcenter_load.py @@ -79,7 +79,7 @@ class report_custom(report_int): year = i/52 week = i%52 d = date(year, 1, 1) - + dates[i] = { 'name' :"Week #%d" % week, 'start':(d + timedelta(days=-d.weekday(), weeks=week)).strftime('%Y-%m-%d'), @@ -124,11 +124,16 @@ class report_custom(report_int): x_index.append((dates[date]['name'], date)) pdf_string = StringIO.StringIO() can = canvas.init(fname=pdf_string, format='pdf') + can.set_title("Work Centers Load") chart_object.set_defaults(line_plot.T, line_style=None) if datas['form']['measure_unit'] == 'cycles': y_label = "Load (Cycles)" else: y_label = "Load (Hours)" + + # For add the report header on the top of the report. + tb = text_box.T(loc=(300, 500), text="/hL/15/bWork Centers Load", line_style=None) + tb.draw() ar = area.T(legend = legend.T(), x_grid_style = line_style.gray70_dash1, x_axis = axis.X(label="Periods", format="/a90/hC%s"), @@ -137,7 +142,6 @@ class report_custom(report_int): y_range = (0, None), size = (640,480)) bar_plot.fill_styles.reset(); - # select workcenters cr.execute( "SELECT mw.id, rs.name FROM mrp_workcenter mw, resource_resource rs " \ diff --git a/addons/point_of_sale/report/pos_lines.rml b/addons/point_of_sale/report/pos_lines.rml index 95f02bb5c1c..b0a2e606897 100644 --- a/addons/point_of_sale/report/pos_lines.rml +++ b/addons/point_of_sale/report/pos_lines.rml @@ -1,6 +1,6 @@ <?xml version="1.0"?> -<document filename="test.pdf"> - <template pageSize="(595.0,842.0)" title="Sales lines" author="OpenERP S.A. (sales@openerp.com)" allowSplitting="20"> +<document filename="Sale Lines.pdf"> + <template pageSize="(595.0,842.0)" title="Sale Lines" author="OpenERP S.A.(sales@openerp.com)" allowSplitting="20"> <pageTemplate id="first"> <frame id="first" x1="27.0" y1="57.0" width="512" height="728"/> </pageTemplate> @@ -62,13 +62,10 @@ <blockAlignment value="LEFT"/> <blockValign value="TOP"/> <lineStyle kind="LINEABOVE" colorName="#ffffff" start="0,0" stop="0,0"/> - <lineStyle kind="LINEABOVE" colorName="#ffffff" start="1,0" stop="1,0"/> - <lineStyle kind="LINEABOVE" colorName="#ffffff" start="2,0" stop="2,0"/> - <lineStyle kind="LINEABOVE" colorName="#ffffff" start="3,0" stop="3,0"/> - <lineStyle kind="LINEABOVE" colorName="#000000" start="4,0" stop="4,0"/> - <lineStyle kind="LINEABOVE" colorName="#000000" start="5,0" stop="5,0"/> - <lineStyle kind="LINEABOVE" colorName="#000000" start="4,2" stop="4,2"/> - <lineStyle kind="LINEABOVE" colorName="#000000" start="5,2" stop="5,2"/> + <lineStyle kind="LINEABOVE" colorName="#000000" start="1,0" stop="1,0"/> + <lineStyle kind="LINEABOVE" colorName="#000000" start="2,0" stop="2,0"/> + <lineStyle kind="LINEABOVE" colorName="#000000" start="1,2" stop="1,2"/> + <lineStyle kind="LINEABOVE" colorName="#000000" start="2,2" stop="2,2"/> </blockTableStyle> <initialize> <paraStyle name="all" alignment="justify"/> @@ -147,7 +144,7 @@ <para style="terp_default_9"> <font color="white"> </font> </para> - <blockTable colWidths="196.0,78.0,62.0,58.0,56.0,63.0" style="Tableau6"> + <blockTable colWidths="186.0,71.0,71.0,57.0,57.0,71.0" style="Tableau6"> <tr> <td> <para style="terp_tblheader_Details">Description</para> @@ -171,7 +168,7 @@ </blockTable> <section> <para style="terp_default_1">[[repeatIn(o.lines,'l')]]</para> - <blockTable colWidths="195.0,78.0,62.0,58.0,56.0,63.0" style="Tableau7"> + <blockTable colWidths="186.0,71.0,71.0,57.0,57.0,71.0" style="Tableau7"> <tr> <td> <para style="terp_default_9">[ [[l.product_id.code]] ] [[l.product_id.name]]</para> @@ -194,7 +191,7 @@ </tr> </blockTable> </section> - <blockTable colWidths="84.0,85.0,86.0,114.0,68.0,74.0" style="Table1"> + <blockTable colWidths="356.0,71.0,85.0" style="Table1"> <tr> <td> <para style="terp_default_9"> @@ -202,21 +199,6 @@ </para> </td> <td> - <para style="terp_default_9"> - <font color="white"> </font> - </para> - </td> - <td> - <para style="terp_default_9"> - <font color="white"> </font> - </para> - </td> - <td> - <para style="terp_default_9"> - <font color="white"> </font> - </para> - </td> - <td> <para style="terp_default_9">Net Total </para> </td> <td> @@ -230,21 +212,6 @@ </para> </td> <td> - <para style="terp_default_9"> - <font color="white"> </font> - </para> - </td> - <td> - <para style="terp_default_9"> - <font color="white"> </font> - </para> - </td> - <td> - <para style="terp_default_9"> - <font color="white"> </font> - </para> - </td> - <td> <para style="terp_default_9">Taxes</para> </td> <td> @@ -258,21 +225,6 @@ </para> </td> <td> - <para style="terp_default_9"> - <font color="white"> </font> - </para> - </td> - <td> - <para style="terp_default_9"> - <font color="white"> </font> - </para> - </td> - <td> - <para style="terp_default_9"> - <font color="white"> </font> - </para> - </td> - <td> <para style="terp_default_Bold_9">Total:</para> </td> <td> @@ -284,4 +236,4 @@ <font color="white"> </font> </para> </story> -</document> +</document>
\ No newline at end of file diff --git a/addons/point_of_sale/report/pos_payment_report.rml b/addons/point_of_sale/report/pos_payment_report.rml index 5201de274ca..56e9982c080 100644 --- a/addons/point_of_sale/report/pos_payment_report.rml +++ b/addons/point_of_sale/report/pos_payment_report.rml @@ -64,11 +64,7 @@ <lineStyle kind="LINEABOVE" colorName="#ffffff" start="0,0" stop="0,0"/> <lineStyle kind="LINEABOVE" colorName="#ffffff" start="1,0" stop="1,0"/> <lineStyle kind="LINEABOVE" colorName="#ffffff" start="2,0" stop="2,0"/> - <lineStyle kind="LINEABOVE" colorName="#000000" start="3,0" stop="3,0"/> - <lineStyle kind="LINEABOVE" colorName="#000000" start="4,0" stop="4,0"/> - <lineStyle kind="LINEABOVE" colorName="#000000" start="5,0" stop="5,0"/> - <lineStyle kind="LINEABOVE" colorName="#000000" start="4,2" stop="4,2"/> - <lineStyle kind="LINEABOVE" colorName="#000000" start="5,2" stop="5,2"/> + <lineStyle kind="LINEABOVE" colorName="#000000" start="1,0" stop="-1,-1"/> </blockTableStyle> <initialize> <paraStyle name="all" alignment="justify"/> @@ -149,7 +145,7 @@ <para style="terp_default_9"> <font color="white"> </font> </para> - <blockTable colWidths="301.0,58.0,34.0,57.0,61.0" style="Tableau6"> + <blockTable colWidths="257.0,71.0,57.0,57.0,71.0" style="Tableau6"> <tr> <td> <para style="terp_tblheader_Details">Product</para> @@ -172,7 +168,7 @@ <para style="terp_default_8">[[ repeatIn(objects,'o') ]]</para> <section> <para style="terp_default_8">[[ repeatIn(pos_payment(o), 'line_ids') ]]</para> - <blockTable colWidths="301.0,58.0,34.0,57.0,61.0" style="Tableau7"> + <blockTable colWidths="257.0,71.0,57.0,57.0,71.0" style="Tableau7"> <tr> <td> <para style="terp_default_9">[ [[ line_ids['code'] ]] ] [[ line_ids['name'] ]]</para> @@ -194,7 +190,7 @@ </blockTable> </section> </section> - <blockTable colWidths="302.0,57.0,34.0,57.0,61.0" style="Table1"> + <blockTable colWidths="356.0,71.0,85.0" style="Table1"> <tr> <td> <para style="terp_default_9"> @@ -202,16 +198,6 @@ </para> </td> <td> - <para style="terp_default_9"> - <font color="white"> </font> - </para> - </td> - <td> - <para style="terp_default_9"> - <font color="white"> </font> - </para> - </td> - <td> <para style="terp_tblheader_Details">Net Total:</para> </td> <td> diff --git a/addons/point_of_sale/report/pos_payment_report_date.rml b/addons/point_of_sale/report/pos_payment_report_date.rml index 5abda34f54e..b8f86233319 100644 --- a/addons/point_of_sale/report/pos_payment_report_date.rml +++ b/addons/point_of_sale/report/pos_payment_report_date.rml @@ -1,6 +1,6 @@ <?xml version="1.0"?> -<document filename="test.pdf"> - <template pageSize="(595.0,842.0)" title="Payments" author="OpenERP S.A. (sales@openerp.com)" allowSplitting="20"> +<document filename="Payments.pdf"> + <template pageSize="(595.0,842.0)" title="Payments" author="OpenERP S.A.(sales@openerp.com)" allowSplitting="20"> <pageTemplate id="first"> <frame id="first" x1="27.0" y1="57.0" width="512" height="728"/> </pageTemplate> @@ -53,8 +53,8 @@ <blockTableStyle id="Table5"> <blockAlignment value="LEFT"/> <blockValign value="TOP"/> - <lineStyle kind="LINEABOVE" colorName="#000000" start="3,0" stop="3,0"/> - <lineStyle kind="LINEABOVE" colorName="#000000" start="4,0" stop="4,0"/> + <lineStyle kind="LINEABOVE" colorName="#000000" start="1,0" stop="1,0"/> + <lineStyle kind="LINEABOVE" colorName="#000000" start="2,0" stop="2,0"/> </blockTableStyle> <initialize> <paraStyle name="all" alignment="justify"/> @@ -95,9 +95,6 @@ </stylesheet> <story> <para style="terp_default_8">[[ repeatIn(objects,'order') ]]</para> - <para style="terp_default_8"> - <font color="white"> </font> - </para> <para style="terp_header_Centre">Sales Lines</para> <para style="Standard"> <font color="white"> </font> @@ -128,7 +125,7 @@ <para style="Standard"> <font color="white"> </font> </para> - <blockTable colWidths="301.0,57.0,35.0,57.0,61.0" style="Table3"> + <blockTable colWidths="256.0,71.0,57.0,57.0,71.0" style="Table3"> <tr> <td> <para style="terp_tblheader_Details">Product</para> @@ -149,7 +146,7 @@ </blockTable> <section> <para style="terp_default_1">[[ repeatIn(pos_payment_date(data['form']), 'line_ids') ]]</para> - <blockTable colWidths="301.0,58.0,34.0,57.0,61.0" style="Table6"> + <blockTable colWidths="256.0,71.0,57.0,57.0,71.0" style="Table6"> <tr> <td> <para style="terp_default_9">[ [[ line_ids['code'] ]] ] [[ line_ids['name'] ]]</para> @@ -169,7 +166,7 @@ </tr> </blockTable> </section> - <blockTable colWidths="302.0,57.0,34.0,57.0,61.0" style="Table5"> + <blockTable colWidths="355.0,71.0,85.0" style="Table5"> <tr> <td> <para style="Table Contents"> @@ -177,16 +174,6 @@ </para> </td> <td> - <para style="Table Contents"> - <font color="white"> </font> - </para> - </td> - <td> - <para style="Table Contents"> - <font color="white"> </font> - </para> - </td> - <td> <para style="terp_tblheader_General_Right">Total:</para> </td> <td> @@ -198,4 +185,4 @@ <font color="white"> </font> </para> </story> -</document> +</document>
\ No newline at end of file diff --git a/addons/procurement/board_mrp_procurement_view.xml b/addons/procurement/board_mrp_procurement_view.xml index 3b18a876f4f..bf11fe79166 100644 --- a/addons/procurement/board_mrp_procurement_view.xml +++ b/addons/procurement/board_mrp_procurement_view.xml @@ -8,16 +8,16 @@ <field name="view_type">form</field> <field name="view_mode">tree,form</field> <field name="domain">[('state','=','exception')]</field> - <field name="view_id" ref="procurement.procurement_tree_view_board"/> + <field name="view_id" ref="procurement.procurement_tree_view_board"/> </record> <record id="board_mrp_procurement_form" model="ir.ui.view"> <field name="name">board.mrp.procurement.form</field> <field name="model">board.board</field> - <field name="inherit_id" ref="stock.board_warehouse_form"/> + <field name="inherit_id" ref="stock.board_warehouse_form"/> <field name="type">form</field> <field name="arch" type="xml"> - <xpath expr="/form/hpaned/child1" position="inside"> - <action colspan="4" name="%(procurement_action_board)d" string="Procurement Exceptions" width="510" /> + <xpath expr="/form/hpaned/child1/action[@string='Incoming Product']" position="before"> + <action colspan="4" name="%(procurement_action_board)d" string="Procurements in Exception" width="510" /> </xpath> </field> </record> diff --git a/addons/project/report/project_report_view.xml b/addons/project/report/project_report_view.xml index aec1296b3c4..86f79857104 100644 --- a/addons/project/report/project_report_view.xml +++ b/addons/project/report/project_report_view.xml @@ -270,14 +270,15 @@ <field name="res_model">project.vs.hours</field> <field name="view_type">form</field> <field name="view_mode">graph,tree</field> + <field name="context">{'group_by':['project'],'group_by_no_leaf':1}</field> <field name="domain">[('uid','=',uid),('state','=','open')]</field> <field name="view_id" ref="view_project_vs_planned_total_hours_graph"/> </record> <record id="open_view_project_vs_planned_total_hours_tree" model="ir.actions.act_window.view"> - <field eval="1" name="sequence"/> - <field name="view_mode">graph</field> - <field name="view_id" ref="view_project_vs_planned_total_hours_graph"/> + <field eval="2" name="sequence"/> + <field name="view_mode">tree</field> + <field name="view_id" ref="view_project_vs_planned_total_hours_tree"/> <field name="act_window_id" ref="action_project_vs_planned_total_hours_graph"/> </record> <record id="open_view_project_vs_planned_total_hours_graph" model="ir.actions.act_window.view"> diff --git a/addons/project_issue/board_project_issue_view.xml b/addons/project_issue/board_project_issue_view.xml index b236d0458ec..3b6a6bcd0a3 100644 --- a/addons/project_issue/board_project_issue_view.xml +++ b/addons/project_issue/board_project_issue_view.xml @@ -90,13 +90,41 @@ action="open_board_project_issue"/> <!-- For Project Dashboard --> + <record model="ir.ui.view" id="project_issue_board_tree_view"> + <field name="name">Project Issue Board Tree</field> + <field name="model">project.issue</field> + <field name="type">tree</field> + <field name="arch" type="xml"> + <tree string="Issue Tracker Tree" colors="black:state=='open';blue:state=='pending';grey:state in ('cancel', 'done')"> + <field name="id"/> + <field name="create_date"/> + <field name="name"/> + <field name="partner_id" groups="base.group_extended"/> + <field name="project_id" /> + <field name="priority" string="Priority"/> + <field name="type_id" widget="selection" readonly="1"/> + <button name="prev_type" string="Previous" type="object" icon="gtk-go-back" help="Change to Previous Stage"/> + <button name="next_type" string="Next" type="object" icon="gtk-go-forward" help="Change to Next Stage"/> + <field name="version_id" widget="selection"/> + <field name="progress" widget="progressbar" attrs="{'invisible':[('task_id','=',False)]}"/> + <field name="state"/> + <button name="case_cancel" string="Cancel" states="draft,open,pending" type="object" icon="gtk-cancel"/> + <button name="case_close" string="Done" states="open,draft,pending" type="object" icon="gtk-jump-to"/> + <button name="case_open" string="Open" states="draft,pending" type="object" icon="gtk-go-forward" help="To Do"/> + <button name="case_pending" string="Pending" states="draft,open" type="object" icon="gtk-media-pause"/> + <button name="case_escalate" string="Escalate" states="open,draft,pending" type="object" icon="gtk-go-up"/> + <button name="case_reset" string="Reset to Draft" states="done,cancel" type="object" icon="gtk-convert"/> + <field name="categ_id" invisible="1"/> + </tree> + </field> + </record> <record id="action_view_my_project_issue_tree" model="ir.actions.act_window"> <field name="name">My Project Issues</field> <field name="res_model">project.issue</field> <field name="view_type">form</field> <field name="view_mode">tree,form</field> - <field name="domain">['|',('assigned_to','=',uid),('user_id','=',uid)]</field> - <field name="view_id" ref="project_issue.project_issue_tree_view"/> + <field name="domain">[('state','not in',('cancel','done')),'|',('assigned_to','=',uid),('user_id','=',uid)]</field> + <field name="view_id" ref="project_issue_board_tree_view"/> </record> <record id="view_my_open_project_issue_graph" model="ir.ui.view"> <field name="name">my.open.project.issue.graph</field> diff --git a/addons/project_scrum/board_project_scrum_view.xml b/addons/project_scrum/board_project_scrum_view.xml index 08acece9bbb..5620950fa5a 100644 --- a/addons/project_scrum/board_project_scrum_view.xml +++ b/addons/project_scrum/board_project_scrum_view.xml @@ -110,6 +110,7 @@ <field name="arch" type="xml"> <tree string="Scrum Sprint"> <field name="name"/> + <field name="date_start"/> <field name="progress" widget="progressbar"/> <field name="effective_hours" widget="float_time"/> <field name="expected_hours" widget="float_time"/> diff --git a/addons/project_scrum/report/sprint_burndown.py b/addons/project_scrum/report/sprint_burndown.py index c7388b0e790..64a6087d440 100644 --- a/addons/project_scrum/report/sprint_burndown.py +++ b/addons/project_scrum/report/sprint_burndown.py @@ -40,9 +40,13 @@ class report_tasks(report_int): canv = canvas.init(fname=io, format='pdf') canv.set_author("OpenERP") + canv.set_title("Burndown Chart") pool = pooler.get_pool(cr.dbname) sprint_pool = pool.get('project.scrum.sprint') task_pool = pool.get('project.task') + # For add the report header on the top of the report. + tb = text_box.T(loc=(320, 500), text="/hL/15/bBurndown Chart", line_style=None) + tb.draw() int_to_date = lambda x: '/a60{}' + datetime(time.localtime(x).tm_year, time.localtime(x).tm_mon, time.localtime(x).tm_mday).strftime('%d %m %Y') for sprint in sprint_pool.browse(cr, uid, ids, context=context): task_ids = task_pool.search(cr, uid, [('sprint_id','=',sprint.id)], context=context) diff --git a/addons/purchase/board_purchase_view.xml b/addons/purchase/board_purchase_view.xml index 475873a138e..c4f8d447a21 100644 --- a/addons/purchase/board_purchase_view.xml +++ b/addons/purchase/board_purchase_view.xml @@ -33,8 +33,8 @@ <field name="arch" type="xml"> <tree string="Monthly Purchase by Category"> <field name="month"/> - <field name="price_total"/> <field name="category_id"/> + <field name="price_total"/> </tree> </field> </record> @@ -55,6 +55,7 @@ <field name="res_model">purchase.report</field> <field name="view_type">form</field> <field name="view_mode">graph,tree</field> + <field name="context">{'group_by':['month','category_id'],'group_by_no_leaf':1}</field> <field name="view_id" ref="view_purchase_order_monthly_categ_graph"></field> </record> <record id="open_view_purchase_order_monthly_categ_tree" model="ir.actions.act_window.view"> @@ -97,6 +98,7 @@ <field name="res_model">purchase.report</field> <field name="view_type">form</field> <field name="view_mode">graph,tree</field> + <field name="context">{'group_by':['partner_id'],'group_by_no_leaf':1}</field> <field name="view_id" ref="view_negotiation_by_supplier_graph"/> </record> <record id="open_view_negotiation_by_supplier_tree" model="ir.actions.act_window.view"> diff --git a/addons/purchase/report/order.rml b/addons/purchase/report/order.rml index 60ee35b92bb..0ca1a8d6878 100644 --- a/addons/purchase/report/order.rml +++ b/addons/purchase/report/order.rml @@ -226,7 +226,7 @@ <para style="terp_default_9"> <font color="white"> </font> </para> - <blockTable colWidths="179.0,82.0,73.0,64.0,56.0,79.0" repeatRows="1" style="Table_Header_Pur_ord_Line"> + <blockTable colWidths="180.0,85.0,71.0,71.0,57.0,71.0" repeatRows="1" style="Table_Header_Pur_ord_Line"> <tr> <td> <para style="terp_tblheader_Details">Description</para> @@ -250,7 +250,7 @@ </blockTable> <section> <para style="terp_default_8">[[repeatIn(o.order_line,'line')]]</para> - <blockTable colWidths="179.0,82.0,73.0,64.0,57.0,79.0" style="Table_Order_Pur_line_Content"> + <blockTable colWidths="179.0,85.0,71.0,71.0,57.0,71.0" style="Table_Order_Pur_line_Content"> <tr> <td> <para style="terp_default_9">[[ line.name ]]</para> @@ -265,7 +265,7 @@ <para style="terp_default_Right_9">[[ formatLang(line.product_qty ) ]] [[ line.product_uom.name ]] </para> </td> <td> - <para style="Standard">[[ formatLang(line.price_unit, digits=get_digits(dp='Purchase Price') ) ]]</para> + <para style="terp_default_Right_9">[[ formatLang(line.price_unit, digits=get_digits(dp='Purchase Price') ) ]]</para> </td> <td> <para style="terp_default_Right_9">[[ formatLang(line.price_subtotal, digits=get_digits(dp='Purchase Price') ) ]] [[ o.pricelist_id.currency_id.symbol ]]</para> @@ -303,7 +303,7 @@ </tr> </blockTable> </section> - <blockTable colWidths="391.0,55.0,88.0" style="Table_All_Total_Detail"> + <blockTable colWidths="394.0,55.0,85.0" style="Table_All_Total_Detail"> <tr> <td> <para style="terp_default_9"> diff --git a/addons/purchase/report/purchase_report_view.xml b/addons/purchase/report/purchase_report_view.xml index f570f898f7c..8bf381b4d41 100644 --- a/addons/purchase/report/purchase_report_view.xml +++ b/addons/purchase/report/purchase_report_view.xml @@ -25,6 +25,7 @@ <field name="user_id" invisible="1"/> <field name="partner_id" invisible="1"/> <field name="product_id" invisible="1"/> + <field name="category_id" invisible="1"/> <field name="product_uom" invisible="1"/> <field name="day" invisible="1"/> <field name="name" invisible="1"/> @@ -99,6 +100,7 @@ <filter string="Validated by" icon="terp-personal" context="{'group_by':'validator'}"/> <separator orientation="vertical"/> <filter string="Product" name="group_product_id" icon="terp-accessories-archiver" context="{'group_by':'product_id'}"/> + <filter string="Category" name="group_category_id" icon="terp-accessories-archiver" context="{'group_by':'category_id'}"/> <filter string="Product UOM" name="group_product_uom" icon="terp-accessories-archiver" context="{'group_by':'product_uom'}"/> <filter string="Warehouse" icon="terp-go-home" context="{'group_by':'warehouse_id'}" groups="base.group_extended"/> <filter string="Destination" icon="terp-gtk-jump-to-ltr" context="{'group_by':'location_id'}"/> diff --git a/addons/sale/board_sale_view.xml b/addons/sale/board_sale_view.xml index e521fde2008..1473bf42f31 100644 --- a/addons/sale/board_sale_view.xml +++ b/addons/sale/board_sale_view.xml @@ -33,10 +33,9 @@ <field name="view_mode">form</field> <field name="view_id" ref="board_sales_manager_form"/> </record> + <menuitem id="board.menu_dasboard" name="Dashboard" sequence="0" parent="base.next_id_64"/> <menuitem action="open_board_sales_manager" icon="terp-graph" id="menu_board_sales_manager" parent="board.menu_dasboard" sequence="0" groups="base.group_sale_manager"/> - <menuitem icon="terp-partner" id="base.menu_base_partner" name="Sales" sequence="0" action="open_board_sales_manager"/> - </data> </openerp> diff --git a/addons/sale/report/sale_report_view.xml b/addons/sale/report/sale_report_view.xml index e69d841053b..4f81fb4cb5d 100644 --- a/addons/sale/report/sale_report_view.xml +++ b/addons/sale/report/sale_report_view.xml @@ -3,6 +3,7 @@ <data> <record id="view_order_product_tree" model="ir.ui.view"> + <field eval="1" name="priority"/> <field name="name">sale.report.tree</field> <field name="model">sale.report</field> <field name="type">tree</field> @@ -163,6 +164,7 @@ <field name="view_mode">graph,tree</field> <field name="domain">[('state','in',('manual','progress')),('date','<=', time.strftime('%Y-%m-%d')),('date','>',(datetime.date.today()-datetime.timedelta(days=90)).strftime('%Y-%m-%d'))]</field> <field name="view_id" ref="view_sales_by_partner_graph"/> + <field name="context">{'group_by_no_leaf':1,'group_by':['partner_id']}</field> </record> <record id="open_view_sales_by_partner_graph" model="ir.actions.act_window.view"> <field eval="1" name="sequence"/> @@ -208,6 +210,7 @@ <field name="view_mode">graph,tree</field> <field name="domain">[('state','in',('manual','progress','done')),('date','<=', time.strftime('%Y-%m-%d')),('date','>',(datetime.date.today()-datetime.timedelta(days=90)).strftime('%Y-%m-%d'))]</field> <field name="view_id" ref="view_sales_by_salesman_graph"/> + <field name="context">{'group_by_no_leaf':1,'group_by':['user_id']}</field> </record> <record id="open_view_sales_by_salesman_graph" model="ir.actions.act_window.view"> <field eval="7" name="sequence"/> @@ -227,7 +230,7 @@ <field name="type">tree</field> <field name="arch" type="xml"> <tree string="Sales by Product Category"> - <field name="product_id"/> + <field name="categ_id"/> <field name="price_total"/> </tree> </field> @@ -252,6 +255,7 @@ <field name="view_mode">graph,tree</field> <field name="domain">[('state','in',('manual','progress','done')),('date','>',(datetime.date.today()-datetime.timedelta(days=90)).strftime('%Y-%m-%d'))]</field> <field name="view_id" ref="view_sales_product_total_price_graph"/> + <field name="context">{'group_by_no_leaf':1,'group_by':['categ_id']}</field> </record> <record id="open_view_sales_product_total_price_graph" model="ir.actions.act_window.view"> <field eval="3" name="sequence"/> diff --git a/addons/sale_layout/report/report_sale_layout.rml b/addons/sale_layout/report/report_sale_layout.rml index 990c4c5c7b1..e203ae5dd2b 100755 --- a/addons/sale_layout/report/report_sale_layout.rml +++ b/addons/sale_layout/report/report_sale_layout.rml @@ -1,8 +1,8 @@ <?xml version="1.0"?> -<document filename="test.pdf"> - <template pageSize="(595.0,842.0)" title="Sale Layout" author="OpenERP S.A. (sales@openerp.com)" allowSplitting="20"> +<document filename="Sale Order.pdf"> + <template pageSize="(595.0,842.0)" title="Sale Order" author="OpenERP S.A.(sales@openerp.com)" allowSplitting="20"> <pageTemplate id="first"> - <frame id="first" x1="34.0" y1="28.0" width="527" height="786"/> + <frame id="first" x1="28.0" y1="28.0" width="539" height="786"/> </pageTemplate> </template> <stylesheet> @@ -31,27 +31,6 @@ <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="3,0" stop="3,0"/> <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="3,-1" stop="3,-1"/> </blockTableStyle> - <blockTableStyle id="Table_final"> - <blockAlignment value="LEFT"/> - <blockValign value="TOP"/> - <lineStyle kind="LINEABOVE" colorName="#ffffff" start="0,0" stop="0,0"/> - <lineStyle kind="LINEABOVE" colorName="#000000" start="1,0" stop="1,0"/> - <lineStyle kind="LINEABOVE" colorName="#000000" start="2,0" stop="2,0"/> - <lineStyle kind="LINEABOVE" colorName="#000000" start="3,0" stop="3,0"/> - <lineStyle kind="LINEBEFORE" colorName="#ffffff" start="0,1" stop="0,-1"/> - <lineStyle kind="LINEBELOW" colorName="#ffffff" start="0,-1" stop="0,-1"/> - <lineStyle kind="LINEBEFORE" colorName="#ffffff" start="0,2" stop="0,-1"/> - <lineStyle kind="LINEBELOW" colorName="#ffffff" start="0,-1" stop="0,-1"/> - <lineStyle kind="LINEABOVE" colorName="#000000" start="1,2" stop="1,2"/> - <lineStyle kind="LINEABOVE" colorName="#000000" start="2,2" stop="2,2"/> - <lineStyle kind="LINEABOVE" colorName="#000000" start="3,2" stop="3,2"/> - </blockTableStyle> - <blockTableStyle id="Table_note"> - <blockAlignment value="LEFT"/> - <blockValign value="TOP"/> - </blockTableStyle> - - <blockTableStyle id="Table6"> <blockAlignment value="LEFT"/> <blockValign value="TOP"/> @@ -81,18 +60,22 @@ </blockTableStyle> <blockTableStyle id="Table1"> <blockAlignment value="LEFT"/> - <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,0" stop="-1,-1"/> - <blockValign value="TOP"/> - </blockTableStyle> - <blockTableStyle id="Table2"> - <blockAlignment value="LEFT"/> <blockValign value="TOP"/> + <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/> + <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/> + <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="2,-1" stop="2,-1"/> + <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="3,-1" stop="3,-1"/> + <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="4,-1" stop="4,-1"/> + <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="5,-1" stop="5,-1"/> + <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="6,-1" stop="6,-1"/> + <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/> + <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/> </blockTableStyle> - <blockTableStyle id="Table3"> + <blockTableStyle id="Table11"> <blockAlignment value="LEFT"/> <blockValign value="TOP"/> </blockTableStyle> - <blockTableStyle id="Table4"> + <blockTableStyle id="Table13"> <blockAlignment value="LEFT"/> <blockValign value="TOP"/> <lineStyle kind="LINEBELOW" colorName="#000000" start="0,-1" stop="0,-1"/> @@ -108,52 +91,20 @@ <lineStyle kind="LINEABOVE" colorName="#ffffff" start="0,0" stop="0,0"/> <lineStyle kind="LINEABOVE" colorName="#000000" start="1,0" stop="1,0"/> <lineStyle kind="LINEABOVE" colorName="#000000" start="2,0" stop="2,0"/> - <lineStyle kind="LINEABOVE" colorName="#000000" start="3,0" stop="3,0"/> <lineStyle kind="LINEBEFORE" colorName="#ffffff" start="0,1" stop="0,-1"/> <lineStyle kind="LINEBELOW" colorName="#ffffff" start="0,-1" stop="0,-1"/> <lineStyle kind="LINEBEFORE" colorName="#ffffff" start="0,2" stop="0,-1"/> <lineStyle kind="LINEBELOW" colorName="#ffffff" start="0,-1" stop="0,-1"/> <lineStyle kind="LINEABOVE" colorName="#000000" start="1,2" stop="1,2"/> <lineStyle kind="LINEABOVE" colorName="#000000" start="2,2" stop="2,2"/> - <lineStyle kind="LINEABOVE" colorName="#000000" start="3,2" stop="3,2"/> + </blockTableStyle> + <blockTableStyle id="Table2"> + <blockAlignment value="LEFT"/> + <blockValign value="TOP"/> </blockTableStyle> <initialize> <paraStyle name="all" alignment="justify"/> </initialize> - <paraStyle name="P1" rightIndent="0.0" leftIndent="14.0" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> - <paraStyle name="P2" rightIndent="0.0" leftIndent="-2.0" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> - <paraStyle name="P3" rightIndent="0.0" leftIndent="11.0" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> - <paraStyle name="P4" fontName="Helvetica" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/> - <paraStyle name="P5" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/> - <paraStyle name="P6" fontName="Helvetica" fontSize="5.0" leading="7" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> - <paraStyle name="P7" fontName="Helvetica"/> - <paraStyle name="P8" fontName="Helvetica" fontSize="9.0" leading="13" alignment="LEFT"/> - <paraStyle name="P9" fontName="Helvetica-Bold" fontSize="20.0" leading="25" alignment="LEFT"/> - <paraStyle name="P10" fontName="Helvetica-BoldOblique" fontSize="20.0" leading="25" alignment="LEFT"/> - <paraStyle name="P11" fontName="Helvetica" fontSize="11.0" leading="14"/> - <paraStyle name="P12" fontName="Helvetica" fontSize="11.0" leading="14"/> - <paraStyle name="P13" fontName="Helvetica" fontSize="11.0" leading="14" alignment="LEFT"/> - <paraStyle name="P14" fontName="Helvetica-BoldOblique" fontSize="6.0" leading="8" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> - <paraStyle name="P15" fontName="Helvetica-BoldOblique" fontSize="14.0" leading="17" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> - <paraStyle name="P16" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/> - <paraStyle name="P17" fontName="Helvetica" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/> - <paraStyle name="P18" fontName="Helvetica-BoldOblique" fontSize="11.0" leading="14" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/> - <paraStyle name="P19" fontName="Helvetica-BoldOblique" fontSize="11.0" leading="14" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/> - <paraStyle name="P20" fontName="Helvetica" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/> - <paraStyle name="P21" fontName="Helvetica" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/> - <paraStyle name="P22" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/> - <paraStyle name="P23" fontName="Helvetica" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/> - <paraStyle name="P24" fontName="Helvetica-Bold" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/> - <paraStyle name="P25" fontName="Helvetica-Bold" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/> - <paraStyle name="P26" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> - <paraStyle name="P27" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> - <paraStyle name="P28" rightIndent="0.0" leftIndent="-2.0" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> - <paraStyle name="P29" rightIndent="0.0" leftIndent="11.0" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> - <paraStyle name="P30" rightIndent="0.0" leftIndent="14.0" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> - <paraStyle name="P31" fontName="Helvetica-Bold" fontSize="9.0" leading="13" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/> - <paraStyle name="P32" fontName="Helvetica-Bold" fontSize="5.0" leading="7" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> - <paraStyle name="P33" fontName="Helvetica" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/> - <paraStyle name="P34" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/> <paraStyle name="Standard" fontName="Helvetica"/> <paraStyle name="Text body" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/> <paraStyle name="List" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/> @@ -179,18 +130,15 @@ <paraStyle name="terp_default_Right_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/> <paraStyle name="terp_default_Italic" fontName="Helvetica-Oblique" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> <paraStyle name="terp_default_Right_9_Bold" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/> + <images/> </stylesheet> - <images/> <story> <para style="terp_default_8">[[repeatIn(objects,'o')]]</para> - <para style="P14">[[ setLang(o.partner_id.lang) ]]</para> - <para style="P8"> - <font color="white"> </font> - </para> - <blockTable colWidths="254.0,62.0,211.0" style="Tableau2"> + <para style="terp_default_8">[[ setLang(o.partner_id.lang) ]]</para> + <blockTable colWidths="260.0,64.0,215.0" style="Tableau2"> <tr> <td> - <para style="terp_default_Bold_9">Shipping address :</para> + <para style="terp_default_Bold_9">Shipping address :</para> <para style="terp_default_9">[[ (o.partner_id and o.partner_id.title and o.partner_id.title.name) or '' ]] [[ (o.partner_id and o.partner_id.name) or '' ]]</para> <para style="terp_default_9">[[ (o.partner_shipping_id and o.partner_shipping_id.street) or '' ]]</para> <para style="terp_default_9">[[ (o.partner_shipping_id and o.partner_shipping_id.street2) or removeParentNode('para') ]]</para> @@ -209,7 +157,7 @@ <para style="terp_default_9">[[ (o.partner_invoice_id and o.partner_invoice_id.country_id and o.partner_invoice_id.country_id.name) or '' ]]</para> </td> <td> - <para style="P17"> + <para style="terp_default_8"> <font color="white"> </font> </para> </td> @@ -231,21 +179,22 @@ </td> </tr> </blockTable> - <para style="P8"> + <para style="terp_default_8"> <font color="white"> </font> </para> <para style="terp_header">[[ o.state<>'draft' and removeParentNode('para') ]] Quotation N° [[ o.name ]]</para> <para style="terp_header">[[ o.state=='draft' and removeParentNode('para') ]] Order N° [[ o.name ]]</para> - <para style="P15"> + <para style="terp_default_8"> <font color="white"> </font> </para> - <blockTable colWidths="132.0,134.0,135.0,135.0" style="Table5"> + <blockTable colWidths="135.0,135.0,135.0,135.0" style="Table5"> <tr> <td> <para style="terp_tblheader_General_Centre">Your Reference </para> </td> <td> - <para style="terp_tblheader_General_Centre">Date Ordered </para> + <para style="terp_tblheader_General_Centre">[[ o.state=='draft' and removeParentNode('para') ]] Date Ordered</para> + <para style="terp_tblheader_General_Centre">[[ o.state <> 'draft' and removeParentNode('para') ]] Quotation Date</para> </td> <td> <para style="terp_tblheader_General_Centre">Our Salesman </para> @@ -255,26 +204,26 @@ </td> </tr> </blockTable> - <blockTable colWidths="132.0,134.0,135.0,135.0" style="Table6"> + <blockTable colWidths="135.0,135.0,135.0,135.0" style="Table6"> <tr> <td> <para style="terp_default_Centre_8">[[ o.client_order_ref ]]</para> </td> <td> - <para style="terp_default_Centre_8">[[ formatLang(o.date_order,date=True) ]]</para> + <para style="terp_default_Centre_8">[[ formatLang(o.date_order,date = True) ]]</para> </td> <td> <para style="terp_default_Centre_8">[[ (o.user_id and o.user_id.name) or '' ]]</para> </td> <td> - <para style="terp_default_Centre_8">[[ o.payment_term.name ]]</para> + <para style="terp_default_Centre_8">[[ (o.payment_term and o.payment_term.name) or '' ]]</para> </td> </tr> </blockTable> - <para style="P7"> + <para style="terp_default_8"> <font color="white"> </font> </para> - <blockTable colWidths="216.0,62.0,62.0,62.0,51.0,74.0" style="Table7"> + <blockTable colWidths="198.0,85.0,71.0,57.0,57.0,71.0" style="Table7"> <tr> <td> <para style="terp_tblheader_Details">Description</para> @@ -296,83 +245,77 @@ </td> </tr> </blockTable> - - <section> - <para style="P32">[[ repeatIn(sale_order_lines(o),'a') ]]</para> - <blockTable colWidths="0.0,216.0,62.0,40.0,22.0,62.0,51.0,74.0" style="Table1"> - <tr> - <td> - <para style="P8">[[ a['layout_type']=='text' and removeParentNode('blockTable')]]</para> - </td> - <td> - <para style="terp_default_9"><font>[[ (a['layout_type']=='title' or a['layout_type']=='subtotal') and ( setTag('para','para',{'fontName':'Helvetica-bold'})) or removeParentNode('font') ]]</font>[[ a['name'] ]]</para> - </td> - <td> - <para style="terp_default_9"><font>[[ a['layout_type']=='subtotal' and ( setTag('para','para',{'fontName':'Helvetica-Bold'})) or removeParentNode('font') ]]</font><font>[[ a['tax_id'] ]]</font></para> - </td> - <td> - <para style="terp_default_Right_9"><font>[[ a['layout_type']=='subtotal' and ( setTag('para','para',{'fontName':'Helvetica-Bold'})) or removeParentNode('font') ]]</font><font>[[ a['product_uom_qty'] ]]</font></para> - </td> - <td> - <para style="terp_default_Right_9"><font>[[ a['layout_type']=='subtotal' and ( setTag('para','para',{'fontName':'Helvetica-Bold'})) or removeParentNode('font') ]]</font><font>[[ a['product_uom'] ]]</font></para> - </td> - <td> - <para style="terp_default_Right_9"><font>[[ a['layout_type']=='subtotal' and ( setTag('para','para',{'fontName':'Helvetica-Bold'})) or removeParentNode('font') ]] </font><font>[[ formatLang(a['price_unit'], digits=get_digits(dp='Sale Price')) ]]</font></para> - </td> - <td> - <para style="terp_default_Centre_9"><font>[[ a['layout_type']=='subtotal' and ( setTag('para','para',{'fontName':'Helvetica-Bold'})) or removeParentNode('font') ]]</font><font>[[ formatLang(a['discount'], digits=get_digits(dp='Sale Price')) ]]</font></para> - </td> - <td> - <para style="terp_default_Right_9"><font>[[ a['layout_type']=='subtotal' and ( setTag('para','para',{'fontName':'Helvetica-Bold'})) or removeParentNode('font') ]]</font><font>[[ formatLang(a['price_subtotal'], digits=get_digits(dp='Sale Price')) ]] [[ o.pricelist_id.currency_id.symbol ]]</font></para> - </td> - </tr> - </blockTable> - <blockTable colWidths="453.0,74.0" style="Table2"> - <tr> - <td> - <para style="P7">[[ a['layout_type']=='text' and a['name'] or removeParentNode('blockTable') ]]</para> - </td> - <td> - <para style="P7"></para> - </td> - </tr> - </blockTable> - <blockTable colWidths="66.0,461.0" style="Table3"> - <tr> - <td> - - <para style="P7"><font>[[ a['note']=='' and removeParentNode('blockTable') ]]</font><font>[[ repeatIn(( a['note'] and a['note'].splitlines()) or [], 'note') ]]</font></para> - </td> - <td> - <para style="P7">[[ a['note'] and note or removeParentNode('blockTable') ]]</para> - </td> - </tr> - </blockTable> - <pageBreak>[[ a['layout_type']!='break' and removeParentNode('pageBreak')]]</pageBreak> - <blockTable colWidths="216.0,62.0,62.0,62.0,51.0,74.0" style="Table4"> - <tr> - <td> - <para style="P31">Description [[ a['layout_type']!='break' and removeParentNode('blockTable')]]</para> - </td> - <td> - <para style="P31">Taxes</para> - </td> - <td> - <para style="P31">Quantity</para> - </td> - <td> - <para style="P31">Unit Price</para> - </td> - <td> - <para style="P31">Disc. (%)</para> - </td> - <td> - <para style="P31">Price</para> - </td> - </tr> - </blockTable> + <section> + <para style="terp_default_8">[[repeatIn(sale_order_lines(o),'a')]]</para> + <blockTable colWidths="6.0,193.0,85.0,71.0,57.0,57.0,71.0" style="Table1"> + <tr> + <td> + <para style="terp_default_8"> + <font face="Helvetica" size="9.0">[[ a['layout_type']=='text' and removeParentNode('blockTable')]]</font> + </para> + </td> + <td> + <para style="terp_default_9"><font face="Helvetica" size="8.0">[[ (a['layout_type']=='title' or a['layout_type']=='subtotal') and ( setTag('para','para',{'fontName':'Helvetica-bold'})) or removeParentNode('font') ]] </font>[[ a['name'] ]]</para> + </td> + <td> + <para style="terp_default_Centre_9"><font face="Helvetica" size="8.0">[[ a['layout_type']=='subtotal' and ( setTag('para','para',{'fontName':'Helvetica-Bold'})) or removeParentNode('font') ]]</font> [[ a['tax_id'] ]]</para> + </td> + <td> + <para style="terp_default_Right_9"><font face="Helvetica" size="8.0">[[ a['layout_type']=='subtotal' and ( setTag('para','para',{'fontName':'Helvetica-Bold'})) or removeParentNode('font') ]]</font> [[ a['product_uom_qty'] ]] [[ a['product_uom'] ]] </para> + </td> + <td> + <para style="terp_default_Right_9"><font face="Helvetica" size="8.0">[[ a['layout_type']=='subtotal' and ( setTag('para','para',{'fontName':'Helvetica-Bold'})) or removeParentNode('font') ]]</font> [[ formatLang(a['price_unit'], digits=get_digits(dp='Sale Price')) ]]</para> + </td> + <td> + <para style="terp_default_Centre_9"><font face="Helvetica" size="8.0">[[ a['layout_type']=='subtotal' and ( setTag('para','para',{'fontName':'Helvetica-Bold'})) or removeParentNode('font') ]]</font> [[ formatLang(a['discount'], digits=get_digits(dp='Sale Price')) ]]</para> + </td> + <td> + <para style="terp_default_Right_9">[[ a['layout_type']=='break' and removeParentNode('blockTable')]]<font face="Helvetica" size="8.0">[[ a['layout_type']=='subtotal' and ( setTag('para','para',{'fontName':'Helvetica-Bold'})) or removeParentNode('font') ]]</font> [[ formatLang(a['price_subtotal'], digits=get_digits(dp='Sale Price')) ]] [[ o.pricelist_id.currency_id.symbol ]]</para> + </td> + </tr> + <tr> + <td> + <para style="terp_default_9"> + <font face="Helvetica" size="8.0">[[ a['note']=='' and removeParentNode('tr') ]]</font> + </para> + </td> + <td> + <para style="terp_default_9">[[ a['note'] and format(a['note']) or removeParentNode('tr') ]]</para> + </td> + </tr> + </blockTable> + <blockTable colWidths="539.0" style="Table11"> + <tr> + <td> + <para style="terp_default_9">[[ a['layout_type']=='text' and a['name'] or removeParentNode('blockTable') ]]</para> + </td> + </tr> + </blockTable> + <pageBreak>[[ a['layout_type']!='break' and removeParentNode('pageBreak')]]</pageBreak> + <blockTable colWidths="198.0,85.0,71.0,57.0,57.0,71.0" style="Table13"> + <tr> + <td> + <para style="terp_tblheader_Details">Description<font face="Helvetica" size="8.0"> [[ a['layout_type']!='break' and removeParentNode('blockTable')]]</font></para> + </td> + <td> + <para style="terp_tblheader_Details_Centre">Taxes</para> + </td> + <td> + <para style="terp_tblheader_Details_Right">Quantity</para> + </td> + <td> + <para style="terp_tblheader_Details_Right">Unit Price</para> + </td> + <td> + <para style="terp_tblheader_Details_Centre">Disc. (%)</para> + </td> + <td> + <para style="terp_tblheader_Details_Right">Price</para> + </td> + </tr> + </blockTable> </section> - <blockTable colWidths="382.0,56.0,90.0" style="Table_final"> + <blockTable colWidths="386.0,67.0,86.0" style="Table8"> <tr> <td> <para style="terp_default_9"> @@ -383,7 +326,7 @@ <para style="terp_default_9">Net Total :</para> </td> <td> - <para style="terp_default_Right_9">[[ formatLang(o.amount_untaxed, digits=get_digits(dp='Sale Price') ) ]] [[ o.pricelist_id.currency_id.symbol ]]</para> + <para style="terp_default_Right_9">[[ formatLang(o.amount_untaxed , digits=get_digits(dp='Sale Price')) ]] [[ o.pricelist_id.currency_id. symbol ]]</para> </td> </tr> <tr> @@ -396,7 +339,7 @@ <para style="terp_default_9">Taxes :</para> </td> <td> - <para style="terp_default_Right_9">[[ formatLang(o.amount_tax, digits=get_digits(dp='Sale Price') ) ]] [[ o.pricelist_id.currency_id.symbol ]]</para> + <para style="terp_default_Right_9">[[ formatLang(o.amount_tax , digits=get_digits(dp='Sale Price')) ]] [[ o.pricelist_id.currency_id. symbol ]]</para> </td> </tr> <tr> @@ -409,14 +352,11 @@ <para style="terp_default_Bold_9">Total :</para> </td> <td> - <para style="terp_default_Right_9_Bold">[[ formatLang(o.amount_total, digits=get_digits(dp='Sale Price') ) ]] [[ o.pricelist_id.currency_id.symbol ]]</para> + <para style="terp_default_Right_9_Bold">[[ formatLang(o.amount_total , digits=get_digits(dp='Sale Price')) ]] [[ o.pricelist_id.currency_id. symbol ]] </para> </td> </tr> </blockTable> - <para style="terp_default_8"> - <font color="white"> </font> - </para> - <blockTable colWidths="533.0" style="Table_note"> + <blockTable colWidths="539.0" style="Table2"> <tr> <td> <para style="terp_default_9">[[ format(o.note or '') ]]</para> @@ -428,5 +368,8 @@ </td> </tr> </blockTable> + <para style="Standard"> + <font color="white"> </font> + </para> </story> -</document> +</document>
\ No newline at end of file diff --git a/addons/stock/board_warehouse_view.xml b/addons/stock/board_warehouse_view.xml index fd68f0a2eb5..b073be73575 100644 --- a/addons/stock/board_warehouse_view.xml +++ b/addons/stock/board_warehouse_view.xml @@ -12,7 +12,7 @@ <field name="type">ir.actions.act_window</field> <field name="view_type">form</field> <field name="view_mode">tree,form</field> - <field name="domain">['|','&',('picking_id','=',False),('location_id.usage', 'in', ['customer','supplier']),'&',('picking_id','!=',False),('picking_id.type','=','in')]</field> + <field name="domain">[('state','in',('confirmed','assigned')),'|','&',('picking_id','=',False),('location_id.usage', 'in', ['customer','supplier']),'&',('picking_id','!=',False),('picking_id.type','=','in')]</field> <field name="view_id" ref="stock.view_move_tree_reception_picking_board"/> </record> @@ -22,7 +22,7 @@ <field name="type">ir.actions.act_window</field> <field name="view_type">form</field> <field name="view_mode">tree,form</field> - <field name="domain">['|','&',('picking_id','=',False),('location_dest_id.usage', 'in', ['customer','supplier']),'&',('picking_id','!=',False),('picking_id.type','=','out')]</field> + <field name="domain">[('state','in',('confirmed','assigned')),'|','&',('picking_id','=',False),('location_dest_id.usage', 'in', ['customer','supplier']),'&',('picking_id','!=',False),('picking_id.type','=','out')]</field> <field name="view_id" ref="stock.view_move_tree_reception_picking_board"/> </record> @@ -30,7 +30,7 @@ <field name="res_model">report.stock.move</field> <field name="view_type">form</field> <field name="view_mode">graph,tree</field> - <field name="domain">[('type','=','in')]</field> + <field name="domain">[('type','=','in'),('day','<=', time.strftime('%Y-%m-%d')),('day','>',(datetime.date.today()-datetime.timedelta(days=15)).strftime('%Y-%m-%d'))]</field> <field name="view_id" ref="stock.view_stock_graph_board"></field> <field name="context">{'search_default_month-1':1,'search_default_in':1,'group_by':['day'], 'group_by_no_leaf':1}</field> </record> @@ -38,7 +38,7 @@ <field name="res_model">report.stock.move</field> <field name="view_type">form</field> <field name="view_mode">graph,tree</field> - <field name="domain">[('type','=','out')]</field> + <field name="domain">[('type','=','out'),('day','<=', time.strftime('%Y-%m-%d')),('day','>',(datetime.date.today()-datetime.timedelta(days=15)).strftime('%Y-%m-%d'))]</field> <field name="view_id" ref="stock.view_stock_graph_board"></field> <field name="context">{'search_default_month-1':1,'search_default_out':1,'group_by':['day'], 'group_by_no_leaf':1}</field> </record> @@ -50,13 +50,13 @@ <form string="Warehouse board"> <hpaned position="200"> <child1> - <action colspan="4" name="%(action_incoming_product_board)d" string="Incoming Product" /> - <action colspan="4" name="%(action_outgoing_product_board)d" string="Outgoing Product" /> + <action colspan="4" name="%(action_incoming_product_board)d" string="Incoming Product" width="510"/> + <action colspan="4" name="%(action_outgoing_product_board)d" string="Outgoing Product" width="510"/> </child1> <child2> - <action colspan="4" name="%(action_stock_incoming_product_delay)d" string="Incoming Products Delay" width="510"/> - <action colspan="4" name="%(action_stock_outgoing_product_delay)d" string="Outgoing Products delay" width="510"/> + <action colspan="4" name="%(action_stock_incoming_product_delay)d" string="Incoming Products Delay" /> + <action colspan="4" name="%(action_stock_outgoing_product_delay)d" string="Outgoing Products Delay" /> </child2> </hpaned> </form> diff --git a/addons/stock/report/lot_overview.py b/addons/stock/report/lot_overview.py index 66230e2822c..89974fa122b 100644 --- a/addons/stock/report/lot_overview.py +++ b/addons/stock/report/lot_overview.py @@ -37,7 +37,7 @@ class lot_overview(report_sxw.rml_parse): def process(self,location_id): location_obj = pooler.get_pool(self.cr.dbname).get('stock.location') data = location_obj._product_get_report(self.cr,self.uid, [location_id]) - + data['location_name'] = location_obj.read(self.cr, self.uid, [location_id],['complete_name'])[0]['complete_name'] self.price_total = 0.0 self.price_total += data['total_price'] @@ -50,7 +50,7 @@ class lot_overview(report_sxw.rml_parse): def _grand_total(self): return self.grand_total -report_sxw.report_sxw('report.lot.stock.overview', 'stock.location', 'addons/stock/report/lot_overview.rml', parser=lot_overview) +report_sxw.report_sxw('report.lot.stock.overview', 'stock.location', 'addons/stock/report/lot_overview.rml', parser=lot_overview,header='internal') # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/stock/report/lot_overview.rml b/addons/stock/report/lot_overview.rml index 4283bd2e960..aae5abacf0a 100644 --- a/addons/stock/report/lot_overview.rml +++ b/addons/stock/report/lot_overview.rml @@ -1,6 +1,6 @@ <?xml version="1.0"?> -<document filename="Location Overview.pdf"> - <template pageSize="(595.0,842.0)" title="Location Overview" author="OpenERP S.A.(sales@openerp.com)" allowSplitting="20"> +<document filename="Location Inventory Overview.pdf"> + <template pageSize="(595.0,842.0)" title="Location Inventory Overview" author="OpenERP S.A.(sales@openerp.com)" allowSplitting="20"> <pageTemplate id="first"> <frame id="first" x1="33.0" y1="57.0" width="526" height="728"/> </pageTemplate> @@ -24,6 +24,8 @@ <blockValign value="TOP"/> <lineStyle kind="LINEBELOW" colorName="#999999" start="0,-1" stop="0,-1"/> <lineStyle kind="LINEBELOW" colorName="#999999" start="1,-1" stop="1,-1"/> + <lineStyle kind="LINEBELOW" colorName="#999999" start="2,-1" stop="2,-1"/> + <lineStyle kind="LINEBELOW" colorName="#999999" start="3,-1" stop="3,-1"/> </blockTableStyle> <blockTableStyle id="Table8"> <blockAlignment value="LEFT"/> @@ -89,7 +91,7 @@ <para style="terp_default_8"> <font color="white"> </font> </para> - <para style="terp_header_Centre">Location Overview</para> + <para style="terp_header_Centre">Location Inventory Overview</para> <para style="terp_default_8"> <font color="white"> </font> </para> diff --git a/addons/stock/report/lot_overview_all.rml b/addons/stock/report/lot_overview_all.rml index 5104671fa11..e5aca0e3035 100644 --- a/addons/stock/report/lot_overview_all.rml +++ b/addons/stock/report/lot_overview_all.rml @@ -23,6 +23,9 @@ <blockAlignment value="LEFT"/> <blockValign value="TOP"/> <lineStyle kind="LINEBELOW" colorName="#999999" start="0,-1" stop="0,-1"/> + <lineStyle kind="LINEBELOW" colorName="#999999" start="1,-1" stop="1,-1"/> + <lineStyle kind="LINEBELOW" colorName="#999999" start="2,-1" stop="2,-1"/> + <lineStyle kind="LINEBELOW" colorName="#999999" start="3,-1" stop="3,-1"/> </blockTableStyle> <blockTableStyle id="Table8"> <blockAlignment value="LEFT"/> @@ -194,5 +197,8 @@ </td> </tr> </blockTable> + <para style="terp_default_2"> + <font color="white"> </font> + </para> </story> </document>
\ No newline at end of file diff --git a/addons/stock/report/picking.py b/addons/stock/report/picking.py index 29a53fba7a2..27141c917a9 100644 --- a/addons/stock/report/picking.py +++ b/addons/stock/report/picking.py @@ -29,7 +29,14 @@ class picking(report_sxw.rml_parse): super(picking, self).__init__(cr, uid, name, context=context) self.localcontext.update({ 'time': time, + 'get_qtytotal':self._get_qtytotal }) + def _get_qtytotal(self,move_lines): + total = 0.0 + uom = move_lines[0].product_uom.name + for move in move_lines: + total+=move.product_qty + return {'quantity':total,'uom':uom} report_sxw.report_sxw('report.stock.picking.list','stock.picking','addons/stock/report/picking.rml',parser=picking) # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/stock/report/picking.rml b/addons/stock/report/picking.rml index 6c6027093a0..cc6923ac545 100644 --- a/addons/stock/report/picking.rml +++ b/addons/stock/report/picking.rml @@ -1,6 +1,6 @@ <?xml version="1.0"?> -<document filename="test.pdf"> - <template pageSize="(595.0,842.0)" title="Picking List" author="OpenERP S.A. (sales@openerp.com)" allowSplitting="20"> +<document filename="Packing List.pdf"> + <template pageSize="(595.0,842.0)" title="Packing List" author="OpenERP S.A.(sales@openerp.com)" allowSplitting="20"> <pageTemplate id="first"> <frame id="first" x1="0.0" y1="57.0" width="538" height="728"/> </pageTemplate> @@ -70,7 +70,7 @@ <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="3,-1" stop="3,-1"/> <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="4,-1" stop="4,-1"/> </blockTableStyle> - <blockTableStyle id="Move_Line_Content_Other_State"> + <blockTableStyle id="Table1"> <blockAlignment value="LEFT"/> <blockValign value="TOP"/> <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/> @@ -79,6 +79,12 @@ <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="3,-1" stop="3,-1"/> <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="4,-1" stop="4,-1"/> </blockTableStyle> + <blockTableStyle id="Table2"> + <blockAlignment value="LEFT"/> + <blockValign value="TOP"/> + <lineStyle kind="LINEABOVE" colorName="#000000" start="1,0" stop="1,0"/> + <lineStyle kind="LINEABOVE" colorName="#000000" start="2,0" stop="2,0"/> + </blockTableStyle> <initialize> <paraStyle name="all" alignment="justify"/> </initialize> @@ -203,13 +209,13 @@ <para style="terp_tblheader_Details_Centre">Lot</para> </td> <td> - <para style="terp_tblheader_Details">State</para> + <para style="terp_tblheader_Details_Centre">State</para> </td> <td> - <para style="terp_tblheader_Details_Centre">Quantity</para> + <para style="terp_tblheader_Details_Right">Location</para> </td> <td> - <para style="terp_tblheader_Details_Centre">Location</para> + <para style="terp_tblheader_Details_Right">Quantity</para> </td> </tr> </blockTable> @@ -228,19 +234,20 @@ <para style="terp_default_9">[[ move_lines.state ]]</para> </td> <td> - <para style="terp_default_Right_9">[[ move_lines.product_qty ]] [[ move_lines.product_uom.name ]] </para> + <para style="terp_default_Right_9">[[ (move_lines.location_id and move_lines.location_id.name) or '' ]] </para> </td> <td> - <para style="terp_default_Centre_9">[[ (move_lines.location_id and move_lines.location_id.name) or '' ]]</para> + <para style="terp_default_Right_9">[[ formatLang(move_lines.product_qty) ]] [[ move_lines.product_uom.name ]]</para> </td> </tr> </blockTable> </section> <para style="terp_default_Bold_9">[[ ([line for line in picking.move_lines if (line.state == 'draft' or line.state=='waiting' )]) and 'Non Assigned Products:' or removeParentNode('para') ]]</para> + <para style="terp_default_2"/> <section> - <para style="terp_default_2">[[ repeatIn([line for line in picking.move_lines if (line.state == 'draft' or line.state=='waiting')],'move_lines') ]] </para> + <para style="terp_default_2">[[ repeatIn([line for line in picking.move_lines if (line.state == 'draft' or line.state=='waiting')],'move_lines') ]]</para> <para style="terp_default_2">[[ (picking.move_lines!=[] and removeParentNode('para')) or removeParentNode('section')]]</para> - <blockTable colWidths="256.0,74.0,57.0,61.0,72.0" style="Move_Line_Content_Other_State"> + <blockTable colWidths="256.0,74.0,57.0,61.0,72.0" style="Table1"> <tr> <td> <para style="terp_default_9"><font face="Helvetica" size="9.0">[ [[ (move_lines.product_id.default_code) or removeParentNode('font') ]] ]</font> [[ move_lines.product_id.name ]] [[ move_lines.product_id.variants or '']]</para> @@ -252,16 +259,31 @@ <para style="terp_default_9">[[ move_lines.state ]]</para> </td> <td> - <para style="terp_default_Right_9">[[ move_lines.product_qty ]] [[ move_lines.product_uom.name ]] </para> + <para style="terp_default_Right_9">[[ (move_lines.location_id and move_lines.location_id.name) or '' ]] </para> </td> <td> - <para style="terp_default_Centre_9">[[ (move_lines.location_id and move_lines.location_id.name) or '' ]]</para> + <para style="terp_default_Right_9">[[ formatLang(move_lines.product_qty) ]] [[ move_lines.product_uom.name ]]</para> </td> </tr> </blockTable> - <para style="terp_default_2"> - <font color="white"> </font> - </para> </section> + <blockTable colWidths="388.0,56.0,77.0" style="Table2"> + <tr> + <td> + <para style="terp_default_9"> + <font color="white"> </font> + </para> + </td> + <td> + <para style="terp_tblheader_Details_Centre">Total</para> + </td> + <td> + <para style="terp_tblheader_Details_Right">[[ formatLang(get_qtytotal(picking.move_lines)['quantity']) ]] [[ get_qtytotal(picking.move_lines)['uom'] ]]</para> + </td> + </tr> + </blockTable> + <para style="terp_default_2"> + <font color="white"> </font> + </para> </story> </document>
\ No newline at end of file diff --git a/addons/stock/report/report_stock_move_view.xml b/addons/stock/report/report_stock_move_view.xml index 91ded919ced..094b6d43e57 100644 --- a/addons/stock/report/report_stock_move_view.xml +++ b/addons/stock/report/report_stock_move_view.xml @@ -33,7 +33,7 @@ <field name="value" sum="Total value"/> <field name="day_diff1"/> <field name="day_diff"/> - <field name="day_diff2"/> + <field name="day_diff2" string="Delay(Days)"/> </tree> </field> </record> @@ -56,7 +56,7 @@ <field name="arch" type="xml"> <graph string="Moves Analysis" type="bar"> <field name="day"/> - <field name="day_diff2" operator="+"/> + <field name="day_diff2" operator="+" string="Delay(Days)"/> </graph> </field> </record> diff --git a/addons/stock/report/stock_graph.py b/addons/stock/report/stock_graph.py index 4d4c03fb80c..5ee58bb9d2c 100644 --- a/addons/stock/report/stock_graph.py +++ b/addons/stock/report/stock_graph.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ############################################################################## -# +# # OpenERP, Open Source Management Solution # Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>). # @@ -15,7 +15,7 @@ # GNU Affero General Public License for more details. # # You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. +# along with this program. If not, see <http://www.gnu.org/licenses/>. # ############################################################################## from pychart import * @@ -31,6 +31,7 @@ class stock_graph(object): self._datas = {} self._canvas = canvas.init(fname=io, format='pdf') self._canvas.set_author("OpenERP") + self._canvas.set_title("Stock Level Forecast") self._names = {} self.val_min = '' self.val_max = '' @@ -91,6 +92,9 @@ class stock_graph(object): interval = max((val_max-val_min)/15, 86400) x_axis = axis.X(format=lambda x:'/a60{}'+time.strftime('%Y-%m-%d',time.gmtime(x)), tic_interval=interval, label=None) + # For add the report header on the top of the report. + tb = text_box.T(loc=(300, 500), text="/hL/15/bStock Level Forecast", line_style=None) + tb.draw() ar = area.T(size = (620,435), x_range=(val_min,val_max+1), y_axis = axis.Y(format="%d", label="Virtual Stock (Unit)"), x_axis=x_axis) for plot in plots: ar.add_plot(plot) diff --git a/addons/stock/report/stock_inventory_move.rml b/addons/stock/report/stock_inventory_move.rml index 9531c534dec..a6f8971ac6d 100755 --- a/addons/stock/report/stock_inventory_move.rml +++ b/addons/stock/report/stock_inventory_move.rml @@ -1,6 +1,6 @@ <?xml version="1.0"?> -<document filename="test.pdf"> - <template pageSize="(595.0,842.0)" title="Stock Inventory" author="OpenERP S.A. (sales@openerp.com)" allowSplitting="20"> +<document filename="Stock Inventory.pdf"> + <template pageSize="(595.0,842.0)" title="Stock Inventory" author="OpenERP S.A.(sales@openerp.com)" allowSplitting="20"> <pageTemplate id="first"> <frame id="first" x1="28.0" y1="28.0" width="539" height="786"/> </pageTemplate> @@ -59,8 +59,8 @@ <blockTableStyle id="Table7"> <blockAlignment value="LEFT"/> <blockValign value="TOP"/> - <lineStyle kind="LINEABOVE" colorName="#000000" start="0,0" stop="0,0"/> <lineStyle kind="LINEABOVE" colorName="#000000" start="1,0" stop="1,0"/> + <lineStyle kind="LINEABOVE" colorName="#000000" start="2,0" stop="2,0"/> </blockTableStyle> <initialize> <paraStyle name="all" alignment="justify"/> @@ -111,13 +111,6 @@ <para style="terp_header_Centre">Stock Inventory</para> </td> </tr> - <tr> - <td> - <para style="terp_default_8"> - <font color="white"> </font> - </para> - </td> - </tr> </blockTable> <blockTable colWidths="539.0" style="Table5"> <tr> @@ -167,11 +160,8 @@ </td> </tr> </blockTable> - <para style="terp_default_2"> - <font color="white"> </font> - </para> <section> - <para style="terp_default_9">[[ repeatIn(o.inventory_line_id, 'p') ]]</para> + <para style="terp_default_2">[[ repeatIn(o.inventory_line_id, 'p') ]]</para> <blockTable colWidths="70.0,105.0,255.0,109.0" style="Table8"> <tr> <td> @@ -189,13 +179,18 @@ </tr> </blockTable> </section> - <blockTable colWidths="430.0,109.0" style="Table7"> + <blockTable colWidths="383.0,47.0,109.0" style="Table7"> <tr> <td> + <para style="terp_default_Bold_9"> + <font color="white"> </font> + </para> + </td> + <td> <para style="terp_default_Bold_9">Total:</para> </td> <td> - <para style="terp_default_Bold_Right_9">[[ format(qty_total(o.inventory_line_id)['quantity']) ]] [[ format(qty_total(o.inventory_line_id)['uom']) ]]</para> + <para style="terp_default_Bold_Right_9">[[ formatLang(qty_total(o.inventory_line_id)['quantity']) ]] [[ qty_total(o.inventory_line_id)['uom'] ]]</para> </td> </tr> </blockTable> @@ -203,4 +198,4 @@ <font color="white"> </font> </para> </story> -</document> +</document>
\ No newline at end of file diff --git a/addons/stock/report/stock_inventory_move_report.py b/addons/stock/report/stock_inventory_move_report.py index b89b6b9fa9b..e8c0d44bcc1 100755 --- a/addons/stock/report/stock_inventory_move_report.py +++ b/addons/stock/report/stock_inventory_move_report.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ############################################################################## -# +# # OpenERP, Open Source Management Solution # Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>). # @@ -15,7 +15,7 @@ # GNU Affero General Public License for more details. # # You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. +# along with this program. If not, see <http://www.gnu.org/licenses/>. # ############################################################################## @@ -29,18 +29,19 @@ class stock_inventory_move(report_sxw.rml_parse): 'time': time, 'qty_total':self._qty_total }) - + def _qty_total(self,objects): total = 0.0 uom = objects[0].product_uom.name for obj in objects: total += obj.product_qty - return {'quantity':str(total),'uom':uom} + return {'quantity':total,'uom':uom} report_sxw.report_sxw( 'report.stock.inventory.move', 'stock.inventory', 'addons/stock/report/stock_inventory_move.rml', - parser=stock_inventory_move + parser=stock_inventory_move, + header='internal' ) # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/stock/stock_report.xml b/addons/stock/stock_report.xml index e634d27153e..0f7411a1430 100644 --- a/addons/stock/stock_report.xml +++ b/addons/stock/stock_report.xml @@ -2,10 +2,10 @@ <openerp> <data> <report auto="False" id="report_product_history" model="product.product" name="stock.product.history" string="Stock Level Forecast"/> - <report id="report_picking_list" model="stock.picking" name="stock.picking.list" string="Picking list" rml="stock/report/picking.rml"/> + <report id="report_picking_list" model="stock.picking" name="stock.picking.list" string="Packing list" rml="stock/report/picking.rml"/> <report id="report_move_labels" model="stock.move" name="stock.move.label" string="Item Labels" xml="stock/report/lot_move_label.xml" xsl="stock/report/lot_move_label.xsl"/> - <report auto="False" id="report_location_overview" model="stock.location" name="lot.stock.overview" string="Inventory" rml="stock/report/lot_overview.rml" groups="base.group_extended"/> - <report id="report_location_overview_all" model="stock.location" name="lot.stock.overview_all" string="Inventory (with child locations)" rml="stock/report/lot_overview_all.rml"/> - <report id="report_stock_inventory_move" model="stock.inventory" name="stock.inventory.move" string="Inventory" rml="stock/report/stock_inventory_move.rml"/> + <report auto="False" id="report_location_overview" model="stock.location" name="lot.stock.overview" string="Location Inventory Overview" rml="stock/report/lot_overview.rml" groups="base.group_extended"/> + <report id="report_location_overview_all" model="stock.location" name="lot.stock.overview_all" string="Location Content" rml="stock/report/lot_overview_all.rml"/> + <report id="report_stock_inventory_move" model="stock.inventory" name="stock.inventory.move" string="Stock Inventory" rml="stock/report/stock_inventory_move.rml"/> </data> </openerp> |