openerp-dev-web team mailing list archive

["Amit Parik \(OpenERP\)" <amp@xxxxxxxxxxx>]

Amit Parik (OpenERP) has proposed merging lp:~openerp-dev/openobject-addons/trunk-bug-pointofsale-amp into lp:~openerp-dev/openobject-addons/trunk-bugfixes-Ind.

Requested reviews:
  OpenERP R&D Team (openerp-dev)

For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-bug-pointofsale-amp/+merge/57640
-- 
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-bug-pointofsale-amp/+merge/57640
Your team OpenERP R&D Team is requested to review the proposed merge of lp:~openerp-dev/openobject-addons/trunk-bug-pointofsale-amp into lp:~openerp-dev/openobject-addons/trunk-bugfixes-Ind.

=== modified file 'point_of_sale/point_of_sale.py'
--- point_of_sale/point_of_sale.py	2011-02-23 14:34:55 +0000
+++ point_of_sale/point_of_sale.py	2011-04-14 09:31:00 +0000
@@ -74,8 +74,10 @@
         """ Changed price list on_change of partner_id"""
         if not part:
             return {'value': {}}
-        pricelist = self.pool.get('res.partner').browse(cr, uid, part, context=context).property_product_pricelist.id
-        return {'value': {'pricelist_id': pricelist}}
+        addr = self.pool.get('res.partner').address_get(cr, uid, [part], ['delivery'])
+        part = self.pool.get('res.partner').browse(cr, uid, part)        
+        pricelist = part.property_product_pricelist.id
+        return {'value': {'pricelist_id': pricelist, 'partner_shipping_id': addr['delivery']}}
 
     def _amount_total(self, cr, uid, ids, field_name, arg, context=None):
         """ Calculates amount_tax of order line
@@ -271,6 +273,7 @@
         'statement_ids': fields.one2many('account.bank.statement.line', 'pos_statement_id', 'Payments', states={'draft': [('readonly', False)]}, readonly=True),
         'pricelist_id': fields.many2one('product.pricelist', 'Pricelist', required=True, states={'draft': [('readonly', False)]}, readonly=True),
         'partner_id': fields.many2one('res.partner', 'Customer', change_default=True, select=1, states={'draft': [('readonly', False)], 'paid': [('readonly', False)]}),
+        'partner_shipping_id': fields.many2one('res.partner.address', 'Delivery Address',  states={'draft': [('readonly', False)]}, help="Shipping address for current sales order."),
         'state': fields.selection([('draft', 'Quotation'),
                                    ('payment', 'Payment'),
                                    ('advance','Advance'),
@@ -432,6 +435,7 @@
                 picking_id = picking_obj.create(cr, uid, {
                     'name': pick_name,
                     'origin': order.name,
+                    'address_id': order.partner_shipping_id and order.partner_shipping_id.id or False,
                     'type': 'out',
                     'state': 'draft',
                     'move_type': 'direct',

=== modified file 'point_of_sale/point_of_sale_view.xml'
--- point_of_sale/point_of_sale_view.xml	2011-02-04 11:32:47 +0000
+++ point_of_sale/point_of_sale_view.xml	2011-04-14 09:31:00 +0000
@@ -18,6 +18,7 @@
                         <field name="date_order"/>
                         <field name="shop_id" widget="selection"/>
                         <field name="partner_id" on_change="onchange_partner_pricelist(partner_id)" groups="base.group_extended"/>
+                        <field name="partner_shipping_id" groups="base.group_extended"/>
                         <field name="contract_number" groups="base.group_extended"/>
                     </group>
                     <notebook colspan="4">