diff options
| author | saz-OpenERP <azaz.201186@gmail.com> | 2010-10-07 10:39:37 +0530 |
|---|---|---|
| committer | saz-OpenERP <azaz.201186@gmail.com> | 2010-10-07 10:39:37 +0530 |
| commit | a32b9d28efd4d4cbcbb71c71ced33e77f1c1502e (patch) | |
| tree | 41492a097eeef2b7e36394e58647e9e1aaa270e7 | |
| parent | a9d05d171c6f95866068aabedd285b2b7cea67cd (diff) | |
[IMP]Improve the pos reports and yml files
bzr revid: azaz.201186@gmail.com-20101007050937-8lp2i9qsm5zl5v7n
11 files changed, 179 insertions, 215 deletions
diff --git a/addons/point_of_sale/report/account_statement.rml b/addons/point_of_sale/report/account_statement.rml index 301370ccb59..e777bdfd8f1 100644 --- a/addons/point_of_sale/report/account_statement.rml +++ b/addons/point_of_sale/report/account_statement.rml @@ -216,10 +216,10 @@ <para style="terp_default_Centre_8">[[ formatLang(statement.closing_date,date=True) ]]</para> </td> <td> - <para style="terp_default_Centre_8">[[ formatLang(statement.balance_start, digits=get_digits(dp='Account')) ]][[ company.currency_id.symbol ]]</para> + <para style="terp_default_Centre_8">[[ formatLang(statement.balance_start)]] [[ company.currency_id.symbol ]]</para> </td> <td> - <para style="terp_default_Centre_8">[[ formatLang(statement.balance_end_real, digits=get_digits(dp='Account')) ]][[ company.currency_id.symbol ]]</para> + <para style="terp_default_Centre_8">[[ formatLang(statement.balance_end_real)]] [[ company.currency_id.symbol ]]</para> </td> </tr> </blockTable> @@ -247,14 +247,13 @@ <td> <para style="P2">[[ repeatIn(statement.line_ids,'line_ids') and ' ' or removeParentNode('blockTable') ]]</para> <para style="P2">[[ repeatIn(get_data(statement), 'line_ids')]]</para> - <!--<para style="terp_default_9">[[ line_ids.name ]]</para>--> - <para style="terp_default_9">[[ line_ids['name'] ]]</para> + <para style="terp_default_9">[[ line_ids.name ]]</para> </td> <td> <para style="terp_default_9">[[ line_ids.partner_id.name ]]</para> </td> <td> - <para style="terp_default_Right_9">[[ formatLang(line_ids.amount, digits=get_digits(dp='Account')) ]][[ company.currency_id.symbol ]]</para> + <para style="terp_default_Right_9">[[ formatLang(line_ids.amount) ]] [[ company.currency_id.symbol ]]</para> </td> </tr> </blockTable> @@ -269,7 +268,7 @@ <para style="terp_default_Right_9_Bold">Total :</para> </td> <td> - <para style="terp_default_Right_9">[[ formatLang(get_total(statement.line_ids), digits=get_digits(dp='Account')) ]][[ company.currency_id.symbol ]]</para> + <para style="terp_default_Right_9">[[ formatLang(get_total(statement.line_ids)) ]] [[ company.currency_id.symbol ]]</para> </td> </tr> </blockTable> diff --git a/addons/point_of_sale/report/all_closed_cashbox_of_the_day.rml b/addons/point_of_sale/report/all_closed_cashbox_of_the_day.rml index f75c08dbadb..04689e0e059 100644 --- a/addons/point_of_sale/report/all_closed_cashbox_of_the_day.rml +++ b/addons/point_of_sale/report/all_closed_cashbox_of_the_day.rml @@ -1,6 +1,6 @@ <?xml version="1.0"?> <document filename="test.pdf"> - <template pageSize="(595.0,842.0)" title="Cashbox of the day" author="OpenERP S.A. (sales@openerp.com)" allowSplitting="20"> + <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"/> </pageTemplate> @@ -10,134 +10,86 @@ <blockAlignment value="LEFT"/> <blockValign value="TOP"/> </blockTableStyle> - <blockTableStyle id="statement_tbl"> - <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="LINEAFTER" colorName="#e6e6e6" start="3,0" stop="3,-1"/> - <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="3,0" stop="3,0"/> - <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="3,-1" stop="3,-1"/> - </blockTableStyle> - <blockTableStyle id="statement_data"> - <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="LINEAFTER" colorName="#e6e6e6" start="3,0" stop="3,-1"/> - <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="3,0" stop="3,0"/> - <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="3,-1" stop="3,-1"/> - </blockTableStyle> - <blockTableStyle id="statement_header"> + <blockTableStyle id="Table1"> <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="LINEAFTER" 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="LINEAFTER" colorName="#e6e6e6" start="3,0" stop="3,-1"/> - <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="3,0" stop="3,0"/> - <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="3,-1" stop="3,-1"/> </blockTableStyle> - <blockTableStyle id="statement_data1"> + <blockTableStyle id="Table2"> <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="LINEAFTER" 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="LINEAFTER" colorName="#e6e6e6" start="3,0" stop="3,-1"/> - <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="3,0" stop="3,0"/> - <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="3,-1" stop="3,-1"/> </blockTableStyle> - <blockTableStyle id="Table1"> + <blockTableStyle id="Table3"> <blockAlignment value="LEFT"/> <blockValign value="TOP"/> - <lineStyle kind="LINEBELOW" colorName="#000000" 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_detail"> + <blockTableStyle id="Table4"> <blockAlignment value="LEFT"/> <blockValign value="TOP"/> - <lineStyle kind="LINEBELOW" colorName="#777777" start="0,0" stop="1,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"/> + <lineStyle kind="LINEBELOW" colorName="#000000" start="5,-1" stop="5,-1"/> </blockTableStyle> - - <blockTableStyle id="Table2_detail"> + <blockTableStyle id="Table7"> <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"/> </blockTableStyle> - <blockTableStyle id="Table2"> + <blockTableStyle id="Table5"> <blockAlignment value="LEFT"/> <blockValign value="TOP"/> <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/> <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/> <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="2,-1" stop="2,-1"/> - <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="statement_total"> - <blockAlignment value="LEFT"/> - <blockValign value="TOP"/> - <lineStyle kind="LINEABOVE" colorName="#ffffff" start="0,0" stop="0,0"/> - <lineStyle kind="LINEABOVE" colorName="#ffffff" start="1,0" stop="1,0"/> - <lineStyle kind="LINEABOVE" colorName="#000000" start="2,0" stop="2,0"/> - <lineStyle kind="LINEABOVE" colorName="#000000" start="3,0" stop="3,0"/> + <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="3,-1" stop="3,-1"/> + <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="4,-1" stop="4,-1"/> </blockTableStyle> <initialize> <paraStyle name="all" alignment="justify"/> </initialize> - <paraStyle name="P1" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT"/> - <paraStyle name="Standard" fontName="Times-Roman"/> + <paraStyle name="P1" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/> + <paraStyle name="Standard" fontName="Helvetica"/> <paraStyle name="Heading" fontName="Helvetica" fontSize="14.0" leading="17" spaceBefore="12.0" spaceAfter="6.0"/> - <paraStyle name="Text body" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/> - <paraStyle name="List" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/> - <paraStyle name="Caption" fontName="Times-Roman" fontSize="12.0" leading="15" spaceBefore="6.0" spaceAfter="6.0"/> - <paraStyle name="Index" fontName="Times-Roman"/> - <paraStyle name="Table Contents" fontName="Times-Roman"/> - <paraStyle name="Table Heading" fontName="Times-Roman" alignment="CENTER"/> + <paraStyle name="Text body" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/> + <paraStyle name="List" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/> + <paraStyle name="Caption" fontName="Helvetica" fontSize="12.0" leading="15" spaceBefore="6.0" spaceAfter="6.0"/> + <paraStyle name="Index" fontName="Helvetica"/> + <paraStyle name="Table Contents" fontName="Helvetica"/> + <paraStyle name="Table Heading" fontName="Helvetica" alignment="CENTER"/> <paraStyle name="terp_header" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/> <paraStyle name="terp_default_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> <paraStyle name="terp_default_Bold_8" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> - <paraStyle name="terp_default_Bold_8_centre" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/> - <paraStyle name="terp_default_Bold_8_right" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="RIGHT" 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_Bold_9_centre" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="CENTER" 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-Bold" 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="Footer" fontName="Helvetica"/> + <paraStyle name="Horizontal Line" fontName="Helvetica" fontSize="6.0" leading="8" spaceBefore="0.0" spaceAfter="14.0"/> <paraStyle name="Heading 9" fontName="Helvetica-Bold" fontSize="75%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/> <paraStyle name="terp_tblheader_General_Right" fontName="Helvetica-Bold" fontSize="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"/> @@ -151,34 +103,21 @@ <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="Drawing" fontName="Times-Roman" fontSize="12.0" leading="15" spaceBefore="6.0" spaceAfter="6.0"/> - <paraStyle name="Header" fontName="Times-Roman"/> - <paraStyle name="Endnote" rightIndent="0.0" leftIndent="14.0" fontName="Times-Roman" fontSize="10.0" leading="13"/> - <paraStyle name="Addressee" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="3.0"/> - <paraStyle name="Signature" fontName="Times-Roman"/> - <paraStyle name="Heading 8" fontName="Helvetica-Bold" fontSize="75%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/> - <paraStyle name="Heading 7" fontName="Helvetica-Bold" fontSize="75%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/> - <paraStyle name="Heading 6" fontName="Helvetica-Bold" fontSize="75%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/> - <paraStyle name="Heading 5" fontName="Helvetica-Bold" fontSize="85%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/> - <paraStyle name="Heading 4" fontName="Helvetica-BoldOblique" fontSize="85%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/> - <paraStyle name="Heading 1" fontName="Helvetica-Bold" fontSize="115%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/> - <paraStyle name="Heading 10" fontName="Helvetica-Bold" fontSize="75%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/> - <paraStyle name="Heading 2" fontName="Helvetica-BoldOblique" fontSize="14.0" leading="17" spaceBefore="12.0" spaceAfter="6.0"/> - <paraStyle name="First line indent" rightIndent="0.0" leftIndent="0.0" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/> - <paraStyle name="Hanging indent" rightIndent="0.0" leftIndent="28.0" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/> - <paraStyle name="Salutation" fontName="Times-Roman"/> - <paraStyle name="Text body indent" rightIndent="0.0" leftIndent="0.0" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/> - <paraStyle name="Heading 3" fontName="Helvetica-Bold" fontSize="14.0" leading="17" spaceBefore="12.0" spaceAfter="6.0"/> - <paraStyle name="List Indent" rightIndent="0.0" leftIndent="142.0" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/> - <paraStyle name="Marginalia" rightIndent="0.0" leftIndent="113.0" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/> + <images/> </stylesheet> - <images/> <story> - + <para style="terp_default_8">[[ repeatIn(objects,'statement') ]]</para> <para style="terp_default_8"> <font color="white"> </font> </para> - <blockTable colWidths="258.0,258.0" style="statement_tbl"> + <para style="terp_default_8"> + <font color="white"> </font> + </para> + <para style="terp_header_Centre">Today's Closed Cashbox</para> + <para style="terp_header_Centre"> + <font color="white"> </font> + </para> + <blockTable colWidths="241.0,241.0" style="Table1"> <tr> <td> <para style="terp_tblheader_General_Centre">Company</para> @@ -186,11 +125,9 @@ <td> <para style="terp_tblheader_General_Centre">User</para> </td> - </tr> + </tr> </blockTable> - - - <blockTable colWidths="258.0,258.0" style="statement_data"> + <blockTable colWidths="241.0,241.0" style="Table2"> <tr> <td> <para style="terp_default_Centre_8">[[ company.name ]]</para> @@ -200,10 +137,10 @@ </td> </tr> </blockTable> - <para style="terp_default_8"> + <para style="Standard"> <font color="white"> </font> </para> - <blockTable colWidths="70.0,90.0,100.0,100.0,80.0,80.0" style="Table1"> + <blockTable colWidths="55.0,95.0,71.0,73.0,98.0,89.0" style="Table3"> <tr> <td> <para style="terp_tblheader_General">St.Name</para> @@ -224,76 +161,89 @@ <para style="terp_tblheader_General_Right">Ending Balance</para> </td> </tr> - <tr> - <td> - <para style="terp_tblheader_General">Total : </para> - </td> - <td> - <para style="terp_tblheader_General_Centre"></para> - </td> - <td> - <para style="terp_tblheader_General_Centre"></para> - </td> - <td> - <para style="terp_tblheader_General_Centre"></para> - </td> - <td> - <para style="terp_tblheader_General_Right"><u>[[ formatLang(get_net_total_starting(user)[1]) ]]</u></para> - </td> - <td> - <para style="terp_tblheader_General_Right"><u>[[ formatLang(get_net_total(user)) ]]</u></para> - </td> - </tr> </blockTable> - - <section> -<para style="terp_default_8">[[ repeatIn(get_data(user),'statement') ]]</para> - <blockTable colWidths="70.0,90.0,100.0,100.0,80.0,80.0" style="Table1_detail"> + <blockTable colWidths="55.0,95.0,71.0,73.0,98.0,89.0" style="Table4"> <tr> <td> - <para style="terp_default_Bold_8">[[ statement['statement'] ]]</para> - </td> - <td> - <para style="terp_default_Bold_8_centre">[[ statement['journal'] ]]</para> - </td> - <td> - <para style="terp_default_Bold_8_centre">[[ statement['date'] ]]</para> + <para style="terp_tblheader_General">Total:</para> </td> <td> - <para style="terp_default_Bold_8_centre">[[ statement['closing_date'] ]]</para> - </td> - <td> - <para style="terp_default_Bold_8_right"><u> [[ (get_bal(statement)) or '0.00' ]]</u></para> + <para style="Table Contents"> + <font color="white"> </font> + </para> </td> <td> - <para style="terp_default_Bold_8_right"><u>[[ formatLang(get_sub_total(user,statement['journal_id'],statement['date'])) ]]</u></para> + <para style="Table Contents"> + <font color="white"> </font> + </para> </td> - </tr> - </blockTable> - - <section> - <para style="terp_default_9">[[ repeatIn(get_lines(statement),'line_ids') ]]</para> - <blockTable colWidths="129.0,150.0,83.0,80.0,80.0" style="Table2_detail"> - <tr> <td> - <para style="terp_default_9">[[ line_ids['name'] ]]</para> + <para style="Table Contents"> + <font color="white"> </font> + </para> </td> <td> - <para style="terp_default_9"><font>[[ get_partner(line_ids) or removeParentNode('font') ]]</font></para> + <para style="terp_tblheader_General_Right">[[ formatLang(get_net_total_starting(user)[1]) ]] [[company.currency_id.symbol]]</para> </td> - <td> - <para style="terp_default_9"><font>[[ get_user(line_ids) or removeParentNode('font') ]]</font></para> - </td> - <td></td> <td> - <para style="terp_default_Right_9">[[ formatLang(line_ids['amount']) ]]</para> + <para style="terp_tblheader_General_Right">[[ formatLang(get_net_total(user)) ]] [[company.currency_id.symbol]]</para> </td> </tr> - </blockTable> -</section> + </blockTable> + <section> + <para style="terp_default_Bold_8">[[ repeatIn(get_data(user),'statement') ]]</para> + <blockTable colWidths="56.0,94.0,71.0,74.0,97.0,90.0" style="Table7"> + <tr> + <td> + <para style="terp_default_Bold_8">[[ statement['statement'] ]]</para> + </td> + <td> + <para style="terp_default_Bold_8">[[ statement['journal'] ]]</para> + </td> + <td> + <para style="terp_default_Bold_8">[[ statement['date'] ]]</para> + </td> + <td> + <para style="terp_default_Bold_8">[[ statement['closing_date'] ]]</para> + </td> + <td> + <para style="P1">[[ (get_bal(statement)) or '0.00' ]] [[company.currency_id.symbol]]</para> + </td> + <td> + <para style="P1">[[ formatLang(get_sub_total(user,statement['journal_id'],statement['date'])) ]] [[company.currency_id.symbol]]</para> + </td> + </tr> + </blockTable> + <section> + <para style="Standard">[[ repeatIn(get_lines(statement),'line_ids') ]]</para> + <blockTable colWidths="94.0,126.0,121.0,3.0,138.0" style="Table5"> + <tr> + <td> + <para style="terp_default_9">[[ line_ids['name'] ]]</para> + <para style="terp_default_9"> + <font color="white"> </font> + </para> + </td> + <td> + <para style="terp_default_9">[[ get_partner(line_ids) or removeParentNode('font') ]]</para> + </td> + <td> + <para style="terp_default_Right_9">[[ get_user(line_ids) or removeParentNode('font') ]]</para> + </td> + <td> + <para style="Table Contents"> + <font color="white"> </font> + </para> + </td> + <td> + <para style="terp_default_Right_9">[[ formatLang(line_ids['amount']) ]] [[company.currency_id.symbol]]</para> + </td> + </tr> + </blockTable> + <para style="Standard"> + <font color="white"> </font> + </para> + </section> </section> - <para style="terp_default_8"> - <font color="white"> </font> - </para> </story> </document> diff --git a/addons/point_of_sale/report/pos_details.rml b/addons/point_of_sale/report/pos_details.rml index c86120779f6..786d2cb0b4d 100644 --- a/addons/point_of_sale/report/pos_details.rml +++ b/addons/point_of_sale/report/pos_details.rml @@ -125,7 +125,6 @@ <lineStyle kind="LINEABOVE" colorName="#b3b3b3" start="1,4" stop="1,4"/> <lineStyle kind="LINEBELOW" colorName="#b3b3b3" start="1,-1" stop="1,-1"/> <lineStyle kind="LINEABOVE" colorName="#b3b3b3" start="0,5" stop="0,5"/> - <lineStyle kind="LINEBELOW" colorName="#b3b3b3" start="0,-1" stop="0,-1"/> <lineStyle kind="LINEABOVE" colorName="#b3b3b3" start="1,5" stop="1,5"/> <lineStyle kind="LINEBELOW" colorName="#b3b3b3" start="1,-1" stop="1,-1"/> </blockTableStyle> diff --git a/addons/point_of_sale/report/pos_details_summary.rml b/addons/point_of_sale/report/pos_details_summary.rml index 7fc8f0cc42b..309f128d229 100644 --- a/addons/point_of_sale/report/pos_details_summary.rml +++ b/addons/point_of_sale/report/pos_details_summary.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="42.0" width="527" height="758"/> + <frame id="first" x1="57.0" y1="57.0" width="481" height="728"/> </pageTemplate> </template> <stylesheet> @@ -82,9 +82,10 @@ <lineStyle kind="LINEABOVE" colorName="#000000" start="0,0" stop="0,0"/> <lineStyle kind="LINEABOVE" colorName="#000000" start="1,0" stop="1,0"/> <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/> - <lineStyle kind="LINEABOVE" colorName="#cccccc" start="0,1" stop="0,1"/> - <lineStyle kind="LINEABOVE" colorName="#b3b3b3" start="1,1" stop="1,1"/> - <lineStyle kind="LINEABOVE" colorName="#b3b3b3" start="0,2" stop="0,2"/> + <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="0,1" stop="0,1"/> + <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/> + <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="1,1" stop="1,1"/> + <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="0,2" stop="0,2"/> <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="1,2" stop="1,2"/> <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/> <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="0,3" stop="0,3"/> diff --git a/addons/point_of_sale/report/pos_lines.rml b/addons/point_of_sale/report/pos_lines.rml index fd3bbf9c43c..17f722c1c17 100644 --- a/addons/point_of_sale/report/pos_lines.rml +++ b/addons/point_of_sale/report/pos_lines.rml @@ -1,6 +1,6 @@ <?xml version="1.0"?> <document filename="test.pdf"> - <template pageSize="(595.0,842.0)" title="Sales Lines" author="OpenERP S.A. (sales@openerp.com)" allowSplitting="20"> + <template pageSize="(595.0,842.0)" title="Test" author="Martin Simon" allowSplitting="20"> <pageTemplate id="first"> <frame id="first" x1="2.0" y1="57.0" width="537" height="728"/> </pageTemplate> @@ -73,7 +73,6 @@ <initialize> <paraStyle name="all" alignment="justify"/> </initialize> - <paraStyle name="P1" fontName="Helvetica-Bold" 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="Heading" fontName="Helvetica" fontSize="14.0" leading="17" spaceBefore="12.0" spaceAfter="6.0"/> @@ -184,16 +183,16 @@ <para style="terp_default_Right_9">[[taxes(l)]]</para> </td> <td> - <para style="terp_default_Right_9">[[ formatLang(l.qty) ]] [[l.product_id.uom_id.name]]</para> + <para style="terp_default_Right_9">[[ formatLang(l.qty) ]]</para> </td> <td> - <para style="terp_default_Right_9">[[ formatLang(l.price_unit) ]]</para> + <para style="terp_default_Right_9">[[ formatLang(l.price_unit) ]] [[o.pricelist_id.currency_id. symbol ]]</para> </td> <td> <para style="terp_default_Right_9">[[ formatLang(l.discount) ]]</para> </td> <td> - <para style="terp_default_Right_9">[[ formatLang(l.price_subtotal) ]][[o.pricelist_id.currency_id. symbol ]]</para> + <para style="terp_default_Right_9">[[ formatLang(l.price_subtotal) ]] [[o.pricelist_id.currency_id. symbol ]]</para> </td> </tr> </blockTable> @@ -221,7 +220,7 @@ </para> </td> <td> - <para style="terp_default_9">Net Total :</para> + <para style="terp_default_9">Net Total </para> </td> <td> <para style="terp_default_Right_9">[[ formatLang(o.amount_total) ]] [[o.pricelist_id.currency_id.symbol ]]</para> @@ -249,7 +248,7 @@ </para> </td> <td> - <para style="terp_default_9">Taxes :</para> + <para style="terp_default_9">Taxes</para> </td> <td> <para style="terp_default_Right_9">[[ formatLang(o.amount_tax) ]] [[o.pricelist_id.currency_id. symbol ]]</para> @@ -277,7 +276,7 @@ </para> </td> <td> - <para style="P1">Total :</para> + <para style="terp_default_9">Total</para> </td> <td> <para style="terp_default_Right_9">[[ formatLang(o.amount_total + o.amount_tax) ]] [[o.pricelist_id.currency_id. symbol ]]</para> diff --git a/addons/point_of_sale/report/pos_payment_report_user.rml b/addons/point_of_sale/report/pos_payment_report_user.rml index a88813fac1f..3c93c9731a1 100644 --- a/addons/point_of_sale/report/pos_payment_report_user.rml +++ b/addons/point_of_sale/report/pos_payment_report_user.rml @@ -133,7 +133,7 @@ <para style="Standard"> <font color="white"> </font> </para> - <blockTable colWidths="256.0,59.0,42.0,61.0,64.0" style="Table3"> + <blockTable colWidths="241.0,55.0,61.0,61.0,64.0" style="Table3"> <tr> <td> <para style="terp_tblheader_Details">Product</para> @@ -154,7 +154,7 @@ </blockTable> <section> <para style="P1">[[ repeatIn(pos_payment_user(data['form']), 'line_ids') ]]</para> - <blockTable colWidths="256.0,59.0,42.0,61.0,64.0" style="Table6"> + <blockTable colWidths="241.0,55.0,61.0,61.0,64.0" style="Table6"> <tr> <td> <para style="terp_default_9">[[ line_ids['name'] ]]</para> @@ -169,12 +169,12 @@ <para style="terp_default_Right_9">[[ formatLang(line_ids['price_unit']) ]]</para> </td> <td> - <para style="terp_default_Right_9">[[ formatLang(line_ids['total']) ]]</para> + <para style="terp_default_Right_9">[[ formatLang(line_ids['total']) ]] [[company.currency_id.symbol]]</para> </td> </tr> </blockTable> </section> - <blockTable colWidths="256.0,59.0,42.0,61.0,64.0" style="Table5"> + <blockTable colWidths="241.0,56.0,61.0,61.0,64.0" style="Table5"> <tr> <td> <para style="Table Contents"> @@ -192,10 +192,10 @@ </para> </td> <td> - <para style="terp_tblheader_General_Right">Total</para> + <para style="terp_tblheader_General_Right">Total:</para> </td> <td> - <para style="terp_default_Right_9">[[ formatLang(pos_payment_user_total(data['form'])) or removeParentNode('blockTable')]]</para> + <para style="terp_default_Right_9">[[ formatLang(pos_payment_user_total(data['form'])) or removeParentNode('blockTable')]] [[company.currency_id.symbol]]</para> </td> </tr> </blockTable> diff --git a/addons/point_of_sale/report/pos_receipt_without_remboursment.rml b/addons/point_of_sale/report/pos_receipt_without_remboursment.rml index 44fa3bf60cc..ff6ebc3132c 100644 --- a/addons/point_of_sale/report/pos_receipt_without_remboursment.rml +++ b/addons/point_of_sale/report/pos_receipt_without_remboursment.rml @@ -125,7 +125,7 @@ </td> </tr> </blockTable> - <para style="terp_default_Centre_9">[[ get_journal_amt(o)[1] ]]</para> + <para style="terp_default_Centre_9">[[ get_journal_amt(o)[0] ]] : [[ get_journal_amt(o)[1] ]]</para> <!-- <section>--> <!-- [[ repeatIn((o.state=='cancel' and o.statement_ids) and [1] or [], 'p') ]]--> diff --git a/addons/point_of_sale/report/pos_sales_user_today.rml b/addons/point_of_sale/report/pos_sales_user_today.rml index 16c8f6f0b38..52ac1eb6f49 100644 --- a/addons/point_of_sale/report/pos_sales_user_today.rml +++ b/addons/point_of_sale/report/pos_sales_user_today.rml @@ -54,8 +54,9 @@ <paraStyle name="all" alignment="justify"/> </initialize> <paraStyle name="P1" fontName="Helvetica" fontSize="6.0" leading="8" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> - <paraStyle name="P2" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="6.0" spaceAfter="6.0"/> - <paraStyle name="P3" fontName="Helvetica-Bold" fontSize="16.0" leading="20" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/> + <paraStyle name="P2" fontName="Helvetica-Bold" fontSize="16.0" leading="20" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/> + <paraStyle name="P3" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="6.0" spaceAfter="6.0"/> + <paraStyle name="P4" fontName="Helvetica-Bold" fontSize="16.0" leading="20" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/> <paraStyle name="Standard" fontName="Helvetica"/> <paraStyle name="Heading" fontName="Helvetica" fontSize="14.0" leading="17" spaceBefore="12.0" spaceAfter="6.0"/> <paraStyle name="Text body" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/> @@ -98,7 +99,10 @@ <para style="Standard"> <font color="white"> </font> </para> - <para style="P3">Todays Sales By User</para> + <para style="P2">Today's Sales By User</para> + <para style="P2"> + <font color="white"> </font> + </para> <blockTable colWidths="241.0,241.0" style="Table1"> <tr> <td> @@ -134,7 +138,7 @@ <para style="terp_tblheader_Details_Centre">Date Order</para> </td> <td> - <para style="P2">User</para> + <para style="P3">User</para> </td> <td> <para style="terp_tblheader_General_Right">State</para> diff --git a/addons/point_of_sale/report/pos_sales_user_today_current_user.rml b/addons/point_of_sale/report/pos_sales_user_today_current_user.rml index c483fa80a65..d0499f1743b 100644 --- a/addons/point_of_sale/report/pos_sales_user_today_current_user.rml +++ b/addons/point_of_sale/report/pos_sales_user_today_current_user.rml @@ -109,7 +109,7 @@ <para style="terp_default_8"> <font color="white"> </font> </para> - <para style="P3">Sales By Current User(Todays)</para> + <para style="P3">Today's Sales By Current User</para> <para style="terp_default_8"> <font color="white"> </font> </para> @@ -175,7 +175,7 @@ <para style="terp_default_Right_9">[[ formatLang(line_ids['qty']) ]]</para> </td> <td> - <para style="terp_default_Right_9">[[ formatLang(line_ids['total']) ]]</para> + <para style="terp_default_Right_9">[[ formatLang(line_ids['total']) ]] [[company.currency_id.symbol]]</para> </td> </tr> </blockTable> @@ -194,7 +194,7 @@ <para style="terp_default_Right_9">[[ formatLang((get_data_current_user_qty(user))) ]]</para> </td> <td> - <para style="terp_default_Right_9">[[ formatLang((get_data_current_user_tot(user))) or removeParentNode('blockTable')]]</para> + <para style="terp_default_Right_9">[[ formatLang((get_data_current_user_tot(user))) or removeParentNode('blockTable')]] [[company.currency_id.symbol]]</para> </td> </tr> </blockTable> diff --git a/addons/point_of_sale/statement_report.xml b/addons/point_of_sale/statement_report.xml index fb1be16419e..a81d51a2679 100644 --- a/addons/point_of_sale/statement_report.xml +++ b/addons/point_of_sale/statement_report.xml @@ -25,7 +25,7 @@ <report id="all_closed_cashbox_of_the_day" - string="All Cloded CashBOx" + string="All Closed CashBox" model="account.bank.statement" name="all.closed.cashbox.of.the.day" auto="False" @@ -54,16 +54,7 @@ rml="point_of_sale/report/account_statement.rml" /> - <report - id="all_closed_cashbox_of_the_day" - string="All Cloded CashBOx" - model="account.bank.statement" - name="all.closed.cashbox.of.the.day" - auto="False" - multi="True" - menu = 'False' - rml="point_of_sale/report/all_closed_cashbox_of_the_day.rml" - /> + </data> </openerp> diff --git a/addons/point_of_sale/test/pos_report.yml b/addons/point_of_sale/test/pos_report.yml index 08052356104..2fe288c2df1 100644 --- a/addons/point_of_sale/test/pos_report.yml +++ b/addons/point_of_sale/test/pos_report.yml @@ -7,12 +7,26 @@ if tools.config['test_report_directory']: file(os.path.join(tools.config['test_report_directory'], 'point_of_sale-details_summary report'+format), 'wb+').write(data) + +- + I open the register. +- + !record {model: pos.open.statement, id: pos_open_statement_0}: + {} +- + I open the statement. +- + !python {model: pos.open.statement}: | + self.open_statement(cr, uid, [ref("pos_open_statement_0")], {"lang": "en_US", "active_model": + "ir.ui.menu", "active_ids": [ref("point_of_sale.menu_open_statement")], "tz": + False, "active_id": ref("point_of_sale.menu_open_statement"), }) - In order to test the PDF reports defined on a Point Of Sale, we will print a POS Invoice Report - !python {model: pos.order}: | import netsvc, tools, os - (data, format) = netsvc.LocalService('report.pos.invoice').create(cr, uid, [ref('point_of_sale.order_pos1'), ref('point_of_sale.order_pos2')], {}, {}) + data_dict = {'model':'ir.ui.menu', 'form':{'invoice_wanted': 1, 'journal':pos_open_statement_0,}} + (data, format) = netsvc.LocalService('report.pos.invoice').create(cr, uid, [ref('point_of_sale.order_pos1')], data_dict, {}) if tools.config['test_report_directory']: file(os.path.join(tools.config['test_report_directory'], 'point_of_sale-invoice report'+format), 'wb+').write(data) @@ -52,7 +66,7 @@ if tools.config['test_report_directory']: file(os.path.join(tools.config['test_report_directory'], 'point_of_sale-receipt without reimbursement report'+format), 'wb+').write(data) - - In order to test the PDF reports defined on a Point Of Sale, we will print a POS Payment Report Report + In order to test the PDF reports defined on a Point Of Sale, we will print a POS Payment Report - !python {model: ir.ui.menu}: | import netsvc, tools, os, time @@ -84,6 +98,13 @@ balance_end_real: 0.0 date: '2010-05-19' journal_id: account_journal_cash0 + line_ids: + - name: statement + date: "2010-10-13" + type: customer + account_id: account_account_sales0 + amount: 100 + partner_id: base.res_partner_agrolait period_id: account.period_5 state: 'draft' - @@ -133,7 +154,7 @@ - !python {model: pos.order}: | import netsvc, tools, os, time - (data, format) = netsvc.LocalService('report.pos.payment.report').create(cr, uid, [ref('point_of_sale.order_pos1'), ref('point_of_sale.order_pos2')], {}, {}) + (data, format) = netsvc.LocalService('report.pos.payment.report').create(cr, uid, [ref('point_of_sale.pos_order_pos0')], {}, {}) if tools.config['test_report_directory']: file(os.path.join(tools.config['test_report_directory'], 'point_of_sale-payment_report'+format), 'wb+').write(data) - @@ -152,4 +173,4 @@ import netsvc, tools, os, time (data, format) = netsvc.LocalService('report.pos.sales.user.today.current.user').create(cr, uid, [ref('point_of_sale.order_pos1'), ref('point_of_sale.order_pos2')], {}, {}) if tools.config['test_report_directory']: - file(os.path.join(tools.config['test_report_directory'], 'point_of_sale-sales_today_current_user_report'+format), 'wb+').write(data)
\ No newline at end of file + file(os.path.join(tools.config['test_report_directory'], 'point_of_sale-sales_today_current_user_report'+format), 'wb+').write(data) |
