Mayur Maheshwari(OpenERP) has proposed merging
lp:~openerp-dev/openobject-addons/trunk-addons_isue16_warehouse-mma into
lp:openobject-addons.
Requested reviews:
OpenERP Core Team (openerp)
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-addons_isue16_warehouse-mma/+merge/130293
Hello,
I have done following things:
=> Added tool-tip for computation in Unit of Measure.
=> Improve tool-tip for view type in Category Type in product form.
=> Accounting Properties and Accounting Stock Properties should only appear
with accounting and stock installed.
Thanks.
Mayur
--
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-addons_isue16_warehouse-mma/+merge/130293
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openobject-addons/trunk-addons_isue16_warehouse-mma.
=== modified file 'account/product_view.xml'
--- account/product_view.xml 2012-10-03 06:48:40 +0000
+++ account/product_view.xml 2012-10-18 07:31:26 +0000
@@ -49,9 +49,11 @@
<field name="inherit_id" ref="product.product_category_form_view"/>
<field name="arch" type="xml">
<data>
- <xpath expr="/form/sheet//group[@name='account_property']" position="inside">
- <field name="property_account_income_categ" domain="[('type','<>','view'),('type','<>','consolidation')]"/>
- <field name="property_account_expense_categ" domain="[('type','<>','view'),('type','<>','consolidation')]"/>
+ <xpath expr="//group[@name='parent']" position="inside">
+ <group name="account_property" string="Account Properties" colspan="2">
+ <field name="property_account_income_categ" domain="[('type','<>','view'),('type','<>','consolidation')]"/>
+ <field name="property_account_expense_categ" domain="[('type','<>','view'),('type','<>','consolidation')]"/>
+ </group>
</xpath>
</data>
</field>
=== modified file 'account_anglo_saxon/product_view.xml'
--- account_anglo_saxon/product_view.xml 2012-08-08 10:59:07 +0000
+++ account_anglo_saxon/product_view.xml 2012-10-18 07:31:26 +0000
@@ -29,10 +29,10 @@
<record id="view_category_property_form" model="ir.ui.view">
<field name="name">product.category.property.form.inherit.stock</field>
<field name="model">product.category</field>
- <field name="inherit_id" ref="product.product_category_form_view"/>
+ <field name="inherit_id" ref="account.view_category_property_form"/>
<field name="arch" type="xml">
<data>
- <xpath expr="/form/sheet//group[@name='account_property']" position="inside">
+ <xpath expr="//field[@name='property_account_income_categ']" position="before">
<field name="property_account_creditor_price_difference_categ" domain="[('type','<>','view'),('type','<>','consolidation')]"/>
</xpath>
</data>
=== modified file 'product/product.py'
--- product/product.py 2012-10-13 10:09:05 +0000
+++ product/product.py 2012-10-18 07:31:26 +0000
@@ -113,7 +113,7 @@
'category_id': fields.many2one('product.uom.categ', 'Category', required=True, ondelete='cascade',
help="Quantity conversions may happen automatically between Units of Measure in the same category, according to their respective ratios."),
'factor': fields.float('Ratio', required=True,digits=(12, 12),
- help='How many times this Unit of Measure is smaller than the reference Unit of Measure in this category:\n'\
+ help='How much bigger or smaller this unit is compared to the reference Unit of Measure for this category:\n'\
'1 * (reference unit) = ratio * (this unit)'),
'factor_inv': fields.function(_factor_inv, digits=(12,12),
fnct_inv=_factor_inv_write,
@@ -233,7 +233,7 @@
'parent_id': fields.many2one('product.category','Parent Category', select=True, ondelete='cascade'),
'child_id': fields.one2many('product.category', 'parent_id', string='Child Categories'),
'sequence': fields.integer('Sequence', select=True, help="Gives the sequence order when displaying a list of product categories."),
- 'type': fields.selection([('view','View'), ('normal','Normal')], 'Category Type'),
+ 'type': fields.selection([('view','View'), ('normal','Normal')], 'Category Type', help="A category of the view type is a virtual category that can be used as the parent of another category to create hierarchical structure."),
'parent_left': fields.integer('Left Parent', select=1),
'parent_right': fields.integer('Right Parent', select=1),
}
=== modified file 'product/product_view.xml'
--- product/product_view.xml 2012-10-15 17:54:19 +0000
+++ product/product_view.xml 2012-10-18 07:31:26 +0000
@@ -318,17 +318,11 @@
</h1>
</div>
<group>
- <group>
+ <group name="parent" col="4">
<field name="parent_id"/>
- </group>
- <group>
<field name="type"/>
</group>
</group>
- <group name="basic">
- <group name="account_property" string="Account Properties"/>
- <group name="account_stock_property" string="Account Stock Properties"/>
- </group>
</sheet>
</form>
</field>
=== modified file 'stock/product_view.xml'
--- stock/product_view.xml 2012-10-13 11:22:53 +0000
+++ stock/product_view.xml 2012-10-18 07:31:26 +0000
@@ -17,15 +17,17 @@
<record id="view_category_property_form" model="ir.ui.view">
<field name="name">product.category.stock.property.form.inherit</field>
<field name="model">product.category</field>
- <field name="inherit_id" ref="product.product_category_form_view"/>
+ <field name="inherit_id" ref="account.view_category_property_form"/>
<field name="arch" type="xml">
<data>
- <xpath expr="/form/sheet//group[@name='account_stock_property']" position="inside">
- <field name="property_stock_account_input_categ" domain="[('type','<>','view'),('type','<>','consolidation')]"/>
- <field name="property_stock_account_output_categ" domain="[('type','<>','view'),('type','<>','consolidation')]"/>
- <field name="property_stock_valuation_account_id" domain="[('type','<>','view'), ('type','<>','consolidation')]"/>
- <field name="property_stock_journal"/>
- </xpath>
+ <group name="account_property" position="after">
+ <group name="account_stock_property" string="Account Stock Properties" colspan="2">
+ <field name="property_stock_account_input_categ" domain="[('type','<>','view'),('type','<>','consolidation')]"/>
+ <field name="property_stock_account_output_categ" domain="[('type','<>','view'),('type','<>','consolidation')]"/>
+ <field name="property_stock_valuation_account_id" domain="[('type','<>','view'), ('type','<>','consolidation')]"/>
+ <field name="property_stock_journal"/>
+ </group>
+ </group>
</data>
</field>
</record>
_______________________________________________
Mailing list: https://launchpad.net/~openerp-dev-gtk
Post to : [email protected]
Unsubscribe : https://launchpad.net/~openerp-dev-gtk
More help : https://help.launchpad.net/ListHelp
