[MERGE] merged with main addons trunk
bzr revid: qdp-launchpad@openerp.com-20111209081905-pq3nm1un3hgiavvz
This commit is contained in:
Quentin (OpenERP)
commit
6b2dd13e96
|
|
@ -19,11 +19,11 @@
|
|||
#
|
||||
##############################################################################
|
||||
{
|
||||
"name" : "Accounting and Financial Management",
|
||||
"name" : "eInvoicing",
|
||||
"version" : "1.1",
|
||||
"author" : "OpenERP SA",
|
||||
"category": 'Accounting & Finance',
|
||||
'complexity': "normal",
|
||||
'complexity': "easy",
|
||||
"description": """
|
||||
Accounting and Financial Management.
|
||||
====================================
|
||||
|
|
|
|||
|
|
@ -790,9 +790,11 @@ class account_journal(osv.osv):
|
|||
result = self.browse(cr, user, ids, context=context)
|
||||
res = []
|
||||
for rs in result:
|
||||
name = rs.name
|
||||
if rs.currency:
|
||||
name = "%s (%s)" % (rs.name, rs.currency.name)
|
||||
currency = rs.currency
|
||||
else:
|
||||
currency = rs.company_id.currency_id
|
||||
name = "%s (%s)" % (rs.name, currency.name)
|
||||
res += [(rs.id, name)]
|
||||
return res
|
||||
|
||||
|
|
@ -1224,7 +1226,7 @@ class account_move(osv.osv):
|
|||
'period_id': fields.many2one('account.period', 'Period', required=True, states={'posted':[('readonly',True)]}),
|
||||
'journal_id': fields.many2one('account.journal', 'Journal', required=True, states={'posted':[('readonly',True)]}),
|
||||
'state': fields.selection([('draft','Unposted'), ('posted','Posted')], 'State', required=True, readonly=True,
|
||||
help='All manually created new journal entry are usually in the state \'Unposted\', but you can set the option to skip that state on the related journal. In that case, they will be behave as journal entries automatically created by the system on document validation (invoices, bank statements...) and will be created in \'Posted\' state.'),
|
||||
help='All manually created new journal entries are usually in the state \'Unposted\', but you can set the option to skip that state on the related journal. In that case, they will be behave as journal entries automatically created by the system on document validation (invoices, bank statements...) and will be created in \'Posted\' state.'),
|
||||
'line_id': fields.one2many('account.move.line', 'move_id', 'Entries', states={'posted':[('readonly',True)]}),
|
||||
'to_check': fields.boolean('To Review', help='Check this box if you are unsure of that journal entry and if you want to note it as \'to be reviewed\' by an accounting expert.'),
|
||||
'partner_id': fields.related('line_id', 'partner_id', type="many2one", relation="res.partner", string="Partner", store=True),
|
||||
|
|
@ -3396,7 +3398,7 @@ class wizard_multi_charts_accounts(osv.osv_memory):
|
|||
'type': line['account_type'] == 'cash' and 'cash' or 'bank',
|
||||
'company_id': company_id,
|
||||
'analytic_journal_id': False,
|
||||
'currency_id': False,
|
||||
'currency': False,
|
||||
'default_credit_account_id': default_account_id,
|
||||
'default_debit_account_id': default_account_id,
|
||||
}
|
||||
|
|
|
|||
|
|
@ -99,7 +99,6 @@ class bank(osv.osv):
|
|||
'type': 'bank',
|
||||
'company_id': bank.company_id.id,
|
||||
'analytic_journal_id': False,
|
||||
'currency_id': False,
|
||||
'default_credit_account_id': acc_bank_id,
|
||||
'default_debit_account_id': acc_bank_id,
|
||||
'view_id': view_id_cash
|
||||
|
|
|
|||
|
|
@ -923,7 +923,6 @@ class account_invoice(osv.osv):
|
|||
'line_id': line,
|
||||
'journal_id': journal_id,
|
||||
'date': date,
|
||||
'type': entry_type,
|
||||
'narration':inv.comment
|
||||
}
|
||||
period_id = inv.period_id and inv.period_id.id or False
|
||||
|
|
@ -1081,7 +1080,8 @@ class account_invoice(osv.osv):
|
|||
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'):
|
||||
line[field] = line.get(field, False) and line[field][0]
|
||||
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)
|
||||
|
|
@ -1209,7 +1209,7 @@ class account_invoice(osv.osv):
|
|||
l2['name'] = name
|
||||
|
||||
lines = [(0, 0, l1), (0, 0, l2)]
|
||||
move = {'ref': ref, 'line_id': lines, 'journal_id': pay_journal_id, 'period_id': period_id, 'date': date, 'type': entry_type}
|
||||
move = {'ref': ref, 'line_id': lines, 'journal_id': pay_journal_id, 'period_id': period_id, 'date': date}
|
||||
move_id = self.pool.get('account.move').create(cr, uid, move, context=context)
|
||||
|
||||
line_ids = []
|
||||
|
|
|
|||
|
|
@ -171,8 +171,8 @@
|
|||
<field name="user_type" select="1"/>
|
||||
<field name="active" groups="base.group_extended" />
|
||||
<newline/>
|
||||
<field name="debit" invisible="context.get('config_invisible', True)"/>
|
||||
<field name="credit" invisible="context.get('config_invisible', True)"/>
|
||||
<field name="debit" invisible="context.get('config_invisible', True)" attrs="{'readonly':[('type','=','view')]}"/>
|
||||
<field name="credit" invisible="context.get('config_invisible', True)" attrs="{'readonly':[('type','=','view')]}"/>
|
||||
<field name="balance" invisible="context.get('config_invisible', True)"/>
|
||||
</group>
|
||||
<notebook colspan="4">
|
||||
|
|
|
|||
|
|
@ -7,14 +7,14 @@ msgstr ""
|
|||
"Project-Id-Version: OpenERP Server 6.0dev\n"
|
||||
"Report-Msgid-Bugs-To: support@openerp.com\n"
|
||||
"POT-Creation-Date: 2011-01-11 11:14+0000\n"
|
||||
"PO-Revision-Date: 2011-12-04 22:14+0000\n"
|
||||
"PO-Revision-Date: 2011-12-08 16:20+0000\n"
|
||||
"Last-Translator: kifcaliph <kifcaliph@hotmail.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: 2011-12-05 05:22+0000\n"
|
||||
"X-Generator: Launchpad (build 14418)\n"
|
||||
"X-Launchpad-Export-Date: 2011-12-09 04:45+0000\n"
|
||||
"X-Generator: Launchpad (build 14450)\n"
|
||||
|
||||
#. module: account
|
||||
#: model:process.transition,name:account.process_transition_supplierreconcilepaid0
|
||||
|
|
@ -152,7 +152,7 @@ msgstr "الاصل"
|
|||
#: view:account.move.line.reconcile:0
|
||||
#: view:account.move.line.reconcile.writeoff:0
|
||||
msgid "Reconcile"
|
||||
msgstr "توافق"
|
||||
msgstr "تسوية"
|
||||
|
||||
#. module: account
|
||||
#: field:account.bank.statement.line,ref:0
|
||||
|
|
@ -209,7 +209,7 @@ msgstr "سالب"
|
|||
#: code:addons/account/wizard/account_move_journal.py:95
|
||||
#, python-format
|
||||
msgid "Journal: %s"
|
||||
msgstr "سجل : %s"
|
||||
msgstr "يومية: %s"
|
||||
|
||||
#. module: account
|
||||
#: help:account.analytic.journal,type:0
|
||||
|
|
@ -230,7 +230,7 @@ msgstr "قوالب الضريبة"
|
|||
#. module: account
|
||||
#: model:ir.model,name:account.model_account_tax
|
||||
msgid "account.tax"
|
||||
msgstr "حساب.ضريبة"
|
||||
msgstr "account.tax"
|
||||
|
||||
#. module: account
|
||||
#: code:addons/account/account.py:901
|
||||
|
|
@ -661,7 +661,7 @@ msgstr "اقفال الفترة"
|
|||
#. module: account
|
||||
#: model:ir.model,name:account.model_account_common_partner_report
|
||||
msgid "Account Common Partner Report"
|
||||
msgstr ""
|
||||
msgstr "تقرير الحساب المشترك للشريك"
|
||||
|
||||
#. module: account
|
||||
#: field:account.fiscalyear.close,period_id:0
|
||||
|
|
@ -908,7 +908,7 @@ msgstr "مرشحات مفصلة..."
|
|||
#. module: account
|
||||
#: model:ir.ui.menu,name:account.menu_account_central_journal
|
||||
msgid "Centralizing Journal"
|
||||
msgstr "مركزية السجل"
|
||||
msgstr "مركزية اليومية"
|
||||
|
||||
#. module: account
|
||||
#: selection:account.journal,type:0
|
||||
|
|
@ -1514,7 +1514,7 @@ msgstr ""
|
|||
#: view:account.bank.statement:0
|
||||
#: field:account.bank.statement,line_ids:0
|
||||
msgid "Statement lines"
|
||||
msgstr ""
|
||||
msgstr "سطور القائمة"
|
||||
|
||||
#. module: account
|
||||
#: model:ir.actions.act_window,help:account.action_bank_statement_tree
|
||||
|
|
@ -1568,7 +1568,7 @@ msgstr "مسلسل السنة المالية"
|
|||
#. module: account
|
||||
#: field:wizard.multi.charts.accounts,seq_journal:0
|
||||
msgid "Separated Journal Sequences"
|
||||
msgstr ""
|
||||
msgstr "مسلسلات اليومية منفصلة"
|
||||
|
||||
#. module: account
|
||||
#: field:account.bank.statement,user_id:0
|
||||
|
|
@ -1601,7 +1601,7 @@ msgstr "الفواتير"
|
|||
#. module: account
|
||||
#: field:account.chart.template,tax_code_root_id:0
|
||||
msgid "Root Tax Code"
|
||||
msgstr ""
|
||||
msgstr "رمز الضريبة الرئيسي"
|
||||
|
||||
#. module: account
|
||||
#: field:account.partner.ledger,initial_balance:0
|
||||
|
|
@ -1612,12 +1612,12 @@ msgstr "ضم الأرصدة المبدئية"
|
|||
#. module: account
|
||||
#: field:account.tax.code,sum:0
|
||||
msgid "Year Sum"
|
||||
msgstr ""
|
||||
msgstr "جمع السنة"
|
||||
|
||||
#. module: account
|
||||
#: model:ir.actions.report.xml,name:account.report_account_voucher_new
|
||||
msgid "Print Voucher"
|
||||
msgstr ""
|
||||
msgstr "طباعة الوثيقة"
|
||||
|
||||
#. module: account
|
||||
#: view:account.change.currency:0
|
||||
|
|
@ -1658,12 +1658,12 @@ msgstr "إذا كان الحقل"
|
|||
#. module: account
|
||||
#: view:res.partner:0
|
||||
msgid "Supplier Debit"
|
||||
msgstr ""
|
||||
msgstr "مورد مدين"
|
||||
|
||||
#. module: account
|
||||
#: help:account.model.line,quantity:0
|
||||
msgid "The optional quantity on entries"
|
||||
msgstr ""
|
||||
msgstr "الكمية الإختيارية علي القيود"
|
||||
|
||||
#. module: account
|
||||
#: model:ir.actions.act_window,name:account.act_account_partner_account_move_all
|
||||
|
|
@ -1679,7 +1679,7 @@ msgstr "يجب إعطاء حساب لقيود الإعدام !"
|
|||
#. module: account
|
||||
#: model:ir.model,name:account.model_account_common_journal_report
|
||||
msgid "Account Common Journal Report"
|
||||
msgstr ""
|
||||
msgstr "تقرير حساب اليومية المشترك"
|
||||
|
||||
#. module: account
|
||||
#: selection:account.partner.balance,display_partner:0
|
||||
|
|
@ -1689,7 +1689,7 @@ msgstr "كل الشركاء"
|
|||
#. module: account
|
||||
#: report:account.move.voucher:0
|
||||
msgid "Ref. :"
|
||||
msgstr ""
|
||||
msgstr "مرجع:"
|
||||
|
||||
#. module: account
|
||||
#: view:account.analytic.chart:0
|
||||
|
|
@ -1720,12 +1720,12 @@ msgstr "هذه الفترات يمكن أن تتداخل."
|
|||
#. module: account
|
||||
#: model:process.node,name:account.process_node_draftstatement0
|
||||
msgid "Draft statement"
|
||||
msgstr ""
|
||||
msgstr "قائمة مؤقتة"
|
||||
|
||||
#. module: account
|
||||
#: view:account.tax:0
|
||||
msgid "Tax Declaration: Credit Notes"
|
||||
msgstr ""
|
||||
msgstr "الإعلان الضريبي: الأوراق الدائنة"
|
||||
|
||||
#. module: account
|
||||
#: code:addons/account/account.py:499
|
||||
|
|
@ -1760,7 +1760,7 @@ msgstr "حساب الإحتياطي و الأرباح و الخسائر"
|
|||
#. module: account
|
||||
#: sql_constraint:account.move.line:0
|
||||
msgid "Wrong credit or debit value in accounting entry !"
|
||||
msgstr ""
|
||||
msgstr "قيمة دائنة أو مدينة خاطئة في القيد المحاسبي !"
|
||||
|
||||
#. module: account
|
||||
#: view:account.invoice.report:0
|
||||
|
|
@ -1798,7 +1798,7 @@ msgstr "قيد يومية"
|
|||
#. module: account
|
||||
#: view:account.tax:0
|
||||
msgid "Tax Declaration: Invoices"
|
||||
msgstr ""
|
||||
msgstr "الإعلان الضريبي: الفواتير"
|
||||
|
||||
#. module: account
|
||||
#: field:account.cashbox.line,subtotal:0
|
||||
|
|
@ -2622,7 +2622,7 @@ msgstr ""
|
|||
#. module: account
|
||||
#: report:account.move.voucher:0
|
||||
msgid "Number:"
|
||||
msgstr ""
|
||||
msgstr "رقم:"
|
||||
|
||||
#. module: account
|
||||
#: selection:account.print.journal,sort_selection:0
|
||||
|
|
@ -2676,7 +2676,7 @@ msgstr ""
|
|||
#. module: account
|
||||
#: field:account.invoice.tax,base_amount:0
|
||||
msgid "Base Code Amount"
|
||||
msgstr ""
|
||||
msgstr "مبلغ الرمز الرئيسي"
|
||||
|
||||
#. module: account
|
||||
#: field:wizard.multi.charts.accounts,sale_tax:0
|
||||
|
|
@ -2760,7 +2760,7 @@ msgstr ""
|
|||
#. module: account
|
||||
#: help:account.journal,user_id:0
|
||||
msgid "The user responsible for this journal"
|
||||
msgstr ""
|
||||
msgstr "الشخص المسؤول لهذه اليومية"
|
||||
|
||||
#. module: account
|
||||
#: view:account.period:0
|
||||
|
|
@ -2805,12 +2805,12 @@ msgstr ""
|
|||
#. module: account
|
||||
#: help:wizard.multi.charts.accounts,code_digits:0
|
||||
msgid "No. of Digits to use for account code"
|
||||
msgstr ""
|
||||
msgstr "أعداد الوحدة لرمز الحساب"
|
||||
|
||||
#. module: account
|
||||
#: field:account.payment.term.line,name:0
|
||||
msgid "Line Name"
|
||||
msgstr ""
|
||||
msgstr "اسم الخط"
|
||||
|
||||
#. module: account
|
||||
#: view:account.fiscalyear:0
|
||||
|
|
@ -2882,7 +2882,7 @@ msgstr "دين العميل"
|
|||
#. module: account
|
||||
#: model:ir.model,name:account.model_account_tax_code_template
|
||||
msgid "Tax Code Template"
|
||||
msgstr ""
|
||||
msgstr "قالب رمز الضريبة"
|
||||
|
||||
#. module: account
|
||||
#: view:account.subscription:0
|
||||
|
|
@ -2902,7 +2902,7 @@ msgstr ""
|
|||
#. module: account
|
||||
#: view:account.tax.template:0
|
||||
msgid "Tax Declaration"
|
||||
msgstr ""
|
||||
msgstr "الإعلان الضريبي"
|
||||
|
||||
#. module: account
|
||||
#: help:account.account,currency_id:0
|
||||
|
|
@ -2932,7 +2932,7 @@ msgstr "إنشاء شجرة حسابات من قالب"
|
|||
#. module: account
|
||||
#: model:ir.model,name:account.model_account_unreconcile_reconcile
|
||||
msgid "Account Unreconcile Reconcile"
|
||||
msgstr ""
|
||||
msgstr "حساب التسوية / إلغاءها"
|
||||
|
||||
#. module: account
|
||||
#: help:account.account.type,close_method:0
|
||||
|
|
@ -3023,7 +3023,7 @@ msgstr "شراء"
|
|||
#: model:ir.actions.act_window,name:account.action_account_installer
|
||||
#: view:wizard.multi.charts.accounts:0
|
||||
msgid "Accounting Application Configuration"
|
||||
msgstr ""
|
||||
msgstr "إعداد برنامج المحاسبة"
|
||||
|
||||
#. module: account
|
||||
#: model:ir.actions.act_window,name:account.open_board_account
|
||||
|
|
@ -3069,7 +3069,7 @@ msgstr ""
|
|||
#. module: account
|
||||
#: report:account.move.voucher:0
|
||||
msgid "Journal:"
|
||||
msgstr ""
|
||||
msgstr "يومية:"
|
||||
|
||||
#. module: account
|
||||
#: view:account.bank.statement:0
|
||||
|
|
@ -3121,7 +3121,7 @@ msgstr "سنة"
|
|||
#. module: account
|
||||
#: report:account.move.voucher:0
|
||||
msgid "Authorised Signatory"
|
||||
msgstr ""
|
||||
msgstr "إمضاء المسؤول"
|
||||
|
||||
#. module: account
|
||||
#: view:validate.account.move.lines:0
|
||||
|
|
@ -3151,7 +3151,7 @@ msgstr "تحويلات"
|
|||
#. module: account
|
||||
#: view:account.payment.term.line:0
|
||||
msgid " value amount: n.a"
|
||||
msgstr ""
|
||||
msgstr " قيمة المبلغ: غير متاحة"
|
||||
|
||||
#. module: account
|
||||
#: view:account.chart:0
|
||||
|
|
@ -3240,7 +3240,7 @@ msgstr "إنشاء حساب"
|
|||
#. module: account
|
||||
#: model:ir.model,name:account.model_report_account_type_sales
|
||||
msgid "Report of the Sales by Account Type"
|
||||
msgstr ""
|
||||
msgstr "تقرير المبيعات حسب نوع الحساب"
|
||||
|
||||
#. module: account
|
||||
#: selection:account.account.type,close_method:0
|
||||
|
|
@ -4389,7 +4389,7 @@ msgstr "عناصر اليومية"
|
|||
#. module: account
|
||||
#: selection:account.account.type,report_type:0
|
||||
msgid "Balance Sheet (Asset Accounts)"
|
||||
msgstr ""
|
||||
msgstr "الميزانية العمومية (حسابات الأصول)"
|
||||
|
||||
#. module: account
|
||||
#: report:account.tax.code.entries:0
|
||||
|
|
@ -4830,7 +4830,7 @@ msgstr "إحصائيات القيود التحليلية"
|
|||
#: model:ir.actions.act_window,name:account.action_account_tax_code_template_form
|
||||
#: model:ir.ui.menu,name:account.menu_action_account_tax_code_template_form
|
||||
msgid "Tax Code Templates"
|
||||
msgstr ""
|
||||
msgstr "قوالب رمز الضريبة"
|
||||
|
||||
#. module: account
|
||||
#: model:ir.model,name:account.model_account_installer
|
||||
|
|
@ -6434,7 +6434,7 @@ msgstr ""
|
|||
#. module: account
|
||||
#: model:process.transition,note:account.process_transition_invoicemanually0
|
||||
msgid "A statement with manual entries becomes a draft statement."
|
||||
msgstr ""
|
||||
msgstr "القائمة ذات القيود اليدوية تصبح مؤقتة."
|
||||
|
||||
#. module: account
|
||||
#: view:account.aged.trial.balance:0
|
||||
|
|
@ -7936,7 +7936,7 @@ msgstr "عملة"
|
|||
#: help:account.bank.statement.line,sequence:0
|
||||
msgid ""
|
||||
"Gives the sequence order when displaying a list of bank statement lines."
|
||||
msgstr ""
|
||||
msgstr "يعطيك ترتيب المسلسل حين يعرض قائمة لسطور كشف حساب البنك"
|
||||
|
||||
#. module: account
|
||||
#: model:process.transition,note:account.process_transition_validentries0
|
||||
|
|
@ -9414,7 +9414,7 @@ msgstr "بيانات الحساب"
|
|||
#. module: account
|
||||
#: view:account.tax.code.template:0
|
||||
msgid "Account Tax Code Template"
|
||||
msgstr ""
|
||||
msgstr "قالب حساب رمز الضريبة"
|
||||
|
||||
#. module: account
|
||||
#: model:process.node,name:account.process_node_manually0
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
|
|
@ -8,15 +8,16 @@
|
|||
<field name="type">tree</field>
|
||||
<field eval="8" name="priority"/>
|
||||
<field name="arch" type="xml">
|
||||
<tree toolbar="1" colors="red:state=='pending';grey:state=='done';blue:type=='view'" string="Analytic Accounts">
|
||||
<field name="code"/>
|
||||
<tree toolbar="1" colors="red:state=='pending';grey:state in ('cancelled','close');blue:type=='view'" string="Analytic Accounts">
|
||||
<field name="complete_name"/>
|
||||
<field name="code"/>
|
||||
<field name="quantity"/>
|
||||
<field name="date"/>
|
||||
<field name="user_id" invisible="1"/>
|
||||
<field name="parent_id" invisible="1"/>
|
||||
<field name="partner_id" invisible="1"/>
|
||||
<field name="state" invisible="1"/>
|
||||
<field name="type" invisible="1"/>
|
||||
</tree>
|
||||
</field>
|
||||
</record>
|
||||
|
|
@ -56,7 +57,7 @@
|
|||
<field name="type">tree</field>
|
||||
<field name="field_parent">child_complete_ids</field>
|
||||
<field name="arch" type="xml">
|
||||
<tree colors="red:state=='pending';grey:state=='done';blue:type=='view'" string="Analytic account" toolbar="1">
|
||||
<tree colors="red:state=='pending';grey:state in ('close','cancelled');blue:type=='view'" string="Analytic account" toolbar="1">
|
||||
<field name="name"/>
|
||||
<field name="code"/>
|
||||
<field name="quantity"/>
|
||||
|
|
|
|||
|
|
@ -194,7 +194,7 @@
|
|||
<para style="terp_tblheader_General_Centre">Origin</para>
|
||||
</td>
|
||||
<td>
|
||||
<para style="terp_tblheader_General_Centre">Your Reference</para>
|
||||
<para style="terp_tblheader_General_Centre">Customer Code</para>
|
||||
</td>
|
||||
</tr>
|
||||
</blockTable>
|
||||
|
|
|
|||
|
|
@ -19,10 +19,10 @@
|
|||
#
|
||||
##############################################################################
|
||||
{
|
||||
"name" : "Accountant Access",
|
||||
"name" : "Accounting and Finance",
|
||||
"version" : "1.1",
|
||||
"author" : "OpenERP SA",
|
||||
"category": 'Hidden',
|
||||
"category": 'Accounting & Finance',
|
||||
'complexity': "normal",
|
||||
"description": """
|
||||
Accounting Access Rights.
|
||||
|
|
@ -45,6 +45,7 @@ user rights to Demo user.
|
|||
'test': [],
|
||||
'installable': True,
|
||||
'active': False,
|
||||
'application': True,
|
||||
'certificate': '00395091383933390541',
|
||||
}
|
||||
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
|
||||
|
|
|
|||
|
|
@ -0,0 +1,37 @@
|
|||
# Azerbaijani translation for openobject-addons
|
||||
# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
|
||||
# This file is distributed under the same license as the openobject-addons package.
|
||||
# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
|
||||
#
|
||||
msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: openobject-addons\n"
|
||||
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
|
||||
"POT-Creation-Date: 2011-01-11 11:14+0000\n"
|
||||
"PO-Revision-Date: 2011-12-06 05:22+0000\n"
|
||||
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
|
||||
"Language-Team: Azerbaijani <az@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: 2011-12-07 04:52+0000\n"
|
||||
"X-Generator: Launchpad (build 14435)\n"
|
||||
|
||||
#. module: account_accountant
|
||||
#: model:ir.module.module,description:account_accountant.module_meta_information
|
||||
msgid ""
|
||||
"\n"
|
||||
"This module gives the admin user the access to all the accounting features "
|
||||
"like the journal\n"
|
||||
"items and the chart of accounts.\n"
|
||||
" "
|
||||
msgstr ""
|
||||
"\n"
|
||||
"Bu modul jurnal yazıları, hesab qrafikləri kimi mühasibat uçotu "
|
||||
"funksiyalarına idarəçilik imkanı verir.\n"
|
||||
" "
|
||||
|
||||
#. module: account_accountant
|
||||
#: model:ir.module.module,shortdesc:account_accountant.module_meta_information
|
||||
msgid "Accountant"
|
||||
msgstr "Mühasib"
|
||||
|
|
@ -21,7 +21,7 @@
|
|||
|
||||
|
||||
{
|
||||
'name' : 'Sales Contract Management',
|
||||
'name' : 'Contracts Management',
|
||||
'version' : '1.1',
|
||||
'category' : 'Sales Management',
|
||||
'complexity': "normal",
|
||||
|
|
@ -46,6 +46,7 @@ user-wise as well as month wise.
|
|||
],
|
||||
'demo_xml' : [],
|
||||
'installable': True,
|
||||
'application': True,
|
||||
'active' : False,
|
||||
'certificate': '0042927202589',
|
||||
}
|
||||
|
|
|
|||
|
|
@ -406,7 +406,7 @@ class account_analytic_account(osv.osv):
|
|||
'ca_theorical': fields.function(_analysis_all, multi='analytic_analysis', type='float', string='Theoretical Revenue',
|
||||
help="Based on the costs you had on the project, what would have been the revenue if all these costs have been invoiced at the normal sale price provided by the pricelist.",
|
||||
digits_compute=dp.get_precision('Account')),
|
||||
'hours_quantity': fields.function(_analysis_all, multi='analytic_analysis', type='float', string='Total Duration',
|
||||
'hours_quantity': fields.function(_analysis_all, multi='analytic_analysis', type='float', string='Total Time',
|
||||
help="Number of time you spent on the analytic account (from timesheet). It computes quantities on all journal of type 'general'."),
|
||||
'last_invoice_date': fields.function(_analysis_all, multi='analytic_analysis', type='date', string='Last Invoice Date',
|
||||
help="If invoice from the costs, this is the date of the latest invoiced."),
|
||||
|
|
@ -419,12 +419,12 @@ class account_analytic_account(osv.osv):
|
|||
'hours_qtt_invoiced': fields.function(_hours_qtt_invoiced_calc, type='float', string='Invoiced Time',
|
||||
help="Number of time (hours/days) that can be invoiced plus those that already have been invoiced."),
|
||||
'remaining_hours': fields.function(_remaining_hours_calc, type='float', string='Remaining Time',
|
||||
help="Computed using the formula: Maximum Duration - Total Time"),
|
||||
help="Computed using the formula: Maximum Time - Total Time"),
|
||||
'remaining_ca': fields.function(_remaining_ca_calc, type='float', string='Remaining Revenue',
|
||||
help="Computed using the formula: Max Invoice Price - Invoiced Amount.",
|
||||
digits_compute=dp.get_precision('Account')),
|
||||
'revenue_per_hour': fields.function(_revenue_per_hour_calc, type='float', string='Revenue per Time (real)',
|
||||
help="Computed using the formula: Invoiced Amount / Total Duration",
|
||||
help="Computed using the formula: Invoiced Amount / Total Time",
|
||||
digits_compute=dp.get_precision('Account')),
|
||||
'real_margin': fields.function(_real_margin_calc, type='float', string='Real Margin',
|
||||
help="Computed using the formula: Invoiced Amount - Total Costs.",
|
||||
|
|
|
|||
|
|
@ -8,6 +8,7 @@
|
|||
<field name="view_type">form</field>
|
||||
<field name="view_mode">tree,form</field>
|
||||
<field name="domain">[('invoice_id','=',False)]</field>
|
||||
<field name="context">{'search_default_to_invoice': 1}</field>
|
||||
<field name="search_view_id" ref="account.view_account_analytic_line_filter"/>
|
||||
</record>
|
||||
<menuitem action="action_hr_tree_invoiced_all" id="menu_action_hr_tree_invoiced_all" parent="base.menu_invoiced"/>
|
||||
|
|
@ -58,18 +59,6 @@
|
|||
</record>
|
||||
|
||||
|
||||
<record id="action_account_analytic_overdue" model="ir.actions.act_window">
|
||||
<field name="name">Contracts to Renew</field>
|
||||
<field name="res_model">account.analytic.account</field>
|
||||
<field name="view_type">form</field>
|
||||
<field name="view_mode">tree,form,graph</field>
|
||||
<field name="context">{'search_default_has_partner':1, 'search_default_my_accounts':1, 'search_default_draft':1, 'search_default_pending':1, 'search_default_open':1, 'search_default_renew':1}</field>
|
||||
<field name="domain">[('type','=','normal')]</field>
|
||||
<field name="search_view_id" ref="view_account_analytic_account_overdue_search"/>
|
||||
<field name="help">You will find here the contracts to be renewed because the deadline is passed or the working hours are higher than the allocated hours. OpenERP automatically sets these analytic accounts to the pending state, in order to raise a warning during the timesheets recording. Salesmen should review all pending accounts and reopen or close the according to the negotiation with the customer.</field>
|
||||
</record>
|
||||
<menuitem action="action_account_analytic_overdue" id="menu_action_account_analytic_overdue" sequence="50" parent="base.menu_invoiced"/>
|
||||
|
||||
<record id="action_account_analytic_overdue" model="ir.actions.act_window">
|
||||
<field name="name">Contracts to Renew</field>
|
||||
<field name="res_model">account.analytic.account</field>
|
||||
|
|
|
|||
|
|
@ -110,22 +110,5 @@
|
|||
</field>
|
||||
</record>
|
||||
|
||||
<record id="view_account_analytic_simplified" model="ir.ui.view">
|
||||
<field name="name">account.analytic.account.simplified.tree</field>
|
||||
<field name="model">account.analytic.account</field>
|
||||
<field name="type">tree</field>
|
||||
<field eval="20" name="priority"/>
|
||||
<field name="arch" type="xml">
|
||||
<tree string="Analytic accounts">
|
||||
<field name="complete_name"/>
|
||||
<field name="code"/>
|
||||
<field name="hours_qtt_non_invoiced"/>
|
||||
<field name="remaining_hours"/>
|
||||
<field name="ca_to_invoice"/>
|
||||
<field name="last_invoice_date"/>
|
||||
</tree>
|
||||
</field>
|
||||
</record>
|
||||
|
||||
</data>
|
||||
</openerp>
|
||||
|
|
|
|||
|
|
@ -7,14 +7,14 @@ msgstr ""
|
|||
"Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
|
||||
"Report-Msgid-Bugs-To: support@openerp.com\n"
|
||||
"POT-Creation-Date: 2011-01-11 11:14+0000\n"
|
||||
"PO-Revision-Date: 2010-08-02 20:32+0000\n"
|
||||
"Last-Translator: Mantavya Gajjar (Open ERP) <Unknown>\n"
|
||||
"PO-Revision-Date: 2011-12-08 16:13+0000\n"
|
||||
"Last-Translator: Goran Kliska <gkliska@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: 2011-11-05 05:20+0000\n"
|
||||
"X-Generator: Launchpad (build 14231)\n"
|
||||
"X-Launchpad-Export-Date: 2011-12-09 04:45+0000\n"
|
||||
"X-Generator: Launchpad (build 14450)\n"
|
||||
|
||||
#. module: account_analytic_analysis
|
||||
#: help:account.analytic.account,hours_qtt_invoiced:0
|
||||
|
|
@ -27,7 +27,7 @@ msgstr ""
|
|||
#. module: account_analytic_analysis
|
||||
#: help:account.analytic.account,remaining_ca:0
|
||||
msgid "Computed using the formula: Max Invoice Price - Invoiced Amount."
|
||||
msgstr "Izračunato pomoću formule: Max Cijena Iznos - Iznos dostavnice."
|
||||
msgstr "Izračun: Max. cijena računa - Fakturirani iznos."
|
||||
|
||||
#. module: account_analytic_analysis
|
||||
#: help:account.analytic.account,remaining_hours:0
|
||||
|
|
@ -61,7 +61,7 @@ msgstr ""
|
|||
#. module: account_analytic_analysis
|
||||
#: field:account.analytic.account,last_invoice_date:0
|
||||
msgid "Last Invoice Date"
|
||||
msgstr "Zadnji Datum fakture"
|
||||
msgstr "Zadnji datum računa"
|
||||
|
||||
#. module: account_analytic_analysis
|
||||
#: help:account.analytic.account,theorical_margin:0
|
||||
|
|
@ -71,12 +71,12 @@ msgstr "Izračunato pomoću formule: Prihodi Teorijski - Ukupni troškovi"
|
|||
#. module: account_analytic_analysis
|
||||
#: field:account.analytic.account,real_margin_rate:0
|
||||
msgid "Real Margin Rate (%)"
|
||||
msgstr "Realna margina Stopa (%)"
|
||||
msgstr "Realna marža(%)"
|
||||
|
||||
#. module: account_analytic_analysis
|
||||
#: field:account.analytic.account,ca_theorical:0
|
||||
msgid "Theoretical Revenue"
|
||||
msgstr ""
|
||||
msgstr "Teoretski prihod"
|
||||
|
||||
#. module: account_analytic_analysis
|
||||
#: help:account.analytic.account,last_worked_invoiced_date:0
|
||||
|
|
@ -84,8 +84,8 @@ msgid ""
|
|||
"If invoice from the costs, this is the date of the latest work or cost that "
|
||||
"have been invoiced."
|
||||
msgstr ""
|
||||
"Ako račun od troškova, to je datum najnoviji rad ili cijene koje su "
|
||||
"fakturirane."
|
||||
"Ako je račun iz troškova, to je datum najnovijeg rada ili ulaznog troška "
|
||||
"koji je fakturiran."
|
||||
|
||||
#. module: account_analytic_analysis
|
||||
#: model:ir.ui.menu,name:account_analytic_analysis.menu_invoicing
|
||||
|
|
@ -95,12 +95,12 @@ msgstr ""
|
|||
#. module: account_analytic_analysis
|
||||
#: field:account.analytic.account,last_worked_date:0
|
||||
msgid "Date of Last Cost/Work"
|
||||
msgstr "Datum Zadnja cijena / Posao"
|
||||
msgstr "Datum zadnjeg troška/rada"
|
||||
|
||||
#. module: account_analytic_analysis
|
||||
#: field:account.analytic.account,total_cost:0
|
||||
msgid "Total Costs"
|
||||
msgstr ""
|
||||
msgstr "Ukupni troškovi"
|
||||
|
||||
#. module: account_analytic_analysis
|
||||
#: help:account.analytic.account,hours_quantity:0
|
||||
|
|
@ -119,7 +119,7 @@ msgstr "Preostalo vrijeme"
|
|||
#. module: account_analytic_analysis
|
||||
#: field:account.analytic.account,theorical_margin:0
|
||||
msgid "Theoretical Margin"
|
||||
msgstr ""
|
||||
msgstr "Teoretski iznos"
|
||||
|
||||
#. module: account_analytic_analysis
|
||||
#: help:account.analytic.account,ca_theorical:0
|
||||
|
|
@ -128,25 +128,24 @@ msgid ""
|
|||
"if all these costs have been invoiced at the normal sale price provided by "
|
||||
"the pricelist."
|
||||
msgstr ""
|
||||
"Na temelju troškova koje ste imali na projektu, što bi bio prihod ako svi "
|
||||
"ovi troškovi su obračunati po normalnoj prodajnoj cijeni proistekli iz "
|
||||
"cjenika."
|
||||
"Na temelju troškova koje ste imali na projektu, što bi bio prihod da su svi "
|
||||
"ovi troškovi obračunati po normalnoj prodajnoj cijeni iz cjenika."
|
||||
|
||||
#. module: account_analytic_analysis
|
||||
#: field:account.analytic.account,user_ids:0
|
||||
#: field:account_analytic_analysis.summary.user,user:0
|
||||
msgid "User"
|
||||
msgstr ""
|
||||
msgstr "Korisnik"
|
||||
|
||||
#. module: account_analytic_analysis
|
||||
#: field:account.analytic.account,ca_to_invoice:0
|
||||
msgid "Uninvoiced Amount"
|
||||
msgstr ""
|
||||
msgstr "Nefakturirani iznos"
|
||||
|
||||
#. module: account_analytic_analysis
|
||||
#: help:account.analytic.account,real_margin:0
|
||||
msgid "Computed using the formula: Invoiced Amount - Total Costs."
|
||||
msgstr ""
|
||||
msgstr "Izračun: Iznos računa - Ukupni troškovi."
|
||||
|
||||
#. module: account_analytic_analysis
|
||||
#: field:account.analytic.account,hours_qtt_non_invoiced:0
|
||||
|
|
@ -166,12 +165,12 @@ msgstr ""
|
|||
#. module: account_analytic_analysis
|
||||
#: model:ir.model,name:account_analytic_analysis.model_account_analytic_analysis_summary_user
|
||||
msgid "Hours Summary by User"
|
||||
msgstr ""
|
||||
msgstr "Uk. sati po korisniku"
|
||||
|
||||
#. module: account_analytic_analysis
|
||||
#: field:account.analytic.account,ca_invoiced:0
|
||||
msgid "Invoiced Amount"
|
||||
msgstr ""
|
||||
msgstr "Iznos na računu"
|
||||
|
||||
#. module: account_analytic_analysis
|
||||
#: code:addons/account_analytic_analysis/account_analytic_analysis.py:533
|
||||
|
|
@ -183,7 +182,7 @@ msgstr ""
|
|||
#. module: account_analytic_analysis
|
||||
#: field:account.analytic.account,last_worked_invoiced_date:0
|
||||
msgid "Date of Last Invoiced Cost"
|
||||
msgstr ""
|
||||
msgstr "Zadnje fakturiranje troška"
|
||||
|
||||
#. module: account_analytic_analysis
|
||||
#: field:account.analytic.account,hours_qtt_invoiced:0
|
||||
|
|
@ -193,7 +192,7 @@ msgstr ""
|
|||
#. module: account_analytic_analysis
|
||||
#: field:account.analytic.account,real_margin:0
|
||||
msgid "Real Margin"
|
||||
msgstr "Reanal margina"
|
||||
msgstr "Realna marža"
|
||||
|
||||
#. module: account_analytic_analysis
|
||||
#: constraint:account.analytic.account:0
|
||||
|
|
@ -205,17 +204,17 @@ msgstr ""
|
|||
#. module: account_analytic_analysis
|
||||
#: help:account.analytic.account,ca_invoiced:0
|
||||
msgid "Total customer invoiced amount for this account."
|
||||
msgstr ""
|
||||
msgstr "Ukupno fakturirani iznos."
|
||||
|
||||
#. module: account_analytic_analysis
|
||||
#: model:ir.model,name:account_analytic_analysis.model_account_analytic_analysis_summary_month
|
||||
msgid "Hours summary by month"
|
||||
msgstr ""
|
||||
msgstr "Uk. sati po mjesecima"
|
||||
|
||||
#. module: account_analytic_analysis
|
||||
#: help:account.analytic.account,real_margin_rate:0
|
||||
msgid "Computes using the formula: (Real Margin / Total Costs) * 100."
|
||||
msgstr ""
|
||||
msgstr "Computes using the formula: (Real Margin / Total Costs) * 100."
|
||||
|
||||
#. module: account_analytic_analysis
|
||||
#: help:account.analytic.account,hours_qtt_non_invoiced:0
|
||||
|
|
@ -227,12 +226,12 @@ msgstr ""
|
|||
#. module: account_analytic_analysis
|
||||
#: view:account.analytic.account:0
|
||||
msgid "Analytic accounts"
|
||||
msgstr ""
|
||||
msgstr "Analitička konta"
|
||||
|
||||
#. module: account_analytic_analysis
|
||||
#: field:account.analytic.account,remaining_ca:0
|
||||
msgid "Remaining Revenue"
|
||||
msgstr ""
|
||||
msgstr "Preostali prihod"
|
||||
|
||||
#. module: account_analytic_analysis
|
||||
#: help:account.analytic.account,ca_to_invoice:0
|
||||
|
|
@ -240,6 +239,8 @@ msgid ""
|
|||
"If invoice from analytic account, the remaining amount you can invoice to "
|
||||
"the customer based on the total costs."
|
||||
msgstr ""
|
||||
"Ako fakturirate sa analitičkog konta, preostali iznos kojeg možete "
|
||||
"fakturirati kupcu prema ukupnim troškovima."
|
||||
|
||||
#. module: account_analytic_analysis
|
||||
#: help:account.analytic.account,revenue_per_hour:0
|
||||
|
|
@ -255,20 +256,20 @@ msgstr ""
|
|||
#: field:account_analytic_analysis.summary.month,unit_amount:0
|
||||
#: field:account_analytic_analysis.summary.user,unit_amount:0
|
||||
msgid "Total Time"
|
||||
msgstr ""
|
||||
msgstr "Ukupno vrijeme"
|
||||
|
||||
#. module: account_analytic_analysis
|
||||
#: field:account.analytic.account,month_ids:0
|
||||
#: field:account_analytic_analysis.summary.month,month:0
|
||||
msgid "Month"
|
||||
msgstr ""
|
||||
msgstr "Mjesec"
|
||||
|
||||
#. module: account_analytic_analysis
|
||||
#: field:account_analytic_analysis.summary.month,account_id:0
|
||||
#: field:account_analytic_analysis.summary.user,account_id:0
|
||||
#: model:ir.model,name:account_analytic_analysis.model_account_analytic_account
|
||||
msgid "Analytic Account"
|
||||
msgstr ""
|
||||
msgstr "Konto analitike"
|
||||
|
||||
#. module: account_analytic_analysis
|
||||
#: model:ir.actions.act_window,name:account_analytic_analysis.action_account_analytic_managed_overpassed
|
||||
|
|
@ -280,7 +281,7 @@ msgstr ""
|
|||
#: model:ir.actions.act_window,name:account_analytic_analysis.action_hr_tree_invoiced_all
|
||||
#: model:ir.ui.menu,name:account_analytic_analysis.menu_action_hr_tree_invoiced_all
|
||||
msgid "All Uninvoiced Entries"
|
||||
msgstr ""
|
||||
msgstr "Sve nefakturirane stavke"
|
||||
|
||||
#. module: account_analytic_analysis
|
||||
#: field:account.analytic.account,hours_quantity:0
|
||||
|
|
@ -290,7 +291,7 @@ msgstr ""
|
|||
#. module: account_analytic_analysis
|
||||
#: constraint:account.analytic.account:0
|
||||
msgid "Error! You can not create recursive analytic accounts."
|
||||
msgstr ""
|
||||
msgstr "Error! You can not create recursive analytic accounts."
|
||||
|
||||
#. module: account_analytic_analysis
|
||||
#: help:account.analytic.account,total_cost:0
|
||||
|
|
@ -298,6 +299,8 @@ msgid ""
|
|||
"Total of costs for this account. It includes real costs (from invoices) and "
|
||||
"indirect costs, like time spent on timesheets."
|
||||
msgstr ""
|
||||
"Ukupni troškovi ovog konta. Uključuje stvarne troškove (iz računa) i "
|
||||
"indirektne troškove kao što je vrijeme utrošeno po evidencijama rada"
|
||||
|
||||
#~ msgid "Invalid XML for View Architecture!"
|
||||
#~ msgstr "Neispravan XML za arhitekturu prikaza!"
|
||||
|
|
@ -330,3 +333,6 @@ msgstr ""
|
|||
#~ "Promijeni račun analitički prikaz \n"
|
||||
#~ "za važne podatke za projekt menadžer od usluznih tvrtki.\n"
|
||||
#~ "Dodaj izbornik za prikaz relevantne informacije za svakog menadžera."
|
||||
|
||||
#~ msgid "My Accounts"
|
||||
#~ msgstr "My Accounts"
|
||||
|
|
|
|||
|
|
@ -22,7 +22,7 @@
|
|||
{
|
||||
'name' : 'Account Analytic Defaults',
|
||||
'version' : '1.0',
|
||||
'category' : 'Hidden',
|
||||
"category": 'Accounting & Finance',
|
||||
'complexity': "normal",
|
||||
'description': """Set default values for your analytic accounts
|
||||
Allows to automatically select analytic accounts based on criterions:
|
||||
|
|
|
|||
|
|
@ -7,14 +7,14 @@ msgstr ""
|
|||
"Project-Id-Version: OpenERP Server 6.0dev\n"
|
||||
"Report-Msgid-Bugs-To: support@openerp.com\n"
|
||||
"POT-Creation-Date: 2011-01-11 11:14+0000\n"
|
||||
"PO-Revision-Date: 2010-08-02 20:44+0000\n"
|
||||
"Last-Translator: Mantavya Gajjar (Open ERP) <Unknown>\n"
|
||||
"PO-Revision-Date: 2011-12-08 16:13+0000\n"
|
||||
"Last-Translator: Goran Kliska <gkliska@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: 2011-11-05 05:25+0000\n"
|
||||
"X-Generator: Launchpad (build 14231)\n"
|
||||
"X-Launchpad-Export-Date: 2011-12-09 04:45+0000\n"
|
||||
"X-Generator: Launchpad (build 14450)\n"
|
||||
|
||||
#. module: account_analytic_default
|
||||
#: model:ir.module.module,shortdesc:account_analytic_default.module_meta_information
|
||||
|
|
@ -28,6 +28,9 @@ msgid ""
|
|||
"default (eg. create new cutomer invoice or Sale order if we select this "
|
||||
"partner, it will automatically take this as an analytical account)"
|
||||
msgstr ""
|
||||
"select a partner which will use analytical account specified in analytic "
|
||||
"default (eg. create new cutomer invoice or Sale order if we select this "
|
||||
"partner, it will automatically take this as an analytical account)"
|
||||
|
||||
#. module: account_analytic_default
|
||||
#: model:ir.actions.act_window,name:account_analytic_default.analytic_rule_action_partner
|
||||
|
|
@ -39,27 +42,27 @@ msgstr "Pravila analitike"
|
|||
#. module: account_analytic_default
|
||||
#: help:account.analytic.default,analytic_id:0
|
||||
msgid "Analytical Account"
|
||||
msgstr ""
|
||||
msgstr "Analitički konto"
|
||||
|
||||
#. module: account_analytic_default
|
||||
#: view:account.analytic.default:0
|
||||
msgid "Current"
|
||||
msgstr ""
|
||||
msgstr "Trenutno"
|
||||
|
||||
#. module: account_analytic_default
|
||||
#: view:account.analytic.default:0
|
||||
msgid "Group By..."
|
||||
msgstr ""
|
||||
msgstr "Grupiraj po..."
|
||||
|
||||
#. module: account_analytic_default
|
||||
#: help:account.analytic.default,date_stop:0
|
||||
msgid "Default end date for this Analytical Account"
|
||||
msgstr ""
|
||||
msgstr "Zadani krajnji datum za ovaj analitički konto"
|
||||
|
||||
#. module: account_analytic_default
|
||||
#: model:ir.model,name:account_analytic_default.model_stock_picking
|
||||
msgid "Picking List"
|
||||
msgstr ""
|
||||
msgstr "Skladišni dokument"
|
||||
|
||||
#. module: account_analytic_default
|
||||
#: view:account.analytic.default:0
|
||||
|
|
@ -73,11 +76,14 @@ msgid ""
|
|||
"default (eg. create new cutomer invoice or Sale order if we select this "
|
||||
"company, it will automatically take this as an analytical account)"
|
||||
msgstr ""
|
||||
"select a company which will use analytical account specified in analytic "
|
||||
"default (eg. create new cutomer invoice or Sale order if we select this "
|
||||
"company, it will automatically take this as an analytical account)"
|
||||
|
||||
#. module: account_analytic_default
|
||||
#: help:account.analytic.default,date_start:0
|
||||
msgid "Default start date for this Analytical Account"
|
||||
msgstr ""
|
||||
msgstr "Zadani početni datum za ovaj analitički konto"
|
||||
|
||||
#. module: account_analytic_default
|
||||
#: view:account.analytic.default:0
|
||||
|
|
@ -88,13 +94,13 @@ msgstr "Proizvod"
|
|||
#. module: account_analytic_default
|
||||
#: model:ir.model,name:account_analytic_default.model_account_analytic_default
|
||||
msgid "Analytic Distribution"
|
||||
msgstr ""
|
||||
msgstr "Analytic Distribution"
|
||||
|
||||
#. module: account_analytic_default
|
||||
#: view:account.analytic.default:0
|
||||
#: field:account.analytic.default,company_id:0
|
||||
msgid "Company"
|
||||
msgstr "Tvrtka"
|
||||
msgstr "Organizacija"
|
||||
|
||||
#. module: account_analytic_default
|
||||
#: view:account.analytic.default:0
|
||||
|
|
@ -110,13 +116,14 @@ msgstr "Stavke"
|
|||
#. module: account_analytic_default
|
||||
#: field:account.analytic.default,date_stop:0
|
||||
msgid "End Date"
|
||||
msgstr "Završni datum"
|
||||
msgstr "Završni Datum"
|
||||
|
||||
#. module: account_analytic_default
|
||||
#: help:account.analytic.default,user_id:0
|
||||
msgid ""
|
||||
"select a user which will use analytical account specified in analytic default"
|
||||
msgstr ""
|
||||
"select a user which will use analytical account specified in analytic default"
|
||||
|
||||
#. module: account_analytic_default
|
||||
#: view:account.analytic.default:0
|
||||
|
|
@ -145,33 +152,36 @@ msgid ""
|
|||
"default (eg. create new cutomer invoice or Sale order if we select this "
|
||||
"product, it will automatically take this as an analytical account)"
|
||||
msgstr ""
|
||||
"odaberite proizvod koji će koristiti analitički račun naveden u analitičkim "
|
||||
"zadanim računima (npr. stvaranje novih računa kupaca ili prodajnih naloga "
|
||||
"ukoliko smo odabrali ovaj proizvod, automatski će se uzeti analitički račun)"
|
||||
|
||||
#. module: account_analytic_default
|
||||
#: field:account.analytic.default,sequence:0
|
||||
msgid "Sequence"
|
||||
msgstr "Redoslijed"
|
||||
msgstr "Sekvenca"
|
||||
|
||||
#. module: account_analytic_default
|
||||
#: model:ir.model,name:account_analytic_default.model_account_invoice_line
|
||||
msgid "Invoice Line"
|
||||
msgstr ""
|
||||
msgstr "Stavka računa"
|
||||
|
||||
#. module: account_analytic_default
|
||||
#: view:account.analytic.default:0
|
||||
#: field:account.analytic.default,analytic_id:0
|
||||
msgid "Analytic Account"
|
||||
msgstr "Analitički račun"
|
||||
msgstr "Konto analitike"
|
||||
|
||||
#. module: account_analytic_default
|
||||
#: view:account.analytic.default:0
|
||||
msgid "Accounts"
|
||||
msgstr ""
|
||||
msgstr "Konta"
|
||||
|
||||
#. module: account_analytic_default
|
||||
#: view:account.analytic.default:0
|
||||
#: field:account.analytic.default,partner_id:0
|
||||
msgid "Partner"
|
||||
msgstr "Stranka"
|
||||
msgstr "Partner"
|
||||
|
||||
#. module: account_analytic_default
|
||||
#: field:account.analytic.default,date_start:0
|
||||
|
|
@ -183,11 +193,12 @@ msgstr "Početni datum"
|
|||
msgid ""
|
||||
"Gives the sequence order when displaying a list of analytic distribution"
|
||||
msgstr ""
|
||||
"Gives the sequence order when displaying a list of analytic distribution"
|
||||
|
||||
#. module: account_analytic_default
|
||||
#: model:ir.model,name:account_analytic_default.model_sale_order_line
|
||||
msgid "Sales Order Line"
|
||||
msgstr ""
|
||||
msgstr "Stavka prodajnog naloga"
|
||||
|
||||
#~ msgid "Invalid XML for View Architecture!"
|
||||
#~ msgstr "Neispravan XML za arhitekturu prikaza!"
|
||||
|
|
|
|||
|
|
@ -7,20 +7,21 @@ msgstr ""
|
|||
"Project-Id-Version: OpenERP Server 6.0dev\n"
|
||||
"Report-Msgid-Bugs-To: support@openerp.com\n"
|
||||
"POT-Creation-Date: 2011-01-03 16:56+0000\n"
|
||||
"PO-Revision-Date: 2011-10-17 21:05+0000\n"
|
||||
"Last-Translator: Ivan Marijanović <Unknown>\n"
|
||||
"PO-Revision-Date: 2011-12-08 16:14+0000\n"
|
||||
"Last-Translator: Goran Kliska <gkliska@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: 2011-11-05 05:21+0000\n"
|
||||
"X-Generator: Launchpad (build 14231)\n"
|
||||
"X-Launchpad-Export-Date: 2011-12-09 04:45+0000\n"
|
||||
"X-Generator: Launchpad (build 14450)\n"
|
||||
|
||||
#. module: account_analytic_plans
|
||||
#: view:analytic.plan.create.model:0
|
||||
msgid ""
|
||||
"This distribution model has been saved.You will be able to reuse it later."
|
||||
msgstr ""
|
||||
"This distribution model has been saved.You will be able to reuse it later."
|
||||
|
||||
#. module: account_analytic_plans
|
||||
#: field:account.analytic.plan.instance.line,plan_id:0
|
||||
|
|
@ -30,7 +31,7 @@ msgstr "Šifra plana"
|
|||
#. module: account_analytic_plans
|
||||
#: report:account.analytic.account.crossovered.analytic:0
|
||||
msgid "From Date"
|
||||
msgstr ""
|
||||
msgstr "From Date"
|
||||
|
||||
#. module: account_analytic_plans
|
||||
#: report:account.analytic.account.crossovered.analytic:0
|
||||
|
|
@ -60,7 +61,7 @@ msgstr ""
|
|||
#: view:account.crossovered.analytic:0
|
||||
#: field:account.crossovered.analytic,journal_ids:0
|
||||
msgid "Analytic Journal"
|
||||
msgstr "Analitički Dnevnik"
|
||||
msgstr "Dnevnik analitike"
|
||||
|
||||
#. module: account_analytic_plans
|
||||
#: view:account.analytic.plan.line:0
|
||||
|
|
@ -82,12 +83,12 @@ msgstr "Instanca analitičkog plana"
|
|||
#. module: account_analytic_plans
|
||||
#: view:analytic.plan.create.model:0
|
||||
msgid "Ok"
|
||||
msgstr ""
|
||||
msgstr "U redu"
|
||||
|
||||
#. module: account_analytic_plans
|
||||
#: constraint:account.move.line:0
|
||||
msgid "You can not create move line on closed account."
|
||||
msgstr ""
|
||||
msgstr "Ne možete kreirati stavke prometa za zatvoreni račun."
|
||||
|
||||
#. module: account_analytic_plans
|
||||
#: field:account.analytic.plan.instance,plan_id:0
|
||||
|
|
@ -97,12 +98,12 @@ msgstr "Plan modela"
|
|||
#. module: account_analytic_plans
|
||||
#: field:account.analytic.plan.instance,account2_ids:0
|
||||
msgid "Account2 Id"
|
||||
msgstr "Šifra računa 2"
|
||||
msgstr "Konto2 Id"
|
||||
|
||||
#. module: account_analytic_plans
|
||||
#: field:account.analytic.plan.instance,account_ids:0
|
||||
msgid "Account Id"
|
||||
msgstr "Šifra računa"
|
||||
msgstr "Account Id"
|
||||
|
||||
#. module: account_analytic_plans
|
||||
#: report:account.analytic.account.crossovered.analytic:0
|
||||
|
|
@ -117,37 +118,37 @@ msgstr "Šifra"
|
|||
#. module: account_analytic_plans
|
||||
#: sql_constraint:account.move.line:0
|
||||
msgid "Wrong credit or debit value in accounting entry !"
|
||||
msgstr ""
|
||||
msgstr "Pogrešno kreditna ili debitnom vrijednost unešene stavke!"
|
||||
|
||||
#. module: account_analytic_plans
|
||||
#: field:account.analytic.plan.instance,account6_ids:0
|
||||
msgid "Account6 Id"
|
||||
msgstr "Šifra računa 6"
|
||||
msgstr "Konto6 Id"
|
||||
|
||||
#. module: account_analytic_plans
|
||||
#: model:ir.ui.menu,name:account_analytic_plans.menu_account_analytic_multi_plan_action
|
||||
msgid "Multi Plans"
|
||||
msgstr ""
|
||||
msgstr "Višestruki planovi"
|
||||
|
||||
#. module: account_analytic_plans
|
||||
#: model:ir.model,name:account_analytic_plans.model_account_bank_statement_line
|
||||
msgid "Bank Statement Line"
|
||||
msgstr ""
|
||||
msgstr "Redak bankovnog izvoda"
|
||||
|
||||
#. module: account_analytic_plans
|
||||
#: field:account.analytic.plan.instance.line,analytic_account_id:0
|
||||
msgid "Analytic Account"
|
||||
msgstr "Račun analitike"
|
||||
msgstr "Konto analitike"
|
||||
|
||||
#. module: account_analytic_plans
|
||||
#: sql_constraint:account.journal:0
|
||||
msgid "The code of the journal must be unique per company !"
|
||||
msgstr ""
|
||||
msgstr "Šifra dnevnika mora biti jedinstvena (za organizaciju) !"
|
||||
|
||||
#. module: account_analytic_plans
|
||||
#: field:account.crossovered.analytic,ref:0
|
||||
msgid "Analytic Account Reference"
|
||||
msgstr ""
|
||||
msgstr "Analytic Account Reference"
|
||||
|
||||
#. module: account_analytic_plans
|
||||
#: constraint:account.move.line:0
|
||||
|
|
@ -158,7 +159,7 @@ msgstr ""
|
|||
#. module: account_analytic_plans
|
||||
#: model:ir.model,name:account_analytic_plans.model_sale_order_line
|
||||
msgid "Sales Order Line"
|
||||
msgstr ""
|
||||
msgstr "Stavka prodajnog naloga"
|
||||
|
||||
#. module: account_analytic_plans
|
||||
#: code:addons/account_analytic_plans/wizard/analytic_plan_create_model.py:47
|
||||
|
|
@ -209,7 +210,7 @@ msgstr "Analitički planovi"
|
|||
#. module: account_analytic_plans
|
||||
#: report:account.analytic.account.crossovered.analytic:0
|
||||
msgid "Perc(%)"
|
||||
msgstr ""
|
||||
msgstr "Perc(%)"
|
||||
|
||||
#. module: account_analytic_plans
|
||||
#: field:account.analytic.plan.line,max_required:0
|
||||
|
|
@ -231,17 +232,17 @@ msgstr "Retci analitičkog plana"
|
|||
msgid ""
|
||||
"The amount of the voucher must be the same amount as the one on the "
|
||||
"statement line"
|
||||
msgstr ""
|
||||
msgstr "Iznos vaučera mora biti jednak iznosu stavke izvoda banke/blagajne."
|
||||
|
||||
#. module: account_analytic_plans
|
||||
#: model:ir.model,name:account_analytic_plans.model_account_invoice_line
|
||||
msgid "Invoice Line"
|
||||
msgstr ""
|
||||
msgstr "Stavka računa"
|
||||
|
||||
#. module: account_analytic_plans
|
||||
#: report:account.analytic.account.crossovered.analytic:0
|
||||
msgid "Currency"
|
||||
msgstr ""
|
||||
msgstr "Valuta"
|
||||
|
||||
#. module: account_analytic_plans
|
||||
#: field:account.crossovered.analytic,date1:0
|
||||
|
|
@ -251,12 +252,12 @@ msgstr "Početni datum"
|
|||
#. module: account_analytic_plans
|
||||
#: report:account.analytic.account.crossovered.analytic:0
|
||||
msgid "Company"
|
||||
msgstr ""
|
||||
msgstr "Organizacija"
|
||||
|
||||
#. module: account_analytic_plans
|
||||
#: field:account.analytic.plan.instance,account5_ids:0
|
||||
msgid "Account5 Id"
|
||||
msgstr "Šifra računa 5"
|
||||
msgstr "Konto5 Id"
|
||||
|
||||
#. module: account_analytic_plans
|
||||
#: model:ir.model,name:account_analytic_plans.model_account_analytic_plan_instance_line
|
||||
|
|
@ -271,7 +272,7 @@ msgstr "Korijensko konto"
|
|||
#. module: account_analytic_plans
|
||||
#: report:account.analytic.account.crossovered.analytic:0
|
||||
msgid "To Date"
|
||||
msgstr ""
|
||||
msgstr "To Date"
|
||||
|
||||
#. module: account_analytic_plans
|
||||
#: code:addons/account_analytic_plans/account_analytic_plans.py:321
|
||||
|
|
@ -288,12 +289,12 @@ msgstr "Ne prikazuj prazne retke"
|
|||
#. module: account_analytic_plans
|
||||
#: model:ir.actions.act_window,name:account_analytic_plans.action_analytic_plan_create_model
|
||||
msgid "analytic.plan.create.model.action"
|
||||
msgstr ""
|
||||
msgstr "analytic.plan.create.model.action"
|
||||
|
||||
#. module: account_analytic_plans
|
||||
#: report:account.analytic.account.crossovered.analytic:0
|
||||
msgid "Analytic Account :"
|
||||
msgstr ""
|
||||
msgstr "Konto analitike :"
|
||||
|
||||
#. module: account_analytic_plans
|
||||
#: model:ir.module.module,description:account_analytic_plans.module_meta_information
|
||||
|
|
@ -336,7 +337,7 @@ msgstr ""
|
|||
#. module: account_analytic_plans
|
||||
#: report:account.analytic.account.crossovered.analytic:0
|
||||
msgid "Analytic Account Reference:"
|
||||
msgstr "Veza analitičkog računa:"
|
||||
msgstr "Analytic Account Reference:"
|
||||
|
||||
#. module: account_analytic_plans
|
||||
#: field:account.analytic.plan.line,name:0
|
||||
|
|
@ -346,22 +347,22 @@ msgstr "Naziv plana"
|
|||
#. module: account_analytic_plans
|
||||
#: field:account.analytic.plan,default_instance_id:0
|
||||
msgid "Default Entries"
|
||||
msgstr "Zadani unosi"
|
||||
msgstr "Uobičajene stavke"
|
||||
|
||||
#. module: account_analytic_plans
|
||||
#: model:ir.model,name:account_analytic_plans.model_account_move_line
|
||||
msgid "Journal Items"
|
||||
msgstr ""
|
||||
msgstr "Stavke glavne knjige"
|
||||
|
||||
#. module: account_analytic_plans
|
||||
#: field:account.analytic.plan.instance,account1_ids:0
|
||||
msgid "Account1 Id"
|
||||
msgstr "Šifra računa 1"
|
||||
msgstr "Konto1 Id"
|
||||
|
||||
#. module: account_analytic_plans
|
||||
#: constraint:account.move.line:0
|
||||
msgid "Company must be same for its related account and period."
|
||||
msgstr ""
|
||||
msgstr "Company must be same for its related account and period."
|
||||
|
||||
#. module: account_analytic_plans
|
||||
#: field:account.analytic.plan.line,min_required:0
|
||||
|
|
@ -371,7 +372,7 @@ msgstr "Minimalno dozvoljeno (%)"
|
|||
#. module: account_analytic_plans
|
||||
#: help:account.analytic.plan.line,root_analytic_id:0
|
||||
msgid "Root account of this plan."
|
||||
msgstr "Korijenski račun ovog plana."
|
||||
msgstr "Root account of this plan."
|
||||
|
||||
#. module: account_analytic_plans
|
||||
#: code:addons/account_analytic_plans/account_analytic_plans.py:201
|
||||
|
|
@ -384,7 +385,7 @@ msgstr ""
|
|||
#. module: account_analytic_plans
|
||||
#: view:analytic.plan.create.model:0
|
||||
msgid "Save This Distribution as a Model"
|
||||
msgstr ""
|
||||
msgstr "Save This Distribution as a Model"
|
||||
|
||||
#. module: account_analytic_plans
|
||||
#: report:account.analytic.account.crossovered.analytic:0
|
||||
|
|
@ -400,7 +401,7 @@ msgstr ""
|
|||
#. module: account_analytic_plans
|
||||
#: model:ir.model,name:account_analytic_plans.model_account_crossovered_analytic
|
||||
msgid "Print Crossovered Analytic"
|
||||
msgstr ""
|
||||
msgstr "Print Crossovered Analytic"
|
||||
|
||||
#. module: account_analytic_plans
|
||||
#: code:addons/account_analytic_plans/account_analytic_plans.py:321
|
||||
|
|
@ -412,28 +413,28 @@ msgstr ""
|
|||
#. module: account_analytic_plans
|
||||
#: model:ir.model,name:account_analytic_plans.model_account_bank_statement
|
||||
msgid "Bank Statement"
|
||||
msgstr ""
|
||||
msgstr "Izvod banke"
|
||||
|
||||
#. module: account_analytic_plans
|
||||
#: field:account.analytic.plan.instance,account3_ids:0
|
||||
msgid "Account3 Id"
|
||||
msgstr "Šifra računa 3"
|
||||
msgstr "Konto3 Id"
|
||||
|
||||
#. module: account_analytic_plans
|
||||
#: model:ir.model,name:account_analytic_plans.model_account_invoice
|
||||
msgid "Invoice"
|
||||
msgstr ""
|
||||
msgstr "Račun"
|
||||
|
||||
#. module: account_analytic_plans
|
||||
#: view:account.crossovered.analytic:0
|
||||
#: view:analytic.plan.create.model:0
|
||||
msgid "Cancel"
|
||||
msgstr "Poništi"
|
||||
msgstr "Odustani"
|
||||
|
||||
#. module: account_analytic_plans
|
||||
#: field:account.analytic.plan.instance,account4_ids:0
|
||||
msgid "Account4 Id"
|
||||
msgstr "Šifra računa 4"
|
||||
msgstr "Konto4 Id"
|
||||
|
||||
#. module: account_analytic_plans
|
||||
#: view:account.analytic.plan.instance.line:0
|
||||
|
|
@ -454,7 +455,7 @@ msgstr "na"
|
|||
#. module: account_analytic_plans
|
||||
#: report:account.analytic.account.crossovered.analytic:0
|
||||
msgid "Account Name"
|
||||
msgstr "Naziv računa"
|
||||
msgstr "Naziv konta"
|
||||
|
||||
#. module: account_analytic_plans
|
||||
#: view:account.analytic.plan.instance.line:0
|
||||
|
|
@ -469,7 +470,7 @@ msgstr "Šifra raspodjele"
|
|||
#. module: account_analytic_plans
|
||||
#: report:account.analytic.account.crossovered.analytic:0
|
||||
msgid "%"
|
||||
msgstr ""
|
||||
msgstr "%"
|
||||
|
||||
#. module: account_analytic_plans
|
||||
#: report:account.analytic.account.crossovered.analytic:0
|
||||
|
|
@ -485,22 +486,22 @@ msgstr "100.00%"
|
|||
#: field:account.move.line,analytics_id:0
|
||||
#: model:ir.model,name:account_analytic_plans.model_account_analytic_default
|
||||
msgid "Analytic Distribution"
|
||||
msgstr "Analitička raspodjela"
|
||||
msgstr "Analytic Distribution"
|
||||
|
||||
#. module: account_analytic_plans
|
||||
#: model:ir.model,name:account_analytic_plans.model_account_journal
|
||||
msgid "Journal"
|
||||
msgstr ""
|
||||
msgstr "Dnevnik"
|
||||
|
||||
#. module: account_analytic_plans
|
||||
#: model:ir.model,name:account_analytic_plans.model_analytic_plan_create_model
|
||||
msgid "analytic.plan.create.model"
|
||||
msgstr ""
|
||||
msgstr "analytic.plan.create.model"
|
||||
|
||||
#. module: account_analytic_plans
|
||||
#: field:account.crossovered.analytic,date2:0
|
||||
msgid "End Date"
|
||||
msgstr "Završni datum"
|
||||
msgstr "Završni Datum"
|
||||
|
||||
#. module: account_analytic_plans
|
||||
#: model:ir.actions.act_window,name:account_analytic_plans.account_analytic_instance_model_open
|
||||
|
|
@ -515,7 +516,7 @@ msgstr "Sekvenca"
|
|||
#. module: account_analytic_plans
|
||||
#: sql_constraint:account.journal:0
|
||||
msgid "The name of the journal must be unique per company !"
|
||||
msgstr ""
|
||||
msgstr "Naziv dnevnika mora biti jedinstven za jednu organizaciju!"
|
||||
|
||||
#. module: account_analytic_plans
|
||||
#: code:addons/account_analytic_plans/account_analytic_plans.py:214
|
||||
|
|
@ -526,7 +527,7 @@ msgstr ""
|
|||
#. module: account_analytic_plans
|
||||
#: constraint:account.move.line:0
|
||||
msgid "You can not create move line on view account."
|
||||
msgstr ""
|
||||
msgstr "Ne može se knjižiti na sintetički konto."
|
||||
|
||||
#~ msgid "Select Information"
|
||||
#~ msgstr "Odaberi informacije"
|
||||
|
|
|
|||
|
|
@ -49,6 +49,7 @@
|
|||
],
|
||||
"active": False,
|
||||
"installable": True,
|
||||
"application": True,
|
||||
}
|
||||
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
|
||||
|
||||
|
|
|
|||
|
|
@ -32,11 +32,11 @@
|
|||
<field name="prorata"/>
|
||||
<field name="open_asset"/>
|
||||
</group>
|
||||
<group col="2" colspan="2" groups="analytic.group_analytic_accounting">
|
||||
<separator string="Analytic information" colspan="4"/>
|
||||
<newline/>
|
||||
<field name="account_analytic_id"/>
|
||||
</group>
|
||||
<group col="2" colspan="2" groups="analytic.group_analytic_accounting">
|
||||
<separator string="Analytic information" colspan="4"/>
|
||||
<newline/>
|
||||
<field name="account_analytic_id"/>
|
||||
</group>
|
||||
<separator string="Notes" colspan="4"/>
|
||||
<field name="note" colspan="4" nolabel="1"/>
|
||||
</form>
|
||||
|
|
@ -317,7 +317,7 @@
|
|||
<field name="name">Review Asset Categories</field>
|
||||
<field name="res_model">account.asset.category</field>
|
||||
<field name="view_type">form</field>
|
||||
<field name="view_mode">form</field>
|
||||
<field name="view_mode">tree,form</field>
|
||||
</record>
|
||||
|
||||
<record id="asset_category_form_view_todo" model="ir.actions.todo">
|
||||
|
|
|
|||
|
|
@ -8,14 +8,14 @@ msgstr ""
|
|||
"Project-Id-Version: openobject-addons\n"
|
||||
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
|
||||
"POT-Creation-Date: 2009-11-24 12:54+0000\n"
|
||||
"PO-Revision-Date: 2011-10-17 21:09+0000\n"
|
||||
"Last-Translator: Ivan Marijanović <Unknown>\n"
|
||||
"PO-Revision-Date: 2011-12-08 16:13+0000\n"
|
||||
"Last-Translator: Tomislav Bosnjakovic <Unknown>\n"
|
||||
"Language-Team: Croatian <hr@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: 2011-11-05 05:57+0000\n"
|
||||
"X-Generator: Launchpad (build 14231)\n"
|
||||
"X-Launchpad-Export-Date: 2011-12-09 04:46+0000\n"
|
||||
"X-Generator: Launchpad (build 14450)\n"
|
||||
|
||||
#. module: account_asset
|
||||
#: model:ir.actions.act_window,name:account_asset.action_account_asset_asset_list_normal
|
||||
|
|
@ -27,12 +27,12 @@ msgstr ""
|
|||
#: field:account.asset.property,method_end:0
|
||||
#: field:account.asset.property.history,method_end:0
|
||||
msgid "Ending date"
|
||||
msgstr ""
|
||||
msgstr "Završni datum"
|
||||
|
||||
#. module: account_asset
|
||||
#: view:account.asset.asset:0
|
||||
msgid "Depreciation board"
|
||||
msgstr ""
|
||||
msgstr "Depreciation board"
|
||||
|
||||
#. module: account_asset
|
||||
#: view:account.asset.asset:0
|
||||
|
|
@ -45,7 +45,7 @@ msgstr ""
|
|||
#: model:ir.model,name:account_asset.model_account_asset_asset
|
||||
#: model:ir.ui.menu,name:account_asset.menu_action_account_asset_asset_form
|
||||
msgid "Asset"
|
||||
msgstr "Imovina"
|
||||
msgstr "Osnovno sredstvo"
|
||||
|
||||
#. module: account_asset
|
||||
#: constraint:ir.actions.act_window:0
|
||||
|
|
@ -55,7 +55,7 @@ msgstr "Pogrešan naziv modela u definiciji akcije."
|
|||
#. module: account_asset
|
||||
#: selection:account.asset.property,method:0
|
||||
msgid "Linear"
|
||||
msgstr "Linearno"
|
||||
msgstr "Linear"
|
||||
|
||||
#. module: account_asset
|
||||
#: view:account.asset.asset:0
|
||||
|
|
@ -108,7 +108,7 @@ msgstr "Otvorene stavke"
|
|||
#: model:ir.ui.menu,name:account_asset.menu_finance_Assets
|
||||
#: model:ir.ui.menu,name:account_asset.menu_finance_config_Assets
|
||||
msgid "Assets"
|
||||
msgstr "Imovina"
|
||||
msgstr "Osnovna sredstva"
|
||||
|
||||
#. module: account_asset
|
||||
#: selection:account.asset.property,method:0
|
||||
|
|
@ -151,7 +151,7 @@ msgstr ""
|
|||
#. module: account_asset
|
||||
#: field:account.asset.asset,partner_id:0
|
||||
msgid "Partner"
|
||||
msgstr ""
|
||||
msgstr "Partner"
|
||||
|
||||
#. module: account_asset
|
||||
#: wizard_field:account.asset.modify,init,method_period:0
|
||||
|
|
@ -168,12 +168,12 @@ msgstr ""
|
|||
#. module: account_asset
|
||||
#: field:account.asset.property,account_analytic_id:0
|
||||
msgid "Analytic account"
|
||||
msgstr ""
|
||||
msgstr "Analitički konto"
|
||||
|
||||
#. module: account_asset
|
||||
#: field:account.asset.property,state:0
|
||||
msgid "State"
|
||||
msgstr ""
|
||||
msgstr "Stanje"
|
||||
|
||||
#. module: account_asset
|
||||
#: view:account.asset.asset:0
|
||||
|
|
@ -212,14 +212,14 @@ msgstr ""
|
|||
#: model:ir.actions.wizard,name:account_asset.wizard_asset_compute
|
||||
#: model:ir.ui.menu,name:account_asset.menu_wizard_asset_compute
|
||||
msgid "Compute assets"
|
||||
msgstr ""
|
||||
msgstr "Izračunaj amortizaciju"
|
||||
|
||||
#. module: account_asset
|
||||
#: wizard_view:account.asset.modify,init:0
|
||||
#: wizard_button:account.asset.modify,init,asset_modify:0
|
||||
#: model:ir.actions.wizard,name:account_asset.wizard_asset_modify
|
||||
msgid "Modify asset"
|
||||
msgstr ""
|
||||
msgstr "Promjeni sredstvo"
|
||||
|
||||
#. module: account_asset
|
||||
#: view:account.asset.asset:0
|
||||
|
|
@ -230,7 +230,7 @@ msgstr ""
|
|||
#: view:account.asset.property.history:0
|
||||
#: model:ir.model,name:account_asset.model_account_asset_property_history
|
||||
msgid "Asset history"
|
||||
msgstr ""
|
||||
msgstr "Povijest osnovnog sredstva"
|
||||
|
||||
#. module: account_asset
|
||||
#: field:account.asset.property,date:0
|
||||
|
|
@ -274,13 +274,13 @@ msgstr ""
|
|||
#: field:account.asset.category,note:0
|
||||
#: field:account.asset.property.history,note:0
|
||||
msgid "Note"
|
||||
msgstr ""
|
||||
msgstr "Bilješka"
|
||||
|
||||
#. module: account_asset
|
||||
#: selection:account.asset.asset,state:0
|
||||
#: selection:account.asset.property,state:0
|
||||
msgid "Draft"
|
||||
msgstr ""
|
||||
msgstr "Nacrt"
|
||||
|
||||
#. module: account_asset
|
||||
#: field:account.asset.property,type:0
|
||||
|
|
@ -325,12 +325,12 @@ msgstr ""
|
|||
#. module: account_asset
|
||||
#: field:account.asset.asset,active:0
|
||||
msgid "Active"
|
||||
msgstr ""
|
||||
msgstr "Aktivan"
|
||||
|
||||
#. module: account_asset
|
||||
#: field:account.asset.property.history,user_id:0
|
||||
msgid "User"
|
||||
msgstr ""
|
||||
msgstr "Korisnik"
|
||||
|
||||
#. module: account_asset
|
||||
#: field:account.asset.asset,property_ids:0
|
||||
|
|
@ -341,7 +341,7 @@ msgstr ""
|
|||
#: field:account.asset.asset,date:0
|
||||
#: field:account.asset.property.history,date:0
|
||||
msgid "Date"
|
||||
msgstr ""
|
||||
msgstr "Datum"
|
||||
|
||||
#. module: account_asset
|
||||
#: field:account.asset.board,value_net:0
|
||||
|
|
@ -352,12 +352,12 @@ msgstr ""
|
|||
#: wizard_view:account.asset.close,init:0
|
||||
#: model:ir.actions.wizard,name:account_asset.wizard_asset_close
|
||||
msgid "Close asset"
|
||||
msgstr ""
|
||||
msgstr "Zatvori sredstvo"
|
||||
|
||||
#. module: account_asset
|
||||
#: field:account.asset.property,history_ids:0
|
||||
msgid "History"
|
||||
msgstr ""
|
||||
msgstr "Povijest"
|
||||
|
||||
#. module: account_asset
|
||||
#: field:account.asset.property,account_actif_id:0
|
||||
|
|
@ -368,27 +368,27 @@ msgstr ""
|
|||
#: field:account.asset.asset,period_id:0
|
||||
#: wizard_field:account.asset.compute,init,period_id:0
|
||||
msgid "Period"
|
||||
msgstr ""
|
||||
msgstr "Period"
|
||||
|
||||
#. module: account_asset
|
||||
#: model:ir.actions.act_window,name:account_asset.action_account_asset_category_form
|
||||
#: model:ir.ui.menu,name:account_asset.menu_action_account_asset_category_form
|
||||
msgid "Asset Category"
|
||||
msgstr ""
|
||||
msgstr "Grupa o.sredstva"
|
||||
|
||||
#. module: account_asset
|
||||
#: wizard_button:account.asset.close,init,end:0
|
||||
#: wizard_button:account.asset.compute,init,end:0
|
||||
#: wizard_button:account.asset.modify,init,end:0
|
||||
msgid "Cancel"
|
||||
msgstr ""
|
||||
msgstr "Odustani"
|
||||
|
||||
#. module: account_asset
|
||||
#: selection:account.asset.asset,state:0
|
||||
#: wizard_button:account.asset.compute,asset_compute,end:0
|
||||
#: selection:account.asset.property,state:0
|
||||
msgid "Close"
|
||||
msgstr ""
|
||||
msgstr "Zatvori"
|
||||
|
||||
#. module: account_asset
|
||||
#: selection:account.asset.property,state:0
|
||||
|
|
@ -441,12 +441,12 @@ msgstr ""
|
|||
#. module: account_asset
|
||||
#: field:account.asset.property,journal_id:0
|
||||
msgid "Journal"
|
||||
msgstr ""
|
||||
msgstr "Dnevnik"
|
||||
|
||||
#. module: account_asset
|
||||
#: field:account.asset.property.history,name:0
|
||||
msgid "History name"
|
||||
msgstr ""
|
||||
msgstr "Naziv"
|
||||
|
||||
#. module: account_asset
|
||||
#: view:account.asset.asset:0
|
||||
|
|
@ -464,7 +464,7 @@ msgstr ""
|
|||
#: field:account.asset.category,name:0
|
||||
#: model:ir.model,name:account_asset.model_account_asset_category
|
||||
msgid "Asset category"
|
||||
msgstr ""
|
||||
msgstr "Asset category"
|
||||
|
||||
#. module: account_asset
|
||||
#: view:account.asset.asset:0
|
||||
|
|
@ -526,4 +526,4 @@ msgstr ""
|
|||
#: model:ir.actions.act_window,name:account_asset.action_account_asset_asset_tree
|
||||
#: model:ir.ui.menu,name:account_asset.menu_action_account_asset_asset_tree
|
||||
msgid "Asset Hierarchy"
|
||||
msgstr ""
|
||||
msgstr "hijerarhija imovine"
|
||||
|
|
|
|||
|
|
@ -23,7 +23,7 @@
|
|||
"name" : "Cancel Entries",
|
||||
"version" : "1.1",
|
||||
"author" : "OpenERP SA",
|
||||
"category": 'Hidden',
|
||||
"category": 'Accounting & Finance',
|
||||
'complexity': "normal",
|
||||
"description": """
|
||||
Allows cancelling accounting entries.
|
||||
|
|
|
|||
|
|
@ -8,14 +8,14 @@ msgstr ""
|
|||
"Project-Id-Version: openobject-addons\n"
|
||||
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
|
||||
"POT-Creation-Date: 2011-01-11 11:14+0000\n"
|
||||
"PO-Revision-Date: 2010-09-10 16:28+0000\n"
|
||||
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
|
||||
"PO-Revision-Date: 2011-12-08 15:10+0000\n"
|
||||
"Last-Translator: Goran Kliska <gkliska@gmail.com>\n"
|
||||
"Language-Team: Croatian <hr@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: 2011-11-05 05:46+0000\n"
|
||||
"X-Generator: Launchpad (build 14231)\n"
|
||||
"X-Launchpad-Export-Date: 2011-12-09 04:46+0000\n"
|
||||
"X-Generator: Launchpad (build 14450)\n"
|
||||
|
||||
#. module: account_cancel
|
||||
#: model:ir.module.module,description:account_cancel.module_meta_information
|
||||
|
|
@ -25,8 +25,12 @@ msgid ""
|
|||
"journal. If set to true it allows user to cancel entries & invoices.\n"
|
||||
" "
|
||||
msgstr ""
|
||||
"\n"
|
||||
" Modul dodaje polje \"Dozvoli otkazivanje\" na formi dnevnika. Knjiženja "
|
||||
"i računi označenih dnevnika će se moći otkazivati.\n"
|
||||
" "
|
||||
|
||||
#. module: account_cancel
|
||||
#: model:ir.module.module,shortdesc:account_cancel.module_meta_information
|
||||
msgid "Account Cancel"
|
||||
msgstr ""
|
||||
msgstr "Dozvoli otkazivanje"
|
||||
|
|
|
|||
|
|
@ -21,9 +21,9 @@
|
|||
|
||||
|
||||
{
|
||||
'name': 'Charts of Accounts',
|
||||
'name': 'Template of Charts of Accounts',
|
||||
'version': '1.1',
|
||||
'category': 'Hidden',
|
||||
"category": 'Accounting & Finance',
|
||||
'description': """
|
||||
Remove minimal account chart.
|
||||
=============================
|
||||
|
|
|
|||
|
|
@ -20,10 +20,10 @@
|
|||
##############################################################################
|
||||
|
||||
{
|
||||
"name" : "Account CODA - import bank statements from coda file",
|
||||
"name" : "CODA Bank Statements",
|
||||
"version" : "1.0",
|
||||
"author" : "OpenERP SA",
|
||||
"category" : "Hidden",
|
||||
"category": 'Accounting & Finance',
|
||||
'complexity': "normal",
|
||||
"description": """
|
||||
Module provides functionality to import bank statements from coda files.
|
||||
|
|
|
|||
|
|
@ -8,14 +8,14 @@ msgstr ""
|
|||
"Project-Id-Version: openobject-addons\n"
|
||||
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
|
||||
"POT-Creation-Date: 2011-01-11 11:14+0000\n"
|
||||
"PO-Revision-Date: 2010-10-15 09:33+0000\n"
|
||||
"Last-Translator: OpenERP Administrators <Unknown>\n"
|
||||
"PO-Revision-Date: 2011-12-08 16:14+0000\n"
|
||||
"Last-Translator: Goran Kliska <gkliska@gmail.com>\n"
|
||||
"Language-Team: Croatian <hr@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: 2011-11-05 05:42+0000\n"
|
||||
"X-Generator: Launchpad (build 14231)\n"
|
||||
"X-Launchpad-Export-Date: 2011-12-09 04:46+0000\n"
|
||||
"X-Generator: Launchpad (build 14450)\n"
|
||||
|
||||
#. module: account_coda
|
||||
#: help:account.coda,journal_id:0
|
||||
|
|
@ -32,37 +32,37 @@ msgstr "Zapisnik"
|
|||
#. module: account_coda
|
||||
#: model:ir.model,name:account_coda.model_account_coda_import
|
||||
msgid "Account Coda Import"
|
||||
msgstr ""
|
||||
msgstr "Account Coda Import"
|
||||
|
||||
#. module: account_coda
|
||||
#: field:account.coda,name:0
|
||||
msgid "Coda file"
|
||||
msgstr ""
|
||||
msgstr "Coda file"
|
||||
|
||||
#. module: account_coda
|
||||
#: view:account.coda:0
|
||||
msgid "Group By..."
|
||||
msgstr ""
|
||||
msgstr "Grupiraj po..."
|
||||
|
||||
#. module: account_coda
|
||||
#: field:account.coda.import,awaiting_account:0
|
||||
msgid "Default Account for Unrecognized Movement"
|
||||
msgstr ""
|
||||
msgstr "Konto za nepoznate (konto nep. kupaca)"
|
||||
|
||||
#. module: account_coda
|
||||
#: help:account.coda,date:0
|
||||
msgid "Import Date"
|
||||
msgstr ""
|
||||
msgstr "Datum uvoza"
|
||||
|
||||
#. module: account_coda
|
||||
#: field:account.coda,note:0
|
||||
msgid "Import log"
|
||||
msgstr ""
|
||||
msgstr "Import log"
|
||||
|
||||
#. module: account_coda
|
||||
#: view:account.coda.import:0
|
||||
msgid "Import"
|
||||
msgstr ""
|
||||
msgstr "Uvoz"
|
||||
|
||||
#. module: account_coda
|
||||
#: view:account.coda:0
|
||||
|
|
@ -81,12 +81,14 @@ msgid ""
|
|||
"Set here the default account that will be used, if the partner is found but "
|
||||
"does not have the bank account, or if he is domiciled"
|
||||
msgstr ""
|
||||
"Zadajte uobičajeni konto za slučaj da je partner pronađen, ali nema upisan "
|
||||
"bankovni račun."
|
||||
|
||||
#. module: account_coda
|
||||
#: view:account.coda:0
|
||||
#: field:account.coda,company_id:0
|
||||
msgid "Company"
|
||||
msgstr ""
|
||||
msgstr "Organizacija"
|
||||
|
||||
#. module: account_coda
|
||||
#: help:account.coda.import,def_payable:0
|
||||
|
|
@ -94,11 +96,13 @@ msgid ""
|
|||
"Set here the payable account that will be used, by default, if the partner "
|
||||
"is not found"
|
||||
msgstr ""
|
||||
"Postavite ovdje račun plaćanja koji će se koristiti po defaultu ukoliko "
|
||||
"partner nije pronađen"
|
||||
|
||||
#. module: account_coda
|
||||
#: view:account.coda:0
|
||||
msgid "Search Coda"
|
||||
msgstr ""
|
||||
msgstr "Traži Coda"
|
||||
|
||||
#. module: account_coda
|
||||
#: view:account.coda:0
|
||||
|
|
@ -110,12 +114,12 @@ msgstr "Korisnik"
|
|||
#: view:account.coda:0
|
||||
#: field:account.coda,date:0
|
||||
msgid "Date"
|
||||
msgstr ""
|
||||
msgstr "Datum"
|
||||
|
||||
#. module: account_coda
|
||||
#: model:ir.ui.menu,name:account_coda.menu_account_coda_statement
|
||||
msgid "Coda Import Logs"
|
||||
msgstr ""
|
||||
msgstr "Coda Import Logs"
|
||||
|
||||
#. module: account_coda
|
||||
#: model:ir.model,name:account_coda.model_account_coda
|
||||
|
|
@ -125,22 +129,22 @@ msgstr "coda za jedan nalog"
|
|||
#. module: account_coda
|
||||
#: field:account.coda.import,def_payable:0
|
||||
msgid "Default Payable Account"
|
||||
msgstr "Osnovni platni konto"
|
||||
msgstr "Uobičajeni konto obveza"
|
||||
|
||||
#. module: account_coda
|
||||
#: help:account.coda,name:0
|
||||
msgid "Store the detail of bank statements"
|
||||
msgstr ""
|
||||
msgstr "Store the detail of bank statements"
|
||||
|
||||
#. module: account_coda
|
||||
#: view:account.coda.import:0
|
||||
msgid "Cancel"
|
||||
msgstr ""
|
||||
msgstr "Odustani"
|
||||
|
||||
#. module: account_coda
|
||||
#: view:account.coda.import:0
|
||||
msgid "Open Statements"
|
||||
msgstr ""
|
||||
msgstr "Open Statements"
|
||||
|
||||
#. module: account_coda
|
||||
#: code:addons/account_coda/wizard/account_coda_import.py:167
|
||||
|
|
@ -151,13 +155,13 @@ msgstr ""
|
|||
#. module: account_coda
|
||||
#: model:ir.ui.menu,name:account_coda.menu_account_coda_import
|
||||
msgid "Import Coda Statements"
|
||||
msgstr ""
|
||||
msgstr "Uvoz Coda izjave"
|
||||
|
||||
#. module: account_coda
|
||||
#: view:account.coda.import:0
|
||||
#: model:ir.actions.act_window,name:account_coda.action_account_coda_import
|
||||
msgid "Import Coda Statement"
|
||||
msgstr ""
|
||||
msgstr "Import Coda Statement"
|
||||
|
||||
#. module: account_coda
|
||||
#: model:ir.module.module,description:account_coda.module_meta_information
|
||||
|
|
@ -171,22 +175,22 @@ msgstr ""
|
|||
#. module: account_coda
|
||||
#: view:account.coda:0
|
||||
msgid "Statements"
|
||||
msgstr ""
|
||||
msgstr "Izvodi"
|
||||
|
||||
#. module: account_coda
|
||||
#: field:account.bank.statement,coda_id:0
|
||||
msgid "Coda"
|
||||
msgstr ""
|
||||
msgstr "Coda"
|
||||
|
||||
#. module: account_coda
|
||||
#: view:account.coda.import:0
|
||||
msgid "Results :"
|
||||
msgstr ""
|
||||
msgstr "Rezultat :"
|
||||
|
||||
#. module: account_coda
|
||||
#: view:account.coda.import:0
|
||||
msgid "Result of Imported Coda Statements"
|
||||
msgstr ""
|
||||
msgstr "Rezultat uveženih Coda izvoda"
|
||||
|
||||
#. module: account_coda
|
||||
#: help:account.coda.import,def_receivable:0
|
||||
|
|
@ -194,22 +198,24 @@ msgid ""
|
|||
"Set here the receivable account that will be used, by default, if the "
|
||||
"partner is not found"
|
||||
msgstr ""
|
||||
"Zadajte uobičajeni konto potraživanja od kupaca kada partner nije "
|
||||
"pronađen/prepoznat sa izvoda."
|
||||
|
||||
#. module: account_coda
|
||||
#: field:account.coda.import,coda:0
|
||||
#: model:ir.actions.act_window,name:account_coda.act_account_payment_account_bank_statement
|
||||
msgid "Coda File"
|
||||
msgstr ""
|
||||
msgstr "Coda File"
|
||||
|
||||
#. module: account_coda
|
||||
#: model:ir.model,name:account_coda.model_account_bank_statement
|
||||
msgid "Bank Statement"
|
||||
msgstr ""
|
||||
msgstr "Izvod banke"
|
||||
|
||||
#. module: account_coda
|
||||
#: model:ir.actions.act_window,name:account_coda.action_account_coda
|
||||
msgid "Coda Logs"
|
||||
msgstr ""
|
||||
msgstr "Coda Evidencije"
|
||||
|
||||
#. module: account_coda
|
||||
#: code:addons/account_coda/wizard/account_coda_import.py:311
|
||||
|
|
@ -220,22 +226,22 @@ msgstr ""
|
|||
#. module: account_coda
|
||||
#: view:account.coda.import:0
|
||||
msgid "Click on 'New' to select your file :"
|
||||
msgstr ""
|
||||
msgstr "Kliknite na \"Novo\" kako bi odabrali svoj file :"
|
||||
|
||||
#. module: account_coda
|
||||
#: field:account.coda.import,def_receivable:0
|
||||
msgid "Default Receivable Account"
|
||||
msgstr ""
|
||||
msgstr "Uobičajeni konto potraživanja"
|
||||
|
||||
#. module: account_coda
|
||||
#: view:account.coda.import:0
|
||||
msgid "Close"
|
||||
msgstr ""
|
||||
msgstr "Zatvori"
|
||||
|
||||
#. module: account_coda
|
||||
#: field:account.coda,statement_ids:0
|
||||
msgid "Generated Bank Statements"
|
||||
msgstr ""
|
||||
msgstr "Generirani bankovni izvodi"
|
||||
|
||||
#. module: account_coda
|
||||
#: model:ir.module.module,shortdesc:account_coda.module_meta_information
|
||||
|
|
@ -245,18 +251,18 @@ msgstr ""
|
|||
#. module: account_coda
|
||||
#: view:account.coda.import:0
|
||||
msgid "Configure Your Journal and Account :"
|
||||
msgstr ""
|
||||
msgstr "konfigurirajte temeljnicu i račun :"
|
||||
|
||||
#. module: account_coda
|
||||
#: view:account.coda:0
|
||||
msgid "Coda Import"
|
||||
msgstr ""
|
||||
msgstr "Coda Import"
|
||||
|
||||
#. module: account_coda
|
||||
#: view:account.coda:0
|
||||
#: field:account.coda,journal_id:0
|
||||
msgid "Journal"
|
||||
msgstr ""
|
||||
msgstr "Dnevnik"
|
||||
|
||||
#~ msgid "Clic on 'New' to select your file :"
|
||||
#~ msgstr "Kliknite na \"Novi\" za odabir datoteke"
|
||||
|
|
|
|||
|
|
@ -7,14 +7,14 @@ msgstr ""
|
|||
"Project-Id-Version: OpenERP Server 6.0dev\n"
|
||||
"Report-Msgid-Bugs-To: support@openerp.com\n"
|
||||
"POT-Creation-Date: 2011-01-11 11:14+0000\n"
|
||||
"PO-Revision-Date: 2010-09-04 09:03+0000\n"
|
||||
"PO-Revision-Date: 2011-12-08 16:15+0000\n"
|
||||
"Last-Translator: Goran Kliska <gkliska@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: 2011-11-12 04:52+0000\n"
|
||||
"X-Generator: Launchpad (build 14277)\n"
|
||||
"X-Launchpad-Export-Date: 2011-12-09 04:45+0000\n"
|
||||
"X-Generator: Launchpad (build 14450)\n"
|
||||
|
||||
#. module: account_followup
|
||||
#: code:addons/account_followup/wizard/account_followup_print.py:295
|
||||
|
|
@ -25,7 +25,7 @@ msgstr ""
|
|||
#. module: account_followup
|
||||
#: view:account_followup.followup:0
|
||||
msgid "Search Followup"
|
||||
msgstr ""
|
||||
msgstr "Traži IOS-e"
|
||||
|
||||
#. module: account_followup
|
||||
#: model:ir.module.module,description:account_followup.module_meta_information
|
||||
|
|
@ -55,7 +55,7 @@ msgstr ""
|
|||
#. module: account_followup
|
||||
#: view:account_followup.stat:0
|
||||
msgid "Group By..."
|
||||
msgstr ""
|
||||
msgstr "Grupiraj po..."
|
||||
|
||||
#. module: account_followup
|
||||
#: code:addons/account_followup/wizard/account_followup_print.py:290
|
||||
|
|
@ -72,7 +72,7 @@ msgstr ""
|
|||
#: view:account_followup.followup:0
|
||||
#: field:account_followup.followup,followup_line:0
|
||||
msgid "Follow-Up"
|
||||
msgstr ""
|
||||
msgstr "Follow-Up"
|
||||
|
||||
#. module: account_followup
|
||||
#: field:account_followup.followup,company_id:0
|
||||
|
|
@ -80,12 +80,12 @@ msgstr ""
|
|||
#: field:account_followup.stat,company_id:0
|
||||
#: field:account_followup.stat.by.partner,company_id:0
|
||||
msgid "Company"
|
||||
msgstr "Tvrtka"
|
||||
msgstr "Organizacija"
|
||||
|
||||
#. module: account_followup
|
||||
#: report:account_followup.followup.print:0
|
||||
msgid "Invoice Date"
|
||||
msgstr "Datum Računa"
|
||||
msgstr "Datum računa"
|
||||
|
||||
#. module: account_followup
|
||||
#: field:account.followup.print.all,email_subject:0
|
||||
|
|
@ -96,87 +96,87 @@ msgstr "Predmet email-a"
|
|||
#: model:ir.actions.act_window,help:account_followup.action_followup_stat
|
||||
msgid ""
|
||||
"Follow up on the reminders sent over to your partners for unpaid invoices."
|
||||
msgstr ""
|
||||
msgstr "Izvodi otvorenih stavaka sa neplaćenim računima poslani partnerima."
|
||||
|
||||
#. module: account_followup
|
||||
#: view:account.followup.print.all:0
|
||||
#: view:account_followup.followup.line:0
|
||||
msgid "Legend"
|
||||
msgstr ""
|
||||
msgstr "Legenda"
|
||||
|
||||
#. module: account_followup
|
||||
#: view:account.followup.print.all:0
|
||||
msgid "Ok"
|
||||
msgstr "Ok"
|
||||
msgstr "U redu"
|
||||
|
||||
#. module: account_followup
|
||||
#: view:account.followup.print.all:0
|
||||
msgid "Select Partners to Remind"
|
||||
msgstr ""
|
||||
msgstr "Select Partners to Remind"
|
||||
|
||||
#. module: account_followup
|
||||
#: constraint:account.move.line:0
|
||||
msgid "You can not create move line on closed account."
|
||||
msgstr ""
|
||||
msgstr "Ne možete kreirati stavke prometa za zatvoreni račun."
|
||||
|
||||
#. module: account_followup
|
||||
#: field:account.followup.print,date:0
|
||||
msgid "Follow-up Sending Date"
|
||||
msgstr ""
|
||||
msgstr "Datum slanja IOS-a"
|
||||
|
||||
#. module: account_followup
|
||||
#: sql_constraint:account.move.line:0
|
||||
msgid "Wrong credit or debit value in accounting entry !"
|
||||
msgstr ""
|
||||
msgstr "Pogrešno kreditna ili debitnom vrijednost unešene stavke!"
|
||||
|
||||
#. module: account_followup
|
||||
#: selection:account_followup.followup.line,start:0
|
||||
msgid "Net Days"
|
||||
msgstr ""
|
||||
msgstr "Neto dana"
|
||||
|
||||
#. module: account_followup
|
||||
#: model:ir.actions.act_window,name:account_followup.action_account_followup_definition_form
|
||||
#: model:ir.ui.menu,name:account_followup.account_followup_menu
|
||||
msgid "Follow-Ups"
|
||||
msgstr ""
|
||||
msgstr "IOS-i"
|
||||
|
||||
#. module: account_followup
|
||||
#: view:account_followup.stat.by.partner:0
|
||||
msgid "Balance > 0"
|
||||
msgstr ""
|
||||
msgstr "Balance > 0"
|
||||
|
||||
#. module: account_followup
|
||||
#: view:account.move.line:0
|
||||
msgid "Total debit"
|
||||
msgstr "Ukupni dug"
|
||||
msgstr "Ukupno duguje"
|
||||
|
||||
#. module: account_followup
|
||||
#: view:account.followup.print.all:0
|
||||
msgid "%(heading)s: Move line header"
|
||||
msgstr ""
|
||||
msgstr "%(heading)s: Zaglavlje stavke"
|
||||
|
||||
#. module: account_followup
|
||||
#: view:res.company:0
|
||||
#: field:res.company,follow_up_msg:0
|
||||
msgid "Follow-up Message"
|
||||
msgstr ""
|
||||
msgstr "Poruka IOS-a"
|
||||
|
||||
#. module: account_followup
|
||||
#: field:account.followup.print,followup_id:0
|
||||
msgid "Follow-up"
|
||||
msgstr ""
|
||||
msgstr "Pratiti"
|
||||
|
||||
#. module: account_followup
|
||||
#: report:account_followup.followup.print:0
|
||||
msgid "VAT:"
|
||||
msgstr "VAT:"
|
||||
msgstr "PDV:"
|
||||
|
||||
#. module: account_followup
|
||||
#: view:account_followup.stat:0
|
||||
#: field:account_followup.stat,partner_id:0
|
||||
#: field:account_followup.stat.by.partner,partner_id:0
|
||||
msgid "Partner"
|
||||
msgstr ""
|
||||
msgstr "Partner"
|
||||
|
||||
#. module: account_followup
|
||||
#: report:account_followup.followup.print:0
|
||||
|
|
@ -197,7 +197,7 @@ msgstr ""
|
|||
#. module: account_followup
|
||||
#: model:ir.model,name:account_followup.model_account_followup_followup
|
||||
msgid "Account Follow Up"
|
||||
msgstr ""
|
||||
msgstr "Upravljanje IOS-ima"
|
||||
|
||||
#. module: account_followup
|
||||
#: selection:account_followup.followup.line,start:0
|
||||
|
|
@ -207,7 +207,7 @@ msgstr "Kraj Mjeseca"
|
|||
#. module: account_followup
|
||||
#: view:account_followup.stat:0
|
||||
msgid "Not Litigation"
|
||||
msgstr ""
|
||||
msgstr "Not Litigation"
|
||||
|
||||
#. module: account_followup
|
||||
#: view:account.followup.print.all:0
|
||||
|
|
@ -217,7 +217,7 @@ msgstr "%(user_signature)s: Korisničko ime"
|
|||
#. module: account_followup
|
||||
#: field:account_followup.stat,debit:0
|
||||
msgid "Debit"
|
||||
msgstr "Dug"
|
||||
msgstr "Duguje"
|
||||
|
||||
#. module: account_followup
|
||||
#: view:account.followup.print:0
|
||||
|
|
@ -226,33 +226,36 @@ msgid ""
|
|||
"You can send them the default message for unpaid invoices or manually enter "
|
||||
"a message should you need to remind them of a specific information."
|
||||
msgstr ""
|
||||
"This feature allows you to send reminders to partners with pending invoices. "
|
||||
"You can send them the default message for unpaid invoices or manually enter "
|
||||
"a message should you need to remind them of a specific information."
|
||||
|
||||
#. module: account_followup
|
||||
#: report:account_followup.followup.print:0
|
||||
msgid "Ref"
|
||||
msgstr ""
|
||||
msgstr "Vezna oznaka"
|
||||
|
||||
#. module: account_followup
|
||||
#: help:account_followup.followup.line,sequence:0
|
||||
msgid "Gives the sequence order when displaying a list of follow-up lines."
|
||||
msgstr ""
|
||||
msgstr "Gives the sequence order when displaying a list of follow-up lines."
|
||||
|
||||
#. module: account_followup
|
||||
#: view:account.followup.print.all:0
|
||||
#: field:account.followup.print.all,email_body:0
|
||||
msgid "Email body"
|
||||
msgstr ""
|
||||
msgstr "Email sadržaj"
|
||||
|
||||
#. module: account_followup
|
||||
#: field:account.move.line,followup_line_id:0
|
||||
msgid "Follow-up Level"
|
||||
msgstr ""
|
||||
msgstr "Nivo IOSa"
|
||||
|
||||
#. module: account_followup
|
||||
#: field:account_followup.stat,date_followup:0
|
||||
#: field:account_followup.stat.by.partner,date_followup:0
|
||||
msgid "Latest followup"
|
||||
msgstr ""
|
||||
msgstr "Zadnji IOS"
|
||||
|
||||
#. module: account_followup
|
||||
#: model:account_followup.followup.line,description:account_followup.demo_followup_line2
|
||||
|
|
@ -281,7 +284,7 @@ msgstr ""
|
|||
#. module: account_followup
|
||||
#: field:account.followup.print.all,partner_lang:0
|
||||
msgid "Send Email in Partner Language"
|
||||
msgstr ""
|
||||
msgstr "Send Email in Partner Language"
|
||||
|
||||
#. module: account_followup
|
||||
#: constraint:account.move.line:0
|
||||
|
|
@ -306,18 +309,18 @@ msgstr "Ispisana Poruka"
|
|||
#: model:ir.actions.act_window,name:account_followup.action_account_followup_print_all
|
||||
#: model:ir.ui.menu,name:account_followup.account_followup_print_menu
|
||||
msgid "Send followups"
|
||||
msgstr ""
|
||||
msgstr "Pošalji IOS-e"
|
||||
|
||||
#. module: account_followup
|
||||
#: view:account_followup.stat.by.partner:0
|
||||
msgid "Partner to Remind"
|
||||
msgstr ""
|
||||
msgstr "Partner to Remind"
|
||||
|
||||
#. module: account_followup
|
||||
#: field:account_followup.followup.line,followup_id:0
|
||||
#: field:account_followup.stat,followup_id:0
|
||||
msgid "Follow Ups"
|
||||
msgstr ""
|
||||
msgstr "IOS-i"
|
||||
|
||||
#. module: account_followup
|
||||
#: model:account_followup.followup.line,description:account_followup.demo_followup_line1
|
||||
|
|
@ -359,7 +362,7 @@ msgstr ""
|
|||
#. module: account_followup
|
||||
#: view:account.followup.print.all:0
|
||||
msgid "Send Mails"
|
||||
msgstr ""
|
||||
msgstr "Send Mails"
|
||||
|
||||
#. module: account_followup
|
||||
#: report:account_followup.followup.print:0
|
||||
|
|
@ -369,7 +372,7 @@ msgstr ""
|
|||
#. module: account_followup
|
||||
#: model:ir.model,name:account_followup.model_account_followup_stat_by_partner
|
||||
msgid "Followup Statistics by Partner"
|
||||
msgstr ""
|
||||
msgstr "Statistika IOS-a po partneru"
|
||||
|
||||
#. module: account_followup
|
||||
#: model:ir.module.module,shortdesc:account_followup.module_meta_information
|
||||
|
|
@ -379,13 +382,13 @@ msgstr ""
|
|||
#. module: account_followup
|
||||
#: field:account_followup.stat,blocked:0
|
||||
msgid "Blocked"
|
||||
msgstr ""
|
||||
msgstr "Blocked"
|
||||
|
||||
#. module: account_followup
|
||||
#: help:account.followup.print,date:0
|
||||
msgid ""
|
||||
"This field allow you to select a forecast date to plan your follow-ups"
|
||||
msgstr ""
|
||||
msgstr "Upišite planirani dan kreiranja IOS-a"
|
||||
|
||||
#. module: account_followup
|
||||
#: report:account_followup.followup.print:0
|
||||
|
|
@ -406,12 +409,12 @@ msgstr "Email Postavke"
|
|||
#. module: account_followup
|
||||
#: view:account.followup.print.all:0
|
||||
msgid "Print Follow Ups"
|
||||
msgstr ""
|
||||
msgstr "Ispiši sve IOS-e"
|
||||
|
||||
#. module: account_followup
|
||||
#: field:account.move.line,followup_date:0
|
||||
msgid "Latest Follow-up"
|
||||
msgstr ""
|
||||
msgstr "Zadnji IOS-i"
|
||||
|
||||
#. module: account_followup
|
||||
#: report:account_followup.followup.print:0
|
||||
|
|
@ -426,7 +429,7 @@ msgstr "Saldo:"
|
|||
#. module: account_followup
|
||||
#: model:ir.model,name:account_followup.model_account_followup_stat
|
||||
msgid "Followup Statistics"
|
||||
msgstr ""
|
||||
msgstr "Statistika IOS-a"
|
||||
|
||||
#. module: account_followup
|
||||
#: report:account_followup.followup.print:0
|
||||
|
|
@ -436,22 +439,22 @@ msgstr "Plaćeno"
|
|||
#. module: account_followup
|
||||
#: view:account_followup.followup.line:0
|
||||
msgid "%(user_signature)s: User Name"
|
||||
msgstr ""
|
||||
msgstr "%(user_signature)s: User Name"
|
||||
|
||||
#. module: account_followup
|
||||
#: model:ir.model,name:account_followup.model_account_move_line
|
||||
msgid "Journal Items"
|
||||
msgstr ""
|
||||
msgstr "Stavke glavne knjige"
|
||||
|
||||
#. module: account_followup
|
||||
#: constraint:account.move.line:0
|
||||
msgid "Company must be same for its related account and period."
|
||||
msgstr ""
|
||||
msgstr "Company must be same for its related account and period."
|
||||
|
||||
#. module: account_followup
|
||||
#: field:account.followup.print.all,email_conf:0
|
||||
msgid "Send email confirmation"
|
||||
msgstr ""
|
||||
msgstr "Send email confirmation"
|
||||
|
||||
#. module: account_followup
|
||||
#: code:addons/account_followup/wizard/account_followup_print.py:287
|
||||
|
|
@ -465,17 +468,17 @@ msgstr ""
|
|||
#. module: account_followup
|
||||
#: constraint:res.company:0
|
||||
msgid "Error! You can not create recursive companies."
|
||||
msgstr ""
|
||||
msgstr "Pogreška! Ne možete kreirati rekurzivne organizacije."
|
||||
|
||||
#. module: account_followup
|
||||
#: view:account.followup.print.all:0
|
||||
msgid "%(company_name)s: User's Company name"
|
||||
msgstr ""
|
||||
msgstr "%(poduzeće_naziv)s: User's Company name"
|
||||
|
||||
#. module: account_followup
|
||||
#: model:ir.model,name:account_followup.model_res_company
|
||||
msgid "Companies"
|
||||
msgstr ""
|
||||
msgstr "Organizacije"
|
||||
|
||||
#. module: account_followup
|
||||
#: view:account_followup.followup:0
|
||||
|
|
@ -485,34 +488,34 @@ msgstr ""
|
|||
#. module: account_followup
|
||||
#: field:account_followup.stat,credit:0
|
||||
msgid "Credit"
|
||||
msgstr ""
|
||||
msgstr "Potražuje"
|
||||
|
||||
#. module: account_followup
|
||||
#: report:account_followup.followup.print:0
|
||||
msgid "Maturity Date"
|
||||
msgstr ""
|
||||
msgstr "Maturity Date"
|
||||
|
||||
#. module: account_followup
|
||||
#: view:account_followup.followup.line:0
|
||||
msgid "%(partner_name)s: Partner Name"
|
||||
msgstr ""
|
||||
msgstr "%(partner_name)s: Partner Name"
|
||||
|
||||
#. module: account_followup
|
||||
#: view:account_followup.stat:0
|
||||
msgid "Follow-Up lines"
|
||||
msgstr ""
|
||||
msgstr "Stavke IOS-a"
|
||||
|
||||
#. module: account_followup
|
||||
#: view:account.followup.print.all:0
|
||||
msgid "%(company_currency)s: User's Company Currency"
|
||||
msgstr ""
|
||||
msgstr "%(company_currency)s: Valuta organizacije"
|
||||
|
||||
#. module: account_followup
|
||||
#: view:account_followup.stat:0
|
||||
#: field:account_followup.stat,balance:0
|
||||
#: field:account_followup.stat.by.partner,balance:0
|
||||
msgid "Balance"
|
||||
msgstr ""
|
||||
msgstr "Saldo"
|
||||
|
||||
#. module: account_followup
|
||||
#: field:account_followup.followup.line,start:0
|
||||
|
|
@ -523,29 +526,29 @@ msgstr "Tip Uvjeta"
|
|||
#: model:ir.model,name:account_followup.model_account_followup_print
|
||||
#: model:ir.model,name:account_followup.model_account_followup_print_all
|
||||
msgid "Print Followup & Send Mail to Customers"
|
||||
msgstr ""
|
||||
msgstr "Print Followup & Send Mail to Customers"
|
||||
|
||||
#. module: account_followup
|
||||
#: field:account_followup.stat,date_move_last:0
|
||||
#: field:account_followup.stat.by.partner,date_move_last:0
|
||||
msgid "Last move"
|
||||
msgstr ""
|
||||
msgstr "Zadnja transakcija"
|
||||
|
||||
#. module: account_followup
|
||||
#: model:ir.actions.report.xml,name:account_followup.account_followup_followup_report
|
||||
msgid "Followup Report"
|
||||
msgstr ""
|
||||
msgstr "Izvještaj IOS-a"
|
||||
|
||||
#. module: account_followup
|
||||
#: field:account_followup.stat,period_id:0
|
||||
msgid "Period"
|
||||
msgstr ""
|
||||
msgstr "Period"
|
||||
|
||||
#. module: account_followup
|
||||
#: view:account.followup.print:0
|
||||
#: view:account.followup.print.all:0
|
||||
msgid "Cancel"
|
||||
msgstr ""
|
||||
msgstr "Odustani"
|
||||
|
||||
#. module: account_followup
|
||||
#: view:account_followup.followup.line:0
|
||||
|
|
@ -555,22 +558,22 @@ msgstr ""
|
|||
#. module: account_followup
|
||||
#: view:account_followup.stat:0
|
||||
msgid "Litigation"
|
||||
msgstr ""
|
||||
msgstr "Sporno"
|
||||
|
||||
#. module: account_followup
|
||||
#: field:account_followup.stat.by.partner,max_followup_id:0
|
||||
msgid "Max Follow Up Level"
|
||||
msgstr ""
|
||||
msgstr "Max Follow Up Level"
|
||||
|
||||
#. module: account_followup
|
||||
#: model:ir.actions.act_window,name:account_followup.act_account_partner_account_move_payable_all
|
||||
msgid "Payable Items"
|
||||
msgstr ""
|
||||
msgstr "Payable Items"
|
||||
|
||||
#. module: account_followup
|
||||
#: view:account.followup.print.all:0
|
||||
msgid "%(followup_amount)s: Total Amount Due"
|
||||
msgstr ""
|
||||
msgstr "%(followup_amount)s: Ukupni iznos duga"
|
||||
|
||||
#. module: account_followup
|
||||
#: view:account.followup.print.all:0
|
||||
|
|
@ -581,7 +584,7 @@ msgstr "%(date)s: Trenutni Datum"
|
|||
#. module: account_followup
|
||||
#: view:account_followup.stat:0
|
||||
msgid "Followup Level"
|
||||
msgstr ""
|
||||
msgstr "Nivo IOS-a"
|
||||
|
||||
#. module: account_followup
|
||||
#: view:account_followup.followup:0
|
||||
|
|
@ -593,12 +596,12 @@ msgstr "Opis"
|
|||
#. module: account_followup
|
||||
#: view:account_followup.stat:0
|
||||
msgid "This Fiscal year"
|
||||
msgstr ""
|
||||
msgstr "This Fiscal year"
|
||||
|
||||
#. module: account_followup
|
||||
#: view:account.move.line:0
|
||||
msgid "Partner entries"
|
||||
msgstr ""
|
||||
msgstr "Partner entries"
|
||||
|
||||
#. module: account_followup
|
||||
#: help:account.followup.print.all,partner_lang:0
|
||||
|
|
@ -606,24 +609,26 @@ msgid ""
|
|||
"Do not change message text, if you want to send email in partner language, "
|
||||
"or configure from company"
|
||||
msgstr ""
|
||||
"Ne mijenjajte tekstualne poruke, ako želite poslati e-mail u partnerskom "
|
||||
"jeziku, ili konfigurirati iz tvrtke"
|
||||
|
||||
#. module: account_followup
|
||||
#: model:ir.actions.act_window,name:account_followup.act_account_partner_account_move_all
|
||||
msgid "Receivable Items"
|
||||
msgstr ""
|
||||
msgstr "Receivable Items"
|
||||
|
||||
#. module: account_followup
|
||||
#: view:account_followup.stat:0
|
||||
#: model:ir.actions.act_window,name:account_followup.action_followup_stat
|
||||
#: model:ir.ui.menu,name:account_followup.menu_action_followup_stat_follow
|
||||
msgid "Follow-ups Sent"
|
||||
msgstr ""
|
||||
msgstr "Poslani IOS-i"
|
||||
|
||||
#. module: account_followup
|
||||
#: field:account_followup.followup,name:0
|
||||
#: field:account_followup.followup.line,name:0
|
||||
msgid "Name"
|
||||
msgstr "Ime"
|
||||
msgstr "Naziv"
|
||||
|
||||
#. module: account_followup
|
||||
#: field:account_followup.stat,date_move:0
|
||||
|
|
@ -653,43 +658,43 @@ msgstr ""
|
|||
#. module: account_followup
|
||||
#: view:account.followup.print:0
|
||||
msgid "Continue"
|
||||
msgstr ""
|
||||
msgstr "Continue"
|
||||
|
||||
#. module: account_followup
|
||||
#: field:account_followup.followup.line,delay:0
|
||||
msgid "Days of delay"
|
||||
msgstr ""
|
||||
msgstr "Dana kašnjenja"
|
||||
|
||||
#. module: account_followup
|
||||
#: report:account_followup.followup.print:0
|
||||
msgid "Document : Customer account statement"
|
||||
msgstr ""
|
||||
msgstr "Document : Customer account statement"
|
||||
|
||||
#. module: account_followup
|
||||
#: view:account.followup.print.all:0
|
||||
#: field:account.followup.print.all,summary:0
|
||||
msgid "Summary"
|
||||
msgstr ""
|
||||
msgstr "Sažetak"
|
||||
|
||||
#. module: account_followup
|
||||
#: view:account.move.line:0
|
||||
msgid "Total credit"
|
||||
msgstr ""
|
||||
msgstr "Ukupno potražuje"
|
||||
|
||||
#. module: account_followup
|
||||
#: view:account.followup.print.all:0
|
||||
msgid "%(line)s: Ledger Posting lines"
|
||||
msgstr ""
|
||||
msgstr "%(line)s: Ledger Posting lines"
|
||||
|
||||
#. module: account_followup
|
||||
#: field:account_followup.followup.line,sequence:0
|
||||
msgid "Sequence"
|
||||
msgstr ""
|
||||
msgstr "Sekvenca"
|
||||
|
||||
#. module: account_followup
|
||||
#: view:account_followup.followup.line:0
|
||||
msgid "%(company_name)s: User's Company Name"
|
||||
msgstr ""
|
||||
msgstr "%(company_name)s: Naziv korisnikove organizacije"
|
||||
|
||||
#. module: account_followup
|
||||
#: report:account_followup.followup.print:0
|
||||
|
|
@ -699,22 +704,22 @@ msgstr "Poziv na broj"
|
|||
#. module: account_followup
|
||||
#: view:account.followup.print.all:0
|
||||
msgid "%(partner_name)s: Partner name"
|
||||
msgstr ""
|
||||
msgstr "%(partner_name)s: Ime/naziv partnera"
|
||||
|
||||
#. module: account_followup
|
||||
#: view:account_followup.stat:0
|
||||
msgid "Latest Followup Date"
|
||||
msgstr ""
|
||||
msgstr "Datum zadnjeg IOS-a"
|
||||
|
||||
#. module: account_followup
|
||||
#: model:ir.model,name:account_followup.model_account_followup_followup_line
|
||||
msgid "Follow-Up Criteria"
|
||||
msgstr ""
|
||||
msgstr "Kriterij IOS-a"
|
||||
|
||||
#. module: account_followup
|
||||
#: constraint:account.move.line:0
|
||||
msgid "You can not create move line on view account."
|
||||
msgstr ""
|
||||
msgstr "Ne može se knjižiti na sintetički konto."
|
||||
|
||||
#~ msgid "Select partners"
|
||||
#~ msgstr "Odaberi partnere"
|
||||
|
|
|
|||
|
|
@ -64,9 +64,9 @@ class report_rappel(report_sxw.rml_parse):
|
|||
line_cur = {base_currency.id: {'line': []}}
|
||||
|
||||
for line in movelines:
|
||||
if line.account_id.currency_id and (not line.account_id.currency_id.id in line_cur):
|
||||
line_cur[line.account_id.currency_id.id] = {'line': []}
|
||||
currency = line.account_id.currency_id or line.company_id.currency_id
|
||||
if line.currency_id and (not line.currency_id.id in line_cur):
|
||||
line_cur[line.currency_id.id] = {'line': []}
|
||||
currency = line.currency_id or line.company_id.currency_id
|
||||
line_data = {
|
||||
'name': line.move_id.name,
|
||||
'ref': line.ref,
|
||||
|
|
|
|||
|
|
@ -21,9 +21,9 @@
|
|||
|
||||
|
||||
{
|
||||
'name': 'Improve Invoice Layout',
|
||||
'name': 'Invoice Layouts',
|
||||
'version': '1.0',
|
||||
'category': 'Hidden',
|
||||
"category": 'Accounting & Finance',
|
||||
'complexity': "easy",
|
||||
'description': """
|
||||
This module provides some features to improve the layout of the invoices.
|
||||
|
|
|
|||
|
|
@ -7,37 +7,37 @@ msgstr ""
|
|||
"Project-Id-Version: OpenERP Server 6.0dev\n"
|
||||
"Report-Msgid-Bugs-To: support@openerp.com\n"
|
||||
"POT-Creation-Date: 2011-01-11 11:14+0000\n"
|
||||
"PO-Revision-Date: 2009-09-08 14:10+0000\n"
|
||||
"PO-Revision-Date: 2011-12-08 17:04+0000\n"
|
||||
"Last-Translator: Ivica Perić <ivica.peric@ipsoft-tg.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: 2011-11-05 05:22+0000\n"
|
||||
"X-Generator: Launchpad (build 14231)\n"
|
||||
"X-Launchpad-Export-Date: 2011-12-09 04:45+0000\n"
|
||||
"X-Generator: Launchpad (build 14450)\n"
|
||||
|
||||
#. module: account_invoice_layout
|
||||
#: selection:account.invoice.line,state:0
|
||||
msgid "Sub Total"
|
||||
msgstr "Međuzbroj"
|
||||
msgstr "Podzbroj"
|
||||
|
||||
#. module: account_invoice_layout
|
||||
#: report:account.invoice.layout:0
|
||||
#: report:notify_account.invoice:0
|
||||
msgid "Note:"
|
||||
msgstr "Bilješka:"
|
||||
msgstr "Napomena:"
|
||||
|
||||
#. module: account_invoice_layout
|
||||
#: report:account.invoice.layout:0
|
||||
#: report:notify_account.invoice:0
|
||||
msgid "Cancelled Invoice"
|
||||
msgstr "Poništeni račun"
|
||||
msgstr "Otkazani račun"
|
||||
|
||||
#. module: account_invoice_layout
|
||||
#: selection:account.invoice.line,state:0
|
||||
#: field:notify.message,name:0
|
||||
msgid "Title"
|
||||
msgstr ""
|
||||
msgstr "Naslov"
|
||||
|
||||
#. module: account_invoice_layout
|
||||
#: model:ir.actions.act_window,name:account_invoice_layout.action_account_invoice_special_msg
|
||||
|
|
@ -49,7 +49,7 @@ msgstr "Fakure sa izgledom i porukom"
|
|||
#: report:account.invoice.layout:0
|
||||
#: report:notify_account.invoice:0
|
||||
msgid "Disc. (%)"
|
||||
msgstr "Popust (%)"
|
||||
msgstr "Pop.(%)"
|
||||
|
||||
#. module: account_invoice_layout
|
||||
#: selection:account.invoice.line,state:0
|
||||
|
|
@ -59,13 +59,13 @@ msgstr "Bilješka"
|
|||
#. module: account_invoice_layout
|
||||
#: model:ir.model,name:account_invoice_layout.model_notify_message
|
||||
msgid "Notify By Messages"
|
||||
msgstr ""
|
||||
msgstr "Obavijesti po porukama"
|
||||
|
||||
#. module: account_invoice_layout
|
||||
#: help:notify.message,msg:0
|
||||
msgid ""
|
||||
"This notification will appear at the bottom of the Invoices when printed."
|
||||
msgstr "Ova poruka će se pojaviti na dnu ispisanih faktura."
|
||||
msgstr "Ova poruka će se ispisati na podnožju računa."
|
||||
|
||||
#. module: account_invoice_layout
|
||||
#: report:account.invoice.layout:0
|
||||
|
|
@ -97,132 +97,132 @@ msgstr ""
|
|||
#: report:account.invoice.layout:0
|
||||
#: report:notify_account.invoice:0
|
||||
msgid "VAT :"
|
||||
msgstr ""
|
||||
msgstr "PDV :"
|
||||
|
||||
#. module: account_invoice_layout
|
||||
#: report:account.invoice.layout:0
|
||||
#: report:notify_account.invoice:0
|
||||
msgid "Tel. :"
|
||||
msgstr ""
|
||||
msgstr "Tel.:"
|
||||
|
||||
#. module: account_invoice_layout
|
||||
#: report:account.invoice.layout:0
|
||||
#: report:notify_account.invoice:0
|
||||
msgid "PRO-FORMA"
|
||||
msgstr ""
|
||||
msgstr "Pro-forma"
|
||||
|
||||
#. module: account_invoice_layout
|
||||
#: field:account.invoice,abstract_line_ids:0
|
||||
msgid "Invoice Lines"
|
||||
msgstr ""
|
||||
msgstr "Stavke računa"
|
||||
|
||||
#. module: account_invoice_layout
|
||||
#: view:account.invoice.line:0
|
||||
msgid "Seq."
|
||||
msgstr ""
|
||||
msgstr "R.br."
|
||||
|
||||
#. module: account_invoice_layout
|
||||
#: model:ir.ui.menu,name:account_invoice_layout.menu_finan_config_notify_message
|
||||
msgid "Notification Message"
|
||||
msgstr ""
|
||||
msgstr "Notification Message"
|
||||
|
||||
#. module: account_invoice_layout
|
||||
#: selection:account.invoice.line,state:0
|
||||
msgid "Product"
|
||||
msgstr ""
|
||||
msgstr "Proizvod"
|
||||
|
||||
#. module: account_invoice_layout
|
||||
#: report:account.invoice.layout:0
|
||||
#: report:notify_account.invoice:0
|
||||
msgid "Description"
|
||||
msgstr ""
|
||||
msgstr "Opis"
|
||||
|
||||
#. module: account_invoice_layout
|
||||
#: help:account.invoice.line,sequence:0
|
||||
msgid "Gives the sequence order when displaying a list of invoice lines."
|
||||
msgstr ""
|
||||
msgstr "Gives the sequence order when displaying a list of invoice lines."
|
||||
|
||||
#. module: account_invoice_layout
|
||||
#: report:account.invoice.layout:0
|
||||
#: report:notify_account.invoice:0
|
||||
msgid "Price"
|
||||
msgstr ""
|
||||
msgstr "Cijena"
|
||||
|
||||
#. module: account_invoice_layout
|
||||
#: report:account.invoice.layout:0
|
||||
#: report:notify_account.invoice:0
|
||||
msgid "Invoice Date"
|
||||
msgstr ""
|
||||
msgstr "Datum računa"
|
||||
|
||||
#. module: account_invoice_layout
|
||||
#: report:account.invoice.layout:0
|
||||
msgid "Taxes:"
|
||||
msgstr ""
|
||||
msgstr "Porezi:"
|
||||
|
||||
#. module: account_invoice_layout
|
||||
#: field:account.invoice.line,functional_field:0
|
||||
msgid "Source Account"
|
||||
msgstr ""
|
||||
msgstr "Konto"
|
||||
|
||||
#. module: account_invoice_layout
|
||||
#: model:ir.actions.act_window,name:account_invoice_layout.notify_mesage_tree_form
|
||||
msgid "Write Messages"
|
||||
msgstr ""
|
||||
msgstr "Write Messages"
|
||||
|
||||
#. module: account_invoice_layout
|
||||
#: report:account.invoice.layout:0
|
||||
#: report:notify_account.invoice:0
|
||||
msgid "Base"
|
||||
msgstr ""
|
||||
msgstr "Osnovica"
|
||||
|
||||
#. module: account_invoice_layout
|
||||
#: selection:account.invoice.line,state:0
|
||||
msgid "Page Break"
|
||||
msgstr ""
|
||||
msgstr "Page Break"
|
||||
|
||||
#. module: account_invoice_layout
|
||||
#: view:notify.message:0
|
||||
#: field:notify.message,msg:0
|
||||
msgid "Special Message"
|
||||
msgstr ""
|
||||
msgstr "Posebna poruka"
|
||||
|
||||
#. module: account_invoice_layout
|
||||
#: help:account.invoice.special.msg,message:0
|
||||
msgid "Message to Print at the bottom of report"
|
||||
msgstr ""
|
||||
msgstr "Poruka na kraju ispisa"
|
||||
|
||||
#. module: account_invoice_layout
|
||||
#: report:account.invoice.layout:0
|
||||
#: report:notify_account.invoice:0
|
||||
msgid "Quantity"
|
||||
msgstr ""
|
||||
msgstr "Količina"
|
||||
|
||||
#. module: account_invoice_layout
|
||||
#: report:account.invoice.layout:0
|
||||
#: report:notify_account.invoice:0
|
||||
msgid "Refund"
|
||||
msgstr ""
|
||||
msgstr "Povrat novca"
|
||||
|
||||
#. module: account_invoice_layout
|
||||
#: report:account.invoice.layout:0
|
||||
#: report:notify_account.invoice:0
|
||||
msgid "Fax :"
|
||||
msgstr ""
|
||||
msgstr "Fax:"
|
||||
|
||||
#. module: account_invoice_layout
|
||||
#: report:account.invoice.layout:0
|
||||
msgid "Total:"
|
||||
msgstr ""
|
||||
msgstr "Ukupno:"
|
||||
|
||||
#. module: account_invoice_layout
|
||||
#: view:account.invoice.special.msg:0
|
||||
msgid "Select Message"
|
||||
msgstr ""
|
||||
msgstr "Select Message"
|
||||
|
||||
#. module: account_invoice_layout
|
||||
#: view:notify.message:0
|
||||
msgid "Messages"
|
||||
msgstr ""
|
||||
msgstr "Messages"
|
||||
|
||||
#. module: account_invoice_layout
|
||||
#: model:ir.actions.report.xml,name:account_invoice_layout.account_invoices_1
|
||||
|
|
@ -233,66 +233,66 @@ msgstr ""
|
|||
#: report:account.invoice.layout:0
|
||||
#: report:notify_account.invoice:0
|
||||
msgid "Description / Taxes"
|
||||
msgstr ""
|
||||
msgstr "Opis/Porezi"
|
||||
|
||||
#. module: account_invoice_layout
|
||||
#: report:account.invoice.layout:0
|
||||
#: report:notify_account.invoice:0
|
||||
msgid "Amount"
|
||||
msgstr ""
|
||||
msgstr "Iznos"
|
||||
|
||||
#. module: account_invoice_layout
|
||||
#: model:notify.message,msg:account_invoice_layout.demo_message1
|
||||
msgid "ERP & CRM Solutions..."
|
||||
msgstr ""
|
||||
msgstr "ERP & CRM Solutions..."
|
||||
|
||||
#. module: account_invoice_layout
|
||||
#: report:notify_account.invoice:0
|
||||
msgid "Net Total :"
|
||||
msgstr ""
|
||||
msgstr "Net Total :"
|
||||
|
||||
#. module: account_invoice_layout
|
||||
#: report:notify_account.invoice:0
|
||||
msgid "Total :"
|
||||
msgstr ""
|
||||
msgstr "Ukupno :"
|
||||
|
||||
#. module: account_invoice_layout
|
||||
#: report:account.invoice.layout:0
|
||||
#: report:notify_account.invoice:0
|
||||
msgid "Draft Invoice"
|
||||
msgstr ""
|
||||
msgstr "Nacrt računa"
|
||||
|
||||
#. module: account_invoice_layout
|
||||
#: field:account.invoice.line,sequence:0
|
||||
msgid "Sequence Number"
|
||||
msgstr ""
|
||||
msgstr "Redni br."
|
||||
|
||||
#. module: account_invoice_layout
|
||||
#: model:ir.model,name:account_invoice_layout.model_account_invoice_special_msg
|
||||
msgid "Account Invoice Special Message"
|
||||
msgstr ""
|
||||
msgstr "Posebna poruka na računu"
|
||||
|
||||
#. module: account_invoice_layout
|
||||
#: report:account.invoice.layout:0
|
||||
#: report:notify_account.invoice:0
|
||||
msgid "Origin"
|
||||
msgstr ""
|
||||
msgstr "Izvor"
|
||||
|
||||
#. module: account_invoice_layout
|
||||
#: field:account.invoice.line,state:0
|
||||
msgid "Type"
|
||||
msgstr ""
|
||||
msgstr "Vrsta"
|
||||
|
||||
#. module: account_invoice_layout
|
||||
#: selection:account.invoice.line,state:0
|
||||
msgid "Separator Line"
|
||||
msgstr ""
|
||||
msgstr "Separator Line"
|
||||
|
||||
#. module: account_invoice_layout
|
||||
#: report:account.invoice.layout:0
|
||||
#: report:notify_account.invoice:0
|
||||
msgid "Your Reference"
|
||||
msgstr ""
|
||||
msgstr "Vaša oznaka"
|
||||
|
||||
#. module: account_invoice_layout
|
||||
#: model:ir.module.module,shortdesc:account_invoice_layout.module_meta_information
|
||||
|
|
@ -303,63 +303,63 @@ msgstr ""
|
|||
#: report:account.invoice.layout:0
|
||||
#: report:notify_account.invoice:0
|
||||
msgid "Supplier Invoice"
|
||||
msgstr ""
|
||||
msgstr "Ulazni račun"
|
||||
|
||||
#. module: account_invoice_layout
|
||||
#: view:account.invoice.special.msg:0
|
||||
msgid "Print"
|
||||
msgstr ""
|
||||
msgstr "Ispis"
|
||||
|
||||
#. module: account_invoice_layout
|
||||
#: report:account.invoice.layout:0
|
||||
#: report:notify_account.invoice:0
|
||||
msgid "Tax"
|
||||
msgstr ""
|
||||
msgstr "Porez"
|
||||
|
||||
#. module: account_invoice_layout
|
||||
#: model:ir.model,name:account_invoice_layout.model_account_invoice_line
|
||||
msgid "Invoice Line"
|
||||
msgstr ""
|
||||
msgstr "Stavka računa"
|
||||
|
||||
#. module: account_invoice_layout
|
||||
#: report:account.invoice.layout:0
|
||||
msgid "Net Total:"
|
||||
msgstr ""
|
||||
msgstr "Ukupno netto:"
|
||||
|
||||
#. module: account_invoice_layout
|
||||
#: view:notify.message:0
|
||||
msgid "Write a notification or a wishful message."
|
||||
msgstr ""
|
||||
msgstr "Write a notification or a wishful message."
|
||||
|
||||
#. module: account_invoice_layout
|
||||
#: report:account.invoice.layout:0
|
||||
#: model:ir.model,name:account_invoice_layout.model_account_invoice
|
||||
#: report:notify_account.invoice:0
|
||||
msgid "Invoice"
|
||||
msgstr ""
|
||||
msgstr "Račun"
|
||||
|
||||
#. module: account_invoice_layout
|
||||
#: view:account.invoice.special.msg:0
|
||||
msgid "Cancel"
|
||||
msgstr ""
|
||||
msgstr "Odustani"
|
||||
|
||||
#. module: account_invoice_layout
|
||||
#: report:account.invoice.layout:0
|
||||
#: report:notify_account.invoice:0
|
||||
msgid "Supplier Refund"
|
||||
msgstr ""
|
||||
msgstr "Povrat URA"
|
||||
|
||||
#. module: account_invoice_layout
|
||||
#: field:account.invoice.special.msg,message:0
|
||||
msgid "Message"
|
||||
msgstr ""
|
||||
msgstr "Poruka"
|
||||
|
||||
#. module: account_invoice_layout
|
||||
#: report:notify_account.invoice:0
|
||||
msgid "Taxes :"
|
||||
msgstr ""
|
||||
msgstr "Taxes :"
|
||||
|
||||
#. module: account_invoice_layout
|
||||
#: model:ir.ui.menu,name:account_invoice_layout.menu_notify_mesage_tree_form
|
||||
msgid "All Notification Messages"
|
||||
msgstr ""
|
||||
msgstr "Sve poruke"
|
||||
|
|
|
|||
|
|
@ -231,7 +231,7 @@
|
|||
<para style="terp_tblheader_General_Centre">Origin</para>
|
||||
</td>
|
||||
<td>
|
||||
<para style="terp_tblheader_General_Centre">Your Reference</para>
|
||||
<para style="terp_tblheader_General_Centre">Customer Code</para>
|
||||
</td>
|
||||
</tr>
|
||||
</blockTable>
|
||||
|
|
|
|||
|
|
@ -7,19 +7,19 @@ msgstr ""
|
|||
"Project-Id-Version: OpenERP Server 6.0dev\n"
|
||||
"Report-Msgid-Bugs-To: support@openerp.com\n"
|
||||
"POT-Creation-Date: 2011-01-11 11:14+0000\n"
|
||||
"PO-Revision-Date: 2011-01-17 01:09+0000\n"
|
||||
"PO-Revision-Date: 2011-12-08 17:06+0000\n"
|
||||
"Last-Translator: Goran Kliska <gkliska@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: 2011-11-05 05:21+0000\n"
|
||||
"X-Generator: Launchpad (build 14231)\n"
|
||||
"X-Launchpad-Export-Date: 2011-12-09 04:45+0000\n"
|
||||
"X-Generator: Launchpad (build 14450)\n"
|
||||
|
||||
#. module: account_payment
|
||||
#: field:payment.order,date_scheduled:0
|
||||
msgid "Scheduled date if fixed"
|
||||
msgstr "Zakazani datum ako je fiskno"
|
||||
msgstr "Zakazani datum ako je fiksno"
|
||||
|
||||
#. module: account_payment
|
||||
#: field:payment.line,currency:0
|
||||
|
|
@ -29,7 +29,7 @@ msgstr "Valuta partnera"
|
|||
#. module: account_payment
|
||||
#: view:payment.order:0
|
||||
msgid "Set to draft"
|
||||
msgstr "Stavi u pripremu"
|
||||
msgstr "Postavi na nacrt"
|
||||
|
||||
#. module: account_payment
|
||||
#: help:payment.order,mode:0
|
||||
|
|
@ -55,7 +55,7 @@ msgstr ""
|
|||
#. module: account_payment
|
||||
#: field:payment.order,line_ids:0
|
||||
msgid "Payment lines"
|
||||
msgstr "Retci plaćanja"
|
||||
msgstr "Redci plaćanja"
|
||||
|
||||
#. module: account_payment
|
||||
#: view:payment.line:0
|
||||
|
|
@ -71,6 +71,9 @@ msgid ""
|
|||
" Once the bank is confirmed the state is set to 'Confirmed'.\n"
|
||||
" Then the order is paid the state is 'Done'."
|
||||
msgstr ""
|
||||
"When an order is placed the state is 'Draft'.\n"
|
||||
" Once the bank is confirmed the state is set to 'Confirmed'.\n"
|
||||
" Then the order is paid the state is 'Done'."
|
||||
|
||||
#. module: account_payment
|
||||
#: help:account.invoice,amount_to_pay:0
|
||||
|
|
@ -84,7 +87,7 @@ msgstr ""
|
|||
#. module: account_payment
|
||||
#: field:payment.mode,company_id:0
|
||||
msgid "Company"
|
||||
msgstr "Tvrtka"
|
||||
msgstr "Organizacija"
|
||||
|
||||
#. module: account_payment
|
||||
#: field:payment.order,date_prefered:0
|
||||
|
|
@ -104,7 +107,7 @@ msgstr "Stavke"
|
|||
#. module: account_payment
|
||||
#: report:payment.order:0
|
||||
msgid "Used Account"
|
||||
msgstr ""
|
||||
msgstr "Used Account"
|
||||
|
||||
#. module: account_payment
|
||||
#: field:payment.line,ml_maturity_date:0
|
||||
|
|
@ -115,23 +118,23 @@ msgstr "Datum dospijeća"
|
|||
#. module: account_payment
|
||||
#: constraint:account.move.line:0
|
||||
msgid "You can not create move line on closed account."
|
||||
msgstr ""
|
||||
msgstr "Ne možete kreirati stavke prometa za zatvoreni račun."
|
||||
|
||||
#. module: account_payment
|
||||
#: view:account.move.line:0
|
||||
msgid "Account Entry Line"
|
||||
msgstr "Stavke knjiženja"
|
||||
msgstr "Stavke"
|
||||
|
||||
#. module: account_payment
|
||||
#: view:payment.order.create:0
|
||||
msgid "_Add to payment order"
|
||||
msgstr ""
|
||||
msgstr "_Dodaj na nalog za plaćanje"
|
||||
|
||||
#. module: account_payment
|
||||
#: model:ir.actions.act_window,name:account_payment.action_account_payment_populate_statement
|
||||
#: model:ir.actions.act_window,name:account_payment.action_account_populate_statement_confirm
|
||||
msgid "Payment Populate statement"
|
||||
msgstr ""
|
||||
msgstr "Popuni nalog za plaćanje"
|
||||
|
||||
#. module: account_payment
|
||||
#: report:payment.order:0
|
||||
|
|
@ -142,17 +145,17 @@ msgstr "Iznos"
|
|||
#. module: account_payment
|
||||
#: sql_constraint:account.move.line:0
|
||||
msgid "Wrong credit or debit value in accounting entry !"
|
||||
msgstr ""
|
||||
msgstr "Pogrešno kreditna ili debitnom vrijednost unešene stavke!"
|
||||
|
||||
#. module: account_payment
|
||||
#: view:payment.order:0
|
||||
msgid "Total in Company Currency"
|
||||
msgstr "Ukupno u valuti tvrtke"
|
||||
msgstr "Ukupno u valuti organizacije"
|
||||
|
||||
#. module: account_payment
|
||||
#: selection:payment.order,state:0
|
||||
msgid "Cancelled"
|
||||
msgstr "Poništeno"
|
||||
msgstr "Otkazani"
|
||||
|
||||
#. module: account_payment
|
||||
#: model:ir.actions.act_window,name:account_payment.action_payment_order_tree_new
|
||||
|
|
@ -163,12 +166,12 @@ msgstr "Novi nalog za plaćanje"
|
|||
#: report:payment.order:0
|
||||
#: field:payment.order,reference:0
|
||||
msgid "Reference"
|
||||
msgstr "Veza"
|
||||
msgstr "Vezna oznaka"
|
||||
|
||||
#. module: account_payment
|
||||
#: sql_constraint:payment.line:0
|
||||
msgid "The payment line name must be unique!"
|
||||
msgstr ""
|
||||
msgstr "Naziv stavke plaćanja mora biti jedinstven!"
|
||||
|
||||
#. module: account_payment
|
||||
#: model:ir.actions.act_window,name:account_payment.action_payment_order_tree
|
||||
|
|
@ -225,7 +228,7 @@ msgstr "Stanje"
|
|||
#: view:payment.line:0
|
||||
#: view:payment.order:0
|
||||
msgid "Transaction Information"
|
||||
msgstr "Podatci o transakciji"
|
||||
msgstr "Podaci o transakciji"
|
||||
|
||||
#. module: account_payment
|
||||
#: model:ir.actions.act_window,name:account_payment.action_payment_mode_form
|
||||
|
|
@ -244,7 +247,7 @@ msgstr "Efektivni datum"
|
|||
#. module: account_payment
|
||||
#: field:payment.line,ml_inv_ref:0
|
||||
msgid "Invoice Ref."
|
||||
msgstr ""
|
||||
msgstr "Poziv na br."
|
||||
|
||||
#. module: account_payment
|
||||
#: help:payment.order,date_prefered:0
|
||||
|
|
@ -276,7 +279,7 @@ msgstr "Datum izvršenja"
|
|||
#. module: account_payment
|
||||
#: help:payment.mode,journal:0
|
||||
msgid "Bank or Cash Journal for the Payment Mode"
|
||||
msgstr ""
|
||||
msgstr "Dnevnik banke ili blagajne za način plaćanja"
|
||||
|
||||
#. module: account_payment
|
||||
#: selection:payment.order,date_prefered:0
|
||||
|
|
@ -297,7 +300,7 @@ msgstr "Ciljni konto"
|
|||
#. module: account_payment
|
||||
#: view:payment.order:0
|
||||
msgid "Search Payment Orders"
|
||||
msgstr ""
|
||||
msgstr "Traži naloge za plaćanje"
|
||||
|
||||
#. module: account_payment
|
||||
#: constraint:account.move.line:0
|
||||
|
|
@ -323,12 +326,12 @@ msgstr "Ukupni iznos u valuti"
|
|||
#. module: account_payment
|
||||
#: view:payment.order:0
|
||||
msgid "Make Payments"
|
||||
msgstr "Napravite plaćanja"
|
||||
msgstr "Kreiraj plaćanja"
|
||||
|
||||
#. module: account_payment
|
||||
#: field:payment.line,state:0
|
||||
msgid "Communication Type"
|
||||
msgstr "Vrsta veze"
|
||||
msgstr "Vrsta komunikacije"
|
||||
|
||||
#. module: account_payment
|
||||
#: model:ir.module.module,shortdesc:account_payment.module_meta_information
|
||||
|
|
@ -338,32 +341,32 @@ msgstr ""
|
|||
#. module: account_payment
|
||||
#: field:payment.line,bank_statement_line_id:0
|
||||
msgid "Bank statement line"
|
||||
msgstr ""
|
||||
msgstr "Redak bankovnog izvoda"
|
||||
|
||||
#. module: account_payment
|
||||
#: selection:payment.order,date_prefered:0
|
||||
msgid "Due date"
|
||||
msgstr ""
|
||||
msgstr "Datum dospijeća"
|
||||
|
||||
#. module: account_payment
|
||||
#: field:account.invoice,amount_to_pay:0
|
||||
msgid "Amount to be paid"
|
||||
msgstr ""
|
||||
msgstr "Za uplatu"
|
||||
|
||||
#. module: account_payment
|
||||
#: report:payment.order:0
|
||||
msgid "Currency"
|
||||
msgstr ""
|
||||
msgstr "Valuta"
|
||||
|
||||
#. module: account_payment
|
||||
#: view:account.payment.make.payment:0
|
||||
msgid "Yes"
|
||||
msgstr ""
|
||||
msgstr "Da"
|
||||
|
||||
#. module: account_payment
|
||||
#: help:payment.line,info_owner:0
|
||||
msgid "Address of the Main Partner"
|
||||
msgstr ""
|
||||
msgstr "Address of the Main Partner"
|
||||
|
||||
#. module: account_payment
|
||||
#: help:payment.line,date:0
|
||||
|
|
@ -371,42 +374,44 @@ msgid ""
|
|||
"If no payment date is specified, the bank will treat this payment line "
|
||||
"directly"
|
||||
msgstr ""
|
||||
"If no payment date is specified, the bank will treat this payment line "
|
||||
"directly"
|
||||
|
||||
#. module: account_payment
|
||||
#: model:ir.model,name:account_payment.model_account_payment_populate_statement
|
||||
msgid "Account Payment Populate Statement"
|
||||
msgstr ""
|
||||
msgstr "Popuni izvod plaćanja"
|
||||
|
||||
#. module: account_payment
|
||||
#: help:payment.mode,name:0
|
||||
msgid "Mode of Payment"
|
||||
msgstr ""
|
||||
msgstr "Način plaćanja"
|
||||
|
||||
#. module: account_payment
|
||||
#: report:payment.order:0
|
||||
msgid "Value Date"
|
||||
msgstr ""
|
||||
msgstr "Value Date"
|
||||
|
||||
#. module: account_payment
|
||||
#: report:payment.order:0
|
||||
msgid "Payment Type"
|
||||
msgstr ""
|
||||
msgstr "Uvjet plaćanja"
|
||||
|
||||
#. module: account_payment
|
||||
#: help:payment.line,amount_currency:0
|
||||
msgid "Payment amount in the partner currency"
|
||||
msgstr ""
|
||||
msgstr "Iznos plaćanja u partnerovoj valuti"
|
||||
|
||||
#. module: account_payment
|
||||
#: view:payment.order:0
|
||||
#: selection:payment.order,state:0
|
||||
msgid "Draft"
|
||||
msgstr ""
|
||||
msgstr "Nacrt"
|
||||
|
||||
#. module: account_payment
|
||||
#: help:payment.line,communication2:0
|
||||
msgid "The successor message of Communication."
|
||||
msgstr ""
|
||||
msgstr "The successor message of Communication."
|
||||
|
||||
#. module: account_payment
|
||||
#: code:addons/account_payment/account_move_line.py:110
|
||||
|
|
@ -417,43 +422,43 @@ msgstr ""
|
|||
#. module: account_payment
|
||||
#: help:payment.line,info_partner:0
|
||||
msgid "Address of the Ordering Customer."
|
||||
msgstr ""
|
||||
msgstr "Adresa Uplatitelja"
|
||||
|
||||
#. module: account_payment
|
||||
#: view:account.payment.populate.statement:0
|
||||
msgid "Populate Statement:"
|
||||
msgstr ""
|
||||
msgstr "Populate Statement:"
|
||||
|
||||
#. module: account_payment
|
||||
#: view:account.move.line:0
|
||||
msgid "Total credit"
|
||||
msgstr ""
|
||||
msgstr "Ukupno potražuje"
|
||||
|
||||
#. module: account_payment
|
||||
#: help:payment.order,date_scheduled:0
|
||||
msgid "Select a date if you have chosen Preferred Date to be fixed."
|
||||
msgstr ""
|
||||
msgstr "Select a date if you have chosen Preferred Date to be fixed."
|
||||
|
||||
#. module: account_payment
|
||||
#: field:payment.order,user_id:0
|
||||
msgid "User"
|
||||
msgstr ""
|
||||
msgstr "Korisnik"
|
||||
|
||||
#. module: account_payment
|
||||
#: field:account.payment.populate.statement,lines:0
|
||||
#: model:ir.actions.act_window,name:account_payment.act_account_invoice_2_payment_line
|
||||
msgid "Payment Lines"
|
||||
msgstr ""
|
||||
msgstr "Stavke plaćanja"
|
||||
|
||||
#. module: account_payment
|
||||
#: model:ir.model,name:account_payment.model_account_move_line
|
||||
msgid "Journal Items"
|
||||
msgstr ""
|
||||
msgstr "Stavke glavne knjige"
|
||||
|
||||
#. module: account_payment
|
||||
#: constraint:account.move.line:0
|
||||
msgid "Company must be same for its related account and period."
|
||||
msgstr ""
|
||||
msgstr "Company must be same for its related account and period."
|
||||
|
||||
#. module: account_payment
|
||||
#: help:payment.line,move_line_id:0
|
||||
|
|
@ -461,104 +466,106 @@ msgid ""
|
|||
"This Entry Line will be referred for the information of the ordering "
|
||||
"customer."
|
||||
msgstr ""
|
||||
"This Entry Line will be referred for the information of the ordering "
|
||||
"customer."
|
||||
|
||||
#. module: account_payment
|
||||
#: view:payment.order.create:0
|
||||
msgid "Search"
|
||||
msgstr ""
|
||||
msgstr "Search"
|
||||
|
||||
#. module: account_payment
|
||||
#: model:ir.actions.report.xml,name:account_payment.payment_order1
|
||||
#: model:ir.model,name:account_payment.model_payment_order
|
||||
msgid "Payment Order"
|
||||
msgstr ""
|
||||
msgstr "Nalog za plaćanje"
|
||||
|
||||
#. module: account_payment
|
||||
#: field:payment.line,date:0
|
||||
msgid "Payment Date"
|
||||
msgstr ""
|
||||
msgstr "Datum plaćanja"
|
||||
|
||||
#. module: account_payment
|
||||
#: report:payment.order:0
|
||||
msgid "Total:"
|
||||
msgstr ""
|
||||
msgstr "Ukupno:"
|
||||
|
||||
#. module: account_payment
|
||||
#: field:payment.order,date_created:0
|
||||
msgid "Creation date"
|
||||
msgstr ""
|
||||
msgstr "Datum kreiranja"
|
||||
|
||||
#. module: account_payment
|
||||
#: view:account.payment.populate.statement:0
|
||||
msgid "ADD"
|
||||
msgstr ""
|
||||
msgstr "ADD"
|
||||
|
||||
#. module: account_payment
|
||||
#: view:account.bank.statement:0
|
||||
msgid "Import payment lines"
|
||||
msgstr ""
|
||||
msgstr "Uvezi linije plaćanja"
|
||||
|
||||
#. module: account_payment
|
||||
#: field:account.move.line,amount_to_pay:0
|
||||
msgid "Amount to pay"
|
||||
msgstr ""
|
||||
msgstr "Iznos za platiti"
|
||||
|
||||
#. module: account_payment
|
||||
#: field:payment.line,amount:0
|
||||
msgid "Amount in Company Currency"
|
||||
msgstr ""
|
||||
msgstr "Iznos u valuti organizacije"
|
||||
|
||||
#. module: account_payment
|
||||
#: help:payment.line,partner_id:0
|
||||
msgid "The Ordering Customer"
|
||||
msgstr ""
|
||||
msgstr "The Ordering Customer"
|
||||
|
||||
#. module: account_payment
|
||||
#: model:ir.model,name:account_payment.model_account_payment_make_payment
|
||||
msgid "Account make payment"
|
||||
msgstr ""
|
||||
msgstr "Plaćanje"
|
||||
|
||||
#. module: account_payment
|
||||
#: report:payment.order:0
|
||||
msgid "Invoice Ref"
|
||||
msgstr ""
|
||||
msgstr "Poziv na br."
|
||||
|
||||
#. module: account_payment
|
||||
#: field:payment.line,name:0
|
||||
msgid "Your Reference"
|
||||
msgstr ""
|
||||
msgstr "Vaša oznaka"
|
||||
|
||||
#. module: account_payment
|
||||
#: field:payment.order,mode:0
|
||||
msgid "Payment mode"
|
||||
msgstr ""
|
||||
msgstr "Vrsta plaćanja"
|
||||
|
||||
#. module: account_payment
|
||||
#: view:payment.order:0
|
||||
msgid "Payment order"
|
||||
msgstr ""
|
||||
msgstr "Nalog za plaćanje"
|
||||
|
||||
#. module: account_payment
|
||||
#: view:payment.line:0
|
||||
#: view:payment.order:0
|
||||
msgid "General Information"
|
||||
msgstr ""
|
||||
msgstr "Opći podaci"
|
||||
|
||||
#. module: account_payment
|
||||
#: view:payment.order:0
|
||||
#: selection:payment.order,state:0
|
||||
msgid "Done"
|
||||
msgstr ""
|
||||
msgstr "Izvršeno"
|
||||
|
||||
#. module: account_payment
|
||||
#: model:ir.model,name:account_payment.model_account_invoice
|
||||
msgid "Invoice"
|
||||
msgstr ""
|
||||
msgstr "Račun"
|
||||
|
||||
#. module: account_payment
|
||||
#: field:payment.line,communication:0
|
||||
msgid "Communication"
|
||||
msgstr ""
|
||||
msgstr "Veza"
|
||||
|
||||
#. module: account_payment
|
||||
#: view:account.payment.make.payment:0
|
||||
|
|
@ -566,13 +573,13 @@ msgstr ""
|
|||
#: view:payment.order:0
|
||||
#: view:payment.order.create:0
|
||||
msgid "Cancel"
|
||||
msgstr ""
|
||||
msgstr "Odustani"
|
||||
|
||||
#. module: account_payment
|
||||
#: view:payment.line:0
|
||||
#: view:payment.order:0
|
||||
msgid "Information"
|
||||
msgstr ""
|
||||
msgstr "Informacija"
|
||||
|
||||
#. module: account_payment
|
||||
#: model:ir.actions.act_window,help:account_payment.action_payment_order_tree
|
||||
|
|
@ -582,26 +589,30 @@ msgid ""
|
|||
"that should be done, keep track of all payment orders and mention the "
|
||||
"invoice reference and the partner the payment should be done for."
|
||||
msgstr ""
|
||||
"Nalog za plaćanje je zahtjev za plaćanjem za plaćanjem računa dobavljaču ili "
|
||||
"odobrenje kupca. Ovdje se mogu prijaviti svi nalozi za plaćanje koje je "
|
||||
"potrebno izvršiti, omogućuje također praćenje naloga za plaćanje i "
|
||||
"spomenutih računa i partnera koje je potrebno platiti."
|
||||
|
||||
#. module: account_payment
|
||||
#: help:payment.line,amount:0
|
||||
msgid "Payment amount in the company currency"
|
||||
msgstr ""
|
||||
msgstr "Iznos plaćanja u valuti organizacije"
|
||||
|
||||
#. module: account_payment
|
||||
#: view:payment.order.create:0
|
||||
msgid "Search Payment lines"
|
||||
msgstr ""
|
||||
msgstr "Traži stavke naloga za plaćanje"
|
||||
|
||||
#. module: account_payment
|
||||
#: field:payment.line,amount_currency:0
|
||||
msgid "Amount in Partner Currency"
|
||||
msgstr ""
|
||||
msgstr "Iznos u valuti partnera"
|
||||
|
||||
#. module: account_payment
|
||||
#: field:payment.line,communication2:0
|
||||
msgid "Communication 2"
|
||||
msgstr ""
|
||||
msgstr "Komunikacija 2"
|
||||
|
||||
#. module: account_payment
|
||||
#: field:payment.line,bank_id:0
|
||||
|
|
@ -611,46 +622,46 @@ msgstr ""
|
|||
#. module: account_payment
|
||||
#: view:account.payment.make.payment:0
|
||||
msgid "Are you sure you want to make payment?"
|
||||
msgstr ""
|
||||
msgstr "Želite dodati plaćanje?"
|
||||
|
||||
#. module: account_payment
|
||||
#: view:payment.mode:0
|
||||
#: field:payment.mode,journal:0
|
||||
msgid "Journal"
|
||||
msgstr ""
|
||||
msgstr "Dnevnik"
|
||||
|
||||
#. module: account_payment
|
||||
#: field:payment.mode,bank_id:0
|
||||
msgid "Bank account"
|
||||
msgstr ""
|
||||
msgstr "Bankovni račun"
|
||||
|
||||
#. module: account_payment
|
||||
#: view:payment.order:0
|
||||
msgid "Confirm Payments"
|
||||
msgstr ""
|
||||
msgstr "Potvrdi plaćanja"
|
||||
|
||||
#. module: account_payment
|
||||
#: field:payment.line,company_currency:0
|
||||
#: report:payment.order:0
|
||||
msgid "Company Currency"
|
||||
msgstr ""
|
||||
msgstr "Valuta organizacije"
|
||||
|
||||
#. module: account_payment
|
||||
#: model:ir.ui.menu,name:account_payment.menu_main_payment
|
||||
#: view:payment.line:0
|
||||
#: view:payment.order:0
|
||||
msgid "Payment"
|
||||
msgstr ""
|
||||
msgstr "Plaćanje"
|
||||
|
||||
#. module: account_payment
|
||||
#: report:payment.order:0
|
||||
msgid "Payment Order / Payment"
|
||||
msgstr ""
|
||||
msgstr "Nalog za plaćanje / plaćanje"
|
||||
|
||||
#. module: account_payment
|
||||
#: field:payment.line,move_line_id:0
|
||||
msgid "Entry line"
|
||||
msgstr ""
|
||||
msgstr "Redak"
|
||||
|
||||
#. module: account_payment
|
||||
#: help:payment.line,communication:0
|
||||
|
|
@ -658,61 +669,63 @@ msgid ""
|
|||
"Used as the message between ordering customer and current company. Depicts "
|
||||
"'What do you want to say to the recipient about this order ?'"
|
||||
msgstr ""
|
||||
"Used as the message between ordering customer and current company. Depicts "
|
||||
"'What do you want to say to the recipient about this order ?'"
|
||||
|
||||
#. module: account_payment
|
||||
#: field:payment.mode,name:0
|
||||
msgid "Name"
|
||||
msgstr ""
|
||||
msgstr "Naziv"
|
||||
|
||||
#. module: account_payment
|
||||
#: report:payment.order:0
|
||||
msgid "Bank Account"
|
||||
msgstr ""
|
||||
msgstr "Bankovni račun"
|
||||
|
||||
#. module: account_payment
|
||||
#: view:payment.line:0
|
||||
#: view:payment.order:0
|
||||
msgid "Entry Information"
|
||||
msgstr ""
|
||||
msgstr "Informacije"
|
||||
|
||||
#. module: account_payment
|
||||
#: model:ir.model,name:account_payment.model_payment_order_create
|
||||
msgid "payment.order.create"
|
||||
msgstr ""
|
||||
msgstr "payment.order.create"
|
||||
|
||||
#. module: account_payment
|
||||
#: field:payment.line,order_id:0
|
||||
msgid "Order"
|
||||
msgstr ""
|
||||
msgstr "Order"
|
||||
|
||||
#. module: account_payment
|
||||
#: field:payment.order,total:0
|
||||
msgid "Total"
|
||||
msgstr ""
|
||||
msgstr "Ukupno"
|
||||
|
||||
#. module: account_payment
|
||||
#: view:account.payment.make.payment:0
|
||||
#: model:ir.actions.act_window,name:account_payment.action_account_payment_make_payment
|
||||
msgid "Make Payment"
|
||||
msgstr ""
|
||||
msgstr "Plaćanje"
|
||||
|
||||
#. module: account_payment
|
||||
#: field:payment.line,partner_id:0
|
||||
#: report:payment.order:0
|
||||
msgid "Partner"
|
||||
msgstr ""
|
||||
msgstr "Partner"
|
||||
|
||||
#. module: account_payment
|
||||
#: model:ir.actions.act_window,name:account_payment.action_create_payment_order
|
||||
msgid "Populate Payment"
|
||||
msgstr ""
|
||||
msgstr "Popuni plaćanje"
|
||||
|
||||
#. module: account_payment
|
||||
#: help:payment.mode,bank_id:0
|
||||
msgid "Bank Account for the Payment Mode"
|
||||
msgstr ""
|
||||
msgstr "Račun banke za vrstu plaćanja"
|
||||
|
||||
#. module: account_payment
|
||||
#: constraint:account.move.line:0
|
||||
msgid "You can not create move line on view account."
|
||||
msgstr ""
|
||||
msgstr "Ne može se knjižiti na sintetički konto."
|
||||
|
|
|
|||
|
|
@ -22,7 +22,7 @@
|
|||
{
|
||||
'name': 'Entries Sequence Numbering',
|
||||
'version': '1.1',
|
||||
'category': 'Hidden',
|
||||
"category": 'Accounting & Finance',
|
||||
'complexity': "easy",
|
||||
'description': """
|
||||
This module maintains internal sequence number for accounting entries.
|
||||
|
|
|
|||
|
|
@ -0,0 +1,222 @@
|
|||
# Croatian translation for openobject-addons
|
||||
# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
|
||||
# This file is distributed under the same license as the openobject-addons package.
|
||||
# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
|
||||
#
|
||||
msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: openobject-addons\n"
|
||||
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
|
||||
"POT-Creation-Date: 2011-01-11 11:14+0000\n"
|
||||
"PO-Revision-Date: 2011-12-08 15:33+0000\n"
|
||||
"Last-Translator: Goran Kliska <gkliska@gmail.com>\n"
|
||||
"Language-Team: Croatian <hr@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: 2011-12-09 04:46+0000\n"
|
||||
"X-Generator: Launchpad (build 14450)\n"
|
||||
|
||||
#. module: account_sequence
|
||||
#: view:account.sequence.installer:0
|
||||
#: model:ir.actions.act_window,name:account_sequence.action_account_seq_installer
|
||||
msgid "Account Sequence Application Configuration"
|
||||
msgstr "Postave brojčanih serija"
|
||||
|
||||
#. module: account_sequence
|
||||
#: constraint:account.move:0
|
||||
msgid ""
|
||||
"You cannot create entries on different periods/journals in the same move"
|
||||
msgstr ""
|
||||
"Sva knjiženja na jednoj temeljnici moraju imati isti period i dnevnik."
|
||||
|
||||
#. module: account_sequence
|
||||
#: help:account.move,internal_sequence_number:0
|
||||
#: help:account.move.line,internal_sequence_number:0
|
||||
msgid "Internal Sequence Number"
|
||||
msgstr "Interni broj"
|
||||
|
||||
#. module: account_sequence
|
||||
#: help:account.sequence.installer,number_next:0
|
||||
msgid "Next number of this sequence"
|
||||
msgstr "Slijedeći broj ove brojčane serije"
|
||||
|
||||
#. module: account_sequence
|
||||
#: field:account.sequence.installer,number_next:0
|
||||
msgid "Next Number"
|
||||
msgstr "Sljedeći broj"
|
||||
|
||||
#. module: account_sequence
|
||||
#: field:account.sequence.installer,number_increment:0
|
||||
msgid "Increment Number"
|
||||
msgstr "Povećati za broj"
|
||||
|
||||
#. module: account_sequence
|
||||
#: model:ir.module.module,description:account_sequence.module_meta_information
|
||||
msgid ""
|
||||
"\n"
|
||||
" This module maintains internal sequence number for accounting entries.\n"
|
||||
" "
|
||||
msgstr ""
|
||||
|
||||
#. module: account_sequence
|
||||
#: model:ir.module.module,shortdesc:account_sequence.module_meta_information
|
||||
msgid "Entries Sequence Numbering"
|
||||
msgstr ""
|
||||
|
||||
#. module: account_sequence
|
||||
#: help:account.sequence.installer,number_increment:0
|
||||
msgid "The next number of the sequence will be incremented by this number"
|
||||
msgstr "Korak uvećanja brojača. 1 će uvećavati brojač za jedan, 10 za 10."
|
||||
|
||||
#. module: account_sequence
|
||||
#: view:account.sequence.installer:0
|
||||
msgid "Configure Your Account Sequence Application"
|
||||
msgstr "Postavite vaše brojčane serije"
|
||||
|
||||
#. module: account_sequence
|
||||
#: field:account.sequence.installer,progress:0
|
||||
msgid "Configuration Progress"
|
||||
msgstr "Napredak konfiguracije"
|
||||
|
||||
#. module: account_sequence
|
||||
#: help:account.sequence.installer,suffix:0
|
||||
msgid "Suffix value of the record for the sequence"
|
||||
msgstr "Sufiks (poslije brojača) za ovu brojčanu seriju"
|
||||
|
||||
#. module: account_sequence
|
||||
#: field:account.sequence.installer,company_id:0
|
||||
msgid "Company"
|
||||
msgstr "Organizacija"
|
||||
|
||||
#. module: account_sequence
|
||||
#: help:account.journal,internal_sequence_id:0
|
||||
msgid ""
|
||||
"This sequence will be used to maintain the internal number for the journal "
|
||||
"entries related to this journal."
|
||||
msgstr ""
|
||||
|
||||
#. module: account_sequence
|
||||
#: field:account.sequence.installer,padding:0
|
||||
msgid "Number padding"
|
||||
msgstr "Dopunjavanje na duljinu"
|
||||
|
||||
#. module: account_sequence
|
||||
#: model:ir.model,name:account_sequence.model_account_move_line
|
||||
msgid "Journal Items"
|
||||
msgstr "Stavke glavne knjige"
|
||||
|
||||
#. module: account_sequence
|
||||
#: field:account.move,internal_sequence_number:0
|
||||
#: field:account.move.line,internal_sequence_number:0
|
||||
msgid "Internal Number"
|
||||
msgstr "Interni broj"
|
||||
|
||||
#. module: account_sequence
|
||||
#: constraint:account.move.line:0
|
||||
msgid "Company must be same for its related account and period."
|
||||
msgstr ""
|
||||
|
||||
#. module: account_sequence
|
||||
#: help:account.sequence.installer,padding:0
|
||||
msgid ""
|
||||
"OpenERP will automatically adds some '0' on the left of the 'Next Number' to "
|
||||
"get the required padding size."
|
||||
msgstr "Potreban broj vodećih \"0\" će se automatski dodati."
|
||||
|
||||
#. module: account_sequence
|
||||
#: field:account.sequence.installer,name:0
|
||||
msgid "Name"
|
||||
msgstr "Naziv"
|
||||
|
||||
#. module: account_sequence
|
||||
#: constraint:account.move.line:0
|
||||
msgid "You can not create move line on closed account."
|
||||
msgstr "Ne možete kreirati stavke prometa za zatvoreni račun."
|
||||
|
||||
#. module: account_sequence
|
||||
#: constraint:account.move:0
|
||||
msgid ""
|
||||
"You cannot create more than one move per period on centralized journal"
|
||||
msgstr ""
|
||||
|
||||
#. module: account_sequence
|
||||
#: sql_constraint:account.move.line:0
|
||||
msgid "Wrong credit or debit value in accounting entry !"
|
||||
msgstr "Pogrešna dugovna ili potražna vrijednost upisane stavke!"
|
||||
|
||||
#. module: account_sequence
|
||||
#: field:account.journal,internal_sequence_id:0
|
||||
msgid "Internal Sequence"
|
||||
msgstr "Interna brojčana serija"
|
||||
|
||||
#. module: account_sequence
|
||||
#: model:ir.model,name:account_sequence.model_account_sequence_installer
|
||||
msgid "account.sequence.installer"
|
||||
msgstr ""
|
||||
|
||||
#. module: account_sequence
|
||||
#: view:account.sequence.installer:0
|
||||
msgid "Configure"
|
||||
msgstr "Postavke"
|
||||
|
||||
#. module: account_sequence
|
||||
#: help:account.sequence.installer,prefix:0
|
||||
msgid "Prefix value of the record for the sequence"
|
||||
msgstr "Prefiks za brojčanu seriju"
|
||||
|
||||
#. module: account_sequence
|
||||
#: model:ir.model,name:account_sequence.model_account_move
|
||||
msgid "Account Entry"
|
||||
msgstr "Temeljnica"
|
||||
|
||||
#. module: account_sequence
|
||||
#: field:account.sequence.installer,suffix:0
|
||||
msgid "Suffix"
|
||||
msgstr "Sufiks"
|
||||
|
||||
#. module: account_sequence
|
||||
#: field:account.sequence.installer,config_logo:0
|
||||
msgid "Image"
|
||||
msgstr "Slika"
|
||||
|
||||
#. module: account_sequence
|
||||
#: view:account.sequence.installer:0
|
||||
msgid "title"
|
||||
msgstr "naslov"
|
||||
|
||||
#. module: account_sequence
|
||||
#: sql_constraint:account.journal:0
|
||||
msgid "The name of the journal must be unique per company !"
|
||||
msgstr "Naziv dnevnika mora biti jedinstven za jednu organizaciju!"
|
||||
|
||||
#. module: account_sequence
|
||||
#: field:account.sequence.installer,prefix:0
|
||||
msgid "Prefix"
|
||||
msgstr "Prefiks"
|
||||
|
||||
#. module: account_sequence
|
||||
#: sql_constraint:account.journal:0
|
||||
msgid "The code of the journal must be unique per company !"
|
||||
msgstr "Šifra dnevnika mora biti jedinstvena (za organizaciju) !"
|
||||
|
||||
#. module: account_sequence
|
||||
#: constraint:account.move.line:0
|
||||
msgid ""
|
||||
"You can not create move line on receivable/payable account without partner"
|
||||
msgstr ""
|
||||
|
||||
#. module: account_sequence
|
||||
#: model:ir.model,name:account_sequence.model_account_journal
|
||||
msgid "Journal"
|
||||
msgstr "Dnevnik"
|
||||
|
||||
#. module: account_sequence
|
||||
#: view:account.sequence.installer:0
|
||||
msgid "You can enhance the Account Sequence Application by installing ."
|
||||
msgstr ""
|
||||
|
||||
#. module: account_sequence
|
||||
#: constraint:account.move.line:0
|
||||
msgid "You can not create move line on view account."
|
||||
msgstr "Ne može se knjižiti na sintetički konto."
|
||||
|
|
@ -20,7 +20,7 @@
|
|||
##############################################################################
|
||||
|
||||
{
|
||||
"name" : "Accounting Voucher Entries",
|
||||
"name" : "eInvoicing & Payments",
|
||||
"version" : "1.0",
|
||||
"author" : 'OpenERP SA',
|
||||
'complexity': "normal",
|
||||
|
|
@ -32,7 +32,7 @@ Account Voucher module includes all the basic requirements of Voucher Entries fo
|
|||
* Voucher Receipt
|
||||
* Cheque Register
|
||||
""",
|
||||
"category" : "Hidden",
|
||||
"category": 'Accounting & Finance',
|
||||
"website" : "http://tinyerp.com",
|
||||
"images" : ["images/customer_payment.jpeg","images/journal_voucher.jpeg","images/sales_receipt.jpeg","images/supplier_voucher.jpeg"],
|
||||
"depends" : ["account"],
|
||||
|
|
@ -68,6 +68,7 @@ Account Voucher module includes all the basic requirements of Voucher Entries fo
|
|||
],
|
||||
'certificate': '0037580727101',
|
||||
"active": False,
|
||||
"application": True,
|
||||
"installable": True,
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -90,6 +90,21 @@ class account_voucher(osv.osv):
|
|||
return tax_id
|
||||
return False
|
||||
|
||||
def _get_payment_rate_currency(self, cr, uid, context=None):
|
||||
'''
|
||||
Return the default value for field payment_rate_currency_id: the currency of the journal
|
||||
if there is one, otherwise the currency of the user's company
|
||||
'''
|
||||
if context is None: context = {}
|
||||
journal_pool = self.pool.get('account.journal')
|
||||
journal_id = context.get('journal_id', False)
|
||||
if journal_id:
|
||||
journal = journal_pool.browse(cr, uid, journal_id, context=context)
|
||||
if journal.currency:
|
||||
return journal.currency.id
|
||||
#no journal given in the context, use company currency as default
|
||||
return self.pool.get('res.users').browse(cr, uid, uid, context=context).company_id.currency_id.id
|
||||
|
||||
def _get_currency(self, cr, uid, context=None):
|
||||
if context is None: context = {}
|
||||
journal_pool = self.pool.get('account.journal')
|
||||
|
|
@ -143,11 +158,12 @@ class account_voucher(osv.osv):
|
|||
|
||||
res = super(account_voucher, self).fields_view_get(cr, uid, view_id=view_id, view_type=view_type, context=context, toolbar=toolbar, submenu=submenu)
|
||||
doc = etree.XML(res['arch'])
|
||||
nodes = doc.xpath("//field[@name='partner_id']")
|
||||
|
||||
if context.get('type', 'sale') in ('purchase', 'payment'):
|
||||
nodes = doc.xpath("//field[@name='partner_id']")
|
||||
for node in nodes:
|
||||
node.set('domain', "[('supplier', '=', True)]")
|
||||
res['arch'] = etree.tostring(doc)
|
||||
res['arch'] = etree.tostring(doc)
|
||||
return res
|
||||
|
||||
def _compute_writeoff_amount(self, cr, uid, line_dr_ids, line_cr_ids, amount):
|
||||
|
|
@ -158,17 +174,25 @@ class account_voucher(osv.osv):
|
|||
credit += l['amount']
|
||||
return abs(amount - abs(credit - debit))
|
||||
|
||||
def onchange_line_ids(self, cr, uid, ids, line_dr_ids, line_cr_ids, amount, context=None):
|
||||
def onchange_line_ids(self, cr, uid, ids, line_dr_ids, line_cr_ids, amount, voucher_currency, context=None):
|
||||
context = context or {}
|
||||
if not line_dr_ids and not line_cr_ids:
|
||||
return {'value':{}}
|
||||
line_osv = self.pool.get("account.voucher.line")
|
||||
line_dr_ids = resolve_o2m_operations(cr, uid, line_osv, line_dr_ids, ['amount'], context)
|
||||
line_cr_ids = resolve_o2m_operations(cr, uid, line_osv, line_cr_ids, ['amount'], context)
|
||||
return {'value': {'writeoff_amount': self._compute_writeoff_amount(cr, uid, line_dr_ids, line_cr_ids, amount)}}
|
||||
|
||||
#loop into the lines to see if there is an amount allocated on a voucher line with a currency different than the voucher currency
|
||||
is_multi_currency = False
|
||||
for voucher_line in line_dr_ids+line_cr_ids:
|
||||
if voucher_line.get('currency_id',False) != voucher_currency:
|
||||
is_multi_currency = True
|
||||
break
|
||||
return {'value': {'writeoff_amount': self._compute_writeoff_amount(cr, uid, line_dr_ids, line_cr_ids, amount), 'is_multi_currency': is_multi_currency}}
|
||||
|
||||
def _get_writeoff_amount(self, cr, uid, ids, name, args, context=None):
|
||||
if not ids: return {}
|
||||
currency_obj = self.pool.get('res.currency')
|
||||
res = {}
|
||||
debit = credit = 0.0
|
||||
for voucher in self.browse(cr, uid, ids, context=context):
|
||||
|
|
@ -176,15 +200,24 @@ class account_voucher(osv.osv):
|
|||
debit += l.amount
|
||||
for l in voucher.line_cr_ids:
|
||||
credit += l.amount
|
||||
res[voucher.id] = abs(voucher.amount - abs(credit - debit))
|
||||
currency = voucher.currency_id or voucher.company_id.currency_id
|
||||
res[voucher.id] = currency_obj.round(cr, uid, currency, abs(voucher.amount - abs(credit - debit)))
|
||||
return res
|
||||
|
||||
def _paid_amount_in_company_currency(self, cr, uid, ids, name, args, context=None):
|
||||
if not ids: return {}
|
||||
res = {}
|
||||
debit = credit = 0.0
|
||||
voucher_rate = company_currency_rate = 1.0
|
||||
for voucher in self.browse(cr, uid, ids, context=context):
|
||||
res[voucher.id] = voucher.amount / voucher.payment_rate
|
||||
if voucher.currency_id:
|
||||
ctx = context.copy()
|
||||
ctx.update({'date': voucher.date})
|
||||
voucher_rate = self.browse(cr, uid, voucher.id, context=ctx).currency_id.rate
|
||||
if voucher.company_id.currency_id.id == voucher.payment_rate_currency_id.id:
|
||||
company_currency_rate = voucher.payment_rate
|
||||
else:
|
||||
company_currency_rate = voucher.company_id.currency_id.rate
|
||||
res[voucher.id] = voucher.amount / voucher_rate * company_currency_rate
|
||||
return res
|
||||
|
||||
_name = 'account.voucher'
|
||||
|
|
@ -241,15 +274,16 @@ class account_voucher(osv.osv):
|
|||
'payment_option':fields.selection([
|
||||
('without_writeoff', 'Keep Open'),
|
||||
('with_writeoff', 'Reconcile Payment Balance'),
|
||||
], 'Payment Difference', required=True, readonly=True, states={'draft': [('readonly', False)]}),
|
||||
'exchange_acc_id': fields.many2one('account.account', 'Exchange Diff. Account', readonly=True, states={'draft': [('readonly', False)]}),
|
||||
], 'Payment Difference', required=True, readonly=True, states={'draft': [('readonly', False)]}, help="This field helps you to choose what you want to do with the eventual difference between the paid amount and the sum of allocated amounts. You can either choose to keep open this difference on the partner's account, or reconcile it with the payment(s)"),
|
||||
'writeoff_acc_id': fields.many2one('account.account', 'Counterpart Account', readonly=True, states={'draft': [('readonly', False)]}),
|
||||
'comment': fields.char('Counterpart Comment', size=64, required=True, readonly=True, states={'draft': [('readonly', False)]}),
|
||||
'analytic_id': fields.many2one('account.analytic.account','Write-Off Analytic Account', readonly=True, states={'draft': [('readonly', False)]}),
|
||||
'writeoff_amount': fields.function(_get_writeoff_amount, string='Reconcile Amount', type='float', readonly=True),
|
||||
'payment_rate': fields.float('Payment Rate', digits=(12,6), required=True, readonly=True, states={'draft': [('readonly', False)]},
|
||||
help='The rate between the journal currency and the company currency for this particular payment.'),
|
||||
'writeoff_amount': fields.function(_get_writeoff_amount, string='Difference Amount', type='float', readonly=True, help="Computed as the difference between the amount stated in the voucher and the sum of allocation on the voucher lines."),
|
||||
'payment_rate_currency_id': fields.many2one('res.currency', 'Payment Rate Currency', required=True, readonly=True, states={'draft':[('readonly',False)]}),
|
||||
'payment_rate': fields.float('Exchange Rate', digits=(12,6), required=True, readonly=True, states={'draft': [('readonly', False)]},
|
||||
help='The specific rate that will be used, in this voucher, between the selected currency (in \'Payment Rate Currency\' field) and the voucher currency.'),
|
||||
'paid_amount_in_company_currency': fields.function(_paid_amount_in_company_currency, string='Paid Amount in Company Currency', type='float', readonly=True),
|
||||
'is_multi_currency': fields.boolean('Multi Currency Voucher', help='Fields with internal purpose only that depicts if the voucher is a multi currency one or not'),
|
||||
}
|
||||
_defaults = {
|
||||
'period_id': _get_period,
|
||||
|
|
@ -269,6 +303,7 @@ class account_voucher(osv.osv):
|
|||
'payment_option': 'without_writeoff',
|
||||
'comment': _('Write-Off'),
|
||||
'payment_rate': 1.0,
|
||||
'payment_rate_currency_id': _get_payment_rate_currency,
|
||||
}
|
||||
|
||||
def compute_tax(self, cr, uid, ids, context=None):
|
||||
|
|
@ -374,7 +409,7 @@ class account_voucher(osv.osv):
|
|||
})
|
||||
return {'value':default}
|
||||
|
||||
def onchange_journal_voucher(self, cr, uid, ids, line_ids=False, tax_id=False, price=0.0, partner_id=False, journal_id=False, ttype=False, context=None):
|
||||
def onchange_journal_voucher(self, cr, uid, ids, line_ids=False, tax_id=False, price=0.0, partner_id=False, journal_id=False, ttype=False, company_id=False, context=None):
|
||||
"""price
|
||||
Returns a dict that contains new values and context
|
||||
|
||||
|
|
@ -413,25 +448,78 @@ class account_voucher(osv.osv):
|
|||
default['value']['account_id'] = account_id
|
||||
default['value']['type'] = ttype or tr_type
|
||||
|
||||
vals = self.onchange_journal(cr, uid, ids, journal_id, line_ids, tax_id, partner_id, context)
|
||||
vals = self.onchange_journal(cr, uid, ids, journal_id, line_ids, tax_id, partner_id, company_id, context)
|
||||
default['value'].update(vals.get('value'))
|
||||
|
||||
return default
|
||||
|
||||
def onchange_rate(self, cr, uid, ids, rate, amount, context=None):
|
||||
res = {'value': {'paid_amount_in_company_currency': 0.0}}
|
||||
if rate and amount:
|
||||
res['value']['paid_amount_in_company_currency'] = amount / rate
|
||||
def onchange_rate(self, cr, uid, ids, rate, amount, currency_id, payment_rate_currency_id, company_id, context=None):
|
||||
res = {'value': {'paid_amount_in_company_currency': amount}}
|
||||
company_currency = self.pool.get('res.company').browse(cr, uid, company_id, context=context).currency_id
|
||||
if rate and amount and currency_id:# and currency_id == payment_rate_currency_id:
|
||||
voucher_rate = self.pool.get('res.currency').browse(cr, uid, currency_id, context).rate
|
||||
if company_currency.id == payment_rate_currency_id:
|
||||
company_rate = rate
|
||||
else:
|
||||
company_rate = self.pool.get('res.company').browse(cr, uid, company_id, context=context).currency_id.rate
|
||||
res['value']['paid_amount_in_company_currency'] = amount / voucher_rate * company_rate
|
||||
return res
|
||||
|
||||
def onchange_amount(self, cr, uid, ids, amount, rate, partner_id, journal_id, currency_id, ttype, date, context=None):
|
||||
res = self.onchange_partner_id(cr, uid, ids, partner_id, journal_id, amount, currency_id, ttype, date, context=context)
|
||||
vals = self.onchange_rate(cr, uid, ids, rate, amount, context=context)
|
||||
def onchange_amount(self, cr, uid, ids, amount, rate, partner_id, journal_id, currency_id, ttype, date, payment_rate_currency_id, company_id, context=None):
|
||||
if context is None:
|
||||
context = {}
|
||||
res = self.recompute_voucher_lines(cr, uid, ids, partner_id, journal_id, amount, currency_id, ttype, date, context=context)
|
||||
ctx = context.copy()
|
||||
ctx.update({'date': date})
|
||||
vals = self.onchange_rate(cr, uid, ids, rate, amount, currency_id, payment_rate_currency_id, company_id, context=ctx)
|
||||
for key in vals.keys():
|
||||
res[key].update(vals[key])
|
||||
return res
|
||||
|
||||
def onchange_partner_id(self, cr, uid, ids, partner_id, journal_id, price, currency_id, ttype, date, context=None):
|
||||
def recompute_payment_rate(self, cr, uid, ids, vals, currency_id, date, ttype, journal_id, amount, context=None):
|
||||
if context is None:
|
||||
context = {}
|
||||
#on change of the journal, we need to set also the default value for payment_rate and payment_rate_currency_id
|
||||
currency_obj = self.pool.get('res.currency')
|
||||
journal = self.pool.get('account.journal').browse(cr, uid, journal_id, context=context)
|
||||
company_id = journal.company_id.id
|
||||
payment_rate = 1.0
|
||||
payment_rate_currency_id = currency_id
|
||||
ctx = context.copy()
|
||||
ctx.update({'date': date})
|
||||
o2m_to_loop = False
|
||||
if ttype == 'receipt':
|
||||
o2m_to_loop = 'line_cr_ids'
|
||||
elif ttype == 'payment':
|
||||
o2m_to_loop = 'line_dr_ids'
|
||||
if o2m_to_loop and 'value' in vals and o2m_to_loop in vals['value']:
|
||||
for voucher_line in vals['value'][o2m_to_loop]:
|
||||
if voucher_line['currency_id'] != currency_id:
|
||||
# we take as default value for the payment_rate_currency_id, the currency of the first invoice that
|
||||
# is not in the voucher currency
|
||||
payment_rate_currency_id = voucher_line['currency_id']
|
||||
tmp = currency_obj.browse(cr, uid, payment_rate_currency_id, context=ctx).rate
|
||||
voucher_currency_id = currency_id or journal.company_id.currency_id.id
|
||||
payment_rate = tmp / currency_obj.browse(cr, uid, voucher_currency_id, context=ctx).rate
|
||||
break
|
||||
res = self.onchange_rate(cr, uid, ids, payment_rate, amount, currency_id, payment_rate_currency_id, company_id, context=ctx)
|
||||
for key in res.keys():
|
||||
vals[key].update(res[key])
|
||||
vals['value'].update({'payment_rate': payment_rate})
|
||||
if payment_rate_currency_id:
|
||||
vals['value'].update({'payment_rate_currency_id': payment_rate_currency_id})
|
||||
return vals
|
||||
|
||||
def onchange_partner_id(self, cr, uid, ids, partner_id, journal_id, amount, currency_id, ttype, date, context=None):
|
||||
if not journal_id:
|
||||
return {}
|
||||
res = self.recompute_voucher_lines(cr, uid, ids, partner_id, journal_id, amount, currency_id, ttype, date, context=context)
|
||||
vals = self.recompute_payment_rate(cr, uid, ids, res, currency_id, date, ttype, journal_id, amount, context=context)
|
||||
for key in vals.keys():
|
||||
res[key].update(vals[key])
|
||||
return res
|
||||
|
||||
def recompute_voucher_lines(self, cr, uid, ids, partner_id, journal_id, price, currency_id, ttype, date, context=None):
|
||||
"""
|
||||
Returns a dict that contains new values and context
|
||||
|
||||
|
|
@ -502,9 +590,9 @@ class account_voucher(osv.osv):
|
|||
|
||||
#order the lines by most old first
|
||||
ids.reverse()
|
||||
moves = move_line_pool.browse(cr, uid, ids, context=context)
|
||||
account_move_lines = move_line_pool.browse(cr, uid, ids, context=context)
|
||||
|
||||
for line in moves:
|
||||
for line in account_move_lines:
|
||||
if line.credit and line.reconcile_partial_id and ttype == 'receipt':
|
||||
continue
|
||||
if line.debit and line.reconcile_partial_id and ttype == 'payment':
|
||||
|
|
@ -533,7 +621,7 @@ class account_voucher(osv.osv):
|
|||
total_debit += line.debit and line.amount_currency or 0.0
|
||||
|
||||
#voucher line creation
|
||||
for line in moves:
|
||||
for line in account_move_lines:
|
||||
if line.credit and line.reconcile_partial_id and ttype == 'receipt':
|
||||
continue
|
||||
if line.debit and line.reconcile_partial_id and ttype == 'payment':
|
||||
|
|
@ -544,6 +632,7 @@ class account_voucher(osv.osv):
|
|||
else:
|
||||
amount_original = currency_pool.compute(cr, uid, company_currency, currency_id, line.credit or line.debit or 0.0)
|
||||
amount_unreconciled = currency_pool.compute(cr, uid, company_currency, currency_id, abs(line.amount_residual))
|
||||
line_currency_id = line.currency_id and line.currency_id.id or company_currency
|
||||
rs = {
|
||||
'name':line.move_id.name,
|
||||
'type': line.credit and 'dr' or 'cr',
|
||||
|
|
@ -554,11 +643,11 @@ class account_voucher(osv.osv):
|
|||
'date_original':line.date,
|
||||
'date_due':line.date_maturity,
|
||||
'amount_unreconciled': amount_unreconciled,
|
||||
'currency_id': line_currency_id,
|
||||
}
|
||||
|
||||
#split voucher amount by most old first, but only for lines in the same currency
|
||||
if not move_line_found:
|
||||
line_currency_id = line.currency_id and line.currency_id.id or company_currency
|
||||
if currency_id == line_currency_id:
|
||||
if line.credit:
|
||||
amount = min(amount_unreconciled, abs(total_debit))
|
||||
|
|
@ -569,7 +658,9 @@ class account_voucher(osv.osv):
|
|||
rs['amount'] = amount
|
||||
total_credit -= amount
|
||||
|
||||
default['value']['line_ids'].append(rs)
|
||||
if rs['amount_unreconciled'] == rs['amount']:
|
||||
rs['reconcile'] = True
|
||||
|
||||
if rs['type'] == 'cr':
|
||||
default['value']['line_cr_ids'].append(rs)
|
||||
else:
|
||||
|
|
@ -582,30 +673,51 @@ class account_voucher(osv.osv):
|
|||
default['value']['writeoff_amount'] = self._compute_writeoff_amount(cr, uid, default['value']['line_dr_ids'], default['value']['line_cr_ids'], price)
|
||||
return default
|
||||
|
||||
def onchange_date(self, cr, uid, ids, date, currency_id, amount, context=None):
|
||||
def onchange_payment_rate_currency(self, cr, uid, ids, currency_id, payment_rate, payment_rate_currency_id, date, amount, company_id, context=None):
|
||||
if context is None:
|
||||
context = {}
|
||||
res = {'value': {}}
|
||||
#set the default payment rate of the voucher and compute the paid amount in company currency
|
||||
if currency_id and currency_id == payment_rate_currency_id:
|
||||
ctx = context.copy()
|
||||
ctx.update({'date': date})
|
||||
vals = self.onchange_rate(cr, uid, ids, payment_rate, amount, currency_id, payment_rate_currency_id, company_id, context=ctx)
|
||||
for key in vals.keys():
|
||||
res[key].update(vals[key])
|
||||
return res
|
||||
|
||||
def onchange_date(self, cr, uid, ids, date, currency_id, payment_rate_currency_id, amount, company_id, context=None):
|
||||
"""
|
||||
@param date: latest value from user input for field date
|
||||
@param args: other arguments
|
||||
@param context: context arguments, like lang, time zone
|
||||
@return: Returns a dict which contains new values, and context
|
||||
"""
|
||||
if context is None:
|
||||
context ={}
|
||||
res = {'value': {}}
|
||||
#set the period of the voucher
|
||||
period_pool = self.pool.get('account.period')
|
||||
pids = period_pool.search(cr, uid, [('date_start', '<=', date), ('date_stop', '>=', date)])
|
||||
currency_obj = self.pool.get('res.currency')
|
||||
ctx = context.copy()
|
||||
ctx.update({'company_id': company_id})
|
||||
pids = period_pool.find(cr, uid, date, context=ctx)
|
||||
if pids:
|
||||
res['value'].update({'period_id':pids[0]})
|
||||
#set the default payment rate of the voucher and compute the paid amount in company currency
|
||||
payment_rate = 1.0
|
||||
if currency_id:
|
||||
payment_rate = self.pool.get('res.currency').browse(cr, uid, currency_id, context={'date': date}).rate
|
||||
res['value'].update({'payment_rate': payment_rate})
|
||||
vals = self.onchange_rate(cr, uid, ids, payment_rate, amount, context=context)
|
||||
for key in vals.keys():
|
||||
res[key].update(vals[key])
|
||||
if payment_rate_currency_id:
|
||||
ctx.update({'date': date})
|
||||
payment_rate = 1.0
|
||||
if payment_rate_currency_id != currency_id:
|
||||
tmp = currency_obj.browse(cr, uid, payment_rate_currency_id, context=ctx).rate
|
||||
voucher_currency_id = currency_id or self.pool.get('res.company').browse(cr, uid, company_id, context=ctx).currency_id.id
|
||||
payment_rate = tmp / currency_obj.browse(cr, uid, voucher_currency_id, context=ctx).rate
|
||||
vals = self.onchange_payment_rate_currency(cr, uid, ids, currency_id, payment_rate, payment_rate_currency_id, date, amount, company_id, context=context)
|
||||
vals['value'].update({'payment_rate': payment_rate})
|
||||
for key in vals.keys():
|
||||
res[key].update(vals[key])
|
||||
return res
|
||||
|
||||
def onchange_journal(self, cr, uid, ids, journal_id, line_ids, tax_id, partner_id, date, amount, ttype, context=None):
|
||||
def onchange_journal(self, cr, uid, ids, journal_id, line_ids, tax_id, partner_id, date, amount, ttype, company_id, context=None):
|
||||
if not journal_id:
|
||||
return False
|
||||
journal_pool = self.pool.get('account.journal')
|
||||
|
|
@ -620,11 +732,6 @@ class account_voucher(osv.osv):
|
|||
currency_id = False
|
||||
if journal.currency:
|
||||
currency_id = journal.currency.id
|
||||
payment_rate = self.pool.get('res.currency').browse(cr, uid, currency_id, context={'date': date}).rate
|
||||
vals['value'].update({'payment_rate': payment_rate})
|
||||
res = self.onchange_rate(cr, uid, ids, payment_rate, amount, context=context)
|
||||
for key in res.keys():
|
||||
vals[key].update(res[key])
|
||||
vals['value'].update({'currency_id': currency_id})
|
||||
res = self.onchange_partner_id(cr, uid, ids, partner_id, journal_id, amount, currency_id, ttype, date, context)
|
||||
for key in res.keys():
|
||||
|
|
@ -730,9 +837,9 @@ class account_voucher(osv.osv):
|
|||
# TODO: Make this logic available.
|
||||
# -for sale, purchase we have but for the payment and receipt we do not have as based on the bank/cash journal we can not know its payment or receipt
|
||||
if voucher_brw.type in ('purchase', 'payment'):
|
||||
credit = voucher_brw.amount / voucher_brw.payment_rate
|
||||
credit = voucher_brw.paid_amount_in_company_currency
|
||||
elif voucher_brw.type in ('sale', 'receipt'):
|
||||
debit = voucher_brw.amount / voucher_brw.payment_rate
|
||||
debit = voucher_brw.paid_amount_in_company_currency
|
||||
if debit < 0: credit = -debit; debit = 0.0
|
||||
if credit < 0: debit = -credit; credit = 0.0
|
||||
sign = debit - credit < 0 and -1 or 1
|
||||
|
|
@ -788,9 +895,10 @@ class account_voucher(osv.osv):
|
|||
|
||||
def _get_exchange_lines(self, cr, uid, line, move_id, amount_residual, company_currency, current_currency, context=None):
|
||||
'''
|
||||
Prepare the two lines due to currency rate difference.
|
||||
Prepare the two lines in company currency due to currency rate difference.
|
||||
|
||||
:param line: browse record of the voucher.line for which we want to create currency rate difference accounting entries
|
||||
:param line: browse record of the voucher.line for which we want to create currency rate difference accounting
|
||||
entries
|
||||
:param move_id: Account move wher the move lines will be.
|
||||
:param amount_residual: Amount to be posted.
|
||||
:param company_currency: id of currency of the company to which the voucher belong
|
||||
|
|
@ -798,9 +906,17 @@ class account_voucher(osv.osv):
|
|||
:return: the account move line and its counterpart to create, depicted as mapping between fieldname and value
|
||||
:rtype: tuple of dict
|
||||
'''
|
||||
if not line.voucher_id.exchange_acc_id.id:
|
||||
raise osv.except_osv(_('Error!'), _('You must provide an account for the exchange difference.'))
|
||||
|
||||
if amount_residual > 0:
|
||||
account_id = line.voucher_id.company_id.expense_currency_exchange_account_id
|
||||
if not account_id:
|
||||
raise osv.except_osv(_('Warning'),_("Unable to create accounting entry for currency rate difference. You have to configure the field 'Income Currency Rate' on the company! "))
|
||||
else:
|
||||
account_id = line.voucher_id.company_id.income_currency_exchange_account_id
|
||||
if not account_id:
|
||||
raise osv.except_osv(_('Warning'),_("Unable to create accounting entry for currency rate difference. You have to configure the field 'Expense Currency Rate' on the company! "))
|
||||
# Even if the amount_currency is never filled, we need to pass the foreign currency because otherwise
|
||||
# the receivable/payable account may have a secondary currency, which render this field mandatory
|
||||
account_currency_id = company_currency <> current_currency and current_currency or False
|
||||
move_line = {
|
||||
'journal_id': line.voucher_id.journal_id.id,
|
||||
'period_id': line.voucher_id.period_id.id,
|
||||
|
|
@ -808,7 +924,7 @@ class account_voucher(osv.osv):
|
|||
'account_id': line.account_id.id,
|
||||
'move_id': move_id,
|
||||
'partner_id': line.voucher_id.partner_id.id,
|
||||
'currency_id': company_currency <> current_currency and current_currency or False,
|
||||
'currency_id': account_currency_id,
|
||||
'amount_currency': 0.0,
|
||||
'quantity': 1,
|
||||
'credit': amount_residual > 0 and amount_residual or 0.0,
|
||||
|
|
@ -819,11 +935,11 @@ class account_voucher(osv.osv):
|
|||
'journal_id': line.voucher_id.journal_id.id,
|
||||
'period_id': line.voucher_id.period_id.id,
|
||||
'name': _('change')+': '+(line.name or '/'),
|
||||
'account_id': line.voucher_id.exchange_acc_id.id,
|
||||
'account_id': account_id.id,
|
||||
'move_id': move_id,
|
||||
'amount_currency': 0.0,
|
||||
'partner_id': line.voucher_id.partner_id.id,
|
||||
'currency_id': company_currency <> current_currency and current_currency or False,
|
||||
'currency_id': account_currency_id,
|
||||
'quantity': 1,
|
||||
'debit': amount_residual > 0 and amount_residual or 0.0,
|
||||
'credit': amount_residual < 0 and -amount_residual or 0.0,
|
||||
|
|
@ -831,6 +947,31 @@ class account_voucher(osv.osv):
|
|||
}
|
||||
return (move_line, move_line_counterpart)
|
||||
|
||||
def _convert_amount(self, cr, uid, amount, voucher_id, context=None):
|
||||
'''
|
||||
This function convert the amount given in company currency. It takes either the rate in the voucher (if the
|
||||
payment_rate_currency_id is relevant) either the rate encoded in the system.
|
||||
|
||||
:param amount: float. The amount to convert
|
||||
:param voucher: id of the voucher on which we want the conversion
|
||||
:param context: to context to use for the conversion. It may contain the key 'date' set to the voucher date
|
||||
field in order to select the good rate to use.
|
||||
:return: the amount in the currency of the voucher's company
|
||||
:rtype: float
|
||||
'''
|
||||
currency_obj = self.pool.get('res.currency')
|
||||
voucher = self.browse(cr, uid, voucher_id, context=context)
|
||||
res = amount
|
||||
if voucher.payment_rate_currency_id.id == voucher.company_id.currency_id.id:
|
||||
# the rate specified on the voucher is for the company currency
|
||||
rate_between_voucher_and_base = voucher.currency_id.rate or 1.0
|
||||
rate_between_base_and_company = voucher.payment_rate or 1.0
|
||||
res = currency_obj.round(cr, uid, voucher.company_id.currency_id, (amount / rate_between_voucher_and_base * rate_between_base_and_company))
|
||||
else:
|
||||
# the rate specified on the voucher is not relevant, we use all the rates in the system
|
||||
res = currency_obj.compute(cr, uid, voucher.currency_id.id, voucher.company_id.currency_id.id, amount, context=context)
|
||||
return res
|
||||
|
||||
def voucher_move_line_create(self, cr, uid, voucher_id, line_total, move_id, company_currency, current_currency, context=None):
|
||||
'''
|
||||
Create one account move line, on the given account move, per voucher line where amount is not 0.0.
|
||||
|
|
@ -843,25 +984,30 @@ class account_voucher(osv.osv):
|
|||
:param company_currency: id of currency of the company to which the voucher belong
|
||||
:param current_currency: id of currency of the voucher
|
||||
:return: Tuple build as (remaining amount not allocated on voucher lines, list of account_move_line created in this method)
|
||||
:rtype: tuple(int, list of int)
|
||||
:rtype: tuple(float, list of int)
|
||||
'''
|
||||
if context is None:
|
||||
context = {}
|
||||
move_line_obj = self.pool.get('account.move.line')
|
||||
currency_obj = self.pool.get('res.currency')
|
||||
tot_line = line_total
|
||||
rec_lst_ids = []
|
||||
|
||||
voucher_brw = self.pool.get('account.voucher').browse(cr,uid,voucher_id,context)
|
||||
voucher_brw = self.pool.get('account.voucher').browse(cr, uid, voucher_id, context)
|
||||
ctx = context.copy()
|
||||
ctx.update({'date': voucher_brw.date})
|
||||
for line in voucher_brw.line_ids:
|
||||
#create one move line per voucher line where amount is not 0.0
|
||||
if not line.amount:
|
||||
continue
|
||||
#we check if the voucher line is fully paid or not and create a move line to balance the payment and initial invoice if needed
|
||||
# convert the amount set on the voucher line into the currency of the voucher's company
|
||||
amount = self._convert_amount(cr, uid, line.untax_amount or line.amount, voucher_brw.id, context=ctx)
|
||||
# if the amount encoded in voucher is equal to the amount unreconciled, we need to compute the
|
||||
# currency rate difference
|
||||
if line.amount == line.amount_unreconciled:
|
||||
amount = (line.untax_amount or line.amount) / voucher_brw.payment_rate
|
||||
amount_residual = line.move_line_id.amount_residual - amount #residual amount in company currency
|
||||
currency_rate_difference = line.move_line_id.amount_residual - amount
|
||||
else:
|
||||
amount = (line.untax_amount or line.amount) / voucher_brw.payment_rate
|
||||
amount_residual = 0.0
|
||||
currency_rate_difference = 0.0
|
||||
move_line = {
|
||||
'journal_id': voucher_brw.journal_id.id,
|
||||
'period_id': voucher_brw.period_id.id,
|
||||
|
|
@ -869,7 +1015,7 @@ class account_voucher(osv.osv):
|
|||
'account_id': line.account_id.id,
|
||||
'move_id': move_id,
|
||||
'partner_id': voucher_brw.partner_id.id,
|
||||
'currency_id': company_currency <> current_currency and current_currency or False,
|
||||
'currency_id': line.move_line_id and (company_currency <> line.move_line_id.currency_id.id and line.move_line_id.currency_id.id) or False,
|
||||
'analytic_account_id': line.account_analytic_id and line.account_analytic_id.id or False,
|
||||
'quantity': 1,
|
||||
'credit': 0.0,
|
||||
|
|
@ -900,18 +1046,58 @@ class account_voucher(osv.osv):
|
|||
if not (tax_data.base_code_id and tax_data.tax_code_id):
|
||||
raise osv.except_osv(_('No Account Base Code and Account Tax Code!'),_("You have to configure account base code and account tax code on the '%s' tax!") % (tax_data.name))
|
||||
|
||||
sign = (move_line['debit'] - move_line['credit']) < 0 and -1 or 1
|
||||
move_line['amount_currency'] = company_currency <> current_currency and sign * line.amount or False
|
||||
# compute the amount in foreign currency
|
||||
foreign_currency_diff = 0.0
|
||||
amount_currency = False
|
||||
if line.move_line_id:
|
||||
voucher_currency = voucher_brw.currency_id and voucher_brw.currency_id.id or voucher_brw.journal_id.company_id.currency_id.id
|
||||
# We want to set it on the account move line as soon as the original line had a foreign currency
|
||||
if line.move_line_id.currency_id and line.move_line_id.currency_id.id != company_currency:
|
||||
# we compute the amount in that foreign currency.
|
||||
if line.move_line_id.currency_id.id == current_currency:
|
||||
# if the voucher and the voucher line share the same currency, there is no computation to do
|
||||
sign = (move_line['debit'] - move_line['credit']) < 0 and -1 or 1
|
||||
amount_currency = sign * (line.amount)
|
||||
elif line.move_line_id.currency_id.id == voucher_brw.payment_rate_currency_id.id:
|
||||
# if the rate is specified on the voucher, we must use it
|
||||
voucher_rate = currency_obj.browse(cr, uid, voucher_currency, context=ctx).rate
|
||||
amount_currency = (move_line['debit'] - move_line['credit']) * voucher_brw.payment_rate * voucher_rate
|
||||
else:
|
||||
# otherwise we use the rates of the system (giving the voucher date in the context)
|
||||
amount_currency = currency_obj.compute(cr, uid, company_currency, line.move_line_id.currency_id.id, move_line['debit']-move_line['credit'], context=ctx)
|
||||
if line.amount == line.amount_unreconciled and line.move_line_id.currency_id.id == voucher_currency:
|
||||
foreign_currency_diff = line.move_line_id.amount_residual_currency + amount_currency
|
||||
|
||||
move_line['amount_currency'] = amount_currency
|
||||
voucher_line = move_line_obj.create(cr, uid, move_line)
|
||||
rec_ids = [voucher_line, line.move_line_id.id]
|
||||
|
||||
if amount_residual:
|
||||
# Change difference entry
|
||||
exch_lines = self._get_exchange_lines(cr, uid, line, move_id, amount_residual, company_currency, current_currency, context=context)
|
||||
if not currency_obj.is_zero(cr, uid, voucher_brw.company_id.currency_id, currency_rate_difference):
|
||||
# Change difference entry in company currency
|
||||
exch_lines = self._get_exchange_lines(cr, uid, line, move_id, currency_rate_difference, company_currency, current_currency, context=context)
|
||||
new_id = move_line_obj.create(cr, uid, exch_lines[0],context)
|
||||
move_line_obj.create(cr, uid, exch_lines[1], context)
|
||||
rec_ids.append(new_id)
|
||||
|
||||
if line.move_line_id and line.move_line_id.currency_id and not currency_obj.is_zero(cr, uid, line.move_line_id.currency_id, foreign_currency_diff):
|
||||
# Change difference entry in voucher currency
|
||||
move_line_foreign_currency = {
|
||||
'journal_id': line.voucher_id.journal_id.id,
|
||||
'period_id': line.voucher_id.period_id.id,
|
||||
'name': _('change')+': '+(line.name or '/'),
|
||||
'account_id': line.account_id.id,
|
||||
'move_id': move_id,
|
||||
'partner_id': line.voucher_id.partner_id.id,
|
||||
'currency_id': line.move_line_id.currency_id.id,
|
||||
'amount_currency': -1 * foreign_currency_diff,
|
||||
'quantity': 1,
|
||||
'credit': 0.0,
|
||||
'debit': 0.0,
|
||||
'date': line.voucher_id.date,
|
||||
}
|
||||
new_id = move_line_obj.create(cr, uid, move_line_foreign_currency, context=context)
|
||||
rec_ids.append(new_id)
|
||||
|
||||
if line.move_line_id.id:
|
||||
rec_lst_ids.append(rec_ids)
|
||||
|
||||
|
|
@ -1000,28 +1186,32 @@ class account_voucher(osv.osv):
|
|||
continue
|
||||
company_currency = self._get_company_currency(cr, uid, voucher.id, context)
|
||||
current_currency = self._get_current_currency(cr, uid, voucher.id, context)
|
||||
# we select the context to use accordingly if it's a multicurrency case or not
|
||||
context = self._sel_context(cr, uid, voucher.id, context)
|
||||
#Create the account move record.
|
||||
# But for the operations made by _convert_amount, we always need to give the date in the context
|
||||
ctx = context.copy()
|
||||
ctx.update({'date': voucher.date})
|
||||
# Create the account move record.
|
||||
move_id = move_pool.create(cr, uid, self.account_move_get(cr, uid, voucher.id, context=context), context=context)
|
||||
# Get the name of the account_move just created
|
||||
name = move_pool.browse(cr, uid, move_id, context=context).name
|
||||
#Create the first line of the voucher
|
||||
# Create the first line of the voucher
|
||||
move_line_id = move_line_pool.create(cr, uid, self.first_move_line_get(cr,uid,voucher.id, move_id, company_currency, current_currency, context), context)
|
||||
move_line_brw = move_line_pool.browse(cr, uid, move_line_id, context=context)
|
||||
line_total = move_line_brw.debit - move_line_brw.credit
|
||||
rec_list_ids = []
|
||||
if voucher.type == 'sale':
|
||||
line_total = line_total - (voucher.tax_amount / voucher.payment_rate)
|
||||
line_total = line_total - self._convert_amount(cr, uid, voucher.tax_amount, voucher.id, context=ctx)
|
||||
elif voucher.type == 'purchase':
|
||||
line_total = line_total + (voucher.tax_amount / voucher.payment_rate)
|
||||
#create one move line per voucher line where amount is not 0.0
|
||||
line_total = line_total + self._convert_amount(cr, uid, voucher.tax_amount, voucher.id, context=ctx)
|
||||
# Create one move line per voucher line where amount is not 0.0
|
||||
line_total, rec_list_ids = self.voucher_move_line_create(cr, uid, voucher.id, line_total, move_id, company_currency, current_currency, context)
|
||||
|
||||
#create the writeoff line if needed
|
||||
# Create the writeoff line if needed
|
||||
ml_writeoff = self.writeoff_move_line_get(cr, uid, voucher.id, line_total, move_id, name, company_currency, current_currency, context)
|
||||
if ml_writeoff:
|
||||
ml_writeoff_id = move_line_pool.create(cr, uid, ml_writeoff, context)
|
||||
#We post the voucher.
|
||||
# We post the voucher.
|
||||
self.write(cr, uid, [voucher.id], {
|
||||
'move_id': move_id,
|
||||
'state': 'posted',
|
||||
|
|
@ -1029,10 +1219,10 @@ class account_voucher(osv.osv):
|
|||
})
|
||||
if voucher.journal_id.entry_posted:
|
||||
move_pool.post(cr, uid, [move_id], context={})
|
||||
#We automatically reconcile the account move lines.
|
||||
# We automatically reconcile the account move lines.
|
||||
for rec_ids in rec_list_ids:
|
||||
if len(rec_ids) >= 2:
|
||||
move_line_pool.reconcile_partial(cr, uid, rec_ids, writeoff_acc_id=voucher.exchange_acc_id.id, writeoff_period_id=voucher.period_id.id, writeoff_journal_id=voucher.journal_id.id)
|
||||
move_line_pool.reconcile_partial(cr, uid, rec_ids, writeoff_acc_id=voucher.writeoff_acc_id.id, writeoff_period_id=voucher.period_id.id, writeoff_journal_id=voucher.journal_id.id)
|
||||
return True
|
||||
|
||||
def copy(self, cr, uid, id, default={}, context=None):
|
||||
|
|
@ -1084,13 +1274,28 @@ class account_voucher_line(osv.osv):
|
|||
rs_data[line.id] = res
|
||||
return rs_data
|
||||
|
||||
def _currency_id(self, cr, uid, ids, name, args, context=None):
|
||||
'''
|
||||
This function returns the currency id of a voucher line. It's either the currency of the
|
||||
associated move line (if any) or the currency of the voucher or the company currency.
|
||||
'''
|
||||
res = {}
|
||||
for line in self.browse(cr, uid, ids, context=context):
|
||||
move_line = line.move_line_id
|
||||
if move_line:
|
||||
res[line.id] = move_line.currency_id and move_line.currency_id.id or move_line.company_id.currency_id.id
|
||||
else:
|
||||
res[line.id] = line.voucher_id.currency_id and line.voucher_id.currency_id.id or line.voucher_id.company_id.currency_id.id
|
||||
return res
|
||||
|
||||
_columns = {
|
||||
'voucher_id':fields.many2one('account.voucher', 'Voucher', required=1, ondelete='cascade'),
|
||||
'name':fields.char('Description', size=256),
|
||||
'account_id':fields.many2one('account.account','Account', required=True),
|
||||
'partner_id':fields.related('voucher_id', 'partner_id', type='many2one', relation='res.partner', string='Partner'),
|
||||
'untax_amount':fields.float('Untax Amount'),
|
||||
'amount':fields.float('Amount', digits_compute=dp.get_precision('Account')),
|
||||
'amount':fields.float('Allocation', digits_compute=dp.get_precision('Account')),
|
||||
'reconcile': fields.boolean('Full Reconcile'),
|
||||
'type':fields.selection([('dr','Debit'),('cr','Credit')], 'Dr/Cr'),
|
||||
'account_analytic_id': fields.many2one('account.analytic.account', 'Analytic Account'),
|
||||
'move_line_id': fields.many2one('account.move.line', 'Journal Item'),
|
||||
|
|
@ -1099,11 +1304,24 @@ class account_voucher_line(osv.osv):
|
|||
'amount_original': fields.function(_compute_balance, multi='dc', type='float', string='Original Amount', store=True),
|
||||
'amount_unreconciled': fields.function(_compute_balance, multi='dc', type='float', string='Open Balance', store=True),
|
||||
'company_id': fields.related('voucher_id','company_id', relation='res.company', type='many2one', string='Company', store=True, readonly=True),
|
||||
'currency_id': fields.function(_currency_id, string='Currency', type='many2one', relation='res.currency', readonly=True),
|
||||
}
|
||||
_defaults = {
|
||||
'name': ''
|
||||
'name': '',
|
||||
}
|
||||
|
||||
def onchange_reconcile(self, cr, uid, ids, reconcile, amount, amount_unreconciled, context=None):
|
||||
vals = { 'amount': 0.0}
|
||||
if reconcile:
|
||||
vals = { 'amount': amount_unreconciled}
|
||||
return {'value': vals}
|
||||
|
||||
def onchange_amount(self, cr, uid, ids, amount, amount_unreconciled, context=None):
|
||||
vals = {}
|
||||
if amount:
|
||||
vals['reconcile'] = (amount == amount_unreconciled)
|
||||
return {'value': vals}
|
||||
|
||||
def onchange_move_line_id(self, cr, user, ids, move_line_id, context=None):
|
||||
"""
|
||||
Returns a dict that contains new values and context
|
||||
|
|
@ -1122,10 +1340,10 @@ class account_voucher_line(osv.osv):
|
|||
ttype = 'dr'
|
||||
else:
|
||||
ttype = 'cr'
|
||||
account_id = move_line.account_id.id
|
||||
res.update({
|
||||
'account_id':account_id,
|
||||
'type': ttype
|
||||
'account_id': move_line.account_id.id,
|
||||
'type': ttype,
|
||||
'currency_id': move_line.currency_id and move_line.currency_id.id or move_line.company_id.currency_id.id,
|
||||
})
|
||||
return {
|
||||
'value':res,
|
||||
|
|
@ -1262,6 +1480,7 @@ def resolve_o2m_operations(cr, uid, target_osv, operations, fields, context):
|
|||
result = operation[2]
|
||||
elif operation[0] == 1:
|
||||
result = target_osv.read(cr, uid, operation[1], fields, context=context)
|
||||
if not result: result = {}
|
||||
result.update(operation[2])
|
||||
elif operation[0] == 4:
|
||||
result = target_osv.read(cr, uid, operation[1], fields, context=context)
|
||||
|
|
@ -1269,4 +1488,19 @@ def resolve_o2m_operations(cr, uid, target_osv, operations, fields, context):
|
|||
results.append(result)
|
||||
return results
|
||||
|
||||
class res_company(osv.osv):
|
||||
_inherit = "res.company"
|
||||
_columns = {
|
||||
'income_currency_exchange_account_id': fields.many2one(
|
||||
'account.account',
|
||||
string="Income Currency Rate",
|
||||
domain="[('type', '=', 'other')]",),
|
||||
'expense_currency_exchange_account_id': fields.many2one(
|
||||
'account.account',
|
||||
string="Expense Currency Rate",
|
||||
domain="[('type', '=', 'other')]",),
|
||||
}
|
||||
|
||||
res_company()
|
||||
|
||||
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
|
||||
|
|
|
|||
|
|
@ -11,13 +11,14 @@
|
|||
header = "False"
|
||||
menu="True"/> -->
|
||||
|
||||
<report id="report_account_voucher_print"
|
||||
<!-- This report is awfull so it's better to hide it -->
|
||||
<!-- <report id="report_account_voucher_print"
|
||||
string="Voucher Print"
|
||||
model="account.voucher"
|
||||
name="voucher.print"
|
||||
rml="account_voucher/report/account_voucher_print.rml"
|
||||
auto="False"
|
||||
header = "False"
|
||||
menu="True"/>
|
||||
menu="True"/>-->
|
||||
</data>
|
||||
</openerp>
|
||||
|
|
|
|||
|
|
@ -259,5 +259,19 @@
|
|||
</field>
|
||||
</record>
|
||||
|
||||
<!-- res.company form view -->
|
||||
<record model="ir.ui.view" id="view_company_inherit_currency_xchange_form">
|
||||
<field name="name">res.company.form.inherit</field>
|
||||
<field name="inherit_id" ref="base.view_company_form"/>
|
||||
<field name="model">res.company</field>
|
||||
<field name="type">form</field>
|
||||
<field name="arch" type="xml">
|
||||
<field name="currency_id" position="after">
|
||||
<field name="income_currency_exchange_account_id" colspan="2"/>
|
||||
<field name="expense_currency_exchange_account_id" colspan="2"/>
|
||||
</field>
|
||||
</field>
|
||||
</record>
|
||||
|
||||
</data>
|
||||
</openerp>
|
||||
|
|
|
|||
|
|
@ -7,19 +7,19 @@ msgstr ""
|
|||
"Project-Id-Version: OpenERP Server 6.0dev\n"
|
||||
"Report-Msgid-Bugs-To: support@openerp.com\n"
|
||||
"POT-Creation-Date: 2011-01-11 11:14+0000\n"
|
||||
"PO-Revision-Date: 2011-03-03 13:20+0000\n"
|
||||
"PO-Revision-Date: 2011-12-08 17:08+0000\n"
|
||||
"Last-Translator: Goran Kliska <gkliska@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: 2011-11-05 05:33+0000\n"
|
||||
"X-Generator: Launchpad (build 14231)\n"
|
||||
"X-Launchpad-Export-Date: 2011-12-09 04:46+0000\n"
|
||||
"X-Generator: Launchpad (build 14450)\n"
|
||||
|
||||
#. module: account_voucher
|
||||
#: view:account.voucher.unreconcile:0
|
||||
msgid "Unreconciliation transactions"
|
||||
msgstr ""
|
||||
msgstr "Transakcije poništavanja zatvaranja"
|
||||
|
||||
#. module: account_voucher
|
||||
#: code:addons/account_voucher/account_voucher.py:247
|
||||
|
|
@ -30,12 +30,12 @@ msgstr "Otpis"
|
|||
#. module: account_voucher
|
||||
#: view:account.voucher:0
|
||||
msgid "Payment Ref"
|
||||
msgstr ""
|
||||
msgstr "Oznaka plaćanja"
|
||||
|
||||
#. module: account_voucher
|
||||
#: view:account.voucher:0
|
||||
msgid "Open Customer Journal Entries"
|
||||
msgstr ""
|
||||
msgstr "Otvori temeljnice kupaca"
|
||||
|
||||
#. module: account_voucher
|
||||
#: view:sale.receipt.report:0
|
||||
|
|
@ -85,7 +85,7 @@ msgstr ""
|
|||
#: view:account.voucher:0
|
||||
#: model:ir.actions.act_window,name:account_voucher.act_pay_bills
|
||||
msgid "Bill Payment"
|
||||
msgstr ""
|
||||
msgstr "Plaćanje računa"
|
||||
|
||||
#. module: account_voucher
|
||||
#: code:addons/account_voucher/account_voucher.py:746
|
||||
|
|
@ -105,7 +105,7 @@ msgstr "Uvoz stavki"
|
|||
#. module: account_voucher
|
||||
#: model:ir.model,name:account_voucher.model_account_voucher_unreconcile
|
||||
msgid "Account voucher unreconcile"
|
||||
msgstr "Poništi zatvaranja plaćanja"
|
||||
msgstr "Poništi zatvaranja"
|
||||
|
||||
#. module: account_voucher
|
||||
#: selection:sale.receipt.report,month:0
|
||||
|
|
@ -120,11 +120,14 @@ msgid ""
|
|||
"automatically and you can record the customer payment related to this sales "
|
||||
"receipt."
|
||||
msgstr ""
|
||||
"Kada prodate proizvod kupci dužni ste mu izdati račun. Potvrdom računa "
|
||||
"kreiraju se knjigovodstvene stavke dugovanja kupca i tada možete "
|
||||
"evidentirati plaćanje kupca vezano na ovu prodaju."
|
||||
|
||||
#. module: account_voucher
|
||||
#: view:account.voucher:0
|
||||
msgid "Pay Bill"
|
||||
msgstr ""
|
||||
msgstr "Plati račun"
|
||||
|
||||
#. module: account_voucher
|
||||
#: field:account.voucher,company_id:0
|
||||
|
|
@ -132,66 +135,66 @@ msgstr ""
|
|||
#: view:sale.receipt.report:0
|
||||
#: field:sale.receipt.report,company_id:0
|
||||
msgid "Company"
|
||||
msgstr "Tvrtka"
|
||||
msgstr "Organizacija"
|
||||
|
||||
#. module: account_voucher
|
||||
#: view:account.voucher:0
|
||||
msgid "Set to Draft"
|
||||
msgstr ""
|
||||
msgstr "Postavi na nacrt"
|
||||
|
||||
#. module: account_voucher
|
||||
#: help:account.voucher,reference:0
|
||||
msgid "Transaction reference number."
|
||||
msgstr ""
|
||||
msgstr "Transaction reference number."
|
||||
|
||||
#. module: account_voucher
|
||||
#: model:ir.actions.act_window,name:account_voucher.action_view_account_voucher_unreconcile
|
||||
msgid "Unreconcile entries"
|
||||
msgstr ""
|
||||
msgstr "Otvori stavke"
|
||||
|
||||
#. module: account_voucher
|
||||
#: view:account.voucher:0
|
||||
msgid "Voucher Statistics"
|
||||
msgstr ""
|
||||
msgstr "Statistike vaučera"
|
||||
|
||||
#. module: account_voucher
|
||||
#: view:account.voucher:0
|
||||
msgid "Validate"
|
||||
msgstr ""
|
||||
msgstr "Potvrdi"
|
||||
|
||||
#. module: account_voucher
|
||||
#: view:sale.receipt.report:0
|
||||
#: field:sale.receipt.report,day:0
|
||||
msgid "Day"
|
||||
msgstr ""
|
||||
msgstr "Dan"
|
||||
|
||||
#. module: account_voucher
|
||||
#: view:account.voucher:0
|
||||
msgid "Search Vouchers"
|
||||
msgstr ""
|
||||
msgstr "Traži vaučere"
|
||||
|
||||
#. module: account_voucher
|
||||
#: selection:account.voucher,type:0
|
||||
#: selection:sale.receipt.report,type:0
|
||||
msgid "Purchase"
|
||||
msgstr ""
|
||||
msgstr "Nabava"
|
||||
|
||||
#. module: account_voucher
|
||||
#: field:account.voucher,account_id:0
|
||||
#: field:account.voucher.line,account_id:0
|
||||
#: field:sale.receipt.report,account_id:0
|
||||
msgid "Account"
|
||||
msgstr ""
|
||||
msgstr "Konto"
|
||||
|
||||
#. module: account_voucher
|
||||
#: field:account.voucher,line_dr_ids:0
|
||||
msgid "Debits"
|
||||
msgstr ""
|
||||
msgstr "Dugovanja"
|
||||
|
||||
#. module: account_voucher
|
||||
#: view:account.statement.from.invoice.lines:0
|
||||
msgid "Ok"
|
||||
msgstr ""
|
||||
msgstr "U redu"
|
||||
|
||||
#. module: account_voucher
|
||||
#: model:ir.actions.act_window,help:account_voucher.action_sale_receipt_report_all
|
||||
|
|
@ -200,6 +203,8 @@ msgid ""
|
|||
"customer as well as payment delays. The tool search can also be used to "
|
||||
"personalise your Invoices reports and so, match this analysis to your needs."
|
||||
msgstr ""
|
||||
"Pregled fakturiranih iznosa i kašnjenja plaćanja. Za prilagodbu izvještaja "
|
||||
"vašim potrebama koristite funkcionalnosti traženja i grupiranja."
|
||||
|
||||
#. module: account_voucher
|
||||
#: field:account.voucher,date_due:0
|
||||
|
|
@ -207,12 +212,12 @@ msgstr ""
|
|||
#: view:sale.receipt.report:0
|
||||
#: field:sale.receipt.report,date_due:0
|
||||
msgid "Due Date"
|
||||
msgstr ""
|
||||
msgstr "Datum dospijeća"
|
||||
|
||||
#. module: account_voucher
|
||||
#: field:account.voucher,narration:0
|
||||
msgid "Notes"
|
||||
msgstr ""
|
||||
msgstr "Bilješke"
|
||||
|
||||
#. module: account_voucher
|
||||
#: model:ir.actions.act_window,help:account_voucher.action_vendor_receipt
|
||||
|
|
@ -223,22 +228,25 @@ msgid ""
|
|||
"to you automatically the reconciliation of this payment with the open "
|
||||
"invoices or sales receipts."
|
||||
msgstr ""
|
||||
"Uplate kupaca evidentiraju primljena plaćanja kupaca. Upišite kupca, način "
|
||||
"plaćanja=dnevnik i iznos plaćanja. OpenERP će predložiti zatvaranje plaćanja "
|
||||
"s otvorenim računom(ima) ili drugim otvorenim stavkama tog partnera."
|
||||
|
||||
#. module: account_voucher
|
||||
#: selection:account.voucher,type:0
|
||||
#: selection:sale.receipt.report,type:0
|
||||
msgid "Sale"
|
||||
msgstr ""
|
||||
msgstr "Prodaja"
|
||||
|
||||
#. module: account_voucher
|
||||
#: field:account.voucher.line,move_line_id:0
|
||||
msgid "Journal Item"
|
||||
msgstr ""
|
||||
msgstr "Stavka dnevnika"
|
||||
|
||||
#. module: account_voucher
|
||||
#: field:account.voucher,reference:0
|
||||
msgid "Ref #"
|
||||
msgstr ""
|
||||
msgstr "Ref #"
|
||||
|
||||
#. module: account_voucher
|
||||
#: field:account.voucher.line,amount:0
|
||||
|
|
@ -249,28 +257,28 @@ msgstr ""
|
|||
#. module: account_voucher
|
||||
#: view:account.voucher:0
|
||||
msgid "Payment Options"
|
||||
msgstr ""
|
||||
msgstr "Opcije plaćanja"
|
||||
|
||||
#. module: account_voucher
|
||||
#: view:account.voucher:0
|
||||
msgid "Other Information"
|
||||
msgstr ""
|
||||
msgstr "Ostali podaci"
|
||||
|
||||
#. module: account_voucher
|
||||
#: selection:account.voucher,state:0
|
||||
#: selection:sale.receipt.report,state:0
|
||||
msgid "Cancelled"
|
||||
msgstr ""
|
||||
msgstr "Otkazani"
|
||||
|
||||
#. module: account_voucher
|
||||
#: field:account.statement.from.invoice,date:0
|
||||
msgid "Date payment"
|
||||
msgstr ""
|
||||
msgstr "Datum plaćanja"
|
||||
|
||||
#. module: account_voucher
|
||||
#: model:ir.model,name:account_voucher.model_account_bank_statement_line
|
||||
msgid "Bank Statement Line"
|
||||
msgstr ""
|
||||
msgstr "Redak bankovnog izvoda"
|
||||
|
||||
#. module: account_voucher
|
||||
#: model:ir.actions.act_window,name:account_voucher.action_purchase_receipt
|
||||
|
|
@ -282,12 +290,12 @@ msgstr ""
|
|||
#: view:account.voucher:0
|
||||
#: view:account.voucher.unreconcile:0
|
||||
msgid "Unreconcile"
|
||||
msgstr ""
|
||||
msgstr "Otvori stavke"
|
||||
|
||||
#. module: account_voucher
|
||||
#: field:account.voucher,tax_id:0
|
||||
msgid "Tax"
|
||||
msgstr ""
|
||||
msgstr "Porez"
|
||||
|
||||
#. module: account_voucher
|
||||
#: report:voucher.print:0
|
||||
|
|
@ -298,32 +306,32 @@ msgstr ""
|
|||
#: view:sale.receipt.report:0
|
||||
#: field:sale.receipt.report,nbr:0
|
||||
msgid "# of Voucher Lines"
|
||||
msgstr ""
|
||||
msgstr "# linija vaučera"
|
||||
|
||||
#. module: account_voucher
|
||||
#: field:account.voucher.line,account_analytic_id:0
|
||||
msgid "Analytic Account"
|
||||
msgstr ""
|
||||
msgstr "Konto analitike"
|
||||
|
||||
#. module: account_voucher
|
||||
#: view:account.voucher:0
|
||||
msgid "Payment Information"
|
||||
msgstr ""
|
||||
msgstr "Informacije uplate"
|
||||
|
||||
#. module: account_voucher
|
||||
#: view:account.statement.from.invoice:0
|
||||
msgid "Go"
|
||||
msgstr ""
|
||||
msgstr "Go"
|
||||
|
||||
#. module: account_voucher
|
||||
#: view:account.voucher:0
|
||||
msgid "Paid Amount"
|
||||
msgstr ""
|
||||
msgstr "Plaćeni iznos"
|
||||
|
||||
#. module: account_voucher
|
||||
#: view:account.bank.statement:0
|
||||
msgid "Import Invoices"
|
||||
msgstr ""
|
||||
msgstr "Uvoz računa"
|
||||
|
||||
#. module: account_voucher
|
||||
#: report:voucher.print:0
|
||||
|
|
@ -334,7 +342,7 @@ msgstr ""
|
|||
#: selection:account.voucher,type:0
|
||||
#: selection:sale.receipt.report,type:0
|
||||
msgid "Receipt"
|
||||
msgstr ""
|
||||
msgstr "Receipt"
|
||||
|
||||
#. module: account_voucher
|
||||
#: report:voucher.print:0
|
||||
|
|
@ -349,7 +357,7 @@ msgstr ""
|
|||
#. module: account_voucher
|
||||
#: view:account.voucher:0
|
||||
msgid "Sales Lines"
|
||||
msgstr ""
|
||||
msgstr "Stavke prodaje"
|
||||
|
||||
#. module: account_voucher
|
||||
#: report:voucher.print:0
|
||||
|
|
@ -360,14 +368,14 @@ msgstr ""
|
|||
#: view:account.voucher:0
|
||||
#: field:account.voucher,period_id:0
|
||||
msgid "Period"
|
||||
msgstr ""
|
||||
msgstr "Period"
|
||||
|
||||
#. module: account_voucher
|
||||
#: view:account.voucher:0
|
||||
#: field:account.voucher,state:0
|
||||
#: view:sale.receipt.report:0
|
||||
msgid "State"
|
||||
msgstr ""
|
||||
msgstr "Stanje"
|
||||
|
||||
#. module: account_voucher
|
||||
#: model:ir.module.module,shortdesc:account_voucher.module_meta_information
|
||||
|
|
@ -378,18 +386,18 @@ msgstr ""
|
|||
#: view:sale.receipt.report:0
|
||||
#: field:sale.receipt.report,type:0
|
||||
msgid "Type"
|
||||
msgstr ""
|
||||
msgstr "Vrsta"
|
||||
|
||||
#. module: account_voucher
|
||||
#: field:account.voucher.unreconcile,remove:0
|
||||
msgid "Want to remove accounting entries too ?"
|
||||
msgstr ""
|
||||
msgstr "Želite li ukloniti i knjigovodstvene unose?"
|
||||
|
||||
#. module: account_voucher
|
||||
#: view:account.voucher:0
|
||||
#: model:ir.actions.act_window,name:account_voucher.act_journal_voucher_open
|
||||
msgid "Voucher Entries"
|
||||
msgstr ""
|
||||
msgstr "Stavke vaučera"
|
||||
|
||||
#. module: account_voucher
|
||||
#: code:addons/account_voucher/account_voucher.py:645
|
||||
|
|
@ -400,24 +408,24 @@ msgstr ""
|
|||
#. module: account_voucher
|
||||
#: view:account.voucher:0
|
||||
msgid "Supplier Voucher"
|
||||
msgstr ""
|
||||
msgstr "Vaučer dobavljača"
|
||||
|
||||
#. module: account_voucher
|
||||
#: model:ir.actions.act_window,name:account_voucher.action_review_voucher_list
|
||||
msgid "Vouchers Entries"
|
||||
msgstr ""
|
||||
msgstr "Stavke vaučera"
|
||||
|
||||
#. module: account_voucher
|
||||
#: field:account.voucher,name:0
|
||||
msgid "Memo"
|
||||
msgstr ""
|
||||
msgstr "Memo"
|
||||
|
||||
#. module: account_voucher
|
||||
#: view:account.voucher:0
|
||||
#: model:ir.actions.act_window,name:account_voucher.action_sale_receipt
|
||||
#: model:ir.ui.menu,name:account_voucher.menu_action_sale_receipt
|
||||
msgid "Sales Receipt"
|
||||
msgstr ""
|
||||
msgstr "Izdani vaučeri"
|
||||
|
||||
#. module: account_voucher
|
||||
#: code:addons/account_voucher/account_voucher.py:596
|
||||
|
|
@ -428,30 +436,30 @@ msgstr ""
|
|||
#. module: account_voucher
|
||||
#: view:account.voucher:0
|
||||
msgid "Bill Information"
|
||||
msgstr ""
|
||||
msgstr "Bill Information"
|
||||
|
||||
#. module: account_voucher
|
||||
#: selection:sale.receipt.report,month:0
|
||||
msgid "July"
|
||||
msgstr ""
|
||||
msgstr "Srpanj"
|
||||
|
||||
#. module: account_voucher
|
||||
#: view:account.voucher.unreconcile:0
|
||||
msgid "Unreconciliation"
|
||||
msgstr ""
|
||||
msgstr "Poništavanje zatvaranja IOS-a"
|
||||
|
||||
#. module: account_voucher
|
||||
#: view:sale.receipt.report:0
|
||||
#: field:sale.receipt.report,due_delay:0
|
||||
msgid "Avg. Due Delay"
|
||||
msgstr ""
|
||||
msgstr "Pros. dugovanje"
|
||||
|
||||
#. module: account_voucher
|
||||
#: view:account.invoice:0
|
||||
#: code:addons/account_voucher/invoice.py:32
|
||||
#, python-format
|
||||
msgid "Pay Invoice"
|
||||
msgstr ""
|
||||
msgstr "Plaćanje"
|
||||
|
||||
#. module: account_voucher
|
||||
#: code:addons/account_voucher/account_voucher.py:746
|
||||
|
|
@ -462,12 +470,12 @@ msgstr ""
|
|||
#. module: account_voucher
|
||||
#: field:account.voucher,tax_amount:0
|
||||
msgid "Tax Amount"
|
||||
msgstr ""
|
||||
msgstr "Iznos poreza"
|
||||
|
||||
#. module: account_voucher
|
||||
#: view:account.voucher:0
|
||||
msgid "Voucher Entry"
|
||||
msgstr ""
|
||||
msgstr "Stavka vaučera"
|
||||
|
||||
#. module: account_voucher
|
||||
#: view:account.voucher:0
|
||||
|
|
@ -476,82 +484,82 @@ msgstr ""
|
|||
#: view:sale.receipt.report:0
|
||||
#: field:sale.receipt.report,partner_id:0
|
||||
msgid "Partner"
|
||||
msgstr ""
|
||||
msgstr "Partner"
|
||||
|
||||
#. module: account_voucher
|
||||
#: field:account.voucher,payment_option:0
|
||||
msgid "Payment Difference"
|
||||
msgstr ""
|
||||
msgstr "Razlika plaćanja"
|
||||
|
||||
#. module: account_voucher
|
||||
#: constraint:account.bank.statement.line:0
|
||||
msgid ""
|
||||
"The amount of the voucher must be the same amount as the one on the "
|
||||
"statement line"
|
||||
msgstr ""
|
||||
msgstr "Iznos vaučera mora biti jednak iznosu stavke izvoda banke/blagajne."
|
||||
|
||||
#. module: account_voucher
|
||||
#: view:account.voucher:0
|
||||
msgid "To Review"
|
||||
msgstr ""
|
||||
msgstr "Za provjeru"
|
||||
|
||||
#. module: account_voucher
|
||||
#: view:account.voucher:0
|
||||
msgid "Expense Lines"
|
||||
msgstr ""
|
||||
msgstr "Redak troška"
|
||||
|
||||
#. module: account_voucher
|
||||
#: field:account.statement.from.invoice,line_ids:0
|
||||
#: field:account.statement.from.invoice.lines,line_ids:0
|
||||
msgid "Invoices"
|
||||
msgstr ""
|
||||
msgstr "Računi"
|
||||
|
||||
#. module: account_voucher
|
||||
#: selection:sale.receipt.report,month:0
|
||||
msgid "December"
|
||||
msgstr ""
|
||||
msgstr "Prosinac"
|
||||
|
||||
#. module: account_voucher
|
||||
#: field:account.voucher,line_ids:0
|
||||
#: view:account.voucher.line:0
|
||||
#: model:ir.model,name:account_voucher.model_account_voucher_line
|
||||
msgid "Voucher Lines"
|
||||
msgstr ""
|
||||
msgstr "Linije vaučera"
|
||||
|
||||
#. module: account_voucher
|
||||
#: view:sale.receipt.report:0
|
||||
#: field:sale.receipt.report,month:0
|
||||
msgid "Month"
|
||||
msgstr ""
|
||||
msgstr "Mjesec"
|
||||
|
||||
#. module: account_voucher
|
||||
#: field:account.voucher,currency_id:0
|
||||
#: field:sale.receipt.report,currency_id:0
|
||||
msgid "Currency"
|
||||
msgstr ""
|
||||
msgstr "Valuta"
|
||||
|
||||
#. module: account_voucher
|
||||
#: view:account.statement.from.invoice.lines:0
|
||||
msgid "Payable and Receivables"
|
||||
msgstr ""
|
||||
msgstr "Payable and Receivables"
|
||||
|
||||
#. module: account_voucher
|
||||
#: selection:account.voucher,pay_now:0
|
||||
#: selection:sale.receipt.report,pay_now:0
|
||||
msgid "Pay Later or Group Funds"
|
||||
msgstr ""
|
||||
msgstr "Pay Later or Group Funds"
|
||||
|
||||
#. module: account_voucher
|
||||
#: view:sale.receipt.report:0
|
||||
#: field:sale.receipt.report,user_id:0
|
||||
msgid "Salesman"
|
||||
msgstr ""
|
||||
msgstr "Prodavač"
|
||||
|
||||
#. module: account_voucher
|
||||
#: view:sale.receipt.report:0
|
||||
#: field:sale.receipt.report,delay_to_pay:0
|
||||
msgid "Avg. Delay To Pay"
|
||||
msgstr ""
|
||||
msgstr "Pros. kašnjenje"
|
||||
|
||||
#. module: account_voucher
|
||||
#: view:account.voucher:0
|
||||
|
|
@ -560,7 +568,7 @@ msgstr ""
|
|||
#: selection:sale.receipt.report,state:0
|
||||
#: report:voucher.print:0
|
||||
msgid "Draft"
|
||||
msgstr ""
|
||||
msgstr "Nacrt"
|
||||
|
||||
#. module: account_voucher
|
||||
#: field:account.voucher,writeoff_acc_id:0
|
||||
|
|
@ -576,7 +584,7 @@ msgstr ""
|
|||
#: view:sale.receipt.report:0
|
||||
#: field:sale.receipt.report,price_total_tax:0
|
||||
msgid "Total With Tax"
|
||||
msgstr ""
|
||||
msgstr "Ukupno s porezom"
|
||||
|
||||
#. module: account_voucher
|
||||
#: report:voucher.print:0
|
||||
|
|
@ -586,7 +594,7 @@ msgstr ""
|
|||
#. module: account_voucher
|
||||
#: selection:sale.receipt.report,month:0
|
||||
msgid "August"
|
||||
msgstr ""
|
||||
msgstr "Kolovoz"
|
||||
|
||||
#. module: account_voucher
|
||||
#: model:ir.actions.act_window,help:account_voucher.action_vendor_payment
|
||||
|
|
@ -596,16 +604,19 @@ msgid ""
|
|||
"the payment, OpenERP will propose to reconcile your payment with the open "
|
||||
"supplier invoices or bills."
|
||||
msgstr ""
|
||||
"Nalozi za plaćanje omogućuju upravljanje plaćanjima obveza. Nakon odabira "
|
||||
"dobavljača, načina plaćanja i iznosa OpenERP će ponuditi zatvaranje "
|
||||
"otvorenih računa dobavljača, odnosno svih otvorenih stavki (IOS-a) partnera."
|
||||
|
||||
#. module: account_voucher
|
||||
#: view:account.voucher:0
|
||||
msgid "Total Amount"
|
||||
msgstr ""
|
||||
msgstr "Ukupni iznos"
|
||||
|
||||
#. module: account_voucher
|
||||
#: selection:sale.receipt.report,month:0
|
||||
msgid "June"
|
||||
msgstr ""
|
||||
msgstr "Lipanj"
|
||||
|
||||
#. module: account_voucher
|
||||
#: field:account.voucher.line,type:0
|
||||
|
|
@ -620,30 +631,30 @@ msgstr ""
|
|||
#. module: account_voucher
|
||||
#: view:account.voucher:0
|
||||
msgid "Payment Terms"
|
||||
msgstr ""
|
||||
msgstr "Uvjeti plaćanja"
|
||||
|
||||
#. module: account_voucher
|
||||
#: view:account.voucher:0
|
||||
msgid "Are you sure to unreconcile this record ?"
|
||||
msgstr ""
|
||||
msgstr "Sigurno želite otvoriti ovaj zapis?"
|
||||
|
||||
#. module: account_voucher
|
||||
#: field:account.voucher,date:0
|
||||
#: field:account.voucher.line,date_original:0
|
||||
#: field:sale.receipt.report,date:0
|
||||
msgid "Date"
|
||||
msgstr ""
|
||||
msgstr "Datum"
|
||||
|
||||
#. module: account_voucher
|
||||
#: selection:sale.receipt.report,month:0
|
||||
msgid "November"
|
||||
msgstr ""
|
||||
msgstr "Studeni"
|
||||
|
||||
#. module: account_voucher
|
||||
#: view:account.voucher:0
|
||||
#: view:sale.receipt.report:0
|
||||
msgid "Extended Filters..."
|
||||
msgstr ""
|
||||
msgstr "Prošireni filtri..."
|
||||
|
||||
#. module: account_voucher
|
||||
#: report:voucher.print:0
|
||||
|
|
@ -653,49 +664,49 @@ msgstr ""
|
|||
#. module: account_voucher
|
||||
#: field:account.bank.statement.line,amount_reconciled:0
|
||||
msgid "Amount reconciled"
|
||||
msgstr ""
|
||||
msgstr "Zatvoreni iznos"
|
||||
|
||||
#. module: account_voucher
|
||||
#: field:account.voucher,analytic_id:0
|
||||
msgid "Write-Off Analytic Account"
|
||||
msgstr ""
|
||||
msgstr "Write-Off Analytic Account"
|
||||
|
||||
#. module: account_voucher
|
||||
#: selection:account.voucher,pay_now:0
|
||||
#: selection:sale.receipt.report,pay_now:0
|
||||
msgid "Pay Directly"
|
||||
msgstr ""
|
||||
msgstr "Pay Directly"
|
||||
|
||||
#. module: account_voucher
|
||||
#: selection:sale.receipt.report,month:0
|
||||
msgid "October"
|
||||
msgstr ""
|
||||
msgstr "Listopad"
|
||||
|
||||
#. module: account_voucher
|
||||
#: field:account.voucher,pre_line:0
|
||||
msgid "Previous Payments ?"
|
||||
msgstr ""
|
||||
msgstr "Predhodna plaćanja ?"
|
||||
|
||||
#. module: account_voucher
|
||||
#: selection:sale.receipt.report,month:0
|
||||
msgid "January"
|
||||
msgstr ""
|
||||
msgstr "Siječanj"
|
||||
|
||||
#. module: account_voucher
|
||||
#: model:ir.actions.act_window,name:account_voucher.action_voucher_list
|
||||
#: model:ir.ui.menu,name:account_voucher.menu_encode_entries_by_voucher
|
||||
msgid "Journal Vouchers"
|
||||
msgstr ""
|
||||
msgstr "Dnevnik vaučera"
|
||||
|
||||
#. module: account_voucher
|
||||
#: view:account.voucher:0
|
||||
msgid "Compute Tax"
|
||||
msgstr ""
|
||||
msgstr "Izračunaj porez"
|
||||
|
||||
#. module: account_voucher
|
||||
#: selection:account.voucher.line,type:0
|
||||
msgid "Credit"
|
||||
msgstr ""
|
||||
msgstr "Potražuje"
|
||||
|
||||
#. module: account_voucher
|
||||
#: code:addons/account_voucher/account_voucher.py:645
|
||||
|
|
@ -706,7 +717,7 @@ msgstr ""
|
|||
#. module: account_voucher
|
||||
#: view:account.voucher:0
|
||||
msgid "Open Supplier Journal Entries"
|
||||
msgstr ""
|
||||
msgstr "Otvori temeljnice dobavljača"
|
||||
|
||||
#. module: account_voucher
|
||||
#: report:voucher.print:0
|
||||
|
|
@ -717,28 +728,28 @@ msgstr ""
|
|||
#: model:ir.actions.act_window,name:account_voucher.action_vendor_payment
|
||||
#: model:ir.ui.menu,name:account_voucher.menu_action_vendor_payment
|
||||
msgid "Supplier Payment"
|
||||
msgstr ""
|
||||
msgstr "Plaćanja dobavljačima"
|
||||
|
||||
#. module: account_voucher
|
||||
#: view:account.voucher:0
|
||||
msgid "Post"
|
||||
msgstr ""
|
||||
msgstr "Post"
|
||||
|
||||
#. module: account_voucher
|
||||
#: view:account.voucher:0
|
||||
msgid "Invoices and outstanding transactions"
|
||||
msgstr ""
|
||||
msgstr "Računi i otvorene stavke"
|
||||
|
||||
#. module: account_voucher
|
||||
#: view:sale.receipt.report:0
|
||||
#: field:sale.receipt.report,price_total:0
|
||||
msgid "Total Without Tax"
|
||||
msgstr ""
|
||||
msgstr "Uk. prije poreza"
|
||||
|
||||
#. module: account_voucher
|
||||
#: view:account.voucher:0
|
||||
msgid "Bill Date"
|
||||
msgstr ""
|
||||
msgstr "Datum računa"
|
||||
|
||||
#. module: account_voucher
|
||||
#: help:account.voucher,state:0
|
||||
|
|
@ -752,55 +763,61 @@ msgid ""
|
|||
"\n"
|
||||
"* The 'Cancelled' state is used when user cancel voucher."
|
||||
msgstr ""
|
||||
" * Vaučer je u stanju \"Nacrt\" za vrijeme upisa podataka i stavki vaučera "
|
||||
"dok se ne potvrdi ili otkaže. \n"
|
||||
" * U 'Pro-forma' stanju vaučeru još uvijek nije dodijeljen broj. \n"
|
||||
" * Stanje 'Knjižen' označava vaučer koji je dobio broj i za koji je izrađena "
|
||||
"temeljnica \n"
|
||||
" * U stanju 'Otkazan' su nevažeći vaučeri"
|
||||
|
||||
#. module: account_voucher
|
||||
#: view:account.voucher:0
|
||||
#: model:ir.model,name:account_voucher.model_account_voucher
|
||||
msgid "Accounting Voucher"
|
||||
msgstr ""
|
||||
msgstr "Knjigovodstveni vaučer"
|
||||
|
||||
#. module: account_voucher
|
||||
#: field:account.voucher,number:0
|
||||
msgid "Number"
|
||||
msgstr ""
|
||||
msgstr "Broj"
|
||||
|
||||
#. module: account_voucher
|
||||
#: model:ir.model,name:account_voucher.model_account_bank_statement
|
||||
msgid "Bank Statement"
|
||||
msgstr ""
|
||||
msgstr "Izvod banke"
|
||||
|
||||
#. module: account_voucher
|
||||
#: selection:sale.receipt.report,month:0
|
||||
msgid "September"
|
||||
msgstr ""
|
||||
msgstr "Rujan"
|
||||
|
||||
#. module: account_voucher
|
||||
#: view:account.voucher:0
|
||||
msgid "Sales Information"
|
||||
msgstr ""
|
||||
msgstr "Informacije o prodaji"
|
||||
|
||||
#. module: account_voucher
|
||||
#: model:ir.actions.act_window,name:account_voucher.action_sale_receipt_report_all
|
||||
#: model:ir.ui.menu,name:account_voucher.menu_action_sale_receipt_report_all
|
||||
#: view:sale.receipt.report:0
|
||||
msgid "Sales Receipt Analysis"
|
||||
msgstr ""
|
||||
msgstr "Analiza izdanih vaučera"
|
||||
|
||||
#. module: account_voucher
|
||||
#: field:account.voucher.line,voucher_id:0
|
||||
#: model:res.request.link,name:account_voucher.req_link_voucher
|
||||
msgid "Voucher"
|
||||
msgstr ""
|
||||
msgstr "Vaučer"
|
||||
|
||||
#. module: account_voucher
|
||||
#: model:ir.model,name:account_voucher.model_account_invoice
|
||||
msgid "Invoice"
|
||||
msgstr ""
|
||||
msgstr "Račun"
|
||||
|
||||
#. module: account_voucher
|
||||
#: view:account.voucher:0
|
||||
msgid "Voucher Items"
|
||||
msgstr ""
|
||||
msgstr "Sadržaj vaučera"
|
||||
|
||||
#. module: account_voucher
|
||||
#: view:account.statement.from.invoice:0
|
||||
|
|
@ -808,20 +825,20 @@ msgstr ""
|
|||
#: view:account.voucher:0
|
||||
#: view:account.voucher.unreconcile:0
|
||||
msgid "Cancel"
|
||||
msgstr ""
|
||||
msgstr "Odustani"
|
||||
|
||||
#. module: account_voucher
|
||||
#: selection:account.voucher,state:0
|
||||
#: view:sale.receipt.report:0
|
||||
#: selection:sale.receipt.report,state:0
|
||||
msgid "Pro-forma"
|
||||
msgstr ""
|
||||
msgstr "Pro-forma"
|
||||
|
||||
#. module: account_voucher
|
||||
#: view:account.voucher:0
|
||||
#: field:account.voucher,move_ids:0
|
||||
msgid "Journal Items"
|
||||
msgstr ""
|
||||
msgstr "Stavke glavne knjige"
|
||||
|
||||
#. module: account_voucher
|
||||
#: view:account.voucher:0
|
||||
|
|
@ -829,28 +846,28 @@ msgstr ""
|
|||
#: model:ir.actions.act_window,name:account_voucher.action_vendor_receipt
|
||||
#: model:ir.ui.menu,name:account_voucher.menu_action_vendor_receipt
|
||||
msgid "Customer Payment"
|
||||
msgstr ""
|
||||
msgstr "Plaćanja kupaca"
|
||||
|
||||
#. module: account_voucher
|
||||
#: view:account.statement.from.invoice:0
|
||||
#: model:ir.actions.act_window,name:account_voucher.action_view_account_statement_from_invoice
|
||||
msgid "Import Invoices in Statement"
|
||||
msgstr ""
|
||||
msgstr "Uvezi račune na nalog"
|
||||
|
||||
#. module: account_voucher
|
||||
#: view:account.voucher:0
|
||||
msgid "Pay"
|
||||
msgstr ""
|
||||
msgstr "Pay"
|
||||
|
||||
#. module: account_voucher
|
||||
#: selection:account.voucher.line,type:0
|
||||
msgid "Debit"
|
||||
msgstr ""
|
||||
msgstr "Duguje"
|
||||
|
||||
#. module: account_voucher
|
||||
#: view:account.voucher:0
|
||||
msgid "Are you sure to confirm this record ?"
|
||||
msgstr ""
|
||||
msgstr "Are you sure to confirm this record ?"
|
||||
|
||||
#. module: account_voucher
|
||||
#: selection:account.voucher,payment_option:0
|
||||
|
|
@ -860,12 +877,12 @@ msgstr ""
|
|||
#. module: account_voucher
|
||||
#: view:account.voucher:0
|
||||
msgid "Payment Method"
|
||||
msgstr ""
|
||||
msgstr "Način plaćanja"
|
||||
|
||||
#. module: account_voucher
|
||||
#: field:account.voucher.line,name:0
|
||||
msgid "Description"
|
||||
msgstr ""
|
||||
msgstr "Opis"
|
||||
|
||||
#. module: account_voucher
|
||||
#: report:voucher.print:0
|
||||
|
|
@ -875,7 +892,7 @@ msgstr ""
|
|||
#. module: account_voucher
|
||||
#: selection:sale.receipt.report,month:0
|
||||
msgid "May"
|
||||
msgstr ""
|
||||
msgstr "Svibanj"
|
||||
|
||||
#. module: account_voucher
|
||||
#: field:account.statement.from.invoice,journal_ids:0
|
||||
|
|
@ -884,23 +901,23 @@ msgstr ""
|
|||
#: view:sale.receipt.report:0
|
||||
#: field:sale.receipt.report,journal_id:0
|
||||
msgid "Journal"
|
||||
msgstr ""
|
||||
msgstr "Dnevnik"
|
||||
|
||||
#. module: account_voucher
|
||||
#: view:account.voucher:0
|
||||
msgid "Internal Notes"
|
||||
msgstr ""
|
||||
msgstr "Interne bilješke"
|
||||
|
||||
#. module: account_voucher
|
||||
#: view:account.voucher:0
|
||||
#: field:account.voucher,line_cr_ids:0
|
||||
msgid "Credits"
|
||||
msgstr ""
|
||||
msgstr "Potraživanja"
|
||||
|
||||
#. module: account_voucher
|
||||
#: field:account.voucher.line,amount_original:0
|
||||
msgid "Original Amount"
|
||||
msgstr ""
|
||||
msgstr "Originalni iznos"
|
||||
|
||||
#. module: account_voucher
|
||||
#: report:voucher.print:0
|
||||
|
|
@ -916,7 +933,7 @@ msgstr ""
|
|||
#: field:sale.receipt.report,pay_now:0
|
||||
#: selection:sale.receipt.report,type:0
|
||||
msgid "Payment"
|
||||
msgstr ""
|
||||
msgstr "Plaćanje"
|
||||
|
||||
#. module: account_voucher
|
||||
#: view:account.voucher:0
|
||||
|
|
@ -925,22 +942,22 @@ msgstr ""
|
|||
#: selection:sale.receipt.report,state:0
|
||||
#: report:voucher.print:0
|
||||
msgid "Posted"
|
||||
msgstr ""
|
||||
msgstr "Proknjiženo"
|
||||
|
||||
#. module: account_voucher
|
||||
#: view:account.voucher:0
|
||||
msgid "Customer"
|
||||
msgstr ""
|
||||
msgstr "Kupac"
|
||||
|
||||
#. module: account_voucher
|
||||
#: selection:sale.receipt.report,month:0
|
||||
msgid "February"
|
||||
msgstr ""
|
||||
msgstr "Veljača"
|
||||
|
||||
#. module: account_voucher
|
||||
#: view:account.voucher:0
|
||||
msgid "Supplier Invoices and Outstanding transactions"
|
||||
msgstr ""
|
||||
msgstr "Ulazni računi i otvorene stavke"
|
||||
|
||||
#. module: account_voucher
|
||||
#: field:account.voucher,comment:0
|
||||
|
|
@ -950,38 +967,38 @@ msgstr ""
|
|||
#. module: account_voucher
|
||||
#: selection:sale.receipt.report,month:0
|
||||
msgid "April"
|
||||
msgstr ""
|
||||
msgstr "Travanj"
|
||||
|
||||
#. module: account_voucher
|
||||
#: field:account.voucher,type:0
|
||||
msgid "Default Type"
|
||||
msgstr ""
|
||||
msgstr "Uobičajeni tip"
|
||||
|
||||
#. module: account_voucher
|
||||
#: model:ir.model,name:account_voucher.model_account_statement_from_invoice
|
||||
#: model:ir.model,name:account_voucher.model_account_statement_from_invoice_lines
|
||||
msgid "Entries by Statement from Invoices"
|
||||
msgstr ""
|
||||
msgstr "Stavke po izvodu iz računa"
|
||||
|
||||
#. module: account_voucher
|
||||
#: field:account.voucher,move_id:0
|
||||
msgid "Account Entry"
|
||||
msgstr ""
|
||||
msgstr "Temeljnica"
|
||||
|
||||
#. module: account_voucher
|
||||
#: field:sale.receipt.report,state:0
|
||||
msgid "Voucher State"
|
||||
msgstr ""
|
||||
msgstr "Stanje vaučera"
|
||||
|
||||
#. module: account_voucher
|
||||
#: help:account.voucher,date:0
|
||||
msgid "Effective date for accounting entries"
|
||||
msgstr ""
|
||||
msgstr "Effective date for accounting entries"
|
||||
|
||||
#. module: account_voucher
|
||||
#: selection:account.voucher,payment_option:0
|
||||
msgid "Keep Open"
|
||||
msgstr ""
|
||||
msgstr "Ostavi otvoreno"
|
||||
|
||||
#. module: account_voucher
|
||||
#: view:account.voucher.unreconcile:0
|
||||
|
|
@ -989,31 +1006,36 @@ msgid ""
|
|||
"If you unreconciliate transactions, you must also verify all the actions "
|
||||
"that are linked to those transactions because they will not be disable"
|
||||
msgstr ""
|
||||
"Ako želite poništiti zatvaranja transakcija, morate također provjeriti sve "
|
||||
"radnje koje su povezane sa tim transakcijama jer neće biti onemogućene"
|
||||
|
||||
#. module: account_voucher
|
||||
#: field:account.voucher.line,untax_amount:0
|
||||
msgid "Untax Amount"
|
||||
msgstr ""
|
||||
msgstr "Osnovica"
|
||||
|
||||
#. module: account_voucher
|
||||
#: model:ir.model,name:account_voucher.model_sale_receipt_report
|
||||
msgid "Sales Receipt Statistics"
|
||||
msgstr ""
|
||||
msgstr "Statistika izdanih vaučera"
|
||||
|
||||
#. module: account_voucher
|
||||
#: view:sale.receipt.report:0
|
||||
#: field:sale.receipt.report,year:0
|
||||
msgid "Year"
|
||||
msgstr ""
|
||||
msgstr "Godina"
|
||||
|
||||
#. module: account_voucher
|
||||
#: view:account.voucher:0
|
||||
#: field:account.voucher.line,amount_unreconciled:0
|
||||
msgid "Open Balance"
|
||||
msgstr ""
|
||||
msgstr "Otvoreni saldo"
|
||||
|
||||
#. module: account_voucher
|
||||
#: view:account.voucher:0
|
||||
#: field:account.voucher,amount:0
|
||||
msgid "Total"
|
||||
msgstr ""
|
||||
msgstr "Ukupno"
|
||||
|
||||
#~ msgid "Dr/Cr"
|
||||
#~ msgstr "Dr/Cr"
|
||||
|
|
|
|||
|
|
@ -5,7 +5,6 @@
|
|||
account_id: account.cash
|
||||
amount: 1000.0
|
||||
company_id: base.main_company
|
||||
currency_id: base.EUR
|
||||
journal_id: account.bank_journal
|
||||
name: Voucher for Axelor
|
||||
narration: Basic Pc
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
-
|
||||
Demo for Account Voucher
|
||||
-
|
||||
!record {model: account.voucher, id: account_voucher_voucheraxelor0}:
|
||||
!record {model: account.voucher, id: account_voucher_voucheraxelor0again}:
|
||||
account_id: account.cash
|
||||
company_id: base.main_company
|
||||
journal_id: account.bank_journal
|
||||
|
|
@ -19,6 +19,6 @@
|
|||
-
|
||||
!python {model: account.voucher}: |
|
||||
import netsvc, tools, os
|
||||
(data, format) = netsvc.LocalService('report.voucher.cash_receipt.drcr').create(cr, uid, [ref("account_voucher_voucheraxelor0")], {}, {})
|
||||
(data, format) = netsvc.LocalService('report.voucher.cash_receipt.drcr').create(cr, uid, [ref("account_voucher_voucheraxelor0again")], {}, {})
|
||||
if tools.config['test_report_directory']:
|
||||
file(os.path.join(tools.config['test_report_directory'], 'account_voucher-report.'+format), 'wb+').write(data)
|
||||
|
|
|
|||
|
|
@ -1,6 +1,15 @@
|
|||
-
|
||||
In order to check the Account_voucher module with multi-currency in OpenERP,
|
||||
I create 2 Invoices in USD and make 2 Payments in USD based on the currency rating on that particular date
|
||||
-
|
||||
I set the income and expense currency accounts on the main company
|
||||
-
|
||||
!python {model: res.company}: |
|
||||
from datetime import datetime
|
||||
vals = {
|
||||
'income_currency_exchange_account_id': ref('account.o_expense'),
|
||||
'expense_currency_exchange_account_id': ref('account.o_expense')}
|
||||
self.write(cr, uid, ref('base.main_company'), vals)
|
||||
-
|
||||
I create currency USD in OpenERP for January of 1.333333 Rate
|
||||
-
|
||||
|
|
@ -131,39 +140,41 @@
|
|||
assert (move_line.debit - move_line.credit == 80), "Invoice move is not correct for debtors account"
|
||||
|
||||
-
|
||||
I create the first voucher of payment
|
||||
<create with values 240 USD, journal USD, and fill amounts 180 for the invoice of 200$ and 70 for the invoice of 100$>
|
||||
I set the context that will be used for the encoding of all the vouchers of this file
|
||||
-
|
||||
!context
|
||||
'type': 'receipt'
|
||||
-
|
||||
I create the first voucher of payment with values 240 USD, journal USD,
|
||||
-
|
||||
!record {model: account.voucher, id: account_voucher_1_case1, view: view_vendor_receipt_form}:
|
||||
account_id: account.cash
|
||||
amount: 240.0
|
||||
company_id: base.main_company
|
||||
journal_id: bank_journal_USD
|
||||
name: 'First payment: Case 1 USD/USD'
|
||||
partner_id: base.res_partner_seagate
|
||||
period_id: account.period_3
|
||||
date: !eval time.strftime("%Y-03-01")
|
||||
payment_option: 'with_writeoff'
|
||||
writeoff_acc_id: account.a_expense
|
||||
comment: 'Write Off'
|
||||
|
||||
-
|
||||
I fill amounts 180 for the invoice of 200$ and 70 for the invoice of 100$>
|
||||
-
|
||||
!python {model: account.voucher}: |
|
||||
import netsvc, time
|
||||
vals = {}
|
||||
res = self.onchange_partner_id(cr, uid, [], ref("base.res_partner_seagate"), ref('bank_journal_USD'), 240.00, 2, ttype='receipt', date=False)
|
||||
vals = {
|
||||
'account_id': ref('account.cash'),
|
||||
'amount': 240.00,
|
||||
'company_id': ref('base.main_company'),
|
||||
'currency_id': ref('base.USD'),
|
||||
'journal_id': ref('bank_journal_USD'),
|
||||
'partner_id': ref('base.res_partner_seagate'),
|
||||
'period_id': ref('account.period_3'),
|
||||
'type': 'receipt',
|
||||
'date': time.strftime("%Y-%m-%d"),
|
||||
'payment_option': 'with_writeoff',
|
||||
'writeoff_acc_id': ref('account.a_expense'),
|
||||
'comment': 'Write Off',
|
||||
'name': 'First payment: Case 1 USD/USD',
|
||||
}
|
||||
vals.update(self.onchange_date(cr, uid, [], time.strftime('%Y-03-01'), ref('base.USD'), 240)['value'])
|
||||
if not res['value']['line_cr_ids']:
|
||||
res['value']['line_cr_ids'] = [{'type': 'cr', 'account_id': ref('account.a_recv'),}]
|
||||
for item in res['value']['line_cr_ids']:
|
||||
if item['amount_unreconciled'] == 200.00:
|
||||
item['amount'] = 180.00
|
||||
voucher_id = self.browse(cr, uid, ref('account_voucher_1_case1'))
|
||||
data = []
|
||||
for item in voucher_id.line_cr_ids:
|
||||
if item.amount_unreconciled == 200.00:
|
||||
data += [(item.id, 180.0)]
|
||||
else:
|
||||
item['amount'] = 70.00
|
||||
vals['line_cr_ids'] = [(0,0,i) for i in res['value']['line_cr_ids']]
|
||||
id = self.create(cr, uid, vals)
|
||||
voucher_id = self.browse(cr, uid, id)
|
||||
data += [(item.id, 70.0)]
|
||||
for line_id, amount in data:
|
||||
self.pool.get('account.voucher.line').write(cr, uid, [line_id], {'amount': amount})
|
||||
assert (voucher_id.state=='draft'), "Voucher is not in draft state"
|
||||
-
|
||||
I check that writeoff amount computed is 10.0
|
||||
|
|
@ -228,41 +239,35 @@
|
|||
move_line = move_line_obj.browse(cr, uid, move_lines[0])
|
||||
assert (move_line.amount_residual_currency == 30.0) , "Residual amount is not correct for first Invoice"
|
||||
-
|
||||
I create the second voucher of payment
|
||||
<create with values 45 USD, journal USD, and fill amounts 20 for the invoice of 200$ and 30 for the invoice of 100$>
|
||||
|
||||
I create the second voucher of payment with values 45 USD, journal USD,
|
||||
-
|
||||
!record {model: account.voucher, id: account_voucher_2_case1}:
|
||||
account_id: account.cash
|
||||
amount: 45.0
|
||||
company_id: base.main_company
|
||||
journal_id: bank_journal_USD
|
||||
name: 'Second payment: Case 1'
|
||||
partner_id: base.res_partner_seagate
|
||||
period_id: account.period_3
|
||||
date: !eval time.strftime("%Y-04-01")
|
||||
payment_option: 'with_writeoff'
|
||||
writeoff_acc_id: account.a_expense
|
||||
comment: 'Write Off'
|
||||
-
|
||||
I fill amounts 20 for the invoice of 200$ and 30 for the invoice of 100$
|
||||
-
|
||||
!python {model: account.voucher}: |
|
||||
import netsvc, time
|
||||
vals = {}
|
||||
res = self.onchange_partner_id(cr, uid, [], ref("base.res_partner_seagate"), ref('bank_journal_USD'), 45.00, 2, ttype='receipt', date=False)
|
||||
vals = {
|
||||
'account_id': ref('account.cash'),
|
||||
'amount': 45.00,
|
||||
'exchange_acc_id': ref('account.o_expense'),
|
||||
'company_id': ref('base.main_company'),
|
||||
'currency_id': ref('base.USD'),
|
||||
'journal_id': ref('bank_journal_USD'),
|
||||
'partner_id': ref('base.res_partner_seagate'),
|
||||
'period_id': ref('account.period_3'),
|
||||
'type': 'receipt',
|
||||
'date': time.strftime("%Y-%m-%d"),
|
||||
'payment_option': 'with_writeoff',
|
||||
'writeoff_acc_id': ref('account.a_expense'),
|
||||
'comment': 'Write Off',
|
||||
'name': 'Second payment: Case 1',
|
||||
}
|
||||
vals.update(self.onchange_date(cr, uid, [], time.strftime('%Y-04-01'), ref('base.USD'), 45.0)['value'])
|
||||
if not res['value']['line_cr_ids']:
|
||||
res['value']['line_cr_ids'] = [{'type': 'cr', 'account_id': ref('account.a_recv'),}]
|
||||
for item in res['value']['line_cr_ids']:
|
||||
if item['amount_unreconciled'] == 20.00:
|
||||
item['amount'] = 20.00
|
||||
voucher_id = self.browse(cr, uid, ref('account_voucher_2_case1'))
|
||||
data = []
|
||||
for item in voucher_id.line_cr_ids:
|
||||
if item.amount_unreconciled == 20.00:
|
||||
data += [(item.id, 20.0)]
|
||||
else:
|
||||
item['amount'] = 30.00
|
||||
vals['line_cr_ids'] = [(0,0,i) for i in res['value']['line_cr_ids']]
|
||||
id = self.create(cr, uid, vals)
|
||||
voucher_id = self.browse(cr, uid, id)
|
||||
data += [(item.id, 30.0)]
|
||||
for line_id, amount in data:
|
||||
self.pool.get('account.voucher.line').write(cr, uid, [line_id], {'amount': amount})
|
||||
assert (voucher_id.state=='draft'), "Voucher is not in draft state"
|
||||
-
|
||||
I check that writeoff amount computed is 5.0
|
||||
|
|
|
|||
|
|
@ -1,6 +1,15 @@
|
|||
-
|
||||
In order to check the Account_voucher module with multi-currency in OpenERP,
|
||||
I create 2 Invoices in USD and make 2 Payments one in USD and another in EUR, based on the currency rating on that particular date
|
||||
-
|
||||
I set the income and expense currency accounts on the main company
|
||||
-
|
||||
!python {model: res.company}: |
|
||||
from datetime import datetime
|
||||
vals = {
|
||||
'income_currency_exchange_account_id': ref('account.o_expense'),
|
||||
'expense_currency_exchange_account_id': ref('account.o_expense')}
|
||||
self.write(cr, uid, ref('base.main_company'), vals)
|
||||
-
|
||||
I create a bank journal with EUR as currency
|
||||
-
|
||||
|
|
@ -104,38 +113,41 @@
|
|||
move_line = move_line_obj.browse(cr, uid, move_lines[0])
|
||||
assert (move_line.debit - move_line.credit == -80), "Invoice move is incorrect for debtors account"
|
||||
-
|
||||
I create the first voucher of payment
|
||||
<create with values 240 EUR, journal EUR, and fills amount 180 for the invoice of 200$ and 70 for the invoice of 100$>
|
||||
I set the context that will be used for the encoding of all the vouchers of this file
|
||||
-
|
||||
!context
|
||||
'type': 'payment'
|
||||
-
|
||||
I create the first voucher of payment with values 240 EUR, journal EUR
|
||||
-
|
||||
!record {model: account.voucher, id: account_voucher_1_case2_suppl, view: view_vendor_payment_form}:
|
||||
account_id: account.cash
|
||||
amount: 240.0
|
||||
company_id: base.main_company
|
||||
journal_id: bank_journal_EUR
|
||||
name: 'First payment: Case 2 SUPPL USD/EUR',
|
||||
partner_id: base.res_partner_seagate
|
||||
period_id: account.period_3
|
||||
date: !eval time.strftime("%Y-03-01")
|
||||
payment_option: 'with_writeoff'
|
||||
writeoff_acc_id: account.a_expense
|
||||
comment: 'Write Off'
|
||||
|
||||
-
|
||||
I fill amounts 180 for the invoice of 200$ and 70 for the invoice of 100$
|
||||
-
|
||||
!python {model: account.voucher}: |
|
||||
import netsvc, time
|
||||
vals = {}
|
||||
res = self.onchange_partner_id(cr, uid, [], ref("base.res_partner_seagate"), ref('bank_journal_EUR'), 240.0, 2, ttype='payment', date=False)
|
||||
vals = {
|
||||
'account_id': ref('account.cash'),
|
||||
'amount': 240.0,
|
||||
'company_id': ref('base.main_company'),
|
||||
'currency_id': ref('base.EUR'),
|
||||
'journal_id': ref('bank_journal_EUR'),
|
||||
'partner_id': ref('base.res_partner_seagate'),
|
||||
'period_id': ref('account.period_3'),
|
||||
'type': 'payment',
|
||||
'date': time.strftime("%Y-03-01"),
|
||||
'payment_option': 'with_writeoff',
|
||||
'writeoff_acc_id': ref('account.a_expense'),
|
||||
'comment': 'Write Off',
|
||||
'name': 'First payment: Case 2 SUPPL USD/EUR',
|
||||
}
|
||||
if not res['value']['line_dr_ids']:
|
||||
res['value']['line_dr_ids'] = [{'type': 'dr', 'account_id': ref('account.a_pay'),}]
|
||||
for item in res['value']['line_dr_ids']:
|
||||
if item['amount_unreconciled'] == 200.00:
|
||||
item['amount'] = 180.00
|
||||
voucher_id = self.browse(cr, uid, ref('account_voucher_1_case2_suppl'))
|
||||
data = []
|
||||
for item in voucher_id.line_cr_ids:
|
||||
if item.amount_unreconciled == 200.00:
|
||||
data += [(item.id, 180.0)]
|
||||
else:
|
||||
item['amount'] = 70.00
|
||||
vals['line_dr_ids'] = [(0,0,i) for i in res['value']['line_dr_ids']]
|
||||
id = self.create(cr, uid, vals)
|
||||
voucher_id = self.browse(cr, uid, id)
|
||||
data += [(item.id, 70.0)]
|
||||
for line_id, amount in data:
|
||||
self.pool.get('account.voucher.line').write(cr, uid, [line_id], {'amount': amount})
|
||||
assert (voucher_id.state=='draft'), "Voucher is not in draft state"
|
||||
-
|
||||
I check that writeoff amount computed is -15.0
|
||||
|
|
@ -201,7 +213,7 @@
|
|||
move_lines = move_line_obj.search(cr, uid, [('move_id', '=', invoice_id.move_id.id), ('invoice', '=', invoice_id.id), ('account_id', '=', invoice_id.account_id.id)])
|
||||
move_line = move_line_obj.browse(cr, uid, move_lines[0])
|
||||
assert (move_line.amount_residual_currency == 20.0 and move_line.amount_residual == 15) , "Residual amount is not correct for first Invoice"
|
||||
-
|
||||
-
|
||||
I check the residual amuont of Invoice2, should be 30 in residual currency and 24 in amount_residual
|
||||
-
|
||||
!python {model: account.invoice}: |
|
||||
|
|
@ -210,40 +222,37 @@
|
|||
move_lines = move_line_obj.search(cr, uid, [('move_id', '=', invoice_id.move_id.id), ('invoice', '=', invoice_id.id), ('account_id', '=', invoice_id.account_id.id)])
|
||||
move_line = move_line_obj.browse(cr, uid, move_lines[0])
|
||||
assert (move_line.amount_residual_currency == 30 and move_line.amount_residual == 24) , "Residual amount is not correct for second Invoice"
|
||||
-
|
||||
I create the second voucher of payment
|
||||
<create with values 45 USD, journal USD, and fill amounts 20 for the invoice of 200$ and 30 for the invoice of 100$>
|
||||
-
|
||||
I create the second voucher of payment with values 45 USD, journal USD,
|
||||
-
|
||||
!record {model: account.voucher, id: account_voucher_2_case2_suppl, view: view_vendor_payment_form}:
|
||||
account_id: account.cash
|
||||
amount: 45.0
|
||||
company_id: base.main_company
|
||||
journal_id: bank_journal_USD
|
||||
partner_id: base.res_partner_seagate
|
||||
period_id: account.period_3
|
||||
date: !eval time.strftime("%Y-04-01")
|
||||
payment_option: 'with_writeoff'
|
||||
writeoff_acc_id: account.a_expense
|
||||
comment: 'Write Off'
|
||||
name: 'Second payment: Case 2 SUPPL USD/EUR'
|
||||
|
||||
-
|
||||
I fill amounts 20 for the invoice of 200$ and 30 for the invoice of 100$>
|
||||
-
|
||||
!python {model: account.voucher}: |
|
||||
import netsvc, time
|
||||
vals = {}
|
||||
res = self.onchange_partner_id(cr, uid, [], ref("base.res_partner_seagate"), ref('bank_journal_EUR'), 45.0, 2, ttype='payment', date=False)
|
||||
vals = {
|
||||
'account_id': ref('account.cash'),
|
||||
'amount': 45.0,
|
||||
'company_id': ref('base.main_company'),
|
||||
'currency_id': ref('base.USD'),
|
||||
'journal_id': ref('bank_journal_USD'),
|
||||
'partner_id': ref('base.res_partner_seagate'),
|
||||
'period_id': ref('account.period_3'),
|
||||
'type': 'payment',
|
||||
'date': time.strftime("%Y-%m-%d"),
|
||||
'payment_option': 'with_writeoff',
|
||||
'writeoff_acc_id': ref('account.a_expense'),
|
||||
'comment': 'Write Off',
|
||||
'name': 'Second payment: Case 2 SUPPL USD/EUR',
|
||||
}
|
||||
vals.update(self.onchange_date(cr, uid, [], time.strftime('%Y-04-01'), ref('base.USD'), 45.0)['value'])
|
||||
if not res['value']['line_dr_ids']:
|
||||
res['value']['line_dr_ids'] = [{'type': 'dr', 'account_id': ref('account.a_pay'),}]
|
||||
for item in res['value']['line_dr_ids']:
|
||||
if item['amount_unreconciled'] == 20.00:
|
||||
item['amount'] = 20.00
|
||||
voucher_id = self.browse(cr, uid, ref('account_voucher_2_case2_suppl'))
|
||||
data = []
|
||||
for item in voucher_id.line_cr_ids:
|
||||
if item.amount_unreconciled == 20.00:
|
||||
data += [(item.id, 20.0)]
|
||||
else:
|
||||
item['amount'] = 30.00
|
||||
vals['line_dr_ids'] = [(0,0,i) for i in res['value']['line_dr_ids']]
|
||||
id = self.create(cr, uid, vals)
|
||||
voucher_id = self.browse(cr, uid, id)
|
||||
data += [(item.id, 30.0)]
|
||||
for line_id, amount in data:
|
||||
self.pool.get('account.voucher.line').write(cr, uid, [line_id], {'amount': amount})
|
||||
assert (voucher_id.state=='draft'), "Voucher is not in draft state"
|
||||
-
|
||||
I check that writeoff amount computed is -5.0
|
||||
|
|
|
|||
|
|
@ -1,6 +1,15 @@
|
|||
-
|
||||
In order to check the Account_voucher module with multi-currency in OpenERP,
|
||||
I create 2 Invoices in USD and make 2 Payments one in USD and another in EUR, based on the currency rating on that particular date
|
||||
-
|
||||
I set the income and expense currency accounts on the main company
|
||||
-
|
||||
!python {model: res.company}: |
|
||||
from datetime import datetime
|
||||
vals = {
|
||||
'income_currency_exchange_account_id': ref('account.o_expense'),
|
||||
'expense_currency_exchange_account_id': ref('account.o_expense')}
|
||||
self.write(cr, uid, ref('base.main_company'), vals)
|
||||
-
|
||||
I modify the debtor account in order to make sure there is no currency_id linked
|
||||
-
|
||||
|
|
@ -136,38 +145,41 @@
|
|||
move_line = move_line_obj.browse(cr, uid, move_lines[0])
|
||||
assert (move_line.debit - move_line.credit == 80), "Invoice move is incorrect for debtors account"
|
||||
-
|
||||
I create the first voucher of payment
|
||||
<create with values 200 EUR, journal EUR, and fills amount 130 EUR for the invoice of 200 USD and 70 EUR for the invoice of 100 USD>
|
||||
I set the context that will be used for the encoding of all the vouchers of this file
|
||||
-
|
||||
!context
|
||||
'type': 'receipt'
|
||||
-
|
||||
I create the first voucher of payment with values 200 EUR, journal EUR
|
||||
-
|
||||
!record {model: account.voucher, id: account_voucher_1_case2a, view: view_vendor_receipt_form}:
|
||||
account_id: account.cash
|
||||
amount: 200.0
|
||||
company_id: base.main_company
|
||||
journal_id: bank_journal_EUR
|
||||
partner_id: base.res_partner_seagate
|
||||
period_id: account.period_3
|
||||
date: !eval time.strftime("%Y-03-01")
|
||||
payment_option: 'with_writeoff'
|
||||
writeoff_acc_id: account.a_expense
|
||||
comment: 'Write Off'
|
||||
name: 'First payment: Case 2 USD/EUR DR EUR'
|
||||
|
||||
-
|
||||
I fill amounts 130 for the invoice of 200$ and 70 for the invoice of 100$
|
||||
-
|
||||
!python {model: account.voucher}: |
|
||||
import netsvc, time
|
||||
vals = {}
|
||||
res = self.onchange_partner_id(cr, uid, [], ref("base.res_partner_seagate"), ref('bank_journal_EUR'), 240.0, False, ttype='receipt', date=False)
|
||||
vals = {
|
||||
'account_id': ref('account.cash'),
|
||||
'amount': 200.0,
|
||||
'company_id': ref('base.main_company'),
|
||||
'currency_id': False,
|
||||
'journal_id': ref('bank_journal_EUR'),
|
||||
'partner_id': ref('base.res_partner_seagate'),
|
||||
'period_id': ref('account.period_3'),
|
||||
'type': 'receipt',
|
||||
'date': time.strftime("%Y-03-01"),
|
||||
'payment_option': 'with_writeoff',
|
||||
'writeoff_acc_id': ref('account.a_expense'),
|
||||
'comment': 'Write Off',
|
||||
'name': 'First payment: Case 2 USD/EUR DR EUR',
|
||||
}
|
||||
if not res['value']['line_cr_ids']:
|
||||
res['value']['line_cr_ids'] = [{'type': 'cr', 'account_id': ref('account.a_recv'),}]
|
||||
for item in res['value']['line_cr_ids']:
|
||||
if item['amount_unreconciled'] == 150.00:
|
||||
item['amount'] = 130.00
|
||||
voucher_id = self.browse(cr, uid, ref('account_voucher_1_case2a'))
|
||||
data = []
|
||||
for item in voucher_id.line_cr_ids:
|
||||
if item.amount_unreconciled == 150.00:
|
||||
data += [(item.id, 130.0)]
|
||||
else:
|
||||
item['amount'] = 70.00
|
||||
vals['line_cr_ids'] = [(0,0,i) for i in res['value']['line_cr_ids']]
|
||||
id = self.create(cr, uid, vals)
|
||||
voucher_id = self.browse(cr, uid, id)
|
||||
data += [(item.id, 70.0)]
|
||||
for line_id, amount in data:
|
||||
self.pool.get('account.voucher.line').write(cr, uid, [line_id], {'amount': amount})
|
||||
assert (voucher_id.state=='draft'), "Voucher is not in draft state"
|
||||
-
|
||||
I confirm the voucher
|
||||
|
|
@ -187,18 +199,6 @@
|
|||
move_lines = move_line_obj.search(cr, uid, [('move_id', '=', voucher_id.move_id.id)])
|
||||
for move_line in move_line_obj.browse(cr, uid, move_lines):
|
||||
assert move_line.state == 'valid', "Voucher move is not valid"
|
||||
-
|
||||
I check that my debtor account is correct
|
||||
-
|
||||
I check that the debtor account has 2 new lines with 0 in amount_currency columns and their credit columns are 130 and 70
|
||||
-
|
||||
!python {model: account.voucher}: |
|
||||
voucher = self.search(cr, uid, [('name', '=', 'First payment: Case 2 USD/EUR DR EUR'), ('partner_id', '=', ref('base.res_partner_seagate'))])
|
||||
voucher_id = self.browse(cr, uid, voucher[0])
|
||||
move_line_obj = self.pool.get('account.move.line')
|
||||
move_lines = move_line_obj.search(cr, uid, [('move_id', '=', voucher_id.move_id.id)])
|
||||
for move_line in move_line_obj.browse(cr, uid, move_lines):
|
||||
assert move_line.amount_currency == 0.00, "A line has the 'amount_currency' column filled"
|
||||
-
|
||||
I check the residual amount of Invoice1, should be 55.56 in residual currency and 20 in amount_residual
|
||||
-
|
||||
|
|
@ -217,41 +217,37 @@
|
|||
move_lines = move_line_obj.search(cr, uid, [('move_id', '=', invoice_id.move_id.id), ('invoice', '=', invoice_id.id), ('account_id', '=', invoice_id.account_id.id)])
|
||||
move_line = move_line_obj.browse(cr, uid, move_lines[0])
|
||||
assert (move_line.amount_residual_currency == 22.22 and move_line.amount_residual == 10) , "Residual amount is not correct for second Invoice"
|
||||
-
|
||||
I create the second voucher of payment
|
||||
<create with values 80 USD, journal USD, and fully reconcile the 2 invoices>
|
||||
-
|
||||
I create the second voucher of payment with values 80 USD, journal USD
|
||||
-
|
||||
!record {model: account.voucher, id: account_voucher_2_case2a, view: view_vendor_receipt_form}:
|
||||
account_id: account.cash
|
||||
amount: 80
|
||||
company_id: base.main_company
|
||||
journal_id: bank_journal_USD
|
||||
partner_id: base.res_partner_seagate
|
||||
period_id: account.period_3
|
||||
date: !eval time.strftime("%Y-04-01")
|
||||
payment_option: 'with_writeoff'
|
||||
writeoff_acc_id: account.a_expense
|
||||
comment: 'Write Off'
|
||||
name: 'Second payment: Case 2 SUPPL USD/EUR DR EUR'
|
||||
|
||||
-
|
||||
and I fully reconcile the 2 previous invoices
|
||||
-
|
||||
!python {model: account.voucher}: |
|
||||
import netsvc, time
|
||||
vals = {}
|
||||
res = self.onchange_partner_id(cr, uid, [], ref("base.res_partner_seagate"), ref('bank_journal_USD'), 80.0, 2, ttype='receipt', date=False)
|
||||
vals = {
|
||||
'account_id': ref('account.cash'),
|
||||
'amount': 80.0,
|
||||
'company_id': ref('base.main_company'),
|
||||
'currency_id': ref('base.USD'),
|
||||
'journal_id': ref('bank_journal_USD'),
|
||||
'partner_id': ref('base.res_partner_seagate'),
|
||||
'period_id': ref('account.period_3'),
|
||||
'type': 'receipt',
|
||||
'date': time.strftime("%Y-%m-%d"),
|
||||
'payment_option': 'with_writeoff',
|
||||
'writeoff_acc_id': ref('account.a_expense'),
|
||||
'exchange_acc_id': ref('account.o_expense'),
|
||||
'comment': 'Write Off',
|
||||
'name': 'Second payment: Case 2 SUPPL USD/EUR DR EUR',
|
||||
}
|
||||
vals.update(self.onchange_date(cr, uid, [], time.strftime('%Y-04-01'), ref('base.USD'), 80.0)['value'])
|
||||
if not res['value']['line_cr_ids']:
|
||||
res['value']['line_cr_ids'] = [{'type': 'cr', 'account_id': ref('account.a_recv'),}]
|
||||
for item in res['value']['line_cr_ids']:
|
||||
if item['amount_unreconciled'] == 55.56:
|
||||
item['amount'] = 55.56
|
||||
voucher_id = self.browse(cr, uid, ref('account_voucher_2_case2a'))
|
||||
data = []
|
||||
for item in voucher_id.line_cr_ids:
|
||||
if item.amount_unreconciled == 55.56:
|
||||
data += [(item.id, 55.56)]
|
||||
else:
|
||||
item['amount'] = 22.22
|
||||
vals['line_cr_ids'] = [(0,0,i) for i in res['value']['line_cr_ids']]
|
||||
id = self.create(cr, uid, vals)
|
||||
voucher_id = self.browse(cr, uid, id)
|
||||
data += [(item.id, 22.22)]
|
||||
for line_id, amount in data:
|
||||
self.pool.get('account.voucher.line').write(cr, uid, [line_id], {'amount': amount})
|
||||
assert (voucher_id.state=='draft'), "Voucher is not in draft state"
|
||||
-
|
||||
I check that writeoff amount computed is 2.22
|
||||
|
|
|
|||
|
|
@ -1,6 +1,15 @@
|
|||
-
|
||||
In order to check the Account_voucher module with multi-currency in OpenERP,
|
||||
I create 2 Invoices in USD and make 2 Payments one in USD and another in EUR, based on the currency rating on that particular date
|
||||
-
|
||||
I set the income and expense currency accounts on the main company
|
||||
-
|
||||
!python {model: res.company}: |
|
||||
from datetime import datetime
|
||||
vals = {
|
||||
'income_currency_exchange_account_id': ref('account.o_expense'),
|
||||
'expense_currency_exchange_account_id': ref('account.o_expense')}
|
||||
self.write(cr, uid, ref('base.main_company'), vals)
|
||||
-
|
||||
I modify the debtor account in order to set the currency_id = USD
|
||||
-
|
||||
|
|
@ -136,38 +145,41 @@
|
|||
move_line = move_line_obj.browse(cr, uid, move_lines[0])
|
||||
assert (move_line.debit - move_line.credit == 80), "Invoice move is incorrect for debtors account"
|
||||
-
|
||||
I create the first voucher of payment
|
||||
<create with values 200 EUR (€), journal EUR, and fills amount 130€ for the invoice of 200$ and 70€ for the invoice of 100$>
|
||||
I set the context that will be used for the encoding of all the vouchers of this file
|
||||
-
|
||||
!context
|
||||
'type': 'receipt'
|
||||
-
|
||||
I create the first voucher of payment with values 200 EUR, journal EUR
|
||||
-
|
||||
!record {model: account.voucher, id: account_voucher_1_case2b, view: view_vendor_receipt_form}:
|
||||
account_id: account.cash
|
||||
amount: 200.0
|
||||
company_id: base.main_company
|
||||
journal_id: bank_journal_EUR
|
||||
partner_id: base.res_partner_seagate
|
||||
period_id: account.period_3
|
||||
date: !eval time.strftime("%Y-03-01")
|
||||
payment_option: 'with_writeoff'
|
||||
writeoff_acc_id: account.a_expense
|
||||
comment: 'Write Off'
|
||||
name: 'First payment: Case 2 USD/EUR DR USD'
|
||||
|
||||
-
|
||||
I fill amounts 130 for the invoice of 200$ and 70 for the invoice of 100$>
|
||||
-
|
||||
!python {model: account.voucher}: |
|
||||
import netsvc, time
|
||||
vals = {}
|
||||
res = self.onchange_partner_id(cr, uid, [], ref("base.res_partner_seagate"), ref('bank_journal_EUR'), 200.0, False, ttype='receipt', date=False)
|
||||
vals = {
|
||||
'account_id': ref('account.cash'),
|
||||
'amount': 200.0,
|
||||
'company_id': ref('base.main_company'),
|
||||
'currency_id': ref('base.EUR'),
|
||||
'journal_id': ref('bank_journal_EUR'),
|
||||
'partner_id': ref('base.res_partner_seagate'),
|
||||
'period_id': ref('account.period_3'),
|
||||
'type': 'receipt',
|
||||
'date': time.strftime("%Y-03-01"),
|
||||
'payment_option': 'with_writeoff',
|
||||
'writeoff_acc_id': ref('account.a_expense'),
|
||||
'comment': 'Write Off',
|
||||
'name': 'First payment: Case 2 USD/EUR DR USD',
|
||||
}
|
||||
if not res['value']['line_cr_ids']:
|
||||
res['value']['line_cr_ids'] = [{'type': 'cr', 'account_id': ref('account.a_recv'),}]
|
||||
for item in res['value']['line_cr_ids']:
|
||||
if item['amount_unreconciled'] == 150.00:
|
||||
item['amount'] = 130.00
|
||||
voucher_id = self.browse(cr, uid, ref('account_voucher_1_case2b'))
|
||||
data = []
|
||||
for item in voucher_id.line_cr_ids:
|
||||
if item.amount_unreconciled == 150.00:
|
||||
data += [(item.id, 130.0)]
|
||||
else:
|
||||
item['amount'] = 70.00
|
||||
vals['line_cr_ids'] = [(0,0,i) for i in res['value']['line_cr_ids']]
|
||||
id = self.create(cr, uid, vals)
|
||||
voucher_id = self.browse(cr, uid, id)
|
||||
data += [(item.id, 70.0)]
|
||||
for line_id, amount in data:
|
||||
self.pool.get('account.voucher.line').write(cr, uid, [line_id], {'amount': amount})
|
||||
assert (voucher_id.state=='draft'), "Voucher is not in draft state"
|
||||
-
|
||||
I confirm the voucher
|
||||
|
|
@ -211,8 +223,8 @@
|
|||
move_lines = move_line_obj.search(cr, uid, [('move_id', '=', invoice_id.move_id.id), ('invoice', '=', invoice_id.id), ('account_id', '=', invoice_id.account_id.id)])
|
||||
move_line = move_line_obj.browse(cr, uid, move_lines[0])
|
||||
assert (move_line.amount_residual_currency == 55.56 and move_line.amount_residual == 20) , "Residual amount is not correct for first Invoice"
|
||||
- toto
|
||||
I check the residual amuont of Invoice2, should be 22.22 in residual currency and 10 in amount_residual
|
||||
-
|
||||
I check the residual amount of Invoice2, should be 22.22 in residual currency and 10 in amount_residual
|
||||
-
|
||||
!python {model: account.invoice}: |
|
||||
invoice_id = self.browse(cr, uid, ref("account_second_invoice_feb_michal"))
|
||||
|
|
@ -220,41 +232,37 @@
|
|||
move_lines = move_line_obj.search(cr, uid, [('move_id', '=', invoice_id.move_id.id), ('invoice', '=', invoice_id.id), ('account_id', '=', invoice_id.account_id.id)])
|
||||
move_line = move_line_obj.browse(cr, uid, move_lines[0])
|
||||
assert (move_line.amount_residual_currency == 22.22 and move_line.amount_residual == 10) , "Residual amount is not correct for second Invoice"
|
||||
-
|
||||
I create the second voucher of payment
|
||||
<create with values 80 USD, journal USD, and fully reconcile the 2 invoices>
|
||||
-
|
||||
I create the second voucher of payment with values 80 USD, journal USD
|
||||
-
|
||||
!record {model: account.voucher, id: account_voucher_2_case2b, view: view_vendor_receipt_form}:
|
||||
account_id: account.cash
|
||||
amount: 80.0
|
||||
company_id: base.main_company
|
||||
journal_id: bank_journal_USD
|
||||
partner_id: base.res_partner_seagate
|
||||
period_id: account.period_3
|
||||
date: !eval time.strftime("%Y-04-01")
|
||||
payment_option: 'with_writeoff'
|
||||
writeoff_acc_id: account.a_expense
|
||||
comment: 'Write Off'
|
||||
name: 'Second payment: Case 2 SUPPL USD/EUR DR USD'
|
||||
|
||||
-
|
||||
and I fully reconcil the 2 previous invoices
|
||||
-
|
||||
!python {model: account.voucher}: |
|
||||
import netsvc, time
|
||||
vals = {}
|
||||
res = self.onchange_partner_id(cr, uid, [], ref("base.res_partner_seagate"), ref('bank_journal_USD'), 80.0, ref('base.USD'), ttype='receipt', date=False)
|
||||
vals = {
|
||||
'account_id': ref('account.cash'),
|
||||
'amount': 80.0,
|
||||
'company_id': ref('base.main_company'),
|
||||
'currency_id': ref('base.USD'),
|
||||
'journal_id': ref('bank_journal_USD'),
|
||||
'partner_id': ref('base.res_partner_seagate'),
|
||||
'period_id': ref('account.period_3'),
|
||||
'type': 'receipt',
|
||||
'date': time.strftime("%Y-%m-%d"),
|
||||
'payment_option': 'with_writeoff',
|
||||
'writeoff_acc_id': ref('account.a_expense'),
|
||||
'exchange_acc_id': ref('account.o_expense'),
|
||||
'comment': 'Write Off',
|
||||
'name': 'Second payment: Case 2 SUPPL USD/EUR DR USD',
|
||||
}
|
||||
vals.update(self.onchange_date(cr, uid, [], time.strftime('%Y-04-01'), ref('base.USD'), 80.0)['value'])
|
||||
if not res['value']['line_cr_ids']:
|
||||
res['value']['line_cr_ids'] = [{'type': 'cr', 'account_id': ref('account.a_recv'),}]
|
||||
for item in res['value']['line_cr_ids']:
|
||||
if item['amount_unreconciled'] == 55.56:
|
||||
item['amount'] = 55.56
|
||||
voucher_id = self.browse(cr, uid, ref('account_voucher_2_case2b'))
|
||||
data = []
|
||||
for item in voucher_id.line_cr_ids:
|
||||
if item.amount_unreconciled == 55.56:
|
||||
data += [(item.id, 55.56)]
|
||||
else:
|
||||
item['amount'] = 22.22
|
||||
vals['line_cr_ids'] = [(0,0,i) for i in res['value']['line_cr_ids']]
|
||||
id = self.create(cr, uid, vals)
|
||||
voucher_id = self.browse(cr, uid, id)
|
||||
data += [(item.id, 22.22)]
|
||||
for line_id, amount in data:
|
||||
self.pool.get('account.voucher.line').write(cr, uid, [line_id], {'amount': amount})
|
||||
assert (voucher_id.state=='draft'), "Voucher is not in draft state"
|
||||
-
|
||||
I check that writeoff amount computed is 2.22
|
||||
|
|
@ -320,8 +328,8 @@
|
|||
move_lines = move_line_obj.search(cr, uid, [('move_id', '=', invoice_id.move_id.id), ('invoice', '=', invoice_id.id), ('account_id', '=', invoice_id.account_id.id)])
|
||||
move_line = move_line_obj.browse(cr, uid, move_lines[0])
|
||||
assert (move_line.amount_residual_currency == 0.0 and move_line.amount_residual == 0.0 and invoice_id.state == 'paid') , "Residual amount is not correct for first Invoice"
|
||||
-
|
||||
I check the residual amuont of invoice 2, should be 0 in residual currency and 0 in amount_residual and paid
|
||||
-
|
||||
I check the residual amount of invoice 2, should be 0 in residual currency and 0 in amount_residual and paid
|
||||
-
|
||||
!python {model: account.invoice}: |
|
||||
invoice_id = self.browse(cr, uid, ref("account_second_invoice_feb_michal"))
|
||||
|
|
|
|||
|
|
@ -99,38 +99,41 @@
|
|||
move_line = move_line_obj.browse(cr, uid, move_lines[0])
|
||||
assert (move_line.debit - move_line.credit == 80.00), "Invoice move is incorrect for debtors account"
|
||||
-
|
||||
I create the first voucher of payment
|
||||
<create with values 120 EUR, journal EUR, and fill amounts 100 for the invoice of 150 EUR and 20 for the invoice of 80 EUR>
|
||||
I set the context that will be used for the encoding of all the vouchers of this file
|
||||
-
|
||||
!context
|
||||
'type': 'receipt'
|
||||
-
|
||||
I create the first voucher of payment with values 120 EUR, journal EUR
|
||||
-
|
||||
!record {model: account.voucher, id: account_voucher_1_case3, view: view_vendor_receipt_form}:
|
||||
account_id: account.cash
|
||||
amount: 120.0
|
||||
company_id: base.main_company
|
||||
journal_id: bank_journal_EUR
|
||||
partner_id: base.res_partner_seagate
|
||||
period_id: account.period_3
|
||||
date: !eval time.strftime("%Y-03-01")
|
||||
payment_option: 'with_writeoff'
|
||||
writeoff_acc_id: account.a_expense
|
||||
comment: 'Write Off'
|
||||
name: 'First payment: Case 3'
|
||||
|
||||
-
|
||||
I fill amounts 100 for the invoice of 150€ and 20 for the invoice of 80€
|
||||
-
|
||||
!python {model: account.voucher}: |
|
||||
import netsvc, time
|
||||
vals = {}
|
||||
res = self.onchange_partner_id(cr, uid, [], ref("base.res_partner_seagate"), ref('bank_journal_EUR'), 120.00, False, ttype='receipt', date=False)
|
||||
vals = {
|
||||
'account_id': ref('account.cash'),
|
||||
'amount': 120.00,
|
||||
'company_id': ref('base.main_company'),
|
||||
'currency_id': ref('base.EUR'),
|
||||
'journal_id': ref('bank_journal_EUR'),
|
||||
'partner_id': ref('base.res_partner_seagate'),
|
||||
'period_id': ref('account.period_3'),
|
||||
'type': 'receipt',
|
||||
'date': time.strftime("%Y-03-01"),
|
||||
'payment_option': 'with_writeoff',
|
||||
'writeoff_acc_id': ref('account.a_expense'),
|
||||
'comment': 'Write Off',
|
||||
'name': 'First payment: Case 3',
|
||||
}
|
||||
if not res['value']['line_cr_ids']:
|
||||
res['value']['line_cr_ids'] = [{'type': 'cr', 'account_id': ref('account.a_recv'),}]
|
||||
for item in res['value']['line_cr_ids']:
|
||||
if item['amount_unreconciled'] == 150.00:
|
||||
item['amount'] = 100.00
|
||||
voucher_id = self.browse(cr, uid, ref('account_voucher_1_case3'))
|
||||
data = []
|
||||
for item in voucher_id.line_cr_ids:
|
||||
if item.amount_unreconciled == 150.00:
|
||||
data += [(item.id, 100.0)]
|
||||
else:
|
||||
item['amount'] = 20.00
|
||||
vals['line_cr_ids'] = [(0,0,i) for i in res['value']['line_cr_ids']]
|
||||
id = self.create(cr, uid, vals)
|
||||
voucher_id = self.browse(cr, uid, id)
|
||||
data += [(item.id, 20.0)]
|
||||
for line_id, amount in data:
|
||||
self.pool.get('account.voucher.line').write(cr, uid, [line_id], {'amount': amount})
|
||||
assert (voucher_id.state=='draft'), "Voucher is not in draft state"
|
||||
-
|
||||
I check that writeoff amount computed is 0.00
|
||||
|
|
@ -181,7 +184,7 @@
|
|||
move_lines = move_line_obj.search(cr, uid, [('move_id', '=', invoice_id.move_id.id), ('invoice', '=', invoice_id.id), ('account_id', '=', invoice_id.account_id.id)])
|
||||
move_line = move_line_obj.browse(cr, uid, move_lines[0])
|
||||
assert (move_line.amount_residual_currency == 50.0 and move_line.amount_residual == 50.0) , "Residual amount is not correct for first Invoice"
|
||||
-
|
||||
-
|
||||
I check the residual amuont of Invoice2 is 60
|
||||
-
|
||||
!python {model: account.invoice}: |
|
||||
|
|
@ -191,38 +194,36 @@
|
|||
move_line = move_line_obj.browse(cr, uid, move_lines[0])
|
||||
assert (move_line.amount_residual_currency == 60.0 and move_line.amount_residual == 60.0) , "Residual amount is not correct for second Invoice"
|
||||
-
|
||||
I create the second voucher of payment and check to let open the debtor overpaid amount.
|
||||
<create with values 120 EUR, journal EUR, and fill amounts 50 for the invoice of 150 EUR and 70 for the invoice of 80 EUR>
|
||||
I create the second voucher of payment with values 120€, journal EUR, and check to let open the debtor overpaid amount
|
||||
-
|
||||
!record {model: account.voucher, id: account_voucher_2_case3, view: view_vendor_receipt_form}:
|
||||
account_id: account.cash
|
||||
amount: 120.0
|
||||
company_id: base.main_company
|
||||
journal_id: bank_journal_EUR
|
||||
partner_id: base.res_partner_seagate
|
||||
period_id: account.period_3
|
||||
date: !eval time.strftime("%Y-04-01")
|
||||
payment_option: 'with_writeoff'
|
||||
writeoff_acc_id: account.a_expense
|
||||
comment: 'Write Off'
|
||||
name: 'Second payment: Case 3'
|
||||
|
||||
-
|
||||
I fill amounts 50 for the invoice of 150€ and 70 for the invoice of 80€
|
||||
-
|
||||
!python {model: account.voucher}: |
|
||||
import netsvc, time
|
||||
vals = {}
|
||||
res = self.onchange_partner_id(cr, uid, [], ref("base.res_partner_seagate"), ref('bank_journal_EUR'), 120.00, False, ttype='receipt', date=False)
|
||||
vals = {
|
||||
'account_id': ref('account.cash'),
|
||||
'amount': 120.00,
|
||||
'company_id': ref('base.main_company'),
|
||||
'currency_id': ref('base.EUR'),
|
||||
'journal_id': ref('bank_journal_EUR'),
|
||||
'partner_id': ref('base.res_partner_seagate'),
|
||||
'period_id': ref('account.period_3'),
|
||||
'type': 'receipt',
|
||||
'date': time.strftime("%Y-04-01"),
|
||||
'payment_option': 'with_writeoff',
|
||||
'writeoff_acc_id': ref('account.a_expense'),
|
||||
'comment': 'Write Off',
|
||||
'name': 'Second payment: Case 3',
|
||||
}
|
||||
if not res['value']['line_cr_ids']:
|
||||
res['value']['line_cr_ids'] = [{'type': 'cr', 'account_id': ref('account.a_recv'),}]
|
||||
for item in res['value']['line_cr_ids']:
|
||||
if item['amount_unreconciled'] == 50.00:
|
||||
item['amount'] = 50.00
|
||||
elif item['amount_unreconciled'] == 60.00:
|
||||
item['amount'] = 70.00
|
||||
vals['line_cr_ids'] = [(0,0,i) for i in res['value']['line_cr_ids']]
|
||||
id = self.create(cr, uid, vals)
|
||||
voucher_id = self.browse(cr, uid, id)
|
||||
voucher_id = self.browse(cr, uid, ref('account_voucher_2_case3'))
|
||||
data = []
|
||||
for item in voucher_id.line_cr_ids:
|
||||
if item.amount_unreconciled == 50.00:
|
||||
data += [(item.id, 50.0)]
|
||||
elif item.amount_unreconciled == 60.00:
|
||||
data += [(item.id, 70.00)]
|
||||
for line_id, amount in data:
|
||||
self.pool.get('account.voucher.line').write(cr, uid, [line_id], {'amount': amount})
|
||||
assert (voucher_id.state=='draft'), "Voucher is not in draft state"
|
||||
-
|
||||
I check that writeoff amount computed is 0.00
|
||||
|
|
|
|||
|
|
@ -1,6 +1,15 @@
|
|||
-
|
||||
In order to check the Account_voucher module with multi-currency in OpenERP,
|
||||
I create an invoice in CAD and make its Payment in CHF based on the currency rating on that particular date.
|
||||
-
|
||||
I set the income and expense currency accounts on the main company
|
||||
-
|
||||
!python {model: res.company}: |
|
||||
from datetime import datetime
|
||||
vals = {
|
||||
'income_currency_exchange_account_id': ref('account.o_expense'),
|
||||
'expense_currency_exchange_account_id': ref('account.o_expense')}
|
||||
self.write(cr, uid, ref('base.main_company'), vals)
|
||||
-
|
||||
I create currency CAD in OpenERP for January of 1.338800 Rate
|
||||
-
|
||||
|
|
@ -89,38 +98,40 @@
|
|||
move_line = move_line_obj.browse(cr, uid, move_lines[0])
|
||||
assert (move_line.debit - move_line.credit == 149.39), "Invoice move is incorrect for debtors account"
|
||||
-
|
||||
I create the first voucher of payment
|
||||
<create with values 200 CHF, journal CHF, and completly pat the invoice of 200 CAD>
|
||||
I set the context that will be used for the encoding of all the vouchers of this file
|
||||
-
|
||||
!context
|
||||
'type': 'receipt'
|
||||
-
|
||||
I create the first voucher of payment with values 200 CHF, journal CHF
|
||||
-
|
||||
!record {model: account.voucher, id: account_voucher_1_case4, view: view_vendor_receipt_form}:
|
||||
account_id: account.cash
|
||||
amount: 200
|
||||
company_id: base.main_company
|
||||
journal_id: bank_journal_CHF
|
||||
partner_id: base.res_partner_seagate
|
||||
period_id: account.period_3
|
||||
date: !eval time.strftime("%Y-03-01")
|
||||
payment_option: 'with_writeoff'
|
||||
writeoff_acc_id: account.a_expense
|
||||
comment: 'Write Off'
|
||||
name: 'First payment: Case 4'
|
||||
-
|
||||
I completly pay the invoice of 200 CAD
|
||||
-
|
||||
!python {model: account.voucher}: |
|
||||
import netsvc, time
|
||||
vals = {}
|
||||
res = self.onchange_partner_id(cr, uid, [], ref("base.res_partner_seagate"), ref('bank_journal_CHF'), 200.00, ref('base.CHF'), ttype='receipt', date=False)
|
||||
vals = {
|
||||
'account_id': ref('account.cash'),
|
||||
'amount': 200.00,
|
||||
'company_id': ref('base.main_company'),
|
||||
'currency_id': ref('base.CHF'),
|
||||
'journal_id': ref('bank_journal_CHF'),
|
||||
'partner_id': ref('base.res_partner_seagate'),
|
||||
'period_id': ref('account.period_3'),
|
||||
'type': 'receipt',
|
||||
'date': time.strftime("%Y-%m-%d"),
|
||||
'payment_option': 'with_writeoff',
|
||||
'writeoff_acc_id': ref('account.a_expense'),
|
||||
'exchange_acc_id': ref('account.o_expense'),
|
||||
'comment': 'Write Off',
|
||||
'name': 'First payment: Case 4',
|
||||
}
|
||||
vals.update(self.onchange_date(cr, uid, [], time.strftime('%Y-03-01'), ref('base.CHF'), 200.0)['value'])
|
||||
if not res['value']['line_cr_ids']:
|
||||
res['value']['line_cr_ids'] = [{'type': 'cr', 'account_id': ref('account.a_recv'),}]
|
||||
for item in res['value']['line_cr_ids']:
|
||||
if item['amount_unreconciled'] == 186.74:
|
||||
item['amount'] = 186.74
|
||||
vals['line_cr_ids'] = [(0,0,i) for i in res['value']['line_cr_ids']]
|
||||
id = self.create(cr, uid, vals)
|
||||
voucher_id = self.browse(cr, uid, id)
|
||||
voucher_id = self.browse(cr, uid, ref('account_voucher_1_case4'))
|
||||
data = []
|
||||
for item in voucher_id.line_cr_ids:
|
||||
if item.amount_unreconciled == 186.74:
|
||||
data += [(item.id, 186.74)]
|
||||
else:
|
||||
data += [(item.id, 0.0)]
|
||||
for line_id, amount in data:
|
||||
self.pool.get('account.voucher.line').write(cr, uid, [line_id], {'amount': amount})
|
||||
assert (voucher_id.state=='draft'), "Voucher is not in draft state"
|
||||
-
|
||||
I check that writeoff amount computed is 13.26
|
||||
|
|
@ -151,7 +162,7 @@
|
|||
-
|
||||
I check that my debtor account is correct
|
||||
-
|
||||
I check that the debtor account has 1 new line with -186.74 as amount_currency columns and 149.39 of credit and currency is CHF.
|
||||
I check that the debtor account has 1 new line with -298.78 as amount_currency columns and 149.39 of credit and currency is CAD.
|
||||
-
|
||||
I check that my currency rate difference is correct. 0 in debit with no amount_currency
|
||||
-
|
||||
|
|
@ -165,7 +176,7 @@
|
|||
for move_line in move_line_obj.browse(cr, uid, move_lines):
|
||||
if move_line.amount_currency == 200:
|
||||
assert move_line.debit == 160.00, "Bank account has wrong entry."
|
||||
elif move_line.amount_currency == -186.74:
|
||||
elif move_line.amount_currency == -298.78:
|
||||
assert move_line.credit == 149.39, "Debtor account has wrong entry."
|
||||
elif move_line.debit == 0.00 and move_line.credit == 0.00:
|
||||
assert move_line.amount_currency == 0.00, "Incorrect Currency Difference."
|
||||
|
|
|
|||
|
|
@ -5,7 +5,6 @@
|
|||
account_id: account.a_recv
|
||||
amount: 30000.0
|
||||
company_id: base.main_company
|
||||
currency_id: base.EUR
|
||||
journal_id: account.sales_journal
|
||||
line_cr_ids:
|
||||
- account_id: account.a_sale
|
||||
|
|
|
|||
|
|
@ -75,13 +75,13 @@
|
|||
<form string="Bill Payment">
|
||||
<group col="6" colspan="4">
|
||||
<field name="partner_id" required="1" on_change="onchange_partner_id(partner_id, journal_id, amount, currency_id, type, date, context)" context="{'invoice_currency':currency_id}" string="Supplier"/>
|
||||
<field name="amount" on_change="onchange_amount(amount, payment_rate, partner_id, journal_id, currency_id, type, date, context)"/>
|
||||
<field name="amount" on_change="onchange_amount(amount, payment_rate, partner_id, journal_id, currency_id, type, date, payment_rate_currency_id, company_id, context)"/>
|
||||
<field name="journal_id"
|
||||
domain="[('type','in',['bank', 'cash'])]"
|
||||
widget="selection" select="1"
|
||||
on_change="onchange_journal(journal_id, line_dr_ids, False, partner_id, date, amount, type, context)"
|
||||
on_change="onchange_journal(journal_id, line_dr_ids, False, partner_id, date, amount, type, company_id, context)"
|
||||
string="Payment Method"/>
|
||||
<field name="date" select="1" on_change="onchange_date(date, currency_id, amount, context)"/>
|
||||
<field name="date" select="1" on_change="onchange_date(date, currency_id, payment_rate_currency_id, amount, company_id, context)"/>
|
||||
<field name="reference" select="1" string="Payment Ref"/>
|
||||
<field name="name" colspan="2"/>
|
||||
<field name="account_id"
|
||||
|
|
@ -92,7 +92,7 @@
|
|||
</group>
|
||||
<notebook colspan="4">
|
||||
<page string="Payment Information">
|
||||
<field name="line_dr_ids" attrs="{'invisible': [('type', '=', 'receipt')]}" default_get="{'journal_id':journal_id, 'type':type, 'partner_id':partner_id}" colspan="4" nolabel="1" height="140" on_change="onchange_line_ids(line_dr_ids, line_cr_ids, amount, context)">
|
||||
<field name="line_dr_ids" attrs="{'invisible': [('type', '=', 'receipt')]}" default_get="{'journal_id':journal_id, 'type':type, 'partner_id':partner_id}" colspan="4" nolabel="1" height="140" on_change="onchange_line_ids(line_dr_ids, line_cr_ids, amount, currency_id, context)">
|
||||
<tree string="Open Supplier Journal Entries" editable="bottom" colors="gray:amount==0">
|
||||
<field name="move_line_id" context="{'journal_id':parent.journal_id, 'partner_id':parent.partner_id}"
|
||||
on_change="onchange_move_line_id(move_line_id)"
|
||||
|
|
@ -102,29 +102,35 @@
|
|||
<field name="date_original" readonly="1"/>
|
||||
<field name="date_due" readonly="1"/>
|
||||
<field name="amount_original" readonly="1"/>
|
||||
<field name="amount_unreconciled" sum="Open Balance" readonly="1"/>
|
||||
<field name="amount" sum="Payment"/>
|
||||
<field name="amount_unreconciled" readonly="1"/>
|
||||
<field name="amount" sum="Total Allocation"/>
|
||||
</tree>
|
||||
</field>
|
||||
<field name="line_cr_ids" colspan="4" nolabel="1" attrs="{'invisible': [('type', '=', 'payment')]}" default_get="{'journal_id':journal_id, 'partner_id':partner_id}" on_change="onchange_line_ids(line_dr_ids, line_cr_ids, amount, context)">
|
||||
<field name="line_cr_ids" colspan="4" nolabel="1" attrs="{'invisible': [('type', '=', 'payment')]}" default_get="{'journal_id':journal_id, 'partner_id':partner_id}" on_change="onchange_line_ids(line_dr_ids, line_cr_ids, amount, currency_id, context)">
|
||||
<tree string="Open Customer Journal Entries" editable="bottom" colors="gray:amount==0">
|
||||
<field name="move_line_id"/>
|
||||
<field name="account_id" groups="base.group_extended" domain="[('type','=','receivable')]"/>
|
||||
<field name="date_original"/>
|
||||
<field name="amount_original"/>
|
||||
<field name="amount" sum="Payment"/>
|
||||
<field name="move_line_id" context="{'journal_id':parent.journal_id, 'partner_id':parent.partner_id}"
|
||||
on_change="onchange_move_line_id(move_line_id)"
|
||||
domain="[('account_id.type','=','payable'), ('reconcile_id','=', False), ('partner_id','=',parent.partner_id)]"
|
||||
/>
|
||||
<field name="account_id" groups="base.group_extended" domain="[('type','=','payable')]"/>
|
||||
<field name="date_original" readonly="1"/>
|
||||
<field name="date_due" readonly="1"/>
|
||||
<field name="amount_original" readonly="1"/>
|
||||
<field name="amount_unreconciled" readonly="1"/>
|
||||
<field name="amount" sum="Total Allocation"/>
|
||||
</tree>
|
||||
</field>
|
||||
<group col="2" colspan="3">
|
||||
<separator string="Internal Notes" colspan="2"/>
|
||||
<field name="narration" colspan="2" nolabel="1"/>
|
||||
</group>
|
||||
<group col="2" colspan="1">
|
||||
<separator string="Other Information" colspan="2"/>
|
||||
<field name="currency_id"/>
|
||||
<field name="payment_rate" required="1" on_change="onchange_rate(payment_rate, amount, context)" groups='base.group_extended'/>
|
||||
<field name="paid_amount_in_company_currency" groups='base.group_extended'/>
|
||||
<field name="number"/>
|
||||
<group col="4" colspan="1">
|
||||
<separator string="Other Information" colspan="4"/>
|
||||
<field name="currency_id" colspan="4"/>
|
||||
<field name="payment_rate" required="1" on_change="onchange_rate(payment_rate, amount, currency_id, payment_rate_currency_id, company_id, context)" groups='base.group_extended' colspan="3"/>
|
||||
<field name="payment_rate_currency_id" groups='base.group_extended' colspan="1" nolabel="1" on_change="onchange_payment_rate_currency(currency_id, payment_rate, payment_rate_currency_id, date, amount, company_id, context)"/>
|
||||
<field name="paid_amount_in_company_currency" groups='base.group_extended' colspan="4" invisible="1"/>
|
||||
<field name="number" colspan="4"/>
|
||||
</group>
|
||||
</page>
|
||||
</notebook>
|
||||
|
|
@ -140,14 +146,14 @@
|
|||
<form string="Bill Payment">
|
||||
<group col="6" colspan="4">
|
||||
<field name="partner_id" domain="[('supplier','=',True)]" required="1" invisible="context.get('line_type', False)" on_change="onchange_partner_id(partner_id, journal_id, amount, currency_id, type, date, context)" context="{'invoice_currency':currency_id}" string="Supplier"/>
|
||||
<field name="amount" invisible="context.get('line_type', False)" on_change="onchange_amount(amount, payment_rate, partner_id, journal_id, currency_id, type, date, context)"/>
|
||||
<field name="amount" invisible="context.get('line_type', False)" on_change="onchange_amount(amount, payment_rate, partner_id, journal_id, currency_id, type, date, payment_rate_currency_id, company_id, context)"/>
|
||||
<field name="journal_id"
|
||||
domain="[('type','in',['bank', 'cash'])]"
|
||||
invisible="context.get('line_type', False)"
|
||||
widget="selection" select="1"
|
||||
on_change="onchange_journal(journal_id, line_dr_ids, False, partner_id, date, amount, type, context)"
|
||||
on_change="onchange_journal(journal_id, line_dr_ids, False, partner_id, date, amount, type, company_id, context)"
|
||||
string="Payment Method"/>
|
||||
<field name="date" select="1" invisible="context.get('line_type', False)" on_change="onchange_date(date, currency_id, amount, context)"/>
|
||||
<field name="date" select="1" invisible="context.get('line_type', False)" on_change="onchange_date(date, currency_id, payment_rate_currency_id, amount, company_id, context)"/>
|
||||
<field name="reference" select="1" invisible="context.get('line_type', False)" string="Payment Ref"/>
|
||||
<field name="name" colspan="2" invisible="context.get('line_type', False)"/>
|
||||
<field name="company_id" widget="selection" groups="base.group_multi_company"/>
|
||||
|
|
@ -156,6 +162,7 @@
|
|||
invisible="True"/>
|
||||
<field name="pre_line" invisible="1"/>
|
||||
<field name="type" invisible="True"/>
|
||||
<field name="currency_id" invisible="1" colspan="4"/>
|
||||
</group>
|
||||
<notebook colspan="4">
|
||||
<page string="Payment Information">
|
||||
|
|
@ -170,17 +177,25 @@
|
|||
<field name="date_original" readonly="1"/>
|
||||
<field name="date_due" readonly="1"/>
|
||||
<field name="amount_original" readonly="1"/>
|
||||
<field name="amount_unreconciled" sum="Open Balance" readonly="1"/>
|
||||
<field name="amount" sum="Payment"/>
|
||||
<field name="amount_unreconciled" readonly="1"/>
|
||||
<field name="reconcile" on_change="onchange_reconcile(reconcile, amount, amount_unreconciled, context)"/>
|
||||
<field name="amount" sum="Total Allocation" on_change="onchange_amount(amount, amount_unreconciled, context)"/>
|
||||
</tree>
|
||||
</field>
|
||||
<field name="line_cr_ids" colspan="4" nolabel="1" attrs="{'invisible': [('pre_line','=',False)]}" default_get="{'journal_id':journal_id, 'partner_id':partner_id}">
|
||||
<tree string="Credits" editable="bottom" colors="gray:amount==0">
|
||||
<field name="move_line_id"/>
|
||||
<field name="account_id" groups="base.group_extended" domain="[('type','=','receivable')]"/>
|
||||
<field name="date_original"/>
|
||||
<field name="amount_original"/>
|
||||
<field name="amount" sum="Payment"/>
|
||||
<field name="move_line_id" context="{'journal_id':parent.journal_id, 'partner_id':parent.partner_id}"
|
||||
on_change="onchange_move_line_id(move_line_id)"
|
||||
domain="[('account_id.type','=','payable'), ('reconcile_id','=', False), ('partner_id','=',parent.partner_id)]"
|
||||
required="1"
|
||||
/>
|
||||
<field name="account_id" groups="base.group_no_one" domain="[('type','=','payable')]"/>
|
||||
<field name="date_original" readonly="1"/>
|
||||
<field name="date_due" readonly="1"/>
|
||||
<field name="amount_original" readonly="1"/>
|
||||
<field name="amount_unreconciled" readonly="1"/>
|
||||
<field name="reconcile" on_change="onchange_reconcile(reconcile, amount, amount_unreconciled, context)"/>
|
||||
<field name="amount" sum="Total Allocation" on_change="onchange_amount(amount, amount_unreconciled, context)"/>
|
||||
</tree>
|
||||
</field>
|
||||
<group col="2" colspan="3">
|
||||
|
|
@ -188,18 +203,16 @@
|
|||
<field name="narration" colspan="2" nolabel="1"/>
|
||||
</group>
|
||||
<group col="2" colspan="1">
|
||||
<group col="2" colspan="1" attrs="{'invisible':[('currency_id','=',False)]}">
|
||||
<separator string="Currency Options" colspan="2"/>
|
||||
<field name="exchange_acc_id"
|
||||
domain="[('type','=','other')]"/>
|
||||
<field name="payment_rate" required="1" on_change="onchange_rate(payment_rate, amount, context)" groups='base.group_extended'/>
|
||||
<field name="paid_amount_in_company_currency" groups='base.group_extended'/>
|
||||
<group col="4" colspan="1" attrs="{'invisible':[('currency_id','=',False),('is_multi_currency','=',False)]}">
|
||||
<separator string="Currency Options" colspan="4"/>
|
||||
<field name="payment_rate" required="1" on_change="onchange_rate(payment_rate, amount, currency_id, payment_rate_currency_id, company_id, context)" groups='base.group_extended' colspan="3"/>
|
||||
<field name="payment_rate_currency_id" groups='base.group_extended' colspan="1" nolabel="1" on_change="onchange_payment_rate_currency(currency_id, payment_rate, payment_rate_currency_id, date, amount, company_id, context)"/>
|
||||
<field name="paid_amount_in_company_currency" groups='base.group_extended' colspan="4" invisible="1"/>
|
||||
</group>
|
||||
<group col="2" colspan="1">
|
||||
<separator string="Payment Options" colspan="2"/>
|
||||
<field name="writeoff_amount"/>
|
||||
<field name="payment_option" required="1"/>
|
||||
<field name="writeoff_amount"
|
||||
attrs="{'invisible':[('payment_option','!=','with_writeoff')]}"/>
|
||||
<field name="writeoff_acc_id"
|
||||
attrs="{'invisible':[('payment_option','!=','with_writeoff')], 'required':[('payment_option','=','with_writeoff')]}"
|
||||
domain="[('type','=','other')]"/>
|
||||
|
|
@ -208,11 +221,6 @@
|
|||
<field name="analytic_id"
|
||||
groups="analytic.group_analytic_accounting"/>
|
||||
</group>
|
||||
<group col="4" colspan="2">
|
||||
<separator string="Other Information" colspan="4"/>
|
||||
<field name="number" colspan="4"/>
|
||||
<field name="currency_id" invisible="1" colspan="4"/>
|
||||
</group>
|
||||
</group>
|
||||
</page>
|
||||
<page string="Journal Items" groups="base.group_extended" attrs="{'invisible': [('state','!=','posted')]}">
|
||||
|
|
@ -220,6 +228,7 @@
|
|||
<field name="period_id"/>
|
||||
<field name="audit"/>
|
||||
</group>
|
||||
<field name="number" colspan="4"/>
|
||||
<field name="move_ids" colspan="4" nolabel="1" readonly="1">
|
||||
<tree string="Journal Items">
|
||||
<field name="move_id"/>
|
||||
|
|
@ -242,7 +251,7 @@
|
|||
<group col="10" colspan="4">
|
||||
<field name="state" widget="statusbar" statusbar_visible="draft,posted" statusbar_colors='{"proforma":"blue"}'/>
|
||||
<button name="cancel_voucher" string="Cancel" states="draft,proforma" icon="gtk-cancel" invisible="context.get('line_type', False)"/>
|
||||
<button name="cancel_voucher" string="Unreconcile" type="object" states="posted" icon="terp-stock_effects-object-colorize" invisible="context.get('line_type', False)" confirm="Are you sure to unreconcile this record ?"/>
|
||||
<button name="cancel_voucher" string="Unreconcile" type="object" states="posted" icon="terp-stock_effects-object-colorize" invisible="context.get('line_type', False)" confirm="Are you sure to unreconcile and cancel this record ?"/>
|
||||
<button name="action_cancel_draft" type="object" states="cancel" string="Set to Draft" icon="terp-stock_effects-object-colorize" invisible="context.get('line_type', False)"/>
|
||||
<button name="proforma_voucher" string="Validate" states="draft" icon="gtk-go-forward" invisible="context.get('line_type', False)"/>
|
||||
</group>
|
||||
|
|
@ -289,14 +298,14 @@
|
|||
<field name="amount"
|
||||
invisible="context.get('line_type', False)"
|
||||
string="Paid Amount"
|
||||
on_change="onchange_amount(amount, payment_rate, partner_id, journal_id, currency_id, type, date, context)"/>
|
||||
on_change="onchange_amount(amount, payment_rate, partner_id, journal_id, currency_id, type, date, payment_rate_currency_id, company_id, context)"/>
|
||||
<field name="journal_id"
|
||||
domain="[('type','in',['bank', 'cash'])]"
|
||||
invisible="context.get('line_type', False)"
|
||||
widget="selection" select="1"
|
||||
on_change="onchange_journal(journal_id, line_cr_ids, False, partner_id, date, amount, type, context)"
|
||||
on_change="onchange_journal(journal_id, line_cr_ids, False, partner_id, date, amount, type, company_id, context)"
|
||||
string="Payment Method"/>
|
||||
<field name="date" select="1" invisible="context.get('line_type', False)" on_change="onchange_date(date, currency_id, amount, context)"/>
|
||||
<field name="date" select="1" invisible="context.get('line_type', False)" on_change="onchange_date(date, currency_id, payment_rate_currency_id, amount, company_id, context)"/>
|
||||
<field name="reference" select="1" invisible="context.get('line_type', False)" string="Payment Ref"/>
|
||||
<field name="name" colspan="2" invisible="context.get('line_type', False)"/>
|
||||
<field name="company_id" widget="selection" groups="base.group_multi_company"/>
|
||||
|
|
@ -308,7 +317,7 @@
|
|||
</group>
|
||||
<notebook colspan="4">
|
||||
<page string="Payment Information">
|
||||
<field name="line_cr_ids" default_get="{'journal_id':journal_id, 'type':type, 'partner_id':partner_id}" colspan="4" nolabel="1" height="140" on_change="onchange_line_ids(line_dr_ids, line_cr_ids, amount, context)">
|
||||
<field name="line_cr_ids" default_get="{'journal_id':journal_id, 'type':type, 'partner_id':partner_id}" colspan="4" nolabel="1" height="140" on_change="onchange_line_ids(line_dr_ids, line_cr_ids, amount, currency_id, context)">
|
||||
<tree string="Invoices and outstanding transactions" editable="bottom" colors="gray:amount==0">
|
||||
<field name="move_line_id" context="{'journal_id':parent.journal_id, 'partner_id':parent.partner_id}"
|
||||
on_change="onchange_move_line_id(move_line_id)"
|
||||
|
|
@ -319,17 +328,25 @@
|
|||
<field name="date_original" readonly="1"/>
|
||||
<field name="date_due" readonly="1"/>
|
||||
<field name="amount_original" readonly="1"/>
|
||||
<field name="amount_unreconciled" sum="Open Balance" readonly="1"/>
|
||||
<field name="amount" sum="Payment"/>
|
||||
<field name="amount_unreconciled" readonly="1"/>
|
||||
<field name="reconcile" on_change="onchange_reconcile(reconcile, amount, amount_unreconciled, context)"/>
|
||||
<field name="amount" sum="Total Allocation" on_change="onchange_amount(amount, amount_unreconciled, context)"/>
|
||||
</tree>
|
||||
</field>
|
||||
<field name="line_dr_ids" colspan="4" nolabel="1" attrs="{'invisible': [('pre_line','=',False)]}" default_get="{'journal_id':journal_id, 'partner_id':partner_id}" on_change="onchange_line_ids(line_dr_ids, line_cr_ids, amount, context)">
|
||||
<field name="line_dr_ids" colspan="4" nolabel="1" attrs="{'invisible': [('pre_line','=',False)]}" default_get="{'journal_id':journal_id, 'partner_id':partner_id}" on_change="onchange_line_ids(line_dr_ids, line_cr_ids, amount, currency_id, context)">
|
||||
<tree string="Credits" editable="bottom" colors="gray:amount==0">
|
||||
<field name="move_line_id"/>
|
||||
<field name="account_id" groups="base.group_extended" domain="[('type','=','receivable')]"/>
|
||||
<field name="date_original"/>
|
||||
<field name="amount_original"/>
|
||||
<field name="amount" sum="Payment"/>
|
||||
<field name="move_line_id" context="{'journal_id':parent.journal_id, 'partner_id':parent.partner_id}"
|
||||
on_change="onchange_move_line_id(move_line_id)"
|
||||
domain="[('account_id.type','in',('receivable','payable')), ('reconcile_id','=', False), ('partner_id','=',parent.partner_id)]"
|
||||
required="1"
|
||||
/>
|
||||
<field name="account_id" groups="base.group_no_one" domain="[('type','=','receivable')]"/>
|
||||
<field name="date_original" readonly="1"/>
|
||||
<field name="date_due" readonly="1"/>
|
||||
<field name="amount_original" readonly="1"/>
|
||||
<field name="amount_unreconciled" readonly="1"/>
|
||||
<field name="reconcile" on_change="onchange_reconcile(reconcile, amount, amount_unreconciled, context)"/>
|
||||
<field name="amount" sum="Total Allocation" on_change="onchange_amount(amount, amount_unreconciled, context)"/>
|
||||
</tree>
|
||||
</field>
|
||||
<group col="2" colspan="3">
|
||||
|
|
@ -337,18 +354,16 @@
|
|||
<field name="narration" colspan="2" nolabel="1"/>
|
||||
</group>
|
||||
<group col="2" colspan="1">
|
||||
<group col="2" colspan="1" attrs="{'invisible':[('currency_id','=',False)]}">
|
||||
<separator string="Currency Options" colspan="2"/>
|
||||
<field name="exchange_acc_id"
|
||||
domain="[('type','=','other')]"/>
|
||||
<field name="payment_rate" required="1" on_change="onchange_rate(payment_rate, amount, context)" groups='base.group_extended'/>
|
||||
<field name="paid_amount_in_company_currency" groups='base.group_extended'/>
|
||||
<group col="4" colspan="1" attrs="{'invisible':[('currency_id','=',False),('is_multi_currency','=',False)]}">
|
||||
<separator string="Currency Options" colspan="4"/>
|
||||
<field name="payment_rate" required="1" on_change="onchange_rate(payment_rate, amount, currency_id, payment_rate_currency_id, company_id, context)" groups='base.group_extended' colspan="3"/>
|
||||
<field name="payment_rate_currency_id" groups='base.group_extended' colspan="1" nolabel="1" on_change="onchange_payment_rate_currency(currency_id, payment_rate, payment_rate_currency_id, date, amount, company_id, context)"/>
|
||||
<field name="paid_amount_in_company_currency" groups='base.group_extended' colspan="4" invisible="1"/>
|
||||
</group>
|
||||
<group col="2" colspan="1">
|
||||
<separator string="Payment Options" colspan="2"/>
|
||||
<field name="writeoff_amount"/>
|
||||
<field name="payment_option" required="1"/>
|
||||
<field name="writeoff_amount"
|
||||
attrs="{'invisible':[('payment_option','!=','with_writeoff')]}"/>
|
||||
<field name="writeoff_acc_id"
|
||||
attrs="{'invisible':[('payment_option','!=','with_writeoff')], 'required':[('payment_option','=','with_writeoff')]}"
|
||||
domain="[('type','=','other')]"/>
|
||||
|
|
@ -357,10 +372,6 @@
|
|||
<field name="analytic_id"
|
||||
groups="analytic.group_analytic_accounting"/>
|
||||
</group>
|
||||
<group col="4" colspan="2">
|
||||
<separator string="Other Information" colspan="4"/>
|
||||
<field name="number" colspan="4"/>
|
||||
</group>
|
||||
</group>
|
||||
</page>
|
||||
<page string="Journal Items" groups="base.group_extended" attrs="{'invisible': [('state','!=','posted')]}">
|
||||
|
|
@ -368,6 +379,7 @@
|
|||
<field name="period_id"/>
|
||||
<field name="audit"/>
|
||||
</group>
|
||||
<field name="number" colspan="4"/>
|
||||
<field name="move_ids" colspan="4" nolabel="1" readonly="1">
|
||||
<tree string="Journal Items">
|
||||
<field name="move_id"/>
|
||||
|
|
@ -390,7 +402,7 @@
|
|||
<group col="10" colspan="4">
|
||||
<field name="state" widget="statusbar" statusbar_visible="draft,posted" statusbar_colors='{"proforma":"blue"}'/>
|
||||
<button name="cancel_voucher" string="Cancel" states="draft,proforma" icon="gtk-cancel" invisible="context.get('line_type', False)"/>
|
||||
<button name="cancel_voucher" string="Unreconcile" type="object" states="posted" invisible="context.get('line_type', False)" icon="terp-stock_effects-object-colorize" confirm="Are you sure to unreconcile this record ?"/>
|
||||
<button name="cancel_voucher" string="Unreconcile" type="object" states="posted" invisible="context.get('line_type', False)" icon="terp-stock_effects-object-colorize" confirm="Are you sure to unreconcile and cancel this record ?"/>
|
||||
<button name="action_cancel_draft" type="object" states="cancel" string="Set to Draft" icon="terp-stock_effects-object-colorize" invisible="context.get('line_type', False)"/>
|
||||
<button name="proforma_voucher" string="Validate" states="draft" icon="gtk-go-forward" invisible="context.get('line_type', False)"/>
|
||||
</group>
|
||||
|
|
|
|||
|
|
@ -83,8 +83,8 @@
|
|||
<form string="Sales Receipt">
|
||||
<group col="6" colspan="4">
|
||||
<field name="partner_id" required="1" on_change="onchange_partner_id(partner_id, journal_id, amount, currency_id, type, date, context)" string="Customer"/>
|
||||
<field name="date" on_change="onchange_date(date, currency_id, amount, context)"/>
|
||||
<field name="journal_id" domain="[('type','in',['sale','sale_refund'])]" widget="selection" on_change="onchange_journal(journal_id, line_cr_ids, tax_id, partner_id, date, amount, type, context)"/>
|
||||
<field name="date" on_change="onchange_date(date, currency_id, currency_id, amount, company_id, context)"/>
|
||||
<field name="journal_id" domain="[('type','in',['sale','sale_refund'])]" widget="selection" on_change="onchange_journal(journal_id, line_cr_ids, tax_id, partner_id, date, amount, type, company_id, context)"/>
|
||||
<field name="number"/>
|
||||
<field name="name" colspan="2"/>
|
||||
<field name="company_id" select="1" widget="selection" groups="base.group_multi_company"/>
|
||||
|
|
@ -210,8 +210,8 @@
|
|||
<form string="Supplier Voucher">
|
||||
<group col="6" colspan="4">
|
||||
<field name="partner_id" domain="[('supplier','=',True)]" required="1" string="Supplier" on_change="onchange_partner_id(partner_id, journal_id, amount, currency_id, type, date, context)"/>
|
||||
<field name="date" string="Bill Date" select="1" on_change="onchange_date(date, currency_id, amount, context)"/>
|
||||
<field name="journal_id" domain="[('type','in',['purchase','purchase_refund'])]" widget="selection" select="1" on_change="onchange_journal(journal_id, line_dr_ids, tax_id, partner_id, date, amount, type, context)"/>
|
||||
<field name="date" string="Bill Date" select="1" on_change="onchange_date(date, currency_id, currency_id, amount, company_id, context)"/>
|
||||
<field name="journal_id" domain="[('type','in',['purchase','purchase_refund'])]" widget="selection" select="1" on_change="onchange_journal(journal_id, line_dr_ids, tax_id, partner_id, date, amount, type, company_id, context)"/>
|
||||
<field name="number"/>
|
||||
<field name="name" colspan="2"/>
|
||||
<field name="reference" select="1"/>
|
||||
|
|
|
|||
|
|
@ -24,7 +24,7 @@
|
|||
"version": "1.1",
|
||||
"author" : "OpenERP SA",
|
||||
"website" : "http://www.openerp.com",
|
||||
"category" : "Hidden",
|
||||
"category": 'Accounting & Finance',
|
||||
"depends" : ["base", "decimal_precision"],
|
||||
"description": """
|
||||
Module for defining analytic accounting object.
|
||||
|
|
|
|||
|
|
@ -161,7 +161,7 @@ class account_analytic_account(osv.osv):
|
|||
'debit': fields.function(_debit_credit_bal_qtty, type='float', string='Debit', multi='debit_credit_bal_qtty', digits_compute=dp.get_precision('Account')),
|
||||
'credit': fields.function(_debit_credit_bal_qtty, type='float', string='Credit', multi='debit_credit_bal_qtty', digits_compute=dp.get_precision('Account')),
|
||||
'quantity': fields.function(_debit_credit_bal_qtty, type='float', string='Quantity', multi='debit_credit_bal_qtty'),
|
||||
'quantity_max': fields.float('Maximum Time', help='Sets the higher limit of quantity of hours.'),
|
||||
'quantity_max': fields.float('Maximum Time', help='Sets the higher limit of time to work on the contract.'),
|
||||
'partner_id': fields.many2one('res.partner', 'Partner'),
|
||||
'contact_id': fields.many2one('res.partner.address', 'Contact'),
|
||||
'user_id': fields.many2one('res.users', 'Account Manager'),
|
||||
|
|
|
|||
|
|
@ -0,0 +1,255 @@
|
|||
# Croatian translation for openobject-addons
|
||||
# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
|
||||
# This file is distributed under the same license as the openobject-addons package.
|
||||
# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
|
||||
#
|
||||
msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: openobject-addons\n"
|
||||
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
|
||||
"POT-Creation-Date: 2011-01-11 11:14+0000\n"
|
||||
"PO-Revision-Date: 2011-12-08 15:42+0000\n"
|
||||
"Last-Translator: Goran Kliska <gkliska@gmail.com>\n"
|
||||
"Language-Team: Croatian <hr@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: 2011-12-09 04:46+0000\n"
|
||||
"X-Generator: Launchpad (build 14450)\n"
|
||||
|
||||
#. module: analytic
|
||||
#: field:account.analytic.account,child_ids:0
|
||||
msgid "Child Accounts"
|
||||
msgstr "Podređena konta"
|
||||
|
||||
#. module: analytic
|
||||
#: field:account.analytic.account,name:0
|
||||
msgid "Account Name"
|
||||
msgstr "Naziv konta"
|
||||
|
||||
#. module: analytic
|
||||
#: help:account.analytic.line,unit_amount:0
|
||||
msgid "Specifies the amount of quantity to count."
|
||||
msgstr ""
|
||||
|
||||
#. module: analytic
|
||||
#: model:ir.module.module,description:analytic.module_meta_information
|
||||
msgid ""
|
||||
"Module for defining analytic accounting object.\n"
|
||||
" "
|
||||
msgstr ""
|
||||
|
||||
#. module: analytic
|
||||
#: field:account.analytic.account,state:0
|
||||
msgid "State"
|
||||
msgstr "Stanje"
|
||||
|
||||
#. module: analytic
|
||||
#: field:account.analytic.account,user_id:0
|
||||
msgid "Account Manager"
|
||||
msgstr "Voditelj računovodstva"
|
||||
|
||||
#. module: analytic
|
||||
#: selection:account.analytic.account,state:0
|
||||
msgid "Draft"
|
||||
msgstr "Nacrt"
|
||||
|
||||
#. module: analytic
|
||||
#: selection:account.analytic.account,state:0
|
||||
msgid "Closed"
|
||||
msgstr "Zatvoren"
|
||||
|
||||
#. module: analytic
|
||||
#: field:account.analytic.account,debit:0
|
||||
msgid "Debit"
|
||||
msgstr "Duguje"
|
||||
|
||||
#. module: analytic
|
||||
#: help:account.analytic.account,state:0
|
||||
msgid ""
|
||||
"* When an account is created its in 'Draft' state. "
|
||||
" \n"
|
||||
"* If any associated partner is there, it can be in 'Open' state. "
|
||||
" \n"
|
||||
"* If any pending balance is there it can be in 'Pending'. "
|
||||
" \n"
|
||||
"* And finally when all the transactions are over, it can be in 'Close' "
|
||||
"state. \n"
|
||||
"* The project can be in either if the states 'Template' and 'Running'.\n"
|
||||
" If it is template then we can make projects based on the template projects. "
|
||||
"If its in 'Running' state it is a normal project. "
|
||||
" \n"
|
||||
" If it is to be reviewed then the state is 'Pending'.\n"
|
||||
" When the project is completed the state is set to 'Done'."
|
||||
msgstr ""
|
||||
|
||||
#. module: analytic
|
||||
#: field:account.analytic.account,type:0
|
||||
msgid "Account Type"
|
||||
msgstr "Vrsta konta"
|
||||
|
||||
#. module: analytic
|
||||
#: selection:account.analytic.account,state:0
|
||||
msgid "Template"
|
||||
msgstr "Predložak"
|
||||
|
||||
#. module: analytic
|
||||
#: selection:account.analytic.account,state:0
|
||||
msgid "Pending"
|
||||
msgstr "U toku"
|
||||
|
||||
#. module: analytic
|
||||
#: model:ir.model,name:analytic.model_account_analytic_line
|
||||
msgid "Analytic Line"
|
||||
msgstr "Analitičke stavke"
|
||||
|
||||
#. module: analytic
|
||||
#: field:account.analytic.account,description:0
|
||||
#: field:account.analytic.line,name:0
|
||||
msgid "Description"
|
||||
msgstr "Opis"
|
||||
|
||||
#. module: analytic
|
||||
#: selection:account.analytic.account,type:0
|
||||
msgid "Normal"
|
||||
msgstr "Običan"
|
||||
|
||||
#. module: analytic
|
||||
#: field:account.analytic.account,company_id:0
|
||||
#: field:account.analytic.line,company_id:0
|
||||
msgid "Company"
|
||||
msgstr "Organizacija"
|
||||
|
||||
#. module: analytic
|
||||
#: field:account.analytic.account,quantity_max:0
|
||||
msgid "Maximum Quantity"
|
||||
msgstr "Maksimalna količina"
|
||||
|
||||
#. module: analytic
|
||||
#: field:account.analytic.line,user_id:0
|
||||
msgid "User"
|
||||
msgstr "Korisnik"
|
||||
|
||||
#. module: analytic
|
||||
#: field:account.analytic.account,parent_id:0
|
||||
msgid "Parent Analytic Account"
|
||||
msgstr "Nadređeni analitički konto"
|
||||
|
||||
#. module: analytic
|
||||
#: field:account.analytic.line,date:0
|
||||
msgid "Date"
|
||||
msgstr "Datum"
|
||||
|
||||
#. module: analytic
|
||||
#: field:account.analytic.account,currency_id:0
|
||||
msgid "Account currency"
|
||||
msgstr "Valuta konta"
|
||||
|
||||
#. module: analytic
|
||||
#: field:account.analytic.account,quantity:0
|
||||
#: field:account.analytic.line,unit_amount:0
|
||||
msgid "Quantity"
|
||||
msgstr "Količina"
|
||||
|
||||
#. module: analytic
|
||||
#: help:account.analytic.line,amount:0
|
||||
msgid ""
|
||||
"Calculated by multiplying the quantity and the price given in the Product's "
|
||||
"cost price. Always expressed in the company main currency."
|
||||
msgstr ""
|
||||
|
||||
#. module: analytic
|
||||
#: help:account.analytic.account,quantity_max:0
|
||||
msgid "Sets the higher limit of quantity of hours."
|
||||
msgstr ""
|
||||
|
||||
#. module: analytic
|
||||
#: field:account.analytic.account,credit:0
|
||||
msgid "Credit"
|
||||
msgstr "Potražuje"
|
||||
|
||||
#. module: analytic
|
||||
#: field:account.analytic.line,amount:0
|
||||
msgid "Amount"
|
||||
msgstr "Iznos"
|
||||
|
||||
#. module: analytic
|
||||
#: field:account.analytic.account,contact_id:0
|
||||
msgid "Contact"
|
||||
msgstr "Kontakt"
|
||||
|
||||
#. module: analytic
|
||||
#: constraint:account.analytic.account:0
|
||||
msgid ""
|
||||
"Error! The currency has to be the same as the currency of the selected "
|
||||
"company"
|
||||
msgstr "Greška! Valuta ne odgovara valuti organizacije."
|
||||
|
||||
#. module: analytic
|
||||
#: selection:account.analytic.account,state:0
|
||||
msgid "Cancelled"
|
||||
msgstr "Otkazano"
|
||||
|
||||
#. module: analytic
|
||||
#: field:account.analytic.account,balance:0
|
||||
msgid "Balance"
|
||||
msgstr "Saldo"
|
||||
|
||||
#. module: analytic
|
||||
#: constraint:account.analytic.account:0
|
||||
msgid "Error! You can not create recursive analytic accounts."
|
||||
msgstr "Greška! Ne možete kreirati rekurzivna analitička konta."
|
||||
|
||||
#. module: analytic
|
||||
#: help:account.analytic.account,type:0
|
||||
msgid ""
|
||||
"If you select the View Type, it means you won't allow to create journal "
|
||||
"entries using that account."
|
||||
msgstr ""
|
||||
|
||||
#. module: analytic
|
||||
#: field:account.analytic.account,date:0
|
||||
msgid "Date End"
|
||||
msgstr "Završni datum"
|
||||
|
||||
#. module: analytic
|
||||
#: field:account.analytic.account,code:0
|
||||
msgid "Account Code"
|
||||
msgstr "Šifra konta"
|
||||
|
||||
#. module: analytic
|
||||
#: field:account.analytic.account,complete_name:0
|
||||
msgid "Full Account Name"
|
||||
msgstr "Puni naziv konta"
|
||||
|
||||
#. module: analytic
|
||||
#: field:account.analytic.line,account_id:0
|
||||
#: model:ir.model,name:analytic.model_account_analytic_account
|
||||
#: model:ir.module.module,shortdesc:analytic.module_meta_information
|
||||
msgid "Analytic Account"
|
||||
msgstr "Analitički konto"
|
||||
|
||||
#. module: analytic
|
||||
#: selection:account.analytic.account,type:0
|
||||
msgid "View"
|
||||
msgstr "Pogled"
|
||||
|
||||
#. module: analytic
|
||||
#: field:account.analytic.account,partner_id:0
|
||||
msgid "Partner"
|
||||
msgstr "Partner"
|
||||
|
||||
#. module: analytic
|
||||
#: field:account.analytic.account,date_start:0
|
||||
msgid "Date Start"
|
||||
msgstr "Početni datum"
|
||||
|
||||
#. module: analytic
|
||||
#: selection:account.analytic.account,state:0
|
||||
msgid "Open"
|
||||
msgstr "Otvoren"
|
||||
|
||||
#. module: analytic
|
||||
#: field:account.analytic.account,line_ids:0
|
||||
msgid "Analytic Entries"
|
||||
msgstr "Stavke analitike"
|
||||
|
|
@ -20,9 +20,9 @@
|
|||
##############################################################################
|
||||
|
||||
{
|
||||
'name': 'Analytic Journal Billing Rate, Define the default invoicing rate for a specific journal',
|
||||
'name': 'Billing Rates on Contracts',
|
||||
'version': '1.0',
|
||||
'category': 'Hidden',
|
||||
'category': 'Sales Management',
|
||||
'description': """
|
||||
This module allows you to define what is the default invoicing rate for a specific journal on a given account.
|
||||
==============================================================================================================
|
||||
|
|
|
|||
|
|
@ -7,14 +7,14 @@ msgstr ""
|
|||
"Project-Id-Version: OpenERP Server 6.0dev\n"
|
||||
"Report-Msgid-Bugs-To: support@openerp.com\n"
|
||||
"POT-Creation-Date: 2011-01-03 16:56+0000\n"
|
||||
"PO-Revision-Date: 2009-09-08 15:52+0000\n"
|
||||
"Last-Translator: Ivica Perić <ivica.peric@ipsoft-tg.com>\n"
|
||||
"PO-Revision-Date: 2011-12-08 15:46+0000\n"
|
||||
"Last-Translator: Goran Kliska <gkliska@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: 2011-11-05 05:34+0000\n"
|
||||
"X-Generator: Launchpad (build 14231)\n"
|
||||
"X-Launchpad-Export-Date: 2011-12-09 04:46+0000\n"
|
||||
"X-Generator: Launchpad (build 14450)\n"
|
||||
|
||||
#. module: analytic_journal_billing_rate
|
||||
#: model:ir.module.module,description:analytic_journal_billing_rate.module_meta_information
|
||||
|
|
@ -36,28 +36,28 @@ msgstr ""
|
|||
#. module: analytic_journal_billing_rate
|
||||
#: field:analytic_journal_rate_grid,journal_id:0
|
||||
msgid "Analytic Journal"
|
||||
msgstr ""
|
||||
msgstr "Dnevnik analitike"
|
||||
|
||||
#. module: analytic_journal_billing_rate
|
||||
#: model:ir.model,name:analytic_journal_billing_rate.model_account_invoice
|
||||
msgid "Invoice"
|
||||
msgstr ""
|
||||
msgstr "Račun"
|
||||
|
||||
#. module: analytic_journal_billing_rate
|
||||
#: view:analytic_journal_rate_grid:0
|
||||
msgid "Billing Rate per Journal for this Analytic Account"
|
||||
msgstr ""
|
||||
msgstr "Stupanj naplate po temeljnici za ovaj analitički račun"
|
||||
|
||||
#. module: analytic_journal_billing_rate
|
||||
#: field:analytic_journal_rate_grid,account_id:0
|
||||
#: model:ir.model,name:analytic_journal_billing_rate.model_account_analytic_account
|
||||
msgid "Analytic Account"
|
||||
msgstr ""
|
||||
msgstr "Analitički konto"
|
||||
|
||||
#. module: analytic_journal_billing_rate
|
||||
#: model:ir.model,name:analytic_journal_billing_rate.model_analytic_journal_rate_grid
|
||||
msgid "Relation table between journals and billing rates"
|
||||
msgstr ""
|
||||
msgstr "Relacijska tablica između temeljnica i stupnjeva naplate"
|
||||
|
||||
#. module: analytic_journal_billing_rate
|
||||
#: field:account.analytic.account,journal_rate_ids:0
|
||||
|
|
@ -76,7 +76,7 @@ msgstr ""
|
|||
msgid ""
|
||||
"Error! The currency has to be the same as the currency of the selected "
|
||||
"company"
|
||||
msgstr ""
|
||||
msgstr "Greška! Valuta ne odgovara valuti organizacije."
|
||||
|
||||
#. module: analytic_journal_billing_rate
|
||||
#: field:analytic_journal_rate_grid,rate_id:0
|
||||
|
|
@ -86,7 +86,7 @@ msgstr ""
|
|||
#. module: analytic_journal_billing_rate
|
||||
#: constraint:account.analytic.account:0
|
||||
msgid "Error! You can not create recursive analytic accounts."
|
||||
msgstr ""
|
||||
msgstr "Greška! Ne možete kreirati rekurzivna analitička konta."
|
||||
|
||||
#. module: analytic_journal_billing_rate
|
||||
#: model:ir.model,name:analytic_journal_billing_rate.model_hr_analytic_timesheet
|
||||
|
|
|
|||
|
|
@ -21,9 +21,9 @@
|
|||
|
||||
|
||||
{
|
||||
'name': 'Human Resources',
|
||||
'name': 'Jobs on Contracts',
|
||||
'version': '1.0',
|
||||
'category': 'Hidden',
|
||||
'category': 'Sales Management',
|
||||
'description': """
|
||||
This module allows you to define what is the default function of a specific user on a given account.
|
||||
====================================================================================================
|
||||
|
|
|
|||
|
|
@ -7,14 +7,14 @@ msgstr ""
|
|||
"Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
|
||||
"Report-Msgid-Bugs-To: support@openerp.com\n"
|
||||
"POT-Creation-Date: 2011-01-03 16:56+0000\n"
|
||||
"PO-Revision-Date: 2010-08-03 02:55+0000\n"
|
||||
"Last-Translator: Mantavya Gajjar (Open ERP) <Unknown>\n"
|
||||
"PO-Revision-Date: 2011-12-08 15:51+0000\n"
|
||||
"Last-Translator: Goran Kliska <gkliska@gmail.com>\n"
|
||||
"Language-Team: Vinteh\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
"X-Launchpad-Export-Date: 2011-11-05 05:36+0000\n"
|
||||
"X-Generator: Launchpad (build 14231)\n"
|
||||
"X-Launchpad-Export-Date: 2011-12-09 04:46+0000\n"
|
||||
"X-Generator: Launchpad (build 14450)\n"
|
||||
"Language: hr\n"
|
||||
|
||||
#. module: analytic_user_function
|
||||
|
|
@ -27,7 +27,7 @@ msgstr "Proizvod"
|
|||
#: code:addons/analytic_user_function/analytic_user_function.py:131
|
||||
#, python-format
|
||||
msgid "Error !"
|
||||
msgstr ""
|
||||
msgstr "Greška !"
|
||||
|
||||
#. module: analytic_user_function
|
||||
#: model:ir.model,name:analytic_user_function.model_hr_analytic_timesheet
|
||||
|
|
@ -56,19 +56,19 @@ msgstr "Korisnik"
|
|||
msgid ""
|
||||
"Error! The currency has to be the same as the currency of the selected "
|
||||
"company"
|
||||
msgstr ""
|
||||
msgstr "Greška! Valuta ne odgovara valuti organizacije."
|
||||
|
||||
#. module: analytic_user_function
|
||||
#: code:addons/analytic_user_function/analytic_user_function.py:97
|
||||
#: code:addons/analytic_user_function/analytic_user_function.py:132
|
||||
#, python-format
|
||||
msgid "There is no expense account define for this product: \"%s\" (id:%d)"
|
||||
msgstr ""
|
||||
msgstr "nije definiran konto troška za ovaj proizvod: \"%s\" (id:%d)"
|
||||
|
||||
#. module: analytic_user_function
|
||||
#: model:ir.model,name:analytic_user_function.model_analytic_user_funct_grid
|
||||
msgid "Relation table between users and products on a analytic account"
|
||||
msgstr "Vza između korisnika i proizvoda kod Analitičkog konta."
|
||||
msgstr "Veza između korisnika i proizvoda na analitičkom kontu."
|
||||
|
||||
#. module: analytic_user_function
|
||||
#: model:ir.module.module,description:analytic_user_function.module_meta_information
|
||||
|
|
@ -95,12 +95,12 @@ msgstr "Funkcija Analitičkog Korisnika"
|
|||
#. module: analytic_user_function
|
||||
#: constraint:account.analytic.account:0
|
||||
msgid "Error! You can not create recursive analytic accounts."
|
||||
msgstr ""
|
||||
msgstr "Greška! Ne možete kreirati rekurzivna analitička konta."
|
||||
|
||||
#. module: analytic_user_function
|
||||
#: view:analytic_user_funct_grid:0
|
||||
msgid "User's Product for this Analytic Account"
|
||||
msgstr "Korisnikov Proizvod za ovaj Analitički konto."
|
||||
msgstr "Proizvod rada"
|
||||
|
||||
#~ msgid "Invalid XML for View Architecture!"
|
||||
#~ msgstr "Nepravilan XML format za View Architecture!"
|
||||
|
|
|
|||
|
|
@ -24,7 +24,7 @@
|
|||
{
|
||||
'name': 'Database Anonymization',
|
||||
'version': '1.0',
|
||||
'category': 'Hidden',
|
||||
'category': 'Tools',
|
||||
'complexity': "easy",
|
||||
'description': """
|
||||
This module allows you to anonymize a database.
|
||||
|
|
|
|||
|
|
@ -0,0 +1,226 @@
|
|||
# Croatian translation for openobject-addons
|
||||
# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
|
||||
# This file is distributed under the same license as the openobject-addons package.
|
||||
# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
|
||||
#
|
||||
msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: openobject-addons\n"
|
||||
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
|
||||
"POT-Creation-Date: 2011-01-11 11:14+0000\n"
|
||||
"PO-Revision-Date: 2011-12-08 15:53+0000\n"
|
||||
"Last-Translator: Goran Kliska <gkliska@gmail.com>\n"
|
||||
"Language-Team: Croatian <hr@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: 2011-12-09 04:46+0000\n"
|
||||
"X-Generator: Launchpad (build 14450)\n"
|
||||
|
||||
#. module: anonymization
|
||||
#: model:ir.model,name:anonymization.model_ir_model_fields_anonymize_wizard
|
||||
msgid "ir.model.fields.anonymize.wizard"
|
||||
msgstr ""
|
||||
|
||||
#. module: anonymization
|
||||
#: field:ir.model.fields.anonymization,field_name:0
|
||||
msgid "Field Name"
|
||||
msgstr "Naziv polja"
|
||||
|
||||
#. module: anonymization
|
||||
#: field:ir.model.fields.anonymization,field_id:0
|
||||
msgid "Field"
|
||||
msgstr "Polje"
|
||||
|
||||
#. module: anonymization
|
||||
#: field:ir.model.fields.anonymization.history,state:0
|
||||
#: field:ir.model.fields.anonymize.wizard,state:0
|
||||
msgid "State"
|
||||
msgstr "Stanje"
|
||||
|
||||
#. module: anonymization
|
||||
#: field:ir.model.fields.anonymize.wizard,file_import:0
|
||||
msgid "Import"
|
||||
msgstr "Uvoz"
|
||||
|
||||
#. module: anonymization
|
||||
#: model:ir.model,name:anonymization.model_ir_model_fields_anonymization
|
||||
msgid "ir.model.fields.anonymization"
|
||||
msgstr ""
|
||||
|
||||
#. module: anonymization
|
||||
#: model:ir.module.module,shortdesc:anonymization.module_meta_information
|
||||
msgid "Database anonymization module"
|
||||
msgstr ""
|
||||
|
||||
#. module: anonymization
|
||||
#: field:ir.model.fields.anonymization.history,direction:0
|
||||
msgid "Direction"
|
||||
msgstr "Smjer"
|
||||
|
||||
#. module: anonymization
|
||||
#: model:ir.actions.act_window,name:anonymization.action_ir_model_fields_anonymization_tree
|
||||
#: view:ir.model.fields.anonymization:0
|
||||
#: model:ir.ui.menu,name:anonymization.menu_administration_anonymization_fields
|
||||
msgid "Anonymized Fields"
|
||||
msgstr ""
|
||||
|
||||
#. module: anonymization
|
||||
#: model:ir.ui.menu,name:anonymization.menu_administration_anonymization
|
||||
msgid "Database anonymization"
|
||||
msgstr ""
|
||||
|
||||
#. module: anonymization
|
||||
#: code:addons/anonymization/anonymization.py:55
|
||||
#: sql_constraint:ir.model.fields.anonymization:0
|
||||
#, python-format
|
||||
msgid "You cannot have two records having the same model and the same field"
|
||||
msgstr ""
|
||||
|
||||
#. module: anonymization
|
||||
#: selection:ir.model.fields.anonymization,state:0
|
||||
#: selection:ir.model.fields.anonymize.wizard,state:0
|
||||
msgid "Anonymized"
|
||||
msgstr ""
|
||||
|
||||
#. module: anonymization
|
||||
#: field:ir.model.fields.anonymization,state:0
|
||||
msgid "unknown"
|
||||
msgstr "nepoznato"
|
||||
|
||||
#. module: anonymization
|
||||
#: field:ir.model.fields.anonymization,model_id:0
|
||||
msgid "Object"
|
||||
msgstr "Objekt"
|
||||
|
||||
#. module: anonymization
|
||||
#: field:ir.model.fields.anonymization.history,filepath:0
|
||||
msgid "File path"
|
||||
msgstr "Putanja datoteke"
|
||||
|
||||
#. module: anonymization
|
||||
#: field:ir.model.fields.anonymization.history,date:0
|
||||
msgid "Date"
|
||||
msgstr "Datum"
|
||||
|
||||
#. module: anonymization
|
||||
#: field:ir.model.fields.anonymize.wizard,file_export:0
|
||||
msgid "Export"
|
||||
msgstr "Izvoz"
|
||||
|
||||
#. module: anonymization
|
||||
#: view:ir.model.fields.anonymize.wizard:0
|
||||
msgid "Reverse the Database Anonymization"
|
||||
msgstr ""
|
||||
|
||||
#. module: anonymization
|
||||
#: view:ir.model.fields.anonymize.wizard:0
|
||||
msgid "Database Anonymization"
|
||||
msgstr ""
|
||||
|
||||
#. module: anonymization
|
||||
#: model:ir.ui.menu,name:anonymization.menu_administration_anonymization_wizard
|
||||
msgid "Anonymize database"
|
||||
msgstr ""
|
||||
|
||||
#. module: anonymization
|
||||
#: view:ir.model.fields.anonymization.history:0
|
||||
#: field:ir.model.fields.anonymization.history,field_ids:0
|
||||
msgid "Fields"
|
||||
msgstr "Polja"
|
||||
|
||||
#. module: anonymization
|
||||
#: selection:ir.model.fields.anonymization,state:0
|
||||
#: selection:ir.model.fields.anonymize.wizard,state:0
|
||||
msgid "Clear"
|
||||
msgstr "Očisti"
|
||||
|
||||
#. module: anonymization
|
||||
#: selection:ir.model.fields.anonymization.history,direction:0
|
||||
msgid "clear -> anonymized"
|
||||
msgstr ""
|
||||
|
||||
#. module: anonymization
|
||||
#: view:ir.model.fields.anonymize.wizard:0
|
||||
#: field:ir.model.fields.anonymize.wizard,summary:0
|
||||
msgid "Summary"
|
||||
msgstr "Sažetak"
|
||||
|
||||
#. module: anonymization
|
||||
#: view:ir.model.fields.anonymization:0
|
||||
msgid "Anonymized Field"
|
||||
msgstr ""
|
||||
|
||||
#. module: anonymization
|
||||
#: model:ir.module.module,description:anonymization.module_meta_information
|
||||
msgid ""
|
||||
"\n"
|
||||
"This module allows you to anonymize a database.\n"
|
||||
" "
|
||||
msgstr ""
|
||||
|
||||
#. module: anonymization
|
||||
#: selection:ir.model.fields.anonymize.wizard,state:0
|
||||
msgid "Unstable"
|
||||
msgstr ""
|
||||
|
||||
#. module: anonymization
|
||||
#: selection:ir.model.fields.anonymization.history,state:0
|
||||
msgid "Exception occured"
|
||||
msgstr ""
|
||||
|
||||
#. module: anonymization
|
||||
#: selection:ir.model.fields.anonymization,state:0
|
||||
#: selection:ir.model.fields.anonymize.wizard,state:0
|
||||
msgid "Not Existing"
|
||||
msgstr ""
|
||||
|
||||
#. module: anonymization
|
||||
#: field:ir.model.fields.anonymization,model_name:0
|
||||
msgid "Object Name"
|
||||
msgstr "Naziv objekta"
|
||||
|
||||
#. module: anonymization
|
||||
#: model:ir.actions.act_window,name:anonymization.action_ir_model_fields_anonymization_history_tree
|
||||
#: view:ir.model.fields.anonymization.history:0
|
||||
#: model:ir.ui.menu,name:anonymization.menu_administration_anonymization_history
|
||||
msgid "Anonymization History"
|
||||
msgstr ""
|
||||
|
||||
#. module: anonymization
|
||||
#: model:ir.model,name:anonymization.model_ir_model_fields_anonymization_history
|
||||
msgid "ir.model.fields.anonymization.history"
|
||||
msgstr ""
|
||||
|
||||
#. module: anonymization
|
||||
#: model:ir.actions.act_window,name:anonymization.action_ir_model_fields_anonymize_wizard
|
||||
#: view:ir.model.fields.anonymize.wizard:0
|
||||
msgid "Anonymize Database"
|
||||
msgstr ""
|
||||
|
||||
#. module: anonymization
|
||||
#: field:ir.model.fields.anonymize.wizard,name:0
|
||||
msgid "File Name"
|
||||
msgstr ""
|
||||
|
||||
#. module: anonymization
|
||||
#: selection:ir.model.fields.anonymization.history,direction:0
|
||||
msgid "anonymized -> clear"
|
||||
msgstr ""
|
||||
|
||||
#. module: anonymization
|
||||
#: selection:ir.model.fields.anonymization.history,state:0
|
||||
msgid "Started"
|
||||
msgstr ""
|
||||
|
||||
#. module: anonymization
|
||||
#: selection:ir.model.fields.anonymization.history,state:0
|
||||
msgid "Done"
|
||||
msgstr ""
|
||||
|
||||
#. module: anonymization
|
||||
#: view:ir.model.fields.anonymization.history:0
|
||||
#: field:ir.model.fields.anonymization.history,msg:0
|
||||
#: field:ir.model.fields.anonymize.wizard,msg:0
|
||||
msgid "Message"
|
||||
msgstr ""
|
||||
|
|
@ -3,5 +3,3 @@
|
|||
"access_ir_model_fields_anonymization_user","ir_model_fields_anonymization user","model_ir_model_fields_anonymization",,1,0,0,0
|
||||
"access_ir_model_fields_anonymization_history_group_system","ir_model_fields_anonymization_history group_user","model_ir_model_fields_anonymization_history","base.group_system",1,1,1,1
|
||||
"access_ir_model_fields_anonymization_history_user","ir_model_fields_anonymization_history user","model_ir_model_fields_anonymization_history",,1,0,0,0
|
||||
"access_ir_model_fields_anonymize_wizard_group_system","ir_model_fields_anonymize_wizard group_user","model_ir_model_fields_anonymize_wizard","base.group_system",1,1,1,1
|
||||
"access_ir_model_fields_anonymize_wizard_user","ir_model_fields_anonymize_wizard user","model_ir_model_fields_anonymize_wizard",,1,0,0,0
|
||||
|
|
|
|||
|
|
|
@ -21,7 +21,7 @@
|
|||
|
||||
|
||||
{
|
||||
'name': 'Association profile',
|
||||
'name': 'Associations Management',
|
||||
'version': '0.1',
|
||||
'category': 'Specific Industry Applications',
|
||||
'complexity': "normal",
|
||||
|
|
@ -37,6 +37,7 @@ It installs the profile for associations to manage events, registrations, member
|
|||
'demo_xml': [],
|
||||
'installable': True,
|
||||
'active': False,
|
||||
'application': True,
|
||||
'certificate': '0078696047261',
|
||||
'images': ['images/association1.jpeg'],
|
||||
}
|
||||
|
|
|
|||
|
|
@ -7,29 +7,29 @@ msgstr ""
|
|||
"Project-Id-Version: OpenERP Server 6.0dev\n"
|
||||
"Report-Msgid-Bugs-To: support@openerp.com\n"
|
||||
"POT-Creation-Date: 2011-01-11 11:14+0000\n"
|
||||
"PO-Revision-Date: 2010-11-12 11:37+0000\n"
|
||||
"Last-Translator: <>\n"
|
||||
"PO-Revision-Date: 2011-12-08 15:58+0000\n"
|
||||
"Last-Translator: Goran Kliska <gkliska@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: 2011-11-05 05:52+0000\n"
|
||||
"X-Generator: Launchpad (build 14231)\n"
|
||||
"X-Launchpad-Export-Date: 2011-12-09 04:46+0000\n"
|
||||
"X-Generator: Launchpad (build 14450)\n"
|
||||
|
||||
#. module: association
|
||||
#: field:profile.association.config.install_modules_wizard,wiki:0
|
||||
msgid "Wiki"
|
||||
msgstr ""
|
||||
msgstr "Wiki"
|
||||
|
||||
#. module: association
|
||||
#: view:profile.association.config.install_modules_wizard:0
|
||||
msgid "Event Management"
|
||||
msgstr ""
|
||||
msgstr "Upravljanje eventima"
|
||||
|
||||
#. module: association
|
||||
#: field:profile.association.config.install_modules_wizard,project_gtd:0
|
||||
msgid "Getting Things Done"
|
||||
msgstr ""
|
||||
msgstr "Getting Things Done"
|
||||
|
||||
#. module: association
|
||||
#: model:ir.module.module,description:association.module_meta_information
|
||||
|
|
@ -39,7 +39,7 @@ msgstr ""
|
|||
#. module: association
|
||||
#: field:profile.association.config.install_modules_wizard,progress:0
|
||||
msgid "Configuration Progress"
|
||||
msgstr ""
|
||||
msgstr "Napredak konfiguracije"
|
||||
|
||||
#. module: association
|
||||
#: view:profile.association.config.install_modules_wizard:0
|
||||
|
|
@ -51,7 +51,7 @@ msgstr ""
|
|||
#. module: association
|
||||
#: view:profile.association.config.install_modules_wizard:0
|
||||
msgid "title"
|
||||
msgstr ""
|
||||
msgstr "naslov"
|
||||
|
||||
#. module: association
|
||||
#: help:profile.association.config.install_modules_wizard,event_project:0
|
||||
|
|
@ -61,7 +61,7 @@ msgstr ""
|
|||
#. module: association
|
||||
#: field:profile.association.config.install_modules_wizard,config_logo:0
|
||||
msgid "Image"
|
||||
msgstr ""
|
||||
msgstr "Slika"
|
||||
|
||||
#. module: association
|
||||
#: help:profile.association.config.install_modules_wizard,hr_expense:0
|
||||
|
|
@ -69,6 +69,8 @@ msgid ""
|
|||
"Tracks and manages employee expenses, and can automatically re-invoice "
|
||||
"clients if the expenses are project-related."
|
||||
msgstr ""
|
||||
"Prati i upravlja troškove djelatnika , moguće je automatski ponovno "
|
||||
"fakturirati klijente ako su troškovi povezani sa projektom."
|
||||
|
||||
#. module: association
|
||||
#: help:profile.association.config.install_modules_wizard,project_gtd:0
|
||||
|
|
@ -80,7 +82,7 @@ msgstr ""
|
|||
#. module: association
|
||||
#: view:profile.association.config.install_modules_wizard:0
|
||||
msgid "Resources Management"
|
||||
msgstr ""
|
||||
msgstr "Upravljanje resursima"
|
||||
|
||||
#. module: association
|
||||
#: model:ir.module.module,shortdesc:association.module_meta_information
|
||||
|
|
@ -90,7 +92,7 @@ msgstr ""
|
|||
#. module: association
|
||||
#: field:profile.association.config.install_modules_wizard,hr_expense:0
|
||||
msgid "Expenses Tracking"
|
||||
msgstr ""
|
||||
msgstr "Praćenje troškova"
|
||||
|
||||
#. module: association
|
||||
#: model:ir.actions.act_window,name:association.action_config_install_module
|
||||
|
|
@ -120,15 +122,15 @@ msgstr ""
|
|||
#. module: association
|
||||
#: field:profile.association.config.install_modules_wizard,event_project:0
|
||||
msgid "Events"
|
||||
msgstr ""
|
||||
msgstr "Eventi"
|
||||
|
||||
#. module: association
|
||||
#: view:profile.association.config.install_modules_wizard:0
|
||||
#: field:profile.association.config.install_modules_wizard,project:0
|
||||
msgid "Project Management"
|
||||
msgstr ""
|
||||
msgstr "Upravljanje Projektima"
|
||||
|
||||
#. module: association
|
||||
#: view:profile.association.config.install_modules_wizard:0
|
||||
msgid "Configure"
|
||||
msgstr ""
|
||||
msgstr "Postavke"
|
||||
|
|
|
|||
|
|
@ -6,7 +6,6 @@
|
|||
id="base.menu_association"
|
||||
icon="terp-calendar"
|
||||
sequence="9"
|
||||
groups="base.group_extended"
|
||||
web_icon="images/association.png"
|
||||
web_icon_hover="images/association-hover.png"/>
|
||||
<menuitem name="Configuration" id="base.menu_event_config" parent="base.menu_association" sequence="30" groups="base.group_extended"/>
|
||||
|
|
|
|||
|
|
@ -68,6 +68,7 @@ The dashboard for auction includes:
|
|||
],
|
||||
|
||||
'installable': True,
|
||||
'auction': True,
|
||||
'active': False,
|
||||
'certificate': '0039333102717',
|
||||
'images': ['images/auction1.jpeg','images/auction2.jpeg','images/auction3.jpeg'],
|
||||
|
|
|
|||
|
|
@ -23,7 +23,7 @@
|
|||
{
|
||||
'name': 'Audit Trail',
|
||||
'version': '1.0',
|
||||
'category': 'Hidden',
|
||||
'category': 'Tools',
|
||||
'description': """
|
||||
This module lets administrator track every user operation on all the objects of the system.
|
||||
===========================================================================================
|
||||
|
|
|
|||
|
|
@ -7,19 +7,19 @@ msgstr ""
|
|||
"Project-Id-Version: OpenERP Server 6.0dev\n"
|
||||
"Report-Msgid-Bugs-To: support@openerp.com\n"
|
||||
"POT-Creation-Date: 2011-01-11 11:14+0000\n"
|
||||
"PO-Revision-Date: 2009-09-08 13:23+0000\n"
|
||||
"PO-Revision-Date: 2011-12-08 17:09+0000\n"
|
||||
"Last-Translator: Ivica Perić <ivica.peric@ipsoft-tg.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: 2011-11-05 05:32+0000\n"
|
||||
"X-Generator: Launchpad (build 14231)\n"
|
||||
"X-Launchpad-Export-Date: 2011-12-09 04:45+0000\n"
|
||||
"X-Generator: Launchpad (build 14450)\n"
|
||||
|
||||
#. module: audittrail
|
||||
#: model:ir.module.module,shortdesc:audittrail.module_meta_information
|
||||
msgid "Audit Trail"
|
||||
msgstr ""
|
||||
msgstr "Audit Trail"
|
||||
|
||||
#. module: audittrail
|
||||
#: code:addons/audittrail/audittrail.py:81
|
||||
|
|
@ -30,18 +30,18 @@ msgstr ""
|
|||
#. module: audittrail
|
||||
#: field:audittrail.log.line,log_id:0
|
||||
msgid "Log"
|
||||
msgstr "Dnevnik izmjena"
|
||||
msgstr "Zapisnik"
|
||||
|
||||
#. module: audittrail
|
||||
#: view:audittrail.rule:0
|
||||
#: selection:audittrail.rule,state:0
|
||||
msgid "Subscribed"
|
||||
msgstr "Pretplaćeno"
|
||||
msgstr "Pretplaćen"
|
||||
|
||||
#. module: audittrail
|
||||
#: model:ir.model,name:audittrail.model_audittrail_rule
|
||||
msgid "Audittrail Rule"
|
||||
msgstr ""
|
||||
msgstr "Audittrail Pravila"
|
||||
|
||||
#. module: audittrail
|
||||
#: view:audittrail.view.log:0
|
||||
|
|
@ -54,7 +54,7 @@ msgstr "Dnevnik izmjena"
|
|||
#: view:audittrail.log:0
|
||||
#: view:audittrail.rule:0
|
||||
msgid "Group By..."
|
||||
msgstr ""
|
||||
msgstr "Grupiraj po..."
|
||||
|
||||
#. module: audittrail
|
||||
#: view:audittrail.rule:0
|
||||
|
|
@ -65,7 +65,7 @@ msgstr "Stanje"
|
|||
#. module: audittrail
|
||||
#: view:audittrail.rule:0
|
||||
msgid "_Subscribe"
|
||||
msgstr ""
|
||||
msgstr "_Pretplati"
|
||||
|
||||
#. module: audittrail
|
||||
#: view:audittrail.rule:0
|
||||
|
|
@ -89,6 +89,8 @@ msgid ""
|
|||
"Select this if you want to keep track of read/open on any record of the "
|
||||
"object of this rule"
|
||||
msgstr ""
|
||||
"Select this if you want to keep track of read/open on any record of the "
|
||||
"object of this rule"
|
||||
|
||||
#. module: audittrail
|
||||
#: field:audittrail.log,method:0
|
||||
|
|
@ -98,22 +100,22 @@ msgstr "Metoda"
|
|||
#. module: audittrail
|
||||
#: field:audittrail.view.log,from:0
|
||||
msgid "Log From"
|
||||
msgstr ""
|
||||
msgstr "Logiraj od"
|
||||
|
||||
#. module: audittrail
|
||||
#: field:audittrail.log.line,log:0
|
||||
msgid "Log ID"
|
||||
msgstr ""
|
||||
msgstr "Log ID"
|
||||
|
||||
#. module: audittrail
|
||||
#: field:audittrail.log,res_id:0
|
||||
msgid "Resource Id"
|
||||
msgstr ""
|
||||
msgstr "Id resursa"
|
||||
|
||||
#. module: audittrail
|
||||
#: help:audittrail.rule,user_id:0
|
||||
msgid "if User is not added then it will applicable for all users"
|
||||
msgstr ""
|
||||
msgstr "if User is not added then it will applicable for all users"
|
||||
|
||||
#. module: audittrail
|
||||
#: help:audittrail.rule,log_workflow:0
|
||||
|
|
@ -121,6 +123,8 @@ msgid ""
|
|||
"Select this if you want to keep track of workflow on any record of the "
|
||||
"object of this rule"
|
||||
msgstr ""
|
||||
"Odaberite ovu opciju ukoliko želite pratiti tijek rada na bilo koji zapis "
|
||||
"predmeta iz ovog pravila"
|
||||
|
||||
#. module: audittrail
|
||||
#: field:audittrail.rule,user_id:0
|
||||
|
|
@ -130,14 +134,14 @@ msgstr "Korisnici"
|
|||
#. module: audittrail
|
||||
#: view:audittrail.log:0
|
||||
msgid "Log Lines"
|
||||
msgstr ""
|
||||
msgstr "Log Lines"
|
||||
|
||||
#. module: audittrail
|
||||
#: view:audittrail.log:0
|
||||
#: field:audittrail.log,object_id:0
|
||||
#: field:audittrail.rule,object_id:0
|
||||
msgid "Object"
|
||||
msgstr "Objekt"
|
||||
msgstr "Object"
|
||||
|
||||
#. module: audittrail
|
||||
#: view:audittrail.rule:0
|
||||
|
|
@ -147,7 +151,7 @@ msgstr "Pravilo praćenja promjena"
|
|||
#. module: audittrail
|
||||
#: field:audittrail.view.log,to:0
|
||||
msgid "Log To"
|
||||
msgstr ""
|
||||
msgstr "Log To"
|
||||
|
||||
#. module: audittrail
|
||||
#: view:audittrail.log:0
|
||||
|
|
@ -157,13 +161,13 @@ msgstr "Tekst nove vrijednosti: "
|
|||
#. module: audittrail
|
||||
#: view:audittrail.rule:0
|
||||
msgid "Search Audittrail Rule"
|
||||
msgstr ""
|
||||
msgstr "Search Audittrail Rule"
|
||||
|
||||
#. module: audittrail
|
||||
#: model:ir.actions.act_window,name:audittrail.action_audittrail_rule_tree
|
||||
#: model:ir.ui.menu,name:audittrail.menu_action_audittrail_rule_tree
|
||||
msgid "Audit Rules"
|
||||
msgstr ""
|
||||
msgstr "Pravila revizije"
|
||||
|
||||
#. module: audittrail
|
||||
#: view:audittrail.log:0
|
||||
|
|
@ -173,7 +177,7 @@ msgstr "Stara vrijednost : "
|
|||
#. module: audittrail
|
||||
#: field:audittrail.log,name:0
|
||||
msgid "Resource Name"
|
||||
msgstr ""
|
||||
msgstr "Resource Name"
|
||||
|
||||
#. module: audittrail
|
||||
#: view:audittrail.log:0
|
||||
|
|
@ -187,16 +191,18 @@ msgid ""
|
|||
"Select this if you want to keep track of modification on any record of the "
|
||||
"object of this rule"
|
||||
msgstr ""
|
||||
"Select this if you want to keep track of modification on any record of the "
|
||||
"object of this rule"
|
||||
|
||||
#. module: audittrail
|
||||
#: field:audittrail.rule,log_create:0
|
||||
msgid "Log Creates"
|
||||
msgstr ""
|
||||
msgstr "Log Creates"
|
||||
|
||||
#. module: audittrail
|
||||
#: help:audittrail.rule,object_id:0
|
||||
msgid "Select object for which you want to generate log."
|
||||
msgstr ""
|
||||
msgstr "Select object for which you want to generate log."
|
||||
|
||||
#. module: audittrail
|
||||
#: view:audittrail.log:0
|
||||
|
|
@ -206,7 +212,7 @@ msgstr "Tekst stare vrijednosti : "
|
|||
#. module: audittrail
|
||||
#: field:audittrail.rule,log_workflow:0
|
||||
msgid "Log Workflow"
|
||||
msgstr ""
|
||||
msgstr "Log Workflow"
|
||||
|
||||
#. module: audittrail
|
||||
#: model:ir.module.module,description:audittrail.module_meta_information
|
||||
|
|
@ -224,7 +230,7 @@ msgstr ""
|
|||
#. module: audittrail
|
||||
#: field:audittrail.rule,log_read:0
|
||||
msgid "Log Reads"
|
||||
msgstr ""
|
||||
msgstr "Log Reads"
|
||||
|
||||
#. module: audittrail
|
||||
#: code:addons/audittrail/audittrail.py:82
|
||||
|
|
@ -235,7 +241,7 @@ msgstr ""
|
|||
#. module: audittrail
|
||||
#: field:audittrail.log,line_ids:0
|
||||
msgid "Log lines"
|
||||
msgstr "Retci dnevnika"
|
||||
msgstr "Reci dnevnika"
|
||||
|
||||
#. module: audittrail
|
||||
#: field:audittrail.log.line,field_id:0
|
||||
|
|
@ -253,6 +259,8 @@ msgid ""
|
|||
"Select this if you want to keep track of deletion on any record of the "
|
||||
"object of this rule"
|
||||
msgstr ""
|
||||
"Select this if you want to keep track of deletion on any record of the "
|
||||
"object of this rule"
|
||||
|
||||
#. module: audittrail
|
||||
#: view:audittrail.log:0
|
||||
|
|
@ -263,47 +271,47 @@ msgstr "Korisnik"
|
|||
#. module: audittrail
|
||||
#: field:audittrail.rule,action_id:0
|
||||
msgid "Action ID"
|
||||
msgstr ""
|
||||
msgstr "Action ID"
|
||||
|
||||
#. module: audittrail
|
||||
#: view:audittrail.rule:0
|
||||
msgid "Users (if User is not added then it will applicable for all users)"
|
||||
msgstr ""
|
||||
msgstr "Korisnici (ako se ne upišu - vrijedi za sve korisnike)"
|
||||
|
||||
#. module: audittrail
|
||||
#: view:audittrail.rule:0
|
||||
msgid "UnSubscribe"
|
||||
msgstr ""
|
||||
msgstr "UnSubscribe"
|
||||
|
||||
#. module: audittrail
|
||||
#: field:audittrail.rule,log_unlink:0
|
||||
msgid "Log Deletes"
|
||||
msgstr ""
|
||||
msgstr "Log Deletes"
|
||||
|
||||
#. module: audittrail
|
||||
#: field:audittrail.log.line,field_description:0
|
||||
msgid "Field Description"
|
||||
msgstr ""
|
||||
msgstr "Field Description"
|
||||
|
||||
#. module: audittrail
|
||||
#: view:audittrail.log:0
|
||||
msgid "Search Audittrail Log"
|
||||
msgstr ""
|
||||
msgstr "Search Audittrail Log"
|
||||
|
||||
#. module: audittrail
|
||||
#: field:audittrail.rule,log_write:0
|
||||
msgid "Log Writes"
|
||||
msgstr ""
|
||||
msgstr "Log Writes"
|
||||
|
||||
#. module: audittrail
|
||||
#: view:audittrail.view.log:0
|
||||
msgid "Open Logs"
|
||||
msgstr ""
|
||||
msgstr "Open Logs"
|
||||
|
||||
#. module: audittrail
|
||||
#: field:audittrail.log.line,new_value_text:0
|
||||
msgid "New value Text"
|
||||
msgstr ""
|
||||
msgstr "New value Text"
|
||||
|
||||
#. module: audittrail
|
||||
#: field:audittrail.rule,name:0
|
||||
|
|
@ -313,28 +321,29 @@ msgstr "Naziv pravila"
|
|||
#. module: audittrail
|
||||
#: field:audittrail.log.line,new_value:0
|
||||
msgid "New Value"
|
||||
msgstr ""
|
||||
msgstr "New Value"
|
||||
|
||||
#. module: audittrail
|
||||
#: view:audittrail.log:0
|
||||
msgid "AuditTrail Logs"
|
||||
msgstr ""
|
||||
msgstr "AuditTrail Logs"
|
||||
|
||||
#. module: audittrail
|
||||
#: model:ir.model,name:audittrail.model_audittrail_log
|
||||
msgid "Audittrail Log"
|
||||
msgstr ""
|
||||
msgstr "Audittrail Log"
|
||||
|
||||
#. module: audittrail
|
||||
#: help:audittrail.rule,log_action:0
|
||||
msgid ""
|
||||
"Select this if you want to keep track of actions on the object of this rule"
|
||||
msgstr ""
|
||||
"Select this if you want to keep track of actions on the object of this rule"
|
||||
|
||||
#. module: audittrail
|
||||
#: view:audittrail.log:0
|
||||
msgid "New Value : "
|
||||
msgstr ""
|
||||
msgstr "Nova vrijednost : "
|
||||
|
||||
#. module: audittrail
|
||||
#: sql_constraint:audittrail.rule:0
|
||||
|
|
@ -351,22 +360,22 @@ msgstr "Tekst stare vrijednosti"
|
|||
#. module: audittrail
|
||||
#: view:audittrail.view.log:0
|
||||
msgid "Cancel"
|
||||
msgstr "Otkaži"
|
||||
msgstr "Odustani"
|
||||
|
||||
#. module: audittrail
|
||||
#: model:ir.model,name:audittrail.model_audittrail_view_log
|
||||
msgid "View Log"
|
||||
msgstr ""
|
||||
msgstr "Pogledaj Log"
|
||||
|
||||
#. module: audittrail
|
||||
#: model:ir.model,name:audittrail.model_audittrail_log_line
|
||||
msgid "Log Line"
|
||||
msgstr ""
|
||||
msgstr "Redak Prijave"
|
||||
|
||||
#. module: audittrail
|
||||
#: field:audittrail.rule,log_action:0
|
||||
msgid "Log Action"
|
||||
msgstr ""
|
||||
msgstr "Log Action"
|
||||
|
||||
#. module: audittrail
|
||||
#: help:audittrail.rule,log_create:0
|
||||
|
|
@ -374,6 +383,8 @@ msgid ""
|
|||
"Select this if you want to keep track of creation on any record of the "
|
||||
"object of this rule"
|
||||
msgstr ""
|
||||
"Select this if you want to keep track of creation on any record of the "
|
||||
"object of this rule"
|
||||
|
||||
#~ msgid "Name"
|
||||
#~ msgstr "Naziv"
|
||||
|
|
|
|||
|
|
@ -21,9 +21,9 @@
|
|||
|
||||
|
||||
{
|
||||
'name': 'OpenID',
|
||||
'name': 'OpenID Authentification',
|
||||
'version': '2.0',
|
||||
'category': 'Hidden',
|
||||
'category': 'Tools',
|
||||
'description': """Allow users to login through OpenID.""",
|
||||
'author': 'OpenERP s.a.',
|
||||
'maintainer': 'OpenERP s.a.',
|
||||
|
|
|
|||
|
|
@ -22,7 +22,7 @@
|
|||
{
|
||||
'name': 'Action Rule',
|
||||
'version': '1.0',
|
||||
'category': 'Hidden',
|
||||
'category': 'Sales Management',
|
||||
'description': """
|
||||
This module allows to implement action rules for any object.
|
||||
============================================================
|
||||
|
|
|
|||
|
|
@ -34,7 +34,7 @@ It supports:
|
|||
- Recurring events
|
||||
- Invitations to people""",
|
||||
"author" : "OpenERP SA",
|
||||
'category': 'Hidden',
|
||||
'category': 'Tools',
|
||||
'website': 'http://www.openerp.com',
|
||||
"init_xml" : [
|
||||
'base_calendar_data.xml'
|
||||
|
|
|
|||
|
|
@ -23,7 +23,7 @@
|
|||
{
|
||||
'name': 'Base Contact',
|
||||
'version': '1.0',
|
||||
'category': 'Hidden',
|
||||
'category': 'Sales Management',
|
||||
'complexity': "expert",
|
||||
'description': """
|
||||
This module allows you to manage your contacts entirely.
|
||||
|
|
|
|||
|
|
@ -19,12 +19,12 @@
|
|||
#
|
||||
##############################################################################
|
||||
{
|
||||
"name" : "Base - Password Encryption",
|
||||
"name" : "DB Password Encryption",
|
||||
"version" : "1.1",
|
||||
"author" : ['OpenERP SA', "FS3"],
|
||||
"maintainer" : "OpenERP SA",
|
||||
"website" : "http://www.openerp.com",
|
||||
"category" : "Hidden",
|
||||
"category" : "Tools",
|
||||
'complexity': "easy",
|
||||
"description": """
|
||||
Replaces cleartext passwords in the database with a secure hash
|
||||
|
|
|
|||
|
|
@ -19,9 +19,9 @@
|
|||
#
|
||||
##############################################################################
|
||||
{
|
||||
'name': 'Create IBAN bank accounts',
|
||||
'name': 'IBAN Bank Accounts',
|
||||
'version': '1.0',
|
||||
'category': 'Hidden',
|
||||
"category": 'Accounting & Finance',
|
||||
'complexity': "easy",
|
||||
'description': """
|
||||
This module installs the base for IBAN (International Bank Account Number) bank accounts and checks for its validity.
|
||||
|
|
|
|||
|
|
@ -20,9 +20,9 @@
|
|||
##############################################################################
|
||||
|
||||
{
|
||||
'name': 'Module Technical Guide in Restructured Text ',
|
||||
'name': 'Generate Docs of Modules',
|
||||
'version': '1.0',
|
||||
'category': 'Hidden',
|
||||
'category': 'Tools',
|
||||
'description': """
|
||||
This module generates the Technical Guides of selected modules in Restructured Text format (RST).
|
||||
=================================================================================================
|
||||
|
|
|
|||
|
|
@ -21,9 +21,9 @@
|
|||
|
||||
|
||||
{
|
||||
'name': 'Base module quality - To check the quality of other modules' ,
|
||||
'name': 'Analyse Module Quality' ,
|
||||
'version': '1.0',
|
||||
'category': 'Hidden',
|
||||
'category': 'Tools',
|
||||
'description': """
|
||||
The aim of this module is to check the quality of other modules.
|
||||
================================================================
|
||||
|
|
|
|||
|
|
@ -23,7 +23,7 @@
|
|||
{
|
||||
'name': 'Module Record',
|
||||
'version': '1.0',
|
||||
'category': 'Hidden',
|
||||
'category': 'Tools',
|
||||
'description': """
|
||||
This module allows you to create a new module without any development.
|
||||
======================================================================
|
||||
|
|
|
|||
|
|
@ -2,3 +2,4 @@
|
|||
"access_base_report_creator_report","base_report_creator.report","model_base_report_creator_report","base.group_system",1,1,1,1
|
||||
"access_base_report_creator_report_fields","base_report_creator.report.fields","model_base_report_creator_report_fields","base.group_system",1,1,1,1
|
||||
"access_base_report_creator_report_filter","base_report_creator.report.filter","model_base_report_creator_report_filter","base.group_system",1,1,1,1
|
||||
"access_base_report_creator_report_result","base_report_creator.report.result","model_base_report_creator_report_result","base.group_system",1,1,1,1
|
||||
|
|
|
|||
|
|
|
@ -21,9 +21,9 @@
|
|||
|
||||
|
||||
{
|
||||
'name': 'Base Setup',
|
||||
'name': 'Initial Setup Tools',
|
||||
'version': '1.0',
|
||||
'category': 'Hidden',
|
||||
'category': 'Tools',
|
||||
'complexity': "easy",
|
||||
'description': """
|
||||
This module helps to configure the system at the installation of a new database.
|
||||
|
|
|
|||
|
|
@ -28,290 +28,6 @@ from osv import fields, osv
|
|||
from tools.translate import _
|
||||
from lxml import etree
|
||||
|
||||
#Application and feature chooser, this could be done by introspecting ir.modules
|
||||
DEFAULT_MODULES = {
|
||||
'Customer Relationship Management' : ['crm',],
|
||||
'Sales Management' : ['sale',],
|
||||
'Project Management' : ['project',],
|
||||
'Knowledge Management' : ['document',],
|
||||
'Warehouse Management' : ['stock',],
|
||||
'Manufacturing' : ['mrp'],
|
||||
'Accounting & Finance' : ['account'],
|
||||
'Purchase Management' : ['purchase'],
|
||||
'Human Resources' : ['hr',],
|
||||
'Point of Sale' : ['point_of_sale',],
|
||||
'Marketing' : ['marketing',],
|
||||
}
|
||||
|
||||
class base_setup_installer(osv.osv_memory):
|
||||
_name = 'base.setup.installer'
|
||||
_inherit = 'res.config.installer'
|
||||
|
||||
_columns = {
|
||||
'selection' : fields.text('Selection'),
|
||||
}
|
||||
|
||||
def fields_get(self, cr, uid, fields=None, context=None):
|
||||
if context is None:
|
||||
context = {}
|
||||
if fields is None:
|
||||
fields = {}
|
||||
|
||||
fields = {}
|
||||
category_proxy = self.pool.get('ir.module.category')
|
||||
domain = [('parent_id', '=', False),
|
||||
('name', '!=', 'Uncategorized'),
|
||||
('visible', '=', True)]
|
||||
category_ids = category_proxy.search(cr, uid, domain, context=context)
|
||||
for category in category_proxy.browse(cr, uid, category_ids, context=context):
|
||||
category_name = 'category_%d' % (category.id,)
|
||||
fields[category_name] = {
|
||||
'type' : 'boolean',
|
||||
'string' : category.name,
|
||||
'name' : category_name,
|
||||
'help' : category.description,
|
||||
}
|
||||
|
||||
module_proxy = self.pool.get('ir.module.module')
|
||||
module_ids = module_proxy.search(cr, uid, [], context=context)
|
||||
for module in module_proxy.browse(cr, uid, module_ids, context=context):
|
||||
module_name = 'module_%d' % (module.id,)
|
||||
module_is_installed = module.state == 'installed'
|
||||
|
||||
fields[module_name] = {
|
||||
'type' : 'boolean',
|
||||
'string' : module.shortdesc,
|
||||
'name' : module_name,
|
||||
'help' : module.description,
|
||||
}
|
||||
|
||||
return fields
|
||||
|
||||
def default_get(self, cr, uid, fields=None, context=None):
|
||||
if context is None:
|
||||
context = {}
|
||||
if fields is None:
|
||||
fields = {}
|
||||
|
||||
result = {}
|
||||
|
||||
if 'dont_compute_virtual_attributes' not in context:
|
||||
module_proxy = self.pool.get('ir.module.module')
|
||||
module_ids = module_proxy.search(cr, uid, [], context=context)
|
||||
for module in module_proxy.browse(cr, uid, module_ids, context=context):
|
||||
result['module_%d' % (module.id,)] = module.state == 'installed'
|
||||
|
||||
cat_proxy = self.pool.get('ir.module.category')
|
||||
cat_ids = cat_proxy.search(cr, uid, [], context=context)
|
||||
for cat in cat_proxy.browse(cr, uid, cat_ids, context=context):
|
||||
m = DEFAULT_MODULES.get(cat.name,[])
|
||||
r = module_proxy.search(cr, uid, [('state','=','installed'),('name','in',m)])
|
||||
|
||||
result['category_%d' % (cat.id,)] = bool(r) and (len(r) == len(m))
|
||||
|
||||
return result
|
||||
|
||||
def fields_view_get(self, cr, uid, view_id=None, view_type='from', context=None, toolbar=False, submenu=False):
|
||||
def in_extended_view_group(cr, uid, context=None):
|
||||
try:
|
||||
model, group_id = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'base', 'group_extended')
|
||||
except ValueError:
|
||||
return False
|
||||
return group_id in self.pool.get('res.users').read(cr, uid, uid, ['groups_id'], context=context)['groups_id']
|
||||
|
||||
result = super(base_setup_installer, self).fields_view_get(cr, uid, view_id, view_type, context, toolbar, submenu)
|
||||
|
||||
module_category_proxy = self.pool.get('ir.module.category')
|
||||
domain = [('parent_id', '=', False),
|
||||
('name', '!=', 'Uncategorized'),
|
||||
('visible', '=', True)]
|
||||
module_category_ids = module_category_proxy.search(cr, uid, domain, context=context, order='sequence asc')
|
||||
|
||||
arch = ['<form string="%s">' % _('Automatic Base Setup')]
|
||||
arch.append('<separator string="%s" colspan="4" />' % _('Install Applications'))
|
||||
module_proxy = self.pool.get('ir.module.module')
|
||||
|
||||
extended_view = in_extended_view_group(cr, uid, context=context)
|
||||
|
||||
for module_category in module_category_proxy.browse(cr, uid, module_category_ids, context=context):
|
||||
domain = [('category_id', '=', module_category.id)]
|
||||
if not extended_view:
|
||||
domain.append(('complexity', '!=', 'expert'))
|
||||
|
||||
modules = module_proxy.browse(cr, uid, module_proxy.search(cr, uid, domain, context=context), context=context)
|
||||
if not modules:
|
||||
continue
|
||||
|
||||
m = DEFAULT_MODULES.get(module_category.name, [])
|
||||
r = module_proxy.search(cr, uid, [('state', '=', 'installed'),('name', 'in', m)], context=context)
|
||||
readonly = bool(r)
|
||||
|
||||
attributes = {
|
||||
'name' : 'category_%d' % (module_category.id,),
|
||||
'on_change' : 'on_change_%s_%d(category_%d)' % ('category', module_category.id, module_category.id,),
|
||||
}
|
||||
if readonly:
|
||||
attributes['modifiers'] = simplejson.dumps({'readonly' : True})
|
||||
|
||||
arch.append("""<field %s />""" % (" ".join(["%s='%s'" % (key, value,)
|
||||
for key, value in attributes.iteritems()]),))
|
||||
|
||||
# Compute the modules to show
|
||||
for module_category in module_category_proxy.browse(cr, uid, module_category_ids, context=context):
|
||||
domain = [('category_id', '=', module_category.id)]
|
||||
|
||||
if not extended_view:
|
||||
domain.append(('complexity', '!=', 'expert'))
|
||||
|
||||
default_modules = DEFAULT_MODULES.get(module_category.name, False)
|
||||
if default_modules:
|
||||
domain.append(('name', 'not in', default_modules))
|
||||
|
||||
modules = module_proxy.browse(cr, uid, module_proxy.search(cr, uid, domain, context=context), context=context)
|
||||
|
||||
if not modules:
|
||||
continue
|
||||
|
||||
modifiers = {
|
||||
'invisible' : [('category_%d' % (module_category.id), '=', False)],
|
||||
}
|
||||
module_modifiers = dict(modifiers)
|
||||
|
||||
arch.append("""<separator string="%s Features" colspan="4" modifiers='%s'/>""" % (
|
||||
cgi.escape(module_category.name),
|
||||
simplejson.dumps(modifiers))
|
||||
)
|
||||
|
||||
for module in modules:
|
||||
#module_modifiers['readonly'] = module.state == 'installed'
|
||||
|
||||
arch.append("""<field name="module_%d" modifiers='%s' />""" % (
|
||||
module.id,
|
||||
simplejson.dumps(module_modifiers))
|
||||
)
|
||||
|
||||
arch.append(
|
||||
'<separator colspan="4" />'
|
||||
'<group colspan="4" col="2">'
|
||||
'<button special="cancel" string="Cancel" icon="gtk-cancel" />'
|
||||
'<button string="Install Modules" type="object" name="apply_cb" icon="gtk-apply" />'
|
||||
'</group>'
|
||||
)
|
||||
|
||||
arch.append('</form>')
|
||||
|
||||
result['arch'] = ''.join(arch)
|
||||
return result
|
||||
|
||||
def __getattr__(self, name):
|
||||
if name.startswith('on_change_category_'):
|
||||
def proxy(cr, uid, ids, value, context=None):
|
||||
item = 'category_%s' % name[len('on_change_category_'):]
|
||||
return self._on_change_selection(cr, uid, ids, item, value, context=context)
|
||||
return proxy
|
||||
return getattr(super(base_setup_installer, self), name)
|
||||
|
||||
def _on_change_selection(self, cr, uid, ids, item, value, context=None):
|
||||
if not isinstance(item, basestring) or not value:
|
||||
return {}
|
||||
|
||||
if item.startswith('category_') or item.startswith('module_'):
|
||||
object_name, identifier = item.split('_')
|
||||
else:
|
||||
return {}
|
||||
|
||||
values = {
|
||||
}
|
||||
|
||||
#if object_name == 'category':
|
||||
# module_ids = self.pool.get('ir.module.module').search(cr, uid, [('category_id', '=', int(identifier))], context=context)
|
||||
# for module_id in module_ids:
|
||||
# values['module_%d' % module_id] = 1
|
||||
|
||||
return {'value': values}
|
||||
|
||||
def create(self, cr, uid, values, context=None):
|
||||
to_install = {'categories' : [], 'modules' : []}
|
||||
|
||||
for key, value in values.iteritems():
|
||||
if value == 1 and (key.startswith('module_') or key.startswith('category_')):
|
||||
kind, identifier = key.split('_')
|
||||
if kind == 'category':
|
||||
to_install['categories'].append(long(identifier))
|
||||
if kind == 'module':
|
||||
to_install['modules'].append(long(identifier))
|
||||
|
||||
values = {
|
||||
'selection' : simplejson.dumps(to_install),
|
||||
}
|
||||
context.update(dont_compute_virtual_attributes=True)
|
||||
return super(base_setup_installer, self).create(cr, uid, values, context=context)
|
||||
|
||||
def apply_cb(self, cr, uid, ids, context=None):
|
||||
category_proxy = self.pool.get('ir.module.category')
|
||||
for installer in self.browse(cr, uid, ids, context=context):
|
||||
to_install = simplejson.loads(installer.selection)
|
||||
|
||||
proxy = self.pool.get('ir.module.module')
|
||||
|
||||
module_ids = proxy.search(cr, uid, [('id', 'in', to_install['modules'])], context=context)
|
||||
modules = set(record['name']
|
||||
for record in proxy.read(cr, uid, module_ids, ['name'], context=context))
|
||||
|
||||
category_ids = category_proxy.search(cr, uid, [('id', 'in', to_install['categories'])], context=context)
|
||||
selected_categories = set(record['name']
|
||||
for record in category_proxy.read(cr, uid, category_ids, ['name'], context=context))
|
||||
|
||||
# FIXME: Use a workaround, but can do better
|
||||
for category_name, default_modules in DEFAULT_MODULES.iteritems():
|
||||
if category_name in selected_categories:
|
||||
modules.update(default_modules)
|
||||
|
||||
# Special Cases:
|
||||
# * project_mrp: the dependencies are sale, project, procurement, mrp_jit
|
||||
if 'sale' in modules and 'project' in modules:
|
||||
modules.add('project_mrp')
|
||||
|
||||
need_update = False
|
||||
module_ids = proxy.search(cr, uid, [('name', 'in', list(modules))], context=context)
|
||||
if module_ids:
|
||||
proxy.state_update(cr, uid, module_ids, 'to install', ['uninstalled'], context=context)
|
||||
need_update = True
|
||||
|
||||
category_id = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'base', 'module_category_hidden_link')
|
||||
while True and category_id:
|
||||
cr.execute("select id, name from ir_module_module m where category_id = %s \
|
||||
and (select count(d.id) from ir_module_module_dependency d \
|
||||
where d.module_id = m.id) = (select count(d.id) from \
|
||||
ir_module_module_dependency d inner join ir_module_module m2 on d.name = m2.name \
|
||||
where d.module_id=m.id and m2.state in %s ) and state = %s",
|
||||
(category_id[1], ('installed', 'to install', 'to upgrade', ), 'uninstalled',))
|
||||
inner_modules = [name for _, name in cr.fetchall()]
|
||||
|
||||
module_ids = proxy.search(cr, uid, [('name', 'in', inner_modules)], context=context)
|
||||
if not module_ids:
|
||||
break
|
||||
|
||||
modules.update(inner_modules)
|
||||
|
||||
proxy.state_update(cr, uid, module_ids, 'to install', ['uninstalled'], context=context)
|
||||
need_update = True
|
||||
|
||||
|
||||
domain = [('name', 'in', list(modules)),
|
||||
('state', '=', 'installed')]
|
||||
for module in proxy.browse(cr, uid, proxy.search(cr, uid, domain, context=context), context):
|
||||
cr.execute("update ir_actions_todo set state='open' \
|
||||
from ir_model_data as data where data.res_id = ir_actions_todo.id \
|
||||
and ir_actions_todo.type='special'\
|
||||
and data.model = 'ir.actions.todo' and data.module=%s", (module.name, ))
|
||||
|
||||
if need_update:
|
||||
cr.commit()
|
||||
self.pool = pooler.restart_pool(cr.dbname, update_module=True)[1]
|
||||
|
||||
return self.pool.get('res.config').next(cr, uid, [], context=context)
|
||||
|
||||
#Migrate data from another application Conf wiz
|
||||
|
||||
class migrade_application_installer_modules(osv.osv_memory):
|
||||
|
|
|
|||
|
|
@ -1,36 +1,6 @@
|
|||
<openerp>
|
||||
<data>
|
||||
|
||||
<record model="ir.actions.act_window" id="action_base_setup_installer_beta">
|
||||
<field name="name">Install Applications</field>
|
||||
<field name="res_model">base.setup.installer</field>
|
||||
<field name="view_type">form</field>
|
||||
<field name="view_mode">form</field>
|
||||
<field name="target">new</field>
|
||||
</record>
|
||||
|
||||
|
||||
<record id="base_setup_installer_todo" model="ir.actions.todo">
|
||||
<field name="action_id" ref="action_base_setup_installer_beta" />
|
||||
<field name="category_id" ref="base.category_administration_config"/>
|
||||
<field name="sequence">2</field>
|
||||
</record>
|
||||
|
||||
<record id="action_start_configurator" model="ir.actions.server">
|
||||
<field name="name">Start Configuration</field>
|
||||
<field name="model_id" ref="base.model_ir_actions_todo"/>
|
||||
<field name="state">code</field>
|
||||
<field name="code" eval="'# obj is a browse_record and will provide stupid ids to method\n' 'action = pool.get(\'ir.actions.todo\').action_launch(cr, uid, ' + str([ref('base_setup_installer_todo')]) + ', context=context)'"/>
|
||||
</record>
|
||||
|
||||
<menuitem name="Add More Features" action="action_start_configurator" id="menu_view_base_module_configuration" parent="base.menu_config" type="server" icon="STOCK_EXECUTE" sequence="1"/>
|
||||
<record id="ir_ui_view_sc_configuration" model="ir.ui.view_sc">
|
||||
<field name="name">Add More Features</field>
|
||||
<field name="resource">ir.ui.menu</field>
|
||||
<field name="user_id" ref="base.user_root"/>
|
||||
<field name="res_id" ref="menu_view_base_module_configuration" />
|
||||
</record>
|
||||
|
||||
<!-- Import or create customers configartion view -->
|
||||
<record id="action_import_create_installer" model="ir.actions.act_window">
|
||||
<field name="name">Create or Import Customers</field>
|
||||
|
|
@ -162,6 +132,7 @@
|
|||
<field name="view_type">form</field>
|
||||
<field name="view_mode">form</field>
|
||||
<field name="context">{'res_id': user.company_id.id}</field>
|
||||
<field name="help">Fill in your company data (address, logo, bank accounts) so that it's printed on your reports. You can click on the button 'Preview Header' in order to check the header/footer of PDF documents.</field>
|
||||
</record>
|
||||
<record id="base_setup_company_todo" model="ir.actions.todo">
|
||||
<field name="action_id" ref="action_base_setup_company"/>
|
||||
|
|
|
|||
|
|
@ -20,10 +20,10 @@
|
|||
##############################################################################
|
||||
|
||||
{
|
||||
"name":"Server Object Synchronization",
|
||||
"name":"Multi-DB Synchronization",
|
||||
"version":"0.1",
|
||||
"author":"OpenERP SA",
|
||||
"category":"Hidden",
|
||||
"category":"Tools",
|
||||
"description": """
|
||||
Synchronization with all objects.
|
||||
=================================
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
"author": "OpenERP SA",
|
||||
"version": "1.0",
|
||||
"depends": ["base"],
|
||||
"category" : "Hidden",
|
||||
"category" : "Tools",
|
||||
'complexity': "easy",
|
||||
'description': """
|
||||
Common base for tools modules.
|
||||
|
|
|
|||
|
|
@ -22,7 +22,7 @@
|
|||
{
|
||||
'name': 'VAT Number Validation',
|
||||
'version': '1.0',
|
||||
'category': 'Hidden',
|
||||
"category": 'Accounting & Finance',
|
||||
'complexity': "easy",
|
||||
'description': """
|
||||
VAT validation for Partners' VAT numbers
|
||||
|
|
|
|||
|
|
@ -20,9 +20,9 @@
|
|||
##############################################################################
|
||||
|
||||
{
|
||||
'name': 'Dashboard Creator',
|
||||
'name': 'Dashboards',
|
||||
'version': '1.0',
|
||||
'category': 'Hidden',
|
||||
'category': 'Tools',
|
||||
'complexity': "normal",
|
||||
'description': """
|
||||
Lets the user create a custom dashboard.
|
||||
|
|
|
|||
|
|
@ -49,7 +49,7 @@ To access OpenERP Calendar using WebCal to remote site use the URL like:
|
|||
DATABASE_NAME: Name of database on which OpenERP Calendar is created
|
||||
CALENDAR_NAME: Name of calendar to access
|
||||
""",
|
||||
'category': 'Hidden',
|
||||
'category': 'Tools',
|
||||
"author" : "OpenERP SA",
|
||||
'website': 'http://www.openerp.com',
|
||||
"init_xml" : ["caldav_data.xml"],
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@
|
|||
"name" : "Claim from Delivery",
|
||||
"version" : "1.0",
|
||||
"author" : "OpenERP SA",
|
||||
"category" : "Hidden",
|
||||
'category': 'Sales Management',
|
||||
"depends" : ["base", "crm_claim", "stock"],
|
||||
"init_xml" : [],
|
||||
"demo_xml" : [],
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@
|
|||
|
||||
|
||||
{
|
||||
'name': 'Customer & Supplier Relationship Management',
|
||||
'name': 'Customer Relationship Management',
|
||||
'version': '1.0',
|
||||
'category': 'Customer Relationship Management',
|
||||
'complexity': "easy",
|
||||
|
|
@ -61,7 +61,8 @@ Creates a dashboard for CRM that includes:
|
|||
'mail',
|
||||
'base_calendar',
|
||||
'resource',
|
||||
'board'
|
||||
'board',
|
||||
'fetchmail'
|
||||
],
|
||||
'init_xml': [
|
||||
'crm_data.xml',
|
||||
|
|
@ -128,6 +129,7 @@ Creates a dashboard for CRM that includes:
|
|||
'test/ui/delete_lead.yml'
|
||||
],
|
||||
'installable': True,
|
||||
'application': True,
|
||||
'active': False,
|
||||
'certificate': '0079056041421',
|
||||
'images': ['images/sale_crm_crm_dashboard.png', 'images/crm_dashboard.jpeg','images/leads.jpeg','images/meetings.jpeg','images/opportunities.jpeg','images/outbound_calls.jpeg','images/stages.jpeg'],
|
||||
|
|
|
|||
|
|
@ -121,10 +121,10 @@
|
|||
<board style="1-1">
|
||||
<column>
|
||||
<action string="My Open Opportunities"
|
||||
name="%(act_my_oppor)d"/>
|
||||
name="%(act_my_oppor)d" creatable="true"/>
|
||||
<action
|
||||
string="My Meetings"
|
||||
name="%(act_my_meetings)d"/>
|
||||
name="%(act_my_meetings)d" creatable="true"/>
|
||||
</column>
|
||||
<column>
|
||||
<action string="My Planned Revenues by Stage"
|
||||
|
|
|
|||
|
|
@ -60,16 +60,23 @@
|
|||
<record model="ir.actions.act_window" id="crm_case_category_act_oppor11">
|
||||
<field name="name">Opportunities</field>
|
||||
<field name="res_model">crm.lead</field>
|
||||
<field name="view_mode">tree,form,graph,calendar,kanban</field>
|
||||
<field name="view_mode">kanban,tree,form,graph,calendar</field>
|
||||
<field name="domain">[('type','=','opportunity')]</field>
|
||||
<field name="context">{'search_default_user_id':uid,'search_default_new':1, 'search_default_open':1, 'search_default_section_id':section_id, 'stage_type': 'opportunity', 'default_type': 'opportunity'}</field>
|
||||
<field name="view_id" ref="crm_case_tree_view_oppor"/>
|
||||
<field name="view_id" eval="False"/>
|
||||
<field name="search_view_id" ref="crm.view_crm_case_opportunities_filter"/>
|
||||
<field name="help">With opportunities you can manage and keep track of your sales pipeline by creating specific customer- or prospect-related sales documents to follow up potential sales. Information such as expected revenue, opportunity stage, expected closing date, communication history and much more can be stored. Opportunities can be connected to the email gateway: new emails may create opportunities, each of them automatically gets the history of the conversation with the customer.
|
||||
|
||||
You and your team(s) will be able to plan meetings and phone calls from opportunities, convert them into quotations, manage related documents, track all customer related activities, and much more.</field>
|
||||
</record>
|
||||
|
||||
<record model="ir.actions.act_window.view" id="action_crm_tag_kanban_view_oppor11">
|
||||
<field name="sequence" eval="0"/>
|
||||
<field name="view_mode">kanban</field>
|
||||
<field name="view_id" ref="crm_case_kanban_view_leads"/>
|
||||
<field name="act_window_id" ref="crm_case_category_act_oppor11"/>
|
||||
</record>
|
||||
|
||||
<record model="ir.actions.act_window.view" id="action_crm_tag_tree_view_oppor11">
|
||||
<field name="sequence" eval="1"/>
|
||||
<field name="view_mode">tree</field>
|
||||
|
|
|
|||
|
|
@ -147,7 +147,7 @@
|
|||
<group colspan="4">
|
||||
<field colspan="4" name="email_cc" widget="char" size="512"/>
|
||||
</group>
|
||||
<field name="message_ids" colspan="4" nolabel="1" mode="tree,form" readonly="1">
|
||||
<field name="message_ids" colspan="4" nolabel="1" mode="tree" readonly="1">
|
||||
<tree string="History">
|
||||
<field name="display_text" string="History Information"/>
|
||||
<field name="email_from" invisible="1"/>
|
||||
|
|
@ -157,35 +157,6 @@
|
|||
context="{'mail.compose.message.mode':'reply', 'message_id':active_id}"
|
||||
icon="terp-mail-replied" type="action" />
|
||||
</tree>
|
||||
<form string="History">
|
||||
<group col="4" colspan="4">
|
||||
<group col="2" colspan="2" attrs="{'invisible': [('email_from', '=', False)]}">
|
||||
<field name="email_from"/>
|
||||
<field name="email_to" size="512"/>
|
||||
</group>
|
||||
<group col="2" colspan="2">
|
||||
<field name="date"/>
|
||||
<field name="email_cc" size="512" attrs="{'invisible': [('email_from', '=', False)]}"/>
|
||||
</group>
|
||||
<field name="subject" colspan="4" widget="char" attrs="{'invisible': [('email_from', '=', False)]}" size="512"/>
|
||||
<field name="display_text" colspan="4" attrs="{'invisible': [('email_from', '!=', False)]}"/>
|
||||
</group>
|
||||
<notebook colspan="4">
|
||||
<page string="Details" attrs="{'invisible': [('email_from', '=', False)]}">
|
||||
<field name="body_text" colspan="4" nolabel="1"/>
|
||||
<group attrs="{'invisible': [('email_from', '=', False)]}">
|
||||
<button colspan="4" string="Reply"
|
||||
name="%(mail.action_email_compose_message_wizard)d"
|
||||
context="{'mail.compose.message.mode':'reply'}"
|
||||
icon="terp-mail-replied" type="action"/>
|
||||
</group>
|
||||
|
||||
</page>
|
||||
<page string="Attachments" attrs="{'invisible': [('email_from', '=', False)]}">
|
||||
<field name="attachment_ids" colspan="4" readonly="1" nolabel="1"/>
|
||||
</page>
|
||||
</notebook>
|
||||
</form>
|
||||
</field>
|
||||
<button string="Add Internal Note"
|
||||
name="%(crm.action_crm_add_note)d"
|
||||
|
|
@ -578,7 +549,7 @@
|
|||
<group colspan="4">
|
||||
<field colspan="4" name="email_cc" widget="char" size="512"/>
|
||||
</group>
|
||||
<field name="message_ids" colspan="4" nolabel="1" mode="tree,form" readonly="1">
|
||||
<field name="message_ids" colspan="4" nolabel="1" mode="tree" readonly="1">
|
||||
<tree string="History">
|
||||
<field name="display_text" string="History Information"/>
|
||||
<field name="email_from" invisible="1"/>
|
||||
|
|
@ -588,34 +559,6 @@
|
|||
context="{'mail.compose.message.mode':'reply', 'message_id':active_id}"
|
||||
icon="terp-mail-replied" type="action" />
|
||||
</tree>
|
||||
<form string="History">
|
||||
<group col="4" colspan="4">
|
||||
<group col="2" colspan="2" attrs="{'invisible': [('email_from', '=', False)]}">
|
||||
<field name="email_from"/>
|
||||
<field name="email_to" size="512"/>
|
||||
</group>
|
||||
<group col="2" colspan="2">
|
||||
<field name="date"/>
|
||||
<field name="email_cc" size="512" attrs="{'invisible': [('email_from', '=', False)]}"/>
|
||||
</group>
|
||||
<field name="subject" colspan="4" widget="char" attrs="{'invisible': [('email_from', '=', False)]}" size="512"/>
|
||||
<field name="display_text" colspan="4" attrs="{'invisible': [('email_from', '!=', False)]}"/>
|
||||
</group>
|
||||
<notebook colspan="4">
|
||||
<page string="Details" attrs="{'invisible': [('email_from', '=', False)]}">
|
||||
<field name="body_text" colspan="4" nolabel="1"/>
|
||||
<group attrs="{'invisible': [('email_from', '=', False)]}">
|
||||
<button colspan="4" string="Reply"
|
||||
name="%(mail.action_email_compose_message_wizard)d"
|
||||
context="{'mail.compose.message.mode':'reply'}"
|
||||
icon="terp-mail-replied" type="action"/>
|
||||
</group>
|
||||
</page>
|
||||
<page string="Attachments" attrs="{'invisible': [('email_from', '=', False)]}">
|
||||
<field name="attachment_ids" colspan="4" readonly="1" nolabel="1"/>
|
||||
</page>
|
||||
</notebook>
|
||||
</form>
|
||||
</field>
|
||||
<button string="Add Internal Note"
|
||||
name="%(crm.action_crm_add_note)d"
|
||||
|
|
|
|||
|
|
@ -294,14 +294,18 @@
|
|||
<field name="arch" type="xml">
|
||||
<search string="Search Meetings">
|
||||
<group>
|
||||
<field name="name" string="Subject"/>
|
||||
<field name="partner_id"/>
|
||||
<field name="section_id" widget="selection">
|
||||
<field name="name" string="Meeting / Partner"
|
||||
domain="[('name','ilike',self), ('partner_id','ilike', self)]"/>
|
||||
<field name="user_id" groups="base.group_extended">
|
||||
<filter icon="terp-personal" groups="base.group_extended"
|
||||
domain="[('user_id','=',uid)]"
|
||||
help="My Meetings" />
|
||||
</field>
|
||||
<field name="section_id" widget="selection" groups="base.group_extended">
|
||||
<filter icon="terp-personal+" groups="base.group_extended"
|
||||
domain="['|', ('section_id', '=', context.get('section_id')), '|', ('section_id.user_id','=',uid), ('section_id.member_ids', 'in', [uid])]"
|
||||
domain="['|', ('section_id.user_id','=',uid), ('section_id.member_ids', 'in', [uid])]"
|
||||
help="My Sales Team(s)" />
|
||||
</field>
|
||||
<field name="user_id"/>
|
||||
</group>
|
||||
</search>
|
||||
</field>
|
||||
|
|
|
|||
|
|
@ -0,0 +1,46 @@
|
|||
# Arabic translation for openobject-addons
|
||||
# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
|
||||
# This file is distributed under the same license as the openobject-addons package.
|
||||
# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
|
||||
#
|
||||
msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: openobject-addons\n"
|
||||
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
|
||||
"POT-Creation-Date: 2011-01-11 11:15+0000\n"
|
||||
"PO-Revision-Date: 2011-12-05 08:17+0000\n"
|
||||
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
|
||||
"Language-Team: Arabic <ar@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: 2011-12-06 05:28+0000\n"
|
||||
"X-Generator: Launchpad (build 14435)\n"
|
||||
|
||||
#. module: crm_caldav
|
||||
#: model:ir.actions.act_window,name:crm_caldav.action_caldav_browse
|
||||
msgid "Caldav Browse"
|
||||
msgstr ""
|
||||
|
||||
#. module: crm_caldav
|
||||
#: model:ir.model,name:crm_caldav.model_crm_meeting
|
||||
msgid "Meeting"
|
||||
msgstr "إجتماعات"
|
||||
|
||||
#. module: crm_caldav
|
||||
#: model:ir.module.module,shortdesc:crm_caldav.module_meta_information
|
||||
msgid "Extended Module to Add CalDav feature on Meeting"
|
||||
msgstr ""
|
||||
|
||||
#. module: crm_caldav
|
||||
#: model:ir.module.module,description:crm_caldav.module_meta_information
|
||||
msgid ""
|
||||
"\n"
|
||||
" New Features in Meeting:\n"
|
||||
" * Share meeting with other calendar clients like sunbird\n"
|
||||
msgstr ""
|
||||
|
||||
#. module: crm_caldav
|
||||
#: model:ir.ui.menu,name:crm_caldav.menu_caldav_browse
|
||||
msgid "Synchronyze this calendar"
|
||||
msgstr ""
|
||||
|
|
@ -52,6 +52,7 @@ automatically new claims based on incoming emails.
|
|||
'test/ui/claim_demo.yml'
|
||||
],
|
||||
'installable': True,
|
||||
'application': True,
|
||||
'active': False,
|
||||
'certificate' : '00612027414703404749',
|
||||
'images': ['images/claim_categories.jpeg','images/claim_stages.jpeg','images/claims.jpeg'],
|
||||
|
|
|
|||
|
|
@ -151,7 +151,7 @@
|
|||
<group colspan="4">
|
||||
<field colspan="4" name="email_cc" string="Global CC" widget="char"/>
|
||||
</group>
|
||||
<field name="message_ids" colspan="4" nolabel="1" mode="tree,form" readonly="1">
|
||||
<field name="message_ids" colspan="4" nolabel="1" mode="tree" readonly="1">
|
||||
<tree string="History">
|
||||
<field name="display_text" string="History Information"/>
|
||||
<field name="email_from" invisible="1"/>
|
||||
|
|
@ -161,32 +161,6 @@
|
|||
context="{'mail.compose.message.mode':'reply'}"
|
||||
icon="terp-mail-replied" type="action" />
|
||||
</tree>
|
||||
<form string="Communication & History">
|
||||
<group col="4" colspan="4">
|
||||
<field name="email_from"/>
|
||||
<field name="date"/>
|
||||
<field name="email_to" widget="char" size="512"/>
|
||||
<field name="email_cc" widget="char" size="512"/>
|
||||
<field name="subject" colspan="4" widget="char" size="512"/>
|
||||
</group>
|
||||
<notebook colspan="4">
|
||||
<page string="Details">
|
||||
<group attrs="{'invisible': [('email_from', '=', False)]}">
|
||||
<field name="body_text" colspan="4" nolabel="1" height="250"/>
|
||||
<button colspan="4" string="Reply"
|
||||
name="%(mail.action_email_compose_message_wizard)d"
|
||||
context="{'mail.compose.message.mode':'reply', 'message_id':active_id}"
|
||||
icon="terp-mail-replied" type="action"/>
|
||||
</group>
|
||||
<group attrs="{'invisible': [('email_from', '!=', False)]}">
|
||||
<field name="display_text" colspan="4" nolabel="1" height="250"/>
|
||||
</group>
|
||||
</page>
|
||||
<page string="Attachments">
|
||||
<field name="attachment_ids" colspan="4" readonly="1" nolabel="1"/>
|
||||
</page>
|
||||
</notebook>
|
||||
</form>
|
||||
</field>
|
||||
<button string="Add Internal Note"
|
||||
name="%(crm.action_crm_add_note)d"
|
||||
|
|
|
|||
|
|
@ -53,6 +53,7 @@ fund status.
|
|||
],
|
||||
'test': ['test/process/fund-rising.yml'],
|
||||
'installable': True,
|
||||
'application': True,
|
||||
'active': False,
|
||||
'certificate' : '00871545204231528989',
|
||||
'images': ['images/fundraising_analysis.jpeg','images/fundraising_categories.jpeg','images/funds.jpeg'],
|
||||
|
|
|
|||
|
|
@ -136,7 +136,7 @@
|
|||
<group colspan="4">
|
||||
<field colspan="4" name="email_cc" string="Global CC" widget="char"/>
|
||||
</group>
|
||||
<field name="message_ids" colspan="4" nolabel="1" mode="tree,form" readonly="1">
|
||||
<field name="message_ids" colspan="4" nolabel="1" mode="tree" readonly="1">
|
||||
<tree string="History">
|
||||
<field name="display_text" string="History Information"/>
|
||||
<field name="email_from" invisible="1"/>
|
||||
|
|
@ -146,32 +146,6 @@
|
|||
context="{'mail.compose.message.mode':'reply', 'message_id':active_id}"
|
||||
icon="terp-mail-replied" type="action" />
|
||||
</tree>
|
||||
<form string="History">
|
||||
<group col="4" colspan="4">
|
||||
<field name="email_from"/>
|
||||
<field name="date"/>
|
||||
<field name="email_to" widget="char" size="512"/>
|
||||
<field name="email_cc" widget="char" size="512"/>
|
||||
<field name="subject" colspan="4" widget="char" size="512"/>
|
||||
</group>
|
||||
<notebook colspan="4">
|
||||
<page string="Details">
|
||||
<group attrs="{'invisible': [('email_from', '=', False)]}">
|
||||
<field name="body_text" colspan="4" nolabel="1" height="250"/>
|
||||
<button colspan="4" string="Reply"
|
||||
name="%(mail.action_email_compose_message_wizard)d"
|
||||
context="{'mail.compose.message.mode':'reply', 'message_id':active_id}"
|
||||
icon="terp-mail-replied" type="action"/>
|
||||
</group>
|
||||
<group attrs="{'invisible': [('email_from', '!=', False)]}">
|
||||
<field name="display_text" colspan="4" nolabel="1" height="250"/>
|
||||
</group>
|
||||
</page>
|
||||
<page string="Attachments">
|
||||
<field name="attachment_ids" colspan="4" readonly="1" nolabel="1"/>
|
||||
</page>
|
||||
</notebook>
|
||||
</form>
|
||||
</field>
|
||||
<button string="Add Internal Note"
|
||||
name="%(crm.action_crm_add_note)d"
|
||||
|
|
|
|||
|
|
@ -51,6 +51,7 @@ and categorize your interventions with a channel and a priority level.
|
|||
],
|
||||
'test': ['test/process/help-desk.yml'],
|
||||
'installable': True,
|
||||
'application': True,
|
||||
'active': False,
|
||||
'certificate' : '00830691522781519309',
|
||||
'images': ['images/helpdesk_analysis.jpeg','images/helpdesk_categories.jpeg','images/helpdesk_requests.jpeg'],
|
||||
|
|
|
|||
|
|
@ -96,7 +96,7 @@
|
|||
<group colspan="4">
|
||||
<field colspan="4" name="email_cc" string="Global CC" widget="char"/>
|
||||
</group>
|
||||
<field name="message_ids" colspan="4" nolabel="1" mode="tree,form" readonly="1">
|
||||
<field name="message_ids" colspan="4" nolabel="1" mode="tree" readonly="1">
|
||||
<tree string="History">
|
||||
<field name="display_text" string="History Information"/>
|
||||
<field name="email_from" invisible="1"/>
|
||||
|
|
@ -106,32 +106,6 @@
|
|||
context="{'mail.compose.message.mode':'reply', 'message_id':active_id}"
|
||||
icon="terp-mail-replied" type="action" />
|
||||
</tree>
|
||||
<form string="History">
|
||||
<group col="4" colspan="4">
|
||||
<field name="email_from"/>
|
||||
<field name="date"/>
|
||||
<field name="email_to" widget="char" size="512"/>
|
||||
<field name="email_cc" widget="char" size="512"/>
|
||||
<field name="subject" colspan="4" widget="char" size="512"/>
|
||||
</group>
|
||||
<notebook colspan="4">
|
||||
<page string="Details">
|
||||
<group attrs="{'invisible': [('email_from', '=', False)]}">
|
||||
<field name="body_text" colspan="4" nolabel="1" height="250"/>
|
||||
<button colspan="4" string="Reply"
|
||||
name="%(mail.action_email_compose_message_wizard)d"
|
||||
context="{'mail.compose.message.mode':'reply', 'message_id':active_id}"
|
||||
icon="terp-mail-replied" type="action"/>
|
||||
</group>
|
||||
<group attrs="{'invisible': [('email_from', '!=', False)]}">
|
||||
<field name="display_text" colspan="4" nolabel="1" height="250"/>
|
||||
</group>
|
||||
</page>
|
||||
<page string="Attachments">
|
||||
<field name="attachment_ids" colspan="4" readonly="1" nolabel="1"/>
|
||||
</page>
|
||||
</notebook>
|
||||
</form>
|
||||
</field>
|
||||
<button string="Add Internal Note"
|
||||
name="%(crm.action_crm_add_note)d"
|
||||
|
|
|
|||
|
|
@ -23,7 +23,7 @@
|
|||
{
|
||||
'name': 'Partner Geo-Localization',
|
||||
'version': '1.0',
|
||||
'category': 'Hidden',
|
||||
'category': 'Sales Management',
|
||||
'complexity': "normal",
|
||||
'description': """
|
||||
This is the module used by OpenERP SA to redirect customers to its partners, based on geolocalization.
|
||||
|
|
|
|||
|
|
@ -21,9 +21,9 @@
|
|||
|
||||
|
||||
{
|
||||
'name': 'To Do List',
|
||||
'name': 'CRM Todo Lists',
|
||||
'version': '1.0',
|
||||
'category': 'Customer Relationship Management',
|
||||
"category": 'Hidden/Link',
|
||||
'complexity': "easy",
|
||||
'description': """
|
||||
Todo list for CRM leads and opportunities.
|
||||
|
|
|
|||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue