[IMP]:renamed fieldslable
bzr revid: apa@tinyerp.com-20120530133436-wihrnh13wr12s4m8
This commit is contained in:
parent
6f42929b39
commit
ee1b8f1342
|
@ -197,10 +197,10 @@
|
||||||
</tr>
|
</tr>
|
||||||
</table>
|
</table>
|
||||||
</group>-->
|
</group>-->
|
||||||
<group colspan="4" class="oe_form_group_label_border">
|
<group colspan="4" class="oe_form_group_label_border">
|
||||||
<field name="pricelist_id" />
|
<field name="pricelist_id" />
|
||||||
<field name="to_invoice" widget="selection" />
|
<field name="to_invoice" widget="selection" />
|
||||||
</group>
|
</group>
|
||||||
</xpath>
|
</xpath>
|
||||||
<!-- <notebook position="inside">
|
<!-- <notebook position="inside">
|
||||||
<page string="Invoice Analysis">
|
<page string="Invoice Analysis">
|
||||||
|
|
|
@ -63,13 +63,13 @@ class account_analytic_account(osv.osv):
|
||||||
|
|
||||||
_inherit = "account.analytic.account"
|
_inherit = "account.analytic.account"
|
||||||
_columns = {
|
_columns = {
|
||||||
'pricelist_id': fields.many2one('product.pricelist', 'Customer Pricelist',
|
'pricelist_id': fields.many2one('product.pricelist', 'Pricelist',
|
||||||
help="The product to invoice is defined on the employee form, the price will be deduced by this pricelist on the product."),
|
help="The product to invoice is defined on the employee form, the price will be deduced by this pricelist on the product."),
|
||||||
'amount_max': fields.float('Max. Invoice Price',
|
'amount_max': fields.float('Max. Invoice Price',
|
||||||
help="Keep empty if this contract is not limited to a total fixed price."),
|
help="Keep empty if this contract is not limited to a total fixed price."),
|
||||||
'amount_invoiced': fields.function(_invoiced_calc, string='Invoiced Amount',
|
'amount_invoiced': fields.function(_invoiced_calc, string='Invoiced Amount',
|
||||||
help="Total invoiced"),
|
help="Total invoiced"),
|
||||||
'to_invoice': fields.many2one('hr_timesheet_invoice.factor', 'Invoice on Timesheet & Costs',
|
'to_invoice': fields.many2one('hr_timesheet_invoice.factor', 'Timesheet Invocing Ratio',
|
||||||
help="Fill this field if you plan to automatically generate invoices based " \
|
help="Fill this field if you plan to automatically generate invoices based " \
|
||||||
"on the costs in this analytic account: timesheets, expenses, ..." \
|
"on the costs in this analytic account: timesheets, expenses, ..." \
|
||||||
"You can configure an automatic invoice rate on analytic accounts."),
|
"You can configure an automatic invoice rate on analytic accounts."),
|
||||||
|
|
Loading…
Reference in New Issue