pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[FIX] point_of_sale: cleaning and fixing the point_of_sale for use cases with advance payments (+add product)

Browse Source 
bzr revid: qdp-launchpad@tinyerp.com-20110120113951-8f8sy6il5g1mczxf
This commit is contained in:
qdp-launchpad@tinyerp.com
2011-01-20 12:39:51 +01:00
parent cfd8b8b2a7
commit cda9789c02
3 changed files with 8 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/point_of_sale/point_of_sale.py
-2
View File
@@ -591,8 +591,6 @@ class pos_order(osv.osv):
'qty': qty,
'price_unit': price,
}, context=context)
wf_service = netsvc.LocalService("workflow")
wf_service.trg_write(uid, 'pos.order', order_id, cr)
return order_line_id, price
def refund(self, cr, uid, ids, context=None):
addons/point_of_sale/point_of_sale_view.xml
+1 -1
View File
@@ -51,7 +51,7 @@
<separator colspan="4"/>
<group colspan="4" col="8">
<field name="state" />
<button name="%(action_add_product)d" string="Add product" type="action" icon="gtk-ok" states="draft" groups="base.group_extended"/>
<button name="%(action_add_product)d" string="Add product" type="action" icon="gtk-ok" states="advance" groups="base.group_extended"/>
<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" />
addons/point_of_sale/wizard/pos_payment.py
+7 -11
View File
@@ -133,7 +133,7 @@ class pos_make_payment(osv.osv_memory):
prod_obj = self.pool.get('product.product')
if product_id:
product = prod_obj.browse(cr, uid, product_id)
amount = amount - product.list_price
amount = product.list_price
return {'value': {'amount': amount}}
def check(self, cr, uid, ids, context=None):
@@ -148,10 +148,8 @@ class pos_make_payment(osv.osv_memory):
order = order_obj.browse(cr, uid, active_id, context=context)
amount = order.amount_total - order.amount_paid
data = self.read(cr, uid, ids, context=context)[0]
# Todo need to check ...
if data['is_acc']:
line_id, price = order_obj.add_product(cr, uid, order.id, data['product_id'], -1.0, context=context)
amount = order.amount_total - order.amount_paid - price
amount = self.pool.get('product.product').browse(cr, uid, data['product_id'], context=context).list_price
if amount != 0.0:
order_obj.write(cr, uid, [active_id], {'invoice_wanted': data['invoice_wanted'], 'partner_id': data['partner_id']}, context=context)
@@ -175,13 +173,11 @@ class pos_make_payment(osv.osv_memory):
order_obj.write(cr, uid, [active_id], {'state':'paid'}, context=context)
return self.print_report(cr, uid, ids, context=context)
if order.amount_paid > 0.0:
context.update({'flag': True})
# Todo need to check
order_obj.action_paid(cr, uid, [active_id], context=context)
order_obj.write(cr, uid, [active_id], {'state': 'advance'}, context=context)
return self.print_report(cr, uid, ids, context=context)
return {}
context.update({'flag': True})
# Todo need to check
order_obj.action_paid(cr, uid, [active_id], context=context)
order_obj.write(cr, uid, [active_id], {'state': 'advance'}, context=context)
return self.print_report(cr, uid, ids, context=context)
def create_invoice(self, cr, uid, ids, context=None):