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

[jftempo]

[lp:~unifield-team/unifield-wm/UF_2164]

1837. By jftempo on 2013-11-05

UF-2164 [IMP] Correction handling
lp:~unifield-team/unifield-wm/UF_2164

1838. By jftempo on 2013-11-06

UF-2164 [IMP] Code simplification

=== modified file 'account_corrections/__init__.py'
--- account_corrections/__init__.py	2013-09-13 13:57:37 +0000
+++ account_corrections/__init__.py	2013-11-06 10:36:19 +0000
@@ -23,5 +23,7 @@
 
 import account_move_line
 import wizard
+import account_analytic_line
+import account_invoice
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== added file 'account_corrections/account_analytic_line.py'
--- account_corrections/account_analytic_line.py	1970-01-01 00:00:00 +0000
+++ account_corrections/account_analytic_line.py	2013-11-06 10:36:19 +0000
@@ -0,0 +1,149 @@
+#!/usr/bin/env python
+#-*- encoding:utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2011 TeMPO Consulting, MSF. All Rights Reserved
+#    Developer: Olivier DOSSMANN
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from osv import osv
+from osv import fields
+from tools.translate import _
+
+class account_analytic_line(osv.osv):
+    _name = 'account.analytic.line'
+    _inherit = 'account.analytic.line'
+
+    _columns = {
+        'is_corrigible': fields.related('move_id', 'is_corrigible', string='Is correctible?', type="boolean", readonly=True),
+        'last_corrected_id': fields.many2one('account.analytic.line', string="Last corrected entry", readonly=True),
+    }
+
+    def button_corrections(self, cr, uid, ids, context=None):
+        """
+        Launch accounting correction wizard to do reverse or correction on selected analytic line.
+        """
+        # Verification
+        if not context:
+            context={}
+        if isinstance(ids, (int, long)):
+            ids = [ids]
+        # Retrieve some values
+        wiz_obj = self.pool.get('wizard.journal.items.corrections')
+        al = self.browse(cr, uid, ids[0])
+        if not al.move_id:
+            raise osv.except_osv(_('Warning'), _('No link to a journal item found!'))
+        if not al.move_id.is_corrigible:
+            raise osv.except_osv(_('Error'), _('The journal item linked to this analytic line is not correctible!'))
+        # Create wizard
+        wizard = wiz_obj.create(cr, uid, {'move_line_id': al.move_id.id}, context=context)
+        # Change wizard state in order to change date requirement on wizard
+        wiz_obj.write(cr, uid, [wizard], {'state': 'open'}, context=context)
+        # Update context
+        context.update({
+            'active_id': al.move_id.id,
+            'active_ids': [al.move_id.id],
+        })
+        # Change context if account special type is "donation"
+        if al.move_id.account_id and al.move_id.account_id.type_for_register and al.move_id.account_id.type_for_register == 'donation':
+            wiz_obj.write(cr, uid, [wizard], {'from_donation': True}, context=context)
+        # Update context to inform wizard we come from a correction wizard
+        context.update({'from_correction': True,})
+        return {
+            'name': _("Accounting Corrections Wizard (from Analytic Journal Items)"),
+            'type': 'ir.actions.act_window',
+            'res_model': 'wizard.journal.items.corrections',
+            'target': 'new',
+            'view_mode': 'form,tree',
+            'view_type': 'form',
+            'res_id': [wizard],
+            'context': context,
+        }
+
+    def get_corrections_history(self, cr, uid, ids, context=None):
+        """
+        Give for each line their history by using "move_id and reversal_origin" field to browse lines
+        Return something like that: 
+            {id1: [line_id, another_line_id], id2: [a_line_id, other_line_id]}
+        """
+        # Verifications
+        if not context:
+            context = {}
+        if isinstance(ids, (int, long)):
+            ids = [ids]
+        # Prepare some values
+        res = {}
+        upstream_line_ids = []
+        downstream_line_ids = []
+        # Browse all given lines
+        for aml in self.browse(cr, uid, ids, context=context):
+            # Get upstream move lines
+            line = aml
+            while line:
+                # Add line to result
+                upstream_line_ids.append(line.id)
+                # Add reversal line to result
+                upstream_line_ids += self.search(cr, uid, [('reversal_origin', '=', line.id), ('is_reversal', '=', True)], context=context)
+                line = line.last_corrected_id
+            # Get downstream move lines
+            sline_ids = [aml.id]
+            while sline_ids:
+                sline_ids = self.search(cr, uid, [('last_corrected_id', 'in', sline_ids)], context=context)
+                if sline_ids:
+                    # Add line to result
+                    downstream_line_ids += sline_ids
+                    # Add reversal line to result
+                    downstream_line_ids += self.search(cr, uid, [('reversal_origin', 'in', sline_ids), ('is_reversal', '=', True)], context=context)
+
+        return  list(set(upstream_line_ids + downstream_line_ids))
+
+    def button_open_analytic_corrections(self, cr, uid, ids, context=None):
+        """
+        Open a wizard that contains all analytic lines linked to this one.
+        """
+        # Verification
+        if not context:
+            context={}
+        if isinstance(ids, (int, long)):
+            ids = [ids]
+
+        # Search ids to be open
+        domain_ids = self.get_corrections_history(cr, uid, ids, context=context)
+        # Create domain
+        domain = [('id', 'in', domain_ids)]
+        # Update context
+        context.update({
+            'active_id': ids[0],
+            'active_ids': ids,
+            'display_fp': True,
+        })
+        # Display the result
+        return {
+            'name': "History Analytic Line",
+            'type': 'ir.actions.act_window',
+            'res_model': 'account.analytic.line',
+            'target': 'new',
+            'view_type': 'form',
+            'view_mode': 'tree',
+            'context': context,
+            'domain': domain,
+        }
+        return True
+
+account_analytic_line()
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== added file 'account_corrections/account_invoice.py'
--- account_corrections/account_invoice.py	1970-01-01 00:00:00 +0000
+++ account_corrections/account_invoice.py	2013-11-06 10:36:19 +0000
@@ -0,0 +1,85 @@
+#!/usr/bin/env python
+#-*- encoding:utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2013 TeMPO Consulting, MSF. All Rights Reserved
+#    Developer: Olivier DOSSMANN
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from osv import osv
+from osv import fields
+from tools.translate import _
+from time import strftime
+
+class account_invoice_line(osv.osv):
+    _name = 'account.invoice.line'
+    _inherit = 'account.invoice.line'
+
+    def _have_been_corrected(self, cr, uid, ids, name, args, context=None):
+        """
+        Return True if ALL elements are OK:
+         - a journal items is linked to this invoice line
+         - the journal items is linked to an analytic line that have been reallocated
+        """
+        if context is None:
+            context = {}
+        res = {}
+
+        def has_ana_reallocated(move):
+            for ml in move.move_lines or []:
+                for al in ml.analytic_lines or []:
+                    if al.is_reallocated:
+                        return True
+            return False
+
+        for il in self.browse(cr, uid, ids, context=context):
+            res[il.id] = has_ana_reallocated(il)
+        return res
+
+    _columns = {
+        'is_corrected': fields.function(_have_been_corrected, method=True, string="Have been corrected?", type='boolean', 
+            readonly=True, help="This informs system if this item have been corrected in analytic lines. Criteria: the invoice line is linked to a journal items that have analytic item which is reallocated.", 
+            store=False),
+    }
+
+    _defaults = {
+        'is_corrected': lambda *a: False,
+    }
+
+    def button_open_analytic_lines(self, cr, uid, ids, context=None):
+        """
+        Return analytic lines linked to this invoice line.
+        First we takes all journal items that are linked to this invoice line.
+        Then for all journal items, we take all analytic journal items.
+        Finally we display the result for "button_open_analytic_corrections" of analytic lines
+        """
+        # Some checks
+        if not context:
+            context = {}
+        # Prepare some values
+        al_ids = []
+        # Browse give invoice lines
+        for il in self.browse(cr, uid, ids, context=context):
+            if il.move_lines:
+                for ml in il.move_lines:
+                    if ml.analytic_lines:
+                        al_ids += [x.id for x in ml.analytic_lines]
+        return self.pool.get('account.analytic.line').button_open_analytic_corrections(cr, uid, al_ids, context=context)
+
+account_invoice_line()
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== modified file 'account_corrections/account_move_line.py'
--- account_corrections/account_move_line.py	2013-09-13 13:57:37 +0000
+++ account_corrections/account_move_line.py	2013-11-06 10:36:19 +0000
@@ -256,7 +256,7 @@
         # Update context to inform wizard we come from a correction wizard
         context.update({'from_correction': True,})
         return {
-            'name': "Accounting Corrections Wizard",
+            'name': _("Accounting Corrections Wizard (from Journal Items)"),
             'type': 'ir.actions.act_window',
             'res_model': 'wizard.journal.items.corrections',
             'target': 'new',
@@ -600,6 +600,13 @@
             # Abort process if this move line was corrected before
             if ml.corrected:
                 continue
+            # If this line was already been corrected, check the first analytic line ID (but not the first first analytic line)
+            first_analytic_line_id = False
+            first_ana_ids = self.pool.get('account.analytic.line').search(cr, uid, [('move_id', '=', ml.id)])
+            if first_ana_ids:
+                first_ana = self.pool.get('account.analytic.line').browse(cr, uid, first_ana_ids)[0]
+                if first_ana.last_corrected_id:
+                    first_analytic_line_id = first_ana.last_corrected_id.id
             # Retrieve right journal
             journal_id = j_corr_id
 
@@ -681,19 +688,23 @@
             move_obj.post(cr, uid, [move_id], context=context)
             # Change analytic lines that come from:
             #- initial move line: is_reallocated is True
-            #- reversal move line: is_reversal is True
+            #- reversal move line: is_reversal is True + initial analytic line
             #- correction line: change is_reallocated and is_reversal to False
             #- old reversal line: reset is_reversal to True (lost previously in validate())
+            initial_al_ids = al_obj.search(cr, uid, [('move_id', '=', ml.id)])
             search_datas = [(ml.id, {'is_reallocated': True}),
-                            (rev_line_id, {'is_reversal': True}),
-                            (correction_line_id, {'is_reallocated': False, 'is_reversal': False})]
+                            (rev_line_id, {'is_reversal': True, 'reversal_origin': initial_al_ids[0]}),
+                            (correction_line_id, {'is_reallocated': False, 'is_reversal': False, 'last_corrected_id': initial_al_ids[0]})]
             # If line is already a correction, take the previous reversal move line id
             # (UF_1234: otherwise, the reversal is not set correctly)
             if ml.corrected_line_id:
                 old_reverse_ids = self.search(cr, uid, [('reversal_line_id', '=', ml.corrected_line_id.id)])
                 if len(old_reverse_ids) > 0:
-                    search_datas += [(old_reverse_ids[0], {'is_reversal': True})]
+                    search_datas += [(old_reverse_ids[0], {'is_reversal': True, 'reversal_origin': first_analytic_line_id})]
             for search_data in search_datas:
+                # keep initial analytic line as corrected line if it the 2nd or more correction on this line
+                if ml.corrected_line_id and search_data[0] == ml.id and first_analytic_line_id:
+                    search_data[1].update({'last_corrected_id': first_analytic_line_id})
                 search_ids = al_obj.search(cr, uid, [('move_id', '=', search_data[0])])
                 if search_ids:
                     al_obj.write(cr, uid, search_ids, search_data[1])

=== modified file 'account_corrections/account_wizard_view.xml'
--- account_corrections/account_wizard_view.xml	2013-07-30 12:08:55 +0000
+++ account_corrections/account_wizard_view.xml	2013-11-06 10:36:19 +0000
@@ -9,11 +9,9 @@
             <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree hide_new_button="1" hide_delete_button="1" editable="bottom" colors="blue:analytic_distribution_state in ('valid');red:analytic_distribution_state in ('invalid');black:analytic_distribution_state in ('none')">
-                    <field name="journal_id"/>
                     <field name="move_id"/>
                     <field name="ref"/>
                     <field name="date"/>
-                    <field name="period_id"/>
                     <field name="account_id" domain="[('type', '&lt;&gt;', 'view')]"/>
                     <button name="button_analytic_distribution" type="object" icon="terp-stock_symbol-selection" string="Ana. Distri."/>
                     <field name="analytic_distribution_state"/>
@@ -32,13 +30,13 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Journal items corrections Wizard">
-                    <field name="move_line_id" invisible="1" colspan="1"/>
-                    <field name="date" on_change="onchange_date(date)"/>
+                    <separator string="Correction"/>
+                    <field name="date" on_change="onchange_date(date)" colspan="2"/>
+                    <label string="" colspan="2"/>
                     <field name="from_donation" invisible="1"/>
                     <newline/>
-                    <field name="to_be_corrected_ids" colspan="6" context="{'from_donation_account': from_donation}" />
+                    <field name="to_be_corrected_ids" colspan="6" context="{'from_donation_account': from_donation}" nolabel="1"/>
                     <newline/>
-                    <label string="" colspan="6"/>
                     <group colspan="4" col="6">
                         <label string ="" colspan="1"/>
                         <button icon="gtk-cancel" special="cancel" string="Cancel"/>
@@ -63,9 +61,12 @@
                             attrs="{'invisible': [('state', '!=', 'correction')], 'required': [('state', '=', 'correction')]}"/>
                         <newline/>
                     </xpath>
-                    <xpath expr="/form//button[@name='button_confirm']" position="replace">
-                        <button name="button_confirm" string="Save" type="object" icon="gtk-ok" colspan="1" attrs="{'invisible': [('state', '=', 'correction')], 'readonly': [('is_writable', '=', False)]}"/>
-                        <button name="button_confirm" string="Correct it!" type="object" icon="gtk-edit" colspan="1" attrs="{'invisible': [('state', '!=', 'correction')]}"/>
+                    <xpath expr="/form//field[@name='state']" position="before">
+                        <group colspan="4" attrs="{'invisible': [('state', '!=', 'correction')]}">
+                            <label string="" colspan="2"/>
+                            <button name="button_cancel" string='Cancel' type='object' icon='gtk-cancel' colspan="1"/>
+                            <button name="button_confirm" string="Correct it" type="object" icon="gtk-edit" colspan="1" attrs="{'readonly': [('is_writable', '=', False)]}"/>
+                        </group>
                     </xpath>
                 </data>
             </field>

=== modified file 'account_corrections/wizard/analytic_distribution_wizard.py'
--- account_corrections/wizard/analytic_distribution_wizard.py	2013-11-05 09:23:49 +0000
+++ account_corrections/wizard/analytic_distribution_wizard.py	2013-11-06 10:36:19 +0000
@@ -204,11 +204,12 @@
             # reverse the line
             to_reverse_ids = self.pool.get('account.analytic.line').search(cr, uid, [('distrib_line_id', '=', 'funding.pool.distribution.line,%d'%line.distribution_line_id.id), ('is_reversal', '=', False), ('is_reallocated', '=', False)])
             # UTP-943: Set wizard date as date for REVERSAL AND CORRECTION lines
-            rev_ids = self.pool.get('account.analytic.line').reverse(cr, uid, to_reverse_ids, posting_date=wizard.date)
+            reversed_ids = self.pool.get('account.analytic.line').reverse(cr, uid, to_reverse_ids[0], posting_date=wizard.date)
+            # Add reversal origin link (to not loose it). last_corrected_id is to prevent case where you do a reverse a line that have been already corrected
             # UTP-943: Add correction journal on it
-            self.pool.get('account.analytic.line').write(cr, uid, rev_ids, {'journal_id': correction_journal_id})
+            self.pool.get('account.analytic.line').write(cr, uid, [reversed_ids[0]], {'reversal_origin': to_reverse_ids[0], 'last_corrected_id': False, 'journal_id': correction_journal_id})
             # Mark old lines as non reallocatable (ana_ids): why reverse() don't set this flag ?
-            self.pool.get('account.analytic.line').write(cr, uid, to_reverse_ids, {'is_reallocated': True,})
+            self.pool.get('account.analytic.line').write(cr, uid, [to_reverse_ids[0]], {'is_reallocated': True,})
             # update the distrib line
             name = False
             if to_reverse_ids:
@@ -228,9 +229,10 @@
                 if cp.state != 'draft':
                     raise osv.except_osv(_('Error'), _('Period (%s) is not open.') % (cp.name,))
             # Create the new ana line
-            cor_ids = self.pool.get('funding.pool.distribution.line').create_analytic_lines(cr, uid, line.distribution_line_id.id, ml.id, date=wizard.date, document_date=orig_document_date, source_date=orig_date, name=name)
-            for distrib_id in cor_ids:
-                self.pool.get('account.analytic.line').write(cr, uid, [cor_ids[distrib_id]], {'journal_id': correction_journal_id})
+            ret = self.pool.get('funding.pool.distribution.line').create_analytic_lines(cr, uid, line.distribution_line_id.id, ml.id, date=wizard.date, document_date=orig_document_date, source_date=orig_date, name=name)
+            # Add link to first analytic lines
+            for ret_id in ret:
+                self.pool.get('account.analytic.line').write(cr, uid, [ret[ret_id]], {'last_corrected_id': to_reverse_ids[0], 'journal_id': correction_journal_id})
 
         for line in to_override:
             # update the ana line

=== modified file 'account_hq_entries/hq_entries.py'
--- account_hq_entries/hq_entries.py	2013-10-31 13:55:38 +0000
+++ account_hq_entries/hq_entries.py	2013-11-06 10:36:19 +0000
@@ -255,8 +255,10 @@
             # create new lines
             if not fp_old_lines: # UTP-546 - this have been added because of sync that break analytic lines generation
                 continue
-            ana_line_obj.copy(cr, uid, fp_old_lines[0], {'date': current_date, 'source_date': line.date, 'cost_center_id': line.cost_center_id.id, 
-                'account_id': line.analytic_id.id, 'destination_id': line.destination_id.id, 'journal_id': acor_journal_id})
+            cor_ids = ana_line_obj.copy(cr, uid, fp_old_lines[0], {'date': current_date, 'source_date': line.date, 'cost_center_id': line.cost_center_id.id, 
+                'account_id': line.analytic_id.id, 'destination_id': line.destination_id.id, 'journal_id': acor_journal_id, 'last_correction_id': fp_old_lines[0]})
+            # update new ana line
+            ana_line_obj.write(cr, uid, cor_ids, {'last_corrected_id': fp_old_lines[0]})
             # update old ana lines
             ana_line_obj.write(cr, uid, fp_old_lines, {'is_reallocated': True})
 

=== modified file 'account_mcdb/account_view.xml'
--- account_mcdb/account_view.xml	2013-04-16 15:08:18 +0000
+++ account_mcdb/account_view.xml	2013-11-06 10:36:19 +0000
@@ -10,6 +10,12 @@
             <field name="arch" type="xml">
                 <tree string="Account Entries" min_rows="100" hide_new_button="1">
                     <field name="instance_id"/>
+                    <field name="is_corrigible" invisible="1"/>
+                    <field name="have_an_historic" invisible="1"/>
+                    <button name="button_do_accounting_corrections" type="object" string="Open Accounting Correction Wizard" 
+                        attrs="{'invisible': [('is_corrigible', '=', False)]}" icon="terp-mail-message-new"/>
+                    <button name="button_open_corrections" type="object" string="Open corrections history" 
+                        attrs="{'invisible': [('have_an_historic', '=', False)]}" icon="terp-mail-"/>
                     <field name="journal_id"/>
                     <field name="move_id"/>
                     <field name="name"/>
@@ -47,10 +53,15 @@
             <field name="model">account.analytic.line</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
-                <tree string="Analytic Line" min_rows="100" editable="bottom" noteditable="1" hide_delete_button="1" hide_new_button="1">
+                <tree string="Analytic Journal Items" min_rows="100" editable="bottom" noteditable="1" hide_delete_button="1" hide_new_button="1">
                     <field name="is_reallocated" invisible="1"/>
-                    <button string="Have been reallocated" attrs="{'invisible': [('is_reallocated', '=', False)]}" icon="terp-mail-" colspan="2"/>
                     <field name="instance_id"/>
+                    <field name="is_reversal" invisible="1"/>
+                    <field name="journal_type" invisible="1"/>
+                    <field name="is_corrigible" invisible="1"/>
+                    <button name="button_corrections" type="object" string="Accounting info/correction" 
+                        attrs="{'invisible': ['|', '|', '|', ('is_reallocated', '=', True), ('is_reversal', '=', True), ('journal_type', '=', 'engagement'), ('is_corrigible', '=', False)]}" icon="terp-mail-message-new"/>
+                    <button string="Have been reallocated?" attrs="{'invisible': [('is_reallocated', '=', False)]}" icon="terp-mail-" colspan="2" name="button_open_analytic_corrections" type="object"/>
                     <field name="journal_id"/>
                     <field name="entry_sequence"/>
                     <field name="name"/>
@@ -75,6 +86,29 @@
             </field>
         </record>
 
+    <!-- Account analytic line tree view -->
+        <record model="ir.ui.view" id="account_analytic_line_default">
+            <field name="name">account.analytic.line.default</field>
+            <field name="model">account.analytic.line</field>
+            <field name="type">tree</field>
+            <field name="inherit_id" ref="account.view_account_analytic_line_tree"/>
+            <field name="priority" eval="40"/>
+            <field name="arch" type="xml">
+                <data>
+                    <xpath expr="/tree/field[@name='journal_id']" position="before">
+                        <field name="is_reversal" invisible="1"/>
+                        <field name="journal_type" invisible="1"/>
+                        <field name="is_corrigible" invisible="1"/>
+                        <button name="button_corrections" type="object" string="Accounting info/correction" 
+                            attrs="{'invisible': ['|', '|', '|', ('is_reallocated', '=', True), ('is_reversal', '=', True), ('journal_type', '=', 'engagement'), ('is_corrigible', '=', False)]}" icon="terp-mail-message-new"/>
+                        <field name="is_reallocated" invisible="1"/>
+                        <field name="last_corrected_id" invisible="1"/>
+                        <button string="Have been reallocated" attrs="{'invisible': [('is_reallocated', '=', False), ('last_corrected_id', '=', False)]}" icon="terp-mail-" colspan="2" name="button_open_analytic_corrections" type="object"/>
+                   </xpath>
+                </data>
+            </field>
+        </record>
+
     <!-- Account move line search view -->
         <record id="mcdb_view_account_move_line_filter" model="ir.ui.view">
             <field name="name">Journal Items</field>

=== modified file 'account_msf/invoice.py'
--- account_msf/invoice.py	2013-03-11 10:50:12 +0000
+++ account_msf/invoice.py	2013-11-06 10:36:19 +0000
@@ -250,7 +250,7 @@
             if inv.type != 'out_invoice' or inv.is_debit_note == False:
                 raise osv.except_osv(_('Error'), _('You can only do import invoice on a Debit Note!'))
             w_id = self.pool.get('debit.note.import.invoice').create(cr, uid, {'invoice_id': inv.id, 'currency_id': inv.currency_id.id, 
-                'partner_id': inv.partner_id.id})
+                'partner_id': inv.partner_id.id}, context=context)
             context.update({
                 'active_id': inv.id,
                 'active_ids': ids,

=== modified file 'account_msf/invoice_view.xml'
--- account_msf/invoice_view.xml	2013-09-09 13:14:25 +0000
+++ account_msf/invoice_view.xml	2013-11-06 10:36:19 +0000
@@ -185,6 +185,8 @@
                             <field colspan="4" name="invoice_line" nolabel="1" widget="one2many_list">
                                 <tree editable="top" string="Donation Lines" noteditable="1" hide_new_button="1" colors="red: inactive_product == True">
                                     <field name="line_number"/>
+                                    <field name="is_corrected" invisible="1"/>
+                                    <button name="button_open_analytic_lines" string="Have been corrected" type="object" icon="terp-mail-" attrs="{'invisible': [('is_corrected', '=', False)]}"/>
                                     <field name="product_id"/>
                                     <field name="account_id" />
                                     <button name="button_analytic_distribution" string="Analytical Distribution" type="object" icon="terp-stock_symbol-selection" 
@@ -282,6 +284,8 @@
                             <newline/>
                             <field colspan="4" name="invoice_line" nolabel="1" widget="one2many_list">
                                 <tree editable="top" string="Intermission Voucher Lines" hide_new_button="1" colors="red: inactive_product == True">
+                                    <field name="is_corrected" invisible="1"/>
+                                    <button name="button_open_analytic_lines" string="Have been corrected" type="object" icon="terp-mail-" attrs="{'invisible': [('is_corrected', '=', False)]}"/>
                                     <field name="name"/>
                                     <field name="account_id" />
                                     <button name="button_analytic_distribution" string="Analytical Distribution" type="object" icon="terp-stock_symbol-selection" 

=== modified file 'account_override/account_analytic_line.py'
--- account_override/account_analytic_line.py	2013-10-31 13:55:38 +0000
+++ account_override/account_analytic_line.py	2013-11-06 10:36:19 +0000
@@ -54,6 +54,7 @@
         'is_reversal': fields.boolean('Reversal?'),
         'is_reallocated': fields.boolean('Reallocated?'),
         'journal_id': fields.many2one('account.analytic.journal', 'Journal Code', required=True, ondelete='restrict', select=True, readonly=True),
+        'journal_type': fields.related('journal_id', 'type', 'Journal type', readonly=True),
         'date': fields.date('Posting Date', required=True, select=True, readonly=True),
         'document_date': fields.date('Document Date', readonly=True, required=True),
         'move_id': fields.many2one('account.move.line', 'Entry Sequence', ondelete='restrict', select=True, readonly=True, domain="[('account_id.user_type.code', 'in', ['expense', 'income'])]"), # UF-1719: Domain added for search view

=== modified file 'account_override/account_view.xml'
--- account_override/account_view.xml	2013-10-21 12:02:45 +0000
+++ account_override/account_view.xml	2013-11-06 10:36:19 +0000
@@ -14,6 +14,8 @@
                 <data>
                     <xpath expr="/tree/field[@name='name']" position="before">
                         <field name="line_number"/>
+                        <field name="is_corrected" invisible="1"/>
+                        <button name="button_open_analytic_lines" string="Have been corrected" type="object" icon="terp-mail-" attrs="{'invisible': [('is_corrected', '=', False)]}"/>
                     </xpath>
                 </data>
             </field>

=== modified file 'analytic_distribution/analytic_distribution_wizard_view.xml'
--- analytic_distribution/analytic_distribution_wizard_view.xml	2013-10-30 11:00:44 +0000
+++ analytic_distribution/analytic_distribution_wizard_view.xml	2013-11-06 10:36:19 +0000
@@ -109,7 +109,7 @@
                             <field colspan="4" name="f2_line_ids" nolabel="1" widget="one2many_list" context="{'mode': entry_mode, 'parent_id':active_id}" attrs="{'readonly': [('is_writable', '=', False)]}"/>
                         </group>
                     </group>
-                    <group colspan="4">
+                    <group colspan="4" attrs="{'invisible': [('state', '=', 'correction')]}">
                         <label string="" colspan="2"/>
                         <button name="button_cancel" string='Cancel' type='object' icon='gtk-cancel' colspan="1"/>
                         <button name="button_confirm" string="Save" type="object" icon="gtk-ok" colspan="1" attrs="{'readonly': [('is_writable', '=', False)]}"/>

=== modified file 'analytic_distribution/analytic_line.py'
--- analytic_distribution/analytic_line.py	2013-11-05 09:23:49 +0000
+++ analytic_distribution/analytic_line.py	2013-11-06 10:36:19 +0000
@@ -324,7 +324,7 @@
                     # First reverse line
                     rev_ids = self.pool.get('account.analytic.line').reverse(cr, uid, [aline.id], posting_date=date)
                     # UTP-943: Shoud have a correction journal on these lines
-                    self.pool.get('account.analytic.line').write(cr, uid, rev_ids, {'journal_id': correction_journal_id})
+                    self.pool.get('account.analytic.line').write(cr, uid, rev_ids, {'journal_id': correction_journal_id, 'is_reversal': True, 'reversal_origin': aline.id, 'last_corrected_id': False})
                     # UTP-943: Check that period is open
                     correction_period_ids = self.pool.get('account.period').get_period_from_date(cr, uid, date, context=context)
                     if not correction_period_ids:
@@ -333,8 +333,9 @@
                         if p.state != 'draft':
                             raise osv.except_osv(_('Error'), _('Period (%s) is not open.') % (p.name,))
                     # then create new lines
-                    self.pool.get('account.analytic.line').copy(cr, uid, aline.id, {fieldname: account_id, 'date': date,
+                    cor_ids = self.pool.get('account.analytic.line').copy(cr, uid, aline.id, {fieldname: account_id, 'date': date,
                         'source_date': aline.source_date or aline.date, 'journal_id': correction_journal_id}, context=context)
+                    self.pool.get('account.analytic.line').write(cr, uid, cor_ids, {'last_corrected_id': aline.id})
                     # finally flag analytic line as reallocated
                     self.pool.get('account.analytic.line').write(cr, uid, [aline.id], {'is_reallocated': True})
             else:

=== modified file 'analytic_distribution/analytic_line_view.xml'
--- analytic_distribution/analytic_line_view.xml	2013-07-08 16:03:00 +0000
+++ analytic_distribution/analytic_line_view.xml	2013-11-06 10:36:19 +0000
@@ -11,11 +11,6 @@
             <field name="priority" eval="11"/>
             <field name="arch" type="xml">
                 <data>
-                    <xpath expr="/tree/field[@name='journal_id']" position='before'>
-                        <field name="is_reallocated" invisible="1"/>
-                        <button string="Have been reallocated" attrs="{'invisible': [('is_reallocated', '=', False)]}" 
-                            icon="terp-mail-" colspan="2"/>
-                    </xpath>
                     <xpath expr="/tree/field[@name='move_id']" position='replace'>
                         <field name="entry_sequence"/>
                     </xpath>

=== modified file 'analytic_distribution_invoice/account_invoice_view.xml'
--- analytic_distribution_invoice/account_invoice_view.xml	2013-03-26 17:07:53 +0000
+++ analytic_distribution_invoice/account_invoice_view.xml	2013-11-06 10:36:19 +0000
@@ -26,7 +26,11 @@
                         <field name="is_allocatable" invisible="1"/>
                     </xpath>
                     <xpath expr="//tree[@string='Invoice lines']" position="attributes">
-                        <attribute name="colors">red:analytic_distribution_state in ('invalid') or inactive_product == True;blue:analytic_distribution_state in ('valid') and inactive_product == False;black:analytic_distribution_state in ('none') and inactive_product = False</attribute>
+                        <attribute name="colors">red:analytic_distribution_state in ('invalid') or inactive_product == True;blue:analytic_distribution_state in ('valid') and inactive_product == False;black:analytic_distribution_state in ('none') and inactive_product == False</attribute>
+                    </xpath>
+                    <xpath expr="//tree[@string='Invoice lines']/field[@name='product_id']" position="before">
+                        <field name="is_corrected" invisible="1"/>
+                        <button name="button_open_analytic_lines" string="Have been corrected" type="object" icon="terp-mail-" attrs="{'invisible': [('is_corrected', '=', False)]}"/>
                     </xpath>
                 </data>
             </field>

=== modified file 'analytic_distribution_invoice/invoice.py'
--- analytic_distribution_invoice/invoice.py	2013-07-19 13:23:03 +0000
+++ analytic_distribution_invoice/invoice.py	2013-11-06 10:36:19 +0000
@@ -128,9 +128,12 @@
                 # Give false analytic lines for 'line' in order not to give an error
                 if 'analytic_line_ids' in el[2]:
                     el[2]['analytic_line_ids'] = False
-                # Give false order_line_id in order not to give an error
-                if 'order_line_id' in el[2]:
-                    el[2]['order_line_id'] = el[2].get('order_line_id', False) and el[2]['order_line_id'][0] or False
+                # Give false for (because not needed):
+                # - order_line_id
+                # - sale_order_line_id
+                for field in ['order_line_id', 'sale_order_line_id']:
+                    if field in el[2]:
+                        el[2][field] = el[2].get(field, False) and el[2][field][0] or False
         return res
 
     def refund(self, cr, uid, ids, date=None, period_id=None, description=None, journal_id=None, document_date=None):

=== modified file 'msf_instance/msf_instance_view.xml'
--- msf_instance/msf_instance_view.xml	2013-10-31 21:48:37 +0000
+++ msf_instance/msf_instance_view.xml	2013-11-06 10:36:19 +0000
@@ -125,6 +125,7 @@
             <field name="model">account.analytic.line</field>
             <field name="type">tree</field>
             <field name="inherit_id" ref="account.view_account_analytic_line_tree"/>
+            <field name="priority" eval="18"/>
             <field name="arch" type="xml">
                 <field name="journal_id" position="before">
                     <field name="instance_id" readonly="1"/>
@@ -297,6 +298,20 @@
             </field>
         </record>
 
+        <record id="view_move_line_tree_from_move_inherit" model="ir.ui.view">
+            <field name="name">account.move.line.tree.from.move.inherit</field>
+            <field name="model">account.move.line</field>
+            <field name="type">tree</field>
+            <field name="inherit_id" ref="register_accounting.view_move_line_tree_from_move"/>
+            <field name="arch" type="xml">
+                <data>
+                    <xpath expr="/tree/field[@name='is_corrigible']" position="before">
+                        <field name="instance_id" readonly="1"/>
+                    </xpath>
+                </data>
+            </field>
+        </record>
+
         <record id="view_account_move_line_filter_instance_inherit" model="ir.ui.view">
             <field name="name">account.move.line.filter.instance.inherit</field>
             <field name="model">account.move.line</field>

=== modified file 'register_accounting/account_bank_statement.py'
--- register_accounting/account_bank_statement.py	2013-10-14 16:04:11 +0000
+++ register_accounting/account_bank_statement.py	2013-11-06 10:36:19 +0000
@@ -862,6 +862,52 @@
             return open_register_view(self, cr, uid, st_line.statement_id.id)
         raise osv.except_osv(_('Warning'), _('You have to select some line to return to a register.'))
 
+    def get_analytic_lines(self, cr, uid, ids, context=None):
+        """
+        Give all analytic lines linked to the given register line(s)
+        """
+        # Some verifications
+        if not context:
+            context = {}
+        if not 'active_ids' in context or not context.get('active_ids', False):
+            raise osv.except_osv(_('Error'), _('No line selected!'))
+        # Use right register line IDS
+        ids = context.get('active_ids')
+        if isinstance(ids, (int, long)):
+            ids = [ids]
+        # Check which move_id to use
+        move_ids = []
+        for absl in self.browse(cr, uid, ids):
+            if absl.move_ids:
+                # Default ones (direct link to register lines)
+                for m in absl.move_ids:
+                    if m.id not in move_ids:
+                        move_ids.append(m.id)
+                    # Those from cash advance return (we should use the reconciliation to find the return and its expenses)
+                    for ml in m.line_id:
+                        if ml.reconcile_id and ml.reconcile_id.line_id:
+                            for line in ml.reconcile_id.line_id:
+                                if line.move_id and line.move_id.id and line.move_id.id not in move_ids:
+                                    move_ids.append(line.move_id.id)
+            # Those from pending payments (imported_invoice_line_ids are move_line)
+            if absl.imported_invoice_line_ids:
+                for ml in absl.imported_invoice_line_ids:
+                    if ml.move_id and ml.move_id.id not in move_ids:
+                        move_ids.append(ml.move_id.id)
+        # Search valid ids
+        domain = [('account_id.category', '=', 'FUNDING'), ('move_id.move_id', 'in', move_ids)]
+        context.update({'display_fp': True}) # to display "Funding Pool" column name instead of "Analytic account"
+        return {
+            'name': _('Analytic Journal Items'),
+            'type': 'ir.actions.act_window',
+            'res_model': 'account.analytic.line',
+            'view_type': 'form',
+            'view_mode': 'tree,form',
+            'context': context,
+            'domain': domain,
+            'target': 'current',
+        }
+
     def create_move_from_st_line(self, cr, uid, st_line_id, company_currency_id, st_line_number, context=None):
         """
         Create move from the register line
@@ -1714,6 +1760,17 @@
         """
         return self.posting(cr, uid, ids, 'temp', context=context)
 
+    def button_analytic_lines(self, cr, uid, ids, context=None):
+        """
+        Give analytic lines linked to the given register lines
+        """
+        if not context:
+            context = {}
+        # Update context
+        context.update({'active_ids': ids})
+        # Return result of action named "Analytic Lines" on register lines
+        return self.get_analytic_lines(cr, uid, ids, context=context)
+
     def unlink(self, cr, uid, ids, context=None):
         """
         Permit to delete some account_bank_statement_line. But do some treatments on temp posting lines and do nothing for hard posting lines.

=== modified file 'register_accounting/account_invoice_view.xml'
--- register_accounting/account_invoice_view.xml	2013-09-11 14:31:05 +0000
+++ register_accounting/account_invoice_view.xml	2013-11-06 10:36:19 +0000
@@ -130,6 +130,8 @@
                                 address_invoice_id, 'partner_id': partner_id, 'price_type': 'price_type' in dir() and price_type or False}" 
                                 name="invoice_line" nolabel="1" attrs="{'readonly': [('state', 'not in', ['draft', 'open']), ('is_direct_invoice', '=', True)]}">
                                 <tree editable="bottom" string="Invoice lines" colors="blue:inactive_product == False and analytic_distribution_state in ('valid');red:analytic_distribution_state in ('invalid') or inactive_product == True;black:inactive_product == False and analytic_distribution_state in ('none')">
+                                    <field name="is_corrected" invisible="1"/>
+                                    <button name="button_open_analytic_lines" string="Have been corrected" type="object" icon="terp-mail-" attrs="{'invisible': [('is_corrected', '=', False)]}"/>
                                     <field name="product_id" on_change="product_id_change(product_id, uos_id, quantity, name, parent.type, 
                                         parent.partner_id, parent.fiscal_position, price_unit, parent.address_invoice_id, parent.currency_id, 
                                         {'company_id': parent.company_id})"/>

=== modified file 'register_accounting/account_view.xml'
--- register_accounting/account_view.xml	2013-10-14 16:04:11 +0000
+++ register_accounting/account_view.xml	2013-11-06 10:36:19 +0000
@@ -55,6 +55,7 @@
                                 <field colspan="4" name="line_ids" nolabel="1">
                                     <tree editable="bottom" string="Statement lines" noteditable="state=='hard' or direct_invoice is True" colors="red:display_analytic_button and (not analytic_distribution_id or analytic_distribution_state == 'invalid')">
                                         <button name="button_duplicate" string="Duplicate" type="object" icon="gtk-copy" />
+                                        <button name="button_analytic_lines" string="Analytic lines" type="object" icon="terp-stock_zoom" />
                                         <field name="document_date" attrs="{'readonly': [('from_import_cheque_id', '!=', False)]}"/>
                                         <field name="date"/>
                                         <field name="sequence_for_reference" />
@@ -189,6 +190,7 @@
                                 <field colspan="4" name="line_ids" nolabel="1">
                                     <tree editable="bottom" string="Statement lines" noteditable="state=='hard' or direct_invoice is True" colors="red:display_analytic_button and (not analytic_distribution_id or analytic_distribution_state == 'invalid')">
                                         <button name="button_duplicate" string="Duplicate" type="object" icon="gtk-copy" />
+                                        <button name="button_analytic_lines" string="Analytic lines" type="object" icon="terp-stock_zoom" />
                                         <field name="from_cash_return" invisible="1"/>
                                         <button name="button_advance" states="hard" string="Advance return" type="object" 
                                             icon="terp-stock_effects-object-colorize" context="context" 
@@ -355,6 +357,7 @@
                         icon="terp-stock_effects-object-colorize" context="context"
                         attrs="{'invisible': ['|', ('from_cash_return', '=', True), '|', ('amount', '&gt;=', 0), 
                             ('employee_id', '=', False)]}"/>
+                    <button name="button_analytic_lines" string="Analytic lines" type="object" icon="terp-stock_zoom" />
                     <field name="from_cash_return" invisible="1"/>
                     <field name="amount" invisible="1"/>
                     <field name="document_date"/>
@@ -663,6 +666,7 @@
                                 <!-- WARNING: because of UTP-331, in cheque register direct invoice lines should be editable but ONLY for cheque_number FIELD. That's why ALL field must be not editable when "direct_invoice" is True. -->
                                 <tree editable="bottom" string="Statement lines" noteditable="state=='hard'" colors="red:display_analytic_button and (not analytic_distribution_id or analytic_distribution_state == 'invalid')">
                                     <button name="button_duplicate" string="Duplicate" type="object" icon="gtk-copy" />
+                                    <button name="button_analytic_lines" string="Analytic lines" type="object" icon="terp-stock_zoom" />
                                     <field name="document_date" attrs="{'readonly': [('direct_invoice', '=', True)]}"/>
                                     <field name="date" attrs="{'readonly': [('direct_invoice', '=', True)]}"/>
                                     <field name="cheque_number" required="1"/>
@@ -910,6 +914,12 @@
             <field name="priority" eval="1"/>
             <field name="arch" type="xml">
                 <tree string="Journal Items" editable="bottom" noteditable="1" colors="red:state in ('draft');black:state in ('valid')" hide_new_button="1">
+                    <field name="is_corrigible" invisible="1"/>
+                    <field name="have_an_historic" invisible="1"/>
+                    <button name="button_do_accounting_corrections" type="object" string="Open Accounting Correction Wizard" 
+                        attrs="{'invisible': [('is_corrigible', '=', False)]}" icon="terp-mail-message-new"/>
+                    <button name="button_open_corrections" type="object" string="Open corrections history" 
+                        attrs="{'invisible': [('have_an_historic', '=', False)]}" icon="terp-mail-"/>
                     <field name="journal_id"/>
                     <field name="move_id"/>
                     <field name="name"/>

=== modified file 'register_accounting/account_wizard.xml'
--- register_accounting/account_wizard.xml	2013-01-30 15:51:06 +0000
+++ register_accounting/account_wizard.xml	2013-11-06 10:36:19 +0000
@@ -42,6 +42,7 @@
             Account bank statement lines
         -->
 
+        <!-- Return to the register linked to the given line -->
         <record id="action_return_to_register" model="ir.actions.server">
             <field name="name">Return to register</field>
             <field name="model_id" ref="model_account_bank_statement_line"/>
@@ -57,5 +58,21 @@
             <field eval="True" name="object"/>
         </record>
 
+        <!-- Display all Analytic Lines attached to given Register Lines -->
+        <record id="action_analytic_register_lines" model="ir.actions.server">
+            <field name="name">Analytic Lines</field>
+            <field name="model_id" ref="model_account_bank_statement_line"/>
+            <field name="state">code</field>
+            <field name="code">action = obj.get_analytic_lines(context=context)</field>
+        </record>
+
+        <record id="ir_open_analytic_register_lines" model="ir.values">
+            <field name="key2">client_action_multi</field>
+            <field name="model">account.bank.statement.line</field>
+            <field name="name">Analytic Lines</field>
+            <field eval="'ir.actions.server,%d'%action_analytic_register_lines" name="value"/>
+            <field eval="True" name="object"/>
+        </record>
+
     </data>
 </openerp>