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

[jftempo]

=== modified file 'bin/addons/msf_profile/i18n/fr_MF.po'
--- bin/addons/msf_profile/i18n/fr_MF.po	2017-07-06 14:23:27 +0000
+++ bin/addons/msf_profile/i18n/fr_MF.po	2017-07-17 07:08:42 +0000
@@ -10552,12 +10552,6 @@
 msgid " Code: %s"
 msgstr " Code: %s"
 
-#. module: res_currency_tables
-#: code:addons/res_currency_tables/res_currency.py:215
-#, python-format
-msgid "The currency you want to %s is currently used on at least one sale order or purchase order."
-msgstr "La devise que vous désirez %s est utilisée par au moins une commande client ou un bon de commande"
-
 #. modules: stock_override, product_list, stock
 #: view:product.list:0
 #: field:product.list,location_id:0
@@ -25401,7 +25395,7 @@
 #: code:addons/res_currency_tables/res_currency.py:215
 #: code:addons/res_currency_tables/res_currency.py:232
 #, python-format
-msgid "Currency currently used !"
+msgid "Currency currently used!"
 msgstr "Devise actuellement utilisée !"
 
 #. module: consumption_calculation
@@ -88271,7 +88265,7 @@
 #: code:addons/res_currency_tables/res_currency.py:232
 #, python-format
 msgid "The currency cannot be deleted as one or more journal items are currently using it!"
-msgstr "The currency cannot be deleted as one or more journal items are currently using it!"
+msgstr "La devise ne peut pas être supprimée car au moins une ligne d'écriture comptable l'utilise."
 
 #. module: sync_client
 #: field:ir.model.data,last_modification:0
@@ -94941,12 +94935,6 @@
 msgid "# lines"
 msgstr "# de lignes"
 
-#. module: res_currency_tables
-#: code:addons/res_currency_tables/res_currency.py:211
-#, python-format
-msgid "The currency you want to %s is currently used on at least one partner form."
-msgstr "La devise que vous désirez %s est utilisée par au moins un  formulaire partenaire."
-
 #. module: account
 #: help:account.chart.template,property_reserve_and_surplus_account:0
 msgid "This Account is used for transferring Profit/Loss(If It is Profit: Amount will be added, Loss: Amount will be deducted.), Which is calculated from Profilt & Loss Report"
@@ -98688,3 +98676,81 @@
 #, python-format
 msgid "Warning, you have removed header value source location! The lines will be re-set to have 'Other Supplier' as the source location. Please check this is correct!"
 msgstr "Attention, vous avez supprimé la zone source d'en-tête! La zone source des lignes va être réinitialisée avec la valeur 'Autre Fournisseur'. Merci de vérifier leur cohérence!"
+
+#. module: res_currency_tables
+#: code:addons/res_currency_tables/res_currency.py:0
+#, python-format
+msgid "delete"
+msgstr "supprimer"
+
+#. module: res_currency_tables
+#: code:addons/res_currency_tables/res_currency.py:0
+#, python-format
+msgid "de-activate"
+msgstr "désactiver"
+
+#. module: res_currency_tables
+#: code:addons/res_currency_tables/res_currency.py:225
+#, python-format
+msgid "The currency you want to %s is used in at least one active partner form."
+msgstr "La devise que vous désirez %s est utilisée dans au moins un formulaire d'un partenaire actif."
+
+#. module: res_currency_tables
+#: code:addons/res_currency_tables/res_currency.py:216
+#, python-format
+msgid "The currency you want to %s is used in at least one Field Order which isn't Closed."
+msgstr "La devise que vous désirez %s est utilisée dans au moins une Commande de Terrain qui n'est pas Clôturée."
+
+#. module: res_currency_tables
+#: code:addons/res_currency_tables/res_currency.py:216
+#, python-format
+msgid "The currency you want to %s is used in at least one Purchase Order which isn't Closed."
+msgstr "La devise que vous désirez %s est utilisée dans au moins un Bon de Commande qui n'est pas Clôturé."
+
+#. module: res_currency_tables
+#: code:addons/res_currency_tables/res_currency.py:230
+#, python-format
+msgid "The currency you want to %s is used in at least one document in Draft or Open state."
+msgstr "La devise que vous désirez %s est utilisée dans au moins un document à l'état Brouillon ou Ouvert."
+
+#. module: res_currency_tables
+#: code:addons/res_currency_tables/res_currency.py:256
+#, python-format
+msgid "The currency you want to %s is used in at least one Register in Draft or Open state."
+msgstr "La devise que vous désirez %s est utilisée dans au moins un Registre à l'état Brouillon ou Ouvert."
+
+#. module: res_currency_tables
+#: code:addons/res_currency_tables/res_currency.py:236
+#, python-format
+msgid "The currency you want to %s is used in at least one Journal Item in Unposted state."
+msgstr "La devise que vous désirez %s est utilisée dans au moins une Ligne d'écriture comptable non comptabilisée."
+
+#. module: res_currency_tables
+#: code:addons/res_currency_tables/res_currency.py:263
+#, python-format
+msgid "The currency you want to %s is used in at least one Recurring Entry having a state not Done."
+msgstr "La devise que vous désirez %s est utilisée dans au moins une Ecriture Périodique avec un statut non Terminé."
+
+#. module: res_currency_tables
+#: code:addons/res_currency_tables/res_currency.py:240
+#, python-format
+msgid "The currency you want to %s is used in at least one Commitment Voucher which isn't Done."
+msgstr "La devise que vous désirez %s est utilisée dans un moins un Bon d'Engagement non Terminé."
+
+#. module: res_currency_tables
+#: code:addons/res_currency_tables/res_currency.py:244
+#, python-format
+msgid "The currency you want to %s is used in at least one HQ Entry which isn't validated."
+msgstr "La devise que vous désirez %s est utilisée dans au moins une Ecriture HQ non validée."
+
+#. module: res_currency_tables
+#: code:addons/res_currency_tables/res_currency.py:272
+#, python-format
+msgid "The currency you want to %s is used in at least one Draft or Partially Posted Accrual Line."
+msgstr "La devise que vous désirez %s est utilisée dans au moins une Ligne de Régularisation à l'état Brouillon ou Partiellement Comptabilisée."
+
+#. module: res_currency_tables
+#: code:addons/res_currency_tables/res_currency.py:249
+#, python-format
+msgid "The currency you want to %s is used in at least one Payroll Entry which isn't validated."
+msgstr "La devise que vous désirez %s est utilisée dans au moins une Ecriture de Paie non validée."

=== modified file 'bin/addons/res_currency_tables/res_currency.py'
--- bin/addons/res_currency_tables/res_currency.py	2017-01-31 11:13:35 +0000
+++ bin/addons/res_currency_tables/res_currency.py	2017-07-17 07:08:42 +0000
@@ -190,29 +190,94 @@
         purchase_obj = self.pool.get('purchase.order')
         sale_obj = self.pool.get('sale.order')
         property_obj = self.pool.get('ir.property')
+        acc_inv_obj = self.pool.get('account.invoice')
+        aml_obj = self.pool.get('account.move.line')
+        comm_voucher_obj = self.pool.get('account.commitment')
+        hq_entry_obj = self.pool.get('hq.entries')
+        payroll_obj = self.pool.get('hr.payroll.msf')
+        reg_obj = self.pool.get('account.bank.statement')
+        recurring_obj = self.pool.get('account.subscription')
+        accrual_line_obj = self.pool.get('msf.accrual.line')
+        keyword = _(keyword)
 
         if isinstance(ids, (int, long)):
             ids = [ids]
 
-        pricelist_ids = pricelist_obj.search(cr, uid, [('currency_id', 'in', ids), ('active', 'in', ['t', 'f'])], context=context)
+        pricelist_ids = pricelist_obj.search(cr, uid, [('currency_id', 'in', ids), ('active', 'in', ['t', 'f'])],
+                                             order='NO_ORDER', context=context)
         if pricelist_ids:
             # Get all documents which disallow the deletion of the currency
-            purchase_ids = purchase_obj.search(cr, uid, [('pricelist_id', 'in', pricelist_ids)], context=context)
-            sale_ids = sale_obj.search(cr, uid, [('pricelist_id', 'in', pricelist_ids)], context=context)
-#            partner_ids = partner_obj.search(cr, uid, ['|', ('property_product_pricelist', 'in', pricelist_ids),
-#                                                       ('property_product_pricelist_purchase', 'in', pricelist_ids)], context=context)
+            # Raise an error if the currency is used in a transaction that isn't closed/paid/posted
+
+            # Check on POs
+            if purchase_obj.search_exist(cr, uid, [('pricelist_id', 'in', pricelist_ids), ('state', 'not in', ['done', 'cancel'])],
+                                         context=context):
+                raise osv.except_osv(_('Currency currently used!'), _(
+                    "The currency you want to %s is used in at least one "
+                    "Purchase Order which isn't Closed.") % keyword)
+
+            # Check on FOs
+            if sale_obj.search_exist(cr, uid, [('pricelist_id', 'in', pricelist_ids), ('state', 'not in', ['done', 'cancel'])],
+                                     context=context):
+                raise osv.except_osv(_('Currency currently used!'), _(
+                    "The currency you want to %s is used in at least one "
+                    "Field Order which isn't Closed.") % keyword)
+
+            # Check on Partner (forms)
             value_reference = ['product.pricelist,%s' % x for x in pricelist_ids]
-            partner_ids = property_obj.search(cr, uid, ['|', ('name', '=', 'property_product_pricelist'),
-                                                        ('name', '=', 'property_product_pricelist_purcahse'),
-                                                        ('value_reference', 'in', value_reference)])
-
-            # Raise an error if the currency is used on partner form
-            if partner_ids:
-                raise osv.except_osv(_('Currency currently used !'), _('The currency you want to %s is currently used on at least one partner form.') % keyword)
-
-            # Raise an error if the currency is used on sale or purchase order
-            if purchase_ids or sale_ids:
-                raise osv.except_osv(_('Currency currently used !'), _('The currency you want to %s is currently used on at least one sale order or purchase order.') % keyword)
+            property_ids = property_obj.search(cr, uid, ['|', ('name', '=', 'property_product_pricelist'),
+                                                        ('name', '=', 'property_product_pricelist_purchase'),
+                                                        ('value_reference', 'in', value_reference)], order='NO_ORDER', context=context)
+            for prop in property_obj.browse(cr, uid, property_ids, fields_to_fetch=['res_id'], context=context):
+                if prop.res_id and prop.res_id._table_name == 'res.partner' and prop.res_id.active:
+                    raise osv.except_osv(_('Currency currently used!'), _('The currency you want to %s is used '
+                                                                          'in at least one active partner form.') % keyword)
+
+        # Check on account.invoice
+        if acc_inv_obj.search_exist(cr, uid, [('currency_id', 'in', ids), ('state', 'not in', ['paid', 'cancel'])], context=context):
+            raise osv.except_osv(_('Currency currently used!'), _('The currency you want to %s is used in at least '
+                                                                  'one document in Draft or Open state.') % keyword)
+
+        # Check on Journal Items
+        if aml_obj.search_exist(cr, uid, ['|',
+                                          ('currency_id', 'in', ids),
+                                          ('functional_currency_id', 'in', ids),
+                                          ('move_state', '=', 'draft')], context=context):
+            raise osv.except_osv(_('Currency currently used!'), _('The currency you want to %s is used in at least '
+                                                                  'one Journal Item in Unposted state.') % keyword)
+        # Check on Commitment Vouchers
+        if comm_voucher_obj.search_exist(cr, uid, [('currency_id', 'in', ids), ('state', '!=', 'done')], context=context):
+            raise osv.except_osv(_('Currency currently used!'), _("The currency you want to %s is used in at least "
+                                                                  "one Commitment Voucher which isn't Done.") % keyword)
+        # Check on HQ Entries
+        if hq_entry_obj.search_exist(cr, uid, [('currency_id', 'in', ids), ('user_validated', '=', False)], context=context):
+            raise osv.except_osv(_('Currency currently used!'), _("The currency you want to %s is used in at least "
+                                                                  "one HQ Entry which isn't validated.") % keyword)
+
+        # Check on HR Payrolls
+        if payroll_obj.search_exist(cr, uid, [('currency_id', 'in', ids), ('state', '=', 'draft')], context=context):
+            raise osv.except_osv(_('Currency currently used!'), _("The currency you want to %s is used in at least "
+                                                                  "one Payroll Entry which isn't validated.") % keyword)
+
+        # Check on Registers
+        if reg_obj.search_exist(cr, uid, [('journal_id.currency', 'in', ids), ('state', 'in', ['draft', 'open'])], context=context):
+            raise osv.except_osv(_('Currency currently used!'),
+                                 _("The currency you want to %s is used in at least "
+                                   "one Register in Draft or Open state.") % keyword)
+
+        # Check on Recurring Entries
+        if recurring_obj.search_exist(cr, uid, [('model_id.currency_id', 'in', ids), ('state', '!=', 'done')], context=context):
+            raise osv.except_osv(_('Currency currently used!'),
+                                 _("The currency you want to %s is used in at least "
+                                   "one Recurring Entry having a state not Done.") % keyword)
+
+        # Check on Accrual Lines
+        if accrual_line_obj.search_exist(cr, uid,
+                                         ['|', ('currency_id', 'in', ids), ('functional_currency_id', 'in', ids),
+                                               ('state', 'in', ['draft', 'partially_posted'])], context=context):
+            raise osv.except_osv(_('Currency currently used!'),
+                                 _("The currency you want to %s is used in at least "
+                                   "one Draft or Partially Posted Accrual Line.") % keyword)
 
         return pricelist_ids
 
@@ -229,7 +294,7 @@
                                                                             ('currency_id','in',ids),
                                                                             ('functional_currency_id', 'in', ids)], context=context)
         if len(move_line_ids) > 0:
-            raise osv.except_osv(_('Currency currently used !'), _('The currency cannot be deleted as one or more journal items are currently using it!'))
+            raise osv.except_osv(_('Currency currently used!'), _('The currency cannot be deleted as one or more journal items are currently using it!'))
 
         pricelist_obj = self.pool.get('product.pricelist')