[IMP] order of invoice types
bzr revid: fp@openerp.com-20121103134512-mwkqzsnz3ndy5fsb
This commit is contained in:
parent
c7550c110a
commit
367edaad26
|
@ -26,8 +26,9 @@ from tools.translate import _
|
||||||
class hr_timesheet_invoice_factor(osv.osv):
|
class hr_timesheet_invoice_factor(osv.osv):
|
||||||
_name = "hr_timesheet_invoice.factor"
|
_name = "hr_timesheet_invoice.factor"
|
||||||
_description = "Invoice Rate"
|
_description = "Invoice Rate"
|
||||||
|
_order = 'factor'
|
||||||
_columns = {
|
_columns = {
|
||||||
'name': fields.char('Internal name', size=128, required=True, translate=True),
|
'name': fields.char('Internal Name', size=128, required=True, translate=True),
|
||||||
'customer_name': fields.char('Name', size=128, help="Label for the customer"),
|
'customer_name': fields.char('Name', size=128, help="Label for the customer"),
|
||||||
'factor': fields.float('Discount (%)', required=True, help="Discount in percentage"),
|
'factor': fields.float('Discount (%)', required=True, help="Discount in percentage"),
|
||||||
}
|
}
|
||||||
|
@ -122,7 +123,7 @@ class account_analytic_line(osv.osv):
|
||||||
_inherit = 'account.analytic.line'
|
_inherit = 'account.analytic.line'
|
||||||
_columns = {
|
_columns = {
|
||||||
'invoice_id': fields.many2one('account.invoice', 'Invoice', ondelete="set null"),
|
'invoice_id': fields.many2one('account.invoice', 'Invoice', ondelete="set null"),
|
||||||
'to_invoice': fields.many2one('hr_timesheet_invoice.factor', 'Type of Invoicing', help="It allows to set the discount while making invoice"),
|
'to_invoice': fields.many2one('hr_timesheet_invoice.factor', 'Invoiceable', help="It allows to set the discount while making invoice, keep empty if the activities should not be invoiced."),
|
||||||
}
|
}
|
||||||
|
|
||||||
def _default_journal(self, cr, uid, context=None):
|
def _default_journal(self, cr, uid, context=None):
|
||||||
|
|
Loading…
Reference in New Issue