projects / odoo / odoo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: b021330)
Pull request feedback by chs
authorDimitri del Marmol <dimitri@ddm.be.openerp.com>
Fri, 13 Jun 2014 15:27:59 +0000 (17:27 +0200)
committerDimitri del Marmol <dimitri@ddm.be.openerp.com>
Fri, 13 Jun 2014 15:27:59 +0000 (17:27 +0200)
addons/point_of_sale/point_of_sale.py patch | blob | history
addons/point_of_sale/views/templates.xml patch | blob | history
addons/point_of_sale/wizard/pos_payment.py patch | blob | history

diff --git a/addons/point_of_sale/point_of_sale.py b/addons/point_of_sale/point_of_sale.py
index 7d604bf..65473c4 100644 (file)
--- a/addons/point_of_sale/point_of_sale.py
+++ b/addons/point_of_sale/point_of_sale.py
@@ -596,7 +596,7 @@ class pos_order(osv.osv):
             session = self.pool.get('pos.session').browse(cr, uid, order['pos_session_id'], context=context)
             if session.sequence_number <= order['sequence_number']:
                 session.write({'sequence_number': order['sequence_number'] + 1})
-                session = self.pool.get('pos.session').browse(cr, uid, order['pos_session_id'], context=context)
+                session.refresh()
 
             if order['fidpoints'] and order['partner_id']:
                 partner = self.pool.get('res.partner').browse(cr, uid, order['partner_id'], context=context)
diff --git a/addons/point_of_sale/views/templates.xml b/addons/point_of_sale/views/templates.xml
index 870ea04..d5efe6d 100644 (file)
--- a/addons/point_of_sale/views/templates.xml
+++ b/addons/point_of_sale/views/templates.xml
@@ -8,7 +8,7 @@
 <template id="index" name="POS Index">&lt;!DOCTYPE html&gt;
 <html>
     <head>
-        <title>OpenERP POS</title>
+        <title>Odoo POS</title>
 
         <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1"/>
         <meta http-equiv="content-type" content="text/html, charset=utf-8" />
@@ -42,10 +42,6 @@
 
     </head>
     <body>
-        <!--[if lte IE 8]>
-        <script src="//ajax.googleapis.com/ajax/libs/chrome-frame/1/CFInstall.min.js"></script>
-        <script>CFInstall.check({mode: "overlay"});</script>
-        <![endif]-->
     </body>
 </html>
 </template>
diff --git a/addons/point_of_sale/wizard/pos_payment.py b/addons/point_of_sale/wizard/pos_payment.py
index fc03ff4..a5450f0 100644 (file)
--- a/addons/point_of_sale/wizard/pos_payment.py
+++ b/addons/point_of_sale/wizard/pos_payment.py
@@ -123,7 +123,7 @@ class pos_make_payment(osv.osv_memory):
     }
     _defaults = {
         'journal_id' : _default_journal,
-        'payment_date': time.strftime('%Y-%m-%d %H:%M:%S'),
+        'payment_date': lambda *a: time.strftime('%Y-%m-%d %H:%M:%S'),
         'amount': _default_amount,
     }
 
Unnamed repository; edit this file 'description' to name the repository.