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

[IMP] useability 

bzr revid: fp@tinyerp.com-20121026153436-v3y2i49iarpoknok
This commit is contained in:
Fabien Pinckaers 2012-10-26 17:34:36 +02:00
parent 00caf72c6c
commit e6159de18f
3 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
addons/sale/sale.py
View File

@ -202,7 +202,7 @@ class sale_order(osv.osv):
- With 'Before Delivery', a draft invoice is created, and it must be paid before delivery."""), - With 'Before Delivery', a draft invoice is created, and it must be paid before delivery."""),
'pricelist_id': fields.many2one('product.pricelist', 'Pricelist', required=True, readonly=True, states={'draft': [('readonly', False)], 'sent': [('readonly', False)]}, help="Pricelist for current sales order."), 'pricelist_id': fields.many2one('product.pricelist', 'Pricelist', required=True, readonly=True, states={'draft': [('readonly', False)], 'sent': [('readonly', False)]}, help="Pricelist for current sales order."),
'currency_id': fields.related('pricelist_id', 'currency_id', type="many2one", relation="res.currency", readonly=True, required=True), 'currency_id': fields.related('pricelist_id', 'currency_id', type="many2one", relation="res.currency", readonly=True, required=True),
'project_id': fields.many2one('account.analytic.account', 'Contract/Analytic Account', readonly=True, states={'draft': [('readonly', False)], 'sent': [('readonly', False)]}, help="The analytic account related to a sales order."), 'project_id': fields.many2one('account.analytic.account', 'Contract / Analytic', readonly=True, states={'draft': [('readonly', False)], 'sent': [('readonly', False)]}, help="The analytic account related to a sales order."),
'order_line': fields.one2many('sale.order.line', 'order_id', 'Order Lines', readonly=True, states={'draft': [('readonly', False)], 'sent': [('readonly', False)]}), 'order_line': fields.one2many('sale.order.line', 'order_id', 'Order Lines', readonly=True, states={'draft': [('readonly', False)], 'sent': [('readonly', False)]}),
'invoice_ids': fields.many2many('account.invoice', 'sale_order_invoice_rel', 'order_id', 'invoice_id', 'Invoices', readonly=True, help="This is the list of invoices that have been generated for this sales order. The same sales order may have been invoiced in several times (by line for example)."), 'invoice_ids': fields.many2many('account.invoice', 'sale_order_invoice_rel', 'order_id', 'invoice_id', 'Invoices', readonly=True, help="This is the list of invoices that have been generated for this sales order. The same sales order may have been invoiced in several times (by line for example)."),

5
addons/sale/sale_view.xml
View File

@ -286,11 +286,8 @@
</div> </div>
<field name="amount_total" nolabel="1" class="oe_subtotal_footer_separator" widget='monetary' options="{'currency_field': 'currency_id'}"/> <field name="amount_total" nolabel="1" class="oe_subtotal_footer_separator" widget='monetary' options="{'currency_field': 'currency_id'}"/>
</group> </group>
<group name="sale_margin_grp">
</group>
<div class="oe_clear"/> <div class="oe_clear"/>
<label for="note"/><br/> <field name="note" class="oe_inline" placeholder="Terms and conditions..."/>
<field name="note" class="oe_inline"/>
</page> </page>
<page string="Other Information" groups="base.group_user"> <page string="Other Information" groups="base.group_user">
<group> <group>

9
addons/sale_margin/sale_margin_view.xml
View File

@ -7,12 +7,9 @@
<field name="model">sale.order</field> <field name="model">sale.order</field>
<field name="inherit_id" ref="sale.view_order_form"/> <field name="inherit_id" ref="sale.view_order_form"/>
<field name="arch" type="xml"> <field name="arch" type="xml">
<xpath expr="//group[@name='sale_margin_grp']" position="inside"> <xpath expr="//group[@name='sale_total']" position="after">
<group> <group name="sale_margin_grp">
<label for="margin"/> <field name="margin" widget='monetary' options="{'currency_field': 'currency_id'}"/>
<div>
<field name="margin" widget='monetary' options="{'currency_field': 'currency_id'}"/>
</div>
</group> </group>
</xpath> </xpath>
</field> </field>