Hemendra Paregi(Open ERP) has proposed merging
lp:~openerp-dev/openobject-addons/trunk-polish2-analysis-view-stock-hpa into
lp:openobject-addons.
Requested reviews:
OpenERP Core Team (openerp)
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-polish2-analysis-view-stock-hpa/+merge/81729
Hello Sir
improvement is done in Stock Analysis view.
Thanks.
HPA
--
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-polish2-analysis-view-stock-hpa/+merge/81729
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openobject-addons/trunk-polish2-analysis-view-stock-hpa.
=== modified file 'stock/report/report_stock_move.py'
--- stock/report/report_stock_move.py 2011-10-02 17:31:16 +0000
+++ stock/report/report_stock_move.py 2011-11-09 12:52:46 +0000
@@ -154,6 +154,9 @@
_auto = False
_columns = {
'date': fields.datetime('Date', readonly=True),
+ 'year': fields.char('Year', size=4, readonly=True),
+ 'month':fields.selection([('01','January'), ('02','February'), ('03','March'), ('04','April'),
+ ('05','May'), ('06','June'), ('07','July'), ('08','August'), ('09','September')]),
'partner_id':fields.many2one('res.partner.address', 'Partner', readonly=True),
'product_id':fields.many2one('product.product', 'Product', readonly=True),
'product_categ_id':fields.many2one('product.category', 'Product Category', readonly=True),
=== modified file 'stock/report/report_stock_move_view.xml'
--- stock/report/report_stock_move_view.xml 2011-09-17 11:03:17 +0000
+++ stock/report/report_stock_move_view.xml 2011-11-09 12:52:46 +0000
@@ -37,7 +37,6 @@
</tree>
</field>
</record>
-
<record id="view_stock_graph" model="ir.ui.view">
<field name="name">report.stock.move.graph</field>
<field name="model">report.stock.move</field>
@@ -60,7 +59,6 @@
</graph>
</field>
</record>
-
<record id="view_stock_search" model="ir.ui.view">
<field name="name">report.stock.move.search</field>
<field name="model">report.stock.move</field>
@@ -69,17 +67,19 @@
<search string="Moves Analysis">
<group>
<filter icon="terp-go-year" string="Year"
- domain="[('date','<=', time.strftime('%%Y-%%m-%%d')),('date','>=',time.strftime('%%Y-01-01'))]"
- help="Current 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"/>
- <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"/>
+ 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"
@@ -90,7 +90,6 @@
icon="terp-gtk-go-back-rtl"
domain="[('state','in',('assigned','waiting','confirmed'))]"
help = "Future Stock-Moves"/>
-
<separator orientation="vertical"/>
<filter icon="terp-go-home" name="in" string="Incoming" domain="[('type','=','in')]"/>
<filter icon="terp-go-home" name="internal" string="Internal" domain="[('type','=','internal')]"/>
@@ -142,7 +141,7 @@
<field name="view_type">form</field>
<field name="view_mode">tree,graph</field>
<field name="search_view_id" ref="view_stock_search"/>
- <field name="context">{'full':'1','contact_display': 'partner','search_default_done':1, 'search_default_month':1, 'search_default_group_type':1, 'group_by': [], 'group_by_no_leaf':1,}</field>
+ <field name="context">{'full':'1','contact_display': 'partner','search_default_done':1,'search_default_year':1, 'search_default_month':1, 'search_default_group_type':1, 'group_by': [], 'group_by_no_leaf':1,}</field>
<field name="help">Moves Analysis allows you to easily check and analyse your company stock moves. Use this report when you want to analyse the different routes taken by your products and inventory management performance.</field>
</record>
<menuitem action="action_stock_move_report" id="menu_action_stock_move_report" parent="next_id_61" sequence="3"/>
@@ -155,6 +154,8 @@
<field name="arch" type="xml">
<tree string="Inventory Analysis">
<field name="date" invisible="1"/>
+ <field name="year" invisible="1" />
+ <field name="month" invisible="1"/>
<field name="company_id" invisible="1"/>
<field name="location_type" invisible="1"/>
<field name="location_id" invisible="1"/>
@@ -188,6 +189,21 @@
<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"
@@ -240,7 +256,8 @@
<field name="view_type">form</field>
<field name="view_mode">tree,graph</field>
<field name="search_view_id" eval="False"/>
- <field name="context">{'contact_display': 'partner', 'search_default_real':1, 'search_default_location_type_internal':1,'search_default_group_product':1,'group_by':[], 'group_by_no_leaf':1}</field>
+ <field name="context">{'contact_display': 'partner', 'search_default_real':1,
+'search_default_year':1,'search_default_month':1, 'search_default_location_type_internal':1,'search_default_group_product':1,'group_by':[], 'group_by_no_leaf':1}</field>
<field name="help">Inventory Analysis allows you to easily check and analyse your company stock levels. Sort and group by selection criteria in order to better analyse and manage your company activities.</field>
</record>
<menuitem action="action_stock_inventory_report"
_______________________________________________
Mailing list: https://launchpad.net/~openerp-dev-gtk
Post to : openerp-dev-gtk@lists.launchpad.net
Unsubscribe : https://launchpad.net/~openerp-dev-gtk
More help : https://help.launchpad.net/ListHelp
