Merge lp:~julie-w/unifield-server/US-6354 into lp:unifield-server

[jftempo]

=== modified file 'bin/addons/msf_profile/data/patches.xml'
--- bin/addons/msf_profile/data/patches.xml	2019-08-19 09:44:42 +0000
+++ bin/addons/msf_profile/data/patches.xml	2019-09-11 07:42:29 +0000
@@ -447,5 +447,10 @@
             <field name="method">us_6342_cancel_ir</field>
         </record>
 
+        <!-- UF15.0 -->
+        <record id="us_6354_trigger_donation_account_sync" model="patch.scripts">
+            <field name="method">us_6354_trigger_donation_account_sync</field>
+        </record>
+
     </data>
 </openerp>

=== modified file 'bin/addons/msf_profile/msf_profile.py'
--- bin/addons/msf_profile/msf_profile.py	2019-08-19 09:44:42 +0000
+++ bin/addons/msf_profile/msf_profile.py	2019-09-11 07:42:29 +0000
@@ -52,6 +52,25 @@
         'model': lambda *a: 'patch.scripts',
     }
 
+    # UF15.0
+    def us_6354_trigger_donation_account_sync(self, cr, uid, *a, **b):
+        """
+        Triggers a synch. on the Intersection Partners at HQ, so that their Donation Payable Account is retrieved in the lower instances
+        """
+        if _get_instance_level(self, cr, uid) == 'hq':
+            cr.execute("""                        
+                UPDATE ir_model_data 
+                SET touched ='[''donation_payable_account'']', last_modification = NOW()
+                WHERE module='sd' 
+                AND model='res.partner' 
+                AND res_id IN (
+                    SELECT id
+                    FROM res_partner
+                    WHERE partner_type = 'section'
+                );                        
+            """)
+            self._logger.warn('Sync. triggered on %s Intersection Partner(s).' % (cr.rowcount,))
+
     # UF14.0
     def us_6342_cancel_ir(self, cr, uid, *a, **b):
         """
@@ -95,7 +114,6 @@
         cr.execute("update ir_cron set function='send_backup_bg' where function='send_backup' and model='msf.instance.cloud'")
         return True
 
-    # UF14.0
     def us_6075_set_paid_invoices_as_closed(self, cr, uid, *a, **b):
         cr.execute('''SELECT i.id, i.number
             FROM account_invoice i

=== 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	2019-08-08 13:55:43 +0000
+++ bin/addons/msf_sync_data_server/data/sync_server.sync_rule.csv	2019-09-11 07:42:29 +0000
@@ -53,7 +53,7 @@
 msf_sync_data_server.section_partner,TRUE,TRUE,FALSE,TRUE,bidirectional,Down,"[('partner_type' , '=' , 'esc')]","['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_product_pricelist/id', 'property_product_pricelist_purchase/id', 'property_stock_customer/id', 'property_stock_supplier/id', 'ref', 'split_po', 'supplier', 'supplier_lt', 'transport_0', 'transport_0_lt', 'transport_1', 'transport_1_lt', 'transport_2', 'transport_2_lt', 'transporter', 'zone']",OC,res.partner,,Section Partner,Valid,"{'active':False}",300
 msf_sync_data_server.section_partner_tree,TRUE,TRUE,FALSE,TRUE,bidirectional,Down,"[('partner_type','=','esc') , ('parent_id', '!=', '')]",['parent_id/id'],OC,res.partner,,Section Partner Tree,Valid,,301
 msf_sync_data_server.section_partner_address,TRUE,TRUE,FALSE,TRUE,bidirectional,Down,"[('partner_id' , 'in' , ('res.partner' , 'id' , [('partner_type','=','esc')]))]","['active', 'city', 'country_id/id', 'email', 'fax', 'function', 'mobile', 'name', 'partner_id/id', 'phone', 'state_id/id', 'street', 'street2', 'title/id', 'type', 'zip']",OC,res.partner.address,,Section Partner Address,Valid,,302
-msf_sync_data_server.intersection_partner,TRUE,TRUE,FALSE,TRUE,bidirectional,Down,"['|', ('active', '=', ''), ('active', '!=', ''),('partner_type' , '=' , 'section')]","['customer', 'manufacturer', 'name', 'partner_type', 'property_account_payable/id', 'property_account_receivable/id', 'ref', 'supplier', 'transporter', 'property_product_pricelist/id', 'property_product_pricelist_purchase/id']",OC,res.partner,,Intersection Partner,Valid,"{'customer': True, 'supplier': True, 'active': False}",306
+msf_sync_data_server.intersection_partner,TRUE,TRUE,FALSE,TRUE,bidirectional,Down,"['|', ('active', '=', ''), ('active', '!=', ''),('partner_type' , '=' , 'section')]","['customer', 'manufacturer', 'name', 'partner_type', 'property_account_payable/id', 'property_account_receivable/id', 'ref', 'supplier', 'transporter', 'property_product_pricelist/id', 'property_product_pricelist_purchase/id', 'donation_payable_account/id']",OC,res.partner,,Intersection Partner,Valid,"{'customer': True, 'supplier': True, 'active': False}",306
 msf_sync_data_server.intersection_partner_tree,TRUE,TRUE,FALSE,TRUE,bidirectional,Down,"['|', ('active', '=', ''), ('active', '!=', ''),('partner_type','=','section') , ('parent_id', '!=', '')]",['parent_id/id'],OC,res.partner,,Intersection Partner Tree,Valid,,307
 msf_sync_data_server.intersection_partner_address,TRUE,TRUE,FALSE,TRUE,bidirectional,Down,"['|', ('active', '=', ''), ('active', '!=', ''),('partner_id' , 'in' , ('res.partner' , 'id' , [('partner_type','=','section')]))]","['active', 'city', 'country_id/id', 'email', 'fax', 'function', 'mobile', 'name', 'partner_id/id', 'phone', 'state_id/id', 'street', 'street2', 'title/id', 'type', 'zip']",OC,res.partner.address,,Intersection Partner Address,Valid,,308
 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', 'po_by_project', 'manufacturer', 'transporter']",HQ + MISSION,res.partner,,External Partner,Valid,"{'active':False}",309