[IMP]:set alignment in account reports
authorSAZ(OpenERP) <>
Tue, 28 Sep 2010 07:25:50 +0000 (12:55 +0530)
committerapa-tiny <apa@tinyerp.com>
Tue, 28 Sep 2010 07:25:50 +0000 (12:55 +0530)
bzr revid: apa@tinyerp.com-20100928072550-g5axwyfg1bby3fo0

addons/account/project/report/cost_ledger.rml
addons/account/report/account_balance.rml
addons/account/report/account_general_ledger.rml
addons/account/report/account_general_ledger_landscape.rml
addons/account/report/account_journal.rml
addons/account/report/account_partner_balance.rml
addons/point_of_sale/test/pos_report.yml

index bc3f2f2..4f49589 100644 (file)
           <para style="terp_tblheader_Details_Right">Credit</para>
         </td>
         <td>
-          <para style="terp_tblheader_Details_Centre">Balance</para>
+          <para style="terp_tblheader_Details_Right">Balance</para>
         </td>
       </tr>
     </blockTable>
       <font color="white"> </font>
     </para>
   </story>
-</document>
\ No newline at end of file
+</document>
index fac1983..4538582 100644 (file)
         <para style="P11">
       <font color="white"> </font>
     </para>
-  <blockTable colWidths="67,264.0,70.0,70.0,80.0" style="Table2" repeatRows="1">
+  <blockTable colWidths="67,295.0,60.0,60.0,60.0" style="Table2" repeatRows="1">
       <tr noRowsplits="1">
         <td><para style="P12a">Code</para></td>
         <td><para style="P12a">Account</para></td>
       <tr>
     <td><para style="P14">[[ repeatIn(lines(data['form']), 'a') ]]<font>[[ (a['type']&lt;&gt;'view' and setTag('para','para',{'fontName':"Helvetica"})) or removeParentNode('font') ]]</font><i>[[ a['code'] or removeParentNode('tr')  ]]</i></para></td>
         <td><para style="P14"><font>[[ (a['type']&lt;&gt;'view' and setTag('para','para',{'fontName':"Helvetica"})) or removeParentNode('font') ]]</font><font color="white">[[ '..'*(a['level']-1) ]]</font><font>[[ a['name'] ]]</font> </para></td>
-        <td><para style="P3"><font>[[ (a['type']&lt;&gt;'view' and setTag('para','para',{'fontName':"Helvetica"})) or removeParentNode('font') ]]</font><font>[[ a['type']=='view' and removeParentNode('font') ]][[ formatLang(a['debit']) ]]</font><font>[[ a['type']&lt;&gt;'view' and removeParentNode('font') ]] [[formatLang(a['debit']) ]] </font></para></td>
+        <td><para style="P3"><font>[[ (a['type']&lt;&gt;'view' and setTag('para','para',{'fontName':"Helvetica"})) or removeParentNode('font') ]]</font><font>[[ a['type']=='view' and removeParentNode('font') ]][[ formatLang(a['debit']) ]]</font><font>[[ a['type']&lt;&gt;'view' and removeParentNode('font') ]] [[formatLang(a['debit']) ]]</font></para></td>
         <td><para style="P3"><font>[[ (a['type']&lt;&gt;'view' and setTag('para','para',{'fontName':"Helvetica"})) or removeParentNode('font')]]</font><font>[[ a['type']=='view' and removeParentNode('font') ]][[ formatLang(a['credit']) ]]</font><font>[[ a['type']&lt;&gt;'view' and removeParentNode('font') ]] [[ formatLang(a['credit']) ]]</font> </para></td>
         <td><para style="P3"><font>[[ (a['type']&lt;&gt;'view' and setTag('para','para',{'fontName':"Helvetica"})) or removeParentNode('font') ]]</font><font>[[ a['type']=='view' and removeParentNode('font') ]][[ formatLang(a['balance']) ]] [[ company.currency_id.symbol ]]</font><font>[[ a['type']&lt;&gt;'view' and removeParentNode('font') ]] [[ formatLang(a['balance']) ]] [[ company.currency_id.symbol ]]</font> </para></td>
       </tr>
       <font color="white"> </font>
     </para>
   </story>
-</document>
\ No newline at end of file
+</document>
index 5a38122..7ded268 100644 (file)
           <td><para style="P3b">Move</para></td>
           <td><para style="P3b">Entry Label</para></td>
           <td><para style="P9b">Debit</para></td>
-          <td><para style="P9b">Crebit</para></td>
+          <td><para style="P9b">Credit</para></td>
           <td><para style="P9b">Balance</para></td>
         </tr>
      </blockTable>
      <blockTable colWidths="66.0,44.0,80.0,60.0,92.5,66.5,64.5,71.5" style="tbl_content">[[ data['form']['amount_currency'] == False or removeParentNode('blockTable') ]]
         <tr>
           <td>
-          <blockTable colWidths="245.0,92.5,66.5,64.5,71.5" style="Table5">
+          <blockTable colWidths="245.0,92.5,65.5,67.5,68.5" style="Table5">
       <tr>
         <td><para style="Standard"><font color="white">[[ '..'*(o.level-1) ]]</font>[[ o.code or '']] [[ o.name or '']]</para></td>
         <td><para style="Standard"></para></td>
      <blockTable colWidths="70.0,40.0,60.0,55.0,89.0,58.0,58.0,58.0,58.0" style="tbl_content">[[ data['form']['amount_currency'] == True or removeParentNode('blockTable') ]]
        <tr>
           <td>
-          <blockTable colWidths="230.00,74.0,55.5,60.5,60.5,65.5" style="Table5">
+          <blockTable colWidths="230.00,80.0,56.5,57.5,57.5,65.5" style="Table5">
               <tr>
                 <td><para style="Standard"><font color="white">[[ '..'*(o.level-1) ]]</font>[[ o.code or '' ]] [[ o.name or '' ]]</para></td>
                 <td><para style="Standard"></para></td>
index 80a55c7..163d5cb 100644 (file)
       <blockTable colWidths="66.0,35.0,120.0,90.0,60.0,200.0,180.0,73.0,73.0,73.0,85.00" style="tbl_content">[[data['form']['amount_currency'] == True or removeParentNode('blockTable')]]
        <tr>
                <td>
-                       <blockTable colWidths="404.0,335.0,75.0,75.0,75.0,79.00" style="Table5">
+                       <blockTable colWidths="404.0,335.0,79,73.5,72.5,79.00" style="Table5">
                                <tr>
                                        <td><para style="Standard"><font color="white">[[ '..'*(o.level-1) ]]</font>[[ o.code ]] [[ o.name ]]</para></td>
                                        <td><para style="Standard"></para></td>
                <blockTable colWidths="66.0,35.0,166.0,90.0,60.0,280.0,148.0,69.0,72.0,64.0" style="tbl_content">[[data['form']['amount_currency'] == False or removeParentNode('blockTable')]]
                <tr>
                        <td>
-                               <blockTable colWidths="405.0,435.0,69.0,72.0,64.0" style="Table5">
+                               <blockTable colWidths="405.0,435.0,69.0,72.0,63.0" style="Table5">
                                                <tr>
                                                        <td><para style="Standard"><font color="white">[[ '..'*(o.level-1) ]]</font>[[ o.code ]] [[ o.name ]]</para></td>
                                                        <td><para style="Standard"></para></td>
index e153ae2..5b7ebf7 100644 (file)
         <td><para style="P10">Entry No</para></td>
         <td><para style="P10">A/c No.</para></td>
         <td><para style="P10a">Partner</para></td>
-        <td><para style="P10a">Move - Entry label</para></td>
+        <td><para style="P10a">Move/Entry label</para></td>
         <td><para style="P10b">Debit</para></td>
         <td><para style="P10b">Credit</para></td>
         <td><para style="P10b">Balance</para></td>
         <td><para style="P11"><font color="white"></font></para></td>
         <td><para style="P11"><font color="white"></font></para></td>
         <td><para style="P12"><u>[[ formatLang(sum_debit(o.period_id.id, o.journal_id.id)) ]]</u></para></td>
-        <td><para style="P12"><u>[[ formatLang(sum_credit(o.period_id.id, o.journal_id.id)) ]] </u></para></td>
-        <td> <para style="P12"><u>[[ formatLang((sum_credit(o.period_id.id, o.journal_id.id) - sum_debit(o.period_id.id, o.journal_id.id))) ]] [[ company.currency_id.symbol ]]</u></para></td>
+        <td><para style="P12"><u>[[ formatLang(sum_credit(o.period_id.id, o.journal_id.id)) ]]</u></para></td>
+        <td><para style="P12"><u>[[ formatLang((sum_credit(o.period_id.id, o.journal_id.id)-sum_debit(o.period_id.id, o.journal_id.id))) ]] [[ company.currency_id.symbol ]]</u></para></td>
       </tr>
       <para style="Standard"><font color="white">[[lines(o.period_id.id, o.journal_id.id) or removeParentNode('story') ]]</font></para>
       <tr>
         <td><para style="P10">Entry No</para></td>
         <td><para style="P10">A/c No.</para></td>
         <td><para style="P10a">Partner</para></td>
-        <td><para style="P10a">Move - Entry label</para></td>
+        <td><para style="P10a">Move/Entry label</para></td>
         <td><para style="P10b">Debit</para></td>
         <td><para style="P10b">Credit</para></td>
                <td><para style="P10b">Balance</para></td>
index a11df4e..a9ddb16 100644 (file)
         <td><para style="P12b">Debit</para></td>
         <td><para style="P12b">Credit</para></td>
         <td><para style="P12b">Balance</para></td>
-        <td><para style="P12a">In dispute</para></td>
+        <td><para style="P12b">In dispute</para></td>
       </tr>
       <tr>
         <td><para style="P7">Total:</para></td>
         <td><para style="P8"></para></td>
-        <td><para style="P8"><u>[[ formatLang(sum_debit()) ]] </u></para></td>
+        <td><para style="P8"><u>[[ formatLang(sum_debit()) ]]</u></para></td>
         <td><para style="P8"><u>[[ formatLang(sum_credit()) ]]</u></para></td>
         <td><para style="P8"><u>[[ formatLang((solde_debit()-solde_credit())) ]] [[ company.currency_id.symbol ]]</u></para></td>
         <td><para style="P8"><u>[[ formatLang(sum_litige()) ]] [[ company.currency_id.symbol ]]</u></para></td>
index 1747fb6..aeb99e4 100644 (file)
@@ -1,51 +1,51 @@
 -
-  In order to test the PDF reports defined on a Point Of Sale, we will print a POS Detail Summary Report
-- 
+  In order to test the PDF reports defined on a Point Of Sale,we will print a POS Detail Summary Report
+-
   !python {model: pos.order}: |
     import netsvc, tools, os
     (data, format) = netsvc.LocalService('report.pos.details_summary').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-details_summary report'+format), 'wb+').write(data)
-        
+
 -
   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')], {}, {})
     if tools.config['test_report_directory']:
         file(os.path.join(tools.config['test_report_directory'], 'point_of_sale-invoice report'+format), 'wb+').write(data)
-        
+
 -
   In order to test the PDF reports defined on a Point Of Sale, we will print a POS Lines Report
-- 
+-
   !python {model: pos.order}: |
     import netsvc, tools, os
     (data, format) = netsvc.LocalService('report.pos.lines').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-lines report'+format), 'wb+').write(data)
-        
+
 -
   In order to test the PDF reports defined on a Point of Sale, we will print a POS Receipt Report
-- 
+-
   !python {model: pos.order}: |
     import netsvc, tools, os
     (data, format) = netsvc.LocalService('report.pos.receipt').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-receipt report'+format), 'wb+').write(data)
-        
+
 -
   In order to test the PDF reports defined on a Point of Sale, we will print a POS Receipt With Reimbursement Report
-- 
+-
   !python {model: pos.order}: |
     import netsvc, tools, os
     (data, format) = netsvc.LocalService('report.pos.receipt.with.remboursment').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-receipt with reimbursement report'+format), 'wb+').write(data)
-        
+
 -
   In order to test the PDF reports defined on a point of sale, we will print a POS Receipt Without Reimbursement Report
-- 
+-
   !python {model: pos.order}: |
     import netsvc, tools, os
     (data, format) = netsvc.LocalService('report.pos.receipt.without.remboursment').create(cr, uid, [ref('point_of_sale.order_pos1'), ref('point_of_sale.order_pos2')], {}, {})
@@ -53,7 +53,7 @@
         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
-- 
+-
   !python {model: ir.ui.menu}: |
     import netsvc, tools, os, time
     (data, format) = netsvc.LocalService('report.pos.payment.report.date').create(cr, uid, [1], {'model':'ir.ui.menu', 'form':{'date_start': time.strftime('%Y-%m-%d'), 'date_end': time.strftime('%Y-%m-%d'), 'user_id': [ref('base.user_root')] }}, {})
@@ -61,7 +61,7 @@
         file(os.path.join(tools.config['test_report_directory'], 'point_of_sale- pos sales lines report'+format), 'wb+').write(data)
 -
   In order to test the PDF reports defined on a Point Of Sale, we will print a POS Details Report
-- 
+-
   !python {model: ir.ui.menu}: |
     import netsvc, tools, os, time
     (data, format) = netsvc.LocalService('report.pos.details').create(cr, uid, [], {'model':'ir.ui.menu', 'form':{'date_start': time.strftime('%Y-%m-%d'), 'date_end': time.strftime('%Y-%m-%d') }}, {})
@@ -69,7 +69,7 @@
         file(os.path.join(tools.config['test_report_directory'], 'point_of_sale- pos details report'+format), 'wb+').write(data)
 -
   In order to test the PDF reports defined on a Point Of Sale, we will print a Account Statement Report
-- 
+-
   !python {model: account.bank.statement}: |
     import netsvc, tools, os, time
     (data, format) = netsvc.LocalService('report.account.statement').create(cr, uid, [ref('point_of_sale.account_bank_statement_st0')], {}, {})
@@ -77,7 +77,7 @@
         file(os.path.join(tools.config['test_report_directory'], 'point_of_sale-account_statement_report'+format), 'wb+').write(data)
 -
   In order to test the PDF reports defined on a Point Of Sale, we will print a POS User Product Report
-- 
+-
   !python {model: account.bank.statement}: |
     import netsvc, tools, os, time
     (data, format) = netsvc.LocalService('report.pos.user.product').create(cr, uid, [ref('point_of_sale.account_bank_statement_st0')], {}, {})
@@ -85,7 +85,7 @@
         file(os.path.join(tools.config['test_report_directory'], 'point_of_sale-user_product_report'+format), 'wb+').write(data)
 -
   In order to test the PDF reports defined on a Point Of Sale, we will print a POS All Close Cashbox Of the Day Report
-- 
+-
   !python {model: account.bank.statement}: |
     import netsvc, tools, os, time
     (data, format) = netsvc.LocalService('report.all.closed.cashbox.of.the.day').create(cr, uid, [ref('point_of_sale.account_bank_statement_st0')], {}, {})
@@ -93,7 +93,7 @@
         file(os.path.join(tools.config['test_report_directory'], 'point_of_sale-all_closed_cash_box_of_the_day_report'+format), 'wb+').write(data)
 -
   In order to test the PDF reports defined on a Point of Sale, we will print a POS Sales User Report
-- 
+-
   !python {model: pos.order}: |
     import netsvc, tools, os, time
     data_dict = {'model':'ir.ui.menu', 'form':{'date_start': time.strftime('%Y-%m-%d'), 'date_end': time.strftime('%Y-%m-%d'),'user_id':[ref('base.user_root')] }}
         file(os.path.join(tools.config['test_report_directory'], 'point_of_sale-sales_user_report'+format), 'wb+').write(data)
 -
   In order to test the PDF reports defined on a Point of Sale, we will print a POS Sales User Today Report
-- 
+-
   !python {model: pos.order}: |
     import netsvc, tools, os, time
     data_dict = {'model':'ir.ui.menu', 'form':{'user_id':[ref('base.user_root')] }}
         file(os.path.join(tools.config['test_report_directory'], 'point_of_sale-sales_user_today_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
-- 
+-
   !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')], {}, {})
         file(os.path.join(tools.config['test_report_directory'], 'point_of_sale-payment_report'+format), 'wb+').write(data)
 -
   In order to test the PDF reports defined on a Point of Sale, we will print a POS Payment User Report
-- 
+-
   !python {model: pos.order}: |
     import netsvc, tools, os, time
     data_dict = {'model':'ir.ui.menu', 'form':{'user_id':[ref('base.user_root'),ref('base.user_demo')] }}
         file(os.path.join(tools.config['test_report_directory'], 'point_of_sale-payment_user_report'+format), 'wb+').write(data)
 -
   In order to test the PDF reports defined on a Point of Sale, we will print a POS Today's Sales of Current User Report
-- 
+-
   !python {model: pos.order}: |
     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')], {}, {})