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

[MERGE] lp:~openerp-dev/openobject-addons/trunk-clean-search-tools-lunch-tch

Browse Source 
bzr revid: jam@tinyerp.com-20120719110530-jnwuachrq6v0lpg0
This commit is contained in:
Jigar Amin - OpenERP
2012-07-19 16:35:30 +05:30
parent f93959e43d 16eaa629df
commit f658fdb206
1 changed files with 5 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/lunch/lunch_view.xml
+5 -15
View File
@@ -76,12 +76,9 @@
<field name="arch" type="xml">
<search string="Search Lunch Order">
<field name="date"/>
<separator orientation="vertical"/>
<field name="user_id"/>
<filter icon="terp-check" string="To Confirm" domain="[('state','=','draft')]"/>
<filter icon="terp-camera_test" string="Confirmed" domain="[('state','=',('confirmed'))]"/>
<separator orientation="vertical"/>
<field name="user_id"/>
<newline/>
<group expand="0" string="Group By...">
<filter string="Category" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'category'}"/>
</group>
@@ -192,12 +189,9 @@
<search string="Search CashMove">
<field name="create_date"/>
<field name="user_cashmove"/>
<newline/>
<group expand="0" string="Group By...">
<filter string="User" icon="terp-personal" domain="[]" context="{'group_by':'user_cashmove'}"/>
<separator orientation="vertical"/>
<filter string="Box" icon="terp-dolar" domain="[]" context="{'group_by':'box'}"/>
<separator orientation="vertical"/>
<filter string="Date" icon="terp-go-today" domain="[]" context="{'group_by':'create_date'}"/>
</group>
</search>
@@ -375,14 +369,10 @@
<field name="type">search</field>
<field name="arch" type="xml">
<search string="Box Amount by User">
<group>
<field name="date"/>
<separator orientation="vertical"/>
<field name="user_id"/>
<field name="box"/>
<field name="amount"/>
</group>
<newline/>
<field name="date"/>
<field name="user_id"/>
<field name="box"/>
<field name="amount"/>
<group expand="0" string="Group By...">
<filter string="Box" icon="terp-dolar" context="{'group_by':'box'}"/>
</group>