Merge lp:~jfb-tempo-consulting/unifield-server/US-7941 into lp:unifield-server

[jftempo]

=== modified file 'bin/addons/msf_doc_import/purchase_order.py'
--- bin/addons/msf_doc_import/purchase_order.py	2020-12-14 16:49:10 +0000
+++ bin/addons/msf_doc_import/purchase_order.py	2021-04-15 08:08:32 +0000
@@ -65,12 +65,12 @@
         return result
 
     def export_po(self, cr, uid, ids, context=None):
-        auto_job_ids = self.pool.get('automated.export').search(cr, uid, [('function_id.method_to_call', '=', 'auto_export_validated_purchase_order'), ('active', '=', True)], context=context)
+        wiz = self.browse(cr, uid, ids[0], context)
+        auto_job_ids = self.pool.get('automated.export').search(cr, uid, [('function_id.method_to_call', '=', 'auto_export_validated_purchase_order'), ('active', '=', True), ('partner_id', '=', wiz.purchase_id.partner_id.id)], context=context)
         if not auto_job_ids:
             raise osv.except_osv(_('Warning'), _('The job to export PO is not active.'))
 
         auto_job = self.pool.get('automated.export').browse(cr, uid, auto_job_ids[0], context=context)
-        wiz = self.browse(cr, uid, ids[0], context)
 
 
         processed, rejected, trash = self.pool.get('purchase.order').auto_export_validated_purchase_order(cr, uid, auto_job, [wiz.purchase_id.id], context=context)
@@ -126,11 +126,26 @@
         for id in ids:
             ret[id] = False
 
-        if not self.pool.get('automated.export').search_exist(cr, uid, [('function_id.method_to_call', '=', 'auto_export_validated_purchase_order'), ('active', '=', True)], context=context):
-            return ret
-
-        for x in self.search(cr, uid, [('id', 'in', ids), ('partner_type', '=', 'esc'), ('state', 'in', ['validated', 'validated_p'])], context=context):
-            ret[x] = True
+        if not ids:
+            return {}
+
+        cr.execute('''
+            select o.id
+                from
+                    purchase_order o, automated_export exp, automated_export_function fnct
+                where
+                    o.id in %s and
+                    o.partner_type = 'esc' and
+                    o.state in ('validated', 'validated_p') and
+                    o.partner_id = exp.partner_id and
+                    exp.active = 't' and
+                    exp.function_id = fnct.id and
+                    fnct.method_to_call = 'auto_export_validated_purchase_order'
+        ''', (tuple(ids), ))
+
+        for x in cr.fetchall():
+            ret[x[0]] = True
+
         return ret
 
     _columns = {
@@ -390,7 +405,8 @@
                 ('partner_type', '=', 'esc'),
                 ('state', 'in', ['validated', 'validated_p']),
                 ('auto_exported_ok', '=', False),
-            ], context= context)
+                ('partner_id', '=', export_wiz.partner_id.id),
+            ], context=context)
 
         if not po_ids:
             msg = _('No PO to export !')

=== modified file 'bin/addons/msf_profile/data/patches.xml'
--- bin/addons/msf_profile/data/patches.xml	2021-02-04 16:31:58 +0000
+++ bin/addons/msf_profile/data/patches.xml	2021-04-15 08:08:32 +0000
@@ -647,5 +647,10 @@
             <field name="method">us_6796_hide_prod_status_inconsistencies</field>
         </record>
 
+        <!-- UF21.0 -->
+        <record id="us_7941_auto_vi_set_partner" model="patch.scripts">
+            <field name="method">us_7941_auto_vi_set_partner</field>
+        </record>
+
     </data>
 </openerp>

=== modified file 'bin/addons/msf_profile/msf_profile.py'
--- bin/addons/msf_profile/msf_profile.py	2021-02-04 16:31:58 +0000
+++ bin/addons/msf_profile/msf_profile.py	2021-04-15 08:08:32 +0000
@@ -51,6 +51,29 @@
     _defaults = {
         'model': lambda *a: 'patch.scripts',
     }
+    # UF21.0
+    def us_7941_auto_vi_set_partner(self, cr, uid, *a, **b):
+        cr.execute('''
+            update automated_import imp set partner_id = (select id from res_partner where ref='APU' and partner_type='esc' LIMIT 1)
+                from automated_import_function function
+            where
+                function.id = imp.function_id and
+                imp.partner_id is null and
+                function.multiple='t'
+        ''')
+        self._logger.warn('APU set on %s VI import.' % (cr.rowcount,))
+
+        cr.execute('''
+            update automated_export exp set partner_id = (select id from res_partner where ref='APU' and partner_type='esc' LIMIT 1)
+                from automated_export_function function
+            where
+                function.id = exp.function_id and
+                exp.partner_id is null and
+                function.multiple='t'
+        ''')
+        self._logger.warn('APU set on %s VI export.' % (cr.rowcount,))
+
+        return True
 
     # UF20.0
     def us_7866_fill_in_target_cc_code(self, cr, uid, *a, **b):

=== modified file 'bin/addons/msf_tools/automated_export.py'
--- bin/addons/msf_tools/automated_export.py	2020-09-18 13:38:52 +0000
+++ bin/addons/msf_tools/automated_export.py	2021-04-15 08:08:32 +0000
@@ -33,6 +33,16 @@
 
 class automated_export(osv.osv):
     _name = 'automated.export'
+    _order = 'name, id'
+
+    def _auto_init(self, cr, context=None):
+        res = super(automated_export, self)._auto_init(cr, context)
+        # migration delete old constraint
+        cr.drop_constraint_if_exists('automated_export', 'automated_export_export_function_id_uniq')
+        cr.execute("SELECT indexname FROM pg_indexes WHERE indexname = 'automated_export_function_id_partner_id_uniq'")
+        if not cr.fetchone():
+            cr.execute("CREATE UNIQUE INDEX automated_export_function_id_partner_id_uniq ON automated_export (function_id, coalesce(partner_id, 0))")
+        return res
 
     _columns = {
         'name': fields.char(
@@ -77,6 +87,7 @@
             required=True,
         ),
         'disable_cron': fields.related('function_id', 'disable_cron', string='Cron disabled', type='boolean', write_relate=False),
+        'multiple': fields.related('function_id', 'multiple', string='Multiple', type='boolean', write_relate=False),
         'export_format': fields.selection(
             selection=[
                 ('excel', 'Excel'),
@@ -109,6 +120,7 @@
         'ftp_dest_ok': fields.boolean(string='on FTP server', help='Is given path is located on FTP server ?'),
         'ftp_dest_fail_ok': fields.boolean(string='on FTP server', help='Is given path is located on FTP server ?'),
         'ftp_report_ok': fields.boolean(string='on FTP server', help='Is given path is located on FTP server ?'),
+        'partner_id': fields.many2one('res.partner', 'Partner', domain=[('supplier', '=', True), ('partner_type', '=', 'esc')]),
 
     }
 
@@ -127,10 +139,11 @@
             _('Another Automated export with same name already exists (maybe inactive). Automated export name must be unique. Please select an other name.'),
         ),
         (
-            'export_function_id_uniq',
-            'unique(function_id)',
-            _('Another Automated export with same functionality already exists (maybe inactive). Only one automated export must be created for a '\
-              'same functionality. Please select an other functionality.'),
+            # declared in _auto_init
+            'function_id_partner_id_uniq',
+            '',
+            _('Another Automated export with same functionality and same partner already exists (maybe inactive). Only one automated export must be created for a '\
+              'same functionality and partner.'),
         ),
         (
             'export_positive_interval',
@@ -141,9 +154,12 @@
 
     def change_function_id(self, cr, uid, ids, function_id, context=None):
         disable_cron = False
+        multiple = False
         if function_id:
-            disable_cron = self.pool.get('automated.export.function').browse(cr, uid, function_id, context=context).disable_cron
-        return {'value': {'disable_cron': disable_cron}}
+            fct_data = self.pool.get('automated.export.function').browse(cr, uid, function_id, context=context)
+            disable_cron = fct_data.disable_cron
+            multiple = fct_data.multiple
+        return {'value': {'disable_cron': disable_cron, 'multiple': multiple}}
 
     def onchange_ftp_ok(self, cr, uid, ids, ftp_ok, context=None):
         if context is None:

=== modified file 'bin/addons/msf_tools/automated_export_data.xml'
--- bin/addons/msf_tools/automated_export_data.xml	2020-09-18 10:39:31 +0000
+++ bin/addons/msf_tools/automated_export_data.xml	2021-04-15 08:08:32 +0000
@@ -5,6 +5,7 @@
             <field name="name">Export validated Purchase Order</field>
             <field name="model_id" model="ir.model" search="[('model', '=', 'purchase.order')]" />
             <field name="method_to_call">auto_export_validated_purchase_order</field>
+            <field name="multiple" eval="True" />
         </record>
         <record id="auto_export_fnct_oca_finance_vi" model="automated.export.function">
             <field name="name">Export to HQ system (OCA) - Not yet exported</field>

=== modified file 'bin/addons/msf_tools/automated_export_function.py'
--- bin/addons/msf_tools/automated_export_function.py	2020-09-18 10:39:31 +0000
+++ bin/addons/msf_tools/automated_export_function.py	2021-04-15 08:08:32 +0000
@@ -45,11 +45,13 @@
             required=True,
         ),
         'disable_cron': fields.boolean('No cron'),
+        'multiple': fields.boolean('Allow multiple jobs'),
     }
 
     _defaults = {
         'method_to_call': lambda *a: 'export_data_from_csv',
         'disable_cron': False,
+        'multiple': False,
     }
 
     _order = 'name'

=== modified file 'bin/addons/msf_tools/automated_import.py'
--- bin/addons/msf_tools/automated_import.py	2020-10-20 12:50:50 +0000
+++ bin/addons/msf_tools/automated_import.py	2021-04-15 08:08:32 +0000
@@ -33,6 +33,16 @@
 
 class automated_import(osv.osv):
     _name = 'automated.import'
+    _order = 'name, id'
+
+    def _auto_init(self, cr, context=None):
+        res = super(automated_import, self)._auto_init(cr, context)
+        # migration delete old constraint
+        cr.drop_constraint_if_exists('automated_import', 'automated_import_import_function_id_uniq')
+        cr.execute("SELECT indexname FROM pg_indexes WHERE indexname = 'automated_import_function_id_partner_id_uniq'")
+        if not cr.fetchone():
+            cr.execute("CREATE UNIQUE INDEX automated_import_function_id_partner_id_uniq ON automated_import (function_id, coalesce(partner_id, 0))")
+        return res
 
     def _check_paths(self, cr, uid, ids, context=None):
         """
@@ -73,6 +83,44 @@
 
         return True
 
+    def _check_unicity(self, cr, uid, ids, context=None):
+        '''
+            if the function_id allows multiple then the server / src_path must be unique
+            if not multiple: then function_id must be unique
+        '''
+
+        error = []
+        cr.execute('''
+            select function.name
+                from automated_import import, automated_import_function function
+            where
+                function.id = import.function_id and
+                coalesce(function.multiple, 'f') = 'f'
+            group by function.name
+            having(count(*) > 1)
+        ''')
+        for x in cr.fetchall():
+            error.append(_('Another Automated import with same functionality "%s" already exists (maybe inactive). Only one automated import must be created for a '\
+                           'same functionality. Please select an other functionality.') % x[0])
+
+        cr.execute('''
+            select function.name
+                from automated_import import, automated_import_function function
+            where
+                function.id = import.function_id and
+                coalesce(function.multiple, 'f') = 't' and
+                coalesce(src_path, '') != ''
+            group by function.name, src_path, ftp_url
+            having(count(*) > 1)
+        ''')
+        for x in cr.fetchall():
+            error.append(_('Another Automated import with same functionality "%s", same server and same source already exists (maybe inactive).') % x[0])
+
+        if error:
+            raise osv.except_osv(_('Warning'), "\n".join(error))
+
+        return True
+
     def _get_isadmin(self, cr, uid, ids, *a, **b):
         ret = {}
         for _id in ids:
@@ -123,6 +171,7 @@
             string='Functionality',
             required=True,
         ),
+        'multiple': fields.related('function_id', 'multiple', string='Multiple', type='boolean', write_relate=False),
         'active': fields.boolean(
             string='Active',
             readonly=True,
@@ -149,6 +198,7 @@
         'ftp_dest_fail_ok': fields.boolean(string='on FTP server', help='Is given path is located on FTP server ?'),
         'ftp_report_ok': fields.boolean(string='on FTP server', help='Is given path is located on FTP server ?'),
         'is_admin': fields.function(_get_isadmin, method=True, type='boolean', string='Is Admin'),
+        'partner_id': fields.many2one('res.partner', 'Partner', domain=[('partner_type', '=', 'esc')]),
     }
 
     _defaults = {
@@ -167,10 +217,9 @@
             _('Another Automated import with same name already exists (maybe inactive). Automated import name must be unique. Please select an other name.'),
         ),
         (
-            'import_function_id_uniq',
-            'unique(function_id)',
-            _('Another Automated import with same functionality already exists (maybe inactive). Only one automated import must be created for a '\
-              'same functionality. Please select an other functionality.'),
+            'function_id_partner_id_uniq',
+            '',
+            _('Another Automated import with same function / same partner already exists (maybe inactive).'),
         ),
         (
             'import_positive_interval',
@@ -181,8 +230,20 @@
 
     _constraints = [
         (_check_paths, _('There is a problem with paths'), ['active', 'src_path', 'dest_path', 'report_path', 'dest_path_failure']),
+        (_check_unicity, _('There is a problem with paths'), []),
     ]
 
+    def change_function_id(self, cr, uid, ids, function_id, context=None):
+        multiple = False
+        value = {}
+        if function_id:
+            fct_data = self.pool.get('automated.import.function').browse(cr, uid, function_id, context=context)
+            multiple = fct_data.multiple
+            if not multiple:
+                value['partner_id'] = False
+        value['multiple'] = multiple
+        return {'value': value}
+
     def onchange_ftp_ok(self, cr, uid, ids, ftp_ok, context=None):
         if context is None:
             context = {}
@@ -290,14 +351,20 @@
 
         main_path = os.path.join(config.get('root_path'), 'vi_auto_import')
         write_me = {'ftp_source_ok': False, 'ftp_dest_ok': False, 'ftp_dest_fail_ok': False, 'ftp_report_ok': False, 'ftp_ok': False, 'active': True, 'interval_unit': 'months', 'interval': 12}
+
+        prefix = ''
+        for job in self.browse(cr, uid, ids, fields_to_fetch=['name', 'function_id'], context=context):
+            if job.function_id.multiple:
+                num = self.search(cr, uid, [('function_id', '=', job.function_id.id), ('active', 'in', ['t', 'f'])], count=True, context=context)
+                if num > 1:
+                    prefix = num
+            self.log(cr, uid, job.id, 'Auto configuration done on job %s' % job.name)
+
         for directory in ['src_path', 'dest_path', 'dest_path_failure', 'report_path']:
-            target = os.path.join(main_path, directory)
+            target = os.path.join(main_path, '%s%s' % (directory, prefix))
             write_me[directory] = target
             if not os.path.exists(target):
                 os.makedirs(target)
-
-        for job in self.read(cr, uid, ids, ['name'], context=context):
-            self.log(cr, uid, job['id'], 'Auto configuration done on job %s' % job['name'])
         self.write(cr, uid, ids, write_me, context=context)
         return True
 

=== modified file 'bin/addons/msf_tools/automated_import_data.xml'
--- bin/addons/msf_tools/automated_import_data.xml	2018-03-29 07:34:43 +0000
+++ bin/addons/msf_tools/automated_import_data.xml	2021-04-15 08:08:32 +0000
@@ -61,6 +61,7 @@
             <field name="model_id" model="ir.model" search="[('model', '=', 'supplier.catalogue')]" />
             <field name="method_to_call">auto_import</field>
             <field name="startswith">SCL_</field>
+            <field name="multiple" eval="True" />
         </record>
 
         <record id="auto_import_fnct_product_list" model="automated.import.function">
@@ -75,6 +76,7 @@
             <field name="model_id" model="ir.model" search="[('model', '=', 'stock.picking')]" />
             <field name="method_to_call">auto_import_incoming_shipment</field>
             <field name="startswith">SHPM_</field>
+            <field name="multiple" eval="True" />
         </record>
 
         <record id="auto_import_fnct_purchase_order" model="automated.import.function">
@@ -82,13 +84,15 @@
             <field name="model_id" model="ir.model" search="[('model', '=', 'purchase.order')]" />
             <field name="method_to_call">auto_import_purchase_order</field>
             <field name="startswith">POV_</field>
+            <field name="multiple" eval="True" />
         </record>
-        
+
         <record id="auto_import_fnct_confirmed_purchase_order" model="automated.import.function">
             <field name="name">Import Purchase Order and confirm</field>
             <field name="model_id" model="ir.model" search="[('model', '=', 'purchase.order')]" />
             <field name="method_to_call">auto_import_confirmed_purchase_order</field>
             <field name="startswith">POV_</field>
+            <field name="multiple" eval="True" />
         </record>
 
         <record id="auto_import_fnct_product_categories" model="automated.import.function">

=== modified file 'bin/addons/msf_tools/automated_import_function.py'
--- bin/addons/msf_tools/automated_import_function.py	2018-03-29 07:34:43 +0000
+++ bin/addons/msf_tools/automated_import_function.py	2021-04-15 08:08:32 +0000
@@ -45,10 +45,12 @@
             required=True,
         ),
         'startswith': fields.char('Starts with', size=56),
+        'multiple': fields.boolean('Allow multiple jobs'),
     }
 
     _defaults = {
         'method_to_call': lambda *a: 'import_data_from_csv',
+        'multiple': False,
     }
 
     _order = 'name'

=== modified file 'bin/addons/msf_tools/views/automated_export_view.xml'
--- bin/addons/msf_tools/views/automated_export_view.xml	2020-09-18 10:39:31 +0000
+++ bin/addons/msf_tools/views/automated_export_view.xml	2021-04-15 08:08:32 +0000
@@ -8,9 +8,16 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Automated exports">
-                    <filter name="inactive" domain="[('active', '=', False)]" string="Inactive" icon="gtk-undo" />
+                    <filter icon="terp-check" name="filteractive" string="Active" domain="[('active', '=', True)]" />
+                    <filter icon="gtk-dialog-error" name="filterinactive" string="Inactive" domain="[('active', '=', False)]" />
                     <field name="name" />
                     <field name="function_id" />
+                    <field name="partner_id" />
+                    <newline />
+                    <group expand="1" string="Group By..." colspan="4" col="4">
+                        <filter string="Partner" name="groupby_partner_id" icon="terp-partner" domain="[]"  context="{'group_by':'partner_id'}"/>
+                        <filter string="Function" name="groupby_function_id" icon="terp-accessories-archiver" domain="[]"  context="{'group_by':'function_id'}"/>
+                    </group>
                 </search>
             </field>
         </record>
@@ -20,12 +27,14 @@
             <field name="model">automated.export</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
-                <tree string="Automated exports">
+                <tree string="Automated exports" colors="red: not active">
                     <field name="name" />
                     <field name="function_id" />
+                    <field name="partner_id" />
                     <field name="start_time" />
                     <field name="interval" />
                     <field name="interval_unit" />
+                    <field name="active"  />
                 </tree>
             </field>
         </record>
@@ -41,10 +50,14 @@
                     <field name="function_id" widget="selection" on_change="change_function_id(function_id)"/>
                     <field name="active" />
                     <field name="export_format" attrs="{'invisible': [('disable_cron', '=', True)]}"/>
+                    <label colspan="2" />
+                    <field name="partner_id" attrs="{'invisible': [('multiple', '=', False)], 'required': [('multiple', '=', True)]}"/>
+                    <newline />
                     <button name="run_job_manually" string="Run job manually" colspan="2" type="object" icon="gtk-execute" />
                     <button name="sent_to_remote" string="Manually send to FTP" colspan="2" type="object" icon="cloud.png" attrs="{'invisible': ['|', ('disable_cron', '=', False), ('ftp_ok', '=', False)]}" />
 
                     <field name="disable_cron" invisible="1" />
+                    <field name="multiple" invisible="1" />
 
                     <separator colspan="4" string="FTP server" />
                     <group col="4" colspan="4">
@@ -87,6 +100,7 @@
             <field name="res_model">automated.export</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
+            <field name="context">{'search_default_filteractive' : 1}</field>
         </record>
         <menuitem
             id="automated_export_menu"

=== modified file 'bin/addons/msf_tools/views/automated_import_view.xml'
--- bin/addons/msf_tools/views/automated_import_view.xml	2020-10-20 15:14:32 +0000
+++ bin/addons/msf_tools/views/automated_import_view.xml	2021-04-15 08:08:32 +0000
@@ -8,9 +8,16 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Automated imports">
-                    <filter name="inactive" domain="[('active', '=', False)]" string="Inactive" icon="gtk-undo" />
+                    <filter icon="terp-check" name="filteractive" string="Active" domain="[('active', '=', True)]" />
+                    <filter icon="gtk-dialog-error" name="filterinactive" string="Inactive" domain="[('active', '=', False)]" />
                     <field name="name" />
                     <field name="function_id" />
+                    <field name="partner_id" />
+                    <newline />
+                    <group expand="1" string="Group By..." colspan="4" col="4">
+                        <filter string="Partner" name="groupby_partner_id" icon="terp-partner" domain="[]"  context="{'group_by':'partner_id'}"/>
+                        <filter string="Function" name="groupby_function_id" icon="terp-accessories-archiver" domain="[]"  context="{'group_by':'function_id'}"/>
+                    </group>
                 </search>
             </field>
         </record>
@@ -20,12 +27,14 @@
             <field name="model">automated.import</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
-                <tree string="Automated imports">
+                <tree string="Automated imports" colors="red: not active">
                     <field name="name" />
                     <field name="function_id" />
+                    <field name="partner_id" />
                     <field name="start_time" />
                     <field name="interval" />
                     <field name="interval_unit" />
+                    <field name="active"  />
                 </tree>
             </field>
         </record>
@@ -58,9 +67,11 @@
                             });
                         </script>
                     </html>
+                    <field name="multiple" invisible="1" />
                     <field name="name" />
-                    <field name="function_id" widget="selection" />
+                    <field name="function_id" widget="selection" on_change="change_function_id(function_id)" />
                     <field name="active" />
+                    <field name="partner_id" attrs="{'invisible': [('multiple', '=', False)], 'required': [('multiple', '=', True)]}"/>
                     <field name="is_admin" invisible="1"/>
                     <button name="run_job_manually" string="Run job manually" colspan="2" type="object" icon="gtk-execute" />
                     <button name="local_autoconfig" string="Local Auto Configuration" colspan="2" type="object" icon="terp-dialog-close" confirm="This action should only be executed on a Sandbox, it will override the current configuration. Do you confirm ?" attrs="{'invisible': [('is_admin', '=', False)]}"/>
@@ -108,6 +119,7 @@
             <field name="res_model">automated.import</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
+            <field name="context">{'search_default_filteractive' : 1}</field>
         </record>
         <menuitem
             id="automated_import_menu"

=== modified file 'bin/osv/orm.py'
--- bin/osv/orm.py	2021-02-02 10:20:51 +0000
+++ bin/osv/orm.py	2021-04-15 08:08:32 +0000
@@ -3425,6 +3425,8 @@
         cr.commit()     # start a new transaction
 
         for (key, con, null) in self._sql_constraints:
+            if not con:
+                continue
             conname = '%s_%s' % (self._table, key)
 
             cr.execute("SELECT conname, pg_catalog.pg_get_constraintdef(oid, true) as condef FROM pg_constraint where conname=%s", (conname,))
@@ -4007,7 +4009,7 @@
                                                     [('res_id','in',list(sub_ids)),('model','=',self._name)],
                                                     order='NO_ORDER', context=context)
 
-            if self._name in xmlid_no_delete.prevent_deletion:
+            if referenced_ids and self._name in xmlid_no_delete.prevent_deletion:
                 cr.execute('''select module, name from ir_model_data
                         where
                             (module, name) in %s and