Merge lp:~unifield-team/unifield-wm/uf_1699_auto_creation_intermission_partner_coordo into lp:unifield-wm

[jftempo]

Unmerged revisions

2027. By Duy VO on 2014-03-17

UF-2308: Refresh only the reg lines, not whole view

2026. By Duy VO on 2014-03-11

REF-40: just merged from the REF-40, already in trunk

2025. By Duy VO on 2014-03-11

UF-1699: Auto create intermission partner if coordo

=== modified file 'account_override/account.py'
--- account_override/account.py	2014-01-24 10:20:06 +0000
+++ account_override/account.py	2014-03-21 08:49:45 +0000
@@ -203,15 +203,18 @@
             company_account_active = company.additional_allocation
         company_account = 7 # User for accounts that begins by "7"
         # Prepare result
-        for account in self.browse(cr, uid, ids, context=context):
-            res[account.id] = False
-            if account.user_type_code == 'expense':
-                res[account.id] = True
-            elif account.user_type_code == 'income':
+        for account in self.read(cr, uid, ids, ['user_type_code', 'code'], context=context):
+            account_id = account.get('id', False)
+            user_type = account.get('user_type_code', False)
+            code = account.get('code')
+            res[account_id] = False
+            if user_type == 'expense':
+                res[account_id] = True
+            elif user_type == 'income':
                 if not company_account_active:
-                    res[account.id] = True
-                elif company_account_active and account.code.startswith(str(company_account)):
-                    res[account.id] = True
+                    res[account_id] = True
+                elif company_account_active and code.startswith(str(company_account)):
+                    res[account_id] = True
         return res
 
     def _search_is_analytic_addicted(self, cr, uid, ids, field_name, args, context=None):
@@ -350,6 +353,51 @@
             res.append((record['id'], name))
         return res
 
+    def _get_parent_of(self, cr, uid, ids, limit=10, context=None):
+        """
+        Get all parents from the given accounts.
+        To avoid problem of recursion, set a limit from 1 to 10.
+        """
+        # Some checks
+        if context is None:
+            context = {}
+        if not ids:
+            return []
+        if isinstance(ids, (int, long)):
+            ids = [ids]
+        if limit < 1 or limit > 10:
+            raise osv.except_osv(_('Error'), _("You're only allowed to use a limit between 1 and 10."))
+        # Prepare some values
+        account_ids = list(ids)
+        sql = """
+            SELECT parent_id
+            FROM account_account
+            WHERE id IN %s
+            AND parent_id IS NOT NULL
+            GROUP BY parent_id"""
+        cr.execute(sql, (tuple(ids),))
+        if not cr.rowcount:
+            return account_ids
+        parent_ids = [x[0] for x in cr.fetchall()]
+        account_ids += parent_ids
+        stop = 1
+        while parent_ids:
+            # Stop the search if we reach limit
+            if stop >= limit:
+                break
+            stop += 1
+            cr.execute(sql, (tuple(parent_ids),))
+            if not cr.rowcount:
+                parent_ids = False
+            tmp_res = cr.fetchall()
+            tmp_ids = [x[0] for x in tmp_res]
+            if None in tmp_ids:
+                parent_ids = False
+            else:
+                parent_ids = list(tmp_ids)
+                account_ids += tmp_ids
+        return account_ids
+
 account_account()
 
 class account_journal(osv.osv):

=== modified file 'analytic_distribution/account_bank_statement.py'
--- analytic_distribution/account_bank_statement.py	2013-12-06 10:54:04 +0000
+++ analytic_distribution/account_bank_statement.py	2014-03-21 08:49:45 +0000
@@ -59,11 +59,13 @@
         # Prepare some values
         res = {}
         # Browse all given lines
-        for line in self.browse(cr, uid, ids, context=context):
-            if not line.analytic_distribution_id:
-                res[line.id] = 'none'
+        for line in self.read(cr, uid, ids, ['analytic_distribution_id', 'account_id'], context=context):
+            if not line.get('analytic_distribution_id', False):
+                res[line.get('id')] = 'none'
                 continue
-            res[line.id] = self.pool.get('analytic.distribution')._get_distribution_state(cr, uid, line.analytic_distribution_id.id, False, line.account_id.id)
+            distribution_id = line.get('analytic_distribution_id')[0]
+            account_id = line.get('account_id', [False])[0]
+            res[line.get('id')] = self.pool.get('analytic.distribution')._get_distribution_state(cr, uid, distribution_id, False, account_id)
         return res
 
     _columns = {

=== modified file 'analytic_distribution/account_move_line.py'
--- analytic_distribution/account_move_line.py	2013-12-10 09:13:08 +0000
+++ analytic_distribution/account_move_line.py	2014-03-21 08:49:45 +0000
@@ -55,9 +55,16 @@
             ids = [ids]
         # Prepare some values
         res = {}
-        # Browse all given lines
-        for line in self.browse(cr, uid, ids, context=context):
-            res[line.id] = self.pool.get('analytic.distribution')._get_distribution_state(cr, uid, line.analytic_distribution_id.id, line.move_id and line.move_id.analytic_distribution_id and line.move_id.analytic_distribution_id.id or False, line.account_id.id)
+        distrib_obj = self.pool.get('analytic.distribution')
+        sql = """
+            SELECT aml.id, aml.analytic_distribution_id AS distrib_id, m.analytic_distribution_id AS move_distrib_id, aml.account_id
+            FROM account_move_line AS aml, account_move AS m
+            WHERE aml.move_id = m.id
+            AND aml.id IN %s
+            ORDER BY aml.id;"""
+        cr.execute(sql, (tuple(ids),))
+        for line in cr.fetchall():
+            res[line[0]] = distrib_obj._get_distribution_state(cr, uid, line[1], line[2], line[3])
         return res
 
     def _have_analytic_distribution_from_header(self, cr, uid, ids, name, arg, context=None):
@@ -119,52 +126,69 @@
             context = {}
         acc_ana_line_obj = self.pool.get('account.analytic.line')
         company_currency = self.pool.get('res.users').browse(cr, uid, uid, context=context).company_id.currency_id.id
-        for obj_line in self.browse(cr, uid, ids, context=context):
+        obj_fields = [
+            'debit_currency',
+            'credit_currency',
+            'analytic_distribution_id',
+            'move_id',
+            'state',
+            'journal_id',
+            'source_date',
+            'date',
+            'document_date',
+            'name',
+            'ref',
+            'currency_id',
+            'corrected_line_id',
+            'is_write_off',
+            'account_id',
+        ]
+        for obj_line in self.read(cr, uid, ids, obj_fields, context=context):
             # Prepare some values
-            amount = obj_line.debit_currency - obj_line.credit_currency
-            line_distrib_id = obj_line.analytic_distribution_id and obj_line.analytic_distribution_id.id or obj_line.move_id and obj_line.move_id.analytic_distribution_id and obj_line.move_id.analytic_distribution_id.id or False
+            amount = obj_line.get('debit_currency', 0.0) - obj_line.get('credit_currency', 0.0)
+            journal = self.pool.get('account.journal').read(cr, uid, obj_line.get('journal_id', [False])[0], ['analytic_journal_id', 'name'], context=context)
+            move = self.pool.get('account.move').read(cr, uid, obj_line.get('move_id', [False])[0], ['analytic_distribution_id', 'status', 'line_id'], context=context)
+            account = self.pool.get('account.account').read(cr, uid, obj_line.get('account_id', [False])[0], ['is_analytic_addicted'], context=context)
+            line_distrib_id = (obj_line.get('analytic_distribution_id', False) and obj_line.get('analytic_distribution_id')[0]) or (move.get('analytic_distribution_id', False) and move.get('analytic_distribution_id')[0]) or False
             # When you create a journal entry manually, we should not have analytic lines if ONE line is invalid!
             other_lines_are_ok = True
-            if obj_line.move_id and obj_line.move_id.status and obj_line.move_id.status == 'manu':
-                if obj_line.state != 'valid':
-                    other_lines_are_ok = False
-                for other_line in obj_line.move_id.line_id:
-                    if other_line.state != 'valid':
-                        other_lines_are_ok = False
+            result = self.search(cr, uid, [('move_id', '=', move.get('status', False)), ('move_id.status', '=', 'manu'), ('state', '!=', 'valid')], count=1)
+            if result and result > 0 and move.get('status', False) == 'manu':
+                other_lines_are_ok = False
             # Check that line have analytic-a-holic account and have a distribution
-            if line_distrib_id and obj_line.account_id.is_analytic_addicted and other_lines_are_ok:
-                ana_state = self.pool.get('analytic.distribution')._get_distribution_state(cr, uid, line_distrib_id, {}, obj_line.account_id.id)
+            if line_distrib_id and account.get('is_analytic_addicted', False) and other_lines_are_ok:
+                ana_state = self.pool.get('analytic.distribution')._get_distribution_state(cr, uid, line_distrib_id, {}, account.get('id'))
                 # For manual journal entries, do not raise an error. But delete all analytic distribution linked to other_lines because if one line is invalid, all lines should not create analytic lines
-                if ana_state == 'invalid' and obj_line.move_id.status == 'manu':
-                    ana_line_ids = acc_ana_line_obj.search(cr, uid, [('move_id', 'in', [x.id for x in obj_line.move_id.line_id])])
+                if ana_state == 'invalid' and move.get('status', '') == 'manu':
+                    ana_line_ids = acc_ana_line_obj.search(cr, uid, [('move_id', 'in', move.get('line_id', []))])
                     acc_ana_line_obj.unlink(cr, uid, ana_line_ids)
                     continue
                 elif ana_state == 'invalid':
                     raise osv.except_osv(_('Warning'), _('Invalid analytic distribution.'))
-                if not obj_line.journal_id.analytic_journal_id:
-                    raise osv.except_osv(_('Warning'),_("No Analytic Journal! You have to define an analytic journal on the '%s' journal!") % (obj_line.journal_id.name, ))
+                if not journal.get('analytic_journal_id', False):
+                    raise osv.except_osv(_('Warning'),_("No Analytic Journal! You have to define an analytic journal on the '%s' journal!") % (journal.get('name', ''), ))
                 distrib_obj = self.pool.get('analytic.distribution').browse(cr, uid, line_distrib_id, context=context)
                 # create lines
                 for distrib_lines in [distrib_obj.funding_pool_lines, distrib_obj.free_1_lines, distrib_obj.free_2_lines]:
                     for distrib_line in distrib_lines:
-                        context.update({'date': obj_line.source_date or obj_line.date})
+                        context.update({'date': obj_line.get('source_date', False) or obj_line.get('date', False)})
                         anal_amount = distrib_line.percentage*amount/100
                         line_vals = {
-                                     'name': obj_line.name,
-                                     'date': obj_line.date,
-                                     'ref': obj_line.ref,
-                                     'journal_id': obj_line.journal_id.analytic_journal_id.id,
-                                     'amount': -1 * self.pool.get('res.currency').compute(cr, uid, obj_line.currency_id.id, company_currency, 
+                                     'name': obj_line.get('name', ''),
+                                     'date': obj_line.get('date', False),
+                                     'ref': obj_line.get('ref', ''),
+                                     'journal_id': journal.get('analytic_journal_id', [False])[0],
+                                     'amount': -1 * self.pool.get('res.currency').compute(cr, uid, obj_line.get('currency_id', [False])[0], company_currency, 
                                         anal_amount, round=False, context=context),
                                      'amount_currency': -1 * anal_amount,
                                      'account_id': distrib_line.analytic_id.id,
-                                     'general_account_id': obj_line.account_id.id,
-                                     'move_id': obj_line.id,
+                                     'general_account_id': account.get('id'),
+                                     'move_id': obj_line.get('id'),
                                      'distribution_id': distrib_obj.id,
                                      'user_id': uid,
-                                     'currency_id': obj_line.currency_id.id,
+                                     'currency_id': obj_line.get('currency_id', [False])[0],
                                      'distrib_line_id': '%s,%s'%(distrib_line._name, distrib_line.id),
-                                     'document_date': obj_line.document_date,
+                                     'document_date': obj_line.get('document_date', False),
                         }
                         # Update values if we come from a funding pool
                         if distrib_line._name == 'funding.pool.distribution.line':
@@ -172,11 +196,11 @@
                             line_vals.update({'cost_center_id': distrib_line.cost_center_id and distrib_line.cost_center_id.id or False,
                                 'destination_id': destination_id,})
                         # Update value if we come from a write-off
-                        if obj_line.is_write_off:
+                        if obj_line.get('is_write_off', False):
                             line_vals.update({'from_write_off': True,})
                         # Add source_date value for account_move_line that are a correction of another account_move_line
-                        if obj_line.corrected_line_id and obj_line.source_date:
-                            line_vals.update({'source_date': obj_line.source_date})
+                        if obj_line.get('corrected_line_id', False) and obj_line.get('source_date', False):
+                            line_vals.update({'source_date': obj_line.get('source_date', False)})
                         self.pool.get('account.analytic.line').create(cr, uid, line_vals, context=context)
         return True
 
@@ -187,11 +211,18 @@
         """
         if not context:
             context = {}
-        # Search moves
+        # Search manual moves to revalidate
         move_ids = []
-        for ml in self.browse(cr, uid, ids):
-            if ml.move_id and ml.move_id.state == 'manu':
-                move_ids.append(ml.move_id.id)
+        sql = """
+            SELECT m.id
+            FROM account_move_line AS ml, account_move AS m
+            WHERE ml.move_id = m.id
+            AND m.status = 'manu'
+            AND ml.id IN %s
+            GROUP BY m.id
+            ORDER BY m.id;"""
+        cr.execute(sql, (tuple(ids),))
+        move_ids += cr.fetchall()
         # Search analytic lines
         ana_ids = self.pool.get('account.analytic.line').search(cr, uid, [('move_id', 'in', ids)])
         self.pool.get('account.analytic.line').unlink(cr, uid, ana_ids)

=== modified file 'analytic_distribution/analytic_account.py'
--- analytic_distribution/analytic_account.py	2014-01-14 17:29:00 +0000
+++ analytic_distribution/analytic_account.py	2014-03-21 08:49:45 +0000
@@ -190,6 +190,51 @@
             res.update(tmp_res)
         return res
 
+    def _get_parent_of(self, cr, uid, ids, limit=10, context=None):
+        """
+        Get all parents from the given accounts.
+        To avoid problem of recursion, set a limit from 1 to 10.
+        """
+        # Some checks
+        if context is None:
+            context = {}
+        if not ids:
+            return []
+        if isinstance(ids, (int, long)):
+            ids = [ids]
+        if limit < 1 or limit > 10:
+            raise osv.except_osv(_('Error'), _("You're only allowed to use a limit between 1 and 10."))
+        # Prepare some values
+        account_ids = list(ids)
+        sql = """
+            SELECT parent_id
+            FROM account_analytic_account
+            WHERE id IN %s
+            AND parent_id IS NOT NULL
+            GROUP BY parent_id"""
+        cr.execute(sql, (tuple(ids),))
+        if not cr.rowcount:
+            return account_ids
+        parent_ids = [x[0] for x in cr.fetchall()]
+        account_ids += parent_ids
+        stop = 1
+        while parent_ids:
+            # Stop the search if we reach limit
+            if stop >= limit:
+                break
+            stop += 1
+            cr.execute(sql, (tuple(parent_ids),))
+            if not cr.rowcount:
+                parent_ids = False
+            tmp_res = cr.fetchall()
+            tmp_ids = [x[0] for x in tmp_res]
+            if None in tmp_ids:
+                parent_ids = False
+            else:
+                parent_ids = list(tmp_ids)
+                account_ids += tmp_ids
+        return account_ids
+
     _columns = {
         'name': fields.char('Name', size=128, required=True, translate=1),
         'code': fields.char('Code', size=24),

=== modified file 'analytic_distribution/analytic_distribution.py'
--- analytic_distribution/analytic_distribution.py	2014-01-13 13:44:46 +0000
+++ analytic_distribution/analytic_distribution.py	2014-03-21 08:49:45 +0000
@@ -65,8 +65,8 @@
         # Have an analytic distribution on another account than analytic-a-holic account make no sense. So their analytic distribution is valid
         logger = netsvc.Logger()
         if account_id:
-            account =  self.pool.get('account.account').browse(cr, uid, account_id)
-            if account and not account.is_analytic_addicted:
+            account =  self.pool.get('account.account').read(cr, uid, account_id, ['is_analytic_addicted'])
+            if account and not account.get('is_analytic_addicted', False):
                 return 'valid'
         if not id:
             if parent_id:
@@ -80,10 +80,10 @@
             'analytic_account_msf_private_funds')[1]
         except ValueError:
             fp_id = 0
-        account = self.pool.get('account.account').browse(cr, uid, account_id)
+        account = self.pool.get('account.account').read(cr, uid, account_id, ['destination_ids'])
         # Check Cost Center lines with destination/account link
         for cc_line in distrib.cost_center_lines:
-            if cc_line.destination_id.id not in [x.id for x in account.destination_ids]:
+            if cc_line.destination_id.id not in account.get('destination_ids', []):
                 logger.notifyChannel("analytic distribution", netsvc.LOG_WARNING, _("%s: Error, destination not compatible with G/L account in CC lines") % (id or ''))
                 return 'invalid'
         # Check Funding pool lines regarding:
@@ -91,7 +91,7 @@
         # - If analytic account is MSF Private funds
         # - Cost center and funding pool compatibility
         for fp_line in distrib.funding_pool_lines:
-            if fp_line.destination_id.id not in [x.id for x in account.destination_ids]:
+            if fp_line.destination_id.id not in account.get('destination_ids', []):
                 logger.notifyChannel("analytic distribution", netsvc.LOG_WARNING, _("%s: Error, destination not compatible with G/L account for FP lines") % (id or ''))
                 return 'invalid'
             # If fp_line is MSF Private Fund, all is ok
@@ -276,11 +276,11 @@
             for dl_name in ['cost.center.distribution.line', 'funding.pool.distribution.line', 'free.1.distribution.line', 'free.2.distribution.line']:
                 dl_obj = self.pool.get(dl_name)
                 dl_ids = dl_obj.search(cr, uid, [('distribution_id', '=', distrib_id)], context=context)
-                for dl in dl_obj.browse(cr, uid, dl_ids, context=context):
+                for dl in dl_obj.read(cr, uid, dl_ids, ['percentage'], context=context):
                     dl_vals = {
-                        'amount': round(dl.percentage * amount) / 100.0,
+                        'amount': round(dl.get('percentage', False) * amount) / 100.0,
                     }
-                    dl_obj.write(cr, uid, [dl.id], dl_vals, context=context)
+                    dl_obj.write(cr, uid, [dl.get('id')], dl_vals, context=context)
         return True
 
     def update_distribution_line_account(self, cr, uid, line_ids, account_id, context=None):

=== modified file 'analytic_distribution/wizard/analytic_distribution_wizard.py'
--- analytic_distribution/wizard/analytic_distribution_wizard.py	2014-02-06 16:53:32 +0000
+++ analytic_distribution/wizard/analytic_distribution_wizard.py	2014-03-21 08:49:45 +0000
@@ -1326,7 +1326,7 @@
                             self.pool.get('account.commitment').create_analytic_lines(cr, uid, [wizard.commitment_id.id], context=context)
             elif wizard.register_line_id and wizard.register_line_id.state == 'temp':
                 # Update analytic lines
-                self.pool.get('account.bank.statement.line').update_analytic_lines(cr, uid, [wizard.register_line_id.id], distrib=distrib.id)
+                self.pool.get('account.bank.statement.line').update_analytic_lines(cr, uid, [wizard.register_line_id], distrib=distrib.id)
         return True
 
 analytic_distribution_wizard()

=== modified file 'analytic_distribution_invoice/invoice.py'
--- analytic_distribution_invoice/invoice.py	2014-01-16 10:50:16 +0000
+++ analytic_distribution_invoice/invoice.py	2014-03-21 08:49:45 +0000
@@ -328,7 +328,7 @@
         res = {}
         for invl in self.browse(cr, uid, ids):
             res[invl.id] = []
-            for ml in invl.move_lines or []:
+            for ml in (invl.move_lines or []):
                 if ml.analytic_lines:
                     res[invl.id] = self.pool.get('account.analytic.line').get_corrections_history(cr, uid, [x.id for x in ml.analytic_lines])
         return res

=== modified file 'delivery_mechanism/delivery_mechanism.py'
--- delivery_mechanism/delivery_mechanism.py	2014-02-26 13:56:21 +0000
+++ delivery_mechanism/delivery_mechanism.py	2014-03-21 08:49:45 +0000
@@ -2,7 +2,7 @@
 ##############################################################################
 #
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2011 TeMPO Consulting, MSF 
+#    Copyright (C) 2011 TeMPO Consulting, MSF
 #
 #    This program is free software: you can redistribute it and/or modify
 #    it under the terms of the GNU Affero General Public License as
@@ -41,33 +41,9 @@
                 }
     _defaults = {'line_number': 0,
                  'in_out_updated': False,
-                 'original_qty_partial': -1}
+                 'original_qty_partial':-1}
     _order = 'line_number, date_expected desc, id'
-    
-    def create(self, cr, uid, vals, context=None):
-        '''
-        add the corresponding line number
-        
-        if a corresponding purchase order line or sale order line exist
-        we take the line number from there
-        '''
-        # objects
-        picking_obj = self.pool.get('stock.picking')
-        seq_pool = self.pool.get('ir.sequence')
 
-        # line number correspondance to be checked with Magali
-        if vals.get('picking_id', False):
-            if not vals.get('line_number', False):
-                # new number needed - gather the line number from the sequence
-                sequence_id = picking_obj.read(cr, uid, [vals['picking_id']], ['move_sequence_id'], context=context)[0]['move_sequence_id'][0]
-                line = seq_pool.get_id(cr, uid, sequence_id, code_or_id='id', context=context)
-                # update values with line value
-                vals.update({'line_number': line})
-        
-        # create the new object
-        result = super(stock_move, self).create(cr, uid, vals, context=context)
-        return result
-    
     def copy_data(self, cr, uid, id, defaults=None, context=None):
         '''
         If the line_number is not in the defaults, we set it to False.
@@ -78,7 +54,7 @@
             defaults = {}
         if context is None:
             context = {}
-        
+
         # we set line_number, so it will not be copied in copy_data - keepLineNumber - the original Line Number will be kept
         if 'line_number' not in defaults and not context.get('keepLineNumber', False):
             defaults.update({'line_number': False})
@@ -91,7 +67,7 @@
                 input_loc = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'msf_cross_docking', 'stock_location_input')[1]
                 defaults.update(location_dest_id=input_loc)
         return super(stock_move, self).copy_data(cr, uid, id, defaults, context=context)
-    
+
     def unlink(self, cr, uid, ids, context=None):
         '''
         check the numbering on deletion
@@ -101,37 +77,37 @@
             context = {}
         if isinstance(ids, (int, long)):
             ids = [ids]
-            
+
         # objects
         tools_obj = self.pool.get('sequence.tools')
-        
+
         if not context.get('skipResequencing', False):
-            # re sequencing only happen if purchase order is draft (behavior 1) 
+            # re sequencing only happen if purchase order is draft (behavior 1)
             # get ids with corresponding po at draft state
             draft_not_wkf_ids = self.allow_resequencing(cr, uid, ids, context=context)
             tools_obj.reorder_sequence_number_from_unlink(cr, uid, draft_not_wkf_ids, 'stock.picking', 'move_sequence_id', 'stock.move', 'picking_id', 'line_number', context=context)
-        
+
         return super(stock_move, self).unlink(cr, uid, ids, context=context)
-    
+
     def allow_resequencing(self, cr, uid, ids, context=None):
         '''
         define if a resequencing has to be performed or not
-        
+
         return the list of ids for which resequencing will can be performed
-        
+
         linked to Picking + Picking draft + not linked to Po/Fo
         '''
         # objects
         pick_obj = self.pool.get('stock.picking')
-        
+
         resequencing_ids = [x.id for x in self.browse(cr, uid, ids, context=context) if x.picking_id and pick_obj.allow_resequencing(cr, uid, x.picking_id, context=context)]
         return resequencing_ids
-    
+
     def _create_chained_picking_move_values_hook(self, cr, uid, context=None, *args, **kwargs):
         '''
         Please copy this to your module's method also.
         This hook belongs to the action_process method from stock>stock.py>stock_picking
-        
+
         - set the line number of the original picking, could have used the keepLineNumber flag, but used hook to modify original class minimally
         '''
         if context is None:
@@ -160,44 +136,44 @@
     def _do_partial_hook(self, cr, uid, ids, context, *args, **kwargs):
         '''
         hook to update defaults data
-        
+
         - update the line number, keep original line number
         >> performed for all cases (too few (copy - new numbering policy), complete (simple update - no impact), to many (simple update - no impact)
         '''
         # variable parameters
         move = kwargs.get('move', False)
         assert move, 'delivery_mechanism.py >> stock_move: _do_partial_hook - missing move'
-        
+
         # calling super method
         defaults = super(stock_move, self)._do_partial_hook(cr, uid, ids, context, *args, **kwargs)
         assert defaults is not None, 'delivery_mechanism.py >> stock_move: _do_partial_hook - missing defaults'
         # update the line number, copy original line_number value
         defaults.update({'line_number': move.line_number})
-        
+
         return defaults
-    
+
     def get_mirror_move(self, cr, uid, ids, data_back, context=None):
         '''
         return a dictionary with IN for OUT and OUT for IN, if exists, False otherwise
-        
+
         only one mirror object should exist for each object (to check)
         return objects which are not done
-        
+
         same sale_line_id/purchase_line_id - same product - same quantity
-        
+
         IN: move -> po line -> procurement -> so line -> move
         OUT: move -> so line -> procurement -> po line -> move
-        
+
         I dont use move.move_dest_id because of back orders both on OUT and IN sides
         '''
         if context is None:
             context = {}
         if isinstance(ids, (int, long)):
             ids = [ids]
-            
+
         # objects
         so_line_obj = self.pool.get('sale.order.line')
-            
+
         res = {}
         for obj in self.browse(cr, uid, ids, context=context):
             res[obj.id] = {'move_id': False, 'picking_id': False, 'picking_version': 0, 'quantity': 0, 'moves': []}
@@ -215,33 +191,50 @@
                         if so_line_ids:
                             # find the corresponding OUT move
                             # move_ids = self.search(cr, uid, [('product_id', '=', obj.product_id.id), ('product_qty', '=', obj.product_qty), ('state', 'in', ('assigned', 'confirmed')), ('sale_line_id', '=', so_line_ids[0])], context=context)
-                            move_ids = self.search(cr, uid, [('product_id', '=', data_back['product_id']), 
-                                                             ('state', 'in', ('assigned', 'confirmed')), 
+                            move_ids = self.search(cr, uid, [('product_id', '=', data_back['product_id']),
+                                                             ('state', 'in', ('assigned', 'confirmed')),
                                                              ('sale_line_id', '=', so_line_ids[0]),
-                                                             ('in_out_updated', '=', False)], order="state desc", context=context)
+                                                             ('in_out_updated', '=', False),
+                                                             ('picking_id.type', '=', 'out'),
+                                                             ('processed_stock_move', '=', False),
+                                                             ], order="state desc", context=context)
                             # list of matching out moves
                             integrity_check = []
                             for move in self.browse(cr, uid, move_ids, context=context):
                                 # move from draft picking or standard picking
-                                if (move.product_qty != 0.00 and not move.processed_stock_move and move.picking_id.subtype == 'picking' and not move.picking_id.backorder_id and move.picking_id.state == 'draft') or (move.picking_id.subtype == 'standard') and move.picking_id.type == 'out':
+                                if (move.product_qty != 0.00 and move.picking_id.subtype == 'picking' and not move.picking_id.backorder_id and move.picking_id.state == 'draft') or (move.picking_id.subtype == 'standard'):
                                     integrity_check.append(move)
                             # return the first one matching
                             if integrity_check:
                                 if all([not move.processed_stock_move for move in integrity_check]):
                                     # the out stock moves (draft picking or std out) have not yet been processed, we can therefore update them
-                                    res[obj.id]['move_id'] = integrity_check[0].id
-                                    res[obj.id]['moves'] = integrity_check
-                                    res[obj.id]['picking_id'] = integrity_check[0].picking_id.id
-                                    res[obj.id]['picking_version'] = integrity_check[0].picking_id.update_version_from_in_stock_picking
-                                    res[obj.id]['quantity'] = integrity_check[0].product_qty
+                                    res[obj.id].update({
+                                        'move_id': integrity_check[0].id,
+                                        'moves': integrity_check,
+                                        'picking_id': integrity_check[0].picking_id.id,
+                                        'picking_version': integrity_check[0].picking_id.update_version_from_in_stock_picking,
+                                        'quantity': integrity_check[0].product_qty,
+                                    })
                                 else:
                                     # the corresponding OUT move have been processed completely or partially,, we do not update the OUT
-                                    self.log(cr, uid, integrity_check[0].id, _('The Stock Move %s from %s has already been processed and is therefore not updated.')%(integrity_check[0].name, integrity_check[0].picking_id.name))
-                                    
+                                    self.log(cr, uid, integrity_check[0].id, _('The Stock Move %s from %s has already been processed and is therefore not updated.') % (integrity_check[0].name, integrity_check[0].picking_id.name))
+
             else:
                 # we are looking for corresponding IN from on_order purchase order
                 assert False, 'This method is not implemented for OUT or Internal moves'
-                
+
+        return res
+
+    def create_data_back(self, move):
+        '''
+        build data_back dictionary
+        '''
+        res = {'id': move.id,
+               'name': move.product_id.partner_ref,
+               'product_id': move.product_id.id,
+               'product_uom': move.product_uom.id,
+               'product_qty': move.product_qty,
+               }
         return res
 
     def hook__create_chained_picking(self, cr, uid, pick_values, picking):
@@ -251,7 +244,7 @@
             res['auto_picking'] = picking.type == 'in' and picking.move_lines[0]['direct_incoming']
 
         return res
-        
+
 stock_move()
 
 
@@ -263,12 +256,12 @@
     _columns = {'move_sequence_id': fields.many2one('ir.sequence', string='Moves Sequence', help="This field contains the information related to the numbering of the moves of this picking.", required=True, ondelete='cascade'),
                 'change_reason': fields.char(string='Change Reason', size=1024, readonly=True),
                 }
-    
+
     def _stock_picking_action_process_hook(self, cr, uid, ids, context=None, *args, **kwargs):
         '''
         Please copy this to your module's method also.
         This hook belongs to the action_process method from stock>stock.py>stock_picking
-        
+
         - allow to modify the data for wizard display
         '''
         if context is None:
@@ -283,7 +276,7 @@
                                                                                model=res['res_model'],
                                                                                step='default'))
         return res
-    
+
     def create(self, cr, uid, vals, context=None):
         '''
         create the sequence for the numbering of the lines
@@ -294,9 +287,9 @@
         seq_pool = self.pool.get('ir.sequence')
         po_obj = self.pool.get('purchase.order')
         so_obj = self.pool.get('sale.order')
-        
+
         new_seq_id = self.create_sequence(cr, uid, vals, context=context)
-        vals.update({'move_sequence_id': new_seq_id,})
+        vals.update({'move_sequence_id': new_seq_id, })
         # if from order, we udpate the sequence to match the order's one
         # line number correspondance to be checked with Magali
         # I keep that code deactivated, as when the picking is wkf, hide_new_button must always be true
@@ -307,13 +300,13 @@
         elif vals.get('sale_id') and False:
             seq_id = po_obj.read(cr, uid, [vals.get('sale_id')], ['sequence_id'], context=context)[0]['sequence_id'][0]
             seq_value = seq_pool.read(cr, uid, [seq_id], ['number_next'], context=context)[0]['number_next']
-        
+
         if seq_value:
             # update sequence value of stock picking to match order's one
-            seq_pool.write(cr, uid, [new_seq_id], {'number_next': seq_value,})
-            
+            seq_pool.write(cr, uid, [new_seq_id], {'number_next': seq_value, })
+
         return super(stock_picking, self).create(cr, uid, vals, context=context)
-    
+
     def allow_resequencing(self, cr, uid, pick_browse, context=None):
         '''
         allow resequencing criteria
@@ -321,7 +314,7 @@
         if pick_browse.state == 'draft' and not pick_browse.purchase_id and not pick_browse.sale_id:
             return True
         return False
-    
+
     def _do_partial_hook(self, cr, uid, ids, context, *args, **kwargs):
         '''
         hook to update defaults data
@@ -329,42 +322,30 @@
         # variable parameters
         move = kwargs.get('move')
         assert move, 'delivery_mechanism.py >> stock_picking: _do_partial_hook - missing move'
-        
+
         # calling super method
         defaults = super(stock_picking, self)._do_partial_hook(cr, uid, ids, context, *args, **kwargs)
         assert defaults is not None, 'delivery_mechanism.py >> stock_picking: _do_partial_hook - missing defaults'
         # update the line number, copy original line_number value
         defaults.update({'line_number': move.line_number})
-        
-        #UTP-972: Set the original total qty of the original move to the new partial move, for sync purpose only
+
+        # UTP-972: Set the original total qty of the original move to the new partial move, for sync purpose only
         orig_qty = move.product_qty
         if move.original_qty_partial and move.original_qty_partial != -1:
             orig_qty = move.original_qty_partial
         defaults.update({'original_qty_partial': orig_qty})
-        
+
         return defaults
-    
-    def create_data_back(self, cr, uid, move, context=None):
-        '''
-        build data_back dictionary
-        '''
-        res = {'id': move.id,
-               'name': move.product_id.partner_ref,
-               'product_id': move.product_id.id,
-               'product_uom': move.product_uom.id,
-               'product_qty': move.product_qty,
-               }
-        return res
-    
+
     def _update_mirror_move(self, cr, uid, ids, data_back, diff_qty, out_move=False, context=None):
         '''
         update the mirror move with difference quantity diff_qty
-        
+
         if out_move is provided, it is used for copy if another cannot be found (meaning the one provided does
         not fit anyhow)
-        
+
         # NOTE: the price is not update in OUT move according to average price computation. this is an open point.
-        
+
         if diff_qty < 0, the qty is decreased
         if diff_qty > 0, the qty is increased
         '''
@@ -383,8 +364,8 @@
                       'product_uos_qty': 0,
                       'product_uom': data_back['product_uom'],
                       'state': 'confirmed',
-                      'prodlot_id': False, # reset batch number
-                      'asset_id': False, # reset asset
+                      'prodlot_id': False,  # reset batch number
+                      'asset_id': False,  # reset asset
                       }
             out_move_id = move_obj.copy(cr, uid, out_move, values, context=context)
         # update quantity
@@ -400,7 +381,7 @@
                 new_move_id = move_obj.copy(cr, uid, out_move_id, {'product_qty' : diff_qty,
                                                                    'product_uom': data_back['product_uom'],
                                                                    'product_uos': data_back['product_uom'],
-                                                                   'product_uos_qty': diff_qty,}, context=context)
+                                                                   'product_uos_qty': diff_qty, }, context=context)
                 move_obj.action_confirm(cr, uid, [new_move_id], context=context)
 #                if present_qty == 0.00:
 #                    move_obj.write(cr, uid, [out_move_id], {'state': 'draft'})
@@ -409,14 +390,14 @@
                 move_obj.write(cr, uid, [out_move_id], {'product_qty' : new_qty,
                                                         'product_uom': data['product_uom'][0],
                                                         'product_uos': data['product_uom'][0],
-                                                        'product_uos_qty': new_qty,}, context=context)
-    
+                                                        'product_uos_qty': new_qty, }, context=context)
+
             # log the modification
             # log creation message
-            move_obj.log(cr, uid, out_move_id, _('The Stock Move %s from %s has been updated to %s %s.')%(stock_move_name, picking_out_name, new_qty, uom_name))
+            move_obj.log(cr, uid, out_move_id, _('The Stock Move %s from %s has been updated to %s %s.') % (stock_move_name, picking_out_name, new_qty, uom_name))
         # return updated move or False
         return out_move_id
-    
+
     def _do_incoming_shipment_first_hook(self, cr, uid, ids, context=None, *args, **kwargs):
         '''
         hook to update values for stock move if first encountered
@@ -424,31 +405,188 @@
         values = kwargs.get('values')
         assert values is not None, 'missing values'
         return values
-    
-    def do_incoming_shipment(self, cr, uid, ids, context=None):
-        '''
-        validate the picking ticket from selected stock moves
-        
-        move here the logic of validate picking
-        available for picking loop
-        '''
-        assert context, 'context is not defined'
-        assert 'partial_datas' in context, 'partial datas not present in context'
-        partial_datas = context['partial_datas']
-        if isinstance(ids, (int, long)):
-            ids = [ids]
-        
-        # sequence object
+
+    def _get_db_data_dict(self, cr, uid):
+        """
+        Get some data from data.xml file (like stock locations, Unifield setup...)
+        """
+        # Objects
+        data_obj = self.pool.get('ir.model.data')
+        loc_obj = self.pool.get('stock.location')
+
+        setup = self.pool.get('unifield.setup.configuration').get_config(cr, uid)
+
+        cd_loc = loc_obj.get_cross_docking_location(cr, uid)
+        service_loc = loc_obj.get_service_location(cr, uid)
+        non_stock = loc_obj.search(cr, uid, [('non_stockable_ok', '=', True)])
+        if non_stock:
+            non_stock = non_stock[0]
+        input_loc = data_obj.get_object_reference(cr, uid, 'msf_cross_docking', 'stock_location_input')[1]
+
+        db_data = {
+            'setup': setup,
+            'cd_loc': cd_loc,
+            'service_loc': service_loc,
+            'non_stock': non_stock,
+            'input_loc': input_loc
+        }
+
+        return db_data
+
+    def _compute_average_values(self, cr, uid, move, line, product_availability, context=None):
+        """
+        Compute the average price of the product according to processed quantities
+        """
+        # Objects
+        uom_obj = self.pool.get('product.uom')
+        currency_obj = self.pool.get('res.currency')
+        product_obj = self.pool.get('product.product')
+
+        if context is None:
+            context = {}
+
+        average_values = {}
+
+        move_currency_id = move.company_id.currency_id.id
+        context['currency_id'] = move_currency_id
+
+        qty = line.quantity
+        if line.uom_id.id != line.product_id.uom_id.id:
+            qty = uom_obj._compute_qty(cr, uid, line.uom_id.id, line.quantity, line.product_id.uom_id.id)
+
+        product_availability.setdefault(line.product_id.id, line.product_id.qty_available)
+        product_availability[line.product_id.id] += qty
+
+        if qty > 0.00:
+            new_price = line.cost
+            # Recompute unit price if the currency used is not the functional currency
+            if line.currency.id != move_currency_id:
+                new_price = currency_obj.compute(cr, uid, line.currency.id, move_currency_id,
+                    new_price, round=False, context=context)
+
+            # Recompute unit price if the UoM received is not the default UoM of the product
+            if line.uom_id.id != line.product_id.uom_id.id:
+                new_price = uom_obj._compute_price(cr, uid, line.uom_id.id, new_price,
+                    line.product_id.uom_id.id)
+
+            new_std_price = 0.00
+            if line.product_id.qty_available <= 0.00:
+                new_std_price = new_price
+            else:
+                # Get the current price
+                current_price = product_obj.price_get(cr, uid, [line.product_id.id], 'standard_price', context=context)[line.product_id.id]
+                # Check no division by zero
+                if product_availability[line.product_id.id]:
+                    new_std_price = ((current_price * product_availability[line.product_id.id])\
+                        + (new_price * qty)) / (product_availability[line.product_id.id] + qty)
+
+            # Write the field according to price type field
+            product_obj.write(cr, uid, [line.product_id.id], {'standard_price': new_std_price})
+
+            # Record the values that were chosen in the wizard, so they can be
+            # used for inventory valuation of real-time valuation is enabled.
+            average_values = {
+              'price_unit': new_price,
+              'price_currency_id': line.currency.id,
+            }
+
+        return average_values
+
+    def _get_values_from_line(self, cr, uid, move, line, db_data, context=None):
+        """
+        Prepare the value for a processed move according to line values
+        """
+        # Objects
+        uom_obj = self.pool.get('product.uom')
+
+        if context is None:
+            context = {}
+
+        wizard = line.wizard_id
+
+        values = {
+            'name': line.product_id.partner_ref,
+            'product_id': line.product_id.id,
+            'original_qty_partial': move.product_qty,
+            'product_qty': line.quantity,
+            'product_uom': line.uom_id.id,
+            'product_uos_qty': line.quantity,
+            'product_uos': line.uom_id.id,
+            'prodlot_id': line.prodlot_id and line.prodlot_id.id or False,
+            # 'asset_id': line.asset_id and line.asset_id.id or False,
+            'change_reason': line.change_reason,
+            # Values from incoming wizard
+            'direct_incoming': line.wizard_id.direct_incoming,
+            # Values for Direct Purchase Order
+            'sync_dpo': move.dpo_line_id and True or move.sync_dpo,
+            'dpo_line_id': move.dpo_line_id and move.dpo_line_id.id or False,
+        }
+
+        # UTP-872: Don't change the quantity if the move is canceled
+        # If the quantity is changed to 0.00, a backorder is created
+        # for canceled moves
+        if move.state == 'cancel':
+            values.update({
+                'product_qty': move.product_qty,
+                'product_uos_qty': move.product_uos_qty
+            })
+
+        # UTP-872: Added also the state into the move line if the state comes from the sync
+        if line.state:
+            values['state'] = line.state
+
+        if line.cost:
+            values['price_unit'] = line.cost
+        elif line.uom_id.id != move.product_uom.id:
+            new_price = uom_obj._compute_price(cr, uid, move.product_uom.id, move.price_unit, line.uom_id.id)
+            values['price_unit'] = new_price
+
+        # We check the dest_type for INCOMING shipment (and not the source_type which is reserved for OUTGOING shipment)
+        if wizard.dest_type == 'to_cross_docking':
+            if db_data.get('setup').allocation_setup == 'unallocated':
+                raise osv.except_osv(
+                        _('Error'),
+                        _('You cannot made moves from/to Cross-docking locations when the Allocated stocks configuration is set to \'Unallocated\'.')
+                )
+            # Below, "source_type" is only used for the outgoing shipment. We set it to "None" because by default it is
+            # "default" and we do not want that info on INCOMING shipment
+            wizard.source_type = None
+            values.update({
+                'location_dest_id': db_data.get('cd_loc'),
+                'cd_from_bo': True,
+            })
+        elif wizard.dest_type == 'to_stock':
+            # Below, "source_type" is only used for the outgoing shipment. We set it to "None because by default it is
+            # "default" and we do not want that info on INCOMING shipment
+            if line.product_id.type == 'consu':
+                values['location_dest_id'] = db_data.get('non_stock')
+            elif line.product_id.type == 'service_recep':
+                values['location_dest_id'] = db_data.get('service_loc')
+            else:
+                # treat moves towards STOCK if NOT SERVICE
+                values['location_dest_id'] = db_data.get('input_loc')
+
+            values['cd_from_bo'] = False
+
+        if wizard.dest_type != 'to_cross_docking':
+            values['direct_incoming'] = wizard.direct_incoming
+
+        return values
+
+    def do_incoming_shipment(self, cr, uid, wizard_ids, context=None):
+        """
+        Take the data in wizard_ids and lines of stock.incoming.processor and
+        do the split of stock.move according to the data.
+        """
+        # Objects
+        inc_proc_obj = self.pool.get('stock.incoming.processor')
+        move_proc_obj = self.pool.get('stock.move.in.processor')
+        loc_obj = self.pool.get('stock.location')
+        uom_obj = self.pool.get('product.uom')
+        move_obj = self.pool.get('stock.move')
         sequence_obj = self.pool.get('ir.sequence')
-        # stock move object
-        move_obj = self.pool.get('stock.move')
-        product_obj = self.pool.get('product.product')
-        currency_obj = self.pool.get('res.currency')
-        uom_obj = self.pool.get('product.uom')
-        # create picking object
-        create_picking_obj = self.pool.get('create.picking')
-        # workflow
         wf_service = netsvc.LocalService("workflow")
+<<<<<<< TREE
         internal_loc_ids = self.pool.get('stock.location').search(cr, uid, [('usage','=','internal'), ('cross_docking_location_ok', '=', False)])
         ctx_avg = context.copy()
         ctx_avg['location'] = internal_loc_ids
@@ -487,204 +625,131 @@
                 # keep data for back order creation
                 data_back = self.create_data_back(cr, uid, move, context=context)
                 # qty selected
+=======
+
+        if context is None:
+            context = {}
+
+        if isinstance(wizard_ids, (int, long)):
+            wizard_ids = [wizard_ids]
+
+        db_data_dict = self._get_db_data_dict(cr, uid)
+
+        # UF-1617: Get the sync_message case
+        sync_in = context.get('sync_message_execution', False)
+
+        internal_loc = loc_obj.search(cr, uid, [('usage', '=', 'internal'), ('cross_docking_location_ok', '=', False)])
+        context['location'] = internal_loc
+
+        product_availability = {}
+
+        for wizard in inc_proc_obj.browse(cr, uid, wizard_ids, context=context):
+            picking = wizard.picking_id
+            backordered_moves = []  # Moves that need to be put in a backorder
+            done_moves = []  # Moves that are completed
+            out_picks = set()
+            processed_out_moves = []
+
+            for move in picking.move_lines:
+                # Get all processed lines that processed this stock move
+                proc_ids = move_proc_obj.search(cr, uid, [('wizard_id', '=', wizard.id), ('move_id', '=', move.id)], context=context)
+                # The processed quantity
+>>>>>>> MERGE-SOURCE
                 count = 0
-                # flag to update the first move - if split was performed during the validation, new stock moves are created
-                first = True
-                # force complete flag = validate all partial for the same move have the same force complete value
-                force_complete = False
-                # initial qty
-                initial_qty = move.product_qty
-                # initial uom
-                initial_uom = move.product_uom.id
-                # corresponding out move
+                need_split = False
+
+                data_back = move_obj.create_data_back(move)
                 mirror_data = move_obj.get_mirror_move(cr, uid, [move.id], data_back, context=context)[move.id]
-                out_move_id = mirror_data['move_id']
                 out_moves = mirror_data['moves']
-                processed_moves = []
-                # update out flag
-                count_partial = len(partial_datas[pick.id][move.id])
-                update_out = count_partial > 1
-                # average price computation, new values - should be the same for every partial
                 average_values = {}
 
-                orig_qty = move.product_qty
-                if move.original_qty_partial and move.original_qty_partial != -1:
-                    orig_qty = move.original_qty_partial
-                
-                # partial list
-                for partial in partial_datas[pick.id][move.id]:
-                    # original openERP logic - average price computation - To be validated by Matthias
-                    # Average price computation
-                    # selected product from wizard must be tested
-                    product = product_obj.browse(cr, uid, partial['product_id'], context=ctx_avg)
-                    values = {'name': partial['name'],
-                              'product_id': partial['product_id'],
-                              'product_qty': partial['product_qty'],
-                              'product_uos_qty': partial['product_qty'],
-                              'original_qty_partial': orig_qty,
-                              'prodlot_id': partial['prodlot_id'],
-                              'product_uom': partial['product_uom'],
-                              'product_uos': partial['product_uom'],
-                              'sync_dpo': move.sync_dpo,
-                              'asset_id': partial['asset_id'],
-                              'change_reason': partial['change_reason'],
-                              'direct_incoming': partial.get('direct_incoming'),
-                              }
-
-                    if partial.get('dpo_line_id'):
-                        values['dpo_line_id'] = partial['dpo_line_id']
-                        values['sync_dpo'] = partial['dpo_line_id'] and True or False
-
-                    # UTP-872: Don't change the quantity if the move is canceled
-                    # If the quantity is changed to 0.00, a backorder is created
-                    # for canceled moves
-                    if move.state == 'cancel':
-                        values.update({'product_qty': move.product_qty,
-                                       'product_uos_qty': move.product_uos_qty})
-
-                    if 'state' in partial: # UTP-872: Added also the state into the move line if the state comes from the sync
-                        values.update({'state': partial['state']})
-                    if 'product_price' in partial:
-                        values.update({'price_unit': partial['product_price']})
-                    elif 'product_uom' in partial and partial['product_uom'] != move.product_uom.id:
-                        new_price = self.pool.get('product.uom')._compute_price(cr, uid, move.product_uom.id, move.price_unit, partial['product_uom'])
-                        values.update({'price_unit': new_price})
-                    values = self._do_incoming_shipment_first_hook(cr, uid, ids, context, values=values)
-                    compute_average = pick.type == 'in' and product.cost_method == 'average' and not move.location_dest_id.cross_docking_location_ok
-                    if values.get('location_dest_id'):
-                        val_loc = self.pool.get('stock.location').browse(cr, uid, values.get('location_dest_id'), context=context)
-                        compute_average = pick.type == 'in' and product.cost_method == 'average' and not val_loc.cross_docking_location_ok
-                    
-                    # why do not used get_picking_type: original do_partial do not use it
-                    # when an incoming shipment has a avg product to Service, the average price computation is of no use
-                    
+                for line in move_proc_obj.browse(cr, uid, proc_ids, context=context):
+                    values = self._get_values_from_line(cr, uid, move, line, db_data_dict, context=context)
+
+                    # Check if we must re-compute the price of the product
+                    compute_average = False
+                    if values.get('location_dest_id', False):
+                        dest_loc = loc_obj.browse(cr, uid, values['location_dest_id'], context=context)
+                        compute_average = picking.type == 'in' and line.product_id.cost_method == 'average' and dest_loc.cross_docking_location_ok
+
                     if compute_average:
-                        move_currency_id = move.company_id.currency_id.id
-                        context['currency_id'] = move_currency_id
-                        # datas from partial
-                        product_uom = partial['product_uom']
-                        product_qty = partial['product_qty']
-                        product_currency = partial.get('product_currency', False)
-                        product_price = partial.get('product_price', 0.0)
-                        qty = uom_obj._compute_qty(cr, uid, product_uom, product_qty, product.uom_id.id)
-    
-                        if product.id in product_avail:
-                            product_avail[product.id] += qty
-                        else:
-                            product_avail[product.id] = product.qty_available
-    
-                        if qty > 0:
-                            new_price = currency_obj.compute(cr, uid, product_currency,
-                                    move_currency_id, product_price, round=False, context=context)
-                            new_price = uom_obj._compute_price(cr, uid, product_uom, new_price,
-                                    product.uom_id.id)
-                            if product.qty_available <= 0:
-                                new_std_price = new_price
-                            else:
-                                # Get the standard price
-                                amount_unit = product.price_get('standard_price', context)[product.id]
-                                # check no division by zero
-                                if product_avail[product.id] + qty:
-                                    new_std_price = ((amount_unit * product_avail[product.id])\
-                                        + (new_price * qty))/(product_avail[product.id] + qty)
-                                else:
-                                    new_std_price = 0.0
-                                            
-                            # Write the field according to price type field
-                            product_obj.write(cr, uid, [product.id], {'standard_price': new_std_price})
-    
-                            # Record the values that were chosen in the wizard, so they can be
-                            # used for inventory valuation if real-time valuation is enabled.
-                            average_values = {'price_unit': product_price,
-                                              'price_currency_id': product_currency}
-                                        
-                    # the quantity
-                    count = count + uom_obj._compute_qty(cr, uid, partial['product_uom'], partial['product_qty'], initial_uom)
-                    count_partial -= 1
-                    if first:
-                        first = False
-                        # line number does not need to be updated
-                        # average computation - empty if not average
+                        average_values = self._compute_average_values(cr, uid, move, line, product_availability, context=context)
                         values.update(average_values)
-                        
-#                        # if split happened, we update the corresponding OUT move
-#                        if out_move_id:
-#                            # UF-1690 : Remove the location_dest_id from values
-#                            out_values = values.copy()
-#                            if out_values.get('location_dest_id', False):
-#                                out_values.pop('location_dest_id')
-#                            second_assign_moves.append(out_move_id)
-#                            if update_out:
-#                                move_obj.write(cr, uid, [out_move_id], out_values, context=context)
-#                            elif move.product_id.id != partial['product_id']:
-#                                move_obj.write(cr, uid, [out_move_id], out_values, context=context)
-#                                # we force update flag - out will be updated if qty is missing - possibly with the creation of a new move
-#                                update_out = True
-                        # we update the values with the _do_incoming_shipment_first_hook only if we are on an 'IN'
-                        values = self._do_incoming_shipment_first_hook(cr, uid, ids, context, values=values)
-                        # mark the done IN stock as processed
-                        move_obj.write(cr, uid, [move.id], dict(values, processed_stock_move=True), context=context)
+
+                    # The quantity
+                    if line.uom_id.id != move.product_uom.id:
+                        count += uom_obj._compute_qty(cr, uid, line.uom_id.id, line.quantity, move.product_uom.id)
+                    else:
+                        count += line.quantity
+
+                    values['processed_stock_move'] = True
+                    if not need_split:
+                        need_split = True
+                        # Mark the done IN stock move as processed
+                        move_obj.write(cr, uid, [move.id], values, context=context)
                         done_moves.append(move.id)
-                                
                     else:
-                        # split happened during the validation
-                        # copy the stock move and set the quantity
-                        # we keep original line number
-                        values.update({'state': 'assigned'})
-                        # average computation - empty if not average
-                        values.update(average_values)
-                        # mark the done IN stock as processed
-                        new_move = move_obj.copy(cr, uid, move.id, dict(values, processed_stock_move=True), context=dict(context, keepLineNumber=True))
-                        done_moves.append(new_move)
-                        
-                    
+                        values['state'] = 'assigned'
+                        context['keepLineNumber'] = True
+                        new_move_id = move_obj.copy(cr, uid, move.id, values, context=context)
+                        context['keepLineNumber'] = False
+                        done_moves.append(new_move_id)
+
+                    values['processed_stock_move'] = False
+
                     out_values = values.copy()
-                    # Remove sync. dpo fields
-                    out_values['dpo_line_id'] = 0
-                    out_values['sync_dpo'] = False
-                    out_values.update({'state': 'confirmed'})
+                    # Remove sync. DPO fields
+                    out_values.update({
+                        'dpo_line_id': 0,
+                        'sync_dpo': False,
+                        'state': 'confirmed',
+                    })
                     if out_values.get('location_dest_id', False):
                         out_values.pop('location_dest_id')
-                        
-                    partial_qty = partial['product_qty']
-                    count_out = len(out_moves)
-                        
+
+                    remaining_out_qty = line.quantity
+                    out_move = None
                     for out_move in out_moves:
-                        if not partial_qty:
-                            break
-                        
-                        out_pick = out_move.picking_id
-                        if out_pick and out_pick.type == 'out' and out_pick.subtype == 'picking' and \
-                           out_pick.state == 'draft' and out_pick.id not in out_picks:
-                            out_picks.append(out_move.picking_id.id)
-                        
                         out_move = move_obj.browse(cr, uid, out_move.id, context=context)
-                        count_out -= 1
-                        
-                        uom_partial_qty = self.pool.get('product.uom')._compute_qty(cr, uid, partial['product_uom'], partial_qty, out_move.product_uom.id)
-                        if count_partial or uom_partial_qty < out_move.product_qty:
-                            # Split the out move
-                            vals = dict(out_values, product_qty=partial_qty, product_uom=partial['product_uom'])
-                            if not sync_in:
-                                vals.update({'in_out_updated': True})
-                            new_move = move_obj.copy(cr, uid, out_move.id, vals, context=dict(context, keepLineNumber=True))
-                            # Update the initial out move qty
-                            move_obj.write(cr, uid, [out_move.id], {'product_qty': out_move.product_qty - uom_partial_qty, 'original_qty_partial': orig_qty}, context=context)
-                            backlinks.append((move.id, new_move))
-                            partial_qty = 0.00
-#                            if not count_out:
-#                                backlinks.append((move.id, out_move.id))
-                        elif not count_out or uom_partial_qty == out_move.product_qty:
-                            # Update the initial out move qty with the processed qty
-                            vals = dict(out_values, product_qty=partial_qty, product_uom=partial['product_uom'])
-                            if not sync_in:
-                                vals.update({'in_out_updated': True})
-                            move_obj.write(cr, uid, [out_move.id], vals, context=context)
-                            backlinks.append((move.id, out_move.id))
-                            processed_moves.append(out_move.id)
-                            partial_qty = 0.00
+
+                        # List the Picking Ticket that need to be created from the Draft Picking Ticket
+                        if out_move.picking_id.type == 'out' \
+                           and out_move.picking_id.subtype == 'picking' \
+                           and out_move.picking_id.state == 'draft':
+                            out_picks.add(out_move.picking_id.id)
+
+                        if line.uom_id.id != out_move.product_uom.id:
+                            uom_partial_qty = uom_obj._compute_qty(cr, uid, line.uom_id.id, remaining_out_qty, out_move.product_uom.id)
+                        else:
+                            uom_partial_qty = remaining_out_qty
+
+                        if uom_partial_qty < out_move.product_qty:
+                            # Splt the out move
+                            out_values.update({
+                                'product_qty': remaining_out_qty,
+                                'product_uom': line.uom_id.id,
+                                'in_out_updated': sync_in and False or True,
+                            })
+                            context['keepLineNumber'] = True
+                            new_out_move_id = move_obj.copy(cr, uid, out_move.id, out_values, context=context)
+                            context['keepLineNumber'] = False
+                            remaining_out_qty = 0.00
+                            move_obj.write(cr, uid, [out_move.id], {
+                                'product_qty': out_move.product_qty - uom_partial_qty,
+                                'product_uos_qty': out_move.product_qty - uom_partial_qty,
+                            }, context=context)
+                            processed_out_moves.append(new_out_move_id)
+                        elif uom_partial_qty == out_move.product_qty:
+                            out_values.update({
+                                'product_qty': remaining_out_qty,
+                                'product_uom': line.uom_id.id,
+                                'in_out_updated': sync_in and False or True,
+                            })
+                            move_obj.write(cr, uid, [out_move.id], out_values, context=context)
+                            processed_out_moves.append(out_move.id)
                         else:
                             # Just update the data of the initial out move
+<<<<<<< TREE
                             vals = dict(out_values, product_qty=out_move.product_qty, product_uom=partial['product_uom'])
                             if not sync_in:
                                 vals.update({'in_out_updated': True})
@@ -786,74 +851,117 @@
                     wf_service.trg_write(uid, 'stock.picking', pick.id, cr)
                 else:
                     # UF-1617: when it is from the sync, then just send the IN to shipped, then return the backorder_id
+=======
+                            out_values.update({
+                                'product_qty': uom_partial_qty,
+                                'product_uom': line.uom_id.id,
+                                'in_out_updated': sync_in and False or True
+                            })
+                            move_obj.write(cr, uid, [out_move.id], out_values, context=context)
+                            processed_out_moves.append(out_move.id)
+
+                # Decrement the inital move, cannot be less than zero
+                diff_qty = move.product_qty - count
+                # If there is remaining quantity for the move, put the ID of the move
+                # and the remaining quantity to list of moves to put in backorder
+                if diff_qty > 0.00 and move.state != 'cancel':
+                    backordered_moves.append((move, diff_qty, average_values))
+
+            # Create the backorder if needed
+            if backordered_moves:
+                backorder_id = self.copy(cr, uid, picking.id, {
+                    'name': sequence_obj.get(cr, uid, 'stock.picking.%s' % (picking.type)),
+                    'move_lines': [],
+                    'state': 'draft',
+                }, context=context)
+
+                for bo_move, bo_qty, av_values in backordered_moves:
+                    # Create the corresponding move in the backorder - reset batch - reset asset_id
+                    bo_values = {
+                        'asset_id': False,
+                        'product_qty': bo_qty,
+                        'product_uos_qty': bo_qty,
+                        'product_uom': data_back['product_uom'],
+                        'product_uos': data_back['product_uom'],
+                        'prodlot_id': False,
+                        'state': 'assigned',
+                        'move_dest_id': False,
+                        'change_reason': False,
+                        'processed_stock_move': True,
+                    }
+                    bo_values.update(av_values)
+                    context['keepLineNumber'] = True
+                    move_obj.copy(cr, uid, move.id, bo_values, context=context)
+                    context['keepLineNumber'] = False
+
+                # Put the done moves in this new picking
+                move_obj.write(cr, uid, done_moves, {
+                    'picking_id': backorder_id,
+                    'dpo_line_id': 0,
+                }, context=context)
+
+
+                if sync_in:
+                    # UF-1617: When it is from the sync., then just send the IN to shipped, then return the backorder_id
+>>>>>>> MERGE-SOURCE
                     wf_service.trg_validate(uid, 'stock.picking', backorder_id, 'button_shipped', cr)
                     return backorder_id
+
+
+                wf_service.trg_validate(uid, 'stock.picking', backorder_id, 'button_confirm', cr)
+                # Then we finish the good picking
+                self.write(cr, uid, [picking.id], {
+                    'backorder_id': backorder_id,
+                    'cd_from_bo': values.get('cd_from_bo', False),
+                }, context=context)
+                self.action_move(cr, uid, [backorder_id])
+                wf_service.trg_validate(uid, 'stock.picking', backorder_id, 'button_done', cr)
+                wf_service.trg_write(uid, 'stock.picking', picking.id, cr)
             else:
-                if sync_in: # if it's from sync, then we just send the pick to become Available Shipped, not completely close!
-                    self.write(cr, uid, [pick.id], {'state': 'shipped'}, context=context)
-                    return pick.id
+                if sync_in:  # If it's from sync, then we just send the pick to become Available Shippde, not completely close!
+                    self.write(cr, uid, [picking.id], {'state': 'shipped'}, context=context)
+                    return picking.id
                 else:
-                    self.action_move(cr, uid, [pick.id], context)
-                    wf_service.trg_validate(uid, 'stock.picking', pick.id, 'button_done', cr)
-                
-            for move, out_move in backlinks:
-                if move in done_moves:
-                    move_obj.write(cr, uid, [move], {'state': 'done'}, context=context)
-                    if not sync_in:
-                        move_obj.action_assign(cr, uid, [out_move])
-                    pick_moves.append(out_move)
-            
-            # update the out version
-            if update_pick_version:
-                self.write(cr, uid, [update_pick_version], {'update_version_from_in_stock_picking': mirror_data['picking_version']+1}, context=context)
-                
-                
-            # Create the first picking ticket if we are on a draft picking ticket
-            for picking in self.browse(cr, uid, out_picks, context=context):
-                if picking.type == 'out' and picking.subtype == 'picking' and picking.state == 'draft':
-                    wiz = self.create_picking(cr, uid, [picking.id], context=context)
-                    wiz_obj = self.pool.get(wiz['res_model'])
-                    moves_picking = wiz_obj.browse(cr, uid, wiz['res_id'], context=wiz['context']).product_moves_picking
-                    # We delete the lines which is not from the IN
-                    for line in moves_picking:
-                        if line.move_id.id not in pick_moves:
-                            self.pool.get('stock.move.memory.picking').unlink(cr, uid, [line.id], context=context)
-                    if wiz_obj.browse(cr, uid, wiz['res_id'], context=wiz['context']).product_moves_picking:
-                        # We copy all data in lines
-                        wiz_obj.copy_all(cr, uid, [wiz['res_id']], context=wiz['context'])
-                        # We process the creation of the picking
-                        wiz_obj.do_create_picking(cr, uid, [wiz['res_id']], context=wiz['context'])
-
-            # Assign all updated out moves
-#            for move in move_obj.browse(cr, uid, to_assign_moves):
-#                if not move.product_qty and move.state not in ('done', 'cancel'):
-#                    to_assign_moves.remove(move.id)
-#                    move.unlink(context=dict(context, call_unlink=True))
-#            for move in move_obj.browse(cr, uid, second_assign_moves):
-#                if not move.product_qty and move.state not in ('done', 'cancel'):
-#                    second_assign_moves.remove(move.id)
-#                    move.unlink(context=dict(context, call_unlink=True))
-#            move_obj.action_assign(cr, uid, second_assign_moves)
-#            move_obj.action_assign(cr, uid, to_assign_moves)
-
-        # If a line has been canceled on PICK/OUT
-        for so in self.pool.get('sale.order').browse(cr, uid, list(so_to_check), context=context):
-            if so.state == 'shipping_except':
-                wf_service.trg_validate(uid, 'sale.order', so.id, 'ship_corrected', cr)
+                    self.action_move(cr, uid, [picking.id], context=context)
+                    wf_service.trg_validate(uid, 'stock.picking', picking.id, 'button_done', cr)
+
+            if not sync_in:
+                move_obj.action_assign(cr, uid, processed_out_moves)
+
+
+        # Create the first picking ticket if we are on a draft picking ticket
+        for picking in self.browse(cr, uid, list(out_picks), context=context):
+            wiz = self.create_picking(cr, uid, [picking.id], context=context)
+            wiz_obj = self.pool.get(wiz['res_model'])
+            wiz_context = wiz.get('context', {})
+            moves_picking = wiz_obj.browse(cr, uid, wiz['res_id'], context=wiz_context).move_ids
+            nb_lines = len(moves_picking)
+            # We delete the lines which is not from the IN
+#            for line in moves_picking:
+#                if line.move_id.id not in pick_moves:
+#                    self.pool.get('stock.move.memeroy.picking').unlink(cr, uid, [line.id], context=context)
+#                    nb_lines -= 1
+
+            if nb_lines:
+                # We copy all data in lines
+                wiz_obj.copy_all(cr, uid, [wiz['res_id']], context=wiz_context)
+                # We process the creation of the picking
+                wiz_obj.do_create_picking(cr, uid, [wiz['res_id']], context=wiz_context)
 
         if context.get('from_simu_screen'):
             view_id = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'stock', 'view_picking_in_form')[1]
-            return {'type': 'ir.actions.act_window',
-                    'res_model': 'stock.picking',
-                    'res_id': ids[0],
-                    'view_id': [view_id],
-                    'view_mode': 'form, tree',
-                    'view_type': 'form',
-                    'target': 'crush',
-                    'context': context}
+            return {
+                'type': 'ir.actions.act_window',
+                'res_model': 'stock.picking',
+                'res_id': picking.id,
+                'view_id': [view_id],
+                'view_mode': 'form, tree',
+                'view_type': 'form',
+                'target': 'crush',
+                'context': context}
 
         return {'type': 'ir.actions.act_window_close'}
-    
+
     def enter_reason(self, cr, uid, ids, context=None):
         '''
         open reason wizard
@@ -868,7 +976,7 @@
         wiz_obj = self.pool.get('wizard')
         # open the selected wizard
         return wiz_obj.open_wizard(cr, uid, ids, name=name, model=model, step=step, context=dict(context, picking_id=ids[0]))
-    
+
     def cancel_and_update_out(self, cr, uid, ids, context=None):
         '''
         update corresponding out picking if exists and cancel the picking
@@ -877,18 +985,18 @@
             context = {}
         if isinstance(ids, (int, long)):
             ids = [ids]
-        
+
         # objects
         move_obj = self.pool.get('stock.move')
         purchase_obj = self.pool.get('purchase.order')
         # workflow
         wf_service = netsvc.LocalService("workflow")
-        
+
         for obj in self.browse(cr, uid, ids, context=context):
             # corresponding sale ids to be manually corrected after purchase workflow trigger
             sale_ids = []
             for move in obj.move_lines:
-                data_back = self.create_data_back(cr, uid, move, context=context)
+                data_back = self.create_data_back(move)
                 diff_qty = -data_back['product_qty']
                 # update corresponding out move - no move created, no need to handle line sequencing policy
                 out_move_id = self._update_mirror_move(cr, uid, ids, data_back, diff_qty, out_move=False, context=context)
@@ -906,8 +1014,8 @@
                             move_id = move_obj.search(cr, uid, [('picking_id.type', '=', 'out'),
                                                                 ('picking_id.subtype', 'in', ('standard', 'picking')),
                                                                 ('picking_id.sale_id', '=', sale_id),
-                                                                ('state', 'not in', ('done', 'cancel')),  
-                                                                ('processed_stock_move', '=', True),], context=context)
+                                                                ('state', 'not in', ('done', 'cancel')),
+                                                                ('processed_stock_move', '=', True), ], context=context)
                             if move_id:
                                 proc_id = self.pool.get('procurement.order').search(cr, uid, [('move_id', '=', out_move_id)], context=context)
                                 self.pool.get('procurement.order').write(cr, uid, proc_id, {'move_id': move_id[0]}, context=context)
@@ -920,15 +1028,15 @@
                         if out_move.picking_id and out_move.picking_id.sale_id:
                             if out_move.picking_id.sale_id.id not in sale_ids:
                                 sale_ids.append(out_move.picking_id.sale_id.id)
-                            
+
             # correct the corresponding po manually if exists - should be in shipping exception
             if obj.purchase_id:
                 wf_service.trg_validate(uid, 'purchase.order', obj.purchase_id.id, 'picking_ok', cr)
-                purchase_obj.log(cr, uid, obj.purchase_id.id, _('The Purchase Order %s is %s%% received.')%(obj.purchase_id.name, round(obj.purchase_id.shipped_rate,2)))
+                purchase_obj.log(cr, uid, obj.purchase_id.id, _('The Purchase Order %s is %s%% received.') % (obj.purchase_id.name, round(obj.purchase_id.shipped_rate, 2)))
             # correct the corresponding so
             for sale_id in sale_ids:
                 wf_service.trg_validate(uid, 'sale.order', sale_id, 'ship_corrected', cr)
-        
+
         return True
 
 stock_picking()
@@ -939,34 +1047,13 @@
     add the link to procurement order
     '''
     _inherit = 'purchase.order.line'
-    _columns= {'procurement_id': fields.many2one('procurement.order', string='Procurement Reference', readonly=True,),
+    _columns = {'procurement_id': fields.many2one('procurement.order', string='Procurement Reference', readonly=True,),
                }
-    _defaults = {'procurement_id': False,}
-    
+    _defaults = {'procurement_id': False, }
+
 purchase_order_line()
 
 
-class purchase_order(osv.osv):
-    '''
-    hook to modify created In moves
-    '''
-    _inherit = 'purchase.order'
-    
-    def _hook_action_picking_create_stock_picking(self, cr, uid, ids, context=None, *args, **kwargs):
-        '''
-        modify data for stock move creation
-        - line number of stock move is taken from purchase order line
-        '''
-        if context is None:
-            context = {}
-        move_values = super(purchase_order, self)._hook_action_picking_create_stock_picking(cr, uid, ids, context=context, *args, **kwargs)
-        order_line = kwargs['order_line']
-        move_values.update({'line_number': order_line.line_number})
-        return move_values
-    
-purchase_order()
-
-
 class procurement_order(osv.osv):
     '''
     inherit po_values_hook
@@ -977,7 +1064,7 @@
         '''
         Please copy this to your module's method also.
         This hook belongs to the make_po method from purchase>purchase.py>procurement_order
-        
+
         - allow to modify the data for purchase order line creation
         '''
         if isinstance(ids, (int, long)):
@@ -986,13 +1073,13 @@
         line = super(procurement_order, self).po_line_values_hook(cr, uid, ids, context=context, *args, **kwargs)
         # give the purchase order line a link to corresponding procurement
         procurement = kwargs['procurement']
-        line.update({'procurement_id': procurement.id,})
+        line.update({'procurement_id': procurement.id, })
         # for Internal Request (IR) on make_to_order we update PO line data according to the data of the IR (=sale_order)
-        sale_order_line_ids = sale_obj.search(cr, uid, [('procurement_id','=', procurement.id)], context=context)
+        sale_order_line_ids = sale_obj.search(cr, uid, [('procurement_id', '=', procurement.id)], context=context)
         for sol in sale_obj.browse(cr, uid, sale_order_line_ids, context=context):
             if sol.order_id.procurement_request and not sol.product_id and sol.comment:
                 line.update({'product_id': False,
-                             'name': 'Description: %s' %sol.comment,
+                             'name': 'Description: %s' % sol.comment,
                              'comment': sol.comment,
                              'product_qty': sol.product_uom_qty,
                              'price_unit': sol.price_unit,
@@ -1009,6 +1096,6 @@
                              'nomen_sub_4': sol.nomen_sub_4.id or False,
                              'nomen_sub_5': sol.nomen_sub_5.id or False})
         return line
-    
+
 procurement_order()
 

=== modified file 'delivery_mechanism/wizard/change_product_memory_move_view.xml'
--- delivery_mechanism/wizard/change_product_memory_move_view.xml	2013-08-30 14:16:23 +0000
+++ delivery_mechanism/wizard/change_product_memory_move_view.xml	2014-03-21 08:49:45 +0000
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-        <record id="view_change_product_memory_move_form_wizard" model="ir.ui.view">
-            <field name="name">Change Product move</field>
-            <field name="model">change.product.memory.move</field>
+        <record id="change_product_move_processor_form_view" model="ir.ui.view">
+            <field name="name">change.product.move.processor.form.view</field>
+            <field name="model">change.product.move.processor</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
             <form string="Change Product of Memory Move">

=== modified file 'import_data/import_data.py'
--- import_data/import_data.py	2014-01-15 09:20:59 +0000
+++ import_data/import_data.py	2014-03-21 08:49:45 +0000
@@ -2,7 +2,7 @@
 ##############################################################################
 #
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2011 TeMPO Consulting, MSF 
+#    Copyright (C) 2011 TeMPO Consulting, MSF
 #
 #    This program is free software: you can redistribute it and/or modify
 #    it under the terms of the GNU Affero General Public License as
@@ -49,7 +49,6 @@
 
     def _set_full_path_nomen(self, cr, uid, headers, row, col):
         if not col:
-            self._cache = {}
             # modify headers if needed
             for n,h in enumerate(headers):
                 m = re.match("^nomen_manda_([0123]).name$", h)
@@ -63,9 +62,6 @@
                     row[col[manda]] = ' | '.join([row[col[manda-1]], row[col[manda]]])
         return col
 
-    def _del_product_cache(self, cr, uid):
-        self._cache = {}
-
     def _set_default_value(self, cr, uid, data, row, headers):
         # Create new list of headers with the name of each fields (without dots)
         new_headers = []
@@ -78,10 +74,11 @@
         # Get the default value
         defaults = self.pool.get('product.product').default_get(cr, uid, new_headers)
         # If no value in file, set the default value
-        for n, h in enumerate(new_headers):
+        for h in new_headers:
             if h in defaults and (not h in data or not data[h]):
                 data[h] = defaults[h]
 
+
     post_hook = {
         'account.budget.post': _set_code_name,
         'product.nomenclature': _set_nomen_level,
@@ -89,11 +86,10 @@
     }
 
     pre_hook = {
-        'product.product': _set_full_path_nomen, 
+        'product.product': _set_full_path_nomen,
     }
 
     post_load_hook = {
-        'product.product': _del_product_cache,
     }
 
     def _get_image(self, cr, uid, context=None):
@@ -105,7 +101,7 @@
         'debug': fields.boolean('Debug to server log'),
         'object': fields.selection([
             ('product.nomenclature','Product Nomenclature'),
-            ('product.category','Product Category'), 
+            ('product.category','Product Category'),
             ('product.product', 'Product'),
             ('res.partner.category','Partner Category'),
             ('res.partner','Partner'),
@@ -132,13 +128,13 @@
 
         obj = self.read(cr, uid, ids[0])
         import_mode = obj.get('import_mode')
-        
+
         objname = ""
         for sel in self._columns['object'].selection:
             if sel[0] == obj['object']:
                 objname = sel[1]
                 break
-        
+
         fileobj = TemporaryFile('w+')
         fileobj.write(base64.decodestring(obj['file']))
         fileobj.seek(0)
@@ -146,6 +142,71 @@
         reader = csv.reader(fileobj, quotechar='"', delimiter=';')
         headers = []
 
+        if impobj._name == 'product.product':
+            # Create the cache
+            if not hasattr(self, '_cache'):
+                self._cache = {}
+            self._cache.setdefault(dbname, {})
+
+            if not hasattr(self.pool.get('product.nomenclature'), '_cache'):
+                self.pool.get('product.nomenclature')._cache = {}
+            self.pool.get('product.nomenclature')._cache.setdefault(dbname, {})
+
+            # Clear the cache
+            self._cache[dbname] = {'product.nomenclature': {'name': {}, 'complete_name': {}},
+                                   'product.uom': {'name': {}},
+                                   'product.asset.type': {'name': {}},
+                                   'product.international.status': {'name': {}},
+                                   }
+            # Product nomenclature
+            cr.execute('SELECT name, id FROM product_nomenclature;')
+            for nv in cr.dictfetchall():
+                self._cache[dbname]['product.nomenclature']['name'].update({nv['name']: nv['id']})
+            # Product category
+            cr.execute('SELECT id, family_id FROM product_category;')
+            for pc in cr.dictfetchall():
+                self.pool.get('product.nomenclature')._cache[dbname].update({pc['family_id']: pc['id']})
+            # Product nomenclature complete name
+            cr.execute('''SELECT id, name FROM
+(
+(SELECT
+    n0.id, n0.name AS name
+FROM product_nomenclature n0
+WHERE n0.level = 0)
+UNION
+(SELECT n1.id, n0.name ||' | '|| n1.name AS name
+FROM product_nomenclature n1
+  LEFT JOIN product_nomenclature n0 ON n1.parent_id = n0.id
+WHERE n1.level = 1)
+UNION
+(SELECT n2.id, n0.name ||' | '|| n1.name ||' | '|| n2.name AS name
+FROM product_nomenclature n1
+  LEFT JOIN product_nomenclature n0 ON n1.parent_id = n0.id
+  LEFT JOIN product_nomenclature n2 ON n2.parent_id = n1.id
+WHERE n2.level = 2)
+UNION
+(SELECT n3.id, n0.name ||' | '|| n1.name ||' | '|| n2.name ||' | '|| n3.name AS name
+FROM product_nomenclature n1
+  LEFT JOIN product_nomenclature n0 ON n1.parent_id = n0.id
+  LEFT JOIN product_nomenclature n2 ON n2.parent_id = n1.id
+  LEFT JOIN product_nomenclature n3 ON n3.parent_id = n2.id
+WHERE n3.level = 3)
+) AS cn''')
+            for cnv in cr.dictfetchall():
+                self._cache[dbname]['product.nomenclature']['complete_name'].update({cnv['name']: cnv['id']})
+            # Product UoM
+            cr.execute('SELECT name, id FROM product_uom;')
+            for uv in cr.dictfetchall():
+                self._cache[dbname]['product.uom']['name'].update({uv['name']: uv['id']})
+            # Asset type
+            cr.execute('SELECT name, id FROM product_asset_type;')
+            for av in cr.dictfetchall():
+                self._cache[dbname]['product.asset.type']['name'].update({av['name']: av['id']})
+            # International status
+            cr.execute('SELECT name, id FROM product_international_status;')
+            for iv in cr.dictfetchall():
+                self._cache[dbname]['product.international.status']['name'].update({iv['name']: iv['id']})
+
         errorfile = TemporaryFile('w+')
         writer = csv.writer(errorfile, quotechar='"', delimiter=';')
 
@@ -160,11 +221,18 @@
         def _get_obj(header, value, fields_def):
             list_obj = header.split('.')
             relation = fields_def[list_obj[0]]['relation']
+            if impobj._name == 'product.product' and value in self._cache.get(dbname, {}).get(relation, {}).get(list_obj[1], {}):
+                return self._cache[dbname][relation][list_obj[1]][value]
             new_obj = self.pool.get(relation)
             newids = new_obj.search(cr, uid, [(list_obj[1], '=', value)], limit=1)
             if not newids:
-                # TODO: no obj
+                # no obj
                 raise osv.except_osv(_('Warning !'), _('%s does not exist')%(value,))
+
+            if impobj._name == 'product.product':
+                self._cache[dbname].setdefault(relation, {})
+                self._cache[dbname][relation].setdefault(list_obj[1], {})
+                self._cache[dbname][relation][list_obj[1]][value] = newids[0]
             return newids[0]
 
         def process_data(field, value, fields_def):
@@ -172,17 +240,23 @@
                 return
             if '.' not in field:
                 # type datetime, date, bool, int, float
-                if value and fields_def[field]['type'] == 'boolean':
+                if fields_def[field]['type'] == 'boolean':
                     value = value.lower() not in ('0', 'false', 'off','-', 'no', 'n')
-                elif value and fields_def[field]['type'] == 'selection':
-                    for key, val in fields_def[field]['selection']:
-                        if value.lower() in [tools.ustr(key).lower(), tools.ustr(val).lower()]:
-                            value = key
-                            break
-                elif value and fields_def[field]['type'] == 'date':
+                elif fields_def[field]['type'] == 'selection':
+                    if impobj == 'product.product' and self._cache[dbname].get('product.product.%s.%s' % (field, value), False):
+                        value = self._cache[dbname]['product.product.%s.%s' % (field, value)]
+                    else:
+                        for key, val in fields_def[field]['selection']:
+                            if value.lower() in [tools.ustr(key).lower(), tools.ustr(val).lower()]:
+                                value = key
+                                if impobj == 'product.product':
+                                    self._cache[dbname].setdefault('product.product.%s' % field, {})
+                                    self._cache[dbname]['product.product.%s.%s' % (field, value)] = key
+                                break
+                elif fields_def[field]['type'] == 'date':
                     dt = DateTime.strptime(value,"%d/%m/%Y")
-                    value = dt.strftime("%Y-%m-%d") 
-                elif value and fields_def[field]['type'] == 'float':
+                    value = dt.strftime("%Y-%m-%d")
+                elif fields_def[field]['type'] == 'float':
                     # remove space and unbreakable space
                     value = re.sub('[  ]+', '', value)
                     value = float(value.replace(',', '.'))
@@ -191,9 +265,9 @@
             else:
                 if fields_def[field.split('.')[0]]['type'] in 'many2one':
                     return _get_obj(field, value, fields_def)
-            
+
             raise osv.except_osv(_('Warning !'), _('%s does not exist')%(value,))
-        
+
         i = 1
         nb_error = 0
         nb_succes = 0
@@ -301,13 +375,13 @@
         import_type = 'Import'
         if import_mode == 'update':
             import_type = 'Update'
-            summary = '''Datas Import Summary: 
+            summary = '''Datas Import Summary:
 Object: %s
 Records updated: %s
 Records created: %s
 '''%(objname, nb_update_success, nb_succes)
         else:
-            summary = '''Datas Import Summary: 
+            summary = '''Datas Import Summary:
 Object: %s
 Records created: %s
 '''%(objname, nb_succes)
@@ -336,9 +410,14 @@
                 'description': 'Rejected Lines',
                 'res_model': 'res.request',
                 'res_id': req_id,
-                'datas': base64.encodestring(errorfile.read()), 
+                'datas': base64.encodestring(errorfile.read()),
             })
 
+        if impobj == 'product.product':
+            # Clear the cache
+            self._cache[dbname] = {}
+            self.pool.get('product.nomenclature')._cache[dbname] = {}
+
         errorfile.close()
         cr.commit()
         cr.close()

=== modified file 'kit/kit_creation.py'
--- kit/kit_creation.py	2013-11-26 07:54:42 +0000
+++ kit/kit_creation.py	2014-03-21 08:49:45 +0000
@@ -1285,9 +1285,6 @@
                  'original_from_process_stock_move': False,
                  }
     
-    def write(self, cr, uid, ids, vals, context=None):
-        return super(stock_move, self).write(cr, uid, ids, vals, context=context)
-    
     def assign_to_kit(self, cr, uid, ids, context=None):
         '''
         open the assign to kit wizard

=== modified file 'msf_audittrail/audittrail.py'
--- msf_audittrail/audittrail.py	2014-03-12 08:56:42 +0000
+++ msf_audittrail/audittrail.py	2014-03-21 08:49:45 +0000
@@ -24,14 +24,14 @@
 from osv.orm import orm_template
 from tools.translate import _
 from lxml import etree
-from datetime import *
+from datetime import datetime
 import ir
 import pooler
 import time
 import tools
 import logging
 from tools.safe_eval import safe_eval as eval
-import logging
+
 
 class purchase_order(osv.osv):
     _name = 'purchase.order'
@@ -40,6 +40,7 @@
 
 purchase_order()
 
+
 class purchase_order_line(osv.osv):
     _name = 'purchase.order.line'
     _inherit = 'purchase.order.line'
@@ -47,6 +48,7 @@
 
 purchase_order_line()
 
+
 class sale_order(osv.osv):
     _name = 'sale.order'
     _inherit = 'sale.order'
@@ -54,6 +56,7 @@
 
 sale_order()
 
+
 class sale_order_line(osv.osv):
     _name = 'sale.order.line'
     _inherit = 'sale.order.line'
@@ -61,6 +64,7 @@
 
 sale_order_line()
 
+
 class stock_picking(osv.osv):
     _name = 'stock.picking'
     _inherit = 'stock.picking'
@@ -68,6 +72,7 @@
 
 stock_picking()
 
+
 class stock_move(osv.osv):
     _name = 'stock.move'
     _inherit = 'stock.move'
@@ -80,6 +85,7 @@
 
 stock_move()
 
+
 class account_invoice(osv.osv):
     _name = 'account.invoice'
     _inherit = 'account.invoice'
@@ -87,6 +93,7 @@
 
 account_invoice()
 
+
 class account_invoice_line(osv.osv):
     _name = 'account.invoice.line'
     _inherit = 'account.invoice.line'
@@ -94,6 +101,7 @@
 
 account_invoice_line()
 
+
 class account_bank_statement(osv.osv):
     _name = 'account.bank.statement'
     _inherit = 'account.bank.statement'
@@ -101,6 +109,7 @@
 
 account_bank_statement()
 
+
 class account_bank_statement_line(osv.osv):
     _name = 'account.bank.statement.line'
     _inherit = 'account.bank.statement.line'
@@ -149,6 +158,7 @@
 
 account_analytic_account()
 
+
 class account_period(osv.osv):
     _name = 'account.period'
     _inherit = 'account.period'
@@ -167,13 +177,12 @@
         res = super(ir_module, self).update_translations(cr, uid, ids, filter_lang=None, context=context)
 
         msf_profile_id = self.search(cr, uid, [('name', '=', 'msf_profile')], context=context)
-        
+
         if not msf_profile_id or msf_profile_id[0] not in ids:
             return res
 
         tr_obj = self.pool.get('ir.translation')
         act_obj = self.pool.get('ir.actions.act_window')
-        language_obj = self.browse(cr, uid, ids)[0]
         src = 'Track changes'
         if not filter_lang:
             pool = pooler.get_pool(cr.dbname)
@@ -194,11 +203,11 @@
                 # Search all actions to rename
                 act_ids = act_obj.search(cr, uid, [('name', '=', src)], context=context)
                 for act in act_ids:
-                    exist = tr_obj.search(cr, uid, [('lang', '=', lang), 
-                                                    ('type', '=', 'model'), 
-                                                    ('src', '=', src), 
-                                                    ('name', '=', 'ir.actions.act_window,name'), 
-                                                    ('value', '=', trans), 
+                    exist = tr_obj.search(cr, uid, [('lang', '=', lang),
+                                                    ('type', '=', 'model'),
+                                                    ('src', '=', src),
+                                                    ('name', '=', 'ir.actions.act_window,name'),
+                                                    ('value', '=', trans),
                                                     ('res_id', '=', act)], context=context)
                     if not exist:
                         tr_obj.create(cr, uid, {'lang': lang,
@@ -224,6 +233,7 @@
 
 audittrail_log_sequence()
 
+
 class audittrail_rule(osv.osv):
     """
     For Auddittrail Rule
@@ -236,9 +246,9 @@
         "log_read": fields.boolean("Log Reads", help="Select this if you want to keep track of read/open on any record of the object of this rule"),
         "log_write": fields.boolean("Log Writes", help="Select this if you want to keep track of modification on any record of the object of this rule"),
         "log_unlink": fields.boolean("Log Deletes", help="Select this if you want to keep track of deletion on any record of the object of this rule"),
-        "log_create": fields.boolean("Log Creates",help="Select this if you want to keep track of creation on any record of the object of this rule"),
-        "log_action": fields.boolean("Log Action",help="Select this if you want to keep track of actions on the object of this rule"),
-        "log_workflow": fields.boolean("Log Workflow",help="Select this if you want to keep track of workflow on any record of the object of this rule"),
+        "log_create": fields.boolean("Log Creates", help="Select this if you want to keep track of creation on any record of the object of this rule"),
+        "log_action": fields.boolean("Log Action", help="Select this if you want to keep track of actions on the object of this rule"),
+        "log_workflow": fields.boolean("Log Workflow", help="Select this if you want to keep track of workflow on any record of the object of this rule"),
         "domain_filter": fields.char(size=128, string="Domain", help="Python expression !"),
         "state": fields.selection((("draft", "Draft"),
                                    ("subscribed", "Subscribed")),
@@ -257,15 +267,6 @@
         'domain_filter': [],
     }
 
-# we replace the sql_constraint below by a Python constraint which checks that there is one type of rule per type.
-#    _sql_constraints = [
-#        ('model_uniq', 'unique (object_id)', """There is a rule defined on this object\n You can not define other on the same!""")
-#    ]
-
-    _sql_constraints = [
-        ('rule_name_uniq', 'unique(name)', """The AuditTrail rule name must be unique!""")
-    ]
-
     def _check_domain_filter(self, cr, uid, ids, context=None):
         """
         Check that if you select cross docking, you do not have an other location than cross docking
@@ -274,20 +275,39 @@
             ids = [ids]
         if context is None:
             context = {}
-        
+
         for rule in self.browse(cr, uid, ids, context=context):
             domain = eval(rule.domain_filter)
             for d in tuple(domain):
                 if len(d[0].split('.')) > 2:
                     return False
-        
+
         return True
-    
+
+
+    _sql_constraints = [
+        ('rule_name_uniq', 'unique(name)', """The AuditTrail rule name must be unique!""")
+    ]
+
     _constraints = [
         (_check_domain_filter, 'The domain shouldn\'t contain a right element in condition with more than 2 elements.', ['domain_filter']),
     ]
+
     __functions = {}
 
+
+    def write(self, cr, uid, ids, value, context=None):
+        if isinstance(ids, (int, long)):
+            ids = [ids]
+        for rule in self.browse(cr, uid, ids):
+            self.get_functionnal_fields.clear_cache(cr.dbname, objname=rule.object_id.model, ids=[rule.id])
+            for method in ['read', 'create', 'write', 'unlink']:
+                field_name = 'log_' + method
+                if getattr(rule, field_name):
+                    self.to_trace.clear_cache(cr.dbname, model=rule.object_id.model, method=method)
+        return super(audittrail_rule, self).write(cr, uid, ids, value, context=context)
+
+
     def subscribe(self, cr, uid, ids, *args):
         """
         Subscribe Rule for auditing changes on object and apply shortcut for logs on that object.
@@ -298,17 +318,17 @@
         """
         if isinstance(ids, (int, long)):
             ids = [ids]
-        
+
         obj_action = self.pool.get('ir.actions.act_window')
         obj_model = self.pool.get('ir.model.data')
-        #start Loop
+
         for thisrule in self.browse(cr, uid, ids):
             obj = self.pool.get(thisrule.object_id.model)
             if not obj:
                 raise osv.except_osv(
                         _('WARNING: audittrail is not part of the pool'),
                         _('Change audittrail depends -- Setting rule as DRAFT'))
-                self.write(cr, uid, [thisrule.id], {"state": "draft"})
+
             search_view_id = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'msf_audittrail', 'view_audittrail_log_line_search')
             val = {
                  "name": _('Track changes'),
@@ -326,8 +346,8 @@
             keyword = 'client_action_relate'
             value = 'ir.actions.act_window,' + str(action_id)
             obj_model.ir_set(cr, uid, 'action', keyword, 'View_log_' + thisrule.object_id.model, [thisrule.object_id.model], value, replace=True, isobject=True, xml_id=False)
-            #End Loop
-        
+            # End Loop
+
         # Check if an export model already exist for audittrail.rule
         export_ids = self.pool.get('ir.exports').search(cr, uid, [('name', '=', 'Log Lines'), ('resource', '=', 'audittrail.log.line')])
         if not export_ids:
@@ -335,7 +355,7 @@
                                                                      'resource': 'audittrail.log.line'})
             fields = ['log', 'timestamp', 'sub_obj_name', 'method', 'field_description', 'old_value', 'new_value', 'user_id']
             for f in fields:
-                self.pool.get('ir.exports.line').create(cr, uid, {'name': f, 'export_id': export_id}) 
+                self.pool.get('ir.exports.line').create(cr, uid, {'name': f, 'export_id': export_id})
 
         return True
 
@@ -349,8 +369,8 @@
         """
         obj_action = self.pool.get('ir.actions.act_window')
         val_obj = self.pool.get('ir.values')
-        value=''
-        #start Loop
+        value = ''
+        # start Loop
         for thisrule in self.browse(cr, uid, ids):
             if thisrule.id in self.__functions:
                 for function in self.__functions[thisrule.id]:
@@ -363,10 +383,182 @@
             if val_id:
                 ir.ir_del(cr, uid, val_id[0])
             self.write(cr, uid, [thisrule.id], {"state": "draft"})
-        #End Loop
-        
+        # End Loop
+
         return True
 
+    @tools.cache(skiparg=3)
+    def get_functionnal_fields(self, cr, uid, objname, ids):
+        # no context to not disturb caching
+        fields_obj = self.pool.get('ir.model.fields')
+        fields_ids = fields_obj.search(cr, uid, [('audittrail_rule_ids', 'in', ids)])
+        if fields_ids:
+            ret = []
+            obj = self.pool.get(objname)
+            for field in fields_obj.read(cr, uid, fields_ids, ['name']):
+                col = obj._all_columns[field['name']].column
+                if col._properties and not col._classic_write:
+                    ret.append(field['name'])
+            return ret
+        return []
+
+    @tools.cache(skiparg=3)
+    def to_trace(self, cr, uid, model, method):
+        obj = self.pool.get(model)
+        if not obj or not obj._trace:
+            return False
+
+        log_field = 'log_' + method
+        return self.search(cr, 1, [('object_id.model', '=', model), (log_field, '=', True), ('state', '=', 'subscribed')])
+
+
+    def audit_log(self, cr, uid, ids, obj, objids, method, previous_value=None, current=None, context=None):
+        uid_orig = uid
+        uid = 1
+        log_line_obj = self.pool.get('audittrail.log.line')
+
+        if isinstance(objids, (int, long)):
+            obj_ids = [objids]
+            previous = [previous_value]
+        else:
+            obj_ids = objids[:]
+            previous = previous_value
+
+        for rule in self.browse(cr, uid, ids, context=context):
+            if not obj_ids:
+                # if a previous rule has been applied, stop the log
+                # i.e: if multiple rules a set for a an object, only the 1st is applied
+                return True
+            domain = []
+            if rule.domain_filter:
+                domain = eval(rule.domain_filter)
+            if domain:
+                new_dom = ['&', ('id', 'in', obj_ids)] + domain
+                res_ids = obj.search(cr, uid, new_dom)
+                if not res_ids:
+                    continue
+
+                # test next rule on res_ids exluded by the rule domain
+                obj_ids = [x for x in obj_ids if x not in res_ids]
+            else:
+                res_ids = obj_ids[:]
+                obj_ids = []
+
+            model_name_tolog = rule.object_id.model
+            parent_field = False
+            if rule.parent_field_id:
+                parent_field_display = rule.name_get_field_id.name
+                parent_field = rule.parent_field_id.name
+                model_name_tolog = rule.parent_field_id.relation
+                model_parent_id = self.pool.get('ir.model').search(cr, uid, [('model', '=', model_name_tolog)])[0]
+
+            if method in ('write', 'create'):
+                original_fields = current.values()[0].keys()
+                fields_to_trace = {}
+
+                for field in rule.field_ids:
+                    if field.name in original_fields or field.is_function:
+                        fields_to_trace[field.name] = field
+
+                if method != 'create' and not fields_to_trace:
+                    # no changes written in field to trace
+                    continue
+
+            new_values_computed = {}
+            if parent_field:
+                new_values_computed = dict((x['id'], x) for x in obj.read(cr, uid, res_ids, [parent_field, parent_field_display], context=context))
+
+
+            for res_id in res_ids:
+                parent_field_id = False
+                if parent_field:
+                    parent_field_id = new_values_computed[res_id][parent_field][0]
+
+                vals = {
+                    'name': rule.object_id.name,
+                    'method': method,
+                    'object_id': rule.object_id.id,
+                    'user_id': uid_orig,
+                    'res_id': parent_field_id or res_id,
+                }
+
+                # Add the name of the created sub-object
+                if parent_field_id:
+                    # get the parent model_id
+                    vals.update({
+                        'sub_obj_name': new_values_computed[res_id][parent_field_display],
+                        'rule_id': rule.id,
+                        'fct_object_id': rule.object_id.id,
+                        'object_id': model_parent_id,
+                        'fct_res_id': res_id
+                    })
+                if method == 'unlink':
+                    vals.update({
+                        'field_description': get_field_description(rule.object_id),
+                        'log': self.get_sequence(cr, uid, model_name_tolog, vals['res_id'], context=context),
+                    })
+                    log_line_obj.create(cr, uid, vals)
+
+                elif method in  ('write', 'create'):
+                    if method == 'create':
+                        vals.update({
+                            'log': self.get_sequence(cr, uid, model_name_tolog, vals['res_id'], context=context),
+                            'field_description': get_field_description(rule.object_id),
+                        })
+                        log_line_obj.create(cr, uid, vals)
+                    if method == 'write':
+                        previous_values = dict((x['id'], x) for x in previous)
+                        record = previous_values[res_id]
+                    else:
+                        record = {}
+
+                    for field in fields_to_trace.keys():
+                        old_value = record.get(field, False)
+                        new_value = current[res_id].get(field, False)
+                        if old_value != new_value:
+                            if fields_to_trace[field].ttype == 'datetime' and old_value and new_value and old_value[:10] == new_value[:10]:
+                                continue
+                            line = vals.copy()
+                            description = fields_to_trace[field].field_description
+                            # UTP-360
+                            if description == 'Pricelist':
+                                description = 'Currency'
+                            line.update({
+                              'field_id': fields_to_trace[field].id,
+                              'field_description': description,
+                              'log': self.get_sequence(cr, uid, model_name_tolog, vals['res_id'], context=context),
+                              'name': field,
+                              'new_value': new_value,
+                              'old_value': old_value,
+                            })
+                            log_line_obj.create(cr, uid, line)
+
+    def get_sequence(self, cr, uid, obj_name, res_id, context=None):
+        log_seq_obj = self.pool.get('audittrail.log.sequence')
+        log_sequence = log_seq_obj.search(cr, uid, [('model', '=', obj_name), ('res_id', '=', res_id)])
+        if log_sequence:
+            log_seq = log_seq_obj.browse(cr, uid, log_sequence[0]).sequence
+            log = log_seq.get_id(code_or_id='id')
+        else:
+            # Create a new sequence
+            seq_pool = self.pool.get('ir.sequence')
+            seq_typ_pool = self.pool.get('ir.sequence.type')
+            types = {
+                'name': obj_name,
+                'code': obj_name,
+            }
+            seq_typ_pool.create(cr, uid, types)
+            seq = {
+                'name': obj_name,
+                'code': obj_name,
+                'prefix': '',
+                'padding': 1,
+            }
+            seq_id = seq_pool.create(cr, uid, seq)
+            log_seq_obj.create(cr, uid, {'model': obj_name, 'res_id': res_id, 'sequence': seq_id})
+            log = seq_pool.browse(cr, uid, seq_id).get_id(code_or_id='id')
+        return log
+
 audittrail_rule()
 
 
@@ -378,61 +570,12 @@
     _description = "Log Line"
     _order = 'timestamp asc'
 
-    def _get_name_line(self, cr, uid, ids, field_name, args, context=None):
-        '''
-        Return the value of the field set in the rule
-        '''
-        res = {}
-
-        for line in self.browse(cr, uid, ids, context=context):
-            if not line.rule_id or not line.fct_res_id or not line.fct_object_id:
-                res[line.id] = False
-            else:
-                field = line.rule_id.name_get_field_id.name
-                res_id = line.fct_res_id
-                object_id = self.pool.get(line.fct_object_id.model)
-                try:
-                    res[line.id] = object_id.read(cr, uid, res_id, [field], context=context)[field]
-                except TypeError:
-                    res[line.id] = False
-
-        return res
-
-    ####
-    # TODO : To validate
-    ####
-    def _search_name_line(self, cr, uid, obj, name, args, context=None):
-        '''
-        Returns all lines corresponding to the args
-        '''
-        ids = []
-
-        if not context:
-            return []
-
-        for arg in args:
-            if not arg[2]:
-                return []
-            if arg[0] == 'sub_obj_name' and arg[1] == 'ilike' and arg[2]:
-                line_ids = self.browse(cr, uid, context.get('active_ids'), context=context)
-                for line in line_ids:
-                    if line.rule_id and line.fct_res_id and line.fct_object_id:
-                        field = line.rule_id.name_get_field_id.name
-                        res_id = line.fct_res_id
-                        object_id = self.pool.get(line.fct_object_id.model)
-                        if str(object_id.read(cr, uid, res_id, [field], context=context)[field]) == arg[2]:
-                            ids.append(line.id)
-                
-                return [('id', 'in', ids)]
-
-        return []
-    
     def _get_values(self, cr, uid, ids, field_name, arg, context=None):
         '''
         Return the value of the field according to his type
         '''
         res = {}
-        
+
         for line in self.browse(cr, uid, ids, context=context):
             res[line.id] = {'old_value_fct': False, 'new_value_fct': False}
             if not line.old_value_text:
@@ -443,14 +586,14 @@
                 res[line.id]['new_value_fct'] = get_value_text(self, cr, uid, line.field_id.id, False, line.new_value, line.fct_object_id or line.object_id, context=context)
             else:
                 res[line.id]['new_value_fct'] = line.new_value_text
-                
+
             if not line.old_value_text and not line.new_value_text:
                 self.write(cr, uid, [line.id], {'old_value_text': res[line.id]['old_value_fct'], 'new_value_text': res[line.id]['new_value_fct']})
             elif not line.old_value_text:
-                self.write(cr, uid, [line.id], {'old_value_text': res[line.id]['old_value_fct'],})
+                self.write(cr, uid, [line.id], {'old_value_text': res[line.id]['old_value_fct'], })
             elif not line.new_value_text:
-                self.write(cr, uid, [line.id], {'new_value_text': res[line.id]['new_value_fct'],})
-        
+                self.write(cr, uid, [line.id], {'new_value_text': res[line.id]['new_value_fct'], })
+
         return res
 
     def _get_field_name(self, cr, uid, ids, field_name, arg, context=None):
@@ -511,7 +654,7 @@
 
         for arg in args:
             if arg[0] == 'trans_field_description':
-                tr_fields = tr_obj.search(cr, uid, [('lang', '=', lang), 
+                tr_fields = tr_obj.search(cr, uid, [('lang', '=', lang),
                                                     ('type', 'in', ['field', 'model']),
                                                     ('value', arg[1], arg[2])], context=context)
 
@@ -542,27 +685,15 @@
           'field_description': fields.char('Field Description', size=64),
           'trans_field_description': fields.function(_get_field_name, fnct_search=_src_field_name, method=True, type='char', size=64, string='Field Description', store=False),
           'sub_obj_name': fields.char(size=64, string='Order line'),
-#          'sub_obj_name': fields.function(fnct=_get_name_line, fnct_search=_search_name_line, method=True, type='char', string='Order line', store=False),
           # These 3 fields allows the computation of the name of the subobject (sub_obj_name)
           'rule_id': fields.many2one('audittrail.rule', string='Rule'),
           'fct_res_id': fields.integer(string='Res. Id'),
           'fct_object_id': fields.many2one('ir.model', string='Fct. Object'),
         }
 
-    def fields_view_get(self, cr, uid, view_id=None, view_type='form', context=None, toolbar=False, submenu=False):
-        '''
-        Display the name of the resource on the tree view
-        '''
-        res = super(osv.osv, self).fields_view_get(cr, uid, view_id, view_type, context=context, toolbar=toolbar, submenu=submenu)
-        # TODO: Waiting OEB-86 
-#        if view_type == 'tree' and context.get('active_ids') and context.get('active_model'):
-#            element_name = self.pool.get(context.get('active_model')).name_get(cr, uid, context.get('active_ids'), context=context)[0][1]
-#            xml_view = etree.fromstring(res['arch'])
-#            for element in xml_view.iter("tree"):
-#                element.set('string', element_name)
-#            res['arch'] = etree.tostring(xml_view)
-        return res
-
+    _defaults = {
+        'timestamp': lambda *a: time.strftime('%Y-%m-%d %H:%M:%S'),
+    }
     def _get_report_name(self, cr, uid, ids, context=None):
         if isinstance(ids, (int, long)):
             ids = [ids]
@@ -574,11 +705,18 @@
             if obj:
                 name_get = obj.name_get(cr, uid, [self_info.res_id])
                 if name_get and name_get[0]:
-                    name = name_get[0][1].replace('/','_')
+                    name = name_get[0][1].replace('/', '_')
         return "LL_%s_%s" % (name, time.strftime('%Y%m%d'))
 
 audittrail_log_line()
 
+class ir_model_fields(osv.osv):
+    _name = 'ir.model.fields'
+    _inherit = 'ir.model.fields'
+    _columns = {
+        'audittrail_rule_ids': fields.many2many('audittrail.rule', 'audit_rule_field_rel', 'field_id', 'rule_id', string='Audit rules'),
+    }
+ir_model_fields()
 
 def get_value_text(self, cr, uid, field_id, field_name, values, model, context=None):
     """
@@ -593,7 +731,7 @@
     """
     if not context:
         context = {}
-    if field_name in('__last_update','id'):
+    if field_name in('__last_update', 'id'):
         return values
     pool = pooler.get_pool(cr.dbname)
     field_pool = pool.get('ir.model.fields')
@@ -624,7 +762,7 @@
                     res = relation_model_object[relation_model_pool._rec_name]
             return res
 
-        elif field['ttype'] in ('many2many','one2many'):
+        elif field['ttype'] in ('many2many', 'one2many'):
             res = []
             if values and values != '[]':
                 values = values[1:-1].split(',')
@@ -644,7 +782,6 @@
             if values:
                 # Display only the date on log line (Comment the next line and uncomment the next one if you want display the time)
                 date_format = self.pool.get('date.tools').get_date_format(cr, uid, context=context)
-                #date_format = self.pool.get('date.tools').get_datetime_format(cr, uid, context=context)
                 try:
                     res = datetime.strptime(values, '%Y-%m-%d %H:%M:%S')
                 except ValueError:
@@ -660,532 +797,19 @@
                 res = dict(sel[field['name']]['selection']).get(values)
                 name = '%s,%s' % (fct_object, field['name'])
                 # Search translation
-                res_tr_ids = self.pool.get('ir.translation').search(cr, uid, [('type', '=', 'selection'), ('name', '=', name),('src', 'in', [values])])
+                res_tr_ids = self.pool.get('ir.translation').search(cr, uid, [('type', '=', 'selection'), ('name', '=', name), ('src', 'in', [values])])
                 if res_tr_ids:
                     res = self.pool.get('ir.translation').read(cr, uid, res_tr_ids, ['value'])[0]['value']
             return res
 
     return values
 
-def create_log_line(self, cr, uid, model, lines=[]):
-    """
-    Creates lines for changed fields with its old and new values
-
-    @param cr: the current row, from the database cursor,
-    @param uid: the current user’s ID for security checks,
-    @param model: Object who's values are being changed
-    @param lines: List of values for line is to be created
-    """
-    pool = pooler.get_pool(cr.dbname)
-    obj_pool = pool.get(model.model)
-    model_pool = pool.get('ir.model')
-    field_pool = pool.get('ir.model.fields')
-    log_line_pool = pool.get('audittrail.log.line')
-    #start Loop
-    for line in lines:
-        dict_of_values = {}
-        if line['name'] in('__last_update','id'):
-            continue
-        if obj_pool._inherits:
-            inherits_ids = model_pool.search(cr, uid, [('model', '=', obj_pool._inherits.keys()[0])])
-            field_ids = field_pool.search(cr, uid, [('name', '=', line['name']), ('model_id', 'in', (model.id, inherits_ids[0]))])
-        else:
-            field_ids = field_pool.search(cr, uid, [('name', '=', line['name']), ('model_id', '=', model.id)])
-        field_id = field_ids and field_ids[0] or False
-
-        if field_id:
-            field = field_pool.read(cr, uid, field_id)
-            if field['ttype'] == 'selection':
-                # if we have a fields.selection, we want to evaluate the 2nd part of the tuple which is user readable
-                try:
-                    dict_of_values = dict(self.pool.get(field['model'])._columns[line['name']].selection)
-                except TypeError as e:
-                    logging.getLogger('Track changes').warning("""Can\'t track changes for the field %s of the model %s. Error is %s"""
-                                                            % (line['name'], model.name, e))
-
-        # Get the values
-        old_value = line.get('old_value')
-        new_value = line.get('new_value')
-        method = line.get('method')
-        
-#        if old_value == new_value and method not in ('create', 'unlink'):
-#            continue
-        # the check below is for the case where we have empty fields but with different types (i.e. transport_type that was comparing a unicode and a boolean)
-        if not old_value:
-            old_value = False
-        if not new_value:
-            new_value = False
-        if new_value == old_value:
-            continue  # nothing has changed, nothing to log
-        
-        # for the many2one field, we compare old_value and new_value with the name (uf_1624), so the 2nd part of the tupe (old_value[1] == new_value[1])
-        if method not in ('create', 'unlink') and (old_value == new_value \
-           or (field['ttype'] == 'datetime' and old_value and new_value and old_value[:10] == new_value[:10])\
-           or (field['ttype'] == 'many2one' and old_value and new_value and old_value[1] == new_value[1])\
-           or (field['ttype'] == 'selection' and old_value and new_value and dict_of_values.get(old_value) == dict_of_values.get(new_value))):
-             continue
-
-        res_id = line.get('res_id')
-        name = line.get('name', '')
-        object_id = line.get('object_id')
-        user_id = line.get('user_id')
-        timestamp = line.get('timestamp', time.strftime('%Y-%m-%d %H:%M:%S'))
-        log = line.get('log')
-        field_description = line.get('field_description', '')
-        sub_obj_name = line.get('sub_obj_name', '')
-        rule_id = line.get('rule_id')
-        fct_res_id = line.get('fct_res_id')
-        fct_object_id = line.get('fct_object_id')
-
-        if res_id:
-            # Get the log number
-            seq_object_id = object_id
-            seq_res_id = res_id
-            fct_object = self.pool.get('ir.model').browse(cr, uid, seq_object_id)
-            log_sequence = self.pool.get('audittrail.log.sequence').search(cr, uid, [('model', '=', fct_object.model), ('res_id', '=', seq_res_id)])
-            if log_sequence:
-                log_seq = self.pool.get('audittrail.log.sequence').browse(cr, uid, log_sequence[0]).sequence
-                log = log_seq.get_id(code_or_id='id')
-            else:
-                # Create a new sequence
-                seq_pool = self.pool.get('ir.sequence')
-                seq_typ_pool = self.pool.get('ir.sequence.type')
-                types = {
-                    'name': fct_object.name,
-                    'code': fct_object.model,
-                }
-                seq_typ_pool.create(cr, uid, types)
-                seq = {
-                    'name': fct_object.name,
-                    'code': fct_object.model,
-                    'prefix': '',
-                    'padding': 1,
-                }
-                seq_id = seq_pool.create(cr, uid, seq)
-                self.pool.get('audittrail.log.sequence').create(cr, uid, {'model': fct_object.model, 'res_id': seq_res_id, 'sequence': seq_id})
-                log = self.pool.get('ir.sequence').browse(cr, uid, seq_id).get_id(code_or_id='id')
-
-
-        if field_id:
-            field_description = field['field_description']
-            if field_description == 'Pricelist':
-                field_description = 'Currency'
-
-#            if field['ttype'] == 'many2one':
-#                if type(old_value) == tuple:
-#                    old_value = old_value[0]
-#                if type(new_value) == tuple:
-#                    new_value = new_value[0]
-
-
-        vals = {
-                "field_id": field_id,
-                "old_value": old_value or '',
-                "new_value": new_value or '',
-                "field_description": field_description,
-                "res_id": res_id,
-                "name": name,
-                "object_id": object_id,
-                "user_id": user_id,
-                "method": method,
-                "timestamp": timestamp,
-                "log": log,
-                "rule_id": rule_id,
-                "fct_res_id": fct_res_id,
-                "fct_object_id": fct_object_id,
-                "sub_obj_name": sub_obj_name,
-                }
-        log_line_pool.create(cr, uid, vals)
-    #End Loop
-    return True
-
-def _get_domain_fields(self, domain=[]):
-    '''
-    Returns fields to read from the domain
-    '''    
-    ret_f = []
-    for d in domain:
-        ret_f.append(d[0])
-       
-    return ret_f
-
-def _check_domain(self, cr, uid, vals=[], domain=[], model=False, res_id=False):
-    '''
-    Check if the values check with the domain
-    '''
-    res = True
-    pool = pooler.get_pool(cr.dbname)
-    for d in tuple(domain):
-        assert d[1] in ('=', '!=', 'in', 'not in'), _("'%s' Not comprehensive operator... Please use only '=', '!=', 'in' and 'not in' operators") %(d[1])
-            
-        if len(d[0].split('.')) == 2 and model:
-            p_rel, p_field = d[0].split('.')
-            parent_field_id = pool.get('ir.model.fields').search(cr, uid, [('model', '=', model.model), ('name', '=', p_rel)])
-            parent_field = pool.get('ir.model.fields').browse(cr, uid, parent_field_id)
-            if not vals.get(p_rel) and res_id:
-                vals[d[0]] = self.pool.get(model.model).read(cr, uid, res_id, [p_rel])[p_rel]
-            if parent_field and parent_field[0].relation and vals.get(p_rel):
-                if isinstance(vals[p_rel], (int, long)):
-                    p_rel_id = vals[p_rel]
-                else:
-                    p_rel_id = vals[p_rel][0] 
-                value = pool.get(parent_field[0].relation).read(cr, uid, p_rel_id, [p_field])
-                if value:
-                    d = (p_field, d[1], d[2])
-                    vals[p_field] = value[p_field]
-        
-        if d[0] not in vals and model and res_id:
-            obj = self.pool.get(model.model).read(cr, uid, res_id, [d[0]])
-            vals[d[0]] = obj[d[0]]
-        
-        if d[1] == '=' and vals[d[0]] != d[2]:
-            res = False
-        elif d[1] == '!=' and vals[d[0]] == d[2]:
-            res = False
-        elif d[1] == 'in' and vals[d[0]] not in d[2]:
-            res = False
-        elif d[1] == 'not in' and vals[d[0]] in d[2]:
-            res = False
-            
-    return res
-
 def get_field_description(model):
     """
     Redefine the field_description for sale order and sale order line
     """
-    if model.model == 'sale.order':
-        field_description = 'Field Order'
-    elif model.model == 'sale.order.line':
-        field_description = 'Field Order Line'
-    elif model.model== 'stock.picking':
-        field_description = 'Incoming Shipment'
-    else:
-        field_description = model.name
-    return field_description
-
-def log_fct(self, cr, uid, model, method, fct_src, fields_to_trace=None, rule_id=False, parent_field_id=False, name_get_field='name', domain='[]', *args, **kwargs):
-    """
-    Logging function: This function is performs logging operations according to method
-    @param cr: the current database
-    @param uid: the current user’s ID for security checks,
-    @param model: Object who's values are being changed
-    @param method: method to log: create, read, write, unlink
-    @param fct_src: execute method of Object proxy
-
-    @return: Returns result as per method of Object proxy
-    """
-    if not fields_to_trace:
-        fields_to_trace = []
-    uid_orig = uid
-    uid = 1
-    pool = pooler.get_pool(cr.dbname)
-    resource_pool = pool.get(model)
-    model_pool = pool.get('ir.model')
-
-    model_ids = model_pool.search(cr, uid, [('model', '=', model)])
-    model_id = model_ids and model_ids[0] or False
-    assert model_id, _("'%s' Model does not exist...") %(model,)
-    model = model_pool.browse(cr, uid, model_id)
-    domain = eval(domain)
-    fields_to_read = ['id']
-
-    old_values = {}
-    if method in ('create'):
-        res_id = fct_src(self, *args, **kwargs)
-        
-        # If the object doesn't match with the domain
-        if domain and not _check_domain(self, cr, uid, args[2], domain, model, res_id):
-            return res_id
-        
-        model_id = model.id
-        model_name = model.name
-        # If we are on the children object, escalate to the parent log
-        if parent_field_id:
-            parent_field = pool.get('ir.model.fields').browse(cr, uid, parent_field_id)
-            model_id = model_pool.search(cr, uid, [('model', '=', parent_field.relation)])
-            if not model_id or not args[2].get(parent_field.name, False):
-                return res_id
-            else:
-                model_id = model_id[0]
-            model_name = parent_field.model_id.name
-            resource = resource_pool.read(cr, uid, res_id, [parent_field.name, name_get_field or 'name'])
-            res_id2 = resource[parent_field.name][0]
-        else:
-            res_id2 = res_id
-        
-        vals = {
-                "name": '%s' %model.name,
-                "method": method,
-                "object_id": model_id,
-                "user_id": uid_orig,
-                "res_id": res_id2,
-                "field_description": get_field_description(model),
-        }
-
-        # Add the name of the created sub-object
-        if parent_field_id:
-            vals.update({'sub_obj_name': resource[name_get_field or 'name'],
-                         'rule_id': rule_id,
-                         'fct_object_id': model.id,
-                         'fct_res_id': res_id})
-
-        # We create only one line on creation (not one line by field)
-        create_log_line(self, cr, uid, model, [vals])
-
-        # Get new values
-        if res_id and fields_to_trace:
-            resource = resource_pool.read(cr, uid, res_id, fields_to_trace)
-            if 'id' in resource:
-                del resource['id']
-
-            # now we create one line for each field tracked
-            lines = []
-            for field in resource.keys():
-                line = vals.copy()
-                line.update({
-                      'name': field,
-                      'new_value': resource[field],
-                      })
-                lines.append(line)
-
-            create_log_line(self, cr, uid, model, lines)
-
-        return res_id
-
-    elif method in ('unlink'):
-        res_ids = []
-        if isinstance(args[2], (int, long)):
-            res_ids = [args[2]]
-        else:
-            res_ids = list(args[2])
-        model_name = model.name
-        model_id = model.id
-        fields_to_read = [name_get_field, 'name']
-        fields_to_read.extend(_get_domain_fields(self, domain))
-        
-        if parent_field_id:
-            parent_field = pool.get('ir.model.fields').browse(cr, uid, parent_field_id)
-            model_id = model_pool.search(cr, uid, [('model', '=', parent_field.relation)])
-            # If the parent object is not a valid object
-            if not model_id:
-                return fct_src(self, *args, **kwargs)
-            else:
-                model_id = model_id[0]
-            model_name = parent_field.model_id.name
-        
-        for res_id in res_ids:
-            old_values[res_id] = resource_pool.read(cr, uid, res_id, fields_to_read)
-            # If the object doesn't match with the domain
-            if domain and not _check_domain(self, cr, uid, old_values[res_id], domain, model, res_id):
-                res_ids.pop(res_ids.index(res_id))
-                continue
-            if model_name == 'Sales Order':
-                model_name = 'Field Order'
-            elif model_name == 'Sales Order Line':
-                model_name = 'Field Order Line'
-            elif model_name == 'Picking List':
-                model_name = 'Incoming Shipment'
-            vals = {
-                "name": "%s" %model_name,
-                "method": method,
-                "object_id": model_id,
-                "user_id": uid_orig,
-                "field_description": model_name,
-            }
-
-            if not parent_field_id:
-                vals.update({'res_id': res_id})
-            else:
-                ressource = resource_pool.read(cr, uid, res_id, [parent_field.name, name_get_field or 'name'])
-                res_id = ressource[parent_field.name]
-                # Add the name of the created sub-object
-                if res_id:
-                    res_id = res_id[0]
-                else:
-                    continue
-                vals = {
-                        "name": "%s" %model_name,
-                        "sub_obj_name": "%s" %ressource.get(name_get_field or 'name', ''),
-                        "method": method,
-                        "object_id": model_id,
-                        "user_id": uid_orig,
-                        "res_id": res_id,  
-                        "field_description": model_name,
-                        }
-
-            # We create only one line when deleting a record
-            create_log_line(self, cr, uid, model, [vals])
-        res = fct_src(self, *args, **kwargs)
-        return res
-    else: 
-        res_ids = []
-        res = True
-        fields = []
-        if args:
-            if isinstance(args[2], (long, int)):
-                res_ids = [args[2]]
-            else:
-                res_ids = list(args[2])
-            if len(args)>3 and type(args[3]) == dict:
-                fields.extend(list(set(args[3]) & set(fields_to_trace)))
-            # we take below the fields.function that were ignored
-            fields_obj = self.pool.get('ir.model.fields')
-            fields_to_trace_ids = fields_obj.search(cr, uid, [('name', 'in', fields_to_trace), ('model_id', '=', model_id)])
-            for fields_value in fields_obj.read(cr, uid, fields_to_trace_ids, ['is_function', 'name']):
-                if fields_value['is_function']:
-                    fields.append(fields_value['name'])
-                
-        model_id = model.id
-
-        # if no change on traced fields, variable fields is empty: so nothing to do.
-        if fields:
-            if parent_field_id:
-                parent_field = pool.get('ir.model.fields').browse(cr, uid, parent_field_id)
-                model_id = model_pool.search(cr, uid, [('model', '=', parent_field.relation)])
-                # If the parent object is not a valid object
-                if not model_id:
-                    return res
-                else:
-                    model_id = model_id[0]
-                    
-                if parent_field.name not in fields:
-                    fields.append(parent_field.name)
-                
-            fields.extend(_get_domain_fields(self, domain))
-            # Remove double entries
-            fields = list(set(fields))
-            if name_get_field not in fields:
-                fields.append(name_get_field)
-
-            # Get old values
-            if res_ids:
-                for resource in resource_pool.read(cr, uid, res_ids, fields):
-                    if parent_field_id and not args[3].get(parent_field.name, resource[parent_field.name]):
-                        continue
-                    if domain and not _check_domain(self, cr, uid, resource, domain, model):
-                        res_ids.pop(res_ids.index(resource['id']))
-                        continue
-                    
-                    resource_id = resource['id']
-                    if 'id' in resource:
-                        del resource['id']
-                        
-                    old_value = resource.copy()
-#                for field in resource.keys():
-#                    old_value = resource.copy()
-                    
-                    old_values[resource_id] = {'value': old_value}
-
-        # Run the method on object
-        res = fct_src(self, *args, **kwargs)
-
-        # Get new values
-        if fields and res_ids:
-            for resource in resource_pool.read(cr, uid, res_ids, fields):
-                if parent_field_id and not args[3].get(parent_field.name, resource[parent_field.name]):
-                    continue
-                res_id = resource['id']
-                res_id2 = parent_field_id and resource[parent_field.name][0] or res_id
-                if 'id' in resource:
-                    del resource['id']
-
-                vals = {
-                    "method": method,
-                    "object_id": model_id,
-                    "user_id": uid_orig,
-                    "res_id": res_id2,
-                }
-                if 'name' in resource:
-                    vals.update({'name': resource['name']})
-
-                # Add the name of the created sub-object
-                if parent_field_id:
-                    vals.update({'sub_obj_name': resource[name_get_field],
-                                 'rule_id': rule_id,
-                                 'fct_object_id': model.id,
-                                 'fct_res_id': res_id})
-
-                lines = []
-                for field in resource.keys():
-                    line = vals.copy()
-                    line.update({
-                          'name': field,
-                          'new_value': resource[field],
-                          'old_value': old_values[res_id]['value'][field],
-                          })
-                    lines.append(line)
-
-                create_log_line(self, cr, uid, model, lines)
-        return res
-    return True
-
-
-#########################################################################
-#                                                                       #
-# OVERRIDE OSV METHODS (only create, write and unlink for the moment)   #
-#                                                                       #
-#########################################################################
-
-_old_create = orm.orm.create
-_old_write = orm.orm.write
-_old_unlink = orm.orm.unlink
-
-def _audittrail_osv_method(self, old_method, method_name, cr, *args, **kwargs):
-    """ General wrapper for osv methods """
-    # If the object is not marked as traced object, just return the normal method
-    if not self._trace:
-        return old_method(self, *args, **kwargs)
-
-    # If the object is traceable
-    uid_orig = args[1]
-    model = self._name
-    pool = pooler.get_pool(cr.dbname)
-    model_pool = pool.get('ir.model')
-    rule_pool = pool.get('audittrail.rule')
-
-    def my_fct(cr, uid, model, method, *args, **kwargs):
-        rule = False
-        model_ids = model_pool.search(cr, uid, [('model', '=', model)])
-        model_id = model_ids and model_ids[0] or False
-
-        if not model_id:
-            return old_method(self, *args, **kwargs)
-
-        if 'audittrail.rule' in pool.obj_list():
-            rule = True
-
-        if not rule:
-            return old_method(self, *args, **kwargs)
-
-        rule_ids = rule_pool.search(cr, uid, [('object_id', '=', model_id)])
-        if not rule_ids:
-            return old_method(self, *args, **kwargs)
-
-        for thisrule in rule_pool.browse(cr, uid, rule_ids):
-            # if the rule for the right method, then go inside and do the track change log
-            if getattr(thisrule, 'log_' + method_name):
-                fields_to_trace = [(field.name) for field in thisrule.field_ids]
-                return log_fct(self, cr, uid_orig, model, method, old_method, fields_to_trace, thisrule.id, thisrule.parent_field_id.id, thisrule.name_get_field_id.name, thisrule.domain_filter, *args, **kwargs)
-        
-        return old_method(self, *args, **kwargs)
-    res = my_fct(cr, uid_orig, model, method_name, *args, **kwargs)
-    return res
-
-
-def _audittrail_create(self, *args, **kwargs):
-    """ Wrapper to trace the osv.create method """
-    return _audittrail_osv_method(self, _old_create, 'create', args[0], *args, **kwargs)
-
-def _audittrail_write(self, *args, **kwargs):
-    """ Wrapper to trace the osv.write method """
-    return _audittrail_osv_method(self, _old_write, 'write', args[0], *args, **kwargs)
-
-def _audittrail_unlink(self, *args, **kwargs):
-    """ Wrapper to trace the osv.unlink method """
-    return _audittrail_osv_method(self, _old_unlink, 'unlink', args[0], *args, **kwargs)
-
-orm.orm.create = _audittrail_create
-orm.orm.write = _audittrail_write
-orm.orm.unlink = _audittrail_unlink
+    if model.model == 'stock.picking':
+        return 'Incoming Shipment'
+    return model.name
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== modified file 'msf_budget/__openerp__.py'
--- msf_budget/__openerp__.py	2012-07-25 11:49:04 +0000
+++ msf_budget/__openerp__.py	2014-03-21 08:49:45 +0000
@@ -31,12 +31,14 @@
     'init_xml': [],
     'update_xml': [
         'security/ir.model.access.csv',
+        'msf_budget_sequence.xml',
         'msf_budget_report.xml',
         'msf_budget_view.xml',
         'msf_budget_workflow.xml',
         'data/msf_budget_decision_moment_data.xml',
         'wizard/wizard_budget_criteria_export_view.xml',
         'wizard/wizard_actual_export_view.xml',
+        'wizard/wizard_budget_summary.xml',
     ],
     'test': [
         'test/budget_test.yml'

=== modified file 'msf_budget/analytic.py'
--- msf_budget/analytic.py	2013-05-02 14:38:30 +0000
+++ msf_budget/analytic.py	2014-03-21 08:49:45 +0000
@@ -22,7 +22,6 @@
 ##############################################################################
 
 from osv import osv
-from osv import fields
 from tools.translate import _
 
 class account_analytic_line(osv.osv):
@@ -41,7 +40,7 @@
                 else:
                     # Line without domain (consumption, overhead)
                     raise osv.except_osv(_('No Analytic Domain !'),_("This budget does not have an analytic domain!"))
-                    
+
         return super(account_analytic_line, self).search(cr, uid, args, offset, limit, order, context=context, count=count)
 account_analytic_line()
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== modified file 'msf_budget/msf_budget.py'
--- msf_budget/msf_budget.py	2014-02-11 08:32:47 +0000
+++ msf_budget/msf_budget.py	2014-03-21 08:49:45 +0000
@@ -28,19 +28,40 @@
     _name = "msf.budget"
     _description = 'MSF Budget'
     _trace = True
-    
+
     def _get_total_budget_amounts(self, cr, uid, ids, field_names=None, arg=None, context=None):
         res = {}
-        
-        for budget in self.browse(cr, uid, ids, context=context):
-            total_amounts = self.pool.get('msf.budget.line')._get_total_amounts(cr, uid, [x.id for x in budget.budget_line_ids], context=context)
-            
-            budget_amount = 0.0
-            for budget_line in budget.budget_line_ids:
-                if not budget_line.parent_id:
-                    res[budget.id] = total_amounts[budget_line.id]['budget_amount']
-                    break
-        
+        sql = """
+        SELECT expense.budget_id, COALESCE(expense.total, 0.0) - COALESCE(income.total, 0.0) AS diff
+        FROM (
+            SELECT budget_id, SUM(COALESCE(month1 + month2 + month3 + month4 + month5 + month6 + month7 + month8 + month9 + month10 + month11 + month12, 0.0)) AS total
+            FROM msf_budget_line AS l, account_account AS a, account_account_type AS t
+            WHERE budget_id IN %s
+            AND l.account_id = a.id
+            AND a.user_type = t.id
+            AND t.code = 'expense'
+            AND a.type != 'view'
+            AND l.line_type = 'destination'
+            GROUP BY budget_id
+        ) AS expense
+        LEFT JOIN (
+            SELECT budget_id, SUM(COALESCE(month1 + month2 + month3 + month4 + month5 + month6 + month7 + month8 + month9 + month10 + month11 + month12, 0.0)) AS total
+            FROM msf_budget_line AS l, account_account AS a, account_account_type AS t
+            WHERE budget_id IN %s
+            AND l.account_id = a.id
+            AND a.user_type = t.id
+            AND t.code = 'income'
+            AND a.type != 'view'
+            AND l.line_type = 'destination'
+            GROUP BY budget_id
+        ) AS income ON expense.budget_id = income.budget_id"""
+        cr.execute(sql, (tuple(ids),tuple(ids),))
+        tmp_res = cr.fetchall()
+        if not tmp_res:
+            return res
+        for b_id in ids:
+            res.setdefault(b_id, 0.0)
+        res.update(dict(tmp_res))
         return res
 
     def _get_instance_type(self, cr, uid, ids, field_names=None, arg=None, context=None):
@@ -93,84 +114,217 @@
         'decision_moment_order': fields.related('decision_moment_id', 'order', string="Decision Moment Order", readonly=True, store=True, type="integer"),
         'version': fields.integer('Version'),
         'currency_id': fields.many2one('res.currency', 'Currency', required=True),
-        'display_type': fields.selection([('all', 'Accounts and destinations'),
-                                          ('expense', 'Accounts only'),
-                                          ('view', 'Parent accounts only')], string="Display type"),
         'type': fields.selection([('normal', 'Normal'), ('view', 'View')], string="Budget type"),
         'total_budget_amount': fields.function(_get_total_budget_amounts, method=True, store=False, string="Total Budget Amount", type="float", readonly=True),
         'instance_type': fields.function(_get_instance_type, fnct_search=_search_instance_type, method=True, store=False, string='Instance type', type='selection', selection=[('section', 'HQ'), ('coordo', 'Coordo'), ('project', 'Project')], readonly=True),
     }
-    
+
     _defaults = {
         'currency_id': lambda self,cr,uid,c: self.pool.get('res.users').browse(cr, uid, uid, c).company_id.currency_id.id,
         'state': 'draft',
-        'display_type': 'all',
         'type': 'normal',
     }
 
     _order = 'decision_moment_order desc, version, code'
-    
+
+    def _check_parent(self, cr, uid, vals, context=None):
+        """
+        Check budget's parent to see if it exist.
+        Create it if we're on another instance that top cost center one.
+        Note: context can contains a list of budget lines. This permit to avoid problem of budget line template time consuming.
+        We hope the copy() will take less time than the creation of an entire budget template.
+        """
+        # Some checks
+        if context is None:
+            context = {}
+        # Prepare some values
+        top_cost_center = self.pool.get('res.users').browse(cr, uid, uid).company_id.instance_id.top_cost_center_id
+        ana_obj = self.pool.get('account.analytic.account')
+        fy_obj = self.pool.get('account.fiscalyear')
+        tool_obj = self.pool.get('msf.budget.tools')
+        # Fetch cost center info (id and parent)
+        cc_id = vals.get('cost_center_id', False)
+        cc = ana_obj.read(cr, uid, cc_id, ['parent_id'], context=context)
+        parent_id = cc.get('parent_id', False) and cc.get('parent_id')[0] or False
+        # Fetch fiscalyear info
+        fy_id = vals.get('fiscalyear_id', False)
+        fy = fy_obj.read(cr, uid, fy_id, ['code'])
+        # Fetch decision moment id
+        decision_moment_id = vals.get('decision_moment_id', False)
+
+        # Check that no parent cost center exists for the given values
+        if cc_id and cc_id != top_cost_center.id and parent_id:
+            parent_cost_center = ana_obj.read(cr, uid, parent_id, ['code', 'name'], context=context)
+            have_parent_budget = self.search(cr, uid, [('fiscalyear_id', '=', fy_id), ('cost_center_id', '=', parent_id), ('decision_moment_id', '=', decision_moment_id)], count=1, context=context)
+            if have_parent_budget == 0:
+                # Create budget's parent
+                budget_vals = {
+                    'name': "Budget " + fy.get('code', '')[4:6] + " - " + parent_cost_center.get('name', ''),
+                    'code': "BU" + fy.get('code')[4:6] + " - " + parent_cost_center.get('code', ''),
+                    'fiscalyear_id': fy_id,
+                    'cost_center_id': parent_id,
+                    'decision_moment_id': decision_moment_id,
+                    'type': 'view'
+                }
+                parent_budget_id = self.create(cr, uid, budget_vals, context=context)
+                # Create budget's line.
+                tool_obj.create_budget_lines(cr, uid, parent_budget_id, context=context)
+                # Validate this parent
+                self.write(cr, uid, [parent_budget_id], {'state': 'valid'}, context=context)
+        return True
+
     def create(self, cr, uid, vals, context=None):
+        """
+        Create a budget then check its parent.
+        """
         res = super(msf_budget, self).create(cr, uid, vals, context=context)
-        # If the "parent" budget does not exist and we're not on the proprietary instance level already, create it.
-        budget = self.browse(cr, uid, res, context=context)
-        prop_instance = self.pool.get('res.users').browse(cr, uid, uid).company_id.instance_id
-        if prop_instance.top_cost_center_id and budget.cost_center_id and budget.cost_center_id.id != prop_instance.top_cost_center_id.id and budget.cost_center_id.parent_id:
-            parent_cost_center = budget.cost_center_id.parent_id
-            parent_budget_ids = self.search(cr,
-                                            uid,
-                                            [('fiscalyear_id','=',budget.fiscalyear_id.id),
-                                             ('cost_center_id','=',parent_cost_center.id),
-                                             ('decision_moment_id','=',budget.decision_moment_id.id)])
-            if len(parent_budget_ids) == 0:
-                parent_budget_id = self.create(cr,
-                                               uid,
-                                               {'name': "Budget " + budget.fiscalyear_id.code[4:6] + " - " + parent_cost_center.name,
-                                                'code': "BU" + budget.fiscalyear_id.code[4:6] + " - " + parent_cost_center.code,
-                                                'fiscalyear_id': budget.fiscalyear_id.id,
-                                                'cost_center_id': budget.cost_center_id.parent_id.id,
-                                                'decision_moment_id': budget.decision_moment_id.id,
-                                                'type': 'view'}, context=context)
-                # Create all lines for all accounts/destinations (no budget values, those are retrieved)
-                expense_account_ids = self.pool.get('account.account').search(cr, uid, [('is_analytic_addicted', '=', True),
-                                                                                        ('user_type_report_type', '!=', 'none'),
-                                                                                        ('type', '!=', 'view')], context=context)
-                destination_obj = self.pool.get('account.destination.link')
-                destination_link_ids = destination_obj.search(cr, uid, [('account_id', 'in',  expense_account_ids)], context=context)
-                account_destination_ids = [(dest.account_id.id, dest.destination_id.id)
-                                           for dest
-                                           in destination_obj.browse(cr, uid, destination_link_ids, context=context)]
-                for account_id, destination_id in account_destination_ids:
-                    budget_line_vals = {'budget_id': parent_budget_id,
-                                        'account_id': account_id,
-                                        'destination_id': destination_id,
-                                        'line_type': 'destination'}
-                    self.pool.get('msf.budget.line').create(cr, uid, budget_line_vals, context=context)
-                # validate this parent
-                self.write(cr, uid, [parent_budget_id], {'state': 'valid'}, context=context)
-        return res
-    
-    # Methods for display view lines (warning, dirty, but it works)
+        # Check parent budget
+        self._check_parent(cr, uid, vals, context=context)
+        return res
+
+    def write(self, cr, uid, ids, vals, context=None):
+        """
+        Goal is to update parent budget regarding these criteria:
+          - context is synchronization
+          - state is in vals
+          - state is different from draft (validated or done)
+        """
+        if context is None:
+            context = {}
+        res = super(msf_budget, self).write(cr, uid, ids, vals, context=context)
+        if context.get('sync_update_execution', False) and vals.get('state', False) and vals.get('state') != 'draft':
+            # Update parent budget
+            self.update_parent_budgets(cr, uid, ids, context=context)
+        return res
+
+    def update(self, cr, uid, ids, context=None):
+        """
+        Update given budget. But only update view one.
+        """
+        # Some checks
+        if context is None:
+            context = {}
+        if isinstance(ids, (int, long)):
+            ids = [ids]
+        # Prepare some values
+        ana_obj = self.pool.get('account.analytic.account')
+        line_obj = self.pool.get('msf.budget.line')
+        sql = """
+            SELECT
+                SUM(COALESCE(month1, 0)),
+                SUM(COALESCE(month2, 0)),
+                SUM(COALESCE(month3, 0)),
+                SUM(COALESCE(month4, 0)),
+                SUM(COALESCE(month5, 0)),
+                SUM(COALESCE(month6, 0)),
+                SUM(COALESCE(month7, 0)),
+                SUM(COALESCE(month8, 0)),
+                SUM(COALESCE(month9, 0)),
+                SUM(COALESCE(month10, 0)),
+                SUM(COALESCE(month11, 0)),
+                SUM(COALESCE(month12, 0))
+            FROM msf_budget_line
+            WHERE id IN %s"""
+        # Filter budget to only update those that are view one
+        to_update = self.search(cr, uid, [('id', 'in', ids), ('type', '=', 'view')])
+        # Then update budget, one by one, line by line...
+        for budget in self.browse(cr, uid, to_update, context=context):
+            cost_center_id = budget.cost_center_id and budget.cost_center_id.id or False
+            if not cost_center_id:
+                raise osv.except_osv(_('Error'), _('Problem while reading Cost Center for the given budget: %s') % (budget.get('name', ''),))
+            child_cc_ids = ana_obj.search(cr, uid, [('parent_id', 'child_of', cost_center_id)])
+            budget_ids = []
+            # For each CC, search the last budget
+            for cc_id in child_cc_ids:
+                cc_args = [
+                    ('cost_center_id', '=', cc_id),
+                    ('type', '!=', 'view'),
+                    ('state', '!=', 'draft'),
+                    ('decision_moment_id', '=', budget.decision_moment_id.id)
+                ]
+                corresponding_budget_ids = self.search(cr, uid, cc_args, limit=1, order='version DESC')
+                if corresponding_budget_ids:
+                    budget_ids.append(corresponding_budget_ids)
+            # Browse each budget line to update it
+            for budget_line in budget.budget_line_ids:
+                line_vals = {
+                    'month1': 0.0,
+                    'month2': 0.0,
+                    'month3': 0.0,
+                    'month4': 0.0,
+                    'month5': 0.0,
+                    'month6': 0.0,
+                    'month7': 0.0,
+                    'month8': 0.0,
+                    'month9': 0.0,
+                    'month10': 0.0,
+                    'month11': 0.0,
+                    'month12': 0.0
+                }
+                # search all linked budget lines
+                args = [('budget_id', 'in', budget_ids), ('account_id', '=', budget_line.account_id.id)]
+                if budget_line.destination_id:
+                    args.append(('destination_id', '=', budget_line.destination_id.id))
+                child_line_ids = line_obj.search(cr, uid, args, context=context)
+                if child_line_ids:
+                    cr.execute(sql, (tuple(child_line_ids),))
+                    if cr.rowcount:
+                        tmp_res = cr.fetchall()
+                        res = tmp_res and tmp_res[0]
+                        if res:
+                            for x in xrange(1, 13, 1):
+                                try:
+                                    line_vals.update({'month'+str(x): res[x - 1]})
+                                except IndexError, error:
+                                    continue
+                line_obj.write(cr, uid, [budget_line.id], line_vals)
+        return True
+
+    def update_parent_budgets(self, cr, uid, ids, context=None):
+        """
+        Search all parent budget and update them.
+        """
+        # Some checks
+        if context is None:
+            context = {}
+        if isinstance(ids, (int, long)):
+            ids = [ids]
+        # We only need to update parent budgets.
+        # So we search all parent cost center (but only them, so we don't care about cost center that are linked to given budgets)
+        # Then we use these parent cost center to find budget to update (only budget lines)
+        budgets = self.read(cr, uid, ids, ['cost_center_id'])
+        cost_center_ids = [x.get('cost_center_id', False) and x.get('cost_center_id')[0] or 0 for x in budgets]
+        cc_parent_ids = self.pool.get('account.analytic.account')._get_parent_of(cr, uid, cost_center_ids, context=context)
+        parent_ids = [x for x in cc_parent_ids if x not in cost_center_ids]
+        to_update = self.search(cr, uid, [('cost_center_id', 'in', parent_ids)])
+        # Update budgets
+        self.update(cr, uid, to_update, context=context)
+        return True
+
     def button_display_type(self, cr, uid, ids, context=None, *args, **kwargs):
         """
-        Change display type
+        Just reset the budget view to give the context to the one2many_budget_lines object
         """
-        display_types = {}
-        for budget in self.read(cr, uid, ids, ['display_type']):
-            display_types[budget['id']] = budget['display_type']
-            
-        for budget_id in ids:
-            result = 'all'
-            if display_types[budget_id] == 'all':
-                result = 'expense'
-            elif display_types[budget_id] == 'expense':
-                result = 'view'
-            elif display_types[budget_id] == 'view':
-                result = 'all'
-            self.write(cr, uid, [budget_id], {'display_type': result}, context=context)
-        return True
-    
-    
+        if context is None:
+            context = {}
+        if isinstance(ids, (int, long)):
+            ids = [ids]
+        # do not erase the previous context!
+        context.update({
+            'active_id': ids[0],
+            'active_ids': ids,
+        })
+        return {
+            'name': _('Budgets'),
+            'type': 'ir.actions.act_window',
+            'res_model': 'msf.budget',
+            'target': 'crush',
+            'view_mode': 'form,tree',
+            'view_type': 'form',
+            'res_id': ids[0],
+            'context': context,
+        }
+
     def budget_summary_open_window(self, cr, uid, ids, context=None):
         budget_id = False
         if not ids:
@@ -190,7 +344,7 @@
             if isinstance(ids, (int, long)):
                 ids = [ids]
             budget_id = ids[0]
-            
+
         if budget_id:
             parent_line_id = self.pool.get('msf.budget.summary').create(cr,
                 uid, {'budget_id': budget_id}, context=context)
@@ -206,6 +360,27 @@
                        'context': context
                 }
         return {}
-        
+
+    def action_confirmed(self, cr, uid, ids, context=None):
+        """
+        At budget validation we should update all parent budgets.
+        To do this, each parent need to take all its validated children budget at the last version.
+        """
+        # Some checks
+        if context is None:
+            context = {}
+        if isinstance(ids, (int, long)):
+            ids = [ids]
+        # Only validate budget that are draft!
+        to_validate = []
+        for budget in self.read(cr, uid, ids, ['state']):
+            if budget.get('state', '') and budget.get('state') == 'draft':
+                to_validate.append(budget.get('id', 0))
+        # Change budget statuses. Important in order to include given budgets in their parents!
+        self.write(cr, uid, to_validate, {'state': 'valid'}, context=context)
+        # Update parent budget
+        self.update_parent_budgets(cr, uid, to_validate, context=context)
+        return True
+
 msf_budget()
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== modified file 'msf_budget/msf_budget_line.py'
--- msf_budget/msf_budget_line.py	2013-09-20 13:40:19 +0000
+++ msf_budget/msf_budget_line.py	2014-03-21 08:49:45 +0000
@@ -20,290 +20,54 @@
 ##############################################################################
 
 from osv import fields, osv
-import datetime
-from dateutil.relativedelta import relativedelta
 
-# Overloading the one2many.get for budget lines
-# (used for filtering budget lines in the form view;
-# dirty as f*ck, but hey, it works)
+# Overloading the one2many.get for budget lines to filter regarding context.
 class one2many_budget_lines(fields.one2many):
-    
+
     def get(self, cr, obj, ids, name, uid=None, offset=0, context=None, values=None):
+        """
+        Use 'granularity' value in context to filter budget lines.
+        If granularity is 'view', then display only budget line that have line_type = view
+        If 'expense', display budget lines that have line_type = view and normal
+        If 'all' display budget lines that are view, normal and destination line_type
+        Else, display view, normal and destination line_type ones.
+
+        NB: This context also permit "Budget vs. Actual" report to work and display right lines regarding a given granularity.
+        """
         if context is None:
             context = {}
         if values is None:
             values = {}
         res = {}
         display_type = {}
-        
-        for budget in obj.read(cr, uid, ids, ['display_type']):
-            res[budget['id']] = []
-            display_type[budget['id']] = budget['display_type']
-            # Override display_type if we come from a report
-            if context.get('report', False) and context.get('granularity', False):
-                display_type[budget['id']] = context.get('granularity')
-
-        budget_line_obj = obj.pool.get('msf.budget.line')
-        budget_line_ids = budget_line_obj.search(cr, uid, [('budget_id', 'in', ids)])
-        if budget_line_ids:
-            for budget_line in  budget_line_obj.read(cr, uid, budget_line_ids, ['line_type', 'budget_id'], context=context):
-                budget_id = budget_line['budget_id'][0]
-                if display_type[budget_id] == 'all' \
-                or (display_type[budget_id] == 'view' and budget_line['line_type'] == 'view') \
-                or (display_type[budget_id] == 'expense' and budget_line['line_type'] != 'destination'):
-                    res[budget_id].append(budget_line['id'])
+
+        domain = ['view', 'normal', 'destination']
+        tuples = {
+            'view': ['view'],
+            'expense': ['view', 'normal'],
+            'all': domain,
+        }
+        line_obj = obj.pool.get('msf.budget.line')
+
+        if 'granularity' in context:
+            display_type = context.get('granularity', False)
+            if display_type and display_type in ['view', 'expense', 'all']:
+                domain = tuples[display_type]
+
+        for budget_id in ids:
+            res[budget_id] = line_obj.search(cr, uid, [('budget_id', '=', budget_id), ('line_type', 'in', domain)])
+
         return res
 
 class msf_budget_line(osv.osv):
     _name = "msf.budget.line"
 
-    def _get_comm_amounts(self, cr, uid, ids, context=None):
-        res = {}
-        if context is None:
-            context = {}
-        engagement_journal_ids = self.pool.get('account.analytic.journal').search(cr, uid, [('type', '=', 'engagement')], context=context)
-        budget_line_ids = []
-        if len(ids) > 0:
-            budget = self.browse(cr, uid, ids[0], context=context).budget_id
-            output_currency_id = budget.currency_id.id
-            cost_center_ids = self.pool.get('msf.budget.tools')._get_cost_center_ids(budget.cost_center_id)
-            actual_domain = [('cost_center_id', 'in', cost_center_ids)]
-            actual_domain.append(('date', '>=', budget.fiscalyear_id.date_start))
-            actual_domain.append(('date', '<=', budget.fiscalyear_id.date_stop))
-            actual_domain.append(('journal_id', 'in', engagement_journal_ids))
-            res = self.pool.get('msf.budget.tools')._get_actual_amounts(cr, uid, output_currency_id, actual_domain, context=context)
-        return res
-
-    def _get_actual_amounts(self, cr, uid, ids, context=None):
-        # Input: list of budget lines
-        # Output: a dict of list {general_account_id: [jan_actual, feb_actual,...]}
-        res = {}
-        if context is None:
-            context = {}
-        # global values
-        engagement_journal_ids = self.pool.get('account.analytic.journal').search(cr, uid, [('type', '=', 'engagement')], context=context)
-        
-        # we discard the ids, but retrieve the budget from it
-        # Otherwise, view lines don't have values in "view lines only" display mode
-        budget_line_ids = []
-        if len(ids) > 0:
-            budget = self.browse(cr, uid, ids[0], context=context).budget_id
-            output_currency_id = budget.currency_id.id
-                    
-            cost_center_ids = self.pool.get('msf.budget.tools')._get_cost_center_ids(budget.cost_center_id)
-                    
-            # Create search domain (one search for all analytic lines)
-            actual_domain = [('cost_center_id', 'in', cost_center_ids)]
-            actual_domain.append(('date', '>=', budget.fiscalyear_id.date_start))
-            actual_domain.append(('date', '<=', budget.fiscalyear_id.date_stop))
-            # 3. commitments
-            # if commitments are set to False in context, the engagement analytic journals are removed
-            # from the domain
-            actual_domain.append(('journal_id', 'not in', engagement_journal_ids))
-            # Call budget_tools method
-            res = self.pool.get('msf.budget.tools')._get_actual_amounts(cr, uid, output_currency_id, actual_domain, context=context)
-        
-        return res
-        
-    def _get_budget_amounts(self, cr, uid, ids, context=None):
-        # Input: list of budget lines
-        # Output: a dict of list {general_account_id: [jan_budget, feb_budget,...]}
-        res = {}
-        if context is None:
-            context = {}
-            
-        if len(ids) > 0:
-            budget = self.browse(cr, uid, ids[0], context=context).budget_id
-            
-            if budget.type == 'normal':
-                # Budget values are stored in lines; just retrieve and add them
-                for budget_line in self.browse(cr, uid, ids, context=context):
-                    budget_line_destination_id = budget_line.destination_id and budget_line.destination_id.id or False
-                    if budget_line.budget_values:
-                        res[budget_line.account_id.id, budget_line_destination_id] = eval(budget_line.budget_values)
-                    else:
-                        res[budget_line.account_id.id, budget_line_destination_id] = [0] * 12
-            else:
-                # fill with 0s
-                for budget_line in self.browse(cr, uid, ids, context=context):
-                    budget_line_destination_id = budget_line.destination_id and budget_line.destination_id.id or False
-                    res[budget_line.account_id.id, budget_line_destination_id] = [0] * 12
-                # Not stored in lines; retrieve child budgets, get their budget values and add
-                cost_center_list = self.pool.get('msf.budget.tools')._get_cost_center_ids(budget.cost_center_id)
-                # For each cost center, get the latest non-draft budget
-                for cost_center_id in cost_center_list:
-                    cr.execute("SELECT id FROM msf_budget WHERE fiscalyear_id = %s \
-                                                            AND cost_center_id = %s \
-                                                            AND decision_moment_id = %s \
-                                                            AND state != 'draft' \
-                                                            AND type = 'normal' \
-                                                            ORDER BY version DESC LIMIT 1",
-                                                           (budget.fiscalyear_id.id,
-                                                            cost_center_id,
-                                                            budget.decision_moment_id.id))
-                    if cr.rowcount:
-                        # A budget was found; get its lines and their amounts
-                        child_budget_id = cr.fetchall()[0][0]
-                        child_line_ids = self.search(cr,
-                                                     uid,
-                                                     [('budget_id', '=', child_budget_id)],
-                                                     context=context)
-                        child_budget_amounts = self._get_budget_amounts(cr, uid, child_line_ids, context=context)
-                        for child_line in self.browse(cr, uid, child_line_ids, context=context):
-                            child_line_destination_id = child_line.destination_id and child_line.destination_id.id or False
-                            if (child_line.account_id.id, child_line_destination_id) not in res:
-                                res[child_line.account_id.id, child_line_destination_id] = child_budget_amounts[child_line.account_id.id, child_line_destination_id]
-                            else:
-                                res[child_line.account_id.id, child_line_destination_id] = [sum(pair) for pair in 
-                                                                                                             zip(child_budget_amounts[child_line.account_id.id, child_line_destination_id],
-                                                                                                             res[child_line.account_id.id, child_line_destination_id])]
-
-        return res
-    
-    def _compute_total_amounts(self, cr, uid, budget_amount_list, actual_amount_list, comm_amount_list, context=None):
-        # period_id
-        if context is None:
-            context = {}
-        budget_amount = 0
-        actual_amount = 0
-        comm_amount = 0
-        month_stop = 0
-
-        if 'period_id' in context:
-            period = self.pool.get('account.period').browse(cr, uid, context['period_id'], context=context)
-            month_stop = datetime.datetime.strptime(period.date_stop, '%Y-%m-%d').month
-        else:
-            month_stop = 12
-
-        # actual amount
-        if actual_amount_list:
-            for i in range(month_stop):
-                actual_amount += actual_amount_list[i]
-        # budget amount
-        if budget_amount_list:
-            for i in range(month_stop):
-                budget_amount += budget_amount_list[i]
-        # comm amount
-        if comm_amount_list:
-            for i in range(month_stop):
-                comm_amount += comm_amount_list[i]
-                
-        return {'actual_amount': actual_amount,
-                'comm_amount': comm_amount,
-                'budget_amount': budget_amount}
-    
-    def _get_total_amounts(self, cr, uid, ids, field_names=None, arg=None, context=None):
-        res = {}
-        if context is None:
-            context = {}
-        
-        actual_amounts = self._get_actual_amounts(cr, uid, ids, context)
-        budget_amounts = self._get_budget_amounts(cr, uid, ids, context)
-        comm_amounts = self._get_comm_amounts(cr, uid, ids, context)
-        
-        # Browse each line
-        for budget_line in self.browse(cr, uid, ids, context=context):
-            budget_line_destination_id = budget_line.destination_id and budget_line.destination_id.id or False
-            line_amounts = self._compute_total_amounts(cr,
-                                                       uid,
-                                                       (budget_line.account_id.id, budget_line_destination_id) in budget_amounts \
-                                                       and budget_amounts[budget_line.account_id.id, budget_line_destination_id] \
-                                                       or [0] * 12,
-                                                       (budget_line.account_id.id, budget_line_destination_id) in actual_amounts \
-                                                       and actual_amounts[budget_line.account_id.id, budget_line_destination_id] \
-                                                       or [0] * 12,
-                                                       (budget_line.account_id.id, budget_line_destination_id) in comm_amounts \
-                                                       and comm_amounts[budget_line.account_id.id, budget_line_destination_id] \
-                                                       or [0] * 12,
-                                                       context=context)
-
-            actual_amount = line_amounts['actual_amount']
-            budget_amount = line_amounts['budget_amount']
-            comm_amount = line_amounts['comm_amount']
-
-            # We have budget amount and actual amount, compute the remaining ones
-            percentage = 0.0
-            if budget_amount != 0.0:
-                percentage = round((actual_amount / budget_amount) * 100.0)
-            res[budget_line.id] = {'budget_amount': budget_amount,
-                                   'actual_amount': actual_amount,
-                                   'comm_amount': comm_amount,
-                                   'balance': budget_amount - actual_amount,
-                                   'percentage': percentage}
-        
-        return res
-    
-    def _get_monthly_amounts(self, cr, uid, ids, context=None):
-        res = []
-        if context is None:
-            context = {}
-            
-        actual_amounts = self._get_actual_amounts(cr, uid, ids, context)
-        budget_amounts = self._get_budget_amounts(cr, uid, ids, context)
-        comm_amounts = self._get_comm_amounts(cr, uid, ids, context)
-        
-        # if period id, only retrieve a subset
-        month_stop = 0
-        if 'period_id' in context:
-            period = self.pool.get('account.period').browse(cr, uid, context['period_id'], context=context)
-            month_stop = datetime.datetime.strptime(period.date_stop, '%Y-%m-%d').month
-        else:
-            month_stop = 12
-                
-        # Browse each line
-        for budget_line in self.browse(cr, uid, ids, context=context):
-            budget_line_destination_id = budget_line.destination_id and budget_line.destination_id.id or False
-
-            if budget_line.line_type == 'view' \
-                or ('granularity' in context and context['granularity'] == 'all') \
-                or ('granularity' in context and context['granularity'] == 'expense' and budget_line.line_type != 'destination'):
-                line_actual_amounts = [0] * 12
-                line_budget_amounts = [0] * 12
-                line_comm_amounts = [0] * 12
-                if (budget_line.account_id.id, budget_line_destination_id) in actual_amounts:
-                    line_actual_amounts = actual_amounts[budget_line.account_id.id, budget_line_destination_id]
-                if (budget_line.account_id.id, budget_line_destination_id) in budget_amounts:
-                    line_budget_amounts = budget_amounts[budget_line.account_id.id, budget_line_destination_id]
-                if (budget_line.account_id.id, budget_line_destination_id) in comm_amounts:
-                    line_comm_amounts = comm_amounts[budget_line.account_id.id, budget_line_destination_id]
-                
-
-                line_code = budget_line.account_id.code
-                line_destination = ''
-                if budget_line.destination_id:
-                    line_destination = budget_line.destination_id.code
-                line_name = budget_line.account_id.name
-                line_values = [(line_code,line_destination,line_name)]
-
-                if 'breakdown' in context and context['breakdown'] == 'month':
-                    # Need to add breakdown values
-                    for i in range(month_stop):
-                        line_values.append(line_budget_amounts[i])
-                        line_values.append(line_comm_amounts[i])
-                        line_values.append(line_actual_amounts[i])
-                
-                total_amounts = self._compute_total_amounts(cr,
-                                                           uid,
-                                                           line_budget_amounts,
-                                                           line_actual_amounts,
-                                                           line_comm_amounts,
-                                                           context=context)
-
-                line_values.append(total_amounts['budget_amount'])
-                line_values.append(total_amounts['comm_amount'])
-                line_values.append(total_amounts['actual_amount'])
-
-                # add to result
-                res.append(line_values)
-            
-        return res
-    
     def _get_name(self, cr, uid, ids, field_names=None, arg=None, context=None):
         result = self.browse(cr, uid, ids, context=context)
         res = {}
         for rs in result:
             account = rs.account_id
-            name = account.code 
+            name = account.code
             if rs.destination_id:
                 name += " "
                 name += rs.destination_id.code
@@ -311,18 +75,312 @@
             name += account.name
             res[rs.id] = name
         return res
-    
+
+    def _get_month_names(self, number=12):
+        """
+        Return a list of all month field to be used from the first one to the given number (included).
+        """
+        res = []
+        # Do not permit to give a number superior to 12!
+        if number > 12:
+            number = 12
+        for x in xrange(1, number+1, 1):
+            res.append('month' + str(x))
+        return res
+
+    def _get_domain(self, line_type, account_id, cost_center_ids, destination_id, date_start, date_stop):
+        """
+        Create a domain regarding budget line elements (to be used in a search()).
+        Return a list.
+        """
+        if isinstance(cost_center_ids, (int, long)):
+            cost_center_ids = [cost_center_ids]
+        res = [
+            ('cost_center_id', 'in', cost_center_ids),
+            ('date', '>=', date_start),
+            ('date', '<=', date_stop),
+        ]
+        if line_type == 'destination':
+            res.append(('destination_id', '=', destination_id))
+        if line_type in ['destination', 'normal']:
+            res.append(('general_account_id', '=', account_id)),
+        else:
+            res.append(('general_account_id', 'child_of', account_id))
+        return res
+
+    def _get_sql_domain(self, cr, uid, request, params, line_type, account_id, destination_id):
+        """
+        Create a SQL domain regarding budget line elements (to be used in a SQL request).
+        Return a 2 params:
+          - SQL request
+          - SQL params (list)
+        """
+        if not request:
+            request = ""
+        if not params:
+            params = []
+        if line_type == 'destination':
+            request += """ AND destination_id = %s """
+            params.append(destination_id)
+        if line_type in ['destination', 'normal']:
+            request += """ AND general_account_id = %s """
+            params.append(account_id)
+        else:
+            request += """ AND general_account_id IN %s """
+            account_ids = self.pool.get('account.account').search(cr, uid, [('parent_id', 'child_of', account_id)])
+            params.append(tuple(account_ids))
+        return request, params
+
+    def _get_amounts(self, cr, uid, ids, field_names=None, arg=None, context=None):
+        """
+        Those field can be asked for:
+          - actual_amount
+          - comm_amount
+          - balance
+          - percentage
+        With some depends:
+          - percentage needs actual_amount, comm_amount, balance and budget_amount
+          - balance needs actual_amount, comm_amount and budget_amount
+
+        NB:
+          - if 'period_id' in context, we change date_stop for SQL request to the date_stop of the given period to reduce computation
+          - if 'currency_table_id' in context, we compute actual amounts (and commitment ones) currency by currency
+        """
+        # Some checks
+        if context is None:
+            context = {}
+        if isinstance(ids, (int, long)):
+            ids = [ids]
+        # Prepare some values
+        res = {}
+        budget_ok = False
+        actual_ok = False
+        commitment_ok = False
+        percentage_ok = False
+        balance_ok = False
+        budget_amounts = {}
+        actual_amounts = {}
+        comm_amounts = {}
+        cur_obj = self.pool.get('res.currency')
+        # If period_id in context, use another date_stop element.
+        date_period_stop = False
+        month_number = 12
+        if 'period_id' in context:
+            period = self.pool.get('account.period').read(cr, uid, context.get('period_id', False), ['date_stop', 'number'], context=context)
+            if period and period.get('date_stop', False):
+                date_period_stop = period.get('date_stop')
+            if period and period.get('number', False):
+                month_number = period.get('number')
+        # Check if we need to use another currency_table_id
+        other_currencies = False
+        date_context = {}
+        company_currency_id = self.pool.get('res.users').browse(cr, uid, uid, context=context).company_id.currency_id.id
+        if context.get('currency_table_id', False):
+            other_currencies = True
+            date_context.update({'currency_table_id': context.get('currency_table_id')})
+        # Check in which case we are regarding field names. Compute actual and commitment when we need balance and/or percentage.
+        if 'budget_amount' in field_names:
+            budget_ok = True
+        if 'actual_amount' in field_names:
+            actual_ok = True
+        if 'comm_amount' in field_names:
+            actual_ok = True
+            commitment_ok = True
+        if 'percentage' in field_names:
+            budget_ok = True
+            actual_ok = True
+            percentage_ok = True
+        if 'balance' in field_names:
+            budget_ok = True
+            actual_ok = True
+            balance_ok = True
+        # In some cases (reports) we don't want to display commitment values. But we have to include them into "balance" and percentage computation.
+        if 'commitment' in context:
+            commitment_ok = context.get('commitment', False)
+        # Compute actual and/or commitments
+        if actual_ok or commitment_ok or percentage_ok or balance_ok:
+            # COMPUTE ACTUAL/COMMITMENT
+            ana_obj = self.pool.get('account.analytic.line')
+            ana_account_obj = self.pool.get('account.analytic.account')
+            cur_obj = self.pool.get('res.currency')
+            # Create default values
+            for index in ids:
+                if actual_ok:
+                    actual_amounts.setdefault(index, 0.0)
+                if commitment_ok:
+                    comm_amounts.setdefault(index, 0.0)
+            # Now, only use 'destination' line to do process and complete parent one at the same time
+            sql = """
+                SELECT l.id, l.line_type, l.account_id, l.destination_id, b.cost_center_id, f.date_start, f.date_stop
+                FROM msf_budget_line AS l, msf_budget AS b, account_fiscalyear AS f
+                WHERE l.budget_id = b.id
+                AND b.fiscalyear_id = f.id
+                AND l.id IN %s
+                ORDER BY l.line_type, l.id"""
+            cr.execute(sql, (tuple(ids),))
+            # Prepare SQL2 request that contains sum of amount of given analytic lines (in functional currency)
+            sql2 = """
+                SELECT SUM(amount)
+                FROM account_analytic_line
+                WHERE id in %s"""
+            # Prepare SQL3 request in case we have other currencies to compute
+            sql3 = """
+                SELECT l.currency_id, SUM(l.amount_currency)
+                FROM account_analytic_line AS l, account_analytic_journal AS j
+                WHERE l.journal_id = j.id
+                AND l.cost_center_id IN %s
+                AND l.date >= %s
+                AND l.date <= %s"""
+            sql3_end = """ GROUP BY l.currency_id"""
+            # Process destination lines
+            for line in cr.fetchall():
+                # fetch some values
+                line_id, line_type, account_id, destination_id, cost_center_id, date_start, date_stop = line
+                cost_center_ids = ana_account_obj.search(cr, uid, [('parent_id', 'child_of', cost_center_id)])
+                if date_period_stop:
+                    date_stop = date_period_stop
+                criteria = self._get_domain(line_type, account_id, cost_center_ids, destination_id, date_start, date_stop)
+                # TWO METHODS to display actual/commitments
+                # (1) Either we use functional amounts (no currency_table)
+                # (2) Or we use a currency table to change amounts to functional amounts at fiscalyear date_stop
+                if not other_currencies:
+                    # (1) Use functional amounts: NO conversion
+                    # fill in ACTUAL AMOUNTS
+                    if actual_ok:
+                        actual_criteria = list(criteria) + [('journal_id.type', '!=', 'engagement')]
+                        ana_ids = ana_obj.search(cr, uid, actual_criteria)
+                        if ana_ids:
+                            cr.execute(sql2, (tuple(ana_ids),))
+                            mnt_result = cr.fetchall()
+                            if mnt_result:
+                                    actual_amounts[line_id] += mnt_result[0][0] * -1
+                    # fill in COMMITMENT AMOUNTS
+                    if commitment_ok:
+                        commitment_criteria = list(criteria) + [('journal_id.type', '=', 'engagement')]
+                        ana_ids = ana_obj.search(cr, uid, commitment_criteria)
+                        if ana_ids:
+                            cr.execute(sql2, (tuple(ana_ids),))
+                            mnt_result = cr.fetchall()
+                            if mnt_result:
+                                comm_amounts[line_id] += mnt_result[0][0] * -1
+                else:
+                    # (2) OTHER CURRENCIES to compute
+                    # Note that to not compute each analytic lines we use the sum of each currency and convert it to the functional currency using the given currency_table_id in the context
+                    tmp_sql_params = [tuple(cost_center_ids), date_start, date_stop]
+                    tmp_sql, sql_params = self._get_sql_domain(cr, uid, sql3, tmp_sql_params, line_type, account_id, destination_id)
+                    # Use fiscalyear end date as date on which we do conversion
+                    date_context.update({'date': date_stop})
+
+                    def get_amounts_and_compute_total(local_request, local_params, local_end_request):
+                        """
+                        Use request.
+                        Finish it with local_end_request.
+                        Execute it.
+                        Fetch amounts.
+                        Compute them by currency.
+                        Return total result
+                        """
+                        total = 0.0
+                        if local_end_request:
+                            local_request += local_end_request
+                        cr.execute(local_request, tuple(local_params))
+                        if cr.rowcount:
+                            analytic_amounts = cr.fetchall()
+                            # Browse each currency amount and convert it to the functional currency (company one)
+                            for currency_id, amount in analytic_amounts:
+                                tmp_amount = cur_obj.compute(cr, uid, currency_id, company_currency_id, amount, round=False, context=date_context)
+                                total += (tmp_amount * -1) # As analytic amounts are negative, we should use the opposite to make budget with positive values
+                        return total
+
+                    if actual_ok:
+                        actual_sql = tmp_sql + """ AND j.type != 'engagement' """
+                        actual_amounts[line_id] += get_amounts_and_compute_total(actual_sql, sql_params, sql3_end)
+                    if commitment_ok:
+                        commitment_sql = tmp_sql + """ AND j.type = 'engagement' """
+                        comm_amounts[line_id] += get_amounts_and_compute_total(commitment_sql, sql_params, sql3_end)
+        # Budget line amounts
+        if budget_ok:
+            month_names = self._get_month_names(month_number)
+            sql = """
+            SELECT id, COALESCE(""" + '+'.join(month_names) + """, 0.0)
+            FROM msf_budget_line
+            WHERE id IN %s;
+            """
+            cr.execute(sql, (tuple(ids),))
+            tmp_res = cr.fetchall()
+            if tmp_res:
+                budget_amounts = dict(tmp_res)
+        # Prepare result
+        for line_id in ids:
+            actual_amount = line_id in actual_amounts and actual_amounts[line_id] or 0.0
+            comm_amount = line_id in comm_amounts and comm_amounts[line_id] or 0.0
+            res[line_id] = {'actual_amount': actual_amount, 'comm_amount': comm_amount, 'balance': 0.0, 'percentage': 0.0, 'budget_amount': 0.0,}
+            if budget_ok:
+                budget_amount = line_id in budget_amounts and budget_amounts[line_id] or 0.0
+                res[line_id].update({'budget_amount': budget_amount,})
+            if balance_ok:
+                balance = budget_amount - actual_amount
+                if commitment_ok:
+                    balance -= comm_amount
+                res[line_id].update({'balance': balance,})
+            if percentage_ok:
+                if budget_amount != 0.0:
+                    base = actual_amount
+                    if commitment_ok:
+                        base += comm_amount
+                    percentage = round(base / budget_amount * 100.0)
+                    res[line_id].update({'percentage': percentage,})
+        return res
+
+    def _get_total(self, cr, uid, ids, field_names=None, arg=None, context=None):
+        """
+        Give the sum of all month for the given budget lines.
+        If period_id in context, just display months from the first one to the given period month (included)
+        """
+        # Some checks
+        if isinstance(ids,(int, long)):
+            ids = [ids]
+        month_number = 12
+        if 'period_id' in context:
+            period = self.pool.get('account.period').read(cr, uid, context.get('period_id', False), ['number'])
+            if period and period.get('number', False):
+                month_number = period.get('number')
+        month_names = self._get_month_names(month_number)
+        # Prepare some values
+        res = {}
+        sql = """
+            SELECT id, COALESCE(""" + '+'.join(month_names) + """, 0.0)
+            FROM msf_budget_line
+            WHERE id IN %s"""
+        cr.execute(sql, (tuple(ids),))
+        tmp_res = cr.fetchall()
+        if tmp_res:
+            res = dict(tmp_res)
+        return res
+
     _columns = {
         'budget_id': fields.many2one('msf.budget', 'Budget', ondelete='cascade'),
         'account_id': fields.many2one('account.account', 'Account', required=True, domain=[('type', '!=', 'view')]),
         'destination_id': fields.many2one('account.analytic.account', 'Destination', domain=[('category', '=', 'DEST')]),
         'name': fields.function(_get_name, method=True, store=False, string="Name", type="char", readonly="True", size=512),
-        'budget_values': fields.char('Budget Values (list of float to evaluate)', size=256),
-        'budget_amount': fields.function(_get_total_amounts, method=True, store=False, string="Budget amount", type="float", readonly="True", multi="all"),
-        'actual_amount': fields.function(_get_total_amounts, method=True, store=False, string="Actual amount", type="float", readonly="True", multi="all"),
-        'comm_amount': fields.function(_get_total_amounts, method=True, store=False, string="Commitments amount", type="float", readonly="True", multi="all"),
-        'balance': fields.function(_get_total_amounts, method=True, store=False, string="Balance", type="float", readonly="True", multi="all"),
-        'percentage': fields.function(_get_total_amounts, method=True, store=False, string="Percentage", type="float", readonly="True", multi="all"),
+        'month1': fields.float("Month 01"),
+        'month2': fields.float("Month 02"),
+        'month3': fields.float("Month 03"),
+        'month4': fields.float("Month 04"),
+        'month5': fields.float("Month 05"),
+        'month6': fields.float("Month 06"),
+        'month7': fields.float("Month 07"),
+        'month8': fields.float("Month 08"),
+        'month9': fields.float("Month 09"),
+        'month10': fields.float("Month 10"),
+        'month11': fields.float("Month 11"),
+        'month12': fields.float("Month 12"),
+        'total': fields.function(_get_total, method=True, store=False, string="Total", type="float", readonly=True, help="Get all month total amount"),
+        'budget_amount': fields.function(_get_amounts, method=True, store=False, string="Budget amount", type="float", readonly=True, multi="budget_amounts"),
+        'actual_amount': fields.function(_get_amounts, method=True, store=False, string="Actual amount", type="float", readonly=True, multi="budget_amounts"),
+        'comm_amount': fields.function(_get_amounts, method=True, store=False, string="Commitments amount", type="float", readonly=True, multi="budget_amounts"),
+        'balance': fields.function(_get_amounts, method=True, store=False, string="Balance", type="float", readonly=True, multi="budget_amounts"),
+        'percentage': fields.function(_get_amounts, method=True, store=False, string="Percentage", type="float", readonly=True, multi="budget_amounts"),
         'parent_id': fields.many2one('msf.budget.line', 'Parent Line'),
         'child_ids': fields.one2many('msf.budget.line', 'parent_id', 'Child Lines'),
         'line_type': fields.selection([('view','View'),
@@ -334,89 +392,30 @@
     _order = 'account_code asc, line_type desc'
 
     _defaults = {
-        'line_type': 'normal',
+        'line_type': lambda *a: 'normal',
+        'month1': lambda *a: 0.0,
+        'month2': lambda *a: 0.0,
+        'month3': lambda *a: 0.0,
+        'month4': lambda *a: 0.0,
+        'month5': lambda *a: 0.0,
+        'month6': lambda *a: 0.0,
+        'month7': lambda *a: 0.0,
+        'month8': lambda *a: 0.0,
+        'month9': lambda *a: 0.0,
+        'month10': lambda *a: 0.0,
+        'month11': lambda *a: 0.0,
+        'month12': lambda *a: 0.0,
     }
-    
-    def get_parent_line(self, cr, uid, vals, context=None):
-        # Method to check if the used account has a parent,
-        # and retrieve or create the corresponding parent line.
-        # It also adds budget values to parent lines
-        parent_account_id = False
-        parent_line_ids = []
-        if 'account_id' in vals and 'budget_id' in vals:
-            if 'destination_id' in vals:
-                # Special case: the line has a destination, so the parent is a line
-                # with the same account and no destination
-                parent_account_id = vals['account_id']
-                parent_line_ids = self.search(cr, uid, [('account_id', '=', vals['account_id']),
-                                                        ('budget_id', '=', vals['budget_id']),
-                                                        ('line_type', '=', 'normal')], context=context)
-            else:
-                # search for budget line
-                account = self.pool.get('account.account').browse(cr, uid, vals['account_id'], context=context)
-                chart_of_account_ids = self.pool.get('account.account').search(cr, uid, [('code', '=', 'MSF')], context=context)
-                if account.parent_id and account.parent_id.id in chart_of_account_ids:
-                    # no need to create the parent
-                    return
-                else:
-                    parent_account_id = account.parent_id.id
-                    parent_line_ids = self.search(cr, uid, [('account_id', '=', parent_account_id),
-                                                            ('budget_id', '=', vals['budget_id'])], context=context)
-            if len(parent_line_ids) > 0:
-                # Parent line exists
-                if 'budget_values' in vals:
-                    # we add the budget values to the parent one
-                    parent_line = self.browse(cr, uid, parent_line_ids[0], context=context)
-                    parent_budget_values = [sum(pair) for pair in zip(eval(parent_line.budget_values),
-                                                                      eval(vals['budget_values']))]
-                    # write parent
-                    super(msf_budget_line, self).write(cr,
-                                                       uid,
-                                                       parent_line_ids,
-                                                       {'budget_values': str(parent_budget_values)},
-                                                       context=context)
-                    # use method on parent with original budget values
-                    self.get_parent_line(cr,
-                                         uid,
-                                         {'account_id': parent_line.account_id.id,
-                                          'budget_id': parent_line.budget_id.id,
-                                          'budget_values': vals['budget_values']},
-                                         context=context)
-                # add parent id to vals
-                vals.update({'parent_id': parent_line_ids[0]})
-            else:
-                # Create parent line and add it to vals, except if it's the main parent
-                parent_vals = {'budget_id': vals['budget_id'],
-                               'account_id': parent_account_id}
-                if 'line_type' in vals and vals['line_type'] == 'destination':
-                    parent_vals['line_type'] = 'normal'
-                else:
-                    parent_vals['line_type'] = 'view'
-                # default parent budget values: the one from the (currently) only child
-                if 'budget_values' in vals:
-                    parent_vals.update({'budget_values': vals['budget_values']})
-                parent_budget_line_id = self.create(cr, uid, parent_vals, context=context)
-                vals.update({'parent_id': parent_budget_line_id})
-        return
-            
-    
-    def create(self, cr, uid, vals, context=None):
-        self.get_parent_line(cr, uid, vals, context=context)
-        return super(msf_budget_line, self).create(cr, uid, vals, context=context)
-    
-    def write(self, cr, uid, ids, vals, context=None):
-        self.get_parent_line(cr, uid, vals, context=context)
-        return super(msf_budget_line, self).write(cr, uid, ids, vals, context=context)
-    
+
 msf_budget_line()
 
 class msf_budget(osv.osv):
     _name = "msf.budget"
     _inherit = "msf.budget"
-    
+
     _columns = {
         'budget_line_ids': one2many_budget_lines('msf.budget.line', 'budget_id', 'Budget Lines'),
     }
-    
+
 msf_budget()
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== modified file 'msf_budget/msf_budget_report.xml'
--- msf_budget/msf_budget_report.xml	2013-12-12 17:29:01 +0000
+++ msf_budget/msf_budget_report.xml	2014-03-21 08:49:45 +0000
@@ -23,7 +23,7 @@
         header="False"
         auto="False"
         menu="True"/>
-        
+
         <report id="pdf_budget_monthly"
         string="Monthly Budget (PDF)"
         model="msf.budget"
@@ -32,7 +32,8 @@
         rml="msf_budget/report/monthly_budget.rml"
         auto="False"
         menu="True"/>
-        
+
+        <!-- see 'report/report_pdf_budget_summary.py' for real filename -->
         <report id="pdf_budget_summary"
         string="Budget Summary"
         model="msf.budget"
@@ -40,8 +41,8 @@
         target_filename="Budget_Summary_${code}_%(year)s%(month)s%(day)s"
         rml="msf_budget/report/budget_summary.rml"
         auto="False"
-        menu="True"/>
-        
+        menu="False"/>
+
         <report id="report_local_expenses_xls"
         string="Local Expenses"
         model="account.analytic.line"
@@ -52,7 +53,7 @@
         header="False"
         auto="False"
         menu="False"/>
-        
+
         <report id="pdf_engagement"
         string="Order impact vs. Budget"
         model="purchase.order"
@@ -66,7 +67,7 @@
         string="Actuals by CC"
         model="msf.budget"
         name="msf.budget.actual"
-        target_filename="Actuals by CC_${code}_ %(year)s%(month)s%(day)s"
+        target_filename="Actuals by CC_${code}_%(year)s%(month)s%(day)s"
         report_type="txt"
         auto="False"
         menu="False"/>

=== added file 'msf_budget/msf_budget_sequence.xml'
--- msf_budget/msf_budget_sequence.xml	1970-01-01 00:00:00 +0000
+++ msf_budget/msf_budget_sequence.xml	2014-03-21 08:49:45 +0000
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+  <data noupdate="1">
+
+    <record id="seq_type_budget_import" model="ir.sequence.type">
+      <field name="name">Budget Import</field>
+      <field name="code">budget.import</field>
+    </record>
+
+
+    <record id="seq_budget_import" model="ir.sequence">
+      <field name="name">Budget Import</field>
+      <field name="code">budget.import</field>
+      <field name="padding">10</field>
+      <field name="implementation">psql</field>
+    </record>
+  </data>
+</openerp>

=== modified file 'msf_budget/msf_budget_tools.py'
--- msf_budget/msf_budget_tools.py	2013-12-12 16:01:40 +0000
+++ msf_budget/msf_budget_tools.py	2014-03-21 08:49:45 +0000
@@ -19,23 +19,18 @@
 #
 ##############################################################################
 
-from osv import fields, osv
+from osv import osv
 import datetime
-from dateutil.relativedelta import relativedelta
+from tools.translate import _
 
 class msf_budget_tools(osv.osv):
     _name = "msf.budget.tools"
-    
-    def _get_account_parent(self, browse_account, account_list, chart_of_account_ids):
-        if browse_account.parent_id and \
-           browse_account.parent_id.id and \
-           browse_account.parent_id.id not in chart_of_account_ids and \
-           browse_account.parent_id.id not in account_list:
-            account_list.append((browse_account.parent_id.id, False))
-            self._get_account_parent(browse_account.parent_id, account_list, chart_of_account_ids)
-        return
-    
-    def _get_expense_accounts(self, cr, uid, context=None):
+
+    def get_expense_accounts(self, cr, uid, context=None):
+        """
+        Get all "is_analytic_addicted" accounts except if context notify to only use expense ones.
+        By using this method you also retrieve ALL parents EXCEPT the first one: MSF account.
+        """
         # Checks
         if context is None:
             context = {}
@@ -43,56 +38,215 @@
         res = []
         account_obj = self.pool.get('account.account')
         # get the last parent
-        chart_of_account_ids = account_obj.search(cr, uid, [('code', '=', 'MSF')], context=context)
+        top_ids = account_obj.search(cr, uid, [('code', '=', 'MSF')], context=context)
         # get normal analytic-a-holic accounts. UTP-944: only expenses ones if "only_expenses" in context. Do not include Extra-accounting accounts and incomes one.
         domain = [('type', '!=', 'view'), ('user_type_report_type', '!=', 'none')]
         if context.get('only_expenses', False) and context.get('only_expenses') is True:
             domain += [('user_type_code', '=', 'expense'), ('user_type_report_type', '=', 'expense')]
         else:
             domain += [('is_analytic_addicted', '=', True)]
-        general_account_ids = account_obj.search(cr, uid, domain, context=context)
-        expense_account_ids = [(account_id, False) for account_id in general_account_ids]
-        # go through parents
-        for account in account_obj.browse(cr, uid, general_account_ids, context=context):
-            self._get_account_parent(account, expense_account_ids, chart_of_account_ids)
-        return expense_account_ids
-
-    def _create_expense_account_line_amounts(self, cr, uid, account_destination_tuple, actual_amounts, context=None):
-        if account_destination_tuple not in actual_amounts:
-            account = self.pool.get('account.account').browse(cr, uid, account_destination_tuple[0], context=context)
-            result = [0] * 12
-            if account.type == 'view':
-                # children are accounts
-                for child_account in account.child_id:
-                    if (child_account.id, False) not in actual_amounts:
-                        self._create_expense_account_line_amounts(cr, uid, (child_account.id, False), actual_amounts, context=context)
-                    result = [sum(pair) for pair in zip(result, actual_amounts[child_account.id, False])]
-            else:
-                # children are account, destination tuples (already in actual_amounts)
-                # get all tuples starting with (account_id)
-                for account_destination in [tuple for tuple in actual_amounts.keys() if tuple[0] == account_destination_tuple[0] and tuple[1] is not False]:
-                    result = [sum(pair) for pair in zip(result, actual_amounts[account_destination])]
-            actual_amounts[account_destination_tuple[0], False] = result
-        return
-    
-    def _get_cc_children(self, browse_cost_center, cost_center_list):
-        for child in browse_cost_center.child_ids:
-            if child.type == 'view':
-                self._get_cc_children(child, cost_center_list)
-            else:
-                cost_center_list.append(child.id)
-        return
-    
-    def _get_cost_center_ids(self, browse_cost_center):
-        if browse_cost_center.type == 'normal':
-            # Normal budget, just return a 1-item list
-            return [browse_cost_center.id]
-        else:
-            # View budget: return all non-view cost centers below this one
-            cost_center_list = []
-            self._get_cc_children(browse_cost_center, cost_center_list)
-            return cost_center_list
-    
+        account_ids = account_obj.search(cr, uid, domain, context=context)
+        if account_ids:
+            parent_ids = account_obj._get_parent_of(cr, uid, account_ids, context=context)
+            if parent_ids:
+                res = [x for x in parent_ids if x not in top_ids]
+        return res
+
+    def get_budget_line_template(self, cr, uid, context=None):
+        """
+        Create a template that contains all budget line main values for a new budget.
+        """
+        # Some checks
+        if context is None:
+            context = {}
+        # Prepare some values
+        res = []
+        # Search all income/expense accounts (except if context contains "only_expenses" set to True)
+        account_ids = self.get_expense_accounts(cr, uid, context=context)
+        if not account_ids:
+            return []
+        # We use a SQL request to keep an order of accounts regarding their parents so that parents could be created before their childs.
+        sql = """
+            SELECT id, CASE WHEN type != 'view' THEN 'normal' ELSE 'view' END AS account_type, parent_id
+            FROM account_account
+            WHERE id IN %s
+            ORDER BY parent_id ASC"""
+        cr.execute(sql, (tuple(account_ids),))
+        if not cr.rowcount:
+            raise osv.except_osv(_('Error'), _('Unable to find needed info.'))
+        tmp_res = cr.fetchall()
+        # We take destination ids for a given account (and we make a dictionnary to be quickly used)
+        accounts = self.pool.get('account.account').read(cr, uid, account_ids, ['destination_ids'], context=context)
+        destinations = {}
+        for account in accounts:
+            destinations[account.get('id')] = account.get('destination_ids')
+        # We then create the final result with all needed elements
+        for line_id, line_type, parent_id in tmp_res:
+            line_vals = {
+                'id': line_id,
+                'type': line_type,
+                'parent_id': parent_id,
+                'destination_ids': []
+            }
+            if line_id in destinations:
+                line_vals.update({'destination_ids': destinations[line_id]})
+            res.append(line_vals)
+        return res
+
+    def create_budget_lines(self, cr, uid, budget_id, sequence=False, context=None):
+        """
+        Create budget lines for a given budget.
+        If no budget: do nothing.
+        If no sequence: only create budget lines without any specific amounts.
+
+        Creation synthesis:
+        1/ get the initial template
+        2/ for each line create its budget line
+        3/a) if sequence: fetch budget values and fill in destination lines, normal lines and parents
+        3/b) if NO sequence, just create destination lines, normal lines and parents.
+        """
+        # Some checks
+        if context is None:
+            context = {}
+        if not budget_id:
+            return False
+        # Prepare some values
+        a_obj = self.pool.get('account.account')
+        chart_of_account_ids = a_obj.search(cr, uid, [('code', '=', 'MSF')], context=context)
+        budget_line_obj = self.pool.get('msf.budget.line')
+        imported_obj = self.pool.get('imported.msf.budget.line')
+        sql = """
+            SELECT SUM(COALESCE(month1, 0.0)), SUM(COALESCE(month2, 0.0)), SUM(COALESCE(month3, 0.0)), SUM(COALESCE(month4, 0.0)), SUM(COALESCE(month5, 0.0)), SUM(COALESCE(month6, 0.0)), SUM(COALESCE(month7, 0.0)), SUM(COALESCE(month8, 0.0)), SUM(COALESCE(month9, 0.0)), SUM(COALESCE(month10, 0.0)), SUM(COALESCE(month11, 0.0)), SUM(COALESCE(month12, 0.0))
+            FROM msf_budget_line
+            WHERE id IN %s"""
+        # Get budget line template from budget tools
+        template = self.get_budget_line_template(cr, uid, context=context)
+        # Browse each budget line and create needed values
+        to_proceed = []
+        mapping_accounts = {}
+        for budget_line in template:
+            # Create budget line
+            line_id = budget_line.get('id')
+            line_type = budget_line.get('type')
+            parent_id = budget_line.get('parent_id', False)
+            # Do not use top parent account (those in chart_of_account_ids)
+            if parent_id in chart_of_account_ids:
+                parent_id = False
+            budget_line_vals = {
+                'budget_id': budget_id,
+                'account_id': line_id,
+                'line_type': line_type,
+                'month1': 0.0,
+                'month2': 0.0,
+                'month3': 0.0,
+                'month4': 0.0,
+                'month5': 0.0,
+                'month6': 0.0,
+                'month7': 0.0,
+                'month8': 0.0,
+                'month9': 0.0,
+                'month10': 0.0,
+                'month11': 0.0,
+                'month12': 0.0,
+            }
+            if parent_id:
+                if parent_id not in mapping_accounts:
+                    raise osv.except_osv(_('Error'), _('You did not create budget line in the right order. A parent does not exist!'))
+                budget_line_vals.update({'parent_id': mapping_accounts[parent_id]})
+            # Create line
+            budget_line_id = budget_line_obj.create(cr, uid, budget_line_vals, context=context)
+            to_proceed.append(budget_line_id)
+            mapping_accounts[line_id] = budget_line_id
+            if line_type == 'normal':
+                # Update vals with the new line type
+                budget_line_vals.update({
+                    'line_type': 'destination',
+                })
+                # Browse each destination to create its line
+                for destination_id in budget_line.get('destination_ids', []):
+                    budget_line_vals.update({
+                        'destination_id': destination_id,
+                        'month1': 0.0,
+                        'month2': 0.0,
+                        'month3': 0.0,
+                        'month4': 0.0,
+                        'month5': 0.0,
+                        'month6': 0.0,
+                        'month7': 0.0,
+                        'month8': 0.0,
+                        'month9': 0.0,
+                        'month10': 0.0,
+                        'month11': 0.0,
+                        'month12': 0.0,
+                        'parent_id': budget_line_id
+                    })
+                    # Fetch values if sequence is given (which permit to find some lines)
+                    if sequence:
+                        # Search if the CSV file have this kind of tuple account/destination and fetch values
+                        csv_line_ids = imported_obj.search(cr, uid, [('account_id', '=', line_id), ('destination_id', '=', destination_id)], context=context)
+                        # If yes, complete budget values from month1 to month12
+                        if csv_line_ids:
+                            csv_line = imported_obj.read(cr, uid, csv_line_ids[0], ['month1', 'month2', 'month3', 'month4', 'month5', 'month6', 'month7', 'month8', 'month9', 'month10', 'month11', 'month12'])
+                            budget_line_vals.update({
+                                'month1': csv_line.get('month1', 0.0),
+                                'month2': csv_line.get('month2', 0.0),
+                                'month3': csv_line.get('month3', 0.0),
+                                'month4': csv_line.get('month4', 0.0),
+                                'month5': csv_line.get('month5', 0.0),
+                                'month6': csv_line.get('month6', 0.0),
+                                'month7': csv_line.get('month7', 0.0),
+                                'month8': csv_line.get('month8', 0.0),
+                                'month9': csv_line.get('month9', 0.0),
+                                'month10': csv_line.get('month10', 0.0),
+                                'month11': csv_line.get('month11', 0.0),
+                                'month12': csv_line.get('month12', 0.0),
+                            })
+                    # Create destination line
+                    budget_line_obj.create(cr, uid, budget_line_vals, context=context)
+        # Fill in parent lines (only if sequence is given which means that we have probably some values in destination lines)
+        if sequence:
+            vals_headers = ['month1', 'month2', 'month3', 'month4', 'month5', 'month6', 'month7', 'month8', 'month9', 'month10', 'month11', 'month12']
+            for budget_line_id in to_proceed:
+                # Search child_ids
+                child_ids = budget_line_obj.search(cr, uid, [('parent_id', 'child_of', budget_line_id)])
+                # Do the sum of them
+                cr.execute(sql, (tuple(child_ids),))
+                tmp_res = cr.fetchall()
+                # If result, write on the given budget line the result
+                if tmp_res:
+                    budget_line_vals = dict(zip(vals_headers, tmp_res[0]))
+                    budget_line_obj.write(cr, uid, budget_line_id, budget_line_vals, context=context)
+        return True
+
+    def _create_expense_account_line_amounts(self, cr, uid, account_ids, actual_amounts, context=None):
+        # Some checks
+        if context is None:
+            context = {}
+        if isinstance(account_ids, (int, long)):
+            account_ids = [account_ids]
+        a_obj = self.pool.get('account.account')
+        # Browse accounts
+        for account_id in account_ids:
+            if (account_id, False) not in actual_amounts:
+                account = a_obj.browse(cr, uid, account_id, context=context)
+                result = [0] * 12
+                if account.type == 'view':
+                    # children are accounts
+                    for child_account in account.child_id:
+                        if (child_account.id, False) not in actual_amounts:
+                            self._create_expense_account_line_amounts(cr, uid, child_account.id, actual_amounts, context=context)
+                        result = [sum(pair) for pair in zip(result, actual_amounts[child_account.id, False])]
+                else:
+                    # children are account, destination tuples (already in actual_amounts)
+                    # get all tuples starting with (account_id)
+                    for account_destination in [tuple_acc_dest for tuple_acc_dest in actual_amounts.keys() if tuple_acc_dest[0] == account_id and tuple_acc_dest[1] is not False]:
+                        result = [sum(pair) for pair in zip(result, actual_amounts[account_destination])]
+                actual_amounts[account_id, False] = result
+        return
+
+    def _get_cost_center_ids(self, cr, uid, browse_cost_center):
+        return self.pool.get('account.analytic.account').search(cr, uid, [('parent_id', 'child_of', browse_cost_center.id)])
+
     def _create_account_destination_domain(self, account_destination_list):
         if len(account_destination_list) == 0:
             return ['&',
@@ -104,7 +258,7 @@
                     ('destination_id', '=', account_destination_list[0][1])]
         else:
             return ['|'] + self._create_account_destination_domain([account_destination_list[0]]) + self._create_account_destination_domain(account_destination_list[1:])
-    
+
     def _get_actual_amounts(self, cr, uid, output_currency_id, domain=[], context=None):
         # Input: domain for the selection of analytic lines (cost center, date, etc...)
         # Output: a dict of list {(general_account_id, destination_id): [jan_actual, feb_actual,...]}
@@ -113,20 +267,20 @@
             context = {}
         destination_obj = self.pool.get('account.destination.link')
         # list to store every existing destination link in the system
-        account_ids = self._get_expense_accounts(cr, uid, context=context)
-        
-        destination_link_ids = destination_obj.search(cr, uid, [('account_id', 'in',  [x[0] for x in account_ids])], context=context)
+        account_ids = self.get_expense_accounts(cr, uid, context=context)
+
+        destination_link_ids = destination_obj.search(cr, uid, [('account_id', 'in',  account_ids)], context=context)
         account_destination_ids = [(dest.account_id.id, dest.destination_id.id)
                                    for dest
                                    in destination_obj.browse(cr, uid, destination_link_ids, context=context)]
-        
+
         # Fill all general accounts
         for account_id, destination_id in account_destination_ids:
             res[account_id, destination_id] = [0] * 12
-                    
+
         # fill search domain (one search for all analytic lines)
         domain += self._create_account_destination_domain(account_destination_ids)
-        
+
         # Analytic domain is now done; lines are retrieved and added
         analytic_line_obj = self.pool.get('account.analytic.line')
         analytic_lines = analytic_line_obj.search(cr, uid, domain, context=context)
@@ -134,7 +288,7 @@
         currency_table = None
         if 'currency_table_id' in context:
             currency_table = context['currency_table_id']
-        
+
         # parse each line and add it to the right array
         for analytic_line in analytic_line_obj.browse(cr, uid, analytic_lines, context=context):
             date_context = {'date': analytic_line.source_date or analytic_line.date,
@@ -142,23 +296,22 @@
             actual_amount = self.pool.get('res.currency').compute(cr,
                                                                   uid,
                                                                   analytic_line.currency_id.id,
-                                                                  output_currency_id, 
+                                                                  output_currency_id,
                                                                   analytic_line.amount_currency or 0.0,
                                                                   round=True,
                                                                   context=date_context)
             # add the amount to correct month
             month = datetime.datetime.strptime(analytic_line.date, '%Y-%m-%d').month
             res[analytic_line.general_account_id.id, analytic_line.destination_id.id][month - 1] += round(actual_amount, 2)
-            
+
         # after all lines are parsed, absolute of every column
         for line in res.keys():
             res[line] = [-x for x in res[line]]
-                
+
         # do the view lines
-        for account_destination_tuple in account_ids:
-            self._create_expense_account_line_amounts(cr, uid, account_destination_tuple, res, context=context)
-        
+        self._create_expense_account_line_amounts(cr, uid, account_ids, res, context=context)
+
         return res
-    
+
 msf_budget_tools()
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== modified file 'msf_budget/msf_budget_view.xml'
--- msf_budget/msf_budget_view.xml	2014-01-13 13:44:46 +0000
+++ msf_budget/msf_budget_view.xml	2014-03-21 08:49:45 +0000
@@ -62,11 +62,13 @@
                     <field name="decision_moment_id" readonly="1" attrs="{'invisible': [('type', '=', 'view')]}"/>
                     <field name="version" readonly="1" attrs="{'invisible': [('type', '=', 'view')]}"/>
                     <field name="type" readonly="1" invisible="1"/>
-                    <group col="4" colspan="2">
-                        <button name="button_display_type" string="Change display type" type="object" icon="terp-stock_zoom" context="context" colspan="1"/>
-                        <field name="display_type" readonly="1" nolabel="1"/>
-                    </group>
+                    <label string="" colspan="2"/>
                     <field name="currency_id" readonly="1"/>
+                    <group col="3" colspan="4">
+                        <button name="button_display_type" string="Parent accounts only" type="object" icon="terp-stock_zoom" context="{'granularity': 'view'}" colspan="1"/>
+                        <button name="button_display_type" string="Accounts only" type="object" icon="terp-stock_zoom" context="{'granularity': 'expense'}" colspan="1"/>
+                        <button name="button_display_type" string="Accounts and destinations" type="object" icon="terp-stock_zoom" context="{'granularity': 'all'}" colspan="1"/>
+                    </group>
                     <field name="budget_line_ids" colspan="4" nolabel="1" readonly="1">
                         <tree string="Budget Lines" editable="top" colors="black:line_type in ('normal');blue:line_type in ('view')">
                             <field name="name"/>
@@ -90,7 +92,7 @@
                     </field>
                     <field name="state" select="1" readonly="1" attrs="{'invisible': [('type', '=', 'view')]}"/>
                     <group col="4" colspan="2">
-                        <button string="Approve" name="validate" type="workflow" icon="gtk-ok" attrs="{'invisible': [('|'), ('type', '=', 'view'), ('state', '!=', 'draft')]}"/>
+                        <button string="Approve" name="validate" type="workflow" icon="gtk-ok" attrs="{'invisible': [('|'), ('type', '=', 'view'), ('state', '!=', 'draft')]}" help="By using this button you will not only validate the budget but also update all parent budgets. This will take a while..."/>
                         <button string="Done" name="done" type="workflow" icon="gtk-jump-to" attrs="{'invisible': [('|'), ('type', '=', 'view'), ('state', '!=', 'valid')]}"/>
                     </group>
                 </form>
@@ -107,32 +109,12 @@
             <field name="context">{'search_default_validated': 1}</field>
             <field name="help">A budget is a forecast of your company's income and expenses expected for a period in the future. With a budget, a company is able to carefully look at how much money they are taking in during a given period, and figure out the best way to divide it among various categories. By keeping track of where your money goes, you may be less likely to overspend, and more likely to meet your financial goals. Forecast a budget by detailing the expected revenue per analytic account and monitor its evolution based on the actuals realised during that period.</field>
         </record>
-        
+
         <menuitem id="next_id_31" name="Budgets" parent="account.menu_finance" sequence="11"/>
         <menuitem parent="next_id_31"
             id="menu_act_crossovered_budget_view"
             action="act_crossovered_budget_view" sequence="1" />
 
-        <record id="wizard_budget_criteria_export_view" model="ir.ui.view">
-            <field name="name">Budget vs. Actuals Export</field>
-            <field name="model">wizard.budget.criteria.export</field>
-            <field name="type">form</field>
-            <field name="arch" type="xml">
-                <form string="Budget vs. Actuals Export">
-                    <field name="currency_table_id" domain="[('state','=','valid')]" />
-                    <field name="period_id"/>
-                    <field name="commitment"/>
-                    <field name="breakdown"/>
-                    <field name="granularity"/>
-                    <separator colspan="4"/>
-                    <group colspan="4" col="6">
-                        <button special="cancel" string="No" icon="gtk-cancel"/>
-                        <button name="button_create_budget_2" string="Create report" type="object" icon="gtk-ok"/>
-                    </group>
-                </form>
-            </field>
-        </record>
-
         <record id="wizard_budget_actual_export_view" model="ir.ui.view">
             <field name="name">Actuals by CC Export</field>
             <field name="model">wizard.actual.export</field>
@@ -162,7 +144,7 @@
                     <separator colspan="4"/>
                     <group colspan="4" col="6">
                         <button special="cancel" string="Cancel" icon="gtk-cancel"/>
-                        <button name="import_csv_budget" string="Import Budget" type="object" icon="gtk-ok"/>
+                        <button name="button_import" string="Import Budget" type="object" icon="gtk-ok"/>
                     </group>
                 </form>
             </field>
@@ -207,7 +189,7 @@
             <field name="view_id" ref="wizard_budget_import_view"/>
             <field name="target">new</field>
         </record>
-        
+
         <record id="wizard_local_expenses_view" model="ir.ui.view">
             <field name="name">Local Expenses</field>
             <field name="model">wizard.local.expenses</field>
@@ -245,15 +227,15 @@
 		<!-- Menu Item: Analytic Accounts which displays only Cost Center, and not allow: delete, new, edit
 		hide_new_button="1" hide_delete_button="1"
 		 -->
-        
+
         <menuitem parent="account.menu_finance_generic_reporting"
             action="action_wizard_local_expenses"
             id="menu_action_wizard_local_expenses"/>
-            
+
         <menuitem parent="next_id_31"
             action="action_wizard_budget_import"
             id="menu_action_wizard_budget_import"  sequence="2"/>
-            
+
         <record id="view_msf_budget_summary_tree" model="ir.ui.view">
             <field name="name">msf.budget.summary.tree</field>
             <field name="model">msf.budget.summary</field>
@@ -270,7 +252,7 @@
                 </tree>
             </field>
         </record>
-        
+
         <record id="action_wizard_budget_summary_tree" model="ir.actions.server">
             <field name="name">Budget Status</field>
             <field name="model_id" ref="model_msf_budget"/>
@@ -294,7 +276,7 @@
             <field name="domain">[('category','=','OC')]</field>
             <field name="field_parent">child_complete_ids</field>
             <field name="arch" type="xml">
-                <tree colors="red:(date&lt;current_date);black:(date&gt;=current_date);black:(date==False)" string="Analytic Accounts" 
+                <tree colors="red:(date&lt;current_date);black:(date&gt;=current_date);black:(date==False)" string="Analytic Accounts"
                  toolbar="1" hide_new_button="1" hide_delete_button="1" editable="top" noteditable="1">
                     <field name="name"/>
                     <field name="code"/>
@@ -371,10 +353,10 @@
             <field name="view_type">form</field>
             <field name="view_id" ref="view_msf_budget_decision_moment_tree"/>
         </record>
-        
+
         <menuitem id="menu_action_msf_budget_decision_moment_tree"
             parent="next_id_31"
             action="action_msf_budget_decision_moment_tree"/>
-        
+
     </data>
 </openerp>

=== modified file 'msf_budget/msf_budget_workflow.xml'
--- msf_budget/msf_budget_workflow.xml	2012-03-20 16:56:09 +0000
+++ msf_budget/msf_budget_workflow.xml	2014-03-21 08:49:45 +0000
@@ -20,7 +20,7 @@
         <field name="wkf_id" ref="wkf_msf_budget" />
         <field name="name">validate</field>
         <field name="kind">function</field>
-        <field name="action">write({'state':'valid'})</field>
+        <field name="action">action_confirmed()</field>
     </record>
 
     <record model="workflow.activity" id="act_done">
@@ -45,4 +45,4 @@
     </record>
     
 </data>
-</openerp>
\ No newline at end of file
+</openerp>

=== modified file 'msf_budget/report/__init__.py'
--- msf_budget/report/__init__.py	2012-07-25 11:49:04 +0000
+++ msf_budget/report/__init__.py	2014-03-21 08:49:45 +0000
@@ -21,7 +21,6 @@
 
 import report_budget_criteria
 import report_budget_actual
-import report_csv_budget_monthly
 import report_pdf_budget_monthly
 import report_pdf_budget_summary
 import report_pdf_engagement

=== modified file 'msf_budget/report/budget_criteria_xls.mako'
--- msf_budget/report/budget_criteria_xls.mako	2013-09-20 13:40:19 +0000
+++ msf_budget/report/budget_criteria_xls.mako	2014-03-21 08:49:45 +0000
@@ -20,426 +20,423 @@
   <ProtectStructure>False</ProtectStructure>
   <ProtectWindows>False</ProtectWindows>
  </ExcelWorkbook>
-
-
-
-
-
-
-
-
-<Styles>
-<Style ss:ID="Default" ss:Name="Normal">
-<Alignment ss:Vertical="Bottom"/>
-<Borders/>
-<Font/>
-<Interior/>
-<NumberFormat/>
-<Protection/>
-</Style>
-<Style ss:ID="s20" ss:Name="Percent">
-<NumberFormat ss:Format="0%"/>
-</Style>
-<Style ss:ID="s21">
-<Interior ss:Pattern="Solid"/>
-</Style>
-<Style ss:ID="s22">
-<Borders>
-<Border ss:Position="Bottom" ss:LineStyle="Continuous" ss:Weight="1"/>
-<Border ss:Position="Left" ss:LineStyle="Continuous" ss:Weight="1"/>
-<Border ss:Position="Right" ss:LineStyle="Continuous" ss:Weight="1"/>
-<Border ss:Position="Top" ss:LineStyle="Continuous" ss:Weight="1"/>
-</Borders>
-<Font x:Family="Swiss" ss:Bold="1"/>
-</Style>
-<Style ss:ID="s23">
-<Borders>
-<Border ss:Position="Bottom" ss:LineStyle="Continuous" ss:Weight="1"/>
-<Border ss:Position="Left" ss:LineStyle="Continuous" ss:Weight="1"/>
-<Border ss:Position="Right" ss:LineStyle="Continuous" ss:Weight="1"/>
-<Border ss:Position="Top" ss:LineStyle="Continuous" ss:Weight="1"/>
-</Borders>
-</Style>
-<Style ss:ID="s24">
-<Alignment ss:Horizontal="Left" ss:Vertical="Bottom"/>
-<Borders>
-<Border ss:Position="Bottom" ss:LineStyle="Continuous" ss:Weight="1"/>
-<Border ss:Position="Left" ss:LineStyle="Continuous" ss:Weight="1"/>
-<Border ss:Position="Right" ss:LineStyle="Continuous" ss:Weight="1"/>
-<Border ss:Position="Top" ss:LineStyle="Continuous" ss:Weight="1"/>
-</Borders>
-<Interior ss:Pattern="Solid"/>
-</Style>
-<Style ss:ID="s25">
-<Borders>
-<Border ss:Position="Bottom" ss:LineStyle="Continuous" ss:Weight="1"/>
-<Border ss:Position="Left" ss:LineStyle="Continuous" ss:Weight="1"/>
-<Border ss:Position="Right" ss:LineStyle="Continuous" ss:Weight="1"/>
-<Border ss:Position="Top" ss:LineStyle="Continuous" ss:Weight="1"/>
-</Borders>
-<Font x:Family="Swiss" ss:Bold="1"/>
-<Interior ss:Pattern="Solid"/>
-</Style>
-<Style ss:ID="s26">
-<Alignment ss:Vertical="Center" ss:WrapText="1"/>
-</Style>
-<Style ss:ID="s27">
-<Alignment ss:Vertical="Center" ss:WrapText="1"/>
-<Borders>
-<Border ss:Position="Bottom" ss:LineStyle="Continuous" ss:Weight="2"/>
-<Border ss:Position="Left" ss:LineStyle="Continuous" ss:Weight="2"/>
-<Border ss:Position="Right" ss:LineStyle="Continuous" ss:Weight="2"/>
-<Border ss:Position="Top" ss:LineStyle="Continuous" ss:Weight="2"/>
-</Borders>
-<Font x:Family="Swiss" ss:Bold="1"/>
-</Style>
-
-<Style ss:ID="s27a">
-<Alignment ss:Vertical="Center" ss:WrapText="1"/>
-<Borders>
-<Border ss:Position="Bottom" ss:LineStyle="Continuous" ss:Weight="1"/>
-<Border ss:Position="Left" ss:LineStyle="Continuous" ss:Weight="1"/>
-<Border ss:Position="Right" ss:LineStyle="Continuous" ss:Weight="1"/>
-<Border ss:Position="Top" ss:LineStyle="Continuous" ss:Weight="1"/>
-</Borders>
-<Font x:Family="Swiss" ss:Bold="1"/>
-</Style>
-
-
-<Style ss:ID="s32">
-<Alignment ss:Vertical="Center" ss:WrapText="1"/>
-<Borders>
-<Border ss:Position="Bottom" ss:LineStyle="Continuous" ss:Weight="2"/>
-<Border ss:Position="Left" ss:LineStyle="Continuous" ss:Weight="2"/>
-<Border ss:Position="Right" ss:LineStyle="Continuous" ss:Weight="1"/>
-<Border ss:Position="Top" ss:LineStyle="Continuous" ss:Weight="2"/>
-</Borders>
-<Font x:Family="Swiss" ss:Bold="1"/>
-<Interior  ss:Pattern="Solid"/>
-</Style>
-<Style ss:ID="s33">
-<Alignment ss:Vertical="Center" ss:WrapText="1"/>
-<Borders>
-<Border ss:Position="Bottom" ss:LineStyle="Continuous" ss:Weight="2"/>
-<Border ss:Position="Left" ss:LineStyle="Continuous" ss:Weight="1"/>
-<Border ss:Position="Right" ss:LineStyle="Continuous" ss:Weight="2"/>
-<Border ss:Position="Top" ss:LineStyle="Continuous" ss:Weight="2"/>
-</Borders>
-<Font x:Family="Swiss" ss:Bold="1"/>
-<Interior  ss:Pattern="Solid"/>
-</Style>
-<Style ss:ID="s34">
-<Alignment ss:Horizontal="Left" ss:Vertical="Bottom"/>
-<Interior  ss:Pattern="Solid"/>
-</Style>
-<Style ss:ID="s39">
-<Borders>
-<Border ss:Position="Bottom" ss:LineStyle="Continuous" ss:Weight="1"/>
-<Border ss:Position="Left" ss:LineStyle="Continuous" ss:Weight="2"/>
-<Border ss:Position="Right" ss:LineStyle="Continuous" ss:Weight="1"/>
-<Border ss:Position="Top" ss:LineStyle="Continuous" ss:Weight="2"/>
-</Borders>
-<Interior  ss:Pattern="Solid"/>
-<NumberFormat ss:Format="#,##0"/>
-</Style>
-<Style ss:ID="s41" ss:Parent="s20">
-<Borders>
-<Border ss:Position="Bottom" ss:LineStyle="Continuous" ss:Weight="1"/>
-<Border ss:Position="Left" ss:LineStyle="Continuous" ss:Weight="1"/>
-<Border ss:Position="Right" ss:LineStyle="Continuous" ss:Weight="2"/>
-<Border ss:Position="Top" ss:LineStyle="Continuous" ss:Weight="2"/>
-</Borders>
-<Interior  ss:Pattern="Solid"/>
-<NumberFormat ss:Format="0.0%"/>
-</Style>
-<Style ss:ID="s46">
-<Borders>
-<Border ss:Position="Bottom" ss:LineStyle="Continuous" ss:Weight="1"/>
-<Border ss:Position="Left" ss:LineStyle="Continuous" ss:Weight="2"/>
-<Border ss:Position="Right" ss:LineStyle="Continuous" ss:Weight="1"/>
-<Border ss:Position="Top" ss:LineStyle="Continuous" ss:Weight="1"/>
-</Borders>
-<Interior ss:Pattern="Solid"/>
-<NumberFormat ss:Format="#,##0"/>
-</Style>
-<Style ss:ID="s47" ss:Parent="s20">
-<Borders>
-<Border ss:Position="Bottom" ss:LineStyle="Continuous" ss:Weight="1"/>
-<Border ss:Position="Left" ss:LineStyle="Continuous" ss:Weight="1"/>
-<Border ss:Position="Right" ss:LineStyle="Continuous" ss:Weight="2"/>
-<Border ss:Position="Top" ss:LineStyle="Continuous" ss:Weight="1"/>
-</Borders>
-<Interior  ss:Pattern="Solid"/>
-<NumberFormat ss:Format="0.0%"/>
-</Style>
-<Style ss:ID="s53">
-<Borders>
-<Border ss:Position="Bottom" ss:LineStyle="Continuous" ss:Weight="2"/>