Merge lp:~openerp-dev/openobject-addons/7.0-speedup-accounting-mat into lp:openobject-addons/7.0

[Martin Trigaux (OpenERP)]

Improve performances on the creation of account moves

[lp:~openerp-dev/openobject-addons/7.0-speedup-accounting-mat]

9463. By Martin Trigaux (OpenERP) on 2013-09-19

[IMP] account: group constraints into a single browse

9464. By Martin Trigaux (OpenERP) on 2013-09-20

[IMP] stock: replace browse by a single search

9465. By Martin Trigaux (OpenERP) on 2013-09-24

[MERGE] sync with 7.0

9466. By Martin Trigaux (OpenERP) on 2013-09-27

[IMP] account: don't create new analytic lines at creation, will do it once the move is balanced

9467. By Martin Trigaux (OpenERP) on 2013-09-27

[IMP] account: remove analytic lines only when create new one

Unmerged revisions

9467. By Martin Trigaux (OpenERP) on 2013-09-27

[IMP] account: remove analytic lines only when create new one

9466. By Martin Trigaux (OpenERP) on 2013-09-27

[IMP] account: don't create new analytic lines at creation, will do it once the move is balanced

9465. By Martin Trigaux (OpenERP) on 2013-09-24

[MERGE] sync with 7.0

9464. By Martin Trigaux (OpenERP) on 2013-09-20

[IMP] stock: replace browse by a single search

9463. By Martin Trigaux (OpenERP) on 2013-09-19

[IMP] account: group constraints into a single browse

9462. By Martin Trigaux (OpenERP) on 2013-09-19

[IMP] account: group the creation of move lines in one call (benefit from the novalidate context)

9461. By Martin Trigaux (OpenERP) on 2013-09-19

[IMP] account: replaced nested browse by a search

=== modified file 'account/account.py'
--- account/account.py	2013-09-18 14:31:46 +0000
+++ account/account.py	2013-09-27 15:33:32 +0000
@@ -1580,11 +1580,6 @@
         obj_analytic_line = self.pool.get('account.analytic.line')
         obj_move_line = self.pool.get('account.move.line')
         for move in self.browse(cr, uid, ids, context):
-            # Unlink old analytic lines on move_lines
-            for obj_line in move.line_id:
-                for obj in obj_line.analytic_lines:
-                    obj_analytic_line.unlink(cr,uid,obj.id)
-
             journal = move.journal_id
             amount = 0
             line_ids = []
 
=== modified file 'account/account_bank_statement.py'
--- account/account_bank_statement.py	2013-06-07 11:38:29 +0000
+++ account/account_bank_statement.py	2013-09-27 15:33:32 +0000
@@ -220,9 +220,8 @@
             res_currency_obj = self.pool.get('res.currency')
             amt_cur = -res_currency_obj.compute(cr, uid, company_currency_id, cur_id, amount, context=context)
 
-        res = self._prepare_move_line_vals(cr, uid, st_line, move_id, debit, credit,
+        return self._prepare_move_line_vals(cr, uid, st_line, move_id, debit, credit,
             amount_currency=amt_cur, currency_id=cur_id, analytic_id=anl_id, context=context)
-        return res
 
     def _get_counter_part_account(sefl, cr, uid, st_line, context=None):
         """Retrieve the account to use in the counterpart move.
@@ -342,7 +341,7 @@
         account_bank_statement_line_obj.write(cr, uid, [st_line.id], {
             'move_ids': [(4, move_id, False)]
         })
-        torec = []
+
         acc_cur = ((st_line.amount<=0) and st.journal_id.default_debit_account_id) or st_line.account_id
 
         context.update({
@@ -353,18 +352,14 @@
 
         bank_move_vals = self._prepare_bank_move_line(cr, uid, st_line, move_id, amount,
             company_currency_id, context=context)
-        move_line_id = account_move_line_obj.create(cr, uid, bank_move_vals, context=context)
-        torec.append(move_line_id)
-
         counterpart_move_vals = self._prepare_counterpart_move_line(cr, uid, st_line, move_id,
             amount, company_currency_id, context=context)
-        account_move_line_obj.create(cr, uid, counterpart_move_vals, context=context)
-
-        for line in account_move_line_obj.browse(cr, uid, [x.id for x in
-                account_move_obj.browse(cr, uid, move_id,
-                    context=context).line_id],
-                context=context):
-            if line.state <> 'valid':
+
+        account_move_obj.write(cr, uid, [move_id], {'line_id': [(0, 0, bank_move_vals), (0, 0, counterpart_move_vals)]}, context)
+
+        invalid_line_ids = account_move_line_obj.search(cr, uid, [('move_id', '=', move_id), ('state', '<>', 'valid')], context=context)
+        if invalid_line_ids:
+            for line in account_move_line_obj.browse(cr, uid, invalid_line_ids, context=context):
                 raise osv.except_osv(_('Error!'),
                         _('Journal item "%s" is not valid.') % line.name)
 
 
=== modified file 'account/account_move_line.py'
--- account/account_move_line.py	2013-09-18 14:31:46 +0000
+++ account/account_move_line.py	2013-09-27 15:33:32 +0000
@@ -193,6 +193,8 @@
             if obj_line.analytic_account_id:
                 if not obj_line.journal_id.analytic_journal_id:
                     raise osv.except_osv(_('No Analytic Journal!'),_("You have to define an analytic journal on the '%s' journal!") % (obj_line.journal_id.name, ))
+                if obj_line.analytic_lines:
+                    acc_ana_line_obj.unlink(cr,uid,[obj.id for obj in obj_line.analytic_lines])
                 vals_line = self._prepare_analytic_line(cr, uid, obj_line, context=context)
                 acc_ana_line_obj.create(cr, uid, vals_line)
         return True
@@ -565,6 +567,33 @@
         if not cr.fetchone():
             cr.execute('CREATE INDEX account_move_line_journal_id_period_id_index ON account_move_line (journal_id, period_id)')
 
+    def _check_all(self, cr, uid, ids, context=None):
+        for l in self.browse(cr, uid, ids, context=context):
+            if l.account_id.type == 'view':
+                raise osv.except_osv(_('Error!'), _('You cannot create journal items on an account of type view %s %s.') % (l.account_id.code, l.account_id.name))
+            elif l.account_id.type == 'closed':
+                raise osv.except_osv(_('Error!'), _('You cannot create journal items on a closed account %s %s.') % (l.account_id.code, l.account_id.name))
+
+            if l.company_id != l.account_id.company_id or l.company_id != l.period_id.company_id:
+                raise osv.except_osv(_('Error!'), _('Account and Period must belong to the company %s.') % (l.company_id.name))
+
+            if l.journal_id.allow_date:
+                if not time.strptime(l.date[:10],'%Y-%m-%d') >= time.strptime(l.period_id.date_start, '%Y-%m-%d') or not time.strptime(l.date[:10], '%Y-%m-%d') <= time.strptime(l.period_id.date_stop, '%Y-%m-%d'):
+                    raise osv.except_osv(_('Error!'), _('The date of your Journal Entry is not in the defined period! You should change the date or remove this constraint from the journal.'))
+
+            if l.account_id.currency_id:
+                if not l.currency_id or not l.currency_id.id == l.account_id.currency_id.id:
+                    raise osv.except_osv(_('Error!'), _('The selected account %s of your Journal Entry forces to provide a secondary currency. ' \
+                                                        'You should remove the secondary currency on the account or select a multi-currency view on the journal.' % l.account_id.name))
+            if (l.amount_currency and not l.currency_id):
+                raise osv.except_osv(_('Error!'), _("You cannot create journal items with a secondary currency without recording both 'currency' and 'amount currency' field."))
+            if l.currency_id.id == l.company_id.currency_id.id:
+                raise osv.except_osv(_('Error!'), _("You cannot provide a secondary currency if it is the same than the company one."))
+            if l.amount_currency:
+                if (l.amount_currency > 0.0 and l.credit > 0.0) or (l.amount_currency < 0.0 and l.debit > 0.0):
+                    raise osv.except_osv(_('Error!'), _("The amount expressed in the secondary currency must be positive when the journal item is a debit and negative when if it is a credit."))
+        return True
+
     def _check_no_view(self, cr, uid, ids, context=None):
         lines = self.browse(cr, uid, ids, context=context)
         for l in lines:
@@ -620,14 +649,15 @@
         return True
 
     _constraints = [
-        (_check_no_view, 'You cannot create journal items on an account of type view.', ['account_id']),
-        (_check_no_closed, 'You cannot create journal items on closed account.', ['account_id']),
-        (_check_company_id, 'Account and Period must belong to the same company.', ['company_id']),
-        (_check_date, 'The date of your Journal Entry is not in the defined period! You should change the date or remove this constraint from the journal.', ['date']),
-        (_check_currency, 'The selected account of your Journal Entry forces to provide a secondary currency. You should remove the secondary currency on the account or select a multi-currency view on the journal.', ['currency_id']),
-        (_check_currency_and_amount, "You cannot create journal items with a secondary currency without recording both 'currency' and 'amount currency' field.", ['currency_id','amount_currency']),
-        (_check_currency_amount, 'The amount expressed in the secondary currency must be positive when the journal item is a debit and negative when if it is a credit.', ['amount_currency']),
-        (_check_currency_company, "You cannot provide a secondary currency if it is the same than the company one." , ['currency_id']),
+        (_check_all, 'Invalid line.', ['account_id', 'date', 'currency_id','amount_currency', 'company_id']),
+        # (_check_no_view, 'You cannot create journal items on an account of type view.', ['account_id']),
+        # (_check_no_closed, 'You cannot create journal items on closed account.', ['account_id']),
+        # (_check_company_id, 'Account and Period must belong to the same company.', ['company_id']),
+        # (_check_date, 'The date of your Journal Entry is not in the defined period! You should change the date or remove this constraint from the journal.', ['date']),
+        # (_check_currency, 'The selected account of your Journal Entry forces to provide a secondary currency. You should remove the secondary currency on the account or select a multi-currency view on the journal.', ['currency_id']),
+        # (_check_currency_and_amount, "You cannot create journal items with a secondary currency without recording both 'currency' and 'amount currency' field.", ['currency_id','amount_currency']),
+        # (_check_currency_amount, 'The amount expressed in the secondary currency must be positive when the journal item is a debit and negative when if it is a credit.', ['amount_currency']),
+        # (_check_currency_company, "You cannot provide a secondary currency if it is the same than the company one." , ['currency_id']),
     ]
 
     #TODO: ONCHANGE_ACCOUNT_ID: set account_tax_id
@@ -1209,20 +1239,6 @@
         if not ok:
             raise osv.except_osv(_('Bad Account!'), _('You cannot use this general account in this journal, check the tab \'Entry Controls\' on the related journal.'))
 
-        if vals.get('analytic_account_id',False):
-            if journal.analytic_journal_id:
-                vals['analytic_lines'] = [(0,0, {
-                        'name': vals['name'],
-                        'date': vals.get('date', time.strftime('%Y-%m-%d')),
-                        'account_id': vals.get('analytic_account_id', False),
-                        'unit_amount': vals.get('quantity', 1.0),
-                        'amount': vals.get('debit', 0.0) or vals.get('credit', 0.0),
-                        'general_account_id': vals.get('account_id', False),
-                        'journal_id': journal.analytic_journal_id.id,
-                        'ref': vals.get('ref', False),
-                        'user_id': uid
-            })]
-
         result = super(account_move_line, self).create(cr, uid, vals, context=context)
         # CREATE Taxes
         if vals.get('account_tax_id', False):
 
=== modified file 'stock/stock.py'
--- stock/stock.py	2013-09-20 11:24:37 +0000
+++ stock/stock.py	2013-09-27 15:33:32 +0000
@@ -2121,12 +2121,8 @@
         """ Changes state to confirmed or waiting.
         @return: List of values
         """
-        todo = []
-        for move in self.browse(cr, uid, ids):
-            if move.state in ('confirmed', 'waiting'):
-                todo.append(move.id)
-        res = self.check_assign(cr, uid, todo)
-        return res
+        todo = self.search(cr, uid, [('id', 'in', ids), ('state', 'in', ('confirmed', 'waiting'))])
+        return self.check_assign(cr, uid, todo)
 
     def force_assign(self, cr, uid, ids, context=None):
         """ Changes the state to assigned.