[MERGE] from trunk

bzr revid: rco@openerp.com-20121219130953-tq0e2mzw145j1ewx
This commit is contained in:
Raphael Collet 2012-12-19 14:09:53 +01:00
commit 29ee76d744
1785 changed files with 203913 additions and 38300 deletions

View File

@ -141,7 +141,7 @@ for a particular financial year and for preparation of vouchers there is a modul
'project/analytic_account_demo.xml',
'demo/account_minimal.xml',
'demo/account_invoice_demo.xml',
# 'account_unit_test.xml',
'account_unit_test.xml',
],
'test': [
'test/account_customer_invoice.yml',

View File

@ -19,19 +19,19 @@
#
##############################################################################
import time
import logging
from datetime import datetime
from dateutil.relativedelta import relativedelta
from operator import itemgetter
import time
import logging
import pooler
from osv import fields, osv
import decimal_precision as dp
from tools.translate import _
from tools.float_utils import float_round
from openerp import SUPERUSER_ID
import tools
from openerp import pooler, tools
from openerp.osv import fields, osv
from openerp.tools.translate import _
from openerp.tools.float_utils import float_round
import openerp.addons.decimal_precision as dp
_logger = logging.getLogger(__name__)
@ -75,8 +75,8 @@ class account_payment_term(osv.osv):
amount = value
result = []
obj_precision = self.pool.get('decimal.precision')
prec = obj_precision.precision_get(cr, uid, 'Account')
for line in pt.line_ids:
prec = obj_precision.precision_get(cr, uid, 'Account')
if line.value == 'fixed':
amt = round(line.value_amount, prec)
elif line.value == 'procent':
@ -92,19 +92,20 @@ class account_payment_term(osv.osv):
next_date += relativedelta(day=line.days2, months=1)
result.append( (next_date.strftime('%Y-%m-%d'), amt) )
amount -= amt
return result
account_payment_term()
amount = reduce(lambda x,y: x+y[1], result, 0.0)
dist = round(value-amount, prec)
if dist:
result.append( (time.strftime('%Y-%m-%d'), dist) )
return result
class account_payment_term_line(osv.osv):
_name = "account.payment.term.line"
_description = "Payment Term Line"
_columns = {
'name': fields.char('Line Name', size=32, required=True),
'sequence': fields.integer('Sequence', required=True, help="The sequence field is used to order the payment term lines from the lowest sequences to the higher ones"),
'value': fields.selection([('procent', 'Percent'),
('balance', 'Balance'),
('fixed', 'Fixed Amount')], 'Valuation',
('fixed', 'Fixed Amount')], 'Computation',
required=True, help="""Select here the kind of valuation related to this payment term line. Note that you should have your last line with the type 'Balance' to ensure that the whole amount will be treated."""),
'value_amount': fields.float('Amount To Pay', digits_compute=dp.get_precision('Payment Term'), help="For percent enter a ratio between 0-1."),
@ -115,10 +116,10 @@ class account_payment_term_line(osv.osv):
}
_defaults = {
'value': 'balance',
'sequence': 5,
'days': 30,
'days2': 0,
}
_order = "sequence"
_order = "value desc,days"
def _check_percent(self, cr, uid, ids, context=None):
obj = self.browse(cr, uid, ids[0], context=context)
@ -1013,10 +1014,15 @@ class account_period(osv.osv):
else:
company_id = self.pool.get('res.users').browse(cr, uid, uid, context=context).company_id.id
args.append(('company_id', '=', company_id))
ids = self.search(cr, uid, args, context=context)
if not ids:
raise osv.except_osv(_('Error!'), _('There is no period defined for this date: %s.\nPlease create one.')%dt)
return ids
result = []
if context.get('account_period_prefer_normal'):
# look for non-special periods first, and fallback to all if no result is found
result = self.search(cr, uid, args + [('special', '=', False)], context=context)
if not result:
result = self.search(cr, uid, args, context=context)
if not result:
raise osv.except_osv(_('Error !'), _('There is no period defined for this date: %s.\nPlease create one.')%dt)
return result
def action_draft(self, cr, uid, ids, *args):
mode = 'draft'
@ -1082,7 +1088,7 @@ class account_journal_period(osv.osv):
'journal_id': fields.many2one('account.journal', 'Journal', required=True, ondelete="cascade"),
'period_id': fields.many2one('account.period', 'Period', required=True, ondelete="cascade"),
'icon': fields.function(_icon_get, string='Icon', type='char', size=32),
'active': fields.boolean('Active', required=True, help="If the active field is set to False, it will allow you to hide the journal period without removing it."),
'active': fields.boolean('Active', help="If the active field is set to False, it will allow you to hide the journal period without removing it."),
'state': fields.selection([('draft','Draft'), ('printed','Printed'), ('done','Done')], 'Status', required=True, readonly=True,
help='When journal period is created. The status is \'Draft\'. If a report is printed it comes to \'Printed\' status. When all transactions are done, it comes in \'Done\' status.'),
'fiscalyear_id': fields.related('period_id', 'fiscalyear_id', string='Fiscal Year', type='many2one', relation='account.fiscalyear'),
@ -1190,10 +1196,9 @@ class account_move(osv.osv):
return res
def _get_period(self, cr, uid, context=None):
periods = self.pool.get('account.period').find(cr, uid)
if periods:
return periods[0]
return False
ctx = dict(context or {}, account_period_prefer_normal=True)
period_ids = self.pool.get('account.period').find(cr, uid, context=ctx)
return period_ids[0]
def _amount_compute(self, cr, uid, ids, name, args, context, where =''):
if not ids: return {}
@ -3347,10 +3352,25 @@ class wizard_multi_charts_accounts(osv.osv_memory):
all the provided information to create the accounts, the banks, the journals, the taxes, the tax codes, the
accounting properties... accordingly for the chosen company.
'''
obj_data = self.pool.get('ir.model.data')
ir_values_obj = self.pool.get('ir.values')
obj_wizard = self.browse(cr, uid, ids[0])
company_id = obj_wizard.company_id.id
self.pool.get('res.company').write(cr, uid, [company_id], {'currency_id': obj_wizard.currency_id.id})
# When we install the CoA of first company, set the currency to price types and pricelists
if company_id==1:
for ref in (('product','list_price'),('product','standard_price'),('product','list0'),('purchase','list0')):
try:
tmp2 = obj_data.get_object_reference(cr, uid, *ref)
if tmp2:
self.pool.get(tmp2[0]).write(cr, uid, tmp2[1], {
'currency_id': obj_wizard.currency_id.id
})
except ValueError, e:
pass
# If the floats for sale/purchase rates have been filled, create templates from them
self._create_tax_templates_from_rates(cr, uid, obj_wizard, company_id, context=context)

View File

@ -19,9 +19,9 @@
#
##############################################################################
from osv import fields
from osv import osv
from tools.translate import _
from openerp.osv import fields
from openerp.osv import osv
from openerp.tools.translate import _
class account_analytic_line(osv.osv):
_inherit = 'account.analytic.line'
@ -82,7 +82,7 @@ class account_analytic_line(osv.osv):
if j_id.type == 'purchase':
unit = prod.uom_po_id.id
if j_id.type <> 'sale':
a = prod.product_tmpl_id.property_account_expense.id
a = prod.property_account_expense.id
if not a:
a = prod.categ_id.property_account_expense_categ.id
if not a:
@ -91,7 +91,7 @@ class account_analytic_line(osv.osv):
'for this product: "%s" (id:%d).') % \
(prod.name, prod.id,))
else:
a = prod.product_tmpl_id.property_account_income.id
a = prod.property_account_income.id
if not a:
a = prod.categ_id.property_account_income_categ.id
if not a:

View File

@ -19,8 +19,8 @@
#
##############################################################################
from tools.translate import _
from osv import fields, osv
from openerp.tools.translate import _
from openerp.osv import fields, osv
class bank(osv.osv):
_inherit = "res.partner.bank"

View File

@ -21,9 +21,9 @@
import time
from osv import fields, osv
from tools.translate import _
import decimal_precision as dp
from openerp.osv import fields, osv
from openerp.tools.translate import _
import openerp.addons.decimal_precision as dp
class account_bank_statement(osv.osv):
def create(self, cr, uid, vals, context=None):
@ -439,10 +439,11 @@ class account_bank_statement(osv.osv):
for st in self.browse(cr, uid, ids, context=context):
if st.state=='draft':
continue
ids = []
move_ids = []
for line in st.line_ids:
ids += [x.id for x in line.move_ids]
account_move_obj.unlink(cr, uid, ids, context)
move_ids += [x.id for x in line.move_ids]
account_move_obj.button_cancel(cr, uid, move_ids, context=context)
account_move_obj.unlink(cr, uid, move_ids, context)
done.append(st.id)
return self.write(cr, uid, done, {'state':'draft'}, context=context)
@ -546,7 +547,7 @@ class account_bank_statement_line(osv.osv):
_name = "account.bank.statement.line"
_description = "Bank Statement Line"
_columns = {
'name': fields.char('Communication', size=64, required=True),
'name': fields.char('Communication', required=True),
'date': fields.date('Date', required=True),
'amount': fields.float('Amount', digits_compute=dp.get_precision('Account')),
'type': fields.selection([

View File

@ -22,9 +22,9 @@
import time
from osv import osv, fields
from tools.translate import _
import decimal_precision as dp
from openerp.osv import fields, osv
from openerp.tools.translate import _
import openerp.addons.decimal_precision as dp
class account_cashbox_line(osv.osv):

View File

@ -24,11 +24,11 @@ from datetime import datetime
from dateutil.relativedelta import relativedelta
from operator import itemgetter
import netsvc
import pooler
from osv import fields, osv
import decimal_precision as dp
from tools.translate import _
from openerp import netsvc
from openerp import pooler
from openerp.osv import fields, osv
import openerp.addons.decimal_precision as dp
from openerp.tools.translate import _
# ---------------------------------------------------------
# Account Financial Report

View File

@ -21,12 +21,12 @@
import time
from lxml import etree
import decimal_precision as dp
import openerp.addons.decimal_precision as dp
import netsvc
import pooler
from osv import fields, osv, orm
from tools.translate import _
from openerp import netsvc
from openerp import pooler
from openerp.osv import fields, osv, orm
from openerp.tools.translate import _
class account_invoice(osv.osv):
def _amount_all(self, cr, uid, ids, name, args, context=None):
@ -80,8 +80,11 @@ class account_invoice(osv.osv):
def _reconciled(self, cr, uid, ids, name, args, context=None):
res = {}
for id in ids:
res[id] = self.test_paid(cr, uid, [id])
wf_service = netsvc.LocalService("workflow")
for inv in self.browse(cr, uid, ids, context=context):
res[inv.id] = self.test_paid(cr, uid, [inv.id])
if not res[inv.id] and inv.state == 'paid':
wf_service.trg_validate(uid, 'account.invoice', inv.id, 'open_test', cr)
return res
def _get_reference_type(self, cr, uid, context=None):
@ -455,7 +458,6 @@ class account_invoice(osv.osv):
def onchange_partner_id(self, cr, uid, ids, type, partner_id,\
date_invoice=False, payment_term=False, partner_bank_id=False, company_id=False):
invoice_addr_id = False
partner_payment_term = False
acc_id = False
bank_id = False
@ -465,8 +467,6 @@ class account_invoice(osv.osv):
if partner_id:
opt.insert(0, ('id', partner_id))
res = self.pool.get('res.partner').address_get(cr, uid, [partner_id], ['invoice'])
invoice_addr_id = res['invoice']
p = self.pool.get('res.partner').browse(cr, uid, partner_id)
if company_id:
if (p.property_account_receivable.company_id and (p.property_account_receivable.company_id.id != company_id)) and (p.property_account_payable.company_id and (p.property_account_payable.company_id.id != company_id)):
@ -994,7 +994,8 @@ class account_invoice(osv.osv):
'narration':inv.comment
}
period_id = inv.period_id and inv.period_id.id or False
ctx.update({'company_id': inv.company_id.id})
ctx.update(company_id=inv.company_id.id,
account_period_prefer_normal=True)
if not period_id:
period_ids = period_obj.find(cr, uid, inv.date_invoice, context=ctx)
period_id = period_ids and period_ids[0] or False
@ -1149,72 +1150,92 @@ class account_invoice(osv.osv):
ids = self.search(cr, user, [('name',operator,name)] + args, limit=limit, context=context)
return self.name_get(cr, user, ids, context)
def _refund_cleanup_lines(self, cr, uid, lines):
def _refund_cleanup_lines(self, cr, uid, lines, context=None):
clean_lines = []
for line in lines:
del line['id']
del line['invoice_id']
for field in ('company_id', 'partner_id', 'account_id', 'product_id',
'uos_id', 'account_analytic_id', 'tax_code_id', 'base_code_id'):
if line.get(field):
line[field] = line[field][0]
if 'invoice_line_tax_id' in line:
line['invoice_line_tax_id'] = [(6,0, line.get('invoice_line_tax_id', [])) ]
return map(lambda x: (0,0,x), lines)
clean_line = {}
for field in line._all_columns.keys():
if line._all_columns[field].column._type == 'many2one':
clean_line[field] = line[field].id
elif line._all_columns[field].column._type not in ['many2many','one2many']:
clean_line[field] = line[field]
elif field == 'invoice_line_tax_id':
tax_list = []
for tax in line[field]:
tax_list.append(tax.id)
clean_line[field] = [(6,0, tax_list)]
clean_lines.append(clean_line)
return map(lambda x: (0,0,x), clean_lines)
def refund(self, cr, uid, ids, date=None, period_id=None, description=None, journal_id=None):
invoices = self.read(cr, uid, ids, ['name', 'type', 'number', 'reference', 'comment', 'date_due', 'partner_id', 'partner_contact', 'partner_insite', 'partner_ref', 'payment_term', 'account_id', 'currency_id', 'invoice_line', 'tax_line', 'journal_id', 'company_id'])
obj_invoice_line = self.pool.get('account.invoice.line')
obj_invoice_tax = self.pool.get('account.invoice.tax')
def _prepare_refund(self, cr, uid, invoice, date=None, period_id=None, description=None, journal_id=None, context=None):
"""Prepare the dict of values to create the new refund from the invoice.
This method may be overridden to implement custom
refund generation (making sure to call super() to establish
a clean extension chain).
:param integer invoice_id: id of the invoice to refund
:param dict invoice: read of the invoice to refund
:param string date: refund creation date from the wizard
:param integer period_id: force account.period from the wizard
:param string description: description of the refund from the wizard
:param integer journal_id: account.journal from the wizard
:return: dict of value to create() the refund
"""
obj_journal = self.pool.get('account.journal')
new_ids = []
for invoice in invoices:
del invoice['id']
type_dict = {
'out_invoice': 'out_refund', # Customer Invoice
'in_invoice': 'in_refund', # Supplier Invoice
'out_refund': 'out_invoice', # Customer Refund
'in_refund': 'in_invoice', # Supplier Refund
}
invoice_lines = obj_invoice_line.read(cr, uid, invoice['invoice_line'])
invoice_lines = self._refund_cleanup_lines(cr, uid, invoice_lines)
tax_lines = obj_invoice_tax.read(cr, uid, invoice['tax_line'])
tax_lines = filter(lambda l: l['manual'], tax_lines)
tax_lines = self._refund_cleanup_lines(cr, uid, tax_lines)
if journal_id:
refund_journal_ids = [journal_id]
elif invoice['type'] == 'in_invoice':
refund_journal_ids = obj_journal.search(cr, uid, [('type','=','purchase_refund')])
type_dict = {
'out_invoice': 'out_refund', # Customer Invoice
'in_invoice': 'in_refund', # Supplier Invoice
'out_refund': 'out_invoice', # Customer Refund
'in_refund': 'in_invoice', # Supplier Refund
}
invoice_data = {}
for field in ['name', 'reference', 'comment', 'date_due', 'partner_id', 'company_id',
'account_id', 'currency_id', 'payment_term', 'user_id', 'fiscal_position']:
if invoice._all_columns[field].column._type == 'many2one':
invoice_data[field] = invoice[field].id
else:
refund_journal_ids = obj_journal.search(cr, uid, [('type','=','sale_refund')])
invoice_data[field] = invoice[field] if invoice[field] else False
if not date:
date = time.strftime('%Y-%m-%d')
invoice.update({
'type': type_dict[invoice['type']],
'date_invoice': date,
'state': 'draft',
'number': False,
'invoice_line': invoice_lines,
'tax_line': tax_lines,
'journal_id': refund_journal_ids
})
if period_id:
invoice.update({
'period_id': period_id,
})
if description:
invoice.update({
'name': description,
})
# take the id part of the tuple returned for many2one fields
for field in ('partner_id', 'company_id',
'account_id', 'currency_id', 'payment_term', 'journal_id'):
invoice[field] = invoice[field] and invoice[field][0]
invoice_lines = self._refund_cleanup_lines(cr, uid, invoice.invoice_line, context=context)
tax_lines = filter(lambda l: l['manual'], invoice.tax_line)
tax_lines = self._refund_cleanup_lines(cr, uid, tax_lines, context=context)
if journal_id:
refund_journal_ids = [journal_id]
elif invoice['type'] == 'in_invoice':
refund_journal_ids = obj_journal.search(cr, uid, [('type','=','purchase_refund')], context=context)
else:
refund_journal_ids = obj_journal.search(cr, uid, [('type','=','sale_refund')], context=context)
if not date:
date = time.strftime('%Y-%m-%d')
invoice_data.update({
'type': type_dict[invoice['type']],
'date_invoice': date,
'state': 'draft',
'number': False,
'invoice_line': invoice_lines,
'tax_line': tax_lines,
'journal_id': refund_journal_ids and refund_journal_ids[0] or False,
})
if period_id:
invoice_data['period_id'] = period_id
if description:
invoice_data['name'] = description
return invoice_data
def refund(self, cr, uid, ids, date=None, period_id=None, description=None, journal_id=None, context=None):
new_ids = []
for invoice in self.browse(cr, uid, ids, context=context):
invoice = self._prepare_refund(cr, uid, invoice,
date=date,
period_id=period_id,
description=description,
journal_id=journal_id,
context=context)
# create the new invoice
new_ids.append(self.create(cr, uid, invoice))
new_ids.append(self.create(cr, uid, invoice, context=context))
return new_ids
@ -1432,7 +1453,7 @@ class account_invoice_line(osv.osv):
res['arch'] = etree.tostring(doc)
return res
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, currency_id=False, context=None, company_id=None):
def product_id_change(self, cr, uid, ids, product, uom_id, qty=0, name='', type='out_invoice', partner_id=False, fposition_id=False, price_unit=False, currency_id=False, context=None, company_id=None):
if context is None:
context = {}
company_id = company_id if company_id != None else context.get('company_id',False)
@ -1455,11 +1476,11 @@ class account_invoice_line(osv.osv):
res = self.pool.get('product.product').browse(cr, uid, product, context=context)
if type in ('out_invoice','out_refund'):
a = res.product_tmpl_id.property_account_income.id
a = res.property_account_income.id
if not a:
a = res.categ_id.property_account_income_categ.id
else:
a = res.product_tmpl_id.property_account_expense.id
a = res.property_account_expense.id
if not a:
a = res.categ_id.property_account_expense_categ.id
a = fpos_obj.map_account(cr, uid, fpos, a)
@ -1478,14 +1499,11 @@ class account_invoice_line(osv.osv):
result.update({'price_unit': res.list_price, 'invoice_line_tax_id': tax_id})
result['name'] = res.partner_ref
domain = {}
result['uos_id'] = res.uom_id.id or uom or False
result['uos_id'] = uom_id or res.uom_id.id
if res.description:
result['name'] += '\n'+res.description
if result['uos_id']:
res2 = res.uom_id.category_id.id
if res2:
domain = {'uos_id':[('category_id','=',res2 )]}
domain = {'uos_id':[('category_id','=',res.uom_id.category_id.id)]}
res_final = {'value':result, 'domain':domain}
@ -1501,10 +1519,10 @@ class account_invoice_line(osv.osv):
new_price = res_final['value']['price_unit'] * currency.rate
res_final['value']['price_unit'] = new_price
if uom:
uom = self.pool.get('product.uom').browse(cr, uid, uom, context=context)
if res.uom_id.category_id.id == uom.category_id.id:
new_price = res_final['value']['price_unit'] * uom.factor_inv
if result['uos_id'] != res.uom_id.id:
selected_uom = self.pool.get('product.uom_id').browse(cr, uid, result['uos_id'], context=context)
if res.uom_id.category_id.id == selected_uom.category_id.id:
new_price = res_final['value']['price_unit'] * uom_id.factor_inv
res_final['value']['price_unit'] = new_price
return res_final
@ -1516,8 +1534,6 @@ class account_invoice_line(osv.osv):
context.update({'company_id': company_id})
warning = {}
res = self.product_id_change(cr, uid, ids, product, uom, qty, name, type, partner_id, fposition_id, price_unit, currency_id, context=context)
if 'uos_id' in res['value']:
del res['value']['uos_id']
if not uom:
res['value']['price_unit'] = 0.0
if product and uom:

View File

@ -145,7 +145,8 @@
<header>
<button name="invoice_open" states="draft,proforma2" string="Validate" class="oe_highlight" groups="account.group_account_invoice"/>
<button name="%(action_account_invoice_refund)d" type='action' string='Ask Refund' states='open,paid' groups="account.group_account_invoice"/>
<button name="invoice_cancel" states="draft,proforma2,sale,open" string="Cancel" groups="base.group_no_one"/>
<button name="invoice_cancel" states="draft,proforma2" string="Cancel" groups="account.group_account_invoice"/>
<button name="invoice_cancel" states="sale,open" string="Cancel" groups="base.group_no_one"/>
<button name="action_cancel_draft" states="cancel" string="Set to Draft" type="object" groups="account.group_account_invoice"/>
<button name='%(action_account_state_open)d' type='action' string='Re-Open' groups="account.group_account_invoice" attrs="{'invisible':['|', ('state','&lt;&gt;','paid'), ('reconciled', '=', True)]}" help="This button only appears when the state of the invoice is 'paid' (showing that it has been fully reconciled) and auto-computed boolean 'reconciled' is False (depicting that it's not the case anymore). In other words, the invoice has been dereconciled and it does not fit anymore the 'paid' state. You should press this button to re-open it and let it continue its normal process after having resolved the eventual exceptions it may have created."/>
<field name="state" widget="statusbar" statusbar_visible="draft,open,paid" statusbar_colors='{"proforma":"blue","proforma2":"blue"}'/>
@ -194,7 +195,7 @@
<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.currency_id, context, parent.company_id)"/>
<field name="name"/>
<field name="company_id" groups="base.group_multi_company" readonly="1"/>
<field name="company_id" invisible="1"/>
<field name="account_id" groups="account.group_account_user"
domain="[('company_id', '=', parent.company_id), ('journal_id', '=', parent.journal_id), ('type', '!=', 'view')]"
on_change="onchange_account_id(product_id, parent.partner_id, parent.type, parent.fiscal_position,account_id)"/>
@ -349,7 +350,7 @@
<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.currency_id, context, parent.company_id)"/>
<field name="name"/>
<field name="company_id" groups="base.group_multi_company" readonly="1"/>
<field name="company_id" invisible="1"/>
<field name="account_id" groups="account.group_account_user"
domain="[('company_id', '=', parent.company_id), ('journal_id', '=', parent.journal_id), ('type', '!=', 'view')]"
on_change="onchange_account_id(product_id, parent.partner_id, parent.type, parent.fiscal_position,account_id)"/>
@ -627,6 +628,7 @@
id="act_account_journal_2_account_invoice_opened"
name="Unpaid Invoices"
context="{'search_default_journal_id': [active_id], 'search_default_unpaid':1, 'default_journal_id': active_id}"
domain="[('journal_id','=', active_id)]"
res_model="account.invoice"
src_model="account.journal"/>

View File

@ -26,11 +26,11 @@ from operator import itemgetter
from lxml import etree
import netsvc
from osv import fields, osv, orm
from tools.translate import _
import decimal_precision as dp
import tools
from openerp import netsvc
from openerp.osv import fields, osv, orm
from openerp.tools.translate import _
import openerp.addons.decimal_precision as dp
from openerp import tools
class account_move_line(osv.osv):
_name = "account.move.line"
@ -443,9 +443,9 @@ class account_move_line(osv.osv):
'statement_id': fields.many2one('account.bank.statement', 'Statement', help="The bank statement used for bank reconciliation", select=1),
'reconcile_id': fields.many2one('account.move.reconcile', 'Reconcile', readonly=True, ondelete='set null', select=2),
'reconcile_partial_id': fields.many2one('account.move.reconcile', 'Partial Reconcile', readonly=True, ondelete='set null', select=2),
'reconcile': fields.function(_get_reconcile, type='char', string='Reconcile'),
'reconcile': fields.function(_get_reconcile, type='char', string='Reconcile Ref'),
'amount_currency': fields.float('Amount Currency', help="The amount expressed in an optional other currency if it is a multi-currency entry.", digits_compute=dp.get_precision('Account')),
'amount_residual_currency': fields.function(_amount_residual, string='Residual Amount', multi="residual", help="The residual amount on a receivable or payable of a journal entry expressed in its currency (maybe different of the company currency)."),
'amount_residual_currency': fields.function(_amount_residual, string='Residual Amount in Currency', multi="residual", help="The residual amount on a receivable or payable of a journal entry expressed in its currency (maybe different of the company currency)."),
'amount_residual': fields.function(_amount_residual, string='Residual Amount', multi="residual", help="The residual amount on a receivable or payable of a journal entry expressed in the company currency."),
'currency_id': fields.many2one('res.currency', 'Currency', help="The optional other currency if it is a multi-currency entry."),
'journal_id': fields.related('move_id', 'journal_id', string='Journal', type='many2one', relation='account.journal', required=True, select=True,
@ -456,7 +456,7 @@ class account_move_line(osv.osv):
store = {
'account.move': (_get_move_lines, ['period_id'], 20)
}),
'blocked': fields.boolean('Litigation', help="You can check this box to mark this journal item as a litigation with the associated partner"),
'blocked': fields.boolean('No Follow-up', help="You can check this box to mark this journal item as a litigation with the associated partner"),
'partner_id': fields.many2one('res.partner', 'Partner', select=1, ondelete='restrict'),
'date_maturity': fields.date('Due date', select=True ,help="This field is used for payable and receivable journal entries. You can put the limit date for the payment of this line."),
'date': fields.related('move_id','date', string='Effective date', type='date', required=True, select=True,
@ -856,7 +856,12 @@ class account_move_line(osv.osv):
if r[0][1] != None:
raise osv.except_osv(_('Error!'), _('Some entries are already reconciled.'))
if (not currency_obj.is_zero(cr, uid, account.company_id.currency_id, writeoff)) or \
if context.get('fy_closing'):
# We don't want to generate any write-off when being called from the
# wizard used to close a fiscal year (and it doesn't give us any
# writeoff_acc_id).
pass
elif (not currency_obj.is_zero(cr, uid, account.company_id.currency_id, writeoff)) or \
(account.currency_id and (not currency_obj.is_zero(cr, uid, account.currency_id, currency))):
if not writeoff_acc_id:
raise osv.except_osv(_('Warning!'), _('You have to provide an account for the write off/exchange difference entry.'))
@ -978,7 +983,8 @@ class account_move_line(osv.osv):
if context is None:
context = {}
period_pool = self.pool.get('account.period')
pids = period_pool.search(cr, user, [('date_start','<=',date), ('date_stop','>=',date)])
ctx = dict(context, account_period_prefer_normal=True)
pids = period_pool.find(cr, user, date, context=ctx)
if pids:
res.update({
'period_id':pids[0]

View File

@ -577,7 +577,7 @@
<field name="date"/>
<field name="name"/>
<field name="ref"/>
<field name="partner_id" on_change="onchange_partner_id(partner_id)"/>
<field name="partner_id" on_change="onchange_partner_id(partner_id)" domain="['|',('parent_id','=',False),('is_company','=',True)]"/>
<field name="type" on_change="onchange_type(partner_id, type)"/>
<field name="account_id" options='{"no_open":True}' domain="[('journal_id','=',parent.journal_id), ('company_id', '=', parent.company_id)]"/>
<field name="analytic_account_id" groups="analytic.group_analytic_accounting" domain="[('company_id', '=', parent.company_id), ('type', '&lt;&gt;', 'view')]"/>
@ -1137,7 +1137,7 @@
<separator/>
<filter string="Next Partner to Reconcile" help="Next Partner Entries to reconcile" name="next_partner" context="{'next_partner_only': 1}" icon="terp-gtk-jump-to-ltr" domain="[('account_id.reconcile','=',True),('reconcile_id','=',False)]"/>
<field name="move_id" string="Number (Move)"/>
<field name="account_id" filter_domain="['|', ('name', 'ilike', self), ('code', 'ilike', self)]"/>
<field name="account_id"/>
<field name="partner_id"/>
<field name="journal_id" context="{'journal_id':self}" widget="selection"/> <!-- it's important to keep widget='selection' in this filter viewbecause without that the value passed in the context is not the ID but the textual value (name) of the selected journal -->
<field name="period_id" context="{'period_id':self}" widget="selection"/> <!-- it's important to keep the widget='selection' in this field, for the same reason as explained above -->
@ -1549,10 +1549,8 @@
<field name="model">account.payment.term.line</field>
<field name="arch" type="xml">
<tree string="Payment Term">
<field name="sequence"/>
<field name="name"/>
<field name="value"/>
<field name="value_amount"/>
<field name="value_amount" attrs="{'readonly':[('value','=','balance')]}"/>
<field name="days"/>
<field name="days2"/>
</tree>
@ -1563,37 +1561,20 @@
<field name="model">account.payment.term.line</field>
<field name="arch" type="xml">
<form string="Payment Term" version="7.0">
<group>
<field name="name"/>
<field name="sequence"/>
</group>
<group>
<group string="Amount Computation">
<field name="value"/>
<field name="value_amount" attrs="{'readonly':[('value','=','balance')]}"/>
<field name="value"/>
<label for="value_amount" string="Amount To Pay" attrs="{'invisible':[('value','=','balance')]}"/>
<div attrs="{'invisible':[('value','=','balance')]}">
<field name="value_amount" class="oe_inline"/>
<label string="%%" class="oe_inline" attrs="{'invisible':['!',('value','=','procent')]}" />
</div>
</group>
<group string="Due Date Computation">
<field name="days"/>
<field name="days2"/>
</group>
</group>
<separator string="Example"/>
<label string="At 14 net days 2 percent, remaining amount at 30 days end of month."/>
<group>
<label string="Line 1:" colspan="2"/>
<label string=" Valuation: Percent"/>
<label string=" Number of Days: 14"/>
<label string=" Value amount: 0.02"/>
<label string=" Day of the Month: 0"/>
</group>
<group>
<label string="Line 2:" colspan="2"/>
<label string=" Valuation: Balance"/>
<label string=" Number of Days: 30"/>
<label string=" Value amount: n.a"/>
<label string=" Day of the Month= -1"/>
</group>
</form>
</field>
</record>
@ -1616,7 +1597,7 @@
<field name="name"/>
<field name="active"/>
</group>
<field name="note" placeholder="Note for the invoice..."/>
<field name="note" placeholder="Payment term explanation for the customer..."/>
<separator string="Computation"/>
<field name="line_ids"/>
</form>
@ -2262,8 +2243,8 @@
<field name="state" widget="statusbar" nolabel="1" statusbar_visible="draft,confirm"/>
</header>
<sheet string="Statement">
<label for="name" class="oe_edit_only" attrs="{'invisible':[('name','=','/')]}"/>
<h1><field name="name" class="oe_inline" attrs="{'invisible':[('name','=','/')]}"/></h1>
<label for="name" class="oe_edit_only"/>
<h1><field name="name" class="oe_inline"/></h1>
<group>
<group>
<field name="journal_id" on_change="onchange_journal_id(journal_id)" widget="selection" domain="[('type', '=', 'cash')]" />

View File

@ -19,7 +19,7 @@
#
##############################################################################
from osv import fields, osv
from openerp.osv import fields, osv
class res_company(osv.osv):
_inherit = "res.company"

View File

@ -10,17 +10,33 @@
<!--
Payment term
-->
<record id="account_payment_term" model="account.payment.term">
<field name="name">30 Days End of Month</field>
<field name="note">30 Days End of Month</field>
<record id="account_payment_term_immediate" model="account.payment.term">
<field name="name">Immediate Payment</field>
<field name="note">Immediate Payment</field>
</record>
<record id="account_payment_term_line" model="account.payment.term.line">
<field name="name">30 Days End of Month</field>
<record id="account_payment_term_line_immediate" model="account.payment.term.line">
<field name="name">Immediate Payment</field>
<field name="value">balance</field>
<field eval="30" name="days"/>
<field eval="-1" name="days2"/>
<field eval="account_payment_term" name="payment_id"/>
<field eval="0" name="days"/>
<field eval="0" name="days2"/>
<field eval="account_payment_term_immediate" name="payment_id"/>
</record>
<record id="account_payment_term_15days" model="account.payment.term">
<field name="name">15 Days</field>
<field name="note">15 Days</field>
</record>
<record id="account_payment_term_line_15days" model="account.payment.term.line">
<field name="name">15 Days</field>
<field name="value">balance</field>
<field eval="15" name="days"/>
<field eval="0" name="days2"/>
<field eval="account_payment_term_15days" name="payment_id"/>
</record>
<record forcecreate="True" id="decimal_payment" model="decimal.precision">
<field name="name">Payment Term</field>
<field name="digits">6</field>
@ -30,6 +46,7 @@
<field name="name">30 Net Days</field>
<field name="note">30 Net Days</field>
</record>
<record id="account_payment_term_line_net" model="account.payment.term.line">
<field name="name">30 Net Days</field>
<field name="value">balance</field>
@ -37,28 +54,7 @@
<field eval="0" name="days2"/>
<field eval="account_payment_term_net" name="payment_id"/>
</record>
<record id="account_payment_term_advance" model="account.payment.term">
<field name="name">30% Advance End 30 Days</field>
<field name="note">30% Advance End 30 Days</field>
</record>
<record id="account_payment_term_line_advance1" model="account.payment.term.line">
<field name="name">30% Advance</field>
<field name="value">procent</field>
<field eval="3" name="sequence"/>
<field eval="0.300000" name="value_amount"/>
<field eval="0" name="days"/>
<field eval="0" name="days2"/>
<field eval="account_payment_term_advance" name="payment_id"/>
</record>
<record id="account_payment_term_line_advance2" model="account.payment.term.line">
<field name="name">Remaining Balance</field>
<field name="value">balance</field>
<field eval="30" name="days"/>
<field eval="-1" name="days2"/>
<field eval="account_payment_term_advance" name="payment_id"/>
</record>
<!--
Account Journal Sequences
-->

View File

@ -127,6 +127,41 @@
<field eval="time.strftime('%Y')+'-12-31'" name="date_stop"/>
<field name="company_id" ref="base.main_company"/>
</record>
<!-- Payment Term -->
<record id="account_payment_term" model="account.payment.term">
<field name="name">30 Days End of Month</field>
<field name="note">30 Days End of Month</field>
</record>
<record id="account_payment_term_line" model="account.payment.term.line">
<field name="name">30 Days End of Month</field>
<field name="value">balance</field>
<field eval="30" name="days"/>
<field eval="-1" name="days2"/>
<field eval="account_payment_term" name="payment_id"/>
</record>
<record id="account_payment_term_advance" model="account.payment.term">
<field name="name">30% Advance End 30 Days</field>
<field name="note">30% Advance End 30 Days</field>
</record>
<record id="account_payment_term_line_advance1" model="account.payment.term.line">
<field name="name">30% Advance</field>
<field name="value">procent</field>
<field eval="3" name="sequence"/>
<field eval="0.300000" name="value_amount"/>
<field eval="0" name="days"/>
<field eval="0" name="days2"/>
<field eval="account_payment_term_advance" name="payment_id"/>
</record>
<record id="account_payment_term_line_advance2" model="account.payment.term.line">
<field name="name">Remaining Balance</field>
<field name="value">balance</field>
<field eval="30" name="days"/>
<field eval="-1" name="days2"/>
<field eval="account_payment_term_advance" name="payment_id"/>
</record>
<record id="base.user_demo" model="res.users">
<field name="groups_id" eval="[(4,ref('account.group_account_user'))]"/>

View File

@ -18,9 +18,10 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
##############################################################################
from openerp.osv import osv, fields
from openerp.addons.edi import EDIMixin
from openerp.osv import osv
from edi import EDIMixin
from urllib import urlencode
INVOICE_LINE_EDI_STRUCT = {
'name': True,
@ -258,6 +259,28 @@ class account_invoice(osv.osv, EDIMixin):
pass
return action
def _edi_paypal_url(self, cr, uid, ids, field, arg, context=None):
res = dict.fromkeys(ids, False)
for inv in self.browse(cr, uid, ids, context=context):
if inv.type == 'out_invoice' and inv.company_id.paypal_account:
params = {
"cmd": "_xclick",
"business": inv.company_id.paypal_account,
"item_name": inv.company_id.name + " Invoice " + inv.number,
"invoice": inv.number,
"amount": inv.residual,
"currency_code": inv.currency_id.name,
"button_subtype": "services",
"no_note": "1",
"bn": "OpenERP_Invoice_PayNow_" + inv.currency_id.name,
}
res[inv.id] = "https://www.paypal.com/cgi-bin/webscr?" + urlencode(params)
return res
_columns = {
'paypal_url': fields.function(_edi_paypal_url, type='char', string='Paypal Url'),
}
class account_invoice_line(osv.osv, EDIMixin):
_inherit='account.invoice.line'

View File

@ -23,16 +23,17 @@
<record id="email_template_edi_invoice" model="email.template">
<field name="name">Invoice - Send by Email</field>
<field name="email_from">${object.user_id.email or object.company_id.email or 'noreply@localhost'}</field>
<field name="subject">${object.company_id.name} Invoice (Ref ${object.number or 'n/a' })</field>
<field name="subject">${object.company_id.name} Invoice (Ref ${object.number or 'n/a'})</field>
<field name="email_recipients">${object.partner_id.id}</field>
<field name="model_id" ref="account.model_account_invoice"/>
<field name="auto_delete" eval="True"/>
<field name="report_template" ref="account_invoices"/>
<field name="report_name">Invoice_${(object.number or '').replace('/','_')}_${object.state == 'draft' and 'draft' or ''}</field>
<field name="lang">${object.partner_id.lang}</field>
<field name="body_html"><![CDATA[
<div style="font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, 255, 255); ">
<div style="font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-serif; font-size: 12px; color: rgb(34, 34, 34); background-color: #FFF; ">
<p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name or ''},</p>
<p>Hello ${object.partner_id.name},</p>
<p>A new invoice is available for you: </p>
@ -49,20 +50,10 @@
% endif
</p>
% if object.company_id.paypal_account and object.type in ('out_invoice', 'in_refund'):
<%
comp_name = quote(object.company_id.name)
inv_number = quote(object.number)
paypal_account = quote(object.company_id.paypal_account)
inv_amount = quote(str(object.residual))
cur_name = quote(object.currency_id.name)
paypal_url = "https://www.paypal.com/cgi-bin/webscr?cmd=_xclick&amp;business=%s&amp;item_name=%s%%20Invoice%%20%s&amp;" \
"invoice=%s&amp;amount=%s&amp;currency_code=%s&amp;button_subtype=services&amp;no_note=1&amp;bn=OpenERP_Invoice_PayNow_%s" % \
(paypal_account,comp_name,inv_number,inv_number,inv_amount,cur_name,cur_name)
%>
% if object.paypal_url:
<br/>
<p>It is also possible to directly pay with Paypal:</p>
<a style="margin-left: 120px;" href="${paypal_url}">
<a style="margin-left: 120px;" href="${object.paypal_url}">
<img class="oe_edi_paypal_button" src="https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif"/>
</a>
% endif
@ -73,7 +64,7 @@
<br/>
<br/>
<div style="width: 375px; margin: 0px; padding: 0px; background-color: #8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; background-repeat: repeat no-repeat;">
<h3 style="margin: 0px; padding: 2px 14px; font-size: 12px; color: #FFF;">
<h3 style="margin: 0px; padding: 2px 14px; font-size: 12px; color: #DDD;">
<strong style="text-transform:uppercase;">${object.company_id.name}</strong></h3>
</div>
<div style="width: 347px; margin: 0px; padding: 5px 14px; line-height: 16px; background-color: #F2F2F2;">

View File

@ -7,14 +7,14 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2012-12-03 16:02+0000\n"
"PO-Revision-Date: 2012-12-01 17:09+0000\n"
"Last-Translator: kifcaliph <Unknown>\n"
"PO-Revision-Date: 2012-12-15 22:53+0000\n"
"Last-Translator: gehad shaat <gehad.shaath@gmail.com>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-12-04 05:20+0000\n"
"X-Generator: Launchpad (build 16335)\n"
"X-Launchpad-Export-Date: 2012-12-17 04:45+0000\n"
"X-Generator: Launchpad (build 16372)\n"
#. module: account
#: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@ -923,7 +923,7 @@ msgstr "نقل اسم/ j.c."
#. module: account
#: view:account.account:0
msgid "Account Code and Name"
msgstr "رمز و رقم الحساب"
msgstr "رمز واسم الحساب"
#. module: account
#: model:mail.message.subtype,name:account.mt_invoice_new
@ -1170,6 +1170,8 @@ msgid ""
"Check this box if you don't want any tax related to this tax code to appear "
"on invoices"
msgstr ""
"اختر هذا المربع اذا كنت لا ترغب أن تظهر الضرائب المتعلقة بهذا الرمز الضريبي "
"على الفاتورة."
#. module: account
#: field:report.account.receivable,name:0
@ -1506,7 +1508,7 @@ msgstr "السنة المالية للإغلاق"
#. module: account
#: field:account.config.settings,sale_sequence_prefix:0
msgid "Invoice sequence"
msgstr ""
msgstr "مسلسل الفاتورة"
#. module: account
#: model:ir.model,name:account.model_account_entries_report
@ -2504,7 +2506,7 @@ msgstr "ليس لديك الصلاحيات لفتح هذه %s اليومية!"
#. module: account
#: model:res.groups,name:account.group_supplier_inv_check_total
msgid "Check Total on supplier invoices"
msgstr ""
msgstr "افحص المجموع لفواتير المورد"
#. module: account
#: selection:account.invoice,state:0
@ -2578,7 +2580,7 @@ msgstr "حساب الدخل"
#. module: account
#: help:account.config.settings,default_sale_tax:0
msgid "This sale tax will be assigned by default on new products."
msgstr ""
msgstr "سيتم اختيار ضريبة المبيعات هذه افتراضيا للمنتجات الجديدة"
#. module: account
#: report:account.general.ledger_landscape:0
@ -2688,6 +2690,10 @@ msgid ""
"amount greater than the total invoiced amount. In order to avoid rounding "
"issues, the latest line of your payment term must be of type 'balance'."
msgstr ""
"لا يمكن إنشاء الفاتورة.\n"
"من الممكن أن تكون شروط الدفع المتعلقة بالفاتورة غير معدة بطريقة صحيحة لأنها "
"تعطي قيمة أكبر من المجموع الكلي للفاتورة. لتفادي هذه المشكلة يجب أن يكون أخر "
"خط من شروط الدفع من نوع 'رصيد'."
#. module: account
#: view:account.move:0
@ -2764,7 +2770,7 @@ msgstr "حالة مسودة من الفاتورة"
#. module: account
#: view:product.category:0
msgid "Account Properties"
msgstr ""
msgstr "خصائص الحساب"
#. module: account
#: view:account.partner.reconcile.process:0
@ -2851,7 +2857,7 @@ msgstr "EXJ"
#. module: account
#: view:account.invoice.refund:0
msgid "Create Credit Note"
msgstr ""
msgstr "أنشئ إشعار رصيد"
#. module: account
#: field:product.template,supplier_taxes_id:0
@ -2901,7 +2907,7 @@ msgstr ""
#: code:addons/account/wizard/account_state_open.py:37
#, python-format
msgid "Invoice is already reconciled."
msgstr ""
msgstr "الفاتورة قد تم تسويتها مسبقا"
#. module: account
#: view:account.analytic.cost.ledger.journal.report:0
@ -2949,7 +2955,7 @@ msgstr "حساب تحليلي"
#: field:account.config.settings,default_purchase_tax:0
#: field:account.config.settings,purchase_tax:0
msgid "Default purchase tax"
msgstr ""
msgstr "ضريبة الشراء الافتراضية"
#. module: account
#: view:account.account:0
@ -2982,7 +2988,7 @@ msgstr "خطأ في الإعدادات!"
#: code:addons/account/account_bank_statement.py:433
#, python-format
msgid "Statement %s confirmed, journal items were created."
msgstr ""
msgstr "قد تم تأكيد كشف %s، تم انشاء اليومية."
#. module: account
#: field:account.invoice.report,price_average:0
@ -3035,7 +3041,7 @@ msgstr "مرجع"
#. module: account
#: view:wizard.multi.charts.accounts:0
msgid "Purchase Tax"
msgstr ""
msgstr "ضريبة الشراء"
#. module: account
#: help:account.move.line,tax_code_id:0
@ -3129,7 +3135,7 @@ msgstr "نوع الاتصال"
#. module: account
#: constraint:account.move.line:0
msgid "Account and Period must belong to the same company."
msgstr ""
msgstr "الحساب و المدة يجب أن تنتمي لنفس الشركة."
#. module: account
#: field:account.invoice.line,discount:0
@ -3159,7 +3165,7 @@ msgstr "مبلغ ملغي"
#: field:account.bank.statement,message_unread:0
#: field:account.invoice,message_unread:0
msgid "Unread Messages"
msgstr ""
msgstr "رسائل غير مقروءة"
#. module: account
#: code:addons/account/wizard/account_invoice_state.py:44
@ -3167,13 +3173,13 @@ msgstr ""
msgid ""
"Selected invoice(s) cannot be confirmed as they are not in 'Draft' or 'Pro-"
"Forma' state."
msgstr ""
msgstr "لا يمكن تأكيد الفواتير لأنهم ليس بحالة 'مسودة' أو 'فاتورة مبدأية'"
#. module: account
#: code:addons/account/account.py:1056
#, python-format
msgid "You should choose the periods that belong to the same company."
msgstr ""
msgstr "يجب اختيار الفترات التي تنتمي لنفس الشركة"
#. module: account
#: model:ir.actions.act_window,name:account.action_report_account_sales_tree_all
@ -3191,12 +3197,12 @@ msgstr ""
#. module: account
#: view:account.invoice:0
msgid "Accounting Period"
msgstr ""
msgstr "الفترة المحاسبية"
#. module: account
#: field:account.config.settings,sale_journal_id:0
msgid "Sale journal"
msgstr ""
msgstr "يومية البيع"
#. module: account
#: code:addons/account/account.py:2293
@ -3212,7 +3218,7 @@ msgstr "عليك بتعريف يومية تحليلية في يومية '%s' !"
msgid ""
"This journal already contains items, therefore you cannot modify its company "
"field."
msgstr ""
msgstr "اليومية تحتوي على أصناف, لذا لا يمكن تعديل حقول الشركة الخاصة بها"
#. module: account
#: code:addons/account/account.py:408
@ -3258,7 +3264,7 @@ msgstr "أغسطس"
#. module: account
#: field:accounting.report,debit_credit:0
msgid "Display Debit/Credit Columns"
msgstr ""
msgstr "عرض خانة الدائن/المدين"
#. module: account
#: selection:account.entries.report,month:0
@ -3286,7 +3292,7 @@ msgstr "خط 2:"
#. module: account
#: field:wizard.multi.charts.accounts,only_one_chart_template:0
msgid "Only One Chart Template Available"
msgstr ""
msgstr "يوجد نموذج رسم واحد فقط"
#. module: account
#: view:account.chart.template:0
@ -3419,7 +3425,7 @@ msgstr "اختار السنة المالية"
#: view:account.config.settings:0
#: view:account.installer:0
msgid "Date Range"
msgstr ""
msgstr "مدى التاريخ"
#. module: account
#: view:account.period:0
@ -3498,7 +3504,7 @@ msgstr "دائماً"
#: field:account.config.settings,module_account_accountant:0
msgid ""
"Full accounting features: journals, legal statements, chart of accounts, etc."
msgstr ""
msgstr "خصائص محاسبية متكاملة: يوميات، قوائم قانونية، دليل الحسابات، الخ."
#. module: account
#: view:account.analytic.line:0
@ -3555,7 +3561,7 @@ msgstr "ملف إالكتروني"
#. module: account
#: field:account.config.settings,has_chart_of_accounts:0
msgid "Company has a chart of accounts"
msgstr ""
msgstr "الشركة لديها دليل الحسابات"
#. module: account
#: view:account.payment.term.line:0
@ -3576,7 +3582,7 @@ msgstr ""
#. module: account
#: view:account.period:0
msgid "Account Period"
msgstr ""
msgstr "فترة الحساب"
#. module: account
#: help:account.account,currency_id:0
@ -3704,7 +3710,7 @@ msgstr "إعداد برنامج المحاسبة"
#. module: account
#: model:ir.actions.act_window,name:account.action_account_vat_declaration
msgid "Account Tax Declaration"
msgstr ""
msgstr "الإقرار الضريبي للحساب"
#. module: account
#: view:account.payment.term.line:0
@ -3743,7 +3749,7 @@ msgstr "إغلاق الفترة"
#: view:account.bank.statement:0
#: field:account.cashbox.line,subtotal_opening:0
msgid "Opening Subtotal"
msgstr ""
msgstr "المجموع الجزئي الافتتاحي"
#. module: account
#: constraint:account.move.line:0
@ -3854,6 +3860,8 @@ msgid ""
"You have not supplied enough arguments to compute the initial balance, "
"please select a period and a journal in the context."
msgstr ""
"لم تقم بادخال معطيات كافية للقيام بحساب الرصيد المبدأي، الرجاء اختيار الفترة "
"و اليومية في السياق."
#. module: account
#: model:ir.actions.report.xml,name:account.account_transfers
@ -3863,7 +3871,7 @@ msgstr "تحويلات"
#. module: account
#: field:account.config.settings,expects_chart_of_accounts:0
msgid "This company has its own chart of accounts"
msgstr ""
msgstr "هذه الشركة لديها دليل حسابات خاص بها"
#. module: account
#: view:account.chart:0
@ -3959,6 +3967,8 @@ msgid ""
"There is no fiscal year defined for this date.\n"
"Please create one from the configuration of the accounting menu."
msgstr ""
"لا يوجد سنة مالية معرفة لهذا التاريخ\n"
"الرجاء انشاء واحدة من اعدادات قائمة المحاسبة."
#. module: account
#: view:account.addtmpl.wizard:0
@ -3970,7 +3980,7 @@ msgstr "إنشاء حساب"
#: code:addons/account/wizard/account_fiscalyear_close.py:62
#, python-format
msgid "The entries to reconcile should belong to the same company."
msgstr ""
msgstr "القيود التي تريد تسويتها يجب ان تنتمي لنفس الشركة."
#. module: account
#: field:account.invoice.tax,tax_amount:0
@ -3990,7 +4000,7 @@ msgstr "تفاصيل"
#. module: account
#: help:account.config.settings,default_purchase_tax:0
msgid "This purchase tax will be assigned by default on new products."
msgstr ""
msgstr "ضريبة الشراء هذه سيتم استخدامها افتراضيا للمنتجات الجديدة."
#. module: account
#: report:account.invoice:0
@ -4157,7 +4167,7 @@ msgstr ""
#. module: account
#: field:account.config.settings,group_check_supplier_invoice_total:0
msgid "Check the total of supplier invoices"
msgstr ""
msgstr "افحص المجموع لفواتير المورد"
#. module: account
#: view:account.tax:0
@ -4171,6 +4181,8 @@ msgid ""
"When monthly periods are created. The status is 'Draft'. At the end of "
"monthly period it is in 'Done' status."
msgstr ""
"عند انشاء فترات شهرية. تكون الحالة 'مسودة'. عند أخر الفترة الشهرية تكون "
"الحالة 'تم'"
#. module: account
#: view:account.invoice.report:0
@ -4257,7 +4269,7 @@ msgstr "اسم"
#: code:addons/account/installer.py:94
#, python-format
msgid "No unconfigured company !"
msgstr ""
msgstr "لا يوجد شركات لم يتم إعدادها!"
#. module: account
#: field:res.company,expects_chart_of_accounts:0
@ -4267,7 +4279,7 @@ msgstr ""
#. module: account
#: model:mail.message.subtype,name:account.mt_invoice_paid
msgid "paid"
msgstr ""
msgstr "مدفوعة"
#. module: account
#: field:account.move.line,date:0
@ -4278,7 +4290,7 @@ msgstr "التاريخ الفعلي"
#: code:addons/account/wizard/account_fiscalyear_close.py:100
#, python-format
msgid "The journal must have default credit and debit account."
msgstr ""
msgstr "اليومة يجب ان تحتوي على حساب الدائن والمدين."
#. module: account
#: model:ir.actions.act_window,name:account.action_bank_tree
@ -4289,7 +4301,7 @@ msgstr "اعداد الحسابات المصرفية الخاصة بك"
#. module: account
#: selection:account.invoice.refund,filter_refund:0
msgid "Modify: create credit note, reconcile and create a new draft invoice"
msgstr ""
msgstr "تعديل: إنشاء إشعار الرصيد، تسوية وإنشاء فاتورة 'مسودة' جديدة."
#. module: account
#: xsl:account.transfer:0
@ -4300,7 +4312,7 @@ msgstr ""
#: help:account.bank.statement,message_ids:0
#: help:account.invoice,message_ids:0
msgid "Messages and communication history"
msgstr ""
msgstr "الرسائل و سجل التواصل"
#. module: account
#: help:account.journal,analytic_journal_id:0
@ -4334,13 +4346,15 @@ msgid ""
"Check this box if you don't want any tax related to this tax Code to appear "
"on invoices."
msgstr ""
"اختر هذا المربع اذا كنت لا ترغب أن تظهر الضرائب المتعلقة بهذا الرمز الضريبي "
"على الفاتورة."
#. module: account
#: code:addons/account/account_move_line.py:1048
#: code:addons/account/account_move_line.py:1131
#, python-format
msgid "You cannot use an inactive account."
msgstr ""
msgstr "لا يمكنك استخدام حساب غير مغعل."
#. module: account
#: model:ir.actions.act_window,name:account.open_board_account
@ -4371,7 +4385,7 @@ msgstr "فرعي موحد"
#: code:addons/account/wizard/account_invoice_refund.py:146
#, python-format
msgid "Insufficient Data!"
msgstr ""
msgstr "لا يوجد معلومات كافية!"
#. module: account
#: help:account.account,unrealized_gain_loss:0
@ -4407,7 +4421,7 @@ msgstr "الاسم"
#. module: account
#: selection:account.invoice.refund,filter_refund:0
msgid "Create a draft credit note"
msgstr ""
msgstr "إنشاء إشعار رصيد 'مسودة'"
#. module: account
#: view:account.invoice:0
@ -4439,7 +4453,7 @@ msgstr "أصول"
#. module: account
#: view:account.config.settings:0
msgid "Accounting & Finance"
msgstr ""
msgstr "الحسابات و المالية"
#. module: account
#: view:account.invoice.confirm:0
@ -4461,7 +4475,7 @@ msgstr "عرض الحسابات"
#. module: account
#: view:account.state.open:0
msgid "(Invoice should be unreconciled if you want to open it)"
msgstr "(يجب تسوية الفاتورة لفتحها)"
msgstr "(يجب الغاء تسوية الفاتورة لفتحها)"
#. module: account
#: field:account.tax,account_analytic_collected_id:0
@ -4614,6 +4628,8 @@ msgid ""
"Error!\n"
"You cannot create recursive Tax Codes."
msgstr ""
"خطأ!\n"
"لا يمكنك انشاء رموز ضريبية متداخلة"
#. module: account
#: constraint:account.period:0
@ -4621,6 +4637,8 @@ msgid ""
"Error!\n"
"The duration of the Period(s) is/are invalid."
msgstr ""
"خطأ!\n"
"المدة الزمنية لهذه الفترات غير صالحة."
#. module: account
#: field:account.entries.report,month:0
@ -4642,7 +4660,7 @@ msgstr ""
#. module: account
#: field:account.config.settings,purchase_sequence_prefix:0
msgid "Supplier invoice sequence"
msgstr ""
msgstr "تسلسل فاتورة المورد/الشريك"
#. module: account
#: code:addons/account/account_invoice.py:571
@ -4759,7 +4777,7 @@ msgstr ""
#: code:addons/account/static/src/xml/account_move_reconciliation.xml:24
#, python-format
msgid "Last Reconciliation:"
msgstr ""
msgstr "آخر تسوية:"
#. module: account
#: model:ir.ui.menu,name:account.menu_finance_periodical_processing
@ -4769,7 +4787,7 @@ msgstr "المعالجة الدورية"
#. module: account
#: selection:account.move.line,state:0
msgid "Balanced"
msgstr ""
msgstr "متوازن"
#. module: account
#: model:process.node,note:account.process_node_importinvoice0
@ -4782,12 +4800,12 @@ msgstr "بيان من الفاتورة أو الدفع"
msgid ""
"There is currently no company without chart of account. The wizard will "
"therefore not be executed."
msgstr ""
msgstr "لا يوجد شركات بدون دليل حسابات. لذا لن يظهر المعالج."
#. module: account
#: model:ir.actions.act_window,name:account.action_wizard_multi_chart
msgid "Set Your Accounting Options"
msgstr ""
msgstr "ضبط خيارات المحاسبة"
#. module: account
#: model:ir.model,name:account.model_account_chart
@ -4798,7 +4816,7 @@ msgstr "خريطة الحساب"
#: code:addons/account/account_invoice.py:1322
#, python-format
msgid "Supplier invoice"
msgstr ""
msgstr "فاتورة المورد"
#. module: account
#: selection:account.financial.report,style_overwrite:0
@ -4878,12 +4896,12 @@ msgstr "اسم الفترة يجب ان يكون فريد لكل شركة"
#. module: account
#: help:wizard.multi.charts.accounts,currency_id:0
msgid "Currency as per company's country."
msgstr ""
msgstr "العملة وفقا لبلد الشركة"
#. module: account
#: view:account.tax:0
msgid "Tax Computation"
msgstr ""
msgstr "حساب الضرائب"
#. module: account
#: view:wizard.multi.charts.accounts:0
@ -4954,7 +4972,7 @@ msgstr "نماذج التكرارات"
#. module: account
#: view:account.tax:0
msgid "Children/Sub Taxes"
msgstr ""
msgstr "ضرائب فرعية"
#. module: account
#: xsl:account.transfer:0
@ -4979,7 +4997,7 @@ msgstr "وهي تعمل كحساب افتراضي لكمية بطاقة الائ
#. module: account
#: view:cash.box.out:0
msgid "Describe why you take money from the cash register:"
msgstr ""
msgstr "اشرح لماذا قمت بأخد نقود من الماكينة:"
#. module: account
#: selection:account.invoice,state:0
@ -4996,7 +5014,7 @@ msgstr "مثال"
#. module: account
#: help:account.config.settings,group_proforma_invoices:0
msgid "Allows you to put invoices in pro-forma state."
msgstr ""
msgstr "يسمح لك بوضع الفواتير في حالة 'فاتورة مبدأية'."
#. module: account
#: view:account.journal:0
@ -5015,6 +5033,8 @@ msgid ""
"It adds the currency column on report if the currency differs from the "
"company currency."
msgstr ""
"تقوم باضافة خانة العملة في التقرير اذا كانت العملة مختلفة عن العملة "
"الافتراضية للشركة."
#. module: account
#: code:addons/account/account.py:3336
@ -5054,7 +5074,7 @@ msgstr "فاتورة ملغاة"
#. module: account
#: view:account.invoice:0
msgid "My Invoices"
msgstr ""
msgstr "فواتيري"
#. module: account
#: selection:account.bank.statement,state:0
@ -5064,7 +5084,7 @@ msgstr "جديد"
#. module: account
#: view:wizard.multi.charts.accounts:0
msgid "Sale Tax"
msgstr ""
msgstr "ضريبة مبيعات"
#. module: account
#: field:account.tax,ref_tax_code_id:0
@ -5123,7 +5143,7 @@ msgstr "الفواتير"
#. module: account
#: help:account.config.settings,expects_chart_of_accounts:0
msgid "Check this box if this company is a legal entity."
msgstr ""
msgstr "علم هذا المربع اذا كانت الشركة كيان قانوني."
#. module: account
#: model:account.account.type,name:account.conf_account_type_chk
@ -5238,6 +5258,8 @@ msgid ""
"Set the account that will be set by default on invoice tax lines for "
"invoices. Leave empty to use the expense account."
msgstr ""
"عرف الحساب الذي سوف يستخدم افتراضيا على صنف (خط) الضريبة في الفاتورة. اتركه "
"فارغا لاستخدام حساب المصاريف."
#. module: account
#: code:addons/account/account.py:889
@ -5261,7 +5283,7 @@ msgstr ""
#: field:account.invoice,message_comment_ids:0
#: help:account.invoice,message_comment_ids:0
msgid "Comments and emails"
msgstr ""
msgstr "التعليقات و البريد الالكتروني"
#. module: account
#: view:account.bank.statement:0
@ -5345,7 +5367,7 @@ msgstr ""
#. module: account
#: model:res.groups,name:account.group_account_manager
msgid "Financial Manager"
msgstr ""
msgstr "المدير المالي"
#. module: account
#: field:account.journal,group_invoice_lines:0
@ -5379,6 +5401,8 @@ msgid ""
"If you do not check this box, you will be able to do invoicing & payments, "
"but not accounting (Journal Items, Chart of Accounts, ...)"
msgstr ""
"اذا لم تعلم هذه الخانة، ستستطيع القيام بالفوترة والدفعات، ولكن لن تستطيع "
"القيام بالعمليات الحسابية (أصناف اليومية، الدليل الحسابي،الخ...)"
#. module: account
#: view:account.period:0
@ -5412,6 +5436,8 @@ msgid ""
"There is no period defined for this date: %s.\n"
"Please create one."
msgstr ""
"لا يوجد هناك فترة معرفة لهذا التاريخ: %s.\n"
"الرجاء إنشاء فترة لهذا التاريخ"
#. module: account
#: help:account.tax,price_include:0
@ -5540,7 +5566,7 @@ msgstr "سنة"
#. module: account
#: help:account.invoice,sent:0
msgid "It indicates that the invoice has been sent."
msgstr ""
msgstr "هذا يشير أن الفاتورة قد تم ارسالها."
#. module: account
#: view:account.payment.term.line:0
@ -5560,11 +5586,13 @@ msgid ""
"Put a sequence in the journal definition for automatic numbering or create a "
"sequence manually for this piece."
msgstr ""
"لا يمكن انشاء تسلسل تلقائي لها.\n"
"ضع تسلسل في تعريف اليومية للترقيم التلقائي أو ضع تسلسل لها يدويا"
#. module: account
#: view:account.invoice:0
msgid "Pro Forma Invoice "
msgstr ""
msgstr "فاتورة مبدأية "
#. module: account
#: selection:account.subscription,period_type:0
@ -5629,7 +5657,7 @@ msgstr "رمز الحساب (إذا كان النوع = الرمز)"
#, python-format
msgid ""
"Cannot find a chart of accounts for this company, you should create one."
msgstr ""
msgstr "لم يتم العثور على دليل حسابي لهذه الشركة. يجب إنشاء دليل حسابي لها."
#. module: account
#: selection:account.analytic.journal,type:0
@ -5752,13 +5780,13 @@ msgstr "account.installer"
#. module: account
#: view:account.invoice:0
msgid "Recompute taxes and total"
msgstr ""
msgstr "أعد حساب الضريبة والمجموع الكلي."
#. module: account
#: code:addons/account/account.py:1097
#, python-format
msgid "You cannot modify/delete a journal with entries for this period."
msgstr ""
msgstr "لا يمكنك تعديل/حذف يومية لها قيود لهذه الفترة."
#. module: account
#: field:account.tax.template,include_base_amount:0
@ -5768,7 +5796,7 @@ msgstr "إدراجها في المبلغ الرئيسي"
#. module: account
#: field:account.invoice,supplier_invoice_number:0
msgid "Supplier Invoice Number"
msgstr ""
msgstr "رقم فاتورة المورد"
#. module: account
#: help:account.payment.term.line,days:0
@ -5788,7 +5816,7 @@ msgstr "حساب المبلغ"
#: code:addons/account/account_move_line.py:1095
#, python-format
msgid "You can not add/modify entries in a closed period %s of journal %s."
msgstr ""
msgstr "لا يمكنك اضافة/تعديل قيود لفترة قد تم اغلاقها %s لليومية %s."
#. module: account
#: view:account.journal:0
@ -6030,7 +6058,7 @@ msgstr ""
#: code:addons/account/wizard/account_report_aged_partner_balance.py:56
#, python-format
msgid "You must set a period length greater than 0."
msgstr ""
msgstr "يجب أن تضع مدة الفترة أكبر من 0."
#. module: account
#: view:account.fiscal.position.template:0
@ -6091,7 +6119,7 @@ msgstr "مبلغ ثابت"
#: code:addons/account/account_move_line.py:1046
#, python-format
msgid "You cannot change the tax, you should remove and recreate lines."
msgstr ""
msgstr "لا يمكنك تغيير الضريبة، يجب أن تحذف وتنشئ أصناف(خطوط) جديدة."
#. module: account
#: model:ir.actions.act_window,name:account.action_account_automatic_reconcile
@ -6216,7 +6244,7 @@ msgstr "مخطط السنة المالية"
#. module: account
#: view:account.config.settings:0
msgid "Select Company"
msgstr ""
msgstr "اختر شركة"
#. module: account
#: model:ir.actions.act_window,name:account.action_account_state_open
@ -6330,7 +6358,7 @@ msgstr "الرصيد محسوب علي اساس بدايه الرصيد و ال
#. module: account
#: field:account.journal,loss_account_id:0
msgid "Loss Account"
msgstr ""
msgstr "حساب الخسارة"
#. module: account
#: field:account.tax,account_collected_id:0

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@ -10,14 +10,15 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2012-12-03 16:02+0000\n"
"PO-Revision-Date: 2012-10-17 01:09+0000\n"
"Last-Translator: Cristian Salamea (Gnuthink) <ovnicraft@gmail.com>\n"
"PO-Revision-Date: 2012-12-13 05:27+0000\n"
"Last-Translator: Christopher Ormaza - (Ecuadorenlinea.net) "
"<chris.ormaza@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: 2012-12-04 05:29+0000\n"
"X-Generator: Launchpad (build 16335)\n"
"X-Launchpad-Export-Date: 2012-12-14 05:37+0000\n"
"X-Generator: Launchpad (build 16369)\n"
#. module: account
#: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@ -29,6 +30,7 @@ msgstr "Sistema de Pago"
msgid ""
"An account fiscal position could be defined only once time on same accounts."
msgstr ""
"Una posición fiscal solo puede estar definida una vez en las mismas cuentas."
#. module: account
#: view:account.unreconcile:0
@ -88,7 +90,7 @@ msgstr "Importar desde factura o pago"
#: code:addons/account/account_move_line.py:1198
#, python-format
msgid "Bad Account!"
msgstr ""
msgstr "Cuenta erronea."
#. module: account
#: view:account.move:0
@ -111,6 +113,8 @@ msgid ""
"Error!\n"
"You cannot create recursive account templates."
msgstr ""
"¡Error!\n"
"No puede crear plantillas de cuentas recursivas."
#. module: account
#. openerp-web
@ -183,6 +187,9 @@ msgid ""
"which is set after generating opening entries from 'Generate Opening "
"Entries'."
msgstr ""
"Tiene que establecer un diario para el asiento de cierre para este año "
"fiscal, que se crea después de generar el asiento de apertura desde "
"\"Generar asiento de apertura\"."
#. module: account
#: field:account.fiscal.position.account,account_src_id:0
@ -201,6 +208,14 @@ msgid ""
" </p>\n"
" "
msgstr ""
"<p class=\"oe_view_nocontent_create\">\n"
" Haga clic para añadir un período fiscal.\n"
" </p><p>\n"
" Un período fiscal es habitualmente un mes o un trimestre. \n"
" Normalmente se corresponde con los períodos de presentación "
"de impuestos\n"
" </p>\n"
" "
#. module: account
#: model:ir.actions.act_window,name:account.action_view_created_invoice_dashboard
@ -215,7 +230,7 @@ msgstr "Etiqueta de Columna"
#. module: account
#: help:account.config.settings,code_digits:0
msgid "No. of digits to use for account code"
msgstr ""
msgstr "Cantidad de dígitos a usar para el código de la cuenta"
#. module: account
#: help:account.analytic.journal,type:0
@ -235,6 +250,9 @@ msgid ""
"lines for invoices. Leave empty if you don't want to use an analytic account "
"on the invoice tax lines by default."
msgstr ""
"Introduzca la cuenta analítica a usar por defecto en las líneas de impuestos "
"de las facturas. Déjelo vacío si no quiere utilizar cuantas analíticas por "
"defecto en las líneas de impuestos."
#. module: account
#: model:ir.actions.act_window,name:account.action_account_tax_template_form
@ -265,7 +283,7 @@ msgstr "Reportes de Bélgica"
#. module: account
#: model:account.account.type,name:account.account_type_income_view1
msgid "Income View"
msgstr ""
msgstr "Vista de ingresos"
#. module: account
#: help:account.account,user_type:0
@ -281,7 +299,7 @@ msgstr ""
#. module: account
#: field:account.config.settings,sale_refund_sequence_next:0
msgid "Next credit note number"
msgstr ""
msgstr "Número siguiente de nota de crédito"
#. module: account
#: help:account.config.settings,module_account_voucher:0
@ -290,6 +308,9 @@ msgid ""
"sales, purchase, expense, contra, etc.\n"
" This installs the module account_voucher."
msgstr ""
"Incluye todos los requisitos básicos para la anotación de comprobantes de "
"banco, efectivo, ventas, compras, gastos, etc.. \n"
" Instala el módulo account_voucher"
#. module: account
#: model:ir.actions.act_window,name:account.action_account_use_model_create_entry

View File

@ -7,15 +7,15 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2012-12-03 16:02+0000\n"
"PO-Revision-Date: 2012-12-03 20:35+0000\n"
"Last-Translator: Frederic Clementi - Camptocamp.com "
"<frederic.clementi@camptocamp.com>\n"
"PO-Revision-Date: 2012-12-18 18:03+0000\n"
"Last-Translator: Pierre Lamarche (www.savoirfairelinux.com) "
"<pierre.lamarche@savoirfairelinux.com>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-12-04 05:21+0000\n"
"X-Generator: Launchpad (build 16335)\n"
"X-Launchpad-Export-Date: 2012-12-19 05:16+0000\n"
"X-Generator: Launchpad (build 16378)\n"
#. module: account
#: code:addons/account/wizard/account_fiscalyear_close.py:41
@ -91,6 +91,8 @@ msgstr "Règlement enregistré dans le système"
msgid ""
"An account fiscal position could be defined only once time on same accounts."
msgstr ""
"La position fiscale d'un compte peut être définie seulement une seule fois "
"pour ce compte"
#. module: account
#: view:account.unreconcile:0
@ -132,7 +134,7 @@ msgstr "Solde dû"
#: code:addons/account/account_bank_statement.py:368
#, python-format
msgid "Journal item \"%s\" is not valid."
msgstr ""
msgstr "L'élément \"%s\" du journal n'est pas valide"
#. module: account
#: model:ir.model,name:account.model_report_aged_receivable
@ -184,7 +186,7 @@ msgstr ""
#: code:addons/account/static/src/xml/account_move_reconciliation.xml:30
#, python-format
msgid "Reconcile"
msgstr "Lettrer"
msgstr "Let."
#. module: account
#: field:account.bank.statement,name:0
@ -297,6 +299,9 @@ msgid ""
"lines for invoices. Leave empty if you don't want to use an analytic account "
"on the invoice tax lines by default."
msgstr ""
"Définissez le compte analytique qui sera utilisé par défaut sur les lignes "
"de taxes des factures. Laissez vide si, par défaut, vous ne voulez pas "
"utiliser un compte analytique sur les lignes de taxes des factures."
#. module: account
#: model:ir.actions.act_window,name:account.action_account_tax_template_form
@ -988,12 +993,12 @@ msgstr ""
#. module: account
#: report:account.analytic.account.quantity_cost_ledger:0
msgid "J.C./Move name"
msgstr "J.C. / Nom du mouvement"
msgstr "J.C. / description de l'écriture"
#. module: account
#: view:account.account:0
msgid "Account Code and Name"
msgstr ""
msgstr "Code et Nom du Compte"
#. module: account
#: model:mail.message.subtype,name:account.mt_invoice_new
@ -2993,7 +2998,7 @@ msgstr "Relevés"
#. module: account
#: report:account.analytic.account.journal:0
msgid "Move Name"
msgstr "Nom de la transaction"
msgstr "Description de l'écriture"
#. module: account
#: model:ir.model,name:account.model_account_move_line_reconcile_writeoff
@ -3008,7 +3013,7 @@ msgstr "Ligne d'écriture lettrée (écriture d'écart)"
#: field:account.move.line,account_tax_id:0
#: view:account.tax:0
msgid "Tax"
msgstr "Impôts et taxes"
msgstr "Taxes"
#. module: account
#: view:account.analytic.account:0
@ -4350,7 +4355,7 @@ msgstr ""
#: field:account.move.reconcile,name:0
#: field:account.subscription,name:0
msgid "Name"
msgstr "Nom"
msgstr "Decription"
#. module: account
#: code:addons/account/installer.py:94
@ -4918,7 +4923,7 @@ msgstr "Nom du compte"
#. module: account
#: help:account.fiscalyear.close,report_name:0
msgid "Give name of the new entries"
msgstr "Indique le nom à donner aux nouvelles écritures"
msgstr "Indique la description à donner aux nouvelles écritures"
#. module: account
#: model:ir.model,name:account.model_account_invoice_report
@ -4982,12 +4987,12 @@ msgstr "Le nom de la période doit être unique par société!"
#. module: account
#: help:wizard.multi.charts.accounts,currency_id:0
msgid "Currency as per company's country."
msgstr ""
msgstr "Devise selon le pays de la société"
#. module: account
#: view:account.tax:0
msgid "Tax Computation"
msgstr ""
msgstr "Calcul des taxes"
#. module: account
#: view:wizard.multi.charts.accounts:0
@ -6246,7 +6251,7 @@ msgstr "Comptes fils"
#: code:addons/account/account_move_line.py:1107
#, python-format
msgid "Move name (id): %s (%s)"
msgstr "Nom du mouvement (id): %s (%s)"
msgstr "Description de l'écriture (id): %s (%s)"
#. module: account
#: view:account.move.line.reconcile:0
@ -6258,7 +6263,7 @@ msgstr "Ajustement"
#. module: account
#: field:res.partner,debit:0
msgid "Total Payable"
msgstr "Total à payer"
msgstr "Total "
#. module: account
#: model:account.account.type,name:account.data_account_type_income
@ -7850,7 +7855,7 @@ msgstr ""
#. module: account
#: field:account.fiscalyear.close,report_name:0
msgid "Name of new entries"
msgstr "Nom des nouvelles écritures"
msgstr "Description des nouvelles écritures"
#. module: account
#: view:account.use.model:0
@ -7865,7 +7870,7 @@ msgstr ""
#. module: account
#: help:account.config.settings,currency_id:0
msgid "Main currency of the company."
msgstr ""
msgstr "Devise de a société"
#. module: account
#: model:ir.ui.menu,name:account.menu_finance_reports
@ -8843,7 +8848,7 @@ msgstr ""
#: field:account.move.line,reconcile_partial_id:0
#: view:account.move.line.reconcile:0
msgid "Partial Reconcile"
msgstr "Rapprochement partiel"
msgstr "Let.P"
#. module: account
#: model:ir.model,name:account.model_account_analytic_inverted_balance

View File

@ -7,19 +7,19 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2012-12-03 16:02+0000\n"
"PO-Revision-Date: 2012-06-20 16:19+0000\n"
"Last-Translator: Goran Kliska <gkliska@gmail.com>\n"
"PO-Revision-Date: 2012-12-13 14:32+0000\n"
"Last-Translator: Velimir Valjetic <velimir.valjetic@procudo.hr>\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: 2012-12-04 05:25+0000\n"
"X-Generator: Launchpad (build 16335)\n"
"X-Launchpad-Export-Date: 2012-12-14 05:37+0000\n"
"X-Generator: Launchpad (build 16369)\n"
#. module: account
#: model:process.transition,name:account.process_transition_supplierreconcilepaid0
msgid "System payment"
msgstr "System payment"
msgstr "Način plaćanja"
#. module: account
#: sql_constraint:account.fiscal.position.account:0
@ -30,7 +30,7 @@ msgstr ""
#. module: account
#: view:account.unreconcile:0
msgid "Unreconciliate Transactions"
msgstr "Unreconciliate Transactions"
msgstr "Nepodmirene transakcije"
#. module: account
#: help:account.tax.code,sequence:0
@ -38,11 +38,13 @@ msgid ""
"Determine the display order in the report 'Accounting \\ Reporting \\ "
"Generic Reporting \\ Taxes \\ Taxes Report'"
msgstr ""
"Odredi redoslijed prikaza u izvješćima 'Računovodstvo \\ Izvještaji \\ "
"Generički izvještaji \\ Porezi \\ Porezni izvještaji"
#. module: account
#: view:account.move.reconcile:0
msgid "Journal Entry Reconcile"
msgstr "Zatvaranje stavke dnevnika(IOS)"
msgstr "Zatvaranje IOS-a"
#. module: account
#: view:account.account:0
@ -83,7 +85,7 @@ msgstr "Uvezi iz računa ili plaćanja"
#: code:addons/account/account_move_line.py:1198
#, python-format
msgid "Bad Account!"
msgstr ""
msgstr "Nepostojeći račun!"
#. module: account
#: view:account.move:0
@ -166,7 +168,7 @@ msgstr "Upozorenje!"
#: code:addons/account/account.py:3139
#, python-format
msgid "Miscellaneous Journal"
msgstr ""
msgstr "Ostali dokumenti"
#. module: account
#: code:addons/account/wizard/account_open_closed_fiscalyear.py:39
@ -208,7 +210,7 @@ msgstr "Labela stupca"
#. module: account
#: help:account.config.settings,code_digits:0
msgid "No. of digits to use for account code"
msgstr ""
msgstr "Broj znamenki za kod računa"
#. module: account
#: help:account.analytic.journal,type:0
@ -217,8 +219,8 @@ msgid ""
"invoice) to create analytic entries, OpenERP will look for a matching "
"journal of the same type."
msgstr ""
"Tip analitičkog dnevnika. Kod kreiranja analitičkih knjiženja koristi se "
"ovdje definirani analitički dnevnik odgovarajućeg tipa."
"Tip analitičkog dokumenta. Kod kreiranja analitičkih knjiženja koristit će "
"se dokument istog tipa."
#. module: account
#: help:account.tax,account_analytic_collected_id:0
@ -227,6 +229,9 @@ msgid ""
"lines for invoices. Leave empty if you don't want to use an analytic account "
"on the invoice tax lines by default."
msgstr ""
"Postavi analitički račun koji će se koristiti kao predložak na računu "
"poreznih linija za račune. Ostavite prazno ako ne želite koristiti "
"analitički račun na računu poreznih linija kao predložak."
#. module: account
#: model:ir.actions.act_window,name:account.action_account_tax_template_form
@ -519,7 +524,7 @@ msgstr "Omogući usporedbu"
#: model:ir.model,name:account.model_account_journal
#: field:validate.account.move,journal_id:0
msgid "Journal"
msgstr "Dnevnik"
msgstr "Dokument"
#. module: account
#: model:ir.model,name:account.model_account_invoice_confirm
@ -539,7 +544,7 @@ msgstr ""
#. module: account
#: field:account.bank.statement,account_id:0
msgid "Account used in this journal"
msgstr "Konto ovog dnevnika"
msgstr "Konto"
#. module: account
#: help:account.aged.trial.balance,chart_account_id:0
@ -986,7 +991,7 @@ msgstr "Dospijeće"
#. module: account
#: field:account.config.settings,purchase_journal_id:0
msgid "Purchase journal"
msgstr ""
msgstr "Dokument nabave"
#. module: account
#: code:addons/account/account.py:1316
@ -1693,7 +1698,7 @@ msgstr "Traži izvode banke"
#. module: account
#: view:account.move.line:0
msgid "Unposted Journal Items"
msgstr "Nepotvrđene stavke dnevnika"
msgstr "Nepotvrđena knjiženja"
#. module: account
#: view:account.chart.template:0
@ -2213,7 +2218,7 @@ msgstr ""
#: field:account.invoice,move_name:0
#: field:account.move.line,move_id:0
msgid "Journal Entry"
msgstr "Temeljnica"
msgstr ""
#. module: account
#: view:account.invoice:0
@ -2290,7 +2295,7 @@ msgstr ""
#: code:addons/account/static/src/xml/account_move_line_quickadd.xml:14
#, python-format
msgid "Journal :"
msgstr ""
msgstr "Dokument :"
#. module: account
#: sql_constraint:account.fiscal.position.tax:0
@ -3166,7 +3171,7 @@ msgstr ""
#. module: account
#: field:account.config.settings,sale_journal_id:0
msgid "Sale journal"
msgstr ""
msgstr "Dokument prodaje"
#. module: account
#: code:addons/account/account.py:2293
@ -3637,7 +3642,7 @@ msgstr "Ostavite prazno za korištenje konta troška"
#: model:ir.ui.menu,name:account.menu_journals
#: model:ir.ui.menu,name:account.menu_journals_report
msgid "Journals"
msgstr "Dnevnici"
msgstr "Vrste dokumenta"
#. module: account
#: field:account.partner.reconcile.process,to_reconcile:0
@ -3779,7 +3784,7 @@ msgstr "Stablo poreza"
#. module: account
#: view:account.journal:0
msgid "Search Account Journal"
msgstr "Traži dnevnik"
msgstr "Traži vrstu dokumenta"
#. module: account
#: model:ir.actions.act_window,name:account.action_invoice_tree_pending_invoice
@ -6186,7 +6191,7 @@ msgstr "Max. kol.:"
#: view:account.invoice:0
#: model:ir.actions.act_window,name:account.action_account_invoice_refund
msgid "Refund Invoice"
msgstr "Storno računi"
msgstr "Storniraj račun"
#. module: account
#: model:ir.actions.act_window,help:account.action_account_entries_report_all
@ -6872,7 +6877,7 @@ msgstr ""
#: selection:report.invoice.created,type:0
#, python-format
msgid "Supplier Refund"
msgstr "Povrat URA"
msgstr "Odobrenje dobavljača"
#. module: account
#: field:account.bank.statement,move_line_ids:0
@ -8457,7 +8462,7 @@ msgstr "Iznos ovog poreza dodati osnovici prije izračuna slijedećeg poreza."
#: code:addons/account/account.py:3138
#, python-format
msgid "Purchase Refund Journal"
msgstr "Dnevnik odobrenja dobavljača"
msgstr "Knjiga odobrenja dobavljača"
#. module: account
#: code:addons/account/account.py:1292
@ -8778,7 +8783,7 @@ msgstr "Fiscalyear Close state"
#. module: account
#: field:account.invoice.refund,journal_id:0
msgid "Refund Journal"
msgstr "Dnevnik povrata"
msgstr "Knjiga odobrenja"
#. module: account
#: report:account.account.balance:0
@ -10839,7 +10844,7 @@ msgstr "Traži račun"
#: view:account.invoice:0
#: view:account.invoice.report:0
msgid "Refund"
msgstr "Povrat novca"
msgstr "Odobrenje"
#. module: account
#: model:ir.model,name:account.model_res_partner_bank

View File

@ -8,14 +8,14 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2012-12-03 16:02+0000\n"
"PO-Revision-Date: 2012-08-24 02:50+0000\n"
"Last-Translator: Ginandjar Satyanagara <Unknown>\n"
"PO-Revision-Date: 2012-12-15 11:28+0000\n"
"Last-Translator: riza Kurniawan <Unknown>\n"
"Language-Team: Indonesian <id@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-12-04 05:22+0000\n"
"X-Generator: Launchpad (build 16335)\n"
"X-Launchpad-Export-Date: 2012-12-16 04:47+0000\n"
"X-Generator: Launchpad (build 16372)\n"
#. module: account
#: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@ -26,12 +26,12 @@ msgstr "Sistem Pembayaran"
#: sql_constraint:account.fiscal.position.account:0
msgid ""
"An account fiscal position could be defined only once time on same accounts."
msgstr ""
msgstr "Posisi Tahun Fiskal didefinisikan sekali saja untuk akun yang sama"
#. module: account
#: view:account.unreconcile:0
msgid "Unreconciliate Transactions"
msgstr ""
msgstr "Transaksi Belum Di-rekonsiliasi"
#. module: account
#: help:account.tax.code,sequence:0
@ -39,11 +39,13 @@ msgid ""
"Determine the display order in the report 'Accounting \\ Reporting \\ "
"Generic Reporting \\ Taxes \\ Taxes Report'"
msgstr ""
"Menentukan urutan tampilan dalam laporan 'Akunting\\Pelaporan\\Pelaporan "
"Generik\\Pajak\\Laporan Pjak'"
#. module: account
#: view:account.move.reconcile:0
msgid "Journal Entry Reconcile"
msgstr ""
msgstr "Rekonsiliasi Ayat-ayat Jurnal"
#. module: account
#: view:account.account:0
@ -60,7 +62,7 @@ msgstr "Proforma/Terbuka/Terbayar Faktur"
#. module: account
#: field:report.invoice.created,residual:0
msgid "Residual"
msgstr "Tersisa"
msgstr "Sisa"
#. module: account
#: code:addons/account/account_bank_statement.py:368
@ -108,6 +110,8 @@ msgid ""
"Error!\n"
"You cannot create recursive account templates."
msgstr ""
"Kesalahan\n"
"Anda tidak bisa membuat template akun secara rekursif"
#. module: account
#. openerp-web

File diff suppressed because it is too large Load Diff

View File

@ -7,14 +7,14 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2012-12-03 16:02+0000\n"
"PO-Revision-Date: 2012-11-29 13:22+0000\n"
"PO-Revision-Date: 2012-12-12 15:27+0000\n"
"Last-Translator: Andrius Preimantas <andrius.preimantas@gmail.com>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-12-04 05:23+0000\n"
"X-Generator: Launchpad (build 16335)\n"
"X-Launchpad-Export-Date: 2012-12-13 04:43+0000\n"
"X-Generator: Launchpad (build 16361)\n"
#. module: account
#: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@ -359,7 +359,7 @@ msgstr ""
#: selection:report.account.sales,month:0
#: selection:report.account_type.sales,month:0
msgid "June"
msgstr ""
msgstr "Birželis"
#. module: account
#: code:addons/account/wizard/account_automatic_reconcile.py:148
@ -919,7 +919,7 @@ msgstr ""
#: selection:report.account.sales,month:0
#: selection:report.account_type.sales,month:0
msgid "September"
msgstr ""
msgstr "Rugsėjis"
#. module: account
#: selection:account.subscription,period_type:0
@ -2441,7 +2441,7 @@ msgstr ""
#: selection:report.account.sales,month:0
#: selection:report.account_type.sales,month:0
msgid "January"
msgstr ""
msgstr "Sausis"
#. module: account
#: view:account.entries.report:0
@ -3209,7 +3209,7 @@ msgstr "Iki periodo"
#: selection:report.account.sales,month:0
#: selection:report.account_type.sales,month:0
msgid "August"
msgstr ""
msgstr "Rugpjūtis"
#. module: account
#: field:accounting.report,debit_credit:0
@ -3223,7 +3223,7 @@ msgstr ""
#: selection:report.account.sales,month:0
#: selection:report.account_type.sales,month:0
msgid "October"
msgstr ""
msgstr "Spalis"
#. module: account
#: help:account.move.line,quantity:0
@ -6084,7 +6084,7 @@ msgstr "Tiekėjas"
#: selection:report.account.sales,month:0
#: selection:report.account_type.sales,month:0
msgid "March"
msgstr ""
msgstr "Kovas"
#. module: account
#: report:account.analytic.account.journal:0
@ -7894,7 +7894,7 @@ msgstr ""
#: selection:report.account.sales,month:0
#: selection:report.account_type.sales,month:0
msgid "May"
msgstr ""
msgstr "Gegužė"
#. module: account
#: code:addons/account/account_invoice.py:776
@ -9646,7 +9646,7 @@ msgstr ""
#: selection:report.account.sales,month:0
#: selection:report.account_type.sales,month:0
msgid "July"
msgstr ""
msgstr "Liepa"
#. module: account
#: view:account.account:0
@ -10047,7 +10047,7 @@ msgstr "Numatytieji mokesčiai"
#: selection:report.account.sales,month:0
#: selection:report.account_type.sales,month:0
msgid "April"
msgstr ""
msgstr "Balandis"
#. module: account
#: model:account.financial.report,name:account.account_financial_report_profitloss_toreport0
@ -10563,7 +10563,7 @@ msgstr ""
#: selection:report.account.sales,month:0
#: selection:report.account_type.sales,month:0
msgid "December"
msgstr ""
msgstr "Gruodis"
#. module: account
#: view:account.invoice.report:0
@ -10667,7 +10667,7 @@ msgstr ""
#: selection:report.account.sales,month:0
#: selection:report.account_type.sales,month:0
msgid "November"
msgstr ""
msgstr "Lapkritis"
#. module: account
#: model:ir.actions.act_window,help:account.action_account_moves_all_a
@ -10858,7 +10858,7 @@ msgstr ""
#: selection:report.account.sales,month:0
#: selection:report.account_type.sales,month:0
msgid "February"
msgstr ""
msgstr "Vasaris"
#. module: account
#: help:account.bank.statement,name:0

View File

@ -8,14 +8,14 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2012-12-03 16:02+0000\n"
"PO-Revision-Date: 2012-05-10 17:16+0000\n"
"Last-Translator: Raphael Collet (OpenERP) <Unknown>\n"
"PO-Revision-Date: 2012-12-17 13:50+0000\n"
"Last-Translator: Normunds (Alistek) <Unknown>\n"
"Language-Team: Latvian <lv@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-12-04 05:23+0000\n"
"X-Generator: Launchpad (build 16335)\n"
"X-Launchpad-Export-Date: 2012-12-18 05:00+0000\n"
"X-Generator: Launchpad (build 16372)\n"
#. module: account
#: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@ -460,7 +460,7 @@ msgstr ""
#: field:account.tax.template,chart_template_id:0
#: field:wizard.multi.charts.accounts,chart_template_id:0
msgid "Chart Template"
msgstr "Grafika Sagatave"
msgstr "Kontu Plāna Sagatave"
#. module: account
#: help:account.config.settings,tax_calculation_rounding_method:0

View File

@ -7,14 +7,14 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2012-12-03 16:02+0000\n"
"PO-Revision-Date: 2012-12-01 16:00+0000\n"
"Last-Translator: Thomas Pot (Open2bizz) <Unknown>\n"
"PO-Revision-Date: 2012-12-17 14:28+0000\n"
"Last-Translator: Harjan Talen <harjantalen@gmail.com>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-12-04 05:21+0000\n"
"X-Generator: Launchpad (build 16335)\n"
"X-Launchpad-Export-Date: 2012-12-18 05:00+0000\n"
"X-Generator: Launchpad (build 16372)\n"
#, python-format
#~ msgid "Integrity Error !"
@ -30,13 +30,13 @@ msgstr "Betaling (administratief)"
msgid ""
"An account fiscal position could be defined only once time on same accounts."
msgstr ""
"Een fiscale positie kan maar één keer worden gedefinieerd voro dezelfde "
"Een fiscale positie kan maar één keer worden gedefinieerd voor dezelfde "
"rekening."
#. module: account
#: view:account.unreconcile:0
msgid "Unreconciliate Transactions"
msgstr "Afletteren transactief ongedaan maken"
msgstr "Afletteren transacties ongedaan maken"
#. module: account
#: help:account.tax.code,sequence:0
@ -502,7 +502,7 @@ msgstr ""
#: code:addons/account/static/src/xml/account_move_line_quickadd.xml:8
#, python-format
msgid "Period :"
msgstr ""
msgstr "Periode:"
#. module: account
#: field:account.account.template,chart_template_id:0
@ -808,6 +808,9 @@ msgid ""
"lines for refunds. Leave empty if you don't want to use an analytic account "
"on the invoice tax lines by default."
msgstr ""
"Selecteer de kostenplaats rekening welke standaard gebruikt wordt voor "
"belastingregels op creditfacturen. Laat deze leeg wanneer geen gebruikt "
"gemaakt wordt van kostenplaatsen."
#. module: account
#: view:account.account:0
@ -823,7 +826,7 @@ msgstr "Debiteuren"
#. module: account
#: view:account.config.settings:0
msgid "Configure your company bank accounts"
msgstr ""
msgstr "Bankrekeningen van het bedrijf instellen"
#. module: account
#: constraint:account.move.line:0
@ -861,6 +864,8 @@ msgid ""
"Cannot %s invoice which is already reconciled, invoice should be "
"unreconciled first. You can only refund this invoice."
msgstr ""
"Niet mogelijk %s met een afgeletterde factuur. De factuur kan wel "
"gecrediteerd worden."
#. module: account
#: selection:account.financial.report,display_detail:0
@ -939,7 +944,7 @@ msgstr "Leveranciers facturen en teruggaves"
#: code:addons/account/account_move_line.py:847
#, python-format
msgid "Entry is already reconciled."
msgstr ""
msgstr "Boeking is reeds afgeletterd."
#. module: account
#: view:account.move.line.unreconcile.select:0
@ -974,6 +979,8 @@ msgid ""
"Print Report with the currency column if the currency differs from the "
"company currency."
msgstr ""
"Print de rapportage met de valuta kolom als de valuta afwijkt van de "
"bedrijfsvaluta"
#. module: account
#: report:account.analytic.account.quantity_cost_ledger:0
@ -983,7 +990,7 @@ msgstr "Dagboek code / Mutatienaam"
#. module: account
#: view:account.account:0
msgid "Account Code and Name"
msgstr ""
msgstr "Naam en nummer grootboekrekening"
#. module: account
#: model:mail.message.subtype,name:account.mt_invoice_new
@ -1032,6 +1039,8 @@ msgid ""
" opening/closing fiscal "
"year process."
msgstr ""
"Het afletteren van boekingen kan niet ongedaan worden gemaakt wanneer ze "
"zijn gemaakt bij de jaarovergang."
#. module: account
#: model:ir.actions.act_window,name:account.action_subscription_form_new
@ -1077,6 +1086,8 @@ msgid ""
"You cannot validate this journal entry because account \"%s\" does not "
"belong to chart of accounts \"%s\"."
msgstr ""
"U kunt deze journaalpost niet valideren omdat rekening \"%s\" niet tot het "
"rekeningschema \"%s\" behoort."
#. module: account
#: view:validate.account.move:0
@ -1094,7 +1105,7 @@ msgstr "Totaalbedrag"
#. module: account
#: help:account.invoice,supplier_invoice_number:0
msgid "The reference of this invoice as provided by the supplier."
msgstr ""
msgstr "De referentie van deze factuur zoals opgegeven door de leverancier"
#. module: account
#: selection:account.account,type:0
@ -1219,6 +1230,17 @@ msgid ""
" </p>\n"
" "
msgstr ""
"<p class=\"oe_view_nocontent_create\">\n"
" Klik om een grootboekkaar toe te voegen.\n"
" </p><p>\n"
" Bij transacties in meerdere valuta kan een valutaresultaat "
"tot\n"
" stand komen. Dit menu geeft het actuele valutaresultaat aan\n"
" tegen de huidige koers. Dit wordt alleen aangegeven bij "
"groot-\n"
" boekkaarten waar meerdere valuta aan gekoppeld zijn.\n"
" </p>\n"
" "
#. module: account
#: field:account.bank.accounts.wizard,acc_name:0
@ -1228,7 +1250,7 @@ msgstr "Rekeningnaam."
#. module: account
#: field:account.journal,with_last_closing_balance:0
msgid "Opening With Last Closing Balance"
msgstr ""
msgstr "Openen met het laatst afgesloten saldo."
#. module: account
#: help:account.tax.code,notprintable:0
@ -1236,6 +1258,8 @@ msgid ""
"Check this box if you don't want any tax related to this tax code to appear "
"on invoices"
msgstr ""
"Aanvinken wanneer geen belasting gegevens zichtbaar moeten zijn op de "
"factuur."
#. module: account
#: field:report.account.receivable,name:0
@ -1270,6 +1294,8 @@ msgstr "Crediteer "
#: help:account.config.settings,company_footer:0
msgid "Bank accounts as printed in the footer of each printed document"
msgstr ""
"Rekeninginformatie die afgedrukt wordt in de voettekst van ieder afgedrukt "
"document"
#. module: account
#: view:account.tax:0
@ -1496,7 +1522,7 @@ msgstr "Niveau"
#: code:addons/account/wizard/account_change_currency.py:38
#, python-format
msgid "You can only change currency for Draft Invoice."
msgstr ""
msgstr "U kunt alleen de valuta wijzigen van een voorlopige factuur"
#. module: account
#: report:account.invoice:0
@ -1617,7 +1643,7 @@ msgstr "Debiteuren"
#: code:addons/account/account.py:767
#, python-format
msgid "%s (copy)"
msgstr ""
msgstr "%s (kopie)"
#. module: account
#: selection:account.balance.report,display_account:0
@ -1634,6 +1660,8 @@ msgid ""
"There is no default debit account defined \n"
"on journal \"%s\"."
msgstr ""
"Er is geen standaard debet grootboekrekening gedefinieerd in dit dagboek: "
"\"%s\"."
#. module: account
#: view:account.tax:0
@ -1668,6 +1696,8 @@ msgid ""
"There is nothing to reconcile. All invoices and payments\n"
" have been reconciled, your partner balance is clean."
msgstr ""
"Er zijn geen facturen om af te letteren. Alle facturen en betalingen zijn "
"afgeletterd."
#. module: account
#: field:account.chart.template,code_digits:0
@ -2125,7 +2155,7 @@ msgstr "Klant ref:"
#: help:account.tax.template,ref_tax_code_id:0
#: help:account.tax.template,tax_code_id:0
msgid "Use this code for the tax declaration."
msgstr ""
msgstr "Gebruik deze code voor de belastingaangifte"
#. module: account
#: help:account.period,special:0
@ -2292,6 +2322,18 @@ msgid ""
" </p>\n"
" "
msgstr ""
"<p class=\"oe_view_nocontent_create\">\n"
" Klik om een bankafschrift te registreren.\n"
" </p><p>\n"
" Een bankafschrift is een samenvatting van alle financiele "
"transacties\n"
" van een bankrekening gedurende een bepaalde periode.\n"
" U ontvangt deze periodieke van uw bank.\n"
" </p><p>\n"
" Met OpenERP kunt u de bankafschriften direct afletteren\n"
" met de gerelateerde in- en verkoopfacturen.\n"
" </p>\n"
" "
#. module: account
#: field:account.config.settings,currency_id:0
@ -2381,7 +2423,7 @@ msgstr "Afsluiten boekjaar"
#: code:addons/account/static/src/xml/account_move_line_quickadd.xml:14
#, python-format
msgid "Journal :"
msgstr ""
msgstr "Dagboek:"
#. module: account
#: sql_constraint:account.fiscal.position.tax:0
@ -7290,7 +7332,7 @@ msgstr "Behoud het balans +/- teken"
#: model:ir.actions.report.xml,name:account.account_vat_declaration
#: model:ir.ui.menu,name:account.menu_account_vat_declaration
msgid "Taxes Report"
msgstr "Belastingen rapport"
msgstr "BTW aangifte"
#. module: account
#: selection:account.journal.period,state:0
@ -8311,7 +8353,7 @@ msgstr "Activa"
#. module: account
#: field:account.bank.statement,balance_end:0
msgid "Computed Balance"
msgstr "Bereken balans"
msgstr "Berekende balans"
#. module: account
#. openerp-web
@ -8497,8 +8539,9 @@ msgid ""
"The statement balance is incorrect !\n"
"The expected balance (%.2f) is different than the computed one. (%.2f)"
msgstr ""
"De afschrift balans is incorrect!\n"
"De verwachte balans (%.2f) is verschillend dan de berekende. (%.2f)"
"Het eindsaldo van het afschrift is onjuist!\n"
"Het verwachte eindsaldo (%.2f) is verschillend dan het berekende eindsaldo "
"(%.2f)."
#. module: account
#: code:addons/account/account_bank_statement.py:419
@ -10658,7 +10701,7 @@ msgstr "Vervaldatum"
#: field:cash.box.in,name:0
#: field:cash.box.out,name:0
msgid "Reason"
msgstr ""
msgstr "Reden"
#. module: account
#: selection:account.partner.ledger,filter:0
@ -10839,7 +10882,7 @@ msgstr "Debiteuren"
#: code:addons/account/account_move_line.py:776
#, python-format
msgid "Already reconciled."
msgstr ""
msgstr "Al afgeletterd"
#. module: account
#: selection:account.model.line,date_maturity:0
@ -11138,7 +11181,7 @@ msgstr "Rechts bovenliggende"
#: code:addons/account/static/src/js/account_move_reconciliation.js:80
#, python-format
msgid "Never"
msgstr ""
msgstr "Nooit"
#. module: account
#: model:ir.model,name:account.model_account_addtmpl_wizard
@ -11159,7 +11202,7 @@ msgstr "Relaties"
#. module: account
#: field:account.account,note:0
msgid "Internal Notes"
msgstr ""
msgstr "Interne notities"
#. module: account
#: model:ir.actions.act_window,name:account.action_account_fiscalyear
@ -11192,7 +11235,7 @@ msgstr "Administratiemodel"
#: code:addons/account/account_cash_statement.py:292
#, python-format
msgid "Loss"
msgstr ""
msgstr "Verlies"
#. module: account
#: selection:account.entries.report,month:0
@ -13626,9 +13669,6 @@ msgstr ""
#~ "U kunt het bedrijf niet meer veranderen in dit dagboek omdat er inmiddels al "
#~ "gerelateerde transacties op zijn geboekt."
#~ msgid "Reference UoM"
#~ msgstr "Referentie meeteenheid"
#~ msgid "Unreconciliate transactions"
#~ msgstr "Afletteren transactief ongedaan maken"
@ -15253,3 +15293,6 @@ msgstr ""
#~ "OpenERP geeft u de mogelijkheid om, vanuit dit menu, een belastingweergave "
#~ "te beheren. Het is mogelijk om numerieke en alfanumerieke belastingrubrieken "
#~ "te gebruiken."
#~ msgid "Reference UoM"
#~ msgstr "Referentie maateenheid"

File diff suppressed because it is too large Load Diff

View File

@ -7,14 +7,14 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2012-12-03 16:02+0000\n"
"PO-Revision-Date: 2012-06-20 16:19+0000\n"
"Last-Translator: Tiago Rodrigues <tig.rodrigues@gmail.com>\n"
"PO-Revision-Date: 2012-12-18 15:21+0000\n"
"Last-Translator: Rui Franco (multibase.pt) <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: 2012-12-04 05:24+0000\n"
"X-Generator: Launchpad (build 16335)\n"
"X-Launchpad-Export-Date: 2012-12-19 05:16+0000\n"
"X-Generator: Launchpad (build 16378)\n"
#. module: account
#: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@ -108,6 +108,8 @@ msgid ""
"Error!\n"
"You cannot create recursive account templates."
msgstr ""
"Erro!\n"
"Não pode criar modelos de conta de forma recursiva."
#. module: account
#. openerp-web
@ -212,7 +214,7 @@ msgstr "Rótulo da Coluna"
#. module: account
#: help:account.config.settings,code_digits:0
msgid "No. of digits to use for account code"
msgstr ""
msgstr "Número de algarismos a usar no código da conta"
#. module: account
#: help:account.analytic.journal,type:0
@ -278,7 +280,7 @@ msgstr ""
#. module: account
#: field:account.config.settings,sale_refund_sequence_next:0
msgid "Next credit note number"
msgstr ""
msgstr "Próximo número de nota de crédito"
#. module: account
#: help:account.config.settings,module_account_voucher:0
@ -336,7 +338,7 @@ msgstr "Desconciliar Contas"
#. module: account
#: field:account.config.settings,module_account_budget:0
msgid "Budget management"
msgstr ""
msgstr "Gestão de orçamento"
#. module: account
#: view:product.template:0
@ -357,7 +359,7 @@ msgstr ""
#. module: account
#: field:account.config.settings,group_multi_currency:0
msgid "Allow multi currencies"
msgstr ""
msgstr "Permitir várias divisas"
#. module: account
#: code:addons/account/account_invoice.py:73
@ -391,7 +393,7 @@ msgstr ""
#: view:account.invoice.report:0
#: field:account.invoice.report,user_id:0
msgid "Salesperson"
msgstr ""
msgstr "Vendedor"
#. module: account
#: model:ir.model,name:account.model_account_tax_template
@ -457,7 +459,7 @@ msgstr ""
#: code:addons/account/static/src/xml/account_move_line_quickadd.xml:8
#, python-format
msgid "Period :"
msgstr ""
msgstr "Período"
#. module: account
#: field:account.account.template,chart_template_id:0
@ -906,7 +908,7 @@ msgstr "Diário da contabilidade analítica"
#. module: account
#: view:account.invoice:0
msgid "Send by Email"
msgstr ""
msgstr "Enviar por email"
#. module: account
#: help:account.central.journal,amount_currency:0
@ -962,6 +964,10 @@ msgid ""
" </p>\n"
" "
msgstr ""
"<p>\n"
" Não foram encontradas entradas em diário.\n"
" </p>\n"
" "
#. module: account
#: code:addons/account/account.py:1632
@ -1007,7 +1013,7 @@ msgstr "Limite"
#. module: account
#: field:account.config.settings,purchase_journal_id:0
msgid "Purchase journal"
msgstr ""
msgstr "Diário de compras"
#. module: account
#: code:addons/account/account.py:1316
@ -1202,7 +1208,7 @@ msgstr ""
#. module: account
#: view:account.invoice:0
msgid "Refund "
msgstr ""
msgstr "Reembolso "
#. module: account
#: help:account.config.settings,company_footer:0
@ -1342,7 +1348,7 @@ msgstr "Taxa de câmbios nas vendas"
#. module: account
#: field:account.config.settings,chart_template_id:0
msgid "Template"
msgstr ""
msgstr "Modelo"
#. module: account
#: selection:account.analytic.journal,type:0
@ -1434,7 +1440,7 @@ msgstr "Nível"
#: code:addons/account/wizard/account_change_currency.py:38
#, python-format
msgid "You can only change currency for Draft Invoice."
msgstr ""
msgstr "Só se pode mudar a divisa num rascunho de fatura."
#. module: account
#: report:account.invoice:0
@ -1505,7 +1511,7 @@ msgstr "Opções de relatório"
#. module: account
#: field:account.fiscalyear.close.state,fy_id:0
msgid "Fiscal Year to Close"
msgstr ""
msgstr "Ano fiscal a ser fechado"
#. module: account
#: field:account.config.settings,sale_sequence_prefix:0
@ -1634,7 +1640,7 @@ msgstr "Nota de crédito"
#. module: account
#: view:account.config.settings:0
msgid "eInvoicing & Payments"
msgstr ""
msgstr "Faturação eletrónica e pagamentos"
#. module: account
#: view:account.analytic.cost.ledger.journal.report:0
@ -1711,7 +1717,7 @@ msgstr "Sem imposto"
#. module: account
#: view:account.journal:0
msgid "Advanced Settings"
msgstr ""
msgstr "Configurações avançadas"
#. module: account
#: view:account.bank.statement:0
@ -2025,7 +2031,7 @@ msgstr ""
#. module: account
#: view:account.period:0
msgid "Duration"
msgstr ""
msgstr "Duração"
#. module: account
#: view:account.bank.statement:0
@ -2089,7 +2095,7 @@ msgstr "Montante do crédito"
#: field:account.bank.statement,message_ids:0
#: field:account.invoice,message_ids:0
msgid "Messages"
msgstr ""
msgstr "Mensagens"
#. module: account
#: view:account.vat.declaration:0
@ -2188,7 +2194,7 @@ msgstr "Análise de faturas"
#. module: account
#: model:ir.model,name:account.model_mail_compose_message
msgid "Email composition wizard"
msgstr ""
msgstr "Assistente de criação de mensagem eletrónica"
#. module: account
#: model:ir.model,name:account.model_account_period_close
@ -2234,7 +2240,7 @@ msgstr ""
#. module: account
#: field:account.config.settings,currency_id:0
msgid "Default company currency"
msgstr ""
msgstr "Divisa padrão da empresa"
#. module: account
#: field:account.invoice,move_id:0
@ -2282,7 +2288,7 @@ msgstr "Válido"
#: field:account.bank.statement,message_follower_ids:0
#: field:account.invoice,message_follower_ids:0
msgid "Followers"
msgstr ""
msgstr "Seguidores"
#. module: account
#: model:ir.actions.act_window,name:account.action_account_print_journal
@ -2311,14 +2317,14 @@ msgstr "Relatório de Balancete de Antiguidade de Contas Experimental"
#. module: account
#: view:account.fiscalyear.close.state:0
msgid "Close Fiscal Year"
msgstr ""
msgstr "Fechar ano fiscal"
#. module: account
#. openerp-web
#: code:addons/account/static/src/xml/account_move_line_quickadd.xml:14
#, python-format
msgid "Journal :"
msgstr ""
msgstr "Diáro:"
#. module: account
#: sql_constraint:account.fiscal.position.tax:0
@ -2356,7 +2362,7 @@ msgstr ""
#: code:addons/account/static/src/xml/account_move_reconciliation.xml:8
#, python-format
msgid "Good job!"
msgstr ""
msgstr "Bom trabalho!"
#. module: account
#: field:account.config.settings,module_account_asset:0
@ -2737,7 +2743,7 @@ msgstr "Posições Fiscais"
#: code:addons/account/account_move_line.py:578
#, python-format
msgid "You cannot create journal items on a closed account %s %s."
msgstr ""
msgstr "Não se pode criar entradas em diário numa conta já fechada %s %s."
#. module: account
#: field:account.period.close,sure:0
@ -2770,7 +2776,7 @@ msgstr "Estado de rascunho de uma fatura"
#. module: account
#: view:product.category:0
msgid "Account Properties"
msgstr ""
msgstr "Propriedades da conta"
#. module: account
#: view:account.partner.reconcile.process:0
@ -2857,7 +2863,7 @@ msgstr "EXJ"
#. module: account
#: view:account.invoice.refund:0
msgid "Create Credit Note"
msgstr ""
msgstr "Criar nota de crédito"
#. module: account
#: field:product.template,supplier_taxes_id:0
@ -3167,7 +3173,7 @@ msgstr "Fechar montante"
#: field:account.bank.statement,message_unread:0
#: field:account.invoice,message_unread:0
msgid "Unread Messages"
msgstr ""
msgstr "Mensagens por ler"
#. module: account
#: code:addons/account/wizard/account_invoice_state.py:44
@ -3204,7 +3210,7 @@ msgstr ""
#. module: account
#: field:account.config.settings,sale_journal_id:0
msgid "Sale journal"
msgstr ""
msgstr "Diário de vendas"
#. module: account
#: code:addons/account/account.py:2293
@ -3308,7 +3314,7 @@ msgstr "Conta de Despesas"
#: field:account.bank.statement,message_summary:0
#: field:account.invoice,message_summary:0
msgid "Summary"
msgstr ""
msgstr "Resumo"
#. module: account
#: help:account.invoice,period_id:0
@ -3431,7 +3437,7 @@ msgstr "Escolha o Ano Fiscal"
#: view:account.config.settings:0
#: view:account.installer:0
msgid "Date Range"
msgstr ""
msgstr "Intervalo de datas"
#. module: account
#: view:account.period:0
@ -3615,7 +3621,7 @@ msgstr "Templates de Plano de Contas"
#. module: account
#: view:account.bank.statement:0
msgid "Transactions"
msgstr ""
msgstr "Transações"
#. module: account
#: model:ir.model,name:account.model_account_unreconcile_reconcile
@ -4031,7 +4037,7 @@ msgstr ""
#. module: account
#: model:ir.model,name:account.model_account_journal_cashbox_line
msgid "account.journal.cashbox.line"
msgstr ""
msgstr "account.journal.cashbox.line"
#. module: account
#: model:ir.model,name:account.model_account_partner_reconcile_process
@ -4314,7 +4320,7 @@ msgstr "ID Parceiro"
#: help:account.bank.statement,message_ids:0
#: help:account.invoice,message_ids:0
msgid "Messages and communication history"
msgstr ""
msgstr "Histórico de mensagens e comunicação"
#. module: account
#: help:account.journal,analytic_journal_id:0
@ -4355,7 +4361,7 @@ msgstr ""
#: code:addons/account/account_move_line.py:1131
#, python-format
msgid "You cannot use an inactive account."
msgstr ""
msgstr "Não se pode usar uma conta inativa."
#. module: account
#: model:ir.actions.act_window,name:account.open_board_account
@ -4386,7 +4392,7 @@ msgstr "Dependentes consolidados"
#: code:addons/account/wizard/account_invoice_refund.py:146
#, python-format
msgid "Insufficient Data!"
msgstr ""
msgstr "Dados insuficientes!"
#. module: account
#: help:account.account,unrealized_gain_loss:0
@ -4423,7 +4429,7 @@ msgstr "título"
#. module: account
#: selection:account.invoice.refund,filter_refund:0
msgid "Create a draft credit note"
msgstr ""
msgstr "Criar um rascunho de nota de crédito"
#. module: account
#: view:account.invoice:0
@ -4455,7 +4461,7 @@ msgstr "Ativos"
#. module: account
#: view:account.config.settings:0
msgid "Accounting & Finance"
msgstr ""
msgstr "Contabilidade e finanças"
#. module: account
#: view:account.invoice.confirm:0
@ -4632,6 +4638,8 @@ msgid ""
"Error!\n"
"You cannot create recursive Tax Codes."
msgstr ""
"Erro!\n"
"Não se pode criar códigos de imposto de forma recursiva."
#. module: account
#: constraint:account.period:0
@ -4639,6 +4647,8 @@ msgid ""
"Error!\n"
"The duration of the Period(s) is/are invalid."
msgstr ""
"Erro!\n"
"As durações dos períodos são inválidas."
#. module: account
#: field:account.entries.report,month:0
@ -4676,7 +4686,7 @@ msgstr ""
#: view:analytic.entries.report:0
#: field:analytic.entries.report,product_uom_id:0
msgid "Product Unit of Measure"
msgstr ""
msgstr "Unidade de medida do produto"
#. module: account
#: field:res.company,paypal_account:0
@ -4936,6 +4946,9 @@ msgid ""
"Error!\n"
"You cannot create an account which has parent account of different company."
msgstr ""
"Erro!\n"
"Não se pode criar uma conta que esteja dependente de uma conta pertencente a "
"outra empresa."
#. module: account
#: code:addons/account/account_invoice.py:615
@ -5071,7 +5084,7 @@ msgstr "Fatura cancelada"
#. module: account
#: view:account.invoice:0
msgid "My Invoices"
msgstr ""
msgstr "As minhas faturas"
#. module: account
#: selection:account.bank.statement,state:0
@ -5185,7 +5198,7 @@ msgstr "Cheque"
#: view:validate.account.move:0
#: view:validate.account.move.lines:0
msgid "or"
msgstr ""
msgstr "ou"
#. module: account
#: view:account.invoice.report:0
@ -5278,7 +5291,7 @@ msgstr ""
#: field:account.invoice,message_comment_ids:0
#: help:account.invoice,message_comment_ids:0
msgid "Comments and emails"
msgstr ""
msgstr "Comentários e emails"
#. module: account
#: view:account.bank.statement:0
@ -6235,7 +6248,7 @@ msgstr "Mapeamento Fiscal"
#. module: account
#: view:account.config.settings:0
msgid "Select Company"
msgstr ""
msgstr "Selecione a empresa"
#. module: account
#: model:ir.actions.act_window,name:account.action_account_state_open
@ -6310,7 +6323,7 @@ msgstr "Número de linhas"
#. module: account
#: view:account.invoice:0
msgid "(update)"
msgstr ""
msgstr "(atualizar)"
#. module: account
#: field:account.aged.trial.balance,filter:0
@ -6519,7 +6532,7 @@ msgstr "Linha analítica"
#. module: account
#: model:ir.ui.menu,name:account.menu_action_model_form
msgid "Models"
msgstr ""
msgstr "Modelos"
#. module: account
#: code:addons/account/account_invoice.py:1090
@ -6699,7 +6712,7 @@ msgstr "A receber"
#. module: account
#: constraint:account.move.line:0
msgid "You cannot create journal items on closed account."
msgstr ""
msgstr "Não se pode criar entradas em diário numa conta já fechada."
#. module: account
#: code:addons/account/account_invoice.py:594
@ -6753,7 +6766,7 @@ msgstr "Situação liquida"
#. module: account
#: field:account.journal,internal_account_id:0
msgid "Internal Transfers Account"
msgstr ""
msgstr "Conta de transferências internas"
#. module: account
#: code:addons/account/wizard/pos_box.py:33
@ -6802,7 +6815,7 @@ msgstr "Número de Fatura"
#. module: account
#: field:account.bank.statement,difference:0
msgid "Difference"
msgstr ""
msgstr "Diferença"
#. module: account
#: help:account.tax,include_base_amount:0
@ -6868,12 +6881,12 @@ msgstr ""
#: code:addons/account/wizard/account_report_aged_partner_balance.py:58
#, python-format
msgid "User Error!"
msgstr ""
msgstr "Erro do utilizador!"
#. module: account
#: view:account.open.closed.fiscalyear:0
msgid "Discard"
msgstr ""
msgstr "Descartar"
#. module: account
#: selection:account.account,type:0
@ -7238,7 +7251,7 @@ msgstr "Manual"
#: code:addons/account/wizard/account_report_aged_partner_balance.py:58
#, python-format
msgid "You must set a start date."
msgstr ""
msgstr "Tem de definir uma data de início"
#. module: account
#: view:account.automatic.reconcile:0
@ -7466,6 +7479,8 @@ msgid ""
"Error!\n"
"The start date of a fiscal year must precede its end date."
msgstr ""
"Erro!\n"
"O início do ano fiscal deve ser anterior ao seu fim."
#. module: account
#: view:account.tax.template:0
@ -7774,7 +7789,7 @@ msgstr "Criar movimentos"
#. module: account
#: model:ir.model,name:account.model_cash_box_out
msgid "cash.box.out"
msgstr ""
msgstr "cash.box.out"
#. module: account
#: help:account.config.settings,currency_id:0
@ -8186,7 +8201,7 @@ msgstr "Sequência"
#. module: account
#: field:account.config.settings,paypal_account:0
msgid "Paypal account"
msgstr ""
msgstr "Conta Paypal"
#. module: account
#: selection:account.print.journal,sort_selection:0
@ -8205,11 +8220,13 @@ msgid ""
"Error!\n"
"You cannot create recursive accounts."
msgstr ""
"Erro!\n"
"Não se pode criar contas de forma recursiva."
#. module: account
#: model:ir.model,name:account.model_cash_box_in
msgid "cash.box.in"
msgstr ""
msgstr "cash.box.in"
#. module: account
#: help:account.invoice,move_id:0
@ -8219,7 +8236,7 @@ msgstr "Ligar aos movimentos de diário gerados automaticamente."
#. module: account
#: model:ir.model,name:account.model_account_config_settings
msgid "account.config.settings"
msgstr ""
msgstr "account.config.settings"
#. module: account
#: selection:account.config.settings,period:0
@ -8254,7 +8271,7 @@ msgstr "Ascendente"
#: code:addons/account/account_cash_statement.py:292
#, python-format
msgid "Profit"
msgstr ""
msgstr "Lucro"
#. module: account
#: help:account.payment.term.line,days2:0
@ -8788,7 +8805,7 @@ msgstr "Importação automática do extrato bancário"
#: code:addons/account/account_invoice.py:370
#, python-format
msgid "Unknown Error!"
msgstr ""
msgstr "Erro desconhecido!"
#. module: account
#: model:ir.model,name:account.model_account_move_bank_reconcile
@ -8798,7 +8815,7 @@ msgstr "Reconciliação de movimento bancário"
#. module: account
#: view:account.config.settings:0
msgid "Apply"
msgstr ""
msgstr "Aplicar"
#. module: account
#: field:account.financial.report,account_type_ids:0
@ -9736,7 +9753,7 @@ msgstr "Filtra por"
#: field:account.cashbox.line,number_closing:0
#: field:account.cashbox.line,number_opening:0
msgid "Number of Units"
msgstr ""
msgstr "Número de unidades"
#. module: account
#: model:process.node,note:account.process_node_manually0
@ -9761,7 +9778,7 @@ msgstr "Movimento"
#: code:addons/account/wizard/account_period_close.py:51
#, python-format
msgid "Invalid Action!"
msgstr ""
msgstr "Ação inválida!"
#. module: account
#: view:account.bank.statement:0
@ -10584,7 +10601,7 @@ msgstr "Data de Maturidade"
#: field:cash.box.in,name:0
#: field:cash.box.out,name:0
msgid "Reason"
msgstr ""
msgstr "Motivo"
#. module: account
#: selection:account.partner.ledger,filter:0
@ -11064,7 +11081,7 @@ msgstr "Ascendente a Direita"
#: code:addons/account/static/src/js/account_move_reconciliation.js:80
#, python-format
msgid "Never"
msgstr ""
msgstr "Nunca"
#. module: account
#: model:ir.model,name:account.model_account_addtmpl_wizard
@ -11085,7 +11102,7 @@ msgstr "Do parceiro"
#. module: account
#: field:account.account,note:0
msgid "Internal Notes"
msgstr ""
msgstr "Notas internas"
#. module: account
#: model:ir.actions.act_window,name:account.action_account_fiscalyear

View File

@ -7,14 +7,14 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2012-12-03 16:02+0000\n"
"PO-Revision-Date: 2012-10-17 00:11+0000\n"
"Last-Translator: Syllas F. de O. Neto <syllasneto@gmail.com>\n"
"PO-Revision-Date: 2012-12-10 17:59+0000\n"
"Last-Translator: Projetaty Soluções OpenSource <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: 2012-12-04 05:27+0000\n"
"X-Generator: Launchpad (build 16335)\n"
"X-Launchpad-Export-Date: 2012-12-11 04:48+0000\n"
"X-Generator: Launchpad (build 16356)\n"
#. module: account
#: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@ -26,6 +26,8 @@ msgstr "Sistema de pagamento"
msgid ""
"An account fiscal position could be defined only once time on same accounts."
msgstr ""
"Uma posição fiscal contábil pode ser definida apenas uma vez sobre as contas "
"contábeis."
#. module: account
#: view:account.unreconcile:0
@ -51,7 +53,7 @@ msgstr "Reconciliar a Entrada de Diário"
#: view:account.bank.statement:0
#: view:account.move.line:0
msgid "Account Statistics"
msgstr "Estatísticas da Conta"
msgstr "Estatisticas da conta"
#. module: account
#: view:account.invoice:0
@ -85,7 +87,7 @@ msgstr "Importar da fatura ou do pagamento"
#: code:addons/account/account_move_line.py:1198
#, python-format
msgid "Bad Account!"
msgstr ""
msgstr "Conta Inválida"
#. module: account
#: view:account.move:0
@ -108,6 +110,8 @@ msgid ""
"Error!\n"
"You cannot create recursive account templates."
msgstr ""
"Erro!\n"
"Não é permitido criar modelos recursivos de contas"
#. module: account
#. openerp-web
@ -180,6 +184,9 @@ msgid ""
"which is set after generating opening entries from 'Generate Opening "
"Entries'."
msgstr ""
"Você precisa registrar o 'Fim dos Lançamentos Anuais nos Diários' por este "
"Ano Fiscal isto é feito após a criação da Situação de Abertura a partir de "
"'Gerar Situação de Abertura'"
#. module: account
#: field:account.fiscal.position.account,account_src_id:0
@ -198,6 +205,13 @@ msgid ""
" </p>\n"
" "
msgstr ""
"<p class=\"oe_view_nocontent_create\">\n"
" Click para adicionar um período fiscal.\n"
" </p><p>\n"
" Um período fiscal geralmente é de um mês ou de um trimestre. "
"Correspondendo a data de pagamento dos impostos\n"
" </p>\n"
" "
#. module: account
#: model:ir.actions.act_window,name:account.action_view_created_invoice_dashboard
@ -212,7 +226,7 @@ msgstr "Etiqueta da Coluna"
#. module: account
#: help:account.config.settings,code_digits:0
msgid "No. of digits to use for account code"
msgstr ""
msgstr "Nº de dígitos utilizados na contabilidade"
#. module: account
#: help:account.analytic.journal,type:0
@ -232,6 +246,9 @@ msgid ""
"lines for invoices. Leave empty if you don't want to use an analytic account "
"on the invoice tax lines by default."
msgstr ""
"Define a conta analítica que será utilizada como padrão para o registro das "
"linhas da fatura. Deixe em branco se você não pretende utilizar contas "
"analíticas para cada linha da fatura."
#. module: account
#: model:ir.actions.act_window,name:account.action_account_tax_template_form
@ -262,7 +279,7 @@ msgstr "Relatórios Belgas"
#. module: account
#: model:account.account.type,name:account.account_type_income_view1
msgid "Income View"
msgstr ""
msgstr "Visualização de Recebíveis"
#. module: account
#: help:account.account,user_type:0
@ -278,7 +295,7 @@ msgstr ""
#. module: account
#: field:account.config.settings,sale_refund_sequence_next:0
msgid "Next credit note number"
msgstr ""
msgstr "Próxima nota de crédito"
#. module: account
#: help:account.config.settings,module_account_voucher:0
@ -287,6 +304,9 @@ msgid ""
"sales, purchase, expense, contra, etc.\n"
" This installs the module account_voucher."
msgstr ""
"Isto inclui todos os requerimentos básicos de recibos para o lançamento de "
"entradas bancárias, caixa, vendas, compras, despesas, contratos, etc. O "
"módulo account_voucher será instalado."
#. module: account
#: model:ir.actions.act_window,name:account.action_account_use_model_create_entry
@ -318,6 +338,18 @@ msgid ""
" </p>\n"
" "
msgstr ""
"<p class=\"oe_view_nocontent_create\">\n"
" Clique para criar uma restituição ao cliente. \n"
" </p><p>\n"
" Uma restituição é um documento que credita (-) uma fatura "
"completamente ou\n"
" parcialmente.\n"
" </p><p>\n"
" Ao invés de criar uma restituição manualmente, você\n"
" pode gerá-la diretamente a partir da fatura relacionada ao "
"cliente.\n"
" </p>\n"
" "
#. module: account
#: help:account.installer,charts:0
@ -336,7 +368,7 @@ msgstr "Conta não Conciliada"
#. module: account
#: field:account.config.settings,module_account_budget:0
msgid "Budget management"
msgstr ""
msgstr "Gestão de Orçamento"
#. module: account
#: view:product.template:0
@ -358,7 +390,7 @@ msgstr ""
#. module: account
#: field:account.config.settings,group_multi_currency:0
msgid "Allow multi currencies"
msgstr ""
msgstr "Permite multi moedas"
#. module: account
#: code:addons/account/account_invoice.py:73
@ -379,7 +411,7 @@ msgstr "Junho"
#: code:addons/account/wizard/account_automatic_reconcile.py:148
#, python-format
msgid "You must select accounts to reconcile."
msgstr ""
msgstr "Você precisa selecionar as contas para reconciliar"
#. module: account
#: help:account.config.settings,group_analytic_accounting:0

View File

@ -7,14 +7,14 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2012-12-03 16:02+0000\n"
"PO-Revision-Date: 2012-10-17 08:24+0000\n"
"Last-Translator: filsys <office@filsystem.ro>\n"
"PO-Revision-Date: 2012-12-10 07:21+0000\n"
"Last-Translator: Fekete Mihai <mihai@erpsystems.ro>\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: 2012-12-04 05:25+0000\n"
"X-Generator: Launchpad (build 16335)\n"
"X-Launchpad-Export-Date: 2012-12-11 04:47+0000\n"
"X-Generator: Launchpad (build 16356)\n"
#. module: account
#: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@ -26,6 +26,7 @@ msgstr "Sistem de plata"
msgid ""
"An account fiscal position could be defined only once time on same accounts."
msgstr ""
"O poziție fiscal poate fi definită o singură dată pe aceleași tip de cont."
#. module: account
#: view:account.unreconcile:0
@ -85,7 +86,7 @@ msgstr "Importati din factura sau din plata"
#: code:addons/account/account_move_line.py:1198
#, python-format
msgid "Bad Account!"
msgstr ""
msgstr "Contul nu este bun!"
#. module: account
#: view:account.move:0

File diff suppressed because it is too large Load Diff

View File

@ -7,14 +7,14 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2012-12-03 16:02+0000\n"
"PO-Revision-Date: 2012-11-30 17:32+0000\n"
"Last-Translator: ccdos <ccdos@163.com>\n"
"PO-Revision-Date: 2012-12-14 15:57+0000\n"
"Last-Translator: digitalsatori <digisatori@gmail.com>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-12-04 05:29+0000\n"
"X-Generator: Launchpad (build 16335)\n"
"X-Launchpad-Export-Date: 2012-12-15 05:05+0000\n"
"X-Generator: Launchpad (build 16372)\n"
#. module: account
#: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@ -25,7 +25,7 @@ msgstr "系统支付"
#: sql_constraint:account.fiscal.position.account:0
msgid ""
"An account fiscal position could be defined only once time on same accounts."
msgstr ""
msgstr "在一个科目上只能设置一个应税设定"
#. module: account
#: view:account.unreconcile:0
@ -104,6 +104,8 @@ msgid ""
"Error!\n"
"You cannot create recursive account templates."
msgstr ""
"错误!\n"
"您不能创建重复的帐户模板。"
#. module: account
#. openerp-web
@ -173,7 +175,7 @@ msgid ""
"You have to set the 'End of Year Entries Journal' for this Fiscal Year "
"which is set after generating opening entries from 'Generate Opening "
"Entries'."
msgstr ""
msgstr "在生成开账分录之后必须设置分类账的结束年度。"
#. module: account
#: field:account.fiscal.position.account,account_src_id:0
@ -192,6 +194,12 @@ msgid ""
" </p>\n"
" "
msgstr ""
"<p class=\"oe_view_nocontent_create\">\n"
"点击添加一个会计期间.\n"
"</p><p>\n"
"会计期间通常是一个月或一个季度。它通常对应纳税申报的期间。\n"
"</p>\n"
" "
#. module: account
#: model:ir.actions.act_window,name:account.action_view_created_invoice_dashboard
@ -206,7 +214,7 @@ msgstr "字段标签"
#. module: account
#: help:account.config.settings,code_digits:0
msgid "No. of digits to use for account code"
msgstr ""
msgstr "科目代码的编码长度"
#. module: account
#: help:account.analytic.journal,type:0
@ -266,7 +274,7 @@ msgstr "科目类别用于生成合乎各国财税规范的报表,设置财年
#. module: account
#: field:account.config.settings,sale_refund_sequence_next:0
msgid "Next credit note number"
msgstr ""
msgstr "下一个信用证编码"
#. module: account
#: help:account.config.settings,module_account_voucher:0
@ -275,6 +283,9 @@ msgid ""
"sales, purchase, expense, contra, etc.\n"
" This installs the module account_voucher."
msgstr ""
"This includes all the basic requirements of voucher entries for bank, cash, "
"sales, purchase, expense, contra, etc.\n"
" This installs the module account_voucher."
#. module: account
#: model:ir.actions.act_window,name:account.action_account_use_model_create_entry
@ -306,6 +317,14 @@ msgid ""
" </p>\n"
" "
msgstr ""
"<p class=\"oe_view_nocontent_create\">\n"
" 点击创建一个客户退款. \n"
" </p><p>\n"
" 退款是全部或部分借记销售发票的证明。\n"
" </p><p>\n"
" 可以直接从与客户相关联的发票直接生成退款,以代替手工创建客户退款。.\n"
" </p>\n"
" "
#. module: account
#: help:account.installer,charts:0
@ -434,13 +453,17 @@ msgid ""
"this box, you will be able to do invoicing & payments,\n"
" but not accounting (Journal Items, Chart of Accounts, ...)"
msgstr ""
"此处可以管理属于公司或者个人的资产.\n"
" 跟踪资产折旧的发生,创建折旧明细账户。.\n"
" 要安装account_asset模块. 如果不检查box, 可以处理发票和付款,\n"
" 但不能处理账记(账簿明细, 会计报表, ...)"
#. module: account
#. openerp-web
#: code:addons/account/static/src/xml/account_move_line_quickadd.xml:8
#, python-format
msgid "Period :"
msgstr ""
msgstr "时间:"
#. module: account
#: field:account.account.template,chart_template_id:0
@ -529,7 +552,7 @@ msgstr "上级目标"
#. module: account
#: help:account.invoice.line,sequence:0
msgid "Gives the sequence of this line when displaying the invoice."
msgstr ""
msgstr "显示发票的时候给出明细编号。"
#. module: account
#: field:account.bank.statement,account_id:0
@ -603,7 +626,7 @@ msgstr "没有什么被核销"
#. module: account
#: field:account.config.settings,decimal_precision:0
msgid "Decimal precision on journal entries"
msgstr ""
msgstr "日记帐分录小数精度"
#. module: account
#: selection:account.config.settings,period:0
@ -722,7 +745,7 @@ msgstr "账簿的会计期间"
#: constraint:account.move:0
msgid ""
"You cannot create more than one move per period on a centralized journal."
msgstr ""
msgstr "在每个会计期间你不可以创建1个以上的总分类凭证"
#. module: account
#: help:account.tax,account_analytic_paid_id:0
@ -936,6 +959,10 @@ msgid ""
" </p>\n"
" "
msgstr ""
"<p>\n"
" 账簿明细未找到.\n"
" </p>\n"
" "
#. module: account
#: code:addons/account/account.py:1632
@ -1137,7 +1164,7 @@ msgstr "科目名称"
#. module: account
#: field:account.journal,with_last_closing_balance:0
msgid "Opening With Last Closing Balance"
msgstr "用末期的期终余额打开"
msgstr "用上个期末余额作期初"
#. module: account
#: help:account.tax.code,notprintable:0
@ -1401,7 +1428,7 @@ msgstr "级别"
#: code:addons/account/wizard/account_change_currency.py:38
#, python-format
msgid "You can only change currency for Draft Invoice."
msgstr ""
msgstr "您只能修改发票草稿的货币。"
#. module: account
#: report:account.invoice:0
@ -1959,7 +1986,7 @@ msgstr "Pending Accounts"
#. module: account
#: view:account.open.closed.fiscalyear:0
msgid "Cancel Fiscal Year Opening Entries"
msgstr ""
msgstr "取消财务年度未结案分录"
#. module: account
#: report:account.journal.period.print.sale.purchase:0
@ -2288,7 +2315,7 @@ msgstr "关闭财政年度"
#: code:addons/account/static/src/xml/account_move_line_quickadd.xml:14
#, python-format
msgid "Journal :"
msgstr ""
msgstr "流水帐"
#. module: account
#: sql_constraint:account.fiscal.position.tax:0
@ -2995,7 +3022,7 @@ msgstr "单号"
#. module: account
#: view:wizard.multi.charts.accounts:0
msgid "Purchase Tax"
msgstr ""
msgstr "购置税"
#. module: account
#: help:account.move.line,tax_code_id:0
@ -3089,7 +3116,7 @@ msgstr "沟通类型"
#. module: account
#: constraint:account.move.line:0
msgid "Account and Period must belong to the same company."
msgstr ""
msgstr "帐户和帐期必须属于同一家公司。"
#. module: account
#: field:account.invoice.line,discount:0
@ -3117,7 +3144,7 @@ msgstr "补差额金额"
#: field:account.bank.statement,message_unread:0
#: field:account.invoice,message_unread:0
msgid "Unread Messages"
msgstr ""
msgstr "未读消息"
#. module: account
#: code:addons/account/wizard/account_invoice_state.py:44
@ -10443,7 +10470,7 @@ msgstr "发票的状态已完成"
#. module: account
#: field:account.config.settings,module_account_followup:0
msgid "Manage customer payment follow-ups"
msgstr ""
msgstr "管理客户付款 催款"
#. module: account
#: model:ir.model,name:account.model_report_account_sales

View File

@ -19,17 +19,17 @@
#
##############################################################################
import logging
import time
import datetime
from dateutil.relativedelta import relativedelta
import logging
from operator import itemgetter
from os.path import join as opj
import time
from openerp import netsvc, tools
from openerp.tools.translate import _
from openerp.osv import fields, osv
from tools.translate import _
from osv import fields, osv
import netsvc
import tools
_logger = logging.getLogger(__name__)
class account_installer(osv.osv_memory):

View File

@ -19,7 +19,7 @@
#
##############################################################################
from osv import fields, osv
from openerp.osv import fields, osv
class ir_sequence_fiscalyear(osv.osv):
_name = 'account.sequence.fiscalyear'

View File

@ -20,9 +20,10 @@
##############################################################################
from operator import itemgetter
from osv import fields, osv
import time
from openerp.osv import fields, osv
class account_fiscal_position(osv.osv):
_name = 'account.fiscal.position'
_description = 'Fiscal Position'
@ -134,18 +135,23 @@ class res_partner(osv.osv):
return []
having_values = tuple(map(itemgetter(2), args))
where = ' AND '.join(
map(lambda x: '(SUM(debit-credit) %(operator)s %%s)' % {
map(lambda x: '(SUM(bal2) %(operator)s %%s)' % {
'operator':x[1]},args))
query = self.pool.get('account.move.line')._query_get(cr, uid, context=context)
cr.execute(('SELECT partner_id FROM account_move_line l '\
'WHERE account_id IN '\
'(SELECT id FROM account_account '\
'WHERE type=%s AND active) '\
'AND reconcile_id IS NULL '\
'AND '+query+' '\
'AND partner_id IS NOT NULL '\
'GROUP BY partner_id HAVING '+where),
(type,) + having_values)
cr.execute(('SELECT pid AS partner_id, SUM(bal2) FROM ' \
'(SELECT CASE WHEN bal IS NOT NULL THEN bal ' \
'ELSE 0.0 END AS bal2, p.id as pid FROM ' \
'(SELECT (debit-credit) AS bal, partner_id ' \
'FROM account_move_line l ' \
'WHERE account_id IN ' \
'(SELECT id FROM account_account '\
'WHERE type=%s AND active) ' \
'AND reconcile_id IS NULL ' \
'AND '+query+') AS l ' \
'RIGHT JOIN res_partner p ' \
'ON p.id = partner_id ) AS pl ' \
'GROUP BY pid HAVING ' + where),
(type,) + having_values)
res = cr.fetchall()
if not res:
return [('id','=','0')]

View File

@ -68,6 +68,7 @@
<field eval="&quot;&quot;&quot;Accounting&quot;&quot;&quot;" name="name"/>
<field eval="&quot;&quot;&quot;Accounting entries.&quot;&quot;&quot;" name="note"/>
<field name="process_id" ref="process_process_supplierinvoiceprocess0"/>
<field eval="&quot;&quot;&quot;object.state=='posted'&quot;&quot;&quot;" name="model_states"/>
<field eval="0" name="flow_start"/>
</record>

View File

@ -19,7 +19,7 @@
#
##############################################################################
from osv import fields, osv
from openerp.osv import fields, osv
class product_category(osv.osv):
_inherit = "product.category"

View File

@ -4,6 +4,7 @@
<record id="product_normal_form_view" model="ir.ui.view">
<field name="name">product.normal.form.inherit</field>
<field name="model">product.product</field>
<field name="priority">5</field>
<field name="inherit_id" ref="product.product_normal_form_view"/>
<field name="arch" type="xml">
<notebook position="inside">

View File

@ -19,8 +19,7 @@
#
##############################################################################
from osv import fields
from osv import osv
from openerp.osv import fields, osv
class account_analytic_journal(osv.osv):
_name = 'account.analytic.journal'

View File

@ -9,13 +9,13 @@
<field name="arch" type="xml">
<tree toolbar="1" colors="red:state=='pending';grey:state in ('cancelled','close');blue:type=='view'" string="Analytic Accounts">
<field name="complete_name"/>
<field name="partner_id"/>
<field name="code"/>
<field name="quantity"/>
<field name="date"/>
<field name="date_start" invisible="1"/>
<field name="user_id" invisible="1"/>
<field name="manager_id" invisible="1"/>
<field name="parent_id" invisible="1"/>
<field name="partner_id" invisible="1"/>
<field name="state" invisible="1"/>
<field name="type" invisible="1"/>
<field name="company_id" groups="base.group_multi_company"/>
@ -33,6 +33,7 @@
<filter icon="terp-gtk-media-pause" string="Pending" domain="[('state','=','pending')]" help="Pending Accounts"/>
<filter icon="terp-camera_test" string="Current" domain="[('state','=','open')]" help="Current Accounts"/>
<field name="partner_id"/>
<field name="manager_id"/>
<field name="user_id"/>
<group expand="0" string="Group By...">
<filter string="Associated Partner" icon="terp-partner" domain="[]" context="{'group_by':'partner_id'}"/>
@ -49,6 +50,7 @@
<field name="field_parent">child_complete_ids</field>
<field name="arch" type="xml">
<tree colors="blue:state=='pending';grey:state in ('close','cancelled');blue:type=='view'" string="Analytic account" toolbar="1">
<field name="name" invisible="1"/>
<field name="complete_name"/>
<field name="code"/>
<field name="debit"/>

View File

@ -21,7 +21,7 @@
import time
from report import report_sxw
from openerp.report import report_sxw
#
# Use period and Journal for selection or resources

View File

@ -20,7 +20,8 @@
##############################################################################
import time
from report import report_sxw
from openerp.report import report_sxw
class account_analytic_balance(report_sxw.rml_parse):

View File

@ -20,8 +20,9 @@
##############################################################################
import time
import pooler
from report import report_sxw
from openerp import pooler
from openerp.report import report_sxw
#
# Use period and Journal for selection or resources

View File

@ -19,9 +19,10 @@
#
##############################################################################
import pooler
import time
from report import report_sxw
from openerp import pooler
from openerp.report import report_sxw
class account_analytic_cost_ledger(report_sxw.rml_parse):
def __init__(self, cr, uid, name, context):

View File

@ -19,9 +19,10 @@
#
##############################################################################
import pooler
import time
from report import report_sxw
from openerp import pooler
from openerp.report import report_sxw
class account_inverted_analytic_balance(report_sxw.rml_parse):
def __init__(self, cr, uid, name, context):

View File

@ -20,8 +20,8 @@
##############################################################################
import time
import pooler
from report import report_sxw
from openerp import pooler
from openerp.report import report_sxw
class account_analytic_quantity_cost_ledger(report_sxw.rml_parse):
def __init__(self, cr, uid, name, context):

View File

@ -20,7 +20,7 @@
##############################################################################
import time
from osv import osv, fields
from openerp.osv import fields, osv
class account_analytic_balance(osv.osv_memory):
_name = 'account.analytic.balance'

View File

@ -18,7 +18,7 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
##############################################################################
from osv import osv, fields
from openerp.osv import fields, osv
class account_analytic_chart(osv.osv_memory):
_name = 'account.analytic.chart'

View File

@ -20,7 +20,7 @@
##############################################################################
import time
from osv import osv, fields
from openerp.osv import fields, osv
class account_analytic_cost_ledger_journal_report(osv.osv_memory):
_name = 'account.analytic.cost.ledger.journal.report'

View File

@ -18,9 +18,10 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
##############################################################################
import time
from osv import osv, fields
from openerp.osv import osv, fields
class account_analytic_cost_ledger(osv.osv_memory):
_name = 'account.analytic.cost.ledger'

View File

@ -20,7 +20,7 @@
##############################################################################
import time
from osv import osv, fields
from openerp.osv import fields, osv
class account_analytic_inverted_balance(osv.osv_memory):
_name = 'account.analytic.inverted.balance'

View File

@ -20,7 +20,7 @@
##############################################################################
import time
from osv import osv, fields
from openerp.osv import fields, osv
class account_analytic_journal_report(osv.osv_memory):
_name = 'account.analytic.journal.report'

View File

@ -18,8 +18,8 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
##############################################################################
from osv import fields, osv
from tools.translate import _
from openerp.osv import fields, osv
from openerp.tools.translate import _
class project_account_analytic_line(osv.osv_memory):
_name = "project.account.analytic.line"

View File

@ -20,7 +20,7 @@
##############################################################################
import time
from report import report_sxw
from openerp.report import report_sxw
from common_report_header import common_report_header
class aged_trial_report(report_sxw.rml_parse, common_report_header):

View File

@ -19,8 +19,8 @@
#
##############################################################################
import tools
from osv import fields,osv
from openerp import tools
from openerp.osv import fields,osv
class analytic_entries_report(osv.osv):
_name = "analytic.entries.report"

View File

@ -21,7 +21,7 @@
import time
from report import report_sxw
from openerp.report import report_sxw
from common_report_header import common_report_header
class account_balance(report_sxw.rml_parse, common_report_header):

View File

@ -20,7 +20,7 @@
##############################################################################
import time
from report import report_sxw
from openerp.report import report_sxw
from common_report_header import common_report_header
#
# Use period and Journal for selection or resources

View File

@ -19,9 +19,9 @@
#
##############################################################################
import tools
from osv import fields,osv
import decimal_precision as dp
from openerp import tools
from openerp.osv import fields,osv
import openerp.addons.decimal_precision as dp
class account_entries_report(osv.osv):
_name = "account.entries.report"

View File

@ -20,9 +20,9 @@
import time
from report import report_sxw
from openerp.report import report_sxw
from common_report_header import common_report_header
from tools.translate import _
from openerp.tools.translate import _
class report_account_common(report_sxw.rml_parse, common_report_header):
@ -56,7 +56,7 @@ class report_account_common(report_sxw.rml_parse, common_report_header):
for report in self.pool.get('account.financial.report').browse(self.cr, self.uid, ids2, context=data['form']['used_context']):
vals = {
'name': report.name,
'balance': report.balance,
'balance': report.balance * report.sign,
'type': 'report',
'level': bool(report.style_overwrite) and report.style_overwrite or report.level,
'account_type': report.type =='sum' and 'view' or False, #used to underline the financial report balances

View File

@ -21,7 +21,7 @@
import time
from common_report_header import common_report_header
from report import report_sxw
from openerp.report import report_sxw
class journal_print(report_sxw.rml_parse, common_report_header):

View File

@ -28,7 +28,7 @@
##############################################################################
import time
from report import report_sxw
from openerp.report import report_sxw
from common_report_header import common_report_header
class general_ledger(report_sxw.rml_parse, common_report_header):

View File

@ -19,9 +19,9 @@
#
##############################################################################
import tools
import decimal_precision as dp
from osv import fields,osv
from openerp import tools
import openerp.addons.decimal_precision as dp
from openerp.osv import fields,osv
class account_invoice_report(osv.osv):
_name = "account.invoice.report"

View File

@ -21,7 +21,7 @@
import time
from common_report_header import common_report_header
from report import report_sxw
from openerp.report import report_sxw
class journal_print(report_sxw.rml_parse, common_report_header):

View File

@ -21,8 +21,8 @@
import time
from tools.translate import _
from report import report_sxw
from openerp.tools.translate import _
from openerp.report import report_sxw
from common_report_header import common_report_header
class partner_balance(report_sxw.rml_parse, common_report_header):

View File

@ -21,9 +21,9 @@
import time
import re
from report import report_sxw
from openerp.report import report_sxw
from common_report_header import common_report_header
from tools.translate import _
from openerp.tools.translate import _
class third_party_ledger(report_sxw.rml_parse, common_report_header):

View File

@ -20,7 +20,7 @@
##############################################################################
import time
from report import report_sxw
from openerp.report import report_sxw
class account_invoice(report_sxw.rml_parse):
def __init__(self, cr, uid, name, context):

View File

@ -21,8 +21,8 @@
import time
from report import report_sxw
import pooler
from openerp.report import report_sxw
from openerp import pooler
class Overdue(report_sxw.rml_parse):
def __init__(self, cr, uid, name, context):

View File

@ -23,9 +23,9 @@ import time
from datetime import datetime
from dateutil.relativedelta import relativedelta
import pooler
import tools
from osv import fields,osv
from openerp import pooler
from openerp import tools
from openerp.osv import fields,osv
def _code_get(self, cr, uid, context=None):
acc_type_obj = self.pool.get('account.account.type')
@ -48,6 +48,7 @@ class report_account_receivable(osv.osv):
_order = 'name desc'
def init(self, cr):
tools.drop_view_if_exists(cr, 'report_account_receivable')
cr.execute("""
create or replace view report_account_receivable as (
select
@ -183,6 +184,7 @@ class report_invoice_created(osv.osv):
_order = 'create_date'
def init(self, cr):
tools.drop_view_if_exists(cr, 'report_invoice_created')
cr.execute("""create or replace view report_invoice_created as (
select
inv.id as id, inv.name as name, inv.type as type,

View File

@ -22,7 +22,7 @@
import time
from common_report_header import common_report_header
from report import report_sxw
from openerp.report import report_sxw
class tax_report(report_sxw.rml_parse, common_report_header):
_name = 'report.account.vat.declaration'

View File

@ -19,9 +19,9 @@
#
##############################################################################
import tools
from osv import fields,osv
import decimal_precision as dp
from openerp import tools
from openerp.osv import fields,osv
import openerp.addons.decimal_precision as dp
class account_treasury_report(osv.osv):
_name = "account.treasury.report"

View File

@ -19,8 +19,8 @@
#
##############################################################################
import pooler
from tools.translate import _
from openerp import pooler
from openerp.tools.translate import _
class common_report_header(object):

View File

@ -25,9 +25,9 @@ from dateutil.relativedelta import relativedelta
from operator import itemgetter
from os.path import join as opj
from tools.translate import _
from osv import osv, fields
import tools
from openerp.tools.translate import _
from openerp.osv import fields, osv
from openerp import tools
class account_config_settings(osv.osv_memory):
_name = 'account.config.settings'

View File

@ -18,7 +18,7 @@
#
##############################################################################
from osv import osv
from openerp.osv import osv
"""Inherit res.currency to handle accounting date values when converting currencies"""

View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<openerp>
<data>
<data noupdate="0">
<record id="group_account_invoice" model="res.groups">
<field name="name">Invoicing &amp; Payments</field>
@ -30,7 +30,9 @@
<field name="name">Check Total on supplier invoices</field>
<field name="category_id" ref="base.module_category_hidden"/>
</record>
</data>
<data noupdate="1">
<record id="account_move_comp_rule" model="ir.rule">
<field name="name">Account Entry</field>
<field name="model_id" ref="model_account_move"/>

View File

@ -69,5 +69,7 @@
!python {model: account.bank.statement}: |
try:
self.button_cancel(cr, uid, [ref("account_bank_statement_0")])
except Exception, e:
assert e[0]=='User Error!', 'Another exception has been raised!'
assert False, "An exception should have been raised, the journal should not let us cancel moves!"
except Exception:
# exception was raised as expected, as the journal does not allow cancelling moves
pass

View File

@ -21,8 +21,8 @@
import time
from osv import osv, fields
from tools.translate import _
from openerp.osv import fields, osv
from openerp.tools.translate import _
class account_automatic_reconcile(osv.osv_memory):
_name = 'account.automatic.reconcile'

View File

@ -19,8 +19,8 @@
#
##############################################################################
from osv import osv, fields
from tools.translate import _
from openerp.osv import fields, osv
from openerp.tools.translate import _
class account_change_currency(osv.osv_memory):
_name = 'account.change.currency'

View File

@ -19,7 +19,7 @@
#
##############################################################################
from osv import fields, osv
from openerp.osv import fields, osv
class account_chart(osv.osv_memory):
"""

View File

@ -19,7 +19,7 @@
#
##############################################################################
from osv import fields, osv
from openerp.osv import fields, osv
class accounting_report(osv.osv_memory):
_name = "accounting.report"

View File

@ -19,8 +19,8 @@
#
##############################################################################
from osv import fields, osv
from tools.translate import _
from openerp.osv import fields, osv
from openerp.tools.translate import _
class account_fiscalyear_close(osv.osv_memory):
"""

View File

@ -19,8 +19,8 @@
#
##############################################################################
from osv import fields, osv
from tools.translate import _
from openerp.osv import fields, osv
from openerp.tools.translate import _
class account_fiscalyear_close_state(osv.osv_memory):
"""

View File

@ -21,9 +21,9 @@
import time
from osv import fields, osv
from tools.translate import _
import netsvc
from openerp.osv import fields, osv
from openerp.tools.translate import _
from openerp import netsvc
class account_invoice_refund(osv.osv_memory):
@ -36,7 +36,7 @@ class account_invoice_refund(osv.osv_memory):
'period': fields.many2one('account.period', 'Force period'),
'journal_id': fields.many2one('account.journal', 'Refund Journal', help='You can select here the journal to use for the credit note that will be created. If you leave that field empty, it will use the same journal as the current invoice.'),
'description': fields.char('Reason', size=128, required=True),
'filter_refund': fields.selection([('refund', 'Create a draft credit note'), ('cancel', 'Cancel: create credit note and reconcile'),('modify', 'Modify: create credit note, reconcile and create a new draft invoice')], "Refund Method", required=True, help='Credit note base on this type. You can not Modify and Cancel if the invoice is already reconciled'),
'filter_refund': fields.selection([('refund', 'Create a draft refund'), ('cancel', 'Cancel: create refund and reconcile'),('modify', 'Modify: create refund, reconcile and create a new draft invoice')], "Refund Method", required=True, help='Refund base on this type. You can not Modify and Cancel if the invoice is already reconciled'),
}
def _get_journal(self, cr, uid, context=None):
@ -146,7 +146,7 @@ class account_invoice_refund(osv.osv_memory):
raise osv.except_osv(_('Insufficient Data!'), \
_('No period found on the invoice.'))
refund_id = inv_obj.refund(cr, uid, [inv.id], date, period, description, journal_id)
refund_id = inv_obj.refund(cr, uid, [inv.id], date, period, description, journal_id, context=context)
refund = inv_obj.browse(cr, uid, refund_id[0], context=context)
inv_obj.write(cr, uid, [refund.id], {'date_due': date,
'check_total': inv.check_total})

View File

@ -40,7 +40,7 @@
</group>
</group>
<footer>
<button string='Create Credit Note' name="invoice_refund" type="object" class="oe_highlight"/>
<button string='Create Refund' name="invoice_refund" type="object" class="oe_highlight"/>
or
<button string="Cancel" class="oe_link" special="cancel"/>
</footer>

View File

@ -19,10 +19,10 @@
#
##############################################################################
from osv import osv
from tools.translate import _
import netsvc
import pooler
from openerp.osv import osv
from openerp.tools.translate import _
from openerp import netsvc
from openerp import pooler
class account_invoice_confirm(osv.osv_memory):
"""

View File

@ -19,7 +19,7 @@
#
##############################################################################
from osv import osv
from openerp.osv import osv
class account_journal_select(osv.osv_memory):
"""

View File

@ -19,8 +19,8 @@
#
##############################################################################
from osv import fields, osv
from tools.translate import _
from openerp.osv import fields, osv
from openerp.tools.translate import _
class account_move_bank_reconcile(osv.osv_memory):
"""

View File

@ -19,8 +19,8 @@
#
##############################################################################
from osv import fields, osv
from tools.translate import _
from openerp.osv import fields, osv
from openerp.tools.translate import _
class account_move_line_reconcile_select(osv.osv_memory):
_name = "account.move.line.reconcile.select"

View File

@ -19,7 +19,7 @@
#
##############################################################################
from osv import osv
from openerp.osv import osv
class account_move_line_select(osv.osv_memory):
"""

View File

@ -19,7 +19,7 @@
#
##############################################################################
from osv import fields, osv
from openerp.osv import fields, osv
class account_move_line_unreconcile_select(osv.osv_memory):
_name = "account.move.line.unreconcile.select"

View File

@ -19,8 +19,8 @@
#
##############################################################################
from osv import fields, osv
from tools.translate import _
from openerp.osv import fields, osv
from openerp.tools.translate import _
class account_open_closed_fiscalyear(osv.osv_memory):
_name = "account.open.closed.fiscalyear"

View File

@ -19,8 +19,8 @@
#
##############################################################################
from osv import fields, osv
from tools.translate import _
from openerp.osv import fields, osv
from openerp.tools.translate import _
class account_period_close(osv.osv_memory):
"""

View File

@ -21,9 +21,9 @@
import time
from osv import fields, osv
from tools.translate import _
import decimal_precision as dp
from openerp.osv import fields, osv
from openerp.tools.translate import _
import openerp.addons.decimal_precision as dp
class account_move_line_reconcile(osv.osv_memory):
"""

View File

@ -21,7 +21,7 @@
import time
from osv import osv, fields
from openerp.osv import fields, osv
class account_partner_reconcile_process(osv.osv_memory):
_name = 'account.partner.reconcile.process'

View File

@ -19,7 +19,7 @@
#
##############################################################################
from osv import osv, fields
from openerp.osv import fields, osv
class account_balance_report(osv.osv_memory):
_inherit = "account.common.account.report"

View File

@ -22,8 +22,8 @@
import time
from datetime import datetime
from dateutil.relativedelta import relativedelta
from osv import osv, fields
from tools.translate import _
from openerp.osv import fields, osv
from openerp.tools.translate import _
class account_aged_trial_balance(osv.osv_memory):
_inherit = 'account.common.partner.report'

View File

@ -19,7 +19,7 @@
#
##############################################################################
from osv import osv, fields
from openerp.osv import fields, osv
class account_central_journal(osv.osv_memory):
_name = 'account.central.journal'

View File

@ -22,8 +22,9 @@
import time
from lxml import etree
from osv import fields, osv
from tools.translate import _
from openerp.osv import fields, osv
from openerp.osv.orm import setup_modifiers
from openerp.tools.translate import _
class account_common_report(osv.osv_memory):
_name = "account.common.report"
@ -67,16 +68,16 @@ class account_common_report(osv.osv_memory):
(_check_company_id, 'The fiscalyear, periods or chart of account chosen have to belong to the same company.', ['chart_account_id','fiscalyear_id','period_from','period_to']),
]
def fields_view_get(self, cr, uid, view_id=None, view_type='form', context=None, toolbar=False, submenu=False):
if context is None:context = {}
res = super(account_common_report, self).fields_view_get(cr, uid, view_id=view_id, view_type=view_type, context=context, toolbar=toolbar, submenu=False)
if context.get('active_model', False) == 'account.account' and view_id:
if context.get('active_model', False) == 'account.account':
doc = etree.XML(res['arch'])
nodes = doc.xpath("//field[@name='chart_account_id']")
for node in nodes:
node.set('readonly', '1')
node.set('help', 'If you print the report from Account list/form view it will not consider Charts of account')
setup_modifiers(node, res['fields']['chart_account_id'])
res['arch'] = etree.tostring(doc)
return res
@ -121,8 +122,8 @@ class account_common_report(osv.osv_memory):
now = time.strftime('%Y-%m-%d')
company_id = False
ids = context.get('active_ids', [])
if ids:
company_id = self.browse(cr, uid, ids[0], context=context).company_id.id
if ids and context.get('active_model') == 'account.account':
company_id = self.pool.get('account.account').browse(cr, uid, ids[0], context=context).company_id.id
fiscalyears = self.pool.get('account.fiscalyear').search(cr, uid, [('date_start', '<', now), ('date_stop', '>', now), ('company_id', '=', company_id)], limit=1)
return fiscalyears and fiscalyears[0] or False

View File

@ -19,7 +19,7 @@
#
##############################################################################
from osv import osv, fields
from openerp.osv import fields, osv
class account_common_account_report(osv.osv_memory):
_name = 'account.common.account.report'

View File

@ -19,7 +19,7 @@
#
##############################################################################
from osv import osv, fields
from openerp.osv import fields, osv
class account_common_journal_report(osv.osv_memory):
_name = 'account.common.journal.report'

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