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

[jftempo]

=== modified file 'bin/addons/msf_profile/data/patches.xml'
--- bin/addons/msf_profile/data/patches.xml	2020-03-20 14:08:02 +0000
+++ bin/addons/msf_profile/data/patches.xml	2020-03-24 15:49:52 +0000
@@ -522,5 +522,10 @@
             <field name="method">us_7025_7039_fix_nr_empty_ins</field>
         </record>
 
+        <!-- UF17.0 -->
+        <record id="us_7221_reset_starting_balance" model="patch.scripts">
+            <field name="method">us_7221_reset_starting_balance</field>
+        </record>
+
     </data>
 </openerp>

=== modified file 'bin/addons/msf_profile/i18n/fr_MF.po'
--- bin/addons/msf_profile/i18n/fr_MF.po	2020-03-20 14:08:02 +0000
+++ bin/addons/msf_profile/i18n/fr_MF.po	2020-03-24 15:49:52 +0000
@@ -4445,11 +4445,6 @@
 msgid "There is no income account defined for this product: \"%s\" (id:%d)"
 msgstr "Il n'y a pas de compte de produit défini pour ce produit : \"%s\" (id : %d)."
 
-#. module: register_accounting
-#: view:wizard.register.opening.confirmation:0
-msgid "Register Starting Balance"
-msgstr "Solde Initial du Registre"
-
 #. module: finance
 #: code:addons/finance/cash_request.py:276
 #, python-format
@@ -60771,11 +60766,6 @@
 msgid "In Progress..."
 msgstr "En Cours..."
 
-#. module: register_accounting
-#: field:wizard.register.opening.confirmation,confirm_opening_balance:0
-msgid "Do you want to open the register with the following starting balance?"
-msgstr "Voulez-vous ouvrir le registre avec le solde initial suivant ?"
-
 #. module: msf_outgoing
 #: field:stock.move.memory.shipment.create,selected_weight:0
 #: field:stock.move.memory.shipment.returnpacks,selected_weight:0
@@ -61304,7 +61294,6 @@
 #. modules: account, register_accounting
 #: view:account.bank.statement:0
 #: view:account.bank.statement:0
-#: field:wizard.register.opening.confirmation,opening_balance:0
 #: field:account.bank.statement,balance_start:0
 msgid "Starting Balance"
 msgstr "Solde Initial"
@@ -68451,12 +68440,11 @@
 msgid "External Partners"
 msgstr "External Partners"
 
-#. modules: register_accounting, finance
+#. module: finance
 #: field:cash.request.liquidity,type:0
 #: field:cash.request.liquidity.bank,type:0
 #: field:cash.request.liquidity.cash,type:0
 #: field:cash.request.liquidity.cheque,type:0
-#: field:wizard.register.opening.confirmation,register_type:0
 msgid "Register Type"
 msgstr "Type de Registre"
 
@@ -99664,8 +99652,8 @@
 #. module: register_accounting
 #: code:addons/register_accounting/wizard/register_opening.py:91
 #, python-format
-msgid "You must tick the boxes before clicking on Yes."
-msgstr "Vous devez cocher les cases avant de cliquer sur Oui."
+msgid "You must tick the box before clicking on Yes."
+msgstr "Vous devez cocher la case avant de cliquer sur Oui."
 
 #. module: msf_partner
 #: view:res.partner:0

=== modified file 'bin/addons/msf_profile/msf_profile.py'
--- bin/addons/msf_profile/msf_profile.py	2020-03-20 14:08:02 +0000
+++ bin/addons/msf_profile/msf_profile.py	2020-03-24 15:49:52 +0000
@@ -53,6 +53,34 @@
     }
 
 
+    # UF17.0
+    def us_7221_reset_starting_balance(self, cr, uid, *a, **b):
+        """
+        Reset the Starting Balance of the first register created for each journal if it is still in Draft state
+        """
+        # Cashbox details set to zero
+        cr.execute("""
+                   UPDATE account_cashbox_line
+                   SET number = 0 
+                   WHERE starting_id IN (
+                       SELECT id FROM account_bank_statement
+                       WHERE state = 'draft'
+                       AND prev_reg_id IS NULL
+                       AND journal_id IN (SELECT id FROM account_journal WHERE type='cash')
+                   );
+                   """)
+         # Starting Balance set to zero
+        cr.execute("""
+                   UPDATE account_bank_statement
+                   SET balance_start = 0.0
+                   WHERE state = 'draft'
+                   AND prev_reg_id IS NULL
+                   AND journal_id IN (SELECT id FROM account_journal WHERE type in ('bank', 'cash'));
+                   """)
+        self._logger.warn('Starting Balance set to zero in %s registers.' % (cr.rowcount,))
+        return True
+
+    # UF16.1
     def remove_ir_actions_linked_to_deleted_modules(self, cr, uid, *a, **b):
         # delete remove actions
         cr.execute("delete from ir_act_window where id in (select res_id from ir_model_data where module in ('procurement_report', 'threshold_value') and model='ir.actions.act_window')")
@@ -65,7 +93,6 @@
 
         return True
 
-    # UF17.0
     def us_7025_7039_fix_nr_empty_ins(self, cr, uid, *a, **b):
         """
         1. Set the Not Runs to run:

=== modified file 'bin/addons/register_accounting/account_view.xml'
--- bin/addons/register_accounting/account_view.xml	2020-02-11 13:28:59 +0000
+++ bin/addons/register_accounting/account_view.xml	2020-03-24 15:49:52 +0000
@@ -24,7 +24,7 @@
                             <field name="bank_account_number"/>
                             <newline/>
                             <field name="prev_reg_id" invisible="1"/>
-                            <field name="balance_start" attrs="{'readonly': ['|', ('prev_reg_id', '!=', False), ('closing_balance_frozen', '=', True)]}"/>
+                            <field name="balance_start" readonly="1"/>
                             <group col="3" colspan="4">
                                 <field name="balance_end_real" colspan="2" attrs="{'readonly': ['|', ('closing_balance_frozen', '=', True), ('state', 'in', ['confirm'])]}" string="Bank statement balance"/>
                                 <button name="button_confirm_closing_bank_balance" type="object" string="Confirm End-of-Month Balance" icon="gtk-apply"
@@ -340,18 +340,6 @@
                             <page string="CashBox">
                                 <field name="prev_reg_id" invisible="1"/>
                                 <group col="4" colspan="4">
-                                    <field name="starting_details_ids" nolabel="1" colspan="2" attrs="{'invisible':['|',('state','!=','draft'),('prev_reg_id','!=',False)], 'readonly':['|',('state','!=','draft'),('prev_reg_id','!=',False)]}">
-                                        <tree string="Starting Balance" editable="bottom">
-                                            <field name="pieces"/>
-                                            <field name="number" on_change="on_change_sub(pieces,number, parent.balance_end)"/>
-                                            <field name="subtotal" sum="Total"/>
-                                        </tree>
-                                        <form string="Starting Balance">
-                                            <field name="pieces"/>
-                                            <field name="number" on_change="on_change_sub(pieces,number, parent.balance_end)"/>
-                                            <field name="subtotal"/>
-                                        </form>
-                                    </field>
                                     <field name="closing_balance_frozen" invisible="1"/>
                                     <field name="ending_details_ids" nolabel="1" colspan="2" attrs="{'readonly':['|', ('state','!=','open'), ('closing_balance_frozen', '=', True)]}">
                                         <tree string = "Closing Balance" editable="bottom">

=== modified file 'bin/addons/register_accounting/wizard/register_opening.py'
--- bin/addons/register_accounting/wizard/register_opening.py	2018-10-04 13:56:00 +0000
+++ bin/addons/register_accounting/wizard/register_opening.py	2020-03-24 15:49:52 +0000
@@ -29,44 +29,8 @@
 
     _name = 'wizard.register.opening.confirmation'
 
-    def _get_opening_balance(self, cr, uid, ids, name, arg, context=None):
-        """
-        Returns a dict with key = id of the wizard, and value = amount of the starting balance of the related register
-        The Starting Balance is:
-        - equal to the value of "balance_start" for Bank Registers
-        - based on the Cashbox lines for Cash Registers
-        - always equal to 0.00 for Cheque Registers
-        """
-        res = {}
-        if context is None:
-            context = {}
-        reg_obj = self.pool.get('account.bank.statement')
-        for wiz in self.browse(cr, uid, ids, fields_to_fetch=['register_id', 'register_type'], context=context):
-            res[wiz.id] = 0.0
-            if wiz.register_id:
-                reg_id = wiz.register_id.id
-                reg_type = wiz.register_type
-                if reg_type == 'bank':
-                    res[wiz.id] = wiz.register_id.balance_start or 0.0
-                elif reg_type == 'cash':
-                    computed_balance = reg_obj._get_starting_balance(cr, uid, [reg_id], context=context)
-                    res[wiz.id] = computed_balance[reg_id].get('balance_start', 0.0)
-        return res
-
-    def _get_journal_type(self, cr, uid, context=None):
-        """
-        Returns a list of tuples containing the different Journal Types
-        """
-        return self.pool.get('account.journal').get_journal_type(cr, uid, context=context)
-
     _columns = {
-        'confirm_opening_balance': fields.boolean(string='Do you want to open the register with the following starting balance?',
-                                                  required=False),
         'register_id': fields.many2one('account.bank.statement', 'Register', required=True, readonly=True),
-        'register_type': fields.related('register_id', 'journal_id', 'type', string='Register Type', type='selection',
-                                        selection=_get_journal_type, readonly=True),
-        'opening_balance': fields.function(_get_opening_balance, method=True, type='float', readonly=True,
-                                           string='Starting Balance'),
         'confirm_opening_period': fields.boolean(string='Do you want to open the register on the following period?',
                                                  required=False),
         'opening_period': fields.related('register_id', 'period_id', string='Opening Period', type='many2one',
@@ -84,16 +48,11 @@
         reg_obj = self.pool.get('account.bank.statement')
         wiz = self.browse(cr, uid, ids[0], context=context)
         reg_id = wiz.register_id.id
-        reg_type = wiz.register_type
-        balance_ok = wiz.confirm_opening_balance or reg_type == 'cheque'
         period_ok = wiz.confirm_opening_period
-        if not balance_ok or not period_ok:
-            raise osv.except_osv(_('Warning'), _('You must tick the boxes before clicking on Yes.'))
+        if not period_ok:
+            raise osv.except_osv(_('Warning'), _('You must tick the box before clicking on Yes.'))
         else:
-            cash_opening_balance = 0.0
-            if reg_type == 'cash':
-                cash_opening_balance = wiz.opening_balance
-            reg_obj.open_register(cr, uid, reg_id, cash_opening_balance=cash_opening_balance, context=context)
+            reg_obj.open_register(cr, uid, reg_id, cash_opening_balance=0.0, context=context)
         return {'type': 'ir.actions.act_window_close'}
 
 

=== modified file 'bin/addons/register_accounting/wizard/register_opening.xml'
--- bin/addons/register_accounting/wizard/register_opening.xml	2018-10-04 13:56:00 +0000
+++ bin/addons/register_accounting/wizard/register_opening.xml	2020-03-24 15:49:52 +0000
@@ -7,12 +7,6 @@
             <field name='type'>form</field>
             <field name='arch' type='xml'>
                 <form string="Open Register Confirmation">
-                    <group colspan="4" attrs="{'invisible': [('register_type', '=', 'cheque')]}">
-                        <separator string="Register Starting Balance"/>
-                        <field name="register_type" invisible="1"/>
-                        <field name="confirm_opening_balance"/>
-                        <field name="opening_balance"/>
-                    </group>
                     <group colspan="4">
                         <separator string="Register Opening Period"/>
                         <field name="confirm_opening_period"/>