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

[jftempo]

=== modified file 'bin/addons/account_override/__init__.py'
--- bin/addons/account_override/__init__.py	2018-07-17 14:03:52 +0000
+++ bin/addons/account_override/__init__.py	2018-09-05 07:53:26 +0000
@@ -38,6 +38,7 @@
     # CASH RETURN - ADVANCE LINES
     'cash_return': [
         ('type', '!=', 'view'),
+        ('type_for_register', '!=', 'donation'),
         '|', '|', '|',
         ('user_type_code', 'in', ['income', 'expense']),
         '&', ('type', '=', 'receivable'), ('user_type_code', 'in', ['receivables', 'cash']),

=== modified file 'bin/addons/analytic_distribution_supply/invoice.py'
--- bin/addons/analytic_distribution_supply/invoice.py	2018-07-13 08:26:08 +0000
+++ bin/addons/analytic_distribution_supply/invoice.py	2018-09-05 07:53:26 +0000
@@ -274,7 +274,7 @@
 
         if auto_cv and from_cancel:
             # we cancel the last IN from PO and no draft invoice exist
-            if not self.pool.get('purchase.order').search_exist(cr, uid, [('id', 'in', po_ids), ('state', 'not in', ['cancel', 'done'])], context=context):
+            if not self.pool.get('stock.move').search_exist(cr, uid, [('type', '=', 'in'), ('id', 'not in', from_cancel), ('state', 'not in', ['cancel', 'done']), ('picking_id.purchase_id', 'in', po_ids)], context=context):
                 if not self.pool.get('account.invoice').search_exist(cr, uid, [('purchase_ids', 'in', po_ids), ('state', '=', 'draft')], context=context):
                     self.pool.get('purchase.order')._finish_commitment(cr, uid, po_ids, context=context)
                     return True

=== modified file 'bin/addons/analytic_distribution_supply/stock.py'
--- bin/addons/analytic_distribution_supply/stock.py	2018-01-10 15:57:41 +0000
+++ bin/addons/analytic_distribution_supply/stock.py	2018-09-05 07:53:26 +0000
@@ -87,7 +87,7 @@
                 account_amount[account_id] += round(qty * price_unit, 2)
 
         if account_amount and po_ids:
-            inv_obj._update_commitments_lines(cr, uid, po_ids.keys(), account_amount, from_cancel=True, context=context)
+            inv_obj._update_commitments_lines(cr, uid, po_ids.keys(), account_amount, from_cancel=ids, context=context)
 
         return super(stock_move, self).action_cancel(cr, uid, ids, context=context)
 

=== modified file 'bin/addons/consumption_calculation/expiry_calculation.py'
--- bin/addons/consumption_calculation/expiry_calculation.py	2018-08-14 14:10:58 +0000
+++ bin/addons/consumption_calculation/expiry_calculation.py	2018-09-05 07:53:26 +0000
@@ -705,7 +705,7 @@
         return res
 
     _columns = {
-        'report_id': fields.many2one('product.likely.expire.report', string='Report', required=True, ondelete='cascade'),
+        'report_id': fields.many2one('product.likely.expire.report', string='Report', required=True, ondelete='cascade', select=1),
         'product_id': fields.many2one('product.product', string='Product', required=True),
         'consumption': fields.float(digits=(16, 2), string='Monthly Consumption', required=True),
         'in_stock': fields.float(digits=(16, 2), string='In stock'),
@@ -792,11 +792,11 @@
     _rec_name = 'line_id'
 
     _columns = {
-        'line_id': fields.many2one('product.likely.expire.report.line', string='Line', ondelete='cascade'),
-        'name': fields.char(size=64, string='Month'),
+        'line_id': fields.many2one('product.likely.expire.report.line', string='Line', ondelete='cascade', select=1),
+        'name': fields.char(size=64, string='Month', select=1),
         'available_qty': fields.float(digits=(16,2), string='Available Qty.'),
         'expired_qty': fields.float(digits=(16,2), string='Expired Qty.'),
-        'period_start': fields.date(string='Period start', readonly=True),
+        'period_start': fields.date(string='Period start', readonly=True, select=1),
         'line_ids': fields.one2many('product.likely.expire.report.item.line', 'item_id', string='Batchs'),
     }
 

=== modified file 'bin/addons/consumption_calculation/report/expiry_calculation_report.py'
--- bin/addons/consumption_calculation/report/expiry_calculation_report.py	2018-07-18 12:56:39 +0000
+++ bin/addons/consumption_calculation/report/expiry_calculation_report.py	2018-09-05 07:53:26 +0000
@@ -119,7 +119,7 @@
             return False
         return item_obj.browse(self.cr, self.uid, items_ids)
 
-    def _get_month_item_lines_ids(self, report, month_date):
+    def _get_month_item_lines_ids(self, report, month_date, report_type=''):
         """get month items('product.likely.expire.report.item')
         """
         lines_obj = self.pool.get('product.likely.expire.report.line')
@@ -143,6 +143,8 @@
                 ('period_start', '>=', dt_from),
                 ('period_start', '<=', dt_to)
             ]
+            if report_type == 'xls':
+                domain.append(('name', '!=', 'expired_qty_col'))
 
         items_ids = item_obj.search(self.cr, self.uid, domain)
 
@@ -152,11 +154,11 @@
                                               order='expired_date')
         return item_lines_ids
 
-    def _get_month_item_lines(self, report, month_date):
+    def _get_month_item_lines(self, report, month_date, report_type=''):
         """get month items('product.likely.expire.report.item')
         """
         item_line_obj = self.pool.get('product.likely.expire.report.item.line')
-        return item_line_obj.browse(self.cr, self.uid, self._get_month_item_lines_ids(report, month_date))
+        return item_line_obj.browse(self.cr, self.uid, self._get_month_item_lines_ids(report, month_date, report_type=report_type))
 
     def _get_rml_tables(self, report, month_cols_count):
         """

=== modified file 'bin/addons/consumption_calculation/report/product_likely_expire_xls.mako'
--- bin/addons/consumption_calculation/report/product_likely_expire_xls.mako	2018-07-18 12:56:39 +0000
+++ bin/addons/consumption_calculation/report/product_likely_expire_xls.mako	2018-09-05 07:53:26 +0000
@@ -194,7 +194,7 @@
 <Cell ss:StyleID="header" ><Data ss:Type="String">${_('Available Qty')}</Data></Cell>
 <Cell ss:StyleID="header" ><Data ss:Type="String">${_('Expiry Qty')}</Data></Cell>
 </Row>
-% for il in getMonthItemLines(o, d):
+% for il in getMonthItemLines(o, d, 'xls'):
 <Row>
 <Cell ss:StyleID="line" ><Data ss:Type="String">${il.item_id.line_id.product_id.default_code or ''|x}</Data></Cell>
 <Cell ss:StyleID="line" ><Data ss:Type="String">${il.item_id.line_id.product_id.name or ''|x}</Data></Cell>

=== modified file 'bin/addons/delivery_mechanism/delivery_mechanism.py'
--- bin/addons/delivery_mechanism/delivery_mechanism.py	2018-05-28 07:44:07 +0000
+++ bin/addons/delivery_mechanism/delivery_mechanism.py	2018-09-05 07:53:26 +0000
@@ -1013,6 +1013,10 @@
                 line = False
                 for line in move_proc_obj.browse(cr, uid, proc_ids, context=context):
                     values = self._get_values_from_line(cr, uid, move, line, db_data_dict, context=context)
+                    if context.get('do_not_process_incoming') and line.pack_info_id:
+                        # we are processing auto import IN, we must register pack_info data
+                        values['pack_info_id'] = line.pack_info_id.id
+
                     if not values.get('product_qty', 0.00):
                         continue
                     # Check if we must re-compute the price of the product

=== modified file 'bin/addons/finance/purchase.py'
--- bin/addons/finance/purchase.py	2016-08-18 08:32:03 +0000
+++ bin/addons/finance/purchase.py	2018-09-05 07:53:26 +0000
@@ -63,5 +63,20 @@
             res.update({'value': v})
         return res
 
+    def check_close_cv(self, cr, uid, po_id, context=None):
+        """
+        If all lines of the PO in parameter have been invoiced and none of these invoices is still in Draft state,
+        the Commitment Vouchers linked to the PO will be closed (i.e. line amounts and total set to 0.00 and state set to Done)
+        """
+        if context is None:
+            context = {}
+        if po_id:
+            po = self.browse(cr, uid, po_id, fields_to_fetch=['order_type', 'state', 'invoice_ids'], context=context)
+            po_states = ['done']
+            if po.order_type == 'direct':  # DPO use case: CV and SI are both created at DPO confirmation
+                po_states = ['confirmed', 'confirmed_p', 'done']
+            if po.state in po_states and all(x.state != 'draft' for x in po.invoice_ids):
+                self._finish_commitment(cr, uid, [po.id], context=context)
+
 purchase_order()
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== modified file 'bin/addons/msf_doc_import/purchase_order.py'
--- bin/addons/msf_doc_import/purchase_order.py	2018-08-14 12:57:02 +0000
+++ bin/addons/msf_doc_import/purchase_order.py	2018-09-05 07:53:26 +0000
@@ -260,6 +260,7 @@
 
         context.update({'auto_import_confirm_pol': True})
         res = self.auto_import_purchase_order(cr, uid, file_path, context=context)
+        context['rejected_confirmation'] = 0
         if context.get('po_id'):
             po = self.browse(cr, uid, context['po_id'], context=context)
             nb_pol_confirmed = 0
@@ -273,6 +274,7 @@
                         cr.commit()
                         nb_pol_confirmed += 1
                     except:
+                        context['rejected_confirmation'] += 1
                         cr.rollback()
                         self.infolog(cr, uid, _('%s :: not able to confirm line #%s') % (po.name, pol.line_number))
                         job_comment = context.get('job_comment', [])

=== modified file 'bin/addons/msf_doc_import/wizard/wizard_po_simulation_screen.py'
--- bin/addons/msf_doc_import/wizard/wizard_po_simulation_screen.py	2018-08-21 13:13:08 +0000
+++ bin/addons/msf_doc_import/wizard/wizard_po_simulation_screen.py	2018-09-05 07:53:26 +0000
@@ -1425,13 +1425,14 @@
         for line in self.browse(cr, uid, ids, context=context):
             write_vals = {}
 
-            if line.po_line_id.state in ('confirmed', 'done', 'cancel', 'cancel_r'):
-                write_vals['type_change'] = 'error'
-                errors.append(_('PO line has been confirmed or cancelled and consequently is not editable'))
-
             # Comment
             write_vals['imp_comment'] = values[15] and values[15].strip()
 
+            if line.po_line_id.state in ('confirmed', 'done') or ( line.po_line_id.state in  ('cancel', 'cancel_r') and write_vals['imp_comment'] != '[DELETE]'):
+                write_vals['type_change'] = 'error'
+                errors.append(_('PO line has been confirmed or cancelled and consequently is not editable'))
+
+
             # External Ref.
             write_vals['imp_external_ref'] = values[1]
             pol_ids = None
@@ -1671,6 +1672,14 @@
             if line.po_line_id and line.type_change != 'ignore' and not line.change_ok and not line.imp_external_ref and not line.imp_project_ref and not line.imp_origin:
                 continue
             if line.type_change in ('ignore', 'error'):
+                if line.type_change == 'error':
+                    job_comment = context.get('job_comment', [])
+                    job_comment.append({
+                        'res_model': 'purchase.order',
+                        'res_id': line.simu_id.order_id.id,
+                        'msg': _('%s: error on line %s %s') % (line.simu_id.order_id.name, line.in_line_number or line.imp_external_ref, line.error_msg),
+                    })
+                    context['job_comment'] = job_comment
                 continue
 
             if line.type_change == 'del' and line.po_line_id:
@@ -1764,7 +1773,7 @@
                     job_comment.append({
                         'res_model': 'purchase.order',
                         'res_id': line.simu_id.order_id.id,
-                        'msg': _('Line #%s has been split.') % line.parent_line_id.po_line_id.line_number,
+                        'msg': _('%s: Line #%s has been split.') % (line.simu_id.order_id.name, line.parent_line_id.po_line_id.line_number),
                     })
                     context['job_comment'] = job_comment
             elif line.type_change == 'new':
@@ -1796,7 +1805,7 @@
                 job_comment.append({
                     'res_model': 'purchase.order',
                     'res_id': line.simu_id.order_id.id,
-                    'msg': _('New line #%s created.') % new_line_numb,
+                    'msg': _('%s: New line #%s created.') % (line.simu_id.order_id.name, new_line_numb),
                 })
                 context['job_comment'] = job_comment
             elif line.po_line_id:

=== modified file 'bin/addons/msf_outgoing/wizard/picking_processor.py'
--- bin/addons/msf_outgoing/wizard/picking_processor.py	2018-08-07 09:06:24 +0000
+++ bin/addons/msf_outgoing/wizard/picking_processor.py	2018-09-05 07:53:26 +0000
@@ -213,62 +213,18 @@
                     continue
 
                 line_data = line_obj._get_line_data(cr, uid, wizard, move, context=context)
-
-                if line_obj._name == 'stock.move.in.processor':
-                    # search for simulation done for this move, and if has pack info attached
-                    sm_in_proc = line_obj.search(cr, uid, [('move_id', '=', move.id)], order='id desc', context=context)
-
-                    link_data = {}
-                    if not sm_in_proc:
-                        # search stock.incoming.processor for the move.picking_id
-                        if move.purchase_line_id.id:
-                            stock_move_ids = self.pool.get('stock.move').search(cr, uid, [('purchase_line_id', '=', move.purchase_line_id.id)], context=context)
-                            picking_ids = [data['picking_id'][0] for data in self.pool.get('stock.move').read(cr, uid, stock_move_ids, ['picking_id']) if data['picking_id']]
-                            picking_ids = list(set(picking_ids))
-
-                            for in_proc_id in self.pool.get('stock.incoming.processor').search(cr, uid, [('picking_id', 'in', picking_ids)], order='id desc', context=context):
-                                # search for stock.move.in.processor with same wizard_id and line_number and with split_move_ok flag on
-                                sm_in_proc = line_obj.search(cr, uid, [
-                                    ('wizard_id', '=', in_proc_id),
-                                    ('line_number', '=', move.line_number),
-                                    ('split_move_ok', '=', False),
-                                    ('pack_info_id', '!=', False),
-                                ], order='id asc', context=context)
-                                if sm_in_proc and context.get('picking_type') == 'incoming_shipment':
-                                    link_data = {'move_id': move.id}
-                                    break
-
-                        if not sm_in_proc and context.get('picking_type') == 'incoming_shipment' and move.picking_id and move.picking_id.origin:
-                            # search backorder
-                            picking_ids = self.pool.get('stock.picking').search(cr, uid, [('origin', '=', move.picking_id.origin), ('id', '!=', move.picking_id.id)])
-
-                            for in_proc_id in self.pool.get('stock.incoming.processor').search(cr, uid, [('picking_id', 'in', picking_ids)], order='id desc', context=context):
-                                # search for stock.move.in.processor with same wizard_id and line_number and with split_move_ok flag on
-                                sm_in_proc = line_obj.search(cr, uid, [
-                                    ('wizard_id', '=', in_proc_id),
-                                    ('line_number', '=', move.line_number),
-                                    ('split_move_ok', '=', False),
-                                    ('pack_info_id', '!=', False),
-                                ], order='id asc', context=context)
-                                if sm_in_proc and context.get('picking_type') == 'incoming_shipment':
-                                    link_data = {'move_id': move.id}
-                                    break
-
-                    for sm_in_proc in line_obj.browse(cr, uid, sm_in_proc, context=context):
-                        if sm_in_proc.pack_info_id:
-                            line_data.update({
-                                'from_pack': sm_in_proc.pack_info_id.parcel_from,
-                                'to_pack': sm_in_proc.pack_info_id.parcel_to,
-                                'weight': sm_in_proc.pack_info_id.total_weight,
-                                'volume': sm_in_proc.pack_info_id.total_volume,
-                                'height': sm_in_proc.pack_info_id.total_height,
-                                'length': sm_in_proc.pack_info_id.total_length,
-                                'width': sm_in_proc.pack_info_id.total_width,
-                                'cost': sm_in_proc.cost,
-                            })
-                            if link_data:
-                                line_obj.write(cr, uid, [sm_in_proc.id], link_data, context=context)
-                            break
+                if line_obj._name == 'stock.move.in.processor' and move.pack_info_id:
+                    line_data.update({
+                        'from_pack': move.pack_info_id.parcel_from,
+                        'to_pack': move.pack_info_id.parcel_to,
+                        'weight': move.pack_info_id.total_weight,
+                        'volume': move.pack_info_id.total_volume,
+                        'height': move.pack_info_id.total_height,
+                        'length': move.pack_info_id.total_length,
+                        'width': move.pack_info_id.total_width,
+                        'cost': move.price_unit,
+                        'currency': move.currency_id.id,
+                    })
                 line_obj.create(cr, uid, line_data, context=context)
 
         return True
@@ -849,7 +805,6 @@
             'currency': move.price_currency_id.id,
             'location_id': move.location_id and move.location_id.id,
         }
-
         return line_data
 
     def split(self, cr, uid, ids, new_qty=0.00, uom_id=False, context=None):

=== modified file 'bin/addons/msf_printed_documents/report/report_reception.py'
--- bin/addons/msf_printed_documents/report/report_reception.py	2017-12-19 10:34:23 +0000
+++ bin/addons/msf_printed_documents/report/report_reception.py	2018-09-05 07:53:26 +0000
@@ -21,6 +21,8 @@
 
 import time
 from report import report_sxw
+from tools.translate import _
+
 
 class report_reception(report_sxw.rml_parse):
     def __init__(self, cr, uid, name, context=None):
@@ -75,59 +77,45 @@
         warn = ''
         tab = []
         if kc_flag or dg_flag:
-            warn += 'You are about to receive'
+            warn += _('You are about to receive')
         if kc_flag :
-            tab.append('heat sensitive')
+            tab.append(_(' heat sensitive'))
         if dg_flag :
-            tab.append('dangerous')
+            tab.append(_(' dangerous'))
         if len(tab) > 0 :
-            if len(tab) ==1:
-                warn += ' ' + tab[0]
+            if len(tab) == 1:
+                warn += tab[0]
             elif len(tab) == 2:
-                warn += ' ' + tab[0] + ' and ' + tab[1]
+                warn += tab[0] + _(' and') + tab[1]
             elif len(tab) == 3:
-                warn += ' ' + tab[0] + ', ' + tab[1] + ' and ' +  tab[2]
+                warn += tab[0] + ', ' + tab[1] + _(' and') +  tab[2]
         if warn:
-            warn += ' goods products, please refer to the appropriate procedures'
+            warn += _(' goods products, please refer to the appropriate procedures')
         return warn
 
     def getQtyPO(self,line):
         # line amount from the PO, always the same on all INs for a given PO
-        val = line.product_qty
+        val = 0
+        if line.state in ('assigned', 'confirmed', 'done'):
+            val = line.product_qty
         return "{0:.2f}".format(val)
 
     def getQtyBO(self,line,o):
-        # Back Order amount = PO amount - all receipts
-
-        # get PO qty
-        initial_qty = line.product_qty
-        # get received qty (current and previous INs)
-        cr, uid = self.cr, self.uid
-        val = 0.00
-        stock_move_obj = self.pool.get('stock.move')
-        closed_move_ids = stock_move_obj.search(cr, uid, [('purchase_line_id','=',line.purchase_line_id.id),('state','=','done'),('type','=','in')])
-        if closed_move_ids:
-            stock_moves = stock_move_obj.browse(cr, uid, closed_move_ids)
-            if stock_moves:
-                for move in stock_moves:
-                    val = val + move.product_qty
-
-        qtyBO = initial_qty - val
-        if qtyBO <= 0:
-            qtyBO = 0
-
-        return "{0:.2f}".format(qtyBO)
+        bo_qty = 0
+        if line.state in ('assigned', 'shipped', 'confirmed'):
+            bo_qty = line.product_qty
+
+        return "{0:.2f}".format(bo_qty)
 
     def getQtyIS(self, line, o):
         # Amount received in this IN only
         # REF-96: Don't count the shipped available IN
 
-        if line.state in ('cancel') or o.state in ('cancel'):
+        val = 0
+        if line.state == 'done':
+            val = line.product_qty
+        elif line.state in ('cancel') or o.state in ('cancel'):
             return '0' # US_275 Return 0 for cancel lines
-        elif o.state in ('assigned', 'shipped'):
-            val = 0
-        else:
-            val = line.product_qty
 
         if val == 0:
             return ' ' # display blank instead 0

=== modified file 'bin/addons/msf_profile/i18n/fr_MF.po'
--- bin/addons/msf_profile/i18n/fr_MF.po	2018-08-22 15:47:29 +0000
+++ bin/addons/msf_profile/i18n/fr_MF.po	2018-09-05 07:53:26 +0000
@@ -90065,7 +90065,7 @@
 #: code:addons/msf_tools/automated_import_job.py:414
 #, python-format
 msgid " and "
-msgstr " and "
+msgstr " et "
 
 #. module: register_accounting
 #: report:addons/register_accounting/report/cheque_inventory_xls.mako:132
@@ -101829,3 +101829,34 @@
 #, python-format
 msgid "FP date"
 msgstr "Date du FP"
+
+#. module: msf_printed_documents
+#: code:addons/msf_printed_documents/report/report_reception.py:80
+#, python-format
+msgid "You are about to receive"
+msgstr "Vous êtes sur le point de recevoir des marchandises"
+
+#. module: msf_printed_documents
+#: code:addons/msf_printed_documents/report/report_reception.py:82
+#, python-format
+msgid " heat sensitive"
+msgstr " sensibles à la chaleur"
+
+#. module: msf_printed_documents
+#: code:addons/msf_printed_documents/report/report_reception.py:89
+#: code:addons/msf_printed_documents/report/report_reception.py:91
+#, python-format
+msgid " and"
+msgstr " et"
+
+#. module: msf_printed_documents
+#: code:addons/msf_printed_documents/report/report_reception.py:84
+#, python-format
+msgid " dangerous"
+msgstr " dangeureuses"
+
+#. module: msf_printed_documents
+#: code:addons/msf_printed_documents/report/report_reception.py:93
+#, python-format
+msgid " goods products, please refer to the appropriate procedures"
+msgstr " veuillez vous référer aux procédures adéquates."

=== modified file 'bin/addons/msf_tools/automated_import_job.py'
--- bin/addons/msf_tools/automated_import_job.py	2018-07-18 08:34:06 +0000
+++ bin/addons/msf_tools/automated_import_job.py	2018-09-05 07:53:26 +0000
@@ -401,7 +401,12 @@
                         line_message = _('Line %s: ') % resjected_line[0]
                         line_message += resjected_line[2]
                         error_message.append(line_message)
-                self.infolog(cr, uid, _('%s :: Import job done with %s records processed and %s rejected') % (job.import_id.name, len(processed), len(rejected)))
+
+                if context.get('rejected_confirmation'):
+                    nb_rejected += context.get('rejected_confirmation')
+                    state = 'error'
+
+                self.infolog(cr, uid, _('%s :: Import job done with %s records processed and %s rejected') % (job.import_id.name, len(processed), nb_rejected))
 
                 if job.import_id.function_id.model_id.model == 'purchase.order':
                     po_id = self.pool.get('purchase.order').get_po_id_from_file(cr, uid, oldest_file, context=context)

=== modified file 'bin/addons/purchase/purchase_order.py'
--- bin/addons/purchase/purchase_order.py	2018-08-08 08:13:10 +0000
+++ bin/addons/purchase/purchase_order.py	2018-09-05 07:53:26 +0000
@@ -115,6 +115,14 @@
                     purchase.order_type in ['donation_exp', 'donation_st', 'loan', 'in_kind']):
                 res[purchase.id] = purchase.shipped_rate
             else:
+                # if all PO lines have been invoiced and the SI aren't in Draft anymore: invoiced rate must be 100%
+                # (event if some SI amounts have been lowered)
+                po_states = ['done']
+                if purchase.order_type == 'direct':  # DPO use case: CV and SI are both created at DPO confirmation
+                    po_states = ['confirmed', 'confirmed_p', 'done']
+                if purchase.state in po_states and all(x.state != 'draft' for x in purchase.invoice_ids):
+                    res[purchase.id] = 100.0
+                    continue
                 tot = 0.0
                 # UTP-808: Deleted invoices amount should be taken in this process. So what we do:
                 # 1/ Take all closed stock picking linked to the purchase

=== modified file 'bin/addons/purchase/purchase_view.xml'
--- bin/addons/purchase/purchase_view.xml	2018-08-17 15:15:35 +0000
+++ bin/addons/purchase/purchase_view.xml	2018-09-05 07:53:26 +0000
@@ -188,16 +188,16 @@
                                 <field name="origin" readonly="1" widget="char"/>
                                 <field name="internal_type" string="Zone"/>
                                 <field name="customer_ref" widget="char"/>
-                                <group colspan="2" col="3">
-                                    <field name="stock_take_date" attrs="{'readonly': [('state', 'not in', ['draft', 'draft_p', 'validated'])]}" />
-                                    <button colspan="1" name="update_date" string="Update Lines" type="object" context="{'field_name': 'stock_take', 'type': 'purchase.order'}" icon="gtk-indent" attrs="{'invisible': [('state', 'not in', ['draft', 'draft_p', 'validated'])]}"/>
-                                </group>
+                                <field name="from_address" domain="[('partner_id', '=', company_id)]" attrs="{'readonly': [('state', 'not in', ['draft', 'draft_p', 'validated'])]}"/>
                                 <group colspan="2" col="3">
                                     <field name="no_line" invisible="1"/>
                                     <field name="pricelist_id" string="Currency" colspan="2" attrs="{'readonly': [('state', 'not in', ['draft', 'draft_p', 'validated'])]}" domain="[('type', '=', 'purchase'), ('in_search', '=', partner_type)]"/>
                                     <button name="change_currency" string="Change currency" icon="terp-dolar" type="object" attrs="{'invisible': [('state', 'not in', ['draft', 'draft_p', 'validated'])]}"/>
                                 </group>
-                                <field name="from_address" domain="[('partner_id', '=', company_id)]" attrs="{'readonly': [('state', 'not in', ['draft', 'draft_p', 'validated'])]}"/>
+                                <group colspan="2" col="3">
+                                    <field name="stock_take_date" attrs="{'readonly': [('state', 'not in', ['draft', 'draft_p', 'validated'])]}" />
+                                    <button colspan="1" name="update_date" string="Update Lines" type="object" context="{'field_name': 'stock_take', 'type': 'purchase.order'}" icon="gtk-indent" attrs="{'invisible': [('state', 'not in', ['draft', 'draft_p', 'validated'])]}"/>
+                                </group>
                                 <button colspan="4" string="Round Qty to SoQ" type="object" name="round_to_soq" icon="gtk-execute" attrs="{'invisible': [('state', '!=', 'draft')]}"/>
                             </group>
                             <group name="import" string=" Import Lines " colspan="1" col="4" attrs="{'invisible':[('state', '!=', 'draft')]}">

=== modified file 'bin/addons/purchase/wizard/purchase_line_cancel.py'
--- bin/addons/purchase/wizard/purchase_line_cancel.py	2018-04-20 08:38:08 +0000
+++ bin/addons/purchase/wizard/purchase_line_cancel.py	2018-09-05 07:53:26 +0000
@@ -42,6 +42,7 @@
             ids = [ids]
 
         pol_obj = self.pool.get('purchase.order.line')
+        po_obj = self.pool.get('purchase.order')
         wf_service = netsvc.LocalService("workflow")
 
         # cancel line:
@@ -57,6 +58,10 @@
                     and p_order.partner_type == 'external' and p_order.state == 'confirmed':
                 pol_obj.create_counterpart_fo_for_external_partner_po(cr, uid, p_order, context=context)
 
+            # check if the related CV should be set to Done
+            if p_order:
+                po_obj.check_close_cv(cr, uid, p_order.id, context=context)
+
         return {'type': 'ir.actions.act_window_close'}
 
     def cancel_only_pol(self, cr, uid, ids, context=None):

=== modified file 'bin/addons/purchase_override/purchase.py'
--- bin/addons/purchase_override/purchase.py	2018-04-20 14:37:59 +0000
+++ bin/addons/purchase_override/purchase.py	2018-09-05 07:53:26 +0000
@@ -433,6 +433,9 @@
                     if resource and pol.linked_sol_id:
                         signal = 'cancel_r'
                     wf_service.trg_validate(uid, 'purchase.order.line', pol.id, signal, cr)
+            # check if the related CV should be set to Done
+            if po:
+                self.pool.get('purchase.order').check_close_cv(cr, uid, po.id, context=context)
 
         return {'type': 'ir.actions.act_window_close'}
 

=== modified file 'bin/addons/purchase_override/report/merged_order.rml'
--- bin/addons/purchase_override/report/merged_order.rml	2018-08-20 15:39:49 +0000
+++ bin/addons/purchase_override/report/merged_order.rml	2018-09-05 07:53:26 +0000
@@ -28,6 +28,9 @@
         <blockTableStyle id="OrderInformations">
             <blockAlignment value="LEFT" />
             <blockVAlign value="MIDDLE" />
+             <blockLeading length="0" />
+             <blockBottomPadding length="1" />
+             <blockTopPadding length="1" />
             <lineStyle kind="OUTLINE" colorName="black" start="0,0" stop="0,-1" thickness="0.5" />
             <lineStyle kind="OUTLINE" colorName="black" start="2,0" stop="2,-1" thickness="0.5" />
             <lineStyle kind="OUTLINE" colorName="black" start="4,0" stop="4,-1" thickness="0.5" />
@@ -80,8 +83,9 @@
         <paraStyle name="Header_9" fontName="Helvetica-Bold" fontSize="8.0" leading="15" alignment="LEFT" spaceBefore="0.0" spaceAfter="3.0" />
         <paraStyle name="HeaderBlue" textColor="blue" fontName="Helvetica-Bold" fontSize="13.0" leading="15" alignment="LEFT" spaceBefore="0.0" spaceAfter="35.0" />
 		<!-- Information font style -->
-        <paraStyle name="TextInformation" fontName="Helvetica" fontSize="7.0" alignment="LEFT" leading="7.0" spaceBefore="1.0" spaceAfter="1.0" />
-        <paraStyle name="TextInformationMail" fontName="Helvetica" fontSize="7.0" alignment="LEFT" leading="7.0" spaceBefore="1.0" spaceAfter="1.0" />
+        <paraStyle name="TextInformationH" fontName="Helvetica" fontSize="7.0" alignment="LEFT" leading="3.0" spaceBefore="0" spaceAfter="0" />
+        <paraStyle name="TextInformation" fontName="Helvetica" fontSize="7.0" alignment="LEFT" leading="7.0" spaceBefore="0" spaceAfter="0" />
+        <paraStyle name="TextInformationMail" fontName="Helvetica" fontSize="7.0" alignment="LEFT" leading="7.0" spaceBefore="0" spaceAfter="0" />
         <paraStyle name="TextRemarks" fontName="Helvetica" fontSize="7.0" alignment="LEFT" leading="15.0" spaceBefore="1.0" spaceAfter="1.0" />
         <!-- Lines font style -->
         <paraStyle name="Lines" fontName="Helvetica" fontSize="7.0" alignment="LEFT" leading="7.0" />
@@ -95,36 +99,36 @@
         <blockTable colWidths="90.0,600.0,100.0" style="Origin">
             <tr>
                 <td>
-                    <para style="TextInformation">Source Document :</para>
-                </td>
-                <td>
-                    <para style="TextInformation">[[ getOrigin(objects[0].origin, 5)[0] ]]</para>
-                </td>
-                <td>
-                    <para style="TextInformation"> </para>
+                    <para style="TextInformationH">Source Document :</para>
+                </td>
+                <td>
+                    <para style="TextInformationH">[[ getOrigin(objects[0].origin, 5)[0] ]]</para>
+                </td>
+                <td>
+                    <para style="TextInformationH"> </para>
                 </td>
             </tr>
             <tr>
                 <td>
-                    <para style="TextInformation">Customer reference :</para>
-                </td>
-                <td>
-                    <para style="TextInformation">[[ objects[0].customer_ref ]]</para>
-                </td>
-                <td>
-                    <para style="TextInformation"> </para>
+                    <para style="TextInformationH">Customer reference :</para>
+                </td>
+                <td>
+                    <para style="TextInformationH">[[ objects[0].customer_ref ]]</para>
+                </td>
+                <td>
+                    <para style="TextInformationH"> </para>
                 </td>
             </tr>
             <tr>
                 [[ repeatIn(getOrigin(objects[0].origin, 5)[1:], 'orig') ]]
                 <td>
-                    <para style="TextInformation"> </para>
-                </td>
-                <td>
-                    <para style="TextInformation">[[ orig ]]</para>
-                </td>
-                <td>
-                    <para style="TextInformation"> </para>
+                    <para style="TextInformationH"> </para>
+                </td>
+                <td>
+                    <para style="TextInformationH">[[ orig ]]</para>
+                </td>
+                <td>
+                    <para style="TextInformationH"> </para>
                 </td>
             </tr>
             <tr>

=== modified file 'bin/addons/purchase_override/report/purchase_order.rml'
--- bin/addons/purchase_override/report/purchase_order.rml	2018-08-20 15:39:49 +0000
+++ bin/addons/purchase_override/report/purchase_order.rml	2018-09-05 07:53:26 +0000
@@ -29,6 +29,9 @@
         <blockTableStyle id="OrderInformations">
             <blockAlignment value="LEFT" />
             <blockVAlign value="MIDDLE" />
+            <blockLeading length="0" />
+            <blockBottomPadding length="1" />
+            <blockTopPadding length="1" />
             <lineStyle kind="OUTLINE" colorName="black" start="0,0" stop="0,-1" thickness="0.5" />
             <lineStyle kind="OUTLINE" colorName="black" start="2,0" stop="2,-1" thickness="0.5" />
             <lineStyle kind="OUTLINE" colorName="black" start="4,0" stop="4,-1" thickness="0.5" />
@@ -81,8 +84,10 @@
         <paraStyle name="Header_9" fontName="Helvetica-Bold" fontSize="8.0" leading="15" alignment="LEFT" spaceBefore="0.0" spaceAfter="3.0" />
         <paraStyle name="HeaderBlue" textColor="blue" fontName="Helvetica-Bold" fontSize="13.0" leading="15" alignment="LEFT" spaceBefore="0.0" spaceAfter="35.0" />
 		<!-- Information font style -->
-        <paraStyle name="TextInformation" fontName="Helvetica" fontSize="7.0" alignment="LEFT" leading="7.0" spaceBefore="1.0" spaceAfter="1.0" />
-        <paraStyle name="TextInformationMail" fontName="Helvetica" fontSize="7.0" alignment="LEFT" leading="7.0" spaceBefore="1.0" spaceAfter="1.0" />
+        <paraStyle name="TextInformationH" fontName="Helvetica" fontSize="7.0" alignment="LEFT" leading="3.0" spaceBefore="1" spaceAfter="1" />
+        <paraStyle name="TextInformation" fontName="Helvetica" fontSize="7.0" alignment="LEFT" leading="7.0" spaceBefore="0" spaceAfter="0" />
+        <paraStyle name="TextInformation1" fontName="Helvetica" fontSize="1.0" alignment="LEFT" leading="1.0" spaceBefore="0" spaceAfter="0" />
+        <paraStyle name="TextInformationMail" fontName="Helvetica" fontSize="7.0" alignment="LEFT" leading="7.0" spaceBefore="0" spaceAfter="0" />
         <paraStyle name="TextRemarks" fontName="Helvetica" fontSize="7.0" alignment="LEFT" leading="15.0" spaceBefore="1.0" spaceAfter="1.0" />
         <!-- Lines font style -->
         <paraStyle name="Lines" fontName="Helvetica" fontSize="7.0" alignment="LEFT" leading="7.0" />
@@ -96,36 +101,36 @@
         <blockTable colWidths="90.0,582.0,100.0" style="Origin">
             <tr>
                 <td>
-                    <para style="TextInformation">Source Document :</para>
-                </td>
-                <td>
-                    <para style="TextInformation">[[ getOrigin(objects[0].origin, 5)[0] ]]</para>
-                </td>
-                <td>
-                    <para style="TextInformation"> </para>
+                    <para style="TextInformationH">Source Document :</para>
+                </td>
+                <td>
+                    <para style="TextInformationH">[[ getOrigin(objects[0].origin, 5)[0] ]]</para>
+                </td>
+                <td>
+                    <para style="TextInformationH"> </para>
                 </td>
             </tr>
             <tr>
                 <td>
-                    <para style="TextInformation">Customer reference :</para>
-                </td>
-                <td>
-                    <para style="TextInformation">[[ objects[0].customer_ref ]]</para>
-                </td>
-                <td>
-                    <para style="TextInformation"> </para>
+                    <para style="TextInformationH">Customer reference :</para>
+                </td>
+                <td>
+                    <para style="TextInformationH">[[ objects[0].customer_ref ]]</para>
+                </td>
+                <td>
+                    <para style="TextInformationH"> </para>
                 </td>
             </tr>
             <tr>
                 [[ repeatIn(getOrigin(objects[0].origin, 5)[1:], 'orig') ]]
                 <td>
-                    <para style="TextInformation"> </para>
-                </td>
-                <td>
-                    <para style="TextInformation">[[ orig ]]</para>
-                </td>
-                <td>
-                    <para style="TextInformation"> </para>
+                    <para style="TextInformationH"> </para>
+                </td>
+                <td>
+                    <para style="TextInformationH">[[ orig ]]</para>
+                </td>
+                <td>
+                    <para style="TextInformationH"> </para>
                 </td>
             </tr>
             <tr>
@@ -141,25 +146,25 @@
                     <para style="TextInformation">Project : [[ objects[0].company_id.partner_id.name ]]</para>
                 </td>
                 <td>
-                    <para style="TextInformation"> </para>
+                    <para style="TextInformation1"> </para>
                 </td>
                 <td>
                     <para style="TextInformation"><u>From</u> :</para>
                 </td>
                 <td>
-                    <para style="TextInformation"> </para>
+                    <para style="TextInformation1"> </para>
                 </td>
                 <td>
                     <para style="TextInformation"><u>To (Supplier)</u> :</para>
                 </td>
                 <td>
-                    <para style="TextInformation"> </para>
+                    <para style="TextInformation1"> </para>
                 </td>
                 <td>
                     <para style="TextInformation"><u>Ship to</u>[[ objects[0].incoterm_id and ' (%s)' % objects[0].incoterm_id.name or '' ]] :</para>
                 </td>
                 <td>
-                    <para style="TextInformation"> </para>
+                    <para style="TextInformation1"> </para>
                 </td>
                 <td>
                     <para style="TextInformation"><u>Invoice to</u> :</para>
@@ -199,25 +204,25 @@
                     <para style="TextInformation">Category : [[ getSel(objects[0], 'categ') ]] </para>
                 </td>
                 <td>
-                    <para style="TextInformation"> </para>
+                    <para style="TextInformation1"> </para>
                 </td>
                 <td>
                     <para style="TextInformation">[[ objects[0].from_address.office_name or objects[0].from_address.partner_id.name or objects[0].partner_id.name or '' ]]</para>
                 </td>
                 <td>
-                    <para style="TextInformation"> </para>
+                    <para style="TextInformation1"> </para>
                 </td>
                 <td>
                     <parawrap style="TextInformation">[[ (objects[0].partner_address_id.office_name or objects[0].partner_address_id.partner_id.name or objects[0].partner_id.name or '')[0:100] ]]</parawrap>
                 </td>
                 <td>
-                    <para style="TextInformation"> </para>
+                    <para style="TextInformation1"> </para>
                 </td>
                 <td>
                     <para style="TextInformation">[[ objects[0].dest_address_id.office_name or objects[0].dest_address_id.partner_id.name or objects[0].partner_id.name ]]</para>
                 </td>
                 <td>
-                    <para style="TextInformation"> </para>
+                    <para style="TextInformation1"> </para>
                 </td>
                 <td>
                     <para style="TextInformation">[[ objects[0].invoice_address_id.office_name or objects[0].invoice_address_id.partner_id.name or objects[0].company_id.partner_id.name ]] </para>
@@ -228,25 +233,25 @@
                     <para style="TextInformation">Total Lines : [[ len([x for x in objects[0].order_line if x.state not in ('cancel', 'cancel_r')]) ]]</para>
                 </td>
                 <td>
-                    <para style="TextInformation"> </para>
+                    <para style="TextInformation1"> </para>
                 </td>
                 <td>
                     <para style="TextInformation">[[ objects[0].from_address and objects[0].from_address.street or '' ]]</para>
                 </td>
                 <td>
-                    <para style="TextInformation"> </para>
+                    <para style="TextInformation1"> </para>
                 </td>
                 <td>
                     <para style="TextInformation">[[ objects[0].partner_address_id.street ]]</para>
                 </td>
                 <td>
-                    <para style="TextInformation"> </para>
+                    <para style="TextInformation1"> </para>
                 </td>
                 <td>
                     <para style="TextInformation">[[ objects[0].dest_address_id.street ]]</para>
                 </td>
                 <td>
-                    <para style="TextInformation"> </para>
+                    <para style="TextInformation1"> </para>
                 </td>
                 <td>
                     <para style="TextInformation">[[ objects[0].invoice_address_id.street ]]</para>
@@ -257,25 +262,25 @@
                     <para style="TextInformation">Transport mode : [[ getSel(objects[0], 'transport_type') ]]</para>
                 </td>
                 <td>
-                    <para style="TextInformation"> </para>
+                    <para style="TextInformation1"> </para>
                 </td>
                 <td>
                     <para style="TextInformation">[[ objects[0].from_address and objects[0].from_address.street2 or '' ]]</para>
                 </td>
                 <td>
-                    <para style="TextInformation"> </para>
+                    <para style="TextInformation1"> </para>
                 </td>
                 <td>
                     <para style="TextInformation">[[ objects[0].partner_address_id.street2 ]]</para>
                 </td>
                 <td>
-                    <para style="TextInformation"> </para>
+                    <para style="TextInformation1"> </para>
                 </td>
                 <td>
                     <para style="TextInformation">[[ objects[0].dest_address_id.street2 ]]</para>
                 </td>
                 <td>
-                    <para style="TextInformation"> </para>
+                    <para style="TextInformation1"> </para>
                 </td>
                 <td>
                     <para style="TextInformation">[[ objects[0].invoice_address_id.street2 ]]</para>
@@ -286,25 +291,25 @@
                     <para style="TextInformation">Priority : [[ getSel(objects[0], 'priority') ]]</para>
                 </td>
                 <td>
-                    <para style="TextInformation"> </para>
+                    <para style="TextInformation1"> </para>
                 </td>
                 <td>
                     <para style="TextInformation">[[ objects[0].from_address and objects[0].from_address.zip or '' ]] [[ objects[0].from_address and objects[0].from_address.city or '' ]]</para>
                 </td>
                 <td>
-                    <para style="TextInformation"> </para>
+                    <para style="TextInformation1"> </para>
                 </td>
                 <td>
                     <para style="TextInformation">[[ objects[0].partner_address_id.zip ]] [[ objects[0].partner_address_id.city ]]</para>
                 </td>
                 <td>
-                    <para style="TextInformation"> </para>
+                    <para style="TextInformation1"> </para>
                 </td>
                 <td>
                     <para style="TextInformation">[[ objects[0].dest_address_id.zip ]] [[ objects[0].dest_address_id.city ]]</para>
                 </td>
                 <td>
-                    <para style="TextInformation"> </para>
+                    <para style="TextInformation1"> </para>
                 </td>
                 <td>
                     <para style="TextInformation">[[ objects[0].invoice_address_id.zip ]] [[ objects[0].invoice_address_id.city ]]</para>
@@ -315,25 +320,25 @@
                     <para style="TextInformation"> </para>
                 </td>
                 <td>
-                    <para style="TextInformation"> </para>
+                    <para style="TextInformation1"> </para>
                 </td>
                 <td>
                     <para style="TextInformation">[[ objects[0].from_address and objects[0].from_address.country_id and objects[0].from_address.country_id.name or '' ]]</para>
                 </td>
                 <td>
-                    <para style="TextInformation"> </para>
+                    <para style="TextInformation1"> </para>
                 </td>
                 <td>
                     <para style="TextInformation">[[ objects[0].partner_address_id.country_id.name or '' ]]</para>
                 </td>
                 <td>
-                    <para style="TextInformation"> </para>
+                    <para style="TextInformation1"> </para>
                 </td>
                 <td>
                     <para style="TextInformation">[[ objects[0].dest_address_id.country_id and objects[0].dest_address_id.country_id.name or '' ]]</para>
                 </td>
                 <td>
-                    <para style="TextInformation"> </para>
+                    <para style="TextInformation1"> </para>
                 </td>
                 <td>
                     <para style="TextInformation">[[ objects[0].invoice_address_id.country_id and objects[0].invoice_address_id.country_id.name or '' ]]</para>
@@ -344,25 +349,25 @@
                     <para style="TextInformation">Goods value : [[ objects[0].amount_untaxed or '0.00' ]]</para>
                 </td>
                 <td>
-                    <para style="TextInformation"> </para>
+                    <para style="TextInformation1"> </para>
                 </td>
                 <td>
                     <para style="TextInformation">[[ objects[0].from_address and objects[0].from_address.phone or '' ]]</para>
                 </td>
                 <td>
-                    <para style="TextInformation"> </para>
+                    <para style="TextInformation1"> </para>
                 </td>
                 <td>
                     <para style="TextInformation">[[ objects[0].partner_address_id.phone ]]</para>
                 </td>
                 <td>
-                    <para style="TextInformation"> </para>
+                    <para style="TextInformation1"> </para>
                 </td>
                 <td>
                     <para style="TextInformation">[[ objects[0].dest_address_id.phone ]]</para>
                 </td>
                 <td>
-                    <para style="TextInformation"> </para>
+                    <para style="TextInformation1"> </para>
                 </td>
                 <td>
                     <para style="TextInformation">[[ objects[0].invoice_address_id.phone ]]</para>
@@ -373,25 +378,25 @@
                     <para style="TextInformation">Tax amount : [[ objects[0].amount_tax or '0.00' ]]</para>
                 </td>
                 <td>
-                    <para style="TextInformation"> </para>
+                    <para style="TextInformation1"> </para>
                 </td>
                 <td>
                     <parawrap style="TextInformationMail">[[ objects[0].from_address and objects[0].from_address.email or '' ]]</parawrap>
                 </td>
                 <td>
-                    <para style="TextInformation"> </para>
+                    <para style="TextInformation1"> </para>
                 </td>
                 <td>
                     <parawrap style="TextInformationMail">[[ objects[0].partner_address_id.email ]]</parawrap>
                 </td>
                 <td>
-                    <para style="TextInformation"> </para>
+                    <para style="TextInformation1"> </para>
                 </td>
                 <td>
                     <parawrap style="TextInformationMail">[[ objects[0].dest_address_id.email ]]</parawrap>
                 </td>
                 <td>
-                    <para style="TextInformation"> </para>
+                    <para style="TextInformation1"> </para>
                 </td>
                 <td>
                     <parawrap style="TextInformationMail">[[ objects[0].invoice_address_id.email ]]</parawrap>
@@ -402,28 +407,28 @@
                     <parawrap style="TextInformation">Transport cost : [[ objects[0].transport_cost or '0.00' ]]</parawrap>
                 </td>
                 <td>
-                    <para style="TextInformation"> </para>
-                </td>
-                <td>
-                    <para style="TextInformation"> </para>
-                </td>
-                <td>
-                    <para style="TextInformation"> </para>
-                </td>
-                <td>
-                    <para style="TextInformation"> </para>
-                </td>
-                <td>
-                    <para style="TextInformation"> </para>
-                </td>
-                <td>
-                    <para style="TextInformation"> </para>
-                </td>
-                <td>
-                    <para style="TextInformation"> </para>
-                </td>
-                <td>
-                    <para style="TextInformation"> </para>
+                    <para style="TextInformation1"> </para>
+                </td>
+                <td>
+                    <para style="TextInformation1"> </para>
+                </td>
+                <td>
+                    <para style="TextInformation1"> </para>
+                </td>
+                <td>
+                    <para style="TextInformation1"> </para>
+                </td>
+                <td>
+                    <para style="TextInformation1"> </para>
+                </td>
+                <td>
+                    <para style="TextInformation1"> </para>
+                </td>
+                <td>
+                    <para style="TextInformation1"> </para>
+                </td>
+                <td>
+                    <para style="TextInformation1"> </para>
                 </td>
             </tr>
             <tr>
@@ -431,28 +436,28 @@
                     <para style="TextInformation">Total cost : [[ objects[0].total_price_include_transport or '0.00' ]]</para>
                 </td>
                 <td>
-                    <para style="TextInformation"> </para>
-                </td>
-                <td>
-                    <para style="TextInformation"> </para>
-                </td>
-                <td>
-                    <para style="TextInformation"> </para>
-                </td>
-                <td>
-                    <para style="TextInformation"> </para>
-                </td>
-                <td>
-                    <para style="TextInformation"> </para>
-                </td>
-                <td>
-                    <para style="TextInformation"> </para>
-                </td>
-                <td>
-                    <para style="TextInformation"> </para>
-                </td>
-                <td>
-                    <para style="TextInformation"> </para>
+                    <para style="TextInformation1"> </para>
+                </td>
+                <td>
+                    <para style="TextInformation1"> </para>
+                </td>
+                <td>
+                    <para style="TextInformation1"> </para>
+                </td>
+                <td>
+                    <para style="TextInformation1"> </para>
+                </td>
+                <td>
+                    <para style="TextInformation1"> </para>
+                </td>
+                <td>
+                    <para style="TextInformation1"> </para>
+                </td>
+                <td>
+                    <para style="TextInformation1"> </para>
+                </td>
+                <td>
+                    <para style="TextInformation1"> </para>
                 </td>
             </tr>
             <tr>
@@ -461,28 +466,28 @@
                     <para style="TextInformation"> </para>
                 </td>
                 <td>
-                    <para style="TextInformation"> </para>
-                </td>
-                <td>
-                    <para style="TextInformation"> </para>
-                </td>
-                <td>
-                    <para style="TextInformation"> </para>
-                </td>
-                <td>
-                    <para style="TextInformation"> </para>
-                </td>
-                <td>
-                    <para style="TextInformation"> </para>
-                </td>
-                <td>
-                    <para style="TextInformation"> </para>
-                </td>
-                <td>
-                    <para style="TextInformation"> </para>
-                </td>
-                <td>
-                    <para style="TextInformation"> </para>
+                    <para style="TextInformation1"> </para>
+                </td>
+                <td>
+                    <para style="TextInformation1"> </para>
+                </td>
+                <td>
+                    <para style="TextInformation1"> </para>
+                </td>
+                <td>
+                    <para style="TextInformation1"> </para>
+                </td>
+                <td>
+                    <para style="TextInformation1"> </para>
+                </td>
+                <td>
+                    <para style="TextInformation1"> </para>
+                </td>
+                <td>
+                    <para style="TextInformation1"> </para>
+                </td>
+                <td>
+                    <para style="TextInformation1"> </para>
                 </td>
             </tr>
             <tr>
@@ -490,25 +495,25 @@
                     <para style="TextInformation">Confirmed delivery date : </para>
                 </td>
                 <td>
-                    <para style="TextInformation"> </para>
+                    <para style="TextInformation1"> </para>
                 </td>
                 <td>
                     <para style="TextInformation">Date sent : </para>
                 </td>
                 <td>
-                    <para style="TextInformation"> </para>
+                    <para style="TextInformation1"> </para>
                 </td>
                 <td>
                     <para style="TextInformation">Date received : </para>
                 </td>
                 <td>
-                    <para style="TextInformation"> </para>
+                    <para style="TextInformation1"> </para>
                 </td>
                 <td>
                     <para style="TextInformation">Requested delivery date : </para>
                 </td>
                 <td>
-                    <para style="TextInformation"> </para>
+                    <para style="TextInformation1"> </para>
                 </td>
                 <td>
                     <para style="TextInformation">Dated before :</para>
@@ -517,33 +522,30 @@
             <tr>
                 <td>
                     <para style="TextInformation">[[ to_time(objects[0].delivery_confirmed_date) ]]</para>
-                    <para style="TextInformation"> </para>
-                </td>
-                <td>
-                    <para style="TextInformation"> </para>
-                </td>
-                <td>
-                	<para style="TextInformation">[[ to_time(objects[0].date_confirm) ]]</para>
-                    <para style="TextInformation"> </para>
-                </td>
-                <td>
-                    <para style="TextInformation"> </para>
-                </td>
-                <td>
-                    <para style="TextInformation"> </para>
-                </td>
-                <td>
-                    <para style="TextInformation"> </para>
+                </td>
+                <td>
+                    <para style="TextInformation1"> </para>
+                </td>
+                <td>
+                    <para style="TextInformation">[[ to_time(objects[0].date_confirm) ]]</para>
+                </td>
+                <td>
+                    <para style="TextInformation1"> </para>
+                </td>
+                <td>
+                    <para style="TextInformation1"> </para>
+                </td>
+                <td>
+                    <para style="TextInformation1"> </para>
                 </td>
                 <td>
                     <para style="TextInformation">[[ to_time(objects[0].delivery_requested_date) ]]</para>
-                    <para style="TextInformation"> </para>
-                </td>
-                <td>
-                    <para style="TextInformation"> </para>
-                </td>
-                <td>
-                    <para style="TextInformation"> </para>
+                </td>
+                <td>
+                    <para style="TextInformation1"> </para>
+                </td>
+                <td>
+                    <para style="TextInformation1"> </para>
                 </td>
             </tr>
         </blockTable>

=== modified file 'bin/addons/register_accounting/account_bank_statement.py'
--- bin/addons/register_accounting/account_bank_statement.py	2018-07-17 12:20:07 +0000
+++ bin/addons/register_accounting/account_bank_statement.py	2018-09-05 07:53:26 +0000
@@ -1910,7 +1910,7 @@
         process_invoice_move_line_ids = []
         total_payment = True
         diff = st_line.first_move_line_id.amount_currency - total_amount
-        if abs(diff) > 0.001:
+        if len(st_line.imported_invoice_line_ids) > 1 and abs(diff) > 0.001:
             # multi unpartial payment
             total_payment = False
             # Delete them

=== modified file 'bin/addons/register_accounting/report/report_fully_report.py'
--- bin/addons/register_accounting/report/report_fully_report.py	2018-06-15 09:18:20 +0000
+++ bin/addons/register_accounting/report/report_fully_report.py	2018-09-05 07:53:26 +0000
@@ -260,6 +260,15 @@
             color = 'red'
         return color
 
-
-SpreadsheetReport('report.fully.report','account.bank.statement','addons/register_accounting/report/fully_report_xls.mako', parser=report_fully_report)
+class SpreadsheetReportX(SpreadsheetReport):
+    def create(self, cr, uid, ids, data, context=None):
+        if not context:
+            context = {}
+        context['pathit'] = True
+        return super(SpreadsheetReportX, self).create(cr, uid, ids, data, context=context)
+
+
+
+
+SpreadsheetReportX('report.fully.report','account.bank.statement','addons/register_accounting/report/fully_report_xls.mako', parser=report_fully_report)
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== modified file 'bin/addons/res_currency_functional/account_move_compute_currency.py'
--- bin/addons/res_currency_functional/account_move_compute_currency.py	2017-12-21 16:34:38 +0000
+++ bin/addons/res_currency_functional/account_move_compute_currency.py	2018-09-05 07:53:26 +0000
@@ -164,14 +164,18 @@
             amount_currency = 0
             sorted_line_ids = move.line_id
             sorted_line_ids.sort(key=lambda x: abs(x.debit - x.credit), reverse=True)
+            all_line_zero_func = True
             for line in sorted_line_ids:
                 amount += line.debit - line.credit
+                if all_line_zero_func:
+                    # because of high fx rate, funct. amount could be 0 on all lines, we must not consider this case as func balanced
+                    all_line_zero_func = abs(line.debit - line.credit) < 10**-4
                 amount_currency += line.amount_currency
 
             if move.period_id and not move.period_id.is_system \
                     and len(sorted_line_ids) > 2:
-                if abs(amount_currency) > 10 ** -4 and abs(amount) < 10 ** -4:
-                    # The move is balanced, but there is a difference in the converted amounts;
+                if not all_line_zero_func and abs(amount_currency) > 10 ** -4 and abs(amount) < 10 ** -4:
+                    # The move is func. balanced, but there is a difference in the converted amounts;
                     # the second-biggest move line is modified accordingly
                     line_to_be_balanced = self._sub_sort_by_xmlid(cr, uid, sorted_line_ids)
                     amount_currency = line_to_be_balanced.amount_currency - amount_currency
@@ -189,7 +193,7 @@
                     if line_to_be_balanced.reconcile_id:
                         reconcile[line_to_be_balanced.reconcile_id.id] = 1
                 elif abs(amount) > 10 ** -4 and abs(amount_currency) < 10 ** -4:
-                    # The move is balanced, but there is a difference in the converted amounts;
+                    # The move is book. balanced, but there is a difference in the converted amounts;
                     # the second-biggest move line is modified accordingly
                     line_to_be_balanced = self._sub_sort_by_xmlid(cr, uid, sorted_line_ids)
                     amount = line_to_be_balanced.debit - line_to_be_balanced.credit - amount

=== modified file 'bin/addons/spreadsheet_xml/spreadsheet_xml_write.py'
--- bin/addons/spreadsheet_xml/spreadsheet_xml_write.py	2017-10-09 21:06:10 +0000
+++ bin/addons/spreadsheet_xml/spreadsheet_xml_write.py	2018-09-05 07:53:26 +0000
@@ -2,6 +2,7 @@
 
 from tools.translate import _
 from tools.misc import file_open
+from tools.misc import Path
 from osv import osv
 from report_webkit.webkit_report import WebKitParser
 from report import report_sxw
@@ -126,6 +127,10 @@
             os.unlink(tmpname)
             return (out, 'zip')
 
+        if context.get('pathit'):
+            os.close(null)
+            return (Path(tmpname, delete=True), 'xls')
+
         out = file(tmpname, 'rb').read()
         os.close(null)
         os.unlink(tmpname)

=== modified file 'bin/addons/stock/physical_inventory.py'
--- bin/addons/stock/physical_inventory.py	2018-07-05 08:44:50 +0000
+++ bin/addons/stock/physical_inventory.py	2018-09-05 07:53:26 +0000
@@ -1457,19 +1457,21 @@
         r = super(PhysicalInventoryDiscrepancy, self).write(cr, uid, ids, vals, context=context)
         move_obj = self.pool.get("stock.move")
 
-        lines = self.read(cr, uid, ids, ["move_id", "comment"], context=context)
+        lines = self.read(cr, uid, ids, ["move_id"], context=context)
 
         for line in lines:
             if not line["move_id"]:
                 continue
             reason_type_id = vals.get("reason_type_id", False)
-            comment = vals.get("comment", False)
             to_update = {}
             if reason_type_id:
                 to_update["reason_type_id"] = reason_type_id
-            if comment:
-                to_update["comment"] = comment
+            if 'comment' in vals:
+                to_update["comment"] = vals['comment']
+
             if to_update:
+                if '__last_update' in context:
+                    context['__last_update'] = {}
                 move_obj.write(cr, uid, [line["move_id"]], to_update, context=context)
 
         return r