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

[jftempo]

=== modified file 'bin/addons/msf_profile/data/patches.xml'
--- bin/addons/msf_profile/data/patches.xml	2019-02-06 13:36:14 +0000
+++ bin/addons/msf_profile/data/patches.xml	2019-02-21 09:14:56 +0000
@@ -2,6 +2,10 @@
 <openerp>
     <data>
         <!-- UF12.0 -->
+        <record id="us_5724_set_previous_fy_dates_allowed" model="patch.scripts">
+            <field name="method">us_5724_set_previous_fy_dates_allowed</field>
+        </record>
+
         <record id="us_2896_volume_ocbprod" model="patch.scripts">
             <field name="method">us_2896_volume_ocbprod</field>
         </record>
 
=== modified file 'bin/addons/msf_profile/i18n/fr_MF.po'
--- bin/addons/msf_profile/i18n/fr_MF.po	2019-02-15 10:46:11 +0000
+++ bin/addons/msf_profile/i18n/fr_MF.po	2019-02-21 09:14:56 +0000
@@ -105270,3 +105270,43 @@
 #: field:wizard.pick.import,import_file:0
 msgid "PICK import file"
 msgstr "Fichier d'import de PICK"
+
+#. module: unifield_setup
+#: field:previous.fy.dates.setup,previous_fy_dates_allowed:0
+#: field:unifield.setup.configuration,previous_fy_dates_allowed:0
+msgid "Does the system allow document dates on previous Fiscal Year?"
+msgstr "Le système autorise-t-il les dates des documents sur l'Exercice Comptable précédent ?"
+
+#. module: unifield_setup
+#: code:addons/unifield_setup/installer/previous_fy_dates_setup.py:52
+#, python-format
+msgid "An error has occurred with the item retrieved from the form. Please contact an administrator if the problem persists."
+msgstr "Une erreur est survenue avec l'élément récupéré depuis le formulaire. Veuillez contacter un administrateur si le problème persiste."
+
+#. module: unifield_setup
+#: view:previous.fy.dates.setup:0
+#: model:ir.actions.act_window,name:unifield_setup.action_previous_fy_dates_setup
+msgid "Allow previous Fiscal Year dates"
+msgstr "Autoriser les dates de l'Exercice Comptable précédent"
+
+#. module: unifield_setup
+#: view:previous.fy.dates.setup:0
+msgid "Allow document dates on previous Fiscal Year"
+msgstr "Autoriser les dates des documents sur l'Exercice Comptable précédent"
+
+#. module: unifield_setup
+#: view:previous.fy.dates.setup:0
+msgid "Determines whether document dates and posting dates can be on different Fiscal Years."
+msgstr "Détermine si les dates des documents et les dates de comptabilisation peuvent être sur des Exercices Comptables différents."
+
+#. module: msf_tools
+#: code:addons/msf_tools/msf_tools.py:909
+#, python-format
+msgid "Document date should be in posting date FY"
+msgstr "La date du document doit être dans le même exercice comptable que la date de comptabilisation"
+
+#. module: msf_tools
+#: code:addons/msf_tools/msf_tools.py:907
+#, python-format
+msgid "Document date (%s) should be in posting date FY"
+msgstr "La date du document (%s) doit être dans le même exercice comptable que la date de comptabilisation"
 
=== modified file 'bin/addons/msf_profile/msf_profile.py'
--- bin/addons/msf_profile/msf_profile.py	2019-02-06 13:36:14 +0000
+++ bin/addons/msf_profile/msf_profile.py	2019-02-21 09:14:56 +0000
@@ -53,6 +53,16 @@
     }
 
     # UF12.0
+    def us_5724_set_previous_fy_dates_allowed(self, cr, uid, *a, **b):
+        """
+        Sets the field "previous_fy_dates_allowed" to True in the UniField Setup Configuration for all OCB and OCP instances
+        """
+        user_obj = self.pool.get('res.users')
+        current_instance = user_obj.browse(cr, uid, uid, fields_to_fetch=['company_id']).company_id.instance_id
+        if current_instance and (current_instance.name.startswith('OCB') or current_instance.name.startswith('OCP')):
+            cr.execute("UPDATE unifield_setup_configuration SET previous_fy_dates_allowed = 't';")
+        return True
+
     def us_2896_volume_ocbprod(self, cr, uid, *a, **b):
         ''' OCBHQ: volume has not been converted to dm3 on instances '''
         instance = self.pool.get('res.users').browse(cr, uid, uid).company_id.instance_id
 
=== modified file 'bin/addons/msf_tools/msf_tools.py'
--- bin/addons/msf_tools/msf_tools.py	2018-12-10 14:01:47 +0000
+++ bin/addons/msf_tools/msf_tools.py	2019-02-21 09:14:56 +0000
@@ -871,6 +871,8 @@
                             show_date=False, custom_msg=False, context=None):
         """
         Checks that posting date >= document date
+        Depending on the config made in the Reconfigure Wizard, can also check that the document date is included
+        in the same FY as the related posting date.
 
         :type document_date: orm date
         :type posting_date: orm date
@@ -895,6 +897,20 @@
                         'Posting date should be later than Document Date.')
             raise osv.except_osv(_('Error'), msg)
 
+        # if the system doesn't allow doc dates from previous FY, check that this condition is met
+        setup = self.pool.get('unifield.setup.configuration').get_config(cr, uid)
+        if not setup or not setup.previous_fy_dates_allowed:
+            # 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 = self.get_orm_date(31, 12, year=posting_date_obj.year)
+            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
 
=== modified file 'bin/addons/unifield_setup/__openerp__.py'
--- bin/addons/unifield_setup/__openerp__.py	2014-05-13 11:58:37 +0000
+++ bin/addons/unifield_setup/__openerp__.py	2019-02-21 09:14:56 +0000
@@ -59,6 +59,7 @@
         "installer/payroll_view.xml",
         "installer/commitment_import_view.xml",
         "installer/vat_setup_view.xml",
+        "installer/previous_fy_dates_setup_view.xml",
         # Security and access rights
         "security/ir.model.access.csv",
         "view/product_view.xml",
 
=== modified file 'bin/addons/unifield_setup/installer/__init__.py'
--- bin/addons/unifield_setup/installer/__init__.py	2014-05-13 11:58:37 +0000
+++ bin/addons/unifield_setup/installer/__init__.py	2019-02-21 09:14:56 +0000
@@ -32,3 +32,4 @@
 import payroll
 import commitment_import
 import vat_setup
+import previous_fy_dates_setup
 
=== added file 'bin/addons/unifield_setup/installer/previous_fy_dates_setup.py'
--- bin/addons/unifield_setup/installer/previous_fy_dates_setup.py	1970-01-01 00:00:00 +0000
+++ bin/addons/unifield_setup/installer/previous_fy_dates_setup.py	2019-02-21 09:14:56 +0000
@@ -0,0 +1,62 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2019 TeMPO Consulting, MSF
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+# 
+##############################################################################
+
+from osv import osv
+from osv import fields
+
+from tools.translate import _
+
+
+class previous_fy_dates_setup(osv.osv_memory):
+    _name = 'previous.fy.dates.setup'
+    _inherit = 'res.config'
+    
+    _columns = {
+        'previous_fy_dates_allowed': fields.boolean(string='Does the system allow document dates on previous Fiscal Year?'),
+    }
+    
+    def default_get(self, cr, uid, fields, context=None):
+        """
+        Display the default/current value regarding the allowing of previous FY dates
+        """
+        if context is None:
+            context = {}
+        setup = self.pool.get('unifield.setup.configuration').get_config(cr, uid)
+        res = super(previous_fy_dates_setup, self).default_get(cr, uid, fields, context=context)
+        res['previous_fy_dates_allowed'] = setup.previous_fy_dates_allowed
+        return res
+
+    def execute(self, cr, uid, ids, context=None):
+        """
+        Fills in the previous_fy_dates_allowed field and activate/de-activate the allowing of Doc dates booked in previous FY
+        """
+        if context is None:
+            context = {}
+        if not isinstance(ids, list) or len(ids) != 1:
+            raise osv.except_osv(_('Error'), _('An error has occurred with the item retrieved from the form. Please contact an administrator if the problem persists.'))
+        payload = self.browse(cr, uid, ids[0], fields_to_fetch=['previous_fy_dates_allowed'], context=context)
+        setup_obj = self.pool.get('unifield.setup.configuration')
+        setup = setup_obj.get_config(cr, uid)
+        if setup:
+            setup_obj.write(cr, uid, [setup.id], {'previous_fy_dates_allowed': payload.previous_fy_dates_allowed}, context=context)
+
+
+previous_fy_dates_setup()
 
=== added file 'bin/addons/unifield_setup/installer/previous_fy_dates_setup_view.xml'
--- bin/addons/unifield_setup/installer/previous_fy_dates_setup_view.xml	1970-01-01 00:00:00 +0000
+++ bin/addons/unifield_setup/installer/previous_fy_dates_setup_view.xml	2019-02-21 09:14:56 +0000
@@ -0,0 +1,48 @@
+<openerp>
+    <data>
+        <record id="view_previous_fy_dates_setup" model="ir.ui.view">
+            <field name="name">Allow previous Fiscal Year dates</field>
+            <field name="model">previous.fy.dates.setup</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="base.res_config_view_base"/>
+            <field name="arch" type="xml">
+                <data>
+                    <form position="attributes">
+                        <attribute name="string">Allow previous Fiscal Year dates</attribute>
+                    </form>
+                    <xpath expr="//label[@string='description']" position="attributes">
+                        <attribute name="string">Determines whether document dates and posting dates can be on different Fiscal Years.</attribute>
+                    </xpath>
+                    <xpath expr='//separator[@string="title"]' position='attributes'>
+                        <attribute name='string'>Allow document dates on previous Fiscal Year</attribute>
+                    </xpath>
+                    <xpath expr='//separator[@string="vsep"]' position='attributes'>
+                        <attribute name='rowspan'>25</attribute>
+                        <attribute name='string'></attribute>
+                    </xpath>
+                    <group string="res_config_contents" position="replace">
+                        <group colspan="5">
+                            <field name="previous_fy_dates_allowed"/>
+                        </group>
+                    </group>
+                </data>
+            </field>
+        </record>
+
+        <record id="action_previous_fy_dates_setup" model="ir.actions.act_window">
+            <field name="name">Allow previous Fiscal Year dates</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">previous.fy.dates.setup</field>
+            <field name="view_id" ref="view_previous_fy_dates_setup"/>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="target">new</field>
+        </record>
+
+        <record id="previous_fy_dates_setup_todo" model="ir.actions.todo">
+            <field name="action_id" ref="action_previous_fy_dates_setup"/>
+            <field name="sequence">30</field>
+            <field name="restart">always</field>
+        </record>
+    </data>
+</openerp>
 
=== modified file 'bin/addons/unifield_setup/setup_configuration.py'
--- bin/addons/unifield_setup/setup_configuration.py	2017-09-28 14:58:54 +0000
+++ bin/addons/unifield_setup/setup_configuration.py	2019-02-21 09:14:56 +0000
@@ -59,6 +59,7 @@
         'payroll_ok': fields.boolean(string='System manages payrolls ?'),
         'import_commitments': fields.boolean(string='Manage commitments corresponding to international order through specific import ?'),
         'vat_ok': fields.boolean(string='System manages VAT locally ?'),
+        'previous_fy_dates_allowed': fields.boolean(string='Does the system allow document dates on previous Fiscal Year?'),
     }
 
     _defaults = {
@@ -73,6 +74,7 @@
         'payroll_ok': lambda *a: True,
         'import_commitments': lambda *a: True,
         'vat_ok': lambda *a: True,
+        'previous_fy_dates_allowed': lambda *a: False,
     }
 
     _constraints = [