Merge lp:~jfb-tempo-consulting/unifield-server/us-636 into lp:unifield-server

[jftempo]

=== modified file 'bin/addons/msf_partner/partner.py'
--- bin/addons/msf_partner/partner.py	2018-07-30 14:02:59 +0000
+++ bin/addons/msf_partner/partner.py	2018-09-14 08:02:39 +0000
@@ -406,26 +406,10 @@
 
         bro = bro_uid.company_id
         res =  bro and bro.partner_id and bro.partner_id.id
-        cur =  bro and bro.currency_id and bro.currency_id.id
-
-        po_def_cur = self.pool.get('product.pricelist').browse(cr,uid,vals.get('property_product_pricelist_purchase'))
-        fo_def_cur = self.pool.get('product.pricelist').browse(cr,uid,vals.get('property_product_pricelist'))
 
         if res in ids:
             for obj in self.browse(cr, uid, [res], context=context):
 
-                if context.get('from_setup') and bro.second_time and po_def_cur and po_def_cur.currency_id and po_def_cur.currency_id.id != cur:
-                    raise osv.except_osv(_('Warning !'), _('You can not change the Purchase Default Currency of this partner anymore'))
-
-                if not context.get('from_setup') and po_def_cur and po_def_cur.currency_id and po_def_cur.currency_id.id != cur:
-                    raise osv.except_osv(_('Warning !'), _('You can not change the Purchase Default Currency of this partner'))
-
-                if context.get('from_setup') and bro.second_time and fo_def_cur and fo_def_cur.currency_id and fo_def_cur.currency_id.id != cur:
-                    raise osv.except_osv(_('Warning !'), _('You can not change the Field Orders Default Currency of this partner anymore'))
-
-                if not context.get('from_setup') and fo_def_cur and fo_def_cur.currency_id and fo_def_cur.currency_id.id != cur:
-                    raise osv.except_osv(_('Warning !'), _('You can not change the Field Orders Default Currency of this partner'))
-
                 if obj.customer:
                     raise osv.except_osv(_('Warning !'), _('This partner can not be checked as customer'))
 
@@ -649,6 +633,22 @@
                     payable_acc = account_obj.browse(cr, uid, vals['property_account_payable'], fields_to_fetch=['code', 'name'], context=context)
                     raise osv.except_osv(_('Error'), _('The account %s - %s cannot be used as Account Payable.') % (payable_acc.code, payable_acc.name))
 
+    def check_same_pricelist(self, cr, uid, ids, context=None):
+        if context is None:
+            context = {}
+
+        if context.get('sync_update_execution'):
+            return True
+
+
+        for x in self.browse(cr, uid, ids, fields_to_fetch=['property_product_pricelist_purchase', 'property_product_pricelist', 'name'], context=context):
+            if x.property_product_pricelist_purchase.currency_id.id != x.property_product_pricelist.currency_id.id:
+                raise osv.except_osv(_('Warning'),
+                                     _('Partner %s : Purchase Default Currency (%s) and Field Orders Default Currency (%s) must be the same') % (x.name, x.property_product_pricelist_purchase.currency_id.name, x.property_product_pricelist.currency_id.name)
+                                     )
+
+        return True
+
     def write(self, cr, uid, ids, vals, context=None):
         if not ids:
             return True
@@ -686,7 +686,9 @@
         if vals.get('name'):
             vals['name'] = vals['name'].replace('\r\n', ' ').replace('\r', ' ').replace('\n', ' ').strip()
 
-        return super(res_partner, self).write(cr, uid, ids, vals, context=context)
+        ret = super(res_partner, self).write(cr, uid, ids, vals, context=context)
+        self.check_same_pricelist(cr, uid, ids, context=context)
+        return ret
 
     def create(self, cr, uid, vals, context=None):
         fields_to_create = vals.keys()
@@ -721,7 +723,7 @@
 
         new_id = super(res_partner, self).create(cr, uid, vals, context=context)
         self.check_partner_unicity(cr, uid, partner_id=new_id, context=context)
-
+        self.check_same_pricelist(cr, uid, [new_id], context=context)
         # US-3945: checking user's rights
         if not context.get('sync_update_execution') and uid != 1:
             instance_level = _get_instance_level(self, cr, uid)

=== modified file 'bin/addons/msf_sync_data_server/data/sync_server.message_rule.csv'
--- bin/addons/msf_sync_data_server/data/sync_server.message_rule.csv	2018-08-14 10:33:11 +0000
+++ bin/addons/msf_sync_data_server/data/sync_server.message_rule.csv	2018-09-14 08:02:39 +0000
@@ -1,6 +1,6 @@
 id,active,applies_to_type,arguments,domain,destination_name,type_id,remote_call,model_id,name,sequence_number,wait_while,status
 msf_sync_data_server.resourcing_lines,TRUE,TRUE,"['sync_order_line_db_id', 'partner_id', 'resource_ok', 'resource_sync_line_db_id', 'partner_type']","[('partner_type','!=','external'), ('partner_id', '!=', False)]",partner_id,MISSION,sale.order.line.cancel.create_line,sale.order.line.cancel,Resourcing lines,1,,Valid
-msf_sync_data_server.po_creates_fo,TRUE,TRUE,"['name', 'analytic_distribution_id/id', 'delivery_requested_date','details','notes', 'origin', 'categ', 'order_type', 'priority', 'loan_duration', 'is_a_counterpart', 'sourced_references', 'stock_take_date']","['&','&','&',('partner_type','not in',['external','esc']),('state','in',['validated','validated_p','sourced_p','confirmed','confirmed_p']), ('split_po','!=','True'),('push_fo','!=','True')]",partner_id,MISSION,sale.order.create_so,purchase.order,PO creates FO,2,,Valid
+msf_sync_data_server.po_creates_fo,TRUE,TRUE,"['name', 'analytic_distribution_id/id', 'delivery_requested_date','details','notes', 'origin', 'categ', 'order_type', 'priority', 'loan_duration', 'is_a_counterpart', 'sourced_references', 'stock_take_date', 'currency_id/id']","['&','&','&',('partner_type','not in',['external','esc']),('state','in',['validated','validated_p','sourced_p','confirmed','confirmed_p']), ('split_po','!=','True'),('push_fo','!=','True')]",partner_id,MISSION,sale.order.create_so,purchase.order,PO creates FO,2,,Valid
 msf_sync_data_server.normal_fo_creates_po,TRUE,TRUE,"['name','state','analytic_distribution_id/id','parent_order_name','delivery_confirmed_date','est_transport_lead_time', 'categ', 'order_type', 'priority', 'loan_duration','transport_type', 'ready_to_ship_date', 'details', 'note','client_order_ref', 'stock_take_date', 'order_line/product_id/id', 'order_line/product_id/name','order_line/id', 'order_line/name', 'order_line/product_uom_qty', 'order_line/product_uom', 'order_line/price_unit', 'order_line/analytic_distribution_id/id','order_line/comment','order_line/have_analytic_distribution_from_header','order_line/line_number', 'order_line/nomen_manda_0/id','order_line/nomen_manda_1/id','order_line/nomen_manda_2/id','order_line/nomen_manda_3/id', 'order_line/sync_order_line_db_id', 'order_line/nomenclature_description','order_line/notes','order_line/default_name','order_line/default_code','order_line/date_planned', 'order_line/confirmed_delivery_date', 'order_line/stock_take_date']","[('partner_type','!=','external'),('state','not in',['draft','draft_p']),('client_order_ref','=',False)]",partner_id,MISSION,purchase.order.normal_fo_create_po,sale.order,Normal FO creates PO,5,,Valid
 msf_sync_data_server.po_updates_so_ref,TRUE,TRUE,"['name','state','partner_ref']","['&','&','&',('partner_type','!=','external'),('state','in',['validated', 'validated_p', 'sourced', 'sourced_p', 'confirmed', 'confirmed_p']),('partner_ref','!=',False),'!',('partner_ref', 'like', 'invalid_by_recovery')]",partner_id,MISSION,sale.order.update_sub_so_ref,purchase.order,PO updates SO ref,8,,Valid
 msf_sync_data_server.fo_updates_po_ref,TRUE,TRUE,"['name','state','client_order_ref']","['&', '&','&','&', ('claim_name_goods_return', '=', False), ('partner_type','!=','external'),('client_order_ref','!=',False),('split_type_sale_order','=','original_sale_order'),'!',('client_order_ref', 'like', 'invalid_by_recovery')]",partner_id,MISSION,purchase.order.update_fo_ref,sale.order,FO updates PO ref,9,,Valid

=== modified file 'bin/addons/msf_sync_data_server/data/sync_server.sync_rule.csv'
--- bin/addons/msf_sync_data_server/data/sync_server.sync_rule.csv	2018-08-21 19:12:31 +0000
+++ bin/addons/msf_sync_data_server/data/sync_server.sync_rule.csv	2018-09-14 08:02:39 +0000
@@ -56,7 +56,7 @@
 msf_sync_data_server.external_partner,TRUE,TRUE,FALSE,TRUE,bidirectional,Bidirectional,"[('partner_type' , '=' , 'external'),('name','!=','Local Market')]","['name', 'partner_type', 'property_account_receivable/id', 'property_account_payable/id', 'ref', 'customer','supplier','zone', 'lang', 'property_product_pricelist/id', 'property_product_pricelist_purchase/id', 'donation_payable_account/id']",HQ + MISSION,res.partner,,External Partner,Valid,"{'active':False}",309
 msf_sync_data_server.external_partner_tree,TRUE,TRUE,FALSE,TRUE,bidirectional,Bidirectional,"[('partner_type' , '=' , 'external'),('name','!=','Local Market'), ('parent_id', '!=', '')]",['parent_id/id'],HQ + MISSION,res.partner,,External Partner Tree,Valid,,310
 msf_sync_data_server.external_partner_address,TRUE,TRUE,FALSE,TRUE,bidirectional,Bidirectional,"['|', ('active', '=', ''), ('active', '!=', ''),('partner_id' , 'in' , ('res.partner' , 'id' , [('partner_type' , '=' , 'external')]))]","['active', 'city', 'country_id/id', 'email', 'fax', 'function', 'mobile', 'name', 'partner_id/id', 'phone', 'state_id/id', 'street', 'street2', 'title/id', 'type', 'zip']",HQ + MISSION,res.partner.address,,External Partner Address,Valid,,311
-msf_sync_data_server.internal_partner,TRUE,TRUE,FALSE,TRUE,bidirectional,Bidirectional,"['|', ('active', '=', ''), ('active', '!=', ''),('partner_type' , '=' , 'internal')]","['comment', 'credit_limit', 'customer', 'customer_lt', 'lang', 'manufacturer', 'name', 'partner_type', 'po_by_project', 'procurement_lt', 'property_account_payable/id', 'property_account_position/id', 'property_account_receivable/id', 'property_payment_term/id', 'property_stock_customer/id', 'property_stock_supplier/id', 'ref', 'supplier', 'supplier_lt', 'transport_0', 'transport_0_lt', 'transport_1', 'transport_1_lt', 'transport_2', 'transport_2_lt', 'transporter']",MISSION,res.partner,,Internal Partner,Valid,"{'active': True, 'customer': True, 'supplier': True, 'partner_type': 'internal'}",312
+msf_sync_data_server.internal_partner,TRUE,TRUE,FALSE,TRUE,bidirectional,Bidirectional,"['|', ('active', '=', ''), ('active', '!=', ''),('partner_type' , '=' , 'internal')]","['comment', 'credit_limit', 'customer', 'customer_lt', 'lang', 'manufacturer', 'name', 'partner_type', 'po_by_project', 'procurement_lt', 'property_account_payable/id', 'property_account_position/id', 'property_account_receivable/id', 'property_payment_term/id', 'property_stock_customer/id', 'property_stock_supplier/id', 'ref', 'supplier', 'supplier_lt', 'transport_0', 'transport_0_lt', 'transport_1', 'transport_1_lt', 'transport_2', 'transport_2_lt', 'transporter', 'property_product_pricelist/id', 'property_product_pricelist_purchase/id']",MISSION,res.partner,,Internal Partner,Valid,"{'active': True, 'customer': True, 'supplier': True, 'partner_type': 'internal'}",312
 msf_sync_data_server.internal_partner_tree,TRUE,TRUE,FALSE,TRUE,bidirectional,Bidirectional,"['|', ('active', '=', ''), ('active', '!=', ''),('partner_type' , '=' , 'internal'), ('parent_id', '!=', '')]",['parent_id/id'],MISSION,res.partner,,Internal Partner Tree,Valid,,313
 msf_sync_data_server.internal_partner_address,TRUE,TRUE,FALSE,TRUE,bidirectional,Bidirectional,"['|', ('active', '=', ''), ('active', '!=', ''),('partner_id' , 'in' , ('res.partner' , 'id' , [('partner_type' , '=' , 'internal')]))]","['active', 'city', 'country_id/id', 'email', 'fax', 'function', 'mobile', 'name', 'partner_id/id', 'phone', 'state_id/id', 'street', 'street2', 'title/id', 'type', 'zip']",MISSION,res.partner.address,,Internal Partner Address,Valid,,314
 msf_sync_data_server.intermission_partner,TRUE,TRUE,FALSE,TRUE,bidirectional,Down,"['|', ('active', '=', ''), ('active', '!=', ''),('partner_type' , '=' , 'intermission')]","['customer', 'manufacturer', 'name', 'partner_type', 'property_account_payable/id', 'property_account_receivable/id', 'ref', 'supplier', 'transporter']",OC,res.partner,,Intermission Partner,Valid,"{'customer': True, 'supplier': True, 'active': False}",320

=== modified file 'bin/addons/supplier_catalogue/product.py'
--- bin/addons/supplier_catalogue/product.py	2017-09-28 15:51:02 +0000
+++ bin/addons/supplier_catalogue/product.py	2018-09-14 08:02:39 +0000
@@ -56,7 +56,7 @@
         if not context:
             context = {}
 
-        new_res = [] 
+        new_res = []
         res = super(product_supplierinfo, self).search(cr, uid, args, offset, limit,
                                                        order, context=context, count=count)
         if count:
@@ -326,7 +326,7 @@
                 #            info = partner_price.browse(cr, uid, info_price, context=context)[0]
                 info = partner_price.browse(cr, uid, info_prices[0], context=context)
                 price = cur_obj.compute(cr, uid, info.currency_id.id, currency_id, info.price, round=False, context=context)
-                res[product.id] = (price, info.rounding or 1.00, info.suppinfo_id.min_qty or 0.00) 
+                res[product.id] = (price, info.rounding or 1.00, info.suppinfo_id.min_qty or 0.00)
             else:
                 res[product.id] = (False, 1.0, 1.0)
 
@@ -423,7 +423,7 @@
         '''
         Returns pricelists according to partner type
         '''
-        user_obj = self.pool.get('res.users')
+        #user_obj = self.pool.get('res.users')
         cur_obj = self.pool.get('res.currency')
         dom = []
 
@@ -432,13 +432,13 @@
                 if arg[1] != '=':
                     raise osv.except_osv(_('Error !'), _('Bad operator !'))
                 else:
-                    if arg[2] in ('internal', 'intermission'):
-                        func_currency_id = user_obj.browse(cr, uid, uid, context=context).company_id.currency_id.id
-                        dom.append(('currency_id', '=', func_currency_id))
-                    elif arg[2] == 'section':
-                        currency_ids = cur_obj.search(cr, uid, [('is_section_currency', '=', True)])
-                        dom.append(('currency_id', 'in', currency_ids))
-                    elif arg[2] == 'esc':
+                    #if arg[2] in ('internal', 'intermission'):
+                    #    func_currency_id = user_obj.browse(cr, uid, uid, context=context).company_id.currency_id.id
+                    #    dom.append(('currency_id', '=', func_currency_id))
+                    #if arg[2] == 'section':
+                    #    currency_ids = cur_obj.search(cr, uid, [('is_section_currency', '=', True)])
+                    #    dom.append(('currency_id', 'in', currency_ids))
+                    if arg[2] == 'esc':
                         currency_ids = cur_obj.search(cr, uid, [('is_esc_currency', '=', True)])
                         dom.append(('currency_id', 'in', currency_ids))
 
@@ -447,7 +447,7 @@
     def _get_currency_name(self, cr, uid, ids, field_name, args, context=None):
         '''
         Return the name of the related currency
-        '''  
+        '''
         res = {}
 
         for p_list in self.browse(cr, uid, ids, context=context):
@@ -521,7 +521,7 @@
                                                                 [('name', operator, name)], order='NO_ORDER', context=context)
             ids = self.search(cr, uid, [('currency_id', 'in', currency_ids)] + (args or []))
 
-        return self.name_get(cr, uid, ids)          
+        return self.name_get(cr, uid, ids)
 
 
 product_pricelist()
@@ -585,9 +585,9 @@
         return dom
 
     _columns = {
-        'is_section_currency': fields.boolean(string='Functional currency', 
+        'is_section_currency': fields.boolean(string='Functional currency',
                                               help='If this box is checked, this currency is used as a functional currency for at least one section in MSF.'),
-        'is_esc_currency': fields.boolean(string='ESC currency', 
+        'is_esc_currency': fields.boolean(string='ESC currency',
                                           help='If this box is checked, this currency is used as a currency for at least one ESC.'),
         'is_po_functional': fields.function(_get_in_search, fnct_search=_search_in_search, method=True,
                                             type='boolean', string='transport PO currencies'),
@@ -643,7 +643,7 @@
             if property_ids:
                 properties = property_obj.browse(cr, uid, property_ids, context=context)
                 partner_list = ' / '.join(x.res_id.name for x in properties)
-                raise osv.except_osv(_('Error !'), 
+                raise osv.except_osv(_('Error !'),
                                      _('You cannot uncheck the ESC checkbox because this currency is used on these \'ESC\' partners : \
                                       %s' % partner_list))
 

=== modified file 'bin/addons/sync_so/sale.py'
--- bin/addons/sync_so/sale.py	2018-04-17 08:54:07 +0000
+++ bin/addons/sync_so/sale.py	2018-09-14 08:02:39 +0000
@@ -161,6 +161,12 @@
 
         header_result = {}
         so_po_common_obj.retrieve_so_header_data(cr, uid, source, header_result, po_dict, context)
+
+        if header_result.get('currency_id') and header_result.get('pricelist_id'):
+            if not self.pool.get('product.pricelist').search_exist(cr, uid, [('id', '=', header_result['pricelist_id']), ('currency_id', '=', header_result['currency_id'])]):
+                po_cur = self.pool.get('res.currency').read(cr, uid, header_result['currency_id'], ['name'], context=context)
+                raise Exception, "Wrong FO/PO Currency on partner: please set FO/PO currency to %s on partner %s" % (po_cur['name'], source)
+
         header_result['order_line'] = so_po_common_obj.get_lines(cr, uid, source, po_info, False, False, False, True, context)
         # [utp-360] we set the confirmed_delivery_date to False directly in creation and not in modification
         order_line = []

=== modified file 'bin/addons/sync_so/so_po_common.py'
--- bin/addons/sync_so/so_po_common.py	2018-04-17 09:09:35 +0000
+++ bin/addons/sync_so/so_po_common.py	2018-09-14 08:02:39 +0000
@@ -342,6 +342,10 @@
             if price_list:
                 price_list = self.pool.get('product.pricelist').find_sd_ref(cr, uid, xmlid_to_sdref(price_list['id']), context=context)
 
+        currency_id = False
+        if header_info.get('currency_id'):
+            currency_id = self.pool.get('res.currency').find_sd_ref(cr, uid, xmlid_to_sdref(header_info['currency_id']['id']), context=context)
+
         # at the end, if there is no price list, just use the one from the partner
         if not price_list:
             price_list = self.get_price_list_id(cr, uid, partner_id, context)
@@ -352,7 +356,7 @@
         header_result['partner_shipping_id'] = address_id
         header_result['partner_invoice_id'] = address_id
         header_result['pricelist_id'] = price_list
-
+        header_result['currency_id'] = currency_id
         return header_result
 
     def get_product_id(self, cr, uid, data, default_code=False, context=None):