diff --git a/addons/mrp_repair/report/order.rml b/addons/mrp_repair/report/order.rml
index 1b0cbe99d4a..e0f89a14b73 100644
--- a/addons/mrp_repair/report/order.rml
+++ b/addons/mrp_repair/report/order.rml
@@ -256,7 +256,7 @@
           <para style="P16">[[ o.product_id.name or '' ]]</para>
         </td>
         <td>
-          <para style="P16">[[ ' ' ]]</para>, <!-- TODO: NO prodlot_id on mrp_repair anymore, Once move_id will be replaced with quant_id everywhere this will fetch lot like o.quant_id.move_id.name  --> 
+          <para style="P16">[[ o.prodlot_id.name or ' ' ]]</para> 
         </td>
         <td>
           <para style="P16">[[ formatLang(o.guarantee_limit,date = True) ]]</para>
diff --git a/addons/point_of_sale/point_of_sale.py b/addons/point_of_sale/point_of_sale.py
index 4f216106f28..4767d90f188 100644
--- a/addons/point_of_sale/point_of_sale.py
+++ b/addons/point_of_sale/point_of_sale.py
@@ -714,6 +714,7 @@ class pos_order(osv.osv):
                 'company_id': order.company_id.id,
                 'move_type': 'direct',
                 'note': order.note or "",
+                'invoice_state': 'none',
             }, context=context)
             self.write(cr, uid, [order.id], {'picking_id': picking_id}, context=context)
             location_id = picking_type.default_location_src_id.id
diff --git a/addons/purchase/purchase.py b/addons/purchase/purchase.py
index 41d946ba671..84c915bd130 100644
--- a/addons/purchase/purchase.py
+++ b/addons/purchase/purchase.py
@@ -672,6 +672,7 @@ class purchase_order(osv.osv):
             'origin': order.name + ((order.origin and (':' + order.origin)) or ''),
             'date': self.date_to_datetime(cr, uid, order.date_order, context),
             'partner_id': order.dest_address_id.id or order.partner_id.id,
+            'invoice_state': '2binvoiced' if order.invoice_method == 'picking' else 'none',
             'partner_id': order.dest_address_id.id or order.partner_id.id,
             'purchase_id': order.id,
             'company_id': order.company_id.id,
diff --git a/addons/stock_invoice_directly/test/stock_invoice_directly.yml b/addons/stock_invoice_directly/test/stock_invoice_directly.yml
index a061e41c095..5e2daaccf4f 100644
--- a/addons/stock_invoice_directly/test/stock_invoice_directly.yml
+++ b/addons/stock_invoice_directly/test/stock_invoice_directly.yml
@@ -6,6 +6,7 @@
 -
   !record {model: stock.picking, id: stock_picking_out0}:
     partner_id: base.res_partner_address_22
+    invoice_state: 2binvoiced
     move_lines:
       - company_id: base.main_company
         location_id: stock.stock_location_stock