Merge lp:~unifield-team/unifield-wm/us-873 into lp:unifield-wm

[jftempo]

[lp:~unifield-team/unifield-wm/us-873]

2743. By Vincent GREINER on 2016-01-29

US-873 [FIX] forbid of journal system create was impacting auto create in yearly closure

2744. By Vincent GREINER on 2016-01-29

US-873 [FIX] do not allow to book manually entries on a system journal

=== modified file 'account_journal/account_journal.py'
--- account_journal/account_journal.py	2016-01-13 09:02:46 +0000
+++ account_journal/account_journal.py	2016-01-29 11:16:03 +0000
@@ -236,6 +236,14 @@
         # Checks
         if context is None:
             context = {}
+
+        if not context.get('sync_update_execution', False):
+            if not context.get('allow_journal_system_create', False):
+                if vals.get('type', '') == 'system':
+                    # user not allowed to create 'system' journal
+                    raise osv.except_osv(_('Warning'),
+                        _('You can not create a System journal'))
+
         # Prepare some values
         seq_pool = self.pool.get('ir.sequence')
         seq_typ_pool = self.pool.get('ir.sequence.type')

=== modified file 'account_override/account.py'
--- account_override/account.py	2016-01-05 13:52:50 +0000
+++ account_override/account.py	2016-01-29 11:16:03 +0000
@@ -637,6 +637,8 @@
             # UTFTP-262: Make manual_name mandatory
             if 'manual_name' not in vals or not vals.get('manual_name', False) or vals.get('manual_name') == '':
                 raise osv.except_osv(_('Error'), _('Description is mandatory!'))
+            if journal.type == 'system':
+                raise osv.except_osv(_('Warning'), _('You can not record a Journal Entry on a system journal'))
 
         if context.get('seqnums',False):
             # utp913 - reuse sequence numbers if in the context
@@ -684,8 +686,11 @@
             if context.get('from_web_menu', False):
                 fields += ['document_date', 'date']
             for m in self.browse(cr, uid, ids):
-                if context.get('from_web_menu', False) and m.status == 'sys':
-                    raise osv.except_osv(_('Warning'), _('You cannot edit a Journal Entry created by the system.'))
+                if context.get('from_web_menu', False):
+                    if m.status == 'sys':
+                        raise osv.except_osv(_('Warning'), _('You cannot edit a Journal Entry created by the system.'))
+                    if m.journal_id.type == 'system':
+                        raise osv.except_osv(_('Warning'), _('You can not edit a Journal Entry on a system journal'))
                 # Update context in order journal item could retrieve this @creation
                 # Also update some other fields
                 ml_vals = {}

=== modified file 'account_period_closing_level/account_year_end_closing.py'
--- account_period_closing_level/account_year_end_closing.py	2016-01-25 16:24:57 +0000
+++ account_period_closing_level/account_year_end_closing.py	2016-01-29 11:16:03 +0000
@@ -248,6 +248,10 @@
             context=context)[0].company_id.instance_id
         if instance_rec.level != 'coordo':
             return
+        if context is None:
+            context = {}
+        local_context = context.copy()
+        local_context['allow_journal_system_create'] = True
 
         for code in self._journals:
             id = self._get_journal(cr, uid, code, context=context)
@@ -261,7 +265,7 @@
                     'analytic_journal_id': False,  # no AJI year end entries
                 }
                 self.pool.get('account.journal').create(cr, uid, vals,
-                    context=context)
+                    context=local_context)
 
     def delete_year_end_entries(self, cr, uid, fy_id, context=None):
         """

=== modified file 'finance/account_view.xml'
--- finance/account_view.xml	2016-01-22 13:35:15 +0000
+++ finance/account_view.xml	2016-01-29 11:16:03 +0000
@@ -69,7 +69,7 @@
                 <form string="Journal Entries" position="replace">
                     <form string="Journal Entries" hide_delete_button="1">
                         <group colspan="4" col="6">
-                            <field name="journal_id" on_change="onchange_journal_id(journal_id)" attrs="{'readonly': ['|', '|', ('status', '=', 'sys'), ('state', '=', 'posted'), ('imported', '=', True)]}" context="{'from_manual_entry': True}" domain="[('type', '!=', 'system')]"/>
+                            <field name="journal_id" on_change="onchange_journal_id(journal_id)" attrs="{'readonly': ['|', '|', ('status', '=', 'sys'), ('state', '=', 'posted'), ('imported', '=', True)]}" context="{'from_manual_entry': True}"/>
                             <field name="name" readonly="1"/>
                             <field name="period_id" on_change="onchange_period_id(period_id, date)" attrs="{'readonly': ['|', '|', ('status', '=', 'sys'), ('state', '=', 'posted'), ('imported', '=', True)]}" domain="[('number', '!=', 16)]"/>
                             <field name="document_date" attrs="{'readonly': ['|', '|', ('status', '=', 'sys'), ('state', '=', 'posted'), ('imported', '=', True)]}"/>