merge

bzr revid: fp@tinyerp.com-20090127123219-q7grzypdf9caigkr

8 files changed, 186 insertions, 196 deletions

diff --git a/addons/account/invoice.py b/addons/account/invoice.py
index 2e5550325b7..de343eedfd1 100644
--- a/addons/account/invoice.py
+++ b/addons/account/invoice.py
@@ -483,13 +483,9 @@ class account_invoice(osv.osv):
         cur_obj = self.pool.get('res.currency')
 
         for inv in self.browse(cr, uid, ids):
-            if not inv.tax_line:
-                self.button_compute(cr, uid, [inv.id], context={}, set_total=False)
             if inv.move_id:
                 continue
 
-            if inv.type in ('in_invoice', 'in_refund') and abs(inv.check_total - inv.amount_total) >= (inv.currency_id.rounding/2.0):
-                raise osv.except_osv(_('Bad total !'), _('Please verify the price of the invoice !\nThe real total does not match the computed total.'))
             if not inv.date_invoice:
                 self.write(cr, uid, [inv.id], {'date_invoice':time.strftime('%Y-%m-%d')})
             company_currency = inv.company_id.currency_id.id
@@ -519,6 +515,9 @@ class account_invoice(osv.osv):
                     if not key in tax_key:
                         raise osv.except_osv(_('Warning !'), _('Taxes missing !'))
 
+            if inv.type in ('in_invoice', 'in_refund') and abs(inv.check_total - inv.amount_total) >= (inv.currency_id.rounding/2.0):
+                raise osv.except_osv(_('Bad total !'), _('Please verify the price of the invoice !\nThe real total does not match the computed total.'))
+
             # one move line per tax line
             iml += ait_obj.move_line_get(cr, uid, inv.id)
 
@@ -986,7 +985,7 @@ class account_invoice_line(osv.osv):
             taxes = res.taxes_id and res.taxes_id or (a and self.pool.get('account.account').browse(cr, uid,a).tax_ids or False)
             tax_id = self.pool.get('account.fiscal.position').map_tax(cr, uid, fpos, taxes)
         else:
-            taxes = res.taxes_id and res.taxes_id or (a and self.pool.get('account.account').browse(cr, uid,a).tax_ids or False)
+            taxes = res.supplier_taxes_id and res.supplier_taxes_id or (a and self.pool.get('account.account').browse(cr, uid,a).tax_ids or False)
             tax_id = self.pool.get('account.fiscal.position').map_tax(cr, uid, fpos, taxes)
         if type in ('in_invoice', 'in_refund'):
             to_update = self.product_id_change_unit_price_inv(cr, uid, tax_id, price_unit, qty, address_invoice_id, product, partner_id, context=context)
diff --git a/addons/account/project/report/analytic_balance.rml b/addons/account/project/report/analytic_balance.rml
index 0d1c7d53ad1..598937b29aa 100644
--- a/addons/account/project/report/analytic_balance.rml
+++ b/addons/account/project/report/analytic_balance.rml
@@ -128,16 +128,16 @@
           </td>
           <td></td>
           <td>
-            <para style="terp_tblheader_General_Right"><u>[[ sum_debit(objects,data['form']['date1'],data['form']['date2']) or '0.0' ]]</u></para>
+            <para style="terp_tblheader_General_Right"><u>[[ formatLang(sum_debit(objects,data['form']['date1'],data['form']['date2'])) ]]</u></para>
           </td>
           <td>
-            <para style="terp_tblheader_General_Right"><u>[[ sum_credit(objects,data['form']['date1'],data['form']['date2']) or '0.0' ]]</u></para>
+            <para style="terp_tblheader_General_Right"><u>[[ formatLang(sum_credit(objects,data['form']['date1'],data['form']['date2'])) ]]</u></para>
           </td>
           <td>
-            <para style="terp_tblheader_General_Right"><u>[[ sum_balance(objects,data['form']['date1'],data['form']['date2']) or '0.0' ]]</u></para>
+            <para style="terp_tblheader_General_Right"><u>[[ formatLang(sum_balance(objects,data['form']['date1'],data['form']['date2'])) ]]</u></para>
           </td>
           <td>
-            <para style="terp_tblheader_General_Right"><u>[[ sum_quantity(objects,data['form']['date1'],data['form']['date2']) or '0.0' ]]</u></para>
+            <para style="terp_tblheader_General_Right"><u>[[ formatLang(sum_quantity(objects,data['form']['date1'],data['form']['date2'])) ]]</u></para>
           </td>
         </tr>
             
@@ -153,16 +153,16 @@
                   <para style="terp_default_8_bold">[[ o.complete_name ]]</para>
                 </td>
                 <td>
-                  <para style="terp_default_8_right_bold"><u>[[  move_sum_debit(o.id,data['form']['date1'],data['form']['date2']) or '0.0' ]]</u></para>
+                  <para style="terp_default_8_right_bold"><u>[[  formatLang(move_sum_debit(o.id,data['form']['date1'],data['form']['date2'])) ]]</u></para>
                 </td>
                 <td>
-                  <para style="terp_default_8_right_bold"><u>[[  move_sum_credit(o.id,data['form']['date1'],data['form']['date2']) or '0.0' ]]</u></para>
+                  <para style="terp_default_8_right_bold"><u>[[  formatLang(move_sum_credit(o.id,data['form']['date1'],data['form']['date2'])) ]]</u></para>
                 </td>
                 <td>
-                  <para style="terp_default_8_right_bold"><u>[[  move_sum_balance(o.id,data['form']['date1'],data['form']['date2']) or '0.0' ]]</u></para>
+                  <para style="terp_default_8_right_bold"><u>[[  formatLang(move_sum_balance(o.id,data['form']['date1'],data['form']['date2'])) ]]</u></para>
                 </td>
                 <td>
-                  <para style="terp_default_8_right_bold"><u>[[  move_sum_quantity(o.id,data['form']['date1'],data['form']['date2']) or '0.0']]</u></para>
+                  <para style="terp_default_8_right_bold"><u>[[  formatLang(move_sum_quantity(o.id,data['form']['date1'],data['form']['date2'])) ]]</u></para>
                 </td>
               </tr>
               <tr>
@@ -174,16 +174,16 @@
                   <para style="terp_default_8">[[ move_g['name']  ]]</para>
                 </td>
                 <td>
-                  <para style="terp_default_Right_8">[[ move_g['debit'] or '0.0']]</para>
+                  <para style="terp_default_Right_8">[[ formatLang(move_g['debit'])]]</para>
                 </td>
                 <td>
-                  <para style="terp_default_Right_8">[[ move_g['credit'] or '0.0']]</para>
+                  <para style="terp_default_Right_8">[[ formatLang(move_g['credit']) ]]</para>
                 </td>
                 <td>
-                  <para style="terp_default_Right_8">[[ move_g['balance'] or '0.0']]</para>
+                  <para style="terp_default_Right_8">[[ formatLang(move_g['balance'])]]</para>
                 </td>
                 <td>
-                  <para style="terp_default_Right_8">[[ (move_g['quantity'] or '0.0') ]]</para>
+                  <para style="terp_default_Right_8">[[ formatLang(move_g['quantity']) ]]</para>
                 </td>
               </tr>
             </blockTable>
diff --git a/addons/account/project/report/analytic_check.rml b/addons/account/project/report/analytic_check.rml
index 0bbc727e9f6..d38ac43adc8 100644
--- a/addons/account/project/report/analytic_check.rml
+++ b/addons/account/project/report/analytic_check.rml
@@ -141,22 +141,22 @@
         </td>
         <td></td>
         <td>
-          <para style="terp_tblheader_General_Right"><u>[[ '%.2f' % general_debit(data['form']['date1'],data['form']['date2']) ]]</u></para>
+          <para style="terp_tblheader_General_Right"><u>[[ formatLang( general_debit(data['form']['date1'],data['form']['date2'])) ]]</u></para>
         </td>
         <td>
-          <para style="terp_tblheader_General_Right"><u>[[ '%.2f' % general_credit(data['form']['date1'],data['form']['date2']) ]]</u></para>
+          <para style="terp_tblheader_General_Right"><u>[[ formatLang( general_credit(data['form']['date1'],data['form']['date2'])) ]]</u></para>
         </td>
         <td>
-          <para style="terp_tblheader_General_Right"><u>[[ '%.2f' % analytic_debit(data['form']['date1'],data['form']['date2']) ]]</u></para>
+          <para style="terp_tblheader_General_Right"><u>[[ formatLang( analytic_debit(data['form']['date1'],data['form']['date2'])) ]]</u></para>
         </td>
         <td>
-          <para style="terp_tblheader_General_Right"><u>[[ '%.2f' % analytic_credit(data['form']['date1'],data['form']['date2']) ]]</u></para>
+          <para style="terp_tblheader_General_Right"><u>[[ formatLang( analytic_credit(data['form']['date1'],data['form']['date2'])) ]]</u></para>
         </td>
         <td>
-          <para style="terp_tblheader_General_Right"><u>[[ '%.2f' % delta_debit(data['form']['date1'],data['form']['date2']) ]]</u></para>
+          <para style="terp_tblheader_General_Right"><u>[[ formatLang( delta_debit(data['form']['date1'],data['form']['date2'])) ]]</u></para>
         </td>
         <td>
-          <para style="terp_tblheader_General_Right"><u>[[ '%.2f' % delta_credit(data['form']['date1'],data['form']['date2']) ]]</u></para>
+          <para style="terp_tblheader_General_Right"><u>[[ formatLang( delta_credit(data['form']['date1'],data['form']['date2'])) ]]</u></para>
         </td>
       </tr>
       <tr>
@@ -167,22 +167,22 @@
           <para style="terp_default_8">[[ acc['name'] ]]</para>
         </td>
         <td>
-          <para style="terp_default_Right_8">[[ '%.2f' % acc['gen_debit'] ]]</para>
+          <para style="terp_default_Right_8">[[ formatLang( acc['gen_debit']) ]]</para>
         </td>
         <td>
-           <para style="terp_default_Right_8">[[ '%.2f' % acc['gen_credit'] ]]</para>
+           <para style="terp_default_Right_8">[[ formatLang( acc['gen_credit']) ]]</para>
         </td>
         <td>
-          <para style="terp_default_Right_8">[[ '%.2f' % acc['ana_debit'] ]]</para>
+          <para style="terp_default_Right_8">[[ formatLang( acc['ana_debit']) ]]</para>
         </td>
         <td>
-          <para style="terp_default_Right_8">[[ '%.2f' % acc['ana_credit'] ]]</para>
+          <para style="terp_default_Right_8">[[ formatLang( acc['ana_credit']) ]]</para>
         </td>
         <td>
-          <para style="terp_default_Right_8">[[ '%.2f' % acc['delta_debit'] ]]</para>
+          <para style="terp_default_Right_8">[[ formatLang( acc['delta_debit']) ]]</para>
         </td>
         <td>
-          <para style="terp_default_Right_8">[[ '%.2f' % acc['delta_credit'] ]]</para>
+          <para style="terp_default_Right_8">[[ formatLang( acc['delta_credit']) ]]</para>
         </td>
       </tr>
     </blockTable>
diff --git a/addons/account/project/report/analytic_journal.rml b/addons/account/project/report/analytic_journal.rml
index d7e9f391114..96383420a1f 100644
--- a/addons/account/project/report/analytic_journal.rml
+++ b/addons/account/project/report/analytic_journal.rml
@@ -83,8 +83,8 @@
     <blockTable colWidths="450.0,48.0,48.0" style="tbl_code_name">
       <tr>
   		<td><para style="total">[[ o.code ]] - [[ o.name ]]</para></td>
-        <td><para style="total_right"><u>[[ '%.2f' % sum_general(o.id,data['form']['date1'],data['form']['date2']) ]]</u></para></td>
-        <td><para style="total_right"><u>[[ '%.2f' % sum_analytic(o.id,data['form']['date1'],data['form']['date2']) ]]</u></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>
       </tr>
     </blockTable>
     
@@ -99,7 +99,7 @@
         <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"></para></td>
-        <td><para style="tbl_content_right">[[ '%.2f' % (move.debit-move.credit) ]]</para></td>
+        <td><para style="tbl_content_right">[[ formatLang(move.debit-move.credit) ]]</para></td>
         
       </tr>
     </blockTable>
@@ -108,13 +108,13 @@
         <tr> 
           <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">[[ move_a.date ]]</para>
+              <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">[[ '%.2f' % move_a.amount ]]</para></td>
+          <td><para style="tbl_content_right">[[ formatLang( move_a.amount) ]]</para></td>
         
         </tr>
     </blockTable>
@@ -124,12 +124,12 @@
     
       <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">[[ move_a.date ]]</para></td>
+        <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">[[ '%.2f' % move_a.amount ]]</para></td>
+        <td><para style="tbl_content_right">[[ formatLang( move_a.amount) ]]</para></td>
         
       </tr>
     </blockTable>
diff --git a/addons/account/project/report/quantity_cost_ledger.rml b/addons/account/project/report/quantity_cost_ledger.rml
index 42fb7330a07..5c7e9331078 100644
--- a/addons/account/project/report/quantity_cost_ledger.rml
+++ b/addons/account/project/report/quantity_cost_ledger.rml
@@ -3,30 +3,6 @@
   <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>
-				<setFont name="Helvetica-Bold" size="9"/>
-
-
-				<!--COL 1-->
-				<drawString x="1.0cm" y="28.1cm">[[ company.name ]]</drawString>
-				<drawRightString x="20cm" y="28.1cm">Cost Ledger - [[ 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>   
     </pageTemplate>
   </template>
   <stylesheet>
@@ -69,7 +45,10 @@
     <blockTableStyle id="Table_Header_Move_Line">
       <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="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"/>
     </blockTableStyle>
     <blockTableStyle id="Table_Final_Total">
       <blockAlignment value="LEFT"/>
@@ -78,29 +57,28 @@
       <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="Table_Account_Detail">
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
-      <lineStyle kind="LINEBELOW" colorName="#b3b3b3" start="0,0" stop="-1,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="2,-1" stop="2,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="3,-1" stop="3,-1"/>
     </blockTableStyle>
     <blockTableStyle id="Table_Analytical_Detail">
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="0,0" stop="2,2"/>
-      <lineStyle kind="LINEBELOW" colorName="white" start="0,1" stop="-1,1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
     </blockTableStyle>
     <blockTableStyle id="Table_Move_Line_Content">
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
-      <lineStyle kind="LINEBELOW" colorName="white" start="0,0" stop="1,1"/>
     </blockTableStyle>
     <initialize>
       <paraStyle name="all" alignment="justify"/>
     </initialize>
-    <paraStyle name="P1" fontName="Times-Bold" fontSize="10.0" leading="13" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.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"/>
@@ -114,13 +92,13 @@
     <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" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_tblheader_Details" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="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" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
-    <paraStyle name="terp_tblheader_Details_Right" fontName="Helvetica" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_tblheader_Details_Centre" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
+    <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="12.0" leading="15" alignment="RIGHT" spaceBefore="12.0" spaceAfter="6.0"/>
@@ -132,30 +110,30 @@
     <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_Bold_9_Right" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_default_Bold_9_Center" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_default_9_Italic" fontName="Times-Italic" fontSize="8.0" leading="7" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_default_9_Italic_Center" fontName="Times-Italic" fontSize="8.0" leading="7" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_default_9_Italic_Right" fontName="Times-Italic" fontSize="8.0" leading="7" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_default_Rignt_9_U" fontName="Helvetica" fontSize="9.0" leading="7" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_default_Bold_9_Right_U" fontName="Helvetica-Bold" fontSize="9.0" leading="7" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_9_Italic" fontName="Times-Italic" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_9_Italic_Right" fontName="Times-Italic" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Rignt_9_U" fontName="Helvetica" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Bold_9_Right_U" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
   </stylesheet>
   <images/>
   <story>
-    <!--blockTable colWidths="161.0,161.0,161.0" repeatRows="1" style="Table_Header_Detail">
+    <blockTable colWidths="161.0,161.0,161.0" repeatRows="1" style="Table_Header_Detail">
       <tr>
         <td>
-          <para style="terp_default_9">[[ company.name ]]</para>
-        </td>
-        <td>
           <para style="terp_default_9">
             <font color="white"> </font>
           </para>
         </td>
         <td>
-          <para style="terp_header_Right">Cost Ledger-[[ company.currency_id.name ]]</para>
+          <para style="terp_header_Centre">Cost Ledger</para>
+        </td>
+        <td>
+          <para style="terp_header_Right">
+            <font color="white"> </font>
+          </para>
         </td>
       </tr>
-    </blockTable-->
+    </blockTable>
     <para style="terp_default_8">
       <font color="white"> </font>
     </para>
@@ -181,13 +159,13 @@
     <blockTable colWidths="161.0,161.0,161.0" style="Table_Date_Content">
       <tr>
         <td>
-          <para style="terp_default_Centre_8">[[ data['form']['date1'] ]]</para>
+          <para style="terp_tblheader_General_Centre">[[ formatLang(data['form']['date1'],date = True) ]]</para>
         </td>
         <td>
-          <para style="terp_default_Centre_8">[[ data['form']['date2'] ]]</para>
+          <para style="terp_tblheader_General_Centre">[[ formatLang(data['form']['date2'],date = True) ]]</para>
         </td>
         <td>
-          <para style="terp_default_Centre_8">[[ time.strftime('%Y-%m-%d') ]] at [[ time.strftime('%H:%M:%S') ]]</para>
+          <para style="terp_tblheader_General_Centre">[[ formatLang(time.strftime('%Y-%m-%d %H:%M:%S'),date_time = True) ]]</para>
         </td>
       </tr>
     </blockTable>
@@ -197,11 +175,10 @@
     <para style="terp_default_8">
       <font color="white"> </font>
     </para>
-    <section>
-    <blockTable colWidths="77.0,305.0,45.0,58.0" style="Table_Header_Move_Line" repeatRows="1">
+    <blockTable colWidths="82.0,247.0,92.0,60.0" style="Table_Header_Move_Line">
       <tr>
         <td>
-          <para style="terp_tblheader_Details_Centre">Code/Date</para>
+          <para style="terp_tblheader_Details">Code/Date</para>
         </td>
         <td>
           <para style="terp_tblheader_Details">J.C./Move name</para>
@@ -213,92 +190,105 @@
           <para style="terp_tblheader_Details_Right">Total</para>
         </td>
       </tr>
-      
-	  <tr>
-	  <td>
-    	<blockTable colWidths="69.0,298.0,115.0" style="Table_Final_Total">
-	      <tr>
-	        <td>
-	          <para style="terp_default_Bold_9_Center">Total:</para>
-	        </td>
-	        <td>
-	          <para style="terp_default_Bold_9"><font color="white"> </font></para>
-	        </td>
-	        <td>
-	          <para style="terp_default_Bold_9_Right_U">[[ '%.2f' % (sum_quantity(objects,data['form']['date1'],data['form']['date2'], data['form']['journal']) or 0.0) ]]</para>
-	        </td>
-	      </tr>
-    	</blockTable>
-      </td>
-      </tr>
-      
+    </blockTable>
+    <para style="terp_default_2">
+      <font color="white"> </font>
+    </para>
+    <blockTable colWidths="81.0,249.0,92.0,60.0" style="Table_Final_Total">
       <tr>
-      <td>
-		  <para style="terp_default_8">[[ repeatIn(objects,'o') ]]</para>
-      	<blockTable colWidths="67.0,291.0,55.0,70.0" style="Table_Account_Detail">
-	        <tr>
-	          <td>
-	            <para style="terp_default_Bold_9_Center">[[ o.code ]]</para>
-	          </td>
-	          <td>
-	            <para style="terp_default_Bold_9">[[ o.complete_name ]]</para>
-	          </td>
-	          <td>
-	            <para style="terp_default_Bold_9">Max.qty:[[ '%.2f' % (o.quantity_max or 0.0)]]</para>
-	          </td>
-	          <td>
-	            <para style="terp_default_Bold_9_Right_U">[[ '%.2f' % (account_sum_quantity(o.id,data['form']['date1'],data['form']['date2'], data['form']['journal']) or 0.0 )]]</para>
-	          </td>
-	        </tr>
-      		
-      		<tr>
-      		<td>
-			 	<para style="terp_default_8">[[ repeatIn(lines_g(o.id,data['form']['date1'],data['form']['date2'],data['form']['journal']),'move_g') ]]</para>
-			    <blockTable colWidths="61.0,284.0,70.0,64.0" style="Table_Analytical_Detail">
-			      <tr>
-			        <td>
-			          <para style="terp_default_Bold_9_Center">[[ move_g['code'] ]] </para>
-			        </td>
-			        <td>
-			          <para style="terp_default_Bold_9">[[ move_g['name'] ]]</para>
-			        </td>
-			        <td>
-			          <para style="terp_default_Bold_9">
-			            <font color="white"> </font>
-			          </para>
-			        </td>
-			        <td>
-			          <para style="terp_default_Bold_9_Right_U">[[ '%.2f' % (move_g['quantity'] or 0.0) ]]</para>
-			        </td>
-			      </tr>
-			 	  
-			 	  <tr>
-			 	  <td>
-			        <blockTable colWidths="55.0,327.0,89.0" style="Table_Move_Line_Content">
-			          <tr>
-			            <td>
-			              <para style="terp_default_9_Italic_Center">[[ repeatIn(lines_a(move_g['id'],o.id,data['form']['date1'],data['form']['date2'],data['form']['journal']),'move_a') ]]<font>[[ move_a['date'] ]]</font></para>
-			            </td>
-			            <td>
-			              <para style="terp_default_9_Italic">[[ move_a['cj'] ]] / [[ move_a['name'] ]]</para>
-			            </td>
-			            <td>
-			              <para style="terp_default_9_Italic_Right">[[ '%.2f' % (move_a['quantity'] or 0.0 )]]</para>
-			            </td>
-			          </tr>
-			        </blockTable>
-		 		   </td>
-			       </tr>
-			     </blockTable>
-			   </td>
-			   </tr> 
-			  </blockTable>
-			 </td>
-			 </tr>
-			 <para style="terp_default_8">
-      			<font color="white"> </font>
-    	  	</para>
-		</blockTable>
+        <td>
+          <para style="terp_default_Bold_9">Total:</para>
+        </td>
+        <td>
+          <para style="terp_default_Bold_9">
+            <font color="white"> </font>
+          </para>
+        </td>
+        <td>
+          <para style="terp_default_Bold_9">
+            <font color="white"> </font>
+          </para>
+        </td>
+        <td>
+          <para style="terp_default_Bold_9_Right_U">[[ formatLang (sum_quantity(objects,data['form']['date1'],data['form']['date2'], data['form']['journal']) ) ]]</para>
+        </td>
+      </tr>
+    </blockTable>
+    <para style="terp_default_2">
+      <font color="white"> </font>
+    </para>
+    <section>
+      <para style="terp_default_8">[[ repeatIn(objects,'o') ]]</para>
+      <para style="terp_default_2">
+        <font color="white"> </font>
+      </para>
+      <blockTable colWidths="81.0,249.0,92.0,59.0" style="Table_Account_Detail">
+        <tr>
+          <td>
+            <para style="terp_default_Bold_9">[[ o.code ]]<font face="Times-Roman" size="10.0"/></para>
+          </td>
+          <td>
+            <para style="terp_default_Bold_9">[[ o.complete_name ]]<font face="Times-Roman" size="10.0"/></para>
+          </td>
+          <td>
+            <para style="terp_default_Bold_9">Max Qty: [[ formatLang (o.quantity_max )]]</para>
+          </td>
+          <td>
+            <para style="terp_default_Bold_9_Right_U">[[ formatLang (account_sum_quantity(o.id,data['form']['date1'],data['form']['date2'], data['form']['journal']) )]]</para>
+          </td>
+        </tr>
+      </blockTable>
+      <para style="terp_default_2">
+        <font color="white"> </font>
+      </para>
+      <section>
+        <para style="terp_default_8">[[ repeatIn(lines_g(o.id,data['form']['date1'],data['form']['date2'],data['form']['journal']),'move_g') ]]</para>
+        <para style="terp_default_2">
+          <font color="white"> </font>
+        </para>
+        <blockTable colWidths="81.0,342.0,59.0" style="Table_Analytical_Detail">
+          <tr>
+            <td>
+              <para style="terp_default_Bold_9">[[ move_g['code'] ]] </para>
+            </td>
+            <td>
+              <para style="terp_default_Bold_9">[[ move_g['name'] ]]</para>
+            </td>
+            <td>
+              <para style="terp_default_Bold_9_Right_U">[[ formatLang (move_g['quantity']) ]]</para>
+            </td>
+          </tr>
+        </blockTable>
+        <blockTable colWidths="81.0,51.0,290.0,59.0" style="Table_Move_Line_Content">
+          <tr>
+            <td>
+              <para style="terp_default_9_Italic">[[ repeatIn(lines_a(move_g['id'],o.id,data['form']['date1'],data['form']['date2'],data['form']['journal']),'move_a') ]]</para>
+              <para style="terp_default_9_Italic">[[ formatLang(move_a['date'],date = True) ]]</para>
+            </td>
+            <td>
+              <para style="terp_default_9_Italic">[[ move_a['cj'] ]]</para>
+            </td>
+            <td>
+              <para style="terp_default_9_Italic">[[ move_a['name'] ]]</para>
+            </td>
+            <td>
+              <para style="terp_default_9_Italic_Right">[[ formatLang (move_a['quantity'] )]]</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>
+    <para style="terp_default_2">
+      <font color="white"> </font>
+    </para>
   </story>
 </document>
diff --git a/addons/account/report/invoice.rml b/addons/account/report/invoice.rml
index 2d3ec597087..62df090ed59 100644
--- a/addons/account/report/invoice.rml
+++ b/addons/account/report/invoice.rml
@@ -258,8 +258,8 @@
       </tr>
     </blockTable>
     <para style="terp_header">Invoice [[ ((o.type == 'out_invoice' and (o.state == 'open' or o.state == 'paid')) or removeParentNode('para')) and '' ]] [[ o.number ]]</para>
-    <para style="terp_header">PRO-FORMA [[ ((o.type == 'out_invoice' and o.state == 'proforma') or removeParentNode('para')) and '' ]]</para>
-    <para style="terp_header">PRO-FORMA [[ ((o.type == 'out_invoice' and o.state == 'draft') or removeParentNode('para')) and '' ]]</para>
+    <para style="terp_header">PRO-FORMA [[ ((o.type == 'out_invoice' and o.state == 'proforma2') or removeParentNode('para')) and '' ]]</para>
+    <para style="terp_header">Draft [[ ((o.type == 'out_invoice' and o.state == 'draft') or removeParentNode('para')) and '' ]]</para>
     <para style="terp_header">Canceled Invoice [[ ((o.type == 'out_invoice' and o.state == 'cancel') or removeParentNode('para')) and '' ]]</para>
     <para style="terp_header">Refund [[ (o.type=='out_refund' or removeParentNode('para')) and '' ]] [[ o.number ]]</para>
     <para style="terp_header">Supplier Refund [[ (o.type=='in_refund' or removeParentNode('para')) and '' ]] [[ o.number ]]</para>
@@ -560,4 +560,4 @@
       <font color="white"> </font>
     </para>
   </story>
-</document>
\ No newline at end of file
+</document>
diff --git a/addons/account/wizard/wizard_account_balance_report.py b/addons/account/wizard/wizard_account_balance_report.py
index ab03f87bb98..232d2a80475 100644
--- a/addons/account/wizard/wizard_account_balance_report.py
+++ b/addons/account/wizard/wizard_account_balance_report.py
@@ -35,17 +35,17 @@ period_form = '''<?xml version="1.0"?>
     <separator string="Filters" colspan="4"/>
     <field name="state" required="True"/>
     <newline/>
-    <group attrs="{'invisible':[('state','=','byperiod'),('state','=','none')]}" colspan="4">
-        <separator string="Date Filter" colspan="4"/>
-        <field name="date_from"/>
-        <field name="date_to"/>
+    <group attrs="{'invisible':[('state','=','none')]}" colspan="4">
+        <group attrs="{'invisible':[('state','=','byperiod')]}" colspan="4">
+            <separator string="Date Filter" colspan="4"/>
+            <field name="date_from"/>
+            <field name="date_to"/>
+        </group>
+        <group attrs="{'invisible':[('state','=','bydate')]}" colspan="4">
+            <separator string="Filter on Periods" colspan="4"/>
+            <field name="periods" colspan="4" nolabel="1"/>
+        </group>
     </group>
-    <group attrs="{'invisible':[('state','=','bydate'),('state','=','none')]}" colspan="4">
-        <separator string="Filter on Periods" colspan="4"/>
-        <field name="periods" colspan="4" nolabel="1"/>
-
-    </group>
-
 </form>'''
 
 period_fields = {
diff --git a/addons/account/wizard/wizard_general_ledger_report.py b/addons/account/wizard/wizard_general_ledger_report.py
index 84ee61a7005..841f5c8d893 100644
--- a/addons/account/wizard/wizard_general_ledger_report.py
+++ b/addons/account/wizard/wizard_general_ledger_report.py
@@ -51,15 +51,16 @@ period_form = '''<?xml version="1.0"?>
     <separator string="Filters" colspan="4"/>
     <field name="state" required="True"/>
     <newline/>
-    
-    <group attrs="{'invisible':[('state','=','byperiod'),('state','=','none')]}" colspan="4">
-        <separator string="Date Filter" colspan="4"/>
-        <field name="date_from"/>
-        <field name="date_to"/>
-    </group>
-    <group attrs="{'invisible':[('state','=','bydate'),('state','=','none')]}" colspan="4">
-        <separator string="Filter on Periods" colspan="4"/>
-        <field name="periods" colspan="4" nolabel="1"/>
+    <group attrs="{'invisible':[('state','=','none')]}" colspan="4">
+        <group attrs="{'invisible':[('state','=','byperiod')]}" colspan="4">
+            <separator string="Date Filter" colspan="4"/>
+            <field name="date_from"/>
+            <field name="date_to"/>
+        </group>
+        <group attrs="{'invisible':[('state','=','bydate')]}" colspan="4">
+            <separator string="Filter on Periods" colspan="4"/>
+            <field name="periods" colspan="4" nolabel="1"/>
+        </group>
     </group>