MRP,PRODUCT: fix report declaration and improve help for workcenter
bzr revid: ced-c7054e65091669d71e18b091723c27f55f4a8536
This commit is contained in:
ced
parent
7b4eca839a
commit
a2d07bb31b
|
|
@ -55,7 +55,7 @@ class mrp_workcenter(osv.osv):
|
|||
'timesheet_id': fields.many2one('hr.timesheet.group', 'Timesheet'),
|
||||
'note': fields.text('Description'),
|
||||
|
||||
'capacity_per_cycle': fields.float('Capacity per Cycle'),
|
||||
'capacity_per_cycle': fields.float('Number of workcenter', help="This is the number of available workcenter simultaneously"),
|
||||
|
||||
'time_cycle': fields.float('Time for 1 cycle (hour)'),
|
||||
'time_start': fields.float('Time before prod.'),
|
||||
|
|
|
|||
|
|
@ -7,14 +7,6 @@
|
|||
model="mrp.workcenter"
|
||||
name="mmrp.workcenter.load"/>
|
||||
|
||||
<report
|
||||
id="report_cost_structure"
|
||||
string="Product Cost Structure"
|
||||
model="product.product"
|
||||
name="mrp.product.cost.report"
|
||||
xml="mrp/report/product_explosion.xml"
|
||||
xsl="mrp/report/product_explosion.xsl" />
|
||||
|
||||
<!-- Bom content disabled because it is semi-functional
|
||||
<report
|
||||
id="report_bom_content"
|
||||
|
|
|
|||
|
|
@ -101,9 +101,9 @@
|
|||
<field name="capacity_per_cycle"/>
|
||||
<newline/>
|
||||
<field name="time_cycle"/>
|
||||
<field name="time_efficiency"/>
|
||||
<field name="time_start"/>
|
||||
<field name="time_stop"/>
|
||||
<field name="time_efficiency"/>
|
||||
</group>
|
||||
</page>
|
||||
<page string="Cost Accounting">
|
||||
|
|
|
|||
|
|
@ -29,7 +29,16 @@
|
|||
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"/>
|
||||
<record model="ir.values" id="ir_project_cost_structure">
|
||||
<field name="key2" eval="'client_print_multi'"/>
|
||||
<field name="model" eval="'product.product'"/>
|
||||
<field name="name">Product Cost Structure</field>
|
||||
<field name="value" eval="'ir.actions.wizard,%d'%wizard_price"/>
|
||||
<field name="object" eval="True"/>
|
||||
</record>
|
||||
|
||||
</data>
|
||||
</terp>
|
||||
|
||||
|
|
|
|||
|
|
@ -1,13 +0,0 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<lotlist>
|
||||
<lot type="fields" name="id">
|
||||
<id type="field" name="id"/>
|
||||
<product type="call" name="product_cost_explosion" args="">
|
||||
<amount value="amount"/>
|
||||
<variants value="variants"/>
|
||||
<name value="name"/>
|
||||
<uom value="uom"/>
|
||||
<price value="price"/>
|
||||
</product>
|
||||
</lot>
|
||||
</lotlist>
|
||||
|
|
@ -1,73 +0,0 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:fo="http://www.w3.org/1999/XSL/Format">
|
||||
|
||||
<xsl:import href="../../custom/corporate_defaults.xsl"/>
|
||||
<xsl:import href="../../base/report/rml_template.xsl"/>
|
||||
|
||||
<xsl:template name="first_page_frames">
|
||||
<frame id="main" x1="1cm" y1="2.5cm" width="19.0cm" height="23cm"/>
|
||||
</xsl:template>
|
||||
|
||||
<xsl:template match="/">
|
||||
<xsl:call-template name="rml"/>
|
||||
</xsl:template>
|
||||
|
||||
<!-- stylesheet -->
|
||||
|
||||
<xsl:template name="stylesheet">
|
||||
<blockTableStyle id="products">
|
||||
<blockFont name="Helvetica-Bold" size="10" start="0,0" stop="-1,0"/>
|
||||
<blockBackground colorName="grey" start="0,0" stop="-1,0"/>
|
||||
<blockTextColor colorName="white" start="0,0" stop="-1,0"/>
|
||||
<blockValign value="TOP"/>
|
||||
<blockAlignment value="CENTER" start="0,0" stop="-1,0"/>
|
||||
<blockAlignment value="RIGHT" start="1,1" stop="-1,-1"/>
|
||||
<lineStyle kind="GRID" colorName="black"/>
|
||||
</blockTableStyle>
|
||||
</xsl:template>
|
||||
|
||||
<xsl:template name="story">
|
||||
<xsl:apply-templates select="lotlist"/>
|
||||
</xsl:template>
|
||||
|
||||
<xsl:template name="lotlist">
|
||||
<nextFrame/>
|
||||
<setNextTemplate name="other_pages"/>
|
||||
<xsl:apply-templates select="lot"/>
|
||||
</xsl:template>
|
||||
|
||||
<xsl:template match="lot">
|
||||
|
||||
<spacer length="1cm"/>
|
||||
|
||||
<blockTable colWidths="8cm,2.5cm,2cm,2cm,2cm,2.5cm" style="products" repeatRows="1">
|
||||
<tr>
|
||||
<td t="1">Product</td><td t="1">Variants</td><td t="1">Amount</td><td t="1">UoM</td><td t="1">Unit Price</td><td t="1">Value</td>
|
||||
</tr>
|
||||
<xsl:apply-templates select="product"/>
|
||||
</blockTable>
|
||||
|
||||
<setNextTemplate name="other_pages"/>
|
||||
<pageBreak/>
|
||||
<!--
|
||||
<setNextTemplate name="first_page"/>
|
||||
<nextFrame/>
|
||||
-->
|
||||
</xsl:template>
|
||||
|
||||
<xsl:template match="product">
|
||||
<tr>
|
||||
<td><para><xsl:value-of select="name"/></para></td>
|
||||
<td><para><xsl:value-of select="variants"/></para></td>
|
||||
<td><xsl:value-of select="amount"/></td>
|
||||
<td><xsl:value-of select="uom"/></td>
|
||||
<td><xsl:value-of select="price"/></td>
|
||||
<td><xsl:value-of select="amount * price"/></td>
|
||||
<!--
|
||||
<td><xsl:value-of select="//product_amount[id=$product_id]/amount"/></td>
|
||||
<td><xsl:value-of select="//product_amount[id=$product_id]/amount * price"/></td>
|
||||
-->
|
||||
</tr>
|
||||
</xsl:template>
|
||||
|
||||
</xsl:stylesheet>
|
||||
|
|
@ -3,14 +3,6 @@
|
|||
<data>
|
||||
<wizard string="Check EAN13" model="product.product" name="product.ean13" id="wizard_ean_check"/>
|
||||
|
||||
<wizard id="wizard_price" string="Product Cost Structure" model="product_product" name="product_price" menu="False"/>
|
||||
<record model="ir.values" id="ir_project_cost_structure">
|
||||
<field name="key2" eval="'client_print_multi'"/>
|
||||
<field name="model" eval="'product.product'"/>
|
||||
<field name="name">Product Cost Structure</field>
|
||||
<field name="value" eval="'ir.actions.wizard,%d'%wizard_price"/>
|
||||
<field name="object" eval="True"/>
|
||||
</record>
|
||||
</data>
|
||||
</terp>
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue