Merge branch 'approval_retur_picking' into production

# Conflicts:
#	indoteknik_custom/models/requisition.py
#	indoteknik_custom/views/requisition.xml

1 files changed, 3 insertions, 3 deletions

diff --git a/indoteknik_custom/models/requisition.py b/indoteknik_custom/models/requisition.py
index 3d9ca876..8ebdd31b 100644
--- a/indoteknik_custom/models/requisition.py
+++ b/indoteknik_custom/models/requisition.py
@@ -70,9 +70,9 @@ class Requisition(models.Model):
 
     def create_po_from_requisition(self):
         if not self.sales_approve:
-            raise UserError('Harus di Approve Vita')
+            raise UserError('Harus Di Approve oleh Vita')
         if not self.merchandise_approve:
-            raise UserError('Harus di Approve Darren')
+            raise UserError('Harus Di Approve oleh Darren')
         if not self.requisition_lines:
             raise UserError('Tidak ada Lines, belum bisa create PO')
         if self.is_po:
@@ -145,7 +145,7 @@ class Requisition(models.Model):
                     'product_id': product.id,
                     'product_qty': line.qty_purchase,
                     'product_uom_qty': line.qty_purchase,
-                    'name': product.name,
+                    'name': product.display_name,
                     'price_unit': line.price_unit,
                     'taxes_id': tax,
                 }