Bharat Devnani (Open ERP) has proposed merging
lp:~openerp-dev/openobject-addons/trunk-partner-address-cleaning-purchase-requisition-bde
into lp:~openerp-dev/openobject-addons/trunk-partner-address-cleaning.
Requested reviews:
OpenERP R&D Team (openerp-dev)
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-partner-address-cleaning-purchase-requisition-bde/+merge/96104
Hello Madam,
I have removed references of res.partner.address from purchase_requisition
module.
Thanks & Regards,
Devnani Bharat R.
--
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-partner-address-cleaning-purchase-requisition-bde/+merge/96104
Your team OpenERP R&D Team is requested to review the proposed merge of
lp:~openerp-dev/openobject-addons/trunk-partner-address-cleaning-purchase-requisition-bde
into lp:~openerp-dev/openobject-addons/trunk-partner-address-cleaning.
=== modified file 'purchase_requisition/purchase_requisition.py'
--- purchase_requisition/purchase_requisition.py 2011-12-23 11:22:41 +0000
+++ purchase_requisition/purchase_requisition.py 2012-03-06 12:11:51 +0000
@@ -128,7 +128,6 @@
res_partner = self.pool.get('res.partner')
fiscal_position = self.pool.get('account.fiscal.position')
supplier = res_partner.browse(cr, uid, partner_id, context=context)
- delivery_address_id = res_partner.address_get(cr, uid, [supplier.id], ['delivery'])['delivery']
supplier_pricelist = supplier.property_product_pricelist_purchase or False
res = {}
for requisition in self.browse(cr, uid, ids, context=context):
@@ -138,7 +137,6 @@
purchase_id = purchase_order.create(cr, uid, {
'origin': requisition.name,
'partner_id': supplier.id,
- 'partner_address_id': delivery_address_id,
'pricelist_id': supplier_pricelist.id,
'location_id': location_id,
'company_id': requisition.company_id.id,
=== modified file 'purchase_requisition/purchase_requisition_demo.xml'
--- purchase_requisition/purchase_requisition_demo.xml 2011-12-23 08:30:19 +0000
+++ purchase_requisition/purchase_requisition_demo.xml 2012-03-06 12:11:51 +0000
@@ -32,7 +32,6 @@
<field name="location_id" ref="stock.stock_location_stock"/>
<field name="pricelist_id" ref="purchase.list0"/>
<field name="partner_id" ref="base.res_partner_4"/>
- <field name="partner_address_id" ref="base.res_partner_address_7"/>
<field name="requisition_id" ref="requisition1"/>
</record>
@@ -50,7 +49,6 @@
<field name="location_id" ref="stock.stock_location_stock"/>
<field name="pricelist_id" ref="purchase.list0"/>
<field name="partner_id" ref="base.res_partner_vickingdirect0"/>
- <field name="partner_address_id" ref="base.res_partner_address_brussels0"/>
<field name="requisition_id" ref="requisition1"/>
</record>
=== modified file 'purchase_requisition/report/purchase_requisition.rml'
--- purchase_requisition/report/purchase_requisition.rml 2011-12-21 09:08:11 +0000
+++ purchase_requisition/report/purchase_requisition.rml 2012-03-06 12:11:51 +0000
@@ -223,7 +223,7 @@
<blockTable colWidths="338.0,96.0,96.0" style="Table7">
<tr>
<td>
- <para style="terp_default_9">[[ (purchase_ids.partner_address_id and purchase_ids.partner_address_id.partner_id and purchase_ids.partner_address_id.partner_id.name) or '' ]]</para>
+ <para style="terp_default_9">[[ (purchase_ids.partner_address_id and purchase_ids.partner_address_id.id and purchase_ids.partner_address_id.name) or '' ]]</para>
</td>
<td>
<para style="terp_default_Centre_9">[[ formatLang(purchase_ids.date_order,date='True') ]]</para>
=== modified file 'purchase_requisition/wizard/purchase_requisition_partner.py'
--- purchase_requisition/wizard/purchase_requisition_partner.py 2011-12-19 16:54:40 +0000
+++ purchase_requisition/wizard/purchase_requisition_partner.py 2012-03-06 12:11:51 +0000
@@ -29,7 +29,6 @@
_description = "Purchase Requisition Partner"
_columns = {
'partner_id': fields.many2one('res.partner', 'Partner', required=True,domain=[('supplier', '=', True)]),
- 'partner_address_id':fields.many2one('res.partner.address', 'Address'),
}
def view_init(self, cr, uid, fields_list, context=None):
@@ -42,13 +41,6 @@
raise osv.except_osv(_('Error!'), _('No Product in Tender'))
return res
- def onchange_partner_id(self, cr, uid, ids, partner_id):
- if not partner_id:
- return {}
- addr = self.pool.get('res.partner').address_get(cr, uid, [partner_id], ['default'])
- part = self.pool.get('res.partner').browse(cr, uid, partner_id)
- return {'value':{'partner_address_id': addr['default']}}
-
def create_order(self, cr, uid, ids, context=None):
active_ids = context and context.get('active_ids', [])
data = self.browse(cr, uid, ids, context=context)[0]
=== modified file 'purchase_requisition/wizard/purchase_requisition_partner_view.xml'
--- purchase_requisition/wizard/purchase_requisition_partner_view.xml 2011-01-14 00:11:01 +0000
+++ purchase_requisition/wizard/purchase_requisition_partner_view.xml 2012-03-06 12:11:51 +0000
@@ -8,8 +8,7 @@
<field name="arch" type="xml">
<form string="Purchase Requisition">
<group colspan="2" col="2">
- <field name="partner_id" on_change="onchange_partner_id(partner_id)"/>
- <field domain="[('partner_id','=',partner_id)]" name="partner_address_id"/>
+ <field name="partner_id"/>
<separator string="" colspan="4" />
<button icon="gtk-cancel" special="cancel" string="_Cancel"/>
<button icon="gtk-ok" name="create_order" string="Create Quotation" type="object"/>
_______________________________________________
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
