This commit is contained in:
jeffery 2013-08-17 06:43:52 -07:00
commit 055a937349
5 changed files with 298 additions and 294 deletions

View File

@ -1,60 +1,60 @@
<?xml version="1.0" encoding="utf-8"?>
<openerp>
<data>
<!-- res.company.qc.trigger.template -->
<record id="company_qc_trigger_template_form" model="ir.ui.view">
<field name="name">res.company.qc.trigger.template.form</field>
<field name="model">res.company.qc.trigger.template</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="QC Template Trigger by Company">
<field name="company_id" select="1"/>
<field name="sequence"/>
<field name="trigger_id" select="1"/>
<field name="template_id"/>
</form>
<data>
<!-- res.company.qc.trigger.template -->
<record id="company_qc_trigger_template_form" model="ir.ui.view">
<field name="name">res.company.qc.trigger.template.form</field>
<field name="model">res.company.qc.trigger.template</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="QC Template Trigger by Company">
<field name="company_id" select="1"/>
<field name="sequence"/>
<field name="trigger_id" select="1"/>
<field name="template_id"/>
</form>
</field>
</record>
<record id="company_qc_trigger_template_tree" model="ir.ui.view">
<field name="name">res.company.qc.trigger.template.tree</field>
<field name="model">res.company.qc.trigger.template</field>
<field name="type">tree</field>
<field name="arch" type="xml">
<tree string="QC Template Triggers by Company">
<field name="company_id"/>
<field name="sequence"/>
<field name="trigger_id"/>
<field name="template_id"/>
</tree>
</field>
</record>
<!-- res.company -->
<record id="company_prodlot_qc_form" model="ir.ui.view">
<field name="name">res.company.prodlot.quality_control.form</field>
<field name="model">res.company</field>
<field name="type">form</field>
<field name="inherit_id" ref="base.view_company_form"/>
<field name="arch" type="xml">
<page string="Configuration" position="inside">
<group name="prodlot_qc" colspan="2" col="2">
<separator string="Quality Control Triggers" colspan="2"/>
<field name="qc_template_trigger_ids" nolabel="1" colspan="2">
<tree string="Quality Control Triggers" editable="bottom">
<field name="sequence"/>
<field name="trigger_id"/>
<field name="template_id"/>
</tree>
<form string="Quality Control Trigger">
<field name="trigger_id"/>
<field name="template_id"/>
</form>
</field>
</record>
<record id="company_qc_trigger_template_tree" model="ir.ui.view">
<field name="name">res.company.qc.trigger.template.tree</field>
<field name="model">res.company.qc.trigger.template</field>
<field name="type">tree</field>
<field name="arch" type="xml">
<tree string="QC Template Triggers by Company">
<field name="company_id"/>
<field name="sequence"/>
<field name="trigger_id"/>
<field name="template_id"/>
</tree>
</field>
</record>
<!-- res.company -->
<record id="company_prodlot_qc_form" model="ir.ui.view">
<field name="name">res.company.prodlot.quality_control.form</field>
<field name="model">res.company</field>
<field name="type">form</field>
<field name="inherit_id" ref="base.view_company_form"/>
<field name="arch" type="xml">
<page string="Configuration" position="inside">
<group name="prodlot_qc" colspan="2" col="2">
<separator string="Quality Control Triggers" colspan="2"/>
<field name="qc_template_trigger_ids" nolabel="1" colspan="2">
<tree string="Quality Control Triggers" editable="bottom">
<field name="sequence"/>
<field name="trigger_id"/>
<field name="template_id"/>
</tree>
<form string="Quality Control Trigger">
<field name="trigger_id"/>
<field name="template_id"/>
</form>
</field>
</group>
</page>
</field>
</record>
</data>
</group>
</page>
</field>
</record>
</data>
</openerp>

View File

@ -63,6 +63,10 @@
</record>
</data>
<data noupdate="1">
<record id="product.cat0" model="product.category">
<field name="parent_id" ref="product.product_category_all"/>
<field name="name">QC TEST</field>
</record>
<record id="product_wo_qc0" model="product.product">
<field name="name">Product without Quality Control</field>
<field name="type">product</field>

View File

@ -1,66 +1,63 @@
<?xml version="1.0" encoding="utf-8"?>
<openerp>
<data>
<!-- product.qc.trigger.template -->
<record id="product_qc_trigger_template_form" model="ir.ui.view">
<field name="name">product.qc.trigger.template.form</field>
<field name="model">product.qc.trigger.template</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="QC Template Trigger by Product" col="6">
<field name="product_id" select="1"/>
<field name="sequence"/>
<field name="company_id" select="1"/>
<field name="trigger_id" select="1"/>
<field name="template_id"/>
</form>
<data>
<!-- product.qc.trigger.template -->
<record id="product_qc_trigger_template_form" model="ir.ui.view">
<field name="name">product.qc.trigger.template.form</field>
<field name="model">product.qc.trigger.template</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="QC Template Trigger by Product" col="6">
<field name="product_id" select="1"/>
<field name="sequence"/>
<field name="company_id" select="1"/>
<field name="trigger_id" select="1"/>
<field name="template_id"/>
</form>
</field>
</record>
<record id="product_qc_trigger_template_tree" model="ir.ui.view">
<field name="name">product.qc.trigger.template.tree</field>
<field name="model">product.qc.trigger.template</field>
<field name="type">tree</field>
<field name="arch" type="xml">
<tree string="QC Template Triggers by Product">
<field name="product_id"/>
<field name="sequence"/>
<field name="trigger_id"/>
<field name="template_id"/>
<field name="company_id"/>
</tree>
</field>
</record>
<!-- product.product -->
<record id="product_prodlot_qc_form" model="ir.ui.view">
<field name="name">product.prodlot.quality_control.form</field>
<field name="model">product.product</field>
<field name="type">form</field>
<field name="inherit_id" ref="stock.view_normal_procurement_locations_form"/>
<field name="arch" type="xml">
<group name="lot" position="after">
<group name="lot_qc" colspan="2" col="2" groups="nan_quality_control.group_quality_control_supervisor">
<separator string="Quality Control Triggers" colspan="2"/>
<field name="qc_template_trigger_ids" nolabel="1" colspan="2">
<tree string="Quality Control Triggers" editable="bottom">
<field name="sequence"/>
<field name="trigger_id"/>
<field name="template_id"/>
<field name="company_id"/>
</tree>
<form string="Quality Control Trigger" col="6">
<field name="company_id" select="1"/>
<newline/>
<field name="trigger_id" select="1"/>
<field name="template_id"/>
</form>
</field>
</record>
<record id="product_qc_trigger_template_tree" model="ir.ui.view">
<field name="name">product.qc.trigger.template.tree</field>
<field name="model">product.qc.trigger.template</field>
<field name="type">tree</field>
<field name="arch" type="xml">
<tree string="QC Template Triggers by Product">
<field name="product_id"/>
<field name="sequence"/>
<field name="trigger_id"/>
<field name="template_id"/>
<field name="company_id"/>
</tree>
</field>
</record>
<!-- product.product -->
<record id="product_prodlot_qc_form" model="ir.ui.view">
<field name="name">product.prodlot.quality_control.form</field>
<field name="model">product.product</field>
<field name="type">form</field>
<field name="inherit_id" ref="stock.view_normal_stock_property_form"/>
<field name="arch" type="xml">
<group name="lot" position="after">
<group name="lot_qc" colspan="2" col="2" groups="base.group_extended">
<separator string="Quality Control Triggers" colspan="2"/>
<field name="qc_template_trigger_ids" nolabel="1" colspan="2">
<tree string="Quality Control Triggers" editable="bottom">
<field name="sequence"/>
<field name="trigger_id"/>
<field name="template_id"/>
<field name="company_id"/>
</tree>
<form string="Quality Control Trigger" col="6">
<field name="company_id" select="1"/>
<newline/>
<field name="trigger_id" select="1"/>
<field name="template_id"/>
</form>
</field>
</group>
</group>
</field>
</record>
</data>
</group>
</group>
</field>
</record>
</data>
</openerp>

View File

@ -1,53 +1,53 @@
<?xml version="1.0" encoding="UTF-8"?>
<openerp>
<data>
<!-- qc.trigger -->
<record id="qc_trigger_form" model="ir.ui.view">
<field name="name">qc.trigger.form</field>
<field name="model">qc.trigger</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Trigger Tag">
<field name="name" select="1"/>
</form>
</field>
</record>
<record id="qc_trigger_tree" model="ir.ui.view">
<field name="name">qc.trigger.tree</field>
<field name="model">qc.trigger</field>
<field name="type">tree</field>
<field name="arch" type="xml">
<tree string="Trigger Tags">
<field name="name"/>
</tree>
</field>
</record>
<record id="act_trigger_tag_view" model="ir.actions.act_window">
<field name="name">Trigger Tags</field>
<field name="type">ir.actions.act_window</field>
<field name="res_model">qc.trigger</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
</record>
<menuitem id="menu_action_trigger_tag"
action="act_trigger_tag_view"
parent="nan_quality_control.qc_menu_config" sequence="50"/>
<!-- qc.test -->
<record id="action_qc_test_prodlot_view" model="ir.actions.act_window">
<field name="name">Production Lot Tests</field>
<field name="res_model">qc.test</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
<field name="domain">[('object_id','like','stock.production.lot,')]</field>
</record>
<menuitem id="qc_test_prodlot_menu" action="action_qc_test_prodlot_view"
name="Production Lot Tests"
parent="nan_quality_control.qc_test_menu"/>
</data>
<data>
<!-- qc.trigger -->
<record id="qc_trigger_form" model="ir.ui.view">
<field name="name">qc.trigger.form</field>
<field name="model">qc.trigger</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Trigger Tag">
<field name="name" select="1"/>
</form>
</field>
</record>
<record id="qc_trigger_tree" model="ir.ui.view">
<field name="name">qc.trigger.tree</field>
<field name="model">qc.trigger</field>
<field name="type">tree</field>
<field name="arch" type="xml">
<tree string="Trigger Tags">
<field name="name"/>
</tree>
</field>
</record>
<record id="act_trigger_tag_view" model="ir.actions.act_window">
<field name="name">Trigger Tags</field>
<field name="type">ir.actions.act_window</field>
<field name="res_model">qc.trigger</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
</record>
<menuitem id="menu_action_trigger_tag"
action="act_trigger_tag_view"
parent="nan_quality_control.qc_menu_config" sequence="50"/>
<!-- qc.test -->
<record id="action_qc_test_prodlot_view" model="ir.actions.act_window">
<field name="name">Production Lot Tests</field>
<field name="res_model">qc.test</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
<field name="domain">[('object_id','like','stock.production.lot,')]</field>
</record>
<menuitem id="qc_test_prodlot_menu" action="action_qc_test_prodlot_view"
name="Production Lot Tests"
parent="nan_quality_control.qc_test_menu"/>
</data>
</openerp>

View File

@ -1,131 +1,134 @@
<?xml version="1.0" encoding="utf-8"?>
<openerp>
<data>
<!-- stock.production.lot.qc.trigger.test -->
<record id="prodlot_qc_trigger_test_form" model="ir.ui.view">
<field name="name">stock.production.lot.qc.trigger.test.form</field>
<field name="model">stock.production.lot.qc.trigger.test</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="QC Test Trigger by Lot" col="6">
<field name="prodlot_id" select="1"/>
<field name="sequence"/>
<field name="trigger_id" select="1"/>
<field name="test_id"/>
<field name="test_approved"/>
<field name="test_success"/>
</form>
<data>
<!-- stock.production.lot.qc.trigger.test -->
<record id="prodlot_qc_trigger_test_form" model="ir.ui.view">
<field name="name">stock.production.lot.qc.trigger.test.form</field>
<field name="model">stock.production.lot.qc.trigger.test</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="QC Test Trigger by Lot" col="6">
<field name="prodlot_id" select="1"/>
<field name="sequence"/>
<field name="trigger_id" select="1"/>
<field name="test_id"/>
<field name="test_approved"/>
<field name="test_success"/>
</form>
</field>
</record>
<record id="prodlot_qc_trigger_test_tree" model="ir.ui.view">
<field name="name">stock.production.lot.qc.trigger.test.tree</field>
<field name="model">stock.production.lot.qc.trigger.test</field>
<field name="type">tree</field>
<field name="arch" type="xml">
<tree string="QC Test Triggers by Lot">
<field name="prodlot_id"/>
<field name="sequence"/>
<field name="trigger_id"/>
<field name="test_id"/>
<field name="test_approved"/>
<field name="test_success"/>
</tree>
</field>
</record>
<!-- stock.production.lot -->
<record id="view_production_lot_qc_form" model="ir.ui.view">
<field name="name">stock.production.lot.quality_control.form</field>
<field name="model">stock.production.lot</field>
<field name="type">form</field>
<field name="inherit_id" ref="stock.view_production_lot_form"/>
<field name="arch" type="xml">
<field name="product_id" position="replace">
<field name="product_id" on_change="onchange_product_id(product_id,context)"/>
</field>
<field name="date" position="replace">
<field name="date"/>
<field name="active"/>
</field>
<notebook position="inside">
<page string="Quality Control">
<separator string="Quality Control Triggers" colspan="4"/>
<field name="qc_test_trigger_ids" nolabel="1" colspan="4"
groups="nan_quality_control.group_quality_control_manager">
<tree string="Quality Control Triggers" editable="bottom">
<field name="sequence"/>
<field name="trigger_id"/>
<field name="test_id"/>
<field name="test_approved"/>
<field name="test_success"/>
</tree>
</field>
</record>
<record id="prodlot_qc_trigger_test_tree" model="ir.ui.view">
<field name="name">stock.production.lot.qc.trigger.test.tree</field>
<field name="model">stock.production.lot.qc.trigger.test</field>
<field name="type">tree</field>
<field name="arch" type="xml">
<tree string="QC Test Triggers by Lot">
<field name="prodlot_id"/>
<field name="sequence"/>
<field name="trigger_id"/>
<field name="test_id"/>
<field name="test_approved"/>
<field name="test_success"/>
</tree>
<field name="qc_test_trigger_ro_ids" nolabel="1" colspan="4"
groups="nan_quality_control.group_quality_control_user">
<tree string="Quality Control Triggers">
<field name="sequence"/>
<field name="trigger_id"/>
<field name="test_id"/>
<field name="test_approved"/>
<field name="test_success"/>
</tree>
</field>
</record>
<!-- stock.production.lot -->
<record id="view_production_lot_qc_form" model="ir.ui.view">
<field name="name">stock.production.lot.quality_control.form</field>
<field name="model">stock.production.lot</field>
<field name="type">form</field>
<field name="inherit_id" ref="stock.view_production_lot_form" />
<field name="arch" type="xml">
<field name="product_id" position="replace">
<field name="product_id" on_change="onchange_product_id(product_id,context)"/>
</field>
<field name="date" position="replace">
<field name="date"/>
<field name="active"/>
</field>
<notebook position="inside">
<page string="Quality Control">
<separator string="Quality Control Triggers" colspan="4"/>
<field name="qc_test_trigger_ids" nolabel="1" colspan="4" groups="nan_quality_control.group_quality_control_manager">
<tree string="Quality Control Triggers" editable="bottom">
<field name="sequence"/>
<field name="trigger_id"/>
<field name="test_id"/>
<field name="test_approved"/>
<field name="test_success"/>
</tree>
</field>
<field name="qc_test_trigger_ro_ids" nolabel="1" colspan="4" groups="nan_quality_control.group_quality_control_user">
<tree string="Quality Control Triggers">
<field name="sequence"/>
<field name="trigger_id"/>
<field name="test_id"/>
<field name="test_approved"/>
<field name="test_success"/>
</tree>
</field>
<field name="current_qc_test_trigger_id" groups="nan_quality_control.group_quality_control_manager"/>
<field name="current_qc_test_id"/>
</page>
</notebook>
<form position="inside">
<group col="7" colspan="4">
<field name="state"/>
<button name="draft" states="cancel" string="Set To Draft" icon="gtk-new"/>
<button name="confirm" states="draft" string="Confirm" icon="gtk-ok"/>
<button name="next_test" states="valid" string="Next Test" icon="gtk-ok"/>
<button name="cancel" states="valid" string="Cancel" icon="gtk-cancel"/>
<button name="action_force_cancel" type="object" states="pending_test,test_failed" string="Force Cancel" icon="gtk-cancel"/>
</group>
</form>
</field>
</record>
<record id="view_production_lot_qc_tree" model="ir.ui.view">
<field name="name">stock.production.lot.quality_control.tree</field>
<field name="model">stock.production.lot</field>
<field name="type">tree</field>
<field name="inherit_id" ref="stock.view_production_lot_tree" />
<field name="arch" type="xml">
<field name="date" position="after">
<field name="current_qc_test_id"/>
<field name="state"/>
</field>
</field>
</record>
<record id="search_product_lot_filter" model="ir.ui.view">
<field name="name">stock.production.lot.quality_control.filter</field>
<field name="model">stock.production.lot</field>
<field name="type">search</field>
<field name="inherit_id" ref="stock.search_product_lot_filter"/>
<field name="arch" type="xml">
<filter name="available" position="after">
<filter icon="terp-dialog-close" name="inactive" string="Inactive" domain="[('active', '=', False)]"/>
</filter>
<filter string="Product" position="after">
<filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
</filter>
</field>
</record>
<!--<record id="action_prodlot_test_popup" model="ir.actions.act_window">
<field name="name">Tests</field>
<field name="src_model">stock.production.lot</field>
<field name="res_model">qc.test</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
<field name="domain">[('id', 'in', [x.test_id.id for x in qc_test_trigger_ids])]</field>
</record>-->
</data>
<field name="current_qc_test_trigger_id" groups="nan_quality_control.group_quality_control_manager"/>
<field name="current_qc_test_id"/>
</page>
</notebook>
<form position="inside">
<group col="7" colspan="4">
<field name="state"/>
<button name="draft" states="cancel" string="Set To Draft" icon="gtk-new"/>
<button name="confirm" states="draft" string="Confirm" icon="gtk-ok"/>
<button name="next_test" states="valid" string="Next Test" icon="gtk-ok"/>
<button name="cancel" states="valid" string="Cancel" icon="gtk-cancel"/>
<button name="action_force_cancel" type="object" states="pending_test,test_failed" string="Force Cancel"
icon="gtk-cancel"/>
</group>
</form>
</field>
</record>
<record id="view_production_lot_qc_tree" model="ir.ui.view">
<field name="name">stock.production.lot.quality_control.tree</field>
<field name="model">stock.production.lot</field>
<field name="type">tree</field>
<field name="inherit_id" ref="stock.view_production_lot_tree"/>
<field name="arch" type="xml">
<field name="date" position="after">
<field name="current_qc_test_id"/>
<field name="state"/>
</field>
</field>
</record>
<record id="search_product_lot_filter" model="ir.ui.view">
<field name="name">stock.production.lot.quality_control.filter</field>
<field name="model">stock.production.lot</field>
<field name="type">search</field>
<field name="inherit_id" ref="stock.search_product_lot_filter"/>
<field name="arch" type="xml">
<filter name="available" position="after">
<filter icon="terp-dialog-close" name="inactive" string="Inactive" domain="[('active', '=', False)]"/>
</filter>
<filter string="Product" position="after">
<filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
</filter>
</field>
</record>
<!--<record id="action_prodlot_test_popup" model="ir.actions.act_window">
<field name="name">Tests</field>
<field name="src_model">stock.production.lot</field>
<field name="res_model">qc.test</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
<field name="domain">[('id', 'in', [x.test_id.id for x in qc_test_trigger_ids])]</field>
</record>-->
</data>
</openerp>