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

[IMP] sale : Added missing filter string and 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-20120529090537-9c0slyugyzlof7y1
This commit is contained in:
Divyesh Makwana (Open ERP)
2012-05-29 14:35:37 +05:30
parent 612ff6bfda
commit cef8622452
2 changed files with 3 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/sale/report/sale_report_view.xml
-13
View File
@@ -51,19 +51,6 @@
<field name="arch" type="xml">
<search string="Sales Analysis">
<group>
<filter icon="terp-go-year" string="Year" name="year"
domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')),('date','&gt;=',time.strftime('%%Y-01-01'))]"
help="Sales order created in current year"/>
<separator orientation="vertical"/>
<filter icon="terp-go-month" string="Month"
name="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="Sales order 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="Sales order created in last month"/>
<separator orientation="vertical"/>
<filter icon="terp-document-new"
string="Quotations"
domain="[('state','=','draft')]"/>
addons/sale/sale_view.xml
+3 -3
View File
@@ -290,7 +290,7 @@
filter_domain="['|', ('name','ilike',self),('client_order_ref','ilike',self)]"/>
<field name="partner_id"/>
<field name="user_id">
<filter domain="[('user_id','=',uid)]" help="My Sale Orders" icon="terp-personal"/>
<filter string="My Sale Orders" domain="[('user_id','=',uid)]" help="My Sale Orders" icon="terp-personal"/>
</field>
<newline/>
<group expand="0" string="Group By...">
@@ -444,7 +444,7 @@
<field name="order_partner_id"/>
<field name="product_id"/>
<field name="salesman_id">
<filter icon="terp-personnal" domain="[('salesman_id','=',uid)]" help="Sales Order Lines related to a Sales Order of mine"/>
<filter string="My Sales Order Lines" icon="terp-personnal" domain="[('salesman_id','=',uid)]" help="Sales Order Lines related to a Sales Order of mine"/>
</field>
<newline/>
<group expand="0" string="Group By...">
@@ -473,7 +473,7 @@
<field name="order_partner_id"/>
<field name="product_id"/>
<field name="salesman_id">
<filter icon="terp-personal" domain="[('salesman_id','=',uid)]" help="My Sales Order Lines"/>
<filter string="My Sales Order Lines" icon="terp-personal" domain="[('salesman_id','=',uid)]" help="My Sales Order Lines"/>
</field>
<newline/>
<group expand="0" string="Group By...">