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

[jftempo]

=== modified file 'bin/addons/account_corrections/account_move_line.py'
--- bin/addons/account_corrections/account_move_line.py	2018-06-15 09:18:20 +0000
+++ bin/addons/account_corrections/account_move_line.py	2018-09-12 12:20:35 +0000
@@ -930,7 +930,7 @@
         if isinstance(ji_ids, (int, long)):
             ji_ids = [ji_ids]
         aal_obj = self.pool.get('account.analytic.line')
-        for ji in self.browse(cr, uid, ji_ids, fields_to_fetch=['corrected', 'move_id'], context=context):
+        for ji in self.browse(cr, uid, ji_ids, fields_to_fetch=['corrected', 'move_id', 'account_id'], context=context):
             # check that the account can be corrected
             if ji.account_id.is_not_hq_correctible:
                 raise osv.except_osv(_('Error'), _('The account "%s - %s" is set as "Prevent correction on '

=== modified file 'bin/addons/msf_profile/i18n/fr_MF.po'
--- bin/addons/msf_profile/i18n/fr_MF.po	2018-09-03 09:00:00 +0000
+++ bin/addons/msf_profile/i18n/fr_MF.po	2018-09-12 12:20:35 +0000
@@ -34874,12 +34874,6 @@
 msgid "Only draft picking tickets can be deleted."
 msgstr "Seuls les brouillons de bons de picking peuvent être supprimés"
 
-#. module: msf_tools
-#: code:addons/msf_tools/msf_tools.py:886
-#, python-format
-msgid "Document date should be in posting date FY"
-msgstr "Document date should be in posting date FY"
-
 #. module: account
 #: field:account.account.type,name:0
 msgid "Acc. Type Name"
@@ -39566,12 +39560,6 @@
 msgid "Africa/Kinshasa"
 msgstr "Africa/Kinshasa"
 
-#. module: msf_tools
-#: code:addons/msf_tools/msf_tools.py:883
-#, python-format
-msgid "Document date (%s) should be in posting date FY"
-msgstr "Document date (%s) should be in posting date FY"
-
 #. modules: account_override, order_line_number, register_accounting
 #: field:account.invoice,sequence_id:0
 #: field:purchase.order,sequence_id:0

=== modified file 'bin/addons/msf_tools/msf_tools.py'
--- bin/addons/msf_tools/msf_tools.py	2017-10-02 15:51:29 +0000
+++ bin/addons/msf_tools/msf_tools.py	2018-09-12 12:20:35 +0000
@@ -841,12 +841,7 @@
     def check_document_date(self, cr, uid, document_date, posting_date,
                             show_date=False, custom_msg=False, context=None):
         """
-        US-192 document date check rules
-        http://jira.unifield.org/browse/US-192?focusedCommentId=38911&page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel#comment-38911
-
-        Document date should be included within the fiscal year of
-            the posting date it is tied with.
-        01/01/FY <= document date <= 31/12/FY
+        Checks that posting date >= document date
 
         :type document_date: orm date
         :type posting_date: orm date
@@ -859,8 +854,6 @@
         if custom_msg:
             show_date = False
 
-        # initial check that not (posting_date < document_date)
-        # like was until 1.0-5
         if posting_date < document_date:
             if custom_msg:
                 msg = custom_msg  # optional custom message
@@ -873,19 +866,6 @@
                         'Posting date should be later than Document Date.')
             raise osv.except_osv(_('Error'), msg)
 
-        # US-192 check
-        # 01/01/FY <= document date <= 31/12/FY
-        posting_date_obj = self.pool.get('date.tools').orm2date(posting_date)
-        check_range_start = self.get_orm_date(1, 1, year=posting_date_obj.year)
-        check_range_end = posting_date
-        if not (check_range_start <= document_date <= check_range_end):
-            if show_date:
-                msg = _('Document date (%s) should be in posting date FY') % (
-                    document_date, )
-            else:
-                msg = _('Document date should be in posting date FY')
-            raise osv.except_osv(_('Error'), msg)
-
     def truncate_amount(self, amount, digits):
         stepper = pow(10.0, digits)
         return math.trunc(stepper * amount) / stepper