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

mrp: fix workcenter load report 

bzr revid: ced-ba8d6c6d10f17439f5638ce7a3a54f03f07e4036
This commit is contained in:
ced 2007-07-10 15:25:40 +00:00
parent 37d45e4ffb
commit 3388852590
3 changed files with 9 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
addons/mrp/mrp_report.xml
View File

@ -1,22 +1,6 @@
<?xml version="1.0"?>
<terp>
<data>
<report
id="report_mrp_workcenter_load"
string="Workcenter load"
model="mrp.workcenter"
name="mmrp.workcenter.load"/>
<!-- Bom content disabled because it is semi-functional
<report
id="report_bom_content"
string="Bom Content"
model="mrp.bom"
name="bom.report"
xml="mrp/report/bom.xml"
xsl="mrp/report/bom.xsl" />
-->
<!--
Resource: ir.report.custom
-->

1
addons/mrp/mrp_wizard.xml
View File

@ -27,7 +27,6 @@
string="Workcenter load"
model="mrp.workcenter"
name="mrp.workcenter.load"
keyword="client_print_multi"
id="wizard_workcenter_load"/>
<wizard id="wizard_price" string="Product Cost Structure" model="product.product" name="product_price" menu="False"/>

18
addons/mrp/report/workcenter_load.py
View File

@ -128,13 +128,13 @@ class report_custom(report_int):
y_label = "Load (Cycles)"
else:
y_label = "Load (Hours)"
ar = area.T(legend = legend.T(),
x_grid_style= line_style.gray70_dash1,
x_axis = axis.X(label="Periods", format="/a90/hC%s"),
x_coord = category_coord.T(x_index, 0),
y_axis = axis.Y(label=y_label),
y_range = (0, None),
size = (640,480))
ar = area.T(legend = legend.T(),
x_grid_style = line_style.gray70_dash1,
x_axis = axis.X(label="Periods", format="/a90/hC%s"),
x_coord = category_coord.T(x_index, 0),
y_axis = axis.Y(label=y_label),
y_range = (0, None),
size = (640,480))
bar_plot.fill_styles.reset();
# select workcenters
@ -154,9 +154,9 @@ class report_custom(report_int):
WHERE (mrp_production_workcenter_line.production_id=mrp_production.id) \
AND (mrp_production_workcenter_line.workcenter_id=mrp_workcenter.id) \
AND (mrp_workcenter.id=%d) \
AND (mrp_production.date_planned BETWEEN '%s' AND '%s') \
AND (mrp_production.date_planned BETWEEN %s AND %s) \
GROUP BY mrp_production_workcenter_line.workcenter_id, mrp_workcenter.name, mrp_workcenter.id \
ORDER BY mrp_workcenter.id" % (workcenter['id'], dates[date]['start'], dates[date]['stop']))
ORDER BY mrp_workcenter.id", (workcenter['id'], dates[date]['start'], dates[date]['stop']))
res = cr.dictfetchall()
if not res:
vals.append(0.0)