[MERGE] trunk
bzr revid: qdp-launchpad@openerp.com-20121218134118-ixggega7sumgv6gq
This commit is contained in:
commit
a513344bc1
|
@ -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__)
|
||||
|
||||
|
|
|
@ -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'
|
||||
|
|
|
@ -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"
|
||||
|
|
|
@ -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):
|
||||
|
|
|
@ -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):
|
||||
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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):
|
||||
|
|
|
@ -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"
|
||||
|
|
|
@ -1137,7 +1137,7 @@
|
|||
<separator/>
|
||||
<filter string="Next Partner to Reconcile" help="Next Partner Entries to reconcile" name="next_partner" context="{'next_partner_only': 1}" icon="terp-gtk-jump-to-ltr" domain="[('account_id.reconcile','=',True),('reconcile_id','=',False)]"/>
|
||||
<field name="move_id" string="Number (Move)"/>
|
||||
<field name="account_id" filter_domain="['|', ('name', 'ilike', self), ('code', 'ilike', self)]"/>
|
||||
<field name="account_id"/>
|
||||
<field name="partner_id"/>
|
||||
<field name="journal_id" context="{'journal_id':self}" widget="selection"/> <!-- it's important to keep widget='selection' in this filter viewbecause without that the value passed in the context is not the ID but the textual value (name) of the selected journal -->
|
||||
<field name="period_id" context="{'period_id':self}" widget="selection"/> <!-- it's important to keep the widget='selection' in this field, for the same reason as explained above -->
|
||||
|
@ -2243,8 +2243,8 @@
|
|||
<field name="state" widget="statusbar" nolabel="1" statusbar_visible="draft,confirm"/>
|
||||
</header>
|
||||
<sheet string="Statement">
|
||||
<label for="name" class="oe_edit_only" attrs="{'invisible':[('name','=','/')]}"/>
|
||||
<h1><field name="name" class="oe_inline" attrs="{'invisible':[('name','=','/')]}"/></h1>
|
||||
<label for="name" class="oe_edit_only"/>
|
||||
<h1><field name="name" class="oe_inline"/></h1>
|
||||
<group>
|
||||
<group>
|
||||
<field name="journal_id" on_change="onchange_journal_id(journal_id)" widget="selection" domain="[('type', '=', 'cash')]" />
|
||||
|
|
|
@ -19,7 +19,7 @@
|
|||
#
|
||||
##############################################################################
|
||||
|
||||
from osv import fields, osv
|
||||
from openerp.osv import fields, osv
|
||||
|
||||
class res_company(osv.osv):
|
||||
_inherit = "res.company"
|
||||
|
|
|
@ -18,9 +18,10 @@
|
|||
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
#
|
||||
##############################################################################
|
||||
from openerp.osv import osv, fields
|
||||
from openerp.addons.edi import EDIMixin
|
||||
|
||||
from openerp.osv import osv
|
||||
from edi import EDIMixin
|
||||
from urllib import urlencode
|
||||
|
||||
INVOICE_LINE_EDI_STRUCT = {
|
||||
'name': True,
|
||||
|
@ -258,6 +259,28 @@ class account_invoice(osv.osv, EDIMixin):
|
|||
pass
|
||||
return action
|
||||
|
||||
def _edi_paypal_url(self, cr, uid, ids, field, arg, context=None):
|
||||
res = dict.fromkeys(ids, False)
|
||||
for inv in self.browse(cr, uid, ids, context=context):
|
||||
if inv.type == 'out_invoice' and inv.company_id.paypal_account:
|
||||
params = {
|
||||
"cmd": "_xclick",
|
||||
"business": inv.company_id.paypal_account,
|
||||
"item_name": inv.company_id.name + " Invoice " + inv.number,
|
||||
"invoice": inv.number,
|
||||
"amount": inv.residual,
|
||||
"currency_code": inv.currency_id.name,
|
||||
"button_subtype": "services",
|
||||
"no_note": "1",
|
||||
"bn": "OpenERP_Invoice_PayNow_" + inv.currency_id.name,
|
||||
}
|
||||
res[inv.id] = "https://www.paypal.com/cgi-bin/webscr?" + urlencode(params)
|
||||
return res
|
||||
|
||||
_columns = {
|
||||
'paypal_url': fields.function(_edi_paypal_url, type='char', string='Paypal Url'),
|
||||
}
|
||||
|
||||
|
||||
class account_invoice_line(osv.osv, EDIMixin):
|
||||
_inherit='account.invoice.line'
|
||||
|
|
|
@ -33,7 +33,7 @@
|
|||
<field name="body_html"><![CDATA[
|
||||
<div style="font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-serif; font-size: 12px; color: rgb(34, 34, 34); background-color: #FFF; ">
|
||||
|
||||
<p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name or ''},</p>
|
||||
<p>Hello ${object.partner_id.name},</p>
|
||||
|
||||
<p>A new invoice is available for you: </p>
|
||||
|
||||
|
@ -50,20 +50,10 @@
|
|||
% endif
|
||||
</p>
|
||||
|
||||
% if object.company_id.paypal_account and object.type in ('out_invoice'):
|
||||
<%
|
||||
comp_name = quote(object.company_id.name)
|
||||
inv_number = quote(object.number)
|
||||
paypal_account = quote(object.company_id.paypal_account)
|
||||
inv_amount = quote(str(object.residual))
|
||||
cur_name = quote(object.currency_id.name)
|
||||
paypal_url = "https://www.paypal.com/cgi-bin/webscr?cmd=_xclick&business=%s&item_name=%s%%20Invoice%%20%s&" \
|
||||
"invoice=%s&amount=%s&currency_code=%s&button_subtype=services&no_note=1&bn=OpenERP_Invoice_PayNow_%s" % \
|
||||
(paypal_account,comp_name,inv_number,inv_number,inv_amount,cur_name,cur_name)
|
||||
%>
|
||||
% if object.paypal_url:
|
||||
<br/>
|
||||
<p>It is also possible to directly pay with Paypal:</p>
|
||||
<a style="margin-left: 120px;" href="${paypal_url}">
|
||||
<a style="margin-left: 120px;" href="${object.paypal_url}">
|
||||
<img class="oe_edi_paypal_button" src="https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif"/>
|
||||
</a>
|
||||
% endif
|
||||
|
|
|
@ -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 23:17+0000\n"
|
||||
"PO-Revision-Date: 2012-12-17 21:28+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-17 04:46+0000\n"
|
||||
"X-Launchpad-Export-Date: 2012-12-18 05:00+0000\n"
|
||||
"X-Generator: Launchpad (build 16372)\n"
|
||||
|
||||
#. module: account
|
||||
|
@ -11915,8 +11915,8 @@ msgid ""
|
|||
"This label will be displayed on report to show the balance computed for the "
|
||||
"given comparison filter."
|
||||
msgstr ""
|
||||
"Dieser Text wird am Bericht gedruckt um den Saldo für den entsprechenden "
|
||||
"Vergleichsfilter zu berschreiben"
|
||||
"Dieser Text wird am Bericht gedruckt, um den Saldo für den entsprechenden "
|
||||
"Vergleichsfilter zu beschreiben"
|
||||
|
||||
#. module: account
|
||||
#: selection:account.config.settings,tax_calculation_rounding_method:0
|
||||
|
|
|
@ -8,14 +8,14 @@ msgstr ""
|
|||
"Project-Id-Version: openobject-addons\n"
|
||||
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
|
||||
"POT-Creation-Date: 2012-12-03 16:02+0000\n"
|
||||
"PO-Revision-Date: 2012-05-10 17:16+0000\n"
|
||||
"Last-Translator: Raphael Collet (OpenERP) <Unknown>\n"
|
||||
"PO-Revision-Date: 2012-12-17 13:50+0000\n"
|
||||
"Last-Translator: Normunds (Alistek) <Unknown>\n"
|
||||
"Language-Team: Latvian <lv@li.org>\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
"X-Launchpad-Export-Date: 2012-12-04 05:23+0000\n"
|
||||
"X-Generator: Launchpad (build 16335)\n"
|
||||
"X-Launchpad-Export-Date: 2012-12-18 05:00+0000\n"
|
||||
"X-Generator: Launchpad (build 16372)\n"
|
||||
|
||||
#. module: account
|
||||
#: model:process.transition,name:account.process_transition_supplierreconcilepaid0
|
||||
|
@ -460,7 +460,7 @@ msgstr ""
|
|||
#: field:account.tax.template,chart_template_id:0
|
||||
#: field:wizard.multi.charts.accounts,chart_template_id:0
|
||||
msgid "Chart Template"
|
||||
msgstr "Grafika Sagatave"
|
||||
msgstr "Kontu Plāna Sagatave"
|
||||
|
||||
#. module: account
|
||||
#: help:account.config.settings,tax_calculation_rounding_method:0
|
||||
|
|
|
@ -7,13 +7,13 @@ 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-15 10:47+0000\n"
|
||||
"PO-Revision-Date: 2012-12-17 14:28+0000\n"
|
||||
"Last-Translator: Harjan Talen <harjantalen@gmail.com>\n"
|
||||
"Language-Team: \n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
"X-Launchpad-Export-Date: 2012-12-16 04:47+0000\n"
|
||||
"X-Launchpad-Export-Date: 2012-12-18 05:00+0000\n"
|
||||
"X-Generator: Launchpad (build 16372)\n"
|
||||
|
||||
#, python-format
|
||||
|
@ -808,6 +808,9 @@ msgid ""
|
|||
"lines for refunds. Leave empty if you don't want to use an analytic account "
|
||||
"on the invoice tax lines by default."
|
||||
msgstr ""
|
||||
"Selecteer de kostenplaats rekening welke standaard gebruikt wordt voor "
|
||||
"belastingregels op creditfacturen. Laat deze leeg wanneer geen gebruikt "
|
||||
"gemaakt wordt van kostenplaatsen."
|
||||
|
||||
#. module: account
|
||||
#: view:account.account:0
|
||||
|
@ -1227,6 +1230,17 @@ msgid ""
|
|||
" </p>\n"
|
||||
" "
|
||||
msgstr ""
|
||||
"<p class=\"oe_view_nocontent_create\">\n"
|
||||
" Klik om een grootboekkaar toe te voegen.\n"
|
||||
" </p><p>\n"
|
||||
" Bij transacties in meerdere valuta kan een valutaresultaat "
|
||||
"tot\n"
|
||||
" stand komen. Dit menu geeft het actuele valutaresultaat aan\n"
|
||||
" tegen de huidige koers. Dit wordt alleen aangegeven bij "
|
||||
"groot-\n"
|
||||
" boekkaarten waar meerdere valuta aan gekoppeld zijn.\n"
|
||||
" </p>\n"
|
||||
" "
|
||||
|
||||
#. module: account
|
||||
#: field:account.bank.accounts.wizard,acc_name:0
|
||||
|
@ -1236,7 +1250,7 @@ msgstr "Rekeningnaam."
|
|||
#. module: account
|
||||
#: field:account.journal,with_last_closing_balance:0
|
||||
msgid "Opening With Last Closing Balance"
|
||||
msgstr ""
|
||||
msgstr "Openen met het laatst afgesloten saldo."
|
||||
|
||||
#. module: account
|
||||
#: help:account.tax.code,notprintable:0
|
||||
|
@ -1646,6 +1660,8 @@ msgid ""
|
|||
"There is no default debit account defined \n"
|
||||
"on journal \"%s\"."
|
||||
msgstr ""
|
||||
"Er is geen standaard debet grootboekrekening gedefinieerd in dit dagboek: "
|
||||
"\"%s\"."
|
||||
|
||||
#. module: account
|
||||
#: view:account.tax:0
|
||||
|
@ -1680,6 +1696,8 @@ msgid ""
|
|||
"There is nothing to reconcile. All invoices and payments\n"
|
||||
" have been reconciled, your partner balance is clean."
|
||||
msgstr ""
|
||||
"Er zijn geen facturen om af te letteren. Alle facturen en betalingen zijn "
|
||||
"afgeletterd."
|
||||
|
||||
#. module: account
|
||||
#: field:account.chart.template,code_digits:0
|
||||
|
@ -13651,9 +13669,6 @@ msgstr ""
|
|||
#~ "U kunt het bedrijf niet meer veranderen in dit dagboek omdat er inmiddels al "
|
||||
#~ "gerelateerde transacties op zijn geboekt."
|
||||
|
||||
#~ msgid "Reference UoM"
|
||||
#~ msgstr "Referentie meeteenheid"
|
||||
|
||||
#~ msgid "Unreconciliate transactions"
|
||||
#~ msgstr "Afletteren transactief ongedaan maken"
|
||||
|
||||
|
@ -15278,3 +15293,6 @@ msgstr ""
|
|||
#~ "OpenERP geeft u de mogelijkheid om, vanuit dit menu, een belastingweergave "
|
||||
#~ "te beheren. Het is mogelijk om numerieke en alfanumerieke belastingrubrieken "
|
||||
#~ "te gebruiken."
|
||||
|
||||
#~ msgid "Reference UoM"
|
||||
#~ msgstr "Referentie maateenheid"
|
||||
|
|
|
@ -7,13 +7,13 @@ 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 00:45+0000\n"
|
||||
"PO-Revision-Date: 2012-12-17 16:09+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-17 04:46+0000\n"
|
||||
"X-Launchpad-Export-Date: 2012-12-18 05:01+0000\n"
|
||||
"X-Generator: Launchpad (build 16372)\n"
|
||||
|
||||
#. module: account
|
||||
|
@ -179,7 +179,7 @@ msgid ""
|
|||
"You have to set the 'End of Year Entries Journal' for this Fiscal Year "
|
||||
"which is set after generating opening entries from 'Generate Opening "
|
||||
"Entries'."
|
||||
msgstr ""
|
||||
msgstr "Nastavite morate dnevnik za zaključek leta."
|
||||
|
||||
#. module: account
|
||||
#: field:account.fiscal.position.account,account_src_id:0
|
||||
|
@ -323,6 +323,10 @@ msgid ""
|
|||
" </p>\n"
|
||||
" "
|
||||
msgstr ""
|
||||
"<p class=\"oe_view_nocontent_create\">\n"
|
||||
" Tu lahko kreirate dobropise kupcem\n"
|
||||
" </p><p>\n"
|
||||
" "
|
||||
|
||||
#. module: account
|
||||
#: help:account.installer,charts:0
|
||||
|
@ -339,7 +343,7 @@ msgstr "Neusklajen konto"
|
|||
#. module: account
|
||||
#: field:account.config.settings,module_account_budget:0
|
||||
msgid "Budget management"
|
||||
msgstr ""
|
||||
msgstr "Upravljanje proračuna"
|
||||
|
||||
#. module: account
|
||||
#: view:product.template:0
|
||||
|
@ -381,7 +385,7 @@ msgstr "Junij"
|
|||
#: code:addons/account/wizard/account_automatic_reconcile.py:148
|
||||
#, python-format
|
||||
msgid "You must select accounts to reconcile."
|
||||
msgstr ""
|
||||
msgstr "Izbrati morate konte za usklajevnaje"
|
||||
|
||||
#. module: account
|
||||
#: help:account.config.settings,group_analytic_accounting:0
|
||||
|
@ -453,7 +457,7 @@ msgid ""
|
|||
" This installs the module account_asset. If you do not check "
|
||||
"this box, you will be able to do invoicing & payments,\n"
|
||||
" but not accounting (Journal Items, Chart of Accounts, ...)"
|
||||
msgstr ""
|
||||
msgstr "Vodenje osnovnih sredstev"
|
||||
|
||||
#. module: account
|
||||
#. openerp-web
|
||||
|
@ -482,6 +486,8 @@ msgid ""
|
|||
"should choose 'Round per line' because you certainly want the sum of your "
|
||||
"tax-included line subtotals to be equal to the total amount with taxes."
|
||||
msgstr ""
|
||||
"Če imate davek vključen v prodajno ceno , morate izbrati zaokroževanje na "
|
||||
"vrstico."
|
||||
|
||||
#. module: account
|
||||
#: model:ir.model,name:account.model_wizard_multi_charts_accounts
|
||||
|
@ -549,7 +555,7 @@ msgstr "Nadrejeni element"
|
|||
#. module: account
|
||||
#: help:account.invoice.line,sequence:0
|
||||
msgid "Gives the sequence of this line when displaying the invoice."
|
||||
msgstr ""
|
||||
msgstr "Prikaz zaporednih številk pozicij na računu."
|
||||
|
||||
#. module: account
|
||||
#: field:account.bank.statement,account_id:0
|
||||
|
@ -709,7 +715,7 @@ msgstr "SAJ"
|
|||
#: code:addons/account/account.py:1546
|
||||
#, python-format
|
||||
msgid "Cannot create move with currency different from .."
|
||||
msgstr ""
|
||||
msgstr "Valuta se razlikuje od .."
|
||||
|
||||
#. module: account
|
||||
#: model:email.template,report_name:account.email_template_edi_invoice
|
||||
|
@ -753,7 +759,7 @@ msgid ""
|
|||
"Set the analytic account that will be used by default on the invoice tax "
|
||||
"lines for refunds. Leave empty if you don't want to use an analytic account "
|
||||
"on the invoice tax lines by default."
|
||||
msgstr ""
|
||||
msgstr "Tu lahko nastavite privzeti konto za davek na dobropisih kupcem."
|
||||
|
||||
#. module: account
|
||||
#: view:account.account:0
|
||||
|
@ -806,7 +812,7 @@ msgstr "Izpis računa"
|
|||
msgid ""
|
||||
"Cannot %s invoice which is already reconciled, invoice should be "
|
||||
"unreconciled first. You can only refund this invoice."
|
||||
msgstr ""
|
||||
msgstr "Ni možno %s račun , ki je že zaprt."
|
||||
|
||||
#. module: account
|
||||
#: selection:account.financial.report,display_detail:0
|
||||
|
@ -962,6 +968,10 @@ msgid ""
|
|||
" </p>\n"
|
||||
" "
|
||||
msgstr ""
|
||||
"<p>\n"
|
||||
" Ni postavk.\n"
|
||||
" </p>\n"
|
||||
" "
|
||||
|
||||
#. module: account
|
||||
#: code:addons/account/account.py:1632
|
||||
|
@ -971,6 +981,8 @@ msgid ""
|
|||
" opening/closing fiscal "
|
||||
"year process."
|
||||
msgstr ""
|
||||
"Ne morete odpreti postavk, ki so bile ustvarjene ob avtomatskem "
|
||||
"zaključevanju/odpiranju poslovnega leta."
|
||||
|
||||
#. module: account
|
||||
#: model:ir.actions.act_window,name:account.action_subscription_form_new
|
||||
|
@ -1015,7 +1027,7 @@ msgstr "Dnevnik nabav"
|
|||
msgid ""
|
||||
"You cannot validate this journal entry because account \"%s\" does not "
|
||||
"belong to chart of accounts \"%s\"."
|
||||
msgstr ""
|
||||
msgstr "Konto \"%s\" ne pripada kontnemu načrtu \"%s\"."
|
||||
|
||||
#. module: account
|
||||
#: view:validate.account.move:0
|
||||
|
@ -1033,7 +1045,7 @@ msgstr "Skupni znesek"
|
|||
#. module: account
|
||||
#: help:account.invoice,supplier_invoice_number:0
|
||||
msgid "The reference of this invoice as provided by the supplier."
|
||||
msgstr ""
|
||||
msgstr "Dobaviteljeva številka računa."
|
||||
|
||||
#. module: account
|
||||
#: selection:account.account,type:0
|
||||
|
|
|
@ -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):
|
||||
|
|
|
@ -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'
|
||||
|
|
|
@ -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'
|
||||
|
|
|
@ -19,7 +19,7 @@
|
|||
#
|
||||
##############################################################################
|
||||
|
||||
from osv import fields, osv
|
||||
from openerp.osv import fields, osv
|
||||
|
||||
class product_category(osv.osv):
|
||||
_inherit = "product.category"
|
||||
|
|
|
@ -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'
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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):
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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):
|
||||
|
|
|
@ -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):
|
||||
|
|
|
@ -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):
|
||||
|
|
|
@ -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'
|
||||
|
|
|
@ -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'
|
||||
|
|
|
@ -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'
|
||||
|
|
|
@ -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'
|
||||
|
|
|
@ -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'
|
||||
|
|
|
@ -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'
|
||||
|
|
|
@ -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"
|
||||
|
|
|
@ -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):
|
||||
|
|
|
@ -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"
|
||||
|
|
|
@ -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):
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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"
|
||||
|
|
|
@ -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):
|
||||
|
||||
|
|
|
@ -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):
|
||||
|
||||
|
|
|
@ -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):
|
||||
|
|
|
@ -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"
|
||||
|
|
|
@ -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):
|
||||
|
||||
|
|
|
@ -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):
|
||||
|
|
|
@ -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):
|
||||
|
||||
|
|
|
@ -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):
|
||||
|
|
|
@ -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):
|
||||
|
|
|
@ -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')
|
||||
|
|
|
@ -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'
|
||||
|
|
|
@ -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"
|
||||
|
|
|
@ -19,8 +19,8 @@
|
|||
#
|
||||
##############################################################################
|
||||
|
||||
import pooler
|
||||
from tools.translate import _
|
||||
from openerp import pooler
|
||||
from openerp.tools.translate import _
|
||||
|
||||
class common_report_header(object):
|
||||
|
||||
|
|
|
@ -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'
|
||||
|
|
|
@ -18,7 +18,7 @@
|
|||
#
|
||||
##############################################################################
|
||||
|
||||
from osv import osv
|
||||
from openerp.osv import osv
|
||||
|
||||
"""Inherit res.currency to handle accounting date values when converting currencies"""
|
||||
|
||||
|
|
|
@ -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'
|
||||
|
|
|
@ -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'
|
||||
|
|
|
@ -19,7 +19,7 @@
|
|||
#
|
||||
##############################################################################
|
||||
|
||||
from osv import fields, osv
|
||||
from openerp.osv import fields, osv
|
||||
|
||||
class account_chart(osv.osv_memory):
|
||||
"""
|
||||
|
|
|
@ -19,7 +19,7 @@
|
|||
#
|
||||
##############################################################################
|
||||
|
||||
from osv import fields, osv
|
||||
from openerp.osv import fields, osv
|
||||
|
||||
class accounting_report(osv.osv_memory):
|
||||
_name = "accounting.report"
|
||||
|
|
|
@ -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):
|
||||
"""
|
||||
|
|
|
@ -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):
|
||||
"""
|
||||
|
|
|
@ -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):
|
||||
|
||||
|
|
|
@ -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):
|
||||
"""
|
||||
|
|
|
@ -19,7 +19,7 @@
|
|||
#
|
||||
##############################################################################
|
||||
|
||||
from osv import osv
|
||||
from openerp.osv import osv
|
||||
|
||||
class account_journal_select(osv.osv_memory):
|
||||
"""
|
||||
|
|
|
@ -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):
|
||||
"""
|
||||
|
|
|
@ -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"
|
||||
|
|
|
@ -19,7 +19,7 @@
|
|||
#
|
||||
##############################################################################
|
||||
|
||||
from osv import osv
|
||||
from openerp.osv import osv
|
||||
|
||||
class account_move_line_select(osv.osv_memory):
|
||||
"""
|
||||
|
|
|
@ -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"
|
||||
|
|
|
@ -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"
|
||||
|
|
|
@ -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):
|
||||
"""
|
||||
|
|
|
@ -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):
|
||||
"""
|
||||
|
|
|
@ -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'
|
||||
|
|
|
@ -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"
|
||||
|
|
|
@ -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'
|
||||
|
|
|
@ -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'
|
||||
|
|
|
@ -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"
|
||||
|
|
|
@ -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'
|
||||
|
|
|
@ -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'
|
||||
|
|
|
@ -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'
|
||||
|
|
|
@ -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"
|
||||
|
|
|
@ -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"
|
||||
|
|
|
@ -19,7 +19,7 @@
|
|||
#
|
||||
##############################################################################
|
||||
|
||||
from osv import fields, osv
|
||||
from openerp.osv import fields, osv
|
||||
|
||||
class account_partner_balance(osv.osv_memory):
|
||||
"""
|
||||
|
|
|
@ -19,7 +19,7 @@
|
|||
#
|
||||
##############################################################################
|
||||
|
||||
from osv import fields, osv
|
||||
from openerp.osv import fields, osv
|
||||
|
||||
class account_partner_ledger(osv.osv_memory):
|
||||
"""
|
||||
|
|
|
@ -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):
|
||||
|
|
|
@ -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'
|
||||
|
|
|
@ -21,7 +21,7 @@
|
|||
|
||||
import time
|
||||
|
||||
from osv import fields, osv
|
||||
from openerp.osv import fields, osv
|
||||
|
||||
class account_subscription_generate(osv.osv_memory):
|
||||
|
||||
|
|
|
@ -19,7 +19,7 @@
|
|||
#
|
||||
##############################################################################
|
||||
|
||||
from osv import fields, osv
|
||||
from openerp.osv import fields, osv
|
||||
|
||||
class account_tax_chart(osv.osv_memory):
|
||||
"""
|
||||
|
|
|
@ -19,7 +19,7 @@
|
|||
#
|
||||
##############################################################################
|
||||
|
||||
from osv import osv
|
||||
from openerp.osv import osv
|
||||
|
||||
class account_unreconcile(osv.osv_memory):
|
||||
_name = "account.unreconcile"
|
||||
|
|
|
@ -20,8 +20,8 @@
|
|||
##############################################################################
|
||||
import time
|
||||
|
||||
from osv import fields, osv
|
||||
from tools.translate import _
|
||||
from openerp.osv import fields, osv
|
||||
from openerp.tools.translate import _
|
||||
|
||||
class account_use_model(osv.osv_memory):
|
||||
|
||||
|
|
|
@ -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 validate_account_move(osv.osv_memory):
|
||||
_name = "validate.account.move"
|
||||
|
|
|
@ -19,7 +19,7 @@
|
|||
#
|
||||
##############################################################################
|
||||
|
||||
from osv import osv, fields
|
||||
from openerp.osv import fields, osv
|
||||
|
||||
class account_vat_declaration(osv.osv_memory):
|
||||
_name = 'account.vat.declaration'
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
#!/usr/bin/env python
|
||||
from osv import osv, fields
|
||||
import decimal_precision as dp
|
||||
from tools.translate import _
|
||||
from openerp.osv import fields, osv
|
||||
import openerp.addons.decimal_precision as dp
|
||||
from openerp.tools.translate import _
|
||||
|
||||
class CashBox(osv.osv_memory):
|
||||
_register = False
|
||||
|
|
|
@ -19,11 +19,12 @@
|
|||
#
|
||||
##############################################################################
|
||||
|
||||
from osv import osv, fields
|
||||
from osv.orm import intersect, except_orm
|
||||
import tools.sql
|
||||
from tools.translate import _
|
||||
from decimal_precision import decimal_precision as dp
|
||||
from openerp.osv import osv, fields
|
||||
from openerp.osv.orm import intersect, except_orm
|
||||
import openerp.tools
|
||||
from openerp.tools.translate import _
|
||||
|
||||
from openerp.addons.decimal_precision import decimal_precision as dp
|
||||
|
||||
|
||||
class account_analytic_account(osv.osv):
|
||||
|
@ -518,7 +519,7 @@ class account_analytic_account_summary_user(osv.osv):
|
|||
}
|
||||
|
||||
def init(self, cr):
|
||||
tools.sql.drop_view_if_exists(cr, 'account_analytic_analysis_summary_user')
|
||||
openerp.tools.sql.drop_view_if_exists(cr, 'account_analytic_analysis_summary_user')
|
||||
cr.execute('''CREATE OR REPLACE VIEW account_analytic_analysis_summary_user AS (
|
||||
with mu as
|
||||
(select max(id) as max_user from res_users)
|
||||
|
@ -553,7 +554,7 @@ class account_analytic_account_summary_month(osv.osv):
|
|||
}
|
||||
|
||||
def init(self, cr):
|
||||
tools.sql.drop_view_if_exists(cr, 'account_analytic_analysis_summary_month')
|
||||
openerp.tools.sql.drop_view_if_exists(cr, 'account_analytic_analysis_summary_month')
|
||||
cr.execute('CREATE VIEW account_analytic_analysis_summary_month AS (' \
|
||||
'SELECT ' \
|
||||
'(TO_NUMBER(TO_CHAR(d.month, \'YYYYMM\'), \'999999\') + (d.account_id * 1000000::bigint))::bigint AS id, ' \
|
||||
|
|
|
@ -1,5 +1,4 @@
|
|||
#!/usr/bin/env python
|
||||
from osv import osv
|
||||
from mako.template import Template
|
||||
import time
|
||||
try:
|
||||
|
@ -7,7 +6,8 @@ try:
|
|||
except ImportError:
|
||||
import StringIO
|
||||
|
||||
import tools
|
||||
from openerp import tools
|
||||
from openerp.osv import osv
|
||||
|
||||
MAKO_TEMPLATE = u"""Hello ${user.name},
|
||||
|
||||
|
|
|
@ -7,20 +7,20 @@ msgstr ""
|
|||
"Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
|
||||
"Report-Msgid-Bugs-To: support@openerp.com\n"
|
||||
"POT-Creation-Date: 2012-12-03 16:02+0000\n"
|
||||
"PO-Revision-Date: 2012-12-06 21:29+0000\n"
|
||||
"PO-Revision-Date: 2012-12-17 21:42+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-07 04:35+0000\n"
|
||||
"X-Generator: Launchpad (build 16341)\n"
|
||||
"X-Launchpad-Export-Date: 2012-12-18 05:01+0000\n"
|
||||
"X-Generator: Launchpad (build 16372)\n"
|
||||
|
||||
#. module: account_analytic_analysis
|
||||
#: view:account.analytic.account:0
|
||||
msgid "No order to invoice, create"
|
||||
msgstr ""
|
||||
msgstr "Kein Auftrag abzurechnen, erstelle"
|
||||
|
||||
#. module: account_analytic_analysis
|
||||
#: view:account.analytic.account:0
|
||||
|
@ -30,7 +30,7 @@ msgstr "Gruppierung ..."
|
|||
#. module: account_analytic_analysis
|
||||
#: view:account.analytic.account:0
|
||||
msgid "To Invoice"
|
||||
msgstr "Abrechenbar"
|
||||
msgstr "Abrechnen"
|
||||
|
||||
#. module: account_analytic_analysis
|
||||
#: view:account.analytic.account:0
|
||||
|
@ -47,14 +47,12 @@ msgstr "Verträge in Bearbeitung"
|
|||
msgid ""
|
||||
"If invoice from the costs, this is the date of the latest work or cost that "
|
||||
"have been invoiced."
|
||||
msgstr ""
|
||||
"Falls eine Berechnung auf Basis der Produktionskosten erfolgt, ist dieses "
|
||||
"das Datum der letzten Weiter - Berechnung."
|
||||
msgstr "Datum der letzten Weiterberechnung von Kosten"
|
||||
|
||||
#. module: account_analytic_analysis
|
||||
#: field:account.analytic.account,last_worked_date:0
|
||||
msgid "Date of Last Cost/Work"
|
||||
msgstr "vorheriger Arbeitstag"
|
||||
msgstr "Letzte Aufwandserfassung"
|
||||
|
||||
#. module: account_analytic_analysis
|
||||
#: field:account.analytic.account,ca_to_invoice:0
|
||||
|
@ -167,8 +165,8 @@ msgid ""
|
|||
"Number of time (hours/days) (from journal of type 'general') that can be "
|
||||
"invoiced if you invoice based on analytic account."
|
||||
msgstr ""
|
||||
"verrechenbare Zeiten (Stunden/Tage) vom Journal 'General', wenn die "
|
||||
"Verrechnung auf Analyse Konten beruht"
|
||||
"Abrechenbare Zeit (Stunden/Tage) vom Journaltyp 'Sonstige', wenn Abrechnung "
|
||||
"über die Kostenstelle erfolgt."
|
||||
|
||||
#. module: account_analytic_analysis
|
||||
#: help:account.analytic.account,remaining_hours_to_invoice:0
|
||||
|
@ -178,7 +176,7 @@ msgstr "Berechnungsformel: Maximale Zeit - Abgerechnete Zeit"
|
|||
#. module: account_analytic_analysis
|
||||
#: view:account.analytic.account:0
|
||||
msgid "Expected"
|
||||
msgstr "Geplant"
|
||||
msgstr "Erwartet"
|
||||
|
||||
#. module: account_analytic_analysis
|
||||
#: view:account.analytic.account:0
|
||||
|
@ -186,7 +184,7 @@ msgstr "Geplant"
|
|||
#: field:account_analytic_analysis.summary.user,account_id:0
|
||||
#: model:ir.model,name:account_analytic_analysis.model_account_analytic_account
|
||||
msgid "Analytic Account"
|
||||
msgstr "Analytisches Konto"
|
||||
msgstr "Kostenstelle"
|
||||
|
||||
#. module: account_analytic_analysis
|
||||
#: help:account.analytic.account,theorical_margin:0
|
||||
|
@ -329,7 +327,7 @@ msgstr "Stundenzettel"
|
|||
#: code:addons/account_analytic_analysis/account_analytic_analysis.py:461
|
||||
#, python-format
|
||||
msgid "Sale Order Lines of %s"
|
||||
msgstr ""
|
||||
msgstr "Auftragszeilen von %s"
|
||||
|
||||
#. module: account_analytic_analysis
|
||||
#: view:account.analytic.account:0
|
||||
|
@ -437,13 +435,13 @@ msgid ""
|
|||
"Number of time (hours/days) that can be invoiced plus those that already "
|
||||
"have been invoiced."
|
||||
msgstr ""
|
||||
"Anzahl von Stunden oder Tagen, die verrechnet werden können, inklusiver der "
|
||||
"bereits verrechneten"
|
||||
"Anzahl von Stunden oder Tagen, die zur Abrechnung anstehen inklusive bereits "
|
||||
"abgerechneter Stunden"
|
||||
|
||||
#. module: account_analytic_analysis
|
||||
#: field:account.analytic.account,revenue_per_hour:0
|
||||
msgid "Revenue per Time (real)"
|
||||
msgstr "Erträge je Zeiteinheit (real)"
|
||||
msgstr "Umsatz pro Stunde"
|
||||
|
||||
#. module: account_analytic_analysis
|
||||
#: model:ir.actions.act_window,help:account_analytic_analysis.action_account_analytic_overdue_all
|
||||
|
|
|
@ -19,7 +19,7 @@
|
|||
#
|
||||
##############################################################################
|
||||
|
||||
from osv import fields, osv
|
||||
from openerp.osv import fields, osv
|
||||
|
||||
class sale_configuration(osv.osv_memory):
|
||||
_inherit = 'sale.config.settings'
|
||||
|
|
|
@ -21,7 +21,7 @@
|
|||
|
||||
import time
|
||||
|
||||
from osv import fields, osv
|
||||
from openerp.osv import fields, osv
|
||||
|
||||
class account_analytic_default(osv.osv):
|
||||
_name = "account.analytic.default"
|
||||
|
|
|
@ -22,9 +22,9 @@
|
|||
import time
|
||||
from lxml import etree
|
||||
|
||||
from osv import fields, osv
|
||||
import tools
|
||||
from tools.translate import _
|
||||
from openerp.osv import fields, osv
|
||||
from openerp import tools
|
||||
from openerp.tools.translate import _
|
||||
|
||||
class one2many_mod2(fields.one2many):
|
||||
def get(self, cr, obj, ids, name, user=None, offset=0, context=None, values=None):
|
||||
|
|
|
@ -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 17:11+0000\n"
|
||||
"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
|
||||
"PO-Revision-Date: 2012-12-17 12:28+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:38+0000\n"
|
||||
"X-Generator: Launchpad (build 16369)\n"
|
||||
"X-Launchpad-Export-Date: 2012-12-18 05:01+0000\n"
|
||||
"X-Generator: Launchpad (build 16372)\n"
|
||||
|
||||
#. module: account_analytic_plans
|
||||
#: field:account.analytic.plan.instance,account4_ids:0
|
||||
|
@ -143,7 +143,7 @@ msgstr "Identificação da Conta 3"
|
|||
#: view:account.crossovered.analytic:0
|
||||
#: view:analytic.plan.create.model:0
|
||||
msgid "or"
|
||||
msgstr ""
|
||||
msgstr "ou"
|
||||
|
||||
#. module: account_analytic_plans
|
||||
#: model:ir.model,name:account_analytic_plans.model_account_analytic_line
|
||||
|
@ -316,7 +316,7 @@ msgstr "Diário analítico"
|
|||
#: code:addons/account_analytic_plans/wizard/analytic_plan_create_model.py:38
|
||||
#, python-format
|
||||
msgid "Please put a name and a code before saving the model."
|
||||
msgstr ""
|
||||
msgstr "Por favor, indique um nome e um código antes de gravar o modelo."
|
||||
|
||||
#. module: account_analytic_plans
|
||||
#: report:account.analytic.account.crossovered.analytic:0
|
||||
|
@ -348,7 +348,7 @@ msgstr "Diário"
|
|||
#: code:addons/account_analytic_plans/account_analytic_plans.py:486
|
||||
#, python-format
|
||||
msgid "You have to define an analytic journal on the '%s' journal."
|
||||
msgstr ""
|
||||
msgstr "Tem de definir um diário analítico para o diário '%s'."
|
||||
|
||||
#. module: account_analytic_plans
|
||||
#: code:addons/account_analytic_plans/account_analytic_plans.py:342
|
||||
|
@ -403,7 +403,7 @@ msgstr "Distribuição analítica"
|
|||
#: code:addons/account_analytic_plans/account_analytic_plans.py:221
|
||||
#, python-format
|
||||
msgid "A model with this name and code already exists."
|
||||
msgstr ""
|
||||
msgstr "Já existe um modelo com estes nome e código."
|
||||
|
||||
#. module: account_analytic_plans
|
||||
#: help:account.analytic.plan.line,root_analytic_id:0
|
||||
|
|
|
@ -21,7 +21,7 @@
|
|||
|
||||
import time
|
||||
|
||||
from report import report_sxw
|
||||
from openerp.report import report_sxw
|
||||
|
||||
class crossovered_analytic(report_sxw.rml_parse):
|
||||
def __init__(self, cr, uid, name, context):
|
||||
|
|
|
@ -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_crossovered_analytic(osv.osv_memory):
|
||||
_name = "account.crossovered.analytic"
|
||||
|
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue