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

[MERGE] merge from lp:~openerp/openobject-addons/trunk

Browse Source 
bzr revid: hmo@tinyerp.com-20091217134057-40llgyk11ik0xt0g
This commit is contained in:
Harry (Open ERP)
2009-12-17 19:10:57 +05:30
parent 6d32891c04 0f5c880307
commit ced3f592ef
4170 changed files with 48360 additions and 35037 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/account/account.py
+71 -62
View File
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
##############################################################################
#
#
# OpenERP, Open Source Management Solution
# Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
#
@@ -15,7 +15,7 @@
# GNU Affero General Public License for more details.
#
# You should have received a copy of the GNU Affero General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
##############################################################################
@@ -103,7 +103,7 @@ class account_payment_term_line(osv.osv):
_constraints = [
(_check_percent, _('Percentages for Payment Term Line must be between 0 and 1, Example: 0.02 for 2% '), ['value_amount']),
]
account_payment_term_line()
@@ -320,7 +320,8 @@ class account_account(osv.osv):
'company_id': _default_company,
'active': lambda *a: True,
'check_history': lambda *a: True,
'currency_mode': lambda *a: 'current'
'currency_mode': lambda *a: 'current',
'company_id': lambda s,cr,uid,c: s.pool.get('res.company')._company_default_get(cr, uid, 'account.account', c),
}
def _check_recursion(self, cr, uid, ids):
@@ -348,7 +349,7 @@ class account_account(osv.osv):
_sql_constraints = [
('code_company_uniq', 'unique (code,company_id)', 'The code of the account must be unique per company !')
]
def name_search(self, cr, user, name, args=None, operator='ilike', context=None, limit=80):
def name_search(self, cr, user, name, args=None, operator='ilike', context=None, limit=100):
if not args:
args = []
if not context:
@@ -418,7 +419,7 @@ class account_account(osv.osv):
line_obj = self.pool.get('account.move.line')
account_ids = self.search(cr, uid, [('id', 'child_of', ids)])
if line_obj.search(cr, uid, [('account_id', 'in', account_ids)]):
raise osv.except_osv(_('Error !'), _('You can not deactivate an account that contains account moves.'))
raise osv.except_osv(_('Error !'), _('You can not deactivate an account that contains Ledger Postings.'))
return super(account_account, self).write(cr, uid, ids, vals, context=context)
account_account()
@@ -478,7 +479,7 @@ class account_journal(osv.osv):
'groups_id': fields.many2many('res.groups', 'account_journal_group_rel', 'journal_id', 'group_id', 'Groups'),
'currency': fields.many2one('res.currency', 'Currency', help='The currency used to enter statement'),
'entry_posted': fields.boolean('Skip \'Draft\' State for Created Entries', help='Check this box if you don\'t want new account moves to pass through the \'draft\' state and instead goes directly to the \'posted state\' without any manual validation.'),
#'company_id': fields.related('default_credit_account_id','company_id',type='many2one', relation="res.company", string="Company"),
#'company_id': fields.related('default_credit_account_id','company_id',type='many2one', relation="res.company", string="Company",store=True),
'company_id': fields.many2one('res.company', 'Company', required=True,select=1),
'invoice_sequence_id': fields.many2one('ir.sequence', 'Invoice Sequence', \
help="The sequence used for invoice numbers in this journal."),
@@ -502,7 +503,7 @@ class account_journal(osv.osv):
# })
return journal_id
def name_search(self, cr, user, name, args=None, operator='ilike', context=None, limit=80):
def name_search(self, cr, user, name, args=None, operator='ilike', context=None, limit=100):
if not args:
args=[]
if not context:
@@ -526,7 +527,8 @@ class account_fiscalyear(osv.osv):
'date_start': fields.date('Start Date', required=True),
'date_stop': fields.date('End Date', required=True),
'period_ids': fields.one2many('account.period', 'fiscalyear_id', 'Periods'),
'state': fields.selection([('draft','Draft'), ('done','Done')], 'Status', readonly=True),
'state': fields.selection([('draft','Draft'), ('done','Done')], 'State', readonly=True,
help='When fiscal year is created. The state is \'Draft\'. At the end of the year it is in \'Done\' state.'),
}
_defaults = {
@@ -590,7 +592,8 @@ 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')], 'Status', readonly=True),
'state': fields.selection([('draft','Draft'), ('done','Done')], '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.many2one('res.company', 'Company', required=True)
}
_defaults = {
@@ -674,7 +677,8 @@ class account_journal_period(osv.osv):
'period_id': fields.many2one('account.period', 'Period', required=True, ondelete="cascade"),
'icon': fields.function(_icon_get, method=True, string='Icon', type='char', size=32),
'active': fields.boolean('Active', required=True),
'state': fields.selection([('draft','Draft'), ('printed','Printed'), ('done','Done')], 'Status', required=True, readonly=True),
'state': fields.selection([('draft','Draft'), ('printed','Printed'), ('done','Done')], 'State', required=True, readonly=True,
help='When journal period is created. The state is \'Draft\'. If a report is printed it comes to \'Printed\' state. When all transactions are done, it comes in \'Done\' state.'),
'fiscalyear_id': fields.related('period_id', 'fiscalyear_id', string='Fiscal Year', type='many2one', relation='account.fiscalyear'),
'company_id' : fields.many2one('res.company', 'Company')
}
@@ -761,7 +765,8 @@ class account_move(osv.osv):
'ref': fields.char('Ref', size=64),
'period_id': fields.many2one('account.period', 'Period', required=True, states={'posted':[('readonly',True)]}),
'journal_id': fields.many2one('account.journal', 'Journal', required=True, states={'posted':[('readonly',True)]}),
'state': fields.selection([('draft','Draft'), ('posted','Posted')], 'Status', required=True, readonly=True),
'state': fields.selection([('draft','Draft'), ('posted','Posted')], 'State', required=True, readonly=True,
help='When new account move is created the state will be \'Draft\'. When all the payments are done it will be in \'Posted\' state.'),
'line_id': fields.one2many('account.move.line', 'move_id', 'Entries', states={'posted':[('readonly',True)]}),
'to_check': fields.boolean('To Be Verified'),
'partner_id': fields.related('line_id', 'partner_id', type="many2one", relation="res.partner", string="Partner"),
@@ -777,7 +782,7 @@ class account_move(osv.osv):
('journal_pur_voucher','Journal Purchase'),
('journal_voucher','Journal Voucher'),
],'Type', readonly=True, select=True, states={'draft':[('readonly',False)]}),
'company_id': fields.many2one('res.company', 'Company', required=True),
'company_id': fields.related('journal_id','company_id',type='many2one',relation='res.company',string='Company',store=True),
}
_defaults = {
'name': lambda *a: '/',
@@ -915,7 +920,10 @@ class account_move(osv.osv):
amount+= (line.debit - line.credit)
return amount
def _centralise(self, cr, uid, move, mode):
def _centralise(self, cr, uid, move, mode, context=None):
if context is None:
context = {}
if mode=='credit':
account_id = move.journal_id.default_debit_account_id.id
mode2 = 'debit'
@@ -938,8 +946,9 @@ class account_move(osv.osv):
if res:
line_id = res[0]
else:
context.update({'journal_id': move.journal_id.id, 'period_id': move.period_id.id})
line_id = self.pool.get('account.move.line').create(cr, uid, {
'name': 'Centralisation '+mode,
'name': _t(cr, None, 'selection', context.get('lang'), source=(mode.capitalize()+' Centralisation')) or (mode.capitalize()+' Centralisation'),
'centralisation': mode,
'account_id': account_id,
'move_id': move.id,
@@ -948,7 +957,7 @@ class account_move(osv.osv):
'date': move.period_id.date_stop,
'debit': 0.0,
'credit': 0.0,
}, {'journal_id': move.journal_id.id, 'period_id': move.period_id.id})
}, context)
# find the first line of this move with the other mode
# so that we can exclude it from our calculation
@@ -1030,8 +1039,8 @@ class account_move(osv.osv):
#
continue
if journal.centralisation:
self._centralise(cr, uid, move, 'debit')
self._centralise(cr, uid, move, 'credit')
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, {
'state': 'valid'
}, context, check=False)
@@ -1422,11 +1431,11 @@ class account_tax(osv.osv):
for tax in taxes:
if (tax.type=='percent') and not tax.include_base_amount:
tax_parent_tot += tax.amount
for tax in taxes:
if (tax.type=='fixed') and not tax.include_base_amount:
cur_price_unit -= tax.amount
for tax in taxes:
if tax.type=='percent':
if tax.include_base_amount:
@@ -1613,7 +1622,7 @@ class account_subscription(osv.osv):
'period_total': fields.integer('Number of Periods', required=True),
'period_nbr': fields.integer('Period', required=True),
'period_type': fields.selection([('day','days'),('month','month'),('year','year')], 'Period Type', required=True),
'state': fields.selection([('draft','Draft'),('running','Running'),('done','Done')], 'Status', required=True, readonly=True),
'state': fields.selection([('draft','Draft'),('running','Running'),('done','Done')], 'State', required=True, readonly=True),
'lines_id': fields.one2many('account.subscription.line', 'subscription_id', 'Subscription Lines')
}
@@ -1810,13 +1819,13 @@ class account_account_template(osv.osv):
'parent_id': fields.many2one('account.account.template','Parent Account Template', ondelete='cascade'),
'child_parent_ids':fields.one2many('account.account.template','parent_id','Children'),
'tax_ids': fields.many2many('account.tax.template', 'account_account_template_tax_rel','account_id','tax_id', 'Default Taxes'),
'nocreate': fields.boolean('Optional create', help="If checked, the new chart of accounts will not contain this by default."),
'nocreate': fields.boolean('Optional create', help="If checked, the new chart of accounts will not contain this by default."),
}
_defaults = {
'reconcile': lambda *a: False,
'type' : lambda *a :'view',
'nocreate': lambda *a: False,
'nocreate': lambda *a: False,
}
def _check_recursion(self, cr, uid, ids):
@@ -1851,24 +1860,24 @@ account_account_template()
class account_add_tmpl_wizard(osv.osv_memory):
"""Add one more account from the template.
With the 'nocreate' option, some accounts may not be created. Use this to add them later."""
With the 'nocreate' option, some accounts may not be created. Use this to add them later."""
_name = 'account.addtmpl.wizard'
def _get_def_cparent(self, cr, uid, context):
acc_obj=self.pool.get('account.account')
tmpl_obj=self.pool.get('account.account.template')
#print "Searching for ",context
tmpl_obj=self.pool.get('account.account.template')
#print "Searching for ",context
tids=tmpl_obj.read(cr, uid, [context['tmpl_ids']],['parent_id'])
if not tids or not tids[0]['parent_id']:
return False
ptids = tmpl_obj.read(cr, uid, [tids[0]['parent_id'][0]],['code'])
if not ptids or not ptids[0]['code']:
raise osv.except_osv(_('Error !'), _('Cannot locate parent code for template account!'))
res = acc_obj.search(cr,uid,[('code','=',ptids[0]['code'])])
if res:
return res[0]
else:
return False
if not tids or not tids[0]['parent_id']:
return False
ptids = tmpl_obj.read(cr, uid, [tids[0]['parent_id'][0]],['code'])
if not ptids or not ptids[0]['code']:
raise osv.except_osv(_('Error !'), _('Cannot locate parent code for template account!'))
res = acc_obj.search(cr,uid,[('code','=',ptids[0]['code'])])
if res:
return res[0]
else:
return False
_columns = {
'cparent_id':fields.many2one('account.account', 'Parent target', help="Create an account with the selected template under this existing parent.", required=True),
@@ -1879,33 +1888,33 @@ class account_add_tmpl_wizard(osv.osv_memory):
def action_create(self,cr,uid,ids,context=None):
acc_obj=self.pool.get('account.account')
tmpl_obj=self.pool.get('account.account.template')
data= self.read(cr,uid,ids)
company_id = acc_obj.read(cr,uid,[data[0]['cparent_id']],['company_id'])[0]['company_id'][0]
account_template = tmpl_obj.browse(cr,uid,context['tmpl_ids'])
#tax_ids = []
#for tax in account_template.tax_ids:
# tax_ids.append(tax_template_ref[tax.id])
vals={
'name': account_template.name,
#'sign': account_template.sign,
'currency_id': account_template.currency_id and account_template.currency_id.id or False,
'code': account_template.code,
'type': account_template.type,
'user_type': account_template.user_type and account_template.user_type.id or False,
'reconcile': account_template.reconcile,
'shortcut': account_template.shortcut,
'note': account_template.note,
'parent_id': data[0]['cparent_id'],
# 'tax_ids': [(6,0,tax_ids)], todo!!
'company_id': company_id,
}
# print "Creating:", vals
new_account = acc_obj.create(cr,uid,vals)
return {'type':'state', 'state': 'end' }
tmpl_obj=self.pool.get('account.account.template')
data= self.read(cr,uid,ids)
company_id = acc_obj.read(cr,uid,[data[0]['cparent_id']],['company_id'])[0]['company_id'][0]
account_template = tmpl_obj.browse(cr,uid,context['tmpl_ids'])
#tax_ids = []
#for tax in account_template.tax_ids:
# tax_ids.append(tax_template_ref[tax.id])
vals={
'name': account_template.name,
#'sign': account_template.sign,
'currency_id': account_template.currency_id and account_template.currency_id.id or False,
'code': account_template.code,
'type': account_template.type,
'user_type': account_template.user_type and account_template.user_type.id or False,
'reconcile': account_template.reconcile,
'shortcut': account_template.shortcut,
'note': account_template.note,
'parent_id': data[0]['cparent_id'],
# 'tax_ids': [(6,0,tax_ids)], todo!!
'company_id': company_id,
}
# print "Creating:", vals
new_account = acc_obj.create(cr,uid,vals)
return {'type':'state', 'state': 'end' }
def action_cancel(self,cr,uid,ids,context=None):
return { 'type': 'state', 'state': 'end' }
return { 'type': 'state', 'state': 'end' }
account_add_tmpl_wizard()
addons/account/account_analytic_line.py
+10 -4
View File
@@ -24,6 +24,7 @@ import time
from osv import fields
from osv import osv
from tools.translate import _
import tools
class account_analytic_line(osv.osv):
_name = 'account.analytic.line'
@@ -113,20 +114,24 @@ class timesheet_invoice(osv.osv):
_description = "Analytic account costs and revenues"
_auto = False
_columns = {
'name': fields.date('Month', readonly=True),
'name': fields.char('Year',size=64,required=False, readonly=True),
'account_id':fields.many2one('account.analytic.account', 'Analytic Account', readonly=True, select=True),
'journal_id': fields.many2one('account.analytic.journal', 'Journal', readonly=True),
'quantity': fields.float('Quantities', readonly=True),
'cost': fields.float('Credit', readonly=True),
'revenue': fields.float('Debit', readonly=True)
'revenue': fields.float('Debit', readonly=True),
'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),
}
_order = 'name desc, account_id'
def init(self, cr):
tools.drop_view_if_exists(cr, 'report_hr_timesheet_invoice_journal')
cr.execute("""
create or replace view report_hr_timesheet_invoice_journal as (
select
min(l.id) as id,
date_trunc('month', l.date)::date as name,
to_char(l.date, 'YYYY') as name,
to_char(l.date,'MM') as month,
sum(
CASE WHEN l.amount>0 THEN 0 ELSE l.amount
END
@@ -141,7 +146,8 @@ class timesheet_invoice(osv.osv):
from account_analytic_line l
LEFT OUTER join product_uom u on (u.id=l.product_uom_id)
group by
date_trunc('month', l.date),
to_char(l.date, 'YYYY'),
to_char(l.date,'MM'),
journal_id,
account_id
)""")
addons/account/account_assert_test.xml
+1 -1
View File
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<openerp>
<data>
<assert model="account.move" search="[]" string="For all account moves, the state is valid implies that the sum of credits equals the sum of debits">
<assert model="account.move" search="[]" string="For all Ledger Postings, the state is valid implies that the sum of credits equals the sum of debits">
<test expr="not len(line_id) or line_id[0].state != 'valid' or (sum([l.debit - l.credit for l in line_id]) &lt;= 0.00001)"/>
</assert>
addons/account/account_bank_statement.py
+15 -10
View File
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
##############################################################################
#
#
# OpenERP, Open Source Management Solution
# Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
#
@@ -15,7 +15,7 @@
# GNU Affero General Public License for more details.
#
# You should have received a copy of the GNU Affero General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
##############################################################################
@@ -126,7 +126,9 @@ class account_bank_statement(osv.osv):
'Entry lines', states={'confirm':[('readonly',True)]}),
'state': fields.selection([('draft', 'Draft'),('confirm', 'Confirmed')],
'State', required=True,
states={'confirm': [('readonly', True)]}, readonly="1"),
states={'confirm': [('readonly', True)]}, readonly="1",
help='When new statement is created the state will be \'Draft\'. \
\n* And after getting confirmation from the bank it will be in \'Confirmed\' state.'),
'currency': fields.function(_currency, method=True, string='Currency',
type='many2one', relation='res.currency'),
}
@@ -142,6 +144,7 @@ class account_bank_statement(osv.osv):
}
def button_confirm(self, cr, uid, ids, context=None):
context = context or {}
done = []
res_currency_obj = self.pool.get('res.currency')
res_users_obj = self.pool.get('res.users')
@@ -174,6 +177,8 @@ class account_bank_statement(osv.osv):
# In line we get reconcile_id on bank.ste.rec.
# in bank stat.rec we get line_new_ids on bank.stat.rec.line
for move in st.line_ids:
context.update({'date':move.date})
move_id = account_move_obj.create(cr, uid, {
'journal_id': st.journal_id.id,
'period_id': st.period_id.id,
@@ -211,7 +216,7 @@ class account_bank_statement(osv.osv):
'period_id': st.period_id.id,
'currency_id': st.currency.id,
}
amount = res_currency_obj.compute(cr, uid, st.currency.id,
company_currency_id, move.amount, context=context,
account=acc_cur)
@@ -247,7 +252,7 @@ class account_bank_statement(osv.osv):
'statement_id': st.id,
'journal_id': st.journal_id.id,
'period_id': st.period_id.id,
'analytic_account_id':newline.analytic_id and newline.analytic_id.id or False,
'analytic_account_id':newline.analytic_id and newline.analytic_id.id or False,
}, context=context)
@@ -280,7 +285,7 @@ class account_bank_statement(osv.osv):
context=context):
if line.state <> 'valid':
raise osv.except_osv(_('Error !'),
_('Account move line "%s" is not valid') % line.name)
_('Ledger Posting line "%s" is not valid') % line.name)
if move.reconcile_id and move.reconcile_id.line_ids:
torec += map(lambda x: x.id, move.reconcile_id.line_ids)
@@ -499,7 +504,7 @@ class account_bank_statement_reconcile_line(osv.osv):
'account_id': fields.many2one('account.account', 'Account', required=True),
'line_id': fields.many2one('account.bank.statement.reconcile', 'Reconcile'),
'amount': fields.float('Amount', required=True),
'analytic_id': fields.many2one('account.analytic.account',"Analytic Account")
'analytic_id': fields.many2one('account.analytic.account',"Analytic Account")
}
_defaults = {
'name': lambda *a: 'Write-Off',
@@ -576,7 +581,7 @@ class account_bank_statement_line(osv.osv):
'account_id': fields.many2one('account.account','Account',
required=True),
'statement_id': fields.many2one('account.bank.statement', 'Statement',
select=True, required=True),
select=True, required=True, ondelete='cascade'),
'reconcile_id': fields.many2one('account.bank.statement.reconcile',
'Reconcile', states={'confirm':[('readonly',True)]}),
'move_ids': fields.many2many('account.move',
@@ -586,13 +591,13 @@ class account_bank_statement_line(osv.osv):
'note': fields.text('Notes'),
'reconcile_amount': fields.function(_reconcile_amount,
string='Amount reconciled', method=True, type='float'),
'sequence': fields.integer('Sequence'),
'sequence': fields.integer('Sequence'),
}
_defaults = {
'name': lambda self,cr,uid,context={}: self.pool.get('ir.sequence').get(cr, uid, 'account.bank.statement.line'),
'date': lambda *a: time.strftime('%Y-%m-%d'),
'type': lambda *a: 'general',
'sequence': lambda *a: 10,
'sequence': lambda *a: 10,
}
account_bank_statement_line()
addons/account/account_invoice_view.xml
+26 -270
View File
@@ -52,7 +52,7 @@
<form string="Invoice Line">
<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, {'company_id': parent.company_id})"/>
<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"/>
<field name="quantity" select="1"/>
<field name="price_unit" select="1"/>
@@ -63,6 +63,7 @@
<field domain="[('type','&lt;&gt;','view'), ('company_id', '=', parent.company_id)]" name="account_analytic_id" groups="base.group_user"/>
<newline/>
<field name="price_subtotal"/>
<field name="company_id" groups="base.group_multi_company"/>
<field colspan="4" name="invoice_line_tax_id" context="{'type':parent.type}" domain="[('parent_id','=',False),('company_id', '=', parent.company_id)]"/>
</page>
<page string="Notes">
@@ -117,7 +118,7 @@
<field name="name"/>
<field name="type"/>
<field name="number"/>
<field name="company_id"/>
<field name="company_id" groups="base.group_multi_company"/>
<field name="partner_id" groups="base.group_user"/>
<field name="amount_untaxed" sum="Untaxed amount"/>
<field name="amount_total" sum="Total amount"/>
@@ -155,7 +156,7 @@
<field name="check_total" required="2"/>
<field colspan="4" default_get="{'check_total': check_total, 'invoice_line': invoice_line, 'address_invoice_id': address_invoice_id, 'partner_id': partner_id, 'price_type': 'price_type' in dir() and price_type or False}" name="invoice_line" nolabel="1">
<tree string="Invoice lines" editable="top">
<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, {'company_id': parent.company_id})"/>
<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 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 name="invoice_line_tax_id" view_mode="2" context="{'type':parent.type}" domain="[('parent_id','=',False)]"/>
<field domain="[('type','&lt;&gt;','view'), ('company_id', '=', parent.company_id)]" name="account_analytic_id"/>
@@ -197,7 +198,7 @@
</group>
</page>
<page string="Other Info">
<field name="company_id" on_change="onchange_company_id(company_id,partner_id,type,invoice_line)" widget="selection"/>
<field name="company_id" on_change="onchange_company_id(company_id,partner_id,type,invoice_line)" widget="selection" groups="base.group_multi_company"/>
<field name="fiscal_position" groups="base.group_extended" widget="selection"/>
<newline/>
<field name="payment_term" widget="selection"/>
@@ -288,7 +289,7 @@
</group>
</page>
<page string="Other Info">
<field name="company_id" on_change="onchange_company_id(company_id,partner_id,type,invoice_line)" widget="selection"/>
<field name="company_id" on_change="onchange_company_id(company_id,partner_id,type,invoice_line)" widget="selection" groups="base.group_multi_company"/>
<field name="fiscal_position" groups="base.group_extended,base.group_user" widget="selection"/>
<newline/>
<field name="date_due" select="1"/>
@@ -327,7 +328,7 @@
<search string="Search Invoice">
<group col="10" colspan="4">
<filter icon="terp-account" string="Draft" domain="[('state','=','draft')]" help="Draft Invoices"/>
<filter icon="terp-account" string="Proforma" domain="[('state','=','proforma')]" help="Proforma Invoices"/>
<filter icon="terp-account" string="Proforma" domain="[('state','=','proforma2')]" help="Proforma Invoices"/>
<filter icon="terp-account" string="Unpaid" domain="[('state','in',('open','cancel'))]" help="Unpaid Invoices"/>
<separator orientation="vertical"/>
<field name="number" select='1'/>
@@ -346,7 +347,7 @@
<field name="view_mode">tree,form,calendar,graph</field>
<field name="view_id" ref="invoice_tree"/>
<field name="context">{'type':'out_invoice'}</field>
<field name="search_view_id" ref="view_account_invoice_filter"/>
<field name="search_view_id" ref="view_account_invoice_filter"/>
</record>
<record id="action_invoice_tree_view1" model="ir.actions.act_window.view">
<field eval="1" name="sequence"/>
@@ -369,7 +370,7 @@
<field eval="False" name="view_id"/>
<field name="domain">[('type','=','out_invoice')]</field>
<field name="context">{'type':'out_invoice'}</field>
<field name="search_view_id" ref="view_account_invoice_filter"/>
<field name="search_view_id" ref="view_account_invoice_filter"/>
</record>
<record id="action_invoice_tree1_view1" model="ir.actions.act_window.view">
<field eval="1" name="sequence"/>
@@ -383,16 +384,6 @@
<field name="act_window_id" ref="action_invoice_tree1"/>
</record>
<menuitem action="action_invoice_tree1" id="menu_action_invoice_tree1" parent="account.menu_finance_invoice"/>
<record id="action_invoice_tree1_new" model="ir.actions.act_window">
<field name="name">New Customer Invoice</field>
<field name="res_model">account.invoice</field>
<field name="view_type">form</field>
<field name="view_mode">form,tree,calendar,graph</field>
<field eval="invoice_form" name="view_id"/>
<field name="domain">[('type','=','out_invoice')]</field>
<field name="context">{'type':'out_invoice'}</field>
</record>
<menuitem action="action_invoice_tree1_new" sequence="50" id="menu_action_invoice_tree1_new" parent="menu_action_invoice_tree1"/>
<record id="action_invoice_tree2" model="ir.actions.act_window">
<field name="name">Supplier Invoices</field>
@@ -402,19 +393,9 @@
<field eval="False" name="view_id"/>
<field name="domain">[('type','=','in_invoice')]</field>
<field name="context">{'type':'in_invoice'}</field>
<field name="search_view_id" ref="view_account_invoice_filter"/>
<field name="search_view_id" ref="view_account_invoice_filter"/>
</record>
<menuitem action="action_invoice_tree2" id="menu_action_invoice_tree2" parent="account.menu_finance_invoice"/>
<record id="action_invoice_tree2_new" model="ir.actions.act_window">
<field name="name">New Supplier Invoice</field>
<field name="res_model">account.invoice</field>
<field name="view_type">form</field>
<field name="view_mode">form,tree,calendar,graph</field>
<field eval="invoice_supplier_form" name="view_id"/>
<field name="domain">[('type','=','in_invoice')]</field>
<field name="context">{'type':'in_invoice'}</field>
</record>
<menuitem action="action_invoice_tree2_new" sequence="50" id="menu_action_invoice_tree2_new" parent="menu_action_invoice_tree2"/>
<record id="action_invoice_tree3" model="ir.actions.act_window">
<field name="name">Customer Refunds</field>
@@ -424,21 +405,24 @@
<field eval="False" name="view_id"/>
<field name="domain">[('type','=','out_refund')]</field>
<field name="context">{'type':'out_refund'}</field>
<field name="search_view_id" ref="view_account_invoice_filter"/>
<field name="search_view_id" ref="view_account_invoice_filter"/>
</record>
<record id="action_invoice_tree3_view1" model="ir.actions.act_window.view">
<field eval="1" name="sequence"/>
<field name="view_mode">tree</field>
<field name="act_window_id" ref="action_invoice_tree3"/>
</record>
<record id="action_invoice_tree3_view2" model="ir.actions.act_window.view">
<field eval="2" name="sequence"/>
<field name="view_mode">form</field>
<field name="view_id" ref="invoice_form"/>
<field name="act_window_id" ref="action_invoice_tree3"/>
</record>
<menuitem action="action_invoice_tree3" id="menu_action_invoice_tree3" parent="account.menu_finance_invoice"/>
<record id="action_invoice_tree3_new" model="ir.actions.act_window">
<field name="name">New Customer Refund</field>
<field name="res_model">account.invoice</field>
<field name="view_type">form</field>
<field name="view_mode">form,tree,calendar,graph</field>
<field eval="invoice_form" name="view_id"/>
<field name="domain">[('type','=','out_refund')]</field>
<field name="context">{'type':'out_refund'}</field>
</record>
<menuitem action="action_invoice_tree3_new" sequence="50" id="menu_action_invoice_tree3_new" parent="menu_action_invoice_tree3"/>
<record id="action_invoice_tree4" model="ir.actions.act_window">
<field name="name">Supplier Refunds</field>
<field name="res_model">account.invoice</field>
@@ -447,238 +431,10 @@
<field eval="False" name="view_id"/>
<field name="domain">[('type','=','in_refund')]</field>
<field name="context">{'type':'in_refund'}</field>
<field name="search_view_id" ref="view_account_invoice_filter"/>
<field name="search_view_id" ref="view_account_invoice_filter"/>
</record>
<menuitem action="action_invoice_tree4" id="menu_action_invoice_tree4" parent="account.menu_finance_invoice"/>
<record id="action_invoice_tree4_new" model="ir.actions.act_window">
<field name="name">New Supplier Refund</field>
<field name="res_model">account.invoice</field>
<field name="view_type">form</field>
<field name="view_mode">form,tree,calendar,graph</field>
<field eval="invoice_supplier_form" name="view_id"/>
<field name="domain">[('type','=','in_refund')]</field>
<field name="context">{'type':'in_refund'}</field>
</record>
<menuitem action="action_invoice_tree4_new" sequence="50" id="menu_action_invoice_tree4_new" parent="menu_action_invoice_tree4"/>
<record id="action_invoice_tree5" model="ir.actions.act_window">
<field name="name">Draft Customer Invoices</field>
<field name="res_model">account.invoice</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form,calendar,graph</field>
<field name="domain">[('state','=','draft'),('type','=','out_invoice')]</field>
<field name="context">{'type':'out_invoice'}</field>
<field name="filter" eval="True"/>
<field name="search_view_id" ref="view_account_invoice_filter"/>
</record>
<record id="action_invoice_tree5_view1" model="ir.actions.act_window.view">
<field eval="1" name="sequence"/>
<field name="view_mode">tree</field>
<field name="act_window_id" ref="action_invoice_tree5"/>
</record>
<record id="action_invoice_tree5_view2" model="ir.actions.act_window.view">
<field eval="2" name="sequence"/>
<field name="view_mode">form</field>
<field name="view_id" ref="invoice_form"/>
<field name="act_window_id" ref="action_invoice_tree5"/>
</record>
<menuitem action="action_invoice_tree5" id="menu_invoice_draft" parent="menu_action_invoice_tree1" groups="base.group_extended"/>
<record id="action_invoice_tree6" model="ir.actions.act_window">
<field name="name">PRO-FORMA Customer Invoices</field>
<field name="res_model">account.invoice</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form,calendar,graph</field>
<field name="domain">[('state','=','proforma2'),('type','=','out_invoice')]</field>
<field name="context">{'type':'out_invoice'}</field>
<field name="filter" eval="True"/>
<field name="search_view_id" ref="view_account_invoice_filter"/>
</record>
<record id="action_invoice_tree6_view1" model="ir.actions.act_window.view">
<field eval="1" name="sequence"/>
<field name="view_mode">tree</field>
<field name="act_window_id" ref="action_invoice_tree6"/>
</record>
<record id="action_invoice_tree6_view2" model="ir.actions.act_window.view">
<field eval="2" name="sequence"/>
<field name="view_mode">form</field>
<field name="view_id" ref="invoice_form"/>
<field name="act_window_id" ref="action_invoice_tree6"/>
</record>
<menuitem action="action_invoice_tree6" id="menu_action_invoice_tree6" parent="menu_action_invoice_tree1" groups="base.group_extended"/>
<record id="action_invoice_tree7" model="ir.actions.act_window">
<field name="name">Unpaid Customer Invoices</field>
<field name="res_model">account.invoice</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form,calendar,graph</field>
<field name="domain">[('state','not in',['draft','cancel']),('reconciled','=',False),('type','=','out_invoice')]</field>
<field name="context">{'type':'out_invoice'}</field>
<field name="filter" eval="True"/>
<field name="search_view_id" ref="view_account_invoice_filter"/>
</record>
<record id="action_invoice_tree7_view1" model="ir.actions.act_window.view">
<field eval="1" name="sequence"/>
<field name="view_mode">tree</field>
<field name="act_window_id" ref="action_invoice_tree7"/>
</record>
<record id="action_invoice_tree7_view2" model="ir.actions.act_window.view">
<field eval="2" name="sequence"/>
<field name="view_mode">form</field>
<field name="view_id" ref="invoice_form"/>
<field name="act_window_id" ref="action_invoice_tree7"/>
</record>
<menuitem action="action_invoice_tree7" id="menu_action_invoice_tree7" parent="menu_action_invoice_tree1" groups="base.group_extended"/>
<record id="action_invoice_tree8" model="ir.actions.act_window">
<field name="name">Draft 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>
<field name="domain">[('state','=','draft'),('type','=','in_invoice')]</field>
<field name="context">{'type':'in_invoice'}</field>
<field name="filter" eval="True"/>
<field name="search_view_id" ref="view_account_invoice_filter"/>
</record>
<record id="action_invoice_tree8_view1" model="ir.actions.act_window.view">
<field eval="1" name="sequence"/>
<field name="view_mode">tree</field>
<field name="act_window_id" ref="action_invoice_tree8"/>
</record>
<record id="action_invoice_tree8_view2" model="ir.actions.act_window.view">
<field eval="2" name="sequence"/>
<field name="view_mode">form</field>
<field name="view_id" ref="invoice_supplier_form"/>
<field name="act_window_id" ref="action_invoice_tree8"/>
</record>
<menuitem action="action_invoice_tree8" id="menu_action_invoice_tree8" parent="menu_action_invoice_tree2" groups="base.group_extended"/>
<record id="action_invoice_tree9" model="ir.actions.act_window">
<field name="name">Unpaid 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>
<field name="domain">[('state','not in',['draft','cancel']),('reconciled','=',False),('type','=','in_invoice')]</field>
<field name="context">{'type':'in_invoice'}</field>
<field name="filter" eval="True"/>
<field name="search_view_id" ref="view_account_invoice_filter"/>
</record>
<record id="action_invoice_tree9_view1" model="ir.actions.act_window.view">
<field eval="1" name="sequence"/>
<field name="view_mode">tree</field>
<field name="act_window_id" ref="action_invoice_tree9"/>
</record>
<record id="action_invoice_tree9_view2" model="ir.actions.act_window.view">
<field eval="2" name="sequence"/>
<field name="view_mode">form</field>
<field name="view_id" ref="invoice_supplier_form"/>
<field name="act_window_id" ref="action_invoice_tree9"/>
</record>
<menuitem action="action_invoice_tree9" id="menu_action_invoice_tree9" parent="menu_action_invoice_tree2" groups="base.group_extended"/>
<record id="action_invoice_tree10" model="ir.actions.act_window">
<field name="name">Draft Customer Refunds</field>
<field name="res_model">account.invoice</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form,calendar,graph</field>
<field name="domain">[('state','=','draft'),('type','=','out_refund')]</field>
<field name="context">{'type':'out_refund'}</field>
<field name="filter" eval="True"/>
<field name="search_view_id" ref="view_account_invoice_filter"/>
</record>
<record id="action_invoice_tree10_view1" model="ir.actions.act_window.view">
<field eval="1" name="sequence"/>
<field name="view_mode">tree</field>
<field name="act_window_id" ref="action_invoice_tree10"/>
</record>
<record id="action_invoice_tree10_view2" model="ir.actions.act_window.view">
<field eval="2" name="sequence"/>
<field name="view_mode">form</field>
<field name="view_id" ref="invoice_form"/>
<field name="act_window_id" ref="action_invoice_tree10"/>
</record>
<menuitem action="action_invoice_tree10" id="menu_action_invoice_tree10" parent="menu_action_invoice_tree3" groups="base.group_extended"/>
<record id="action_invoice_tree11" model="ir.actions.act_window">
<field name="name">Unpaid Customer Refunds</field>
<field name="res_model">account.invoice</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form,calendar,graph</field>
<field name="domain">[('state','not in',['draft','cancel']),('reconciled','=',False),('type','=','out_refund')]</field>
<field name="context">{'type':'out_refund'}</field>
<field name="filter" eval="True"/>
<field name="search_view_id" ref="view_account_invoice_filter"/>
</record>
<record id="action_invoice_tree11_view1" model="ir.actions.act_window.view">
<field eval="1" name="sequence"/>
<field name="view_mode">tree</field>
<field name="act_window_id" ref="action_invoice_tree11"/>
</record>
<record id="action_invoice_tree11_view2" model="ir.actions.act_window.view">
<field eval="2" name="sequence"/>
<field name="view_mode">form</field>
<field name="view_id" ref="invoice_form"/>
<field name="act_window_id" ref="action_invoice_tree11"/>
</record>
<menuitem action="action_invoice_tree11" id="menu_action_invoice_tree11" parent="menu_action_invoice_tree3" groups="base.group_extended"/>
<record id="action_invoice_tree12" model="ir.actions.act_window">
<field name="name">Draft 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>
<field name="domain">[('state','=','draft'),('type','=','in_refund')]</field>
<field name="context">{'type':'in_refund'}</field>
<field name="filter" eval="True"/>
<field name="search_view_id" ref="view_account_invoice_filter"/>
</record>
<record id="action_invoice_tree12_view1" model="ir.actions.act_window.view">
<field eval="1" name="sequence"/>
<field name="view_mode">tree</field>
<field name="act_window_id" ref="action_invoice_tree12"/>
</record>
<record id="action_invoice_tree12_view2" model="ir.actions.act_window.view">
<field eval="2" name="sequence"/>
<field name="view_mode">form</field>
<field name="view_id" ref="invoice_supplier_form"/>
<field name="act_window_id" ref="action_invoice_tree12"/>
</record>
<menuitem action="action_invoice_tree12" id="menu_action_invoice_tree12" parent="menu_action_invoice_tree4" groups="base.group_extended"/>
<record id="action_invoice_tree13" model="ir.actions.act_window">
<field name="name">Unpaid 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>
<field name="domain">[('state','not in',['draft','cancel']),('reconciled','=',False),('type','=','in_refund')]</field>
<field name="context">{'type':'in_refund'}</field>
<field name="filter" eval="True"/>
<field name="search_view_id" ref="view_account_invoice_filter"/>
</record>
<record id="action_invoice_tree13_view1" model="ir.actions.act_window.view">
<field eval="1" name="sequence"/>
<field name="view_mode">tree</field>
<field name="act_window_id" ref="action_invoice_tree13"/>
</record>
<record id="action_invoice_tree13_view2" model="ir.actions.act_window.view">
<field eval="2" name="sequence"/>
<field name="view_mode">form</field>
<field name="view_id" ref="invoice_supplier_form"/>
<field name="act_window_id" ref="action_invoice_tree13"/>
</record>
<menuitem action="action_invoice_tree13" id="menu_action_invoice_tree13" parent="menu_action_invoice_tree4" groups="base.group_extended"/>
<act_window domain="[('partner_id','=',active_id)]" id="act_res_partner_2_account_invoice_opened" name="Invoices" res_model="account.invoice" src_model="res.partner"/>
<act_window domain="[('journal_id','=',active_id),('state','!=','draft'),('reconciled','=',False)]" id="act_account_journal_2_account_invoice_opened" name="Unpaid invoices" res_model="account.invoice" src_model="account.journal"/>
addons/account/account_menuitem.xml
+1 -1
View File
@@ -12,7 +12,7 @@
<menuitem id="menu_finance_legal_statement" name="Legal Statements" parent="account.menu_finance" sequence="8"/>
<menuitem id="menu_generic_report" name="Generic Reports" parent="account.menu_finance_legal_statement" sequence="8"/>
<menuitem id="menu_finance_entries" name="Entries Encoding" parent="account.menu_finance" sequence="2"
<menuitem id="menu_finance_entries" name="Making Entries" parent="account.menu_finance" sequence="2"
groups="group_account_user"/>
<menuitem id="account.menu_finance_recurrent_entries" name="Recurrent Entries" parent="account.menu_finance_entries" sequence="15"/>
addons/account/account_move_line.py
+15 -13
View File
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
##############################################################################
#
#
# OpenERP, Open Source Management Solution
# Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
#
@@ -15,7 +15,7 @@
# GNU Affero General Public License for more details.
#
# You should have received a copy of the GNU Affero General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
##############################################################################
@@ -46,12 +46,12 @@ class account_move_line(osv.osv):
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 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('periods', False):
ids = ','.join([str(x) for x in context['periods']])
return 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)
@@ -103,9 +103,10 @@ class account_move_line(osv.osv):
total_new=0.00
for i in context['lines']:
total_new +=(i[2]['debit'] or 0.00)- (i[2]['credit'] or 0.00)
for item in i[2]:
data[item]=i[2][item]
if i[2]:
total_new +=(i[2]['debit'] or 0.00)- (i[2]['credit'] or 0.00)
for item in i[2]:
data[item]=i[2][item]
if context['journal']:
journal_obj=self.pool.get('account.journal').browse(cr,uid,context['journal'])
if journal_obj.type == 'purchase':
@@ -292,7 +293,7 @@ class account_move_line(osv.osv):
if not len(res):
return [('id', '=', '0')]
return [('id', 'in', [x[0] for x in res])]
def _invoice_search(self, cursor, user, obj, name, args):
if not len(args):
return []
@@ -377,7 +378,8 @@ class account_move_line(osv.osv):
'analytic_lines': fields.one2many('account.analytic.line', 'move_id', 'Analytic lines'),
'centralisation': fields.selection([('normal','Normal'),('credit','Credit Centralisation'),('debit','Debit Centralisation')], 'Centralisation', size=6),
'balance': fields.function(_balance, fnct_search=_balance_search, method=True, string='Balance'),
'state': fields.selection([('draft','Draft'), ('valid','Valid')], 'Status', readonly=True),
'state': fields.selection([('draft','Draft'), ('valid','Valid')], 'State', readonly=True,
help='When new move line is created the state will be \'Draft\'.\n* When all the payments are done it will be in \'Valid\' state.'),
'tax_code_id': fields.many2one('account.tax.code', 'Tax Account', help="The Account can either be a base tax code or tax code account."),
'tax_amount': fields.float('Tax/Base Amount', digits=(16,int(tools.config['price_accuracy'])), select=True, help="If the Tax account is tax code account, this field will contain the taxed amount.If the tax account is base tax code,\
this field will contain the basic amount(without tax)."),
@@ -387,7 +389,7 @@ class account_move_line(osv.osv):
'analytic_account_id' : fields.many2one('account.analytic.account', 'Analytic Account'),
#TODO: remove this
'amount_taxed':fields.float("Taxed Amount",digits=(16,int(tools.config['price_accuracy']))),
'company_id': fields.related('move_id','company_id',type='many2one',object='res.company',string='Company')
'company_id': fields.related('account_id','company_id',type='many2one',relation='res.company',string='Company',store=True)
}
@@ -552,7 +554,7 @@ class account_move_line(osv.osv):
def reconcile(self, cr, uid, ids, type='auto', writeoff_acc_id=False, writeoff_period_id=False, writeoff_journal_id=False, context={}):
id_set = ','.join(map(str, ids))
lines = self.browse(cr, uid, ids, context=context)
unrec_lines = filter(lambda x: not x['reconcile_id'], lines)
credit = debit = 0.0
@@ -828,7 +830,7 @@ class account_move_line(osv.osv):
if res:
if res[1] != 'draft':
raise osv.except_osv(_('UserError'),
_('The account move (%s) for centralisation ' \
_('The Ledger Posting (%s) for centralisation ' \
'has been confirmed!') % res[2])
vals['move_id'] = res[0]
addons/account/account_view.xml
+53 -56
View File
@@ -16,7 +16,7 @@
<field name="code" select="1"/>
<field name="date_start"/>
<field name="date_stop"/>
<field name="company_id"/>
<field name="company_id" groups="base.group_multi_company"/>
<field name="end_journal_period_id"/>
<separator colspan="4" string="Periods"/>
<field colspan="4" name="period_ids" nolabel="1" widget="one2many_list">
@@ -75,7 +75,7 @@
<field name="code" select="1"/>
<field name="date_start"/>
<field name="date_stop"/>
<field name="company_id"/>
<field name="company_id" groups="base.group_multi_company"/>
<field name="fiscalyear_id"/>
<field name="special"/>
<separator colspan="4" string="States"/>
@@ -122,7 +122,7 @@
<field name="name" select="1" colspan="4"/>
<field name="code" select="1"/>
<field name="parent_id"/>
<field name="company_id" select="2" widget="selection"/>
<field name="company_id" select="2" widget="selection" groups="base.group_multi_company"/>
<field name="user_type" select="1"/>
</group>
<notebook colspan="4">
@@ -168,7 +168,7 @@
<field name="debit"/>
<field name="credit"/>
<field name="balance"/>
<field name="company_id" />
<field name="company_id" groups="base.group_multi_company"/>
<field name="company_currency_id"/>
<field name="type" invisible="1"/>
</tree>
@@ -242,7 +242,7 @@
<tree string="Account Journal">
<field name="code"/>
<field name="name"/>
<field name="company_id"/>
<field name="company_id" groups="base.group_multi_company"/>
</tree>
</field>
</record>
@@ -270,7 +270,7 @@
<field name="default_debit_account_id" attrs="{'required':[('type','=','cash')]}" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]"/>
<field name="default_credit_account_id" attrs="{'required':[('type','=','cash')]}" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]"/>
<field name="user_id" groups="base.group_extended"/>
<field name="company_id"/>
<field name="company_id" groups="base.group_multi_company"/>
<newline/>
<field name="centralisation"/>
<field name="group_invoice_lines"/>
@@ -336,11 +336,10 @@
<page string="Entry encoding">
<field colspan="4" name="line_ids" nolabel="1">
<tree editable="bottom" string="Statement lines">
<field name="sequence"/>
<field name="sequence"/>
<field name="date"/>
<field name="ref"/>
<field name="name"/>
<field name="account_id"/>
<field name="type"/>
<field name="partner_id" on_change="onchange_partner_id(partner_id, type, parent.currency)"/>
<field domain="[('journal_id','=',parent.journal_id)]" name="account_id"/>
@@ -351,14 +350,13 @@
<form string="Statement lines">
<field name="date"/>
<field name="name"/>
<field name="account_id"/>
<field name="type"/>
<field name="partner_id" on_change="onchange_partner_id(partner_id, type, parent.currency)"/>
<field domain="[('journal_id', '=', parent.journal_id), ('type', '&lt;&gt;', 'view')]" name="account_id"/>
<field name="amount"/>
<field context="{'partner_id':partner_id,'amount':amount,'account_id':account_id,'currency_id': parent.currency,'journal_id':parent.journal_id, 'date':date}" name="reconcile_id"/>
<field name="ref"/>
<field name="sequence"/>
<field name="sequence"/>
<separator colspan="4" string="Notes"/>
<field colspan="4" name="note" nolabel="1"/>
</form>
@@ -392,9 +390,8 @@
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
<field name="domain">[('state','=','draft')]</field>
<field name="filter" eval="True"/>
<field name="filter" eval="True"/>
</record>
<menuitem action="action_bank_statement_draft_tree" id="menu_bank_statement_draft_tree" parent="account.menu_bank_statement_tree" groups="base.group_extended"/>
<record id="action_bank_statement_tree2" model="ir.actions.act_window">
<field name="name">New Statement</field>
@@ -402,7 +399,6 @@
<field name="view_type">form</field>
<field name="view_mode">form,tree</field>
</record>
<menuitem action="action_bank_statement_tree2" id="menu_bank_statement_tree2" parent="menu_bank_statement_tree"/>
<record id="view_bank_statement_reconcile" model="ir.ui.view">
<field name="name">account.bank.statement.reconcile.form</field>
@@ -460,7 +456,6 @@
<field name="code" select="1"/>
<field name="sequence"/>
<field name="sign"/>
<field name="close_method"/>
<field name="partner_account"/>
</form>
@@ -540,7 +535,7 @@
<form string="Account Tax Code">
<field name="name" select="1"/>
<field name="code" select="1"/>
<field name="company_id" widget="selection"/>
<field name="company_id" widget="selection" groups="base.group_multi_company"/>
<field name="notprintable"/>
<field name="parent_id" select="1"/>
<field name="sign"/>
@@ -587,7 +582,7 @@
<form string="Account Tax">
<group colspan="4" col="6">
<field name="name" select="1"/>
<field name="company_id" widget="selection"/>
<field name="company_id" widget="selection" groups="base.group_multi_company"/>
<field name="description" select="1"/>
<field name="active" select="2"/>
<field name="tax_group" select="1"/>
@@ -659,7 +654,7 @@
<field eval="True" name="object"/>
</record>
<wizard id="action_move_journal_line_form" menu="False" model="account.move.line" name="account.move.journal" string="Entries Encoding by Line"/>
<wizard id="action_move_journal_line_form" menu="False" model="account.move.line" name="account.move.journal" string="Making Entries by Line"/>
<menuitem icon="STOCK_JUSTIFY_FILL" action="action_move_journal_line_form" id="menu_action_move_journal_line_form" parent="account.menu_finance_entries" type="wizard" sequence="5"/>
<!--
@@ -714,8 +709,8 @@
<field name="debit" select="2"/>
<field name="credit" select="2"/>
<field name="company_id" required="1"/>
<field name="company_id" required="1" groups="base.group_multi_company"/>
<separator colspan="4" string="Optional Information"/>
<field name="currency_id"/>
<field name="amount_currency"/>
@@ -801,16 +796,16 @@
<field name="model">account.move.line</field>
<field name="type">search</field>
<field name="arch" type="xml">
<search string="Search Move Lines">
<group col='10' colspan='4'>
<filter icon="terp-account" string="Draft" domain="[('state','=','draft')]" help="Draft Move Lines"/>
<search string="Search Entry Lines">
<group col='10' colspan='4'>
<filter icon="terp-account" string="Draft" domain="[('state','=','draft')]" help="Draft Move Lines"/>
<filter icon="terp-account" string="Posted" domain="[('state','=','valid')]" help="Posted Move Lines"/>
<separator orientation="vertical"/>
<field name="date" select='1'/>
<field name="account_id" select='1'/>
<field name="partner_id" select='1'/>
<field name="balance" string="Debit/Credit" select='1'/>
</group>
<separator orientation="vertical"/>
<field name="date" select='1'/>
<field name="account_id" select='1'/>
<field name="partner_id" select='1'/>
<field name="balance" string="Debit/Credit" select='1'/>
</group>
</search>
</field>
</record>
@@ -821,9 +816,9 @@
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
<field name="view_id" ref="view_move_line_tree"/>
<field name="search_view_id" ref="view_account_move_line_filter"/>
<field name="search_view_id" ref="view_account_move_line_filter"/>
</record>
<record id="action_view_move_line" model="ir.actions.act_window">
<field name="name">Lines to reconcile</field>
<field name="res_model">account.move.line</field>
@@ -832,7 +827,7 @@
<field name="domain">[('account_id.reconcile', '=', True),('reconcile_id','=',False)]</field>
<field eval="False" name="view_id"/>
<field eval="True" name="filter"/>
<field name="search_view_id" ref="view_account_move_line_filter"/>
<field name="search_view_id" ref="view_account_move_line_filter"/>
</record>
<!--
@@ -869,7 +864,7 @@
<field name="name" select="1" readonly="True"/>
<field name="period_id" select="2"/>
<field name="journal_id" select="1"/>
<field name="company_id" required="1"/>
<field name="company_id" required="1" groups="base.group_multi_company"/>
<field name="date" select="1"/>
<field name="ref" select="1"/>
<field name="to_check" select="2"/>
@@ -887,8 +882,8 @@
<field name="debit" select="1"/>
<field name="credit" select="1"/>
<field name="date" select="1"/>
<field name="date" select="1"/>
<separator colspan="4" string="Optional Information"/>
<field name="currency_id"/>
<field name="amount_currency"/>
@@ -933,21 +928,21 @@
</field>
</record>
<record id="view_account_move_filter" model="ir.ui.view">
<record id="view_account_move_filter" model="ir.ui.view">
<field name="name">account.move.select</field>
<field name="model">account.move</field>
<field name="type">search</field>
<field name="arch" type="xml">
<search string="Search Move">
<group col='8' colspan='4'>
<filter icon="terp-account" string="Draft" domain="[('state','=','draft')]" help="Draft Move Lines"/>
<group col='8' colspan='4'>
<filter icon="terp-account" string="Draft" domain="[('state','=','draft')]" help="Draft Move Lines"/>
<filter icon="terp-account" string="Posted" domain="[('state','=','posted')]" help="Posted Move Lines"/>
<separator orientation="vertical"/>
<field name="date" select='1'/>
<field name="name" select='1'/>
<field name="journal_id" select='1'/>
<field name="partner_id" select='1'/>
</group>
<separator orientation="vertical"/>
<field name="date" select='1'/>
<field name="name" select='1'/>
<field name="journal_id" select='1'/>
<field name="partner_id" select='1'/>
</group>
</search>
</field>
</record>
@@ -964,12 +959,12 @@
<menuitem action="action_move_line_form" id="menu_action_move_line_form" parent="next_id_29"/>
<record id="action_move_line_form_encode_by_move" model="ir.actions.act_window">
<field name="name">Entries Encoding by Move</field>
<field name="name">Making Entries by Move</field>
<field name="res_model">account.move</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
<field name="view_id" ref="view_move_tree"/>
<field name="search_view_id" ref="view_account_move_filter"/>
<field name="search_view_id" ref="view_account_move_filter"/>
</record>
<menuitem action="action_move_line_form_encode_by_move" id="menu_encode_entries_by_move" parent="menu_finance_entries"/>
@@ -1094,7 +1089,7 @@
<!--
TODO:
Print Journal (and change state)
Close Journal (and verify that there is no draft move lines)
Close Journal (and verify that there is no draft Entry Lines)
-->
<record id="view_journal_period_tree" model="ir.ui.view">
@@ -1107,7 +1102,7 @@
<field name="period_id"/>
<field name="journal_id"/>
<field name="state"/>
<field name="company_id"/>
<field name="company_id" groups="base.group_multi_company"/>
</tree>
</field>
</record>
@@ -1348,9 +1343,8 @@
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
<field name="domain">[('state','=','running')]</field>
<field name="filter" eval="True"/>
<field name="filter" eval="True"/>
</record>
<menuitem action="action_subscription_form_running" id="menu_action_subscription_form_running" parent="menu_action_subscription_form" groups="base.group_extended"/>
<record id="action_subscription_form_new" model="ir.actions.act_window">
<field name="name">New Subscription</field>
@@ -1359,7 +1353,6 @@
<field name="view_mode">form,tree</field>
<field name="view_id" ref="view_subscription_form"/>
</record>
<menuitem action="action_subscription_form_new" id="menu_action_subscription_form_new" parent="menu_action_subscription_form"/>
<record id="view_subscription_line_form_complete" model="ir.ui.view">
<field name="name">account.subscription.line.form</field>
@@ -1418,7 +1411,7 @@
</record>
<record id="action_tax_code_line_open" model="ir.actions.act_window">
<field name="name">account.move.line</field>
<field name="name">Account Entry Lines</field>
<field name="res_model">account.move.line</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
@@ -1518,7 +1511,11 @@
<!-- Account Templates -->
<menuitem id="account_template_folder" name="Templates" parent="account.menu_finance_accounting"/>
<menuitem
id="account_template_folder"
name="Templates"
parent="account.menu_finance_accounting"
groups="base.group_multi_company"/>
<record id="view_account_template_form" model="ir.ui.view">
@@ -1739,7 +1736,7 @@
<form string="Generate Chart of Accounts from a Chart Template">
<separator col="4" colspan="4" string="Generate Chart of Accounts from a Chart Template"/>
<label align="0.0" string="This will automatically configure your chart of accounts, bank accounts, taxes and journals according to the selected template" colspan="4"/>
<field name="company_id" widget="selection"/>
<field name="company_id" widget="selection" groups="base.group_multi_company"/>
<field name ="code_digits" />
<field name="chart_template_id"/>
<field name ="seq_journal" />
@@ -1784,11 +1781,11 @@
<field name="balance" operator="+"/>
</graph>
</field>
</record>
</record>
<!-- Fiscal Position Templates -->
<!-- Fiscal Position Templates -->
<record id="view_account_position_template_form" model="ir.ui.view">
<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>
addons/account/account_wizard.xml
+4 -3
View File
@@ -85,10 +85,10 @@
<!-- account.move validate -->
<wizard id="wizard_validate_account_moves" menu="False" model="account.move" name="account.move.validate" string="Validate Account Moves"/>
<wizard id="wizard_validate_account_moves" menu="False" model="account.move" name="account.move.validate" string="Validate Ledger Postings"/>
<menuitem action="wizard_validate_account_moves" id="menu_validate_account_moves" parent="account.menu_finance_periodical_processing" type="wizard"/>
<wizard id="wizard_validate_account_moves_line" menu="True" model="account.move.line" name="account.move_line.validate" string="Validate Account Moves"/>
<wizard id="wizard_validate_account_moves_line" menu="True" model="account.move.line" name="account.move_line.validate" string="Validate Ledger Postings"/>
<!-- Use Models -->
<wizard string="Create Entries From Models" model="account.model" name="account_use_models" menu="False" id="wizard_account_use_model"/>
@@ -114,6 +114,7 @@
<wizard id="wizard_general_journal" menu="False" model="account.journal.period" name="account.general.journal.report" string="Print General Journal" />
<menuitem icon="STOCK_PRINT" action="wizard_general_journal" id="menu_general_journal" parent="account.menu_generic_report" type="wizard" />
<wizard id="wizard_invoice_currency_change" model="account.invoice" name="account.invoice.currency_change" string="Change Currency" groups="base.group_user"/>
</data>
</openerp>
addons/account/company_view.xml
+32 -32
View File
@@ -1,40 +1,40 @@
<?xml version="1.0" encoding="utf-8"?>
<openerp>
<data>
<record model="ir.ui.view" id="view_company_inherit_form">
<field name="name">res.company.form.inherit</field>
<field name="inherit_id" ref="base.view_company_form"/>
<field name="model">res.company</field>
<field name="type">form</field>
<field name="arch" type="xml">
<notebook>
<data>
<record model="ir.ui.view" id="view_company_inherit_form">
<field name="name">res.company.form.inherit</field>
<field name="inherit_id" ref="base.view_company_form"/>
<field name="model">res.company</field>
<field name="type">form</field>
<field name="arch" type="xml">
<notebook>
<page string="Overdue Payments" position="inside">
<separator string="Overdue Payments Message" colspan="4"/>
<field name="overdue_msg" nolabel="1" colspan ="4"/>
<separator string="Overdue Payments Message" colspan="4"/>
<field name="overdue_msg" nolabel="1" colspan ="4"/>
</page>
</notebook>
</field>
</record>
<!-- Wizard for Configuration of Overdue Payments -->
<record model="ir.ui.view" id="wizard_company_setup_form">
<field name="name">wizard.company.setup.form</field>
<field name="model">wizard.company.setup</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Overdue Payment Report Message">
<field name="company_id" select="1" on_change="onchange_company_id(company_id)"/>
<field name="partner_id" select="1" readonly="1"/>
<separator string="Message" colspan="4"/>
<field name="overdue_msg" nolabel="1" colspan="4"/>
<group col="2" colspan="4">
<button icon="gtk-cancel" special="cancel" type="object" name="action_cancel" string="Cancel"/>
<button icon="gtk-ok" name="action_create" string="Create" type="object"/>
</group>
</form>
</field>
</record>
</record>
<!-- Wizard for Configuration of Overdue Payments -->
<record model="ir.ui.view" id="wizard_company_setup_form">
<field name="name">wizard.company.setup.form</field>
<field name="model">wizard.company.setup</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Overdue Payment Report Message">
<field name="company_id" select="1" on_change="onchange_company_id(company_id)" groups="base.group_multi_company"/>
<field name="partner_id" select="1" readonly="1"/>
<separator string="Message" colspan="4"/>
<field name="overdue_msg" nolabel="1" colspan="4"/>
<group col="2" colspan="4">
<button icon="gtk-cancel" special="cancel" type="object" name="action_cancel" string="Cancel"/>
<button icon="gtk-ok" name="action_create" string="Create" type="object"/>
</group>
</form>
</field>
</record>
<record id="action_wizard_company_setup_form" model="ir.actions.act_window">
<field name="name">Overdue Payment Report Message</field>
@@ -52,5 +52,5 @@
<field name="note">Specify The Message for the Overdue Payment Report.</field>
<field name="action_id" ref="action_wizard_company_setup_form"/>
</record>
</data>
</data>
</openerp>
addons/account/i18n/ar.po
+1 -1
View File
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2009-11-17 04:58+0000\n"
"X-Launchpad-Export-Date: 2009-12-16 05:10+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account
addons/account/i18n/bg.po
+35 -21
View File
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 5.0.0\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
"PO-Revision-Date: 2009-11-17 10:13+0000\n"
"Last-Translator: Boris <boris.ivanov@obseg.com>\n"
"PO-Revision-Date: 2009-12-14 23:34+0000\n"
"Last-Translator: Antoan Georgiev <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: 2009-11-18 04:36+0000\n"
"X-Launchpad-Export-Date: 2009-12-16 05:10+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account
@@ -24,7 +24,7 @@ msgstr "Вътрешно име"
#. module: account
#: view:account.tax.code:0
msgid "Account Tax Code"
msgstr "Код на сметка за данъци"
msgstr "Код на данъчна сметка"
#. module: account
#: model:ir.actions.act_window,name:account.action_invoice_tree9
@@ -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
@@ -73,11 +73,13 @@ 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
@@ -87,7 +89,7 @@ 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
@@ -99,18 +101,18 @@ 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
@@ -120,7 +122,7 @@ msgstr ""
#. module: account
#: field:account.invoice,residual:0
msgid "Residual"
msgstr ""
msgstr "Остатък"
#. module: account
#: field:account.tax,base_sign:0
@@ -128,18 +130,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
@@ -168,16 +170,19 @@ 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
msgid "Charts of Account"
msgstr ""
msgstr "Графики на сметка"
#. module: account
#: model:ir.actions.wizard,name:account.wizard_move_line_select
@@ -222,7 +227,7 @@ 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
@@ -257,7 +262,7 @@ msgstr ""
#. module: account
#: rml:account.tax.code.entries:0
msgid "Accounting Entries-"
msgstr ""
msgstr "Счетоводни записи-"
#. module: account
#: help:account.journal,view_id:0
@@ -267,6 +272,10 @@ msgid ""
"in which order. You can create your own view for a faster encoding in each "
"journal."
msgstr ""
"Дава изглед използван за запис или разглеждане на записи от този дневник. "
"Изгледа задава на Open ERP кои полета ще бъдат видими, задължителни или само "
"за четене и в какъв ред. Може да създадете собствен изглед за по-бързо "
"набиране във всеки дневник."
#. module: account
#: help:account.invoice,date_due:0
@@ -277,6 +286,11 @@ msgid ""
"date empty, it means direct payment. The payment term may compute several "
"due dates, for example 50% now, 50% in one month."
msgstr ""
"Ако използвате условия за разплащане, датата за плащане ще се изчисли "
"автоматично при създаване на записите на сметката. Ако запазите условията за "
"плащане и датата на плащане празна, това означава директно плащане(веднага). "
"Условията за плащане може да изчислят няколко дати(частични плащания), "
"например 50% сега и 50% след месец."
#. module: account
#: selection:account.tax,type:0
@@ -310,7 +324,7 @@ msgstr "Произход"
#. module: account
#: rml:account.analytic.account.journal:0
msgid "Move Name"
msgstr ""
msgstr "Смяна на име"
#. module: account
#: xsl:account.transfer:0
@@ -325,7 +339,7 @@ msgstr "Пресмятане на абонамент"
#. module: account
#: rml:account.central.journal:0
msgid "Account Num."
msgstr ""
msgstr "Номер на сметка"
#. module: account
#: rml:account.analytic.account.analytic.check:0
addons/account/i18n/bs.po
+1 -1
View File
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2009-11-17 04:58+0000\n"
"X-Launchpad-Export-Date: 2009-12-16 05:10+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account
addons/account/i18n/ca.po
+12 -11
View File
@@ -7,13 +7,14 @@ msgstr ""
"Project-Id-Version: OpenERP Server 5.0.0\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
"PO-Revision-Date: 2009-11-17 10:12+0000\n"
"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
"PO-Revision-Date: 2009-11-30 01:35+0000\n"
"Last-Translator: Jordi Esteve - http://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: 2009-11-18 04:36+0000\n"
"X-Launchpad-Export-Date: 2009-12-16 05:10+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account
@@ -24,7 +25,7 @@ msgstr "Nom intern"
#. module: account
#: view:account.tax.code:0
msgid "Account Tax Code"
msgstr "Codi compte impostos"
msgstr "Codi impost comptable"
#. module: account
#: model:ir.actions.act_window,name:account.action_invoice_tree9
@@ -415,7 +416,7 @@ msgstr "Conciliació del pagament"
#. module: account
#: model:account.journal,name:account.expenses_journal
msgid "Journal de frais"
msgstr ""
msgstr "Diari de despeses"
#. module: account
#: model:ir.actions.act_window,name:account.act_acc_analytic_acc_5_report_hr_timesheet_invoice_journal
@@ -1169,7 +1170,7 @@ msgstr "wizard.multi.charts.accounts"
#. module: account
#: model:account.journal,name:account.sales_journal
msgid "Journal de vente"
msgstr ""
msgstr "Diari de vendes"
#. module: account
#: help:account.model.line,amount_currency:0
@@ -1596,7 +1597,7 @@ msgstr "Obre per la conciliació"
#. module: account
#: model:account.journal,name:account.bilan_journal
msgid "Journal d'ouverture"
msgstr ""
msgstr "Diari d'obertura"
#. module: account
#: selection:account.tax,tax_group:0
@@ -1934,7 +1935,7 @@ msgstr "Paga factura"
#. module: account
#: constraint:account.invoice:0
msgid "Error: Invalid Bvr Number (wrong checksum)."
msgstr ""
msgstr "Error: Número BVR no vàlid (checksum erroni)."
#. module: account
#: model:ir.actions.act_window,name:account.action_invoice_tree5
@@ -2394,7 +2395,7 @@ msgstr "Plantilla del pla comptable"
#. module: account
#: model:account.journal,name:account.refund_sales_journal
msgid "Journal d'extourne"
msgstr ""
msgstr "Diari d'inversió"
#. module: account
#: rml:account.journal.period.print:0
@@ -3228,7 +3229,7 @@ msgstr "Compte"
#. module: account
#: model:account.journal,name:account.bank_journal
msgid "Journal de Banque CHF"
msgstr ""
msgstr "Diari de banc"
#. module: account
#: selection:account.account.balance.report,checktype,state:0
@@ -3361,7 +3362,7 @@ msgstr "Codi impost arrel"
#. module: account
#: constraint:account.invoice:0
msgid "Error: BVR reference is required."
msgstr ""
msgstr "Error: La referència BVR és necessària."
#. module: account
#: field:account.tax.code,notprintable:0
addons/account/i18n/cs.po
+1 -1
View File
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2009-11-19 04:35+0000\n"
"X-Launchpad-Export-Date: 2009-12-16 05:10+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account
addons/account/i18n/da.po
+1 -1
View File
@@ -14,7 +14,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2009-11-18 04:36+0000\n"
"X-Launchpad-Export-Date: 2009-12-16 05:11+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account
addons/account/i18n/de.po
+2 -2
View File
@@ -8,12 +8,12 @@ msgstr ""
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
"PO-Revision-Date: 2009-11-20 14:43+0000\n"
"Last-Translator: Henning Eggers <Unknown>\n"
"Last-Translator: Henning Eggers <henning.eggers@canonical.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: 2009-11-21 04:45+0000\n"
"X-Launchpad-Export-Date: 2009-12-16 05:11+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account
addons/account/i18n/el.po
+291 -237
View File
File diff suppressed because it is too large Load Diff
addons/account/i18n/es.po
+134 -68
View File
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 5.0.0\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
"PO-Revision-Date: 2009-11-17 10:10+0000\n"
"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
"PO-Revision-Date: 2009-12-15 07:12+0000\n"
"Last-Translator: Daniel Brown <dbrown@tecnosconsultores.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: 2009-11-18 04:37+0000\n"
"X-Launchpad-Export-Date: 2009-12-16 05:12+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account
@@ -40,7 +40,7 @@ msgstr "Codificación asientos"
#. 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 "Especificar el mensaje para el reporte de pagos vencidos"
#. module: account
#: model:process.transition,name:account.process_transition_confirmstatementfromdraft0
@@ -55,7 +55,7 @@ msgstr "Activo"
#. module: account
#: constraint:ir.actions.act_window:0
msgid "Invalid model name in the action definition."
msgstr "Nombre de modelo no válido en la definición de acción."
msgstr "Nombre de modelo inválido en la definición de acción."
#. module: account
#: help:account.journal,currency:0
@@ -73,6 +73,8 @@ msgid ""
"This account will be used to value incoming stock for the current product "
"category"
msgstr ""
"Esta cuenta se utilizará para valuar el stock entrante para la categoría "
"actual de producto"
#. module: account
#: help:account.invoice,period_id:0
@@ -106,7 +108,7 @@ msgstr "Estadísticas de cuentas"
#: model:ir.actions.wizard,name:account.wizard_vat_declaration
#: model:ir.ui.menu,name:account.menu_wizard_vat_declaration
msgid "Print Taxes Report"
msgstr "Imprimir informe de impuestos"
msgstr "Imprimir reporte de impuesto"
#. module: account
#: field:account.account,parent_id:0
@@ -116,12 +118,12 @@ msgstr "Padre"
#. module: account
#: selection:account.move,type:0
msgid "Journal Voucher"
msgstr "Diario de bonos"
msgstr "Diario de comprobantes"
#. module: account
#: field:account.invoice,residual:0
msgid "Residual"
msgstr "Pendiente"
msgstr "Residual"
#. module: account
#: field:account.tax,base_sign:0
@@ -140,7 +142,7 @@ msgstr "Romper conciliación de los asientos"
#. module: account
#: constraint:account.period:0
msgid "Error ! The duration of the Period(s) is/are invalid. "
msgstr ""
msgstr "¡Error! La duración de el/los período(s) no es válida. "
#. module: account
#: view:account.bank.statement.reconcile:0
@@ -199,7 +201,7 @@ msgstr "Ref. asiento"
#. module: account
#: model:ir.model,name:account.model_account_model_line
msgid "Account Model Entries"
msgstr "Línea de modelo de asiento"
msgstr "Líneas de modelo de asiento"
#. module: account
#: field:account.tax.code,sum_period:0
@@ -285,6 +287,11 @@ msgid ""
"date empty, it means direct payment. The payment term may compute several "
"due dates, for example 50% now, 50% in one month."
msgstr ""
"Si utiliza los plazos de pago, la fecha de vencimiento será calculada "
"automáticamente en la generación de los asientos contables. Si se mantiene "
"el plazo de pago y la fecha de vencimiento vacía, significa que es un pago "
"directo. El plazo de pago podrá calcular varias fechas de vencimiento, por "
"ejemplo, 50% ahora, 50% en un mes."
#. module: account
#: selection:account.tax,type:0
@@ -364,7 +371,7 @@ msgstr "Cuenta analítica"
#: field:account.tax,child_depend:0
#: field:account.tax.template,child_depend:0
msgid "Tax on Children"
msgstr ""
msgstr "Impuesto en hijos"
#. module: account
#: rml:account.central.journal:0
@@ -408,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
@@ -428,7 +435,7 @@ msgstr "Negativo"
#. module: account
#: rml:account.partner.balance:0
msgid "(Account/Partner) Name"
msgstr ""
msgstr "(Cuenta/Socio) Nombre"
#. module: account
#: selection:account.move,type:0
@@ -474,7 +481,7 @@ msgstr "Conciliación bancaria"
#. module: account
#: rml:account.invoice:0
msgid "Disc.(%)"
msgstr ""
msgstr "Desc.(%)"
#. module: account
#: rml:account.general.ledger:0
@@ -488,7 +495,7 @@ msgstr "Ref."
#. module: account
#: field:account.tax.template,type_tax_use:0
msgid "Tax Use In"
msgstr ""
msgstr "Impuesto usado en"
#. module: account
#: help:account.tax.template,include_base_amount:0
@@ -496,6 +503,8 @@ msgid ""
"Set if the amount of tax must be included in the base amount before "
"computing the next taxes."
msgstr ""
"Indica si el importe del impuesto deberá incluirse en el importe base antes "
"de calcular los siguientes impuestos."
#. module: account
#: model:ir.ui.menu,name:account.menu_finance_periodical_processing
@@ -548,7 +557,7 @@ msgstr "Método cierre"
#. module: account
#: field:account.tax.template,include_base_amount:0
msgid "Include in Base Amount"
msgstr ""
msgstr "Incluir en importe base"
#. module: account
#: field:account.tax,ref_base_code_id:0
@@ -564,7 +573,7 @@ msgstr "Línea"
#. module: account
#: rml:account.analytic.account.cost_ledger:0
msgid "J.C. or Move name"
msgstr ""
msgstr "Cód. diario o asiento"
#. module: account
#: selection:account.tax,applicable_type:0
@@ -613,6 +622,8 @@ msgid ""
"The sequence field is used to order the resources from lower sequences to "
"higher ones"
msgstr ""
"El campo secuencia es usado para ordenar los recursos secuencialmente de "
"menor a mayor"
#. module: account
#: wizard_view:account.analytic.account.chart,init:0
@@ -698,7 +709,7 @@ msgstr "Información adicional"
#. module: account
#: selection:account.invoice,type:0
msgid "Customer Refund"
msgstr "Factura de abono de cliente"
msgstr "Reembolso del cliente"
#. module: account
#: wizard_view:account.analytic.account.chart,init:0
@@ -716,7 +727,7 @@ msgstr "Signo código impuesto"
#. module: account
#: help:res.partner,credit:0
msgid "Total amount this customer owes you."
msgstr ""
msgstr "Importe total que este cliente le debe."
#. module: account
#: view:account.move.line:0
@@ -902,7 +913,7 @@ msgstr "Diario de desajuste"
#: field:account.model.line,amount_currency:0
#: field:account.move.line,amount_currency:0
msgid "Amount Currency"
msgstr "Importe cambio"
msgstr "Importe divisa"
#. module: account
#: field:account.chart.template,property_account_expense_categ:0
@@ -962,7 +973,7 @@ msgstr "Importe código base"
#. module: account
#: help:account.journal,user_id:0
msgid "The user responsible for this journal"
msgstr ""
msgstr "El usuario responsable de este diario"
#. module: account
#: field:account.journal,default_debit_account_id:0
@@ -1076,7 +1087,7 @@ msgstr "Escoja el ejercicio fiscal"
#. module: account
#: field:account.sequence.fiscalyear,sequence_main_id:0
msgid "Main Sequence"
msgstr ""
msgstr "Secuencia principal"
#. module: account
#: model:ir.actions.act_window,name:account.action_account_analytic_journal_tree
@@ -1148,7 +1159,7 @@ msgstr "Precio unidad"
#. module: account
#: rml:account.analytic.account.journal:0
msgid "Period from :"
msgstr ""
msgstr "Periodo desde :"
#. module: account
#: model:ir.model,name:account.model_wizard_multi_charts_accounts
@@ -1158,12 +1169,12 @@ msgstr "wizard.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
msgid "The amount expressed in an optional other currency."
msgstr "El importe expresado en una otra divisa opcional."
msgstr "El importe expresado en otra divisa opcional."
#. module: account
#: view:account.fiscal.position.template:0
@@ -1226,21 +1237,27 @@ msgid ""
"software system you may have to use the rate at date. Incoming transactions "
"always use the rate at date."
msgstr ""
"Permite seleccionar la forma en que la tasa de la moneda actual de las "
"transacciones de salida se calcula. En la mayoría de los países el método "
"legal es \"Promedio\", pero sólo unos pocos sistemas de software son capaces "
"de gestionarlo. Por lo tanto, si la importación procede de otro sistema de "
"software, es posible que tenga que utilizar la tasa \"En fecha\". Las "
"transacciones de entrada siempre utilizan la tasa \"En fecha\"."
#. module: account
#: field:account.account,company_currency_id:0
msgid "Company Currency"
msgstr "Moneda de la compañía"
msgstr "Divisa de la compañía"
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_account_template
msgid "Fiscal Position Template Account Mapping"
msgstr ""
msgstr "Mapeo cuentas plantilla posición fiscal"
#. module: account
#: field:account.analytic.account,parent_id:0
msgid "Parent Analytic Account"
msgstr ""
msgstr "Cuenta analítica padre"
#. module: account
#: wizard_button:account.move.line.reconcile,init_partial,addendum:0
@@ -1298,7 +1315,7 @@ msgstr "Transacciones no conciliadas"
#: field:account.fiscal.position,tax_ids:0
#: field:account.fiscal.position.template,tax_ids:0
msgid "Tax Mapping"
msgstr ""
msgstr "Mapeo impuestos"
#. module: account
#: view:account.config.wizard:0
@@ -1336,7 +1353,7 @@ msgstr "Homólogo centralizado"
#. module: account
#: view:wizard.company.setup:0
msgid "Message"
msgstr ""
msgstr "Mensaje"
#. module: account
#: model:process.node,note:account.process_node_supplierpaymentorder0
@@ -1406,7 +1423,7 @@ msgstr "Líneas de impuestos"
#. module: account
#: field:ir.sequence,fiscal_ids:0
msgid "Sequences"
msgstr ""
msgstr "Secuencias"
#. module: account
#: model:ir.actions.act_window,name:account.action_account_type_form
@@ -1440,7 +1457,7 @@ msgstr "Diario"
#: field:account.account,child_id:0
#: field:account.analytic.account,child_ids:0
msgid "Child Accounts"
msgstr ""
msgstr "Cuentas hijas"
#. module: account
#: field:account.account,check_history:0
@@ -1483,6 +1500,8 @@ msgid ""
"The partner bank account to pay\n"
"Keep empty to use the default"
msgstr ""
"La cuenta bancaria de la empresa para pagar\n"
"Dejarlo vacío para utilizar el valor por defecto"
#. module: account
#: field:res.partner,debit:0
@@ -1578,7 +1597,7 @@ msgstr "Abrir para la 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
@@ -1676,7 +1695,7 @@ msgstr "Diarios"
#. module: account
#: rml:account.analytic.account.quantity_cost_ledger:0
msgid "Max Qty:"
msgstr ""
msgstr "Ctdad máx."
#. module: account
#: wizard_button:account.invoice.refund,init,refund:0
@@ -1825,7 +1844,7 @@ msgstr ""
#. module: account
#: rml:account.analytic.account.cost_ledger:0
msgid "Date or Code"
msgstr ""
msgstr "Fecha o código"
#. module: account
#: field:account.analytic.account,user_id:0
@@ -1835,7 +1854,7 @@ msgstr "Gestor contable"
#. module: account
#: rml:account.analytic.account.journal:0
msgid "to :"
msgstr ""
msgstr "a :"
#. module: account
#: wizard_field:account.move.line.reconcile,init_full,debit:0
@@ -1916,7 +1935,7 @@ msgstr "Pagar factura"
#. module: account
#: constraint:account.invoice:0
msgid "Error: Invalid Bvr Number (wrong checksum)."
msgstr ""
msgstr "Error: Número BVR inválido (checksum erróneo)."
#. module: account
#: model:ir.actions.act_window,name:account.action_invoice_tree5
@@ -1985,7 +2004,7 @@ msgstr "Planes contables"
#. module: account
#: help:account.tax,name:0
msgid "This name will be displayed on reports"
msgstr ""
msgstr "Este nombre se mostrará en los informes"
#. module: account
#: rml:account.analytic.account.cost_ledger:0
@@ -2042,6 +2061,9 @@ msgid ""
"'draft' state and instead goes directly to the 'posted state' without any "
"manual validation."
msgstr ""
"Marque esta opción si no desea que nuevos asientos contables pasen por el "
"estado 'Borrador' y, por el contrario, pasen directamente al estado "
"\"Fijado\" sin ningún tipo de validación manual."
#. module: account
#: field:account.bank.statement.line,partner_id:0
@@ -2092,7 +2114,7 @@ msgstr "Proceso de factura de cliente"
#. module: account
#: rml:account.invoice:0
msgid "Fiscal Position Remark :"
msgstr ""
msgstr "Comentario situacion fiscal"
#. module: account
#: wizard_field:account.fiscalyear.close,init,period_id:0
@@ -2166,7 +2188,7 @@ msgstr "Asiento analítico"
#: view:res.company:0
#: field:res.company,overdue_msg:0
msgid "Overdue Payments Message"
msgstr ""
msgstr "Mensaje pagos vencidos"
#. module: account
#: model:ir.actions.act_window,name:account.action_tax_code_tree
@@ -2305,11 +2327,13 @@ msgstr "2"
#: wizard_view:account.chart,init:0
msgid "(If you do not select Fiscal year it will take all open fiscal years)"
msgstr ""
"(Si no selecciona un ejercicio fiscal se tendrán en cuenta todos los "
"ejercicios fiscales)"
#. module: account
#: help:account.invoice.tax,base_code_id:0
msgid "The account basis of the tax declaration."
msgstr ""
msgstr "La cuenta base de la declaración de impuestos."
#. module: account
#: rml:account.analytic.account.journal:0
@@ -2373,7 +2397,7 @@ msgstr "Plantilla del plan contable"
#. 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
@@ -2431,6 +2455,8 @@ msgid ""
"If not applicable (computed through a Python code), the tax won't appear on "
"the invoice."
msgstr ""
"Si no es aplicable (calculado a través de un código Python), el impuesto no "
"aparecerá en la factura."
#. module: account
#: field:account.model,lines_id:0
@@ -2613,7 +2639,7 @@ msgstr "Cuenta a pagar"
#. module: account
#: wizard_view:populate_statement_from_inv,init:0
msgid "Import Invoices in Statement"
msgstr ""
msgstr "Importar facturas en extracto"
#. module: account
#: view:account.invoice:0
@@ -2635,6 +2661,7 @@ msgstr "Orden de pago"
msgid ""
"Check this option if you want the user to reconcile entries in this account."
msgstr ""
"Marque esta opción si desea que el usuario concilie asientos en esta cuenta."
#. module: account
#: rml:account.analytic.account.journal:0
@@ -2657,7 +2684,7 @@ msgstr "Patrimonio"
#. module: account
#: field:wizard.company.setup,overdue_msg:0
msgid "Overdue Payment Message"
msgstr ""
msgstr "Mensaje pagos vencidos"
#. module: account
#: model:ir.model,name:account.model_account_tax_code_template
@@ -2922,7 +2949,7 @@ msgstr "A partir de extractos, crear asientos"
#. module: account
#: field:account.analytic.account,complete_name:0
msgid "Full Account Name"
msgstr ""
msgstr "Nombre completo de la cuenta"
#. module: account
#: rml:account.account.balance:0
@@ -2952,7 +2979,7 @@ msgstr "Extracto contable"
#. module: account
#: rml:account.overdue:0
msgid "Document: Customer account statement"
msgstr ""
msgstr "Documento: Estado contable del cliente"
#. module: account
#: view:product.product:0
@@ -3080,6 +3107,8 @@ msgid ""
"If this box is checked, the system will try to group the accounting lines "
"when generating them from invoices."
msgstr ""
"Si esta opción está marcada, el sistema tratará de agrupar las líneas del "
"asiento cuando se generen desde facturas."
#. module: account
#: wizard_field:account.move.line.reconcile,init_full,trans_nbr:0
@@ -3202,7 +3231,7 @@ msgstr "Cuenta"
#. module: account
#: model:account.journal,name:account.bank_journal
msgid "Journal de Banque CHF"
msgstr ""
msgstr "Diario de banco"
#. module: account
#: selection:account.account.balance.report,checktype,state:0
@@ -3334,7 +3363,7 @@ msgstr "Código impuesto raíz"
#. module: account
#: constraint:account.invoice:0
msgid "Error: BVR reference is required."
msgstr ""
msgstr "Error: La referencia BVR es necesaria."
#. module: account
#: field:account.tax.code,notprintable:0
@@ -3399,6 +3428,8 @@ msgid ""
"This account will be used instead of the default one as the receivable "
"account for the current partner"
msgstr ""
"Esta cuenta se utilizará en lugar de la cuenta por defecto como la cuenta a "
"cobrar para la empresa actual."
#. module: account
#: selection:account.tax,applicable_type:0
@@ -3555,7 +3586,7 @@ msgstr "Ejercicio fiscal"
#. module: account
#: rml:account.overdue:0
msgid "Balance :"
msgstr ""
msgstr "Saldo :"
#. module: account
#: selection:account.account.balance.report,checktype,display_account:0
@@ -3646,6 +3677,8 @@ msgid ""
"This payment term will be used instead of the default one for the current "
"partner"
msgstr ""
"Este plazo de pago se utilizará en lugar del plazo por defecto para la "
"empresa actual."
#. module: account
#: wizard_field:account.invoice.pay,addendum,comment:0
@@ -3665,6 +3698,8 @@ msgid ""
"Check this box if you don't want any VAT related to this Tax Code to appear "
"on invoices"
msgstr ""
"Marque esta opción si no desea que ningún IVA relacionado con este código de "
"impuesto aparezca en las facturas."
#. module: account
#: field:account.account.type,sequence:0
@@ -3767,7 +3802,7 @@ msgstr "Asistente de configuración contabilidad "
#: field:account.fiscalyear,date_start:0
#: field:account.subscription,date_start:0
msgid "Start Date"
msgstr ""
msgstr "Fecha inicial"
#. module: account
#: wizard_view:account.general.ledger.report,account_selection:0
@@ -3789,7 +3824,7 @@ msgstr "Facturas borrador"
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_tax_template
msgid "Fiscal Position Template Tax Mapping"
msgstr ""
msgstr "Mapeo de impuestos en plantilla posiciones fiscales"
#. module: account
#: rml:account.invoice:0
@@ -3820,6 +3855,15 @@ msgid ""
" Bank statements\n"
" "
msgstr ""
"Módulo de contabilidad financiera y analítica que cubre:\n"
" Contabilidad general\n"
" Costes / contabilidad analítica\n"
" Contabilidad de terceros\n"
" Gestión de impuestos\n"
" Presupuestos\n"
" Facturas de clientes y proveedores\n"
" Extractos de cuentas bancarias\n"
" "
#. module: account
#: field:account.journal,sequence_id:0
@@ -3857,7 +3901,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
@@ -3894,6 +3938,8 @@ msgid ""
"This account will be used instead of the default one to value outgoing stock "
"for the current product"
msgstr ""
"Esta cuenta se utilizará en lugar de la cuenta por defecto para valorar el "
"stock saliente para el producto actual."
#. module: account
#: model:process.node,note:account.process_node_manually0
@@ -3927,7 +3973,7 @@ msgstr "."
#. module: account
#: field:account.analytic.account,quantity_max:0
msgid "Maximum Quantity"
msgstr ""
msgstr "Cantidad máxima"
#. module: account
#: field:account.period,name:0
@@ -4051,7 +4097,7 @@ msgstr "Cuenta impuestos de devoluciones"
#: field:account.tax.code,child_ids:0
#: field:account.tax.code.template,child_ids:0
msgid "Child Codes"
msgstr ""
msgstr "Códigos hijos"
#. module: account
#: field:account.invoice,move_name:0
@@ -4229,6 +4275,8 @@ msgid ""
"reports, so that you can see positive figures instead of negative ones in "
"expenses accounts."
msgstr ""
"Permite cambiar el signo del saldo que se muestra en los informes, para que "
"pueda ver cifras positivas en vez de negativas en cuentas de gastos."
#. module: account
#: help:account.config.wizard,code:0
@@ -4395,7 +4443,7 @@ msgstr "Facturas de abono"
#: field:account.config.wizard,date2:0
#: field:account.fiscalyear,date_stop:0
msgid "End Date"
msgstr ""
msgstr "Fecha final"
#. module: account
#: model:ir.actions.wizard,name:account.wizard_open_closed_fiscalyear
@@ -4431,6 +4479,9 @@ msgid ""
"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."
msgstr ""
"El campo secuencia es usado para ordenar las líneas de impuestos de menor a "
"mayor secuencia. El orden es importante si un impuesto tiene varios impuesto "
"hijos. En este caso, el orden de evaluación es importante."
#. module: account
#: view:account.tax:0
@@ -4446,7 +4497,7 @@ msgstr "Archivo de extractos"
#. module: account
#: view:ir.sequence:0
msgid "Fiscal Year Sequences"
msgstr ""
msgstr "Secuencias ejercicios fiscales"
#. module: account
#: view:account.model.line:0
@@ -4491,7 +4542,7 @@ msgstr "Debe del proveedor"
#. module: account
#: help:account.model.line,quantity:0
msgid "The optional quantity on entries"
msgstr ""
msgstr "La cantidad opcional en los asientos"
#. module: account
#: rml:account.third_party_ledger:0
@@ -4784,6 +4835,9 @@ msgid ""
"new counterpart but will share the same counterpart. This is used in fiscal "
"year closing."
msgstr ""
"Marque esta opción para que cada asiento de este diario no crea una nueva "
"contrapartida, sino que comparta la misma contrapartida. Se usa en el cierre "
"del ejercicio fiscal."
#. module: account
#: selection:account.invoice,state:0
@@ -4884,7 +4938,7 @@ msgstr "account.analytic.journal"
#: field:account.fiscal.position,account_ids:0
#: field:account.fiscal.position.template,account_ids:0
msgid "Account Mapping"
msgstr ""
msgstr "Mapeo de cuentas"
#. module: account
#: view:product.product:0
@@ -4984,7 +5038,7 @@ msgstr "Líneas de factura"
#. module: account
#: field:account.period,date_start:0
msgid "Start of Period"
msgstr ""
msgstr "Inicio del periodo"
#. module: account
#: wizard_field:account.fiscalyear.close,init,report_name:0
@@ -5284,7 +5338,7 @@ msgstr "Todos los asientos contables"
#. module: account
#: help:account.invoice.tax,tax_code_id:0
msgid "The tax basis of the tax declaration."
msgstr ""
msgstr "La base del impuesto de la declaración de impuestos."
#. module: account
#: wizard_view:account.account.balance.report,checktype:0
@@ -5444,7 +5498,7 @@ msgstr ""
#. module: account
#: field:account.tax,type_tax_use:0
msgid "Tax Application"
msgstr ""
msgstr "Aplicación impuesto"
#. module: account
#: model:ir.actions.act_window,name:account.action_subscription_form
@@ -5461,7 +5515,7 @@ msgstr "Facturas de cliente PRO-FORMA"
#. module: account
#: field:account.subscription,period_total:0
msgid "Number of Periods"
msgstr ""
msgstr "Número de periodos"
#. module: account
#: wizard_field:account.analytic.account.analytic.check.report,init,date2:0
@@ -5538,11 +5592,13 @@ msgid ""
"Invalid period ! Some periods overlap or the date period is not in the scope "
"of the fiscal year. "
msgstr ""
"¡Periodo inválido! Algunos periodos se superponen o la fecha del periodo no "
"está dentro del intervalo del ejercicio fiscal. "
#. module: account
#: help:account.journal,invoice_sequence_id:0
msgid "The sequence used for invoice numbers in this journal."
msgstr ""
msgstr "La secuencia utilizada para los números de factura en este diario."
#. module: account
#: view:account.account:0
@@ -5567,7 +5623,7 @@ msgstr ""
#. module: account
#: constraint:account.fiscalyear:0
msgid "Error ! The duration of the Fiscal Year is invalid. "
msgstr ""
msgstr "¡Error! La duración del ejercicio fiscal no es correcta. "
#. module: account
#: selection:account.analytic.account,state:0
@@ -5703,11 +5759,13 @@ msgid ""
"This account will be used instead of the default one to value incoming stock "
"for the current product"
msgstr ""
"Esta cuenta se utilizará en lugar de la cuenta por defecto para valorar el "
"stock entrante para el producto actual."
#. module: account
#: field:account.tax,child_ids:0
msgid "Child Tax Accounts"
msgstr ""
msgstr "Cuentas impuestos hijas"
#. module: account
#: field:account.account,parent_right:0
@@ -5735,6 +5793,8 @@ msgid ""
"This account will be used instead of the default one as the payable account "
"for the current partner"
msgstr ""
"Este cuenta se utilizará en lugar de la cuenta por defecto como la cuenta a "
"pagar para la empresa actual."
#. module: account
#: field:account.tax.code,code:0
@@ -5793,7 +5853,7 @@ msgstr "Propiedades de contabilidad"
#. module: account
#: model:ir.model,name:account.model_account_sequence_fiscalyear
msgid "account.sequence.fiscalyear"
msgstr ""
msgstr "contabilidad.secuencia.ejerciciofiscal"
#. module: account
#: wizard_field:account.print.journal.report,init,sort_selection:0
@@ -5894,7 +5954,7 @@ msgstr "Código Python (inverso)"
#. module: account
#: model:ir.module.module,shortdesc:account.module_meta_information
msgid "Accounting and financial management"
msgstr ""
msgstr "Gestión contable y financiera"
#. module: account
#: view:account.fiscal.position.template:0
@@ -5907,6 +5967,8 @@ msgid ""
"This account will be used to value outgoing stock for the current product "
"category"
msgstr ""
"Esta cuenta se utilizará para valorar el stock saliente para la categoría de "
"producto actual."
#. module: account
#: help:account.tax,base_sign:0
@@ -5938,7 +6000,7 @@ msgstr "Debe general"
#. module: account
#: field:account.analytic.account,code:0
msgid "Account Code"
msgstr ""
msgstr "Código cuenta"
#. module: account
#: help:account.config.wizard,name:0
@@ -5985,6 +6047,8 @@ msgid ""
"Check this if the price you use on the product and invoices includes this "
"tax."
msgstr ""
"Marque esta opción si el precio que utiliza en el producto y en las facturas "
"incluye este impuesto."
#. module: account
#: field:account.journal.column,name:0
@@ -6009,6 +6073,8 @@ msgstr "Sí"
msgid ""
"Check this if the user is allowed to reconcile entries in this account."
msgstr ""
"Marque esta opción si el usuario se le permite conciliar asientos en esta "
"cuenta."
#. module: account
#: wizard_button:account.subscription.generate,init,generate:0
addons/account/i18n/es_AR.po
+1 -1
View File
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2009-11-19 04:35+0000\n"
"X-Launchpad-Export-Date: 2009-12-16 05:13+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account
addons/account/i18n/es_EC.po
+2 -3
View File
@@ -9,13 +9,12 @@ msgstr ""
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
"PO-Revision-Date: 2009-06-09 05:58+0000\n"
"Last-Translator: Cristian Salamea (GnuThink) "
"<cristian.salamea@gnuthink.com>\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: 2009-11-17 05:01+0000\n"
"X-Launchpad-Export-Date: 2009-12-16 05:13+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account
addons/account/i18n/et.po
+1 -1
View File
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2009-11-17 04:58+0000\n"
"X-Launchpad-Export-Date: 2009-12-16 05:11+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account
addons/account/i18n/fa.po
+1 -1
View File
@@ -14,7 +14,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2009-11-17 04:59+0000\n"
"X-Launchpad-Export-Date: 2009-12-16 05:12+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account
addons/account/i18n/fi.po
+388 -376
View File
File diff suppressed because it is too large Load Diff
addons/account/i18n/fr.po
+23 -23
View File
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 5.0.1\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
"PO-Revision-Date: 2009-11-09 14:41+0000\n"
"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
"PO-Revision-Date: 2009-12-08 14:44+0000\n"
"Last-Translator: Olivier Dony (OpenERP) <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: 2009-11-17 04:58+0000\n"
"X-Launchpad-Export-Date: 2009-12-16 05:11+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account
@@ -68,11 +68,6 @@ msgstr "Imprimer le journal"
msgid "New Fiscal Year"
msgstr "Nouvel exercice fiscal"
#. module: account
#: wizard_field:account.open_closed_fiscalyear,init,fyear_id:0
msgid "Fiscal Year to Open"
msgstr "Exercice fiscal à ouvrir"
#. module: account
#: model:ir.actions.act_window,name:account.action_bank_statement_tree
#: model:ir.ui.menu,name:account.menu_bank_statement_tree
@@ -500,7 +495,7 @@ msgstr "Saisie des écritures"
#. 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 "Indiquez le message pour les rapports de paiement en retard."
#. module: account
#: model:process.transition,name:account.process_transition_confirmstatementfromdraft0
@@ -764,7 +759,7 @@ msgstr "Origine"
#. module: account
#: rml:account.analytic.account.journal:0
msgid "Move Name"
msgstr ""
msgstr "Nom de la transaction"
#. module: account
#: xsl:account.transfer:0
@@ -875,7 +870,7 @@ msgstr "Négatif"
#. module: account
#: rml:account.partner.balance:0
msgid "(Account/Partner) Name"
msgstr ""
msgstr "Nom (Compte/Partenaire)"
#. module: account
#: selection:account.move,type:0
@@ -921,7 +916,7 @@ msgstr "Rapprochement bancaire"
#. module: account
#: rml:account.invoice:0
msgid "Disc.(%)"
msgstr ""
msgstr "Rem.(%)"
#. module: account
#: rml:account.general.ledger:0
@@ -1345,6 +1340,11 @@ msgstr ""
"Si une taxe par défaut est donnée dans le partenaire, elle surcharge "
"uniquement les taxes des comptes (ou des produits) du même groupe."
#. module: account
#: wizard_field:account.open_closed_fiscalyear,init,fyear_id:0
msgid "Fiscal Year to Open"
msgstr "Exercice fiscal à ouvrir"
#. module: account
#: view:account.config.wizard:0
msgid "Select Chart of Accounts"
@@ -1528,7 +1528,7 @@ msgstr "Prix unitaire"
#. module: account
#: rml:account.analytic.account.journal:0
msgid "Period from :"
msgstr ""
msgstr "Période de :"
#. module: account
#: model:ir.model,name:account.model_wizard_multi_charts_accounts
@@ -1695,7 +1695,7 @@ msgstr "Centralisation"
#. module: account
#: view:wizard.company.setup:0
msgid "Message"
msgstr ""
msgstr "Messages"
#. module: account
#: model:process.node,note:account.process_node_supplierpaymentorder0
@@ -1857,7 +1857,7 @@ msgstr "Clôturer l'état"
#. 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
@@ -2169,7 +2169,7 @@ msgstr "Comptable"
#. module: account
#: rml:account.analytic.account.journal:0
msgid "to :"
msgstr ""
msgstr "à :"
#. module: account
#: wizard_field:account.move.line.reconcile,init_full,debit:0
@@ -2274,7 +2274,7 @@ msgstr "Pas de filtre"
#. module: account
#: field:account.payment.term.line,days:0
msgid "Number of Days"
msgstr "Nombre de jour"
msgstr "Nombre de jours"
#. module: account
#: help:account.invoice,reference:0
@@ -2429,7 +2429,7 @@ msgstr "Processus de la facture client"
#. module: account
#: rml:account.invoice:0
msgid "Fiscal Position Remark :"
msgstr ""
msgstr "Remarque position fiscale :"
#. module: account
#: wizard_field:account.fiscalyear.close,init,period_id:0
@@ -2503,7 +2503,7 @@ msgstr "Ecriture analytique"
#: view:res.company:0
#: field:res.company,overdue_msg:0
msgid "Overdue Payments Message"
msgstr ""
msgstr "Message pour les paiements en retard"
#. module: account
#: model:ir.actions.act_window,name:account.action_tax_code_tree
@@ -2977,7 +2977,7 @@ msgstr "Capitaux propres"
#. module: account
#: field:wizard.company.setup,overdue_msg:0
msgid "Overdue Payment Message"
msgstr ""
msgstr "Message pour paiement en retard"
#. module: account
#: model:ir.model,name:account.model_account_tax_code_template
@@ -4112,7 +4112,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 "Message pour rapport de paiement en retard"
#. module: account
#: selection:account.tax,tax_group:0
@@ -4432,7 +4432,7 @@ msgstr "Facture"
#: wizard_button:account.open_closed_fiscalyear,init,open:0
#: wizard_button:account_use_models,create,open_move:0
msgid "Open"
msgstr "Ouvrir"
msgstr "Ouverte"
#. module: account
#: model:ir.ui.menu,name:account.next_id_29
@@ -4698,7 +4698,7 @@ msgstr "Confirmez-vous l'ouverture de cette facture ?"
#. module: account
#: model:ir.actions.report.xml,name:account.account_3rdparty_ledger_other
msgid "Partner Other Ledger"
msgstr ""
msgstr "Journal des tiers"
#. module: account
#: view:res.partner:0
addons/account/i18n/gl.po
+1 -1
View File
@@ -14,7 +14,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2009-11-17 04:58+0000\n"
"X-Launchpad-Export-Date: 2009-12-16 05:11+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account
addons/account/i18n/gu.po
+2 -2
View File
@@ -9,12 +9,12 @@ msgstr ""
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
"PO-Revision-Date: 2009-09-18 15:06+0000\n"
"Last-Translator: mga (Open ERP) <mga@tinyerp.com>\n"
"Last-Translator: mga (Open ERP) <Unknown>\n"
"Language-Team: Gujarati <gu@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: 2009-11-17 04:59+0000\n"
"X-Launchpad-Export-Date: 2009-12-16 05:11+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account
addons/account/i18n/hr.po
+1 -1
View File
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2009-11-18 04:37+0000\n"
"X-Launchpad-Export-Date: 2009-12-16 05:12+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account
addons/account/i18n/hu.po
+1 -1
View File
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2009-11-18 04:37+0000\n"
"X-Launchpad-Export-Date: 2009-12-16 05:11+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account
addons/account/i18n/id.po
+1 -1
View File
@@ -14,7 +14,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2009-11-18 04:37+0000\n"
"X-Launchpad-Export-Date: 2009-12-16 05:11+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account
addons/account/i18n/it.po
+1 -1
View File
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2009-11-18 04:37+0000\n"
"X-Launchpad-Export-Date: 2009-12-16 05:11+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account
addons/account/i18n/kab.po
+1 -1
View File
@@ -14,7 +14,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2009-11-17 04:59+0000\n"
"X-Launchpad-Export-Date: 2009-12-16 05:11+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account
addons/account/i18n/ko.po
+1 -1
View File
@@ -14,7 +14,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2009-11-18 04:37+0000\n"
"X-Launchpad-Export-Date: 2009-12-16 05:11+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account
addons/account/i18n/lt.po
+1 -1
View File
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2009-11-19 04:35+0000\n"
"X-Launchpad-Export-Date: 2009-12-16 05:12+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account
addons/account/i18n/lv.po
+1 -1
View File
@@ -14,7 +14,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2009-11-19 04:35+0000\n"
"X-Launchpad-Export-Date: 2009-12-16 05:12+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account
addons/account/i18n/mn.po
+1 -1
View File
@@ -14,7 +14,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2009-11-17 04:59+0000\n"
"X-Launchpad-Export-Date: 2009-12-16 05:12+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account
addons/account/i18n/nb.po
+1 -1
View File
@@ -14,7 +14,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2009-11-17 04:59+0000\n"
"X-Launchpad-Export-Date: 2009-12-16 05:12+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account
addons/account/i18n/nl.po
+224 -137
View File
File diff suppressed because it is too large Load Diff
addons/account/i18n/nl_BE.po
+1 -1
View File
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2009-11-17 05:00+0000\n"
"X-Launchpad-Export-Date: 2009-12-16 05:13+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account
addons/account/i18n/oc.po
+1 -1
View File
@@ -14,7 +14,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2009-11-17 04:59+0000\n"
"X-Launchpad-Export-Date: 2009-12-16 05:12+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account
addons/account/i18n/pl.po
+21 -14
View File
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 5.0.0\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
"PO-Revision-Date: 2009-11-21 15:39+0000\n"
"Last-Translator: Andrzej MoST (Marcin Ostajewski) <Unknown>\n"
"PO-Revision-Date: 2009-12-15 16:09+0000\n"
"Last-Translator: Grzegorz Grzelak (Cirrus) <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: 2009-11-22 04:49+0000\n"
"X-Launchpad-Export-Date: 2009-12-16 05:12+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account
@@ -79,7 +79,7 @@ msgstr ""
#. module: account
#: help:account.invoice,period_id:0
msgid "Keep empty to use the period of the validation(invoice) date."
msgstr ""
msgstr "Pozostaw puste, aby stosować okres z daty zatwierdzenia (faktury)."
#. module: account
#: wizard_view:account.automatic.reconcile,reconcile:0
@@ -434,7 +434,7 @@ msgstr "Ujemne"
#. module: account
#: rml:account.partner.balance:0
msgid "(Account/Partner) Name"
msgstr ""
msgstr "Nazwa (konta/partnera)"
#. module: account
#: selection:account.move,type:0
@@ -1133,7 +1133,7 @@ msgstr "Szablon planu kont"
#. module: account
#: field:account.chart.template,property_account_income_categ:0
msgid "Income Category Account"
msgstr ""
msgstr "Konto dochodów dla kategorii"
#. module: account
#: model:ir.actions.act_window,name:account.analytic_account_form
@@ -1156,7 +1156,7 @@ msgstr "Cena jednostkowa"
#. module: account
#: rml:account.analytic.account.journal:0
msgid "Period from :"
msgstr ""
msgstr "Okres od :"
#. module: account
#: model:ir.model,name:account.model_wizard_multi_charts_accounts
@@ -1349,7 +1349,7 @@ msgstr ""
#. module: account
#: view:wizard.company.setup:0
msgid "Message"
msgstr ""
msgstr "Komunikat"
#. module: account
#: model:process.node,note:account.process_node_supplierpaymentorder0
@@ -1844,7 +1844,7 @@ msgstr "Główna(y) księgowa(y)"
#. module: account
#: rml:account.analytic.account.journal:0
msgid "to :"
msgstr ""
msgstr "do :"
#. module: account
#: wizard_field:account.move.line.reconcile,init_full,debit:0
@@ -2102,7 +2102,7 @@ msgstr "Proces faktury dla klienta"
#. module: account
#: rml:account.invoice:0
msgid "Fiscal Position Remark :"
msgstr ""
msgstr "Uwaga do obszaru podatkowego :"
#. module: account
#: wizard_field:account.fiscalyear.close,init,period_id:0
@@ -2176,7 +2176,7 @@ msgstr "Zapis analityczny"
#: view:res.company:0
#: field:res.company,overdue_msg:0
msgid "Overdue Payments Message"
msgstr ""
msgstr "Komunikat przeterminowanych płatności"
#. module: account
#: model:ir.actions.act_window,name:account.action_tax_code_tree
@@ -2818,7 +2818,7 @@ msgstr ""
#. module: account
#: wizard_button:populate_statement_from_inv,init,go:0
msgid "_Go"
msgstr ""
msgstr "_Przejdź"
#. module: account
#: field:res.partner,ref_companies:0
@@ -3917,6 +3917,8 @@ msgid ""
"This account will be used instead of the default one to value outgoing stock "
"for the current product"
msgstr ""
"To konto księgowe będzie stosowane zamiast domyślnego przy wycenie zapasów "
"przyjmowanych dla bieżącego produktu"
#. module: account
#: model:process.node,note:account.process_node_manually0
@@ -3940,7 +3942,7 @@ msgstr "Wg okresów"
#. module: account
#: help:account.invoice,date_invoice:0
msgid "Keep empty to use the current date"
msgstr ""
msgstr "Pozostaw puste, aby stosować bieżącą datę"
#. module: account
#: rml:account.overdue:0
@@ -4110,6 +4112,9 @@ msgid ""
"The optional quantity expressed by this line, eg: number of product sold. "
"The quantity is not a legal requirement but is very usefull for some reports."
msgstr ""
"Ewentualna ilość wyrażona w tej pozycji, czyli liczba sprzedanych produktów. "
"Nie jest to wymagane prawnie, ale może być bardzo użyteczne w niektórych "
"raportach."
#. module: account
#: wizard_field:account.third_party_ledger.report,init,reconcil:0
@@ -4648,7 +4653,7 @@ msgstr "Wprowadzanie zapisów przez zmianę stanu"
#. module: account
#: wizard_view:account.analytic.account.chart,init:0
msgid "Analytic Account Charts"
msgstr ""
msgstr "Plany kont analitycznych"
#. module: account
#: wizard_field:account.aged.trial.balance,init,result_selection:0
@@ -5724,6 +5729,8 @@ msgid ""
"This account will be used instead of the default one to value incoming stock "
"for the current product"
msgstr ""
"To konto będzie stosowane, zamiast domyślnego, do wyceny zapasów "
"wychodzących dla tego produktu"
#. module: account
#: field:account.tax,child_ids:0
addons/account/i18n/pt.po
+100 -90
View File
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 5.0.0\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
"PO-Revision-Date: 2009-11-17 09:50+0000\n"
"Last-Translator: pmgmarques <pmgmarques@gmail.com>\n"
"PO-Revision-Date: 2009-12-09 22:31+0000\n"
"Last-Translator: Paulino <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: 2009-11-18 04:37+0000\n"
"X-Launchpad-Export-Date: 2009-12-16 05:12+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account
@@ -24,28 +24,28 @@ msgstr "Nome Interno"
#. module: account
#: view:account.tax.code:0
msgid "Account Tax Code"
msgstr "Código de imposto da conta"
msgstr "Código do imposto da conta"
#. 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 "Facturas de fornecedores não pagas"
msgstr "Facturas de fornecedores por pagar"
#. module: account
#: model:ir.ui.menu,name:account.menu_finance_entries
msgid "Entries Encoding"
msgstr "Codificações de entrada"
msgstr "Introdução de movimentos"
#. 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 "Especifique a mensagem para o relatório de pagamentos em atraso"
#. module: account
#: model:process.transition,name:account.process_transition_confirmstatementfromdraft0
msgid "Confirm statement from draft"
msgstr "Confirmar declaração de rascunho"
msgstr "Confirmar extracto rascunho"
#. module: account
#: model:account.account.type,name:account.account_type_asset
@@ -55,17 +55,17 @@ msgstr "Activo"
#. module: account
#: constraint:ir.actions.act_window:0
msgid "Invalid model name in the action definition."
msgstr ""
msgstr "Nome de modelo inválido na definição da acção"
#. module: account
#: help:account.journal,currency:0
msgid "The currency used to enter statement"
msgstr "A moeda usada para inserir declaração"
msgstr "A divisa usada para inserir o extrato"
#. module: account
#: wizard_view:account_use_models,init_form:0
msgid "Select Message"
msgstr "Selecionar mensagem"
msgstr "Selecione a mensagem"
#. module: account
#: help:product.category,property_account_income_categ:0
@@ -73,11 +73,14 @@ msgid ""
"This account will be used to value incoming stock for the current product "
"category"
msgstr ""
"Esta conta será usada para valorizar as entradas de existências para a "
"categoria do produto actual."
#. module: account
#: help:account.invoice,period_id:0
msgid "Keep empty to use the period of the validation(invoice) date."
msgstr ""
"Mantenha vazio para usar o período da data de validação (da factura)."
#. module: account
#: wizard_view:account.automatic.reconcile,reconcile:0
@@ -87,14 +90,14 @@ msgstr "Resultado da reconciliação"
#. module: account
#: model:ir.actions.act_window,name:account.act_account_acount_move_line_open_unreconciled
msgid "Unreconciled entries"
msgstr "Entradas em aberto"
msgstr "Movimentos por reconciliar"
#. 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 "Código base"
msgstr "Código Base"
#. module: account
#: view:account.account:0
@@ -105,7 +108,7 @@ msgstr "Estatisticas da conta"
#: model:ir.actions.wizard,name:account.wizard_vat_declaration
#: model:ir.ui.menu,name:account.menu_wizard_vat_declaration
msgid "Print Taxes Report"
msgstr "Imprimir relatório de impostos"
msgstr "Imprimir mapa de impostos"
#. module: account
#: field:account.account,parent_id:0
@@ -115,7 +118,7 @@ msgstr "Pai"
#. module: account
#: selection:account.move,type:0
msgid "Journal Voucher"
msgstr "Voucher do jornal"
msgstr "Voucher do Diário"
#. module: account
#: field:account.invoice,residual:0
@@ -139,7 +142,7 @@ msgstr "Anular conciliação de movimentos"
#. module: account
#: constraint:account.period:0
msgid "Error ! The duration of the Period(s) is/are invalid. "
msgstr ""
msgstr "Erro! A duração do(s) período(s) não é/são válida(s). "
#. module: account
#: view:account.bank.statement.reconcile:0
@@ -317,7 +320,7 @@ msgstr "Origem"
#. module: account
#: rml:account.analytic.account.journal:0
msgid "Move Name"
msgstr ""
msgstr "Nome do Movimento"
#. module: account
#: xsl:account.transfer:0
@@ -363,7 +366,7 @@ msgstr "Conta analítica"
#: field:account.tax,child_depend:0
#: field:account.tax.template,child_depend:0
msgid "Tax on Children"
msgstr ""
msgstr "Imposto nos dependentes"
#. module: account
#: rml:account.central.journal:0
@@ -380,7 +383,7 @@ msgstr "Descrição das facturas"
#. module: account
#: constraint:account.analytic.account:0
msgid "Error! You can not create recursive analytic accounts."
msgstr ""
msgstr "Erro! Não pode criar contas analiticas recursivamente"
#. module: account
#: field:account.bank.statement.reconcile,total_entry:0
@@ -432,7 +435,7 @@ msgstr ""
#. module: account
#: selection:account.move,type:0
msgid "Contra"
msgstr ""
msgstr "Contra"
#. module: account
#: field:account.analytic.account,state:0
@@ -471,7 +474,7 @@ msgstr "Reconciliação bancária"
#. module: account
#: rml:account.invoice:0
msgid "Disc.(%)"
msgstr ""
msgstr "Desc.(%)"
#. module: account
#: rml:account.general.ledger:0
@@ -485,7 +488,7 @@ msgstr "Ref"
#. module: account
#: field:account.tax.template,type_tax_use:0
msgid "Tax Use In"
msgstr ""
msgstr "Imposto usado em"
#. module: account
#: help:account.tax.template,include_base_amount:0
@@ -493,6 +496,8 @@ msgid ""
"Set if the amount of tax must be included in the base amount before "
"computing the next taxes."
msgstr ""
"Defina se o montante do imposto deve ser incluído no valor base dos impostos "
"a processar em seguida."
#. module: account
#: model:ir.ui.menu,name:account.menu_finance_periodical_processing
@@ -545,7 +550,7 @@ msgstr "Método de reabertura"
#. module: account
#: field:account.tax.template,include_base_amount:0
msgid "Include in Base Amount"
msgstr ""
msgstr "Incluir no valor base"
#. module: account
#: field:account.tax,ref_base_code_id:0
@@ -561,7 +566,7 @@ msgstr "Linha"
#. module: account
#: rml:account.analytic.account.cost_ledger:0
msgid "J.C. or Move name"
msgstr ""
msgstr "J.C. ou nome do movimento."
#. module: account
#: selection:account.tax,applicable_type:0
@@ -575,11 +580,13 @@ msgid ""
"Number of days to add before computation of the day of month.If Date=15/01, "
"Number of Days=22, Day of Month=-1, then the due date is 28/02."
msgstr ""
"Número de dias a somar antes de calcular o dia do mês. Se data = 15/01, "
"Numero de dias = 22, Dia do mes= -1, entao a data de vencimento é 28/02."
#. module: account
#: model:ir.model,name:account.model_account_tax
msgid "account.tax"
msgstr ""
msgstr "account.tax"
#. module: account
#: rml:account.central.journal:0
@@ -595,7 +602,7 @@ msgstr "Mvt"
#: model:ir.actions.wizard,name:account.wizard_aged_trial_balance
#: model:ir.ui.menu,name:account.menu_aged_trial_balance
msgid "Aged Partner Balance"
msgstr ""
msgstr "Balancete de antiguidade de parceiros."
#. module: account
#: view:account.journal:0
@@ -607,7 +614,7 @@ msgstr "Controlo do movimentos"
msgid ""
"The sequence field is used to order the resources from lower sequences to "
"higher ones"
msgstr ""
msgstr "O campo sequência é usado para ordenar os registos"
#. module: account
#: wizard_view:account.analytic.account.chart,init:0
@@ -655,7 +662,7 @@ msgstr "Fechar montante"
#. module: account
#: help:account.fiscalyear,company_id:0
msgid "Keep empty if the fiscal year belongs to several companies."
msgstr ""
msgstr "Manter vazio se o ano fiscal pertence a varias empresas."
#. module: account
#: model:ir.ui.menu,name:account.menu_analytic_accounting
@@ -665,7 +672,7 @@ msgstr "Contabilidade Analítica"
#. module: account
#: rml:account.overdue:0
msgid "Sub-Total :"
msgstr ""
msgstr "Sub-total :"
#. module: account
#: field:account.analytic.account,line_ids:0
@@ -683,12 +690,12 @@ msgstr "mês"
#. module: account
#: field:account.analytic.account,partner_id:0
msgid "Associated Partner"
msgstr ""
msgstr "Parceiro associado"
#. module: account
#: field:account.invoice,comment:0
msgid "Additional Information"
msgstr ""
msgstr "Informação Adicional"
#. module: account
#: selection:account.invoice,type:0
@@ -698,7 +705,7 @@ msgstr "Nota de crédito a clientes"
#. module: account
#: wizard_view:account.analytic.account.chart,init:0
msgid "Select the Period for Analysis"
msgstr ""
msgstr "Seleccione o período para análise."
#. module: account
#: field:account.tax,ref_tax_sign:0
@@ -711,7 +718,7 @@ msgstr "Sinal do código de imposto"
#. module: account
#: help:res.partner,credit:0
msgid "Total amount this customer owes you."
msgstr ""
msgstr "Valor total que este cliente lhe deve."
#. module: account
#: view:account.move.line:0
@@ -721,7 +728,7 @@ msgstr "Rua"
#. module: account
#: model:ir.actions.act_window,name:account.action_tax_code_line_open
msgid "account.move.line"
msgstr ""
msgstr "account.move.line"
#. module: account
#: model:process.transition,name:account.process_transition_supplieranalyticcost0
@@ -737,7 +744,7 @@ msgstr "Nome do Campo"
#: field:account.tax.code,sign:0
#: field:account.tax.code.template,sign:0
msgid "Sign for parent"
msgstr ""
msgstr "Sinal do ascendente"
#. module: account
#: field:account.fiscalyear,end_journal_period_id:0
@@ -748,7 +755,7 @@ msgstr "Diários de fim de exercício"
#: view:product.product:0
#: view:product.template:0
msgid "Purchase Properties"
msgstr ""
msgstr "Propriedades das compras."
#. module: account
#: model:process.node,note:account.process_node_paymententries0
@@ -815,7 +822,7 @@ msgstr "Linhas de movimentos"
#. module: account
#: model:ir.model,name:account.model_account_config_wizard
msgid "account.config.wizard"
msgstr ""
msgstr "account.config.wizard"
#. module: account
#: model:ir.actions.act_window,name:account.report_account_analytic_journal_tree
@@ -862,7 +869,7 @@ msgstr "Imprimir diário"
#. module: account
#: model:ir.model,name:account.model_account_bank_accounts_wizard
msgid "account.bank.accounts.wizard"
msgstr ""
msgstr "account.bank.accounts.wizard"
#. module: account
#: field:account.move.line,date_created:0
@@ -953,7 +960,7 @@ msgstr "Montante de código base"
#. module: account
#: help:account.journal,user_id:0
msgid "The user responsible for this journal"
msgstr ""
msgstr "Utilizador responsável por este diário"
#. module: account
#: field:account.journal,default_debit_account_id:0
@@ -1067,7 +1074,7 @@ msgstr "Escolha o ano fiscal"
#. module: account
#: field:account.sequence.fiscalyear,sequence_main_id:0
msgid "Main Sequence"
msgstr ""
msgstr "Sequência principal"
#. module: account
#: model:ir.actions.act_window,name:account.action_account_analytic_journal_tree
@@ -1128,7 +1135,7 @@ msgstr "Nova conta da contabilidade 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 Position Templates"
msgstr ""
msgstr "Modelos de posição fiscal"
#. module: account
#: rml:account.invoice:0
@@ -1139,12 +1146,12 @@ msgstr "Preço Unitário"
#. module: account
#: rml:account.analytic.account.journal:0
msgid "Period from :"
msgstr ""
msgstr "Período de:"
#. module: account
#: model:ir.model,name:account.model_wizard_multi_charts_accounts
msgid "wizard.multi.charts.accounts"
msgstr ""
msgstr "wizard.multi.charts.accounts"
#. module: account
#: model:account.journal,name:account.sales_journal
@@ -1160,7 +1167,7 @@ msgstr "Montante apresentado numa outra moeda, opcional."
#: view:account.fiscal.position.template:0
#: field:account.fiscal.position.template,name:0
msgid "Fiscal Position Template"
msgstr ""
msgstr "Modelo de posição fiscal"
#. module: account
#: field:account.payment.term,line_ids:0
@@ -1181,7 +1188,7 @@ msgstr "Gráficos abertos"
#. module: account
#: wizard_view:account.fiscalyear.close.state,init:0
msgid "Are you sure you want to close the fiscal year ?"
msgstr ""
msgstr "de certeza que quer encerrar o exercício?"
#. module: account
#: selection:account.move,type:0
@@ -1226,12 +1233,12 @@ msgstr "Moeda da empresa"
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_account_template
msgid "Fiscal Position Template Account Mapping"
msgstr ""
msgstr "Mapeamento do Modelo de Posição Fiscal."
#. module: account
#: field:account.analytic.account,parent_id:0
msgid "Parent Analytic Account"
msgstr ""
msgstr "Conta analítica mãe"
#. module: account
#: wizard_button:account.move.line.reconcile,init_partial,addendum:0
@@ -1289,7 +1296,7 @@ msgstr "Transacções não reconciliadas"
#: field:account.fiscal.position,tax_ids:0
#: field:account.fiscal.position.template,tax_ids:0
msgid "Tax Mapping"
msgstr ""
msgstr "Mapeamento do Imposto"
#. module: account
#: view:account.config.wizard:0
@@ -1327,7 +1334,7 @@ msgstr "Contrapartida centralizada"
#. module: account
#: view:wizard.company.setup:0
msgid "Message"
msgstr ""
msgstr "Mensagem"
#. module: account
#: model:process.node,note:account.process_node_supplierpaymentorder0
@@ -1360,7 +1367,7 @@ msgstr "Linhas da analítica"
#. module: account
#: help:account.tax,type:0
msgid "The computation method for the tax amount."
msgstr ""
msgstr "O método de cálculo do imposto."
#. module: account
#: model:process.node,note:account.process_node_accountingentries0
@@ -1396,7 +1403,7 @@ msgstr "Linhas de impostos"
#. module: account
#: field:ir.sequence,fiscal_ids:0
msgid "Sequences"
msgstr ""
msgstr "Sequências"
#. module: account
#: model:ir.actions.act_window,name:account.action_account_type_form
@@ -1430,7 +1437,7 @@ msgstr "Diário"
#: field:account.account,child_id:0
#: field:account.analytic.account,child_ids:0
msgid "Child Accounts"
msgstr ""
msgstr "Conta-filha"
#. module: account
#: field:account.account,check_history:0
@@ -1473,6 +1480,8 @@ msgid ""
"The partner bank account to pay\n"
"Keep empty to use the default"
msgstr ""
"A conta bancária do parceiro para pagamentos\n"
"Deixe vazio para usar a predefinida."
#. module: account
#: field:res.partner,debit:0
@@ -1487,12 +1496,12 @@ msgstr ""
#. 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
msgid "account.analytic.line.extended"
msgstr ""
msgstr "account.analytic.line.extended"
#. module: account
#: field:account.journal,refund_journal:0
@@ -1666,7 +1675,7 @@ msgstr "Diários"
#. module: account
#: rml:account.analytic.account.quantity_cost_ledger:0
msgid "Max Qty:"
msgstr ""
msgstr "Qtd Max:"
#. module: account
#: wizard_button:account.invoice.refund,init,refund:0
@@ -1678,7 +1687,7 @@ msgstr "Devolver valor de factura"
#: model:ir.actions.wizard,name:account.wizard_period_close
#: model:ir.ui.menu,name:account.menu_action_account_period_close_tree
msgid "Close a Period"
msgstr ""
msgstr "Fechar um período"
#. module: account
#: model:ir.actions.act_window,name:account.act_acc_analytic_acc_2_report_hr_timesheet_invoice_journal
@@ -1688,7 +1697,7 @@ msgstr "Custos e Retornos"
#. module: account
#: constraint:account.account:0
msgid "Error ! You can not create recursive accounts."
msgstr ""
msgstr "Erro! Não pode criar contas recursivamente."
#. module: account
#: rml:account.tax.code.entries:0
@@ -1718,7 +1727,7 @@ msgstr "Reabrir"
#. module: account
#: wizard_view:account.fiscalyear.close,init:0
msgid "Are you sure you want to create entries?"
msgstr ""
msgstr "De certeza que quer criar os movimentos?"
#. module: account
#: field:account.tax,include_base_amount:0
@@ -1813,7 +1822,7 @@ msgstr ""
#. module: account
#: rml:account.analytic.account.cost_ledger:0
msgid "Date or Code"
msgstr ""
msgstr "Data ou Código"
#. module: account
#: field:account.analytic.account,user_id:0
@@ -1823,7 +1832,7 @@ msgstr "Gestor de conta"
#. module: account
#: rml:account.analytic.account.journal:0
msgid "to :"
msgstr ""
msgstr "para:"
#. module: account
#: wizard_field:account.move.line.reconcile,init_full,debit:0
@@ -1973,7 +1982,7 @@ msgstr "Listas de contas"
#. module: account
#: help:account.tax,name:0
msgid "This name will be displayed on reports"
msgstr ""
msgstr "Este nome será exibido nos relatórios"
#. module: account
#: rml:account.analytic.account.cost_ledger:0
@@ -2005,7 +2014,7 @@ msgstr "Devoluções a clientes"
#. module: account
#: rml:account.vat.declaration:0
msgid "Tax Amount"
msgstr ""
msgstr "Valor do imposto"
#. module: account
#: rml:account.analytic.account.quantity_cost_ledger:0
@@ -2049,11 +2058,12 @@ msgid ""
"Unique number of the invoice, computed automatically when the invoice is "
"created."
msgstr ""
"Numero único da factura, gerado automaticamente quando a factura é criada."
#. module: account
#: rml:account.invoice:0
msgid "Draft Invoice"
msgstr ""
msgstr "Factura rascunho"
#. module: account
#: model:account.account.type,name:account.account_type_expense
@@ -2063,7 +2073,7 @@ msgstr "Despesa"
#. module: account
#: field:account.journal,invoice_sequence_id:0
msgid "Invoice Sequence"
msgstr ""
msgstr "Sequência facturas"
#. module: account
#: wizard_view:account.automatic.reconcile,init:0
@@ -2073,7 +2083,7 @@ msgstr "Opções"
#. module: account
#: model:process.process,name:account.process_process_invoiceprocess0
msgid "Customer Invoice Process"
msgstr ""
msgstr "Processo de facturação a clientes"
#. module: account
#: rml:account.invoice:0
@@ -2083,7 +2093,7 @@ msgstr ""
#. module: account
#: wizard_field:account.fiscalyear.close,init,period_id:0
msgid "Opening Entries Period"
msgstr ""
msgstr "Período dos movimentos de abertura"
#. module: account
#: model:ir.actions.wizard,name:account.wizard_validate_account_moves
@@ -2152,7 +2162,7 @@ msgstr "movimento analitico"
#: view:res.company:0
#: field:res.company,overdue_msg:0
msgid "Overdue Payments Message"
msgstr ""
msgstr "Mensagem de pagamentos em atraso"
#. module: account
#: model:ir.actions.act_window,name:account.action_tax_code_tree
@@ -2251,7 +2261,7 @@ msgstr "Criar movimentos de subscrição"
#. module: account
#: wizard_field:account.fiscalyear.close,init,journal_id:0
msgid "Opening Entries Journal"
msgstr ""
msgstr "Diário de abertura"
#. module: account
#: view:account.config.wizard:0
@@ -2727,7 +2737,7 @@ msgstr "Numero da factura"
#. module: account
#: field:account.period,date_stop:0
msgid "End of Period"
msgstr ""
msgstr "Fim do período"
#. module: account
#: wizard_button:populate_statement_from_inv,go,finish:0
@@ -2786,7 +2796,7 @@ msgstr "Direcção da analise"
#. module: account
#: wizard_button:populate_statement_from_inv,init,go:0
msgid "_Go"
msgstr ""
msgstr "_Ir"
#. module: account
#: field:res.partner,ref_companies:0
@@ -2898,7 +2908,7 @@ msgstr "De declarações, criar entradas"
#. module: account
#: field:account.analytic.account,complete_name:0
msgid "Full Account Name"
msgstr ""
msgstr "Nome completo da conta"
#. module: account
#: rml:account.account.balance:0
@@ -3155,7 +3165,7 @@ msgstr "Factura proposta a ser verificado, validado e imprimido"
#. 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
@@ -3269,7 +3279,7 @@ msgstr "Nenhum(a)"
#: model:ir.actions.wizard,name:account.wizard_fiscalyear_close
#: model:ir.ui.menu,name:account.menu_wizard_fy_close
msgid "Generate Fiscal Year Opening Entries"
msgstr ""
msgstr "Gerar os movimentos de abertura do exercício."
#. module: account
#: model:ir.actions.wizard,name:account.wizard_reconcile
@@ -3530,7 +3540,7 @@ msgstr "Ano fiscal"
#. module: account
#: rml:account.overdue:0
msgid "Balance :"
msgstr ""
msgstr "Saldo:"
#. module: account
#: selection:account.account.balance.report,checktype,display_account:0
@@ -3608,7 +3618,7 @@ msgstr "Manual"
#. module: account
#: view:account.invoice:0
msgid "Compute Taxes"
msgstr ""
msgstr "Calcular impostos"
#. module: account
#: field:wizard.multi.charts.accounts,code_digits:0
@@ -3657,7 +3667,7 @@ msgstr "Sequência"
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_template
msgid "Template for Fiscal Position"
msgstr ""
msgstr "Modelo de posição fiscal"
#. module: account
#: view:account.bank.statement:0
@@ -3742,7 +3752,7 @@ msgstr "Assistente de configuração de contas "
#: field:account.fiscalyear,date_start:0
#: field:account.subscription,date_start:0
msgid "Start Date"
msgstr ""
msgstr "Data de Início"
#. module: account
#: wizard_view:account.general.ledger.report,account_selection:0
@@ -3859,7 +3869,7 @@ msgstr "Movimento"
#. module: account
#: help:account.period,special:0
msgid "These periods can overlap."
msgstr ""
msgstr "Estes períodos podem sobrepor-se"
#. module: account
#: help:product.template,property_account_expense:0
@@ -3890,7 +3900,7 @@ msgstr "Por período"
#. module: account
#: help:account.invoice,date_invoice:0
msgid "Keep empty to use the current date"
msgstr ""
msgstr "Deixe vazio para usar a data actual"
#. module: account
#: rml:account.overdue:0
@@ -3900,7 +3910,7 @@ msgstr "."
#. module: account
#: field:account.analytic.account,quantity_max:0
msgid "Maximum Quantity"
msgstr ""
msgstr "Quantidade Máxima"
#. module: account
#: field:account.period,name:0
@@ -3962,7 +3972,7 @@ msgstr "Seleccionar movimentos"
#. module: account
#: selection:account.chart,init,target_move:0
msgid "All Posted Entries"
msgstr ""
msgstr "Todos os movimentos confirmados"
#. module: account
#: wizard_field:account.vat.declaration,init,based_on:0
@@ -4024,7 +4034,7 @@ msgstr "Imposto de reembolso da conta"
#: field:account.tax.code,child_ids:0
#: field:account.tax.code.template,child_ids:0
msgid "Child Codes"
msgstr ""
msgstr "Códigos-filho"
#. module: account
#: field:account.invoice,move_name:0
@@ -4116,7 +4126,7 @@ msgstr "Transferência de crédito"
#. module: account
#: field:wizard.multi.charts.accounts,seq_journal:0
msgid "Separated Journal Sequences"
msgstr ""
msgstr "Sequências de diário separadas"
#. module: account
#: help:account.bank.statement.reconcile,total_second_currency:0
@@ -4367,7 +4377,7 @@ msgstr "Notas de crédito"
#: field:account.config.wizard,date2:0
#: field:account.fiscalyear,date_stop:0
msgid "End Date"
msgstr ""
msgstr "Data final"
#. module: account
#: model:ir.actions.wizard,name:account.wizard_open_closed_fiscalyear
@@ -4418,7 +4428,7 @@ msgstr ""
#. module: account
#: view:ir.sequence:0
msgid "Fiscal Year Sequences"
msgstr ""
msgstr "Sequência de exercício fiscal"
#. module: account
#: view:account.model.line:0
@@ -4463,7 +4473,7 @@ msgstr "Debito do fornecedor"
#. module: account
#: help:account.model.line,quantity:0
msgid "The optional quantity on entries"
msgstr ""
msgstr "A quantidade optconal nos movimentos"
#. module: account
#: rml:account.third_party_ledger:0
@@ -4597,7 +4607,7 @@ msgstr "Entradas codificadas por movimentos"
#. module: account
#: wizard_view:account.analytic.account.chart,init:0
msgid "Analytic Account Charts"
msgstr ""
msgstr "Plano de contas analítico"
#. module: account
#: wizard_field:account.aged.trial.balance,init,result_selection:0
@@ -4760,7 +4770,7 @@ msgstr ""
#. module: account
#: selection:account.invoice,state:0
msgid "Cancelled"
msgstr ""
msgstr "Cancelada"
#. module: account
#: model:ir.actions.act_window,name:account.action_bank_statement_draft_tree
@@ -4849,7 +4859,7 @@ msgstr "Total:"
#. 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
@@ -4956,7 +4966,7 @@ msgstr "Linhas de factura"
#. module: account
#: field:account.period,date_start:0
msgid "Start of Period"
msgstr ""
msgstr "Início do período"
#. module: account
#: wizard_field:account.fiscalyear.close,init,report_name:0
addons/account/i18n/pt_BR.po
+223 -136
View File
File diff suppressed because it is too large Load Diff
addons/account/i18n/ro.po
+7 -7
View File
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 5.0.0\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
"PO-Revision-Date: 2009-11-17 09:48+0000\n"
"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
"PO-Revision-Date: 2009-12-10 10:27+0000\n"
"Last-Translator: geopop65 <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: 2009-11-18 04:37+0000\n"
"X-Launchpad-Export-Date: 2009-12-16 05:12+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account
@@ -2486,7 +2486,7 @@ msgstr "Deschidere jurnal"
#. module: account
#: rml:account.analytic.account.journal:0
msgid "KI"
msgstr ""
msgstr "Kl"
#. module: account
#: model:ir.actions.wizard,name:account.action_account_analytic_line
@@ -2741,7 +2741,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
@@ -4543,7 +4543,7 @@ msgstr "Cantitatea opţională din înregistrări"
#: rml:account.third_party_ledger:0
#: rml:account.third_party_ledger_other:0
msgid "JNRL"
msgstr ""
msgstr "JRNL"
#. module: account
#: view:account.fiscalyear:0
@@ -5725,7 +5725,7 @@ msgstr "Tipărire declaraţie TVA"
#. module: account
#: model:ir.actions.report.xml,name:account.account_intracom
msgid "IntraCom"
msgstr ""
msgstr "ComInt"
#. module: account
#: view:account.analytic.account:0
addons/account/i18n/ru.po
+52 -37
View File
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 5.0.0\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
"PO-Revision-Date: 2009-11-17 09:47+0000\n"
"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
"PO-Revision-Date: 2009-12-16 08:27+0000\n"
"Last-Translator: Casufi <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: 2009-11-18 04:37+0000\n"
"X-Launchpad-Export-Date: 2009-12-17 04:44+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account
@@ -24,7 +24,7 @@ msgstr "Внутреннее название"
#. module: account
#: view:account.tax.code:0
msgid "Account Tax Code"
msgstr "Налоговый код счета"
msgstr "Код налогового счёта"
#. module: account
#: model:ir.actions.act_window,name:account.action_invoice_tree9
@@ -40,27 +40,27 @@ 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
msgid "Asset"
msgstr "Активы"
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
@@ -73,11 +73,14 @@ 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 ""
"Не заполняйте для того, чтобы использовать период проверки (счета-фактуры)"
#. module: account
#: wizard_view:account.automatic.reconcile,reconcile:0
@@ -87,7 +90,7 @@ 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
@@ -99,7 +102,7 @@ msgstr ""
#. module: account
#: view:account.account:0
msgid "Account Statistics"
msgstr ""
msgstr "Статистика по счету"
#. module: account
#: model:ir.actions.wizard,name:account.wizard_vat_declaration
@@ -115,12 +118,12 @@ 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
@@ -139,7 +142,7 @@ 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
@@ -172,12 +175,12 @@ msgstr ""
#. module: account
#: view:account.move:0
msgid "Total Credit"
msgstr ""
msgstr "Итого по кредиту"
#. module: account
#: field:account.config.wizard,charts:0
msgid "Charts of Account"
msgstr ""
msgstr "Планы счетов"
#. module: account
#: model:ir.actions.wizard,name:account.wizard_move_line_select
@@ -200,7 +203,7 @@ msgstr "Проводки модели счета"
#. module: account
#: field:account.tax.code,sum_period:0
msgid "Period Sum"
msgstr "Сумма периода"
msgstr "Сумма за период"
#. module: account
#: view:account.tax:0
@@ -217,12 +220,12 @@ 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
@@ -242,7 +245,7 @@ msgstr "Сумма"
#: 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
@@ -252,12 +255,12 @@ msgstr "Налоги поставщиков"
#. module: account
#: view:account.move:0
msgid "Total Debit"
msgstr ""
msgstr "Итого по дебету"
#. module: account
#: rml:account.tax.code.entries:0
msgid "Accounting Entries-"
msgstr ""
msgstr "Бухгалтерские проводки-"
#. module: account
#: help:account.journal,view_id:0
@@ -267,6 +270,11 @@ msgid ""
"in which order. You can create your own view for a faster encoding in each "
"journal."
msgstr ""
"Открывает режим просмотра использовавшийся при вводе проводок или их "
"просмотре в книге проводок. Вид сообщает Open ERP какие поля должны быть "
"видимыми и необходимы в режиме изменения/добавления или только для чтения и "
"в каком порядке. Вы можете создать свой собственный режим просмотра для "
"быстрого редактирования каждой книги проводок."
#. module: account
#: help:account.invoice,date_due:0
@@ -277,6 +285,11 @@ msgid ""
"date empty, it means direct payment. The payment term may compute several "
"due dates, for example 50% now, 50% in one month."
msgstr ""
"При использовании условий платежа, дата валютирования будет сгенерирована "
"автоматически при создании проводок. Если вы оставляете условия платежа и "
"дату валютирования незаполненными - это будет подразумевать прямой платеж. "
"Условия платежа могут включать в себя несколько дат валютирования, например "
"50% сегодня, 50% в следующем месяце."
#. module: account
#: selection:account.tax,type:0
@@ -288,7 +301,7 @@ msgstr "Фиксированный"
#: model:ir.actions.report.xml,name:account.account_overdue
#: view:res.company:0
msgid "Overdue Payments"
msgstr ""
msgstr "Просроченные платежи"
#. module: account
#: wizard_view:account.account.balance.report,checktype:0
@@ -325,7 +338,7 @@ msgstr "Рассчитать подписку"
#. module: account
#: rml:account.central.journal:0
msgid "Account Num."
msgstr ""
msgstr "Номер счета"
#. module: account
#: rml:account.analytic.account.analytic.check:0
@@ -350,7 +363,7 @@ msgstr ""
#: field:account.move.line,analytic_account_id:0
#: field:report.hr.timesheet.invoice.journal,account_id:0
msgid "Analytic Account"
msgstr "Счет аналитики"
msgstr "Счет аналитического учета"
#. module: account
#: field:account.tax,child_depend:0
@@ -373,7 +386,7 @@ msgstr "Описание счетов"
#. module: account
#: constraint:account.analytic.account:0
msgid "Error! You can not create recursive analytic accounts."
msgstr ""
msgstr "Ошибка! Вы не можете создать рекурсивные счета аналитического учета."
#. module: account
#: field:account.bank.statement.reconcile,total_entry:0
@@ -395,7 +408,7 @@ msgstr "Разрешить отменяющие проводки"
#: model:process.transition,name:account.process_transition_paymentorderbank0
#: model:process.transition,name:account.process_transition_paymentorderreconcilation0
msgid "Payment Reconcilation"
msgstr ""
msgstr "Согласование платежа"
#. module: account
#: model:account.journal,name:account.expenses_journal
@@ -415,17 +428,17 @@ msgstr "Дата:"
#. module: account
#: selection:account.account.type,sign:0
msgid "Negative"
msgstr "Отрицательная"
msgstr "Отрицательный"
#. module: account
#: rml:account.partner.balance:0
msgid "(Account/Partner) Name"
msgstr ""
msgstr "Имя счета/контрагента"
#. module: account
#: selection:account.move,type:0
msgid "Contra"
msgstr ""
msgstr "Сторно"
#. module: account
#: field:account.analytic.account,state:0
@@ -452,7 +465,7 @@ msgstr "Специальные расчеты"
#. module: account
#: model:process.transition,note:account.process_transition_confirmstatementfromdraft0
msgid "Confirm statement with/without reconciliation from draft statement"
msgstr ""
msgstr "Подтвердите платеж по счету (с согласованием или без)"
#. module: account
#: wizard_view:account.move.bank.reconcile,init:0
@@ -464,7 +477,7 @@ msgstr "Сверка банковской выписки"
#. module: account
#: rml:account.invoice:0
msgid "Disc.(%)"
msgstr ""
msgstr "Дисконт (%)"
#. module: account
#: rml:account.general.ledger:0
@@ -486,6 +499,8 @@ msgid ""
"Set if the amount of tax must be included in the base amount before "
"computing the next taxes."
msgstr ""
"Включить, если сумма налога должна быть включена в расчетную сумму перед "
"расчетом других налогов."
#. module: account
#: model:ir.ui.menu,name:account.menu_finance_periodical_processing
@@ -528,7 +543,7 @@ msgstr ""
#. module: account
#: field:account.invoice,reconciled:0
msgid "Paid/Reconciled"
msgstr "Оплачено / сверено"
msgstr "Оплаченный/согласованный"
#. module: account
#: field:account.account.type,close_method:0
@@ -681,7 +696,7 @@ msgstr ""
#. module: account
#: field:account.invoice,comment:0
msgid "Additional Information"
msgstr ""
msgstr "Дополнительная информация"
#. module: account
#: selection:account.invoice,type:0
@@ -691,7 +706,7 @@ msgstr "Возвпат денег клиенту"
#. module: account
#: wizard_view:account.analytic.account.chart,init:0
msgid "Select the Period for Analysis"
msgstr ""
msgstr "Выберите период для проведения анализа"
#. module: account
#: field:account.tax,ref_tax_sign:0
@@ -704,7 +719,7 @@ msgstr ""
#. module: account
#: help:res.partner,credit:0
msgid "Total amount this customer owes you."
msgstr ""
msgstr "Общая сумма долга покупателя перед вами"
#. module: account
#: view:account.move.line:0
@@ -741,7 +756,7 @@ msgstr "Журнал проводок конца года"
#: view:product.product:0
#: view:product.template:0
msgid "Purchase Properties"
msgstr ""
msgstr "Свойства покупки"
#. module: account
#: model:process.node,note:account.process_node_paymententries0
addons/account/i18n/si.po
+1 -1
View File
@@ -14,7 +14,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2009-11-17 05:00+0000\n"
"X-Launchpad-Export-Date: 2009-12-16 05:12+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account
addons/account/i18n/sk.po
+5932
View File
File diff suppressed because it is too large Load Diff
addons/account/i18n/sl.po
+108 -84
View File
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 5.0.0\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
"PO-Revision-Date: 2009-11-18 06:41+0000\n"
"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
"PO-Revision-Date: 2009-12-10 13:46+0000\n"
"Last-Translator: Simon Vidmar <Unknown>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2009-11-19 04:35+0000\n"
"X-Launchpad-Export-Date: 2009-12-16 05:12+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account
@@ -35,17 +35,17 @@ msgstr "Neplačani računi dobaviteljem"
#. module: account
#: model:ir.ui.menu,name:account.menu_finance_entries
msgid "Entries Encoding"
msgstr ""
msgstr "Knjiženje"
#. 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 "Določite besedilo opomina za zapadla plačila."
#. module: account
#: model:process.transition,name:account.process_transition_confirmstatementfromdraft0
msgid "Confirm statement from draft"
msgstr ""
msgstr "Potrdite predlog izpiska."
#. module: account
#: model:account.account.type,name:account.account_type_asset
@@ -73,6 +73,8 @@ msgid ""
"This account will be used to value incoming stock for the current product "
"category"
msgstr ""
"Ta konto bo uporabljen za vrednotenje prevzetih zalog za izbrano kategorijo "
"proizvodov."
#. module: account
#: help:account.invoice,period_id:0
@@ -111,12 +113,12 @@ msgstr "Natisni davčno poročilo"
#. module: account
#: field:account.account,parent_id:0
msgid "Parent"
msgstr "Starš"
msgstr "Nadrejeni"
#. module: account
#: selection:account.move,type:0
msgid "Journal Voucher"
msgstr ""
msgstr "Dnevnik za kupone."
#. module: account
#: field:account.invoice,residual:0
@@ -169,6 +171,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 ""
"Dan v mesecu, -1 za zadnji dan tekočega meseca. Če pozitiven, bo pomenil dan "
"v naslednjem mesecu. izberite 0 za točno število dni (drugače se izračuna od "
"začetka meseca)."
#. module: account
#: view:account.move:0
@@ -183,7 +188,7 @@ msgstr "Kontni načrt"
#. module: account
#: model:ir.actions.wizard,name:account.wizard_move_line_select
msgid "Move line select"
msgstr ""
msgstr "Izberite knjižbo."
#. module: account
#: rml:account.journal.period.print:0
@@ -218,12 +223,12 @@ msgstr "Vnosna vrstica konta"
#. module: account
#: wizard_view:account.aged.trial.balance,init:0
msgid "Aged Trial Balance"
msgstr ""
msgstr "Izpis po zapadlosti"
#. module: account
#: model:ir.ui.menu,name:account.menu_finance_recurrent_entries
msgid "Recurrent Entries"
msgstr ""
msgstr "Ponavljajoče se knjižbe"
#. module: account
#: field:account.analytic.line,amount:0
@@ -243,7 +248,7 @@ msgstr "Znesek"
#: 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 "Saldakonti"
#. module: account
#: field:product.template,supplier_taxes_id:0
@@ -258,7 +263,7 @@ msgstr "Skupaj breme"
#. module: account
#: rml:account.tax.code.entries:0
msgid "Accounting Entries-"
msgstr ""
msgstr "Računovodske knjižbe"
#. module: account
#: help:account.journal,view_id:0
@@ -351,13 +356,13 @@ msgstr "Transakcije v breme"
#: field:account.move.line,analytic_account_id:0
#: field:report.hr.timesheet.invoice.journal,account_id:0
msgid "Analytic Account"
msgstr "Stroškovno mesto"
msgstr "Analitični konto"
#. module: account
#: field:account.tax,child_depend:0
#: field:account.tax.template,child_depend:0
msgid "Tax on Children"
msgstr ""
msgstr "Izračunaj davke po podrejenih zapisih"
#. module: account
#: rml:account.central.journal:0
@@ -396,12 +401,12 @@ msgstr "Omogoči storniranje vknjižb"
#: model:process.transition,name:account.process_transition_paymentorderbank0
#: model:process.transition,name:account.process_transition_paymentorderreconcilation0
msgid "Payment Reconcilation"
msgstr ""
msgstr "Zapiranje plačil"
#. module: account
#: model:account.journal,name:account.expenses_journal
msgid "Journal de frais"
msgstr ""
msgstr "Dnevnik provizij"
#. module: account
#: model:ir.actions.act_window,name:account.act_acc_analytic_acc_5_report_hr_timesheet_invoice_journal
@@ -421,7 +426,7 @@ msgstr "Negativno"
#. module: account
#: rml:account.partner.balance:0
msgid "(Account/Partner) Name"
msgstr ""
msgstr "Ime partnerja"
#. module: account
#: selection:account.move,type:0
@@ -453,7 +458,7 @@ msgstr "Poseben izračun"
#. module: account
#: model:process.transition,note:account.process_transition_confirmstatementfromdraft0
msgid "Confirm statement with/without reconciliation from draft statement"
msgstr ""
msgstr "Na podlagi osnutka potrdite izpisek z ali brez zapiranja plačil"
#. module: account
#: wizard_view:account.move.bank.reconcile,init:0
@@ -479,7 +484,7 @@ msgstr "Sklic"
#. module: account
#: field:account.tax.template,type_tax_use:0
msgid "Tax Use In"
msgstr ""
msgstr "Uporaba davka v"
#. module: account
#: help:account.tax.template,include_base_amount:0
@@ -487,6 +492,8 @@ msgid ""
"Set if the amount of tax must be included in the base amount before "
"computing the next taxes."
msgstr ""
"Izberite če je potrebno davek vključiti v osnovo pred obračunom naslednjih "
"davkov."
#. module: account
#: model:ir.ui.menu,name:account.menu_finance_periodical_processing
@@ -502,7 +509,7 @@ msgstr "Statistika stroškovnih mest"
#: 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 ""
msgstr "Predloge davčnih šifer"
#. module: account
#: view:account.invoice:0
@@ -513,12 +520,12 @@ msgstr "Račun dobavitelja"
#: model:process.transition,name:account.process_transition_reconcilepaid0
#: model:process.transition,name:account.process_transition_supplierreconcilepaid0
msgid "Reconcile Paid"
msgstr ""
msgstr "Zapri plačano"
#. module: account
#: wizard_field:account.chart,init,target_move:0
msgid "Target Moves"
msgstr ""
msgstr "Ciljni premik"
#. module: account
#: model:ir.actions.act_window,name:account.action_account_tax_template_form
@@ -539,13 +546,13 @@ msgstr "Metoda zaključevanja"
#. module: account
#: field:account.tax.template,include_base_amount:0
msgid "Include in Base Amount"
msgstr ""
msgstr "Vključiti v osnovo"
#. module: account
#: field:account.tax,ref_base_code_id:0
#: field:account.tax.template,ref_base_code_id:0
msgid "Refund Base Code"
msgstr ""
msgstr "Šifra osnove za vračilo"
#. module: account
#: view:account.invoice.line:0
@@ -569,6 +576,9 @@ msgid ""
"Number of days to add before computation of the day of month.If Date=15/01, "
"Number of Days=22, Day of Month=-1, then the due date is 28/02."
msgstr ""
"Število dni, ki jih je potrebno dodati pred izračunom dneva v mesecu. Če je "
"Datum=15.1, Število dni=22, Dan v mesecu=-1, potem to pomeni, da je datum "
"zapadlosti 28.2.."
#. module: account
#: model:ir.model,name:account.model_account_tax
@@ -583,7 +593,7 @@ msgstr "Datum izpisa"
#. module: account
#: rml:account.general.ledger:0
msgid "Mvt"
msgstr ""
msgstr "Premik"
#. module: account
#: model:ir.actions.wizard,name:account.wizard_aged_trial_balance
@@ -602,17 +612,19 @@ msgid ""
"The sequence field is used to order the resources from lower sequences to "
"higher ones"
msgstr ""
"Polje zaporedna številka se uporablja za urejanje resursov in sicer od "
"manjših k večjim."
#. module: account
#: wizard_view:account.analytic.account.chart,init:0
#: wizard_view:account.analytic.line,init:0
msgid "(Keep empty to open the current situation)"
msgstr ""
msgstr "(Postite prazno da se odpre terenutno stanje)"
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_account
msgid "Fiscal Position Accounts Mapping"
msgstr ""
msgstr "Preslikava kontov glede na davčno pozicijo"
#. module: account
#: field:account.analytic.account,contact_id:0
@@ -649,7 +661,7 @@ msgstr "Znesek odpisa"
#. module: account
#: help:account.fiscalyear,company_id:0
msgid "Keep empty if the fiscal year belongs to several companies."
msgstr ""
msgstr "Postite prazno, če poslovno leto pripada večim podjetjem"
#. module: account
#: model:ir.ui.menu,name:account.menu_analytic_accounting
@@ -677,7 +689,7 @@ msgstr "mesec"
#. module: account
#: field:account.analytic.account,partner_id:0
msgid "Associated Partner"
msgstr ""
msgstr "Pridružen partner"
#. module: account
#: field:account.invoice,comment:0
@@ -736,7 +748,7 @@ msgstr "Podpiši za nadrejenega"
#. module: account
#: field:account.fiscalyear,end_journal_period_id:0
msgid "End of Year Entries Journal"
msgstr ""
msgstr "Dnevnik knjižb za zaključek leta"
#. module: account
#: view:product.product:0
@@ -804,7 +816,7 @@ msgstr "(Prazno za vsa odprta davčna leta)"
#. module: account
#: field:account.invoice,move_lines:0
msgid "Move Lines"
msgstr ""
msgstr "Postavke knjižb"
#. module: account
#: model:ir.model,name:account.model_account_config_wizard
@@ -823,6 +835,8 @@ msgid ""
"These types are defined according to your country. The type contain more "
"information about the account and it's specificities."
msgstr ""
"Tipi so določeni glede na državo. Tip vsebuje več informacij o kontu in "
"njegovih posebnostih."
#. module: account
#: selection:account.automatic.reconcile,init,power:0
@@ -894,7 +908,7 @@ msgstr "Valuta zneska"
#. module: account
#: field:account.chart.template,property_account_expense_categ:0
msgid "Expense Category Account"
msgstr ""
msgstr "Konto vrste stroškov"
#. module: account
#: wizard_field:account.fiscalyear.close,init,fy2_id:0
@@ -1033,7 +1047,7 @@ msgstr "Otroci"
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_tax
msgid "Fiscal Position Taxes Mapping"
msgstr ""
msgstr "Preslikava davkov glede na davčno pozicijo"
#. module: account
#: model:ir.actions.act_window,name:account.action_invoice_tree2_new
@@ -1072,7 +1086,7 @@ msgstr "Izpiši dnevnik analitike"
#. module: account
#: rml:account.tax.code.entries:0
msgid "Voucher Nb"
msgstr ""
msgstr "Kupon Nb"
#. module: account
#: help:account.payment.term.line,sequence:0
@@ -1091,7 +1105,7 @@ msgstr "Odpis skupaj"
#. module: account
#: view:account.tax.template:0
msgid "Compute Code for Taxes included prices"
msgstr ""
msgstr "Koda izračuna za davke v cenah"
#. module: account
#: view:account.invoice.tax:0
@@ -1148,13 +1162,13 @@ msgstr "Dnevnik prodaje"
#. module: account
#: help:account.model.line,amount_currency:0
msgid "The amount expressed in an optional other currency."
msgstr ""
msgstr "Znesek izražen v poljubni drugi valuti"
#. module: account
#: view:account.fiscal.position.template:0
#: field:account.fiscal.position.template,name:0
msgid "Fiscal Position Template"
msgstr ""
msgstr "Vzorec za davčno pozicijo"
#. module: account
#: field:account.payment.term,line_ids:0
@@ -1220,7 +1234,7 @@ msgstr "Valute družba"
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_account_template
msgid "Fiscal Position Template Account Mapping"
msgstr ""
msgstr "Preslikava kontov za vzorec za davčno pozicijo"
#. module: account
#: field:account.analytic.account,parent_id:0
@@ -1230,7 +1244,7 @@ msgstr "Nadrejeni analitični konto"
#. module: account
#: wizard_button:account.move.line.reconcile,init_partial,addendum:0
msgid "Reconcile With Write-Off"
msgstr ""
msgstr "Zapri z odpisom"
#. module: account
#: field:account.move.line,tax_amount:0
@@ -1283,7 +1297,7 @@ msgstr "Neusklajene transakcije"
#: field:account.fiscal.position,tax_ids:0
#: field:account.fiscal.position.template,tax_ids:0
msgid "Tax Mapping"
msgstr ""
msgstr "Preslikava davkov"
#. module: account
#: view:account.config.wizard:0
@@ -1326,7 +1340,7 @@ msgstr "Sporočilo"
#. module: account
#: model:process.node,note:account.process_node_supplierpaymentorder0
msgid "Select invoices you want to pay and manages advances"
msgstr ""
msgstr "Izbere račune, ki jih želite plačati in upravlja z avansi"
#. module: account
#: selection:account.account,type:0
@@ -1354,13 +1368,13 @@ msgstr "Analitične vrstice"
#. module: account
#: help:account.tax,type:0
msgid "The computation method for the tax amount."
msgstr ""
msgstr "Metoda izračuna za znesek davka"
#. module: account
#: model:process.node,note:account.process_node_accountingentries0
#: model:process.node,note:account.process_node_supplieraccountingentries0
msgid "Validated accounting entries."
msgstr ""
msgstr "Potrjene knjižbe"
#. module: account
#: wizard_view:account.move.line.unreconcile,init:0
@@ -1467,6 +1481,8 @@ msgid ""
"The partner bank account to pay\n"
"Keep empty to use the default"
msgstr ""
"Partnerjev bančni račun\n"
"Pustite prazno za privzeti račun"
#. module: account
#: field:res.partner,debit:0
@@ -1603,7 +1619,7 @@ msgstr "Konti terjatev in obveznosti"
#: view:account.subscription:0
#: field:account.subscription,lines_id:0
msgid "Subscription Lines"
msgstr ""
msgstr "Postavke naročnine"
#. module: account
#: selection:account.analytic.journal,type:0
@@ -1712,7 +1728,7 @@ msgstr "Znova odpri"
#. module: account
#: wizard_view:account.fiscalyear.close,init:0
msgid "Are you sure you want to create entries?"
msgstr ""
msgstr "prosim potrdite knjiženje"
#. module: account
#: field:account.tax,include_base_amount:0
@@ -1733,7 +1749,7 @@ msgstr "Prekliči uskladitev vknjižb"
#. module: account
#: model:process.node,note:account.process_node_supplierdraftinvoices0
msgid "Pre-generated invoice from control"
msgstr ""
msgstr "Predgeneriran račun iz kontrole"
#. module: account
#: wizard_view:account.analytic.account.quantity_cost_ledger.report,init:0
@@ -1756,7 +1772,7 @@ msgstr "Od"
#: 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 "Zapiranje računov in plačil"
#. module: account
#: wizard_view:account.central.journal.report,init:0
@@ -1802,11 +1818,13 @@ msgid ""
"The fiscal position will determine taxes and the accounts used for the the "
"partner."
msgstr ""
"Davčna pozicija bo določila davke in konte, ki se bodo uporabljali za tega "
"partnerja."
#. module: account
#: rml:account.analytic.account.cost_ledger:0
msgid "Date or Code"
msgstr ""
msgstr "Datum ali šifra"
#. module: account
#: field:account.analytic.account,user_id:0
@@ -2023,6 +2041,9 @@ msgid ""
"'draft' state and instead goes directly to the 'posted state' without any "
"manual validation."
msgstr ""
"Odkljukajte ta kvadratek, če ne želite, da bo za vknjižbe na tem kontu "
"potrebna dodatna ročna potrditev prehoda statusa iz \"osnutka\" v "
"\"knjiženo\" (status \"knjiženo\" bodo pridobile avtomatično)."
#. module: account
#: field:account.bank.statement.line,partner_id:0
@@ -2042,6 +2063,7 @@ msgid ""
"Unique number of the invoice, computed automatically when the invoice is "
"created."
msgstr ""
"Zaporedna številka računa, izračunana avtomatično ob kreiranju računa."
#. module: account
#: rml:account.invoice:0
@@ -2071,12 +2093,12 @@ msgstr "Proces računa stranke"
#. module: account
#: rml:account.invoice:0
msgid "Fiscal Position Remark :"
msgstr ""
msgstr "Opomba za davčno pozicijo"
#. module: account
#: wizard_field:account.fiscalyear.close,init,period_id:0
msgid "Opening Entries Period"
msgstr ""
msgstr "Obdobje za otvoritve"
#. module: account
#: model:ir.actions.wizard,name:account.wizard_validate_account_moves
@@ -2117,7 +2139,7 @@ msgstr "Naplačani računi"
#. module: account
#: model:process.transition,name:account.process_transition_paymentreconcile0
msgid "Payment Reconcile"
msgstr ""
msgstr "Zapiranje plačil"
#. module: account
#: model:ir.actions.act_window,name:account.action_bank_statement_reconciliation_form
@@ -2145,7 +2167,7 @@ msgstr "Analitičen vnos"
#: view:res.company:0
#: field:res.company,overdue_msg:0
msgid "Overdue Payments Message"
msgstr ""
msgstr "Sporočilo za opomin za zapadle postavke"
#. module: account
#: model:ir.actions.act_window,name:account.action_tax_code_tree
@@ -2187,7 +2209,7 @@ msgstr "Pripravljeni računi dobaviteljev"
#. module: account
#: wizard_field:account.invoice.refund,init,period:0
msgid "Force period"
msgstr ""
msgstr "Vsili obdobje"
#. module: account
#: selection:account.account.type,close_method:0
@@ -2203,7 +2225,7 @@ msgstr "Zgoščeno"
#. module: account
#: field:account.chart.template,account_root_id:0
msgid "Root Account"
msgstr ""
msgstr "Osnovni konto"
#. module: account
#: rml:account.overdue:0
@@ -2236,17 +2258,17 @@ msgstr ""
#: model:ir.actions.wizard,name:account.wizard_generate_subscription
#: model:ir.ui.menu,name:account.menu_generate_subscription
msgid "Create subscription entries"
msgstr ""
msgstr "Kreiraj periodične vnose"
#. module: account
#: wizard_field:account.fiscalyear.close,init,journal_id:0
msgid "Opening Entries Journal"
msgstr ""
msgstr "Dnevnik otvoritev"
#. module: account
#: view:account.config.wizard:0
msgid "Create a Fiscal Year"
msgstr ""
msgstr "Kreiraj poslovno leto"
#. module: account
#: field:product.template,taxes_id:0
@@ -2265,7 +2287,7 @@ msgstr "Datum računa"
#: help:account.third_party_ledger.report,init,periods:0
#: help:account.vat.declaration,init,periods:0
msgid "All periods if empty"
msgstr ""
msgstr "Če prazno, potem vsa obdobja"
#. module: account
#: model:account.account.type,name:account.account_type_liability
@@ -2280,7 +2302,7 @@ msgstr "2"
#. module: account
#: wizard_view:account.chart,init:0
msgid "(If you do not select Fiscal year it will take all open fiscal years)"
msgstr ""
msgstr "( Če ne izberete poslovnega leta bo izbrano tekoče poslovno leto)"
#. module: account
#: help:account.invoice.tax,base_code_id:0
@@ -2327,7 +2349,7 @@ msgstr "Vrsta davka"
#. module: account
#: model:process.transition,name:account.process_transition_statemententries0
msgid "Statement Entries"
msgstr ""
msgstr "Postavke izpiska"
#. module: account
#: field:account.analytic.line,user_id:0
@@ -2354,7 +2376,7 @@ msgstr ""
#. module: account
#: rml:account.journal.period.print:0
msgid "Voucher No"
msgstr ""
msgstr "Številka kupona"
#. module: account
#: model:ir.actions.wizard,name:account.wizard_automatic_reconcile
@@ -2370,12 +2392,12 @@ msgstr "Uvozi račun"
#. module: account
#: wizard_view:account.analytic.account.quantity_cost_ledger.report,init:0
msgid "and Journals"
msgstr ""
msgstr "in dnevniki"
#. module: account
#: view:account.tax:0
msgid "Account Tax"
msgstr ""
msgstr "Davek za konto"
#. module: account
#: field:account.analytic.line,move_id:0
@@ -2385,7 +2407,7 @@ msgstr "Postavka prenosa"
#. module: account
#: field:account.bank.accounts.wizard,acc_no:0
msgid "Account No."
msgstr ""
msgstr "Številka konta"
#. module: account
#: help:account.tax,child_depend:0
@@ -2393,11 +2415,13 @@ msgid ""
"Set if the tax computation is based on the computation of child taxes rather "
"than on the total amount."
msgstr ""
"Izberite če izračun davka temelji na izračunih podrejenih davkov in ne na "
"celotnem znesku."
#. module: account
#: rml:account.central.journal:0
msgid "Journal Code"
msgstr ""
msgstr "Šifra dnevnika"
#. module: account
#: help:account.tax,applicable_type:0
@@ -2630,12 +2654,12 @@ msgstr "Stanje bilance"
#. module: account
#: field:wizard.company.setup,overdue_msg:0
msgid "Overdue Payment Message"
msgstr ""
msgstr "Besedilo za opomin za zapadle terjatve"
#. module: account
#: model:ir.model,name:account.model_account_tax_code_template
msgid "Tax Code Template"
msgstr ""
msgstr "Vzorec davčnih šifer"
#. module: account
#: rml:account.partner.balance:0
@@ -2660,7 +2684,7 @@ msgstr "Postopek zaključevanja leta"
#. module: account
#: model:ir.ui.menu,name:account.menu_generic_report
msgid "Generic Reports"
msgstr ""
msgstr "Splošna poročila"
#. module: account
#: wizard_field:account.automatic.reconcile,init,power:0
@@ -2701,7 +2725,7 @@ msgstr "Analitični kontni plan"
#. module: account
#: wizard_view:account.analytic.line,init:0
msgid "View Account Analytic Lines"
msgstr ""
msgstr "Pregled analitičnih vknjižb"
#. module: account
#: wizard_view:account.move.validate,init:0
@@ -2732,7 +2756,7 @@ msgstr "Neobdavčeno"
#: model:ir.actions.report.xml,name:account.account_analytic_account_inverted_balance
#: model:ir.actions.wizard,name:account.account_analytic_account_inverted_balance_report
msgid "Inverted Analytic Balance"
msgstr ""
msgstr "Obrnjena bilanca po analitičnih kontih"
#. module: account
#: field:account.tax,applicable_type:0
@@ -2765,12 +2789,12 @@ msgstr "Naziv"
#: wizard_view:account.move.line.reconcile,init_full:0
#: wizard_view:account.move.line.reconcile,init_partial:0
msgid "Reconciliation transactions"
msgstr ""
msgstr "transakcije zapiranja"
#. module: account
#: wizard_field:account.aged.trial.balance,init,direction_selection:0
msgid "Analysis Direction"
msgstr ""
msgstr "Smer analize"
#. module: account
#: wizard_button:populate_statement_from_inv,init,go:0
@@ -2856,12 +2880,12 @@ msgstr "S spoštovanjem,"
#. module: account
#: model:ir.model,name:account.model_report_hr_timesheet_invoice_journal
msgid "Analytic account costs and revenues"
msgstr ""
msgstr "Prihodki in stroški na analitičnem kontu"
#. module: account
#: wizard_view:account.invoice.refund,init:0
msgid "Are you sure you want to refund this invoice ?"
msgstr ""
msgstr "Res želite narediti dobropis za ta račun?"
#. module: account
#: model:ir.actions.wizard,name:account.wizard_paid_open
@@ -2882,7 +2906,7 @@ msgstr "Konto davkov"
#. module: account
#: model:process.transition,note:account.process_transition_statemententries0
msgid "From statement, create entries"
msgstr ""
msgstr "Iz izpiska naredi vknjižbe"
#. module: account
#: field:account.analytic.account,complete_name:0
@@ -2929,7 +2953,7 @@ msgstr "Računovodstvo"
#. module: account
#: view:account.fiscal.position.template:0
msgid "Taxes Mapping"
msgstr ""
msgstr "Preslikava davkov"
#. module: account
#: wizard_view:account.move.line.unreconcile,init:0
@@ -2941,7 +2965,7 @@ msgstr ""
#: model:process.transition,note:account.process_transition_paymentorderbank0
#: model:process.transition,note:account.process_transition_paymentorderreconcilation0
msgid "Reconcilation of entries from payment order."
msgstr ""
msgstr "Zapiranje vknjižb plačilnega naloga"
#. module: account
#: field:account.bank.statement,move_line_ids:0
@@ -2978,7 +3002,7 @@ msgstr "Davčna stopnja"
#. module: account
#: rml:account.analytic.account.journal:0
msgid "Analytic Journal -"
msgstr ""
msgstr "Analitični dnevnik"
#. module: account
#: rml:account.analytic.account.analytic.check:0
@@ -3013,7 +3037,7 @@ msgstr ""
#: selection:account.analytic.journal,type:0
#: selection:account.journal,type:0
msgid "Situation"
msgstr ""
msgstr "Stanje"
#. module: account
#: rml:account.invoice:0
@@ -4756,7 +4780,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 "Konti terjatev"
#. module: account
#: wizard_button:account.move.line.unreconcile.select,init,open:0
@@ -4845,7 +4869,7 @@ msgstr "Potrdi"
#. module: account
#: wizard_view:account.account.balance.report,account_selection:0
msgid "Select parent account"
msgstr ""
msgstr "Izberite nadrejeni konto"
#. module: account
#: field:account.account.template,parent_id:0
@@ -5292,7 +5316,7 @@ msgstr "Poslovno leto"
#. module: account
#: wizard_button:account.analytic.line,init,open:0
msgid "Open Entries"
msgstr ""
msgstr "Odprte postavke"
#. module: account
#: selection:account.analytic.account,type:0
@@ -5392,7 +5416,7 @@ msgstr "Izdani predračuni"
#. module: account
#: field:account.subscription,period_total:0
msgid "Number of Periods"
msgstr ""
msgstr "Število obdobij"
#. module: account
#: wizard_field:account.analytic.account.analytic.check.report,init,date2:0
addons/account/i18n/sr.po
+1 -1
View File
@@ -14,7 +14,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2009-11-17 05:00+0000\n"
"X-Launchpad-Export-Date: 2009-12-16 05:12+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account
addons/account/i18n/sv.po
+1 -1
View File
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2009-11-17 05:00+0000\n"
"X-Launchpad-Export-Date: 2009-12-16 05:13+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account
addons/account/i18n/te.po
+1 -1
View File
@@ -14,7 +14,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2009-11-17 05:00+0000\n"
"X-Launchpad-Export-Date: 2009-12-16 05:13+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account
addons/account/i18n/th.po
+1 -1
View File
@@ -14,7 +14,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2009-11-17 05:00+0000\n"
"X-Launchpad-Export-Date: 2009-12-16 05:13+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account
addons/account/i18n/tlh.po
+1 -1
View File
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2009-11-17 05:00+0000\n"
"X-Launchpad-Export-Date: 2009-12-16 05:13+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account
addons/account/i18n/tr.po
+1 -1
View File
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2009-11-18 04:37+0000\n"
"X-Launchpad-Export-Date: 2009-12-16 05:13+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account
addons/account/i18n/uk.po
+1 -1
View File
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2009-11-17 05:00+0000\n"
"X-Launchpad-Export-Date: 2009-12-16 05:13+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account
addons/account/i18n/vi.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-09-16 01:49+0000\n"
"Last-Translator: Nguyễn Thịnh <thinhnverp@gmail.com>\n"
"PO-Revision-Date: 2009-12-17 03:24+0000\n"
"Last-Translator: pdqt <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: 2009-11-17 05:00+0000\n"
"X-Launchpad-Export-Date: 2009-12-17 04:44+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account
addons/account/i18n/zh_CN.po
+956 -926
View File
File diff suppressed because it is too large Load Diff
addons/account/i18n/zh_HK.po
+1 -1
View File
@@ -14,7 +14,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2009-11-17 05:00+0000\n"
"X-Launchpad-Export-Date: 2009-12-16 05:13+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account
addons/account/i18n/zh_TW.po
+1 -1
View File
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2009-11-17 05:00+0000\n"
"X-Launchpad-Export-Date: 2009-12-16 05:13+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account
addons/account/invoice.py
+44 -27
View File
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
##############################################################################
#
#
# OpenERP, Open Source Management Solution
# Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
#
@@ -15,7 +15,7 @@
# GNU Affero General Public License for more details.
#
# You should have received a copy of the GNU Affero General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
##############################################################################
@@ -61,9 +61,13 @@ class account_invoice(osv.osv):
if context is None:
context = {}
type_inv = context.get('type', 'out_invoice')
user = self.pool.get('res.users').browse(cr, uid, uid)
company_id = context.get('company_id', user.company_id.id)
type2journal = {'out_invoice': 'sale', 'in_invoice': 'purchase', 'out_refund': 'sale', 'in_refund': 'purchase'}
journal_obj = self.pool.get('account.journal')
res = journal_obj.search(cr, uid, [('type', '=', type2journal.get(type_inv, 'sale'))], limit=1)
res = journal_obj.search(cr, uid, [('type', '=', type2journal.get(type_inv, 'sale')),
('company_id', '=', company_id)],
limit=1)
if res:
return res[0]
else:
@@ -128,7 +132,7 @@ class account_invoice(osv.osv):
else:
debit+=debit_tmp
credit+=credit_tmp
if not inv.amount_total:
result = 0.0
elif inv.type in ('out_invoice','in_refund'):
@@ -139,7 +143,7 @@ class account_invoice(osv.osv):
result = inv.amount_total - amount
# Use is_zero function to avoid rounding trouble => should be fixed into ORM
res[inv.id] = not self.pool.get('res.currency').is_zero(cr, uid, inv.company_id.currency_id,result) and result or 0.0
return res
def _get_lines(self, cr, uid, ids, name, arg, context=None):
@@ -209,7 +213,7 @@ class account_invoice(osv.osv):
move[line.move_id.id] = True
for line in r.line_id:
move[line.move_id.id] = True
invoice_ids = []
if move:
invoice_ids = self.pool.get('account.invoice').search(cr, uid, [('move_id','in',move.keys())], context=context)
@@ -260,7 +264,7 @@ class account_invoice(osv.osv):
'invoice_line': fields.one2many('account.invoice.line', 'invoice_id', 'Invoice Lines', readonly=True, states={'draft':[('readonly',False)]}),
'tax_line': fields.one2many('account.invoice.tax', 'invoice_id', 'Tax Lines', readonly=True, states={'draft':[('readonly',False)]}),
'move_id': fields.many2one('account.move', 'Invoice Movement', readonly=True, help="Link to the automatically generated account moves."),
'move_id': fields.many2one('account.move', 'Invoice Movement', readonly=True, help="Link to the automatically generated Ledger Postings."),
'amount_untaxed': fields.function(_amount_all, method=True, digits=(16, int(config['price_accuracy'])),string='Untaxed',
store={
'account.invoice': (lambda self, cr, uid, ids, c={}: ids, ['invoice_line'], 20),
@@ -291,10 +295,10 @@ class account_invoice(osv.osv):
'account.invoice': (lambda self, cr, uid, ids, c={}: ids, None, 50), # Check if we can remove ?
'account.move.line': (_get_invoice_from_line, None, 50),
'account.move.reconcile': (_get_invoice_from_reconcile, None, 50),
}, help="The account moves of the invoice have been reconciled with account moves of the payment(s)."),
}, help="The Ledger Postings of the invoice have been reconciled with Ledger Postings of the payment(s)."),
'partner_bank': fields.many2one('res.partner.bank', 'Bank Account',
help='The bank account to pay to or to be paid from'),
'move_lines':fields.function(_get_lines , method=True,type='many2many' , relation='account.move.line',string='Move 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=(16, int(config['price_accuracy'])),string='Residual',
store={
'account.invoice': (lambda self, cr, uid, ids, c={}: ids, ['invoice_line'], 50),
@@ -305,7 +309,7 @@ class account_invoice(osv.osv):
},
help="Remaining amount due."),
'payment_ids': fields.function(_compute_lines, method=True, relation='account.move.line', type="many2many", string='Payments'),
'move_name': fields.char('Account Move', size=64),
'move_name': fields.char('Ledger Posting', size=64),
'fiscal_position': fields.many2one('account.fiscal.position', 'Fiscal Position')
}
_defaults = {
@@ -314,10 +318,9 @@ class account_invoice(osv.osv):
'state': lambda *a: 'draft',
'journal_id': _get_journal,
'currency_id': _get_currency,
'company_id': lambda self, cr, uid, context: \
self.pool.get('res.users').browse(cr, uid, uid,
context=context).company_id.id,
'company_id': lambda self,cr,uid,c: self.pool.get('res.company')._company_default_get(cr, uid, 'account.invoice', c),
'reference_type': lambda *a: 'none',
'check_total': lambda *a: 0.0,
}
def unlink(self, cr, uid, ids, context=None):
@@ -545,7 +548,7 @@ class account_invoice(osv.osv):
for taxe in ait_obj.compute(cr, uid, id, context=context).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=context)
# self.pool.get('account.invoice').write(cr, uid, ids, {}, context=context)
return True
@@ -730,7 +733,7 @@ class account_invoice(osv.osv):
tmp += '-'+str(l.get('product_id',"False"))
tmp += '-'+str(l.get('analytic_account_id',"False"))
tmp += '-'+str(l.get('date_maturity',"False"))
if tmp in line2:
am = line2[tmp]['debit'] - line2[tmp]['credit'] + (l['debit'] - l['credit'])
line2[tmp]['debit'] = (am > 0) and am or 0.0
@@ -759,7 +762,7 @@ class account_invoice(osv.osv):
for i in line:
i[2]['period_id'] = period_id
move_id = self.pool.get('account.move').create(cr, uid, move)
move_id = self.pool.get('account.move').create(cr, uid, move, context=context)
new_move_name = self.pool.get('account.move').browse(cr, uid, move_id).name
# make the invoice point to that move
self.write(cr, uid, [inv.id], {'move_id': move_id,'period_id':period_id, 'move_name':new_move_name})
@@ -875,7 +878,7 @@ class account_invoice(osv.osv):
}
return [(r['id'], types[r['type']]+(r['number'] or '')+' '+(r['name'] or '')) for r in self.read(cr, uid, ids, ['type', 'number', 'name'], context, load='_classic_write')]
def name_search(self, cr, user, name, args=None, operator='ilike', context=None, limit=80):
def name_search(self, cr, user, name, args=None, operator='ilike', context=None, limit=100):
if not args:
args=[]
if context is None:
@@ -971,7 +974,7 @@ class account_invoice(osv.osv):
date=context['date_p']
else:
date=time.strftime('%Y-%m-%d')
# Take the amount in currency and the currency of the payment
if 'amount_currency' in context and context['amount_currency'] and 'currency_id' in context and context['currency_id']:
amount_currency = context['amount_currency']
@@ -979,7 +982,7 @@ class account_invoice(osv.osv):
else:
amount_currency = False
currency_id = False
# Pay attention to the sign for both debit/credit AND amount_currency
l1 = {
'debit': direction * pay_amount>0 and direction * pay_amount,
@@ -990,6 +993,7 @@ class account_invoice(osv.osv):
'date': date,
'currency_id':currency_id,
'amount_currency':amount_currency and direction * amount_currency or 0.0,
'company_id': invoice.company_id.id,
}
l2 = {
'debit': direction * pay_amount<0 and - direction * pay_amount,
@@ -1000,6 +1004,7 @@ class account_invoice(osv.osv):
'date': date,
'currency_id':currency_id,
'amount_currency':amount_currency and - direction * amount_currency or 0.0,
'company_id': invoice.company_id.id,
}
if not name:
@@ -1081,7 +1086,7 @@ class account_invoice_line(osv.osv):
'invoice_line_tax_id': fields.many2many('account.tax', 'account_invoice_line_tax', 'invoice_line_id', 'tax_id', 'Taxes', domain=[('parent_id','=',False)]),
'note': fields.text('Notes'),
'account_analytic_id': fields.many2one('account.analytic.account', 'Analytic Account'),
'company_id': fields.related('invoice_id','company_id',type='many2one',object='res.company',string='Company')
'company_id': fields.related('invoice_id','company_id',type='many2one',relation='res.company',string='Company',store=True)
}
_defaults = {
'quantity': lambda *a: 1,
@@ -1097,7 +1102,7 @@ class account_invoice_line(osv.osv):
price_unit = price_unit - tax['amount']
return {'price_unit': price_unit,'invoice_line_tax_id': tax_id}
def product_id_change(self, cr, uid, ids, product, uom, qty=0, name='', type='out_invoice', partner_id=False, fposition_id=False, price_unit=False, address_invoice_id=False, context=None):
def product_id_change(self, cr, uid, ids, product, uom, qty=0, name='', type='out_invoice', partner_id=False, fposition_id=False, price_unit=False, address_invoice_id=False, currency_id=False, context=None):
if context is None:
context = {}
company_id = context.get('company_id',False)
@@ -1207,10 +1212,21 @@ class account_invoice_line(osv.osv):
res2 = res.uom_id.category_id.id
if res2 :
domain = {'uos_id':[('category_id','=',res2 )]}
prod_pool=self.pool.get('product.product')
result['categ_id'] = res.categ_id.id
return {'value':result, 'domain':domain}
result['categ_id'] = res.categ_id.id
res_final = {'value':result, 'domain':domain}
if not company_id and not currency_id:
return res_final
company = self.pool.get('res.company').browse(cr, uid, company_id)
currency = self.pool.get('res.currency').browse(cr, uid, currency_id)
if company.currency_id.id != currency.id and currency.company_id.id == company.id:
new_price = res_final['value']['price_unit'] * currency.rate
res_final['value']['price_unit'] = new_price
return res_final
def move_line_get(self, cr, uid, invoice_id, context=None):
res = []
@@ -1296,13 +1312,14 @@ class account_invoice_tax(osv.osv):
'base_amount': fields.float('Base Code Amount', digits=(16,int(config['price_accuracy']))),
'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=(16,int(config['price_accuracy']))),
'company_id': fields.related('account_id','company_id',type='many2one',relation='res.company',string='Company',store=True),
}
def base_change(self, cr, uid, ids, base,currency_id=False,company_id=False,date_invoice=False):
cur_obj = self.pool.get('res.currency')
company_obj = self.pool.get('res.company')
company_currency=False
if company_id:
if company_id:
company_currency = company_obj.read(cr,uid,[company_id],['currency_id'])[0]['currency_id'][0]
if currency_id and company_currency:
base = cur_obj.compute(cr, uid, currency_id, company_currency, base, context={'date': date_invoice or time.strftime('%Y-%m-%d')}, round=False)
@@ -1317,7 +1334,7 @@ class account_invoice_tax(osv.osv):
if currency_id and company_currency:
amount = cur_obj.compute(cr, uid, currency_id, company_currency, amount, context={'date': date_invoice or time.strftime('%Y-%m-%d')}, round=False)
return {'value': {'tax_amount':amount}}
_order = 'sequence'
_defaults = {
'manual': lambda *a: 1,
addons/account/partner_view.xml
+2 -2
View File
@@ -9,7 +9,7 @@
<field name="arch" type="xml">
<form string="Fiscal Position">
<field name="name" select="1"/>
<field name="company_id" widget="selection"/>
<field name="company_id" widget="selection" groups="base.group_multi_company"/>
<newline/>
<field name="note" colspan="4"/>
<field name="tax_ids" colspan="4" widget="one2many_list">
@@ -42,7 +42,7 @@
<field name="arch" type="xml">
<tree string="Fiscal Position">
<field name="name"/>
<field name="company_id"/>
<field name="company_id" groups="base.group_multi_company"/>
</tree>
</field>
</record>
addons/account/process/customer_invoice_process.xml
+1 -1
View File
@@ -28,7 +28,7 @@
</record>
<record id="process_node_draftinvoices0" model="process.node">
<field name="menu_id" ref="account.menu_invoice_draft"/>
<field name="menu_id" ref="account.menu_action_invoice_tree1"/>
<field name="model_id" ref="account.model_account_invoice"/>
<field eval="&quot;&quot;&quot;state&quot;&quot;&quot;" name="kind"/>
<field eval="&quot;&quot;&quot;Draft Invoice&quot;&quot;&quot;" name="name"/>
addons/account/process/statement_process.xml
+13 -12
View File
@@ -1,21 +1,21 @@
<?xml version="1.0" ?>
<openerp>
<data>
<!--
Process
-->
<record id="process_process_statementprocess0" model="process.process">
<field eval="1" name="active"/>
<field name="model_id" ref="account.model_account_bank_statement"/>
<field eval="&quot;&quot;&quot;Statement&quot;&quot;&quot;" name="name"/>
</record>
<!--
Process Node
-->
<record id="process_node_electronicfile0" model="process.node">
<field name="menu_id" ref="account.menu_bank_statement_tree"/>
<field name="model_id" ref="account.model_account_bank_statement"/>
@@ -26,7 +26,7 @@
<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_manually0" model="process.node">
<field name="menu_id" ref="account.menu_bank_statement_tree"/>
<field name="model_id" ref="account.model_account_bank_statement"/>
@@ -37,7 +37,7 @@
<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_importinvoice0" model="process.node">
<field name="menu_id" ref="account.menu_bank_statement_tree"/>
<field name="model_id" ref="account.model_account_bank_statement"/>
@@ -48,7 +48,7 @@
<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_draftstatement0" model="process.node">
<field name="menu_id" ref="account.menu_bank_statement_tree"/>
<field name="model_id" ref="account.model_account_bank_statement"/>
@@ -63,7 +63,7 @@
<!--
Process Transition
-->
<record id="process_transition_filestatement0" model="process.transition">
<field eval="[(6,0,[])]" name="role_ids"/>
<field eval="[(6,0,[])]" name="transition_ids"/>
@@ -72,16 +72,17 @@
<field model="process.node" name="target_node_id" ref="process_node_draftstatement0"/>
<field model="process.node" name="source_node_id" ref="process_node_electronicfile0"/>
</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;Encode the statement manually in the system.&quot;&quot;&quot;" name="note"/>
<field eval="&quot;&quot;&quot;A statement with manual entries becomes a draft statement.&quot;&quot;&quot;" name="note"/>
<field model="process.node" name="target_node_id" ref="process_node_draftstatement0"/>
<field model="process.node" name="source_node_id" ref="process_node_manually0"/>
</record>
<record id="process_transition_invoiceimport0" model="process.transition">
<field eval="[(6,0,[])]" name="role_ids"/>
<field eval="[(6,0,[])]" name="transition_ids"/>
@@ -90,6 +91,6 @@
<field model="process.node" name="target_node_id" ref="process_node_draftstatement0"/>
<field model="process.node" name="source_node_id" ref="process_node_importinvoice0"/>
</record>
</data>
</openerp>
addons/account/process/supplier_invoice_process.xml
+1 -1
View File
@@ -28,7 +28,7 @@
</record>
<record id="process_node_supplierdraftinvoices0" model="process.node">
<field name="menu_id" ref="account.menu_invoice_draft"/>
<field name="menu_id" ref="account.menu_action_invoice_tree2"/>
<field name="model_id" ref="account.model_account_invoice"/>
<field eval="&quot;&quot;&quot;state&quot;&quot;&quot;" name="kind"/>
<field eval="&quot;&quot;&quot;Draft Invoices&quot;&quot;&quot;" name="name"/>
addons/account/project/project.py
+6 -2
View File
@@ -189,7 +189,11 @@ class account_analytic_account(osv.osv):
'date': fields.date('Date End'),
'company_id': fields.many2one('res.company', 'Company', required=True),
'company_currency_id': fields.function(_get_company_currency, method=True, type='many2one', relation='res.currency', string='Currency'),
'state': fields.selection([('draft','Draft'), ('open','Open'), ('pending','Pending'), ('close','Close'),], 'State', required=True),
'state': fields.selection([('draft','Draft'), ('open','Open'), ('pending','Pending'), ('close','Close'),], 'State', required=True,
help='* When an account is created its in \'Draft\' state.\
\n* If any associated partner is there, it can be in \'Open\' state.\
\n* If any pending balance is there it can be in \'Pending\'. \
\n* And finally when all the transactions are over, it can be in \'Close\' state.'),
}
def _default_company(self, cr, uid, context={}):
@@ -244,7 +248,7 @@ class account_analytic_account(osv.osv):
res['value']['partner_id'] = partner
return res
def name_search(self, cr, uid, name, args=None, operator='ilike', context=None, limit=80):
def name_search(self, cr, uid, name, args=None, operator='ilike', context=None, limit=100):
if not args:
args=[]
if not context:
addons/account/project/project_view.xml
+48 -25
View File
@@ -18,6 +18,25 @@
</field>
</record>
<record id="view_account_analytic_account_search" model="ir.ui.view">
<field name="name">account.analytic.account.search</field>
<field name="model">account.analytic.account</field>
<field name="type">search</field>
<field name="arch" type="xml">
<search string="Analytic Account">
<group col="8" colspan="4">
<filter icon="gtk-execute" string="My Accounts" domain="[('user_id','=',uid)]" help="My Analytic Accounts"/>
<filter icon="gtk-execute" string="Current" domain="[('state','=','open')]" help="Current Accounts"/>
<filter icon="gtk-execute" string="Pending" domain="[('state','=','pending')]" help="Pending Accounts"/>
<separator orientation="vertical"/>
<field name="name" select="1"/>
<field name="code" select="1"/>
<field name="partner_id" select="1"/>
</group>
</search>
</field>
</record>
<record id="view_account_analytic_account_tree" model="ir.ui.view">
<field name="name">account.analytic.account.tree</field>
<field name="model">account.analytic.account</field>
@@ -77,10 +96,11 @@
<field name="view_type">form</field>
<field name="view_mode">tree,graph,form</field>
<field name="view_id" ref="view_account_analytic_account_tree"/>
<field name="search_view_id" ref="account.view_account_analytic_account_search"/>
</record>
<!--<menuitem id="menu_analytic_account" name="Analytic Accounts" parent="account.menu_analytic_accounting"/>-->
<menuitem action="action_account_analytic_account_form" id="account_analytic_def_account" parent="account.menu_analytic_accounting"/>
<record id="act_account_renew_view" model="ir.actions.act_window">
<field name="name">Accounts to Renew</field>
<field name="type">ir.actions.act_window</field>
@@ -88,7 +108,7 @@
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
<field name="domain">[('date','&lt;',time.strftime('%Y-%m-%d %H:%M:%S'))]</field>
<field name="filter" eval="True"/>
<field name="filter" eval="True"/>
</record>
<record id="action_account_analytic_account_tree2" model="ir.actions.act_window">
@@ -105,20 +125,12 @@
id="account_analytic_def_chart"
parent="account_analytic_def_account"/>
<!-- <menuitem action="action_account_analytic_account_tree2" id="account_analytic_chart" parent="account.menu_finance_charts"/>-->
<wizard id="wizard_analytic_account_chart" menu="False" model="account.analytic.account" name="account.analytic.account.chart" string="Analytic Chart of Accounts"/>
<menuitem icon="STOCK_INDENT" action="wizard_analytic_account_chart" id="menu_action_analytic_account_tree2" parent="account.menu_finance_charts" type="wizard"/>
<record id="analytic_account_form" model="ir.actions.act_window">
<field name="name">New Analytic Account</field>
<field name="res_model">account.analytic.account</field>
<field name="view_type">form</field>
<field name="view_mode">form,tree,graph</field>
<field eval="view_account_analytic_account_form" name="view_id"/>
</record>
<menuitem action="analytic_account_form" id="account_analytic_form" parent="account.account_analytic_def_account"/>
<menuitem id="next_id_40" name="Analytic" parent="account.menu_finance_reporting"/><menuitem action="action_account_analytic_account_tree2" id="account_analytic_chart_balance" parent="next_id_40"/>
<menuitem id="next_id_40" name="Analytic" parent="account.menu_finance_reporting"/>
<menuitem action="action_account_analytic_account_tree2" id="account_analytic_chart_balance" parent="next_id_40"/>
<record id="view_account_analytic_line_form" model="ir.ui.view">
<field name="name">account.analytic.line.form</field>
@@ -183,7 +195,7 @@
<field name="view_type">form</field>
<field name="view_id" ref="view_account_analytic_line_tree"/>
</record>
<wizard id="action_account_analytic_line" menu="False" model="account.analytic.line" name="account.analytic.line" string="Entries Encoding by Line"/>
<wizard id="action_account_analytic_line" menu="False" model="account.analytic.line" name="account.analytic.line" string="Making Entries by Line"/>
<menuitem id="next_id_41" name="Analytic Entries" parent="account.menu_finance_entries"/>
<menuitem type="wizard" icon="STOCK_JUSTIFY_FILL" action="action_account_analytic_line" id="account_entries_analytic_entries" parent="next_id_41"/>
@@ -334,6 +346,7 @@
<field name="arch" type="xml">
<tree string="Analytic Entries Stats">
<field name="name"/>
<field name="month"/>
<field name="account_id"/>
<field name="journal_id"/>
<field name="quantity"/>
@@ -350,6 +363,7 @@
<field name="arch" type="xml">
<graph string="Analytic Entries Stats" type="bar">
<field name="name"/>
<field name="month"/>
<field name="cost" operator="+"/>
<field name="revenue" operator="+"/>
<field group="True" name="journal_id"/>
@@ -357,26 +371,35 @@
</field>
</record>
<record id="report_hr_timesheet_invoice_journal_search" model="ir.ui.view">
<field name="name">report.hr.timesheet.invoice.journal.search</field>
<field name="model">report.hr.timesheet.invoice.journal</field>
<field name="type">search</field>
<field name="arch" type="xml">
<search string="Analytic Entries Stats">
<group col="8" colspan="4">
<filter icon="terp-sale" string="This Year" domain="[('name','=',time.strftime('%%Y'))]" help="Sale journal in this year"/>
<filter icon="terp-sale" string="This Month" domain="[('month','=',time.strftime('%%m'))]" help="Sale journal in this month"/>
<separator orientation="vertical"/>
<field name="name" select="1"/>
<field name="month" select="1"/>
<field name="account_id" select="1"/>
</group>
</search>
</field>
</record>
<record id="report_account_analytic_journal_tree" model="ir.actions.act_window">
<field name="name">Account cost and revenue by journal</field>
<field name="res_model">report.hr.timesheet.invoice.journal</field>
<field name="view_type">form</field>
<field name="view_mode">tree,graph</field>
<field name="search_view_id" ref="report_hr_timesheet_invoice_journal_search"/>
</record>
<menuitem id="next_id_42" name="All Months" parent="account.next_id_40"/><menuitem action="report_account_analytic_journal_tree" id="report_account_analytic_journal_print" parent="next_id_42"/>
<record id="report_account_analytic_journal_tree_month" model="ir.actions.act_window">
<field name="name">Account cost and revenue by journal (This Month)</field>
<field name="res_model">report.hr.timesheet.invoice.journal</field>
<field name="view_type">form</field>
<field name="view_mode">tree</field>
<field name="domain">[('name','=',time.strftime('%Y-%m-01'))]</field>
</record>
<menuitem id="next_id_43" name="This Month" parent="account.next_id_40"/><menuitem action="report_account_analytic_journal_tree_month" id="report_account_analytic_journal_print_month" parent="next_id_43"/>
<menuitem action="report_account_analytic_journal_tree" id="report_account_analytic_journal_print" parent="account.next_id_40"/>
<act_window domain="[('account_id', '=', active_id)]" 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"/>
<act_window domain="[('account_id', '=', active_id)]" id="act_acc_analytic_acc_2_report_hr_timesheet_invoice_journal" name="Costs &amp; Revenues" res_model="report.hr.timesheet.invoice.journal" src_model="account.analytic.account" view_mode="graph,tree,form" view_type="form"/>
<record id="view_account_journal_1" model="ir.ui.view">
addons/account/report/account_tax_code.py
+26 -22
View File
@@ -1,3 +1,4 @@
#!/usr/bin/env python
# -*- coding: utf-8 -*-
##############################################################################
#
@@ -26,6 +27,25 @@ import copy
from report import report_sxw
import re
def _get_country(record):
if record.partner_id \
and record.partner_id.address \
and record.partner_id.address[0].country_id:
return record.partner_id.address[0].country_id.code
else:
return ''
def _record_to_report_line(record):
return {'date': record.date,
'ref': record.ref,
'acode': record.account_id.code,
'name': record.name,
'debit': record.debit,
'credit': record.credit,
'pname': record.partner_id and record.partner_id.name or '',
'country': _get_country(record)
}
class account_tax_code_report(rml_parse.rml_parse):
#_name = 'report.account.tax.code.entries'
@@ -36,30 +56,14 @@ class account_tax_code_report(rml_parse.rml_parse):
'get_line':self.get_line,
})
def get_line(self,obj):
res = {}
result = []
line_ids = self.pool.get('account.move.line').search(self.cr,self.uid,[('tax_code_id','=',obj.id)])
if line_ids:
move_line_objs = self.pool.get('account.move.line').browse(self.cr,self.uid,line_ids)
for line in move_line_objs:
res['date'] = line.date
res['ref'] = line.ref
res['acode'] = line.account_id.code
res['pname'] = ''
res['country'] = ''
def get_line(self, obj):
line_ids = self.pool.get('account.move.line').search(self.cr, self.uid, [('tax_code_id','=',obj.id)])
if not line_ids: return []
if line.partner_id:
res['pname'] = line.partner_id.name
if line.partner_id.address and line.partner_id.address[0].country_id:
res['country'] = line.partner_id.address[0].country_id.code
res['name'] = line.name
res['debit'] = line.debit
res['credit'] = line.credit
result.append(res)
return map(_record_to_report_line,
self.pool.get('account.move.line')\
.browse(self.cr, self.uid, line_ids))
return result
report_sxw.report_sxw('report.account.tax.code.entries', 'account.tax.code',
'addons/account/report/account_tax_code.rml', parser=account_tax_code_report, header=False)
addons/account/report/general_ledger_landscape.rml
+1 -1
View File
@@ -1,6 +1,6 @@
<?xml version="1.0"?>
<document filename="test.pdf">
<template pageSize="(1120.0,770.0)" title="Test" author="Martin Simon" allowSplitting="20" >
<template pageSize="(1120.5,767.8)" title="Test" author="Martin Simon" allowSplitting="20" >
<pageTemplate id="first">
<frame id="first" x1="22.0" y1="31.0" width="1080" height="680"/>
<pageGraphics>
addons/account/security/account_security.xml
+57 -45
View File
@@ -12,92 +12,97 @@
<field name="name">Finance / Manager</field>
</record>
<record id="menu_finance_configuration" model="ir.ui.menu">
<field eval="[(6,0,[ref('group_account_manager')])]" name="groups_id"/>
</record>
<record id="menu_finance_reporting" model="ir.ui.menu">
<field eval="[(6,0,[ref('group_account_manager')])]" name="groups_id"/>
</record>
<record id="menu_finance_legal_statement" model="ir.ui.menu">
<field eval="[(6,0,[ref('group_account_manager')])]" name="groups_id"/>
</record>
<record id="menu_finance_invoice" model="ir.ui.menu">
<field eval="[(6,0,[ref('group_account_invoice')])]" name="groups_id"/>
</record>
<record id="menu_automatic_reconcile" model="ir.ui.menu">
<field eval="[(6,0,[ref('group_account_user')])]" name="groups_id"/>
</record>
<record id="menu_finance_charts" model="ir.ui.menu">
<field eval="[(6,0,[ref('group_account_user'), ref('group_account_manager')])]" name="groups_id"/>
</record>
<record id="account_move_comp_rule_group" model="ir.rule.group">
<field name="name">Account Entry</field>
<field model="ir.model" name="model_id" search="[('model','=','account.move')]"/>
<field eval="True" name="global"/>
<record id="menu_finance_configuration" model="ir.ui.menu">
<field eval="[(6,0,[ref('group_account_manager')])]" name="groups_id"/>
</record>
<record id="menu_finance_reporting" model="ir.ui.menu">
<field eval="[(6,0,[ref('group_account_manager')])]" name="groups_id"/>
</record>
<record id="menu_finance_legal_statement" model="ir.ui.menu">
<field eval="[(6,0,[ref('group_account_manager')])]" name="groups_id"/>
</record>
<record id="menu_finance_invoice" model="ir.ui.menu">
<field eval="[(6,0,[ref('group_account_invoice')])]" name="groups_id"/>
</record>
<record id="menu_automatic_reconcile" model="ir.ui.menu">
<field eval="[(6,0,[ref('group_account_user')])]" name="groups_id"/>
</record>
<record id="menu_finance_charts" model="ir.ui.menu">
<field eval="[(6,0,[ref('group_account_user'), ref('group_account_manager')])]" name="groups_id"/>
</record>
<record id="account_move_comp_rule_group" model="ir.rule.group">
<field name="name">Account Entry</field>
<field ref="model_account_move" name="model_id"/>
<field eval="True" name="global"/>
</record>
<record id="account_move_comp_rule" model="ir.rule">
<field model="ir.model.fields" name="field_id" search="[('model','=','account.move'),('name','=','company_id')]"/>
<field name="operator">child_of</field>
<field name="operand">user.company_id.id</field>
<field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
<field name="rule_group" ref="account_move_comp_rule_group"/>
</record>
<record id="account_move_line_comp_rule_group" model="ir.rule.group">
<field name="name">Entry lines</field>
<field model="ir.model" name="model_id" search="[('model','=','account.move.line')]"/>
<field eval="True" name="global"/>
<record id="account_move_line_comp_rule_group" model="ir.rule.group">
<field name="name">Entry lines</field>
<field model="ir.model" name="model_id" ref="model_account_move_line"/>
<field eval="True" name="global"/>
</record>
<record id="account_move_line_comp_rule" model="ir.rule">
<field model="ir.model.fields" name="field_id" search="[('model','=','account.move.line'),('name','=','company_id')]"/>
<field name="operator">child_of</field>
<field name="operand">user.company_id.id</field>
<field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
<field name="rule_group" ref="account_move_line_comp_rule_group"/>
</record>
<record id="journal_period_comp_rule_group" model="ir.rule.group">
<field name="name">Journal Period</field>
<field model="ir.model" name="model_id" search="[('model','=','account.journal.period')]"/>
<field model="ir.model" name="model_id" ref="model_account_journal_period"/>
<field eval="True" name="global"/>
</record>
<record id="journal_period_comp_rule" model="ir.rule">
<field model="ir.model.fields" name="field_id" search="[('model','=','account.journal.period'),('name','=','company_id')]"/>
<field name="operator">child_of</field>
<field name="operand">user.company_id.id</field>
<field name="domain_force">['|','|',('company_id','=',False),('company_id.child_ids','child_of',[user.company_id.id]),('company_id','child_of',[user.company_id.id])]</field>
<field name="rule_group" ref="journal_period_comp_rule_group"/>
</record>
<record id="journal_comp_rule_group" model="ir.rule.group">
<field name="name">Journal multi-company</field>
<field model="ir.model" name="model_id" search="[('model','=','account.journal')]"/>
<field model="ir.model" name="model_id" ref="model_account_journal"/>
<field eval="True" name="global"/>
</record>
<record id="journal_comp_rule" model="ir.rule">
<field model="ir.model.fields" name="field_id" search="[('model','=','account.journal'),('name','=','company_id')]"/>
<field name="operator">child_of</field>
<field name="operand">user.company_id.id</field>
<field name="domain_force">['|','|',('company_id','=',False),('company_id.child_ids','child_of',[user.company_id.id]),('company_id','child_of',[user.company_id.id])]</field>
<field name="rule_group" ref="journal_comp_rule_group"/>
</record>
<record id="analytic_journal_comp_rule_group" model="ir.rule.group">
<field name="name">Analytic journal multi-company</field>
<field model="ir.model" name="model_id" search="[('model','=','account.analytic.journal')]"/>
<field model="ir.model" name="model_id" ref="model_account_analytic_journal"/>
<field eval="True" name="global"/>
</record>
<record id="analytic_journal_comp_rule" model="ir.rule">
<field model="ir.model.fields" name="field_id" search="[('model','=','account.analytic.journal'),('name','=','company_id')]"/>
<field name="operator">child_of</field>
<field name="operand">user.company_id.id</field>
<field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
<field name="rule_group" ref="analytic_journal_comp_rule_group"/>
</record>
<record id="analytic_journal_comp_rule_group1" model="ir.rule.group">
<field name="name">Analytic journal multi-company</field>
<field model="ir.model" name="model_id" search="[('model','=','account.analytic.journal')]"/>
<field model="ir.model" name="model_id" ref="model_account_analytic_journal"/>
<field eval="True" name="global"/>
</record>
@@ -105,79 +110,86 @@
<field model="ir.model.fields" name="field_id" search="[('model','=','account.analytic.journal'),('name','=','company_id')]"/>
<field name="operator">=</field>
<field name="operand">False</field>
<field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
<field name="rule_group" ref="analytic_journal_comp_rule_group1"/>
</record>
<record id="period_comp_rule_group" model="ir.rule.group">
<field name="name">Period multi-company</field>
<field model="ir.model" name="model_id" search="[('model','=','account.period')]"/>
<field model="ir.model" name="model_id" ref="model_account_period"/>
<field eval="True" name="global"/>
</record>
<record id="period_comp_rule" model="ir.rule">
<field model="ir.model.fields" name="field_id" search="[('model','=','account.period'),('name','=','company_id')]"/>
<field name="operator">child_of</field>
<field name="operand">user.company_id.id</field>
<field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
<field name="rule_group" ref="period_comp_rule_group"/>
</record>
<record id="fiscal_year_comp_rule_group" model="ir.rule.group">
<field name="name">Fiscal year multi-company</field>
<field model="ir.model" name="model_id" search="[('model','=','account.fiscalyear')]"/>
<field model="ir.model" name="model_id" ref="model_account_fiscalyear"/>
<field eval="True" name="global"/>
</record>
<record id="fiscal_year_comp_rule" model="ir.rule">
<field model="ir.model.fields" name="field_id" search="[('model','=','account.fiscalyear'),('name','=','company_id')]"/>
<field name="operator">child_of</field>
<field name="operand">user.company_id.id</field>
<field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
<field name="rule_group" ref="fiscal_year_comp_rule_group"/>
</record>
<record id="account_comp_rule_group" model="ir.rule.group">
<field name="name">Account multi-company</field>
<field model="ir.model" name="model_id" search="[('model','=','account.account')]"/>
<field model="ir.model" name="model_id" ref="model_account_account"/>
<field eval="True" name="global"/>
</record>
<record id="account_comp_rule" model="ir.rule">
<field model="ir.model.fields" name="field_id" search="[('model','=','account.account'),('name','=','company_id')]"/>
<field name="operator">child_of</field>
<field name="operand">user.company_id.id</field>
<field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
<field name="rule_group" ref="account_comp_rule_group"/>
</record>
<record id="tax_comp_rule_group" model="ir.rule.group">
<field name="name">Tax multi-company</field>
<field model="ir.model" name="model_id" search="[('model','=','account.tax')]"/>
<field model="ir.model" name="model_id" ref="model_account_tax"/>
<field eval="True" name="global"/>
</record>
<record id="tax_comp_rule" model="ir.rule">
<field model="ir.model.fields" name="field_id" search="[('model','=','account.tax'),('name','=','company_id')]"/>
<field name="operator">child_of</field>
<field name="operand">user.company_id.id</field>
<field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
<field name="rule_group" ref="tax_comp_rule_group"/>
</record>
<record id="tax_code_comp_rule_group" model="ir.rule.group">
<field name="name">Tax code multi-company</field>
<field model="ir.model" name="model_id" search="[('model','=','account.tax.code')]"/>
<field model="ir.model" name="model_id" ref="model_account_tax_code"/>
<field eval="True" name="global"/>
</record>
<record id="tax_code_comp_rule" model="ir.rule">
<field model="ir.model.fields" name="field_id" search="[('model','=','account.tax.code'),('name','=','company_id')]"/>
<field name="operator">child_of</field>
<field name="operand">user.company_id.id</field>
<field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
<field name="rule_group" ref="tax_code_comp_rule_group"/>
</record>
<record id="invoice_comp_rule_group" model="ir.rule.group">
<field name="name">Invoice multi-company</field>
<field model="ir.model" name="model_id" search="[('model','=','account.invoice')]"/>
<field model="ir.model" name="model_id" ref="model_account_invoice"/>
<field eval="True" name="global"/>
</record>
<record id="invoice_comp_rule" model="ir.rule">
<field model="ir.model.fields" name="field_id" search="[('model','=','account.invoice'),('name','=','company_id')]"/>
<field name="operator">child_of</field>
<field name="operand">user.company_id.id</field>
<field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
<field name="rule_group" ref="invoice_comp_rule_group"/>
</record>
addons/account/wizard/__init__.py
+1
View File
@@ -59,6 +59,7 @@ import wizard_statement_from_invoice
import wizard_print_journal
import wizard_central_journal
import wizard_general_journal
import wizard_change_currency
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
addons/account/wizard/wizard_central_journal.py
+1
View File
@@ -21,6 +21,7 @@
import wizard
import pooler
from tools.translate import _
form = '''<?xml version="1.0"?>
<form string="Print Central Journal">
addons/account/wizard/wizard_change_currency.py
+106
View File
@@ -0,0 +1,106 @@
#!/usr/bin/env python
# -*- encoding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
# Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as
# published by the Free Software Foundation, either version 3 of the
# License, or (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU Affero General Public License for more details.
#
# You should have received a copy of the GNU Affero General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
##############################################################################
import wizard
import pooler
class wizard_change_currency(wizard.interface):
'''
OpenERP Wizard
'''
form = '''<?xml version="1.0"?>
<form string="Invoice Currency">
<field name="currency_id"/>
</form>'''
message = '''<?xml version="1.0"?>
<form string="Invoice Currency">
<label string="You can not change currency for Open Invoice !"/>
</form>'''
fields = {
'currency_id': {'string': 'New Currency', 'type': 'many2one', 'relation': 'res.currency', 'required':True},
}
def _get_defaults(self, cr, user, data, context):
#TODO : initlize required data
return data['form']
def _change_currency(self, cr, uid, data, context):
pool = pooler.get_pool(cr.dbname)
inv_obj = pool.get('account.invoice')
inv_line_obj = pool.get('account.invoice.line')
curr_obj = pool.get('res.currency')
invoice_ids = data['ids']
new_currency = data['form']['currency_id']
for invoice in inv_obj.browse(cr, uid, invoice_ids, context=context):
if invoice.currency_id.id == new_currency:
continue
for line in invoice.invoice_line:
rate = curr_obj.browse(cr, uid, new_currency).rate
new_price = 0
if invoice.company_id.currency_id.id == invoice.currency_id.id:
new_price = line.price_unit * rate
if invoice.company_id.currency_id.id != invoice.currency_id.id and invoice.company_id.currency_id.id == new_currency:
old_rate = invoice.currency_id.rate
new_price = line.price_unit / old_rate
if invoice.company_id.currency_id.id != invoice.currency_id.id and invoice.company_id.currency_id.id != new_currency:
old_rate = invoice.currency_id.rate
new_price = (line.price_unit / old_rate ) * rate
inv_line_obj.write(cr, uid, [line.id], {'price_unit':new_price})
inv_obj.write(cr, uid, [invoice.id], {'currency_id':new_currency})
return {}
def _check_what_next(self, cr, uid, data, context):
pool = pooler.get_pool(cr.dbname)
inv_obj = pool.get('account.invoice')
if inv_obj.browse(cr, uid, data['id']).state != 'draft':
return 'message'
return 'change'
states = {
'init': {
'actions': [],
'result': {'type': 'choice', 'next_state': _check_what_next},
},
'change': {
'actions': [],
'result': {'type': 'form', 'arch': form, 'fields': fields, 'state': (('end', 'Cancel'), ('next', 'Change Currency'))},
},
'next': {
'actions': [_change_currency],
'result': {'type': 'state', 'state': 'end'},
},
'message': {
'actions': [],
'result': {'type': 'form', 'arch': message, 'fields': {}, 'state': [('end', 'Ok')]},
},
}
wizard_change_currency('account.invoice.currency_change')
addons/account/wizard/wizard_general_journal.py
+1
View File
@@ -21,6 +21,7 @@
import wizard
import pooler
from tools.translate import _
form = '''<?xml version="1.0"?>
<form string="Print General Journal">
addons/account/wizard/wizard_print_journal.py
+1
View File
@@ -21,6 +21,7 @@
import wizard
import pooler
from tools.translate import _
form = '''<?xml version="1.0"?>
<form string="Print Journal">
addons/account/wizard/wizard_use_model.py
+3 -3
View File
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
##############################################################################
#
#
# OpenERP, Open Source Management Solution
# Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
#
@@ -15,7 +15,7 @@
# GNU Affero General Public License for more details.
#
# You should have received a copy of the GNU Affero General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
##############################################################################
@@ -36,7 +36,7 @@ model_fields = {
form = """<?xml version="1.0"?>
<form string="Use Model">
<label string="Move Lines Created."/>
<label string="Entry Lines Created."/>
</form>
"""
fields = {
addons/account/wizard/wizard_validate_account_move.py
+3 -3
View File
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
##############################################################################
#
#
# OpenERP, Open Source Management Solution
# Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
#
@@ -15,7 +15,7 @@
# GNU Affero General Public License for more details.
#
# You should have received a copy of the GNU Affero General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
##############################################################################
@@ -72,7 +72,7 @@ def _validate_move_lines(self, cr, uid, data, context={}):
move_ids.append(line.move_id.id)
move_ids = list(set(move_ids))
if not move_ids:
raise wizard.except_wizard(_('Warning'), _('Selected Move lines does not have any account move enties in draft state'))
raise wizard.except_wizard(_('Warning'), _('Selected Entry Lines does not have any account move enties in draft state'))
res = move_obj.button_validate(cr, uid, move_ids, context)
return {}
addons/account_analytic_analysis/account_analytic_analysis_menu.xml
+5 -91
View File
@@ -1,86 +1,28 @@
<?xml version="1.0" encoding="utf-8"?>
<openerp>
<data>
<record id="action_account_analytic_managed" model="ir.actions.act_window">
<field name="name">My Accounts</field>
<field name="res_model">account.analytic.account</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form,graph</field>
<field name="domain">[('user_id','=',uid)]</field>
</record>
<menuitem
id="next_id_71"
name="Financial Project Management"
parent="project.menu_main"
groups="account.group_account_invoice"
sequence="20"/>
<menuitem id="menu_account" name="Analytic Accounts" parent="next_id_71" sequence="10"/>
<menuitem id="next_id_71" name="Financial Project Management" parent="project.menu_main" groups="account.group_account_invoice" sequence="20"/>
<menuitem id="menu_invoicing" name="Invoicing" parent="next_id_71" sequence="20"/>
<menuitem action="action_account_analytic_managed" id="menu_analytic_account_managed" parent="menu_account"/>
<record id="action_hr_tree_invoiced_all" model="ir.actions.act_window">
<field name="name">All Uninvoiced Entries</field>
<field name="res_model">account.analytic.line</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
<field name="domain">[('invoice_id','=',False),('to_invoice','!=',False)]</field>
<field name="search_view_id" ref="account.view_account_analytic_line_filter"/>
</record>
<menuitem action="action_hr_tree_invoiced_all" id="menu_action_hr_tree_invoiced_all" parent="menu_invoicing"/>
<record id="action_hr_tree_invoiced_my" model="ir.actions.act_window">
<field name="name">My Uninvoiced Entries</field>
<field name="res_model">account.analytic.line</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
<field name="domain">[('invoice_id','=',False),('to_invoice','!=',False),('account_id.user_id','=',uid)]</field>
</record>
<menuitem action="action_hr_tree_invoiced_my" id="menu_action_hr_tree_invoiced_my" parent="menu_invoicing"/>
<record id="action_account_analytic_managed_open" model="ir.actions.act_window">
<field name="name">My Current Accounts</field>
<field name="res_model">account.analytic.account</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form,graph</field>
<field name="domain">[('user_id','=',uid),('state','=','open')]</field>
<field name="filter" eval="True"/>
</record>
<menuitem action="action_account_analytic_managed_open" id="menu_analytic_account_to_valid_open" parent="account_analytic_analysis.menu_analytic_account_managed" groups="base.group_extended"/>
<record id="action_account_analytic_managed_pending" model="ir.actions.act_window">
<field name="name">My Pending Accounts</field>
<field name="res_model">account.analytic.account</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form,graph</field>
<field name="domain">[('user_id','=',uid),('state','=','pending')]</field>
<field name="filter" eval="True"/>
</record>
<menuitem action="action_account_analytic_managed_pending" id="menu_analytic_account_to_valid_pending" parent="account_analytic_analysis.menu_analytic_account_managed" groups="base.group_extended"/>
<record id="action_account_analytic_new" model="ir.actions.act_window">
<field name="name">New Analytic Account</field>
<field name="res_model">account.analytic.account</field>
<field name="view_type">form</field>
<field name="view_mode">form,tree,graph</field>
</record>
<menuitem
action="action_account_analytic_new"
id="menu_action_account_analytic_new"
sequence="50"
parent="account_analytic_analysis.menu_account"/>
<record id="action_account_analytic_all" model="ir.actions.act_window">
<field name="name">All Analytic Accounts</field>
<field name="res_model">account.analytic.account</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form,graph</field>
<field name="view_id" ref="account.view_account_analytic_account_list"/>
<field name="search_view_id" ref="account.view_account_analytic_account_search"/>
<field name="domain">[]</field>
</record>
<menuitem action="action_account_analytic_all" id="menu_action_account_analytic_all" parent="account_analytic_analysis.menu_account"/>
<menuitem name="Analytic Accounts" action="action_account_analytic_all" id="menu_action_account_analytic_all" parent="next_id_71"/>
<record id="action_account_analytic_managed_overpassed" model="ir.actions.act_window">
<field name="name">Overpassed Accounts</field>
@@ -89,34 +31,6 @@
<field name="view_mode">tree,form,graph</field>
<field name="domain">[('date','&lt;=',time.strftime('%Y-%m-%d')),('state','=','open')]</field>
</record>
<menuitem
action="action_account_analytic_managed_overpassed"
id="menu_action_account_analytic_managed_overpassed"
sequence="50"
parent="menu_invoicing"/>
<record id="action_account_analytic_all_open" model="ir.actions.act_window">
<field name="name">Current Analytic Accounts</field>
<field name="res_model">account.analytic.account</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form,graph</field>
<field name="view_id" ref="account.view_account_analytic_account_list"/>
<field name="domain">[('state','=','open')]</field>
<field name="filter" eval="True"/>
</record>
<menuitem action="action_account_analytic_all_open" id="menu_action_account_analytic_all_open" parent="menu_action_account_analytic_all" groups="base.group_extended"/>
<record id="action_account_analytic_all_pending" model="ir.actions.act_window">
<field name="name">Pending Analytic Accounts</field>
<field name="res_model">account.analytic.account</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form,graph</field>
<field name="view_id" ref="account.view_account_analytic_account_list"/>
<field name="domain">[('state','=','pending')]</field>
<field name="filter" eval="True"/>
</record>
<menuitem action="action_account_analytic_all_pending" id="menu_action_account_analytic_all_pending" parent="menu_action_account_analytic_all" groups="base.group_extended"/>
<menuitem action="action_account_analytic_managed_overpassed" id="menu_action_account_analytic_managed_overpassed" sequence="50" parent="menu_invoicing"/>
</data>
</openerp>
addons/account_analytic_analysis/account_analytic_analysis_view.xml
-1
View File
@@ -90,7 +90,6 @@
<field name="arch" type="xml">
<field name="date" position="before">
<field name="last_invoice_date"/>
<field name="ca_to_invoice"/>
</field>
addons/account_analytic_analysis/i18n/ar.po
+1 -1
View File
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2009-11-17 05:08+0000\n"
"X-Launchpad-Export-Date: 2009-12-16 05:16+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_analytic_analysis
addons/account_analytic_analysis/i18n/bg.po
+1 -1
View File
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2009-11-19 04:36+0000\n"
"X-Launchpad-Export-Date: 2009-12-16 05:16+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_analytic_analysis
addons/account_analytic_analysis/i18n/bs.po
+1 -1
View File
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2009-11-17 05:08+0000\n"
"X-Launchpad-Export-Date: 2009-12-16 05:16+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_analytic_analysis
addons/account_analytic_analysis/i18n/ca.po
+5 -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: 2009-11-18 04:41+0000\n"
"X-Launchpad-Export-Date: 2009-12-16 05:16+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_analytic_analysis
@@ -202,6 +202,9 @@ msgid ""
"important data for project manager of services companies.\n"
"Add menu to show relevant information for each manager."
msgstr ""
"Modifica la vista de compte analític per mostrar\n"
"dades importants pel director de projectes en empreses de serveis.\n"
"Afegeix un menú per a mostrar informació rellevant per a cada director."
#. module: account_analytic_analysis
#: field:account.analytic.account,hours_qtt_non_invoiced:0
@@ -221,7 +224,7 @@ msgstr "Comptes analítics"
#. module: account_analytic_analysis
#: model:ir.module.module,shortdesc:account_analytic_analysis.module_meta_information
msgid "report_account_analytic"
msgstr ""
msgstr "informes comptabilitat analítica"
#. module: account_analytic_analysis
#: field:account.analytic.account,ca_invoiced:0
addons/account_analytic_analysis/i18n/cs.po
+1 -1
View File
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2009-11-18 04:41+0000\n"
"X-Launchpad-Export-Date: 2009-12-16 05:16+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_analytic_analysis
addons/account_analytic_analysis/i18n/de.po
+1 -1
View File
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2009-11-23 04:49+0000\n"
"X-Launchpad-Export-Date: 2009-12-16 05:16+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_analytic_analysis
addons/account_analytic_analysis/i18n/el.po
+1 -1
View File
@@ -14,7 +14,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2009-11-17 05:08+0000\n"
"X-Launchpad-Export-Date: 2009-12-16 05:16+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_analytic_analysis
addons/account_analytic_analysis/i18n/es.po
+7 -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: 2009-11-18 04:41+0000\n"
"X-Launchpad-Export-Date: 2009-12-16 05:16+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_analytic_analysis
@@ -22,6 +22,8 @@ msgid ""
"Number of hours that can be invoiced plus those that already have been "
"invoiced."
msgstr ""
"Número de horas que pueden ser facturadas más aquellas que ya han sido "
"facturadas."
#. module: account_analytic_analysis
#: model:ir.model,name:account_analytic_analysis.model_account_analytic_analysis_summary_user
@@ -200,6 +202,9 @@ msgid ""
"important data for project manager of services companies.\n"
"Add menu to show relevant information for each manager."
msgstr ""
"Modifica la vista de cuenta analítica para mostrar\n"
"datos importantes para el director de proyectos en empresas de servicios.\n"
"Añade menú para mostrar información relevante para cada director."
#. module: account_analytic_analysis
#: field:account.analytic.account,hours_qtt_non_invoiced:0
@@ -219,7 +224,7 @@ msgstr "Cuentas analíticas"
#. module: account_analytic_analysis
#: model:ir.module.module,shortdesc:account_analytic_analysis.module_meta_information
msgid "report_account_analytic"
msgstr ""
msgstr "Informes contabilidad analítica"
#. module: account_analytic_analysis
#: field:account.analytic.account,ca_invoiced:0
addons/account_analytic_analysis/i18n/es_AR.po
+1 -1
View File
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2009-11-17 05:08+0000\n"
"X-Launchpad-Export-Date: 2009-12-16 05:16+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_analytic_analysis
addons/account_analytic_analysis/i18n/et.po
+1 -1
View File
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2009-11-17 05:08+0000\n"
"X-Launchpad-Export-Date: 2009-12-16 05:16+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_analytic_analysis
addons/account_analytic_analysis/i18n/fi.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: 2009-11-18 06:21+0000\n"
"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
"PO-Revision-Date: 2009-12-01 18:07+0000\n"
"Last-Translator: T Kortehisto <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: 2009-11-19 04:36+0000\n"
"X-Launchpad-Export-Date: 2009-12-16 05:16+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_analytic_analysis
@@ -239,7 +239,7 @@ msgstr "Laskuttamaton määrä"
#: model:ir.actions.act_window,name:account_analytic_analysis.action_account_analytic_all_pending
#: model:ir.ui.menu,name:account_analytic_analysis.menu_action_account_analytic_all_pending
msgid "Pending Analytic Accounts"
msgstr ""
msgstr "Vireillä olevat analyyttiset tilit"
#. module: account_analytic_analysis
#: field:account.analytic.account,hours_qtt_invoiced:0
addons/account_analytic_analysis/i18n/fr.po
+1 -1
View File
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2009-11-18 04:41+0000\n"
"X-Launchpad-Export-Date: 2009-12-16 05:16+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_analytic_analysis
addons/account_analytic_analysis/i18n/gl.po
+1 -1
View File
@@ -15,7 +15,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2009-11-17 05:08+0000\n"
"X-Launchpad-Export-Date: 2009-12-16 05:16+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_analytic_analysis
addons/account_analytic_analysis/i18n/hr.po
+1 -1
View File
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2009-11-17 05:08+0000\n"
"X-Launchpad-Export-Date: 2009-12-16 05:16+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_analytic_analysis
addons/account_analytic_analysis/i18n/hu.po
+1 -1
View File
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2009-11-17 05:08+0000\n"
"X-Launchpad-Export-Date: 2009-12-16 05:16+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_analytic_analysis
addons/account_analytic_analysis/i18n/id.po
+1 -1
View File
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2009-11-17 05:08+0000\n"
"X-Launchpad-Export-Date: 2009-12-16 05:16+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_analytic_analysis
addons/account_analytic_analysis/i18n/it.po
+1 -1
View File
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2009-11-17 05:08+0000\n"
"X-Launchpad-Export-Date: 2009-12-16 05:16+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_analytic_analysis
addons/account_analytic_analysis/i18n/ko.po
+1 -1
View File
@@ -14,7 +14,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2009-11-17 05:08+0000\n"
"X-Launchpad-Export-Date: 2009-12-16 05:16+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_analytic_analysis
addons/account_analytic_analysis/i18n/lt.po
+1 -1
View File
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2009-11-19 04:36+0000\n"
"X-Launchpad-Export-Date: 2009-12-16 05:16+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_analytic_analysis
addons/account_analytic_analysis/i18n/lv.po
+1 -1
View File
@@ -14,7 +14,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2009-11-17 05:08+0000\n"
"X-Launchpad-Export-Date: 2009-12-16 05:16+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_analytic_analysis
addons/account_analytic_analysis/i18n/nb.po
+1 -1
View File
@@ -14,7 +14,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2009-11-18 04:41+0000\n"
"X-Launchpad-Export-Date: 2009-12-16 05:16+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_analytic_analysis
addons/account_analytic_analysis/i18n/nl.po
+45 -40
View File
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 5.0.0_rc3\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
"PO-Revision-Date: 2009-11-09 15:53+0000\n"
"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
"PO-Revision-Date: 2009-12-11 12:37+0000\n"
"Last-Translator: Pieter J. Kersten (EduSense BV) <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: 2009-11-17 05:08+0000\n"
"X-Launchpad-Export-Date: 2009-12-16 05:16+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_analytic_analysis
@@ -22,6 +22,8 @@ msgid ""
"Number of hours that can be invoiced plus those that already have been "
"invoiced."
msgstr ""
"Aantal uren dat kan worden gefactureerd plus het aantal uren dat al "
"gefactureerd is."
#. module: account_analytic_analysis
#: model:ir.model,name:account_analytic_analysis.model_account_analytic_analysis_summary_user
@@ -31,33 +33,33 @@ msgstr "Urenoverzicht per gebruiker"
#. module: account_analytic_analysis
#: field:account.analytic.account,last_invoice_date:0
msgid "Last Invoice Date"
msgstr "Laatste Factuurdatum"
msgstr "Laatste factuurdatum"
#. module: account_analytic_analysis
#: help:account.analytic.account,remaining_ca:0
msgid "Computed using the formula: Max Invoice Price - Invoiced Amount."
msgstr "Berekend met de formule: Max Factuur Prijs - Gefactureerd Bedrag"
msgstr "Berekend met de formule: max factuurprijs - gefactureerd bedrag"
#. module: account_analytic_analysis
#: help:account.analytic.account,remaining_hours:0
msgid "Computed using the formula: Maximum Quantity - Hours Tot."
msgstr "Berekend met de formule: Maximum Aantal - Totaal aantal Uren"
msgstr "Berekend met de formule: maximum hoeveelheid - totaal aantal uren"
#. module: account_analytic_analysis
#: model:ir.ui.menu,name:account_analytic_analysis.menu_action_account_analytic_all
msgid "All Analytic Accounts"
msgstr "Alle Kostenplaatsen"
msgstr "Alle kostenplaatsen"
#. module: account_analytic_analysis
#: model:ir.actions.act_window,name:account_analytic_analysis.action_account_analytic_managed_open
#: model:ir.ui.menu,name:account_analytic_analysis.menu_analytic_account_to_valid_open
msgid "My Current Accounts"
msgstr "Mijn Actuele Kostenplaatsen"
msgstr "Mijn actuele kostenplaatsen"
#. module: account_analytic_analysis
#: constraint:ir.ui.view:0
msgid "Invalid XML for View Architecture!"
msgstr "Ongeldige XML voor overzicht"
msgstr "Ongeldige XML voor weergave!"
#. module: account_analytic_analysis
#: help:account.analytic.account,last_invoice_date:0
@@ -67,17 +69,17 @@ msgstr "Datum van de laatst aangemaakte factuur voor deze kostenplaats"
#. module: account_analytic_analysis
#: field:account.analytic.account,ca_theorical:0
msgid "Theorical Revenue"
msgstr "Theoretische Inkomsten"
msgstr "Theoretische omzet"
#. module: account_analytic_analysis
#: constraint:ir.actions.act_window:0
msgid "Invalid model name in the action definition."
msgstr ""
msgstr "Ongeldige modelnaam in de actie-definitie."
#. module: account_analytic_analysis
#: help:account.analytic.account,theorical_margin:0
msgid "Computed using the formula: Theorial Revenue - Total Costs"
msgstr "Berekend met de formule: Theoritische Inkomsten - Totale Kosten"
msgstr "Berekend met de formule: theoretische omzet - totale kosten"
#. module: account_analytic_analysis
#: constraint:ir.model:0
@@ -95,18 +97,18 @@ msgstr "Nieuwe kostenplaats"
#. module: account_analytic_analysis
#: field:account.analytic.account,theorical_margin:0
msgid "Theorical Margin"
msgstr "Theoretische Marge"
msgstr "Theoretische marge"
#. module: account_analytic_analysis
#: field:account.analytic.account,real_margin_rate:0
msgid "Real Margin Rate (%)"
msgstr "Werkelijke Marge (%)"
msgstr "Werkelijke marge (%)"
#. module: account_analytic_analysis
#: model:ir.actions.act_window,name:account_analytic_analysis.action_account_analytic_all_open
#: model:ir.ui.menu,name:account_analytic_analysis.menu_action_account_analytic_all_open
msgid "Current Analytic Accounts"
msgstr "Actuele Kostenplaatsen"
msgstr "Actuele kostenplaatsen"
#. module: account_analytic_analysis
#: help:account.analytic.account,last_worked_date:0
@@ -119,23 +121,23 @@ msgid ""
"If invoice from the costs, this is the date of the latest work or cost that "
"have been invoiced."
msgstr ""
"Wanneer gefactureerd op basis van kosten, dan is dit de datum van de laatste "
"werkzaamheden of kosten die zijn gefactureerd"
"Bij facturatie op basis van kosten, is dit de datum van de laatst "
"gefactureerde werkzaamheden of kosten"
#. module: account_analytic_analysis
#: model:ir.ui.menu,name:account_analytic_analysis.menu_invoicing
msgid "Invoicing"
msgstr "Facturering"
msgstr "Facturatie"
#. module: account_analytic_analysis
#: field:account.analytic.account,last_worked_date:0
msgid "Date of Last Cost/Work"
msgstr "Datum van Laatste Kosten/Werkzaamheden"
msgstr "Datum van laatste kosten/werkzaamheden"
#. module: account_analytic_analysis
#: field:account.analytic.account,total_cost:0
msgid "Total Costs"
msgstr "Totale Kosten"
msgstr "Totale kosten"
#. module: account_analytic_analysis
#: help:account.analytic.account,hours_quantity:0
@@ -144,12 +146,12 @@ msgid ""
"computes on all journal of type 'general'."
msgstr ""
"Aantal uren dat u heeft besteed aan de kostenplaats (van urenstaat). Het "
"wordt berekend op alle journaals van de soort 'algemeen'"
"wordt berekend op alle dagboeken van de soort 'algemeen'"
#. module: account_analytic_analysis
#: field:account.analytic.account,remaining_hours:0
msgid "Remaining Hours"
msgstr "Resterende Uren"
msgstr "Resterende uren"
#. module: account_analytic_analysis
#: help:account.analytic.account,ca_theorical:0
@@ -172,18 +174,18 @@ msgstr "Gebruiker"
#: model:ir.actions.act_window,name:account_analytic_analysis.action_account_analytic_managed_pending
#: model:ir.ui.menu,name:account_analytic_analysis.menu_analytic_account_to_valid_pending
msgid "My Pending Accounts"
msgstr "Mijn Lopende Kostenplaatsen"
msgstr "Mijn wachtende kostenplaatsen"
#. module: account_analytic_analysis
#: model:ir.actions.act_window,name:account_analytic_analysis.action_hr_tree_invoiced_my
#: model:ir.ui.menu,name:account_analytic_analysis.menu_action_hr_tree_invoiced_my
msgid "My Uninvoiced Entries"
msgstr "Mijn Gefactureerde Boekingen"
msgstr "Mijn ongefactureerde boekingen"
#. module: account_analytic_analysis
#: help:account.analytic.account,real_margin:0
msgid "Computed using the formula: Invoiced Amount - Total Costs."
msgstr "Berekend met de formule: Gefactureerd Bedrag - Totale Kosten."
msgstr "Berekend met de formule: gefactureerd bedrag - totale kosten."
#. module: account_analytic_analysis
#: model:ir.actions.act_window,name:account_analytic_analysis.action_account_analytic_managed
@@ -198,16 +200,19 @@ msgid ""
"important data for project manager of services companies.\n"
"Add menu to show relevant information for each manager."
msgstr ""
"Wijzig kostenplaatsscherm voor het tonen van\n"
"belangrijke gegevens voor de projectmanager van service bedrijven.\n"
"Voeg menu toe voor het tonen van relevante informatie voor iedere manager."
#. module: account_analytic_analysis
#: field:account.analytic.account,hours_qtt_non_invoiced:0
msgid "Uninvoiced Hours"
msgstr "Niet-gefactureerde uren"
msgstr "Ongefactureerde uren"
#. module: account_analytic_analysis
#: field:account.analytic.account,hours_quantity:0
msgid "Hours Tot"
msgstr "Uren tot"
msgstr "Totaal uren"
#. module: account_analytic_analysis
#: model:ir.ui.menu,name:account_analytic_analysis.menu_account
@@ -217,7 +222,7 @@ msgstr "Kostenplaatsen"
#. module: account_analytic_analysis
#: model:ir.module.module,shortdesc:account_analytic_analysis.module_meta_information
msgid "report_account_analytic"
msgstr ""
msgstr "report_account_analytic"
#. module: account_analytic_analysis
#: field:account.analytic.account,ca_invoiced:0
@@ -227,33 +232,33 @@ msgstr "Gefactureerd bedrag"
#. module: account_analytic_analysis
#: model:ir.ui.menu,name:account_analytic_analysis.next_id_71
msgid "Financial Project Management"
msgstr "Financieel Projectmanagement"
msgstr "Financieel projectmanagement"
#. module: account_analytic_analysis
#: field:account.analytic.account,last_worked_invoiced_date:0
msgid "Date of Last Invoiced Cost"
msgstr "Datum van Laatste Gefactureerde Kosten"
msgstr "Datum van laatste gefactureerde kosten"
#. module: account_analytic_analysis
#: field:account.analytic.account,ca_to_invoice:0
msgid "Uninvoiced Amount"
msgstr "Gefactureerd bedrag"
msgstr "Ongefactureerd bedrag"
#. module: account_analytic_analysis
#: model:ir.actions.act_window,name:account_analytic_analysis.action_account_analytic_all_pending
#: model:ir.ui.menu,name:account_analytic_analysis.menu_action_account_analytic_all_pending
msgid "Pending Analytic Accounts"
msgstr "Lopende Kostenplaatsen"
msgstr "Wachtende kostenplaatsen"
#. module: account_analytic_analysis
#: field:account.analytic.account,hours_qtt_invoiced:0
msgid "Invoiced Hours"
msgstr "Gefactureerde Uren"
msgstr "Gefactureerde uren"
#. module: account_analytic_analysis
#: field:account.analytic.account,real_margin:0
msgid "Real Margin"
msgstr "Werkelijke Marge"
msgstr "Werkelijke marge"
#. module: account_analytic_analysis
#: help:account.analytic.account,ca_invoiced:0
@@ -268,7 +273,7 @@ msgstr "Bestede uren per maand"
#. module: account_analytic_analysis
#: help:account.analytic.account,real_margin_rate:0
msgid "Computes using the formula: (Real Margin / Total Costs) * 100."
msgstr "Berekend met de formule: (Werkelijke Marge / Totale Kosten) * 100."
msgstr "Berekend met de formule: (werkelijke marge / totale kosten) * 100."
#. module: account_analytic_analysis
#: help:account.analytic.account,hours_qtt_non_invoiced:0
@@ -287,7 +292,7 @@ msgstr "Kostenplaatsen"
#. module: account_analytic_analysis
#: field:account.analytic.account,remaining_ca:0
msgid "Remaining Revenue"
msgstr "Resterende Inkomsten"
msgstr "Resterende omzet"
#. module: account_analytic_analysis
#: help:account.analytic.account,ca_to_invoice:0
@@ -295,18 +300,18 @@ msgid ""
"If invoice from analytic account, the remaining amount you can invoice to "
"the customer based on the total costs."
msgstr ""
"Wanneer gefactureerd van kostenplaats: Het resterende bedrag dat u kunt "
"Wanneer gefactureerd van kostenplaats: het resterende bedrag dat u kunt "
"factureren op basis van de totale kosten."
#. module: account_analytic_analysis
#: help:account.analytic.account,revenue_per_hour:0
msgid "Computed using the formula: Invoiced Amount / Hours Tot."
msgstr "Berekend met de formule: Gefactureerd Bedrag / Totaal aantal Uren"
msgstr "Berekend met de formule: gefactureerd bedrag / totaal aantal uren"
#. module: account_analytic_analysis
#: field:account.analytic.account,revenue_per_hour:0
msgid "Revenue per Hours (real)"
msgstr "Inkomsten per uur (Werkelijk)"
msgstr "Omzet per uur (werkelijk)"
#. module: account_analytic_analysis
#: field:account_analytic_analysis.summary.month,unit_amount:0
@@ -336,7 +341,7 @@ msgstr "Overbrugde Kostenplaatsen"
#: model:ir.actions.act_window,name:account_analytic_analysis.action_hr_tree_invoiced_all
#: model:ir.ui.menu,name:account_analytic_analysis.menu_action_hr_tree_invoiced_all
msgid "All Uninvoiced Entries"
msgstr "Alle gefactureerde boekingen"
msgstr "Alle ongefactureerde boekingen"
#. module: account_analytic_analysis
#: help:account.analytic.account,total_cost:0

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