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

[IMP] point_of_sale : Removed all filters related to a date field and added the related date field in the search view.

Browse Source 
bzr revid: mdi@tinyerp.com-20120528064241-imvko29lik159xal
This commit is contained in:
Divyesh Makwana (Open ERP)
2012-05-28 12:12:41 +05:30
parent d18cb96c97
commit ce6d03c66a
2 changed files with 6 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/point_of_sale/report/pos_order_report_view.xml
+1 -18
View File
@@ -35,24 +35,6 @@
<field name="arch" type="xml">
<search string="Point of Sale Analysis">
<group>
<filter icon="terp-go-year" string="Year" name="year"
domain="[('year','=',time.strftime('%%Y'))]"
help="POS ordered created during current year"/>
<separator orientation="vertical"/>
<filter icon="terp-go-month" string="Month" name="This Month"
domain="[('date','&lt;=',(datetime.date.today()+relativedelta(day=31)).strftime('%%Y-%%m-%%d')),('date','&gt;=',(datetime.date.today()-relativedelta(day=1)).strftime('%%Y-%%m-%%d'))]"
help="POS ordered created during current month"/>
<filter icon="terp-go-month"
string="Month -1"
domain="[('date','&lt;=', (datetime.date.today() - relativedelta(day=31, months=1)).strftime('%%Y-%%m-%%d')),('date','&gt;=',(datetime.date.today() - relativedelta(day=1,months=1)).strftime('%%Y-%%m-%%d'))]"
help="POS ordered created last month"/>
<separator orientation="vertical"/>
<filter icon="terp-go-today"
string="Today"
name="today"
domain="[('date','=', time.strftime('%%Y-%%m-%%d'))]"
help="POS ordered created by today"/>
<separator orientation="vertical"/>
<filter icon="terp-dolar"
string="Invoiced"
domain="[('state','=',('invoiced'))]"/>
@@ -67,6 +49,7 @@
help="My Sales"
domain="[('user_id','=',uid)]"/>
</field>
<field name="date"/>
</group>
<newline/>
<group expand="1" string="Group By...">
addons/point_of_sale/report/report_cash_register_view.xml
+5 -23
View File
@@ -26,29 +26,10 @@
<field name="type">search</field>
<field name="arch" type="xml">
<search string="Point of Sale Cash Register Analysis">
<group>
<filter icon="terp-go-year" string="Year" name="year"
domain="[('year','=',time.strftime('%%Y'))]"
help="Cash Analysis created during this year"/>
<separator orientation="vertical"/>
<filter icon="terp-go-month" string="Month" name="This Month"
domain="[('date','&lt;=',(datetime.date.today()+relativedelta(day=31)).strftime('%%Y-%%m-%%d')),('date','&gt;=',(datetime.date.today()-relativedelta(day=1)).strftime('%%Y-%%m-%%d'))]"
help="Cash Analysis created in current month"/>
<filter icon="terp-go-month"
string="Month -1"
domain="[('date','&lt;=', (datetime.date.today() - relativedelta(day=31, months=1)).strftime('%%Y-%%m-%%d')),('date','&gt;=',(datetime.date.today() - relativedelta(day=1,months=1)).strftime('%%Y-%%m-%%d'))]"
help="Cash Analysis created in last month"/>
<separator orientation="vertical"/>
<filter icon="terp-go-today"
string=" Today "
name="today"
domain="[('date','=', time.strftime('%%Y-%%m-%%d'))]"
help="Cash Analysis created by today"/>
<separator orientation="vertical"/>
<filter icon="terp-document-new"
string="Draft"
domain="[('state','=',('draft'))]"/>
<group>
<filter icon="terp-document-new"
string="Draft"
domain="[('state','=',('draft'))]"/>
<filter icon="terp-camera_test"
string="Confirm"
domain="[('state','=',('confirm'))]"/>
@@ -59,6 +40,7 @@
help="My Sales"
domain="[('user_id','=',uid)]"/>
</field>
<field name="date">
</group>
<newline/>
<group expand="1" string="Group By...">