odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

Pull request feedback by chs

This commit is contained in:
Dimitri del Marmol 2014-06-13 17:27:59 +02:00
parent b021330f0e
commit 49d7b107d1
3 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
addons/point_of_sale/point_of_sale.py
View File

@ -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)

6
addons/point_of_sale/views/templates.xml
View File

@ -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>

2
addons/point_of_sale/wizard/pos_payment.py
View File

@ -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,
}