Merge lp:~therp-nl/therp-addons/7.0-partner_name_dutch_use_refactoring into lp:~therp-nl/therp-addons/7.0

[Holger Brunn (Therp)]

[Stefan Rijnhart (Opener) (stefan-opener)]

tnx!

review: Approve

=== modified file 'partner_name_dutch/model/res_partner.py'
--- partner_name_dutch/model/res_partner.py	2013-10-01 12:00:28 +0000
+++ partner_name_dutch/model/res_partner.py	2014-07-17 08:31:10 +0000
@@ -25,36 +25,34 @@
 
 class res_partner(Model):
     _inherit = 'res.partner'
-    _name_fields = ['firstname', 'lastname', 'initials', 'infix']
-
-    def _compute_name_custom(self, cursor, uid, ids, fname, arg,
-                             context=None):
-        if context is None:
-            context = {}
-
+
+    def _prepare_name_custom(self, cursor, uid, partner, context=None):
         name_template = Template(
-                context.get(
-                    'name_format',
-                    "${firstname or initials or ''}"
-                    "${(firstname or initials) and ' ' or ''}"
-                    "${infix or ''}${infix and ' ' or ''}${lastname}"))
-
-        result = {}
-        for rec in self.read(cursor, uid, ids, self._name_fields):
-            result[rec['id']] = name_template.render(**rec)
-        return result
-
-    def _write_name(self, cursor, uid, partner_id, field_name, field_value,
-            arg, context=None):
-        return super(res_partner, self)._write_name(
-                cursor, uid, partner_id, field_name, field_value, arg,
-                context=context)
+            context.get(
+                'name_format',
+                "${p.firstname or p.initials or ''}"
+                "${(p.firstname or p.initials) and ' ' or ''}"
+                "${p.infix or ''}${p.infix and ' ' or ''}${p.lastname}"))
+
+        return name_template.render(p=partner)
 
     _columns = {
-            'name': fields.function(_compute_name_custom, string="Name",
-                type="char", store=True,
-                select=True, readonly=True,
-                fnct_inv=_write_name),
-            'initials': fields.char('Initials', size=8),
-            'infix': fields.char('Infix', size=32),
-            }
+        'initials': fields.char('Initials', size=8),
+        'infix': fields.char('Infix', size=32),
+    }
+
+    def _register_hook(self, cr):
+        #if firstname_display_name_trigger is installed, add our keys to
+        #the trigger
+        if hasattr(self, '_display_name_store_triggers'):
+            self._display_name_store_triggers[self._name][1].extend(
+                ['infix', 'initials'])
+            for trigger in self.pool._store_function[self._name]:
+                if trigger[0] != self._name or trigger[1] != 'display_name':
+                    continue
+                self.pool._store_function[self._name].append(
+                    trigger[:3] +
+                    ((trigger[3] + ('infix', 'initials')), ) +
+                    trigger[4:])
+                self.pool._store_function[self._name].remove(trigger)
+                break