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

[jftempo]

=== modified file 'bin/addons/account/account_move_line.py'
--- bin/addons/account/account_move_line.py	2016-04-13 07:43:33 +0000
+++ bin/addons/account/account_move_line.py	2016-05-24 07:58:03 +0000
@@ -1240,32 +1240,24 @@
                         move_obj.write(cr, uid, [line.move_id.id], {'date': todo_date}, context=context)
         return result
 
-    def _hook_check_period_state(self, cr, uid, result=False, context=None, raise_hq_closed=True, *args, **kargs):
+    def _hook_check_period_state(self, cr, uid, result=False, context=None, *args, **kargs):
         """
         Check period state
         """
         if not result:
             return False
-        res = True
         for (state,) in result:
             if state == 'done':
-                if raise_hq_closed:
-                    raise osv.except_osv(_('Error !'), _('You can not add/modify entries in a closed journal.'))
-                res = False
-                break
-        return res
+                raise osv.except_osv(_('Error !'), _('You can not add/modify entries in a closed journal.'))
 
-    def _update_journal_check(self, cr, uid, journal_id, period_id,
-        context=None, raise_hq_closed=True):
+    def _update_journal_check(self, cr, uid, journal_id, period_id, context=None):
         journal_obj = self.pool.get('account.journal')
         period_obj = self.pool.get('account.period')
         jour_period_obj = self.pool.get('account.journal.period')
         cr.execute('SELECT state FROM account_journal_period WHERE journal_id = %s AND period_id = %s', (journal_id, period_id))
         result = cr.fetchall()
-        if result:
-            res = self._hook_check_period_state(cr, uid, result,
-                context=context, raise_hq_closed=raise_hq_closed)
-        else:
+        self._hook_check_period_state(cr, uid, result, context=context)
+        if not result:
             journal = journal_obj.browse(cr, uid, journal_id, context=context)
             period = period_obj.browse(cr, uid, period_id, context=context)
             jour_period_obj.create(cr, uid, {
@@ -1273,8 +1265,7 @@
                 'journal_id': journal.id,
                 'period_id': period.id
             })
-            res = True
-        return res
+        return True
 
     def _update_check(self, cr, uid, ids, context=None):
         done = {}
 
=== modified file 'bin/addons/account/report/account_balance_sheet.py'
--- bin/addons/account/report/account_balance_sheet.py	2016-05-19 07:21:22 +0000
+++ bin/addons/account/report/account_balance_sheet.py	2016-05-24 07:58:03 +0000
@@ -77,13 +77,13 @@
         return res
 
     def sum_dr(self):
-        if self.res_bl['type'] == _('Net Loss'):
-            self.result_sum_dr += self.res_bl['balance']
+        if self.res_bl['type'] == _('Net Profit'):
+            self.result_sum_dr += self.res_bl['balance']*-1
         return self.result_sum_dr
 
     def sum_cr(self):
-        if self.res_bl['type'] == _('Net Profit'):
-            self.result_sum_dr += self.res_bl['balance']
+        if self.res_bl['type'] == _('Net Loss'):
+            self.result_sum_cr += self.res_bl['balance']
         return self.result_sum_cr
 
     def get_pl_balance(self):
@@ -137,7 +137,7 @@
             'code': self.res_bl['type'],
             'name': self.res_bl['type'],
             'level': False,
-            'balance': self.res_bl['balance'],
+            'balance':self.res_bl['balance'],
         }
         for typ in types:
             accounts_temp = []
@@ -331,11 +331,9 @@
             if data['form'].get('instance_ids', False):
                 self.cr.execute('select code from msf_instance where id IN %s',
                     (tuple(data['form']['instance_ids']),))
-                instances = [x for x, in self.cr.fetchall()]
             else:
-                # US-1166: mission only instances if none provided
-                instances = self._get_instances(get_code=True,
-                    mission_filter=True)
+                self.cr.execute('select code from msf_instance')
+            instances = [x for x, in self.cr.fetchall()]
         return ', '.join(instances)
 
 report_sxw.report_sxw('report.account.balancesheet.horizontal', 'account.account',
 
=== modified file 'bin/addons/account/report/account_balance_sheet_xls.mako'
--- bin/addons/account/report/account_balance_sheet_xls.mako	2016-04-07 15:55:20 +0000
+++ bin/addons/account/report/account_balance_sheet_xls.mako	2016-05-24 07:58:03 +0000
@@ -162,24 +162,24 @@
 %>
 <Cell ss:StyleID="ssAccountLine${strong}"><Data ss:Type="String">${(o.get('code1', False) or '')|x}</Data></Cell>
 <Cell ss:StyleID="ssAccountLine${strong}"><Data ss:Type="String">${(o.get('name1', False) or '')|x}</Data></Cell>
-<Cell ss:StyleID="ssAccountLineNumber${strong}"><Data ss:Type="Number">${(o.get('balance1', False) or 0.0)}</Data></Cell>
+<Cell ss:StyleID="ssAccountLineNumber${strong}"><Data ss:Type="Number">${(abs(o.get('balance1', False)) or 0.0)}</Data></Cell>
 ## liabilities
 <%
 strong = o.get('level', False) and o['level'] < 4 and 'Strong' or ''
 %>
 <Cell ss:StyleID="ssAccountLine${strong}"><Data ss:Type="String">${(o.get('code', False) or '')|x}</Data></Cell>
 <Cell ss:StyleID="ssAccountLine${strong}"><Data ss:Type="String">${(o.get('name', False) or '')|x}</Data></Cell>
-<Cell ss:StyleID="ssAccountLineNumber${strong}"><Data ss:Type="Number">${(o.get('balance', False) or 0.0)}</Data></Cell>
+<Cell ss:StyleID="ssAccountLineNumber${strong}"><Data ss:Type="Number">${(abs(o.get('balance', False)) or 0.0)}</Data></Cell>
 </Row>
 % endfor
 
 <Row>
 <Cell ss:StyleID="ssAccountLineStrong"><Data ss:Type="String">Balance ${company.currency_id.symbol or ''|x}</Data></Cell>
 <Cell ss:StyleID="ssAccountLineStrong"><Data ss:Type="String"></Data></Cell>
-<Cell ss:StyleID="ssAccountLineNumberStrong"><Data ss:Type="Number">${sum_cr()}</Data></Cell>
+<Cell ss:StyleID="ssAccountLineNumberStrong"><Data ss:Type="Number">${abs(sum_cr())}</Data></Cell>
 <Cell ss:StyleID="ssAccountLineStrong"><Data ss:Type="String">Balance ${company.currency_id.symbol or ''|x}</Data></Cell>
 <Cell ss:StyleID="ssAccountLineStrong"><Data ss:Type="String"></Data></Cell>
-<Cell ss:StyleID="ssAccountLineNumberStrong"><Data ss:Type="Number">${sum_dr()}</Data></Cell>
+<Cell ss:StyleID="ssAccountLineNumberStrong"><Data ss:Type="Number">${abs(sum_dr())}</Data></Cell>
 </Row>
 
 </Table>
 
=== modified file 'bin/addons/account/report/account_general_ledger.py'
--- bin/addons/account/report/account_general_ledger.py	2016-05-11 05:57:29 +0000
+++ bin/addons/account/report/account_general_ledger.py	2016-05-24 07:58:03 +0000
@@ -66,18 +66,6 @@
                 'show_period_0': 1,
                 'state_agnostic': 1,
             })
-            # US-1197/4: IB entries for yearly closing always in 1th Jan
-            # => get rid of regular period/dates filters for _query_get
-            # => if self.init_balance is True, note that filtering is OK
-            # validated at wizard report level
-            ib_local_context.update({
-                'date_from': False,
-                'date_to': False,
-                'date_fromto_docdate': False,
-                'period_from': False,
-                'period_to': False,
-                'periods': False,
-            })
             self.init_query = obj_move._query_get(self.cr, self.uid, obj='l',
                 context=ib_local_context)
         else:
@@ -237,18 +225,12 @@
 
     def _show_node_in_report(self, node):
         res = True
-        if node.parent is None:
-            return res  # always show root account MSF
-        if self.account_ids or self.account_report_types \
-            or self.unreconciled_filter:
-            res = not node.skip
-            if res:
-                # hide if zero bal and any by account or unreconciled filter on
-                bal = node.data.get('*', {}).get('debit', 0.) \
-                    - node.data.get('*', {}).get('credit', 0.)
-                if bal == 0.:
-                    res = False
-
+        if self.account_ids or self.unreconciled_filter:
+            # hide if zero bal and any by account or unreconciled filter on
+            bal = node.data.get('*', {}).get('debit', 0.) \
+                - node.data.get('*', {}).get('credit', 0.)
+            if bal == 0.:
+                res = False
         return res
 
     def _get_journals_str(self, data):
@@ -410,7 +392,6 @@
                 line = self.get_start_period(data) + ' - ' + self.get_end_period(data)
             if line:
                 infos.append(line)
-
         return infos and ", \n".join(infos) or _('No Filter')
         
     def _get_line_debit(self, line, booking=False):
@@ -455,11 +436,9 @@
             if data['form'].get('instance_ids', False):
                 self.cr.execute('select code from msf_instance where id IN %s',
                     (tuple(data['form']['instance_ids']),))
-                instances = [x for x, in self.cr.fetchall()]
             else:
-                # US-1166: mission only instances if none provided
-                instances = self._get_instances(get_code=True,
-                    mission_filter=True)
+                self.cr.execute('select code from msf_instance')
+            instances = [x for x, in self.cr.fetchall()]
         return ', '.join(instances)
 
     # internal filter functions
@@ -497,15 +476,6 @@
                 display_account = _('With balance is not equal to 0')
         info_data.append((_('Accounts'), display_account, ))
 
-        account_ids = list(set(self._get_data_form(data, 'account_ids')))
-        if account_ids:
-            # US-1197/2: display filtered accounts
-            account_obj = self.pool.get('account.account')
-            info_data.append((_('Selected Accounts'), ', '.join(
-                    [ a.code for a in account_obj.browse(
-                        self.cr, self.uid, account_ids) \
-                        if a.type != 'view' ], )))
-
         res = [ "%s: %s" % (label, val, ) for label, val in info_data ]
         return ', \n'.join(res)
 
 
=== modified file 'bin/addons/account/report/account_general_ledger_landscape.rml'
--- bin/addons/account/report/account_general_ledger_landscape.rml	2016-04-13 15:35:05 +0000
+++ bin/addons/account/report/account_general_ledger_landscape.rml	2016-05-24 07:58:03 +0000
@@ -248,7 +248,7 @@
       [[ get_show_move_lines() or removeParentNode('blockTable') ]]
       <tr>
         <td>
-          <para style="terp_tblheader_Details">Account/Entry Seq</para>
+          <para style="terp_tblheader_Details">Entry Seq</para>
         </td>
         <td>
           <para style="terp_tblheader_Details">Posting Date</para>
@@ -330,17 +330,14 @@
 
       <section>
         <para style="terp_default_8">[[ repeatIn(lines(o, initial_balance_mode=True), 'line') ]]</para>
-        <blockTable colWidths="40.0,246.0,60.0,110.0,110.0,110.0,110.0" style="Table9">
+        <blockTable colWidths="286.0,60.0,110.0,110.0,110.0,110.0" style="Table9">
           [[ show_node_in_report(o) or removeParentNode('blockTable') ]]
           <tr>
             <td>
-              <para style="terp_default_9_Right">[[ o.code or '' ]]</para>
-            </td>
-            <td>
               <para style="terp_default_9_Right">[[ line['move'] or '' ]]</para>
             </td>
             <td>
-                <para style="terp_default_9_Right">[[ line['currency_name'] or '' ]]</para>
+                <para style="terp_def114.0,80.0,92.0,60.0,110.0,110.0,110.0,110.0ault_9_Right">[[ line['currency_name'] or '' ]]</para>
             </td>
             <td>
               <para style="terp_default_9_Right">[[ formatLang(get_line_debit(line, booking=True), digits=get_digits(dp='Account')) ]]</para>
@@ -393,14 +390,11 @@
 
       <section>
       <para style="terp_default_8">[[ repeatIn(o.get_currencies(), 'ccy') ]]</para>
-      <blockTable colWidths="40.0,246.0,60.0,110.0,110.0,110.0,110.0" style="Table8_subtotal_ccy">
+      <blockTable colWidths="286.0,60.0,110.0,110.0,110.0,110.0" style="Table8_subtotal_ccy">
         [[ show_node_in_report(o) or removeParentNode('blockTable') ]]
         <tr>
           <td>
-              <para style="terp_default_9_Right">[[ o.code or '' ]]</para>
-          </td>
-          <td>
-            <para style="terp_default_9_Right">Sub Total</para>
+            <para style="terp_default_9_Right">[[ o.code ]]</para>
           </td>
           <td>
               <para style="terp_default_9_Right">[[ ccy ]]</para>
 
=== modified file 'bin/addons/account/report/account_general_ledger_xls.mako'
--- bin/addons/account/report/account_general_ledger_xls.mako	2016-04-13 15:35:05 +0000
+++ bin/addons/account/report/account_general_ledger_xls.mako	2016-05-24 07:58:03 +0000
@@ -187,15 +187,21 @@
     display_account = (data['form']['display_account']=='bal_all' and 'All') or (data['form']['display_account']=='bal_movement' and 'With movements') or 'With balance is not equal to 0'
 %>
 <Table x:FullColumns="1" x:FullRows="1">
-<Column ss:AutoFitWidth="1" ss:Width="50" />
-<Column ss:AutoFitWidth="1" ss:Width="80" />
-<Column ss:AutoFitWidth="1" ss:Width="55" />
-<Column ss:AutoFitWidth="1" ss:Width="80" />
-<Column ss:AutoFitWidth="1" ss:Width="50" />
-<Column ss:Width="90" />
-<Column ss:Width="90" />
-<Column ss:Width="90" />
-<Column ss:Width="90" />
+<Column ss:AutoFitWidth="1" ss:Width="64" />
+<Column ss:AutoFitWidth="1" ss:Width="120" />
+<Column ss:AutoFitWidth="1" ss:Width="64" />
+% if get_show_move_lines():
+<Column ss:AutoFitWidth="1" ss:Width="300" />
+% endif
+% if not get_show_move_lines():
+<Column ss:AutoFitWidth="1" ss:Width="150" />
+% endif
+<Column ss:AutoFitWidth="1" ss:Width="50" />
+<Column ss:AutoFitWidth="1" ss:Width="64" />
+<Column ss:AutoFitWidth="1" ss:Width="64" />
+<Column ss:AutoFitWidth="1" ss:Width="64" />
+<Column ss:AutoFitWidth="1" ss:Width="64" />
+<Column ss:AutoFitWidth="1" ss:Width="64" />
 <Row>
 <Cell ss:StyleID="ssH"><Data ss:Type="String">${header_company_or_chart_of_account}</Data></Cell>
 <Cell ss:StyleID="ssH"><Data ss:Type="String">Fiscal Year</Data></Cell>
@@ -240,14 +246,13 @@
 </Row>
 <Row>
 % if get_show_move_lines():
-<Cell ss:StyleID="ssH"><Data ss:Type="String">Account</Data></Cell>
-<Cell ss:StyleID="ssH"><Data ss:Type="String">Entry Seq</Data></Cell>
+<Cell ss:StyleID="ssH" ss:MergeAcross="1"><Data ss:Type="String">Entry Seq</Data></Cell>
 <Cell ss:StyleID="ssH"><Data ss:Type="String">Posting Date</Data></Cell>
 <Cell ss:StyleID="ssH"><Data ss:Type="String">Description</Data></Cell>
 <Cell ss:StyleID="ssH"><Data ss:Type="String">Currency</Data></Cell>
 % endif
 % if not get_show_move_lines():
-<Cell ss:StyleID="ssH"><Data ss:Type="String">Account</Data></Cell>
+<Cell ss:StyleID="ssH"><Data ss:Type="String">Account / CCY</Data></Cell>
 <Cell ss:StyleID="ssH" ss:MergeAcross="2"><Data ss:Type="String"></Data></Cell>
 <Cell ss:StyleID="ssH"><Data ss:Type="String">Currency</Data></Cell>
 % endif
@@ -296,10 +301,7 @@
 
 % for line in lines(o, initial_balance_mode=True):
 <Row>
-<Cell ss:StyleID="ssBorder${ccy_sub_total_style_suffix}${ccy_sub_total_style_right_suffix}">
-    <Data ss:Type="String">${(o.code or '')|x}</Data>
-</Cell>
-<Cell ss:StyleID="ssBorder${ccy_sub_total_style_suffix}${ccy_sub_total_style_right_suffix}" ss:MergeAcross="2">
+<Cell ss:StyleID="ssBorder${ccy_sub_total_style_suffix}${ccy_sub_total_style_right_suffix}" ss:MergeAcross="3">
     <Data ss:Type="String">${(line['move'] or '' or '')|x}</Data>
 </Cell>
 <Cell ss:StyleID="ssAccountLine${ccy_sub_total_style_suffix}">
@@ -331,7 +333,7 @@
 <Cell ss:StyleID="ssAccountLine">
     <Data ss:Type="String">${(formatLang(line['ldate'],date=True)) or ''}</Data>
 </Cell>
-<Cell ss:StyleID="ssAccountLine">
+<Cell ss:StyleID="ssAccountLineNoWrap">
     <Data ss:Type="String">${(line['lname'] or '')|x}</Data>
 </Cell>
 <Cell ss:StyleID="ssAccountLine">
@@ -354,12 +356,9 @@
 
 % for ccy in o.get_currencies():
 <Row>
-<Cell ss:StyleID="ssBorder${ccy_sub_total_style_suffix}${ccy_sub_total_style_right_suffix}">
+<Cell ss:StyleID="ssBorder${ccy_sub_total_style_suffix}${ccy_sub_total_style_right_suffix}" ss:MergeAcross="3">
     <Data ss:Type="String">${(o.code or '')|x}</Data>
 </Cell>
-<Cell ss:StyleID="ssBorder${ccy_sub_total_style_suffix}${ccy_sub_total_style_right_suffix}" ss:MergeAcross="2">
-    <Data ss:Type="String">Sub Total</Data>
-</Cell>
 <Cell ss:StyleID="ssAccountLine${ccy_sub_total_style_suffix}">
     <Data ss:Type="String">${(ccy or '')|x}</Data>
 </Cell>
@@ -384,12 +383,7 @@
 <WorksheetOptions xmlns="urn:schemas-microsoft-com:office:excel">
    <PageSetup>
     <Layout x:Orientation="Landscape"/>
-% if get_show_move_lines():
-    <Header x:Data="&amp;C&amp;&quot;Arial,Bold&quot;&amp;14General Ledger"/>0
-% endif
-% if not get_show_move_lines():
-    <Header x:Data="&amp;C&amp;&quot;Arial,Bold&quot;&amp;14Trial Balance"/>0
-% endif
+    <Header x:Data="&amp;C&amp;&quot;Arial,Bold&quot;&amp;14General Ledger"/>
     <Footer x:Data="Page &amp;P of &amp;N"/>
    </PageSetup>
    <Print>
 
=== modified file 'bin/addons/account/report/account_profit_loss.py'
--- bin/addons/account/report/account_profit_loss.py	2016-04-06 13:40:48 +0000
+++ bin/addons/account/report/account_profit_loss.py	2016-05-24 07:58:03 +0000
@@ -239,11 +239,9 @@
             if data['form'].get('instance_ids', False):
                 self.cr.execute('select code from msf_instance where id IN %s',
                     (tuple(data['form']['instance_ids']),))
-                instances = [x for x, in self.cr.fetchall()]
             else:
-                # US-1166: mission only instances if none provided
-                instances = self._get_instances(get_code=True,
-                    mission_filter=True)
+                self.cr.execute('select code from msf_instance')
+            instances = [x for x, in self.cr.fetchall()]
         return ', '.join(instances)
 
 report_sxw.report_sxw('report.pl.account.horizontal', 'account.account',
 
=== modified file 'bin/addons/account/report/common_report_header.py'
--- bin/addons/account/report/common_report_header.py	2016-04-06 13:40:48 +0000
+++ bin/addons/account/report/common_report_header.py	2016-05-24 07:58:03 +0000
@@ -192,19 +192,4 @@
             return pooler.get_pool(self.cr.dbname).get('account.account').browse(self.cr, self.uid, data['form']['chart_account_id']).company_id.currency_id.symbol
         return ''
 
-    def _get_instances(self, get_code=False, mission_filter=False):
-        """
-        :param get_code: True to return code list vs ids list
-        :type get_code: boolean
-        :param mission_filter: only mission instance ?
-        :type mission_filter: boolean
-        :rtype : list/False
-        """
-        instance_obj = pooler.get_pool(self.cr.dbname).get('msf.instance')
-        ids = instance_obj.search(self.cr, self.uid,
-            mission_filter and [('instance_to_display_ids','=',True)] or [])
-        if not get_code or not ids:
-            return ids
-        return [ i.code for i in instance_obj.browse(self.cr, self.uid, ids) ]
-
 #vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
=== modified file 'bin/addons/account/wizard/account_report_balance_sheet_view.xml'
--- bin/addons/account/wizard/account_report_balance_sheet_view.xml	2016-04-06 13:40:48 +0000
+++ bin/addons/account/wizard/account_report_balance_sheet_view.xml	2016-05-24 07:58:03 +0000
@@ -20,7 +20,7 @@
                 <field name="display_account"/>
                 <field name="export_format"/>
                 <newline />
-                <field name="instance_ids" domain="[('instance_to_display_ids','=',True)]">
+                <field name="instance_ids">
                     <tree noteditable="1" editable="top" string="Proprietary Instances">
                         <field name="code" />
                         <field name="name" />
 
=== modified file 'bin/addons/account/wizard/account_report_general_ledger.py'
--- bin/addons/account/wizard/account_report_general_ledger.py	2016-04-07 12:44:59 +0000
+++ bin/addons/account/wizard/account_report_general_ledger.py	2016-05-24 07:58:03 +0000
@@ -128,7 +128,9 @@
             fy_rec = self.pool.get('account.fiscalyear').browse(cr, uid,
                 fiscalyear_id, context=context)
             if filter in ('filter_date_doc', 'filter_date', ):
-                ib_available = date_from and date_from == fy_rec.date_start
+                ib_available = date_from and date_to \
+                    and date_from == fy_rec.date_start \
+                    and date_to <= fy_rec.date_stop
             elif filter in 'filter_period':
                 if not period_from or not period_to:
                     ib_available = False
 
=== modified file 'bin/addons/account/wizard/account_report_profit_loss_view.xml'
--- bin/addons/account/wizard/account_report_profit_loss_view.xml	2016-04-06 13:40:48 +0000
+++ bin/addons/account/wizard/account_report_profit_loss_view.xml	2016-05-24 07:58:03 +0000
@@ -20,7 +20,7 @@
                 <field name="display_account"/>
                 <field name="export_format"/>
                 <newline/>
-                <field name="instance_ids" domain="[('instance_to_display_ids','=',True)]">
+                <field name="instance_ids">
                     <tree noteditable="1" editable="top" string="Proprietary Instances">
                         <field name="code" />
                         <field name="name" />
 
=== modified file 'bin/addons/account_mcdb/account_view.xml'
--- bin/addons/account_mcdb/account_view.xml	2016-04-05 08:49:12 +0000
+++ bin/addons/account_mcdb/account_view.xml	2016-05-24 07:58:03 +0000
@@ -31,8 +31,8 @@
                     <field name="transfer_journal_id" invisible="1"/>
                     <field name="partner_txt"/>
                     <field name="partner_type" invisible="1"/>
-                    <field name="debit_currency" sum="Total Booking Debit"/>
-                    <field name="credit_currency" sum="Total Booking Credit"/>
+                    <field name="debit_currency"/>
+                    <field name="credit_currency"/>
                     <field name="currency_id"/>
                     <field name="debit" sum="Total Functional Debit"/>
                     <field name="credit" sum="Total Functional Credit"/>
@@ -74,9 +74,9 @@
                     <field name="cost_center_id" string="Cost Center" invisible="not context.get('display_fp', False)"/>
                     <field name="account_id"/>
                     <field name="partner_txt"/>
-                    <field name="amount_currency" sum="Total Booking Amount"/>
+                    <field name="amount_currency"/>
                     <field name="currency_id"/>
-                    <field name="amount" sum="Total Functional Amount"/>
+                    <field name="amount"/>
                     <field name="functional_currency_id"/>
                     <field name="output_amount"/>
                     <field name="output_currency"/>
 
=== modified file 'bin/addons/analytic_distribution/analytic_line.py'
--- bin/addons/analytic_distribution/analytic_line.py	2016-04-12 08:17:35 +0000
+++ bin/addons/analytic_distribution/analytic_line.py	2016-05-24 07:58:03 +0000
@@ -338,7 +338,7 @@
                 self.pool.get('account.move.line').corrected_upstream_marker(cr, uid, [aline.move_id.id], context=context)
         return True
 
-    def check_analytic_account(self, cr, uid, ids, account_id, wiz_date, context=None):
+    def check_analytic_account(self, cr, uid, ids, account_id, context=None):
         """
         Analytic distribution validity verification with given account for given ids.
         Return all valid ids.
@@ -372,14 +372,6 @@
             # since US-711 date_stop is to be excluded itself as a frontier
             # => >= date_stop vs > date_stop
             # => http://jira.unifield.org/browse/US-711?focusedCommentId=45744&page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel#comment-45744
-            if account_type in ['OC', 'DEST']:
-                if aline.journal_id.type == 'hq' or aline.period_id and aline.period_id.state in ['done', 'mission-closed']:
-                    aline_cmp_date = wiz_date
-                    # these lines will be reverted, check if the reverted line is active
-                    oc_dest_date_start = max(aline.cost_center_id.date_start, aline.destination_id.date_start)
-                    oc_dest_date_stop = min(aline.cost_center_id.date or '9999-01-01', aline.destination_id.date or '9999-01-01')
-                    if (oc_dest_date_start and wiz_date < oc_dest_date_start) or (oc_dest_date_stop and wiz_date >= oc_dest_date_stop):
-                        expired_date_ids.append(aline.id)
             if (date_start and aline_cmp_date < date_start) or (date_stop and aline_cmp_date >= date_stop):
                 expired_date_ids.append(aline.id)
         # Process regarding account_type
 
=== modified file 'bin/addons/analytic_override/analytic_line.py'
--- bin/addons/analytic_override/analytic_line.py	2016-04-12 07:14:13 +0000
+++ bin/addons/analytic_override/analytic_line.py	2016-05-24 07:58:03 +0000
@@ -135,27 +135,24 @@
         if not 'account_id' in vals:
             raise osv.except_osv(_('Error'), _('No account_id found in given values!'))
 
-        account_obj = self.pool.get('account.analytic.account')
-
         #US-419: Use the document date and not posting date when checking the validity of analytic account
         # tech: replaced all date by document_date
         if 'document_date' in vals and vals['document_date'] is not False:
+            account_obj = self.pool.get('account.analytic.account')
             document_date = vals['document_date']
             account = account_obj.browse(cr, uid, vals['account_id'], context=context)
             # FIXME: refactoring of next code
             if document_date < account.date_start or (account.date != False and document_date >= account.date):
                 if 'from' not in context or context.get('from') != 'mass_reallocation':
                     raise osv.except_osv(_('Error'), _("The analytic account selected '%s' is not active.") % (account.name or '',))
-        if 'date' in vals and vals['date'] is not False:
-            date = vals['date']
             if vals.get('cost_center_id', False):
                 cc = account_obj.browse(cr, uid, vals['cost_center_id'], context=context)
-                if date < cc.date_start or (cc.date != False and date >= cc.date):
+                if document_date < cc.date_start or (cc.date != False and document_date >= cc.date):
                     if 'from' not in context or context.get('from') != 'mass_reallocation':
                         raise osv.except_osv(_('Error'), _("The analytic account selected '%s' is not active.") % (cc.name or '',))
             if vals.get('destination_id', False):
                 dest = account_obj.browse(cr, uid, vals['destination_id'], context=context)
-                if date < dest.date_start or (dest.date != False and date >= dest.date):
+                if document_date < dest.date_start or (dest.date != False and document_date >= dest.date):
                     if 'from' not in context or context.get('from') != 'mass_reallocation':
                         raise osv.except_osv(_('Error'), _("The analytic account selected '%s' is not active.") % (dest.name or '',))
         return True
 
=== modified file 'bin/addons/delivery_mechanism/delivery_mechanism.py'
--- bin/addons/delivery_mechanism/delivery_mechanism.py	2016-05-02 07:56:36 +0000
+++ bin/addons/delivery_mechanism/delivery_mechanism.py	2016-05-24 07:58:03 +0000
@@ -1181,7 +1181,7 @@
                 # UTP-967
                 if move.state != 'cancel' and move.purchase_line_id and move.purchase_line_id.procurement_id:
                     proc = move.purchase_line_id.procurement_id
-                    if proc.move_id and proc.move_id.location_id.id == proc_loc_id:
+                    if proc.move_id and proc.move_id.location_id.id == proc_loc_id and count > 0.00:
                         if diff_qty > 0:
                             # REF-59: move of partial in,
                             # adapt proc order's move qty (for correct virtual stock)
 
=== modified file 'bin/addons/finance/account_drill.py'
--- bin/addons/finance/account_drill.py	2016-05-12 08:30:44 +0000
+++ bin/addons/finance/account_drill.py	2016-05-24 07:58:03 +0000
@@ -41,7 +41,6 @@
         # set during map/reduce
         self.data = {}
         self.zero_bal = False
-        self.skip = False
 
         # set during next_node() calls
         self.code = ''
@@ -80,11 +79,12 @@
         JOIN res_currency c ON (c.id = l.currency_id)
         JOIN account_journal j on (l.journal_id=j.id)
         JOIN account_account a on (a.id=l.account_id)
-        WHERE l.account_id = %s{reconcile}{query}
+        JOIN account_account_type at on (at.id=a.user_type)
+        WHERE l.account_id = %s{reconcile}{options}{query}
         GROUP BY l.currency_id'''
 
     # initial balance move lines base query (from IB journal period 0)
-    _sql_ib = '''SELECT sum(debit), sum(credit),
+    _sql_ib = '''SELECT  sum(debit), sum(credit),
         sum(debit_currency), sum(credit_currency),
         max(c.name)
         FROM account_move_line l
@@ -113,28 +113,8 @@
         self.query_ib = query_ib or ''
         self.move_states = move_states or [ 'draft', 'posted', ]
         self.include_accounts = include_accounts
-        self.account_report_types = account_report_types
         self.with_balance_only = with_balance_only
         self.reconcile_filter = reconcile_filter
-        if self.account_report_types and not self.include_accounts:
-            # deduce included accounts from report type filter
-            domain = [
-                ('report_type', 'in' , self.account_report_types),
-            ]
-            if 'asset' in self.account_report_types \
-                or 'liability' in self.account_report_types:
-                # US-227 include tax account for BS accounts selection
-                domain = [ '|', ('code', '=', 'tax') ] + domain
-            account_types_ids = self.pool.get('account.account.type').search(
-                self.cr, self.uid, domain, context=self.context)
-
-            if account_types_ids:
-                domain = [
-                    ('type', '!=', 'view'),
-                    ('user_type', 'in' , account_types_ids),
-                ]
-                self.include_accounts = self.pool.get('account.account').search(
-                    self.cr, self.uid, domain, context=self.context) or []
 
         # nodes
         self.root = None
@@ -146,6 +126,18 @@
         # JI base query: constructed via _sql
         self.sql = self._sql
         self.sql = self.sql.replace('{reconcile}', self.reconcile_filter)
+        if account_report_types:
+            report_types = [ "'%s'" % (rt, ) for rt in account_report_types ]
+            options = " AND (at.report_type in (%s)" % (
+                ','.join(report_types), )
+            if 'asset' in account_report_types \
+                or 'liability' in account_report_types:
+                # US-227 include tax account for BS accounts selection
+                options += " OR at.code = 'tax'"
+            options += ')'
+        else:
+            options = ''
+        self.sql = self.sql.replace('{options}', options)
 
     def output(self):
         """
@@ -177,6 +169,7 @@
 
         level = max(self.nodes_by_level.keys())
         while level > 0:
+<<<<<<< TREE
             nodes = self.nodes_by_level.get(level)
             if nodes:
                 for n in nodes:
@@ -194,16 +187,30 @@
                         n.skip = not n.childs
                     #elif level == self._move_level - 1:
                     #    n.skip = not n.childs  # no entries due to filtering
+=======
+            nodes = self.nodes_by_level[level]
+            for n in nodes:
+                if level == self._move_level:
+                    if self.with_balance_only:
+                        bal = n.data.get('*', {}).get('debit', 0.) \
+                            - n.data.get('*', {}).get('credit', 0.)
+                        if bal == 0.:
+                            # JI level:
+                            # with only balance filter: do not agregate account
+                            # debit/credit with a zero balance
+                            n.zero_bal = True
+                            continue
+>>>>>>> MERGE-SOURCE
 
-                    parent = n.parent
-                    if parent:
-                        for ccy in n.data:
-                            if not ccy in parent.data:
-                                parent.data[ccy] = {}
-                                for f in fields:
-                                    parent.data[ccy][f] = 0.
+                parent = n.parent
+                if parent:
+                    for ccy in n.data:
+                        if not ccy in parent.data:
+                            parent.data[ccy] = {}
                             for f in fields:
-                                parent.data[ccy][f] += n.data[ccy].get(f, 0.)
+                                parent.data[ccy][f] = 0.
+                        for f in fields:
+                            parent.data[ccy][f] += n.data[ccy].get(f, 0.)
             level -= 1  # upper level (upper level by uper level)
 
         # uncomment to explore reduced nodes
@@ -223,11 +230,14 @@
         child_ids = self._search(domain)
         if child_ids:
             for id in child_ids:
+<<<<<<< TREE
                 if self.is_view(id) or not self.include_accounts or id in self.include_accounts:
+=======
+                if not self.include_accounts or id in self.include_accounts:
+>>>>>>> MERGE-SOURCE
                     node = self._create_node(parent=parent, level=level,
                         account_id=id)
-                    if node:
-                        self._map_dive(node, level + 1)
+                    self._map_dive(node, level + 1)
 
     def _create_node(self, parent=None, level=0, account_id=False):
         """
 
=== modified file 'bin/addons/import_data/import_data.py'
--- bin/addons/import_data/import_data.py	2016-01-05 14:50:57 +0000
+++ bin/addons/import_data/import_data.py	2016-05-24 07:58:03 +0000
@@ -190,12 +190,23 @@
         'import_mode': lambda *a: 'create',
     }
 
-    def _import(self, dbname, uid, ids, context=None):
+    def _import(self, cr, uid, ids, context=None, use_new_cursor=True, auto_import=False):
         """if context includes 'import_data_field_max_size' dict,
         this dict specifies the max tolerated field length at import
         (key: field name, value: field size)
         """
-        cr = pooler.get_db(dbname).cursor()
+        dbname = cr.dbname
+        if use_new_cursor:
+            cr = pooler.get_db(cr.dbname).cursor()
+
+        if context is None:
+            context = {}
+
+        if isinstance(ids, (int, long)):
+            ids = [ids]
+
+        processed = []
+        rejected = []
 
         obj = self.read(cr, uid, ids[0])
         import_mode = obj.get('import_mode')
@@ -282,7 +293,8 @@
                 self._cache[dbname]['product.international.status']['name'].update({iv['name']: iv['id']})
 
         errorfile = TemporaryFile('w+')
-        writer = csv.writer(errorfile, quotechar='"', delimiter=';')
+        if not auto_import:
+            writer = csv.writer(errorfile, quotechar='"', delimiter=';')
 
         fields_def = impobj.fields_get(cr, uid, context=context)
         i = 0
@@ -342,6 +354,13 @@
 
             raise osv.except_osv(_('Warning !'), _('%s does not exist')%(value,))
 
+        def write_error_row(row, index, error=""):
+            if not auto_import:
+                row.append(error)
+                writer.writerow(row)
+            else:
+                rejected.append((index, row, error))
+
         i = 1
         nb_error = 0
         nb_succes = 0
@@ -350,7 +369,8 @@
         if self.pre_hook.get(impobj._name):
             # for headers mod.
             col_datas = self.pre_hook[impobj._name](impobj, cr, uid, headers, {}, col_datas)
-        writer.writerow(headers)
+        if not auto_import:
+            writer.writerow(headers)
 
         for row in reader:
             newo2m = False
@@ -394,9 +414,8 @@
                                 logging.getLogger('import data').info(
                                     'Error %s'% (msg, ))
                                 cr.rollback()
-                                row.append("Line %s, row: %s, %s" % (i, n,
-                                    msg, ))
-                                writer.writerow(row)
+                                error = "Line %s, row: %s, %s" % (i, n, msg, )
+                                write_error_row(row, i, error)
                                 nb_error += 1
                                 line_ok = False
                                 break
@@ -464,62 +483,64 @@
                     impobj.create(cr, uid, data, context={'from_import_menu': True})
                     nb_succes += 1
                     cr.commit()
+                processed.append((i, row))
             except osv.except_osv, e:
                 logging.getLogger('import data').info('Error %s'%e.value)
                 cr.rollback()
-                row.append("Line %s, row: %s, %s"%(i, n, e.value))
-                writer.writerow(row)
+                error = "Line %s, row: %s, %s"%(i, n, e.value)
+                write_error_row(row, i, error)
                 nb_error += 1
             except Exception, e:
                 cr.rollback()
                 logging.getLogger('import data').info('Error %s'%e)
-                row.append("Line %s, row: %s, %s"%(i, n, e))
-                writer.writerow(row)
+                error = "Line %s, row: %s, %s"%(i, n, e)
+                write_error_row(row, i, error)
                 nb_error += 1
 
         if self.post_load_hook.get(impobj._name):
             self.post_load_hook[impobj._name](impobj, cr, uid)
         fileobj.close()
-        import_type = 'Import'
-        if import_mode == 'update':
-            import_type = 'Update'
-            summary = '''Datas Import Summary:
-Object: %s
-Records updated: %s
-Records created: %s
-'''%(objname, nb_update_success, nb_succes)
-        else:
-            summary = '''Datas Import Summary:
-Object: %s
-Records created: %s
-'''%(objname, nb_succes)
-
-        if nb_error:
-            summary += '''Records rejected: %s
-
-Find in attachment the rejected lines'''%(nb_error)
-
-        request_obj = self.pool.get('res.request')
-        req_id = request_obj.create(cr, uid,
-            {'name': "%s %s"%(import_type, objname,),
-            'act_from': uid,
-            'act_to': uid,
-            'body': summary,
-            })
-        if req_id:
-            request_obj.request_send(cr, uid, [req_id])
-
-        if nb_error:
-            errorfile.seek(0)
-            attachment = self.pool.get('ir.attachment')
-            attachment.create(cr, uid, {
-                'name': 'rejected-lines.csv',
-                'datas_fname': 'rejected-lines.csv',
-                'description': 'Rejected Lines',
-                'res_model': 'res.request',
-                'res_id': req_id,
-                'datas': base64.encodestring(errorfile.read()),
-            })
+        if not auto_import:
+            import_type = 'Import'
+            if import_mode == 'update':
+                import_type = 'Update'
+                summary = '''Datas Import Summary:
+    Object: %s
+    Records updated: %s
+    Records created: %s
+    '''%(objname, nb_update_success, nb_succes)
+            else:
+                summary = '''Datas Import Summary:
+    Object: %s
+    Records created: %s
+    '''%(objname, nb_succes)
+
+            if nb_error:
+                summary += '''Records rejected: %s
+
+    Find in attachment the rejected lines'''%(nb_error)
+
+            request_obj = self.pool.get('res.request')
+            req_id = request_obj.create(cr, uid,
+                {'name': "%s %s"%(import_type, objname,),
+                'act_from': uid,
+                'act_to': uid,
+                'body': summary,
+                })
+            if req_id:
+                request_obj.request_send(cr, uid, [req_id])
+
+            if nb_error:
+                errorfile.seek(0)
+                attachment = self.pool.get('ir.attachment')
+                attachment.create(cr, uid, {
+                    'name': 'rejected-lines.csv',
+                    'datas_fname': 'rejected-lines.csv',
+                    'description': 'Rejected Lines',
+                    'res_model': 'res.request',
+                    'res_id': req_id,
+                    'datas': base64.encodestring(errorfile.read()),
+                })
 
         if impobj == 'product.product':
             # Clear the cache
@@ -528,10 +549,14 @@
 
         errorfile.close()
         cr.commit()
-        cr.close(True)
+        if use_new_cursor:
+            cr.close(True)
+
+        if auto_import:
+            return processed, rejected, headers
 
     def import_csv(self, cr, uid, ids, context=None):
-        thread = threading.Thread(target=self._import, args=(cr.dbname, uid, ids, context))
+        thread = threading.Thread(target=self._import, args=(cr, uid, ids, context))
         thread.start()
         return {'type': 'ir.actions.act_window_close'}
 
 
=== modified file 'bin/addons/mission_stock/mission_stock.py'
--- bin/addons/mission_stock/mission_stock.py	2016-05-12 08:16:15 +0000
+++ bin/addons/mission_stock/mission_stock.py	2016-05-24 07:58:03 +0000
@@ -39,6 +39,7 @@
     return text
 
 
+<<<<<<< TREE
 class msr_in_progress(osv.osv_memory):
     '''
         US-1218: This memory class is used to store temporary values regarding the report process, when a report is in progress, at it into the table
@@ -84,6 +85,8 @@
 
 msr_in_progress()
 
+=======
+>>>>>>> MERGE-SOURCE
 class stock_mission_report(osv.osv):
     _name = 'stock.mission.report'
     _description = 'Mission stock report'
@@ -185,21 +188,11 @@
     def update_newthread(self, cr, uid, ids=[], context=None):
         # Open a new cursor : Don't forget to close it at the end of method
         cr = pooler.get_db(cr.dbname).cursor()
-        msr_in_progress = self.pool.get('msr_in_progress')
         try:
-            if msr_in_progress._is_in_progress(cr, uid, context):
-                logging.getLogger('MSR').info("""____________________ Another process is progress, this request is ignore: %s""" % time.strftime('%Y-%m-%d %H:%M:%S'))
-                return
-
-            logging.getLogger('MSR').info("""____________________ Start the update process of MSR, at %s""" % time.strftime('%Y-%m-%d %H:%M:%S'))
             self.update(cr, uid, ids=[], context=None)
-            msr_in_progress._delete_all(cr, uid, context)
             cr.commit()
-            logging.getLogger('MSR').info("""____________________ Finished the update process of MSR, at %s""" % time.strftime('%Y-%m-%d %H:%M:%S'))
-        except Exception as e:
+        except Exception:
             cr.rollback()
-            logging.getLogger('MSR').error("""____________________ Error while running the update process of MSR, at %s - Error: %s""" % (time.strftime('%Y-%m-%d %H:%M:%S'), str(e)))
-            msr_in_progress._delete_all(cr, uid, context)
         finally:
             cr.close(True)
 
@@ -214,11 +207,9 @@
             ids = [ids]
 
         line_obj = self.pool.get('stock.mission.report.line')
-        msr_in_progress = self.pool.get('msr_in_progress')
 
-        report_ids = self.search(cr, uid, [('local_report', '=', True), ('full_view', '=', False)], context=context)
+        report_ids = self.search(cr, uid, [('local_report', '=', True)], context=context)
         full_report_ids = self.search(cr, uid, [('full_view', '=', True)], context=context)
-
         instance_id = self.pool.get('res.users').browse(cr, uid, uid).company_id.instance_id
         line_ids = []
 
@@ -251,15 +242,12 @@
 
         product_ids = self.pool.get('product.product').search(cr, uid, [], context=context)
         product_values = {}
-        temp_prods = self.pool.get('product.product').read(cr, uid, product_ids, ['product_amc', 'reviewed_consumption'], context=context)
-
-        logging.getLogger('MSR').info("""___ Number of MSR lines to be updated: %s, at %s""" % (len(temp_prods), time.strftime('%Y-%m-%d %H:%M:%S')))
-
-        for product in temp_prods:
+        for product in self.pool.get('product.product').read(cr, uid, product_ids, ['product_amc', 'reviewed_consumption'], context=context):
             product_values.setdefault(product['id'], {})
             product_values[product['id']].setdefault('product_amc', product['product_amc'])
             product_values[product['id']].setdefault('reviewed_consumption', product['reviewed_consumption'])
 
+
         # Check in each report if new products are in the database and not in the report
         for report in self.read(cr, uid, report_ids, ['local_report', 'full_view'], context=context):
             #self.write(cr, uid, [report.id], {'export_ok': False}, context=context)
@@ -274,11 +262,16 @@
             if not report['local_report']:
                 continue
 
+<<<<<<< TREE
             #US-1218: If this report is previously processed, then do not redo it again for this transaction!
             if msr_in_progress._already_processed(cr, uid, report['id'], context):
                 continue
+=======
+            # Update the update date on report
+            self.write(cr, uid, [report['id']], {'last_update': time.strftime('%Y-%m-%d %H:%M:%S'),
+                                              'export_ok': False}, context=context)
+>>>>>>> MERGE-SOURCE
 
-            logging.getLogger('MSR').info("""___ updating the report lines of the report: %s, at %s (this may take very long time!)""" % (report['id'], time.strftime('%Y-%m-%d %H:%M:%S')))
             if context.get('update_full_report'):
                 full_view = self.search(cr, uid, [('full_view', '=', True)])
                 if full_view:
@@ -288,15 +281,22 @@
                 # Update all lines
                 self.update_lines(cr, uid, [report['id']])
 
+<<<<<<< TREE
             msr_ids = msr_in_progress.search(cr, uid, [('report_id', '=', report['id'])], context=context)
             msr_in_progress.write(cr, uid, msr_ids, {'done_ok': True}, context=context)
 
             logging.getLogger('MSR').info("""___ exporting the report lines of the report %s to csv, at %s""" % (report['id'], time.strftime('%Y-%m-%d %H:%M:%S')))
+=======
+>>>>>>> MERGE-SOURCE
             self._get_export_csv(cr, uid, report['id'], product_values, context=context)
+<<<<<<< TREE
             # Update the update date on report
             self.write(cr, uid, [report['id']], {'last_update': time.strftime('%Y-%m-%d %H:%M:%S')}, context=context)
             logging.getLogger('MSR').info("""___ finished processing completely for the report: %s, at %s \n""" % (report['id'], time.strftime('%Y-%m-%d %H:%M:%S')))
 
+=======
+
+>>>>>>> MERGE-SOURCE
         # After update of all normal reports, update the full view report
         if not context.get('update_full_report'):
             c = context.copy()
@@ -338,43 +338,31 @@
 
         for id in ids:
             # In-Pipe moves
-            cr.execute('''SELECT m.product_id, sum(m.product_qty), m.product_uom, p.name
+            cr.execute('''SELECT m.product_id, m.product_qty, m.product_uom, p.name, m.id
                           FROM stock_move m
                               LEFT JOIN stock_picking s ON m.picking_id = s.id
                               LEFT JOIN res_partner p ON s.partner_id2 = p.id
-                          WHERE s.type = 'in' AND m.state in ('confirmed', 'waiting', 'assigned')
-                          GROUP BY m.product_id, m.product_uom, p.name
-                          ORDER BY m.product_id''')
+                          WHERE s.type = 'in' AND m.state in ('confirmed', 'waiting', 'assigned')''')
 
             in_pipe_moves = cr.fetchall()
-            current_product = None
-            line = None
-            vals = {}
-            for product_id, qty, uom, partner in in_pipe_moves:
-                if current_product != product_id:
-                    if line and vals and (vals.get('in_pipe_qty', False) or vals.get('in_pipe_coor_qty', False)):
-                        line_obj.write(cr, uid, [line.id], vals)
-                    line_id = line_obj.search(cr, uid, [('product_id', '=', product_id),
-                                                        ('mission_report_id', '=', id)])
+            for product_id, qty, uom, partner, move_id in in_pipe_moves:
+                line_id = line_obj.search(cr, uid, [('product_id', '=', product_id),
+                                                    ('mission_report_id', '=', id)])
+                if line_id:
+                    line = line_obj.browse(cr, uid, line_id[0])
+                    if uom != line.product_id.uom_id.id:
+                        qty = self.pool.get('product.uom')._compute_qty(cr, uid, uom, qty, line.product_id.uom_id.id)
 
                     vals = {'in_pipe_qty': 0.00,
                             'in_pipe_coor_qty': 0.00,
                             'updated': True}
-                    current_product = product_id
-                    if not line_id:
-                        continue
-
-                line = line_obj.browse(cr, uid, line_id[0])
-                if uom != line.product_id.uom_id.id:
-                    qty = self.pool.get('product.uom')._compute_qty(cr, uid, uom, qty, line.product_id.uom_id.id)
-
-                vals['in_pipe_qty'] = vals['in_pipe_qty'] + qty
-
-                if partner == coordo_id:
-                    vals['in_pipe_coor_qty'] = vals['in_pipe_coor_qty'] + qty
-
-            if line and vals and (vals.get('in_pipe_qty', False) or vals.get('in_pipe_coor_qty', False)):
-                line_obj.write(cr, uid, [line.id], vals)
+
+                    vals['in_pipe_qty'] = vals['in_pipe_qty'] + qty
+
+                    if partner == coordo_id:
+                        vals['in_pipe_coor_qty'] = vals['in_pipe_coor_qty'] + qty
+
+                    line_obj.write(cr, uid, line.id, vals)
 
             # All other moves
             cr.execute('''
@@ -883,7 +871,6 @@
                 if instance.parent_id.parent_id:
                     return instance.parent_id.parent_id.id
                 return instance.parent_id.id
-            return instance.id
 
         return False
 
 
=== modified file 'bin/addons/msf_accrual/msf_accrual_line.py'
--- bin/addons/msf_accrual/msf_accrual_line.py	2016-04-08 12:50:27 +0000
+++ bin/addons/msf_accrual/msf_accrual_line.py	2016-05-24 07:58:03 +0000
@@ -178,13 +178,15 @@
             context = {}
         if isinstance(ids, (int, long, )):
             ids = [ids]
+
+        if 'document_date' in vals:
+            # US-192 check doc date reagarding post date
+            # => read date field (as readonly in form)
+            for r in self.read(cr, uid, ids, ['date', ], context=context):
+                self.pool.get('finance.tools').check_document_date(cr, uid,
+                    vals['document_date'], r['date'], context=context)
+
         self._create_write_set_vals(cr, uid, vals, context=context)
-        # US-192 check doc date regarding post date
-        current_values = self.read(cr, uid, ids, ['document_date', 'date'], context=context)[0]
-        document_date = 'document_date' in vals and vals['document_date'] or current_values['document_date']
-        posting_date = 'date' in vals and vals['date'] or current_values['date']
-        self.pool.get('finance.tools').check_document_date(cr, uid, document_date, posting_date, context=context)
-
         return super(msf_accrual_line, self).write(cr, uid, ids, vals, context=context)
     
     def button_cancel(self, cr, uid, ids, context=None):
 
=== modified file 'bin/addons/msf_accrual/wizard/wizard_accrual_validation.py'
--- bin/addons/msf_accrual/wizard/wizard_accrual_validation.py	2016-04-08 07:51:59 +0000
+++ bin/addons/msf_accrual/wizard/wizard_accrual_validation.py	2016-05-24 07:58:03 +0000
@@ -39,8 +39,6 @@
                     raise osv.except_osv(_('Warning !'), _("The line '%s' is already posted!") % accrual_line.description)
                 elif accrual_line.state == 'partially_posted':
                     raise osv.except_osv(_('Warning !'), _("The line '%s' is already partially posted!") % accrual_line.description)
-                elif accrual_line.state == 'cancel':
-                    raise osv.except_osv(_('Warning !'), _("The line '%s' is cancelled and can't be re-posted.") % accrual_line.description)
                 elif not accrual_line.period_id:
                     raise osv.except_osv(_('Warning !'), _("The line '%s' has no period set!") % accrual_line.description)
                 elif not accrual_line.analytic_distribution_id:
 
=== modified file 'bin/addons/msf_cross_docking/cross_docking.py'
--- bin/addons/msf_cross_docking/cross_docking.py	2016-04-25 09:24:04 +0000
+++ bin/addons/msf_cross_docking/cross_docking.py	2016-05-24 07:58:03 +0000
@@ -403,9 +403,7 @@
                 self.write(cr, uid, ids, {'cross_docking_ok': True}, context=context)
             else:
                 raise osv.except_osv(_('Warning !'), _('Please, enter some stock moves before changing the source location to CROSS DOCKING'))
-            self.infolog(cr, uid, "The source location of the stock moves of the picking id:%s (%s) has been changed to cross-docking location" % (
-                pick.id, pick.name,
-            ))
+            self.infolog(cr, uid, "The source location of the stock moves of the picking id:%s has been changed to cross-docking location" % (pick.id))
         # we check availability : cancel then check
         self.cancel_assign(cr, uid, ids)
         self.action_assign(cr, uid, ids, context)
@@ -449,9 +447,7 @@
                 self.write(cr, uid, ids, {'cross_docking_ok': False}, context=context)
             else:
                 raise osv.except_osv(_('Warning !'), _('Please, enter some stock moves before changing the source location to STOCK'))
-            self.infolog(cr, uid, "The source location of the stock moves of the picking id:%s (%s) has been changed to stock location" % (
-                pick.id, pick.name,
-            ))
+            self.infolog(cr, uid, "The source location of the stock moves of the picking id:%s has been changed to stock location" % (pick.id))
         # we check availability : cancel then check
         self.cancel_assign(cr, uid, ids)
         self.action_assign(cr, uid, ids, context)
 
=== modified file 'bin/addons/msf_doc_import/account.py'
--- bin/addons/msf_doc_import/account.py	2016-04-14 15:11:58 +0000
+++ bin/addons/msf_doc_import/account.py	2016-05-24 07:58:03 +0000
@@ -406,19 +406,11 @@
                         if not line[cols['Cost Centre']]:
                             errors.append(_('Line %s. No cost center specified!') % (current_line_num,))
                             continue
-                        # If necessary cast the CC into a string, otherwise the below search would crash
-                        if not isinstance(line[cols['Cost Centre']], basestring):
-                            line[cols['Cost Centre']] = '%s' % (line[cols['Cost Centre']])
                         cc_ids = self.pool.get('account.analytic.account').search(cr, uid, [('category', '=', 'OC'), '|', ('name', '=', line[cols['Cost Centre']]), ('code', '=', line[cols['Cost Centre']])])
                         if not cc_ids:
                             errors.append(_('Line %s. Cost Center %s not found!') % (current_line_num, line[cols['Cost Centre']]))
                             continue
                         r_cc = cc_ids[0]
-                        # Check Cost Center type
-                        cc = self.pool.get('account.analytic.account').browse(cr, uid, r_cc, context)
-                        if cc.type == 'view':
-                            errors.append(_('Line %s. %s is a VIEW type Cost Center!') % (current_line_num, line[cols['Cost Centre']]))
-                            continue
                         # Check Funding Pool (added since UTP-1082)
                         r_fp = msf_fp_id
                         if line[cols['Funding Pool']]:
 
=== modified file 'bin/addons/msf_doc_import/view/internal_request_import_line_view.xml'
--- bin/addons/msf_doc_import/view/internal_request_import_line_view.xml	2016-04-12 15:36:23 +0000
+++ bin/addons/msf_doc_import/view/internal_request_import_line_view.xml	2016-05-24 07:58:03 +0000
@@ -31,7 +31,6 @@
                                         background-color: #F0EBA4;
                                         font-weight: bold;
                                         text-transform: uppercase;
-                                        width: 90%%;
                                     }
 
                                     #error_message_unifield p, #error_message_unifield span
@@ -42,7 +41,6 @@
                                         font-weight: bold;
                                         text-transform: uppercase;
                                         padding: 5px;
-                                        width: 90%%;
                                     }
 
                                     #error_message_unifield .grip
@@ -53,7 +51,7 @@
 
                                 <div id="error_message_unifield">
 									<field name="text_error" invisible="context.get('hide_column_error_ok', False) != True" readonly="1" />
-									<field name="inactive_error" attrs="{'invisible': [('inactive_product', '=', False)]}" string="Error" colspan="4" />
+									<field name="inactive_error" attrs="{'invisible': [('inactive_product', '=', False)]}" string="Error" />
                                 </div>
                            </html>
                        </group>
 
=== modified file 'bin/addons/msf_doc_import/view/purchase_order_import_line_view.xml'
--- bin/addons/msf_doc_import/view/purchase_order_import_line_view.xml	2016-04-12 12:42:49 +0000
+++ bin/addons/msf_doc_import/view/purchase_order_import_line_view.xml	2016-05-24 07:58:03 +0000
@@ -96,7 +96,6 @@
                                         font-weight: bold;
                                         text-transform: uppercase;
                                         padding: 5px;
-                                        width: 90%%;
                                     }
                                 </style>
 
 
=== modified file 'bin/addons/msf_doc_import/view/sale_order_import_lines_view.xml'
--- bin/addons/msf_doc_import/view/sale_order_import_lines_view.xml	2016-04-12 12:42:49 +0000
+++ bin/addons/msf_doc_import/view/sale_order_import_lines_view.xml	2016-05-24 07:58:03 +0000
@@ -65,11 +65,10 @@
                                     {
                                         height: 1em;
                                         min-height: 1em;
-                                        color: red;
+                                            color: red;
                                         font-weight: bold;
                                         text-transform: uppercase;
                                         padding: 5px;
-                                        width: 90%%;
                                     }
                                 </style>
 
 
=== modified file 'bin/addons/msf_doc_import/wizard/wiz_common_import.py'
--- bin/addons/msf_doc_import/wizard/wiz_common_import.py	2016-04-08 15:25:39 +0000
+++ bin/addons/msf_doc_import/wizard/wiz_common_import.py	2016-05-24 07:58:03 +0000
@@ -1013,7 +1013,7 @@
         p_obj = self.pool.get('product.product')
 
         location_id = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'stock', 'stock_location_stock')[1]
-        reason_id = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'reason_types_moves', 'reason_type_stock_initialization')[1]
+        reason_id = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'reason_types_moves', 'reason_type_loss')[1]
 
         for p_data in p_obj.read(cr, uid, product_ids, ['uom_id', 'perishable', 'batch_management', 'import_product_qty'], context=context):
             values = {'product_id': p_data['id'],
 
=== modified file 'bin/addons/msf_doc_import/wizard/wizard_import_ir_line.py'
--- bin/addons/msf_doc_import/wizard/wizard_import_ir_line.py	2016-04-12 12:02:11 +0000
+++ bin/addons/msf_doc_import/wizard/wizard_import_ir_line.py	2016-05-24 07:58:03 +0000
@@ -280,7 +280,7 @@
                 wizard_vals.update(file_to_export)
             self.write(cr, uid, ids, wizard_vals, context=context)
             # we reset the state of the FO to draft (initial state)
-            sale_obj.write(cr, uid, fo_id, {'state': 'draft', 'import_in_progress': False}, context)
+            sale_obj.write(cr, uid, fo_id, {'state': 'draft'}, context)
             if not context.get('yml_test', False):
                 cr.commit()
                 cr.close(True)
 
=== modified file 'bin/addons/msf_homere_interface/hr.py'
--- bin/addons/msf_homere_interface/hr.py	2016-01-04 13:16:43 +0000
+++ bin/addons/msf_homere_interface/hr.py	2016-05-24 07:58:03 +0000
@@ -326,5 +326,20 @@
 
         return super(hr_employee, self).name_search(cr, uid, name, args, operator, context, limit)
 
+    def auto_import(self, cr, uid, file_to_import):
+        import base64
+        import os
+        processed = []
+        rejected = []
+        headers = []
+
+        import_obj = self.pool.get('hr.expat.employee.import')
+        import_id = import_obj.create(cr, uid, {
+            'file': base64.encodestring(open(file_to_import, 'r').read()),
+            'filename': os.path.split(file_to_import)[1],
+        })
+        processed, rejected, headers = import_obj.button_validate(cr, uid, [import_id], auto_import=True)
+        return processed, rejected, headers
+
 hr_employee()
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
=== modified file 'bin/addons/msf_homere_interface/wizard/hr_expat_import.py'
--- bin/addons/msf_homere_interface/wizard/hr_expat_import.py	2015-03-24 08:40:43 +0000
+++ bin/addons/msf_homere_interface/wizard/hr_expat_import.py	2016-05-24 07:58:03 +0000
@@ -37,7 +37,7 @@
         'filename': fields.char(string="Imported filename", size=256),
     }
 
-    def button_validate(self, cr, uid, ids, context=None):
+    def button_validate(self, cr, uid, ids, context=None, auto_import=False):
         """
         Import XLS file
         """
@@ -46,12 +46,22 @@
                 line.cells[cell_index] and line.cells[cell_index].data \
                 or False
 
+        def manage_error(line_index, msg, name='', code='', status=''):
+            if auto_import:
+                rejected_lines.append((line_index, [name, code, status], msg))
+            else:
+                raise osv.except_osv(_('Error'), _(msg))
+
+        processed_lines = []
+        rejected_lines = []
+        headers = [_('Name'), _('Code'), _('Status')]
         hr_emp_obj = self.pool.get('hr.employee')
         # Some verifications
         if not context:
             context = {}
         if isinstance(ids, (int, long)):
             ids = [ids]
+
         for wiz in self.browse(cr, uid, ids):
             # Prepare some values
             created = 0
@@ -72,25 +82,28 @@
                 # get cells
                 name = get_xml_spreadheet_cell_value(0)
                 if not name:
+                    manage_error(line_index, 'No name defined')
                     continue
                 code = get_xml_spreadheet_cell_value(1)
                 if not code:
                     msg = "At least one employee in the import file does not" \
                         " have an ID number; make sure all employees in the" \
                         " file have an ID number and run the import again."
-                    raise osv.except_osv(_('Error'), _(msg))
+                    manage_error(line_index, msg, name)
                 active_str = get_xml_spreadheet_cell_value(2)
                 if not active_str:
-                    msg = "Active column is missing or empty at line %d"
-                    raise osv.except_osv(_('Error'), _(msg) % (line_index, ))
+                    msg = "Active column is missing or empty at line %d" % line_index
+                    manage_error(line_index, msg, name, code)
                 active_str = active_str.lower()
                 if active_str not in ('active', 'inactive'):
                     msg = "Active column invalid value line %d" \
-                        " (should be Active/Inactive)"
-                    raise osv.except_osv(_('Error'), _(msg) % (line_index, ))
+                        " (should be Active/Inactive)" % line_index
+                    manage_error(line_index, msg, name, code, active_str)
                 active = active_str == 'active' or False
 
                 processed += 1
+                if auto_import:
+                    processed_lines.append((line_index, [name, code, active_str]))
 
                 ids = hr_emp_obj.search(cr, uid,
                     [('identification_id', '=', code)])
@@ -114,6 +127,9 @@
 
             context.update({'message': ' ', 'from': 'expat_import'})
 
+            if auto_import:
+                return processed_lines, rejected_lines, headers
+
             view_id = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'msf_homere_interface', 'payroll_import_confirmation')
             view_id = view_id and view_id[1] or False
 
 
=== modified file 'bin/addons/msf_instance/add_instance.py'
--- bin/addons/msf_instance/add_instance.py	2016-02-05 16:08:07 +0000
+++ bin/addons/msf_instance/add_instance.py	2016-05-24 07:58:03 +0000
@@ -61,6 +61,27 @@
                 return False
         return True
 
+    def create(self, cr, uid, vals, context=None):
+        """
+        Check there is only one account.analytic.journal with a couple (type, instance_id) during automated import
+        """
+        if context is None:
+            context = {}
+
+        new_id = super(account_analytic_journal, self).create(cr, uid, vals, context=context)
+
+        if not context.get('update_mode') == 'init':
+            return new_id
+
+        journal = self.browse(cr, uid, new_id, context=context)
+        if self.search(cr, uid, [('type', '=', journal.type), ('instance_id', '=', journal.instance_id.id), ('id', '!=', new_id)], limit=1, context=context):
+            raise osv.except_osv(
+                _('Error'),
+                _('A same analytic journal already exists with this type and for this instance!'),
+            )
+
+        return new_id
+
     _constraints = [
         (_check_engagement_count, 'You cannot have more than one engagement journal per instance!', ['type', 'instance_id']),
     ]
 
=== modified file 'bin/addons/msf_outgoing/msf_outgoing.py'
--- bin/addons/msf_outgoing/msf_outgoing.py	2016-04-25 10:27:20 +0000
+++ bin/addons/msf_outgoing/msf_outgoing.py	2016-05-24 07:58:03 +0000
@@ -620,11 +620,6 @@
 
                 add_line_obj.create(cr, uid, line_vals, context=context)
 
-            # US-803: point 9, add the ship description, then remove it from the context
-            description_ppl = context.get('description_ppl', False)
-            if context.get('description_ppl', False):
-                del context['description_ppl']
-
             for family in wizard.family_ids:
                 if not family.selected_number: # UTP-1015 fix from Quentin
                     continue
@@ -641,7 +636,6 @@
                     'backorder_id': picking.id,
                     'shipment_id': False,
                     'move_lines': [],
-                    'description_ppl': description_ppl, # US-803: added the description
                 }
                 # Update context for copy
                 context.update({
@@ -673,9 +667,9 @@
                 picking_obj.force_assign(cr, uid, [new_packing_id])
 
             # Log creation message
-            message = _('The new Shipment id:%s (%s) has been created.')
-            self.log(cr, uid, shipment.id, message%(shipment.id, shipment_name,))
-            self.infolog(cr, uid, message%(shipment.id, shipment.name))
+            message = _('The new Shipment %s has been created.')
+            self.log(cr, uid, shipment.id, message%(shipment_name,))
+            self.infolog(cr, uid, message%(shipment.id,))
             # The shipment is automatically shipped, no more pack states in between.
             self.ship(cr, uid, [shipment_id], context=context)
 
@@ -855,9 +849,6 @@
             if not log_flag:
                 draft_shipment_name = self.read(cr, uid, shipment.id, ['name'], context=context)['name']
                 self.log(cr, uid, shipment.id, _("Packs from the draft Shipment (%s) have been returned to stock.") % (draft_shipment_name,))
-                self.infolog(cr, uid, "Packs from the draft Shipment id:%s (%s) have been returned to stock." % (
-                    shipment.id, shipment.name,
-                ))
                 log_flag = True
 
             res = data_obj.get_object_reference(cr, uid, 'msf_outgoing', 'view_picking_ticket_form')[1]
@@ -1134,9 +1125,6 @@
             # log corresponding action
             shipment_log_msg = _('Packs from the shipped Shipment (%s) have been returned to %s location.') % (shipment.name, _('Dispatch'))
             self.log(cr, uid, shipment.id, shipment_log_msg)
-            self.infolog(cr, uid, "Packs from the shipped Shipment id:%s (%s) have been returned to Dispatch location." % (
-                shipment.id, shipment.name,
-            ))
 
             draft_log_msg = _('The corresponding Draft Shipment (%s) has been updated.') % family.draft_packing_id.backorder_id.shipment_id.name
             self.log(cr, uid, draft_shipment_id, draft_log_msg)
@@ -1273,9 +1261,6 @@
 
             # log the ship action
             self.log(cr, uid, shipment.id, _('The Shipment %s has been shipped.') % (shipment.name,))
-            self.infolog(cr, uid, "The Shipment id:%s (%s) has been shipped." % (
-                shipment.id, shipment.name,
-            ))
 
         # TODO which behavior
         return True
@@ -1587,9 +1572,6 @@
 
             # log validate action
             self.log(cr, uid, shipment.id, _('The Shipment %s has been closed.') % (shipment.name,))
-            self.infolog(cr, uid, "The Shipment id:%s (%s) has been closed." % (
-                shipment.id, shipment.name,
-            ))
 
         self.complete_finished(cr, uid, ids, context=context)
         return True
@@ -3079,11 +3061,6 @@
                 context.update({'original_name': obj.name})
                 self._hook_create_rw_out_sync_messages(cr, uid, [new_pick_id or obj.id], context, True)
 
-            self.infolog(cr, uid, "The Picking Ticket id:%s (%s) has been converted to simple Out id:%s (%s)." % (
-                obj.id, obj.name,
-                new_pick_id or obj.id, new_name,
-            ))
-
             # TODO which behavior
             data_obj = self.pool.get('ir.model.data')
             view_id = data_obj.get_object_reference(cr, uid, 'stock', 'view_picking_out_form')
@@ -3162,9 +3139,6 @@
             # we force availability
 
             self.log(cr, uid, out.id, _('The Delivery order (%s) has been converted to draft Picking Ticket (%s).') % (out.name, new_name), context={'view_id': view_id, 'picking_type': 'picking'})
-            self.infolog(cr, uid, "The Delivery order id:%s (%s) has been converted to draft Picking Ticket id:%s (%s)." % (
-                out.id, out.name, out.id, new_name,
-            ))
 
             for move in out.move_lines:
                 move_to_update.append(move.id)
@@ -3364,15 +3338,7 @@
 
                 wf_service.trg_write(uid, 'stock.picking', picking.id, cr)
                 delivered_pack_id = new_picking_id
-
-                new_pick_name = self.read(cr, uid, new_picking_id, ['name'], context=context)['name']
-                self.infolog(cr, uid, "The Outgoing Delivery id:%s (%s) has been processed. Backorder id:%s (%s) has been created." % (
-                    new_picking_id, new_pick_name, picking.id, picking.name,
-                ))
             else:
-                self.infolog(cr, uid, "The Outgoing Delivery id:%s (%s) has been processed." % (
-                    picking.id, picking.name,
-                ))
                 # Claim specific code
                 self._claim_registration(cr, uid, wizard, picking.id, context=context)
                 if not wizard.register_a_claim or (wizard.register_a_claim and wizard.claim_type != 'return'):
@@ -3466,11 +3432,6 @@
                 pick_name = context.get('associate_pick_name', False)
                 del context['associate_pick_name']
                 already_replicated = True
-            #US-803: Set the pick name that given from sync
-            elif 'rw_backorder_name' in context:
-                pick_name = context.get('rw_backorder_name', False)
-                del context['rw_backorder_name']
-                already_replicated = True
 
             # UF-2531: if not exist, then calculate the name as before
             if not pick_name:
@@ -3557,10 +3518,7 @@
             wf_service.trg_validate(uid, 'stock.picking', new_picking_id, 'button_confirm', cr)
             # We force availability
             self.force_assign(cr, uid, [new_picking_id])
-            self.infolog(cr, uid, "The Validated Picking Ticket id:%s (%s) has been generated by the Draft Picking Ticket id:%s (%s)" % (
-                new_picking_id, self.read(cr, uid, new_picking_id, ['name'], context=context)['name'],
-                picking.id, picking.name,
-            ))
+            self.infolog(cr, uid, "The Validated Picking Ticket id:%s has been generated by the Draft Picking Ticket id:%s" % (new_picking_id, picking.id))
 
         # Just to avoid an error on kit test because view_picking_ticket_form is not still loaded when test is ran
         msf_outgoing = self.pool.get('ir.module.module').search(cr, uid, [('name', '=', 'msf_outgoing'), ('state', '=', 'installed')], context=context)
@@ -3809,9 +3767,7 @@
             if picking.flow_type == 'quick' and new_ppl:
                 return self.quick_mode(cr, uid, new_ppl.id, context=context)
 
-            self.infolog(cr, uid, "The Validated Picking Ticket id:%s (%s) has been validated" % (
-                picking.id, picking.name,
-            ))
+            self.infolog(cr, uid, "The Validated Picking Ticket id:%s has been validated" % (picking.id))
 
         data_obj = self.pool.get('ir.model.data')
         view_id = data_obj.get_object_reference(cr, uid, 'msf_outgoing', 'view_ppl_form')
@@ -4001,10 +3957,8 @@
                 _('No data to process '),
             )
 
-        pickings = {}
         for wizard in proc_obj.browse(cr, uid, wizard_ids, context=context):
             picking = wizard.picking_id
-            pickings.setdefault(picking.id, picking.name)
 
             if picking.state != 'assigned':
                 raise osv.except_osv(
@@ -4129,12 +4083,10 @@
         This code can be set back to the old one, because the shipment should always be available at this stage!!!!! DUY
         '''
         shipment_id = False
-        shipment_name = False
         if new_packing_id:
             obj = self.browse(cr, uid, new_packing_id, context)
             if obj and obj.shipment_id and obj.shipment_id.id:
                 shipment_id = obj.shipment_id.id
-                shipment_name = obj.shipment_id.name
 
                 if context.get('rw_shipment_name', False) and context.get('sync_message_execution', False): # RW Sync - update the shipment name same as on RW instance
                     new_name = context.get('rw_shipment_name')
@@ -4149,11 +4101,6 @@
         if usb_entity == self.REMOTE_WAREHOUSE and not context.get('sync_message_execution', False):
             self._manual_create_rw_messages(cr, uid, context=context)
 
-        for pid, pname in pickings.iteritems():
-            self.infolog(cr, uid, "Products of Pre-Packing List id:%s (%s) have been packed in Shipment id:%s (%s)" % (
-                pid, pname, shipment_id, shipment_name,
-            ))
-
         view_id = data_obj.get_object_reference(cr, uid, 'msf_outgoing', 'view_shipment_form')
         view_id = view_id and view_id[1] or False
         return {'name':_("Shipment"),
@@ -4280,9 +4227,6 @@
             context['view_id'] = ppl_view
             log_message = _('Products from Pre-Packing List (%s) have been returned to stock.') % (picking.name,)
             self.log(cr, uid, picking.id, log_message, context=context)
-            self.infolog(cr, uid, "Products from Pre-Packing List id:%s (%s) have been returned to stock." % (
-                picking.id, picking.name,
-            ))
 
             # Log message for draft picking ticket
             pick_view = data_obj.get_object_reference(cr, uid, 'msf_outgoing', 'view_picking_ticket_form')[1]
@@ -4400,9 +4344,6 @@
                         res = obj_data.get_object_reference(cr, uid, 'msf_outgoing', 'view_picking_ticket_form')[1]
                         context.update({'view_id': res, 'picking_type': 'picking_ticket'})
                         self.log(cr, uid, draft_picking_id, _("The corresponding Draft Picking Ticket (%s) has been updated.") % (picking.backorder_id.name,), context=context)
-                        self.infolog(cr, uid, "The Validated Picking Ticket id:%s (%s) has been canceled. The corresponding Draft Picking Ticket id:%s (%s) has been updated." % (
-                            picking.id, picking.name, picking.backorder_id.id, picking.backorder_id.name,
-                        ))
 
             if picking.subtype == 'packing':
 
 
=== modified file 'bin/addons/msf_profile/data/patches.xml'
--- bin/addons/msf_profile/data/patches.xml	2016-05-19 08:04:50 +0000
+++ bin/addons/msf_profile/data/patches.xml	2016-05-24 07:58:03 +0000
@@ -29,6 +29,7 @@
             <field name="method">clean_far_updates</field>
         </record>
 
+<<<<<<< TREE
         <record id="us_1185_patch" model="patch.scripts">
             <field name="method">us_1185_patch</field>
         </record>
@@ -44,5 +45,7 @@
         <record id="us-1273_patch" model="patch.scripts">
             <field name="method">us_1273_patch</field>
         </record>
+=======
+>>>>>>> MERGE-SOURCE
     </data>
 </openerp>
 
=== modified file 'bin/addons/msf_profile/i18n/fr_MF.po'
--- bin/addons/msf_profile/i18n/fr_MF.po	2016-04-25 09:29:33 +0000
+++ bin/addons/msf_profile/i18n/fr_MF.po	2016-05-24 07:58:03 +0000
@@ -8953,12 +8953,6 @@
 msgid "The line '%s' is already partially posted!"
 msgstr "La ligne '%s' est déjà partiellement comptabilisée !"
 
-#. module: msf_accrual
-#: code:addons/msf_accrual/wizard/wizard_accrual_validation.py:43
-#, python-format
-msgid "The line '%s' is cancelled and can't be re-posted."
-msgstr "La ligne '%s' est annulée et ne peut pas être recomptabilisée."
-
 #. module: account
 #: field:account.report.general.ledger,sortby:0
 msgid "Sort By"
@@ -46311,12 +46305,10 @@
 msgid "Analytic distribution is mandatory for this line: %s!"
 msgstr "Allocation Analytique obligatoire pour cette ligne: %s"
 
-#. modules: msf_accrual, account_period_closing_level
+#. module: msf_accrual
 #: model:ir.actions.act_window,name:msf_accrual.action_msf_accrual_line_tree
 #: model:ir.ui.menu,name:msf_accrual.menu_action_msf_accrual_line_tree
 #: view:msf.accrual.line:0
-#: code:addons/account_period_closing_level/account_period.py:716
-#, python-format
 msgid "Accruals Management"
 msgstr "Gestion des Régularisations"
 
@@ -52203,12 +52195,6 @@
 msgid "Line %s. Cost Center %s not found!"
 msgstr "Ligne %s. Centre de coût %s non trouvé !"
 
-#. module: msf_doc_import
-#: code:addons/msf_doc_import/account.py:420
-#, python-format
-msgid "Line %s. %s is a VIEW type Cost Center!"
-msgstr "Ligne %s. %s est un Centre de coût de type VUE !"
-
 #. module: stock
 #: view:stock.inventory.line.split:0
 #: view:stock.move.split:0
 
=== modified file 'bin/addons/msf_profile/msf_profile.py'
--- bin/addons/msf_profile/msf_profile.py	2016-05-19 08:04:50 +0000
+++ bin/addons/msf_profile/msf_profile.py	2016-05-24 07:58:03 +0000
@@ -131,15 +131,6 @@
                 cr.execute("UPDATE sync_client_update_to_send "
                            "SET sdref='ZMW' "
                            "WHERE sdref='ZMK'")
-    def us_1061_patch(self, cr, uid, *a, **b):
-        '''setup the size on all attachment'''
-        attachment_obj = self.pool.get('ir.attachment')
-        attachment_ids = attachment_obj.search(cr, uid, [])
-        vals = {}
-        for attachment in attachment_obj.browse(cr, uid, attachment_ids):
-            if attachment.datas and not attachment.size:
-                vals['size'] = attachment_obj.get_size(attachment.datas)
-                attachment_obj.write(cr, uid, attachment.id, vals)
 
     def us_898_patch(self, cr, uid, *a, **b):
         context = {}
@@ -486,6 +477,7 @@
         if self.pool.get('sync.server.update'):
             cr.execute("delete from sync_server_update where values like '%msf_outgoing.field_product_product_is_keep_cool%' and model='msf_field_access_rights.field_access_rule_line'")
 
+<<<<<<< TREE
     def us_1185_patch(self, cr, uid, *a, **b):
         # AT HQ level: untick 8/9 top accounts for display in BS/PL report
         user_rec = self.pool.get('res.users').browse(cr, uid, [uid])[0]
@@ -547,6 +539,8 @@
             ir_obj.write(cr, uid, ir_ids, {'import_in_progress': False})
         return True
 
+=======
+>>>>>>> MERGE-SOURCE
 patch_scripts()
 
 
 
=== modified file 'bin/addons/msf_sync_data_server/__openerp__.py'
--- bin/addons/msf_sync_data_server/__openerp__.py	2015-10-23 07:16:45 +0000
+++ bin/addons/msf_sync_data_server/__openerp__.py	2016-05-24 07:58:03 +0000
@@ -27,12 +27,13 @@
     'description': 'Data files for Sync Server',
     'author': 'MSF, OpenERP SA',
     'website': 'http://openerp.com',
-    'depends': ['base', 'sync_server', 'msf_profile', 'sync_client', 'sync_so'],
+    'depends': ['base', 'sync_server', 'msf_profile', 'sync_client', 'sync_so', 'msf_tools'],
     'init_xml': [],
     'data': [
         'data/sync.server.group_type.csv',
         'data/sync_server.sync_rule.csv',
         'data/sync_server.message_rule.csv',
+        'data/automated_import_sync_groups.xml',
     ],
     'demo_xml': [
     ],
 
=== added file 'bin/addons/msf_sync_data_server/data/automated_import_sync_groups.xml'
--- bin/addons/msf_sync_data_server/data/automated_import_sync_groups.xml	1970-01-01 00:00:00 +0000
+++ bin/addons/msf_sync_data_server/data/automated_import_sync_groups.xml	2016-05-24 07:58:03 +0000
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<openerp>
+    <data>
+
+        <record id="auto_import_fnct_sync_groups" model="automated.import.function">
+            <field name="name">Import Sync. Groups</field>
+            <field name="model_id" model="ir.model" search="[('model', '=', 'sync.server.entity_group')]" />
+            <field name="method_to_call">import_data_from_csv</field>
+        </record>
+
+        <record id="auto_import_fnct_sync_group_type" model="automated.import.function">
+            <field name="name">Import Sync. Group Types</field>
+            <field name="model_id" model="ir.model" search="[('model', '=', 'sync.server.group_type')]" />
+            <field name="method_to_call">import_data_from_csv</field>
+        </record>
+
+    </data>
+</openerp>
 \ No newline at end of file
 
=== modified file 'bin/addons/msf_sync_data_server/data/sync_server.message_rule.csv'
--- bin/addons/msf_sync_data_server/data/sync_server.message_rule.csv	2016-04-25 15:54:40 +0000
+++ bin/addons/msf_sync_data_server/data/sync_server.message_rule.csv	2016-05-24 07:58:03 +0000
@@ -24,25 +24,25 @@
 USB_replicate_po,TRUE,TRUE,"['name', 'analytic_distribution_id/id', 'partner_id/id','pricelist_id/id','delivery_requested_date','details','notes', 'origin', 'categ', 'order_type', 'priority', 'loan_duration', 'is_a_counterpart', 'cross_docking_ok', 'order_line/product_id/id', 'order_line/product_id/name','order_line/id', 'order_line/name', 'order_line/product_qty', 'order_line/product_uom', 'order_line/price_unit', 'order_line/analytic_distribution_id/id','order_line/comment','order_line/have_analytic_distribution_from_header','order_line/line_number', 'order_line/nomen_manda_0/id','order_line/nomen_manda_1/id','order_line/nomen_manda_2/id','order_line/nomen_manda_3/id', 'order_line/sync_order_line_db_id', 'order_line/nomenclature_description','order_line/notes','order_line/default_name','order_line/default_code','order_line/is_line_split','order_line/date_planned','order_line/procurement_id/id']","[('state','in',['approved', 'done'])]",partner_id,USB,purchase.order.usb_replicate_po,purchase.order,USB_replicate_po,2000,Valid
 USB_replicate_fo,TRUE,TRUE,"['name', 'location_requestor_id/id', 'analytic_distribution_id/id', 'partner_id/id','pricelist_id/id','delivery_requested_date','details','notes', 'origin', 'categ', 'order_type', 'priority', 'loan_duration', 'is_a_counterpart', 'order_line/product_id/id', 'order_line/product_id/name','order_line/id', 'order_line/name', 'order_line/product_uom_qty', 'order_line/product_uom', 'order_line/price_unit', 'order_line/analytic_distribution_id/id','order_line/comment','order_line/have_analytic_distribution_from_header','order_line/line_number', 'order_line/nomen_manda_0/id','order_line/nomen_manda_1/id','order_line/nomen_manda_2/id','order_line/nomen_manda_3/id', 'order_line/sync_order_line_db_id', 'order_line/nomenclature_description','order_line/notes','order_line/default_name','order_line/default_code','order_line/is_line_split','order_line/date_planned','order_line/procurement_id/id']","[('state','in',['manual','done','progress'])]",partner_id,USB,sale.order.usb_replicate_fo,sale.order,USB_replicate_fo,2001,Valid
 USB_replicate_ir,TRUE,TRUE,"['name', 'location_requestor_id/id', 'analytic_distribution_id/id', 'partner_id/id','pricelist_id/id','delivery_requested_date','details','notes', 'origin', 'categ', 'order_type', 'priority', 'loan_duration', 'is_a_counterpart', 'order_line/product_id/id', 'order_line/product_id/name','order_line/id', 'order_line/name', 'order_line/product_uom_qty', 'order_line/product_uom', 'order_line/price_unit','order_line/cost_price', 'order_line/analytic_distribution_id/id','order_line/comment','order_line/have_analytic_distribution_from_header','order_line/line_number', 'order_line/nomen_manda_0/id','order_line/nomen_manda_1/id','order_line/nomen_manda_2/id','order_line/nomen_manda_3/id', 'order_line/sync_order_line_db_id', 'order_line/nomenclature_description','order_line/notes','order_line/default_name','order_line/default_code','order_line/is_line_split','order_line/date_planned','order_line/procurement_id/id']","[('procurement_request', '=', True), ('state', 'in', ['progress','done'])]",partner_id,USB,sale.order.usb_replicate_fo,sale.order,USB_replicate_ir,2003,Valid
-USB_replicate_in,TRUE,TRUE,"['name','subtype','rw_force_seq','from_wkf','state','stock_journal_id/id','origin','purchase_id/id', 'sale_id/id', 'shipment_id/name','shipment_id/num_of_packs','previous_step_id/name','location_id/id','backorder_ids/id', 'backorder_ids/rw_sdref_counterpart', 'backorder_id/id','backorder_id/name','warehouse_id/id','order_category','overall_qty','change_reason','cross_docking_ok','location_dest_id/id','address_id', 'partner_type_stock_picking', 'delivered','reason_type_id/id','min_date', 'note', 'partner_id', 'move_type', 'type', 'dpo_out', 'flow_type', 'transport_order_id/id', 'direct_incoming','shipment_id/name', 'move_lines/processed_stock_move', 'move_lines/id', 'move_lines/state','move_lines/original_qty_partial', 'move_lines/line_number', 'move_lines/name', 'move_lines/change_reason', 'move_lines/reason_type_id/id','move_lines/product_id/id', 'move_lines/product_id/name', 'move_lines/product_qty', 'move_lines/product_uos_qty', 'move_lines/prodlot_id/id', 'move_lines/expired_date', 'move_lines/asset_id/id','move_lines/product_uom/id', 'move_lines/product_uom/name', 'move_lines/date', 'move_lines/date_expected', 'move_lines/note', 'move_lines/location_dest_id/id','move_lines/location_requestor_rw/id','move_lines/location_id/id','move_lines/from_pack','move_lines/to_pack','move_lines/width','move_lines/height','move_lines/weight','move_lines/length','move_lines/pack_type','move_lines/purchase_line_id/id','move_lines/sale_line_id/id','move_lines/price_unit','move_lines/price_currency_id/id']","[('type', '=', 'in'),('subtype', '=', 'standard'),('state', 'in', ['assigned']),('already_replicated', '=', False),('partner_id', '!=', False)]",partner_id,USB,stock.picking.usb_replicate_in,stock.picking,USB_replicate_in,2010,Valid
-USB_update_in_shipped_available,TRUE,TRUE,"['name','from_wkf','subtype','rw_force_seq','state','stock_journal_id/id','origin','purchase_id/id', 'sale_id/id', 'shipment_id/name','shipment_id/num_of_packs','previous_step_id/name','location_id/id','backorder_ids/id', 'backorder_ids/rw_sdref_counterpart', 'backorder_id/id','backorder_id/name','warehouse_id/id','order_category','overall_qty','change_reason','cross_docking_ok','location_dest_id/id','address_id', 'partner_type_stock_picking', 'delivered','reason_type_id/id','min_date', 'note', 'partner_id', 'move_type', 'type', 'dpo_out', 'flow_type', 'transport_order_id/id', 'direct_incoming','shipment_id/name', 'move_lines/processed_stock_move', 'move_lines/id', 'move_lines/state','move_lines/original_qty_partial', 'move_lines/line_number', 'move_lines/name', 'move_lines/change_reason', 'move_lines/reason_type_id/id','move_lines/product_id/id', 'move_lines/product_id/name', 'move_lines/product_qty', 'move_lines/product_uos_qty', 'move_lines/prodlot_id/id', 'move_lines/expired_date', 'move_lines/asset_id/id','move_lines/product_uom/id', 'move_lines/product_uom/name', 'move_lines/date', 'move_lines/date_expected', 'move_lines/note', 'move_lines/location_dest_id/id','move_lines/location_requestor_rw/id','move_lines/location_id/id','move_lines/from_pack','move_lines/to_pack','move_lines/width','move_lines/height','move_lines/weight','move_lines/length','move_lines/pack_type','move_lines/purchase_line_id/id','move_lines/sale_line_id/id','move_lines/price_unit','move_lines/price_currency_id/id']","[('type', '=', 'in'),('subtype', '=', 'standard'),('state', 'in', ['shipped']),('partner_id', '!=', False),('already_replicated', '=', False)]",partner_id,USB,stock.picking.usb_update_in_shipped_available,stock.picking,USB_update_in_shipped_available,2011,Valid
+USB_replicate_in,TRUE,TRUE,"['name','subtype','rw_force_seq','from_wkf','state','stock_journal_id/id','origin','purchase_id/id', 'sale_id/id', 'shipment_id/name','shipment_id/num_of_packs','previous_step_id/name','location_id/id','backorder_ids/id', 'backorder_ids/rw_sdref_counterpart', 'backorder_id/id','warehouse_id/id','order_category','overall_qty','change_reason','cross_docking_ok','location_dest_id/id','address_id', 'partner_type_stock_picking', 'delivered','reason_type_id/id','min_date', 'note', 'partner_id', 'move_type', 'type', 'dpo_out', 'flow_type', 'transport_order_id/id', 'direct_incoming','shipment_id/name', 'move_lines/processed_stock_move', 'move_lines/id', 'move_lines/state','move_lines/original_qty_partial', 'move_lines/line_number', 'move_lines/name', 'move_lines/change_reason', 'move_lines/reason_type_id/id','move_lines/product_id/id', 'move_lines/product_id/name', 'move_lines/product_qty', 'move_lines/product_uos_qty', 'move_lines/prodlot_id/id', 'move_lines/expired_date', 'move_lines/asset_id/id','move_lines/product_uom/id', 'move_lines/product_uom/name', 'move_lines/date', 'move_lines/date_expected', 'move_lines/note', 'move_lines/location_dest_id/id','move_lines/location_requestor_rw/id','move_lines/location_id/id','move_lines/from_pack','move_lines/to_pack','move_lines/width','move_lines/height','move_lines/weight','move_lines/length','move_lines/pack_type','move_lines/purchase_line_id/id','move_lines/sale_line_id/id','move_lines/price_unit']","[('type', '=', 'in'),('subtype', '=', 'standard'),('state', 'in', ['assigned']),('already_replicated', '=', False),('partner_id', '!=', False)]",partner_id,USB,stock.picking.usb_replicate_in,stock.picking,USB_replicate_in,2010,Valid
+USB_update_in_shipped_available,TRUE,TRUE,"['name','from_wkf','subtype','rw_force_seq','state','stock_journal_id/id','origin','purchase_id/id', 'sale_id/id', 'shipment_id/name','shipment_id/num_of_packs','previous_step_id/name','location_id/id','backorder_ids/id', 'backorder_ids/rw_sdref_counterpart', 'backorder_id/id','warehouse_id/id','order_category','overall_qty','change_reason','cross_docking_ok','location_dest_id/id','address_id', 'partner_type_stock_picking', 'delivered','reason_type_id/id','min_date', 'note', 'partner_id', 'move_type', 'type', 'dpo_out', 'flow_type', 'transport_order_id/id', 'direct_incoming','shipment_id/name', 'move_lines/processed_stock_move', 'move_lines/id', 'move_lines/state','move_lines/original_qty_partial', 'move_lines/line_number', 'move_lines/name', 'move_lines/change_reason', 'move_lines/reason_type_id/id','move_lines/product_id/id', 'move_lines/product_id/name', 'move_lines/product_qty', 'move_lines/product_uos_qty', 'move_lines/prodlot_id/id', 'move_lines/expired_date', 'move_lines/asset_id/id','move_lines/product_uom/id', 'move_lines/product_uom/name', 'move_lines/date', 'move_lines/date_expected', 'move_lines/note', 'move_lines/location_dest_id/id','move_lines/location_requestor_rw/id','move_lines/location_id/id','move_lines/from_pack','move_lines/to_pack','move_lines/width','move_lines/height','move_lines/weight','move_lines/length','move_lines/pack_type','move_lines/purchase_line_id/id','move_lines/sale_line_id/id','move_lines/price_unit']","[('type', '=', 'in'),('subtype', '=', 'standard'),('state', 'in', ['shipped']),('partner_id', '!=', False),('already_replicated', '=', False)]",partner_id,USB,stock.picking.usb_update_in_shipped_available,stock.picking,USB_update_in_shipped_available,2011,Valid
 USB_cancel_in,TRUE,TRUE,"['name','subtype','origin']","[('type', '=', 'in'),('subtype', '=', 'standard'),('state', 'in', ['cancel']),('partner_id', '!=', False)]",partner_id,USB,stock.picking.usb_cancel_in,stock.picking,USB_cancel_in,2012,Valid
 USB_cancel_pick_out,TRUE,TRUE,"['name','subtype','origin']","[('type', '=', 'out'),('state', 'in', ['cancel']),('partner_id', '!=', False), ('already_replicated', '=', False)]",partner_id,USB,stock.picking.usb_cancel_pick_out,stock.picking,USB_cancel_pick_out,2013,Valid
-USB_create_partial_in,TRUE,TRUE,"['name','from_wkf','subtype','date_done','associate_pick_name','rw_force_seq','state','stock_journal_id/id','purchase_id/id', 'sale_id/id','origin','shipment_id/name','shipment_id/num_of_packs','previous_step_id/name','location_id/id','backorder_ids/id','backorder_ids/rw_sdref_counterpart', 'backorder_id/id','backorder_id/name','warehouse_id/id','order_category','overall_qty','change_reason','cross_docking_ok','location_dest_id/id','address_id', 'partner_type_stock_picking', 'delivered','reason_type_id/id','min_date', 'note', 'partner_id', 'move_type', 'type', 'dpo_out', 'flow_type', 'transport_order_id/id', 'direct_incoming','shipment_id/name', 'move_lines/processed_stock_move', 'move_lines/id', 'move_lines/state','move_lines/original_qty_partial', 'move_lines/line_number', 'move_lines/name', 'move_lines/change_reason', 'move_lines/reason_type_id/id','move_lines/product_id/id', 'move_lines/product_id/name', 'move_lines/product_qty', 'move_lines/product_uos_qty', 'move_lines/prodlot_id/id', 'move_lines/expired_date', 'move_lines/asset_id/id','move_lines/product_uom/id', 'move_lines/product_uom/name', 'move_lines/date', 'move_lines/date_expected', 'move_lines/note', 'move_lines/location_dest_id/id','move_lines/location_id/id','move_lines/location_requestor_rw/id','move_lines/from_pack','move_lines/to_pack','move_lines/width','move_lines/height','move_lines/weight','move_lines/length','move_lines/pack_type','move_lines/purchase_line_id/id','move_lines/sale_line_id/id','move_lines/price_unit','move_lines/price_currency_id/id']","[('type', '=', 'in'),('subtype', '=', 'standard'),('state', 'in', ['done']),('already_replicated', '=',False),('partner_id', '!=', False)]",partner_id,USB,stock.picking.usb_create_partial_in,stock.picking,USB_create_partial_in,2015,Valid
-USB_replicate_int,TRUE,TRUE,"['name','from_wkf','subtype','date_done','rw_force_seq','state','stock_journal_id/id','purchase_id/id', 'sale_id/id','origin','shipment_id/name','shipment_id/num_of_packs','previous_step_id/name','location_id/id','backorder_ids/id', 'backorder_ids/rw_sdref_counterpart', 'backorder_id/id','backorder_id/name','warehouse_id/id','order_category','overall_qty','change_reason','cross_docking_ok','location_dest_id/id','address_id', 'partner_type_stock_picking', 'delivered','reason_type_id/id','min_date', 'note', 'partner_id', 'move_type', 'type', 'dpo_out', 'flow_type', 'transport_order_id/id', 'direct_incoming','shipment_id/name', 'move_lines/processed_stock_move', 'move_lines/id', 'move_lines/state','move_lines/original_qty_partial', 'move_lines/line_number', 'move_lines/name', 'move_lines/change_reason', 'move_lines/reason_type_id/id','move_lines/product_id/id', 'move_lines/product_id/name', 'move_lines/product_qty', 'move_lines/product_uos_qty', 'move_lines/prodlot_id/id', 'move_lines/expired_date', 'move_lines/asset_id/id','move_lines/product_uom/id', 'move_lines/product_uom/name', 'move_lines/date', 'move_lines/date_expected', 'move_lines/note', 'move_lines/location_dest_id/id','move_lines/location_id/id','move_lines/from_pack','move_lines/to_pack','move_lines/width','move_lines/height','move_lines/weight','move_lines/length','move_lines/pack_type','move_lines/purchase_line_id/id','move_lines/sale_line_id/id','move_lines/price_unit','move_lines/price_currency_id/id']","[('type', '=', 'internal'),('subtype', '=', 'standard'),('state', 'in', ['assigned','done','confirmed']),('already_replicated', '=', False)]",partner_id,USB,stock.picking.usb_replicate_int,stock.picking,USB_replicate_int,2020,Valid
-USB_create_partial_int_moves,TRUE,TRUE,"['name','from_wkf','date_done','subtype','associate_pick_name','rw_force_seq','state','stock_journal_id/id','purchase_id/id', 'sale_id/id','origin','shipment_id/name','shipment_id/num_of_packs','previous_step_id/name','location_id/id','backorder_ids/id', 'backorder_ids/rw_sdref_counterpart', 'backorder_id/id','backorder_id/name','warehouse_id/id','order_category','overall_qty','change_reason','cross_docking_ok','location_dest_id/id','address_id', 'partner_type_stock_picking', 'delivered','reason_type_id/id','min_date', 'note', 'partner_id', 'move_type', 'type', 'dpo_out', 'flow_type', 'transport_order_id/id', 'direct_incoming','shipment_id/name', 'move_lines/processed_stock_move', 'move_lines/id', 'move_lines/state','move_lines/original_qty_partial', 'move_lines/line_number', 'move_lines/name', 'move_lines/change_reason', 'move_lines/reason_type_id/id','move_lines/product_id/id', 'move_lines/product_id/name', 'move_lines/product_qty', 'move_lines/product_uos_qty', 'move_lines/prodlot_id/id', 'move_lines/expired_date', 'move_lines/asset_id/id','move_lines/product_uom/id', 'move_lines/product_uom/name', 'move_lines/date', 'move_lines/date_expected', 'move_lines/note', 'move_lines/location_dest_id/id','move_lines/location_id/id','move_lines/location_requestor_rw/id','move_lines/from_pack','move_lines/to_pack','move_lines/width','move_lines/height','move_lines/weight','move_lines/length','move_lines/pack_type','move_lines/purchase_line_id/id','move_lines/sale_line_id/id','move_lines/price_unit','move_lines/price_currency_id/id']","[('type', '=', 'internal'),('subtype', '=', 'standard'),('state', 'in', ['done'])]",partner_id,USB,stock.picking.usb_create_partial_int_moves,stock.picking,USB_create_partial_int_moves,2021,Valid
-USB_replicate_out,TRUE,TRUE,"['name','subtype','from_wkf','state','stock_journal_id/id','purchase_id/id', 'sale_id/id','origin','shipment_id/name','shipment_id/num_of_packs','previous_step_id/name','location_id/id', 'backorder_id/id','backorder_id/name','backorder_ids/id','backorder_ids/rw_sdref_counterpart', 'warehouse_id/id','order_category','overall_qty','change_reason','cross_docking_ok','location_dest_id/id','address_id', 'partner_type_stock_picking', 'delivered','reason_type_id/id','min_date', 'note', 'partner_id', 'move_type', 'type', 'dpo_out', 'flow_type', 'transport_order_id/id', 'direct_incoming','shipment_id/name', 'move_lines/processed_stock_move', 'move_lines/id', 'move_lines/state','move_lines/original_qty_partial', 'move_lines/line_number', 'move_lines/name', 'move_lines/change_reason', 'move_lines/reason_type_id/id','move_lines/product_id/id', 'move_lines/product_id/name', 'move_lines/product_qty', 'move_lines/product_uos_qty', 'move_lines/prodlot_id/id', 'move_lines/expired_date', 'move_lines/asset_id/id','move_lines/product_uom/id', 'move_lines/product_uom/name', 'move_lines/date', 'move_lines/date_expected', 'move_lines/note', 'move_lines/location_dest_id/id','move_lines/location_id/id','move_lines/from_pack','move_lines/to_pack','move_lines/width','move_lines/height','move_lines/weight','move_lines/length','move_lines/pack_type','move_lines/purchase_line_id/id','move_lines/sale_line_id/id','move_lines/price_unit','move_lines/price_currency_id/id']","[('type', '=', 'out'),('subtype', '=', 'standard'),('state', 'in', ['confirmed', 'assigned']),('already_replicated', '=', False),('partner_id', '!=', False)]",partner_id,USB,stock.picking.usb_replicate_picking,stock.picking,USB_replicate_out,2030,Valid
-USB_replicate_pick,TRUE,TRUE,"['name','subtype','from_wkf','state','stock_journal_id/id','purchase_id/id', 'sale_id/id','origin','shipment_id/name','shipment_id/num_of_packs','previous_step_id/name','location_id/id', 'backorder_id/id','backorder_id/name','backorder_ids/id','backorder_ids/rw_sdref_counterpart', 'warehouse_id/id','order_category','overall_qty','change_reason','cross_docking_ok','location_dest_id/id','address_id', 'partner_type_stock_picking', 'delivered','reason_type_id/id','min_date', 'note', 'partner_id', 'move_type', 'type', 'dpo_out', 'flow_type', 'transport_order_id/id', 'direct_incoming','shipment_id/name', 'move_lines/processed_stock_move', 'move_lines/id', 'move_lines/state','move_lines/original_qty_partial', 'move_lines/line_number', 'move_lines/name', 'move_lines/change_reason', 'move_lines/reason_type_id/id','move_lines/product_id/id', 'move_lines/product_id/name', 'move_lines/product_qty', 'move_lines/product_uos_qty', 'move_lines/prodlot_id/id', 'move_lines/expired_date', 'move_lines/asset_id/id','move_lines/product_uom/id', 'move_lines/product_uom/name', 'move_lines/date', 'move_lines/date_expected', 'move_lines/note', 'move_lines/location_dest_id/id','move_lines/location_id/id','move_lines/from_pack','move_lines/to_pack','move_lines/width','move_lines/height','move_lines/weight','move_lines/length','move_lines/pack_type','move_lines/purchase_line_id/id','move_lines/sale_line_id/id','move_lines/price_unit','move_lines/price_currency_id/id']","[('type', '=', 'out'),('subtype', '=', 'picking'),('state', 'in', ['draft']),('already_replicated', '=', False),('partner_id', '!=', False)]",partner_id,USB,stock.picking.usb_replicate_picking,stock.picking,USB_replicate_pick,2031,Valid
-USB_replicate_out_conso,TRUE,TRUE,"['name','subtype','from_wkf','date_done','state','stock_journal_id/id','purchase_id/id', 'sale_id/id','origin','shipment_id/name','shipment_id/num_of_packs','previous_step_id/name','location_id/id','backorder_ids/id','backorder_ids/rw_sdref_counterpart',  'backorder_id/id','backorder_id/name','warehouse_id/id','order_category','overall_qty','change_reason','cross_docking_ok','location_dest_id/id','address_id', 'partner_type_stock_picking', 'delivered','reason_type_id/id','min_date', 'note', 'partner_id', 'move_type', 'type', 'dpo_out', 'flow_type', 'transport_order_id/id', 'direct_incoming','shipment_id/name', 'move_lines/processed_stock_move', 'move_lines/id', 'move_lines/state','move_lines/original_qty_partial', 'move_lines/line_number', 'move_lines/name', 'move_lines/change_reason', 'move_lines/reason_type_id/id','move_lines/product_id/id', 'move_lines/product_id/name', 'move_lines/product_qty', 'move_lines/product_uos_qty', 'move_lines/prodlot_id/id', 'move_lines/expired_date', 'move_lines/asset_id/id','move_lines/product_uom/id', 'move_lines/product_uom/name', 'move_lines/date', 'move_lines/date_expected', 'move_lines/note', 'move_lines/location_dest_id/id','move_lines/location_id/id','move_lines/from_pack','move_lines/to_pack','move_lines/width','move_lines/height','move_lines/weight','move_lines/length','move_lines/pack_type','move_lines/purchase_line_id/id','move_lines/sale_line_id/id','move_lines/price_unit','move_lines/price_currency_id/id']","[('type', '=', 'out'),('subtype', '=', 'standard'),('name', 'like', 'OUT-CONSO'),('state', '=', 'done'),('already_replicated', '=', False),('partner_id', '!=', False)]",partner_id,USB,stock.picking.usb_replicate_picking,stock.picking,USB_replicate_out_conso,2032,Valid
-USB_convert_PICK_to_OUT,TRUE,TRUE,"['name','subtype','from_wkf','associate_pick_name','date_done','state','stock_journal_id/id','purchase_id/id', 'sale_id/id','origin','shipment_id/name','shipment_id/num_of_packs','previous_step_id/name','location_id/id','backorder_ids/id', 'backorder_ids/rw_sdref_counterpart', 'backorder_id/id','backorder_id/name','warehouse_id/id','order_category','overall_qty','change_reason','cross_docking_ok','location_dest_id/id','address_id', 'partner_type_stock_picking', 'delivered','reason_type_id/id','min_date', 'note', 'partner_id', 'move_type', 'type', 'dpo_out', 'flow_type', 'transport_order_id/id', 'direct_incoming','shipment_id/name', 'move_lines/processed_stock_move', 'move_lines/id', 'move_lines/state','move_lines/original_qty_partial', 'move_lines/line_number', 'move_lines/name', 'move_lines/change_reason', 'move_lines/reason_type_id/id','move_lines/product_id/id', 'move_lines/product_id/name', 'move_lines/product_qty', 'move_lines/product_uos_qty', 'move_lines/prodlot_id/id', 'move_lines/expired_date', 'move_lines/asset_id/id','move_lines/product_uom/id', 'move_lines/product_uom/name', 'move_lines/date', 'move_lines/date_expected', 'move_lines/note', 'move_lines/location_dest_id/id','move_lines/location_id/id','move_lines/from_pack','move_lines/to_pack','move_lines/width','move_lines/height','move_lines/weight','move_lines/length','move_lines/pack_type','move_lines/purchase_line_id/id','move_lines/sale_line_id/id','move_lines/price_unit','move_lines/price_currency_id/id']","[('name', '=', False),('partner_id', '!=', False)]",partner_id,USB,stock.picking.usb_convert_pick_to_out,stock.picking,USB_convert_PICK_to_OUT,2035,Valid
-USB_convert_OUT_to_PICK,TRUE,TRUE,"['name','subtype','from_wkf','associate_pick_name','date_done','state','stock_journal_id/id','purchase_id/id', 'sale_id/id','origin','shipment_id/name','shipment_id/num_of_packs','previous_step_id/name','location_id/id','backorder_ids/id', 'backorder_ids/rw_sdref_counterpart', 'backorder_id/id','backorder_id/name','warehouse_id/id','order_category','overall_qty','change_reason','cross_docking_ok','location_dest_id/id','address_id', 'partner_type_stock_picking', 'delivered','reason_type_id/id','min_date', 'note', 'partner_id', 'move_type', 'type', 'dpo_out', 'flow_type', 'transport_order_id/id', 'direct_incoming','shipment_id/name', 'move_lines/processed_stock_move', 'move_lines/id', 'move_lines/state','move_lines/original_qty_partial', 'move_lines/line_number', 'move_lines/name', 'move_lines/change_reason', 'move_lines/reason_type_id/id','move_lines/product_id/id', 'move_lines/product_id/name', 'move_lines/product_qty', 'move_lines/product_uos_qty', 'move_lines/prodlot_id/id', 'move_lines/expired_date', 'move_lines/asset_id/id','move_lines/product_uom/id', 'move_lines/product_uom/name', 'move_lines/date', 'move_lines/date_expected', 'move_lines/note', 'move_lines/location_dest_id/id','move_lines/location_id/id','move_lines/from_pack','move_lines/to_pack','move_lines/width','move_lines/height','move_lines/weight','move_lines/length','move_lines/pack_type','move_lines/purchase_line_id/id','move_lines/sale_line_id/id','move_lines/price_unit','move_lines/price_currency_id/id']","[('name', '=', False),('partner_id', '!=', False)]",partner_id,USB,stock.picking.usb_convert_out_to_pick,stock.picking,USB_convert_OUT_to_PICK,2036,Valid
-USB_closed_OUT_closes_OUT,TRUE,TRUE,"['name','subtype','from_wkf','date_done','state','stock_journal_id/id','purchase_id/id', 'sale_id/id','origin','shipment_id/name','shipment_id/num_of_packs','previous_step_id/name','location_id/id','backorder_ids/id', 'backorder_ids/rw_sdref_counterpart', 'backorder_id/id','backorder_id/name','warehouse_id/id','order_category','overall_qty','change_reason','cross_docking_ok','location_dest_id/id','address_id', 'partner_type_stock_picking', 'delivered','reason_type_id/id','min_date', 'note', 'partner_id', 'move_type', 'type', 'dpo_out', 'flow_type', 'transport_order_id/id', 'direct_incoming','shipment_id/name', 'move_lines/processed_stock_move', 'move_lines/id', 'move_lines/state','move_lines/original_qty_partial', 'move_lines/line_number', 'move_lines/name', 'move_lines/change_reason', 'move_lines/reason_type_id/id','move_lines/product_id/id', 'move_lines/product_id/name', 'move_lines/product_qty', 'move_lines/product_uos_qty', 'move_lines/prodlot_id/id', 'move_lines/expired_date', 'move_lines/asset_id/id','move_lines/product_uom/id', 'move_lines/product_uom/name', 'move_lines/date', 'move_lines/date_expected', 'move_lines/note', 'move_lines/location_dest_id/id','move_lines/location_id/id','move_lines/from_pack','move_lines/to_pack','move_lines/width','move_lines/height','move_lines/weight','move_lines/length','move_lines/pack_type','move_lines/purchase_line_id/id','move_lines/sale_line_id/id','move_lines/price_unit','move_lines/price_currency_id/id']","[('type', '=', 'out'),('subtype', '=', 'standard'),('state', '=', 'done'),('already_replicated', '=', False),('partner_id', '!=', False)]",partner_id,USB,stock.picking.usb_closed_out_closes_out,stock.picking,USB_closed_OUT_closes_OUT,2040,Valid
-USB_closed_new_PICK_closes_PICK,TRUE,TRUE,"['name','subtype','date_done','state','from_wkf','stock_journal_id/id','purchase_id/id', 'sale_id/id','origin','shipment_id/name','shipment_id/num_of_packs','previous_step_id/name','location_id/id','backorder_ids/id', 'backorder_ids/rw_sdref_counterpart', 'backorder_id/id','backorder_id/name','warehouse_id/id','order_category','overall_qty','change_reason','cross_docking_ok','location_dest_id/id','address_id', 'partner_type_stock_picking', 'delivered','reason_type_id/id','min_date', 'note', 'partner_id', 'move_type', 'type', 'dpo_out', 'flow_type', 'transport_order_id/id', 'direct_incoming','shipment_id/name', 'move_lines/processed_stock_move', 'move_lines/id', 'move_lines/state','move_lines/original_qty_partial', 'move_lines/line_number', 'move_lines/name', 'move_lines/change_reason', 'move_lines/reason_type_id/id','move_lines/product_id/id', 'move_lines/product_id/name', 'move_lines/product_qty', 'move_lines/product_uos_qty', 'move_lines/prodlot_id/id', 'move_lines/expired_date', 'move_lines/asset_id/id','move_lines/product_uom/id', 'move_lines/product_uom/name', 'move_lines/date', 'move_lines/date_expected', 'move_lines/note', 'move_lines/location_dest_id/id','move_lines/location_id/id','move_lines/from_pack','move_lines/to_pack','move_lines/width','move_lines/height','move_lines/weight','move_lines/length','move_lines/pack_type','move_lines/purchase_line_id/id','move_lines/sale_line_id/id','move_lines/price_unit','move_lines/price_currency_id/id']","[('type', '=', 'out'),('subtype', '=', 'picking'),('state', 'in', ['done', 'assigned']),('already_replicated', '=', False),('partner_id', '!=', False)]",partner_id,USB,stock.picking.usb_create_picking,stock.picking,USB_closed_new_PICK_closes_PICK,2041,Valid
-USB_replicate_PPL,TRUE,TRUE,"['name','subtype','from_wkf','state','stock_journal_id/id','purchase_id/id', 'sale_id/id','origin','shipment_id/name','shipment_id/num_of_packs','previous_step_id/name','location_id/id','backorder_ids/id','backorder_ids/rw_sdref_counterpart',  'backorder_id/id','backorder_id/name','warehouse_id/id','order_category','overall_qty','change_reason','cross_docking_ok','location_dest_id/id','address_id', 'partner_type_stock_picking', 'delivered','reason_type_id/id','min_date', 'note', 'partner_id', 'move_type', 'type', 'dpo_out', 'flow_type', 'transport_order_id/id', 'direct_incoming','shipment_id/name', 'move_lines/processed_stock_move', 'move_lines/id', 'move_lines/state','move_lines/original_qty_partial', 'move_lines/line_number', 'move_lines/name', 'move_lines/change_reason', 'move_lines/reason_type_id/id','move_lines/product_id/id', 'move_lines/product_id/name', 'move_lines/product_qty', 'move_lines/product_uos_qty', 'move_lines/prodlot_id/id', 'move_lines/expired_date', 'move_lines/asset_id/id','move_lines/product_uom/id', 'move_lines/product_uom/name', 'move_lines/date', 'move_lines/date_expected', 'move_lines/note', 'move_lines/location_dest_id/id','move_lines/location_id/id','move_lines/from_pack','move_lines/to_pack','move_lines/width','move_lines/height','move_lines/weight','move_lines/length','move_lines/pack_type','move_lines/purchase_line_id/id','move_lines/sale_line_id/id','move_lines/price_unit','move_lines/price_currency_id/id']","[('type', '=', 'out'),('subtype', '=', 'ppl'),('state', 'in', ['done','assigned']),('already_replicated', '=', False),('partner_id', '!=', False)]",partner_id,USB,stock.picking.usb_replicate_ppl,stock.picking,USB_replicate_PPL,2044,Valid
+USB_create_partial_in,TRUE,TRUE,"['name','from_wkf','subtype','date_done','associate_pick_name','rw_force_seq','state','stock_journal_id/id','purchase_id/id', 'sale_id/id','origin','shipment_id/name','shipment_id/num_of_packs','previous_step_id/name','location_id/id','backorder_ids/id','backorder_ids/rw_sdref_counterpart', 'backorder_id/id','warehouse_id/id','order_category','overall_qty','change_reason','cross_docking_ok','location_dest_id/id','address_id', 'partner_type_stock_picking', 'delivered','reason_type_id/id','min_date', 'note', 'partner_id', 'move_type', 'type', 'dpo_out', 'flow_type', 'transport_order_id/id', 'direct_incoming','shipment_id/name', 'move_lines/processed_stock_move', 'move_lines/id', 'move_lines/state','move_lines/original_qty_partial', 'move_lines/line_number', 'move_lines/name', 'move_lines/change_reason', 'move_lines/reason_type_id/id','move_lines/product_id/id', 'move_lines/product_id/name', 'move_lines/product_qty', 'move_lines/product_uos_qty', 'move_lines/prodlot_id/id', 'move_lines/expired_date', 'move_lines/asset_id/id','move_lines/product_uom/id', 'move_lines/product_uom/name', 'move_lines/date', 'move_lines/date_expected', 'move_lines/note', 'move_lines/location_dest_id/id','move_lines/location_id/id','move_lines/location_requestor_rw/id','move_lines/from_pack','move_lines/to_pack','move_lines/width','move_lines/height','move_lines/weight','move_lines/length','move_lines/pack_type','move_lines/purchase_line_id/id','move_lines/sale_line_id/id','move_lines/price_unit']","[('type', '=', 'in'),('subtype', '=', 'standard'),('state', 'in', ['done']),('already_replicated', '=',False),('partner_id', '!=', False)]",partner_id,USB,stock.picking.usb_create_partial_in,stock.picking,USB_create_partial_in,2015,Valid
+USB_replicate_int,TRUE,TRUE,"['name','from_wkf','subtype','date_done','rw_force_seq','state','stock_journal_id/id','purchase_id/id', 'sale_id/id','origin','shipment_id/name','shipment_id/num_of_packs','previous_step_id/name','location_id/id','backorder_ids/id', 'backorder_ids/rw_sdref_counterpart', 'backorder_id/id','warehouse_id/id','order_category','overall_qty','change_reason','cross_docking_ok','location_dest_id/id','address_id', 'partner_type_stock_picking', 'delivered','reason_type_id/id','min_date', 'note', 'partner_id', 'move_type', 'type', 'dpo_out', 'flow_type', 'transport_order_id/id', 'direct_incoming','shipment_id/name', 'move_lines/processed_stock_move', 'move_lines/id', 'move_lines/state','move_lines/original_qty_partial', 'move_lines/line_number', 'move_lines/name', 'move_lines/change_reason', 'move_lines/reason_type_id/id','move_lines/product_id/id', 'move_lines/product_id/name', 'move_lines/product_qty', 'move_lines/product_uos_qty', 'move_lines/prodlot_id/id', 'move_lines/expired_date', 'move_lines/asset_id/id','move_lines/product_uom/id', 'move_lines/product_uom/name', 'move_lines/date', 'move_lines/date_expected', 'move_lines/note', 'move_lines/location_dest_id/id','move_lines/location_id/id','move_lines/from_pack','move_lines/to_pack','move_lines/width','move_lines/height','move_lines/weight','move_lines/length','move_lines/pack_type','move_lines/purchase_line_id/id','move_lines/sale_line_id/id','move_lines/price_unit']","[('type', '=', 'internal'),('subtype', '=', 'standard'),('state', 'in', ['assigned','done','confirmed']),('already_replicated', '=', False)]",partner_id,USB,stock.picking.usb_replicate_int,stock.picking,USB_replicate_int,2020,Valid
+USB_create_partial_int_moves,TRUE,TRUE,"['name','from_wkf','date_done','subtype','associate_pick_name','rw_force_seq','state','stock_journal_id/id','purchase_id/id', 'sale_id/id','origin','shipment_id/name','shipment_id/num_of_packs','previous_step_id/name','location_id/id','backorder_ids/id', 'backorder_ids/rw_sdref_counterpart', 'backorder_id/id','warehouse_id/id','order_category','overall_qty','change_reason','cross_docking_ok','location_dest_id/id','address_id', 'partner_type_stock_picking', 'delivered','reason_type_id/id','min_date', 'note', 'partner_id', 'move_type', 'type', 'dpo_out', 'flow_type', 'transport_order_id/id', 'direct_incoming','shipment_id/name', 'move_lines/processed_stock_move', 'move_lines/id', 'move_lines/state','move_lines/original_qty_partial', 'move_lines/line_number', 'move_lines/name', 'move_lines/change_reason', 'move_lines/reason_type_id/id','move_lines/product_id/id', 'move_lines/product_id/name', 'move_lines/product_qty', 'move_lines/product_uos_qty', 'move_lines/prodlot_id/id', 'move_lines/expired_date', 'move_lines/asset_id/id','move_lines/product_uom/id', 'move_lines/product_uom/name', 'move_lines/date', 'move_lines/date_expected', 'move_lines/note', 'move_lines/location_dest_id/id','move_lines/location_id/id','move_lines/location_requestor_rw/id','move_lines/from_pack','move_lines/to_pack','move_lines/width','move_lines/height','move_lines/weight','move_lines/length','move_lines/pack_type','move_lines/purchase_line_id/id','move_lines/sale_line_id/id','move_lines/price_unit']","[('type', '=', 'internal'),('subtype', '=', 'standard'),('state', 'in', ['done'])]",partner_id,USB,stock.picking.usb_create_partial_int_moves,stock.picking,USB_create_partial_int_moves,2021,Valid
+USB_replicate_out,TRUE,TRUE,"['name','subtype','from_wkf','state','stock_journal_id/id','purchase_id/id', 'sale_id/id','origin','shipment_id/name','shipment_id/num_of_packs','previous_step_id/name','location_id/id', 'backorder_id/id','backorder_ids/id','backorder_ids/rw_sdref_counterpart', 'warehouse_id/id','order_category','overall_qty','change_reason','cross_docking_ok','location_dest_id/id','address_id', 'partner_type_stock_picking', 'delivered','reason_type_id/id','min_date', 'note', 'partner_id', 'move_type', 'type', 'dpo_out', 'flow_type', 'transport_order_id/id', 'direct_incoming','shipment_id/name', 'move_lines/processed_stock_move', 'move_lines/id', 'move_lines/state','move_lines/original_qty_partial', 'move_lines/line_number', 'move_lines/name', 'move_lines/change_reason', 'move_lines/reason_type_id/id','move_lines/product_id/id', 'move_lines/product_id/name', 'move_lines/product_qty', 'move_lines/product_uos_qty', 'move_lines/prodlot_id/id', 'move_lines/expired_date', 'move_lines/asset_id/id','move_lines/product_uom/id', 'move_lines/product_uom/name', 'move_lines/date', 'move_lines/date_expected', 'move_lines/note', 'move_lines/location_dest_id/id','move_lines/location_id/id','move_lines/from_pack','move_lines/to_pack','move_lines/width','move_lines/height','move_lines/weight','move_lines/length','move_lines/pack_type','move_lines/purchase_line_id/id','move_lines/sale_line_id/id','move_lines/price_unit']","[('type', '=', 'out'),('subtype', '=', 'standard'),('state', 'in', ['confirmed', 'assigned']),('already_replicated', '=', False),('partner_id', '!=', False)]",partner_id,USB,stock.picking.usb_replicate_picking,stock.picking,USB_replicate_out,2030,Valid
+USB_replicate_pick,TRUE,TRUE,"['name','subtype','from_wkf','state','stock_journal_id/id','purchase_id/id', 'sale_id/id','origin','shipment_id/name','shipment_id/num_of_packs','previous_step_id/name','location_id/id', 'backorder_id/id','backorder_ids/id','backorder_ids/rw_sdref_counterpart', 'warehouse_id/id','order_category','overall_qty','change_reason','cross_docking_ok','location_dest_id/id','address_id', 'partner_type_stock_picking', 'delivered','reason_type_id/id','min_date', 'note', 'partner_id', 'move_type', 'type', 'dpo_out', 'flow_type', 'transport_order_id/id', 'direct_incoming','shipment_id/name', 'move_lines/processed_stock_move', 'move_lines/id', 'move_lines/state','move_lines/original_qty_partial', 'move_lines/line_number', 'move_lines/name', 'move_lines/change_reason', 'move_lines/reason_type_id/id','move_lines/product_id/id', 'move_lines/product_id/name', 'move_lines/product_qty', 'move_lines/product_uos_qty', 'move_lines/prodlot_id/id', 'move_lines/expired_date', 'move_lines/asset_id/id','move_lines/product_uom/id', 'move_lines/product_uom/name', 'move_lines/date', 'move_lines/date_expected', 'move_lines/note', 'move_lines/location_dest_id/id','move_lines/location_id/id','move_lines/from_pack','move_lines/to_pack','move_lines/width','move_lines/height','move_lines/weight','move_lines/length','move_lines/pack_type','move_lines/purchase_line_id/id','move_lines/sale_line_id/id','move_lines/price_unit']","[('type', '=', 'out'),('subtype', '=', 'picking'),('state', 'in', ['draft']),('already_replicated', '=', False),('partner_id', '!=', False)]",partner_id,USB,stock.picking.usb_replicate_picking,stock.picking,USB_replicate_pick,2031,Valid
+USB_replicate_out_conso,TRUE,TRUE,"['name','subtype','from_wkf','date_done','state','stock_journal_id/id','purchase_id/id', 'sale_id/id','origin','shipment_id/name','shipment_id/num_of_packs','previous_step_id/name','location_id/id','backorder_ids/id','backorder_ids/rw_sdref_counterpart',  'backorder_id/id','warehouse_id/id','order_category','overall_qty','change_reason','cross_docking_ok','location_dest_id/id','address_id', 'partner_type_stock_picking', 'delivered','reason_type_id/id','min_date', 'note', 'partner_id', 'move_type', 'type', 'dpo_out', 'flow_type', 'transport_order_id/id', 'direct_incoming','shipment_id/name', 'move_lines/processed_stock_move', 'move_lines/id', 'move_lines/state','move_lines/original_qty_partial', 'move_lines/line_number', 'move_lines/name', 'move_lines/change_reason', 'move_lines/reason_type_id/id','move_lines/product_id/id', 'move_lines/product_id/name', 'move_lines/product_qty', 'move_lines/product_uos_qty', 'move_lines/prodlot_id/id', 'move_lines/expired_date', 'move_lines/asset_id/id','move_lines/product_uom/id', 'move_lines/product_uom/name', 'move_lines/date', 'move_lines/date_expected', 'move_lines/note', 'move_lines/location_dest_id/id','move_lines/location_id/id','move_lines/from_pack','move_lines/to_pack','move_lines/width','move_lines/height','move_lines/weight','move_lines/length','move_lines/pack_type','move_lines/purchase_line_id/id','move_lines/sale_line_id/id','move_lines/price_unit']","[('type', '=', 'out'),('subtype', '=', 'standard'),('name', 'like', 'OUT-CONSO'),('state', '=', 'done'),('already_replicated', '=', False),('partner_id', '!=', False)]",partner_id,USB,stock.picking.usb_replicate_picking,stock.picking,USB_replicate_out_conso,2032,Valid
+USB_convert_PICK_to_OUT,TRUE,TRUE,"['name','subtype','from_wkf','associate_pick_name','date_done','state','stock_journal_id/id','purchase_id/id', 'sale_id/id','origin','shipment_id/name','shipment_id/num_of_packs','previous_step_id/name','location_id/id','backorder_ids/id', 'backorder_ids/rw_sdref_counterpart', 'backorder_id/id','warehouse_id/id','order_category','overall_qty','change_reason','cross_docking_ok','location_dest_id/id','address_id', 'partner_type_stock_picking', 'delivered','reason_type_id/id','min_date', 'note', 'partner_id', 'move_type', 'type', 'dpo_out', 'flow_type', 'transport_order_id/id', 'direct_incoming','shipment_id/name', 'move_lines/processed_stock_move', 'move_lines/id', 'move_lines/state','move_lines/original_qty_partial', 'move_lines/line_number', 'move_lines/name', 'move_lines/change_reason', 'move_lines/reason_type_id/id','move_lines/product_id/id', 'move_lines/product_id/name', 'move_lines/product_qty', 'move_lines/product_uos_qty', 'move_lines/prodlot_id/id', 'move_lines/expired_date', 'move_lines/asset_id/id','move_lines/product_uom/id', 'move_lines/product_uom/name', 'move_lines/date', 'move_lines/date_expected', 'move_lines/note', 'move_lines/location_dest_id/id','move_lines/location_id/id','move_lines/from_pack','move_lines/to_pack','move_lines/width','move_lines/height','move_lines/weight','move_lines/length','move_lines/pack_type','move_lines/purchase_line_id/id','move_lines/sale_line_id/id','move_lines/price_unit']","[('name', '=', False),('partner_id', '!=', False)]",partner_id,USB,stock.picking.usb_convert_pick_to_out,stock.picking,USB_convert_PICK_to_OUT,2035,Valid
+USB_convert_OUT_to_PICK,TRUE,TRUE,"['name','subtype','from_wkf','associate_pick_name','date_done','state','stock_journal_id/id','purchase_id/id', 'sale_id/id','origin','shipment_id/name','shipment_id/num_of_packs','previous_step_id/name','location_id/id','backorder_ids/id', 'backorder_ids/rw_sdref_counterpart', 'backorder_id/id','warehouse_id/id','order_category','overall_qty','change_reason','cross_docking_ok','location_dest_id/id','address_id', 'partner_type_stock_picking', 'delivered','reason_type_id/id','min_date', 'note', 'partner_id', 'move_type', 'type', 'dpo_out', 'flow_type', 'transport_order_id/id', 'direct_incoming','shipment_id/name', 'move_lines/processed_stock_move', 'move_lines/id', 'move_lines/state','move_lines/original_qty_partial', 'move_lines/line_number', 'move_lines/name', 'move_lines/change_reason', 'move_lines/reason_type_id/id','move_lines/product_id/id', 'move_lines/product_id/name', 'move_lines/product_qty', 'move_lines/product_uos_qty', 'move_lines/prodlot_id/id', 'move_lines/expired_date', 'move_lines/asset_id/id','move_lines/product_uom/id', 'move_lines/product_uom/name', 'move_lines/date', 'move_lines/date_expected', 'move_lines/note', 'move_lines/location_dest_id/id','move_lines/location_id/id','move_lines/from_pack','move_lines/to_pack','move_lines/width','move_lines/height','move_lines/weight','move_lines/length','move_lines/pack_type','move_lines/purchase_line_id/id','move_lines/sale_line_id/id','move_lines/price_unit']","[('name', '=', False),('partner_id', '!=', False)]",partner_id,USB,stock.picking.usb_convert_out_to_pick,stock.picking,USB_convert_OUT_to_PICK,2036,Valid
+USB_closed_OUT_closes_OUT,TRUE,TRUE,"['name','subtype','from_wkf','date_done','state','stock_journal_id/id','purchase_id/id', 'sale_id/id','origin','shipment_id/name','shipment_id/num_of_packs','previous_step_id/name','location_id/id','backorder_ids/id', 'backorder_ids/rw_sdref_counterpart', 'backorder_id/id','warehouse_id/id','order_category','overall_qty','change_reason','cross_docking_ok','location_dest_id/id','address_id', 'partner_type_stock_picking', 'delivered','reason_type_id/id','min_date', 'note', 'partner_id', 'move_type', 'type', 'dpo_out', 'flow_type', 'transport_order_id/id', 'direct_incoming','shipment_id/name', 'move_lines/processed_stock_move', 'move_lines/id', 'move_lines/state','move_lines/original_qty_partial', 'move_lines/line_number', 'move_lines/name', 'move_lines/change_reason', 'move_lines/reason_type_id/id','move_lines/product_id/id', 'move_lines/product_id/name', 'move_lines/product_qty', 'move_lines/product_uos_qty', 'move_lines/prodlot_id/id', 'move_lines/expired_date', 'move_lines/asset_id/id','move_lines/product_uom/id', 'move_lines/product_uom/name', 'move_lines/date', 'move_lines/date_expected', 'move_lines/note', 'move_lines/location_dest_id/id','move_lines/location_id/id','move_lines/from_pack','move_lines/to_pack','move_lines/width','move_lines/height','move_lines/weight','move_lines/length','move_lines/pack_type','move_lines/purchase_line_id/id','move_lines/sale_line_id/id','move_lines/price_unit']","[('type', '=', 'out'),('subtype', '=', 'standard'),('state', '=', 'done'),('already_replicated', '=', False),('partner_id', '!=', False)]",partner_id,USB,stock.picking.usb_closed_out_closes_out,stock.picking,USB_closed_OUT_closes_OUT,2040,Valid
+USB_closed_new_PICK_closes_PICK,TRUE,TRUE,"['name','subtype','date_done','state','from_wkf','stock_journal_id/id','purchase_id/id', 'sale_id/id','origin','shipment_id/name','shipment_id/num_of_packs','previous_step_id/name','location_id/id','backorder_ids/id', 'backorder_ids/rw_sdref_counterpart', 'backorder_id/id','warehouse_id/id','order_category','overall_qty','change_reason','cross_docking_ok','location_dest_id/id','address_id', 'partner_type_stock_picking', 'delivered','reason_type_id/id','min_date', 'note', 'partner_id', 'move_type', 'type', 'dpo_out', 'flow_type', 'transport_order_id/id', 'direct_incoming','shipment_id/name', 'move_lines/processed_stock_move', 'move_lines/id', 'move_lines/state','move_lines/original_qty_partial', 'move_lines/line_number', 'move_lines/name', 'move_lines/change_reason', 'move_lines/reason_type_id/id','move_lines/product_id/id', 'move_lines/product_id/name', 'move_lines/product_qty', 'move_lines/product_uos_qty', 'move_lines/prodlot_id/id', 'move_lines/expired_date', 'move_lines/asset_id/id','move_lines/product_uom/id', 'move_lines/product_uom/name', 'move_lines/date', 'move_lines/date_expected', 'move_lines/note', 'move_lines/location_dest_id/id','move_lines/location_id/id','move_lines/from_pack','move_lines/to_pack','move_lines/width','move_lines/height','move_lines/weight','move_lines/length','move_lines/pack_type','move_lines/purchase_line_id/id','move_lines/sale_line_id/id','move_lines/price_unit']","[('type', '=', 'out'),('subtype', '=', 'picking'),('state', 'in', ['done', 'assigned']),('already_replicated', '=', False),('partner_id', '!=', False)]",partner_id,USB,stock.picking.usb_create_picking,stock.picking,USB_closed_new_PICK_closes_PICK,2041,Valid
+USB_replicate_PPL,TRUE,TRUE,"['name','subtype','from_wkf','state','stock_journal_id/id','purchase_id/id', 'sale_id/id','origin','shipment_id/name','shipment_id/num_of_packs','previous_step_id/name','location_id/id','backorder_ids/id','backorder_ids/rw_sdref_counterpart',  'backorder_id/id','warehouse_id/id','order_category','overall_qty','change_reason','cross_docking_ok','location_dest_id/id','address_id', 'partner_type_stock_picking', 'delivered','reason_type_id/id','min_date', 'note', 'partner_id', 'move_type', 'type', 'dpo_out', 'flow_type', 'transport_order_id/id', 'direct_incoming','shipment_id/name', 'move_lines/processed_stock_move', 'move_lines/id', 'move_lines/state','move_lines/original_qty_partial', 'move_lines/line_number', 'move_lines/name', 'move_lines/change_reason', 'move_lines/reason_type_id/id','move_lines/product_id/id', 'move_lines/product_id/name', 'move_lines/product_qty', 'move_lines/product_uos_qty', 'move_lines/prodlot_id/id', 'move_lines/expired_date', 'move_lines/asset_id/id','move_lines/product_uom/id', 'move_lines/product_uom/name', 'move_lines/date', 'move_lines/date_expected', 'move_lines/note', 'move_lines/location_dest_id/id','move_lines/location_id/id','move_lines/from_pack','move_lines/to_pack','move_lines/width','move_lines/height','move_lines/weight','move_lines/length','move_lines/pack_type','move_lines/purchase_line_id/id','move_lines/sale_line_id/id','move_lines/price_unit']","[('type', '=', 'out'),('subtype', '=', 'ppl'),('state', 'in', ['done','assigned']),('already_replicated', '=', False),('partner_id', '!=', False)]",partner_id,USB,stock.picking.usb_replicate_ppl,stock.picking,USB_replicate_PPL,2044,Valid
 USB_picking_return_products,TRUE,TRUE,['name'],"[('state', 'in',['fake'])]",partner_id,USB,stock.picking.usb_picking_return_products,stock.picking,usb_picking_return_products,2045,Valid
-USB_Create_Packing_List,TRUE,TRUE,"['name','from_wkf','subtype','state','stock_journal_id/id','purchase_id/id', 'sale_id/id','origin','shipment_id/name','shipment_id/num_of_packs','previous_step_id/name','location_id/id','backorder_ids/id','backorder_ids/rw_sdref_counterpart',  'backorder_id/id','backorder_id/name','warehouse_id/id','order_category','overall_qty','change_reason','cross_docking_ok','location_dest_id/id','address_id', 'partner_type_stock_picking', 'delivered','reason_type_id/id','min_date', 'note', 'partner_id', 'move_type', 'type', 'dpo_out', 'flow_type', 'transport_order_id/id', 'direct_incoming','shipment_id/name', 'move_lines/processed_stock_move', 'move_lines/id', 'move_lines/state','move_lines/original_qty_partial', 'move_lines/line_number', 'move_lines/name', 'move_lines/change_reason', 'move_lines/reason_type_id/id','move_lines/product_id/id', 'move_lines/product_id/name', 'move_lines/product_qty', 'move_lines/product_uos_qty', 'move_lines/prodlot_id/id', 'move_lines/expired_date', 'move_lines/asset_id/id','move_lines/product_uom/id', 'move_lines/product_uom/name', 'move_lines/date', 'move_lines/date_expected', 'move_lines/note', 'move_lines/location_dest_id/id','move_lines/location_id/id','move_lines/from_pack','move_lines/to_pack','move_lines/width','move_lines/height','move_lines/weight','move_lines/length','move_lines/pack_type','move_lines/purchase_line_id/id','move_lines/sale_line_id/id','move_lines/price_unit','move_lines/price_currency_id/id']","[('type', '=', 'out'),('subtype', '=', 'packing'),('state', 'in', ['draft','done','assigned']),('shipment_id', '!=', False),('backorder_id', '=', False),('already_replicated', '=', False),('partner_id', '!=', False)]",partner_id,USB,stock.picking.usb_create_packing,stock.picking,USB_Create_Packing_List,2046,Valid
+USB_Create_Packing_List,TRUE,TRUE,"['name','from_wkf','subtype','state','stock_journal_id/id','purchase_id/id', 'sale_id/id','origin','shipment_id/name','shipment_id/num_of_packs','previous_step_id/name','location_id/id','backorder_ids/id','backorder_ids/rw_sdref_counterpart',  'backorder_id/id','warehouse_id/id','order_category','overall_qty','change_reason','cross_docking_ok','location_dest_id/id','address_id', 'partner_type_stock_picking', 'delivered','reason_type_id/id','min_date', 'note', 'partner_id', 'move_type', 'type', 'dpo_out', 'flow_type', 'transport_order_id/id', 'direct_incoming','shipment_id/name', 'move_lines/processed_stock_move', 'move_lines/id', 'move_lines/state','move_lines/original_qty_partial', 'move_lines/line_number', 'move_lines/name', 'move_lines/change_reason', 'move_lines/reason_type_id/id','move_lines/product_id/id', 'move_lines/product_id/name', 'move_lines/product_qty', 'move_lines/product_uos_qty', 'move_lines/prodlot_id/id', 'move_lines/expired_date', 'move_lines/asset_id/id','move_lines/product_uom/id', 'move_lines/product_uom/name', 'move_lines/date', 'move_lines/date_expected', 'move_lines/note', 'move_lines/location_dest_id/id','move_lines/location_id/id','move_lines/from_pack','move_lines/to_pack','move_lines/width','move_lines/height','move_lines/weight','move_lines/length','move_lines/pack_type','move_lines/purchase_line_id/id','move_lines/sale_line_id/id','move_lines/price_unit']","[('type', '=', 'out'),('subtype', '=', 'packing'),('state', 'in', ['draft','done','assigned']),('shipment_id', '!=', False),('backorder_id', '=', False),('already_replicated', '=', False),('partner_id', '!=', False)]",partner_id,USB,stock.picking.usb_create_packing,stock.picking,USB_Create_Packing_List,2046,Valid
 USB_shipment_return_packs_shipment_draft,TRUE,TRUE,['name'],"[('state', 'in',['fake'])]",partner_id,USB,shipment.usb_shipment_return_packs_shipment_draft,shipment,usb_shipment_return_packs_shipment_draft,2047,Valid
-USB_Create_Shipment,TRUE,TRUE,"['shipper_address','address_id/id','date_of_departure','shipment_expected_date','invoice_id/id', 'consignee_date', 'shipper_name', 'carrier_address', 'registration', 'planned_date_of_arrival', 'partner_id', 'carrier_name', 'carrier_other', 'consignee_email', 'shipment_actual_date', 'shipper_date', 'parent_id/name', 'state', 'driver_name' , 'cargo_manifest_reference', 'carrier_signature', 'shipper_phone' , 'carrier_phone' , 'consignee_signature' , 'sequence_id' , 'carrier_email' , 'date', 'shipper_signature', 'carrier_date', 'name' , 'consignee_other', 'consignee_phone' , 'consignee_address', 'in_ref', 'transit_via', 'transport_type', 'shipper_email', 'partner_id2/id' , 'shipper_other' , 'consignee_name' , 'transport_order_id/id','pack_family_memory_ids/ppl_id/name','pack_family_memory_ids/from_pack','pack_family_memory_ids/to_pack','pack_family_memory_ids/description_ppl']","[('state', 'not in', ['draft']),('already_replicated', '=', False)]",partner_id,USB,shipment.usb_create_shipment,shipment,USB_Create_Shipment,2050,Valid
+USB_Create_Shipment,TRUE,TRUE,"['shipper_address','address_id/id','date_of_departure','shipment_expected_date','invoice_id/id', 'consignee_date', 'shipper_name', 'carrier_address', 'registration', 'planned_date_of_arrival', 'partner_id', 'carrier_name', 'carrier_other', 'consignee_email', 'shipment_actual_date', 'shipper_date', 'parent_id/name', 'state', 'driver_name' , 'cargo_manifest_reference', 'carrier_signature', 'shipper_phone' , 'carrier_phone' , 'consignee_signature' , 'sequence_id' , 'carrier_email' , 'date', 'shipper_signature', 'carrier_date', 'name' , 'consignee_other', 'consignee_phone' , 'consignee_address', 'in_ref', 'transit_via', 'transport_type', 'shipper_email', 'partner_id2/id' , 'shipper_other' , 'consignee_name' , 'transport_order_id/id','pack_family_memory_ids/ppl_id/name','pack_family_memory_ids/from_pack','pack_family_memory_ids/to_pack']","[('state', 'not in', ['draft']),('already_replicated', '=', False)]",partner_id,USB,shipment.usb_create_shipment,shipment,USB_Create_Shipment,2050,Valid
 Usb_Shipment_Return_Packs,TRUE,TRUE,['name'],"[('state','in',['fake'])]",partner_id,USB,shipment.usb_shipment_return_packs,shipment,USB_Shipment_Return_Packs,2051,Valid
 USB_Validate_Shipment,TRUE,TRUE,['name'],"[('state', 'in', ['done']), ('already_rw_validated', '=', False),('parent_id', '!=', False)]",partner_id,USB,shipment.usb_set_validated_shipment,shipment,USB_Validate_Shipment,2055,Valid
 USB_Set_Delivered_Shipment,TRUE,TRUE,['name'],"[('state', 'in', ['delivered']), ('already_rw_delivered', '=', False), ('parent_id', '!=', False)]",partner_id,USB,shipment.usb_set_delivered_shipment,shipment,USB_Set_Delivered_Shipment,2056,Valid
 
=== 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-05-19 09:21:07 +0000
+++ bin/addons/msf_sync_data_server/data/sync_server.sync_rule.csv	2016-05-24 07:58:03 +0000
@@ -83,9 +83,15 @@
 msf_sync_data_server.budget,TRUE,TRUE,FALSE,FALSE,bidirectional,Up,"[('type','=','normal'), ('state', '!=', 'draft')]","['code', 'cost_center_id/id', 'currency_id/id', 'decision_moment_id/id', 'decision_moment_order', 'fiscalyear_id/id', 'name', 'type', 'version']",OC,msf.budget,,Budget,Valid,,430
 msf_sync_data_server.budget_line,TRUE,TRUE,FALSE,FALSE,bidirectional,Up,"[('budget_id','in',('msf.budget','id',[('type','=','normal'), ('state', '!=', 'draft')]))]","['account_id/id', 'budget_id/id', 'month1', 'month2', 'month3', 'month4', 'month5', 'month6', 'month7', 'month8', 'month9', 'month10', 'month11', 'month12', 'destination_id/id', 'line_type']",OC,msf.budget.line,,Budget line,Valid,,431
 msf_sync_data_server.budget_status,TRUE,TRUE,FALSE,FALSE,bidirectional,Up,"[('type','=','normal'), ('state', '!=', 'draft')]",['state'],OC,msf.budget,,Budget status,Valid,,432
+<<<<<<< TREE
 msf_sync_data_server.mission_stock_report,TRUE,TRUE,FALSE,FALSE,bidirectional,Up,"[('full_view', '=', False), ('local_report', '=', True)]","['full_view', 'instance_id/id', 'last_update', 'name']",OC,stock.mission.report,,Mission Stock Report,Valid,,440
 msf_sync_data_server.mission_stock_report_line,TRUE,TRUE,FALSE,FALSE,bidirectional,Up,"[('mission_report_id.full_view', '=', False), ('mission_report_id.local_report', '=', True), ('international_status','in',['Local', 'Temporary'])]","['central_qty', 'central_val', 'cross_qty', 'cross_val', 'cu_qty', 'cu_val', 'in_pipe_coor_qty', 'in_pipe_coor_val', 'in_pipe_qty', 'in_pipe_val', 'internal_qty', 'internal_val', 'mission_report_id/id', 'product_id/id', 'secondary_qty', 'secondary_val', 'stock_qty', 'stock_val', 'xmlid_code']",MISSION,stock.mission.report.line,,Mission Stock Report Line,Valid,,441
 msf_sync_data_server.mission_stock_report_line_OC,TRUE,TRUE,FALSE,FALSE,bidirectional,Up,"[('mission_report_id.full_view', '=', False), ('mission_report_id.local_report', '=', True), ('international_status','in',['ITC', 'UniData', 'ESC', 'HQ'])]","['central_qty', 'central_val', 'cross_qty', 'cross_val', 'cu_qty', 'cu_val', 'in_pipe_coor_qty', 'in_pipe_coor_val', 'in_pipe_qty', 'in_pipe_val', 'internal_qty', 'internal_val', 'mission_report_id/id', 'product_id/id', 'secondary_qty', 'secondary_val', 'stock_qty', 'stock_val', 'xmlid_code']",OC,stock.mission.report.line,,Mission Stock Report Line OC,Valid,,442
+=======
+msf_sync_data_server.mission_stock_report,TRUE,TRUE,FALSE,FALSE,bidirectional,Up,"[('full_view', '=', False)]","['full_view', 'instance_id/id', 'last_update', 'name']",OC,stock.mission.report,,Mission Stock Report,Valid,,440
+msf_sync_data_server.mission_stock_report_line,TRUE,TRUE,FALSE,FALSE,bidirectional,Up,"[('mission_report_id.full_view', '=', False)]","['central_qty', 'central_val', 'cross_qty', 'cross_val', 'cu_qty', 'cu_val', 'in_pipe_coor_qty', 'in_pipe_coor_val', 'in_pipe_qty', 'in_pipe_val', 'internal_qty', 'internal_val', 'mission_report_id/id', 'product_id/id', 'secondary_qty', 'secondary_val', 'stock_qty', 'stock_val', 'xmlid_code']",MISSION,stock.mission.report.line,,Mission Stock Report Line,Valid,,441
+msf_sync_data_server.mission_stock_report_line_OC,TRUE,TRUE,FALSE,FALSE,bidirectional,Bidirectional-Private,"[('mission_report_id.full_view', '=', False), '|','|',('international_status','=','ITC'),('international_status','=','ESC'),('international_status','=','HQ')]","['central_qty', 'central_val', 'cross_qty', 'cross_val', 'cu_qty', 'cu_val', 'in_pipe_coor_qty', 'in_pipe_coor_val', 'in_pipe_qty', 'in_pipe_val', 'internal_qty', 'internal_val', 'mission_report_id/id', 'product_id/id', 'secondary_qty', 'secondary_val', 'stock_qty', 'stock_val', 'xmlid_code', 'instance_id']",OC,stock.mission.report.line,instance_id,Mission Stock Report Line OC,Valid,,442
+>>>>>>> MERGE-SOURCE
 msf_sync_data_server.financing_contract_formats_fc,TRUE,TRUE,FALSE,TRUE,bidirectional,Bidirectional-Private,[],"['cost_center_ids/id', 'eligibility_from_date', 'eligibility_to_date', 'format_name', 'overhead_percentage', 'overhead_type', 'reporting_type', 'hidden_instance_id/id']",HQ + MISSION,financing.contract.format,hidden_instance_id,Financing Contract Formats FC,Valid,,450
 msf_sync_data_server.financing_contract_formats,TRUE,TRUE,TRUE,TRUE,bidirectional,Bidirectional,"[('hidden_instance_id','=',False)]","['hidden_instance_id/id','cost_center_ids/id', 'eligibility_from_date', 'eligibility_to_date', 'format_name', 'overhead_percentage', 'overhead_type', 'reporting_type']",HQ + MISSION,financing.contract.format,,Financing Contract Formats,Valid,,451
 msf_sync_data_server.financing_contract_format_lines,TRUE,TRUE,TRUE,TRUE,bidirectional,Bidirectional,"[('instance_id', '=', False)]","['account_destination_ids/id', 'instance_id/id','allocated_budget_value', 'allocated_real_value', 'code', 'format_id/id', 'line_type', 'name', 'overhead_percentage', 'overhead_type', 'project_budget_value', 'project_real_value',  'is_quadruplet','quadruplet_update']",HQ + MISSION,financing.contract.format.line,,Financing Contract Format Lines,Valid,,452
@@ -109,8 +115,13 @@
 msf_sync_data_server.price_list_version,FALSE,TRUE,FALSE,FALSE,bidirectional,Bidirectional,[],"['active', 'date_end', 'date_start', 'name', 'pricelist_id/id']",MISSION,product.pricelist.version,,Price List Version,Valid,,561
 msf_sync_data_server.country_restrictions,TRUE,TRUE,FALSE,TRUE,bidirectional,Down,[],['name'],MISSION,res.country.restriction,,Country restrictions,Valid,,570
 msf_sync_data_server.country_code_mapping,TRUE,TRUE,TRUE,TRUE,bidirectional,Down,[],"['instance_id/id', 'mapping_value']",COORDINATIONS,country.export.mapping,,Country Code Mapping,Valid,,571
+<<<<<<< TREE
 msf_sync_data_server.oc_product_creator_itc_esc_hq,TRUE,TRUE,FALSE,TRUE,bidirectional,Down,"['|','|','|',('international_status','=','UniData'),('international_status','=','ITC'),('international_status','=','ESC'),('international_status','=','HQ'), ('active', 'in', ['t','f'])]","['alert_time', 'batch_management', 'categ_id/id', 'closed_article', 'manufacturer_txt', 'manufacturer_ref', 'code', 'cold_chain/id', 'composed_kit', 'xmlid_code', 'cost_method', 'country_restriction/id', 'dangerous_goods', 'default_code', 'description', 'description2', 'description_purchase', 'description_sale', 'gmdn_code', 'gmdn_description', 'heat_sensitive_item/id', 'international_status/id', 'justification_code_id/id', 'library', 'life_time', 'list_ids/id','med_device_class', 'name', 'name_template', 'controlled_substance', 'nomen_manda_0/id', 'nomen_manda_1/id', 'nomen_manda_2/id', 'nomen_manda_3/id', 'options_ids/id', 'perishable', 'procure_delay', 'procure_method', 'produce_delay', 'product_catalog_page', 'product_catalog_path', 'property_account_expense/id', 'property_account_income/id', 'property_stock_account_input/id', 'property_stock_account_output/id', 'restricted_country', 'short_shelf_life', 'single_use', 'sterilized', 'standard_price', 'sublist', 'subtype', 'asset_type_id', 'supply_method', 'type', 'un_code', 'uom_id/id', 'uom_po_id/id','use_time', 'valuation', 'weight', 'weight_net', 'active', 'state', 'old_code', 'new_code', 'function_value', 'form_value', 'fit_value', 'standard_ok','transport_ok','volume', 'volume_updated', 'soq_quantity', 'soq_weight', 'soq_volume']",OC,product.product,,"OC Product (Creator = ITC, ESC, UniData or HQ)",Valid,,600
 msf_sync_data_server.mission_product_creator_local,TRUE,TRUE,FALSE,TRUE,bidirectional,Down,"[('international_status','=','Local'), ('active', 'in', ['t','f'])]","['alert_time', 'batch_management', 'categ_id/id', 'closed_article', 'manufacturer_txt', 'manufacturer_ref', 'code', 'xmlid_code','cold_chain/id', 'composed_kit', 'cost_method', 'country_restriction/id', 'dangerous_goods', 'default_code', 'description', 'description2', 'description_purchase', 'description_sale', 'gmdn_code', 'gmdn_description', 'heat_sensitive_item/id', 'international_status/id', 'justification_code_id/id', 'library', 'life_time', 'list_ids/id','med_device_class', 'name', 'name_template', 'controlled_substance', 'nomen_manda_0/id', 'nomen_manda_1/id', 'nomen_manda_2/id', 'nomen_manda_3/id', 'options_ids/id', 'perishable', 'procure_delay', 'procure_method', 'produce_delay', 'product_catalog_page', 'product_catalog_path', 'property_account_expense/id', 'property_account_income/id', 'property_stock_account_input/id', 'property_stock_account_output/id', 'restricted_country', 'short_shelf_life', 'single_use', 'sterilized', 'standard_price', 'sublist', 'subtype', 'asset_type_id',  'supply_method', 'type', 'un_code', 'uom_id/id', 'uom_po_id/id','use_time', 'valuation', 'weight', 'weight_net', 'active', 'state', 'old_code', 'new_code', 'function_value', 'form_value', 'fit_value', 'standard_ok','transport_ok','volume', 'volume_updated', 'soq_quantity', 'soq_weight','soq_volume']",MISSION,product.product,,Mission Product (Creator = local),Valid,,601
+=======
+msf_sync_data_server.oc_product_creator_itc_esc_hq,TRUE,TRUE,FALSE,TRUE,bidirectional,Down,"['|','|','|',('international_status','=','UniData'),('international_status','=','ITC'),('international_status','=','ESC'),('international_status','=','HQ'), ('active', 'in', ['t','f'])]","['alert_time', 'batch_management', 'categ_id/id', 'closed_article', 'manufacturer_txt', 'manufacturer_ref', 'code', 'cold_chain/id', 'composed_kit', 'xmlid_code', 'cost_method', 'country_restriction/id', 'dangerous_goods', 'default_code', 'description', 'description2', 'description_purchase', 'description_sale', 'gmdn_code', 'gmdn_description', 'heat_sensitive_item/id', 'international_status/id', 'justification_code_id/id', 'library', 'life_time', 'list_ids/id','med_device_class', 'name', 'name_template', 'controlled_substance', 'nomen_manda_0/id', 'nomen_manda_1/id', 'nomen_manda_2/id', 'nomen_manda_3/id', 'options_ids/id', 'perishable', 'procure_delay', 'procure_method', 'produce_delay', 'product_catalog_page', 'product_catalog_path', 'property_account_expense/id', 'property_account_income/id', 'property_stock_account_input/id', 'property_stock_account_output/id', 'restricted_country', 'short_shelf_life', 'single_use', 'sterilized', 'standard_price', 'sublist', 'subtype', 'asset_type_id', 'supply_method', 'type', 'un_code', 'uom_id/id', 'uom_po_id/id','use_time', 'valuation', 'weight', 'weight_net', 'active', 'state', 'old_code', 'function_value', 'form_value', 'fit_value', 'standard_ok','transport_ok','volume', 'volume_updated', 'soq_quantity', 'soq_weight', 'soq_volume']",OC,product.product,,"OC Product (Creator = ITC, ESC or HQ)",Valid,,600
+msf_sync_data_server.mission_product_creator_local,TRUE,TRUE,FALSE,TRUE,bidirectional,Down,"[('international_status','=','Local'), ('active', 'in', ['t','f'])]","['alert_time', 'batch_management', 'categ_id/id', 'closed_article', 'manufacturer_txt', 'manufacturer_ref', 'code', 'xmlid_code','cold_chain/id', 'composed_kit', 'cost_method', 'country_restriction/id', 'dangerous_goods', 'default_code', 'description', 'description2', 'description_purchase', 'description_sale', 'gmdn_code', 'gmdn_description', 'heat_sensitive_item/id', 'international_status/id', 'justification_code_id/id', 'library', 'life_time', 'list_ids/id','med_device_class', 'name', 'name_template', 'controlled_substance', 'nomen_manda_0/id', 'nomen_manda_1/id', 'nomen_manda_2/id', 'nomen_manda_3/id', 'options_ids/id', 'perishable', 'procure_delay', 'procure_method', 'produce_delay', 'product_catalog_page', 'product_catalog_path', 'property_account_expense/id', 'property_account_income/id', 'property_stock_account_input/id', 'property_stock_account_output/id', 'restricted_country', 'short_shelf_life', 'single_use', 'sterilized', 'standard_price', 'sublist', 'subtype', 'asset_type_id',  'supply_method', 'type', 'un_code', 'uom_id/id', 'uom_po_id/id','use_time', 'valuation', 'weight', 'weight_net', 'active', 'state', 'old_code', 'function_value', 'form_value', 'fit_value', 'standard_ok','transport_ok','volume', 'volume_updated', 'soq_quantity', 'soq_weight','soq_volume']",MISSION,product.product,,Mission Product (Creator = local),Valid,,601
+>>>>>>> MERGE-SOURCE
 msf_sync_data_server.standard_product_list,TRUE,TRUE,TRUE,TRUE,bidirectional,Down,"[('standard_list_ok','=','True')]","['creation_date', 'creator', 'description', 'last_update_date', 'name', 'order_list_print_ok', 'ref', 'standard_list_ok', 'type']",OC,product.list,,Standard Product List,Valid,,605
 msf_sync_data_server.standard_product_list_line,TRUE,TRUE,TRUE,TRUE,bidirectional,Down,"[('list_id' , 'in', ('product.list', 'id', [('standard_list_ok','=','True')]))]","['comment','list_id/id','ref','name']",OC,product.list.line,,Standard Product List Line,Valid,,606
 msf_sync_data_server.tax_code,TRUE,TRUE,FALSE,TRUE,bidirectional,Down,[],"['code', 'info', 'name', 'notprintable', 'sign']",OC,account.tax.code,,Tax Code,Valid,,610
@@ -202,7 +213,7 @@
 msf_usb_sync_data_server.cp_all_partners_address,TRUE,TRUE,FALSE,TRUE,cp_to_rw,Bidirectional,[],"['active', 'city', 'country_id/id', 'email', 'fax', 'function', 'mobile', 'name', 'partner_id/id', 'phone', 'state_id/id', 'street', 'street2', 'title/id', 'type', 'zip']",USB,res.partner.address,,[MASTER] Partner Address,Valid,,1662
 msf_usb_sync_data_server.cp_product_price_list,TRUE,TRUE,FALSE,TRUE,cp_to_rw,Bidirectional,[],"['active', 'company_id/id', 'currency_id/id', 'currency_name', 'name', 'type']",USB,product.pricelist,,[MASTER] Product_price_list,Valid,,1670
 msf_usb_sync_data_server.cp_country_restrictions,TRUE,TRUE,FALSE,TRUE,cp_to_rw,Bidirectional,[],['name'],USB,res.country.restriction,,[MASTER] Country restrictions,Valid,,1680
-msf_usb_sync_data_server.cp_all_product,TRUE,TRUE,FALSE,TRUE,cp_to_rw,Bidirectional,[],"['alert_time', 'batch_management', 'asset_type_id', 'categ_id/id', 'closed_article','manufacturer_txt', 'manufacturer_ref','code', 'cold_chain/id', 'composed_kit', 'cost_method', 'country_restriction/id', 'dangerous_goods', 'default_code', 'description', 'description2', 'description_purchase', 'description_sale', 'gmdn_code', 'gmdn_description', 'heat_sensitive_item/id', 'international_status/id', 'justification_code_id/id', 'library', 'life_time', 'list_ids/id','med_device_class', 'name', 'name_template', 'controlled_substance', 'nomen_manda_0/id', 'nomen_manda_1/id', 'nomen_manda_2/id', 'nomen_manda_3/id', 'options_ids/id', 'perishable', 'procure_delay', 'procure_method', 'produce_delay', 'product_catalog_page', 'product_catalog_path', 'property_account_expense/id', 'property_account_income/id', 'property_stock_account_input/id', 'property_stock_account_output/id', 'restricted_country', 'short_shelf_life', 'single_use', 'sterilized', 'standard_price', 'sublist', 'subtype', 'supply_method', 'type', 'un_code', 'uom_id/id', 'uom_po_id/id','use_time', 'valuation', 'weight', 'weight_net', 'xmlid_code', 'active', 'state', 'old_code', 'new_code', 'function_value', 'form_value', 'fit_value', 'standard_ok','transport_ok','volume','volume_updated', 'soq_quantity', 'soq_weight','soq_volume']",USB,product.product,,[MASTER] Products,Valid,,1810
+msf_usb_sync_data_server.cp_all_product,TRUE,TRUE,FALSE,TRUE,cp_to_rw,Bidirectional,[],"['alert_time', 'batch_management', 'asset_type_id', 'categ_id/id', 'closed_article','manufacturer_txt', 'manufacturer_ref','code', 'cold_chain/id', 'composed_kit', 'cost_method', 'country_restriction/id', 'dangerous_goods', 'default_code', 'description', 'description2', 'description_purchase', 'description_sale', 'gmdn_code', 'gmdn_description', 'heat_sensitive_item/id', 'international_status/id', 'justification_code_id/id', 'library', 'life_time', 'list_ids/id','med_device_class', 'name', 'name_template', 'controlled_substance', 'nomen_manda_0/id', 'nomen_manda_1/id', 'nomen_manda_2/id', 'nomen_manda_3/id', 'options_ids/id', 'perishable', 'procure_delay', 'procure_method', 'produce_delay', 'product_catalog_page', 'product_catalog_path', 'property_account_expense/id', 'property_account_income/id', 'property_stock_account_input/id', 'property_stock_account_output/id', 'restricted_country', 'short_shelf_life', 'single_use', 'sterilized', 'standard_price', 'sublist', 'subtype', 'supply_method', 'type', 'un_code', 'uom_id/id', 'uom_po_id/id','use_time', 'valuation', 'weight', 'weight_net', 'xmlid_code', 'active', 'state', 'old_code', 'function_value', 'form_value', 'fit_value', 'standard_ok','transport_ok','volume','volume_updated', 'soq_quantity', 'soq_weight','soq_volume']",USB,product.product,,[MASTER] Products,Valid,,1810
 msf_usb_sync_data_server.cp_standard_product_list,TRUE,TRUE,TRUE,TRUE,cp_to_rw,Bidirectional,"[('standard_list_ok','=','True')]","['creation_date', 'creator', 'description', 'last_update_date', 'name', 'order_list_print_ok', 'ref', 'standard_list_ok', 'type']",USB,product.list,,[MASTER] Standard Product List,Valid,,1820
 msf_usb_sync_data_server.cp_standard_product_list_line,TRUE,TRUE,TRUE,TRUE,cp_to_rw,Bidirectional,"[('list_id' , 'in', ('product.list', 'id', [('standard_list_ok','=','True')]))]","['comment','list_id/id','ref','name/id']",USB,product.list.line,,[MASTER] Standard Product List Line,Valid,,1821
 msf_usb_sync_data_server.cp_composition_kit,TRUE,TRUE,FALSE,TRUE,cp_to_rw,Bidirectional,"[('state','=','completed'),('composition_type','=','theoretical')]","['active', 'composition_creation_date', 'composition_description', 'composition_product_id/id', 'composition_type', 'composition_version', 'composition_version_txt', 'name', 'state']",USB,composition.kit,,[MASTER] Theoretical Kit Composition List,Valid,,1830
 
=== modified file 'bin/addons/msf_tools/__init__.py'
--- bin/addons/msf_tools/__init__.py	2012-04-04 07:07:34 +0000
+++ bin/addons/msf_tools/__init__.py	2016-05-24 07:58:03 +0000
@@ -15,8 +15,11 @@
 #    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/>.
+#    along with this progrimport automated_import_job_progressam.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
 import msf_tools
+import automated_import_function
+import automated_import
+import automated_import_job
 
=== modified file 'bin/addons/msf_tools/__openerp__.py'
--- bin/addons/msf_tools/__openerp__.py	2013-03-18 16:15:46 +0000
+++ bin/addons/msf_tools/__openerp__.py	2016-05-24 07:58:03 +0000
@@ -24,6 +24,7 @@
     "version": "1.0",
     "depends": ["base",
                 "product",
+                "object_query",
                 ],
     "author": "MSF, TeMPO Consulting",
     "website": "",
@@ -33,7 +34,13 @@
     """,
     "init_xml": [
     ],
-    'update_xml': ['security/ir.model.access.csv',],
+    'update_xml': [
+        'views/automated_import_view.xml',
+        'views/automated_import_function_view.xml',
+        'views/automated_import_job_view.xml',
+        'security/ir.model.access.csv',
+        'automated_import_data.xml',
+    ],
     'demo_xml': [
     ],
     'test': [# tests should be performed in base classes to avoid cyclic dependencies
 
=== added file 'bin/addons/msf_tools/automated_import.py'
--- bin/addons/msf_tools/automated_import.py	1970-01-01 00:00:00 +0000
+++ bin/addons/msf_tools/automated_import.py	2016-05-24 07:58:03 +0000
@@ -0,0 +1,513 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2016 TeMPO Consulting, MSF
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    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/>.
+#
+##############################################################################
+
+import os
+import time
+
+from osv import osv
+from osv import fields
+
+from tools.translate import _
+
+
+class automated_import(osv.osv):
+    _name = 'automated.import'
+
+    _columns = {
+        'name': fields.char(
+            size=128,
+            string='Name',
+            required=True,
+        ),
+        'src_path': fields.char(
+            size=512,
+            string='Source Path',
+        ),
+        'dest_path': fields.char(
+            size=512,
+            string='Destination Path',
+        ),
+        'report_path': fields.char(
+            size=512,
+            string='Report Path',
+        ),
+        'start_time': fields.datetime(
+            string='Date and time of first planned execution',
+        ),
+        'interval': fields.integer(
+            string='Interval number',
+        ),
+        'interval_unit': fields.selection(
+            selection=[
+                ('minutes', 'Minutes'),
+                ('hours', 'Hours'),
+                ('work_days', 'Work Days'),
+                ('days', 'Days'),
+                ('weeks', 'Weeks'),
+               ('months', 'Months'),
+            ],
+            string='Interval Unit',
+        ),
+        'function_id': fields.many2one(
+            'automated.import.function',
+            string='Functionality',
+            required=True,
+        ),
+        'active': fields.boolean(
+            string='Active',
+            readonly=True,
+        ),
+        'cron_id': fields.many2one(
+            'ir.cron',
+            string='Associated cron job',
+            readonly=True,
+        ),
+        'priority': fields.integer(
+            string='Priority',
+            required=True,
+            help="""Defines the priority of the automated import processing because some of them needs other data
+to import well some data (e.g: Product Categories needs Product nomenclatures)."""
+        ),
+    }
+
+    _defaults = {
+        'interval': lambda *a: 1,
+        'interval_unit': lambda *a: 'hours',
+        'active': lambda *a: False,
+        'priority': lambda *a: 10,
+    }
+
+    def unique_import_by_name(self, cr, uid, name, ids=None, context=None):
+        """
+        Check if no other automated.import with same name exists in the system
+        :param cr: Cursor to the database
+        :param uid: ID of the res.users that calls the method
+        :param name: Name of the automated.import to check
+        :param ids: List of ID of automated.import on which the test is made
+        :param context: Context of the call
+        :return: True or raise an error.
+        """
+        if context is None:
+            context = {}
+
+        if ids and isinstance(ids, (int, long)):
+            ids = [ids]
+
+        src_domain = [('name', '=', name), ('active', 'in', ['t', 'f'])]
+        if ids:
+            src_domain.append(('id', 'not in', ids))
+        if self.search(cr, uid, src_domain, limit=1, order='NO_ORDER', context=context):
+            raise osv.except_osv(
+                _('Error'),
+                _('''Another Automated import with same name already exists (maybe inactive). Automated import name
+must be unique. Please select an other name.'''),
+            )
+
+        return True
+
+    def unique_import_by_function(self, cr, uid, function_id, ids=None, context=None):
+        """
+        Check if no other automated.import with same fuctionality exists in the system
+        :param cr: Cursor to the database
+        :param uid: ID of the res.users that calls the method
+        :param function_id: Functionality of the automated.import to check
+        :param ids: List of ID of automated.import on which the test is made
+        :param context: Context of the call
+        :return: True or raise an error.
+        """
+        if context is None:
+            context = {}
+
+        if ids and isinstance(ids, (int, long)):
+            ids = [ids]
+
+        src_domain = [('function_id', '=', function_id), ('active', 'in', ['t', 'f'])]
+        if ids:
+            src_domain.append(('id', 'not in', ids))
+        if self.search(cr, uid, src_domain, limit=1, order='NO_ORDER', context=context):
+            raise osv.except_osv(
+                _('Error'),
+                _('''Another Automated import with same functionality already exists (maybe inactive). Only one
+automated import must be created for a same functionality. Please select an other functionality.'''),
+            )
+
+        return True
+
+    def job_in_progress(self, cr, uid, ids, context=None):
+        """
+        Check if there is job in progress for this automated import.
+        :param cr: Cursor to the database
+        :param uid: ID of the res.users that calls the method
+        :param ids: List of ID of automated.import on which the test is made
+        :param context: Context of the call
+        :return: Return True if there are jobs in progress
+        """
+        job_progress_obj = self.pool.get('automated.import.job.progress')
+
+        if context is None:
+            context = {}
+
+        if isinstance(ids, (int, long)):
+            ids = [ids]
+
+        # Use uid=1 to avoid return of only osv.memory that belongs to the current user
+        return job_progress_obj.search(cr, 1, [('import_id', 'in', ids)], limit=1, context=context)
+
+    def path_is_accessible(self, path, mode='r'):
+        """
+        Returns if the given path is accessible in the given mode
+        :param path: Local path to test
+        :param mode: Mode to test (can be 'r' for read, 'w' for write)
+        :return: True if the path is accessible or the error if not
+        """
+        msg = None
+        if not os.access(path, os.F_OK):
+            msg = _('Path \'%s\' doesn\'t exist!') % path
+        elif 'r' in mode and not os.access(path, os.R_OK):
+            msg =  _('Read is not allowed on \'%s\'!') % path
+        elif 'w' in mode and not os.access(path, os.W_OK):
+            msg = _('Write is not allowed on \'%s\'!') % path
+
+        if msg:
+            raise osv.except_osv(_('Error'), msg)
+
+        return True
+
+    def run_job_manually(self, cr, uid, ids, context=None, params=None):
+        """
+        Create a new job with automated import parameters and display a view
+        to add a file to import. Then, run it if user clicks on Run or delete
+        it if user clicks on Cancel
+        :param cr: Cursor to the database
+        :param uid: ID of the res.users that calls this method
+        :param ids: List of ID of automated.import that must be ran
+        :param context: Context of the call
+        :param params: Manual parameters in case of manual customized run
+        :return: An action to go to the view of automated.import.job to add a file to import
+        """
+        job_obj = self.pool.get('automated.import.job')
+        data_obj = self.pool.get('ir.model.data')
+
+        if context is None:
+            context = {}
+
+        if isinstance(ids, (int, long)):
+            ids = [ids]
+
+        if params is None:
+            params = {}
+
+        for import_brw in self.browse(cr, uid, ids, context=context):
+            if not import_brw.src_path or not import_brw.dest_path or not import_brw.report_path:
+                raise osv.except_osv(
+                    _('Error'),
+                    _('You should define all paths before run manually this job !'),
+                )
+            params = {
+                'import_id': import_brw.id,
+                'state': 'draft',
+            }
+            job_id = job_obj.create(cr, uid, params, context=context)
+
+        return {
+            'type': 'ir.actions.act_window',
+            'res_model': job_obj._name,
+            'res_id': job_id,
+            'view_type': 'form',
+            'view_mode': 'form',
+            'view_id': [data_obj.get_object_reference(cr, uid, 'msf_tools', 'automated_import_job_file_view')[1]],
+            'target': 'new',
+            'context': context,
+        }
+
+
+    def run_job(self, cr, uid, ids, context=None, params=None):
+        """
+        Create a new job with automated import parameters and run it
+        :param cr: Cursor to the database
+        :param uid: ID of the res.users that calls this method
+        :param ids: List of ID of automated.import that must be ran
+        :param context: Context of the call
+        :param params: Manual parameters in case of manual customized run
+        :return: An action to go to the view of automated.import.job
+        """
+        job_obj = self.pool.get('automated.import.job')
+
+        if context is None:
+            context = {}
+
+        if isinstance(ids, (int, long)):
+            ids = [ids]
+
+        if params is None:
+            params = {}
+
+        for import_id in ids:
+            params = {
+                'import_id': import_id,
+                'state': 'in_progress',
+            }
+            job_id = job_obj.create(cr, uid, params, context=context)
+            cr.commit()
+            res = job_obj.process_import(cr, uid, [job_id], context=context)
+            cr.commit()
+
+        return res
+
+    def _generate_ir_cron(self, import_brw):
+        """
+        Returns the values for the ir.cron to create according to automated.import values
+        :param import_brw: automated.import browse_record
+        :return: A dictionary with values for ir.cron
+        """
+        # If no interval defined, stop the scheduled action
+        numbercall = -1
+        if not import_brw.interval:
+            numbercall = 0
+
+        return {
+            'name': _('[Automated import] %s') % import_brw.name,
+            'user_id': 1,
+            'active': import_brw.active,
+            'interval_number': import_brw.interval,
+            'interval_type': import_brw.interval_unit,
+            'numbercall': numbercall,
+            'nextcall': import_brw.start_time or time.strftime('%Y-%m-%d %H:%M:%S'),
+            'model': self._name,
+            'function': 'run_job',
+            'args': '(%s,)' % import_brw.id,
+            'priority': import_brw.priority,
+        }
+
+    def create(self, cr, uid, vals, context=None):
+        """
+        Create the automated.import record.
+        Make some checks (uniqueness of name, uniqueness of functionality...)
+        Create an ir_cron record and linked it to the new automated.import
+        :param cr: Cursor to the database
+        :param uid: ID of the res.users that calls the method
+        :param vals: Values for the new automated.import record
+        :param context: Context of the call
+        :return: The ID of the new automated.import created record
+        """
+        cron_obj = self.pool.get('ir.cron')
+
+        if context is None:
+            context = {}
+
+        # Make some checks
+        if vals.get('name', False):
+            self.unique_import_by_name(cr, uid, vals.get('name', False), context=context)
+
+        if vals.get('function_id', False):
+            self.unique_import_by_function(cr, uid, vals.get('function_id', False), context=context)
+
+        for path in [('src_path', 'r'), ('dest_path', 'w'), ('report_path', 'w')]:
+            if vals.get(path[0]):
+                self.path_is_accessible(vals.get(path[0]), path[1])
+
+        src_path = vals.get('src_path')
+        dest_path = vals.get('dest_path')
+        report_path = vals.get('report_path')
+        if src_path:
+            if src_path == dest_path:
+                raise osv.except_osv(
+                    _('Error'),
+                    _('You cannot have same directory for \'Source Path\' and \'Destination Path\''),
+                )
+            if src_path == report_path:
+                raise osv.except_osv(
+                    _('Error'),
+                    _('You cannot have same directory for \'Source Path\' and \'Report Path\''),
+                )
+
+        if vals.get('active') and not (src_path and dest_path and report_path):
+            raise osv.except_osv(
+                _('Error'),
+                _('Before activation, the different paths should be set.')
+            )
+
+        if vals.get('interval', 0.00) < 0:
+            raise osv.except_osv(
+                _('Error'),
+                _('Interval number cannot be negative !'),
+            )
+
+        # Call the super create
+        new_id = super(automated_import, self).create(cr, uid, vals, context=context)
+
+        # Generate new ir.cron
+        import_brw = self.browse(cr, uid, new_id, context=context)
+        cron_id = cron_obj.create(cr, uid, self._generate_ir_cron(import_brw), context=context)
+        self.write(cr, uid, [new_id], {'cron_id': cron_id}, context=context)
+
+        return new_id
+
+    def write(self, cr, uid, ids, vals, context=None):
+        """
+        Make some checks on new values (uniqueness of name, uniqueness of functionality...)
+        Update the ir_cron
+        Write new values on existing automated.import records
+        :param cr: Cursor to the database
+        :param uid: ID of the res.users that calls the method
+        :param ids: List of ID of automated.import records to write
+        :param vals: Values for the new automated.import record
+        :param context: Context of the call
+        :return: True
+        """
+        cron_obj = self.pool.get('ir.cron')
+
+        if context is None:
+            context = {}
+
+        if isinstance(ids, (int, long)):
+            ids = [ids]
+
+        # Make some checks
+        if vals.get('name', False):
+            self.unique_import_by_name(cr, uid, vals.get('name', False), ids, context=context)
+
+        if vals.get('function_id', False):
+            self.unique_import_by_function(cr, uid, vals.get('function_id', False), ids, context=context)
+
+        if vals.get('interval', 0.00) < 0:
+            raise osv.except_osv(
+                _('Error'),
+                _('Interval number cannot be negative !'),
+            )
+
+        res = super(automated_import, self).write(cr, uid, ids, vals, context=context)
+
+        for import_brw in self.browse(cr, uid, ids, context=context):
+            for path in [('src_path', 'r'), ('dest_path', 'w'), ('report_path', 'w')]:
+                if vals.get(path[0], import_brw[path[0]]):
+                    self.path_is_accessible(vals.get(path[0], import_brw[path[0]]), path[1])
+
+            src_path = vals.get('src_path', import_brw.src_path)
+            dest_path = vals.get('dest_path', import_brw.dest_path)
+            report_path = vals.get('report_path', import_brw.report_path)
+            if src_path:
+                if src_path == dest_path:
+                    raise osv.except_osv(
+                        _('Error'),
+                        _('You cannot have same directory for \'Source Path\' and \'Destination Path\''),
+                    )
+                if src_path == report_path:
+                    raise osv.except_osv(
+                        _('Error'),
+                        _('You cannot have same directory for \'Source Path\' and \'Report Path\''),
+                    )
+
+            if vals.get('active', import_brw.active) and not (src_path and dest_path and report_path):
+                raise osv.except_osv(
+                    _('Error'),
+                    _('Before activation, the different paths should be set.')
+                )
+
+            cron_vals = self._generate_ir_cron(import_brw)
+            if import_brw.cron_id:
+                cron_obj.write(cr, uid, [import_brw.cron_id.id], cron_vals, context=context)
+            elif not vals.get('cron_id', False):
+                cron_id = cron_obj.create(cr, uid, cron_vals, context=context)
+                self.write(cr, uid, [import_brw.id], {'cron_id': cron_id}, context=context)
+
+        return res
+
+    def unlink(self, cr, uid, ids, context=None):
+        """
+        Delete the associated ir_cron
+        :param cr: Cursor to the database
+        :param uid: ID of the res.users that calls this method
+        :param ids: List of automated.import ID to remove
+        :param context: Context of the call
+        :return: True
+        """
+        cron_obj = self.pool.get('ir.cron')
+        job_obj = self.pool.get('automated.import.job')
+
+        if context is None:
+            context = {}
+
+        if isinstance(ids, (int, long)):
+            ids = [ids]
+
+        if job_obj.search(cr, uid, [('import_id', 'in', ids)], limit=1, order='NO_ORDER', context=context):
+            raise osv.except_osv(
+                _('Error'),
+                _('Please delete the automated import jobs that are linked to the Automatic import you try to delete!'),
+            )
+
+        for import_brw in self.browse(cr, uid, ids, context=context):
+            if import_brw.cron_id:
+                cron_obj.unlink(cr, uid, [import_brw.cron_id.id], context=context)
+
+        return super(automated_import, self).unlink(cr, uid, ids, context=context)
+
+    def copy(self, cr, uid, import_id, new_vals=None, context=None):
+        """
+        Display an error on copy as copy is not allowed on automated.import
+        :param cr: Cursor to the database
+        :param uid: ID of the res.users that calls this method
+        :param import_id: ID of the automated.import to copy
+        :param new_vals: Default values for the new automated.import record
+        :param context: Context of the call
+        :return: The ID of the new automated.import record
+        """
+        raise osv.except_osv(
+            _('Error'),
+            _('Copy is not allowed for Automated imports!'),
+        )
+
+    def active_import(self, cr, uid, ids, context=None):
+        """
+        Make the automated.import as active
+        :param cr: Cursor to the database
+        :param uid: ID of the res.users that calls this method
+        :param ids: List of ID of automated.import to activate
+        :param context: Context of the call
+        :return: True
+        """
+        if context is None:
+            context = {}
+
+        if isinstance(ids, (int, long)):
+            ids = [ids]
+
+        return self.write(cr, uid, ids, {'active': True}, context=context)
+
+    def deactive_import(self, cr, uid, ids, context=None):
+        """
+        Make the automated.import as inactive
+        :param cr: Cursor to the database
+        :param uid: ID of the res.users that calls this method
+        :param ids: List of ID of automated.import to activate
+        :param context: Context of the call
+        :return: True
+        """
+        if context is None:
+            context = {}
+
+        if isinstance(ids, (int, long)):
+            ids = [ids]
+
+        return self.write(cr, uid, ids, {'active': False}, context=context)
+
+automated_import()
 
=== added file 'bin/addons/msf_tools/automated_import_data.xml'
--- bin/addons/msf_tools/automated_import_data.xml	1970-01-01 00:00:00 +0000
+++ bin/addons/msf_tools/automated_import_data.xml	2016-05-24 07:58:03 +0000
@@ -0,0 +1,102 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<openerp>
+    <data>
+
+        <record id="auto_import_fnct_res_partner" model="automated.import.function">
+            <field name="name">Import Suppliers</field>
+            <field name="model_id" model="ir.model" search="[('model', '=', 'res.partner')]" />
+            <field name="method_to_call">import_data_from_csv</field>
+        </record>
+
+        <record id="auto_import_fnct_account_account" model="automated.import.function">
+            <field name="name">Import G/L Accounts</field>
+            <field name="model_id" model="ir.model" search="[('model', '=', 'account.account')]" />
+            <field name="method_to_call">import_data_from_csv</field>
+        </record>
+
+        <record id="auto_import_fnct_account_journal" model="automated.import.function">
+            <field name="name">Import G/L Journals</field>
+            <field name="model_id" model="ir.model" search="[('model', '=', 'account.journal')]" />
+            <field name="method_to_call">import_data_from_csv</field>
+        </record>
+
+        <record id="auto_import_fnct_analytic_account" model="automated.import.function">
+            <field name="name">Import Analytic Accounts</field>
+            <field name="model_id" model="ir.model" search="[('model', '=', 'account.analytic.account')]" />
+            <field name="method_to_call">import_data_from_csv</field>
+        </record>
+
+        <record id="auto_import_fnct_analytic_journal" model="automated.import.function">
+            <field name="name">Import Analytic Journals</field>
+            <field name="model_id" model="ir.model" search="[('model', '=', 'account.analytic.journal')]" />
+            <field name="method_to_call">import_data_from_csv</field>
+        </record>
+
+        <record id="auto_import_fnct_destination_account" model="automated.import.function">
+            <field name="name">Import Links between destinations and GL accounts</field>
+            <field name="model_id" model="ir.model" search="[('model', '=', 'account.analytic.account')]" />
+            <field name="method_to_call">import_data_from_csv</field>
+        </record>
+
+        <record id="auto_import_fnct_sync_product_nomenclature" model="automated.import.function">
+            <field name="name">Import Product Nomenclatures</field>
+            <field name="model_id" model="ir.model" search="[('model', '=', 'product.nomenclature')]" />
+            <field name="method_to_call">import_data_with_wizard</field>
+        </record>
+
+        <record id="auto_import_fnct_product_categories" model="automated.import.function">
+            <field name="name">Import Product Categories</field>
+            <field name="model_id" model="ir.model" search="[('model', '=', 'product.category')]" />
+            <field name="method_to_call">import_data_with_wizard</field>
+        </record>
+
+        <record id="auto_import_fnct_employee" model="automated.import.function">
+            <field name="name">Import Employees</field>
+            <field name="model_id" model="ir.model" search="[('model', '=', 'hr.employee')]" />
+            <field name="method_to_call">auto_import</field>
+        </record>
+
+        <record id="auto_import_fnct_product" model="automated.import.function">
+            <field name="name">Import Products</field>
+            <field name="model_id" model="ir.model" search="[('model', '=', 'product.product')]" />
+            <field name="method_to_call">import_data_with_wizard</field>
+        </record>
+
+        <record id="auto_import_fnct_access_control_list" model="automated.import.function">
+            <field name="name">Import Access Control Lists</field>
+            <field name="model_id" model="ir.model" search="[('model', '=', 'ir.model.access')]" />
+            <field name="method_to_call">import_data_from_csv</field>
+        </record>
+
+        <record id="auto_import_fnct_record_rules" model="automated.import.function">
+            <field name="name">Import Record Rules</field>
+            <field name="model_id" model="ir.model" search="[('model', '=', 'ir.rule')]" />
+            <field name="method_to_call">import_data_from_csv</field>
+        </record>
+
+        <record id="auto_import_fnct_window_actions" model="automated.import.function">
+            <field name="name">Import Window Actions</field>
+            <field name="model_id" model="ir.model" search="[('model', '=', 'ir.actions.act_window')]" />
+            <field name="method_to_call">import_data_from_csv</field>
+        </record>
+
+        <record id="auto_import_fnct_field_access_rule" model="automated.import.function">
+            <field name="name">Import Field Access Rules</field>
+            <field name="model_id" model="ir.model" search="[('model', '=', 'msf_field_access_rights.field_access_rule')]" />
+            <field name="method_to_call">import_data_from_csv</field>
+        </record>
+
+        <record id="auto_import_fnct_field_access_rule_lines" model="automated.import.function">
+            <field name="name">Import Field Access Rule Lines</field>
+            <field name="model_id" model="ir.model" search="[('model', '=', 'msf_field_access_rights.field_access_rule_line')]" />
+            <field name="method_to_call">import_data_from_csv</field>
+        </record>
+
+        <record id="auto_import_fnct_button_access_rules" model="automated.import.function">
+            <field name="name">Import Button Access Rules</field>
+            <field name="model_id" model="ir.model" search="[('model', '=', 'msf_button_access_rights.button_access_rule')]" />
+            <field name="method_to_call">import_data_from_csv</field>
+        </record>
+
+    </data>
+</openerp>
 
=== added file 'bin/addons/msf_tools/automated_import_function.py'
--- bin/addons/msf_tools/automated_import_function.py	1970-01-01 00:00:00 +0000
+++ bin/addons/msf_tools/automated_import_function.py	2016-05-24 07:58:03 +0000
@@ -0,0 +1,107 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2016 TeMPO Consulting, MSF
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    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 automated_import_function(osv.osv):
+    _name = 'automated.import.function'
+
+    _columns = {
+        'name': fields.char(
+            size=64,
+            string='Name',
+            required=True,
+        ),
+        'model_id': fields.many2one(
+            'ir.model',
+            string='Model',
+            required=True,
+        ),
+        'method_to_call': fields.char(
+            size=128,
+            string='Method to call',
+            required=True,
+        ),
+    }
+
+    _defaults = {
+        'method_to_call': lambda *a: 'import_data_from_csv',
+    }
+
+    def check_method_to_call(self, cr, uid, model_id, method):
+        """
+        Check if the model implements the method
+        :param cr: Cursor to the database
+        :param uid: ID of the res.users that calls the method
+        :param model: ID of ir.model
+        :param method: method name
+        :return: Return True or False
+        """
+        model = self.pool.get('ir.model').browse(cr, uid, model_id)
+        if not hasattr(self.pool.get(model.model), method):
+            raise osv.except_osv(
+                _('Error'),
+                _('The method \'%s\' of the model \'%s\' is not callable') % (model.model, method),
+            )
+        return True
+
+    def create(self, cr, uid, vals, context=None):
+        """
+        Run the check on method to call before create the new record
+        :param cr: Cursor to the database
+        :param uid: ID of the res.users that calls this method
+        :param vals: Values to put on the new record
+        :param context: Context of the call
+        :return: ID of the new automated.import.function
+        """
+        if vals.get('model_id') and vals.get('method_to_call'):
+            self.check_method_to_call(cr, uid, vals.get('model_id'), vals.get('method_to_call'))
+
+        return super(automated_import_function, self).create(cr, uid, vals, context=context)
+
+    def write(self, cr, uid, ids, vals, context=None):
+        """
+        Run the check on method to call before update the record(s)
+        :param cr: Cursor to the database
+        :param uid: ID of the res.users that calls this method
+        :param ids: List of ID of automated.import.function record to update
+        :param vals: Values to put on the new record
+        :param context: Context of the call
+        :return: True
+        """
+        if isinstance(ids, (int, long)):
+            ids = [ids]
+
+        if vals.get('model_id') and vals.get('method_to_call'):
+            self.check_method_to_call(cr, uid, vals.get('model_id'), vals.get('method_to_call'))
+        elif vals.get('model_id') or vals.get('method_to_call'):
+            for rec in self.browse(cr, uid, ids, context=context):
+                model = vals.get('model_id', rec.model_id)
+                func = vals.get('method_to_call', rec.method_to_call)
+                self.check_method_to_call(cr, uid, model, func)
+
+        return super(automated_import_function, self).write(cr, uid, ids, vals, context=context)
+
+automated_import_function()
 \ No newline at end of file
 
=== added file 'bin/addons/msf_tools/automated_import_job.py'
--- bin/addons/msf_tools/automated_import_job.py	1970-01-01 00:00:00 +0000
+++ bin/addons/msf_tools/automated_import_job.py	2016-05-24 07:58:03 +0000
@@ -0,0 +1,366 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2016 TeMPO Consulting, MSF
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    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/>.
+#
+##############################################################################
+
+import os
+import csv
+import time
+import shutil
+import base64
+import hashlib
+
+from osv import osv
+from osv import fields
+
+from tools.translate import _
+
+
+def all_files_under(path):
+    """
+    Iterates through all files that are under the given path.
+    :param path: Path on which we want to iterate
+    """
+    for cur_path, dirnames, filenames in os.walk(path):
+        for filename in filenames:
+            yield os.path.join(cur_path, filename)
+
+
+def move_to_process_path(file, src_path, dest_path):
+    """
+    Move the file `file` from `src_path` to `dest_path`
+    :param file: Name of the file to move
+    :param src_path: Source folder
+    :param dest_path: Destination folder
+    :return: return True
+    """
+    srcname = os.path.join(src_path, file)
+    renamed = os.path.join(dest_path, '%s_%s' % (time.strftime('%Y%m%d_%H%M%S'), file))
+    shutil.move(srcname, renamed)
+    return True
+
+
+class automated_import_job(osv.osv):
+    _name = 'automated.import.job'
+
+    def _get_name(self, cr, uid, ids, field_name, args, context=None):
+        """
+        Build the name of the job by using the function_id and the date and time
+        :param cr: Cursor to the database
+        :param uid: ID of the res.users that calls this issue
+        :param ids: List of ID of automated.import.job to compute name
+        :param field_name: The name of the field to compute (here: name)
+        :param args: Additional parameters
+        :param context: Context of the call
+        :return: A dictionnary with automated.import.job ID as key and computed name as value
+        """
+        if context is None:
+            context = {}
+
+        if isinstance(ids, (int, long)):
+            ids = [ids]
+
+        res = {}
+        for job in self.browse(cr, uid, ids, context=context):
+            res[job.id] = '%s - %s' % (job.import_id.function_id.name, job.start_time or _('Not started'))
+
+        return res
+
+    _columns = {
+        'name': fields.function(
+            _get_name,
+            method=True,
+            type='char',
+            size=128,
+            string='Name',
+            store=True,
+        ),
+        'import_id': fields.many2one(
+            'automated.import',
+            string='Automated import',
+            required=True,
+            readonly=True,
+        ),
+        'file_to_import': fields.binary(
+            string='File to import',
+        ),
+        'filename': fields.char(
+            size=128,
+            string='Name of the file to import',
+        ),
+        'file_sum': fields.char(
+            string='Check sum',
+            size=256,
+            readonly=True,
+        ),
+        'start_time': fields.datetime(
+            string='Start time',
+            readonly=True,
+        ),
+        'end_time': fields.datetime(
+            string='End time',
+            readonly=True,
+        ),
+        'nb_processed_records': fields.integer(
+            string='# of processed records',
+            readonly=True,
+        ),
+        'nb_rejected_records': fields.integer(
+            string='# of rejected records',
+            readonly=True,
+        ),
+        'comment': fields.text(
+            string='Comment',
+            readonly=True,
+        ),
+        'state': fields.selection(
+            selection=[
+                ('draft', 'Draft'),
+                ('in_progress', 'In progress'),
+                ('done', 'Done'),
+                ('error', 'Exception'),
+            ],
+            string='State',
+            readonly=True,
+            required=True,
+        ),
+    }
+
+    _defaults = {
+        'state': lambda *a: 'draft',
+    }
+
+    def process_import(self, cr, uid, ids, context=None):
+        """
+        First, browse the source path, then select the oldest file and run import on this file.
+        After the processing of import, generate a report and move the processed file to the
+        processed folder.
+        :param cr: Cursor to the database
+        :param uid: ID of the res.users that calls this method
+        :param ids: List of ID of automated.import.job to process
+        :param context: Context of the call
+        :return: True
+        """
+        import_obj = self.pool.get('automated.import')
+        data_obj = self.pool.get('ir.model.data')
+
+        if context is None:
+            context = []
+
+        if isinstance(ids, (int, long)):
+            ids = [ids]
+
+        for job in self.browse(cr, uid, ids, context=context):
+            nb_rejected = 0
+            nb_processed = 0
+            start_time = time.strftime('%Y-%m-%d %H:%M:%S')
+            no_file = False
+            md5 = False
+            error = None
+            data64 = None
+            filename = False
+
+            try:
+                for path in [('src_path', 'r'), ('dest_path', 'w'), ('report_path', 'w')]:
+                    import_obj.path_is_accessible(job.import_id[path[0]], path[1])
+            except osv.except_osv as e:
+                error = str(e)
+                # In case of manual processing, raise the error
+                if job.file_to_import:
+                    raise e
+
+            if not job.file_to_import:
+                try:
+                    oldest_file = min(all_files_under(job.import_id.src_path), key=os.path.getmtime)
+                    filename = os.path.split(oldest_file)[1]
+                    md5 = hashlib.md5(open(oldest_file).read()).hexdigest()
+                    data64 = base64.encodestring(open(oldest_file).read())
+                except ValueError:
+                    no_file = True
+
+                if not error:
+                    if no_file:
+                        error = _('No file to import in %s !') % job.import_id.src_path
+                    elif md5 and self.search(cr, uid, [('import_id', '=', job.import_id.id), ('file_sum', '=', md5)], limit=1, order='NO_ORDER', context=context):
+                        error = _('A file with same checksum has been already imported !')
+                        move_to_process_path(filename, job.import_id.src_path, job.import_id.dest_path)
+
+                if error:
+                    self.write(cr, uid, [job.id], {
+                        'filename': filename,
+                        'file_to_import': data64,
+                        'start_time': start_time,
+                        'end_time': time.strftime('%Y-%m-%d'),
+                        'nb_processed_records': 0,
+                        'nb_rejected_records': 0,
+                        'comment': error,
+                        'file_sum': md5,
+                        'state': 'error',
+                    }, context=context)
+                    continue
+            else:
+                oldest_file = open(os.path.join(job.import_id.src_path, job.filename), 'wb+')
+                oldest_file.write(base64.decodestring(job.file_to_import))
+                oldest_file.close()
+                md5 = hashlib.md5(job.file_to_import).hexdigest()
+
+                if job.file_sum != md5:
+                    if self.search(cr, uid, [('file_sum', '=', md5), ('id', '!=', job.id)], limit=1, order='NO_ORDER', context=context):
+                        self.write(cr, uid, [job.id], {'file_sum': md5}, context=context)
+                        return {
+                            'type': 'ir.actions.act_window',
+                            'res_model': self._name,
+                            'res_id': ids[0],
+                            'view_type': 'form',
+                            'view_mode': 'form,tree',
+                            'target': 'new',
+                            'view_id': [data_obj.get_object_reference(cr, uid, 'msf_tools', 'automated_import_job_file_view')[1]],
+                            'context': context,
+                        }
+
+                oldest_file = os.path.join(job.import_id.src_path, job.filename)
+                filename = job.filename
+                data64 = base64.encodestring(job.file_to_import)
+
+            # Process import
+            try:
+                processed, rejected, headers = getattr(
+                    self.pool.get(job.import_id.function_id.model_id.model),
+                    job.import_id.function_id.method_to_call
+                )(cr, uid, oldest_file)
+                if processed:
+                    nb_processed = self.generate_file_report(cr, uid, job, processed, headers)
+
+                if rejected:
+                    nb_rejected = self.generate_file_report(cr, uid, job, rejected, headers, rejected=True)
+
+                self.write(cr, uid, [job.id], {
+                    'filename': filename,
+                    'start_time': start_time,
+                    'end_time': time.strftime('%Y-%m-%d %H:%M:%S'),
+                    'nb_processed_records': nb_processed,
+                    'nb_rejected_records': nb_rejected,
+                    'file_sum': md5,
+                    'file_to_import': data64,
+                    'state': 'done',
+                }, context=context)
+            except Exception as e:
+                self.write(cr, uid, [job.id], {
+                    'filename': False,
+                    'start_time': start_time,
+                    'end_time': time.strftime('%Y-%m-%d'),
+                    'nb_processed_records': 0,
+                    'nb_rejected_records': 0,
+                    'comment': str(e),
+                    'file_sum': md5,
+                    'file_to_import': data64,
+                    'state': 'error',
+                }, context=context)
+            finally:
+                move_to_process_path(filename, job.import_id.src_path, job.import_id.dest_path)
+
+        return {
+            'type': 'ir.actions.act_window',
+            'res_model': self._name,
+            'res_id': ids[0],
+            'view_type': 'form',
+            'view_mode': 'form,tree',
+            'target': 'current',
+            'context': context,
+        }
+
+
+    def generate_file_report(self, cr, uid, job_brw, data_lines, headers, rejected=False):
+        """
+        Create a csv file that contains the processed lines and put this csv file
+        on the report_path directory and attach it to the automated.import.job.
+        :param cr: Cursor to the database
+        :param uid: ID of the res.users that calls this method
+        :param job_brw: browse_record of the automated.import.job that need a report
+        :param data_lines: List of tuple containing the line index and the line data
+        :param headers: List of field names in the file
+        :param rejected: If true, the data_lines tuple is composed of 3 members, else, composed of 2 members
+        :return: # of lines in file
+        """
+        att_obj = self.pool.get('ir.attachment')
+
+        filename = '%s_%s_%s.csv' % (
+            time.strftime('%Y%m%d_%H%M%S'),
+            job_brw.import_id.function_id.model_id.model,
+            rejected and 'rejected' or 'processed'
+        )
+        pth_filename = os.path.join(job_brw.import_id.report_path, filename)
+        delimiter = ','
+        quotechar = '"'
+
+        with open(pth_filename, 'wb') as csvfile:
+            spamwriter = csv.writer(csvfile, delimiter=delimiter, quotechar=quotechar, quoting=csv.QUOTE_MINIMAL)
+            headers_row = [_('Line number')] + headers
+            if rejected:
+                headers_row += [_('Error')]
+            spamwriter.writerow(headers_row)
+            for pl in data_lines:
+                pl_row = [pl[0]] + pl[1]
+                if rejected:
+                    pl_row += [pl[2]]
+                spamwriter.writerow(pl_row)
+
+        csvfile = open(pth_filename, 'r')
+        att_obj.create(cr, uid, {
+            'name': filename,
+            'datas_fname': filename,
+            'description': '%s Lines' % (rejected and _('Rejected') or _('Processed')),
+            'res_model': 'automated.import.job',
+            'res_id': job_brw.id,
+            'datas': base64.encodestring(csvfile.read())
+        })
+
+        return len(data_lines)
+
+    def cancel_file_import(self, cr, uid, ids, context=None):
+        """
+        Delete the automated.import.job and close the wizard.
+        :param cr: Cursor to the database
+        :param uid: ID of the res.users that calls this method
+        :param ids: List of automated.import.job to delete
+        :param context: Context of the call
+        :return: The action to close the wizard
+        """
+        self.unlink(cr, uid, ids, context=context)
+        return {'type': 'ir.actions.act_window_close'}
+
+automated_import_job()
+
+
+class automated_import_job_progress(osv.osv_memory):
+    _name = 'automated.import.job.progress'
+
+    _columns = {
+        'job_id': fields.many2one(
+            'automated.import.job',
+            string='Import job',
+            required=True,
+        ),
+        'import_id': fields.related(
+            'automated.import',
+            string='Import',
+        ),
+    }
+
+automated_import_job_progress()
 
=== modified file 'bin/addons/msf_tools/msf_tools.py'
--- bin/addons/msf_tools/msf_tools.py	2016-04-11 08:10:35 +0000
+++ bin/addons/msf_tools/msf_tools.py	2016-05-24 07:58:03 +0000
@@ -624,10 +624,7 @@
         tr_split = name.split(',')
         res_id = self.pool.get('ir.model.data').find_sd_ref(cr, 1, sdref, field='res_id', context=context)
         if res_id and tr_split[0] == 'product.template':
-            prod = self.pool.get('product.product').read(cr, 1, [res_id], ['product_tmpl_id'], context=context)
-            if not prod:
-                return False
-            prod = prod[0]
+            prod = self.pool.get('product.product').read(cr, 1, [res_id], ['product_tmpl_id'], context=context)[0]
             if prod['product_tmpl_id']:
                 return prod['product_tmpl_id'][0]
         return res_id
 
=== added directory 'bin/addons/msf_tools/views'
=== added file 'bin/addons/msf_tools/views/automated_import_function_view.xml'
--- bin/addons/msf_tools/views/automated_import_function_view.xml	1970-01-01 00:00:00 +0000
+++ bin/addons/msf_tools/views/automated_import_function_view.xml	2016-05-24 07:58:03 +0000
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<openerp>
+    <data>
+
+        <record id="automated_import_function_search_view" model="ir.ui.view">
+            <field name="name">automated.import.function.search.view</field>
+            <field name="model">automated.import.function</field>
+            <field name="type">search</field>
+            <field name="arch" type="xml">
+                <search string="Automated import functions">
+                    <field name="name" />
+                    <field name="model_id" />
+                    <field name="method_to_call" />
+                </search>
+            </field>
+        </record>
+
+        <record id="automated_import_function_tree_view" model="ir.ui.view">
+            <field name="name">automated.import.function.tree.view</field>
+            <field name="model">automated.import.function</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="Automated import functions">
+                    <field name="name" />
+                    <field name="model_id" />
+                    <field name="method_to_call" />
+                </tree>
+            </field>
+        </record>
+
+        <record id="automated_import_function_form_view" model="ir.ui.view">
+            <field name="name">automated.import.function.form.view</field>
+            <field name="model">automated.import.function</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Automated import function">
+                    <field name="name" />
+                    <newline />
+                    <field name="model_id" />
+                    <field name="method_to_call" />
+                </form>
+            </field>
+        </record>
+
+        <record id="automated_import_function_action" model="ir.actions.act_window">
+            <field name="name">Automated import functions</field>
+            <field name="res_model">automated.import.function</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+        </record>
+
+        <menuitem
+            id="automated_import_function_menu"
+            action="automated_import_function_action"
+            parent="automated_import_menu" />
+
+    </data>
+</openerp>
 \ No newline at end of file
 
=== added file 'bin/addons/msf_tools/views/automated_import_job_view.xml'
--- bin/addons/msf_tools/views/automated_import_job_view.xml	1970-01-01 00:00:00 +0000
+++ bin/addons/msf_tools/views/automated_import_job_view.xml	2016-05-24 07:58:03 +0000
@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<openerp>
+    <data>
+
+        <record id="automated_import_job_search_view" model="ir.ui.view">
+            <field name="name">automated.import.job.search.view</field>
+            <field name="model">automated.import.job</field>
+            <field name="type">search</field>
+            <field name="arch" type="xml">
+                <search string="Import job requests">
+                    <filter icon="terp-document-new" string="Draft" name="draft" domain="[('state', '=', 'draft')]" help="Draft jobs" /> 
+                    <filter icon="terp-gnome-cpu-frequency-applet+" string="In progress" name="in_progress" domain="[('state', '=', 'in_progress')]" help="In progress jobs" /> 
+                    <filter icon="terp-dialog-close" string="Done" name="done" domain="[('state', '=', 'done')]" help="Done jobs" /> 
+                    <filter icon="terp-emblem-important" string="Exception" name="exceptions" domain="[('state', '=', 'error')]" help="Jobs with error" /> 
+                    <separator orientation="vertical" />
+                    <field name="import_id" />
+                    <field name="start_time" />
+                    <field name="end_time" />
+                </search>
+            </field>
+        </record>
+
+        <record id="automated_import_job_tree_view" model="ir.ui.view">
+            <field name="name">automated.import.job.tree.view</field>
+            <field name="model">automated.import.job</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="Import job reports" noteditable="True" hide_new_button="True">
+                    <field name="import_id" />
+                    <field name="start_time" />
+                    <field name="end_time" />
+                    <field name="state" />
+                </tree>
+            </field>
+        </record>
+
+        <record id="automated_import_job_form_view" model="ir.ui.view">
+            <field name="name">automated.import.job.form.view</field>
+            <field name="model">automated.import.job</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Import job report">
+                    <field name="import_id" />
+                    <field name="start_time" />
+                    <field name="end_time" />
+                    <separator colspan="4" string="Import file" />
+                    <field name="file_to_import" readonly="True" filename="filename" />
+                    <field name="filename" invisible="1" />
+                    <separator colspan="4" string="Import results" />
+                    <field name="nb_processed_records" />
+                    <field name="nb_rejected_records" />
+                    <field name="comment" colspan="4" />
+                    <separator colspan="4" string="States" />
+                    <field name="state" />
+                    <button name="process_import" type="object" states="draft" string="Process import" icon="gtk-execute" />
+                </form>
+            </field>
+        </record>
+
+        <record id="automated_import_job_file_view" model="ir.ui.view">
+            <field name="name">automated.import.job.file.view</field>
+            <field name="model">automated.import.job</field>
+            <field name="type">form</field>
+            <field name="priority" eval="99" />
+            <field name="arch" type="xml">
+                <form string="Automated import job">
+                    <field name="file_sum" invisible="1" />
+                    <separator colspan="4" string="Import file" />
+                    <group colspan="4" attrs="{'invisible': [('file_sum', '!=', False)]}">
+                        <html>
+                            <style>
+                                #explanation_message_unifield div
+                                {
+                                    font-weight: bold;
+                                    font-size: 1.2em;
+                                }
+                            </style>
+                            <div id="explanation_message_unifield">
+                                <label colspan="4" string="If no file is selected, the system will try to get the oldest file in the source path." align="0.0" />
+                            </div>
+                        </html>
+                    </group>
+                    <group colspan="4" attrs="{'invisible': [('file_sum', '=', False)]}">
+                        <html>
+                            <style>
+                                #warning_message_unifield div
+                                {
+                                    font-weight: bold;
+                                    font-size: 1.2em;
+                                    color: red;
+                                }
+                            </style>
+                            <div id="warning_message_unifield">
+                                <label colspan="4" string="The file you selected has already been imported in the past. Are you sure you want to import it ?" align="0.0" />
+                            </div>
+                        </html>
+                    </group>
+                    <field name="file_to_import" filename="filename" />
+                    <field name="filename" invisible="1" />
+                    <separator colspan="4" string="Actions" />
+                    <button name="cancel_file_import" type="object" string="Cancel" icon="gtk-cancel" colspan="2" />
+                    <button name="process_import" type="object" string="Run job" icon="gtk-execute" colspan="2" />
+                </form>
+            </field>
+        </record>
+
+        <record id="automated_import_job_action" model="ir.actions.act_window">
+            <field name="name">Import job reports</field>
+            <field name="res_model">automated.import.job</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+        </record>
+
+        <menuitem
+            id="automated_import_job_menu"
+            action="automated_import_job_action"
+            parent="automated_import_menu" />
+
+    </data>
+</openerp>
 
=== added file 'bin/addons/msf_tools/views/automated_import_view.xml'
--- bin/addons/msf_tools/views/automated_import_view.xml	1970-01-01 00:00:00 +0000
+++ bin/addons/msf_tools/views/automated_import_view.xml	2016-05-24 07:58:03 +0000
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<openerp>
+    <data>
+
+        <record id="automated_import_search_view" model="ir.ui.view">
+            <field name="name">automated.import.search.view</field>
+            <field name="model">automated.import</field>
+            <field name="type">search</field>
+            <field name="arch" type="xml">
+                <search string="Automated imports">
+                    <filter name="active" domain="[('active', '=', False)]" string="Inactive" icon="gtk-undo" />
+                    <field name="name" />
+                    <field name="function_id" />
+                </search>
+            </field>
+        </record>
+
+        <record id="automated_import_tree_view" model="ir.ui.view">
+            <field name="name">automated.import.tree.view</field>
+            <field name="model">automated.import</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="Automated imports">
+                    <field name="name" />
+                    <field name="function_id" />
+                    <field name="start_time" />
+                    <field name="interval" />
+                    <field name="interval_unit" />
+                </tree>
+            </field>
+        </record>
+
+        <record id="automated_import_form_view" model="ir.ui.view">
+            <field name="name">automated.import.form.view</field>
+            <field name="model">automated.import</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Automated import">
+                    <separator colspan="4" string="General configuration" />
+                    <field name="name" />
+                    <field name="function_id" widget="selection" />
+                    <field name="active" />
+                    <button name="run_job_manually" string="Run job manually" colspan="2" type="object" icon="gtk-execute" />
+                    <separator colspan="4" string="Paths configuration" />
+                    <field name="src_path" colspan="4" attrs="{'required': [('active', '=', True)]}" />
+                    <field name="dest_path" colspan="4" attrs="{'required': [('active', '=', True)]}" />
+                    <field name="report_path" colspan="4" attrs="{'required': [('active', '=', True)]}" />
+                    <separator colspan="4" string="Scheduler configuration" />
+                    <group colspan="4" col="6">
+                        <field name="priority" />
+                        <field name="interval" attrs="{'required': [('interval_unit', '&gt;', 0)]}" />
+                        <field name="interval_unit" />
+                        <field name="start_time" />
+                    </group>
+                    <separator colspan="4" string="Activation" />
+                    <group colspan="4" col="1">
+                        <button name="active_import" string="Activate" colspan="1" type="object" icon="gtk-execute" attrs="{'invisible': [('active', '=', True)]}" />
+                        <button name="deactive_import" string="De-activate" colspan="1" type="object" icon="gtk-execute" attrs="{'invisible': [('active', '=', False)]}" />
+                    </group>
+                </form>
+            </field>
+        </record>
+
+        <record id="automated_import_action" model="ir.actions.act_window">
+            <field name="name">Automated imports</field>
+            <field name="res_model">automated.import</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+        </record>
+
+        <menuitem
+            id="automated_import_menu"
+            action="automated_import_action"
+            parent="object_query.menu_preferences" />
+
+    </data>
+</openerp>
 
=== modified file 'bin/addons/procurement_request/procurement_request.py'
--- bin/addons/procurement_request/procurement_request.py	2016-05-02 07:56:36 +0000
+++ bin/addons/procurement_request/procurement_request.py	2016-05-24 07:58:03 +0000
@@ -497,10 +497,8 @@
         self.write(cr, uid, ids, {'state': 'cancel'}, context=context)
         self.pool.get('sale.order.line').write(cr, uid, line_ids, {'state': 'cancel'}, context=context)
 
-        for ir in self.read(cr, uid, ids, ['name'], context=context):
-            self.infolog(cr, uid, "The IR id:%s (%s) has been canceled" % (
-                ir['id'], ir['name'],
-            ))
+        for ir_id in ids:
+            self.infolog(cr, uid, "The IR id:%s has been canceled" % ir_id)
 
         return True
 
@@ -539,9 +537,6 @@
             if nb_lines:
                 raise osv.except_osv(_('Error'), _('Please check the lines : you cannot have "To Be confirmed" for Nomenclature Level". You have %s lines to correct !') % nb_lines)
             self.log(cr, uid, req.id, _("The internal request '%s' has been validated (nb lines: %s).") % (req.name, len(req.order_line)), context=context)
-            self.infolog(cr, uid, "The internal request id:%s (%s) has been validated." % (
-                req.id, req.name,
-            ))
         line_obj.update_supplier_on_line(cr, uid, line_ids, context=context)
         line_obj.write(cr, uid, reset_soq, {'soq_updated': False,}, context=context)
         self.write(cr, uid, ids, {'state': 'validated'}, context=context)
 
=== modified file 'bin/addons/purchase_override/purchase.py'
--- bin/addons/purchase_override/purchase.py	2016-05-19 07:37:10 +0000
+++ bin/addons/purchase_override/purchase.py	2016-05-24 07:58:03 +0000
@@ -1103,9 +1103,6 @@
 
             message = _("Purchase order '%s' is validated.") % (po.name,)
             self.log(cr, uid, po.id, message)
-            self.infolog(cr, uid, "Purchase order id:%s (%s) is validated." % (
-                po.id, po.name,
-            ))
             # hook for corresponding Fo update
             self._hook_confirm_order_update_corresponding_so(cr, uid, ids, context=context, po=po)
 
@@ -1235,9 +1232,8 @@
                 vals.update({'order_id': l.link_so_id.original_so_id_sale_order.id,
                              'state': 'done'})
                 sol_id = sol_obj.create(cr, uid, vals, context=context)
-                self.infolog(cr, uid, "The FO/IR line id:%s (line number: %s) has been added from the PO line id:%s (line number: %s)" % (
-                    sol_id, sol_obj.read(cr, uid, sol_id, ['line_number'], context=context)['line_number'],
-                    l.id, l.line_number,
+                self.infolog(cr, uid, "The FO/IR line id:%s has been added from the PO line id:%s" % (
+                    sol_id, l.id,
                 ))
             context['sale_id'] = tmp_sale_context
 
@@ -1265,9 +1261,8 @@
                     pick_obj.action_confirm(cr, uid, pick_to_confirm, context=context)
 
             sol_ids.add(l.link_so_id.id)
-            self.infolog(cr, uid, "The FO/IR line id:%s (line number: %s) has been added from the PO line id:%s (line number: %s)" % (
-                new_line_id, sol_obj.read(cr, uid, new_line_id, ['line_number'], context=context)['line_number'],
-                l.id, l.line_number,
+            self.infolog(cr, uid, "The FO/IR line id:%s has been added from the PO line id:%s" % (
+                new_line_id, l.id,
             ))
 
         if sol_ids:
@@ -1330,7 +1325,7 @@
             context['wait_order'] = True
             self._hook_confirm_order_update_corresponding_so(cr, uid, ids, context=context, po=po, so_ids=so_ids)
             del context['wait_order']
-            self.infolog(cr, uid, "The PO id:%s (%s) has been confirmed" % (po.id, po.name))
+            self.infolog(cr, uid, "The PO id:%s has been confirmed" % po.id)
 
         return True
 
@@ -3413,10 +3408,8 @@
 
         res = super(purchase_order_line, self).unlink(cr, uid, ids, context=context)
 
-        for pol in self.read(cr, uid, ids, ['line_number'], context=context):
-            self.infolog(cr, uid, "The PO/RfQ line id:%s (line number: %s) has been deleted" % (
-                pol['id'], pol['name'],
-            ))
+        for pol_id in ids:
+            self.infolog(cr, uid, "The PO/RfQ line id:%s has been deleted" % pol_id)
 
         po_obj.wkf_confirm_trigger(cr, uid, order_ids, context=context)
 
 
=== modified file 'bin/addons/register_accounting/account_move_line.py'
--- bin/addons/register_accounting/account_move_line.py	2016-04-18 14:37:27 +0000
+++ bin/addons/register_accounting/account_move_line.py	2016-05-24 07:58:03 +0000
@@ -77,7 +77,7 @@
             ('state', '=', 'valid'),
             ('move_state', '=', 'posted'), # UFTP-204: Exclude the Direct Invoice from the list
             ('journal_id.type', 'not in', ['migration']),  # US-70 Open the pending payment to receivable and payable entries from all journals except for the migration journal
-            ('account_id.type_for_register', 'not in', ['down_payment', 'advance', 'donation', ]),
+            ('account_id.type_for_register', 'not in', ['down_payment', 'advance', ]),
             # UTP-1088 exclude correction/reversal lines as can be in journal of type correction
             ('corrected_line_id', '=', False),  # is a correction line if has a corrected line
             ('reversal_line_id', '=', False),  # is a reversal line if a reversed line
 
=== modified file 'bin/addons/sale_override/sale.py'
--- bin/addons/sale_override/sale.py	2016-05-10 09:47:26 +0000
+++ bin/addons/sale_override/sale.py	2016-05-24 07:58:03 +0000
@@ -635,13 +635,7 @@
 
         context.update({'no_check_line': True})
         self.write(cr, uid, ids, {'delivery_confirmed_date': time.strftime('%Y-%m-%d')}, context=context)
-        res = super(sale_order, self).action_cancel(cr, uid, ids, context=context)
-        for order in self.browse(cr, uid, ids, context=context):
-            self.infolog(cr, uid, "The %s id:%s (%s) has been canceled." % (
-                order.procurement_request and  'Internal request' or 'Field order',
-                order.id, order.name,
-            ))
-        return res
+        return super(sale_order, self).action_cancel(cr, uid, ids, context=context)
 
     #@@@override sale.sale_order._invoiced
     def _invoiced(self, cr, uid, ids, name, arg, context=None):
@@ -814,9 +808,6 @@
         get function values
         '''
         result = {}
-        if context is None:
-            context = {}
-
         for obj in self.browse(cr, uid, ids, context=context):
             result[obj.id] = {}
             for f in fields:
@@ -827,10 +818,8 @@
             if obj.state == 'done' and obj.split_type_sale_order == 'original_sale_order' and not obj.procurement_request:
                 result[obj.id]['state_hidden_sale_order'] = 'split_so'
 
-            if obj.state_hidden_sale_order != result[obj.id]['state_hidden_sale_order'] and \
-                (not obj.original_so_id_sale_order or obj.state_hidden_sale_order not in (False, 'draft')):
-                real_uid = context.get('computed_for_uid', uid)
-                self.add_audit_line(cr, real_uid, obj.id,
+            if obj.state_hidden_sale_order != result[obj.id]['state_hidden_sale_order']:
+                self.add_audit_line(cr, uid, obj.id,
                                     obj.state_hidden_sale_order,
                                     result[obj.id]['state_hidden_sale_order'],
                                     context=context)
@@ -1330,10 +1319,8 @@
         for order in order_brw_list:
             if not order.procurement_request:
                 self.log(cr, uid, order.id, 'The Field order \'%s\' has been validated (nb lines: %s).' % (order.name, len(order.order_line)), context=context)
-                self.infolog(cr, uid, "The Field order id:%s (%s) has been validated." % (order.id, order.name))
             else:
                 self.log(cr, uid, order.id, 'The Internal Request \'%s\' has been validated (nb lines: %s).' % (order.name, len(order.order_line)), context=context)
-                self.infolog(cr, uid, "The Internal request id:%s (%s) has been validated." % (order.id, order.name))
 
         return True
 
@@ -1421,9 +1408,6 @@
                                                               'original_so_id_sale_order': so.id}, context=dict(context, keepDateAndDistrib=True, keepClientOrder=True))
                         # log the action of split
                         self.log(cr, uid, split_id, _('The %s split %s has been created.') % (selec_name, fo_name))
-                        self.infolog(cr, uid, "The %s split id:%s (%s) has been created." % (
-                            selec_name, split_id, fo_name,
-                        ))
                         split_fo_dic[fo_type] = split_id
                         # For loans, change the subflow
                         if fo_type == 'stock_split_sale_order':
@@ -1537,10 +1521,8 @@
         self.write(cr, uid, ids, {'state': 'done',
                                   'active': False}, context=context)
 
-        for order in self.read(cr, uid, ids, ['name'], context=context):
-            self.infolog(cr, uid, "The splitted FO id:%s (%s) has been closed" % (
-                order['id'], order['name'],
-            ))
+        for order_id in ids:
+            self.infolog(cr, uid, "The splitted FO id:%s has been closed" % order_id)
 
         return True
 
@@ -1958,15 +1940,6 @@
         date_tools = self.pool.get('date.tools')
         fields_tools = self.pool.get('fields.tools')
 
-        msg_type = {
-            'in': 'Incoming shipment',
-            'internal': 'Internal picking',
-            'out': {
-                'standard': 'Delivery order',
-                'picking': 'Picking Ticket,'
-            }
-        }
-
         if context is None:
             context = {}
 
@@ -2004,14 +1977,6 @@
                     if not picking_id:
                         picking_data = self._get_picking_data(cr, uid, order)
                         picking_id = picking_obj.create(cr, uid, picking_data, context=context)
-                        self.infolog(cr, uid, "The %s id:%s (%s) has been created from %s id:%s (%s)." % (
-                            picking_data.get('type', '') == 'out' and \
-                                msg_type.get('out', {}).get(picking_data.get('subtype', ''), '') or \
-                                msg_type.get(picking_data.get('type', ''), ''),
-                            picking_id, picking_data.get('name', ''),
-                            order.procurement_request and 'Internal request' or 'Field order',
-                            order.id, order.name,
-                        ))
 
                     # Get move data and create the move
                     move_data = self._get_move_data(cr, uid, order, line, picking_id, context=context)
@@ -2125,9 +2090,9 @@
 
                 line_done += 1
                 if line.type == 'make_to_stock':
-                    msg = 'The line id:%s (line number: %s) of FO/IR id:%s (%s) has been sourced \'from stock\' with the stock.move id:%s' % (
-                            line.id, line.line_number,
-                            line.order_id.id, line.order_id.name,
+                    msg = 'The line id:%s of FO/IR id:%s has been sourced \'from stock\' with the stock.move id:%s' % (
+                            line.id,
+                            line.order_id.id,
                             move_id,
                     )
                     self.infolog(cr, uid, msg)
@@ -2868,31 +2833,17 @@
         lines_to_check = []
         if isinstance(ids, (int, long)):
             ids = [ids]
-
-        lines_to_log = []
-
-        for line in self.browse(cr, uid, ids, context=context):
+        for line in self.read(cr, uid, ids, ['order_id'], context=context):
             ltc_ids = self.search(cr, uid, [
-                ('order_id', '=', line.order_id.id),
+                ('order_id', '=', line['order_id'][0]),
                 ('order_id.state', '=', 'validated'),
-                ('id', '!=', line.id),
+                ('id', '!=', line['id']),
             ], limit=1, context=context)
             if ltc_ids and ltc_ids[0] not in lines_to_check:
                 lines_to_check.append(ltc_ids[0])
 
-            lines_to_log.append((
-                line.id,
-                line.line_number,
-                line.order_id.procurement_request and 'Internal request' or 'Field orer',
-                line.order_id.id,
-                line.order_id.name,
-        ))
-
         res = super(sale_order_line, self).unlink(cr, uid, ids, context=context)
 
-        for ltl in lines_to_log:
-            self.infolog(cr, uid, "The line id:%s (line number: %s) of the %s id:%s (%s) has been deleted." % ltl)
-
         if lines_to_check:
             self.check_confirm_order(cr, uid, lines_to_check, run_scheduler=False, context=context)
 
 
=== modified file 'bin/addons/sourcing/procurement_order.py'
--- bin/addons/sourcing/procurement_order.py	2016-04-25 09:24:04 +0000
+++ bin/addons/sourcing/procurement_order.py	2016-05-24 07:58:03 +0000
@@ -348,11 +348,7 @@
                     }, context=context)
 
             if line:
-                self.infolog(cr, uid, "The FO/IR line id:%s (line number: %s) has been sourced on order to the PO line id:%s (line number: %s) of the PO id:%s (%s)" % (
-                    line.id, line.line_number,
-                    pol_id, self.pool.get('purchase.order.line').read(cr, uid, pol_id, ['line_number'], context=context)['line_number'],
-                    purchase_ids[0], self.pool.get('purchase.order').read(cr, uid, purchase_ids[0], ['name'], context=context)['name'],
-                ))
+                self.infolog(cr, uid, "The FO/IR line id:%s has been sourced on order to the PO line id:%s of the PO id:%s" % (line.id, pol_id, purchase_ids[0]))
 
             return purchase_ids[0]
         else:
@@ -386,10 +382,8 @@
                     }, context=context)
 
             if line:
-                self.infolog(cr, uid, "The FO/IR line id:%s (line number: %s) has been sourced on order to the PO id:%s (%s)" % (
-                    line.id, line.line_number,
-                    purchase_id, self.pool.get('purchase.order').read(cr, uid, purchase_id, ['name'], context=context)['name'],
-                ))
+                self.infolog(cr, uid, "The FO/IR line id:%s has been sourced on order to the PO id:%s" % (
+                    line.id, purchase_id))
 
             return purchase_id
 
 
=== modified file 'bin/addons/sourcing/sale_order_line.py'
--- bin/addons/sourcing/sale_order_line.py	2016-05-11 08:59:01 +0000
+++ bin/addons/sourcing/sale_order_line.py	2016-05-24 07:58:03 +0000
@@ -1058,7 +1058,7 @@
 
         return result
 
-    def confirmLine(self, cr, uid, ids, context=None, run_scheduler=False):
+    def confirmLine(self, cr, uid, ids, run_scheduler=False, context=None):
         """
         Set the line as confirmed and check if all lines
         of the FO/IR are confirmed. If yes, launch the
@@ -1248,12 +1248,6 @@
                         'start_date': time.strftime('%Y-%m-%d %H:%M:%S'),
                     }, context=context)
 
-                    order = self.pool.get('sale.order').read(cr, uid, order_id, ['name'], context=context)
-                    self.infolog(cr, uid, "All lines of the FO/IR id:%s (%s) have been sourced" % (
-                        order['id'],
-                        order['name'],
-                    ))
-
                 self.pool.get('sale.order').write(cr, uid, order_ids, {
                     'sourcing_trace_ok': True,
                     'sourcing_trace': 'Sourcing in progress',
 
=== modified file 'bin/addons/specific_rules/specific_rules.py'
--- bin/addons/specific_rules/specific_rules.py	2016-04-25 09:24:04 +0000
+++ bin/addons/specific_rules/specific_rules.py	2016-05-24 07:58:03 +0000
@@ -1655,10 +1655,10 @@
         # super function after production lot creation - production lot are therefore taken into account at stock move creation
         result = super(stock_inventory, self).action_confirm(cr, uid, ids, context=context)
 
-        self.infolog(cr, uid, 'The %s inventor%s %s (%s) ha%s been confirmed' % (
+        self.infolog(cr, uid, 'The %s inventor%s %s ha%s been confirmed' % (
             self._name == 'initial.stock.inventory' and 'Initial stock' or 'Physical',
             len(ids) > 1 and 'ies' or 'y',
-            ids, ', '.join(x['name'] for x in self.read(cr, uid, ids, ['name'], context=context)),
+            ids,
             len(ids) > 1 and 've' or 's',
         ))
 
@@ -1667,10 +1667,10 @@
     def action_cancel_draft(self, cr, uid, ids, context=None):
         res = super(stock_inventory, self).action_cancel_draft(cr, uid, ids, context=context)
 
-        for inv in self.read(cr, uid, ids, ['name'], context=context):
-            self.infolog(cr, uid, "The %s inventory id:%s (%s) has been re-set to draft" % (
+        for inv_id in ids:
+            self.infolog(cr, uid, "The %s inventory id:%s has been re-set to draft" % (
                 self._name == 'initial.stock.inventory' and 'Initial stock' or 'Physical',
-                inv['id'], inv['name'],
+                inv_id,
             ))
 
         return res
@@ -1678,9 +1678,9 @@
     def action_done(self, cr, uid, ids, context=None):
         res = super(stock_inventory, self).action_done(cr, uid, ids, context=context)
 
-        self.infolog(cr, uid, 'The Physical inventor%s %s (%s) ha%s been validated' % (
+        self.infolog(cr, uid, 'The Physical inventor%s %s ha%s been validated' % (
             len(ids) > 1 and 'ies' or 'y',
-            ids, ', '.join(x['name'] for x in self.read(cr, uid, ids, ['name'], context=context)),
+            ids,
             len(ids) > 1 and 've' or 's',
         ))
 
 
=== modified file 'bin/addons/stock/stock.py'
--- bin/addons/stock/stock.py	2016-04-25 08:27:30 +0000
+++ bin/addons/stock/stock.py	2016-05-24 07:58:03 +0000
@@ -1432,9 +1432,6 @@
             }
             # modify the list of views
             message = type_list.get(pick.type, _('Document')) + " '" + (pick.name or '?') + "' "
-            infolog_message = None
-            if pick.state == 'assigned':
-                infolog_message = type_list.get(pick.type, _('Document')) + " id:" + str(pick.id) or 'False' + " '" + (pick.name or '?') + "' "
             if pick.min_date:
                 msg= _(' for the ')+ datetime.strptime(pick.min_date, '%Y-%m-%d %H:%M:%S').strftime(date_format).decode('utf-8')
             state_list = {
@@ -1448,21 +1445,14 @@
             res = self._hook_picking_get_view(cr, uid, ids, context=context, pick=pick)
             context.update({'view_id': res and res[1] or False})
             message += state_list[pick.state]
-            if infolog_message:
-                infolog_message += state_list[pick.state]
             # modify the message to be displayed
             message = self._hook_log_picking_modify_message(cr, uid, ids, context=context, message=message, pick=pick)
-            if infolog_message:
-                infolog_message = self._hook_log_picking_modify_message(cr, uid, ids, context=context, message=infolog_message, pick=pick)
             # conditional test for message log
             log_cond = self._hook_log_picking_log_cond(cr, uid, ids, context=context, pick=pick)
             if log_cond and log_cond != 'packing':
                 self.log(cr, uid, pick.id, message, context=context)
             elif not log_cond:
                 self._hook_custom_log(cr, uid, ids, context=context, message=message, pick=pick)
-
-            if infolog_message:
-                self.infolog(cr, uid, message)
         return True
 
 stock_picking()
@@ -2898,9 +2888,9 @@
                          account_move_obj.unlink(cr, uid, [account_move['id']], context=context)
             self.write(cr, uid, [inv.id], {'state': 'cancel'}, context=context)
             if self._name == 'initial.stock.inventory':
-                self.infolog(cr, uid, "The Initial Stock inventory id:%s (%s) has been canceled" % (inv.id, inv.name))
+                self.infolog(cr, uid, "The Initial Stock inventory id:%s has been canceled" % inv.id)
             else:
-                self.infolog(cr, uid, "The Physical inventory id:%s (%s) has been canceled" % (inv.id, inv.name))
+                self.infolog(cr, uid, "The Physical inventory id:%s has been canceled" % inv.id)
         return True
 
 stock_inventory()
 
=== modified file 'bin/addons/stock_override/stock.py'
--- bin/addons/stock_override/stock.py	2016-04-25 10:27:20 +0000
+++ bin/addons/stock_override/stock.py	2016-05-24 07:58:03 +0000
@@ -627,28 +627,22 @@
     @check_cp_rw
     def force_assign(self, cr, uid, ids, context=None):
         res = super(stock_picking, self).force_assign(cr, uid, ids)
-        for pick in self.read(cr, uid, ids, ['name'], context=context):
-            self.infolog(cr, uid, 'Force availability ran on stock.picking id:%s (%s)' % (
-                pick['id'], pick['name'],
-            ))
+        for pick_id in ids:
+            self.infolog(cr, uid, 'Force availability ran on stock.picking id:%s' % pick_id)
         return res
 
     @check_cp_rw
     def action_assign(self, cr, uid, ids, context=None):
         res = super(stock_picking, self).action_assign(cr, uid, ids, context=context)
-        for pick in self.read(cr, uid, ids, ['name'], context=context):
-            self.infolog(cr, uid, 'Check availability ran on stock.picking id:%s (%s)' % (
-                pick['id'], pick['name'],
-            ))
+        for pick_id in ids:
+            self.infolog(cr, uid, 'Check availability ran on stock.picking id:%s' % pick_id)
         return res
 
     @check_cp_rw
     def cancel_assign(self, cr, uid, ids, *args, **kwargs):
         res = super(stock_picking, self).cancel_assign(cr, uid, ids)
-        for pick in self.read(cr, uid, ids, ['name']):
-            self.infolog(cr, uid, 'Cancel availability ran on stock.picking id:%s (%s)' % (
-                pick['id'], pick['name'],
-            ))
+        for pick_id in ids:
+            self.infolog(cr, uid, 'Cancel availability ran on stock.picking id:%s' % pick_id)
         return res
 
  
@@ -999,7 +993,7 @@
 
         return res
 
-    def is_invoice_needed(self, cr, uid, sp=None, invoice_type=None):
+    def is_invoice_needed(self, cr, uid, sp=None):
         """
         Check if invoice is needed. Cases where we do not need invoice:
         - OUT from scratch (without purchase_id and sale_id) AND stock picking type in internal, external or esc
@@ -1032,8 +1026,7 @@
             res = False
 
         # (US-952) Move out on an external partner should not create a Stock Transfer Voucher
-        # US-1212: but should create refund
-        if sp.type == 'out' and sp.partner_id.partner_type == 'external' and invoice_type != 'in_refund':
+        if sp.type == 'out' and sp.partner_id.partner_type == 'external':
             res = False
 
         return res
@@ -1047,7 +1040,7 @@
         invoice_type = self._get_invoice_type(stock_picking)
 
         # Check if no invoice needed
-        if not self.is_invoice_needed(cr, uid, stock_picking, invoice_type):
+        if not self.is_invoice_needed(cr, uid, stock_picking):
             return
 
         # we do not create invoice for procurement_request (Internal Request)
@@ -1231,7 +1224,6 @@
 
         return True
 
-    @check_cp_rw
     def change_all_location(self, cr, uid, ids, context=None):
         '''
         Launch the wizard to change all destination location of stock moves
@@ -1483,9 +1475,7 @@
             if move.product_id.id == product_tbd and move.from_wkf_line:
                 ids.pop(ids.index(move.id))
             else:
-                self.infolog(cr, uid, 'Force availability run on stock move #%s (id:%s) of picking id:%s (%s)' % (
-                    move.line_number, move.id, move.picking_id.id, move.picking_id.name,
-                ))
+                self.infolog(cr, uid, 'Force availability run on stock move #%s (id:%s) of picking id:%s' % (move.line_number, move.id, move.picking_id.id))
 
         return super(stock_move, self).force_assign(cr, uid, ids, context=context)
 
@@ -1938,6 +1928,8 @@
 
     def check_assign(self, cr, uid, ids, context=None):
         res = super(stock_move, self).check_assign(cr, uid, ids, context=context)
+        for move_id in ids:
+            self.infolog(cr, uid, 'Check availability ran on stock.move id:%s' % move_id)
         return res
 
     @check_cp_rw
@@ -1952,12 +1944,10 @@
         for move_data in self.read(cr, uid, ids, fields_to_read, context=context):
             search_domain = [('state', '=', 'confirmed'), ('id', '!=', move_data['id'])]
 
-            self.infolog(cr, uid, 'Cancel availability run on stock move #%s (id:%s) of picking id:%s (%s)' % (
+            self.infolog(cr, uid, 'Cancel availability run on stock move #%s (id:%s) of picking id:%s' % (
                 move_data['line_number'],
                 move_data['id'],
-                move_data['picking_id'][0],
-                self.pool.get('stock.picking').read(cr, uid, move_data['picking_id'][0], ['name'], context=context)['name'],
-            ))
+                move_data['picking_id'][0]))
 
             for f in fields_to_read:
                 if f in ('product_qty', 'product_uos_qty'):
@@ -2536,17 +2526,9 @@
             move_ids = move_obj.search(cr, uid, [('id', '=', wiz.move_id.id)],
                     limit=1, order='NO_ORDER', context=context)
             if move_ids and  wiz.move_id.has_to_be_resourced:
-                self.infolog(cr, uid, "The stock.move id:%s of the picking id:%s (%s) has been canceled and resourced" % (
-                    move_id,
-                    picking_id,
-                    pick_obj.read(cr, uid, picking_id, ['name'], context=context)['name'],
-                ))
+                self.infolog(cr, uid, "The stock.move id:%s of the picking id:%s has been canceled and resourced" % (move_id, picking_id))
             else:
-                self.infolog(cr, uid, "The stock.move id:%s of the picking id:%s (%s) has been canceled" % (
-                    move_id,
-                    picking_id,
-                    pick_obj.read(cr, uid, picking_id, ['name'], context=context)['name'],
-                ))
+                self.infolog(cr, uid, "The stock.move id:%s of the picking id:%s has been canceled" % (move_id, picking_id))
 
             if move_ids and wiz.move_id.picking_id:
                 lines = wiz.move_id.picking_id.move_lines
@@ -2602,23 +2584,9 @@
         '''
         Just call the cancel of the stock.picking
         '''
-        msg_type = {
-            'in': 'Incoming Shipment',
-            'internal': 'Internal Picking',
-            'out': {
-                'standard': 'Delivery Order',
-                'picking': 'Picking Ticket',
-            }
-        }
-
         wf_service = netsvc.LocalService("workflow")
         for wiz in self.browse(cr, uid, ids, context=context):
             wf_service.trg_validate(uid, 'stock.picking', wiz.picking_id.id, 'button_cancel', cr)
-            self.infolog(cr, uid, "The %s id:%s (%s) has been canceled%s." % (
-                wiz.picking_id.type == 'out' and msg_type.get('out', {}).get(wiz.picking_id.subtype, '') or msg_type.get(wiz.picking_id.type),
-                wiz.picking_id.id,
-                wiz.picking_id.has_to_be_resourced and ' and resourced' or '',
-            ))
 
         return {'type': 'ir.actions.act_window_close'}
 
 
=== modified file 'bin/addons/stock_override/stock_view.xml'
--- bin/addons/stock_override/stock_view.xml	2016-04-25 10:27:20 +0000
+++ bin/addons/stock_override/stock_view.xml	2016-05-24 07:58:03 +0000
@@ -469,7 +469,7 @@
                                 <button name="draft_force_assign" states="draft,confirmed,assigned" string="Confirm" type="object" icon="gtk-apply" attrs="{'invisible': ['|', '&amp;', ('state', 'in', ['done', 'cancel', 'import']), ('state', '!=', 'draft'), ('has_draft_moves', '=', False)]}" />
                                 <button name="action_assign" states="confirmed,assigned" string="Check Availability" type="object" icon="gtk-find" context="{'from_button': True}"/>
                                 <button name="force_assign" states="confirmed,assigned" string="Force Availability" type="object" icon="gtk-jump-to" context="{'from_button': True}" />
-                                <button name="change_all_location" string="Change All destinations" icon="gtk-execute" type="object" states="draft,confirmed,assigned" context="{'from_button': True}" />
+                                <button name="change_all_location" string="Change All destinations" icon="gtk-execute" type="object" states="draft,confirmed,assigned" />
                                 <button name="action_process" states="assigned" string="Process" type="object" icon="gtk-go-forward" context="{'from_button': True}"/>
                                 <field name="certificate_donation" invisible="1"/>
                                 <button name="print_certificate" string="Print certificate" type="object" icon="gtk-print" attrs="{'invisible': [('certificate_donation', '=', False)]}"/>
 
=== modified file 'bin/addons/sync_client/sync_client.py'
--- bin/addons/sync_client/sync_client.py	2016-05-02 08:02:47 +0000
+++ bin/addons/sync_client/sync_client.py	2016-05-24 07:58:03 +0000
@@ -69,7 +69,6 @@
                 connected = False
                 raise osv.except_osv(_("Error!"), _("Not connected: please try to log on in the Connection Manager"))
             # Check for update
-
             if hasattr(entity, 'upgrade'):
                 up_to_date = entity.upgrade(cr, uid, context=context)
                 if not up_to_date[0]:
 
=== modified file 'bin/addons/tender_flow/tender_flow.py'
--- bin/addons/tender_flow/tender_flow.py	2016-04-25 09:24:04 +0000
+++ bin/addons/tender_flow/tender_flow.py	2016-05-24 07:58:03 +0000
@@ -385,11 +385,8 @@
                                                             'res_id': po_id,
                                                             'domain': [('rfq_ok', '=', True)],
                                                             }, context={'rfq_ok': True})
-                self.infolog(cr, uid, "The RfQ id:%s (%s) has been generated from tender id:%s (%s)" % (
-                    po_id,
-                    po_obj.read(cr, uid, po_id, ['name'], context=context)['name'],
-                    tender.id,
-                    tender.name,
+                self.infolog(cr, uid, "The RfQ id:%s has been generated from tender id:%s" % (
+                    po_id, tender.id,
                 ))
             
         self.write(cr, uid, ids, {'state':'comparison'}, context=context)
@@ -475,10 +472,7 @@
 
                         sol_ids.add(tender.sale_order_id.id)
 
-            self.infolog(cr, uid, "The tender id:%s (%s) has been closed" % (
-                tender.id,
-                tender.name,
-            ))
+            self.infolog(cr, uid, "The tender id:%s has been closed" % tender.id)
 
         if sol_ids:
             so_obj.action_ship_proc_create(cr, uid, list(sol_ids), context=context)
@@ -681,12 +675,7 @@
                 po_id = po_obj.create(cr, uid, po_data, context=context)
                 po = po_obj.browse(cr, uid, po_id, context=context)
                 po_obj.log(cr, uid, po_id, 'The Purchase order %s for supplier %s has been created.'%(po.name, po.partner_id.name))
-                self.infolog(cr, uid, "The PO id:%s (%s) has been generated from tender id:%s (%s)" % (
-                    po_id,
-                    po.name,
-                    tender.id,
-                    tender.name,
-                ))
+                self.infolog(cr, uid, "The PO id:%s has been generated from tender" % po_id)
                 #UF-802: the PO created must be in draft state, and not validated!
                 #wf_service.trg_validate(uid, 'purchase.order', po_id, 'purchase_confirm', cr)
                 
@@ -750,10 +739,7 @@
 
             for line in tender.tender_line_ids:
                 t_line_obj.cancel_sourcing(cr, uid, [line.id], context=context)
-            self.infolog(cr, uid, "The tender id:%s (%s) has been canceled" % (
-                tender.id,
-                tender.name,
-            ))
+            self.infolog(cr, uid, "The tender id:%s has been canceled" % tender.id)
 
         return True
 
@@ -1123,12 +1109,8 @@
         '''
         to_remove = self.cancel_sourcing(cr, uid, ids, context=dict(context, fake_unlink=True))
 
-        for tl in self.browse(cr, uid, ids, context=context):
-            self.infolog(cr, uid, "The tender line id:%s of tender id:%s (%s) has been canceled" % (
-                tl.id,
-                tl.tender_id.id,
-                tl.tender_id.name,
-            ))
+        for tl_id in ids:
+            self.infolog(cr, uid, "The tender line id:%s has been canceled" % tl_id)
 
         return self.unlink(cr, uid, to_remove, context=context)
 
@@ -1400,14 +1382,8 @@
             
             # log message concerning RfQ creation
             rfq_obj.log(cr, uid, rfq_id, "The Request for Quotation '%s' has been created and must be completed before purchase order creation."%rfq_obj.browse(cr, uid, rfq_id, context=context).name, context={'rfq_ok': 1})
-            rfq_line = rfq_line_obj.browse(cr, uid, rfq_line_id, context=context)
-            self.infolog(cr, uid, "The FO/IR line id:%s (line number: %s) has been sourced on order to RfQ line id:%s (line number: %s) of the RfQ id:%s (%s)" % (
-                sale_order_line.id,
-                sale_order_line.line_number,
-                rfq_line.id,
-                rfq_line.line_number,
-                rfq_line.order_id.id,
-                rfq_line.order_id.name,
+            self.infolog(cr, uid, "The FO/IR line id:%s has been sourced on order to RfQ line id:%s of the RfQ id:%s" % (
+                sale_order_line.id, rfq_line_id, rfq_id,
             ))
         # state of procurement is Tender
         self.write(cr, uid, ids, {'state': 'rfq'}, context=context)
@@ -1465,14 +1441,9 @@
             self.write(cr, uid, ids, {'tender_id': tender_id, 'tender_line_id': tender_line_id}, context=context)
             
             # log message concerning tender creation
-            tender_line = tender_line_obj.browse(cr, uid, tender_line_id, context=context)
-            tender_obj.log(cr, uid, tender_id, "The tender '%s' has been created and must be completed before purchase order creation."%tender_line.tender_id.name)
-            self.infolog(cr, uid, "The FO/IR line id:%s (%s) has been sourced on order to tender line id:%s of the tender id:%s (%s)" % (
-                sale_order_line.id,
-                sale_order_line.line_number,
-                tender_line.id,
-                tender_line.tender_id.id,
-                tender_line.tender_id.name,
+            tender_obj.log(cr, uid, tender_id, "The tender '%s' has been created and must be completed before purchase order creation."%tender_obj.browse(cr, uid, tender_id, context=context).name)
+            self.infolog(cr, uid, "The FO/IR line id:%s has been sourced on order to tender line id:%s of the tender id:%s" % (
+                sale_order_line.id, tender_line_id, tender_id,
             ))
         # state of procurement is Tender
         self.write(cr, uid, ids, {'state': 'tender'}, context=context)
@@ -1705,9 +1676,6 @@
         for rfq in self.browse(cr, uid, ids, context=context):
             wf_service = netsvc.LocalService("workflow")
             wf_service.trg_validate(uid, 'purchase.order', rfq.id, 'rfq_sent', cr)
-            self.infolog(cr, uid, "The RfQ id:%s (%s) has been sent." % (
-                rfq.id, rfq.name,
-            ))
             
         self.write(cr, uid, ids, {'date_confirm': time.strftime('%Y-%m-%d')}, context=context)
 
@@ -1745,8 +1713,8 @@
                                        'tender_id': rfq.tender_id.id,
                                        'created_by_rfq': True}
                             tl_id = tl_obj.create(cr, uid, tl_vals, context=context)
-                            self.infolog(cr, uid, "The tender line id:%s has been created by the RfQ line id:%s (line number: %s)" % (
-                                tl_id, line.id, line.line_number,
+                            self.infolog(cr, uid, "The tender line id:%s has been created by the RfQ line id:%s" % (
+                                tl_id, line.id,
                             ))
                         line_obj.write(cr, uid, [line.id], {'tender_line_id': tl_id}, context=context)
             elif rfq.rfq_ok:
@@ -1762,9 +1730,7 @@
                     )
 
             wf_service.trg_validate(uid, 'purchase.order', rfq.id, 'rfq_updated', cr)
-            self.infolog(cr, uid, "The RfQ id:%s (%s) has been updated" % (
-                rfq.id, rfq.name,
-            ))
+            self.infolog(cr, uid, "The RfQ id:%s has been updated" % rfq.id)
 
         return {
             'type': 'ir.actions.act_window',
@@ -1831,7 +1797,7 @@
             ids = [ids]
 
         for rfq in self.browse(cr, uid, ids, context=context):
-            self.infolog(cr, uid, "The RfQ id:%s (%s) has been closed" % (rfq.id, rfq.name))
+            self.infolog(cr, uid, "The RfQ id:%s has been closed" % rfq.id)
             if rfq.from_procurement:
                 for line in rfq.order_line:
                     if line.procurement_id:
 
=== modified file 'bin/osv/orm.py' (properties changed: +x to -x)
--- bin/osv/orm.py	2016-04-12 16:43:36 +0000
+++ bin/osv/orm.py	2016-05-24 07:58:03 +0000
@@ -48,6 +48,7 @@
 import time
 import traceback
 import types
+import csv
 
 import netsvc
 from lxml import etree
@@ -745,6 +746,48 @@
             datas += self.__export_row(cr, uid, row, fields_to_export, context)
         return {'datas': datas}
 
+    def import_data_with_wizard(self, cr, uid, csv_file, quotechar="'", delimiter=","):
+        import base64
+
+        import_obj = self.pool.get('import_data')
+        import_id = import_obj.create(cr, uid, {
+            'ignore': 1,
+            'file': base64.encodestring(open(csv_file, 'r').read()),
+            'object': self._name,
+            'import_mode': 'create',
+        })
+        processed, rejected, headers = import_obj._import(cr, uid, import_id, use_new_cursor=False, auto_import=True)
+        return processed, rejected, headers
+
+    def import_data_from_csv(self, cr, uid, csv_file, quotechar='"', delimiter=','):
+        headers = []
+        list_data = []
+        with open(csv_file, 'r') as fcsv:
+            reader = csv.reader(fcsv, quotechar=quotechar, delimiter=delimiter)
+            for row in reader:
+                if not headers:
+                    headers = row
+                else:
+                    list_data.append(row)
+
+        rejected = []
+        processed = []
+        i = 1
+        for d in list_data:
+            i += 1
+            try:
+                res = self.import_data(cr, uid, headers, [d])
+                if res[0] == -1:
+                    rejected.append((i, d, res[2]))
+                else:
+                    processed.append((i, d))
+                cr.commit()
+            except Exception as e:
+                rejected.append((i, d, str(e)))
+                cr.commit()
+
+        return processed, rejected, headers
+
     def import_data(self, cr, uid, fields, datas, mode='init', current_module='', noupdate=False, context=None, filename=None):
         """
         Import given data in given module
@@ -4173,15 +4216,7 @@
             val = todo[key]
             if key:
                 # uid == 1 for accessing objects having rules defined on store fields
-                if hasattr(uid, 'realUid'):
-                    context['computed_for_uid'] = uid.realUid
-                else:
-                    context['computed_for_uid'] = uid
                 result = self._columns[val[0]].get(cr, self, ids, val, 1, context=context)
-                try:
-                    del context['computed_for_uid']
-                except KeyError:
-                    pass
                 for id, value in result.items():
                     if field_flag:
                         for f in value.keys():
 
=== modified file 'bin/release.py'
--- bin/release.py	2016-05-19 07:14:29 +0000
+++ bin/release.py	2016-05-24 07:58:03 +0000
@@ -20,7 +20,7 @@
 ##############################################################################
 
 name = 'openerp-server'
-version = 'UF2.1-2dev'
+version = 'UF2.1-1dev'
 major_version = '6.0'
 description = 'OpenERP Server'
 long_desc = '''OpenERP is a complete ERP and CRM. The main features are accounting (analytic
@@ -41,3 +41,4 @@
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
+version = "UF2.1-1rc2-20160405-085815"
 
=== modified file 'bin/unifield-version.txt'
--- bin/unifield-version.txt	2016-05-02 07:25:38 +0000
+++ bin/unifield-version.txt	2016-05-24 07:58:03 +0000
@@ -39,3 +39,4 @@
 9cc36509c8e23277fa984c409108214a 2016-04-19 17:00:00 UF2.1-1
 02fefe702b11f65e825167449ffbcd16 2016-05-02 10:00:00 UF2.1-1p1
 
+2b35d23b977618a2abab522b3681147c 2016-04-05 10:06:58 UF2.1-1rc2