Merge lp:~unifield-team/unifield-wm/utp-674 into lp:unifield-wm

[jftempo]

=== modified file 'purchase_override/purchase.py'
--- purchase_override/purchase.py	2013-10-14 09:04:37 +0000
+++ purchase_override/purchase.py	2013-10-21 14:37:05 +0000
@@ -440,17 +440,19 @@
 #            d['partner_id'] = [('partner_type', 'in', ['esc', 'external'])]
         else:
             v['invoice_method'] = 'picking'
+
+        company_id = self.pool.get('res.users').browse(cr, uid, uid).company_id.partner_id.id
         
-        if order_type == 'direct' and dest_partner_id:
+        if order_type == 'direct' and dest_partner_id and dest_partner_id != company_id:
             cp_address_id = self.pool.get('res.partner').address_get(cr, uid, dest_partner_id, ['delivery'])['delivery']
             v.update({'dest_address_id': cp_address_id})
 #            d.update({'dest_address_id': [('partner_id', '=', dest_partner_id)]})
         elif order_type == 'direct':
-            v.update({'dest_address_id': False})
+            v.update({'dest_address_id': False, 'dest_partner_id': False})
 #            d.update({'dest_address_id': [('partner_id', '=', self.pool.get('res.users').browse(cr, uid, uid).company_id.id)]})
         else:
-            cp_address_id = self.pool.get('res.partner').address_get(cr, uid, self.pool.get('res.users').browse(cr, uid, uid).company_id.partner_id.id, ['delivery'])['delivery']
-            v.update({'dest_address_id': cp_address_id})
+            cp_address_id = self.pool.get('res.partner').address_get(cr, uid, company_id, ['delivery'])['delivery']
+            v.update({'dest_address_id': cp_address_id, 'dest_partner_id': company_id})
 #            d.update({'dest_address_id': [('partner_id', '=', self.pool.get('res.users').browse(cr, uid, uid).company_id.id)]})
 
         if partner_id and partner_id != local_market:
@@ -560,14 +562,15 @@
         
         if not dest_partner_id:
             v.update({'dest_address_id': False})
-            d.update({'dest_address_id': [('partner_id', '=', company_id)]})
+#            d.update({'dest_address_id': [('partner_id', '=', company_id)]})
         else:
-            d.update({'dest_address_id': [('partner_id', '=', dest_partner_id)]})
+#            d.update({'dest_address_id': [('partner_id', '=', dest_partner_id)]})
         
             delivery_addr = self.pool.get('res.partner').address_get(cr, uid, dest_partner_id, ['delivery'])
             v.update({'dest_address_id': delivery_addr['delivery']})
         
-        return {'value': v, 'domain': d}
+#        return {'value': v, 'domain': d}
+        return {'value': v}
     
     def change_currency(self, cr, uid, ids, context=None):
         '''
@@ -2596,4 +2599,86 @@
     
 account_invoice()
 
+
+class res_partner(osv.osv):
+    _inherit = 'res.partner'
+
+    def address_multiple_get(self, cr, uid, ids, adr_pref=['default']):
+        address_obj = self.pool.get('res.partner.address')
+        address_ids = address_obj.search(cr, uid, [('partner_id', '=', ids)])
+        address_rec = address_obj.read(cr, uid, address_ids, ['type'])
+        res= {}
+        for addr in address_rec:
+            res.setdefault(addr['type'], [])
+            res[addr['type']].append(addr['id'])
+        if res:
+            default_address = res.get('default', False)
+        else:
+            default_address = False
+        result = {}
+        for a in adr_pref:
+            result[a] = res.get(a, default_address)
+        
+        return result
+
+res_partner()
+
+
+class res_partner_address(osv.osv):
+    _inherit = 'res.partner.address'
+
+    def _get_dummy(self, cr, uid, ids, field_name, args, context=None):
+        res = {}
+        for id in ids:
+            res[id] = True
+
+        return res
+
+    def _src_address(self, cr, uid, obj, name, args, context=None):
+        '''
+        Returns all the destination addresses of a partner or all default
+        addresses if he hasn't destination addresses
+        '''
+        addr_obj = self.pool.get('res.partner.address')
+        partner_obj = self.pool.get('res.partner')
+        user_obj = self.pool.get('res.users')
+        res = []
+
+        for arg in args:
+            if arg[0] == 'dest_address':
+                addr_type = 'delivery'
+            elif arg[0] == 'inv_address':
+                addr_type = 'invoice'
+                
+            if arg[2]:
+                partner_id = arg[2]
+            else:
+                partner_id = user_obj.browse(cr, uid, uid, context=context).company_id.partner_id.id
+                if arg[1] == 'in':
+                    partner_id = [partner_id]
+            
+            addr_ids = []
+            if isinstance(partner_id, list):
+                for partner in partner_id:
+                    if not partner:
+                        continue
+                    addr_ids.extend(partner_obj.address_multiple_get(cr, uid, partner, [addr_type])[addr_type])
+
+            else:
+                addr_ids = partner_obj.address_multiple_get(cr, uid, partner_id, [addr_type])[addr_type]
+
+            res.append(('id', 'in', list(id for id in addr_ids if id)))
+
+        return res
+    
+    _columns = {
+        'dest_address': fields.function(_get_dummy, fnct_search=_src_address, method=True,
+                                           type='boolean', string='Dest. Address', store=False),
+        'inv_address': fields.function(_get_dummy, fnct_search=_src_address, method=True,
+                                           type='boolean', string='Invoice Address', store=False),
+    }
+    
+
+res_partner_address()
+
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== modified file 'purchase_override/purchase_view.xml'
--- purchase_override/purchase_view.xml	2013-10-08 08:56:01 +0000
+++ purchase_override/purchase_view.xml	2013-10-21 14:37:05 +0000
@@ -87,11 +87,11 @@
                     <xpath expr="/form/notebook//field[@name='dest_address_id']" position="replace">
                         <field name="dest_partner_id" attrs="{'invisible': [('order_type', '!=', 'direct')], 'required': [('order_type', '=', 'direct')], 'readonly': [('state', 'not in', ['draft', 'confirmed'])]}"
                             on_change="on_change_dest_partner_id(dest_partner_id)" />
-                        <field name="dest_address_id" domain="[('partner_id', '=', dest_partner_id)]" attrs="{'required': [('order_type', '=', 'direct')], 'readonly': [('state', 'not in', ['draft', 'confirmed'])]}" />
+                        <field name="dest_address_id" domain="[('dest_address', '=', dest_partner_id)]" attrs="{'required': [('order_type', '=', 'direct')], 'readonly': [('state', 'not in', ['draft', 'confirmed'])]}" />
                     </xpath>
                     <xpath expr="/form/notebook//field[@name='fiscal_position']" position="after">
                         <field name="invoice_address_id"
-                            domain="[('partner_id', 'in', [dest_partner_id, company_id])]"
+                            domain="[('inv_address', 'in', [company_id])]"
                             context="contact_display='partner_address'"
                             attrs="{'required': [('order_type', '=', 'direct')], 'readonly': [('state', 'not in', ['draft', 'confirmed'])]}"
                             />
@@ -251,6 +251,18 @@
                   name="Address Book"
                   parent="purchase.menu_purchase_config_purchase" />
 
+        <record id="res_partner_address_list_view" model="ir.ui.view">
+            <field name="name">res.partner.address.list.view</field>
+            <field name="model">res.partner.address</field>
+            <field name="type">tree</field>
+            <field name="inherit_id" ref="base.view_partner_address_tree" />
+            <field name="arch" type="xml">
+                <xpath expr="/tree//field[@name='name']" position="after">
+                    <field name="street" />
+                </xpath>
+            </field>
+        </record>
+
         <record id="action_supplier_address_form" model="ir.actions.act_window">
             <field name="name">Addresses</field>
             <field name="type">ir.actions.act_window</field>

=== modified file 'purchase_override/report/rfq.rml'
--- purchase_override/report/rfq.rml	2013-08-20 09:01:06 +0000
+++ purchase_override/report/rfq.rml	2013-10-21 14:37:05 +0000
@@ -170,7 +170,7 @@
                     <para style="TextInformation"> </para>
                 </td>
                 <td>
-                    <para style="TextInformation">[[ objects[0].dest_address_id.name or objects[0].partner_id.name ]]</para>
+                    <para style="TextInformation">[[ objects[0].rfq_delivery_address and objects[0].rfq_delivery_address.partner_id and objects[0].rfq_delivery_address.partner_id.name or '' ]]</para>
                 </td>
                 <td>
                     <para style="TextInformation"> </para>
@@ -199,7 +199,7 @@
                     <para style="TextInformation"> </para>
                 </td>
                 <td>
-                    <para style="TextInformation">[[ objects[0].dest_address_id.street ]]</para>
+                    <para style="TextInformation">[[ objects[0].rfq_delivery_address and objects[0].rfq_delivery_address.street ]]</para>
                 </td>
                 <td>
                     <para style="TextInformation"> </para>
@@ -228,7 +228,7 @@
                     <para style="TextInformation"> </para>
                 </td>
                 <td>
-                    <para style="TextInformation">[[ objects[0].dest_address_id.street2 ]]</para>
+                    <para style="TextInformation">[[ objects[0].rfq_delivery_address and objects[0].rfq_delivery_address.street2 ]]</para>
                 </td>
                 <td>
                     <para style="TextInformation"> </para>
@@ -257,7 +257,7 @@
                     <para style="TextInformation"> </para>
                 </td>
                 <td>
-                    <para style="TextInformation">[[ objects[0].dest_address_id.zip ]] [[ objects[0].dest_address_id.city ]]</para>
+                    <para style="TextInformation">[[ objects[0].rfq_delivery_address and '%s %s' % (objects[0].rfq_delivery_address.zip objects[0].rfq_delivery_address.city) or '' ]]</para>
                 </td>
                 <td>
                     <para style="TextInformation"> </para>
@@ -286,7 +286,7 @@
                     <para style="TextInformation"> </para>
                 </td>
                 <td>
-                    <para style="TextInformation">[[ objects[0].dest_address_id.country_id and objects[0].dest_address_id.country_id.name or '' ]]</para>
+                    <para style="TextInformation">[[ objects[0].rfq_delivery_address and objects[0].rfq_delivery_address.country_id and objects[0].rfq_delivery_address.country_id.name or '' ]]</para>
                 </td>
                 <td>
                     <para style="TextInformation"> </para>
@@ -315,7 +315,7 @@
                     <para style="TextInformation"> </para>
                 </td>
                 <td>
-                    <para style="TextInformation">[[ objects[0].dest_address_id.phone ]]</para>
+                    <para style="TextInformation">[[ objects[0].rfq_delivery_address and objects[0].rfq_delivery_address.phone ]]</para>
                 </td>
                 <td>
                     <para style="TextInformation"> </para>
@@ -344,7 +344,7 @@
                     <para style="TextInformation"> </para>
                 </td>
                 <td>
-                    <para style="TextInformation">[[ objects[0].dest_address_id.email ]]</para>
+                    <para style="TextInformation">[[ objects[0].rfq_delivery_address and objects[0].rfq_delivery_address.email ]]</para>
                 </td>
                 <td>
                     <para style="TextInformation"> </para>

=== modified file 'tender_flow/tender_flow.py'
--- tender_flow/tender_flow.py	2013-10-14 12:58:21 +0000
+++ tender_flow/tender_flow.py	2013-10-21 14:37:05 +0000
@@ -111,6 +111,7 @@
                 'internal_state': fields.selection([('draft', 'Draft'),('updated', 'Rfq Updated'), ], string="Internal State", readonly=True),
                 'rfq_name_list': fields.function(_vals_get, method=True, string='RfQs Ref', type='char', readonly=True, store=False, multi='get_vals',),
                 'product_id': fields.related('tender_line_ids', 'product_id', type='many2one', relation='product.product', string='Product'),
+                'delivery_address': fields.many2one('res.partner.address', string='Delivery address', required=True),
                'tender_from_fo': fields.function(_is_tender_from_fo, method=True, type='boolean', string='Is tender from FO ?',),
                 }
     
@@ -127,6 +128,7 @@
     
     _order = 'name desc'
 
+<<<<<<< TREE
     def _check_restriction_line(self, cr, uid, ids, context=None):
         '''
         Check if there is no restrictive products in lines
@@ -142,6 +144,24 @@
 
         return res
 
+=======
+    def default_get(self, cr, uid, fields, context=None):
+        '''
+        Set default data
+        '''
+        # Object declaration
+        partner_obj = self.pool.get('res.partner')
+        user_obj = self.pool.get('res.users')
+
+        res = super(tender, self).default_get(cr, uid, fields, context=context)
+
+        # Get the delivery address
+        company = user_obj.browse(cr, uid, uid, context=context).company_id
+        res['delivery_address'] = partner_obj.address_get(cr, uid, company.partner_id.id, ['delivery'])['delivery']
+
+        return res
+
+>>>>>>> MERGE-SOURCE
     def _check_tender_from_fo(self, cr, uid, ids, context=None):
         if not context:
             context = {}
@@ -273,7 +293,7 @@
                 raise osv.except_osv(_('Warning !'), _('You must select at least one product!'))
             for supplier in tender.supplier_ids:
                 # create a purchase order for each supplier
-                address_id = partner_obj.address_get(cr, uid, [supplier.id], ['delivery'])['delivery']
+                address_id = partner_obj.address_get(cr, uid, [supplier.id], ['default'])['default']
                 if not address_id:
                     raise osv.except_osv(_('Warning !'), _('The supplier "%s" has no address defined!')%(supplier.name,))
                 pricelist_id = supplier.property_product_pricelist_purchase.id
@@ -291,6 +311,7 @@
                           'priority': tender.priority,
                           'details': tender.details,
                           'delivery_requested_date': tender.requested_date,
+                          'rfq_delivery_address': tender.delivery_address and tender.delivery_address.id or False,
                           }
                 # create the rfq - dic is udpated for default partner_address_id at purchase.order level
                 po_id = po_obj.create(cr, uid, values, context=dict(context, partner_id=supplier.id, rfq_ok=True))
@@ -511,7 +532,7 @@
                                                                }))
                     
                 # fill data corresponding to po creation
-                address_id = partner_obj.address_get(cr, uid, [line.supplier_id.id], ['delivery'])['delivery']
+                address_id = partner_obj.address_get(cr, uid, [line.supplier_id.id], ['default'])['default']
                 pricelist = line.supplier_id.property_product_pricelist_purchase.id,
                 if line.currency_id:
                     price_ids = self.pool.get('product.pricelist').search(cr, uid, [('type', '=', 'purchase'), ('currency_id', '=', line.currency_id.id)], context=context)
@@ -531,6 +552,7 @@
                              'warehouse_id': tender.warehouse_id.id,
                              'details': tender.details,
                              'delivery_requested_date': tender.requested_date,
+                             'dest_address_id': tender.delivery_address.id,
                              }
                 data[line.supplier_id.id].update(po_values)
             
@@ -881,6 +903,8 @@
         values = super(procurement_order, self).po_values_hook(cr, uid, ids, context=context, *args, **kwargs)
         procurement = kwargs['procurement']
 
+        values['partner_address_id'] = self.pool.get('res.partner').address_get(cr, uid, [values['partner_id']], ['default'])['default']
+
         # set tender link in purchase order
         if procurement.tender_id:
             values['origin_tender_id'] = procurement.tender_id.id
@@ -918,6 +942,7 @@
                 return False
         return True
     _columns = {'tender_id': fields.many2one('tender', string="Tender", readonly=True),
+                'rfq_delivery_address': fields.many2one('res.partner.address', string='Delivery address'),
                 'origin_tender_id': fields.many2one('tender', string='Tender', readonly=True),
                 'rfq_ok': fields.boolean(string='Is RfQ ?'),
                 'state': fields.selection(PURCHASE_ORDER_STATE_SELECTION, 'State', readonly=True, help="The state of the purchase order or the quotation request. A quotation is a purchase order in a 'Draft' state. Then the order has to be confirmed by the user, the state switch to 'Confirmed'. Then the supplier must confirm the order to change the state to 'Approved'. When the purchase order is paid and received, the state becomes 'Closed'. If a cancel action occurs in the invoice or in the reception of goods, the state becomes in exception.", select=True),
@@ -934,6 +959,22 @@
             'You must specify a Valid Till date.',
             ['valid_till']),]
 
+    def default_get(self, cr, uid, fields, context=None):
+        '''
+        Set default data
+        '''
+        # Object declaration
+        partner_obj = self.pool.get('res.partner')
+        user_obj = self.pool.get('res.users')
+
+        res = super(purchase_order, self).default_get(cr, uid, fields, context=context)
+
+        # Get the delivery address
+        company = user_obj.browse(cr, uid, uid, context=context).company_id
+        res['rfq_delivery_address'] = partner_obj.address_get(cr, uid, company.partner_id.id, ['delivery'])['delivery']
+
+        return res
+
     def create(self, cr, uid, vals, context=None):
         '''
         Set the reference at this step

=== modified file 'tender_flow/tender_flow_view.xml'
--- tender_flow/tender_flow_view.xml	2013-08-30 14:16:23 +0000
+++ tender_flow/tender_flow_view.xml	2013-10-21 14:37:05 +0000
@@ -20,6 +20,7 @@
                         <field name="categ" attrs="{'readonly': [('state', '!=', 'draft')]}" 
                         on_change="onchange_categ(categ)"/>
                         <field name="priority" attrs="{'readonly': [('state', '!=', 'draft')]}" />
+                        <field name="delivery_address" colspan="4" attrs="{'readonly': [('state', '!=', 'draft')]}" domain="[('dest_address', '=', company_id)]"/>
                         <field name="details" />
                     </group>
                     <notebook colspan="5">
@@ -184,9 +185,15 @@
             <field name="arch" type="xml">
                 <data>
                     <field name="details" position="after">
+                        <newline />
+                        <field name="valid_till" attrs="{'invisible': [('rfq_ok', '=', False)],'readonly': [('state', 'in', ['sourced', 'split', 'rfq_updated', 'draft', 'done', 'cancel', 'confirmed', 'approved', 'except_picking', 'except_invoice'])]}" />
                         <field name="tender_id" attrs="{'invisible': [('rfq_ok', '=', False)],'readonly': [('state', 'in', ['sourced', 'split', 'rfq_updated', 'done', 'cancel', 'confirmed', 'approved', 'except_picking', 'except_invoice'])]}" />
-                        <field name="valid_till" attrs="{'invisible': [('rfq_ok', '=', False)],'readonly': [('state', 'in', ['sourced', 'split', 'rfq_updated', 'draft', 'done', 'cancel', 'confirmed', 'approved', 'except_picking', 'except_invoice'])]}" />
                         <field name="rfq_ok" invisible="1" />
+                        <field
+                            name="rfq_delivery_address" 
+                            colspan="4"
+                            domain="[('dest_address', '=', company_id)]"
+                            attrs="{'invisible': [('rfq_ok', '=', False)], 'readonly': ['|', ('tender_id', '!=', False), ('state', 'in', ['sourced', 'split', 'rfq_updated', 'done', 'cancel', 'confirmed', 'approved', 'except_picking', 'except_invoice'])]}" />
                     </field>
 
                     <xpath expr="/form/notebook//page[@string='Delivery &amp; Invoicing']" position="attributes">