odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[FIX] removed filed address_contact_id 

bzr revid: jam@tinyerp.com-20120307104205-fdvym7euls9rjsn6
This commit is contained in:
Jigar Amin - OpenERP 2012-03-07 16:12:05 +05:30
parent 879ddb6130
commit db5958f3fb
5 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
addons/account/account_invoice.py
View File

@ -1391,7 +1391,7 @@ class account_invoice_line(osv.osv):
res_final['value']['price_unit'] = new_price
return res_final
def uos_id_change(self, cr, uid, ids, product, uom, qty=0, name='', type='out_invoice', partner_id=False, fposition_id=False, price_unit=False, address_invoice_id=False, currency_id=False, context=None, company_id=None):
def uos_id_change(self, cr, uid, ids, product, uom, qty=0, name='', type='out_invoice', partner_id=False, fposition_id=False, price_unit=False, currency_id=False, context=None, company_id=None):
if context is None:
context = {}
company_id = company_id if company_id != None else context.get('company_id',False)

1
addons/account/account_unit_test.xml
View File

@ -11,7 +11,6 @@
<field name="type">out_invoice</field>
<field name="account_id" ref="account.a_recv"/>
<field name="name">Test invoice 1</field>
<field name="address_contact_id" ref="base.res_partner_address_tang"/>
</record>
<record id="test_tax_line" model="account.invoice.tax">
<field name="name">Test Tax</field>

1
addons/account/edi/invoice.py
View File

@ -148,7 +148,6 @@ class account_invoice(osv.osv, EDIMixin):
partner_address = res_partner.browse(cr, uid, address_id, context=context)
edi_document['partner_id'] = (src_company_id, src_company_name)
edi_document.pop('partner_address', False) # ignored
#edi_document['address_contact_id'] = self.edi_m2o(cr, uid, partner_address, context=context)
return partner_id

4
addons/account/edi/invoice_action_data.xml
View File

@ -46,8 +46,8 @@
<field name="body_html"><![CDATA[
<div style="font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, 255, 255); ">
<p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.title or ''},</p>
<p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name or ''},</p>
<p>A new invoice is available for ${object.partner_id.name}: </p>
<p style="border-left: 1px solid #8e0000; margin-left: 30px;">

5
addons/account/wizard/account_invoice_refund.py
View File

@ -176,7 +176,6 @@ class account_invoice_refund(osv.osv_memory):
invoice = inv_obj.read(cr, uid, [inv.id],
['name', 'type', 'number', 'reference',
'comment', 'date_due', 'partner_id',
'address_contact_id',
'partner_insite', 'partner_contact',
'partner_ref', 'payment_term', 'account_id',
'currency_id', 'invoice_line', 'tax_line',
@ -197,8 +196,8 @@ class account_invoice_refund(osv.osv_memory):
'period_id': period,
'name': description
})
for field in ('address_contact_id', 'partner_id',
'account_id', 'currency_id', 'payment_term', 'journal_id'):
for field in ('partner_id', 'account_id', 'currency_id',
'payment_term', 'journal_id'):
invoice[field] = invoice[field] and invoice[field][0]
inv_id = inv_obj.create(cr, uid, invoice, {})
if inv.payment_term.id: