audrius/contract
1
0
Fork 1
mirror of https://github.com/OCA/contract.git synced 2025-02-13 17:57:24 +02:00
Code Issues Packages Projects Releases Wiki Activity

Set correct company on invoices when working on multicompany environment

Browse Source 
Now when working on multy company environmets the server action creates
invioices with accounts belong to correct company based on contract company.
This commit is contained in:
Federico Cruz
2014-10-23 19:59:12 -05:00
parent b6cb18df08
commit 57791c2d4e
1 changed files with 31 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
contract/account_analytic_analysis_recurring.py
View File

@@ -93,7 +93,7 @@ class account_analytic_invoice_line(osv.osv):
'uom_id': uom_id or res.uom_id.id or False, 'uom_id': uom_id or res.uom_id.id or False,
'price_unit': res.list_price or 0.0}) 'price_unit': res.list_price or 0.0})
if res.description: if res.description:
result['name'] += '\n'+res.description result['name'] += '\n' + res.description
res_final = {'value': result} res_final = {'value': result}
if result['uom_id'] != res.uom_id.id: if result['uom_id'] != res.uom_id.id:
@@ -164,7 +164,7 @@ class account_analytic_account(osv.osv):
raise osv.except_osv( raise osv.except_osv(
_('Error!'), _('Error!'),
_('Please define a sale journal for the company "%s".') % _('Please define a sale journal for the company "%s".') %
(contract.company_id.name or '', )) (contract.company_id.name or '',))
partner_payment_term = contract.partner_id.property_payment_term.id partner_payment_term = contract.partner_id.property_payment_term.id
inv_data = { inv_data = {
'reference': contract.code or False, 'reference': contract.code or False,
@@ -230,20 +230,41 @@ class account_analytic_account(osv.osv):
contract.recurring_next_date or current_date, "%Y-%m-%d") contract.recurring_next_date or current_date, "%Y-%m-%d")
interval = contract.recurring_interval interval = contract.recurring_interval
if contract.recurring_rule_type == 'daily': if contract.recurring_rule_type == 'daily':
old_date = next_date-relativedelta(days=+interval) old_date = next_date - relativedelta(days=+interval)
new_date = next_date+relativedelta(days=+interval) new_date = next_date + relativedelta(days=+interval)
elif contract.recurring_rule_type == 'weekly': elif contract.recurring_rule_type == 'weekly':
old_date = next_date-relativedelta(weeks=+interval) old_date = next_date - relativedelta(weeks=+interval)
new_date = next_date+relativedelta(weeks=+interval) new_date = next_date + relativedelta(weeks=+interval)
else: else:
old_date = next_date+relativedelta(months=+interval) old_date = next_date + relativedelta(months=+interval)
new_date = next_date+relativedelta(months=+interval) new_date = next_date + relativedelta(months=+interval)
context['old_date'] = old_date context['old_date'] = old_date
context['next_date'] = datetime.datetime.strptime( context['next_date'] = datetime.datetime.strptime(
contract.recurring_next_date or current_date, "%Y-%m-%d") contract.recurring_next_date or current_date, "%Y-%m-%d")
self._prepare_invoice( # Force company for correct evaluate domain access rules
cr, uid, contract, context=context) context['force_company'] = contract.company_id.id
# Create new cursor for handle multi company environments
from openerp import pooler
db, pool = pooler.get_db_and_pool(cr.dbname)
cursor = db.cursor()
try:
this = pool.get('account.analytic.account')
# Need to reload contract on new cursor for prevent
# ORM optimizations use same company for load all
# partner properties
contract = this.browse(
cursor, uid, contract.id, context=context
)
this._prepare_invoice(
cursor, uid, contract, context=context
)
cursor.commit() # commit results
except Exception:
cursor.rollback() # error, rollback everything
finally:
cursor.close() # always close cursor
self.write( self.write(
cr, uid, [contract.id], cr, uid, [contract.id],