diff options
| author | apa-tiny <apa@tinyerp.com> | 2010-05-25 17:35:09 +0530 |
|---|---|---|
| committer | apa-tiny <apa@tinyerp.com> | 2010-05-25 17:35:09 +0530 |
| commit | 97b2f83bf4f3f9573d64a3f7475ea607c8a476d6 (patch) | |
| tree | bad1f5b16cf16f0cd6c0570bce2d601c715ee353 | |
| parent | a75dccccf2127be2a7387116298bc902def89d88 (diff) | |
[IMP]:stock,account,project,sale:Improved SQL reports.
bzr revid: apa@tinyerp.com-20100525120509-e76da8uak1alpu0h
| -rw-r--r-- | addons/account/report/account_invoice_report_view.xml | 4 | ||||
| -rw-r--r-- | addons/project/report/project_report_view.xml | 4 | ||||
| -rw-r--r-- | addons/sale/report/sale_report_view.xml | 4 | ||||
| -rw-r--r-- | addons/stock/report/report_stock_picking_view.xml | 9 |
4 files changed, 13 insertions, 8 deletions
diff --git a/addons/account/report/account_invoice_report_view.xml b/addons/account/report/account_invoice_report_view.xml index b974afdb8a3..bdbcb4c7ed6 100644 --- a/addons/account/report/account_invoice_report_view.xml +++ b/addons/account/report/account_invoice_report_view.xml @@ -56,10 +56,10 @@ <field name="arch" type="xml"> <search string="Invoices"> <group col="10" colspan="12"> - <filter icon="terp-account" string="Last 365 Days" + <filter icon="gtk-media-rewind" string="Last 365 Days" domain="[('date','<=', time.strftime('%%Y-%%m-%%d')),('date','>',(datetime.date.today()-datetime.timedelta(days=365)).strftime('%%Y-%%m-%%d'))]" help="Invoices of last 365 days"/> - <filter icon="terp-account" string="Last 30 Days" + <filter icon="gtk-media-rewind" string="Last 30 Days" name="month" domain="[('date','<=', time.strftime('%%Y-%%m-%%d')), ('date','>',(datetime.date.today()-datetime.timedelta(days=30)).strftime('%%Y-%%m-%%d'))]" help="Invoices of last 30 days"/> diff --git a/addons/project/report/project_report_view.xml b/addons/project/report/project_report_view.xml index 37f43590515..da4c2cd7ee0 100644 --- a/addons/project/report/project_report_view.xml +++ b/addons/project/report/project_report_view.xml @@ -55,10 +55,10 @@ <field name="arch" type="xml"> <search string="Tasks Analysis"> <group> - <filter icon="terp-project" string="Last 365 Days" + <filter icon="gtk-media-rewind" string="Last 365 Days" domain="[('date_start','<=', time.strftime('%%Y-%%m-%%d')),('date_start','>',(datetime.date.today()-datetime.timedelta(days=365)).strftime('%%Y-%%m-%%d'))]" help="Tasks performed in last 365 Days"/> - <filter icon="terp-project" string="Last 30 Days" + <filter icon="gtk-media-rewind" string="Last 30 Days" name="month" domain="[('date_start','<=', time.strftime('%%Y-%%m-%%d')), ('date_start','>',(datetime.date.today()-datetime.timedelta(days=30)).strftime('%%Y-%%m-%%d'))]" help="Tasks performed in last 30 days"/> diff --git a/addons/sale/report/sale_report_view.xml b/addons/sale/report/sale_report_view.xml index 69541868904..41bb1598a30 100644 --- a/addons/sale/report/sale_report_view.xml +++ b/addons/sale/report/sale_report_view.xml @@ -50,10 +50,10 @@ <field name="arch" type="xml"> <search string="Sales Analysis"> <group> - <filter icon="terp-sale" string="Last 365 Days" + <filter icon="gtk-media-rewind" string="Last 365 Days" domain="[('date','<=', time.strftime('%%Y-%%m-%%d')),('date','>',(datetime.date.today()-datetime.timedelta(days=365)).strftime('%%Y-%%m-%%d'))]" help="Tasks performed in last 365 days"/> - <filter icon="terp-sale" string="Last 30 Days" + <filter icon="gtk-media-rewind" string="Last 30 Days" name="month" domain="[('date','<=', time.strftime('%%Y-%%m-%%d')), ('date','>',(datetime.date.today()-datetime.timedelta(days=30)).strftime('%%Y-%%m-%%d'))]" help="Tasks performed in last 30 days"/> diff --git a/addons/stock/report/report_stock_picking_view.xml b/addons/stock/report/report_stock_picking_view.xml index 62d1b06fd19..1d977f92abd 100644 --- a/addons/stock/report/report_stock_picking_view.xml +++ b/addons/stock/report/report_stock_picking_view.xml @@ -54,13 +54,18 @@ <field name="arch" type="xml"> <search string="Search"> <group col="16" colspan="6"> - <filter icon="terp-stock" string="Last 365 Days" + <filter icon="gtk-media-rewind" string="Last 365 Days" domain="[('date','<=', time.strftime('%%Y-%%m-%%d')),('date','>',(datetime.date.today()-datetime.timedelta(days=365)).strftime('%%Y-%%m-%%d'))]" help="Picking in last 365 days"/> - <filter icon="terp-stock" string="Last 30 Days" + <filter icon="gtk-media-rewind" string="Last 30 Days" name="month" domain="[('date','<=', time.strftime('%%Y-%%m-%%d')), ('date','>',(datetime.date.today()-datetime.timedelta(days=30)).strftime('%%Y-%%m-%%d'))]" help="Picking in last 30 days"/> + <filter icon="gtk-media-rewind" + string=" 7 Days " + separator="1" + domain="[('date','<=', time.strftime('%%Y-%%m-%%d')), ('date','>',(datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d'))]" + help="Picking during last 7 days"/> <separator orientation="vertical"/> <filter string="Todo" icon="terp-stock" domain="[('state','in',('draft','auto','confirmed','assigned'))]"/> <filter string="Done" icon="terp-stock" domain="[('state','=','done')]"/> |