Merge lp:~unifield-team/unifield-server/us-1960 into lp:unifield-server/uf3

[jftempo]

Unmerged revisions

4127. By Quentin THEURET @Amaris on 2016-12-20

US-1960 [FIX] Do not raise an error if the product is already inactive when a sync. update deactivate the product

4126. By jftempo on 2016-12-15

Version 4.0dev

4125. By jftempo on 2016-12-15

US-2047 [FIX] Attachment config: French translation missing

lp:~fabien-morin/unifield-server/fm-us-2047

4124. By jftempo on 2016-12-15

US-1822 [FIX] Unreconciliation: allow to unreconcile manually reconciled system JIs

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

4123. By jftempo on 2016-12-15

US-1900 [FIX] View translation when a node have multiplte attributes + export/translate help msg

lp:~fabien-morin/unifield-server/fm-fix-orm-translation

4122. By jftempo on 2016-12-15

US-1571 [IMP] Delivery Orders: new "Draft" search button

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

4121. By jftempo on 2016-12-15

US-1694 [FIX] Comparison RFQ report: fix currency

lp:~unifield-team/unifield-server/us-1694

4120. By jftempo on 2016-12-15

US-1804 [FIX] Typo + translation

4119. By jftempo on 2016-12-15

US-1743 [FIX] Export xls PO simulation: fix xls corruption when RTS is not set

lp:~unifield-team/unifield-server/us-1743

4118. By jftempo on 2016-12-15

US-1773 [IMP] Reconciliation must include at least one debit and one credit

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

=== modified file 'bin/addons/account_override/account_move_line.py'
--- bin/addons/account_override/account_move_line.py	2016-11-24 15:02:51 +0000
+++ bin/addons/account_override/account_move_line.py	2017-01-16 10:24:56 +0000
@@ -484,7 +484,13 @@
             context = {}
         if context.get('from_web_menu', False):
             for ml in self.browse(cr, uid, ids):
-                if ml.move_id and ml.move_id.status == 'sys':
+                # US-1822 When unreconciling entries, to check if the write can be done use the reconciliation status
+                # (manual / auto) instead of the JI one
+                if 'unreconcile_date' in vals and vals['unreconcile_date']:
+                    reconciliation = ml.reconcile_id or ml.reconcile_partial_id or False
+                    if reconciliation and reconciliation.type == 'auto':
+                        raise osv.except_osv(_('Warning'), _('Only manually reconciled entries can be unreconciled.'))
+                elif ml.move_id and ml.move_id.status == 'sys':
                     raise osv.except_osv(_('Warning'), _('You cannot change Journal Items that comes from the system!'))
             # Check date validity with period
             self._check_date_validity(cr, uid, ids, vals)

=== modified file 'bin/addons/account_override/finance_export.py'
--- bin/addons/account_override/finance_export.py	2016-01-20 10:18:19 +0000
+++ bin/addons/account_override/finance_export.py	2017-01-16 10:24:56 +0000
@@ -56,9 +56,13 @@
      + Do not repeat headers if you use the same filename for more than 1 request. This avoid having multiple lines as headers.
     """
 
-    def __init__(self, sql, process):
+    def __init__(self, sql, process, context):
         self.sqlrequests = sql
         self.processrequests = process
+        if 'background_id' in context:
+            self.bg_id = context['background_id']
+        else:
+            self.bg_id = None
 
     def line_to_utf8(self, line):
         """
@@ -183,6 +187,14 @@
         # - filename
         # - key of sqlrequests dict to fetch its SQL request
         files = {}
+
+        if self.bg_id:
+            bg_report_obj = pool.get('memory.background.report')
+        else:
+            bg_report_obj = None
+
+        request_count = 0
+
         for fileparams in self.processrequests:
             if not fileparams.get('filename', False):
                 raise osv.except_osv(_('Error'), _('Filename param is missing!'))
@@ -256,6 +268,13 @@
             if filename not in files:
                 files[filename] = tmp_file
 
+            if bg_report_obj:
+                request_count += 1
+                percent = request_count / float(len(self.processrequests) + 1)  # add 1
+                # to the total because task is not finish at the end of the for
+                # loop, there is some ZIP work to do
+                bg_report_obj.update_percent(cr, uid, [self.bg_id], percent)
+
         # WRITE RESULT INTO AN ARCHIVE
         # Create a ZIP file
         out_zipfile = zipfile.ZipFile(zip_buffer, "w")

=== modified file 'bin/addons/account_reconciliation/wizard/account_reconcile.py'
--- bin/addons/account_reconciliation/wizard/account_reconcile.py	2016-10-04 10:11:04 +0000
+++ bin/addons/account_reconciliation/wizard/account_reconcile.py	2017-01-16 10:24:56 +0000
@@ -24,7 +24,6 @@
 from osv import osv
 from osv import fields
 from tools.translate import _
-import time
 from collections import defaultdict
 
 class account_move_line_reconcile(osv.osv_memory):
@@ -33,8 +32,8 @@
 
     _columns = {
         'state': fields.selection([('total', 'Full Reconciliation'), ('partial', 'Partial Reconciliation'), 
-            ('total_change', 'Full Reconciliation with change'), ('partial_change', 'Partial Reconciliation with change')], string="State", 
-            required=True, readonly=True),
+                                   ('total_change', 'Full Reconciliation with change'), ('partial_change', 'Partial Reconciliation with change')], string="State", 
+                                  required=True, readonly=True),
         'different_currencies': fields.boolean('Is this reconciliation in different currencies? (2 at most)'),
     }
 
@@ -145,7 +144,13 @@
             state = 'total_change'
         currency_id = False
         currency2_id = False
+        rec_partial_set = set()
+        rec_partial_leg_nb = 0
         for line in account_move_line_obj.browse(cr, uid, context['active_ids'], context=context):
+            # for partially reconciled lines: store the different partial reconciliation ids and the total nb of legs
+            if line.reconcile_partial_id:
+                rec_partial_leg_nb += 1
+                rec_partial_set.add(line.reconcile_partial_id.id)
             # prepare some values
             account_id = line.account_id.id
             # some verifications
@@ -166,9 +171,9 @@
             # UTP-1040: 3RD party is also desactivated in case of account that is "Disregard Third Party" as "type_for_register"
             if not transfer and not disregard_third_party:
                 third_party = {
-                        'partner_id': line.partner_id and line.partner_id.id or False, 
-                        'employee_id': line.employee_id and line.employee_id.id or False, 
-                        'transfer_journal_id': line.transfer_journal_id and line.transfer_journal_id.id or False}
+                    'partner_id': line.partner_id and line.partner_id.id or False, 
+                    'employee_id': line.employee_id and line.employee_id.id or False, 
+                    'transfer_journal_id': line.transfer_journal_id and line.transfer_journal_id.id or False}
                 if not prev_third_party:
                     prev_third_party = third_party
                 if prev_third_party != third_party:
@@ -186,8 +191,27 @@
                 debit += line.debit_currency
                 fcredit += line.credit
                 fdebit += line.debit
+
+        diff_in_booking = abs(debit - credit)
+        # (US-1847) If we reconcile together entries from at least 2 different partial reconciliations:
+        # - the reconciliation must be total
+        # - all the legs of the partial reconciliations must be included
+        if len(rec_partial_set) > 1:
+            if diff_in_booking > 10**-3:
+                raise osv.except_osv(_('Error'), _('Only full reconciliation is allowed when entries from two (or more)'
+                                                   ' different partial reconciliations are included.'))
+            elif rec_partial_leg_nb != account_move_line_obj.search(cr, uid,
+                                                                    [('reconcile_partial_id', 'in', list(rec_partial_set))],
+                                                                    count=True, order='NO_ORDER', context=context):
+                raise osv.except_osv(_('Error'),
+                                     _('When entries from different partial reconciliations are reconciled together, '
+                                       'all the legs of these partial reconciliations must be included.'))
+
+        if debit <= 10**-3 or credit <= 10**-3:
+            raise osv.except_osv(_('Error'), _('Both Debit and Credit lines are required for reconciliation.'))
+
         # Adapt state value
-        if abs(debit - credit) <= 10**-3:
+        if diff_in_booking <= 10**-3:
             state = 'total'
         if transfer_with_change:
             debit = fdebit

=== modified file 'bin/addons/base/ir/ir_attachment.py'
--- bin/addons/base/ir/ir_attachment.py	2016-11-24 14:41:24 +0000
+++ bin/addons/base/ir/ir_attachment.py	2017-01-16 10:24:56 +0000
@@ -442,12 +442,12 @@
 
     _columns = {
         'name': fields.char('Path to save the attachments to', size=256,
-                            help="The complet path to the local folder where Unifield will save attachment files.",
+                            help="The complete path to the local folder where Unifield will save attachment files.",
                             required=True),
         'next_migration' : fields.datetime('Next migration date',
-                                           help="Next planned execution of thei migration to move the old attachment to the path you defined"),
+                                           help="Next planned execution of the migration to move the old attachment to the path defined"),
         'migration_date': fields.datetime('Last migration execution date', readonly=True),
-        'migration_error': fields.text('Migration error', readonly=True),
+        'migration_error': fields.text('Migration errors', readonly=True),
         'is_migration_running': fields.function(_is_migration_running,
                                                 type='boolean', string='Moving files...', method=True,
                                                 readonly=True),
@@ -614,7 +614,7 @@
                 'numbercall': 1,
                 'active': True,
             }
-            cron_obj.write(cr, uid, default_migrate_attachment.id, values, context=context) 
+            cron_obj.write(cr, uid, default_migrate_attachment.id, values, context=context)
         return super(attachment_config, self).write(cr, uid, ids, vals, context=context)
 
 attachment_config()

=== modified file 'bin/addons/msf_doc_import/report/po_simulation_screen_xls_report.mako'
--- bin/addons/msf_doc_import/report/po_simulation_screen_xls_report.mako	2016-06-13 07:41:13 +0000
+++ bin/addons/msf_doc_import/report/po_simulation_screen_xls_report.mako	2017-01-16 10:24:56 +0000
@@ -139,7 +139,7 @@
         % else:
         <Cell ss:StyleID="line" ></Cell>
         % endif
-        % if o.imp_ready_to_ship_date != o.in_ready_to_ship_date:
+        % if o.imp_ready_to_ship_date not in ('False', False) and o.imp_ready_to_ship_date != o.in_ready_to_ship_date:
         <Cell ss:StyleID="line_change_short_date" ss:MergeAcross="1" ><Data ss:Type="DateTime">${(o.imp_ready_to_ship_date)|n}T00:00:00.000</Data></Cell>
         % elif o.imp_ready_to_ship_date not in ('False', False):
         <Cell ss:StyleID="short_date" ss:MergeAcross="1" ><Data ss:Type="DateTime">${(o.imp_ready_to_ship_date)|n}T00:00:00.000</Data></Cell>
@@ -155,7 +155,7 @@
         % else:
         <Cell ss:StyleID="line" ></Cell>
         % endif
-        % if o.imp_shipment_date != o.in_shipment_date:
+        % if o.imp_shipment_date not in ('False', False) and o.imp_shipment_date != o.in_shipment_date:
         <Cell ss:StyleID="line_change_short_date" ss:MergeAcross="1" ><Data ss:Type="DateTime">${(o.imp_shipment_date)|n}T00:00:00.000</Data></Cell>
         % elif o.imp_shipment_date not in ('False', False):
         <Cell ss:StyleID="short_date" ss:MergeAcross="1" ><Data ss:Type="DateTime">${(o.imp_shipment_date)|n}T00:00:00.000</Data></Cell>

=== modified file 'bin/addons/msf_outgoing/wizard/incoming_shipment_processor.py'
--- bin/addons/msf_outgoing/wizard/incoming_shipment_processor.py	2016-11-09 09:07:38 +0000
+++ bin/addons/msf_outgoing/wizard/incoming_shipment_processor.py	2017-01-16 10:24:56 +0000
@@ -155,10 +155,6 @@
                       'return to IN form view and re-try.'),
                 )
 
-            self.write(cr, uid, [proc.id], {
-                'already_processed': True,
-            }, context=context)
-
             for line in proc.move_ids:
                 # If one line as an error, return to wizard
                 if line.integrity_status != 'empty':
@@ -172,6 +168,10 @@
                         'context': context,
                     }
 
+            self.write(cr, uid, [proc.id], {
+                'already_processed': True,
+            }, context=context)
+
             for line in proc.move_ids:
                 # if no quantity, don't process the move
                 if not line.quantity:
@@ -318,7 +318,16 @@
                 _('Processing Error'),
                 _('No data to process !'),
             )
-        incoming_obj.write(cr, uid, ids, {'draft': True}, context=context)
+
+        # make sure that the current incoming proc is not already processed :
+        for r in incoming_obj.read(cr, uid, ids, ['already_processed']):
+            if not r['already_processed']:
+                incoming_obj.write(cr, uid, ids, {'draft': True}, context=context)
+            else:
+                raise osv.except_osv(
+                    _('Error'), _('The incoming shipment has already been processed, you cannot save it as draft.')
+                )
+
         return {}
 
     def force_process(self, cr, uid, ids, context=None):

=== modified file 'bin/addons/msf_profile/i18n/fr_MF.po'
--- bin/addons/msf_profile/i18n/fr_MF.po	2016-12-07 06:47:50 +0000
+++ bin/addons/msf_profile/i18n/fr_MF.po	2017-01-16 10:24:56 +0000
@@ -75286,16 +75286,61 @@
 msgstr "Dossier d'enregistrement des pièces jointes"
 
 #. module: base
-#: help:attachment.config,name:0
-msgid "The complet path to the local folder where Unifield will save attachment files."
+#: field:attachment.config,next_migration:444
+msgid "Next migration date"
+msgstr "Date de la prochaine migration"
+
+#. module: base
+#: help:attachment.config,name:445
+msgid "The complete path to the local folder where Unifield will save attachment files."
 msgstr "Dossier dans lequel les pièces jointes seront stockées."
 
 #. module: base
+#: help:attachment.config,next_migration:448
+msgid "Next planned execution of the migration to move the old attachment to the path defined"
+msgstr "Prochaine execution planifiée de migration pour déplacer les anciènes pièces jointes vers le nouveau chemin défini."
+
+#. module: base
+#: field:attachment.config,migration_date:449
+msgid "Last migration execution date"
+msgstr "Date de la dernière migration"
+
+#. module: base
+#: field:attachment.config,migration_error:450
+msgid "Migration errors"
+msgstr "Erreurs de migration"
+
+#. module: base
+#: field:attachment.config,is_migration_running:452
+msgid "Moving files..."
+msgstr "Déplacement des fichiers..."
+
+#. module: base
+#: field:attachment.config,moving_rate:454
+msgid "Moving process"
+msgstr "Avancement du déplacement"
+
+#. module: base
+#: constraint:attachment.config:469
+msgid "You cannot have more than one Attachment configuration"
+msgstr "Vous ne pouvez pas avoir plus d'une configuration de pièces jointes"
+
+#. module: base
 #: view:attachment.config:0
 #: model:ir.model,name:base.model_attachment_config
 msgid "Attachment configuration"
 msgstr "Configuration des pièces jointes"
 
+#. module: base
+#: view:attachment.config:0
+msgid "Old attachments migration"
+msgstr "Migration des anciennes pièces jointes"
+
+#. module: base
+#: view:attachment.config:0
+msgid "Migrate old attachement to store them in local file system"
+msgstr "Migrer les anciennes pièces jointes pour les stocker sur le système de fichier local"
+
 #. module: board
 #: code:addons/board/queries_finance.py:11
 #: code:addons/board/queries_finance.py:30
@@ -75769,3 +75814,37 @@
 msgid "Partner Created on this instance"
 msgstr "Partenaire créé sur cette instance"
 
+#. module: account_reconciliation
+#: code:addons/account_reconciliation/wizard/account_reconcile.py:207
+#, python-format
+msgid "When entries from different partial reconciliations are reconciled together, all the legs of these partial reconciliations must be included."
+msgstr "Lorsque des entrées de différents lettrages partiels sont lettrées ensemble, toutes les lignes de ces lettrage partiels doivent être incluses."
+
+#. module: account_reconciliation
+#: code:addons/account_reconciliation/wizard/account_reconcile.py:201
+#, python-format
+msgid "Only full reconciliation is allowed when entries from two (or more) different partial reconciliations are included."
+msgstr "Seul un lettrage complet est autorisé lorsque des entrées de deux lettrages partiels différents (ou plus) sont incluses."
+
+#. module: account_reconciliation
+#: code:addons/account_reconciliation/wizard/account_reconcile.py:190
+#, python-format
+msgid "Both Debit and Credit lines are required for reconciliation."
+msgstr "Un lettrage requiert à la fois des lignes en débit et en crédit."
+
+#. module: msf_outgoing
+#: code:addons/msf_outgoing/wizard/incoming_shipment_processor.py:328
+#, python-format
+msgid "The incoming shipment has already been processed, you cannot save it as draft."
+msgstr "La livraison a déjà été traitée, vous ne pouvez pas la sauvegarder en brouillon."
+
+#. module: stock
+#: view:stock.picking:0
+msgid "Delivery orders which are in draft state"
+msgstr "Bons de livraison dans l'état brouillon"
+
+#. module: account_override
+#: code:addons/account_override/account_move_line.py:491
+#, python-format
+msgid "Only manually reconciled entries can be unreconciled."
+msgstr "Seules les entrées lettrées manuellement peuvent être délettrées."

=== modified file 'bin/addons/order_types/stock.py'
--- bin/addons/order_types/stock.py	2016-05-17 12:12:38 +0000
+++ bin/addons/order_types/stock.py	2017-01-16 10:24:56 +0000
@@ -192,7 +192,7 @@
         if new_ids:
             stock_move_obj = self.pool.get('stock.move')
             move_line_read_list = self.read(cr, uid, new_ids, ['id', 'move_lines', 'type'],
-                                      context=context)
+                                            context=context)
             for move_line_dict in move_line_read_list:
                 stock_move_ids = move_line_dict['move_lines']
                 if stock_move_obj.search(cr, uid, [('id', 'in', stock_move_ids),
@@ -200,7 +200,7 @@
                                                     ('donation_exp',
                                                      'donation_st',
                                                      'in_kind')),
-                                                  ], context=context):
+                                                   ], context=context):
                     res[move_line_dict['id']] = True
         return res
 
@@ -227,12 +227,12 @@
         for picking in self.browse(cr, uid, ids):
             for move in picking.move_lines:
                 self.pool.get('stock.certificate.valuation').create(cr, uid, {'picking_id': picking.id,
-                                                                             'product_id': move.product_id.id,
-                                                                             'qty': move.product_qty,
-                                                                             'print_id': print_id,
-                                                                             'move_id': move.id,
-                                                                             'prodlot_id': move.prodlot_id.id,
-                                                                             'unit_price': move.product_id.list_price})
+                                                                              'product_id': move.product_id.id,
+                                                                              'qty': move.product_qty,
+                                                                              'print_id': print_id,
+                                                                              'move_id': move.id,
+                                                                              'prodlot_id': move.prodlot_id.id,
+                                                                              'unit_price': move.product_id.list_price})
 
         return {'type': 'ir.actions.act_window',
                 'res_model': 'stock.print.certificate',
@@ -296,7 +296,7 @@
 
         if certif and not context.get('attach_ok', False):
             partial_id = self.pool.get("stock.certificate.picking").create(
-                            cr, uid, {'picking_id': ids[0]}, context=dict(context, active_ids=ids))
+                cr, uid, {'picking_id': ids[0]}, context=dict(context, active_ids=ids))
             return {'name':_("Attach a certificate of donation"),
                     'view_mode': 'form',
                     'view_id': False,
@@ -326,10 +326,8 @@
 
                 # US-148
                 if pick.type == 'in':
-                    args = [('picking_id', '=', pick.id),
-                            ('draft', '=', True)]
-                    wiz_ids = wizard_obj.search(cr, uid, args=args,
-                                                context=context)
+                    domain = [('picking_id', '=', pick.id), ('draft', '=', True), ('already_processed', '=', False)]
+                    wiz_ids = wizard_obj.search(cr, uid, domain, context=context)
                     if wiz_ids:
                         proc_id = wiz_ids[0]
                     else:
@@ -349,13 +347,13 @@
                     'view_type': 'form',
                     'view_mode': 'form',
                     'target': 'new',
-                    }
+                }
 
                 if not context.get('force_process', False) and pick.type == 'in' \
                    and not pick.in_dpo \
                    and pick.state != 'shipped' and pick.partner_id.partner_type == 'internal':
                     view_id = self.pool.get('ir.model.data').get_object_reference(cr, uid,
-                        'msf_outgoing', 'stock_incoming_processor_internal_warning_form_view')[1]
+                                                                                  'msf_outgoing', 'stock_incoming_processor_internal_warning_form_view')[1]
                     res['view_id'] = [view_id]
 
                 return res

=== modified file 'bin/addons/product_attributes/product_attributes.py'
--- bin/addons/product_attributes/product_attributes.py	2016-11-21 14:21:55 +0000
+++ bin/addons/product_attributes/product_attributes.py	2017-01-16 10:24:56 +0000
@@ -1430,7 +1430,7 @@
 
         for product in self.browse(cr, uid, ids, context=context):
             # Raise an error if the product is already inactive
-            if not product.active:
+            if not product.active and not context.get('sync_update_execution'):
                 raise osv.except_osv(_('Error'), _('The product [%s] %s is already inactive.') % (product.default_code, product.name))
 
             # Check if the product is in some purchase order lines or request for quotation lines

=== modified file 'bin/addons/purchase_override/report/merged_order.rml'
--- bin/addons/purchase_override/report/merged_order.rml	2016-11-24 10:31:53 +0000
+++ bin/addons/purchase_override/report/merged_order.rml	2017-01-16 10:24:56 +0000
@@ -341,7 +341,7 @@
             </tr>
             <tr>
                 <td>
-                    <para style="TextInformation">Goods value : [[ objects[0].amount_total or '0.00' ]]</para>
+                    <para style="TextInformation">Goods value : [[ objects[0].amount_untaxed or '0.00' ]]</para>
                 </td>
                 <td>
                     <para style="TextInformation"> </para>

=== modified file 'bin/addons/purchase_override/report/purchase_order.rml'
--- bin/addons/purchase_override/report/purchase_order.rml	2016-11-09 08:10:08 +0000
+++ bin/addons/purchase_override/report/purchase_order.rml	2017-01-16 10:24:56 +0000
@@ -343,7 +343,7 @@
             </tr>
             <tr>
                 <td>
-                    <para style="TextInformation">Goods value : [[ objects[0].amount_total or '0.00' ]]</para>
+                    <para style="TextInformation">Goods value : [[ objects[0].amount_untaxed or '0.00' ]]</para>
                 </td>
                 <td>
                     <para style="TextInformation"> </para>

=== modified file 'bin/addons/stock/stock_view.xml'
--- bin/addons/stock/stock_view.xml	2016-02-18 15:39:31 +0000
+++ bin/addons/stock/stock_view.xml	2017-01-16 10:24:56 +0000
@@ -1024,8 +1024,9 @@
             <field name="arch" type="xml">
                 <search string="Picking list">
                     <group col="8" colspan="4">
+                        <filter icon="terp-document-new" name="draft" string="Draft" domain="[('state', 'in', ['draft'])]" help="Delivery orders which are in draft state" />
+                        <filter icon="terp-camera_test" name="confirmed" string="Confirmed" domain="[('state','=','confirmed')]" help="Confirmed Delivery Orders"/>
                         <filter icon="terp-check" name="available" string="Available" domain="[('state','=','assigned')]" help="Assigned Delivery Orders"/>
-                        <filter icon="terp-camera_test" name="confirmed" string="Confirmed" domain="[('state','=','confirmed')]" help="Confirmed Delivery Orders"/>
                         <filter icon="terp-dialog-close" name="done" string="Done" domain="[('state','=','done')]" help="Delivery orders already processed"/>
                         <separator orientation="vertical"/>
                         <filter icon="terp-accessories-archiver-minus" string="Back Orders" domain="[('backorder_id', '!=', False)]" help="Is a Back Order" groups="base.group_extended"/>

=== modified file 'bin/addons/supplier_catalogue/product.py'
--- bin/addons/supplier_catalogue/product.py	2016-08-18 08:32:03 +0000
+++ bin/addons/supplier_catalogue/product.py	2017-01-16 10:24:56 +0000
@@ -30,7 +30,7 @@
 class product_supplierinfo(osv.osv):
     _name = 'product.supplierinfo'
     _inherit = 'product.supplierinfo'
-    
+
     def unlink(self, cr, uid, info_ids, context=None):
         '''
         Disallow the possibility to remove a supplier info if 
@@ -43,45 +43,45 @@
             context = {}
         if isinstance(info_ids, (int, long)):
             info_ids = [info_ids]
-            
+
         for info in self.browse(cr, uid, info_ids, context=context):
             if info.catalogue_id and not context.get('product_change', False):
                 raise osv.except_osv(_('Error'), _('You cannot remove a supplier information which is linked ' \
                                                    'to a supplier catalogue line ! Please remove the corresponding ' \
                                                    'supplier catalogue line to remove this supplier information.'))
-        
+
         return super(product_supplierinfo, self).unlink(cr, uid, info_ids, context=context)
-    
+
     def search(self, cr, uid, args, offset=0, limit=None, order=None, context=None, count=False):
         if not context:
             context = {}
-        
+
         new_res = [] 
         res = super(product_supplierinfo, self).search(cr, uid, args, offset, limit,
-                order, context=context, count=count)
+                                                       order, context=context, count=count)
         if count:
             return res
-        
+
         if isinstance(res, (int, long)):
             res = [res]
-        
+
         for r in self.browse(cr, uid, res, context=context):
             if not r.catalogue_id or r.catalogue_id.active:
                 new_res.append(r.id)
-        
+
         return new_res
-    
+
     def _get_editable(self, cr, uid, ids, field_name, args, context=None):
         '''
         Return True if no catalogue associated
         '''
         res = {}
-        
+
         for x in self.browse(cr, uid, ids, context=context):
             res[x.id] = True
             if x.catalogue_id:
                 res[x.id] = False
-        
+
         return res
 
     def _get_seller_delay(self, cr, uid, ids, field_name, args, context=None):
@@ -95,7 +95,7 @@
             res[price.id] = (price.name and price.name.supplier_lt) or (product_id and int(product[0].procure_delay)) or 1
 
         return res
-    
+
     _columns = {
         'catalogue_id': fields.many2one('supplier.catalogue', string='Associated catalogue', ondelete='cascade'),
         'editable': fields.function(_get_editable, method=True, string='Editable', store=False, type='boolean'),
@@ -122,7 +122,7 @@
 
         return {'value': v}
 
-    
+
     # Override the original method
     def price_get(self, cr, uid, supplier_ids, product_id, product_qty=1, context=None):
         """
@@ -141,16 +141,16 @@
         uom_id = context.get('uom', False) or product_pool.browse(cr, uid, product_id, context=context).uom_id.id
         for supplier in partner_pool.browse(cr, uid, supplier_ids, context=context):
             res[supplier.id] = product_pool._get_partner_price(cr, uid, product_id, supplier.id, product_qty,
-                                                                        currency_id, date, uom_id, context=context)
+                                                               currency_id, date, uom_id, context=context)
         return res
-    
+
 product_supplierinfo()
 
 
 class pricelist_partnerinfo(osv.osv):
     _name = 'pricelist.partnerinfo'
     _inherit = 'pricelist.partnerinfo'
-    
+
     def default_get(self, cr, uid, fields, context=None):
         '''
         Set automatically the currency of the line with the default
@@ -158,9 +158,9 @@
         '''
         if not context:
             context = {}
-        
+
         res = super(pricelist_partnerinfo, self).default_get(cr, uid, fields, context=context)
-        
+
         if context.get('partner_id', False) and isinstance(context['partner_id'], (int, long)):
             partner = self.pool.get('res.partner').browse(cr, uid, context.get('partner_id'), context=context)
             res['currency_id'] = partner.property_product_pricelist_purchase.currency_id.id
@@ -168,9 +168,9 @@
         if context.get('active_model', False) == 'product.supplierinfo' and context.get('active_id', False) and isinstance(context['active_id'], (int, long)):
             read_partnerinfo = self.pool.get('product.supplierinfo').read(cr, uid, context['active_id'])
             res['uom_id'] = read_partnerinfo['product_uom'][0]
-        
+
         return res
-    
+
     def unlink(self, cr, uid, info_id, context=None):
         '''
         Disallow the possibility to remove a supplier pricelist 
@@ -181,7 +181,7 @@
         '''
         if context is None:
             context = {}
-            
+
         if isinstance(info_id, (int, long)):
             info_id = [info_id]
 
@@ -190,27 +190,27 @@
                 raise osv.except_osv(_('Error'), _('You cannot remove a supplier pricelist line which is linked ' \
                                                    'to a supplier catalogue line ! Please remove the corresponding ' \
                                                    'supplier catalogue line to remove this supplier information.'))
-        
+
         return super(pricelist_partnerinfo, self).unlink(cr, uid, info_id, context=context)
-    
+
     def search(self, cr, uid, args, offset=0, limit=None, order=None, context=None, count=False):
         if not context:
             context = {}
-            
+
         res = super(pricelist_partnerinfo, self).search(cr, uid, args, offset, limit,
-                order, context=context, count=count)
+                                                        order, context=context, count=count)
 
         if count:
             return res
-        
+
         new_res = []
-        
+
         for r in self.browse(cr, uid, res, context=context):
             if not r.suppinfo_id or not r.suppinfo_id.catalogue_id or r.suppinfo_id.catalogue_id.active:
                 new_res.append(r.id)
-        
+
         return new_res
-    
+
     def _check_min_quantity(self, cr, uid, ids, context=None):
         '''
         Check if the min_qty field is set
@@ -226,7 +226,7 @@
                 if line.min_quantity <= 0.00:
                     raise osv.except_osv(_('Error'), _('The line of product %s has a negative or zero min. quantity !') %line.suppinfo_id.product_id.name)
                     return False
-            
+
         return True
 
     def _get_supplierinfo(self, cr, uid, ids, context=None):
@@ -254,7 +254,7 @@
         'sequence': fields.function(_get_sequence, method=True, string='Sequence', type='integer',
                                     store={'pricelist.partnerinfo': (lambda self, cr, uid, ids, c={}: ids, [], 20),
                                            'product.supplierinfo': (_get_supplierinfo, ['sequence'], 20),
-                                        })
+                                           })
     }
 
     def create(self, cr, uid, vals, context=None):
@@ -285,15 +285,15 @@
 class product_product(osv.osv):
     _name = 'product.product'
     _inherit = 'product.product'
-    
+
     def _get_partner_info_price(self, cr, uid, product, partner_id, product_qty, currency_id,
-                                          order_date, product_uom_id, context=None):
+                                order_date, product_uom_id, context=None):
         '''
         Returns the pricelist_information from product form
         '''
         if not context:
             context = {}
-            
+
         partner_price = self.pool.get('pricelist.partnerinfo')
         info_prices = []
         suppinfo_ids = self.pool.get('product.supplierinfo').search(cr, uid, [('name', '=', partner_id), ('product_id', '=', product.product_tmpl_id.id)], context=context)
@@ -304,18 +304,18 @@
                   ('valid_from', '=', False),
                   '|', ('valid_till', '>=', order_date),
                   ('valid_till', '=', False)]
-        
+
         domain_cur = [('currency_id', '=', currency_id)]
         domain_cur.extend(domain)
-        
+
         info_prices = partner_price.search(cr, uid, domain_cur, order='sequence asc, min_quantity desc, id desc', limit=1, context=context)
         if not info_prices:
             info_prices = partner_price.search(cr, uid, domain, order='sequence asc, min_quantity desc, id desc', limit=1, context=context)
-        
+
         return info_prices
-    
+
     def _get_partner_price(self, cr, uid, product_ids, partner_id, product_qty, currency_id,
-                                          order_date, product_uom_id, context=None):
+                           order_date, product_uom_id, context=None):
         '''
         Search the good partner price line for products
         '''
@@ -323,29 +323,27 @@
         one_product = False
         cur_obj = self.pool.get('res.currency')
         partner_price = self.pool.get('pricelist.partnerinfo')
-        suppinfo_obj = self.pool.get('product.supplierinfo')
         prod_obj = self.pool.get('product.product')
-        catalogue_obj = self.pool.get('supplier.catalogue')
-        
+
         if not context:
             context = {}
-            
+
         if isinstance(product_ids, (int, long)):
             one_product = product_ids
             product_ids = [product_ids]
-            
+
         for product in prod_obj.browse(cr, uid, product_ids, context=context):
             info_prices = self._get_partner_info_price(cr, uid, product, partner_id, product_qty, currency_id,
                                                        order_date, product_uom_id, context=context)
-                
+
             if info_prices:
-    #            info = partner_price.browse(cr, uid, info_price, context=context)[0]
+                #            info = partner_price.browse(cr, uid, info_price, context=context)[0]
                 info = partner_price.browse(cr, uid, info_prices[0], context=context)
                 price = cur_obj.compute(cr, uid, info.currency_id.id, currency_id, info.price, round=False, context=context)
                 res[product.id] = (price, info.rounding or 1.00, info.suppinfo_id.min_qty or 0.00) 
             else:
                 res[product.id] = (False, 1.0, 1.0)
-                        
+
         return not one_product and res or res[one_product]
 
     def _get_catalogue_ids(self, cr, uid, ids, field_name, arg, context=None):
@@ -371,51 +369,70 @@
             res[product.id] = list(catalogue_ids)
 
         return res
-                            
+
     def _search_catalogue_ids(self, cr, uid, obj, name, args, context=None):
         '''
         Filter the search according to the args parameter
         '''
-        # Objects
         catalogue_obj = self.pool.get('supplier.catalogue')
 
-        context = context is None and {} or context
-        ids = set()
+        if context is None:
+            context = {}
+        product_id_list = []
 
         for arg in args:
-            if arg[0] == 'catalogue_ids' and arg[1] == '=' and arg[2]:
-                catalogue = catalogue_obj.browse(cr, uid, int(arg[2]), context=context)
-                for line in catalogue.line_ids:
-                    ids.add(line.product_id.id)
-            elif arg[0] == 'catalogue_ids' and arg[1] == 'in' and arg[2]:
-                for catalogue in catalogue_obj.browse(cr, uid, arg[2], context=context):
-                    for line in catalogue.line_ids:
-                        ids.add(line.product_id.id)
+            if arg[0] == 'catalogue_ids' and arg[1] == '=':
+                catalogue_list = [int(arg[2])]
+            elif arg[0] == 'catalogue_ids' and arg[1] == 'in':
+                catalogue_list = arg[2]
+            elif arg[0] == 'catalogue_ids' and arg[1] == 'ilike':
+                name_search = arg[2]
+                catalogue_list = catalogue_obj.search(cr, uid, [('name', 'ilike', name_search)],
+                                                      context=context)
+                if not catalogue_list:
+                    return []
             else:
                 return []
 
-        return [('id', 'in', list(ids))]
+            catalog_lines_result = catalogue_obj.read(cr, uid, catalogue_list,
+                                                      ['line_ids'], context)
+            catalog_line_ids_list = []
+            for catalog in catalog_lines_result:
+                catalog_line_ids_list.extend(catalog['line_ids'])
+
+            total_lines = len(catalog_line_ids_list)
+            start_chunk = 0
+            chunk_size = 500
+            while start_chunk < total_lines:
+                ids_chunk = catalog_line_ids_list[start_chunk:start_chunk+chunk_size]
+                cr.execute("""SELECT scl.product_id
+                FROM supplier_catalogue_line as scl
+                WHERE scl.id in %s""", (tuple(ids_chunk),))
+                current_res = [x[0] for x in cr.fetchall() if x]
+                product_id_list.extend(current_res)
+                start_chunk += chunk_size
+        return [('id', 'in', product_id_list)]
 
     _columns = {
         'catalogue_ids': fields.function(_get_catalogue_ids, fnct_search=_search_catalogue_ids,
-                                            type='many2many', relation='supplier.catalogue', method=True, string='Catalogues'),
+                                         type='many2many', relation='supplier.catalogue', method=True, string='Catalogues'),
     }
-    
+
 product_product()
 
 
 class product_pricelist(osv.osv):
     _name = 'product.pricelist'
     _inherit = 'product.pricelist'
-    
+
     def _get_in_search(self, cr, uid, ids, field_name, args, context=None):
         res = {}
-        
+
         for id in ids:
             res[id] = True
-        
+
         return res
-    
+
     def _search_in_search(self, cr, uid, obj, name, args, context=None):
         '''
         Returns pricelists according to partner type
@@ -423,7 +440,7 @@
         user_obj = self.pool.get('res.users')
         cur_obj = self.pool.get('res.currency')
         dom = []
-        
+
         for arg in args:
             if arg[0] == 'in_search':
                 if arg[1] != '=':
@@ -438,42 +455,42 @@
                     elif arg[2] == 'esc':
                         currency_ids = cur_obj.search(cr, uid, [('is_esc_currency', '=', True)])
                         dom.append(('currency_id', 'in', currency_ids))
-                        
+
         return dom
-    
+
     def _get_currency_name(self, cr, uid, ids, field_name, args, context=None):
         '''
         Return the name of the related currency
         '''  
         res = {}
-        
+
         for p_list in self.browse(cr, uid, ids, context=context):
             res[p_list.id] = False
             if p_list.currency_id:
                 res[p_list.id] = p_list.currency_id.currency_name
-        
+
         return res
-    
+
     def _search_currency_name(self, cr, uid, obj, name, args, context=None):
         '''
         Return the list corresponding to the currency name
         '''
         dom = []
-        
+
         for arg in args:
             if arg[0] == 'currency_name':
                 currency_ids = self.pool.get('res.currency').search(cr, uid, [('currency_name', arg[1], arg[2])], context=context)
                 dom.append(('currency_id', 'in', currency_ids))
-                
+
         return dom
-        
-    
+
+
     _columns = {
         'in_search': fields.function(_get_in_search, fnct_search=_search_in_search, method=True,
                                      type='boolean', string='In search'),
         'currency_name': fields.function(_get_currency_name, fnct_search=_search_currency_name, type='char', method=True, string='Currency name'),
     }
-    
+
     def _hook_product_partner_price(self, cr, uid, *args, **kwargs):
         '''
         Rework the computation of price from partner section in product form
@@ -490,13 +507,13 @@
         if not partner and 'partner_id' in context:
             partner = context.get('partner_id', False)
         uom_price_already_computed = kwargs['uom_price_already_computed']
-        
+
         price, rounding, min_qty = self.pool.get('product.product')._get_partner_price(cr, uid, product_id, partner, qty, currency_id,
                                                                                        date, uom, context=context)
         uom_price_already_computed = 1
-        
+
         return price, uom_price_already_computed
-    
+
     def name_get(self, cr, user, ids, context=None):
         '''
         Display the currency name instead of the pricelist name
@@ -507,7 +524,7 @@
             txt = pp.currency_id.name
             res += [(pp.id, txt)]
         return res
-    
+
     def name_search(self, cr, uid, name='', args=None, operator='ilike', context=None, limit=80):
         '''
         Search pricelist by currency name instead of pricelist name
@@ -515,12 +532,12 @@
         ids = []
         if name:
             currency_ids = self.pool.get('res.currency').search(cr, uid,
-                    [('name', operator, name)], order='NO_ORDER', context=context)
+                                                                [('name', operator, name)], order='NO_ORDER', context=context)
             ids = self.search(cr, uid, [('currency_id', 'in', currency_ids)] + (args or []))
-            
+
         return self.name_get(cr, uid, ids)          
-        
-    
+
+
 product_pricelist()
 
 class res_currency(osv.osv):
@@ -550,21 +567,21 @@
                     po_currency_id = price_obj.browse(cr, uid, arg[2]).currency_id.id
                     dom.append(('id', 'in', [func_currency_id, po_currency_id]))
         return dom
-    
+
     def _get_partner_currency(self, cr, uid, ids, field_name, args, context=None):
         res = {}
         for id in ids:
             res[id] = True
-            
+
         return res
-    
+
     def _src_partner_currency(self, cr, uid, obj, name, args, context=None):
         '''
         Returns currencies according to partner type
         '''
         user_obj = self.pool.get('res.users')
         dom = []
-        
+
         for arg in args:
             if arg[0] == 'partner_currency':
                 if arg[1] != '=':
@@ -578,14 +595,14 @@
                         dom.append(('is_section_currency', '=', True))
                     elif partner.partner_type == 'esc':
                         dom.append(('is_esc_currency', '=', True))
-                        
+
         return dom
 
     _columns = {
         'is_section_currency': fields.boolean(string='Functional currency', 
-                                        help='If this box is checked, this currency is used as a functional currency for at least one section in MSF.'),
+                                              help='If this box is checked, this currency is used as a functional currency for at least one section in MSF.'),
         'is_esc_currency': fields.boolean(string='ESC currency', 
-                                        help='If this box is checked, this currency is used as a currency for at least one ESC.'),
+                                          help='If this box is checked, this currency is used as a currency for at least one ESC.'),
         'is_po_functional': fields.function(_get_in_search, fnct_search=_search_in_search, method=True,
                                             type='boolean', string='transport PO currencies'),
         'partner_currency': fields.function(_get_partner_currency, fnct_search=_src_partner_currency, type='boolean', method=True,
@@ -605,9 +622,9 @@
         # Check if Inter-section partners used one of these currencies
         if 'is_section_currency' in values and not values['is_section_currency']:
             pricelist_ids = pricelist_obj.search(cr, uid, [('currency_id',
-                'in', ids)], order='NO_ORDER', context=context)
+                                                            'in', ids)], order='NO_ORDER', context=context)
             partner_ids = partner_obj.search(cr, uid, [('partner_type', '=',
-                'section')], order='NO_ORDER', context=context)
+                                                        'section')], order='NO_ORDER', context=context)
             value_reference = ['product.pricelist,%s' % x for x in pricelist_ids]
             res_reference = ['res.partner,%s' % x for x in partner_ids]
             property_ids = []
@@ -615,7 +632,7 @@
                 property_ids = property_obj.search(cr, uid, [('res_id', 'in', res_reference),
                                                              ('value_reference', 'in', value_reference),
                                                              '|', ('name', '=', 'property_product_pricelist'),
-                                                                  ('name', '=', 'property_product_pricelist_purchase'),], context=context)
+                                                             ('name', '=', 'property_product_pricelist_purchase'),], context=context)
             if property_ids:
                 properties = property_obj.browse(cr, uid, property_ids, context=context)
                 partner_list = ' / '.join(x.res_id.name for x in properties)
@@ -626,9 +643,9 @@
         # Check if ESC partners used one of these currencies
         if 'is_esc_currency' in values and not values['is_esc_currency']:
             pricelist_ids = pricelist_obj.search(cr, uid, [('currency_id',
-                'in', ids)], order='NO_ORDER', context=context)
+                                                            'in', ids)], order='NO_ORDER', context=context)
             partner_ids = partner_obj.search(cr, uid, [('partner_type', '=',
-                'esc')], order='NO_ORDER', context=context)
+                                                        'esc')], order='NO_ORDER', context=context)
             value_reference = ['product.pricelist,%s' % x for x in pricelist_ids]
             res_reference = ['res.partner,%s' % x for x in partner_ids]
             property_ids = []
@@ -636,7 +653,7 @@
                 property_ids = property_obj.search(cr, uid, [('res_id', 'in', res_reference),
                                                              ('value_reference', 'in', value_reference),
                                                              '|', ('name', '=', 'property_product_pricelist'),
-                                                                  ('name', '=', 'property_product_pricelist_purchase'),], context=context)
+                                                             ('name', '=', 'property_product_pricelist_purchase'),], context=context)
             if property_ids:
                 properties = property_obj.browse(cr, uid, property_ids, context=context)
                 partner_list = ' / '.join(x.res_id.name for x in properties)

=== modified file 'bin/addons/tender_flow/report/tender_rfq_comparison_xls.mako'
--- bin/addons/tender_flow/report/tender_rfq_comparison_xls.mako	2016-12-05 15:18:05 +0000
+++ bin/addons/tender_flow/report/tender_rfq_comparison_xls.mako	2017-01-16 10:24:56 +0000
@@ -541,7 +541,7 @@
     <Cell ss:StyleID="sTitle" ss:MergeAcross="1"><Data ss:Type="String">${_('Details')}:</Data></Cell>
     <Cell ss:StyleID="sData"><Data ss:Type="String">${o.details or ''|x}</Data></Cell>
     <Cell ss:StyleID="sTitle" ss:MergeAcross="1"><Data ss:Type="String">${_('Currency')}:</Data></Cell>
-    <Cell ss:StyleID="sData"><Data ss:Type="String">${get_same_and_default_currency(o)[1].name or ''|x}</Data></Cell>
+    <Cell ss:StyleID="sData"><Data ss:Type="String">${o.company_id.currency_id.name or ''|x}</Data></Cell>
     <Cell ss:StyleID="sTitle" ss:MergeAcross="1"><Data ss:Type="String">${_('Tender Priority')}:</Data></Cell>
     <Cell ss:StyleID="sData"><Data ss:Type="String">${getSel(o, 'priority')|x}</Data></Cell>
    </Row>

=== modified file 'bin/addons/tender_flow/report/tender_rfq_comparison_xls.py'
--- bin/addons/tender_flow/report/tender_rfq_comparison_xls.py	2016-12-05 15:15:27 +0000
+++ bin/addons/tender_flow/report/tender_rfq_comparison_xls.py	2017-01-16 10:24:56 +0000
@@ -17,8 +17,6 @@
         super(tender_rfq_comparison, self).__init__(cr, uid, name, context=context)
         self.localcontext.update({
             'get_compare_lines': self.get_compare_lines,
-            'gen_line_link': self.gen_line_link,
-            'get_same_and_default_currency': self.get_same_and_default_currency,
         })
 
     def get_compare_lines(self, tender_obj):
@@ -85,42 +83,5 @@
 
         return lines
 
-    def get_same_and_default_currency(self, tender_obj):
-
-        if tender_obj == 'draft' or not tender_obj.rfq_ids:
-            return (True, self.localcontext['company'].currency_id)
-
-        current_cur = False
-
-        for rfq in tender_obj.rfq_ids:
-            next_cur = rfq.currency_id
-            if current_cur and current_cur.id != next_cur.id:
-                return (False, self.localcontext['company'].currency_id)
-            current_cur = rfq.currency_id
-        return (True, current_cur)
-
-    def gen_line_link(self, tender_obj):
-        link_line_supp = {}
-
-        same_cur, currency = self.get_same_and_default_currency(tender_obj)
-        cur_obj = self.pool.get('res.currency')
-
-        if tender_obj.rfq_ids:
-            # fine we have rfqs
-            for rfq in tender_obj.rfq_ids:
-                for line in rfq.order_line:
-                    data = {'notes': line.notes, 'price_unit': line.price_unit}
-                    if not same_cur:
-                        data['price_unit'] = cur_obj.compute(self.cr, self.uid, line.currency_id.id, currency.id, line.price_unit, round=True)
-
-                    link_line_supp.setdefault(line.product_id.id, {}).setdefault(rfq.partner_id.id, data)
-        elif tender_obj.supplier_ids:
-            for line in tender_obj.tender_line_ids:
-                link_line_supp[line.product_id.id] = {}
-                for supp in tender_obj.supplier_ids:
-                    link_line_supp[line.product_id.id][supp.id] = {}
-
-        return link_line_supp
-
 
 SpreadsheetReport('report.tender_rfq_comparison_xls', 'tender', 'tender_flow/report/tender_rfq_comparison_xls.mako', parser=tender_rfq_comparison)

=== modified file 'bin/addons/vertical_integration/report/hq_report_ocb.py'
--- bin/addons/vertical_integration/report/hq_report_ocb.py	2016-11-18 16:44:10 +0000
+++ bin/addons/vertical_integration/report/hq_report_ocb.py	2017-01-16 10:24:56 +0000
@@ -63,6 +63,7 @@
         dbname = cr.dbname
         pool = pooler.get_pool(dbname)
         partner_obj = pool.get('res.partner')
+        employee_obj = pool.get('hr.employee')
 
         # define column number corresponding to properties
         partner_name_cl = 9
@@ -73,6 +74,12 @@
         partner_search_dict = {}
         employee_search_dict = {}
         employee_code_dict = {}
+        partner_name_dict = {}
+        partner_hash_dict = {}
+
+        partner_id_list = list(set([x[partner_id_cl] for x in data if x[partner_id_cl]]))
+        partner_result = partner_obj.read(cr, uid, partner_id_list, ['name'])
+        partner_name_dict = dict((x['id'], x['name']) for x in partner_result)
 
         for line in data:
             tmp_line = list(line)
@@ -90,7 +97,7 @@
                     partner_id = tmp_line[partner_id_cl]
                     if partner_id:
                         # US-497: extract name from partner_id (better than partner_txt)
-                        tmp_line[partner_name_cl] = partner_obj.read(cr, uid, partner_id, ['name'])['name']
+                        tmp_line[partner_name_cl] = partner_name_dict[partner_id]
 
                 partner_name = tmp_line[partner_name_cl]
                 # Search only if partner_name is not empty
@@ -109,12 +116,13 @@
 
                 # If we get some ids, fetch the partner hash
                 if partner_id:
-                    if isinstance(partner_id, (int, long)):
-                        partner_id = [partner_id]
-                    partner_hash = self.get_hash(cr, uid, partner_id, 'res.partner')
+                    if partner_id in partner_hash_dict:
+                        partner_hash = partner_hash_dict[partner_id]
+                    else:
+                        partner_hash = self.get_hash(cr, uid, [partner_id], 'res.partner')
+                        partner_hash_dict[partner_id] = partner_hash
 
                 if not partner_id and tmp_line[partner_name_cl]:
-                    employee_obj = pool.get('hr.employee')
                     if partner_name not in employee_search_dict:
                         employee_search = employee_obj.search(cr, uid, [('name', '=', partner_name), ('active', 'in', ['t', 'f'])])
                         if employee_search:
@@ -673,7 +681,7 @@
             })
 
         # Launch finance archive object
-        fe = finance_archive(sqlrequests, processrequests)
+        fe = finance_archive(sqlrequests, processrequests, context=context)
         # Use archive method to create the archive
         return fe.archive(cr, uid)
 

=== modified file 'bin/addons/vertical_integration/wizard/ocb_export.py'
--- bin/addons/vertical_integration/wizard/ocb_export.py	2016-01-26 10:00:40 +0000
+++ bin/addons/vertical_integration/wizard/ocb_export.py	2017-01-16 10:24:56 +0000
@@ -45,6 +45,12 @@
         """
         Launch a report to generate the ZIP file.
         """
+        if context is None:
+            context = {}
+
+        if isinstance(ids, (int, long)):
+            ids = [ids]
+
         # Prepare some values
         wizard = self.browse(cr, uid, ids[0], context=context)
         data = {}
@@ -67,7 +73,7 @@
             if wizard.period_id.number == 16:
                 msg = _("You can not select '%s' as already included in' \
                     '  December export")  % (
-                        wizard.period_id.name or 'Period 16', )
+                    wizard.period_id.name or 'Period 16', )
                 raise osv.except_osv(_('Warning'), msg)
             """elif wizard.period_id.number == 12:
                 domain = [
@@ -89,7 +95,20 @@
             wizard.instance_id and wizard.instance_id.code or '',
             period_name)
 
-        return {'type': 'ir.actions.report.xml', 'report_name': 'hq.ocb', 'datas': data}
+        background_id = self.pool.get('memory.background.report').create(cr, uid, {
+            'file_name': data['target_filename'],
+            'report_name': 'hq.ocb',
+        }, context=context)
+        context['background_id'] = background_id
+        context['background_time'] = 2
+
+        data['context'] = context
+        return {
+            'type': 'ir.actions.report.xml',
+            'report_name': 'hq.ocb',
+            'datas': data,
+            'context': context,
+        }
 
 ocb_export_wizard()
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== modified file 'bin/osv/orm.py'
--- bin/osv/orm.py	2016-11-17 08:46:41 +0000
+++ bin/osv/orm.py	2017-01-16 10:24:56 +0000
@@ -1450,11 +1450,15 @@
                 trans = translation_obj._get_source(cr, user, self._name, 'view', context['lang'], node.get('sum'))
                 if trans:
                     node.set('sum', trans)
-            elif node.get('confirm'):
+            if node.get('confirm'):
                 trans = translation_obj._get_source(cr, user, self._name, 'view', context['lang'], node.get('confirm'))
                 if trans:
                     node.set('confirm', trans)
-            elif node.get('string'):
+            if node.get('help'):
+                trans = translation_obj._get_source(cr, user, self._name, 'view', context['lang'], node.get('help'))
+                if trans:
+                    node.set('help', trans)
+            if node.get('string'):
                 trans = translation_obj._get_source(cr, user, self._name, 'view', context['lang'], node.get('string'))
                 if trans == node.get('string') and ('base_model_name' in context):
                     # If translation is same as source, perhaps we'd have more luck with the alternative model name
@@ -1462,7 +1466,7 @@
                     trans = translation_obj._get_source(cr, user, context['base_model_name'], 'view', context['lang'], node.get('string'))
                 if trans:
                     node.set('string', trans)
-            elif node.tag == 'translate':
+            if node.tag == 'translate':
                 parent = node.getparent()
                 source = node.text
                 for child in node.getchildren():

=== modified file 'bin/release.py'
--- bin/release.py	2016-12-14 08:48:56 +0000
+++ bin/release.py	2017-01-16 10:24:56 +0000
@@ -20,7 +20,7 @@
 ##############################################################################
 
 name = 'openerp-server'
-version = 'UF3.0'
+version = 'UF4.0dev'
 major_version = '6.0'
 description = 'OpenERP Server'
 long_desc = '''OpenERP is a complete ERP and CRM. The main features are accounting (analytic

=== modified file 'bin/service/web_services.py'
--- bin/service/web_services.py	2016-11-15 15:32:01 +0000
+++ bin/service/web_services.py	2017-01-16 10:24:56 +0000
@@ -848,7 +848,7 @@
             data.append(tmp_data)
         return data
 
-    def exp_export(self, db_name, uid,  fields, domain, model, fields_name,
+    def exp_export(self, db_name, uid, fields, domain, model, fields_name,
                    group_by=None, export_format='csv', ids=None, context=None):
         res = {'result': None}
         db, pool = pooler.get_db_and_pool(db_name)
@@ -866,7 +866,7 @@
             return res
         return background_id
 
-    def export(self, cr, pool, uid,  fields, domain, model, fields_name,
+    def export(self, cr, pool, uid, fields, domain, model, fields_name,
                bg_id, group_by=None, export_format='csv', ids=None, res=None,
                context=None):
 

=== modified file 'bin/tools/translate.py'
--- bin/tools/translate.py	2016-11-09 08:41:40 +0000
+++ bin/tools/translate.py	2017-01-16 10:24:56 +0000
@@ -559,6 +559,8 @@
         res.append(de.get('sum').encode("utf8"))
     if de.get("confirm"):
         res.append(de.get('confirm').encode("utf8"))
+    if de.get("help"):
+        res.append(de.get('help').encode("utf8"))
     if de.tag == 'translate':
         text_to_translate = ''
         if de.text: