Openerp Venezuela

Merge lp:~vauxoo/openerp-venezuela-localization/7.0-l10n_ve_withholding_iva-rev-2161-kty into lp:openerp-venezuela-localization

  1. 7.0-l10n_ve_withholding_iva-rev-2161-kty
  2. Merge into trunk
Proposed by Katherine Zaoral (Vauxoo)
Status: Needs review
Proposed branch: lp:~vauxoo/openerp-venezuela-localization/7.0-l10n_ve_withholding_iva-rev-2161-kty
Merge into: lp:openerp-venezuela-localization
Diff against target: 29 lines (+6/-6)
1 file modified
l10n_ve_withholding_iva/report/withholding_vat_report.rml (+6/-6)
To merge this branch: bzr merge lp:~vauxoo/openerp-venezuela-localization/7.0-l10n_ve_withholding_iva-rev-2161-kty
Reviewer Review Type Date Requested Status
Katherine Zaoral (Vauxoo) Approve
hbto [Vauxoo] http://www.vauxoo.com Pending
Review via email: mp+233930@code.launchpad.net

Description of the change

[MERGE] change the withholding iva report when is a supplier withholding.

To post a comment you must log in.
Revision history for this message
Katherine Zaoral (Vauxoo) (kathy-zaoral) wrote :

waiting for runbot

Reply
Revision history for this message
Katherine Zaoral (Vauxoo) (kathy-zaoral) wrote :

runbot green.
waiting for functional test

Reply
lp:~vauxoo/openerp-venezuela-localization/7.0-l10n_ve_withholding_iva-rev-2161-kty updated
1015. By Katherine Zaoral (Vauxoo)

[FIX] print the third party name.

1016. By Katherine Zaoral (Vauxoo)

[FIX] missing reference to object.

Revision history for this message
Katherine Zaoral (Vauxoo) (kathy-zaoral) wrote :

some fiexes needed was made

Reply
Revision history for this message
Katherine Zaoral (Vauxoo) (kathy-zaoral) wrote :

@htbo please review this mp

Reply
Revision history for this message
Katherine Zaoral (Vauxoo) (kathy-zaoral) wrote :

LGTM

review: Approve
Reply

Unmerged revisions

1016. By Katherine Zaoral (Vauxoo)

[FIX] missing reference to object.

1015. By Katherine Zaoral (Vauxoo)

[FIX] print the third party name.

1014. By Katherine Zaoral (Vauxoo)

[ADD] manage the iva retention report different for the supplier retentions.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'l10n_ve_withholding_iva/report/withholding_vat_report.rml'
2--- l10n_ve_withholding_iva/report/withholding_vat_report.rml 2014-07-14 17:08:41 +0000
3+++ l10n_ve_withholding_iva/report/withholding_vat_report.rml 2014-09-09 21:28:55 +0000
4@@ -145,9 +145,9 @@
5 </blockTable>
6 <blockTable colWidths="88.6mm,88.6mm,88.7mm" style="ITEMSWHITE" rowHeights="15mm">
7 <tr>
8- <td><para style="ITEMSRIF"><b>[[ o.company_id.partner_id.name ]]</b></para></td>
9- <td><para style="ITEMSRIF"><b>[[ (o.company_id.partner_id.vat and ('%s-%s-%s'%(o.company_id.partner_id.vat[2:3],o.company_id.partner_id.vat[3:11],o.company_id.partner_id.vat[11:12])) or removeParentNode('para')) ]]</b></para></td>
10- <td><para style="ITEMSLEFT"><b>[[ get_partner_addr2(o.company_id.partner_id.id) or '' ]]</b></para></td>
11+ <td><para style="ITEMSRIF"><b>[[ (o.type == 'in_invoice' and o.third_party_id) and o.third_party_id.name or o.company_id.partner_id.name ]]</b></para></td>
12+ <td><para style="ITEMSRIF"><b>[[ (o.type == 'in_invoice' and o.third_party_id) and (o.third_party_id.vat and ('%s-%s-%s'%(o.third_party_id.vat[2:3],o.third_party_id.vat[3:11],o.third_party_id.vat[11:12])) or removeParentNode('para')) or (o.company_id.partner_id.vat and ('%s-%s-%s'%(o.company_id.partner_id.vat[2:3],o.company_id.partner_id.vat[3:11],o.company_id.partner_id.vat[11:12])) or removeParentNode('para')) ]]</b></para></td>
13+ <td><para style="ITEMSLEFT"><b>[[ (o.type == 'in_invoice' and o.third_party_id) and (get_partner_addr2(o.third_party_id.id) or '') or (get_partner_addr2(o.company_id.partner_id.id) or '') ]]</b></para></td>
14 </tr>
15 </blockTable>
16
17@@ -168,9 +168,9 @@
18 </blockTable>
19 <blockTable colWidths="88.6mm,88.6mm,88.7mm" style="ITEMSWHITE" >
20 <tr>
21- <td><para style="ITEMSRIF"><b>[[ o.third_party_id and o.third_party_id.name or o.partner_id.name ]]</b></para></td>
22- <td><para style="ITEMSRIF"><b>[[ o.third_party_id and o.third_party_id.vat and ('%s-%s-%s'%(o.third_party_id.vat[2:3],o.third_party_id.vat[3:11],o.third_party_id.vat[11:12])) or o.partner_id.vat and ('%s-%s-%s'%(o.partner_id.vat[2:3],o.partner_id.vat[3:11],o.partner_id.vat[11:12])) or removeParentNode('para') ]]</b></para></td>
23- <td><para style="ITEMSLEFT">[[ get_partner_addr2( o.third_party_id and o.third_party_id.id or o.partner_id.id ) ]]</para></td>
24+ <td><para style="ITEMSRIF"><b>[[ (o.type == 'out_invoice') and (o.third_party_id and o.third_party_id.name or o.partner_id.name) or (o.partner_id and o.partner_id.name) ]]</b></para></td>
25+ <td><para style="ITEMSRIF"><b>[[ (o.type == 'out_invoice') and (o.third_party_id and o.third_party_id.vat and ('%s-%s-%s'%(o.third_party_id.vat[2:3],o.third_party_id.vat[3:11],o.third_party_id.vat[11:12])) or o.partner_id.vat and ('%s-%s-%s'%(o.partner_id.vat[2:3],o.partner_id.vat[3:11],o.partner_id.vat[11:12])) or removeParentNode('para')) or (o.partner_id and o.partner_id.vat and ('%s-%s-%s'%(o.partner_id.vat[2:3],o.partner_id.vat[3:11],o.partner_id.vat[11:12])) or removeParentNode('para')) ]]</b></para></td>
26+ <td><para style="ITEMSLEFT">[[ (o.type == 'out_invoice') and get_partner_addr2( o.third_party_id and o.third_party_id.id or o.partner_id.id ) or get_partner_addr2( o.partner_id and o.partner_id.id ) ]]</para></td>
27 </tr>
28 </blockTable>
29 <spacer length="5mm"/>