Merge lp:~vauxoo/openerp-venezuela-localization/7.0-l10n_ve_wh_iva_third_party-dev-1704-kty into lp:openerp-venezuela-localization

[Katherine Zaoral (Vauxoo)]

[MERGE] add third party partnet to the l10n_ve_withholding_iva module.

[Katherine Zaoral (Vauxoo) (kathy-zaoral)]

waiting for runbot result.

review: Needs Information

[Katherine Zaoral (Vauxoo) (kathy-zaoral)]

runbot is green but need to make some functional test first

review: Needs Information

[lp:~vauxoo/openerp-venezuela-localization/7.0-l10n_ve_wh_iva_third_party-dev-1704-kty]

1005. By Katherine Zaoral (Vauxoo) on 2014-07-14

[FIX] bad reference to the parner_id view field from the third party domain.

1006. By Katherine Zaoral (Vauxoo) on 2014-07-15

[ADD] change the domain of the third party field.

[Katherine Zaoral (Vauxoo) (kathy-zaoral)]

this functionality is ready
runbot green
and functional tested
please @hbto review this mp

[hbto [Vauxoo] http://www.vauxoo.com (humbertoarocha)]

Looks good to me.

review: Approve

=== modified file 'l10n_ve_withholding_iva/model/wh_iva.py'
--- l10n_ve_withholding_iva/model/wh_iva.py	2014-01-08 15:21:44 +0000
+++ l10n_ve_withholding_iva/model/wh_iva.py	2014-07-15 15:05:31 +0000
@@ -287,7 +287,12 @@
             string="Fortnight",
             readonly=True, states={"draft": [("readonly",False)]},
             help="Withholding type"),
+        'third_party_id': fields.many2one(
+            'res.partner',
+            'Third Party Partner',
+            help='Third Party Partner'),
     } 
+
     _defaults = {
         'code': lambda self,cr,uid,c: self.wh_iva_seq_get(cr, uid),
         'type': _get_type,

=== modified file 'l10n_ve_withholding_iva/report/withholding_vat_report.rml'
--- l10n_ve_withholding_iva/report/withholding_vat_report.rml	2012-05-30 19:13:00 +0000
+++ l10n_ve_withholding_iva/report/withholding_vat_report.rml	2014-07-15 15:05:31 +0000
@@ -168,9 +168,9 @@
                 </blockTable>
                 <blockTable colWidths="88.6mm,88.6mm,88.7mm" style="ITEMSWHITE" >
                 <tr>
-                    <td><para style="ITEMSRIF"><b>[[ o.partner_id.name ]]</b></para></td>
-                    <td><para style="ITEMSRIF"><b>[[ (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>
-                    <td><para style="ITEMSLEFT">[[ get_partner_addr2( o.partner_id.id ) ]]</para></td>
+                    <td><para style="ITEMSRIF"><b>[[ o.third_party_id and o.third_party_id.name or o.partner_id.name ]]</b></para></td>
+                    <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>
+                    <td><para style="ITEMSLEFT">[[ get_partner_addr2( o.third_party_id and o.third_party_id.id or o.partner_id.id ) ]]</para></td>
                 </tr>
     </blockTable>
     <spacer length="5mm"/>

=== modified file 'l10n_ve_withholding_iva/view/wh_iva_view.xml'
--- l10n_ve_withholding_iva/view/wh_iva_view.xml	2014-05-14 20:07:35 +0000
+++ l10n_ve_withholding_iva/view/wh_iva_view.xml	2014-07-15 15:05:31 +0000
@@ -160,6 +160,7 @@
                             name="partner_id" 
                             on_change="onchange_lines_filter(type, partner_id, period_id, fortnight)" 
                             domain="[('supplier','=',True),('parent_id','=',False)]"/>
+                        <field name="third_party_id" domain="[('is_company','=',False),('id','!=',partner_id)]"/>
                         <field name="currency_id"/>
                         <field name="date_ret" readonly="1"/>
                         <field name="account_id" domain="[('type','=', type == 'in_invoice' and 'payable' or 'receivable'), ('company_id', '=', company_id)]"/>
@@ -213,6 +214,7 @@
                             name="partner_id" 
                             on_change="onchange_partner_id(type,partner_id)" 
                             domain="[('wh_iva_agent','=',True), ('customer','=',True), ('parent_id','=',False)]"/>
+                        <field name="third_party_id" domain="[('is_company','=',False),('id','!=',partner_id)]"/>
                         <field name="currency_id"/>
                         <field name="date_ret" attrs="{'readonly':[('state','!=','draft')]}"/>
                         <field name="account_id" domain="[('type','=', type == 'in_invoice' and 'payable' or 'receivable'), ('company_id', '=', company_id)]"/>