Merge lp:~unifield-team/unifield-server/us-1492 into lp:unifield-server

[jftempo]

=== modified file 'bin/addons/supplier_catalogue/partner_view.xml'
--- bin/addons/supplier_catalogue/partner_view.xml	2013-02-13 06:50:09 +0000
+++ bin/addons/supplier_catalogue/partner_view.xml	2016-08-22 14:53:53 +0000
@@ -28,19 +28,26 @@
                 </data>
             </field>
         </record>
-        	
+
+        <delete id="action_new_catalogue_supplier" model="ir.actions.act_window" />
+        <record id="action_create_new_catalogue" model="ir.actions.server">
+            <field name="name">New Catalogue</field>
+            <field name="model_id" ref="model_supplier_catalogue"/>
+            <field name="state">code</field>
+            <field name="code">action = obj.open_new_catalogue_form(context=context)</field>
+        </record>
+
         <!-- Action to create a new catalogue for this supplier -->
-        <act_window
-        	name="New catalogue"
-        	res_model="supplier.catalogue"
-        	src_model="res.partner"
-        	view_mode="form,tree"
-        	view_type="form"
-        	key2="client_action_multi"
-        	domain="[('partner_id', '=', active_id)]"
-        	context="{'partner_id': active_id}"
-        	id="action_new_catalogue_supplier" />
-        	
+        <record id="action_new_catalogue_supplier2" model="ir.values">
+            <field name="key2">client_action_multi</field>
+            <field name="model">res.partner</field>
+            <field name="name">New catalogue</field>
+            <field eval="'ir.actions.server,%d'%action_create_new_catalogue" name="value"/>
+            <field name="context">{'partner_id': active_id}</field>
+            <field name="sequence" eval="1" />
+            <field eval="True" name="object"/>
+        </record>
+
         <!-- Choose catalogue from supplier (osv_memory) form view -->
         <record id="from_supplier_choose_catalogue_form_view" model="ir.ui.view">
         	<field name="name">from.supplier.choose.catalogue.form.view</field>
 
=== modified file 'bin/addons/supplier_catalogue/supplier_catalogue.py'
--- bin/addons/supplier_catalogue/supplier_catalogue.py	2016-04-29 07:39:24 +0000
+++ bin/addons/supplier_catalogue/supplier_catalogue.py	2016-08-22 14:53:53 +0000
@@ -58,6 +58,33 @@
 
         return False
 
+    def open_new_catalogue_form(self, cr, uid, ids, context=None):
+        if context is None:
+            context = {}
+        context['partner_id'] = ids[0]
+        partner_obj = self.pool.get('res.partner')
+        if partner_obj.search(cr, uid, [('id', '=', ids[0]), ('partner_type', '=', 'esc')], context=context):
+            user = self.pool.get('res.users').browse(cr, uid, uid,context=context)
+            level = user and user.company_id and user.company_id.instance_id and user.company_id.instance_id.level or False
+            if level != 'section':
+                raise osv.except_osv(
+                    _('Error'),
+                    'For an ESC Supplier you must create the catalogue on a HQ instance.'
+                )
+            elif self.search(cr, uid, [('active', '=', True), ('partner_id', '=', ids[0])]):
+                raise osv.except_osv(
+                    _('Error'),
+                    _('Warning! There is already another active catalogue for this Supplier! This could have implications on the synching of catalogue to instances below, please check.'),
+                )
+
+        return {
+            'res_model': 'supplier.catalogue',
+            'view_type': 'form',
+            'view_mode': 'form,tree',
+            'type': 'ir.actions.act_window',
+            'context': context,
+            'domain': [('partner_id', '=', ids[0])],
+        }
     def _update_other_catalogue(self, cr, uid, cat_id, period_from, currency_id, partner_id, period_to=False, context=None):
         '''
         Check if other catalogues with the same partner/currency exist and are defined in the period of the
@@ -83,21 +110,6 @@
                                                                                         order='period_from asc',
                                                                                         limit=1,
                                                                                         context=context)
-        if period_to:
-            to_ids = self.search(cr, uid, [('id', 'not in', context.get('cat_ids', [])), ('period_from', '>', period_from),
-                                                                                         ('period_from', '<', period_to),
-                                                                                         ('currency_id', '=', currency_id),
-                                                                                         ('partner_id', '=', partner_id)],
-                                                                                         order='period_from asc',
-                                                                                         limit=1,
-                                                                                         context=context)
-        else:
-            to_ids = self.search(cr, uid, [('id', 'not in', context.get('cat_ids', [])), ('period_from', '>', period_from),
-                                                                                         ('currency_id', '=', currency_id),
-                                                                                         ('partner_id', '=', partner_id)],
-                                                                                         order='period_from asc',
-                                                                                         limit=1,
-                                                                                         context=context)
 
         # If overrided catalogues exist, display an error message
         if equal_ids:
@@ -111,6 +123,30 @@
                 raise osv.except_osv(_('Error'), _('This catalogue has the same \'From\' date than the following catalogue : %s (\'From\' : %s - \'To\' : %s) - ' \
                                                    'Please change the \'From\' date of this new catalogue or delete the other catalogue.') % (over_cat.name, over_cat_from, over_cat_to))
 
+            elif cat and cat.is_esc:
+                raise osv.except_osv(
+                    _('Error'),
+                    _('Warning! There is already another active catalogue for this Supplier! This could have implications on the synching of catalogue to instances below, please check.'),
+                )
+
+        if period_to:
+            to_ids = self.search(cr, uid,
+                                 [('id', 'not in', context.get('cat_ids', [])), ('period_from', '>', period_from),
+                                  ('period_from', '<', period_to),
+                                  ('currency_id', '=', currency_id),
+                                  ('partner_id', '=', partner_id)],
+                                 order='period_from asc',
+                                 limit=1,
+                                 context=context)
+        else:
+            to_ids = self.search(cr, uid,
+                                 [('id', 'not in', context.get('cat_ids', [])), ('period_from', '>', period_from),
+                                  ('currency_id', '=', currency_id),
+                                  ('partner_id', '=', partner_id)],
+                                 order='period_from asc',
+                                 limit=1,
+                                 context=context)
+
         # If overrided catalogues exist, display an error message
         if to_ids:
             over_cat = self.browse(cr, uid, to_ids[0], context=context)
@@ -159,6 +195,12 @@
         catalogue = self.browse(cr, uid, [res], context=context)[0]
         if not catalogue.partner_id.active:
             self.write(cr, uid, [res], {'active': False}, context=context)
+        elif not context.get('sync_update_execution') and vals.get('active') and catalogue.partner_id.partner_type == 'esc':
+            if self.search(cr, uid, [('partner_id', '=', catalogue.partner_id.id), ('active', '=', True)], count=True, context=context) > 1:
+                raise osv.except_osv(
+                    _('Error'),
+                    _('Warning! There is already another active catalogue for this Supplier! This could have implications on the synching of catalogue to instances below, please check.'),
+                )
 
         return res
 
@@ -255,6 +297,33 @@
 
         return True
 
+    def check_inactive_catalogues(self, cr, uid, ids, partner_id, context=None):
+        '''
+        Check if there are an inactive catalogue for this supplier. If yes, display a warning messagse
+        '''
+        res = {}
+
+        if not ids:
+            ids = []
+
+        if partner_id and self.pool.get('res.partner').read(cr, uid, partner_id, ['partner_type'], context=context)['partner_type'] == 'esc':
+            equal_ids = self.search(cr, uid, [
+                ('id', 'not in', ids),
+                ('active', '=', False),
+                ('partner_id', '=', partner_id),
+            ], order='period_from asc', limit=1, context=context)
+            if equal_ids:
+                res.update({
+                    'warning': {
+                        'title': _('Warning'),
+                        'message': _('Warning! There is already another inactive catalogue for this Supplier! This could have implications on the synching of catalogue to instances below, please check'),
+                    },
+                })
+
+
+
+        return res
+
     def button_draft(self, cr, uid, ids, context=None):
         '''
         Reset to draft the catalogue
@@ -375,7 +444,7 @@
     _columns = {
         'name': fields.char(size=64, string='Name', required=True),
         'partner_id': fields.many2one('res.partner', string='Partner', required=True,
-                                      domain=[('supplier', '=', True)]),
+                                      domain=[('supplier', '=', True)], select=1),
         'period_from': fields.date(string='From',
                                    help='Starting date of the catalogue.'),
         'period_to': fields.date(string='To',
 
=== modified file 'bin/addons/supplier_catalogue/supplier_catalogue_view.xml'
--- bin/addons/supplier_catalogue/supplier_catalogue_view.xml	2016-03-31 08:47:35 +0000
+++ bin/addons/supplier_catalogue/supplier_catalogue_view.xml	2016-08-22 14:53:53 +0000
@@ -31,7 +31,7 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Supplier catalogue">
-                    <field name="name" colspan="4" />
+                    <field name="name" colspan="4" on_change="check_inactive_catalogues(partner_id)" />
                     <field name="period_from" attrs="{'required': [('is_esc', '=', False)], 'invisible': [('is_esc', '=', True)]}" />
                     <field name="period_to" attrs="{'invisible': [('is_esc', '=', True)]}" />
                     <field name="currency_id" domain="[('partner_currency', '=', partner_id)]" />