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

[IMP]:renamed fieldslable 

bzr revid: apa@tinyerp.com-20120530133436-wihrnh13wr12s4m8
This commit is contained in:
Amit Patel (OpenERP) 2012-05-30 19:04:36 +05:30
parent 6f42929b39
commit ee1b8f1342
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
addons/account_analytic_analysis/account_analytic_analysis_view.xml
View File

@ -197,10 +197,10 @@
</tr>
</table>
</group>-->
<group colspan="4" class="oe_form_group_label_border">
<field name="pricelist_id" />
<field name="to_invoice" widget="selection" />
</group>
<group colspan="4" class="oe_form_group_label_border">
<field name="pricelist_id" />
<field name="to_invoice" widget="selection" />
</group>
</xpath>
<!-- <notebook position="inside">
<page string="Invoice Analysis">

4
addons/hr_timesheet_invoice/hr_timesheet_invoice.py
View File

@ -63,13 +63,13 @@ class account_analytic_account(osv.osv):
_inherit = "account.analytic.account"
_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."),
'amount_max': fields.float('Max. Invoice Price',
help="Keep empty if this contract is not limited to a total fixed price."),
'amount_invoiced': fields.function(_invoiced_calc, string='Invoiced Amount',
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 " \
"on the costs in this analytic account: timesheets, expenses, ..." \
"You can configure an automatic invoice rate on analytic accounts."),