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

[jftempo]

[lp:~mukunde/unifield-server/US-11269]

6138. By jftempo on 2023-09-25

US-12011 [MERGE] PO Confirmation with MML non-conform product

6139. By jftempo on 2023-09-26

[MERGE] UF30.1

6140. By jftempo on 2023-09-26

Release UF30.1

6141. By jftempo on 2023-10-02

US-5946 [FIX] Import expact
     - allow integer as Indentifier
     - end date: issue depending on server locale (fr_MF)
     - Tools > Import : allow to import file with or without end date

6142. By jftempo on 2023-10-03

US-12041 [FIX] Import payroll: lmf if envoi.ini is ISO-8859 encoded with special char

6143. By jftempo on 2023-10-23

US-12130 [FIX] JI / JI Selector: pink screen if Display HQ Code is enabled on Company configuration

6144. By jftempo on 2023-10-24

US-12069 [IMP] OCP Webservice to update res.currency.table

6145. By jftempo on 2023-10-26

US-US-5912 [FIX] Export PO f/up: too many lines, replace Lmf by a warning message

6146. By jftempo on 2023-10-26

US-5376 [FIX] HQ entries import: allow B/S account

6147. By jftempo on 2023-10-26

US-6516 [FIX] OCG VI Finance: py3 error on itekeys

6148. By jftempo on 2023-11-03

[MERGE] UF31.0rc0

6149. By jftempo on 2023-11-06

[MERGE] UF31.0rc1

6150. By jftempo on 2023-11-06

[FIX] UF30.1 py3 migration

6151. By jftempo on 2023-11-06

[FIX] Asset py3: int, long

6152. By jftempo on 2023-11-10

US-12185 |FIX] PI import with ED date 11-2222 nothing happens
   - dateutil.parser.parse does not raise a ValueError
   - Exception.message no longer exists in py3

6153. By jftempo on 2023-11-10

Exception has no more message attribute

6154. By jftempo on 2023-11-16

[MERGE] UF31.0rc2

6155. By jftempo on 2023-11-20

US-11950 [FIX] Product asset sync down state

6156. By jftempo on 2023-11-21

[IMP] RB: create asset data

6157. By jftempo on 2023-11-22

Upgrade python lib

6158. By jftempo on 2023-11-22

Upgrade python lib

6159. By jftempo on 2023-11-22

Upgrade python lib

6160. By jftempo on 2023-11-22

upgrade from pip-audit

6161. By jftempo on 2023-11-22

Upgrade lib from safety tool

6162. By jftempo on 2023-11-22

[IMP] replace deprecated currentThread() / isDaemon() by current_thread() / daemon

6163. By jftempo on 2023-11-23

[FIX] Py3 Pillow 10: getsize replaced by getbbox

6164. By jftempo on 2023-11-23

US-12244 [FIX] Periodical forecast: fixed date check for dates in the future

6165. By jftempo on 2023-11-23

US-6144-py3 [FIX] Sourcing: fixed name filtering for python 3 during creation/modification

lp:~dorian-kemps/unifield-server/US-6144-py3

6166. By jftempo on 2023-11-30

[FIX] Generate translation file to py3

6167. By jftempo on 2023-12-01

Release UF31.0py3

6168. By jftempo on 2023-12-14

[MERGE] UF31.1

6169. By jftempo on 2023-12-14

unifield-version.txt: typo in version

6170. By Gaël Mukunde on 2023-12-15

US-11269 [IMP] Prevent changing G/L accounts linked to non-draft registers

6171. By Gaël Mukunde on 2024-01-15

US-11269 [IMP] Code fix to allow edition of default journal accounts only until first edition, after that it's only editable through action menu by super admin

6172. By Gaël Mukunde on 2024-01-18

US-11269 [IMP] Use less generic class name

6173. By Gaël Mukunde on 2024-01-19

US-11269 [IMP] Remove unused code + update the domain of the fields of the wizard + rename button

6174. By Gaël Mukunde on 2024-01-19

US-11269 [IMP] Rename action

6175. By Gaël Mukunde on 2024-01-19

US-11269 [IMP] Restrict domain of proposed account in wizard to only liquidity accounts

6176. By Gaël Mukunde on 2024-01-24

US-11269 [IMP] Code to adapt dynamically the domain of default accounts to display in the wizard search

6177. By Gaël Mukunde on 2024-01-25

US-11269 [IMP] Remove unused code

6178. By Gaël Mukunde on 2024-02-05

US-11269 [IMP] French translation

=== modified file 'bin/addons/account/account.py'
--- bin/addons/account/account.py	2023-11-03 15:04:29 +0000
+++ bin/addons/account/account.py	2024-02-05 12:55:03 +0000
@@ -2939,4 +2939,80 @@
 
 account_bank_accounts_wizard()
 
+class journal_change_account(osv.osv_memory):
+    _name = 'journal.change.account'
+
+    def _get_journal(self, cr, uid, context=None):
+        if context is None:
+            context = {}
+        return context.get('active_id', False)
+
+    def _get_journal_type(self, cr, uid, context=None):
+        if context is None:
+            context = {}
+        if context.get('active_id', False):
+            return self.pool.get('account.journal').read(cr, uid, context['active_id'], ['type'], context=context)['type']
+        return False
+
+    def _get_instance(self, cr, uid, context=None):
+        if context is None:
+            context = {}
+        ids = context.get('active_ids', False)
+        if ids and len(ids) == 1:
+            return self.pool.get('account.journal').read(cr, uid, ids[0], ['is_current_instance'], context=context)['is_current_instance']
+        return False
+
+    def _get_credit_account(self, cr, uid, context=None):
+        if context is None:
+            context = {}
+        ids = context.get('active_ids', False)
+        if ids and len(ids) == 1:
+            return self.pool.get('account.journal').read(cr, uid, ids[0], ['default_credit_account_id'], context=context)['default_credit_account_id']
+        return []
+
+    def _get_debit_account(self, cr, uid, context=None):
+        if context is None:
+            context = {}
+        ids = context.get('active_ids', False)
+        if ids and len(ids) == 1:
+            return self.pool.get('account.journal').read(cr, uid, ids[0], ['default_debit_account_id'], context=context)['default_debit_account_id']
+        return []
+
+
+    _columns = {
+        'journal_id': fields.many2one('account.journal', string="Current journal"),
+        'journal_type': fields.char("Current Journal Type", size=32),
+        'debit_account_id': fields.many2one('account.account', 'Debit account'),
+        'credit_account_id': fields.many2one('account.account', 'Credit account'),
+        'is_current_instance': fields.boolean('Is current instance?'),
+
+    }
+    _defaults = {
+        'journal_id': _get_journal,
+        'journal_type': _get_journal_type,
+        'debit_account_id': _get_debit_account,
+        'credit_account_id': _get_credit_account,
+        'is_current_instance': _get_instance,
+    }
+
+    def journal_change_account(self, cr, uid, ids, context=None):
+        '''
+        US-11269: Modify the default debit or credit account of the journal
+        '''
+        if context is None:
+            context = {}
+        journ_obj = self.pool.get('account.journal')
+        active_ids = context.get('active_ids', False)
+        if active_ids:
+            debit_id = self.read(cr, uid, ids, ['debit_account_id'])[0]['debit_account_id']
+            credit_id = self.read(cr, uid, ids, ['credit_account_id'])[0]['credit_account_id']
+            if debit_id:
+                journ_obj.write(cr, uid, active_ids, {'default_debit_account_id': debit_id}, context=context)
+            if credit_id:
+                journ_obj.write(cr, uid, active_ids, {'default_credit_account_id': credit_id}, context=context)
+        return {'type': 'ir.actions.act_window_close'}
+
+
+journal_change_account()
+
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
=== modified file 'bin/addons/account/account_view.xml'
--- bin/addons/account/account_view.xml	2023-12-15 14:14:31 +0000
+++ bin/addons/account/account_view.xml	2024-02-05 12:55:03 +0000
@@ -2248,6 +2248,53 @@
            res_model="account.move.line"
            src_model="account.journal"/>
 
+        <record model="ir.ui.view" id="wizard_change_account_code">
+            <field name="name">wizard.change.account.code.form</field>
+            <field name="model">journal.change.account</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Change Account - Wizard">
+                    <separator string="Wizard to modify the debit/credit accounts of current journal"/>
+                    <separator string="Current journal" colspan="2" />
+                    <newline />
+                    <field name="journal_id" nolabel="1" readonly="1" colspan="2"/>
+                    <field name="journal_type" invisible="1"/>
+                    <newline />
+                    <separator string="Change Default Debit Account" colspan="2" />
+                    <separator string="Change Default Credit Account" colspan="2" />
+                    <newline />
+                    <field name="is_current_instance" invisible="1"/>
+                    <field name="debit_account_id" domain="[('type','!=','view'), ('cash_domain', '=', journal_type)]"
+                           attrs="{'readonly': [('is_current_instance', '!=', True)]}" colspan="2">
+                            <tree>
+                                <field name="name"/>
+                            </tree>
+                    </field>
+                    <field name="credit_account_id" domain="[('type','!=','view'), ('cash_domain', '=', journal_type)]"
+                           attrs="{'readonly': [('is_current_instance', '!=', True)]}" colspan="2">
+                            <tree>
+                                <field name="name"/>
+                            </tree>
+                    </field>
+                    <newline />
+                    <group colspan="4">
+                        <button string="Cancel" special="cancel" icon="gtk-cancel" />
+                        <button string="Confirm" icon="terp-check" name="journal_change_account" attrs="{'readonly': [('is_current_instance', '!=', True)]}" type="object"/>
+                    </group>
+                </form>
+            </field>
+        </record>
+
+        <act_window
+           id="act_change_account_code"
+           name="Change default journal accounts"
+           res_model="journal.change.account"
+           src_model="account.journal"
+           key2="client_action_multi"
+           view_mode="form"
+           view_type="form"
+           target="new" />
+
         <act_window context="{'search_default_reconcile_id':False, 'search_default_partner_id':[active_id]}" domain="[('account_id.reconcile', '=', True),('account_id.type', 'in', ['receivable', 'payable'])]" id="act_account_partner_account_move_all" name="Receivables &amp; Payables" res_model="account.move.line" src_model="res.partner" groups="base.group_extended"/>
 
         <act_window context="{'search_default_partner_id':[active_id]}" id="act_account_partner_account_move" name="Journal Items" res_model="account.move.line" src_model="res.partner" groups="account.group_account_user"/>
 
=== modified file 'bin/addons/account_journal/account_journal.py'
--- bin/addons/account_journal/account_journal.py	2023-11-03 15:04:29 +0000
+++ bin/addons/account_journal/account_journal.py	2024-02-05 12:55:03 +0000
@@ -72,6 +72,19 @@
             res[id] = bool(count_entries(id))
         return res
 
+    def _get_has_non_draft_register(self, cr, uid, ids, field_name, arg, context=None):
+        def has_non_draft_reg(journal_id):
+            return abs_obj.search(cr, uid, [('journal_id', '=', journal_id), ('state', '!=', 'draft')], limit=1, context=context)
+        res = {}
+        if not ids:
+            return res
+        abs_obj = self.pool.get('account.bank.statement')
+        if isinstance(ids, int):
+            ids = [ids]
+        for id in ids:
+            res[id] = bool(has_non_draft_reg(id))
+        return res
+
     _columns = {
         'type': fields.selection(get_journal_type, 'Type', size=32, required=True, select=1),
         'code': fields.char('Code', size=10, required=True, help="The code will be used to generate the numbers of the journal entries of this journal."),
@@ -79,6 +92,7 @@
                                            domain="[('type', '=', 'bank'), ('currency', '=', currency), ('is_active', '=', True)]"),
         'cheque_journal_id': fields.one2many('account.journal', 'bank_journal_id', 'Linked cheque'),
         'has_entries': fields.function(_get_has_entries, type='boolean', method=True, string='Has journal entries'),
+        'has_non_draft_register': fields.function(_get_has_non_draft_register, type='boolean', method=True, string='Has non-draft register'),
     }
 
     _defaults = {
 
=== modified file 'bin/addons/account_journal/account_journal_view.xml'
--- bin/addons/account_journal/account_journal_view.xml	2022-10-05 14:08:57 +0000
+++ bin/addons/account_journal/account_journal_view.xml	2024-02-05 12:55:03 +0000
@@ -15,6 +15,7 @@
                             <field name="is_current_instance" invisible="1"/>
                             <field name="is_coordo_editable" invisible="1"/>
                             <field name="has_entries" invisible="1"/>
+                            <field name="has_non_draft_register" invisible="1"/>
                             <field name="name" select="1"/>
                             <field name="code" select="1"
                                    attrs="{'readonly': [('has_entries', '=', True)]}"/>
@@ -26,9 +27,9 @@
                         <group col="2" colspan="2">
                                <separator string="Accounts" colspan="4"/>
                                <field name="default_debit_account_id" domain="[('type','&lt;&gt;','view'), ('cash_domain', '=', type)]"
-                                      attrs="{'required': [('type', 'in', ('cash', 'bank', 'cheque', 'cur_adj'))]}"/>
+                                      attrs="{'required': [('type', 'in', ('cash', 'bank', 'cheque', 'cur_adj'))], 'readonly': [('type', 'in', ('cash', 'bank', 'cheque', 'cur_adj')), ('has_non_draft_register', '=', True)]}"/>
                                <field name="default_credit_account_id" domain="[('type','&lt;&gt;','view'), ('cash_domain', '=', type)]"
-                                      attrs="{'required': [('type', 'in', ('cash', 'bank', 'cheque', 'cur_adj'))]}"/>
+                                      attrs="{'required': [('type', 'in', ('cash', 'bank', 'cheque', 'cur_adj'))], 'readonly': [('type', 'in', ('cash', 'bank', 'cheque', 'cur_adj')), ('has_non_draft_register', '=', True)]}"/>
                         </group>
                         <group colspan="2" col="2">
                             <separator string="Company" colspan="4"/>
 
=== modified file 'bin/addons/msf_profile/i18n/fr_MF.po'
--- bin/addons/msf_profile/i18n/fr_MF.po	2024-01-17 13:57:19 +0000
+++ bin/addons/msf_profile/i18n/fr_MF.po	2024-02-05 12:55:03 +0000
@@ -3377,10 +3377,11 @@
 msgid "Transport cost :"
 msgstr "Coût du Transport :"
 
-#. module: product_asset, account_period_closing_level
+#. module: product_asset, account_period_closing_level, account
 #: model:ir.ui.menu,name:product_asset.menu_asset_sales
 #: model:ir.ui.menu,name:product_asset.asset_configuration
 #: view:account.period:0
+#: view:account.account:0
 msgid "Assets"
 msgstr "Immobilisations"
 
@@ -36469,6 +36470,7 @@
 #: view:modify.responsible:0
 #: view:signature.add_user.wizard:0
 #: view:signature.change_date:0
+#: view:journal.change.account:0
 msgid "Confirm"
 msgstr "Confirmer"
 
@@ -48880,6 +48882,7 @@
 #: report:addons/account/report/invoice_excel_export.mako:70
 #: model:product.uom.categ,name:msf_profile.uom_category_percentage
 #: code:addons/msf_doc_import/report/export_po_ad_line_xlsx.py:43
+#: report:addons/account/report/export_invoice.mako:146
 msgid "Percentage"
 msgstr "Pourcentage"
 
@@ -96635,6 +96638,7 @@
 #: view:product.asset.disposal:0
 #: selection:product.asset.event,asset_state:0
 #: view:product.asset.generate.entries:0
+#: view:journal.change.account:0
 #, python-format
 msgid "Cancel"
 msgstr "Annuler"
@@ -119691,6 +119695,7 @@
 
 #. module: register_accounting, account
 #: field:account.move.line,counterpart_transfer_st_line_id:0
+#: selection:account.journal.column,field:0
 msgid "Conterpart transfert register line"
 msgstr "Line de registre de la contrepartie de transfert"
 
@@ -119749,6 +119754,7 @@
 #. module: register_accounting, account
 #: field:account.bank.statement.line,has_a_counterpart_transfer:0
 #: field:account.move.line,has_a_counterpart_transfer:0
+#: selection:account.journal.column,field:0
 msgid "Has a counterpart_transfer"
 msgstr "A une contrepartie de transfert"
 
@@ -119807,6 +119813,7 @@
 #: report:addons/account_mcdb/report/report_account_analytic_line_xls.mako:72
 #: report:addons/account_mcdb/report/report_account_move_line_xls.mako:61
 #: report:combined.journals.report.pdf:0
+#: selection:account.journal.column,field:0
 msgid "HQ System Account"
 msgstr "Compte Système HQ"
 
@@ -119936,6 +119943,7 @@
 #. module: register_accounting, account
 #: field:account.bank.statement.line,counterpart_transfer_st_line_sdref:0
 #: field:account.move.line,counterpart_transfer_st_line_sdref:0
+#: selection:account.journal.column,field:0
 msgid "St couterpert line sdref"
 msgstr "Sdref de le ligne de reg. de cp"
 
@@ -121276,6 +121284,7 @@
 
 #. module: account
 #: field:account.move.line,asset_line_id:0
+#: selection:account.journal.column,field:0
 msgid "Asset Line"
 msgstr "Ligne d'amortissement"
 
@@ -121489,6 +121498,7 @@
 #, python-format
 msgid "to open and compute"
 msgstr "à ouvrir et générer"
+<<<<<<< TREE
 
 #. module: account_override
 #: model:ir.actions.act_window,name:account_override.action_inkind_donation
@@ -121631,3 +121641,56 @@
 #, python-format
 msgid "This record is not linked to any Picking."
 msgstr "Cet enregistrement n'est lié à aucun Picking. "
+=======
+
+#. module: account
+#: view:journal.change.account:0
+msgid "Change Account - Wizard"
+msgstr "Assistant de changement de comptes par défaut"
+
+#. module: account
+#: view:journal.change.account:0
+msgid "Change Default Credit Account"
+msgstr "Changer le compte de crédit par défaut"
+
+#. module: account
+#: view:journal.change.account:0
+msgid "Change Default Debit Account"
+msgstr "Changer le compte de débit par défaut"
+
+#. module: account
+#: model:ir.actions.act_window,name:account.act_change_account_code
+msgid "Change default journal accounts"
+msgstr "Changer les comptes par défaut du journal"
+
+#. module: account
+#: field:journal.change.account,credit_account_id:0
+msgid "Credit account"
+msgstr "Compte de crédit"
+
+#. module: account
+#: field:journal.change.account,journal_type:0
+msgid "Current Journal Type"
+msgstr "Type du journal actuel"
+
+#. module: account
+#: view:journal.change.account:0
+#: field:journal.change.account,journal_id:0
+msgid "Current journal"
+msgstr "Journal actuel"
+
+#. module: account
+#: field:journal.change.account,debit_account_id:0
+msgid "Debit account"
+msgstr "Compte de débit"
+
+#. module: account
+#: field:journal.change.account,is_current_instance:0
+msgid "Is current instance?"
+msgstr "A été créé dans l'instance actuelle?"
+
+#. module: account
+#: view:journal.change.account:0
+msgid "Wizard to modify the debit/credit accounts of current journal"
+msgstr "Assistant pour modifier les comptes de débit/crédit par défaut du journal actuel"
+>>>>>>> MERGE-SOURCE