#
##############################################################################
-import sys
import time
from datetime import datetime
-from operator import itemgetter
-from lxml import etree
-
-import netsvc
-from osv import fields, osv, orm
-from tools.translate import _
-import decimal_precision as dp
-import tools
+from openerp import workflow
+from openerp.osv import fields, osv
+from openerp.tools.translate import _
+import openerp.addons.decimal_precision as dp
+from openerp import tools
+from openerp.report import report_sxw
+import openerp
class account_move_line(osv.osv):
_name = "account.move.line"
fiscalperiod_obj = self.pool.get('account.period')
account_obj = self.pool.get('account.account')
fiscalyear_ids = []
- if context is None:
- context = {}
+ context = dict(context or {})
initial_bal = context.get('initial_bal', False)
company_clause = " "
if context.get('company_id', False):
if move_line.reconcile_id:
continue
- if not move_line.account_id.type in ('payable', 'receivable'):
- #this function does not suport to be used on move lines not related to payable or receivable accounts
+ if not move_line.account_id.reconcile:
+ #this function does not suport to be used on move lines not related to a reconcilable account
continue
if move_line.currency_id:
def create_analytic_lines(self, cr, uid, ids, context=None):
acc_ana_line_obj = self.pool.get('account.analytic.line')
for obj_line in self.browse(cr, uid, ids, context=context):
+ if obj_line.analytic_lines:
+ acc_ana_line_obj.unlink(cr,uid,[obj.id for obj in obj_line.analytic_lines])
if obj_line.analytic_account_id:
if not obj_line.journal_id.analytic_journal_id:
- raise osv.except_osv(_('No Analytic Journal !'),_("You have to define an analytic journal on the '%s' journal!") % (obj_line.journal_id.name, ))
+ raise osv.except_osv(_('No Analytic Journal!'),_("You have to define an analytic journal on the '%s' journal!") % (obj_line.journal_id.name, ))
vals_line = self._prepare_analytic_line(cr, uid, obj_line, context=context)
acc_ana_line_obj.create(cr, uid, vals_line)
return True
period_id = context.get('period_id')
if type(period_id) == str:
ids = period_obj.search(cr, uid, [('name', 'ilike', period_id)])
- context.update({
- 'period_id': ids and ids[0] or False
- })
+ context = dict(context, period_id=ids and ids[0] or False)
return context
def _default_get(self, cr, uid, fields, context=None):
#default_get should only do the following:
# -propose the next amount in debit/credit in order to balance the move
# -propose the next account from the journal (default debit/credit account) accordingly
- if context is None:
- context = {}
+ context = dict(context or {})
account_obj = self.pool.get('account.account')
period_obj = self.pool.get('account.period')
journal_obj = self.pool.get('account.journal')
context = {}
c = context.copy()
c['initital_bal'] = True
- sql = """SELECT l2.id, SUM(l1.debit-l1.credit)
- FROM account_move_line l1, account_move_line l2
- WHERE l2.account_id = l1.account_id
- AND l1.id <= l2.id
- AND l2.id IN %s AND """ + \
- self._query_get(cr, uid, obj='l1', context=c) + \
- " GROUP BY l2.id"
+ sql = """SELECT l1.id, COALESCE(SUM(l2.debit-l2.credit), 0)
+ FROM account_move_line l1 LEFT JOIN account_move_line l2
+ ON (l1.account_id = l2.account_id
+ AND l2.id <= l1.id
+ AND """ + \
+ self._query_get(cr, uid, obj='l2', context=c) + \
+ ") WHERE l1.id IN %s GROUP BY l1.id"
cr.execute(sql, [tuple(ids)])
return dict(cr.fetchall())
for line_id, invoice_id in cursor.fetchall():
res[line_id] = invoice_id
invoice_ids.append(invoice_id)
- invoice_names = {False: ''}
+ invoice_names = {}
for invoice_id, name in invoice_obj.name_get(cursor, user, invoice_ids, context=context):
invoice_names[invoice_id] = name
for line_id in res.keys():
invoice_id = res[line_id]
- res[line_id] = (invoice_id, invoice_names[invoice_id])
+ res[line_id] = invoice_id and (invoice_id, invoice_names[invoice_id]) or False
return res
def name_get(self, cr, uid, ids, context=None):
res[line.id] = str(line.reconcile_partial_id.name)
return res
+ def _get_move_from_reconcile(self, cr, uid, ids, context=None):
+ move = {}
+ for r in self.pool.get('account.move.reconcile').browse(cr, uid, ids, context=context):
+ for line in r.line_partial_ids:
+ move[line.move_id.id] = True
+ for line in r.line_id:
+ move[line.move_id.id] = True
+ move_line_ids = []
+ if move:
+ move_line_ids = self.pool.get('account.move.line').search(cr, uid, [('journal_id','in',move.keys())], context=context)
+ return move_line_ids
+
+
_columns = {
- 'name': fields.char('Name', size=64, required=True),
+ 'name': fields.char('Name', required=True),
'quantity': fields.float('Quantity', digits=(16,2), help="The optional quantity expressed by this line, eg: number of product sold. The quantity is not a legal requirement but is very useful for some reports."),
'product_uom_id': fields.many2one('product.uom', 'Unit of Measure'),
'product_id': fields.many2one('product.product', 'Product'),
'account_id': fields.many2one('account.account', 'Account', required=True, ondelete="cascade", domain=[('type','<>','view'), ('type', '<>', 'closed')], select=2),
'move_id': fields.many2one('account.move', 'Journal Entry', ondelete="cascade", help="The move of this entry line.", select=2, required=True),
'narration': fields.related('move_id','narration', type='text', relation='account.move', string='Internal Note'),
- 'ref': fields.related('move_id', 'ref', string='Reference', type='char', size=64, store=True),
- 'statement_id': fields.many2one('account.bank.statement', 'Statement', help="The bank statement used for bank reconciliation", select=1),
- 'reconcile_id': fields.many2one('account.move.reconcile', 'Reconcile', readonly=True, ondelete='set null', select=2),
- 'reconcile_partial_id': fields.many2one('account.move.reconcile', 'Partial Reconcile', readonly=True, ondelete='set null', select=2),
- 'reconcile': fields.function(_get_reconcile, type='char', string='Reconcile Ref'),
+ 'ref': fields.related('move_id', 'ref', string='Reference', type='char', store=True),
+ 'statement_id': fields.many2one('account.bank.statement', 'Statement', help="The bank statement used for bank reconciliation", select=1, copy=False),
+ 'reconcile_id': fields.many2one('account.move.reconcile', 'Reconcile', readonly=True, ondelete='set null', select=2, copy=False),
+ 'reconcile_partial_id': fields.many2one('account.move.reconcile', 'Partial Reconcile', readonly=True, ondelete='set null', select=2, copy=False),
+ 'reconcile_ref': fields.function(_get_reconcile, type='char', string='Reconcile Ref', oldname='reconcile', store={
+ 'account.move.line': (lambda self, cr, uid, ids, c={}: ids, ['reconcile_id','reconcile_partial_id'], 50),'account.move.reconcile': (_get_move_from_reconcile, None, 50)}),
'amount_currency': fields.float('Amount Currency', help="The amount expressed in an optional other currency if it is a multi-currency entry.", digits_compute=dp.get_precision('Account')),
'amount_residual_currency': fields.function(_amount_residual, string='Residual Amount in Currency', multi="residual", help="The residual amount on a receivable or payable of a journal entry expressed in its currency (maybe different of the company currency)."),
'amount_residual': fields.function(_amount_residual, string='Residual Amount', multi="residual", help="The residual amount on a receivable or payable of a journal entry expressed in the company currency."),
'analytic_lines': fields.one2many('account.analytic.line', 'move_id', 'Analytic lines'),
'centralisation': fields.selection([('normal','Normal'),('credit','Credit Centralisation'),('debit','Debit Centralisation'),('currency','Currency Adjustment')], 'Centralisation', size=8),
'balance': fields.function(_balance, fnct_search=_balance_search, string='Balance'),
- 'state': fields.selection([('draft','Unbalanced'), ('valid','Balanced')], 'Status', readonly=True),
+ 'state': fields.selection([('draft','Unbalanced'), ('valid','Balanced')], 'Status', readonly=True, copy=False),
'tax_code_id': fields.many2one('account.tax.code', 'Tax Account', help="The Account can either be a base tax code or a tax code account."),
'tax_amount': fields.float('Tax/Base Amount', digits_compute=dp.get_precision('Account'), select=True, help="If the Tax account is a tax code account, this field will contain the taxed amount.If the tax account is base tax code, "\
"this field will contain the basic amount(without tax)."),
'invoice': fields.function(_invoice, string='Invoice',
type='many2one', relation='account.invoice', fnct_search=_invoice_search),
- 'account_tax_id':fields.many2one('account.tax', 'Tax'),
+ 'account_tax_id':fields.many2one('account.tax', 'Tax', copy=False),
'analytic_account_id': fields.many2one('account.analytic.account', 'Analytic Account'),
- 'company_id': fields.related('account_id', 'company_id', type='many2one', relation='res.company',
+ 'company_id': fields.related('account_id', 'company_id', type='many2one', relation='res.company',
string='Company', store=True, readonly=True)
}
if context.get('journal_type', False):
jids = journal_pool.search(cr, uid, [('type','=', context.get('journal_type'))])
if not jids:
- raise osv.except_osv(_('Configuration Error!'), _('Cannot find any account journal of %s type for this company.\n\nYou can create one in the menu: \nConfiguration/Journals/Journals.') % context.get('journal_type'))
+ model, action_id = self.pool['ir.model.data'].get_object_reference(cr, uid, 'account', 'action_account_journal_form')
+ msg = _("""Cannot find any account journal of "%s" type for this company, You should create one.\n Please go to Journal Configuration""") % context.get('journal_type').replace('_', ' ').title()
+ raise openerp.exceptions.RedirectWarning(msg, action_id, _('Go to the configuration panel'))
journal_id = jids[0]
return journal_id
]
def _auto_init(self, cr, context=None):
- super(account_move_line, self)._auto_init(cr, context=context)
+ res = super(account_move_line, self)._auto_init(cr, context=context)
cr.execute('SELECT indexname FROM pg_indexes WHERE indexname = \'account_move_line_journal_id_period_id_index\'')
if not cr.fetchone():
cr.execute('CREATE INDEX account_move_line_journal_id_period_id_index ON account_move_line (journal_id, period_id)')
+ cr.execute('SELECT indexname FROM pg_indexes WHERE indexname = %s', ('account_move_line_date_id_index',))
+ if not cr.fetchone():
+ cr.execute('CREATE INDEX account_move_line_date_id_index ON account_move_line (date DESC, id desc)')
+ return res
def _check_no_view(self, cr, uid, ids, context=None):
lines = self.browse(cr, uid, ids, context=context)
for l in lines:
- if l.account_id.type == 'view':
+ if l.account_id.type in ('view', 'consolidation'):
return False
return True
return True
_constraints = [
- (_check_no_view, 'You cannot create journal items on an account of type view.', ['account_id']),
+ (_check_no_view, 'You cannot create journal items on an account of type view or consolidation.', ['account_id']),
(_check_no_closed, 'You cannot create journal items on closed account.', ['account_id']),
(_check_company_id, 'Account and Period must belong to the same company.', ['company_id']),
(_check_date, 'The date of your Journal Entry is not in the defined period! You should change the date or remove this constraint from the journal.', ['date']),
(_check_currency, 'The selected account of your Journal Entry forces to provide a secondary currency. You should remove the secondary currency on the account or select a multi-currency view on the journal.', ['currency_id']),
(_check_currency_and_amount, "You cannot create journal items with a secondary currency without recording both 'currency' and 'amount currency' field.", ['currency_id','amount_currency']),
- (_check_currency_amount, 'The amount expressed in the secondary currency must be positif when journal item are debit and negatif when journal item are credit.', ['amount_currency']),
+ (_check_currency_amount, 'The amount expressed in the secondary currency must be positive when account is debited and negative when account is credited.', ['amount_currency']),
(_check_currency_company, "You cannot provide a secondary currency if it is the same than the company one." , ['currency_id']),
]
if (amount>0) and journal:
x = journal_obj.browse(cr, uid, journal).default_credit_account_id
if x: acc = x
+ context = dict(context)
context.update({
'date': date,
'res.currency.compute.account': acc,
}
return result
- def onchange_account_id(self, cr, uid, ids, account_id, context=None):
- res = {'value': {}}
- if account_id:
- res['value']['account_tax_id'] = [x.id for x in self.pool.get('account.account').browse(cr, uid, account_id, context=context).tax_ids]
- return res
-
- def onchange_partner_id(self, cr, uid, ids, move_id, partner_id, account_id=None, debit=0, credit=0, date=False, journal=False):
+ def onchange_partner_id(self, cr, uid, ids, move_id, partner_id, account_id=None, debit=0, credit=0, date=False, journal=False, context=None):
partner_obj = self.pool.get('res.partner')
payment_term_obj = self.pool.get('account.payment.term')
journal_obj = self.pool.get('account.journal')
date = datetime.now().strftime('%Y-%m-%d')
jt = False
if journal:
- jt = journal_obj.browse(cr, uid, journal).type
- part = partner_obj.browse(cr, uid, partner_id)
+ jt = journal_obj.browse(cr, uid, journal, context=context).type
+ part = partner_obj.browse(cr, uid, partner_id, context=context)
payment_term_id = False
if jt and jt in ('purchase', 'purchase_refund') and part.property_supplier_payment_term:
elif part.supplier:
val['account_id'] = fiscal_pos_obj.map_account(cr, uid, part and part.property_account_position or False, id1)
if val.get('account_id', False):
- d = self.onchange_account_id(cr, uid, ids, val['account_id'])
+ d = self.onchange_account_id(cr, uid, ids, account_id=val['account_id'], partner_id=part.id, context=context)
val.update(d['value'])
return {'value':val}
- def onchange_account_id(self, cr, uid, ids, account_id=False, partner_id=False):
+ def onchange_account_id(self, cr, uid, ids, account_id=False, partner_id=False, context=None):
account_obj = self.pool.get('account.account')
partner_obj = self.pool.get('res.partner')
fiscal_pos_obj = self.pool.get('account.fiscal.position')
val = {}
if account_id:
- res = account_obj.browse(cr, uid, account_id)
+ res = account_obj.browse(cr, uid, account_id, context=context)
tax_ids = res.tax_ids
if tax_ids and partner_id:
- part = partner_obj.browse(cr, uid, partner_id)
+ part = partner_obj.browse(cr, uid, partner_id, context=context)
tax_id = fiscal_pos_obj.map_tax(cr, uid, part and part.property_account_position or False, tax_ids)[0]
else:
tax_id = tax_ids and tax_ids[0].id or False
def search(self, cr, uid, args, offset=0, limit=None, order=None, context=None, count=False):
if context is None:
context = {}
+ if context.get('fiscalyear'):
+ args.append(('period_id.fiscalyear_id', '=', context.get('fiscalyear', False)))
if context and context.get('next_partner_only', False):
if not context.get('partner_id', False):
partner = self.list_partners_to_reconcile(cr, uid, context=context)
args.append(('partner_id', '=', partner[0]))
return super(account_move_line, self).search(cr, uid, args, offset, limit, order, context, count)
+ def prepare_move_lines_for_reconciliation_widget(self, cr, uid, lines, target_currency=False, target_date=False, context=None):
+ """ Returns move lines formatted for the manual/bank reconciliation widget
+
+ :param target_currency: curreny you want the move line debit/credit converted into
+ :param target_date: date to use for the monetary conversion
+ """
+ if not lines:
+ return []
+ if context is None:
+ context = {}
+ ctx = context.copy()
+ currency_obj = self.pool.get('res.currency')
+ company_currency = self.pool.get('res.users').browse(cr, uid, uid, context=context).company_id.currency_id
+ rml_parser = report_sxw.rml_parse(cr, uid, 'reconciliation_widget_aml', context=context)
+ ret = []
+
+ for line in lines:
+ partial_reconciliation_siblings_ids = []
+ if line.reconcile_partial_id:
+ partial_reconciliation_siblings_ids = self.search(cr, uid, [('reconcile_partial_id', '=', line.reconcile_partial_id.id)], context=context)
+ partial_reconciliation_siblings_ids.remove(line.id)
+
+ ret_line = {
+ 'id': line.id,
+ 'name': line.name != '/' and line.move_id.name + ': ' + line.name or line.move_id.name,
+ 'ref': line.move_id.ref,
+ 'account_code': line.account_id.code,
+ 'account_name': line.account_id.name,
+ 'account_type': line.account_id.type,
+ 'date_maturity': line.date_maturity,
+ 'date': line.date,
+ 'period_name': line.period_id.name,
+ 'journal_name': line.journal_id.name,
+ 'partner_id': line.partner_id.id,
+ 'partner_name': line.partner_id.name,
+ 'is_partially_reconciled': bool(line.reconcile_partial_id),
+ 'partial_reconciliation_siblings_ids': partial_reconciliation_siblings_ids,
+ }
+
+ # Amount residual can be negative
+ debit = line.debit
+ credit = line.credit
+ total_amount = abs(debit - credit)
+ total_amount_currency = line.amount_currency
+ amount_residual = line.amount_residual
+ amount_residual_currency = line.amount_residual_currency
+ if line.amount_residual < 0:
+ debit, credit = credit, debit
+ amount_residual = -amount_residual
+ amount_residual_currency = -amount_residual_currency
+
+ # Get right debit / credit:
+ line_currency = line.currency_id or company_currency
+ amount_currency_str = ""
+ total_amount_currency_str = ""
+ if line.currency_id and line.amount_currency:
+ amount_currency_str = rml_parser.formatLang(amount_residual_currency, currency_obj=line.currency_id)
+ total_amount_currency_str = rml_parser.formatLang(total_amount_currency, currency_obj=line.currency_id)
+ if target_currency and line_currency == target_currency and target_currency != company_currency:
+ debit = debit > 0 and amount_residual_currency or 0.0
+ credit = credit > 0 and amount_residual_currency or 0.0
+ amount_currency_str = rml_parser.formatLang(amount_residual, currency_obj=company_currency)
+ total_amount_currency_str = rml_parser.formatLang(total_amount, currency_obj=company_currency)
+ amount_str = rml_parser.formatLang(debit or credit, currency_obj=target_currency)
+ total_amount_str = rml_parser.formatLang(total_amount_currency, currency_obj=target_currency)
+ else:
+ debit = debit > 0 and amount_residual or 0.0
+ credit = credit > 0 and amount_residual or 0.0
+ amount_str = rml_parser.formatLang(debit or credit, currency_obj=company_currency)
+ total_amount_str = rml_parser.formatLang(total_amount, currency_obj=company_currency)
+ if target_currency and target_currency != company_currency:
+ amount_currency_str = rml_parser.formatLang(debit or credit, currency_obj=line_currency)
+ total_amount_currency_str = rml_parser.formatLang(total_amount, currency_obj=line_currency)
+ ctx = context.copy()
+ if target_date:
+ ctx.update({'date': target_date})
+ debit = currency_obj.compute(cr, uid, company_currency.id, target_currency.id, debit, context=ctx)
+ credit = currency_obj.compute(cr, uid, company_currency.id, target_currency.id, credit, context=ctx)
+ amount_str = rml_parser.formatLang(debit or credit, currency_obj=target_currency)
+ total_amount = currency_obj.compute(cr, uid, company_currency.id, target_currency.id, total_amount, context=ctx)
+ total_amount_str = rml_parser.formatLang(total_amount, currency_obj=target_currency)
+
+ ret_line['credit'] = credit
+ ret_line['debit'] = debit
+ ret_line['amount_str'] = amount_str
+ ret_line['amount_currency_str'] = amount_currency_str
+ ret_line['total_amount_str'] = total_amount_str # For partial reconciliations
+ ret_line['total_amount_currency_str'] = total_amount_currency_str
+ ret.append(ret_line)
+ return ret
+
def list_partners_to_reconcile(self, cr, uid, context=None):
cr.execute(
- """
- SELECT partner_id
- FROM (
- SELECT l.partner_id, p.last_reconciliation_date, SUM(l.debit) AS debit, SUM(l.credit) AS credit
+ """SELECT partner_id FROM (
+ SELECT l.partner_id, p.last_reconciliation_date, SUM(l.debit) AS debit, SUM(l.credit) AS credit, MAX(l.create_date) AS max_date
FROM account_move_line l
RIGHT JOIN account_account a ON (a.id = l.account_id)
RIGHT JOIN res_partner p ON (l.partner_id = p.id)
WHERE a.reconcile IS TRUE
AND l.reconcile_id IS NULL
- AND (p.last_reconciliation_date IS NULL OR l.date > p.last_reconciliation_date)
AND l.state <> 'draft'
GROUP BY l.partner_id, p.last_reconciliation_date
) AS s
- WHERE debit > 0 AND credit > 0
+ WHERE debit > 0 AND credit > 0 AND (last_reconciliation_date IS NULL OR max_date > last_reconciliation_date)
ORDER BY last_reconciliation_date""")
- ids = cr.fetchall()
- ids = len(ids) and [x[0] for x in ids] or []
- return self.pool.get('res.partner').name_get(cr, uid, ids, context=context)
+ ids = [x[0] for x in cr.fetchall()]
+ if not ids:
+ return []
+
+ # To apply the ir_rules
+ partner_obj = self.pool.get('res.partner')
+ ids = partner_obj.search(cr, uid, [('id', 'in', ids)], context=context)
+ return partner_obj.name_get(cr, uid, ids, context=context)
def reconcile_partial(self, cr, uid, ids, type='auto', context=None, writeoff_acc_id=False, writeoff_period_id=False, writeoff_journal_id=False):
move_rec_obj = self.pool.get('account.move.reconcile')
else:
currency_id = line.company_id.currency_id
if line.reconcile_id:
- raise osv.except_osv(_('Warning!'), _('Already reconciled.'))
+ raise osv.except_osv(_('Warning'), _("Journal Item '%s' (id: %s), Move '%s' is already reconciled!") % (line.name, line.id, line.move_id.name))
if line.reconcile_partial_id:
for line2 in line.reconcile_partial_id.line_partial_ids:
+ if line2.state != 'valid':
+ raise osv.except_osv(_('Warning'), _("Journal Item '%s' (id: %s) cannot be used in a reconciliation as it is not balanced!") % (line2.name, line2.id))
if not line2.reconcile_id:
if line2.id not in merges:
merges.append(line2.id)
if self.pool.get('res.currency').is_zero(cr, uid, currency_id, total):
res = self.reconcile(cr, uid, merges+unmerge, context=context, writeoff_acc_id=writeoff_acc_id, writeoff_period_id=writeoff_period_id, writeoff_journal_id=writeoff_journal_id)
return res
+ # marking the lines as reconciled does not change their validity, so there is no need
+ # to revalidate their moves completely.
+ reconcile_context = dict(context, novalidate=True)
r_id = move_rec_obj.create(cr, uid, {
'type': type,
'line_partial_ids': map(lambda x: (4,x,False), merges+unmerge)
- })
- move_rec_obj.reconcile_partial_check(cr, uid, [r_id] + merges_rec, context=context)
- return True
+ }, context=reconcile_context)
+ move_rec_obj.reconcile_partial_check(cr, uid, [r_id] + merges_rec, context=reconcile_context)
+ return r_id
def reconcile(self, cr, uid, ids, type='auto', writeoff_acc_id=False, writeoff_period_id=False, writeoff_journal_id=False, context=None):
account_obj = self.pool.get('account.account')
(tuple(ids), ))
r = cr.fetchall()
#TODO: move this check to a constraint in the account_move_reconcile object
+ if len(r) != 1:
+ raise osv.except_osv(_('Error'), _('Entries are not of the same account or already reconciled ! '))
if not unrec_lines:
raise osv.except_osv(_('Error!'), _('Entry is already reconciled.'))
account = account_obj.browse(cr, uid, account_id, context=context)
+ if not account.reconcile:
+ raise osv.except_osv(_('Error'), _('The account is not defined to be reconciled !'))
if r[0][1] != None:
raise osv.except_osv(_('Error!'), _('Some entries are already reconciled.'))
- if context.get('fy_closing'):
- # We don't want to generate any write-off when being called from the
- # wizard used to close a fiscal year (and it doesn't give us any
- # writeoff_acc_id).
- pass
- elif (not currency_obj.is_zero(cr, uid, account.company_id.currency_id, writeoff)) or \
+ if (not currency_obj.is_zero(cr, uid, account.company_id.currency_id, writeoff)) or \
(account.currency_id and (not currency_obj.is_zero(cr, uid, account.currency_id, currency))):
if not writeoff_acc_id:
raise osv.except_osv(_('Warning!'), _('You have to provide an account for the write off/exchange difference entry.'))
writeoff_line_ids = [writeoff_line_ids[1]]
ids += writeoff_line_ids
+ # marking the lines as reconciled does not change their validity, so there is no need
+ # to revalidate their moves completely.
+ reconcile_context = dict(context, novalidate=True)
r_id = move_rec_obj.create(cr, uid, {
'type': type,
'line_id': map(lambda x: (4, x, False), ids),
'line_partial_ids': map(lambda x: (3, x, False), ids)
- })
- wf_service = netsvc.LocalService("workflow")
+ }, context=reconcile_context)
# the id of the move.reconcile is written in the move.line (self) by the create method above
# because of the way the line_id are defined: (4, x, False)
for id in ids:
- wf_service.trg_trigger(uid, 'account.move.line', id, cr)
+ workflow.trg_trigger(uid, 'account.move.line', id, cr)
if lines and lines[0]:
partner_id = lines[0].partner_id and lines[0].partner_id.id or False
if context is None:
context = {}
period_pool = self.pool.get('account.period')
- ctx = dict(context, account_period_prefer_normal=True)
- pids = period_pool.find(cr, user, date, context=ctx)
+ pids = period_pool.find(cr, user, date, context=context)
if pids:
- res.update({
- 'period_id':pids[0]
- })
- context.update({
- 'period_id':pids[0]
- })
+ res.update({'period_id':pids[0]})
+ context = dict(context, period_id=pids[0])
return {
'value':res,
'context':context,
part_rec_ids = [rec['reconcile_partial_id'][0] for rec in part_recs]
unlink_ids += rec_ids
unlink_ids += part_rec_ids
+ all_moves = obj_move_line.search(cr, uid, ['|',('reconcile_id', 'in', unlink_ids),('reconcile_partial_id', 'in', unlink_ids)])
+ all_moves = list(set(all_moves) - set(move_ids))
if unlink_ids:
if opening_reconciliation:
+ raise osv.except_osv(_('Warning!'),
+ _('Opening Entries have already been generated. Please run "Cancel Closing Entries" wizard to cancel those entries and then run this wizard.'))
obj_move_rec.write(cr, uid, unlink_ids, {'opening_reconciliation': False})
obj_move_rec.unlink(cr, uid, unlink_ids)
+ if len(all_moves) >= 2:
+ obj_move_line.reconcile_partial(cr, uid, all_moves, 'auto',context=context)
return True
def unlink(self, cr, uid, ids, context=None, check=True):
for line in self.browse(cr, uid, ids, context=context):
ctx = context.copy()
- if ('journal_id' not in ctx):
+ if not ctx.get('journal_id'):
if line.move_id:
ctx['journal_id'] = line.move_id.journal_id.id
else:
ctx['journal_id'] = line.journal_id.id
- if ('period_id' not in ctx):
+ if not ctx.get('period_id'):
if line.move_id:
ctx['period_id'] = line.move_id.period_id.id
else:
period = period_obj.browse(cr, uid, period_id, context=context)
for (state,) in result:
if state == 'done':
- raise osv.except_osv(_('Error !'), _('You can not add/modify entries in a closed period %s of journal %s.' % (period.name,journal.name)))
+ raise osv.except_osv(_('Error!'), _('You can not add/modify entries in a closed period %s of journal %s.' % (period.name,journal.name)))
if not result:
jour_period_obj.create(cr, uid, {
'name': (journal.code or journal.name)+':'+(period.name or ''),
move_obj = self.pool.get('account.move')
cur_obj = self.pool.get('res.currency')
journal_obj = self.pool.get('account.journal')
- if context is None:
- context = {}
+ context = dict(context or {})
if vals.get('move_id', False):
- company_id = self.pool.get('account.move').read(cr, uid, vals['move_id'], ['company_id']).get('company_id', False)
- if company_id:
- vals['company_id'] = company_id[0]
- if ('account_id' in vals) and not account_obj.read(cr, uid, vals['account_id'], ['active'])['active']:
+ move = self.pool.get('account.move').browse(cr, uid, vals['move_id'], context=context)
+ if move.company_id:
+ vals['company_id'] = move.company_id.id
+ if move.date and not vals.get('date'):
+ vals['date'] = move.date
+ if ('account_id' in vals) and not account_obj.read(cr, uid, [vals['account_id']], ['active'])[0]['active']:
raise osv.except_osv(_('Bad Account!'), _('You cannot use an inactive account.'))
if 'journal_id' in vals and vals['journal_id']:
context['journal_id'] = vals['journal_id']
move_id = move_obj.create(cr, uid, v, context)
vals['move_id'] = move_id
else:
- raise osv.except_osv(_('No piece number !'), _('Cannot create an automatic sequence for this piece.\nPut a sequence in the journal definition for automatic numbering or create a sequence manually for this piece.'))
+ raise osv.except_osv(_('No Piece Number!'), _('Cannot create an automatic sequence for this piece.\nPut a sequence in the journal definition for automatic numbering or create a sequence manually for this piece.'))
ok = not (journal.type_control_ids or journal.account_control_ids)
if ('account_id' in vals):
account = account_obj.browse(cr, uid, vals['account_id'], context=context)
break
# Automatically convert in the account's secondary currency if there is one and
# the provided values were not already multi-currency
- if account.currency_id and (vals.get('amount_currency', False) is False) and account.currency_id.id != account.company_id.currency_id.id:
+ if account.currency_id and 'amount_currency' not in vals and account.currency_id.id != account.company_id.currency_id.id:
vals['currency_id'] = account.currency_id.id
ctx = {}
if 'date' in vals:
if not ok:
raise osv.except_osv(_('Bad Account!'), _('You cannot use this general account in this journal, check the tab \'Entry Controls\' on the related journal.'))
- if vals.get('analytic_account_id',False):
- if journal.analytic_journal_id:
- vals['analytic_lines'] = [(0,0, {
- 'name': vals['name'],
- 'date': vals.get('date', time.strftime('%Y-%m-%d')),
- 'account_id': vals.get('analytic_account_id', False),
- 'unit_amount': vals.get('quantity', 1.0),
- 'amount': vals.get('debit', 0.0) or vals.get('credit', 0.0),
- 'general_account_id': vals.get('account_id', False),
- 'journal_id': journal.analytic_journal_id.id,
- 'ref': vals.get('ref', False),
- 'user_id': uid
- })]
-
result = super(account_move_line, self).create(cr, uid, vals, context=context)
# CREATE Taxes
if vals.get('account_tax_id', False):
tax_id = tax_obj.browse(cr, uid, vals['account_tax_id'])
total = vals['debit'] - vals['credit']
- if journal.type in ('purchase_refund', 'sale_refund'):
+ base_code = 'base_code_id'
+ tax_code = 'tax_code_id'
+ account_id = 'account_collected_id'
+ base_sign = 'base_sign'
+ tax_sign = 'tax_sign'
+ if journal.type in ('purchase_refund', 'sale_refund') or (journal.type in ('cash', 'bank') and total < 0):
base_code = 'ref_base_code_id'
tax_code = 'ref_tax_code_id'
account_id = 'account_paid_id'
base_sign = 'ref_base_sign'
tax_sign = 'ref_tax_sign'
- else:
- base_code = 'base_code_id'
- tax_code = 'tax_code_id'
- account_id = 'account_collected_id'
- base_sign = 'base_sign'
- tax_sign = 'tax_sign'
tmp_cnt = 0
- for tax in tax_obj.compute_all(cr, uid, [tax_id], total, 1.00, force_excluded=True).get('taxes'):
+ for tax in tax_obj.compute_all(cr, uid, [tax_id], total, 1.00, force_excluded=False).get('taxes'):
#create the base movement
if tmp_cnt == 0:
if tax[base_code]:
tmp_cnt += 1
- self.write(cr, uid,[result], {
+ if tax_id.price_include:
+ total = tax['price_unit']
+ newvals = {
'tax_code_id': tax[base_code],
- 'tax_amount': tax[base_sign] * abs(total)
- })
+ 'tax_amount': tax[base_sign] * abs(total),
+ }
+ if tax_id.price_include:
+ if tax['price_unit'] < 0:
+ newvals['credit'] = abs(tax['price_unit'])
+ else:
+ newvals['debit'] = tax['price_unit']
+ self.write(cr, uid, [result], newvals, context=context)
else:
data = {
'move_id': vals['move_id'],
'name': tools.ustr(vals['name'] or '') + ' ' + tools.ustr(tax['name'] or ''),
'date': vals['date'],
- 'partner_id': vals.get('partner_id',False),
- 'ref': vals.get('ref',False),
+ 'partner_id': vals.get('partner_id', False),
+ 'ref': vals.get('ref', False),
+ 'statement_id': vals.get('statement_id', False),
'account_tax_id': False,
'tax_code_id': tax[base_code],
'tax_amount': tax[base_sign] * abs(total),
'date': vals['date'],
'partner_id': vals.get('partner_id',False),
'ref': vals.get('ref',False),
+ 'statement_id': vals.get('statement_id', False),
'account_tax_id': False,
'tax_code_id': tax[tax_code],
'tax_amount': tax[tax_sign] * abs(tax['amount']),
self.create(cr, uid, data, context)
del vals['account_tax_id']
- if check and ((not context.get('no_store_function')) or journal.entry_posted):
+ if check and not context.get('novalidate') and (context.get('recompute', True) or journal.entry_posted):
tmp = move_obj.validate(cr, uid, [vals['move_id']], context)
if journal.entry_posted and tmp:
move_obj.button_validate(cr,uid, [vals['move_id']], context)
bool(journal.currency),bool(journal.analytic_journal_id)))
return result
-account_move_line()
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
projects / odoo / odoo.git / blobdiff