Merge lp:~mukunde/unifield-server/US-11005 into lp:unifield-server

[jftempo]

Unmerged revisions

6392. By Gaël Mukunde on 2023-02-06

US-11005 [IMP] Code fix to prevent also creation of draft PO/FO

6391. By Gaël Mukunde on 2023-02-03

US-11005 [IMP] Translation

6390. By Gaël Mukunde on 2023-02-03

US-11005 [IMP] Prevent FO / PO creation if 'Cost center picked for PO/FO reference' is empty

6389. By jftempo on 2023-01-30

US-11042 [FIX] Sync server: acl on signature.image

6388. By jftempo on 2023-01-18

US-9724 [FIX] Analytic Account inactive: do not change the term in the error msg

6387. By jftempo on 2023-01-17

 US-6710 [IMP] Tools/Import-Export: new CC import to link new CC to prop. instances

 lp:~jfb-tempo-consulting/unifield-server/US-6710

6386. By jftempo on 2023-01-17

US-10353 [IMP] Selectors (G/L and Combined): new option to exclude inactive journals

lp:~jfb-tempo-consulting/unifield-server/US-10353

6385. By jftempo on 2023-01-17

US-10725 [IMP] Advance return wizard: third party type and required must depend on account
  copy transfer journal from wizard to the new register line

lp:~mukunde/unifield-server/US-10725

6384. By jftempo on 2023-01-17

US-7955 [IMP] Invoice line: remove spaces in description, if the result is empty raise an error if not from workflow

lp:~jfb-tempo-consulting/unifield-server/US-7955

6383. By jftempo on 2023-01-17

US-9724 [FIX] AD error message: display the entry sequence or "FXA" if linked to FXA journal

lp:~jfb-tempo-consulting/unifield-server/US-9724

=== modified file 'bin/addons/msf_profile/i18n/fr_MF.po'
--- bin/addons/msf_profile/i18n/fr_MF.po	2023-02-06 10:44:22 +0000
+++ bin/addons/msf_profile/i18n/fr_MF.po	2023-02-07 11:28:16 +0000
@@ -118120,6 +118120,7 @@
 
 #. module: purchase
 #: code:addons/purchase/purchase_order.py:2063
+#: code:addons/purchase/purchase_order.py:2070
 #, python-format
 msgid "%s: You can not select this Order Type manually"
 msgstr "%s: Vous ne pouvez pas sélectionner ce Type de Commande manuellement"
@@ -118127,6 +118128,7 @@
 #. modules: purchase, msf_custom_settings
 #: code:addons/msf_custom_settings/sale.py:42
 #: code:addons/purchase/purchase_order.py:2107
+#: code:addons/purchase/purchase_order.py:2114
 #, python-format
 msgid "You can not select this Order Type manually"
 msgstr "Vous ne pouvez pas sélectionner ce Type de Commande manuellement"
@@ -118188,6 +118190,7 @@
 #: field:account.mcdb,inactive_at:0
 msgid "Journals Inactive at"
 msgstr "Journaux inactifs le"
+<<<<<<< TREE
 
 #. module: purchase
 #: view:purchase.order:0
@@ -118211,3 +118214,12 @@
 msgid "You cannot re-sync a line more than 2 times"
 msgstr "Vous ne pouvez pas faire plus de 2 re-sync"
 
+=======
+
+#. modules: purchase, sale
+#: code:addons/purchase/purchase_workflow.py:964
+#: code:addons/sale/sale_workflow.py:885
+#, python-format
+msgid "Add the cost center picked for PO/FO reference"
+msgstr "Rajouter le centre de coût utilisé pour la reference PO/FO"
+>>>>>>> MERGE-SOURCE

=== modified file 'bin/addons/purchase/purchase_order.py'
--- bin/addons/purchase/purchase_order.py	2023-01-17 15:21:33 +0000
+++ bin/addons/purchase/purchase_order.py	2023-02-07 11:28:16 +0000
@@ -1130,6 +1130,10 @@
             partner = self.pool.get('res.partner').browse(cr, uid, vals['partner_id'], fields_to_fetch=['property_product_pricelist_purchase', 'partner_type'], context=context)
             if partner.partner_type in ('internal', 'intermission', 'section'):
                 vals['pricelist_id'] = partner.property_product_pricelist_purchase.id
+        if 'partner_id' in vals and vals.get('partner_id', False):
+            # US-11005
+            if not self.pool.get('res.partner').browse(cr, uid, vals['partner_id'], context=context).company_id.instance_id.po_fo_cost_center_id:
+                raise osv.except_osv(_('Warning !'), _('Add the cost center picked for PO/FO reference'))
 
         # common function for so and po
         vals = common_create(self, cr, uid, vals, type=get_type(self), context=context)
@@ -1234,6 +1238,10 @@
 
         pol_obj = self.pool.get('purchase.order.line')
 
+        # US-11005
+        if not self.browse(cr, uid, ids[0], context=context).company_id.instance_id.po_fo_cost_center_id:
+            raise osv.except_osv(_('Warning !'), _('Add the cost center picked for PO/FO reference'))
+
         if not 'date_order' in vals:
             vals.update({'date_order': self.browse(cr, uid, ids[0]).date_order})
 

=== modified file 'bin/addons/purchase/purchase_workflow.py'
--- bin/addons/purchase/purchase_workflow.py	2023-02-06 10:44:22 +0000
+++ bin/addons/purchase/purchase_workflow.py	2023-02-07 11:28:16 +0000
@@ -960,7 +960,6 @@
             context = {}
         if isinstance(ids, (int, long)):
             ids = [ids]
-
         po = self.browse(cr, uid, ids[0], fields_to_fetch=['order_line'], context=context)
         return self.pool.get('purchase.order.line').validated(cr, uid, [pol.id for pol in po.order_line], context=context)
 

=== modified file 'bin/addons/sale/sale_order.py'
--- bin/addons/sale/sale_order.py	2023-02-06 10:44:22 +0000
+++ bin/addons/sale/sale_order.py	2023-02-07 11:28:16 +0000
@@ -942,6 +942,10 @@
                 if not obj['procurement_request']:
                     self._check_own_company(cr, uid, vals['partner_id'], context=context)
 
+        # US-11005
+        if not self.browse(cr, uid, ids[0], context=context).company_id.instance_id.po_fo_cost_center_id:
+            raise osv.except_osv(_('Warning !'), _('Add the cost center picked for PO/FO reference'))
+
         if 'partner_id' in vals:
             partner = self.pool.get('res.partner').browse(cr, uid, vals['partner_id'], fields_to_fetch=['property_product_pricelist', 'partner_type'], context=context)
             if partner.partner_type in ('internal', 'intermission', 'section'):
@@ -977,6 +981,11 @@
         if 'partner_id' in vals and not context.get('procurement_request') and not vals.get('procurement_request'):
             self._check_own_company(cr, uid, vals['partner_id'], context=context)
 
+        if 'partner_id' in vals and vals.get('partner_id', False):
+            # US-11005
+            if not self.pool.get('res.partner').browse(cr, uid, vals['partner_id'], context=context).company_id.instance_id.po_fo_cost_center_id:
+                raise osv.except_osv(_('Warning !'), _('Add the cost center picked for PO/FO reference'))
+
         if not 'pricelist_id' in vals and vals.get('partner_id'):
             partner = self.pool.get('res.partner').browse(cr, uid, vals['partner_id'], fields_to_fetch=['property_product_pricelist', 'partner_type'], context=context)
             if partner.partner_type in ('internal', 'intermission', 'section'):