pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[IMP] product: improve view if bigger uom than reference

Browse Source 
bzr revid: hmo@tinyerp.com-20121012123549-2mlyit8k21ime5qq
This commit is contained in:
Harry (OpenERP)
2012-10-12 18:05:49 +05:30
parent a4a339dfa9
commit 46c1a230bb
3 changed files with 22 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/product/product_view.xml
+2 -2
View File
@@ -429,8 +429,8 @@
</group>
<group>
<field name="uom_type" on_change="onchange_type(uom_type)"/>
<field name="factor" attrs="{'invisible':[('uom_type','!=','smaller')]}" widget="uom_factor" options="{'category_field': 'category_id', 'name_field': 'name'}"/>
- <field name="factor_inv" attrs="{'invisible':[('uom_type','!=','bigger')]}" widget="uom_factor" options="{'category_field': 'category_id', 'name_field': 'name'}"/>
<field name="factor" attrs="{'invisible':[('uom_type','!=','smaller')]}" widget="uom_factor"/>
- <field name="factor_inv" attrs="{'invisible':[('uom_type','!=','bigger')]}" widget="uom_factor"/>
<field name="rounding"/>
</group>
</group>
addons/product/static/src/js/product.js
+12 -14
View File
@@ -4,17 +4,16 @@ instance.web.form.FieldUOMFactor = instance.web.form.FieldFloat.extend({
template: "FieldUOMFactor",
init: function() {
this._super.apply(this, arguments);
this.set({"category": false, 'name': false});
if (this.options.category_field) {
this.field_manager.on("field_changed:" + this.options.category_field, this, function() {
this.set({"category": this.field_manager.get_field_value(this.options.category_field)});
});
}
if (this.options.name_field) {
this.field_manager.on("field_changed:" + this.options.name_field, this, function() {
this.set({"name": this.field_manager.get_field_value(this.options.name_field)});
});
}
this.set({"category": false, 'name': false, 'uom_type': false});
this.field_manager.on("field_changed:category_id", this, function() {
this.set({"category": this.field_manager.get_field_value("category_id")});
});
this.field_manager.on("field_changed:name", this, function() {
this.set({"name": this.field_manager.get_field_value("name")});
});
this.field_manager.on("field_changed:uom_type", this, function() {
this.set({"uom_type": this.field_manager.get_field_value("uom_type")});
});
this.on("change:category", this, this.get_uom_reference);
this.get_uom_reference();
this.ci_dm = new instance.web.DropMisordered();
@@ -23,6 +22,7 @@ instance.web.form.FieldUOMFactor = instance.web.form.FieldFloat.extend({
var tmp = this._super();
this.on("change:uom_reference", this, this.reinitialize);
this.on("change:name", this, this.reinitialize);
this.on("change:uom_type", this, this.reinitialize);
return tmp;
},
get_uom_reference: function() {
@@ -39,8 +39,6 @@ instance.web.form.FieldUOMFactor = instance.web.form.FieldFloat.extend({
parse_value: function(val, def) {
return instance.web.parse_value(val, {type: "float"}, def);
},
format_value: function(val, def) {
return instance.web.format_value(val, {type: "float"}, def);
},
});
}
addons/product/static/src/xml/product.xml
+8 -1
View File
@@ -5,10 +5,17 @@
<t t-name="FieldUOMFactor" t-extend="FieldChar">
<t t-jquery="t:first" t-operation="before">
<t t-if="widget.get('uom_reference')">
1 <t t-esc="widget.get('uom_reference').name"/> =
<t t-if="widget.get('uom_type') === 'smaller'">
1 <t t-esc="widget.get('uom_reference').name"/> =
</t>
</t>
</t>
<t t-jquery="t:last" t-operation="after">
<t t-if="widget.get('uom_reference')">
<t t-if="widget.get('uom_type') === 'bigger'">
<t t-esc="widget.get('uom_reference').name"/> = 1
</t>
</t>
<t t-esc="widget.get('name')"/>
</t>
</t>