From aa96975247a11b5b85cecdee0f6163cc43797f4c Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Sun, 25 Sep 2011 20:40:12 +0200
Subject: [PATCH] [IMP] pos, -u point_of_sale works better

bzr revid: fp@tinyerp.com-20110925184012-t1x14v2it65zsm0o
---
 addons/point_of_sale/test/02_order_to_invoice.yml |  1 -
 addons/point_of_sale/wizard/pos_discount.xml      | 14 +++++++-------
 addons/point_of_sale/wizard/pos_open_statement.py |  2 +-
 3 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/addons/point_of_sale/test/02_order_to_invoice.yml b/addons/point_of_sale/test/02_order_to_invoice.yml
index 535eab6999b..3436e176678 100644
--- a/addons/point_of_sale/test/02_order_to_invoice.yml
+++ b/addons/point_of_sale/test/02_order_to_invoice.yml
@@ -31,7 +31,6 @@
 -
   !python {model: pos.order}: |
     order = self.browse(cr,uid,ref('pos_order_pos1'))
-    print order.state, order.invoice_id, order.amount_total, order.amount_paid
 -
   !assert {model: pos.order, id: pos_order_pos1, string: State not correct}:
      - state == 'paid'
diff --git a/addons/point_of_sale/wizard/pos_discount.xml b/addons/point_of_sale/wizard/pos_discount.xml
index 0602d5f803e..2c5e1648702 100644
--- a/addons/point_of_sale/wizard/pos_discount.xml
+++ b/addons/point_of_sale/wizard/pos_discount.xml
@@ -9,13 +9,13 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Apply Discount">
-                    <group col="2" colspan="4">
-                        <field name="discount"/>
-                        <button icon='gtk-cancel' special="cancel"
-                            string="Close" />
-                        <button name="apply_discount" string="Apply Discount"
-                            colspan="1" type="object" icon="gtk-ok" />
-                    </group>
+                    <field name="discount" colspan="4"/>
+                    <separator colspan="2" string=""/>
+                    <group colspan="2"/>
+                    <button icon='gtk-cancel' special="cancel"
+                        string="Close" />
+                    <button name="apply_discount" string="Apply Discount"
+                        colspan="1" type="object" icon="gtk-ok" />
                 </form>
             </field>
         </record>
diff --git a/addons/point_of_sale/wizard/pos_open_statement.py b/addons/point_of_sale/wizard/pos_open_statement.py
index 241f0a6e1d0..f7f1137c28b 100644
--- a/addons/point_of_sale/wizard/pos_open_statement.py
+++ b/addons/point_of_sale/wizard/pos_open_statement.py
@@ -51,7 +51,7 @@ class pos_open_statement(osv.osv_memory):
         for journal in journal_obj.browse(cr, uid, journal_ids, context=context):
             ids = statement_obj.search(cr, uid, [('state', '!=', 'confirm'), ('user_id', '=', uid), ('journal_id', '=', journal.id)], context=context)
             if len(ids):
-                raise osv.except_osv(_('Message'), _('You can not open a Cashbox for "%s".\nPlease close its related cash register.') %(journal.name))
+                continue
 
             number = ''
             if journal.sequence_id: