Merge lp:~vauxoo/openobject-server/customization_address_field-dev-julio into lp:openobject-server

[Julio Serna-http://www.vauxoo.com]

add new function to customize by code the fields receives the function _display_address()

[lp:~vauxoo/openobject-server/customization_address_field-dev-julio]

4787. By Raphael Collet (OpenERP) on 2013-02-13

[MERGE] trunk-methflow-thu: add model methods to create/delete/interact with the worflow instances of records

4788. By Raphael Collet (OpenERP) on 2013-02-13

[IMP] openerp.osv.orm: add optional context in method that handles workflow signal

4789. By Vo Minh Thu on 2013-02-13

[DOC] Updated changelog.

4790. By Raphael Collet (OpenERP) on 2013-02-13

[MERGE] trunk-methflow-thu (refactor existing workflow methods in models)

4791. By Raphael Collet (OpenERP) on 2013-02-13

[IMP] doc: add missing documentation on new methods

4792. By Raphael Collet (OpenERP) on 2013-02-14

[FIX] openerp/service/report: missing import

4793. By Raphael Collet (OpenERP) on 2013-02-14

[FIX] openerp/service/report: add all missing imports!

4794. By Quentin (OpenERP) <email address hidden> on 2013-02-15

[MERGE] merged the branch with the RedirectWarnings

4795. By Launchpad Translations on behalf of openerp on 2013-02-17

Launchpad automatic translations update.

4796. By Vo Minh Thu on 2013-02-18

[MERGE] merged long-polling branch:

When using --workers, an evented (for longpolling) worker is started.
When passing --gevent, all the server is evented but the cron is disabled.

4797. By Vo Minh Thu on 2013-02-18

[FIX] openerp namespace: the import hook was still inserting modules in sys.moduls at their shortname.

4798. By Vo Minh Thu on 2013-02-19

[DOC] Added section `Process model` to talk a bit about the recently merged longpolling feature.

4799. By Vo Minh Thu on 2013-02-19

[FIX] cron: push the registry signaling checks in the try/except of the job itself.

4800. By Vo Minh Thu on 2013-02-19

[FIX] oe drop: correctly call netsvc.init_logger(), and use pid instead of procpid under postgres 9.2.

4801. By Anto on 2013-02-20

[IMP] exceptions tests: use another xml_menu_id that leads directly to the tests wizard.
also use an int instead of a tuple in the exception's constructor

4802. By Olivier Dony (Odoo) on 2013-02-20

[MERGE] search: when count=True, execute main query as a subquery to avoid side effects with offset and limit

Granted, calling search() with both count=True and
offset or limit is not extremely useful, but
it is still better to accept it and apply it
to the inner query rather than have silly
errors

4803. By Anto on 2013-02-22

[MERGE] res_config: improve documentation

4804. By Fabien (Open ERP) on 2013-02-24

[FIX] write country if code is null

4805. By Fabien (Open ERP) on 2013-02-24

[iMP] error message simplified for required values

4806. By Vo Minh Thu on 2013-02-25

[FIX] Previous `[iMP]` was broken.

4807. By Vo Minh Thu on 2013-02-25

[MERGE] netrpc: support for netrpc was already removed, but command line flags and docs were not updated.

4808. By Vo Minh Thu on 2013-02-25

[MERGE] netsvc/service.model: added missing/removed unnecessary `except` clauses.

4809. By Launchpad Translations on behalf of openerp on 2013-02-26

Launchpad automatic translations update.

4810. By Vo Minh Thu on 2013-02-26

[MERGE] safe_eval: do not log reported exception, instead re-raise them with a complete stacktrace and the evaluated expression.

4811. By Vo Minh Thu on 2013-02-26

[MERGE] Better exception handling in tools.convert:

- The exception is not logged in tools.convert. It is loggeg by the netsv layer anyway.
- The exception is re-raised instead, but with the full traceback available.
- A fix in openerp.service.db where the cr is closed twice.

4812. By Olivier Dony (Odoo) on 2013-02-26

[MERGE] res.config: fix incorrect assertion syntax in tests

4813. By Nicolas Vanhoren (OpenERP) on 2013-02-26

[FIX] typo that caused crash in cron only when launching server with --workers

4814. By Julio Serna-http://www.vauxoo.com on 2013-02-26

[REF] Refactory in constant fields to function get_fields

[Vo Minh Thu (thu)]

Olivier lets me know that equivalent changes have been made in 7.0 (and will be forward ported to trunk later). Thanks though.

Unmerged revisions

4814. By Julio Serna-http://www.vauxoo.com on 2013-02-26

[REF] Refactory in constant fields to function get_fields

=== modified file 'openerp/addons/base/res/res_partner.py'
--- openerp/addons/base/res/res_partner.py	2013-01-14 17:43:55 +0000
+++ openerp/addons/base/res/res_partner.py	2013-02-26 18:34:20 +0000
@@ -159,9 +159,6 @@
     res = lang_pool.read(cr, uid, ids, ['code', 'name'], context)
     return [(r['code'], r['name']) for r in res]
 
-POSTAL_ADDRESS_FIELDS = ('street', 'street2', 'zip', 'city', 'state_id', 'country_id')
-ADDRESS_FIELDS = POSTAL_ADDRESS_FIELDS + ('email', 'phone', 'fax', 'mobile', 'website', 'ref', 'lang')
-
 class res_partner(osv.osv, format_address):
     _description = 'Partner'
     _name = "res.partner"
@@ -331,7 +328,7 @@
 
         if use_parent_address and parent_id:
             parent = self.browse(cr, uid, parent_id, context=context)
-            return {'value': dict((key, value_or_id(parent[key])) for key in ADDRESS_FIELDS)}
+            return {'value': dict((key, value_or_id(parent[key])) for key in self._get_address_field())}
         return {}
 
     def onchange_state(self, cr, uid, ids, state_id, context=None):
@@ -390,7 +387,7 @@
         return super(res_partner,self).create(cr, uid, vals, context=context)
 
     def update_address(self, cr, uid, ids, vals, context=None):
-        addr_vals = dict((key, vals[key]) for key in POSTAL_ADDRESS_FIELDS if vals.get(key))
+        addr_vals = dict((key, vals[key]) for key in self._get_postal_address_field() if vals.get(key))
         if addr_vals:
             return super(res_partner, self).write(cr, uid, ids, addr_vals, context)
 
@@ -540,6 +537,19 @@
                                                 ('name','=','main_partner')])[0],
                 ).res_id
 
+    def _get_address_field(self):
+        address_fields = self._get_postal_address_field() + ('email', 'phone', 'fax', 'mobile', 'website', 'ref', 'lang')
+        return address_fields 
+            
+    def _get_display_address_field(self):
+        address_display_field = ['title', 'street', 'street2', 'zip', 'city']
+        return address_display_field
+    
+    def _get_postal_address_field(self):
+        postal_address_fields = ('street', 'street2', 'zip', 'city', 'state_id', 'country_id')
+        return postal_address_fields
+    
+        
     def _display_address(self, cr, uid, address, without_company=False, context=None):
 
         '''
@@ -563,8 +573,7 @@
             'country_name': address.country_id and address.country_id.name or '',
             'company_name': address.parent_id and address.parent_id.name or '',
         }
-        address_field = ['title', 'street', 'street2', 'zip', 'city']
-        for field in address_field :
+        for field in self._get_display_address_field():
             args[field] = getattr(address, field) or ''
         if without_company:
             args['company_name'] = ''