Merge lp:~mallorymarcot/unifield-server/us-449 into lp:unifield-server

[jftempo]

=== modified file 'bin/addons/account/account.py'
=== modified file 'bin/addons/account/account_invoice_view.xml'
=== modified file 'bin/addons/account/account_view.xml'
=== modified file 'bin/addons/account/project/project_view.xml'
=== modified file 'bin/addons/account_override/account_invoice_view.xml'
=== modified file 'bin/addons/account_override/account_move_line.py'
=== modified file 'bin/addons/account_period_closing_level/account_period.py'
--- bin/addons/account_period_closing_level/account_period.py	2017-08-28 14:06:27 +0000
+++ bin/addons/account_period_closing_level/account_period.py	2017-09-01 09:49:29 +0000
@@ -193,11 +193,20 @@
 
                 # first verify that all existent registers for this period are closed
                 reg_ids = reg_obj.search(cr, uid, [('period_id', '=', period.id)], context=context)
+<<<<<<< TREE
                 journal_ok = []
+=======
+                linked_prev_reg_ids = []
+>>>>>>> MERGE-SOURCE
                 for register in reg_obj.browse(cr, uid, reg_ids, context=context):
+<<<<<<< TREE
                     journal_ok.append(register.journal_id.id)
+=======
+                    register.prev_reg_id and linked_prev_reg_ids.append(register.prev_reg_id.id)
+>>>>>>> MERGE-SOURCE
                     if register.state not in ['confirm']:
                         raise osv.except_osv(_('Warning'), _("The register '%s' is not closed. Please close it before closing period") % (register.name,))
+<<<<<<< TREE
 
                 # prevent period closing if one of the registers of the previous period
                 # has no corresponding register in the period to close AND has a non 0 balance. (except for period 13..16)
@@ -218,6 +227,29 @@
                                                    "to close and have a balance which isn't equal to 0:\n"
                                                    "%s") % ", ".join([r.name for r in reg_ko]))
 
+=======
+
+                # prevent period closing if one of the registers of the previous period
+                # has no corresponding register in the period to close AND has a non 0 balance. (except for period 13..16)
+                if not period.special:
+                    prev_period_id = register_tools.previous_period_id(self, cr, uid, period.id, context=context, raise_error=False)
+                    if prev_period_id:
+                        all_prev_reg_ids = reg_obj.search(cr, uid, [('period_id', '=', prev_period_id)], order='NO_ORDER', context=context)
+                        # get the registers of the previous period which are NOT linked to a register of the period to close
+                        orphan_prev_reg_ids = [reg_id for reg_id in all_prev_reg_ids if reg_id not in linked_prev_reg_ids]
+                        reg_ko = []
+                        for reg in reg_obj.browse(cr, uid, orphan_prev_reg_ids,
+                                                  fields_to_fetch=['balance_end', 'balance_end_real', 'balance_end_cash', 'name'],
+                                                  context=context):
+                            if abs(reg.balance_end) > 10**-3 or abs(reg.balance_end_real) > 10**-3 or abs(reg.balance_end_cash) > 10**-3:
+                                reg_ko.append(reg)
+                        if len(reg_ko) > 0:
+                            raise osv.except_osv(_('Warning'),
+                                                 _("One or several registers have not been generated for the period "
+                                                   "to close and have a balance which isn't equal to 0:\n"
+                                                   "%s") % ", ".join([r.name for r in reg_ko]))
+
+>>>>>>> MERGE-SOURCE
                 # check if subscriptions lines were not created for this period
                 sub_ids = sub_obj.search(cr, uid, [('date', '<', period.date_stop), ('move_id', '=', False)], context=context)
                 if len(sub_ids) > 0:

=== modified file 'bin/addons/base/ir/ir.xml'
=== modified file 'bin/addons/delivery_mechanism/delivery_mechanism.py'
--- bin/addons/delivery_mechanism/delivery_mechanism.py	2017-08-28 12:05:59 +0000
+++ bin/addons/delivery_mechanism/delivery_mechanism.py	2017-09-01 09:49:29 +0000
@@ -334,8 +334,12 @@
                             for move in self.browse(cr, uid, move_ids, context=context):
                                 pick = move.picking_id
                                 cond1 = move.picking_id.subtype == 'standard'
+<<<<<<< TREE
                                 cond2 = move.product_qty != 0.00 and pick.subtype == 'picking' and (not pick.backorder_id or pick.backorder_id.subtype == 'standard') and pick.state == 'draft'
+=======
+>>>>>>> MERGE-SOURCE
                                 # move from draft picking or standard picking
+                                cond2 = move.product_qty != 0.00 and pick.subtype == 'picking' and (not pick.backorder_id or pick.backorder_id.subtype == 'standard') and pick.state == 'draft'
                                 if cond2 or cond1:
                                     integrity_check.append(move)
                             # return the first one matching

=== modified file 'bin/addons/financing_contract/financing_contract_view.xml'
=== modified file 'bin/addons/msf_budget/msf_budget_view.xml'
=== modified file 'bin/addons/msf_doc_import/wizard/__init__.py'
=== modified file 'bin/addons/msf_doc_import/wizard/wizard_delete_lines.py'
--- bin/addons/msf_doc_import/wizard/wizard_delete_lines.py	2017-08-11 13:56:44 +0000
+++ bin/addons/msf_doc_import/wizard/wizard_delete_lines.py	2017-09-01 09:49:29 +0000
@@ -573,6 +573,7 @@
         if isinstance(ids, (int, long)):
             ids = [ids]
 
+<<<<<<< TREE
         # only for FO
         if context['active_model'] == 'sale.order' \
                 and (not context.get('procurement_request') or not context['procurement_request']):
@@ -611,6 +612,28 @@
                 else:
                     line_obj.unlink(cr, uid, line_ids, context=context)
             context['from_del_wizard'] = False
+=======
+        for wiz in self.browse(cr, uid, ids, context=context):
+            line_obj = self.pool.get(wiz.to_remove_type)
+            line_ids = []
+            # Parse the content of 'line_ids' field (text field) to retrieve
+            # the id of lines to remove.
+            for line in wiz.line_ids:
+                for l in line[2]:
+                    line_ids.append(l)
+
+            context['noraise'] = True
+            context.update({
+                'noraise': True,
+                'from_del_wizard': True,
+            })
+            if wiz.to_remove_type in ('purchase.order.line', 'tender.line'):
+                line_obj.fake_unlink(cr, uid, line_ids, context=context)
+            else:
+                line_obj.unlink(cr, uid, line_ids, context=context)
+
+        context['from_del_wizard'] = False
+>>>>>>> MERGE-SOURCE
 
         return {'type': 'ir.actions.act_window_close'}
 

=== modified file 'bin/addons/msf_instance/msf_instance_installer.py'
=== modified file 'bin/addons/msf_order_date/order_dates_view.xml'
=== modified file 'bin/addons/msf_outgoing/msf_outgoing.py'
--- bin/addons/msf_outgoing/msf_outgoing.py	2017-08-16 10:23:09 +0000
+++ bin/addons/msf_outgoing/msf_outgoing.py	2017-09-01 09:49:29 +0000
@@ -811,6 +811,15 @@
                 picking = family.draft_packing_id
                 draft_picking = family.ppl_id and family.ppl_id.previous_step_id and family.ppl_id.previous_step_id.backorder_id or False
 
+                # get the linked "save as draft" wizard if has:
+                picking_processor_wiz = []
+                if draft_picking:
+                    picking_processor_wiz = self.pool.get('create.picking.processor').search(cr, uid, [
+                        ('picking_id', '=', draft_picking.id),
+                        ('draft', '=', True),
+                    ], context=context)
+                    if picking_processor_wiz:
+                        picking_processor_wiz = self.pool.get('create.picking.processor').browse(cr, uid, picking_processor_wiz[0], context=context)
 
                 # UF-2531: Store some important info for the return pack messages
                 return_info.setdefault(str(counter), {
@@ -885,6 +894,24 @@
                     draft_initial_qty += return_qty
                     move_obj.write(cr, uid, [draft_move.id], {'product_qty': draft_initial_qty}, context=context)
 
+                    # Update or create "save as draft" lines with returned qty:
+                    if picking_processor_wiz:
+                        save_as_draft_move = self.pool.get('create.picking.move.processor').search(cr, uid, [
+                            ('wizard_id', '=', picking_processor_wiz.id),
+                            ('move_id', '=', draft_move.id),
+                        ], context=context)
+                        if not save_as_draft_move: # then create the SaD line:
+                            move_data = self.pool.get('create.picking.move.processor')._get_line_data(cr, uid, wizard=picking_processor_wiz, move=draft_move, context=context)
+                            move_data.update({'quantity': return_qty})
+                            save_as_draft_move = self.pool.get('create.picking.move.processor').create(cr, uid, move_data, context=context)
+                            save_as_draft_move = [save_as_draft_move]
+                        else: # update Sad line
+                            for sad_move in self.pool.get('create.picking.move.processor').browse(cr, uid, save_as_draft_move, context=context):
+                                self.pool.get('create.picking.move.processor').write(cr, uid, sad_move.id, {
+                                    'ordered_quantity': sad_move.ordered_quantity + return_qty,
+                                    'quantity': sad_move.quantity + return_qty,
+                                }, context=context)
+                    
             # log the increase action - display the picking ticket view form - log message for each draft packing because each corresponds to a different draft picking
             if not log_flag:
                 draft_shipment_name = self.read(cr, uid, shipment.id, ['name'], context=context)['name']
@@ -3506,9 +3533,16 @@
 
         if isinstance(ids, (int, long)):
             ids = [ids]
+        if context is None:
+            context = {}
 
-        processor_id = proc_obj.create(cr, uid, {'picking_id': ids[0]}, context=context)
-        proc_obj.create_lines(cr, uid, processor_id, context=context)
+        # if wizard already exists, then open it (able save as draft/reset functionnality):
+        wiz_ids = proc_obj.search(cr, uid, [('picking_id', 'in', ids), ('draft', '=', True)], context=context)
+        if wiz_ids:
+            processor_id = wiz_ids[0]
+        else:
+            processor_id = proc_obj.create(cr, uid, {'picking_id': ids[0]}, context=context)
+            proc_obj.create_lines(cr, uid, processor_id, context=context)
 
         return {
             'type': 'ir.actions.act_window',
@@ -3517,6 +3551,7 @@
             'view_type': 'form',
             'view_mode': 'form',
             'target': 'new',
+            'context': context,
         }
 
     def do_create_picking(self, cr, uid, wizard_ids, context=None):
@@ -3698,8 +3733,13 @@
                 _('The picking ticket is not in \'Available\' state. Please check this and re-try')
             )
 
-        processor_id = proc_obj.create(cr, uid, {'picking_id': ids[0]}, context=context)
-        proc_obj.create_lines(cr, uid, processor_id, context=context)
+        # if wizard already exists, then open it (able save as draft/reset functionnality):
+        wiz_ids = proc_obj.search(cr, uid, [('picking_id', 'in', ids), ('draft', '=', True)], context=context)
+        if wiz_ids:
+            processor_id = wiz_ids[0]
+        else:
+            processor_id = proc_obj.create(cr, uid, {'picking_id': ids[0]}, context=context)
+            proc_obj.create_lines(cr, uid, processor_id, context=context)
 
         return {
             'type': 'ir.actions.act_window',
@@ -4314,6 +4354,16 @@
             picking = wizard.picking_id
             draft_picking_id = picking.previous_step_id.backorder_id.id
 
+            # get the linked "save as draft" wizard if has:
+            picking_processor_wiz = []
+            if draft_picking_id:
+                picking_processor_wiz = self.pool.get('create.picking.processor').search(cr, uid, [
+                    ('picking_id', '=', draft_picking_id),
+                    ('draft', '=', True),
+                ], context=context)
+                if picking_processor_wiz:
+                    picking_processor_wiz = self.pool.get('create.picking.processor').browse(cr, uid, picking_processor_wiz[0], context=context)
+
             for line in wizard.move_ids:
                 return_qty = line.quantity
 
@@ -4363,11 +4413,27 @@
 
                 # Increase the draft move with the returned quantity
                 draft_move_id = line.move_id.backmove_id.id
-                draft_initial_qty = move_obj.read(cr, uid, [draft_move_id], ['product_qty'], context=context)[0]['product_qty']
-                draft_initial_qty += return_qty
-                move_obj.write(cr, uid, [draft_move_id], {'product_qty': draft_initial_qty}, context=context)
-
-
+                draft_move_qty = move_obj.read(cr, uid, [draft_move_id], ['product_qty'], context=context)[0]['product_qty']
+                draft_move_qty += return_qty
+                move_obj.write(cr, uid, [draft_move_id], {'product_qty': draft_move_qty}, context=context)
+
+                # Update or create "save as draft" lines with returned qty:
+                if picking_processor_wiz:
+                    save_as_draft_move = self.pool.get('create.picking.move.processor').search(cr, uid, [
+                        ('wizard_id', '=', picking_processor_wiz.id),
+                        ('move_id', '=', draft_move_id),
+                    ], context=context)
+                    if not save_as_draft_move: # then create the SaD line:
+                        move_data = self.pool.get('create.picking.move.processor')._get_line_data(cr, uid, wizard=picking_processor_wiz, move=line.move_id.backmove_id, context=context)
+                        move_data.update({'quantity': return_qty})
+                        save_as_draft_move = self.pool.get('create.picking.move.processor').create(cr, uid, move_data, context=context)
+                        save_as_draft_move = [save_as_draft_move]
+                    else: # update Sad line
+                        for sad_move in self.pool.get('create.picking.move.processor').browse(cr, uid, save_as_draft_move, context=context):
+                            self.pool.get('create.picking.move.processor').write(cr, uid, sad_move.id, {
+                                'ordered_quantity': sad_move.ordered_quantity + return_qty,
+                                'quantity': sad_move.quantity + return_qty,
+                            }, context=context)
 
             # Log message for PPL
             ppl_view = data_obj.get_object_reference(cr, uid, 'msf_outgoing', 'view_ppl_form')[1]
@@ -4477,6 +4543,14 @@
                 # get the draft picking
                 draft_picking_id = picking.backorder_id.id
 
+                # get the linked "save as draft" wizard if has:
+                picking_processor_wiz = self.pool.get('create.picking.processor').search(cr, uid, [
+                    ('picking_id', '=', draft_picking_id),
+                    ('draft', '=', True),
+                ], context=context)
+                if picking_processor_wiz:
+                    picking_processor_wiz = self.pool.get('create.picking.processor').browse(cr, uid, picking_processor_wiz[0], context=context)
+
                 # for each move from picking ticket - could be split moves
                 for move in picking.move_lines:
                     # find the corresponding move in draft
@@ -4486,6 +4560,25 @@
                         initial_qty = move_obj.read(cr, uid, [draft_move.id], ['product_qty'], context=context)[0]['product_qty']
                         initial_qty += move.product_qty
                         move_obj.write(cr, uid, [draft_move.id], {'product_qty': initial_qty}, context=context)
+
+                        # Update or create "save as draft" lines with returned qty:
+                        if picking_processor_wiz:
+                            save_as_draft_move = self.pool.get('create.picking.move.processor').search(cr, uid, [
+                                ('wizard_id', '=', picking_processor_wiz.id),
+                                ('move_id', '=', draft_move.id),
+                            ], context=context)
+                            if not save_as_draft_move: # then create the SaD line:
+                                move_data = self.pool.get('create.picking.move.processor')._get_line_data(cr, uid, wizard=picking_processor_wiz, move=move, context=context)
+                                move_data.update({'quantity': move.product_qty})
+                                save_as_draft_move = self.pool.get('create.picking.move.processor').create(cr, uid, move_data, context=context)
+                                save_as_draft_move = [save_as_draft_move]
+                            else: # update Sad line
+                                for sad_move in self.pool.get('create.picking.move.processor').browse(cr, uid, save_as_draft_move, context=context):
+                                    self.pool.get('create.picking.move.processor').write(cr, uid, sad_move.id, {
+                                        'ordered_quantity': sad_move.ordered_quantity + move.product_qty,
+                                        'quantity': sad_move.quantity + move.product_qty,
+                                    }, context=context)
+
                         # log the increase action
                         # TODO refactoring needed
                         obj_data = self.pool.get('ir.model.data')

=== modified file 'bin/addons/msf_outgoing/wizard/create_picking_processor.py'
--- bin/addons/msf_outgoing/wizard/create_picking_processor.py	2016-11-09 09:07:38 +0000
+++ bin/addons/msf_outgoing/wizard/create_picking_processor.py	2017-09-01 09:49:29 +0000
@@ -40,6 +40,7 @@
             'wizard_id',
             string='Moves',
         ),
+        'draft': fields.boolean('Draft'),
     }
 
     """
@@ -54,11 +55,50 @@
 
         wizard_brw_list = self.browse(cr, uid, ids, context=context)
 
+        # disable "save as draft":
+        self.write(cr, uid, ids, {'draft': False}, context=context)
+
         self.integrity_check_quantity(cr, uid, wizard_brw_list, context=context)
         self.integrity_check_prodlot(cr, uid, wizard_brw_list, context=context)
         # call stock_picking method which returns action call
         return picking_obj.do_create_picking(cr, uid, ids, context=context)
 
+
+    def do_reset(self, cr, uid, ids, context=None):
+        if context is None:
+            context = {}
+        if isinstance(ids, (int, long)):
+            ids = [ids]
+        if not ids:
+            raise osv.except_osv(
+                _('Processing Error'),
+                _('No data to process !'),
+            )
+
+        pick_id = []
+        for proc in self.browse(cr, uid, ids, context=context):
+            pick_id = proc['picking_id']['id']
+
+        self.write(cr, uid, ids, {'draft': False}, context=context)
+
+        return self.pool.get('stock.picking').create_picking(cr, uid, pick_id, context=context)
+
+
+    def do_save_draft(self, cr, uid, ids, context=None):
+        if context is None:
+            context = {}
+        if isinstance(ids, (int, long)):
+            ids = [ids]
+        if not ids:
+            raise osv.except_osv(
+                _('Processing Error'),
+                _('No data to process !'),
+            )
+
+        self.write(cr, uid, ids, {'draft': True}, context=context)
+
+        return {}
+
 create_picking_processor()
 
 

=== modified file 'bin/addons/msf_outgoing/wizard/create_picking_processor_view.xml'
--- bin/addons/msf_outgoing/wizard/create_picking_processor_view.xml	2016-10-28 12:36:50 +0000
+++ bin/addons/msf_outgoing/wizard/create_picking_processor_view.xml	2017-09-01 09:49:29 +0000
@@ -15,9 +15,11 @@
                     <separator colspan="4" string="Move lines" />
                     <field name="move_ids" mode="tree"
                            colspan="4" nolabel="1" />
+                    <field name="draft" invisible="1"/>
                     <group colspan="4" col="6" name="actions">
                         <separator string="Actions" colspan="6" />
-                        <label colspan="4"> </label>
+                        <button name="do_reset" type="object" string="Reset" attrs="{'invisible':[('draft','!=',True)]}" icon="gtk-go-forward" />
+                        <button name="do_save_draft" type="object" string="Save as draft" icon="gtk-go-forward" />
                         <button special="cancel" string="Cancel" icon="gtk-cancel" />
                         <button name="do_create_picking" type="object" string="Create Picking" icon="gtk-go-forward" />
                     </group>

=== modified file 'bin/addons/msf_outgoing/wizard/validate_picking_processor.py'
--- bin/addons/msf_outgoing/wizard/validate_picking_processor.py	2016-11-09 09:07:38 +0000
+++ bin/addons/msf_outgoing/wizard/validate_picking_processor.py	2017-09-01 09:49:29 +0000
@@ -41,6 +41,7 @@
             'wizard_id',
             string='Moves to process',
         ),
+        'draft': fields.boolean('Draft'),
     }
 
     """
@@ -58,8 +59,10 @@
         if context is None:
             context = {}
 
+        # disable "save as draft":
+        self.write(cr, uid, ids, {'draft': False}, context=context)
+
         to_unlink = []
-
         for proc in self.browse(cr, uid, ids, context=context):
             total_qty = 0.00
 
@@ -154,6 +157,42 @@
 
         return True
 
+
+    def do_reset(self, cr, uid, ids, context=None):
+        if context is None:
+            context = {}
+        if isinstance(ids, (int, long)):
+            ids = [ids]
+        if not ids:
+            raise osv.except_osv(
+                _('Processing Error'),
+                _('No data to process !'),
+            )
+
+        pick_id = []
+        for proc in self.browse(cr, uid, ids, context=context):
+            pick_id = proc['picking_id']['id']
+
+        self.write(cr, uid, ids, {'draft': False}, context=context)
+
+        return self.pool.get('stock.picking').validate_picking(cr, uid, pick_id, context=context)
+
+
+    def do_save_draft(self, cr, uid, ids, context=None):
+        if context is None:
+            context = {}
+        if isinstance(ids, (int, long)):
+            ids = [ids]
+        if not ids:
+            raise osv.except_osv(
+                _('Processing Error'),
+                _('No data to process !'),
+            )
+
+        self.write(cr, uid, ids, {'draft': True}, context=context)
+
+        return {}
+
 validate_picking_processor()
 
 

=== modified file 'bin/addons/msf_outgoing/wizard/validate_picking_processor_view.xml'
--- bin/addons/msf_outgoing/wizard/validate_picking_processor_view.xml	2016-10-28 12:36:50 +0000
+++ bin/addons/msf_outgoing/wizard/validate_picking_processor_view.xml	2017-09-01 09:49:29 +0000
@@ -15,9 +15,11 @@
                     <separator colspan="4" string="Move lines" />
                     <field name="move_ids" mode="tree"
                            colspan="4" nolabel="1" />
+                    <field name="draft" invisible="1"/>
                     <group colspan="4" col="6" name="actions">
                         <separator string="Actions" colspan="6" />
-                        <label colspan="4"> </label>
+                        <button name="do_reset" type="object" string="Reset" attrs="{'invisible':[('draft','!=',True)]}" icon="gtk-go-forward" />
+                        <button name="do_save_draft" type="object" string="Save as draft" icon="gtk-go-forward" />
                         <button special="cancel" string="Cancel" icon="gtk-cancel" />
                         <button name="do_validate_picking" type="object" string="Validate Picking" icon="gtk-go-forward" />
                     </group>

=== modified file 'bin/addons/msf_profile/data.xml'
=== modified file 'bin/addons/msf_profile/data/patches.xml'
--- bin/addons/msf_profile/data/patches.xml	2017-08-25 15:40:47 +0000
+++ bin/addons/msf_profile/data/patches.xml	2017-09-01 09:49:29 +0000
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <openerp>
     <data>
+<<<<<<< TREE
         <record id="us_2647_patch" model="patch.scripts">
             <field name="method">us_2647</field>
         </record>
@@ -23,6 +24,27 @@
             <field name="method">us_2806_add_ir_ui_view_constraint</field>
         </record>
 
+=======
+        <record id="us_244_patch" model="patch.scripts">
+            <field name="method">us_2444_touch_liquidity_journals</field>
+        </record>
+
+        <record id="us_3098_patch" model="patch.scripts">
+            <field name="method">us_3098_patch</field>
+        </record>
+        
+        <record id="us_2257_patch" model="patch.scripts">
+            <field name="method">us_2257_patch</field>
+        </record>
+        <record id="us_2730_patch" model="patch.scripts">
+            <field name="method">us_2730_patch</field>
+        </record>
+
+        <record id="us_2806_add_ir_ui_view_constraint" model="patch.scripts">
+            <field name="method">us_2806_add_ir_ui_view_constraint</field>
+        </record>
+
+>>>>>>> MERGE-SOURCE
         <record id="remove_not_synchronized_data" model="patch.scripts">
             <field name="method">remove_not_synchronized_data</field>
         </record>

=== modified file 'bin/addons/msf_profile/i18n/fr_MF.po'
--- bin/addons/msf_profile/i18n/fr_MF.po	2017-08-29 13:47:43 +0000
+++ bin/addons/msf_profile/i18n/fr_MF.po	2017-09-01 09:49:29 +0000
@@ -10842,7 +10842,7 @@
 msgid "International status"
 msgstr "International status"
 
-#. modules: return_claim, msf_outgoing
+#. modules: return_claim, delivery_mechanism, msf_outgoing, stock_override, stock
 #: code:addons/msf_outgoing/msf_outgoing.py:536
 #: code:addons/msf_outgoing/msf_outgoing.py:739
 #: code:addons/msf_outgoing/msf_outgoing.py:778
@@ -10897,7 +10897,7 @@
 #: code:addons/return_claim/return_claim.py:1639
 #, python-format
 msgid "Processing Error"
-msgstr "Erreur en cours "
+msgstr "Erreur de traitement"
 
 #. module: account_payment
 #: field:payment.order,mode:0
@@ -35824,6 +35824,44 @@
 msgid "Only technically to filter currencies according to partner type"
 msgstr "Seulement techniquement pour filtrer les devises d'après le type de partenaire"
 
+<<<<<<< TREE
+=======
+#. modules: purchase, product, msf_outgoing, purchase_override, supplier_catalogue, sale, account, kit, purchase_allocation_report, order_types, tender_flow, register_accounting, stock, msf_doc_import
+#: field:account.invoice.line,price_unit:0
+#: report:account.invoice2:0
+#: field:kit.selection.line,price_unit_kit_selection_line:0
+#: field:kit.selection.sale.line,price_unit_kit_selection_sale_line:0
+#: report:invoice:0
+#: field:stock.certificate.valuation,unit_price:0
+#: field:pricelist.partnerinfo,price:0
+#: report:purchase.order:0
+#: field:purchase.order.line,price_unit:0
+#: report:po.line.allocation.report:0
+#: report:purchase.order.allocation.report:0
+#: field:purchase.order.line.allocation.report,unit_price:0
+#: report:msf.purchase.order:0
+#: report:purchase.order.merged:0
+#: field:purchase.order.merged.line,price_unit:0
+#: field:wizard.account.invoice.line,price_unit:0
+#: report:msf.sale.order:0
+#: report:sale.order.allocation.report:0
+#: field:sale.order.line,price_unit:0
+#: report:lot.stock.overview:0
+#: report:lot.stock.overview_all:0
+#: field:stock.move,price_unit:0
+#: field:supplier.catalogue.line,unit_price:0
+#: report:addons/tender_flow/report/tender_rfq_comparison_xls.mako:577
+#: code:addons/msf_doc_import/wizard/__init__.py:112
+#: code:addons/msf_doc_import/wizard/__init__.py:133
+#: code:addons/msf_doc_import/wizard/wizard_import_invoice_line.py:195
+#: field:wizard.simu.import.po.line,import_unit_price:0
+#: field:wizard.simu.import.po.line,initial_unit_price:0
+#: field:account.direct.invoice.wizard.line,price_unit:0
+#, python-format
+msgid "Unit Price"
+msgstr "Prix unitaire"
+
+>>>>>>> MERGE-SOURCE
 #. module: base
 #: field:res.config.users,is_erp_manager:0
 #: field:res.users,is_erp_manager:0
@@ -37260,7 +37298,7 @@
 #: code:addons/return_claim/return_claim.py:1640
 #, python-format
 msgid "No data to process !"
-msgstr "No data to process !"
+msgstr "Aucune donnée à traiter !"
 
 #. module: stock_override
 #: field:export.report.stock.move,exported_file:0
@@ -63785,23 +63823,6 @@
 msgid "Child Accounts"
 msgstr "Comptes Enfant "
 
-#. modules: delivery_mechanism, msf_outgoing, stock_override, stock
-#: code:addons/delivery_mechanism/wizard/stock_partial_picking.py:149
-#: code:addons/msf_outgoing/wizard/shipment.py:444
-#: code:addons/stock/wizard/stock_move.py:265
-#: code:addons/stock/wizard/stock_partial_picking.py:157
-#: code:addons/stock/wizard/stock_partial_picking.py:165
-#: code:addons/stock/wizard/stock_partial_picking.py:172
-#: code:addons/stock_override/wizard/stock_partial_picking.py:113
-#: code:addons/stock_override/wizard/stock_partial_picking.py:131
-#: code:addons/stock_override/wizard/stock_partial_picking.py:138
-#: code:addons/stock_override/wizard/stock_partial_picking.py:149
-#: code:addons/stock_override/wizard/stock_partial_picking.py:187
-#: code:addons/stock_override/wizard/stock_partial_picking.py:193
-#, python-format
-msgid "Processing Error"
-msgstr "Erreur de traitement"
-
 #. module: specific_rules
 #: help:product.uom,uom_by_product:0
 msgid "Field used to filter the UoM for a specific product"
@@ -98303,6 +98324,7 @@
 msgid "Intermission Vouchers linked to a PO can be deleted only in Draft state."
 msgstr "Les Bons Intermission liés à un BC ne peuvent être supprimés qu'à l'état Brouillon."
 
+<<<<<<< TREE
 #. module: account_override
 #: code:addons/account_override/invoice.py:723
 #, python-format
@@ -99361,3 +99383,609 @@
 msgid "Unable to generate updates, retrying %d/%d"
 msgstr "Impossible de générer les data, nouvel essai %d/%d"
 
+=======
+#. module: account_override
+#: code:addons/account_override/invoice.py:723
+#, python-format
+msgid "No Intermission journal found for the current instance."
+msgstr "Pas de journal Intermission trouvé pour l'instance actuelle."
+
+#. module: purchase_override
+#: field:purchase.order,fixed_order_type:0
+msgid "Possible order types"
+msgstr "Types de commande possibles"
+
+#. module: purchase_override
+#: code:addons/purchase_override/purchase.py:669
+#: code:addons/purchase_override/purchase.py:853
+#, python-format
+msgid "%s: This purchase order is a loan counterpart. You cannot change its order type"
+msgstr "%s: Ce bon de commande est la contrepartie d'un prêt. Vous ne pouvez pas modifier son type"
+
+#. module: purchase_override
+#: code:addons/purchase_override/purchase.py:672
+#: code:addons/purchase_override/purchase.py:857
+#, python-format
+msgid "%s: Only %s order types are allowed for this purchase order"
+msgstr "%s: Seuls les types %s sont autorisés pour cette commande"
+
+#. modules: sourcing, purchase_override, sync_so
+#: constraint:purchase.order:0
+#: constraint:purchase.order:0
+#: constraint:purchase.order:0
+msgid "The order type of the order is not consistent with the order type of the source"
+msgstr "Le type de commande n'est pas compatible avec le type de la commande qui est sourcée"
+
+#. module: purchase_override
+#: code:addons/purchase_override/purchase.py:888
+#, python-format
+msgid "You cannot select Direct Purchase order for a lines sourced to a normal PO"
+msgstr "Vous ne pouvez pas sélectionner 'Bon de commande direct' pour des lignes sourcées sur un PO normal"
+
+#. module: sourcing
+#: code:addons/sourcing/sale_order_line.py:929
+#, python-format
+msgid "loan"
+msgstr "prêt"
+
+#. module: sourcing
+#: code:addons/sourcing/sale_order_line.py:929
+#, python-format
+msgid "donation"
+msgstr "don"
+
+#. module: sourcing
+#: code:addons/sourcing/sale_order_line.py:1004
+#, python-format
+msgid "You can only source a Donation line from stock."
+msgstr "Vous pouvez sourcé une ligne de don uniquement sur stock"
+
+#. module: sourcing
+#: code:addons/sourcing/sale_order_line.py:1278
+#, python-format
+msgid "You can't source a donation 'on order'."
+msgstr "Vous ne pouvez pas sourcer un don 'sur commande'."
+
+#. module: base
+#: field:ir.model,default_order:0
+#, python-format
+msgid "Default Order"
+msgstr "Ordre par défaut"
+
+#. module: mission_stock
+#: view:mission.stock.wizard:0
+msgid "Errors"
+msgstr "Erreurs"
+
+#. module: mission_stock
+#: field:stock.mission.report,export_state:0
+msgid "Export state"
+msgstr "Statut du rapport"
+
+#. module: mission_stock
+#: selection:stock.mission.report,export_state:0
+msgid "Draft"
+msgstr "Brouillon"
+
+#. module: mission_stock
+#: selection:stock.mission.report,export_state:0
+msgid "Error"
+msgstr "Erreur"
+
+#. module: mission_stock
+#: field:mission.stock.wizard,export_error_msg:0
+#: field:stock.mission.report,export_error_msg:0
+msgid "Error message"
+msgstr "Message d'erreur"
+
+#. modules: finance, msf_profile
+#: model:ir.actions.act_window,name:finance.account_board_commitment_voucher
+#: view:board.board:0
+msgid "Commitment Vouchers to validate"
+msgstr "Bons d'Engagement à valider"
+
+#. module: account_reconciliation
+#: field:account.move.reconcile,nb_partial_legs:0
+msgid "Nb legs in partial reconcile"
+msgstr "Nb d'entrées du lettrage partiel"
+
+#. module: product_attributes
+#: selection:product.product,state_ud:0
+msgid "Forbidden"
+msgstr "Interdit"
+
+#. module: msf_doc_import
+#: code:addons/msf_doc_import/wizard/wizard_import_invoice_line.py:106
+#, python-format
+msgid "No data found in the spreadhseet."
+msgstr "Aucune donnée trouvée dans le tableur."
+
+#. module: msf_doc_import
+#: code:addons/msf_doc_import/wizard/wizard_import_invoice_line.py:143
+#, python-format
+msgid "Line %s. %s was not set. This field is mandatory."
+msgstr "Ligne %s. %s n'est pas défini. Ce champ est requis."
+
+#. module: msf_doc_import
+#: code:addons/msf_doc_import/wizard/wizard_import_invoice_line.py:156
+#, python-format
+msgid "Line %s. Account %s not found!"
+msgstr "Ligne %s. Compte %s non trouvé !"
+
+#. module: msf_doc_import
+#: code:addons/msf_doc_import/wizard/wizard_import_invoice_line.py:162
+#, python-format
+msgid "Line %s. Account %s is 'Donations' type which is forbidden."
+msgstr "Ligne %s. Le compte %s est de type 'Donations' ce qui est interdit."
+
+#. module: msf_doc_import
+#: code:addons/msf_doc_import/wizard/wizard_import_invoice_line.py:174
+#, python-format
+msgid "Line %s: Some restrictions prevent account %s to be used to import this line:\n"
+"- the account cannot be of type 'View' or 'Liquidity'\n"
+"- account can not be corrected on HQ entries\n"
+"- 'Type for specific treatment' cannot be 'Donations'\n"
+"- 'Internal Type' should be different from 'Regular' OR 'Account Type' should be different from 'Stock'\n"
+"- 'Account Type' should be different from 'Expense' OR 'P&L / BS Category' not None."
+msgstr "Ligne %s: Des restrictions empêchent le compte %s d'être utilisé pour importer cette ligne :\n"
+"- le compte ne peut pas être de type 'Vue' ou 'Liquidités'\n"
+"- compte impossible à corriger dans les entrées HQ\n"
+"- 'Type pour traitement spécifique' ne peut pas être 'Donations'\n"
+"- 'Type Interne' doit être différent de 'Normal' OU 'Type de Compte' doit être différent de 'Stock'\n"
+"- 'Type de Compte' doit être différent de 'Expense' OU 'Catégorie Bilan/Cte de Résultat' ne doit pas être vide."
+
+#. module: msf_doc_import
+#: code:addons/msf_doc_import/wizard/wizard_import_invoice_line.py:168
+#, python-format
+msgid "Line %s: Some restrictions prevent account %s to be used to import this line:\n"
+"- the account cannot be of type 'View'\n"
+"- account can not be corrected on HQ entries\n"
+"- 'Account Type' should be in ('expense', 'income', 'receivables')\n"
+"- 'P&L / BS Category' cannot be None."
+msgstr "Ligne %s: Des restrictions empêchent le compte %s d'être utilisé pour importer cette ligne :\n"
+"- le compte ne peut pas être de type 'Vue'\n"
+"- compte impossible à corriger dans les entrées HQ\n"
+"- 'Type de Compte' doit être de type 'expense', 'income' ou 'receivables'\n"
+"- 'Catégorie Bilan/Cte de Résultat' ne doit pas être vide."
+
+#. module: msf_doc_import
+#: code:addons/msf_doc_import/wizard/wizard_import_invoice_line.py:184
+#, python-format
+msgid "\n"
+"- 'Account Type' should be in ('expense', 'income', 'receivables')."
+msgstr "\n"
+"- 'Type de Compte' doit être de type 'expense', 'income' ou 'receivables'."
+
+#. module: msf_doc_import
+#: code:addons/msf_doc_import/wizard/wizard_import_invoice_line.py:275
+#: code:addons/msf_doc_import/wizard/wizard_import_invoice_line.py:280
+#: code:addons/msf_doc_import/wizard/wizard_import_po_line.py:370
+#: code:addons/msf_doc_import/wizard/wizard_import_po_line.py:378
+#, python-format
+msgid "Line %s in the Excel file, uncaught error: %s\n"
+""
+msgstr "Ligne %s du fichier Excel, erreur non détectée: %s\n"
+""
+
+#. module: msf_doc_import
+#: code:addons/msf_doc_import/wizard/wizard_import_invoice_line.py:354
+#, python-format
+msgid "You can refresh the screen if you need to follow the upload progress by clicking on 'Update'."
+msgstr "Vous pouvez rafraichir l'écran si vous avez besoin de suivre la progresion du téléchargement en cliquant sur le bouton 'Mettre à jour'."
+
+#. module: msf_doc_import
+#: model:ir.model,name:msf_doc_import.model_wizard_import_invoice_line
+msgid "Import Invoice Lines from Excel sheet"
+msgstr "Importer des lignes depuis un fichier Excel"
+
+#. module: finance
+#: code:addons/finance/invoice.py:57
+#, python-format
+msgid "%s_template.xls"
+msgstr "modèle_%s.xls"
+
+#. module: stock_override
+#: field:stock.location,filter_partner_id2:0
+msgid "Filter location by partner"
+msgstr "Filtrer l'emplacement de stock par partenaire"
+
+#. module: register_accounting
+#: code:addons/register_accounting/wizard/import_cheque_on_bank_registers.py:166
+#, python-format
+msgid "Please add a Document Date on imported lines."
+msgstr "Veuillez saisir la date du document sur les lignes importées."
+
+#. module: product_list
+#: code:addons/product_list/product_list.py:306
+#: code:addons/product_list/product_list.py:316
+#, python-format
+msgid "This product cannot be added as it already exists in this list."
+msgstr "Ce produit ne peut pas être ajouter car il est déjà présent dans la liste"
+
+#. module: product_list
+#: code:addons/product_list/wizard/add_products.py:103
+#, python-format
+msgid "product(s) %s already exist(s) in the product list and so cannot be added"
+msgstr "Les produits %s ne peuvent pas être ajouter car ils sont déjà présent dans la liste de produits"
+
+#. module: account_mcdb
+#: field:account.mcdb,top_prop_instance_ids:0
+msgid "Top Proprietary instances"
+msgstr "Instances propriétaires parentes"
+
+#. module: account_mcdb
+#: field:account.mcdb,rev_top_prop_instance_ids:0
+msgid "Exclude top prop instances selection"
+msgstr "Exclure la selection d'instances prop. parentes"
+
+#. module: account_mcdb
+#: field:account.mcdb,display_top_prop_instance:0
+msgid "Display Top prop instances?"
+msgstr "Afficher les instances propriétaires parentes"
+
+#. module: account_mcdb
+#: code:addons/account_mcdb/account_mcdb.py:230
+#, python-format
+msgid "You cannot select 'Instances' because 'Top prop Instances' is already selected."
+msgstr "Vous ne pouvez pas selectionner 'Instances' car 'Instance prop. parente' est déjà selectionné."
+
+#. module: account_mcdb
+#: view:account.mcdb:0
+msgid "Top prop Instances"
+msgstr "Instance prop. parente"
+
+#. module: account_mcdb
+#: code:addons/account_mcdb/account_mcdb.py:244
+#, python-format
+msgid "You cannot select 'Top prop Instances' because 'Instances' is already selected."
+msgstr "Vous ne pouvez pas selectionner 'Instance prop. parente' car 'Instances' est déjà selectionné."
+
+#. module: account_mcdb
+#: field:account.mcdb,rev_instance_ids:0
+msgid "Exclude instances selection"
+msgstr "Exclure la sélection d'instance"
+
+#. module: account_mcdb
+#: view:account.mcdb:0
+msgid "Remove all Instances"
+msgstr "Supprimer toutes les instances"
+
+#. module: account_mcdb
+#: view:account.mcdb:0
+msgid "Add all Instances"
+msgstr "Ajouter toutes les instances"
+
+#. module: account_mcdb
+#: view:account.mcdb:0
+msgid "Remove Prop Instances"
+msgstr "Supprimer toutes les instances propriétaires"
+
+#. module: account_mcdb
+#: view:account.mcdb:0
+msgid "Add Prop Instances"
+msgstr "Ajouter toutes les instances propriétaires"
+
+#. module: account
+#: report:addons/account/report/account_liquidity_balance.mako:171
+msgid "Calculated balance"
+msgstr "Solde calculé (théorique)"
+
+#. module: account
+#: code:addons/account/wizard/account_report_liquidity_balance.py:65
+#: model:ir.actions.act_window,name:account.action_liquidity_balance_report
+#: model:ir.ui.menu,name:account.menu_liquidity_balance_report
+#: report:addons/account/report/account_liquidity_balance.mako:142
+#, python-format
+msgid "Liquidity Balances"
+msgstr "Balances de trésorie"
+
+#. module: account
+#: code:addons/account/wizard/account_report_common_partner.py:89
+#, python-format
+msgid "Only dates of the selected Fiscal Year can be chosen."
+msgstr "Seules des dates de l'exercice comptable sélectionné peuvent être choisies."
+
+#. module: mission_stock
+#: field:mission.stock.wizard,processed_state:0
+msgid "Processing"
+msgstr "En traitement..."
+
+#. module: mission_stock
+#: view:mission.stock.wizard:0
+msgid "Updating..."
+msgstr "Mise à jour ..."
+
+#. module: mission_stock
+#: field:mission.stock.wizard,processed_start_date:0
+msgid "since"
+msgstr "depuis"
+
+#. module: stock_override
+#: code:addons/stock_override/stock.py:389
+#, python-format
+msgid "The source location of lines has been changed to the same as header value"
+msgstr "La zone source des lignes a été changé avec la valeur présente en en-tête"
+
+#. module: stock_override
+#: code:addons/stock_override/stock.py:393
+#, python-format
+msgid "Warning, you have removed header value source location! The lines will be re-set to have 'Other Supplier' as the source location. Please check this is correct!"
+msgstr "Attention, vous avez supprimé la zone source d'en-tête! La zone source des lignes va être réinitialisée avec la valeur 'Autre Fournisseur'. Merci de vérifier leur cohérence!"
+
+#. module: account_override
+#: code:addons/account_override/account.py:524
+#, python-format
+msgid "An account can't be both reconcilable and included in the yearly move to 0."
+msgstr "Un compte ne peut pas être à la fois lettrable et inclus dans la mise à zéro annuelle."
+
+#. module: account_period_closing_level
+#: code:addons/account_period_closing_level/account_year_end_closing.py:423
+#, python-format
+msgid "The yearly closure can't be processed due to one or several reconciled entries that are included in the move to 0."
+msgstr "La fermeture de l'année fiscale ne peut pas être effectuée car une ou plusieurs écritures incluses dans la mise à zéro sont déjà lettrées."
+
+#. module: account_reconciliation
+#: code:addons/account_reconciliation/account_move_line.py:269
+#, python-format
+msgid "The entries included in the yearly move to zero can't be reconciled together because they are unbalanced."
+msgstr "Les écritures incluses dans la mise à zéro annuelle ne peuvent pas être lettrées ensemble car elles ne sont pas équilibrées."
+
+#. modules: account_override, account_mcdb, account
+#: field:account.move.line,open_items:0
+#: field:account.mcdb,open_items:0
+#: field:account.report.general.ledger,open_items:0
+msgid "Open Items at"
+msgstr "Écritures ouvertes à"
+
+#. module: account
+#: model:ir.actions.server,name:account.action_aml_related_entries
+msgid "Related Entries"
+msgstr "Ecritures associées"
+
+#. module: account
+#: code:addons/account/account_move_line.py:1369
+#, python-format
+msgid "Related entries: Entry Sequence %s"
+msgstr "Ecritures associées : Entrée Comptable %s"
+
+#. module: account
+#: code:addons/account/account_move_line.py:1330
+#, python-format
+msgid "The related entries feature can only be used with one Journal Item."
+msgstr "La fonctionnalité des écritures associées ne peut être utilisée qu'avec une seule ligne d'écriture comptable."
+
+#. module: account_period_closing_level
+#: code:addons/account_period_closing_level/account_period.py:217
+#, python-format
+msgid "One or several registers have not been generated for the period to close and have a balance which isn't equal to 0:\n"
+"%s"
+msgstr "Un ou plusieurs registres n'ont pas été générés pour la période à fermer et ont un solde qui n'est pas égal à 0 :\n"
+"%s"
+
+#. module: res_currency_tables
+#: code:addons/res_currency_tables/res_currency.py:0
+#, python-format
+msgid "delete"
+msgstr "supprimer"
+
+#. module: res_currency_tables
+#: code:addons/res_currency_tables/res_currency.py:0
+#, python-format
+msgid "de-activate"
+msgstr "désactiver"
+
+#. module: res_currency_tables
+#: code:addons/res_currency_tables/res_currency.py:225
+#, python-format
+msgid "The currency you want to %s is used in at least one active partner form."
+msgstr "La devise que vous désirez %s est utilisée dans au moins un formulaire d'un partenaire actif."
+
+#. module: res_currency_tables
+#: code:addons/res_currency_tables/res_currency.py:216
+#, python-format
+msgid "The currency you want to %s is used in at least one Field Order which isn't Closed."
+msgstr "La devise que vous désirez %s est utilisée dans au moins une Commande de Terrain qui n'est pas Clôturée."
+
+#. module: res_currency_tables
+#: code:addons/res_currency_tables/res_currency.py:216
+#, python-format
+msgid "The currency you want to %s is used in at least one Purchase Order which isn't Closed."
+msgstr "La devise que vous désirez %s est utilisée dans au moins un Bon de Commande qui n'est pas Clôturé."
+
+#. module: res_currency_tables
+#: code:addons/res_currency_tables/res_currency.py:230
+#, python-format
+msgid "The currency you want to %s is used in at least one document in Draft or Open state."
+msgstr "La devise que vous désirez %s est utilisée dans au moins un document à l'état Brouillon ou Ouvert."
+
+#. module: res_currency_tables
+#: code:addons/res_currency_tables/res_currency.py:256
+#, python-format
+msgid "The currency you want to %s is used in at least one Register in Draft or Open state."
+msgstr "La devise que vous désirez %s est utilisée dans au moins un Registre à l'état Brouillon ou Ouvert."
+
+#. module: res_currency_tables
+#: code:addons/res_currency_tables/res_currency.py:236
+#, python-format
+msgid "The currency you want to %s is used in at least one Journal Item in Unposted state."
+msgstr "La devise que vous désirez %s est utilisée dans au moins une Ligne d'écriture comptable non comptabilisée."
+
+#. module: res_currency_tables
+#: code:addons/res_currency_tables/res_currency.py:263
+#, python-format
+msgid "The currency you want to %s is used in at least one Recurring Entry having a state not Done."
+msgstr "La devise que vous désirez %s est utilisée dans au moins une Ecriture Périodique avec un statut non Terminé."
+
+#. module: res_currency_tables
+#: code:addons/res_currency_tables/res_currency.py:240
+#, python-format
+msgid "The currency you want to %s is used in at least one Commitment Voucher which isn't Done."
+msgstr "La devise que vous désirez %s est utilisée dans un moins un Bon d'Engagement non Terminé."
+
+#. module: res_currency_tables
+#: code:addons/res_currency_tables/res_currency.py:244
+#, python-format
+msgid "The currency you want to %s is used in at least one HQ Entry which isn't validated."
+msgstr "La devise que vous désirez %s est utilisée dans au moins une Ecriture HQ non validée."
+
+#. module: res_currency_tables
+#: code:addons/res_currency_tables/res_currency.py:272
+#, python-format
+msgid "The currency you want to %s is used in at least one Draft or Partially Posted Accrual Line."
+msgstr "La devise que vous désirez %s est utilisée dans au moins une Ligne de Régularisation à l'état Brouillon ou Partiellement Comptabilisée."
+
+#. module: res_currency_tables
+#: code:addons/res_currency_tables/res_currency.py:249
+#, python-format
+msgid "The currency you want to %s is used in at least one Payroll Entry which isn't validated."
+msgstr "La devise que vous désirez %s est utilisée dans au moins une Ecriture de Paie non validée."
+
+#. module: account_override
+#: report:addons/account_override/report/open_invoices_xls.mako:315
+msgid "Payment Sequence Number"
+msgstr "Numéro de séquence du paiement"
+
+#. module: account_override
+#: report:addons/account_override/report/open_invoices_xls.mako:316
+msgid "Down Payment Sequence Number"
+msgstr "Numéro de séquence de l'acompte"
+
+#. module: account_override
+#: model:ir.actions.act_window,name:account_override.action_paid_invoices_menu
+#: model:ir.actions.report.xml,name:account_override.paid_invoices
+#: report:addons/account_override/report/open_invoices_xls.mako:238
+msgid "Paid Invoices"
+msgstr "Factures Payées"
+
+#. module: account_override
+#: report:addons/account_override/report/open_invoices_xls.mako:264
+msgid "PAID INVOICES"
+msgstr "FACTURES PAYÉES"
+
+#. module: account_override
+#: model:ir.model,name:account_override.model_wizard_report_paid_invoice
+msgid "Wizard of the Paid Invoices Report"
+msgstr "Assistant du Rapport des Factures Payées"
+
+#. module: account_override
+#: field:wizard.report.paid.invoice,beginning_date:0
+msgid "Beginning date"
+msgstr "Date de début"
+
+#. module: account_override
+#: field:wizard.report.paid.invoice,ending_date:0
+msgid "Ending date"
+msgstr "Date de fin"
+
+#. module: account_override
+#: report:addons/account_override/report/open_invoices_xls.mako:290
+msgid "Beginning date:"
+msgstr "Date de début :"
+
+#. module: account_override
+#: report:addons/account_override/report/open_invoices_xls.mako:296
+msgid "Ending date:"
+msgstr "Date de fin :"
+
+#. module: account_override
+#: report:addons/account_override/report/open_invoices_xls.mako:306
+msgid "Intermission Vouchers IN"
+msgstr "Bons Intermission IN"
+
+#. module: account_override
+#: report:addons/account_override/report/open_invoices_xls.mako:307
+msgid "Intermission Vouchers OUT"
+msgstr "Bons Intermission OUT"
+
+#. module: account_override
+#: report:addons/account_override/report/open_invoices_xls.mako:305
+msgid "Donations"
+msgstr "Donations"
+
+#. module: account_override
+#: report:addons/account_override/report/open_invoices_xls.mako:307
+msgid "Debit Notes"
+msgstr "Notes de débit"
+
+#. module: msf_homere_interface
+#: code:addons/msf_homere_interface/wizard/hr_payroll_import.py:188
+#, python-format
+msgid "This account is a Donation account: %s"
+msgstr "Ce compte est un compte de Donation : %s"
+
+#. module: account_override
+#: code:addons/account_override/account.py:597
+#, python-format
+msgid "Please check the Type for specific treatment of the accounts used."
+msgstr "Veuillez vérifier le Type pour traitement spécifique des comptes utilisés."
+
+#. module: msf_homere_interface
+#: field:hr.payroll.msf,has_third_party:0
+msgid "Has a Third Party"
+msgstr "A un Tiers"
+
+#. module: msf_homere_interface
+#: view:hr.payroll.msf:0
+msgid "Empty Third Party"
+msgstr "Pas de Tiers"
+
+#. module: msf_homere_interface
+#: model:ir.actions.server,name:msf_homere_interface.action_move_to_payroll_bs_lines
+msgid "Validate Payroll Expenses and move to Payroll B/S lines"
+msgstr "Valider les Lignes de dépenses et aller aux Lignes du bilan"
+
+#. module: msf_homere_interface
+#: code:addons/msf_homere_interface/hr_payroll.py:367
+#, python-format
+msgid "Payroll B/S lines"
+msgstr "Lignes de paye du bilan"
+
+#. module: msf_homere_interface
+#: code:addons/msf_homere_interface/wizard/hr_payroll_validation.py:324
+#, python-format
+msgid "An error occurred%s"
+msgstr "Une erreur est survenue%s"
+
+#. module: msf_homere_interface
+#: code:addons/msf_homere_interface/wizard/hr_payroll_validation.py:161
+#, python-format
+msgid "Checking account/partner compatibility..."
+msgstr "Vérification de la compatibilité compte/partenaire..."
+
+#. module: msf_homere_interface
+#: code:addons/msf_homere_interface/wizard/hr_payroll_validation.py:303
+#, python-format
+msgid "Posting of the Journal Entry. This may take a while..."
+msgstr "Comptabilisation de l'Ecriture Comptable. Cela peut prendre un certain temps..."
+
+#. module: msf_homere_interface
+#: code:addons/msf_homere_interface/wizard/hr_payroll_validation.py:308
+#, python-format
+msgid "Updating the status of the Journal Items..."
+msgstr "Mise à jour du statut des Lignes d'Ecritures Comptables..."
+
+#. module: msf_homere_interface
+#: code:addons/msf_homere_interface/wizard/hr_payroll_validation.py:213
+#, python-format
+msgid "Creation of the Journal Items..."
+msgstr "Création des Lignes d'Ecritures Comptables..."
+
+#. module: msf_currency_revaluation
+#: code:addons/msf_currency_revaluation/wizard/wizard_currency_revaluation.py:723
+#, python-format
+msgid "The following projects are not field-closed:\n"
+"%s"
+msgstr "Les projets suivants ne sont pas fermés sur le terrain :\n"
+"%s"
+
+#. module: register_accounting
+#: code:addons/register_accounting/account_bank_statement.py:120
+#, python-format
+msgid "Writing on liquidity journals %s is not allowed"
+msgstr "Vous ne pouvez pas modifier le journal de liquidité %s"
+
+#. module: sync_client
+#: field:sync.version.instance.monitor,instance_state:0
+msgid "Instance State"
+msgstr "État de l'instance"
+>>>>>>> MERGE-SOURCE

=== modified file 'bin/addons/msf_profile/msf_profile.py'
--- bin/addons/msf_profile/msf_profile.py	2017-08-25 15:40:47 +0000
+++ bin/addons/msf_profile/msf_profile.py	2017-09-01 09:49:29 +0000
@@ -47,6 +47,7 @@
         'model': lambda *a: 'patch.scripts',
     }
 
+<<<<<<< TREE
     def us_2647(self, cr, uid, *a, **b):
         cr.execute('''update stock_inventory_line set dont_move='t' where id not in (
                 select l.id from stock_inventory_line l
@@ -220,6 +221,171 @@
             else:
                 self._logger.warn('The constraint \'ir_ui_view_model_type_priority\' have not been created because there is some duplicated values.')
 
+=======
+    def us_2444_touch_liquidity_journals(self, cr, uid, *a, **b):
+        if _get_instance_level(self, cr, uid) == 'project':
+            cr.execute('''
+                update ir_model_data set last_modification=NOW(), touched='[''type'']'
+                where module='sd' and model='account.journal' and res_id in (
+                    select id from account_journal where type in ('bank', 'cash', 'cheque') and is_current_instance='t'
+                )
+            ''')
+
+    def us_3098_patch(self, cr, uid, *a, **b):
+        cr.execute("""
+            SELECT id, name
+            FROM res_partner
+            WHERE name IN (select name from res_partner where partner_type = 'internal')
+            AND name IN (select name from res_partner where partner_type = 'intermission')
+            AND partner_type = 'intermission';
+        """)
+        wrong_partners = cr.fetchall()
+
+        updated_doc = []
+        for partner in wrong_partners:
+            intermission_partner_id = partner[0]
+            partner_name = partner[1]
+            internal_partner_id = self.pool.get('res.partner').search(cr, uid, [
+                ('name', '=', partner_name),
+                ('partner_type', '=', 'internal'),
+            ])[0]
+            address_id = self.pool.get('res.partner.address').search(cr, uid, [
+                ('partner_id', '=', internal_partner_id),
+                ('type', '=', 'default'),
+            ])
+            if not address_id:
+                address_id = self.pool.get('res.partner.address').search(cr, uid, [
+                    ('partner_id', '=', internal_partner_id),
+                ])
+
+            address_id = address_id[0]
+
+            cr.execute("SELECT name FROM stock_picking WHERE partner_id = %s AND state not in ('done', 'cancel');", (intermission_partner_id,))
+            updated_doc += [x[0] for x in cr.fetchall()]
+            cr.execute("""
+                UPDATE stock_picking
+                SET partner_id = %s, partner_id2 = %s, address_id = %s, partner_type_stock_picking = 'internal', invoice_state = 'none'
+                WHERE partner_id = %s
+                AND state not in ('done', 'cancel');
+            """, (internal_partner_id, internal_partner_id, address_id, intermission_partner_id) )
+            cr.execute("""
+                UPDATE stock_move
+                SET partner_id = %s, partner_id2 = %s, address_id = %s
+                WHERE (partner_id = %s OR partner_id2 = %s) AND state not in ('done', 'cancel');
+            """, (internal_partner_id, internal_partner_id, address_id, intermission_partner_id, intermission_partner_id) )
+
+            cr.execute("SELECT name FROM purchase_order WHERE partner_id = %s AND state not in ('done', 'cancel');", (intermission_partner_id,))
+            updated_doc += [x[0] for x in cr.fetchall()]
+            cr.execute("""
+                UPDATE purchase_order
+                SET partner_id = %s, partner_address_id = %s, partner_type = 'internal'
+                WHERE partner_id = %s
+                AND state not in ('done', 'cancel');
+            """, (internal_partner_id, address_id, intermission_partner_id) )
+            cr.execute("""
+                UPDATE purchase_order_line pol
+                SET partner_id = %s
+                FROM purchase_order po
+                WHERE pol.order_id = po.id
+                AND pol.partner_id = %s
+                AND po.state not in ('done', 'cancel');
+            """, (internal_partner_id, intermission_partner_id) )
+
+            cr.execute("SELECT name FROM sale_order WHERE partner_id = %s AND state not in ('done', 'cancel');", (intermission_partner_id,))
+            updated_doc += [x[0] for x in cr.fetchall()]
+            cr.execute("""
+                UPDATE sale_order
+                SET partner_id = %s, partner_invoice_id = %s, partner_order_id = %s, partner_shipping_id = %s, partner_type = 'internal'
+                WHERE partner_id = %s
+                AND state not in ('done', 'cancel');
+            """, (internal_partner_id, address_id, address_id, address_id, intermission_partner_id) )
+            cr.execute("""
+                UPDATE sale_order_line sol
+                SET order_partner_id = %s
+                FROM sale_order so
+                WHERE sol.order_id = so.id
+                AND sol.order_partner_id = %s
+                AND so.state not in ('done', 'cancel');
+            """, (internal_partner_id, intermission_partner_id) )
+
+            cr.execute("SELECT name FROM shipment WHERE partner_id = %s AND state not in ('done', 'cancel', 'delivered');", (intermission_partner_id,))
+            updated_doc += [x[0] for x in cr.fetchall()]
+            cr.execute("""
+                UPDATE shipment
+                SET partner_id = %s, partner_id2 = %s, address_id = %s
+                WHERE partner_id = %s
+                AND state not in ('done', 'cancel', 'delivered');
+            """, (internal_partner_id, internal_partner_id, address_id, intermission_partner_id) )
+
+        self._logger.warn("Following documents have been updated with internal partner: %s" % ", ".join(updated_doc))
+
+        return True
+
+    def us_2257_patch(self, cr, uid, *a, **b):
+        context = {}
+        user_obj = self.pool.get('res.users')
+        partner_obj = self.pool.get('res.partner')
+        usr = user_obj.browse(cr, uid, [uid], context=context)[0]
+        level_current = False
+
+        if usr and usr.company_id and usr.company_id.instance_id:
+            level_current = usr.company_id.instance_id.level
+
+        if level_current == 'section':
+            intermission_ids = partner_obj.search(cr, uid, [('active', 'in', ['t', 'f']), ('partner_type', '=', 'intermission')])
+            address_ids = []
+            if intermission_ids:
+                address_ids = self.pool.get('res.partner.address').search(cr, uid, [('partner_id', 'in', intermission_ids)])
+                self._logger.warn('touch %d partners, %d addresses' % (len(intermission_ids), len(address_ids)))
+                cr.execute("update ir_model_data set touched='[''name'']', last_modification=now() where model='res.partner' and module='sd' and res_id in %s" , (tuple(intermission_ids), ))
+                if address_ids:
+                    cr.execute("update ir_model_data set touched='[''name'']', last_modification=now() where model='res.partner.address' and module='sd' and res_id in %s" , (tuple(address_ids), ))
+
+        return True
+
+    def us_2730_patch(self, cr, uid, *a, **b):
+        '''
+        remove all translations, and then re-import them
+        so that the {*}_MF.po files are authoratative
+        '''
+        cr.execute("""delete from ir_model_data where model='ir.translation' and res_id in (
+            select id from ir_translation where lang = 'fr_MF' and type != 'model'
+            )
+        """)
+        cr.execute("delete from ir_translation where lang = 'fr_MF' and type != 'model'")
+        irmm = self.pool.get('ir.module.module')
+        msf_profile_id = irmm.search(cr, uid, [('name', '=', 'msf_profile')])
+        irmm.update_translations(cr, uid, msf_profile_id)
+
+    def us_2632_patch(self, cr, uid, *a, **b):
+        '''fix ir.model.data entries on sync_server instances
+        '''
+        update_module = self.pool.get('sync.server.update')
+        if update_module:
+            cr.execute("""
+            UPDATE ir_model_data SET module='msf_sync_data_server' WHERE
+            model='sync_server.message_rule' AND module='';
+            """)
+
+    def us_2806_add_ir_ui_view_constraint(self, cr, uid, *a, **b):
+        '''
+        The constraint may have not been added during the update because it is
+        needeed to update all the modules before to add this constraint.
+        Having it in this patch script will add it at the end of the update.
+        '''
+        cr.execute('SELECT indexname FROM pg_indexes WHERE indexname = \'ir_ui_view_model_type_priority\'')
+        if not cr.fetchone():
+            cr.execute("""SELECT model, type, priority, count(*)
+            FROM ir_ui_view
+            WHERE inherit_id IS NULL
+            GROUP BY model, type, priority
+            HAVING count(*) > 1""")
+            if not cr.fetchone():
+                cr.execute('CREATE UNIQUE INDEX ir_ui_view_model_type_priority ON ir_ui_view (priority, type, model) WHERE inherit_id IS NULL')
+            else:
+                self._logger.warn('The constraint \'ir_ui_view_model_type_priority\' have not been created because there is some duplicated values.')
+
+>>>>>>> MERGE-SOURCE
     def remove_not_synchronized_data(self, cr, uid, *a, **b):
         '''
         The list of models to synchronize was wrong. It is now build

=== 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	2017-08-03 15:16:40 +0000
+++ bin/addons/msf_sync_data_server/data/sync_server.message_rule.csv	2017-09-01 09:49:29 +0000
@@ -1,4 +1,5 @@
 id,active,applies_to_type,arguments,domain,destination_name,type_id,remote_call,model_id,name,sequence_number,status
+<<<<<<< TREE
 msf_sync_data_server.resourcing_lines,TRUE,TRUE,"['sync_order_line_db_id', 'partner_id', 'resource_ok', 'resource_sync_line_db_id', 'partner_type']","[('partner_type','!=','external'), ('partner_id', '!=', False)]",partner_id,MISSION,sale.order.line.cancel.create_line,sale.order.line.cancel,Resourcing lines,1,Valid
 msf_sync_data_server.po_creates_fo,TRUE,TRUE,"['name', 'analytic_distribution_id/id', 'delivery_requested_date','details','notes', 'origin', 'categ', 'order_type', 'priority', 'loan_duration', 'is_a_counterpart', 'sourced_references', 'stock_take_date', '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/stock_take_date']","['&','&','&',('partner_type','!=','external'),('state','in',['confirmed']), ('split_po','!=','True'),('push_fo','!=','True')]",partner_id,MISSION,sale.order.create_so,purchase.order,PO creates FO,2,Valid
 msf_sync_data_server.split_po_lines_from_splitted_fo_lines,TRUE,TRUE,"['partner_id','old_sync_order_line_db_id','new_sync_order_line_db_id','new_line_qty','old_line_qty']","[]",partner_id,MISSION,purchase.order.line.to.split.create_from_sync_message,sync.sale.order.line.split,Split PO lines from splitted FO lines,3,Valid
@@ -47,3 +48,53 @@
 msf_sync_data_server.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
 msf_sync_data_server.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
 msf_sync_data_server.USB_Cancel_Int,TRUE,TRUE,['name'],"[('type', '=', 'internal'), ('state', '=', 'cancel')]",partner_id,USB,stock.picking.usb_cancel_int,stock.picking,USB_Cancel_Int,2057,Valid
+=======
+msf_sync_data_server.resourcing_lines,TRUE,TRUE,"['sync_order_line_db_id', 'partner_id', 'resource_ok', 'resource_sync_line_db_id', 'partner_type']","[('partner_type','!=','external'), ('partner_id', '!=', False)]",partner_id,MISSION,sale.order.line.cancel.create_line,sale.order.line.cancel,Resourcing lines,1,Valid
+msf_sync_data_server.po_creates_fo,TRUE,TRUE,"['name', 'analytic_distribution_id/id', 'delivery_requested_date','details','notes', 'origin', 'categ', 'order_type', 'priority', 'loan_duration', 'is_a_counterpart', 'sourced_references', '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']","['&','&','&',('partner_type','!=','external'),('state','in',['confirmed']), ('split_po','!=','True'),('push_fo','!=','True')]",partner_id,MISSION,sale.order.create_so,purchase.order,PO creates FO,2,Valid
+msf_sync_data_server.split_po_lines_from_splitted_fo_lines,TRUE,TRUE,"['partner_id','old_sync_order_line_db_id','new_sync_order_line_db_id','new_line_qty','old_line_qty']","[]",partner_id,MISSION,purchase.order.line.to.split.create_from_sync_message,sync.sale.order.line.split,Split PO lines from splitted FO lines,3,Valid
+msf_sync_data_server.validated_fo_updates_po,TRUE,TRUE,"['name','state','analytic_distribution_id/id', 'original_so_id_sale_order','categ', 'order_type', 'priority', 'loan_duration','delivery_confirmed_date','est_transport_lead_time', 'transport_type', 'ready_to_ship_date', 'details', 'note','client_order_ref', '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/date_planned','order_line/is_line_split', 'order_line/confirmed_delivery_date', 'order_line/cancel_split_ok']","['&','&','&',('partner_type','!=','external'),('state','in',['validated', 'done']),('original_so_id_sale_order','=',''), ('client_order_ref','!=',False)]",partner_id,MISSION,purchase.order.validated_fo_update_original_po,sale.order,Validated FO updates  PO,4,Valid
+msf_sync_data_server.normal_fo_creates_po,TRUE,TRUE,"['name','state','analytic_distribution_id/id','parent_order_name','delivery_confirmed_date','est_transport_lead_time', 'categ', 'order_type', 'priority', 'loan_duration','transport_type', 'ready_to_ship_date', 'details', 'note','client_order_ref', '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/date_planned', 'order_line/confirmed_delivery_date']","['&','&','&',('partner_type','!=','external'),('state','in',['validated','done']),('client_order_ref','=',False),('split_type_sale_order','=','original_sale_order')]",partner_id,MISSION,purchase.order.normal_fo_create_po,sale.order,Normal FO creates PO,5,Valid
+msf_sync_data_server.split_fo_creates_split_po,TRUE,TRUE,"['name','state','analytic_distribution_id/id', 'delivery_confirmed_date','categ', 'order_type', 'priority', 'loan_duration','est_transport_lead_time', 'transport_type', 'ready_to_ship_date', 'details', 'note','client_order_ref', 'order_line/product_id/id', 'order_line/product_id/name','order_line/id', 'order_line/is_line_split','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/date_planned', 'order_line/confirmed_delivery_date', 'order_line/source_sync_line_id']","['&',('partner_type','!=','external'),('original_so_id_sale_order','!=','False')]",partner_id,MISSION,purchase.order.create_split_po,sale.order,Split FO creates Split PO,6,Valid
+msf_sync_data_server.split_fo_updates_split_po,TRUE,TRUE,"['name', 'state', 'client_order_ref','sync_date','analytic_distribution_id/id','categ', 'order_type', 'priority', 'loan_duration', 'delivery_confirmed_date','est_transport_lead_time', 'transport_type', 'note','original_so_id_sale_order', 'ready_to_ship_date', 'order_line/product_id/id', 'order_line/product_id/name','order_line/id', 'order_line/name', 'order_line/is_line_split','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/confirmed_delivery_date', 'order_line/source_sync_line_id', 'order_line/sync_sourced_origin']","['&','&',('partner_type','!=','external'),('state','in',['manual','progress','shipping_except','invoice_except','done']),('original_so_id_sale_order','!=','False')]",partner_id,MISSION,purchase.order.update_split_po,sale.order,Split FO updates split PO,7,Valid
+msf_sync_data_server.po_updates_so_ref,TRUE,TRUE,"['name','state','partner_ref']","['&','&','&',('partner_type','!=','external'),('state','in',['confirmed','sourced','split', 'approved']),('partner_ref','!=',False),'!',('partner_ref', 'like', 'invalid_by_recovery')]",partner_id,MISSION,sale.order.update_sub_so_ref,purchase.order,PO updates SO ref,8,Valid
+msf_sync_data_server.fo_updates_po_ref,TRUE,TRUE,"['name','state','client_order_ref']","['&','&','&',('partner_type','!=','external'),('client_order_ref','!=',False),('split_type_sale_order','=','original_sale_order'),'!',('client_order_ref', 'like', 'invalid_by_recovery')]",partner_id,MISSION,purchase.order.update_fo_ref,sale.order,FO updates PO ref,9,Valid
+msf_sync_data_server.update_in_ref,TRUE,TRUE,"['name','shipment_ref']","['&',('shipment_ref','!=',False),'!',('shipment_ref', 'like', 'invalid_by_recovery')]",partner_id,MISSION,stock.picking.update_in_ref,stock.picking,IN updates ref to OUT SHIP,10,Valid
+msf_sync_data_server.canceled_fo_cancels_po,TRUE,TRUE,"['name','state', 'client_order_ref']","[('state', '=', 'cancel'), ('client_order_ref', '!=', '')]",partner_id,MISSION,purchase.order.canceled_fo_cancel_po,sale.order,Canceled FO cancels PO,18,Valid
+msf_sync_data_server.partial_shipped_coordo_updates_in_at_project,TRUE,TRUE,"['name', 'state', 'origin', 'partner_type_stock_picking', 'shipment_id/name', 'min_date', 'note', '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/product_id/id', 'move_lines/product_id/name', 'move_lines/product_qty', 'move_lines/prodlot_id/id','move_lines/prodlot_id/name','move_lines/prodlot_id/life_date', '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/usage', 'move_lines/comment']","['&','&','&','&','&','&',('partner_type_stock_picking', '!=', 'external'), ('type', '=', 'out'), ('subtype', 'in', ['standard', 'packing']), ('state', '=', 'done'), ('already_shipped', '=', True), ('do_not_sync', '=', False), ('claim', '=', False)]",partner_id,MISSION,stock.picking.partial_shipped_fo_updates_in_po,stock.picking,Partial shipped at Coordo updates IN at Project,19,Valid
+msf_sync_data_server.moves_from_dpo_closed_coordo_updates_in_at_project,TRUE,TRUE,"['name', 'state', 'origin', 'subtype', 'partner_type_stock_picking', 'shipment_id/name', 'min_date', 'note', '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/product_id/id', 'move_lines/product_id/name', 'move_lines/product_qty', 'move_lines/prodlot_id/id','move_lines/prodlot_id/name','move_lines/prodlot_id/life_date', '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/dpo_line_id', 'move_lines/comment']","['&', '&', '&', ('partner_type_stock_picking', '!=', 'external'), ('type', '=', 'out'), ('subtype', 'in', ['picking', 'standard']), ('dpo_out', '=', True)]",partner_id,MISSION,stock.picking.partial_shippped_dpo_updates_in_po,stock.picking,Moves from DPO closed at Coordo updates IN at Project,20,Valid
+msf_sync_data_server.dpo_service_lines_update_in_at_project,FALSE,TRUE,"['order_id/name', 'order_id/delivery_confirmed_date', 'fake_id', 'origin', 'confirmed_delivery_date', 'name', 'product_uom/id', 'product_uom/name', 'link_sol_id/line_number', 'notes', 'product_qty', 'product_id/name', 'product_id/id', 'comment']","[('dest_partner_id.partner_type', '=', 'internal'), ('order_id.order_type', '=', 'direct'), ('order_id.state', 'in', ['approved', 'done']), ('product_id.type', 'in', ['service', 'service_recep'])]",dest_partner_id,MISSION,purchase.order.line.confirmed_dpo_service_lines_update_in_po,purchase.order.line,DPO service lines update IN at Project,21,Valid
+msf_sync_data_server.cancel_out_at_coordo_cancels_in_at_project,TRUE,TRUE,"['name', 'state', 'origin']","['&','&','&','&',('partner_type_stock_picking', '!=', 'external'), ('type', '=', 'out'),('state', '=', 'cancel'),('subtype', '=', 'standard'),('do_not_sync', '=', False)]",partner_id,MISSION,stock.picking.cancel_out_pick_cancel_in,stock.picking,Canceled OUT at Coordo cancels IN at Project,22,Valid
+msf_sync_data_server.cancel_pick_at_coordo_cancels_in_at_project,TRUE,TRUE,"['name', 'state', 'origin']","['&','&','&','&','&',('partner_type_stock_picking', '!=', 'external'), ('type', '=', 'out'),('state', '=', 'cancel'),('subtype', '=', 'picking'),('backorder_id', '=', False),('do_not_sync', '=', False)]",partner_id,MISSION,stock.picking.cancel_out_pick_cancel_in,stock.picking,Canceled PICK at Coordo cancels IN at Project,23,Valid
+msf_sync_data_server.cancel_stock_move_at_coordo_cancels_in_at_project,TRUE,TRUE,"['name', 'state', 'origin', 'date_cancel']","['&','&','&','&','&','&',('picking_id.partner_type_stock_picking', '!=', 'external'), ('type', '=', 'out'),('state', '=', 'cancel'),('picking_id.state', '=', 'done'),('picking_id.do_not_sync', '=', False),('to_be_sent', '=', True), '&', '|', ('picking_id.subtype', '=', 'picking'), ('picking_id.subtype', '=', 'standard'), ('picking_id.already_shipped', '=', False)]",partner_id,MISSION,stock.picking.cancel_stock_move_of_pick_cancel_in,stock.move,Canceled stock move cancels IN,24,Valid
+msf_sync_data_server.closed_in_validates_delivery_out_ship,TRUE,TRUE,"['name', 'state', 'shipment_ref']","['&','&','&','&','&',('partner_type_stock_picking', '!=', 'external'), ('type', '=', 'in'),('subtype', 'in', ['standard']), ('state', '=', 'done'), ('shipment_ref', '!=', False), ('dpo_incoming', '=', False)]",partner_id,MISSION,stock.picking.closed_in_validates_delivery_out_ship,stock.picking,Closed IN validates delivery of OUT-SHIP,26,Valid
+msf_sync_data_server.closed_in_confirms_dpo_reception,TRUE,TRUE,"['name', 'state', 'dpo_line_id']","['&','&','&','&',('picking_id.partner_type_stock_picking', '!=', 'external'), ('picking_id.type', '=', 'in'), ('picking_id.subtype', 'in', ['standard']), ('state', '=', 'done'), ('dpo_line_id', '!=', 0)]",partner_id,MISSION,stock.picking.closed_in_confirms_dpo_reception,stock.move,Closed IN confirms DPO reception,27,Valid
+msf_sync_data_server.create_batch_object,FALSE,TRUE,"['name', 'xmlid_name', 'prefix', 'product_id/id', 'partner_id/id', 'date', 'ref','life_date','sequence_id','type']","[('name', '=', False)]",partner_id,MISSION,stock.picking.create_batch_number,stock.production.lot,Create Batch Object,1001,Valid
+msf_sync_data_server.create_asset_object,TRUE,TRUE,"['name', 'xmlid_name', 'arrival_date', 'asset_type_id/id', 'partner_id/id', 'brand', 'comment', 'description', 'hq_ref', 'international_po', 'invo_certif_depreciation', 'invo_currency/id', 'invo_date', 'invo_donator_code', 'invo_num', 'invo_supplier', 'invo_value', 'local_ref', 'model', 'orig_mission_code', 'product_id/id', 'project_po', 'receipt_place', 'serial_nb', 'type', 'year']","[('name', '=', False)]",partner_id,MISSION,stock.picking.create_asset,product.asset,Create Asset Object,1002,Valid
+msf_sync_data_server.reset_ref_by_recovery_mode,TRUE,TRUE,['name'],"[('name', '=', False)]",partner_id,MISSION,sale.order.reset_ref_by_recovery_mode,sale.order,Reset Due to Recovery,1003,Valid
+msf_sync_data_server.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
+msf_sync_data_server.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
+msf_sync_data_server.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
+msf_sync_data_server.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
+msf_sync_data_server.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
+msf_sync_data_server.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
+msf_sync_data_server.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
+msf_sync_data_server.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
+msf_sync_data_server.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
+msf_sync_data_server.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
+msf_sync_data_server.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
+msf_sync_data_server.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
+msf_sync_data_server.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
+msf_sync_data_server.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
+msf_sync_data_server.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
+msf_sync_data_server.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
+msf_sync_data_server.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
+msf_sync_data_server.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
+msf_sync_data_server.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
+msf_sync_data_server.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
+msf_sync_data_server.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
+msf_sync_data_server.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
+msf_sync_data_server.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
+msf_sync_data_server.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
+msf_sync_data_server.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
+msf_sync_data_server.USB_Cancel_Int,TRUE,TRUE,['name'],"[('type', '=', 'internal'), ('state', '=', 'cancel')]",partner_id,USB,stock.picking.usb_cancel_int,stock.picking,USB_Cancel_Int,2057,Valid
+>>>>>>> MERGE-SOURCE

=== 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	2017-08-23 18:38:09 +0000
+++ bin/addons/msf_sync_data_server/data/sync_server.sync_rule.csv	2017-09-01 09:49:29 +0000
@@ -123,12 +123,21 @@
 msf_sync_data_server.account_tax_tree,TRUE,TRUE,FALSE,TRUE,bidirectional,Down,"[('parent_id','!=','')]",['parent_id/id'],OC,account.tax,,Account Tax Tree,Valid,,613
 msf_sync_data_server.composition_kit,TRUE,TRUE,FALSE,TRUE,bidirectional,Down,"[('state','=','completed'),('composition_type','=','theoretical')]","['active', 'composition_creation_date', 'composition_description', 'composition_product_id/id', 'composition_type', 'composition_version', 'composition_version_txt', 'name', 'state']",OC,composition.kit,,Theoretical Kit Composition List,Valid,,620
 msf_sync_data_server.composition_item,TRUE,TRUE,FALSE,TRUE,bidirectional,Down,"[('item_kit_id' , 'in' , ('composition.kit' , 'id' , [('state','=','completed'),('composition_type','=','theoretical')]))]","['item_asset_id/id', 'item_kit_id/id', 'item_module', 'item_product_id/id', 'item_qty', 'item_uom_id/id']",OC,composition.item,,Theoretical Kit Composition List Line,Valid,,621
+<<<<<<< TREE
 msf_sync_data_server.internal_catalogue,TRUE,TRUE,TRUE,TRUE,bidirectional,Down,"[('state','=','confirmed'),('active', 'in', ['t', 'f']),('partner_id' , 'in' , ('res.partner' , 'id' , [('partner_type','=','external')]))]","[ 'comment', 'currency_id/id', 'current', 'esc_update_ts', 'active', 'name', 'partner_id/id', 'period_from', 'period_to']",OC,supplier.catalogue,,External Supplier Catalogue,Valid,"{'state': 'confirmed'}",650
 msf_sync_data_server.internal_catalogue_line,TRUE,TRUE,TRUE,TRUE,bidirectional,Down,"[('catalogue_id.state','=','confirmed'),('catalogue_id.partner_id' , 'in' , ('res.partner' , 'id' , [('partner_type','=','external')]))]","['catalogue_id/id', 'comment', 'line_number', 'line_uom_id/id', 'min_order_qty', 'min_qty', 'product_id/id', 'rounding', 'unit_price', 'product_code']",OC,supplier.catalogue.line,,External Supplier Catalogue Line,Valid,,651
 msf_sync_data_server.esc_catalogue,TRUE,TRUE,FALSE,TRUE,bidirectional,Down,"[('state','=','confirmed'),('active', 'in', ['t', 'f']),('partner_id' , 'in' , ('res.partner' , 'id' , [('partner_type','=','esc')]))]","[ 'comment', 'currency_id/id', 'current', 'esc_update_ts', 'active', 'name', 'partner_id/id', 'period_from', 'period_to']",COORDINATIONS,supplier.catalogue,,ESC Supplier Catalogue,Valid,"{'state': 'confirmed'}",655
 msf_sync_data_server.esc_catalogue_line,TRUE,TRUE,FALSE,TRUE,bidirectional,Down,"[('catalogue_id.state','=','confirmed'),('catalogue_id.partner_id' , 'in' , ('res.partner' , 'id' , [('partner_type','=','esc')]))]","['catalogue_id/id', 'comment', 'line_number', 'line_uom_id/id', 'min_order_qty', 'min_qty', 'product_id/id', 'rounding', 'unit_price', 'product_code']",COORDINATIONS,supplier.catalogue.line,,ESC Supplier Catalogue Lines,Valid,,656
 msf_sync_data_server.coordo_catalogue,TRUE,TRUE,FALSE,TRUE,bidirectional,Down,"[('state','=','confirmed'),('active', 'in', ['t', 'f']),('partner_id' , 'in' , ('res.partner' , 'id' , [('is_coordo','=',True)]))]","[ 'comment', 'currency_id/id', 'current', 'esc_update_ts', 'active', 'name', 'partner_id/id', 'period_from', 'period_to']",MISSION,supplier.catalogue,,Coordo Supplier Catalogue,Valid,"{'state': 'confirmed'}",660
 msf_sync_data_server.coordo_catalogue_line,TRUE,TRUE,FALSE,TRUE,bidirectional,Down,"[('catalogue_id.state','=','confirmed'),('catalogue_id.partner_id' , 'in' , ('res.partner' , 'id' , [('is_coordo','=',True)]))]","['catalogue_id/id', 'comment', 'line_number', 'line_uom_id/id', 'min_order_qty', 'min_qty', 'product_id/id', 'rounding', 'unit_price', 'product_code']",MISSION,supplier.catalogue.line,,Coordo Supplier Catalogue Lines,Valid,,661
+=======
+msf_sync_data_server.internal_catalogue,TRUE,TRUE,TRUE,TRUE,bidirectional,Down,"[('state','=','confirmed'),('active', 'in', ['t', 'f']),('partner_id' , 'in' , ('res.partner' , 'id' , [('partner_type','=','external')]))]","[ 'comment', 'currency_id/id', 'current', 'esc_update_ts', 'active', 'name', 'partner_id/id', 'period_from', 'period_to']",OC,supplier.catalogue,,External Supplier Catalogue,Valid,"{'state': 'confirmed'}",650
+msf_sync_data_server.internal_catalogue_line,TRUE,TRUE,TRUE,TRUE,bidirectional,Down,"[('catalogue_id.state','=','confirmed'),('catalogue_id.partner_id' , 'in' , ('res.partner' , 'id' , [('partner_type','=','external')]))]","['catalogue_id/id', 'comment', 'line_number', 'line_uom_id/id', 'min_order_qty', 'min_qty', 'product_id/id', 'rounding', 'unit_price']",OC,supplier.catalogue.line,,External Supplier Catalogue Line,Valid,,651
+msf_sync_data_server.esc_catalogue,TRUE,TRUE,FALSE,TRUE,bidirectional,Down,"[('state','=','confirmed'),('active', 'in', ['t', 'f']),('partner_id' , 'in' , ('res.partner' , 'id' , [('partner_type','=','esc')]))]","[ 'comment', 'currency_id/id', 'current', 'esc_update_ts', 'active', 'name', 'partner_id/id', 'period_from', 'period_to']",COORDINATIONS,supplier.catalogue,,ESC Supplier Catalogue,Valid,"{'state': 'confirmed'}",655
+msf_sync_data_server.esc_catalogue_line,TRUE,TRUE,FALSE,TRUE,bidirectional,Down,"[('catalogue_id.state','=','confirmed'),('catalogue_id.partner_id' , 'in' , ('res.partner' , 'id' , [('partner_type','=','esc')]))]","['catalogue_id/id', 'comment', 'line_number', 'line_uom_id/id', 'min_order_qty', 'min_qty', 'product_id/id', 'rounding', 'unit_price']",COORDINATIONS,supplier.catalogue.line,,ESC Supplier Catalogue Lines,Valid,,656
+msf_sync_data_server.coordo_catalogue,TRUE,TRUE,FALSE,TRUE,bidirectional,Down,"[('state','=','confirmed'),('active', 'in', ['t', 'f']),('partner_id' , 'in' , ('res.partner' , 'id' , [('is_coordo','=',True)]))]","[ 'comment', 'currency_id/id', 'current', 'esc_update_ts', 'active', 'name', 'partner_id/id', 'period_from', 'period_to']",MISSION,supplier.catalogue,,Coordo Supplier Catalogue,Valid,"{'state': 'confirmed'}",660
+msf_sync_data_server.coordo_catalogue_line,TRUE,TRUE,FALSE,TRUE,bidirectional,Down,"[('catalogue_id.state','=','confirmed'),('catalogue_id.partner_id' , 'in' , ('res.partner' , 'id' , [('is_coordo','=',True)]))]","['catalogue_id/id', 'comment', 'line_number', 'line_uom_id/id', 'min_order_qty', 'min_qty', 'product_id/id', 'rounding', 'unit_price']",MISSION,supplier.catalogue.line,,Coordo Supplier Catalogue Lines,Valid,,661
+>>>>>>> MERGE-SOURCE
 msf_sync_data_server.user_groups,TRUE,TRUE,TRUE,TRUE,bidirectional,Down,[],"['comment', 'menu_access/id', 'name', 'visible_res_groups', 'is_an_admin_profile', 'level']",OC,res.groups,,User Groups,Valid,,700
 msf_sync_data_server.ACL,TRUE,TRUE,TRUE,TRUE,bidirectional,Down,[],"['group_id/id', 'model_id/id', 'name', 'perm_create', 'perm_read', 'perm_unlink', 'perm_write']",OC,ir.model.access,,Access Control Lists,Valid,,701
 msf_sync_data_server.record_rules,TRUE,TRUE,TRUE,TRUE,bidirectional,Down,[],"['domain_force', 'global', 'groups/id', 'model_id/id', 'name', 'perm_create', 'perm_read', 'perm_unlink', 'perm_write']",OC,ir.rule,,Record Rules,Valid,,702

=== modified file 'bin/addons/procurement_request/procurement_request.py'
=== modified file 'bin/addons/procurement_request/procurement_request_view.xml'
--- bin/addons/procurement_request/procurement_request_view.xml	2017-08-01 15:45:31 +0000
+++ bin/addons/procurement_request/procurement_request_view.xml	2017-09-01 09:49:29 +0000
@@ -54,12 +54,16 @@
                         <field name="delivery_requested_date" required="1" string="Requested date" attrs="{'readonly': [('state', 'not in', ['draft', 'validated'])]}" />
                         <field name="origin" attrs="{'readonly': [('state', 'not in', ['draft', 'validated'])]}" />
                         <field name="functional_currency_id" />
+<<<<<<< TREE
                         <field name="categ" on_change="onchange_categ(categ)" />
                         <group colspan="2" col="3">
                             <field name="stock_take_date" attrs="{'readonly': [('state', 'not in', ['draft'])]}" />
                             <button colspan="1" name="update_date" string="Update Lines" type="object" context="{'field_name': 'stock_take', 'type': 'sale.order'}" icon="gtk-indent"
                                 attrs="{'invisible': [('state', 'not in', ('draft', 'confirmed'))]}" />
                         </group>
+=======
+                        <field name="categ" on_change="onchange_categ(categ)" />
+>>>>>>> MERGE-SOURCE
                         <field name="fo_to_resource" invisible="1" />
                         <field name="parent_order_name" attrs="{'invisible': [('fo_to_resource', '=', False)]}" />
                     </group>

=== modified file 'bin/addons/product_attributes/product_attributes_view.xml'
=== modified file 'bin/addons/purchase_override/purchase.py'
=== modified file 'bin/addons/purchase_override/purchase_view.xml'
=== modified file 'bin/addons/reason_types_moves/reason_type.py'
--- bin/addons/reason_types_moves/reason_type.py	2017-08-25 16:02:26 +0000
+++ bin/addons/reason_types_moves/reason_type.py	2017-09-01 09:49:29 +0000
@@ -177,12 +177,21 @@
         @return:
         """
         # Copy the comment
+<<<<<<< TREE
         if inventory_line:
             move_vals.update({
                 'comment': inventory_line.comment,
                 'reason_type_id': inventory_line.reason_type_id.id,
             })
         move_vals.update({'not_chained': True})
+=======
+        if inventory_line:
+            move_vals.update({
+                'comment': inventory_line.comment,
+                    'reason_type_id': inventory_line.reason_type_id.id,
+            })
+        move_vals.update({'not_chained': True})
+>>>>>>> MERGE-SOURCE
 
         return super(stock_inventory, self)._inventory_line_hook(cr, uid, inventory_line, move_vals)
         # @@@end

=== modified file 'bin/addons/report_webkit/webkit_report.py'
=== modified file 'bin/addons/sale/sale_view.xml'
=== modified file 'bin/addons/sale_override/sale.py'
=== modified file 'bin/addons/sale_override/sale_view.xml'
=== modified file 'bin/addons/sales_followup/report/sale_follow_up_report_multi.py'
--- bin/addons/sales_followup/report/sale_follow_up_report_multi.py	2017-07-25 09:04:51 +0000
+++ bin/addons/sales_followup/report/sale_follow_up_report_multi.py	2017-09-01 09:49:29 +0000
@@ -147,11 +147,18 @@
                     data = {
                         'po_name': po_name,
                         'cdd': cdd,
+<<<<<<< TREE
                         'line_number': line.line_number,
                         'product_name': line.product_id.name,
                         'product_code': line.product_id.code,
                         'is_delivered': False,
                         'backordered_qty': 0.00,
+=======
+                        'line_number': line.line_number,
+                        'product_name': line.product_id.name,
+                        'product_code': line.product_id.code,
+                        'is_delivered': False,
+>>>>>>> MERGE-SOURCE
                     }
                     if first_line:
                         data.update({
@@ -162,6 +169,7 @@
                         })
                         first_line = False
 
+<<<<<<< TREE
                     if ppl or ppl_not_shipped:
                         eta = ''
                         is_delivered = False
@@ -177,6 +185,23 @@
                             packing = move.picking_id.name or ''
                             shipment = ''
 
+=======
+                    if ppl or ppl_not_shipped:
+                        eta = ''
+                        is_delivered = False
+                        is_shipment_done = False
+                        if ppl: 
+                            packing = move.picking_id.previous_step_id.name or ''
+                            shipment = move.picking_id.shipment_id and move.picking_id.shipment_id.name or ''
+                            eta = datetime.strptime(move.picking_id.shipment_id.shipment_actual_date[0:10], '%Y-%m-%d')
+                            eta += timedelta(days=line.order_id.partner_id.supplier_lt or 0.00)
+                            is_delivered = move.picking_id.shipment_id.state == 'delivered' or False
+                            is_shipment_done = move.picking_id.shipment_id.state == 'done' or False
+                        else:
+                            packing = move.picking_id.name or ''
+                            shipment = ''
+
+>>>>>>> MERGE-SOURCE
                         if not grouped:
                             key = (packing, shipment, move.product_uom.name)
                         else:

=== modified file 'bin/addons/sourcing/procurement_order.py'
=== modified file 'bin/addons/specific_rules/specific_rules.py'
--- bin/addons/specific_rules/specific_rules.py	2017-08-23 14:10:02 +0000
+++ bin/addons/specific_rules/specific_rules.py	2017-09-01 09:49:29 +0000
@@ -75,9 +75,15 @@
             prod_obj = self.pool.get('product.product')
             if prod_obj.browse(cr, uid, product).is_ssl:
                 warning = {
+<<<<<<< TREE
                     'title': 'Short Shelf Life product',
                     'message': _(SHORT_SHELF_LIFE_MESS)
                 }
+=======
+                    'title': 'Short Shelf Life product',
+                            'message': _(SHORT_SHELF_LIFE_MESS)
+                }
+>>>>>>> MERGE-SOURCE
                 result.update(warning=warning)
 
         return result
@@ -168,9 +174,15 @@
             prod_obj = self.pool.get('product.product')
             if prod_obj.browse(cr, uid, product).is_ssl:
                 warning = {
+<<<<<<< TREE
                     'title': 'Short Shelf Life product',
                     'message': _(SHORT_SHELF_LIFE_MESS)
                 }
+=======
+                    'title': 'Short Shelf Life product',
+                            'message': _(SHORT_SHELF_LIFE_MESS)
+                }
+>>>>>>> MERGE-SOURCE
                 result.update(warning=warning)
 
         return result
@@ -704,12 +716,21 @@
                     raise osv.except_osv(_('Error!'),  _('The selected product is Expiry Date Mandatory while the selected Batch number corresponds to Batch Number Mandatory.'))
             if not move.prodlot_id and move.product_qty and \
                (move.state == 'done' and \
+<<<<<<< TREE
                     ( \
                         (move.product_id.track_production and move.location_id.usage == 'production') or \
                         (move.product_id.track_production and move.location_dest_id.usage == 'production') or \
                         (move.product_id.track_incoming and move.location_id.usage == 'supplier') or \
                         (move.product_id.track_outgoing and move.location_dest_id.usage == 'customer') \
                     )):
+=======
+                ( \
+                (move.product_id.track_production and move.location_id.usage == 'production') or \
+                (move.product_id.track_production and move.location_dest_id.usage == 'production') or \
+                (move.product_id.track_incoming and move.location_id.usage == 'supplier') or \
+                (move.product_id.track_outgoing and move.location_dest_id.usage == 'customer') \
+                )):
+>>>>>>> MERGE-SOURCE
                 raise osv.except_osv(_('Error!'),  _('You must assign a batch number for this product.'))
 
         return True
@@ -783,6 +804,7 @@
             product_ids.add(read_dict['product_id'][0])
 
         product_list_dict = self.pool.get('product.product').read(cr, uid,
+<<<<<<< TREE
                                                                   list(product_ids),
                                                                   ['kc_txt',
                                                                    'ssl_txt',
@@ -793,6 +815,18 @@
                                                                    'type',
                                                                    'subtype',],
                                                                   context=context)
+=======
+                                                             list(product_ids),
+                                                             ['kc_txt',
+                                                              'ssl_txt',
+                                                              'dg_txt',
+                                                              'cs_txt',
+                                                              'batch_management',
+                                                              'perishable',
+                                                              'type',
+                                                              'subtype',],
+            context=context)
+>>>>>>> MERGE-SOURCE
         product_dict = dict([(x['id'], x) for x in product_list_dict])
 
         for stock_move_dict in read_result:
@@ -1362,9 +1396,15 @@
                      'You can\'t create a standard batch number for a product which is not batch mandatory. If the product is perishable, the system will create automatically an internal batch number on reception/inventory.',
                      ['Type', 'Product']),
                     (_check_perishable_type_integrity,
+<<<<<<< TREE
                      'You can\'t create an internal Batch Number for a product which is batch managed or which is not perishable. If the product is batch managed, please create a standard batch number.',
                      ['Type', 'Product']),
                     ]
+=======
+                    'You can\'t create an internal Batch Number for a product which is batch managed or which is not perishable. If the product is batch managed, please create a standard batch number.',
+                    ['Type', 'Product']),
+                    ]
+>>>>>>> MERGE-SOURCE
 
     def search(self, cr, uid, args, offset=0, limit=None, order=None, context=None, count=False):
         '''
@@ -1601,9 +1641,15 @@
             GROUP BY l.product_id, l.location_id, l.%s, l.expiry_date
             HAVING count(l.id) > 1
             ORDER BY count(l.id) DESC""" % (
+<<<<<<< TREE
             self._name.replace('.', '_'),
             self._name == 'stock.inventory' and 'prod_lot_id' or 'prodlot_name',
         )
+=======
+            self._name.replace('.', '_'),
+                self._name == 'stock.inventory' and 'prod_lot_id' or 'prodlot_name',
+        )
+>>>>>>> MERGE-SOURCE
         cr.execute(sql_req, (tuple(ids),))
         check_res = cr.dictfetchall()
         if check_res:

=== modified file 'bin/addons/stock/stock.py'
--- bin/addons/stock/stock.py	2017-08-23 14:10:02 +0000
+++ bin/addons/stock/stock.py	2017-09-01 09:49:29 +0000
@@ -3057,6 +3057,7 @@
                             'location_id': line['location_id'][0],
                             'location_dest_id': location_id,
                         })
+<<<<<<< TREE
                     value.update({
                         'comment': line['comment'],
                         'reason_type_id': line['reason_type_id'][0],
@@ -3071,6 +3072,20 @@
             message = _('Inventory') + " '" + inv['name'] + "' "+ _("is validated.")
             self.log(cr, uid, inv['id'], message)
             self.write(cr, uid, [inv['id']], {'state': 'confirm', 'move_ids': [(6, 0, move_ids)]})
+=======
+                    value.update({
+                        'comment': line['comment'],
+                        'reason_type_id': line['reason_type_id'][0],
+                    })
+
+                    if self._name == 'initial.stock.inventory':
+                        value.update({'price_unit': line['average_cost']})
+                    move_ids.append(self._inventory_line_hook(cr, uid, None, value))
+            # Changed the text of the following line to "is confirmed" instead of "is done" due to the state value
+            message = _('Inventory') + " '" + inv['name'] + "' "+ _("is confirmed.")
+            self.log(cr, uid, inv['id'], message)
+            self.write(cr, uid, [inv['id']], {'state': 'confirm', 'move_ids': [(6, 0, move_ids)]})
+>>>>>>> MERGE-SOURCE
         return True
 
     def action_cancel_draft(self, cr, uid, ids, context=None):

=== modified file 'bin/addons/stock_override/wizard/stock_card_wizard.py'
--- bin/addons/stock_override/wizard/stock_card_wizard.py	2017-08-23 14:10:02 +0000
+++ bin/addons/stock_override/wizard/stock_card_wizard.py	2017-09-01 09:49:29 +0000
@@ -245,12 +245,16 @@
                 'notes': move.picking_id and move.picking_id.note  or '',
             }
 
+<<<<<<< TREE
             line_obj.create(cr, uid, line_values, context=context)
 
         for inv_date in inv_line_dates:
             for new_line in inv_line_to_add[inv_date]:
                 new_line['balance'] = initial_stock
                 line_obj.create(cr, uid, new_line, context=context)
+=======
+            line_obj.create(cr, uid, line_values, context=context)
+>>>>>>> MERGE-SOURCE
 
         self.write(cr, uid, [ids[0]], {'available_stock': initial_stock},
                    context=context)

=== modified file 'bin/addons/sync_client/sync_client.py'
=== modified file 'bin/addons/sync_so/so_po_common.py'
=== modified file 'bin/release.py'
--- bin/release.py	2017-08-29 14:56:45 +0000
+++ bin/release.py	2017-09-01 09:49:29 +0000
@@ -20,7 +20,11 @@
 ##############################################################################
 
 name = 'openerp-server'
+<<<<<<< TREE
 version = 'UF6.0rc1'
+=======
+version = 'UF6.0dev'
+>>>>>>> MERGE-SOURCE
 major_version = '6.0'
 description = 'OpenERP Server'
 long_desc = '''OpenERP is a complete ERP and CRM. The main features are accounting (analytic

=== modified file 'bin/tools/misc.py'
=== modified file 'bin/unifield-version.txt'
--- bin/unifield-version.txt	2017-08-29 14:56:45 +0000
+++ bin/unifield-version.txt	2017-09-01 09:49:29 +0000
@@ -48,7 +48,13 @@
 364232a949995b3e46324fa93b5a06c3 2016-12-14 10:00:00 UF3.0
 b2bc3aa15d627714868e8bac1c44b821 2017-01-26 14:00:00 UF3.1
 f37e6ab5138ec1768214805ec03b77ec 2017-03-20 16:00:00 UF4.0
+<<<<<<< TREE
 0b4c9c7c2367ce89a4258c7e97016f68 2017-05-05 12:00:00 UF4.1
 7777607e902de5a698ab370152ca6302 2017-06-16 09:23:00 UF5.0
 6e67c8793129be46edc2237c80f13846 2017-07-20 15:00:00 UF5.1
 07a26b10a43329d42ecbfeb1fe5a26e1 2017-08-29 17:00:00 UF6.0rc1
+=======
+0b4c9c7c2367ce89a4258c7e97016f68 2017-05-05 12:00:00 UF4.1
+7777607e902de5a698ab370152ca6302 2017-06-16 09:23:00 UF5.0
+6e67c8793129be46edc2237c80f13846 2017-07-20 15:00:00 UF5.1
+>>>>>>> MERGE-SOURCE

=== modified file 'bin/updater.py'
--- bin/updater.py	2017-08-25 12:42:18 +0000
+++ bin/updater.py	2017-09-01 09:49:29 +0000
@@ -554,6 +554,7 @@
                         logger.warning('ExpandedColumnCount is present in file %s line %s.' % (full_path, line_number))
     logger.info("Check mako and xml files finished.")
 
+<<<<<<< TREE
 #
 # Functions related to upgrading PostgreSQL.
 #
@@ -979,3 +980,374 @@
     if sys.platform != 'win32':
         root = '/'
     assert get_free_space_mb(root) != None
+=======
+#
+# Functions related to upgrading PostgreSQL.
+#
+
+def _find_pg_patch():
+    """
+    Looks in the cwd for a file matching pgsql-*-*-patch.
+    Returns the filename of the patch, the oldVer and the newVer.
+    """
+    import glob
+    pfiles = glob.glob('pgsql-*-*-patch')
+    if len(pfiles) == 0:
+        return None, None, None
+    if len(pfiles) != 1:
+        warn("Too many PostgreSQL patch files: %s" % pfiles)
+        warn("PostgreSQL will not be updated.")
+        return None, None, None
+
+    (oldVer, newVer) = pfiles[0].split('-')[1:3]
+
+    # Check version format: 8.4.14 or 10.1
+    if not re.match('\d+\.\d+(\.\d+)?', oldVer) or \
+       not re.match('\d+\.\d+(\.\d+)?', newVer):
+        return None, None, None
+
+    return pfiles[0], oldVer, newVer
+
+def _is_major(oldVer, newVer):
+    oldVer = oldVer.split('.')
+    newVer = newVer.split('.')
+    if oldVer[0] != newVer[0]:
+        return True
+    if oldVer[0] >= 10:
+        # for 10.x and onward, second position indicates minor
+        # version: https://www.postgresql.org/support/versioning/
+        return False
+    if oldVer[1] != newVer[1]:
+        return True
+    return False
+
+def _no_log(*x):
+    pass
+
+def _archive_patch(pf):
+    """
+    Put away the patch file in order to indicate that it has
+    already been applied and PG update should not be attempted
+    again.
+    """
+    warn('Archiving patch file %s' % pf)
+    if not os.path.exists('backup'):
+        os.mkdir('backup')
+    bf = os.path.join('backup', pf)
+    if os.path.exists(bf):
+        os.remove(bf)
+    os.rename(pf, bf)
+
+def do_pg_update():
+    """
+    This function is run on every server start (see openerp-server.py).
+    If the conditions are not right for a PostgreSQL update, it
+    immeditately returns, so that the server can start up (the common case).
+    If an update is required, then it attempts the update. If the
+    update fails, it must leave the server in the same condition it
+    started, i.e. with the original Postgres up and running.
+    """
+
+    # Postgres updates are only done on Windows.
+    if os.name != "nt":
+        return
+
+    # We need to open this here because do_update only
+    # opens it once it starts to work, not if there is no
+    # update to apply.
+    global log
+    try:
+        log = open(log_file, 'a')
+    except Exception as e:
+        log = os.stderr
+        warn("Could not open %s correctly: %s" % (log_file, e))
+
+    # If there is no patch file available, then there's no
+    # update to do.
+    pf, oldVer, newVer = _find_pg_patch()
+    if pf is None:
+        return
+
+    try:
+        with open(pf, 'rb') as f:
+            pdata = f.read()
+    except Exception as e:
+        warn("Could not read patch file %s: %s" % (pf, e))
+        _archive_patch(pf)
+        return
+
+    for root in ('c:\\', 'd:\\'):
+        if os.path.exists(root):
+            free = get_free_space_mb(root)
+            if free < 1000:
+                warn("Less than 1 gb free on %s. Not attempting PostgreSQL upgrade." % root)
+                return
+
+    # Minor update:
+    # 1. check that the patch will apply
+    # 2. stop server
+    # 3. patch the binaries in place, nuke patch to show it is done
+    # 4. start server
+    #
+    # Minor updates will only happen after the 8.4->9.6.x transition,
+    # so things are much easier, with more fixed items (PG inst location,
+    # service name).
+    if not _is_major(oldVer, newVer):
+        if oldVer.startswith("8.4."):
+            warn("Minor patch from 8.4.x not supported.")
+            return
+        warn("Postgres minor update from %s to %s" % (oldVer, newVer))
+
+        try:
+            bsdifftree.applyPatch(pdata, r'..\pgsql', doIt=False, log=_no_log)
+            subprocess.call('net stop Postgres', stdout=log, stderr=log)
+            bsdifftree.applyPatch(pdata, r'..\pgsql', log=warn)
+            _archive_patch(pf)
+        except Exception as e:
+            s = str(e) or type(e)
+            warn("Could not apply patch:", s)
+        finally:
+            subprocess.call('net start Postgres', stdout=log, stderr=log)
+        warn("Minor update done.")
+        return
+
+    # Major upgrade
+    #
+    # 0. find out if tablespaces are in use, if so abort
+    # 1. figure out where the old PG is and copy it to pgsql-next
+    # 2. patch pgsql-next, nuke patch file
+    # 3. prepare new db dir using new initdb, old user/pass.
+    # 4. stop server
+    # 5. pg_upgrade -> if fail, clean db dir, goto 8
+    # 6. commit to new bin dir, put it in '..\pgsql'
+    # 7. if old was 8.4, change service entry
+    # 8. start server
+
+    warn("Postgres major update from %s to %s" % (oldVer, newVer))
+    import tools
+
+    stopped = False
+    pg_new_db = None
+    try:
+        env = os.environ
+        if tools.config.get('db_user'):
+            env['PGUSER'] = tools.config['db_user']
+        if tools.config.get('db_password'):
+            env['PGPASSWORD'] = tools.config['db_password']
+
+        pg_new = r'..\pgsql-next'
+        if oldVer == '8.4.14':
+            svc = 'PostgreSQL_For_OpenERP'
+            pg_old = r'D:\MSF data\Unifield\PostgreSQL'
+        else:
+            svc = 'Postgres'
+            pg_old = r'..\pgsql'
+        if not os.path.exists(pg_old):
+            raise RuntimeError('PostgreSQL install directory %s not found.' % pg_old)
+
+        # 0: check for tablespaces (pg_upgrade seems to unify them
+        # into pg_default, which is not ok)
+        cmd = [ os.path.join(pg_old, 'bin', 'psql'), '-t', '-c',
+                'select count(*) > 2 from pg_tablespace;', 'postgres' ]
+        out = None
+        try:
+            out = subprocess.check_output(cmd, stderr=log, env=env)
+        except subprocess.CalledProcessError as e:
+            warn(e)
+            warn("out is", out)
+        if out is None or 'f' not in out:
+            raise RuntimeError("User-defined tablespaces might be in use. Upgrade needs human intervention.")
+
+        # 1: use old PG install to make a new one to patch
+        if os.path.exists(pg_new):
+            warn("Removing previous %s directory" % pg_new)
+            shutil.rmtree(pg_new)
+
+        if oldVer == '8.4.14':
+            warn("Creating %s by selective copy from %s" % (pg_new, pg_old))
+            os.mkdir(pg_new)
+            for d in ('bin', 'lib', 'share'):
+                shutil.copytree(os.path.join(pg_old, d),
+                                os.path.join(pg_new, d))
+        else:
+            shutil.copytree(pg_old, pg_new)
+
+        # 2: patch the pg exes -- no trial run here, because if applyPatch
+        # fails, we have only left pg_new unusable, and we will revert
+        # to pg_old. Compare to minor (in-place) upgrade, above.
+        warn('Patching %s' % pg_new)
+        bsdifftree.applyPatch(pdata, pg_new, log=warn)
+        _archive_patch(pf)
+
+        # 3: prepare the new db
+        pg_old_db = r'D:\MSF data\Unifield\PostgreSQL\data'
+        if not os.path.exists(pg_old_db):
+            raise RuntimeError('Could not find existing PostgreSQL data in %s' % pg_old_db)
+        pg_new_db = pg_old_db + '-new'
+        if os.path.exists(pg_new_db):
+            raise RuntimeError('New data directory %s already exists.' % pg_new_db)
+        pwf = tempfile.NamedTemporaryFile(delete=False)
+        pwf.write(tools.config.get('db_password'))
+        # TODO: apply same fix here for trust as in the AIO
+        cmd = [ os.path.join(pg_new, 'bin', 'initdb'),
+                '--pwfile', pwf.name,
+                '--data-checksums', '-A', 'md5',
+                '-U', tools.config.get('db_user'),
+                '--locale', 'English_United States',
+                '-E', 'UTF8', pg_new_db
+                ]
+        rc = subprocess.call(cmd, stdout=log, stderr=log)
+        pwf.close()
+        os.remove(pwf.name)
+        if rc != 0:
+            raise RuntimeError("initdb returned %d" % rc)
+
+        # modify the postgresql.conf file for best
+        # defaults
+        pgconf = os.path.join(pg_new_db, "postgresql.conf")
+        with open(pgconf, "a") as f:
+            f.write("listen_addresses = 'localhost'\n")
+            f.write("shared_buffers = 1024MB\n")
+
+        # 4: stop old service
+        subprocess.call('net stop %s' % svc, stdout=log, stderr=log)
+        stopped = True
+
+        # 5: pg_upgrade
+        run_analyze = False
+        cmd = [ os.path.join(pg_new, 'bin', 'pg_upgrade'),
+                '-b', os.path.join(pg_old, 'bin'),
+                '-B', os.path.join(pg_new, 'bin'),
+                '-d', pg_old_db, '-D', pg_new_db, '-k', '-v',
+                ]
+        rc = subprocess.call(cmd, stdout=log, stderr=log, env=env)
+        if rc != 0:
+            raise RuntimeError("pg_upgrade returned %d" % rc)
+
+        # The pg_upgrade went ok, so we are committed now. Nuke the
+        # old db directory and move the upgraded one into place.
+        warn("pg_upgrade returned %d, commiting to new version" % rc)
+        run_analyze = True
+
+        warn("Rename %s to %s." % (pg_new_db, pg_old_db))
+        # we do this with two renames since rmtree/rename sometimes
+        # failed (why? due to antivirus still holding files open?)
+        pg_old_db2 = pg_old_db + "-trash"
+        os.rename(pg_old_db, pg_old_db2)
+        os.rename(pg_new_db, pg_old_db)
+        shutil.rmtree(pg_old_db2)
+
+        # 6: commit to new bin dir
+        if oldVer == '8.4.14':
+            # Move pg_new to it's final name.
+            os.rename(pg_new, r'..\pgsql')
+            # For 8.4->9.9.x transition, nuke 8.4 install
+            warn("Removing stand-alone PostgreSQL 8.4 installation.")
+            cmd = [ os.path.join(pg_old, 'uninstall-postgresql.exe'),
+                    '--mode', 'unattended',
+                    ]
+            rc = subprocess.call(cmd, stdout=log, stderr=log)
+            if rc != 0:
+                warn("PostgreSQL 8.4 uninstall returned %d" % rc)
+            pg_old = r'..\pgsql'
+        else:
+            warn("Remove %s." % pg_old)
+            shutil.rmtree(pg_old)
+
+        warn("Rename %s to %s." % (pg_new, pg_old))
+        os.rename(pg_new, pg_old)
+
+        pgp = os.path.normpath(os.path.join(pg_old, 'bin'))
+        if tools.config['pg_path'] != pgp:
+            warn("Setting pg_path to %s." % pgp)
+            tools.config['pg_path'] = pgp
+            tools.config.save()
+
+        # 7: change service entry to the correct install location
+        if oldVer == '8.4.14':
+            cmd = [
+                os.path.join(pg_old, 'bin', 'pg_ctl'),
+                'register', '-N', 'Postgres',
+                '-U', 'openpgsvc',
+                '-P', '0p3npgsvcPWD',
+                '-D', pg_old_db,
+            ]
+            rc = subprocess.call(cmd, stdout=log, stderr=log)
+            if rc != 0:
+                raise RuntimeError("pg_ctl returned %d" % rc)
+            svc = 'Postgres'
+
+    except Exception as e:
+        s = str(e) or type(e)
+        warn('Failed to update Postgres:', s)
+    finally:
+        try:
+            if pg_new_db is not None and os.path.exists(pg_new_db):
+                warn("Removing failed DB upgrade directory %s" % pg_new_db)
+                shutil.rmtree(pg_new_db)
+        except Exception:
+            # don't know what went wrong, but we must not crash here
+            # or else OpenERP-Server will not start.
+            pass
+        # 8. start service (either the old one or the new one)
+        if stopped:
+            warn('Starting service %s' % svc)
+            subprocess.call('net start %s' % svc, stdout=log, stderr=log)
+        if run_analyze:
+            cmd = [ os.path.join(r'..\pgsql', 'bin', 'vacuumdb'),
+                    '--all', '--analyze-only' ]
+            subprocess.call(cmd, stdout=log, stderr=log, env=env)
+    return
+
+# https://stackoverflow.com/questions/51658/cross-platform-space-remaining-on-volume-using-python
+def get_free_space_mb(dirname):
+    """Return folder/drive free space (in megabytes)."""
+    if platform.system() == 'Windows':
+        free_bytes = ctypes.c_ulonglong(0)
+        ctypes.windll.kernel32.GetDiskFreeSpaceExW(ctypes.c_wchar_p(dirname), None, None, ctypes.pointer(free_bytes))
+        return free_bytes.value / 1024 / 1024
+    else:
+        st = os.statvfs(dirname)
+        return st.f_bavail * st.f_frsize / 1024 / 1024
+
+#
+# Unit tests follow
+#
+if __name__ == '__main__':
+    d = tempfile.mkdtemp()
+    os.chdir(d)
+
+    # no file
+    pf, oldVer, newVer = _find_pg_patch()
+    assert pf == None
+
+    # one good file
+    with open('pgsql-8.4.14-9.6.3-patch', 'wb') as f:
+        f.write('Fake patch for testing.')
+    pf, oldVer, newVer = _find_pg_patch()
+    assert oldVer == '8.4.14'
+    assert newVer == '9.6.3'
+    assert pf == 'pgsql-8.4.14-9.6.3-patch'
+
+    # two files: oops
+    warn("Expect 2 messages on stderr after this:")
+    with open('pgsql-wat-huh-patch', 'wb') as f:
+        f.write('Second fake patch for testing.')
+    pf, oldVer, newVer = _find_pg_patch()
+    assert pf == None
+
+    # one file with wrong version format
+    os.remove('pgsql-8.4.14-9.6.3-patch')
+    pf, oldVer, newVer = _find_pg_patch()
+    assert pf == None
+
+    assert _is_major('8.4.14', '9.6.3')
+    assert not _is_major('8.4.14', '8.4.15')
+    assert _is_major('9.6.9', '10.1')
+    assert not _is_major('10.1', '10.2')
+    assert _is_major('21.9', '22.1')
+
+    os.chdir('..')
+    shutil.rmtree(d)
+    assert get_free_space_mb("D:\\") != None
+>>>>>>> MERGE-SOURCE

=== modified file 'setup.py'
--- setup.py	2017-08-04 14:42:21 +0000
+++ setup.py	2017-09-01 09:49:29 +0000
@@ -60,6 +60,7 @@
                 "imaplib", "smtplib", "email", "yaml",
                 "uuid", "commands", "mx.DateTime", "json",
                 "pylzma", "xlwt", "passlib", "bcrypt", "six", "cffi",
+<<<<<<< TREE
                 "psutil",
             ],
             'dist_dir': 'dist',
@@ -77,6 +78,24 @@
                 'api-ms-win-core-sysinfo-l1-2-1.dll',
                 'api-ms-win-security-activedirectoryclient-l1-1-0.dll',
             ],
+=======
+            ],
+            'dist_dir': 'dist',
+            'excludes' : ["Tkconstants","Tkinter","tcl"],
+            'dll_excludes': [
+                'w9xpopen.exe', 'PSAPI.dll', 'CRYPT32.dll', 'MPR.dll',
+                'Secur32.dll', 'SHFOLDER.dll',
+                'api-ms-win-core-delayload-l1-1-1.dll',
+                'api-ms-win-core-errorhandling-l1-1-1.dll',
+                'api-ms-win-core-heap-obsolete-l1-1-0.dll',
+                'api-ms-win-core-libraryloader-l1-2-0.dll',
+                'api-ms-win-core-processthreads-l1-1-2.dll',
+                'api-ms-win-core-profile-l1-1-0.dll',
+                'api-ms-win-core-string-obsolete-l1-1-0.dll',
+                'api-ms-win-core-sysinfo-l1-2-1.dll',
+                'api-ms-win-security-activedirectoryclient-l1-1-0.dll',
+            ],
+>>>>>>> MERGE-SOURCE
         }
     }
 
@@ -226,11 +245,18 @@
           'reportlab==2.5',
           'pyyaml==3.12',
           'egenix-mx-base==3.2.9',
+<<<<<<< TREE
           'passlib==1.7.1',
           'bcrypt==3.1.3',
           'xlwt==1.2.0',
           'psutil==5.2.2',
           'bsdiff4==1.1.4',
+=======
+          'passlib==1.7.1',
+          'bcrypt==3.1.3',
+          'xlwt==1.2.0',
+          'bsdiff4==1.1.4',
+>>>>>>> MERGE-SOURCE
       ],
       **py2exe_keywords
       )