diff --git a/addons/point_of_sale/__openerp__.py b/addons/point_of_sale/__openerp__.py
index ff55c06f3b6..bd6c7018ca1 100644
--- a/addons/point_of_sale/__openerp__.py
+++ b/addons/point_of_sale/__openerp__.py
@@ -76,7 +76,7 @@ Main features :
         'statement_data.xml',
     ],
     'demo_xml': ['pos_demo.xml','singer_statement_demo.xml','multi_company_stock_data.xml'],
-#    'test':['test/pos_test.yml',],
+    'test':['test/pos_test.yml',],
     'installable': True,
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/point_of_sale/test/pos_test.yml b/addons/point_of_sale/test/pos_test.yml
index 360c25b53a5..10c691e86c3 100644
--- a/addons/point_of_sale/test/pos_test.yml
+++ b/addons/point_of_sale/test/pos_test.yml
@@ -170,7 +170,6 @@
     type: cash
     view_id: account.account_journal_bank_view
     
-    
 - 
   I create property for account payable.
 - 
@@ -281,8 +280,6 @@
     list_price: 170.0
     mes_type: fixed
     name: LG Viewty Smart
-    pricelist_purchase: 'Default Purchase Pricelist (0.00) : 160.00\n'
-    pricelist_sale: 'Public Pricelist (0.00) : 170.00\n'
     procure_method: make_to_order
     property_account_expense: account_account_payable1
     property_account_income: account_account_receivable0
@@ -311,7 +308,7 @@
     seller_ids:
       - delay: 1
         name: res_partner_microlinktechnologies0
-        qty: 5.0
+        min_qty: 5.0
     supply_method: buy
     type: product
     uom_id: product.product_uom_unit
@@ -374,10 +371,12 @@
 - 
   !record {model: pos.make.payment, id: pos_make_payment_0}:
     amount: 1615.0
-    journal: 5
+    journal: 7
     payment_date: 2010-05-13
     payment_name: Payment
     product_id: product_product_hppaviliondesktoppcs0
+    pricelist_id: product.list0
+    partner_id: base.res_partner_agrolait
     
 - 
   I make the payment.
@@ -427,6 +426,9 @@
   I click on close button.
 - 
   !python {model: pos.add.product}: |
+    return_obj = self.pool.get('pos.return')
+    context['active_ids'] = [ref("pos_order_pos0")] 
+    return_obj.view_init(cr, uid, [],context=context)
     self.close_action(cr, uid, [ref("pos_add_product_0")], {"lang": "en_US", "active_model":
       "pos.order", "active_ids": [ref("pos_order_pos0")], "tz": False, "active_id": ref("pos_order_pos0"),
       })
@@ -436,10 +438,12 @@
 - 
   !record {model: pos.make.payment, id: pos_make_payment_1}:
     amount: 680.0
-    journal: 5
+    journal: 7
     payment_date: 2010-05-13
     payment_name: Payment
     product_id: product_product_hppaviliondesktoppcs0
+    pricelist_id: product.list0
+    partner_id: base.res_partner_agrolait
 
 - 
   For payment, I click on  Make Payment. 
diff --git a/addons/point_of_sale/wizard/pos_payment.py b/addons/point_of_sale/wizard/pos_payment.py
index 1b88100987c..7bd4f5e6b41 100644
--- a/addons/point_of_sale/wizard/pos_payment.py
+++ b/addons/point_of_sale/wizard/pos_payment.py
@@ -149,10 +149,11 @@ class pos_make_payment(osv.osv_memory):
         if order_obj.test_paid(cr, uid, [active_id]):
             if data['partner_id'] and invoice_wanted:
                 order_obj.action_invoice(cr, uid, [active_id], context)
+                order_obj.create_picking(cr, uid, [active_id], context)
                 if context.get('return'):
                     order_obj.write(cr, uid, [active_id],{'state':'done'})
                 else:
-                     order_obj.write(cr, uid, [active_id],{'state':'paid'})
+                    order_obj.write(cr, uid, [active_id],{'state':'paid'})
                 return self.create_invoice(cr, uid, ids, context)
             else:
                 context.update({'flag': True})
@@ -160,7 +161,7 @@ class pos_make_payment(osv.osv_memory):
                 if context.get('return'):
                     order_obj.write(cr, uid, [active_id],{'state':'done'})
                 else:
-                     order_obj.write(cr, uid, [active_id],{'state':'paid'})
+                    order_obj.write(cr, uid, [active_id],{'state':'paid'})
                 return self.print_report(cr, uid, ids, context)
         
         if order.amount_paid > 0.0:
diff --git a/addons/point_of_sale/wizard/pos_return.py b/addons/point_of_sale/wizard/pos_return.py
index 72a30daf5ec..776cb8cfb11 100644
--- a/addons/point_of_sale/wizard/pos_return.py
+++ b/addons/point_of_sale/wizard/pos_return.py
@@ -317,7 +317,7 @@ class add_product(osv.osv_memory):
         invoice_obj=self.pool.get('account.invoice')
         picking_ids = picking_obj.search(cr, uid, [('pos_order', 'in', active_ids), ('state', '=', 'done')])
         clone_list = []
-        date_cur=time.strftime('%Y-%m-%d')
+        date_cur=time.strftime('%Y-%m-%d %H:%M:%S')
         uom_obj = self.pool.get('product.uom')
         return_boj=self.pool.get('pos.return')
         return_id=return_boj.search(cr,uid,[])