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

[FIX] point_of_sale: 

* undefined reference in some circonstance (journal)
 * use Decimal to avoid rounding problems when comparing floats

bzr revid: olt@tinyerp.com-20090616081056-7zcfu0th1yw9ewf2
This commit is contained in:
Olivier Laurent 2009-06-16 10:10:56 +02:00
parent 7556c38bc8
commit 1c596e7f20
2 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
addons/point_of_sale/pos.py
View File

@ -27,6 +27,7 @@ from mx import DateTime
from tools.translate import _
import tools
from wizard import except_wizard
from decimal import Decimal
class pos_config_journal(osv.osv):
@ -230,11 +231,14 @@ class pos_order(osv.osv):
return True
def test_paid(self, cr, uid, ids, context=None):
def deci(val):
return Decimal(str(val))
for order in self.browse(cr, uid, ids, context):
if order.lines and not order.amount_total:
return True
if (not order.lines) or (not order.payments) or \
(order.amount_paid != order.amount_total):
(deci(order.amount_paid) != deci(order.amount_total)):
return False
return True
@ -414,6 +418,8 @@ class pos_order(osv.osv):
def add_payment(self, cr, uid, order_id, data, context=None):
"""Create a new payment for the order"""
print data
order = self.browse(cr, uid, order_id, context)
if order.invoice_wanted and not order.partner_id:
raise osv.except_osv(_('Error'), _('Cannot create invoice without a partner.'))

9
addons/point_of_sale/wizard/wizard_pos_payment.py
View File

@ -1,7 +1,7 @@
# -*- encoding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
# OpenERP, Open Source Management Solution
# Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>). All Rights Reserved
# $Id$
#
@ -77,6 +77,7 @@ def _pre_init(self, cr, uid, data, context):
pos_config_journal = pool.get('pos.config.journal')
ids = pos_config_journal.search(cr, uid, [('code', '=', journal_to_fetch)])
objs = pos_config_journal.browse(cr, uid, ids)
journal = None
if objs:
journal = objs[0].journal_id.id
else:
@ -121,6 +122,7 @@ def _add_pay(self, cr, uid, data, context):
order_obj.add_payment(cr, uid, data['id'], result, context=context)
return {}
def _validate(self, cr, uid, data, context):
pool = pooler.get_pool(cr.dbname)
order_obj = pool.get('pos.order')
@ -129,7 +131,8 @@ def _validate(self, cr, uid, data, context):
# return 'receipt'
order_obj.test_order_lines(cr, uid, order, context=context)
return {}
def _check(self, cr, uid, data, context):
"""Check the order:
if the order is not paid: continue payment,
@ -165,7 +168,7 @@ def create_invoice(self, cr, uid, data, context):
order_obj = pool.get('pos.order')
order = order_obj.browse(cr, uid, data['id'], context)
if not order.invoice_id:
inv_id = order_obj.action_invoice(cr,uid,[data['id']])
inv_id = order_obj.action_invoice(cr, uid, [data['id']])
#raise wizard.except_wizard(_('Error !'), _('Please create an invoice for this sale.'))
# wf_service = netsvc.LocalService("workflow")
# for i in data['ids']: