odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[IMP]display data for sparkline tooltip and set date 

bzr revid: prajapatijitendra7969@gmail.com-20131209121642-6iznd4pcywclfe8w
This commit is contained in:
Jitendra Prajapati (OpenERP) 2013-12-09 17:46:42 +05:30
parent 2db0d707f3
commit 9e6beb401a
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
addons/stock/stock.py
View File

@ -3425,6 +3425,11 @@ class stock_picking_type(osv.osv):
group_begin_date = datetime.strptime(group['__domain'][0][2], tools.DEFAULT_SERVER_DATE_FORMAT)
month_delta = relativedelta.relativedelta(month_begin, group_begin_date)
section_result[10 - (month_delta.months + 1)] = {'value': group.get(value_field, 0), 'tooltip': group_begin_date.strftime('%B')}
inner_groupby = (group.get('__context', {})).get('group_by',[])
if inner_groupby:
groupby_picking = obj.read_group(cr, uid, group.get('__domain'), read_fields, inner_groupby, context=context)
for groupby in groupby_picking:
section_result[10 - (month_delta.months + 1)]['value'] = groupby.get(value_field, 0)
return section_result
def _get_picking_data(self, cr, uid, ids, field_name, arg, context=None):
@ -3440,7 +3445,7 @@ class stock_picking_type(osv.osv):
('date', '>=', groupby_begin),
('date', '<', groupby_end),
]
res[id] = self.__get_bar_values(cr, uid, obj, created_domain, ['date'], 'picking_type_id_count', 'date', context=context)
res[id] = self.__get_bar_values(cr, uid, obj, created_domain, ['date','picking_type_id'], 'picking_type_id_count', ['date','picking_type_id'], context=context)
return res
def _get_picking_count(self, cr, uid, ids, field_names, arg, context=None):

4
addons/stock/stock_demo.yml
View File

@ -85,6 +85,7 @@
picking_type_id: stock.picking_type_out
origin: 'outgoing shipment'
partner_id: base.res_partner_6
date: !eval "'%s-%s-15' %(datetime.now().year,datetime.now().month-2)"
move_lines:
- product_id: product.product_product_6
product_uom: product.product_uom_unit
@ -101,6 +102,7 @@
picking_type_id: stock.picking_type_out
origin: 'outgoing shipment your_company warehouse'
partner_id: base.res_partner_6
date: !eval "'%s-%s-15' %(datetime.now().year,datetime.now().month-1)"
move_lines:
- product_id: product.product_product_31
product_uom: product.product_uom_unit
@ -231,6 +233,7 @@
picking_type_id: chi_picking_type_in
origin: 'chicago_warehouse'
partner_id: base.res_partner_6
date: !eval "'%s-%s-2' %(datetime.now().year,datetime.now().month-1)"
move_lines:
- product_id: product.product_product_22
product_uom: product.product_uom_unit
@ -299,4 +302,5 @@
record_chi_in = self.browse(cr, uid, ref('incomming_chicago_warehouse1'), context=context)
record_chi_out = self.browse(cr, uid, ref('outgoing_chicago_warehouse1'), context=context)
if record.state != 'done' and record_chi_in.state != 'done' and record_chi_out.state != 'done':
self.force_assign(cr, uid, [ref('outgoing_shipment_main_warehouse'),ref('outgoing_chicago_warehouse3'),ref('outgoing_shipment_main_warehouse2')], context=context)
self.do_transfer(cr, uid, [ref('outgoing_shipment_main_warehouse1'),ref('incomming_chicago_warehouse1'),ref('outgoing_chicago_warehouse1')], context=context)