diff options
| author | Divyesh Makwana (Open ERP) <mdi@tinyerp.com> | 2012-05-30 10:37:27 +0530 |
|---|---|---|
| committer | Divyesh Makwana (Open ERP) <mdi@tinyerp.com> | 2012-05-30 10:37:27 +0530 |
| commit | bcf2099bac094485929d48e1ef3cfd43656dfd47 (patch) | |
| tree | 2539b488ffbc2f5fdd7694cf0b99d56c033affc9 | |
| parent | 4077d10f71097326435c477704edda2307ba3746 (diff) | |
[IMP] stock : Removed all filters related to a date field and added the related date field in the search view.
bzr revid: mdi@tinyerp.com-20120530050727-2nk2v9nvegwnc1il
| -rw-r--r-- | addons/stock/report/report_stock_move_view.xml | 30 | ||||
| -rw-r--r-- | addons/stock/stock_view.xml | 2 |
2 files changed, 1 insertions, 31 deletions
diff --git a/addons/stock/report/report_stock_move_view.xml b/addons/stock/report/report_stock_move_view.xml index dc457bc4ea8..d6ab3c4674f 100644 --- a/addons/stock/report/report_stock_move_view.xml +++ b/addons/stock/report/report_stock_move_view.xml @@ -67,21 +67,6 @@ <field name="arch" type="xml"> <search string="Moves Analysis"> <group> - <filter icon="terp-go-year" string="Year" - name="year" - domain="[('date','<=', time.strftime('%%Y-%%m-%%d')),('date','>=',time.strftime('%%Y-01-01'))]" - help="Current year"/> - <separator orientation="vertical"/> - <filter icon="terp-go-month" string="Month" - name="month" - domain="[('date','<=',(datetime.date.today()+relativedelta(day=31)).strftime('%%Y-%%m-%%d')),('date','>=',(datetime.date.today()-relativedelta(day=1)).strftime('%%Y-%%m-%%d'))]" - help="Current month"/> - <filter icon="terp-go-month" - string="Month-1" - name="month-1" - domain="[('date','<=', (datetime.date.today() - relativedelta(day=31, months=1)).strftime('%%Y-%%m-%%d')),('date','>=',(datetime.date.today() - relativedelta(day=1,months=1)).strftime('%%Y-%%m-%%d'))]" - help="Last month"/> - <separator orientation="vertical"/> <filter string="Done" name="done" icon="terp-dialog-close" @@ -190,21 +175,6 @@ <field name="arch" type="xml"> <search string="Inventory Analysis"> <group> - <filter icon="terp-go-year" string="Year" - name="year" - domain="[('date','<=', time.strftime('%%Y-%%m-%%d')),('date','>=',time.strftime('%%Y-01-01'))]" - help="Current year"/> - <separator orientation="vertical"/> - <filter icon="terp-go-month" string="Month" - name="month" - domain="[('date','<=',(datetime.date.today()+relativedelta(day=31)).strftime('%%Y-%%m-%%d')),('date','>=',(datetime.date.today()-relativedelta(day=1)).strftime('%%Y-%%m-%%d'))]" - help="Current month"/> - <filter icon="terp-go-month" - string="Month-1" - name="month-1" - domain="[('date','<=', (datetime.date.today() - relativedelta(day=31, months=1)).strftime('%%Y-%%m-%%d')),('date','>=',(datetime.date.today() - relativedelta(day=1,months=1)).strftime('%%Y-%%m-%%d'))]" - help="Last month"/> - <separator orientation="vertical"/> <filter string="Real" name="real" icon="terp-check" diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml index cff0298d08b..e8bbd306aa7 100644 --- a/addons/stock/stock_view.xml +++ b/addons/stock/stock_view.xml @@ -1485,7 +1485,7 @@ <field name="arch" type="xml"> <search string="Stock Moves"> <group> - <filter icon="terp-gtk-go-back-rtl" name="receive" string=" Waiting" domain="[('state','in',('confirmed','assigned'))]" help="Stock to be delivered (Available or not)"/> + <filter icon="terp-gtk-go-back-rtl" name="receive" string="Waiting" domain="[('state','in',('confirmed','assigned'))]" help="Stock to be delivered (Available or not)"/> <filter icon="terp-check" name="available" string="Available" domain="[('state','in',('assigned',))]" help="Stock available to be delivered"/> <filter icon="terp-dialog-close" name="received" string="Done" domain="[('state','=','done')]"/> <separator orientation="vertical"/> |