diff options
| author | husen daudi <hda@hda> | 2009-06-04 12:28:39 +0530 |
|---|---|---|
| committer | husen daudi <hda@hda> | 2009-06-04 12:28:39 +0530 |
| commit | 2b516bb9f0d88cea1dec24215b8b8bf16632e77d (patch) | |
| tree | 057cbee37182cd87ac119faf005645506a23b7bd | |
| parent | 18dc4ad6ca9d70a25959b352a9bb1b14959a1a72 (diff) | |
| parent | 92a17b1477c175a203ccd6b3b3b5cb8e635ae064 (diff) | |
bugfixd in pos,invoice_layout,improved reports and sxw files(ref:vra)
bzr revid: hda@hda-20090604065839-jphvl53youhrspap
| -rw-r--r-- | addons/account/project/report/analytic_journal.rml | 368 | ||||
| -rw-r--r-- | addons/account/project/report/inverted_analytic_balance.rml | 280 | ||||
| -rw-r--r-- | addons/account_analytic_plans/report/crossovered_analytic.rml | 358 | ||||
| -rw-r--r-- | addons/account_invoice_layout/report/report_account_invoice_layout.rml | 38 | ||||
| -rw-r--r-- | addons/account_invoice_layout/report/special_message_invoice.rml | 56 | ||||
| -rw-r--r-- | addons/account_payment/report/order.rml | 123 | ||||
| -rw-r--r-- | addons/account_reporting/account.py | 5 | ||||
| -rw-r--r-- | addons/account_reporting/report/account_report_bs.rml | 9 | ||||
| -rw-r--r-- | addons/point_of_sale/report/pos_invoice.py | 39 | ||||
| -rw-r--r-- | addons/point_of_sale/report/pos_receipt.rml | 160 | ||||
| -rw-r--r-- | addons/point_of_sale/wizard/wizard_pos_payment.py | 33 |
11 files changed, 890 insertions, 579 deletions
diff --git a/addons/account/project/report/analytic_journal.rml b/addons/account/project/report/analytic_journal.rml index d7570aa8943..6cb381531c9 100644 --- a/addons/account/project/report/analytic_journal.rml +++ b/addons/account/project/report/analytic_journal.rml @@ -2,137 +2,297 @@ <document filename="test.pdf"> <template pageSize="(595.0,842.0)" title="Test" author="Martin Simon" allowSplitting="20"> <pageTemplate id="first"> - <frame id="first" x1="57.0" y1="57.0" width="481" height="728"/> - <header> - <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">Analytic Journal - [[ company.currency_id.name ]]</drawRightString> - - <!-- Header --> - - - <setFont name="Helvetica" size="9"/> - <drawString x="1.0cm" y="1cm"> [[ time.strftime("%Y-%m-%d %H:%M", time.localtime()) ]]</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> - </header> + <frame id="first" x1="28.0" y1="28.0" width="539" height="786"/> </pageTemplate> </template> <stylesheet> - <blockTableStyle id="tbl_header"> + <blockTableStyle id="Standard_Outline"> <blockAlignment value="LEFT"/> <blockValign value="TOP"/> - <lineStyle kind="LINEBELOW" colorName="#000000" start="0,0" stop="-1,0"/> </blockTableStyle> - - <blockTableStyle id="tbl_code_name"> + <blockTableStyle id="Table_Tilte"> <blockAlignment value="LEFT"/> <blockValign value="TOP"/> - <lineStyle kind="LINEBELOW" colorName="#000000" start="0,0" stop="-1,0"/> </blockTableStyle> - - <blockTableStyle id="tbl_content"> + <blockTableStyle id="Table_detail_header"> <blockAlignment value="LEFT"/> <blockValign value="TOP"/> - <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,0" stop="-1,-1"/> + <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"/> + <lineStyle kind="LINEBELOW" colorName="#000000" start="5,-1" stop="5,-1"/> + </blockTableStyle> + <blockTableStyle id="Table1"> + <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"/> + <lineStyle kind="LINEBELOW" colorName="#000000" start="5,-1" stop="5,-1"/> + </blockTableStyle> + <blockTableStyle id="Table2"> + <blockAlignment value="LEFT"/> + <blockValign value="TOP"/> + <lineStyle kind="LINEBELOW" colorName="#cccccc" start="0,-1" stop="0,-1"/> + <lineStyle kind="LINEBELOW" colorName="#cccccc" start="1,-1" stop="1,-1"/> + <lineStyle kind="LINEBELOW" colorName="#cccccc" start="2,-1" stop="2,-1"/> + <lineStyle kind="LINEBELOW" colorName="#cccccc" start="3,-1" stop="3,-1"/> + <lineStyle kind="LINEBELOW" colorName="#cccccc" start="4,-1" stop="4,-1"/> + <lineStyle kind="LINEBELOW" colorName="#cccccc" start="5,-1" stop="5,-1"/> + </blockTableStyle> + <blockTableStyle id="Table4"> + <blockAlignment value="LEFT"/> + <blockValign value="TOP"/> + <lineStyle kind="LINEBELOW" colorName="#cccccc" start="0,-1" stop="0,-1"/> + <lineStyle kind="LINEBELOW" colorName="#cccccc" start="1,-1" stop="1,-1"/> + <lineStyle kind="LINEBELOW" colorName="#cccccc" start="2,-1" stop="2,-1"/> + <lineStyle kind="LINEBELOW" colorName="#cccccc" start="3,-1" stop="3,-1"/> + <lineStyle kind="LINEBELOW" colorName="#cccccc" start="4,-1" stop="4,-1"/> + <lineStyle kind="LINEBELOW" colorName="#cccccc" start="5,-1" stop="5,-1"/> + </blockTableStyle> + <blockTableStyle id="Table3"> + <blockAlignment value="LEFT"/> + <blockValign value="TOP"/> + <lineStyle kind="LINEBELOW" colorName="#cccccc" start="0,-1" stop="0,-1"/> + <lineStyle kind="LINEBELOW" colorName="#cccccc" start="1,-1" stop="1,-1"/> + <lineStyle kind="LINEBELOW" colorName="#cccccc" start="2,-1" stop="2,-1"/> + <lineStyle kind="LINEBELOW" colorName="#cccccc" start="3,-1" stop="3,-1"/> + <lineStyle kind="LINEBELOW" colorName="#cccccc" start="4,-1" stop="4,-1"/> + <lineStyle kind="LINEBELOW" colorName="#cccccc" start="5,-1" stop="5,-1"/> </blockTableStyle> - <initialize> <paraStyle name="all" alignment="justify"/> </initialize> - <paraStyle name="Heading" fontName="Helvetica" fontSize="8.0" alignment="LEFT"/> - <paraStyle name="Heading_right" fontName="Helvetica" fontSize="8.0" alignment="RIGHT"/> - <paraStyle name="total" fontName="Helvetica-Bold" fontSize="8.5" alignment="LEFT"/> - <paraStyle name="total_right" fontName="Helvetica-Bold" fontSize="8.5" alignment="RIGHT"/> - <paraStyle name="tbl_content" fontName="Helvetica" fontSize="8.0" alignment="LEFT"/> - <paraStyle name="tbl_content_right" fontName="Helvetica" fontSize="8.0" alignment="RIGHT"/> + <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="CENTER" spaceBefore="0.0" spaceAfter="0.0"/> + <paraStyle name="P3" fontName="Helvetica" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/> + <paraStyle name="P4" fontName="Helvetica-Bold" fontSize="11.0" leading="14" spaceBefore="0.0" spaceAfter="0.0"/> + <paraStyle name="P5" fontName="Helvetica-Bold" fontSize="11.0" leading="14" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/> + <paraStyle name="P6" fontName="Helvetica" fontSize="11.0" leading="14" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/> + <paraStyle name="P7" fontName="Helvetica" fontSize="11.0" leading="14" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> + <paraStyle name="P8" fontName="Helvetica" fontSize="11.0" leading="14" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/> + <paraStyle name="P9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/> + <paraStyle name="P10" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> + <paraStyle name="P11" fontName="Helvetica" fontSize="6.0" leading="8" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> + <paraStyle name="P12" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> + <paraStyle name="P13" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" 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="Heading" fontName="Helvetica" fontSize="12.0" leading="15" spaceBefore="12.0" spaceAfter="6.0"/> + <paraStyle name="List" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/> + <paraStyle name="Table Contents" fontName="Helvetica" spaceBefore="0.0" spaceAfter="0.0"/> + <paraStyle name="Table Heading" fontName="Helvetica" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/> + <paraStyle name="Caption" fontName="Helvetica" fontSize="12.0" leading="15" spaceBefore="6.0" spaceAfter="6.0"/> + <paraStyle name="Index" fontName="Helvetica"/> + <paraStyle name="Footer" 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="Heading 9" fontName="Helvetica-Bold" fontSize="75%" leading="NaN" spaceBefore="12.0" spaceAfter="6.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="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_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="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"/> + <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_address" fontName="Helvetica" fontSize="10.0" leading="13" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> + <paraStyle name="terp_default_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> + <paraStyle name="terp_default_Bold_9" fontName="Helvetica-Bold" fontSize="9.0" leading="11" 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_Right_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/> + <paraStyle name="terp_default_space" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="11.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_Right_9_Bold" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/> </stylesheet> - + <images/> <story> - - <para style="Heading">[[ repeatIn(objects,'o') ]]</para> - <blockTable colWidths="55.0,50.0,245.0,100.0,48.0,48.0" style="tbl_header" repeatRows="1"> - <tr> - <td><para style="Heading">Date</para></td> - <td><para style="Heading">Code</para></td> - <td><para style="Heading">Move name</para></td> - <td><para style="Heading">Account n°</para></td> - <td><para style="Heading_right">General</para></td> - <td><para style="Heading_right">Analytic</para></td> + <para style="P12">[[ repeatIn(objects,'o') ]]</para> + <blockTable colWidths="539.0" style="Table_Tilte"> + <tr> + <td> + <para style="terp_header_Centre">Analitic Journal - [[ company.currency_id.name ]]</para> + </td> + </tr> + <tr> + <td> + <para style="terp_header_Centre">Period from : [[ data['form']['date1'] ]]</para> + <para style="terp_header_Centre">to : [[ data['form']['date2'] ]]</para> + </td> </tr> </blockTable> - - - <blockTable colWidths="450.0,48.0,48.0" style="tbl_code_name"> + <para style="terp_default_space"> + <font color="white"> </font> + </para> + <blockTable colWidths="85.0,62.0,168.0,73.0,74.0,77.0" style="Table_detail_header"> <tr> - <td><para style="total">[[ o.code ]] - [[ o.name ]]</para></td> - <td><para style="total_right"><u>[[ formatLang(sum_general(o.id,data['form']['date1'],data['form']['date2'])) ]]</u></para></td> - <td><para style="total_right"><u>[[ formatLang(sum_analytic(o.id,data['form']['date1'],data['form']['date2'])) ]]</u></para></td> + <td> + <para style="terp_tblheader_Details">Date</para> + </td> + <td> + <para style="terp_tblheader_Details">Code</para> + </td> + <td> + <para style="terp_tblheader_Details">Move Name</para> + </td> + <td> + <para style="terp_tblheader_Details">Account n°</para> + </td> + <td> + <para style="terp_tblheader_Details_Right">General</para> + </td> + <td> + <para style="terp_tblheader_Details_Right">Analytic</para> + </td> </tr> </blockTable> - - <section> - - <para style="tbl_content">[[ repeatIn(lines(o.id,data['form']['date1'],data['form']['date2']), 'move') ]]</para> - - <blockTable colWidths="55.0,50.0,245.0,100.0,48.0,48.0" repeatRows="1" style="tbl_content"> + <para style="terp_default_2"> + <font color="white"> </font> + </para> + <blockTable colWidths="118.0,28.0,168.0,73.0,74.0,77.0" style="Table1"> <tr> - <td><para style="tbl_content"></para></td> - <td><para style="tbl_content"></para></td> - <td><para style="tbl_content">[[ move.name ]]</para></td> - <td><para style="tbl_content">[[ move.account_id.code ]] - [[ move.account_id.name ]]</para></td> - <td><para style="tbl_content_right">[[ formatLang(move.debit-move.credit) ]]</para></td> - <td><para style="tbl_content"></para></td> - + <td> + <para style="terp_tblheader_Details">[[ o.code ]] - [[ o.name ]]</para> + </td> + <td> + <para style="terp_tblheader_Details"> + <font color="white"> </font> + </para> + </td> + <td> + <para style="terp_tblheader_Details"> + <font color="white"> </font> + </para> + </td> + <td> + <para style="terp_tblheader_Details"> + <font color="white"> </font> + </para> + </td> + <td> + <para style="terp_default_Right_9_Bold">[[ formatLang(sum_general(o.id,data['form']['date1'],data['form']['date2'])) ]]</para> + </td> + <td> + <para style="terp_default_Right_9_Bold">[[ formatLang(sum_analytic(o.id,data['form']['date1'],data['form']['date2'])) ]]</para> + </td> </tr> </blockTable> - - <blockTable colWidths="55.0,50.0,245.0,100.0,48.0,48.0" style="tbl_content"> - <tr> + <para style="terp_default_2"> + <font color="white"> </font> + </para> + <section> + <para style="terp_default_8">[[ repeatIn(lines(o.id,data['form']['date1'],data['form']['date2']), 'move') ]]</para> + <blockTable colWidths="85.0,62.0,168.0,73.0,74.0,77.0" style="Table2"> + <tr> + <td> + <para style="terp_tblheader_Details"> + <font color="white"> </font> + </para> + </td> + <td> + <para style="terp_tblheader_Details"> + <font color="white"> </font> + </para> + </td> + <td> + <para style="terp_default_9">[[ move.name ]]</para> + </td> <td> - <para style="tbl_content">[[ repeatIn(lines_a(move.id,o.id,data['form']['date1'],data['form']['date2']),'move_a') ]]</para> - <para style="tbl_content">[[ formatLang(move_a.date,date = True) ]]</para> + <para style="terp_default_9">[[ move.account_id.code ]] - [[ move.account_id.name ]]</para> + </td> + <td> + <para style="terp_default_Right_9">[[ formatLang(move.debit-move.credit) ]]</para> + </td> + <td> + <para style="terp_default_Right_9"> + <font color="white"> </font> + </para> </td> - <td><para style="tbl_content">[[ move_a.code ]]</para></td> - <td><para style="tbl_content">[[ move_a.name ]]</para></td> - <td><para style="tbl_content">[[ move_a.account_id.code ]] - [[ move_a.account_id.name ]]</para></td> - <td><para style="tbl_content"></para></td> - <td><para style="tbl_content_right">[[ formatLang( move_a.amount) ]]</para></td> - </tr> - </blockTable> + </blockTable> + <para style="terp_default_2"> + <font color="white"> </font> + </para> + <section> + <para style="terp_default_8">[[ repeatIn(lines_a(move.id,o.id,data['form']['date1'],data['form']['date2']),'move_a') ]]</para> + <blockTable colWidths="85.0,62.0,168.0,73.0,74.0,77.0" style="Table4"> + <tr> + <td> + <para style="terp_default_9">[[ move_a or removeParentNode('blockTable') ]] [[ formatLang(move_a.date,date = True) ]]</para> + </td> + <td> + <para style="terp_default_9">[[ move_a.code ]]</para> + </td> + <td> + <para style="terp_default_9">[[ move_a.name ]]</para> + </td> + <td> + <para style="terp_default_9">[[ move_a.account_id.code ]] - [[ move_a.account_id.name ]]</para> + </td> + <td> + <para style="terp_default_Right_9"> + <font color="white"> </font> + </para> + </td> + <td> + <para style="terp_default_Right_9">[[ formatLang( move_a.amount) ]]</para> + </td> + </tr> + </blockTable> + <para style="terp_default_2"> + <font color="white"> </font> + </para> + </section> + <para style="terp_default_2"> + <font color="white"> </font> + </para> + <para style="terp_default_2"> + <font color="white"> </font> + </para> </section> - - <blockTable colWidths="55.0,50.0,245.0,100.0,48.0,48.0" style="tbl_content"> - - <tr> - <para style="tbl_content">[[ repeatIn(lines_a(False,o.id,data['form']['date1'],data['form']['date2']),'move_a') ]]</para> - <td><para style="tbl_content">[[ formatLang(move_a.date,date = True) ]]</para></td> - <td><para style="tbl_content">[[ move_a.code ]]</para></td> - <td><para style="tbl_content">[[ move_a.name ]]</para></td> - <td><para style="tbl_content">[[move_a.account_id.code ]] - [[ move_a.account_id.name ]]</para></td> - <td><para style="tbl_content"></para></td> - <td><para style="tbl_content_right">[[ formatLang( move_a.amount) ]]</para></td> - - </tr> - </blockTable> - + <para style="terp_default_2"> + <font color="white"> </font> + </para> + <section> + <para style="terp_default_8">[[ repeatIn(lines_a(False,o.id,data['form']['date1'],data['form']['date2']),'move_a') ]]</para> + <blockTable colWidths="85.0,62.0,168.0,73.0,74.0,77.0" style="Table3"> + <tr> + <td> + <para style="terp_default_9">[[ move_a or removeParentNode('blockTable') ]] [[ formatLang(move_a.date,date = True) ]]</para> + </td> + <td> + <para style="terp_default_9">[[ move_a.code ]]</para> + </td> + <td> + <para style="terp_default_9">[[ move_a.name ]]</para> + </td> + <td> + <para style="terp_default_9">[[ move_a.account_id.code ]] - [[ move_a.account_id.name ]]</para> + </td> + <td> + <para style="terp_default_Right_9"> + <font color="white"> </font> + </para> + </td> + <td> + <para style="terp_default_Right_9">[[ formatLang( move_a.amount) ]]</para> + </td> + </tr> + </blockTable> + <para style="terp_default_2"> + <font color="white"> </font> + </para> + </section> + <para style="terp_default_8"> + <font color="white"> </font> + </para> </story> -</document>
\ No newline at end of file +</document> diff --git a/addons/account/project/report/inverted_analytic_balance.rml b/addons/account/project/report/inverted_analytic_balance.rml index 1f3850d2439..18511393253 100644 --- a/addons/account/project/report/inverted_analytic_balance.rml +++ b/addons/account/project/report/inverted_analytic_balance.rml @@ -2,37 +2,7 @@ <document filename="test.pdf"> <template pageSize="(595.0,842.0)" title="Test" author="Martin Simon" allowSplitting="20"> <pageTemplate id="first"> - <frame id="first" x1="57.0" y1="57.0" width="481" height="728"/> - <header> - <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">Inverted Analytic Balance - [[ company.currency_id.name ]]</drawRightString> - - <!-- Header --> - - - <setFont name="Helvetica" size="9"/> - <drawString x="1.0cm" y="1cm"> [[ time.strftime("%Y-%m-%d %H:%M", time.localtime()) ]]</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> - </header> + <frame id="first" x1="28.0" y1="28.0" width="539" height="786"/> </pageTemplate> </template> <stylesheet> @@ -40,165 +10,209 @@ <blockAlignment value="LEFT"/> <blockValign value="TOP"/> </blockTableStyle> - <blockTableStyle id="tbl_header1"> + <blockTableStyle id="Table_Title"> <blockAlignment value="LEFT"/> <blockValign value="TOP"/> - <lineStyle kind="LINEBELOW" colorName="#000000" start="0,0" stop="-1,0"/> - <lineStyle kind="LINEBELOW" colorName="#000000" start="0,1" stop="-1,1"/> </blockTableStyle> - <blockTableStyle id="Table2"> + <blockTableStyle id="Table_Header_table"> <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"/> + <lineStyle kind="LINEBELOW" colorName="#000000" start="5,-1" stop="5,-1"/> + </blockTableStyle> + <blockTableStyle id="Table1"> + <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"/> + <lineStyle kind="LINEBELOW" colorName="#000000" start="5,-1" stop="5,-1"/> </blockTableStyle> <blockTableStyle id="Table3"> <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="Table4"> <blockAlignment value="LEFT"/> - <lineStyle kind="LINEBELOW" colorName="#777777" start="0,0" stop="1,0"/> - <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,1" stop="-1,-1"/> <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"/> </blockTableStyle> <initialize> <paraStyle name="all" alignment="justify"/> </initialize> - <paraStyle name="P1" fontName="Times-Bold" fontSize="6.0" leading="8" spaceBefore="0.0" spaceAfter="0.0"/> - <paraStyle name="P2" fontName="Times-Roman" fontSize="6.0" leading="8" spaceBefore="0.0" spaceAfter="0.0"/> - <paraStyle name="P3" fontName="Times-Roman" fontSize="6.0" leading="8"/> - <paraStyle name="Standard" fontName="Times-Roman"/> - <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="Table Contents" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="0.0"/> - <paraStyle name="Table Heading" fontName="Times-Roman" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/> - <paraStyle name="Caption" fontName="Times-Roman" fontSize="10.0" leading="13" spaceBefore="6.0" spaceAfter="6.0"/> - <paraStyle name="Index" fontName="Times-Roman"/> - <paraStyle name="Heading" fontName="Helvetica" fontSize="8.0" leading="10" spaceBefore="12.0" spaceAfter="6.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"/> + <paraStyle name="Table Contents" fontName="Helvetica" spaceBefore="0.0" spaceAfter="0.0"/> + <paraStyle name="Table Heading" fontName="Helvetica" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/> + <paraStyle name="Caption" fontName="Helvetica" fontSize="10.0" leading="13" spaceBefore="6.0" spaceAfter="6.0"/> + <paraStyle name="Index" fontName="Helvetica"/> + <paraStyle name="Heading" fontName="Helvetica" fontSize="15.0" leading="19" spaceBefore="12.0" spaceAfter="6.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="terp_header" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/> + <paraStyle name="Heading 9" fontName="Helvetica-Bold" fontSize="75%" leading="NaN" spaceBefore="12.0" spaceAfter="6.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="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_Bold_8" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> - <paraStyle name="terp_default_Bold_9" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> - <paraStyle name="terp_default_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> - <paraStyle name="terp_tblheader_General" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.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_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="Heading 9" fontName="Helvetica-Bold" fontSize="75%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/> - <paraStyle name="terp_tblheader_General_Right" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="6.0" spaceAfter="6.0"/> - <paraStyle name="terp_tblheader_Details_Centre" fontName="Helvetica-Bold" fontSize="8.0" leading="11" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/> - <paraStyle name="terp_tblheader_Details_Right" fontName="Helvetica-Bold" fontSize="8.0" leading="11" alignment="RIGHT" 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="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"/> - <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_address" fontName="Helvetica" fontSize="10.0" leading="13" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> + <paraStyle name="terp_default_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> + <paraStyle name="terp_default_Bold_9" fontName="Helvetica-Bold" fontSize="9.0" leading="11" 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_Right_9" fontName="Helvetica" 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="terp_default_space" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="9.0" spaceAfter="0.0"/> + <paraStyle name="terp_default_2" fontName="Helvetica" fontSize="2.0" leading="3" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> </stylesheet> <images/> <story> - <blockTable colWidths="60.0,280.0,48.0,50.0,50.0,48.0" style="tbl_header1" repeatRows="1"> + <blockTable colWidths="539.0" style="Table_Title"> <tr> <td> - <para style="terp_tblheader_General">Code</para> + <para style="terp_header_Centre">Inverted Analytic Balance - [[ company.currency_id.name ]]</para> </td> + </tr> + </blockTable> + <para style="terp_default_space"> + <font color="white"> </font> + </para> + <para style="terp_default_space"> + <font color="white"> </font> + </para> + <blockTable colWidths="58.0,238.0,62.0,62.0,60.0,59.0" style="Table_Header_table"> + <tr> <td> - <para style="terp_tblheader_General">Account Name</para> + <para style="terp_tblheader_Details">Code</para> </td> <td> - <para style="terp_tblheader_General_Right">Debit</para> + <para style="terp_tblheader_Details">Name</para> </td> <td> - <para style="terp_tblheader_General_Right">Credit</para> + <para style="terp_tblheader_Details_Right">Debit</para> </td> <td> - <para style="terp_tblheader_General_Right">Balance</para> + <para style="terp_tblheader_Details_Right">Credit</para> </td> <td> - <para style="terp_tblheader_General_Right">Quantity</para> + <para style="terp_tblheader_Details_Right">Balance </para> + </td> + <td> + <para style="terp_tblheader_Details_Right">Quantity</para> </td> </tr> - + </blockTable> + <para style="terp_default_2"> + <font color="white"> </font> + </para> + <blockTable colWidths="58.0,238.0,62.0,62.0,60.0,59.0" style="Table1"> <tr> <td> <para style="terp_tblheader_Details">Total</para> </td> - <td></td> <td> - <para style="terp_tblheader_Details_Right"><u>[[ formatLang(sum_debit(objects,data['form']['date1'],data['form']['date2'])) ]]</u></para> - + <para style="terp_tblheader_Details"> + <font color="white"> </font> + </para> </td> <td> - <para style="terp_tblheader_Details_Right"><u>[[ formatLang(sum_credit(objects,data['form']['date1'],data['form']['date2']))]]</u></para> + <para style="terp_tblheader_Details_Right">[[ formatLang(sum_debit(objects,data['form']['date1'],data['form']['date2'])) ]]</para> </td> <td> - <para style="terp_tblheader_Details_Right"><u>[[ formatLang(sum_balance(objects,data['form']['date1'],data['form']['date2']))]]</u></para> + <para style="terp_tblheader_Details_Right">[[ formatLang(sum_credit(objects,data['form']['date1'],data['form']['date2']))]]</para> </td> <td> - <para style="terp_tblheader_Details_Right"><u>[[ formatLang(sum_quantity(objects,data['form']['date1'],data['form']['date2'])) ]]</u></para> + <para style="terp_tblheader_Details_Right">[[ formatLang(sum_balance(objects,data['form']['date1'],data['form']['date2']))]]</para> </td> - </tr> - - - <tr> <td> - <para style="P1">[[ repeatIn(lines_g(objects,data['form']['date1'],data['form']['date2']),'move_g') ]]</para> - <blockTable colWidths="56.0,278.0,48.0,50.0,50.0,47.0" style="Table4"> - <tr> - <td> - <para style="terp_default_8"><b>[[ move_g['code'] ]]</b> </para> - - </td> - <td> - <para style="terp_default_8"><b>[[ move_g['name'] ]]</b></para> - </td> - <td> - <para style="terp_default_Right_8"><b><u>[[ formatLang(move_g['debit'])]]</u></b></para> - </td> - <td> - <para style="terp_default_Right_8"><b><u>[[formatLang(move_g['credit'])]]</u></b></para> - </td> - <td> - <para style="terp_default_Right_8"><b><u>[[ formatLang(move_g['balance'])]]</u></b></para> - </td> - <td> - <para style="terp_default_Right_8"><b><u>[[formatLang(move_g['quantity']) ]]</u></b></para> - </td> - </tr> - <tr> - <td> - <para style="terp_default_8">[[ repeatIn(lines_a(objects,move_g['id'],data['form']['date1'],data['form']['date2']),'move_a') ]] </para> - <para style="terp_default_8">[[ move_a['code'] ]]</para> - </td> - <td> - <para style="terp_default_8">[[ move_a['complete_name'] ]]</para> - - </td> - <td> - <para style="terp_default_Right_8">[[ formatLang(move_a['debit']) ]]</para> - </td> - <td> - <para style="terp_default_Right_8">[[ formatLang(move_a['credit']) ]]</para> - </td> - <td> - <para style="terp_default_Right_8">[[ formatLang(move_a['balance']) ]]</para> - </td> - <td> - <para style="terp_default_Right_8">[[ formatLang(move_a['quantity'] or 0.00) ]]</para> - </td> - </tr> - </blockTable> - + <para style="terp_tblheader_Details_Right">[[ formatLang(sum_quantity(objects,data['form']['date1'],data['form']['date2'])) ]]</para> </td> </tr> </blockTable> - + <para style="terp_default_2"> + <font color="white"> </font> + </para> + <section> + <para style="terp_default_8">[[ repeatIn(lines_g(objects,data['form']['date1'],data['form']['date2']),'move_g') ]]</para> + <blockTable colWidths="58.0,238.0,62.0,62.0,60.0,59.0" style="Table3"> + <tr> + <td> + <para style="terp_default_Bold_9">[[ move_g or removeParentNode('blockTable') ]] [[ move_g['code'] ]]</para> + </td> + <td> + <para style="terp_default_Bold_9">[[ move_g['name'] ]]</para> + </td> + <td> + <para style="terp_tblheader_Details_Right">[[ formatLang(move_g['debit'])]]</para> + </td> + <td> + <para style="terp_tblheader_Details_Right">[[formatLang(move_g['credit'])]]</para> + </td> + <td> + <para style="terp_tblheader_Details_Right">[[ formatLang(move_g['balance'])]]</para> + </td> + <td> + <para style="terp_tblheader_Details_Right">[[formatLang(move_g['quantity']) ]]</para> + </td> + </tr> + </blockTable> + <para style="terp_default_2"> + <font color="white"> </font> + </para> + <section> + <para style="terp_default_8">[[ repeatIn(lines_a(objects,move_g['id'],data['form']['date1'],data['form']['date2']),'move_a') ]]</para> + <blockTable colWidths="58.0,238.0,62.0,62.0,60.0,59.0" style="Table4"> + <tr> + <td> + <para style="terp_default_9">[[ move_a or removeParentNode('blockTable') ]] [[ move_a['code'] ]]</para> + </td> + <td> + <para style="terp_default_9">[[ move_a['complete_name'] ]]</para> + </td> + <td> + <para style="terp_default_Right_9">[[ formatLang(move_a['debit']) ]]</para> + </td> + <td> + <para style="terp_default_Right_9">[[ formatLang(move_a['credit']) ]]</para> + </td> + <td> + <para style="terp_default_Right_9">[[ formatLang(move_a['balance']) ]]</para> + </td> + <td> + <para style="terp_default_Right_9">[[ formatLang(move_a['quantity'] or 0.00) ]]</para> + </td> + </tr> + </blockTable> + <para style="terp_default_2"> + <font color="white"> </font> + </para> + </section> + <para style="terp_default_2"> + <font color="white"> </font> + </para> + </section> + <para style="terp_default_2"> + <font color="white"> </font> + </para> </story> -</document>
\ No newline at end of file +</document> diff --git a/addons/account_analytic_plans/report/crossovered_analytic.rml b/addons/account_analytic_plans/report/crossovered_analytic.rml index c10ce01edba..78a01d82a96 100644 --- a/addons/account_analytic_plans/report/crossovered_analytic.rml +++ b/addons/account_analytic_plans/report/crossovered_analytic.rml @@ -2,7 +2,7 @@ <document filename="test.pdf"> <template pageSize="(595.0,842.0)" title="Test" author="Martin Simon" allowSplitting="20"> <pageTemplate id="first"> - <frame id="first" x1="34.0" y1="28.0" width="527" height="786"/> + <frame id="first" x1="28.0" y1="28.0" width="539" height="786"/> </pageTemplate> </template> <stylesheet> @@ -10,213 +10,303 @@ <blockAlignment value="LEFT"/> <blockValign value="TOP"/> </blockTableStyle> - <blockTableStyle id="Tableau1"> + <blockTableStyle id="Table_sub_header"> <blockAlignment value="LEFT"/> <blockValign value="TOP"/> - <blockBackground colorName="#e6e6e6" start="0,0" stop="0,0"/> - <blockBackground colorName="#e6e6e6" start="1,0" stop="1,0"/> - <blockBackground colorName="#e6e6e6" start="2,0" stop="2,0"/> - <blockBackground colorName="#e6e6e6" start="0,1" stop="0,1"/> - <blockBackground colorName="#e6e6e6" start="1,1" stop="1,1"/> - <blockBackground colorName="#e6e6e6" start="2,1" stop="2,1"/> + <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="LINEAFTER" 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"/> </blockTableStyle> - <blockTableStyle id="Table3"> + <blockTableStyle id="Table_sub_content"> <blockAlignment value="LEFT"/> <blockValign value="TOP"/> - <lineStyle kind="GRID" colorName="black"/> - <blockBackground colorName="#cccccc" start="0,0" stop="0,0"/> - <blockBackground colorName="#cccccc" start="1,0" stop="1,0"/> - <blockBackground colorName="#cccccc" start="2,0" stop="2,0"/> - <blockBackground colorName="#cccccc" start="3,0" stop="3,0"/> - <blockBackground colorName="#cccccc" start="4,0" stop="4,0"/> + <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="LINEAFTER" 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"/> </blockTableStyle> - <blockTableStyle id="Table4"> + <blockTableStyle id="Table5"> <blockAlignment value="LEFT"/> <blockValign value="TOP"/> - <lineStyle kind="GRID" colorName="black"/> + <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="LINEABOVE" colorName="#e6e6e6" start="2,0" stop="2,0"/> + <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="2,-1" stop="2,-1"/> + <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="3,0" stop="3,-1"/> + <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="3,0" stop="3,0"/> + <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="3,-1" stop="3,-1"/> + <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="4,0" stop="4,-1"/> + <lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="4,0" stop="4,-1"/> + <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="4,0" stop="4,0"/> + <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="4,-1" stop="4,-1"/> + <blockBackground colorName="#cccccc" start="0,0" stop="0,-1"/> + <blockBackground colorName="#cccccc" start="1,0" stop="1,-1"/> + <blockBackground colorName="#cccccc" start="2,0" stop="2,-1"/> + <blockBackground colorName="#cccccc" start="3,0" stop="3,-1"/> + <blockBackground colorName="#cccccc" start="4,0" stop="4,-1"/> </blockTableStyle> - <blockTableStyle id="Table1"> + <blockTableStyle id="Table6"> <blockAlignment value="LEFT"/> <blockValign value="TOP"/> - <lineStyle kind="GRID" colorName="black"/> - <blockBackground colorName="#cccccc" start="0,0" stop="0,0"/> - <blockBackground colorName="#cccccc" start="1,0" stop="1,0"/> - <blockBackground colorName="#cccccc" start="2,0" stop="2,0"/> - <blockBackground colorName="#cccccc" start="3,0" stop="3,0"/> - <blockBackground colorName="#cccccc" start="4,0" stop="4,0"/> + <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="LINEABOVE" colorName="#e6e6e6" start="2,0" stop="2,0"/> + <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="2,-1" stop="2,-1"/> + <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="3,0" stop="3,-1"/> + <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="3,0" stop="3,0"/> + <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="3,-1" stop="3,-1"/> + <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="4,0" stop="4,-1"/> + <lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="4,0" stop="4,-1"/> + <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="4,0" stop="4,0"/> + <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="4,-1" stop="4,-1"/> </blockTableStyle> - <blockTableStyle id="Table2"> + <blockTableStyle id="Table3"> <blockAlignment value="LEFT"/> <blockValign value="TOP"/> - <lineStyle kind="GRID" colorName="black"/> + <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="LINEABOVE" colorName="#e6e6e6" start="2,0" stop="2,0"/> + <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="2,-1" stop="2,-1"/> + <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="3,0" stop="3,-1"/> + <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="3,0" stop="3,0"/> + <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="3,-1" stop="3,-1"/> + <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="4,0" stop="4,-1"/> + <lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="4,0" stop="4,-1"/> + <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="4,0" stop="4,0"/> + <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="4,-1" stop="4,-1"/> + <blockBackground colorName="#cccccc" start="0,0" stop="0,-1"/> + <blockBackground colorName="#cccccc" start="1,0" stop="1,-1"/> + <blockBackground colorName="#cccccc" start="2,0" stop="2,-1"/> + <blockBackground colorName="#cccccc" start="3,0" stop="3,-1"/> + <blockBackground colorName="#cccccc" start="4,0" stop="4,-1"/> + </blockTableStyle> + <blockTableStyle id="Table4"> + <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="LINEABOVE" colorName="#e6e6e6" start="2,0" stop="2,0"/> + <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="2,-1" stop="2,-1"/> + <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="3,0" stop="3,-1"/> + <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="3,0" stop="3,0"/> + <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="3,-1" stop="3,-1"/> + <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="4,0" stop="4,-1"/> + <lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="4,0" stop="4,-1"/> + <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="4,0" stop="4,0"/> + <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="4,-1" stop="4,-1"/> </blockTableStyle> <initialize> <paraStyle name="all" alignment="justify"/> </initialize> - <paraStyle name="P1" fontName="Times-Roman"/> - <paraStyle name="P2" fontName="Times-Roman" fontSize="10.0" leading="13" alignment="CENTER"/> - <paraStyle name="P3" fontName="Times-Roman" fontSize="10.0" leading="13" alignment="LEFT"/> - <paraStyle name="P4" fontName="Times-Roman" fontSize="9.0" leading="11" alignment="CENTER"/> - <paraStyle name="P5" fontName="Times-Roman" fontSize="9.0" leading="11" alignment="LEFT"/> - <paraStyle name="P6" fontName="Times-Roman" fontSize="11.0" leading="14" alignment="LEFT"/> - <paraStyle name="P7" fontName="Times-Roman" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/> - <paraStyle name="P8" fontName="Times-Bold" fontSize="20.0" leading="25" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/> - <paraStyle name="P9" fontName="Times-Bold" fontSize="10.0" leading="13" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/> - <paraStyle name="P10" fontName="Times-Roman" fontSize="10.0" leading="13" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/> - <paraStyle name="P11" fontName="Times-Roman" fontSize="10.0" leading="13" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/> - <paraStyle name="P12" fontName="Times-Roman" fontSize="10.0" leading="13" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/> - <paraStyle name="P13" fontName="Times-Bold" fontSize="11.0" leading="14" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/> - <paraStyle name="P14" fontName="Times-Roman" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/> - <paraStyle name="P15" fontName="Times-Roman" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/> - <paraStyle name="P16" fontName="Times-Bold" fontSize="11.0" leading="14" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/> - <paraStyle name="P17" fontName="Times-Roman" fontSize="10.0" leading="13" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/> - <paraStyle name="Standard" fontName="Times-Roman"/> - <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="Table Contents" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/> - <paraStyle name="Table Heading" fontName="Times-Roman" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/> - <paraStyle name="Caption" fontName="Times-Roman" fontSize="10.0" leading="13" spaceBefore="6.0" spaceAfter="6.0"/> - <paraStyle name="Index" fontName="Times-Roman"/> + <paraStyle name="P1" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" 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"/> + <paraStyle name="Table Contents" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/> + <paraStyle name="Table Heading" fontName="Helvetica" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/> + <paraStyle name="Caption" fontName="Helvetica" fontSize="10.0" leading="13" spaceBefore="6.0" spaceAfter="6.0"/> + <paraStyle name="Index" fontName="Helvetica"/> + <paraStyle name="Heading" fontName="Helvetica" fontSize="12.0" leading="15" spaceBefore="12.0" spaceAfter="6.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="terp_header" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/> + <paraStyle name="Heading 9" fontName="Helvetica-Bold" fontSize="75%" leading="NaN" spaceBefore="12.0" spaceAfter="6.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="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_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="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"/> + <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_address" fontName="Helvetica" fontSize="10.0" leading="13" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> + <paraStyle name="terp_default_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> + <paraStyle name="terp_default_Bold_9" fontName="Helvetica-Bold" fontSize="9.0" leading="11" 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_Right_9" fontName="Helvetica" 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"/> + <paraStyle name="terp_default_space_0.5" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="9.0" spaceAfter="0.0"/> </stylesheet> + <images/> <story> - <blockTable colWidths="176.0,176.0,176.0" repeatRows="1" style="Tableau1"> + <para style="terp_header_Centre">Crossovered Analytic - [[ company.currency_id.name ]]</para> + <para style="terp_header_Centre">[[ company.name ]]</para> + <para style="terp_default_space_0.5"> + <font color="white"> </font> + </para> + <blockTable colWidths="180.0,180.0,180.0" style="Table_sub_header"> <tr> <td> - <para style="P7"> - <font color="white"> </font> - </para> + <para style="terp_tblheader_Details_Centre">From Date</para> </td> <td> - <para style="P8">Crossovered Analytic</para> + <para style="terp_tblheader_Details_Centre">To Date</para> </td> <td> - <para style="P9"> - <font color="white"> </font> - </para> - <para style="P10"> - <font color="white"> </font> - </para> + <para style="terp_tblheader_Details_Centre">Printing date</para> </td> </tr> + </blockTable> + <blockTable colWidths="180.0,180.0,180.0" style="Table_sub_content"> <tr> <td> - <para style="P7">[[ company.name ]]</para> + <para style="terp_tblheader_Details_Centre">[[ data['form']['date1'] ]] </para> </td> <td> - <para style="P11">Period from [[ data['form']['date1'] ]]</para> - <para style="P11">to [[ data['form']['date2'] ]]</para> + <para style="terp_tblheader_Details_Centre">[[ data['form']['date2'] ]]</para> </td> <td> - <para style="P10">Currency: [[ company.currency_id.name ]]</para> + <para style="terp_tblheader_Details_Centre">[[ time.strftime('%Y-%m-%d') ]] at [[ time.strftime('%H:%M:%S') ]]</para> </td> </tr> </blockTable> - <para style="Standard"> - <font color="white"> </font> - </para> - <para style="P1"> - <font color="white"> </font> - </para> - <para style="P4">Printing date: [[ time.strftime('%Y-%m-%d') ]] at [[ time.strftime('%H:%M:%S') ]]</para> - <para style="P5"> + <para style="terp_default_space_0.5"> <font color="white"> </font> </para> - <para style="P6">Analytic Account Reference:</para> - <para style="P6"> + <para style="terp_default_Bold_9">Analytic Account Reference:</para> + <para style="terp_default_9"> <font color="white"> </font> </para> - <blockTable colWidths="152.0,123.0,90.0,63.0,99.0" style="Table3"> + <blockTable colWidths="155.0,125.0,92.0,65.0,101.0" style="Table5"> <tr> <td> - <para style="P13">Account Name</para> + <para style="terp_tblheader_Details_Centre">Account Name</para> </td> <td> - <para style="P13">Code</para> + <para style="terp_tblheader_Details_Centre">Code</para> </td> <td> - <para style="P13">Quantity</para> + <para style="terp_tblheader_Details_Right">Quantity</para> </td> <td> - <para style="P13">Amount</para> + <para style="terp_tblheader_Details_Right">Amount</para> </td> <td> - <para style="P13">Percentage</para> + <para style="terp_tblheader_Details_Right">Percentage</para> </td> </tr> </blockTable> - <blockTable colWidths="152.0,123.0,90.0,63.0,100.0" style="Table4"> - <tr> - <td> - <para style="P14">[[ repeatIn(ref_lines(data['form']),'a') ]]<font face="Times-Roman" size="10.0">[[ a['ref_name'] ]]</font></para> - </td> - <td> - <para style="P12">[[ a['ref_code'] ]]</para> - </td> - <td> - <para style="P12">[[ '%.2f' % a['ref_qty'] ]]</para> - </td> - <td> - <para style="P12">[[ '%.2f' % a['ref_amt'] ]]</para> - </td> - <td> - <para style="P12">100.00%</para> - </td> - </tr> - </blockTable> - <para style="P4"> + <para style="terp_default_2"> <font color="white"> </font> </para> - <para style="P4"> + <section> + <para style="terp_default_9">[[ repeatIn(ref_lines(data['form']),'a') ]]</para> + <blockTable colWidths="155.0,125.0,92.0,64.0,102.0" style="Table6"> + <tr> + <td> + <para style="terp_default_9"> + <font face="Helvetica" size="10.0">[[ a['ref_name'] ]]</font> + </para> + </td> + <td> + <para style="terp_default_9">[[ a['ref_code'] ]]</para> + </td> + <td> + <para style="terp_default_Right_9">[[ '%.2f' % a['ref_qty'] ]]</para> + </td> + <td> + <para style="terp_default_Right_9">[[ '%.2f' % a['ref_amt'] ]]</para> + </td> + <td> + <para style="terp_default_Right_9">100.00%</para> + </td> + </tr> + </blockTable> + <para style="terp_default_2"/> + </section> + <para style="terp_default_space_0.5"> <font color="white"> </font> </para> - <para style="P3"> + <para style="terp_default_Bold_9">Analytic Account :</para> + <para style="terp_default_Bold_9"> <font color="white"> </font> </para> - <para style="P3"> - <font color="white"> </font> - </para> - <blockTable colWidths="152.0,123.0,89.0,64.0,99.0" style="Table1"> + <blockTable colWidths="155.0,126.0,91.0,65.0,101.0" style="Table3"> <tr> <td> - <para style="P13">Account Name</para> + <para style="terp_tblheader_Details_Centre">Account Name</para> </td> <td> - <para style="P13">Code</para> + <para style="terp_tblheader_Details_Centre">Code</para> </td> <td> - <para style="P13">Quantity</para> + <para style="terp_tblheader_Details_Right">Quantity</para> </td> <td> - <para style="P13">Amount</para> + <para style="terp_tblheader_Details_Right">Amount</para> </td> <td> - <para style="P13">Percentage</para> + <para style="terp_tblheader_Details_Right">Percentage</para> </td> </tr> </blockTable> - <blockTable colWidths="152.0,123.0,89.0,64.0,99.0" style="Table2"> - <tr> - <td> - <para style="P15">[[ repeatIn(lines(data['form']),'a') ]] </para> - <para style="P15">[[a['acc_name'] ]]</para> - </td> - <td> - <para style="P12">[[ a['code'] ]]</para> - </td> - <td> - <para style="P12">[[ '%.2f' % a['qty'] ]]</para> - </td> - <td> - <para style="P12">[[ '%.2f' % a['amt'] ]]</para> - </td> - <td> - <para style="P12">[[ '%.2f' % a['perc'] ]]%</para> - </td> - </tr> - </blockTable> - <para style="P2"> + <para style="terp_default_2"> + <font color="white"> </font> + </para> + <section> + <para style="terp_default_9">[[ repeatIn(lines(data['form']),'a') ]]</para> + <blockTable colWidths="156.0,126.0,91.0,66.0,101.0" style="Table4"> + <tr> + <td> + <para style="terp_default_9">[[ a['acc_name'] ]]</para> + </td> + <td> + <para style="terp_default_9">[[ a['code'] ]]</para> + </td> + <td> + <para style="terp_default_Right_9">[[ '%.2f' % a['qty'] ]]</para> + </td> + <td> + <para style="terp_default_Right_9">[[ '%.2f' % a['amt'] ]]</para> + </td> + <td> + <para style="terp_default_Right_9">[[ '%.2f' % a['perc'] ]]%</para> + </td> + </tr> + </blockTable> + <para style="terp_default_2"> + <font color="white"> </font> + </para> + </section> + <para style="terp_default_8"> <font color="white"> </font> </para> </story> </document> - 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 5fabe670f81..b177bc6ede2 100644 --- a/addons/account_invoice_layout/report/report_account_invoice_layout.rml +++ b/addons/account_invoice_layout/report/report_account_invoice_layout.rml @@ -139,42 +139,35 @@ <para style="P8b"> <font color="white"></font> </para> -<blockTable colWidths="212.0,62.0,62.0,70.0,61.0,74.0" style="Tableau6"> +<blockTable colWidths="274.0,62.0,70.0,61.0,74.0" style="Tableau6"> <tr> -<td><para style="P3">Description</para></td> -<td><para style="P4">Taxes</para></td> -<td><para style="P4">Quantity</para></td> +<td><para style="P3">Description / Taxes</para></td> +<td><para style="P3">Quantity</para></td> <td><para style="P4">Unit Price</para></td> <td><para style="P4">Disc. (%)</para></td> -<td><para style="P4a">Price</para></td> +<td><para style="P3">Price</para></td> </tr> </blockTable> <section> <para style="P20">[[ repeatIn(invoice_lines(o), 'a') ]]</para> - <blockTable colWidths="0.0,221.5,60.0,31.0,16.0,31.0,39.0,61.0,45.0,23.0" style="Tableau7"> + <blockTable colWidths="0.0,250.0,77.5,31.0,39.0,50.0,79.0" style="Tableau7"> <tr> <td><para style="P8">[[ a['type']=='text' and removeParentNode('blockTable')]]</para></td> - <td><para style="P8a">[[ (a['type']=='title' or a['type']=='subtotal') and ( setTag('para','para',{'fontName':'Helvetica-bold'})) ]][[ a['name'] ]]</para></td> - <td><para style="P8a">[[ a['type']=='subtotal' and ( setTag('para','para',{'fontName':'Helvetica-bold'})) ]][[ a['tax_types'] ]]</para></td> - <td><para style="Table Contents">[[ a['type']=='subtotal' and ( setTag('para','para',{'fontName':'Helvetica-bold'})) ]][[ a['quantity'] ]]</para></td> - <td><para style="Table Contents">[[ a['type']=='subtotal' and ( setTag('para','para',{'fontName':'Helvetica-bold'})) ]][[ a['uos'] ]]</para></td> + <td><para style="P8a">[[ (a['type']=='title' or a['type']=='subtotal') and ( setTag('para','para',{'fontName':'Helvetica-bold'})) ]][[ a['name'] ]] / ( [[ a['tax_types'] ]] )</para></td> + <td><para style="Table Contents1">[[ a['type']=='subtotal' and ( setTag('para','para',{'fontName':'Helvetica-bold'})) ]][[ a['quantity'] ]] [[ a['uos'] ]]</para></td> <td><para><font color="white"></font></para></td> <td><para style="Table Contents">[[ a['type']=='subtotal' and ( setTag('para','para',{'fontName':'Helvetica-bold'})) ]][[ a['price_unit'] ]]</para></td> <td><para style="Table Contents1">[[ a['type']=='subtotal' and ( setTag('para','para',{'fontName':'Helvetica-bold'})) ]][[ a['discount'] ]]</para></td> - <td><para style="Table Contents">[[ a['type']=='subtotal' and ( setTag('para','para',{'fontName':'Helvetica-bold'})) ]][[ a['price_subtotal'] ]]</para></td> - <td><para style="Table Contents">[[ a['type']=='subtotal' and ( setTag('para','para',{'fontName':'Helvetica-bold'})) ]][[ a['currency'] ]]</para></td> + <td><para style="Table Contents1">[[ a['type']=='subtotal' and ( setTag('para','para',{'fontName':'Helvetica-bold'})) ]]<font>[[ a['price_subtotal'] ]]</font><font> [[ a['currency'] ]]</font></para></td> </tr> <tr> <td><para style="P8"><font color="white"></font></para></td> - <td><para style="terp_default_Note">[[ format(a['note'] or removeParentNode('tr')) ]]</para></td> - <td><para style="P8a"><font color="white"></font></para></td> - <td><para style="Table Contents"><font color="white"></font></para></td> + <td><para style="terp_default_Note">Note : [[ format(a['note'] or removeParentNode('tr')) ]]</para></td> <td><para style="Table Contents"><font color="white"></font></para></td> <td><para><font color="white"></font></para></td> <td><para style="Table Contents"><font color="white"></font></para></td> <td><para style="Table Contents1"><font color="white"></font></para></td> <td><para style="Table Contents"><font color="white"></font></para></td> - <td><para style="Table Contents"><font color="white"></font></para></td> </tr> </blockTable> <blockTable colWidths="453.0,74.0" style="Tableau8"> @@ -184,18 +177,17 @@ </tr> </blockTable> <pageBreak>[[ a['type']!='break' and removeParentNode('pageBreak')]]</pageBreak> - <blockTable colWidths="212.0,62.0,62.0,70.0,61.0,74.0" style="Tableau6"> + <blockTable colWidths="274.0,62.0,20.0,70.0,61.0,74.0" style="Tableau6"> <tr> - <td><para style="P3">Description [[ a['type']!='break' and removeParentNode('blockTable')]]</para></td> - <td><para style="P4">Taxes</para></td> + <td><para style="P3">Description/Taxes [[ a['type']!='break' and removeParentNode('blockTable')]]</para></td> <td><para style="P4">Quantity</para></td> <td><para style="P4">Unit Price</para></td> <td><para style="P4">Disc. (%)</para></td> - <td><para style="P4a">Price</para></td> + <td><para style="P3">Price</para></td> </tr> </blockTable> </section> -<blockTable colWidths="340.0,191.0" style="Tableau3"> +<blockTable colWidths="331.0,200.0" style="Tableau3"> <tr> <td> <blockTable colWidths="100.0,73.0,100.0" style="Tableau8"> @@ -212,14 +204,14 @@ </blockTable> </td> <td> - <blockTable colWidths="110.0,81.0" style="Tableau5"> + <blockTable colWidths="110.0,90.0" style="Tableau5"> <tr> <td><para style="P13">Total (Excl. taxes):</para></td> <td><para style="P12"><u>[[ '%.2f' % o.amount_untaxed ]] [[o.currency_id.code ]]</u></para></td> </tr> <tr> <td><para style="P13">Taxes:</para></td> - <td><para style="P12"><u>[[ '%.2f' % o.amount_tax ]] [[o.currency_id.code ]]</u></para></td> + <td><para style="P11a">[[ '%.2f' % o.amount_tax ]] [[o.currency_id.code ]]</para></td> </tr> <tr> <td><para style="P13">Total <font>(Incl. taxes):</font></para></td> diff --git a/addons/account_invoice_layout/report/special_message_invoice.rml b/addons/account_invoice_layout/report/special_message_invoice.rml index 16deca9e70c..d53d06e9f70 100644 --- a/addons/account_invoice_layout/report/special_message_invoice.rml +++ b/addons/account_invoice_layout/report/special_message_invoice.rml @@ -29,8 +29,10 @@ <blockValign value="TOP"/> <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,0" stop="-1,0"/> - <lineStyle kind="LINEABOVE" colorName="#ffffff" start="0,1" stop="-1,-1"/> - <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,1" stop="-1,-1"/> + <lineStyle kind="LINEABOVE" colorName="#ffffff" start="0,1" stop="-1,1"/> + <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,1" stop="-1,1"/> + <lineStyle kind="LINEABOVE" colorName="#ffffff" start="0,2" stop="-1,-1"/> + <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,2" stop="-1,-1"/> </blockTableStyle> <blockTableStyle id="Tableau8"> <blockAlignment value="LEFT"/> @@ -139,42 +141,35 @@ <para style="P17"><font>Invoice Date: </font><font>[[ formatLang(o.date_invoice,date=True) ]]</font></para> <para style="P18"><font>Customer Ref:</font> [[ o.address_invoice_id.partner_id.ref or '/' ]]</para> <para style="P8b"><font color="white"> </font></para> -<blockTable colWidths="212.0,62.0,62.0,70.0,61.0,74.0" style="Tableau6"> - <tr> - <td><para style="P3">Description</para></td> - <td><para style="P4">Taxes</para></td> - <td><para style="P4">Quantity</para></td> - <td><para style="P4">Unit Price</para></td> - <td><para style="P4">Disc. (%)</para></td> - <td><para style="P4a">Price</para></td> - </tr> +<blockTable colWidths="274.0,62.0,70.0,61.0,74.0" style="Tableau6"> +<tr> +<td><para style="P3">Description / Taxes</para></td> +<td><para style="P3">Quantity</para></td> +<td><para style="P4">Unit Price</para></td> +<td><para style="P4">Disc. (%)</para></td> +<td><para style="P3">Price</para></td> +</tr> </blockTable> <section> <para style="P20">[[ repeatIn(invoice_lines(o), 'a') ]]</para> - <blockTable colWidths="0.0,221.5,60.0,31.0,16.0,31.0,39.0,61.0,45.0,23.0" style="Tableau7"> + <blockTable colWidths="0.0,250.0,77.5,31.0,39.0,50.0,79.0" style="Tableau7"> <tr> <td><para style="P8">[[ a['type']=='text' and removeParentNode('blockTable')]]</para></td> - <td><para style="P8a">[[ (a['type']=='title' or a['type']=='subtotal') and ( setTag('para','para',{'fontName':'Helvetica-bold'})) ]][[ a['name'] ]]</para></td> - <td><para style="P8a">[[ a['type']=='subtotal' and ( setTag('para','para',{'fontName':'Helvetica-bold'})) ]][[ a['tax_types'] ]]</para></td> - <td><para style="Table Contents">[[ a['type']=='subtotal' and ( setTag('para','para',{'fontName':'Helvetica-bold'})) ]][[ a['quantity'] ]]</para></td> - <td><para style="Table Contents">[[ a['type']=='subtotal' and ( setTag('para','para',{'fontName':'Helvetica-bold'})) ]][[ a['uos'] ]]</para></td> + <td><para style="P8a">[[ (a['type']=='title' or a['type']=='subtotal') and ( setTag('para','para',{'fontName':'Helvetica-bold'})) ]][[ a['name'] ]] / ( [[ a['tax_types'] ]] )</para></td> + <td><para style="Table Contents1">[[ a['type']=='subtotal' and ( setTag('para','para',{'fontName':'Helvetica-bold'})) ]][[ a['quantity'] ]] [[ a['uos'] ]]</para></td> <td><para><font color="white"></font></para></td> <td><para style="Table Contents">[[ a['type']=='subtotal' and ( setTag('para','para',{'fontName':'Helvetica-bold'})) ]][[ a['price_unit'] ]]</para></td> <td><para style="Table Contents1">[[ a['type']=='subtotal' and ( setTag('para','para',{'fontName':'Helvetica-bold'})) ]][[ a['discount'] ]]</para></td> - <td><para style="Table Contents">[[ a['type']=='subtotal' and ( setTag('para','para',{'fontName':'Helvetica-bold'})) ]][[ a['price_subtotal'] ]]</para></td> - <td><para style="Table Contents">[[ a['type']=='subtotal' and ( setTag('para','para',{'fontName':'Helvetica-bold'})) ]][[ a['currency'] ]]</para></td> + <td><para style="Table Contents1">[[ a['type']=='subtotal' and ( setTag('para','para',{'fontName':'Helvetica-bold'})) ]]<font>[[ a['price_subtotal'] ]]</font><font> [[ a['currency'] ]]</font></para></td> </tr> <tr> <td><para style="P8"><font color="white"></font></para></td> - <td><para style="terp_default_Note">[[ format(a['note'] or '') ]]</para></td> - <td><para style="P8a"><font color="white"></font></para></td> - <td><para style="Table Contents"><font color="white"></font></para></td> + <td><para style="terp_default_Note">Note : [[ format(a['note'] or removeParentNode('tr')) ]]</para></td> <td><para style="Table Contents"><font color="white"></font></para></td> <td><para><font color="white"></font></para></td> <td><para style="Table Contents"><font color="white"></font></para></td> <td><para style="Table Contents1"><font color="white"></font></para></td> <td><para style="Table Contents"><font color="white"></font></para></td> - <td><para style="Table Contents"><font color="white"></font></para></td> </tr> </blockTable> <blockTable colWidths="453.0,74.0" style="Tableau8"> @@ -184,21 +179,20 @@ </tr> </blockTable> <pageBreak>[[ a['type']!='break' and removeParentNode('pageBreak')]]</pageBreak> - <blockTable colWidths="212.0,62.0,62.0,70.0,61.0,74.0" style="Tableau6"> + <blockTable colWidths="274.0,62.0,20.0,70.0,61.0,74.0" style="Tableau6"> <tr> - <td><para style="P3">Description [[ a['type']!='break' and removeParentNode('blockTable')]]</para></td> - <td><para style="P4">Taxes</para></td> + <td><para style="P3">Description/Taxes [[ a['type']!='break' and removeParentNode('blockTable')]]</para></td> <td><para style="P4">Quantity</para></td> <td><para style="P4">Unit Price</para></td> <td><para style="P4">Disc. (%)</para></td> - <td><para style="P4a">Price</para></td> + <td><para style="P3">Price</para></td> </tr> </blockTable> </section> -<blockTable colWidths="340.0,191.0" style="Tableau3"> +<blockTable colWidths="331.0,200.0" style="Tableau3"> <tr> <td> - <blockTable colWidths="81.0,73.0,65.0" style="Tableau8"> + <blockTable colWidths="100.0,73.0,100.0" style="Tableau8"> <tr> <td><para style="P10"><font color="white"></font></para></td> <td><para style="P8"><font color="white"></font></para></td> @@ -212,18 +206,18 @@ </blockTable> </td> <td> - <blockTable colWidths="110.0,81.0" style="Tableau5"> + <blockTable colWidths="110.0,90.0" style="Tableau5"> <tr> <td><para style="P13">Total (Excl. taxes):</para></td> <td><para style="P12"><u>[[ '%.2f' % o.amount_untaxed ]] [[o.currency_id.code ]]</u></para></td> </tr> <tr> <td><para style="P13">Taxes:</para></td> - <td><para style="P12"><u>[[ '%.2f' % o.amount_tax ]] [[o.currency_id.code ]]</u></para></td> + <td><para style="P11a">[[ '%.2f' % o.amount_tax ]] [[o.currency_id.code ]]</para></td> </tr> <tr> <td><para style="P13">Total <font>(Incl. taxes):</font></para></td> - <td><para style="P22"><u>[[ '%.2f' % o.amount_total ]] [[o.currency_id.code ]]</u></para></td> + <td><para style="P12"><u>[[ '%.2f' % o.amount_total ]] [[o.currency_id.code ]]</u></para></td> </tr> </blockTable> </td> diff --git a/addons/account_payment/report/order.rml b/addons/account_payment/report/order.rml index 80c3a3382a9..69c4b21c5d6 100644 --- a/addons/account_payment/report/order.rml +++ b/addons/account_payment/report/order.rml @@ -17,109 +17,137 @@ <blockTableStyle id="Table2"> <blockAlignment value="LEFT"/> <blockValign value="TOP"/> - <lineStyle kind="GRID" colorName="black"/> - <blockBackground colorName="#e6e6e6" start="0,0" stop="0,0"/> - <blockBackground colorName="#e6e6e6" start="1,0" stop="1,0"/> - <blockBackground colorName="#e6e6e6" start="2,0" stop="2,0"/> - <blockBackground colorName="#e6e6e6" start="3,0" stop="3,0"/> - <blockBackground colorName="#e6e6e6" start="4,0" stop="4,0"/> + <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="Table1"> <blockAlignment value="LEFT"/> <blockValign value="TOP"/> - <lineStyle kind="GRID" colorName="black"/> + <lineStyle kind="LINEBELOW" colorName="#cccccc" start="0,-1" stop="0,-1"/> + <lineStyle kind="LINEBELOW" colorName="#cccccc" start="1,-1" stop="1,-1"/> + <lineStyle kind="LINEBELOW" colorName="#cccccc" start="2,-1" stop="2,-1"/> + <lineStyle kind="LINEBELOW" colorName="#cccccc" start="3,-1" stop="3,-1"/> + <lineStyle kind="LINEBELOW" colorName="#cccccc" start="4,-1" stop="4,-1"/> </blockTableStyle> <initialize> <paraStyle name="all" alignment="justify"/> </initialize> - <paraStyle name="P1" fontName="Times-Roman" fontSize="16.0" leading="20"/> - <paraStyle name="P2" fontName="Times-Roman" alignment="CENTER"/> - <paraStyle name="P3" fontName="Times-Roman" alignment="RIGHT"/> - <paraStyle name="P4" fontName="Times-Roman" alignment="LEFT"/> - <paraStyle name="P5" fontName="Times-Roman" alignment="CENTER"/> - <paraStyle name="P6" fontName="Times-Roman" alignment="RIGHT"/> - <paraStyle name="Standard" fontName="Times-Roman"/> - <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"/> - <paraStyle name="Table Heading" fontName="Times-Roman" alignment="CENTER"/> + <paraStyle name="P1" fontName="Helvetica" alignment="LEFT"/> + <paraStyle name="P2" fontName="Helvetica" alignment="CENTER"/> + <paraStyle name="P3" fontName="Helvetica" alignment="RIGHT"/> + <paraStyle name="Standard" fontName="Helvetica"/> + <paraStyle name="Heading" fontName="Helvetica" fontSize="12.0" leading="15" spaceBefore="12.0" spaceAfter="6.0"/> + <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"/> + <paraStyle name="Table Heading" fontName="Helvetica" alignment="CENTER"/> + <paraStyle name="Footer" 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="12.0" leading="15" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/> + <paraStyle name="Heading 9" fontName="Helvetica-Bold" fontSize="75%" leading="NaN" spaceBefore="12.0" spaceAfter="6.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_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"/> + <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_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"/> + <paraStyle name="terp_header_Centre" fontName="Helvetica-Bold" fontSize="12.0" leading="15" 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_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> + <paraStyle name="terp_default_Bold_9" fontName="Helvetica-Bold" fontSize="9.0" leading="11" 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_Right_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/> + <paraStyle name="terp_default_Space" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="9.0" spaceAfter="0.0"/> + <paraStyle name="terp_default_space_0.2" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="6.0" spaceAfter="0.0"/> + <paraStyle name="terp_default_2" fontName="Helvetica" fontSize="2.0" leading="3" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> </stylesheet> + <images/> <story> - <para style="Standard">[[ repeatIn(objects, 'o') ]]</para> - <para style="Standard"> + <para style="terp_default_8">[[ repeatIn(objects, 'o') ]]</para> + <para style="terp_default_8"> <font color="white"> </font> </para> <blockTable colWidths="264.0,264.0" style="Table3"> <tr> <td> - <para style="Table Contents"> + <para style="terp_default_9"> <font color="white"> </font> </para> </td> <td> - <para style="Table Contents">[[ o.mode and o.mode.bank_id.bank and o.mode.bank_id.bank.name or '']]</para> - <para style="Table Contents">[[ o.mode and o.mode.bank_id.bank and o.mode.bank_id.bank.street or '']]</para> - <para style="Table Contents">[[ o.mode and o.mode.bank_id.bank and o.mode.bank_id.bank.street2 or '']]</para> - <para style="Table Contents">[[ o.mode and o.mode.bank_id.bank and o.mode.bank_id.bank.zip or '']] [[ o.mode and o.mode.bank_id.bank and o.mode.bank_id.bank.city or '']]</para> - <para style="Table Contents">[[ o.mode and o.mode.bank_id.bank and o.mode.bank_id.bank.state and o.mode.bank_id.bank.state.name or '' ]]</para> - <para style="Table Contents">[[ o.mode and o.mode.bank_id.bank and o.mode.bank_id.bank.country and o.mode.bank_id.bank.country.name or '']]</para> + <para style="terp_default_9">[[ o.mode and o.mode.bank_id.bank and o.mode.bank_id.bank.name or '']]</para> + <para style="terp_default_9">[[ o.mode and o.mode.bank_id.bank and o.mode.bank_id.bank.street or '']]</para> + <para style="terp_default_9">[[ o.mode and o.mode.bank_id.bank and o.mode.bank_id.bank.street2 or '']]</para> + <para style="terp_default_9">[[ o.mode and o.mode.bank_id.bank and o.mode.bank_id.bank.zip or '']] [[ o.mode and o.mode.bank_id.bank and o.mode.bank_id.bank.city or '']]</para> + <para style="terp_default_9">[[ o.mode and o.mode.bank_id.bank and o.mode.bank_id.bank.state and o.mode.bank_id.bank.state.name or '' ]]</para> + <para style="terp_default_9">[[ o.mode and o.mode.bank_id.bank and o.mode.bank_id.bank.country and o.mode.bank_id.bank.country.name or '']]</para> </td> </tr> </blockTable> - <para style="Standard"> + <para style="terp_default_Space"> <font color="white"> </font> </para> <para style="Standard"> <font color="white"> </font> </para> - <para style="P1">[[ o.mode and o.mode.name ]]</para> - <para style="Standard"> + <para style="terp_header">[[ o.mode and o.mode.name ]]</para> + <para style="terp_default_space_0.2"> <font color="white"> </font> </para> - <para style="Standard">Reference: [[ o.reference ]]</para> - <para style="Standard">Execution date: [[ o.date_done or '/']]</para> - <para style="Standard"> + <para style="terp_default_9">Reference: [[ o.reference ]]</para> + <para style="terp_default_9">Execution date: [[ o.date_done or '/']]</para> + <para style="terp_default_space_0.2"> <font color="white"> </font> </para> <blockTable colWidths="83.0,98.0,190.0,70.0,85.0" style="Table2"> <tr> <td> - <para style="P4">Partner</para> + <para style="P1">Partner</para> </td> <td> - <para style="P4">Bank account</para> + <para style="P1">Bank account</para> </td> <td> - <para style="P4">Reference</para> + <para style="P1">Reference</para> </td> <td> - <para style="P5">Date</para> + <para style="P2">Date</para> </td> <td> - <para style="P6">Amount</para> + <para style="P3">Amount</para> </td> </tr> </blockTable> + <para style="terp_default_2"> + <font color="white"> </font> + </para> <blockTable colWidths="83.0,98.0,190.0,70.0,85.0" style="Table1"> <tr> <td> - <para style="Table Contents">[[repeatIn(o.line_ids, 'line') ]]</para> - <para style="Table Contents">[[ line.partner_id and line.partner_id.name or '' ]]</para> + <para style="terp_default_9">[[repeatIn(o.line_ids, 'line') ]]</para> + <para style="terp_default_9">[[ line.partner_id and line.partner_id.name or '' ]]</para> </td> <td> - <para style="Table Contents">[[ line.bank_id and line.bank_id.name ]]</para> + <para style="terp_default_9">[[ line.bank_id and line.bank_id.name ]]</para> </td> <td> - <para style="Table Contents">[[ line.name ]]</para> + <para style="terp_default_9">[[ line.name ]]</para> </td> <td> - <para style="P2">[[ line.date ]]</para> + <para style="terp_default_9">[[ line.date ]]</para> </td> <td> - <para style="P3">[[ formatLang(line.amount_currency) ]] [[ line.currency.name ]]</para> + <para style="terp_default_Right_9">[[ formatLang(line.amount_currency) ]] [[ line.currency.name ]]</para> </td> </tr> </blockTable> @@ -128,4 +156,3 @@ </para> </story> </document> - diff --git a/addons/account_reporting/account.py b/addons/account_reporting/account.py index 676144ab8c2..a31dbf06c04 100644 --- a/addons/account_reporting/account.py +++ b/addons/account_reporting/account.py @@ -98,7 +98,10 @@ class account_report_bs(osv.osv): 'report_type' : fields.selection([('only_obj', 'Report Objects Only'),('with_account', 'Report Objects With Accounts'),('acc_with_child', 'Report Objects With Accounts and child of Accounts')],"Report Type") } _defaults = { - 'report_type': lambda *a :'only_obj' + 'report_type': lambda *a :'only_obj', + 'color_font': lambda *a :'', + 'color_back': lambda *a :'', + 'font_style': lambda *a :'', } def name_search(self, cr, user, name, args=None, operator='ilike', context=None, limit=80): diff --git a/addons/account_reporting/report/account_report_bs.rml b/addons/account_reporting/report/account_report_bs.rml index 06912cd3dae..3d81d427769 100644 --- a/addons/account_reporting/report/account_report_bs.rml +++ b/addons/account_reporting/report/account_report_bs.rml @@ -94,7 +94,7 @@ </para> </td> <td> - <para style="P1"><font>[[o.name]] [[o.font_style and (setTag('font','font',{'face':o.font_style} ) ) ]] [[ o.color_font and ( setTag('font','font',{'color':o.color_font.name})) ]] [[ o.color_back and ( setTag('para','para',{'backColor':o.color_back.name})) ]]</font></para> + <para style="P1"><font>[[ setTag('font','font',{'face':o.font_style,'color':o.color_font.name,'backColor':o.color_back.name}) ]] [[o.name]]</font></para> </td> <td> <para style="P2"> @@ -119,15 +119,14 @@ <blockTable colWidths="131.0,280.0,131.0" style="Table4"> <tr> <td> - <para style="P10">[[ repeatIn(lines(data['form'],object=o), 'a') ]]<font> [[ a['code'] ]] [[ (a['font_style']) and (setTag('font','font',{'face':a['font_style']})) or (a['level']==1 and (setTag('para','para',{'fontName':'Helvetica-Bold'}))) ]] [[ a['color_font'] and ( setTag('font','font',{'color':a['color_font']})) ]] [[ a['color_back'] and ( setTag('para','para',{'backColor':a['color_back']})) ]]</font></para> + <para style="P10"><font>[[ repeatIn(lines(data['form'],object=o), 'a') ]]</font><font>[[ setTag('font','font',{'face':o.font_style,'color':o.color_font.name,'backColor':o.color_back.name}) ]] [[ a['code'] ]]</font></para> </td> <td> - <para style="P17"><font><font color="white">[[ '..'*(a['level']-1) ]]</font> [[ a['name'] ]] [[ (a['font_style']) and (setTag('font','font',{'face':a['font_style']})) or (a['level']==1 and (setTag('para','para',{'fontName':'Helvetica-Bold'}))) ]] [[ a['color_font'] and ( setTag('font','font',{'color':a['color_font']})) ]] [[ a['color_back'] and ( setTag('para','para',{'backColor':a['color_back']})) ]]</font></para> + <para style="P17"><font color="white">[[ '..'*(a['level']-1) ]]</font><font>[[ setTag('font','font',{'face':o.font_style,'color':o.color_font.name,'backColor':o.color_back.name}) ]] [[ a['name'] ]]</font></para> </td> <td> - <para style="P18"><font>[[ '%.2f'% a['balance'] ]] [[ (a['font_style']) and (setTag('font','font',{'face':a['font_style']})) or (a['level']==1 and (setTag('para','para',{'fontName':'Helvetica-Bold'}))) ]] [[ a['color_font'] and ( setTag('font','font',{'color':a['color_font']})) ]] [[ a['color_back'] and ( setTag('para','para',{'backColor':a['color_back']})) ]]</font></para> + <para style="P18"><font>[[ setTag('font','font',{'face':o.font_style,'color':o.color_font.name,'backColor':o.color_back.name}) ]][[ '%.2f'% a['balance'] ]]</font></para> </td> - </tr> </blockTable> <para style="Standard"> diff --git a/addons/point_of_sale/report/pos_invoice.py b/addons/point_of_sale/report/pos_invoice.py index a3ac7b39318..e7d34f517e9 100644 --- a/addons/point_of_sale/report/pos_invoice.py +++ b/addons/point_of_sale/report/pos_invoice.py @@ -30,22 +30,25 @@ class pos_invoice(report_sxw.rml_parse): self.localcontext.update({ 'time': time, }) - - def preprocess(self, objects, data, ids): - super(pos_invoice, self).preprocess(objects, data, ids) - - post_objects = [] - for obj in objects: - if obj.invoice_id: - post_objects.append(obj.invoice_id) - - #self.localcontext['objects'] = objects - self.localcontext['objects'] = post_objects - - -report_sxw.report_sxw( - 'report.pos.invoice', - 'pos.order', - 'addons/point_of_sale/report/pos_invoice.rml', - parser=pos_invoice) + + def set_context(self, objects, data, ids, report_type = None): + super(pos_invoice, self).set_context(objects, data, ids, report_type) + iids = [] + nids = [] + for order in objects: + order.write({'nb_print': order.nb_print + 1}) + if order.invoice_id and order.invoice_id not in iids: + iids.append(order.invoice_id) + nids.append(order.invoice_id.id) + self.cr.commit() + data['ids'] = nids + self.datas = data + self.ids = nids + self.objects = iids + self.localcontext['data'] = data + self.localcontext['objects'] = iids + +report_sxw.report_sxw('report.pos.invoice', 'pos.order', 'account/report/invoice.rml', parser= pos_invoice) + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/point_of_sale/report/pos_receipt.rml b/addons/point_of_sale/report/pos_receipt.rml index c0c4ce794a2..bb6ceffd694 100644 --- a/addons/point_of_sale/report/pos_receipt.rml +++ b/addons/point_of_sale/report/pos_receipt.rml @@ -1,8 +1,8 @@ <?xml version="1.0"?> <document filename="test.pdf"> - <template pageSize="(224.0,842.0)" title="Test" author="Martin Simon" allowSplitting="20"> + <template pageSize="(595.0,842.0)" title="Test" author="Martin Simon" allowSplitting="20"> <pageTemplate id="first"> - <frame id="first" x1="0.0" y1="0.0" width="224" height="842"/> + <frame id="first" x1="34.0" y1="42.0" width="145" height="758"/> </pageTemplate> </template> <stylesheet> @@ -13,37 +13,35 @@ <blockTableStyle id="Tableau2"> <blockAlignment value="LEFT"/> <blockValign value="TOP"/> - <blockBackground colorName="#ffffff" start="0,0" stop="0,0"/> - <blockBackground colorName="#ffffff" start="1,0" stop="1,0"/> - <blockBackground colorName="#ffffff" start="2,0" stop="2,0"/> + <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"/> + <blockBackground colorName="#ffffff" start="0,0" stop="0,-1"/> + <blockBackground colorName="#ffffff" start="1,0" stop="1,-1"/> + <blockBackground colorName="#ffffff" start="2,0" stop="2,-1"/> </blockTableStyle> <blockTableStyle id="Tableau3"> <blockAlignment value="LEFT"/> <blockValign value="TOP"/> + <lineStyle kind="LINEBELOW" colorName="#cccccc" start="0,-1" stop="0,-1"/> + <lineStyle kind="LINEBELOW" colorName="#cccccc" start="1,-1" stop="1,-1"/> + <lineStyle kind="LINEBELOW" colorName="#cccccc" start="2,-1" stop="2,-1"/> </blockTableStyle> - <blockTableStyle id="Table1"> + <blockTableStyle id="Table_Dicount_Total"> + <blockAlignment value="LEFT"/> + <blockValign value="TOP"/> + </blockTableStyle> + <blockTableStyle id="Table_Discount_Total"> + <blockAlignment value="LEFT"/> + <blockValign value="TOP"/> + </blockTableStyle> + <blockTableStyle id="Table_Total"> <blockAlignment value="LEFT"/> <blockValign value="TOP"/> </blockTableStyle> <initialize> <paraStyle name="all" alignment="justify"/> </initialize> - <paraStyle name="P1" fontName="Times-Roman" fontSize="6.0" leading="8" alignment="LEFT"/> - <paraStyle name="P2" fontName="Times-Bold" fontSize="9.0" leading="11" alignment="CENTER"/> - <paraStyle name="P3" fontName="Times-Roman" fontSize="7.0" leading="9" alignment="CENTER"/> - <paraStyle name="P30" fontName="Times-Roman" fontSize="7.0" leading="9" alignment="LEFT"/> - <paraStyle name="P31" fontName="Times-Bold" fontSize="8.0" leading="9" alignment="CENTER" backColor="#dddddd"/> - <paraStyle name="P4" fontName="Times-Roman" fontSize="8.0" leading="10" alignment="LEFT"/> - <paraStyle name="P5" fontName="Times-Bold" fontSize="8.0" leading="10" alignment="LEFT"/> - <paraStyle name="P6" fontName="Times-Bold" fontSize="8.0" leading="10" alignment="RIGHT"/> - <paraStyle name="P7" fontName="Times-Bold" fontSize="8.0" leading="10" alignment="RIGHT"/> - <paraStyle name="P8" fontName="Times-BoldItalic" fontSize="6.0" leading="8" alignment="LEFT"/> - <paraStyle name="P9" fontName="Times-Roman" fontSize="6.0" leading="8" alignment="LEFT"/> - <paraStyle name="P10" fontName="Times-Roman" fontSize="7.0" leading="9" alignment="RIGHT"/> - <paraStyle name="P11" rightIndent="0.0" leftIndent="-3.0" fontName="Times-Bold" fontSize="8.0" leading="10" alignment="CENTER"/> - <paraStyle name="P12" rightIndent="0.0" leftIndent="-2.0" fontName="Times-Bold" fontSize="8.0" leading="10" alignment="CENTER"/> - <paraStyle name="P13" fontName="Times-Bold" fontSize="8.0" leading="10" alignment="RIGHT"/> - <paraStyle name="P14" fontName="Times-Bold" fontSize="8.0" leading="10" alignment="LEFT"/> <paraStyle name="Standard" fontName="Times-Roman"/> <paraStyle name="Text body" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/> <paraStyle name="Heading" fontName="Helvetica" fontSize="14.0" leading="17" spaceBefore="12.0" spaceAfter="6.0"/> @@ -52,82 +50,108 @@ <paraStyle name="Table Heading" fontName="Times-Roman" alignment="CENTER"/> <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="Footer" fontName="Times-Roman"/> + <paraStyle name="Horizontal Line" fontName="Times-Roman" fontSize="6.0" leading="8" spaceBefore="0.0" spaceAfter="14.0"/> + <paraStyle name="terp_header" fontName="Helvetica-Bold" fontSize="12.0" leading="15" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/> + <paraStyle name="Heading 9" fontName="Helvetica-Bold" fontSize="75%" leading="NaN" spaceBefore="12.0" spaceAfter="6.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_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"/> + <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_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"/> + <paraStyle name="terp_header_Centre" fontName="Helvetica-Bold" fontSize="12.0" leading="15" 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_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> + <paraStyle name="terp_default_Bold_9" fontName="Helvetica-Bold" fontSize="9.0" leading="11" 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_Right_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/> + <paraStyle name="terp_default_Bold_9_Right" 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"/> </stylesheet> + <images/> <story> - [[ repeatIn(objects,'o') ]] - <para style="P2">[[ o.user_id.company_id.name ]]</para> - <para style="P3">[[ address and address.street ]], [[ address and address.zip ]] [[ address and address.city ]]</para> - <para style="P3">[[ address and address.country_id and address.country_id.name ]]</para> - <para style="P3">Tel : [[ address and address.phone ]]</para> - <para style="P3">E-mail : [[ address and address.email ]]</para> - <para style="P3">User : [[ o.user_id.name ]]</para> - <para style="P3">Date : [[ time.strftime('%d/%m/%Y %H:%M') ]]</para> - <para style="P4"> + <para style="terp_default_8">[[ repeatIn(objects,'o') ]]</para> + <para style="terp_header_Centre">[[o.user_id.company_id.name]]</para> + <para style="terp_default_Centre_9">[[ address and address.street ]], [[ address and address.zip ]] [[ address and address.city ]]</para> + <para style="terp_default_Centre_9">[[ address and address.country_id.name ]]</para> + <para style="terp_default_Centre_9">Tel : [[ address and address.phone ]]</para> + <para style="terp_default_Centre_9">E-mail : [[ address and address.email ]]</para> + <para style="terp_default_Centre_9"> <font color="white"> </font> </para> - <para style="P4"> + <para style="terp_default_8"> <font color="white"> </font> </para> - <para style="P4">Operation N° : [[ o.name ]]</para> - <blockTable colWidths="97.0,23.0,26.0" repeatRows="1" style="Tableau2"> + <para style="terp_header">Operation N° : [[ o.name ]]</para> + <blockTable colWidths="78.0,30.0,38.0" repeatRows="1" style="Tableau2"> <tr> <td> - <para style="P5">Description</para> + <para style="terp_tblheader_Details">Description</para> </td> <td> - <para style="P11">Qty</para> + <para style="terp_tblheader_Details_Right">Qty</para> </td> <td> - <para style="P12">Price</para> + <para style="terp_tblheader_Details_Right">Price</para> </td> </tr> </blockTable> <section> - <para style="P8">[[ repeatIn(o.lines,'line') ]]</para> - <blockTable colWidths="95.0,23.0,27.0" style="Tableau3"> + <para style="terp_default_8">[[ repeatIn(o.lines,'line') ]]</para> + <blockTable colWidths="77.0,30.0,38.0" style="Tableau3"> <tr> <td> - <para style="P9">[[ line.product_id.name ]]</para> + <para style="terp_default_9">[[ line.product_id.name ]]</para> </td> <td> - <para style="P10">[[ '%.f' % line.qty ]]</para> + <para style="terp_default_Right_9">[[ '%.f' % line.qty ]]</para> </td> <td> - <para style="P10">[[ '%.2f' % net(line.id) ]]</para> + <para style="terp_default_Right_9">[[ '%.2f' % net(line.id) ]]</para> </td> </tr> </blockTable> </section> - <blockTable colWidths="109.0,37.0" style="Table1"> - <tr> - <td> - <para style="P13">Disc : </para> - </td> - <td> - <para style="P10">[[ '%.2f' % (disc(o.id) or 0.0,) ]] </para> - </td> - </tr> + <blockTable colWidths="146.0" style="Table_Dicount_Total"> <tr> <td> - <para style="P6">Total :</para> - </td> - <td> - <para style="P7">[[ '%.2f' % o.amount_total ]] [[ o.pricelist_id.currency_id.name ]]</para> + <blockTable colWidths="57.0,88.0" style="Table_Discount_Total"> + <tr> + <td> + <para style="terp_tblheader_Details">Total :</para> + </td> + <td> + <para style="terp_default_Bold_9_Right">[[ '%.2f' % o.amount_total ]] [[ o.pricelist_id.currency_id.name ]]</para> + </td> + </tr> + </blockTable> + <para style="terp_default_2"> + <font color="white"> </font> + </para> + <blockTable colWidths="62.0,82.0" style="Table_Total"> + <tr> + <td> + <para style="terp_tblheader_Details">Discount : </para> + </td> + <td> + <para style="terp_default_Bold_9_Right">[[ disc(o.id) or 0.00 ]] [[ o.pricelist_id.currency_id.name ]]</para> + </td> + </tr> + </blockTable> + <para style="terp_default_2"> + <font color="white"> </font> + </para> </td> </tr> </blockTable> - <section> - [[ repeatIn((o.amount_total>0) and o.payments or [], 'p') ]] - <para style="P30"> - [[ p.journal_id.name ]] : [[ '%.2f' % (p.amount,) ]] - </para> - </section> - <section> - [[ repeatIn((o.amount_total<0) and [1] or [], 'p') ]] - <para style="P31"> - Ce bon est valide jusqu'au [[ time.strftime('%d/%m/%Y', time.strptime(o.date_validity,'%Y-%m-%d')) ]]. - </para> - </section> + <para style="terp_default_8"> + <font color="white"> </font> + </para> </story> </document> - diff --git a/addons/point_of_sale/wizard/wizard_pos_payment.py b/addons/point_of_sale/wizard/wizard_pos_payment.py index 285433d1f15..283e83caa55 100644 --- a/addons/point_of_sale/wizard/wizard_pos_payment.py +++ b/addons/point_of_sale/wizard/wizard_pos_payment.py @@ -114,29 +114,30 @@ def _add_pay(self, cr, uid, data, context): pool = pooler.get_pool(cr.dbname) order_obj = pool.get('pos.order') result = data['form'] - invoice_wanted = data['form']['invoice_wanted'] - # add 'invoice_wanted' in 'pos.order' order_obj.write(cr, uid, [data['id']], {'invoice_wanted': invoice_wanted}) order_obj.add_payment(cr, uid, data['id'], result, context=context) return {} - +def _validate(self, cr, uid, data, context): + pool = pooler.get_pool(cr.dbname) + order_obj = pool.get('pos.order') + order = order_obj.browse(cr, uid, data['id'], context) +# if not order.amount_total: +# return 'receipt' + order_obj.test_order_lines(cr, uid, order, context=context) + return {} + def _check(self, cr, uid, data, context): """Check the order: if the order is not paid: continue payment, if the order is paid print invoice (if wanted) or ticket. """ - pool = pooler.get_pool(cr.dbname) order_obj = pool.get('pos.order') order = order_obj.browse(cr, uid, data['id'], context) - #if not order.amount_total: - # return 'receipt' - order_obj.test_order_lines(cr, uid, order, context=context) - action = 'ask_pay' if order.state == 'paid': if order.partner_id: @@ -146,7 +147,6 @@ def _check(self, cr, uid, data, context): action = 'paid' else: action = 'receipt' - return action @@ -161,17 +161,22 @@ def _test_no_line(self, cr, uid, data, context): def create_invoice(self, cr, uid, data, context): - wf_service = netsvc.LocalService("workflow") - for i in data['ids']: - wf_service.trg_validate(uid, 'pos.order', i, 'invoice', cr) - + pool = pooler.get_pool(cr.dbname) + order_obj = pool.get('pos.order') + order = order_obj.browse(cr, uid, data['id'], context) + if not order.invoice_id: + inv_id = order_obj.action_invoice(cr,uid,[data['id']]) + #raise wizard.except_wizard(_('Error !'), _('Please create an invoice for this sale.')) +# wf_service = netsvc.LocalService("workflow") +# for i in data['ids']: +# wf_service.trg_validate(uid, 'pos.order', i, 'invoice', cr) return {} class pos_payment(wizard.interface): states = { 'init': { - 'actions': [_test_no_line], + 'actions': [_validate], 'result': { 'type': 'choice', 'next_state': _check, |