Merge lp:~vauxoo/openerp-mexico-localization/6.1_invoice_report_dev_carlos into lp:openerp-mexico-localization/6.1

[Juan Carlos Hernandez]

Se migro reportes a las 6.1

=== modified file 'invoice_report/report/invoice_report1.py'
--- invoice_report/report/invoice_report1.py	2011-11-19 19:36:00 +0000
+++ invoice_report/report/invoice_report1.py	2012-12-05 22:41:32 +0000
@@ -119,12 +119,12 @@
                 subq="""
                         select b.id-- devuelve los ids de voucher_line correspondientes a esa factura
                             from account_voucher a
-                            inner join account_voucher_line b
+                            join account_voucher_line b
                                 on a.id=b.voucher_id
                                 and b.amount<>0
-                            inner join account_move_line c
+                            join account_move_line c
                                 on c.id=b.move_line_id
-                            inner join account_invoice d
+                            join account_invoice d
                                 on d.move_id=c.move_id
                             where d.id=%s
                             and a.state='posted'
@@ -147,7 +147,7 @@
                                                      ('state', 'not in', ['cancel', 'proforma2', 'proforma']),
                                                      ('date_invoice', '>=', date_start),
                                                      ('date_invoice', '<=', date_end),
-                                                     ('currency_id', '=', currency_id), ] )
+                                                     ('currency_id', '=', currency_id[0],), ], )
         inv_brw= inv_obj.browse(self.cr, self.uid, inv_ids)
         self.invoice=inv_brw
         self.haber_tot = 0

=== modified file 'invoice_report/report/invoice_report1.rml'
--- invoice_report/report/invoice_report1.rml	2011-11-24 18:35:44 +0000
+++ invoice_report/report/invoice_report1.rml	2012-12-05 22:41:32 +0000
@@ -91,35 +91,28 @@
     <paraStyle name="P6" fontName="Helvetica" fontSize="9.0" leading="11"/>
     <paraStyle name="P7" fontName="Helvetica" fontSize="9.0" leading="11"/>
     <paraStyle name="P8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT"/>
-    <paraStyle name="P9" fontName="Helvetica" fontSize="7.0" leading="0"/>
-    <paraStyle name="P9_7" fontName="Helvetica" fontSize="7.0" leading="7"/>
-    <paraStyle name="P10" fontName="Helvetica" fontSize="7.0" leading="0" alignment="RIGHT"/>
-    <paraStyle name="P10_7" fontName="Helvetica" fontSize="7.0" leading="7" alignment="RIGHT"/>
+    <paraStyle name="P9" fontName="Helvetica" fontSize="7.0" leading="9"/>
+    <paraStyle name="P10" fontName="Helvetica" fontSize="7.0" leading="9" alignment="RIGHT"/>
     <paraStyle name="P11" fontName="Helvetica" fontSize="7.0" leading="9"/>
-    <paraStyle name="P12" fontName="Helvetica" fontSize="10.0" leading="13"/>
+    <paraStyle name="P12" fontName="Helvetica" fontSize="7.0" leading="9"/>
     <paraStyle name="P13" fontName="Helvetica" fontSize="10.0" leading="13"/>
-    <paraStyle name="P14" fontName="Helvetica" fontSize="6.0" leading="8"/>
-    <paraStyle name="P15" fontName="Helvetica" fontSize="6.0" leading="8" alignment="RIGHT"/>
-    <paraStyle name="P16" fontName="Helvetica" fontSize="2.0" leading="3"/>
+    <paraStyle name="P14" fontName="Helvetica" fontSize="10.0" leading="13"/>
+    <paraStyle name="P15" fontName="Helvetica" fontSize="6.0" leading="8"/>
+    <paraStyle name="P16" fontName="Helvetica" fontSize="6.0" leading="8" alignment="RIGHT"/>
     <paraStyle name="P17" fontName="Helvetica" fontSize="2.0" leading="3"/>
     <paraStyle name="P18" fontName="Helvetica" fontSize="2.0" leading="3"/>
-    <paraStyle name="P19" fontName="Helvetica" fontSize="2.0" leading="3" alignment="RIGHT"/>
-    <paraStyle name="P20" fontName="Helvetica" fontSize="10.0" leading="13" alignment="RIGHT"/>
-    <paraStyle name="P21" fontName="Helvetica" fontSize="2.0" leading="3"/>
-    <paraStyle name="P22" fontName="Helvetica" fontSize="9.0" leading="11"/>
-    <paraStyle name="P23" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="10.0" leading="13"/>
-    <paraStyle name="P24" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="6.0" leading="8"/>
-    <paraStyle name="P25" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="8.0" leading="10"/>
-    <paraStyle name="P26" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="9.0" leading="11"/>
-    <paraStyle name="P27" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="7.0" leading="0"/>
-    <paraStyle name="P28" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="7.0" leading="0"/>
+    <paraStyle name="P19" fontName="Helvetica" fontSize="2.0" leading="3"/>
+    <paraStyle name="P20" fontName="Helvetica" fontSize="2.0" leading="3" alignment="RIGHT"/>
+    <paraStyle name="P21" fontName="Helvetica" fontSize="10.0" leading="13" alignment="RIGHT"/>
+    <paraStyle name="P22" fontName="Helvetica" fontSize="2.0" leading="3"/>
+    <paraStyle name="P23" fontName="Helvetica" fontSize="9.0" leading="11"/>
+    <paraStyle name="P24" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="10.0" leading="13"/>
+    <paraStyle name="P25" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="6.0" leading="8"/>
+    <paraStyle name="P26" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="8.0" leading="10"/>
+    <paraStyle name="P27" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="9.0" leading="11"/>
+    <paraStyle name="P28" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="7.0" leading="9"/>
     <paraStyle name="P29" rightIndent="0.0" leftIndent="-3.0" fontName="Helvetica" fontSize="9.0" leading="11"/>
-    <paraStyle name="P30" fontName="Helvetica" fontSize="7.0" leading="9"/>
-    <paraStyle name="P31" fontName="Helvetica" fontSize="9.0" leading="11"/>
-    <paraStyle name="P32" fontName="Helvetica" fontSize="9.0" leading="11" alignment="CENTER"/>
-    <paraStyle name="P33" fontName="Helvetica" fontSize="2.0" leading="3"/>
-    <paraStyle name="P34" fontName="Helvetica" fontSize="9.0" leading="11"/>
-    <paraStyle name="P35" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT"/>
+    <paraStyle name="P30" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="7.0" leading="9"/>
     <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"/>
@@ -131,16 +124,16 @@
     <images/>
   </stylesheet>
   <story>
-    <para style="P21">
+    <para style="P22">
       <font color="white"> </font>
     </para>
     <blockTable colWidths="303.0,303.0" style="Tabla8">
       <tr>
         <td>
-          <para style="P24">[[ repeatIn(objects,'o') ]] <font face="Helvetica" size="10.0">[[ get_company(data['uid']).company_id.name ]]</font></para>
+          <para style="P25">[[ repeatIn(objects,'o') ]] <font face="Helvetica" size="10.0">[[ get_company(data['uid']).company_id.name ]]</font></para>
         </td>
         <td>
-          <para style="P20">
+          <para style="P21">
             <font color="white"> </font>
           </para>
         </td>
@@ -149,20 +142,20 @@
     <blockTable colWidths="114.0,249.0,242.0" style="Tabla7">
       <tr>
         <td>
-          <para style="P26">Estado de cuenta de: </para>
-        </td>
-        <td>
-          <para style="P23">[[o.name]]</para>
-          <para style="P25">[[ get_address(o.id).street ]]</para>
-          <para style="P25">[[ get_address(o.id).street2 ]]</para>
-          <para style="P25">[[ get_address(o.id).zip ]]</para>
-        </td>
-        <td>
-          <para style="P12">
+          <para style="P27">Estado de cuenta de: </para>
+        </td>
+        <td>
+          <para style="P24">[[o.name]]</para>
+          <para style="P26">[[ get_address(o.id).street ]]</para>
+          <para style="P26">[[ get_address(o.id).street2 ]]</para>
+          <para style="P26">[[ get_address(o.id).zip ]]</para>
+        </td>
+        <td>
+          <para style="P13">
             <font face="Helvetica" size="9.0">RFC: [[o.vat ]]</font>
           </para>
           <para style="P6">Moneda: [[ get_currency(data['form']['currency_id']).name ]]</para>
-          <para style="P12">
+          <para style="P13">
             <font face="Helvetica" size="9.0">Fecha Impresion:</font>
             <font face="Helvetica" size="9.0"> [[ time.strftime("%Y-%m-%d ") ]]</font>
           </para>
@@ -176,7 +169,7 @@
         </td>
       </tr>
     </blockTable>
-    <blockTable colWidths="92.0,57.0,117.0,72.0,75.0,65.0,140.0" style="Tabla3">
+    <blockTable colWidths="96.0,57.0,117.0,72.0,76.0,63.0,118.0" style="Tabla3">
       <tr>
         <td>
           <para style="P1">Fecha</para>
@@ -208,14 +201,14 @@
         </td>
       </tr>
     </blockTable>
-    <blockTable rowHeights="1cm" colWidths="92.0,57.0,117.0,72.0,75.0,65.0,140.0" style="Tabla5">
+    <blockTable colWidths="99.0,56.0,117.0,73.0,74.0,65.0,120.0" style="Tabla5">
       <tr>
         <td>
-          <para style="P13">[[ repeatIn(get_invoice(o.id, data['form']['date_start'], data['form']['date_end'], data['form']['currency_id'] ),'inv') ]]</para>
-          <blockTable colWidths="92.0,57.0,117.0,72.0,75.0,65.0,180.0" style="Tabla6">
+          <para style="P14">[[ repeatIn(get_invoice(o.id, data['form']['date_start'], data['form']['date_end'], data['form']['currency_id'] ),'inv') ]]</para>
+          <blockTable colWidths="92.0,57.0,117.0,72.0,75.0,65.0,120.0" style="Tabla6">
             <tr>
               <td>
-                <para style="P27">[[ inv.date_invoice ]]</para>
+                <para style="P28">[[ inv.date_invoice ]]</para>
               </td>
               <td>
                 <para style="P9">[[inv.date_due]]</para>
@@ -242,7 +235,7 @@
             </tr>
             <tr>
               <td>
-                <para style="P28">[[m.voucher_id.date]]</para>
+                <para style="P30"><font face="Helvetica">[[ repeatIn(get_invoice(o.id, data['form']['date_start'], data['form']['date_end'], data['form']['currency_id'] ),'inv') ]]</font>[[m.voucher_id.date]]</para>
               </td>
               <td>
                 <para style="P9">
@@ -345,11 +338,14 @@
         </td>
       </tr>
     </blockTable>
+    <para style="Standard">
+      <font color="white"> </font>
+    </para>
     <para style="Standard">Movimientos</para>
     <para style="Standard">
       <font color="white"> </font>
     </para>
-    <blockTable colWidths="64.0,46.0,147.0,59.0,62.0,105.0,126.0" style="Tabla10">
+    <blockTable colWidths="61.0,46.0,147.0,59.0,62.0,105.0,126.0" style="Tabla10">
       <tr>
         <td>
           <para style="P1">Fecha mov</para>
@@ -376,72 +372,72 @@
         </td>
       </tr>
     </blockTable>
-    <para style="P5">===================================================================================================</para>
-    <blockTable rowHeights="0.6cm" colWidths="605.0" style="Tablamovs">
+    <para style="P23">---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------</para>
+    <blockTable colWidths="605.0" style="Tablamovs">
       <tr>
         <td>
-          <para style="P14">[[repeatIn(get_mov_sin_fact(o.id, data['form']['date_start'], data['form']['date_end'] ),'move_l') ]]</para>
+          <para style="P15">[[repeatIn(get_mov_sin_fact(o.id, data['form']['date_start'], data['form']['date_end'] ),'move_l') ]]</para>
           <blockTable colWidths="59.0,46.0,146.0,59.0,62.0,219.0,9.0" style="Tabla1">
             <tr>
               <td>
-                <para style="P30">[[ move_l.move_id.date ]]</para>
-              </td>
-              <td>
-                <para style="P9_7">[[ move_l.reconcile_id.id and 'Conciliado' or '' ]]</para>
-              </td>
-              <td>
-                <para style="P9_7">Cta – [[move_l.account_id.name]]</para>
-              </td>
-              <td>
-                <para style="P10_7">[[ formatLang(move_l.debit) ]]</para>
-              </td>
-              <td>
-                <para style="P10_7">[[ formatLang(move_l.credit) ]]</para>
-              </td>
-              <td>
-                <para style="P9_7">[[ move_l.move_id.id ]] - [[ move_l.move_id.name ]]</para>
-              </td>
-              <td>
-                <para style="P9_7">
+                <para style="P12">[[ move_l.move_id.date ]]</para>
+              </td>
+              <td>
+                <para style="P9">[[ move_l.reconcile_id.id and 'Conciliado' or '' ]]</para>
+              </td>
+              <td>
+                <para style="P9">Cta – [[move_l.account_id.name]]</para>
+              </td>
+              <td>
+                <para style="P10">[[ formatLang(move_l.debit) ]]</para>
+              </td>
+              <td>
+                <para style="P10">[[ formatLang(move_l.credit) ]]</para>
+              </td>
+              <td>
+                <para style="P9">[[ move_l.move_id.id ]] - [[ move_l.move_id.name ]]</para>
+              </td>
+              <td>
+                <para style="P9">
                   <font color="white"> </font>
                 </para>
               </td>
             </tr>
             <tr>
               <td>
-                <para style="P16">
-                  <font color="white"> </font>
-                </para>
-              </td>
-              <td>
-                <para style="P18">
-                  <font color="white"> </font>
-                </para>
-              </td>
-              <td>
-                <para style="P18">
-                  <font color="white"> </font>
-                </para>
-              </td>
-              <td>
-                <para style="P19">[[ suma_move_debit( move_l.debit ) ]]</para>
-              </td>
-              <td>
-                <para style="P19">[[ suma_move_credit( move_l.credit ) ]]</para>
-              </td>
-              <td>
-                <para style="P19">
-                  <font color="white"> </font>
-                </para>
-              </td>
-              <td>
-                <para style="P18">
+                <para style="P17">
+                  <font color="white"> </font>
+                </para>
+              </td>
+              <td>
+                <para style="P19">
+                  <font color="white"> </font>
+                </para>
+              </td>
+              <td>
+                <para style="P19">
+                  <font color="white"> </font>
+                </para>
+              </td>
+              <td>
+                <para style="P20">[[ suma_move_debit( move_l.debit ) ]]</para>
+              </td>
+              <td>
+                <para style="P20">[[ suma_move_credit( move_l.credit ) ]]</para>
+              </td>
+              <td>
+                <para style="P20">
+                  <font color="white"> </font>
+                </para>
+              </td>
+              <td>
+                <para style="P19">
                   <font color="white"> </font>
                 </para>
               </td>
             </tr>
           </blockTable>
-          <para style="P17">
+          <para style="P18">
             <font color="white"> </font>
           </para>
         </td>
@@ -506,13 +502,13 @@
           <para style="Table Contents">Grand Total</para>
         </td>
         <td>
-          <para style="P15">[[formatLang( get_grand_debit(get_total_move_debit(), get_total_debe()) ) ]]</para>
-        </td>
-        <td>
-          <para style="P15">[[formatLang( get_grand_credit(get_total_move_credit(), get_total_haber() ) ) ]]</para>
-        </td>
-        <td>
-          <para style="P15">[[ formatLang( get_total_saldo() ) ]]</para>
+          <para style="P16">[[formatLang( get_grand_debit(get_total_move_debit(), get_total_debe()) ) ]]</para>
+        </td>
+        <td>
+          <para style="P16">[[formatLang( get_grand_credit(get_total_move_credit(), get_total_haber() ) ) ]]</para>
+        </td>
+        <td>
+          <para style="P16">[[ formatLang( get_total_saldo() ) ]]</para>
         </td>
         <td>
           <para style="Table Contents">

=== modified file 'invoice_report/report/invoice_report1.sxw'
Binary files invoice_report/report/invoice_report1.sxw	2011-11-24 18:35:44 +0000 and invoice_report/report/invoice_report1.sxw	2012-12-05 22:41:32 +0000 differ
=== modified file 'invoice_report/report/invoice_report_pagos.py'
--- invoice_report/report/invoice_report_pagos.py	2011-11-19 19:36:00 +0000
+++ invoice_report/report/invoice_report_pagos.py	2012-12-05 22:41:32 +0000
@@ -120,7 +120,7 @@
 
     def _get_payment(self, partner_id, date_start, date_end, currency_id):
         vou_obj = self.pool.get('account.voucher')
-        vou_ids = vou_obj.search(self.cr, self.uid, [('partner_id', '=', partner_id), ('date', '>=', date_start), ('date', '<=', date_end), ('currency_id', '=', currency_id), ('state', '=', 'posted')] )
+        vou_ids = vou_obj.search(self.cr, self.uid, [('partner_id', '=', partner_id), ('date', '>=', date_start), ('date', '<=', date_end), ('payment_rate_currency_id', '=', currency_id[0]), ('state', '=', 'posted')] )
         vou_brw= vou_obj.browse(self.cr, self.uid, vou_ids)
         self.vou_brw=vou_brw
         self.total_final_pagado=0