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

[jftempo]

=== modified file 'bin/addons/account_override/invoice.py'
--- bin/addons/account_override/invoice.py	2017-02-24 13:33:33 +0000
+++ bin/addons/account_override/invoice.py	2017-04-24 09:34:46 +0000
@@ -378,11 +378,16 @@
             context = {}
         if isinstance(ids, (int, long)):
             ids = [ids]
-        for inv in self.read(cr, uid, ids, ['purchase_ids', 'type', 'is_inkind_donation', 'is_debit_note']):
+        for inv in self.read(cr, uid, ids, ['purchase_ids', 'type', 'is_inkind_donation', 'is_debit_note', 'is_intermission', 'state']):
             if inv.get('type', '') == 'in_invoice' and not inv.get('is_inkind_donation', False) and not inv.get('is_debit_note', False):
                 if inv.get('purchase_ids', False):
-                    # US-1702 Do not allow at all the deletion of SI coming from PO
-                    raise osv.except_osv(_('Warning'), _('You cannot cancel or delete a supplier invoice linked to a PO.'))
+                    if inv.get('is_intermission'):
+                        if inv.get('state', '') != 'draft':  # only draft IVIs can be deleted
+                            raise osv.except_osv(_('Warning'),
+                                                 _('Intermission Vouchers linked to a PO can be deleted only in Draft state.'))
+                    else:
+                        # US-1702 Do not allow at all the deletion of SI coming from PO
+                        raise osv.except_osv(_('Warning'), _('You cannot cancel or delete a supplier invoice linked to a PO.'))
         return True
 
     def _hook_period_id(self, cr, uid, inv, context=None):

=== modified file 'bin/addons/msf_profile/i18n/fr_MF.po'
--- bin/addons/msf_profile/i18n/fr_MF.po	2017-04-19 14:11:12 +0000
+++ bin/addons/msf_profile/i18n/fr_MF.po	2017-04-24 09:34:46 +0000
@@ -98225,6 +98225,7 @@
 msgid "Article must be used only in a properly designed programme, need a more detailed description."
 msgstr "L'article doit être uniquement utilisé dans un programme correctement construit, à besoin d'une description plus détaillée."
 
+<<<<<<< TREE
 #. module: sync_client
 #: view:sync.client.update_received:0
 msgid "Updates Received"
@@ -98376,3 +98377,10 @@
 #, python-format
 msgid "The date format was not correct. The expected date should be > 01/01/1900 in this format DD/MM/YYYY."
 msgstr "Format de date incorrect. La date attendue doit être > 01/01/1900 dans ce format JJ/MM/AAAA."
+=======
+#. module: account_override
+#: code:addons/account_override/invoice.py:387
+#, python-format
+msgid "Intermission Vouchers linked to a PO can be deleted only in Draft state."
+msgstr "Les Bons Intermission liés à un BC ne peuvent être supprimés qu'à l'état Brouillon."
+>>>>>>> MERGE-SOURCE