From 5a7ac2bbdbb7ef82d1d777572a7f6b02ceb2a3b9 Mon Sep 17 00:00:00 2001
From: Jigar Amin - OpenERP <jam@tinyerp.com>
Date: Wed, 7 Mar 2012 17:34:37 +0530
Subject: [PATCH] [IMP] l10n_be fixed for the invoice and res_partner_address
 clean up

bzr revid: jam@tinyerp.com-20120307120437-6aw31z2mqbgo7h0e
---
 addons/l10n_be/account_demo.xml                      | 12 ++++--------
 addons/l10n_be/wizard/l10n_be_partner_vat_listing.py |  7 +++----
 addons/l10n_be/wizard/l10n_be_vat_intra.py           |  3 +--
 3 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/addons/l10n_be/account_demo.xml b/addons/l10n_be/account_demo.xml
index 697d3c3cfef..88a59c75ab3 100644
--- a/addons/l10n_be/account_demo.xml
+++ b/addons/l10n_be/account_demo.xml
@@ -6,13 +6,12 @@
         <record id="invoice_1" model="account.invoice">
             <field name="currency_id" ref="base.EUR"/>
             <field name="company_id" ref="base.main_company"/>
-            <field name="address_invoice_id" ref="base.res_partner_address_8"/>
             <field name="partner_id" ref="base.res_partner_agrolait"/>
             <field name="journal_id" ref="account.sales_journal"/>
             <field name="state">draft</field>
             <field name="type">out_invoice</field>
             <field name="account_id" ref="a_recv"/>
-            <field name="address_contact_id" ref="base.res_partner_address_8"/>
+            <field name="partner_id" ref="base.res_partner_address_8"/>
         </record>
         <record id="invoice_1_line_1" model="account.invoice.line">
             <field name="name">Otpez Laptop without OS</field>
@@ -32,13 +31,12 @@
         <record id="invoice_2" model="account.invoice">
             <field name="currency_id" ref="base.EUR"/>
             <field name="company_id" ref="base.main_company"/>
-            <field name="address_invoice_id" ref="base.res_partner_address_8"/>
             <field name="partner_id" ref="base.res_partner_agrolait"/>
             <field name="journal_id" ref="account.sales_journal"/>
             <field name="state">draft</field>
             <field name="type">out_invoice</field>
             <field name="account_id" ref="a_recv"/>
-            <field name="address_contact_id" ref="base.res_partner_address_8"/>
+            <field name="partner_id" ref="base.res_partner_address_8"/>
             <field eval="time.strftime('%Y-%m') + '-01'" name="date_invoice"/>
         </record>
         <record id="invoice_2_line_1" model="account.invoice.line">
@@ -60,13 +58,12 @@
         <record id="invoice_3" model="account.invoice">
             <field name="currency_id" ref="base.EUR"/>
             <field name="company_id" ref="base.main_company"/>
-            <field name="address_invoice_id" ref="base.res_partner_address_8"/>
             <field name="partner_id" ref="base.res_partner_agrolait"/>
             <field name="journal_id" ref="account.sales_journal"/>
             <field name="state">draft</field>
             <field name="type">out_invoice</field>
             <field name="account_id" ref="a_recv"/>
-            <field name="address_contact_id" ref="base.res_partner_address_8"/>
+            <field name="partner_id" ref="base.res_partner_address_8"/>
             <field eval="time.strftime('%Y-%m') + '-08'" name="date_invoice"/>
         </record>
         <record id="invoice_3_line_1" model="account.invoice.line">
@@ -88,13 +85,12 @@
         <record id="invoice_4" model="account.invoice">
             <field name="currency_id" ref="base.EUR"/>
             <field name="company_id" ref="base.main_company"/>
-            <field name="address_invoice_id" ref="base.res_partner_address_8"/>
             <field name="partner_id" ref="base.res_partner_agrolait"/>
             <field name="journal_id" ref="account.sales_journal"/>
             <field name="state">draft</field>
             <field name="type">out_invoice</field>
             <field name="account_id" ref="a_recv"/>
-            <field name="address_contact_id" ref="base.res_partner_address_8"/>
+            <field name="partner_id" ref="base.res_partner_address_8"/>
             <field eval="time.strftime('%Y-%m') + '-15'" name="date_invoice"/>
         </record>
         <record id="invoice_4_line_1" model="account.invoice.line">
diff --git a/addons/l10n_be/wizard/l10n_be_partner_vat_listing.py b/addons/l10n_be/wizard/l10n_be_partner_vat_listing.py
index 37bfd034fae..68ad3f703e1 100644
--- a/addons/l10n_be/wizard/l10n_be_partner_vat_listing.py
+++ b/addons/l10n_be/wizard/l10n_be_partner_vat_listing.py
@@ -170,7 +170,6 @@ class partner_vat_list(osv.osv_memory):
         obj_sequence = self.pool.get('ir.sequence')
         obj_users = self.pool.get('res.users')
         obj_partner = self.pool.get('res.partner')
-        obj_addr = self.pool.get('res.partner.address')
         obj_model_data = self.pool.get('ir.model.data')
         seq_declarantnum = obj_sequence.get(cr, uid, 'declarantnum')
         obj_cmpny = obj_users.browse(cr, uid, uid, context=context).company_id
@@ -187,12 +186,12 @@ class partner_vat_list(osv.osv_memory):
         street = city = country = ''
         addr = obj_partner.address_get(cr, uid, [obj_cmpny.partner_id.id], ['invoice'])
         if addr.get('invoice',False):
-            ads = obj_addr.browse(cr, uid, [addr['invoice']], context=context)[0]
+            ads = obj_partner.browse(cr, uid, [addr['invoice']], context=context)[0]
             phone = ads.phone.replace(' ','') or ''
             email = ads.email or ''
             name = ads.name or ''
-            city = obj_addr.get_city(cr, uid, ads.id)
-            zip = obj_addr.browse(cr, uid, ads.id, context=context).zip or ''
+            city = obj_partner.get_city(cr, uid, ads.id)
+            zip = obj_partner.browse(cr, uid, ads.id, context=context).zip or ''
             if not city:
                 city = ''
             if ads.street:
diff --git a/addons/l10n_be/wizard/l10n_be_vat_intra.py b/addons/l10n_be/wizard/l10n_be_vat_intra.py
index f784d3953e8..123d235f19b 100644
--- a/addons/l10n_be/wizard/l10n_be_vat_intra.py
+++ b/addons/l10n_be/wizard/l10n_be_vat_intra.py
@@ -92,7 +92,6 @@ class partner_vat_intra(osv.osv_memory):
         obj_user = self.pool.get('res.users')
         obj_sequence = self.pool.get('ir.sequence')
         obj_partner = self.pool.get('res.partner')
-        obj_partner_add = self.pool.get('res.partner.address')
 
         xmldict = {}
         post_code = street = city = country = data_clientinfo = ''
@@ -131,7 +130,7 @@ class partner_vat_intra(osv.osv_memory):
         phone = data_company.partner_id.phone or ''
 
         if addr.get('invoice',False):
-            ads = obj_partner_add.browse(cr, uid, [addr['invoice']])[0]
+            ads = obj_partner.browse(cr, uid, [addr['invoice']])[0]
             city = (ads.city or '')
             post_code = (ads.zip or '')
             if ads.street: