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

[IMP] stock: Imrpove the view and tooltips of product 

bzr revid: sbh@tinyerp.com-20100830105118-6ugyk6x669wkzsm3
This commit is contained in:
sbh (Open ERP) 2010-08-30 16:21:18 +05:30
parent fb84333b5b
commit f33aad6c5e
2 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
addons/account/product_view.xml
View File

@ -9,15 +9,19 @@
<field name="arch" type="xml">
<notebook position="inside">
<page string="Accounting">
<group groups="base.group_extended">
<separator string="Sales Properties" colspan="2"/>
<separator string="Purchase Properties" colspan="2"/>
<field name="property_account_income" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]" attrs="{'readonly':[('sale_ok','=',0)]}" groups="base.group_extended"/>
<field name="property_account_expense" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]" attrs="{'readonly':[('purchase_ok','=',0)]}" groups="base.group_extended"/>
</group>
<newline/>
<group colspan="2">
<separator string="Sale Taxes" colspan="2"/>
<separator string="Purchase Taxes" colspan="2"/>
<field name="taxes_id" nolabel="1" colspan="2" attrs="{'readonly':[('sale_ok','=',0)]}"/>
<field name="supplier_taxes_id" nolabel="1" colspan="2" attrs="{'readonly':[('purchase_ok','=',0)]}"/>
</group>
</page>
</notebook>
</field>

12
addons/stock/stock.py
View File

@ -553,12 +553,12 @@ class stock_picking(osv.osv):
('done', 'Done'),
('cancel', 'Cancelled'),
], 'State', readonly=True, select=True,
help=' * The \'Draft\' state is used when a user not confirmed yet and will not be scheduled until confirmed picking. \
\n* The \'Confirmed \' state is still waiting for the availability of products. \
\n* The \'Available\' state is products reserved, simply waiting for confirmation.\
\n* The \'Waiting\' state is used waiting for another move to proceed before it becomes automatically available. (e.g. in Make-To-Order flows).\
\n* The \'Done\' has been processed, cant be modified or cancelled anymore. \
\n* The \'Cancelled\' has been cancelled, cant be confirmed anymore. \
help=' * The \'Draft\' Not confirmed yet and will not be scheduled until confirmed picking. \
\n* The \'Confirmed \' Still waiting for the availability of products. \
\n* The \'Available\' Products reserved, simply waiting for confirmation.\
\n* The \'Waiting\' Waiting for another move to proceed before it becomes automatically available. (e.g. in Make-To-Order flows).\
\n* The \'Done\' Has been processed, can not be modified or cancelled anymore. \
\n* The \'Cancelled\' Has been cancelled, can not be confirmed anymore. \
'),
'min_date': fields.function(get_min_max_date, fnct_inv=_set_minimum_date, multi="min_max_date",