Merge lp:~odossmann/unifield-wm/UTP_1011 into lp:unifield-wm

[Olivier DOSSMANN]

For seeing changes.

[lp:~odossmann/unifield-wm/UTP_1011]

2215. By Olivier DOSSMANN on 2014-09-23

UTP-1011 [FIX] Correction from Coordo: Now we check our current instance to see if used cost center are in target CC. If not, do not make the line.

2216. By Olivier DOSSMANN on 2014-09-24

UTP-1011 [IMP] Display a message on journal item allocation to explain that this analytic distribution was reallocated upstream.

2217. By Olivier DOSSMANN on 2014-09-25

UTP-1011 [FIX] Analytic correction on multiple lines from project to coordo: Fix the fact that we don't delete right lines.

Unmerged revisions

2217. By Olivier DOSSMANN on 2014-09-25

UTP-1011 [FIX] Analytic correction on multiple lines from project to coordo: Fix the fact that we don't delete right lines.

2216. By Olivier DOSSMANN on 2014-09-24

UTP-1011 [IMP] Display a message on journal item allocation to explain that this analytic distribution was reallocated upstream.

2215. By Olivier DOSSMANN on 2014-09-23

UTP-1011 [FIX] Correction from Coordo: Now we check our current instance to see if used cost center are in target CC. If not, do not make the line.

2214. By Olivier DOSSMANN on 2014-09-17

UTP-1011 [FIX] Correction through synchronization: Fetch correctly the distribution from the coordo level to project one

2213. By Olivier DOSSMANN on 2014-09-17

UTP-1011 [FIX] Generate a correct dictionnary with SD REF values of element so that we can find them at project level

2212. By Olivier DOSSMANN on 2014-09-15

UTP-1011 [WIP] work in progress - Attempt to send and receive analytic distribution

2211. By Olivier DOSSMANN on 2014-09-12

UTP-1011 [WIP] work in progress - Change corrected_upstream field to a binary one to include analytic distribution into the move line

=== modified file 'account_corrections/account_move_line.py'
--- account_corrections/account_move_line.py	2014-05-12 12:55:30 +0000
+++ account_corrections/account_move_line.py	2014-09-25 13:09:07 +0000
@@ -887,7 +887,53 @@
             # UF-1746: Set also all other move lines as corrected upstream to disallow projet user to correct any move line of this move.
             move_ids = [x and x.get('move_id', False) and x.get('move_id')[0] for x in self.read(cr, uid, ids, ['move_id'], context=context)]
             ml_ids = self.search(cr, uid, [('move_id', 'in', move_ids)])
-            self.write(cr, uid, ml_ids, {'corrected_upstream': True}, check=False, update_check=False, context=context)
+            # UTP-1011: Make a dictionnary of the all entire analytic distribution and load it into corrected_upstream with cPickle (serialization)
+            from cPickle import dumps
+            distrib_obj = self.pool.get('analytic.distribution')
+            for ml in self.read(cr, uid, ml_ids, ['analytic_distribution_id'], context=context):
+                distrib_id = ml.get('analytic_distribution_id', False)
+                ml_id = ml.get('id')
+                if not distrib_id:
+                    continue
+                else:
+                    distrib_id = distrib_id[0]
+                ml_result = {
+                    'distrib_id': ml.get('analytic_distribution_id', False),
+                    'funding_pool_lines': [],
+                    'cost_center_lines': [],
+                    'free_1_lines': [],
+                    'free_2_lines': [],
+                    'corrected': False,
+                }
+                # Give another information: if this line was initially corrected or not. If this line was not originally corrected, so do no specific changes on it. Just keep the corrected_upstream field as it is.
+                if ml_id in ids:
+                    ml_result.update({'corrected': True})
+                # Browse distribution to remember it
+                distrib = distrib_obj.browse(cr, uid, [distrib_id], context=context)[0]
+                for object_name in [('funding_pool_lines', 'funding.pool.distribution.line'), ('cost_center_lines', 'cost.center.distribution.line'), ('free_1_lines', 'free.1.distribution.line'), ('free_2_lines', 'free.2.distribution.line')]:
+                    distrib_lines = getattr(distrib, object_name[0], False)
+                    if distrib_lines:
+                        # fetch info from the object
+                        object_obj = self.pool.get(object_name[1])
+                        fields = ['date', 'source_date', 'percentage', 'destination_id/id', 'analytic_id/id', 'currency_id/id']
+                        if object_name[0] == 'funding_pool_lines':
+                            fields.append('cost_center_id/id')
+                        distrib_line_ids = [x.id for x in distrib_lines]
+                        distrib_list = []
+                        if isinstance(distrib_line_ids, (int, long)):
+                            distrib_line_ids = [distrib_line_ids]
+                        for distrib_line_id in distrib_line_ids:
+                            distrib_dict = {}
+                            for field in fields:
+                                distrib_dict.update({
+                                    field: object_obj.export_data(cr, uid, [distrib_line_id], [field], context=context).get('datas', [False])[0],
+                                })
+                            distrib_list.append(distrib_dict)
+                        ml_result[object_name[0]].append(distrib_dict)
+                # Transform dict into a serialized object
+                binary_content = False
+                binary_content = dumps(ml_result)
+                self.write(cr, uid, ml_id, {'corrected_upstream': binary_content}, check=False, update_check=False, context=context)
         return True
 
 account_move_line()

=== modified file 'account_override/account_move_line.py'
--- account_override/account_move_line.py	2014-09-09 08:14:21 +0000
+++ account_override/account_move_line.py	2014-09-25 13:09:07 +0000
@@ -260,7 +260,7 @@
         ),
         'is_reconciled': fields.function(_get_is_reconciled, fnct_search=_search_is_reconciled, type='boolean', method=True, string="Is reconciled", help="Is that line partially/totally reconciled?"),
         'balance_currency': fields.function(_balance_currency, fnct_search=_balance_currency_search, method=True, string='Balance Booking'),
-        'corrected_upstream': fields.boolean('Corrected from CC/HQ', readonly=True, help='This line have been corrected from Coordo or HQ level to a cost center that have the same level or superior.'),
+        'corrected_upstream': fields.text('Corrected from CC/HQ', readonly=True, help='This line have been corrected from Coordo or HQ level to a cost center that have the same level or superior. The binary contains the analytic distribution found at Coordo Level.'),
         'line_number': fields.integer(string='Line Number'),
         'invoice_partner_link': fields.many2one('account.invoice', string="Invoice partner link", readonly=True,
             help="This link implies this line come from the total of an invoice, directly from partner account.", ondelete="cascade"),
@@ -347,6 +347,65 @@
                 raise osv.except_osv(_('Warning'), _('Given date [%s] is outside defined period: %s') % (date, period and period.name or ''))
         return True
 
+    def _generate_distribution_from_corrected(self, cr, uid, corrected_dict, context=None):
+        """
+        Check given dictionary, extract distribution and make a new distribution in the system.
+        Then return result
+        """
+        res = False
+        if context is None:
+            context = {}
+        # If not "corrected" or "corrected" is False, then return False
+        if not corrected_dict or not corrected_dict.get('corrected', False):
+            return res
+        # Example of what is fetch
+        # {'corrected': True, 'free_2_lines': [], 'distrib_id': (1, u'0 CC; 1 FP; 0 F1; 0 F2'), 'cost_center_lines': [], 'funding_pool_lines': [{'destination_id/id': [u'sd.analytic_distribution_analytic_account_destination_operation'], 'cost_center_id/id': [u'sd.OC_HT101_HT101'], 'analytic_id/id': [u'sd.analytic_distribution_analytic_account_msf_private_funds'], 'source_date': [u'2014-09-16'], 'date': [u'2014-09-16'], 'percentage': [u'100.0']}], 'free_1_lines': []}
+        distrib_id = self.pool.get('analytic.distribution').create(cr, uid, {}, context=context)
+        objs = [('funding_pool_lines', 'funding.pool.distribution.line'), ('cost_center_lines', 'cost.center.distribution.line'), ('free_2_lines', 'free.2.distribution.line'), ('free_1_lines', 'free.1.distribution.line')]
+        data_obj = self.pool.get('ir.model.data')
+        for obj in objs:
+            if corrected_dict.get(obj[0], False):
+                for line in corrected_dict.get(obj[0]):
+                    # Check for FP lines that CC is allowed
+                    if obj[0] == 'funding_pool_lines' and line.get('cost_center_id/id'):
+                        # Search ID for the cost center
+                        module, xml_id = line.get('cost_center_id/id')[0].rsplit('.', 1)
+                        data_ids = data_obj.search(cr, uid, [('model', '=', 'account.analytic.account'), ('name', '=', xml_id), ('module', '=', module)])
+                        if data_ids and len(data_ids) == 1:
+                            data = data_obj.read(cr, uid, data_ids, ['res_id'])[0]
+                            cc_id = data.get('res_id')
+                            # Pass the line creation if CC is not in targeted CC
+                            target_cc = self.pool.get('res.users').browse(cr, uid, uid).company_id.instance_id.target_cost_center_ids
+                            target_ids = [x.id for x in target_cc if x]
+                            if cc_id not in target_ids:
+                                continue
+                    # Initial values (distribution that we will use)
+                    vals = {
+                        'distribution_id': distrib_id,
+                    }
+                    # Normal fields
+                    for field in ['source_date', 'date', 'percentage']:
+                        vals.update({
+                            field: line[field] and line[field][0] or False,
+                        })
+                    # Specific fields
+                    fields = [('analytic_id/id', 'analytic_id', 'account.analytic.account'), ('destination_id/id', 'destination_id', 'account.analytic.account'), ('currency_id/id', 'currency_id', 'res.currency')]
+                    if obj[0] == 'funding_pool_lines':
+                        fields.append(('cost_center_id/id', 'cost_center_id', 'account.analytic.account'))
+                    for field in fields:
+                        if line.get(field[0]):
+                            module, xml_id = line.get(field[0])[0].rsplit('.', 1)
+                            data_ids = data_obj.search(cr, uid, [('model', '=', field[2]), ('name', '=', xml_id), ('module', '=', module)])
+                            if data_ids and len(data_ids) == 1:
+                                data = data_obj.read(cr, uid, data_ids, ['res_id'])[0]
+                                vals.update({
+                                    field[1]: data.get('res_id'),
+                                })
+                    self.pool.get(obj[1]).create(cr, uid, vals)
+        if distrib_id:
+            res = distrib_id
+        return res
+
     def create(self, cr, uid, vals, context=None, check=True):
         """
         Filled in 'document_date' if we come from tests
@@ -383,7 +442,8 @@
 
     def write(self, cr, uid, ids, vals, context=None, check=True, update_check=True):
         """
-        Check document_date and date validity
+        Check document_date and date validity.
+        If vals contains corrected_upstream (during synchronization), adapt the analytic distribution to the new one.
         """
         if not context:
             context = {}
@@ -403,6 +463,19 @@
                     context.update({'date': m.date})
         # Note that _check_document_date HAVE TO be BEFORE the super write. If not, some problems appears in ournal entries document/posting date changes at the same time!
         self._check_document_date(cr, uid, ids, vals)
+        # UTP-1011: If corrected_upstream, apply the given analytic distribution. But only when you come from synchro and that you are in project level
+        if vals.get('corrected_upstream', False) and context.get('sync_update_execution', False):
+            company = self.pool.get('res.users').browse(cr, uid, uid, context=context).company_id
+            if company and company.instance_id and company.instance_id.level in ['project']:
+                from cPickle import loads
+                corrected_dict = loads(vals.get('corrected_upstream').encode('utf-8'))
+                if corrected_dict:
+                    distrib_id = self._generate_distribution_from_corrected(cr, uid, corrected_dict, context=context)
+                    if distrib_id:
+                        vals.update({'analytic_distribution_id': distrib_id})
+                        # Change check and update_check so that it deletes all analytic lines and recreate them with the right analytic distribution
+                        check = True
+                        update_check = True
         res = super(account_move_line, self).write(cr, uid, ids, vals, context=context, check=check, update_check=update_check)
         return res
 

=== modified file 'analytic_distribution/analytic_distribution_wizard_view.xml'
--- analytic_distribution/analytic_distribution_wizard_view.xml	2014-01-15 13:48:41 +0000
+++ analytic_distribution/analytic_distribution_wizard_view.xml	2014-09-25 13:09:07 +0000
@@ -93,6 +93,12 @@
                             <label string="*: this action will copy the analytic distribution from the header to the line allowing then the user to make changes starting from the copied distribution." colspan="3" />
                         </group>
                     </group>
+                    <group colspan="4">
+                      <field name="corrected_upstream" invisible="1"/>
+                      <group colspan="3" col="3" attrs="{'invisible': [('corrected_upstream', '=', False)]}">
+                        <label string="This allocation was corrected upstream."/>
+                        </group>
+                    </group>
                     <group colspan="4" col="2" attrs="{'invisible': [('state', '!=', 'cc')]}">
                         <separator string="Cost Center"/>
                         <field colspan="4" name="line_ids" nolabel="1" widget="one2many_list" context="{'mode': entry_mode, 'from_purchase': purchase_id, 'from_sale_order': sale_order_id, 'parent_id':active_id}" attrs="{'readonly': [('is_writable', '=', False)]}"/>

=== modified file 'analytic_distribution/wizard/analytic_distribution_wizard.py'
--- analytic_distribution/wizard/analytic_distribution_wizard.py	2014-09-19 13:19:14 +0000
+++ analytic_distribution/wizard/analytic_distribution_wizard.py	2014-09-25 13:09:07 +0000
@@ -555,6 +555,18 @@
                 res[wiz.id] = abs(wiz.total_amount)
         return res
 
+    def _get_corrected_upstream(self, cr, uid, ids, name, args, context=None):
+        """
+        Check if Journal Item have a corrected_upstream field filled in. If yes, corrected_upstream on wizard is True.
+        """
+        # Prepare some values
+        res = {}
+        for wiz in self.browse(cr, uid, ids):
+            res[wiz.id] = False
+            if wiz.move_line_id and wiz.move_line_id.corrected_upstream:
+                res[wiz.id] = True
+        return res
+
     def _get_register_line_state(self, cr, uid, ids, name, args, context=None):
         """
         Get register line state if present.
@@ -606,6 +618,7 @@
         'partner_type': fields.text(string='Partner Type of FO/PO', required=False, readonly=True), #UF-2138: added the ref to partner type of FO/PO
         'cash_return_id': fields.many2one('wizard.cash.return', string="Advance Return"),
         'cash_return_line_id': fields.many2one('wizard.advance.line', string="Advance Return Line"),
+        'corrected_upstream': fields.function(_get_corrected_upstream, method=True, string="Corrected upstream?", type='boolean', readonly=True),
     }
 
     _defaults = {

=== modified file 'analytic_distribution/wizard/mass_reallocation_wizard.py'
--- analytic_distribution/wizard/mass_reallocation_wizard.py	2014-06-27 09:29:47 +0000
+++ analytic_distribution/wizard/mass_reallocation_wizard.py	2014-09-25 13:09:07 +0000
@@ -193,7 +193,7 @@
                     ('from_write_off', '=', True),
                     ('move_state', '=', 'draft'),
                     ('account_id.category', 'in', ['FREE1', 'FREE2']),
-                    ('move_id.corrected_upstream', '=', True)
+                    ('move_id.corrected_upstream', '!=', False)
                 ]
 
             search_ns_ids = self.pool.get('account.analytic.line').search(cr, uid, search_args, context=context)
@@ -290,7 +290,7 @@
                     ('from_write_off', '=', True),
                     ('move_state', '=', 'draft'),
                     ('account_id.category', 'in', ['FREE1', 'FREE2']),
-                    ('move_id.corrected_upstream', '=', True)
+                    ('move_id.corrected_upstream', '!=', False)
                 ]
             search_ns_ids = self.pool.get('account.analytic.line').search(cr, uid, search_args)
             if search_ns_ids: