Merge lp:~unifield-team/unifield-server/uf40-little-fixes into lp:unifield-server

[jftempo]

Unmerged revisions

4188. By Quentin THEURET @Amaris on 2017-02-09

US-1716 [FIX] FIx issue with NoneType context

4187. By Quentin THEURET @Amaris on 2017-02-08

US-1716 [FIX] Fix creation of empty address on partner during the synchornization and de-activate existing empty address if there is used in an other document

4186. By Quentin THEURET @Amaris on 2017-02-08

US-2288 [FIX] Remove let me fix error when a user tries to add a Notes in a Confirmed (Waiting) PO

4185. By Quentin THEURET @Amaris on 2017-02-08

US-2393 [FIX] display partner list on 'Moves analysis' report

=== modified file 'bin/addons/msf_partner/partner.py'
--- bin/addons/msf_partner/partner.py	2017-01-20 14:37:30 +0000
+++ bin/addons/msf_partner/partner.py	2017-02-09 16:28:10 +0000
@@ -626,6 +626,8 @@
         return super(res_partner, self).write(cr, uid, ids, vals, context=context)
 
     def create(self, cr, uid, vals, context=None):
+        if context is None:
+            context = {}
         vals = self.check_pricelists_vals(cr, uid, vals, context=context)
         if 'partner_type' in vals and vals['partner_type'] in ('internal', 'section', 'esc', 'intermission'):
             msf_customer = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'stock', 'stock_location_internal_customers')
@@ -645,7 +647,7 @@
                         elif pl.type == 'purchase':
                             vals['property_product_pricelist_purchase'] = pl.id
 
-        if not vals.get('address'):
+        if not context.get('sync_update_execution') and not vals.get('address'):
             vals['address'] = [(0, 0, {'function': False, 'city': False, 'fax': False, 'name': False, 'zip': False, 'title': False, 'mobile': False, 'street2': False, 'country_id': False, 'phone': False, 'street': False, 'active': True, 'state_id': False, 'type': False, 'email': False})]
 
         if vals.get('name'):
@@ -873,6 +875,26 @@
         '''
         Remove empty addresses if exist and create the new one
         '''
+        def src_addr_link(addresses):
+            cr.execute("""
+                SELECT ccu.constraint_name
+                FROM information_schema.constraint_column_usage ccu
+                WHERE ccu.table_name = %s AND ccu.table_catalog = %s""", (self._table, cr.dbname))
+            constraints = cr.fetchall()
+            cr.execute("""
+                SELECT kcu.column_name, kcu.table_name
+                FROM information_schema.key_column_usage kcu
+                WHERE kcu.table_catalog = %s AND kcu.constraint_name IN %s""", (cr.dbname, tuple([x[0] for x in constraints])))
+            for column, table in cr.fetchall():
+                if table == self._table:
+                    continue
+                cr.execute("""SELECT count(id) FROM %s WHERE %s IN %%s""" % (table, column), (tuple(addresses),))
+                res = cr.fetchall()
+                if res[0][0]:
+                    return True
+
+            return False
+
         if vals.get('partner_id'):
             domain_dict = {
                 'partner_id': vals.get('partner_id'),
@@ -894,7 +916,10 @@
             }
             domain = [(k, '=', v) for k, v in domain_dict.iteritems()]
             addr_ids = self.search(cr, uid, domain, context=context)
-            self.unlink(cr, uid, addr_ids, context=context)
+            if addr_ids and not src_addr_link(addr_ids):
+                self.unlink(cr, uid, addr_ids, context=context)
+            elif addr_ids:
+                self.write(cr, uid, addr_ids, {'active': False}, context=context)
 
         return super(res_partner_address, self).create(cr, uid, vals, context=context)
 

=== modified file 'bin/addons/stock_override/report/report_stock_move_view.xml'
--- bin/addons/stock_override/report/report_stock_move_view.xml	2016-12-14 08:13:13 +0000
+++ bin/addons/stock_override/report/report_stock_move_view.xml	2017-02-09 16:28:10 +0000
@@ -76,7 +76,7 @@
                         <filter icon="terp-go-home" name="out" string="Outgoing" domain="[('type','=','out')]"/>
                         <separator orientation="vertical"/>
                         <field name="product_id" default_focus="1"/>
-                        <field name="partner_id" context="{'contact_display':'partner'}"/>
+                        <field name="partner_id" />
                         <field name="order_type" />
                         <field name="reason_type_id" widget="selection"/>
                         <newline />

=== modified file 'bin/addons/tender_flow/tender_flow_view.xml'
--- bin/addons/tender_flow/tender_flow_view.xml	2017-01-16 14:20:41 +0000
+++ bin/addons/tender_flow/tender_flow_view.xml	2017-02-09 16:28:10 +0000
@@ -210,7 +210,7 @@
                 <data>
                     <field name="details" position="after">
                         <newline />
-                        <field name="valid_till" attrs="{'invisible': [('rfq_ok', '=', False)],'readonly': [('state', 'in', ['sourced', 'split', 'rfq_updated', 'draft', 'done', 'cancel', 'confirmed', 'approved', 'except_picking', 'except_invoice'])]}" />
+                        <field name="valid_till" attrs="{'invisible': [('rfq_ok', '=', False)],'readonly': [('state', 'in', ['sourced', 'split', 'rfq_updated', 'draft', 'done', 'cancel', 'confirmed', 'confirmed_wait', 'approved', 'except_picking', 'except_invoice'])]}" />
                         <field name="tender_id" attrs="{'invisible': [('rfq_ok', '=', False)],'readonly': [('state', 'in', ['sourced', 'split', 'rfq_updated', 'done', 'cancel', 'confirmed', 'approved', 'except_picking', 'except_invoice'])]}" />
                         <field name="rfq_ok" invisible="1" />
                         <field