[MERGE] merge from trunk addons
bzr revid: mra@mra-laptop-20101214130232-wqsim6966u1hilu9 bzr revid: mra@mra-laptop-20101217043732-ri8dfx38pacpruye
This commit is contained in:
commit
b0f61a9546
|
@ -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:'):
|
||||
|
@ -584,7 +580,7 @@ class account_journal(osv.osv):
|
|||
_name = "account.journal"
|
||||
_description = "Journal"
|
||||
_columns = {
|
||||
'name': fields.char('Journal Name', size=64, required=True, translate=True),
|
||||
'name': fields.char('Journal Name', size=64, required=True),
|
||||
'code': fields.char('Code', size=5, required=True, help="The code will be used to generate the numbers of the journal entries of this journal."),
|
||||
'type': fields.selection([('sale', 'Sale'),('sale_refund','Sale Refund'), ('purchase', 'Purchase'), ('purchase_refund','Purchase Refund'), ('cash', 'Cash'), ('bank', 'Bank and Cheques'), ('general', 'General'), ('situation', 'Opening/Closing Situation')], 'Type', size=32, required=True,
|
||||
help="Select 'Sale' for Sale journal to be used at the time of making invoice."\
|
||||
|
@ -688,7 +684,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
|
||||
|
@ -736,7 +732,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',
|
||||
|
@ -781,8 +777,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
|
||||
|
@ -792,11 +788,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)
|
||||
|
@ -814,7 +810,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)])
|
||||
|
@ -859,14 +855,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
|
||||
|
||||
|
@ -887,13 +883,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?
|
||||
|
@ -909,7 +905,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:
|
||||
|
@ -921,7 +917,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:
|
||||
|
@ -947,7 +943,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']] = {
|
||||
|
@ -969,28 +965,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',
|
||||
|
@ -1041,8 +1037,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)
|
||||
|
@ -1061,7 +1055,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)
|
||||
|
@ -1070,7 +1064,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]
|
||||
|
@ -1131,8 +1125,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),
|
||||
|
@ -1142,8 +1136,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
|
||||
|
@ -1169,7 +1163,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
|
||||
|
@ -1194,7 +1188,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
|
||||
|
@ -1207,8 +1201,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:
|
||||
|
@ -1217,18 +1211,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]:
|
||||
|
@ -1268,8 +1265,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':'/',
|
||||
|
@ -1280,10 +1278,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"!') % \
|
||||
|
@ -1297,8 +1294,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)
|
||||
|
@ -1361,7 +1358,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']
|
||||
|
||||
|
@ -1475,9 +1472,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:
|
||||
|
@ -1491,7 +1488,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)
|
||||
|
@ -1540,7 +1537,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:
|
||||
|
@ -1622,7 +1619,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
|
||||
|
@ -1726,7 +1723,7 @@ class account_tax(osv.osv):
|
|||
"""
|
||||
if not args:
|
||||
args = []
|
||||
if not context:
|
||||
if context is None:
|
||||
context = {}
|
||||
ids = []
|
||||
if name:
|
||||
|
@ -2065,7 +2062,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'],
|
||||
|
@ -2171,13 +2168,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:
|
||||
|
@ -2189,9 +2186,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)
|
||||
|
@ -2200,8 +2197,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, {
|
||||
|
@ -2299,10 +2296,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']
|
||||
|
@ -2319,7 +2316,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'])
|
||||
|
@ -2341,6 +2338,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)
|
||||
|
@ -2466,16 +2465,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
|
||||
|
@ -2582,7 +2581,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]
|
||||
|
@ -2628,7 +2627,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,
|
||||
|
@ -2686,7 +2685,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])
|
||||
|
@ -2725,7 +2724,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]
|
||||
|
@ -2838,11 +2837,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
|
||||
|
||||
|
@ -2935,7 +2934,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,
|
||||
|
|
|
@ -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'],))
|
||||
|
|
|
@ -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':
|
||||
|
|
|
@ -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):
|
||||
|
|
|
@ -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:
|
||||
|
|
|
@ -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
|
||||
|
@ -1186,11 +1192,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
|
||||
|
@ -1938,6 +1939,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
|
||||
|
@ -2835,7 +2841,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 ""
|
||||
|
||||
|
@ -3283,17 +3292,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
|
||||
|
@ -3511,9 +3512,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
|
||||
|
@ -3809,9 +3818,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
|
||||
|
@ -3895,6 +3903,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
|
||||
|
@ -5363,6 +5381,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"
|
||||
|
@ -5534,6 +5557,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
|
||||
|
@ -5684,6 +5712,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"
|
||||
|
@ -6178,11 +6212,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."
|
||||
|
@ -6844,6 +6873,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
|
||||
|
@ -7368,11 +7402,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"
|
||||
|
@ -7536,6 +7565,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."
|
||||
|
@ -8532,13 +8566,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
|
||||
|
|
|
@ -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-12 04:40+0000\n"
|
||||
"X-Launchpad-Export-Date: 2010-12-15 04:52+0000\n"
|
||||
"X-Generator: Launchpad (build Unknown)\n"
|
||||
|
||||
#. module: account
|
||||
|
|
|
@ -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-12 04:41+0000\n"
|
||||
"X-Launchpad-Export-Date: 2010-12-15 04:53+0000\n"
|
||||
"X-Generator: Launchpad (build Unknown)\n"
|
||||
|
||||
#. module: account
|
||||
|
|
|
@ -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-12-11 11:22+0000\n"
|
||||
"Last-Translator: Fulup <Unknown>\n"
|
||||
"PO-Revision-Date: 2010-12-12 09:25+0000\n"
|
||||
"Last-Translator: OpenERP Administrators <Unknown>\n"
|
||||
"Language-Team: Breton <br@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-12 04:40+0000\n"
|
||||
"X-Launchpad-Export-Date: 2010-12-15 04:53+0000\n"
|
||||
"X-Generator: Launchpad (build Unknown)\n"
|
||||
|
||||
#. module: account
|
||||
|
|
|
@ -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-12 04:40+0000\n"
|
||||
"X-Launchpad-Export-Date: 2010-12-15 04:53+0000\n"
|
||||
"X-Generator: Launchpad (build Unknown)\n"
|
||||
|
||||
#. module: account
|
||||
|
|
|
@ -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-12 04:41+0000\n"
|
||||
"X-Launchpad-Export-Date: 2010-12-15 04:53+0000\n"
|
||||
"X-Generator: Launchpad (build Unknown)\n"
|
||||
|
||||
#. module: account
|
||||
|
|
|
@ -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-12 04:41+0000\n"
|
||||
"X-Launchpad-Export-Date: 2010-12-15 04:53+0000\n"
|
||||
"X-Generator: Launchpad (build Unknown)\n"
|
||||
|
||||
#. module: account
|
||||
|
|
|
@ -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-11 04:51+0000\n"
|
||||
"X-Launchpad-Export-Date: 2010-12-15 04:53+0000\n"
|
||||
"X-Generator: Launchpad (build Unknown)\n"
|
||||
|
||||
#. module: account
|
||||
|
@ -1012,6 +1012,11 @@ msgstr ""
|
|||
msgid "Landscape Mode"
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: model:account.account.type,name:account.account_type_liability
|
||||
msgid "Bilanzkonten - Passiva - Kapitalkonten"
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: view:board.board:0
|
||||
msgid "Customer Invoices to Approve"
|
||||
|
@ -1937,7 +1942,7 @@ msgstr ""
|
|||
#. module: account
|
||||
#: model:ir.actions.act_window,help:account.action_invoice_tree4
|
||||
msgid ""
|
||||
"A supplier refund is a credit note from your supplier indicating that he "
|
||||
"A vendor refund is a credit note from your supplier indicating that he "
|
||||
"refunds part or totality of the invoice sent to you."
|
||||
msgstr ""
|
||||
|
||||
|
@ -2660,6 +2665,11 @@ msgstr ""
|
|||
msgid "Base Code Amount"
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: model:account.account.type,name:account.account_type_view
|
||||
msgid "Ansicht"
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: field:wizard.multi.charts.accounts,sale_tax:0
|
||||
msgid "Default Sale Tax"
|
||||
|
|
|
@ -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-09 08:46+0000\n"
|
||||
"PO-Revision-Date: 2010-12-14 21:38+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-11 04:52+0000\n"
|
||||
"X-Launchpad-Export-Date: 2010-12-15 04:54+0000\n"
|
||||
"X-Generator: Launchpad (build Unknown)\n"
|
||||
|
||||
#. module: account
|
||||
|
@ -1073,6 +1073,11 @@ msgstr "Woche eines Jahres"
|
|||
msgid "Landscape Mode"
|
||||
msgstr "Überblick"
|
||||
|
||||
#. module: account
|
||||
#: model:account.account.type,name:account.account_type_liability
|
||||
msgid "Bilanzkonten - Passiva - Kapitalkonten"
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: view:board.board:0
|
||||
msgid "Customer Invoices to Approve"
|
||||
|
@ -2031,7 +2036,7 @@ msgstr "Bearbeite Buchungen"
|
|||
#. module: account
|
||||
#: model:ir.actions.act_window,help:account.action_invoice_tree4
|
||||
msgid ""
|
||||
"A supplier refund is a credit note from your supplier indicating that he "
|
||||
"A vendor refund is a credit note from your supplier indicating that he "
|
||||
"refunds part or totality of the invoice sent to you."
|
||||
msgstr ""
|
||||
"Eine Gutschrift ist ein Beleg von Ihrem Lieferanten, der einen Teil oder "
|
||||
|
@ -2796,6 +2801,11 @@ msgstr ""
|
|||
msgid "Base Code Amount"
|
||||
msgstr "Steuergrundlage Betrag"
|
||||
|
||||
#. module: account
|
||||
#: model:account.account.type,name:account.account_type_view
|
||||
msgid "Ansicht"
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: field:wizard.multi.charts.accounts,sale_tax:0
|
||||
msgid "Default Sale Tax"
|
||||
|
|
|
@ -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-11 04:52+0000\n"
|
||||
"X-Launchpad-Export-Date: 2010-12-15 04:55+0000\n"
|
||||
"X-Generator: Launchpad (build Unknown)\n"
|
||||
|
||||
#. module: account
|
||||
|
@ -1032,6 +1032,11 @@ msgstr "Εβδομάδα Έτους"
|
|||
msgid "Landscape Mode"
|
||||
msgstr "Προβολή Τοπίου"
|
||||
|
||||
#. module: account
|
||||
#: model:account.account.type,name:account.account_type_liability
|
||||
msgid "Bilanzkonten - Passiva - Kapitalkonten"
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: view:board.board:0
|
||||
msgid "Customer Invoices to Approve"
|
||||
|
@ -1965,7 +1970,7 @@ msgstr "Ανοικτές Εγγραφές"
|
|||
#. module: account
|
||||
#: model:ir.actions.act_window,help:account.action_invoice_tree4
|
||||
msgid ""
|
||||
"A supplier refund is a credit note from your supplier indicating that he "
|
||||
"A vendor refund is a credit note from your supplier indicating that he "
|
||||
"refunds part or totality of the invoice sent to you."
|
||||
msgstr ""
|
||||
|
||||
|
@ -2694,6 +2699,11 @@ msgstr ""
|
|||
msgid "Base Code Amount"
|
||||
msgstr "Ποσό Βασικού Κώδικα"
|
||||
|
||||
#. module: account
|
||||
#: model:account.account.type,name:account.account_type_view
|
||||
msgid "Ansicht"
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: field:wizard.multi.charts.accounts,sale_tax:0
|
||||
msgid "Default Sale Tax"
|
||||
|
|
|
@ -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-09 10:21+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-11 04:56+0000\n"
|
||||
"X-Launchpad-Export-Date: 2010-12-16 04:45+0000\n"
|
||||
"X-Generator: Launchpad (build Unknown)\n"
|
||||
|
||||
#. module: account
|
||||
|
@ -1057,6 +1057,11 @@ msgstr "Semana del año"
|
|||
msgid "Landscape Mode"
|
||||
msgstr "Modo horizontal"
|
||||
|
||||
#. module: account
|
||||
#: model:account.account.type,name:account.account_type_liability
|
||||
msgid "Bilanzkonten - Passiva - Kapitalkonten"
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: view:board.board:0
|
||||
msgid "Customer Invoices to Approve"
|
||||
|
@ -2011,7 +2016,7 @@ msgstr "Abrir asientos"
|
|||
#. module: account
|
||||
#: model:ir.actions.act_window,help:account.action_invoice_tree4
|
||||
msgid ""
|
||||
"A supplier refund is a credit note from your supplier indicating that he "
|
||||
"A vendor refund is a credit note from your supplier indicating that he "
|
||||
"refunds part or totality of the invoice sent to you."
|
||||
msgstr ""
|
||||
"Un abono de proveedor de es una factura rectificativa de su proveedor "
|
||||
|
@ -2761,6 +2766,11 @@ msgstr ""
|
|||
msgid "Base Code Amount"
|
||||
msgstr "Importe código base"
|
||||
|
||||
#. module: account
|
||||
#: model:account.account.type,name:account.account_type_view
|
||||
msgid "Ansicht"
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: field:wizard.multi.charts.accounts,sale_tax:0
|
||||
msgid "Default Sale Tax"
|
||||
|
@ -11364,3 +11374,10 @@ msgstr "¡No puede eliminar una cuenta que contiene asientos contables! "
|
|||
|
||||
#~ msgid "Low Level"
|
||||
#~ msgstr "Nivel inferior"
|
||||
|
||||
#~ msgid ""
|
||||
#~ "A supplier refund is a credit note from your supplier indicating that he "
|
||||
#~ "refunds part or totality of the invoice sent to you."
|
||||
#~ msgstr ""
|
||||
#~ "Un abono de proveedor de es una factura rectificativa de su proveedor "
|
||||
#~ "indicando que le abona parte o totalmente la factura que le fue enviada."
|
||||
|
|
|
@ -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-11 04:58+0000\n"
|
||||
"X-Launchpad-Export-Date: 2010-12-15 05:01+0000\n"
|
||||
"X-Generator: Launchpad (build Unknown)\n"
|
||||
|
||||
#. module: account
|
||||
|
|
|
@ -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-11 04:59+0000\n"
|
||||
"X-Launchpad-Export-Date: 2010-12-15 05:01+0000\n"
|
||||
"X-Generator: Launchpad (build Unknown)\n"
|
||||
|
||||
#. module: account
|
||||
|
@ -1026,6 +1026,11 @@ msgstr "Semana del Año"
|
|||
msgid "Landscape Mode"
|
||||
msgstr "Modo horizontal"
|
||||
|
||||
#. module: account
|
||||
#: model:account.account.type,name:account.account_type_liability
|
||||
msgid "Bilanzkonten - Passiva - Kapitalkonten"
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: view:board.board:0
|
||||
msgid "Customer Invoices to Approve"
|
||||
|
@ -1953,7 +1958,7 @@ msgstr "Abrir Entradas"
|
|||
#. module: account
|
||||
#: model:ir.actions.act_window,help:account.action_invoice_tree4
|
||||
msgid ""
|
||||
"A supplier refund is a credit note from your supplier indicating that he "
|
||||
"A vendor refund is a credit note from your supplier indicating that he "
|
||||
"refunds part or totality of the invoice sent to you."
|
||||
msgstr ""
|
||||
|
||||
|
@ -2679,6 +2684,11 @@ msgstr ""
|
|||
msgid "Base Code Amount"
|
||||
msgstr "Importe código base"
|
||||
|
||||
#. module: account
|
||||
#: model:account.account.type,name:account.account_type_view
|
||||
msgid "Ansicht"
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: field:wizard.multi.charts.accounts,sale_tax:0
|
||||
msgid "Default Sale Tax"
|
||||
|
|
|
@ -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-12 04:41+0000\n"
|
||||
"X-Launchpad-Export-Date: 2010-12-15 04:54+0000\n"
|
||||
"X-Generator: Launchpad (build Unknown)\n"
|
||||
|
||||
#. module: account
|
||||
|
|
|
@ -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-11 04:50+0000\n"
|
||||
"X-Launchpad-Export-Date: 2010-12-15 04:53+0000\n"
|
||||
"X-Generator: Launchpad (build Unknown)\n"
|
||||
|
||||
#. module: account
|
||||
|
|
|
@ -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-11 04:54+0000\n"
|
||||
"X-Launchpad-Export-Date: 2010-12-15 04:57+0000\n"
|
||||
"X-Generator: Launchpad (build Unknown)\n"
|
||||
|
||||
#. module: account
|
||||
|
|
|
@ -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-12 04:41+0000\n"
|
||||
"X-Launchpad-Export-Date: 2010-12-15 04:54+0000\n"
|
||||
"X-Generator: Launchpad (build Unknown)\n"
|
||||
|
||||
#. module: account
|
||||
|
|
File diff suppressed because it is too large
Load Diff
|
@ -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-12 04:42+0000\n"
|
||||
"X-Launchpad-Export-Date: 2010-12-15 04:55+0000\n"
|
||||
"X-Generator: Launchpad (build Unknown)\n"
|
||||
|
||||
#. module: account
|
||||
|
|
|
@ -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-11 04:52+0000\n"
|
||||
"X-Launchpad-Export-Date: 2010-12-15 04:55+0000\n"
|
||||
"X-Generator: Launchpad (build Unknown)\n"
|
||||
|
||||
#. module: account
|
||||
|
|
|
@ -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-12 04:42+0000\n"
|
||||
"X-Launchpad-Export-Date: 2010-12-15 04:55+0000\n"
|
||||
"X-Generator: Launchpad (build Unknown)\n"
|
||||
|
||||
#. module: account
|
||||
|
|
|
@ -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-11 04:53+0000\n"
|
||||
"X-Launchpad-Export-Date: 2010-12-15 04:55+0000\n"
|
||||
"X-Generator: Launchpad (build Unknown)\n"
|
||||
|
||||
#. module: account
|
||||
|
@ -1010,6 +1010,11 @@ msgstr ""
|
|||
msgid "Landscape Mode"
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: model:account.account.type,name:account.account_type_liability
|
||||
msgid "Bilanzkonten - Passiva - Kapitalkonten"
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: view:board.board:0
|
||||
msgid "Customer Invoices to Approve"
|
||||
|
@ -1935,7 +1940,7 @@ msgstr ""
|
|||
#. module: account
|
||||
#: model:ir.actions.act_window,help:account.action_invoice_tree4
|
||||
msgid ""
|
||||
"A supplier refund is a credit note from your supplier indicating that he "
|
||||
"A vendor refund is a credit note from your supplier indicating that he "
|
||||
"refunds part or totality of the invoice sent to you."
|
||||
msgstr ""
|
||||
|
||||
|
@ -2652,6 +2657,11 @@ msgstr ""
|
|||
msgid "Base Code Amount"
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: model:account.account.type,name:account.account_type_view
|
||||
msgid "Ansicht"
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: field:wizard.multi.charts.accounts,sale_tax:0
|
||||
msgid "Default Sale Tax"
|
||||
|
|
|
@ -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-12 04:43+0000\n"
|
||||
"X-Launchpad-Export-Date: 2010-12-15 04:58+0000\n"
|
||||
"X-Generator: Launchpad (build Unknown)\n"
|
||||
|
||||
#. module: account
|
||||
|
|
|
@ -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-11 04:53+0000\n"
|
||||
"X-Launchpad-Export-Date: 2010-12-15 04:55+0000\n"
|
||||
"X-Generator: Launchpad (build Unknown)\n"
|
||||
|
||||
#. module: account
|
||||
|
@ -1009,6 +1009,11 @@ msgstr ""
|
|||
msgid "Landscape Mode"
|
||||
msgstr "Fekvő mód"
|
||||
|
||||
#. module: account
|
||||
#: model:account.account.type,name:account.account_type_liability
|
||||
msgid "Bilanzkonten - Passiva - Kapitalkonten"
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: view:board.board:0
|
||||
msgid "Customer Invoices to Approve"
|
||||
|
@ -1934,7 +1939,7 @@ msgstr ""
|
|||
#. module: account
|
||||
#: model:ir.actions.act_window,help:account.action_invoice_tree4
|
||||
msgid ""
|
||||
"A supplier refund is a credit note from your supplier indicating that he "
|
||||
"A vendor refund is a credit note from your supplier indicating that he "
|
||||
"refunds part or totality of the invoice sent to you."
|
||||
msgstr ""
|
||||
|
||||
|
@ -2651,6 +2656,11 @@ msgstr ""
|
|||
msgid "Base Code Amount"
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: model:account.account.type,name:account.account_type_view
|
||||
msgid "Ansicht"
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: field:wizard.multi.charts.accounts,sale_tax:0
|
||||
msgid "Default Sale Tax"
|
||||
|
|
|
@ -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-12 04:42+0000\n"
|
||||
"X-Launchpad-Export-Date: 2010-12-15 04:55+0000\n"
|
||||
"X-Generator: Launchpad (build Unknown)\n"
|
||||
|
||||
#. module: account
|
||||
|
|
|
@ -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-02 09:18+0000\n"
|
||||
"Last-Translator: OpenERP Administrators <Unknown>\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-11 04:53+0000\n"
|
||||
"X-Launchpad-Export-Date: 2010-12-16 04:45+0000\n"
|
||||
"X-Generator: Launchpad (build Unknown)\n"
|
||||
|
||||
#. module: account
|
||||
|
@ -1062,6 +1062,11 @@ msgstr "Settimana dell'anno"
|
|||
msgid "Landscape Mode"
|
||||
msgstr "Modalità Orizzontale"
|
||||
|
||||
#. module: account
|
||||
#: model:account.account.type,name:account.account_type_liability
|
||||
msgid "Bilanzkonten - Passiva - Kapitalkonten"
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: view:board.board:0
|
||||
msgid "Customer Invoices to Approve"
|
||||
|
@ -2012,7 +2017,7 @@ msgstr "Apri registrazioni"
|
|||
#. module: account
|
||||
#: model:ir.actions.act_window,help:account.action_invoice_tree4
|
||||
msgid ""
|
||||
"A supplier refund is a credit note from your supplier indicating that he "
|
||||
"A vendor refund is a credit note from your supplier indicating that he "
|
||||
"refunds part or totality of the invoice sent to you."
|
||||
msgstr ""
|
||||
"Il rimborso da un fornitore consiste in una nota di credito che indica che "
|
||||
|
@ -2759,6 +2764,11 @@ msgstr ""
|
|||
msgid "Base Code Amount"
|
||||
msgstr "Importo codice base"
|
||||
|
||||
#. module: account
|
||||
#: model:account.account.type,name:account.account_type_view
|
||||
msgid "Ansicht"
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: field:wizard.multi.charts.accounts,sale_tax:0
|
||||
msgid "Default Sale Tax"
|
||||
|
@ -10553,3 +10563,10 @@ msgstr ""
|
|||
|
||||
#~ msgid "Error ! You can not create recursive Menu."
|
||||
#~ msgstr "Errore! Non è possibile creare un menù ricorsivo."
|
||||
|
||||
#~ msgid ""
|
||||
#~ "A supplier refund is a credit note from your supplier indicating that he "
|
||||
#~ "refunds part or totality of the invoice sent to you."
|
||||
#~ msgstr ""
|
||||
#~ "Il rimborso da un fornitore consiste in una nota di credito che indica che "
|
||||
#~ "rimborsa in tutto od in parte una fattura che ha inviato."
|
||||
|
|
|
@ -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-11 04:53+0000\n"
|
||||
"X-Launchpad-Export-Date: 2010-12-15 04:56+0000\n"
|
||||
"X-Generator: Launchpad (build Unknown)\n"
|
||||
|
||||
#. module: account
|
||||
|
|
|
@ -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-12 04:42+0000\n"
|
||||
"X-Launchpad-Export-Date: 2010-12-15 04:56+0000\n"
|
||||
"X-Generator: Launchpad (build Unknown)\n"
|
||||
|
||||
#. module: account
|
||||
|
|
|
@ -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-12 04:42+0000\n"
|
||||
"X-Launchpad-Export-Date: 2010-12-15 04:56+0000\n"
|
||||
"X-Generator: Launchpad (build Unknown)\n"
|
||||
|
||||
#. module: account
|
||||
|
|
|
@ -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-12 04:42+0000\n"
|
||||
"X-Launchpad-Export-Date: 2010-12-15 04:56+0000\n"
|
||||
"X-Generator: Launchpad (build Unknown)\n"
|
||||
|
||||
#. module: account
|
||||
|
|
|
@ -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-12 04:43+0000\n"
|
||||
"X-Launchpad-Export-Date: 2010-12-15 04:56+0000\n"
|
||||
"X-Generator: Launchpad (build Unknown)\n"
|
||||
|
||||
#. module: account
|
||||
|
|
|
@ -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-11 04:54+0000\n"
|
||||
"X-Launchpad-Export-Date: 2010-12-15 04:57+0000\n"
|
||||
"X-Generator: Launchpad (build Unknown)\n"
|
||||
|
||||
#. module: account
|
||||
|
|
|
@ -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-04 08:55+0000\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-11 04:51+0000\n"
|
||||
"X-Launchpad-Export-Date: 2010-12-16 04:44+0000\n"
|
||||
"X-Generator: Launchpad (build Unknown)\n"
|
||||
|
||||
#. module: account
|
||||
|
@ -1043,6 +1043,11 @@ msgstr "Weeknummer"
|
|||
msgid "Landscape Mode"
|
||||
msgstr "Landschap modus"
|
||||
|
||||
#. module: account
|
||||
#: model:account.account.type,name:account.account_type_liability
|
||||
msgid "Bilanzkonten - Passiva - Kapitalkonten"
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: view:board.board:0
|
||||
msgid "Customer Invoices to Approve"
|
||||
|
@ -1988,7 +1993,7 @@ msgstr "Open boekingen"
|
|||
#. module: account
|
||||
#: model:ir.actions.act_window,help:account.action_invoice_tree4
|
||||
msgid ""
|
||||
"A supplier refund is a credit note from your supplier indicating that he "
|
||||
"A vendor refund is a credit note from your supplier indicating that he "
|
||||
"refunds part or totality of the invoice sent to you."
|
||||
msgstr ""
|
||||
|
||||
|
@ -2720,6 +2725,11 @@ msgstr ""
|
|||
msgid "Base Code Amount"
|
||||
msgstr "Basiscode bedrag"
|
||||
|
||||
#. module: account
|
||||
#: model:account.account.type,name:account.account_type_view
|
||||
msgid "Ansicht"
|
||||
msgstr "Weergave"
|
||||
|
||||
#. module: account
|
||||
#: field:wizard.multi.charts.accounts,sale_tax:0
|
||||
msgid "Default Sale Tax"
|
||||
|
|
|
@ -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-11 04:58+0000\n"
|
||||
"X-Launchpad-Export-Date: 2010-12-15 05:01+0000\n"
|
||||
"X-Generator: Launchpad (build Unknown)\n"
|
||||
|
||||
#. module: account
|
||||
|
|
|
@ -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-11 04:54+0000\n"
|
||||
"X-Launchpad-Export-Date: 2010-12-15 04:57+0000\n"
|
||||
"X-Generator: Launchpad (build Unknown)\n"
|
||||
|
||||
#. module: account
|
||||
|
|
|
@ -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-11 04:55+0000\n"
|
||||
"X-Launchpad-Export-Date: 2010-12-15 04:57+0000\n"
|
||||
"X-Generator: Launchpad (build Unknown)\n"
|
||||
|
||||
#. module: account
|
||||
|
@ -1056,6 +1056,11 @@ msgstr "Tydzień roku"
|
|||
msgid "Landscape Mode"
|
||||
msgstr "Poziomo"
|
||||
|
||||
#. module: account
|
||||
#: model:account.account.type,name:account.account_type_liability
|
||||
msgid "Bilanzkonten - Passiva - Kapitalkonten"
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: view:board.board:0
|
||||
msgid "Customer Invoices to Approve"
|
||||
|
@ -1984,7 +1989,7 @@ msgstr "Zapisy otwarte"
|
|||
#. module: account
|
||||
#: model:ir.actions.act_window,help:account.action_invoice_tree4
|
||||
msgid ""
|
||||
"A supplier refund is a credit note from your supplier indicating that he "
|
||||
"A vendor refund is a credit note from your supplier indicating that he "
|
||||
"refunds part or totality of the invoice sent to you."
|
||||
msgstr ""
|
||||
|
||||
|
@ -2710,6 +2715,11 @@ msgstr ""
|
|||
msgid "Base Code Amount"
|
||||
msgstr "Kwota do rejestru podstawy"
|
||||
|
||||
#. module: account
|
||||
#: model:account.account.type,name:account.account_type_view
|
||||
msgid "Ansicht"
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: field:wizard.multi.charts.accounts,sale_tax:0
|
||||
msgid "Default Sale Tax"
|
||||
|
|
File diff suppressed because it is too large
Load Diff
|
@ -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-11 04:58+0000\n"
|
||||
"X-Launchpad-Export-Date: 2010-12-15 05:01+0000\n"
|
||||
"X-Generator: Launchpad (build Unknown)\n"
|
||||
|
||||
#. module: account
|
||||
|
@ -1042,6 +1042,11 @@ msgstr "Semana do Ano"
|
|||
msgid "Landscape Mode"
|
||||
msgstr "Modo paisagem"
|
||||
|
||||
#. module: account
|
||||
#: model:account.account.type,name:account.account_type_liability
|
||||
msgid "Bilanzkonten - Passiva - Kapitalkonten"
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: view:board.board:0
|
||||
msgid "Customer Invoices to Approve"
|
||||
|
@ -1970,7 +1975,7 @@ msgstr "Lançamentos abertos"
|
|||
#. module: account
|
||||
#: model:ir.actions.act_window,help:account.action_invoice_tree4
|
||||
msgid ""
|
||||
"A supplier refund is a credit note from your supplier indicating that he "
|
||||
"A vendor refund is a credit note from your supplier indicating that he "
|
||||
"refunds part or totality of the invoice sent to you."
|
||||
msgstr ""
|
||||
|
||||
|
@ -2695,6 +2700,11 @@ msgstr ""
|
|||
msgid "Base Code Amount"
|
||||
msgstr "Valor do código básico"
|
||||
|
||||
#. module: account
|
||||
#: model:account.account.type,name:account.account_type_view
|
||||
msgid "Ansicht"
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: field:wizard.multi.charts.accounts,sale_tax:0
|
||||
msgid "Default Sale Tax"
|
||||
|
|
|
@ -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-11 04:55+0000\n"
|
||||
"X-Launchpad-Export-Date: 2010-12-15 04:57+0000\n"
|
||||
"X-Generator: Launchpad (build Unknown)\n"
|
||||
|
||||
#. module: account
|
||||
|
@ -1022,6 +1022,11 @@ msgstr "Saptamana din an"
|
|||
msgid "Landscape Mode"
|
||||
msgstr "Mod vedere"
|
||||
|
||||
#. module: account
|
||||
#: model:account.account.type,name:account.account_type_liability
|
||||
msgid "Bilanzkonten - Passiva - Kapitalkonten"
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: view:board.board:0
|
||||
msgid "Customer Invoices to Approve"
|
||||
|
@ -1950,7 +1955,7 @@ msgstr "Înregistrări deschise"
|
|||
#. module: account
|
||||
#: model:ir.actions.act_window,help:account.action_invoice_tree4
|
||||
msgid ""
|
||||
"A supplier refund is a credit note from your supplier indicating that he "
|
||||
"A vendor refund is a credit note from your supplier indicating that he "
|
||||
"refunds part or totality of the invoice sent to you."
|
||||
msgstr ""
|
||||
|
||||
|
@ -2676,6 +2681,11 @@ msgstr ""
|
|||
msgid "Base Code Amount"
|
||||
msgstr "Suma cod bază"
|
||||
|
||||
#. module: account
|
||||
#: model:account.account.type,name:account.account_type_view
|
||||
msgid "Ansicht"
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: field:wizard.multi.charts.accounts,sale_tax:0
|
||||
msgid "Default Sale Tax"
|
||||
|
|
File diff suppressed because it is too large
Load Diff
|
@ -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-11 04:56+0000\n"
|
||||
"X-Launchpad-Export-Date: 2010-12-15 04:58+0000\n"
|
||||
"X-Generator: Launchpad (build Unknown)\n"
|
||||
|
||||
#. module: account
|
||||
|
|
|
@ -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-11 04:56+0000\n"
|
||||
"X-Launchpad-Export-Date: 2010-12-15 04:58+0000\n"
|
||||
"X-Generator: Launchpad (build Unknown)\n"
|
||||
|
||||
#. module: account
|
||||
|
@ -1010,6 +1010,11 @@ msgstr ""
|
|||
msgid "Landscape Mode"
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: model:account.account.type,name:account.account_type_liability
|
||||
msgid "Bilanzkonten - Passiva - Kapitalkonten"
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: view:board.board:0
|
||||
msgid "Customer Invoices to Approve"
|
||||
|
@ -1935,7 +1940,7 @@ msgstr ""
|
|||
#. module: account
|
||||
#: model:ir.actions.act_window,help:account.action_invoice_tree4
|
||||
msgid ""
|
||||
"A supplier refund is a credit note from your supplier indicating that he "
|
||||
"A vendor refund is a credit note from your supplier indicating that he "
|
||||
"refunds part or totality of the invoice sent to you."
|
||||
msgstr ""
|
||||
|
||||
|
@ -2652,6 +2657,11 @@ msgstr ""
|
|||
msgid "Base Code Amount"
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: model:account.account.type,name:account.account_type_view
|
||||
msgid "Ansicht"
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: field:wizard.multi.charts.accounts,sale_tax:0
|
||||
msgid "Default Sale Tax"
|
||||
|
|
|
@ -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-11 04:56+0000\n"
|
||||
"X-Launchpad-Export-Date: 2010-12-15 04:58+0000\n"
|
||||
"X-Generator: Launchpad (build Unknown)\n"
|
||||
|
||||
#. module: account
|
||||
|
|
|
@ -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-11 04:50+0000\n"
|
||||
"X-Launchpad-Export-Date: 2010-12-15 04:52+0000\n"
|
||||
"X-Generator: Launchpad (build Unknown)\n"
|
||||
|
||||
#. module: account
|
||||
|
|
|
@ -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-11 04:55+0000\n"
|
||||
"X-Launchpad-Export-Date: 2010-12-15 04:58+0000\n"
|
||||
"X-Generator: Launchpad (build Unknown)\n"
|
||||
|
||||
#. module: account
|
||||
|
|
|
@ -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-11 04:59+0000\n"
|
||||
"X-Launchpad-Export-Date: 2010-12-15 05:01+0000\n"
|
||||
"X-Generator: Launchpad (build Unknown)\n"
|
||||
|
||||
#. module: account
|
||||
|
|
|
@ -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-11 10:56+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-12 04:43+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
|
||||
|
@ -1025,6 +1028,11 @@ msgstr "Veckonummer"
|
|||
msgid "Landscape Mode"
|
||||
msgstr "Landscape Mode"
|
||||
|
||||
#. module: account
|
||||
#: model:account.account.type,name:account.account_type_liability
|
||||
msgid "Bilanzkonten - Passiva - Kapitalkonten"
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: view:board.board:0
|
||||
msgid "Customer Invoices to Approve"
|
||||
|
@ -1046,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
|
||||
|
@ -1057,12 +1065,12 @@ msgstr "Tvistig"
|
|||
#: model:ir.actions.act_window,name:account.action_view_bank_statement_tree
|
||||
#: model:ir.ui.menu,name:account.journal_cash_move_lines
|
||||
msgid "Cash Registers"
|
||||
msgstr "kassaapparat"
|
||||
msgstr "Kassaregister"
|
||||
|
||||
#. module: account
|
||||
#: selection:account.account.type,report_type:0
|
||||
msgid "Profit & Loss (Expense Accounts)"
|
||||
msgstr "Vinst och Förlust"
|
||||
msgstr "Resultaträkning (utgiftskonton)"
|
||||
|
||||
#. module: account
|
||||
#: report:account.analytic.account.journal:0
|
||||
|
@ -1080,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
|
||||
|
@ -1095,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
|
||||
|
@ -1756,7 +1764,7 @@ msgstr "Fel kredit- eller debitvärde i bokföringstransaktionerna."
|
|||
#: model:ir.actions.act_window,name:account.action_account_invoice_report_all
|
||||
#: model:ir.ui.menu,name:account.menu_action_account_invoice_report_all
|
||||
msgid "Invoices Analysis"
|
||||
msgstr ""
|
||||
msgstr "Fakturor analys"
|
||||
|
||||
#. module: account
|
||||
#: model:ir.model,name:account.model_account_period_close
|
||||
|
@ -1776,7 +1784,7 @@ msgstr "Transaktiomer per rad"
|
|||
#. module: account
|
||||
#: report:account.tax.code.entries:0
|
||||
msgid "A/c Code"
|
||||
msgstr ""
|
||||
msgstr "A/c kod"
|
||||
|
||||
#. module: account
|
||||
#: field:account.invoice,move_id:0
|
||||
|
@ -1886,7 +1894,7 @@ msgstr "Registreringsdatum måste vara i perioden om denna är markerad."
|
|||
#. module: account
|
||||
#: model:ir.actions.act_window,name:account.action_account_pl_report
|
||||
msgid "Account Profit And Loss"
|
||||
msgstr ""
|
||||
msgstr "Resultaträkning konton"
|
||||
|
||||
#. module: account
|
||||
#: field:account.installer,config_logo:0
|
||||
|
@ -1957,7 +1965,7 @@ msgstr "Open Entries"
|
|||
#. module: account
|
||||
#: model:ir.actions.act_window,help:account.action_invoice_tree4
|
||||
msgid ""
|
||||
"A supplier refund is a credit note from your supplier indicating that he "
|
||||
"A vendor refund is a credit note from your supplier indicating that he "
|
||||
"refunds part or totality of the invoice sent to you."
|
||||
msgstr ""
|
||||
|
||||
|
@ -2685,6 +2693,11 @@ msgstr ""
|
|||
msgid "Base Code Amount"
|
||||
msgstr "Baskodsbelopp"
|
||||
|
||||
#. module: account
|
||||
#: model:account.account.type,name:account.account_type_view
|
||||
msgid "Ansicht"
|
||||
msgstr "Visa"
|
||||
|
||||
#. module: account
|
||||
#: field:wizard.multi.charts.accounts,sale_tax:0
|
||||
msgid "Default Sale Tax"
|
||||
|
|
|
@ -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-11 04:56+0000\n"
|
||||
"X-Launchpad-Export-Date: 2010-12-15 04:59+0000\n"
|
||||
"X-Generator: Launchpad (build Unknown)\n"
|
||||
|
||||
#. module: account
|
||||
|
|
|
@ -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-11 04:57+0000\n"
|
||||
"X-Launchpad-Export-Date: 2010-12-15 04:59+0000\n"
|
||||
"X-Generator: Launchpad (build Unknown)\n"
|
||||
|
||||
#. module: account
|
||||
|
|
|
@ -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-11 04:57+0000\n"
|
||||
"X-Launchpad-Export-Date: 2010-12-15 04:59+0000\n"
|
||||
"X-Generator: Launchpad (build Unknown)\n"
|
||||
|
||||
#. module: account
|
||||
|
|
|
@ -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-11 04:57+0000\n"
|
||||
"X-Launchpad-Export-Date: 2010-12-15 04:59+0000\n"
|
||||
"X-Generator: Launchpad (build Unknown)\n"
|
||||
|
||||
#. module: account
|
||||
|
|
|
@ -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-11 04:57+0000\n"
|
||||
"X-Launchpad-Export-Date: 2010-12-15 05:00+0000\n"
|
||||
"X-Generator: Launchpad (build Unknown)\n"
|
||||
|
||||
#. module: account
|
||||
|
@ -1045,6 +1045,11 @@ msgstr "Yıl:Hafta"
|
|||
msgid "Landscape Mode"
|
||||
msgstr "Landscape Mode"
|
||||
|
||||
#. module: account
|
||||
#: model:account.account.type,name:account.account_type_liability
|
||||
msgid "Bilanzkonten - Passiva - Kapitalkonten"
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: view:board.board:0
|
||||
msgid "Customer Invoices to Approve"
|
||||
|
@ -1989,7 +1994,7 @@ msgstr "Open Entries"
|
|||
#. module: account
|
||||
#: model:ir.actions.act_window,help:account.action_invoice_tree4
|
||||
msgid ""
|
||||
"A supplier refund is a credit note from your supplier indicating that he "
|
||||
"A vendor refund is a credit note from your supplier indicating that he "
|
||||
"refunds part or totality of the invoice sent to you."
|
||||
msgstr ""
|
||||
|
||||
|
@ -2728,6 +2733,11 @@ msgstr ""
|
|||
msgid "Base Code Amount"
|
||||
msgstr "Base Code Amount"
|
||||
|
||||
#. module: account
|
||||
#: model:account.account.type,name:account.account_type_view
|
||||
msgid "Ansicht"
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: field:wizard.multi.charts.accounts,sale_tax:0
|
||||
msgid "Default Sale Tax"
|
||||
|
|
|
@ -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-12 04:43+0000\n"
|
||||
"X-Launchpad-Export-Date: 2010-12-15 05:00+0000\n"
|
||||
"X-Generator: Launchpad (build Unknown)\n"
|
||||
|
||||
#. module: account
|
||||
|
|
|
@ -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-11 04:58+0000\n"
|
||||
"X-Launchpad-Export-Date: 2010-12-15 05:00+0000\n"
|
||||
"X-Generator: Launchpad (build Unknown)\n"
|
||||
|
||||
#. module: account
|
||||
|
|
|
@ -8,13 +8,13 @@ msgstr ""
|
|||
"Project-Id-Version: openobject-addons\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 14:47+0000\n"
|
||||
"Last-Translator: Phong Nguyen <Unknown>\n"
|
||||
"PO-Revision-Date: 2010-12-15 02:08+0000\n"
|
||||
"Last-Translator: OpenERP Administrators <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-11 04:58+0000\n"
|
||||
"X-Launchpad-Export-Date: 2010-12-16 04:46+0000\n"
|
||||
"X-Generator: Launchpad (build Unknown)\n"
|
||||
|
||||
#. module: account
|
||||
|
@ -1059,6 +1059,11 @@ msgstr "Week of Year"
|
|||
msgid "Landscape Mode"
|
||||
msgstr "Landscape Mode"
|
||||
|
||||
#. module: account
|
||||
#: model:account.account.type,name:account.account_type_liability
|
||||
msgid "Bilanzkonten - Passiva - Kapitalkonten"
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: view:board.board:0
|
||||
msgid "Customer Invoices to Approve"
|
||||
|
@ -2009,10 +2014,10 @@ msgstr "Open Entries"
|
|||
#. module: account
|
||||
#: model:ir.actions.act_window,help:account.action_invoice_tree4
|
||||
msgid ""
|
||||
"A supplier refund is a credit note from your supplier indicating that he "
|
||||
"A vendor refund is a credit note from your supplier indicating that he "
|
||||
"refunds part or totality of the invoice sent to you."
|
||||
msgstr ""
|
||||
"A supplier refund is a credit note from your supplier indicating that he "
|
||||
"A vendor refund is a credit note from your supplier indicating that he "
|
||||
"refunds part or totality of the invoice sent to you."
|
||||
|
||||
#. module: account
|
||||
|
@ -2759,6 +2764,11 @@ msgstr ""
|
|||
msgid "Base Code Amount"
|
||||
msgstr "Base Code Amount"
|
||||
|
||||
#. module: account
|
||||
#: model:account.account.type,name:account.account_type_view
|
||||
msgid "Ansicht"
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: field:wizard.multi.charts.accounts,sale_tax:0
|
||||
msgid "Default Sale Tax"
|
||||
|
@ -6073,7 +6083,7 @@ msgstr "Centralisation"
|
|||
#: view:account.tax.code.template:0
|
||||
#: view:analytic.entries.report:0
|
||||
msgid "Group By..."
|
||||
msgstr "Group By..."
|
||||
msgstr "Nhóm theo..."
|
||||
|
||||
#. module: account
|
||||
#: field:account.journal.column,readonly:0
|
||||
|
|
|
@ -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-11 04:59+0000\n"
|
||||
"X-Launchpad-Export-Date: 2010-12-15 05:01+0000\n"
|
||||
"X-Generator: Launchpad (build Unknown)\n"
|
||||
|
||||
#. module: account
|
||||
|
@ -1009,6 +1009,11 @@ msgstr "会计年度里的周"
|
|||
msgid "Landscape Mode"
|
||||
msgstr "横向模式"
|
||||
|
||||
#. module: account
|
||||
#: model:account.account.type,name:account.account_type_liability
|
||||
msgid "Bilanzkonten - Passiva - Kapitalkonten"
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: view:board.board:0
|
||||
msgid "Customer Invoices to Approve"
|
||||
|
@ -1934,7 +1939,7 @@ msgstr "打开凭证"
|
|||
#. module: account
|
||||
#: model:ir.actions.act_window,help:account.action_invoice_tree4
|
||||
msgid ""
|
||||
"A supplier refund is a credit note from your supplier indicating that he "
|
||||
"A vendor refund is a credit note from your supplier indicating that he "
|
||||
"refunds part or totality of the invoice sent to you."
|
||||
msgstr ""
|
||||
|
||||
|
@ -2653,6 +2658,11 @@ msgstr ""
|
|||
msgid "Base Code Amount"
|
||||
msgstr "基础税事务代码的金额"
|
||||
|
||||
#. module: account
|
||||
#: model:account.account.type,name:account.account_type_view
|
||||
msgid "Ansicht"
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: field:wizard.multi.charts.accounts,sale_tax:0
|
||||
msgid "Default Sale Tax"
|
||||
|
|
|
@ -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-11 04:58+0000\n"
|
||||
"X-Launchpad-Export-Date: 2010-12-15 05:00+0000\n"
|
||||
"X-Generator: Launchpad (build Unknown)\n"
|
||||
|
||||
#. module: account
|
||||
|
|
|
@ -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-12 04:43+0000\n"
|
||||
"X-Launchpad-Export-Date: 2010-12-15 05:01+0000\n"
|
||||
"X-Generator: Launchpad (build Unknown)\n"
|
||||
|
||||
#. module: account
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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}
|
||||
|
@ -1320,9 +1321,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})
|
||||
|
@ -1352,7 +1353,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
|
||||
|
@ -1361,7 +1362,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
|
||||
|
@ -1379,8 +1380,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]
|
||||
|
@ -1435,8 +1436,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
|
||||
|
@ -1461,7 +1462,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:
|
||||
|
@ -1592,11 +1595,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
|
||||
|
||||
|
|
|
@ -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 = {
|
||||
|
|
|
@ -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]
|
||||
|
|
|
@ -94,7 +94,7 @@ class account_entries_report(osv.osv):
|
|||
return super(account_entries_report, self).search(cr, uid, args=args, offset=offset, limit=limit, order=order,
|
||||
context=context, count=count)
|
||||
|
||||
def read_group(self, cr, uid, domain, fields, groupby, offset=0, limit=None, context=None, orderby=False):
|
||||
def read_group(self, cr, uid, domain, *args, **kwargs):
|
||||
todel=[]
|
||||
fiscalyear_obj = self.pool.get('account.fiscalyear')
|
||||
period_obj = self.pool.get('account.period')
|
||||
|
@ -112,7 +112,7 @@ class account_entries_report(osv.osv):
|
|||
for a in [['period_id','in','current_year'], ['period_id','in','current_period']]:
|
||||
if a in domain:
|
||||
domain.remove(a)
|
||||
return super(account_entries_report, self).read_group(cr, uid, domain, fields, groupby, offset, limit, context, orderby)
|
||||
return super(account_entries_report, self).read_group(cr, uid, domain, *args, **kwargs)
|
||||
|
||||
def init(self, cr):
|
||||
tools.drop_view_if_exists(cr, 'account_entries_report')
|
||||
|
|
|
@ -131,32 +131,20 @@
|
|||
</stylesheet>
|
||||
<story>
|
||||
<pto>
|
||||
<pto_header>
|
||||
<blockTable colWidths="202.0,87.0,71.0,57.0,42.0,71.0" style="Table7">
|
||||
<tr>
|
||||
<td>
|
||||
<para style="terp_tblheader_Details">Description</para>
|
||||
</td>
|
||||
<td>
|
||||
<para style="terp_tblheader_Details_Centre">Taxes</para>
|
||||
</td>
|
||||
<td>
|
||||
<para style="terp_tblheader_Details_Centre">Quantity</para>
|
||||
</td>
|
||||
<td>
|
||||
<para style="terp_tblheader_Details_Right">Unit Price </para>
|
||||
</td>
|
||||
<td>
|
||||
<para style="terp_tblheader_Details_Right">Disc.(%)</para>
|
||||
</td>
|
||||
<td>
|
||||
<para style="terp_tblheader_Details_Right">Price</para>
|
||||
</td>
|
||||
</tr>
|
||||
</blockTable>
|
||||
</pto_header>
|
||||
<para style="terp_default_8">[[ repeatIn(objects,'o') ]]</para>
|
||||
<para style="terp_default_8">[[ setLang(o.partner_id.lang) ]]</para>
|
||||
<pto_header><!-- Must be after setLang() -->
|
||||
<blockTable colWidths="202.0,87.0,71.0,57.0,42.0,71.0" style="Table7">
|
||||
<tr>
|
||||
<td> <para style="terp_tblheader_Details">Description</para> </td>
|
||||
<td> <para style="terp_tblheader_Details_Centre">Taxes</para> </td>
|
||||
<td> <para style="terp_tblheader_Details_Centre">Quantity</para> </td>
|
||||
<td> <para style="terp_tblheader_Details_Right">Unit Price </para> </td>
|
||||
<td> <para style="terp_tblheader_Details_Right">Disc.(%)</para> </td>
|
||||
<td> <para style="terp_tblheader_Details_Right">Price</para> </td>
|
||||
</tr>
|
||||
</blockTable>
|
||||
</pto_header>
|
||||
<blockTable colWidths="297.0,233.0" style="Table_Partner_Address">
|
||||
<tr>
|
||||
<td>
|
||||
|
|
|
@ -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' \
|
||||
|
|
|
@ -4,6 +4,7 @@
|
|||
"access_account_payment_term_line","account.payment.term.line","model_account_payment_term_line","account.group_account_user",1,0,0,0
|
||||
"access_account_account_type","account.account.type","model_account_account_type","account.group_account_user",1,0,0,0
|
||||
"access_account_tax","account.tax","model_account_tax","account.group_account_user",1,0,0,0
|
||||
"access_account_tax_internal_user","account.tax internal user","model_account_tax","base.group_user",1,0,0,0
|
||||
"access_account_account","account.account","model_account_account","account.group_account_user",1,0,0,0
|
||||
"access_account_account_user","account.account user","model_account_account","base.group_user",1,0,0,0
|
||||
"access_account_account_partner_manager","account.account partner manager","model_account_account","base.group_partner_manager",1,0,0,0
|
||||
|
|
|
|
@ -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(
|
||||
|
|
|
@ -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:
|
||||
|
|
|
@ -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']:
|
||||
|
|
|
@ -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'],))
|
||||
|
|
|
@ -49,7 +49,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
|
||||
"""
|
||||
|
@ -150,8 +150,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
|
||||
|
|
|
@ -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,
|
||||
|
|
|
@ -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:
|
||||
|
|
|
@ -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'],
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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')
|
||||
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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()
|
||||
|
|
|
@ -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)
|
||||
|
|
|
@ -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()
|
||||
|
|
|
@ -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()
|
||||
|
|
|
@ -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=[]
|
||||
|
|
|
@ -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()
|
||||
|
|
|
@ -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)
|
||||
|
|
|
@ -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()
|
||||
|
|
|
@ -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"
|
||||
|
|
|
@ -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-11 05:08+0000\n"
|
||||
"X-Launchpad-Export-Date: 2010-12-15 05:20+0000\n"
|
||||
"X-Generator: Launchpad (build Unknown)\n"
|
||||
|
||||
#. module: account_accountant
|
||||
|
|
|
@ -15,7 +15,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-11 05:08+0000\n"
|
||||
"X-Launchpad-Export-Date: 2010-12-15 05:20+0000\n"
|
||||
"X-Generator: Launchpad (build Unknown)\n"
|
||||
|
||||
#. module: account_accountant
|
||||
|
|
|
@ -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-11 05:08+0000\n"
|
||||
"X-Launchpad-Export-Date: 2010-12-15 05:20+0000\n"
|
||||
"X-Generator: Launchpad (build Unknown)\n"
|
||||
|
||||
#. module: account_accountant
|
||||
|
|
|
@ -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-11 05:08+0000\n"
|
||||
"X-Launchpad-Export-Date: 2010-12-15 05:20+0000\n"
|
||||
"X-Generator: Launchpad (build Unknown)\n"
|
||||
|
||||
#. module: account_accountant
|
||||
|
|
|
@ -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-11 05:08+0000\n"
|
||||
"X-Launchpad-Export-Date: 2010-12-15 05:20+0000\n"
|
||||
"X-Generator: Launchpad (build Unknown)\n"
|
||||
|
||||
#. module: account_accountant
|
||||
|
|
|
@ -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-11 05:08+0000\n"
|
||||
"X-Launchpad-Export-Date: 2010-12-15 05:20+0000\n"
|
||||
"X-Generator: Launchpad (build Unknown)\n"
|
||||
|
||||
#. module: account_accountant
|
||||
|
|
|
@ -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-11 05:08+0000\n"
|
||||
"X-Launchpad-Export-Date: 2010-12-15 05:20+0000\n"
|
||||
"X-Generator: Launchpad (build Unknown)\n"
|
||||
|
||||
#. module: account_accountant
|
||||
|
|
|
@ -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-11 05:08+0000\n"
|
||||
"X-Launchpad-Export-Date: 2010-12-15 05:20+0000\n"
|
||||
"X-Generator: Launchpad (build Unknown)\n"
|
||||
|
||||
#. module: account_accountant
|
||||
|
|
|
@ -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-11 05:08+0000\n"
|
||||
"X-Launchpad-Export-Date: 2010-12-15 05:20+0000\n"
|
||||
"X-Generator: Launchpad (build Unknown)\n"
|
||||
|
||||
#. module: account_accountant
|
||||
|
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue