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

[IMP]: lunch: usability improvement in lunch module.

Browse Source 
bzr revid: atp@tinyerp.co.in-20100506122000-8wxzo3ddxa1zo4w2
This commit is contained in:
atp (Open ERP)
2010-05-06 17:50:00 +05:30
parent fda05ce231
commit 1ee30d46d4
5 changed files with 112 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/lunch/__openerp__.py
+2 -4
View File
@@ -47,10 +47,8 @@
'lunch_report.xml',
#'process/lunch_process.xml'
],
"demo_xml": ['lunch_demo.xml',
],
"test": ['test/test_lunch.yml'
],
"demo_xml": ['lunch_demo.xml'],
"test": ['test/test_lunch.yml'],
"installable": True,
}
addons/lunch/lunch_view.xml
+101 -20
View File
@@ -56,13 +56,46 @@
</tree>
</field>
</record>
<record id="view_lunch_order_filter" model="ir.ui.view">
<field name="name">lunch-order Search</field>
<field name="model">lunch.order</field>
<field name="type">search</field>
<field name="arch" type="xml">
<search string="Search order">
<group>
<filter icon="terp-project"
string="Draft"
domain="[('state','=','draft')]"/>
<filter icon="terp-project"
name="confirmed"
string="Confirmed"
domain="[('state','=','confirmed')]"/>
<separator orientation="vertical"/>
<field name="product" widget="selection"/>
<field name="user_id" select="1" widget="selection" default="1">
</field>
<field name="date"/>
</group>
<newline/>
<group expand="1" string="Group By..." colspan="14">
<filter string="Product" icon="terp-purchase" domain="[]" context="{'group_by':'product'}"/>
<filter string="State" icon="terp-purchase" domain="[]" context="{'group_by':'state'}"/>
<filter string="Order date" icon="terp-purchase" domain="[]" context="{'group_by':'date'}"/>
<filter string="User" name="user" icon="terp-partner" domain="[]" context="{'group_by':'user_id'}"/>
</group>
<newline/>
</search>
</field>
</record>
<!-- Lunch order Action -->
<record model="ir.actions.act_window" id="action_lunch_order_form">
<field name="name">Lunch Orders</field>
<field name="res_model">lunch.order</field>
<field name="view_mode">tree,form</field>
<field name="search_view_id" ref="view_lunch_order_filter"/>
</record>
<menuitem name="Lunch Order" parent="menu_lunch"
@@ -116,10 +149,10 @@
<field name="arch" type="xml">
<form string="CashMove">
<field name="name" select="1"/>
<field name="user_cashmove" select="1"/>
<field name="amount"/>
<field name="box" select="1"/>
<field name="create_date" select="1"/>
<field name="user_cashmove" select="1"/>
<field name="box" select="1"/>
<field name="amount"/>
<field name="active" select="1"/>
</form>
</field>
@@ -141,12 +174,37 @@
</tree>
</field>
</record>
<record id="view_lunch_cashmove_filter" model="ir.ui.view">
<field name="name">CashMove Search</field>
<field name="model">lunch.cashmove</field>
<field name="type">search</field>
<field name="arch" type="xml">
<search string="Search order">
<group>
<field name="name"/>
<field name="user_cashmove" widget="selection" default="1"/>
<field name="amount"/>
<field name="box" widget="selection"/>
</group>
<newline/>
<group expand="1" string="Group By..." colspan="14">
<filter string="CashBox" icon="terp-purchase" domain="[]" context="{'group_by':'box'}"/>
<filter string="Order date" icon="terp-purchase" domain="[]" context="{'group_by':'create_date'}"/>
<filter string="User" name="user" icon="terp-partner" domain="[]" context="{'group_by':'user_cashmove'}"/>
</group>
<newline/>
</search>
</field>
</record>
<!-- Cash Move Action -->
<record model="ir.actions.act_window" id="action_lunch_cashmove_form">
<field name="name">CashMove</field>
<field name="res_model">lunch.cashmove</field>
<field name="search_view_id" ref="view_lunch_cashmove_filter"/>
</record>
<menuitem name="Cash Moves" parent="menu_lunch"
@@ -240,7 +298,6 @@
id="menu_lunch_category_form"
action="action_lunch_category_form" sequence="1" />
<!-- Lunch Amount Tree view -->
<record model="ir.ui.view" id="view_report_lunch_amount_tree">
@@ -255,29 +312,53 @@
</tree>
</field>
</record>
<!-- Lunch Amount Form view -->
<record model="ir.ui.view" id="view_report_lunch_amount_form">
<field name="name">Lunch amount</field>
<field name="model">report.lunch.amount</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Box Amount by User">
<field name="user_id" select="1"/>
<field name="box" select="1"/>
<field name="amount" select="1"/>
</form>
</field>
<record id="view_order_product_graph" model="ir.ui.view">
<field name="name">Lunch.amount.report.graph</field>
<field name="model">report.lunch.amount</field>
<field name="type">graph</field>
<field name="arch" type="xml">
<graph orientation="vertical" string="Case Position by User" type="bar">
<field name="user_id"/>
<field name="amount"/>
</graph>
</field>
</record>
<!-- Lunch Amount search view -->
<record id="view_report_lunch_amount_filter" model="ir.ui.view">
<field name="name">Lunch amount Search</field>
<field name="model">report.lunch.amount</field>
<field name="type">search</field>
<field name="arch" type="xml">
<search string="Search lunch amount">
<group>
<field name="user_id" widget="selection" default="1">
</field>
<field name="box" widget="selection"/>
<field name="amount"/>
</group>
<newline/>
<group expand="1" string="Group By..." colspan="14">
<filter string="CashBox" name="cashbox" icon="terp-purchase" domain="[]" context="{'group_by':'box'}"/>
<filter string="User" name="user" icon="terp-partner" domain="[]" context="{'group_by':'user_id'}"/>
</group>
<newline/>
</search>
</field>
</record>
<!-- Lunch Amount Action -->
<record model="ir.actions.act_window" id="action_report_lunch_amount_tree">
<field name="name">Lunch amount</field>
<field name="res_model">report.lunch.amount</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
<field name="view_mode">tree,graph</field>
<field name="search_view_id" ref="view_report_lunch_amount_filter"/>
<field name="context">{'search_default_user':1, 'group_by_no_leaf':1,'group_by':[]}</field>
</record>
<menuitem name="Cash Position by User"
addons/lunch/wizard/lunch_cashbox_clean_view.xml
+3 -9
View File
@@ -14,7 +14,8 @@
<label string="Are you sure you want to reset this cashbox ?"/>
</group>
<separator string="" colspan="4" />
<group colspan="4" col="6">
<group colspan="6" >
<label string=" " colspan="2"/>
<button icon="gtk-cancel" special="cancel" string="No"/>
<button icon="gtk-ok" name="set_to_zero" string="Set to Zero" type="object"/>
</group>
@@ -22,14 +23,7 @@
</field>
</record>
<record id="action_lunch_cashbox_clean" model="ir.actions.act_window">
<field name="name">Set CashBox to Zero</field>
<field name="res_model">lunch.cashbox.clean</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
<field name="view_id" ref="view_lunch_cashbox_clean"/>
<field name="target">new</field>
</record>
<!-- Action for lunch cashbox set to zero. -->
<act_window id="action_lunch_cashbox_clean_values"
key2="client_action_multi" name="Set CashBox to Zero"
addons/lunch/wizard/lunch_order_cancel_view.xml
+3 -9
View File
@@ -14,7 +14,8 @@
<label string="Are you sure you want to cancel this order ?"/>
</group>
<separator string="" colspan="4" />
<group colspan="4" col="6">
<group colspan="6">
<label string=" " colspan="2"/>
<button icon="gtk-cancel" special="cancel" string="No"/>
<button icon="gtk-ok" name="cancel" string="Yes" type="object"/>
</group>
@@ -22,14 +23,7 @@
</field>
</record>
<record id="action_lunch_order_cancel" model="ir.actions.act_window">
<field name="name">Cancel Order</field>
<field name="res_model">lunch.order.cancel</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
<field name="view_id" ref="view_lunch_order_cancel"/>
<field name="target">new</field>
</record>
<!-- Action for Cancel Order -->
<act_window id="action_lunch_order_cancel_values"
key2="client_action_multi" name="Cancel Order"
addons/lunch/wizard/lunch_order_confirm_view.xml
+3 -9
View File
@@ -16,7 +16,8 @@
<newline/>
</group>
<separator string="" colspan="4" />
<group colspan="4" col="6">
<group colspan="6">
<label colspan="2" string=" "/>
<button icon="gtk-cancel" special="cancel" string="Cancel"/>
<button icon="gtk-ok" name="confirm" string="Confirm Order" type="object"/>
</group>
@@ -24,14 +25,7 @@
</field>
</record>
<record id="action_lunch_order_confirm" model="ir.actions.act_window">
<field name="name">Confirm Order</field>
<field name="res_model">lunch.order.confirm</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
<field name="view_id" ref="view_lunch_order_confirm"/>
<field name="target">new</field>
</record>
<!-- Action for Confirm order -->
<act_window id="action_lunch_order_confirm_values"
key2="client_action_multi" name="Confirm Order"