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

trunk merge

Browse Source 
bzr revid: aag@tinyerp.co.in-20101014080103-58ysx9lo20h9kogo
This commit is contained in:
aag (OpenERP)
2010-10-14 13:31:03 +05:30
parent 7b2e3875b1 b7a6164e75
commit fabe3674a7
4238 changed files with 121594 additions and 29378 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/account/__openerp__.py
+5 -6
View File
@@ -32,7 +32,7 @@
Customer and Supplier Invoices
Bank statements
Reconciliation process by partner
Creates a dashboards for accountants that includes:
Creates a dashboard for accountants that includes:
* List of uninvoiced quotations
* Graph of aged receivables
* Graph of aged incomes
@@ -49,6 +49,10 @@ module named account_voucher.
'security/ir.model.access.csv',
'account_menuitem.xml',
'account_wizard.xml',
'report/account_invoice_report_view.xml',
'report/account_entries_report_view.xml',
'report/account_report_view.xml',
'report/account_analytic_entries_report_view.xml',
'wizard/account_move_bank_reconcile_view.xml',
'wizard/account_use_model_view.xml',
'account_installer.xml',
@@ -106,10 +110,6 @@ module named account_voucher.
'process/supplier_invoice_process.xml',
'sequence_view.xml',
'company_view.xml',
'report/account_invoice_report_view.xml',
'report/account_entries_report_view.xml',
'report/account_report_view.xml',
'report/account_analytic_entries_report_view.xml',
'board_account_view.xml',
"wizard/account_report_profit_loss_view.xml",
"wizard/account_report_balance_sheet_view.xml"
@@ -120,7 +120,6 @@ module named account_voucher.
'project/analytic_account_demo.xml',
'demo/account_minimal.xml',
'account_unit_test.xml',
'board_account_demo.xml',
],
'test': [
'test/account_customer_invoice.yml',
addons/account/account.py
+154 -146
View File
@@ -25,12 +25,9 @@ from dateutil.relativedelta import relativedelta
from operator import itemgetter
import netsvc
import pooler
from osv import fields, osv
import decimal_precision as dp
from tools.misc import currency
from tools.translate import _
from tools import config
def check_cycle(self, cr, uid, ids):
""" climbs the ``self._table.parent_id`` chains for 100 levels or
@@ -71,8 +68,9 @@ class account_payment_term(osv.osv):
pt = self.browse(cr, uid, id, context=context)
amount = value
result = []
obj_precision = self.pool.get('decimal.precision')
for line in pt.line_ids:
prec = self.pool.get('decimal.precision').precision_get(cr, uid, 'Account')
prec = obj_precision.precision_get(cr, uid, 'Account')
if line.value == 'fixed':
amt = round(line.value_amount, prec)
elif line.value == 'procent':
@@ -156,7 +154,7 @@ class account_account_type(osv.osv):
('expense','Profit & Loss (Expense Accounts)'),
('asset','Balance Sheet (Assets Accounts)'),
('liability','Balance Sheet (Liability Accounts)')
],'Type Heads', select=True, readonly=False, help="According value related accounts will be display on respective reports (Balance Sheet Profit & Loss Account)", required=True),
],'P&L / BS Category', select=True, readonly=False, help="According value related accounts will be display on respective reports (Balance Sheet Profit & Loss Account)", required=True),
'note': fields.text('Description'),
}
_defaults = {
@@ -280,7 +278,7 @@ class account_account(osv.osv):
# ON l.account_id = tmp.id
# or make _get_children_and_consol return a query and join on that
request = ("SELECT l.account_id as id, " +\
' , '.join(map(mapping.__getitem__, field_names)) +
', '.join(map(mapping.__getitem__, field_names)) +
" FROM account_move_line l" \
" WHERE l.account_id IN %s " \
+ filters +
@@ -345,7 +343,7 @@ class account_account(osv.osv):
accounts = self.browse(cr, uid, ids)
for account in accounts:
level = 0
if account.parent_id :
if account.parent_id:
obj = self.browse(cr, uid, account.parent_id.id)
level = obj.level + 1
res[account.id] = level
@@ -465,7 +463,7 @@ class account_account(osv.osv):
return self.name_get(cr, user, ids, context=context)
def name_get(self, cr, uid, ids, context=None):
if not len(ids):
if not ids:
return []
reads = self.read(cr, uid, ids, ['name', 'code'], context=context)
res = []
@@ -624,7 +622,6 @@ class account_journal(osv.osv):
}
def write(self, cr, uid, ids, vals, context=None):
obj=[]
if 'company_id' in vals:
move_lines = self.pool.get('account.move.line').search(cr, uid, [('journal_id', 'in', ids)])
if move_lines:
@@ -640,20 +637,9 @@ class account_journal(osv.osv):
@param context: context arguments, like lang, time zone
@return: return a result
"""
journal_type = ('sale', 'sale_refund', 'purchase', 'purchase_refund')
journal_seq = {
'sale':'seq_out_invoice',
'purchase':'seq_in_invoice',
'purchase_refund':'seq_out_refund',
'sale_refund':'seq_in_refund'
}
seq_pool = self.pool.get('ir.sequence')
seq_typ_pool = self.pool.get('ir.sequence.type')
date_pool = self.pool.get('ir.model.data')
result = True
name = vals['name']
code = vals['code'].lower()
@@ -661,7 +647,7 @@ class account_journal(osv.osv):
'name': name,
'code': code
}
type_id = seq_typ_pool.create(cr, uid, types)
seq_typ_pool.create(cr, uid, types)
seq = {
'name': name,
@@ -675,13 +661,13 @@ class account_journal(osv.osv):
def create(self, cr, uid, vals, context=None):
if not 'sequence_id' in vals or not vals['sequence_id']:
vals.update({'sequence_id' : self.create_sequence(cr, uid, vals, context)})
vals.update({'sequence_id': self.create_sequence(cr, uid, vals, context)})
return super(account_journal, self).create(cr, uid, vals, context)
def name_get(self, cr, user, ids, context=None):
"""
Returns a list of tupples containing id, name.
result format : {[(id, name), (id, name), ...]}
result format: {[(id, name), (id, name), ...]}
@param cr: A database cursor
@param user: ID of the user currently logged in
@@ -715,7 +701,7 @@ class account_journal(osv.osv):
return self.name_get(cr, user, ids, context=context)
def onchange_type(self, cr, uid, ids, type, currency):
data_pool = self.pool.get('ir.model.data')
obj_data = self.pool.get('ir.model.data')
user_pool = self.pool.get('res.users')
type_map = {
@@ -737,8 +723,8 @@ class account_journal(osv.osv):
if type in ('cash', 'bank') and currency and user.company_id.currency_id.id != currency:
view_id = 'account_journal_bank_view_multi'
data_id = data_pool.search(cr, uid, [('model','=','account.journal.view'), ('name','=',view_id)])
data = data_pool.browse(cr, uid, data_id[0])
data_id = obj_data.search(cr, uid, [('model','=','account.journal.view'), ('name','=',view_id)])
data = obj_data.browse(cr, uid, data_id[0])
res.update({
'centralisation':type == 'situation',
@@ -852,7 +838,7 @@ class account_period(osv.osv):
'date_start': fields.date('Start of Period', required=True, states={'done':[('readonly',True)]}),
'date_stop': fields.date('End of Period', required=True, states={'done':[('readonly',True)]}),
'fiscalyear_id': fields.many2one('account.fiscalyear', 'Fiscal Year', required=True, states={'done':[('readonly',True)]}, select=True),
'state': fields.selection([('draft','Draft'), ('done','Done')], 'State', readonly=True,
'state': fields.selection([('draft','Open'), ('done','Closed')], 'State', readonly=True,
help='When monthly periods are created. The state is \'Draft\'. At the end of monthly period it is in \'Done\' state.'),
'company_id': fields.related('fiscalyear_id', 'company_id', type='many2one', relation='res.company', string='Company', store=True, readonly=True)
}
@@ -924,13 +910,25 @@ class account_period(osv.osv):
return self.name_get(cr, user, ids, context=context)
def write(self, cr, uid, ids, vals, context={}):
obj=[]
if 'company_id' in vals:
move_lines = self.pool.get('account.move.line').search(cr, uid, [('period_id', 'in', ids)])
if move_lines:
raise osv.except_osv(_('Warning !'), _('You cannot modify company of this period as its related record exist in Entry Lines'))
return super(account_period, self).write(cr, uid, ids, vals, context=context)
def build_ctx_periods(self, cr, uid, period_from_id, period_to_id):
period_from = self.browse(cr, uid, period_from_id)
period_date_start = period_from.date_start
company1_id = period_from.company_id.id
period_to = self.browse(cr, uid, period_to_id)
period_date_stop = period_to.date_stop
company2_id = period_to.company_id.id
if company1_id != company2_id:
raise osv.except_osv(_('Error'), _('You should have chosen periods that belongs to the same company'))
if period_date_start > period_date_stop:
raise osv.except_osv(_('Error'), _('Start period should be smaller then End period'))
return self.search(cr, uid, [('date_start', '>=', period_date_start), ('date_stop', '<=', period_date_stop), ('company_id', '=', company1_id)])
account_period()
class account_journal_period(osv.osv):
@@ -1016,7 +1014,7 @@ class account_move(osv.osv):
def name_search(self, cr, user, name, args=None, operator='ilike', context=None, limit=80):
"""
Returns a list of tupples containing id, name, as internally it is called {def name_get}
result format : {[(id, name), (id, name), ...]}
result format: {[(id, name), (id, name), ...]}
@param cr: A database cursor
@param user: ID of the user currently logged in
@@ -1046,7 +1044,9 @@ class account_move(osv.osv):
return self.name_get(cr, user, ids, context=context)
def name_get(self, cursor, user, ids, context=None):
if not len(ids):
if isinstance(ids, (int, long)):
ids = [ids]
if not ids:
return []
res = []
data_move = self.pool.get('account.move').browse(cursor,user,ids)
@@ -1088,7 +1088,7 @@ class account_move(osv.osv):
if cond[1] in ['=like', 'like', 'not like', 'ilike', 'not ilike', 'in', 'not in', 'child_of']:
continue
cr.execute("select move_id from account_move_line group by move_id having sum(debit) %s %%s" % (cond[1]) ,(amount,))
cr.execute("select move_id from account_move_line group by move_id having sum(debit) %s %%s" % (cond[1]),(amount,))
res_ids = set(id[0] for id in cr.fetchall())
ids = ids and (ids & res_ids) or res_ids
if ids:
@@ -1149,32 +1149,36 @@ class account_move(osv.osv):
]
def post(self, cr, uid, ids, context=None):
if context is None:
context = {}
invoice = context.get('invoice', False)
valid_moves = self.validate(cr, uid, ids, context)
if valid_moves:
for move in self.browse(cr, uid, valid_moves):
if move.name =='/':
new_name = False
journal = move.journal_id
if invoice and invoice.internal_number:
new_name = invoice.internal_number
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):
if move.name =='/':
new_name = False
journal = move.journal_id
if invoice and invoice.internal_number:
new_name = invoice.internal_number
else:
if journal.sequence_id:
c = {'fiscalyear_id': move.period_id.fiscalyear_id.id}
new_name = obj_sequence.get_id(cr, uid, journal.sequence_id.id, context=c)
else:
if journal.sequence_id:
c = {'fiscalyear_id': move.period_id.fiscalyear_id.id}
new_name = self.pool.get('ir.sequence').get_id(cr, uid, journal.sequence_id.id, context=c)
else:
raise osv.except_osv(_('Error'), _('No sequence defined in the journal !'))
raise osv.except_osv(_('Error'), _('No sequence defined on the journal !'))
if new_name:
self.write(cr, uid, [move.id], {'name':new_name})
if new_name:
self.write(cr, uid, [move.id], {'name':new_name})
cr.execute('UPDATE account_move '\
'SET state=%s '\
'WHERE id IN %s',
('posted', tuple(valid_moves),))
cr.execute('UPDATE account_move '\
'SET state=%s '\
'WHERE id IN %s',
('posted', tuple(valid_moves),))
else:
raise osv.except_osv(_('Integrity Error !'), _('You can not validate a non-balanced entry !\nMake sure you have configured Payment Term properly !\nIt should contain atleast one Payment Term Line with type "Balance" !'))
return True
def button_validate(self, cursor, user, ids, context=None):
@@ -1195,7 +1199,7 @@ class account_move(osv.osv):
for line in self.browse(cr, uid, ids, 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 len(ids):
if ids:
cr.execute('UPDATE account_move '\
'SET state=%s '\
'WHERE id IN %s', ('draft', tuple(ids),))
@@ -1263,6 +1267,7 @@ class account_move(osv.osv):
def unlink(self, cr, uid, ids, context={}, check=True):
toremove = []
obj_move_line = self.pool.get('account.move.line')
for move in self.browse(cr, uid, ids, context):
if move['state'] != 'draft':
raise osv.except_osv(_('UserError'),
@@ -1271,8 +1276,8 @@ class account_move(osv.osv):
line_ids = map(lambda x: x.id, move.line_id)
context['journal_id'] = move.journal_id.id
context['period_id'] = move.period_id.id
self.pool.get('account.move.line')._update_check(cr, uid, line_ids, context)
self.pool.get('account.move.line').unlink(cr, uid, line_ids, context=context)
obj_move_line._update_check(cr, uid, line_ids, context)
obj_move_line.unlink(cr, uid, line_ids, context=context)
toremove.append(move.id)
result = super(account_move, self).unlink(cr, uid, toremove, context)
return result
@@ -1346,12 +1351,13 @@ class account_move(osv.osv):
del context['__last_update']
valid_moves = [] #Maintains a list of moves which can be responsible to create analytic entries
obj_analytic_line = self.pool.get('account.analytic.line')
obj_move_line = self.pool.get('account.move.line')
for move in self.browse(cr, uid, ids, context):
# Unlink old analytic lines on move_lines
for obj_line in move.line_id:
for obj in obj_line.analytic_lines:
self.pool.get('account.analytic.line').unlink(cr,uid,obj.id)
obj_analytic_line.unlink(cr,uid,obj.id)
journal = move.journal_id
amount = 0
@@ -1381,11 +1387,11 @@ class account_move(osv.osv):
# Check whether the move lines are confirmed
if not len(line_draft_ids):
if not line_draft_ids:
continue
# Update the move lines (set them as valid)
self.pool.get('account.move.line').write(cr, uid, line_draft_ids, {
obj_move_line.write(cr, uid, line_draft_ids, {
'journal_id': move.journal_id.id,
'period_id': move.period_id.id,
'state': 'valid'
@@ -1405,7 +1411,7 @@ class account_move(osv.osv):
code = account[line.account_id.id][0]
amount = account[line.account_id.id][1] * (line.debit + line.credit)
if (code or amount) and not (line.tax_code_id or line.tax_amount):
self.pool.get('account.move.line').write(cr, uid, [line.id], {
obj_move_line.write(cr, uid, [line.id], {
'tax_code_id': code,
'tax_amount': amount
}, context, check=False)
@@ -1421,20 +1427,20 @@ class account_move(osv.osv):
#
self._centralise(cr, uid, move, 'debit', context=context)
self._centralise(cr, uid, move, 'credit', context=context)
self.pool.get('account.move.line').write(cr, uid, line_draft_ids, {
obj_move_line.write(cr, uid, line_draft_ids, {
'state': 'valid'
}, context, check=False)
else:
# We can't validate it (it's unbalanced)
# Setting the lines as draft
self.pool.get('account.move.line').write(cr, uid, line_ids, {
obj_move_line.write(cr, uid, line_ids, {
'journal_id': move.journal_id.id,
'period_id': move.period_id.id,
'state': 'draft'
}, context, check=False)
# Create analytic lines for the valid moves
for record in valid_moves:
self.pool.get('account.move.line').create_analytic_lines(cr, uid, [line.id for line in record.line_id], context)
obj_move_line.create_analytic_lines(cr, uid, [line.id for line in record.line_id], context)
valid_moves = [move.id for move in valid_moves]
return len(valid_moves) > 0 and valid_moves or False
@@ -1467,7 +1473,7 @@ class account_move_reconcile(osv.osv):
return True
def name_get(self, cr, uid, ids, context=None):
if not len(ids):
if not ids:
return []
result = []
for r in self.browse(cr, uid, ids, context):
@@ -1518,20 +1524,21 @@ class account_tax_code(osv.osv):
GROUP BY line.tax_code_id',
(parent_ids,) + where_params)
res=dict(cr.fetchall())
obj_precision = self.pool.get('decimal.precision')
for record in self.browse(cr, uid, ids, context):
def _rec_get(record):
amount = res.get(record.id, 0.0)
for rec in record.child_ids:
amount += _rec_get(rec) * rec.sign
return amount
res[record.id] = round(_rec_get(record), self.pool.get('decimal.precision').precision_get(cr, uid, 'Account'))
res[record.id] = round(_rec_get(record), obj_precision.precision_get(cr, uid, 'Account'))
return res
def _sum_year(self, cr, uid, ids, name, args, context=None):
if context is None:
context = {}
move_state = ('posted', )
if context.get('state', False) == 'all':
if context.get('state', 'all') == 'all':
move_state = ('draft', 'posted', )
if context.get('fiscalyear_id', False):
fiscalyear_id = context['fiscalyear_id']
@@ -1557,7 +1564,7 @@ class account_tax_code(osv.osv):
period_id = context['period_id']
else:
period_id = self.pool.get('account.period').find(cr, uid)
if not len(period_id):
if not period_id:
return dict.fromkeys(ids, 0.0)
period_id = period_id[0]
return self._sum(cr, uid, ids, name, args, context,
@@ -1591,7 +1598,9 @@ class account_tax_code(osv.osv):
def name_get(self, cr, uid, ids, context=None):
if not len(ids):
if isinstance(ids, (int, long)):
ids = [ids]
if not ids:
return []
if isinstance(ids, (int, long)):
ids = [ids]
@@ -1641,11 +1650,11 @@ class account_tax(osv.osv):
_columns = {
'name': fields.char('Tax Name', size=64, required=True, translate=True, help="This name will be displayed on reports"),
'sequence': fields.integer('Sequence', required=True, help="The sequence field is used to order the tax lines from the lowest sequences to the higher ones. The order is important if you have a tax with several tax children. In this case, the evaluation order is important."),
'amount': fields.float('Amount', required=True, digits=(14,4), help="For Tax Type percent enter % ratio between 0-1."),
'amount': fields.float('Amount', required=True, digits_compute=dp.get_precision('Account'), help="For taxes of type percentage, enter % ratio between 0-1."),
'active': fields.boolean('Active', help="If the active field is set to true, it will allow you to hide the tax without removing it."),
'type': fields.selection( [('percent','Percent'), ('fixed','Fixed'), ('none','None'), ('code','Python Code'),('balance','Balance')], 'Tax Type', required=True,
'type': fields.selection( [('percent','Percentage'), ('fixed','Fixed Amount'), ('none','None'), ('code','Python Code'), ('balance','Balance')], 'Tax Type', required=True,
help="The computation method for the tax amount."),
'applicable_type': fields.selection( [('true','True'), ('code','Python Code')], 'Applicable Type', required=True,
'applicable_type': fields.selection( [('true','Always'), ('code','Given by Python Code')], 'Applicability', required=True,
help="If not applicable (computed through a Python code), the tax won't appear on the invoice."),
'domain':fields.char('Domain', size=32, help="This field is only used if you develop your own module allowing developers to create specific taxes in a custom domain."),
'account_collected_id':fields.many2one('account.account', 'Invoice Tax Account'),
@@ -1656,7 +1665,6 @@ class account_tax(osv.osv):
'python_compute':fields.text('Python Code'),
'python_compute_inv':fields.text('Python Code (reverse)'),
'python_applicable':fields.text('Python Code'),
'tax_group': fields.selection([('vat','VAT'),('other','Other')], 'Tax Group', help="If a default tax is given in the partner it only overrides taxes from accounts (or products) in the same group."),
#
# Fields used for the VAT declaration
@@ -1683,7 +1691,7 @@ class account_tax(osv.osv):
def name_search(self, cr, user, name, args=None, operator='ilike', context=None, limit=80):
"""
Returns a list of tupples containing id, name, as internally it is called {def name_get}
result format : {[(id, name), (id, name), ...]}
result format: {[(id, name), (id, name), ...]}
@param cr: A database cursor
@param user: ID of the user currently logged in
@@ -1725,7 +1733,7 @@ class account_tax(osv.osv):
return super(account_tax, self).search(cr, uid, args, offset, limit, order, context, count)
def name_get(self, cr, uid, ids, context=None):
if not len(ids):
if not ids:
return []
res = []
for record in self.read(cr, uid, ids, ['description','name'], context=context):
@@ -1740,8 +1748,8 @@ class account_tax(osv.osv):
return self.pool.get('res.company').search(cr, uid, [('parent_id', '=', False)])[0]
_defaults = {
'python_compute': '''# price_unit\n# address : res.partner.address object or False\n# product : product.product object or None\n# partner : res.partner object or None\n\nresult = price_unit * 0.10''',
'python_compute_inv': '''# price_unit\n# address : res.partner.address object or False\n# product : product.product object or False\n\nresult = price_unit * 0.10''',
'python_compute': '''# price_unit\n# address: res.partner.address object or False\n# product: product.product object or None\n# partner: res.partner object or None\n\nresult = price_unit * 0.10''',
'python_compute_inv': '''# price_unit\n# address: res.partner.address object or False\n# product: product.product object or False\n\nresult = price_unit * 0.10''',
'applicable_type': 'true',
'type': 'percent',
'amount': 0,
@@ -1749,7 +1757,6 @@ class account_tax(osv.osv):
'active': 1,
'type_tax_use': 'all',
'sequence': 1,
'tax_group': 'vat',
'ref_tax_sign': 1,
'ref_base_sign': 1,
'tax_sign': 1,
@@ -1761,9 +1768,10 @@ class account_tax(osv.osv):
def _applicable(self, cr, uid, taxes, price_unit, address_id=None, product=None, partner=None):
res = []
obj_partener_address = self.pool.get('res.partner.address')
for tax in taxes:
if tax.applicable_type=='code':
localdict = {'price_unit':price_unit, 'address':self.pool.get('res.partner.address').browse(cr, uid, address_id), 'product':product, 'partner':partner}
localdict = {'price_unit':price_unit, 'address':obj_partener_address.browse(cr, uid, address_id), 'product':product, 'partner':partner}
exec tax.python_applicable in localdict
if localdict.get('result', False):
res.append(tax)
@@ -1773,26 +1781,26 @@ class account_tax(osv.osv):
def _unit_compute(self, cr, uid, taxes, price_unit, address_id=None, product=None, partner=None, quantity=0):
taxes = self._applicable(cr, uid, taxes, price_unit, address_id, product, partner)
res = []
cur_price_unit=price_unit
obj_partener_address = self.pool.get('res.partner.address')
for tax in taxes:
# we compute the amount for the current tax object and append it to the result
data = {'id':tax.id,
'name':tax.description and tax.description + " - " + tax.name or tax.name,
'account_collected_id':tax.account_collected_id.id,
'account_paid_id':tax.account_paid_id.id,
'base_code_id': tax.base_code_id.id,
'ref_base_code_id': tax.ref_base_code_id.id,
'sequence': tax.sequence,
'base_sign': tax.base_sign,
'tax_sign': tax.tax_sign,
'ref_base_sign': tax.ref_base_sign,
'ref_tax_sign': tax.ref_tax_sign,
'price_unit': cur_price_unit,
'tax_code_id': tax.tax_code_id.id,
'ref_tax_code_id': tax.ref_tax_code_id.id,
'name':tax.description and tax.description + " - " + tax.name or tax.name,
'account_collected_id':tax.account_collected_id.id,
'account_paid_id':tax.account_paid_id.id,
'base_code_id': tax.base_code_id.id,
'ref_base_code_id': tax.ref_base_code_id.id,
'sequence': tax.sequence,
'base_sign': tax.base_sign,
'tax_sign': tax.tax_sign,
'ref_base_sign': tax.ref_base_sign,
'ref_tax_sign': tax.ref_tax_sign,
'price_unit': cur_price_unit,
'tax_code_id': tax.tax_code_id.id,
'ref_tax_code_id': tax.ref_tax_code_id.id,
}
res.append(data)
if tax.type=='percent':
@@ -1804,7 +1812,7 @@ class account_tax(osv.osv):
data['tax_amount']=quantity
# data['amount'] = quantity
elif tax.type=='code':
address = address_id and self.pool.get('res.partner.address').browse(cr, uid, address_id) or None
address = address_id and obj_partener_address.browse(cr, uid, address_id) or None
localdict = {'price_unit':cur_price_unit, 'address':address, 'product':product, 'partner':partner}
exec tax.python_compute in localdict
amount = localdict['result']
@@ -1813,8 +1821,8 @@ class account_tax(osv.osv):
data['amount'] = cur_price_unit - reduce(lambda x,y: y.get('amount',0.0)+x, res, 0.0)
data['balance'] = cur_price_unit
amount2 = data['amount']
if len(tax.child_ids):
amount2 = data.get('amount', 0.0)
if tax.child_ids:
if tax.child_depend:
latest = res.pop()
amount = amount2
@@ -1857,7 +1865,7 @@ class account_tax(osv.osv):
tex.append(tax)
tin = self.compute_inv(cr, uid, tin, price_unit, quantity, address_id=address_id, product=product, partner=partner)
for r in tin:
totalex -= r['amount']
totalex -= r.get('amount', 0.0)
totlex_qty = 0.0
try:
totlex_qty=totalex/quantity
@@ -1865,7 +1873,7 @@ class account_tax(osv.osv):
pass
tex = self._compute(cr, uid, tex, totlex_qty, quantity, address_id=address_id, product=product, partner=partner)
for r in tex:
totalin += r['amount']
totalin += r.get('amount', 0.0)
return {
'total': totalex,
'total_included': totalin,
@@ -1889,17 +1897,18 @@ class account_tax(osv.osv):
"""
res = self._unit_compute(cr, uid, taxes, price_unit, address_id, product, partner, quantity)
total = 0.0
precision_pool = self.pool.get('decimal.precision')
for r in res:
if r.get('balance',False):
r['amount'] = round(r['balance'] * quantity, self.pool.get('decimal.precision').precision_get(cr, uid, 'Account')) - total
r['amount'] = round(r.get('balance', 0.0) * quantity, precision_pool.precision_get(cr, uid, 'Account')) - total
else:
r['amount'] = round(r['amount'] * quantity, self.pool.get('decimal.precision').precision_get(cr, uid, 'Account'))
r['amount'] = round(r.get('amount', 0.0) * quantity, precision_pool.precision_get(cr, uid, 'Account'))
total += r['amount']
return res
def _unit_compute_inv(self, cr, uid, taxes, price_unit, address_id=None, product=None, partner=None):
taxes = self._applicable(cr, uid, taxes, price_unit, address_id, product, partner)
obj_partener_address = self.pool.get('res.partner.address')
res = []
taxes.reverse()
cur_price_unit = price_unit
@@ -1924,7 +1933,7 @@ class account_tax(osv.osv):
amount = tax.amount
elif tax.type=='code':
address = address_id and self.pool.get('res.partner.address').browse(cr, uid, address_id) or None
address = address_id and obj_partener_address.browse(cr, uid, address_id) or None
localdict = {'price_unit':cur_price_unit, 'address':address, 'product':product, 'partner':partner}
exec tax.python_compute_inv in localdict
amount = localdict['result']
@@ -1954,7 +1963,7 @@ class account_tax(osv.osv):
'tax_code_id': tax.tax_code_id.id,
'ref_tax_code_id': tax.ref_tax_code_id.id,
})
if len(tax.child_ids):
if tax.child_ids:
if tax.child_depend:
del res[-1]
amount = price_unit
@@ -1983,8 +1992,9 @@ class account_tax(osv.osv):
"""
res = self._unit_compute_inv(cr, uid, taxes, price_unit, address_id, product, partner=None)
total = 0.0
obj_precision = self.pool.get('decimal.precision')
for r in res:
prec = self.pool.get('decimal.precision').precision_get(cr, uid, 'Account')
prec = obj_precision.precision_get(cr, uid, 'Account')
if r.get('balance',False):
r['amount'] = round(r['balance'] * quantity, prec) - total
else:
@@ -2005,7 +2015,7 @@ class account_model(osv.osv):
'journal_id': fields.many2one('account.journal', 'Journal', required=True),
'company_id': fields.related('journal_id', 'company_id', type='many2one', relation='res.company', string='Company', store=True, readonly=True),
'lines_id': fields.one2many('account.model.line', 'model_id', 'Model Entries'),
'legend' :fields.text('Legend', readonly=True, size=100),
'legend': fields.text('Legend', readonly=True, size=100),
}
_defaults = {
@@ -2149,7 +2159,7 @@ class account_subscription(osv.osv):
break
if ok:
todone.append(sub.id)
if len(todone):
if todone:
self.write(cr, uid, todone, {'state':'done'})
return False
@@ -2159,7 +2169,7 @@ class account_subscription(osv.osv):
for line in sub.lines_id:
if not line.move_id.id:
toremove.append(line.id)
if len(toremove):
if toremove:
self.pool.get('account.subscription.line').unlink(cr, uid, toremove)
self.write(cr, uid, ids, {'state':'draft'})
return False
@@ -2194,11 +2204,12 @@ class account_subscription_line(osv.osv):
def move_create(self, cr, uid, ids, context=None):
tocheck = {}
all_moves = []
obj_model = self.pool.get('account.model')
for line in self.browse(cr, uid, ids, context=context):
datas = {
'date': line.date,
}
move_ids = self.pool.get('account.model').generate(cr, uid, [line.subscription_id.model_id.id], datas, context)
move_ids = obj_model.generate(cr, uid, [line.subscription_id.model_id.id], datas, context)
tocheck[line.subscription_id.id] = True
self.write(cr, uid, [line.id], {'move_id':move_ids[0]})
all_moves.extend(move_ids)
@@ -2232,7 +2243,7 @@ class account_account_template(osv.osv):
('view','View'),
('consolidation','Consolidation'),
('liquidity','Liquidity'),
('other','Others'),
('other','Regular'),
('closed','Closed'),
], 'Internal Type', required=True,help="This type is used to differentiate types with "\
"special effects in OpenERP: view can not have entries, consolidation are accounts that "\
@@ -2252,7 +2263,7 @@ class account_account_template(osv.osv):
_defaults = {
'reconcile': False,
'type' : 'view',
'type': 'view',
'nocreate': False,
}
@@ -2263,7 +2274,7 @@ class account_account_template(osv.osv):
def name_get(self, cr, uid, ids, context={}):
if not len(ids):
if not ids:
return []
reads = self.read(cr, uid, ids, ['name','code'], context)
res = []
@@ -2321,7 +2332,7 @@ class account_add_tmpl_wizard(osv.osv_memory):
'parent_id': data[0]['cparent_id'],
'company_id': company_id,
}
new_account = acc_obj.create(cr, uid, vals)
acc_obj.create(cr, uid, vals)
return {'type':'state', 'state': 'end' }
def action_cancel(self, cr, uid, ids, context=None):
@@ -2341,7 +2352,7 @@ class account_tax_code_template(osv.osv):
'info': fields.text('Description'),
'parent_id': fields.many2one('account.tax.code.template', 'Parent Code', select=True),
'child_ids': fields.one2many('account.tax.code.template', 'parent_id', 'Child Codes'),
'sign': fields.float('Sign for parent', required=True),
'sign': fields.float('Sign For Parent', required=True),
'notprintable':fields.boolean("Not Printable in Invoice", help="Check this box if you don't want any VAT related to this Tax Code to appear on invoices"),
}
@@ -2351,7 +2362,7 @@ class account_tax_code_template(osv.osv):
}
def name_get(self, cr, uid, ids, context=None):
if not len(ids):
if not ids:
return []
if isinstance(ids, (int, long)):
ids = [ids]
@@ -2383,7 +2394,7 @@ class account_chart_template(osv.osv):
'property_account_income_categ': fields.many2one('account.account.template','Income Category Account'),
'property_account_expense': fields.many2one('account.account.template','Expense Account on Product Template'),
'property_account_income': fields.many2one('account.account.template','Income Account on Product Template'),
'property_reserve_and_surplus_account': fields.many2one('account.account.template', 'Reserve and Profit/Loss Account', domain=[('type', '=', 'payable')] , help='This Account is used for transferring Profit/Loss(If It is Profit : Amount will be added, Loss : Amount will be deducted.), Which is calculated from Profilt & Loss Report'),
'property_reserve_and_surplus_account': fields.many2one('account.account.template', 'Reserve and Profit/Loss Account', domain=[('type', '=', 'payable')], help='This Account is used for transferring Profit/Loss(If It is Profit : Amount will be added, Loss : Amount will be deducted.), Which is calculated from Profilt & Loss Report'),
}
account_chart_template()
@@ -2408,7 +2419,6 @@ class account_tax_template(osv.osv):
'python_compute':fields.text('Python Code'),
'python_compute_inv':fields.text('Python Code (reverse)'),
'python_applicable':fields.text('Python Code'),
'tax_group': fields.selection([('vat','VAT'),('other','Other')], 'Tax Group', help="If a default tax if given in the partner it only override taxes from account (or product) of the same group."),
#
# Fields used for the VAT declaration
@@ -2430,7 +2440,7 @@ class account_tax_template(osv.osv):
}
def name_get(self, cr, uid, ids, context={}):
if not len(ids):
if not ids:
return []
res = []
for record in self.read(cr, uid, ids, ['description','name'], context):
@@ -2445,13 +2455,12 @@ class account_tax_template(osv.osv):
return self.pool.get('res.company').search(cr, uid, [('parent_id', '=', False)])[0]
_defaults = {
'python_compute': lambda *a: '''# price_unit\n# address : res.partner.address object or False\n# product : product.product object or None\n# partner : res.partner object or None\n\nresult = price_unit * 0.10''',
'python_compute_inv': lambda *a: '''# price_unit\n# address : res.partner.address object or False\n# product : product.product object or False\n\nresult = price_unit * 0.10''',
'python_compute': lambda *a: '''# price_unit\n# address: res.partner.address object or False\n# product: product.product object or None\n# partner: res.partner object or None\n\nresult = price_unit * 0.10''',
'python_compute_inv': lambda *a: '''# price_unit\n# address: res.partner.address object or False\n# product: product.product object or False\n\nresult = price_unit * 0.10''',
'applicable_type': 'true',
'type': 'percent',
'amount': 0,
'sequence': 1,
'tax_group': 'vat',
'ref_tax_sign': 1,
'ref_base_sign': 1,
'tax_sign': 1,
@@ -2464,14 +2473,14 @@ class account_tax_template(osv.osv):
account_tax_template()
# Fiscal Mapping Templates
# Fiscal Position Templates
class account_fiscal_position_template(osv.osv):
_name = 'account.fiscal.position.template'
_description = 'Template for Fiscal Mapping'
_description = 'Template for Fiscal Position'
_columns = {
'name': fields.char('Fiscal Mapping Template', size=64, translate=True, required=True),
'name': fields.char('Fiscal Position Template', size=64, translate=True, required=True),
'chart_template_id': fields.many2one('account.chart.template', 'Chart Template', required=True),
'account_ids': fields.one2many('account.fiscal.position.account.template', 'position_id', 'Account Mapping'),
'tax_ids': fields.one2many('account.fiscal.position.tax.template', 'position_id', 'Tax Mapping')
@@ -2481,11 +2490,11 @@ account_fiscal_position_template()
class account_fiscal_position_tax_template(osv.osv):
_name = 'account.fiscal.position.tax.template'
_description = 'Template Tax Fiscal Mapping'
_description = 'Template Tax Fiscal Position'
_rec_name = 'position_id'
_columns = {
'position_id': fields.many2one('account.fiscal.position.template', 'Fiscal Mapping', required=True, ondelete='cascade'),
'position_id': fields.many2one('account.fiscal.position.template', 'Fiscal Position', required=True, ondelete='cascade'),
'tax_src_id': fields.many2one('account.tax.template', 'Tax Source', required=True),
'tax_dest_id': fields.many2one('account.tax.template', 'Replacement Tax')
}
@@ -2551,9 +2560,9 @@ class wizard_multi_charts_accounts(osv.osv_memory):
obj_acc_template = self.pool.get('account.account.template')
obj_fiscal_position_template = self.pool.get('account.fiscal.position.template')
obj_fiscal_position = self.pool.get('account.fiscal.position')
data_pool = self.pool.get('ir.model.data')
obj_data = self.pool.get('ir.model.data')
analytic_journal_obj = self.pool.get('account.analytic.journal')
obj_tax_code = self.pool.get('account.tax.code')
# Creating Account
obj_acc_root = obj_multi.chart_template_id.account_root_id
tax_code_root_id = obj_multi.chart_template_id.tax_code_root_id.id
@@ -2577,7 +2586,7 @@ class wizard_multi_charts_accounts(osv.osv_memory):
'company_id': company_id,
'sign': tax_code_template.sign,
}
new_tax_code = self.pool.get('account.tax.code').create(cr, uid, vals)
new_tax_code = obj_tax_code.create(cr, uid, vals)
#recording the new tax code to do the mapping
tax_code_template_ref[tax_code_template.id] = new_tax_code
@@ -2596,7 +2605,6 @@ class wizard_multi_charts_accounts(osv.osv_memory):
'python_compute': tax.python_compute,
'python_compute_inv': tax.python_compute_inv,
'python_applicable': tax.python_applicable,
'tax_group':tax.tax_group,
'base_code_id': tax.base_code_id and ((tax.base_code_id.id in tax_code_template_ref) and tax_code_template_ref[tax.base_code_id.id]) or False,
'tax_code_id': tax.tax_code_id and ((tax.tax_code_id.id in tax_code_template_ref) and tax_code_template_ref[tax.tax_code_id.id]) or False,
'base_sign': tax.base_sign,
@@ -2662,8 +2670,8 @@ class wizard_multi_charts_accounts(osv.osv_memory):
# Creating Journals Sales and Purchase
vals_journal={}
data_id = data_pool.search(cr, uid, [('model','=','account.journal.view'), ('name','=','account_sp_journal_view')])
data = data_pool.browse(cr, uid, data_id[0])
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])
view_id = data.res_id
seq_id = obj_sequence.search(cr, uid, [('name','=','Account Journal')])[0]
@@ -2713,12 +2721,12 @@ class wizard_multi_charts_accounts(osv.osv_memory):
obj_journal.create(cr,uid,vals_journal)
# Bank Journals
data_id = data_pool.search(cr, uid, [('model','=','account.journal.view'), ('name','=','account_journal_bank_view')])
data = data_pool.browse(cr, uid, data_id[0])
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])
view_id_cash = data.res_id
data_id = data_pool.search(cr, uid, [('model','=','account.journal.view'), ('name','=','account_journal_bank_view_multi')])
data = data_pool.browse(cr, uid, data_id[0])
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])
view_id_cur = data.res_id
ref_acc_bank = obj_multi.chart_template_id.bank_account_view_id
@@ -2730,7 +2738,7 @@ class wizard_multi_charts_accounts(osv.osv_memory):
if ref_acc_bank.code:
try:
new_code = str(int(ref_acc_bank.code.ljust(dig,'0')) + current_num)
except Exception,e:
except:
new_code = str(ref_acc_bank.code.ljust(dig-len(str(current_num)),'0')) + str(current_num)
vals = {
'name': tmp,
@@ -2807,30 +2815,31 @@ class wizard_multi_charts_accounts(osv.osv_memory):
fp_ids = obj_fiscal_position_template.search(cr, uid, [('chart_template_id', '=', obj_multi.chart_template_id.id)])
if fp_ids:
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):
vals_fp = {
'company_id' : company_id,
'name' : position.name,
'company_id': company_id,
'name': position.name,
}
new_fp = obj_fiscal_position.create(cr, uid, vals_fp)
obj_tax_fp = self.pool.get('account.fiscal.position.tax')
obj_ac_fp = self.pool.get('account.fiscal.position.account')
for tax in position.tax_ids:
vals_tax = {
'tax_src_id' : tax_template_ref[tax.tax_src_id.id],
'tax_dest_id' : tax.tax_dest_id and tax_template_ref[tax.tax_dest_id.id] or False,
'position_id' : new_fp,
'tax_src_id': tax_template_ref[tax.tax_src_id.id],
'tax_dest_id': tax.tax_dest_id and tax_template_ref[tax.tax_dest_id.id] or False,
'position_id': new_fp,
}
obj_tax_fp.create(cr, uid, vals_tax)
for acc in position.account_ids:
vals_acc = {
'account_src_id' : acc_template_ref[acc.account_src_id.id],
'account_dest_id' : acc_template_ref[acc.account_dest_id.id],
'position_id' : new_fp,
'account_src_id': acc_template_ref[acc.account_src_id.id],
'account_dest_id': acc_template_ref[acc.account_dest_id.id],
'position_id': new_fp,
}
obj_ac_fp.create(cr, uid, vals_acc)
@@ -2852,4 +2861,3 @@ class account_bank_accounts_wizard(osv.osv_memory):
account_bank_accounts_wizard()
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
addons/account/account_analytic_line.py
+34 -15
View File
@@ -31,12 +31,12 @@ class account_analytic_line(osv.osv):
_inherit = 'account.analytic.line'
_description = 'Analytic Line'
_columns = {
'product_uom_id' : fields.many2one('product.uom', 'UoM'),
'product_id' : fields.many2one('product.product', 'Product'),
'general_account_id' : fields.many2one('account.account', 'General Account', required=True, ondelete='cascade'),
'move_id' : fields.many2one('account.move.line', 'Move Line', ondelete='cascade', select=True),
'journal_id' : fields.many2one('account.analytic.journal', 'Analytic Journal', required=True, ondelete='cascade', select=True),
'code' : fields.char('Code', size=8),
'product_uom_id': fields.many2one('product.uom', 'UoM'),
'product_id': fields.many2one('product.product', 'Product'),
'general_account_id': fields.many2one('account.account', 'General Account', required=True, ondelete='cascade'),
'move_id': fields.many2one('account.move.line', 'Move Line', ondelete='cascade', select=True),
'journal_id': fields.many2one('account.analytic.journal', 'Analytic Journal', required=True, ondelete='cascade', select=True),
'code': fields.char('Code', size=8),
'ref': fields.char('Ref.', size=64),
'currency_id': fields.related('move_id', 'currency_id', type='many2one', relation='res.currency', string='Account currency', store=True, help="The related account currency if not equal to the company one.", readonly=True),
'amount_currency': fields.related('move_id', 'amount_currency', type='float', string='Amount currency', store=True, help="The amount expressed in the related account currency if not equal to the company one.", readonly=True),
@@ -75,6 +75,9 @@ class account_analytic_line(osv.osv):
unit=False, journal_id=False, context=None):
if context==None:
context={}
if not journal_id:
j_ids = self.pool.get('account.analytic.journal').search(cr, uid, [('type','=','purchase')])
j_id = j_ids and j_ids[0] or False
if not journal_id or not prod_id:
return {}
product_obj = self.pool.get('product.product')
@@ -85,8 +88,8 @@ class account_analytic_line(osv.osv):
company_id = j_id.company_id.id
result = 0.0
is_purchase = False
if j_id.type == 'purchase':
if j_id.type <> 'sale':
a = prod.product_tmpl_id.property_account_expense.id
if not a:
a = prod.categ_id.property_account_expense_categ.id
@@ -109,13 +112,29 @@ class account_analytic_line(osv.osv):
(prod.name, prod_id,))
amount_unit = prod.price_get('list_price', context)[prod_id]
prec = self.pool.get('decimal.precision').precision_get(cr, uid, 'Account')
amount = amount_unit * quantity or 1.0
result = round(amount, prec)
if is_purchase:
result *= -1
return {
'value': {
if not company_id:
company_id=company_obj._company_default_get(cr, uid, 'account.analytic.line', context)
flag = False
# Compute based on pricetype
product_price_type_ids = product_price_type_obj.search(cr, uid, [('field','=','standard_price')], context)
pricetype = product_price_type_obj.browse(cr, uid, product_price_type_ids, context)[0]
if journal_id:
journal = analytic_journal_obj.browse(cr, uid, journal_id)
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]
# Take the company currency as the reference one
if pricetype.field == 'list_price':
flag = True
amount_unit = prod.price_get(pricetype.field, context)[prod.id]
amount = amount_unit*unit_amount or 1.0
prec = self.pool.get('decimal.precision').precision_get(cr, uid, 'Account')
amount = amount_unit*unit_amount or 1.0
result = round(amount, prec)
if not flag:
result *= -1
return {'value': {
'amount': result,
'general_account_id': a,
}
addons/account/account_bank_statement.py
+5 -5
View File
@@ -21,9 +21,7 @@
import time
import netsvc
from osv import fields, osv
from tools.misc import currency
from tools.translate import _
import decimal_precision as dp
@@ -55,6 +53,7 @@ class account_bank_statement(osv.osv):
model_data_ids = mod_obj.search(cr, uid, [('model','=','ir.ui.view'),('name','=','view_account_statement_from_invoice')], context=context)
resource_id = mod_obj.read(cr, uid, model_data_ids, fields=['res_id'], context=context)[0]['res_id']
context.update({'statement_id': ids[0]})
return {
'name': _('Import Invoice'),
'context': context,
@@ -222,11 +221,11 @@ class account_bank_statement(osv.osv):
account_move_line_obj = self.pool.get('account.move.line')
account_analytic_line_obj = self.pool.get('account.analytic.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 = st_line.statement_id
context.update({'date': st_line.date})
move_id = account_move_obj.create(cr, uid, {
'journal_id': st.journal_id.id,
'period_id': st.period_id.id,
@@ -242,6 +241,7 @@ class account_bank_statement(osv.osv):
account_id = st.journal_id.default_credit_account_id.id
else:
account_id = st.journal_id.default_debit_account_id.id
acc_cur = ((st_line.amount<=0) and st.journal_id.default_debit_account_id) or st_line.account_id
amount = res_currency_obj.compute(cr, uid, st.currency.id,
company_currency_id, st_line.amount, context=context,
@@ -282,7 +282,7 @@ class account_bank_statement(osv.osv):
account=acc_cur)
val['amount_currency'] = amount_cur
move_line_id = account_move_line_obj.create(cr, uid, val , context=context)
move_line_id = account_move_line_obj.create(cr, uid, val, context=context)
torec.append(move_line_id)
# Fill the secondary amount/currency
@@ -501,4 +501,4 @@ class account_bank_statement_line(osv.osv):
account_bank_statement_line()
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
addons/account/account_cash_statement.py
+39 -22
View File
@@ -19,9 +19,7 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
##############################################################################
import time
from mx import DateTime
from osv import osv, fields
from decimal import Decimal
@@ -145,6 +143,7 @@ class account_cash_statement(osv.osv):
res[statement.id] -= res_currency_obj.compute(cursor,
user, company_currency_id, currency_id,
line.credit, context=context)
if statement.state in ('draft', 'open'):
for line in statement.line_ids:
res[statement.id] += line.amount
@@ -152,15 +151,14 @@ class account_cash_statement(osv.osv):
res[r] = round(res[r], 2)
return res
def _get_company(self, cr, uid, context={}):
def _get_company(self, cr, uid, context=None):
user_pool = self.pool.get('res.users')
company_pool = self.pool.get('res.company')
user = user_pool.browse(cr, uid, uid, context)
company_id = user.company_id and user.company_id.id
user = user_pool.browse(cr, uid, uid, context=context)
company_id = user.company_id
if not company_id:
company_id = company_pool.search(cr, uid, [])[0]
return company_id
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={}):
res = []
@@ -193,7 +191,7 @@ class account_cash_statement(osv.osv):
res.append(dct)
return res
def _get_cash_close_box_lines(self, cr, ids, uid, context={}):
def _get_cash_close_box_lines(self, cr, uid, context={}):
res = []
curr = [1, 2, 5, 10, 20, 50, 100, 500]
for rs in curr:
@@ -204,6 +202,20 @@ class account_cash_statement(osv.osv):
res.append((0,0,dct))
return res
def _get_cash_open_close_box_lines(self, cr, uid, context={}):
res = {}
start_l = []
end_l = []
starting_details = self._get_cash_open_box_lines(cr, uid, context)
ending_details = self._get_default_cash_close_box_lines(cr, uid, context)
for start in starting_details:
start_l.append((0,0,start))
for end in ending_details:
end_l.append((0,0,end))
res['start'] = start_l
res['end'] = end_l
return res
_columns = {
'balance_end_real': fields.float('Closing Balance', digits_compute=dp.get_precision('Account'), states={'confirm':[('readonly', True)]}, help="closing balance entered by the cashbox verifier"),
'state': fields.selection(
@@ -216,7 +228,7 @@ class account_cash_statement(osv.osv):
'balance_end_cash': fields.function(_balance_end_cash, method=True, store=True, string='Balance', help="Closing balance based on cashBox"),
'starting_details_ids': fields.one2many('account.cashbox.line', 'starting_id', string='Opening Cashbox'),
'ending_details_ids': fields.one2many('account.cashbox.line', 'ending_id', string='Closing Cashbox'),
'name': fields.char('Name', size=64, required=True, states={'draft': [('readonly', False)]}, readonly=True, help='if you give the Name other then / , its created Accounting Entries Move will be with same name as statement name. This allows the statement entries to have the same references than the statement itself'),
'name': fields.char('Name', size=64, required=True, states={'draft': [('readonly', False)]}, readonly=True, help='if you give the Name other then /, its created Accounting Entries Move will be with same name as statement name. This allows the statement entries to have the same references than the statement itself'),
'user_id':fields.many2one('res.users', 'Responsible', required=False),
}
_defaults = {
@@ -237,9 +249,16 @@ class account_cash_statement(osv.osv):
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':
lines = end_lines = self._get_cash_close_box_lines(cr, uid, [], context)
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'):
dict_val = start[2]
for end in open_close['end']:
if end[2]['pieces'] == dict_val['pieces']:
end[2]['number'] += dict_val['number']
vals.update({
'ending_details_ids':lines
'ending_details_ids':open_close['start'],
'starting_details_ids':open_close['end']
})
else:
vals.update({
@@ -247,7 +266,7 @@ class account_cash_statement(osv.osv):
'starting_details_ids':False
})
res_id = super(account_cash_statement, self).create(cr, uid, vals, context=context)
#self.write(cr, uid, [res_id], {})
self.write(cr, uid, [res_id], {})
return res_id
def write(self, cr, uid, ids, vals, context=None):
@@ -357,16 +376,14 @@ class account_cash_statement(osv.osv):
super(account_cash_statement, self).button_confirm_bank(cr, uid, ids, context=context)
return self.write(cr, uid, ids, {'closing_date':time.strftime("%Y-%m-%d %H:%M:%S")}, context=context)
def button_cancel(self, cr, uid, ids, context={}):
done = []
def button_cancel(self, cr, uid, ids, context=None):
cash_box_line_pool = self.pool.get('account.cashbox.line')
super(account_cash_statement, self).button_cancel(cr, uid, ids, context=context)
for st in self.browse(cr, uid, ids, context):
ids = []
for line in st.line_ids:
ids += [x.id for x in line.move_ids]
self.pool.get('account.move').unlink(cr, uid, ids, context)
done.append(st.id)
self.write(cr, uid, done, {'state':'draft'}, context=context)
for end in st.ending_details_ids:
cash_box_line_pool.write(cr, uid, [end.id], {'number':0})
return True
account_cash_statement()
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
addons/account/account_end_fy.xml
+1 -1
View File
@@ -6,8 +6,8 @@
<field name="name">Close a Period</field>
<field name="res_model">account.period</field>
<field name="view_type">form</field>
<field name="domain">[('state','=','draft')]</field>
<field name="view_id" ref="view_account_period_tree"/>
<field name="context">{'search_default_draft': 1}</field>
<field name="help"> After closing a period, you will no longer be able to post entries to the period once it has been closed.</field>
</record>
<menuitem
addons/account/account_installer.xml
+9 -9
View File
@@ -26,7 +26,7 @@
<group colspan="8">
<group colspan="4" height="450" width="600">
<field name="charts"/>
<group colspan="4">
<group colspan="4" groups="base.group_extended">
<separator col="4" colspan="4" string="Configure Fiscal Year"/>
<field name="company_id" colspan="4" widget="selection" groups="base.group_multi_company"/>
<field name="date_start" on_change="on_change_start_date(date_start)"/>
@@ -34,24 +34,24 @@
<field name="period" colspan="4"/>
</group>
<group colspan="4" attrs="{'invisible':[('charts','!=','configurable')]}">
<separator col="4" colspan="4" string="Bank and Cost Account"/>
<field name="sale_tax" on_change="on_change_tax(sale_tax)" attrs="{'required':[('charts','=','configurable')]}"/>
<field name="purchase_tax" groups="base.group_extended"/>
</group>
<group colspan="4" attrs="{'invisible':[('charts','!=','configurable')]}">
<separator col="4" colspan="4" string="Bank and Cash Accounts"/>
<field colspan="4" mode="tree" height="200" name="bank_accounts_id" nolabel="1" widget="one2many_list">
<form string="">
<field name="acc_name"/>
<field name="account_type"/>
<field name="currency_id" widget="selection"/>
<field name="currency_id" widget="selection" groups="base.group_extended"/>
</form>
<tree editable="bottom" string="">
<tree editable="bottom" string="Your bank and cash accounts">
<field name="acc_name"/>
<field name="account_type"/>
<field name="currency_id" widget="selection"/>
<field name="currency_id" widget="selection" groups="base.group_extended"/>
</tree>
</field>
</group>
<group colspan="4" attrs="{'invisible':[('charts','!=','configurable')]}">
<field name="sale_tax" colspan="2" on_change="on_change_tax(sale_tax)"/>
<field name="purchase_tax" colspan="2" />
</group>
</group>
</group>
</data>
addons/account/account_invoice_view.xml
+28 -28
View File
@@ -36,11 +36,11 @@
<field name="arch" type="xml">
<tree string="Invoice Line">
<field name="name"/>
<field name="account_id" groups="base.group_user"/>
<field name="account_id" groups="account.group_account_user"/>
<field name="quantity"/>
<field name="uos_id"/>
<field name="price_unit"/>
<field name="discount"/>
<field name="discount" groups="base.group_extended"/>
<field name="price_subtotal"/>
</tree>
</field>
@@ -55,16 +55,14 @@
<notebook>
<page string="Line">
<field name="product_id" on_change="product_id_change(product_id, uos_id, quantity, name, parent.type, parent.partner_id, parent.fiscal_position, price_unit, parent.address_invoice_id, parent.currency_id, {'company_id': parent.company_id})"/>
<field name="uos_id" widget="selection" on_change="uos_id_change(product_id, uos_id, quantity, name, parent.type, parent.partner_id, parent.fiscal_position, price_unit, parent.address_invoice_id, parent.currency_id, {'company_id': parent.company_id})"/>
<field name="uos_id" on_change="uos_id_change(product_id, uos_id, quantity, name, parent.type, parent.partner_id, parent.fiscal_position, price_unit, parent.address_invoice_id, parent.currency_id, {'company_id': parent.company_id})"/>
<field name="quantity"/>
<field name="price_unit"/>
<field name="discount"/>
<field name="discount" groups="base.group_extended"/>
<field colspan="4" name="name"/>
<field colspan="4" name="origin" groups="base.group_extended"/>
<field domain="[('company_id', '=', parent.company_id), ('journal_id', '=', parent.journal_id), ('type', '&lt;&gt;', 'view')]" name="account_id" on_change="onchange_account_id(parent.fiscal_position,account_id)" groups="base.group_user"/>
<field domain="[('company_id', '=', parent.company_id), ('journal_id', '=', parent.journal_id), ('type', '&lt;&gt;', 'view')]" name="account_id" on_change="onchange_account_id(parent.fiscal_position,account_id)"/>
<field domain="[('type','&lt;&gt;','view'), ('company_id', '=', parent.company_id), ('parent_id', '!=', False)]" name="account_analytic_id" groups="analytic.group_analytic_accounting"/>
<newline/>
<field name="price_subtotal"/>
<field name="company_id" groups="base.group_multi_company" readonly="1"/>
<field colspan="4" name="invoice_line_tax_id" context="{'type':parent.type}" domain="[('parent_id','=',False),('company_id', '=', parent.company_id)]"/>
</page>
@@ -85,7 +83,7 @@
<field name="sequence"/>
<field name="manual"/>
<field name="name"/>
<field name="account_id" groups="base.group_user"/>
<field name="account_id" groups="base.group_account_user"/>
<field name="base"/>
<field name="amount"/>
</tree>
@@ -100,7 +98,7 @@
<form string="Manual Invoice Taxes">
<field name="name"/>
<field name="sequence"/>
<field name="account_id" groups="base.group_user"/>
<field name="account_id"/>
<field name="manual"/>
<field name="amount"/>
<field name="base" readonly="0"/>
@@ -148,7 +146,7 @@
<field name="type">form</field>
<field name="priority">2</field>
<field name="arch" type="xml">
<form string="Supplier invoice">
<form string="Supplier Invoice">
<group col="8" colspan="4">
<field name="journal_id" on_change="onchange_journal_id(journal_id)" widget="selection"/>
<field name="number" readonly="1"/>
@@ -156,7 +154,7 @@
<field name="currency_id" on_change="onchange_currency_id(currency_id, company_id)" width="50"/>
<button name="%(action_account_change_currency)d" type="action" icon="terp-stock_effects-object-colorize" string="Change" attrs="{'invisible':[('state','!=','draft')]}" groups="account.group_account_user"/>
<newline/>
<field name="partner_id" domain="[('supplier','=', 1)]" on_change="onchange_partner_id(type,partner_id,date_invoice,payment_term, partner_bank_id,company_id)" context="{'default_customer': 0}"/>
<field string="Supplier" name="partner_id" domain="[('supplier','=', 1)]" on_change="onchange_partner_id(type,partner_id,date_invoice,payment_term, partner_bank_id,company_id)" context="{'default_customer': 0}"/>
<field domain="[('partner_id','=',partner_id)]" name="address_invoice_id"/>
<field name="fiscal_position" groups="base.group_extended" widget="selection"/>
<newline/>
@@ -211,11 +209,11 @@
<field name="state"/>
<field name="residual"/>
<group col="6" colspan="4">
<button name="action_cancel_draft" states="cancel" string="Set to Draft" type="object" icon="terp-stock_effects-object-colorize"/>
<button name="invoice_cancel" states="draft,proforma2,sale,open" string="Cancel" icon="gtk-cancel"/>
<button name="invoice_open" states="draft,proforma2" string="Approve" icon="terp-camera_test"/>
<button name="action_cancel_draft" states="cancel" string="Set to Draft" type="object" icon="terp-stock_effects-object-colorize"/>
<button name="%(action_account_invoice_refund)d" type='action' string='Refund' states='open,paid' icon="gtk-execute"/>
<button name="%(action_account_state_open)d" type='action' string='Re-Open' states='paid' icon="gtk-convert" groups="base.group_no_one"/>
<button name="invoice_open" states="draft,proforma2" string="Approve" icon="terp-camera_test"/>
</group>
</group>
</page>
@@ -236,14 +234,14 @@
<page string="Payments" groups="base.group_extended">
<field name="payment_ids" colspan="4" nolabel="1" >
<tree string="Payments">
<field name="date"/>
<field name="date" string="Payment Date"/>
<field name="ref"/>
<field name="name"/>
<field name="name" groups="base.group_extended"/>
<field name="journal_id"/>
<field name="debit"/>
<field name="credit"/>
<field name="amount_currency"/>
<field name="currency_id"/>
<field name="amount_currency" groups="base.group_extended"/>
<field name="currency_id" groups="base.group_extended"/>
</tree>
</field>
</page>
@@ -265,7 +263,7 @@
<field name="currency_id" on_change="onchange_currency_id(currency_id, company_id)" width="50"/>
<button name="%(action_account_change_currency)d" type="action" icon="terp-stock_effects-object-colorize" string="Change" attrs="{'invisible':[('state','!=','draft')]}" groups="account.group_account_user"/>
<newline/>
<field name="partner_id" on_change="onchange_partner_id(type,partner_id,date_invoice,payment_term, partner_bank_id,company_id)" groups="base.group_user"/>
<field string="Customer" name="partner_id" on_change="onchange_partner_id(type,partner_id,date_invoice,payment_term, partner_bank_id,company_id)" groups="base.group_user"/>
<field domain="[('partner_id','=',partner_id)]" name="address_invoice_id"/>
<field name="fiscal_position" groups="base.group_extended" widget="selection"/>
<newline/>
@@ -307,10 +305,10 @@
<button name="invoice_cancel" states="draft,proforma2,sale,open" string="Cancel" icon="gtk-cancel"/>
<button name="action_cancel_draft" states="cancel" string="Reset to Draft" type="object" icon="terp-stock_effects-object-colorize"/>
<button name="invoice_proforma2" states="draft" string="PRO-FORMA" icon="terp-gtk-media-pause" groups="account.group_account_user"/>
<button name="invoice_open" states="draft,proforma2" string="Create" icon="terp-camera_test"/>
<button name="%(action_account_invoice_refund)d" type='action' string='Refund' states='open,paid' icon="gtk-execute"/>
<button name='%(action_account_state_open)d' type='action' string='Re-Open' states='paid' icon="gtk-convert" groups="base.group_no_one"/>
<button name="invoice_proforma2" states="draft" string="PRO-FORMA" icon="terp-gtk-media-pause" groups="account.group_account_user"/>
<button name="invoice_open" states="draft,proforma2" string="Validate" icon="gtk-go-forward"/>
</group>
</group>
</page>
@@ -355,15 +353,15 @@
<field name="arch" type="xml">
<search string="Search Invoice">
<group col="10" colspan="4">
<filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]" help="Draft Invoices"/>
<filter icon="terp-gtk-media-pause" string="Proforma" domain="[('state','=','proforma2')]" help="Proforma Invoices"/>
<filter icon="terp-camera_test" string="Invoices" domain="[('state','not in',['draft','cancel'])]" help="Proforma/Open/Paid Invoices"/>
<filter name="draft" icon="terp-document-new" string="Draft" domain="[('state','=','draft')]" help="Draft Invoices"/>
<filter name="proforma" icon="terp-gtk-media-pause" string="Proforma" domain="[('state','=','proforma2')]" help="Proforma Invoices"/>
<filter name="invoices" icon="terp-camera_test" string="Invoices" domain="[('state','not in',['draft','cancel'])]" help="Proforma/Open/Paid Invoices"/>
<separator orientation="vertical"/>
<filter name="unpaid" icon="terp-dolar_ok!" string="Unpaid" domain="[('state','=','open')]" help="Unpaid Invoices"/>
<separator orientation="vertical"/>
<field name="number"/>
<field name="partner_id"/>
<field name="user_id" select="1" default="uid" widget="selection" string="Salesman">
<field name="user_id" select="1" widget="selection" string="Salesman">
<filter domain="[('user_id','=',uid)]" help="My invoices" icon="terp-personal" separator="1"/>
</field>
<field name="origin"/>
@@ -451,7 +449,7 @@
<menuitem action="action_invoice_tree1" id="menu_action_invoice_tree1" parent="menu_finance_receivables"/>
<record id="action_invoice_tree2" model="ir.actions.act_window">
<field name="name">Vendor Invoices</field>
<field name="name">Supplier Invoices</field>
<field name="res_model">account.invoice</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form,calendar,graph</field>
@@ -459,7 +457,7 @@
<field name="domain">[('type','=','in_invoice')]</field>
<field name="context">{'type':'in_invoice', 'journal_type': 'purchase'}</field>
<field name="search_view_id" ref="view_account_invoice_filter"/>
<field name="help">Proposal for vendor invoices are usually automatically generate by OpenERP, following a procurement order or a production order for instance. To consult and to check for, or to manually create a customer invoice, use this menu. You can review, confirm or cancel, pay or refund an invoice from the view from of the invoices.</field>
<field name="help">Proposal for supplier invoices are usually automatically generate by OpenERP, following a procurement order or a production order for instance. To consult and to check for, or to manually create a customer invoice, use this menu. You can review, confirm or cancel, pay or refund an invoice from the view from of the invoices.</field>
</record>
<menuitem action="action_invoice_tree2" id="menu_action_invoice_tree2" parent="menu_finance_payables"/>
@@ -490,7 +488,7 @@
<menuitem action="action_invoice_tree3" id="menu_action_invoice_tree3" parent="menu_finance_receivables"/>
<record id="action_invoice_tree4" model="ir.actions.act_window">
<field name="name">Vendor Refunds</field>
<field name="name">Supplier Refunds</field>
<field name="res_model">account.invoice</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form,calendar,graph</field>
@@ -515,14 +513,16 @@
domain="[('account_id.reconcile', '=', True)]"
context="{'search_default_unreconciled':True,'search_default_partner_id':[partner_id]}"
id="act_account_invoice_account_move_unreconciled"
groups="base.group_extended"
name="Items to Reconcile"
res_model="account.move.line"
src_model="account.invoice"/>
<act_window
context="{'search_default_move_id':move_id}"
context="{'search_default_move_id':move_id, 'search_default_unreconciled':False,}"
id="act_account_invoice_account_move_invoice_link"
name="Invoice Items"
groups="base.group_extended"
res_model="account.move.line"
src_model="account.invoice"/>
addons/account/account_invoice_workflow.xml
-5
View File
@@ -2,11 +2,6 @@
<openerp>
<data>
<record id="res_roles_invoice0" model="res.roles">
<field eval="&quot;&quot;&quot;Invoice&quot;&quot;&quot;" name="name"/>
<field name="description">Assign this role to the persons that should have the rights to confirm a draft invoice.</field>
</record>
<record id="wkf" model="workflow">
<field name="name">account.invoice.basic</field>
<field name="osv">account.invoice</field>
addons/account/account_menuitem.xml
+26 -24
View File
@@ -2,47 +2,49 @@
<openerp>
<data>
<menuitem icon="terp-account" id="menu_finance" name="Accounting" sequence="13"/>
<menuitem id="menu_finance_receivables" name="Customers" parent="menu_finance" sequence="1" groups="group_account_user,group_account_manager,base.group_system"/>
<menuitem id="menu_finance_payables" name="Vendors" parent="menu_finance" sequence="2" groups="group_account_user,group_account_manager,base.group_system"/>
<menuitem id="menu_finance_bank_and_cash" name="Bank and Cash" parent="menu_finance" sequence="3"/>
<menuitem id="menu_finance_periodical_processing" name="Periodical Processing" parent="menu_finance" sequence="8" groups="group_account_user,group_account_manager,base.group_system,group_account_invoice"/>
<menuitem icon="terp-account" id="menu_finance" name="Accounting" sequence="13"
groups="group_account_user,group_account_manager,group_account_invoice"/>
<menuitem id="menu_finance_receivables" name="Customers" parent="menu_finance" sequence="1"/>
<menuitem id="menu_finance_payables" name="Suppliers" parent="menu_finance" sequence="2"/>
<menuitem id="menu_finance_bank_and_cash" name="Bank and Cash" parent="menu_finance" sequence="3"
groups="group_account_user"/>
<menuitem id="menu_finance_periodical_processing" name="Periodical Processing" parent="menu_finance" sequence="8" groups="group_account_user"/>
<!-- This menu is used in account_code module -->
<menuitem id="menu_account_pp_statements" name="Statements" parent="menu_finance_periodical_processing" sequence="12"/>
<menuitem id="periodical_processing_journal_entries_validation" name="Draft Entries" parent="menu_finance_periodical_processing" groups="group_account_user,group_account_manager,base.group_system"/>
<menuitem id="periodical_processing_journal_entries_validation" name="Draft Entries" parent="menu_finance_periodical_processing"/>
<menuitem id="periodical_processing_reconciliation" name="Reconciliation" parent="menu_finance_periodical_processing"/>
<menuitem id="periodical_processing_invoicing" name="Invoicing" parent="menu_finance_periodical_processing"/>
<menuitem id="menu_finance_charts" name="Charts" parent="menu_finance" sequence="5" groups="base.group_system"/>
<menuitem id="menu_finance_reporting" name="Reporting" parent="account.menu_finance" sequence="12" groups="base.group_system,group_account_manager,group_account_user"/>
<menuitem id="menu_finance_reporting_budgets" name="Budgets" parent="menu_finance_reporting"/>
<menuitem id="menu_finance_charts" name="Charts" parent="menu_finance" sequence="5"/>
<menuitem id="menu_finance_reporting" name="Reporting" parent="account.menu_finance" sequence="12"/>
<menuitem id="menu_finance_reporting_budgets" name="Budgets" parent="menu_finance_reporting" groups="group_account_user"/>
<menuitem id="menu_finance_legal_statement" name="Legal Reports" parent="menu_finance_reporting"/>
<menuitem id="menu_finance_management_belgian_reports" name="Belgian Reports" parent="menu_finance_reporting"/>
<menuitem id="menu_finance_configuration" name="Configuration" parent="menu_finance" sequence="13" groups="base.group_system"/>
<menuitem id="menu_finance_accounting" name="Financial Accounting" parent="menu_finance_configuration" groups="base.group_system"/>
<menuitem id="menu_analytic_accounting" name="Analytic Accounting" parent="menu_finance_configuration" groups="base.group_system"/>
<menuitem id="menu_finance_configuration" name="Configuration" parent="menu_finance" sequence="13" groups="group_account_manager"/>
<menuitem id="menu_finance_accounting" name="Financial Accounting" parent="menu_finance_configuration"/>
<menuitem id="menu_analytic_accounting" name="Analytic Accounting" parent="menu_finance_configuration"/>
<menuitem id="menu_analytic" parent="menu_analytic_accounting" name="Accounts" groups="analytic.group_analytic_accounting"/>
<menuitem id="menu_low_level" name="Low Level" parent="menu_finance_accounting" groups="base.group_extended"/>
<menuitem id="menu_configuration_misc" name="Miscellaneous" parent="menu_finance_configuration" sequence="30" groups="base.group_system"/>
<menuitem id="menu_configuration_misc" name="Miscellaneous" parent="menu_finance_configuration" sequence="30" groups="group_account_manager"/>
<menuitem id="base.menu_action_currency_form" parent="menu_configuration_misc" sequence="20"/>
<menuitem id="menu_finance_generic_reporting" name="Generic Reporting" parent="menu_finance_reporting" sequence="100" groups="base.group_system,group_account_manager"/>
<menuitem id="menu_finance_entries" name="Accounting" parent="menu_finance" sequence="4"
groups="group_account_user,group_account_manager,base.group_system"/>
<menuitem id="menu_finance_generic_reporting" name="Generic Reporting" parent="menu_finance_reporting" sequence="100"/>
<menuitem id="menu_finance_entries" name="Journal Entries" parent="menu_finance" sequence="4" groups="group_account_user"/>
<menuitem id="account.menu_finance_recurrent_entries" name="Recurring Entries" parent="menu_finance_periodical_processing" sequence="15" groups="base.group_extended"/>
<menuitem id="menu_account_end_year_treatments" name="End of Period" parent="menu_finance_periodical_processing" groups="group_account_user,group_account_manager,base.group_system" sequence="25"/>
<menuitem id="menu_account_end_year_treatments" name="End of Period" parent="menu_finance_periodical_processing" groups="group_account_manager" sequence="25"/>
<menuitem id="menu_finance_periodical_processing_billing" name="Billing" parent="menu_finance_periodical_processing" sequence="35"/>
<menuitem id="menu_finance_statistic_report_statement" name="Statistic Reports" parent="menu_finance_reporting" sequence="300" groups="account.group_account_manager"/>
<menuitem id="menu_finance_statistic_report_statement" name="Statistic Reports" parent="menu_finance_reporting" sequence="300"/>
<menuitem
parent="account.menu_finance_legal_statement"
id="final_accounting_reports"
name="Accounting Reports"/>
parent="account.menu_finance_legal_statement"
id="final_accounting_reports"
name="Accounting Reports"/>
<menuitem
parent="account.menu_finance_legal_statement"
id="menu_journals_report"
name="Journals"/>
parent="account.menu_finance_legal_statement"
id="menu_journals_report"
groups="group_account_user"
name="Journals"/>
</data>
</openerp>
addons/account/account_move_line.py
+63 -59
View File
@@ -36,12 +36,18 @@ class account_move_line(osv.osv):
fiscalperiod_obj = self.pool.get('account.period')
fiscalyear_ids = []
fiscalperiod_ids = []
if not context.get('fiscalyear', False) and not context.get('empty_fy_allow', False):
initial_bal = context.get('initial_bal', False)
company_clause = ""
if context.get('company_id', False):
company_clause = " AND " +obj+".company_id = %s" % context.get('company_id', False)
if not context.get('fiscalyear', False):
fiscalyear_ids = fiscalyear_obj.search(cr, uid, [('state', '=', 'draft')])
elif context.get('empty_fy_allow', False):
fiscalyear_ids = context['fiscalyear']
else:
fiscalyear_ids = [context['fiscalyear']]
if initial_bal:
fiscalyear_date_start = fiscalyear_obj.read(cr, uid, context['fiscalyear'], ['date_start'])['date_start']
fiscalyear_ids = fiscalyear_obj.search(cr, uid, [('date_stop', '<', fiscalyear_date_start), ('state', '=', 'draft')], context=context)
else:
fiscalyear_ids = [context['fiscalyear']]
fiscalyear_clause = (','.join([str(x) for x in fiscalyear_ids])) or '0'
state = context.get('state',False)
@@ -50,15 +56,36 @@ class account_move_line(osv.osv):
where_move_lines_by_date = ''
if context.get('date_from', False) and context.get('date_to', False):
where_move_lines_by_date = " AND " +obj+".move_id in ( select id from account_move where date >= '" +context['date_from']+"' AND date <= '"+context['date_to']+"')"
if initial_bal:
where_move_lines_by_date = " AND " +obj+".move_id in ( select id from account_move where date < '"+context['date_from']+"')"
else:
where_move_lines_by_date = " AND " +obj+".move_id in ( select id from account_move where date >= '" +context['date_from']+"' AND date <= '"+context['date_to']+"')"
if state:
if state.lower() not in ['all']:
where_move_state= " AND "+obj+".move_id in (select id from account_move where account_move.state = '"+state+"')"
if context.get('period_from', False) and context.get('period_to', False) and not context.get('periods', False):
if initial_bal:
period_company_id = fiscalperiod_obj.browse(cr, uid, context['period_from'], context=context).company_id.id
first_period = fiscalperiod_obj.search(cr, uid, [('company_id', '=', period_company_id)], order='date_start', limit=1)[0]
context['periods'] = fiscalperiod_obj.build_ctx_periods(cr, uid, first_period, context['period_from'])
else:
context['periods'] = fiscalperiod_obj.build_ctx_periods(cr, uid, context['period_from'], context['period_to'])
if context.get('periods', False):
ids = ','.join([str(x) for x in context['periods']])
query = obj+".state<>'draft' AND "+obj+".period_id in (SELECT id from account_period WHERE fiscalyear_id in (%s) AND id in (%s)) %s %s" % (fiscalyear_clause, ids, where_move_state, where_move_lines_by_date)
if initial_bal:
query = obj+".state<>'draft' AND "+obj+".period_id in (SELECT id from account_period WHERE fiscalyear_id in (%s) %s %s)" % (fiscalyear_clause, where_move_state, where_move_lines_by_date)
period_ids = fiscalperiod_obj.search(cr, uid, [('id', 'in', context['periods'])], order='date_start', limit=1)
if period_ids and period_ids[0]:
first_period = fiscalperiod_obj.browse(cr, uid, period_ids[0], context=context)
# Find the old periods where date start of those periods less then Start period
periods = fiscalperiod_obj.search(cr, uid, [('date_start', '<', first_period.date_start)])
periods = ','.join([str(x) for x in periods])
if periods:
query = obj+".state<>'draft' AND "+obj+".period_id in (SELECT id from account_period WHERE fiscalyear_id in (%s) OR id in (%s)) %s %s" % (fiscalyear_clause, periods, where_move_state, where_move_lines_by_date)
else:
ids = ','.join([str(x) for x in context['periods']])
query = obj+".state<>'draft' AND "+obj+".period_id in (SELECT id from account_period WHERE fiscalyear_id in (%s) AND id in (%s)) %s %s" % (fiscalyear_clause, ids, where_move_state, where_move_lines_by_date)
else:
query = obj+".state<>'draft' AND "+obj+".period_id in (SELECT id from account_period WHERE fiscalyear_id in (%s) %s %s)" % (fiscalyear_clause,where_move_state,where_move_lines_by_date)
@@ -69,41 +96,7 @@ class account_move_line(osv.osv):
child_ids = self.pool.get('account.account')._get_children_and_consol(cr, uid, [context['chart_account_id']], context=context)
query += ' AND '+obj+'.account_id in (%s)' % ','.join(map(str, child_ids))
if context.get('period_manner','') == 'created':
#the query have to be build with no reference to periods but thanks to the creation date
if context.get('periods',False):
#if one or more period are given, use them
fiscalperiod_ids = fiscalperiod_obj.search(cr, uid, [('id','in',context['periods'])])
else:
fiscalperiod_ids = self.pool.get('account.period').search(cr, uid, [('fiscalyear_id','in',fiscalyear_ids)])
#remove from the old query the clause related to the period selection
res = ''
count = 1
clause_list = query.split('AND')
ref_string = ' '+obj+'.period_id in'
for clause in clause_list:
if count != 1 and not clause.startswith(ref_string):
res += "AND"
if not clause.startswith(ref_string):
res += clause
count += 1
#add to 'res' a new clause containing the creation date criterion
count = 1
res += " AND ("
periods = self.pool.get('account.period').read(cr, uid, p_ids, ['date_start','date_stop'])
for period in periods:
if count != 1:
res += " OR "
#creation date criterion: the creation date of the move_line has to be
# between the date_start and the date_stop of the selected periods
res += "("+obj+".create_date between to_date('" + period['date_start'] + "','yyyy-mm-dd') and to_date('" + period['date_stop'] + "','yyyy-mm-dd'))"
count += 1
res += ")"
return res
query += company_clause
return query
@@ -309,15 +302,27 @@ class account_move_line(osv.osv):
ml = self.browse(cr, uid, id, context)
return map(lambda x: x.id, ml.move_id.line_id)
# TODO: this is false, it does not uses draft and closed periods
def _balance(self, cr, uid, ids, prop, unknow_none, unknow_dict):
res={}
# TODO group the foreach in sql
for id in ids:
cr.execute('SELECT date,account_id FROM account_move_line WHERE id=%s', (id,))
dt, acc = cr.fetchone()
cr.execute('SELECT SUM(debit-credit) FROM account_move_line WHERE account_id=%s AND (date<%s OR (date=%s AND id<=%s))', (acc,dt,dt,id))
res[id] = cr.fetchone()[0]
def _balance(self, cr, uid, ids, name, arg, context=None):
if context is None:
context = {}
c = context.copy()
c['initital_bal'] = True
sql = [
"""select l2.id, sum(l1.debit-l1.credit) from account_move_line l1, account_move_line l2""",
"""where l2.account_id=l1.account_id""",
"""and""",
"""l1.id<=l2.id""",
"""and""",
"""l2.id in %s""",
"""and""",
self._query_get(cr, uid, obj='l1', context=c),
""" group by l2.id""",
]
cr.execute('\n'.join(sql), [tuple(ids)])
res = dict(cr.fetchall())
return res
def _invoice(self, cursor, user, ids, name, arg, context=None):
@@ -344,7 +349,7 @@ class account_move_line(osv.osv):
return res
def name_get(self, cr, uid, ids, context={}):
if not len(ids):
if not ids:
return []
result = []
for line in self.browse(cr, uid, ids, context):
@@ -358,18 +363,18 @@ class account_move_line(osv.osv):
if context is None:
context = {}
if not len(args):
if not args:
return []
where = ' and '.join(map(lambda x: '(abs(sum(debit-credit))'+x[1]+str(x[2])+')',args))
cursor.execute('select id, sum(debit-credit) from account_move_line \
group by id, debit, credit having '+where)
res = cursor.fetchall()
if not len(res):
if not res:
return [('id', '=', '0')]
return [('id', 'in', [x[0] for x in res])]
def _invoice_search(self, cursor, user, obj, name, args, context):
if not len(args):
if not args:
return []
invoice_obj = self.pool.get('account.invoice')
@@ -402,7 +407,7 @@ class account_move_line(osv.osv):
qu2 += x[2]
else:
qu1.append(' (False)')
if len(qu1):
if qu1:
qu1 = ' AND' + ' AND'.join(qu1)
else:
qu1 = ''
@@ -410,7 +415,7 @@ class account_move_line(osv.osv):
'FROM account_move_line l, account_invoice i ' \
'WHERE l.move_id = i.move_id ' + qu1, qu2)
res = cursor.fetchall()
if not len(res):
if not res:
return [('id', '=', '0')]
return [('id', 'in', [x[0] for x in res])]
@@ -900,7 +905,6 @@ class account_move_line(osv.osv):
fld = sorted(fld, key=itemgetter(1))
widths = {
'ref': 50,
'statement_id': 50,
'state': 60,
'tax_code_id': 50,
@@ -985,7 +989,7 @@ class account_move_line(osv.osv):
part_rec_ids = [rec['reconcile_partial_id'][0] for rec in part_recs]
unlink_ids += rec_ids
unlink_ids += part_rec_ids
if len(unlink_ids):
if unlink_ids:
obj_move_rec.unlink(cr, uid, unlink_ids)
return True
addons/account/account_report.xml
+5 -4
View File
@@ -9,13 +9,13 @@
<report auto="False" id="account_central_journal" model="account.journal.period" name="account.central.journal" rml="account/report/account_central_journal.rml" string="Central Journals" header="False"/>
<report auto="False" id="account_general_journal" model="account.journal.period" name="account.general.journal" rml="account/report/account_general_journal.rml" string="General Journals" header="False"/>
<report auto="False" id="account_journal" model="account.journal.period" name="account.journal.period.print" rml="account/report/account_journal.rml" string="Journals" header="False"/>
<report auto="False" id="account_overdue" model="res.partner" name="account.overdue" rml="account/report/overdue.rml" string="Overdue Payments"/>
<report auto="False" id="account_overdue" model="res.partner" name="account.overdue" rml="account/report/account_print_overdue.rml" string="Overdue Payments"/>
<report
auto="False"
id="account_invoices"
model="account.invoice"
name="account.invoice"
rml="account/report/invoice.rml"
rml="account/report/account_print_invoice.rml"
string="Invoices"
attachment="(object.state in ('open','paid')) and ('INV'+(object.number or '').replace('/',''))"
attachment_use="1"/>
@@ -30,14 +30,14 @@
menu="False"
model="account.tax.code"
name="account.vat.declaration"
rml="account/report/tax_report.rml"
rml="account/report/account_tax_report.rml"
string="Taxes Report"/>
<report id="report_account_voucher_new"
string="Print Voucher"
model="account.move"
name="account.move.voucher"
rml="account/report/voucher_print.rml"
rml="account/report/account_voucher_print.rml"
auto="False"
header = "False"
menu="True"/>
@@ -45,6 +45,7 @@
<menuitem
id="menu_tax_report"
name="Taxes"
groups="group_account_user"
parent="account.menu_finance_generic_reporting" sequence="3"/>
<report id="account_account_balance_landscape"
addons/account/account_unit_test.xml
+8 -1
View File
@@ -14,6 +14,13 @@
<field name="name">Test invoice 1</field>
<field name="address_contact_id" ref="base.res_partner_address_tang"/>
</record>
<record id="test_tax_line" model="account.invoice.tax">
<field name="name">Test Tax</field>
<field name="base">5.00</field>
<field name="amount">100.00</field>
<field name="account_id" ref="account.ova"/>
<field name="invoice_id" ref="test_invoice_1"/>
</record>
<record id="test_invoice_1_line_1" model="account.invoice.line">
<field name="name">Basic computer with Dvorak keyboard and left-handed mouse</field>
<field name="invoice_id" ref="test_invoice_1"/>
@@ -27,7 +34,7 @@
<field name="price_unit">800</field>
<field name="quantity">2</field>
<field name="account_id" ref="account.a_sale"/>
</record>
</record>
<assert id="test_invoice_1" model="account.invoice" string="The currency unit of Test invoice 1 is EUR">
<test expr="currency_id.code">EUR</test>
addons/account/account_view.xml
+101 -105
View File
@@ -129,7 +129,7 @@
<field name="arch" type="xml">
<search string="Search Period">
<group>
<filter string="Draft" name="draft" domain="[('state','=','draft')]" icon="terp-document-new"/>
<filter string="To Close" name="draft" domain="[('state','=','draft')]" icon="terp-document-new"/>
<separator orientation="vertical"/>
<field name="name"/>
<field name="code"/>
@@ -236,6 +236,17 @@
</tree>
</field>
</record>
<record id="view_treasory_graph" model="ir.ui.view">
<field name="name">account.treasory.graph</field>
<field name="model">account.account</field>
<field name="type">graph</field>
<field name="arch" type="xml">
<graph string="Treasory Analysis" type="bar">
<field name="name"/>
<field name="balance" operator="+"/>
</graph>
</field>
</record>
<record id="action_account_form" model="ir.actions.act_window">
<field name="name">Accounts</field>
<field name="res_model">account.account</field>
@@ -347,10 +358,10 @@
<field name="arch" type="xml">
<tree string="Search Account Journal">
<group>
<filter domain="['|', ('type', '=', 'sale'), ('type', '=', 'sale_refund')]" string="Customer Journals" icon="terp-sale"/>
<filter domain="['|', ('type', '=', 'purchase'), ('type', '=', 'purchase_refund')]" string="Vendor Journals" icon="terp-purchase"/>
<filter domain="['|', ('type', '=', 'cash'), ('type', '=', 'bank')]" string="Liquidity Journals" icon="terp-dolar"/>
<filter domain="['|', ('type', '=', 'general'), ('type', '=', 'situation')]" string="Global Journals" icon="terp-stock"/>
<filter domain="['|', ('type', '=', 'sale'), ('type', '=', 'sale_refund')]" string="Sale" icon="terp-sale"/>
<filter domain="['|', ('type', '=', 'purchase'), ('type', '=', 'purchase_refund')]" string="Purchase" icon="terp-purchase"/>
<filter domain="['|', ('type', '=', 'cash'), ('type', '=', 'bank')]" string="Liquidity" icon="terp-dolar"/>
<filter domain="['|', ('type', '=', 'general'), ('type', '=', 'situation')]" string="Others" icon="terp-stock"/>
<separator orientation="vertical"/>
<field name="code"/>
<field name="name"/>
@@ -433,7 +444,7 @@
<menuitem action="action_account_journal_form" id="menu_action_account_journal_form" parent="account_account_menu"/>
<record id="view_account_bank_statement_filter" model="ir.ui.view">
<field name="name">account.bank.statement.select</field>
<field name="name">account.cash.statement.select</field>
<field name="model">account.bank.statement</field>
<field name="type">search</field>
<field name="arch" type="xml">
@@ -444,7 +455,7 @@
<separator orientation="vertical"/>
<field name="date"/>
<field name="name"/>
<field name="journal_id" widget='selection'/>
<field name="journal_id" widget='selection' domain="[('type', '=', 'cash')]" />
</group>
<newline/>
<group expand="0" string="Group By...">
@@ -471,8 +482,8 @@
<field name="balance_end_real"/>
<field name="balance_end" invisible="1"/>
<field name="state"/>
<button type="object" string="Confirm" name="button_confirm_bank" states="draft" icon="terp-camera_test"/>
<button type="object" string="Cancel" name="button_cancel" states="confirm" icon="gtk-cancel"/>
<button type="object" string="Confirm" name="button_confirm_bank" states="draft" icon="terp-camera_test"/>
</tree>
</field>
</record>
@@ -489,7 +500,7 @@
<field name="name"/>
<field name="date"/>
<field name="period_id"/>
<field name="journal_id" widget="selection"/>
<field name="journal_id" widget="selection" domain="[('type', '=', 'bank')]" />
</group>
<newline/>
<group expand="0" string="Group By...">
@@ -553,9 +564,9 @@
<group col="8" colspan="4">
<field name="state"/>
<field name="balance_end"/>
<button name="button_cancel" states="confirm" string="Cancel" type="object" icon="gtk-cancel"/>
<button name="button_dummy" states="draft" string="Compute" type="object" icon="terp-stock_format-scientific"/>
<button name="button_confirm_bank" states="draft" string="Confirm" type="object" icon="terp-camera_test"/>
<button name="button_cancel" states="confirm" string="Cancel" type="object" icon="gtk-cancel"/>
</group>
</form>
</field>
@@ -585,9 +596,9 @@
<group col="8" colspan="4">
<field name="state"/>
<field name="balance_end"/>
<button name="button_cancel" states="confirm" string="Cancel" type="object" icon="gtk-cancel"/>
<button name="button_dummy" states="draft" string="Compute" type="object" icon="terp-stock_format-scientific"/>
<button name="button_confirm_bank" states="draft" string="Confirm" type="object" icon="terp-camera_test"/>
<button name="button_cancel" states="confirm" string="Cancel" type="object" icon="gtk-cancel"/>
</group>
</form>
</field>
@@ -600,6 +611,7 @@
<field name="view_mode">tree,form,graph</field>
<field name="domain">[('journal_id.type', '=', 'bank')]</field>
<field name="context">{'journal_type':'bank'}</field>
<field name="search_view_id" ref="view_bank_statement_search"/>
</record>
<record model="ir.actions.act_window.view" id="action_bank_statement_tree_bank">
<field name="sequence" eval="1"/>
@@ -614,12 +626,13 @@
<field name="act_window_id" ref="action_bank_statement_tree"/>
</record>
<record id="action_bank_statement_periodic_tree" model="ir.actions.act_window">
<record id="action_bank_statement_periodic_tree" model="ir.actions.act_window">
<field name="name">Bank Statements</field>
<field name="res_model">account.bank.statement</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form,graph</field>
<field name="domain">[('journal_id.type', '=', 'bank')]</field>
<field name="search_view_id" ref="view_bank_statement_search"/>
<field name="context">{'journal_type':'bank'}</field>
</record>
<record model="ir.actions.act_window.view" id="action_bank_statement_periodic_tree_bank">
@@ -808,7 +821,6 @@
<field name="name"/>
<field name="price_include" groups="base.group_extended"/>
<field name="description"/>
<field name="tax_group" invisible="1"/>
</tree>
</field>
</record>
@@ -819,16 +831,10 @@
<field name="arch" type="xml">
<search string="Search Taxes">
<group col="10" colspan="4">
<filter icon="terp-folder-blue" string="Vat Taxes" domain="[('tax_group','=','vat')]" help="Vat Taxes"/>
<filter icon="terp-folder-yellow" string="Other Taxes" domain="[('tax_group','=','other')]" help="Other Taxes"/>
<separator orientation="vertical"/>
<field name="name"/>
<field name="description"/>
</group>
<newline/>
<group expand="0" string="Group By...">
<filter string="Tax Group" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'tax_group'}"/>
</group>
</search>
</field>
</record>
@@ -841,55 +847,49 @@
<group colspan="4" col="6">
<field name="name" select="1"/>
<field name="description" select="1"/>
<field name="tax_group" select="1"/>
<field name="type"/>
<field name="company_id" widget="selection" groups="base.group_multi_company"/>
<field name="type_tax_use"/>
<field name="price_include"/>
<field name="active"/>
<field name="company_id" widget="selection" groups="base.group_multi_company"/>
</group>
<notebook colspan="4">
<page string="Tax Definition" >
<group col="2" colspan="2">
<separator colspan="2" string=""/>
<field name="applicable_type"/>
<field name="type_tax_use"/>
<field groups="base.group_extended" name="domain"/>
<field groups="base.group_extended" name="sequence"/>
</group>
<group col="2" colspan="2">
<separator colspan="2" string=""/>
<field name="amount" attrs="{'readonly':[('type','in',('none', 'code'))]}"/>
<field groups="base.group_extended" name="child_depend"/>
<field groups="base.group_extended" name="price_include"/>
<field groups="base.group_extended" name="include_base_amount"/>
</group>
<field name="account_collected_id" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]"/>
<label colspan="2" nolabel="1" string="Keep empty to use the income account"/>
<field name="account_paid_id" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]"/>
<label colspan="2" nolabel="1" string="Keep empty to use the expense account"/>
<separator colspan="4" string="Child Taxes"/>
<field colspan="4" groups="base.group_extended" name="child_ids" nolabel="1"/>
</page>
<page string="Tax Declaration">
<separator colspan="4" string="Invoices"/>
<field name="base_code_id"/>
<field name="base_sign"/>
<field name="tax_code_id"/>
<field name="tax_sign"/>
<separator colspan="4" string="Credit Notes"/>
<field name="ref_base_code_id"/>
<field name="ref_base_sign"/>
<field name="ref_tax_code_id"/>
<field name="ref_tax_sign"/>
<group colspan="4" col="4">
<field name="type"/>
<field name="amount" attrs="{'readonly':[('type','in',('none', 'code', 'balance'))]}"/>
<separator colspan="4" string="Accounting Information"/>
<field name="account_collected_id" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]"/>
<label colspan="2" nolabel="1" string="Keep empty to use the income account"/>
<field name="account_paid_id" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]"/>
<label colspan="2" nolabel="1" string="Keep empty to use the expense account"/>
<separator colspan="4" string="Tax Declaration: Invoices"/>
<field name="base_code_id"/>
<field name="base_sign"/>
<field name="tax_code_id"/>
<field name="tax_sign"/>
<separator colspan="4" string="Tax Declaration: Credit Notes"/>
<field name="ref_base_code_id"/>
<field name="ref_base_sign"/>
<field name="ref_tax_code_id"/>
<field name="ref_tax_sign"/>
<separator groups="base.group_extended" colspan="4" string="Children Definition"/>
<field groups="base.group_extended" name="child_depend"/>
<field groups="base.group_extended" name="sequence"/>
<field groups="base.group_extended" name="include_base_amount"/>
<field groups="base.group_extended" colspan="4" name="child_ids"/>
</group>
</page>
<page groups="base.group_extended" string="Special Computation">
<separator colspan="4" string="Compute Code (if type=code)"/>
<field colspan="4" name="python_compute" nolabel="1" attrs="{'readonly':[('type','!=','code')],'required':[('type','=','code')]}"/>
<separator colspan="4" string="Applicability Options"/>
<field name="applicable_type"/>
<field name="domain"/>
<separator colspan="4" string="Applicable Code (if type=code)"/>
<field colspan="4" name="python_applicable" nolabel="1" attrs="{'readonly':[('applicable_type','=','true')], 'required':[('applicable_type','=','code')]}"/>
<separator colspan="4" string="Compute Code (if type=code)"/>
<field colspan="4" name="python_compute" nolabel="1" attrs="{'readonly':[('type','!=','code')],'required':[('type','=','code')]}"/>
</page>
</notebook>
</form>
</form>
</field>
</record>
<record id="action_tax_form" model="ir.actions.act_window">
@@ -910,13 +910,6 @@
<field name="help">Chart of Taxes is a tree view reflecting the structure of the Tax Cases (or tax codes) and shows the current tax situation. The tax chart represents the amount of each area of the tax declaration for your country. It’s presented in a hierarchical structure, which can be modified to fit your needs.</field>
</record>
<!--
<menuitem
action="action_tax_code_tree"
id="menu_action_tax_code_tree"
parent="menu_finance_charts"
sequence="12"/> --> <!-- move to wizard -->
<!--
Entries lines
-->
@@ -1154,7 +1147,7 @@
id="menu_action_account_moves_all"
parent="account.menu_finance_entries"
sequence="1"
groups="group_account_user,group_account_manager,base.group_system"
groups="group_account_user,group_account_manager"
/>
<record id="action_move_line_select" model="ir.actions.act_window">
@@ -1341,8 +1334,8 @@
<field name="narration" colspan="4" nolabel="1" height="50"/>
<group col="4" colspan="4">
<field name="state" select="1"/>
<button name="button_validate" states="draft" string="Approve" type="object" icon="terp-camera_test"/>
<button name="button_cancel" states="posted" string="Cancel" type="object" icon="gtk-cancel"/>
<button name="button_validate" states="draft" string="Approve" type="object" icon="terp-camera_test"/>
</group>
</page>
</notebook>
@@ -1400,6 +1393,7 @@
action="action_move_journal_line"
id="menu_action_move_journal_line_form"
parent="account.menu_finance_entries"
groups="group_account_user"
sequence="5"/>
<record id="action_move_line_form" model="ir.actions.act_window">
@@ -1418,10 +1412,6 @@
res_model="account.move.line"
src_model="account.move"/>
<record id="account.act_account_move_to_account_move_line_open" model="ir.actions.act_window">
<field eval="[(6,0,[ref('account.group_accounting_accountant')])]" name="groups_id"/>
</record>
<record id="action_move_line_search" model="ir.actions.act_window">
<field name="name">Journal Items</field>
<field name="type">ir.actions.act_window</field>
@@ -1443,10 +1433,8 @@
<field name="act_window_id" ref="action_move_line_search"/>
</record>
<menuitem id="menu_finance_charts" name="Charts" parent="account.menu_finance" sequence="4"/>
<record id="view_bank_statement_reconcile_form" model="ir.ui.view">
<field name="name">account.bank.statement.reconcile.form</field>
<field name="name">account.bank.statement.form</field>
<field name="model">account.bank.statement</field>
<field eval="30" name="priority"/>
<field name="type">form</field>
@@ -1493,9 +1481,9 @@
<group col="7" colspan="4">
<field name="state"/>
<field name="balance_end"/>
<button name="button_cancel" states="confirm" string="Cancel" type="object" icon="gtk-cancel"/>
<button name="button_dummy" states="draft" string="Compute" icon="terp-stock_format-scientific"/>
<button name="button_confirm" states="draft" string="Confirm" type="object" icon="terp-camera_test"/>
<button name="button_cancel" states="confirm" string="Cancel" type="object" icon="gtk-cancel"/>
</group>
</form>
</field>
@@ -1505,6 +1493,7 @@
<field name="res_model">account.bank.statement</field>
<field name="view_type">form</field>
<field name="view_mode">form,tree</field>
<field name="search_view_id" ref="view_bank_statement_search"/>
<field name="view_id" ref="view_bank_statement_reconcile_form"/>
</record>
@@ -1516,8 +1505,8 @@
<menuitem
name="Manual Reconcilication" icon="STOCK_EXECUTE"
action="action_account_manual_reconcile"
name="Manual Reconcilication" icon="STOCK_EXECUTE"
action="action_account_manual_reconcile"
id="menu_manual_reconcile"
parent="account.periodical_processing_reconciliation"/>
@@ -1579,7 +1568,7 @@
<field name="sequence"/>
<field name="name"/>
<field name="account_id"/>
<field name="analytic_account_id"/>
<field name="analytic_account_id" groups="analytic.group_analytic_accounting"/>
<field name="partner_id"/>
<field name="debit"/>
<field name="credit"/>
@@ -1598,7 +1587,7 @@
<field colspan="4" name="name" select="1"/>
<field name="sequence"/>
<field name="account_id" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]"/>
<field name="analytic_account_id"/>
<field name="analytic_account_id" groups="analytic.group_analytic_accounting"/>
<field name="partner_id"/>
<field name="debit" select="1"/>
<field name="credit" select="1"/>
@@ -1646,17 +1635,17 @@
<field name="type">search</field>
<field name="arch" type="xml">
<search string="Journal Entry Model">
<group>
<filter string="Sale" icon="terp-sale" domain="[('journal_id.type', '=', 'sale')]"/>
<filter string="Purchase" icon="terp-purchase" domain="[('journal_id.type', '=', 'purchase')]"/>
<separator orientation="vertical"/>
<field name="name"/>
<field name="journal_id"/>
<field name="company_id" groups="base.group_multi_company"/>
<group>
<filter string="Sale" icon="terp-sale" domain="[('journal_id.type', '=', 'sale')]"/>
<filter string="Purchase" icon="terp-purchase" domain="[('journal_id.type', '=', 'purchase')]"/>
<separator orientation="vertical"/>
<field name="name"/>
<field name="journal_id" widget="selection"/>
<field name="company_id" groups="base.group_multi_company"/>
</group>
<newline/>
<group expand="0" string="Group By...">
<filter string="Journal" icon="terp-folder-orange" domain="[]" context="{'group_by':'journal_id'}"/>
<filter string="Journal" icon="terp-folder-orange" domain="[]" context="{'group_by':'journal_id'}"/>
</group>
</search>
</field>
@@ -1669,7 +1658,9 @@
<field name="view_mode">tree,form,search</field>
<field name="search_view_id" ref="view_model_search"/>
</record>
<menuitem action="action_model_form" id="menu_action_model_form" sequence="5" parent="account.menu_configuration_misc" groups="base.group_extended"/>
<menuitem
action="action_model_form" id="menu_action_model_form" sequence="5"
parent="account.menu_configuration_misc" groups="base.group_extended"/>
<!--
# Payment Terms
@@ -1755,7 +1746,9 @@
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
</record>
<menuitem action="action_payment_term_form" id="menu_action_payment_term_form" parent="menu_configuration_misc"/>
<menuitem action="action_payment_term_form"
id="menu_action_payment_term_form" parent="menu_configuration_misc"
groups="group_account_manager"/>
<!--
# Account Subscriptions
@@ -1800,7 +1793,7 @@
</field>
</record>
<record id="view_subscription_search" model="ir.ui.view">
<record id="view_subscription_search" model="ir.ui.view">
<field name="name">account.subscription.search</field>
<field name="model">account.subscription</field>
<field name="type">search</field>
@@ -1867,7 +1860,11 @@
<field name="view_mode">tree,form</field>
<field name="search_view_id" ref="view_subscription_search"/>
</record>
<menuitem name="Define Recurring Entries" action="action_subscription_form" id="menu_action_subscription_form" sequence="1" parent="account.menu_finance_recurrent_entries"/>
<menuitem
name="Define Recurring Entries" action="action_subscription_form"
groups="base.group_extended"
id="menu_action_subscription_form" sequence="1"
parent="account.menu_finance_recurrent_entries"/>
<record id="action_subscription_form_running" model="ir.actions.act_window">
<field name="name">Running Subscriptions</field>
@@ -2089,7 +2086,6 @@
<field name="view_mode">tree,form,search</field>
</record>
<menuitem action="action_account_template_form" id="menu_action_account_template_form" parent="account_template_accounts"/>
<!-- Chart of Accounts Templates -->
@@ -2184,7 +2180,6 @@
<field name="description"/>
<newline/>
<field name="chart_template_id"/>
<field name="tax_group"/>
<field name="type"/>
<field name="type_tax_use"/>
</group>
@@ -2248,8 +2243,6 @@
<filter icon="terp-sale" string="Sale" domain="[('type_tax_use','=','sale')]" help="Taxes used in Sales"/>
<filter icon="terp-purchase" string="Purchase" domain="[('type_tax_use','=','purchase')]" help="Taxes used in Purchases"/>
<separator orientation="vertical"/>
<filter icon="terp-folder-blue" string="Vat Taxes" domain="[('tax_group','=','vat')]" help="Vat Taxes"/>
<filter icon="terp-folder-yellow" string="Other Taxes" domain="[('tax_group','=','other')]" help="Other Taxes"/>
<separator orientation="vertical"/>
<field name="name"/>
<field name="description"/>
@@ -2355,7 +2348,7 @@
<group string="res_config_contents" position="replace">
<field name="company_id" widget="selection"/>
<field name ="code_digits" />
<field name="chart_template_id"/>
<field name="chart_template_id" widget="selection"/>
<field name ="seq_journal" />
<field colspan="4" mode="tree" name="bank_accounts_id"
nolabel="1" widget="one2many_list">
@@ -2385,7 +2378,9 @@
<field name="target">new</field>
</record>
<menuitem name="New Company Financial Setting" parent="account.account_template_folder" action="account.action_account_configuration_installer" id="menu_wizard"/>
<menuitem name="New Company Financial Setting" parent="account.account_template_folder"
groups="group_account_manager"
action="account.action_account_configuration_installer" id="menu_wizard"/>
<record id="account_account_graph" model="ir.ui.view">
<field name="name">account.account.graph</field>
@@ -2399,14 +2394,14 @@
</field>
</record>
<!-- Fiscal Mapping Templates -->
<!-- Fiscal Position Templates -->
<record id="view_account_position_template_form" model="ir.ui.view">
<field name="name">account.fiscal.position.template.form</field>
<field name="model">account.fiscal.position.template</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Fiscal Mapping Template">
<form string="Fiscal Position Template">
<field name="name" select="1"/>
<field name="chart_template_id"/>
<newline/>
@@ -2438,14 +2433,14 @@
<field name="model">account.fiscal.position.template</field>
<field name="type">tree</field>
<field name="arch" type="xml">
<tree string="Fiscal Mapping">
<tree string="Fiscal Position">
<field name="name"/>
</tree>
</field>
</record>
<record id="action_account_fiscal_position_template_form" model="ir.actions.act_window">
<field name="name">Fiscal Mapping Templates</field>
<field name="name">Fiscal Position Templates</field>
<field name="res_model">account.fiscal.position.template</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
@@ -2471,9 +2466,9 @@
<field name="balance_end_real"/>
<field name="balance_end"/>
<field name="state"/>
<button type="object" string="Cancel" name="button_cancel" states="confirm" icon="gtk-cancel"/>
<button type="object" string="Open" name="button_open" states="draft" icon="terp-camera_test"/>
<button type="object" string="Confirm" name="button_confirm_bank" states="open" icon="terp-gtk-go-back-rtl"/>
<button type="object" string="Cancel" name="button_cancel" states="confirm" icon="gtk-cancel"/>
</tree>
</field>
</record>
@@ -2575,9 +2570,9 @@
</group>
<group col="8" colspan="4">
<field name="state" colspan="4"/>
<button name="button_cancel" states="confirm,open" string="Cancel" icon="terp-gtk-stop" type="object" groups="base.group_extended"/>
<button name="button_confirm_cash" states="open" string="Close CashBox" icon="terp-dialog-close" type="object"/>
<button name="button_open" states="draft" string="Open CashBox" icon="terp-document-new" type="object"/>
<button name="button_cancel" states="confirm,open" string="Cancel" icon="terp-gtk-stop" type="object" groups="base.group_extended"/>
</group>
</form>
</field>
@@ -2595,7 +2590,7 @@
</field>
</record>
<record id="action_view_bank_statement_tree" model="ir.actions.act_window">
<field name="name">Cash Register</field>
<field name="name">Cash Registers</field>
<field name="type">ir.actions.act_window</field>
<field name="res_model">account.bank.statement</field>
<field name="view_type">form</field>
@@ -2623,7 +2618,8 @@
<field name="view_id" ref="account_cash_statement_graph"/>
<field name="act_window_id" ref="action_view_bank_statement_tree"/>
</record>
<menuitem action="action_view_bank_statement_tree" id="journal_cash_move_lines" parent="menu_finance_bank_and_cash"/>
<menuitem action="action_view_bank_statement_tree" id="journal_cash_move_lines" parent="menu_finance_bank_and_cash"
groups="group_account_user"/>
</data>
</openerp>
addons/account/account_wizard.xml
+1 -1
View File
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<openerp>
<data>
<menuitem id="next_id_22" name="Partner Accounts" parent="menu_finance_generic_reporting" sequence="1"/>
<menuitem id="next_id_22" name="Partners" parent="menu_finance_generic_reporting" sequence="1"/>
</data>
</openerp>
addons/account/board_account_demo.xml
-13
View File
@@ -1,13 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<openerp>
<data noupdate="1">
<!--
Administrator shortcut
Demo user startup menu
-->
<record id="base.user_root" model="res.users">
<field name="action_id" ref="open_board_account"/>
</record>
</data>
</openerp>
addons/account/board_account_view.xml
+21 -4
View File
@@ -20,7 +20,22 @@
<field name="view_mode">graph,tree</field>
<field name="domain">[('type','=','income')]</field>
</record>
<record id="action_company_analysis_tree" model="ir.actions.act_window">
<field name="name">Company Analysis</field>
<field name="res_model">account.entries.report</field>
<field name="view_type">form</field>
<field name="view_mode">tree,graph</field>
<field name="context">{'group_by':['user_type'], 'group_by_no_leaf':1}</field>
<field name="view_id" ref="account.view_company_analysis_tree"/>
</record>
<record id="action_treasory_graph" model="ir.actions.act_window">
<field name="name">Treasory</field>
<field name="res_model">account.account</field>
<field name="view_type">form</field>
<field name="view_mode">graph,tree</field>
<field name="domain">[('type','=','liquidity')]</field>
<field name="view_id" ref="account.view_treasory_graph"/>
</record>
<record id="board_account_form" model="ir.ui.view">
<field name="name">board.account.form</field>
<field name="model">board.board</field>
@@ -30,10 +45,12 @@
<hpaned>
<child1>
<action colspan="4" height="160" width="400" name="%(account.action_invoice_tree1)d" string="Draft Customer Invoices" domain="[('state','=','draft'),('type','=','out_invoice')]"/>
<action colspan="4" height="160" width="400" name="%(action_company_analysis_tree)d" string="Company Analysis" />
</child1>
<child2>
<action colspan="4" height="220" name="%(action_treasory_graph)d" string="Treasory"/>
<action colspan="4" height="220" name="%(action_aged_receivable)d" string="Aged receivables"/>
<action colspan="4" height="220" name="%(action_aged_income)d" string="Aged income"/>
<!-- <action colspan="4" height="220" name="%(action_aged_income)d" string="Aged income"/> -->
</child2>
</hpaned>
</form>
@@ -49,8 +66,8 @@
<field name="view_id" ref="board_account_form"/>
</record>
<menuitem id="menu_dashboard_acc" name="Dashboard" sequence="2" parent="account.menu_finance_reporting" groups="group_account_user,group_account_manager,base.group_system"/>
<menuitem id="menu_dashboard_acc" name="Dashboard" sequence="2" parent="account.menu_finance_reporting" groups="group_account_user,group_account_manager"/>
<menuitem action="open_board_account" icon="terp-graph" id="menu_board_account" parent="menu_dashboard_acc" sequence="1"/>
<menuitem icon="terp-account" id="account.menu_finance" name="Accounting" sequence="13" action="open_board_account"/>
</data>
</openerp>
addons/account/company.py
+2 -1
View File
@@ -24,7 +24,7 @@ from osv import fields, osv
class res_company(osv.osv):
_inherit = "res.company"
_columns = {
'overdue_msg' : fields.text('Overdue Payments Message', translate=True),
'overdue_msg': fields.text('Overdue Payments Message', translate=True),
'property_reserve_and_surplus_account': fields.property(
'account.account',
type='many2one',
@@ -41,6 +41,7 @@ class res_company(osv.osv):
out after this mail was sent, please consider the present one as \
void. Do not hesitate to contact our accounting department'
}
res_company()
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
addons/account/i18n/ar.po
+41 -36
View File
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
"PO-Revision-Date: 2010-08-02 15:02+0000\n"
"Last-Translator: mga (Open ERP) <Unknown>\n"
"PO-Revision-Date: 2010-10-09 14:32+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-08-12 03:51+0000\n"
"X-Launchpad-Export-Date: 2010-10-10 04:55+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account
@@ -40,12 +40,12 @@ msgstr "تشفير المدخلات"
#. module: account
#: model:ir.actions.todo,note:account.config_wizard_account_base_setup_form
msgid "Specify The Message for the Overdue Payment Report."
msgstr ""
msgstr "تحديد الرسالة لتقرير الدفع المتأخر"
#. module: account
#: model:process.transition,name:account.process_transition_confirmstatementfromdraft0
msgid "Confirm statement from draft"
msgstr ""
msgstr "تأكيد الحساب من المسودة"
#. module: account
#: model:account.account.type,name:account.account_type_asset
@@ -55,17 +55,17 @@ msgstr "أصل"
#. module: account
#: constraint:ir.actions.act_window:0
msgid "Invalid model name in the action definition."
msgstr ""
msgstr "اسم النموذج غير صالح في تعريف العمل."
#. module: account
#: help:account.journal,currency:0
msgid "The currency used to enter statement"
msgstr ""
msgstr "العملة المستعملة لإدخال البيان"
#. module: account
#: wizard_view:account_use_models,init_form:0
msgid "Select Message"
msgstr ""
msgstr "اختر رسالة"
#. module: account
#: help:product.category,property_account_income_categ:0
@@ -73,54 +73,55 @@ msgid ""
"This account will be used to value incoming stock for the current product "
"category"
msgstr ""
"سيتم استخدام هذا الحساب لتقييم المؤن الواردة بالنسبة لفئة المنتج الحالي"
#. module: account
#: help:account.invoice,period_id:0
msgid "Keep empty to use the period of the validation(invoice) date."
msgstr ""
msgstr "الإبقاء فارغ لاستخدام فترة تاريخ المصادقة (الفاتورة)"
#. module: account
#: wizard_view:account.automatic.reconcile,reconcile:0
msgid "Reconciliation result"
msgstr ""
msgstr "نتيجة التسوية"
#. module: account
#: model:ir.actions.act_window,name:account.act_account_acount_move_line_open_unreconciled
msgid "Unreconciled entries"
msgstr ""
msgstr "إدخالات لم يتم تسويتها"
#. module: account
#: field:account.invoice.tax,base_code_id:0
#: field:account.tax,base_code_id:0
#: field:account.tax.template,base_code_id:0
msgid "Base Code"
msgstr ""
msgstr "رمز الأساس"
#. module: account
#: view:account.account:0
msgid "Account Statistics"
msgstr ""
msgstr "إحصائيات الحساب"
#. module: account
#: model:ir.actions.wizard,name:account.wizard_vat_declaration
#: model:ir.ui.menu,name:account.menu_wizard_vat_declaration
msgid "Print Taxes Report"
msgstr ""
msgstr "طباعة تقرير الضرائب"
#. module: account
#: field:account.account,parent_id:0
msgid "Parent"
msgstr ""
msgstr "أصل"
#. module: account
#: selection:account.move,type:0
msgid "Journal Voucher"
msgstr ""
msgstr "قسيمة الدفتر"
#. module: account
#: field:account.invoice,residual:0
msgid "Residual"
msgstr ""
msgstr "متبقي"
#. module: account
#: field:account.tax,base_sign:0
@@ -128,18 +129,18 @@ msgstr ""
#: field:account.tax.template,base_sign:0
#: field:account.tax.template,ref_base_sign:0
msgid "Base Code Sign"
msgstr ""
msgstr "علامة رمز الأساس"
#. module: account
#: model:ir.actions.wizard,name:account.wizard_unreconcile_select
#: model:ir.ui.menu,name:account.menu_unreconcile_select
msgid "Unreconcile entries"
msgstr ""
msgstr "إلغاء تسوية الإدخالات"
#. module: account
#: constraint:account.period:0
msgid "Error ! The duration of the Period(s) is/are invalid. "
msgstr ""
msgstr "خظأ! إن مدة الفترة أو الفترات غير صالحة "
#. module: account
#: view:account.bank.statement.reconcile:0
@@ -149,17 +150,17 @@ msgstr ""
#: model:ir.actions.act_window,name:account.action_move_line_form
#: model:ir.ui.menu,name:account.menu_action_move_line_form
msgid "Entries"
msgstr ""
msgstr "إدخالات"
#. module: account
#: selection:account.move.line,centralisation:0
msgid "Debit Centralisation"
msgstr ""
msgstr "تمركز المدين"
#. module: account
#: model:ir.actions.wizard,name:account.wizard_invoice_state_confirm
msgid "Confirm draft invoices"
msgstr ""
msgstr "تثبيت مشاريع الفواتير"
#. module: account
#: help:account.payment.term.line,days2:0
@@ -168,11 +169,14 @@ msgid ""
"positive, it gives the day of the next month. Set 0 for net days (otherwise "
"it's based on the beginning of the month)."
msgstr ""
"يوم الشهر، إدخال -1 من أجل آخر يوم من الشهر الحالي. إذا كان إيجابيا فسيعطي "
"اليوم من الشهر القادم. إدخال 0 من أجل أيام صافية (وإلا فإنه يستند إلى بداية "
"الشهر)."
#. module: account
#: view:account.move:0
msgid "Total Credit"
msgstr ""
msgstr "مجموع المدين"
#. module: account
#: field:account.config.wizard,charts:0
@@ -190,39 +194,39 @@ msgstr ""
#: rml:account.third_party_ledger:0
#: rml:account.third_party_ledger_other:0
msgid "Entry label"
msgstr ""
msgstr "تسمية المدخل"
#. module: account
#: model:ir.model,name:account.model_account_model_line
msgid "Account Model Entries"
msgstr ""
msgstr "إدخالات نماذج الحسابات"
#. module: account
#: field:account.tax.code,sum_period:0
msgid "Period Sum"
msgstr ""
msgstr "مجموع الفترة"
#. module: account
#: view:account.tax:0
#: view:account.tax.template:0
msgid "Compute Code (if type=code)"
msgstr ""
msgstr "رمز الحساب (إذا كان النوع = الرمز)"
#. module: account
#: view:account.move:0
#: view:account.move.line:0
msgid "Account Entry Line"
msgstr ""
msgstr "خط إدخال الحساب"
#. module: account
#: wizard_view:account.aged.trial.balance,init:0
msgid "Aged Trial Balance"
msgstr ""
msgstr "ميزان المراجعة القديم"
#. module: account
#: model:ir.ui.menu,name:account.menu_finance_recurrent_entries
msgid "Recurrent Entries"
msgstr ""
msgstr "إدخالات متكررة"
#. module: account
#: field:account.analytic.line,amount:0
@@ -235,19 +239,19 @@ msgstr ""
#: field:account.tax.template,amount:0
#: xsl:account.transfer:0
msgid "Amount"
msgstr ""
msgstr "المبلغ"
#. module: account
#: model:ir.actions.report.xml,name:account.account_3rdparty_ledger
#: model:ir.actions.wizard,name:account.wizard_third_party_ledger
#: model:ir.ui.menu,name:account.menu_third_party_ledger
msgid "Partner Ledger"
msgstr ""
msgstr "دفتر الشركاء"
#. module: account
#: field:product.template,supplier_taxes_id:0
msgid "Supplier Taxes"
msgstr ""
msgstr "ضرائب المورد"
#. module: account
#: view:account.move:0
@@ -1789,7 +1793,8 @@ msgstr ""
#. module: account
#: help:res.partner,property_account_position:0
msgid ""
"The fiscal mapping will determine taxes and the accounts used for the partner."
"The fiscal mapping will determine taxes and the accounts used for the "
"partner."
msgstr ""
#. module: account
@@ -4000,7 +4005,7 @@ msgstr ""
#. module: account
#: field:account.move.line,amount_taxed:0
msgid "Taxed Amount"
msgstr ""
msgstr "حساب ضريبي"
#. module: account
#: field:account.invoice.line,price_subtotal:0
addons/account/i18n/bg.po
+5 -4
View File
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
"PO-Revision-Date: 2010-08-02 18:03+0000\n"
"Last-Translator: mga (Open ERP) <Unknown>\n"
"PO-Revision-Date: 2010-09-29 10:00+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-08-12 03:51+0000\n"
"X-Launchpad-Export-Date: 2010-09-30 04:40+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account
@@ -1807,7 +1807,8 @@ msgstr ""
#. module: account
#: help:res.partner,property_account_position:0
msgid ""
"The fiscal mapping will determine taxes and the accounts used for the partner."
"The fiscal mapping will determine taxes and the accounts used for the "
"partner."
msgstr ""
#. module: account
addons/account/i18n/bs.po
+5 -4
View File
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
"PO-Revision-Date: 2010-08-03 11:13+0000\n"
"Last-Translator: OpenERP Administrators <Unknown>\n"
"PO-Revision-Date: 2010-09-29 09:07+0000\n"
"Last-Translator: Fabien (Open ERP) <fp@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-08-12 03:51+0000\n"
"X-Launchpad-Export-Date: 2010-09-30 04:39+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account
@@ -1824,7 +1824,8 @@ msgstr "Slijedeći"
#. module: account
#: help:res.partner,property_account_position:0
msgid ""
"The fiscal mapping will determine taxes and the accounts used for the partner."
"The fiscal mapping will determine taxes and the accounts used for the "
"partner."
msgstr ""
#. module: account
addons/account/i18n/ca.po
+5 -5
View File
@@ -7,14 +7,14 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
"PO-Revision-Date: 2010-08-03 11:28+0000\n"
"PO-Revision-Date: 2010-09-29 09:27+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-08-12 03:51+0000\n"
"X-Launchpad-Export-Date: 2010-09-30 04:40+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account
@@ -219,7 +219,7 @@ msgstr "Codi per calcular (si tipus=codi)"
#: view:account.move:0
#: view:account.move.line:0
msgid "Account Entry Line"
msgstr "Línia de l'assentament comptable"
msgstr "Apunt comptable"
#. module: account
#: wizard_view:account.aged.trial.balance,init:0
@@ -1830,9 +1830,9 @@ msgstr "Següent"
#. module: account
#: help:res.partner,property_account_position:0
msgid ""
"The fiscal mapping will determine taxes and the accounts used for the partner."
"The fiscal mapping will determine taxes and the accounts used for the "
"partner."
msgstr ""
""
#. module: account
#: rml:account.analytic.account.cost_ledger:0
addons/account/i18n/cs.po
+3 -2
View File
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-08-12 03:51+0000\n"
"X-Launchpad-Export-Date: 2010-09-29 05:00+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account
@@ -1791,7 +1791,8 @@ msgstr ""
#. module: account
#: help:res.partner,property_account_position:0
msgid ""
"The fiscal mapping will determine taxes and the accounts used for the partner."
"The fiscal mapping will determine taxes and the accounts used for the "
"partner."
msgstr ""
#. module: account
addons/account/i18n/da.po
+14 -11
View File
@@ -8,13 +8,13 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
"PO-Revision-Date: 2010-09-08 09:01+0000\n"
"PO-Revision-Date: 2010-09-29 11:06+0000\n"
"Last-Translator: OpenERP Administrators <Unknown>\n"
"Language-Team: Danish <da@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-09-09 04:45+0000\n"
"X-Launchpad-Export-Date: 2010-09-30 04:40+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account
@@ -25,13 +25,13 @@ msgstr "Internt navn"
#. module: account
#: view:account.tax.code:0
msgid "Account Tax Code"
msgstr ""
msgstr "Konto momsklasse"
#. module: account
#: model:ir.actions.act_window,name:account.action_invoice_tree9
#: model:ir.ui.menu,name:account.menu_action_invoice_tree9
msgid "Unpaid Supplier Invoices"
msgstr ""
msgstr "Ubetalte leverandør fakturaer."
#. module: account
#: model:ir.ui.menu,name:account.menu_finance_entries
@@ -66,7 +66,7 @@ msgstr ""
#. module: account
#: wizard_view:account_use_models,init_form:0
msgid "Select Message"
msgstr "Vælg meddelelse."
msgstr "Vælg besked"
#. module: account
#: help:product.category,property_account_income_categ:0
@@ -95,12 +95,12 @@ msgstr ""
#: field:account.tax,base_code_id:0
#: field:account.tax.template,base_code_id:0
msgid "Base Code"
msgstr ""
msgstr "Base kode"
#. module: account
#: view:account.account:0
msgid "Account Statistics"
msgstr ""
msgstr "Konto statistikker"
#. module: account
#: model:ir.actions.wizard,name:account.wizard_vat_declaration
@@ -140,7 +140,7 @@ msgstr ""
#. module: account
#: constraint:account.period:0
msgid "Error ! The duration of the Period(s) is/are invalid. "
msgstr "Fejl! Den angivne periode er ikke korrekt. "
msgstr "Fejl! Varigheden af den periode(r) er ugyldige. "
#. module: account
#: view:account.bank.statement.reconcile:0
@@ -155,7 +155,7 @@ msgstr "Postering"
#. module: account
#: selection:account.move.line,centralisation:0
msgid "Debit Centralisation"
msgstr ""
msgstr "Debet centralisering."
#. module: account
#: model:ir.actions.wizard,name:account.wizard_invoice_state_confirm
@@ -169,6 +169,9 @@ msgid ""
"positive, it gives the day of the next month. Set 0 for net days (otherwise "
"it's based on the beginning of the month)."
msgstr ""
"Dag i måneden, set -1 for den sidste dag i måneden. Hvis positiv, indsættes "
"dagen i efterfølgende måned. Sæt 0 for d.d. (ellers vil det være baseret på "
"efterfølgende måned)"
#. module: account
#: view:account.move:0
@@ -178,7 +181,7 @@ msgstr "Total kredit"
#. module: account
#: field:account.config.wizard,charts:0
msgid "Charts of Account"
msgstr ""
msgstr "Diagrammer af kontoen"
#. module: account
#: model:ir.actions.wizard,name:account.wizard_move_line_select
@@ -1803,7 +1806,7 @@ msgstr ""
#. module: account
#: help:res.partner,property_account_position:0
msgid ""
"The fiscal mapping will determine taxes and the accounts used for the "
"The fiscal mapping will determine taxes and the accounts used for the "
"partner."
msgstr ""
addons/account/i18n/de.po
+15 -14
View File
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
"PO-Revision-Date: 2010-08-29 10:43+0000\n"
"PO-Revision-Date: 2010-10-11 07:18+0000\n"
"Last-Translator: Ferdinand-chricar <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-08-30 03:57+0000\n"
"X-Launchpad-Export-Date: 2010-10-13 04:58+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account
@@ -630,7 +630,7 @@ msgstr "(frei lassen um aktuelle Einstellung zu verwenden)"
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_account
msgid "Accounts Fiscal Mapping"
msgstr ""
msgstr "Konten Steuer Umschlüsselung"
#. module: account
#: field:account.analytic.account,contact_id:0
@@ -1030,7 +1030,7 @@ msgstr "Nettosumme:"
#: model:ir.model,name:account.model_account_fiscal_position
#: field:res.partner,property_account_position:0
msgid "Fiscal Mapping"
msgstr ""
msgstr "Steuer Umschlüsselung"
#. module: account
#: field:account.analytic.line,product_uom_id:0
@@ -1052,7 +1052,7 @@ msgstr "(Sub-)"
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_tax
msgid "Taxes Fiscal Mapping"
msgstr ""
msgstr "Steuern Umschlüsselung"
#. module: account
#: model:ir.actions.act_window,name:account.action_invoice_tree2_new
@@ -1141,7 +1141,7 @@ msgstr "Neues Analytisches Konto"
#: model:ir.actions.act_window,name:account.action_account_fiscal_position_template_form
#: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form_template
msgid "Fiscal Mapping Templates"
msgstr ""
msgstr "Steuer Umschlüsselung Vorlagen"
#. module: account
#: rml:account.invoice:0
@@ -1173,7 +1173,7 @@ msgstr "optionaler Betrag in anderer Währung"
#: view:account.fiscal.position.template:0
#: field:account.fiscal.position.template,name:0
msgid "Fiscal Mapping Template"
msgstr ""
msgstr "Steuer Umschlüsselung Vorlage"
#. module: account
#: field:account.payment.term,line_ids:0
@@ -1244,7 +1244,7 @@ msgstr "Betriebl. Währung"
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_account_template
msgid "Template Account Fiscal Mapping"
msgstr ""
msgstr "Konten Steuerumschlüsselung Vorlagen"
#. module: account
#: field:account.analytic.account,parent_id:0
@@ -1825,9 +1825,10 @@ msgstr "Weiter"
#. module: account
#: help:res.partner,property_account_position:0
msgid ""
"The fiscal mapping will determine taxes and the accounts used for the partner."
"The fiscal mapping will determine taxes and the accounts used for the "
"partner."
msgstr ""
""
"Die Steuerumschlüsselung legt Steuern und Konten für diesen PArtner fest."
#. module: account
#: rml:account.analytic.account.cost_ledger:0
@@ -2102,7 +2103,7 @@ msgstr "Prozess Abrechnung von Kundenaufträgen"
#. module: account
#: rml:account.invoice:0
msgid "Fiscal Mapping Remark :"
msgstr ""
msgstr "Steuer Umschlüsselung Anmerkung:"
#. module: account
#: wizard_field:account.fiscalyear.close,init,period_id:0
@@ -3701,7 +3702,7 @@ msgstr "Sequenzer"
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_template
msgid "Template for Fiscal Mapping"
msgstr ""
msgstr "Steuerumschlüsselung Vorlage"
#. module: account
#: view:account.bank.statement:0
@@ -3808,7 +3809,7 @@ msgstr "Entwurf Rechnungen"
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_tax_template
msgid "Template Tax Fiscal Mapping"
msgstr ""
msgstr "Steuer Umschlüsselung Vorlage"
#. module: account
#: rml:account.invoice:0
@@ -6007,7 +6008,7 @@ msgstr "Zahlungsbedingung"
#: model:ir.actions.act_window,name:account.action_account_fiscal_position_form
#: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form
msgid "Fiscal Mappings"
msgstr ""
msgstr "Steuer Umschlüsselung"
#. module: account
#: model:process.process,name:account.process_process_statementprocess0
addons/account/i18n/el.po
+5 -5
View File
@@ -8,13 +8,13 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
"PO-Revision-Date: 2010-08-02 18:21+0000\n"
"Last-Translator: mga (Open ERP) <Unknown>\n"
"PO-Revision-Date: 2010-09-29 09:26+0000\n"
"Last-Translator: OpenERP Administrators <Unknown>\n"
"Language-Team: Greek <el@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-08-12 03:52+0000\n"
"X-Launchpad-Export-Date: 2010-09-30 04:40+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account
@@ -1832,9 +1832,9 @@ msgstr "Επόμενο"
#. module: account
#: help:res.partner,property_account_position:0
msgid ""
"The fiscal mapping will determine taxes and the accounts used for the partner."
"The fiscal mapping will determine taxes and the accounts used for the "
"partner."
msgstr ""
""
#. module: account
#: rml:account.analytic.account.cost_ledger:0
addons/account/i18n/es.po
+4 -3
View File
@@ -7,14 +7,14 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
"PO-Revision-Date: 2010-08-02 18:23+0000\n"
"PO-Revision-Date: 2010-09-29 09:09+0000\n"
"Last-Translator: Albert Cervera i Areny - http://www.NaN-tic.com <albert@nan-"
"tic.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-08-12 03:53+0000\n"
"X-Launchpad-Export-Date: 2010-09-30 04:42+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account
@@ -1831,7 +1831,8 @@ msgstr "Siguiente"
#. module: account
#: help:res.partner,property_account_position:0
msgid ""
"The fiscal mapping will determine taxes and the accounts used for the partner."
"The fiscal mapping will determine taxes and the accounts used for the "
"partner."
msgstr ""
#. module: account
addons/account/i18n/es_AR.po
+59 -24
View File
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-08-12 03:54+0000\n"
"X-Launchpad-Export-Date: 2010-09-29 05:04+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account
@@ -178,7 +178,7 @@ msgstr ""
#. module: account
#: view:account.move:0
msgid "Total Credit"
msgstr ""
msgstr "Crédito total"
#. module: account
#: field:account.config.wizard,charts:0
@@ -258,7 +258,7 @@ msgstr "Impuestos del proveedor"
#. module: account
#: view:account.move:0
msgid "Total Debit"
msgstr ""
msgstr "Total debe"
#. module: account
#: rml:account.tax.code.entries:0
@@ -325,7 +325,7 @@ msgstr "Origen"
#. module: account
#: rml:account.analytic.account.journal:0
msgid "Move Name"
msgstr ""
msgstr "Mover nombre"
#. module: account
#: xsl:account.transfer:0
@@ -415,7 +415,7 @@ msgstr "Conciliación del pago"
#. module: account
#: model:account.journal,name:account.expenses_journal
msgid "Journal de frais"
msgstr ""
msgstr "Diario de gastos"
#. module: account
#: model:ir.actions.act_window,name:account.act_acc_analytic_acc_5_report_hr_timesheet_invoice_journal
@@ -435,7 +435,7 @@ msgstr "Negativo"
#. module: account
#: rml:account.partner.balance:0
msgid "(Account/Partner) Name"
msgstr ""
msgstr "Nombre de Cuenta/Empresa"
#. module: account
#: selection:account.move,type:0
@@ -1153,7 +1153,7 @@ msgstr "Precio unitario"
#. module: account
#: rml:account.analytic.account.journal:0
msgid "Period from :"
msgstr ""
msgstr "Período desde :"
#. module: account
#: model:ir.model,name:account.model_wizard_multi_charts_accounts
@@ -1163,7 +1163,7 @@ msgstr "asistente.multi.charts.accounts"
#. module: account
#: model:account.journal,name:account.sales_journal
msgid "Journal de vente"
msgstr ""
msgstr "Diario de ventas"
#. module: account
#: help:account.model.line,amount_currency:0
@@ -1509,7 +1509,7 @@ msgstr "Cerrar estados"
#. module: account
#: model:ir.model,name:account.model_wizard_company_setup
msgid "wizard.company.setup"
msgstr ""
msgstr "wizard.company.setup"
#. module: account
#: model:ir.actions.act_window,name:account.action_account_analytic_account_line_extended_form
@@ -1590,7 +1590,7 @@ msgstr "Abrir para Conciliación"
#. module: account
#: model:account.journal,name:account.bilan_journal
msgid "Journal d'ouverture"
msgstr ""
msgstr "Diario de apertura"
#. module: account
#: selection:account.tax,tax_group:0
@@ -1828,7 +1828,8 @@ msgstr "Siguiente"
#. module: account
#: help:res.partner,property_account_position:0
msgid ""
"The fiscal mapping will determine taxes and the accounts used for the partner."
"The fiscal mapping will determine taxes and the accounts used for the "
"partner."
msgstr ""
#. module: account
@@ -2387,7 +2388,7 @@ msgstr "Plantilla del plan de cuentas"
#. module: account
#: model:account.journal,name:account.refund_sales_journal
msgid "Journal d'extourne"
msgstr ""
msgstr "Diario de inversión"
#. module: account
#: rml:account.journal.period.print:0
@@ -2481,7 +2482,7 @@ msgstr "Abrir diario"
#. module: account
#: rml:account.analytic.account.journal:0
msgid "KI"
msgstr ""
msgstr "KI"
#. module: account
#: model:ir.actions.wizard,name:account.action_account_analytic_line
@@ -2669,7 +2670,7 @@ msgstr "Crear factura"
#. module: account
#: model:account.account.type,name:account.account_type_cash_equity
msgid "Equity"
msgstr ""
msgstr "Patrimonio"
#. module: account
#: field:wizard.company.setup,overdue_msg:0
@@ -2736,7 +2737,7 @@ msgstr "-"
#. module: account
#: rml:account.analytic.account.journal:0
msgid "asgfas"
msgstr ""
msgstr "asgfas"
#. module: account
#: model:ir.actions.act_window,name:account.action_account_analytic_account_tree2
@@ -3221,7 +3222,7 @@ msgstr "Cuenta"
#. module: account
#: model:account.journal,name:account.bank_journal
msgid "Journal de Banque CHF"
msgstr ""
msgstr "Diario de bancos"
#. module: account
#: selection:account.account.balance.report,checktype,state:0
@@ -3892,7 +3893,7 @@ msgstr ""
#: model:ir.actions.act_window,name:account.action_wizard_company_setup_form
#: view:wizard.company.setup:0
msgid "Overdue Payment Report Message"
msgstr ""
msgstr "Mensaje para reporte de pagos vencidos"
#. module: account
#: selection:account.tax,tax_group:0
@@ -4523,7 +4524,7 @@ msgstr "¿Está seguro que desea abrir esta factura?"
#. module: account
#: model:ir.actions.report.xml,name:account.account_3rdparty_ledger_other
msgid "Partner Other Ledger"
msgstr ""
msgstr "Asociar Otro Libro Mayor"
#. module: account
#: view:res.partner:0
@@ -4557,7 +4558,7 @@ msgstr "Asientos contables"
#. module: account
#: model:ir.actions.act_window,name:account.act_account_partner_account_move_unreconciled
msgid "Receivables & Payables"
msgstr ""
msgstr "Cuentas a cobrar y pagar"
#. module: account
#: rml:account.general.ledger:0
@@ -4812,7 +4813,7 @@ msgstr "Ref."
#. module: account
#: field:account.invoice,address_invoice_id:0
msgid "Invoice Address"
msgstr "Dirección de facturación"
msgstr "Domicilio de Facturación"
#. module: account
#: rml:account.analytic.account.analytic.check:0
@@ -4866,7 +4867,7 @@ msgstr "Cuentas a cobrar"
#. module: account
#: wizard_button:account.move.line.unreconcile.select,init,open:0
msgid "Open for unreconciliation"
msgstr "Abrir para desconciliar"
msgstr "Abrir para des-conciliar"
#. module: account
#: field:account.bank.statement.reconcile,statement_line:0
@@ -4939,7 +4940,7 @@ msgstr "Impuestos de ventas"
#. module: account
#: model:ir.model,name:account.model_account_move_reconcile
msgid "Account Reconciliation"
msgstr "Conciliación de la cuenta"
msgstr "Conciliación Contable"
#. module: account
#: view:account.bank.statement:0
@@ -5023,7 +5024,7 @@ msgstr "Fecha de operación"
#. module: account
#: field:account.invoice,invoice_line:0
msgid "Invoice Lines"
msgstr "Líneas de factura"
msgstr "Líneas de la factura"
#. module: account
#: field:account.period,date_start:0
@@ -6238,7 +6239,7 @@ msgstr ""
#. module: account
#: wizard_view:account.balance.account.balance.report,init:0
msgid "Select Period"
msgstr ""
msgstr "Seleccionar período"
#. module: account
#: wizard_view:account.balance.account.balance.report,init:0
@@ -6428,6 +6429,9 @@ msgstr ""
#~ msgid "You can not use this general account in this journal !"
#~ msgstr "¡No puede usar esta cuenta general en este diario!"
#~ msgid "Fiscal Position Accounts Mapping"
#~ msgstr "Mapeo de cuentas y posición fiscal"
#, python-format
#~ msgid "You can not add/modify entries in a closed journal."
#~ msgstr "No puede añadir/modificar asientos en un diario cerrado."
@@ -6452,6 +6456,18 @@ msgstr ""
#~ msgstr ""
#~ "El diario de apertura no debe tener ningún asiento en el nuevo año fiscal !"
#~ msgid "Fiscal Position Taxes Mapping"
#~ msgstr "Cruce de posición de impuestos fiscales"
#~ msgid "Fiscal Position"
#~ msgstr "Posición fiscal"
#~ msgid "Fiscal Position Template"
#~ msgstr "Plantilla de posición fiscal"
#~ msgid "Fiscal Position Templates"
#~ msgstr "Plantillas de posiciones fiscales"
#, python-format
#~ msgid ""
#~ "The expected balance (%.2f) is different than the computed one. (%.2f)"
@@ -6491,6 +6507,13 @@ msgstr ""
#~ msgid "Entries are not of the same account or already reconciled ! "
#~ msgstr "Asientos no son de la misma cuenta o ya están conciliados ! "
#~ msgid ""
#~ "The fiscal position will determine taxes and the accounts used for the the "
#~ "partner."
#~ msgstr ""
#~ "La posición fiscal determinará los impuestos y las cuentas utilizadas por el "
#~ "partner"
#, python-format
#~ msgid "Invalid action !"
#~ msgstr "Acción no válida !"
@@ -6572,6 +6595,9 @@ msgstr ""
#~ msgid "SAJ"
#~ msgstr "VENTA"
#~ msgid "Template for Fiscal Position"
#~ msgstr "Plantilla para posición fiscal"
#, python-format
#~ msgid "The journal must have centralised counterpart"
#~ msgstr "El diario debe tener una contrapartida centralizada"
@@ -6632,6 +6658,9 @@ msgstr ""
#~ msgid "You have to define an analytic journal on the '%s' journal!"
#~ msgstr "¡Debe definir un diario analítico en el diario '%s'!"
#~ msgid "Fiscal Positions"
#~ msgstr "Posiciones fiscales"
#, python-format
#~ msgid "No Period found on Invoice!"
#~ msgstr "No se encontro el período en la factura"
@@ -6658,6 +6687,9 @@ msgstr ""
#~ msgid "You must select accounts to reconcile"
#~ msgstr "Debe seleccionar las cuentas a conciliar"
#~ msgid "Fiscal Position Template Account Mapping"
#~ msgstr "Asociación de cuentas Planilla posición fiscal"
#, python-format
#~ msgid "Cannot create invoice move on centralised journal"
#~ msgstr ""
@@ -6709,6 +6741,9 @@ msgstr ""
#~ msgid "Data Insufficient !"
#~ msgstr "¡Datos insuficientes!"
#~ msgid "Fiscal Position Template Tax Mapping"
#~ msgstr "Asociación de impuestos plantilla posición fiscal"
#, python-format
#~ msgid "Can not pay draft/proforma/cancel invoice."
#~ msgstr "No se puede pagar una factura en estado borrador/proforma/cancelada."
addons/account/i18n/es_EC.po
+23 -19
View File
@@ -8,13 +8,13 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
"PO-Revision-Date: 2010-08-20 21:45+0000\n"
"PO-Revision-Date: 2010-09-18 22:37+0000\n"
"Last-Translator: Cristian Salamea (GnuThink) <ovnicraft@gmail.com>\n"
"Language-Team: Spanish (Ecuador) <es_EC@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-08-21 03:57+0000\n"
"X-Launchpad-Export-Date: 2010-09-29 05:04+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account
@@ -635,7 +635,7 @@ msgstr "(dejarlo vacío para abrir la situación actual)"
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_account
msgid "Accounts Fiscal Mapping"
msgstr ""
msgstr "Posiciones fiscales contables"
#. module: account
#: field:account.analytic.account,contact_id:0
@@ -1033,7 +1033,7 @@ msgstr "Total neto:"
#: model:ir.model,name:account.model_account_fiscal_position
#: field:res.partner,property_account_position:0
msgid "Fiscal Mapping"
msgstr ""
msgstr "Tipos de Contribuyente"
#. module: account
#: field:account.analytic.line,product_uom_id:0
@@ -1055,7 +1055,7 @@ msgstr "Hijos"
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_tax
msgid "Taxes Fiscal Mapping"
msgstr ""
msgstr "Impuestos por tipo de contribuyente"
#. module: account
#: model:ir.actions.act_window,name:account.action_invoice_tree2_new
@@ -1144,7 +1144,7 @@ msgstr "Nueva cuenta analítica"
#: model:ir.actions.act_window,name:account.action_account_fiscal_position_template_form
#: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form_template
msgid "Fiscal Mapping Templates"
msgstr ""
msgstr "Plantillas de Mapeo de Impuestos"
#. module: account
#: rml:account.invoice:0
@@ -1176,7 +1176,7 @@ msgstr "El importe expresado en otra divisa opcional."
#: view:account.fiscal.position.template:0
#: field:account.fiscal.position.template,name:0
msgid "Fiscal Mapping Template"
msgstr ""
msgstr "Plantilla de Tipos de Contribuyente"
#. module: account
#: field:account.payment.term,line_ids:0
@@ -1248,7 +1248,7 @@ msgstr "Moneda de la compañía"
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_account_template
msgid "Template Account Fiscal Mapping"
msgstr ""
msgstr "Plantillas de Mapeo de Cuentas"
#. module: account
#: field:account.analytic.account,parent_id:0
@@ -1831,9 +1831,11 @@ msgstr "Siguiente"
#. module: account
#: help:res.partner,property_account_position:0
msgid ""
"The fiscal mapping will determine taxes and the accounts used for the partner."
"The fiscal mapping will determine taxes and the accounts used for the "
"partner."
msgstr ""
""
"El tipo de contribuyente determinara impuestos y cuentas usadas por el "
"partner"
#. module: account
#: rml:account.analytic.account.cost_ledger:0
@@ -4117,7 +4119,7 @@ msgstr "Subtotal sin imp."
#. module: account
#: field:account.invoice.line,invoice_id:0
msgid "Invoice Ref"
msgstr ""
msgstr "Ref. factura"
#. module: account
#: field:account.analytic.line,general_account_id:0
@@ -4145,17 +4147,19 @@ msgid ""
"You can check this box to mark the entry line as a litigation with the "
"associated partner"
msgstr ""
"Marque esta opción para señalar el apunte en desacuerdo con la empresa "
"asociada"
#. module: account
#: model:ir.actions.act_window,name:account.action_invoice_tree1
#: model:ir.ui.menu,name:account.menu_action_invoice_tree1
msgid "Customer Invoices"
msgstr ""
msgstr "Facturas de Cliente"
#. module: account
#: field:res.partner,debit_limit:0
msgid "Payable Limit"
msgstr ""
msgstr "Límite a pagar"
#. module: account
#: wizard_field:account.account.balance.report,checktype,state:0
@@ -4163,7 +4167,7 @@ msgstr ""
#: wizard_field:account.partner.balance.report,init,state:0
#: wizard_field:account.third_party_ledger.report,init,state:0
msgid "Date/Period Filter"
msgstr ""
msgstr "Filtrar por fecha/período"
#. module: account
#: rml:account.analytic.account.journal:0
@@ -4171,12 +4175,12 @@ msgstr ""
#: selection:account.bank.statement.line,type:0
#: selection:account.journal,type:0
msgid "General"
msgstr ""
msgstr "General"
#. module: account
#: rml:account.general.journal:0
msgid "Credit Trans."
msgstr ""
msgstr "Trans. haber"
#. module: account
#: field:wizard.multi.charts.accounts,seq_journal:0
@@ -4186,13 +4190,13 @@ msgstr "Secuencias de diarios separadas"
#. module: account
#: help:account.bank.statement.reconcile,total_second_currency:0
msgid "The currency of the journal"
msgstr ""
msgstr "Moneda del diario"
#. module: account
#: view:account.journal.column:0
#: model:ir.model,name:account.model_account_journal_column
msgid "Journal Column"
msgstr ""
msgstr "Columna diario"
#. module: account
#: selection:account.fiscalyear,state:0
@@ -4201,7 +4205,7 @@ msgstr ""
#: selection:account.period,state:0
#: selection:account.subscription,state:0
msgid "Done"
msgstr ""
msgstr "Realizado"
#. module: account
#: wizard_field:account.account.balance.report,checktype,periods:0
addons/account/i18n/et.po
+4 -3
View File
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
"PO-Revision-Date: 2010-08-28 08:23+0000\n"
"PO-Revision-Date: 2010-09-29 10:03+0000\n"
"Last-Translator: OpenERP Administrators <Unknown>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-08-29 03:46+0000\n"
"X-Launchpad-Export-Date: 2010-09-30 04:40+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account
@@ -1794,7 +1794,8 @@ msgstr "Järgmine"
#. module: account
#: help:res.partner,property_account_position:0
msgid ""
"The fiscal mapping will determine taxes and the accounts used for the partner."
"The fiscal mapping will determine taxes and the accounts used for the "
"partner."
msgstr ""
#. module: account
addons/account/i18n/eu.po
+2 -2
View File
@@ -14,7 +14,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-08-12 03:51+0000\n"
"X-Launchpad-Export-Date: 2010-09-29 05:00+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account
@@ -1790,7 +1790,7 @@ msgstr ""
#. module: account
#: help:res.partner,property_account_position:0
msgid ""
"The fiscal mapping will determine taxes and the accounts used for the "
"The fiscal mapping will determine taxes and the accounts used for the "
"partner."
msgstr ""
addons/account/i18n/fa.po
+2 -2
View File
@@ -14,7 +14,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-08-12 03:53+0000\n"
"X-Launchpad-Export-Date: 2010-09-29 05:02+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account
@@ -1790,7 +1790,7 @@ msgstr ""
#. module: account
#: help:res.partner,property_account_position:0
msgid ""
"The fiscal mapping will determine taxes and the accounts used for the "
"The fiscal mapping will determine taxes and the accounts used for the "
"partner."
msgstr ""
addons/account/i18n/fi.po
+5 -4
View File
@@ -8,13 +8,13 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
"PO-Revision-Date: 2010-08-02 19:40+0000\n"
"Last-Translator: mga (Open ERP) <Unknown>\n"
"PO-Revision-Date: 2010-09-29 11:46+0000\n"
"Last-Translator: OpenERP Administrators <Unknown>\n"
"Language-Team: Finnish <fi@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-08-12 03:51+0000\n"
"X-Launchpad-Export-Date: 2010-09-30 04:40+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account
@@ -1825,7 +1825,8 @@ msgstr "Seuraava"
#. module: account
#: help:res.partner,property_account_position:0
msgid ""
"The fiscal mapping will determine taxes and the accounts used for the partner."
"The fiscal mapping will determine taxes and the accounts used for the "
"partner."
msgstr ""
#. module: account
addons/account/i18n/fr.po
+5 -4
View File
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
"PO-Revision-Date: 2010-09-03 08:02+0000\n"
"PO-Revision-Date: 2010-09-29 11:09+0000\n"
"Last-Translator: Quentin THEURET <quentin@theuret.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-09-04 04:45+0000\n"
"X-Launchpad-Export-Date: 2010-09-30 04:40+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account
@@ -1880,8 +1880,9 @@ msgstr "Suivant"
#. module: account
#: help:res.partner,property_account_position:0
msgid
"The fiscal mapping will determine taxes and the accounts used for the partner."
msgid ""
"The fiscal mapping will determine taxes and the accounts used for the "
"partner."
msgstr ""
#. module: account
addons/account/i18n/gl.po
+4 -3
View File
@@ -8,13 +8,13 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
"PO-Revision-Date: 2010-08-02 19:47+0000\n"
"PO-Revision-Date: 2010-09-29 09:34+0000\n"
"Last-Translator: Borja López Soilán (Pexego) <borjals@pexego.es>\n"
"Language-Team: Galician <gl@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-08-12 03:52+0000\n"
"X-Launchpad-Export-Date: 2010-09-30 04:40+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account
@@ -1790,7 +1790,8 @@ msgstr ""
#. module: account
#: help:res.partner,property_account_position:0
msgid ""
"The fiscal mapping will determine taxes and the accounts used for the partner."
"The fiscal mapping will determine taxes and the accounts used for the "
"partner."
msgstr ""
#. module: account
addons/account/i18n/gu.po
+3 -2
View File
@@ -14,7 +14,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-08-12 03:52+0000\n"
"X-Launchpad-Export-Date: 2010-09-29 05:01+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account
@@ -1790,7 +1790,8 @@ msgstr "આગળ"
#. module: account
#: help:res.partner,property_account_position:0
msgid ""
"The fiscal mapping will determine taxes and the accounts used for the partner."
"The fiscal mapping will determine taxes and the accounts used for the "
"partner."
msgstr ""
#. module: account
addons/account/i18n/hr.po
+59 -51
View File
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
"PO-Revision-Date: 2010-09-07 07:23+0000\n"
"Last-Translator: Goran Kliska <gkliska@gmail.com>\n"
"PO-Revision-Date: 2010-10-13 15:51+0000\n"
"Last-Translator: zmmaj <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-09-08 04:42+0000\n"
"X-Launchpad-Export-Date: 2010-10-14 04:45+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account
@@ -24,7 +24,7 @@ msgstr "Interni naziv"
#. module: account
#: view:account.tax.code:0
msgid "Account Tax Code"
msgstr "Šifra poreza računa"
msgstr "Šifra PDV obrasca"
#. module: account
#: model:ir.actions.act_window,name:account.action_invoice_tree9
@@ -105,7 +105,7 @@ msgstr "Knjigovodstvene statistike"
#: model:ir.actions.wizard,name:account.wizard_vat_declaration
#: model:ir.ui.menu,name:account.menu_wizard_vat_declaration
msgid "Print Taxes Report"
msgstr "Ispis poreznog izvještaja"
msgstr "Ispis PDV obrasca"
#. module: account
#: field:account.account,parent_id:0
@@ -250,7 +250,7 @@ msgstr "Salda konti partnera"
#. module: account
#: field:product.template,supplier_taxes_id:0
msgid "Supplier Taxes"
msgstr "Porezi dobavljača"
msgstr "Pretporez"
#. module: account
#: view:account.move:0
@@ -411,7 +411,7 @@ msgstr "Zatvaranje plaćanja"
#. module: account
#: model:account.journal,name:account.expenses_journal
msgid "Journal de frais"
msgstr ""
msgstr "Dnevnik Provizije"
#. module: account
#: model:ir.actions.act_window,name:account.act_acc_analytic_acc_5_report_hr_timesheet_invoice_journal
@@ -512,7 +512,7 @@ msgstr "Statistika analitičkih stavki"
#: model:ir.actions.act_window,name:account.action_account_tax_code_template_form
#: model:ir.ui.menu,name:account.menu_action_account_tax_code_template_form
msgid "Tax Code Templates"
msgstr "Predlošci šifre PDV-a"
msgstr "Predlošci PDV obrasca"
#. module: account
#: view:account.invoice:0
@@ -640,12 +640,12 @@ msgstr "Uvjeti plaćanja za partnera"
#. module: account
#: view:account.move.reconcile:0
msgid "Account Entry Reconcile"
msgstr "Zatvaranje stavke"
msgstr "Zatvaranje stavke konta"
#. module: account
#: wizard_button:account.move.bank.reconcile,init,open:0
msgid "Open for bank reconciliation"
msgstr "Otvor za zatvaranje banke"
msgstr "Otvoreno za zatvaranje banke"
#. module: account
#: field:account.invoice.line,discount:0
@@ -712,7 +712,7 @@ msgstr "Odaberite period analize"
#: field:account.tax.template,ref_tax_sign:0
#: field:account.tax.template,tax_sign:0
msgid "Tax Code Sign"
msgstr "Predznak šifre poreza"
msgstr "Predznak u PDV obrascu"
#. module: account
#: help:res.partner,credit:0
@@ -830,6 +830,8 @@ msgid ""
"These types are defined according to your country. The type contain more "
"information about the account and it's specificities."
msgstr ""
"Ovi tipovi su kreirani u odnosu na vasu zemlju. Tip sadrzi vise informacija "
"o kontu i njegovim specificnostima."
#. module: account
#: selection:account.automatic.reconcile,init,power:0
@@ -1040,7 +1042,7 @@ msgstr "Podređeni"
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_tax
msgid "Taxes Fiscal Mapping"
msgstr ""
msgstr "Fiskalno mapiranje poreza"
#. module: account
#: model:ir.actions.act_window,name:account.action_invoice_tree2_new
@@ -1063,7 +1065,7 @@ msgstr "Izlazni račun"
#. module: account
#: wizard_view:account.open_closed_fiscalyear,init:0
msgid "Choose Fiscal Year"
msgstr "Odaberite poreznu godinu"
msgstr "Izaberite fiskalnu godinu"
#. module: account
#: field:account.sequence.fiscalyear,sequence_main_id:0
@@ -1079,7 +1081,7 @@ msgstr "Ispiši analitičke dnevnike"
#. module: account
#: rml:account.tax.code.entries:0
msgid "Voucher Nb"
msgstr ""
msgstr "Nbr Vaucera"
#. module: account
#: help:account.payment.term.line,sequence:0
@@ -1129,7 +1131,7 @@ msgstr "Novi analitički konto"
#: model:ir.actions.act_window,name:account.action_account_fiscal_position_template_form
#: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form_template
msgid "Fiscal Mapping Templates"
msgstr ""
msgstr "Predlozci poreskih mapiranja"
#. module: account
#: rml:account.invoice:0
@@ -1145,17 +1147,17 @@ msgstr "Razdoblje od:"
#. module: account
#: model:ir.model,name:account.model_wizard_multi_charts_accounts
msgid "wizard.multi.charts.accounts"
msgstr ""
msgstr "carobnjak.vise.kontnih.naloga"
#. module: account
#: model:account.journal,name:account.sales_journal
msgid "Journal de vente"
msgstr ""
msgstr "Dnevnik Prodaje"
#. module: account
#: help:account.model.line,amount_currency:0
msgid "The amount expressed in an optional other currency."
msgstr "Iznos u drugoj valuti."
msgstr "Iznos je predstavljen opciono u drugoj valuti"
#. module: account
#: view:account.fiscal.position.template:0
@@ -1520,7 +1522,7 @@ msgstr "Tel.:"
#. module: account
#: field:account.invoice.tax,tax_amount:0
msgid "Tax Code Amount"
msgstr "Iznos šifre poreza"
msgstr "Iznos poreza"
#. module: account
#: selection:account.account.type,sign:0
@@ -1789,7 +1791,7 @@ msgstr "Postotak"
#. module: account
#: model:ir.ui.menu,name:account.menu_finance_charts
msgid "Charts"
msgstr "Grafikoni"
msgstr "Kontni planovi"
#. module: account
#: selection:account.analytic.journal,type:0
@@ -1808,9 +1810,9 @@ msgstr "Slijedeći"
#. module: account
#: help:res.partner,property_account_position:0
msgid ""
"The fiscal mapping will determine taxes and the accounts used for the partner."
"The fiscal mapping will determine taxes and the accounts used for the "
"partner."
msgstr ""
""
#. module: account
#: rml:account.analytic.account.cost_ledger:0
@@ -1884,7 +1886,7 @@ msgstr "Dozvoljena konta (prazno bez kontrole)"
#. module: account
#: view:account.invoice:0
msgid "Untaxed amount"
msgstr "Prije poreza"
msgstr "Iznos bez poreza"
#. module: account
#: field:account.tax,account_collected_id:0
@@ -2023,7 +2025,7 @@ msgstr "Naziv dnevnika-razdoblja"
#: field:account.tax.code,name:0
#: field:account.tax.code.template,name:0
msgid "Tax Case Name"
msgstr "Naziv poreznog pretinca"
msgstr "Naziv pozicije PDV obrasca"
#. module: account
#: help:account.journal,entry_posted:0
@@ -2081,7 +2083,7 @@ msgstr "Proces izlacnog računa"
#. module: account
#: rml:account.invoice:0
msgid "Fiscal Mapping Remark :"
msgstr ""
msgstr "Napomena Fiskalnog mapiranja:"
#. module: account
#: wizard_field:account.fiscalyear.close,init,period_id:0
@@ -2144,7 +2146,7 @@ msgstr "Nova pretplata"
#. module: account
#: view:account.payment.term:0
msgid "Computation"
msgstr "Izračun"
msgstr "Proračun"
#. module: account
#: view:account.analytic.line:0
@@ -2264,7 +2266,7 @@ msgstr "Stvori fiskalnu godinu"
#. module: account
#: field:product.template,taxes_id:0
msgid "Customer Taxes"
msgstr "Porezi kupca"
msgstr "Porezi kod prodaje"
#. module: account
#: field:account.invoice,date_invoice:0
@@ -2298,7 +2300,7 @@ msgstr "(ostavite prazno za sve otvorene fiskalne godine)"
#. module: account
#: help:account.invoice.tax,base_code_id:0
msgid "The account basis of the tax declaration."
msgstr ""
msgstr "Porezna osnovica"
#. module: account
#: rml:account.analytic.account.journal:0
@@ -2335,7 +2337,7 @@ msgstr "Poništi zatvaranje"
#: field:account.tax,type:0
#: field:account.tax.template,type:0
msgid "Tax Type"
msgstr "Tip poreza"
msgstr "Vrsta poreza"
#. module: account
#: model:process.transition,name:account.process_transition_statemententries0
@@ -2504,13 +2506,13 @@ msgstr "Iznos u valuti dnevnika"
#. module: account
#: wizard_field:account.general.ledger.report,checktype,landscape:0
msgid "Landscape Mode"
msgstr "Položeni način"
msgstr "Prosireni način"
#. module: account
#: model:process.transition,note:account.process_transition_analyticinvoice0
#: model:process.transition,note:account.process_transition_supplieranalyticcost0
msgid "From analytic accounts, Create invoice."
msgstr "Iz konta analitike, stvori račun."
msgstr "Iz konta analitike, kreiraj račun."
#. module: account
#: wizard_button:account.account.balance.report,account_selection,end:0
@@ -2576,7 +2578,7 @@ msgstr "Naziv vrste konta"
#: help:account.tax.template,ref_tax_code_id:0
#: help:account.tax.template,tax_code_id:0
msgid "Use this code for the VAT declaration."
msgstr "Koristi u PDV obrazascu."
msgstr "Koristi ovo za dekleraciju u PDV-a."
#. module: account
#: field:account.move.line,blocked:0
@@ -2624,7 +2626,8 @@ msgstr "Nalog za plaćanje"
#: help:account.account.template,reconcile:0
msgid ""
"Check this option if you want the user to reconcile entries in this account."
msgstr "Omogućuje zatvaranje stavaka za ovaj konto."
msgstr ""
"Cekirajte ovde da omogućuite korisniku zatvaranje stavaka za ovaj konto."
#. module: account
#: rml:account.analytic.account.journal:0
@@ -2652,7 +2655,7 @@ msgstr "Poruka prekoračenog roka plaćanja"
#. module: account
#: model:ir.model,name:account.model_account_tax_code_template
msgid "Tax Code Template"
msgstr "Predložak šifre poreza"
msgstr "Predložak PDV obrasca"
#. module: account
#: rml:account.partner.balance:0
@@ -2816,6 +2819,10 @@ msgid ""
"higher ones. The order is important if you have a tax that has several tax "
"children. In this case, the evaluation order is important."
msgstr ""
"Sekvenciono polje se koristi da bi se poredjali porezi od najmanjeg do "
"najveceg. Ovaj poredak je vazan, narocito ukoliko imate poreze koji, opet "
"imaju nekoliko podredjenih poreza. U tom slucaju, ovaj evaluacioni poredak "
"je vazan."
#. module: account
#: field:account.journal.column,view_id:0
@@ -2868,7 +2875,7 @@ msgstr "Nova izlazna faktura"
#: wizard_button:account.move.line.reconcile,addendum,reconcile:0
#: wizard_button:account.move.line.reconcile,init_full,reconcile:0
msgid "Reconcile"
msgstr "Zatvori"
msgstr "Sravnjanje"
#. module: account
#: rml:account.overdue:0
@@ -2904,7 +2911,7 @@ msgstr "Konto poreza"
#. module: account
#: model:process.transition,note:account.process_transition_statemententries0
msgid "From statement, create entries"
msgstr "Stvori stavki iz izvoda"
msgstr "Kreiraj stavku iz izvoda"
#. module: account
#: field:account.analytic.account,complete_name:0
@@ -3066,8 +3073,8 @@ msgid ""
"If this box is checked, the system will try to group the accounting lines "
"when generating them from invoices."
msgstr ""
"Označite za grupiranje stavki prilikom knjiženja računa. Istovrsne stavke se "
"knjiže zbrojno, kao jedna."
"Ako je cekirano, sistem ce probati da grupise konta prilikom generisanja iz "
"racuna."
#. module: account
#: wizard_field:account.move.line.reconcile,init_full,trans_nbr:0
@@ -3190,7 +3197,7 @@ msgstr "Konto"
#. module: account
#: model:account.journal,name:account.bank_journal
msgid "Journal de Banque CHF"
msgstr ""
msgstr "Dnevnik CHF Banke"
#. module: account
#: selection:account.account.balance.report,checktype,state:0
@@ -3487,7 +3494,7 @@ msgstr "Konto nadređenog poreza"
#: field:account.analytic.account,type:0
#: model:ir.model,name:account.model_account_account_type
msgid "Account Type"
msgstr "Tip Tvrtke Kupca"
msgstr "Vrsta konta"
#. module: account
#: view:res.partner:0
@@ -3557,7 +3564,7 @@ msgstr "3"
#. module: account
#: model:ir.actions.report.xml,name:account.account_vat_declaration
msgid "Taxes Report"
msgstr "Porezno izvješće"
msgstr "Poreski Izvestaj"
#. module: account
#: selection:account.journal.period,state:0
@@ -3650,7 +3657,7 @@ msgstr "Konto partnera za ovu fakturu"
msgid ""
"Check this box if you don't want any VAT related to this Tax Code to appear "
"on invoices"
msgstr ""
msgstr "Označite ako ovaj porez ne želite ispisivati na računima."
#. module: account
#: field:account.account.type,sequence:0
@@ -4241,7 +4248,7 @@ msgstr "Sekvenca definira poredak u listi dnevnika."
#. module: account
#: field:account.journal,type_control_ids:0
msgid "Type Controls"
msgstr "Kontrole tipa"
msgstr "Kontrola po vrsti kona"
#. module: account
#: field:account.analytic.account,name:0
@@ -4341,7 +4348,7 @@ msgstr "Uvezi datoteku bankovnog izvoda"
#: field:account.account,type:0
#: field:account.account.template,type:0
msgid "Internal Type"
msgstr "Interni tip"
msgstr "Vrsta konta"
#. module: account
#: selection:account.automatic.reconcile,init,power:0
@@ -5208,7 +5215,7 @@ msgstr "Primitak novca"
#: field:account.fiscal.position.tax,tax_dest_id:0
#: field:account.fiscal.position.tax.template,tax_dest_id:0
msgid "Replacement Tax"
msgstr "Zamjenski porez"
msgstr "Promenljiv porez"
#. module: account
#: model:process.transition,note:account.process_transition_invoicemanually0
@@ -5712,7 +5719,7 @@ msgstr ""
#: field:account.tax.code,code:0
#: field:account.tax.code.template,code:0
msgid "Case Code"
msgstr "Šifra pretinca"
msgstr "Šifra"
#. module: account
#: selection:account.automatic.reconcile,init,power:0
@@ -5932,7 +5939,7 @@ msgstr "Uvjet plaćanja"
#: model:ir.actions.act_window,name:account.action_account_fiscal_position_form
#: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form
msgid "Fiscal Mappings"
msgstr ""
msgstr "Fiskalna mapiranja"
#. module: account
#: model:process.process,name:account.process_process_statementprocess0
@@ -5956,7 +5963,7 @@ msgstr "Označite ovu kućicu"
msgid ""
"Check this if the price you use on the product and invoices includes this "
"tax."
msgstr ""
msgstr "Označite ovu kućicu ako cena proizvoda i racuna sadrze ovaj porez"
#. module: account
#: field:account.journal.column,name:0
@@ -5981,6 +5988,7 @@ msgstr "Da"
msgid ""
"Check this if the user is allowed to reconcile entries in this account."
msgstr ""
"Označite ovu kućicu ako je dozvoljeno korisniku da ponisti stavke ovog racuna"
#. module: account
#: wizard_button:account.subscription.generate,init,generate:0
@@ -6001,7 +6009,7 @@ msgstr ""
#: model:ir.actions.act_window,name:account.open_board_account
#: model:ir.ui.menu,name:account.menu_board_account
msgid "Accounting Dashboard"
msgstr ""
msgstr "Računovodstvena nadzorna ploča"
#. module: account
#: view:board.board:0
@@ -6262,7 +6270,7 @@ msgstr "Ukupni iznos"
#. module: account
#: view:report.account.receivable:0
msgid "Accounts by type"
msgstr "Tvrtke kupci po tipu"
msgstr "Konta po vrsti"
#. module: account
#: model:ir.model,name:report_account.model_report_aged_receivable
@@ -6293,7 +6301,7 @@ msgstr "Izvještavanje o tvrtki Kupcu - Izvještavanje"
#: model:ir.actions.act_window,name:report_account.action_account_receivable_graph
#: model:ir.ui.menu,name:report_account.menu_account_receivable_graph
msgid "Balance by Type of Account"
msgstr "Saldo po tipu konta"
msgstr "Saldo po vrsti konta"
#. module: account
#: field:report.account.receivable,name:0
addons/account/i18n/hu.po
+4 -3
View File
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
"PO-Revision-Date: 2010-09-08 08:54+0000\n"
"PO-Revision-Date: 2010-09-09 07:08+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-09-09 04:46+0000\n"
"X-Launchpad-Export-Date: 2010-09-29 05:01+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account
@@ -1789,7 +1789,8 @@ msgstr "Tovább"
#. module: account
#: help:res.partner,property_account_position:0
msgid ""
"The fiscal mapping will determine taxes and the accounts used for the partner."
"The fiscal mapping will determine taxes and the accounts used for the "
"partner."
msgstr ""
#. module: account
addons/account/i18n/id.po
+4 -3
View File
@@ -8,13 +8,13 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
"PO-Revision-Date: 2010-08-02 19:51+0000\n"
"PO-Revision-Date: 2010-09-29 10:36+0000\n"
"Last-Translator: opix <inur.opix@gmail.com>\n"
"Language-Team: Indonesian <id@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-08-12 03:52+0000\n"
"X-Launchpad-Export-Date: 2010-09-30 04:41+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account
@@ -1790,7 +1790,8 @@ msgstr ""
#. module: account
#: help:res.partner,property_account_position:0
msgid ""
"The fiscal mapping will determine taxes and the accounts used for the partner."
"The fiscal mapping will determine taxes and the accounts used for the "
"partner."
msgstr ""
#. module: account
addons/account/i18n/it.po
+75 -72
View File
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
"PO-Revision-Date: 2010-09-08 09:15+0000\n"
"PO-Revision-Date: 2010-09-29 11:28+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-09-09 04:46+0000\n"
"X-Launchpad-Export-Date: 2010-09-30 04:41+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account
@@ -1013,7 +1013,7 @@ msgstr "Totale finale"
#. module: account
#: model:ir.ui.menu,name:account.menu_finance_accounting
msgid "Financial Accounting"
msgstr "Contabilità Ordinaria"
msgstr "Contabilità Generale"
#. module: account
#: rml:account.invoice:0
@@ -1820,9 +1820,9 @@ msgstr "Prossimo"
#. module: account
#: help:res.partner,property_account_position:0
msgid ""
"The fiscal mapping will determine taxes and the accounts used for the partner."
"The fiscal mapping will determine taxes and the accounts used for the "
"partner."
msgstr ""
""
#. module: account
#: rml:account.analytic.account.cost_ledger:0
@@ -2753,7 +2753,7 @@ msgstr "Concludi il periodo"
#. module: account
#: wizard_button:populate_statement_from_inv,go,finish:0
msgid "O_k"
msgstr ""
msgstr "O_k"
#. module: account
#: field:account.invoice,amount_untaxed:0
@@ -2807,7 +2807,7 @@ msgstr "Analisi della direzione"
#. module: account
#: wizard_button:populate_statement_from_inv,init,go:0
msgid "_Go"
msgstr ""
msgstr "_Vai"
#. module: account
#: field:res.partner,ref_companies:0
@@ -2937,7 +2937,7 @@ msgstr ""
#: rml:account.third_party_ledger_other:0
#: rml:account.vat.declaration:0
msgid "1cm 27.7cm 20cm 27.7cm"
msgstr ""
msgstr "1cm 27.7cm 20cm 27.7cm"
#. module: account
#: model:ir.actions.act_window,name:account.action_invoice_tree12
@@ -3014,7 +3014,7 @@ msgstr "Codice tassa"
#. module: account
#: rml:account.analytic.account.journal:0
msgid "Analytic Journal -"
msgstr ""
msgstr "Giornale Analitico -"
#. module: account
#: rml:account.analytic.account.analytic.check:0
@@ -3078,6 +3078,8 @@ msgid ""
"If this box is checked, the system will try to group the accounting lines "
"when generating them from invoices."
msgstr ""
"Se questa casella è spuntata, il sistema cercherà di raggruppare le righe "
"contabili durante la generazione delle fatture."
#. module: account
#: wizard_field:account.move.line.reconcile,init_full,trans_nbr:0
@@ -3149,12 +3151,12 @@ msgstr "Nome Modello"
#: selection:account.account,type:0
#: selection:account.account.template,type:0
msgid "Others"
msgstr ""
msgstr "Altri"
#. module: account
#: selection:account.automatic.reconcile,init,power:0
msgid "8"
msgstr ""
msgstr "8"
#. module: account
#: view:account.invoice:0
@@ -3172,12 +3174,12 @@ msgstr "Legenda"
#. module: account
#: model:process.node,note:account.process_node_draftinvoices0
msgid "Proposed invoice to be checked, validated and printed"
msgstr ""
msgstr "Bozza fattura da controllare, validare e stampare"
#. module: account
#: model:ir.actions.act_window,name:account.action_move_line_select
msgid "account.move.line.select"
msgstr ""
msgstr "account.move.line.select"
#. module: account
#: view:account.account:0
@@ -3208,7 +3210,7 @@ msgstr ""
#: selection:account.partner.balance.report,init,state:0
#: selection:account.third_party_ledger.report,init,state:0
msgid "By Date and Period"
msgstr ""
msgstr "Per data e periodo"
#. module: account
#: view:account.account:0
@@ -3248,7 +3250,7 @@ msgstr ""
#. module: account
#: selection:account.account,currency_mode:0
msgid "Average Rate"
msgstr ""
msgstr "Tasso medio"
#. module: account
#: model:process.node,note:account.process_node_bankstatement0
@@ -3328,7 +3330,7 @@ msgstr "30 giorni Fine Mese"
#. module: account
#: field:account.chart.template,tax_code_root_id:0
msgid "Root Tax Code"
msgstr ""
msgstr "Codice imposta principale"
#. module: account
#: constraint:account.invoice:0
@@ -3371,12 +3373,12 @@ msgstr "In attesa"
#. module: account
#: view:wizard.multi.charts.accounts:0
msgid "Bank Information"
msgstr ""
msgstr "Informazioni bancarie"
#. module: account
#: rml:account.invoice:0
msgid "Fax :"
msgstr ""
msgstr "Fax :"
#. module: account
#: rml:account.partner.balance:0
@@ -3436,7 +3438,7 @@ msgstr ""
#. module: account
#: model:process.node,name:account.process_node_importinvoice0
msgid "Import invoice"
msgstr ""
msgstr "Totale fattura"
#. module: account
#: view:account.invoice:0
@@ -3556,12 +3558,12 @@ msgstr ""
#: selection:account.account.balance.report,checktype,display_account:0
#: selection:account.general.ledger.report,checktype,display_account:0
msgid "With balance is not equal to 0"
msgstr ""
msgstr "Con chiusura diversa da zero"
#. module: account
#: selection:account.automatic.reconcile,init,power:0
msgid "3"
msgstr ""
msgstr "3"
#. module: account
#: model:ir.actions.report.xml,name:account.account_vat_declaration
@@ -3597,7 +3599,7 @@ msgstr "Piano dei conti"
#. module: account
#: field:account.subscription.line,subscription_id:0
msgid "Subscription"
msgstr ""
msgstr "Abbonamento"
#. module: account
#: field:account.analytic.journal,code:0
@@ -3672,7 +3674,7 @@ msgstr ""
#: field:account.tax.template,sequence:0
#: field:fiscalyear.seq,sequence_id:0
msgid "Sequence"
msgstr ""
msgstr "Sequenza"
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_template
@@ -3762,7 +3764,7 @@ msgstr ""
#: field:account.fiscalyear,date_start:0
#: field:account.subscription,date_start:0
msgid "Start Date"
msgstr ""
msgstr "Data di inizio"
#. module: account
#: wizard_view:account.general.ledger.report,account_selection:0
@@ -3779,7 +3781,7 @@ msgstr "Tutte le registrazioni"
#: model:process.node,name:account.process_node_draftinvoices0
#: model:process.node,name:account.process_node_supplierdraftinvoices0
msgid "Draft Invoices"
msgstr ""
msgstr "Fatture bozza"
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_tax_template
@@ -3789,7 +3791,7 @@ msgstr ""
#. module: account
#: rml:account.invoice:0
msgid "Invoice Date"
msgstr ""
msgstr "Data della fattura"
#. module: account
#: selection:account.account.type,close_method:0
@@ -3903,7 +3905,7 @@ msgstr "Libri Giornale finanziari"
#: selection:account.partner.balance.report,init,state:0
#: selection:account.third_party_ledger.report,init,state:0
msgid "By Period"
msgstr ""
msgstr "Per periodo"
#. module: account
#: help:account.invoice,date_invoice:0
@@ -3918,7 +3920,7 @@ msgstr ","
#. module: account
#: field:account.analytic.account,quantity_max:0
msgid "Maximum Quantity"
msgstr ""
msgstr "Quantità massima"
#. module: account
#: field:account.period,name:0
@@ -3962,7 +3964,7 @@ msgstr ""
#. module: account
#: view:account.chart.template:0
msgid "Properties"
msgstr ""
msgstr "Proprietà"
#. module: account
#: view:res.partner:0
@@ -3982,12 +3984,12 @@ msgstr ""
#. module: account
#: wizard_field:account.vat.declaration,init,based_on:0
msgid "Base on"
msgstr ""
msgstr "Basato su"
#. module: account
#: selection:account.move,type:0
msgid "Cash Payment"
msgstr ""
msgstr "Pagamento in contanti"
#. module: account
#: field:account.chart.template,property_account_payable:0
@@ -4108,7 +4110,7 @@ msgstr "Limite pagabile"
#: wizard_field:account.partner.balance.report,init,state:0
#: wizard_field:account.third_party_ledger.report,init,state:0
msgid "Date/Period Filter"
msgstr ""
msgstr "Filtro per data/periodo"
#. module: account
#: rml:account.analytic.account.journal:0
@@ -4343,7 +4345,7 @@ msgstr ""
#: field:account.account,type:0
#: field:account.account.template,type:0
msgid "Internal Type"
msgstr ""
msgstr "Tipo interno"
#. module: account
#: selection:account.automatic.reconcile,init,power:0
@@ -4376,7 +4378,7 @@ msgstr ""
#: field:account.config.wizard,date2:0
#: field:account.fiscalyear,date_stop:0
msgid "End Date"
msgstr ""
msgstr "Data fine"
#. module: account
#: model:ir.actions.wizard,name:account.wizard_open_closed_fiscalyear
@@ -4417,7 +4419,7 @@ msgstr ""
#: view:account.tax:0
#: view:account.tax.template:0
msgid "Tax Declaration"
msgstr ""
msgstr "Dichiarazione Imposta"
#. module: account
#: model:process.transition,name:account.process_transition_filestatement0
@@ -4442,7 +4444,7 @@ msgstr "Template conto tassa"
#. module: account
#: help:account.model,name:0
msgid "This is a model for recurring accounting entries"
msgstr ""
msgstr "Questo è un modello per registrazioni contabili ricorrenti"
#. module: account
#: wizard_view:account.wizard_paid_open,init:0
@@ -4553,7 +4555,7 @@ msgstr ""
#: selection:account.partner.balance.report,init,state:0
#: selection:account.third_party_ledger.report,init,state:0
msgid "By Date"
msgstr ""
msgstr "Per data"
#. module: account
#: model:ir.actions.act_window,name:account.action_invoice_tree4
@@ -4569,7 +4571,7 @@ msgstr "La data delle registrazioni generate"
#. module: account
#: wizard_button:account.invoice.refund,init,modify_invoice:0
msgid "Modify Invoice"
msgstr ""
msgstr "Modifica fattura"
#. module: account
#: view:res.partner:0
@@ -4595,7 +4597,7 @@ msgstr ""
#: field:account.bank.statement.line,statement_id:0
#: field:account.move.line,statement_id:0
msgid "Statement"
msgstr ""
msgstr "Dichiarazione"
#. module: account
#: model:ir.actions.act_window,name:account.action_move_line_form_encode_by_move
@@ -4611,7 +4613,7 @@ msgstr ""
#. module: account
#: wizard_field:account.aged.trial.balance,init,result_selection:0
msgid "Filter on Partners"
msgstr ""
msgstr "Filtro sui Partner"
#. module: account
#: field:account.tax,price_include:0
@@ -4622,7 +4624,7 @@ msgstr "Tassa compresa nel prezzo"
#: model:ir.actions.act_window,name:account.action_account_analytic_journal_tree2
#: model:ir.ui.menu,name:account.account_analytic_journal_entries
msgid "Analytic Entries by Journal"
msgstr ""
msgstr "Voci analitiche divise per Giornale"
#. module: account
#: model:process.transition,note:account.process_transition_suppliervalidentries0
@@ -4658,7 +4660,7 @@ msgstr ""
#. module: account
#: selection:account.subscription,state:0
msgid "Running"
msgstr ""
msgstr "In Esecuzione"
#. module: account
#: help:account.tax,include_base_amount:0
@@ -4685,7 +4687,7 @@ msgstr ""
#. module: account
#: selection:account.automatic.reconcile,init,power:0
msgid "4"
msgstr ""
msgstr "4"
#. module: account
#: model:ir.actions.act_window,name:account.action_account_fiscalyear_form
@@ -4744,7 +4746,7 @@ msgstr ""
#: rml:account.third_party_ledger:0
#: rml:account.third_party_ledger_other:0
msgid "Ref."
msgstr ""
msgstr "Rif."
#. module: account
#: field:account.invoice,address_invoice_id:0
@@ -4754,7 +4756,7 @@ msgstr "Indirizzo Fattura"
#. module: account
#: rml:account.analytic.account.analytic.check:0
msgid "General Credit"
msgstr ""
msgstr "Credito generale"
#. module: account
#: help:account.journal,centralisation:0
@@ -4767,7 +4769,7 @@ msgstr ""
#. module: account
#: selection:account.invoice,state:0
msgid "Cancelled"
msgstr ""
msgstr "Annullato"
#. module: account
#: model:ir.actions.act_window,name:account.action_bank_statement_draft_tree
@@ -4778,7 +4780,7 @@ msgstr ""
#. module: account
#: wizard_field:populate_statement_from_inv,init,date:0
msgid "Date payment"
msgstr ""
msgstr "Data di pagamento"
#. module: account
#: rml:account.journal.period.print:0
@@ -4831,13 +4833,13 @@ msgstr ""
#: model:ir.actions.wizard,name:account.wizard_balance_report
#: model:ir.ui.menu,name:account.menu_account_balance_report
msgid "Account Balance"
msgstr ""
msgstr "Bilancio contabile"
#. module: account
#: model:ir.actions.report.xml,name:account.account_analytic_account_analytic_check
#: model:ir.actions.wizard,name:account.account_analytic_account_analytic_check_report
msgid "Analytic Check"
msgstr ""
msgstr "Controllo analitico"
#. module: account
#: rml:account.overdue:0
@@ -4851,12 +4853,12 @@ msgstr "IVA:"
#: rml:account.general.journal:0
#: rml:account.invoice:0
msgid "Total:"
msgstr ""
msgstr "Totale:"
#. module: account
#: model:ir.model,name:account.model_account_analytic_journal
msgid "account.analytic.journal"
msgstr ""
msgstr "account.analytic.journal"
#. module: account
#: view:account.fiscal.position:0
@@ -4955,7 +4957,7 @@ msgstr ""
#. module: account
#: field:account.invoice,invoice_line:0
msgid "Invoice Lines"
msgstr ""
msgstr "Righe Fattura"
#. module: account
#: field:account.period,date_start:0
@@ -5056,6 +5058,7 @@ msgstr ""
#: help:account.account.template,currency_id:0
msgid "Force all moves for this account to have this secondary currency."
msgstr ""
"Forza tutti i movimenti di questo conto ad avere questa valuta secondaria."
#. module: account
#: wizard_button:populate_statement_from_inv,go,end:0
@@ -5068,7 +5071,7 @@ msgstr "_Annulla"
#: wizard_view:account.partner.balance.report,init:0
#: wizard_view:account.third_party_ledger.report,init:0
msgid "Select Date-Period"
msgstr ""
msgstr "Selezionare Data-Periodo"
#. module: account
#: rml:account.analytic.account.inverted.balance:0
@@ -5127,7 +5130,7 @@ msgstr ""
#: selection:account.account.balance.report,checktype,display_account:0
#: selection:account.general.ledger.report,checktype,display_account:0
msgid "With movements"
msgstr ""
msgstr "Con i movimenti"
#. module: account
#: field:account.tax,domain:0
@@ -5138,7 +5141,7 @@ msgstr "Dominio"
#. module: account
#: view:account.analytic.account:0
msgid "Account Data"
msgstr ""
msgstr "Data conto"
#. module: account
#: view:account.tax.code.template:0
@@ -5148,12 +5151,12 @@ msgstr ""
#. module: account
#: view:account.subscription:0
msgid "Subscription Periods"
msgstr ""
msgstr "Periodi Abbonamento"
#. module: account
#: model:process.node,name:account.process_node_manually0
msgid "Manually"
msgstr ""
msgstr "Manualmente"
#. module: account
#: view:account.invoice:0
@@ -5241,7 +5244,7 @@ msgstr ""
#. module: account
#: wizard_view:account_use_models,create:0
msgid "Use Model"
msgstr ""
msgstr "Usa modello"
#. module: account
#: wizard_button:account.wizard_paid_open,init,end:0
@@ -5264,12 +5267,12 @@ msgstr ""
#: wizard_view:account.partner.balance.report,init:0
#: wizard_view:account.third_party_ledger.report,init:0
msgid "Date Filter"
msgstr ""
msgstr "Filtro per data"
#. module: account
#: wizard_view:populate_statement_from_inv,init:0
msgid "Choose Journal and Payment Date"
msgstr ""
msgstr "Scegli Giornale e data di pagamento"
#. module: account
#: selection:account.analytic.account,state:0
@@ -5335,7 +5338,7 @@ msgstr "Apri registrazioni"
#: selection:account.analytic.account,type:0
#: selection:account.move.line,centralisation:0
msgid "Normal"
msgstr ""
msgstr "Normale"
#. module: account
#: model:process.process,name:account.process_process_supplierinvoiceprocess0
@@ -5354,7 +5357,7 @@ msgstr ""
#: rml:account.third_party_ledger_other:0
#: rml:account.vat.declaration:0
msgid "Page"
msgstr ""
msgstr "Pagina"
#. module: account
#: view:account.move:0
@@ -5377,7 +5380,7 @@ msgstr ""
#: rml:account.account.balance:0
#: rml:account.general.journal:0
msgid ":"
msgstr ""
msgstr ":"
#. module: account
#: field:account.bank.statement.line,reconcile_amount:0
@@ -5387,7 +5390,7 @@ msgstr ""
#. module: account
#: selection:account.account,currency_mode:0
msgid "At Date"
msgstr ""
msgstr "Alla data"
#. module: account
#: help:account.move.line,tax_amount:0
@@ -5429,7 +5432,7 @@ msgstr "Pro-forma"
#. module: account
#: field:account.subscription,period_total:0
msgid "Number of Periods"
msgstr ""
msgstr "Numero di periodi"
#. module: account
#: wizard_field:account.analytic.account.analytic.check.report,init,date2:0
@@ -5532,22 +5535,22 @@ msgstr ""
#. module: account
#: constraint:account.fiscalyear:0
msgid "Error ! The duration of the Fiscal Year is invalid. "
msgstr ""
msgstr "Errore! La durata dell'anno fiscale non è valida. "
#. module: account
#: selection:account.analytic.account,state:0
msgid "Close"
msgstr ""
msgstr "Chiudi"
#. module: account
#: field:account.bank.statement.line,move_ids:0
msgid "Moves"
msgstr ""
msgstr "Movimenti"
#. module: account
#: selection:account.invoice,state:0
msgid "Pro-forma"
msgstr ""
msgstr "Proforma"
#. module: account
#: model:ir.actions.act_window,name:account.action_account_form
@@ -5564,7 +5567,7 @@ msgstr ""
#. module: account
#: rml:account.general.journal:0
msgid "Printing Date :"
msgstr ""
msgstr "Data di stampa :"
#. module: account
#: model:ir.actions.report.xml,name:account.account_analytic_account_quantity_cost_ledger
@@ -5580,7 +5583,7 @@ msgstr "Conferma le registrazioni contabili"
#. module: account
#: selection:account.print.journal.report,init,sort_selection:0
msgid "Reference Number"
msgstr ""
msgstr "Numero di riferimento"
#. module: account
#: rml:account.overdue:0
@@ -6205,7 +6208,7 @@ msgstr ""
#. module: account
#: selection:account.balance.account.balance.report,init,period_manner:0
msgid "Creation Date"
msgstr ""
msgstr "Data di Creazione"
#. module: account
#: wizard_view:account.balance.account.balance.report,backtoinit:0
addons/account/i18n/kab.po
+4 -3
View File
@@ -8,13 +8,13 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
"PO-Revision-Date: 2009-02-02 12:58+0000\n"
"PO-Revision-Date: 2010-09-29 10:25+0000\n"
"Last-Translator: yugurten <yugurten1@hotmail.fr>\n"
"Language-Team: Kabyle <kab@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-08-12 03:52+0000\n"
"X-Launchpad-Export-Date: 2010-09-30 04:41+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account
@@ -1790,7 +1790,8 @@ msgstr ""
#. module: account
#: help:res.partner,property_account_position:0
msgid ""
"The fiscal mapping will determine taxes and the accounts used for the partner."
"The fiscal mapping will determine taxes and the accounts used for the "
"partner."
msgstr ""
#. module: account
addons/account/i18n/ko.po
+3 -2
View File
@@ -14,7 +14,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-08-12 03:52+0000\n"
"X-Launchpad-Export-Date: 2010-09-29 05:02+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account
@@ -1790,7 +1790,8 @@ msgstr ""
#. module: account
#: help:res.partner,property_account_position:0
msgid ""
"The fiscal mapping will determine taxes and the accounts used for the partner."
"The fiscal mapping will determine taxes and the accounts used for the "
"partner."
msgstr ""
#. module: account
addons/account/i18n/lt.po
+4 -3
View File
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
"PO-Revision-Date: 2010-09-08 08:56+0000\n"
"PO-Revision-Date: 2010-09-29 09:43+0000\n"
"Last-Translator: Giedrius Slavinskas <giedrius.slavinskas@gmail.com>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-09-09 04:46+0000\n"
"X-Launchpad-Export-Date: 2010-09-30 04:41+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account
@@ -1799,7 +1799,8 @@ msgstr "Toliau"
#. module: account
#: help:res.partner,property_account_position:0
msgid ""
"The fiscal mapping will determine taxes and the accounts used for the partner."
"The fiscal mapping will determine taxes and the accounts used for the "
"partner."
msgstr ""
#. module: account
addons/account/i18n/lv.po
+5 -4
View File
@@ -8,13 +8,13 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
"PO-Revision-Date: 2010-08-02 19:59+0000\n"
"Last-Translator: mga (Open ERP) <Unknown>\n"
"PO-Revision-Date: 2010-09-29 11:19+0000\n"
"Last-Translator: OpenERP Administrators <Unknown>\n"
"Language-Team: Latvian <lv@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-08-12 03:52+0000\n"
"X-Launchpad-Export-Date: 2010-09-30 04:41+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account
@@ -1802,7 +1802,8 @@ msgstr "Nākamais"
#. module: account
#: help:res.partner,property_account_position:0
msgid ""
"The fiscal mapping will determine taxes and the accounts used for the partner."
"The fiscal mapping will determine taxes and the accounts used for the "
"partner."
msgstr ""
#. module: account
addons/account/i18n/mn.po
+273 -248
View File
File diff suppressed because it is too large Load Diff
addons/account/i18n/nb.po
+2 -2
View File
@@ -14,7 +14,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-08-12 03:52+0000\n"
"X-Launchpad-Export-Date: 2010-09-29 05:02+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account
@@ -1790,7 +1790,7 @@ msgstr ""
#. module: account
#: help:res.partner,property_account_position:0
msgid ""
"The fiscal mapping will determine taxes and the accounts used for the "
"The fiscal mapping will determine taxes and the accounts used for the "
"partner."
msgstr ""
addons/account/i18n/nl.po
+16 -14
View File
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
"PO-Revision-Date: 2010-08-02 20:04+0000\n"
"Last-Translator: mga (Open ERP) <Unknown>\n"
"PO-Revision-Date: 2010-09-30 06:57+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-08-12 03:51+0000\n"
"X-Launchpad-Export-Date: 2010-10-01 08:47+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account
@@ -632,7 +632,7 @@ msgstr "(laat leeg om de huidige situatie te behouden)"
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_account
msgid "Accounts Fiscal Mapping"
msgstr ""
msgstr "Fiscale toewijzing grootboekrekeningen"
#. module: account
#: field:account.analytic.account,contact_id:0
@@ -1031,7 +1031,7 @@ msgstr "Netto totaal"
#: model:ir.model,name:account.model_account_fiscal_position
#: field:res.partner,property_account_position:0
msgid "Fiscal Mapping"
msgstr ""
msgstr "Fiscale toewijzing"
#. module: account
#: field:account.analytic.line,product_uom_id:0
@@ -1053,7 +1053,7 @@ msgstr "Kinderen"
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_tax
msgid "Taxes Fiscal Mapping"
msgstr ""
msgstr "Toewijzing belastingen"
#. module: account
#: model:ir.actions.act_window,name:account.action_invoice_tree2_new
@@ -1142,7 +1142,7 @@ msgstr "Nieuwe kostenplaats"
#: model:ir.actions.act_window,name:account.action_account_fiscal_position_template_form
#: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form_template
msgid "Fiscal Mapping Templates"
msgstr ""
msgstr "Sjablonen fiscale toewijzing"
#. module: account
#: rml:account.invoice:0
@@ -1174,7 +1174,7 @@ msgstr "Het bedrag uitgedrukt in een optionele andere valuta."
#: view:account.fiscal.position.template:0
#: field:account.fiscal.position.template,name:0
msgid "Fiscal Mapping Template"
msgstr ""
msgstr "Sjabloon fiscale toewijzing"
#. module: account
#: field:account.payment.term,line_ids:0
@@ -1245,7 +1245,7 @@ msgstr "Bedrijfsvaluta"
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_account_template
msgid "Template Account Fiscal Mapping"
msgstr ""
msgstr "Sjabloon fiscale toewijzing grootboekrekening"
#. module: account
#: field:account.analytic.account,parent_id:0
@@ -1827,9 +1827,11 @@ msgstr "Volgend"
#. module: account
#: help:res.partner,property_account_position:0
msgid ""
"The fiscal mapping will determine taxes and the accounts used for the "
"The fiscal mapping will determine taxes and the accounts used for the "
"partner."
msgstr ""
"De fiscale toewijzing bepaalt de gebruikte belastingen en "
"grootboekrekeningen voor de relatie."
#. module: account
#: rml:account.analytic.account.cost_ledger:0
@@ -2104,7 +2106,7 @@ msgstr "Verkoopfactuur proces"
#. module: account
#: rml:account.invoice:0
msgid "Fiscal Mapping Remark :"
msgstr ""
msgstr "Fiscale toewijzing opmerking:"
#. module: account
#: wizard_field:account.fiscalyear.close,init,period_id:0
@@ -3710,7 +3712,7 @@ msgstr "Reeks"
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_template
msgid "Template for Fiscal Mapping"
msgstr ""
msgstr "Sjabloon voor fiscale toewijzing"
#. module: account
#: view:account.bank.statement:0
@@ -3817,7 +3819,7 @@ msgstr "Concept-facturen"
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_tax_template
msgid "Template Tax Fiscal Mapping"
msgstr ""
msgstr "Sjabloon fiscale toewijzing belasting"
#. module: account
#: rml:account.invoice:0
@@ -6017,7 +6019,7 @@ msgstr "Betalingsconditie"
#: model:ir.actions.act_window,name:account.action_account_fiscal_position_form
#: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form
msgid "Fiscal Mappings"
msgstr ""
msgstr "Fiscale toewijzingen"
#. module: account
#: model:process.process,name:account.process_process_statementprocess0
addons/account/i18n/nl_BE.po
+2 -2
View File
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-08-12 03:54+0000\n"
"X-Launchpad-Export-Date: 2010-09-29 05:04+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account
@@ -1830,7 +1830,7 @@ msgstr "Volgende"
#. module: account
#: help:res.partner,property_account_position:0
msgid ""
"The fiscal mapping will determine taxes and the accounts used for the "
"The fiscal mapping will determine taxes and the accounts used for the "
"partner."
msgstr ""
addons/account/i18n/oc.po
+3 -3
View File
@@ -8,13 +8,13 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
"PO-Revision-Date: 2010-08-02 20:06+0000\n"
"PO-Revision-Date: 2010-09-29 09:52+0000\n"
"Last-Translator: Cédric VALMARY (Tot en òc) <cvalmary@yahoo.fr>\n"
"Language-Team: Occitan (post 1500) <oc@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-08-12 03:53+0000\n"
"X-Launchpad-Export-Date: 2010-09-30 04:41+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account
@@ -1792,7 +1792,7 @@ msgstr "Seguent"
#. module: account
#: help:res.partner,property_account_position:0
msgid ""
"The fiscal mapping will determine taxes and the accounts used for the "
"The fiscal mapping will determine taxes and the accounts used for the "
"partner."
msgstr ""
addons/account/i18n/pl.po
+18 -16
View File
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
"PO-Revision-Date: 2010-09-08 08:57+0000\n"
"PO-Revision-Date: 2010-09-29 11:22+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-09-09 04:46+0000\n"
"X-Launchpad-Export-Date: 2010-09-30 04:41+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account
@@ -50,7 +50,7 @@ msgstr "Zatwierdź projekt wyciągu"
#. module: account
#: model:account.account.type,name:account.account_type_asset
msgid "Asset"
msgstr "Własność"
msgstr "Środek trwały"
#. module: account
#: constraint:ir.actions.act_window:0
@@ -631,7 +631,7 @@ msgstr "(Pozostaw puste, aby otworzyć bieżącą sytuację)"
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_account
msgid "Accounts Fiscal Mapping"
msgstr ""
msgstr "Mapowanie fiskalne kont"
#. module: account
#: field:account.analytic.account,contact_id:0
@@ -1029,7 +1029,7 @@ msgstr "Suma netto:"
#: model:ir.model,name:account.model_account_fiscal_position
#: field:res.partner,property_account_position:0
msgid "Fiscal Mapping"
msgstr ""
msgstr "Mapowanie fiskalne"
#. module: account
#: field:account.analytic.line,product_uom_id:0
@@ -1051,7 +1051,7 @@ msgstr "Podrzędne"
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_tax
msgid "Taxes Fiscal Mapping"
msgstr ""
msgstr "Mapowanie fiskalne podatków"
#. module: account
#: model:ir.actions.act_window,name:account.action_invoice_tree2_new
@@ -1140,7 +1140,7 @@ msgstr "Nowe konto analityczne"
#: model:ir.actions.act_window,name:account.action_account_fiscal_position_template_form
#: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form_template
msgid "Fiscal Mapping Templates"
msgstr ""
msgstr "Szablony mapowania fiskalnego"
#. module: account
#: rml:account.invoice:0
@@ -1172,7 +1172,7 @@ msgstr "Wartość wyrażona w ewentualnej innej walucie."
#: view:account.fiscal.position.template:0
#: field:account.fiscal.position.template,name:0
msgid "Fiscal Mapping Template"
msgstr ""
msgstr "Szablon mapowania fiskalnego"
#. module: account
#: field:account.payment.term,line_ids:0
@@ -1243,7 +1243,7 @@ msgstr "Waluta firmy"
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_account_template
msgid "Template Account Fiscal Mapping"
msgstr ""
msgstr "Szablon mapowania fiskalnego konta"
#. module: account
#: field:account.analytic.account,parent_id:0
@@ -1824,9 +1824,11 @@ msgstr "Następne"
#. module: account
#: help:res.partner,property_account_position:0
msgid ""
"The fiscal mapping will determine taxes and the accounts used for the "
"The fiscal mapping will determine taxes and the accounts used for the "
"partner."
msgstr ""
"Mapowanie fiskalne określa zmiany podatków i kont (ustalonych w produktach) "
"w zależności od partnera."
#. module: account
#: rml:account.analytic.account.cost_ledger:0
@@ -1922,7 +1924,7 @@ msgstr "Zapłać fakturę"
#. module: account
#: constraint:account.invoice:0
msgid "Error: Invalid Bvr Number (wrong checksum)."
msgstr ""
msgstr "Błąd! Nieprawidłowy numer Bvr (nieporawna suma kontrolna)"
#. module: account
#: model:ir.actions.act_window,name:account.action_invoice_tree5
@@ -2099,7 +2101,7 @@ msgstr "Proces faktury dla klienta"
#. module: account
#: rml:account.invoice:0
msgid "Fiscal Mapping Remark :"
msgstr ""
msgstr "Uwaga do mapowania fiskalnego :"
#. module: account
#: wizard_field:account.fiscalyear.close,init,period_id:0
@@ -3698,7 +3700,7 @@ msgstr "Numeracja"
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_template
msgid "Template for Fiscal Mapping"
msgstr ""
msgstr "Szablon mapowania fiskalnego"
#. module: account
#: view:account.bank.statement:0
@@ -3805,7 +3807,7 @@ msgstr "Projekty faktur"
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_tax_template
msgid "Template Tax Fiscal Mapping"
msgstr ""
msgstr "Szablon mapowania fiskalnego podatku"
#. module: account
#: rml:account.invoice:0
@@ -5997,7 +5999,7 @@ msgstr "Warunki płatności"
#: model:ir.actions.act_window,name:account.action_account_fiscal_position_form
#: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form
msgid "Fiscal Mappings"
msgstr ""
msgstr "Mapowanie fiskalne"
#. module: account
#: model:process.process,name:account.process_process_statementprocess0
@@ -6294,7 +6296,7 @@ msgstr ""
#. module: account
#: help:account.balance.account.balance.report,init,select_account:0
msgid "Keep empty for comparision to its parent"
msgstr ""
msgstr "Pozostaw puste do porównania z nadrzędnymi."
#. module: account
#: selection:account.balance.account.balance.report,init,period_manner:0
addons/account/i18n/pt.po
+4 -4
View File
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
"PO-Revision-Date: 2010-08-02 20:09+0000\n"
"Last-Translator: mga (Open ERP) <Unknown>\n"
"PO-Revision-Date: 2010-09-29 10:11+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-08-12 03:53+0000\n"
"X-Launchpad-Export-Date: 2010-09-30 04:41+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account
@@ -1822,7 +1822,7 @@ msgstr "Seguinte"
#. module: account
#: help:res.partner,property_account_position:0
msgid ""
"The fiscal mapping will determine taxes and the accounts used for the "
"The fiscal mapping will determine taxes and the accounts used for the "
"partner."
msgstr ""
addons/account/i18n/pt_BR.po
+3 -3
View File
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
"PO-Revision-Date: 2010-09-01 06:55+0000\n"
"PO-Revision-Date: 2010-09-29 10:30+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-09-02 03:53+0000\n"
"X-Launchpad-Export-Date: 2010-09-30 04:42+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account
@@ -1826,7 +1826,7 @@ msgstr "Próximo"
#. module: account
#: help:res.partner,property_account_position:0
msgid ""
"The fiscal mapping will determine taxes and the accounts used for the "
"The fiscal mapping will determine taxes and the accounts used for the "
"partner."
msgstr ""
addons/account/i18n/ro.po
+13 -12
View File
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
"PO-Revision-Date: 2010-08-02 20:11+0000\n"
"Last-Translator: mga (Open ERP) <Unknown>\n"
"PO-Revision-Date: 2010-09-29 09: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-08-12 03:53+0000\n"
"X-Launchpad-Export-Date: 2010-09-30 04:41+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account
@@ -1828,7 +1828,7 @@ msgstr "Înainte"
#. module: account
#: help:res.partner,property_account_position:0
msgid ""
"The fiscal mapping will determine taxes and the accounts used for the "
"The fiscal mapping will determine taxes and the accounts used for the "
"partner."
msgstr ""
@@ -6349,22 +6349,22 @@ msgstr ""
#. module: account
#: model:ir.actions.act_window,name:report_account.action_view_created_invoice_dashboard
msgid "Invoices Created Within Past 15 Days"
msgstr ""
msgstr "Facturi create in ultimele 15 zile"
#. module: account
#: model:ir.model,name:report_account.model_report_invoice_created
msgid "Report of Invoices Created within Last 15 days"
msgstr ""
msgstr "Raport al facturilor create in ultimele 15 zile"
#. module: account
#: view:report.invoice.created:0
msgid "Total Amount"
msgstr ""
msgstr "Suma totala"
#. module: account
#: view:report.account.receivable:0
msgid "Accounts by type"
msgstr ""
msgstr "Conturi, după tip"
#. module: account
#: model:ir.model,name:report_account.model_report_aged_receivable
@@ -6385,22 +6385,23 @@ msgstr ""
#: model:ir.module.module,description:report_account.module_meta_information
msgid "A module that adds new reports based on the account module."
msgstr ""
"Un modul care adauga rapoarte noi bazate pe modulul de contabilitate."
#. module: account
#: model:ir.module.module,shortdesc:report_account.module_meta_information
msgid "Account Reporting - Reporting"
msgstr ""
msgstr "Raportare contabilitate - Raportare"
#. module: account
#: model:ir.actions.act_window,name:report_account.action_account_receivable_graph
#: model:ir.ui.menu,name:report_account.menu_account_receivable_graph
msgid "Balance by Type of Account"
msgstr ""
msgstr "Balanță după tipul contului"
#. module: account
#: field:report.account.receivable,name:0
msgid "Week of Year"
msgstr ""
msgstr "Saptamana din an"
#. module: account
#: field:report.invoice.created,create_date:0
@@ -6416,7 +6417,7 @@ msgstr ""
#. module: account
#: view:report.invoice.created:0
msgid "Untaxed Amount"
msgstr ""
msgstr "Valoarea netaxată"
#~ msgid "account.config.wizard"
#~ msgstr "account.config.wizard"
addons/account/i18n/ru.po
+134 -126
View File
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
"PO-Revision-Date: 2010-08-02 20:12+0000\n"
"Last-Translator: mga (Open ERP) <Unknown>\n"
"PO-Revision-Date: 2010-10-04 06:51+0000\n"
"Last-Translator: Chertykov Denis <chertykov@gmail.com>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-08-12 03:53+0000\n"
"X-Launchpad-Export-Date: 2010-10-05 04:57+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account
@@ -1343,7 +1343,7 @@ msgstr ""
#. module: account
#: view:wizard.company.setup:0
msgid "Message"
msgstr ""
msgstr "Сообщение"
#. module: account
#: model:process.node,note:account.process_node_supplierpaymentorder0
@@ -1376,13 +1376,13 @@ msgstr "Строки аналитики"
#. module: account
#: help:account.tax,type:0
msgid "The computation method for the tax amount."
msgstr ""
msgstr "Метод расчета суммы налога."
#. module: account
#: model:process.node,note:account.process_node_accountingentries0
#: model:process.node,note:account.process_node_supplieraccountingentries0
msgid "Validated accounting entries."
msgstr ""
msgstr "Утвержденные проводки."
#. module: account
#: wizard_view:account.move.line.unreconcile,init:0
@@ -1410,7 +1410,7 @@ msgstr "Позиции налога"
#. module: account
#: field:ir.sequence,fiscal_ids:0
msgid "Sequences"
msgstr ""
msgstr "Последовательности"
#. module: account
#: model:ir.actions.act_window,name:account.action_account_type_form
@@ -1487,6 +1487,8 @@ msgid ""
"The partner bank account to pay\n"
"Keep empty to use the default"
msgstr ""
"Банковский счет партнера для оплаты\\n\n"
"Оставьте пустым для использования по умолчанию"
#. module: account
#: field:res.partner,debit:0
@@ -1582,7 +1584,7 @@ msgstr "Отркыть для сверки"
#. module: account
#: model:account.journal,name:account.bilan_journal
msgid "Journal d'ouverture"
msgstr ""
msgstr "Открытие журнала"
#. module: account
#: selection:account.tax,tax_group:0
@@ -1680,12 +1682,12 @@ msgstr "Журналы"
#. module: account
#: rml:account.analytic.account.quantity_cost_ledger:0
msgid "Max Qty:"
msgstr ""
msgstr "Макс. кол-во:"
#. module: account
#: wizard_button:account.invoice.refund,init,refund:0
msgid "Refund Invoice"
msgstr ""
msgstr "Счет возврата"
#. module: account
#: model:ir.actions.act_window,name:account.action_account_period_tree
@@ -1749,7 +1751,7 @@ msgstr ""
#: model:ir.actions.wizard,name:account.wizard_reconcile_unreconcile
#: model:ir.actions.wizard,name:account.wizard_unreconcile
msgid "Unreconcile Entries"
msgstr ""
msgstr "Несогласованные проводки"
#. module: account
#: model:process.node,note:account.process_node_supplierdraftinvoices0
@@ -1777,7 +1779,7 @@ msgstr "От"
#: model:process.node,note:account.process_node_reconciliation0
#: model:process.node,note:account.process_node_supplierreconciliation0
msgid "Reconciliation of entries from invoice(s) and payment(s)"
msgstr ""
msgstr "Согласование проводок из счета (ов) и оплат"
#. module: account
#: wizard_view:account.central.journal.report,init:0
@@ -1820,7 +1822,7 @@ msgstr "Далее"
#. module: account
#: help:res.partner,property_account_position:0
msgid ""
"The fiscal mapping will determine taxes and the accounts used for the "
"The fiscal mapping will determine taxes and the accounts used for the "
"partner."
msgstr ""
@@ -1952,22 +1954,22 @@ msgstr ""
#. module: account
#: wizard_field:account.general.ledger.report,checktype,sortbydate:0
msgid "Sort by:"
msgstr ""
msgstr "Сортировать по:"
#. module: account
#: field:account.move,to_check:0
msgid "To Be Verified"
msgstr ""
msgstr "Будет утвержден"
#. module: account
#: help:res.partner,debit:0
msgid "Total amount you have to pay to this supplier."
msgstr ""
msgstr "Всего вы должны заплатить этому поставщику."
#. module: account
#: selection:account.automatic.reconcile,init,power:0
msgid "7"
msgstr ""
msgstr "7"
#. module: account
#: model:ir.actions.report.xml,name:account.account_transfers
@@ -1987,13 +1989,13 @@ msgstr "Планы счетов"
#. module: account
#: help:account.tax,name:0
msgid "This name will be displayed on reports"
msgstr ""
msgstr "Это название будет выводиться в отчеты"
#. module: account
#: rml:account.analytic.account.cost_ledger:0
#: rml:account.analytic.account.quantity_cost_ledger:0
msgid "Printing date"
msgstr ""
msgstr "Дата печати"
#. module: account
#: constraint:ir.ui.view:0
@@ -2062,7 +2064,7 @@ msgstr "Партнер"
msgid ""
"Unique number of the invoice, computed automatically when the invoice is "
"created."
msgstr ""
msgstr "Уникальный номер счета, автоматически вычислен при создании сета."
#. module: account
#: rml:account.invoice:0
@@ -2114,7 +2116,7 @@ msgstr "дней"
#. module: account
#: selection:account.aged.trial.balance,init,direction_selection:0
msgid "Past"
msgstr ""
msgstr "Прошлые"
#. module: account
#: field:account.analytic.account,company_currency_id:0
@@ -2138,7 +2140,7 @@ msgstr "Неоплаченные счета"
#. module: account
#: model:process.transition,name:account.process_transition_paymentreconcile0
msgid "Payment Reconcile"
msgstr ""
msgstr "Согласование платежа"
#. module: account
#: model:ir.actions.act_window,name:account.action_bank_statement_reconciliation_form
@@ -2166,7 +2168,7 @@ msgstr "Проводка аналитики"
#: view:res.company:0
#: field:res.company,overdue_msg:0
msgid "Overdue Payments Message"
msgstr ""
msgstr "Сообщение о просроченном платеже"
#. module: account
#: model:ir.actions.act_window,name:account.action_tax_code_tree
@@ -2240,7 +2242,7 @@ msgstr ""
#. module: account
#: rml:account.invoice:0
msgid "VAT :"
msgstr ""
msgstr "НДС:"
#. module: account
#: wizard_field:account.general.ledger.report,account_selection,Account_list:0
@@ -2265,7 +2267,7 @@ msgstr "Создать проводки подписки"
#. module: account
#: wizard_field:account.fiscalyear.close,init,journal_id:0
msgid "Opening Entries Journal"
msgstr ""
msgstr "Открытие журнала проводок"
#. module: account
#: view:account.config.wizard:0
@@ -2289,17 +2291,17 @@ msgstr "Дата выставления счета"
#: help:account.third_party_ledger.report,init,periods:0
#: help:account.vat.declaration,init,periods:0
msgid "All periods if empty"
msgstr ""
msgstr "Все периоды, если не заполнено"
#. module: account
#: model:account.account.type,name:account.account_type_liability
msgid "Liability"
msgstr ""
msgstr "Обязательства"
#. module: account
#: selection:account.automatic.reconcile,init,power:0
msgid "2"
msgstr ""
msgstr "2"
#. module: account
#: wizard_view:account.chart,init:0
@@ -2389,7 +2391,7 @@ msgstr "Автоматическая сверка"
#. module: account
#: view:account.bank.statement:0
msgid "Import Invoice"
msgstr ""
msgstr "Импорт счета"
#. module: account
#: wizard_view:account.analytic.account.quantity_cost_ledger.report,init:0
@@ -2409,7 +2411,7 @@ msgstr ""
#. module: account
#: field:account.bank.accounts.wizard,acc_no:0
msgid "Account No."
msgstr ""
msgstr "Счет номер"
#. module: account
#: help:account.tax,child_depend:0
@@ -2421,7 +2423,7 @@ msgstr ""
#. module: account
#: rml:account.central.journal:0
msgid "Journal Code"
msgstr ""
msgstr "Код журнала"
#. module: account
#: help:account.tax,applicable_type:0
@@ -2476,7 +2478,7 @@ msgstr "Построчный ввод проводок"
#. module: account
#: help:account.chart.template,tax_template_ids:0
msgid "List of all the taxes that have to be installed by the wizard"
msgstr ""
msgstr "Список всех налогов, которые должны быть установлены мастером"
#. module: account
#: rml:account.analytic.account.cost_ledger:0
@@ -2501,7 +2503,7 @@ msgstr ""
#: model:process.transition,name:account.process_transition_entriesreconcile0
#: model:process.transition,name:account.process_transition_supplierentriesreconcile0
msgid "Entries Reconcile"
msgstr ""
msgstr "Согласование проводок"
#. module: account
#: help:account.bank.statement.reconcile,total_second_amount:0
@@ -2517,7 +2519,7 @@ msgstr ""
#: model:process.transition,note:account.process_transition_analyticinvoice0
#: model:process.transition,note:account.process_transition_supplieranalyticcost0
msgid "From analytic accounts, Create invoice."
msgstr ""
msgstr "Из аналит. проводок, создать счет"
#. module: account
#: wizard_button:account.account.balance.report,account_selection,end:0
@@ -2588,7 +2590,7 @@ msgstr "Использовать данный код для декларации
#. module: account
#: field:account.move.line,blocked:0
msgid "Litigation"
msgstr ""
msgstr "Судебный спор"
#. module: account
#: view:account.move.line:0
@@ -2600,7 +2602,7 @@ msgstr "Информация"
#. module: account
#: model:ir.ui.menu,name:account.menu_tax_report
msgid "Taxes Reports"
msgstr ""
msgstr "Отчеты по налогам"
#. module: account
#: field:res.partner,property_account_payable:0
@@ -2625,13 +2627,15 @@ msgstr "Счет по кредиту по умолчанию"
#. module: account
#: model:process.node,name:account.process_node_supplierpaymentorder0
msgid "Payment Order"
msgstr ""
msgstr "Платежное поручение"
#. module: account
#: help:account.account.template,reconcile:0
msgid ""
"Check this option if you want the user to reconcile entries in this account."
msgstr ""
"Отметьте, если вы хотите, чтобы пользователь согласовывал проводки по этому "
"счету."
#. module: account
#: rml:account.analytic.account.journal:0
@@ -2644,7 +2648,7 @@ msgstr "Аналитический"
#. module: account
#: model:process.node,name:account.process_node_invoiceinvoice0
msgid "Create Invoice"
msgstr ""
msgstr "Создать счет"
#. module: account
#: model:account.account.type,name:account.account_type_cash_equity
@@ -2654,7 +2658,7 @@ msgstr "Собственные средства"
#. module: account
#: field:wizard.company.setup,overdue_msg:0
msgid "Overdue Payment Message"
msgstr ""
msgstr "Сообщение о просроченном платеже"
#. module: account
#: model:ir.model,name:account.model_account_tax_code_template
@@ -2684,17 +2688,17 @@ msgstr "Обработка конца года"
#. module: account
#: model:ir.ui.menu,name:account.menu_generic_report
msgid "Generic Reports"
msgstr ""
msgstr "Общие отчеты"
#. module: account
#: wizard_field:account.automatic.reconcile,init,power:0
msgid "Power"
msgstr ""
msgstr "Мощность"
#. module: account
#: wizard_view:account.analytic.line,init:0
msgid "Account Analytic Lines Analysis"
msgstr ""
msgstr "Анализ проводок аналитики"
#. module: account
#: rml:account.invoice:0
@@ -2725,7 +2729,7 @@ msgstr "План счетов аналитики"
#. module: account
#: wizard_view:account.analytic.line,init:0
msgid "View Account Analytic Lines"
msgstr ""
msgstr "Вид проводок аналитики"
#. module: account
#: wizard_view:account.move.validate,init:0
@@ -2740,7 +2744,7 @@ msgstr "Номер счета"
#. module: account
#: field:account.period,date_stop:0
msgid "End of Period"
msgstr ""
msgstr "Конец периода"
#. module: account
#: wizard_button:populate_statement_from_inv,go,finish:0
@@ -2750,7 +2754,7 @@ msgstr ""
#. module: account
#: field:account.invoice,amount_untaxed:0
msgid "Untaxed"
msgstr ""
msgstr "Без налога"
#. module: account
#: model:ir.actions.report.xml,name:account.account_analytic_account_inverted_balance
@@ -2911,7 +2915,7 @@ msgstr ""
#. module: account
#: field:account.analytic.account,complete_name:0
msgid "Full Account Name"
msgstr ""
msgstr "Полное название счета"
#. module: account
#: rml:account.account.balance:0
@@ -2925,7 +2929,7 @@ msgstr ""
#: rml:account.third_party_ledger_other:0
#: rml:account.vat.declaration:0
msgid "1cm 27.7cm 20cm 27.7cm"
msgstr ""
msgstr "1см 27,7см 20см 27,7см"
#. module: account
#: model:ir.actions.act_window,name:account.action_invoice_tree12
@@ -2972,7 +2976,7 @@ msgstr ""
#: model:ir.actions.act_window,name:account.act_account_journal_2_account_move_line
#: model:ir.model,name:account.model_account_move_line
msgid "Entry lines"
msgstr ""
msgstr "Проводки"
#. module: account
#: wizard_view:account.automatic.reconcile,init:0
@@ -3002,7 +3006,7 @@ msgstr "Код налога"
#. module: account
#: rml:account.analytic.account.journal:0
msgid "Analytic Journal -"
msgstr ""
msgstr "Журнал аналитики -"
#. module: account
#: rml:account.analytic.account.analytic.check:0
@@ -3053,7 +3057,7 @@ msgstr ""
#. module: account
#: field:account.invoice.line,uos_id:0
msgid "Unit of Measure"
msgstr ""
msgstr "Ед. изм."
#. module: account
#: field:account.chart.template,property_account_receivable:0
@@ -3066,6 +3070,8 @@ msgid ""
"If this box is checked, the system will try to group the accounting lines "
"when generating them from invoices."
msgstr ""
"Если отмечено, система попытается сгруппировать проводки при создании их из "
"счета."
#. module: account
#: wizard_field:account.move.line.reconcile,init_full,trans_nbr:0
@@ -3095,7 +3101,7 @@ msgstr ""
#. module: account
#: model:process.transition,note:account.process_transition_paymentreconcile0
msgid "Reconcilate the entries from payment"
msgstr ""
msgstr "Согласовать проводки из платежа"
#. module: account
#: rml:account.tax.code.entries:0
@@ -3113,7 +3119,7 @@ msgstr "Установить в 'Черновик'"
#: help:account.invoice,origin:0
#: help:account.invoice.line,origin:0
msgid "Reference of the document that produced this invoice."
msgstr ""
msgstr "Ссылка на документ, породивший этот счет."
#. module: account
#: selection:account.account,type:0
@@ -3137,12 +3143,12 @@ msgstr "Название модели"
#: selection:account.account,type:0
#: selection:account.account.template,type:0
msgid "Others"
msgstr ""
msgstr "Другие"
#. module: account
#: selection:account.automatic.reconcile,init,power:0
msgid "8"
msgstr ""
msgstr "8"
#. module: account
#: view:account.invoice:0
@@ -3196,7 +3202,7 @@ msgstr ""
#: selection:account.partner.balance.report,init,state:0
#: selection:account.third_party_ledger.report,init,state:0
msgid "By Date and Period"
msgstr ""
msgstr "По дате и периоду"
#. module: account
#: view:account.account:0
@@ -3337,7 +3343,7 @@ msgstr ""
#: field:account.fiscal.position.tax,tax_src_id:0
#: field:account.fiscal.position.tax.template,tax_src_id:0
msgid "Tax Source"
msgstr ""
msgstr "База налога"
#. module: account
#: model:ir.actions.report.xml,name:account.account_analytic_account_balance
@@ -3363,7 +3369,7 @@ msgstr ""
#. module: account
#: rml:account.invoice:0
msgid "Fax :"
msgstr ""
msgstr "Факс :"
#. module: account
#: rml:account.partner.balance:0
@@ -3418,12 +3424,12 @@ msgstr ""
#. module: account
#: view:account.bank.statement:0
msgid "Real Entries"
msgstr ""
msgstr "Действительные проводки"
#. module: account
#: model:process.node,name:account.process_node_importinvoice0
msgid "Import invoice"
msgstr ""
msgstr "Импорт счета"
#. module: account
#: view:account.invoice:0
@@ -3435,7 +3441,7 @@ msgstr "Создать"
#. module: account
#: model:process.transition.action,name:account.process_transition_action_createentries0
msgid "Create entry"
msgstr ""
msgstr "Создать проводку"
#. module: account
#: model:ir.model,name:account.model_account_invoice_line
@@ -3454,6 +3460,8 @@ msgid ""
"All draft account entries in this journal and period will be validated. It "
"means you won't be able to modify their accouting fields."
msgstr ""
"Все черновые проводки в этом журнале и периоде будут проведены. Это значит, "
"что вы не сможете изменять счета в проводоках."
#. module: account
#: selection:account.model.line,date:0
@@ -3535,23 +3543,23 @@ msgstr "Отчетный год"
#. module: account
#: rml:account.overdue:0
msgid "Balance :"
msgstr ""
msgstr "Баланс :"
#. module: account
#: selection:account.account.balance.report,checktype,display_account:0
#: selection:account.general.ledger.report,checktype,display_account:0
msgid "With balance is not equal to 0"
msgstr ""
msgstr "С балансом не равным 0"
#. module: account
#: selection:account.automatic.reconcile,init,power:0
msgid "3"
msgstr ""
msgstr "3"
#. module: account
#: model:ir.actions.report.xml,name:account.account_vat_declaration
msgid "Taxes Report"
msgstr ""
msgstr "Отчет по налогам"
#. module: account
#: selection:account.journal.period,state:0
@@ -3613,12 +3621,12 @@ msgstr "Вручную"
#. module: account
#: view:account.invoice:0
msgid "Compute Taxes"
msgstr ""
msgstr "Вычислить налоги"
#. module: account
#: field:wizard.multi.charts.accounts,code_digits:0
msgid "# of Digits"
msgstr ""
msgstr "кол-во цифр"
#. module: account
#: help:res.partner,property_payment_term:0
@@ -3688,7 +3696,7 @@ msgstr "Период списания"
#. module: account
#: selection:account.config.wizard,period:0
msgid "3 Months"
msgstr ""
msgstr "3 месяца"
#. module: account
#: wizard_view:account.move.journal,init:0
@@ -3733,19 +3741,19 @@ msgstr "Проводка подписки"
#. module: account
#: selection:account.print.journal.report,init,sort_selection:0
msgid "By date"
msgstr ""
msgstr "По дате"
#. module: account
#: model:ir.actions.act_window,name:account.action_account_config_wizard_form
msgid "Account Configure Wizard "
msgstr ""
msgstr "Мастер настройки бух. счетов "
#. module: account
#: field:account.config.wizard,date1:0
#: field:account.fiscalyear,date_start:0
#: field:account.subscription,date_start:0
msgid "Start Date"
msgstr ""
msgstr "Дата начала"
#. module: account
#: wizard_view:account.general.ledger.report,account_selection:0
@@ -3762,7 +3770,7 @@ msgstr "Все проводки"
#: model:process.node,name:account.process_node_draftinvoices0
#: model:process.node,name:account.process_node_supplierdraftinvoices0
msgid "Draft Invoices"
msgstr ""
msgstr "Черновики счетов"
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_tax_template
@@ -3772,7 +3780,7 @@ msgstr ""
#. module: account
#: rml:account.invoice:0
msgid "Invoice Date"
msgstr ""
msgstr "Дата выставления счета"
#. module: account
#: selection:account.account.type,close_method:0
@@ -3831,7 +3839,7 @@ msgstr ""
#: model:ir.actions.act_window,name:account.action_wizard_company_setup_form
#: view:wizard.company.setup:0
msgid "Overdue Payment Report Message"
msgstr ""
msgstr "Сообщение о просроченном платеже"
#. module: account
#: selection:account.tax,tax_group:0
@@ -3855,12 +3863,12 @@ msgstr "Столбцы"
#. module: account
#: selection:account.general.ledger.report,checktype,sortbydate:0
msgid "Movement"
msgstr ""
msgstr "Перемещение"
#. module: account
#: help:account.period,special:0
msgid "These periods can overlap."
msgstr ""
msgstr "Эти периоды могут перекрываться."
#. module: account
#: help:product.template,property_account_expense:0
@@ -3886,12 +3894,12 @@ msgstr "Финансовые журналы"
#: selection:account.partner.balance.report,init,state:0
#: selection:account.third_party_ledger.report,init,state:0
msgid "By Period"
msgstr ""
msgstr "По периоду"
#. module: account
#: help:account.invoice,date_invoice:0
msgid "Keep empty to use the current date"
msgstr ""
msgstr "Оставьте пустым для текущей даты"
#. module: account
#: rml:account.overdue:0
@@ -3901,7 +3909,7 @@ msgstr "."
#. module: account
#: field:account.analytic.account,quantity_max:0
msgid "Maximum Quantity"
msgstr ""
msgstr "Максимальное количество"
#. module: account
#: field:account.period,name:0
@@ -3924,7 +3932,7 @@ msgstr "Группы"
#. module: account
#: rml:account.analytic.account.quantity_cost_ledger:0
msgid "Code/Date"
msgstr ""
msgstr "Код/Дата"
#. module: account
#: field:account.account,active:0
@@ -3945,12 +3953,12 @@ msgstr ""
#. module: account
#: view:account.chart.template:0
msgid "Properties"
msgstr ""
msgstr "Параметры"
#. module: account
#: view:res.partner:0
msgid "Customer Accounting Properties"
msgstr ""
msgstr "Настройки бух. учета для заказчика"
#. module: account
#: view:account.bank.statement:0
@@ -3965,7 +3973,7 @@ msgstr ""
#. module: account
#: wizard_field:account.vat.declaration,init,based_on:0
msgid "Base on"
msgstr ""
msgstr "Основан на"
#. module: account
#: selection:account.move,type:0
@@ -4197,7 +4205,7 @@ msgstr ""
#. module: account
#: help:account.config.wizard,code:0
msgid "Name of the fiscal year as displayed in reports."
msgstr ""
msgstr "Название отчетного года для отображения в отчетах"
#. module: account
#: help:account.move.line,date_maturity:0
@@ -4357,7 +4365,7 @@ msgstr ""
#: field:account.config.wizard,date2:0
#: field:account.fiscalyear,date_stop:0
msgid "End Date"
msgstr ""
msgstr "Дата окончания"
#. module: account
#: model:ir.actions.wizard,name:account.wizard_open_closed_fiscalyear
@@ -4373,7 +4381,7 @@ msgstr ""
#. module: account
#: field:account.payment.term.line,days2:0
msgid "Day of the Month"
msgstr ""
msgstr "День месяца"
#. module: account
#: field:account.analytic.journal,line_ids:0
@@ -4534,7 +4542,7 @@ msgstr "Разрегить сверку"
#: selection:account.partner.balance.report,init,state:0
#: selection:account.third_party_ledger.report,init,state:0
msgid "By Date"
msgstr ""
msgstr "По дате"
#. module: account
#: model:ir.actions.act_window,name:account.action_invoice_tree4
@@ -4550,7 +4558,7 @@ msgstr "Дата сгенерированных проводок"
#. module: account
#: wizard_button:account.invoice.refund,init,modify_invoice:0
msgid "Modify Invoice"
msgstr ""
msgstr "Изменить счет"
#. module: account
#: view:res.partner:0
@@ -4560,7 +4568,7 @@ msgstr "Настройки бухгалтерского учета для кон
#. module: account
#: view:account.analytic.account:0
msgid "Analytic Account Statistics"
msgstr ""
msgstr "Статистика счета аналитики"
#. module: account
#: view:wizard.multi.charts.accounts:0
@@ -4590,12 +4598,12 @@ msgstr ""
#. module: account
#: wizard_field:account.aged.trial.balance,init,result_selection:0
msgid "Filter on Partners"
msgstr ""
msgstr "Фильтр по партнерам"
#. module: account
#: field:account.tax,price_include:0
msgid "Tax Included in Price"
msgstr ""
msgstr "Налог включен в цену"
#. module: account
#: model:ir.actions.act_window,name:account.action_account_analytic_journal_tree2
@@ -4676,7 +4684,7 @@ msgstr "Учетные годы"
#. module: account
#: model:process.node,note:account.process_node_importinvoice0
msgid "Import from invoices or payments"
msgstr ""
msgstr "Импорт из счетов или платежей"
#. module: account
#: model:ir.actions.wizard,name:account.wizard_reconcile_select
@@ -4733,7 +4741,7 @@ msgstr "Адрес выставления счета"
#. module: account
#: rml:account.analytic.account.analytic.check:0
msgid "General Credit"
msgstr ""
msgstr "Общий кредит"
#. module: account
#: help:account.journal,centralisation:0
@@ -4746,7 +4754,7 @@ msgstr ""
#. module: account
#: selection:account.invoice,state:0
msgid "Cancelled"
msgstr ""
msgstr "Отменено"
#. module: account
#: model:ir.actions.act_window,name:account.action_bank_statement_draft_tree
@@ -4757,7 +4765,7 @@ msgstr "Черновые выписки"
#. module: account
#: wizard_field:populate_statement_from_inv,init,date:0
msgid "Date payment"
msgstr ""
msgstr "Дата оплаты"
#. module: account
#: rml:account.journal.period.print:0
@@ -4774,7 +4782,7 @@ msgstr "Расходы и доходы по журналам (текущий м
#: selection:account.partner.balance.report,init,result_selection:0
#: selection:account.third_party_ledger.report,init,result_selection:0
msgid "Receivable Accounts"
msgstr ""
msgstr "Счета к получению"
#. module: account
#: wizard_button:account.move.line.unreconcile.select,init,open:0
@@ -4830,7 +4838,7 @@ msgstr "НДС:"
#: rml:account.general.journal:0
#: rml:account.invoice:0
msgid "Total:"
msgstr ""
msgstr "Всего:"
#. module: account
#: model:ir.model,name:account.model_account_analytic_journal
@@ -4885,7 +4893,7 @@ msgstr ""
#: field:account.bank.statement.reconcile,total_amount:0
#: field:account.bank.statement.reconcile,total_second_amount:0
msgid "Payment amount"
msgstr ""
msgstr "Сумма оплаты"
#. module: account
#: view:account.analytic.account:0
@@ -4932,7 +4940,7 @@ msgstr "Все месяцы"
#. module: account
#: wizard_field:account.invoice.refund,init,date:0
msgid "Operation date"
msgstr ""
msgstr "Дата операции"
#. module: account
#: field:account.invoice,invoice_line:0
@@ -4942,7 +4950,7 @@ msgstr "Позиции счета"
#. module: account
#: field:account.period,date_start:0
msgid "Start of Period"
msgstr ""
msgstr "Начало периода"
#. module: account
#: wizard_field:account.fiscalyear.close,init,report_name:0
@@ -5000,12 +5008,12 @@ msgstr ""
#. module: account
#: rml:account.account.balance:0
msgid "Account Balance -"
msgstr ""
msgstr "Баланс по счету -"
#. module: account
#: field:account.journal,group_invoice_lines:0
msgid "Group invoice lines"
msgstr ""
msgstr "Группировать позиции счета"
#. module: account
#: model:ir.ui.menu,name:account.menu_finance_configuration
@@ -5050,7 +5058,7 @@ msgstr ""
#: wizard_view:account.partner.balance.report,init:0
#: wizard_view:account.third_party_ledger.report,init:0
msgid "Select Date-Period"
msgstr ""
msgstr "Выбор даты-периода"
#. module: account
#: rml:account.analytic.account.inverted.balance:0
@@ -5061,7 +5069,7 @@ msgstr ""
#: model:process.node,name:account.process_node_paidinvoice0
#: model:process.node,name:account.process_node_supplierpaidinvoice0
msgid "Paid invoice"
msgstr ""
msgstr "Оплаченный счет"
#. module: account
#: view:account.tax:0
@@ -5091,7 +5099,7 @@ msgstr ""
#. module: account
#: model:ir.actions.wizard,name:account.wizard_populate_statement_from_inv
msgid "Import invoices"
msgstr ""
msgstr "Импорт счетов"
#. module: account
#: wizard_view:account.move.line.unreconcile,init:0
@@ -5135,7 +5143,7 @@ msgstr "Периоды подписки"
#. module: account
#: model:process.node,name:account.process_node_manually0
msgid "Manually"
msgstr ""
msgstr "Вручную"
#. module: account
#: view:account.invoice:0
@@ -5154,7 +5162,7 @@ msgstr "Счета"
#: selection:account.partner.balance.report,init,result_selection:0
#: selection:account.third_party_ledger.report,init,result_selection:0
msgid "Payable Accounts"
msgstr ""
msgstr "Кредиторская задолженность"
#. module: account
#: view:account.invoice.line:0
@@ -5175,12 +5183,12 @@ msgstr "Полный платеж"
#. module: account
#: selection:account.move,type:0
msgid "Journal Purchase"
msgstr ""
msgstr "Журнал покупок"
#. module: account
#: selection:account.move,type:0
msgid "Cash Receipt"
msgstr ""
msgstr "Денежное поступление"
#. module: account
#: field:account.fiscal.position.tax,tax_dest_id:0
@@ -5246,12 +5254,12 @@ msgstr ""
#: wizard_view:account.partner.balance.report,init:0
#: wizard_view:account.third_party_ledger.report,init:0
msgid "Date Filter"
msgstr ""
msgstr "Фильтр дат"
#. module: account
#: wizard_view:populate_statement_from_inv,init:0
msgid "Choose Journal and Payment Date"
msgstr ""
msgstr "Выбрать журнал и дату платежа"
#. module: account
#: selection:account.analytic.account,state:0
@@ -5280,7 +5288,7 @@ msgstr "Невыплаченные возвраты клиентам"
#. module: account
#: help:account.invoice,residual:0
msgid "Remaining amount due."
msgstr ""
msgstr "Оставшиеся суммы"
#. module: account
#: wizard_view:account.period.close,init:0
@@ -5296,7 +5304,7 @@ msgstr "Проформа"
#. module: account
#: field:account.move.reconcile,line_partial_ids:0
msgid "Partial Entry lines"
msgstr ""
msgstr "Частичная проводка"
#. module: account
#: help:account.move.line,statement_id:0
@@ -5311,7 +5319,7 @@ msgstr "Отчетный год"
#. module: account
#: wizard_button:account.analytic.line,init,open:0
msgid "Open Entries"
msgstr ""
msgstr "Открытые проводки"
#. module: account
#: selection:account.analytic.account,type:0
@@ -5336,7 +5344,7 @@ msgstr ""
#: rml:account.third_party_ledger_other:0
#: rml:account.vat.declaration:0
msgid "Page"
msgstr ""
msgstr "Страница"
#. module: account
#: view:account.move:0
@@ -5369,7 +5377,7 @@ msgstr "Сверенная сумма"
#. module: account
#: selection:account.account,currency_mode:0
msgid "At Date"
msgstr ""
msgstr "На дату"
#. module: account
#: help:account.move.line,tax_amount:0
@@ -5411,7 +5419,7 @@ msgstr ""
#. module: account
#: field:account.subscription,period_total:0
msgid "Number of Periods"
msgstr ""
msgstr "Количество периодов"
#. module: account
#: wizard_field:account.analytic.account.analytic.check.report,init,date2:0
@@ -5480,7 +5488,7 @@ msgstr ""
#. module: account
#: field:wizard.multi.charts.accounts,bank_accounts_id:0
msgid "Bank Accounts"
msgstr ""
msgstr "Банковские счета"
#. module: account
#: constraint:account.period:0
@@ -5492,7 +5500,7 @@ msgstr ""
#. module: account
#: help:account.journal,invoice_sequence_id:0
msgid "The sequence used for invoice numbers in this journal."
msgstr ""
msgstr "Последовательность используемая для нумерации счетов в этом журнале"
#. module: account
#: view:account.account:0
@@ -5541,7 +5549,7 @@ msgstr "Список счетов"
#: view:product.product:0
#: view:product.template:0
msgid "Sales Properties"
msgstr ""
msgstr "Свойства продаж"
#. module: account
#: rml:account.general.journal:0
@@ -5557,12 +5565,12 @@ msgstr "Книга расходов (только количество)"
#. module: account
#: wizard_view:account.move.validate,init:0
msgid "Validate Account Entries"
msgstr ""
msgstr "Утвердить проводки"
#. module: account
#: selection:account.print.journal.report,init,sort_selection:0
msgid "Reference Number"
msgstr ""
msgstr "Ссылка"
#. module: account
#: rml:account.overdue:0
@@ -5578,7 +5586,7 @@ msgstr ""
#. module: account
#: model:ir.actions.act_window,name:account.action_account_analytic_journal_open_form
msgid "Entries of Open Analytic Journals"
msgstr ""
msgstr "Проводки открытых журналов аналитики"
#. module: account
#: view:account.invoice.tax:0
@@ -5593,7 +5601,7 @@ msgstr "Текущая дата"
#. module: account
#: selection:account.move,type:0
msgid "Journal Sale"
msgstr ""
msgstr "Журнал продаж"
#. module: account
#: wizard_field:account.fiscalyear.close,init,fy_id:0
@@ -5616,12 +5624,12 @@ msgstr "Начало периода"
#. module: account
#: model:ir.ui.menu,name:account.account_template_folder
msgid "Templates"
msgstr ""
msgstr "Шаблоны"
#. module: account
#: wizard_button:account.vat.declaration,init,report:0
msgid "Print VAT Decl."
msgstr ""
msgstr "Печать декл. НДС"
#. module: account
#: model:ir.actions.report.xml,name:account.account_intracom
@@ -5674,7 +5682,7 @@ msgstr "Шаблоны для плана счетов"
#. module: account
#: view:account.config.wizard:0
msgid "Account Configure"
msgstr ""
msgstr "Настройка счета"
#. module: account
#: help:res.partner,property_account_payable:0
addons/account/i18n/si.po
+2 -2
View File
@@ -14,7 +14,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-08-12 03:53+0000\n"
"X-Launchpad-Export-Date: 2010-09-29 05:02+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account
@@ -1790,7 +1790,7 @@ msgstr ""
#. module: account
#: help:res.partner,property_account_position:0
msgid ""
"The fiscal mapping will determine taxes and the accounts used for the "
"The fiscal mapping will determine taxes and the accounts used for the "
"partner."
msgstr ""
addons/account/i18n/sk.po
+4 -4
View File
@@ -8,13 +8,13 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
"PO-Revision-Date: 2010-08-02 20:15+0000\n"
"PO-Revision-Date: 2010-09-29 11:40+0000\n"
"Last-Translator: Radoslav Sloboda <rado.sloboda@gmail.com>\n"
"Language-Team: Slovak <sk@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-08-12 03:53+0000\n"
"X-Launchpad-Export-Date: 2010-09-30 04:42+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account
@@ -31,7 +31,7 @@ msgstr ""
#: model:ir.actions.act_window,name:account.action_invoice_tree9
#: model:ir.ui.menu,name:account.menu_action_invoice_tree9
msgid "Unpaid Supplier Invoices"
msgstr ""
msgstr "Neuhradené dodávateľské faktúry"
#. module: account
#: model:ir.ui.menu,name:account.menu_finance_entries
@@ -1793,7 +1793,7 @@ msgstr ""
#. module: account
#: help:res.partner,property_account_position:0
msgid ""
"The fiscal mapping will determine taxes and the accounts used for the "
"The fiscal mapping will determine taxes and the accounts used for the "
"partner."
msgstr ""
addons/account/i18n/sl.po
+3 -3
View File
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
"PO-Revision-Date: 2010-08-03 11:07+0000\n"
"PO-Revision-Date: 2010-09-29 10: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-08-12 03:53+0000\n"
"X-Launchpad-Export-Date: 2010-09-30 04:42+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account
@@ -1810,7 +1810,7 @@ msgstr "Naslednji"
#. module: account
#: help:res.partner,property_account_position:0
msgid ""
"The fiscal mapping will determine taxes and the accounts used for the "
"The fiscal mapping will determine taxes and the accounts used for the "
"partner."
msgstr ""
addons/account/i18n/sq.po
+3 -3
View File
@@ -8,13 +8,13 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: ASTRIT BOKSHI <astritbokshi@gmail.com>\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
"PO-Revision-Date: 2010-09-08 08:38+0000\n"
"PO-Revision-Date: 2010-09-29 11:14+0000\n"
"Last-Translator: bokshas <astritbokshi@gmail.com>\n"
"Language-Team: Albanian <sq@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-09-09 04:45+0000\n"
"X-Launchpad-Export-Date: 2010-09-30 04:39+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account
@@ -1816,7 +1816,7 @@ msgstr ""
#. module: account
#: help:res.partner,property_account_position:0
msgid ""
"The fiscal mapping will determine taxes and the accounts used for the "
"The fiscal mapping will determine taxes and the accounts used for the "
"partner."
msgstr ""
addons/account/i18n/sr.po
+1054 -934
View File
File diff suppressed because it is too large Load Diff
addons/account/i18n/sv.po
+10 -4
View File
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
"PO-Revision-Date: 2010-09-08 08:36+0000\n"
"Last-Translator: OpenERP Administrators <Unknown>\n"
"PO-Revision-Date: 2010-10-08 07:35+0000\n"
"Last-Translator: Anders Eriksson (Mobila System) <ae@mobilasystem.se>\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-09-09 04:46+0000\n"
"X-Launchpad-Export-Date: 2010-10-09 12:13+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account
@@ -26,6 +26,12 @@ msgstr "Internt namn"
msgid "Account Tax Code"
msgstr "Konto, skattekod"
#. module: account
#: model:ir.actions.act_window,name:account.action_invoice_tree9
#: model:ir.ui.menu,name:account.menu_action_invoice_tree9
msgid "Unpaid Supplier Invoices"
msgstr "Obetalda leverantörsfakturor"
#. module: account
#: model:ir.ui.menu,name:account.menu_finance_entries
msgid "Entries Encoding"
@@ -1808,7 +1814,7 @@ msgstr "Nästa"
#. module: account
#: help:res.partner,property_account_position:0
msgid ""
"The fiscal mapping will determine taxes and the accounts used for the "
"The fiscal mapping will determine taxes and the accounts used for the "
"partner."
msgstr ""
addons/account/i18n/ta.po
+2 -2
View File
@@ -14,7 +14,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-09-02 03:53+0000\n"
"X-Launchpad-Export-Date: 2010-09-29 05:03+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account
@@ -1790,7 +1790,7 @@ msgstr ""
#. module: account
#: help:res.partner,property_account_position:0
msgid ""
"The fiscal mapping will determine taxes and the accounts used for the "
"The fiscal mapping will determine taxes and the accounts used for the "
"partner."
msgstr ""
addons/account/i18n/te.po
+3 -3
View File
@@ -8,13 +8,13 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
"PO-Revision-Date: 2009-10-01 07:46+0000\n"
"PO-Revision-Date: 2010-09-29 11:38+0000\n"
"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
"Language-Team: Telugu <te@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-08-12 03:54+0000\n"
"X-Launchpad-Export-Date: 2010-09-30 04:42+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account
@@ -1790,7 +1790,7 @@ msgstr "తర్వాత"
#. module: account
#: help:res.partner,property_account_position:0
msgid ""
"The fiscal mapping will determine taxes and the accounts used for the "
"The fiscal mapping will determine taxes and the accounts used for the "
"partner."
msgstr ""
addons/account/i18n/th.po
+2 -2
View File
@@ -14,7 +14,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-08-12 03:54+0000\n"
"X-Launchpad-Export-Date: 2010-09-29 05:03+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account
@@ -1790,7 +1790,7 @@ msgstr ""
#. module: account
#: help:res.partner,property_account_position:0
msgid ""
"The fiscal mapping will determine taxes and the accounts used for the "
"The fiscal mapping will determine taxes and the accounts used for the "
"partner."
msgstr ""
addons/account/i18n/tlh.po
+2 -2
View File
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-08-12 03:54+0000\n"
"X-Launchpad-Export-Date: 2010-09-29 05:03+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account
@@ -1789,7 +1789,7 @@ msgstr ""
#. module: account
#: help:res.partner,property_account_position:0
msgid ""
"The fiscal mapping will determine taxes and the accounts used for the "
"The fiscal mapping will determine taxes and the accounts used for the "
"partner."
msgstr ""
addons/account/i18n/tr.po
+3 -3
View File
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
"PO-Revision-Date: 2010-09-08 08:48+0000\n"
"PO-Revision-Date: 2010-09-29 09:15+0000\n"
"Last-Translator: Omer Barlas <omer@barlas.com.tr>\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-09-09 04:46+0000\n"
"X-Launchpad-Export-Date: 2010-09-30 04:42+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account
@@ -1792,7 +1792,7 @@ msgstr ""
#. module: account
#: help:res.partner,property_account_position:0
msgid ""
"The fiscal mapping will determine taxes and the accounts used for the "
"The fiscal mapping will determine taxes and the accounts used for the "
"partner."
msgstr ""
addons/account/i18n/ug.po
+2 -2
View File
@@ -14,7 +14,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-08-12 03:54+0000\n"
"X-Launchpad-Export-Date: 2010-09-29 05:03+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account
@@ -1790,7 +1790,7 @@ msgstr ""
#. module: account
#: help:res.partner,property_account_position:0
msgid ""
"The fiscal mapping will determine taxes and the accounts used for the "
"The fiscal mapping will determine taxes and the accounts used for the "
"partner."
msgstr ""
addons/account/i18n/uk.po
+3 -3
View File
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
"PO-Revision-Date: 2010-08-02 21:53+0000\n"
"PO-Revision-Date: 2010-09-29 09:24+0000\n"
"Last-Translator: Eugene Babiy <eugene.babiy@gmail.com>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-08-12 03:54+0000\n"
"X-Launchpad-Export-Date: 2010-09-30 04:42+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account
@@ -1792,7 +1792,7 @@ msgstr ""
#. module: account
#: help:res.partner,property_account_position:0
msgid ""
"The fiscal mapping will determine taxes and the accounts used for the "
"The fiscal mapping will determine taxes and the accounts used for the "
"partner."
msgstr ""
addons/account/i18n/vi.po
+6 -6
View File
@@ -8,13 +8,13 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
"PO-Revision-Date: 2010-08-02 21:53+0000\n"
"Last-Translator: mga (Open ERP) <Unknown>\n"
"PO-Revision-Date: 2010-09-29 08:58+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-08-12 03:54+0000\n"
"X-Launchpad-Export-Date: 2010-09-30 04:42+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account
@@ -86,7 +86,7 @@ msgstr ""
#. module: account
#: wizard_view:account.automatic.reconcile,reconcile:0
msgid "Reconciliation result"
msgstr "kết quả hòa giả"
msgstr "Kết quả đối chiếu số liệu"
#. module: account
#: model:ir.actions.act_window,name:account.act_account_acount_move_line_open_unreconciled
@@ -114,7 +114,7 @@ msgstr "in báo cáo thuế"
#. module: account
#: field:account.account,parent_id:0
msgid "Parent"
msgstr ""
msgstr "Tài khoản cha"
#. module: account
#: selection:account.move,type:0
@@ -1803,7 +1803,7 @@ msgstr ""
#. module: account
#: help:res.partner,property_account_position:0
msgid ""
"The fiscal mapping will determine taxes and the accounts used for the "
"The fiscal mapping will determine taxes and the accounts used for the "
"partner."
msgstr ""
addons/account/i18n/zh_CN.po
+4 -4
View File
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
"PO-Revision-Date: 2010-09-08 09:06+0000\n"
"Last-Translator: Jeff Wang <wjfonhand@hotmail.com>\n"
"PO-Revision-Date: 2010-09-29 09:08+0000\n"
"Last-Translator: solar.xie@gmail.com <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-09-09 04:46+0000\n"
"X-Launchpad-Export-Date: 2010-09-30 04:42+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account
@@ -1794,7 +1794,7 @@ msgstr "下一步"
#. module: account
#: help:res.partner,property_account_position:0
msgid ""
"The fiscal mapping will determine taxes and the accounts used for the "
"The fiscal mapping will determine taxes and the accounts used for the "
"partner."
msgstr ""
addons/account/i18n/zh_HK.po
+2 -2
View File
@@ -14,7 +14,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-08-12 03:54+0000\n"
"X-Launchpad-Export-Date: 2010-09-29 05:03+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account
@@ -1790,7 +1790,7 @@ msgstr ""
#. module: account
#: help:res.partner,property_account_position:0
msgid ""
"The fiscal mapping will determine taxes and the accounts used for the "
"The fiscal mapping will determine taxes and the accounts used for the "
"partner."
msgstr ""
addons/account/i18n/zh_TW.po
+2 -2
View File
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-08-12 03:54+0000\n"
"X-Launchpad-Export-Date: 2010-09-29 05:04+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account
@@ -1789,7 +1789,7 @@ msgstr ""
#. module: account
#: help:res.partner,property_account_position:0
msgid ""
"The fiscal mapping will determine taxes and the accounts used for the "
"The fiscal mapping will determine taxes and the accounts used for the "
"partner."
msgstr ""
addons/account/installer.py
+14 -15
View File
@@ -61,7 +61,7 @@ class account_installer(osv.osv_memory):
'date_stop': fields.date('End Date', required=True),
'period':fields.selection([('month','Monthly'), ('3months','3 Monthly')],
'Periods', required=True),
'bank_accounts_id': fields.one2many('account.bank.accounts.wizard', 'bank_account_id', 'Bank Accounts',required=True),
'bank_accounts_id': fields.one2many('account.bank.accounts.wizard', 'bank_account_id', 'Your Bank and Cash Accounts',required=True),
'sale_tax':fields.float('Sale Tax(%)'),
'purchase_tax':fields.float('Purchase Tax(%)'),
'company_id': fields.many2one('res.company', 'Company'),
@@ -124,6 +124,8 @@ class account_installer(osv.osv_memory):
id = mod_obj.read(cr, uid, [result], ['res_id'])[0]['res_id']
obj_multi = self.pool.get('account.chart.template').browse(cr, uid, id)
record = self.browse(cr, uid, ids, context=context)[0]
if context is None:
context = {}
company_id = self.browse(cr, uid, ids, context)[0].company_id
@@ -170,7 +172,6 @@ class account_installer(osv.osv_memory):
'python_compute': tax.python_compute,
'python_compute_inv': tax.python_compute_inv,
'python_applicable': tax.python_applicable,
'tax_group':tax.tax_group,
'base_code_id': tax.base_code_id and ((tax.base_code_id.id in tax_code_template_ref) and tax_code_template_ref[tax.base_code_id.id]) or False,
'tax_code_id': tax.tax_code_id and ((tax.tax_code_id.id in tax_code_template_ref) and tax_code_template_ref[tax.tax_code_id.id]) or False,
'base_sign': tax.base_sign,
@@ -240,7 +241,6 @@ class account_installer(osv.osv_memory):
view_id_cash = self.pool.get('account.journal.view').search(cr,uid,[('name','=','Bank/Cash Journal View')])[0] #why fixed name here?
view_id_cur = self.pool.get('account.journal.view').search(cr,uid,[('name','=','Bank/Cash Journal (Multi-Currency) View')])[0] #Why Fixed name here?
ref_acc_bank = obj_multi.bank_account_view_id
cash_result = mod_obj._get_id(cr, uid, 'account', 'conf_account_type_cash')
cash_type_id = mod_obj.read(cr, uid, [cash_result], ['res_id'])[0]['res_id']
@@ -251,7 +251,7 @@ class account_installer(osv.osv_memory):
check_result = mod_obj._get_id(cr, uid, 'account', 'conf_account_type_chk')
check_type_id = mod_obj.read(cr, uid, [check_result], ['res_id'])[0]['res_id']
record = self.browse(cr, uid, ids, context=context)[0]
# record = self.browse(cr, uid, ids, context=context)[0]
code_cnt = 1
vals_seq = {
'name': _('Bank Journal '),
@@ -268,7 +268,7 @@ class account_installer(osv.osv_memory):
vals_journal['name']= _('Bank Journal ')
vals_journal['code']= _('BNK')
vals_journal['sequence_id'] = seq_id
vals_journal['type'] = 'cash'
vals_journal['type'] = 'bank'
vals_journal['analytic_journal_id'] = analitical_journal_bank
if vals.get('currency_id', False):
vals_journal['view_id'] = view_id_cur
@@ -444,7 +444,6 @@ class account_installer(osv.osv_memory):
# Bank Journals
view_id_cash = self.pool.get('account.journal.view').search(cr, uid, [('name','=','Bank/Cash Journal View')])[0] #TOFIX: Why put fixed name ?
view_id_cur = self.pool.get('account.journal.view').search(cr, uid, [('name','=','Bank/Cash Journal (Multi-Currency) View')])[0] #TOFIX: why put fixed name?
ref_acc_bank = obj_multi.bank_account_view_id
#create the properties
@@ -486,8 +485,8 @@ class account_installer(osv.osv_memory):
for position in obj_fiscal_position_template.browse(cr, uid, fp_ids):
vals_fp = {
'company_id' : company_id.id,
'name' : position.name,
'company_id': company_id.id,
'name': position.name,
}
new_fp = obj_fiscal_position.create(cr, uid, vals_fp)
@@ -496,17 +495,17 @@ class account_installer(osv.osv_memory):
for tax in position.tax_ids:
vals_tax = {
'tax_src_id' : tax_template_ref[tax.tax_src_id.id],
'tax_dest_id' : tax.tax_dest_id and tax_template_ref[tax.tax_dest_id.id] or False,
'position_id' : new_fp,
'tax_src_id': tax_template_ref[tax.tax_src_id.id],
'tax_dest_id': tax.tax_dest_id and tax_template_ref[tax.tax_dest_id.id] or False,
'position_id': new_fp,
}
obj_tax_fp.create(cr, uid, vals_tax)
for acc in position.account_ids:
vals_acc = {
'account_src_id' : acc_template_ref[acc.account_src_id.id],
'account_dest_id' : acc_template_ref[acc.account_dest_id.id],
'position_id' : new_fp,
'account_src_id': acc_template_ref[acc.account_src_id.id],
'account_dest_id': acc_template_ref[acc.account_dest_id.id],
'position_id': new_fp,
}
obj_ac_fp.create(cr, uid, vals_acc)
@@ -647,7 +646,7 @@ class account_installer(osv.osv_memory):
obj_acc.write(cr, uid, default_account_ids, {'tax_ids':[(6,0,[purchase_tax])]})
tax_val.update({'supplier_taxes_id':[(6,0,[purchase_tax])]})
default_tax.append(('supplier_taxes_id',purchase_tax))
if len(tax_val):
if tax_val:
product_ids = obj_product.search(cr, uid, [])
for product in obj_product.browse(cr, uid, product_ids):
obj_product.write(cr, uid, product.id, tax_val)
addons/account/invoice.py
+42 -46
View File
@@ -20,14 +20,12 @@
##############################################################################
import time
from operator import itemgetter
import decimal_precision as dp
from lxml import etree
import decimal_precision as dp
import netsvc
from osv import fields, osv, orm
import pooler
from tools import config
from tools.translate import _
class account_invoice(osv.osv):
@@ -148,7 +146,7 @@ class account_invoice(osv.osv):
res[id] = []
if not invoice.move_id:
continue
data_lines = invoice.move_id.line_id
data_lines = [x for x in invoice.move_id.line_id if x.account_id.id == invoice.account_id.id]
partial_ids = []
for line in data_lines:
ids_line = []
@@ -253,7 +251,7 @@ class account_invoice(osv.osv):
\n* The \'Open\' state is used when user create invoice,a invoice number is generated.Its in open state till user does not pay invoice. \
\n* The \'Paid\' state is set automatically when invoice is paid.\
\n* The \'Cancelled\' state is used when user cancel invoice.'),
'date_invoice': fields.date('Date Invoiced', states={'paid':[('readonly',True)], 'open':[('readonly',True)], 'close':[('readonly',True)]}, help="Keep empty to use the current date"),
'date_invoice': fields.date('Invoice Date', states={'paid':[('readonly',True)], 'open':[('readonly',True)], 'close':[('readonly',True)]}, help="Keep empty to use the current date"),
'date_due': fields.date('Due Date', states={'paid':[('readonly',True)], 'open':[('readonly',True)], 'close':[('readonly',True)]},
help="If you use payment terms, the due date will be computed automatically at the generation "\
"of accounting entries. If you keep the payment term and the due date empty, it means direct payment. The payment term may compute several due dates, for example 50% now, 50% in one month."),
@@ -304,7 +302,7 @@ class account_invoice(osv.osv):
}, help="The Journal Entry of the invoice have been totally reconciled with one or several Journal Entries of payment."),
'partner_bank_id': fields.many2one('res.partner.bank', 'Bank Account',
help='Bank Account Number, Company bank account if Invoice is customer or supplier refund, otherwise Partner bank account number.', readonly=True, states={'draft':[('readonly',False)]}),
'move_lines':fields.function(_get_lines , method=True, type='many2many', relation='account.move.line', string='Entry Lines'),
'move_lines':fields.function(_get_lines, method=True, type='many2many', relation='account.move.line', string='Entry Lines'),
'residual': fields.function(_amount_residual, method=True, digits_compute=dp.get_precision('Account'), string='Residual',
store={
'account.invoice': (lambda self, cr, uid, ids, c={}: ids, ['invoice_line'], 50),
@@ -317,7 +315,7 @@ class account_invoice(osv.osv):
'payment_ids': fields.function(_compute_lines, method=True, relation='account.move.line', type="many2many", string='Payments'),
'move_name': fields.char('Journal Entry', size=64, readonly=True, states={'draft':[('readonly',False)]}),
'user_id': fields.many2one('res.users', 'Salesman', readonly=True, states={'draft':[('readonly',False)]}),
'fiscal_position': fields.many2one('account.fiscal.position', 'Fiscal Mapping', readonly=True, states={'draft':[('readonly',False)]})
'fiscal_position': fields.many2one('account.fiscal.position', 'Fiscal Position', readonly=True, states={'draft':[('readonly',False)]})
}
_defaults = {
'type': _get_type,
@@ -349,6 +347,16 @@ class account_invoice(osv.osv):
if field == 'journal_id':
journal_select = journal_obj._name_search(cr, uid, '', [('type', '=', type)], context=context, limit=None, name_get_uid=1)
res['fields'][field]['selection'] = journal_select
if view_type == 'tree':
doc = etree.XML(res['arch'])
nodes = doc.xpath("//field[@name='partner_id']")
partner_string = 'Customer'
if context.get('type', 'out_invoice') in ('in_invoice', 'in_refund'):
partner_string = _('Supplier')
for node in nodes:
node.set('string', partner_string)
res['arch'] = etree.tostring(doc)
return res
def create(self, cr, uid, vals, context=None):
@@ -536,7 +544,7 @@ class account_invoice(osv.osv):
if not result_id:
raise osv.except_osv(_('Configuration Error !'),
_('Can not find account chart for this company in invoice line account, Please Create account.'))
r_id = self.pool.get('account.invoice.line').write(cr, uid, [line.id], {'account_id': result_id[0]})
self.pool.get('account.invoice.line').write(cr, uid, [line.id], {'account_id': result_id[0]})
else:
if invoice_line:
for inv_line in invoice_line:
@@ -577,7 +585,7 @@ class account_invoice(osv.osv):
else:
val['currency_id'] = company.currency_id.id
return {'value' : val, 'domain': dom }
return {'value': val, 'domain': dom }
# go from canceled state to draft state
def action_cancel_draft(self, cr, uid, ids, *args):
@@ -587,16 +595,6 @@ class account_invoice(osv.osv):
wf_service.trg_create(uid, 'account.invoice', inv_id, cr)
return True
def finalize_invoice_move_lines(self, cr, uid, invoice_browse, move_lines):
"""finalize_invoice_move_lines(cr, uid, invoice, move_lines) -> move_lines
Hook method to be overridden in additional modules to verify and possibly alter the
move lines to be created by an invoice, for special cases.
:param invoice_browse: browsable record of the invoice that is generating the move lines
:param move_lines: list of dictionaries with the account.move.lines (as for create())
:return: the (possibly updated) final move_lines to create for this invoice
"""
return move_lines
# Workflow stuff
#################
@@ -650,18 +648,19 @@ class account_invoice(osv.osv):
return ok
def button_reset_taxes(self, cr, uid, ids, context=None):
if not context:
if context is None:
context = {}
ctx = context.copy()
ait_obj = self.pool.get('account.invoice.tax')
for id in ids:
cr.execute("DELETE FROM account_invoice_tax WHERE invoice_id=%s", (id,))
partner = self.browse(cr, uid, id, context=context).partner_id
partner = self.browse(cr, uid, id, context=ctx).partner_id
if partner.lang:
context.update({'lang': partner.lang})
for taxe in ait_obj.compute(cr, uid, id, context=context).values():
ctx.update({'lang': partner.lang})
for taxe in ait_obj.compute(cr, uid, id, context=ctx).values():
ait_obj.create(cr, uid, taxe)
# Update the stored value (fields.function), so we write to trigger recompute
self.pool.get('account.invoice').write(cr, uid, ids, {'invoice_line':[]}, context=context)
self.pool.get('account.invoice').write(cr, uid, ids, {'invoice_line':[]}, context=ctx)
return True
def button_compute(self, cr, uid, ids, context=None, set_total=False):
@@ -816,7 +815,6 @@ class account_invoice(osv.osv):
self.write(cr, uid, [inv.id], {'date_invoice':time.strftime('%Y-%m-%d')})
company_currency = inv.company_id.currency_id.id
# create the analytical lines
line_ids = self.read(cr, uid, [inv.id], ['invoice_line'])[0]['invoice_line']
# one move line per invoice line
iml = self._get_analytic_lines(cr, uid, inv.id)
# check if taxes are all computed
@@ -900,7 +898,7 @@ class account_invoice(osv.osv):
'name': name,
'price': total,
'account_id': acc_id,
'date_maturity' : inv.date_due or False,
'date_maturity': inv.date_due or False,
'amount_currency': diff_currency_p \
and total_currency or False,
'currency_id': diff_currency_p \
@@ -911,7 +909,7 @@ class account_invoice(osv.osv):
date = inv.date_invoice or time.strftime('%Y-%m-%d')
part = inv.partner_id.id
line = map(lambda x:(0,0,self.line_get_convert(cr, uid, x, part, date, context={})) ,iml)
line = map(lambda x:(0,0,self.line_get_convert(cr, uid, x, part, date, context={})),iml)
line = self.group_lines(cr, uid, iml, line, inv)
@@ -934,7 +932,7 @@ class account_invoice(osv.osv):
period_id = inv.period_id and inv.period_id.id or False
if not period_id:
period_ids = self.pool.get('account.period').search(cr, uid, [('date_start','<=',inv.date_invoice or time.strftime('%Y-%m-%d')),('date_stop','>=',inv.date_invoice or time.strftime('%Y-%m-%d'))])
if len(period_ids):
if period_ids:
period_id = period_ids[0]
if period_id:
move['period_id'] = period_id
@@ -1020,7 +1018,7 @@ class account_invoice(osv.osv):
account_move_obj.unlink(cr, uid, [i['move_id'][0]])
if i['payment_ids']:
account_move_line_obj = self.pool.get('account.move.line')
pay_ids = account_move_line_obj.browse(cr, uid , i['payment_ids'])
pay_ids = account_move_line_obj.browse(cr, uid, i['payment_ids'])
for move_line in pay_ids:
if move_line.reconcile_partial_id and move_line.reconcile_partial_id.line_partial_ids:
raise osv.except_osv(_('Error !'), _('You cannot cancel the Invoice which is Partially Paid! You need to unreconcile concerned payment entries!'))
@@ -1045,7 +1043,7 @@ class account_invoice(osv.osv):
return True
def name_get(self, cr, uid, ids, context=None):
if not len(ids):
if not ids:
return []
types = {
'out_invoice': 'CI: ',
@@ -1080,7 +1078,9 @@ class account_invoice(osv.osv):
def refund(self, cr, uid, ids, date=None, period_id=None, description=None, journal_id=None):
invoices = self.read(cr, uid, ids, ['name', 'type', 'number', 'reference', 'comment', 'date_due', 'partner_id', 'address_contact_id', 'address_invoice_id', 'partner_contact', 'partner_insite', 'partner_ref', 'payment_term', 'account_id', 'currency_id', 'invoice_line', 'tax_line', 'journal_id'])
obj_invoice_line = self.pool.get('account.invoice.line')
obj_invoice_tax = self.pool.get('account.invoice.tax')
obj_journal = self.pool.get('account.journal')
new_ids = []
for invoice in invoices:
del invoice['id']
@@ -1092,20 +1092,20 @@ class account_invoice(osv.osv):
'in_refund': 'in_invoice', # Supplier Refund
}
invoice_lines = self.pool.get('account.invoice.line').read(cr, uid, invoice['invoice_line'])
invoice_lines = obj_invoice_line.read(cr, uid, invoice['invoice_line'])
invoice_lines = self._refund_cleanup_lines(cr, uid, invoice_lines)
tax_lines = self.pool.get('account.invoice.tax').read(cr, uid, invoice['tax_line'])
tax_lines = obj_invoice_tax.read(cr, uid, invoice['tax_line'])
tax_lines = filter(lambda l: l['manual'], tax_lines)
tax_lines = self._refund_cleanup_lines(cr, uid, tax_lines)
if journal_id:
refund_journal_ids = [journal_id]
elif invoice['type'] == 'in_invoice':
refund_journal_ids = self.pool.get('account.journal').search(cr, uid, [('type','=','purchase_refund')])
refund_journal_ids = obj_journal.search(cr, uid, [('type','=','purchase_refund')])
else:
refund_journal_ids = self.pool.get('account.journal').search(cr, uid, [('type','=','sale_refund')])
refund_journal_ids = obj_journal.search(cr, uid, [('type','=','sale_refund')])
if not date :
if not date:
date = time.strftime('%Y-%m-%d')
invoice.update({
'type': type_dict[invoice['type']],
@@ -1116,11 +1116,11 @@ class account_invoice(osv.osv):
'tax_line': tax_lines,
'journal_id': refund_journal_ids
})
if period_id :
if period_id:
invoice.update({
'period_id': period_id,
})
if description :
if description:
invoice.update({
'name': description,
})
@@ -1389,8 +1389,6 @@ class account_invoice_line(osv.osv):
if a:
result['account_id'] = a
taxep = None
tax_obj = self.pool.get('account.tax')
if type in ('out_invoice', 'out_refund'):
taxes = res.taxes_id and res.taxes_id or (a and self.pool.get('account.account').browse(cr, uid, a).tax_ids or False)
tax_id = fpos_obj.map_tax(cr, uid, fpos, taxes)
@@ -1410,7 +1408,7 @@ class account_invoice_line(osv.osv):
result['uos_id'] = res.uom_id.id or uom or False
if result['uos_id']:
res2 = res.uom_id.category_id.id
if res2 :
if res2:
domain = {'uos_id':[('category_id','=',res2 )]}
result['categ_id'] = res.categ_id.id
@@ -1443,13 +1441,10 @@ class account_invoice_line(osv.osv):
def move_line_get(self, cr, uid, invoice_id, context=None):
res = []
tax_grouped = {}
tax_obj = self.pool.get('account.tax')
cur_obj = self.pool.get('res.currency')
ait_obj = self.pool.get('account.invoice.tax')
inv = self.pool.get('account.invoice').browse(cr, uid, invoice_id)
company_currency = inv.company_id.currency_id.id
cur = inv.currency_id
for line in inv.invoice_line:
mres = self.move_line_get_item(cr, uid, line, context)
@@ -1544,8 +1539,8 @@ class account_invoice_tax(osv.osv):
'tax_code_id': fields.many2one('account.tax.code', 'Tax Code', help="The tax basis of the tax declaration."),
'tax_amount': fields.float('Tax Code Amount', digits_compute=dp.get_precision('Account')),
'company_id': fields.related('account_id', 'company_id', type='many2one', relation='res.company', string='Company', store=True),
'factor_base' : fields.function(_count_factor, method=True, string='Multipication factor for Base code', type='float', multi="all"),
'factor_tax' : fields.function(_count_factor, method=True, string='Multipication factor Tax code', type='float', multi="all")
'factor_base': fields.function(_count_factor, method=True, string='Multipication factor for Base code', type='float', multi="all"),
'factor_tax': fields.function(_count_factor, method=True, string='Multipication factor Tax code', type='float', multi="all")
}
def base_change(self, cr, uid, ids, base, currency_id=False, company_id=False, date_invoice=False):
@@ -1621,6 +1616,7 @@ class account_invoice_tax(osv.osv):
tax_grouped[key]['tax_amount'] += val['tax_amount']
for t in tax_grouped.values():
t['base'] = cur_obj.round(cr, uid, cur, t['base'])
t['amount'] = cur_obj.round(cr, uid, cur, t['amount'])
t['base_amount'] = cur_obj.round(cr, uid, cur, t['base_amount'])
t['tax_amount'] = cur_obj.round(cr, uid, cur, t['tax_amount'])
addons/account/partner.py
+12 -17
View File
@@ -21,13 +21,12 @@
from operator import itemgetter
from osv import fields, osv
import ir
class account_fiscal_position(osv.osv):
_name = 'account.fiscal.position'
_description = 'Fiscal Mapping'
_description = 'Fiscal Position'
_columns = {
'name': fields.char('Fiscal Mapping', size=64, translate=True, required=True),
'name': fields.char('Fiscal Position', size=64, translate=True, required=True),
'company_id': fields.many2one('res.company', 'Company'),
'account_ids': fields.one2many('account.fiscal.position.account', 'position_id', 'Account Mapping'),
'tax_ids': fields.one2many('account.fiscal.position.tax', 'position_id', 'Tax Mapping'),
@@ -52,7 +51,7 @@ class account_fiscal_position(osv.osv):
return result
def map_account(self, cr, uid, fposition_id, account_id, context={}):
if not fposition_id :
if not fposition_id:
return account_id
for pos in fposition_id.account_ids:
if pos.account_src_id.id == account_id:
@@ -64,10 +63,10 @@ account_fiscal_position()
class account_fiscal_position_tax(osv.osv):
_name = 'account.fiscal.position.tax'
_description = 'Taxes Fiscal Mapping'
_description = 'Taxes Fiscal Position'
_rec_name = 'position_id'
_columns = {
'position_id': fields.many2one('account.fiscal.position', 'Fiscal Mapping', required=True, ondelete='cascade'),
'position_id': fields.many2one('account.fiscal.position', 'Fiscal Position', required=True, ondelete='cascade'),
'tax_src_id': fields.many2one('account.tax', 'Tax Source', required=True),
'tax_dest_id': fields.many2one('account.tax', 'Replacement Tax')
}
@@ -76,10 +75,10 @@ account_fiscal_position_tax()
class account_fiscal_position_account(osv.osv):
_name = 'account.fiscal.position.account'
_description = 'Accounts Fiscal Mapping'
_description = 'Accounts Fiscal Position'
_rec_name = 'position_id'
_columns = {
'position_id': fields.many2one('account.fiscal.position', 'Fiscal Mapping', required=True, ondelete='cascade'),
'position_id': fields.many2one('account.fiscal.position', 'Fiscal Position', required=True, ondelete='cascade'),
'account_src_id': fields.many2one('account.account', 'Account Source', domain=[('type','<>','view')], required=True),
'account_dest_id': fields.many2one('account.account', 'Account Destination', domain=[('type','<>','view')], required=True)
}
@@ -102,10 +101,6 @@ class res_partner(osv.osv):
GROUP BY l.partner_id, a.type
""",
(tuple(ids),))
tinvert = {
'credit': 'receivable',
'debit': 'payable'
}
maps = {'receivable':'credit', 'payable':'debit' }
res = {}
for id in ids:
@@ -116,7 +111,7 @@ class res_partner(osv.osv):
return res
def _asset_difference_search(self, cr, uid, obj, name, type, args, context=None):
if not len(args):
if not args:
return []
having_values = tuple(map(itemgetter(2), args))
where = ' AND '.join(
@@ -133,7 +128,7 @@ class res_partner(osv.osv):
'GROUP BY partner_id HAVING '+where),
(type,) + having_values)
res = cr.fetchall()
if not len(res):
if not res:
return [('id','=','0')]
return [('id','in',map(itemgetter(0), res))]
@@ -172,10 +167,10 @@ class res_partner(osv.osv):
'account.fiscal.position',
type='many2one',
relation='account.fiscal.position',
string="Fiscal Mapping",
string="Fiscal Position",
method=True,
view_load=True,
help="The fiscal Mapping will determine taxes and the accounts used for the partner.",
help="The fiscal position will determine taxes and the accounts used for the partner.",
),
'property_payment_term': fields.property(
'account.payment.term',
@@ -187,7 +182,7 @@ class res_partner(osv.osv):
help="This payment term will be used instead of the default one for the current partner"),
'ref_companies': fields.one2many('res.company', 'partner_id',
'Companies that refers to partner'),
'last_reconciliation_date': fields.datetime('Last Reconciliation Date', help='Date on which the partner accounting entries were reconciled last time')
'last_reconciliation_date': fields.datetime('Latest Reconciliation Date', help='Date on which the partner accounting entries were reconciled last time')
}
res_partner()
addons/account/partner_view.xml
+4 -4
View File
@@ -7,7 +7,7 @@
<field name="model">account.fiscal.position</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Fiscal Mapping">
<form string="Fiscal Position">
<field name="name" select="1"/>
<field name="company_id" widget="selection" groups="base.group_multi_company"/>
<separator string="Mapping" colspan="4"/>
@@ -42,7 +42,7 @@
<field name="model">account.fiscal.position</field>
<field name="type">tree</field>
<field name="arch" type="xml">
<tree string="Fiscal Mapping">
<tree string="Fiscal Position">
<field name="name"/>
<field name="company_id" groups="base.group_multi_company" widget="selection"/>
</tree>
@@ -50,7 +50,7 @@
</record>
<record id="action_account_fiscal_position_form" model="ir.actions.act_window">
<field name="name">Fiscal Mappings</field>
<field name="name">Fiscal Positions</field>
<field name="res_model">account.fiscal.position</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
@@ -143,7 +143,7 @@
<field name="inherit_id" ref="base.view_partner_form"/>
<field name="arch" type="xml">
<field name="credit_limit" position="after">
<field name="last_reconciliation_date"/>
<field name="last_reconciliation_date" groups="base.group_extended"/>
</field>
</field>
</record>
addons/account/process/customer_invoice_process.xml
-10
View File
@@ -83,7 +83,6 @@
</record>
<record id="process_node_reconciliation0" model="process.node">
<field name="menu_id" ref="account.menu_eaction_account_moves_all"/>
<field name="model_id" ref="account.model_account_move_reconcile"/>
<field eval="&quot;&quot;&quot;state&quot;&quot;&quot;" name="kind"/>
<field eval="&quot;&quot;&quot;Reconciliation&quot;&quot;&quot;" name="name"/>
@@ -105,7 +104,6 @@
</record>
<record id="process_node_accountingstatemententries0" model="process.node">
<field name="menu_id" ref="account.menu_eaction_account_moves_all"/>
<field name="model_id" ref="account.model_account_move_line"/>
<field eval="&quot;&quot;&quot;subflow&quot;&quot;&quot;" name="kind"/>
<field eval="&quot;&quot;&quot;Bank Statement&quot;&quot;&quot;" name="name"/>
@@ -122,7 +120,6 @@
-->
<record id="process_transition_confirmstatementfromdraft0" model="process.transition">
<field eval="[(6,0,[])]" name="role_ids"/>
<field eval="[(6,0,[])]" name="transition_ids"/>
<field eval="&quot;&quot;&quot;Confirm statement&quot;&quot;&quot;" name="name"/>
<field eval="&quot;&quot;&quot;The accountant confirms the statement.&quot;&quot;&quot;" name="note"/>
@@ -131,7 +128,6 @@
</record>
<record id="process_transition_analyticinvoice0" model="process.transition">
<field eval="[(6,0,[])]" name="role_ids"/>
<field eval="[(6,0,[])]" name="transition_ids"/>
<field eval="&quot;&quot;&quot;From analytic accounts&quot;&quot;&quot;" name="name"/>
<field eval="&quot;&quot;&quot;Analytic costs (timesheets, some purchased products, ...) come from analytic accounts. These generate draft invoices.&quot;&quot;&quot;" name="note"/>
@@ -140,7 +136,6 @@
</record>
<record id="process_transition_customerinvoice0" model="process.transition">
<field eval="[(6,0,[])]" name="role_ids"/>
<field eval="[(6,0,[])]" name="transition_ids"/>
<field eval="&quot;&quot;&quot;Validation&quot;&quot;&quot;" name="name"/>
<field eval="&quot;&quot;&quot;Draft invoices are checked, validated and printed.&quot;&quot;&quot;" name="note"/>
@@ -150,7 +145,6 @@
</record>
<record id="process_transition_validentries0" model="process.transition">
<field eval="[(6,0,[])]" name="role_ids"/>
<field eval="[(6,0,[])]" name="transition_ids"/>
<field eval="&quot;&quot;&quot;Validation&quot;&quot;&quot;" name="name"/>
<field eval="&quot;&quot;&quot;Accountant validates the accounting entries coming from the invoice.&quot;&quot;&quot;" name="note"/>
@@ -159,7 +153,6 @@
</record>
<record id="process_transition_entriesreconcile0" model="process.transition">
<field eval="[(6,0,[])]" name="role_ids"/>
<field eval="[(6,0,[])]" name="transition_ids"/>
<field eval="&quot;&quot;&quot;Accounting entries&quot;&quot;&quot;" name="name"/>
<field eval="&quot;&quot;&quot;Accounting entries are the first input of the reconciliation.&quot;&quot;&quot;" name="note"/>
@@ -168,7 +161,6 @@
</record>
<record id="process_transition_statemententries0" model="process.transition">
<field eval="[(6,0,[])]" name="role_ids"/>
<field eval="[(6,0,[])]" name="transition_ids"/>
<field eval="&quot;&quot;&quot;Validation&quot;&quot;&quot;" name="name"/>
<field eval="&quot;&quot;&quot;Manual or automatic creation of payment entries according to the statements&quot;&quot;&quot;" name="note"/>
@@ -177,7 +169,6 @@
</record>
<record id="process_transition_paymentreconcile0" model="process.transition">
<field eval="[(6,0,[])]" name="role_ids"/>
<field eval="[(6,0,[])]" name="transition_ids"/>
<field eval="&quot;&quot;&quot;Payment entries&quot;&quot;&quot;" name="name"/>
<field eval="&quot;&quot;&quot;Payment entries are the second input of the reconciliation.&quot;&quot;&quot;" name="note"/>
@@ -186,7 +177,6 @@
</record>
<record id="process_transition_reconcilepaid0" model="process.transition">
<field eval="[(6,0,[])]" name="role_ids"/>
<field eval="[(6,0,[])]" name="transition_ids"/>
<field eval="&quot;&quot;&quot;Payment&quot;&quot;&quot;" name="name"/>
<field eval="&quot;&quot;&quot;As soon as the reconciliation is done, the invoice can be paid.&quot;&quot;&quot;" name="note"/>
addons/account/process/statement_process.xml
-3
View File
@@ -65,7 +65,6 @@
-->
<record id="process_transition_filestatement0" model="process.transition">
<field eval="[(6,0,[])]" name="role_ids"/>
<field eval="[(6,0,[])]" name="transition_ids"/>
<field eval="&quot;&quot;&quot;Automatic import of the bank statement&quot;&quot;&quot;" name="name"/>
<field eval="&quot;&quot;&quot;Import of the statement in the system from an electronic file&quot;&quot;&quot;" name="note"/>
@@ -74,7 +73,6 @@
</record>
<record id="process_transition_invoicemanually0" model="process.transition">
<field eval="[(6,0,[])]" name="role_ids"/>
<field eval="[(6,0,[])]" name="transition_ids"/>
<field eval="&quot;&quot;&quot;Manual entry&quot;&quot;&quot;" name="name"/>
<field eval="&quot;&quot;&quot;A statement with manual entries becomes a draft statement.&quot;&quot;&quot;" name="note"/>
@@ -84,7 +82,6 @@
</record>
<record id="process_transition_invoiceimport0" model="process.transition">
<field eval="[(6,0,[])]" name="role_ids"/>
<field eval="[(6,0,[])]" name="transition_ids"/>
<field eval="&quot;&quot;&quot;Import from invoice or payment&quot;&quot;&quot;" name="name"/>
<field eval="&quot;&quot;&quot;Import of the statement in the system from a supplier or customer invoice&quot;&quot;&quot;" name="note"/>
addons/account/process/supplier_invoice_process.xml
+24 -33
View File
@@ -1,21 +1,21 @@
<?xml version="1.0" ?>
<openerp>
<data>
<!--
Process
<!--
Process
-->
<record id="process_process_supplierinvoiceprocess0" model="process.process">
<field eval="1" name="active"/>
<field name="model_id" ref="account.model_account_invoice"/>
<field eval="&quot;&quot;&quot;Supplier Invoice&quot;&quot;&quot;" name="name"/>
</record>
<!--
<!--
Process Node
-->
<record id="process_node_analyticcost0" model="process.node">
<field name="menu_id" ref="account.account_analytic_def_account"/>
<field name="model_id" ref="analytic.model_account_analytic_account"/>
@@ -26,7 +26,7 @@
<field eval="&quot;&quot;&quot;object.state in ('draft', 'open', 'pending', 'close')&quot;&quot;&quot;" name="model_states"/>
<field eval="1" name="flow_start"/>
</record>
<record id="process_node_supplierdraftinvoices0" model="process.node">
<field name="menu_id" ref="account.menu_action_invoice_tree2"/>
<field name="model_id" ref="account.model_account_invoice"/>
@@ -37,7 +37,7 @@
<field eval="&quot;&quot;&quot;object.state=='draft'&quot;&quot;&quot;" name="model_states"/>
<field eval="0" name="flow_start"/>
</record>
<record id="process_node_supplierinvoiceinvoice0" model="process.node">
<field name="menu_id" ref="account.menu_finance_payables"/>
<field name="model_id" ref="account.model_account_invoice"/>
@@ -48,7 +48,7 @@
<field eval="&quot;&quot;&quot;object.state=='draft'&quot;&quot;&quot;" name="model_states"/>
<field eval="0" name="flow_start"/>
</record>
<record id="process_node_supplierbankstatement0" model="process.node">
<field name="menu_id" ref="account.menu_bank_statement_tree"/>
<field name="model_id" ref="account.model_account_bank_statement"/>
@@ -60,7 +60,7 @@
<field eval="&quot;&quot;&quot;object.state=='draft'&quot;&quot;&quot;" name="model_states"/>
<field eval="0" name="flow_start"/>
</record>
<record id="process_node_supplieraccountingentries0" model="process.node">
<field name="menu_id" ref="account.menu_action_move_journal_line_form"/>
<field name="model_id" ref="account.model_account_move"/>
@@ -70,9 +70,8 @@
<field name="process_id" ref="process_process_supplierinvoiceprocess0"/>
<field eval="0" name="flow_start"/>
</record>
<record id="process_node_supplierpaymentorder0" model="process.node">
<field name="menu_id" ref="account.menu_eaction_account_moves_all"/>
<field name="model_id" ref="account.model_account_move_line"/>
<field eval="&quot;&quot;&quot;state&quot;&quot;&quot;" name="kind"/>
<field eval="&quot;&quot;&quot;Payment Order&quot;&quot;&quot;" name="name"/>
@@ -81,9 +80,8 @@
<field eval="&quot;&quot;&quot;object.state=='draft'&quot;&quot;&quot;" name="model_states"/>
<field eval="1" name="flow_start"/>
</record>
<record id="process_node_supplierreconciliation0" model="process.node">
<field name="menu_id" ref="account.menu_eaction_account_moves_all"/>
<field name="model_id" ref="account.model_account_move_reconcile"/>
<field eval="&quot;&quot;&quot;state&quot;&quot;&quot;" name="kind"/>
<field eval="&quot;&quot;&quot;Reconciliation&quot;&quot;&quot;" name="name"/>
@@ -92,7 +90,7 @@
<field eval="&quot;&quot;&quot;object.state=='valid'&quot;&quot;&quot;" name="model_states"/>
<field eval="0" name="flow_start"/>
</record>
<record id="process_node_supplierpaidinvoice0" model="process.node">
<field name="menu_id" ref="account.menu_action_invoice_tree1"/>
<field name="model_id" ref="account.model_account_invoice"/>
@@ -103,22 +101,20 @@
<field eval="&quot;&quot;&quot;object.state=='paid'&quot;&quot;&quot;" name="model_states"/>
<field eval="0" name="flow_start"/>
</record>
<!--
<!--
Process Transition
-->
<record id="process_transition_supplieranalyticcost0" model="process.transition">
<field eval="[(6,0,[])]" name="role_ids"/>
<field eval="[(6,0,[])]" name="transition_ids"/>
<field eval="&quot;&quot;&quot;From analytic accounts&quot;&quot;&quot;" name="name"/>
<field eval="&quot;&quot;&quot;Analytic costs (timesheets, some purchased products, ...) come from analytic accounts. These generate draft supplier invoices.&quot;&quot;&quot;" name="note"/>
<field model="process.node" name="target_node_id" ref="process_node_supplierdraftinvoices0"/>
<field model="process.node" name="source_node_id" ref="process_node_analyticcost0"/>
</record>
<record id="process_transition_suppliercustomerinvoice0" model="process.transition">
<field eval="[(6,0,[])]" name="role_ids"/>
<field eval="[(6,0,[])]" name="transition_ids"/>
<field eval="&quot;&quot;&quot;Validation&quot;&quot;&quot;" name="name"/>
<field eval="&quot;&quot;&quot;Draft invoices are validated. &quot;&quot;&quot;" name="note"/>
@@ -126,51 +122,46 @@
<field model="process.node" name="source_node_id" ref="process_node_supplierdraftinvoices0"/>
<field eval="[(6,0,[ref('account.pro2_to_open')])]" name="transition_ids"/>
</record>
<record id="process_transition_suppliervalidentries0" model="process.transition">
<field eval="[(6,0,[])]" name="role_ids"/>
<field eval="[(6,0,[])]" name="transition_ids"/>
<field eval="&quot;&quot;&quot;Validation&quot;&quot;&quot;" name="name"/>
<field eval="&quot;&quot;&quot;Accountant validates the accounting entries coming from the invoice. &quot;&quot;&quot;" name="note"/>
<field model="process.node" name="target_node_id" ref="process_node_supplieraccountingentries0"/>
<field model="process.node" name="source_node_id" ref="process_node_supplierinvoiceinvoice0"/>
</record>
<record id="process_transition_supplierentriesreconcile0" model="process.transition">
<field eval="[(6,0,[])]" name="role_ids"/>
<field eval="[(6,0,[])]" name="transition_ids"/>
<field eval="&quot;&quot;&quot;Accounting entries&quot;&quot;&quot;" name="name"/>
<field eval="&quot;&quot;&quot;Accounting entries are an input of the reconciliation.&quot;&quot;&quot;" name="note"/>
<field model="process.node" name="target_node_id" ref="process_node_supplierreconciliation0"/>
<field model="process.node" name="source_node_id" ref="process_node_supplieraccountingentries0"/>
</record>
<record id="process_transition_paymentorderbank0" model="process.transition">
<field eval="[(6,0,[])]" name="role_ids"/>
<field eval="[(6,0,[])]" name="transition_ids"/>
<field eval="&quot;&quot;&quot;Payment entries&quot;&quot;&quot;" name="name"/>
<field eval="&quot;&quot;&quot;The payment order is sent to the bank.&quot;&quot;&quot;" name="note"/>
<field model="process.node" name="target_node_id" ref="process_node_supplierbankstatement0"/>
<field model="process.node" name="source_node_id" ref="process_node_supplierpaymentorder0"/>
</record>
<record id="process_transition_paymentorderreconcilation0" model="process.transition">
<field eval="[(6,0,[])]" name="role_ids"/>
<field eval="[(6,0,[])]" name="transition_ids"/>
<field eval="&quot;&quot;&quot;Validation&quot;&quot;&quot;" name="name"/>
<field eval="&quot;&quot;&quot;Bank statements are entered in the system.&quot;&quot;&quot;" name="note"/>
<field model="process.node" name="target_node_id" ref="process_node_supplierreconciliation0"/>
<field model="process.node" name="source_node_id" ref="process_node_supplierbankstatement0"/>
</record>
<record id="process_transition_supplierreconcilepaid0" model="process.transition">
<field eval="[(6,0,[])]" name="role_ids"/>
<field eval="[(6,0,[])]" name="transition_ids"/>
<field eval="&quot;&quot;&quot;System payment&quot;&quot;&quot;" name="name"/>
<field eval="&quot;&quot;&quot;As soon as the reconciliation is done, the invoice's state turns to “done” (i.e. paid) in the system.&quot;&quot;&quot;" name="note"/>
<field model="process.node" name="target_node_id" ref="process_node_supplierpaidinvoice0"/>
<field model="process.node" name="source_node_id" ref="process_node_supplierreconciliation0"/>
</record>
</data>
</openerp>
addons/account/product_view.xml
+1 -1
View File
@@ -9,7 +9,7 @@
<field name="arch" type="xml">
<notebook position="inside">
<page string="Accounting">
<group groups="base.group_extended">
<group name="properties" groups="base.group_extended">
<separator string="Sales Properties" colspan="2"/>
<separator string="Purchase Properties" colspan="2"/>
<field name="property_account_income" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]" attrs="{'readonly':[('sale_ok','=',0)]}" groups="base.group_extended"/>
addons/account/project/analytic_account_demo.xml
+1 -1
View File
@@ -198,7 +198,7 @@
<field name="parent_id" ref="analytic_project_1"/>
</record>
<record id="analytic_administratif" model="account.analytic.account">
<field name="name">Administratif</field>
<field name="name">Administrative</field>
<field name="code">1</field>
<field name="parent_id" ref="analytic_internal"/>
</record>
addons/account/project/project.py
+2 -2
View File
@@ -28,8 +28,8 @@ from osv import osv
class account_analytic_journal(osv.osv):
_name = 'account.analytic.journal'
_columns = {
'name' : fields.char('Journal name', size=64, required=True),
'code' : fields.char('Journal code', size=8),
'name' : fields.char('Journal Name', size=64, required=True),
'code' : fields.char('Journal Code', size=8),
'active' : fields.boolean('Active', help="If the active field is set to true, it will allow you to hide the analytic journal without removing it."),
'type': fields.selection([('sale','Sale'), ('purchase','Purchase'), ('cash','Cash'), ('general','General'), ('situation','Situation')], 'Type', size=32, required=True, help="Gives the type of the analytic journal. When it needs for a document (eg: an invoice) to create analytic entries, OpenERP will look for a matching journal of the same type."),
'line_ids' : fields.one2many('account.analytic.line', 'journal_id', 'Lines'),
addons/account/project/project_view.xml
+29 -29
View File
@@ -172,19 +172,17 @@
<field name="type">tree</field>
<field name="arch" type="xml">
<tree editable="top" string="Analytic Entries">
<field name="date" on_change="on_change_unit_amount(product_id, unit_amount, company_id, product_uom_id)"/>
<field name="date"/>
<field name="ref" invisible="context.get('to_invoice', False)"/>
<field name="name"/>
<field name="journal_id"/>
<field name="unit_amount" on_change="on_change_unit_amount(product_id, unit_amount, company_id, product_uom_id)" sum="Total quantity"/>
<field name="product_id" on_change="on_change_unit_amount(product_id, unit_amount, company_id, product_uom_id, journal_id)"/>
<field domain="[('type','=','normal')]" name="account_id" groups="base.group_extended"/>
<field invisible="True" name="product_uom_id" on_change="on_change_unit_amount(product_id, unit_amount, company_id, product_uom_id)"/>
<field name="amount" sum="Total amount"/>
<field name="general_account_id"/>
<field name="ref"/>
<field name="currency_id" />
<field name="amount_currency" />
<field name="company_id" on_change="on_change_unit_amount(product_id, unit_amount, company_id, product_uom_id)" groups="base.group_multi_company"/>
<field name="journal_id" invisible="context.get('to_invoice', False)"/>
<field name="amount" sum="Total" invisible="context.get('to_invoice', False)"/>
<field name="product_id" on_change="on_change_unit_amount(product_id, unit_amount, company_id, product_uom_id, journal_id)" invisible="not context.get('to_invoice', False)"/>
<field name="unit_amount" on_change="on_change_unit_amount(product_id, unit_amount, company_id, product_uom_id)" sum="Total Quantity" invisible="not context.get('to_invoice', False)"/>
<field name="product_uom_id" on_change="on_change_unit_amount(product_id, unit_amount, company_id, product_uom_id)" invisible="not context.get('to_invoice', False)"/>
<field domain="[('type','=','normal')]" name="account_id"/>
<field name="general_account_id" invisible="context.get('to_invoice', False)"/>
<field name="user_id" invisible="1" />
</tree>
</field>
</record>
@@ -195,22 +193,24 @@
<field name="arch" type="xml">
<search string="Search Analytic Lines">
<group col='6' colspan='4'>
<filter string="Sales" domain="[('journal_id.type','=','sale')]" icon="terp-sale" help="Analytic Journal Items related to a sale journal."/>
<filter string="Purchases" domain="[('journal_id.type','=','purchase')]" icon="terp-purchase" help="Analytic Journal Items related to a purchase journal."/>
<filter name="sales" string="Sales" domain="[('journal_id.type','=','sale')]" icon="terp-sale" help="Analytic Journal Items related to a sale journal."/>
<filter name="purchases" string="Purchases" domain="[('journal_id.type','=','purchase')]" icon="terp-purchase" help="Analytic Journal Items related to a purchase journal."/>
<filter name="others" string="Others" domain="[('journal_id.type','in',('cash','general','situation')]" icon="terp-folder-orange"/>
<separator orientation="vertical"/>
<filter icon="terp-go-today" string="Overdue Accounts" domain="[('account_id.date','&lt;',time.strftime('%%Y-%%m-%%d'))]" help="Analytic Journal Items related to accounts having a past deadline."/>
<separator orientation="vertical"/>
<field name="date" select="1"/>
<field name="name" select="1"/>
<field name="account_id" select="1"/>
<field name="user_id" widget="selection"/>
<field name="date"/>
<field name="name"/>
<field name="account_id"/>
<field name="user_id">
<filter string="My Entries" domain="[('user_id','=',uid)]" icon="terp-personal"/>
</field>
</group>
<newline/>
<group string="Group By..." expand="0">
<filter string="Analytic Account" context="{'group_by':'account_id'}" groups="base.group_extended" icon="terp-folder-blue"/>
<filter string="Analytic Journal" context="{'group_by':'journal_id'}" icon="terp-folder-orange"/>
<filter string="Account" context="{'group_by':'account_id'}" groups="base.group_extended" icon="terp-folder-blue"/>
<filter string="Journal" context="{'group_by':'journal_id'}" icon="terp-folder-orange"/>
<filter string="User" context="{'group_by':'user_id'}" icon="terp-personal"/>
<separator orientation="vertical"/>
<filter string="General Account" context="{'group_by':'general_account_id'}" icon="terp-folder-green"/>
<filter string="Fin.Account" context="{'group_by':'general_account_id'}" icon="terp-folder-green"/>
<separator orientation="vertical"/>
<filter string="Product" context="{'group_by':'product_id'}" icon="terp-accessories-archiver"/>
</group>
@@ -431,13 +431,13 @@
</field>
</record>
<act_window
<act_window
context="{'search_default_account_id': [active_id], 'search_default_user_id': False}"
id="act_acc_analytic_acc_5_report_hr_timesheet_invoice_journal"
name="All Analytic Entries"
res_model="account.analytic.line"
src_model="account.analytic.account"
view_mode="tree,form"
id="act_acc_analytic_acc_5_report_hr_timesheet_invoice_journal"
name="All Analytic Entries"
res_model="account.analytic.line"
src_model="account.analytic.account"
view_mode="tree,form"
view_type="form"/>
<record id="view_account_journal_1" model="ir.ui.view">
addons/account/project/report/analytic_balance.py
+10 -12
View File
@@ -19,7 +19,6 @@
#
##############################################################################
import pooler
import time
from report import report_sxw
@@ -43,7 +42,6 @@ class account_analytic_balance(report_sxw.rml_parse):
self.acc_sum_list = []# maintains a list of all ids
def get_children(self, ids):
ids2 = []
read_data = self.pool.get('account.analytic.account').read(self.cr, self.uid, ids,['child_ids','code','complete_name','balance'])
for data in read_data:
if (data['id'] not in self.acc_ids):
@@ -54,7 +52,7 @@ class account_analytic_balance(report_sxw.rml_parse):
self.acc_ids.append(data['id'])
self.read_data.append(data)
if data['child_ids']:
res = self.get_children(data['child_ids'])
self.get_children(data['child_ids'])
return True
@@ -102,14 +100,14 @@ class account_analytic_balance(report_sxw.rml_parse):
ids = self.acc_data_dict[account_id]
query_params = (tuple(ids), date1, date2)
if option == "credit" :
if option == "credit":
self.cr.execute("SELECT COALESCE(-sum(amount),0.0) FROM account_analytic_line \
WHERE account_id IN %s AND date>=%s AND date<=%s AND amount<0",query_params)
elif option == "debit" :
elif option == "debit":
self.cr.execute("SELECT COALESCE(sum(amount),0.0) FROM account_analytic_line \
WHERE account_id IN %s\
AND date>=%s AND date<=%s AND amount>0",query_params)
elif option == "quantity" :
elif option == "quantity":
self.cr.execute("SELECT COALESCE(sum(unit_amount),0.0) FROM account_analytic_line \
WHERE account_id IN %s\
AND date>=%s AND date<=%s",query_params)
@@ -121,25 +119,25 @@ class account_analytic_balance(report_sxw.rml_parse):
return (debit-credit)
def _sum_all(self, accounts, date1, date2, option):
account_analytic_obj = self.pool.get('account.analytic.account')
ids = map(lambda x: x['id'], accounts)
if not len(ids):
if not ids:
return 0.0
if not self.acc_sum_list:
account_analytic_obj = self.pool.get('account.analytic.account')
ids2 = account_analytic_obj.search(self.cr, self.uid,[('parent_id', 'child_of', ids)])
self.acc_sum_list = ids2
else:
ids2 = self.acc_sum_list
query_params = (tuple(ids2), date1, date2)
if option == "debit" :
if option == "debit":
self.cr.execute("SELECT COALESCE(sum(amount),0.0) FROM account_analytic_line \
WHERE account_id IN %s AND date>=%s AND date<=%s AND amount>0",query_params)
elif option == "credit" :
elif option == "credit":
self.cr.execute("SELECT COALESCE(-sum(amount),0.0) FROM account_analytic_line \
WHERE account_id IN %s AND date>=%s AND date<=%s AND amount<0",query_params)
elif option == "quantity" :
elif option == "quantity":
self.cr.execute("SELECT COALESCE(sum(unit_amount),0.0) FROM account_analytic_line \
WHERE account_id IN %s AND date>=%s AND date<=%s",query_params)
return self.cr.fetchone()[0] or 0.0
addons/account/project/report/analytic_journal.rml
+1 -1
View File
@@ -280,7 +280,7 @@
<para style="terp_default_9">[[ move_a.code ]]</para>
</td>
<td>
<para style="terp_default_9">[[ move_a.name ]] asgfas</para>
<para style="terp_default_9">[[ move_a.name ]] </para>
</td>
<td>
<para style="terp_default_9">[[ move_a.account_id.code ]] - [[ move_a.account_id.name ]]</para>
addons/account/project/report/cost_ledger.py
+2 -2
View File
@@ -91,14 +91,14 @@ class account_analytic_cost_ledger(report_sxw.rml_parse):
def _sum_debit(self, accounts, date1, date2):
ids = map(lambda x: x.id, accounts)
if not len(ids):
if not ids:
return 0.0
self.cr.execute("SELECT sum(amount) FROM account_analytic_line WHERE account_id IN %s AND date>=%s AND date<=%s AND amount>0", (tuple(ids), date1, date2,))
return self.cr.fetchone()[0] or 0.0
def _sum_credit(self, accounts, date1, date2):
ids = map(lambda x: x.id, accounts)
if not len(ids):
if not ids:
return 0.0
self.cr.execute("SELECT -sum(amount) FROM account_analytic_line WHERE account_id IN %s AND date>=%s AND date<=%s AND amount<0", (tuple(ids),date1, date2,))
return self.cr.fetchone()[0] or 0.0
addons/account/project/report/cost_ledger.rml
+12 -30
View File
@@ -185,9 +185,6 @@
</td>
</tr>
</blockTable>
<para style="terp_default_2">
<font color="white"> </font>
</para>
<blockTable colWidths="62.0,250.0,57.0,56.0,57.0" style="Table_Grant_Total">
<tr>
<td>
@@ -199,21 +196,18 @@
</para>
</td>
<td>
<para style="terp_Default_Bold_Right_9_U">[[ formatLang (sum_debit(objects,data['form']['date1'],data['form']['date2'])) ]]</para>
<para style="terp_Default_Bold_Right_9_U">[[ formatLang (sum_debit(objects,data['form']['date1'],data['form']['date2'])) ]] </para>
</td>
<td>
<para style="terp_Default_Bold_Right_9_U">[[ formatLang (sum_credit(objects,data['form']['date1'],data['form']['date2'])) ]]</para>
<para style="terp_Default_Bold_Right_9_U">[[ formatLang (sum_credit(objects,data['form']['date1'],data['form']['date2'])) ]] </para>
</td>
<td>
<para style="terp_Default_Bold_Right_9_U">[[ formatLang (sum_balance(objects,data['form']['date1'],data['form']['date2'])) ]] [[ company.currency_id.symbol ]]</para>
</td>
</tr>
</blockTable>
<para style="terp_default_2">
<font color="white"> </font>
</para>
<section>
<para style="terp_default_8">[[ repeatIn(objects,'o') ]]</para>
<para style="terp_default_2">[[ repeatIn(objects,'o') ]]</para>
<blockTable colWidths="62.0,249.0,57.0,57.0,57.0" style="Table_Account_Detail">
<tr>
<td>
@@ -223,21 +217,18 @@
<para style="terp_default_Bold_9">[[ o.complete_name ]]</para>
</td>
<td>
<para style="terp_Default_Bold_Right_9_U">[[ formatLang (account_sum_debit(o.id,data['form']['date1'],data['form']['date2'])) ]]</para>
<para style="terp_Default_Bold_Right_9_U">[[ formatLang (account_sum_debit(o.id,data['form']['date1'],data['form']['date2'])) ]] </para>
</td>
<td>
<para style="terp_Default_Bold_Right_9_U">[[ formatLang (account_sum_credit(o.id,data['form']['date1'],data['form']['date2'])) ]]</para>
<para style="terp_Default_Bold_Right_9_U">[[ formatLang (account_sum_credit(o.id,data['form']['date1'],data['form']['date2'])) ]] </para>
</td>
<td>
<para style="terp_Default_Bold_Right_9_U">[[ formatLang (account_sum_balance(o.id,data['form']['date1'],data['form']['date2']))]] [[ company.currency_id.symbol ]]</para>
</td>
</tr>
</blockTable>
<para style="terp_default_2">
<font color="white"> </font>
</para>
<section>
<para style="Standard">[[ repeatIn(lines_g(o.id,data['form']['date1'],data['form']['date2']),'move_g') ]]</para>
<para style="terp_default_2">[[ repeatIn(lines_g(o.id,data['form']['date1'],data['form']['date2']),'move_g') ]]</para>
<blockTable colWidths="62.0,249.0,58.0,56.0,57.0" style="Table_Move_Line_Detail">
<tr>
<td>
@@ -247,21 +238,18 @@
<para style="terp_default_Bold_9">[[ move_g['name'] ]]</para>
</td>
<td>
<para style="terp_Default_Bold_Right_9_U">[[ formatLang( move_g['debit']) ]]</para>
<para style="terp_Default_Bold_Right_9_U">[[ formatLang( move_g['debit']) ]] </para>
</td>
<td>
<para style="terp_Default_Bold_Right_9_U">[[ formatLang( move_g['credit']) ]]</para>
<para style="terp_Default_Bold_Right_9_U">[[ formatLang( move_g['credit']) ]] </para>
</td>
<td>
<para style="terp_Default_Bold_Right_9_U">[[ formatLang( move_g['balance']) ]] [[ company.currency_id.symbol ]]</para>
</td>
</tr>
</blockTable>
<para style="terp_default_2">
<font color="white"> </font>
</para>
<section>
<para style="terp_default_9">[[ repeatIn(lines_a(move_g['id'],o.id,data['form']['date1'],data['form']['date2']),'move_a') ]]</para>
<para style="terp_default_2">[[ repeatIn(lines_a(move_g['id'],o.id,data['form']['date1'],data['form']['date2']),'move_a') ]]</para>
<blockTable colWidths="60.0,46.0,204.0,59.0,55.0,58.0" style="Table_Move_Line_Content">
<tr>
<td>
@@ -274,13 +262,13 @@
<para style="terp_default_9_Italic">[[ move_a['name'] ]]</para>
</td>
<td>
<para style="terp_default_9_italic_Rignt">[[ formatLang( move_a['debit'] )]]</para>
<para style="terp_default_9_italic_Rignt">[[ formatLang( move_a['debit'] )]] </para>
</td>
<td>
<para style="terp_default_9_italic_Rignt">[[ formatLang( move_a['credit']) ]]</para>
<para style="terp_default_9_italic_Rignt">[[ formatLang( move_a['credit']) ]] </para>
</td>
<td>
<para style="terp_default_9_italic_Rignt">[[ formatLang( move_a['balance']) ]]</para>
<para style="terp_default_9_italic_Rignt">[[ formatLang( move_a['balance']) ]] [[ company.currency_id.symbol]]</para>
</td>
</tr>
</blockTable>
@@ -288,13 +276,7 @@
<font color="white"> </font>
</para>
</section>
<para style="terp_default_8">
<font color="white"> </font>
</para>
</section>
</section>
<para style="terp_default_8">
<font color="white"> </font>
</para>
</story>
</document>
addons/account/project/report/quantity_cost_ledger.py
+1 -1
View File
@@ -102,7 +102,7 @@ class account_analytic_quantity_cost_ledger(report_sxw.rml_parse):
def _sum_quantity(self, accounts, date1, date2, journals):
ids = map(lambda x: x.id, accounts)
if not len(ids):
if not ids:
return 0.0
if not journals:
self.cr.execute("SELECT sum(unit_amount) \
addons/account/project/wizard/account_analytic_chart.py
+2 -2
View File
@@ -40,9 +40,9 @@ class account_analytic_chart(osv.osv_memory):
result = act_obj.read(cr, uid, [id], context=context)[0]
data = self.read(cr, uid, ids, [])[0]
if data['from_date']:
result_context.update({'from_date' : data['from_date']})
result_context.update({'from_date': data['from_date']})
if data['to_date']:
result_context.update({'to_date' : data['to_date']})
result_context.update({'to_date': data['to_date']})
result['context'] = str(result_context)
return result
addons/account/project/wizard/account_analytic_inverted_balance_report.xml
+37 -37
View File
@@ -2,44 +2,44 @@
<openerp>
<data>
<record id="account_analytic_invert_balance_view" model="ir.ui.view">
<field name="name">Account Analytic Inverted Balance</field>
<field name="model">account.analytic.inverted.balance</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Select Period">
<group colspan="4" col="6">
<field name="date1"/>
<field name="date2"/>
</group>
<separator colspan="4"/>
<group colspan="4" col="6">
<button special="cancel" string="Cancel" icon="gtk-cancel"/>
<button name="check_report" string="Print" type="object" icon="gtk-print"/>
</group>
</form>
</field>
</record>
<record id="account_analytic_invert_balance_view" model="ir.ui.view">
<field name="name">Account Analytic Inverted Balance</field>
<field name="model">account.analytic.inverted.balance</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Select Period">
<group colspan="4" col="6">
<field name="date1"/>
<field name="date2"/>
</group>
<separator colspan="4"/>
<group colspan="4" col="6">
<button special="cancel" string="Cancel" icon="gtk-cancel"/>
<button name="check_report" string="Print" type="object" icon="gtk-print"/>
</group>
</form>
</field>
</record>
<record id="action_account_analytic_invert_balance" model="ir.actions.act_window">
<field name="name">Inverted Analytic Balance</field>
<field name="type">ir.actions.act_window</field>
<field name="res_model">account.analytic.inverted.balance</field>
<field name="view_type">form</field>
<field name="view_mode">form</field>
<field name="view_id" ref="account_analytic_invert_balance_view"/>
<field name="target">new</field>
</record>
<record id="action_account_analytic_invert_balance" model="ir.actions.act_window">
<field name="name">Inverted Analytic Balance</field>
<field name="type">ir.actions.act_window</field>
<field name="res_model">account.analytic.inverted.balance</field>
<field name="view_type">form</field>
<field name="view_mode">form</field>
<field name="view_id" ref="account_analytic_invert_balance_view"/>
<field name="target">new</field>
</record>
<record model="ir.values" id="account_analytic_invert_balance_values">
<field name="model_id" ref="analytic.model_account_analytic_account" />
<field name="object" eval="1" />
<field name="name">Account Analytic Inverted Balance</field>
<field name="key2">client_print_multi</field>
<field name="value" eval="'ir.actions.act_window,' + str(ref('action_account_analytic_invert_balance'))" />
<field name="key">action</field>
<field name="model">account.analytic.account</field>
</record>
<record model="ir.values" id="account_analytic_invert_balance_values">
<field name="model_id" ref="analytic.model_account_analytic_account" />
<field name="object" eval="1" />
<field name="name">Account Analytic Inverted Balance</field>
<field name="key2">client_print_multi</field>
<field name="value" eval="'ir.actions.act_window,' + str(ref('action_account_analytic_invert_balance'))" />
<field name="key">action</field>
<field name="model">account.analytic.account</field>
</record>
</data>
</openerp>
</openerp>
addons/account/report/__init__.py
+8 -4
View File
@@ -26,17 +26,21 @@ import account_balance
import account_partner_balance
import account_general_ledger
import account_partner_ledger
import invoice
import overdue
#import invoice
import account_print_invoice
#import overdue
import account_print_overdue
import account_aged_partner_balance
import tax_report
#import tax_report
import account_tax_report
import account_tax_code
import account_balance_landscape
import account_invoice_report
import account_report
import account_entries_report
import account_analytic_entries_report
import voucher_print
#import voucher_print
import account_voucher_print
import account_balance_sheet
import account_profit_loss
addons/account/report/account_aged_partner_balance.py
+16 -15
View File
@@ -30,7 +30,6 @@ class aged_trial_report(rml_parse.rml_parse, common_report_header):
def __init__(self, cr, uid, name, context):
super(aged_trial_report, self).__init__(cr, uid, name, context=context)
self.query_line = ''
self.total_account = []
self.localcontext.update({
'time': time,
@@ -44,10 +43,12 @@ class aged_trial_report(rml_parse.rml_parse, common_report_header):
'get_partners':self._get_partners,
'get_account': self._get_account,
'get_fiscalyear': self._get_fiscalyear,
'get_target_move': self._get_target_move,
})
def set_context(self, objects, data, ids, report_type=None):
self.query = data['form'].get('query_line', '')
obj_move = self.pool.get('account.move.line')
self.query = obj_move._query_get(self.cr, self.uid, obj='l', context=data['form'].get('used_context', {}))
self.direction_selection = data['form'].get('direction_selection', 'past')
self.target_move = data['form'].get('target_move', 'all')
self.date_from = data['form'].get('date_from', time.strftime('%Y-%m-%d'))
@@ -61,7 +62,6 @@ class aged_trial_report(rml_parse.rml_parse, common_report_header):
def _get_lines(self, form):
res = []
account_move_line_obj = pooler.get_pool(self.cr.dbname).get('account.move.line')
self.cr.execute('SELECT DISTINCT res_partner.id AS id,\
res_partner.name AS name \
FROM res_partner,account_move_line AS l, account_account\
@@ -70,7 +70,7 @@ class aged_trial_report(rml_parse.rml_parse, common_report_header):
OR (reconcile_id IN (SELECT recon.id FROM account_move_reconcile AS recon WHERE recon.create_date > %s )))\
AND (l.partner_id=res_partner.id)\
AND ' + self.query + ' \
ORDER BY res_partner.name' , (self.date_from,))
ORDER BY res_partner.name', (self.date_from,))
partners = self.cr.dictfetchall()
## mise a 0 du total
for i in range(7):
@@ -78,6 +78,8 @@ class aged_trial_report(rml_parse.rml_parse, common_report_header):
#
# Build a string like (1,2,3) for easy use in SQL query
partner_ids = [x['id'] for x in partners]
if not partner_ids:
return []
# This dictionary will store the debit-credit for all partners, using partner_id as key.
move_state = ['draft','posted']
if self.target_move == 'posted':
@@ -94,7 +96,7 @@ class aged_trial_report(rml_parse.rml_parse, common_report_header):
OR (l.reconcile_id IN (SELECT recon.id FROM account_move_reconcile AS recon WHERE recon.create_date > %s )))\
AND ' + self.query + '\
AND account_account.active\
GROUP BY partner_id ' , (tuple(move_state), tuple(self.ACCOUNT_TYPE), tuple(partner_ids), self.date_from))
GROUP BY partner_id ', (tuple(move_state), tuple(self.ACCOUNT_TYPE), tuple(partner_ids), self.date_from))
t = self.cr.fetchall()
for i in t:
totals[i[0]] = i[1]
@@ -129,7 +131,7 @@ class aged_trial_report(rml_parse.rml_parse, common_report_header):
OR (l.reconcile_id IN (SELECT recon.id FROM account_move_reconcile AS recon WHERE recon.create_date > %s )))\
AND '+ self.query + '\
AND account_account.active\
GROUP BY l.partner_id' , (tuple(move_state), tuple(self.ACCOUNT_TYPE), self.date_from, tuple(partner_ids), self.date_from))
GROUP BY l.partner_id', (tuple(move_state), tuple(self.ACCOUNT_TYPE), self.date_from, tuple(partner_ids), self.date_from))
t = self.cr.fetchall()
for i in t:
future_past[i[0]] = i[1]
@@ -138,7 +140,7 @@ class aged_trial_report(rml_parse.rml_parse, common_report_header):
# Each history will contain : history[1] = {'<partner_id>': <partner_debit-credit>}
history = []
for i in range(5):
args_list = (tuple(move_state), tuple(self.ACCOUNT_TYPE), tuple(partner_ids) ,self.date_from,)
args_list = (tuple(move_state), tuple(self.ACCOUNT_TYPE), tuple(partner_ids),self.date_from,)
dates_query = '(COALESCE(l.date_maturity,l.date)'
if form[str(i)]['start'] and form[str(i)]['stop']:
dates_query += ' BETWEEN %s AND %s)'
@@ -151,7 +153,7 @@ class aged_trial_report(rml_parse.rml_parse, common_report_header):
args_list += (form[str(i)]['stop'],)
self.cr.execute('SELECT l.partner_id, SUM(l.debit-l.credit)\
FROM account_move_line AS l, account_account , account_move am \
FROM account_move_line AS l, account_account, account_move am \
WHERE (l.account_id = account_account.id) AND (l.move_id=am.id)\
AND (am.state IN %s)\
AND (account_account.type IN %s)\
@@ -161,7 +163,7 @@ class aged_trial_report(rml_parse.rml_parse, common_report_header):
AND '+ self.query + '\
AND account_account.active\
AND ' + dates_query + '\
GROUP BY l.partner_id' , args_list)
GROUP BY l.partner_id', args_list)
t = self.cr.fetchall()
d = {}
for i in t:
@@ -216,7 +218,6 @@ class aged_trial_report(rml_parse.rml_parse, common_report_header):
def _get_lines_with_out_partner(self, form):
res = []
account_move_line_obj = pooler.get_pool(self.cr.dbname).get('account.move.line')
move_state = ['draft','posted']
if self.target_move == 'posted':
move_state = ['posted']
@@ -226,7 +227,7 @@ class aged_trial_report(rml_parse.rml_parse, common_report_header):
self.total_account.append(0)
totals = {}
self.cr.execute('SELECT SUM(l.debit-l.credit) \
FROM account_move_line AS l, account_account , account_move am \
FROM account_move_line AS l, account_account, account_move am \
WHERE (l.account_id = account_account.id) AND (l.move_id=am.id)\
AND (am.state IN %s)\
AND (l.partner_id IS NULL)\
@@ -234,7 +235,7 @@ class aged_trial_report(rml_parse.rml_parse, common_report_header):
AND ((l.reconcile_id IS NULL) \
OR (l.reconcile_id IN (SELECT recon.id FROM account_move_reconcile AS recon WHERE recon.create_date > %s )))\
AND ' + self.query + '\
AND account_account.active ' ,(tuple(move_state), tuple(self.ACCOUNT_TYPE), self.date_from))
AND account_account.active ',(tuple(move_state), tuple(self.ACCOUNT_TYPE), self.date_from))
t = self.cr.fetchall()
for i in t:
totals['Unknown Partner'] = i[0]
@@ -265,7 +266,7 @@ class aged_trial_report(rml_parse.rml_parse, common_report_header):
AND ((l.reconcile_id IS NULL)\
OR (l.reconcile_id IN (SELECT recon.id FROM account_move_reconcile AS recon WHERE recon.create_date > %s )))\
AND '+ self.query + '\
AND account_account.active ' , (tuple(move_state), tuple(self.ACCOUNT_TYPE), self.date_from, self.date_from))
AND account_account.active ', (tuple(move_state), tuple(self.ACCOUNT_TYPE), self.date_from, self.date_from))
t = self.cr.fetchall()
for i in t:
future_past['Unknown Partner'] = i[0]
@@ -285,7 +286,7 @@ class aged_trial_report(rml_parse.rml_parse, common_report_header):
args_list += (form[str(i)]['stop'],)
self.cr.execute('SELECT SUM(l.debit-l.credit)\
FROM account_move_line AS l, account_account , account_move am \
FROM account_move_line AS l, account_account, account_move am \
WHERE (l.account_id = account_account.id) AND (l.move_id=am.id)\
AND (am.state IN %s)\
AND (account_account.type IN %s)\
@@ -295,7 +296,7 @@ class aged_trial_report(rml_parse.rml_parse, common_report_header):
AND '+ self.query + '\
AND account_account.active\
AND ' + dates_query + '\
GROUP BY l.partner_id' , args_list)
GROUP BY l.partner_id', args_list)
t = self.cr.fetchall()
d = {}
for i in t:
addons/account/report/account_aged_partner_balance.rml
+8 -8
View File
@@ -132,7 +132,7 @@
<para style="terp_tblheader_General_Centre">Analysis Direction</para>
</td>
<td>
<para style="terp_tblheader_General_Centre">Printing Date</para>
<para style="terp_tblheader_General_Centre">Target Moves</para>
</td>
</tr>
<tr>
@@ -155,7 +155,7 @@
<para style="terp_default_Centre_8">[[ data['form']['direction_selection'] ]]</para>
</td>
<td>
<para style="terp_default_Centre_8">[[ formatLang(time.strftime('%Y-%m-%d %H:%M:%S'), date_time = True)]]</para>
<para style="terp_default_Centre_8">[[ get_target_move(data) ]]</para>
</td>
</tr>
</blockTable>
@@ -168,22 +168,22 @@
<para style="terp_tblheader_Details">Partners</para>
</td>
<td>
<para style="terp_tblheader_Details_Right">[[ data['form']['direction_selection'] == 'future' and 'Due' or 'Not due' ]]<font size="8.0">([[ company.currency_id.code ]])</font></para>
<para style="terp_tblheader_Details_Right">[[ data['form']['direction_selection'] == 'future' and 'Due' or 'Not due' ]]</para>
</td>
<td>
<para style="terp_tblheader_Details_Right">[[ data['form']['4']['name'] ]]<font size="8.0">([[ company.currency_id.code ]])</font></para>
<para style="terp_tblheader_Details_Right">[[ data['form']['4']['name'] ]]</para>
</td>
<td>
<para style="terp_tblheader_Details_Right">[[ data['form']['3']['name'] ]]<font size="8.0">([[ company.currency_id.code ]])</font></para>
<para style="terp_tblheader_Details_Right">[[ data['form']['3']['name'] ]]</para>
</td>
<td>
<para style="terp_tblheader_Details_Right">[[ data['form']['2']['name'] ]]<font size="8.0">([[ company.currency_id.code ]])</font></para>
<para style="terp_tblheader_Details_Right">[[ data['form']['2']['name'] ]]</para>
</td>
<td>
<para style="terp_tblheader_Details_Right">[[ data['form']['1']['name'] ]]<font size="8.0">([[ company.currency_id.code ]])</font></para>
<para style="terp_tblheader_Details_Right">[[ data['form']['1']['name'] ]]</para>
</td>
<td>
<para style="terp_tblheader_Details_Right">[[ data['form']['0']['name'] ]]<font size="8.0">([[ company.currency_id.code ]])</font></para>
<para style="terp_tblheader_Details_Right">[[ data['form']['0']['name'] ]]</para>
</td>
<td>
<para style="terp_tblheader_Details_Right">Total</para>
addons/account/report/account_analytic_entries_report.py
+2 -2
View File
@@ -33,12 +33,12 @@ class analytic_entries_report(osv.osv):
'month':fields.selection([('01','January'), ('02','February'), ('03','March'), ('04','April'),
('05','May'), ('06','June'), ('07','July'), ('08','August'), ('09','September'),
('10','October'), ('11','November'), ('12','December')], 'Month',readonly=True),
'user_id' : fields.many2one('res.users', 'User',readonly=True),
'user_id': fields.many2one('res.users', 'User',readonly=True),
'name': fields.char('Description', size=64, readonly=True),
'partner_id': fields.many2one('res.partner', 'Partner'),
'company_id': fields.many2one('res.company', 'Company', required=True),
'currency_id': fields.many2one('res.currency', 'Currency', required=True),
'account_id': fields.many2one('account.analytic.account', 'Account', required=True),
'account_id': fields.many2one('account.analytic.account', 'Account', required=False),
'general_account_id': fields.many2one('account.account', 'General Account', required=True),
'journal_id': fields.many2one('account.analytic.journal', 'Journal', required=True),
'move_id': fields.many2one('account.move.line', 'Move', required=True),
addons/account/report/account_analytic_entries_report_view.xml
+25 -21
View File
@@ -16,7 +16,7 @@
<field name="partner_id" invisible="1"/>
<field name="company_id" invisible="1" groups="base.group_multi_company"/>
<field name="currency_id" invisible="1"/>
<field name="account_id" invisible="1"/>
<field name="account_id" invisible="1" groups="analytic.group_analytic_accounting"/>
<field name="general_account_id" invisible="1"/>
<field name="journal_id" invisible="1"/>
<field name="product_id" invisible="1"/>
@@ -49,13 +49,31 @@
help="Analytic Entries during last 7 days"/>
<separator orientation="vertical"/>
<field name="date" />
<field name="account_id" />
<field name="account_id" groups="analytic.group_analytic_accounting"/>
<field name="product_id" />
<field name="user_id">
<filter icon="terp-personal" domain="[('user_id','=',uid)]" help="My Entries"/>
</field>
</group>
<newline/>
<group expand="0" string="Group By...">
<filter string="User" name="User" icon="terp-personal" context="{'group_by':'user_id'}"/>
<filter string="Partner" icon="terp-partner" context="{'group_by':'partner_id'}"/>
<separator orientation="vertical"/>
<filter string="Account" name="Account" icon="terp-folder-green" context="{'group_by':'account_id'}" groups="analytic.group_analytic_accounting"/>
<filter string="General Account" icon="terp-folder-green" context="{'group_by':'general_account_id'}"/>
<filter string="Journal" icon="terp-folder-orange" context="{'group_by':'journal_id'}"/>
<separator orientation="vertical"/>
<filter string="Product" icon="terp-accessories-archiver" context="{'group_by':'product_id'}"/>
<filter string="Product UOM" icon="terp-mrp" context="{'group_by':'product_uom_id'}"/>
<separator orientation="vertical" groups="base.group_multi_company"/>
<filter string="Company" icon="terp-go-home" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
<separator orientation="vertical"/>
<filter string="Day" icon="terp-go-today" context="{'group_by':'day'}"/>
<filter string="Month" name="Month" icon="terp-go-month" context="{'group_by':'month'}"/>
<filter string="Year" icon="terp-go-year" context="{'group_by':'year'}"/>
</group>
<newline/>
<group expand="0" string="Extended Filters..." groups="base.group_extended">
<field name="currency_id" widget="selection"/>
<field name="general_account_id" widget="selection"/>
@@ -63,26 +81,9 @@
<field name="journal_id" widget="selection"/>
<separator orientation="vertical"/>
<field name="name"/>
<field name="account_id"/>
<field name="account_id" groups="analytic.group_analytic_accounting"/>
<field name="company_id" widget="selection" groups="base.group_multi_company"/>
</group>
<newline/>
<group expand="1" string="Group By...">
<filter string="User" name="User" icon="terp-personal" context="{'group_by':'user_id'}"/>
<filter string="Partner" icon="terp-personal" context="{'group_by':'partner_id'}"/>
<filter string="Company" icon="terp-go-home" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
<separator orientation="vertical"/>
<filter string="Account" name="Account" icon="terp-folder-green" context="{'group_by':'account_id'}"/>
<filter string="General Account" icon="terp-folder-green" context="{'group_by':'general_account_id'}"/>
<filter string="Journal" icon="terp-folder-orange" context="{'group_by':'journal_id'}"/>
<separator orientation="vertical"/>
<filter string="Product" icon="terp-accessories-archiver" context="{'group_by':'product_id'}"/>
<filter string="Product UOM" icon="terp-mrp" context="{'group_by':'product_uom_id'}"/>
<separator orientation="vertical"/>
<filter string="Day" icon="terp-go-today" context="{'group_by':'day'}"/>
<filter string="Month" name="Month" icon="terp-go-month" context="{'group_by':'month'}"/>
<filter string="Year" icon="terp-go-year" context="{'group_by':'year'}"/>
</group>
</search>
</field>
</record>
@@ -108,7 +109,10 @@
<field name="help">A tool search lets you know statistics on your analytics records that match your needs.</field>
</record>
<menuitem action="action_analytic_entries_report" id="menu_action_analytic_entries_report" parent="account.menu_finance_statistic_report_statement" sequence="4"/>
<menuitem action="action_analytic_entries_report"
id="menu_action_analytic_entries_report"
groups="analytic.group_analytic_accounting"
parent="account.menu_finance_statistic_report_statement" sequence="4"/>
</data>
</openerp>
addons/account/report/account_balance.py
+2 -1
View File
@@ -47,6 +47,7 @@ class account_balance(report_sxw.rml_parse, common_report_header):
'get_journal': self._get_journal,
'get_start_date':self._get_start_date,
'get_end_date':self._get_end_date,
'get_target_move': self._get_target_move,
})
self.context = context
@@ -85,7 +86,7 @@ class account_balance(report_sxw.rml_parse, common_report_header):
self.sum_debit += account_rec['debit']
self.sum_credit += account_rec['credit']
if disp_acc == 'bal_movement':
if res['credit'] > 0 or res['debit'] > 0 or res['balance'] > 0 :
if res['credit'] > 0 or res['debit'] > 0 or res['balance'] > 0:
self.result_acc.append(res)
elif disp_acc == 'bal_solde':
if res['balance'] != 0:
addons/account/report/account_balance.rml
+5 -5
View File
@@ -223,7 +223,7 @@
<para style="terp_tblheader_General_Centre">Filter By <font>[[ get_filter(data)!='No Filter' and get_filter(data) ]]</font> </para>
</td>
<td>
<para style="terp_tblheader_General_Centre">Printing Date</para>
<para style="terp_tblheader_General_Centre">Target Moves</para>
</td>
</tr>
<tr>
@@ -273,7 +273,7 @@
</blockTable>
</td>
<td>
<para style="terp_default_Centre_8">[[ formatLang(time.strftime('%Y-%m-%d %H:%M:%S'), date_time = True)]]</para>
<para style="terp_default_Centre_8">[[ get_target_move(data) ]]</para>
</td>
</tr>
</blockTable>
@@ -283,7 +283,7 @@
<para style="P11">
<font color="white"> </font>
</para>
<blockTable colWidths="67,264.0,70.0,70.0,80.0" style="Table2" repeatRows="1">
<blockTable colWidths="67,295.0,60.0,60.0,60.0" style="Table2" repeatRows="1">
<tr noRowsplits="1">
<td><para style="P12a">Code</para></td>
<td><para style="P12a">Account</para></td>
@@ -294,7 +294,7 @@
<tr>
<td><para style="P14">[[ repeatIn(lines(data['form']), 'a') ]]<font>[[ (a['type']&lt;&gt;'view' and setTag('para','para',{'fontName':"Helvetica"})) or removeParentNode('font') ]]</font><i>[[ a['code'] or removeParentNode('tr') ]]</i></para></td>
<td><para style="P14"><font>[[ (a['type']&lt;&gt;'view' and setTag('para','para',{'fontName':"Helvetica"})) or removeParentNode('font') ]]</font><font color="white">[[ '..'*(a['level']-1) ]]</font><font>[[ a['name'] ]]</font> </para></td>
<td><para style="P3"><font>[[ (a['type']&lt;&gt;'view' and setTag('para','para',{'fontName':"Helvetica"})) or removeParentNode('font') ]]</font><font>[[ a['type']=='view' and removeParentNode('font') ]][[ formatLang(a['debit']) ]]</font><font>[[ a['type']&lt;&gt;'view' and removeParentNode('font') ]] [[formatLang(a['debit']) ]] </font></para></td>
<td><para style="P3"><font>[[ (a['type']&lt;&gt;'view' and setTag('para','para',{'fontName':"Helvetica"})) or removeParentNode('font') ]]</font><font>[[ a['type']=='view' and removeParentNode('font') ]][[ formatLang(a['debit']) ]]</font><font>[[ a['type']&lt;&gt;'view' and removeParentNode('font') ]] [[formatLang(a['debit']) ]]</font></para></td>
<td><para style="P3"><font>[[ (a['type']&lt;&gt;'view' and setTag('para','para',{'fontName':"Helvetica"})) or removeParentNode('font')]]</font><font>[[ a['type']=='view' and removeParentNode('font') ]][[ formatLang(a['credit']) ]]</font><font>[[ a['type']&lt;&gt;'view' and removeParentNode('font') ]] [[ formatLang(a['credit']) ]]</font> </para></td>
<td><para style="P3"><font>[[ (a['type']&lt;&gt;'view' and setTag('para','para',{'fontName':"Helvetica"})) or removeParentNode('font') ]]</font><font>[[ a['type']=='view' and removeParentNode('font') ]][[ formatLang(a['balance']) ]] [[ company.currency_id.symbol ]]</font><font>[[ a['type']&lt;&gt;'view' and removeParentNode('font') ]] [[ formatLang(a['balance']) ]] [[ company.currency_id.symbol ]]</font> </para></td>
</tr>
@@ -303,4 +303,4 @@
<font color="white"> </font>
</para>
</story>
</document>
</document>
addons/account/report/account_balance_landscape.py
+2 -2
View File
@@ -139,7 +139,7 @@ class account_balance_landscape(rml_parse.rml_parse):
ctx['state'] = form['context'].get('state','all')
tmp = self.pool.get('account.account').browse(self.cr, self.uid, ids, ctx.copy())
if len(tmp):
if tmp:
accounts.append(tmp)
merged_accounts=zip(*accounts)
@@ -198,7 +198,7 @@ class account_balance_landscape(rml_parse.rml_parse):
ctx['state'] = form['context'].get('state','all')
tmp1 = self.pool.get('account.account').browse(self.cr, self.uid, ids, ctx.copy())
if len(tmp1):
if tmp1:
accounts.append(tmp1)
if level==1: #if parent is called,done is not empty when called again.
addons/account/report/account_balance_sheet.py
+27 -27
View File
@@ -38,12 +38,12 @@ class report_balancesheet_horizontal(rml_parse.rml_parse, common_report_header):
self.result_temp = []
self.localcontext.update({
'time': time,
'get_lines' : self.get_lines,
'get_lines_another' : self.get_lines_another,
'get_lines': self.get_lines,
'get_lines_another': self.get_lines_another,
'get_company': self._get_company,
'get_currency': self._get_currency,
'sum_dr' : self.sum_dr,
'sum_cr' : self.sum_cr,
'sum_dr': self.sum_dr,
'sum_cr': self.sum_cr,
'get_data':self.get_data,
'get_pl_balance':self.get_pl_balance,
'get_fiscalyear': self._get_fiscalyear,
@@ -56,13 +56,13 @@ class report_balancesheet_horizontal(rml_parse.rml_parse, common_report_header):
'get_start_date':self._get_start_date,
'get_end_date':self._get_end_date,
'get_company':self._get_company,
'get_target_move': self._get_target_move,
})
self.context = context
def sum_dr(self):
if self.res_bl['type'] == 'Net Profit':
self.result_sum_dr += self.res_bl['balance']
self.result_sum_dr += self.res_bl['balance']*-1
return self.result_sum_dr
def sum_cr(self):
@@ -92,7 +92,7 @@ class report_balancesheet_horizontal(rml_parse.rml_parse, common_report_header):
ctx = self.context.copy()
ctx['fiscalyear'] = data['form'].get('fiscalyear_id', False)
if data['form']['filter'] == 'filter_period' :
if data['form']['filter'] == 'filter_period':
ctx['periods'] = data['form'].get('periods', False)
elif data['form']['filter'] == 'filter_date':
ctx['date_from'] = data['form'].get('date_from', False)
@@ -110,8 +110,8 @@ class report_balancesheet_horizontal(rml_parse.rml_parse, common_report_header):
else:
self.res_bl['type'] = 'Net Loss'
pl_dict = {
'code' : False,
'name' : self.res_bl['type'],
'code': False,
'name': self.res_bl['type'],
'level': False,
'balance':self.res_bl['balance'],
}
@@ -120,18 +120,18 @@ class report_balancesheet_horizontal(rml_parse.rml_parse, common_report_header):
for account in accounts:
if (account.user_type.report_type) and (account.user_type.report_type == typ):
account_dict = {
'id' : account.id,
'code' : account.code,
'name' : account.name,
'id': account.id,
'code': account.code,
'name': account.name,
'level': account.level,
'balance':account.balance,
}
if typ == 'liability' and account.type <> 'view' and (account.debit <> account.credit):
self.result_sum_dr += abs(account.debit - account.credit)
self.result_sum_dr += account.balance
if typ == 'asset' and account.type <> 'view' and (account.debit <> account.credit):
self.result_sum_cr += abs(account.debit - account.credit)
self.result_sum_cr += account.balance
if data['form']['display_account'] == 'bal_movement':
if account.credit > 0 or account.debit > 0 or account.balance > 0 :
if account.credit > 0 or account.debit > 0 or account.balance > 0:
accounts_temp.append(account_dict)
elif data['form']['display_account'] == 'bal_solde':
if account.balance != 0:
@@ -150,12 +150,12 @@ class report_balancesheet_horizontal(rml_parse.rml_parse, common_report_header):
for i in range(0,max(len(cal_list['liability']),len(cal_list['asset']))):
if i < len(cal_list['liability']) and i < len(cal_list['asset']):
temp={
'code' : cal_list['liability'][i]['code'],
'name' : cal_list['liability'][i]['name'],
'code': cal_list['liability'][i]['code'],
'name': cal_list['liability'][i]['name'],
'level': cal_list['liability'][i]['level'],
'balance':cal_list['liability'][i]['balance'],
'code1' : cal_list['asset'][i]['code'],
'name1' : cal_list['asset'][i]['name'],
'code1': cal_list['asset'][i]['code'],
'name1': cal_list['asset'][i]['name'],
'level1': cal_list['asset'][i]['level'],
'balance1':cal_list['asset'][i]['balance'],
}
@@ -163,24 +163,24 @@ class report_balancesheet_horizontal(rml_parse.rml_parse, common_report_header):
else:
if i < len(cal_list['asset']):
temp={
'code' : '',
'name' : '',
'code': '',
'name': '',
'level': False,
'balance':False,
'code1' : cal_list['asset'][i]['code'],
'name1' : cal_list['asset'][i]['name'],
'code1': cal_list['asset'][i]['code'],
'name1': cal_list['asset'][i]['name'],
'level1': cal_list['asset'][i]['level'],
'balance1':cal_list['asset'][i]['balance'],
}
self.result_temp.append(temp)
if i < len(cal_list['liability']):
temp={
'code' : cal_list['liability'][i]['code'],
'name' : cal_list['liability'][i]['name'],
'code': cal_list['liability'][i]['code'],
'name': cal_list['liability'][i]['name'],
'level': cal_list['liability'][i]['level'],
'balance':cal_list['liability'][i]['balance'],
'code1' : '',
'name1' : '',
'code1': '',
'name1': '',
'level1': False,
'balance1':False,
}
addons/account/report/account_balance_sheet.rml
+2 -2
View File
@@ -159,7 +159,7 @@
<td><para style="terp_tblheader_General_Centre">Fiscal Year</para></td>
<td><para style="terp_tblheader_General_Centre">Filter By <font>[[ get_filter(data)!='No Filter' and '' or removeParentNode('font') ]]</font></para></td>
<td><para style="terp_tblheader_General_Centre">Display Account</para></td>
<td><para style="terp_tblheader_General_Centre">Printing Date</para></td>
<td><para style="terp_tblheader_General_Centre">Target Moves</para></td>
</tr>
<tr>
<td><para style="terp_default_Centre_8">[[ get_account(data) or removeParentNode('para') ]]</para></td>
@@ -187,7 +187,7 @@
</blockTable>
</td>
<td><para style="terp_default_Centre_8">[[ (data['form']['display_account']=='bal_all' and 'All') or (data['form']['display_account']=='bal_movement' and 'With movements') or 'With balance is not equal to 0']]</para></td>
<td><para style="terp_default_Centre_8">[[ formatLang(time.strftime('%Y-%m-%d %H:%M:%S'), date_time = True) ]] </para></td>
<td><para style="terp_default_Centre_8">[[ get_target_move(data) ]] </para></td>
</tr>
</blockTable>
<para style="Standard">
addons/account/report/account_balance_sheet_horizontal.rml
+3 -3
View File
@@ -158,7 +158,7 @@
<td><para style="terp_tblheader_General_Centre">Fiscal Year</para></td>
<td><para style="terp_tblheader_General_Centre">Filter By [[ get_filter(data)!='No Filter' and get_filter(data) ]]</para></td>
<td><para style="terp_tblheader_General_Centre">Display Account</para></td>
<td><para style="terp_tblheader_General_Centre">Printing Date</para></td>
<td><para style="terp_tblheader_General_Centre">Target Moves</para></td>
</tr>
<tr>
<td><para style="terp_default_Centre_8">[[ get_account(data) or removeParentNode('para') ]]</para></td>
@@ -186,7 +186,7 @@
</blockTable>
</td>
<td><para style="terp_default_Centre_8">[[ (data['form']['display_account']=='bal_all' and 'All') or (data['form']['display_account']=='bal_movement' and 'With movements') or 'With balance is not equal to 0']]</para></td>
<td><para style="terp_default_Centre_8">[[ formatLang(time.strftime('%Y-%m-%d %H:%M:%S'), date_time = True) ]] </para></td>
<td><para style="terp_default_Centre_8">[[ get_target_move(data) ]]</para></td>
</tr>
</blockTable>
<para style="Standard">
@@ -233,7 +233,7 @@
<para style="terp_default_9"><font color="white">[[ '. '*(a['level']-1) ]]</font><font>[[ a['level']&lt;4 and ( setTag('para','para',{'style':'terp_default_Bold_9'})) or removeParentNode('font') ]][[ a['name'] ]]</font></para>
</td>
<td>
<para style="terp_default_Right_9"><font>[[ a['level1']&lt;4 and ( setTag('para','para',{'style':'terp_default_Right_9_Bold'})) or removeParentNode('font') ]]</font><font>[[ formatLang(abs(a['balance'])) ]] [[ company.currency_id.symbol ]]</font></para>
<para style="terp_default_Right_9"><font>[[ a['level1']&lt;4 and ( setTag('para','para',{'style':'terp_default_Right_9_Bold'})) or removeParentNode('font') ]]</font><font>[[(a['code'] and a['name']) and formatLang(abs(a['balance'])) or removeParentNode('font')]] [[ company.currency_id.symbol ]]</font></para>
</td>
</tr>
</blockTable>

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