Merge lp:~vauxoo/openerp-mexico-localization/6.1_invoice_report_dev_carlos into lp:openerp-mexico-localization/6.1
- 6.1_invoice_report_dev_carlos
- Merge into 6.1
Proposed by
Juan Carlos Hernandez
| Status: | Merged |
|---|---|
| Merged at revision: | 211 |
| Proposed branch: | lp:~vauxoo/openerp-mexico-localization/6.1_invoice_report_dev_carlos |
| Merge into: | lp:openerp-mexico-localization/6.1 |
| Diff against target: |
349 lines (+103/-107) 3 files modified
invoice_report/report/invoice_report1.py (+4/-4) invoice_report/report/invoice_report1.rml (+98/-102) invoice_report/report/invoice_report_pagos.py (+1/-1) |
| To merge this branch: | bzr merge lp:~vauxoo/openerp-mexico-localization/6.1_invoice_report_dev_carlos |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Rodolfo Lopez | Pending | ||
| Isaac López Zúñiga | Pending | ||
| Moisés López - http://www.vauxoo.com | Pending | ||
|
Review via email:
|
|||
Commit message
Description of the change
Se migro reportes a las 6.1
To post a comment you must log in.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
| 1 | === modified file 'invoice_report/report/invoice_report1.py' | |||
| 2 | --- invoice_report/report/invoice_report1.py 2011-11-19 19:36:00 +0000 | |||
| 3 | +++ invoice_report/report/invoice_report1.py 2012-12-05 22:41:32 +0000 | |||
| 4 | @@ -119,12 +119,12 @@ | |||
| 5 | 119 | subq=""" | 119 | subq=""" |
| 6 | 120 | select b.id-- devuelve los ids de voucher_line correspondientes a esa factura | 120 | select b.id-- devuelve los ids de voucher_line correspondientes a esa factura |
| 7 | 121 | from account_voucher a | 121 | from account_voucher a |
| 9 | 122 | inner join account_voucher_line b | 122 | join account_voucher_line b |
| 10 | 123 | on a.id=b.voucher_id | 123 | on a.id=b.voucher_id |
| 11 | 124 | and b.amount<>0 | 124 | and b.amount<>0 |
| 13 | 125 | inner join account_move_line c | 125 | join account_move_line c |
| 14 | 126 | on c.id=b.move_line_id | 126 | on c.id=b.move_line_id |
| 16 | 127 | inner join account_invoice d | 127 | join account_invoice d |
| 17 | 128 | on d.move_id=c.move_id | 128 | on d.move_id=c.move_id |
| 18 | 129 | where d.id=%s | 129 | where d.id=%s |
| 19 | 130 | and a.state='posted' | 130 | and a.state='posted' |
| 20 | @@ -147,7 +147,7 @@ | |||
| 21 | 147 | ('state', 'not in', ['cancel', 'proforma2', 'proforma']), | 147 | ('state', 'not in', ['cancel', 'proforma2', 'proforma']), |
| 22 | 148 | ('date_invoice', '>=', date_start), | 148 | ('date_invoice', '>=', date_start), |
| 23 | 149 | ('date_invoice', '<=', date_end), | 149 | ('date_invoice', '<=', date_end), |
| 25 | 150 | ('currency_id', '=', currency_id), ] ) | 150 | ('currency_id', '=', currency_id[0],), ], ) |
| 26 | 151 | inv_brw= inv_obj.browse(self.cr, self.uid, inv_ids) | 151 | inv_brw= inv_obj.browse(self.cr, self.uid, inv_ids) |
| 27 | 152 | self.invoice=inv_brw | 152 | self.invoice=inv_brw |
| 28 | 153 | self.haber_tot = 0 | 153 | self.haber_tot = 0 |
| 29 | 154 | 154 | ||
| 30 | === modified file 'invoice_report/report/invoice_report1.rml' | |||
| 31 | --- invoice_report/report/invoice_report1.rml 2011-11-24 18:35:44 +0000 | |||
| 32 | +++ invoice_report/report/invoice_report1.rml 2012-12-05 22:41:32 +0000 | |||
| 33 | @@ -91,35 +91,28 @@ | |||
| 34 | 91 | <paraStyle name="P6" fontName="Helvetica" fontSize="9.0" leading="11"/> | 91 | <paraStyle name="P6" fontName="Helvetica" fontSize="9.0" leading="11"/> |
| 35 | 92 | <paraStyle name="P7" fontName="Helvetica" fontSize="9.0" leading="11"/> | 92 | <paraStyle name="P7" fontName="Helvetica" fontSize="9.0" leading="11"/> |
| 36 | 93 | <paraStyle name="P8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT"/> | 93 | <paraStyle name="P8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT"/> |
| 41 | 94 | <paraStyle name="P9" fontName="Helvetica" fontSize="7.0" leading="0"/> | 94 | <paraStyle name="P9" fontName="Helvetica" fontSize="7.0" leading="9"/> |
| 42 | 95 | <paraStyle name="P9_7" fontName="Helvetica" fontSize="7.0" leading="7"/> | 95 | <paraStyle name="P10" fontName="Helvetica" fontSize="7.0" leading="9" alignment="RIGHT"/> |
| 39 | 96 | <paraStyle name="P10" fontName="Helvetica" fontSize="7.0" leading="0" alignment="RIGHT"/> | ||
| 40 | 97 | <paraStyle name="P10_7" fontName="Helvetica" fontSize="7.0" leading="7" alignment="RIGHT"/> | ||
| 43 | 98 | <paraStyle name="P11" fontName="Helvetica" fontSize="7.0" leading="9"/> | 96 | <paraStyle name="P11" fontName="Helvetica" fontSize="7.0" leading="9"/> |
| 45 | 99 | <paraStyle name="P12" fontName="Helvetica" fontSize="10.0" leading="13"/> | 97 | <paraStyle name="P12" fontName="Helvetica" fontSize="7.0" leading="9"/> |
| 46 | 100 | <paraStyle name="P13" fontName="Helvetica" fontSize="10.0" leading="13"/> | 98 | <paraStyle name="P13" fontName="Helvetica" fontSize="10.0" leading="13"/> |
| 50 | 101 | <paraStyle name="P14" fontName="Helvetica" fontSize="6.0" leading="8"/> | 99 | <paraStyle name="P14" fontName="Helvetica" fontSize="10.0" leading="13"/> |
| 51 | 102 | <paraStyle name="P15" fontName="Helvetica" fontSize="6.0" leading="8" alignment="RIGHT"/> | 100 | <paraStyle name="P15" fontName="Helvetica" fontSize="6.0" leading="8"/> |
| 52 | 103 | <paraStyle name="P16" fontName="Helvetica" fontSize="2.0" leading="3"/> | 101 | <paraStyle name="P16" fontName="Helvetica" fontSize="6.0" leading="8" alignment="RIGHT"/> |
| 53 | 104 | <paraStyle name="P17" fontName="Helvetica" fontSize="2.0" leading="3"/> | 102 | <paraStyle name="P17" fontName="Helvetica" fontSize="2.0" leading="3"/> |
| 54 | 105 | <paraStyle name="P18" fontName="Helvetica" fontSize="2.0" leading="3"/> | 103 | <paraStyle name="P18" fontName="Helvetica" fontSize="2.0" leading="3"/> |
| 65 | 106 | <paraStyle name="P19" fontName="Helvetica" fontSize="2.0" leading="3" alignment="RIGHT"/> | 104 | <paraStyle name="P19" fontName="Helvetica" fontSize="2.0" leading="3"/> |
| 66 | 107 | <paraStyle name="P20" fontName="Helvetica" fontSize="10.0" leading="13" alignment="RIGHT"/> | 105 | <paraStyle name="P20" fontName="Helvetica" fontSize="2.0" leading="3" alignment="RIGHT"/> |
| 67 | 108 | <paraStyle name="P21" fontName="Helvetica" fontSize="2.0" leading="3"/> | 106 | <paraStyle name="P21" fontName="Helvetica" fontSize="10.0" leading="13" alignment="RIGHT"/> |
| 68 | 109 | <paraStyle name="P22" fontName="Helvetica" fontSize="9.0" leading="11"/> | 107 | <paraStyle name="P22" fontName="Helvetica" fontSize="2.0" leading="3"/> |
| 69 | 110 | <paraStyle name="P23" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="10.0" leading="13"/> | 108 | <paraStyle name="P23" fontName="Helvetica" fontSize="9.0" leading="11"/> |
| 70 | 111 | <paraStyle name="P24" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="6.0" leading="8"/> | 109 | <paraStyle name="P24" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="10.0" leading="13"/> |
| 71 | 112 | <paraStyle name="P25" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="8.0" leading="10"/> | 110 | <paraStyle name="P25" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="6.0" leading="8"/> |
| 72 | 113 | <paraStyle name="P26" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="9.0" leading="11"/> | 111 | <paraStyle name="P26" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="8.0" leading="10"/> |
| 73 | 114 | <paraStyle name="P27" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="7.0" leading="0"/> | 112 | <paraStyle name="P27" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="9.0" leading="11"/> |
| 74 | 115 | <paraStyle name="P28" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="7.0" leading="0"/> | 113 | <paraStyle name="P28" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="7.0" leading="9"/> |
| 75 | 116 | <paraStyle name="P29" rightIndent="0.0" leftIndent="-3.0" fontName="Helvetica" fontSize="9.0" leading="11"/> | 114 | <paraStyle name="P29" rightIndent="0.0" leftIndent="-3.0" fontName="Helvetica" fontSize="9.0" leading="11"/> |
| 82 | 117 | <paraStyle name="P30" fontName="Helvetica" fontSize="7.0" leading="9"/> | 115 | <paraStyle name="P30" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="7.0" leading="9"/> |
| 77 | 118 | <paraStyle name="P31" fontName="Helvetica" fontSize="9.0" leading="11"/> | ||
| 78 | 119 | <paraStyle name="P32" fontName="Helvetica" fontSize="9.0" leading="11" alignment="CENTER"/> | ||
| 79 | 120 | <paraStyle name="P33" fontName="Helvetica" fontSize="2.0" leading="3"/> | ||
| 80 | 121 | <paraStyle name="P34" fontName="Helvetica" fontSize="9.0" leading="11"/> | ||
| 81 | 122 | <paraStyle name="P35" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT"/> | ||
| 83 | 123 | <paraStyle name="Standard" fontName="Helvetica"/> | 116 | <paraStyle name="Standard" fontName="Helvetica"/> |
| 84 | 124 | <paraStyle name="Heading" fontName="Helvetica" fontSize="14.0" leading="17" spaceBefore="12.0" spaceAfter="6.0"/> | 117 | <paraStyle name="Heading" fontName="Helvetica" fontSize="14.0" leading="17" spaceBefore="12.0" spaceAfter="6.0"/> |
| 85 | 125 | <paraStyle name="Text body" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/> | 118 | <paraStyle name="Text body" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/> |
| 86 | @@ -131,16 +124,16 @@ | |||
| 87 | 131 | <images/> | 124 | <images/> |
| 88 | 132 | </stylesheet> | 125 | </stylesheet> |
| 89 | 133 | <story> | 126 | <story> |
| 91 | 134 | <para style="P21"> | 127 | <para style="P22"> |
| 92 | 135 | <font color="white"> </font> | 128 | <font color="white"> </font> |
| 93 | 136 | </para> | 129 | </para> |
| 94 | 137 | <blockTable colWidths="303.0,303.0" style="Tabla8"> | 130 | <blockTable colWidths="303.0,303.0" style="Tabla8"> |
| 95 | 138 | <tr> | 131 | <tr> |
| 96 | 139 | <td> | 132 | <td> |
| 98 | 140 | <para style="P24">[[ repeatIn(objects,'o') ]] <font face="Helvetica" size="10.0">[[ get_company(data['uid']).company_id.name ]]</font></para> | 133 | <para style="P25">[[ repeatIn(objects,'o') ]] <font face="Helvetica" size="10.0">[[ get_company(data['uid']).company_id.name ]]</font></para> |
| 99 | 141 | </td> | 134 | </td> |
| 100 | 142 | <td> | 135 | <td> |
| 102 | 143 | <para style="P20"> | 136 | <para style="P21"> |
| 103 | 144 | <font color="white"> </font> | 137 | <font color="white"> </font> |
| 104 | 145 | </para> | 138 | </para> |
| 105 | 146 | </td> | 139 | </td> |
| 106 | @@ -149,20 +142,20 @@ | |||
| 107 | 149 | <blockTable colWidths="114.0,249.0,242.0" style="Tabla7"> | 142 | <blockTable colWidths="114.0,249.0,242.0" style="Tabla7"> |
| 108 | 150 | <tr> | 143 | <tr> |
| 109 | 151 | <td> | 144 | <td> |
| 120 | 152 | <para style="P26">Estado de cuenta de: </para> | 145 | <para style="P27">Estado de cuenta de: </para> |
| 121 | 153 | </td> | 146 | </td> |
| 122 | 154 | <td> | 147 | <td> |
| 123 | 155 | <para style="P23">[[o.name]]</para> | 148 | <para style="P24">[[o.name]]</para> |
| 124 | 156 | <para style="P25">[[ get_address(o.id).street ]]</para> | 149 | <para style="P26">[[ get_address(o.id).street ]]</para> |
| 125 | 157 | <para style="P25">[[ get_address(o.id).street2 ]]</para> | 150 | <para style="P26">[[ get_address(o.id).street2 ]]</para> |
| 126 | 158 | <para style="P25">[[ get_address(o.id).zip ]]</para> | 151 | <para style="P26">[[ get_address(o.id).zip ]]</para> |
| 127 | 159 | </td> | 152 | </td> |
| 128 | 160 | <td> | 153 | <td> |
| 129 | 161 | <para style="P12"> | 154 | <para style="P13"> |
| 130 | 162 | <font face="Helvetica" size="9.0">RFC: [[o.vat ]]</font> | 155 | <font face="Helvetica" size="9.0">RFC: [[o.vat ]]</font> |
| 131 | 163 | </para> | 156 | </para> |
| 132 | 164 | <para style="P6">Moneda: [[ get_currency(data['form']['currency_id']).name ]]</para> | 157 | <para style="P6">Moneda: [[ get_currency(data['form']['currency_id']).name ]]</para> |
| 134 | 165 | <para style="P12"> | 158 | <para style="P13"> |
| 135 | 166 | <font face="Helvetica" size="9.0">Fecha Impresion:</font> | 159 | <font face="Helvetica" size="9.0">Fecha Impresion:</font> |
| 136 | 167 | <font face="Helvetica" size="9.0"> [[ time.strftime("%Y-%m-%d ") ]]</font> | 160 | <font face="Helvetica" size="9.0"> [[ time.strftime("%Y-%m-%d ") ]]</font> |
| 137 | 168 | </para> | 161 | </para> |
| 138 | @@ -176,7 +169,7 @@ | |||
| 139 | 176 | </td> | 169 | </td> |
| 140 | 177 | </tr> | 170 | </tr> |
| 141 | 178 | </blockTable> | 171 | </blockTable> |
| 143 | 179 | <blockTable colWidths="92.0,57.0,117.0,72.0,75.0,65.0,140.0" style="Tabla3"> | 172 | <blockTable colWidths="96.0,57.0,117.0,72.0,76.0,63.0,118.0" style="Tabla3"> |
| 144 | 180 | <tr> | 173 | <tr> |
| 145 | 181 | <td> | 174 | <td> |
| 146 | 182 | <para style="P1">Fecha</para> | 175 | <para style="P1">Fecha</para> |
| 147 | @@ -208,14 +201,14 @@ | |||
| 148 | 208 | </td> | 201 | </td> |
| 149 | 209 | </tr> | 202 | </tr> |
| 150 | 210 | </blockTable> | 203 | </blockTable> |
| 152 | 211 | <blockTable rowHeights="1cm" colWidths="92.0,57.0,117.0,72.0,75.0,65.0,140.0" style="Tabla5"> | 204 | <blockTable colWidths="99.0,56.0,117.0,73.0,74.0,65.0,120.0" style="Tabla5"> |
| 153 | 212 | <tr> | 205 | <tr> |
| 154 | 213 | <td> | 206 | <td> |
| 157 | 214 | <para style="P13">[[ repeatIn(get_invoice(o.id, data['form']['date_start'], data['form']['date_end'], data['form']['currency_id'] ),'inv') ]]</para> | 207 | <para style="P14">[[ repeatIn(get_invoice(o.id, data['form']['date_start'], data['form']['date_end'], data['form']['currency_id'] ),'inv') ]]</para> |
| 158 | 215 | <blockTable colWidths="92.0,57.0,117.0,72.0,75.0,65.0,180.0" style="Tabla6"> | 208 | <blockTable colWidths="92.0,57.0,117.0,72.0,75.0,65.0,120.0" style="Tabla6"> |
| 159 | 216 | <tr> | 209 | <tr> |
| 160 | 217 | <td> | 210 | <td> |
| 162 | 218 | <para style="P27">[[ inv.date_invoice ]]</para> | 211 | <para style="P28">[[ inv.date_invoice ]]</para> |
| 163 | 219 | </td> | 212 | </td> |
| 164 | 220 | <td> | 213 | <td> |
| 165 | 221 | <para style="P9">[[inv.date_due]]</para> | 214 | <para style="P9">[[inv.date_due]]</para> |
| 166 | @@ -242,7 +235,7 @@ | |||
| 167 | 242 | </tr> | 235 | </tr> |
| 168 | 243 | <tr> | 236 | <tr> |
| 169 | 244 | <td> | 237 | <td> |
| 171 | 245 | <para style="P28">[[m.voucher_id.date]]</para> | 238 | <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> |
| 172 | 246 | </td> | 239 | </td> |
| 173 | 247 | <td> | 240 | <td> |
| 174 | 248 | <para style="P9"> | 241 | <para style="P9"> |
| 175 | @@ -345,11 +338,14 @@ | |||
| 176 | 345 | </td> | 338 | </td> |
| 177 | 346 | </tr> | 339 | </tr> |
| 178 | 347 | </blockTable> | 340 | </blockTable> |
| 179 | 341 | <para style="Standard"> | ||
| 180 | 342 | <font color="white"> </font> | ||
| 181 | 343 | </para> | ||
| 182 | 348 | <para style="Standard">Movimientos</para> | 344 | <para style="Standard">Movimientos</para> |
| 183 | 349 | <para style="Standard"> | 345 | <para style="Standard"> |
| 184 | 350 | <font color="white"> </font> | 346 | <font color="white"> </font> |
| 185 | 351 | </para> | 347 | </para> |
| 187 | 352 | <blockTable colWidths="64.0,46.0,147.0,59.0,62.0,105.0,126.0" style="Tabla10"> | 348 | <blockTable colWidths="61.0,46.0,147.0,59.0,62.0,105.0,126.0" style="Tabla10"> |
| 188 | 353 | <tr> | 349 | <tr> |
| 189 | 354 | <td> | 350 | <td> |
| 190 | 355 | <para style="P1">Fecha mov</para> | 351 | <para style="P1">Fecha mov</para> |
| 191 | @@ -376,72 +372,72 @@ | |||
| 192 | 376 | </td> | 372 | </td> |
| 193 | 377 | </tr> | 373 | </tr> |
| 194 | 378 | </blockTable> | 374 | </blockTable> |
| 197 | 379 | <para style="P5">===================================================================================================</para> | 375 | <para style="P23">---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------</para> |
| 198 | 380 | <blockTable rowHeights="0.6cm" colWidths="605.0" style="Tablamovs"> | 376 | <blockTable colWidths="605.0" style="Tablamovs"> |
| 199 | 381 | <tr> | 377 | <tr> |
| 200 | 382 | <td> | 378 | <td> |
| 202 | 383 | <para style="P14">[[repeatIn(get_mov_sin_fact(o.id, data['form']['date_start'], data['form']['date_end'] ),'move_l') ]]</para> | 379 | <para style="P15">[[repeatIn(get_mov_sin_fact(o.id, data['form']['date_start'], data['form']['date_end'] ),'move_l') ]]</para> |
| 203 | 384 | <blockTable colWidths="59.0,46.0,146.0,59.0,62.0,219.0,9.0" style="Tabla1"> | 380 | <blockTable colWidths="59.0,46.0,146.0,59.0,62.0,219.0,9.0" style="Tabla1"> |
| 204 | 385 | <tr> | 381 | <tr> |
| 205 | 386 | <td> | 382 | <td> |
| 225 | 387 | <para style="P30">[[ move_l.move_id.date ]]</para> | 383 | <para style="P12">[[ move_l.move_id.date ]]</para> |
| 226 | 388 | </td> | 384 | </td> |
| 227 | 389 | <td> | 385 | <td> |
| 228 | 390 | <para style="P9_7">[[ move_l.reconcile_id.id and 'Conciliado' or '' ]]</para> | 386 | <para style="P9">[[ move_l.reconcile_id.id and 'Conciliado' or '' ]]</para> |
| 229 | 391 | </td> | 387 | </td> |
| 230 | 392 | <td> | 388 | <td> |
| 231 | 393 | <para style="P9_7">Cta – [[move_l.account_id.name]]</para> | 389 | <para style="P9">Cta – [[move_l.account_id.name]]</para> |
| 232 | 394 | </td> | 390 | </td> |
| 233 | 395 | <td> | 391 | <td> |
| 234 | 396 | <para style="P10_7">[[ formatLang(move_l.debit) ]]</para> | 392 | <para style="P10">[[ formatLang(move_l.debit) ]]</para> |
| 235 | 397 | </td> | 393 | </td> |
| 236 | 398 | <td> | 394 | <td> |
| 237 | 399 | <para style="P10_7">[[ formatLang(move_l.credit) ]]</para> | 395 | <para style="P10">[[ formatLang(move_l.credit) ]]</para> |
| 238 | 400 | </td> | 396 | </td> |
| 239 | 401 | <td> | 397 | <td> |
| 240 | 402 | <para style="P9_7">[[ move_l.move_id.id ]] - [[ move_l.move_id.name ]]</para> | 398 | <para style="P9">[[ move_l.move_id.id ]] - [[ move_l.move_id.name ]]</para> |
| 241 | 403 | </td> | 399 | </td> |
| 242 | 404 | <td> | 400 | <td> |
| 243 | 405 | <para style="P9_7"> | 401 | <para style="P9"> |
| 244 | 406 | <font color="white"> </font> | 402 | <font color="white"> </font> |
| 245 | 407 | </para> | 403 | </para> |
| 246 | 408 | </td> | 404 | </td> |
| 247 | 409 | </tr> | 405 | </tr> |
| 248 | 410 | <tr> | 406 | <tr> |
| 249 | 411 | <td> | 407 | <td> |
| 277 | 412 | <para style="P16"> | 408 | <para style="P17"> |
| 278 | 413 | <font color="white"> </font> | 409 | <font color="white"> </font> |
| 279 | 414 | </para> | 410 | </para> |
| 280 | 415 | </td> | 411 | </td> |
| 281 | 416 | <td> | 412 | <td> |
| 282 | 417 | <para style="P18"> | 413 | <para style="P19"> |
| 283 | 418 | <font color="white"> </font> | 414 | <font color="white"> </font> |
| 284 | 419 | </para> | 415 | </para> |
| 285 | 420 | </td> | 416 | </td> |
| 286 | 421 | <td> | 417 | <td> |
| 287 | 422 | <para style="P18"> | 418 | <para style="P19"> |
| 288 | 423 | <font color="white"> </font> | 419 | <font color="white"> </font> |
| 289 | 424 | </para> | 420 | </para> |
| 290 | 425 | </td> | 421 | </td> |
| 291 | 426 | <td> | 422 | <td> |
| 292 | 427 | <para style="P19">[[ suma_move_debit( move_l.debit ) ]]</para> | 423 | <para style="P20">[[ suma_move_debit( move_l.debit ) ]]</para> |
| 293 | 428 | </td> | 424 | </td> |
| 294 | 429 | <td> | 425 | <td> |
| 295 | 430 | <para style="P19">[[ suma_move_credit( move_l.credit ) ]]</para> | 426 | <para style="P20">[[ suma_move_credit( move_l.credit ) ]]</para> |
| 296 | 431 | </td> | 427 | </td> |
| 297 | 432 | <td> | 428 | <td> |
| 298 | 433 | <para style="P19"> | 429 | <para style="P20"> |
| 299 | 434 | <font color="white"> </font> | 430 | <font color="white"> </font> |
| 300 | 435 | </para> | 431 | </para> |
| 301 | 436 | </td> | 432 | </td> |
| 302 | 437 | <td> | 433 | <td> |
| 303 | 438 | <para style="P18"> | 434 | <para style="P19"> |
| 304 | 439 | <font color="white"> </font> | 435 | <font color="white"> </font> |
| 305 | 440 | </para> | 436 | </para> |
| 306 | 441 | </td> | 437 | </td> |
| 307 | 442 | </tr> | 438 | </tr> |
| 308 | 443 | </blockTable> | 439 | </blockTable> |
| 310 | 444 | <para style="P17"> | 440 | <para style="P18"> |
| 311 | 445 | <font color="white"> </font> | 441 | <font color="white"> </font> |
| 312 | 446 | </para> | 442 | </para> |
| 313 | 447 | </td> | 443 | </td> |
| 314 | @@ -506,13 +502,13 @@ | |||
| 315 | 506 | <para style="Table Contents">Grand Total</para> | 502 | <para style="Table Contents">Grand Total</para> |
| 316 | 507 | </td> | 503 | </td> |
| 317 | 508 | <td> | 504 | <td> |
| 325 | 509 | <para style="P15">[[formatLang( get_grand_debit(get_total_move_debit(), get_total_debe()) ) ]]</para> | 505 | <para style="P16">[[formatLang( get_grand_debit(get_total_move_debit(), get_total_debe()) ) ]]</para> |
| 326 | 510 | </td> | 506 | </td> |
| 327 | 511 | <td> | 507 | <td> |
| 328 | 512 | <para style="P15">[[formatLang( get_grand_credit(get_total_move_credit(), get_total_haber() ) ) ]]</para> | 508 | <para style="P16">[[formatLang( get_grand_credit(get_total_move_credit(), get_total_haber() ) ) ]]</para> |
| 329 | 513 | </td> | 509 | </td> |
| 330 | 514 | <td> | 510 | <td> |
| 331 | 515 | <para style="P15">[[ formatLang( get_total_saldo() ) ]]</para> | 511 | <para style="P16">[[ formatLang( get_total_saldo() ) ]]</para> |
| 332 | 516 | </td> | 512 | </td> |
| 333 | 517 | <td> | 513 | <td> |
| 334 | 518 | <para style="Table Contents"> | 514 | <para style="Table Contents"> |
| 335 | 519 | 515 | ||
| 336 | === modified file 'invoice_report/report/invoice_report1.sxw' | |||
| 337 | 520 | 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 | 516 | 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 |
| 338 | === modified file 'invoice_report/report/invoice_report_pagos.py' | |||
| 339 | --- invoice_report/report/invoice_report_pagos.py 2011-11-19 19:36:00 +0000 | |||
| 340 | +++ invoice_report/report/invoice_report_pagos.py 2012-12-05 22:41:32 +0000 | |||
| 341 | @@ -120,7 +120,7 @@ | |||
| 342 | 120 | 120 | ||
| 343 | 121 | def _get_payment(self, partner_id, date_start, date_end, currency_id): | 121 | def _get_payment(self, partner_id, date_start, date_end, currency_id): |
| 344 | 122 | vou_obj = self.pool.get('account.voucher') | 122 | vou_obj = self.pool.get('account.voucher') |
| 346 | 123 | 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')] ) | 123 | 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')] ) |
| 347 | 124 | vou_brw= vou_obj.browse(self.cr, self.uid, vou_ids) | 124 | vou_brw= vou_obj.browse(self.cr, self.uid, vou_ids) |
| 348 | 125 | self.vou_brw=vou_brw | 125 | self.vou_brw=vou_brw |
| 349 | 126 | self.total_final_pagado=0 | 126 | self.total_final_pagado=0 |
