Merge lp:~openerp-dev/openobject-server/trunk-imp-onchange-behave-darshan into lp:openobject-server

[Thibault Delavallée (OpenERP)]

[lp:~openerp-dev/openobject-server/trunk-imp-onchange-behave-darshan]

4941. By Darshan Kalola(OpenERP) on 2013-09-24

[IMP]Improve onchange behave with seperate onchange method for use parent address.

4942. By Darshan Kalola(OpenERP) on 2013-09-24

[MERGE]merged with lp:openobject-server

4943. By Darshan Kalola(OpenERP) on 2013-09-27

[IMP]improve attrs on use_parent_address.

[Mustufa Rangwala (Open ERP) (mra-tinyerp)]

Remove else line 23 put value in defaults. Rename parent variable with parent_company.

Regards,
Mustufa Rangwala

review: Needs Fixing

[lp:~openerp-dev/openobject-server/trunk-imp-onchange-behave-darshan]

4944. By Darshan Kalola(OpenERP) on 2013-10-03

[IMP]Rename parent variable with parent_company.

4945. By Darshan Kalola(OpenERP) on 2014-01-24

[MERGE]sync with trunk.

4946. By Darshan Kalola(OpenERP) on 2014-02-07

[MERGE]sync with trunk.

4947. By Darshan Kalola(OpenERP) on 2014-03-06

[MERGE]sync with trunk.

4948. By Darshan Kalola(OpenERP) on 2014-04-09

[MERGE]sync with trunk.

4949. By Darshan Kalola(OpenERP) on 2014-04-17

[IMP]removed use_company_address method, added same feature in single method, to achive this added new parameter 'empty_fields' to empty all address field when use compny address is unchecked.

4950. By Darshan Kalola(OpenERP) on 2014-04-17

[MERGE]sync with trunk.

Unmerged revisions

=== modified file 'openerp/addons/base/res/res_partner.py'
--- openerp/addons/base/res/res_partner.py	2013-09-10 12:12:30 +0000
+++ openerp/addons/base/res/res_partner.py	2013-10-03 07:35:46 +0000
@@ -358,11 +358,25 @@
         value = {}
         value['title'] = False
         if is_company:
+            value['use_parent_address'] = False
             domain = {'title': [('domain', '=', 'partner')]}
         else:
             domain = {'title': [('domain', '=', 'contact')]}
         return {'value': value, 'domain': domain}
 
+    def onchange_use_address(self, cr, uid, ids, use_parent_address, parent_id, context=None):
+        def value_or_id(val):
+            """ return val or val.id if val is a browse record """
+            return val if isinstance(val, (bool, int, long, float, basestring)) else val.id
+        result = {}
+        address_fields = self._address_fields(cr, uid, context=context)
+        if parent_id and use_parent_address:
+            parent_company = self.browse(cr, uid, parent_id, context=context)
+            result['value'] = dict((key, value_or_id(parent_company[key])) for key in address_fields)
+        else:
+            result['value'] = dict((key,"") for key in address_fields)
+        return result
+
     def onchange_address(self, cr, uid, ids, use_parent_address, parent_id, context=None):
         def value_or_id(val):
             """ return val or val.id if val is a browse record """
@@ -377,9 +391,10 @@
                                                       'was never correctly set. If an existing contact starts working for a new '
                                                       'company then a new contact should be created under that new '
                                                       'company. You can use the "Discard" button to abandon this change.')}
-            parent = self.browse(cr, uid, parent_id, context=context)
+            parent_company = self.browse(cr, uid, parent_id, context=context)
             address_fields = self._address_fields(cr, uid, context=context)
-            result['value'] = dict((key, value_or_id(parent[key])) for key in address_fields)
+            if use_parent_address:
+                result['value'] = dict((key, value_or_id(parent_company[key])) for key in address_fields)
         else:
             result['value'] = {'use_parent_address': False}
         return result

=== modified file 'openerp/addons/base/res/res_partner_view.xml'
--- openerp/addons/base/res/res_partner_view.xml	2013-06-14 12:05:40 +0000
+++ openerp/addons/base/res/res_partner_view.xml	2013-10-03 07:35:46 +0000
@@ -157,9 +157,9 @@
                             <label for="street" string="Address"/>
                             <div>
                                 <field name="use_parent_address" class="oe_edit_only oe_inline"
-                                       on_change="onchange_address(use_parent_address, parent_id)"
-                                       attrs="{'invisible': [('parent_id','=', False),('use_parent_address','=',False)]}"/>
-                                <label for="use_parent_address" class="oe_edit_only" attrs="{'invisible': [('parent_id','=', False),('use_parent_address','=',False)]}"/>
+                                       on_change="onchange_use_address(use_parent_address, parent_id)"
+                                       attrs="{'invisible': ['|', ('is_company', '=', True),('parent_id', '=', False)]}"/>
+                                <label for="use_parent_address" class="oe_edit_only" attrs="{'invisible': ['|', ('is_company', '=', True), ('parent_id', '=', False)]}"/>
                                 <button name="open_parent" type="object" string="(edit company address)" class="oe_link oe_edit_only"
                                         attrs="{'invisible': ['|',('parent_id','=', False),('use_parent_address','=',False)]}"/>
                                 <field name="street" placeholder="Street..."  attrs="{'readonly': [('use_parent_address','=',True)]}"/>
@@ -188,7 +188,7 @@
 
                     <notebook colspan="4">
                         <page string="Contacts" attrs="{'invisible': [('is_company','=',False), ('child_ids', '=', [])]}" autofocus="autofocus">
-                            <field name="child_ids" mode="kanban" context="{'default_parent_id': active_id, 'default_street': street, 'default_street2': street2, 'default_city': city, 'default_state_id': state_id, 'default_zip': zip, 'default_country_id': country_id, 'default_supplier': supplier, 'default_customer': customer}">
+                            <field name="child_ids" mode="kanban" context="{'default_parent_id': active_id, 'default_street': street, 'default_street2': street2, 'default_city': city, 'default_state_id': state_id, 'default_zip': zip, 'default_country_id': country_id, 'default_supplier': supplier, 'default_customer': customer, 'default_use_parent_address': True}">
                                 <kanban>
                                     <field name="color"/>
                                     <field name="name"/>