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

[IMP] point_of_sale:improve the view of point_of_sale and fix the problem of Sale Confirm wizard

Browse Source 
bzr revid: sbh@tinyerp.com-20100517084420-or26a2xz7w4pnd6z
This commit is contained in:
sbh (Open ERP)
2010-05-17 14:14:20 +05:30
parent c68668529a
commit 5fc48ab9ef
2 changed files with 14 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/point_of_sale/pos.py
+3 -1
View File
@@ -349,6 +349,7 @@ class pos_order(osv.osv):
return False
_defaults = {
'user_salesman_id':lambda self, cr, uid, context: uid,
'user_id': lambda self, cr, uid, context: uid,
'sale_manager': lambda self, cr, uid, context: uid,
'state': lambda *a: 'draft',
@@ -773,7 +774,8 @@ class pos_order(osv.osv):
comp_id=comp_id and comp_id.id or False
to_reconcile = []
group_tax = {}
account_def = property_obj.get(cr, uid, 'property_account_receivable', 'res.partner', context=context)
account_def = property_obj.get(cr, uid, 'property_account_receivable', 'res.partner', context=context).id
order_account = order.partner_id and order.partner_id.property_account_receivable and order.partner_id.property_account_receivable.id or account_def or curr_c.account_receivable.id
# Create an entry for the sale
addons/point_of_sale/pos_view.xml
+11 -10
View File
@@ -8,18 +8,19 @@
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Sales Order POS">
<notebook >
<page string="Order lines">
<group colspan="4" col="6">
<field name="user_salesman_id" />
<field name="partner_id" on_change="onchange_partner_pricelist(partner_id)"/>
<field name="contract_number" groups="base.group_extended"/>
</group>
<group col="6" colspan="4">
<field name="user_salesman_id" />
<field name="partner_id" on_change="onchange_partner_pricelist(partner_id)"/>
<field name="contract_number" groups="base.group_extended"/>
</group>
<notebook colspan="4">
<page string="Sale Order ">
<field name="lines" colspan="4" nolabel="1">
<tree string="Order lines" editable="bottom">
<field name="product_id" on_change="onchange_product_id(parent.pricelist_id,product_id,qty,parent.partner_id)" width="275" />
<field name="qty" />
<field name="qty_rfd" />
<field name="qty_rfd" groups="base.group_extended"/>
<field name="discount" on_change="onchange_discount(discount,price_unit)" />
<field name="price_ded" on_change="onchange_ded(price_ded, price_unit)" />
<field name="price_unit" readonly="1"/>
@@ -31,7 +32,7 @@
<form string="Order lines" >
<field name="product_id" on_change="onchange_product_id(parent.pricelist_id,product_id,qty,parent.partner_id)" width="275"/>
<field name="qty" />
<field name="qty_rfd" />
<field name="qty_rfd" groups="base.group_extended"/>
<field name="discount" on_change="onchange_discount(discount,price_unit)" />
<field name="price_ded" on_change="onchange_ded(price_ded, price_unit)" />
<field name="price_unit"/>
@@ -69,7 +70,7 @@
</group>
</page>
<page string="Payment">
<page string="Order and Payment">
<group colspan="2" col="2" name="Type">
<separator string="Order Information" colspan="4"/>
<field name="company_id"/>