Merge lp:~agilebg/openobject-italia/imp_save_fiscalcode_data into lp:~nicolariolini/openobject-italia/save_fiscalcode_data

[Lorenzo Battistini]

[Nicola Riolini - Micronaet (nicolariolini)]

Direi che ha migliorato aspetto :)
Ok per me

[Lorenzo Battistini (elbati)]

On 11/08/2013 11:14 AM, Nicola Riolini - Micronaet wrote:
> Direi che ha migliorato aspetto :)
> Ok per me

Puoi mergiarlo nel tuo branch con

bzr merge lp:~agilebg/openobject-italia/imp_save_fiscalcode_data

[Nicola Riolini - Micronaet (nicolariolini)]

grazie, ho visto il suggerimento di Launchapad, spero di non avere fatto casini :)

[Lorenzo Battistini (elbati)]

On 11/08/2013 11:21 AM, Nicola Riolini - Micronaet wrote:
> grazie, ho visto il suggerimento di Launchapad, spero di non avere fatto casini :)

Non ne hai fatti :-)

=== modified file 'l10n_it_fiscalcode/fiscalcode.py'
--- l10n_it_fiscalcode/fiscalcode.py	2013-11-08 09:43:06 +0000
+++ l10n_it_fiscalcode/fiscalcode.py	2013-11-08 10:03:22 +0000
@@ -20,10 +20,6 @@
 ##############################################################################
 
 from osv import fields, osv
-import tools
-import pooler
-from tools.translate import _
-import datetime
 
 
 class res_partner(osv.osv):

=== modified file 'l10n_it_fiscalcode/wizard/compute_fc.py'
--- l10n_it_fiscalcode/wizard/compute_fc.py	2013-11-08 09:43:06 +0000
+++ l10n_it_fiscalcode/wizard/compute_fc.py	2013-11-08 10:03:22 +0000
@@ -20,8 +20,6 @@
 ##############################################################################
 
 from osv import fields, osv
-import tools
-import pooler
 from tools.translate import _
 import datetime
 
@@ -44,17 +42,26 @@
 
     _defaults = {
         # Leggo da res.partner i dati se presenti per impostarli come default:
-        'fiscalcode_surname': lambda s, cr, uid, c: s.get_default_from_partner(
-                                    cr, uid, 'fiscalcode_surname', context=c),
-        'fiscalcode_firstname': lambda s, cr, uid, c:
-                                  s.get_default_from_partner(cr, uid,
-                                      'fiscalcode_firstname', context=c),
-        'birth_date': lambda s, cr, uid, c: s.get_default_from_partner(cr, uid,
-                                      'birth_date', context=c),
-        'birth_city': lambda s, cr, uid, c: s.get_default_from_partner(cr, uid,
-                                      'birth_city', context=c),
-        'sex': lambda s, cr, uid, c: s.get_default_from_partner(cr, uid, 'sex',
-                                      context=c),
+        'fiscalcode_surname': (
+            lambda s, cr, uid, c: s.get_default_from_partner(
+                cr, uid, 'fiscalcode_surname', context=c)
+            ),
+        'fiscalcode_firstname': (
+            lambda s, cr, uid, c: s.get_default_from_partner(
+                cr, uid, 'fiscalcode_firstname', context=c)
+            ),
+        'birth_date': (
+            lambda s, cr, uid, c: s.get_default_from_partner(
+                cr, uid, 'birth_date', context=c)
+            ),
+        'birth_city': (
+            lambda s, cr, uid, c: s.get_default_from_partner(
+                cr, uid, 'birth_city', context=c)
+            ),
+        'sex': (
+            lambda s, cr, uid, c: s.get_default_from_partner(
+                cr, uid, 'sex', context=c)
+            ),
     }
 
     def get_default_from_partner(self, cr, uid, field, context=None):
@@ -69,7 +76,7 @@
             if not partner_id:
                 return False
             partner_proxy = self.pool.get('res.partner').browse(
-                                        cr, uid, partner_id, context=context)
+                cr, uid, partner_id, context=context)
             res = partner_proxy.__getattr__(field)
 
             if field == 'birth_city':  # many2one
@@ -158,10 +165,12 @@
                                                       context)
         form_obj = self.browse(cr, uid, ids, context)
         for fields in form_obj:
-            if (not fields.fiscalcode_surname or
+            if (
+                not fields.fiscalcode_surname or
                 not fields.fiscalcode_firstname or
                 not fields.birth_date or
-                not fields.birth_city or not fields.sex):
+                not fields.birth_city or not fields.sex
+            ):
                 raise osv.except_osv(_('Error'),
                                      _('One or more fields are missing'))
             if not fields.birth_city.cadaster_code:
@@ -169,9 +178,10 @@
                                      _('Cataster code is missing'))
             birth_date = datetime.datetime.strptime(fields.birth_date,
                                                     "%Y-%m-%d")
-            CF = self._codicefiscale(fields.fiscalcode_surname,
-                                     fields.fiscalcode_firstname,
-                                     str(birth_date.day),
+            CF = self._codicefiscale(
+                fields.fiscalcode_surname,
+                fields.fiscalcode_firstname,
+                str(birth_date.day),
                 str(birth_date.month), str(birth_date.year), fields.sex,
                 fields.birth_city.cadaster_code)
             if partner.fiscalcode and partner.fiscalcode != CF:
@@ -181,13 +191,16 @@
                          one (%s). If you want to use the computed one, remove
                          the existing one') % (partner.fiscalcode, CF"""))
             self.pool.get('res.partner').write(
-                        cr, uid, active_id,
-                        {'fiscalcode': CF,
-                         'individual': True,
-                         # Storicizzo in res.partner i dati usati dal wizard
-                         'fiscalcode_surname': fields.fiscalcode_surname,
-                         'fiscalcode_firstname': fields.fiscalcode_firstname,
-                         'birth_date': fields.birth_date,
-                         'birth_city': fields.birth_city.id if fields.birth_city else False,
-                         'sex': fields.sex, })
+                cr, uid, active_id,
+                {'fiscalcode': CF,
+                 'individual': True,
+                 # Storicizzo in res.partner i dati usati dal wizard
+                 'fiscalcode_surname': fields.fiscalcode_surname,
+                 'fiscalcode_firstname': fields.fiscalcode_firstname,
+                 'birth_date': fields.birth_date,
+                 'birth_city': (
+                     fields.birth_city.id if fields.birth_city
+                     else False
+                     ),
+                 'sex': fields.sex, })
         return {}