fix bug number : 327990 for fiscal position added at the time of creating invoice from sale,purchase,and other modules

bzr revid: mra@tinyerp.com-20090211133254-xnp20b9tsbo28v35
This commit is contained in:
mra (Open ERP) 2009-02-11 19:02:54 +05:30
parent 4aa00ae64b
commit 759cead482
12 changed files with 26 additions and 15 deletions

View File

@ -113,6 +113,7 @@ def _makeInvoices(self, cr, uid, data, context):
'currency_id' :reg.partner_invoice_id.property_product_pricelist.currency_id.id,
'comment': "",
'payment_term':reg.partner_invoice_id.property_payment_term.id,
'fiscal_position': reg.partner_invoice_id.property_account_position.id
}
inv_obj = pool_obj.get('account.invoice')

View File

@ -152,6 +152,7 @@ class hr_expense_expense(osv.osv):
'price_type': 'tax_included',
'currency_id': exp.currency_id.id,
'payment_term': payment_term_id,
'fiscal_position': exp.employee_id.address_id.partner_id.property_account_position.id
}
if payment_term_id:
to_update = invoice_obj.onchange_payment_term_date_invoice(cr, uid, [],

View File

@ -71,6 +71,7 @@ class final_invoice_create(wizard.interface):
'account_id': partner.property_account_receivable.id,
'currency_id': account.pricelist_id.currency_id.id,
'date_due': date_due,
'fiscal_position': account.partner_id.property_account_position.id
}
last_invoice = pool.get('account.invoice').create(cr, uid, curr_invoice)
invoices.append(last_invoice)

View File

@ -79,6 +79,7 @@ class invoice_create(wizard.interface):
'account_id': partner.property_account_receivable.id,
'currency_id': account.pricelist_id.currency_id.id,
'date_due': date_due,
'fiscal_position': account.partner_id.property_account_position.id
}
last_invoice = pool.get('account.invoice').create(cr, uid, curr_invoice)
invoices.append(last_invoice)

View File

@ -760,7 +760,7 @@ class account_invoice_line(osv.osv):
if line.invoice_id.date_invoice > date_from and line.invoice_id.date_invoice < date_to:
date_from = line.invoice_id.date_invoice
line_id = member_line_obj.create(cr, uid, {
'partner': line.invoice_id.partner_id.id,
'partner': line.invoice_id.partner_id and line.invoice_id.partner_id.id or False,
'date_from': date_from,
'date_to': date_to,
'account_invoice_line': line.id,

View File

@ -78,7 +78,8 @@ def _invoice_membership(self, cr, uid, data, context):
'partner_id' : partner_id,
'address_invoice_id': partner_address_ids[partner_id]['id'],
'account_id': account_id,
'invoice_line':[(6,0,[invoice_line_id])]
'invoice_line':[(6,0,[invoice_line_id])],
'fiscal_position': fpos_id or False
}
)
invoice_list.append(invoice_id)

View File

@ -281,6 +281,7 @@ class mrp_repair(osv.osv):
'address_invoice_id': repair.address_id.id,
'currency_id': repair.pricelist_id.currency_id.id,
'comment': repair.quotation_notes,
'fiscal_position': repair.partner_id.property_account_position.id
}
inv_obj = self.pool.get('account.invoice')
inv_id = inv_obj.create(cr, uid, inv)

View File

@ -320,6 +320,7 @@ class purchase_order(osv.osv):
'journal_id': len(journal_ids) and journal_ids[0] or False,
'origin': o.name,
'invoice_line': il,
'fiscal_position': o.partner_id.property_account_position.id
}
inv_id = self.pool.get('account.invoice').create(cr, uid, inv, {'type':'in_invoice'})
self.pool.get('account.invoice').button_compute(cr, uid, [inv_id], {'type':'in_invoice'}, set_total=True)

View File

@ -372,6 +372,7 @@ class sale_order(osv.osv):
'currency_id' : order.pricelist_id.currency_id.id,
'comment': order.note,
'payment_term': pay_term,
'fiscal_position': order.partner_id.property_account_position.id
}
inv_obj = self.pool.get('account.invoice')
inv.update(self._inv_get(cr, uid, order))

View File

@ -87,6 +87,7 @@ def _createInvoices(self, cr, uid, data, context={}):
'currency_id' :sale.pricelist_id.currency_id.id,
'comment': '',
'payment_term':sale.payment_term.id,
'fiscal_position': sale.partner_id.property_account_position.id
}
inv_obj = pool_obj.get('account.invoice')
inv_id = inv_obj.create(cr, uid, inv)

View File

@ -61,6 +61,7 @@ def _makeInvoices(self, cr, uid, data, context):
'currency_id' : order.pricelist_id.currency_id.id,
'comment': order.note,
'payment_term': pay_term,
'fiscal_position': order.partner_id.property_account_position.id
}
inv_id = pool.get('account.invoice').create(cr, uid, inv)
return inv_id

View File

@ -681,6 +681,7 @@ class stock_picking(osv.osv):
'address_contact_id': address_contact_id,
'comment': comment,
'payment_term': payment_term_id,
'fiscal_position': partner.property_account_position.id
}
cur_id = self.get_currency_id(cursor, user, picking)
if cur_id: