Merge lp:~mukunde/unifield-server/US-10090 into lp:unifield-server

[jftempo]

=== modified file 'bin/addons/account/account.py'
--- bin/addons/account/account.py	2022-06-22 13:46:44 +0000
+++ bin/addons/account/account.py	2022-07-08 13:04:36 +0000
@@ -2583,7 +2583,7 @@
 
     _columns = {
         'name': fields.char('Name', size=64, required=True),
-        'ref': fields.char('Reference', size=16),
+        'ref': fields.char('Reference', size=64),
         'model_id': fields.many2one('account.model', 'Model', required=True),
 
         'date_start': fields.date('Start Date', required=True),

=== modified file 'bin/addons/account/account_view.xml'
--- bin/addons/account/account_view.xml	2022-03-22 12:59:02 +0000
+++ bin/addons/account/account_view.xml	2022-07-08 13:04:36 +0000
@@ -1897,7 +1897,7 @@
                       <filter icon="terp-dialog-close" string="Done" name="done" domain="[('state', '=', 'done')]" />
                       <field name="name"/>
                       <field name="journal_id"
-                             domain="[('type', '=', 'purchase'), ('code', '!=', 'ISI'), ('is_current_instance', '=', True)]"
+                             domain="[('type', 'in', ('purchase', 'depreciation')), ('code', '!=', 'ISI'), ('is_current_instance', '=', True)]"
                              context="{'search_default_filter_is_active': 1}"
                       />
                     </group>

=== modified file 'bin/addons/account_journal/project/project.py'
--- bin/addons/account_journal/project/project.py	2022-05-04 12:46:50 +0000
+++ bin/addons/account_journal/project/project.py	2022-07-08 13:04:36 +0000
@@ -53,6 +53,7 @@
             ('revaluation', 'Revaluation'),
             ('sale','Sale'),
             ('situation','Situation'),
+            ('depreciation', 'Depreciation'),
         ]
 
     def _get_has_ajis(self, cr, uid, ids, field_name, arg, context=None):

=== modified file 'bin/addons/account_override/__init__.py'
--- bin/addons/account_override/__init__.py	2022-05-10 10:21:27 +0000
+++ bin/addons/account_override/__init__.py	2022-07-08 13:04:36 +0000
@@ -128,8 +128,11 @@
     'recurring_lines': [
         ('type', '!=', 'view'),
         ('is_not_hq_correctible', '=', False),
-        '|', '&', ('user_type_code', '=', 'receivables'), ('type', '=', 'receivable'), '&', ('user_type_code', '=', 'expense'), ('user_type.report_type', '!=', 'none'), # Receivable/Receivable allowed + expense accounts (without extra-accounting) allowed
+        '|',
+        '|', '&', ('user_type_code', '=', 'receivables'), ('type', '=', 'receivable'), '&', ('user_type_code', '=', 'expense'), ('user_type.report_type', '!=', 'none'),  # Receivable/Receivable allowed + expense accounts (without extra-accounting) allowed
+        '&', ('user_type_code', '=', 'asset'), ('type', '=', 'other'),  # US-10090 Allow Type "Asset" and Internal Type "Regular"
     ],
+
     # ACCRUALS - expense lines
     # WARNING: keep in mind that the AD button is always displayed in the Accrual Expense Lines, so if the following
     # domain is modified, this may have to be adapted.

=== modified file 'bin/addons/account_subscription/account_model_view.xml'
--- bin/addons/account_subscription/account_model_view.xml	2022-01-14 13:57:33 +0000
+++ bin/addons/account_subscription/account_model_view.xml	2022-07-08 13:04:36 +0000
@@ -27,7 +27,7 @@
                             <group attrs="{'readonly': [('state', '=', 'done')]}" colspan="6" col="6">
                                 <field name="name"/>
                                 <field name="journal_id"
-                                       domain="[('type', '=', 'purchase'), ('code', '!=', 'ISI'), ('is_current_instance', '=', True), ('is_active', '=', True)]"/>
+                                       domain="[('type', 'in', ('purchase', 'depreciation')), ('code', '!=', 'ISI'), ('is_current_instance', '=', True), ('is_active', '=', True)]"/>
                                 <field name="currency_id"/>
                             </group>
                             <group colspan="6" col="6" attrs="{'invisible': [('analytic_distribution_id', '=', False)]}">

=== modified file 'bin/addons/msf_profile/data/patches.xml'
--- bin/addons/msf_profile/data/patches.xml	2022-05-30 15:32:49 +0000
+++ bin/addons/msf_profile/data/patches.xml	2022-07-08 13:04:36 +0000
@@ -787,9 +787,17 @@
             <field name="method">us_5722_update_accruals</field>
         </record>
 
+<<<<<<< TREE
         <record id="us_8259_remove_currency_table_wkf" model="patch.scripts">
             <field name="method">us_8259_remove_currency_table_wkf</field>
         </record>
 
+=======
+        <!-- UF27.0 -->
+        <record id="us_10090_new_dep_journals" model="patch.scripts">
+            <field name="method">us_10090_new_dep_journals</field>
+        </record>
+
+>>>>>>> MERGE-SOURCE
     </data>
 </openerp>

=== modified file 'bin/addons/msf_profile/msf_profile.py'
--- bin/addons/msf_profile/msf_profile.py	2022-05-30 15:32:49 +0000
+++ bin/addons/msf_profile/msf_profile.py	2022-07-08 13:04:36 +0000
@@ -56,12 +56,55 @@
         'model': lambda *a: 'patch.scripts',
     }
 
+<<<<<<< TREE
     def us_8259_remove_currency_table_wkf(self, cr, uid, *a, **b):
         cr.execute("delete from wkf_workitem where act_id in (select id from wkf_activity where wkf_id = (select id from wkf where name='wkf.res.currency.table' and osv='res.currency.table'))")
         cr.execute("delete from wkf_activity where wkf_id = (select id from wkf where name='wkf.res.currency.table' and osv='res.currency.table')")
         cr.execute("delete from wkf where name='wkf.res.currency.table' and osv='res.currency.table'")
         return True
 
+=======
+    def us_10090_new_dep_journals(self, cr, uid, *a, **b):
+        """
+        Creates the DEP G/L journals in all OCB instances and DEP analytic journals in all existing instances.
+        This is done in Python as the objects created must sync normally.
+        """
+        user_obj = self.pool.get('res.users')
+        analytic_journal_obj = self.pool.get('account.analytic.journal')
+        journal_obj = self.pool.get('account.journal')
+        current_instance = user_obj.browse(cr, uid, uid, fields_to_fetch=['company_id']).company_id.instance_id
+        if current_instance:  # existing instances only
+            # DEP analytic journal
+            dep_analytic_journal_ids = analytic_journal_obj.search(cr, uid,
+                                                                   [('code', '=', 'DEP'),
+                                                                    ('type', '=', 'depreciation'),
+                                                                    ('is_current_instance', '=', True)])
+            if dep_analytic_journal_ids:  # just in case the journal has been created before the release
+                dep_analytic_journal_id = dep_analytic_journal_ids[0]
+            else:
+                dep_analytic_vals = {
+                    # Prop. Instance: by default the current one is used
+                    'code': 'DEP',
+                    'name': 'Depreciation',
+                    'type': 'depreciation',
+                }
+                dep_analytic_journal_id = analytic_journal_obj.create(cr, uid, dep_analytic_vals)
+            # DEP G/L journal in all OCB instances
+            if current_instance.name.startswith('OCB')\
+                    and not journal_obj.search_exist(cr, uid, [('code', '=', 'DEP'), ('type', '=', 'depreciation'),
+                                                               ('is_current_instance', '=', True),
+                                                               ('analytic_journal_id', '=', dep_analytic_journal_id)]):
+                dep_vals = {
+                    # Prop. Instance: by default the current one is used
+                    'code': 'DEP',
+                    'name': 'Depreciation',
+                    'type': 'depreciation',
+                    'analytic_journal_id': dep_analytic_journal_id,
+                }
+                journal_obj.create(cr, uid, dep_vals)
+        return True
+
+>>>>>>> MERGE-SOURCE
     # UF25.0
     def us_8451_split_rr(self, cr, uid, *a, **b):
         if not cr.column_exists('replenishment_segment_line', 'rr_fmc_1') or not cr.column_exists('replenishment_segment_line', 'rr_max_1'):

=== modified file 'bin/addons/msf_sync_data_post_synchro/data/account.analytic.journal.csv'
--- bin/addons/msf_sync_data_post_synchro/data/account.analytic.journal.csv	2022-02-22 15:30:02 +0000
+++ bin/addons/msf_sync_data_post_synchro/data/account.analytic.journal.csv	2022-07-08 13:04:36 +0000
@@ -20,3 +20,4 @@
 TRUE,ENGI,International Engagement,engagement
 TRUE,ISI,Intersection Supplier Invoice,purchase
 TRUE,MIG,Migration,migration
+TRUE,DEP,Depreciation,depreciation

=== modified file 'bin/addons/msf_sync_data_post_synchro/data/account.journal.csv'
--- bin/addons/msf_sync_data_post_synchro/data/account.journal.csv	2022-02-22 15:30:02 +0000
+++ bin/addons/msf_sync_data_post_synchro/data/account.journal.csv	2022-07-08 13:04:36 +0000
@@ -16,3 +16,4 @@
 REV,,,,Revaluation,revaluation,Revaluation
 ISI,,,,Intersection Supplier Invoice,purchase,Intersection Supplier Invoice
 MIG,,,,Migration,migration,Migration
+DEP,,,,Depreciation,depreciation,Depreciation