pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[IMP] sale: remove contact address

Browse Source 
bzr revid: kjo@tinyerp.com-20120229114258-fotdotegzhqbcfb4
This commit is contained in:
Kuldeep Joshi (OpenERP)
2012-02-29 17:12:58 +05:30
parent 92015be276
commit 8d95a3fb83
8 changed files with 21 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/sale/edi/sale_order.py
+3 -3
View File
@@ -82,7 +82,7 @@ class sale_order(osv.osv, EDIMixin):
'__import_module': 'purchase',
'company_address': res_company.edi_export_address(cr, uid, order.company_id, context=context),
'partner_address': res_partner_address.edi_export(cr, uid, [order.partner_order_id], context=context)[0],
'partner_address': res_partner_address.edi_export(cr, uid, [order.partner_invoice_id], context=context)[0],
'currency': self.pool.get('res.currency').edi_export(cr, uid, [order.pricelist_id.currency_id],
context=context)[0],
@@ -120,7 +120,7 @@ class sale_order(osv.osv, EDIMixin):
edi_document['partner_id'] = (src_company_id, src_company_name)
edi_document.pop('partner_address', False) # ignored
address_edi_m2o = self.edi_m2o(cr, uid, partner_address, context=context)
edi_document['partner_order_id'] = address_edi_m2o
# edi_document['partner_order_id'] = address_edi_m2o
edi_document['partner_invoice_id'] = address_edi_m2o
edi_document['partner_shipping_id'] = address_edi_m2o
@@ -219,4 +219,4 @@ class sale_order_line(osv.osv, EDIMixin):
edi_doc_list.append(edi_doc)
return edi_doc_list
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
addons/sale/report/sale_order.rml
+3 -3
View File
@@ -173,12 +173,12 @@
</td>
<td>
<para style="terp_default_9">[[ (o.partner_id and o.partner_id.title and o.partner_id.title.name) or '' ]] [[ (o.partner_id and o.partner_id.name) or '' ]]</para>
<para style="terp_default_9">[[ o.partner_order_id and display_address(o.partner_order_id) ]] </para>
<!--para style="terp_default_9">[[ o.partner_order_id and display_address(o.partner_order_id) ]] </para-->
<para style="terp_default_9">
<font color="white"> </font>
</para>
<para style="terp_default_9">Tel. : [[ (o.partner_order_id and o.partner_order_id.phone) or removeParentNode('para') ]]</para>
<para style="terp_default_9">Fax : [[ (o.partner_order_id and o.partner_order_id.fax) or removeParentNode('para') ]]</para>
<!--para style="terp_default_9">Tel. : [[ (o.partner_order_id and o.partner_order_id.phone) or removeParentNode('para') ]]</para>
<para style="terp_default_9">Fax : [[ (o.partner_order_id and o.partner_order_id.fax) or removeParentNode('para') ]]</para-->
<para style="terp_default_9">TVA : [[ (o.partner_id and o.partner_id.vat) or removeParentNode('para') ]]</para>
<para style="terp_default_9">
<font color="white"> </font>
addons/sale/sale.py
+5 -5
View File
@@ -216,7 +216,7 @@ class sale_order(osv.osv):
'user_id': fields.many2one('res.users', 'Salesman', states={'draft': [('readonly', False)]}, select=True),
'partner_id': fields.many2one('res.partner', 'Customer', readonly=True, states={'draft': [('readonly', False)]}, required=True, change_default=True, select=True),
'partner_invoice_id': fields.many2one('res.partner.address', 'Invoice Address', readonly=True, required=True, states={'draft': [('readonly', False)]}, help="Invoice address for current sales order."),
'partner_order_id': fields.many2one('res.partner.address', 'Ordering Contact', readonly=True, required=True, states={'draft': [('readonly', False)]}, help="The name and address of the contact who requested the order or quotation."),
# 'partner_order_id': fields.many2one('res.partner.address', 'Ordering Contact', readonly=True, required=True, states={'draft': [('readonly', False)]}, help="The name and address of the contact who requested the order or quotation."),
'partner_shipping_id': fields.many2one('res.partner.address', 'Shipping Address', readonly=True, required=True, states={'draft': [('readonly', False)]}, help="Shipping address for current sales order."),
'incoterm': fields.many2one('stock.incoterms', 'Incoterm', help="Incoterm which stands for 'International Commercial terms' implies its a series of sales terms which are used in the commercial transaction."),
@@ -279,7 +279,7 @@ class sale_order(osv.osv):
'name': lambda obj, cr, uid, context: obj.pool.get('ir.sequence').get(cr, uid, 'sale.order'),
'invoice_quantity': 'order',
'partner_invoice_id': lambda self, cr, uid, context: context.get('partner_id', False) and self.pool.get('res.partner').address_get(cr, uid, [context['partner_id']], ['invoice'])['invoice'],
'partner_order_id': lambda self, cr, uid, context: context.get('partner_id', False) and self.pool.get('res.partner').address_get(cr, uid, [context['partner_id']], ['contact'])['contact'],
# 'partner_order_id': lambda self, cr, uid, context: context.get('partner_id', False) and self.pool.get('res.partner').address_get(cr, uid, [context['partner_id']], ['contact'])['contact'],
'partner_shipping_id': lambda self, cr, uid, context: context.get('partner_id', False) and self.pool.get('res.partner').address_get(cr, uid, [context['partner_id']], ['delivery'])['delivery'],
}
_sql_constraints = [
@@ -347,7 +347,7 @@ class sale_order(osv.osv):
def onchange_partner_id(self, cr, uid, ids, part):
if not part:
return {'value': {'partner_invoice_id': False, 'partner_shipping_id': False, 'partner_order_id': False, 'payment_term': False, 'fiscal_position': False}}
return {'value': {'partner_invoice_id': False, 'partner_shipping_id': False, 'payment_term': False, 'fiscal_position': False}}
addr = self.pool.get('res.partner').address_get(cr, uid, [part], ['delivery', 'invoice', 'contact'])
part = self.pool.get('res.partner').browse(cr, uid, part)
@@ -357,7 +357,7 @@ class sale_order(osv.osv):
dedicated_salesman = part.user_id and part.user_id.id or uid
val = {
'partner_invoice_id': addr['invoice'],
'partner_order_id': addr['contact'],
# 'partner_order_id': addr['contact'],
'partner_shipping_id': addr['delivery'],
'payment_term': payment_term,
'fiscal_position': fiscal_position,
@@ -430,7 +430,7 @@ class sale_order(osv.osv):
'partner_id': order.partner_id.id,
'journal_id': journal_ids[0],
'address_invoice_id': order.partner_invoice_id.id,
'address_contact_id': order.partner_order_id.id,
# 'address_contact_id': order.partner_order_id.id,
'invoice_line': [(6, 0, lines)],
'currency_id': order.pricelist_id.currency_id.id,
'comment': order.note,
addons/sale/sale_demo.xml
+7 -7
View File
@@ -11,7 +11,7 @@
<field ref="base.res_partner_agrolait" name="partner_id"/>
<field ref="base.res_partner_address_8" name="partner_invoice_id"/>
<field ref="base.res_partner_address_8" name="partner_shipping_id"/>
<field ref="base.res_partner_address_8" name="partner_order_id"/>
<!--field ref="base.res_partner_address_8" name="partner_order_id"/-->
<field name="order_policy">picking</field>
<field name="invoice_quantity">procurement</field>
<field name="note">Invoice after delivery</field>
@@ -68,7 +68,7 @@
<field name="partner_id" ref="base.res_partner_2"/>
<field name="partner_invoice_id" ref="base.res_partner_address_9"/>
<field name="partner_shipping_id" ref="base.res_partner_address_9"/>
<field name="partner_order_id" ref="base.res_partner_address_9"/>
<!--field name="partner_order_id" ref="base.res_partner_address_9"/-->
<field name="invoice_quantity">order</field>
<field name="order_policy">postpaid</field>
@@ -104,7 +104,7 @@
<field name="partner_id" ref="base.res_partner_agrolait"/>
<field name="partner_invoice_id" ref="base.res_partner_address_8"/>
<field name="partner_shipping_id" ref="base.res_partner_address_8"/>
<field name="partner_order_id" ref="base.res_partner_address_8"/>
<!--field name="partner_order_id" ref="base.res_partner_address_8"/-->
<field name="order_policy">prepaid</field>
</record>
<record id="line5" model="sale.order.line">
@@ -137,7 +137,7 @@
<field name="partner_id" ref="base.res_partner_5"/>
<field name="partner_invoice_id" ref="base.res_partner_address_10"/>
<field name="partner_shipping_id" ref="base.res_partner_address_10"/>
<field name="partner_order_id" ref="base.res_partner_address_10"/>
<!--field name="partner_order_id" ref="base.res_partner_address_10"/-->
</record>
<record id="line7" model="sale.order.line">
<field name="order_id" ref="order4"/>
@@ -170,7 +170,7 @@
<field name="partner_id" ref="base.res_partner_3"/>
<field name="partner_invoice_id" ref="base.res_partner_address_zen"/>
<field name="partner_shipping_id" ref="base.res_partner_address_zen"/>
<field name="partner_order_id" ref="base.res_partner_address_zen"/>
<!--field name="partner_order_id" ref="base.res_partner_address_zen"/-->
</record>
<record id="line9" model="sale.order.line">
<field name="order_id" ref="order5"/>
@@ -203,7 +203,7 @@
<field name="partner_id" ref="base.res_partner_maxtor"/>
<field name="partner_invoice_id" ref="base.res_partner_address_wong"/>
<field name="partner_shipping_id" ref="base.res_partner_address_wong"/>
<field name="partner_order_id" ref="base.res_partner_address_wong"/>
<!--field name="partner_order_id" ref="base.res_partner_address_wong"/-->
</record>
<record id="order6_line0" model="sale.order.line">
<field name="order_id" ref="order6"/>
@@ -237,7 +237,7 @@
<field name="partner_id" ref="base.res_partner_desertic_hispafuentes"/>
<field name="partner_invoice_id" ref="base.res_partner_address_3000"/>
<field name="partner_shipping_id" ref="base.res_partner_address_3000"/>
<field name="partner_order_id" ref="base.res_partner_address_3000"/>
<!--field name="partner_order_id" ref="base.res_partner_address_3000"/-->
</record>
<record id="order7_line0" model="sale.order.line">
<field name="order_id" ref="order7"/>
addons/sale/sale_view.xml
+2 -2
View File
@@ -116,11 +116,11 @@
<notebook colspan="5">
<page string="Sales Order">
<field name="partner_id" options='{"quick_create": false}' on_change="onchange_partner_id(partner_id)" domain="[('customer','=',True)]" context="{'search_default_customer':1}" required="1"/>
<field domain="[('partner_id','=',partner_id)]" name="partner_order_id" on_change="onchange_partner_order_id(partner_order_id, partner_invoice_id, partner_shipping_id)" options='{"quick_create": false}'/>
<!--field domain="[('partner_id','=',partner_id)]" name="partner_order_id" on_change="onchange_partner_order_id(partner_order_id, partner_invoice_id, partner_shipping_id)" options='{"quick_create": false}'/-->
<field domain="[('partner_id','=',partner_id)]" name="partner_invoice_id" groups="base.group_extended" options='{"quick_create": false}'/>
<field domain="[('partner_id','=',partner_id)]" name="partner_shipping_id" groups="base.group_extended" options='{"quick_create": false}'/>
<field domain="[('type','=','sale')]" name="pricelist_id" groups="base.group_extended" on_change="onchange_pricelist_id(pricelist_id,order_line)"/>
<field name="project_id" context="{'partner_id':partner_id, 'contact_id':partner_order_id, 'pricelist_id':pricelist_id, 'default_name':name}" groups="analytic.group_analytic_accounting" domain="[('parent_id','!=',False)]"/>
<field name="project_id" context="{'partner_id':partner_id, 'pricelist_id':pricelist_id, 'default_name':name}" groups="analytic.group_analytic_accounting" domain="[('parent_id','!=',False)]"/>
<newline/>
<field colspan="4" name="order_line" nolabel="1" widget="one2many_list">
<form string="Sales Order Lines">
addons/sale/stock.py
-1
View File
@@ -67,7 +67,6 @@ class stock_picking(osv.osv):
"""
invoice_vals = super(stock_picking, self)._prepare_invoice(cr, uid, picking, partner, inv_type, journal_id, context=context)
if picking.sale_id:
invoice_vals['address_contact_id'] = picking.sale_id.partner_order_id.id
invoice_vals['address_invoice_id'] = picking.sale_id.partner_invoice_id.id
invoice_vals['fiscal_position'] = picking.sale_id.fiscal_position.id
invoice_vals['payment_term'] = picking.sale_id.payment_term.id
addons/sale/test/edi_sale_order.yml
+1 -2
View File
@@ -4,7 +4,6 @@
!record {model: sale.order, id: sale_order_edi_1}:
partner_id: base.res_partner_agrolait
partner_invoice_id: base.res_partner_address_8invoice
partner_order_id: base.res_partner_address_8invoice
partner_shipping_id: base.res_partner_address_8invoice
pricelist_id: 1
order_line:
@@ -129,4 +128,4 @@
assert sale_line.price_unit == 100 , "unit price is not same, got %s, expected 100"%(sale_line.price_unit,)
assert sale_line.product_uom_qty == 2 , "product qty is not same"
else:
raise AssertionError('unknown order line: %s' % sale_line)
raise AssertionError('unknown order line: %s' % sale_line)
addons/sale/wizard/sale_make_invoice_advance.py
-1
View File
@@ -93,7 +93,6 @@ class sale_advance_payment_inv(osv.osv_memory):
'account_id': sale.partner_id.property_account_receivable.id,
'partner_id': sale.partner_id.id,
'address_invoice_id': sale.partner_invoice_id.id,
'address_contact_id': sale.partner_order_id.id,
'invoice_line': [(6, 0, create_ids)],
'currency_id': sale.pricelist_id.currency_id.id,
'comment': '',