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

[IMP] point_of_sale: Improved view 'Sale Order'. Improved error message.

Browse Source 
bzr revid: uco@tinyerp.com-20100809095847-emrt1ef6afuihz4q
This commit is contained in:
uco (Open ERP)
2010-08-09 15:28:47 +05:30
parent bdfe5b9581
commit 17b2db2901
4 changed files with 15 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/point_of_sale/pos_view.xml
+6 -6
View File
@@ -25,9 +25,9 @@
<field name="qty"/>
<!--<field name="qty" on_change="onchange_qty(qty,price_unit)"/>-->
<!--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_subtotal_incl,price_unit)" invisible="1"/>
<field name="price_unit" readonly="1"/>
<field name="discount" on_change="onchange_discount(discount,price_unit)" />
<field name="notice" on_change="onchange_dis(qty,price_subtotal_incl,discount)"/>
<!--field name="serial_number"/-->
<field name="price_subtotal" />
@@ -77,20 +77,20 @@
<page string="Order and Payment">
<group colspan="2" col="2" name="Type">
<separator string="Order Information" colspan="4"/>
<field name="name"/>
<field name="shop_id" widget="selection"/>
<field name="user_salesman_id" />
<field name="company_id" groups="base.group_multi_company"/>
<field name="shop_id" widget="selection" />
<field name="name"/>
<field name="user_id" string="Salesman"/>
<!--field name="sale_manager" /-->
<field name="price_type" />
<field name="user_id" string="Salesman" groups="base.group_extended"/>
<!--field name="sale_manager" /-->
</group>
<group colspan="2" col="2" name="Type">
<separator string="Dates" colspan="4"/>
<field name="date_order"/>
<field name="date_validation" />
<field name="date_payment" groups="base.group_extended"/>
<field name="type_rec" colspan="4"/>
<!-- <field name="type_rec" colspan="4"/>-->
</group>
<group colspan="4">
<!-- <separator string="Invoicing" colspan="4"/>-->
addons/point_of_sale/wizard/pos_box_entries.py
+1 -1
View File
@@ -105,7 +105,7 @@ class pos_box_entries(osv.osv_memory):
acc_id = product_obj.browse(cr, uid, data['product_id']).property_account_income
if not acc_id:
raise osv.except_osv(_('Error !'), _('please check that account is set to %s')%(product_obj.browse(cr, uid, data['product_id']).name))
raise osv.except_osv(_('Error !'), _('Please check that income account is set to %s')%(product_obj.browse(cr, uid, data['product_id']).name))
if statement_id:
statement_id = statement_id[0]
if not statement_id:
addons/point_of_sale/wizard/pos_box_entries.xml
+8 -8
View File
@@ -8,19 +8,19 @@
<field name="model">pos.box.entries</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Entrée de caisse">
<separator string="Please fill these fields for entries to the box:" colspan="4"/>
<field name="name"/>
<field name="journal_id"/>
<field name="product_id"/>
<field name="amount"/>
<form string="Box Entries">
<separator string="Please fill these fields for entries to the box:" colspan="4"/>
<field name="name"/>
<field name="journal_id"/>
<field name="product_id"/>
<field name="amount"/>
<!-- <field name="ref"/>-->
<group colspan="4" col="2">
<group colspan="4" col="2">
<button icon='gtk-cancel' special="cancel"
string="Close" />
<button name="get_in" string="Take Money"
colspan="1" type="object" icon="gtk-ok" />
</group>
</group>
</form>
</field>
</record>
addons/point_of_sale/wizard/pos_confirm.xml
-9
View File
@@ -27,15 +27,6 @@
<field name="view_mode">form</field>
<field name="target">new</field>
</record>
<record model="ir.values" id="values_pos_confirm">
<field name="model_id" ref="point_of_sale.model_pos_order" />
<field name="object" eval="1" />
<field name="name">Sale Confirm</field>
<field name="key2">client_action_multi</field>
<field name="value" eval="'ir.actions.act_window,' + str(ref('action_pos_confirm'))"/>
<field name="key">action</field>
<field name="model">pos.order</field>
</record>
</data>
</openerp>