Merge lp:~unifield-team/unifield-server/us-533 into lp:unifield-server

[jftempo]

=== modified file 'bin/addons/account/account_move_line.py'
--- bin/addons/account/account_move_line.py	2016-06-08 09:08:11 +0000
+++ bin/addons/account/account_move_line.py	2016-08-09 15:43:17 +0000
@@ -1135,6 +1135,9 @@
         unlink_ids += part_rec_ids
         if unlink_ids:
             obj_move_rec.unlink(cr, uid, unlink_ids)
+        obj_move_line.write(cr, uid, move_ids, {
+                'reconcile_date': False,  # US-533 reset reconcilation date
+            }, context=context)
         return True
 
     def check_unlink(self, cr, uid, ids, context=None):

=== modified file 'bin/addons/account/report/account_general_ledger.py'
--- bin/addons/account/report/account_general_ledger.py	2016-05-26 15:01:18 +0000
+++ bin/addons/account/report/account_general_ledger.py	2016-08-09 15:43:17 +0000
@@ -107,11 +107,33 @@
                 self.title = _('Trial Balance')
 
         self.account_ids = self._get_data_form(data, 'account_ids') or []
-        # unreconciled: not reconciled or partial reconciled
-        # (partial: reconcile_partia_id set vs reconcile_id)
-        self.unreconciled_filter = \
-            self._get_data_form(data, 'unreconciled', False) \
-            and " AND reconcile_id is null AND a.reconcile='t'" or ''
+
+        # US-533 reconciled filter:
+        # decision matrix
+        # http://jira.unifield.org/browse/US-533?focusedCommentId=50246&page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel#comment-50246
+        reconcile_date = self._get_data_form(data, 'reconcile_date', False)
+        reconciled = self._get_data_form(data, 'reconciled', 'empty')
+        self.reconciled_filter = ''
+        if reconciled == 'empty':
+            # no reconcile criteria: get rid of reconcile date filter
+            if reconcile_date:
+                del data['form']['reconcile_date']
+                reconcile_date = False
+        elif reconciled == 'no':
+            # reconcile 'No' filter: become reconciled since (day+1)
+            # or not reconciled (cases 6/9 of Jira comment matrix)
+            not_reconciled = "l.reconcile_id is null AND a.reconcile='t'"
+            if reconcile_date:
+                self.reconciled_filter = \
+                    " AND (l.reconcile_date > '%s' or (%s))" % (
+                        reconcile_date, not_reconciled, )
+            else:
+                self.reconciled_filter = " AND %s" % (not_reconciled, )
+        elif reconciled == 'yes':
+            self.reconciled_filter = " AND l.reconcile_id is not null"
+            if reconcile_date:
+                self.reconciled_filter += " AND l.reconcile_date <= '%s'" % (
+                    reconcile_date, )
 
         self.context['state'] = data['form']['target_move']
 
@@ -161,8 +183,8 @@
                     self.cr, self.uid, self.account_ids)
 
         query = self.query
-        if self.unreconciled_filter:
-            query += self.unreconciled_filter
+        if self.reconciled_filter:
+            query += self.reconciled_filter
 
         move_states = [ 'posted', ] if self.target_move == 'posted' \
             else [ 'draft', 'posted', ]
@@ -171,7 +193,7 @@
             include_accounts=self.account_ids,
             account_report_types=self.account_report_types,
             with_balance_only=self.display_account == 'bal_solde',
-            reconcile_filter=self.unreconciled_filter,
+            reconcile_filter=self.reconciled_filter,
             context=used_context)
 
         return res
@@ -248,7 +270,7 @@
         if node.is_zero \
                 and (self.account_ids
                     or self.account_report_types
-                    or self.unreconciled_filter
+                    or self.reconciled_filter
                     or self.display_account == 'bal_movement'):
             # hide zero amounts for above filters on
             # no movements <=> no amount
@@ -332,7 +354,7 @@
                 JOIN account_account a on (a.id=l.account_id)
                 WHERE %s AND m.state IN %s AND l.account_id = %%s{{reconcile}} ORDER by %s
             """ %(self.query, move_state_in, sql_sort)
-            sql = sql.replace('{{reconcile}}', self.unreconciled_filter)
+            sql = sql.replace('{{reconcile}}', self.reconciled_filter)
             self.cr.execute(sql, (account.id, ))
             res = self.cr.dictfetchall()
         else:
@@ -417,6 +439,14 @@
             if line:
                 infos.append(line)
 
+        # reconcile / reconcile date
+        reconciled = self._get_data_form(data, 'reconciled')
+        if reconciled and reconciled != 'empty':
+            dt = self._get_data_form(data, 'reconcile_date')
+            if dt:
+                dt = ' ' + self.formatLang(dt, date=True)
+            infos.append(_("Reconcile %s%s") % (reconciled.title(), dt or '', ))
+
         return infos and ", \n".join(infos) or _('No Filter')
 
     def _get_line_debit(self, line, booking=False):
@@ -489,7 +519,7 @@
 
         # reconciled account
         info_data.append((_('Unreconciled'),
-            self.unreconciled_filter and yes_str or no_str, ))
+            self.reconciled_filter and yes_str or no_str, ))
 
         display_account = all_str
         if 'display_account' in data['form']:

=== modified file 'bin/addons/account/wizard/account_report_account_balance.py'
--- bin/addons/account/wizard/account_report_account_balance.py	2016-05-23 13:52:38 +0000
+++ bin/addons/account/wizard/account_report_account_balance.py	2016-08-09 15:43:17 +0000
@@ -39,6 +39,14 @@
             ('bl','Balance Sheet'),
         ], 'B/S / P&L account', required=True),
 
+        'reconciled': fields.selection([
+            ('empty', ''),
+            ('yes', 'Yes'),
+            ('no', 'No'),
+        ], "Reconciled",
+        help="filter will apply only on the B/S accounts except for the non reconciliable account like 10100 and 10200 which will never be displayed per details"),
+        'reconcile_date': fields.date("At"),
+
         'account_ids': fields.many2many('account.account',
             'account_report_general_ledger_account_account_rel',
             'report_id', 'account_id', 'Accounts'),
@@ -58,6 +66,7 @@
         'initial_balance': False,
         'export_format': 'pdf',
         'account_type': 'all',
+        'reconciled': 'empty',
         'journal_ids': _get_journals,
         'display_account': 'bal_movement',  # by default only result with JIs
     }
@@ -86,7 +95,7 @@
 
         data['form']['initial_balance'] = False
         form_fields = [ 'initial_balance', 'instance_ids', 'export_format',
-            'account_type', 'account_ids', ]
+            'account_type', 'account_ids', 'reconciled', 'reconcile_date', ]
         data['form'].update(self.read(cr, uid, ids, form_fields)[0])
 
         if not data['form']['fiscalyear_id']:# GTK client problem onchange does not consider in save record

=== modified file 'bin/addons/account/wizard/account_report_account_balance_view.xml'
--- bin/addons/account/wizard/account_report_account_balance_view.xml	2016-03-23 14:52:23 +0000
+++ bin/addons/account/wizard/account_report_account_balance_view.xml	2016-08-09 15:43:17 +0000
@@ -24,6 +24,9 @@
                 <newline/>
                 <field name="account_type" />
                 <newline/>
+                <field name="reconciled" />
+                <field name="reconcile_date" />
+                <newline/>
                 <field name="instance_ids" domain="[('instance_to_display_ids','=',True)]">
                     <tree noteditable="1" editable="top" string="Proprietary Instances">
                         <field name="code" />

=== modified file 'bin/addons/account/wizard/account_report_general_ledger.py'
--- bin/addons/account/wizard/account_report_general_ledger.py	2016-05-26 15:01:18 +0000
+++ bin/addons/account/wizard/account_report_general_ledger.py	2016-08-09 15:43:17 +0000
@@ -54,8 +54,13 @@
             ('bl','Balance Sheet'),
         ], 'B/S / P&L account', required=True),
 
-        'unreconciled': fields.boolean("Unreconciled",
-            help="filter will apply only on the B/S accounts except for the non reconciliable account like 10100 and 10200 which will never be displayed per details"),
+        'reconciled': fields.selection([
+            ('empty', ''),
+            ('yes', 'Yes'),
+            ('no', 'No'),
+        ], "Reconciled",
+        help="filter will apply only on the B/S accounts except for the non reconciliable account like 10100 and 10200 which will never be displayed per details"),
+        'reconcile_date': fields.date("At"),
 
         'account_ids': fields.many2many('account.account',
             'account_report_general_ledger_account_account_rel',
@@ -79,7 +84,7 @@
         'export_format': 'pdf',
         'journal_ids': _get_journals,  # exclude extra-accounting journals from this report (IKD, ODX)
         'account_type': 'all',
-        'unreconciled': False,
+        'reconciled': 'empty',
         'is_initial_balance_available': False,  # as no FY selection, not available by default US-926 point 7)
         'display_account': 'bal_movement',  # by default only result with JIs
     }
@@ -163,7 +168,8 @@
 
         form_fields = [ 'initial_balance', 'amount_currency', 'sortby',
             'output_currency', 'instance_ids', 'export_format',
-            'account_type', 'unreconciled', 'account_ids', ]
+            'account_type', 'reconciled', 'reconcile_date',
+            'account_ids', ]
         data['form'].update(self.read(cr, uid, ids, form_fields)[0])
 
         # US-822: safe initial balance check box

=== modified file 'bin/addons/account/wizard/account_report_general_ledger_view.xml'
--- bin/addons/account/wizard/account_report_general_ledger_view.xml	2016-03-23 14:52:23 +0000
+++ bin/addons/account/wizard/account_report_general_ledger_view.xml	2016-08-09 15:43:17 +0000
@@ -24,7 +24,9 @@
                 <field name="amount_currency" invisible="1" />
                 <newline/>
                 <field name="account_type" />
-                <field name="unreconciled" />
+                <newline/>
+                <field name="reconciled" />
+                <field name="reconcile_date" />
                 <newline/>
                 <field name="instance_ids" domain="[('instance_to_display_ids','=',True)]">
                     <tree noteditable="1" editable="top" string="Proprietary Instances">

=== modified file 'bin/addons/account_mcdb/account_mcdb.py'
--- bin/addons/account_mcdb/account_mcdb.py	2016-06-28 12:02:56 +0000
+++ bin/addons/account_mcdb/account_mcdb.py	2016-08-09 15:43:17 +0000
@@ -60,6 +60,7 @@
         'account_type_ids': fields.many2many(obj='account.account.type', rel='account_account_type_mcdb', id1='mcdb_id', id2='account_type_id',
             string="Account type"),
         'reconcile_id': fields.many2one('account.move.reconcile', string="Reconcile Reference"),
+        'reconcile_date': fields.date("Reconciled at"),
         'ref': fields.char(string='Reference', size=255),
         'name': fields.char(string='Description', size=255),
         'rev_account_ids': fields.boolean('Exclude account selection'),
@@ -335,10 +336,17 @@
                 # total or partial and override  reconciled status
                 domain.append(('reconcile_total_partial_id', '=', wiz.reconcile_id.id))
             elif wiz.reconciled:
+                # US-533: new search matrix
+                # http://jira.unifield.org/browse/US-533?focusedCommentId=50218&page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel#comment-50218
+                # search always regarding FULL reconcile (is_reconciled do that)
                 if wiz.reconciled == 'reconciled':
-                    domain.append(('reconcile_id', '!=', False))  # only full reconcile
+                    domain.append(('is_reconciled', '=', True))
                 elif wiz.reconciled == 'unreconciled':
-                    domain.append(('reconcile_id', '=', False))   # partial or not reconcile (dont take care of reconcile_partial_id state)
+                    domain.append(('is_reconciled', '=', False))
+            if wiz.reconcile_date:
+                domain.append(('reconcile_date', '<=', wiz.reconcile_date))
+            # note that for US-533 JI search is overrided in
+            # account_reconcile/account_move_line.py
 
             # REALLOCATION field
             if wiz.reallocated:

=== modified file 'bin/addons/account_mcdb/account_mcdb_view.xml'
--- bin/addons/account_mcdb/account_mcdb_view.xml	2016-05-30 07:12:04 +0000
+++ bin/addons/account_mcdb/account_mcdb_view.xml	2016-08-09 15:43:17 +0000
@@ -67,7 +67,9 @@
                     &account;
                     <separator string="Reconciliation" colspan="4"/>
                     <field name="reconciled"/>
+                    <field name="reconcile_date" string="At"/>
                     <field name="reconcile_id"/>
+
                     &currency;
                     <group colspan="4" col="6">
                         <separator string="Third Party" colspan="6"/>
@@ -342,7 +344,7 @@
             <field name="view_id" ref="account_mcdb_tree"/>
             <field name="search_view_id" ref="account_mcdb_search"/>
             <field name="domain">[('description', '!=', False), ('model', '=', 'account.move.line')]</field>
-            <field name="context">{'search_default_user': uid}</field>
+            <field name="context">{'search_default_user': uid, 'from_web_menu': True}</field>
         </record>
 
         <record id="action_account_mcdb_analytic" model="ir.actions.act_window">
@@ -365,7 +367,7 @@
             <field name="view_id" ref="account_mcdb_form"/>
             <field name="search_view_id" ref="account_mcdb_search"/>
             <field name="domain">[('description', '!=', False), ('model', '=', 'account.move.line')]</field>
-            <field name="context">{'search_default_user': uid}</field>
+            <field name="context">{'search_default_user': uid, 'from_web_menu': True}</field>
         </record>
 
         <record id="action_account_mcdb_analytic_form" model="ir.actions.act_window">

=== modified file 'bin/addons/account_mcdb/account_view.xml'
--- bin/addons/account_mcdb/account_view.xml	2016-05-26 13:18:50 +0000
+++ bin/addons/account_mcdb/account_view.xml	2016-08-09 15:43:17 +0000
@@ -161,9 +161,12 @@
                             <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" context="{'exclude_journals': ['IB']}"/>
+                        </group>
+                        <newline/>
+                        <group>
                             <field name="is_reconciled" select='1'/>
                             <field name="reconcile_total_partial_id" select='1'/>
-                            <newline/>
+                            <field name="reconcile_date" select='1' string="At"/>
                         </group>
                         <newline/>
                         <group>

=== modified file 'bin/addons/account_mcdb/report/account_mcdb_export.py'
--- bin/addons/account_mcdb/report/account_mcdb_export.py	2016-05-20 09:42:27 +0000
+++ bin/addons/account_mcdb/report/account_mcdb_export.py	2016-08-09 15:43:17 +0000
@@ -66,7 +66,7 @@
             head += [_('Func. Debit'), _('Func. Credit'), _('Func. Currency')]
         else:
             head += [_('Output Debit'), _('Output Credit'), _('Output Currency')]
-        head += [_('Reconcile'), _('State')]
+        head += [_('Reconcile'), _('Reconcile Date'), _('State')]
         writer.writerow(map(lambda x: x.encode('utf-8'), head))
         # Sort items
         ids.sort()
@@ -138,6 +138,8 @@
                     csv_line.append(currency_name.encode('utf-8') or '')
                     #reconcile
                     csv_line.append(ml.reconcile_txt and ml.reconcile_txt.encode('utf-8') or '')
+                    #reconcile date US-533
+                    csv_line.append(ml.reconcile_date or '')
                     #state
                     csv_line.append(field_sel(cr, uid, ml, 'move_state', context).encode('utf-8'))
                     # Write line

=== modified file 'bin/addons/account_mcdb/report/report_account_move_line.rml'
--- bin/addons/account_mcdb/report/report_account_move_line.rml	2016-05-20 09:42:27 +0000
+++ bin/addons/account_mcdb/report/report_account_move_line.rml	2016-08-09 15:43:17 +0000
@@ -116,6 +116,9 @@
           <para style="P3">Reconcile</para>
         </td>
         <td>
+          <para style="P3">Reconcile Date</para>
+        </td>
+        <td>
           <para style="P3">State</para>
         </td>
       </tr>
@@ -173,6 +176,9 @@
           <para style="P3">[[ o.reconcile_txt and o.reconcile_txt or '' ]]</para>
         </td>
         <td>
+          <para style="P3">[[ formatLang(o.reconcile_date, date=True) or '']]</para>
+        </td>
+        <td>
           <para style="P3">[[ o.move_state and getSel(o, 'move_state') or '' ]]</para>
         </td>
       </tr>

=== modified file 'bin/addons/account_mcdb/report/report_account_move_line_xls.mako'
--- bin/addons/account_mcdb/report/report_account_move_line_xls.mako	2016-05-20 09:42:27 +0000
+++ bin/addons/account_mcdb/report/report_account_move_line_xls.mako	2016-08-09 15:43:17 +0000
@@ -55,7 +55,7 @@
 <Column ss:AutoFitWidth="1" ss:Width="70" />
 % endfor
 <Row>
-% for header in [_('Proprietary Instance'), _('Journal Code'), _('Entry Sequence'), _('Description'), _('Ref.'), _('Document Date'), _('Posting Date'), _('Period'), _('Account'), _('Third Party'), _('Book. Debit'), _('Book. Credit'), _('Book. Currency'), _('Output Debit'), _('Output Credit'), _('Output Currency'), _('Reconcile'), _('State')]:
+% for header in [_('Proprietary Instance'), _('Journal Code'), _('Entry Sequence'), _('Description'), _('Ref.'), _('Document Date'), _('Posting Date'), _('Period'), _('Account'), _('Third Party'), _('Book. Debit'), _('Book. Credit'), _('Book. Currency'), _('Output Debit'), _('Output Credit'), _('Output Currency'), _('Reconcile'), _('Reconcile Date'), _('State')]:
 <Cell ss:StyleID="ssH"><Data ss:Type="String">${header}</Data></Cell>
 % endfor
 </Row>
@@ -124,6 +124,15 @@
 <Cell ss:StyleID="ssBorder">
         <Data ss:Type="String">${(o.reconcile_txt or '')|x}</Data>
 </Cell>
+% if o.reconcile_date and o.reconcile_date != 'False':
+<Cell ss:StyleID="ssBorderDate">
+        <Data ss:Type="DateTime">${o.reconcile_date|n}T00:00:00</Data>
+</Cell>
+% else:
+<Cell ss:StyleID="ssBorder">
+        <Data ss:Type="String"> </Data>
+</Cell>
+% endif
 <Cell ss:StyleID="ssBorder">
         <Data ss:Type="String">${(o.move_state and getSel(o,'move_state') or '')|x}</Data>
 </Cell>

=== modified file 'bin/addons/account_reconciliation/account.py'
--- bin/addons/account_reconciliation/account.py	2011-11-28 09:29:51 +0000
+++ bin/addons/account_reconciliation/account.py	2016-08-09 15:43:17 +0000
@@ -38,8 +38,10 @@
                 total += (line.debit_currency or 0.0) - (line.credit_currency or 0.0)
         if not total:
             self.pool.get('account.move.line').write(cr, uid,
-                map(lambda x: x.id, rec.line_partial_ids),
-                {'reconcile_id': rec.id }
+                map(lambda x: x.id, rec.line_partial_ids), {
+                    'reconcile_id': rec.id,
+                    'reconcile_date': time.strftime('%Y-%m-%d'),  # US-533 date of JI reconciliation
+                }
             )
         # @@@end
         return True

=== modified file 'bin/addons/account_reconciliation/account_move_line.py'
--- bin/addons/account_reconciliation/account_move_line.py	2014-10-27 13:40:35 +0000
+++ bin/addons/account_reconciliation/account_move_line.py	2016-08-09 15:43:17 +0000
@@ -31,6 +31,54 @@
 class account_move_line(osv.osv):
     _inherit = 'account.move.line'
     _name = 'account.move.line'
+    
+    _columns = {
+        'reconcile_date': fields.date('Reconcile date',
+            help="Date of reconciliation"),
+    }
+
+    def search(self, cr, uid, args, offset=0, limit=None, order=None,
+        context=None, count=False):
+        if context is None:
+            context = {}
+
+        # US-533: to answer http://jira.unifield.org/browse/US-533?focusedCommentId=50218&page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel#comment-50218
+        # always consider:
+        # 1) reconcile empty to cancel the reconcile date criteria
+        # 2) reconcile 'No' filter: become reconciled since (day+1)
+        #    or not reconciled (cases 6/9 of Jira comment matrix)
+        if context.get('from_web_menu', True):
+            ft_obj = self.pool.get('fields.tools')
+            if ft_obj.domain_get_field_index(args, 'reconcile_date') >= 0:
+                is_reconciled_index = ft_obj.domain_get_field_index(args,
+                    'is_reconciled')
+                if is_reconciled_index < 0:
+                    # 1)
+                    args = ft_obj.domain_remove_field(args, 'reconcile_date')
+                else:
+                    reconciled_date_index = ft_obj.domain_get_field_index(args,
+                        'reconcile_date')
+                    if  reconciled_date_index >= 0 \
+                        and args[is_reconciled_index][1] == '=' \
+                        and not args[is_reconciled_index][2]:
+                        # 2)
+                        reconcile_date = args[reconciled_date_index][2]
+                        args = ft_obj.domain_remove_field(args, [
+                            'is_reconciled',
+                            'reconcile_id',
+                            'reconcile_date',
+                        ])
+                        domain = [
+                            '|',
+                            ('reconcile_date', '>', reconcile_date),
+                            ('reconcile_id', '=', False),
+                            ('account_id.reconcile', '=', True),
+                        ]
+                        args = domain + args
+
+        return super(account_move_line, self).search(cr, uid, args,
+            offset=offset, limit=limit, order=order, context=context,
+            count=count)
 
     def check_imported_invoice(self, cr, uid, ids, context=None):
         """
@@ -119,6 +167,11 @@
             'line_partial_ids': map(lambda x: (4,x,False), merges+unmerge),
             'is_multi_instance': different_level,
         })
+        # US-533: date of JI reconciliation for line_partial_ids linked with
+        # above (4, 0)
+        self.pool.get('account.move.line').write(cr, uid, merges+unmerge, {
+                'reconcile_date': time.strftime('%Y-%m-%d'),
+            })
         
         # UF-2011: synchronize move lines (not "marked" after reconcile creation)
         if self.pool.get('sync.client.orm_extended'):
@@ -227,6 +280,12 @@
             'multi_instance_level_creation': multi_instance_level_creation,
         })
         
+        # US-533: date of JI reconciliation for total reconciliation linked
+        # with above (4, 0)
+        self.pool.get('account.move.line').write(cr, uid, ids, {
+                'reconcile_date': time.strftime('%Y-%m-%d'),
+            })
+        
         # UF-2011: synchronize move lines (not "marked" after reconcile creation)
         if self.pool.get('sync.client.orm_extended'):
             self.pool.get('account.move.line').synchronize(cr, uid, ids, context=context)

=== modified file 'bin/addons/msf_sync_data_server/data/sync_server.sync_rule.csv'
--- bin/addons/msf_sync_data_server/data/sync_server.sync_rule.csv	2016-07-12 09:57:48 +0000
+++ bin/addons/msf_sync_data_server/data/sync_server.sync_rule.csv	2016-08-09 15:43:17 +0000
@@ -70,7 +70,7 @@
 msf_sync_data_server.account_move_reconcile,TRUE,TRUE,TRUE,FALSE,bidirectional,Bidirectional,[],"['name', 'type', 'is_multi_instance', 'multi_instance_level_creation', 'instance_id']",OC,account.move.reconcile,,Account Move Reconcile,Valid,,410
 msf_sync_data_server.register_line_deleted,TRUE,TRUE,FALSE,FALSE,bidirectional,Bidirectional-Private,"[('instance_id' , 'in' , ('msf.instance' , 'id' , [('level' , '=' , 'project')]))]","['statement_id/id', 'sequence','instance_id/id']",MISSION,account.bank.statement.line.deleted,instance_id,Register Deleted Line,Valid,,405
 msf_sync_data_server.account_move,TRUE,TRUE,TRUE,FALSE,bidirectional,Bidirectional-Private,[],"['date', 'document_date', 'imported', 'journal_id/id', 'name', 'narration', 'period_id/id', 'ref', 'statement_line_ids/id', 'to_check','instance_id/id','status','employee_id/id','transfer_journal_id/id','manual_currency_id/id','block_manual_currency_id','partner_id2/id','analytic_distribution_id/id', 'register_line_id/id']",OC,account.move,instance_id,Account Move,Valid,,411
-msf_sync_data_server.account_move_line,TRUE,TRUE,TRUE,FALSE,bidirectional,Bidirectional-Private,[],"['account_id/id', 'accrual', 'analytic_account_id/id', 'analytic_distribution_id/id', 'blocked', 'cheque_number','corrected', 'credit', 'credit_currency', 'currency_id/id', 'date_created', 'date_maturity', 'debit', 'debit_currency', 'document_date', 'employee_id/id', 'have_an_historic', 'instance_id/id', 'is_addendum_line', 'is_counterpart', 'is_transfer_with_change', 'is_write_off', 'journal_id/id', 'last_cor_was_only_analytic', 'move_id/id', 'name', 'partner_id/id','partner_txt','period_id/id', 'reconcile_id/id', 'reconcile_partial_id/id', 'ref', 'reversal', 'source_date', 'statement_id/id', 'reference', 'state','transfer_journal_id/id', 'transfer_amount', 'is_downpayment']",OC,account.move.line,instance_id,Account Move Line,Valid,,412
+msf_sync_data_server.account_move_line,TRUE,TRUE,TRUE,FALSE,bidirectional,Bidirectional-Private,[],"['account_id/id', 'accrual', 'analytic_account_id/id', 'analytic_distribution_id/id', 'blocked', 'cheque_number','corrected', 'credit', 'credit_currency', 'currency_id/id', 'date_created', 'date_maturity', 'debit', 'debit_currency', 'document_date', 'employee_id/id', 'have_an_historic', 'instance_id/id', 'is_addendum_line', 'is_counterpart', 'is_transfer_with_change', 'is_write_off', 'journal_id/id', 'last_cor_was_only_analytic', 'move_id/id', 'name', 'partner_id/id','partner_txt','period_id/id', 'reconcile_id/id', 'reconcile_partial_id/id', 'ref', 'reversal', 'source_date', 'statement_id/id', 'reference', 'state','transfer_journal_id/id', 'transfer_amount', 'is_downpayment', 'reconcile_date']",OC,account.move.line,instance_id,Account Move Line,Valid,,412
 msf_sync_data_server.account_move_line_correction,TRUE,TRUE,FALSE,FALSE,bidirectional,Bidirectional-Private,"[('move_id','in',('account.move','id',[('state','=','posted')]))]","['corrected_line_id/id', 'instance_id/id', 'reversal_line_id/id']",OC,account.move.line,instance_id,Account Move Line Correction,Valid,,413
 msf_sync_data_server.account_move_line_register_line,TRUE,TRUE,FALSE,FALSE,bidirectional,Bidirectional-Private,[],"['corrected_st_line_id/id', 'instance_id/id']",MISSION,account.move.line,instance_id,Account Move Line / Register Line,Valid,,414
 msf_sync_data_server.register_line_account_move_line,TRUE,TRUE,FALSE,FALSE,bidirectional,Bidirectional-Private,"[('instance_id' , 'in' , ('msf.instance' , 'id' , [('level' , '=' , 'project')])),('statement_id','in',('account.bank.statement','id',[('state','!=','draft')])),'!',('state','=','draft')]","['direct_invoice_move_id/id', 'first_move_line_id/id', 'from_import_cheque_id/id', 'imported_invoice_line_ids/id','instance_id/id', 'cash_return_move_line_id/id']",MISSION,account.bank.statement.line,instance_id,Register Line / Account Move Line,Valid,,415
@@ -177,7 +177,7 @@
 msf_usb_sync_data_server.cp_gl_journals_registers,TRUE,TRUE,FALSE,TRUE,cp_to_rw,Bidirectional,"['|',('type', '=', 'cash'),('type', '=', 'cheque')]","['bank_journal_id/id','analytic_journal_id/id', 'code', 'currency/id', 'default_credit_account_id/id', 'default_debit_account_id/id', 'name', 'type','instance_id/id']",USB,account.journal,,[MASTER] GL Journals - Registers,Valid,,1507
 msf_usb_sync_data_server.cp_account_move_reconcile,TRUE,TRUE,TRUE,TRUE,cp_to_rw,Bidirectional,[],"['name', 'type']",USB,account.move.reconcile,,[MASTER] Account Move Reconcile,Valid,,1510
 msf_usb_sync_data_server.cp_account_move,TRUE,TRUE,FALSE,TRUE,cp_to_rw,Bidirectional,[],"['date', 'document_date', 'imported', 'journal_id/id', 'name', 'narration', 'period_id/id', 'ref', 'statement_line_ids/id', 'to_check','instance_id/id','status','employee_id/id','transfer_journal_id/id','manual_currency_id/id','block_manual_currency_id','partner_id2/id','analytic_distribution_id/id']",USB,account.move,,[MASTER] Account Move,Valid,,1520
-msf_usb_sync_data_server.cp_account_move_line,TRUE,TRUE,FALSE,TRUE,cp_to_rw,Bidirectional,[],"['account_id/id', 'accrual', 'analytic_account_id/id', 'analytic_distribution_id/id', 'blocked', 'cheque_number','corrected', 'credit', 'credit_currency', 'currency_id/id', 'date', 'date_created', 'date_maturity', 'debit', 'debit_currency', 'document_date', 'employee_id/id', 'have_an_historic', 'instance_id/id', 'is_addendum_line', 'is_counterpart', 'is_transfer_with_change', 'is_write_off', 'journal_id/id', 'last_cor_was_only_analytic', 'move_id/id', 'move_state', 'name', 'partner_id/id','partner_txt','period_id/id', 'reconcile_id/id', 'ref', 'reversal', 'source_date', 'statement_id/id', 'reference', 'state','transfer_journal_id/id', 'transfer_amount', 'is_downpayment']",USB,account.move.line,,[MASTER] Account Move Line,Valid,,1521
+msf_usb_sync_data_server.cp_account_move_line,TRUE,TRUE,FALSE,TRUE,cp_to_rw,Bidirectional,[],"['account_id/id', 'accrual', 'analytic_account_id/id', 'analytic_distribution_id/id', 'blocked', 'cheque_number','corrected', 'credit', 'credit_currency', 'currency_id/id', 'date', 'date_created', 'date_maturity', 'debit', 'debit_currency', 'document_date', 'employee_id/id', 'have_an_historic', 'instance_id/id', 'is_addendum_line', 'is_counterpart', 'is_transfer_with_change', 'is_write_off', 'journal_id/id', 'last_cor_was_only_analytic', 'move_id/id', 'move_state', 'name', 'partner_id/id','partner_txt','period_id/id', 'reconcile_id/id', 'ref', 'reversal', 'source_date', 'statement_id/id', 'reference', 'state','transfer_journal_id/id', 'transfer_amount', 'is_downpayment', 'reconcile_date']",USB,account.move.line,,[MASTER] Account Move Line,Valid,,1521
 msf_usb_sync_data_server.cp_account_move_line_correction,TRUE,TRUE,FALSE,TRUE,cp_to_rw,Bidirectional,"[('move_id','in',('account.move','id',[('state','=','posted')]))]","['corrected_line_id/id', 'instance_id/id', 'reversal_line_id/id']",USB,account.move.line,,[MASTER] Account Move Line Correction,Valid,,1522
 msf_usb_sync_data_server.cp_account_move_line_register_line,TRUE,TRUE,FALSE,TRUE,cp_to_rw,Bidirectional,[],"['corrected_st_line_id/id', 'instance_id/id']",USB,account.move.line,,[MASTER] Account Move Line / Register Line,Valid,,1523
 msf_usb_sync_data_server.cp_register_line_account_move_line,TRUE,TRUE,FALSE,TRUE,cp_to_rw,Bidirectional,"[('instance_id' , 'in' , ('msf.instance' , 'id' , [('level' , '=' , 'project')])),('statement_id','in',('account.bank.statement','id',[('state','!=','draft')])),'!',('state','=','draft')]","['first_move_line_id/id', 'instance_id/id']",USB,account.bank.statement.line,,[MASTER] Register Line / Account Move Line,Valid,,1530

=== modified file 'bin/addons/msf_tools/msf_tools.py'
--- bin/addons/msf_tools/msf_tools.py	2016-07-05 14:43:42 +0000
+++ bin/addons/msf_tools/msf_tools.py	2016-08-09 15:43:17 +0000
@@ -226,6 +226,35 @@
             tpl_drop_const = "alter table %s drop constraint %s" % sql_params
             cr.execute(tpl_drop_const)
 
+    def domain_get_field_index(self, domain, field_name):
+        """
+        get field tuple index in domain
+        :return: index or < 0 if not found
+        :rtype: int
+        """
+        index = 0
+        if domain:
+            for t in domain:
+                if t[0] == field_name:
+                    return index
+                index += 1
+        return -1
+
+    def domain_remove_field(self, domain, field_names):
+        """
+        remove field(s) tuple(s) in domain
+        :param field_names: field(s) to remove
+        :type field_names: str/list/tuple
+        :return: new domain
+        """
+        if not isinstance(field_names, (list, tuple, )):
+            field_names = [ field_names, ]
+        res = []
+        for t in domain:
+            if t[0] not in field_names:
+                res.append(t)
+        return res
+
 fields_tools()