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

[jftempo]

=== modified file 'bin/addons/account_journal/account_journal.py'
--- bin/addons/account_journal/account_journal.py	2017-05-26 10:03:57 +0000
+++ bin/addons/account_journal/account_journal.py	2017-07-04 09:20:36 +0000
@@ -216,6 +216,34 @@
         self.pool.get('account.sequence.fiscalyear').create(cr, uid, {'sequence_id': sequence_id, 'fiscalyear_id': fiscalyear, 'sequence_main_id': main_sequence,})
         return True
 
+    def _create_linked_register(self, cr, uid, journal_id, vals, context):
+        """
+        If the journal is a liquidity journal creates the register linked to it if it doesn't exist yet
+        """
+        reg_obj = self.pool.get('account.bank.statement')
+        # UTP-182: the register isn't created if the journal comes from another instance via the synchronization
+        if 'type' in vals and vals['type'] in ('cash', 'bank', 'cheque') \
+                and not context.get('sync_update_execution', False) and \
+                not reg_obj.search_exist(cr, uid, [('journal_id', '=', journal_id)], context=context):
+
+            # 'from_journal_creation' in context permits to pass register creation that have a
+            #  'prev_reg_id' mandatory field. This is because this register is the first register from this journal.
+            context.update({'from_journal_creation': True})
+
+            #BKLG-53 get the next draft period from today
+            current_date = datetime.date.today().strftime('%Y-%m-%d')
+            periods = self.pool.get('account.period').search(cr, uid, [
+                    ('date_stop', '>=',current_date),
+                    ('state', '=', 'draft'),
+                    ('special', '=', False),
+            ], context=context, limit=1, order='date_stop')
+            if not periods:
+                raise osv.except_osv(_('Warning'), _('Sorry, No open period for creating the register!'))
+            reg_obj.create(cr, uid, {'journal_id': journal_id,
+                                     'name': vals['name'],
+                                     'period_id': periods[0],
+                                     'currency': vals.get('currency')}, context=context)
+
     def create(self, cr, uid, vals, context=None):
         """
         Create the journal with its sequence, a sequence linked to the fiscalyear and some register if this journal type is bank, cash or cheque.
@@ -270,29 +298,8 @@
         if vals['type'] in ['cash', 'bank', 'cheque', 'cur_adj']:
             if not vals.get('default_debit_account_id'):
                 raise osv.except_osv(_('Warning'), _('Default Debit Account is missing.'))
-
-        # if the journal can be linked to a register, the register is also created
-        # UTP-182: but not create if the journal came from another instance via the synchronization
-        if vals['type'] in ('cash','bank','cheque') and not context.get('sync_update_execution', False):
-            # 'from_journal_creation' in context permits to pass register creation that have a
-            #  'prev_reg_id' mandatory field. This is because this register is the first register from this journal.
-            context.update({'from_journal_creation': True})
-
-            #BKLG-53 get the next draft period from today
-            current_date = datetime.date.today().strftime('%Y-%m-%d')
-            periods = self.pool.get('account.period').search(cr, uid, [
-                ('date_stop','>=',current_date),
-                    ('state','=','draft'),
-                    ('special', '=', False),
-            ], context=context, limit=1, order='date_stop')
-            if not periods:
-                raise osv.except_osv(_('Warning'), _('Sorry, No open period for creating the register!'))
-            self.pool.get('account.bank.statement') \
-                .create(cr, uid, {'journal_id': journal_id,
-                                  'name': vals['name'],
-                                  'period_id': periods[0],
-                                  'currency': vals.get('currency')}, \
-                        context=context)
+        # if it is a liquidity journal create the linked register
+        self._create_linked_register(cr, uid, journal_id, vals, context)
 
         # Prevent user that default account for cur_adj type should be an expense account
         if vals['type'] in ['cur_adj']:
@@ -308,6 +315,8 @@
         """
         if not ids:
             return True
+        if isinstance(ids, (int, long)):
+            ids = [ids]
         if context is None:
             context = {}
 
@@ -322,6 +331,7 @@
         for j in self.browse(cr, uid, ids):
             if j.type == 'cur_adj' and j.default_debit_account_id.user_type_code != 'expense':
                 raise osv.except_osv(_('Warning'), _('Default Debit Account should be an expense account for Adjustement Journals!'))
+            self._create_linked_register(cr, uid, j.id, vals, context)
             # US-265: Check account bank statements if name change
             if not context.get('sync_update_execution'):
                 if vals.get('name', False):

=== modified file 'bin/addons/account_journal/account_journal_view.xml'
--- bin/addons/account_journal/account_journal_view.xml	2016-11-04 12:57:37 +0000
+++ bin/addons/account_journal/account_journal_view.xml	2017-07-04 09:20:36 +0000
@@ -14,19 +14,30 @@
                         <group colspan="4" col="6">
                             <field name="has_entries" invisible="1"/>
                             <field name="name" select="1"/>
-                            <field name="code" select="1" attrs="{'readonly': [('has_entries', '=', True)]}"/>
-                            <field name="type" on_change="onchange_type(type, currency, context)"/>
+                            <field name="code" select="1"
+                                   attrs="{'readonly': [('has_entries', '=', True)]}"/>
+                            <field name="type" on_change="onchange_type(type, currency, context)"
+                                   attrs="{'readonly': [('has_entries', '=', True)]}"/>
                         </group>
                         <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'))]}"/>
-                               <field name="default_credit_account_id" domain="[('type','&lt;&gt;','view'), ('cash_domain', '=', type)]" attrs="{'required': [('type', 'in', ('cash', 'bank', 'cheque', 'cur_adj'))]}"/>
+                               <field name="default_debit_account_id" domain="[('type','&lt;&gt;','view'), ('cash_domain', '=', type)]"
+                                      attrs="{'required': [('type', 'in', ('cash', 'bank', 'cheque', 'cur_adj'))]}"/>
+                               <field name="default_credit_account_id" domain="[('type','&lt;&gt;','view'), ('cash_domain', '=', type)]"
+                                      attrs="{'required': [('type', 'in', ('cash', 'bank', 'cheque', 'cur_adj'))]}"/>
                         </group>
                         <group colspan="2" col="2">
                             <separator string="Company" colspan="4"/>
-                            <field name="currency" attrs="{'required': [('type', 'in', ('cash', 'bank', 'cheque'))]}"/>
-                            <field name="analytic_journal_id" domain="[('is_current_instance','=',True)]" attrs="{'required': [('type', 'not in', ('situation', 'stock'))]}"/>
-                            <field name="bank_journal_id" attrs="{'invisible': [('type', '!=', 'cheque')], 'required': [('type', '=', 'cheque')]}"/>
+                            <field name="currency"
+                                   attrs="{'required': [('type', 'in', ('cash', 'bank', 'cheque'))],
+                                           'readonly': [('has_entries', '=', True)]}"/>
+                            <field name="analytic_journal_id" domain="[('is_current_instance','=',True)]"
+                                   attrs="{'required': [('type', 'not in', ('situation', 'stock'))],
+                                           'readonly': [('has_entries', '=', True)]}"/>
+                            <field name="bank_journal_id"
+                                   attrs="{'invisible': [('type', '!=', 'cheque')],
+                                           'required': [('type', '=', 'cheque')],
+                                           'readonly': [('has_entries', '=', True)]}"/>
                         </group>
                         <group colspan="4" col="4">
                             <label string="" colspan="2"/>