pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Invoice on analytic line fill now the due date

Browse Source 
bzr revid: ced-9f4f20060201acd9bb0632bbdacd816752dbe8c8
This commit is contained in:
ced
2007-09-13 14:21:57 +00:00
parent 21a2cfd693
commit 37910cfc4f
2 changed files with 42 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/hr_timesheet_invoice/wizard/hr_timesheet_final_invoice_create.py
+19 -3
View File
@@ -47,13 +47,29 @@ class final_invoice_create(wizard.interface):
def _do_create(self, cr, uid, data, context):
pool = pooler.get_pool(cr.dbname)
analytic_account_obj = pool.get('account.analytic.account')
res_partner_obj = pool.get('res.partner')
account_payment_term_obj = pool.get('account.payment.term')
account_ids = data['ids']
invoices = []
for account in pool.get('account.analytic.account').browse(cr, uid, account_ids, context):
for account in analytic_account_obj.browse(cr, uid, account_ids, context):
partner = account.partner_id
amount_total=0.0
if (not partner) or not (account.pricelist_id):
raise wizard.except_wizard('Analytic account incomplete', 'Please fill in the partner and pricelist field in the analytic account:\n%s' % (account.name,))
raise wizard.except_wizard('Analytic account incomplete',
'Please fill in the partner and pricelist field '
'in the analytic account:\n%s' % (account.name,))
date_due = False
if partner.property_payment_term:
pterm_list= account_payment_term_obj.compute(cr, uid,
partner.property_payment_term.id, value=1,
date_ref=time.strftime('%Y-%m-%d'))
if pterm_list:
pterm_list = [line[0] for line in pterm_list]
pterm_list.sort()
date_due = pterm_list[-1]
curr_invoice = {
'name': time.strftime('%D')+' - '+account.name,
@@ -63,7 +79,7 @@ class final_invoice_create(wizard.interface):
'payment_term': partner.property_payment_term.id or False,
'account_id': partner.property_account_receivable.id,
'currency_id': account.pricelist_id.currency_id.id,
'project_id': account.id
'date_due': date_due,
}
last_invoice = pool.get('account.invoice').create(cr, uid, curr_invoice)
invoices.append(last_invoice)
addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py
+23 -4
View File
@@ -48,21 +48,40 @@ class invoice_create(wizard.interface):
def _do_create(self, cr, uid, data, context):
pool = pooler.get_pool(cr.dbname)
analytic_account_obj = pool.get('account.analytic.account')
res_partner_obj = pool.get('res.partner')
account_payment_term_obj = pool.get('account.payment.term')
account_ids = data['form']['accounts'][0][2]
invoices = []
for account in pool.get('account.analytic.account').browse(cr, uid, account_ids, context):
for account in analytic_account_obj.browse(cr, uid, account_ids, context):
partner = account.partner_id
if (not partner) or not (account.pricelist_id):
raise wizard.except_wizard('Analytic account incomplete', 'Please fill in the partner and pricelist field in the analytic account:\n%s' % (account.name,))
raise wizard.except_wizard('Analytic account incomplete',
'Please fill in the partner and pricelist field '
'in the analytic account:\n%s' % (account.name,))
date_due = False
if partner.property_payment_term:
pterm_list= account_payment_term_obj.compute(cr, uid,
partner.property_payment_term.id, value=1,
date_ref=time.strftime('%Y-%m-%d'))
if pterm_list:
pterm_list = [line[0] for line in pterm_list]
pterm_list.sort()
date_due = pterm_list[-1]
curr_invoice = {
'name': time.strftime('%D')+' - '+account.name,
'partner_id': account.partner_id.id,
'address_contact_id': pool.get('res.partner').address_get(cr, uid, [account.partner_id.id], adr_pref=['contact'])['contact'],
'address_invoice_id': pool.get('res.partner').address_get(cr, uid, [account.partner_id.id], adr_pref=['invoice'])['invoice'],
'address_contact_id': res_partner_obj.address_get(cr, uid,
[account.partner_id.id], adr_pref=['contact'])['contact'],
'address_invoice_id': res_partner_obj.address_get(cr, uid,
[account.partner_id.id], adr_pref=['invoice'])['invoice'],
'payment_term': partner.property_payment_term.id or False,
'account_id': partner.property_account_receivable.id,
'currency_id': account.pricelist_id.currency_id.id,
'date_due': date_due,
}
last_invoice = pool.get('account.invoice').create(cr, uid, curr_invoice)
invoices.append(last_invoice)