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

[IMP] minor useability improvements 

bzr revid: fp@tinyerp.com-20120523144245-a3yqo9oi4cwf6lz4
This commit is contained in:
Fabien Pinckaers 2012-05-23 16:42:45 +02:00
parent de97edb9cb
commit 8a627dd9eb
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
addons/mail/static/src/xml/mail.xml
View File

@ -10,7 +10,7 @@
</table> </table>
<div class="oe_mail_wall_left"> <div class="oe_mail_wall_left">
<div class="oe_mail_wall_act"> <div class="oe_mail_wall_act">
<textarea class="oe_mail oe_mail_wall_action_textarea" placeholder="Add a personnal message here..."/> <textarea class="oe_mail oe_mail_wall_action_textarea" placeholder="What are you working on?"/>
<button class="oe_right oe_mail_wall_button_comment" type="button">Post comment</button> <button class="oe_right oe_mail_wall_button_comment" type="button">Post comment</button>
</div> </div>
<div class="oe_clear"></div> <div class="oe_clear"></div>

2
addons/sale/sale.py
View File

@ -1015,7 +1015,7 @@ class sale_order_line(osv.osv):
help="If 'on order', it triggers a procurement when the sale order is confirmed to create a task, purchase order or manufacturing order linked to this sale order line."), help="If 'on order', it triggers a procurement when the sale order is confirmed to create a task, purchase order or manufacturing order linked to this sale order line."),
'property_ids': fields.many2many('mrp.property', 'sale_order_line_property_rel', 'order_id', 'property_id', 'Properties', readonly=True, states={'draft': [('readonly', False)]}), 'property_ids': fields.many2many('mrp.property', 'sale_order_line_property_rel', 'order_id', 'property_id', 'Properties', readonly=True, states={'draft': [('readonly', False)]}),
'address_allotment_id': fields.many2one('res.partner', 'Allotment Partner'), 'address_allotment_id': fields.many2one('res.partner', 'Allotment Partner'),
'product_uom_qty': fields.float('Quantity (Unit of Measure)', digits_compute= dp.get_precision('Product UoS'), required=True, readonly=True, states={'draft': [('readonly', False)]}), 'product_uom_qty': fields.float('Quantity', digits_compute= dp.get_precision('Product UoS'), required=True, readonly=True, states={'draft': [('readonly', False)]}),
'product_uom': fields.many2one('product.uom', 'Unit of Measure ', required=True, readonly=True, states={'draft': [('readonly', False)]}), 'product_uom': fields.many2one('product.uom', 'Unit of Measure ', required=True, readonly=True, states={'draft': [('readonly', False)]}),
'product_uos_qty': fields.float('Quantity (UoS)' ,digits_compute= dp.get_precision('Product UoS'), readonly=True, states={'draft': [('readonly', False)]}), 'product_uos_qty': fields.float('Quantity (UoS)' ,digits_compute= dp.get_precision('Product UoS'), readonly=True, states={'draft': [('readonly', False)]}),
'product_uos': fields.many2one('product.uom', 'Product UoS'), 'product_uos': fields.many2one('product.uom', 'Product UoS'),

4
addons/sale/sale_view.xml
View File

@ -199,9 +199,9 @@
</form> </form>
<tree string="Sales Order Lines"> <tree string="Sales Order Lines">
<field colspan="4" name="name"/> <field colspan="4" name="name"/>
<field name="product_uom_qty" string="Qty(Unit of Measure)"/> <field name="product_uom_qty" string="Quantity"/>
<field name="product_uom" string="Unit of Measure" groups="product.group_uom"/> <field name="product_uom" string="Unit of Measure" groups="product.group_uom"/>
<field groups="product.group_uos" name="product_uos_qty" string="Qty(UoS)"/> <field groups="product.group_uos" name="product_uos_qty" string="Quantity (UoS)"/>
<field groups="product.group_uos" name="product_uos" string="UoS"/> <field groups="product.group_uos" name="product_uos" string="UoS"/>
<field name="discount" groups="sale.group_discount_per_so_line"/> <field name="discount" groups="sale.group_discount_per_so_line"/>
<field name="price_unit"/> <field name="price_unit"/>