odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[MERGE]Latest trunk 

bzr revid: dle@openerp.com-20121220153510-5n7rxd0ih3ed50ph
This commit is contained in:
dle@openerp.com 2012-12-20 16:35:10 +01:00
parent 53e0bbf2e6 c2b5c3305b
commit eed9b471ad
1015 changed files with 33117 additions and 25219 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
addons/account/__openerp__.py
View File

@ -133,7 +133,9 @@ for a particular financial year and for preparation of vouchers there is a modul
"static/src/xml/account_move_reconciliation.xml",
"static/src/xml/account_move_line_quickadd.xml",
],
'css':['static/src/css/account_move_reconciliation.css'
'css':[
'static/src/css/account_move_reconciliation.css',
'static/src/css/account_move_line_quickadd.css'
],
'demo': [
'demo/account_demo.xml',

36
addons/account/account.py
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__)
@ -1014,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'
@ -1191,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 {}

10
addons/account/account_analytic_line.py
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:

4
addons/account/account_bank.py
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"

13
addons/account/account_bank_statement.py
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)

6
addons/account/account_cash_statement.py
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):

10
addons/account/account_financial_report.py
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

227
addons/account/account_invoice.py
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):
@ -184,7 +184,14 @@ class account_invoice(osv.osv):
_inherit = ['mail.thread']
_description = 'Invoice'
_order = "id desc"
_track = {
'type': {
},
'state': {
'account.mt_invoice_paid': lambda self, cr, uid, obj, ctx=None: obj['state'] == 'paid' and obj['type'] in ('out_invoice', 'out_refund'),
'account.mt_invoice_validated': lambda self, cr, uid, obj, ctx=None: obj['state'] == 'open' and obj['type'] in ('out_invoice', 'out_refund'),
},
}
_columns = {
'name': fields.char('Description', size=64, select=True, readonly=True, states={'draft':[('readonly',False)]}),
'origin': fields.char('Source Document', size=64, help="Reference of the document that produced this invoice.", readonly=True, states={'draft':[('readonly',False)]}),
@ -194,7 +201,7 @@ class account_invoice(osv.osv):
('in_invoice','Supplier Invoice'),
('out_refund','Customer Refund'),
('in_refund','Supplier Refund'),
],'Type', readonly=True, select=True, change_default=True),
],'Type', readonly=True, select=True, change_default=True, track_visibility='always'),
'number': fields.related('move_id','name', type='char', readonly=True, size=64, relation='account.move', store=True, string='Number'),
'internal_number': fields.char('Invoice Number', size=32, readonly=True, help="Unique number of the invoice, computed automatically when the invoice is created."),
@ -210,7 +217,7 @@ class account_invoice(osv.osv):
('open','Open'),
('paid','Paid'),
('cancel','Cancelled'),
],'Status', select=True, readonly=True,
],'Status', select=True, readonly=True, track_visibility='onchange',
help=' * The \'Draft\' status is used when a user is encoding a new and unconfirmed Invoice. \
\n* The \'Pro-forma\' when invoice is in Pro-forma status,invoice does not have an invoice number. \
\n* The \'Open\' status is used when user create invoice,a invoice number is generated.Its in open status till user does not pay invoice. \
@ -221,7 +228,7 @@ class account_invoice(osv.osv):
'date_due': fields.date('Due Date', readonly=True, states={'draft':[('readonly',False)]}, select=True,
help="If you use payment terms, the due date will be computed automatically at the generation "\
"of accounting entries. The payment term may compute several due dates, for example 50% now and 50% in one month, but if you want to force a due date, make sure that the payment term is not set on the invoice. If you keep the payment term and the due date empty, it means direct payment."),
'partner_id': fields.many2one('res.partner', 'Partner', change_default=True, readonly=True, required=True, states={'draft':[('readonly',False)]}),
'partner_id': fields.many2one('res.partner', 'Partner', change_default=True, readonly=True, required=True, states={'draft':[('readonly',False)]}, track_visibility='always'),
'payment_term': fields.many2one('account.payment.term', 'Payment Term',readonly=True, states={'draft':[('readonly',False)]},
help="If you use payment terms, the due date will be computed automatically at the generation "\
"of accounting entries. If you keep the payment term and the due date empty, it means direct payment. "\
@ -233,7 +240,7 @@ class account_invoice(osv.osv):
'tax_line': fields.one2many('account.invoice.tax', 'invoice_id', 'Tax Lines', readonly=True, states={'draft':[('readonly',False)]}),
'move_id': fields.many2one('account.move', 'Journal Entry', readonly=True, select=1, ondelete='restrict', help="Link to the automatically generated Journal Items."),
'amount_untaxed': fields.function(_amount_all, digits_compute=dp.get_precision('Account'), string='Untaxed',
'amount_untaxed': fields.function(_amount_all, digits_compute=dp.get_precision('Account'), string='Untaxed', track_visibility='always',
store={
'account.invoice': (lambda self, cr, uid, ids, c={}: ids, ['invoice_line'], 20),
'account.invoice.tax': (_get_invoice_tax, None, 20),
@ -254,7 +261,7 @@ class account_invoice(osv.osv):
'account.invoice.line': (_get_invoice_line, ['price_unit','invoice_line_tax_id','quantity','discount','invoice_id'], 20),
},
multi='all'),
'currency_id': fields.many2one('res.currency', 'Currency', required=True, readonly=True, states={'draft':[('readonly',False)]}),
'currency_id': fields.many2one('res.currency', 'Currency', required=True, readonly=True, states={'draft':[('readonly',False)]}, track_visibility='always'),
'journal_id': fields.many2one('account.journal', 'Journal', required=True, readonly=True, states={'draft':[('readonly',False)]}),
'company_id': fields.many2one('res.company', 'Company', required=True, change_default=True, readonly=True, states={'draft':[('readonly',False)]}),
'check_total': fields.float('Verification Total', digits_compute=dp.get_precision('Account'), readonly=True, states={'draft':[('readonly',False)]}),
@ -278,7 +285,7 @@ class account_invoice(osv.osv):
help="Remaining amount due."),
'payment_ids': fields.function(_compute_lines, relation='account.move.line', type="many2many", string='Payments'),
'move_name': fields.char('Journal Entry', size=64, readonly=True, states={'draft':[('readonly',False)]}),
'user_id': fields.many2one('res.users', 'Salesperson', readonly=True, states={'draft':[('readonly',False)]}),
'user_id': fields.many2one('res.users', 'Salesperson', readonly=True, track_visibility='onchange', states={'draft':[('readonly',False)]}),
'fiscal_position': fields.many2one('account.fiscal.position', 'Fiscal Position', readonly=True, states={'draft':[('readonly',False)]})
}
_defaults = {
@ -373,10 +380,7 @@ class account_invoice(osv.osv):
if context is None:
context = {}
try:
res = super(account_invoice, self).create(cr, uid, vals, context)
if res:
self.create_send_note(cr, uid, [res], context=context)
return res
return super(account_invoice, self).create(cr, uid, vals, context)
except Exception, e:
if '"journal_id" viol' in e.args[0]:
raise orm.except_orm(_('Configuration Error!'),
@ -440,7 +444,6 @@ class account_invoice(osv.osv):
if context is None:
context = {}
self.write(cr, uid, ids, {'state':'paid'}, context=context)
self.confirm_paid_send_note(cr, uid, ids, context=context)
return True
def unlink(self, cr, uid, ids, context=None):
@ -994,7 +997,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
@ -1046,13 +1050,12 @@ class account_invoice(osv.osv):
self.write(cr, uid, ids, {})
for obj_inv in self.browse(cr, uid, ids, context=context):
id = obj_inv.id
invtype = obj_inv.type
number = obj_inv.number
move_id = obj_inv.move_id and obj_inv.move_id.id or False
reference = obj_inv.reference or ''
self.write(cr, uid, ids, {'internal_number':number})
self.write(cr, uid, ids, {'internal_number': number})
if invtype in ('in_invoice', 'in_refund'):
if not reference:
@ -1073,13 +1076,6 @@ class account_invoice(osv.osv):
'WHERE account_move_line.move_id = %s ' \
'AND account_analytic_line.move_id = account_move_line.id',
(ref, move_id))
for inv_id, name in self.name_get(cr, uid, [id]):
ctx = context.copy()
if obj_inv.type in ('out_invoice', 'out_refund'):
ctx = self.get_log_context(cr, uid, context=ctx)
message = _("Invoice '%s' is validated.") % name
self.message_post(cr, uid, [inv_id], body=message, context=context)
return True
def action_cancel(self, cr, uid, ids, context=None):
@ -1108,7 +1104,6 @@ class account_invoice(osv.osv):
# will be automatically deleted too
account_move_obj.unlink(cr, uid, move_ids, context=context)
self._log_event(cr, uid, ids, -1.0, 'Cancel Invoice')
self.invoice_cancel_send_note(cr, uid, ids, context=context)
return True
###################
@ -1149,73 +1144,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', 'user_id', 'fiscal_position'])
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',
'user_id', 'fiscal_position'):
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
@ -1312,8 +1326,8 @@ class account_invoice(osv.osv):
else:
code = invoice.currency_id.symbol
# TODO: use currency's formatting function
msg = _("Invoice '%s' is paid partially: %s%s of %s%s (%s%s remaining).") % \
(name, pay_amount, code, invoice.amount_total, code, total, code)
msg = _("Invoice partially paid: %s%s of %s%s (%s%s remaining).") % \
(pay_amount, code, invoice.amount_total, code, total, code)
self.message_post(cr, uid, [inv_id], body=msg, context=context)
self.pool.get('account.move.line').reconcile_partial(cr, uid, line_ids, 'manual', context)
@ -1321,35 +1335,6 @@ class account_invoice(osv.osv):
self.pool.get('account.invoice').write(cr, uid, ids, {}, context=context)
return True
# -----------------------------------------
# OpenChatter notifications and need_action
# -----------------------------------------
def _get_document_type(self, type):
type_dict = {
# Translation markers will have no effect at runtime, only used to properly flag export
'out_invoice': _('Customer invoice'),
'in_invoice': _('Supplier invoice'),
'out_refund': _('Customer Refund'),
'in_refund': _('Supplier Refund'),
}
return type_dict.get(type, 'Invoice')
def create_send_note(self, cr, uid, ids, context=None):
for obj in self.browse(cr, uid, ids, context=context):
self.message_post(cr, uid, [obj.id], body=_("%s <b>created</b>.") % (self._get_document_type(obj.type)),
subtype="account.mt_invoice_new", context=context)
def confirm_paid_send_note(self, cr, uid, ids, context=None):
for obj in self.browse(cr, uid, ids, context=context):
self.message_post(cr, uid, [obj.id], body=_("%s <b>paid</b>.") % (self._get_document_type(obj.type)),
subtype="account.mt_invoice_paid", context=context)
def invoice_cancel_send_note(self, cr, uid, ids, context=None):
for obj in self.browse(cr, uid, ids, context=context):
self.message_post(cr, uid, [obj.id], body=_("%s <b>cancelled</b>.") % (self._get_document_type(obj.type)),
context=context)
class account_invoice_line(osv.osv):
@ -1456,11 +1441,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)

3
addons/account/account_invoice_view.xml
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"}'/>

13
addons/account/account_move_line.py
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"
@ -983,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]

12
addons/account/account_view.xml
View File

@ -549,10 +549,8 @@
<div class="oe_right oe_button_box" name="import_buttons">
<!-- Put here related buttons -->
</div>
<label for="name" class="oe_edit_only" attrs="{'invisible':[('name','=','/')]}"/>
<h1>
<field name="name" attrs="{'invisible':[('name','=','/')]}"/>
</h1>
<label for="name" class="oe_edit_only"/>
<h1><field name="name"/></h1>
<group>
<group>
<field name="journal_id" domain="[('type', '=', 'bank')]" on_change="onchange_journal_id(journal_id)" widget="selection"/>
@ -577,7 +575,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 +1135,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 -->
@ -1155,7 +1153,7 @@
<field name="name">Journal Items</field>
<field name="res_model">account.move.line</field>
<field name="view_id" ref="view_move_line_tree"/>
<field name="view_mode">tree_account_move_line_quickadd</field>
<field name="view_mode">tree_account_move_line_quickadd,form</field>
<field name="help" type="html">
<p class="oe_view_nocontent_create">
Select the period and the journal you want to fill.

2
addons/account/company.py
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"

10
addons/account/data/account_data.xml
View File

@ -151,14 +151,16 @@
<field name="object">account.invoice</field>
</record>
<!-- mail: subtypes -->
<record id="mt_invoice_new" model="mail.message.subtype">
<field name="name">created</field>
<!-- Account-related subtypes for messaging / Chatter -->
<record id="mt_invoice_validated" model="mail.message.subtype">
<field name="name">Validated</field>
<field name="res_model">account.invoice</field>
<field name="description">Invoice validated</field>
</record>
<record id="mt_invoice_paid" model="mail.message.subtype">
<field name="name">paid</field>
<field name="name">Paid</field>
<field name="res_model">account.invoice</field>
<field name="description">Invoice paid</field>
</record>
</data>
</openerp>

5
addons/account/edi/invoice.py
View File

@ -18,12 +18,11 @@
# 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 urllib import urlencode
from openerp.osv import osv, fields
from edi import EDIMixin
INVOICE_LINE_EDI_STRUCT = {
'name': True,
'origin': True,

57
addons/account/i18n/de.po
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-17 21:28+0000\n"
"PO-Revision-Date: 2012-12-19 23:16+0000\n"
"Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
"consulting.net>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-12-18 05:00+0000\n"
"X-Generator: Launchpad (build 16372)\n"
"X-Launchpad-Export-Date: 2012-12-20 04:45+0000\n"
"X-Generator: Launchpad (build 16378)\n"
#. module: account
#: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@ -39,8 +39,8 @@ msgid ""
"Determine the display order in the report 'Accounting \\ Reporting \\ "
"Generic Reporting \\ Taxes \\ Taxes Report'"
msgstr ""
"Legen Sie die Reihenfolge der Anzeige im Report 'Finanz \\ Berichte \\ "
"Allgemeine Berichte \\ Steuern \\ Steuererklärung' fest"
"Legen Sie die Reihenfolge der Anzeige im Bericht 'Finanzen \\ Berichte \\ "
"Standard Auswertungen \\ Steuern \\ Umsatzsteuer Anmeldung' fest"
#. module: account
#: view:account.move.reconcile:0
@ -1749,7 +1749,7 @@ msgstr "eRechnung & Zahlungen"
#. module: account
#: view:account.analytic.cost.ledger.journal.report:0
msgid "Cost Ledger for Period"
msgstr "Auszug Analysekonto für Periode"
msgstr "Kostenstellen Umsatz der Periode"
#. module: account
#: view:account.entries.report:0
@ -2524,7 +2524,7 @@ msgstr "Offene Rechnungen"
#: model:ir.model,name:account.model_account_treasury_report
#: model:ir.ui.menu,name:account.menu_action_account_treasury_report_all
msgid "Treasury Analysis"
msgstr "Analyse Liquidität"
msgstr "Statistik Finanzmittel"
#. module: account
#: model:ir.actions.report.xml,name:account.account_journal_sale_purchase
@ -4410,7 +4410,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
@ -4544,8 +4544,8 @@ msgid ""
"If not applicable (computed through a Python code), the tax won't appear on "
"the invoice."
msgstr ""
"Wenn nicht aktiviert (Berechnung durch Python Code) scheint die Steuer nicht "
"auf der Rechnung auf."
"Soweit nicht Berechnung durch Python Code ausgewählt wird, wird die Steuer "
"nicht auf der Rechnung erscheinen."
#. module: account
#: field:account.config.settings,group_check_supplier_invoice_total:0
@ -4837,7 +4837,7 @@ msgstr "Anzeige Partner"
#. module: account
#: view:account.invoice:0
msgid "Validate"
msgstr "Validieren"
msgstr "Genehmigen & Buchen"
#. module: account
#: model:account.financial.report,name:account.account_financial_report_assets0
@ -5030,9 +5030,9 @@ msgid ""
"Analytic costs (timesheets, some purchased products, ...) come from analytic "
"accounts. These generate draft supplier invoices."
msgstr ""
"Analytische Kosten (Zeiterfassung, eingekaufte Produkte, ...) durch "
"Buchungen auf Analytischen Konten. Diese Buchungen erzeugen "
"Eingangsrechnungen im Entwurf."
"Zu analysierende Kosten (Stundenzettel, eingekaufte Produkte, ...) werden "
"verursacht durch Kostenstellen. Diese erzeugen Lieferantenrechnungen im "
"Entwurf."
#. module: account
#: view:account.bank.statement:0
@ -6208,7 +6208,7 @@ msgstr ""
#. module: account
#: field:account.tax.code,sign:0
msgid "Coefficent for parent"
msgstr "Koeff. f. übergeordnete Steuer"
msgstr "Koeffizient für Konsolidierung"
#. module: account
#: report:account.partner.balance:0
@ -6312,7 +6312,7 @@ msgstr "Standardauswertung Finanzen"
#: field:account.bank.statement.line,name:0
#: field:account.invoice,reference:0
msgid "Communication"
msgstr "Kommunikation"
msgstr "Verwendungszweck"
#. module: account
#: view:account.config.settings:0
@ -7095,7 +7095,7 @@ msgid ""
"choice assumes that the set of tax defined for the chosen template is "
"complete"
msgstr ""
"Diese Auswähl erlaubt Ihnen die Einkaufs- und Verkaufssteuern zu definieren "
"Diese Auswahl erlaubt Ihnen die Einkaufs- und Verkaufssteuern zu definieren "
"oder aus einer Liste auszuwählen. Letzteres setzt voraus, dass die Vorlage "
"vollständig ist."
@ -7292,7 +7292,7 @@ msgstr "Journal & Partner"
#. module: account
#: field:account.automatic.reconcile,power:0
msgid "Power"
msgstr "Stärke"
msgstr "Maximum Ausgleichspositionen"
#. module: account
#: code:addons/account/account.py:3392
@ -7334,12 +7334,12 @@ msgstr "Ausgleich Offener Posten: Gehe zu nächstem Partner"
#: model:ir.actions.act_window,name:account.action_account_analytic_invert_balance
#: model:ir.actions.report.xml,name:account.account_analytic_account_inverted_balance
msgid "Inverted Analytic Balance"
msgstr "Umgekehrter Saldo (Anal.)"
msgstr "Kostenstellen - Kostenarten Analyse"
#. module: account
#: field:account.tax.template,applicable_type:0
msgid "Applicable Type"
msgstr "Anwendbare Art"
msgstr "Anwendbarer Typ"
#. module: account
#: field:account.invoice.line,invoice_id:0
@ -7405,7 +7405,7 @@ msgstr "Kostenstellen Buchungen"
#. module: account
#: field:account.config.settings,has_default_company:0
msgid "Has default company"
msgstr ""
msgstr "Hat Unternehmensvorgabe"
#. module: account
#: view:account.fiscalyear.close:0
@ -7454,6 +7454,8 @@ msgid ""
"You cannot change the owner company of an account that already contains "
"journal items."
msgstr ""
"Sie dürfen die Unternehmenszuordnung eines Kontos nicht ändern, wenn es "
"bereits Buchungen gibt."
#. module: account
#: report:account.invoice:0
@ -7940,7 +7942,8 @@ msgid ""
"The currency chosen should be shared by the default accounts too."
msgstr ""
"Konfigurationsfehler !\n"
"Die Währung sollte auch durch die Standard Konten freigegeben werden."
"Die ausgewählte Währung sollte auch bei den verwendeten Standard Konten "
"zugelassen werden."
#. module: account
#: code:addons/account/account.py:2251
@ -8311,7 +8314,7 @@ msgstr "Buchungen anlegen"
#. 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
@ -8778,7 +8781,7 @@ msgstr ""
#. 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
@ -8788,7 +8791,7 @@ msgstr "Verweis auf automatisch generierte Buchungen"
#. 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
@ -10200,7 +10203,7 @@ msgstr "Start Periode"
#. module: account
#: model:ir.actions.report.xml,name:account.account_central_journal
msgid "Central Journal"
msgstr ""
msgstr "Zentrales Journal"
#. module: account
#: field:account.aged.trial.balance,direction_selection:0
@ -10210,7 +10213,7 @@ msgstr "Analysezeitraum"
#. module: account
#: field:res.partner,ref_companies:0
msgid "Companies that refers to partner"
msgstr ""
msgstr "Unternehmen mit Bezug zu diesem Partner"
#. module: account
#: view:account.invoice:0

766
addons/account/i18n/es.po
View File

File diff suppressed because it is too large Load Diff

34
addons/account/i18n/et.po
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-05-10 17:33+0000\n"
"Last-Translator: Raphael Collet (OpenERP) <Unknown>\n"
"PO-Revision-Date: 2012-12-19 19:59+0000\n"
"Last-Translator: Ahti Hinnov <sipelgas@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-20 04:44+0000\n"
"X-Generator: Launchpad (build 16378)\n"
#. module: account
#: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@ -1775,7 +1775,7 @@ msgstr ""
#. module: account
#: field:account.config.settings,group_analytic_accounting:0
msgid "Analytic accounting"
msgstr ""
msgstr "Analüütiline raamatupidamine"
#. module: account
#: report:account.overdue:0
@ -1946,6 +1946,8 @@ msgid ""
"Select a configuration package to setup automatically your\n"
" taxes and chart of accounts."
msgstr ""
"Vali raamatupidamise pakett, et automaatselt seadistada\n"
" maksud ja kontoplaan."
#. module: account
#: view:account.analytic.account:0
@ -2139,7 +2141,7 @@ msgstr ""
#. module: account
#: sql_constraint:account.move.line:0
msgid "Wrong credit or debit value in accounting entry !"
msgstr "Vale kreedit või deebeti raamatupidamise sisend !"
msgstr ""
#. module: account
#: view:account.invoice.report:0
@ -2298,7 +2300,7 @@ msgstr "Maksu definitsioon"
#: view:account.config.settings:0
#: model:ir.actions.act_window,name:account.action_account_config
msgid "Configure Accounting"
msgstr ""
msgstr "Seadista raamatupidamine"
#. module: account
#: field:account.invoice.report,uom_name:0
@ -2493,7 +2495,7 @@ msgstr ""
#. module: account
#: report:account.invoice:0
msgid "Customer Code"
msgstr ""
msgstr "Kliendi kood"
#. module: account
#: view:account.account.type:0
@ -5850,7 +5852,7 @@ msgstr "Analüütilised kontod"
#. module: account
#: view:account.invoice.report:0
msgid "Customer Invoices And Refunds"
msgstr ""
msgstr "Müügiarved ja hüvitised"
#. module: account
#: field:account.analytic.line,amount_currency:0
@ -6388,7 +6390,7 @@ msgstr ""
#. module: account
#: field:product.template,taxes_id:0
msgid "Customer Taxes"
msgstr "Kliendi maksud"
msgstr "Müügimaksud"
#. module: account
#: help:account.model,name:0
@ -6577,7 +6579,7 @@ msgstr ""
#: code:addons/account/installer.py:48
#, python-format
msgid "Custom"
msgstr ""
msgstr "Kohandatud"
#. module: account
#: view:account.analytic.account:0
@ -6939,7 +6941,7 @@ msgstr ""
#: code:addons/account/account_invoice.py:1321
#, python-format
msgid "Customer invoice"
msgstr ""
msgstr "Müügiarve"
#. module: account
#: selection:account.account.type,report_type:0
@ -7289,7 +7291,7 @@ msgstr ""
#: model:ir.actions.act_window,name:account.action_invoice_tree1
#: model:ir.ui.menu,name:account.menu_action_invoice_tree1
msgid "Customer Invoices"
msgstr "Kliendi arved"
msgstr "Müügiarved"
#. module: account
#: view:account.tax:0
@ -7428,7 +7430,7 @@ msgstr ""
#. module: account
#: view:account.invoice:0
msgid "Customer Reference"
msgstr ""
msgstr "Kliendi viide"
#. module: account
#: field:account.account.template,parent_id:0
@ -8085,7 +8087,7 @@ msgstr ""
#. module: account
#: field:account.installer,charts:0
msgid "Accounting Package"
msgstr ""
msgstr "Raamatupidamise pakett"
#. module: account
#: report:account.third_party_ledger:0
@ -9199,7 +9201,7 @@ msgstr "Loo arve"
#. module: account
#: model:ir.actions.act_window,name:account.action_account_configuration_installer
msgid "Configure Accounting Data"
msgstr ""
msgstr "Seadista raamatupidamise andmed"
#. module: account
#: field:wizard.multi.charts.accounts,purchase_tax_rate:0

133
addons/account/i18n/fr.po
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-07 15:21+0000\n"
"Last-Translator: Frederic Clementi - Camptocamp.com "
"<frederic.clementi@camptocamp.com>\n"
"PO-Revision-Date: 2012-12-19 15:40+0000\n"
"Last-Translator: Maxime Chambreuil (http://www.savoirfairelinux.com) "
"<maxime.chambreuil@savoirfairelinux.com>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-12-08 04:59+0000\n"
"X-Generator: Launchpad (build 16341)\n"
"X-Launchpad-Export-Date: 2012-12-20 04:44+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
@ -150,7 +152,7 @@ msgstr "Importer depuis une facture ou un règlement"
#: code:addons/account/account_move_line.py:1198
#, python-format
msgid "Bad Account!"
msgstr ""
msgstr "Mauvais compte!"
#. module: account
#: view:account.move:0
@ -173,6 +175,8 @@ msgid ""
"Error!\n"
"You cannot create recursive account templates."
msgstr ""
"Erreur!\n"
"Vous ne pouvez pas créer de modèles de compte récursifs."
#. module: account
#. openerp-web
@ -263,6 +267,14 @@ msgid ""
" </p>\n"
" "
msgstr ""
"<p class=\"oe_view_nocontent_create\">\n"
" Cliquez pour ajouter une période fiscale.\n"
" </p><p>\n"
" Une période comptable couvre habituellement un mois,\n"
" ou un trimestre. Elle coïncide souvent avec les échéances\n"
" des déclarations de taxes.\n"
" </p>\n"
" "
#. module: account
#: model:ir.actions.act_window,name:account.action_view_created_invoice_dashboard
@ -277,7 +289,7 @@ msgstr "Titre de colonne"
#. module: account
#: help:account.config.settings,code_digits:0
msgid "No. of digits to use for account code"
msgstr ""
msgstr "Nombre de chiffres à utiliser pour le code des comptes"
#. module: account
#: help:account.analytic.journal,type:0
@ -297,6 +309,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
@ -327,7 +342,7 @@ msgstr "Rapports belges"
#. module: account
#: model:account.account.type,name:account.account_type_income_view1
msgid "Income View"
msgstr ""
msgstr "Vue des revenus"
#. module: account
#: help:account.account,user_type:0
@ -344,7 +359,7 @@ msgstr ""
#. module: account
#: field:account.config.settings,sale_refund_sequence_next:0
msgid "Next credit note number"
msgstr ""
msgstr "Prochain numéro d'avoir"
#. module: account
#: help:account.config.settings,module_account_voucher:0
@ -384,6 +399,17 @@ msgid ""
" </p>\n"
" "
msgstr ""
"<p class=\"oe_view_nocontent_create\">\n"
" Cliquez pour ajouter un remboursement à un client.\n"
" </p><p>\n"
" Un remboursement est un document qui crédite une facture\n"
" complètement ou partiellement.\n"
" </p><p>\n"
" Au lieu de créer manuellement un remboursement client, vous\n"
" pouvez le générer directement depuis la facture client\n"
" correspondante.\n"
" </p>\n"
" "
#. module: account
#: help:account.installer,charts:0
@ -403,7 +429,7 @@ msgstr "Annuler le lettrage"
#. module: account
#: field:account.config.settings,module_account_budget:0
msgid "Budget management"
msgstr ""
msgstr "Gestion du budget"
#. module: account
#: view:product.template:0
@ -424,7 +450,7 @@ msgstr ""
#. module: account
#: field:account.config.settings,group_multi_currency:0
msgid "Allow multi currencies"
msgstr ""
msgstr "Autoriser devises multiples"
#. module: account
#: code:addons/account/account_invoice.py:73
@ -445,12 +471,12 @@ msgstr "Juin"
#: code:addons/account/wizard/account_automatic_reconcile.py:148
#, python-format
msgid "You must select accounts to reconcile."
msgstr ""
msgstr "Vous devez sélectionner les comptes à réconcilier."
#. module: account
#: help:account.config.settings,group_analytic_accounting:0
msgid "Allows you to use the analytic accounting."
msgstr ""
msgstr "Vous permet d'utiliser la comptabilité analytique"
#. module: account
#: view:account.invoice:0
@ -524,7 +550,7 @@ msgstr ""
#: code:addons/account/static/src/xml/account_move_line_quickadd.xml:8
#, python-format
msgid "Period :"
msgstr ""
msgstr "Période:"
#. module: account
#: field:account.account.template,chart_template_id:0
@ -560,7 +586,7 @@ msgstr "Le montant exprimé dans une autre devise optionelle."
#. module: account
#: view:account.journal:0
msgid "Available Coins"
msgstr ""
msgstr "Monnaie disponible"
#. module: account
#: field:accounting.report,enable_filter:0
@ -613,7 +639,7 @@ msgstr "Cible parent"
#. module: account
#: help:account.invoice.line,sequence:0
msgid "Gives the sequence of this line when displaying the invoice."
msgstr ""
msgstr "Donne la séquence de cette ligne lors de l'affichage de la facture"
#. module: account
#: field:account.bank.statement,account_id:0
@ -682,12 +708,12 @@ msgstr "Le comptable confirme le relevé."
#: code:addons/account/static/src/xml/account_move_reconciliation.xml:31
#, python-format
msgid "Nothing to reconcile"
msgstr ""
msgstr "Rien à réconcilier"
#. module: account
#: field:account.config.settings,decimal_precision:0
msgid "Decimal precision on journal entries"
msgstr ""
msgstr "Précision décimale pour les entrées de journal"
#. module: account
#: selection:account.config.settings,period:0
@ -745,12 +771,12 @@ msgstr ""
#: code:addons/account/wizard/account_change_currency.py:70
#, python-format
msgid "Current currency is not configured properly."
msgstr ""
msgstr "La devise actuelle n'est pas configurée correctement"
#. module: account
#: field:account.journal,profit_account_id:0
msgid "Profit Account"
msgstr ""
msgstr "Compte de résultat"
#. module: account
#: code:addons/account/account_move_line.py:1144
@ -1334,7 +1360,7 @@ msgstr "Début de période"
#. module: account
#: view:account.tax:0
msgid "Refunds"
msgstr ""
msgstr "Remboursements"
#. module: account
#: model:process.transition,name:account.process_transition_confirmstatementfromdraft0
@ -1624,7 +1650,7 @@ msgstr "Compte client"
#: code:addons/account/account.py:767
#, python-format
msgid "%s (copy)"
msgstr ""
msgstr "%s (copie)"
#. module: account
#: selection:account.balance.report,display_account:0
@ -6616,7 +6642,7 @@ msgstr ""
#. module: account
#: field:product.template,taxes_id:0
msgid "Customer Taxes"
msgstr "Taxes a la vente"
msgstr "Taxes à la vente"
#. module: account
#: help:account.model,name:0
@ -9715,7 +9741,7 @@ msgstr ""
#. module: account
#: field:account.config.settings,purchase_sequence_next:0
msgid "Next supplier invoice number"
msgstr ""
msgstr "Prochain numéro de facture fournisseur"
#. module: account
#: help:account.config.settings,module_account_payment:0
@ -9823,7 +9849,7 @@ msgstr "Filtrés par"
#: field:account.cashbox.line,number_closing:0
#: field:account.cashbox.line,number_opening:0
msgid "Number of Units"
msgstr ""
msgstr "Nombre d'unités"
#. module: account
#: model:process.node,note:account.process_node_manually0
@ -9848,12 +9874,12 @@ msgstr "N° d'écriture"
#: code:addons/account/wizard/account_period_close.py:51
#, python-format
msgid "Invalid Action!"
msgstr ""
msgstr "Action invalide!"
#. module: account
#: view:account.bank.statement:0
msgid "Date / Period"
msgstr ""
msgstr "Date / Période"
#. module: account
#: report:account.central.journal:0
@ -9894,7 +9920,7 @@ msgstr "Crée un compte avec le modèle sélectionné sous le parent existant."
#. module: account
#: report:account.invoice:0
msgid "Source"
msgstr ""
msgstr "Origine"
#. module: account
#: selection:account.model.line,date_maturity:0
@ -9911,7 +9937,7 @@ msgstr ""
#. module: account
#: field:account.invoice,sent:0
msgid "Sent"
msgstr ""
msgstr "Envoyé"
#. module: account
#: view:account.unreconcile.reconcile:0
@ -9927,7 +9953,7 @@ msgstr "Rapport"
#: field:account.config.settings,default_sale_tax:0
#: field:account.config.settings,sale_tax:0
msgid "Default sale tax"
msgstr ""
msgstr "Taxe de vente par défaut"
#. module: account
#: report:account.overdue:0
@ -10014,7 +10040,7 @@ msgstr "Période de fin"
#. module: account
#: model:account.account.type,name:account.account_type_expense_view1
msgid "Expense View"
msgstr ""
msgstr "Vue des dépenses"
#. module: account
#: field:account.move.line,date_maturity:0
@ -10109,7 +10135,7 @@ msgstr "Factures en brouillon"
#: view:cash.box.in:0
#: model:ir.actions.act_window,name:account.action_cash_box_in
msgid "Put Money In"
msgstr ""
msgstr "Faire une entrée de liquidité"
#. module: account
#: selection:account.account.type,close_method:0
@ -10170,7 +10196,7 @@ msgstr "Depuis les comptes analytiques"
#. module: account
#: view:account.installer:0
msgid "Configure your Fiscal Year"
msgstr ""
msgstr "Paramétrer votre année fiscale"
#. module: account
#: field:account.period,name:0
@ -10184,6 +10210,8 @@ msgid ""
"Selected invoice(s) cannot be cancelled as they are already in 'Cancelled' "
"or 'Done' state."
msgstr ""
"La/Les facture(s) sélectionnée(s) ne peuvent être annulée(s) car elle sont "
"déjà dans un état 'Annulée' ou 'Terminée'."
#. module: account
#: report:account.analytic.account.quantity_cost_ledger:0
@ -10218,6 +10246,10 @@ msgid ""
"some non legal fields or you must unconfirm the journal entry first.\n"
"%s."
msgstr ""
"Vous ne pouvez pas appliquer cette modification sur un élément confirmé. "
"Vous pouvez uniquement changer les champs non légaux, ou alors vous devez "
"préalablement annuler la confirmation de cette entrée de journal.\n"
"%s"
#. module: account
#: help:account.config.settings,module_account_budget:0
@ -10280,7 +10312,7 @@ msgstr "Crédit"
#. module: account
#: view:account.invoice:0
msgid "Draft Invoice "
msgstr ""
msgstr "Facture brouillon "
#. module: account
#: selection:account.invoice.refund,filter_refund:0
@ -10301,7 +10333,7 @@ msgstr "Modèle de pièce comptable"
#: code:addons/account/account.py:1058
#, python-format
msgid "Start period should precede then end period."
msgstr ""
msgstr "La période de début doit précéder la période de fin."
#. module: account
#: field:account.invoice,number:0
@ -10386,7 +10418,7 @@ msgstr "Bénéfice (perte) à reporter"
#: code:addons/account/account_invoice.py:368
#, python-format
msgid "There is no Sale/Purchase Journal(s) defined."
msgstr ""
msgstr "Il n'y a pas de journal(s) de vente ou d'achat de défini."
#. module: account
#: view:account.move.line.reconcile.select:0
@ -10587,7 +10619,7 @@ msgstr "Total"
#: code:addons/account/wizard/account_invoice_refund.py:109
#, python-format
msgid "Cannot %s draft/proforma/cancel invoice."
msgstr ""
msgstr "Impossible de %s une facture brouillon/proforma/annulée"
#. module: account
#: field:account.tax,account_analytic_paid_id:0
@ -10659,7 +10691,7 @@ msgstr "Date d'échéance"
#: field:cash.box.in,name:0
#: field:cash.box.out,name:0
msgid "Reason"
msgstr ""
msgstr "Motif"
#. module: account
#: selection:account.partner.ledger,filter:0
@ -10717,7 +10749,7 @@ msgstr "Comptes vides ? "
#: code:addons/account/account_move_line.py:1046
#, python-format
msgid "Unable to change tax!"
msgstr ""
msgstr "Impossible de changer la taxe!"
#. module: account
#: constraint:account.bank.statement:0
@ -10746,6 +10778,9 @@ msgid ""
"customer. The tool search can also be used to personalise your Invoices "
"reports and so, match this analysis to your needs."
msgstr ""
"À partir de ce rapport, vous avez un aperçu du montant facturé à votre "
"client. L'outil de recherche peut aussi être utilisé pour personnaliser "
"l'analyse des factures, et ainsi mieux correspondre à votre besoin."
#. module: account
#: view:account.partner.reconcile.process:0
@ -10842,7 +10877,7 @@ msgstr "Compte client"
#: code:addons/account/account_move_line.py:776
#, python-format
msgid "Already reconciled."
msgstr ""
msgstr "Déjà lettré."
#. module: account
#: selection:account.model.line,date_maturity:0
@ -11042,7 +11077,7 @@ msgstr "Le compte de revenu ou de dépense associé à l'article sélectionné."
#. module: account
#: view:account.config.settings:0
msgid "Install more chart templates"
msgstr ""
msgstr "Ajouter plus de modèles de plan comptable"
#. module: account
#: report:account.general.journal:0
@ -11090,6 +11125,8 @@ msgid ""
"You cannot remove/deactivate an account which is set on a customer or "
"supplier."
msgstr ""
"Vous ne pouvez pas supprimer/désactiver un compte qui est associé à un "
"client ou à un fournisseur."
#. module: account
#: model:ir.model,name:account.model_validate_account_move_lines
@ -11101,6 +11138,8 @@ msgstr "Valider les lignes d'écriture"
msgid ""
"The fiscal position will determine taxes and accounts used for the partner."
msgstr ""
"La position fiscale déterminera les taxes et les comptes comptables utilisés "
"par le partneraire"
#. module: account
#: model:process.node,note:account.process_node_supplierpaidinvoice0
@ -11116,7 +11155,7 @@ msgstr "Dés que le rapprochement est réalisé, la facture peut être payée."
#: code:addons/account/wizard/account_change_currency.py:59
#, python-format
msgid "New currency is not configured properly."
msgstr ""
msgstr "La nouvelle devise n'est pas configurée correctement."
#. module: account
#: view:account.account.template:0
@ -11145,7 +11184,7 @@ msgstr "Parent Droit"
#: code:addons/account/static/src/js/account_move_reconciliation.js:80
#, python-format
msgid "Never"
msgstr ""
msgstr "Jamais"
#. module: account
#: model:ir.model,name:account.model_account_addtmpl_wizard
@ -11166,7 +11205,7 @@ msgstr "Du partenaire"
#. module: account
#: field:account.account,note:0
msgid "Internal Notes"
msgstr ""
msgstr "Notes internes"
#. module: account
#: model:ir.actions.act_window,name:account.action_account_fiscalyear
@ -11199,7 +11238,7 @@ msgstr "Modèle de Compte"
#: code:addons/account/account_cash_statement.py:292
#, python-format
msgid "Loss"
msgstr ""
msgstr "Pertes"
#. module: account
#: selection:account.entries.report,month:0
@ -11290,7 +11329,7 @@ msgstr ""
#. module: account
#: selection:account.config.settings,tax_calculation_rounding_method:0
msgid "Round per line"
msgstr ""
msgstr "Arrondir par ligne"
#. module: account
#: help:account.move.line,amount_residual_currency:0

1020
addons/account/i18n/nl_BE.po
View File

File diff suppressed because it is too large Load Diff

82
addons/account/i18n/pl.po
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-16 21:03+0000\n"
"PO-Revision-Date: 2012-12-19 17:42+0000\n"
"Last-Translator: Grzegorz Grzelak (OpenGLOBE.pl) <grzegorz@openglobe.pl>\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-17 04:46+0000\n"
"X-Generator: Launchpad (build 16372)\n"
"X-Launchpad-Export-Date: 2012-12-20 04:45+0000\n"
"X-Generator: Launchpad (build 16378)\n"
#. module: account
#: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@ -1285,6 +1285,16 @@ msgid ""
" </p>\n"
" "
msgstr ""
"<p class=\"oe_view_nocontent_create\">\n"
" Kliknij, aby utworzyć nowy raport kasowy.\n"
" </p><p>\n"
" Raport kasowy pozwala rejestrować operacje kasowe.\n"
" Służy do obsługi codziennych płatności w gotówce.\n"
" Po utworzeniu raportu, na początku możesz wprowadzić\n"
" banknoty i monety, które posiadasz w kasetce. A następnie\n"
" rejestrować każdą operację wpłaty i wypłaty.\n"
" </p>\n"
" "
#. module: account
#: model:account.account.type,name:account.data_account_type_bank
@ -2964,6 +2974,21 @@ msgid ""
" </p>\n"
" "
msgstr ""
"<p class=\"oe_view_nocontent_create\">\n"
" Kliknij, aby utworzyć zapis księgowy.\n"
" </p><p>\n"
" Zapis księgowy zawiera kilka pozycji. Każda z nich jest "
"transakcją\n"
" po albo stronie Winien, albo po stronie Ma.\n"
" </p><p>\n"
" OpenERP tworzy automatycznie zapisy przy zatwierdzaniu "
"wielu\n"
" dokumentów: faktur, korekt, płatności, wyciągów bankowych, "
"itp.\n"
" Ręcznie powinieneś wprowadzać zapisy tylko dla nietypowych\n"
" operacji.\n"
" </p>\n"
" "
#. module: account
#: help:account.invoice,date_due:0
@ -3860,6 +3885,10 @@ msgid ""
"quotations with a button \"Pay with Paypal\" in automated emails or through "
"the OpenERP portal."
msgstr ""
"Konto paypal (adres email) do otrzymywania płatności online (kartami "
"kredytowymi, itp). Jeśli ustawisz konto paypal, to klient będzie mógł "
"zapłacić za fakturę lub wpłacić przedpłatę przyciskiem \"Płać przez PayPal\" "
"automatycznymi mailami lub w portalu OpenERP."
#. module: account
#: code:addons/account/account_move_line.py:535
@ -3870,6 +3899,10 @@ msgid ""
"You can create one in the menu: \n"
"Configuration/Journals/Journals."
msgstr ""
"Nie można znaleźć dziennika typu %s dla tej firmy.\n"
"\n"
"Utwórz go w menu: \n"
"Konfiguracja/Dzienniki/Dzienniki."
#. module: account
#: model:ir.actions.act_window,name:account.action_account_unreconcile
@ -3920,6 +3953,10 @@ msgid ""
"by\n"
" your supplier/customer."
msgstr ""
"Będziesz mógł edytować i zatwierdzić\n"
" tę korektę od razu lub trzymac ją w \n"
" stanie Projekt do czasu otrzymania\n"
" dokumentu od partnera."
#. module: account
#: view:validate.account.move.lines:0
@ -4486,6 +4523,8 @@ msgid ""
"Value of Loss or Gain due to changes in exchange rate when doing multi-"
"currency transactions."
msgstr ""
"Wartości zysków i strat w zależności od zmian w kursie walut przy transakcja "
"wielowalutowych."
#. module: account
#: view:account.analytic.line:0
@ -4568,7 +4607,7 @@ msgstr "(Faktura musi mieć skasowane uzgodnienia, jeśli chcesz ją otworzyć)"
#. module: account
#: field:account.tax,account_analytic_collected_id:0
msgid "Invoice Tax Analytic Account"
msgstr ""
msgstr "Konto analityczne podatku faktury"
#. module: account
#: field:account.chart,period_from:0
@ -5282,7 +5321,7 @@ msgstr "Czek"
#: view:validate.account.move:0
#: view:validate.account.move.lines:0
msgid "or"
msgstr ""
msgstr "lub"
#. module: account
#: view:account.invoice.report:0
@ -6485,6 +6524,10 @@ msgid ""
"created by the system on document validation (invoices, bank statements...) "
"and will be created in 'Posted' status."
msgstr ""
"Wszystkie ręcznie utworzone zapisy mają zwykle stan 'Niezaksięgowane', ale "
"możesz ustawić opcję w dzienniku, że zapisy będą automatycznie księgowane po "
"wprowadzeniu. Będą się w tedy zachowywały jak zapisy przy fakturach i "
"wyciągach bankowych i przechodziły w stan 'Zaksięgowano'."
#. module: account
#: field:account.payment.term.line,days:0
@ -7034,6 +7077,8 @@ msgid ""
"the tool search to analyse information about analytic entries generated in "
"the system."
msgstr ""
"W tym widoku masz analizę zapisów analitycznych na kontach analitycznych. "
"Konta odzwierciedlają twoje biznesowe potrzeby analityczne."
#. module: account
#: sql_constraint:account.journal:0
@ -7043,7 +7088,7 @@ msgstr "Nazwa dziennika musi być unikalna w ramach firmy !"
#. module: account
#: field:account.account.template,nocreate:0
msgid "Optional create"
msgstr ""
msgstr "Opcjonalne tworzenie"
#. module: account
#: code:addons/account/account.py:685
@ -7099,7 +7144,7 @@ msgstr "Grupuj wg..."
#. module: account
#: view:account.payment.term.line:0
msgid " Valuation: Balance"
msgstr ""
msgstr " Wartość: Saldo"
#. module: account
#: field:account.analytic.line,product_uom_id:0
@ -7150,6 +7195,8 @@ msgid ""
"Percentages for Payment Term Line must be between 0 and 1, Example: 0.02 for "
"2%."
msgstr ""
"Oprocentowanie w pozycji warunku płatności musi być jako liczba między 0 a "
"1, Na przykład: 0.02 oznacza 2%."
#. module: account
#: report:account.invoice:0
@ -7601,6 +7648,9 @@ msgid ""
"Make sure you have configured payment terms properly.\n"
"The latest payment term line should be of the \"Balance\" type."
msgstr ""
"Nie możesz zatwierdzić niezbilansowanego zapisu.\n"
"Upewnij się, że warunki płatności są poprawne.\n"
"Ostatnia pozycja warunków płatności powinna być typu 'Saldo'."
#. module: account
#: model:process.transition,note:account.process_transition_invoicemanually0
@ -8165,7 +8215,7 @@ msgstr "Do"
#: code:addons/account/account.py:1497
#, python-format
msgid "Currency Adjustment"
msgstr ""
msgstr "Poprawka walutowa"
#. module: account
#: field:account.fiscalyear.close,fy_id:0
@ -8894,7 +8944,7 @@ msgstr "Automatyczny import wyciągu bankowego"
#: code:addons/account/account_invoice.py:370
#, python-format
msgid "Unknown Error!"
msgstr ""
msgstr "Nieznany błąd!"
#. module: account
#: model:ir.model,name:account.model_account_move_bank_reconcile
@ -8920,11 +8970,13 @@ msgid ""
"You cannot use this general account in this journal, check the tab 'Entry "
"Controls' on the related journal."
msgstr ""
"Nie możesz stosować tego konta w tym dzienniku. Sprawdź zakładkę 'Kontrola "
"zapisów' w dzienniku."
#. module: account
#: view:account.payment.term.line:0
msgid " Value amount: n.a"
msgstr ""
msgstr " Wartość: nd."
#. module: account
#: view:account.automatic.reconcile:0
@ -9304,6 +9356,9 @@ msgid ""
"created. If you leave that field empty, it will use the same journal as the "
"current invoice."
msgstr ""
"Możesz wybrać dziennik dla tworzonej korekty. Jeśli pozostawisz to pole "
"puste, to do korekty będzie stosowany ten sam dzinnik co do oryginalnej "
"faktury."
#. module: account
#: help:account.bank.statement.line,sequence:0
@ -9352,6 +9407,9 @@ msgid ""
"some non legal fields or you must unreconcile first.\n"
"%s."
msgstr ""
"Nie możesz modyfikować uzgodnionego zapisu. Możesz zmieniać jedynie pola "
"nieistotne księgowo lub najpierw musisz skasować uzgodnienie.\n"
"%s."
#. module: account
#: help:account.financial.report,sign:0
@ -9511,6 +9569,10 @@ msgid ""
"chart\n"
" of accounts."
msgstr ""
"Kiedy projekt faktury zostanie zatwierdzony, to nie\n"
" będziesz mógł go modyfikować. Faktura otrzyma\n"
" unikalny numer i zostanie utworzony zapis\n"
" księgowy."
#. module: account
#: model:process.node,note:account.process_node_bankstatement0

103
addons/account/i18n/pt.po
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-13 16:07+0000\n"
"Last-Translator: Andrei Talpa (multibase.pt) <andrei.talpa@multibase.pt>\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-14 05:37+0000\n"
"X-Generator: Launchpad (build 16369)\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
@ -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
@ -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
@ -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
@ -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
@ -8205,6 +8220,8 @@ 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

111
addons/account/i18n/sl.po
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-17 16:09+0000\n"
"PO-Revision-Date: 2012-12-18 22:31+0000\n"
"Last-Translator: Dusan Laznik <laznik@mentis.si>\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-18 05:01+0000\n"
"X-Generator: Launchpad (build 16372)\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
@ -291,7 +291,7 @@ msgid ""
"This includes all the basic requirements of voucher entries for bank, cash, "
"sales, purchase, expense, contra, etc.\n"
" This installs the module account_voucher."
msgstr ""
msgstr "Poslovanje z vavčerji"
#. module: account
#: model:ir.actions.act_window,name:account.action_account_use_model_create_entry
@ -923,7 +923,7 @@ msgstr "Pošlji po e-pošti"
msgid ""
"Print Report with the currency column if the currency differs from the "
"company currency."
msgstr ""
msgstr "Poročilo z valuto različno od privzete valute podjetja."
#. module: account
#: report:account.analytic.account.quantity_cost_ledger:0
@ -1166,6 +1166,13 @@ msgid ""
" </p>\n"
" "
msgstr ""
"<p class=\"oe_view_nocontent_create\">\n"
" Kliknite , če želite dodati konto\n"
" </p><p>\n"
" Prikaz predvidene valutne razlike\n"
" \n"
" </p>\n"
" "
#. module: account
#: field:account.bank.accounts.wizard,acc_name:0
@ -1581,6 +1588,8 @@ msgid ""
"There is no default debit account defined \n"
"on journal \"%s\"."
msgstr ""
"Ni privzetega debetnega konta \n"
"v dnevniku \"%s\"."
#. module: account
#: view:account.tax:0
@ -1614,7 +1623,7 @@ msgstr "Največji znesek odpisa"
msgid ""
"There is nothing to reconcile. All invoices and payments\n"
" have been reconciled, your partner balance is clean."
msgstr ""
msgstr "Ni neusklajenih postavk"
#. module: account
#: field:account.chart.template,code_digits:0
@ -2586,7 +2595,7 @@ msgstr "Konto prihodkov"
#. module: account
#: help:account.config.settings,default_sale_tax:0
msgid "This sale tax will be assigned by default on new products."
msgstr ""
msgstr "Ta davek bo privzet na novih izdelkih"
#. module: account
#: report:account.general.ledger_landscape:0
@ -2675,7 +2684,7 @@ msgstr "Obdrži prazno za odprto poslovno leto"
msgid ""
"You cannot change the type of account from 'Closed' to any other type as it "
"contains journal items!"
msgstr ""
msgstr "Ne morete spremeniti vrste konta, ker vsebuje vknjižbe!"
#. module: account
#: field:account.invoice.report,account_line_id:0
@ -2860,7 +2869,7 @@ msgstr "EXJ"
#. module: account
#: view:account.invoice.refund:0
msgid "Create Credit Note"
msgstr ""
msgstr "Nov dobropis"
#. module: account
#: field:product.template,supplier_taxes_id:0
@ -3170,7 +3179,7 @@ msgstr "Neprebrana sporočila"
msgid ""
"Selected invoice(s) cannot be confirmed as they are not in 'Draft' or 'Pro-"
"Forma' state."
msgstr ""
msgstr "Izbrani računi nimajo statusa \"Osnutek\" ali \"Predračun\""
#. module: account
#: code:addons/account/account.py:1056
@ -3300,7 +3309,7 @@ msgstr "Konto stroškov"
#: field:account.bank.statement,message_summary:0
#: field:account.invoice,message_summary:0
msgid "Summary"
msgstr ""
msgstr "Povzetek"
#. module: account
#: help:account.invoice,period_id:0
@ -3570,7 +3579,7 @@ msgstr "Saldakonti"
#: code:addons/account/account_invoice.py:1330
#, python-format
msgid "%s <b>created</b>."
msgstr ""
msgstr "%s <b>ustvarjeno</b>."
#. module: account
#: view:account.period:0
@ -3866,7 +3875,7 @@ msgstr "Kontni načrti"
#: view:cash.box.out:0
#: model:ir.actions.act_window,name:account.action_cash_box_out
msgid "Take Money Out"
msgstr ""
msgstr "Dvig gotovine"
#. module: account
#: report:account.vat.declaration:0
@ -4331,7 +4340,7 @@ msgstr ""
#: code:addons/account/account_move_line.py:1131
#, python-format
msgid "You cannot use an inactive account."
msgstr ""
msgstr "Ne morete uporabiti de aktiviranega konta."
#. module: account
#: model:ir.actions.act_window,name:account.open_board_account
@ -4625,12 +4634,12 @@ msgstr "Mesec"
#: code:addons/account/account.py:667
#, python-format
msgid "You cannot change the code of account which contains journal items!"
msgstr ""
msgstr "Ne morete spremeniti kode konta , ki vsebuje vknjižbe"
#. module: account
#: field:account.config.settings,purchase_sequence_prefix:0
msgid "Supplier invoice sequence"
msgstr ""
msgstr "Številčno zaporedje dobaviteljevih računov"
#. module: account
#: code:addons/account/account_invoice.py:571
@ -4755,7 +4764,7 @@ msgstr "Periodična obdelava"
#. module: account
#: selection:account.move.line,state:0
msgid "Balanced"
msgstr ""
msgstr "Uklajeno"
#. module: account
#: model:process.node,note:account.process_node_importinvoice0
@ -4854,7 +4863,7 @@ msgstr "Dobropis"
#: model:ir.actions.act_window,name:account.action_account_manual_reconcile
#: model:ir.ui.menu,name:account.menu_manual_reconcile_bank
msgid "Journal Items to Reconcile"
msgstr ""
msgstr "Odprte postavke"
#. module: account
#: sql_constraint:account.period:0
@ -4869,7 +4878,7 @@ msgstr ""
#. module: account
#: view:account.tax:0
msgid "Tax Computation"
msgstr ""
msgstr "Izračun davka"
#. module: account
#: view:wizard.multi.charts.accounts:0
@ -4965,7 +4974,7 @@ msgstr "Privzeti kreditni konto"
#. module: account
#: view:cash.box.out:0
msgid "Describe why you take money from the cash register:"
msgstr ""
msgstr "Razlog za dvig gotovine"
#. module: account
#: selection:account.invoice,state:0
@ -5050,7 +5059,7 @@ msgstr "Nov"
#. module: account
#: view:wizard.multi.charts.accounts:0
msgid "Sale Tax"
msgstr ""
msgstr "Prodajni davek"
#. module: account
#: field:account.tax,ref_tax_code_id:0
@ -5236,7 +5245,7 @@ msgstr "Postavke za pregled"
#. module: account
#: selection:res.company,tax_calculation_rounding_method:0
msgid "Round Globally"
msgstr ""
msgstr "Skupno zaokroževanje"
#. module: account
#: field:account.bank.statement,message_comment_ids:0
@ -5279,7 +5288,7 @@ msgstr "Aktivno"
#: view:account.bank.statement:0
#: field:account.journal,cash_control:0
msgid "Cash Control"
msgstr ""
msgstr "Gotovina"
#. module: account
#: field:account.analytic.balance,date2:0
@ -5392,7 +5401,7 @@ msgstr "Podrejeni konti davkov"
msgid ""
"There is no period defined for this date: %s.\n"
"Please create one."
msgstr ""
msgstr "Obračunsko obdobje za : %s ni določeno."
#. module: account
#: help:account.tax,price_include:0
@ -5518,7 +5527,7 @@ msgstr "Leto"
#. module: account
#: help:account.invoice,sent:0
msgid "It indicates that the invoice has been sent."
msgstr ""
msgstr "Oznaka , da je bil račun poslan."
#. module: account
#: view:account.payment.term.line:0
@ -5729,7 +5738,7 @@ msgstr "account.installer"
#. module: account
#: view:account.invoice:0
msgid "Recompute taxes and total"
msgstr ""
msgstr "Ponovni izračun davkov in salda"
#. module: account
#: code:addons/account/account.py:1097
@ -5869,7 +5878,7 @@ msgstr ""
#. module: account
#: view:cash.box.in:0
msgid "Fill in this form if you put money in the cash register:"
msgstr ""
msgstr "Izpolnite ta obrazec za polog gotovine:"
#. module: account
#: field:account.payment.term.line,value_amount:0
@ -6055,7 +6064,7 @@ msgstr "Zapri z odpisom"
#. module: account
#: constraint:account.move.line:0
msgid "You cannot create journal items on an account of type view."
msgstr ""
msgstr "No možno knjižiti na konto vrste \"Pogled\"."
#. module: account
#: selection:account.payment.term.line,value:0
@ -6388,7 +6397,7 @@ msgstr "Podjetje"
#. module: account
#: help:account.config.settings,group_multi_currency:0
msgid "Allows you multi currency environment"
msgstr ""
msgstr "Več valutno poslovanje"
#. module: account
#: view:account.subscription:0
@ -6647,7 +6656,7 @@ msgstr "Terjatev"
#. module: account
#: constraint:account.move.line:0
msgid "You cannot create journal items on closed account."
msgstr ""
msgstr "Ni možno knjižiti na konto,ki je zaprt."
#. module: account
#: code:addons/account/account_invoice.py:594
@ -6718,7 +6727,7 @@ msgstr "Odstotek"
#. module: account
#: selection:account.config.settings,tax_calculation_rounding_method:0
msgid "Round globally"
msgstr ""
msgstr "Skupno zaokroževanje"
#. module: account
#: selection:account.report.general.ledger,sortby:0
@ -6998,7 +7007,7 @@ msgstr "Konto vrste stroškov"
#. module: account
#: sql_constraint:account.tax:0
msgid "Tax Name must be unique per company!"
msgstr ""
msgstr "Ime davka mora biti enolično"
#. module: account
#: view:account.bank.statement:0
@ -7218,7 +7227,7 @@ msgstr "Dnevniki"
#: code:addons/account/wizard/account_invoice_refund.py:147
#, python-format
msgid "No period found on the invoice."
msgstr ""
msgstr "Ni obračunskega obdobja"
#. module: account
#: help:account.partner.ledger,page_split:0
@ -7263,7 +7272,7 @@ msgstr "Vse postavke"
#. module: account
#: constraint:account.move.reconcile:0
msgid "You can only reconcile journal items with the same partner."
msgstr ""
msgstr "Postavke se lahko usklajujejo samo na istem partnerju."
#. module: account
#: view:account.journal.select:0
@ -7492,7 +7501,7 @@ msgstr "Davki:"
msgid ""
"You can not delete an invoice which is not cancelled. You should refund it "
"instead."
msgstr ""
msgstr "Preklicanega računa ni možno brisati."
#. module: account
#: help:account.tax,amount:0
@ -7603,7 +7612,7 @@ msgstr "Združeno po letu raćuna"
#. module: account
#: field:account.config.settings,purchase_tax_rate:0
msgid "Purchase tax (%)"
msgstr ""
msgstr "Nabavni davek (%)"
#. module: account
#: help:res.partner,credit:0
@ -7702,7 +7711,7 @@ msgstr "cash.box.out"
#. module: account
#: help:account.config.settings,currency_id:0
msgid "Main currency of the company."
msgstr ""
msgstr "Glavna valuta"
#. module: account
#: model:ir.ui.menu,name:account.menu_finance_reports
@ -8211,7 +8220,7 @@ msgstr "Postavka blagajne"
#. module: account
#: field:account.installer,charts:0
msgid "Accounting Package"
msgstr ""
msgstr "Računovodski paket"
#. module: account
#: report:account.third_party_ledger:0
@ -8922,7 +8931,7 @@ msgstr "Koda konta že obstaja!"
#: help:product.category,property_account_expense_categ:0
#: help:product.template,property_account_expense:0
msgid "This account will be used to value outgoing stock using cost price."
msgstr ""
msgstr "Konto porabe po nabavni ceni."
#. module: account
#: view:account.invoice:0
@ -8960,7 +8969,7 @@ msgstr "Dovoljeni konti (prazno - ni kontrole)"
#. module: account
#: field:account.config.settings,sale_tax_rate:0
msgid "Sales tax (%)"
msgstr ""
msgstr "Prodajni davek (%)"
#. module: account
#: model:ir.actions.act_window,name:account.action_account_analytic_account_tree2
@ -9226,7 +9235,7 @@ msgstr ""
#: code:addons/account/account.py:633
#, python-format
msgid "You cannot deactivate an account that contains journal items."
msgstr ""
msgstr "Ni možno de aktivirati konta , ki ima vknjižbe"
#. module: account
#: selection:account.tax,applicable_type:0
@ -9340,7 +9349,7 @@ msgstr "Ustvari račun"
#. module: account
#: model:ir.actions.act_window,name:account.action_account_configuration_installer
msgid "Configure Accounting Data"
msgstr ""
msgstr "Nastavitve računovodstva"
#. module: account
#: field:wizard.multi.charts.accounts,purchase_tax_rate:0
@ -9619,7 +9628,7 @@ msgstr "Filter"
#: field:account.cashbox.line,number_closing:0
#: field:account.cashbox.line,number_opening:0
msgid "Number of Units"
msgstr ""
msgstr "Število enot"
#. module: account
#: model:process.node,note:account.process_node_manually0
@ -9644,12 +9653,12 @@ msgstr "Prenos"
#: code:addons/account/wizard/account_period_close.py:51
#, python-format
msgid "Invalid Action!"
msgstr ""
msgstr "Napačno dejanje!"
#. module: account
#: view:account.bank.statement:0
msgid "Date / Period"
msgstr ""
msgstr "Datum/Obdobje"
#. module: account
#: report:account.central.journal:0
@ -9672,7 +9681,7 @@ msgstr ""
#. module: account
#: report:account.overdue:0
msgid "There is nothing due with this customer."
msgstr ""
msgstr "Ni zapadlih postavk za tega kupca."
#. module: account
#: help:account.tax,account_paid_id:0
@ -9731,7 +9740,7 @@ msgstr "Skupno poročilo"
#: field:account.config.settings,default_sale_tax:0
#: field:account.config.settings,sale_tax:0
msgid "Default sale tax"
msgstr ""
msgstr "Privzeti prodajni davek"
#. module: account
#: report:account.overdue:0
@ -9818,7 +9827,7 @@ msgstr "Konec obdobja"
#. module: account
#: model:account.account.type,name:account.account_type_expense_view1
msgid "Expense View"
msgstr ""
msgstr "Stroški"
#. module: account
#: field:account.move.line,date_maturity:0
@ -9905,7 +9914,7 @@ msgstr "Osnutki računov"
#: view:cash.box.in:0
#: model:ir.actions.act_window,name:account.action_cash_box_in
msgid "Put Money In"
msgstr ""
msgstr "Polog gotovine"
#. module: account
#: selection:account.account.type,close_method:0
@ -9957,7 +9966,7 @@ msgstr "Iz analitičnih kontov"
#. module: account
#: view:account.installer:0
msgid "Configure your Fiscal Year"
msgstr ""
msgstr "Nastavitve poslovnega leta"
#. module: account
#: field:account.period,name:0
@ -10497,7 +10506,7 @@ msgstr "Konti brez vknjižb ? "
#: code:addons/account/account_move_line.py:1046
#, python-format
msgid "Unable to change tax!"
msgstr ""
msgstr "Ni možno spremeniti davka!"
#. module: account
#: constraint:account.bank.statement:0

16
addons/account/i18n/zh_CN.po
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-14 15:57+0000\n"
"Last-Translator: digitalsatori <digisatori@gmail.com>\n"
"PO-Revision-Date: 2012-12-19 06:55+0000\n"
"Last-Translator: Wei \"oldrev\" Li <oldrev@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-15 05:05+0000\n"
"X-Generator: Launchpad (build 16372)\n"
"X-Launchpad-Export-Date: 2012-12-20 04:45+0000\n"
"X-Generator: Launchpad (build 16378)\n"
#. module: account
#: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@ -1551,7 +1551,7 @@ msgstr "应收科目"
#: code:addons/account/account.py:767
#, python-format
msgid "%s (copy)"
msgstr ""
msgstr "%s (副本)"
#. module: account
#: selection:account.balance.report,display_account:0
@ -2169,6 +2169,12 @@ msgid ""
" </p>\n"
" "
msgstr ""
"<p class=\"oe_view_nocontent_create\">\n"
" 单击以便一张新的供应商发票。\n"
" </p><p>\n"
" 你可以根据从供应商处所采购或收到的货物来管理发票。OpenERP也可以根据采购订单或者收货自动生成一张草稿状态的发票。\n"
" </p>\n"
" "
#. module: account
#: sql_constraint:account.move.line:0

12
addons/account/installer.py
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):

2
addons/account/ir_sequence.py
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'

3
addons/account/partner.py
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'

1
addons/account/process/supplier_invoice_process.xml
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>

2
addons/account/product.py
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"

3
addons/account/project/project.py
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'

2
addons/account/project/report/account_journal.py
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

3
addons/account/project/report/analytic_balance.py
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):

5
addons/account/project/report/analytic_journal.py
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

5
addons/account/project/report/cost_ledger.py
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):

5
addons/account/project/report/inverted_analytic_balance.py
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):

4
addons/account/project/report/quantity_cost_ledger.py
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):

2
addons/account/project/wizard/account_analytic_balance_report.py
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'

2
addons/account/project/wizard/account_analytic_chart.py
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'

2
addons/account/project/wizard/account_analytic_cost_ledger_for_journal_report.py
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'

3
addons/account/project/wizard/account_analytic_cost_ledger_report.py
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'

2
addons/account/project/wizard/account_analytic_inverted_balance_report.py
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'

2
addons/account/project/wizard/account_analytic_journal_report.py
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'

4
addons/account/project/wizard/project_account_analytic_line.py
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"

2
addons/account/report/account_aged_partner_balance.py
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):

4
addons/account/report/account_analytic_entries_report.py
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"

2
addons/account/report/account_balance.py
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):

2
addons/account/report/account_central_journal.py
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

6
addons/account/report/account_entries_report.py
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"

4
addons/account/report/account_financial_report.py
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):

2
addons/account/report/account_general_journal.py
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):

2
addons/account/report/account_general_ledger.py
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):

6
addons/account/report/account_invoice_report.py
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"

2
addons/account/report/account_journal.py
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):

4
addons/account/report/account_partner_balance.py
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):

4
addons/account/report/account_partner_ledger.py
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):

2
addons/account/report/account_print_invoice.py
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):

4
addons/account/report/account_print_overdue.py
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):

6
addons/account/report/account_report.py
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')

2
addons/account/report/account_tax_report.py
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'

6
addons/account/report/account_treasury_report.py
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"

4
addons/account/report/common_report_header.py
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):

6
addons/account/res_config.py
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'

2
addons/account/res_currency.py
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"""

4
addons/account/security/account_security.xml
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"/>

4
addons/account/static/src/css/account_move_line_quickadd.css Normal file
View File

@ -0,0 +1,4 @@
.openerp .oe_vm_switch_tree_account_move_line_quickadd:after {
padding: 2px;
content: "i";
}

2
addons/account/static/src/js/account_move_reconciliation.js
View File

@ -103,7 +103,7 @@ openerp.account = function (instance) {
action_id: result[1],
context: additional_context
}).done(function (result) {
result.context = _.extend(result.context || {}, additional_context);
result.context = instance.web.pyeval.eval('contexts', [result.context, additional_context]);
result.flags = result.flags || {};
result.flags.new_window = true;
return self.do_action(result, {

6
addons/account/test/account_bank_statement.yml
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

4
addons/account/wizard/account_automatic_reconcile.py
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'

4
addons/account/wizard/account_change_currency.py
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'

2
addons/account/wizard/account_chart.py
View File

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

2
addons/account/wizard/account_financial_report.py
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"

4
addons/account/wizard/account_fiscalyear_close.py
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):
"""

4
addons/account/wizard/account_fiscalyear_close_state.py
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):
"""

8
addons/account/wizard/account_invoice_refund.py
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):
@ -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})

8
addons/account/wizard/account_invoice_state.py
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):
"""

2
addons/account/wizard/account_journal_select.py
View File

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

4
addons/account/wizard/account_move_bank_reconcile.py
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):
"""

4
addons/account/wizard/account_move_line_reconcile_select.py
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"

2
addons/account/wizard/account_move_line_select.py
View File

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

2
addons/account/wizard/account_move_line_unreconcile_select.py
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"

4
addons/account/wizard/account_open_closed_fiscalyear.py
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"

4
addons/account/wizard/account_period_close.py
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):
"""

6
addons/account/wizard/account_reconcile.py
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):
"""

2
addons/account/wizard/account_reconcile_partner_process.py
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'

2
addons/account/wizard/account_report_account_balance.py
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"

4
addons/account/wizard/account_report_aged_partner_balance.py
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'

2
addons/account/wizard/account_report_central_journal.py
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'

10
addons/account/wizard/account_report_common.py
View File

@ -22,9 +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"
@ -119,12 +119,16 @@ class account_common_report(osv.osv_memory):
return accounts and accounts[0] or False
def _get_fiscalyear(self, cr, uid, context=None):
if context is None:
context = {}
now = time.strftime('%Y-%m-%d')
company_id = False
ids = context.get('active_ids', [])
domain = [('date_start', '<', now), ('date_stop', '>', now)]
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)
domain += [('company_id', '=', company_id)]
fiscalyears = self.pool.get('account.fiscalyear').search(cr, uid, domain, limit=1)
return fiscalyears and fiscalyears[0] or False
def _get_all_journal(self, cr, uid, context=None):

2
addons/account/wizard/account_report_common_account.py
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'

2
addons/account/wizard/account_report_common_journal.py
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'

2
addons/account/wizard/account_report_common_partner.py
View File

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

2
addons/account/wizard/account_report_general_journal.py
View File

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

2
addons/account/wizard/account_report_general_ledger.py
View File

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

2
addons/account/wizard/account_report_partner_balance.py
View File

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

2
addons/account/wizard/account_report_partner_ledger.py
View File

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

2
addons/account/wizard/account_report_print_journal.py
View File

@ -19,7 +19,7 @@
#
##############################################################################
from osv import osv, fields
from openerp.osv import fields, osv
from lxml import etree
class account_print_journal(osv.osv_memory):

6
addons/account/wizard/account_state_open.py
View File

@ -18,10 +18,10 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
##############################################################################
from osv import osv
from openerp.osv import osv
import netsvc
from tools.translate import _
from openerp import netsvc
from openerp.tools.translate import _
class account_state_open(osv.osv_memory):
_name = 'account.state.open'

2
addons/account/wizard/account_subscription_generate.py
View File

@ -21,7 +21,7 @@
import time
from osv import fields, osv
from openerp.osv import fields, osv
class account_subscription_generate(osv.osv_memory):

2
addons/account/wizard/account_tax_chart.py
View File

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

2
addons/account/wizard/account_unreconcile.py
View File

@ -19,7 +19,7 @@
#
##############################################################################
from osv import osv
from openerp.osv import osv
class account_unreconcile(osv.osv_memory):
_name = "account.unreconcile"

10
addons/account/wizard/account_unreconcile_view.xml
View File

@ -6,9 +6,9 @@
<field name="name">Unreconcile Entries</field>
<field name="model">account.unreconcile</field>
<field name="arch" type="xml">
<form string="Unreconciliation" version="7.0">
<separator string="Unreconciliate Transactions"/>
<label string="If you unreconciliate transactions, you must also verify all the actions that are linked to those transactions because they will not be disabled"/>
<form string="Unreconcile" version="7.0">
<separator string="Unreconcile Transactions"/>
<label string="If you unreconcile transactions, you must also verify all the actions that are linked to those transactions because they will not be disabled"/>
<footer>
<button string="Unreconcile" name="trans_unrec" type="object" default_focus="1" class="oe_highlight"/>
or
@ -44,8 +44,8 @@
<header>
<button icon="gtk-ok" string="Unreconcile" name="trans_unrec_reconcile" type="object" default_focus="1" class="oe_highlight" />
</header>
<separator string="Unreconciliation Transactions"/>
<label string="If you unreconciliate transactions, you must also verify all the actions that are linked to those transactions because they will not be disable"/>
<separator string="Unreconcile Transactions"/>
<label string="If you unreconcile transactions, you must also verify all the actions that are linked to those transactions because they will not be disable"/>
</form>
</field>
</record>

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