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

[jftempo]

=== modified file 'account_journal/account_journal.py'
--- account_journal/account_journal.py	2016-01-29 13:48:03 +0000
+++ account_journal/account_journal.py	2016-02-08 10:52:01 +0000
@@ -297,8 +297,11 @@
 
             #BKLG-53 get the next draft period from today
             current_date = datetime.date.today().strftime('%Y-%m-%d')
-            periods = self.pool.get('account.period').search(cr, uid, [('date_stop','>=',current_date),('state','=','draft')],
-                                                         context=context, limit=1, order='date_stop')
+            periods = self.pool.get('account.period').search(cr, uid, [
+                    ('date_stop','>=',current_date),
+                    ('state','=','draft'),
+                    ('special', '=', False),
+                ], context=context, limit=1, order='date_stop')
             if not periods:
                 raise osv.except_osv(_('Warning'), _('Sorry, No open period for creating the register!'))
             self.pool.get('account.bank.statement') \

=== modified file 'account_mcdb/account_mcdb.py'
--- account_mcdb/account_mcdb.py	2015-06-17 08:52:51 +0000
+++ account_mcdb/account_mcdb.py	2016-02-08 10:52:01 +0000
@@ -31,7 +31,7 @@
 
     _columns = {
         'description': fields.char("Query name", required=False, readonly=False, size=255),
-        'journal_ids': fields.many2many(obj='account.journal', rel='account_journal_mcdb', id1='mcdb_id', id2='journal_id', string="Journal Code"),
+        'journal_ids': fields.many2many(obj='account.journal', rel='account_journal_mcdb', id1='mcdb_id', id2='journal_id', string="Journal Code", domain="[('code', '!=', 'IB')]"),  # exclude year closing initial balance journal
         'instance_ids': fields.many2many('msf.instance', 'instance_mcdb', 'mcdb_id', 'instance_id', string="Proprietary instance"),
         'analytic_journal_ids': fields.many2many(obj='account.analytic.journal', rel='account_analytic_journal_mcdb', id1='mcdb_id', id2='analytic_journal_id', string="Analytic journal code"),
         'abs_id': fields.many2one('account.bank.statement', string="Register name"), # Change into many2many ?
@@ -45,7 +45,7 @@
         'account_ids': fields.many2many(obj='account.account', rel='account_account_mcdb', id1='mcdb_id', id2='account_id', string="Account Code"),
         'partner_id': fields.many2one('res.partner', string="Partner"),
         'employee_id': fields.many2one('hr.employee', string="Employee"),
-        'transfer_journal_id': fields.many2one('account.journal', string="Journal"),
+        'transfer_journal_id': fields.many2one('account.journal', string="Journal", domain="[('code', '!=', 'IB')]"),  # exclude year closing initial balance journal
         'reconciled': fields.selection([('reconciled', 'Reconciled'), ('unreconciled', 'NOT reconciled')], string='Reconciled?'),
         'functional_currency_id': fields.many2one('res.currency', string="Functional currency", readonly=True),
         'amount_func_from': fields.float('Begin amount in functional currency'),

=== modified file 'account_mcdb/account_view.xml'
--- account_mcdb/account_view.xml	2016-01-22 13:35:15 +0000
+++ account_mcdb/account_view.xml	2016-02-08 10:52:01 +0000
@@ -160,7 +160,7 @@
                         <group>
                             <field name="partner_id" select='1' string="3RD Party Partner"/>
                             <field name="employee_id" select='1' string="3RD Party Employee"/>
-                            <field name="transfer_journal_id" select='1' string="3RD Party Journal"/>
+                            <field name="transfer_journal_id" select='1' string="3RD Party Journal" context="{'exclude_journals': ['IB']}"/>
                             <field name="is_reconciled" select='1'/>
                             <field name="reconcile_total_partial_id" select='1'/>
                             <newline/>
@@ -168,7 +168,7 @@
                         <newline/>
                         <group>
                             <field name="instance_id" on_change="onchange_filter_journal(instance_id, journal_id_fake)"/>
-                            <field name="journal_id_fake" context="{'journal_id':self, 'visible_id':self, 'normal_view':False}"/>
+                            <field name="journal_id_fake" context="{'journal_id':self, 'visible_id':self, 'normal_view':False, 'exclude_journals': ['IB']}"/>
                             <field name="journal_type"/>
                         </group>
                         <newline/>
@@ -184,7 +184,7 @@
                         <group expand="0" string="Group By..." colspan="4" col="20">
                             <filter string="3rd party Partner" icon="terp-partner" domain="[]" context="{'group_by':'partner_id'}"/>
                             <filter string="3rd party Employee" icon="terp-personal-" domain="[]" context="{'group_by': 'employee_id'}"/>
-                            <filter string="3rd party Journal" icon="terp-dolar" domain="[]" context="{'group_by': 'transfer_journal_id'}"/>
+                            <filter string="3rd party Journal" icon="terp-dolar" domain="[]" context="{'group_by': 'transfer_journal_id', 'exclude_journals': ['IB']}"/>
                             <separator orientation="vertical"/>
                             <filter string="Journal" icon="terp-folder-orange" domain="[]" context="{'group_by':'journal_id'}"/>
                             <filter string="Account"  icon="terp-folder-green" context="{'group_by':'account_id'}"/>
@@ -386,12 +386,12 @@
                             <group col='8' colspan='4'>
                                 <field name="partner_id" select="1" string="3RD Party Partner"/>
                                 <field name="employee_id" select="1" string="3RD Party Employee"/>
-                                <field name="transfer_journal_id" select="1" string="3RD Party Journal"/>
+                                <field name="transfer_journal_id" select="1" string="3RD Party Journal" context="{'exclude_journals': ['IB']}"/>
                             </group>
                             <newline/>
                             <group col='8' colspan='4'>
                                 <field name="instance_id" on_change="onchange_filter_journal(instance_id, journal_id_fake)"/>
-                                <field name="journal_id_fake"/>
+                                <field name="journal_id_fake" context="{'exclude_journals': ['IB']}" />
                                 <field name="journal_type"/>
                             </group>
                             <newline/>
@@ -400,7 +400,7 @@
                                 <filter string="3rd party Employee" icon="terp-personal-" domain="[]" context="{'group_by': 'employee_id'}"/>
                                 <filter string="3rd party Journal" icon="terp-dolar" domain="[]" context="{'group_by': 'transfer_journal_id'}"/>
                                 <separator orientation="vertical"/>
-                                <filter string="Journal" icon="terp-folder-orange" domain="[]" context="{'group_by':'journal_id'}"/>
+                                <filter string="Journal" icon="terp-folder-orange" domain="[]" context="{'group_by':'journal_id', 'exclude_journals': ['IB']}"/>
                                 <filter string="States" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
                                 <separator orientation="vertical"/>
                                 <filter string="Period" icon="terp-go-month" domain="[]" context="{'group_by':'period_id'}"/>

=== modified file 'account_override/account.py'
--- account_override/account.py	2016-01-29 11:15:41 +0000
+++ account_override/account.py	2016-02-08 10:52:01 +0000
@@ -527,7 +527,7 @@
         'ref': fields.char('Reference', size=64, readonly=True, states={'draft':[('readonly',False)]}),
         'status': fields.selection([('sys', 'system'), ('manu', 'manual')], string="Status", required=True),
         'period_id': fields.many2one('account.period', 'Period', required=True, states={'posted':[('readonly',True)]}, domain="[('state', '=', 'draft')]"),
-        'journal_id': fields.many2one('account.journal', 'Journal', required=True, states={'posted':[('readonly',True)]}, domain="[('type', 'not in', ['accrual', 'hq', 'inkind', 'cur_adj']), ('instance_filter', '=', True)]"),
+        'journal_id': fields.many2one('account.journal', 'Journal', required=True, states={'posted':[('readonly',True)]}, domain="[('type', 'not in', ['accrual', 'hq', 'inkind', 'cur_adj', 'system']), ('instance_filter', '=', True)]"),
         'document_date': fields.date('Document Date', size=255, required=True, help="Used for manual journal entries"),
         'journal_type': fields.related('journal_id', 'type', type='selection', selection=_journal_type_get, string="Journal Type", \
             help="This indicates which Journal Type is attached to this Journal Entry"),

=== modified file 'account_period_closing_level/account_period.py'
--- account_period_closing_level/account_period.py	2016-01-25 14:14:07 +0000
+++ account_period_closing_level/account_period.py	2016-02-08 10:52:01 +0000
@@ -150,7 +150,8 @@
                 pp_ids = self.search(
                     cr, uid,
                     [('date_start', '<', period.date_start),
-                    ('fiscalyear_id', '=', period.fiscalyear_id.id)],
+                    ('fiscalyear_id', '=', period.fiscalyear_id.id),
+                    ('number', '>', 0), ('number', '<', 16)],
                     context=context)
                 for pp in self.browse(cr, uid, pp_ids, context=context):
                     if check_states.index(pp.state) <= check_states.index(period.state):
@@ -161,7 +162,8 @@
                 np_ids = self.search(
                     cr, uid,
                     [('date_start', '>', period.date_start),
-                    ('fiscalyear_id', '=', period.fiscalyear_id.id)],
+                    ('fiscalyear_id', '=', period.fiscalyear_id.id),
+                    ('number', '>', 0), ('number', '<', 16)],
                     context=context)
                 for np in self.browse(cr, uid, np_ids, context=context):
                     if check_states.index(np.state) >= check_states.index(period.state):
@@ -290,7 +292,7 @@
             raise osv.except_osv(_('Error'), msg)
         operator = 'in' if args[0][2] else 'not in'
 
-        return [('number', operator, (0, 16, ))]
+        return [('number', operator, [0, 16, ])]
 
     _columns = {
         'name': fields.char('Period Name', size=64, required=True, translate=True),

=== modified file 'account_period_closing_level/account_year_end_closing.py'
--- account_period_closing_level/account_year_end_closing.py	2016-01-30 10:30:49 +0000
+++ account_period_closing_level/account_year_end_closing.py	2016-02-08 10:52:01 +0000
@@ -33,13 +33,16 @@
     _columns = {
         # US-822 counterpart for BS account
         'ye_pl_cp_for_bs_debit_bal_account': fields.many2one('account.account',
-            'Counterpart for B/S debit balance'),
+            'Counterpart for B/S debit balance',
+            domain=['|', ('user_type.code', 'in', ('income', 'expense', 'equity')), '&', ('type', '=', 'other'), ('user_type.code', '=', 'equity')]),
         'ye_pl_cp_for_bs_credit_bal_account': fields.many2one('account.account',
-            'Counterpart for B/S credit balance'),
+            'Counterpart for B/S credit balance',
+            domain=['|', ('user_type.code', 'in', ('income', 'expense')), '&', ('type', '=', 'other'), ('user_type.code', '=', 'equity')]),
 
         # US-822 PL/BS matrix of dev2/dev3 accounts"
         'ye_pl_pos_credit_account': fields.many2one('account.account',
-            'Credit Account for P&L>0 (Income account)'),
+            'Credit Account for P&L>0 (Income account)',
+            domain=[('user_type.code', '=', 'income')]),
         'ye_pl_pos_debit_account': fields.many2one('account.account',
             'Debit Account for P&L>0 (B/S account)',
             domain=[('type', '=', 'other'), ('user_type.code', '=', 'equity')]),
@@ -47,7 +50,8 @@
             'Credit Account P&L<0 (B/S account)',
             domain=[('type', '=', 'other'), ('user_type.code', '=', 'equity')]),
         'ye_pl_ne_debit_account': fields.many2one('account.account',
-            'Debit Account P&L<0 (Expense account)'),
+            'Debit Account P&L<0 (Expense account)',
+            domain=[('user_type.code', '=', 'expense')]),
     }
 
 res_company()
@@ -325,8 +329,7 @@
             """
             create state valid JI in its CCY/JE
             """
-            name = "EOY-%d-%s-%s-%s" % (fy_year, account_code,
-                instance_rec.code, ccy_code, )
+            name = 'Balance move to 0'
 
             vals = {
                 'account_id': account_id,
@@ -469,8 +472,7 @@
             """
             create state valid JI in its CCY/JE
             """
-            name = self._book_pl_results_seqnum_pattern % (fy_year,
-                instance_rec.code, cpy_rec.currency_id.name, )
+            name = 'P&L Result'
 
             vals = {
                 'account_id': account_rec.id,
@@ -569,7 +571,7 @@
             """
             create draft CCY/JE to log JI into
             """
-            name = "IB-%d-%s-%s-%s" % (fy_year, account_code,
+            name = "IB-%d-%s-%s-%s" % (fy_year + 1, account_code,
                 instance_rec.code, ccy_code, )
 
             vals = {
@@ -592,9 +594,7 @@
             """
             create state valid JI in its CCY/JE
             """
-            if not name:
-                name = "IB-%d-%s-%s-%s" % (fy_year, account_code,
-                    instance_rec.code, ccy_code, )
+            default_name = 'Balance report / Previous Fiscal Year'
 
             vals = {
                 'account_id': account_id,
@@ -604,7 +604,7 @@
                 'document_date': posting_date,
                 'instance_id': instance_rec.id,
                 'journal_id': journal_id,
-                'name': name,
+                'name': name or default_name,
                 'period_id': period_id,
                 'source_date': posting_date,
 
@@ -710,7 +710,6 @@
         if not cr.rowcount:
             return
 
-        re_account_found_in_bs = False
         je_by_acc_ccy = {}  # JE/ ACC/CCY, key: (acc_id, ccy_id), value: JE id
         for account_id, account_code, ccy_id, ccy_code, \
             balance_currency, balance in cr.fetchall():
@@ -730,24 +729,20 @@
                 account_id=account_id, account_code=account_code,
                 balance_currency=balance_currency, balance=balance, je_id=je_id)
 
-        if not re_account_found_in_bs:
-            # Regular/Equity account result entry for P&L
-
-            # invert balance amount to debit or credit amount after account dispatch
-            pl_balance *= -1
-
-            je_id = je_by_acc_ccy.get(
-                (re_account_rec.id, cpy_rec.currency_id.id, ), False)
-            if not je_id:
-                je_id = create_journal_entry(ccy_id=ccy_id,
-                    ccy_code=cpy_rec.currency_id.name,
-                    account_id=re_account_rec.id,
-                    account_code=re_account_rec.code)
-            create_journal_item(ccy_id=cpy_rec.currency_id.id,
+        # Regular/Equity account result entry for P&L
+        # => invert balance amount to debit or credit amount after account dispatch
+        je_id = je_by_acc_ccy.get(
+            (re_account_rec.id, cpy_rec.currency_id.id, ), False)
+        if not je_id:
+            je_id = create_journal_entry(ccy_id=ccy_id,
                 ccy_code=cpy_rec.currency_id.name,
-                account_id=re_account_rec.id, account_code=re_account_rec.code,
-                balance_currency=pl_balance, balance=pl_balance, je_id=je_id,
-                name="P&L Result report / Previous Fiscal Year")
+                account_id=re_account_rec.id,
+                account_code=re_account_rec.code)
+        create_journal_item(ccy_id=cpy_rec.currency_id.id,
+            ccy_code=cpy_rec.currency_id.name,
+            account_id=re_account_rec.id, account_code=re_account_rec.code,
+            balance_currency=pl_balance, balance=pl_balance, je_id=je_id,
+            name="P&L Result report / Previous Fiscal Year")
 
     def update_fy_state(self, cr, uid, fy_id, reopen=False, context=None):
         def hq_close_post_entries(period_ids):

=== modified file 'msf_accrual/msf_accrual_line.py'
--- msf_accrual/msf_accrual_line.py	2015-12-04 09:03:53 +0000
+++ msf_accrual/msf_accrual_line.py	2016-02-08 10:52:01 +0000
@@ -72,7 +72,7 @@
     _columns = {
         'date': fields.date("Date"),
         'document_date': fields.date("Document Date", required=True),
-        'period_id': fields.many2one('account.period', 'Period', required=True, domain=[('state', '=', 'draft')]),
+        'period_id': fields.many2one('account.period', 'Period', required=True, domain=[('state', '=', 'draft'), ('is_system', '=', False)]),
         'description': fields.char('Description', size=64, required=True),
         'reference': fields.char('Reference', size=64),
         'expense_account_id': fields.many2one('account.account', 'Expense Account', required=True, domain=[('type', '!=', 'view'), ('user_type_code', '=', 'expense')]),

=== modified file 'msf_instance/add_instance.py'
--- msf_instance/add_instance.py	2016-01-04 13:16:43 +0000
+++ msf_instance/add_instance.py	2016-02-08 10:52:01 +0000
@@ -192,10 +192,31 @@
 
         ret = []
         for journal in self.read(cr, uid, ids, ['code', 'instance_id']):
+            if context:
+                exclude_journals = context.get('exclude_journals', False)
+                if exclude_journals:
+                    if isinstance(exclude_journals, str):
+                        exclude_journals = [exclude_journals]
+                    if journal['code'] in exclude_journals:
+                        continue
             ret.append((journal['id'], '%s / %s'%(journal['instance_id'] and journal['instance_id'][1] or '', journal['code'])))
-
         return ret
 
+    def search(self, cr, uid, args, offset=0, limit=None, order=None, context=None,
+        count=False):
+        if args is None:
+            args = []
+        if context:
+            exclude_journals = context.get('exclude_journals', False)
+            if exclude_journals:
+                if isinstance(exclude_journals, str):
+                    exclude_journals = [exclude_journals]
+            args.append(('code', 'not in', exclude_journals))
+        res = super(account_journal_fake, self).search(cr, uid, args,
+            offset=offset, limit=limit, order=order, context=context,
+            count=count)
+        return res
+
     def fields_view_get(self, cr, uid, view_id=None, view_type='form', context=None, toolbar=False, submenu=False):
         return self.pool.get('account.journal').fields_view_get(cr, uid, view_id, view_type, context, toolbar, submenu)
 

=== modified file 'vertical_integration/report/hq_report_ocb.py'
--- vertical_integration/report/hq_report_ocb.py	2016-01-30 10:30:49 +0000
+++ vertical_integration/report/hq_report_ocb.py	2016-02-08 10:52:01 +0000
@@ -254,9 +254,7 @@
         period = pool.get('account.period').browse(cr, uid, period_id)
         last_day_of_period = period.date_stop
         first_day_of_period = period.date_start
-        period_name = period.name
         selection = form.get('selection', False)
-        to_export = ['f'] # Default export value for exported field on analytic/move lines
         tm = strptime(first_day_of_period, '%Y-%m-%d')
         year_num = tm.tm_year
         year = str(year_num)
@@ -264,6 +262,7 @@
         period_yyyymm = "{0}{1}".format(year,month)
         if not selection:
             raise osv.except_osv(_('Error'), _('No selection value for lines to select.'))
+        # Default export value for exported field on analytic/move lines
         if selection == 'all':
             to_export = ['f', 't']
         elif selection == 'unexported':
@@ -274,10 +273,7 @@
         # US-822: if December is picked should:
         # - include Period 16 action 2 Year end PL RESULT entries
         #   of target Coordo
-        rawdata_tpl_context= {
-            'plres': '',
-            'plres2': '',
-        }
+        plresult_ji_in_ids = []
         if period.number == 12:
             ayec_obj = pool.get("account.year.end.closing")
             mi_obj = pool.get('msf.instance')
@@ -301,19 +297,9 @@
                     je_ids = m_obj.search(cr, uid, [ ('name', 'in', seqnums) ],
                         context=context)
                     if je_ids:
-                        ji_ids = ml_obj.search(cr, uid, [
+                        plresult_ji_in_ids = ml_obj.search(cr, uid, [
                             ('move_id', 'in', je_ids)
                         ], context=context)
-                        if ji_ids:
-                            plresult_ji_in_ids = ','.join(map(str, ji_ids))
-                            rawdata_tpl_context.update({
-                                # pl result JIs clause (aml alias version)
-                                'plres':  ' or aml.id in (%s)' % (
-                                    plresult_ji_in_ids, ),
-                                # pl result JIs clause (aml2 alias version)
-                                'plres2':  ' or aml2.id in (%s)' % (
-                                    plresult_ji_in_ids, ),
-                            })
 
         # Prepare SQL requests and PROCESS requests for finance_archive object
 
@@ -458,7 +444,7 @@
                      account_account AS a, 
                      account_analytic_account AS aa, 
                      account_analytic_account AS aa2, 
-                     account_analytic_account AS aa3, 
+                     account_analytic_account AS aa3,
                      res_currency AS c, 
                      res_company AS e, 
                      res_currency AS cc, 
@@ -479,11 +465,11 @@
                                from account_move_line aml2, account_move am,
                                account_period as p2
                                where am.id = aml2.move_id and p2.id = am.period_id
-                               and ((p2.number not in (0, 16) and am.state = 'posted')$plres2)
+                               and p2.number not in (0, 16) and am.state = 'posted'
                               )
                 AND al.instance_id = i.id
                 AND aml.journal_id = aj.id
-                AND (aml.period_id = %s$plres)
+                AND aml.period_id = %s
                 AND j.type not in %s
                 AND al.exported in %s
                 AND al.instance_id in %s;
@@ -494,7 +480,7 @@
             'bs_entries_consolidated': """
                 SELECT aml.id
                 FROM account_move_line AS aml, account_account AS aa, account_journal AS j
-                WHERE (aml.period_id = %s$plres)
+                WHERE aml.period_id = %s
                 AND aml.account_id = aa.id
                 AND aml.journal_id = j.id
                 AND j.type not in %s
@@ -529,7 +515,7 @@
                 AND aml.journal_id = j.id
                 AND e.currency_id = cc.id
                 AND aml.instance_id = i.id
-                AND (aml.period_id = %s$plres)
+                AND aml.period_id = %s
                 AND a.shrink_entries_for_hq != 't'
                 AND j.type not in %s
                 AND aml.exported in %s
@@ -538,6 +524,30 @@
                 ORDER BY aml.id;
                 """,
         }
+        if plresult_ji_in_ids:
+            # NOTE: for these entries: booking and fonctional ccy are same
+            ''' columns
+                'DB ID', 'Instance', 'Journal', 'Entry sequence', 'Description',
+                'Reference', 'Document date', 'Posting date', 'G/L Account',
+                'Third party', 'Destination', 'Cost centre', 'Funding pool',
+                'Booking debit', 'Booking credit', 'Booking currency',
+                'Functional debit', 'Functional credit', 'Functional CCY',
+                'Emplid', 'Partner DB ID' '''
+            sqlrequests['plresult'] = """
+                SELECT aml.id, i.code, j.code, m.name as "entry_sequence", aml.name,
+                    aml.ref, aml.document_date, aml.date, a.code,
+                    aml.partner_txt, '', '', '',
+                    ROUND(aml.debit_currency, 2), ROUND(aml.credit_currency, 2), c.name,
+                    ROUND(aml.debit, 2), ROUND(aml.credit, 2), c.name,
+                    '', ''
+                FROM account_move_line aml
+                INNER JOIN msf_instance i on i.id = aml.instance_id
+                INNER JOIN account_journal j on j.id = aml.journal_id
+                INNER JOIN account_move m on m.id = aml.move_id
+                INNER JOIN account_account a on a.id = aml.account_id
+                INNER JOIN res_currency c on c.id = aml.currency_id
+                WHERE aml.id in %s AND aml.exported in %s
+            """
 
         # PROCESS REQUESTS LIST: list of dict containing info to process some SQL requests
         # Dict:
@@ -612,7 +622,6 @@
                 'function': 'postprocess_add_db_id', # to take analytic line IDS and make a DB ID with
                 'fnct_params': 'account.analytic.line',
                 'query_params': (period_id, tuple(excluded_journal_types), tuple(to_export), tuple(instance_ids)),
-                'query_tpl_context': rawdata_tpl_context,
                 'delete_columns': [0],
                 'id': 0,
                 'object': 'account.analytic.line',
@@ -621,7 +630,6 @@
                 'filename': instance_name + '_' + year + month + '_Monthly Export.csv',
                 'key': 'bs_entries_consolidated',
                 'query_params': (period_id, tuple(excluded_journal_types), tuple(to_export), tuple(instance_ids)),
-                'query_tpl_context': rawdata_tpl_context,
                 'function': 'postprocess_consolidated_entries',
                 'fnct_params': excluded_journal_types,
                 },
@@ -631,12 +639,23 @@
                 'function': 'postprocess_add_db_id', # to take analytic line IDS and make a DB ID with
                 'fnct_params': 'account.move.line',
                 'query_params': (period_id, tuple(excluded_journal_types), tuple(to_export), tuple(instance_ids)),
-                'query_tpl_context': rawdata_tpl_context,
                 'delete_columns': [0],
                 'id': 0,
                 'object': 'account.move.line',
                 },
         ]
+        if plresult_ji_in_ids:
+            processrequests.append({
+                'filename': instance_name + '_' + year + month + '_Monthly Export.csv',
+                'key': 'plresult',
+                'function': 'postprocess_add_db_id', # to take move line ids and make a DB ID with
+                'fnct_params': 'account.move.line',
+                'query_params': (tuple(plresult_ji_in_ids), tuple(to_export), ),
+                'delete_columns': [0],
+                'id': 0,
+                'object': 'account.move.line',
+            })
+
         # Launch finance archive object
         fe = finance_archive(sqlrequests, processrequests)
         # Use archive method to create the archive