ufload3 2.4__tar.gz → 2.6__tar.gz

{ufload3-2.4/ufload3.egg-info → ufload3-2.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ufload3
-Version: 2.4
+Version: 2.6
 Summary: UniField  python3 loader
 Author: MSF
 Project-URL: Homepage, https://github.com/Unifield/ufload3

{ufload3-2.4 → ufload3-2.6}/ufload3/__init__.py

@@ -1,7 +1,7 @@
 from . import cloud; assert cloud
 from . import db; assert db
 
-__version__ = '2.4'
+__version__ = '2.6'
 
 # null progress, can be overridden by importers
 def _progress(p):

{ufload3-2.4 → ufload3-2.6}/ufload3/db.py

@@ -403,6 +403,9 @@ def delive(args, db):
     rc = psql(args, 'alter table users_last_login ADD COLUMN IF NOT EXISTS date_prod_value timestamp without time zone;', db)
     rc = psql(args, 'update users_last_login set date_prod_value=date;', db)
 
+    rc = psql(args, 'alter table res_users ADD COLUMN IF NOT EXISTS user_email_prod_value varchar(240);', db)
+    rc = psql(args, 'update res_users set user_email_prod_value=user_email;', db)
+
     rc = psql(args, 'update sync_client_sync_server_connection set automatic_patching = \'f\', protocol = \'xmlrpc\', login = \'%s\', database = \'%s\', host = \'127.0.0.1\', port = %d;' % (adminuser, ss, port), db)
     if rc != 0:
         return rc
@@ -564,9 +567,7 @@ def delive(args, db):
                     where d.name = '%s' and u.id = %s """ % (new_user_dpt, new_userid), db)
 
             if new_user_email:
-                rc, address_id = psql(args, """ insert into res_partner_address (name, email) values ('%s', '%s') returning id """ % (new_user_name, new_user_email), db, silent=True)
-                if address_id:
-                    psql(args,"update res_users set address_id=%s where id=%s" % (address_id, new_userid), db)
+                psql(args,"update res_users set user_email='%s' where id = %s" % (new_user_email, new_userid), db)
 
             for new_group in  groups.split(','):
                 rc = psql(args, " insert into res_groups_users_rel (uid, gid) (select %s, id from res_groups where name='%s');" % (new_userid, new_group), db)
@@ -582,9 +583,7 @@ def delive(args, db):
                             where d.name = '%s' and u.login = '%s' """ % (new_user_dpt, login), db)
 
                 if new_user_email:
-                    rc, address_id = psql(args, """ insert into res_partner_address (name, email) values ('%s', '%s') returning id """ % (login, new_user_email), db, silent=True)
-                    if address_id:
-                        psql(args,"update res_users set address_id=%s where login='%s'" % (address_id, login), db)
+                    psql(args,"update res_users set user_email='%s' where login='%s'" % (new_user_email, login), db)
 
             except ValueError:
                 ufload3.progress("*** WARNING: invalid format %s" % userinfo)

{ufload3-2.4 → ufload3-2.6/ufload3.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ufload3
-Version: 2.4
+Version: 2.6
 Summary: UniField  python3 loader
 Author: MSF
 Project-URL: Homepage, https://github.com/Unifield/ufload3