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

[jftempo]

=== modified file 'bin/addons/account_override/account_move_line.py'
--- bin/addons/account_override/account_move_line.py	2016-11-24 15:02:51 +0000
+++ bin/addons/account_override/account_move_line.py	2016-12-15 08:33:57 +0000
@@ -484,7 +484,13 @@
             context = {}
         if context.get('from_web_menu', False):
             for ml in self.browse(cr, uid, ids):
-                if ml.move_id and ml.move_id.status == 'sys':
+                # US-1822 When unreconciling entries, to check if the write can be done use the reconciliation status
+                # (manual / auto) instead of the JI one
+                if 'unreconcile_date' in vals and vals['unreconcile_date']:
+                    reconciliation = ml.reconcile_id or ml.reconcile_partial_id or False
+                    if reconciliation and reconciliation.type == 'auto':
+                        raise osv.except_osv(_('Warning'), _('Only manually reconciled entries can be unreconciled.'))
+                elif ml.move_id and ml.move_id.status == 'sys':
                     raise osv.except_osv(_('Warning'), _('You cannot change Journal Items that comes from the system!'))
             # Check date validity with period
             self._check_date_validity(cr, uid, ids, vals)

=== modified file 'bin/addons/msf_profile/i18n/fr_MF.po'
--- bin/addons/msf_profile/i18n/fr_MF.po	2016-12-07 06:47:50 +0000
+++ bin/addons/msf_profile/i18n/fr_MF.po	2016-12-15 08:33:57 +0000
@@ -75713,6 +75713,7 @@
 msgid "There is no stopped products to report"
 msgstr "Il n'y a aucun produit stoppé à afficher"
 
+<<<<<<< TREE
 #. module: msf_doc_import
 #: code:addons/msf_doc_import/check_line.py:626
 #: code:addons/msf_doc_import/check_line.py:628
@@ -75769,3 +75770,10 @@
 msgid "Partner Created on this instance"
 msgstr "Partenaire créé sur cette instance"
 
+=======
+#. module: account_override
+#: code:addons/account_override/account_move_line.py:491
+#, python-format
+msgid "Only manually reconciled entries can be unreconciled."
+msgstr "Seules les entrées lettrées manuellement peuvent être délettrées."
+>>>>>>> MERGE-SOURCE