Kuldeep Joshi(OpenERP) has proposed merging
lp:~openerp-dev/openobject-addons/trunk-partner-address-cleaning-l10n_ch_be-jam
into lp:~openerp-dev/openobject-addons/trunk-partner-address-cleaning.
Requested reviews:
Bhumika (OpenERP) (sbh-openerp)
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-partner-address-cleaning-l10n_ch_be-jam/+merge/98144
remove the res.partner.address
--
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-partner-address-cleaning-l10n_ch_be-jam/+merge/98144
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openobject-addons/trunk-partner-address-cleaning.
=== modified file 'l10n_be/account_demo.xml'
--- l10n_be/account_demo.xml 2011-01-14 00:11:01 +0000
+++ l10n_be/account_demo.xml 2012-03-19 05:24:33 +0000
@@ -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">
=== modified file 'l10n_be/wizard/l10n_be_partner_vat_listing.py'
--- l10n_be/wizard/l10n_be_partner_vat_listing.py 2012-02-15 13:18:16 +0000
+++ l10n_be/wizard/l10n_be_partner_vat_listing.py 2012-03-19 05:24:33 +0000
@@ -170,7 +170,6 @@
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 @@
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:
=== modified file 'l10n_be/wizard/l10n_be_vat_intra.py'
--- l10n_be/wizard/l10n_be_vat_intra.py 2012-02-13 17:22:08 +0000
+++ l10n_be/wizard/l10n_be_vat_intra.py 2012-03-19 05:24:33 +0000
@@ -92,7 +92,6 @@
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 @@
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:
=== modified file 'l10n_ch/demo/demo.xml'
--- l10n_ch/demo/demo.xml 2012-01-17 17:21:53 +0000
+++ l10n_ch/demo/demo.xml 2012-03-19 05:24:33 +0000
@@ -24,12 +24,12 @@
<field name="category_id" model="res.partner.category" search="[('name','=','Partenaire')]"/>
</record>
- <record id="res_partner_address_bank1" model="res.partner.address">
+ <record id="res_partner_address_bank1" model="res.partner">
<field name="fax">+41 31 622 13 00</field>
<field name="name">Marc Dufour</field>
<field name="zip">1015</field>
<field name="city">Lausanne</field>
- <field name="partner_id" ref="bank"/>
+ <field name="parent_id" ref="bank"/>
<field name="country_id" model="res.country" search="[('code','=','ch')]"/>
<field name="email">[email protected]</field>
<field name="phone">+41 24 620 10 12</field>
@@ -59,12 +59,12 @@
Resource: res.partner.address
-->
- <record id="res_partner_address_1" model="res.partner.address">
+ <record id="res_partner_address_1" model="res.partner">
<field name="fax">+41 21 619 10 00</field>
<field name="name">Luc Maurer</field>
<field name="zip">1015</field>
<field name="city">Lausanne</field>
- <field name="partner_id" ref="camptocamp"/>
+ <field name="parent_id" ref="camptocamp"/>
<field name="country_id" model="res.country" search="[('code','=','ch')]"/>
<field name="email">[email protected]</field>
<field name="phone">+41 21 619 10 12</field>
@@ -72,11 +72,11 @@
<field name="active">1</field>
<field name="type">default</field>
</record>
- <record id="res_partner_address_2" model="res.partner.address">
+ <record id="res_partner_address_2" model="res.partner">
<field name="name">Ferdinand Gassauer</field>
<field name="zip">1015</field>
<field name="city">Lausanne</field>
- <field name="partner_id" ref="prolibre"/>
+ <field name="parent_id" ref="prolibre"/>
<field name="country_id" model="res.country" search="[('code','=','ch')]"/>
<field name="email">[email protected]</field>
<field name="phone">+41 21 619 10 11</field>
@@ -84,12 +84,12 @@
<field name="active">1</field>
<field name="type">default</field>
</record>
- <record id="res_partner_address_3" model="res.partner.address">
+ <record id="res_partner_address_3" model="res.partner">
<field name="fax">+41 21 619 10 00</field>
<field name="name">Claude Philipona</field>
<field name="zip">1015</field>
<field name="city">Lausanne</field>
- <field name="partner_id" ref="camptocamp"/>
+ <field name="parent_id" ref="camptocamp"/>
<field name="country_id" model="res.country" search="[('name','=','Switzerland')]"/>
<field name="email">[email protected]</field>
<field name="phone">+41 21 619 10 12 </field>
=== modified file 'l10n_ch/demo/dta_demo.xml'
--- l10n_ch/demo/dta_demo.xml 2012-01-17 17:21:53 +0000
+++ l10n_ch/demo/dta_demo.xml 2012-03-19 05:24:33 +0000
@@ -33,7 +33,6 @@
<field name="amount_total">54150</field>
<field name="number">1</field>
<field name="partner_id" ref="base.res_partner_agrolait"/>
- <field name="address_invoice_id" ref="base.res_partner_address_8"/>
<field name="account_id" ref="account.a_recv"/>
<field name="currency_id" ref="base.EUR"/>
<field name="company_id" ref="base.main_partner"/>
=== modified file 'l10n_ch/report/bvr.mako'
--- l10n_ch/report/bvr.mako 2011-09-16 14:32:55 +0000
+++ l10n_ch/report/bvr.mako 2012-03-19 05:24:33 +0000
@@ -103,20 +103,20 @@
<!--adresses + info block -->
<table class="dest_address" style="position:absolute;top:6mm;left:15mm">
<tr><td ><b>${inv.partner_id.title.name or ''|entity} ${inv.partner_id.name |entity}</b></td></tr>
- <tr><td>${inv.address_invoice_id.street or ''|entity}</td></tr>
- <tr><td>${inv.address_invoice_id.street2 or ''|entity}</td></tr>
- <tr><td>${inv.address_invoice_id.zip or ''|entity} ${inv.address_invoice_id.city or ''|entity}</td></tr>
- %if inv.address_invoice_id.country_id :
- <tr><td>${inv.address_invoice_id.country_id.name or ''|entity} </td></tr>
- %endif
- %if inv.address_invoice_id.phone :
- <tr><td>${_("Tel") |entity}: ${inv.address_invoice_id.phone|entity}</td></tr>
- %endif
- %if inv.address_invoice_id.fax :
- <tr><td>${_("Fax") |entity}: ${inv.address_invoice_id.fax|entity}</td></tr>
- %endif
- %if inv.address_invoice_id.email :
- <tr><td>${_("E-mail") |entity}: ${inv.address_invoice_id.email|entity}</td></tr>
+ <tr><td>${inv.partner_id.street or ''|entity}</td></tr>
+ <tr><td>${inv.partner_id.street2 or ''|entity}</td></tr>
+ <tr><td>${inv.partner_id.zip or ''|entity} ${inv.partner_id.city or ''|entity}</td></tr>
+ %if inv.partner_id.country_id :
+ <tr><td>${inv.partner_id.country_id.name or ''|entity} </td></tr>
+ %endif
+ %if inv.partner_id.phone :
+ <tr><td>${_("Tel") |entity}: ${inv.partner_id.phone|entity}</td></tr>
+ %endif
+ %if inv.partner_id.fax :
+ <tr><td>${_("Fax") |entity}: ${inv.partner_id.fax|entity}</td></tr>
+ %endif
+ %if inv.partner_id.email :
+ <tr><td>${_("E-mail") |entity}: ${inv.partner_id.email|entity}</td></tr>
%endif
%if inv.partner_id.vat :
<tr><td>${_("VAT") |entity}: ${inv.partner_id.vat|entity}</td></tr>
@@ -142,7 +142,7 @@
<table name="bvrframe" id="${inv.id}" style="width:210mm;height:106mm;border-collapse:collapse;padding-left:3mm;font-family:Helvetica;font-size:8pt;border-width:0px" border="0" CELLPADDING="0" CELLSPACING="0"> <!--border-width:1px;border-style:solid;border-color:black;-->
<tr style="height:16.933333mm;vertical-align:bottom;padding-bottom:3mm"><td style="width:60.14mm;padding-bottom:3mm"><div style="padding-left:3mm;">${inv.partner_bank_id and inv.partner_bank_id.print_bank and inv.partner_bank_id.bank and inv.partner_bank_id.bank.name or ''}</div></td><td style="width:60.96mm;padding-bottom:3mm"><div style="padding-left:3mm;">${inv.partner_bank_id and inv.partner_bank_id.print_bank and inv.partner_bank_id.bank and inv.partner_bank_id.bank.name or ''}</div></td><td style="width:88.9mm"></td></tr>
<tr style="height:12.7mm;vertical-align:bottom;padding-bottom:3mm"><td style="width:60.14mm;padding-bottom:3mm"><div style="padding-left:3mm;"><b>${user.company_id.partner_id.name}</b></div></td><td style="width:60.96mm;padding-bottom:3mm"><div style="padding-left:3mm;"><b>${user.company_id.partner_id.name}</b></div></td><td style="width:88.9mm"></td></tr>
- <tr style="height:16.933333mm;vertical-align:bottom;padding-bottom:0"><td><table style="padding-left:3mm;font-family:Helvetica;font-size:8pt" height="100%"><tr style="vertical-align:top;padding-bottom:0"><td>${user.company_id.partner_id.address[0].street}<br/> ${user.company_id.partner_id.address[0].zip} ${user.company_id.partner_id.address[0].city}</td></tr><tr style="vertical-align:bottom;padding-bottom:0"><td><div style="padding-left:30.48mm;">${inv.partner_bank_id.print_account and inv.partner_bank_id.post_number or ''}</div></td></tr></table></td><td style="padding-left:3mm"><table style="padding-left:3mm;font-family:Helvetica;font-size:8pt" height="100%"><tr style="vertical-align:top;padding-bottom:0"><td>${user.company_id.partner_id.address[0].street}<br/>${user.company_id.partner_id.address[0].zip} ${user.company_id.partner_id.address[0].city}</td></tr><tr style="vertical-align:bottom;padding-bottom:0"><td><div style="padding-left:30.48mm;">${inv.partner_bank_id.print_account and inv.partner_bank_id.post_number or ''}</div></td></tr></table></td><td style="text-align: right;padding-right:4mm;padding-bottom:8mm;font-size:11pt">${_space(_get_ref(inv))}</td></tr>
+ <tr style="height:16.933333mm;vertical-align:bottom;padding-bottom:0"><td><table style="padding-left:3mm;font-family:Helvetica;font-size:8pt" height="100%"><tr style="vertical-align:top;padding-bottom:0"><td>${user.company_id.partner_id.street}<br/> ${user.company_id.partner_id.zip} ${user.company_id.partner_id.city}</td></tr><tr style="vertical-align:bottom;padding-bottom:0"><td><div style="padding-left:30.48mm;">${inv.partner_bank_id.print_account and inv.partner_bank_id.post_number or ''}</div></td></tr></table></td><td style="padding-left:3mm"><table style="padding-left:3mm;font-family:Helvetica;font-size:8pt" height="100%"><tr style="vertical-align:top;padding-bottom:0"><td>${user.company_id.partner_id.street}<br/>${user.company_id.partner_id.zip} ${user.company_id.partner_id.city}</td></tr><tr style="vertical-align:bottom;padding-bottom:0"><td><div style="padding-left:30.48mm;">${inv.partner_bank_id.print_account and inv.partner_bank_id.post_number or ''}</div></td></tr></table></td><td style="text-align: right;padding-right:4mm;padding-bottom:8mm;font-size:11pt">${_space(_get_ref(inv))}</td></tr>
<tr style="height:8.4666667mm;vertical-align:bottom;padding-bottom:0"> <td><table style="width:100%" CELLPADDING="0" CELLSPACING="0"><td style="width:4mm"></td><td style="width:40mm;text-align: right" >${_space(('%.2f' % inv.amount_total)[:-3], 1)}</td><td style="width:6mm"></td><td style="width:10mm;text-align: right">${ _space(('%.2f' % inv.amount_total)[-2:], 1)}</td><td style="width:3mm;text-align: right"></td></table></td><td><table style="width:100%" CELLPADDING="0" CELLSPACING="0"><td style="width:4mm"></td><td style="width:40mm;text-align: right" >${_space(('%.2f' % inv.amount_total)[:-3], 1)}</td><td style="width:6mm"></td><td style="width:10mm;text-align: right">${ _space(('%.2f' % inv.amount_total)[-2:], 1)}</td><td style="width:3mm;text-align: right"></td></table></td><td></td></tr>
<tr style="height:21.166667mm"><td></td><td></td><td></td></tr>
<tr style="height:8.4666667mm"> <td></td><td></td><td></td></tr>
@@ -150,4 +150,4 @@
</table>
%endfor
</body>
-</html>
\ No newline at end of file
+</html>
=== modified file 'l10n_ch/report/report_webkit_html.mako'
--- l10n_ch/report/report_webkit_html.mako 2011-09-16 14:32:55 +0000
+++ l10n_ch/report/report_webkit_html.mako 2012-03-19 05:24:33 +0000
@@ -10,20 +10,20 @@
<div id="inv_cont_${inv.id}" style="padding-left:20mm;padding-top:0;padding-bottom:10;border-width:0px;border-style:solid">
<table class="dest_address">
<tr><td ><b>${inv.partner_id.title.name or ''|entity} ${inv.partner_id.name |entity}</b></td></tr>
- <tr><td>${inv.address_invoice_id.street or ''|entity}</td></tr>
- <tr><td>${inv.address_invoice_id.street2 or ''|entity}</td></tr>
- <tr><td>${inv.address_invoice_id.zip or ''|entity} ${inv.address_invoice_id.city or ''|entity}</td></tr>
- %if inv.address_invoice_id.country_id :
- <tr><td>${inv.address_invoice_id.country_id.name or ''|entity} </td></tr>
- %endif
- %if inv.address_invoice_id.phone :
- <tr><td>${_("Tel") |entity}: ${inv.address_invoice_id.phone|entity}</td></tr>
- %endif
- %if inv.address_invoice_id.fax :
- <tr><td>${_("Fax") |entity}: ${inv.address_invoice_id.fax|entity}</td></tr>
- %endif
- %if inv.address_invoice_id.email :
- <tr><td>${_("E-mail") |entity}: ${inv.address_invoice_id.email|entity}</td></tr>
+ <tr><td>${inv.partner_id.street or ''|entity}</td></tr>
+ <tr><td>${inv.partner_id.street2 or ''|entity}</td></tr>
+ <tr><td>${inv.partner_id.zip or ''|entity} ${inv.partner_id.city or ''|entity}</td></tr>
+ %if inv.partner_id.country_id :
+ <tr><td>${inv.partner_id.country_id.name or ''|entity} </td></tr>
+ %endif
+ %if inv.partner_id.phone :
+ <tr><td>${_("Tel") |entity}: ${inv.partner_id.phone|entity}</td></tr>
+ %endif
+ %if inv.partner_id.fax :
+ <tr><td>${_("Fax") |entity}: ${inv.partner_id.fax|entity}</td></tr>
+ %endif
+ %if inv.partner_id.email :
+ <tr><td>${_("E-mail") |entity}: ${inv.partner_id.email|entity}</td></tr>
%endif
%if inv.partner_id.vat :
<tr><td>${_("VAT") |entity}: ${inv.partner_id.vat|entity}</td></tr>
@@ -81,4 +81,4 @@
</div>
%endfor
</body>
-</html>
\ No newline at end of file
+</html>
=== modified file 'l10n_ch/report/report_webkit_html_view.xml'
--- l10n_ch/report/report_webkit_html_view.xml 2011-09-16 14:32:55 +0000
+++ l10n_ch/report/report_webkit_html_view.xml 2012-03-19 05:24:33 +0000
@@ -36,16 +36,16 @@
<td><b>${company.partner_id.name |entity}</b></td><td></td><td></td>
</tr>
<tr>
- <td>${company.partner_id.address and company.partner_id.address[0].street or ''|entity}</td><td>${_("phone")}:</td><td>${company.partner_id.address and company.partner_id.address[0].phone or ''|entity} </td><td></td>
- </tr>
- <tr>
- <td>${company.partner_id.address and company.partner_id.address[0].street2 or ''|entity}</td><td>${_('Fax')}:</td><td>${company.partner_id.address and company.partner_id.address[0].fax or ''|entity} </td><td></td>
- </tr>
- <tr>
- <td>${company.partner_id.address and company.partner_id.address[0].zip or ''|entity} ${company.partner_id.address and company.partner_id.address[0].city or ''|entity}</td><td>${_('e-mail')}:</td><td><a href="mailto:${company.partner_id.address and company.partner_id.address[0].email or ''|entity}">${company.partner_id.address and company.partner_id.address[0].email or ''|entity}</a></td><td></td>
- </tr>
- <tr>
- <td>${company.partner_id.address and company.partner_id.address[0].country_id.name or ''|entity}</td><td></td><td style="text-align:right;font-size:12" ><span class="page"/></td><td style="text-align:left;font-size:12;"> / <span class="topage"/></td>
+ <td>${company.partner_id and company.partner_id.street or ''|entity}</td><td>${_("phone")}:</td><td>${company.partner_id and company.partner_id.phone or ''|entity} </td><td></td>
+ </tr>
+ <tr>
+ <td>${company.partner_id and company.partner_id.street2 or ''|entity}</td><td>${_('Fax')}:</td><td>${company.partner_id and company.partner_id.fax or ''|entity} </td><td></td>
+ </tr>
+ <tr>
+ <td>${company.partner_id and company.partner_id.zip or ''|entity} ${company.partner_id and company.partner_id.city or ''|entity}</td><td>${_('e-mail')}:</td><td><a href="mailto:${company.partner_id and company.partner_id.email or ''|entity}">${company.partner_id and company.partner_id.email or ''|entity}</a></td><td></td>
+ </tr>
+ <tr>
+ <td>${company.partner_id and company.partner_id.country_id.name or ''|entity}</td><td></td><td style="text-align:right;font-size:12" ><span class="page"/></td><td style="text-align:left;font-size:12;"> / <span class="topage"/></td>
</tr>
</table>
</td>
@@ -161,4 +161,4 @@
<field name="webkit_header" ref="ir_header_webkit_bvr_invoice0" />
</record>
</data>
-</openerp>
\ No newline at end of file
+</openerp>
=== modified file 'l10n_ch/test/l10n_ch_dta.yml'
--- l10n_ch/test/l10n_ch_dta.yml 2012-01-19 09:24:22 +0000
+++ l10n_ch/test/l10n_ch_dta.yml 2012-03-19 05:24:33 +0000
@@ -13,8 +13,6 @@
account_id: account.a_pay
type : in_invoice
partner_id: base.res_partner_agrolait
- address_contact_id: base.res_partner_address_8
- address_invoice_id: base.res_partner_address_8
reference_type: bvr
reference: 11111111111111111111
date_invoice: !eval "'%s-01-01' %(datetime.now().year)"
=== modified file 'l10n_ch/test/l10n_ch_report.yml'
--- l10n_ch/test/l10n_ch_report.yml 2011-11-15 00:19:12 +0000
+++ l10n_ch/test/l10n_ch_report.yml 2012-03-19 05:24:33 +0000
@@ -13,21 +13,21 @@
-
I create contact address for BVR DUMMY.
-
- !record {model: res.partner.address, id: res_partner_address_1}:
+ !record {model: res.partner, id: res_partner_address_1}:
partner_id: res_partner_bvr
street: Route de Bélario
type: contact
-
I create invoice address for BVR DUMMY.
-
- !record {model: res.partner.address, id: res_partner_address_2}:
+ !record {model: res.partner, id: res_partner_address_2}:
partner_id: res_partner_bvr
street: Route de Bélario
type: invoice
-
I create delivery address for BVR DUMMY.
-
- !record {model: res.partner.address, id: res_partner_address_3}:
+ !record {model: res.partner, id: res_partner_address_3}:
partner_id: res_partner_bvr
street: Route de Bélario
type: delivery
@@ -38,13 +38,11 @@
!record {model: account.invoice, id: l10n_ch_invoice, view: False}:
currency_id: base.CHF
company_id: base.main_company
- address_invoice_id: res_partner_address_2
partner_id: res_partner_bvr
state: draft
type: out_invoice
account_id: account.a_recv
name: BVR test invoice
- address_contact_id: res_partner_address_1
-
In order to test the BVR report, I will assign a bank to the invoice
=== modified file 'l10n_ch/test/l10n_ch_v11.yml'
--- l10n_ch/test/l10n_ch_v11.yml 2011-11-15 00:24:24 +0000
+++ l10n_ch/test/l10n_ch_v11.yml 2012-03-19 05:24:33 +0000
@@ -13,8 +13,6 @@
account_id: account.a_recv
type : out_invoice
partner_id: base.res_partner_agrolait
- address_contact_id: base.res_partner_address_8
- address_invoice_id: base.res_partner_address_8
reference_type: bvr
reference: 12345676
date_invoice: !eval "'%s-01-01' %(datetime.now().year)"
=== modified file 'l10n_ch/test/l10n_ch_v11_part.yml'
--- l10n_ch/test/l10n_ch_v11_part.yml 2011-11-15 00:24:24 +0000
+++ l10n_ch/test/l10n_ch_v11_part.yml 2012-03-19 05:24:33 +0000
@@ -14,8 +14,6 @@
account_id: account.a_recv
type : out_invoice
partner_id: base.res_partner_agrolait
- address_contact_id: base.res_partner_address_8
- address_invoice_id: base.res_partner_address_8
reference_type: bvr
reference: 20009997
date_invoice: !eval "'%s-01-01' %(datetime.now().year)"
=== modified file 'l10n_ch/wizard/create_dta.py'
--- l10n_ch/wizard/create_dta.py 2012-01-17 17:21:53 +0000
+++ l10n_ch/wizard/create_dta.py 2012-03-19 05:24:33 +0000
@@ -388,7 +388,7 @@
user = pool.get('res.users').browse(cr,uid,[uid])[0]
company = user.company_id
#XXX dirty code use get_addr
- co_addr = company.partner_id.address[0]
+ co_addr = company.partner_id
v['comp_country'] = co_addr.country_id and co_addr.country_id.name or ''
v['comp_street'] = co_addr.street or ''
v['comp_zip'] = co_addr.zip
@@ -479,20 +479,19 @@
else:
v['partner_name'] = pline.partner_id and pline.partner_id.name or ''
- if pline.partner_id and pline.partner_id.address \
- and pline.partner_id.address[0]:
- v['partner_street'] = pline.partner_id.address[0].street
- v['partner_city'] = pline.partner_id.address[0].city
- v['partner_zip'] = pline.partner_id.address[0].zip
+ if pline.partner_id and pline.partner_id:
+ v['partner_street'] = pline.partner_id.street
+ v['partner_city'] = pline.partner_id.city
+ v['partner_zip'] = pline.partner_id.zip
# If iban => country=country code for space reason
elec_pay = pline.bank_id.state #Bank type
if elec_pay == 'iban':
- v['partner_country']= pline.partner_id.address[0].country_id \
- and pline.partner_id.address[0].country_id.code+'-' \
+ v['partner_country']= pline.partner_id.country_id \
+ and pline.partner_id.country_id.code+'-' \
or ''
else:
- v['partner_country']= pline.partner_id.address[0].country_id \
- and pline.partner_id.address[0].country_id.name \
+ v['partner_country']= pline.partner_id.country_id \
+ and pline.partner_id.acountry_id.name \
or ''
else:
v['partner_street'] =''
_______________________________________________
Mailing list: https://launchpad.net/~openerp-dev-gtk
Post to : [email protected]
Unsubscribe : https://launchpad.net/~openerp-dev-gtk
More help : https://help.launchpad.net/ListHelp
