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

[MERGE]:merged from lp:~openerp-dev/openobject-addons/report_dev

Browse Source 
bzr revid: apa@tinyerp.com-20101216051828-4b63uzcjynu8u4km
This commit is contained in:
apa (OpenERP)
2010-12-16 10:48:28 +05:30
parent fc707635b5 fdc71f3203
commit 6da9a0069c
639 changed files with 7246 additions and 4980 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/account/account.py
+92 -93
View File
@@ -30,7 +30,7 @@ from osv import fields, osv
import decimal_precision as dp
from tools.translate import _
def check_cycle(self, cr, uid, ids):
def check_cycle(self, cr, uid, ids, context=None):
""" climbs the ``self._table.parent_id`` chains for 100 levels or
until it can't find any more parent(s)
@@ -116,7 +116,7 @@ class account_payment_term_line(osv.osv):
_order = "sequence"
def _check_percent(self, cr, uid, ids, context=None):
obj = self.browse(cr, uid, ids[0])
obj = self.browse(cr, uid, ids[0], context=context)
if obj.value == 'procent' and ( obj.value_amount < 0.0 or obj.value_amount > 1.0):
return False
return True
@@ -194,7 +194,7 @@ class account_account(osv.osv):
if not args[pos][2]:
del args[pos]
continue
jour = self.pool.get('account.journal').browse(cr, uid, args[pos][2])
jour = self.pool.get('account.journal').browse(cr, uid, args[pos][2], context=context)
if (not (jour.account_control_ids or jour.type_control_ids)) or not args[pos][2]:
args[pos] = ('type','not in',('consolidation','view'))
continue
@@ -207,7 +207,7 @@ class account_account(osv.osv):
if context and context.has_key('consolidate_childs'): #add consolidated childs of accounts
ids = super(account_account, self).search(cr, uid, args, offset, limit,
order, context=context, count=count)
for consolidate_child in self.browse(cr, uid, context['account_id']).child_consol_ids:
for consolidate_child in self.browse(cr, uid, context['account_id'], context=context).child_consol_ids:
ids.append(consolidate_child.id)
return ids
@@ -215,8 +215,6 @@ class account_account(osv.osv):
order, context=context, count=count)
def _get_children_and_consol(self, cr, uid, ids, context=None):
if context is None:
context = {}
#this function search for all the children and all consolidated children (recursively) of the given account ids
ids2 = self.search(cr, uid, [('parent_id', 'child_of', ids)], context=context)
ids3 = []
@@ -309,15 +307,15 @@ class account_account(osv.osv):
res[id] = sums.get(id, null_result)
return res
def _get_company_currency(self, cr, uid, ids, field_name, arg, context={}):
def _get_company_currency(self, cr, uid, ids, field_name, arg, context=None):
result = {}
for rec in self.browse(cr, uid, ids, context):
for rec in self.browse(cr, uid, ids, context=context):
result[rec.id] = (rec.company_id.currency_id.id,rec.company_id.currency_id.symbol)
return result
def _get_child_ids(self, cr, uid, ids, field_name, arg, context={}):
def _get_child_ids(self, cr, uid, ids, field_name, arg, context=None):
result = {}
for record in self.browse(cr, uid, ids, context):
for record in self.browse(cr, uid, ids, context=context):
if record.child_parent_ids:
result[record.id] = [x.id for x in record.child_parent_ids]
else:
@@ -330,9 +328,9 @@ class account_account(osv.osv):
return result
def _get_level(self, cr, uid, ids, field_name, arg, context={}):
def _get_level(self, cr, uid, ids, field_name, arg, context=None):
res={}
accounts = self.browse(cr, uid, ids)
accounts = self.browse(cr, uid, ids, context=context)
for account in accounts:
level = 0
if account.parent_id:
@@ -396,8 +394,8 @@ class account_account(osv.osv):
'company_id': lambda s,cr,uid,c: s.pool.get('res.company')._company_default_get(cr, uid, 'account.account', context=c),
}
def _check_recursion(self, cr, uid, ids):
obj_self = self.browse(cr, uid, ids[0])
def _check_recursion(self, cr, uid, ids, context=None):
obj_self = self.browse(cr, uid, ids[0], context=context)
p_id = obj_self.parent_id and obj_self.parent_id.id
if (obj_self in obj_self.child_consol_ids) or (p_id and (p_id is obj_self.id)):
return False
@@ -426,14 +424,12 @@ class account_account(osv.osv):
def name_search(self, cr, user, name, args=None, operator='ilike', context=None, limit=100):
if not args:
args = []
if not context:
context = {}
args = args[:]
ids = []
try:
if name and str(name).startswith('partner:'):
part_id = int(name.split(':')[1])
part = self.pool.get('res.partner').browse(cr, user, part_id, context)
part = self.pool.get('res.partner').browse(cr, user, part_id, context=context)
args += [('id', 'in', (part.property_account_payable.id, part.property_account_receivable.id))]
name = False
if name and str(name).startswith('type:'):
@@ -685,7 +681,7 @@ class account_journal(osv.osv):
@return: Returns a list of tupples containing id, name
"""
result = self.browse(cr, user, ids, context)
result = self.browse(cr, user, ids, context=context)
res = []
for rs in result:
name = rs.name
@@ -733,7 +729,7 @@ class account_journal(osv.osv):
view_id = 'account_journal_bank_view_multi'
data_id = obj_data.search(cr, uid, [('model','=','account.journal.view'), ('name','=',view_id)])
data = obj_data.browse(cr, uid, data_id[0])
data = obj_data.browse(cr, uid, data_id[0], context=context)
res.update({
'centralisation':type == 'situation',
@@ -778,8 +774,8 @@ class account_fiscalyear(osv.osv):
return False
return True
def _check_duration(self,cr,uid,ids):
obj_fy = self.browse(cr,uid,ids[0])
def _check_duration(self, cr, uid, ids, context=None):
obj_fy = self.browse(cr, uid, ids[0], context=context)
if obj_fy.date_stop < obj_fy.date_start:
return False
return True
@@ -789,11 +785,11 @@ class account_fiscalyear(osv.osv):
(_check_fiscal_year, 'Error! You cannot define overlapping fiscal years',['date_start', 'date_stop'])
]
def create_period3(self,cr, uid, ids, context={}):
def create_period3(self,cr, uid, ids, context=None):
return self.create_period(cr, uid, ids, context, 3)
def create_period(self,cr, uid, ids, context={}, interval=1):
for fy in self.browse(cr, uid, ids, context):
def create_period(self,cr, uid, ids, context=None, interval=1):
for fy in self.browse(cr, uid, ids, context=context):
ds = datetime.strptime(fy.date_start, '%Y-%m-%d')
while ds.strftime('%Y-%m-%d')<fy.date_stop:
de = ds + relativedelta(months=interval, days=-1)
@@ -811,7 +807,7 @@ class account_fiscalyear(osv.osv):
ds = ds + relativedelta(months=interval)
return True
def find(self, cr, uid, dt=None, exception=True, context={}):
def find(self, cr, uid, dt=None, exception=True, context=None):
if not dt:
dt = time.strftime('%Y-%m-%d')
ids = self.search(cr, uid, [('date_start', '<=', dt), ('date_stop', '>=', dt)])
@@ -856,14 +852,14 @@ class account_period(osv.osv):
}
_order = "date_start"
def _check_duration(self,cr,uid,ids,context={}):
obj_period=self.browse(cr,uid,ids[0])
def _check_duration(self,cr,uid,ids,context=None):
obj_period = self.browse(cr, uid, ids[0], context=context)
if obj_period.date_stop < obj_period.date_start:
return False
return True
def _check_year_limit(self,cr,uid,ids,context={}):
for obj_period in self.browse(cr,uid,ids):
def _check_year_limit(self,cr,uid,ids,context=None):
for obj_period in self.browse(cr, uid, ids, context=context):
if obj_period.special:
continue
@@ -884,13 +880,13 @@ class account_period(osv.osv):
(_check_year_limit, 'Invalid period ! Some periods overlap or the date period is not in the scope of the fiscal year. ', ['date_stop'])
]
def next(self, cr, uid, period, step, context={}):
def next(self, cr, uid, period, step, context=None):
ids = self.search(cr, uid, [('date_start','>',period.date_start)])
if len(ids)>=step:
return ids[step-1]
return False
def find(self, cr, uid, dt=None, context={}):
def find(self, cr, uid, dt=None, context=None):
if not dt:
dt = time.strftime('%Y-%m-%d')
#CHECKME: shouldn't we check the state of the period?
@@ -906,7 +902,7 @@ class account_period(osv.osv):
cr.execute('update account_period set state=%s where id=%s', (mode, id))
return True
def name_search(self, cr, user, name, args=None, operator='ilike', context={}, limit=80):
def name_search(self, cr, user, name, args=None, operator='ilike', context=None, limit=100):
if args is None:
args = []
if context is None:
@@ -918,7 +914,7 @@ class account_period(osv.osv):
ids = self.search(cr, user, [('name',operator,name)]+ args, limit=limit)
return self.name_get(cr, user, ids, context=context)
def write(self, cr, uid, ids, vals, context={}):
def write(self, cr, uid, ids, vals, context=None):
if 'company_id' in vals:
move_lines = self.pool.get('account.move.line').search(cr, uid, [('period_id', 'in', ids)])
if move_lines:
@@ -944,7 +940,7 @@ class account_journal_period(osv.osv):
_name = "account.journal.period"
_description = "Journal Period"
def _icon_get(self, cr, uid, ids, field_name, arg=None, context={}):
def _icon_get(self, cr, uid, ids, field_name, arg=None, context=None):
result = {}.fromkeys(ids, 'STOCK_NEW')
for r in self.read(cr, uid, ids, ['state']):
result[r['id']] = {
@@ -966,28 +962,28 @@ class account_journal_period(osv.osv):
'company_id': fields.related('journal_id', 'company_id', type='many2one', relation='res.company', string='Company')
}
def _check(self, cr, uid, ids, context={}):
for obj in self.browse(cr, uid, ids, context):
def _check(self, cr, uid, ids, context=None):
for obj in self.browse(cr, uid, ids, context=context):
cr.execute('select * from account_move_line where journal_id=%s and period_id=%s limit 1', (obj.journal_id.id, obj.period_id.id))
res = cr.fetchall()
if res:
raise osv.except_osv(_('Error !'), _('You can not modify/delete a journal with entries for this period !'))
return True
def write(self, cr, uid, ids, vals, context={}):
self._check(cr, uid, ids, context)
return super(account_journal_period, self).write(cr, uid, ids, vals, context)
def write(self, cr, uid, ids, vals, context=None):
self._check(cr, uid, ids, context=context)
return super(account_journal_period, self).write(cr, uid, ids, vals, context=context)
def create(self, cr, uid, vals, context={}):
def create(self, cr, uid, vals, context=None):
period_id=vals.get('period_id',False)
if period_id:
period = self.pool.get('account.period').browse(cr, uid,period_id)
period = self.pool.get('account.period').browse(cr, uid, period_id, context=context)
vals['state']=period.state
return super(account_journal_period, self).create(cr, uid, vals, context)
def unlink(self, cr, uid, ids, context={}):
self._check(cr, uid, ids, context)
return super(account_journal_period, self).unlink(cr, uid, ids, context)
def unlink(self, cr, uid, ids, context=None):
self._check(cr, uid, ids, context=context)
return super(account_journal_period, self).unlink(cr, uid, ids, context=context)
_defaults = {
'state': 'draft',
@@ -1038,8 +1034,6 @@ class account_move(osv.osv):
if not args:
args = []
if not context:
context = {}
ids = []
if name:
ids += self.search(cr, user, [('name','ilike',name)]+args, limit=limit, context=context)
@@ -1058,7 +1052,7 @@ class account_move(osv.osv):
if not ids:
return []
res = []
data_move = self.pool.get('account.move').browse(cursor,user,ids)
data_move = self.pool.get('account.move').browse(cursor, user, ids, context=context)
for move in data_move:
if move.state=='draft':
name = '*' + str(move.id)
@@ -1067,7 +1061,7 @@ class account_move(osv.osv):
res.append((move.id, name))
return res
def _get_period(self, cr, uid, context):
def _get_period(self, cr, uid, context=None):
periods = self.pool.get('account.period').find(cr, uid)
if periods:
return periods[0]
@@ -1128,8 +1122,8 @@ class account_move(osv.osv):
'company_id': lambda self,cr,uid,c: self.pool.get('res.users').browse(cr, uid, uid, c).company_id.id,
}
def _check_centralisation(self, cursor, user, ids):
for move in self.browse(cursor, user, ids):
def _check_centralisation(self, cursor, user, ids, context=None):
for move in self.browse(cursor, user, ids, context=context):
if move.journal_id.centralisation:
move_ids = self.search(cursor, user, [
('period_id', '=', move.period_id.id),
@@ -1139,8 +1133,8 @@ class account_move(osv.osv):
return False
return True
def _check_period_journal(self, cursor, user, ids):
for move in self.browse(cursor, user, ids):
def _check_period_journal(self, cursor, user, ids, context=None):
for move in self.browse(cursor, user, ids, context=context):
for line in move.line_id:
if line.period_id.id != move.period_id.id:
return False
@@ -1166,7 +1160,7 @@ class account_move(osv.osv):
if not valid_moves:
raise osv.except_osv(_('Integrity Error !'), _('You cannot validate a non-balanced entry !\nMake sure you have configured Payment Term properly !\nIt should contain atleast one Payment Term Line with type "Balance" !'))
obj_sequence = self.pool.get('ir.sequence')
for move in self.browse(cr, uid, valid_moves):
for move in self.browse(cr, uid, valid_moves, context=context):
if move.name =='/':
new_name = False
journal = move.journal_id
@@ -1191,7 +1185,7 @@ class account_move(osv.osv):
return True
def button_validate(self, cursor, user, ids, context=None):
for move in self.browse(cursor, user, ids):
for move in self.browse(cursor, user, ids, context=context):
top = None
for line in move.line_id:
account = line.account_id
@@ -1204,8 +1198,8 @@ class account_move(osv.osv):
raise osv.except_osv(_('Error !'), _('You cannot validate a Journal Entry unless all journal items are in same chart of accounts !'))
return self.post(cursor, user, ids, context=context)
def button_cancel(self, cr, uid, ids, context={}):
for line in self.browse(cr, uid, ids, context):
def button_cancel(self, cr, uid, ids, context=None):
for line in self.browse(cr, uid, ids, context=context):
if not line.journal_id.update_posted:
raise osv.except_osv(_('Error !'), _('You can not modify a posted entry of this journal !\nYou should set the journal to allow cancelling entries if you want to do that.'))
if ids:
@@ -1214,18 +1208,21 @@ class account_move(osv.osv):
'WHERE id IN %s', ('draft', tuple(ids),))
return True
def write(self, cr, uid, ids, vals, context={}):
def write(self, cr, uid, ids, vals, context=None):
if context is None:
context = {}
c = context.copy()
c['novalidate'] = True
result = super(osv.osv, self).write(cr, uid, ids, vals, c)
self.validate(cr, uid, ids, context)
self.validate(cr, uid, ids, context=context)
return result
#
# TODO: Check if period is closed !
#
def create(self, cr, uid, vals, context=None):
context = context or {}
if context is None:
context = {}
if 'line_id' in vals and context.get('copy'):
for l in vals['line_id']:
if not l[0]:
@@ -1265,8 +1262,9 @@ class account_move(osv.osv):
result = super(account_move, self).create(cr, uid, vals, context)
return result
def copy(self, cr, uid, id, default={}, context={}):
context = context or {}
def copy(self, cr, uid, id, default={}, context=None):
if context is None:
context = {}
default.update({
'state':'draft',
'name':'/',
@@ -1277,10 +1275,9 @@ class account_move(osv.osv):
return super(account_move, self).copy(cr, uid, id, default, context)
def unlink(self, cr, uid, ids, context=None, check=True):
context = context or {}
toremove = []
obj_move_line = self.pool.get('account.move.line')
for move in self.browse(cr, uid, ids, context):
for move in self.browse(cr, uid, ids, context=context):
if move['state'] != 'draft':
raise osv.except_osv(_('UserError'),
_('You can not delete posted movement: "%s"!') % \
@@ -1294,8 +1291,8 @@ class account_move(osv.osv):
result = super(account_move, self).unlink(cr, uid, toremove, context)
return result
def _compute_balance(self, cr, uid, id, context={}):
move = self.browse(cr, uid, [id])[0]
def _compute_balance(self, cr, uid, id, context=None):
move = self.browse(cr, uid, id, context=context)
amount = 0
for line in move.line_id:
amount+= (line.debit - line.credit)
@@ -1358,7 +1355,7 @@ class account_move(osv.osv):
#
# Validate a balanced move. If it is a centralised journal, create a move.
#
def validate(self, cr, uid, ids, context={}):
def validate(self, cr, uid, ids, context=None):
if context and ('__last_update' in context):
del context['__last_update']
@@ -1472,9 +1469,9 @@ class account_move_reconcile(osv.osv):
_defaults = {
'name': lambda self,cr,uid,ctx={}: self.pool.get('ir.sequence').get(cr, uid, 'account.reconcile') or '/',
}
def reconcile_partial_check(self, cr, uid, ids, type='auto', context={}):
def reconcile_partial_check(self, cr, uid, ids, type='auto', context=None):
total = 0.0
for rec in self.browse(cr, uid, ids, context):
for rec in self.browse(cr, uid, ids, context=context):
for line in rec.line_partial_ids:
total += (line.debit or 0.0) - (line.credit or 0.0)
if not total:
@@ -1488,7 +1485,7 @@ class account_move_reconcile(osv.osv):
if not ids:
return []
result = []
for r in self.browse(cr, uid, ids, context):
for r in self.browse(cr, uid, ids, context=context):
total = reduce(lambda y,t: (t.debit or 0.0) - (t.credit or 0.0) + y, r.line_partial_ids, 0.0)
if total:
name = '%s (%.2f)' % (r.name, total)
@@ -1537,7 +1534,7 @@ class account_tax_code(osv.osv):
(parent_ids,) + where_params)
res=dict(cr.fetchall())
obj_precision = self.pool.get('decimal.precision')
for record in self.browse(cr, uid, ids, context):
for record in self.browse(cr, uid, ids, context=context):
def _rec_get(record):
amount = res.get(record.id, 0.0)
for rec in record.child_ids:
@@ -1619,7 +1616,7 @@ class account_tax_code(osv.osv):
return [(x['id'], (x['code'] and (x['code'] + ' - ') or '') + x['name']) \
for x in reads]
def _default_company(self, cr, uid, context={}):
def _default_company(self, cr, uid, context=None):
user = self.pool.get('res.users').browse(cr, uid, uid, context=context)
if user.company_id:
return user.company_id.id
@@ -1723,7 +1720,7 @@ class account_tax(osv.osv):
"""
if not args:
args = []
if not context:
if context is None:
context = {}
ids = []
if name:
@@ -2062,7 +2059,7 @@ class account_model(osv.osv):
raise osv.except_osv(_('No period found !'), _('Unable to find a valid period !'))
period_id = period_id[0]
for model in self.browse(cr, uid, ids, context):
for model in self.browse(cr, uid, ids, context=context):
entry['name'] = model.name%{'year':time.strftime('%Y'), 'month':time.strftime('%m'), 'date':time.strftime('%Y-%m')}
move_id = account_move_obj.create(cr, uid, {
'ref': entry['name'],
@@ -2168,13 +2165,13 @@ class account_subscription(osv.osv):
'period_nbr': 1,
'state': 'draft',
}
def state_draft(self, cr, uid, ids, context={}):
def state_draft(self, cr, uid, ids, context=None):
self.write(cr, uid, ids, {'state':'draft'})
return False
def check(self, cr, uid, ids, context={}):
def check(self, cr, uid, ids, context=None):
todone = []
for sub in self.browse(cr, uid, ids, context):
for sub in self.browse(cr, uid, ids, context=context):
ok = True
for line in sub.lines_id:
if not line.move_id.id:
@@ -2186,9 +2183,9 @@ class account_subscription(osv.osv):
self.write(cr, uid, todone, {'state':'done'})
return False
def remove_line(self, cr, uid, ids, context={}):
def remove_line(self, cr, uid, ids, context=None):
toremove = []
for sub in self.browse(cr, uid, ids, context):
for sub in self.browse(cr, uid, ids, context=context):
for line in sub.lines_id:
if not line.move_id.id:
toremove.append(line.id)
@@ -2197,8 +2194,8 @@ class account_subscription(osv.osv):
self.write(cr, uid, ids, {'state':'draft'})
return False
def compute(self, cr, uid, ids, context={}):
for sub in self.browse(cr, uid, ids, context):
def compute(self, cr, uid, ids, context=None):
for sub in self.browse(cr, uid, ids, context=context):
ds = sub.date_start
for i in range(sub.period_total):
self.pool.get('account.subscription.line').create(cr, uid, {
@@ -2296,10 +2293,10 @@ class account_account_template(osv.osv):
]
def name_get(self, cr, uid, ids, context={}):
def name_get(self, cr, uid, ids, context=None):
if not ids:
return []
reads = self.read(cr, uid, ids, ['name','code'], context)
reads = self.read(cr, uid, ids, ['name','code'], context=context)
res = []
for record in reads:
name = record['name']
@@ -2316,7 +2313,7 @@ class account_add_tmpl_wizard(osv.osv_memory):
With the 'nocreate' option, some accounts may not be created. Use this to add them later."""
_name = 'account.addtmpl.wizard'
def _get_def_cparent(self, cr, uid, context):
def _get_def_cparent(self, cr, uid, context=None):
acc_obj=self.pool.get('account.account')
tmpl_obj=self.pool.get('account.account.template')
tids=tmpl_obj.read(cr, uid, [context['tmpl_ids']], ['parent_id'])
@@ -2338,6 +2335,8 @@ class account_add_tmpl_wizard(osv.osv_memory):
}
def action_create(self,cr,uid,ids,context=None):
if context is None:
context = {}
acc_obj = self.pool.get('account.account')
tmpl_obj = self.pool.get('account.account.template')
data = self.read(cr, uid, ids)
@@ -2463,16 +2462,16 @@ class account_tax_template(osv.osv):
'price_include': fields.boolean('Tax Included in Price', help="Check this if the price you use on the product and invoices includes this tax."),
}
def name_get(self, cr, uid, ids, context={}):
def name_get(self, cr, uid, ids, context=None):
if not ids:
return []
res = []
for record in self.read(cr, uid, ids, ['description','name'], context):
for record in self.read(cr, uid, ids, ['description','name'], context=context):
name = record['description'] and record['description'] or record['name']
res.append((record['id'],name ))
return res
def _default_company(self, cr, uid, context={}):
def _default_company(self, cr, uid, context=None):
user = self.pool.get('res.users').browse(cr, uid, uid, context=context)
if user.company_id:
return user.company_id.id
@@ -2579,7 +2578,7 @@ class wizard_multi_charts_accounts(osv.osv_memory):
res['value']["purchase_tax"] = purchase_tax_ids and purchase_tax_ids[0] or False
return res
def _get_chart(self, cr, uid, context={}):
def _get_chart(self, cr, uid, context=None):
ids = self.pool.get('account.chart.template').search(cr, uid, [], context=context)
if ids:
return ids[0]
@@ -2625,7 +2624,7 @@ class wizard_multi_charts_accounts(osv.osv_memory):
#create all the tax code
children_tax_code_template = self.pool.get('account.tax.code.template').search(cr, uid, [('parent_id','child_of',[tax_code_root_id])], order='id')
children_tax_code_template.sort()
for tax_code_template in self.pool.get('account.tax.code.template').browse(cr, uid, children_tax_code_template):
for tax_code_template in self.pool.get('account.tax.code.template').browse(cr, uid, children_tax_code_template, context=context):
vals={
'name': (tax_code_root_id == tax_code_template.id) and obj_multi.company_id.name or tax_code_template.name,
'code': tax_code_template.code,
@@ -2682,7 +2681,7 @@ class wizard_multi_charts_accounts(osv.osv_memory):
children_acc_template = obj_acc_template.search(cr, uid, [('parent_id','child_of',[obj_acc_root.id]),('nocreate','!=',True)])
children_acc_template.sort()
for account_template in obj_acc_template.browse(cr, uid, children_acc_template):
for account_template in obj_acc_template.browse(cr, uid, children_acc_template,context=context):
tax_ids = []
for tax in account_template.tax_ids:
tax_ids.append(tax_template_ref[tax.id])
@@ -2722,7 +2721,7 @@ class wizard_multi_charts_accounts(osv.osv_memory):
# Creating Journals Sales and Purchase
vals_journal={}
data_id = obj_data.search(cr, uid, [('model','=','account.journal.view'), ('name','=','account_sp_journal_view')])
data = obj_data.browse(cr, uid, data_id[0])
data = obj_data.browse(cr, uid, data_id[0], context=context)
view_id = data.res_id
seq_id = obj_sequence.search(cr, uid, [('name','=','Account Journal')])[0]
@@ -2835,11 +2834,11 @@ class wizard_multi_charts_accounts(osv.osv_memory):
# Bank Journals
data_id = obj_data.search(cr, uid, [('model','=','account.journal.view'), ('name','=','account_journal_bank_view')])
data = obj_data.browse(cr, uid, data_id[0])
data = obj_data.browse(cr, uid, data_id[0], context=context)
view_id_cash = data.res_id
data_id = obj_data.search(cr, uid, [('model','=','account.journal.view'), ('name','=','account_journal_bank_view_multi')])
data = obj_data.browse(cr, uid, data_id[0])
data = obj_data.browse(cr, uid, data_id[0], context=context)
view_id_cur = data.res_id
ref_acc_bank = obj_multi.chart_template_id.bank_account_view_id
@@ -2932,7 +2931,7 @@ class wizard_multi_charts_accounts(osv.osv_memory):
obj_tax_fp = self.pool.get('account.fiscal.position.tax')
obj_ac_fp = self.pool.get('account.fiscal.position.account')
for position in obj_fiscal_position_template.browse(cr, uid, fp_ids):
for position in obj_fiscal_position_template.browse(cr, uid, fp_ids, context=context):
vals_fp = {
'company_id': company_id,
addons/account/account_analytic_line.py
+9 -7
View File
@@ -58,8 +58,8 @@ class account_analytic_line(osv.osv):
return super(account_analytic_line, self).search(cr, uid, args, offset, limit,
order, context=context, count=count)
def _check_company(self, cr, uid, ids):
lines = self.browse(cr, uid, ids)
def _check_company(self, cr, uid, ids, context=None):
lines = self.browse(cr, uid, ids, context=context)
for l in lines:
if l.move_id and not l.account_id.company_id.id == l.move_id.account_id.company_id.id:
return False
@@ -80,7 +80,7 @@ class account_analytic_line(osv.osv):
analytic_journal_obj =self.pool.get('account.analytic.journal')
product_price_type_obj = self.pool.get('product.price.type')
j_id = analytic_journal_obj.browse(cr, uid, journal_id, context=context)
prod = product_obj.browse(cr, uid, prod_id)
prod = product_obj.browse(cr, uid, prod_id, context=context)
result = 0.0
if j_id.type <> 'sale':
@@ -105,13 +105,13 @@ class account_analytic_line(osv.osv):
flag = False
# Compute based on pricetype
product_price_type_ids = product_price_type_obj.search(cr, uid, [('field','=','standard_price')], context=context)
pricetype = product_price_type_obj.browse(cr, uid, product_price_type_ids, context)[0]
pricetype = product_price_type_obj.browse(cr, uid, product_price_type_ids, context=context)[0]
if journal_id:
journal = analytic_journal_obj.browse(cr, uid, journal_id)
journal = analytic_journal_obj.browse(cr, uid, journal_id, context=context)
if journal.type == 'sale':
product_price_type_ids = product_price_type_obj.search(cr, uid, [('field','=','list_price')], context)
if product_price_type_ids:
pricetype = product_price_type_obj.browse(cr, uid, product_price_type_ids, context)[0]
pricetype = product_price_type_obj.browse(cr, uid, product_price_type_ids, context=context)[0]
# Take the company currency as the reference one
if pricetype.field == 'list_price':
flag = True
@@ -133,7 +133,9 @@ class account_analytic_line(osv.osv):
}
}
def view_header_get(self, cr, user, view_id, view_type, context):
def view_header_get(self, cr, user, view_id, view_type, context=None):
if context is None:
context = {}
if context.get('account_id', False):
# account_id in context may also be pointing to an account.account.id
cr.execute('select name from account_analytic_account where id=%s', (context['account_id'],))
addons/account/account_bank_statement.py
+14 -10
View File
@@ -46,7 +46,9 @@ class account_bank_statement(osv.osv):
account_bank_statement_line_obj.write(cr, uid, [line.id], {'sequence': seq}, context=context)
return res
def _default_journal_id(self, cr, uid, context={}):
def _default_journal_id(self, cr, uid, context=None):
if context is None:
context = {}
journal_pool = self.pool.get('account.journal')
journal_type = context.get('journal_type', False)
journal_id = False
@@ -56,11 +58,11 @@ class account_bank_statement(osv.osv):
journal_id = ids[0]
return journal_id
def _default_balance_start(self, cr, uid, context={}):
def _default_balance_start(self, cr, uid, context=None):
cr.execute('select id from account_bank_statement where journal_id=%s order by date desc limit 1', (1,))
res = cr.fetchone()
if res:
return self.browse(cr, uid, [res[0]], context)[0].balance_end
return self.browse(cr, uid, res[0], context=context).balance_end
return 0.0
def _end_balance(self, cursor, user, ids, name, attr, context=None):
@@ -95,7 +97,7 @@ class account_bank_statement(osv.osv):
res[r] = round(res[r], 2)
return res
def _get_period(self, cr, uid, context={}):
def _get_period(self, cr, uid, context=None):
periods = self.pool.get('account.period').find(cr, uid)
if periods:
return periods[0]
@@ -195,11 +197,13 @@ class account_bank_statement(osv.osv):
return self.write(cr, uid, ids, {}, context=context)
def create_move_from_st_line(self, cr, uid, st_line_id, company_currency_id, st_line_number, context=None):
if context is None:
context = {}
res_currency_obj = self.pool.get('res.currency')
account_move_obj = self.pool.get('account.move')
account_move_line_obj = self.pool.get('account.move.line')
account_bank_statement_line_obj = self.pool.get('account.bank.statement.line')
st_line = account_bank_statement_line_obj.browse(cr, uid, st_line_id, context)
st_line = account_bank_statement_line_obj.browse(cr, uid, st_line_id, context=context)
st = st_line.statement_id
context.update({'date': st_line.date})
@@ -299,7 +303,7 @@ class account_bank_statement(osv.osv):
return st_number + '/' + str(st_line.sequence)
def balance_check(self, cr, uid, st_id, journal_type='bank', context=None):
st = self.browse(cr, uid, st_id, context)
st = self.browse(cr, uid, st_id, context=context)
if not (abs((st.balance_end or 0.0) - st.balance_end_real) < 0.0001):
raise osv.except_osv(_('Error !'),
_('The statement balance is incorrect !\n') +
@@ -318,7 +322,7 @@ class account_bank_statement(osv.osv):
if context is None:
context = {}
for st in self.browse(cr, uid, ids, context):
for st in self.browse(cr, uid, ids, context=context):
j_type = st.journal_id.type
company_currency_id = st.journal_id.company_id.currency_id.id
if not self.check_status_condition(cr, uid, st.state, journal_type=j_type):
@@ -360,7 +364,7 @@ class account_bank_statement(osv.osv):
def button_cancel(self, cr, uid, ids, context=None):
done = []
account_move_obj = self.pool.get('account.move')
for st in self.browse(cr, uid, ids, context):
for st in self.browse(cr, uid, ids, context=context):
if st.state=='draft':
continue
ids = []
@@ -381,7 +385,7 @@ class account_bank_statement(osv.osv):
return {'value': {'balance_start': balance_start, 'account_id': account_id}}
def unlink(self, cr, uid, ids, context=None):
stat = self.read(cr, uid, ids, ['state'])
stat = self.read(cr, uid, ids, ['state'], context=context)
unlink_ids = []
for t in stat:
if t['state'] in ('draft'):
@@ -412,7 +416,7 @@ class account_bank_statement_line(osv.osv):
if not partner_id:
return res
account_id = False
line = self.browse(cr, uid, line_id)
line = self.browse(cr, uid, line_id, context=context)
if not line or (line and not line[0].account_id):
part = obj_partner.browse(cr, uid, partner_id, context=context)
if type == 'supplier':
addons/account/account_cash_statement.py
+13 -13
View File
@@ -41,7 +41,7 @@ class account_cashbox_line(osv.osv):
@return: Dictionary of values.
"""
res = {}
for obj in self.browse(cr, uid, ids):
for obj in self.browse(cr, uid, ids, context=context):
res[obj.id] = obj.pieces * obj.number
return res
@@ -76,7 +76,7 @@ class account_cash_statement(osv.osv):
@return: Dictionary of values.
"""
res = {}
for statement in self.browse(cr, uid, ids):
for statement in self.browse(cr, uid, ids, context=context):
amount_total = 0.0
if statement.journal_id.type not in('cash'):
@@ -96,7 +96,7 @@ class account_cash_statement(osv.osv):
@return: Dictionary of values.
"""
res = {}
for statement in self.browse(cr, uid, ids):
for statement in self.browse(cr, uid, ids, context=context):
amount_total = 0.0
for line in statement.ending_details_ids:
amount_total += line.pieces * line.number
@@ -111,7 +111,7 @@ class account_cash_statement(osv.osv):
@return: Dictionary of values.
"""
res2 = {}
for statement in self.browse(cr, uid, ids):
for statement in self.browse(cr, uid, ids, context=context):
encoding_total=0.0
for line in statement.line_ids:
encoding_total += line.amount
@@ -160,7 +160,7 @@ class account_cash_statement(osv.osv):
company_id = company_pool.search(cr, uid, [])
return company_id and company_id[0] or False
def _get_cash_open_box_lines(self, cr, uid, context={}):
def _get_cash_open_box_lines(self, cr, uid, context=None):
res = []
curr = [1, 2, 5, 10, 20, 50, 100, 500]
for rs in curr:
@@ -173,14 +173,14 @@ class account_cash_statement(osv.osv):
if journal_ids:
results = self.search(cr, uid, [('journal_id', 'in', journal_ids),('state', '=', 'confirm')], context=context)
if results:
cash_st = self.browse(cr, uid, results, context)[0]
cash_st = self.browse(cr, uid, results, context=context)[0]
for cash_line in cash_st.ending_details_ids:
for r in res:
if cash_line.pieces == r['pieces']:
r['number'] = cash_line.number
return res
def _get_default_cash_close_box_lines(self, cr, uid, context={}):
def _get_default_cash_close_box_lines(self, cr, uid, context=None):
res = []
curr = [1, 2, 5, 10, 20, 50, 100, 500]
for rs in curr:
@@ -191,7 +191,7 @@ class account_cash_statement(osv.osv):
res.append(dct)
return res
def _get_cash_close_box_lines(self, cr, uid, context={}):
def _get_cash_close_box_lines(self, cr, uid, context=None):
res = []
curr = [1, 2, 5, 10, 20, 50, 100, 500]
for rs in curr:
@@ -202,11 +202,11 @@ class account_cash_statement(osv.osv):
res.append((0, 0, dct))
return res
def _get_cash_open_close_box_lines(self, cr, uid, context={}):
def _get_cash_open_close_box_lines(self, cr, uid, context=None):
res = {}
start_l = []
end_l = []
starting_details = self._get_cash_open_box_lines(cr, uid, context)
starting_details = self._get_cash_open_box_lines(cr, uid, context=context)
ending_details = self._get_default_cash_close_box_lines(cr, uid, context)
for start in starting_details:
start_l.append((0, 0, start))
@@ -248,7 +248,7 @@ class account_cash_statement(osv.osv):
if open_jrnl:
raise osv.except_osv(_('Error'), _('You can not have two open register for the same journal'))
if self.pool.get('account.journal').browse(cr, uid, vals['journal_id']).type == 'cash':
if self.pool.get('account.journal').browse(cr, uid, vals['journal_id'], context=context).type == 'cash':
open_close = self._get_cash_open_close_box_lines(cr, uid, context)
if vals.get('starting_details_ids', False):
for start in vals.get('starting_details_ids'):
@@ -283,7 +283,7 @@ class account_cash_statement(osv.osv):
@return: True on success, False otherwise
"""
super(account_cash_statement, self).write(cr, uid, ids, vals)
super(account_cash_statement, self).write(cr, uid, ids, vals, context=context)
res = self._get_starting_balance(cr, uid, ids)
for rs in res:
super(account_cash_statement, self).write(cr, uid, [rs], res.get(rs))
@@ -338,7 +338,7 @@ class account_cash_statement(osv.osv):
'state': 'open',
})
self.write(cr, uid, [statement.id], vals)
self.write(cr, uid, [statement.id], vals, context=context)
return True
def balance_check(self, cr, uid, cash_id, journal_type='bank', context=None):
addons/account/account_move_line.py
+60 -44
View File
@@ -107,9 +107,9 @@ class account_move_line(osv.osv):
del data[f]
return data
def create_analytic_lines(self, cr, uid, ids, context={}):
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):
for obj_line in self.browse(cr, uid, ids, context=context):
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, ))
@@ -139,7 +139,9 @@ class account_move_line(osv.osv):
del(data['account_tax_id'])
return data
def convert_to_period(self, cr, uid, context={}):
def convert_to_period(self, cr, uid, context=None):
if context is None:
context = {}
period_obj = self.pool.get('account.period')
#check if the period_id changed in the context from client side
if context.get('period_id', False):
@@ -151,7 +153,9 @@ class account_move_line(osv.osv):
})
return context
def _default_get(self, cr, uid, fields, context={}):
def _default_get(self, cr, uid, fields, context=None):
if context is None:
context = {}
if not context.get('journal_id', False) and context.get('search_default_journal_id', False):
context['journal_id'] = context.get('search_default_journal_id')
account_obj = self.pool.get('account.account')
@@ -164,7 +168,7 @@ class account_move_line(osv.osv):
currency_obj = self.pool.get('res.currency')
context = self.convert_to_period(cr, uid, context)
# Compute simple values
data = super(account_move_line, self).default_get(cr, uid, fields, context)
data = super(account_move_line, self).default_get(cr, uid, fields, context=context)
# Starts: Manual entry from account.move form
if context.get('lines',[]):
total_new = 0.00
@@ -174,7 +178,7 @@ class account_move_line(osv.osv):
for item in i[2]:
data[item] = i[2][item]
if context['journal']:
journal_data = journal_obj.browse(cr, uid, context['journal'])
journal_data = journal_obj.browse(cr, uid, context['journal'], context=context)
if journal_data.type == 'purchase':
if total_new > 0:
account = journal_data.default_credit_account_id
@@ -186,9 +190,9 @@ class account_move_line(osv.osv):
else:
account = journal_data.default_debit_account_id
if account and ((not fields) or ('debit' in fields) or ('credit' in fields)) and 'partner_id' in data and (data['partner_id']):
part = partner_obj.browse(cr, uid, data['partner_id'])
part = partner_obj.browse(cr, uid, data['partner_id'], context=context)
account = fiscal_pos_obj.map_account(cr, uid, part and part.property_account_position or False, account.id)
account = account_obj.browse(cr, uid, account)
account = account_obj.browse(cr, uid, account, context=context)
data['account_id'] = account.id
s = -total_new
@@ -236,7 +240,7 @@ class account_move_line(osv.osv):
return data
total = 0
ref_id = False
move = move_obj.browse(cr, uid, move_id, context)
move = move_obj.browse(cr, uid, move_id, context=context)
if 'name' in fields:
data.setdefault('name', move.line_id[-1].name)
acc1 = False
@@ -265,7 +269,7 @@ class account_move_line(osv.osv):
# part = False is acceptable for fiscal position.
account = fiscal_pos_obj.map_account(cr, uid, part and part.property_account_position or False, account.id)
if account:
account = account_obj.browse(cr, uid, account)
account = account_obj.browse(cr, uid, account, context=context)
if account and ((not fields) or ('debit' in fields) or ('credit' in fields)):
data['account_id'] = account.id
@@ -289,10 +293,10 @@ class account_move_line(osv.osv):
data['amount_currency'] = v
return data
def on_create_write(self, cr, uid, id, context={}):
def on_create_write(self, cr, uid, id, context=None):
if not id:
return []
ml = self.browse(cr, uid, id, context)
ml = self.browse(cr, uid, id, context=context)
return map(lambda x: x.id, ml.move_id.line_id)
def _balance(self, cr, uid, ids, name, arg, context=None):
@@ -334,11 +338,11 @@ class account_move_line(osv.osv):
res[line_id] = (invoice_id, invoice_names[invoice_id])
return res
def name_get(self, cr, uid, ids, context={}):
def name_get(self, cr, uid, ids, context=None):
if not ids:
return []
result = []
for line in self.browse(cr, uid, ids, context):
for line in self.browse(cr, uid, ids, context=context):
if line.ref:
result.append((line.id, (line.move_id.name or '')+' ('+line.ref+')'))
else:
@@ -454,6 +458,8 @@ class account_move_line(osv.osv):
}
def _get_date(self, cr, uid, context=None):
if context is None:
context or {}
period_obj = self.pool.get('account.period')
dt = time.strftime('%Y-%m-%d')
if ('journal_id' in context) and ('period_id' in context):
@@ -495,35 +501,35 @@ class account_move_line(osv.osv):
('credit_debit2', 'CHECK (credit+debit>=0)', 'Wrong credit or debit value in accounting entry !'),
]
def _auto_init(self, cr, context={}):
super(account_move_line, self)._auto_init(cr, context)
def _auto_init(self, cr, context=None):
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)')
def _check_no_view(self, cr, uid, ids):
lines = self.browse(cr, uid, ids)
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':
return False
return True
def _check_no_closed(self, cr, uid, ids):
lines = self.browse(cr, uid, ids)
def _check_no_closed(self, cr, uid, ids, context=None):
lines = self.browse(cr, uid, ids, context=context)
for l in lines:
if l.account_id.type == 'closed':
return False
return True
def _check_company_id(self, cr, uid, ids):
lines = self.browse(cr, uid, ids)
def _check_company_id(self, cr, uid, ids, context=None):
lines = self.browse(cr, uid, ids, context=context)
for l in lines:
if l.company_id != l.account_id.company_id or l.company_id != l.period_id.company_id:
return False
return True
def _check_partner_id(self, cr, uid, ids):
lines = self.browse(cr, uid, ids)
def _check_partner_id(self, cr, uid, ids, context=None):
lines = self.browse(cr, uid, ids, context=context)
for l in lines:
if l.account_id.type in ('receivable', 'payable') and not l.partner_id:
return False
@@ -546,7 +552,7 @@ class account_move_line(osv.osv):
if (not currency_id) or (not account_id):
return {}
result = {}
acc = account_obj.browse(cr, uid, account_id)
acc = account_obj.browse(cr, uid, account_id, context=context)
if (amount>0) and journal:
x = journal_obj.browse(cr, uid, journal).default_credit_account_id
if x: acc = x
@@ -662,7 +668,7 @@ class account_move_line(osv.osv):
raise osv.except_osv(_('Warning !'), _('To reconcile the entries company should be the same for all entries'))
company_list.append(line.company_id.id)
for line in self.browse(cr, uid, ids, context):
for line in self.browse(cr, uid, ids, context=context):
if line.reconcile_id:
raise osv.except_osv(_('Warning'), _('Already Reconciled!'))
if line.reconcile_partial_id:
@@ -808,8 +814,10 @@ class account_move_line(osv.osv):
partner_obj.write(cr, uid, [partner_id], {'last_reconciliation_date': time.strftime('%Y-%m-%d %H:%M:%S')})
return r_id
def view_header_get(self, cr, user, view_id, view_type, context):
context = self.convert_to_period(cr, user, context)
def view_header_get(self, cr, user, view_id, view_type, context=None):
if context is None:
context = {}
context = self.convert_to_period(cr, user, context=context)
if context.get('account_id', False):
cr.execute('SELECT code FROM account_account WHERE id = %s', (context['account_id'], ))
res = cr.fetchone()
@@ -825,7 +833,7 @@ class account_move_line(osv.osv):
return j+(p and (':'+p) or '')
return False
def onchange_date(self, cr, user, ids, date, context={}):
def onchange_date(self, cr, user, ids, date, context=None):
"""
Returns a dict that contains new values and context
@param cr: A database cursor
@@ -836,6 +844,8 @@ class account_move_line(osv.osv):
@return: Returns a dict which contains new values, and context
"""
res = {}
if context is None:
context = {}
period_pool = self.pool.get('account.period')
pids = period_pool.search(cr, user, [('date_start','<=',date), ('date_stop','>=',date)])
if pids:
@@ -850,9 +860,11 @@ class account_move_line(osv.osv):
'context':context,
}
def fields_view_get(self, cr, uid, view_id=None, view_type='form', context={}, toolbar=False, submenu=False):
def fields_view_get(self, cr, uid, view_id=None, view_type='form', context=None, toolbar=False, submenu=False):
journal_pool = self.pool.get('account.journal')
result = super(osv.osv, self).fields_view_get(cr, uid, view_id, view_type, context, toolbar=toolbar, submenu=submenu)
if context is None:
context = {}
result = super(osv.osv, self).fields_view_get(cr, uid, view_id, view_type, context=context, toolbar=toolbar, submenu=submenu)
if view_type != 'tree':
#Remove the toolbar from the form view
if view_type == 'form':
@@ -871,7 +883,7 @@ class account_move_line(osv.osv):
xml = '''<?xml version="1.0"?>\n<tree string="%s" editable="top" refresh="5" on_write="on_create_write" colors="red:state==\'draft\';black:state==\'valid\'">\n\t''' % (title)
ids = journal_pool.search(cr, uid, [])
journals = journal_pool.browse(cr, uid, ids)
journals = journal_pool.browse(cr, uid, ids, context=context)
all_journal = [None]
common_fields = {}
total = len(journals)
@@ -952,8 +964,10 @@ class account_move_line(osv.osv):
result['fields'] = self.fields_get(cr, uid, flds, context)
return result
def _check_moves(self, cr, uid, context):
def _check_moves(self, cr, uid, context=None):
# use the first move ever created for this journal and period
if context is None:
context = {}
cr.execute('SELECT id, state, name FROM account_move WHERE journal_id = %s AND period_id = %s ORDER BY id limit 1', (context['journal_id'],context['period_id']))
res = cr.fetchone()
if res:
@@ -981,11 +995,13 @@ class account_move_line(osv.osv):
obj_move_rec.unlink(cr, uid, unlink_ids)
return True
def unlink(self, cr, uid, ids, context={}, check=True):
def unlink(self, cr, uid, ids, context=None, check=True):
if context is None:
context = {}
move_obj = self.pool.get('account.move')
self._update_check(cr, uid, ids, context)
result = False
for line in self.browse(cr, uid, ids, context):
for line in self.browse(cr, uid, ids, context=context):
context['journal_id'] = line.journal_id.id
context['period_id'] = line.period_id.id
result = super(account_move_line, self).unlink(cr, uid, [line.id], context=context)
@@ -1014,9 +1030,9 @@ class account_move_line(osv.osv):
journal_id = context.get('journal_id', False)
period_id = context.get('period_id', False)
if journal_id:
journal = journal_obj.browse(cr, uid, [journal_id])[0]
journal = journal_obj.browse(cr, uid, journal_id, context=context)
if journal.allow_date and period_id:
period = period_obj.browse(cr, uid, [period_id])[0]
period = period_obj.browse(cr, uid, period_id, context=context)
if not time.strptime(vals['date'][:10],'%Y-%m-%d') >= time.strptime(period.date_start, '%Y-%m-%d') or not time.strptime(vals['date'][:10], '%Y-%m-%d') <= time.strptime(period.date_stop, '%Y-%m-%d'):
raise osv.except_osv(_('Error'),_('The date of your Journal Entry is not in the defined period!'))
else:
@@ -1069,7 +1085,7 @@ class account_move_line(osv.osv):
move_obj.write(cr, uid, [line.move_id.id], {'date': todo_date}, context=context)
return result
def _update_journal_check(self, cr, uid, journal_id, period_id, context={}):
def _update_journal_check(self, cr, uid, journal_id, period_id, context=None):
journal_obj = self.pool.get('account.journal')
period_obj = self.pool.get('account.period')
jour_period_obj = self.pool.get('account.journal.period')
@@ -1079,8 +1095,8 @@ class account_move_line(osv.osv):
if state == 'done':
raise osv.except_osv(_('Error !'), _('You can not add/modify entries in a closed journal.'))
if not result:
journal = journal_obj.browse(cr, uid, journal_id, context)
period = period_obj.browse(cr, uid, period_id, context)
journal = journal_obj.browse(cr, uid, journal_id, context=context)
period = period_obj.browse(cr, uid, period_id, context=context)
jour_period_obj.create(cr, uid, {
'name': (journal.code or journal.name)+':'+(period.name or ''),
'journal_id': journal.id,
@@ -1088,9 +1104,9 @@ class account_move_line(osv.osv):
})
return True
def _update_check(self, cr, uid, ids, context={}):
def _update_check(self, cr, uid, ids, context=None):
done = {}
for line in self.browse(cr, uid, ids, context):
for line in self.browse(cr, uid, ids, context=context):
if line.move_id.state <> 'draft' and (not line.journal_id.entry_posted):
raise osv.except_osv(_('Error !'), _('You can not do this modification on a confirmed entry ! Please note that you can just change some non important fields !'))
if line.reconcile_id:
@@ -1127,7 +1143,7 @@ class account_move_line(osv.osv):
self._update_journal_check(cr, uid, context['journal_id'], context['period_id'], context)
move_id = vals.get('move_id', False)
journal = journal_obj.browse(cr, uid, context['journal_id'])
journal = journal_obj.browse(cr, uid, context['journal_id'], context=context)
if not move_id:
if journal.centralisation:
#Check for centralisation
@@ -1150,7 +1166,7 @@ class account_move_line(osv.osv):
raise osv.except_osv(_('No piece number !'), _('Can not create an automatic sequence for this piece !\n\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'])
account = account_obj.browse(cr, uid, vals['account_id'], context=context)
if journal.type_control_ids:
type = account.user_type
for t in journal.type_control_ids:
addons/account/i18n/account.pot
+70 -41
View File
@@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2010-12-10 17:14:45+0000\n"
"PO-Revision-Date: 2010-12-10 17:14:45+0000\n"
"POT-Creation-Date: 2010-12-15 15:04:35+0000\n"
"PO-Revision-Date: 2010-12-15 15:04:35+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -328,6 +328,12 @@ msgstr ""
msgid "Allows you to change the sign of the balance amount displayed in the reports, so that you can see positive figures instead of negative ones in expenses accounts."
msgstr ""
#. module: account
#: view:account.installer:0
#: view:account.installer.modules:0
msgid "Configure"
msgstr ""
#. module: account
#: selection:account.entries.report,month:0
#: selection:account.invoice.report,month:0
@@ -1191,11 +1197,6 @@ msgstr ""
msgid "Overdue Payments"
msgstr ""
#. module: account
#: constraint:account.invoice:0
msgid "Error: BVR reference is required."
msgstr ""
#. module: account
#: report:account.third_party_ledger:0
#: report:account.third_party_ledger_other:0
@@ -1943,6 +1944,11 @@ msgstr ""
msgid "Search Chart of Account Templates"
msgstr ""
#. module: account
#: view:account.installer:0
msgid "The default Chart of Accounts is matching your country selection. If no certified Chart of Accounts exists for your specified country, a generic one can be installed and will be selected by default."
msgstr ""
#. module: account
#: view:account.account.type:0
#: field:account.account.type,note:0
@@ -2845,7 +2851,10 @@ msgid "Purchase"
msgstr ""
#. module: account
#: view:account.installer:0
#: view:account.installer.modules:0
#: model:ir.actions.act_window,name:account.action_account_installer
#: view:wizard.multi.charts.accounts:0
msgid "Accounting Application Configuration"
msgstr ""
@@ -3293,17 +3302,9 @@ msgid "#Entries"
msgstr ""
#. module: account
#: view:account.account:0
#: field:account.account,user_type:0
#: view:account.account.template:0
#: field:account.account.template,user_type:0
#: view:account.account.type:0
#: field:account.bank.accounts.wizard,account_type:0
#: field:account.entries.report,user_type:0
#: model:ir.model,name:account.model_account_account_type
#: field:report.account.receivable,type:0
#: field:report.account_type.sales,user_type:0
msgid "Account Type"
#: code:addons/account/invoice.py:0
#, python-format
msgid "The Payment Term of Supplier does not have Payment Term Lines(Computation) defined !"
msgstr ""
#. module: account
@@ -3521,9 +3522,17 @@ msgid "Shortcut"
msgstr ""
#. module: account
#: code:addons/account/invoice.py:0
#, python-format
msgid "The Payment Term of Supplier does not have Payment Term Lines(Computation) defined !"
#: view:account.account:0
#: field:account.account,user_type:0
#: view:account.account.template:0
#: field:account.account.template,user_type:0
#: view:account.account.type:0
#: field:account.bank.accounts.wizard,account_type:0
#: field:account.entries.report,user_type:0
#: model:ir.model,name:account.model_account_account_type
#: field:report.account.receivable,type:0
#: field:report.account_type.sales,user_type:0
msgid "Account Type"
msgstr ""
#. module: account
@@ -3819,9 +3828,8 @@ msgid "Analytic Account Statistics"
msgstr ""
#. module: account
#: report:account.vat.declaration:0
#: field:account.vat.declaration,based_on:0
msgid "Based On"
#: view:wizard.multi.charts.accounts:0
msgid "This will automatically configure your chart of accounts, bank accounts, taxes and journals according to the selected template"
msgstr ""
#. module: account
@@ -3905,6 +3913,16 @@ msgid "Please verify the price of the invoice !\n"
"The real total does not match the computed total."
msgstr ""
#. module: account
#: code:addons/account/account_move_line.py:0
#: code:addons/account/wizard/account_invoice_state.py:0
#: code:addons/account/wizard/account_report_balance_sheet.py:0
#: code:addons/account/wizard/account_state_open.py:0
#: code:addons/account/wizard/account_validate_account_move.py:0
#, python-format
msgid "Warning"
msgstr ""
#. module: account
#: view:account.subscription.generate:0
#: model:ir.actions.act_window,name:account.action_account_subscription_generate
@@ -5373,6 +5391,11 @@ msgstr ""
msgid "Default Credit Account"
msgstr ""
#. module: account
#: view:account.installer:0
msgid "Configure Your Accounting Chart"
msgstr ""
#. module: account
#: view:account.payment.term.line:0
msgid " number of days: 30"
@@ -5544,6 +5567,11 @@ msgstr ""
msgid "Centralisation"
msgstr ""
#. module: account
#: view:wizard.multi.charts.accounts:0
msgid "Generate Your Accounting Chart from a Chart Template"
msgstr ""
#. module: account
#: view:account.account:0
#: view:account.account.template:0
@@ -5694,6 +5722,12 @@ msgstr ""
msgid "Fax :"
msgstr ""
#. module: account
#: report:account.vat.declaration:0
#: field:account.vat.declaration,based_on:0
msgid "Based On"
msgstr ""
#. module: account
#: help:res.partner,property_account_receivable:0
msgid "This account will be used instead of the default one as the receivable account for the current partner"
@@ -6188,11 +6222,6 @@ msgstr ""
msgid "Unknown Partner"
msgstr ""
#. module: account
#: view:account.bank.statement:0
msgid "Opening Balance"
msgstr ""
#. module: account
#: help:account.journal,centralisation:0
msgid "Check this box to determine that each entry of this journal won't create a new counterpart but will share the same counterpart. This is used in fiscal year closing."
@@ -6854,6 +6883,11 @@ msgstr ""
msgid "Invoice's state is Open"
msgstr ""
#. module: account
#: view:account.installer.modules:0
msgid "Add extra Accounting functionalities to the ones already installed."
msgstr ""
#. module: account
#: report:account.analytic.account.cost_ledger:0
#: report:account.analytic.account.quantity_cost_ledger:0
@@ -7378,11 +7412,6 @@ msgstr ""
msgid "Print Account Partner Balance"
msgstr ""
#. module: account
#: constraint:account.invoice:0
msgid "Error: Invalid Bvr Number (wrong checksum)."
msgstr ""
#. module: account
#: field:res.partner,contract_ids:0
msgid "Contracts"
@@ -7546,6 +7575,11 @@ msgstr ""
msgid "Dear Sir/Madam,"
msgstr ""
#. module: account
#: view:account.installer.modules:0
msgid "Configure Your Accounting Application"
msgstr ""
#. module: account
#: model:ir.actions.act_window,help:account.action_account_form
msgid "Create and manage accounts you will need to record financial entries in. Accounts are financial records of your company that register all financial transactions. Companies present their annual accounts in two main parts: the balance sheet and the income statement (profit and loss account). The annual accounts of a company are required by law to disclose a certain amount of information. They have to be certified by an external auditor yearly."
@@ -8542,13 +8576,8 @@ msgid "End period"
msgstr ""
#. module: account
#: code:addons/account/account_move_line.py:0
#: code:addons/account/wizard/account_invoice_state.py:0
#: code:addons/account/wizard/account_report_balance_sheet.py:0
#: code:addons/account/wizard/account_state_open.py:0
#: code:addons/account/wizard/account_validate_account_move.py:0
#, python-format
msgid "Warning"
#: view:account.bank.statement:0
msgid "Opening Balance"
msgstr ""
#. module: account
addons/account/i18n/es.po
+2 -2
View File
@@ -7,14 +7,14 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2010-12-10 17:14+0000\n"
"PO-Revision-Date: 2010-12-14 22:57+0000\n"
"PO-Revision-Date: 2010-12-15 15:38+0000\n"
"Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
"<jesteve@zikzakmedia.com>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-12-15 04:59+0000\n"
"X-Launchpad-Export-Date: 2010-12-16 04:45+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account
addons/account/i18n/fr.po
+215 -91
View File
File diff suppressed because it is too large Load Diff
addons/account/i18n/it.po
+2 -2
View File
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2010-12-10 17:14+0000\n"
"PO-Revision-Date: 2010-12-15 00:19+0000\n"
"PO-Revision-Date: 2010-12-15 20:51+0000\n"
"Last-Translator: qdp (OpenERP) <qdp-launchpad@tinyerp.com>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-12-15 04:56+0000\n"
"X-Launchpad-Export-Date: 2010-12-16 04:45+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account
addons/account/i18n/nl.po
+3 -3
View File
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2010-12-10 17:14+0000\n"
"PO-Revision-Date: 2010-12-14 21:02+0000\n"
"Last-Translator: Christophe (OpenERP) <Unknown>\n"
"PO-Revision-Date: 2010-12-15 21:51+0000\n"
"Last-Translator: OpenERP Administrators <Unknown>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-12-15 04:54+0000\n"
"X-Launchpad-Export-Date: 2010-12-16 04:44+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account
addons/account/i18n/ru.po
+51 -48
View File
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2010-12-10 17:14+0000\n"
"PO-Revision-Date: 2010-12-14 23:38+0000\n"
"PO-Revision-Date: 2010-12-15 17:02+0000\n"
"Last-Translator: Chertykov Denis <chertykov@gmail.com>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-12-15 04:58+0000\n"
"X-Launchpad-Export-Date: 2010-12-16 04:45+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account
@@ -4745,7 +4745,7 @@ msgstr "Имя счета/контрагента"
#. module: account
#: view:account.bank.statement:0
msgid "Transaction"
msgstr ""
msgstr "Операция"
#. module: account
#: help:account.tax,base_code_id:0
@@ -4762,7 +4762,7 @@ msgstr "Использовать данный код для декларации
#. module: account
#: view:account.move.line:0
msgid "Debit/Credit"
msgstr ""
msgstr "Дебет/Кредит"
#. module: account
#: view:report.hr.timesheet.invoice.journal:0
@@ -4778,7 +4778,7 @@ msgstr "Шаблоны кодов налога"
#. module: account
#: model:ir.model,name:account.model_account_installer
msgid "account.installer"
msgstr ""
msgstr "account.installer"
#. module: account
#: field:account.tax.template,include_base_amount:0
@@ -4803,6 +4803,8 @@ msgstr "Журнал банковских операций "
#: constraint:product.template:0
msgid "Error: UOS must be in a different category than the UOM"
msgstr ""
"Ошибка: Единицы продажи и единицы измерения должны принадлежать к разным "
"категориям."
#. module: account
#: view:account.journal:0
@@ -4842,7 +4844,7 @@ msgstr ""
#. module: account
#: field:account.bank.statement.line,name:0
msgid "Communication"
msgstr ""
msgstr "Общение"
#. module: account
#: model:ir.ui.menu,name:account.menu_analytic_accounting
@@ -4881,7 +4883,7 @@ msgstr "Символ кода налога"
#. module: account
#: model:ir.model,name:account.model_report_invoice_created
msgid "Report of Invoices Created within Last 15 days"
msgstr ""
msgstr "Отчет по счетам созданным за последние 15 дней"
#. module: account
#: field:account.fiscalyear,end_journal_period_id:0
@@ -4912,7 +4914,7 @@ msgstr "Позиции подписки"
#. module: account
#: field:account.entries.report,quantity:0
msgid "Products Quantity"
msgstr ""
msgstr "Количество ТМЦ"
#. module: account
#: view:account.entries.report:0
@@ -4928,18 +4930,18 @@ msgstr ""
#: model:ir.actions.act_window,name:account.action_account_change_currency
#: model:ir.model,name:account.model_account_change_currency
msgid "Change Currency"
msgstr ""
msgstr "Изменить валюту"
#. module: account
#: model:process.node,note:account.process_node_accountingentries0
#: model:process.node,note:account.process_node_supplieraccountingentries0
msgid "Accounting entries."
msgstr ""
msgstr "Проводки."
#. module: account
#: view:account.invoice:0
msgid "Payment Date"
msgstr ""
msgstr "Дата платежа"
#. module: account
#: selection:account.automatic.reconcile,power:0
@@ -5103,7 +5105,7 @@ msgstr ""
#: view:account.move:0
#: view:account.move.line:0
msgid "Journal Item"
msgstr ""
msgstr "Запись в журнале"
#. module: account
#: model:ir.model,name:account.model_account_move_journal
@@ -5137,14 +5139,14 @@ msgstr ""
#. module: account
#: field:report.invoice.created,create_date:0
msgid "Create Date"
msgstr ""
msgstr "Дата создания"
#. module: account
#: view:account.analytic.journal:0
#: model:ir.actions.act_window,name:account.action_account_analytic_journal_form
#: model:ir.ui.menu,name:account.account_def_analytic_journal
msgid "Analytic Journals"
msgstr ""
msgstr "Журналы аналитики"
#. module: account
#: field:account.account,child_id:0
@@ -5191,7 +5193,7 @@ msgstr ""
#. module: account
#: view:report.account.receivable:0
msgid "Accounts by type"
msgstr ""
msgstr "Счета по типу"
#. module: account
#: report:account.analytic.account.journal:0
@@ -5208,7 +5210,7 @@ msgstr ""
#. module: account
#: field:account.payment.term.line,value:0
msgid "Valuation"
msgstr ""
msgstr "Оценка"
#. module: account
#: selection:account.aged.trial.balance,result_selection:0
@@ -5279,7 +5281,7 @@ msgstr "Установить период"
#: view:account.invoice.report:0
#: field:account.invoice.report,nbr:0
msgid "# of Lines"
msgstr ""
msgstr "Кол-во позиций"
#. module: account
#: code:addons/account/wizard/account_change_currency.py:0
@@ -5304,13 +5306,13 @@ msgstr ""
#: field:account.report.general.ledger,filter:0
#: field:account.vat.declaration,filter:0
msgid "Filter by"
msgstr ""
msgstr "Фильтровать по"
#. module: account
#: code:addons/account/account_move_line.py:0
#, python-format
msgid "You can not use an inactive account!"
msgstr ""
msgstr "Нельзя использовать неактивный счет !"
#. module: account
#: code:addons/account/account_move_line.py:0
@@ -5345,12 +5347,12 @@ msgstr "7"
#: code:addons/account/invoice.py:0
#, python-format
msgid "Invalid action !"
msgstr ""
msgstr "Неверное действие !"
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_tax_template
msgid "Template Tax Fiscal Position"
msgstr ""
msgstr "Шаблон налога системы налогообложения"
#. module: account
#: help:account.tax,name:0
@@ -5373,7 +5375,7 @@ msgstr "Ничего"
#. module: account
#: view:analytic.entries.report:0
msgid " 365 Days "
msgstr ""
msgstr " 365 Дней "
#. module: account
#: model:ir.actions.act_window,name:account.action_invoice_tree3
@@ -5384,7 +5386,7 @@ msgstr "Возврат средств клиенту"
#. module: account
#: view:account.payment.term.line:0
msgid "Amount Computation"
msgstr ""
msgstr "Расчет суммы"
#. module: account
#: field:account.journal.period,name:0
@@ -5400,12 +5402,12 @@ msgstr ""
#: code:addons/account/wizard/account_report_common.py:0
#, python-format
msgid "not implemented"
msgstr ""
msgstr "не реализовано"
#. module: account
#: help:account.journal,company_id:0
msgid "Company related to this journal"
msgstr ""
msgstr "Компания связанная с этим журналом"
#. module: account
#: code:addons/account/wizard/account_invoice_state.py:0
@@ -5418,14 +5420,14 @@ msgstr ""
#. module: account
#: report:account.invoice:0
msgid "Fiscal Position Remark :"
msgstr ""
msgstr "Замечание о системе налогообложения:"
#. module: account
#: view:analytic.entries.report:0
#: model:ir.actions.act_window,name:account.action_analytic_entries_report
#: model:ir.ui.menu,name:account.menu_action_analytic_entries_report
msgid "Analytic Entries Analysis"
msgstr ""
msgstr "Анализ проводок аналитики"
#. module: account
#: model:ir.actions.act_window,help:account.action_bank_statement_tree
@@ -5461,7 +5463,7 @@ msgstr "Сообщение о просроченном платеже"
#. module: account
#: field:account.entries.report,date_created:0
msgid "Date Created"
msgstr ""
msgstr "Дата создания"
#. module: account
#: field:account.payment.term.line,value_amount:0
@@ -5491,7 +5493,7 @@ msgstr ""
#: code:addons/account/invoice.py:0
#, python-format
msgid "is validated."
msgstr ""
msgstr "проверено."
#. module: account
#: view:account.chart.template:0
@@ -5517,13 +5519,13 @@ msgstr "Налоги с покупателя"
#. module: account
#: view:account.addtmpl.wizard:0
msgid "Create an Account based on this template"
msgstr ""
msgstr "Создать счет на основе этого шаблона"
#. module: account
#: view:account.account.type:0
#: view:account.tax.code:0
msgid "Reporting Configuration"
msgstr ""
msgstr "Настройка отчетов"
#. module: account
#: constraint:account.move.line:0
@@ -5550,7 +5552,7 @@ msgstr ""
#. module: account
#: model:ir.model,name:account.model_res_company
msgid "Companies"
msgstr ""
msgstr "Компании"
#. module: account
#: code:addons/account/account.py:0
@@ -5563,7 +5565,7 @@ msgstr ""
#. module: account
#: help:account.fiscalyear.close.state,fy_id:0
msgid "Select a fiscal year to close"
msgstr ""
msgstr "Выберите финансовый год для закрытия"
#. module: account
#: help:account.chart.template,tax_template_ids:0
@@ -5578,7 +5580,7 @@ msgstr ""
#. module: account
#: view:account.move.line.reconcile.writeoff:0
msgid "Information addendum"
msgstr ""
msgstr "Дополнительная информация"
#. module: account
#: field:account.aged.trial.balance,fiscalyear_id:0
@@ -5649,7 +5651,7 @@ msgstr "Отмена"
#. module: account
#: field:account.account.type,name:0
msgid "Acc. Type Name"
msgstr ""
msgstr "Название типа счета"
#. module: account
#: selection:account.account,type:0
@@ -5672,7 +5674,7 @@ msgstr "Счет по кредиту по умолчанию"
#. module: account
#: view:account.payment.term.line:0
msgid " number of days: 30"
msgstr ""
msgstr " количество дней: 30"
#. module: account
#: help:account.analytic.line,currency_id:0
@@ -5682,7 +5684,7 @@ msgstr ""
#. module: account
#: view:account.analytic.account:0
msgid "Current"
msgstr ""
msgstr "Текущий"
#. module: account
#: view:account.bank.statement:0
@@ -5697,12 +5699,12 @@ msgstr "Собственные средства"
#. module: account
#: selection:account.tax,type:0
msgid "Percentage"
msgstr ""
msgstr "Процент"
#. module: account
#: selection:account.report.general.ledger,sortby:0
msgid "Journal & Partner"
msgstr ""
msgstr "Журнал и партнер"
#. module: account
#: field:account.automatic.reconcile,power:0
@@ -5777,13 +5779,13 @@ msgstr ""
#: selection:account.account.template,type:0
#: view:account.journal:0
msgid "Liquidity"
msgstr ""
msgstr "Ликвидность"
#. module: account
#: model:ir.actions.act_window,name:account.action_account_analytic_journal_open_form
#: model:ir.ui.menu,name:account.account_analytic_journal_entries
msgid "Analytic Journal Items"
msgstr ""
msgstr "Аналитические записи журнала"
#. module: account
#: view:account.fiscalyear.close:0
@@ -5810,7 +5812,7 @@ msgstr ""
#. module: account
#: sql_constraint:account.journal:0
msgid "The name of the journal must be unique per company !"
msgstr ""
msgstr "Название журнала должно быть уникальным по компании !"
#. module: account
#: field:account.account.template,nocreate:0
@@ -5822,12 +5824,13 @@ msgstr ""
#, python-format
msgid "Can not find account chart for this company, Please Create account."
msgstr ""
"Не удалось найти план счетов для компании. Пожалуйста, создайте счет."
#. module: account
#: code:addons/account/wizard/account_report_aged_partner_balance.py:0
#, python-format
msgid "Enter a Start date !"
msgstr ""
msgstr "Введите дату начала !"
#. module: account
#: report:account.invoice:0
@@ -5840,7 +5843,7 @@ msgstr "Возврат средств от поставщика"
#. module: account
#: model:ir.ui.menu,name:account.menu_dashboard_acc
msgid "Dashboard"
msgstr ""
msgstr "Инф. панель"
#. module: account
#: field:account.bank.statement,move_line_ids:0
@@ -5872,7 +5875,7 @@ msgstr "Централизация"
#: view:account.tax.code.template:0
#: view:analytic.entries.report:0
msgid "Group By..."
msgstr ""
msgstr "Объединять по..."
#. module: account
#: field:account.journal.column,readonly:0
@@ -5882,7 +5885,7 @@ msgstr "Только чтение"
#. module: account
#: model:ir.model,name:account.model_account_pl_report
msgid "Account Profit And Loss Report"
msgstr ""
msgstr "Отчет по счету прибыль и убыток"
#. module: account
#: field:account.invoice.line,uos_id:0
@@ -5899,7 +5902,7 @@ msgstr ""
#. module: account
#: model:ir.model,name:account.model_account_sequence_fiscalyear
msgid "account.sequence.fiscalyear"
msgstr ""
msgstr "account.sequence.fiscalyear"
#. module: account
#: report:account.analytic.account.journal:0
@@ -5935,7 +5938,7 @@ msgstr "Категория счета расходов"
#. module: account
#: view:account.bank.statement:0
msgid "Cash Transactions"
msgstr ""
msgstr "Операции с наличными"
#. module: account
#: code:addons/account/wizard/account_state_open.py:0
addons/account/i18n/sv.po
+15 -12
View File
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 5.0.14\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2010-12-10 17:14+0000\n"
"PO-Revision-Date: 2010-12-14 22:43+0000\n"
"PO-Revision-Date: 2010-12-15 15:34+0000\n"
"Last-Translator: OpenERP Administrators <Unknown>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-12-15 04:59+0000\n"
"X-Launchpad-Export-Date: 2010-12-16 04:45+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account
@@ -44,7 +44,7 @@ msgstr ""
#. module: account
#: view:account.move.reconcile:0
msgid "Journal Entry Reconcile"
msgstr ""
msgstr "Gournal transaktion avstämning"
#. module: account
#: field:account.installer.modules,account_voucher:0
@@ -89,12 +89,12 @@ msgstr ""
#. module: account
#: model:ir.model,name:account.model_report_aged_receivable
msgid "Aged Receivable Till Today"
msgstr ""
msgstr "Periodiserad reskontra till dagens datum"
#. module: account
#: field:account.partner.ledger,reconcil:0
msgid "Include Reconciled Entries"
msgstr ""
msgstr "Inkludera avstämda transaktioner"
#. module: account
#: view:account.pl.report:0
@@ -288,7 +288,7 @@ msgstr "Balansräkning"
#: model:ir.actions.act_window,name:account.action_view_account_use_model
#: model:ir.ui.menu,name:account.menu_action_manual_recurring
msgid "Manual Recurring"
msgstr ""
msgstr "Manuellt återkommande"
#. module: account
#: view:account.fiscalyear.close.state:0
@@ -468,6 +468,9 @@ msgid ""
"it comes to 'Printed' state. When all transactions are done, it comes in "
"'Done' state."
msgstr ""
"När journalen skapades, Statusen är preliminär. När den skrivs ut blir "
"statusen 'Utskriven'. När alla transaktioner är klara får journalen status "
"'klar'."
#. module: account
#: model:ir.actions.act_window,help:account.action_account_tax_chart
@@ -641,7 +644,7 @@ msgstr "Taxes Mapping"
#. module: account
#: report:account.central.journal:0
msgid "Centralized Journal"
msgstr ""
msgstr "Centraliserad journal"
#. module: account
#: sql_constraint:account.sequence.fiscalyear:0
@@ -846,7 +849,7 @@ msgstr "Beräkning"
#. module: account
#: view:account.move.line:0
msgid "Next Partner to reconcile"
msgstr ""
msgstr "Nästa partner som skall stämmas av"
#. module: account
#: code:addons/account/account_move_line.py:0
@@ -931,7 +934,7 @@ msgstr "Utökade filter..."
#. module: account
#: model:ir.ui.menu,name:account.menu_account_central_journal
msgid "Centralizing Journal"
msgstr ""
msgstr "Centraliserad journal"
#. module: account
#: selection:account.journal,type:0
@@ -1051,7 +1054,7 @@ msgstr ""
#. module: account
#: view:account.tax:0
msgid "Applicability Options"
msgstr ""
msgstr "Tillämplighet alternativ"
#. module: account
#: report:account.partner.balance:0
@@ -1085,7 +1088,7 @@ msgstr "Chef"
#. module: account
#: view:account.subscription.generate:0
msgid "Generate Entries before:"
msgstr ""
msgstr "Skapa transaktioner före:"
#. module: account
#: selection:account.bank.accounts.wizard,account_type:0
@@ -1100,7 +1103,7 @@ msgstr "Startdatum"
#. module: account
#: model:process.transition,name:account.process_transition_confirmstatementfromdraft0
msgid "Confirm statement"
msgstr ""
msgstr "Bekräfta utdraget"
#. module: account
#: field:account.fiscal.position.tax,tax_dest_id:0
addons/account/i18n/vi.po
+1 -1
View File
@@ -14,7 +14,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-12-15 05:00+0000\n"
"X-Launchpad-Export-Date: 2010-12-16 04:46+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account
addons/account/installer.py
+1 -1
View File
@@ -45,7 +45,7 @@ class account_installer(osv.osv_memory):
ids = modules.search(cr, uid, [('category_id', '=', 'Account Charts')], context=context)
charts = list(
sorted(((m.name, m.shortdesc)
for m in modules.browse(cr, uid, ids)),
for m in modules.browse(cr, uid, ids, context=context)),
key=itemgetter(1)))
charts.insert(0, ('configurable', 'Generic Chart Of Account'))
return charts
addons/account/invoice.py
+24 -21
View File
@@ -60,7 +60,7 @@ class account_invoice(osv.osv):
return res and res[0] or False
def _get_currency(self, cr, uid, context=None):
user = pooler.get_pool(cr.dbname).get('res.users').browse(cr, uid, [uid])[0]
user = pooler.get_pool(cr.dbname).get('res.users').browse(cr, uid, [uid], context=context)[0]
if user.company_id:
return user.company_id.currency_id.id
return pooler.get_pool(cr.dbname).get('res.currency').search(cr, uid, [('rate','=', 1.0)])[0]
@@ -89,11 +89,11 @@ class account_invoice(osv.osv):
def _amount_residual(self, cr, uid, ids, name, args, context=None):
res = {}
cur_obj = self.pool.get('res.currency')
data_inv = self.browse(cr, uid, ids)
if context is None:
context = {}
cur_obj = self.pool.get('res.currency')
data_inv = self.browse(cr, uid, ids, context=context)
for inv in data_inv:
debit = credit = 0.0
context.update({'date':inv.date_invoice})
@@ -168,7 +168,7 @@ class account_invoice(osv.osv):
def _compute_lines(self, cr, uid, ids, name, args, context=None):
result = {}
for invoice in self.browse(cr, uid, ids, context):
for invoice in self.browse(cr, uid, ids, context=context):
src = []
lines = []
if invoice.move_id:
@@ -187,7 +187,7 @@ class account_invoice(osv.osv):
def _get_invoice_from_line(self, cr, uid, ids, context=None):
move = {}
for line in self.pool.get('account.move.line').browse(cr, uid, ids):
for line in self.pool.get('account.move.line').browse(cr, uid, ids, context=context):
if line.reconcile_partial_id:
for line2 in line.reconcile_partial_id.line_partial_ids:
move[line2.move_id.id] = True
@@ -201,7 +201,7 @@ class account_invoice(osv.osv):
def _get_invoice_from_reconcile(self, cr, uid, ids, context=None):
move = {}
for r in self.pool.get('account.move.reconcile').browse(cr, uid, ids):
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:
@@ -328,6 +328,7 @@ class account_invoice(osv.osv):
journal_obj = self.pool.get('account.journal')
if context is None:
context = {}
if context.get('active_model', '') in ['res.partner'] and context.get('active_ids', False) and context['active_ids']:
partner = self.pool.get(context['active_model']).read(cr, uid, context['active_ids'], ['supplier','customer'])[0]
if not view_type:
@@ -395,7 +396,7 @@ class account_invoice(osv.osv):
return True
def unlink(self, cr, uid, ids, context=None):
invoices = self.read(cr, uid, ids, ['state'])
invoices = self.read(cr, uid, ids, ['state'], context=context)
unlink_ids = []
for t in invoices:
if t['state'] in ('draft', 'cancel'):
@@ -675,7 +676,7 @@ class account_invoice(osv.osv):
def button_compute(self, cr, uid, ids, context=None, set_total=False):
self.button_reset_taxes(cr, uid, ids, context)
for inv in self.browse(cr, uid, ids):
for inv in self.browse(cr, uid, ids, context=context):
if set_total:
self.pool.get('account.invoice').write(cr, uid, [inv.id], {'check_total': inv.amount_total})
return True
@@ -987,7 +988,7 @@ class account_invoice(osv.osv):
#TODO: not correct fix but required a frech values before reading it.
self.write(cr, uid, ids, {})
for obj_inv in self.browse(cr, uid, ids):
for obj_inv in self.browse(cr, uid, ids, context=context):
id = obj_inv.id
invtype = obj_inv.type
number = obj_inv.number
@@ -1155,7 +1156,7 @@ class account_invoice(osv.osv):
context = {}
#TODO check if we can use different period for payment and the writeoff line
assert len(ids)==1, "Can only pay one invoice at a time"
invoice = self.browse(cr, uid, ids[0])
invoice = self.browse(cr, uid, ids[0], context=context)
src_account_id = invoice.account_id.id
# Take the seq as name for move
types = {'out_invoice': -1, 'in_invoice': 1, 'out_refund': 1, 'in_refund': -1}
@@ -1319,9 +1320,9 @@ class account_invoice_line(osv.osv):
return {'value': {'categ_id': False}, 'domain':{'product_uom':[]}}
else:
return {'value': {'price_unit': 0.0, 'categ_id': False}, 'domain':{'product_uom':[]}}
part = self.pool.get('res.partner').browse(cr, uid, partner_id)
part = self.pool.get('res.partner').browse(cr, uid, partner_id, context=context)
fpos_obj = self.pool.get('account.fiscal.position')
fpos = fposition_id and fpos_obj.browse(cr, uid, fposition_id) or False
fpos = fposition_id and fpos_obj.browse(cr, uid, fposition_id, context=context) or False
if part.lang:
context.update({'lang': part.lang})
@@ -1351,7 +1352,7 @@ class account_invoice_line(osv.osv):
# Parse the value_reference field to get the ID of the account.account record
account_id = int (my_value[0]["value_reference"].split(",")[1])
# Use the ID of the account.account record in the browse for the account.account record
app_acc_in = account_obj.browse(cr, uid, [account_id])[0]
app_acc_in = account_obj.browse(cr, uid, account_id, context=context)
if not exp_pro_id:
ex_acc = res.product_tmpl_id.property_account_expense
ex_acc_cate = res.categ_id.property_account_expense_categ
@@ -1360,7 +1361,7 @@ class account_invoice_line(osv.osv):
else:
app_acc_exp = ex_acc_cate
else:
app_acc_exp = account_obj.browse(cr, uid, exp_pro_id)[0]
app_acc_exp = account_obj.browse(cr, uid, exp_pro_id, context=context)[0]
if not in_pro_id and not exp_pro_id:
in_acc = res.product_tmpl_id.property_account_income
in_acc_cate = res.categ_id.property_account_income_categ
@@ -1378,8 +1379,8 @@ class account_invoice_line(osv.osv):
if not in_res_id and not exp_res_id:
raise osv.except_osv(_('Configuration Error !'),
_('Can not find account chart for this company, Please Create account.'))
in_obj_acc = account_obj.browse(cr, uid, in_res_id)
exp_obj_acc = account_obj.browse(cr, uid, exp_res_id)
in_obj_acc = account_obj.browse(cr, uid, in_res_id, context=context)
exp_obj_acc = account_obj.browse(cr, uid, exp_res_id, context=context)
if in_acc or ex_acc:
res.product_tmpl_id.property_account_income = in_obj_acc[0]
res.product_tmpl_id.property_account_expense = exp_obj_acc[0]
@@ -1427,8 +1428,8 @@ class account_invoice_line(osv.osv):
if not company_id or not currency_id:
return res_final
company = self.pool.get('res.company').browse(cr, uid, company_id)
currency = self.pool.get('res.currency').browse(cr, uid, currency_id)
company = self.pool.get('res.company').browse(cr, uid, company_id, context=context)
currency = self.pool.get('res.currency').browse(cr, uid, currency_id, context=context)
if company.currency_id.id != currency.id:
new_price = res_final['value']['price_unit'] * currency.rate
@@ -1453,7 +1454,9 @@ class account_invoice_line(osv.osv):
res = []
tax_obj = self.pool.get('account.tax')
cur_obj = self.pool.get('res.currency')
inv = self.pool.get('account.invoice').browse(cr, uid, invoice_id)
if context is None:
context = {}
inv = self.pool.get('account.invoice').browse(cr, uid, invoice_id, context=context)
company_currency = inv.company_id.currency_id.id
for line in inv.invoice_line:
@@ -1584,11 +1587,11 @@ class account_invoice_tax(osv.osv):
'base_amount': 0.0,
'tax_amount': 0.0,
}
def compute(self, cr, uid, invoice_id, context={}):
def compute(self, cr, uid, invoice_id, context=None):
tax_grouped = {}
tax_obj = self.pool.get('account.tax')
cur_obj = self.pool.get('res.currency')
inv = self.pool.get('account.invoice').browse(cr, uid, invoice_id, context)
inv = self.pool.get('account.invoice').browse(cr, uid, invoice_id, context=context)
cur = inv.currency_id
company_currency = inv.company_id.currency_id.id
addons/account/partner.py
+4 -4
View File
@@ -34,7 +34,7 @@ class account_fiscal_position(osv.osv):
'note': fields.text('Notes', translate=True),
}
def map_tax(self, cr, uid, fposition_id, taxes, context={}):
def map_tax(self, cr, uid, fposition_id, taxes, context=None):
if not taxes:
return []
if not fposition_id:
@@ -51,7 +51,7 @@ class account_fiscal_position(osv.osv):
result.append(t.id)
return result
def map_account(self, cr, uid, fposition_id, account_id, context={}):
def map_account(self, cr, uid, fposition_id, account_id, context=None):
if not fposition_id:
return account_id
for pos in fposition_id.account_ids:
@@ -134,10 +134,10 @@ class res_partner(osv.osv):
return [('id','=','0')]
return [('id','in',map(itemgetter(0), res))]
def _credit_search(self, cr, uid, obj, name, args, context):
def _credit_search(self, cr, uid, obj, name, args, context=None):
return self._asset_difference_search(cr, uid, obj, name, 'receivable', args, context=context)
def _debit_search(self, cr, uid, obj, name, args, context):
def _debit_search(self, cr, uid, obj, name, args, context=None):
return self._asset_difference_search(cr, uid, obj, name, 'payable', args, context=context)
_columns = {
addons/account/project/wizard/project_account_analytic_line.py
+1 -1
View File
@@ -29,7 +29,7 @@ class project_account_analytic_line(osv.osv_memory):
'to_date': fields.date('To'),
}
def action_open_window(self, cr, uid, ids, context={}):
def action_open_window(self, cr, uid, ids, context=None):
mod_obj =self.pool.get('ir.model.data')
domain = []
data = self.read(cr, uid, ids, [])[0]
addons/account/report/account_report.py
+3 -3
View File
@@ -27,7 +27,7 @@ import pooler
import tools
from osv import fields,osv
def _code_get(self, cr, uid, context={}):
def _code_get(self, cr, uid, context=None):
acc_type_obj = self.pool.get('account.account.type')
ids = acc_type_obj.search(cr, uid, [])
res = acc_type_obj.read(cr, uid, ids, ['code', 'name'], context)
@@ -98,9 +98,9 @@ class report_aged_receivable(osv.osv):
res = super(report_aged_receivable, self).fields_view_get(cr, user, view_id, view_type, context, toolbar=toolbar, submenu=submenu)
return res
def _calc_bal(self, cr, uid, ids, name, args, context):
def _calc_bal(self, cr, uid, ids, name, args, context=None):
res = {}
for period in self.read(cr,uid,ids,['name']):
for period in self.read(cr, uid, ids, ['name'], context=context):
date1,date2 = period['name'].split(' to ')
cr.execute("SELECT SUM(credit-debit) FROM account_move_line AS line, account_account as ac \
WHERE (line.account_id=ac.id) AND ac.type='receivable' \
addons/account/wizard/account_automatic_reconcile.py
+7 -3
View File
@@ -42,10 +42,14 @@ class account_automatic_reconcile(osv.osv_memory):
'allow_write_off': fields.boolean('Allow write off')
}
def _get_reconciled(self, cr, uid, context={}):
def _get_reconciled(self, cr, uid, context=None):
if context is None:
context = {}
return context.get('reconciled', 0)
def _get_unreconciled(self, cr, uid, context={}):
def _get_unreconciled(self, cr, uid, context=None):
if context is None:
context = {}
return context.get('unreconciled', 0)
_defaults = {
@@ -175,7 +179,7 @@ class account_automatic_reconcile(osv.osv_memory):
if allow_write_off:
move_line_obj.reconcile(cr, uid, line_ids, 'auto', form['writeoff_acc_id'], form['period_id'], form['journal_id'], context)
else:
move_line_obj.reconcile_partial(cr, uid, line_ids, 'manual', context={})
move_line_obj.reconcile_partial(cr, uid, line_ids, 'manual', context=context)
# get the list of partners who have more than one unreconciled transaction
cr.execute(
addons/account/wizard/account_change_currency.py
+1 -1
View File
@@ -51,7 +51,7 @@ class account_change_currency(osv.osv_memory):
invoice = obj_inv.browse(cr, uid, context['active_id'], context=context)
if invoice.currency_id.id == new_currency:
return {}
rate = obj_currency.browse(cr, uid, new_currency).rate
rate = obj_currency.browse(cr, uid, new_currency, context=context).rate
for line in invoice.invoice_line:
new_price = 0
if invoice.company_id.currency_id.id == invoice.currency_id.id:
addons/account/wizard/account_invoice_refund.py
+1 -1
View File
@@ -93,7 +93,7 @@ class account_invoice_refund(osv.osv_memory):
date = False
period = False
description = False
company = res_users_obj.browse(cr, uid, uid).company_id
company = res_users_obj.browse(cr, uid, uid, context=context).company_id
journal_id = form.get('journal_id', False)
for inv in inv_obj.browse(cr, uid, context.get('active_ids'), context=context):
if inv.state in ['draft', 'proforma2', 'cancel']:
addons/account/wizard/account_move_bank_reconcile.py
+3 -1
View File
@@ -32,13 +32,15 @@ class account_move_bank_reconcile(osv.osv_memory):
'journal_id': fields.many2one('account.journal', 'Journal', required=True),
}
def action_open_window(self, cr, uid, ids, context={}):
def action_open_window(self, cr, uid, ids, context=None):
"""
@param cr: the current row, from the database cursor,
@param uid: the current user’s ID for security checks,
@param ids: account move bank reconcile’s ID or list of IDs
@return: dictionary of Open account move line on given journal_id.
"""
if context is None:
context = {}
data = self.read(cr, uid, ids, context=context)[0]
cr.execute('select default_credit_account_id \
from account_journal where id=%s', (data['journal_id'],))
addons/account/wizard/account_move_journal.py
+4 -4
View File
@@ -29,7 +29,7 @@ class account_move_journal(osv.osv_memory):
_name = "account.move.journal"
_description = "Move journal"
def _get_period(self, cr, uid, context={}):
def _get_period(self, cr, uid, context=None):
"""
Return default account period value
"""
@@ -40,7 +40,7 @@ class account_move_journal(osv.osv_memory):
period_id = ids[0]
return period_id
def _get_journal(self, cr, uid, context={}):
def _get_journal(self, cr, uid, context=None):
"""
Return journal based on the journal type
"""
@@ -138,8 +138,8 @@ class account_move_journal(osv.osv_memory):
ids = period_pool.search(cr, uid, [('journal_id', '=', journal_id), ('period_id', '=', period_id)], context=context)
if not ids:
journal = journal_pool.browse(cr, uid, journal_id)
period = account_period_obj.browse(cr, uid, period_id)
journal = journal_pool.browse(cr, uid, journal_id, context=context)
period = account_period_obj.browse(cr, uid, period_id, context=context)
name = journal.name
state = period.state
addons/account/wizard/account_move_line_reconcile_select.py
+1 -1
View File
@@ -30,7 +30,7 @@ class account_move_line_reconcile_select(osv.osv_memory):
domain = [('reconcile', '=', 1)], required=True),
}
def action_open_window(self, cr, uid, ids, context={}):
def action_open_window(self, cr, uid, ids, context=None):
"""
This function Open account move line window for reconcile on given account id
@param cr: the current row, from the database cursor,
addons/account/wizard/account_move_line_select.py
+1 -1
View File
@@ -42,7 +42,7 @@ class account_move_line_select(osv.osv_memory):
else:
fiscalyear_ids = [context['fiscalyear']]
fiscalyears = fiscalyear_obj.browse(cr, uid, fiscalyear_ids)
fiscalyears = fiscalyear_obj.browse(cr, uid, fiscalyear_ids, context=context)
period_ids = []
if fiscalyears:
addons/account/wizard/account_move_line_unreconcile_select.py
+1 -1
View File
@@ -27,7 +27,7 @@ class account_move_line_unreconcile_select(osv.osv_memory):
_columns ={
'account_id': fields.many2one('account.account','Account',required=True),
}
def action_open_window(self, cr, uid, ids, context={}):
def action_open_window(self, cr, uid, ids, context=None):
data = self.read(cr, uid, ids, context=context)[0]
return {
'domain': "[('account_id','=',%d),('reconcile_id','<>',False),('state','<>','draft')]" % data['account_id'],
addons/account/wizard/account_open_closed_fiscalyear.py
+3 -3
View File
@@ -30,12 +30,12 @@ class account_open_closed_fiscalyear(osv.osv_memory):
'Fiscal Year to Open', required=True, help='Select Fiscal Year which you want to remove entries for its End of year entries journal'),
}
def remove_entries(self, cr, uid, ids, context={}):
def remove_entries(self, cr, uid, ids, context=None):
fy_obj = self.pool.get('account.fiscalyear')
move_obj = self.pool.get('account.move')
data = self.read(cr, uid, ids, [])[0]
data_fyear = fy_obj.browse(cr, uid, data['fyear_id'])
data = self.read(cr, uid, ids, [], context=context)[0]
data_fyear = fy_obj.browse(cr, uid, data['fyear_id'], context=context)
if not data_fyear.end_journal_period_id:
raise osv.except_osv(_('Error'), _('No journal for ending writing has been defined for the fiscal year'))
period_journal = data_fyear.end_journal_period_id
addons/account/wizard/account_reconcile_partner_process.py
+2
View File
@@ -73,6 +73,8 @@ class account_partner_reconcile_process(osv.osv_memory):
return res
def next_partner(self, cr, uid, ids, context=None):
if context is None:
context = {}
move_line_obj = self.pool.get('account.move.line')
res_partner_obj = self.pool.get('res.partner')
addons/account/wizard/account_report_balance_sheet.py
+1 -1
View File
@@ -57,7 +57,7 @@ class account_bs_report(osv.osv_memory):
if context is None:
context = {}
data = self.pre_print_report(cr, uid, ids, data, context=context)
account = self.pool.get('account.account').browse(cr, uid, data['form']['chart_account_id'])
account = self.pool.get('account.account').browse(cr, uid, data['form']['chart_account_id'], context=context)
if not account.company_id.property_reserve_and_surplus_account:
raise osv.except_osv(_('Warning'),_('Please define the Reserve and Profit/Loss account for current user company !'))
data['form']['reserve_account_id'] = account.company_id.property_reserve_and_surplus_account.id
addons/account/wizard/account_report_common_account.py
+1 -1
View File
@@ -38,7 +38,7 @@ class account_common_account_report(osv.osv_memory):
def pre_print_report(self, cr, uid, ids, data, context=None):
if context is None:
context = {}
data['form'].update(self.read(cr, uid, ids, ['display_account'])[0])
data['form'].update(self.read(cr, uid, ids, ['display_account'], context=context)[0])
return data
account_common_account_report()
addons/account/wizard/account_report_common_journal.py
+1 -1
View File
@@ -41,7 +41,7 @@ class account_common_journal_report(osv.osv_memory):
def pre_print_report(self, cr, uid, ids, data, context=None):
if context is None:
context = {}
data['form'].update(self.read(cr, uid, ids, ['amount_currency'])[0])
data['form'].update(self.read(cr, uid, ids, ['amount_currency'], context=context)[0])
fy_ids = data['form']['fiscalyear_id'] and [data['form']['fiscalyear_id']] or self.pool.get('account.fiscalyear').search(cr, uid, [('state', '=', 'draft')], context=context)
period_list = data['form']['periods'] or self.pool.get('account.period').search(cr, uid, [('fiscalyear_id', 'in', fy_ids)], context=context)
data['form']['active_ids'] = self.pool.get('account.journal.period').search(cr, uid, [('journal_id', 'in', data['form']['journal_ids']), ('period_id', 'in', period_list)], context=context)
addons/account/wizard/account_report_common_partner.py
+1 -1
View File
@@ -39,7 +39,7 @@ class account_common_partner_report(osv.osv_memory):
def pre_print_report(self, cr, uid, ids, data, context=None):
if context is None:
context = {}
data['form'].update(self.read(cr, uid, ids, ['result_selection'])[0])
data['form'].update(self.read(cr, uid, ids, ['result_selection'], context=context)[0])
return data
account_common_partner_report()
addons/account/wizard/account_report_print_journal.py
+1 -1
View File
@@ -39,7 +39,7 @@ class account_print_journal(osv.osv_memory):
if context is None:
context = {}
data = self.pre_print_report(cr, uid, ids, data, context=context)
data['form'].update(self.read(cr, uid, ids, ['sort_selection'])[0])
data['form'].update(self.read(cr, uid, ids, ['sort_selection'], context=context)[0])
return {'type': 'ir.actions.report.xml', 'report_name': 'account.journal.period.print', 'datas': data}
account_print_journal()
addons/account/wizard/account_subscription_generate.py
+1 -1
View File
@@ -33,7 +33,7 @@ class account_subscription_generate(osv.osv_memory):
_defaults = {
'date': lambda *a: time.strftime('%Y-%m-%d'),
}
def action_generate(self, cr, uid, ids, context={}):
def action_generate(self, cr, uid, ids, context=None):
mod_obj = self.pool.get('ir.model.data')
act_obj = self.pool.get('ir.actions.act_window')
moves_created=[]
addons/account/wizard/account_unreconcile.py
+2 -2
View File
@@ -41,11 +41,11 @@ class account_unreconcile_reconcile(osv.osv_memory):
def trans_unrec_reconcile(self, cr, uid, ids, context=None):
obj_move_reconcile = self.pool.get('account.move.reconcile')
rec_ids = context['active_ids']
if context is None:
context = {}
rec_ids = context['active_ids']
if rec_ids:
obj_move_reconcile.unlink(cr, uid, rec_ids)
obj_move_reconcile.unlink(cr, uid, rec_ids, context=context)
return {}
account_unreconcile_reconcile()
addons/account/wizard/account_use_model.py
+2 -2
View File
@@ -59,9 +59,9 @@ class account_use_model(osv.osv_memory):
data = self.read(cr, uid, ids, context=context)[0]
record_id = context and context.get('model_line', False) or False
if record_id:
data_model = account_model_obj.browse(cr, uid, data['model'])
data_model = account_model_obj.browse(cr, uid, data['model'], context=context)
else:
data_model = account_model_obj.browse(cr, uid, context['active_ids'])
data_model = account_model_obj.browse(cr, uid, context['active_ids'], context=context)
for model in data_model:
entry['name'] = model.name%{'year':time.strftime('%Y'), 'month':time.strftime('%m'), 'date':time.strftime('%d')}
period_id = account_period_obj.find(cr, uid, context=context)
addons/account/wizard/account_validate_account_move.py
+2 -2
View File
@@ -33,11 +33,11 @@ class validate_account_move(osv.osv_memory):
obj_move = self.pool.get('account.move')
if context is None:
context = {}
data = self.read(cr, uid, ids)[0]
data = self.read(cr, uid, ids, context=context)[0]
ids_move = obj_move.search(cr, uid, [('state','=','draft'),('journal_id','=',data['journal_id']),('period_id','=',data['period_id'])])
if not ids_move:
raise osv.except_osv(_('Warning'), _('Specified Journal does not have any account move entries in draft state for this period'))
obj_move.button_validate(cr, uid, ids_move, context)
obj_move.button_validate(cr, uid, ids_move, context=context)
return {}
validate_account_move()
addons/account_accountant/i18n/account_accountant.pot
+2 -2
View File
@@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2010-12-10 17:14:45+0000\n"
"PO-Revision-Date: 2010-12-10 17:14:45+0000\n"
"POT-Creation-Date: 2010-12-15 15:04:35+0000\n"
"PO-Revision-Date: 2010-12-15 15:04:35+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
addons/account_analytic_analysis/account_analytic_analysis.py
+8 -8
View File
@@ -269,7 +269,7 @@ class account_analytic_account(osv.osv):
GROUP BY account_analytic_line.account_id", (child_ids,))
for account_id, sum in cr.fetchall():
res[account_id][name] = round(sum,2)
data = self._compute_level_tree(cr, uid, ids, child_ids, res, [name], context)
data = self._compute_level_tree(cr, uid, ids, child_ids, res, [name], context=context)
for i in data:
res_final[i] = data[i][name]
return res_final
@@ -324,7 +324,7 @@ class account_analytic_account(osv.osv):
def _revenue_per_hour_calc(self, cr, uid, ids, name, arg, context=None):
res = {}
for account in self.browse(cr, uid, ids):
for account in self.browse(cr, uid, ids, context=context):
if account.hours_qtt_invoiced == 0:
res[account.id]=0.0
else:
@@ -335,7 +335,7 @@ class account_analytic_account(osv.osv):
def _real_margin_rate_calc(self, cr, uid, ids, name, arg, context=None):
res = {}
for account in self.browse(cr, uid, ids):
for account in self.browse(cr, uid, ids, context=context):
if account.ca_invoiced == 0:
res[account.id]=0.0
elif account.total_cost != 0.0:
@@ -348,7 +348,7 @@ class account_analytic_account(osv.osv):
def _remaining_ca_calc(self, cr, uid, ids, name, arg, context=None):
res = {}
for account in self.browse(cr, uid, ids):
for account in self.browse(cr, uid, ids, context=context):
if account.amount_max != 0:
res[account.id] = account.amount_max - account.ca_invoiced
else:
@@ -359,7 +359,7 @@ class account_analytic_account(osv.osv):
def _real_margin_calc(self, cr, uid, ids, name, arg, context=None):
res = {}
for account in self.browse(cr, uid, ids):
for account in self.browse(cr, uid, ids, context=context):
res[account.id] = account.ca_invoiced + account.total_cost
for id in ids:
res[id] = round(res.get(id, 0.0),2)
@@ -367,7 +367,7 @@ class account_analytic_account(osv.osv):
def _theorical_margin_calc(self, cr, uid, ids, name, arg, context=None):
res = {}
for account in self.browse(cr, uid, ids):
for account in self.browse(cr, uid, ids, context=context):
res[account.id] = account.ca_theorical + account.total_cost
for id in ids:
res[id] = round(res.get(id, 0.0),2)
@@ -497,7 +497,7 @@ class account_analytic_account_summary_user(osv.osv):
')')
def _read_flat(self, cr, user, ids, fields, context=None, load='_classic_read'):
if not context:
if context is None:
context = {}
if not ids:
return []
@@ -671,7 +671,7 @@ class account_analytic_account_summary_month(osv.osv):
')')
def _read_flat(self, cr, user, ids, fields, context=None, load='_classic_read'):
if not context:
if context is None:
context = {}
if not ids:
return []
addons/account_analytic_analysis/i18n/account_analytic_analysis.pot
+2 -2
View File
@@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2010-12-03 15:42:50+0000\n"
"PO-Revision-Date: 2010-12-03 15:42:50+0000\n"
"POT-Creation-Date: 2010-12-15 15:04:36+0000\n"
"PO-Revision-Date: 2010-12-15 15:04:36+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
addons/account_analytic_default/i18n/account_analytic_default.pot
+2 -2
View File
@@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2010-12-03 15:42:50+0000\n"
"PO-Revision-Date: 2010-12-03 15:42:50+0000\n"
"POT-Creation-Date: 2010-12-15 15:04:36+0000\n"
"PO-Revision-Date: 2010-12-15 15:04:36+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
addons/account_analytic_plans/account_analytic_plans.py
+13 -5
View File
@@ -28,7 +28,7 @@ from tools.translate import _
class one2many_mod2(fields.one2many):
def get(self, cr, obj, ids, name, user=None, offset=0, context=None, values=None):
if not context:
if context is None:
context = {}
res = {}
for id in ids:
@@ -115,7 +115,7 @@ class account_analytic_plan_instance(osv.osv):
return super(account_analytic_plan_instance, self).copy(cr, uid, id, default, context=context)
def _default_journal(self, cr, uid, context=None):
if not context:
if context is None:
context = {}
journal_obj = self.pool.get('account.journal')
if context.has_key('journal_id') and context['journal_id']:
@@ -148,6 +148,8 @@ class account_analytic_plan_instance(osv.osv):
return self.name_get(cr, uid, ids, context or {})
def fields_view_get(self, cr, uid, view_id=None, view_type='form', context=None, toolbar=False, submenu=False):
if context is None:
context = {}
wiz_id = self.pool.get('ir.actions.act_window').search(cr, uid, [("name","=","analytic.plan.create.model.action")], context=context)
res = super(account_analytic_plan_instance,self).fields_view_get(cr, uid, view_id, view_type, context, toolbar=toolbar, submenu=submenu)
journal_obj = self.pool.get('account.journal')
@@ -214,6 +216,8 @@ class account_analytic_plan_instance(osv.osv):
return super(account_analytic_plan_instance, self).create(cr, uid, vals, context=context)
def write(self, cr, uid, ids, vals, context=None, check=True, update_check=True):
if context is None:
context = {}
this = self.browse(cr, uid, ids[0], context=context)
invoice_line_obj = self.pool.get('account.invoice.line')
if this.plan_id and not vals.has_key('plan_id'):
@@ -307,6 +311,8 @@ class account_move_line(osv.osv):
return data
def create_analytic_lines(self, cr, uid, ids, context=None):
if context is None:
context = {}
super(account_move_line, self).create_analytic_lines(cr, uid, ids, context=context)
analytic_line_obj = self.pool.get('account.analytic.line')
for line in self.browse(cr, uid, ids, context=context):
@@ -336,7 +342,9 @@ class account_move_line(osv.osv):
analytic_line_obj.create(cr, uid, al_vals, context=context)
return True
def fields_view_get(self, cr, uid, view_id=None, view_type='form', context={}, toolbar=False, submenu=False):
def fields_view_get(self, cr, uid, view_id=None, view_type='form', context=None, toolbar=False, submenu=False):
if context is None:
context = {}
result = super(osv.osv, self).fields_view_get(cr, uid, view_id, view_type, context, toolbar=toolbar, submenu=submenu)
return result
@@ -437,7 +445,7 @@ class account_bank_statement(osv.osv):
def create_move_from_st_line(self, cr, uid, st_line_id, company_currency_id, st_line_number, context=None):
account_move_line_pool = self.pool.get('account.move.line')
account_bank_statement_line_pool = self.pool.get('account.bank.statement.line')
st_line = account_bank_statement_line_pool.browse(cr, uid, st_line_id, context)
st_line = account_bank_statement_line_pool.browse(cr, uid, st_line_id, context=context)
result = super(account_bank_statement,self).create_move_from_st_line(cr, uid, st_line_id, company_currency_id, st_line_number, context=context)
move = st_line.move_ids and st_line.move_ids[0] or False
if move:
@@ -447,7 +455,7 @@ class account_bank_statement(osv.osv):
def button_confirm_bank(self, cr, uid, ids, context=None):
super(account_bank_statement,self).button_confirm_bank(cr, uid, ids, context=context)
for st in self.browse(cr, uid, ids, context):
for st in self.browse(cr, uid, ids, context=context):
for st_line in st.line_ids:
if st_line.analytics_id:
if not st.journal_id.analytic_journal_id:
addons/account_analytic_plans/i18n/account_analytic_plans.pot
+292 -302
View File
@@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2010-12-10 17:14:47+0000\n"
"PO-Revision-Date: 2010-12-10 17:14:47+0000\n"
"POT-Creation-Date: 2010-12-15 15:04:37+0000\n"
"PO-Revision-Date: 2010-12-15 15:04:37+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -16,18 +16,8 @@ msgstr ""
"Plural-Forms: \n"
#. module: account_analytic_plans
#: view:analytic.plan.create.model:0
msgid "This distribution model has been saved.You will be able to reuse it later."
msgstr ""
#. module: account_analytic_plans
#: field:account.analytic.plan.instance.line,plan_id:0
msgid "Plan Id"
msgstr ""
#. module: account_analytic_plans
#: report:account.analytic.account.crossovered.analytic:0
msgid "From Date"
#: field:account.analytic.plan.instance,account4_ids:0
msgid "Account4 Id"
msgstr ""
#. module: account_analytic_plans
@@ -38,6 +28,26 @@ msgstr ""
msgid "Crossovered Analytic"
msgstr ""
#. module: account_analytic_plans
#: field:account.analytic.plan.instance,account5_ids:0
msgid "Account5 Id"
msgstr ""
#. module: account_analytic_plans
#: field:account.crossovered.analytic,date2:0
msgid "End Date"
msgstr ""
#. module: account_analytic_plans
#: field:account.analytic.plan.instance,account3_ids:0
msgid "Account3 Id"
msgstr ""
#. module: account_analytic_plans
#: field:account.analytic.plan.instance.line,rate:0
msgid "Rate (%)"
msgstr ""
#. module: account_analytic_plans
#: view:account.analytic.plan:0
#: field:account.analytic.plan,name:0
@@ -49,8 +59,95 @@ msgid "Analytic Plan"
msgstr ""
#. module: account_analytic_plans
#: model:ir.module.module,shortdesc:account_analytic_plans.module_meta_information
msgid "Multiple-plans management in Analytic Accounting"
#: view:analytic.plan.create.model:0
msgid "This distribution model has been saved.You will be able to reuse it later."
msgstr ""
#. module: account_analytic_plans
#: code:addons/account_analytic_plans/wizard/analytic_plan_create_model.py:0
#, python-format
msgid "Please put a name and a code before saving the model !"
msgstr ""
#. module: account_analytic_plans
#: model:ir.model,name:account_analytic_plans.model_account_analytic_plan_instance_line
msgid "Analytic Instance Line"
msgstr ""
#. module: account_analytic_plans
#: view:account.analytic.plan.instance.line:0
msgid "Analytic Distribution Lines"
msgstr ""
#. module: account_analytic_plans
#: view:account.crossovered.analytic:0
msgid "Print"
msgstr ""
#. module: account_analytic_plans
#: report:account.analytic.account.crossovered.analytic:0
msgid "To Date"
msgstr ""
#. module: account_analytic_plans
#: field:account.analytic.plan.instance.line,plan_id:0
msgid "Plan Id"
msgstr ""
#. module: account_analytic_plans
#: sql_constraint:account.journal:0
msgid "The name of the journal must be unique per company !"
msgstr ""
#. module: account_analytic_plans
#: model:ir.actions.act_window,name:account_analytic_plans.account_analytic_plan_instance_action
msgid "Analytic Distribution's Models"
msgstr ""
#. module: account_analytic_plans
#: report:account.analytic.account.crossovered.analytic:0
msgid "Account Name"
msgstr ""
#. module: account_analytic_plans
#: view:account.analytic.plan.instance.line:0
msgid "Analytic Distribution Line"
msgstr ""
#. module: account_analytic_plans
#: field:account.analytic.plan.instance,code:0
msgid "Distribution Code"
msgstr ""
#. module: account_analytic_plans
#: report:account.analytic.account.crossovered.analytic:0
msgid "Percentage"
msgstr ""
#. module: account_analytic_plans
#: report:account.analytic.account.crossovered.analytic:0
msgid "Printing date"
msgstr ""
#. module: account_analytic_plans
#: model:ir.model,name:account_analytic_plans.model_sale_order_line
msgid "Sale Order Line"
msgstr ""
#. module: account_analytic_plans
#: field:account.crossovered.analytic,empty_line:0
msgid "Dont show empty lines"
msgstr ""
#. module: account_analytic_plans
#: model:ir.actions.act_window,name:account_analytic_plans.action_analytic_plan_create_model
msgid "analytic.plan.create.model.action"
msgstr ""
#. module: account_analytic_plans
#: code:addons/account_analytic_plans/account_analytic_plans.py:0
#, python-format
msgid "A model having this name and code already exists !"
msgstr ""
#. module: account_analytic_plans
@@ -60,128 +157,27 @@ msgstr ""
msgid "Analytic Journal"
msgstr ""
#. module: account_analytic_plans
#: report:account.analytic.account.crossovered.analytic:0
msgid "100.00%"
msgstr ""
#. module: account_analytic_plans
#: report:account.analytic.account.crossovered.analytic:0
msgid "Currency"
msgstr ""
#. module: account_analytic_plans
#: report:account.analytic.account.crossovered.analytic:0
msgid "Analytic Account :"
msgstr ""
#. module: account_analytic_plans
#: view:account.analytic.plan.line:0
#: model:ir.model,name:account_analytic_plans.model_account_analytic_plan_line
msgid "Analytic Plan Line"
msgstr ""
#. module: account_analytic_plans
#: model:ir.model,name:account_analytic_plans.model_account_analytic_plan_instance
msgid "Analytic Plan Instance"
msgstr ""
#. module: account_analytic_plans
#: view:analytic.plan.create.model:0
msgid "Ok"
msgstr ""
#. module: account_analytic_plans
#: constraint:account.move.line:0
msgid "You can not create move line on closed account."
msgstr ""
#. module: account_analytic_plans
#: field:account.analytic.plan.instance,plan_id:0
msgid "Model's Plan"
msgstr ""
#. module: account_analytic_plans
#: field:account.analytic.plan.instance,account2_ids:0
msgid "Account2 Id"
msgstr ""
#. module: account_analytic_plans
#: field:account.analytic.plan.instance,account_ids:0
msgid "Account Id"
msgstr ""
#. module: account_analytic_plans
#: report:account.analytic.account.crossovered.analytic:0
msgid "Amount"
msgstr ""
#. module: account_analytic_plans
#: report:account.analytic.account.crossovered.analytic:0
msgid "Code"
msgstr ""
#. module: account_analytic_plans
#: sql_constraint:account.move.line:0
msgid "Wrong credit or debit value in accounting entry !"
msgstr ""
#. module: account_analytic_plans
#: field:account.analytic.plan.instance,account6_ids:0
msgid "Account6 Id"
msgstr ""
#. module: account_analytic_plans
#: model:ir.ui.menu,name:account_analytic_plans.menu_account_analytic_multi_plan_action
msgid "Multi Plans"
msgstr ""
#. module: account_analytic_plans
#: model:ir.model,name:account_analytic_plans.model_account_bank_statement_line
msgid "Bank Statement Line"
msgstr ""
#. module: account_analytic_plans
#: constraint:account.invoice:0
msgid "Error: BVR reference is required."
msgstr ""
#. module: account_analytic_plans
#: field:account.analytic.plan.instance.line,analytic_account_id:0
msgid "Analytic Account"
msgstr ""
#. module: account_analytic_plans
#: sql_constraint:account.journal:0
msgid "The code of the journal must be unique per company !"
msgstr ""
#. module: account_analytic_plans
#: field:account.crossovered.analytic,ref:0
msgid "Analytic Account Reference"
msgstr ""
#. module: account_analytic_plans
#: constraint:account.move.line:0
msgid "You can not create move line on receivable/payable account without partner"
msgstr ""
#. module: account_analytic_plans
#: report:account.analytic.account.crossovered.analytic:0
msgid "Printing date"
msgstr ""
#. module: account_analytic_plans
#: model:ir.actions.act_window,name:account_analytic_plans.account_analytic_plan_instance_action
msgid "Analytic Distribution's Models"
msgstr ""
#. module: account_analytic_plans
#: view:account.crossovered.analytic:0
msgid "Print"
msgstr ""
#. module: account_analytic_plans
#: report:account.analytic.account.crossovered.analytic:0
msgid "Percentage"
msgstr ""
#. module: account_analytic_plans
#: model:ir.model,name:account_analytic_plans.model_sale_order_line
msgid "Sale Order Line"
msgstr ""
#. module: account_analytic_plans
#: code:addons/account_analytic_plans/account_analytic_plans.py:0
#, python-format
msgid "A model having this name and code already exists !"
msgstr ""
#. module: account_analytic_plans
#: code:addons/account_analytic_plans/wizard/analytic_plan_create_model.py:0
#, python-format
@@ -189,8 +185,30 @@ msgid "No analytic plan defined !"
msgstr ""
#. module: account_analytic_plans
#: field:account.analytic.plan.instance.line,rate:0
msgid "Rate (%)"
#: report:account.analytic.account.crossovered.analytic:0
msgid "Analytic Account Reference:"
msgstr ""
#. module: account_analytic_plans
#: field:account.analytic.plan.line,name:0
msgid "Plan Name"
msgstr ""
#. module: account_analytic_plans
#: field:account.analytic.plan,default_instance_id:0
msgid "Default Entries"
msgstr ""
#. module: account_analytic_plans
#: constraint:account.move.line:0
msgid "You can not create move line on closed account."
msgstr ""
#. module: account_analytic_plans
#: code:addons/account_analytic_plans/account_analytic_plans.py:0
#: code:addons/account_analytic_plans/wizard/analytic_plan_create_model.py:0
#, python-format
msgid "Error"
msgstr ""
#. module: account_analytic_plans
@@ -206,11 +224,36 @@ msgstr ""
msgid "User Error"
msgstr ""
#. module: account_analytic_plans
#: model:ir.model,name:account_analytic_plans.model_account_move_line
msgid "Journal Items"
msgstr ""
#. module: account_analytic_plans
#: model:ir.model,name:account_analytic_plans.model_analytic_plan_create_model
msgid "analytic.plan.create.model"
msgstr ""
#. module: account_analytic_plans
#: field:account.analytic.plan.instance,account1_ids:0
msgid "Account1 Id"
msgstr ""
#. module: account_analytic_plans
#: field:account.analytic.plan.line,max_required:0
msgid "Maximum Allowed (%)"
msgstr ""
#. module: account_analytic_plans
#: constraint:account.move.line:0
msgid "Company must be same for its related account and period."
msgstr ""
#. module: account_analytic_plans
#: field:account.analytic.plan.line,root_analytic_id:0
msgid "Root Account"
msgstr ""
#. module: account_analytic_plans
#: code:addons/account_analytic_plans/wizard/analytic_plan_create_model.py:0
#: view:analytic.plan.create.model:0
@@ -218,75 +261,80 @@ msgstr ""
msgid "Distribution Model Saved"
msgstr ""
#. module: account_analytic_plans
#: model:ir.model,name:account_analytic_plans.model_account_analytic_plan_instance
msgid "Analytic Plan Instance"
msgstr ""
#. module: account_analytic_plans
#: model:ir.actions.act_window,name:account_analytic_plans.account_analytic_instance_model_open
msgid "Distribution Models"
msgstr ""
#. module: account_analytic_plans
#: view:analytic.plan.create.model:0
msgid "Ok"
msgstr ""
#. module: account_analytic_plans
#: constraint:account.move.line:0
msgid "You can not create move line on receivable/payable account without partner"
msgstr ""
#. module: account_analytic_plans
#: model:ir.module.module,shortdesc:account_analytic_plans.module_meta_information
msgid "Multiple-plans management in Analytic Accounting"
msgstr ""
#. module: account_analytic_plans
#: view:account.analytic.plan.line:0
msgid "Analytic Plan Lines"
msgstr ""
#. module: account_analytic_plans
#: model:ir.model,name:account_analytic_plans.model_account_invoice_line
msgid "Invoice Line"
#: field:account.analytic.plan.line,min_required:0
msgid "Minimum Allowed (%)"
msgstr ""
#. module: account_analytic_plans
#: report:account.analytic.account.crossovered.analytic:0
msgid "Currency"
#: field:account.analytic.plan.instance,plan_id:0
msgid "Model's Plan"
msgstr ""
#. module: account_analytic_plans
#: field:account.crossovered.analytic,date1:0
msgid "Start Date"
msgstr ""
#. module: account_analytic_plans
#: report:account.analytic.account.crossovered.analytic:0
msgid "Company"
msgstr ""
#. module: account_analytic_plans
#: field:account.analytic.plan.instance,account5_ids:0
msgid "Account5 Id"
msgstr ""
#. module: account_analytic_plans
#: model:ir.model,name:account_analytic_plans.model_account_analytic_plan_instance_line
msgid "Analytic Instance Line"
msgstr ""
#. module: account_analytic_plans
#: field:account.analytic.plan.line,root_analytic_id:0
msgid "Root Account"
msgstr ""
#. module: account_analytic_plans
#: report:account.analytic.account.crossovered.analytic:0
msgid "To Date"
#: field:account.analytic.plan.instance,account2_ids:0
msgid "Account2 Id"
msgstr ""
#. module: account_analytic_plans
#: code:addons/account_analytic_plans/account_analytic_plans.py:0
#, python-format
msgid "You have to define an analytic journal on the '%s' journal!"
msgid "The Total Should be Between %s and %s"
msgstr ""
#. module: account_analytic_plans
#: constraint:account.invoice:0
msgid "Error: Invalid Bvr Number (wrong checksum)."
msgstr ""
#. module: account_analytic_plans
#: field:account.crossovered.analytic,empty_line:0
msgid "Dont show empty lines"
msgstr ""
#. module: account_analytic_plans
#: model:ir.actions.act_window,name:account_analytic_plans.action_analytic_plan_create_model
msgid "analytic.plan.create.model.action"
#: model:ir.model,name:account_analytic_plans.model_account_bank_statement_line
msgid "Bank Statement Line"
msgstr ""
#. module: account_analytic_plans
#: report:account.analytic.account.crossovered.analytic:0
msgid "Analytic Account :"
msgid "Amount"
msgstr ""
#. module: account_analytic_plans
#: model:ir.model,name:account_analytic_plans.model_account_crossovered_analytic
msgid "Print Crossovered Analytic"
msgstr ""
#. module: account_analytic_plans
#: sql_constraint:account.move.line:0
msgid "Wrong credit or debit value in accounting entry !"
msgstr ""
#. module: account_analytic_plans
#: field:account.analytic.plan.instance,account6_ids:0
msgid "Account6 Id"
msgstr ""
#. module: account_analytic_plans
@@ -323,53 +371,6 @@ msgid "This module allows to use several analytic plans, according to the genera
" "
msgstr ""
#. module: account_analytic_plans
#: report:account.analytic.account.crossovered.analytic:0
msgid "Analytic Account Reference:"
msgstr ""
#. module: account_analytic_plans
#: field:account.analytic.plan.line,name:0
msgid "Plan Name"
msgstr ""
#. module: account_analytic_plans
#: field:account.analytic.plan,default_instance_id:0
msgid "Default Entries"
msgstr ""
#. module: account_analytic_plans
#: model:ir.model,name:account_analytic_plans.model_account_move_line
msgid "Journal Items"
msgstr ""
#. module: account_analytic_plans
#: field:account.analytic.plan.instance,account1_ids:0
msgid "Account1 Id"
msgstr ""
#. module: account_analytic_plans
#: constraint:account.move.line:0
msgid "Company must be same for its related account and period."
msgstr ""
#. module: account_analytic_plans
#: field:account.analytic.plan.line,min_required:0
msgid "Minimum Allowed (%)"
msgstr ""
#. module: account_analytic_plans
#: help:account.analytic.plan.line,root_analytic_id:0
msgid "Root account of this plan."
msgstr ""
#. module: account_analytic_plans
#: code:addons/account_analytic_plans/account_analytic_plans.py:0
#: code:addons/account_analytic_plans/wizard/analytic_plan_create_model.py:0
#, python-format
msgid "Error"
msgstr ""
#. module: account_analytic_plans
#: view:analytic.plan.create.model:0
msgid "Save This Distribution as a Model"
@@ -381,14 +382,29 @@ msgid "Quantity"
msgstr ""
#. module: account_analytic_plans
#: code:addons/account_analytic_plans/wizard/analytic_plan_create_model.py:0
#, python-format
msgid "Please put a name and a code before saving the model !"
#: model:ir.ui.menu,name:account_analytic_plans.menu_account_analytic_multi_plan_action
msgid "Multi Plans"
msgstr ""
#. module: account_analytic_plans
#: model:ir.model,name:account_analytic_plans.model_account_crossovered_analytic
msgid "Print Crossovered Analytic"
#: field:account.analytic.plan.instance,account_ids:0
msgid "Account Id"
msgstr ""
#. module: account_analytic_plans
#: report:account.analytic.account.crossovered.analytic:0
msgid "Code"
msgstr ""
#. module: account_analytic_plans
#: model:ir.model,name:account_analytic_plans.model_account_journal
msgid "Journal"
msgstr ""
#. module: account_analytic_plans
#: code:addons/account_analytic_plans/account_analytic_plans.py:0
#, python-format
msgid "You have to define an analytic journal on the '%s' journal!"
msgstr ""
#. module: account_analytic_plans
@@ -397,66 +413,24 @@ msgstr ""
msgid "No Analytic Journal !"
msgstr ""
#. module: account_analytic_plans
#: field:account.analytic.plan.line,sequence:0
msgid "Sequence"
msgstr ""
#. module: account_analytic_plans
#: model:ir.model,name:account_analytic_plans.model_account_invoice_line
msgid "Invoice Line"
msgstr ""
#. module: account_analytic_plans
#: model:ir.model,name:account_analytic_plans.model_account_bank_statement
msgid "Bank Statement"
msgstr ""
#. module: account_analytic_plans
#: field:account.analytic.plan.instance,account3_ids:0
msgid "Account3 Id"
msgstr ""
#. module: account_analytic_plans
#: model:ir.model,name:account_analytic_plans.model_account_invoice
msgid "Invoice"
msgstr ""
#. module: account_analytic_plans
#: view:account.crossovered.analytic:0
#: view:analytic.plan.create.model:0
msgid "Cancel"
msgstr ""
#. module: account_analytic_plans
#: field:account.analytic.plan.instance,account4_ids:0
msgid "Account4 Id"
msgstr ""
#. module: account_analytic_plans
#: view:account.analytic.plan.instance.line:0
msgid "Analytic Distribution Lines"
msgstr ""
#. module: account_analytic_plans
#: code:addons/account_analytic_plans/account_analytic_plans.py:0
#, python-format
msgid "The Total Should be Between %s and %s"
msgstr ""
#. module: account_analytic_plans
#: report:account.analytic.account.crossovered.analytic:0
msgid "at"
msgstr ""
#. module: account_analytic_plans
#: report:account.analytic.account.crossovered.analytic:0
msgid "Account Name"
msgstr ""
#. module: account_analytic_plans
#: view:account.analytic.plan.instance.line:0
msgid "Analytic Distribution Line"
msgstr ""
#. module: account_analytic_plans
#: field:account.analytic.plan.instance,code:0
msgid "Distribution Code"
msgstr ""
#. module: account_analytic_plans
#: report:account.analytic.account.crossovered.analytic:0
msgid "100.00%"
#: field:account.analytic.plan.instance.line,analytic_account_id:0
msgid "Analytic Account"
msgstr ""
#. module: account_analytic_plans
@@ -471,39 +445,40 @@ msgid "Analytic Distribution"
msgstr ""
#. module: account_analytic_plans
#: model:ir.model,name:account_analytic_plans.model_account_journal
msgid "Journal"
#: code:addons/account_analytic_plans/account_analytic_plans.py:0
#, python-format
msgid "Value Error"
msgstr ""
#. module: account_analytic_plans
#: model:ir.model,name:account_analytic_plans.model_analytic_plan_create_model
msgid "analytic.plan.create.model"
#: help:account.analytic.plan.line,root_analytic_id:0
msgid "Root account of this plan."
msgstr ""
#. module: account_analytic_plans
#: field:account.crossovered.analytic,date2:0
msgid "End Date"
#: field:account.crossovered.analytic,ref:0
msgid "Analytic Account Reference"
msgstr ""
#. module: account_analytic_plans
#: model:ir.actions.act_window,name:account_analytic_plans.account_analytic_instance_model_open
msgid "Distribution Models"
msgstr ""
#. module: account_analytic_plans
#: field:account.analytic.plan.line,sequence:0
msgid "Sequence"
#: model:ir.model,name:account_analytic_plans.model_account_invoice
msgid "Invoice"
msgstr ""
#. module: account_analytic_plans
#: sql_constraint:account.journal:0
msgid "The name of the journal must be unique per company !"
msgid "The code of the journal must be unique per company !"
msgstr ""
#. module: account_analytic_plans
#: code:addons/account_analytic_plans/account_analytic_plans.py:0
#, python-format
msgid "Value Error"
#: view:account.crossovered.analytic:0
#: view:analytic.plan.create.model:0
msgid "Cancel"
msgstr ""
#. module: account_analytic_plans
#: field:account.crossovered.analytic,date1:0
msgid "Start Date"
msgstr ""
#. module: account_analytic_plans
@@ -511,3 +486,18 @@ msgstr ""
msgid "You can not create move line on view account."
msgstr ""
#. module: account_analytic_plans
#: report:account.analytic.account.crossovered.analytic:0
msgid "at"
msgstr ""
#. module: account_analytic_plans
#: report:account.analytic.account.crossovered.analytic:0
msgid "Company"
msgstr ""
#. module: account_analytic_plans
#: report:account.analytic.account.crossovered.analytic:0
msgid "From Date"
msgstr ""
addons/account_analytic_plans/i18n/es.po
+5 -6
View File
@@ -7,14 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2010-12-10 17:14+0000\n"
"PO-Revision-Date: 2010-12-09 11:08+0000\n"
"Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
"<jesteve@zikzakmedia.com>\n"
"PO-Revision-Date: 2010-12-15 22:15+0000\n"
"Last-Translator: Carlos @ smile.fr <Unknown>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-12-15 05:03+0000\n"
"X-Launchpad-Export-Date: 2010-12-16 04:47+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_analytic_plans
@@ -133,7 +132,7 @@ msgstr "Línea extracto bancario"
#. module: account_analytic_plans
#: constraint:account.invoice:0
msgid "Error: BVR reference is required."
msgstr ""
msgstr "Error: La referencia BVR es necesaria."
#. module: account_analytic_plans
#: field:account.analytic.plan.instance.line,analytic_account_id:0
@@ -279,7 +278,7 @@ msgstr "¡Debe definir un diario analítico en el diario '%s'!"
#. module: account_analytic_plans
#: constraint:account.invoice:0
msgid "Error: Invalid Bvr Number (wrong checksum)."
msgstr ""
msgstr "Error: Número BVR no válido (checksum erróneo)."
#. module: account_analytic_plans
#: field:account.crossovered.analytic,empty_line:0
addons/account_analytic_plans/i18n/fr.po
+12 -8
View File
@@ -7,13 +7,14 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2010-12-10 17:14+0000\n"
"PO-Revision-Date: 2010-12-09 11:29+0000\n"
"Last-Translator: Quentin THEURET <quentin@theuret.net>\n"
"PO-Revision-Date: 2010-12-15 20:24+0000\n"
"Last-Translator: Maxime Chambreuil (http://www.savoirfairelinux.com) "
"<maxime.chambreuil@savoirfairelinux.com>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-12-15 05:03+0000\n"
"X-Launchpad-Export-Date: 2010-12-16 04:47+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_analytic_plans
@@ -113,7 +114,7 @@ msgstr "Code"
#. module: account_analytic_plans
#: sql_constraint:account.move.line:0
msgid "Wrong credit or debit value in accounting entry !"
msgstr ""
msgstr "Valeur erronée au crédit ou au débit de l'écriture comptable !"
#. module: account_analytic_plans
#: field:account.analytic.plan.instance,account6_ids:0
@@ -133,7 +134,7 @@ msgstr "Ligne de relevé de banque"
#. module: account_analytic_plans
#: constraint:account.invoice:0
msgid "Error: BVR reference is required."
msgstr ""
msgstr "Erreur: la référence BVR est requise."
#. module: account_analytic_plans
#: field:account.analytic.plan.instance.line,analytic_account_id:0
@@ -143,7 +144,7 @@ msgstr "Compte analytique"
#. module: account_analytic_plans
#: sql_constraint:account.journal:0
msgid "The code of the journal must be unique per company !"
msgstr ""
msgstr "Le code du journal doit être unique dans chaque société !"
#. module: account_analytic_plans
#: field:account.crossovered.analytic,ref:0
@@ -155,6 +156,8 @@ msgstr "Référence du compte analytique"
msgid ""
"You can not create move line on receivable/payable account without partner"
msgstr ""
"Vous ne pouvez pas créer de lignes d'écriture sur un compte client "
"débiteur/fournisseur créditeur sans partenaire"
#. module: account_analytic_plans
#: report:account.analytic.account.crossovered.analytic:0
@@ -277,7 +280,7 @@ msgstr "Vous devez définir un journal analytique sur le journal '%s' !"
#. module: account_analytic_plans
#: constraint:account.invoice:0
msgid "Error: Invalid Bvr Number (wrong checksum)."
msgstr ""
msgstr "Erreur : Nombre BVR non valide (somme de contrôle fausse)."
#. module: account_analytic_plans
#: field:account.crossovered.analytic,empty_line:0
@@ -395,7 +398,7 @@ msgstr "Identifiant du Compte1"
#. module: account_analytic_plans
#: constraint:account.move.line:0
msgid "Company must be same for its related account and period."
msgstr ""
msgstr "La société doit être la même pour les comptes et périodes liées."
#. module: account_analytic_plans
#: field:account.analytic.plan.line,min_required:0
@@ -554,6 +557,7 @@ msgstr "Erreur de valeur"
#: constraint:account.move.line:0
msgid "You can not create move line on view account."
msgstr ""
"Vous ne pouvez pas créer de ligne d'écriture sur un compte de type \"Vue\"."
#~ msgid ""
#~ "The Object name must start with x_ and not contain any special character !"
addons/account_analytic_plans/i18n/pt.po
+1 -1
View File
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-12-15 05:03+0000\n"
"X-Launchpad-Export-Date: 2010-12-16 04:47+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_analytic_plans
addons/account_analytic_plans/wizard/analytic_plan_create_model.py
+2
View File
@@ -30,6 +30,8 @@ class analytic_plan_create_model(osv.osv_memory):
plan_obj = self.pool.get('account.analytic.plan.instance')
mod_obj = self.pool.get('ir.model.data')
anlytic_plan_obj = self.pool.get('account.analytic.plan')
if context is None:
context = {}
if 'active_id' in context and context['active_id']:
plan = plan_obj.browse(cr, uid, context['active_id'], context=context)
if (not plan.name) or (not plan.code):
addons/account_anglo_saxon/i18n/account_anglo_saxon.pot
+2 -2
View File
@@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2010-12-03 15:42:51+0000\n"
"PO-Revision-Date: 2010-12-03 15:42:51+0000\n"
"POT-Creation-Date: 2010-12-15 15:04:37+0000\n"
"PO-Revision-Date: 2010-12-15 15:04:37+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
addons/account_anglo_saxon/i18n/fr.po
+6 -4
View File
@@ -8,14 +8,14 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2010-12-03 15:42+0000\n"
"PO-Revision-Date: 2010-12-04 08:35+0000\n"
"PO-Revision-Date: 2010-12-15 20:26+0000\n"
"Last-Translator: Maxime Chambreuil (http://www.savoirfairelinux.com) "
"<maxime.chambreuil@savoirfairelinux.com>\n"
"Language-Team: French <fr@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-12-14 05:34+0000\n"
"X-Launchpad-Export-Date: 2010-12-16 04:48+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_anglo_saxon
@@ -26,18 +26,20 @@ msgstr "Catégorie de produit"
#. module: account_anglo_saxon
#: constraint:product.template:0
msgid "Error: UOS must be in a different category than the UOM"
msgstr ""
msgstr "Erreur : l'UdV doit appartenir à une autre catégorie que l'UdM"
#. module: account_anglo_saxon
#: constraint:product.category:0
msgid "Error ! You can not create recursive categories."
msgstr ""
msgstr "Erreur ! Vous ne pouvez pas créer de catégorie récursive."
#. module: account_anglo_saxon
#: constraint:product.template:0
msgid ""
"Error: The default UOM and the purchase UOM must be in the same category."
msgstr ""
"Erreur: l'UdM par défaut et l'UdM d'achat doivent appartenir à la même "
"catégorie."
#. module: account_anglo_saxon
#: model:ir.model,name:account_anglo_saxon.model_account_invoice_line
addons/account_anglo_saxon/i18n/nl.po
+7 -4
View File
@@ -8,13 +8,13 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2010-12-03 15:42+0000\n"
"PO-Revision-Date: 2010-11-26 12:04+0000\n"
"Last-Translator: OpenERP Administrators <Unknown>\n"
"PO-Revision-Date: 2010-12-15 14:28+0000\n"
"Last-Translator: Jan Verlaan (Veritos) <Unknown>\n"
"Language-Team: Dutch <nl@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-12-14 05:34+0000\n"
"X-Launchpad-Export-Date: 2010-12-16 04:48+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_anglo_saxon
@@ -26,17 +26,20 @@ msgstr "Productcategorie"
#: constraint:product.template:0
msgid "Error: UOS must be in a different category than the UOM"
msgstr ""
"Fout: Verkoopeenheid moet in een andere categorie staan dan de maateenheid"
#. module: account_anglo_saxon
#: constraint:product.category:0
msgid "Error ! You can not create recursive categories."
msgstr ""
msgstr "Fout ! U kunt geen recursieve categorieën aanmaken."
#. module: account_anglo_saxon
#: constraint:product.template:0
msgid ""
"Error: The default UOM and the purchase UOM must be in the same category."
msgstr ""
"Fout: de standaard meeteenheid en de inkoop-meeteenheid moeten in de zelfde "
"categorie liggen."
#. module: account_anglo_saxon
#: model:ir.model,name:account_anglo_saxon.model_account_invoice_line
addons/account_anglo_saxon/i18n/pt.po
+1 -1
View File
@@ -14,7 +14,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-12-15 05:17+0000\n"
"X-Launchpad-Export-Date: 2010-12-16 04:48+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_anglo_saxon
addons/account_anglo_saxon/invoice.py
+3 -3
View File
@@ -27,8 +27,8 @@ class account_invoice_line(osv.osv):
_inherit = "account.invoice.line"
def move_line_get(self, cr, uid, invoice_id, context=None):
res = super(account_invoice_line,self).move_line_get(cr, uid, invoice_id, context)
inv = self.pool.get('account.invoice').browse(cr, uid, invoice_id)
res = super(account_invoice_line,self).move_line_get(cr, uid, invoice_id, context=context)
inv = self.pool.get('account.invoice').browse(cr, uid, invoice_id, context=context)
if inv.type in ('out_invoice','out_refund'):
for i_line in inv.invoice_line:
if i_line.product_id:
@@ -144,7 +144,7 @@ class account_invoice_line(osv.osv):
if not oa:
oa = product_obj.categ_id.property_stock_account_output_categ and product_obj.categ_id.property_stock_account_output_categ.id
if oa:
fpos = fposition_id and self.pool.get('account.fiscal.position').browse(cr, uid, fposition_id) or False
fpos = fposition_id and self.pool.get('account.fiscal.position').browse(cr, uid, fposition_id, context=context) or False
a = self.pool.get('account.fiscal.position').map_account(cr, uid, fpos, oa)
res['value'].update({'account_id':a})
return res
addons/account_anglo_saxon/stock.py
+1 -1
View File
@@ -31,7 +31,7 @@ class stock_picking(osv.osv):
def action_invoice_create(self, cr, uid, ids, journal_id=False,
group=False, type='out_invoice', context=None):
'''Return ids of created invoices for the pickings'''
res = super(stock_picking,self).action_invoice_create(cr, uid, ids, journal_id, group, type, context)
res = super(stock_picking,self).action_invoice_create(cr, uid, ids, journal_id, group, type, context=context)
if type == 'in_refund':
for inv in self.pool.get('account.invoice').browse(cr, uid, res.values(), context=context):
for ol in inv.invoice_line:
addons/account_budget/account_budget.py
+14 -10
View File
@@ -108,10 +108,12 @@ crossovered_budget()
class crossovered_budget_lines(osv.osv):
def _prac_amt(self, cr, uid, ids, context={}):
def _prac_amt(self, cr, uid, ids, context=None):
res = {}
result = 0.0
for line in self.browse(cr, uid, ids):
if context is None:
context = {}
for line in self.browse(cr, uid, ids, context=context):
acc_ids = [x.id for x in line.general_budget_id.account_ids]
if not acc_ids:
raise osv.except_osv(_('Error!'),_("The General Budget '%s' has no Accounts!") % str(line.general_budget_id.name))
@@ -131,15 +133,17 @@ class crossovered_budget_lines(osv.osv):
res[line.id] = result
return res
def _prac(self, cr, uid, ids, name, args, context):
def _prac(self, cr, uid, ids, name, args, context=None):
res={}
for line in self.browse(cr, uid, ids):
for line in self.browse(cr, uid, ids, context=context):
res[line.id] = self._prac_amt(cr, uid, [line.id], context=context)[line.id]
return res
def _theo_amt(self, cr, uid, ids, context={}):
def _theo_amt(self, cr, uid, ids, context=None):
res = {}
for line in self.browse(cr, uid, ids):
if context is None:
context = {}
for line in self.browse(cr, uid, ids, context=context):
today = datetime.datetime.today()
date_to = today.strftime("%Y-%m-%d")
date_from = line.date_from
@@ -167,15 +171,15 @@ class crossovered_budget_lines(osv.osv):
res[line.id] = theo_amt
return res
def _theo(self, cr, uid, ids, name, args, context):
def _theo(self, cr, uid, ids, name, args, context=None):
res = {}
for line in self.browse(cr, uid, ids):
for line in self.browse(cr, uid, ids, context=context):
res[line.id] = self._theo_amt(cr, uid, [line.id], context=context)[line.id]
return res
def _perc(self, cr, uid, ids, name, args, context):
def _perc(self, cr, uid, ids, name, args, context=None):
res = {}
for line in self.browse(cr, uid, ids):
for line in self.browse(cr, uid, ids, context=context):
if line.theoritical_amount <> 0.00:
res[line.id] = float(line.practical_amount or 0.0 / line.theoritical_amount) * 100
else:
addons/account_budget/i18n/account_budget.pot
+2 -2
View File
@@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2010-12-03 15:42:52+0000\n"
"PO-Revision-Date: 2010-12-03 15:42:52+0000\n"
"POT-Creation-Date: 2010-12-15 15:04:38+0000\n"
"PO-Revision-Date: 2010-12-15 15:04:38+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
addons/account_budget/i18n/es.po
+12 -4
View File
@@ -7,14 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2010-12-03 15:42+0000\n"
"PO-Revision-Date: 2010-12-09 07:28+0000\n"
"Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
"<jesteve@zikzakmedia.com>\n"
"PO-Revision-Date: 2010-12-15 22:19+0000\n"
"Last-Translator: Carlos @ smile.fr <Unknown>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-12-15 05:14+0000\n"
"X-Launchpad-Export-Date: 2010-12-16 04:47+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_budget
@@ -51,6 +50,15 @@ msgid ""
"revenue per analytic account and monitor its evolution based on the actuals "
"realised during that period."
msgstr ""
"Un presupuesto es una previsión de ingresos y gastos esperados de su empresa "
"durante un período futuro. Con un presupuesto, una empresa es capaz de mirar "
"cuidadosamente la cantidad de dinero que manejará durante un período "
"determinado, y decidir la mejor manera de dividirlo entre diferentes "
"categorías. Llevando el seguimiento de dónde va su dinero, usted puede ser "
"menos propenso a gastar en exceso, y tiene más probabilidades de alcanzar "
"sus metas financieras. Programe un presupuesto detallando los ingresos "
"previstos por cuenta analítica y controle su evolución sobre la base de los "
"datos reales ejecutados durante ese período."
#. module: account_budget
#: view:crossovered.budget:0
addons/account_budget/i18n/fr.po
+15 -6
View File
@@ -7,14 +7,14 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2010-12-03 15:42+0000\n"
"PO-Revision-Date: 2010-11-24 09:39+0000\n"
"PO-Revision-Date: 2010-12-15 20:29+0000\n"
"Last-Translator: Maxime Chambreuil (http://www.savoirfairelinux.com) "
"<maxime.chambreuil@savoirfairelinux.com>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-12-15 05:14+0000\n"
"X-Launchpad-Export-Date: 2010-12-16 04:47+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_budget
@@ -50,6 +50,15 @@ msgid ""
"revenue per analytic account and monitor its evolution based on the actuals "
"realised during that period."
msgstr ""
"Un budget est une prévision des revenus et des dépenses de l'entreprise sur "
"une période dans le futur. Avec un budget, une société est capable de voir "
"attentivement sur combien d'argent elle peut compter pendant une période "
"donnée, et trouver la meilleure façon de le partager sur plusieurs "
"catégories. En gardant une trace d'où l'argent va, vous serez probablement "
"en mesure de réduire les dépassements et également d'atteindre vos objectifs "
"financiers. Prévoyez un budget en détaillant les revenus espérés par comptes "
"analytiques et surveillez leur évolution en se basant sur les dépenses "
"réelles au cours de cette période."
#. module: account_budget
#: view:crossovered.budget:0
@@ -141,7 +150,7 @@ msgstr "Description"
#. module: account_budget
#: report:crossovered.budget.report:0
msgid "Currency"
msgstr ""
msgstr "Devise"
#. module: account_budget
#: report:crossovered.budget.report:0
@@ -188,7 +197,7 @@ msgstr "Terminé"
#: report:account.budget:0
#: report:crossovered.budget.report:0
msgid "Practical Amt"
msgstr ""
msgstr "Total réel"
#. module: account_budget
#: view:account.budget.post:0
@@ -318,7 +327,7 @@ msgstr "Début de la période"
#. module: account_budget
#: model:ir.model,name:account_budget.model_account_budget_crossvered_summary_report
msgid "Account Budget crossvered summary report"
msgstr ""
msgstr "Rapport résumé du budget croisé"
#. module: account_budget
#: report:account.budget:0
@@ -448,7 +457,7 @@ msgstr "Gestion Budgétaire"
#. module: account_budget
#: constraint:account.analytic.account:0
msgid "Error! You can not create recursive analytic accounts."
msgstr ""
msgstr "Erreur ! Vous ne pouvez pas créer de comptes analytiques récursifs."
#. module: account_budget
#: report:account.budget:0
addons/account_budget/i18n/pt.po
+3 -3
View File
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2010-12-03 15:42+0000\n"
"PO-Revision-Date: 2010-08-02 21:07+0000\n"
"Last-Translator: mga (Open ERP) <Unknown>\n"
"PO-Revision-Date: 2010-12-15 05:16+0000\n"
"Last-Translator: OpenERP Administrators <Unknown>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-12-15 05:14+0000\n"
"X-Launchpad-Export-Date: 2010-12-16 04:47+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_budget
addons/account_budget/wizard/account_budget_analytic.py
+1 -1
View File
@@ -39,7 +39,7 @@ class account_budget_analytic(osv.osv_memory):
datas = {}
if context is None:
context = {}
data = self.read(cr, uid, ids)[0]
data = self.read(cr, uid, ids, context=context)[0]
datas = {
'ids': context.get('active_ids',[]),
'model': 'account.analytic.account',
addons/account_budget/wizard/account_budget_crossovered_report.py
+1 -1
View File
@@ -39,7 +39,7 @@ class account_budget_crossvered_report(osv.osv_memory):
datas = {}
if context is None:
context = {}
data = self.read(cr, uid, ids)[0]
data = self.read(cr, uid, ids, context=context)[0]
datas = {
'ids': context.get('active_ids',[]),
'model': 'crossovered.budget',
addons/account_budget/wizard/account_budget_crossovered_summary_report.py
+1 -1
View File
@@ -41,7 +41,7 @@ class account_budget_crossvered_summary_report(osv.osv_memory):
datas = {}
if context is None:
context = {}
data = self.read(cr, uid, ids)[0]
data = self.read(cr, uid, ids, context=context)[0]
datas = {
'ids': context.get('active_ids',[]),
'model': 'crossovered.budge',
addons/account_budget/wizard/account_budget_report.py
+1 -1
View File
@@ -40,7 +40,7 @@ class account_budget_report(osv.osv_memory):
datas = {}
if context is None:
context = {}
data = self.read(cr, uid, ids)[0]
data = self.read(cr, uid, ids, context=context)[0]
datas = {
'ids': context.get('active_ids',[]),
'model': 'account.budget.post',
addons/account_cancel/i18n/account_cancel.pot
+2 -2
View File
@@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2010-12-03 15:42:52+0000\n"
"PO-Revision-Date: 2010-12-03 15:42:52+0000\n"
"POT-Creation-Date: 2010-12-15 15:04:38+0000\n"
"PO-Revision-Date: 2010-12-15 15:04:38+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
addons/account_chart/i18n/account_chart.pot
+2 -2
View File
@@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2010-12-03 15:42:53+0000\n"
"PO-Revision-Date: 2010-12-03 15:42:53+0000\n"
"POT-Creation-Date: 2010-12-15 15:04:38+0000\n"
"PO-Revision-Date: 2010-12-15 15:04:38+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
addons/account_coda/account_coda.py
+2
View File
@@ -43,6 +43,8 @@ class account_coda(osv.osv):
}
def search(self, cr, user, args, offset=0, limit=None, order=None, context=None, count=False):
if context is None:
context = {}
res = super(account_coda, self).search(cr, user, args=args, offset=offset, limit=limit, order=order,
context=context, count=count)
if context.get('bank_statement', False) and not res:
addons/account_coda/i18n/account_coda.pot
+2 -2
View File
@@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2010-12-03 15:42:53+0000\n"
"PO-Revision-Date: 2010-12-03 15:42:53+0000\n"
"POT-Creation-Date: 2010-12-15 15:04:39+0000\n"
"PO-Revision-Date: 2010-12-15 15:04:39+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
addons/account_coda/wizard/account_coda_import.py
+4 -4
View File
@@ -66,13 +66,13 @@ class account_coda_import(osv.osv_memory):
mod_obj = self.pool.get('ir.model.data')
line_obj = self.pool.get('account.move.line')
if not context:
if context is None:
context = {}
data = self.read(cr, uid, ids)[0]
codafile = data['coda']
journal_code = journal_obj.browse(cr, uid, data['journal_id'], context).code
journal_code = journal_obj.browse(cr, uid, data['journal_id'], context=context).code
period = account_period_obj.find(cr, uid, context=context)[0]
def_pay_acc = data['def_payable']
@@ -155,7 +155,7 @@ class account_coda_import(osv.osv_memory):
bank_ids = partner_bank_obj.search(cr, uid, [('acc_number', '=', st_line_partner_acc)])
bank_statement_lines[st_line_name].update({'cntry_number': cntry_number, 'contry_name': contry_name})
if bank_ids:
bank = partner_bank_obj.browse(cr, uid, bank_ids[0], context)
bank = partner_bank_obj.browse(cr, uid, bank_ids[0], context=context)
if line and bank.partner_id:
bank_statement_lines[st_line_name].update({'partner_id': bank.partner_id.id})
if bank_statement_lines[st_line_name]['amount'] < 0:
@@ -321,7 +321,7 @@ class account_coda_import(osv.osv_memory):
}
def action_open_window(self, cr, uid, data, context=None):
if not context:
if context is None:
context = {}
return {
addons/account_followup/i18n/account_followup.pot
+2 -2
View File
@@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2010-12-03 15:42:54+0000\n"
"PO-Revision-Date: 2010-12-03 15:42:54+0000\n"
"POT-Creation-Date: 2010-12-15 15:04:40+0000\n"
"PO-Revision-Date: 2010-12-15 15:04:40+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
addons/account_followup/i18n/el.po
+2 -2
View File
@@ -8,13 +8,13 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2010-12-03 15:42+0000\n"
"PO-Revision-Date: 2010-12-14 16:28+0000\n"
"PO-Revision-Date: 2010-12-16 01:30+0000\n"
"Last-Translator: Dimitris Andavoglou <dimitrisand@gmail.com>\n"
"Language-Team: Greek <el@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-12-15 04:52+0000\n"
"X-Launchpad-Export-Date: 2010-12-16 04:44+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_followup
addons/account_followup/i18n/pt.po
+3 -3
View File
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2010-12-03 15:42+0000\n"
"PO-Revision-Date: 2010-08-02 21:37+0000\n"
"Last-Translator: mga (Open ERP) <Unknown>\n"
"PO-Revision-Date: 2010-12-16 00:03+0000\n"
"Last-Translator: OpenERP Administrators <Unknown>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-12-15 04:52+0000\n"
"X-Launchpad-Export-Date: 2010-12-16 04:44+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_followup
addons/account_followup/report/account_followup_print.py
+1 -1
View File
@@ -58,7 +58,7 @@ class report_rappel(report_sxw.rml_parse):
movelines = moveline_obj.read(self.cr, self.uid, movelines)
return movelines
def _get_text(self, partner, followup_id, context={}):
def _get_text(self, partner, followup_id, context=None):
fp_obj = pooler.get_pool(self.cr.dbname).get('account_followup.followup')
fp_line = fp_obj.browse(self.cr, self.uid, followup_id).followup_line
li_delay = []
addons/account_followup/wizard/account_followup_print.py
+8 -8
View File
@@ -39,7 +39,7 @@ class account_followup_print(osv.osv_memory):
context = {}
if context.get('active_model', 'ir.ui.menu') == 'account_followup.followup':
return context.get('active_id', False)
company_id = self.pool.get('res.users').browse(cr, uid, uid).company_id.id
company_id = self.pool.get('res.users').browse(cr, uid, uid, context=context).company_id.id
followp_id = self.pool.get('account_followup.followup').search(cr, uid, [('company_id', '=', company_id)], context=context)
return followp_id and followp_id[0] or False
@@ -48,7 +48,7 @@ class account_followup_print(osv.osv_memory):
if context is None:
context = {}
data = self.read(cr, uid, ids, [])[0]
data = self.read(cr, uid, ids, [], context=context)[0]
model_data_ids = mod_obj.search(cr, uid, [('model','=','ir.ui.view'),('name','=','view_account_followup_print_all')], context=context)
resource_id = mod_obj.read(cr, uid, model_data_ids, fields=['res_id'], context=context)[0]['res_id']
context.update({'followup_id': data['followup_id'], 'date':data['date']})
@@ -146,7 +146,7 @@ class account_followup_print_all(osv.osv_memory):
if context is None:
context = {}
if ids:
data = self.read(cr, uid, ids, [])[0]
data = self.read(cr, uid, ids, [], context=context)[0]
cr.execute(
"SELECT l.partner_id, l.followup_line_id,l.date_maturity, l.date, l.id "\
"FROM account_move_line AS l "\
@@ -208,14 +208,14 @@ class account_followup_print_all(osv.osv_memory):
if context is None:
context = {}
data = self.read(cr, uid, ids, [])[0]
data = self.read(cr, uid, ids, [], context=context)[0]
model_data_ids = mod_obj.search(cr, uid, [('model','=','ir.ui.view'),('name','=','view_account_followup_print_all_msg')], context=context)
resource_id = mod_obj.read(cr, uid, model_data_ids, fields=['res_id'], context=context)[0]['res_id']
if data['email_conf']:
msg_sent = ''
msg_unsent = ''
data_user = user_obj.browse(cr, uid, uid)
move_lines = line_obj.browse(cr, uid, data['partner_ids'])
data_user = user_obj.browse(cr, uid, uid, context=context)
move_lines = line_obj.browse(cr, uid, data['partner_ids'], context=context)
partners = []
dict_lines = {}
for line in move_lines:
@@ -223,7 +223,7 @@ class account_followup_print_all(osv.osv_memory):
dict_lines[line.name.id] =line
for partner in partners:
ids_lines = move_obj.search(cr,uid,[('partner_id','=',partner.id),('reconcile_id','=',False),('account_id.type','in',['receivable'])])
data_lines = move_obj.browse(cr, uid, ids_lines)
data_lines = move_obj.browse(cr, uid, ids_lines, context=context)
followup_data = dict_lines[partner.id]
dest = False
if partner.address:
@@ -306,7 +306,7 @@ class account_followup_print_all(osv.osv_memory):
def do_print(self, cr, uid, ids, context=None):
if context is None:
context = {}
data = self.read(cr, uid, ids, [])[0]
data = self.read(cr, uid, ids, [], context=context)[0]
res = self._get_partners_followp(cr, uid, ids, context)['to_update']
to_update = res
data['followup_id'] = 'followup_id' in context and context['followup_id'] or False
addons/account_invoice_layout/account_invoice_layout.py
+3 -4
View File
@@ -127,13 +127,12 @@ class account_invoice_line(osv.osv):
def copy_data(self, cr, uid, id, default=None, context=None):
if default is None:
default = {}
default['state'] = self.browse(cr, uid, id).state
default['state'] = self.browse(cr, uid, id, context=context).state
return super(account_invoice_line, self).copy_data(cr, uid, id, default, context)
def _fnct(self, cr, uid, ids, name, args, context=None):
res = {}
lines = self.browse(cr, uid, ids)
lines = self.browse(cr, uid, ids, context=context)
account_ids = [line.account_id.id for line in lines]
account_names = dict(self.pool.get('account.account').name_get(cr, uid, account_ids, context=context))
for line in lines:
@@ -180,7 +179,7 @@ account_invoice_line()
class one2many_mod2(fields.one2many):
def get(self, cr, obj, ids, name, user=None, offset=0, context=None, values=None):
if not context:
if context is None:
context = {}
if not values:
values = {}
addons/account_invoice_layout/i18n/account_invoice_layout.pot
+7 -17
View File
@@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2010-12-10 17:14:50+0000\n"
"PO-Revision-Date: 2010-12-10 17:14:50+0000\n"
"POT-Creation-Date: 2010-12-15 15:04:40+0000\n"
"PO-Revision-Date: 2010-12-15 15:04:40+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -32,12 +32,6 @@ msgstr ""
msgid "Cancelled Invoice"
msgstr ""
#. module: account_invoice_layout
#: report:account.invoice.layout:0
#: report:notify_account.invoice:0
msgid "PRO-FORMA"
msgstr ""
#. module: account_invoice_layout
#: selection:account.invoice.line,state:0
#: field:notify.message,name:0
@@ -56,11 +50,6 @@ msgstr ""
msgid "Disc. (%)"
msgstr ""
#. module: account_invoice_layout
#: view:account.invoice.special.msg:0
msgid "Print"
msgstr ""
#. module: account_invoice_layout
#: selection:account.invoice.line,state:0
msgid "Note"
@@ -100,8 +89,9 @@ msgid "Document"
msgstr ""
#. module: account_invoice_layout
#: constraint:account.invoice:0
msgid "Error: Invalid Bvr Number (wrong checksum)."
#: report:account.invoice.layout:0
#: report:notify_account.invoice:0
msgid "PRO-FORMA"
msgstr ""
#. module: account_invoice_layout
@@ -281,8 +271,8 @@ msgid "Supplier Invoice"
msgstr ""
#. module: account_invoice_layout
#: constraint:account.invoice:0
msgid "Error: BVR reference is required."
#: view:account.invoice.special.msg:0
msgid "Print"
msgstr ""
#. module: account_invoice_layout
addons/account_invoice_layout/i18n/sl.po
+13 -13
View File
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2010-12-10 17:14+0000\n"
"PO-Revision-Date: 2010-10-30 14:06+0000\n"
"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
"PO-Revision-Date: 2010-12-15 07:49+0000\n"
"Last-Translator: Simon Vidmar <Unknown>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-12-14 05:22+0000\n"
"X-Launchpad-Export-Date: 2010-12-16 04:47+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_invoice_layout
@@ -25,7 +25,7 @@ msgstr "Vmesna vsota"
#: report:account.invoice.layout:0
#: report:notify_account.invoice:0
msgid "Note:"
msgstr ""
msgstr "Zaznamek:"
#. module: account_invoice_layout
#: report:account.invoice.layout:0
@@ -93,7 +93,7 @@ msgstr ""
#: report:account.invoice.layout:0
#: report:notify_account.invoice:0
msgid "VAT :"
msgstr ""
msgstr "DDV:"
#. module: account_invoice_layout
#: report:account.invoice.layout:0
@@ -141,7 +141,7 @@ msgstr "Cena"
#: report:account.invoice.layout:0
#: report:notify_account.invoice:0
msgid "Invoice Date"
msgstr ""
msgstr "Datum računa"
#. module: account_invoice_layout
#: report:account.invoice.layout:0
@@ -179,7 +179,7 @@ msgstr "Posebno sporočilo"
#. module: account_invoice_layout
#: help:account.invoice.special.msg,message:0
msgid "Message to Print at the bottom of report"
msgstr ""
msgstr "Sporočilo, ki se izpiše na dnu poročila"
#. module: account_invoice_layout
#: report:account.invoice.layout:0
@@ -191,7 +191,7 @@ msgstr "Količina"
#: report:account.invoice.layout:0
#: report:notify_account.invoice:0
msgid "Partner Ref."
msgstr ""
msgstr "Sklic partnerja"
#. module: account_invoice_layout
#: report:account.invoice.layout:0
@@ -204,7 +204,7 @@ msgstr "Račun"
#: report:account.invoice.layout:0
#: report:notify_account.invoice:0
msgid "Total:"
msgstr ""
msgstr "Skupaj:"
#. module: account_invoice_layout
#: view:account.invoice.special.msg:0
@@ -237,7 +237,7 @@ msgstr "Znesek"
#: report:account.invoice.layout:0
#: report:notify_account.invoice:0
msgid "Tel. :"
msgstr ""
msgstr "Tel.:"
#. module: account_invoice_layout
#: report:account.invoice.layout:0
@@ -296,13 +296,13 @@ msgstr "Davek"
#. module: account_invoice_layout
#: model:ir.model,name:account_invoice_layout.model_account_invoice_line
msgid "Invoice Line"
msgstr ""
msgstr "Postavka računa"
#. module: account_invoice_layout
#: report:account.invoice.layout:0
#: report:notify_account.invoice:0
msgid "Net Total:"
msgstr ""
msgstr "Skupaj (brez davkov):"
#. module: account_invoice_layout
#: view:notify.message:0
@@ -313,7 +313,7 @@ msgstr "Izpiši obvestilo ali želeno sporočilo"
#: report:account.invoice.layout:0
#: report:notify_account.invoice:0
msgid "Fax :"
msgstr ""
msgstr "Faks:"
#. module: account_invoice_layout
#: view:account.invoice.special.msg:0
addons/account_invoice_layout/i18n/sv.po
+1 -1
View File
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-12-15 05:04+0000\n"
"X-Launchpad-Export-Date: 2010-12-16 04:47+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_invoice_layout
addons/account_invoice_layout/wizard/account_invoice_special_message.py
+1 -1
View File
@@ -34,7 +34,7 @@ class account_invoice_special_msg(osv.osv_memory):
if context is None:
context = {}
data = self.read(cr, uid, ids, [])[0]
data = self.read(cr, uid, ids, [], context=context)[0]
datas = {
'ids': context.get('active_ids',[]),
'model': 'account.invoice',
addons/account_payment/account_move_line.py
+2 -2
View File
@@ -26,7 +26,7 @@ from tools.translate import _
class account_move_line(osv.osv):
_inherit = "account.move.line"
def amount_to_pay(self, cr, uid, ids, name, arg={}, context={}):
def amount_to_pay(self, cr, uid, ids, name, arg={}, context=None):
""" Return the amount still to pay regarding all the payemnt orders
(excepting cancelled orders)"""
if not ids:
@@ -47,7 +47,7 @@ class account_move_line(osv.osv):
r = dict(cr.fetchall())
return r
def _to_pay_search(self, cr, uid, obj, name, args, context):
def _to_pay_search(self, cr, uid, obj, name, args, context=None):
if not args:
return []
line_obj = self.pool.get('account.move.line')
addons/account_payment/account_payment.py
+6 -6
View File
@@ -39,7 +39,7 @@ class payment_mode(osv.osv):
'company_id': lambda self,cr,uid,c: self.pool.get('res.users').browse(cr, uid, uid, c).company_id.id
}
def suitable_bank_types(self, cr, uid, payment_code=None, context={}):
def suitable_bank_types(self, cr, uid, payment_code=None, context=None):
"""Return the codes of the bank type that are suitable
for the given payment type code"""
if not payment_code:
@@ -267,10 +267,10 @@ class payment_line(osv.osv):
line.amount_currency, context=ctx)
return res
def _get_currency(self, cr, uid, context):
def _get_currency(self, cr, uid, context=None):
user_obj = self.pool.get('res.users')
currency_obj = self.pool.get('res.currency')
user = user_obj.browse(cr, uid, uid)
user = user_obj.browse(cr, uid, uid, context=context)
if user.company_id:
return user.company_id.currency_id.id
@@ -284,7 +284,7 @@ class payment_line(osv.osv):
date = False
if context.get('order_id') and context['order_id']:
order = payment_order_obj.browse(cr, uid, context['order_id'], context)
order = payment_order_obj.browse(cr, uid, context['order_id'], context=context)
if order.date_prefered == 'fixed':
date = order.date_scheduled
else:
@@ -364,7 +364,7 @@ class payment_line(osv.osv):
data['amount_currency'] = data['communication'] = data['partner_id'] = data['reference'] = data['date_created'] = data['bank_id'] = data['amount'] = False
if move_line_id:
line = move_line_obj.browse(cr, uid, move_line_id)
line = move_line_obj.browse(cr, uid, move_line_id, context=context)
data['amount_currency'] = line.amount_to_pay
res = self.onchange_amount(cr, uid, ids, data['amount_currency'], currency,
@@ -413,7 +413,7 @@ class payment_line(osv.osv):
data['info_partner'] = data['bank_id'] = False
if partner_id:
part_obj = partner_obj.browse(cr, uid, partner_id)
part_obj = partner_obj.browse(cr, uid, partner_id, context=context)
partner = part_obj.name or ''
if part_obj.address:
addons/account_payment/i18n/account_payment.pot
+4 -14
View File
@@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2010-12-10 17:14:51+0000\n"
"PO-Revision-Date: 2010-12-10 17:14:51+0000\n"
"POT-Creation-Date: 2010-12-15 15:04:41+0000\n"
"PO-Revision-Date: 2010-12-15 15:04:41+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -151,8 +151,8 @@ msgid "Reference"
msgstr ""
#. module: account_payment
#: constraint:account.invoice:0
msgid "Error: BVR reference is required."
#: sql_constraint:payment.line:0
msgid "The payment line name must be unique!"
msgstr ""
#. module: account_payment
@@ -166,11 +166,6 @@ msgstr ""
msgid "Directly"
msgstr ""
#. module: account_payment
#: sql_constraint:payment.line:0
msgid "The payment line name must be unique!"
msgstr ""
#. module: account_payment
#: model:ir.actions.act_window,name:account_payment.action_payment_line_form
#: model:ir.model,name:account_payment.model_payment_line
@@ -384,11 +379,6 @@ msgstr ""
msgid "Draft"
msgstr ""
#. module: account_payment
#: constraint:account.invoice:0
msgid "Error: Invalid Bvr Number (wrong checksum)."
msgstr ""
#. module: account_payment
#: help:payment.line,communication2:0
msgid "The successor message of Communication."
addons/account_payment/wizard/account_payment_order.py
+1 -1
View File
@@ -62,7 +62,7 @@ class payment_order_create(osv.osv_memory):
payment_obj = self.pool.get('payment.line')
if context is None:
context = {}
data = self.read(cr, uid, ids, [])[0]
data = self.read(cr, uid, ids, [], context=context)[0]
line_ids = data['entries']
if not line_ids:
return {}
addons/account_payment/wizard/account_payment_pay.py
+2
View File
@@ -31,6 +31,8 @@ class account_payment_make_payment(osv.osv_memory):
If type is manual. just confirm the order.
"""
obj_payment_order = self.pool.get('payment.order')
if context is None:
context = {}
# obj_model = self.pool.get('ir.model.data')
# obj_act = self.pool.get('ir.actions.act_window')
# order = obj_payment_order.browse(cr, uid, context['active_id'], context)
addons/account_payment/wizard/account_payment_populate_statement.py
+1 -1
View File
@@ -60,7 +60,7 @@ class account_payment_populate_statement(osv.osv_memory):
if context is None:
context = {}
data = self.read(cr, uid, ids, [])[0]
data = self.read(cr, uid, ids, [], context=context)[0]
line_ids = data['lines']
if not line_ids:
return {}
addons/account_sequence/account_sequence.py
+1 -1
View File
@@ -33,7 +33,7 @@ class account_move(osv.osv):
obj_sequence = self.pool.get('ir.sequence')
res = super(account_move, self).post(cr, uid, ids, context=context)
seq_no = False
for move in self.browse(cr, uid, ids, context):
for move in self.browse(cr, uid, ids, context=context):
if move.journal_id.internal_sequence_id:
seq_no = obj_sequence.get_id(cr, uid, move.journal_id.internal_sequence_id.id, context=context)
if seq_no:
addons/account_sequence/account_sequence_installer.py
+2 -2
View File
@@ -47,7 +47,7 @@ class account_sequence_installer(osv.osv_memory):
context = {}
jou_obj = self.pool.get('account.journal')
obj_sequence = self.pool.get('ir.sequence')
record = self.browse(cr, uid, ids, context)[0]
record = self.browse(cr, uid, ids, context=context)[0]
j_ids = []
if record.company_id:
company_id = record.company_id.id,
@@ -70,7 +70,7 @@ class account_sequence_installer(osv.osv_memory):
ir_seq = obj_sequence.create(cr, uid, vals, context)
res = super(account_sequence_installer, self).execute(cr, uid, ids, context=context)
journal_ids = jou_obj.search(cr, uid, search_criteria, context=context)
for journal in jou_obj.browse(cr, uid, journal_ids, context):
for journal in jou_obj.browse(cr, uid, journal_ids, context=context):
if not journal.internal_sequence_id:
j_ids.append(journal.id)
if j_ids:
addons/account_sequence/i18n/account_sequence.pot
+20 -4
View File
@@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2010-12-03 15:42:55+0000\n"
"PO-Revision-Date: 2010-12-03 15:42:55+0000\n"
"POT-Creation-Date: 2010-12-15 15:04:41+0000\n"
"PO-Revision-Date: 2010-12-15 15:04:41+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -16,6 +16,7 @@ msgstr ""
"Plural-Forms: \n"
#. module: account_sequence
#: view:account.sequence.installer:0
#: model:ir.actions.act_window,name:account_sequence.action_account_seq_installer
msgid "Account Sequence Application Configuration"
msgstr ""
@@ -57,8 +58,13 @@ msgid "The next number of the sequence will be incremented by this number"
msgstr ""
#. module: account_sequence
#: field:account.sequence.installer,progress:0
msgid "Configuration Progress"
#: view:account.sequence.installer:0
msgid "Configure Your Account Sequence Application"
msgstr ""
#. module: account_sequence
#: view:account.sequence.installer:0
msgid "Configure"
msgstr ""
#. module: account_sequence
@@ -132,6 +138,11 @@ msgstr ""
msgid "account.sequence.installer"
msgstr ""
#. module: account_sequence
#: field:account.sequence.installer,progress:0
msgid "Configuration Progress"
msgstr ""
#. module: account_sequence
#: help:account.sequence.installer,prefix:0
msgid "Prefix value of the record for the sequence"
@@ -182,6 +193,11 @@ msgstr ""
msgid "Journal"
msgstr ""
#. module: account_sequence
#: view:account.sequence.installer:0
msgid "You can enhance the Account Sequence Application by installing ."
msgstr ""
#. module: account_sequence
#: constraint:account.move.line:0
msgid "You can not create move line on view account."
addons/account_voucher/account_voucher.py
+52 -39
View File
@@ -30,7 +30,7 @@ from tools.translate import _
class account_move_line(osv.osv):
_inherit = 'account.move.line'
def _unreconciled(self, cr, uid, ids, prop, unknow_none, context):
def _unreconciled(self, cr, uid, ids, prop, unknow_none, context=None):
res = {}
for line in self.browse(cr, uid, ids, context=context):
res[line.id] = line.debit - line.credit
@@ -49,16 +49,19 @@ account_move_line()
class account_voucher(osv.osv):
def _get_type(self, cr, uid, ids, context={}):
def _get_type(self, cr, uid, ids, context=None):
if context is None: context = {}
return context.get('type', False)
def _get_period(self, cr, uid, context={}):
def _get_period(self, cr, uid, context=None):
if context is None: context = {}
if context.get('period_id', False):
return context.get('period_id')
periods = self.pool.get('account.period').find(cr, uid)
return periods and periods[0] or False
def _get_journal(self, cr, uid, context={}):
def _get_journal(self, cr, uid, context=None):
if context is None: context = {}
journal_pool = self.pool.get('account.journal')
if context.get('journal_id', False):
return context.get('journal_id')
@@ -71,7 +74,8 @@ class account_voucher(osv.osv):
res = journal_pool.search(cr, uid, [('type', '=', ttype)], limit=1)
return res and res[0] or False
def _get_tax(self, cr, uid, context={}):
def _get_tax(self, cr, uid, context=None):
if context is None: context = {}
journal_pool = self.pool.get('account.journal')
journal_id = context.get('journal_id', False)
if not journal_id:
@@ -83,39 +87,45 @@ class account_voucher(osv.osv):
if not journal_id:
return False
journal = journal_pool.browse(cr, uid, journal_id)
journal = journal_pool.browse(cr, uid, journal_id, context=context)
account_id = journal.default_credit_account_id or journal.default_debit_account_id
if account_id and account_id.tax_ids:
tax_id = account_id.tax_ids[0].id
return tax_id
return False
def _get_currency(self, cr, uid, context):
def _get_currency(self, cr, uid, context=None):
if context is None: context = {}
journal_pool = self.pool.get('account.journal')
journal_id = context.get('journal_id', False)
if journal_id:
journal = journal_pool.browse(cr, uid, journal_id)
journal = journal_pool.browse(cr, uid, journal_id, context=context)
# currency_id = journal.company_id.currency_id.id
if journal.currency:
return journal.currency.id
return False
def _get_partner(self, cr, uid, context={}):
def _get_partner(self, cr, uid, context=None):
if context is None: context = {}
return context.get('partner_id', False)
def _get_reference(self, cr, uid, context={}):
def _get_reference(self, cr, uid, context=None):
if context is None: context = {}
return context.get('reference', False)
def _get_narration(self, cr, uid, context={}):
def _get_narration(self, cr, uid, context=None):
if context is None: context = {}
return context.get('narration', False)
def name_get(self, cr, uid, ids, context=None):
if not ids:
return []
if context is None: context = {}
return [(r['id'], (str("%.2f" % r['amount']) or '')) for r in self.read(cr, uid, ids, ['amount'], context, load='_classic_write')]
def fields_view_get(self, cr, uid, view_id=None, view_type=False, context=None, toolbar=False, submenu=False):
mod_obj = self.pool.get('ir.model.data')
if context is None: context = {}
if not view_id and context.get('invoice_type', False):
if context.get('invoice_type', False) in ('out_invoice', 'out_refund'):
result = mod_obj.get_object_reference(cr, uid, 'account_voucher', 'view_vendor_receipt_form')
@@ -232,14 +242,15 @@ class account_voucher(osv.osv):
'comment': 'Write-Off',
}
def compute_tax(self, cr, uid, ids, context={}):
def compute_tax(self, cr, uid, ids, context=None):
tax_pool = self.pool.get('account.tax')
partner_pool = self.pool.get('res.partner')
position_pool = self.pool.get('account.fiscal.position')
voucher_line_pool = self.pool.get('account.voucher.line')
voucher_pool = self.pool.get('account.voucher')
if context is None: context = {}
for voucher in voucher_pool.browse(cr, uid, ids, context):
for voucher in voucher_pool.browse(cr, uid, ids, context=context):
voucher_amount = 0.0
for line in voucher.line_ids:
voucher_amount += line.untax_amount or line.amount
@@ -250,10 +261,10 @@ class account_voucher(osv.osv):
self.write(cr, uid, [voucher.id], {'amount':voucher_amount, 'tax_amount':0.0})
continue
tax = [tax_pool.browse(cr, uid, voucher.tax_id.id)]
partner = partner_pool.browse(cr, uid, voucher.partner_id.id) or False
tax = [tax_pool.browse(cr, uid, voucher.tax_id.id, context=context)]
partner = partner_pool.browse(cr, uid, voucher.partner_id.id, context=context) or False
taxes = position_pool.map_tax(cr, uid, partner and partner.property_account_position or False, tax)
tax = tax_pool.browse(cr, uid, taxes)
tax = tax_pool.browse(cr, uid, taxes, context=context)
total = voucher_amount
total_tax = 0.0
@@ -277,7 +288,7 @@ class account_voucher(osv.osv):
self.write(cr, uid, [voucher.id], {'amount':total, 'tax_amount':total_tax})
return True
def onchange_price(self, cr, uid, ids, line_ids, tax_id, partner_id=False, context={}):
def onchange_price(self, cr, uid, ids, line_ids, tax_id, partner_id=False, context=None):
tax_pool = self.pool.get('account.tax')
partner_pool = self.pool.get('res.partner')
position_pool = self.pool.get('account.fiscal.position')
@@ -299,11 +310,11 @@ class account_voucher(osv.osv):
total = voucher_total
total_tax = 0.0
if tax_id:
tax = [tax_pool.browse(cr, uid, tax_id)]
tax = [tax_pool.browse(cr, uid, tax_id, context=context)]
if partner_id:
partner = partner_pool.browse(cr, uid, partner_id) or False
partner = partner_pool.browse(cr, uid, partner_id, context=context) or False
taxes = position_pool.map_tax(cr, uid, partner and partner.property_account_position or False, tax)
tax = tax_pool.browse(cr, uid, taxes)
tax = tax_pool.browse(cr, uid, taxes, context=context)
if not tax[0].price_include:
for tax_line in tax_pool.compute_all(cr, uid, tax, voucher_total, 1).get('taxes', []):
@@ -332,7 +343,7 @@ class account_voucher(osv.osv):
})
return {'value':default}
def onchange_journal_voucher(self, cr, uid, ids, line_ids=False, tax_id=False, price=0.0, partner_id=False, journal_id=False, ttype=False, context={}):
def onchange_journal_voucher(self, cr, uid, ids, line_ids=False, tax_id=False, price=0.0, partner_id=False, journal_id=False, ttype=False, context=None):
"""price
Returns a dict that contains new values and context
@@ -352,8 +363,8 @@ class account_voucher(osv.osv):
partner_pool = self.pool.get('res.partner')
journal_pool = self.pool.get('account.journal')
journal = journal_pool.browse(cr, uid, journal_id)
partner = partner_pool.browse(cr, uid, partner_id)
journal = journal_pool.browse(cr, uid, journal_id, context=context)
partner = partner_pool.browse(cr, uid, partner_id, context=context)
account_id = False
tr_type = False
if journal.type in ('sale','sale_refund'):
@@ -411,8 +422,8 @@ class account_voucher(osv.osv):
line_pool.unlink(cr, uid, line_ids)
return default
journal = journal_pool.browse(cr, uid, journal_id)
partner = partner_pool.browse(cr, uid, partner_id)
journal = journal_pool.browse(cr, uid, journal_id, context=context)
partner = partner_pool.browse(cr, uid, partner_id, context=context)
account_id = False
if journal.type in ('sale','sale_refund'):
account_id = partner.property_account_receivable.id
@@ -441,7 +452,7 @@ class account_voucher(osv.osv):
else:
ids = context['move_line_ids']
ids.reverse()
moves = move_line_pool.browse(cr, uid, ids)
moves = move_line_pool.browse(cr, uid, ids, context=context)
company_currency = journal.company_id.currency_id.id
if company_currency != currency_id and ttype == 'payment':
@@ -496,7 +507,7 @@ class account_voucher(osv.osv):
return default
def onchange_date(self, cr, user, ids, date, context={}):
def onchange_date(self, cr, user, ids, date, context=None):
"""
@param date: latest value from user input for field date
@param args: other arguments
@@ -513,11 +524,11 @@ class account_voucher(osv.osv):
}
}
def onchange_journal(self, cr, uid, ids, journal_id, line_ids, tax_id, partner_id, context={}):
def onchange_journal(self, cr, uid, ids, journal_id, line_ids, tax_id, partner_id, context=None):
if not journal_id:
return False
journal_pool = self.pool.get('account.journal')
journal = journal_pool.browse(cr, uid, journal_id)
journal = journal_pool.browse(cr, uid, journal_id, context=context)
account_id = journal.default_credit_account_id or journal.default_debit_account_id
tax_id = False
if account_id and account_id.tax_ids:
@@ -535,18 +546,18 @@ class account_voucher(osv.osv):
self.action_move_line_create(cr, uid, ids, context=context)
return True
def action_cancel_draft(self, cr, uid, ids, context={}):
def action_cancel_draft(self, cr, uid, ids, context=None):
wf_service = netsvc.LocalService("workflow")
for voucher_id in ids:
wf_service.trg_create(uid, 'account.voucher', voucher_id, cr)
self.write(cr, uid, ids, {'state':'draft'})
return True
def cancel_voucher(self, cr, uid, ids, context={}):
def cancel_voucher(self, cr, uid, ids, context=None):
reconcile_pool = self.pool.get('account.move.reconcile')
move_pool = self.pool.get('account.move')
for voucher in self.browse(cr, uid, ids):
for voucher in self.browse(cr, uid, ids, context=context):
recs = []
for line in voucher.move_ids:
if line.reconcile_id:
@@ -600,14 +611,14 @@ class account_voucher(osv.osv):
terms = term_pool.compute(cr, uid, term_id, amount)
return terms
return False
if not context:
if context is None:
context = {}
move_pool = self.pool.get('account.move')
move_line_pool = self.pool.get('account.move.line')
currency_pool = self.pool.get('res.currency')
tax_obj = self.pool.get('account.tax')
seq_obj = self.pool.get('ir.sequence')
for inv in self.browse(cr, uid, ids):
for inv in self.browse(cr, uid, ids, context=context):
if inv.move_id:
continue
if inv.number:
@@ -787,7 +798,7 @@ class account_voucher_line(osv.osv):
def _compute_balance(self, cr, uid, ids, name, args, context=None):
currency_pool = self.pool.get('res.currency')
rs_data = {}
for line in self.browse(cr, uid, ids):
for line in self.browse(cr, uid, ids, context=context):
res = {}
company_currency = line.voucher_id.journal_id.company_id.currency_id.id
voucher_currency = line.voucher_id.currency_id.id
@@ -827,7 +838,7 @@ class account_voucher_line(osv.osv):
'name': ''
}
def onchange_move_line_id(self, cr, user, ids, move_line_id, context={}):
def onchange_move_line_id(self, cr, user, ids, move_line_id, context=None):
"""
Returns a dict that contains new values and context
@@ -862,6 +873,8 @@ class account_voucher_line(osv.osv):
@return: Returns a dict that contains default values for fields
"""
if context is None:
context = {}
journal_id = context.get('journal_id', False)
partner_id = context.get('partner_id', False)
journal_pool = self.pool.get('account.journal')
@@ -869,7 +882,7 @@ class account_voucher_line(osv.osv):
values = super(account_voucher_line, self).default_get(cr, user, fields_list, context=context)
if (not journal_id) or ('account_id' not in fields_list):
return values
journal = journal_pool.browse(cr, user, journal_id)
journal = journal_pool.browse(cr, user, journal_id, context=context)
account_id = False
ttype = 'cr'
if journal.type in ('sale', 'sale_refund'):
@@ -898,7 +911,7 @@ class account_bank_statement(osv.osv):
def button_cancel(self, cr, uid, ids, context=None):
voucher_obj = self.pool.get('account.voucher')
for st in self.browse(cr, uid, ids, context):
for st in self.browse(cr, uid, ids, context=context):
voucher_ids = []
for line in st.line_ids:
if line.voucher_id:
@@ -958,7 +971,7 @@ class account_bank_statement_line(osv.osv):
def unlink(self, cr, uid, ids, context=None):
voucher_obj = self.pool.get('account.voucher')
statement_line = self.browse(cr, uid, ids, context)
statement_line = self.browse(cr, uid, ids, context=context)
unlink_ids = []
for st_line in statement_line:
if st_line.voucher_id:
addons/account_voucher/i18n/account_voucher.pot
+18 -28
View File
@@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2010-12-10 17:14:52+0000\n"
"PO-Revision-Date: 2010-12-10 17:14:52+0000\n"
"POT-Creation-Date: 2010-12-15 15:04:42+0000\n"
"PO-Revision-Date: 2010-12-15 15:04:42+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -248,11 +248,6 @@ msgstr ""
msgid "Unreconcile"
msgstr ""
#. module: account_voucher
#: constraint:account.invoice:0
msgid "Error: BVR reference is required."
msgstr ""
#. module: account_voucher
#: field:account.voucher,tax_id:0
msgid "Tax"
@@ -340,11 +335,6 @@ msgstr ""
msgid "Date:"
msgstr ""
#. module: account_voucher
#: selection:account.voucher,pay_now:0
msgid "Pay Directly"
msgstr ""
#. module: account_voucher
#: view:account.voucher:0
#: field:account.voucher,period_id:0
@@ -380,8 +370,8 @@ msgid "Supplier Voucher"
msgstr ""
#. module: account_voucher
#: constraint:account.invoice:0
msgid "Error: Invalid Bvr Number (wrong checksum)."
#: model:ir.actions.act_window,name:account_voucher.action_review_voucher_list
msgid "Vouchers Entries"
msgstr ""
#. module: account_voucher
@@ -448,8 +438,8 @@ msgid "Paid Amount"
msgstr ""
#. module: account_voucher
#: view:account.voucher:0
msgid "Expense Lines"
#: selection:account.voucher,pay_now:0
msgid "Pay Directly"
msgstr ""
#. module: account_voucher
@@ -560,9 +550,8 @@ msgid "Extended Filters..."
msgstr ""
#. module: account_voucher
#: report:voucher.cash_receipt.drcr:0
#: report:voucher.print:0
msgid "Number:"
#: constraint:account.move.line:0
msgid "Company must be same for its related account and period."
msgstr ""
#. module: account_voucher
@@ -571,8 +560,8 @@ msgid "Amount reconciled"
msgstr ""
#. module: account_voucher
#: field:account.voucher,comment:0
msgid "Comment"
#: view:account.voucher:0
msgid "Expense Lines"
msgstr ""
#. module: account_voucher
@@ -580,6 +569,11 @@ msgstr ""
msgid "Previous Payments ?"
msgstr ""
#. module: account_voucher
#: field:account.voucher,comment:0
msgid "Comment"
msgstr ""
#. module: account_voucher
#: model:ir.actions.act_window,name:account_voucher.action_voucher_list
#: model:ir.ui.menu,name:account_voucher.menu_encode_entries_by_voucher
@@ -630,8 +624,9 @@ msgid "Bill Date"
msgstr ""
#. module: account_voucher
#: constraint:account.move.line:0
msgid "Company must be same for its related account and period."
#: report:voucher.cash_receipt.drcr:0
#: report:voucher.print:0
msgid "Number:"
msgstr ""
#. module: account_voucher
@@ -855,11 +850,6 @@ msgstr ""
msgid "Untax Amount"
msgstr ""
#. module: account_voucher
#: model:ir.actions.act_window,name:account_voucher.action_review_voucher_list
msgid "Vouchers Entries"
msgstr ""
#. module: account_voucher
#: view:account.voucher:0
#: field:account.voucher.line,amount_unreconciled:0
addons/account_voucher/i18n/de.po
+2 -2
View File
@@ -7,14 +7,14 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2010-12-10 17:14+0000\n"
"PO-Revision-Date: 2010-12-15 01:41+0000\n"
"PO-Revision-Date: 2010-12-15 21:40+0000\n"
"Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
"consulting.net>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-12-15 05:12+0000\n"
"X-Launchpad-Export-Date: 2010-12-16 04:47+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_voucher
addons/account_voucher/i18n/sv.po
+5 -5
View File
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 5.0.14\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2010-12-10 17:14+0000\n"
"PO-Revision-Date: 2010-12-14 17:11+0000\n"
"Last-Translator: Anders Eriksson, Aspirix AB <ae@mobilasystem.se>\n"
"PO-Revision-Date: 2010-12-15 21:34+0000\n"
"Last-Translator: Magnus Brandt (mba), Aspirix AB <Unknown>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-12-15 05:12+0000\n"
"X-Launchpad-Export-Date: 2010-12-16 04:47+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_voucher
@@ -84,7 +84,7 @@ msgstr "Fakturabetalning"
#. module: account_voucher
#: field:account.voucher.line,amount_original:0
msgid "Originial Amount"
msgstr ""
msgstr "Ursprungligt belopp"
#. module: account_voucher
#: view:account.statement.from.invoice.lines:0
@@ -179,7 +179,7 @@ msgstr "Du kan inte skapa transaktioner för ett avslutat konto."
#. module: account_voucher
#: field:account.voucher,narration:0
msgid "Notes"
msgstr ""
msgstr "Anteckningar"
#. module: account_voucher
#: model:ir.actions.act_window,help:account_voucher.action_vendor_receipt
addons/account_voucher/i18n/vi.po
+5 -5
View File
@@ -8,13 +8,13 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2010-12-10 17:14+0000\n"
"PO-Revision-Date: 2010-08-02 14:40+0000\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"PO-Revision-Date: 2010-12-15 15:25+0000\n"
"Last-Translator: Phong Nguyen <Unknown>\n"
"Language-Team: Vietnamese <vi@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-12-15 05:13+0000\n"
"X-Launchpad-Export-Date: 2010-12-16 04:47+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_voucher
@@ -41,7 +41,7 @@ msgstr ""
#. module: account_voucher
#: view:account.voucher:0
msgid "Group By..."
msgstr ""
msgstr "Nhóm theo..."
#. module: account_voucher
#: code:addons/account_voucher/account_voucher.py:0
@@ -576,7 +576,7 @@ msgstr ""
#. module: account_voucher
#: view:account.voucher:0
msgid "Extended Filters..."
msgstr ""
msgstr "Bộ lọc mở rộng..."
#. module: account_voucher
#: report:voucher.cash_receipt.drcr:0
addons/account_voucher/wizard/account_statement_from_invoice.py
+4 -2
View File
@@ -35,7 +35,8 @@ class account_statement_from_invoice_lines(osv.osv_memory):
}
def populate_statement(self, cr, uid, ids, context=None):
if context is None:
context = {}
statement_id = context.get('statement_id', False)
if not statement_id:
return {}
@@ -134,7 +135,8 @@ class account_statement_from_invoice(osv.osv_memory):
}
def search_invoices(self, cr, uid, ids, context=None):
if context is None:
context = {}
line_obj = self.pool.get('account.move.line')
statement_obj = self.pool.get('account.bank.statement')
journal_obj = self.pool.get('account.journal')
addons/account_voucher/wizard/account_voucher_unreconcile.py
+1 -1
View File
@@ -41,7 +41,7 @@ class account_voucher_unreconcile(osv.osv_memory):
voucher_pool = self.pool.get('account.voucher')
reconcile_pool = self.pool.get('account.move.reconcile')
if context.get('active_id'):
voucher = voucher_pool.browse(cr, uid, context.get('active_id'), context)
voucher = voucher_pool.browse(cr, uid, context.get('active_id'), context=context)
recs = []
for line in voucher.move_ids:
if line.reconcile_id:
addons/analytic/analytic.py
+1 -1
View File
@@ -183,7 +183,7 @@ class account_analytic_account(osv.osv):
def name_search(self, cr, uid, name, args=None, operator='ilike', context=None, limit=100):
if not args:
args=[]
if not context:
if context is None:
context={}
account = self.search(cr, uid, [('code', '=', name)]+args, limit=limit, context=context)
if not account:
addons/analytic/i18n/analytic.pot
+2 -2
View File
@@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2010-12-03 15:42:56+0000\n"
"PO-Revision-Date: 2010-12-03 15:42:56+0000\n"
"POT-Creation-Date: 2010-12-15 15:04:42+0000\n"
"PO-Revision-Date: 2010-12-15 15:04:42+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
addons/analytic/i18n/it.po
+2 -2
View File
@@ -8,13 +8,13 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2010-12-03 15:42+0000\n"
"PO-Revision-Date: 2010-12-14 14:11+0000\n"
"PO-Revision-Date: 2010-12-16 03:21+0000\n"
"Last-Translator: Davide Corio - Domsense <davide.corio@domsense.com>\n"
"Language-Team: Italian <it@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-12-15 05:18+0000\n"
"X-Launchpad-Export-Date: 2010-12-16 04:48+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: analytic
addons/analytic/i18n/sl.po
+6 -6
View File
@@ -8,13 +8,13 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2010-12-03 15:42+0000\n"
"PO-Revision-Date: 2010-08-03 00:15+0000\n"
"Last-Translator: mga (Open ERP) <Unknown>\n"
"PO-Revision-Date: 2010-12-15 11:24+0000\n"
"Last-Translator: Simon Vidmar <Unknown>\n"
"Language-Team: Slovenian <sl@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-12-15 05:18+0000\n"
"X-Launchpad-Export-Date: 2010-12-16 04:48+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: analytic
@@ -82,7 +82,7 @@ msgstr "Čakajoči"
#. module: analytic
#: model:ir.model,name:analytic.model_account_analytic_line
msgid "Analytic Line"
msgstr ""
msgstr "Analitična postavka"
#. module: analytic
#: field:account.analytic.account,description:0
@@ -172,7 +172,7 @@ msgstr "Stanje"
#. module: analytic
#: constraint:account.analytic.account:0
msgid "Error! You can not create recursive analytic accounts."
msgstr ""
msgstr "Napaka! Ne morete kreirati rekurzivnih analitičnih kontov."
#. module: analytic
#: help:account.analytic.account,type:0
@@ -211,7 +211,7 @@ msgstr "Pogled"
#. module: analytic
#: field:account.analytic.account,partner_id:0
msgid "Partner"
msgstr ""
msgstr "Stranka"
#. module: analytic
#: field:account.analytic.account,date_start:0
addons/analytic_journal_billing_rate/i18n/analytic_journal_billing_rate.pot
+4 -14
View File
@@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2010-12-10 17:14:53+0000\n"
"PO-Revision-Date: 2010-12-10 17:14:53+0000\n"
"POT-Creation-Date: 2010-12-15 15:04:43+0000\n"
"PO-Revision-Date: 2010-12-15 15:04:43+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -20,16 +20,6 @@ msgstr ""
msgid "Analytic Journal"
msgstr ""
#. module: analytic_journal_billing_rate
#: model:ir.model,name:analytic_journal_billing_rate.model_hr_analytic_timesheet
msgid "Timesheet Line"
msgstr ""
#. module: analytic_journal_billing_rate
#: constraint:account.invoice:0
msgid "Error: BVR reference is required."
msgstr ""
#. module: analytic_journal_billing_rate
#: view:analytic_journal_rate_grid:0
msgid "Billing Rate per Journal for this Analytic Account"
@@ -72,7 +62,7 @@ msgid "Error! You can not create recursive analytic accounts."
msgstr ""
#. module: analytic_journal_billing_rate
#: constraint:account.invoice:0
msgid "Error: Invalid Bvr Number (wrong checksum)."
#: model:ir.model,name:analytic_journal_billing_rate.model_hr_analytic_timesheet
msgid "Timesheet Line"
msgstr ""
addons/analytic_journal_billing_rate/i18n/fr.po
+5 -5
View File
@@ -7,14 +7,14 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2010-12-10 17:14+0000\n"
"PO-Revision-Date: 2010-11-24 09:41+0000\n"
"PO-Revision-Date: 2010-12-15 20:30+0000\n"
"Last-Translator: Maxime Chambreuil (http://www.savoirfairelinux.com) "
"<maxime.chambreuil@savoirfairelinux.com>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-12-15 05:13+0000\n"
"X-Launchpad-Export-Date: 2010-12-16 04:47+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: analytic_journal_billing_rate
@@ -30,7 +30,7 @@ msgstr "Ligne de feuille de temps"
#. module: analytic_journal_billing_rate
#: constraint:account.invoice:0
msgid "Error: BVR reference is required."
msgstr ""
msgstr "Erreur : la référence BVR est requise."
#. module: analytic_journal_billing_rate
#: view:analytic_journal_rate_grid:0
@@ -75,12 +75,12 @@ msgstr "Taux de Facturation"
#. module: analytic_journal_billing_rate
#: constraint:account.analytic.account:0
msgid "Error! You can not create recursive analytic accounts."
msgstr ""
msgstr "Erreur ! Vous ne pouvez pas créer de comptes analytiques récursifs."
#. module: analytic_journal_billing_rate
#: constraint:account.invoice:0
msgid "Error: Invalid Bvr Number (wrong checksum)."
msgstr ""
msgstr "Erreur : Nombre BVR non valide (somme de contrôle fausse)."
#~ msgid "Invalid XML for View Architecture!"
#~ msgstr "XML non valide pour l'architecture de la vue"
addons/analytic_journal_billing_rate/i18n/sl.po
+4 -4
View File
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2010-12-10 17:14+0000\n"
"PO-Revision-Date: 2010-11-27 00:03+0000\n"
"Last-Translator: OpenERP Administrators <Unknown>\n"
"PO-Revision-Date: 2010-12-15 10:04+0000\n"
"Last-Translator: Simon Vidmar <Unknown>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-12-15 05:13+0000\n"
"X-Launchpad-Export-Date: 2010-12-16 04:47+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: analytic_journal_billing_rate
@@ -72,7 +72,7 @@ msgstr "Fakturna stopnja"
#. module: analytic_journal_billing_rate
#: constraint:account.analytic.account:0
msgid "Error! You can not create recursive analytic accounts."
msgstr ""
msgstr "Napaka! Ne morete kreirati rekurzivnih analitičnih kontov."
#. module: analytic_journal_billing_rate
#: constraint:account.invoice:0

Some files were not shown because too many files have changed in this diff Show More