Merge lp:~julie-w/unifield-server/US-4058 into lp:unifield-server/uf7

[jftempo]

Unmerged revisions

4719. By Julie Nuguet on 2018-02-08

US-4058 [FIX] Accruals: duplications were created when posting accrual & reversal lines

4718. By jftempo on 2018-02-02

US-3893 [FIX] C&R IN at header level should set state of stock moves to 'Canceled-r' and FO should remain Confirmed

lp:~mallorymarcot/unifield-server/us-3893

4717. By jftempo on 2018-02-02

US-3944 [FIX] PO/FO: prevent from validating an order with taxes if linked to an intermission partner

lp:~julie-w/unifield-server/US-3944

4716. By jftempo on 2018-02-02

US-3885 [FIX] PO created from Tender are not auto linked to initial IR/FO and AD is not populated from FO

lp:~mallorymarcot/unifield-server/us-3885

4715. By jftempo on 2018-02-02

US-3853 [IMP] Register Lines import: checks on "third party required"

lp:~julie-w/unifield-server/US-3853

4714. By jftempo on 2018-02-02

US-3612 [FIX] Register Full Report: remove duplicates for the use case 'advance return lines linked to Free1/2'

lp:~julie-w/unifield-server/US-3612

4713. By jftempo on 2018-02-02

US-2924 [FIX] Pick pdf labels: print weight

lp:~mallorymarcot/unifield-server/us-2924

4712. By jftempo on 2018-02-02

US-3259 [FIX] PO Follow Up per Supplier: escape html entities

lp:~mallorymarcot/unifield-server/us-3259

4711. By jftempo on 2018-02-02

US-3798 [FIX] Funding Pool: when a FP is created use the current instance_id by default

lp:~julie-w/unifield-server/US-3798

4710. By jftempo on 2018-02-02

US-3493 [IMP] Payroll import: strip spaces in all entries

lp:~julie-w/unifield-server/US-3493

=== modified file 'bin/addons/account/account_cash_statement.py'
--- bin/addons/account/account_cash_statement.py	2016-08-18 08:32:03 +0000
+++ bin/addons/account/account_cash_statement.py	2018-02-12 10:19:50 +0000
@@ -61,7 +61,7 @@
         'subtotal': fields.function(_sub_total, method=True, string='Sub Total', type='float', digits_compute=dp.get_precision('Account')),
         'starting_id': fields.many2one('account.bank.statement', ondelete='cascade'),
         'ending_id': fields.many2one('account.bank.statement', ondelete='cascade'),
-     }
+    }
 
 account_cashbox_line()
 
@@ -115,7 +115,7 @@
         for statement in self.browse(cr, uid, ids, context=context):
             encoding_total=0.0
             for line in statement.line_ids:
-               encoding_total += line.amount
+                encoding_total += line.amount
             res2[statement.id] = encoding_total
         return res2
 
@@ -125,7 +125,7 @@
         res = {}
 
         company_currency_id = res_users_obj.browse(cursor, user, user,
-                context=context).company_id.currency_id.id
+                                                   context=context).company_id.currency_id.id
 
         statements = self.browse(cursor, user, ids, context=context)
         for statement in statements:
@@ -136,14 +136,14 @@
                     if line.account_id.id == \
                             statement.journal_id.default_debit_account_id.id:
                         res[statement.id] += res_currency_obj.compute(cursor,
-                                user, company_currency_id, currency_id,
-                                line.debit, context=context)
+                                                                      user, company_currency_id, currency_id,
+                                                                      line.debit, context=context)
                 else:
                     if line.account_id.id == \
                             statement.journal_id.default_credit_account_id.id:
                         res[statement.id] -= res_currency_obj.compute(cursor,
-                                user, company_currency_id, currency_id,
-                                line.credit, context=context)
+                                                                      user, company_currency_id, currency_id,
+                                                                      line.credit, context=context)
 
             if statement.state in ('draft', 'open'):
                 for line in statement.line_ids:
@@ -221,8 +221,8 @@
         'balance_end_real': fields.float('Closing Balance', digits_compute=dp.get_precision('Account'), states={'confirm': [('readonly', True)]}, help="closing balance entered by the cashbox verifier"),
         'state': fields.selection(
             [('draft', 'Draft'),
-            ('confirm', 'Closed'),
-            ('open','Open')], 'State', required=True, states={'confirm': [('readonly', True)]}, readonly="1"),
+             ('confirm', 'Closed'),
+             ('open','Open')], 'State', required=True, states={'confirm': [('readonly', True)]}, readonly="1"),
         'total_entry_encoding': fields.function(_get_sum_entry_encoding, method=True, store=True, string="Cash Transaction", help="Total cash transactions"),
         'closing_date': fields.datetime("Closed On"),
         'balance_end': fields.function(_end_balance, method=True, store=True, string='Balance', help="Closing balance based on Starting Balance and Cash Transactions"),
@@ -238,12 +238,12 @@
         'user_id': lambda self, cr, uid, context=None: uid,
         'starting_details_ids': _get_cash_open_box_lines,
         'ending_details_ids': _get_default_cash_close_box_lines
-     }
+    }
 
     def create(self, cr, uid, vals, context=None):
         sql = [
-                ('journal_id', '=', vals.get('journal_id', False)),
-                ('state', '=', 'open')
+            ('journal_id', '=', vals.get('journal_id', False)),
+            ('state', '=', 'open')
         ]
         open_jrnl = self.search(cr, uid, sql)
         if open_jrnl:
@@ -255,10 +255,10 @@
                 for start in vals.get('starting_details_ids'):
                     dict_val = start[2]
                     for end in open_close['end']:
-                       if end[2]['pieces'] == dict_val['pieces']:
-                           end[2]['number'] += dict_val['number']
+                        if end[2]['pieces'] == dict_val['pieces']:
+                            end[2]['number'] += dict_val['number']
             vals.update({
-#                'ending_details_ids': open_close['start'],
+                #                'ending_details_ids': open_close['start'],
                 'starting_details_ids': open_close['end']
             })
         else:
@@ -308,8 +308,11 @@
         return super(account_cash_statement, self).onchange_journal_id(cr, uid, statement_id, journal_id, context=context)
 
     def _equal_balance(self, cr, uid, cash_id, context=None):
+        if context is None:
+            context = {}
         statement = self.browse(cr, uid, cash_id, context=context)
-        self.write(cr, uid, [cash_id], {'balance_end_real': statement.balance_end})
+        context.update({'from_cash_statement_equal_balance': True})
+        self.write(cr, uid, [cash_id], {'balance_end_real': statement.balance_end}, context=context)
         statement.balance_end_real = statement.balance_end
         if abs(statement.balance_end - statement.balance_end_cash) > 10**-4:
             return False

=== modified file 'bin/addons/account_corrections/account_move_line.py'
--- bin/addons/account_corrections/account_move_line.py	2017-10-27 12:10:07 +0000
+++ bin/addons/account_corrections/account_move_line.py	2018-02-12 10:19:50 +0000
@@ -527,6 +527,9 @@
         j_extra_ids = j_obj.search(cr, uid, [('type', '=', 'extra'),
                                              ('is_current_instance', '=', True)])
         j_extra_id = j_extra_ids and j_extra_ids[0] or False
+        j_ana_extra_ids = ana_j_obj.search(cr, uid, [('type', '=', 'extra'), ('is_current_instance', '=', True)], context=context)
+        j_ana_extra_id = j_ana_extra_ids and j_ana_extra_ids[0] or False
+
         # Search attached period
         period_ids = self.pool.get('account.period').search(cr, uid, [('date_start', '<=', date), ('date_stop', '>=', date)], context=context,
                                                             limit=1, order='date_start, name')
@@ -555,8 +558,13 @@
             journal_id = j_corr_id
             if is_inkind:
                 journal_id = j_extra_id
-            if not journal_id and is_inkind:
-                raise osv.except_osv(_('Error'), _('No OD-Extra Accounting Journal found!'))
+                j_ana_corr_id = j_ana_extra_id
+
+            if is_inkind:
+                if not journal_id:
+                    raise osv.except_osv(_('Error'), _('No OD-Extra Accounting Journal found!'))
+                elif not j_ana_extra_id:
+                    raise osv.except_osv(_('Error'), _('No OD-Extra Accounting Analytic Journal found!'))
             elif not journal_id:
                 raise osv.except_osv(_('Error'), _('No correction journal found!'))
 

=== modified file 'bin/addons/base/module/module.py'
--- bin/addons/base/module/module.py	2017-10-04 05:23:42 +0000
+++ bin/addons/base/module/module.py	2018-02-12 10:19:50 +0000
@@ -538,13 +538,6 @@
             if not mod.description:
                 logger.warn('module %s: description is empty !', mod.name)
 
-            if not mod.certificate or not mod.certificate.isdigit():
-                logger.info('module %s: no quality certificate', mod.name)
-            else:
-                val = long(mod.certificate[2:]) % 97 == 29
-                if not val:
-                    logger.critical('module %s: invalid quality certificate: %s', mod.name, mod.certificate)
-                    raise osv.except_osv(_('Error'), _('Module %s: Invalid Quality Certificate') % (mod.name,))
 
     def list_web(self, cr, uid, context=None):
         """ list_web(cr, uid, context) -> [(module_name, module_version)]

=== modified file 'bin/addons/delivery_mechanism/wizard/enter_reason.py'
--- bin/addons/delivery_mechanism/wizard/enter_reason.py	2017-11-03 10:59:21 +0000
+++ bin/addons/delivery_mechanism/wizard/enter_reason.py	2018-02-12 10:19:50 +0000
@@ -66,6 +66,8 @@
             # set the reason
             obj.write({'change_reason': change_reason}, context=context)
 
+            if context.get('do_resource', False):
+                self.pool.get('stock.move').write(cr, uid, [move.id for move in obj.move_lines], {'has_to_be_resourced': True}, context=context)
             self.pool.get('stock.move').action_cancel(cr, uid, [move.id for move in obj.move_lines], context=context)
 
             # cancel the IN
@@ -74,7 +76,7 @@
             # correct the corresponding po manually if exists - should be in shipping exception
             if obj.purchase_id:
                 wf_service.trg_validate(uid, 'purchase.order', obj.purchase_id.id, 'picking_ok', cr)
-                purchase_obj.log(cr, uid, obj.purchase_id.id, _('The Purchase Order %s is %s%% received')%(obj.purchase_id.name, round(obj.purchase_id.shipped_rate,2)))
+                purchase_obj.log(cr, uid, obj.purchase_id.id, _('The Purchase Order %s is %s%% received') % (obj.purchase_id.name, round(obj.purchase_id.shipped_rate, 2)))
 
             self.infolog(cr, uid, "The Incoming shipment id:%s (%s) has been canceled%s." % (
                 obj.id, obj.name, cancel_type != 'update_out' and ' and resourced' or '',

=== modified file 'bin/addons/msf_accrual/wizard/wizard_accrual_reversal.py'
--- bin/addons/msf_accrual/wizard/wizard_accrual_reversal.py	2016-02-19 13:23:15 +0000
+++ bin/addons/msf_accrual/wizard/wizard_accrual_reversal.py	2018-02-12 10:19:50 +0000
@@ -70,7 +70,7 @@
                     raise osv.except_osv(_('Warning !'), _("The reversal period '%s' is not open!" % reversal_period.name))
 
                 # post the accrual reversal
-                accrual_line_obj.accrual_reversal_post(cr, uid, context['active_ids'], document_date,
+                accrual_line_obj.accrual_reversal_post(cr, uid, [accrual_line.id], document_date,
                                                        posting_date, context=context)
 
         # close the wizard

=== modified file 'bin/addons/msf_accrual/wizard/wizard_accrual_validation.py'
--- bin/addons/msf_accrual/wizard/wizard_accrual_validation.py	2016-05-24 08:44:23 +0000
+++ bin/addons/msf_accrual/wizard/wizard_accrual_validation.py	2018-02-12 10:19:50 +0000
@@ -62,11 +62,11 @@
                         raise osv.except_osv(_('Warning !'), _("The reversal period '%s' is not open!" % reversal_period.name))
 
                 # post the accrual
-                accrual_line_obj.accrual_post(cr, uid, context['active_ids'], context=context)
+                accrual_line_obj.accrual_post(cr, uid, [accrual_line.id], context=context)
                 # post its reversal only if it is a reversing accrual
                 if accrual_line.accrual_type == 'reversing_accrual':
                     reversal_date = (datetime.datetime.strptime(accrual_line.date, '%Y-%m-%d') + relativedelta(days=1)).strftime('%Y-%m-%d')
-                    accrual_line_obj.accrual_reversal_post(cr, uid, context['active_ids'], reversal_date,
+                    accrual_line_obj.accrual_reversal_post(cr, uid, [accrual_line.id], reversal_date,
                                                            reversal_date, context=context)
                 
         # close the wizard

=== modified file 'bin/addons/msf_homere_interface/wizard/hr_payroll_import.py'
--- bin/addons/msf_homere_interface/wizard/hr_payroll_import.py	2017-10-06 14:55:12 +0000
+++ bin/addons/msf_homere_interface/wizard/hr_payroll_import.py	2018-02-12 10:19:50 +0000
@@ -136,6 +136,9 @@
         error_message = ""
         partner_obj = self.pool.get('res.partner')
 
+        # strip spaces in all columns
+        for i in range(len(data)):
+            data[i] = data[i].strip()
         if len(data) == 13:
             accounting_code, description, second_description, third, expense, receipt, project, financing_line, \
                 financing_contract, date, currency, project, analytic_line = zip(data)

=== modified file 'bin/addons/msf_instance/add_instance.py'
--- bin/addons/msf_instance/add_instance.py	2016-10-28 09:07:17 +0000
+++ bin/addons/msf_instance/add_instance.py	2018-02-12 10:19:50 +0000
@@ -425,10 +425,27 @@
     def write(self, cr, uid, ids, vals, context=None):
         if not ids:
             return True
+        if context is None:
+            context = {}
         if 'journal_id' in vals:
             journal = self.pool.get('account.journal').read(cr, uid, vals['journal_id'], ['instance_id'], context=context)
             vals['instance_id'] = journal.get('instance_id')[0]
-        return super(account_bank_statement, self).write(cr, uid, ids, vals, context=context)
+        res = True
+        for reg in self.browse(cr, uid, ids, fields_to_fetch=['closing_balance_frozen'], context=context):
+            # if the End-of-the-Month Balance has already been confirmed for a register, ignore changes on fields that
+            # should be read-only in that case (cover the use case of concurrent changes by 2 users)
+            newvals = vals.copy()
+            if reg.closing_balance_frozen:
+                # remove the values for each register with a confirmed balance
+                # Note: at Cashbox closing the balance_end_real is set to the reg.balance_end value: keep this change
+                if 'balance_end_real' in newvals and not context.get('from_cash_statement_equal_balance', False):
+                    del newvals['balance_end_real']
+                if 'balance_start' in newvals:
+                    del newvals['balance_start']
+                if 'ending_details_ids' in newvals:
+                    del newvals['ending_details_ids']
+            res = res and super(account_bank_statement, self).write(cr, uid, [reg.id], newvals, context=context)
+        return res
 
 account_bank_statement()
 
@@ -499,8 +516,25 @@
             vals['instance_id'] = register.get('instance_id')[0]
         return super(account_cashbox_line, self).write(cr, uid, ids, vals, context=context)
 
+    def unlink(self, cr, uid, ids, context=None):
+        """
+        CashBox Line Deletion method
+        The deletion isn't triggered for Closing Balance Lines linked to a reg. with a Confirmed month-end cash count
+        (covers the use case of concurrent changes by 2 users)
+        """
+        if context is None:
+            context = {}
+        if isinstance(ids, (int, long)):
+            ids = [ids]
+        res = True
+        for line in self.browse(cr, uid, ids, fields_to_fetch=['ending_id'], context=context):
+            if not line.ending_id or not line.ending_id.closing_balance_frozen:
+                res = res and super(account_cashbox_line, self).unlink(cr, uid, [line.id], context=context)
+        return res
+
 account_cashbox_line()
 
+
 class account_analytic_account(osv.osv):
     _name = 'account.analytic.account'
     _inherit = 'account.analytic.account'
@@ -534,10 +568,11 @@
         'current_instance_type': lambda self, cr, uid, c: self.pool.get('res.users').browse(cr, uid, uid, c).company_id.instance_id.level,
     }
 
-    def check_fp(self, cr, uid, vals, context=None):
+    def check_fp(self, cr, uid, vals, to_update=False, context=None):
         """
         Check that FP have an instance_id
         Check that the given instance is not section level!
+        If to_update is True and no instance_id is in vals: update vals with the id of the current instance
         """
         if context is None:
             context = {}
@@ -554,6 +589,8 @@
                 if not current_instance or current_instance.level == 'section':
                     raise osv.except_osv(_('Error'), _('Proprietary Instance is mandatory for FP accounts!'))
                 instance_id = current_instance.id
+                if to_update:
+                    vals.update({'instance_id': instance_id})
             instance_level = self.pool.get('msf.instance').browse(cr, uid, instance_id).level
             if instance_level == 'section':
                 raise osv.except_osv(_('Warning'), _('Proprietary Instance for FP accounts should be only COORDO and/or MISSION'))
@@ -567,7 +604,7 @@
             context = {}
         # Check that instance_id is filled in for FP
         if context.get('from_web', False) is True:
-            self.check_fp(cr, uid, vals, context=context)
+            self.check_fp(cr, uid, vals, to_update=True, context=context)
         return super(account_analytic_account, self).create(cr, uid, vals, context=context)
 
     def write(self, cr, uid, ids, vals, context=None):

=== modified file 'bin/addons/msf_outgoing/msf_outgoing.py'
--- bin/addons/msf_outgoing/msf_outgoing.py	2017-12-14 17:30:55 +0000
+++ bin/addons/msf_outgoing/msf_outgoing.py	2018-02-12 10:19:50 +0000
@@ -613,7 +613,7 @@
             shipment_name = '%s-%s' % (shipment.name, shipment_number)
             source_shipment_address_id = shipment.address_id.id if shipment.address_id else False
 
-            if context.get('rw_shipment_name', False) and context.get('sync_message_execution', False): # RW Sync - update the shipment name same as on RW instance
+            if context.get('rw_shipment_name', False) and context.get('sync_message_execution', False):  # RW Sync - update the shipment name same as on RW instance
                 shipment_name = context.get('rw_shipment_name')
                 del context['rw_shipment_name']
 
@@ -659,7 +659,7 @@
                 del context['description_ppl']
 
             for family in wizard.family_ids:
-                if not family.selected_number: # UTP-1015 fix from Quentin
+                if not family.selected_number:  # UTP-1015 fix from Quentin
                     continue
 
                 picking = family.draft_packing_id
@@ -674,7 +674,7 @@
                     'backorder_id': picking.id,
                     'shipment_id': False,
                     'move_lines': [],
-                    'description_ppl': description_ppl or picking.description_ppl, # US-803: added the description
+                    'description_ppl': description_ppl or picking.description_ppl,  # US-803: added the description
                 }
                 # Update context for copy
                 context.update({
@@ -709,8 +709,8 @@
 
             # Log creation message
             message = _('The new Shipment id:%s (%s) has been created.')
-            self.log(cr, uid, shipment.id, message%(shipment.id, shipment_name,))
-            self.infolog(cr, uid, message%(shipment.id, shipment.name))
+            self.log(cr, uid, shipment.id, message % (shipment.id, shipment_name,))
+            self.infolog(cr, uid, message % (shipment.id, shipment.name))
             # The shipment is automatically shipped, no more pack states in between.
             self.ship(cr, uid, [shipment_id], context=context)
 
@@ -729,7 +729,7 @@
         })
 
         return {
-            'name':_("Shipment"),
+            'name': _("Shipment"),
             'type': 'ir.actions.act_window',
             'res_model': 'shipment',
             'view_mode': 'form,tree',
@@ -881,7 +881,7 @@
                         'from_pack': family.to_pack - family.selected_number + 1,
                         'to_pack': family.to_pack,
                         'state': 'done',
-                        'not_shipped': True, #BKLG-13: set the pack returned to stock also as not_shipped, for showing to view ship draft
+                        'not_shipped': True,  # BKLG-13: set the pack returned to stock also as not_shipped, for showing to view ship draft
                     }
                     context['non_stock_noupdate'] = True
 
@@ -902,12 +902,12 @@
                             ('wizard_id', '=', picking_processor_wiz.id),
                             ('move_id', '=', draft_move.id),
                         ], context=context)
-                        if not save_as_draft_move: # then create the SaD line:
+                        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
+                        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,
@@ -935,13 +935,13 @@
         # If everything is allright (all draft packing are finished) the shipment is done also
         self.complete_finished(cr, uid, shipment_ids, context=context)
 
-        #UF-2531: Create manually the message for the return pack of the ship
+        # UF-2531: Create manually the message for the return pack of the ship
         if shipment and shipment.id:
             self._manual_create_rw_shipment_message(cr, uid, shipment.id, return_info, 'usb_shipment_return_packs_shipment_draft', context=context)
 
         view_id = data_obj.get_object_reference(cr, uid, 'msf_outgoing', 'view_picking_ticket_form')
         return {
-            'name':_("Picking Ticket"),
+            'name': _("Picking Ticket"),
             'view_mode': 'form,tree',
             'view_id': [view_id and view_id[1] or False],
             'view_type': 'form',
@@ -1207,13 +1207,13 @@
         # if everything is allright (all draft packing are finished) the shipment is done also
         self.complete_finished(cr, uid, shipment_ids, context=context)
 
-        #UF-2531: Create manually the message for the return pack of the ship
+        # UF-2531: Create manually the message for the return pack of the ship
         if shipment and shipment.id:
             self._manual_create_rw_shipment_message(cr, uid, shipment.id, return_info, 'usb_shipment_return_packs', context=context)
 
         view_id = data_obj.get_object_reference(cr, uid, 'msf_outgoing', 'view_shipment_form')
         return {
-            'name':_("Shipment"),
+            'name': _("Shipment"),
             'view_mode': 'form,tree',
             'view_id': [view_id and view_id[1] or False],
             'view_type': 'form',
@@ -1279,7 +1279,7 @@
             # the state does not need to be updated - function
             # update actual ship date (shipment_actual_date) to today + time
             today = time.strftime(db_datetime_format)
-            vals = {'shipment_actual_date': today,}
+            vals = {'shipment_actual_date': today, }
             if context.get('source_shipment_address_id', False):
                 vals['address_id'] = context['source_shipment_address_id']
 
@@ -1308,7 +1308,7 @@
                     pick_obj.write(cr, uid, [new_packing_id], ({'claim': True}), context=context)
                 new_packing = pick_obj.browse(cr, uid, new_packing_id, context=context)
 
-                if new_packing.move_lines and pick_obj._get_usb_entity_type(cr, uid) == pick_obj.REMOTE_WAREHOUSE and not context.get('sync_message_execution', False): # RW Sync - set the replicated to True for not syncing it again
+                if new_packing.move_lines and pick_obj._get_usb_entity_type(cr, uid) == pick_obj.REMOTE_WAREHOUSE and not context.get('sync_message_execution', False):  # RW Sync - set the replicated to True for not syncing it again
                     pick_obj.write(cr, uid, [new_packing_id], {'for_shipment_replicate': True}, context=context)
 
                 # update the shipment_date of the corresponding sale order if the date is not set yet - with current date
@@ -1490,7 +1490,7 @@
                 'payment_term': payment_term_id,
                 'fiscal_position': partner.property_account_position.id,
                 'date_invoice': context.get('date_inv', False) or today,
-                'user_id':uid,
+                'user_id': uid,
             }
 
             cur_id = shipment.pack_family_memory_ids[0].currency_id.id
@@ -1826,8 +1826,8 @@
     _name = 'stock.picking'
 
     # For use only in Remote Warehouse
-    CENTRAL_PLATFORM="central_platform"
-    REMOTE_WAREHOUSE="remote_warehouse"
+    CENTRAL_PLATFORM = "central_platform"
+    REMOTE_WAREHOUSE = "remote_warehouse"
 
     def fields_view_get(self, cr, uid, view_id=None, view_type='form', context=None, toolbar=False, submenu=False):
         '''
@@ -1855,8 +1855,8 @@
                 pass
 
         res = super(stock_picking, self).fields_view_get(cr, uid, view_id, view_type, context=context, toolbar=toolbar, submenu=submenu)
-        #US-688 Do not show the button new, duplicate in the tree and form view of picking
-        if view_type in ['tree','form'] and res['name'] in ['picking.ticket.form', 'picking.ticket.tree']:
+        # US-688 Do not show the button new, duplicate in the tree and form view of picking
+        if view_type in ['tree', 'form'] and res['name'] in ['picking.ticket.form', 'picking.ticket.tree']:
             root = etree.fromstring(res['arch'])
             root.set('hide_new_button', 'True')
             root.set('hide_delete_button', 'True')
@@ -1906,7 +1906,7 @@
             context.update({'picking_type': 'incoming_shipment'})
         else:
             context.update({'picking_type': 'internal_move'})
-            context.update({'_terp_view_name': 'Internal Moves'}) # REF-92: Update also the Form view name, otherwise Products to Process
+            context.update({'_terp_view_name': 'Internal Moves'})  # REF-92: Update also the Form view name, otherwise Products to Process
 
         return super(stock_picking, self)._hook_picking_get_view(cr, uid, ids, context=context, *args, **kwargs)
 
@@ -2702,7 +2702,7 @@
         res = cr.dictfetchone()
         if res and res['id']:
             seq = 'ir_sequence_%03d' % res['id']
-            cr.execute("ALTER SEQUENCE " + seq +" RESTART WITH " + str(value_to_force))
+            cr.execute("ALTER SEQUENCE " + seq + " RESTART WITH " + str(value_to_force))
         return
 
     def create(self, cr, uid, vals, context=None):
@@ -2734,12 +2734,12 @@
             # The following lines are to re-enter explicitly the values, even if they are already set to False
             vals['backorder_id'] = vals.get('backorder_id', False)
             vals['shipment_id'] = vals.get('shipment_id', False)
-        else: # if it is a CONSO-OUT --_> set the state for replicating back to CP
+        else:  # if it is a CONSO-OUT --_> set the state for replicating back to CP
             if 'name' in vals and 'OUT-CONSO' in vals['name']:
                 vals.update(already_replicated=False,)
-            #UF-2531: When the INT from scratch created in RW, just set it for sync to CP
-            if usb_entity == self.REMOTE_WAREHOUSE and (('type' in vals and vals['type']=='internal') or 
-                                                        ('origin' not in vals or vals['origin']==False)): #US-702 Sync also the OUT from scratch in RW
+            # UF-2531: When the INT from scratch created in RW, just set it for sync to CP
+            if usb_entity == self.REMOTE_WAREHOUSE and (('type' in vals and vals['type'] == 'internal') or
+                                                        ('origin' not in vals or vals['origin'] == False)):  # US-702 Sync also the OUT from scratch in RW
                 vals.update(already_replicated=False,)
 
         # the action adds subtype in the context depending from which screen it is created
@@ -2771,10 +2771,10 @@
 
             if not vals['backorder_id']:
                 # creation of *draft* picking ticket
-                vals.update(sequence_id=self.create_sequence(cr, uid, {'name':vals['name'],
-                                                                       'code':vals['name'],
-                                                                       'prefix':'',
-                                                                       'padding':2}, context=context))
+                vals.update(sequence_id=self.create_sequence(cr, uid, {'name': vals['name'],
+                                                                       'code': vals['name'],
+                                                                       'prefix': '',
+                                                                       'padding': 2}, context=context))
 
         if 'subtype' in vals and vals['subtype'] == 'packing':
             # creation of a new packing
@@ -2783,10 +2783,10 @@
 
             if not vals['backorder_id']:
                 # creation of *draft* picking ticket
-                vals.update(sequence_id=self.create_sequence(cr, uid, {'name':vals['name'],
-                                                                       'code':vals['name'],
-                                                                       'prefix':'',
-                                                                       'padding':2,
+                vals.update(sequence_id=self.create_sequence(cr, uid, {'name': vals['name'],
+                                                                       'code': vals['name'],
+                                                                       'prefix': '',
+                                                                       'padding': 2,
                                                                        }, context=context))
 
         # create packing object
@@ -2797,7 +2797,7 @@
             if new_packing and ((new_packing.type == 'out' and new_packing.subtype == 'picking' and new_packing.name.find('-') == -1) or
                                 (new_packing.type == 'in' and new_packing.subtype == 'standard') or
                                 (new_packing.type == 'internal' and new_packing.subtype == 'standard' and new_packing.sale_id)):
-                for_update = {'already_replicated':False}
+                for_update = {'already_replicated': False}
 
                 '''
                     Only get the current sequence for the IN object at the moment, as we still have problem with the naming of documents functionally
@@ -2911,7 +2911,7 @@
                                 shipment_ids = [n['id']]
                                 found = True
                                 break
-                        if not found: # If the name is new, then create a new Shipment
+                        if not found:  # If the name is new, then create a new Shipment
                             shipment_ids = []
 
                 # only one 'draft' shipment should be available
@@ -2946,10 +2946,10 @@
                                   'shipment_actual_date': rts,
                                   'sale_id': vals.get('sale_id', False),
                                   'transport_type': sale_id and sale_order_obj.read(cr, uid, sale_id, ['transport_type'], context=context)['transport_type'] or False,
-                                  'sequence_id': self.create_sequence(cr, uid, {'name':name,
-                                                                                'code':name,
-                                                                                'prefix':'',
-                                                                                'padding':2}, context=context)}
+                                  'sequence_id': self.create_sequence(cr, uid, {'name': name,
+                                                                                'code': name,
+                                                                                'prefix': '',
+                                                                                'padding': 2}, context=context)}
 
                         shipment_id = shipment_obj.create(cr, uid, values, context=context)
                         shipment_obj.log(cr, uid, shipment_id, _('The new Draft Shipment %s has been created.') % (name,))
@@ -3225,7 +3225,7 @@
             search_view_id = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'stock', 'view_picking_out_search')
             search_view_id = search_view_id and search_view_id[1] or False
             context.update({'picking_type': 'delivery_order', 'view_id': view_id, 'search_view_id': search_view_id})
-            return {'name':_("Delivery Orders"),
+            return {'name': _("Delivery Orders"),
                     'view_mode': 'form,tree',
                     'view_id': [view_id, tree_view_id],
                     'search_view_id': search_view_id,
@@ -3287,10 +3287,10 @@
                             'subtype': 'picking',
                             'converted_to_standard': False,
                             'state': 'draft',
-                            'sequence_id': self.create_sequence(cr, uid, {'name':new_name,
-                                                                          'code':new_name,
-                                                                          'prefix':'',
-                                                                          'padding':2}, context=context)
+                            'sequence_id': self.create_sequence(cr, uid, {'name': new_name,
+                                                                          'code': new_name,
+                                                                          'prefix': '',
+                                                                          'padding': 2}, context=context)
                             }
 
             self.write(cr, uid, [out.id], default_vals, context=context)
@@ -3465,13 +3465,13 @@
             if need_new_picking and not rw_full_process:
                 cp_vals = {
                     'name': sequence_obj.get(cr, uid, 'stock.picking.%s' % (picking.type)),
-                    'move_lines' : [],
-                    'state':'draft',
+                    'move_lines': [],
+                    'state': 'draft',
                 }
                 context['allow_copy'] = True
 
                 new_picking_id = picking_obj.copy(cr, uid, picking.id, cp_vals, context=context)
-                # US-327: if it's an internal picking and in partial process, then set the already_replicated to True, so no replicate needed 
+                # US-327: if it's an internal picking and in partial process, then set the already_replicated to True, so no replicate needed
                 if picking.type == 'internal' and (usb_entity == self.REMOTE_WAREHOUSE or context.get('sync_message_execution', False)):
                     to_be_replicated = False
                     self.write(cr, uid, [new_picking_id], {'already_replicated': True}, context=context)
@@ -3646,14 +3646,14 @@
             # Create the new picking object
             # A sequence for each draft picking ticket is used for the picking ticket
 
-            #UF-2531: Use the name of the PICK sent from the RW sync if it's the case
+            # UF-2531: Use the name of the PICK sent from the RW sync if it's the case
             pick_name = False
             already_replicated = False
             if 'associate_pick_name' in context:
                 pick_name = context.get('associate_pick_name', False)
                 del context['associate_pick_name']
                 already_replicated = True
-            #US-803: Set the pick name that given from sync
+            # US-803: Set the pick name that given from sync
             elif 'rw_backorder_name' in context:
                 pick_name = context.get('rw_backorder_name', False)
                 del context['rw_backorder_name']
@@ -3767,7 +3767,7 @@
         if usb_entity == self.REMOTE_WAREHOUSE and not context.get('sync_message_execution', False):
             self._manual_create_rw_messages(cr, uid, context=context)
 
-        return {'name':_("Picking Ticket"),
+        return {'name': _("Picking Ticket"),
                 'view_mode': 'form,tree',
                 'view_id': [view_id],
                 'view_type': 'form',
@@ -3864,7 +3864,7 @@
                     })
 
             # Create the new ppl object
-            #US-702: If the PPL is from RW, then add the suffix RW, if it is created via RW Sync in CP, then use the one from the context (name sent by RW instance)
+            # US-702: If the PPL is from RW, then add the suffix RW, if it is created via RW Sync in CP, then use the one from the context (name sent by RW instance)
             ppl_number = 'PPL/%s' % picking.name.split("/")[1]
             if context.get('rw_backorder_name', False):
                 ppl_number = context.get('rw_backorder_name')
@@ -3979,7 +3979,7 @@
                 diff_qty = move_vals['initial_qty'] - move_vals['processed_qty']
                 if diff_qty != 0.00:
                     # Original move from the draft picking ticket which will be updated
-                    if move_vals['move'].backmove_id: #2531: Added a check to make sure the following code can be run correctly
+                    if move_vals['move'].backmove_id:  # 2531: Added a check to make sure the following code can be run correctly
                         original_move_id = move_vals['move'].backmove_id.id
                         original_vals = move_obj.browse(cr, uid, original_move_id, context=context)
                         if original_vals.product_uom.id != move_vals['move'].product_uom.id:
@@ -4020,7 +4020,7 @@
         if usb_entity == self.REMOTE_WAREHOUSE and not context.get('sync_message_execution', False):
             self._manual_create_rw_messages(cr, uid, context=context)
 
-        return {'name':_("Pre-Packing List"),
+        return {'name': _("Pre-Packing List"),
                 'view_mode': 'form,tree',
                 'view_id': [view_id],
                 'view_type': 'form',
@@ -4225,7 +4225,7 @@
                 'shipment_id': False,
                 'origin': picking.origin,
                 'move_lines': [],
-                'date': today, # Set date as today for the new PACK object
+                'date': today,  # Set date as today for the new PACK object
             }
 
             # Change the context for copy
@@ -4239,7 +4239,7 @@
             new_packing_id = self.copy(cr, uid, picking.id, pack_values, context=context)
             if picking.claim:
                 self.write(cr, uid, new_packing_id, ({'claim': True}), context=context)
-            if usb_entity == self.REMOTE_WAREHOUSE and not context.get('sync_message_execution', False): # RW Sync - set the replicated to True for not syncing it again
+            if usb_entity == self.REMOTE_WAREHOUSE and not context.get('sync_message_execution', False):  # RW Sync - set the replicated to True for not syncing it again
                 self.write(cr, uid, new_packing_id, {'already_replicated': False}, context=context)
 
             # Reset context values
@@ -4336,7 +4336,7 @@
                 shipment_id = obj.shipment_id.id
                 shipment_name = obj.shipment_id.name
 
-                if context.get('rw_shipment_name', False) and context.get('sync_message_execution', False): # RW Sync - update the shipment name same as on RW instance
+                if context.get('rw_shipment_name', False) and context.get('sync_message_execution', False):  # RW Sync - update the shipment name same as on RW instance
                     new_name = context.get('rw_shipment_name')
                     if new_name != obj.shipment_id.name:
                         del context['rw_shipment_name']
@@ -4356,7 +4356,7 @@
 
         view_id = data_obj.get_object_reference(cr, uid, 'msf_outgoing', 'view_shipment_form')
         view_id = view_id and view_id[1] or False
-        return {'name':_("Shipment"),
+        return {'name': _("Shipment"),
                 'view_mode': 'form,tree',
                 'view_id': [view_id],
                 'view_type': 'form',
@@ -4490,12 +4490,12 @@
                         ('wizard_id', '=', picking_processor_wiz.id),
                         ('move_id', '=', draft_move_id),
                     ], context=context)
-                    if not save_as_draft_move: # then create the SaD line:
+                    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
+                    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,
@@ -4537,17 +4537,17 @@
         view_id = view_id and view_id[1] or False
         context['picking_type'] = 'picking_ticket'
 
-        #UF-2531: Create manually the message for the return pack of the ship
+        # UF-2531: Create manually the message for the return pack of the ship
         self._manual_create_rw_picking_message(cr, uid, picking.id, return_info, 'usb_picking_return_products', context=context)
 
         context.update({'picking_type': 'picking_ticket'})
         return {
-            'name':_("Picking Ticket"),
+            'name': _("Picking Ticket"),
             'view_mode': 'form,tree',
             'view_id': [view_id],
             'view_type': 'form',
             'res_model': 'stock.picking',
-            'res_id': draft_picking_id ,
+            'res_id': draft_picking_id,
             'type': 'ir.actions.act_window',
             'target': 'crush',
             'context': context,
@@ -4641,12 +4641,12 @@
                                 ('wizard_id', '=', picking_processor_wiz.id),
                                 ('move_id', '=', draft_move.id),
                             ], context=context)
-                            if not save_as_draft_move: # then create the SaD line:
+                            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
+                            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,
@@ -4982,10 +4982,10 @@
     _columns = {'from_pack': fields.integer(string='From p.'),
                 'to_pack': fields.integer(string='To p.'),
                 'pack_type': fields.many2one('pack.type', string='Pack Type'),
-                'length' : fields.float(digits=(16, 2), string='Length [cm]'),
-                'width' : fields.float(digits=(16, 2), string='Width [cm]'),
-                'height' : fields.float(digits=(16, 2), string='Height [cm]'),
-                'weight' : fields.float(digits=(16, 2), string='Weight p.p [kg]'),
+                'length': fields.float(digits=(16, 2), string='Length [cm]'),
+                'width': fields.float(digits=(16, 2), string='Width [cm]'),
+                'height': fields.float(digits=(16, 2), string='Height [cm]'),
+                'weight': fields.float(digits=(16, 2), string='Weight p.p [kg]'),
                 # 'pack_family_id': fields.many2one('pack.family', string='Pack Family'),
                 'initial_location': fields.many2one('stock.location', string='Initial Picking Location'),
                 # relation to the corresponding move from draft **picking** ticket object
@@ -5015,7 +5015,7 @@
                         'stock.move': (lambda obj, cr, uid, ids, c={}: ids, ['picking_id'], 10),
                         'stock.picking': (_get_picking, ['shipment_id'], 10),
                     }
-    ),  
+    ),
         # Fields used for domain
         'location_virtual_id': fields.many2one('stock.location', string='Virtual location'),
         'location_output_id': fields.many2one('stock.location', string='Output location'),
@@ -5090,26 +5090,6 @@
                     signal = 'cancel_r' if resource else 'cancel'
                     wf_service.trg_validate(uid, 'purchase.order.line', move.purchase_line_id.id, signal, cr)
 
-                not_done_moves = self.pool.get('stock.move').search(cr, uid, [
-                    ('purchase_line_id', '=', move.purchase_line_id.id),
-                    ('state', 'not in', ['cancel', 'cancel_r', 'done']),
-                    ('picking_id.type', '=', 'in'),
-                ], context=context)
-                if (not not_done_moves) or all([x in ids for x in not_done_moves]):
-                    # all in lines processed or will be processed for this po line
-                    wf_service.trg_validate(uid, 'purchase.order.line', move.purchase_line_id.id, 'done', cr)
-
-                if move.purchase_line_id.is_line_split and move.purchase_line_id.original_line_id:
-                    # check if the original PO line can be set to done
-                    not_done_moves = self.pool.get('stock.move').search(cr, uid, [
-                        ('purchase_line_id', '=', move.purchase_line_id.original_line_id.id),
-                        ('state', 'not in', ['cancel', 'cancel_r', 'done']),
-                        ('picking_id.type', '=', 'in'),
-                    ], context=context)
-                    if (not not_done_moves) or all([x in ids for x in not_done_moves]):
-                        # all in lines processed or will be processed for this po line
-                        wf_service.trg_validate(uid, 'purchase.order.line', move.purchase_line_id.original_line_id.id, 'done', cr)
-
                 sol_ids = pol_obj.get_sol_ids_from_pol_ids(cr, uid, [move.purchase_line_id.id], context=context)
                 for sol in sol_obj.browse(cr, uid, sol_ids, context=context):
                     # If the line will be sourced in another way, do not cancel the OUT move
@@ -5118,15 +5098,15 @@
                         continue
 
                     diff_qty = uom_obj._compute_qty(cr, uid, move.product_uom.id, move.product_qty, sol.product_uom.id)
-                    if move.picking_id.partner_id2.partner_type not in ['internal','section','intermission']:
-                        sol_obj.update_or_cancel_line(cr, uid, sol.id, diff_qty, resource=resource,context=context)
+                    if move.picking_id.partner_id2.partner_type not in ['internal', 'section', 'intermission']:
+                        sol_obj.update_or_cancel_line(cr, uid, sol.id, diff_qty, resource=resource, context=context)
                     # Cancel the remaining OUT line
                     if diff_qty < sol.product_uom_qty:
                         data_back = self.create_data_back(move)
                         out_move = self.get_mirror_move(cr, uid, [move.id], data_back, context=context)[move.id]
                         out_move_id = False
                         if out_move['moves']:
-                            out_move_id = sorted(out_move['moves'], key=lambda x: abs(x.product_qty-diff_qty))[0].id
+                            out_move_id = sorted(out_move['moves'], key=lambda x: abs(x.product_qty - diff_qty))[0].id
                         elif out_move['move_id']:
                             out_move_id = out_move['move_id']
 
@@ -5134,6 +5114,26 @@
                             context.setdefault('not_resource_move', []).append(out_move_id)
                             self.action_cancel(cr, uid, [out_move_id], context=context)
 
+                not_done_moves = self.pool.get('stock.move').search(cr, uid, [
+                    ('purchase_line_id', '=', move.purchase_line_id.id),
+                    ('state', 'not in', ['cancel', 'cancel_r', 'done']),
+                    ('picking_id.type', '=', 'in'),
+                ], context=context)
+                if (not not_done_moves) or all([x in ids for x in not_done_moves]):
+                    # all in lines processed or will be processed for this po line
+                    wf_service.trg_validate(uid, 'purchase.order.line', move.purchase_line_id.id, 'done', cr)
+
+                if move.purchase_line_id.is_line_split and move.purchase_line_id.original_line_id:
+                    # check if the original PO line can be set to done
+                    not_done_moves = self.pool.get('stock.move').search(cr, uid, [
+                        ('purchase_line_id', '=', move.purchase_line_id.original_line_id.id),
+                        ('state', 'not in', ['cancel', 'cancel_r', 'done']),
+                        ('picking_id.type', '=', 'in'),
+                    ], context=context)
+                    if (not not_done_moves) or all([x in ids for x in not_done_moves]):
+                        # all in lines processed or will be processed for this po line
+                        wf_service.trg_validate(uid, 'purchase.order.line', move.purchase_line_id.original_line_id.id, 'done', cr)
+
                 self.pool.get('purchase.order.line').update_fo_lines(cr, uid, [move.purchase_line_id.id], context=context)
 
             elif move.sale_line_id and (pick_type == 'internal' or (pick_type == 'out' and subtype_ok)):
@@ -5306,10 +5306,10 @@
         'from_pack': fields.integer(string='From p.'),
         'to_pack': fields.integer(string='To p.'),
         'pack_type': fields.many2one('pack.type', string='Pack Type'),
-        'length' : fields.float(digits=(16, 2), string='Length [cm]'),
-        'width' : fields.float(digits=(16, 2), string='Width [cm]'),
-        'height' : fields.float(digits=(16, 2), string='Height [cm]'),
-        'weight' : fields.float(digits=(16, 2), string='Weight p.p [kg]'),
+        'length': fields.float(digits=(16, 2), string='Length [cm]'),
+        'width': fields.float(digits=(16, 2), string='Width [cm]'),
+        'height': fields.float(digits=(16, 2), string='Height [cm]'),
+        'weight': fields.float(digits=(16, 2), string='Weight p.p [kg]'),
         # functions
         'move_lines': fields.function(_vals_get, method=True, type='one2many', relation='stock.move', string='Stock Moves', multi='get_vals',),
         'fake_state': fields.function(_vals_get, method=True, type='char', String='Fake state', multi='get_vals'),

=== modified file 'bin/addons/msf_outgoing/report/labels.rml'
--- bin/addons/msf_outgoing/report/labels.rml	2017-04-24 13:16:28 +0000
+++ bin/addons/msf_outgoing/report/labels.rml	2018-02-12 10:19:50 +0000
@@ -137,7 +137,7 @@
               <para style="P4">[[ stock_picking.ppl_customize_label.weight and translate('Weight:') or ' ' ]]</para>
             </td>
             <td>
-              <para style="P3">[[ stock_picking.ppl_customize_label.weight and str(pack_family.weight or '0.0') + ' kg' or ' ' ]]</para>
+              <para style="P3">[[ stock_picking.ppl_customize_label.weight and str(stock_picking.total_weight or '0.0') + ' kg' or ' ' ]]</para>
             </td>
           </tr>
           <tr>

=== modified file 'bin/addons/msf_profile/i18n/fr_MF.po'
--- bin/addons/msf_profile/i18n/fr_MF.po	2017-12-12 10:23:48 +0000
+++ bin/addons/msf_profile/i18n/fr_MF.po	2018-02-12 10:19:50 +0000
@@ -101136,3 +101136,22 @@
 #, python-format
 msgid "You must select at least one currency of transfers."
 msgstr "Vous devez sélectionner au moins une devise de virement."
+
+#. module: account_corrections
+#: code:addons/account_corrections/account_move_line.py:567
+#, python-format
+msgid "No OD-Extra Accounting Analytic Journal found!"
+msgstr "Aucun Journal Analytique de type OD-Extra Accounting n'a été trouvé !"
+
+#. module: register_accounting
+#: code:addons/register_accounting/wizard/wizard_register_import.py:490
+#, python-format
+msgid "Line %s. Third Party %s not found or not compatible with the Type for specific treatment of the account '%s - %s'."
+msgstr "Ligne %s. Tiers %s non trouvé ou non compatible avec le Type pour traitement spécifique du compte '%s - %s'."
+
+#. modules: purchase, sale
+#: code:addons/purchase/purchase_workflow.py:413
+#: code:addons/sale/sale_workflow.py:491
+#, python-format
+msgid "You can't use taxes with an intermission partner."
+msgstr "Vous ne pouvez pas utiliser de taxes avec un partenaire intermission."

=== modified file 'bin/addons/msf_supply_doc_export/wizard/po_follow_up.py'
--- bin/addons/msf_supply_doc_export/wizard/po_follow_up.py	2016-01-29 15:34:00 +0000
+++ bin/addons/msf_supply_doc_export/wizard/po_follow_up.py	2018-02-12 10:19:50 +0000
@@ -22,7 +22,7 @@
 from osv import osv
 from osv import fields
 from tools.translate import _
-from lxml import etree
+from urllib import quote_plus
 
 import time
 from datetime import datetime
@@ -42,116 +42,116 @@
     _description = 'PO Follow up report wizard'
 
     _columns = {
-         'po_id':fields.many2one('purchase.order',string="Order Reference", help="Unique number of the Purchase Order. Optional", required=False),
-         'state': fields.selection(PURCHASE_ORDER_STATE_SELECTION, 'State', help="The state of the purchase order. Optional", select=True, required=False),
-         'po_date_from':fields.date("PO date from", required="False"),
-         'po_date_thru':fields.date("PO date to", required="False"),
-         'partner_id':fields.many2one('res.partner', 'Supplier', required=False),
-         'project_ref':fields.char('Supplier reference', size=64, required=False),
-         'export_format': fields.selection([('xls', 'Excel'), ('pdf', 'PDF')], string="Export format", required=True),    
-         'background_time': fields.integer('Number of second before background processing'),
+        'po_id': fields.many2one('purchase.order', string="Order Reference", help="Unique number of the Purchase Order. Optional", required=False),
+        'state': fields.selection(PURCHASE_ORDER_STATE_SELECTION, 'State', help="The state of the purchase order. Optional", select=True, required=False),
+        'po_date_from': fields.date("PO date from", required="False"),
+        'po_date_thru': fields.date("PO date to", required="False"),
+        'partner_id': fields.many2one('res.partner', 'Supplier', required=False),
+        'project_ref': fields.char('Supplier reference', size=64, required=False),
+        'export_format': fields.selection([('xls', 'Excel'), ('pdf', 'PDF')], string="Export format", required=True),
+        'background_time': fields.integer('Number of second before background processing'),
     }
-    
+
     _defaults = {
         'export_format': lambda *a: 'xls',
         'background_time': lambda *a: 20,
     }
-    
+
     def button_validate(self, cr, uid, ids, context=None):
-        wiz = self.browse(cr,uid,ids)[0]
+        wiz = self.browse(cr, uid, ids)[0]
 
         domain = [('rfq_ok', '=', False)]
         states = {}
         for state_val, state_string in PURCHASE_ORDER_STATE_SELECTION:
             states[state_val] = state_string
-        report_parms =  {
+        report_parms = {
             'title': 'PO Follow Up per Supplier',
             'run_date': time.strftime("%d/%m/%Y"),
             'date_from': '',
             'date_thru': '',
             'state': '',
-            'supplier':''
+            'supplier': ''
         }
-         
+
         # PO number
         if wiz.po_id:
-            domain.append(('id','=', wiz.po_id.id))
-   
+            domain.append(('id', '=', wiz.po_id.id))
+
         # Status
         if wiz.state:
-            domain.append(('state','=', wiz.state))
+            domain.append(('state', '=', wiz.state))
             report_parms['state'] = states[wiz.state]
-            
+
         # Dates
         if wiz.po_date_from:
-            domain.append(('date_order','>=',wiz.po_date_from))
-            tmp = datetime.strptime(wiz.po_date_from,"%Y-%m-%d")
+            domain.append(('date_order', '>=', wiz.po_date_from))
+            tmp = datetime.strptime(wiz.po_date_from, "%Y-%m-%d")
             report_parms['date_from'] = tmp.strftime("%d/%m/%Y")
 
         if wiz.po_date_thru:
-            domain.append(('date_order','<=',wiz.po_date_thru))
-            tmp = datetime.strptime(wiz.po_date_thru,"%Y-%m-%d")
+            domain.append(('date_order', '<=', wiz.po_date_thru))
+            tmp = datetime.strptime(wiz.po_date_thru, "%Y-%m-%d")
             report_parms['date_thru'] = tmp.strftime("%d/%m/%Y")
 
         # Supplier
         if wiz.partner_id:
-            domain.append(('partner_id','=', wiz.partner_id.id))
-            report_parms['supplier'] = wiz.partner_id.name  
-            
+            domain.append(('partner_id', '=', wiz.partner_id.id))
+            report_parms['supplier'] = quote_plus(wiz.partner_id.name)
+
         # Supplier Reference
         if wiz.project_ref:
-            domain.append(('project_ref','like',wiz.project_ref))
-        
+            domain.append(('project_ref', 'like', wiz.project_ref))
+
         # get the PO ids based on the selected criteria
         po_obj = self.pool.get('purchase.order')
         po_ids = po_obj.search(cr, uid, domain)
-        
+
         if not po_ids:
             raise osv.except_osv(_('Error'), _('No Purchase Orders match the specified criteria.'))
             return True
-        
+
         report_header = []
         report_header.append(report_parms['title'])
-        
+
         report_header_line2 = ''
         if wiz.partner_id:
             report_header_line2 += wiz.partner_id.name
-        report_header_line2 += '  Report run date: ' + time.strftime("%d/%m/%Y")  #TODO to be removed
+        report_header_line2 += '  Report run date: ' + time.strftime("%d/%m/%Y")  # TODO to be removed
         if wiz.po_date_from:
             report_header_line2 += wiz.po_date_from
-        #UF-2496: Minor fix to append the "date from" correctly into header
+        # UF-2496: Minor fix to append the "date from" correctly into header
         if wiz.po_date_thru:
             if wiz.po_date_from:
                 report_header_line2 += ' - '
             report_header_line2 += wiz.po_date_thru
-        report_header.append(report_header_line2)
-      
-        datas = {'ids': po_ids, 'report_header': report_header, 'report_parms': report_parms}       
+        report_header.append(quote_plus(report_header_line2))
+
+        datas = {'ids': po_ids, 'report_header': report_header, 'report_parms': report_parms}
         if wiz.export_format == 'xls':
             report_name = 'po.follow.up_xls'
         else:
             report_name = 'po.follow.up_rml'
-            
+
         if wiz.po_date_from:
-            domain.append(('date_order','>=',wiz.po_date_from))
-                   
+            domain.append(('date_order', '>=', wiz.po_date_from))
+
         background_id = self.pool.get('memory.background.report').create(cr, uid, {'file_name': report_name, 'report_name': report_name}, context=context)
         context['background_id'] = background_id
         context['background_time'] = wiz.background_time
-                                                                             
-        return {                                                                
-            'type': 'ir.actions.report.xml',                                    
-            'report_name': report_name,                                         
-            'datas': datas,                                                     
-            'nodestroy': True,                                                  
-            'context': context,                                                 
+
+        return {
+            'type': 'ir.actions.report.xml',
+            'report_name': report_name,
+            'datas': datas,
+            'nodestroy': True,
+            'context': context,
         }
-    
+
 po_follow_up()
 
 
 # already defined in account_mcdb/wizard/output_currency_for_export.py
-#class background_report(osv.osv_memory):
+# class background_report(osv.osv_memory):
 #        _name = 'memory.background.report'
 #        _description = 'Report result'
 #
@@ -164,4 +164,4 @@
 #        }
 #        def update_percent(self, cr, uid, ids, percent, context=None):
 #            self.write(cr, uid, ids, {'percent': percent})
-#background_report()
+# background_report()

=== modified file 'bin/addons/purchase/purchase_workflow.py'
--- bin/addons/purchase/purchase_workflow.py	2017-12-14 17:30:55 +0000
+++ bin/addons/purchase/purchase_workflow.py	2018-02-12 10:19:50 +0000
@@ -49,7 +49,7 @@
         '''
         if context is None:
             context = {}
-        if isinstance(ids, (int,long)):
+        if isinstance(ids, (int, long)):
             ids = [ids]
 
         for pol in self.browse(cr, uid, ids, context=context):
@@ -73,7 +73,7 @@
                 domain = [('purchase_line_id', '=', pol.id), ('type', '=', 'in'), ('state', '=', 'assigned')]
                 linked_in_move = self.pool.get('stock.move').search(cr, uid, domain, context=context)
                 if linked_in_move:
-                    self.pool.get('stock.move').action_cancel(cr, uid, linked_in_move, context=context)  
+                    self.pool.get('stock.move').action_cancel(cr, uid, linked_in_move, context=context)
 
         return True
 
@@ -84,7 +84,7 @@
         '''
         if context is None:
             context = {}
-        if isinstance(ids, (int,long)):
+        if isinstance(ids, (int, long)):
             ids = [ids]
 
         for pol in self.browse(cr, uid, ids, fields_to_fetch=['price_unit'], context=context):
@@ -99,7 +99,7 @@
         '''
         if context is None:
             context = {}
-        if isinstance(ids, (int,long)):
+        if isinstance(ids, (int, long)):
             ids = [ids]
 
         for pol in self.browse(cr, uid, ids, context=context):
@@ -117,7 +117,7 @@
                     ], context=context)
                     so_id = so_id and so_id[0] or False
                 if not so_id:
-                    continue # no sale order linked to our PO line
+                    continue  # no sale order linked to our PO line
                 sale_order = self.pool.get('sale.order').browse(cr, uid, so_id, context=context)
                 if sale_order.state == 'cancel' and sale_order.procurement_request:
                     to_trigger = True
@@ -126,7 +126,7 @@
                 sale_order = pol.linked_sol_id.order_id
             else:
                 # case of PO line from scratch, nothing to update
-                continue 
+                continue
 
             # convert from currency of pol to currency of sol
             price_unit_converted = self.pool.get('res.currency').compute(cr, uid, pol.currency_id.id, sale_order.currency_id.id, pol.price_unit or 0.0,
@@ -204,14 +204,14 @@
                 # the right OUT move (moves are already splits at this level):
                 if sol_values['is_line_split']:
                     linked_out_moves = self.pool.get('stock.move').search(cr, uid, [
-                        ('sale_line_id', '=', sol_values['original_line_id']), 
-                        ('type', '=', 'out')], 
+                        ('sale_line_id', '=', sol_values['original_line_id']),
+                        ('type', '=', 'out')],
                         context=context)
                     if len(linked_out_moves) > 1:
                         for out_move in self.pool.get('stock.move').browse(cr, uid, linked_out_moves, context=context):
                             if out_move.state in ('assigned', 'confirmed') and out_move.product_qty == sol_values['product_uom_qty']:
                                 self.pool.get('stock.move').write(cr, uid, [out_move.id], {'sale_line_id': new_sol}, context=context)
-            else: # update FO line
+            else:  # update FO line
                 self.pool.get('sale.order.line').write(cr, uid, [pol.linked_sol_id.id], sol_values, context=context)
 
 
@@ -226,7 +226,7 @@
         '''
         if context is None:
             context = {}
-        if isinstance(ids, (int,long)):
+        if isinstance(ids, (int, long)):
             ids = [ids]
         if not fo_id:
             raise Exception, "No parent Sale Order given for the new Sale Order line"
@@ -305,10 +305,10 @@
         '''
         if context is None:
             context = {}
-        if isinstance(ids, (int,long)):
+        if isinstance(ids, (int, long)):
             ids = [ids]
         if not ids:
-            raise Exception , "No PO line given"
+            raise Exception, "No PO line given"
 
         # load common data into context:
         self.pool.get('data.tools').load_common_data(cr, uid, ids, context=context)
@@ -332,7 +332,7 @@
         pick_id = self.pool.get('stock.picking').create(cr, uid, pick_values, context=context)
 
         # log picking creation
-        self.pool.get('stock.picking').log(cr, uid, pick_id, _('The new internal Picking %s has been created.')%name)
+        self.pool.get('stock.picking').log(cr, uid, pick_id, _('The new internal Picking %s has been created.') % name)
 
         return pick_id
 
@@ -343,7 +343,7 @@
         '''
         if context is None:
             context = {}
-        if isinstance(ids, (int,long)):
+        if isinstance(ids, (int, long)):
             ids = [ids]
         wf_service = netsvc.LocalService("workflow")
 
@@ -383,7 +383,7 @@
         '''
         if context is None:
             context = {}
-        if isinstance(ids, (int,long)):
+        if isinstance(ids, (int, long)):
             ids = [ids]
         self.write(cr, uid, ids, {'state': 'validated_n'}, context=context)
 
@@ -400,6 +400,17 @@
 
         return True
 
+    def check_po_tax(self, cr, uid, ids, context=None):
+        """
+        Prevents from validating a PO with taxes when using an Intermission partner
+        """
+        if context is None:
+            context = {}
+        if isinstance(ids, (int, long)):
+            ids = [ids]
+        for po_line in self.browse(cr, uid, ids, fields_to_fetch=['order_id', 'taxes_id'], context=context):
+            if po_line.taxes_id and po_line.order_id.partner_type == 'intermission':
+                raise osv.except_osv(_('Error'), _("You can't use taxes with an intermission partner."))
 
     def action_validate(self, cr, uid, ids, context=None):
         '''
@@ -407,7 +418,7 @@
         '''
         if context is None:
             context = {}
-        if isinstance(ids, (int,long)):
+        if isinstance(ids, (int, long)):
             ids = [ids]
         wf_service = netsvc.LocalService("workflow")
 
@@ -415,6 +426,7 @@
         self.check_analytic_distribution(cr, uid, ids, context=context)
         self.check_if_stock_take_date_with_esc_partner(cr, uid, ids, context=context)
         self.check_unit_price(cr, uid, ids, context=context)
+        self.check_po_tax(cr, uid, ids, context=context)
 
         # update FO lines:
         self.update_fo_lines(cr, uid, ids, context=context)
@@ -451,7 +463,7 @@
         '''
         if context is None:
             context = {}
-        if isinstance(ids, (int,long)):
+        if isinstance(ids, (int, long)):
             ids = [ids]
         wf_service = netsvc.LocalService("workflow")
 
@@ -472,13 +484,13 @@
         '''
         if context is None:
             context = {}
-        if isinstance(ids, (int,long)):
+        if isinstance(ids, (int, long)):
             ids = [ids]
         wf_service = netsvc.LocalService("workflow")
 
         self.write(cr, uid, ids, {'state': 'sourced_v'}, context=context)
 
-        #update linked sol (same instance) to sourced-v (if has)
+        # update linked sol (same instance) to sourced-v (if has)
         for po in self.browse(cr, uid, ids, context=context):
             if po.linked_sol_id:
                 wf_service.trg_validate(uid, 'sale.order.line', po.linked_sol_id.id, 'sourced_v', cr)
@@ -492,7 +504,7 @@
         '''
         if context is None:
             context = {}
-        if isinstance(ids, (int,long)):
+        if isinstance(ids, (int, long)):
             ids = [ids]
 
         self.write(cr, uid, ids, {'state': 'sourced_n'}, context=context)
@@ -547,9 +559,9 @@
                     self.pool.get('stock.move').in_action_confirm(cr, uid, incoming_move_id, context)
 
                 # create internal moves (INT):
-                if pol.order_id.location_id.input_ok and pol.product_id.type not in ('service_recep', 'consu'): 
+                if pol.order_id.location_id.input_ok and pol.product_id.type not in ('service_recep', 'consu'):
                     internal_pick = self.pool.get('stock.picking').search(cr, uid, [
-                        ('type', '=', 'internal'), 
+                        ('type', '=', 'internal'),
                         ('purchase_id', '=', pol.order_id.id),
                         ('state', 'not in', ['done', 'cancel']),
                     ], context=context)
@@ -604,7 +616,7 @@
         '''
         if context is None:
             context = {}
-        if isinstance(ids, (int,long)):
+        if isinstance(ids, (int, long)):
             ids = [ids]
         wf_service = netsvc.LocalService("workflow")
 
@@ -613,8 +625,8 @@
 
         for pol in self.browse(cr, uid, ids, context=context):
             # no PICK/OUT needed in this cases; close SO line:
-            internal_ir = pol.linked_sol_id and pol.linked_sol_id.order_id.procurement_request and pol.linked_sol_id.order_id.location_requestor_id.usage == 'internal' or False # PO line from Internal IR
-            dpo = pol.order_id.order_type == 'direct' or False # direct PO
+            internal_ir = pol.linked_sol_id and pol.linked_sol_id.order_id.procurement_request and pol.linked_sol_id.order_id.location_requestor_id.usage == 'internal' or False  # PO line from Internal IR
+            dpo = pol.order_id.order_type == 'direct' or False  # direct PO
             ir_non_stockable = pol.linked_sol_id and pol.linked_sol_id.order_id.procurement_request and pol.linked_sol_id.product_id.type in ('consu', 'service', 'service_recep') or False
 
             if internal_ir or dpo or ir_non_stockable:
@@ -700,7 +712,7 @@
         """
         if context is None:
             context = {}
-        if isinstance(ids, (int,long)):
+        if isinstance(ids, (int, long)):
             ids = [ids]
 
         for po in self.browse(cr, uid, ids, context=context):
@@ -715,7 +727,7 @@
         '''
         if context is None:
             context = {}
-        if isinstance(ids, (int,long)):
+        if isinstance(ids, (int, long)):
             ids = [ids]
         wf_service = netsvc.LocalService("workflow")
 

=== modified file 'bin/addons/register_accounting/report/fully_report_xls.mako'
--- bin/addons/register_accounting/report/fully_report_xls.mako	2017-09-26 11:57:14 +0000
+++ bin/addons/register_accounting/report/fully_report_xls.mako	2018-02-12 10:19:50 +0000
@@ -904,8 +904,16 @@
 <!-- Display analytic lines linked to this register line -->
 <%
 a_lines = False
+adv_return_aal = line.cash_return_move_line_id and line.cash_return_move_line_id.analytic_lines or []
+adv_return_fp_lines = []
+adv_return_free_lines = []
+for adv_return_l in adv_return_aal:
+    if adv_return_l.free_account:
+        adv_return_free_lines.append(adv_return_l)
+    else:
+        adv_return_fp_lines.append(adv_return_l)
 if line.fp_analytic_lines and not line.invoice_id and not line.imported_invoice_line_ids:
-    a_lines = line.cash_return_move_line_id and line.cash_return_move_line_id.analytic_lines or line.fp_analytic_lines
+    a_lines = adv_return_fp_lines or line.fp_analytic_lines
 %>
 % if a_lines:
 % for ana_line in sorted(a_lines, key=lambda x: x.id):
@@ -964,7 +972,7 @@
 <%
 a_lines = False
 if line.free_analytic_lines and not line.invoice_id and not line.imported_invoice_line_ids:
-    a_lines = line.free_analytic_lines
+    a_lines = adv_return_free_lines or line.free_analytic_lines
 %>
 % if a_lines:
 % for ana_line in sorted(a_lines, key=lambda x: x.id):

=== modified file 'bin/addons/register_accounting/wizard/import_invoice_on_registers.py'
--- bin/addons/register_accounting/wizard/import_invoice_on_registers.py	2017-06-06 09:58:17 +0000
+++ bin/addons/register_accounting/wizard/import_invoice_on_registers.py	2018-02-12 10:19:50 +0000
@@ -244,7 +244,8 @@
 
                 # Create register line
                 partial = False
-                if line.amount and line.amount_to_pay and line.amount < abs(line.amount_to_pay):
+                equal_amounts = abs(abs(line.amount) - abs(line.amount_to_pay)) <= 10**-3
+                if not equal_amounts and line.amount < abs(line.amount_to_pay):
                     partial = ' - ' + _('partial pymt')
                 ref = line.ref
                 if not ref or ref == 'false':

=== modified file 'bin/addons/register_accounting/wizard/wizard_register_import.py'
--- bin/addons/register_accounting/wizard/wizard_register_import.py	2017-04-19 13:19:37 +0000
+++ bin/addons/register_accounting/wizard/wizard_register_import.py	2018-02-12 10:19:50 +0000
@@ -61,9 +61,9 @@
         if not context:
             context = {}
         view = super(wizard_register_import, self).fields_view_get(cr, uid, view_id, view_type, context, toolbar, submenu)
-        if view_type=='form':
+        if view_type == 'form':
             form = etree.fromstring(view['arch'])
-            for el in [('document_date', 'Document Date'), ('posting_date', 'Posting Date'), ('cheque_number', 'Cheque Number'), ('description', 'Description'), ('reference', 'Reference'), ('account', 'Account'), ('third_party', 'Third Party'), ('amount_in', 'Amount In'), ('amount_out', 'Amount Out'), ('destination', 'Destination'), ('cost_center', 'Cost Centre'), ('funding_pool', 'Funding Pool'), ('proprietary_instance', "Proprietary instance's code"), ('journal', "Journal's code"), ('currency', "Currency's code"),('free1', "Free 1"),('free2', "Free 2")]:
+            for el in [('document_date', 'Document Date'), ('posting_date', 'Posting Date'), ('cheque_number', 'Cheque Number'), ('description', 'Description'), ('reference', 'Reference'), ('account', 'Account'), ('third_party', 'Third Party'), ('amount_in', 'Amount In'), ('amount_out', 'Amount Out'), ('destination', 'Destination'), ('cost_center', 'Cost Centre'), ('funding_pool', 'Funding Pool'), ('proprietary_instance', "Proprietary instance's code"), ('journal', "Journal's code"), ('currency', "Currency's code"), ('free1', "Free 1"), ('free2', "Free 2")]:
                 fields = form.xpath('/form//th[@class="' + el[0] + '"]')
                 for field in fields:
                     field.text = _(el[1])
@@ -149,20 +149,20 @@
                 currency_id = l.get('currency_id', False) and l.get('currency_id')[0] or False
                 account = account_obj.read(cr, uid, account_id, ['is_analytic_addicted'])
                 cheque_number = l.get('cheque_number')
-                free_1_id = l.get('free_1_id',False) and l.get('free_1_id')[0] or False
-                free_2_id = l.get('free_2_id',False) and l.get('free_2_id')[0] or False
+                free_1_id = l.get('free_1_id', False) and l.get('free_1_id')[0] or False
+                free_2_id = l.get('free_2_id', False) and l.get('free_2_id')[0] or False
 
                 vals = {
-                    'name':                l.get('description', ''),
-                    'ref':                 l.get('ref', ''),
-                    'document_date':       l.get('document_date', False),
-                    'date':                date,
-                    'account_id':          account_id,
-                    'amount':              l.get('debit', 0.0) - l.get('credit', 0.0),
-                    'partner_id':          partner_id,
-                    'employee_id':         employee_id,
+                    'name': l.get('description', ''),
+                    'ref': l.get('ref', ''),
+                    'document_date': l.get('document_date', False),
+                    'date': date,
+                    'account_id': account_id,
+                    'amount': l.get('debit', 0.0) - l.get('credit', 0.0),
+                    'partner_id': partner_id,
+                    'employee_id': employee_id,
                     'transfer_journal_id': transfer_journal_id,
-                    'statement_id':        register_id,
+                    'statement_id': register_id,
                 }
                 if cheque_number:
                     vals['cheque_number'] = str(cheque_number)
@@ -182,21 +182,21 @@
                         'source_date': date,
                         'destination_id': destination_id,
                     }
-                    common_vals.update({'analytic_id': cost_center_id,})
+                    common_vals.update({'analytic_id': cost_center_id, })
                     self.pool.get('cost.center.distribution.line').create(cr, uid, common_vals)
-                    common_vals.update({'analytic_id': funding_pool_id or msf_fp_id, 'cost_center_id': cost_center_id,})
+                    common_vals.update({'analytic_id': funding_pool_id or msf_fp_id, 'cost_center_id': cost_center_id, })
                     self.pool.get('funding.pool.distribution.line').create(cr, uid, common_vals)
 
                     if free_1_id:
-                        common_vals.update({'analytic_id': free_1_id,})
-                        self.pool.get('free.1.distribution.line').create(cr,uid,common_vals)
+                        common_vals.update({'analytic_id': free_1_id, })
+                        self.pool.get('free.1.distribution.line').create(cr, uid, common_vals)
 
                     if free_2_id:
-                        common_vals.update({'analytic_id': free_2_id,})
-                        self.pool.get('free.2.distribution.line').create(cr,uid,common_vals)
+                        common_vals.update({'analytic_id': free_2_id, })
+                        self.pool.get('free.2.distribution.line').create(cr, uid, common_vals)
 
                     # Check analytic distribution. Use SKIP_WRITE_CHECK to not do anything else that writing analytic distribution field
-                    absl_obj.write(cr, uid, [absl_id], {'analytic_distribution_id': distrib_id,}, context={'skip_write_check': True})
+                    absl_obj.write(cr, uid, [absl_id], {'analytic_distribution_id': distrib_id, }, context={'skip_write_check': True})
                     # Add this line to be check at the end of the process
                     to_check.append(absl_id)
                 # Update wizard with current progression
@@ -212,7 +212,7 @@
                 to_delete.append(absl_data.get('id'))
                 to_delete_distrib.append(absl_data.get('analytic_distribution_id', [False])[0])
             # Delete analytic distribution field on register lines
-            absl_obj.write(cr, uid, to_delete, {'analytic_distribution_id': False}, context={'skip_write_check': True}) # do not do anything else than changing analytic_distribution_id field content (thanks to SKIP_WRITE_CHECK)
+            absl_obj.write(cr, uid, to_delete, {'analytic_distribution_id': False}, context={'skip_write_check': True})  # do not do anything else than changing analytic_distribution_id field content (thanks to SKIP_WRITE_CHECK)
             # Delete analytic distribution
             self.pool.get('analytic.distribution').unlink(cr, uid, to_delete_distrib, context)
         return True
@@ -234,6 +234,9 @@
         processed = 0
         errors = []
         cheque_numbers = []
+        employee_obj = self.pool.get('hr.employee')
+        journal_obj = self.pool.get('account.journal')
+        partner_obj = self.pool.get('res.partner')
         try:
             msf_fp_id = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'analytic_distribution', 'analytic_account_msf_private_funds')[1]
         except ValueError:
@@ -270,22 +273,22 @@
                 # cols variable describe each column and its expected number
                 cols = {
                     'document_date': 0,
-                    'posting_date':  1,
+                    'posting_date': 1,
                     'cheque_number': 2,
-                    'description':   3,
-                    'reference':     4,
-                    'account':       5,
-                    'third_party':   6,
-                    'amount_in':     7,
-                    'amount_out':    8,
-                    'destination':   9,
-                    'cost_center':   10,
-                    'funding_pool':  11,
-                    'free1':         12,
-                    'free2':         13,
+                    'description': 3,
+                    'reference': 4,
+                    'account': 5,
+                    'third_party': 6,
+                    'amount_in': 7,
+                    'amount_out': 8,
+                    'destination': 9,
+                    'cost_center': 10,
+                    'funding_pool': 11,
+                    'free1': 12,
+                    'free2': 13,
                 }
                 # Number of line to bypass in line's count
-                base_num = 5 # because of Python that begins to 0.
+                base_num = 5  # because of Python that begins to 0.
                 # Attempt to read 3 first lines
                 first_line = self.pool.get('import.cell.data').get_line_values(cr, uid, ids, rows.next())
                 try:
@@ -296,7 +299,7 @@
                 try:
                     journal_code = second_line[1]
                 except IndexError, e:
-                    raise osv.except_osv(_('Warning'),  _('No journal code found.'))
+                    raise osv.except_osv(_('Warning'), _('No journal code found.'))
                 third_line = self.pool.get('import.cell.data').get_line_values(cr, uid, ids, rows.next())
                 try:
                     currency_code = third_line[1]
@@ -309,7 +312,7 @@
                 if isinstance(instance_ids, (int, long)):
                     instance_ids = [instance_ids]
                 # Check second info: journal's code
-                journal_ids = self.pool.get('account.journal').search(cr, uid, [('code', '=', journal_code)])
+                journal_ids = journal_obj.search(cr, uid, [('code', '=', journal_code)])
                 if not journal_ids or len(journal_ids) > 1:
                     raise osv.except_osv(_('Warning'), _('Journal %s not found.') % (journal_code or '',))
                 if isinstance(journal_ids, (int, long)):
@@ -346,7 +349,7 @@
                 # Check file's content
                 for num, r in enumerate(rows):
                     # Update wizard
-                    progression = ((float(num+1) * remaining) / float(nb_rows)) + 6
+                    progression = ((float(num + 1) * remaining) / float(nb_rows)) + 6
                     self.write(cr, uid, [wiz.id], {'message': _('Checking file…'), 'progression': progression}, context)
                     # Prepare some values
                     r_debit = 0
@@ -446,42 +449,62 @@
                     if register_type == 'cheque':
                         if r_cheque_number:
                             if r_cheque_number in cheque_numbers:
-                                errors.append(_('Line %s. Cheque number %s is duplicated from another line') % (current_line_num,r_cheque_number,))
+                                errors.append(_('Line %s. Cheque number %s is duplicated from another line') % (current_line_num, r_cheque_number,))
                             absl = self.pool.get('account.bank.statement.line')
-                            cheque_number_id = absl.search(cr, uid, [('cheque_number','=',r_cheque_number)],context=context)
+                            cheque_number_id = absl.search(cr, uid, [('cheque_number', '=', r_cheque_number)], context=context)
                             if cheque_number_id:
-                                errors.append(_('Line %s. Cheque number %s has already been entered into the system.') % (current_line_num,r_cheque_number,))
+                                errors.append(_('Line %s. Cheque number %s has already been entered into the system.') % (current_line_num, r_cheque_number,))
                             cheque_numbers.append(r_cheque_number)
                         else:
                             errors.append(_('Line %s. Cheque number is missing') % (current_line_num,))
-                    # Check that Third party exists (if not empty)
+
+                    # Check Account/Third Party compatibility regarding the Account "Type for specific treatment"
                     partner_type = 'partner'
-                    if line[cols['third_party']]:
-                        if type_for_register == 'advance':
-                            tp_ids = self.pool.get('hr.employee').search(cr, uid, [('name', '=', line[cols['third_party']])])
-                            partner_type = 'employee'
-                        elif type_for_register in ['transfer', 'transfer_same']:
-                            tp_ids = self.pool.get('account.journal').search(cr, uid, [('code', '=', line[cols['third_party']])])
-                            if tp_ids:
+                    tp_ids = []
+                    has_specific_type = type_for_register in ['advance', 'transfer', 'transfer_same', 'down_payment', 'payroll'] or False
+                    if has_specific_type:
+                        if line[cols['third_party']]:
+                            # Type Operational Advance ==> EMPLOYEE required
+                            if type_for_register == 'advance':
+                                tp_ids = employee_obj.search(cr, uid, [('name', '=', line[cols['third_party']])], context=context)
+                                partner_type = 'employee'
+                            # Type Internal transfer ==> JOURNAL required
+                            elif type_for_register in ['transfer', 'transfer_same']:
+                                tp_ids = journal_obj.search(cr, uid, [('code', '=', line[cols['third_party']])], context=context)
                                 partner_type = 'journal'
-                                tp_journal = self.pool.get('account.journal').browse(cr, uid, tp_ids, context=context)[0]
-                                if type_for_register == 'transfer':
-                                    if tp_journal.currency.id == register_currency:
-                                        errors.append(_('Line %s. A Transfer Journal must have a different currency than the register.') % (current_line_num,))
-                                if type_for_register == 'transfer_same':
-                                    if tp_journal.currency.id != register_currency:
-                                        errors.append(_('Line %s. A Transfer Same Journal must have the same currency as the register.') % (current_line_num,))
-                        else:
-                            tp_ids = self.pool.get('res.partner').search(cr, uid, [('name', '=', line[cols['third_party']])])
-                            partner_type = 'partner'
-                        if not tp_ids:
-                            # Search now if employee exists
-                            tp_ids = self.pool.get('hr.employee').search(cr, uid, [('name', '=', line[cols['third_party']])])
+                                if tp_ids:
+                                    tp_journal = journal_obj.browse(cr, uid, tp_ids, fields_to_fetch=['currency'], context=context)[0]
+                                    if type_for_register == 'transfer':
+                                        if tp_journal.currency.id == register_currency:
+                                            errors.append(_('Line %s. A Transfer Journal must have a different currency than the register.') % (current_line_num,))
+                                            continue
+                                    if type_for_register == 'transfer_same':
+                                        if tp_journal.currency.id != register_currency:
+                                            errors.append(_('Line %s. A Transfer Same Journal must have the same currency as the register.') % (current_line_num,))
+                                            continue
+                            # Type DP or payroll ==> PARTNER required
+                            elif type_for_register in ['down_payment', 'payroll']:
+                                tp_ids = partner_obj.search(cr, uid, [('name', '=', line[cols['third_party']])], context=context)
+                                partner_type = 'partner'
+                        # Any type for Spec. Treatment listed above ==> EMPTY partner NOT allowed
+                        if not tp_ids:
+                            errors.append(
+                                _("Line %s. Third Party %s not found or not compatible with the Type for specific"
+                                  " treatment of the account '%s - %s'.") % (current_line_num, line[cols['third_party']] or '',
+                                                                             account['code'], account['name'],))
+                            continue
+                    elif line[cols['third_party']]:
+                        # if the account has no specific type, search for a partner, then an employee
+                        # (the journal type is ignored in that case. If used it should trigger an error message)
+                        tp_ids = partner_obj.search(cr, uid, [('name', '=', line[cols['third_party']])], context=context)
+                        partner_type = 'partner'
+                        if not tp_ids:
+                            tp_ids = employee_obj.search(cr, uid, [('name', '=', line[cols['third_party']])], context=context)
                             partner_type = 'employee'
-                            # If really not, raise an error for this line
-                            if not tp_ids:
-                                errors.append(_('Line %s. Third party not found: %s') % (current_line_num, line[cols['third_party']],))
-                                continue
+                        if not tp_ids:
+                            errors.append(_('Line %s. Third party not found: %s') % (current_line_num, line[cols['third_party']],))
+                            continue
+                    if tp_ids:
                         r_partner = tp_ids[0]
 
                     # US-672 TP compat with account
@@ -569,7 +592,7 @@
                     # - Booking Currency
                     vals = {
                         'description': r_description or '',
-                        'ref': line[4]  or '',
+                        'ref': line[4] or '',
                         'account_id': r_account or False,
                         'debit': r_debit or 0.0,
                         'credit': r_credit or 0.0,
@@ -586,14 +609,14 @@
                         'free_2_id': r_free2 or False,
                     }
                     if type_for_register == 'advance':
-                        vals.update({'employee_id': r_partner,})
+                        vals.update({'employee_id': r_partner, })
                     elif type_for_register in ['transfer', 'transfer_same']:
                         vals.update({'transfer_journal_id': r_partner})
                     else:
                         if partner_type == 'partner':
-                            vals.update({'partner_id': r_partner,})
+                            vals.update({'partner_id': r_partner, })
                         elif partner_type == 'employee':
-                            vals.update({'employee_id': r_partner,})
+                            vals.update({'employee_id': r_partner, })
                     line_res = self.pool.get('wizard.register.import.lines').create(cr, uid, vals, context)
                     if not line_res:
                         errors.append(_('Line %s. A problem occurred for line registration. Please contact an Administrator.') % (current_line_num,))
@@ -612,7 +635,7 @@
                 # Delete old errors
                 error_ids = self.pool.get('wizard.register.import.errors').search(cr, uid, [], context)
                 if error_ids:
-                    self.pool.get('wizard.register.import.errors').unlink(cr, uid, error_ids ,context)
+                    self.pool.get('wizard.register.import.errors').unlink(cr, uid, error_ids, context)
                 # create errors lines
                 for e in errors:
                     self.pool.get('wizard.register.import.errors').create(cr, uid, {'wizard_id': wiz.id, 'name': e}, context)

=== modified file 'bin/addons/sale/sale_workflow.py'
--- bin/addons/sale/sale_workflow.py	2018-01-08 13:50:26 +0000
+++ bin/addons/sale/sale_workflow.py	2018-02-12 10:19:50 +0000
@@ -52,7 +52,7 @@
             o_ana_dist_id = so.analytic_distribution_id and so.analytic_distribution_id.id
             distrib_id = l_ana_dist_id or o_ana_dist_id or False
 
-            #US-830 : Remove the definition of a default AD for the inter-mission FO is no AD is defined
+            # US-830 : Remove the definition of a default AD for the inter-mission FO is no AD is defined
             if not distrib_id and not so.order_type in ('loan', 'donation_st', 'donation_exp'):
                 raise osv.except_osv(
                     _('Warning'),
@@ -102,7 +102,7 @@
         '''
         if context is None:
             context = {}
-        if isinstance(ids, (int,long)):
+        if isinstance(ids, (int, long)):
             ids = [ids]
 
         # for each line get a new copy:
@@ -122,7 +122,7 @@
         '''
         if context is None:
             context = {}
-        if isinstance(ids, (int,long)):
+        if isinstance(ids, (int, long)):
             ids = [ids]
 
         for sol in self.browse(cr, uid, ids, context=context):
@@ -139,14 +139,14 @@
         '''
         if context is None:
             context = {}
-        if isinstance(ids, (int,long)):
+        if isinstance(ids, (int, long)):
             ids = [ids]
         wf_service = netsvc.LocalService("workflow")
 
         new_sol_id = False
         for sol in self.browse(cr, uid, ids, context=context):
             new_sol_id = self.copy(cr, uid, sol.id, {
-                'resourced_original_line': sol.id, 
+                'resourced_original_line': sol.id,
                 'resourced_original_remote_line': sol.sync_linked_pol,
                 'resourced_at_state': sol.state,
                 'is_line_split': False,
@@ -164,7 +164,7 @@
         '''
         if context is None:
             context = {}
-        if isinstance(ids, (int,long)):
+        if isinstance(ids, (int, long)):
             ids = [ids]
 
         sol = self.browse(cr, uid, ids[0], context=context)
@@ -189,7 +189,7 @@
         '''
         if context is None:
             context = {}
-        if isinstance(ids, (int,long)):
+        if isinstance(ids, (int, long)):
             ids = [ids]
 
         self.write(cr, uid, ids, {'state': 'done'}, context=context)
@@ -197,7 +197,7 @@
         # generate sync message manually :
         return_info = {}
         for sol_id in ids:
-            self.pool.get('sync.client.message_rule')._manual_create_sync_message(cr, uid, 'sale.order.line', sol_id, return_info, 
+            self.pool.get('sync.client.message_rule')._manual_create_sync_message(cr, uid, 'sale.order.line', sol_id, return_info,
                                                                                   'purchase.order.line.sol_update_original_pol', self._logger, check_identifier=False, context=context)
 
         return True
@@ -217,7 +217,7 @@
         # generate sync message manually :
         return_info = {}
         for sol_id in ids:
-            self.pool.get('sync.client.message_rule')._manual_create_sync_message(cr, uid, 'sale.order.line', sol_id, return_info, 
+            self.pool.get('sync.client.message_rule')._manual_create_sync_message(cr, uid, 'sale.order.line', sol_id, return_info,
                                                                                   'purchase.order.line.sol_update_original_pol', self._logger, check_identifier=False, context=context)
 
         return True
@@ -237,7 +237,7 @@
         # generate sync message
         return_info = {}
         for sol_id in ids:
-            self.pool.get('sync.client.message_rule')._manual_create_sync_message(cr, uid, 'sale.order.line', sol_id, return_info, 
+            self.pool.get('sync.client.message_rule')._manual_create_sync_message(cr, uid, 'sale.order.line', sol_id, return_info,
                                                                                   'purchase.order.line.sol_update_original_pol', self._logger, check_identifier=False, context=context)
 
         return True
@@ -271,7 +271,7 @@
         # generate sync message manually :
         return_info = {}
         for sol_id in ids:
-            self.pool.get('sync.client.message_rule')._manual_create_sync_message(cr, uid, 'sale.order.line', sol_id, return_info, 
+            self.pool.get('sync.client.message_rule')._manual_create_sync_message(cr, uid, 'sale.order.line', sol_id, return_info,
                                                                                   'purchase.order.line.sol_update_original_pol', self._logger, check_identifier=False, context=context)
 
         return True
@@ -283,7 +283,7 @@
         '''
         if context is None:
             context = {}
-        if isinstance(ids, (int,long)):
+        if isinstance(ids, (int, long)):
             ids = [ids]
 
         sol = self.browse(cr, uid, ids[0], context=context)
@@ -314,7 +314,7 @@
         '''
         if context is None:
             context = {}
-        if isinstance(ids, (int,long)):
+        if isinstance(ids, (int, long)):
             ids = [ids]
 
         pick_to_use = False
@@ -363,18 +363,20 @@
         '''
         if context is None:
             context = {}
-        if isinstance(ids, (int,long)):
+        if isinstance(ids, (int, long)):
             ids = [ids]
 
         for sol in self.browse(cr, uid, ids, context=context):
             out_moves_to_cancel = self.pool.get('stock.move').search(cr, uid, [
-                ('sale_line_id', '=', sol.id), 
+                ('sale_line_id', '=', sol.id),
                 ('type', '=', 'out'),
                 ('state', 'in', ['assigned', 'confirmed']),
             ], context=context)
 
             if out_moves_to_cancel:
+                context.update({'not_resource_move': out_moves_to_cancel})
                 self.pool.get('stock.move').action_cancel(cr, uid, out_moves_to_cancel, context=context)
+                context.pop('not_resource_move')
 
         return True
 
@@ -398,7 +400,7 @@
                 ('order_id.order_type', '=', 'direct'),
             ], context=context)
 
-            if sol.order_id.procurement_request and sol.product_id.type in ('consu', 'service', 'service_recep'): # IR non stockable
+            if sol.order_id.procurement_request and sol.product_id.type in ('consu', 'service', 'service_recep'):  # IR non stockable
                 continue
 
             if linked_dpo_line:
@@ -439,7 +441,7 @@
                 # Change Currency ??
                 if sol.order_partner_id.partner_type in ('section', 'intermission'):
                     picking = picking_obj.browse(cr, uid, pick_to_use, context=context)
-                    move = self.pool.get('stock.move').browse(cr ,uid, move_id, context=context)
+                    move = self.pool.get('stock.move').browse(cr, uid, move_id, context=context)
                     invoice_id, inv_type = picking_obj.action_invoice_create_header(cr, uid, picking, journal_id=False, invoices_group=False, type=False, use_draft=True, context=context)
                     if invoice_id:
                         picking_obj.action_invoice_create_line(cr, uid, picking, move, invoice_id, group=False, inv_type=inv_type, partner=sol.order_id.partner_id, context=context)
@@ -460,24 +462,35 @@
                 self.pool.get('stock.move').action_confirm(cr, uid, [move_id], context=context)
 
                 # confirm the OUT if in draft state:
-                pick_state = self.pool.get('stock.picking').read(cr, uid, pick_to_use, ['state'] ,context=context)['state']
+                pick_state = self.pool.get('stock.picking').read(cr, uid, pick_to_use, ['state'], context=context)['state']
                 if picking_data['type'] == 'out' and picking_data['subtype'] == 'standard' and pick_state == 'draft':
                     self.pool.get('stock.picking').draft_force_assign(cr, uid, [pick_to_use], context=context)
                 # run check availability on PICK/OUT:
                 if picking_data['type'] == 'out' and picking_data['subtype'] in ['picking', 'standard']:
                     self.pool.get('stock.picking').action_assign(cr, uid, [pick_to_use], context=context)
                 if picking_data['type'] == 'internal' and sol.type == 'make_to_stock' and sol.order_id.procurement_request:
-                    wf_service.trg_validate(uid, 'stock.picking', pick_to_use, 'button_confirm', cr)                    
+                    wf_service.trg_validate(uid, 'stock.picking', pick_to_use, 'button_confirm', cr)
 
         self.write(cr, uid, ids, {'state': 'confirmed'}, context=context)
 
         # generate sync message:
         return_info = {}
         for sol_id in ids:
-            self.pool.get('sync.client.message_rule')._manual_create_sync_message(cr, uid, 'sale.order.line', sol_id, return_info, 
+            self.pool.get('sync.client.message_rule')._manual_create_sync_message(cr, uid, 'sale.order.line', sol_id, return_info,
                                                                                   'purchase.order.line.sol_update_original_pol', self._logger, check_identifier=False, context=context)
         return True
 
+    def check_fo_tax(self, cr, uid, ids, context=None):
+        """
+        Prevents from validating a FO with taxes when using an Intermission partner
+        """
+        if context is None:
+            context = {}
+        if isinstance(ids, (int, long)):
+            ids = [ids]
+        for fo_line in self.browse(cr, uid, ids, fields_to_fetch=['order_id', 'tax_id'], context=context):
+            if fo_line.tax_id and fo_line.order_id.partner_type == 'intermission':
+                raise osv.except_osv(_('Error'), _("You can't use taxes with an intermission partner."))
 
     def action_validate(self, cr, uid, ids, context=None):
         '''
@@ -486,13 +499,15 @@
         if context is None:
             context = {}
         if isinstance(ids, (int, long)):
-            ids = [ids] 
+            ids = [ids]
+
+        self.check_fo_tax(cr, uid, ids, context=context)
 
         for sol in self.browse(cr, uid, ids, context=context):
             to_write = {}
             if not sol.stock_take_date and sol.order_id.stock_take_date:
                 to_write['stock_take_date'] = sol.order_id.stock_take_date
-            if not sol.order_id.procurement_request: # in case of FO
+            if not sol.order_id.procurement_request:  # in case of FO
                 # check unit price:
                 if not sol.price_unit or sol.price_unit <= 0:
                     raise osv.except_osv(
@@ -522,13 +537,13 @@
         # generate sync message:
         return_info = {}
         for sol in self.browse(cr, uid, ids, context=context):
-            self.pool.get('sync.client.message_rule')._manual_create_sync_message(cr, uid, 'sale.order.line', sol.id, return_info, 
+            self.pool.get('sync.client.message_rule')._manual_create_sync_message(cr, uid, 'sale.order.line', sol.id, return_info,
                                                                                   'purchase.order.line.sol_update_original_pol', self._logger, check_identifier=False, context=context)
 
         return True
 
 
-    def action_draft(self, cr ,uid, ids, context=None):
+    def action_draft(self, cr, uid, ids, context=None):
         '''
         Workflow method called when trying to reset draft the sale.order.line
         '''
@@ -560,7 +575,7 @@
         # generate sync message:
         return_info = {}
         for sol_id in ids:
-            self.pool.get('sync.client.message_rule')._manual_create_sync_message(cr, uid, 'sale.order.line', sol_id, return_info, 
+            self.pool.get('sync.client.message_rule')._manual_create_sync_message(cr, uid, 'sale.order.line', sol_id, return_info,
                                                                                   'purchase.order.line.sol_update_original_pol', self._logger, check_identifier=False, context=context)
 
         return True
@@ -585,11 +600,11 @@
         # generate sync message for original FO line:
         return_info = {}
         for sol_id in ids:
-            self.pool.get('sync.client.message_rule')._manual_create_sync_message(cr, uid, 'sale.order.line', sol_id, return_info, 
+            self.pool.get('sync.client.message_rule')._manual_create_sync_message(cr, uid, 'sale.order.line', sol_id, return_info,
                                                                                   'purchase.order.line.sol_update_original_pol', self._logger, check_identifier=False, context=context)
 
         # generate sync message for resourced line:
-        self.pool.get('sync.client.message_rule')._manual_create_sync_message(cr, uid, 'sale.order.line', resourced_sol, return_info, 
+        self.pool.get('sync.client.message_rule')._manual_create_sync_message(cr, uid, 'sale.order.line', resourced_sol, return_info,
                                                                               'purchase.order.line.sol_update_original_pol', self._logger, check_identifier=False, context=context)
 
         return True

=== modified file 'bin/addons/sync_so/purchase.py'
--- bin/addons/sync_so/purchase.py	2017-12-13 14:46:52 +0000
+++ bin/addons/sync_so/purchase.py	2018-02-12 10:19:50 +0000
@@ -146,6 +146,7 @@
         pol_updated = False
         if not pol_id: # then create new PO line
             kind = 'new line'
+            pol_values['line_number'] = sol_dict['line_number']
             if sol_dict['is_line_split']:
                 sync_linked_sol = int(sol_dict['original_line_id'].get('id').split('/')[-1]) if sol_dict['original_line_id'] else False
                 if not sync_linked_sol:
@@ -161,7 +162,6 @@
                     pol_values['origin'] = orig_pol_info.origin
             if sol_dict['in_name_goods_return'] and not sol_dict['is_line_split']:
                 # in case of FO from missing/replacement claim
-                pol_values['line_number'] = sol_dict['line_number']
                 pol_values['origin'] = self.pool.get('purchase.order').browse(cr, uid, po_ids[0], context=context).origin
                 pol_values['from_synchro_return_goods'] = True
             # case of PO line doesn't exists, so created in FO (COO) and pushed back in PO (PROJ)

=== modified file 'bin/addons/tender_flow/tender_flow.py'
--- bin/addons/tender_flow/tender_flow.py	2017-11-13 08:37:20 +0000
+++ bin/addons/tender_flow/tender_flow.py	2018-02-12 10:19:50 +0000
@@ -40,7 +40,7 @@
     def copy(self, cr, uid, id, default=None, context=None, done_list=[], local=False):
         if not default:
             default = {}
-        default['internal_state'] = 'draft' # UF-733: Reset the internal_state
+        default['internal_state'] = 'draft'  # UF-733: Reset the internal_state
         if not 'sale_order_id' in default:
             default['sale_order_id'] = False
         return super(osv.osv, self).copy(cr, uid, id, default, context=context)
@@ -91,8 +91,8 @@
         res = {}
         for tender in self.browse(cr, uid, ids, context=context):
             retour = False
-            ids_proc = self.pool.get('procurement.order').search(cr,uid,[('tender_id','=',tender.id)])
-            ids_sol = self.pool.get('sale.order.line').search(cr,uid,[('procurement_id','in',ids_proc),('order_id.procurement_request','=',False)])
+            ids_proc = self.pool.get('procurement.order').search(cr, uid, [('tender_id', '=', tender.id)])
+            ids_sol = self.pool.get('sale.order.line').search(cr, uid, [('procurement_id', 'in', ids_proc), ('order_id.procurement_request', '=', False)])
             if ids_sol:
                 retour = True
             res[tender.id] = retour
@@ -100,22 +100,22 @@
 
     _columns = {'name': fields.char('Tender Reference', size=64, required=True, select=True, readonly=True),
                 'sale_order_id': fields.many2one('sale.order', string="Sale Order", readonly=True),
-                'state': fields.selection([('draft', 'Draft'),('comparison', 'Comparison'), ('done', 'Closed'), ('cancel', 'Cancelled'),], string="State", readonly=True),
+                'state': fields.selection([('draft', 'Draft'), ('comparison', 'Comparison'), ('done', 'Closed'), ('cancel', 'Cancelled'), ], string="State", readonly=True),
                 'supplier_ids': fields.many2many('res.partner', 'tender_supplier_rel', 'tender_id', 'supplier_id', string="Suppliers", domain="[('id', '!=', company_id)]",
-                                                 states={'draft':[('readonly',False)]}, readonly=True,
-                                                 context={'search_default_supplier': 1,}),
-                'location_id': fields.many2one('stock.location', 'Location', required=True, states={'draft':[('readonly',False)]}, readonly=True, domain=[('usage', '=', 'internal')]),
-                'company_id': fields.many2one('res.company','Company',required=True, states={'draft':[('readonly',False)]}, readonly=True),
+                                                 states={'draft': [('readonly', False)]}, readonly=True,
+                                                 context={'search_default_supplier': 1, }),
+                'location_id': fields.many2one('stock.location', 'Location', required=True, states={'draft': [('readonly', False)]}, readonly=True, domain=[('usage', '=', 'internal')]),
+                'company_id': fields.many2one('res.company', 'Company', required=True, states={'draft': [('readonly', False)]}, readonly=True),
                 'rfq_ids': fields.one2many('purchase.order', 'tender_id', string="RfQs", readonly=True),
-                'priority': fields.selection(ORDER_PRIORITY, string='Tender Priority', states={'draft':[('readonly',False)],}, readonly=True,),
-                'categ': fields.selection(ORDER_CATEGORY, string='Tender Category', required=True, states={'draft':[('readonly',False)],}, readonly=True),
+                'priority': fields.selection(ORDER_PRIORITY, string='Tender Priority', states={'draft': [('readonly', False)], }, readonly=True,),
+                'categ': fields.selection(ORDER_CATEGORY, string='Tender Category', required=True, states={'draft': [('readonly', False)], }, readonly=True),
                 'creator': fields.many2one('res.users', string="Creator", readonly=True, required=True,),
-                'warehouse_id': fields.many2one('stock.warehouse', string="Warehouse", required=True, states={'draft':[('readonly',False)],}, readonly=True),
-                'creation_date': fields.date(string="Creation Date", readonly=True, states={'draft':[('readonly',False)]}),
-                'details': fields.char(size=30, string="Details", states={'draft':[('readonly',False)],}, readonly=True),
-                'requested_date': fields.date(string="Requested Date", required=True, states={'draft':[('readonly',False)],}, readonly=True),
+                'warehouse_id': fields.many2one('stock.warehouse', string="Warehouse", required=True, states={'draft': [('readonly', False)], }, readonly=True),
+                'creation_date': fields.date(string="Creation Date", readonly=True, states={'draft': [('readonly', False)]}),
+                'details': fields.char(size=30, string="Details", states={'draft': [('readonly', False)], }, readonly=True),
+                'requested_date': fields.date(string="Requested Date", required=True, states={'draft': [('readonly', False)], }, readonly=True),
                 'notes': fields.text('Notes'),
-                'internal_state': fields.selection([('draft', 'Draft'),('updated', 'Rfq Updated'), ], string="Internal State", readonly=True),
+                'internal_state': fields.selection([('draft', 'Draft'), ('updated', 'Rfq Updated'), ], string="Internal State", readonly=True),
                 'rfq_name_list': fields.function(_vals_get, method=True, string='RfQs Ref', type='char', readonly=True, store=False, multi='get_vals',),
                 'product_id': fields.related('tender_line_ids', 'product_id', type='many2one', relation='product.product', string='Product'),
                 'delivery_address': fields.many2one('res.partner.address', string='Delivery address', required=True),
@@ -174,7 +174,7 @@
             if not tender.tender_from_fo:
                 return retour
             for sup in tender.supplier_ids:
-                if sup.partner_type == 'internal' :
+                if sup.partner_type == 'internal':
                     retour = False
         return retour
 
@@ -280,7 +280,7 @@
         '''
         on_change function for the warehouse
         '''
-        result = {'value':{},}
+        result = {'value': {}, }
         if warehouse_id:
             input_loc_id = self.pool.get('stock.warehouse').browse(cr, uid, warehouse_id, context=context).lot_input_id.id
             result['value'].update(location_id=input_loc_id)
@@ -303,7 +303,7 @@
             # check some supplier have been selected
             if not tender.supplier_ids:
                 raise osv.except_osv(_('Warning !'), _('You must select at least one supplier!'))
-            #utp-315: check that the suppliers are not inactive (I use a SQL request because the inactive partner are ignored with the browse)
+            # utp-315: check that the suppliers are not inactive (I use a SQL request because the inactive partner are ignored with the browse)
             sql = """
             select tsr.supplier_id, rp.name, rp.active
             from tender_supplier_rel tsr
@@ -325,7 +325,7 @@
                 # create a purchase order for each supplier
                 address_id = partner_obj.address_get(cr, uid, [supplier.id], ['default'])['default']
                 if not address_id:
-                    raise osv.except_osv(_('Warning !'), _('The supplier "%s" has no address defined!')%(supplier.name,))
+                    raise osv.except_osv(_('Warning !'), _('The supplier "%s" has no address defined!') % (supplier.name,))
                 pricelist_id = supplier.property_product_pricelist_purchase.id
                 values = {'origin': tender.sale_order_id and tender.sale_order_id.name + ';' + tender.name or tender.name,
                           'rfq_ok': True,
@@ -353,14 +353,14 @@
                     if line.qty <= 0.00:
                         raise osv.except_osv(_('Error !'), _('You cannot generate RfQs for an line with a null quantity.'))
 
-                    if line.product_id.id == obj_data.get_object_reference(cr, uid,'msf_doc_import', 'product_tbd')[1]:
+                    if line.product_id.id == obj_data.get_object_reference(cr, uid, 'msf_doc_import', 'product_tbd')[1]:
                         raise osv.except_osv(_('Warning !'), _('You can\'t have "To Be Defined" for the product. Please select an existing product.'))
                     newdate = datetime.strptime(line.date_planned, '%Y-%m-%d')
                     values = {'name': line.product_id.partner_ref,
                               'product_qty': line.qty,
                               'product_id': line.product_id.id,
                               'product_uom': line.product_uom.id,
-                              'price_unit': 0.0, # was price variable - uf-607
+                              'price_unit': 0.0,  # was price variable - uf-607
                               'date_planned': newdate.strftime('%Y-%m-%d'),
                               'notes': line.product_id.description_purchase,
                               'order_id': po_id,
@@ -369,7 +369,7 @@
                               }
                     # create purchase order line
                     pol_obj.create(cr, uid, values, context=context)
-                    message = "Request for Quotation '%s' has been created."%po_obj.browse(cr, uid, po_id, context=context).name
+                    message = "Request for Quotation '%s' has been created." % po_obj.browse(cr, uid, po_id, context=context).name
                     # create the log message
                     self.pool.get('res.log').create(cr, uid,
                                                     {'name': message,
@@ -385,7 +385,7 @@
                     tender.name,
                 ))
 
-        self.write(cr, uid, ids, {'state':'comparison'}, context=context)
+        self.write(cr, uid, ids, {'state': 'comparison'}, context=context)
         return True
 
 
@@ -395,7 +395,7 @@
         '''
         if context is None:
             context = {}
-        if isinstance(ids, (int,long)):
+        if isinstance(ids, (int, long)):
             ids = [ids]
 
         self.create_po(cr, uid, ids, context=context)
@@ -420,12 +420,12 @@
             # close linked RfQ:
             rfq_list = []
             for rfq in tender.rfq_ids:
-                if rfq.rfq_state not in ('updated', 'cancel'): 
+                if rfq.rfq_state not in ('updated', 'cancel'):
                     rfq_list.append(rfq.id)
                 else:
                     self.pool.get('purchase.order').write(cr, uid, [rfq.id], {'rfq_state': 'done'}, context=context)
 
-            self.write(cr, uid, [tender.id], {'state':'done'}, context=context)
+            self.write(cr, uid, [tender.id], {'state': 'done'}, context=context)
             self.infolog(cr, uid, "The tender id:%s (%s) has been closed" % (
                 tender.id,
                 tender.name,
@@ -444,12 +444,12 @@
             raise osv.except_osv(_('Error !'), _("Some RfQ are already Closed. Integrity failure."))
         # all rfqs must have been treated
         rfq_ids = po_obj.search(cr, uid, [('tender_id', '=', tender.id),
-                                          ('rfq_state', 'in', ('draft', 'sent',)),], context=context)
+                                          ('rfq_state', 'in', ('draft', 'sent',)), ], context=context)
         if rfq_ids:
             raise osv.except_osv(_('Warning !'), _("Generated RfQs must be Updated or Cancelled."))
         # at least one rfq must be updated and not canceled
         rfq_ids = po_obj.search(cr, uid, [('tender_id', '=', tender.id),
-                                          ('rfq_state', 'in', ('updated',)),], context=context)
+                                          ('rfq_state', 'in', ('updated',)), ], context=context)
         if not rfq_ids:
             raise osv.except_osv(_('Warning !'), _("At least one RfQ must be in state Updated."))
 
@@ -469,7 +469,7 @@
             suppliers = {}
             for line in tender.tender_line_ids:
                 if line.product_id and line.supplier_id and line.line_state != 'cancel':
-                    suppliers.update({line.product_id.id:line.supplier_id.id,})
+                    suppliers.update({line.product_id.id: line.supplier_id.id, })
             # rfq corresponding to this tender with done state (has been updated and not canceled)
             # the list of rfq which will be compared
             c = dict(context, active_ids=rfq_ids, tender_id=tender.id, end_wizard=False, suppliers=suppliers,)
@@ -503,7 +503,7 @@
                     # find the corresponding suppinfo with sequence -99
                     info_99_list = info_obj.search(cr, uid, [('product_id', '=', product.product_tmpl_id.id),
                                                              ('name', '=', line.purchase_order_line_id.order_id.partner_id.id),
-                                                             ('sequence', '=', -99),], context=context)
+                                                             ('sequence', '=', -99), ], context=context)
 
                     if info_99_list:
                         # we drop it
@@ -513,12 +513,12 @@
                     values = {'name': line.supplier_id.id,
                               'product_name': False,
                               'product_code': False,
-                              'sequence' : -99,
+                              'sequence': -99,
                               #'product_uom': line.product_uom.id,
                               #'min_qty': 0.0,
                               #'qty': function
-                              'product_id' : product.product_tmpl_id.id,
-                              'delay' : int(line.supplier_id.default_delay),
+                              'product_id': product.product_tmpl_id.id,
+                              'delay': int(line.supplier_id.default_delay),
                               #'pricelist_ids': created just after
                               #'company_id': default value
                               }
@@ -574,10 +574,13 @@
                     self.pool.get('purchase.order').log(cr, uid, po_to_use, 'The Purchase Order %s for supplier %s has been created.' % (po.name, po.partner_id.name))
                     self.pool.get('purchase.order').infolog(cr, uid, 'The Purchase order %s for supplier %s has been created.' % (po.name, po.partner_id.name))
 
+                anal_dist_to_copy = tender_line.sale_order_line_id and tender_line.sale_order_line_id.analytic_distribution_id.id or False
+
                 # attach new PO line:
                 pol_values = {
                     'order_id': po_to_use,
                     'linked_sol_id': tender_line.sale_order_line_id.id or False,
+                    'origin': tender_line.sale_order_line_id and tender_line.sale_order_line_id.order_id.name or False,
                     'name': tender_line.product_id.partner_ref,
                     'product_qty': tender_line.qty,
                     'product_id': tender_line.product_id.id,
@@ -589,6 +592,8 @@
                     'notes': tender_line.product_id.description_purchase,
                     'comment': tender_line.comment,
                 }
+                if anal_dist_to_copy:
+                    pol_values['analytic_distribution_id'] = self.pool.get('analytic.distribution').copy(cr, uid, anal_dist_to_copy, {}, context=context)
                 self.pool.get('purchase.order.line').create(cr, uid, pol_values, context=context)
 
             # when the po is generated, the tender is done - no more modification or comparison
@@ -769,9 +774,9 @@
     '''
     _name = 'tender.line'
     _rec_name = 'product_id'
-    _description= 'Tender Line'
+    _description = 'Tender Line'
 
-    _SELECTION_TENDER_STATE = [('draft', 'Draft'),('comparison', 'Comparison'), ('done', 'Closed'),]
+    _SELECTION_TENDER_STATE = [('draft', 'Draft'), ('comparison', 'Comparison'), ('done', 'Closed'), ]
 
     def on_product_change(self, cr, uid, id, product_id, uom_id, product_qty, categ, context=None):
         '''
@@ -793,7 +798,7 @@
             result['value']['text_error'] = False
             result['value']['to_correct_ok'] = False
 
-        res_qty = self.onchange_uom_qty(cr, uid, id, uom_id or result.get('value', {}).get('product_uom',False), product_qty)
+        res_qty = self.onchange_uom_qty(cr, uid, id, uom_id or result.get('value', {}).get('product_uom', False), product_qty)
         result['value']['qty'] = res_qty.get('value', {}).get('qty', product_qty)
 
         if uom_id:
@@ -841,9 +846,9 @@
             else:
                 result[line.id]['currency_id'] = result[line.id]['func_currency_id']
 
-            result[line.id]['func_total_price'] = self.pool.get('res.currency').compute(cr, uid, result[line.id]['currency_id'],  
-                                                                                        result[line.id]['func_currency_id'], 
-                                                                                        result[line.id]['total_price'], 
+            result[line.id]['func_total_price'] = self.pool.get('res.currency').compute(cr, uid, result[line.id]['currency_id'],
+                                                                                        result[line.id]['func_currency_id'],
+                                                                                        result[line.id]['total_price'],
                                                                                         round=True, context=context)
 
         return result
@@ -865,7 +870,7 @@
                 'date_planned': fields.related('tender_id', 'requested_date', type='date', string='Requested Date', store=False,),
                 # functions
                 'supplier_id': fields.related('purchase_order_line_id', 'order_id', 'partner_id', type='many2one', relation='res.partner', string="Supplier", readonly=True),
-                'price_unit': fields.related('purchase_order_line_id', 'price_unit', type="float", string="Price unit", digits_compute=dp.get_precision('Purchase Price Computation'), readonly=True), # same precision as related field!
+                'price_unit': fields.related('purchase_order_line_id', 'price_unit', type="float", string="Price unit", digits_compute=dp.get_precision('Purchase Price Computation'), readonly=True),  # same precision as related field!
                 'delivery_confirmed_date': fields.related('purchase_order_line_id', 'confirmed_delivery_date', type="date", string="Delivery Confirmed Date", readonly=True),
                 'total_price': fields.function(_get_total_price, method=True, type='float', string="Total Price", digits_compute=dp.get_precision('Purchase Price'), multi='total'),
                 'currency_id': fields.function(_get_total_price, method=True, type='many2one', relation='res.currency', string='Cur.', multi='total'),
@@ -874,7 +879,7 @@
                 'purchase_order_id': fields.related('purchase_order_line_id', 'order_id', type='many2one', relation='purchase.order', string="Related RfQ", readonly=True,),
                 'purchase_order_line_number': fields.related('purchase_order_line_id', 'line_number', type="char", string="Related Line Number", readonly=True,),
                 'state': fields.related('tender_id', 'state', type="selection", selection=_SELECTION_TENDER_STATE, string="State",),
-                'line_state': fields.selection([('draft','Draft'), ('cancel', 'Canceled'), ('done', 'Done')], string='State', readonly=True),
+                'line_state': fields.selection([('draft', 'Draft'), ('cancel', 'Canceled'), ('done', 'Done')], string='State', readonly=True),
                 'comment': fields.char(size=128, string='Comment'),
                 'has_to_be_resourced': fields.boolean(string='Has to be resourced'),
                 'created_by_rfq': fields.boolean(string='Created by RfQ'),
@@ -940,7 +945,7 @@
 
         return super(tender_line, self).copy(cr, uid, id, default, context=context)
 
-    def cancel_sourcing(self,cr, uid, ids, context=None):
+    def cancel_sourcing(self, cr, uid, ids, context=None):
         '''
         Cancel the line and re-source the FO line
         '''
@@ -997,11 +1002,11 @@
             del context['update_or_cancel_line_not_delete']
 
         # Update the FO state
-        #for so in so_to_update:
+        # for so in so_to_update:
         #    wf_service.trg_write(uid, 'sale.order', so, cr)
 
         # UF-733: if all tender lines have been compared (have PO Line id), then set the tender to be ready
-        # for proceeding to other actions (create PO, Done etc) 
+        # for proceeding to other actions (create PO, Done etc)
         for tender in tender_obj.browse(cr, uid, list(tender_to_update), context=context):
             if tender.internal_state == 'draft':
                 flag = True
@@ -1149,7 +1154,7 @@
         '''
         if context is None:
             context = {}
-        if isinstance(ids, (int,long)):
+        if isinstance(ids, (int, long)):
             ids = [ids]
 
         for tender_line in self.browse(cr, uid, ids, context=context):
@@ -1164,7 +1169,7 @@
                 'origin': (tender.sale_order_id and tender.sale_order_id.name or "") + '; ' + tender.name,
                 'partner_id': tender_line.supplier_id.id,
                 'partner_address_id': self.pool.get('res.partner').address_get(cr, uid, [tender_line.supplier_id.id], ['default'])['default'],
-                'customer_id': tender_line.sale_order_line_id and tender_line.sale_order_line_id.order_id.partner_id.id or False,    
+                'customer_id': tender_line.sale_order_line_id and tender_line.sale_order_line_id.order_id.partner_id.id or False,
                 'location_id': tender.location_id.id,
                 'company_id': tender.company_id.id,
                 'cross_docking_ok': True if tender_line.sale_order_line_id else False,
@@ -1189,7 +1194,7 @@
     tender class
     '''
     _inherit = 'tender'
-    _columns = {'tender_line_ids': fields.one2many('tender.line', 'tender_id', string="Tender lines", states={'draft':[('readonly',False)]}, readonly=True),
+    _columns = {'tender_line_ids': fields.one2many('tender.line', 'tender_id', string="Tender lines", states={'draft': [('readonly', False)]}, readonly=True),
                 }
 
     def copy(self, cr, uid, id, default=None, context=None):
@@ -1252,16 +1257,16 @@
                 'rfq_id': fields.many2one('purchase.order', string='RfQ', readonly=True),
                 'rfq_line_id': fields.many2one('purchase.order.line', string='RfQ line', readonly=True),
                 'is_rfq_done': fields.boolean(string="RfQ Closed"),
-                'state': fields.selection([('draft','Draft'),
-                                           ('confirmed','Confirmed'),
-                                           ('exception','Exception'),
-                                           ('running','Converted'),
-                                           ('cancel','Cancelled'),
-                                           ('ready','Ready'),
-                                           ('done','Closed'),
+                'state': fields.selection([('draft', 'Draft'),
+                                           ('confirmed', 'Confirmed'),
+                                           ('exception', 'Exception'),
+                                           ('running', 'Converted'),
+                                           ('cancel', 'Cancelled'),
+                                           ('ready', 'Ready'),
+                                           ('done', 'Closed'),
                                            ('tender', 'Tender'),
                                            ('rfq', 'Request for Quotation'),
-                                           ('waiting','Waiting'),], 'State', required=True,
+                                           ('waiting', 'Waiting'), ], 'State', required=True,
                                           help='When a procurement is created the state is set to \'Draft\'.\n If the procurement is confirmed, the state is set to \'Confirmed\'.\
                                                 \nAfter confirming the state is set to \'Running\'.\n If any exception arises in the order then the state is set to \'Exception\'.\n Once the exception is removed the state becomes \'Ready\'.\n It is in \'Waiting\'. state when the procurement is waiting for another one to finish.'),
                 'price_unit': fields.float('Unit Price from Tender', digits_compute=dp.get_precision('Purchase Price Computation')),
@@ -1279,7 +1284,7 @@
             if proc.supplier and not proc.supplier.address:
                 self.write(cr, uid, [proc.id], {
                     'state': 'exception',
-                    'message': _('The supplier "%s" has no address defined!')%(proc.supplier.name,),
+                    'message': _('The supplier "%s" has no address defined!') % (proc.supplier.name,),
                 }, context=context)
 
         return True
@@ -1308,8 +1313,8 @@
                 break
             # find the rfq
             rfq_id = False
-            # UTP-934: If source rfq to different supplier, different rfq must be created, and cannot be using the same rfq 
-            rfq_ids = rfq_obj.search(cr, uid, [('sale_order_id', '=', sale_order.id),('partner_id', '=', proc.supplier.id), ('state', '=', 'draft'), ('rfq_ok', '=', True),], context=context)
+            # UTP-934: If source rfq to different supplier, different rfq must be created, and cannot be using the same rfq
+            rfq_ids = rfq_obj.search(cr, uid, [('sale_order_id', '=', sale_order.id), ('partner_id', '=', proc.supplier.id), ('state', '=', 'draft'), ('rfq_ok', '=', True), ], context=context)
             if rfq_ids:
                 rfq_id = rfq_ids[0]
             # create if not found
@@ -1320,7 +1325,7 @@
                 address_id = partner_obj.address_get(cr, uid, [supplier.id], ['default'])['default']
                 if not address_id:
                     self.write(cr, uid, [proc.id], {
-                        'message': _('The supplier "%s" has no address defined!')%(supplier.name,),
+                        'message': _('The supplier "%s" has no address defined!') % (supplier.name,),
                     }, context=context)
                     continue
 
@@ -1338,7 +1343,7 @@
                                                   'rfq_ok': True,
                                                   'from_procurement': True,
                                                   'order_type': sale_order.order_type,
-                                                  'origin': sale_order.name,}, context=context)
+                                                  'origin': sale_order.name, }, context=context)
 
             prsd_obj.chk_create(cr, uid, {
                 'order_id': sale_order.id,
@@ -1366,7 +1371,7 @@
             self.write(cr, uid, ids, {'rfq_id': rfq_id, 'rfq_line_id': rfq_line_id}, context=context)
 
             # log message concerning RfQ creation
-            rfq_obj.log(cr, uid, rfq_id, "The Request for Quotation '%s' has been created and must be completed before purchase order creation."%rfq_obj.browse(cr, uid, rfq_id, context=context).name, context={'rfq_ok': 1})
+            rfq_obj.log(cr, uid, rfq_id, "The Request for Quotation '%s' has been created and must be completed before purchase order creation." % rfq_obj.browse(cr, uid, rfq_id, context=context).name, context={'rfq_ok': 1})
             rfq_line = rfq_line_obj.browse(cr, uid, rfq_line_id, context=context)
             self.infolog(cr, uid, "The FO/IR line id:%s (line number: %s) has been sourced on order to RfQ line id:%s (line number: %s) of the RfQ id:%s (%s)" % (
                 sale_order_line.id,
@@ -1399,7 +1404,7 @@
                 sale_order_line = sol
             # find the tender
             tender_id = False
-            tender_ids = tender_obj.search(cr, uid, [('sale_order_id', '=', sale_order.id),('state', '=', 'draft'),], context=context)
+            tender_ids = tender_obj.search(cr, uid, [('sale_order_id', '=', sale_order.id), ('state', '=', 'draft'), ], context=context)
             if tender_ids:
                 tender_id = tender_ids[0]
             # create if not found
@@ -1433,7 +1438,7 @@
 
             # log message concerning tender creation
             tender_line = tender_line_obj.browse(cr, uid, tender_line_id, context=context)
-            tender_obj.log(cr, uid, tender_id, "The tender '%s' has been created and must be completed before purchase order creation."%tender_line.tender_id.name)
+            tender_obj.log(cr, uid, tender_id, "The tender '%s' has been created and must be completed before purchase order creation." % tender_line.tender_id.name)
             self.infolog(cr, uid, "The FO/IR line id:%s (%s) has been sourced on order to tender line id:%s of the tender id:%s (%s)" % (
                 sale_order_line.id,
                 sale_order_line.line_number,
@@ -1450,14 +1455,14 @@
         '''
         set is_tender_done value
         '''
-        self.write(cr, uid, ids, {'is_tender_done': True, 'state': 'exception',}, context=context)
+        self.write(cr, uid, ids, {'is_tender_done': True, 'state': 'exception', }, context=context)
         return True
 
     def wkf_action_rfq_done(self, cr, uid, ids, context=None):
         '''
         set is_rfq_done value
         '''
-        self.write(cr, uid, ids, {'is_rfq_done': True, 'state': 'exception',}, context=context)
+        self.write(cr, uid, ids, {'is_rfq_done': True, 'state': 'exception', }, context=context)
         return True
 
     def _get_pricelist_from_currency(self, cr, uid, currency_id, context=None):
@@ -1488,7 +1493,7 @@
             # do not display a log if we come from po update backward update of so
             data = self.read(cr, uid, ids, ['so_back_update_dest_po_id_procurement_order'], context=context)
             if not data[0]['so_back_update_dest_po_id_procurement_order']:
-                po_obj.log(cr, uid, result, "The Purchase Order '%s' has been created following 'on order' sourcing."%po_obj.browse(cr, uid, result, context=context).name)
+                po_obj.log(cr, uid, result, "The Purchase Order '%s' has been created following 'on order' sourcing." % po_obj.browse(cr, uid, result, context=context).name)
         return result
 
     def po_values_hook(self, cr, uid, ids, context=None, *args, **kwargs):
@@ -1570,7 +1575,7 @@
     _constraints = [
         (_check_valid_till,
             'You must specify a Valid Till date.',
-            ['valid_till']),]
+            ['valid_till']), ]
 
     def default_get(self, cr, uid, fields, context=None):
         '''
@@ -1612,7 +1617,7 @@
         '''
         if context is None:
             context = {}
-        if isinstance(ids, (int,long)):
+        if isinstance(ids, (int, long)):
             ids = [ids]
         wf_service = netsvc.LocalService("workflow")
 
@@ -1640,10 +1645,10 @@
         purchase_orders = self.read(cr, uid, ids, ['state'], context=context)
         unlink_ids = []
         for s in purchase_orders:
-            if s['state'] in ['draft','cancel']:
+            if s['state'] in ['draft', 'cancel']:
                 unlink_ids.append(s['id'])
             else:
-                raise osv.except_osv(_('Invalid action !'), _('Cannot delete Purchase Order(s) which are in %s State!')  % _(dict(PURCHASE_ORDER_STATE_SELECTION).get(s['state'])))
+                raise osv.except_osv(_('Invalid action !'), _('Cannot delete Purchase Order(s) which are in %s State!') % _(dict(PURCHASE_ORDER_STATE_SELECTION).get(s['state'])))
 
         return super(purchase_order, self).unlink(cr, uid, ids, context=context)
 
@@ -1675,18 +1680,18 @@
         This hook belongs to the rfq_sent method from tender_flow>tender_flow.py
         - check lines after import
         '''
-        pol_obj = self.pool.get('purchase.order.line')                          
+        pol_obj = self.pool.get('purchase.order.line')
 
-        res = True                                                              
-        empty_lines = pol_obj.search(cr, uid, [                                 
-            ('order_id', 'in', ids),                                            
-            ('product_qty', '<=', 0.00),                                        
-        ], context=context)                                                     
-        if empty_lines:                                                         
-            raise osv.except_osv(                                               
-                _('Error'),                                                     
+        res = True
+        empty_lines = pol_obj.search(cr, uid, [
+            ('order_id', 'in', ids),
+            ('product_qty', '<=', 0.00),
+        ], context=context)
+        if empty_lines:
+            raise osv.except_osv(
+                _('Error'),
                 _('All lines of the RfQ should have a quantity before sending the RfQ to the supplier'),
-            ) 
+            )
         return res
 
     def action_sent(self, cr, uid, ids, context=None):
@@ -1695,7 +1700,7 @@
         '''
         if context is None:
             context = {}
-        if isinstance(ids, (int,long)):
+        if isinstance(ids, (int, long)):
             ids = [ids]
 
         self.write(cr, uid, ids, {
@@ -2123,7 +2128,7 @@
 
         po_accepted_values = {'client_action_multi': ['Order Follow Up',
                                                       'action_view_purchase_order_group'],
-                              'client_print_multi': ['Purchase Order (Merged)', 
+                              'client_print_multi': ['Purchase Order (Merged)',
                                                      'Purchase Order',
                                                      'Allocation report',
                                                      'Order impact vs. Budget'],
@@ -2146,14 +2151,14 @@
                         or v[1] == 'Purchase Order' \
                         or v[1] == 'Purchase Order (Merged)' \
                         or v[1] == 'Allocation report' \
-                        or v[1] == 'Order impact vs. Budget' :
+                        or v[1] == 'Order impact vs. Budget':
                     new_values.append(v)
         elif context.get('request_for_quotation', False) and 'purchase.order' in [x[0] for x in models]:
             new_values = []
             for v in values:
                 if key == 'action' and v[1] in rfq_accepted_values[key2] \
                         or v[1] == 'Request for Quotation' \
-                        or v[1] == 'Request For Quotation Excel Export' :
+                        or v[1] == 'Request For Quotation Excel Export':
                     new_values.append(v)
 
         return new_values

=== modified file 'bin/release.py'
--- bin/release.py	2018-01-30 16:12:16 +0000
+++ bin/release.py	2018-02-12 10:19:50 +0000
@@ -20,7 +20,7 @@
 ##############################################################################
 
 name = 'openerp-server'
-version = 'UF7.1'
+version = 'UF8.0dev'
 major_version = '7.0'
 description = 'OpenERP Server'
 long_desc = '''OpenERP is a complete ERP and CRM. The main features are accounting (analytic

=== modified file 'bin/sql_db.py'
--- bin/sql_db.py	2017-10-19 14:14:14 +0000
+++ bin/sql_db.py	2018-02-12 10:19:50 +0000
@@ -390,6 +390,9 @@
         try:
             result = psycopg2.connect(dsn=dsn, connection_factory=PsycoConnection)
         except psycopg2.Error:
+            log = logging.getLogger()
+            if len(log.handlers) > 1:
+                log.removeHandler(log.handlers[1])
             self.__logger.exception('Connection to the database failed')
             raise
         self._connections.append((result, True, time.time()))