=== modified file 'point_of_sale/pos_view.xml'
--- point_of_sale/pos_view.xml	2010-10-17 11:59:01 +0000
+++ point_of_sale/pos_view.xml	2010-10-26 07:40:38 +0000
@@ -49,7 +49,8 @@
 
                             <separator colspan="4"/>
                             <group colspan="4" col="6">
-                                <field name="state" />
+                            	<field name="state" />
+                            	<button name="%(pos_add_product)d" string="Add product" type="action" icon="gtk-ok" states="draft"/>
                                 <button name="%(action_pos_payment)d" string="Make Payment" icon="terp-dolar" type="action" states="draft,advance" />
                                 <button name="%(action_report_pos_receipt)d" string="Reprint" icon="gtk-print" type="action" states="paid,done,invoiced"/>
                                 <button name="set_to_draft" string="Set to draft" states="paid" icon="gtk-execute" type="object" />

=== modified file 'point_of_sale/wizard/pos_payment.xml'
--- point_of_sale/wizard/pos_payment.xml	2010-10-15 06:18:37 +0000
+++ point_of_sale/wizard/pos_payment.xml	2010-10-26 06:41:36 +0000
@@ -53,6 +53,14 @@
             <field name="view_mode">form</field>
             <field name="target">new</field>
         </record>
+        <record id="pos_add_product" model="ir.actions.act_window">
+            <field name="name">Add Product</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">pos.add.product</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="target">new</field>
+        </record>
 	</data>
 </openerp>
 

=== modified file 'point_of_sale/wizard/pos_return.py'
--- point_of_sale/wizard/pos_return.py	2010-10-15 13:26:40 +0000
+++ point_of_sale/wizard/pos_return.py	2010-10-26 07:24:21 +0000
@@ -340,8 +340,10 @@
         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,[])
-        data=return_boj.read(cr,uid,return_id,[])[0]
+        return_id = return_boj.search(cr,uid,[])
+        data = {}
+        if return_id:
+            data = return_boj.read(cr,uid,return_id,[])[0]
         wf_service = netsvc.LocalService("workflow")
         self_data = self.read(cr, uid, ids)[0]
         order_obj.add_product(cr, uid, active_ids[0], self_data['product_id'], self_data['quantity'], context=context)