diff --git a/addons/account/__openerp__.py b/addons/account/__openerp__.py
index c8d17c2cf9e..08122f5af30 100644
--- a/addons/account/__openerp__.py
+++ b/addons/account/__openerp__.py
@@ -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.
====================================
diff --git a/addons/account/account.py b/addons/account/account.py
index e41a5f2f280..a15a04dcffe 100644
--- a/addons/account/account.py
+++ b/addons/account/account.py
@@ -789,9 +789,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
@@ -880,7 +882,7 @@ class account_fiscalyear(osv.osv):
for fy in self.browse(cr, uid, ids, context=context):
ds = datetime.strptime(fy.date_start, '%Y-%m-%d')
period_obj.create(cr, uid, {
- 'name': _('Opening Period'),
+ 'name': "%s %s" % (_('Opening Period'), ds.strftime('%Y')),
'code': ds.strftime('00/%Y'),
'date_start': ds,
'date_stop': ds,
@@ -1223,7 +1225,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),
@@ -3154,7 +3156,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,
}
if line.currency_id:
vals_journal['view_id'] = view_id_cur
diff --git a/addons/account/account_bank.py b/addons/account/account_bank.py
index 01eab2fbb01..02270b94186 100644
--- a/addons/account/account_bank.py
+++ b/addons/account/account_bank.py
@@ -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
diff --git a/addons/account/account_bank_statement.py b/addons/account/account_bank_statement.py
index 57472e228ef..85d9805eb32 100644
--- a/addons/account/account_bank_statement.py
+++ b/addons/account/account_bank_statement.py
@@ -30,10 +30,12 @@ class account_bank_statement(osv.osv):
def create(self, cr, uid, vals, context=None):
seq = 0
if 'line_ids' in vals:
+ new_line_ids = []
for line in vals['line_ids']:
seq += 1
line[2]['sequence'] = seq
- vals[seq - 1] = line
+ new_line_ids += tuple(line)
+ vals['line_ids'] = new_line_ids
return super(account_bank_statement, self).create(cr, uid, vals, context=context)
def write(self, cr, uid, ids, vals, context=None):
diff --git a/addons/account/account_invoice.py b/addons/account/account_invoice.py
index 27881bf1280..39cc471c2f6 100644
--- a/addons/account/account_invoice.py
+++ b/addons/account/account_invoice.py
@@ -207,7 +207,7 @@ class account_invoice(osv.osv):
help=' * The \'Draft\' state is used when a user is encoding a new and unconfirmed Invoice. \
\n* The \'Pro-forma\' when invoice is in Pro-forma state,invoice does not have an invoice number. \
\n* The \'Open\' state is used when user create invoice,a invoice number is generated.Its in open state till user does not pay invoice. \
- \n* The \'Paid\' state is set automatically when invoice is paid.\
+ \n* The \'Paid\' state is set automatically when the invoice is paid. Its related journal entries may or may not be reconciled. \
\n* The \'Cancelled\' state is used when user cancel invoice.'),
'date_invoice': fields.date('Invoice Date', readonly=True, states={'draft':[('readonly',False)]}, select=True, help="Keep empty to use the current date"),
'date_due': fields.date('Due Date', states={'paid':[('readonly',True)], 'open':[('readonly',True)], 'close':[('readonly',True)]}, select=True,
@@ -257,7 +257,7 @@ class account_invoice(osv.osv):
'account.invoice': (lambda self, cr, uid, ids, c={}: ids, None, 50), # Check if we can remove ?
'account.move.line': (_get_invoice_from_line, None, 50),
'account.move.reconcile': (_get_invoice_from_reconcile, None, 50),
- }, help="The Journal Entry of the invoice have been totally reconciled with one or several Journal Entries of payment."),
+ }, help="It indicates that the invoice has been paid and the journal entry of the invoice has been reconciled with one or several journal entries of payment."),
'partner_bank_id': fields.many2one('res.partner.bank', 'Bank Account',
help='Bank Account Number, Company bank account if Invoice is customer or supplier refund, otherwise Partner bank account number.', readonly=True, states={'draft':[('readonly',False)]}),
'move_lines':fields.function(_get_lines, type='many2many', relation='account.move.line', string='Entry Lines'),
@@ -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 = []
diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index 16cd957a61e..0d664d45d32 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -171,8 +171,8 @@
-
-
+
+
diff --git a/addons/account/i18n/ar.po b/addons/account/i18n/ar.po
index 3b5edf1e87d..bbd4189dc8a 100644
--- a/addons/account/i18n/ar.po
+++ b/addons/account/i18n/ar.po
@@ -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-11-15 03:49+0000\n"
+"PO-Revision-Date: 2011-12-08 16:20+0000\n"
"Last-Translator: kifcaliph \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-16 05:21+0000\n"
-"X-Generator: Launchpad (build 14291)\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
@@ -24,7 +24,7 @@ msgstr "نظام الدفع"
#. module: account
#: view:account.journal:0
msgid "Other Configuration"
-msgstr "تعديلات أخرى"
+msgstr "إعدادات أخرى"
#. module: account
#: code:addons/account/wizard/account_open_closed_fiscalyear.py:40
@@ -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
@@ -193,7 +193,7 @@ msgstr "مصدر الحساب"
#. module: account
#: model:ir.actions.act_window,name:account.act_acc_analytic_acc_5_report_hr_timesheet_invoice_journal
msgid "All Analytic Entries"
-msgstr "كل السندات التحليلية"
+msgstr "كل القيود التحليلية"
#. module: account
#: model:ir.actions.act_window,name:account.action_view_created_invoice_dashboard
@@ -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
@@ -607,6 +607,8 @@ 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 ""
+"إذا قمت إلغاء تسوية العمليات، عليك أيضاً التحقق من كل الإجراءات المتعلقة لكل "
+"هذه المعاملات لأنهم لن يتم إيقافها"
#. module: account
#: view:analytic.entries.report:0
@@ -631,12 +633,12 @@ msgstr "سجل مركزي"
#. module: account
#: sql_constraint:account.sequence.fiscalyear:0
msgid "Main Sequence must be different from current !"
-msgstr ""
+msgstr "المسلسل الرئيسي لابد أن يختلف من الحالي !"
#. module: account
#: field:account.invoice.tax,tax_amount:0
msgid "Tax Code Amount"
-msgstr ""
+msgstr "مبلغ رمز الضريبة"
#. module: account
#: code:addons/account/account.py:2779
@@ -648,7 +650,7 @@ msgstr ""
#. module: account
#: help:account.bank.statement,balance_end_real:0
msgid "closing balance entered by the cashbox verifier"
-msgstr ""
+msgstr "رصيد الإغلاق من محقق النقدية"
#. module: account
#: view:account.period:0
@@ -659,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
@@ -688,7 +690,7 @@ msgstr "الشركة يجب ان تكون واحدة لجميع المدخلات
#: model:ir.actions.act_window,name:account.action_aged_receivable
#, python-format
msgid "Receivable Accounts"
-msgstr "حسابات القبض"
+msgstr "حسابات مدينة"
#. module: account
#: model:ir.model,name:account.model_account_report_general_ledger
@@ -756,7 +758,7 @@ msgstr "نوع"
#. module: account
#: model:ir.model,name:account.model_account_subscription_line
msgid "Account Subscription Line"
-msgstr ""
+msgstr "خط إشتراك الحساب"
#. module: account
#: help:account.invoice,reference:0
@@ -818,6 +820,8 @@ msgid ""
"Can not %s invoice which is already reconciled, invoice should be "
"unreconciled first. You can only Refund this invoice"
msgstr ""
+"لا يمكن لفاتورة %s حيث تمت تسويتها، يجب إلغاء التسوية أولاً. يمكنك رد "
+"الفاتورة فقط."
#. module: account
#: model:ir.actions.act_window,name:account.action_subscription_form_new
@@ -840,7 +844,7 @@ msgstr "الشريك التالي للموازنة"
msgid ""
"You can not do this modification on a confirmed entry ! Please note that you "
"can just change some non important fields !"
-msgstr ""
+msgstr "لا يمكنك التعديلات لقيد مؤكد ! يمكنك تحرير بعض الحقول غير المهمة فقط"
#. module: account
#: view:account.invoice.report:0
@@ -904,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
@@ -937,7 +941,7 @@ msgstr "مشتريات"
#. module: account
#: field:account.model,lines_id:0
msgid "Model Entries"
-msgstr ""
+msgstr "نموذج للقيود"
#. module: account
#: field:account.account,code:0
@@ -985,7 +989,7 @@ msgstr "اسم الحساب"
#: field:account.chart.template,property_reserve_and_surplus_account:0
#: field:res.company,property_reserve_and_surplus_account:0
msgid "Reserve and Profit/Loss Account"
-msgstr ""
+msgstr "حساب الإحتياطي و الربح و الخسارة"
#. module: account
#: field:report.account.receivable,name:0
@@ -1020,7 +1024,7 @@ msgstr ""
#. module: account
#: view:account.tax:0
msgid "Applicability Options"
-msgstr ""
+msgstr "خيارات التطابق"
#. module: account
#: report:account.partner.balance:0
@@ -1080,7 +1084,7 @@ msgstr ""
#. module: account
#: selection:account.move.line,centralisation:0
msgid "Credit Centralisation"
-msgstr ""
+msgstr "مركزية الدين"
#. module: account
#: model:ir.actions.act_window,help:account.action_invoice_tree2
@@ -1112,12 +1116,12 @@ msgstr "رمز الضرائب"
#. module: account
#: field:account.account,currency_mode:0
msgid "Outgoing Currencies Rate"
-msgstr ""
+msgstr "معدل العملات الصادرة"
#. module: account
#: help:account.move.line,move_id:0
msgid "The move of this entry line."
-msgstr ""
+msgstr "الحركة لخط هذا القيد"
#. module: account
#: field:account.move.line.reconcile,trans_nbr:0
@@ -1143,7 +1147,7 @@ msgstr "لا يمكنك تعديل/مسح يومية بقيود لهذه الف
#: help:account.invoice,origin:0
#: help:account.invoice.line,origin:0
msgid "Reference of the document that produced this invoice."
-msgstr ""
+msgstr "مرجع المستند لهذه الفاتورة"
#. module: account
#: view:account.analytic.line:0
@@ -1253,7 +1257,7 @@ msgstr "رصيد أول المدة"
#. module: account
#: view:account.invoice:0
msgid "Reset to Draft"
-msgstr ""
+msgstr "إعادة التعيين لمسودة"
#. module: account
#: view:wizard.multi.charts.accounts:0
@@ -1335,7 +1339,7 @@ msgstr "بحث الضرائب"
#. module: account
#: model:ir.model,name:account.model_account_analytic_cost_ledger
msgid "Account Analytic Cost Ledger"
-msgstr ""
+msgstr "حساب تحليل تكاليف الأستاذ"
#. module: account
#: view:account.model:0
@@ -1429,7 +1433,7 @@ msgstr "المحاسبة الإنجليزية"
#: selection:account.fiscalyear,state:0
#: selection:account.period,state:0
msgid "Closed"
-msgstr ""
+msgstr "مغلق"
#. module: account
#: model:ir.ui.menu,name:account.menu_finance_recurrent_entries
@@ -1485,7 +1489,7 @@ msgstr "ذهاب للشريك التالي"
#. module: account
#: view:account.bank.statement:0
msgid "Search Bank Statements"
-msgstr "بحث كشوف حسابات المصرف"
+msgstr "بحث كشوف حساب المصرف"
#. module: account
#: sql_constraint:account.model.line:0
@@ -1498,7 +1502,7 @@ msgstr ""
#: view:account.chart.template:0
#: field:account.chart.template,property_account_payable:0
msgid "Payable Account"
-msgstr "حساب الدائن"
+msgstr "حساب الدائنون"
#. module: account
#: field:account.tax,account_paid_id:0
@@ -1510,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
@@ -1554,7 +1558,7 @@ msgstr "فاتورة"
#: model:process.node,note:account.process_node_analytic0
#: model:process.node,note:account.process_node_analyticcost0
msgid "Analytic costs to invoice"
-msgstr "تحليل التكاليف للفاتورة"
+msgstr "تكاليف تحليلية للفاتورة"
#. module: account
#: view:ir.sequence:0
@@ -1564,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
@@ -1597,28 +1601,28 @@ 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
#: field:account.report.general.ledger,initial_balance:0
msgid "Include initial balances"
-msgstr ""
+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
msgid "This wizard will change the currency of the invoice"
-msgstr ""
+msgstr "هذا المعالج لتغيير العملة للفاتورة"
#. module: account
#: model:ir.actions.act_window,help:account.action_account_chart
@@ -1631,13 +1635,13 @@ msgstr ""
#. module: account
#: constraint:account.fiscalyear:0
msgid "Error! You cannot define overlapping fiscal years"
-msgstr ""
+msgstr "خطأ! لا يمكنك تعريف سنوات مالية متداخلة"
#. module: account
#: code:addons/account/account_move_line.py:808
#, python-format
msgid "The account is not defined to be reconciled !"
-msgstr ""
+msgstr "لم يعرف الحساب لتسويته !"
#. module: account
#: field:account.cashbox.line,pieces:0
@@ -1649,17 +1653,17 @@ msgstr "قيم"
msgid ""
"If the active field is set to False, it will allow you to hide the journal "
"period without removing it."
-msgstr ""
+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
@@ -1675,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
@@ -1685,7 +1689,7 @@ msgstr "كل الشركاء"
#. module: account
#: report:account.move.voucher:0
msgid "Ref. :"
-msgstr ""
+msgstr "مرجع:"
#. module: account
#: view:account.analytic.chart:0
@@ -1706,7 +1710,7 @@ msgstr "مرجع العميل"
#: code:addons/account/account_cash_statement.py:328
#, python-format
msgid "User %s does not have rights to access %s journal !"
-msgstr ""
+msgstr "المستخدم %s ليس لديه صلاحيات الكتابة و التحرير ليومية %s!"
#. module: account
#: help:account.period,special:0
@@ -1716,18 +1720,18 @@ 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
#, python-format
msgid "You cannot deactivate an account that contains account moves."
-msgstr ""
+msgstr "لا يمكنك إلغاء نشاط حساب إذا كان يحتوي علي حركات حساب."
#. module: account
#: field:account.move.line.reconcile,credit:0
@@ -1756,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
@@ -1794,7 +1798,7 @@ msgstr "قيد يومية"
#. module: account
#: view:account.tax:0
msgid "Tax Declaration: Invoices"
-msgstr ""
+msgstr "الإعلان الضريبي: الفواتير"
#. module: account
#: field:account.cashbox.line,subtotal:0
@@ -1852,7 +1856,7 @@ msgstr "حساب الإحتياطي و الأرباح و الخسائر"
#. module: account
#: help:account.bank.statement,balance_end:0
msgid "Closing balance based on Starting Balance and Cash Transactions"
-msgstr ""
+msgstr "رصيد الإغلاق بناءاً علي رصيد أول المدة و معاملات النقدية"
#. module: account
#: model:process.node,note:account.process_node_reconciliation0
@@ -1937,7 +1941,7 @@ msgstr "إلغاء تسوية القيود"
#. module: account
#: field:account.move.reconcile,line_partial_ids:0
msgid "Partial Entry lines"
-msgstr ""
+msgstr "سطور لقيود جزئية"
#. module: account
#: view:account.fiscalyear:0
@@ -2287,7 +2291,7 @@ msgstr "تمركز المدين"
#: view:account.invoice.confirm:0
#: model:ir.actions.act_window,name:account.action_account_invoice_confirm
msgid "Confirm Draft Invoices"
-msgstr ""
+msgstr "تأكيد الفواتير المسودة"
#. module: account
#: field:account.entries.report,day:0
@@ -2481,7 +2485,7 @@ msgstr ""
#: model:ir.actions.act_window,name:account.action_bank_statement_tree
#: model:ir.ui.menu,name:account.menu_bank_statement_tree
msgid "Bank Statements"
-msgstr "كشوف حسابات البنك"
+msgstr "كشوف حساب البنك"
#. module: account
#: selection:account.tax.template,applicable_type:0
@@ -2571,7 +2575,7 @@ msgstr ""
#: code:addons/account/wizard/account_use_model.py:81
#, python-format
msgid "You have to define an analytic journal on the '%s' journal!"
-msgstr ""
+msgstr "عليك بتعريف يومية تحليلية في يومية '%s' !"
#. module: account
#: view:account.invoice.tax:0
@@ -2618,7 +2622,7 @@ msgstr ""
#. module: account
#: report:account.move.voucher:0
msgid "Number:"
-msgstr ""
+msgstr "رقم:"
#. module: account
#: selection:account.print.journal,sort_selection:0
@@ -2672,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
@@ -2756,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
@@ -2801,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
@@ -2863,7 +2867,7 @@ msgstr ""
#. module: account
#: field:account.move.line,analytic_lines:0
msgid "Analytic lines"
-msgstr ""
+msgstr "سطور تحليلية"
#. module: account
#: model:process.node,name:account.process_node_electronicfile0
@@ -2873,12 +2877,12 @@ msgstr "ملف إالكتروني"
#. module: account
#: view:res.partner:0
msgid "Customer Credit"
-msgstr ""
+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
@@ -2898,7 +2902,7 @@ msgstr ""
#. module: account
#: view:account.tax.template:0
msgid "Tax Declaration"
-msgstr ""
+msgstr "الإعلان الضريبي"
#. module: account
#: help:account.account,currency_id:0
@@ -2928,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
@@ -3000,7 +3004,7 @@ msgstr "الشركاء الباقيين"
#: view:account.subscription:0
#: field:account.subscription,lines_id:0
msgid "Subscription Lines"
-msgstr ""
+msgstr "خطوط الإشتراك"
#. module: account
#: selection:account.analytic.journal,type:0
@@ -3019,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
@@ -3065,7 +3069,7 @@ msgstr ""
#. module: account
#: report:account.move.voucher:0
msgid "Journal:"
-msgstr ""
+msgstr "يومية:"
#. module: account
#: view:account.bank.statement:0
@@ -3117,7 +3121,7 @@ msgstr "سنة"
#. module: account
#: report:account.move.voucher:0
msgid "Authorised Signatory"
-msgstr ""
+msgstr "إمضاء المسؤول"
#. module: account
#: view:validate.account.move.lines:0
@@ -3147,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
@@ -3236,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
@@ -3274,7 +3278,7 @@ msgstr "شجرة الحسابات"
#. module: account
#: view:account.tax.chart:0
msgid "(If you do not select period it will take all open periods)"
-msgstr ""
+msgstr "( إذا لم تختار فترة فسيتم أخذ كل الفترات المفتوحة )"
#. module: account
#: field:account.journal,centralisation:0
@@ -3441,7 +3445,7 @@ msgstr "الكمية"
#. module: account
#: field:account.invoice.report,address_contact_id:0
msgid "Contact Address Name"
-msgstr ""
+msgstr "اسم عنوان جهة الإتصال"
#. module: account
#: field:account.move.line,blocked:0
@@ -3451,7 +3455,7 @@ msgstr "تقاضي"
#. module: account
#: view:account.analytic.line:0
msgid "Search Analytic Lines"
-msgstr ""
+msgstr "بحث الخطوط التحليلية"
#. module: account
#: field:res.partner,property_account_payable:0
@@ -3548,7 +3552,7 @@ msgstr "اسم"
#. module: account
#: model:ir.model,name:account.model_account_aged_trial_balance
msgid "Account Aged Trial balance Report"
-msgstr ""
+msgstr "ميزان المراجعة للحسابات المعمرة"
#. module: account
#: field:account.move.line,date:0
@@ -3990,7 +3994,7 @@ msgstr "إحصائيات الفواتير"
#. module: account
#: model:process.transition,note:account.process_transition_paymentorderreconcilation0
msgid "Bank statements are entered in the system."
-msgstr ""
+msgstr "كشوف حسابات البنك تم إدخالها في النظام."
#. module: account
#: code:addons/account/wizard/account_reconcile.py:133
@@ -4034,7 +4038,7 @@ msgstr "طباعة الفاتورة"
#. module: account
#: view:account.tax.template:0
msgid "Credit Notes"
-msgstr ""
+msgstr "أوراق دائنة"
#. module: account
#: code:addons/account/account.py:2067
@@ -4136,7 +4140,7 @@ msgstr ""
#. module: account
#: help:account.partner.ledger,reconcil:0
msgid "Consider reconciled entries"
-msgstr ""
+msgstr "نظر القيود المسواه"
#. module: account
#: model:ir.actions.act_window,name:account.action_validate_account_move_line
@@ -4162,7 +4166,7 @@ msgstr ""
#: constraint:account.account:0
#: constraint:account.tax.code:0
msgid "Error ! You can not create recursive accounts."
-msgstr ""
+msgstr "خطأ ! لا يمكن إنشاء حسابات تكرارية."
#. module: account
#: constraint:account.account:0
@@ -4213,7 +4217,7 @@ msgstr ""
#: code:addons/account/invoice.py:73
#, python-format
msgid "You must define an analytic journal of type '%s' !"
-msgstr ""
+msgstr "عليك بتعريف يومية تحليلية في يومية '%s' !"
#. module: account
#: code:addons/account/account.py:1397
@@ -4245,7 +4249,7 @@ msgstr ""
#. module: account
#: report:account.account.balance.landscape:0
msgid "Account Balance -"
-msgstr ""
+msgstr "رصيد الحساب -"
#. module: account
#: field:account.automatic.reconcile,date1:0
@@ -4344,7 +4348,7 @@ msgstr ""
#. module: account
#: model:process.transition,note:account.process_transition_suppliercustomerinvoice0
msgid "Draft invoices are validated. "
-msgstr ""
+msgstr "تم التحقق للفواتير المؤقتة. "
#. module: account
#: view:account.bank.statement:0
@@ -4385,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
@@ -4416,7 +4420,7 @@ msgstr ""
#: code:addons/account/wizard/account_report_common.py:126
#, python-format
msgid "Error"
-msgstr ""
+msgstr "خطأ"
#. module: account
#: field:account.analytic.Journal.report,date2:0
@@ -4510,7 +4514,7 @@ msgstr ""
#: code:addons/account/account.py:940
#, python-format
msgid "Start period should be smaller then End period"
-msgstr ""
+msgstr "بداية الفترة يجب أن تكون أقل من نهاية الفترة"
#. module: account
#: selection:account.automatic.reconcile,power:0
@@ -4629,7 +4633,7 @@ msgstr ""
#: code:addons/account/account.py:1167
#, python-format
msgid "Integrity Error !"
-msgstr ""
+msgstr "خطأ بالسلامة !"
#. module: account
#: field:account.tax.template,description:0
@@ -4815,18 +4819,18 @@ msgstr ""
#. module: account
#: view:account.move.line:0
msgid "Debit/Credit"
-msgstr ""
+msgstr "مدين / دائن"
#. module: account
#: view:report.hr.timesheet.invoice.journal:0
msgid "Analytic Entries Stats"
-msgstr ""
+msgstr "إحصائيات القيود التحليلية"
#. module: account
#: 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
@@ -4939,7 +4943,7 @@ msgstr ""
#: code:addons/account/wizard/account_move_journal.py:63
#, python-format
msgid "Configuration Error !"
-msgstr ""
+msgstr "خطأ في الإعدادات!"
#. module: account
#: help:account.partner.reconcile.process,to_reconcile:0
@@ -4952,12 +4956,12 @@ msgstr ""
#. module: account
#: view:account.subscription.line:0
msgid "Subscription lines"
-msgstr ""
+msgstr "خطوط الإشتراك"
#. module: account
#: field:account.entries.report,quantity:0
msgid "Products Quantity"
-msgstr ""
+msgstr "كمية المنتجات"
#. module: account
#: view:account.entries.report:0
@@ -4966,14 +4970,14 @@ msgstr ""
#: selection:account.move,state:0
#: view:account.move.line:0
msgid "Unposted"
-msgstr ""
+msgstr "غير مرحله"
#. module: account
#: view:account.change.currency:0
#: model:ir.actions.act_window,name:account.action_account_change_currency
#: model:ir.model,name:account.model_account_change_currency
msgid "Change Currency"
-msgstr ""
+msgstr "تغيير العملة"
#. module: account
#: model:process.node,note:account.process_node_accountingentries0
@@ -4984,7 +4988,7 @@ msgstr ""
#. module: account
#: view:account.invoice:0
msgid "Payment Date"
-msgstr ""
+msgstr "تاريخ الدفع"
#. module: account
#: selection:account.automatic.reconcile,power:0
@@ -4997,7 +5001,7 @@ msgstr ""
#: model:ir.actions.act_window,name:account.action_analytic_open
#: model:ir.ui.menu,name:account.account_analytic_def_account
msgid "Analytic Accounts"
-msgstr ""
+msgstr "حسابات تحليلية"
#. module: account
#: help:account.account.type,report_type:0
@@ -5024,7 +5028,7 @@ msgstr ""
#: field:account.model.line,amount_currency:0
#: field:account.move.line,amount_currency:0
msgid "Amount Currency"
-msgstr ""
+msgstr "مبلغ العملة"
#. module: account
#: code:addons/account/wizard/account_validate_account_move.py:39
@@ -5057,7 +5061,7 @@ msgstr ""
#. module: account
#: view:account.move.line:0
msgid "Number (Move)"
-msgstr ""
+msgstr "رقم (حركة)"
#. module: account
#: view:account.invoice.refund:0
@@ -5108,7 +5112,7 @@ msgstr ""
#: field:account.print.journal,amount_currency:0
#: field:account.report.general.ledger,amount_currency:0
msgid "With Currency"
-msgstr ""
+msgstr "مع العملة"
#. module: account
#: view:account.bank.statement:0
@@ -5134,7 +5138,7 @@ msgstr ""
#. module: account
#: view:board.board:0
msgid "Aged Receivables"
-msgstr ""
+msgstr "الديون المشكوك في تحصيلها"
#. module: account
#: model:ir.actions.act_window,name:account.action_account_automatic_reconcile
@@ -5186,7 +5190,7 @@ msgstr ""
#: model:ir.actions.act_window,name:account.action_account_analytic_journal_form
#: model:ir.ui.menu,name:account.account_def_analytic_journal
msgid "Analytic Journals"
-msgstr ""
+msgstr "يوميات تحليلية"
#. module: account
#: field:account.account,child_id:0
@@ -5203,12 +5207,12 @@ msgstr ""
#. module: account
#: field:res.partner,debit:0
msgid "Total Payable"
-msgstr ""
+msgstr "إجمالي مستحق الدفع"
#. module: account
#: model:ir.actions.act_window,name:account.action_account_analytic_account_line_extended_form
msgid "account.analytic.line.extended"
-msgstr ""
+msgstr "account.analytic.line.extended"
#. module: account
#: selection:account.bank.statement.line,type:0
@@ -5269,7 +5273,7 @@ msgstr ""
#: model:ir.actions.act_window,name:account.action_account_state_open
#: model:ir.model,name:account.model_account_state_open
msgid "Account State Open"
-msgstr ""
+msgstr "فتح حالة الحساب"
#. module: account
#: report:account.analytic.account.quantity_cost_ledger:0
@@ -5323,7 +5327,7 @@ msgstr ""
#: field:report.account.sales,period_id:0
#: field:report.account_type.sales,period_id:0
msgid "Force Period"
-msgstr ""
+msgstr "قوة الفترة"
#. module: account
#: view:account.invoice.report:0
@@ -5335,7 +5339,7 @@ msgstr ""
#: code:addons/account/wizard/account_change_currency.py:60
#, python-format
msgid "New currency is not confirured properly !"
-msgstr ""
+msgstr "العملة الجديدة لم يتم ضبطها بشكل صحيح !"
#. module: account
#: field:account.aged.trial.balance,filter:0
@@ -5354,7 +5358,7 @@ msgstr ""
#: field:account.report.general.ledger,filter:0
#: field:account.vat.declaration,filter:0
msgid "Filter by"
-msgstr ""
+msgstr "ترشيح بـ"
#. module: account
#: code:addons/account/account_move_line.py:1131
@@ -5379,7 +5383,7 @@ msgstr ""
#: model:ir.actions.act_window,name:account.action_account_general_journal
#: model:ir.model,name:account.model_account_general_journal
msgid "Account General Journal"
-msgstr ""
+msgstr "حساب اليومية العامة"
#. module: account
#: code:addons/account/report/common_report_header.py:100
@@ -5403,7 +5407,7 @@ msgstr ""
#. module: account
#: field:account.payment.term.line,days:0
msgid "Number of Days"
-msgstr ""
+msgstr "عدد الأيام"
#. module: account
#: selection:account.automatic.reconcile,power:0
@@ -5437,7 +5441,7 @@ msgstr ""
#: report:account.analytic.account.cost_ledger:0
#: report:account.analytic.account.quantity_cost_ledger:0
msgid "Printing date"
-msgstr ""
+msgstr "تاريخ الطباعة"
#. module: account
#: selection:account.account.type,close_method:0
@@ -5455,7 +5459,7 @@ msgstr ""
#: model:ir.actions.act_window,name:account.action_invoice_tree3
#: model:ir.ui.menu,name:account.menu_action_invoice_tree3
msgid "Customer Refunds"
-msgstr ""
+msgstr "رد للعملاء"
#. module: account
#: view:account.payment.term.line:0
@@ -5465,7 +5469,7 @@ msgstr ""
#. module: account
#: field:account.journal.period,name:0
msgid "Journal-Period Name"
-msgstr ""
+msgstr "اسم الفترة لليومية"
#. module: account
#: field:account.invoice.tax,factor_base:0
@@ -5501,7 +5505,7 @@ msgstr ""
#: model:ir.actions.act_window,name:account.action_analytic_entries_report
#: model:ir.ui.menu,name:account.menu_action_analytic_entries_report
msgid "Analytic Entries Analysis"
-msgstr ""
+msgstr "تحليل القيود التحليلية"
#. module: account
#: selection:account.aged.trial.balance,direction_selection:0
@@ -5511,7 +5515,7 @@ msgstr ""
#. module: account
#: view:account.analytic.line:0
msgid "Analytic Entry"
-msgstr ""
+msgstr "قيد تحليلي"
#. module: account
#: view:res.company:0
@@ -5738,7 +5742,7 @@ msgstr ""
#. module: account
#: field:account.journal,default_credit_account_id:0
msgid "Default Credit Account"
-msgstr ""
+msgstr "حساب الدائنون الإفتراضي"
#. module: account
#: view:account.installer:0
@@ -5748,7 +5752,7 @@ msgstr ""
#. module: account
#: view:account.payment.term.line:0
msgid " number of days: 30"
-msgstr ""
+msgstr " عدد الأيام: 30"
#. module: account
#: help:account.analytic.line,currency_id:0
@@ -5793,18 +5797,18 @@ msgstr ""
#. module: account
#: view:project.account.analytic.line:0
msgid "View Account Analytic Lines"
-msgstr ""
+msgstr "عرض خطوط الحساب التحليلي"
#. module: account
#: selection:account.account.type,report_type:0
msgid "Balance Sheet (Liability Accounts)"
-msgstr ""
+msgstr "الميزانية (لحسابات الأصول)"
#. module: account
#: field:account.invoice,internal_number:0
#: field:report.invoice.created,number:0
msgid "Invoice Number"
-msgstr ""
+msgstr "رقم الفاتورة"
#. module: account
#: help:account.tax,include_base_amount:0
@@ -5822,7 +5826,7 @@ msgstr ""
#: model:ir.actions.act_window,name:account.action_account_analytic_invert_balance
#: model:ir.actions.report.xml,name:account.account_analytic_account_inverted_balance
msgid "Inverted Analytic Balance"
-msgstr ""
+msgstr "الرصيد التحليلي المعكوس"
#. module: account
#: field:account.tax.template,applicable_type:0
@@ -5854,7 +5858,7 @@ msgstr ""
#: model:ir.actions.act_window,name:account.action_account_analytic_journal_open_form
#: model:ir.ui.menu,name:account.account_analytic_journal_entries
msgid "Analytic Journal Items"
-msgstr ""
+msgstr "عناصر اليومية التحليلية"
#. module: account
#: view:account.fiscalyear.close:0
@@ -5900,7 +5904,7 @@ msgstr ""
#: code:addons/account/wizard/account_report_aged_partner_balance.py:57
#, python-format
msgid "Enter a Start date !"
-msgstr ""
+msgstr "أدخل تاريخ البدء !"
#. module: account
#: report:account.invoice:0
@@ -5918,7 +5922,7 @@ msgstr ""
#. module: account
#: field:account.bank.statement,move_line_ids:0
msgid "Entry lines"
-msgstr ""
+msgstr "سطور القيود"
#. module: account
#: field:account.move.line,centralisation:0
@@ -5988,7 +5992,7 @@ msgstr ""
#: model:ir.actions.report.xml,name:account.analytic_journal_print
#: model:ir.model,name:account.model_account_analytic_journal
msgid "Analytic Journal"
-msgstr ""
+msgstr "يومية تحليلية"
#. module: account
#: view:account.entries.report:0
@@ -6037,7 +6041,7 @@ msgstr ""
#. module: account
#: model:ir.model,name:account.model_analytic_entries_report
msgid "Analytic Entries Statistics"
-msgstr ""
+msgstr "إحصائيات القيود التحليلية"
#. module: account
#: code:addons/account/account_analytic_line.py:143
@@ -6049,7 +6053,7 @@ msgstr ""
#. module: account
#: view:account.use.model:0
msgid "Create manual recurring entries in a chosen journal."
-msgstr ""
+msgstr "إنشاء قيد يومية تكرارية يدوياً في يومية مختارة."
#. module: account
#: code:addons/account/account.py:1393
@@ -6087,7 +6091,7 @@ msgstr ""
#: code:addons/account/account_move_line.py:1003
#, python-format
msgid "Total debit"
-msgstr ""
+msgstr "إجمالي الخصم"
#. module: account
#: code:addons/account/account_move_line.py:781
@@ -6193,7 +6197,7 @@ msgstr ""
#. module: account
#: selection:account.journal.period,state:0
msgid "Printed"
-msgstr ""
+msgstr "مطبوع"
#. module: account
#: view:account.analytic.line:0
@@ -6290,7 +6294,7 @@ msgstr ""
#: code:addons/account/wizard/account_change_currency.py:65
#, python-format
msgid "Currnt currency is not confirured properly !"
-msgstr ""
+msgstr "العملة الجديدة لم يتم ضبطها بشكل صحيح !"
#. module: account
#: model:ir.model,name:account.model_account_move_reconcile
@@ -6310,7 +6314,7 @@ msgstr ""
#: model:ir.actions.report.xml,name:account.account_general_ledger
#: model:ir.ui.menu,name:account.menu_general_ledger
msgid "General Ledger"
-msgstr ""
+msgstr "الأستاذ العام"
#. module: account
#: model:process.transition,note:account.process_transition_paymentorderbank0
@@ -6358,7 +6362,7 @@ msgstr ""
#: report:account.invoice:0
#: report:account.partner.balance:0
msgid "Total:"
-msgstr ""
+msgstr "الإجمالي:"
#. module: account
#: code:addons/account/account.py:2050
@@ -6401,7 +6405,7 @@ msgstr ""
#: model:ir.actions.act_window,name:account.action_invoice_tree1
#: model:ir.ui.menu,name:account.menu_action_invoice_tree1
msgid "Customer Invoices"
-msgstr "فواتير العميل"
+msgstr "فواتير العملاء"
#. module: account
#: field:account.move.line.reconcile,writeoff:0
@@ -6411,7 +6415,7 @@ msgstr ""
#. module: account
#: view:account.analytic.line:0
msgid "Sales"
-msgstr ""
+msgstr "المبيعات"
#. module: account
#: view:account.journal.column:0
@@ -6430,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
@@ -6460,7 +6464,7 @@ msgstr ""
#. module: account
#: model:ir.actions.act_window,name:account.act_account_acount_move_line_open_unreconciled
msgid "Unreconciled Entries"
-msgstr ""
+msgstr "قيود غير مسواه"
#. module: account
#: model:ir.ui.menu,name:account.menu_menu_Bank_process
@@ -6491,7 +6495,7 @@ msgstr ""
#: view:analytic.entries.report:0
#: field:analytic.entries.report,product_uom_id:0
msgid "Product UOM"
-msgstr ""
+msgstr "وحدة قياس المنتج"
#. module: account
#: model:ir.actions.act_window,help:account.action_view_bank_statement_tree
@@ -6528,7 +6532,7 @@ msgstr ""
#: view:account.move:0
#: view:account.move.line:0
msgid "Analytic Lines"
-msgstr ""
+msgstr "سطور تحليلية"
#. module: account
#: model:ir.actions.act_window,help:account.action_account_analytic_account_tree2
@@ -6579,7 +6583,7 @@ msgstr ""
#. module: account
#: field:account.account.template,parent_id:0
msgid "Parent Account Template"
-msgstr ""
+msgstr "قالب حساب رئيسي"
#. module: account
#: view:account.bank.statement:0
@@ -6638,7 +6642,7 @@ msgstr ""
#. module: account
#: help:res.partner,credit:0
msgid "Total amount this customer owes you."
-msgstr ""
+msgstr "إجمالي المبلغ المدين لهذا العميل لك."
#. module: account
#: model:ir.model,name:account.model_ir_sequence
@@ -6660,12 +6664,12 @@ msgstr ""
#: code:addons/account/report/account_partner_balance.py:115
#, python-format
msgid "Unknown Partner"
-msgstr ""
+msgstr "شريك مجهول"
#. module: account
#: view:account.bank.statement:0
msgid "Opening Balance"
-msgstr ""
+msgstr "رصيد أول المدة"
#. module: account
#: help:account.journal,centralisation:0
@@ -6678,7 +6682,7 @@ msgstr ""
#. module: account
#: field:account.bank.statement,closing_date:0
msgid "Closed On"
-msgstr ""
+msgstr "إقفال يوم"
#. module: account
#: model:ir.model,name:account.model_account_bank_statement_line
@@ -6875,7 +6879,7 @@ msgstr ""
#. module: account
#: view:account.move.line:0
msgid "Optional Information"
-msgstr ""
+msgstr "معلومات خيارية"
#. module: account
#: view:account.analytic.line:0
@@ -6914,13 +6918,13 @@ msgstr ""
#: code:addons/account/installer.py:432
#, python-format
msgid "Sales Journal"
-msgstr ""
+msgstr "يومية المبيعات"
#. module: account
#: code:addons/account/wizard/account_move_journal.py:104
#, python-format
msgid "Open Journal Items !"
-msgstr ""
+msgstr "فتح عناصر اليومية !"
#. module: account
#: model:ir.model,name:account.model_account_invoice_tax
@@ -6937,7 +6941,7 @@ msgstr ""
#: view:product.product:0
#: view:product.template:0
msgid "Sales Properties"
-msgstr ""
+msgstr "خصائص المبيعات"
#. module: account
#: model:ir.ui.menu,name:account.menu_manual_reconcile
@@ -6947,7 +6951,7 @@ msgstr ""
#. module: account
#: report:account.overdue:0
msgid "Total amount due:"
-msgstr ""
+msgstr "إجمالي المبلغ المستحق:"
#. module: account
#: field:account.analytic.chart,to_date:0
@@ -6986,7 +6990,7 @@ msgstr ""
#: code:addons/account/report/account_partner_balance.py:304
#, python-format
msgid "Payable Accounts"
-msgstr ""
+msgstr "حسابات الدائنون"
#. module: account
#: model:ir.model,name:account.model_account_chart_template
@@ -7044,7 +7048,7 @@ msgstr ""
#. module: account
#: model:ir.model,name:account.model_account_bs_report
msgid "Account Balance Sheet Report"
-msgstr ""
+msgstr "تقرير الميزانية للحسابات"
#. module: account
#: help:account.tax,price_include:0
@@ -7062,7 +7066,7 @@ msgstr ""
#. module: account
#: view:report.account_type.sales:0
msgid "Sales by Account type"
-msgstr ""
+msgstr "المبيعات حسب نوع الحساب"
#. module: account
#: help:account.invoice,move_id:0
@@ -7087,7 +7091,7 @@ msgstr ""
#. module: account
#: view:account.payment.term.line:0
msgid " number of days: 14"
-msgstr ""
+msgstr " عدد الأيام: 14"
#. module: account
#: view:analytic.entries.report:0
@@ -7108,7 +7112,7 @@ msgstr "أصل"
#. module: account
#: field:account.installer.modules,account_analytic_plans:0
msgid "Multiple Analytic Plans"
-msgstr ""
+msgstr "خطط تحليلية متعددة"
#. module: account
#: help:account.payment.term.line,days2:0
@@ -7178,7 +7182,7 @@ msgstr ""
#: code:addons/account/invoice.py:720
#, python-format
msgid "Warning !"
-msgstr ""
+msgstr "تحذير !"
#. module: account
#: field:account.entries.report,move_line_state:0
@@ -7195,7 +7199,7 @@ msgstr ""
#: view:account.subscription.generate:0
#: model:ir.model,name:account.model_account_subscription_generate
msgid "Subscription Compute"
-msgstr ""
+msgstr "حساب الإشتراك"
#. module: account
#: report:account.move.voucher:0
@@ -7229,7 +7233,7 @@ msgstr ""
#. module: account
#: help:account.change.currency,currency_id:0
msgid "Select a currency to apply on the invoice"
-msgstr ""
+msgstr "اختر عملة للفاتورة"
#. module: account
#: code:addons/account/wizard/account_invoice_refund.py:100
@@ -7241,7 +7245,7 @@ msgstr ""
#: code:addons/account/invoice.py:787
#, python-format
msgid "No Invoice Lines !"
-msgstr ""
+msgstr "لا سطور للفاتورة !"
#. module: account
#: view:account.bank.statement:0
@@ -7261,7 +7265,7 @@ msgstr ""
#: field:account.subscription,state:0
#: field:report.invoice.created,state:0
msgid "State"
-msgstr ""
+msgstr "الحالة"
#. module: account
#: help:account.open.closed.fiscalyear,fyear_id:0
@@ -7324,7 +7328,7 @@ msgstr ""
#. module: account
#: report:account.analytic.account.inverted.balance:0
msgid "Inverted Analytic Balance -"
-msgstr ""
+msgstr "رصيد تحليلي معكوس -"
#. module: account
#: view:account.move.bank.reconcile:0
@@ -7357,7 +7361,7 @@ msgstr ""
#: view:account.invoice:0
#: field:account.invoice,comment:0
msgid "Additional Information"
-msgstr ""
+msgstr "معلومات أضافية"
#. module: account
#: view:account.installer:0
@@ -7368,7 +7372,7 @@ msgstr ""
#: view:account.invoice.report:0
#: field:account.invoice.report,residual:0
msgid "Total Residual"
-msgstr ""
+msgstr "إجمالي المتبقي"
#. module: account
#: model:process.node,note:account.process_node_invoiceinvoice0
@@ -7480,7 +7484,7 @@ msgstr ""
#. module: account
#: report:account.invoice:0
msgid "Net Total:"
-msgstr ""
+msgstr "صافي الإجمالي:"
#. module: account
#: model:ir.ui.menu,name:account.menu_finance_generic_reporting
@@ -7553,7 +7557,7 @@ msgstr ""
#. module: account
#: field:account.account,company_currency_id:0
msgid "Company Currency"
-msgstr ""
+msgstr "عملة الشركة"
#. module: account
#: model:process.node,name:account.process_node_paymententries0
@@ -7585,12 +7589,12 @@ msgstr ""
#. module: account
#: model:ir.model,name:account.model_account_analytic_inverted_balance
msgid "Account Analytic Inverted Balance"
-msgstr ""
+msgstr "رصيد للحساب التحليلي المعكوس"
#. module: account
#: model:ir.model,name:account.model_account_common_report
msgid "Account Common Report"
-msgstr ""
+msgstr "تقرير مشترك للحساب"
#. module: account
#: model:process.transition,name:account.process_transition_filestatement0
@@ -7612,13 +7616,13 @@ msgstr ""
#: model:ir.actions.act_window,name:account.action_account_type_form
#: model:ir.ui.menu,name:account.menu_action_account_type_form
msgid "Account Types"
-msgstr ""
+msgstr "أنواع الحساب"
#. module: account
#: code:addons/account/invoice.py:897
#, python-format
msgid "Cannot create invoice move on centralised journal"
-msgstr ""
+msgstr "لا يمكن إنشاء حركة فاتورة حيث اليومية مركزية"
#. module: account
#: field:account.account.type,report_type:0
@@ -7643,17 +7647,17 @@ msgstr ""
#: view:account.chart.template:0
#: field:account.chart.template,property_account_receivable:0
msgid "Receivable Account"
-msgstr ""
+msgstr "حساب المدينون"
#. module: account
#: view:account.bank.statement:0
msgid "CashBox Balance"
-msgstr ""
+msgstr "رصيد صندوق النقدية"
#. module: account
#: model:ir.model,name:account.model_account_fiscalyear_close_state
msgid "Fiscalyear Close state"
-msgstr ""
+msgstr "حالة إغلاق السنة المالية"
#. module: account
#: field:account.invoice.refund,journal_id:0
@@ -7673,7 +7677,7 @@ msgstr ""
#: report:pl.account:0
#: report:pl.account.horizontal:0
msgid "Filter By"
-msgstr ""
+msgstr "ترشيح بـ"
#. module: account
#: model:ir.actions.act_window,help:account.action_invoice_tree1
@@ -7689,7 +7693,7 @@ msgstr ""
#: view:board.board:0
#: model:ir.actions.act_window,name:account.action_company_analysis_tree
msgid "Company Analysis"
-msgstr ""
+msgstr "تحليل الشركة"
#. module: account
#: help:account.invoice,account_id:0
@@ -7706,14 +7710,14 @@ msgstr ""
#. module: account
#: model:ir.model,name:account.model_account_payment_term_line
msgid "Payment Term Line"
-msgstr ""
+msgstr "سطر شروط السداد"
#. module: account
#: code:addons/account/account.py:2794
#: code:addons/account/installer.py:452
#, python-format
msgid "Purchase Journal"
-msgstr ""
+msgstr "يومية المشتريات"
#. module: account
#: view:account.invoice.refund:0
@@ -7723,17 +7727,17 @@ msgstr ""
#. module: account
#: field:account.invoice.line,price_subtotal:0
msgid "Subtotal"
-msgstr ""
+msgstr "المجموع الفرعي"
#. module: account
#: view:account.vat.declaration:0
msgid "Print Tax Statement"
-msgstr ""
+msgstr "طباعة كشف الضريبة"
#. module: account
#: view:account.model.line:0
msgid "Journal Entry Model Line"
-msgstr ""
+msgstr "خط نموذج قيد اليومية"
#. module: account
#: view:account.invoice:0
@@ -7742,7 +7746,7 @@ msgstr ""
#: field:account.invoice.report,date_due:0
#: field:report.invoice.created,date_due:0
msgid "Due Date"
-msgstr ""
+msgstr "تاريخ الإستحقاق"
#. module: account
#: model:ir.ui.menu,name:account.menu_account_supplier
@@ -7759,12 +7763,12 @@ msgstr ""
#. module: account
#: view:account.journal:0
msgid "Accounts Type Allowed (empty for no control)"
-msgstr ""
+msgstr "أنواع الحسابات المسموحة (فارغ للغير رقابية)"
#. module: account
#: view:res.partner:0
msgid "Supplier Accounting Properties"
-msgstr ""
+msgstr "خصائص محاسبة المورد"
#. module: account
#: help:account.move.line,amount_residual:0
@@ -7776,23 +7780,23 @@ msgstr ""
#. module: account
#: view:account.payment.term.line:0
msgid " valuation: balance"
-msgstr ""
+msgstr " التقييم: رصيد"
#. module: account
#: view:account.tax.code:0
msgid "Statistics"
-msgstr ""
+msgstr "إحصائيات"
#. module: account
#: field:account.analytic.chart,from_date:0
#: field:project.account.analytic.line,from_date:0
msgid "From"
-msgstr ""
+msgstr "من"
#. module: account
#: model:ir.model,name:account.model_account_fiscalyear_close
msgid "Fiscalyear Close"
-msgstr ""
+msgstr "إغلاق السنة المالية"
#. module: account
#: sql_constraint:account.account:0
@@ -7802,18 +7806,18 @@ msgstr ""
#. module: account
#: model:ir.actions.act_window,name:account.act_account_journal_2_account_invoice_opened
msgid "Unpaid Invoices"
-msgstr ""
+msgstr "فواتير غير مدفوعة"
#. module: account
#: field:account.move.line.reconcile,debit:0
msgid "Debit amount"
-msgstr ""
+msgstr "المبلغ المدين"
#. module: account
#: view:board.board:0
#: model:ir.actions.act_window,name:account.action_treasory_graph
msgid "Treasury"
-msgstr ""
+msgstr "الخزينة"
#. module: account
#: view:account.aged.trial.balance:0
@@ -7824,7 +7828,7 @@ msgstr ""
#: view:account.analytic.inverted.balance:0
#: view:account.common.report:0
msgid "Print"
-msgstr ""
+msgstr "طباعة"
#. module: account
#: view:account.journal:0
@@ -7836,30 +7840,30 @@ msgstr ""
#: model:ir.actions.act_window,name:account.action_account_analytic_chart
#: model:ir.ui.menu,name:account.menu_action_analytic_account_tree2
msgid "Chart of Analytic Accounts"
-msgstr ""
+msgstr "شجرة الحسابات التحليلية"
#. module: account
#: model:ir.ui.menu,name:account.menu_configuration_misc
msgid "Miscellaneous"
-msgstr ""
+msgstr "متفرقات"
#. module: account
#: help:res.partner,debit:0
msgid "Total amount you have to pay to this supplier."
-msgstr ""
+msgstr "إجمالي المبلغ الواجب دفعه لهذا المورد."
#. module: account
#: model:process.node,name:account.process_node_analytic0
#: model:process.node,name:account.process_node_analyticcost0
msgid "Analytic Costs"
-msgstr ""
+msgstr "تكاليف تحليلية"
#. module: account
#: field:account.analytic.journal,name:0
#: report:account.general.journal:0
#: field:account.journal,name:0
msgid "Journal Name"
-msgstr ""
+msgstr "اسم اليومية"
#. module: account
#: help:account.invoice,internal_number:0
@@ -7880,12 +7884,12 @@ msgstr ""
#: code:addons/account/account_move_line.py:1214
#, python-format
msgid "Bad account!"
-msgstr ""
+msgstr "حساب سئ!"
#. module: account
#: help:account.chart,fiscalyear:0
msgid "Keep empty for all open fiscal years"
-msgstr ""
+msgstr "اتركه فارغ لكل السنوات المالية المفتوحة"
#. module: account
#: code:addons/account/account_move_line.py:1056
@@ -7926,13 +7930,13 @@ msgstr ""
#: field:report.account_type.sales,currency_id:0
#: field:report.invoice.created,currency_id:0
msgid "Currency"
-msgstr ""
+msgstr "عملة"
#. module: account
#: 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
@@ -7954,12 +7958,12 @@ msgstr ""
#. module: account
#: model:ir.actions.act_window,name:account.act_account_acount_move_line_reconcile_open
msgid "Reconciled entries"
-msgstr ""
+msgstr "قيود مسواه"
#. module: account
#: field:account.invoice,address_contact_id:0
msgid "Contact Address"
-msgstr ""
+msgstr "عنوان جهة الإتصال"
#. module: account
#: help:account.invoice,state:0
@@ -7977,34 +7981,34 @@ msgstr ""
#. module: account
#: field:account.invoice.refund,period:0
msgid "Force period"
-msgstr ""
+msgstr "قوة الفترة"
#. module: account
#: model:ir.model,name:account.model_account_partner_balance
msgid "Print Account Partner Balance"
-msgstr ""
+msgstr "طباعة رصيد حساب الشريك"
#. module: account
#: field:res.partner,contract_ids:0
msgid "Contracts"
-msgstr ""
+msgstr "عقود"
#. module: account
#: field:account.cashbox.line,ending_id:0
#: field:account.cashbox.line,starting_id:0
#: field:account.entries.report,reconcile_id:0
msgid "unknown"
-msgstr ""
+msgstr "مجهول"
#. module: account
#: field:account.fiscalyear.close,journal_id:0
msgid "Opening Entries Journal"
-msgstr ""
+msgstr "يومية القيود الإفتتاحية"
#. module: account
#: model:process.transition,note:account.process_transition_customerinvoice0
msgid "Draft invoices are checked, validated and printed."
-msgstr ""
+msgstr "تم التعليم و التحقق و طباعة الفواتير المؤقتة"
#. module: account
#: help:account.chart.template,property_reserve_and_surplus_account:0
@@ -8017,12 +8021,12 @@ msgstr ""
#. module: account
#: field:account.invoice,reference_type:0
msgid "Reference Type"
-msgstr ""
+msgstr "نوع المرجع"
#. module: account
#: view:account.analytic.cost.ledger.journal.report:0
msgid "Cost Ledger for period"
-msgstr ""
+msgstr "أستاذ التكاليف لفترة"
#. module: account
#: help:account.tax,child_depend:0
@@ -8035,12 +8039,12 @@ msgstr ""
#. module: account
#: selection:account.tax,applicable_type:0
msgid "Given by Python Code"
-msgstr ""
+msgstr "معطي بلغة البايثون"
#. module: account
#: field:account.analytic.journal,code:0
msgid "Journal Code"
-msgstr ""
+msgstr "رمز اليومية"
#. module: account
#: help:account.tax.code,sign:0
@@ -8055,19 +8059,19 @@ msgstr ""
#: field:account.move.line,amount_residual:0
#: field:account.move.line,amount_residual_currency:0
msgid "Residual Amount"
-msgstr ""
+msgstr "المبلغ المتبقي"
#. module: account
#: field:account.invoice,move_lines:0
#: field:account.move.reconcile,line_id:0
msgid "Entry Lines"
-msgstr ""
+msgstr "سطور القيود"
#. module: account
#: model:ir.actions.act_window,name:account.action_open_journal_button
#: model:ir.actions.act_window,name:account.action_validate_account_move
msgid "Open Journal"
-msgstr ""
+msgstr "فتح اليومية"
#. module: account
#: report:account.analytic.account.journal:0
@@ -8079,14 +8083,14 @@ msgstr ""
#: report:account.analytic.account.journal:0
#: report:account.analytic.account.quantity_cost_ledger:0
msgid "Period from"
-msgstr ""
+msgstr "من الفترة"
#. module: account
#: code:addons/account/account.py:2817
#: code:addons/account/installer.py:476
#, python-format
msgid "Sales Refund Journal"
-msgstr ""
+msgstr "يومية رد المبيعات"
#. module: account
#: code:addons/account/account.py:927
@@ -8101,12 +8105,12 @@ msgstr ""
#: view:account.move.line:0
#: view:account.payment.term:0
msgid "Information"
-msgstr ""
+msgstr "معلومات"
#. module: account
#: model:process.node,note:account.process_node_bankstatement0
msgid "Registered payment"
-msgstr ""
+msgstr "دفع مسجل"
#. module: account
#: view:account.fiscalyear.close.state:0
@@ -8116,7 +8120,7 @@ msgstr ""
#. module: account
#: view:account.analytic.line:0
msgid "Product Information"
-msgstr ""
+msgstr "معلومات المنتج"
#. module: account
#: report:account.analytic.account.journal:0
@@ -8124,34 +8128,34 @@ msgstr ""
#: view:account.move.line:0
#: model:ir.ui.menu,name:account.next_id_40
msgid "Analytic"
-msgstr ""
+msgstr "تحليلي"
#. module: account
#: model:process.node,name:account.process_node_invoiceinvoice0
#: model:process.node,name:account.process_node_supplierinvoiceinvoice0
msgid "Create Invoice"
-msgstr ""
+msgstr "إنشاء فاتورة"
#. module: account
#: field:account.installer,purchase_tax:0
msgid "Purchase Tax(%)"
-msgstr ""
+msgstr "ضريبة المشتريات (%)"
#. module: account
#: code:addons/account/invoice.py:787
#, python-format
msgid "Please create some invoice lines."
-msgstr ""
+msgstr "قم بإنشاء سطور للفاتورة."
#. module: account
#: report:account.overdue:0
msgid "Dear Sir/Madam,"
-msgstr ""
+msgstr "عزيزي سيدي / سيدتي،"
#. module: account
#: view:account.installer.modules:0
msgid "Configure Your Accounting Application"
-msgstr ""
+msgstr "إعداد التطبيق المحاسبي الخاص بك"
#. module: account
#: code:addons/account/account.py:2820
@@ -8180,12 +8184,12 @@ msgstr ""
#: field:account.period,date_stop:0
#: model:ir.ui.menu,name:account.menu_account_end_year_treatments
msgid "End of Period"
-msgstr ""
+msgstr "نهاية الفترة"
#. module: account
#: field:account.installer.modules,account_followup:0
msgid "Followups Management"
-msgstr ""
+msgstr "إدارة المتابعة"
#. module: account
#: report:account.account.balance:0
@@ -8203,7 +8207,7 @@ msgstr ""
#: report:pl.account:0
#: report:pl.account.horizontal:0
msgid "Start Period"
-msgstr ""
+msgstr "بداية الفترة"
#. module: account
#: code:addons/account/account.py:2333
@@ -8214,12 +8218,12 @@ msgstr ""
#. module: account
#: field:account.aged.trial.balance,direction_selection:0
msgid "Analysis Direction"
-msgstr ""
+msgstr "إتجاه التحليل"
#. module: account
#: field:res.partner,ref_companies:0
msgid "Companies that refers to partner"
-msgstr ""
+msgstr "شركات تشير إلي شركاء"
#. module: account
#: view:account.journal:0
@@ -8228,14 +8232,14 @@ msgstr ""
#: field:account.journal.view,name:0
#: model:ir.model,name:account.model_account_journal_view
msgid "Journal View"
-msgstr ""
+msgstr "عرض اليومية"
#. module: account
#: view:account.move.line:0
#: code:addons/account/account_move_line.py:1006
#, python-format
msgid "Total credit"
-msgstr ""
+msgstr "إجمالي الإئتمان"
#. module: account
#: model:process.transition,note:account.process_transition_suppliervalidentries0
@@ -8253,17 +8257,17 @@ msgstr ""
#. module: account
#: report:account.overdue:0
msgid "Best regards."
-msgstr ""
+msgstr "مع خالص التحيات."
#. module: account
#: view:account.invoice:0
msgid "Unpaid"
-msgstr ""
+msgstr "غير مدفوعة"
#. module: account
#: report:account.overdue:0
msgid "Document: Customer account statement"
-msgstr ""
+msgstr "مستند: كشف حساب عميل"
#. module: account
#: constraint:account.move.line:0
@@ -8274,7 +8278,7 @@ msgstr ""
#: code:addons/account/wizard/account_change_currency.py:71
#, python-format
msgid "Current currency is not confirured properly !"
-msgstr ""
+msgstr "العملة الجديدة لم يتم ضبطها بشكل صحيح !"
#. module: account
#: model:ir.actions.act_window,help:account.action_invoice_tree4
@@ -8288,23 +8292,23 @@ msgstr ""
#. module: account
#: view:account.account.template:0
msgid "Receivale Accounts"
-msgstr ""
+msgstr "حسابات المدينون"
#. module: account
#: report:account.move.voucher:0
msgid "Particulars"
-msgstr ""
+msgstr "أفراد"
#. module: account
#: selection:account.account.type,report_type:0
msgid "Profit & Loss (Income Accounts)"
-msgstr ""
+msgstr "الأرباح و الخسائر (حسابات الدخل)"
#. module: account
#: view:account.tax:0
#: view:account.tax.template:0
msgid "Keep empty to use the income account"
-msgstr ""
+msgstr "لإستخدام حساب الدخل اتركه فارغ"
#. module: account
#: field:account.account,balance:0
@@ -8334,12 +8338,12 @@ msgstr ""
#: field:report.account.receivable,balance:0
#: field:report.aged.receivable,balance:0
msgid "Balance"
-msgstr ""
+msgstr "الرصيد"
#. module: account
#: model:process.node,note:account.process_node_supplierbankstatement0
msgid "Manually or automatically entered in the system"
-msgstr ""
+msgstr "تم إدخاله يدوي أو تلقائي في النظام"
#. module: account
#: report:account.account.balance:0
@@ -8353,22 +8357,22 @@ msgstr ""
#: report:pl.account:0
#: report:pl.account.horizontal:0
msgid "Display Account"
-msgstr ""
+msgstr "عرض الحساب"
#. module: account
#: report:account.tax.code.entries:0
msgid "("
-msgstr ""
+msgstr "("
#. module: account
#: selection:account.invoice.refund,filter_refund:0
msgid "Modify"
-msgstr ""
+msgstr "تعديل"
#. module: account
#: view:account.account.type:0
msgid "Closing Method"
-msgstr ""
+msgstr "إسلوب الإغلاق"
#. module: account
#: model:ir.actions.act_window,help:account.action_account_partner_balance
@@ -8382,25 +8386,25 @@ msgstr ""
#: selection:account.account.template,type:0
#: selection:account.entries.report,type:0
msgid "Payable"
-msgstr ""
+msgstr "مدفوعات"
#. module: account
#: view:report.account.sales:0
#: view:report.account_type.sales:0
#: view:report.hr.timesheet.invoice.journal:0
msgid "This Year"
-msgstr ""
+msgstr "هذا العام"
#. module: account
#: view:board.board:0
msgid "Account Board"
-msgstr ""
+msgstr "لوحة الحسابات"
#. module: account
#: view:account.model:0
#: field:account.model,legend:0
msgid "Legend"
-msgstr ""
+msgstr "الدليل"
#. module: account
#: model:ir.actions.act_window,help:account.action_account_moves_sale
@@ -8416,23 +8420,23 @@ msgstr ""
#: code:addons/account/account_bank_statement.py:391
#, python-format
msgid "Cannot delete bank statement(s) which are already confirmed !"
-msgstr ""
+msgstr "لا يمكن حذف هذا كشف / كشوف حساب البنك التي تم تأكيدها"
#. module: account
#: code:addons/account/wizard/account_automatic_reconcile.py:152
#, python-format
msgid "You must select accounts to reconcile"
-msgstr ""
+msgstr "يجب إختيار الحسابات للتسوية"
#. module: account
#: model:ir.actions.act_window,name:account.action_account_receivable_graph
msgid "Balance by Type of Account"
-msgstr ""
+msgstr "الرصيد حسب نوع الحساب"
#. module: account
#: model:process.transition,note:account.process_transition_entriesreconcile0
msgid "Accounting entries are the first input of the reconciliation."
-msgstr ""
+msgstr "قيود المحاسبة هي أول المدخلات للتسوية."
#. module: account
#: model:ir.actions.act_window,help:account.action_account_period_form
@@ -8448,7 +8452,7 @@ msgstr ""
#. module: account
#: report:account.move.voucher:0
msgid "Receiver's Signature"
-msgstr ""
+msgstr "إمضاء المستلم"
#. module: account
#: report:account.general.ledger:0
@@ -8456,13 +8460,13 @@ msgstr ""
#: report:account.third_party_ledger:0
#: report:account.third_party_ledger_other:0
msgid "Filters By"
-msgstr ""
+msgstr "ترشيح بـ"
#. module: account
#: model:process.node,note:account.process_node_manually0
#: model:process.transition,name:account.process_transition_invoicemanually0
msgid "Manual entry"
-msgstr ""
+msgstr "قيد يدوي"
#. module: account
#: report:account.general.ledger:0
@@ -8470,7 +8474,7 @@ msgstr ""
#: field:account.move.line,move_id:0
#: field:analytic.entries.report,move_id:0
msgid "Move"
-msgstr ""
+msgstr "نقل"
#. module: account
#: code:addons/account/account_move_line.py:1128
@@ -8486,7 +8490,7 @@ msgstr ""
#. module: account
#: model:ir.actions.act_window,name:account.act_account_journal_2_account_bank_statement
msgid "Bank statements"
-msgstr ""
+msgstr "كشوف حساب البنك"
#. module: account
#: help:account.addtmpl.wizard,cparent_id:0
@@ -8497,7 +8501,7 @@ msgstr ""
#. module: account
#: selection:account.model.line,date_maturity:0
msgid "Date of the day"
-msgstr ""
+msgstr "تاريخ اليوم"
#. module: account
#: code:addons/account/wizard/account_move_bank_reconcile.py:49
@@ -8510,18 +8514,18 @@ msgstr ""
#. module: account
#: view:account.move.line.reconcile:0
msgid "Reconciliation transactions"
-msgstr ""
+msgstr "معاملات التسوية"
#. module: account
#: model:ir.actions.act_window,name:account.action_account_common_menu
msgid "Common Report"
-msgstr ""
+msgstr "تقرير مشترك"
#. module: account
#: view:account.account:0
#: field:account.account,child_consol_ids:0
msgid "Consolidated Children"
-msgstr ""
+msgstr "فرعي موحد"
#. module: account
#: code:addons/account/wizard/account_fiscalyear_close.py:82
@@ -8536,7 +8540,7 @@ msgstr ""
#: model:process.transition,name:account.process_transition_paymentorderbank0
#: model:process.transition,name:account.process_transition_paymentreconcile0
msgid "Payment entries"
-msgstr ""
+msgstr "قيود المدفوعات"
#. module: account
#: selection:account.entries.report,month:0
@@ -8545,22 +8549,22 @@ msgstr ""
#: selection:report.account.sales,month:0
#: selection:report.account_type.sales,month:0
msgid "July"
-msgstr ""
+msgstr "يوليو/تموز"
#. module: account
#: view:account.account:0
msgid "Chart of accounts"
-msgstr ""
+msgstr "شجرة الحسابات"
#. module: account
#: field:account.subscription.line,subscription_id:0
msgid "Subscription"
-msgstr ""
+msgstr "الإشتراك"
#. module: account
#: model:ir.model,name:account.model_account_analytic_balance
msgid "Account Analytic Balance"
-msgstr ""
+msgstr "رصيد الحساب التحليلي"
#. module: account
#: report:account.account.balance:0
@@ -8578,7 +8582,7 @@ msgstr ""
#: report:pl.account:0
#: report:pl.account.horizontal:0
msgid "End Period"
-msgstr ""
+msgstr "نهاية الفترة"
#. module: account
#: field:account.aged.trial.balance,chart_account_id:0
@@ -8597,22 +8601,22 @@ msgstr ""
#: field:account.report.general.ledger,chart_account_id:0
#: field:account.vat.declaration,chart_account_id:0
msgid "Chart of account"
-msgstr ""
+msgstr "شجرة الحساب"
#. module: account
#: field:account.move.line,date_maturity:0
msgid "Due date"
-msgstr ""
+msgstr "تاريخ الإستحقاق"
#. module: account
#: view:account.move.journal:0
msgid "Standard entries"
-msgstr ""
+msgstr "القيود المعيارية"
#. module: account
#: model:ir.model,name:account.model_account_subscription
msgid "Account Subscription"
-msgstr ""
+msgstr "إشتراك الحساب"
#. module: account
#: code:addons/account/invoice.py:717
@@ -8625,7 +8629,7 @@ msgstr ""
#. module: account
#: view:account.subscription:0
msgid "Entry Subscription"
-msgstr ""
+msgstr "إشتراك القيد"
#. module: account
#: report:account.account.balance:0
@@ -8655,30 +8659,30 @@ msgstr ""
#: report:account.third_party_ledger_other:0
#: field:account.vat.declaration,date_from:0
msgid "Start Date"
-msgstr ""
+msgstr "تاريخ البدء"
#. module: account
#: model:process.node,name:account.process_node_supplierdraftinvoices0
msgid "Draft Invoices"
-msgstr ""
+msgstr "فواتير مؤقتة"
#. module: account
#: selection:account.account.type,close_method:0
#: view:account.entries.report:0
#: view:account.move.line:0
msgid "Unreconciled"
-msgstr ""
+msgstr "غير مسوي"
#. module: account
#: code:addons/account/invoice.py:804
#, python-format
msgid "Bad total !"
-msgstr ""
+msgstr "إجمالي سئ!"
#. module: account
#: field:account.journal,sequence_id:0
msgid "Entry Sequence"
-msgstr ""
+msgstr "مسلسل القيد"
#. module: account
#: model:ir.actions.act_window,help:account.action_account_period_tree
@@ -8695,28 +8699,28 @@ msgstr ""
#. module: account
#: view:account.analytic.account:0
msgid "Pending"
-msgstr ""
+msgstr "معلّق"
#. module: account
#: model:process.transition,name:account.process_transition_analyticinvoice0
#: model:process.transition,name:account.process_transition_supplieranalyticcost0
msgid "From analytic accounts"
-msgstr ""
+msgstr "من الحسابات التحليلية"
#. module: account
#: field:account.installer.modules,account_payment:0
msgid "Suppliers Payment Management"
-msgstr ""
+msgstr "إدارة مدفوعات الموردين"
#. module: account
#: field:account.period,name:0
msgid "Period Name"
-msgstr ""
+msgstr "اسم الفترة"
#. module: account
#: report:account.analytic.account.quantity_cost_ledger:0
msgid "Code/Date"
-msgstr ""
+msgstr "رمز / تاريخ"
#. module: account
#: field:account.account,active:0
@@ -8725,13 +8729,13 @@ msgstr ""
#: field:account.payment.term,active:0
#: field:account.tax,active:0
msgid "Active"
-msgstr ""
+msgstr "نشِط"
#. module: account
#: code:addons/account/invoice.py:354
#, python-format
msgid "Unknown Error"
-msgstr ""
+msgstr "خطأ غير معروف"
#. module: account
#: code:addons/account/account.py:1167
@@ -8752,19 +8756,19 @@ msgstr ""
#. module: account
#: field:account.period,special:0
msgid "Opening/Closing Period"
-msgstr ""
+msgstr "فتح / إغلاق الفترة"
#. module: account
#: field:account.account,currency_id:0
#: field:account.account.template,currency_id:0
#: field:account.bank.accounts.wizard,currency_id:0
msgid "Secondary Currency"
-msgstr ""
+msgstr "عملة ثانية"
#. module: account
#: model:ir.model,name:account.model_validate_account_move
msgid "Validate Account Move"
-msgstr ""
+msgstr "التحقق من حركة الحساب"
#. module: account
#: field:account.account,credit:0
@@ -8789,7 +8793,7 @@ msgstr ""
#: report:account.vat.declaration:0
#: field:report.account.receivable,credit:0
msgid "Credit"
-msgstr ""
+msgstr "دائن"
#. module: account
#: help:account.invoice.refund,journal_id:0
@@ -8802,18 +8806,18 @@ msgstr ""
#. module: account
#: report:account.move.voucher:0
msgid "Through :"
-msgstr ""
+msgstr "خلال :"
#. module: account
#: view:account.general.journal:0
#: model:ir.ui.menu,name:account.menu_account_general_journal
msgid "General Journals"
-msgstr ""
+msgstr "اليوميات العامة"
#. module: account
#: view:account.model:0
msgid "Journal Entry Model"
-msgstr ""
+msgstr "نموذج قيد اليومية"
#. module: account
#: code:addons/account/wizard/account_use_model.py:44
@@ -8829,7 +8833,7 @@ msgstr ""
#: field:account.invoice,number:0
#: field:account.move,name:0
msgid "Number"
-msgstr ""
+msgstr "رقم"
#. module: account
#: report:account.analytic.account.journal:0
@@ -8837,7 +8841,7 @@ msgstr ""
#: selection:account.bank.statement.line,type:0
#: selection:account.journal,type:0
msgid "General"
-msgstr ""
+msgstr "عام"
#. module: account
#: selection:account.aged.trial.balance,filter:0
@@ -8880,12 +8884,12 @@ msgstr ""
#: model:ir.ui.menu,name:account.next_id_23
#, python-format
msgid "Periods"
-msgstr ""
+msgstr "فترات"
#. module: account
#: field:account.invoice.report,currency_rate:0
msgid "Currency Rate"
-msgstr ""
+msgstr "معدل العملة"
#. module: account
#: help:account.payment.term.line,value_amount:0
@@ -8899,12 +8903,12 @@ msgstr ""
#: selection:report.account.sales,month:0
#: selection:report.account_type.sales,month:0
msgid "April"
-msgstr ""
+msgstr "أبريل/ نيسان"
#. module: account
#: view:account.move.line.reconcile.select:0
msgid "Open for Reconciliation"
-msgstr ""
+msgstr "مفتوح للتسوية"
#. module: account
#: field:account.account,parent_left:0
@@ -8927,13 +8931,13 @@ msgstr ""
#. module: account
#: field:account.installer,sale_tax:0
msgid "Sale Tax(%)"
-msgstr ""
+msgstr "ضريبة المبيعات (%)"
#. module: account
#: model:ir.actions.act_window,name:account.action_invoice_tree2
#: model:ir.ui.menu,name:account.menu_action_invoice_tree2
msgid "Supplier Invoices"
-msgstr "فواتير الموردون"
+msgstr "فواتير الموردين"
#. module: account
#: view:account.analytic.line:0
@@ -8949,7 +8953,7 @@ msgstr "فواتير الموردون"
#: field:report.account.sales,product_id:0
#: field:report.account_type.sales,product_id:0
msgid "Product"
-msgstr ""
+msgstr "منتج"
#. module: account
#: model:ir.actions.act_window,help:account.action_validate_account_move
@@ -8962,17 +8966,17 @@ msgstr ""
#. module: account
#: report:account.tax.code.entries:0
msgid ")"
-msgstr ""
+msgstr ")"
#. module: account
#: model:ir.model,name:account.model_account_period
msgid "Account period"
-msgstr ""
+msgstr "فترة الحساب"
#. module: account
#: view:account.subscription:0
msgid "Remove Lines"
-msgstr ""
+msgstr "إزالة الخطوط"
#. module: account
#: view:account.report.general.ledger:0
@@ -8986,7 +8990,7 @@ msgstr ""
#: selection:account.account.template,type:0
#: selection:account.entries.report,type:0
msgid "Regular"
-msgstr ""
+msgstr "عادي"
#. module: account
#: view:account.account:0
@@ -8995,7 +8999,7 @@ msgstr ""
#: field:account.account.template,type:0
#: field:account.entries.report,type:0
msgid "Internal Type"
-msgstr ""
+msgstr "النوع الداخلي"
#. module: account
#: report:account.move.voucher:0
@@ -9005,14 +9009,14 @@ msgstr ""
#. module: account
#: model:ir.actions.act_window,name:account.action_subscription_form_running
msgid "Running Subscriptions"
-msgstr ""
+msgstr "إدارة الإشتراكات"
#. module: account
#: view:report.account.sales:0
#: view:report.account_type.sales:0
#: view:report.hr.timesheet.invoice.journal:0
msgid "This Month"
-msgstr ""
+msgstr "هذا الشهر"
#. module: account
#: view:account.analytic.Journal.report:0
@@ -9021,7 +9025,7 @@ msgstr ""
#: view:account.analytic.inverted.balance:0
#: model:ir.actions.act_window,name:account.action_account_partner_ledger
msgid "Select Period"
-msgstr ""
+msgstr "اختر فترة"
#. module: account
#: view:account.entries.report:0
@@ -9031,7 +9035,7 @@ msgstr ""
#: view:account.move.line:0
#: report:account.move.voucher:0
msgid "Posted"
-msgstr ""
+msgstr "مرحَلة"
#. module: account
#: report:account.account.balance:0
@@ -9060,24 +9064,24 @@ msgstr ""
#: report:account.third_party_ledger_other:0
#: field:account.vat.declaration,date_to:0
msgid "End Date"
-msgstr ""
+msgstr "تاريخ الإنتهاء"
#. module: account
#: model:ir.actions.act_window,name:account.action_account_open_closed_fiscalyear
#: model:ir.ui.menu,name:account.menu_wizard_account_open_closed_fiscalyear
msgid "Cancel Opening Entries"
-msgstr ""
+msgstr "إلغاء القيود المفتوحة"
#. module: account
#: field:account.payment.term.line,days2:0
msgid "Day of the Month"
-msgstr ""
+msgstr "يوم من الشهر"
#. module: account
#: field:account.fiscal.position.tax,tax_src_id:0
#: field:account.fiscal.position.tax.template,tax_src_id:0
msgid "Tax Source"
-msgstr ""
+msgstr "مصدر الضريبة"
#. module: account
#: report:account.balancesheet:0
@@ -9085,23 +9089,23 @@ msgstr ""
#: report:pl.account:0
#: report:pl.account.horizontal:0
msgid "Net Profit"
-msgstr ""
+msgstr "صافي الربح"
#. module: account
#: view:ir.sequence:0
msgid "Fiscal Year Sequences"
-msgstr ""
+msgstr "مسلسل السنوات المالية"
#. module: account
#: help:account.model,name:0
msgid "This is a model for recurring accounting entries"
-msgstr ""
+msgstr "هذا نموذج لقيود حسابات تكرارية"
#. module: account
#: code:addons/account/account_analytic_line.py:100
#, python-format
msgid "There is no income account defined for this product: \"%s\" (id:%d)"
-msgstr ""
+msgstr "لا يوجد حساب دخل معرّف لهذا المنتج: \"%s\" (id:%d)"
#. module: account
#: report:account.general.ledger:0
@@ -9113,7 +9117,7 @@ msgstr ""
#. module: account
#: view:account.payment.term.line:0
msgid " value amount: 0.02"
-msgstr ""
+msgstr " قيمة المبلغ: 0.02"
#. module: account
#: view:account.fiscalyear:0
@@ -9135,13 +9139,13 @@ msgstr ""
#: field:report.account_type.sales,amount_total:0
#: field:report.invoice.created,amount_total:0
msgid "Total"
-msgstr ""
+msgstr "الإجمالي"
#. module: account
#: code:addons/account/wizard/account_move_journal.py:97
#, python-format
msgid "Journal: All"
-msgstr ""
+msgstr "اليومية: الكل"
#. module: account
#: field:account.account,company_id:0
@@ -9171,22 +9175,22 @@ msgstr ""
#: field:analytic.entries.report,company_id:0
#: field:wizard.multi.charts.accounts,company_id:0
msgid "Company"
-msgstr ""
+msgstr "شركة"
#. module: account
#: model:ir.ui.menu,name:account.menu_action_subscription_form
msgid "Define Recurring Entries"
-msgstr ""
+msgstr "تعريف قيود تكرارية"
#. module: account
#: field:account.entries.report,date_maturity:0
msgid "Date Maturity"
-msgstr ""
+msgstr "تاريخ الإستحقاق"
#. module: account
#: help:account.bank.statement,total_entry_encoding:0
msgid "Total cash transactions"
-msgstr ""
+msgstr "إجمالي معاملات النقدية"
#. module: account
#: help:account.partner.reconcile.process,today_reconciled:0
@@ -9199,7 +9203,7 @@ msgstr ""
#. module: account
#: view:account.fiscalyear:0
msgid "Create Monthly Periods"
-msgstr ""
+msgstr "إنشاء فترات شهرية"
#. module: account
#: field:account.tax.code.template,sign:0
@@ -9209,12 +9213,12 @@ msgstr ""
#. module: account
#: model:ir.model,name:account.model_account_balance_report
msgid "Trial Balance Report"
-msgstr ""
+msgstr "تقرير ميزان المراجعة"
#. module: account
#: model:ir.actions.act_window,name:account.action_bank_statement_draft_tree
msgid "Draft statements"
-msgstr ""
+msgstr "قوائم مؤقتة"
#. module: account
#: model:process.transition,note:account.process_transition_statemententries0
@@ -9225,7 +9229,7 @@ msgstr ""
#. module: account
#: view:account.invoice:0
msgid "Invoice lines"
-msgstr ""
+msgstr "سطور الفاتورة"
#. module: account
#: field:account.aged.trial.balance,period_to:0
@@ -9245,7 +9249,7 @@ msgstr ""
#: field:account.report.general.ledger,period_to:0
#: field:account.vat.declaration,period_to:0
msgid "End period"
-msgstr ""
+msgstr "نهاية الفترة"
#. module: account
#: code:addons/account/account_move_line.py:738
@@ -9258,7 +9262,7 @@ msgstr ""
#: code:addons/account/wizard/account_validate_account_move.py:61
#, python-format
msgid "Warning"
-msgstr ""
+msgstr "تحذير"
#. module: account
#: help:product.category,property_account_expense_categ:0
@@ -9271,7 +9275,7 @@ msgstr ""
#. module: account
#: report:account.move.voucher:0
msgid "On Account of :"
-msgstr ""
+msgstr "علي حساب الـ"
#. module: account
#: view:account.automatic.reconcile:0
@@ -9282,17 +9286,17 @@ msgstr "حركة الإعدام"
#. module: account
#: model:process.node,note:account.process_node_paidinvoice0
msgid "Invoice's state is Done"
-msgstr ""
+msgstr "حالة الفاتورة تمت"
#. module: account
#: model:ir.model,name:account.model_report_account_sales
msgid "Report of the Sales by Account"
-msgstr ""
+msgstr "تقرير المبيعات بالحساب"
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_account
msgid "Accounts Fiscal Position"
-msgstr ""
+msgstr "المركز السنوي للحسابات"
#. module: account
#: report:account.invoice:0
@@ -9302,7 +9306,7 @@ msgstr ""
#: model:process.process,name:account.process_process_supplierinvoiceprocess0
#: selection:report.invoice.created,type:0
msgid "Supplier Invoice"
-msgstr ""
+msgstr "فاتورة المورد"
#. module: account
#: field:account.account,debit:0
@@ -9327,12 +9331,12 @@ msgstr ""
#: report:account.vat.declaration:0
#: field:report.account.receivable,debit:0
msgid "Debit"
-msgstr ""
+msgstr "مدين"
#. module: account
#: field:account.invoice,invoice_line:0
msgid "Invoice Lines"
-msgstr ""
+msgstr "سطور الفاتورة"
#. module: account
#: constraint:account.account.template:0
@@ -9350,28 +9354,28 @@ msgstr ""
#. module: account
#: view:account.subscription:0
msgid "Recurring"
-msgstr ""
+msgstr "متكرّر"
#. module: account
#: code:addons/account/account_move_line.py:805
#, python-format
msgid "Entry is already reconciled"
-msgstr ""
+msgstr "قيد اليومية مسوي بالفعل"
#. module: account
#: model:ir.model,name:account.model_report_account_receivable
msgid "Receivable accounts"
-msgstr ""
+msgstr "حسابات مدينة"
#. module: account
#: selection:account.model.line,date_maturity:0
msgid "Partner Payment Term"
-msgstr ""
+msgstr "شروط السداد للشريك"
#. module: account
#: field:temp.range,name:0
msgid "Range"
-msgstr ""
+msgstr "مدى"
#. module: account
#: code:addons/account/account_move_line.py:1246
@@ -9400,22 +9404,22 @@ msgstr ""
#: report:pl.account:0
#: report:pl.account.horizontal:0
msgid "With movements"
-msgstr ""
+msgstr "مع حركات"
#. module: account
#: view:account.analytic.account:0
msgid "Account Data"
-msgstr ""
+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
msgid "Manually"
-msgstr ""
+msgstr "يدوي"
#. module: account
#: selection:account.entries.report,month:0
@@ -9424,13 +9428,13 @@ msgstr ""
#: selection:report.account.sales,month:0
#: selection:report.account_type.sales,month:0
msgid "December"
-msgstr ""
+msgstr "ديسمبر/ كانون الأول"
#. module: account
#: model:ir.actions.act_window,name:account.action_account_analytic_journal_tree
#: model:ir.ui.menu,name:account.account_analytic_journal_print
msgid "Print Analytic Journals"
-msgstr ""
+msgstr "طباعة اليوميات التحليلية"
#. module: account
#: view:account.analytic.line:0
@@ -9441,18 +9445,18 @@ msgstr ""
#: model:ir.actions.act_window,name:account.action_aged_receivable_graph
#: view:report.aged.receivable:0
msgid "Aged Receivable"
-msgstr ""
+msgstr "الدين المشكوك في تحصيله"
#. module: account
#: field:account.tax,applicable_type:0
msgid "Applicability"
-msgstr ""
+msgstr "تطابق"
#. module: account
#: code:addons/account/wizard/account_move_journal.py:165
#, python-format
msgid "This period is already closed !"
-msgstr ""
+msgstr "هذه الفترة مغلقة !"
#. module: account
#: help:account.move.line,currency_id:0
@@ -9468,12 +9472,12 @@ msgstr ""
#. module: account
#: model:ir.ui.menu,name:account.menu_finance_periodical_processing_billing
msgid "Billing"
-msgstr ""
+msgstr "عمليات الفواتير"
#. module: account
#: view:account.account:0
msgid "Parent Account"
-msgstr ""
+msgstr "حساب رئيسي"
#. module: account
#: model:ir.actions.act_window,help:account.action_account_journal_form
@@ -9489,24 +9493,24 @@ msgstr ""
#. module: account
#: model:ir.model,name:account.model_account_analytic_chart
msgid "Account Analytic Chart"
-msgstr ""
+msgstr "حساب مخطط تحليلي"
#. module: account
#: help:account.invoice,residual:0
msgid "Remaining amount due."
-msgstr ""
+msgstr "المبلغ المتبقي المستحق"
#. module: account
#: model:ir.ui.menu,name:account.menu_finance_statistic_report_statement
msgid "Statistic Reports"
-msgstr ""
+msgstr "تقارير إحصائية"
#. module: account
#: field:account.installer,progress:0
#: field:account.installer.modules,progress:0
#: field:wizard.multi.charts.accounts,progress:0
msgid "Configuration Progress"
-msgstr ""
+msgstr "سير الإعدادات"
#. module: account
#: view:account.fiscal.position.template:0
@@ -9517,7 +9521,7 @@ msgstr ""
#: code:addons/account/invoice.py:346
#, python-format
msgid "Invoice '%s' is waiting for validation."
-msgstr ""
+msgstr "الفاتورة '%s' منتظرة للتحقق."
#. module: account
#: selection:account.entries.report,month:0
@@ -9526,12 +9530,12 @@ msgstr ""
#: selection:report.account.sales,month:0
#: selection:report.account_type.sales,month:0
msgid "November"
-msgstr ""
+msgstr "نوفمبر/تشرين الثاني"
#. module: account
#: model:ir.model,name:account.model_account_installer_modules
msgid "account.installer.modules"
-msgstr ""
+msgstr "account.installer.modules"
#. module: account
#: help:account.invoice.line,account_id:0
@@ -9542,23 +9546,23 @@ msgstr ""
#: code:addons/account/account_move_line.py:1117
#, python-format
msgid "The date of your Journal Entry is not in the defined period!"
-msgstr ""
+msgstr "تاريخ قيد اليومية غير موجود بالفترة المعرفة!"
#. module: account
#: field:account.subscription,period_total:0
msgid "Number of Periods"
-msgstr ""
+msgstr "عدد الفترات"
#. module: account
#: report:account.general.journal:0
#: model:ir.actions.report.xml,name:account.account_general_journal
msgid "General Journal"
-msgstr ""
+msgstr "اليومية العامة"
#. module: account
#: view:account.invoice:0
msgid "Search Invoice"
-msgstr ""
+msgstr "بحث الفواتير"
#. module: account
#: report:account.invoice:0
@@ -9597,7 +9601,7 @@ msgstr "مستندات المحاسبة"
#. module: account
#: model:ir.model,name:account.model_validate_account_move_lines
msgid "Validate Account Move Lines"
-msgstr ""
+msgstr "خطوط التحقق من حركة الحساب"
#. module: account
#: model:ir.actions.act_window,name:account.action_account_analytic_cost_ledger_journal
@@ -9857,10 +9861,6 @@ msgstr "خصوم"
#~ msgid "Move line select"
#~ msgstr "تحريك السطر المختار"
-#, python-format
-#~ msgid "The statement balance is incorrect !\n"
-#~ msgstr "رصيد الكشف خطأ\n"
-
#~ msgid "Balance:"
#~ msgstr "الرصيد:"
@@ -9870,3 +9870,10 @@ msgstr "خصوم"
#~ msgid "Balance Sheet (Assets Accounts)"
#~ msgstr "الميزانية العمومية (حسابات الأصول)"
+
+#, python-format
+#~ msgid "The statement balance is incorrect !\n"
+#~ msgstr "رصيد الكشف خاطئ !\n"
+
+#~ msgid "Chart of Account"
+#~ msgstr "شجرة الحساب"
diff --git a/addons/account/i18n/hr.po b/addons/account/i18n/hr.po
index 9ff165ef150..5f6c47d7d0b 100644
--- a/addons/account/i18n/hr.po
+++ b/addons/account/i18n/hr.po
@@ -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-11-07 12:52+0000\n"
+"PO-Revision-Date: 2011-12-08 15:12+0000\n"
"Last-Translator: Goran Kliska \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-08 05:45+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
#: model:process.transition,name:account.process_transition_supplierreconcilepaid0
msgid "System payment"
-msgstr "Poredak plaćanja"
+msgstr "System payment"
#. module: account
#: view:account.journal:0
@@ -39,12 +39,13 @@ msgid ""
"You cannot remove/deactivate an account which is set as a property to any "
"Partner."
msgstr ""
-"Ne možete obrisati/deaktivirati konto koji se koristi kao obilježje partnera."
+"Konto se koristi kao obilježje partnera, te se ne može brisati ili "
+"deaktivirati."
#. module: account
#: view:account.move.reconcile:0
msgid "Journal Entry Reconcile"
-msgstr "Zatvaranje stavke dnevnika"
+msgstr "Zatvaranje stavke dnevnika(IOS)"
#. module: account
#: field:account.installer.modules,account_voucher:0
@@ -69,7 +70,7 @@ msgstr "Ostatak"
#: code:addons/account/invoice.py:785
#, python-format
msgid "Please define sequence on invoice journal"
-msgstr "Definirajte brojač na dnevniku računa"
+msgstr "Definirajte brojčanu seriju na dnevniku računa"
#. module: account
#: constraint:account.period:0
@@ -126,6 +127,8 @@ msgid ""
"If you unreconciliate transactions, you must also verify all the actions "
"that are linked to those transactions because they will not be disabled"
msgstr ""
+"Ako otvarate stavke, morate provjeriti/provesti i sve ostale vezane akcije i "
+"stanja."
#. module: account
#: report:account.tax.code.entries:0
@@ -152,7 +155,7 @@ msgstr "Izvor"
#: view:account.move.line.reconcile:0
#: view:account.move.line.reconcile.writeoff:0
msgid "Reconcile"
-msgstr "Zatvaranje"
+msgstr "Zatvaranje IOS-a"
#. module: account
#: field:account.bank.statement.line,ref:0
@@ -216,8 +219,8 @@ msgid ""
"invoice) to create analytic entries, OpenERP will look for a matching "
"journal of the same type."
msgstr ""
-"Tip analitičkog dnevnika. Kada je potrebno kreirati analitičke stavke "
-"koristit će se dnevnik odgovarajućeg tipa."
+"Tip analitičkog dnevnika. Kod kreiranja analitičkih knjiženja koristi se "
+"ovdje definirani analitički dnevnik odgovarajućeg tipa."
#. module: account
#: model:ir.actions.act_window,name:account.action_account_tax_template_form
@@ -269,12 +272,12 @@ msgstr "Račun '%s' je djelomično plaćen: %s%s od %s%s (%s%s preostalo)"
#. module: account
#: model:process.transition,note:account.process_transition_supplierentriesreconcile0
msgid "Accounting entries are an input of the reconciliation."
-msgstr ""
+msgstr "Accounting entries are an input of the reconciliation."
#. module: account
#: model:ir.ui.menu,name:account.menu_finance_management_belgian_reports
msgid "Belgian Reports"
-msgstr ""
+msgstr "Belgian Reports"
#. module: account
#: code:addons/account/account_move_line.py:1176
@@ -307,7 +310,7 @@ msgstr "Dozvoli otpis"
#. module: account
#: view:account.analytic.chart:0
msgid "Select the Period for Analysis"
-msgstr "Odaberite period analize"
+msgstr "Odaberite razdoblje analize"
#. module: account
#: view:account.move.line:0
@@ -318,7 +321,7 @@ msgstr "St."
#: code:addons/account/invoice.py:529
#, python-format
msgid "Invoice line account company does not match with invoice company."
-msgstr "Konto na retku računa ne pripada tvrtci sa zaglavlja računa."
+msgstr "Konto na stavci računa ne pripada organizaciji sa zaglavlja računa."
#. module: account
#: field:account.journal.column,field:0
@@ -330,7 +333,8 @@ msgstr "Naziv polja"
msgid ""
"Installs localized accounting charts to match as closely as possible the "
"accounting needs of your company based on your country."
-msgstr "Instalira lokalizirani kontni plan prema potrebama vaše kompanije."
+msgstr ""
+"Instalira lokalizirani kontni plan prema potrebama vaše organizacije."
#. module: account
#: code:addons/account/wizard/account_move_journal.py:63
@@ -341,17 +345,21 @@ msgid ""
"You can create one in the menu: \n"
"Configuration/Financial Accounting/Accounts/Journals."
msgstr ""
+"Can't find any account journal of %s type for this company.\n"
+"\n"
+"You can create one in the menu: \n"
+"Configuration/Financial Accounting/Accounts/Journals."
#. module: account
#: model:ir.model,name:account.model_account_unreconcile
msgid "Account Unreconcile"
-msgstr ""
+msgstr "Account Unreconcile"
#. module: account
#: view:product.product:0
#: view:product.template:0
msgid "Purchase Properties"
-msgstr "Nabava"
+msgstr "Svojstva nabave"
#. module: account
#: view:account.installer:0
@@ -375,11 +383,14 @@ msgid ""
"OpenERP. Journal items are created by OpenERP if you use Bank Statements, "
"Cash Registers, or Customer/Supplier payments."
msgstr ""
+"This view is used by accountants in order to record entries massively in "
+"OpenERP. Journal items are created by OpenERP if you use Bank Statements, "
+"Cash Registers, or Customer/Supplier payments."
#. module: account
#: model:ir.model,name:account.model_account_tax_template
msgid "account.tax.template"
-msgstr "account.tax.template"
+msgstr "račun.porez.predložak"
#. module: account
#: model:ir.model,name:account.model_account_bank_accounts_wizard
@@ -395,7 +406,7 @@ msgstr "Datum kreiranja"
#. module: account
#: selection:account.journal,type:0
msgid "Purchase Refund"
-msgstr "Povrat nabave"
+msgstr "Odobrenja nabave"
#. module: account
#: selection:account.journal,type:0
@@ -418,6 +429,8 @@ msgid ""
"This field contains the informatin related to the numbering of the journal "
"entries of this journal."
msgstr ""
+"Brojčana serija koja će se koristiti za odbrojavanje dokumenata ovog "
+"dnevnika."
#. module: account
#: field:account.journal,default_debit_account_id:0
@@ -437,7 +450,7 @@ msgstr "Pozitivan"
#. module: account
#: view:account.move.line.unreconcile.select:0
msgid "Open For Unreconciliation"
-msgstr "Otvoreno za otvaranje"
+msgstr "Otvori za otvaranje IOS-a"
#. module: account
#: field:account.fiscal.position.template,chart_template_id:0
@@ -449,7 +462,7 @@ msgstr "Predložak kontnog plana"
#. module: account
#: help:account.model.line,amount_currency:0
msgid "The amount expressed in an optional other currency."
-msgstr "Iznos je predstavljen opciono u drugoj valuti"
+msgstr "Iznos u drugoj valuti"
#. module: account
#: help:account.journal.period,state:0
@@ -458,6 +471,9 @@ msgid ""
"it comes to 'Printed' state. When all transactions are done, it comes in "
"'Done' state."
msgstr ""
+"When journal period is created. The state is 'Draft'. If a report is printed "
+"it comes to 'Printed' state. When all transactions are done, it comes in "
+"'Done' state."
#. module: account
#: model:ir.actions.act_window,help:account.action_account_tax_chart
@@ -467,6 +483,10 @@ msgid ""
"amount of each area of the tax declaration for your country. It’s presented "
"in a hierarchical structure, which can be modified to fit your needs."
msgstr ""
+"Stablo poreza prikazuje strukturu poreznih grupa sa vrijednostima osnovica i "
+"poreza. Jedno stablo sadrži strukturu osnovica i poreza za prijavu PDV-a, a "
+"druga možete prilagođavati vašim potrebama i prikazivati druge poreze, "
+"trošarine ili npr. ugovorene provizije prodavačima."
#. module: account
#: view:account.analytic.line:0
@@ -503,7 +523,7 @@ msgstr "Dnevnik"
#. module: account
#: model:ir.model,name:account.model_account_invoice_confirm
msgid "Confirm the selected invoices"
-msgstr "Potvrda odabranih računa"
+msgstr "Potvrdi odabrane račune"
#. module: account
#: field:account.addtmpl.wizard,cparent_id:0
@@ -542,12 +562,12 @@ msgstr "Porezi nabave"
#. module: account
#: model:ir.model,name:account.model_account_invoice_refund
msgid "Invoice Refund"
-msgstr "Povrat računa"
+msgstr "Računi odobrenja"
#. module: account
#: report:account.overdue:0
msgid "Li."
-msgstr ""
+msgstr "Li."
#. module: account
#: field:account.automatic.reconcile,unreconciled:0
@@ -616,7 +636,7 @@ msgstr " 30 Dana "
#. module: account
#: field:ir.sequence,fiscal_ids:0
msgid "Sequences"
-msgstr "Sekvence"
+msgstr "Brojčane serije"
#. module: account
#: view:account.fiscal.position.template:0
@@ -626,17 +646,17 @@ msgstr "Mapiranje poreza"
#. module: account
#: report:account.central.journal:0
msgid "Centralized Journal"
-msgstr ""
+msgstr "Centralized Journal"
#. module: account
#: sql_constraint:account.sequence.fiscalyear:0
msgid "Main Sequence must be different from current !"
-msgstr ""
+msgstr "Glavna serija mora biti različita od trenutne !"
#. module: account
#: field:account.invoice.tax,tax_amount:0
msgid "Tax Code Amount"
-msgstr "Iznos poreza"
+msgstr "Iznos porezne grupe"
#. module: account
#: code:addons/account/account.py:2779
@@ -648,18 +668,18 @@ msgstr "IRA"
#. module: account
#: help:account.bank.statement,balance_end_real:0
msgid "closing balance entered by the cashbox verifier"
-msgstr ""
+msgstr "closing balance entered by the cashbox verifier"
#. module: account
#: view:account.period:0
#: view:account.period.close:0
msgid "Close Period"
-msgstr "Zatvori period"
+msgstr "Zatvori razdoblje"
#. module: account
#: model:ir.model,name:account.model_account_common_partner_report
msgid "Account Common Partner Report"
-msgstr ""
+msgstr "Račun Zajednički Partner Izvješće"
#. module: account
#: field:account.fiscalyear.close,period_id:0
@@ -676,7 +696,7 @@ msgstr "Period dnevnika"
#: code:addons/account/account_move_line.py:776
#, python-format
msgid "To reconcile the entries company should be the same for all entries"
-msgstr "Sve stavke zatvaranja moraju biti iz iste trvtke"
+msgstr "Sve stavke zatvaranja moraju biti iz iste organizacije"
#. module: account
#: view:account.account:0
@@ -713,7 +733,7 @@ msgstr "Čekovi"
#. module: account
#: field:account.partner.reconcile.process,today_reconciled:0
msgid "Partners Reconciled Today"
-msgstr "Danas zatvoreni partneri"
+msgstr "Danas zatvoreni partneri (IOS-i)"
#. module: account
#: selection:account.payment.term.line,value:0
@@ -737,7 +757,7 @@ msgstr "Analitičke stavke"
#: code:addons/account/wizard/account_change_currency.py:39
#, python-format
msgid "You can only change currency for Draft Invoice !"
-msgstr ""
+msgstr "Valuta se može mijenjati samo na računima u stanju 'Nacrt'!"
#. module: account
#: view:account.analytic.journal:0
@@ -751,7 +771,7 @@ msgstr ""
#: field:account.move.reconcile,type:0
#: field:report.invoice.created,type:0
msgid "Type"
-msgstr "Tip"
+msgstr "Vrsta"
#. module: account
#: model:ir.model,name:account.model_account_subscription_line
@@ -761,7 +781,7 @@ msgstr "Retci knjiženja pretplate"
#. module: account
#: help:account.invoice,reference:0
msgid "The partner reference of this invoice."
-msgstr "Vezna oznaka partnera za ovaj račun(poziv na broj)."
+msgstr "Poziv na broj."
#. module: account
#: view:account.move.line.unreconcile.select:0
@@ -769,7 +789,7 @@ msgstr "Vezna oznaka partnera za ovaj račun(poziv na broj)."
#: view:account.unreconcile.reconcile:0
#: model:ir.model,name:account.model_account_move_line_unreconcile_select
msgid "Unreconciliation"
-msgstr "Poništavanje zatvaranja"
+msgstr "Poništavanje zatvaranja IOS-a"
#. module: account
#: model:ir.model,name:account.model_account_analytic_Journal_report
@@ -789,7 +809,7 @@ msgstr "Izračun valute plaćanja"
#. module: account
#: report:account.analytic.account.quantity_cost_ledger:0
msgid "J.C./Move name"
-msgstr ""
+msgstr "J.C./Move name"
#. module: account
#: selection:account.entries.report,month:0
@@ -809,7 +829,7 @@ msgstr "dana"
#: help:account.account.template,nocreate:0
msgid ""
"If checked, the new chart of accounts will not contain this by default."
-msgstr ""
+msgstr "Ako je označeno, novi računski plan neće sadržavati ove po defaultu."
#. module: account
#: code:addons/account/wizard/account_invoice_refund.py:102
@@ -908,12 +928,12 @@ msgstr "Prošireni filtri..."
#. module: account
#: model:ir.ui.menu,name:account.menu_account_central_journal
msgid "Centralizing Journal"
-msgstr ""
+msgstr "Centralizirani dnevnik"
#. module: account
#: selection:account.journal,type:0
msgid "Sale Refund"
-msgstr "Povrat prodaje"
+msgstr "Odobrenje kupcu"
#. module: account
#: model:process.node,note:account.process_node_accountingstatemententries0
@@ -936,7 +956,7 @@ msgstr "Porez ili osnovica poreza ovisno o poreznoj grupi."
#. module: account
#: view:account.analytic.line:0
msgid "Purchases"
-msgstr "Nabave"
+msgstr "Nabava"
#. module: account
#: field:account.model,lines_id:0
@@ -1001,7 +1021,7 @@ msgstr "Tjedan"
#: field:account.pl.report,display_type:0
#: field:account.report.general.ledger,landscape:0
msgid "Landscape Mode"
-msgstr "Prosireni način"
+msgstr "Položeno (Landscape)"
#. module: account
#: view:board.board:0
@@ -1020,6 +1040,8 @@ msgid ""
"These types are defined according to your country. The type contains more "
"information about the account and its specificities."
msgstr ""
+"These types are defined according to your country. The type contains more "
+"information about the account and its specificities."
#. module: account
#: view:account.tax:0
@@ -1079,7 +1101,7 @@ msgstr "Potvrdi izvod"
#: field:account.fiscal.position.tax,tax_dest_id:0
#: field:account.fiscal.position.tax.template,tax_dest_id:0
msgid "Replacement Tax"
-msgstr "Promenljiv porez"
+msgstr "Zamjenski porez"
#. module: account
#: selection:account.move.line,centralisation:0
@@ -1094,11 +1116,15 @@ msgid ""
"purchase orders or receipts. This way, you can control the invoice from your "
"supplier according to what you purchased or received."
msgstr ""
+"With Supplier Invoices you can enter and manage invoices issued by your "
+"suppliers. OpenERP can also generate draft invoices automatically from "
+"purchase orders or receipts. This way, you can control the invoice from your "
+"supplier according to what you purchased or received."
#. module: account
#: view:account.invoice.cancel:0
msgid "Cancel Invoices"
-msgstr ""
+msgstr "Otkaži račune"
#. module: account
#: view:account.unreconcile.reconcile:0
@@ -1111,7 +1137,7 @@ msgstr "Transakcije poništavanja zatvaranja"
#: field:account.tax.template,tax_code_id:0
#: model:ir.model,name:account.model_account_tax_code
msgid "Tax Code"
-msgstr "Šifra poreza"
+msgstr "Porezna grupa"
#. module: account
#: field:account.account,currency_mode:0
@@ -1126,7 +1152,7 @@ msgstr "Temeljnica"
#. module: account
#: field:account.move.line.reconcile,trans_nbr:0
msgid "# of Transaction"
-msgstr "Broj transakcija"
+msgstr "# transakcija"
#. module: account
#: report:account.general.ledger:0
@@ -1147,7 +1173,7 @@ msgstr "Ne možete mjenjati/brisati dnevnike sa stavkama za ovo razdoblje!"
#: help:account.invoice,origin:0
#: help:account.invoice.line,origin:0
msgid "Reference of the document that produced this invoice."
-msgstr "Vezna oznaka dokumenta koji je stvorio ovaj račun."
+msgstr "Oznaka izvornog dokumenta koji je kreirao ovaj račun."
#. module: account
#: view:account.analytic.line:0
@@ -1185,7 +1211,7 @@ msgstr "Konto"
#. module: account
#: field:account.tax,include_base_amount:0
msgid "Included in base amount"
-msgstr "Uključeno u iznos osnovice"
+msgstr "Uključeno u osnovicu"
#. module: account
#: view:account.entries.report:0
@@ -1257,7 +1283,7 @@ msgstr "Početni saldo"
#. module: account
#: view:account.invoice:0
msgid "Reset to Draft"
-msgstr "Vrati u pripremu"
+msgstr "Vrati u nacrt"
#. module: account
#: view:wizard.multi.charts.accounts:0
@@ -1309,7 +1335,7 @@ msgstr "Glavni dnevnik"
#: code:addons/account/account_move_line.py:1271
#, python-format
msgid "You can not use this general account in this journal !"
-msgstr "Ne možete koristiti odabrani opći konto u ovon dnevniku!"
+msgstr "Ne možete koristiti odabrani opći konto u ovom dnevniku!"
#. module: account
#: selection:account.balance.report,display_account:0
@@ -1339,7 +1365,7 @@ msgstr "Traži poreze"
#. module: account
#: model:ir.model,name:account.model_account_analytic_cost_ledger
msgid "Account Analytic Cost Ledger"
-msgstr ""
+msgstr "Account Analytic Cost Ledger"
#. module: account
#: view:account.model:0
@@ -1359,7 +1385,7 @@ msgstr "Maksimalni iznos otpisa"
#. module: account
#: view:account.invoice:0
msgid "Compute Taxes"
-msgstr "Izračunaj poreze"
+msgstr "Iz_računaj poreze"
#. module: account
#: field:wizard.multi.charts.accounts,code_digits:0
@@ -1369,7 +1395,7 @@ msgstr "Broj znamenki"
#. module: account
#: field:account.journal,entry_posted:0
msgid "Skip 'Draft' State for Manual Entries"
-msgstr "Preskoči stanje 'Priprema' za ručni upis"
+msgstr "Preskoči stanje 'Nacrt' za ručni upis"
#. module: account
#: view:account.invoice.report:0
@@ -1385,6 +1411,9 @@ msgid ""
"entry per accounting document: invoice, refund, supplier payment, bank "
"statements, etc."
msgstr ""
+"Temeljnica sadrži više knjigovodstvenih stavaka od kojih je svaka dugovna "
+"ili potražna transakcija. OpenERP automatski kreira jednu temeljnicu za "
+"jedan knjigovodstveni dokument: račun, plaćanje, izvod, itd."
#. module: account
#: view:account.entries.report:0
@@ -1406,7 +1435,7 @@ msgstr "Povrat dobavljaču"
#: view:account.payment.term.line:0
msgid ""
"Example: at 14 net days 2 percents, remaining amount at 30 days end of month."
-msgstr ""
+msgstr "Primjer: za 14 dana 2%, ostatak za 30 dana ili do kraja mjeseca."
#. module: account
#: code:addons/account/invoice.py:815
@@ -1416,6 +1445,8 @@ msgid ""
"The payment term defined gives a computed amount greater than the total "
"invoiced amount."
msgstr ""
+"Račun nije kreiran !\n"
+"Uvjeti plaćanja daju iznos veći od ukupnog iznosa računa."
#. module: account
#: field:account.installer.modules,account_anglo_saxon:0
@@ -1477,7 +1508,7 @@ msgstr "Grupe"
#: field:account.invoice,amount_untaxed:0
#: field:report.invoice.created,amount_untaxed:0
msgid "Untaxed"
-msgstr "Bez poreza"
+msgstr "Osnovica"
#. module: account
#: view:account.partner.reconcile.process:0
@@ -1494,6 +1525,8 @@ msgstr "Traži izvode banke"
msgid ""
"Wrong credit or debit value in model (Credit + Debit Must Be greater \"0\")!"
msgstr ""
+"Pogrešno kreditna ili debitna vrijednost u modelu (Kreditna + debitna mora "
+"biti veći \"0 \")!"
#. module: account
#: view:account.chart.template:0
@@ -1505,7 +1538,7 @@ msgstr "Konto obveza"
#: field:account.tax,account_paid_id:0
#: field:account.tax.template,account_paid_id:0
msgid "Refund Tax Account"
-msgstr "Konto povrata poreza"
+msgstr "Konto poreza za odobrenja"
#. module: account
#: view:account.bank.statement:0
@@ -1523,6 +1556,12 @@ msgid ""
"the Payment column of a line, you can press F1 to open the reconciliation "
"form."
msgstr ""
+"A bank statement is a summary of all financial transactions occurring over a "
+"given period of time on a deposit account, a credit card or any other type "
+"of financial account. The starting balance will be proposed automatically "
+"and the closing balance is to be found on your statement. When you are in "
+"the Payment column of a line, you can press F1 to open the reconciliation "
+"form."
#. module: account
#: report:account.analytic.account.cost_ledger:0
@@ -1565,7 +1604,7 @@ msgstr "Brojač fiskalne godine"
#. module: account
#: field:wizard.multi.charts.accounts,seq_journal:0
msgid "Separated Journal Sequences"
-msgstr "Odvojene sekvence dnevnika"
+msgstr "Odvojeni brojači dnevnika"
#. module: account
#: field:account.bank.statement,user_id:0
@@ -1589,6 +1628,8 @@ msgid ""
"Cancel Invoice: Creates the refund invoice, validate and reconcile it to "
"cancel the current invoice."
msgstr ""
+"Storniraj račun: Kreira storno računa, potvrđuje ga i zatvara sa ovim "
+"računom."
#. module: account
#: model:ir.ui.menu,name:account.periodical_processing_invoicing
@@ -1598,7 +1639,7 @@ msgstr "Fakturiranje"
#. module: account
#: field:account.chart.template,tax_code_root_id:0
msgid "Root Tax Code"
-msgstr "Šifra korijenskog poreza"
+msgstr "Korijenska porezna grupa"
#. module: account
#: field:account.partner.ledger,initial_balance:0
@@ -1619,7 +1660,7 @@ msgstr "Ispiši potvrdu"
#. module: account
#: view:account.change.currency:0
msgid "This wizard will change the currency of the invoice"
-msgstr "Čarobnjak za promjenu valute računa"
+msgstr "Asistent za promjenu valute računa"
#. module: account
#: model:ir.actions.act_window,help:account.action_account_chart
@@ -1628,6 +1669,8 @@ msgid ""
"Have a complete tree view of all journal items per account code by clicking "
"on an account."
msgstr ""
+"Prikaži kontni plan poduzeća za fiskalnu godinu sa filterom razdoblja. "
+"Mogućnost podpregleda stavaka temeljnice po broju konta, kliknuti na konto."
#. module: account
#: constraint:account.fiscalyear:0
@@ -1638,7 +1681,7 @@ msgstr "Greška! Fiskalne godine se ne smiju preklapati"
#: code:addons/account/account_move_line.py:808
#, python-format
msgid "The account is not defined to be reconciled !"
-msgstr ""
+msgstr "Nije zadano zatvaranje IOS-a na ovom kontu !"
#. module: account
#: field:account.cashbox.line,pieces:0
@@ -1651,6 +1694,8 @@ msgid ""
"If the active field is set to False, it will allow you to hide the journal "
"period without removing it."
msgstr ""
+"If the active field is set to False, it will allow you to hide the journal "
+"period without removing it."
#. module: account
#: view:res.partner:0
@@ -1660,7 +1705,7 @@ msgstr "Dugovanje dobavljaču"
#. module: account
#: help:account.model.line,quantity:0
msgid "The optional quantity on entries"
-msgstr ""
+msgstr "The optional quantity on entries"
#. module: account
#: model:ir.actions.act_window,name:account.act_account_partner_account_move_all
@@ -1676,7 +1721,7 @@ msgstr "Morate navesti konto za stavku otpisa!"
#. module: account
#: model:ir.model,name:account.model_account_common_journal_report
msgid "Account Common Journal Report"
-msgstr ""
+msgstr "Izvješče konta opće temeljnice"
#. module: account
#: selection:account.partner.balance,display_partner:0
@@ -1722,13 +1767,13 @@ msgstr "Izvod u pripremi"
#. module: account
#: view:account.tax:0
msgid "Tax Declaration: Credit Notes"
-msgstr ""
+msgstr "Porezna prijava: Odobrenja"
#. module: account
#: code:addons/account/account.py:499
#, python-format
msgid "You cannot deactivate an account that contains account moves."
-msgstr ""
+msgstr "Ne možete deaktivirati račun koji sadrži stavke prometa."
#. module: account
#: field:account.move.line.reconcile,credit:0
@@ -1738,7 +1783,7 @@ msgstr "Potražni iznos"
#. module: account
#: 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
#: code:addons/account/account.py:519
@@ -1747,6 +1792,8 @@ msgid ""
"You cannot change the type of account from 'Closed' to any other type which "
"contains account entries!"
msgstr ""
+"You cannot change the type of account from 'Closed' to any other type which "
+"contains account entries!"
#. module: account
#: view:res.company:0
@@ -1756,14 +1803,14 @@ msgstr "Konto dobiti/gubitka i rezerve"
#. module: account
#: 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
#: view:account.invoice.report:0
#: model:ir.actions.act_window,name:account.action_account_invoice_report_all
#: model:ir.ui.menu,name:account.menu_action_account_invoice_report_all
msgid "Invoices Analysis"
-msgstr "analiza računa"
+msgstr "Analiza računa"
#. module: account
#: model:ir.model,name:account.model_account_period_close
@@ -1783,7 +1830,7 @@ msgstr "Stavke"
#. module: account
#: report:account.tax.code.entries:0
msgid "A/c Code"
-msgstr ""
+msgstr "A/c Code"
#. module: account
#: field:account.invoice,move_id:0
@@ -1794,7 +1841,7 @@ msgstr "Temeljnica"
#. module: account
#: view:account.tax:0
msgid "Tax Declaration: Invoices"
-msgstr "Porezna prijava"
+msgstr "Porezne grupe računa"
#. module: account
#: field:account.cashbox.line,subtotal:0
@@ -1809,7 +1856,7 @@ msgstr "Analiza blagajne"
#. module: account
#: constraint:res.company:0
msgid "Error! You can not create recursive companies."
-msgstr "Greška! Ne možete stvoriti rekurzivne tvrtke."
+msgstr "Pogreška! Ne možete kreirati rekurzivne organizacije."
#. module: account
#: view:account.analytic.account:0
@@ -1858,7 +1905,7 @@ msgstr "Završni saldo na temelju početnog stanja i transakcija"
#: model:process.node,note:account.process_node_reconciliation0
#: model:process.node,note:account.process_node_supplierreconciliation0
msgid "Comparison between accounting and payment entries"
-msgstr "Usporedba Cesti Cesti između knjiženja i plaćanja"
+msgstr "Usporedba stavki knjiženja i plaćanja"
#. module: account
#: view:account.tax:0
@@ -1882,6 +1929,8 @@ msgid ""
"It adds the currency column if the currency is different then the company "
"currency"
msgstr ""
+"It adds the currency column if the currency is different then the company "
+"currency"
#. module: account
#: help:account.journal,allow_date:0
@@ -1911,7 +1960,7 @@ msgstr "Otkazan"
#: view:account.invoice:0
#: view:report.invoice.created:0
msgid "Untaxed Amount"
-msgstr "Iznos bez poreza"
+msgstr "Osnovica"
#. module: account
#: help:account.tax,active:0
@@ -1927,13 +1976,16 @@ msgid ""
"be with same name as statement name. This allows the statement entries to "
"have the same references than the statement itself"
msgstr ""
+"if you give the Name other then /, its created Accounting Entries Move will "
+"be with same name as statement name. This allows the statement entries to "
+"have the same references than the statement itself"
#. module: account
#: model:ir.actions.act_window,name:account.action_account_unreconcile
#: model:ir.actions.act_window,name:account.action_account_unreconcile_reconcile
#: model:ir.actions.act_window,name:account.action_account_unreconcile_select
msgid "Unreconcile Entries"
-msgstr "Poništi zatvaranje stavki"
+msgstr "Otvori stavke"
#. module: account
#: field:account.move.reconcile,line_partial_ids:0
@@ -1949,7 +2001,7 @@ msgstr "Fiskalna godina"
#: view:account.journal.select:0
#: view:project.account.analytic.line:0
msgid "Open Entries"
-msgstr "Otvori stavke"
+msgstr "Prikaži stavke"
#. module: account
#: field:account.automatic.reconcile,account_ids:0
@@ -1996,6 +2048,8 @@ msgid ""
"Invalid period ! Some periods overlap or the date period is not in the scope "
"of the fiscal year. "
msgstr ""
+"Neispravano razdoblje! Neki od razdoblja se preklapaju ili datum razdoblja "
+"nije u okviru fiskalne godine. "
#. module: account
#: selection:account.invoice,state:0
@@ -2018,8 +2072,8 @@ msgid ""
"There is no default default debit account defined \n"
"on journal \"%s\""
msgstr ""
-"Nije definiran zadani dugovni konto \n"
-"za dnevnikl \"%s\""
+"Nije definiran uobičajeni dugovni konto \n"
+"za dnevnik \"%s\""
#. module: account
#: help:account.account,type:0
@@ -2032,10 +2086,15 @@ msgid ""
"partners accounts (for debit/credit computations), closed for depreciated "
"accounts."
msgstr ""
+"This type is used to differentiate types with special effects in OpenERP: "
+"view can not have entries, consolidation are accounts that can have children "
+"accounts for multi-company consolidations, payable/receivable are for "
+"partners accounts (for debit/credit computations), closed for depreciated "
+"accounts."
#. module: account
#: view:account.chart.template:0
-msgid "Search Chart of Accounts Templates"
+msgid "Search Chart of Account Templates"
msgstr "Traži predloške kontnog plana"
#. module: account
@@ -2045,6 +2104,9 @@ msgid ""
"certified Chart of Accounts exists for your specified country, a generic one "
"can be installed and will be selected by default."
msgstr ""
+"The default Chart of Accounts is matching your country selection. If no "
+"certified Chart of Accounts exists for your specified country, a generic one "
+"can be installed and will be selected by default."
#. module: account
#: view:account.account.type:0
@@ -2070,7 +2132,7 @@ msgstr "Opis"
#: code:addons/account/installer.py:498
#, python-format
msgid "ECNJ"
-msgstr ""
+msgstr "ECNJ"
#. module: account
#: view:account.subscription:0
@@ -2089,7 +2151,7 @@ msgstr "Konto prihoda"
#: code:addons/account/invoice.py:352
#, python-format
msgid "There is no Accounting Journal of type Sale/Purchase defined!"
-msgstr ""
+msgstr "Nije definiran dnevnik tipa Prodaja/Nabava!"
#. module: account
#: view:product.category:0
@@ -2102,7 +2164,7 @@ msgstr "Računovodstveni podaci"
#: report:account.general.ledger:0
#: report:account.general.ledger_landscape:0
msgid "Entries Sorted By"
-msgstr "Stavke poredane po"
+msgstr "Entries Sorted By"
#. module: account
#: field:account.change.currency,currency_id:0
@@ -2112,7 +2174,7 @@ msgstr "Promjeni u"
#. module: account
#: view:account.entries.report:0
msgid "# of Products Qty "
-msgstr ""
+msgstr "# količine proizvoda "
#. module: account
#: model:ir.model,name:account.model_product_template
@@ -2166,12 +2228,12 @@ msgstr "Ostavite prazno za sve otvorene fiskalne godine"
#. module: account
#: model:ir.model,name:account.model_account_move
msgid "Account Entry"
-msgstr "Stavka knjiženja"
+msgstr "Temeljnica"
#. module: account
#: field:account.sequence.fiscalyear,sequence_main_id:0
msgid "Main Sequence"
-msgstr "Glavna sekvenca"
+msgstr "Glavna br. serija"
#. module: account
#: field:account.invoice,payment_term:0
@@ -2220,7 +2282,7 @@ msgstr "Otvoreno"
#: model:process.node,note:account.process_node_draftinvoices0
#: model:process.node,note:account.process_node_supplierdraftinvoices0
msgid "Draft state of an invoice"
-msgstr "Stanje računa 'U pripremi'"
+msgstr "Stanje računa 'Nacrt'"
#. module: account
#: help:account.account,reconcile:0
@@ -2238,7 +2300,7 @@ msgstr "Zatvaranje salda konti"
#: field:account.tax,tax_code_id:0
#: view:account.tax.code:0
msgid "Account Tax Code"
-msgstr "Šifra PDV obrasca"
+msgstr "Porezna grupa za porez"
#. module: account
#: code:addons/account/invoice.py:545
@@ -2249,12 +2311,16 @@ msgid ""
"You can create one in the menu: \n"
"Configuration\\Financial Accounting\\Accounts\\Journals."
msgstr ""
+"Can't find any account journal of %s type for this company.\n"
+"\n"
+"You can create one in the menu: \n"
+"Configuration\\Financial Accounting\\Accounts\\Journals."
#. module: account
#: field:account.invoice.tax,base_code_id:0
#: field:account.tax.template,base_code_id:0
msgid "Base Code"
-msgstr "Osnovna Šifra"
+msgstr "Grupa osnovice"
#. module: account
#: help:account.invoice.tax,sequence:0
@@ -2267,7 +2333,7 @@ msgstr "Određuje poredak u popisu poreza na računu."
#: field:account.tax.template,base_sign:0
#: field:account.tax.template,ref_base_sign:0
msgid "Base Code Sign"
-msgstr "Predznak šifre osnovice"
+msgstr "Koef. osnovice"
#. module: account
#: view:account.vat.declaration:0
@@ -2279,6 +2345,12 @@ msgid ""
"useful because it enables you to preview at any time the tax that you owe at "
"the start and end of the month or quarter."
msgstr ""
+"This menu prints a VAT declaration based on invoices or payments. Select one "
+"or several periods of the fiscal year. The information required for a tax "
+"declaration is automatically generated by OpenERP from invoices (or "
+"payments, in some countries). This data is updated in real time. That’s very "
+"useful because it enables you to preview at any time the tax that you owe at "
+"the start and end of the month or quarter."
#. module: account
#: selection:account.move.line,centralisation:0
@@ -2289,7 +2361,7 @@ msgstr "Centralizacija Dugovanja"
#: view:account.invoice.confirm:0
#: model:ir.actions.act_window,name:account.action_account_invoice_confirm
msgid "Confirm Draft Invoices"
-msgstr "Porvrdite pripremljene račune"
+msgstr "Potvrdi nacrte račune"
#. module: account
#: field:account.entries.report,day:0
@@ -2356,18 +2428,21 @@ msgstr "Opis knjiženja"
msgid ""
"The fiscal position will determine taxes and the accounts used for the "
"partner."
-msgstr "Fiskalna pozicija određuje poreze i konta za partnera."
+msgstr ""
+"Fiskalna pozicija određuje/mjenja poreze i konta za partnera kad se "
+"razlikuju od zadanih poreza i konta proizvoda."
#. module: account
#: view:account.print.journal:0
msgid ""
"This report gives you an overview of the situation of a specific journal"
msgstr ""
+"This report gives you an overview of the situation of a specific journal"
#. module: account
#: constraint:product.category:0
msgid "Error ! You can not create recursive categories."
-msgstr "Greška! Ne možete stvoriti rekurzivne kategorije."
+msgstr "Greška ! Ne možete stvoriti rekurzivne grupe."
#. module: account
#: report:account.invoice:0
@@ -2423,6 +2498,8 @@ msgid ""
"You cannot modify company of this journal as its related record exist in "
"Entry Lines"
msgstr ""
+"You cannot modify company of this journal as its related record exist in "
+"Entry Lines"
#. module: account
#: report:account.journal.period.print:0
@@ -2469,7 +2546,7 @@ msgstr "Odaberite ili poreznu grupu poreza ili poreznu grupu osnovice."
#. module: account
#: model:ir.ui.menu,name:account.menu_automatic_reconcile
msgid "Automatic Reconciliation"
-msgstr "Automatsko zatvaranje"
+msgstr "Automatsko zatvaranje IOS-a"
#. module: account
#: field:account.invoice,reconciled:0
@@ -2480,7 +2557,7 @@ msgstr "Plaćeno/Usklađeno"
#: field:account.tax,ref_base_code_id:0
#: field:account.tax.template,ref_base_code_id:0
msgid "Refund Base Code"
-msgstr "Šifra osnovice povrata"
+msgstr "Porezna grupa za osnovicu"
#. module: account
#: model:ir.actions.act_window,name:account.action_bank_statement_periodic_tree
@@ -2514,13 +2591,15 @@ msgid ""
"Automatically generate entries based on what has been entered in the system "
"before a specific date."
msgstr ""
+"Automatically generate entries based on what has been entered in the system "
+"before a specific date."
#. module: account
#: view:account.aged.trial.balance:0
#: model:ir.actions.act_window,name:account.action_account_aged_balance_view
#: model:ir.ui.menu,name:account.menu_aged_trial_balance
msgid "Aged Partner Balance"
-msgstr "Struktura potraživanja/obveza partnera"
+msgstr "Struktura IOS-a partnera"
#. module: account
#: model:process.transition,name:account.process_transition_entriesreconcile0
@@ -2542,12 +2621,17 @@ msgid ""
"Note that journal entries that are automatically created by the system are "
"always skipping that state."
msgstr ""
+"Check this box if you don't want new journal entries to pass through the "
+"'draft' state and instead goes directly to the 'posted state' without any "
+"manual validation. \n"
+"Note that journal entries that are automatically created by the system are "
+"always skipping that state."
#. module: account
#: model:ir.actions.server,name:account.ir_actions_server_action_wizard_multi_chart
#: model:ir.ui.menu,name:account.menu_act_ir_actions_bleble
msgid "New Company Financial Setting"
-msgstr ""
+msgstr "Financijske postavke nove organizacije"
#. module: account
#: model:ir.actions.act_window,name:account.action_report_account_sales_tree_all
@@ -2559,7 +2643,7 @@ msgstr "Prodaje po kontu"
#. module: account
#: view:account.use.model:0
msgid "This wizard will create recurring accounting entries"
-msgstr ""
+msgstr "Asistent za kreiranje ponavljajućih temeljnica"
#. module: account
#: code:addons/account/account.py:1181
@@ -2582,7 +2666,7 @@ msgstr "Morate definirati analitički dnevnik na dnevniku '%s' !"
#: model:ir.actions.act_window,name:account.action_tax_code_list
#: model:ir.ui.menu,name:account.menu_action_tax_code_list
msgid "Tax codes"
-msgstr "Šifre poreza"
+msgstr "Porezne grupe"
#. module: account
#: model:ir.ui.menu,name:account.menu_account_customer
@@ -2617,7 +2701,7 @@ msgstr ""
#. module: account
#: model:process.transition,note:account.process_transition_paymentreconcile0
msgid "Payment entries are the second input of the reconciliation."
-msgstr ""
+msgstr "Payment entries are the second input of the reconciliation."
#. module: account
#: report:account.move.voucher:0
@@ -2644,6 +2728,8 @@ msgid ""
"The optional quantity expressed by this line, eg: number of product sold. "
"The quantity is not a legal requirement but is very useful for some reports."
msgstr ""
+"The optional quantity expressed by this line, eg: number of product sold. "
+"The quantity is not a legal requirement but is very useful for some reports."
#. module: account
#: view:account.payment.term.line:0
@@ -2660,28 +2746,29 @@ msgstr "Obavezno"
#: field:product.category,property_account_expense_categ:0
#: field:product.template,property_account_expense:0
msgid "Expense Account"
-msgstr "Konto rashoda"
+msgstr "Konto troška"
#. module: account
#: help:account.invoice,period_id:0
msgid "Keep empty to use the period of the validation(invoice) date."
-msgstr "Ostavite prazno"
+msgstr "Prazno za datum potvrde."
#. module: account
#: help:account.bank.statement,account_id:0
msgid ""
"used in statement reconciliation domain, but shouldn't be used elswhere."
msgstr ""
+"used in statement reconciliation domain, but shouldn't be used elswhere."
#. module: account
#: field:account.invoice.tax,base_amount:0
msgid "Base Code Amount"
-msgstr "Iznos osnvice"
+msgstr "Iznos osnovice"
#. module: account
#: field:wizard.multi.charts.accounts,sale_tax:0
msgid "Default Sale Tax"
-msgstr "Zadani porez prodaje"
+msgstr "Uobičajeni porezi prodaje"
#. module: account
#: help:account.model.line,date_maturity:0
@@ -2690,6 +2777,8 @@ msgid ""
"between the creation date or the creation date of the entries plus the "
"partner payment terms."
msgstr ""
+"Datum dospijeća generiranih stavaka modelal. Možete birati između datuma "
+"izrade ili datum izrade/unosa plus uvjeta plaćanja partnera."
#. module: account
#: model:ir.ui.menu,name:account.menu_finance_accounting
@@ -2725,6 +2814,8 @@ msgid ""
"It adds initial balance row on report which display previous sum amount of "
"debit/credit/balance"
msgstr ""
+"It adds initial balance row on report which display previous sum amount of "
+"debit/credit/balance"
#. module: account
#: view:account.analytic.line:0
@@ -2785,7 +2876,7 @@ msgstr "Uk. transakcije"
#. module: account
#: view:res.partner:0
msgid "Bank account"
-msgstr "Konto banke"
+msgstr "Bankovni račun"
#. module: account
#: field:account.chart.template,tax_template_ids:0
@@ -2801,6 +2892,11 @@ msgid ""
"software system you may have to use the rate at date. Incoming transactions "
"always use the rate at date."
msgstr ""
+"This will select how the current currency rate for outgoing transactions is "
+"computed. In most countries the legal method is \"average\" but only a few "
+"software systems are able to manage this. So if you import from another "
+"software system you may have to use the rate at date. Incoming transactions "
+"always use the rate at date."
#. module: account
#: help:wizard.multi.charts.accounts,code_digits:0
@@ -2810,7 +2906,7 @@ msgstr "Broj znamenki za upotrebu u šifri konta"
#. module: account
#: field:account.payment.term.line,name:0
msgid "Line Name"
-msgstr "Naziv redka"
+msgstr "Naziv stavke"
#. module: account
#: view:account.fiscalyear:0
@@ -2877,7 +2973,7 @@ msgstr "Elektronska datoteka"
#. module: account
#: view:res.partner:0
msgid "Customer Credit"
-msgstr "Potraživanja kupca"
+msgstr "Potraživanja od kupca"
#. module: account
#: model:ir.model,name:account.model_account_tax_code_template
@@ -2897,7 +2993,7 @@ msgstr "Saldo konti partnera"
#. module: account
#: help:account.journal.column,sequence:0
msgid "Gives the sequence order to journal column."
-msgstr ""
+msgstr "Gives the sequence order to journal column."
#. module: account
#: view:account.tax.template:0
@@ -2909,7 +3005,7 @@ msgstr "Prijava poreza"
#: help:account.account.template,currency_id:0
#: help:account.bank.accounts.wizard,currency_id:0
msgid "Forces all moves for this account to have this secondary currency."
-msgstr ""
+msgstr "Forces all moves for this account to have this secondary currency."
#. module: account
#: model:ir.actions.act_window,help:account.action_validate_account_move_line
@@ -2917,6 +3013,8 @@ msgid ""
"This wizard will validate all journal entries of a particular journal and "
"period. Once journal entries are validated, you can not update them anymore."
msgstr ""
+"Ovaj asistent će knjižiti sve neknjižene stavke odabranog dnevnika za "
+"odabrani period."
#. module: account
#: model:ir.actions.act_window,name:account.action_account_chart_template_form
@@ -2932,7 +3030,7 @@ msgstr "Generiraj kontni plan iz predloška"
#. module: account
#: model:ir.model,name:account.model_account_unreconcile_reconcile
msgid "Account Unreconcile Reconcile"
-msgstr ""
+msgstr "Račun Neusklađen Usklađen"
#. module: account
#: help:account.account.type,close_method:0
@@ -2947,6 +3045,13 @@ msgid ""
" 'Unreconciled' will copy only the journal items that were unreconciled on "
"the first day of the new fiscal year."
msgstr ""
+"Postavite metodu knjiženja kod zatvaranja konta na kraju godine.\n"
+"Sva konta ovog tipa će se zatvarati prema odabranoj metodi.\n"
+"\n"
+" 'Ništa' - neće generirati stavke.\n"
+" 'Saldo' - koristi se uglavnom za konta banke i blagajne.\n"
+" 'Stavke' - sve stavke se prenose u novu godinu(i zatvorene).\n"
+" 'Otvorene stavke' - prenose se otvorene stavke (konta kupaca i dobavljača)."
#. module: account
#: view:account.tax:0
@@ -3023,7 +3128,7 @@ msgstr "Nabava"
#: model:ir.actions.act_window,name:account.action_account_installer
#: view:wizard.multi.charts.accounts:0
msgid "Accounting Application Configuration"
-msgstr ""
+msgstr "Accounting Application Configuration"
#. module: account
#: model:ir.actions.act_window,name:account.open_board_account
@@ -3065,6 +3170,8 @@ msgid ""
"The amount expressed in the related account currency if not equal to the "
"company one."
msgstr ""
+"The amount expressed in the related account currency if not equal to the "
+"company one."
#. module: account
#: report:account.move.voucher:0
@@ -3111,12 +3218,12 @@ msgstr "Traži dnevnik"
#. module: account
#: model:ir.actions.act_window,name:account.action_invoice_tree_pending_invoice
msgid "Pending Invoice"
-msgstr ""
+msgstr "Pending Invoice"
#. module: account
#: selection:account.subscription,period_type:0
msgid "year"
-msgstr "godina"
+msgstr "year"
#. module: account
#: report:account.move.voucher:0
@@ -3129,6 +3236,8 @@ msgid ""
"All selected journal entries will be validated and posted. It means you "
"won't be able to modify their accounting fields anymore."
msgstr ""
+"Sve odabrane stavke dnevnika će biti potvrđena i objavljena. To znači da "
+"nećete moći modificirati svoje računovodstvene polja više."
#. module: account
#: code:addons/account/invoice.py:370
@@ -3149,7 +3258,7 @@ msgstr "Prijenosi"
#. module: account
#: view:account.payment.term.line:0
msgid " value amount: n.a"
-msgstr ""
+msgstr " vrijednost iznos: n.a"
#. module: account
#: view:account.chart:0
@@ -3181,7 +3290,7 @@ msgstr "Naziv pozicije PDV obrasca"
#: report:account.invoice:0
#: model:process.node,name:account.process_node_draftinvoices0
msgid "Draft Invoice"
-msgstr "Neodobreni računi"
+msgstr "Nacrt računa"
#. module: account
#: code:addons/account/wizard/account_invoice_state.py:68
@@ -3190,6 +3299,8 @@ msgid ""
"Selected Invoice(s) cannot be cancelled as they are already in 'Cancelled' "
"or 'Done' state!"
msgstr ""
+"Odabrani račun(i) se ne mogu otkazati jer su u stanju 'Otkazan' ili "
+"'Izvršen'!"
#. module: account
#: code:addons/account/account.py:522
@@ -3198,6 +3309,8 @@ msgid ""
"You cannot change the type of account from '%s' to '%s' type as it contains "
"account entries!"
msgstr ""
+"You cannot change the type of account from '%s' to '%s' type as it contains "
+"account entries!"
#. module: account
#: report:account.general.ledger:0
@@ -3213,13 +3326,13 @@ msgstr "Podaci računa"
#. module: account
#: field:account.invoice.report,state:0
msgid "Invoice State"
-msgstr "Stanje fakture"
+msgstr "Stanje računa"
#. module: account
#: view:account.invoice.report:0
#: field:account.invoice.report,categ_id:0
msgid "Category of Product"
-msgstr "Kategorija proizvoda"
+msgstr "Grupa proizvoda"
#. module: account
#: view:account.move:0
@@ -3238,7 +3351,7 @@ msgstr "Kreiraj konto"
#. module: account
#: model:ir.model,name:account.model_report_account_type_sales
msgid "Report of the Sales by Account Type"
-msgstr ""
+msgstr "Izvještaj o prodaji po vrsti konta"
#. module: account
#: selection:account.account.type,close_method:0
@@ -3248,7 +3361,7 @@ msgstr "Detalji"
#. module: account
#: field:account.installer,bank_accounts_id:0
msgid "Your Bank and Cash Accounts"
-msgstr ""
+msgstr "Your Bank and Cash Accounts"
#. module: account
#: report:account.invoice:0
@@ -3271,12 +3384,12 @@ msgstr "PDV :"
#: report:pl.account:0
#: report:pl.account.horizontal:0
msgid "Chart of Accounts"
-msgstr "Kontni plan"
+msgstr "Chart of Accounts"
#. module: account
#: view:account.tax.chart:0
msgid "(If you do not select period it will take all open periods)"
-msgstr ""
+msgstr "(prazno - sva otvorena razdoblja)"
#. module: account
#: field:account.journal,centralisation:0
@@ -3286,7 +3399,7 @@ msgstr "Centralizirana stavka zatvaranja"
#. module: account
#: model:ir.model,name:account.model_account_partner_reconcile_process
msgid "Reconcilation Process partner by partner"
-msgstr ""
+msgstr "Reconcilation Process partner by partner"
#. module: account
#: selection:account.automatic.reconcile,power:0
@@ -3343,13 +3456,14 @@ msgstr "Datum"
#: view:account.unreconcile:0
#: view:account.unreconcile.reconcile:0
msgid "Unreconcile"
-msgstr "Poništi zatvaranje"
+msgstr "Otvori stavke"
#. module: account
#: code:addons/account/wizard/account_fiscalyear_close.py:79
#, python-format
msgid "The journal must have default credit and debit account"
-msgstr "Dnevnik mora imati zadani potražni i dugovni konto."
+msgstr ""
+"Dnevnik mora imati zadani dugovni i potražni konto radi protu knjiženja."
#. module: account
#: view:account.chart.template:0
@@ -3364,6 +3478,9 @@ msgid ""
"based on partner payment term!\n"
"Please define partner on it!"
msgstr ""
+"Maturity date of entry line generated by model line '%s' of model '%s' is "
+"based on partner payment term!\n"
+"Please define partner on it!"
#. module: account
#: code:addons/account/account_move_line.py:810
@@ -3378,6 +3495,8 @@ msgid ""
"You cannot validate a Journal Entry unless all journal items are in same "
"chart of accounts !"
msgstr ""
+"Nije dozvoljeno potvrđivanje temeljnice na kojoj stavke pripadaju različitim "
+"kontnim planovima!"
#. module: account
#: view:account.tax:0
@@ -3432,7 +3551,7 @@ msgstr ""
#: view:account.tax:0
#: view:account.tax.template:0
msgid "Applicable Code (if type=code)"
-msgstr "Primjenjeni kod (ako je tip=Python kod)"
+msgstr "Primjenjeni kod (ako je Python kod)"
#. module: account
#: view:account.invoice.report:0
@@ -3477,12 +3596,12 @@ msgstr "Nalog za plaćanje"
msgid ""
"Check this option if you want the user to reconcile entries in this account."
msgstr ""
-"Cekirajte ovde da omogućuite korisniku zatvaranje stavaka za ovaj konto."
+"Odaberite ako želite omogućiti zatvaranje stavaka (IOS) za ovaj konto."
#. module: account
#: model:ir.actions.report.xml,name:account.account_account_balance_landscape
msgid "Account balance"
-msgstr "Saldo računa"
+msgstr "Saldo konta"
#. module: account
#: report:account.invoice:0
@@ -3519,17 +3638,17 @@ msgstr "Odabrali ste jedinicu mjere koja nije kompatibilna s proizvodom."
msgid ""
"The Payment Term of Supplier does not have Payment Term Lines(Computation) "
"defined !"
-msgstr ""
+msgstr "Uvjet plaćanja dobavljača nema definirane stavke plaćanja!"
#. module: account
#: view:account.state.open:0
msgid "Open Invoice"
-msgstr "otvoreni računi"
+msgstr "Otvori račun"
#. module: account
#: field:account.invoice.tax,factor_tax:0
msgid "Multipication factor Tax code"
-msgstr ""
+msgstr "Koeficijent porezne grupe"
#. module: account
#: view:account.fiscal.position:0
@@ -3552,7 +3671,7 @@ msgstr "Naziv"
#. module: account
#: model:ir.model,name:account.model_account_aged_trial_balance
msgid "Account Aged Trial balance Report"
-msgstr ""
+msgstr "Bruto bilanca (Aged Trial balance)"
#. module: account
#: field:account.move.line,date:0
@@ -3589,11 +3708,13 @@ msgid ""
"Print Report with the currency column if the currency is different then the "
"company currency"
msgstr ""
+"Print Report with the currency column if the currency is different then the "
+"company currency"
#. module: account
#: view:account.analytic.line:0
msgid "General Accounting"
-msgstr ""
+msgstr "Glavna knjiga"
#. module: account
#: report:account.overdue:0
@@ -3608,6 +3729,10 @@ msgid ""
"debit/credit accounts, of type 'situation' and with a centralized "
"counterpart."
msgstr ""
+"Najbolja praksa je definirati dnevnik(e) na kojima se knjiže početna stanja "
+"svih poslovnih godina. Za ove dnevnike treba definirati dugovni i potražni "
+"konto protustavki, a vrsta dnevnika mora biti 'Početno stanje' sa "
+"centraliziranom(jednom) protustavkom."
#. module: account
#: view:account.installer:0
@@ -3621,12 +3746,12 @@ msgstr "naslov"
#: view:account.period:0
#: view:account.subscription:0
msgid "Set to Draft"
-msgstr "Postavi na neodobreno"
+msgstr "Postavi na nacrt"
#. module: account
#: model:ir.actions.act_window,name:account.action_subscription_form
msgid "Recurring Lines"
-msgstr "Ponavljajuće linije"
+msgstr "Ponavljajuće stavke"
#. module: account
#: field:account.partner.balance,display_partner:0
@@ -3642,6 +3767,7 @@ msgstr "Potvrdi"
#: sql_constraint:account.model.line:0
msgid "Wrong credit or debit value in model (Credit Or Debit Must Be \"0\")!"
msgstr ""
+"Wrong credit or debit value in model (Credit Or Debit Must Be \"0\")!"
#. module: account
#: model:ir.actions.act_window,help:account.action_account_invoice_report_all
@@ -3650,6 +3776,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
#: view:account.invoice.confirm:0
@@ -3734,7 +3862,7 @@ msgstr "Traži predloške poreza"
#. module: account
#: model:ir.ui.menu,name:account.periodical_processing_journal_entries_validation
msgid "Draft Entries"
-msgstr "U pripremi"
+msgstr "Stavke u stanju \"Nacrt\""
#. module: account
#: field:account.account,shortcut:0
@@ -3768,7 +3896,7 @@ msgstr "Bilanca"
#. module: account
#: model:ir.model,name:account.model_account_invoice_cancel
msgid "Cancel the Selected Invoices"
-msgstr ""
+msgstr "Otkaži odabrane račune"
#. module: account
#: help:product.category,property_account_income_categ:0
@@ -3789,6 +3917,8 @@ msgid ""
"Analytic costs (timesheets, some purchased products, ...) come from analytic "
"accounts. These generate draft supplier invoices."
msgstr ""
+"Analitički troškovi (ev. rada, nabava, ...) dolaze sa analitičkih konta. Oni "
+"mogu kreirati nacrte ulaznih računa."
#. module: account
#: view:account.bank.statement:0
@@ -3810,7 +3940,7 @@ msgstr "Tip konta"
#: code:addons/account/invoice.py:714
#, python-format
msgid "Global taxes defined, but are not in invoice lines !"
-msgstr ""
+msgstr "Na stavkama računa nema definiranih poreza!"
#. module: account
#: field:account.entries.report,month:0
@@ -3837,7 +3967,7 @@ msgstr "Bilješka"
#. module: account
#: view:account.analytic.account:0
msgid "Overdue Account"
-msgstr ""
+msgstr "Konto duga"
#. module: account
#: selection:account.invoice,state:0
@@ -3864,6 +3994,9 @@ msgid ""
"the system on document validation (invoices, bank statements...) and will be "
"created in 'Posted' state."
msgstr ""
+"Ručno upisane temeljnice su obično u stanju \"Neažurno\". Ovdje možete "
+"zadati opciju preskakanja ovog stanja za pojedini dnevnik. Tada će upisane "
+"stavke odmah biti u stanju \"Ažurno\"."
#. module: account
#: code:addons/account/account_analytic_line.py:91
@@ -3924,7 +4057,7 @@ msgstr "Raspon Mjeseci"
#. module: account
#: help:account.analytic.balance,empty_acc:0
msgid "Check if you want to display Accounts with 0 balance too."
-msgstr ""
+msgstr "Check if you want to display Accounts with 0 balance too."
#. module: account
#: view:account.tax:0
@@ -3934,7 +4067,7 @@ msgstr "Kod izračuna"
#. module: account
#: view:account.account.template:0
msgid "Default taxes"
-msgstr "Zadani porezi"
+msgstr "Uobičajeni porezi"
#. module: account
#: code:addons/account/invoice.py:88
@@ -3953,6 +4086,8 @@ msgid ""
"When new move line is created the state will be 'Draft'.\n"
"* When all the payments are done it will be in 'Valid' state."
msgstr ""
+"Nakon upisa stanje stavke je 'Nacrt'.\n"
+"* Nakon plaćanja stanje postaje 'Ispravan'."
#. module: account
#: field:account.journal,view_id:0
@@ -3962,7 +4097,7 @@ msgstr "Način prikaza"
#. module: account
#: model:process.node,note:account.process_node_importinvoice0
msgid "Statement from invoice or payment"
-msgstr ""
+msgstr "Izvod iz računa ili plaćanja"
#. module: account
#: view:account.payment.term.line:0
@@ -3984,7 +4119,7 @@ msgstr "Naziv konta"
#. module: account
#: help:account.fiscalyear.close,report_name:0
msgid "Give name of the new entries"
-msgstr ""
+msgstr "Give name of the new entries"
#. module: account
#: model:ir.model,name:account.model_account_invoice_report
@@ -3994,13 +4129,13 @@ msgstr "Statistike računa"
#. module: account
#: model:process.transition,note:account.process_transition_paymentorderreconcilation0
msgid "Bank statements are entered in the system."
-msgstr ""
+msgstr "Bank statements are entered in the system."
#. module: account
#: code:addons/account/wizard/account_reconcile.py:133
#, python-format
msgid "Reconcile Writeoff"
-msgstr ""
+msgstr "Otpis"
#. module: account
#: field:account.model.line,date_maturity:0
@@ -4038,7 +4173,7 @@ msgstr "Ispiši račun"
#. module: account
#: view:account.tax.template:0
msgid "Credit Notes"
-msgstr "Knjižna odobrenja"
+msgstr "Odobrenja"
#. module: account
#: code:addons/account/account.py:2067
@@ -4050,7 +4185,7 @@ msgstr "Nema odgovarajućih perioda."
#. module: account
#: report:account.tax.code.entries:0
msgid "Voucher No"
-msgstr "Potvrda br."
+msgstr "Vaučer br."
#. module: account
#: view:wizard.multi.charts.accounts:0
@@ -4060,7 +4195,7 @@ msgstr "res_config_contents"
#. module: account
#: view:account.unreconcile:0
msgid "Unreconciliate transactions"
-msgstr ""
+msgstr "Unreconciliate transactions"
#. module: account
#: view:account.use.model:0
@@ -4070,7 +4205,7 @@ msgstr "Stvori stavke iz modela"
#. module: account
#: field:account.account.template,reconcile:0
msgid "Allow Reconciliation"
-msgstr "Dozvoli zatvaranje"
+msgstr "Allow Reconciliation"
#. module: account
#: view:account.analytic.account:0
@@ -4095,7 +4230,7 @@ msgstr "Porez uključen u cijenu"
#. module: account
#: model:ir.model,name:account.model_account_analytic_cost_ledger_journal_report
msgid "Account Analytic Cost Ledger For Journal Report"
-msgstr ""
+msgstr "Account Analytic Cost Ledger For Journal Report"
#. module: account
#: model:ir.actions.act_window,name:account.action_model_form
@@ -4137,12 +4272,12 @@ msgstr "Kontrola po vrsti kona"
#. module: account
#: help:account.journal,default_credit_account_id:0
msgid "It acts as a default account for credit amount"
-msgstr "Zadani konto za potražni iznos"
+msgstr "Uobičajeni potražni konto"
#. module: account
#: help:account.partner.ledger,reconcil:0
msgid "Consider reconciled entries"
-msgstr ""
+msgstr "Consider reconciled entries"
#. module: account
#: model:ir.actions.act_window,name:account.action_validate_account_move_line
@@ -4150,19 +4285,19 @@ msgstr ""
#: view:validate.account.move:0
#: view:validate.account.move.lines:0
msgid "Post Journal Entries"
-msgstr "Proknjiži stavke"
+msgstr "Knjiži temeljnicu"
#. module: account
#: selection:account.invoice,state:0
#: selection:account.invoice.report,state:0
#: selection:report.invoice.created,state:0
msgid "Cancelled"
-msgstr "Poništeno"
+msgstr "Otkazani"
#. module: account
#: help:account.bank.statement,balance_end_cash:0
msgid "Closing balance based on cashBox"
-msgstr ""
+msgstr "Završno stanje blagajne"
#. module: account
#: constraint:account.account:0
@@ -4213,7 +4348,7 @@ msgstr "Potvrđeno"
#. module: account
#: report:account.invoice:0
msgid "Cancelled Invoice"
-msgstr "Poništeni račun"
+msgstr "Otkazani račun"
#. module: account
#: code:addons/account/invoice.py:73
@@ -4229,6 +4364,9 @@ msgid ""
"the account \"%s - %s\". Clear the secondary currency field of the account "
"definition if you want to accept all currencies."
msgstr ""
+"Couldn't create move with currency different from the secondary currency of "
+"the account \"%s - %s\". Clear the secondary currency field of the account "
+"definition if you want to accept all currencies."
#. module: account
#: field:account.invoice.refund,date:0
@@ -4239,14 +4377,14 @@ msgstr "Datum postupka"
#: field:account.tax,ref_tax_code_id:0
#: field:account.tax.template,ref_tax_code_id:0
msgid "Refund Tax Code"
-msgstr "Porezna grupa povrata"
+msgstr "Porezna grupa odobrenja"
#. module: account
#: view:validate.account.move:0
msgid ""
"All draft account entries in this journal and period will be validated. It "
"means you won't be able to modify their accounting fields anymore."
-msgstr ""
+msgstr "Potvrđivanje svih nacrta knjiženja za odabrani dnevnik i period."
#. module: account
#: report:account.account.balance.landscape:0
@@ -4293,8 +4431,8 @@ msgid ""
"Please verify the price of the invoice !\n"
"The real total does not match the computed total."
msgstr ""
-"Molimo provjerite cijene na računu!\n"
-"Stvarna ukupna vrijednost se ne slaže sa izračunatom vrijednošću."
+"Molimo provjerite iznose na računu!\n"
+"Ukupna vrijednost se ne slaže sa izračunatom vrijednošću."
#. module: account
#: view:account.invoice:0
@@ -4322,7 +4460,7 @@ msgstr "Ne"
#. module: account
#: help:account.invoice.tax,tax_code_id:0
msgid "The tax basis of the tax declaration."
-msgstr ""
+msgstr "Osnovica za poreznu prijavu."
#. module: account
#: view:account.addtmpl.wizard:0
@@ -4352,7 +4490,7 @@ msgstr "Bankovni izvod korišten za zatvaranje banke"
#. module: account
#: model:process.transition,note:account.process_transition_suppliercustomerinvoice0
msgid "Draft invoices are validated. "
-msgstr ""
+msgstr "Nacrti računa su potvrđeni. "
#. module: account
#: view:account.bank.statement:0
@@ -4388,7 +4526,7 @@ msgstr "Porez se primjenjuje"
#: model:ir.ui.menu,name:account.menu_eaction_account_moves_sale
#, python-format
msgid "Journal Items"
-msgstr "Stavke dnevnika"
+msgstr "Stavke glavne knjige"
#. module: account
#: selection:account.account.type,report_type:0
@@ -4398,7 +4536,7 @@ msgstr "Bilanca (konta imovine)"
#. module: account
#: report:account.tax.code.entries:0
msgid "Third Party (Country)"
-msgstr ""
+msgstr "Third Party (Country)"
#. module: account
#: code:addons/account/account.py:938
@@ -4452,11 +4590,13 @@ msgid ""
"To print an analytics (or costs) journal for a given period. The report give "
"code, move name, account number, general amount and analytic amount."
msgstr ""
+"Ispis analitičkog dnevnika za razdoblje. Ispisuje se šifra, naziv stavke, "
+"konto, iznos glavne knjige i analitički iznos."
#. module: account
#: help:account.journal,refund_journal:0
msgid "Fill this if the journal is to be used for refunds of invoices."
-msgstr ""
+msgstr "Fill this if the journal is to be used for refunds of invoices."
#. module: account
#: view:account.fiscalyear.close:0
@@ -4503,6 +4643,8 @@ msgid ""
"You should set the journal to allow cancelling entries if you want to do "
"that."
msgstr ""
+"Nije dozvoljeno mijenjati knjižene stavke ovog dnevnikal !\n"
+"Ako to ipak želite dozvoliti promijenite postavke ovog dnevnika."
#. module: account
#: model:ir.ui.menu,name:account.account_template_folder
@@ -4518,7 +4660,7 @@ msgstr "Podređeni porezi"
#: code:addons/account/account.py:940
#, python-format
msgid "Start period should be smaller then End period"
-msgstr ""
+msgstr "Start period should be smaller then End period"
#. module: account
#: selection:account.automatic.reconcile,power:0
@@ -4610,7 +4752,7 @@ msgstr "Naziv stupca"
#: view:account.general.journal:0
msgid ""
"This report gives you an overview of the situation of your general journals"
-msgstr ""
+msgstr "Ovo izvješće daje pregled stanja vaše opće temeljnice"
#. module: account
#: field:account.entries.report,year:0
@@ -4688,7 +4830,7 @@ msgstr "Bilanca stanja"
#. module: account
#: model:ir.ui.menu,name:account.final_accounting_reports
msgid "Accounting Reports"
-msgstr "Izvješća"
+msgstr "Računovodstvena izvješća"
#. module: account
#: field:account.move,line_id:0
@@ -4713,7 +4855,7 @@ msgstr "JM"
#: code:addons/account/wizard/account_invoice_refund.py:138
#, python-format
msgid "No Period found on Invoice!"
-msgstr ""
+msgstr "Nije pronađeno razdoblje na računu!"
#. module: account
#: view:account.tax.template:0
@@ -4750,7 +4892,7 @@ msgstr "Iznos"
#: code:addons/account/wizard/account_fiscalyear_close.py:41
#, python-format
msgid "End of Fiscal Year Entry"
-msgstr "Knjiženja zatvaranja fiskalne godine"
+msgstr "Temeljnice zatvaranja fiskalne godine"
#. module: account
#: model:process.transition,name:account.process_transition_customerinvoice0
@@ -4768,6 +4910,8 @@ msgid ""
"The Journal Entry of the invoice have been totally reconciled with one or "
"several Journal Entries of payment."
msgstr ""
+"Stavka računa (potraživanje ili dugovanje) je kompletno zatvorena s jednom "
+"ili više stavaka plaćanja."
#. module: account
#: field:account.tax,child_depend:0
@@ -4791,7 +4935,7 @@ msgstr "Nije nađen period"
#. module: account
#: field:account.journal,update_posted:0
msgid "Allow Cancelling Entries"
-msgstr "Dozvoli storniranje stavki"
+msgstr "Dozvoli odažuriranje knjiženja"
#. module: account
#: field:account.tax.code,sign:0
@@ -4872,7 +5016,7 @@ msgstr "Kontrole unosa"
#: view:account.analytic.chart:0
#: view:project.account.analytic.line:0
msgid "(Keep empty to open the current situation)"
-msgstr "(Zadržite prazno da biste otvorili trenutno stanje)"
+msgstr "(prazno za trenutno stanje)"
#. module: account
#: field:account.analytic.Journal.report,date1:0
@@ -4896,7 +5040,7 @@ msgstr ""
#. module: account
#: model:ir.model,name:account.model_account_common_account_report
msgid "Account Common Account Report"
-msgstr ""
+msgstr "Account Common Account Report"
#. module: account
#: field:account.bank.statement.line,name:0
@@ -4913,14 +5057,14 @@ msgstr "Analitičko računovodstvo"
#: selection:account.invoice.report,type:0
#: selection:report.invoice.created,type:0
msgid "Customer Refund"
-msgstr "Povrat novca kupcu"
+msgstr "Odobrenje kupcu"
#. module: account
#: view:account.account:0
#: field:account.account,tax_ids:0
#: field:account.account.template,tax_ids:0
msgid "Default Taxes"
-msgstr "Zadani porezi"
+msgstr "Uobičajeni porezi"
#. module: account
#: field:account.tax,ref_tax_sign:0
@@ -4928,7 +5072,7 @@ msgstr "Zadani porezi"
#: field:account.tax.template,ref_tax_sign:0
#: field:account.tax.template,tax_sign:0
msgid "Tax Code Sign"
-msgstr "Predznak u PDV obrascu"
+msgstr "Koef. poreza"
#. module: account
#: model:ir.model,name:account.model_report_invoice_created
@@ -4960,6 +5104,9 @@ msgid ""
"something to reconcile or not. This figure already count the current partner "
"as reconciled."
msgstr ""
+"This is the remaining partners for who you should check if there is "
+"something to reconcile or not. This figure already count the current partner "
+"as reconciled."
#. module: account
#: view:account.subscription.line:0
@@ -4991,7 +5138,7 @@ msgstr "Promjeni valutu"
#: model:process.node,note:account.process_node_accountingentries0
#: model:process.node,note:account.process_node_supplieraccountingentries0
msgid "Accounting entries."
-msgstr ""
+msgstr "Accounting entries."
#. module: account
#: view:account.invoice:0
@@ -5017,6 +5164,8 @@ msgid ""
"According value related accounts will be display on respective reports "
"(Balance Sheet Profit & Loss Account)"
msgstr ""
+"Prema iznosu na koji se račun odnosi biti će prikazan na odgovarajućim "
+"izvješćima (Bilanca, Račun dobiti i gubitka)"
#. module: account
#: field:account.report.general.ledger,sortby:0
@@ -5030,6 +5179,8 @@ msgid ""
"There is no default default credit account defined \n"
"on journal \"%s\""
msgstr ""
+"Nije definiran uobičajeni potražni konto za\n"
+"dnevnik \"%s\""
#. module: account
#: field:account.entries.report,amount_currency:0
@@ -5045,7 +5196,7 @@ msgid ""
"Specified Journal does not have any account move entries in draft state for "
"this period"
msgstr ""
-"Navedeni dnevnik nema niti jednu stavku u stanju pripreme za ovo razdoblje"
+"Navedeni dnevnik nema niti jednu stavku u stanju \"Nacrt\" za ovo razdoblje"
#. module: account
#: model:ir.actions.act_window,name:account.action_view_move_line
@@ -5083,6 +5234,8 @@ msgid ""
"Number of partial amounts that can be combined to find a balance point can "
"be chosen as the power of the automatic reconciliation"
msgstr ""
+"Višekratnik automatskog zatvaranja je broj pojedinačnih iznosa koji će se "
+"kombinirati kod traženja odgovarajućeg iznosa"
#. module: account
#: help:account.payment.term.line,sequence:0
@@ -5114,6 +5267,9 @@ msgid ""
"impossible any new entry record. Close a fiscal year when you need to "
"finalize your end of year results definitive "
msgstr ""
+"Nakon knjiženja svih transakcije jedne poslovne godine, ovdje možete "
+"zatvoriti i zaključati poslovnu godinu. Zatvaranje će zatvoriti sve "
+"eventualno otvorene periode te godine i onemogućiti upis podataka. "
#. module: account
#: field:account.central.journal,amount_currency:0
@@ -5154,7 +5310,7 @@ msgstr "Dospjela potraživanja"
#. module: account
#: model:ir.actions.act_window,name:account.action_account_automatic_reconcile
msgid "Account Automatic Reconcile"
-msgstr "Automatsko zatvaranje"
+msgstr "Automatsko zatvaranje IOS-a"
#. module: account
#: view:account.move:0
@@ -5190,6 +5346,8 @@ msgid ""
"This module will support the Anglo-Saxons accounting methodology by changing "
"the accounting logic with stock transactions."
msgstr ""
+"This module will support the Anglo-Saxons accounting methodology by changing "
+"the accounting logic with stock transactions."
#. module: account
#: field:report.invoice.created,create_date:0
@@ -5259,6 +5417,8 @@ msgid ""
"Streamlines invoice payment and creates hooks to plug automated payment "
"systems in."
msgstr ""
+"Streamlines invoice payment and creates hooks to plug automated payment "
+"systems in."
#. module: account
#: field:account.payment.term.line,value:0
@@ -5308,6 +5468,9 @@ msgid ""
"document shows your debit and credit taking in consideration some criteria "
"you can choose by using the search tool."
msgstr ""
+"From this view, have an analysis of your different financial accounts. The "
+"document shows your debit and credit taking in consideration some criteria "
+"you can choose by using the search tool."
#. module: account
#: model:ir.actions.act_window,help:account.action_tax_code_list
@@ -5316,6 +5479,11 @@ msgid ""
"OpenERP allows you to define the tax structure and manage it from this menu. "
"You can define both numeric and alphanumeric tax codes."
msgstr ""
+"Definicija poreznih grupa ovisi o poreznim prijavama i poreznim izvještajima "
+"pojedine zemlje. Za svako polje porezne prijave potrebno je definirati jednu "
+"poreznu grupu, te dodatne grupe za stupce u knjigama URA/IRA kojih nema u "
+"poreznoj prijavi. Osim PDV-a porezne grupe je uputno kreirati i za ostale "
+"poreze npr. Porez na potrošnju ili razne trošarine koje ste obavezni plaćati."
#. module: account
#: help:account.partner.reconcile.process,progress:0
@@ -5323,6 +5491,8 @@ msgid ""
"Shows you the progress made today on the reconciliation process. Given by \n"
"Partners Reconciled Today \\ (Remaining Partners + Partners Reconciled Today)"
msgstr ""
+"Shows you the progress made today on the reconciliation process. Given by \n"
+"Partners Reconciled Today \\ (Remaining Partners + Partners Reconciled Today)"
#. module: account
#: help:account.payment.term.line,value:0
@@ -5331,6 +5501,8 @@ msgid ""
"that you should have your last line with the type 'Balance' to ensure that "
"the whole amount will be threated."
msgstr ""
+"Odaberite način izračuna ove stavke plaćanja. Dobra je praksa navesti "
+"posljednji redak tipa 'Saldo' kako bi se izračunao kompletan iznos."
#. module: account
#: field:account.invoice,period_id:0
@@ -5350,7 +5522,7 @@ msgstr "# linija"
#: code:addons/account/wizard/account_change_currency.py:60
#, python-format
msgid "New currency is not confirured properly !"
-msgstr ""
+msgstr "New currency is not confirured properly !"
#. module: account
#: field:account.aged.trial.balance,filter:0
@@ -5382,7 +5554,7 @@ msgstr "Ne mozete koristiti neaktivan konto!"
#: code:addons/account/account_move_line.py:803
#, python-format
msgid "Entries are not of the same account or already reconciled ! "
-msgstr "Stavke nisu istog konta ili su već usklađene ! "
+msgstr "Stavke nisu istog konta ili su već zatvorene! "
#. module: account
#: field:account.tax,account_collected_id:0
@@ -5470,7 +5642,7 @@ msgstr " 365 dana "
#: model:ir.actions.act_window,name:account.action_invoice_tree3
#: model:ir.ui.menu,name:account.menu_action_invoice_tree3
msgid "Customer Refunds"
-msgstr "Povrati od kupca"
+msgstr "Odobrenja kupcima"
#. module: account
#: view:account.payment.term.line:0
@@ -5496,7 +5668,7 @@ msgstr "nije implementirano"
#. module: account
#: help:account.journal,company_id:0
msgid "Company related to this journal"
-msgstr "Tvrtka za koju se vodi ovaj dnevnik"
+msgstr "Organizacija za koju se vodi ovaj dnevnik"
#. module: account
#: code:addons/account/wizard/account_invoice_state.py:44
@@ -5505,6 +5677,8 @@ msgid ""
"Selected Invoice(s) cannot be confirmed as they are not in 'Draft' or 'Pro-"
"Forma' state!"
msgstr ""
+"Ne mogu se potvrditi odabrani računi jer nisu svi u stanju 'Nacrt' ili 'Pro-"
+"Forma'!"
#. module: account
#: report:account.invoice:0
@@ -5542,6 +5716,11 @@ msgid ""
"line of the expense account. OpenERP will propose to you automatically the "
"Tax related to this account and the counterpart \"Account Payable\"."
msgstr ""
+"Ovu karticu koriste knjigovođe za ručni upis knjiženja u OpenERP. Ako želite "
+"upisati ulazni račun dobavljača, najprije upišite stavku troška, a program "
+"će automatski ponuditi slijedeću stavku(e) poreza prema definiranim porezima "
+"na kontu troška, a zatim i stavku ukupnog potraživanja dobavljača na kontu "
+"potraživanja partnera."
#. module: account
#: field:account.entries.report,date_created:0
@@ -5559,11 +5738,12 @@ msgid ""
"The code will be used to generate the numbers of the journal entries of this "
"journal."
msgstr ""
+"Ova šifra će se koristiti kao prefiks opisa/broja u stavkama knjiženja."
#. module: account
#: view:account.invoice:0
msgid "(keep empty to use the current period)"
-msgstr "(ostaviti prazno ako želite koristiti tekuće razdoblje)"
+msgstr "(ostaviti prazno za trenutno razdoblje)"
#. module: account
#: model:process.transition,note:account.process_transition_supplierreconcilepaid0
@@ -5571,6 +5751,7 @@ msgid ""
"As soon as the reconciliation is done, the invoice's state turns to “done” "
"(i.e. paid) in the system."
msgstr ""
+"Čim je obavljeno zatvaranje, stanje računa prelazi u \"izvršen\" (plaćen)."
#. module: account
#: code:addons/account/invoice.py:997
@@ -5587,7 +5768,7 @@ msgstr "Korijensko konto"
#. module: account
#: field:res.partner,last_reconciliation_date:0
msgid "Latest Reconciliation Date"
-msgstr ""
+msgstr "Zadnje zatvaranje IOS-a"
#. module: account
#: model:ir.model,name:account.model_account_analytic_line
@@ -5613,7 +5794,7 @@ msgstr "Postavke izvještaja"
#. module: account
#: 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
#: field:account.tax,type:0
@@ -5635,7 +5816,7 @@ msgstr "Prijava poreza"
#. module: account
#: model:ir.model,name:account.model_res_company
msgid "Companies"
-msgstr "Tvrtke"
+msgstr "Organizacije"
#. module: account
#: code:addons/account/account.py:532
@@ -5644,6 +5825,8 @@ msgid ""
"You cannot modify Company of account as its related record exist in Entry "
"Lines"
msgstr ""
+"You cannot modify Company of account as its related record exist in Entry "
+"Lines"
#. module: account
#: help:account.fiscalyear.close.state,fy_id:0
@@ -5653,7 +5836,7 @@ msgstr "Odaberite fiskalnu godinu za zatvaranje"
#. module: account
#: help:account.chart.template,tax_template_ids:0
msgid "List of all the taxes that have to be installed by the wizard"
-msgstr "Popis svih poreza koji trebaju biti instalirani od strane čarobnjaka"
+msgstr "Popis svih poreza koje asistent treba instalirati"
#. module: account
#: model:ir.actions.report.xml,name:account.account_intracom
@@ -5768,7 +5951,7 @@ msgstr " broj dana: 30"
#. module: account
#: help:account.analytic.line,currency_id:0
msgid "The related account currency if not equal to the company one."
-msgstr ""
+msgstr "The related account currency if not equal to the company one."
#. module: account
#: view:account.analytic.account:0
@@ -5849,7 +6032,7 @@ msgstr "Primjenjivi tip"
#: field:account.invoice,reference:0
#: field:account.invoice.line,invoice_id:0
msgid "Invoice Reference"
-msgstr "Vezna oznaka računa"
+msgstr "Poziv na br."
#. module: account
#: help:account.tax.template,sequence:0
@@ -5874,7 +6057,7 @@ msgstr "Likvidnost"
#: model:ir.actions.act_window,name:account.action_account_analytic_journal_open_form
#: model:ir.ui.menu,name:account.account_analytic_journal_entries
msgid "Analytic Journal Items"
-msgstr ""
+msgstr "Stavke analitičkog dnevnika"
#. module: account
#: view:account.fiscalyear.close:0
@@ -5883,6 +6066,8 @@ msgid ""
"year. Note that you can run this wizard many times for the same fiscal year: "
"it will simply replace the old opening entries with the new ones."
msgstr ""
+"Ovaj asistent će kreirati temeljnicu početnog stanja u novoj godini. "
+"Najprije će obrisati postojeće knjiženje početnog stanja i kreirati novo."
#. module: account
#: model:ir.ui.menu,name:account.menu_finance_bank_and_cash
@@ -5897,16 +6082,20 @@ msgid ""
"the tool search to analyse information about analytic entries generated in "
"the system."
msgstr ""
+"From this view, have an analysis of your different analytic entries "
+"following the analytic account you defined matching your business need. Use "
+"the tool search to analyse information about analytic entries generated in "
+"the system."
#. module: account
#: 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
#: field:account.account.template,nocreate:0
msgid "Optional create"
-msgstr ""
+msgstr "Opcionalno kreiranje"
#. module: account
#: code:addons/account/invoice.py:406
@@ -5914,7 +6103,7 @@ msgstr ""
#: code:addons/account/invoice.py:1348
#, python-format
msgid "Can not find account chart for this company, Please Create account."
-msgstr ""
+msgstr "Can not find account chart for this company, Please Create account."
#. module: account
#: code:addons/account/wizard/account_report_aged_partner_balance.py:57
@@ -5933,7 +6122,7 @@ msgstr "Povrat URA"
#. module: account
#: model:ir.ui.menu,name:account.menu_dashboard_acc
msgid "Dashboard"
-msgstr "Kontrolna ploča"
+msgstr "Kokpit"
#. module: account
#: field:account.bank.statement,move_line_ids:0
@@ -6031,7 +6220,7 @@ msgstr "Naziv modela"
#. module: account
#: field:account.chart.template,property_account_expense_categ:0
msgid "Expense Category Account"
-msgstr "Konto kategorije troška"
+msgstr "Konto troška"
#. module: account
#: view:account.bank.statement:0
@@ -6071,7 +6260,7 @@ msgstr "Stavke: "
#. module: account
#: view:account.use.model:0
msgid "Create manual recurring entries in a chosen journal."
-msgstr ""
+msgstr "Ručno kreiraj ponavljajuće temeljnice za odabrani dnevnik."
#. module: account
#: code:addons/account/account.py:1393
@@ -6090,6 +6279,13 @@ msgid ""
"account. From this view, you can create and manage the account types you "
"need for your company."
msgstr ""
+"An account type is used to determine how an account is used in each journal. "
+"The deferral method of an account type determines the process for the annual "
+"closing. Reports such as the Balance Sheet and the Profit and Loss report "
+"use the category (profit/loss or balance sheet). For example, the account "
+"type could be linked to an asset account, expense account or payable "
+"account. From this view, you can create and manage the account types you "
+"need for your company."
#. module: account
#: model:ir.actions.act_window,help:account.action_account_bank_reconcile_tree
@@ -6098,11 +6294,14 @@ msgid ""
"corresponds with the entries (or records) of that account in your accounting "
"system."
msgstr ""
+"Bank Reconciliation consists of verifying that your bank statement "
+"corresponds with the entries (or records) of that account in your accounting "
+"system."
#. module: account
#: model:process.node,note:account.process_node_draftstatement0
msgid "State is draft"
-msgstr "Stanje je 'U pripremi'"
+msgstr "Stanje je 'Nacrt'"
#. module: account
#: view:account.move.line:0
@@ -6134,6 +6333,8 @@ msgid ""
"This account will be used instead of the default one as the receivable "
"account for the current partner"
msgstr ""
+"Konto potraživanja od kupaca za ovog partnera, ako je različit od "
+"uobičajenog (12...)"
#. module: account
#: field:account.tax,python_applicable:0
@@ -6152,6 +6353,7 @@ msgstr "Python kod"
msgid ""
"Please define the Reserve and Profit/Loss account for current user company !"
msgstr ""
+"Please define the Reserve and Profit/Loss account for current user company !"
#. module: account
#: help:account.journal,update_posted:0
@@ -6159,6 +6361,8 @@ msgid ""
"Check this box if you want to allow the cancellation the entries related to "
"this journal or of the invoice related to this journal"
msgstr ""
+"Označite ako želite dopustiti naknadno otkazivanje proknjiženih (potvrđenih) "
+"temeljnica ili računa ovog dnevnika."
#. module: account
#: view:account.fiscalyear.close:0
@@ -6236,6 +6440,10 @@ msgid ""
"reconcile in a series of accounts. It finds entries for each partner where "
"the amounts correspond."
msgstr ""
+"Račun je plaćen kada su sve njegove stavke dugovanja kupca (ili potraživanja "
+"dobavljača) zatvorene kontra stavkama, najčešće plaćanjima banke, blagajne "
+"ili sl. Funkcija automatskog zatvaranja za svakog partnera pronalazi stavke "
+"odgovarajućeg iznosa."
#. module: account
#: view:account.move:0
@@ -6250,7 +6458,7 @@ msgstr "Za provjeru"
#: model:ir.ui.menu,name:account.menu_action_move_journal_line_form
#: model:ir.ui.menu,name:account.menu_finance_entries
msgid "Journal Entries"
-msgstr "Stavke dnevnika"
+msgstr "Stavke"
#. module: account
#: help:account.partner.ledger,page_split:0
@@ -6264,6 +6472,8 @@ msgid ""
"This report is an analysis done by a partner. It is a PDF report containing "
"one line per partner representing the cumulative credit balance"
msgstr ""
+"This report is an analysis done by a partner. It is a PDF report containing "
+"one line per partner representing the cumulative credit balance"
#. module: account
#: code:addons/account/wizard/account_validate_account_move.py:61
@@ -6271,6 +6481,7 @@ msgstr ""
msgid ""
"Selected Entry Lines does not have any account move enties in draft state"
msgstr ""
+"Selected Entry Lines does not have any account move enties in draft state"
#. module: account
#: selection:account.aged.trial.balance,target_move:0
@@ -6302,8 +6513,8 @@ msgstr "Sve stavke"
msgid ""
"Error: The default UOM and the purchase UOM must be in the same category."
msgstr ""
-"Greška: Zadana jedinica mjere i kupovna jedinica mjere moraju biti u istoj "
-"kategoriji."
+"Greška: Zadana jedinica mjere i jedinica mjere nabave moraju biti iz iste "
+"kategorije jedinica mjera."
#. module: account
#: view:account.journal.select:0
@@ -6314,7 +6525,7 @@ msgstr "Odabir dnevnika"
#: code:addons/account/wizard/account_change_currency.py:65
#, python-format
msgid "Currnt currency is not confirured properly !"
-msgstr ""
+msgstr "Currnt currency is not confirured properly !"
#. module: account
#: model:ir.model,name:account.model_account_move_reconcile
@@ -6339,7 +6550,7 @@ msgstr "Glavna knjiga"
#. module: account
#: model:process.transition,note:account.process_transition_paymentorderbank0
msgid "The payment order is sent to the bank."
-msgstr ""
+msgstr "Nalog za plaćanje je poslan u banku."
#. module: account
#: view:account.balance.report:0
@@ -6349,6 +6560,9 @@ msgid ""
"allowing you to quickly check the balance of each of your accounts in a "
"single report"
msgstr ""
+"This report allows you to print or generate a pdf of your trial balance "
+"allowing you to quickly check the balance of each of your accounts in a "
+"single report"
#. module: account
#: help:account.move,to_check:0
@@ -6356,6 +6570,8 @@ msgid ""
"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."
msgstr ""
+"Označite \"za provjeru\" kada niste sigurni da li je knjiženje ispravno i "
+"kada je potrebno ekspertno mišljenje."
#. module: account
#: help:account.installer.modules,account_voucher:0
@@ -6363,6 +6579,8 @@ msgid ""
"Account Voucher module includes all the basic requirements of Voucher "
"Entries for Bank, Cash, Sales, Purchase, Expenses, Contra, etc... "
msgstr ""
+"Account Voucher module includes all the basic requirements of Voucher "
+"Entries for Bank, Cash, Sales, Purchase, Expenses, Contra, etc... "
#. module: account
#: view:account.chart.template:0
@@ -6397,6 +6615,13 @@ msgid ""
"\n"
"e.g. My model on %(date)s"
msgstr ""
+"Možete navesti godinu, mjesec i dan u nazivu modela pomoću ovih oznaka:\n"
+"\n"
+"%(year)s: za godinu \n"
+"%(month)s: za mjesec \n"
+"%(date)s: tenutni datum\n"
+"\n"
+"npr. Knjiženje troškova plaće za %(month)s"
#. module: account
#: model:ir.actions.act_window,name:account.action_aged_income
@@ -6406,7 +6631,7 @@ msgstr "Konta prihoda"
#. module: account
#: help:report.invoice.created,origin:0
msgid "Reference of the document that generated this invoice report."
-msgstr ""
+msgstr "Oznaka dokumenta koji je kreirao ovaj račun."
#. module: account
#: field:account.tax.code,child_ids:0
@@ -6425,7 +6650,7 @@ msgstr "Nedovoljni Podaci!"
#: model:ir.actions.act_window,name:account.action_invoice_tree1
#: model:ir.ui.menu,name:account.menu_action_invoice_tree1
msgid "Customer Invoices"
-msgstr "Računi kupca"
+msgstr "Izlazni računi"
#. module: account
#: field:account.move.line.reconcile,writeoff:0
@@ -6435,7 +6660,7 @@ msgstr "Iznos otpisa"
#. module: account
#: view:account.analytic.line:0
msgid "Sales"
-msgstr "Prodaje"
+msgstr "Prodaja"
#. module: account
#: view:account.journal.column:0
@@ -6449,12 +6674,12 @@ msgstr "Stupac dnevnika"
#: selection:account.subscription,state:0
#: selection:report.invoice.created,state:0
msgid "Done"
-msgstr "Gotovo"
+msgstr "Izvršeno"
#. module: account
#: model:process.transition,note:account.process_transition_invoicemanually0
msgid "A statement with manual entries becomes a draft statement."
-msgstr ""
+msgstr "A statement with manual entries becomes a draft statement."
#. module: account
#: view:account.aged.trial.balance:0
@@ -6466,6 +6691,11 @@ msgid ""
"you request an interval of 30 days OpenERP generates an analysis of "
"creditors for the past month, past two months, and so on. "
msgstr ""
+"Struktura dospjelih dugovanja/potraživanja partnera je detaljniji izvještaj "
+"o dugovanjima/potraživanjima u intervalima. Za zadani period i broj dana "
+"intervala analize OpenERP izračunava tablicu dugovanja po intervalu. Ako "
+"zadate interval od 30 dana analiza će pokazati dugovanja do 30, 30 do 60, 60 "
+"do 90 dana i tako dalje. "
#. module: account
#: field:account.invoice,origin:0
@@ -6480,11 +6710,13 @@ msgid ""
"reports, so that you can see positive figures instead of negative ones in "
"expenses accounts."
msgstr ""
+"Omogućuje promjenu predznaka salda u izvještajima tako da se mogu prikazati "
+"pozitivni iznosi umjesto negativnih (duguje-potražuje)*predznak."
#. module: account
#: model:ir.actions.act_window,name:account.act_account_acount_move_line_open_unreconciled
msgid "Unreconciled Entries"
-msgstr "Otvorene stavke"
+msgstr "Otvorene stavke IOS-i"
#. module: account
#: model:ir.ui.menu,name:account.menu_menu_Bank_process
@@ -6511,6 +6743,10 @@ msgid ""
"an agreement with a customer or a supplier. With Define Recurring Entries, "
"you can create such entries to automate the postings in the system."
msgstr ""
+"A recurring entry is a miscellaneous entry that occurs on a recurrent basis "
+"from a specific date, i.e. corresponding to the signature of a contract or "
+"an agreement with a customer or a supplier. With Define Recurring Entries, "
+"you can create such entries to automate the postings in the system."
#. module: account
#: field:account.entries.report,product_uom_id:0
@@ -6527,6 +6763,10 @@ msgid ""
"basis. You can enter the coins that are in your cash box, and then post "
"entries when money comes in or goes out of the cash box."
msgstr ""
+"A Cash Register allows you to manage cash entries in your cash journals. "
+"This feature provides an easy way to follow up cash payments on a daily "
+"basis. You can enter the coins that are in your cash box, and then post "
+"entries when money comes in or goes out of the cash box."
#. module: account
#: selection:account.automatic.reconcile,power:0
@@ -6539,6 +6779,7 @@ msgid ""
"This date will be used as the invoice date for Refund Invoice and Period "
"will be chosen accordingly!"
msgstr ""
+"Datum računa za odobrenje, a fiskalni period će se odrediti automatski!"
#. module: account
#: field:account.aged.trial.balance,period_length:0
@@ -6560,18 +6801,26 @@ msgstr "Retci analitike"
#: model:ir.actions.act_window,help:account.action_account_analytic_account_tree2
msgid ""
"The normal chart of accounts has a structure defined by the legal "
-"requirement of the country. The analytic chart of accounts structure should "
+"requirement of the country. The analytic chart of account structure should "
"reflect your own business needs in term of costs/revenues reporting. They "
"are usually structured by contracts, projects, products or departements. "
"Most of the OpenERP operations (invoices, timesheets, expenses, etc) "
"generate analytic entries on the related account."
msgstr ""
+"Struktura kontnog plana glavne knjige zadana je zakonskim odredbama države u "
+"kojoj poslujemo.\n"
+"Struktura analitičkih kontnih planova bi trebala odražavati specifičnosti "
+"Vašeg poslovanja u pogledu izvještavanja o troškovima i prihodima. \n"
+"Uobičajeno je otvaranje troškovnih/upravljačkih analitičkih planova po "
+"odjelima, projektima, ugovorima, linijama proizvoda i slično.Većina "
+"aktivnosti u OpenERP-u (računi, ev.rada, troškovi radnika, itd) usput "
+"generiraju analitička knjiženja na relevantna analitička konta."
#. module: account
#: field:account.analytic.journal,line_ids:0
#: field:account.tax.code,line_ids:0
msgid "Lines"
-msgstr "Retci"
+msgstr "Stavke"
#. module: account
#: code:addons/account/invoice.py:521
@@ -6579,7 +6828,7 @@ msgstr "Retci"
msgid ""
"Can not find account chart for this company in invoice line account, Please "
"Create account."
-msgstr ""
+msgstr "Nedostaje kontni plan za ovu organizaciju. Kreirajte konta."
#. module: account
#: view:account.tax.template:0
@@ -6589,7 +6838,7 @@ msgstr "Predlošci poreza"
#. module: account
#: view:account.journal.select:0
msgid "Are you sure you want to open Journal Entries?"
-msgstr ""
+msgstr "Potvrdite otvaranje stavki."
#. module: account
#: view:account.state.open:0
@@ -6618,7 +6867,7 @@ msgstr "Izvod"
#. module: account
#: help:account.journal,default_debit_account_id:0
msgid "It acts as a default account for debit amount"
-msgstr ""
+msgstr "Uobičajeni konto za dugovni iznos"
#. module: account
#: model:ir.module.module,description:account.module_meta_information
@@ -6644,6 +6893,33 @@ msgid ""
"module named account_voucher.\n"
" "
msgstr ""
+"Accounting and Financial Management.\n"
+"====================================\n"
+"\n"
+"Financial and accounting module that covers:\n"
+"--------------------------------------------\n"
+"General accountings\n"
+"Cost / Analytic accounting\n"
+"Third party accounting\n"
+"Taxes management\n"
+"Budgets\n"
+"Customer and Supplier Invoices\n"
+"Bank statements\n"
+"Reconciliation process by partner\n"
+"\n"
+"Creates a dashboard for accountants that includes:\n"
+"--------------------------------------------------\n"
+"* List of Customer Invoice to Approve\n"
+"* Company Analysis\n"
+"* Graph of Aged Receivables\n"
+"* Graph of Treasury\n"
+"\n"
+"The processes like maintaining of general ledger is done through the defined "
+"financial Journals (entry move line or\n"
+"grouping is maintained through journal) for a particular financial year and "
+"for preparation of vouchers there is a\n"
+"module named account_voucher.\n"
+" "
#. module: account
#: model:ir.actions.act_window,help:account.action_account_journal_period_tree
@@ -6651,6 +6927,8 @@ msgid ""
"You can search for individual account entries through useful information. To "
"search for account entries, open a journal, then select a record line."
msgstr ""
+"You can search for individual account entries through useful information. To "
+"search for account entries, open a journal, then select a record line."
#. module: account
#: report:account.invoice:0
@@ -6669,7 +6947,7 @@ msgstr "Ukupan iznos dugovanja kupca"
#. module: account
#: model:ir.model,name:account.model_ir_sequence
msgid "ir.sequence"
-msgstr "ir.sequence"
+msgstr "ir.slijed"
#. module: account
#: field:account.journal.period,icon:0
@@ -6700,6 +6978,9 @@ msgid ""
"new counterpart but will share the same counterpart. This is used in fiscal "
"year closing."
msgstr ""
+"Označite ako ne želite da se kod knjiženja ovog dnevnika za svaku stavku "
+"stvara protustavka, već se kreira jedna protustavka za cijelu temeljnicu. "
+"Primjer: završna knjiženja kod zatvaranja poslovne godine."
#. module: account
#: field:account.bank.statement,closing_date:0
@@ -6732,6 +7013,8 @@ msgid ""
"Bank Account Number, Company bank account if Invoice is customer or supplier "
"refund, otherwise Partner bank account number."
msgstr ""
+"Broj računa banke, naš žiro rn. ako se radi o izlaznom računu ili odobrenju "
+"dobavljača, inače broj računa partnera."
#. module: account
#: help:account.tax,domain:0
@@ -6747,7 +7030,7 @@ msgstr ""
#: code:addons/account/account.py:938
#, python-format
msgid "You should have chosen periods that belongs to the same company"
-msgstr ""
+msgstr "You should have chosen periods that belongs to the same company"
#. module: account
#: field:account.fiscalyear.close,report_name:0
@@ -6767,7 +7050,7 @@ msgstr "Izvještavanje"
#. module: account
#: 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
#: field:account.bank.statement,ending_details_ids:0
@@ -6792,6 +7075,8 @@ msgid ""
"the system to go through the reconciliation process, based on the latest day "
"it have been reconciled."
msgstr ""
+"Pokazuje slijedećeg partnera u procesu zatvaranja IOS-a, a prema zadnjem "
+"danu zatvaranja IOS-a."
#. module: account
#: field:account.move.line.reconcile.writeoff,comment:0
@@ -6817,6 +7102,10 @@ msgid ""
"line of the expense account, OpenERP will propose to you automatically the "
"Tax related to this account and the counter-part \"Account Payable\"."
msgstr ""
+"Kartica za ručni upis knjiženja u OpenERP. Ako želite upisati ulazni račun, "
+"najprije upišite stavku troška, a program će automatski ponuditi slijedeću "
+"stavku(e) poreza prema definiranim porezima na kontu troška, a zatim i "
+"stavku ukupnog potraživanja dobavljača na kontu potraživanja partnera."
#. module: account
#: help:res.company,property_reserve_and_surplus_account:0
@@ -6825,13 +7114,16 @@ msgid ""
"will be added, Loss : Amount will be deducted.), Which is calculated from "
"Profit & Loss Report"
msgstr ""
+"This Account is used for transferring Profit/Loss(If It is Profit: Amount "
+"will be added, Loss : Amount will be deducted.), Which is calculated from "
+"Profit & Loss Report"
#. module: account
#: view:account.invoice.line:0
#: field:account.invoice.tax,invoice_id:0
#: model:ir.model,name:account.model_account_invoice_line
msgid "Invoice Line"
-msgstr "Redak računa"
+msgstr "Stavka računa"
#. module: account
#: field:account.balance.report,display_account:0
@@ -6861,7 +7153,7 @@ msgstr " dan u mjesecu= -1"
#. module: account
#: constraint:res.partner:0
msgid "Error ! You can not create recursive associated members."
-msgstr "Greška ! Ne možete kreirati rekurzivno pridružene članove."
+msgstr "Greška ! Ne možete kreirati rekurzivne pridružene članove."
#. module: account
#: help:account.journal,type:0
@@ -6873,13 +7165,19 @@ msgid ""
"Situation' to be used at the time of new fiscal year creation or end of year "
"entries generation."
msgstr ""
+"Select 'Sale' for Sale journal to be used at the time of making invoice. "
+"Select 'Purchase' for Purchase Journal to be used at the time of approving "
+"purchase order. Select 'Cash' to be used at the time of making payment. "
+"Select 'General' for miscellaneous operations. Select 'Opening/Closing "
+"Situation' to be used at the time of new fiscal year creation or end of year "
+"entries generation."
#. module: account
#: report:account.invoice:0
#: view:account.invoice:0
#: report:account.move.voucher:0
msgid "PRO-FORMA"
-msgstr "Predračun"
+msgstr "Pro-forma"
#. module: account
#: help:account.installer.modules,account_followup:0
@@ -6887,6 +7185,8 @@ msgid ""
"Helps you generate reminder letters for unpaid invoices, including multiple "
"levels of reminding and customized per-partner policies."
msgstr ""
+"Helps you generate reminder letters for unpaid invoices, including multiple "
+"levels of reminding and customized per-partner policies."
#. module: account
#: selection:account.entries.report,move_line_state:0
@@ -6930,6 +7230,7 @@ msgid ""
"This field is used for payable and receivable journal entries. You can put "
"the limit date for the payment of this line."
msgstr ""
+"Koristi se za salda konti kupaca i dobavljača. Upišite datum valute plaćanja."
#. module: account
#: code:addons/account/account_move_line.py:1271
@@ -6948,12 +7249,12 @@ msgstr "Dnevnik prodaje"
#: code:addons/account/wizard/account_move_journal.py:104
#, python-format
msgid "Open Journal Items !"
-msgstr "Otvori stavke dnevnika"
+msgstr "Prikaži stavke!"
#. module: account
#: model:ir.model,name:account.model_account_invoice_tax
msgid "Invoice Tax"
-msgstr "Porezi tačuna"
+msgstr "Porezi računa"
#. module: account
#: code:addons/account/account_move_line.py:1246
@@ -6993,7 +7294,7 @@ msgstr "Fiskalna godina za zatvaranje"
#: view:account.invoice.cancel:0
#: model:ir.actions.act_window,name:account.action_account_invoice_cancel
msgid "Cancel Selected Invoices"
-msgstr "Poništi odabrane račune"
+msgstr "Otkaži odabrane račune"
#. module: account
#: selection:account.entries.report,month:0
@@ -7030,7 +7331,7 @@ msgstr "Šifra"
#. module: account
#: view:validate.account.move:0
msgid "Post Journal Entries of a Journal"
-msgstr "Proknjiži"
+msgstr "Knjiženje temeljnica dnevnika"
#. module: account
#: view:product.product:0
@@ -7049,7 +7350,7 @@ msgstr "Gotovina"
#: field:account.fiscal.position.account,account_dest_id:0
#: field:account.fiscal.position.account.template,account_dest_id:0
msgid "Account Destination"
-msgstr "Ciljni račun"
+msgstr "Ciljni konto"
#. module: account
#: model:process.node,note:account.process_node_supplierpaymentorder0
@@ -7080,7 +7381,7 @@ msgstr "Bilanca"
msgid ""
"Check this if the price you use on the product and invoices includes this "
"tax."
-msgstr "Označite ovu kućicu ako cena proizvoda i racuna sadrze ovaj porez"
+msgstr "Cijena na proizvodu i računu sadrži ovaj porez."
#. module: account
#: view:account.state.open:0
@@ -7111,6 +7412,11 @@ msgid ""
"in which they will appear. Then you can create a new journal and link your "
"view to it."
msgstr ""
+"Here you can customize an existing journal view or create a new view. "
+"Journal views determine the way you can record entries in your journal. "
+"Select the fields you want to appear in a journal and determine the sequence "
+"in which they will appear. Then you can create a new journal and link your "
+"view to it."
#. module: account
#: view:account.payment.term.line:0
@@ -7166,6 +7472,9 @@ msgid ""
"to the higher ones. The order is important if you have a tax with several "
"tax children. In this case, the evaluation order is important."
msgstr ""
+"The sequence field is used to order the tax lines from the lowest sequences "
+"to the higher ones. The order is important if you have a tax with several "
+"tax children. In this case, the evaluation order is important."
#. module: account
#: model:ir.model,name:account.model_account_cashbox_line
@@ -7217,7 +7526,7 @@ msgstr "Stanje stavke"
#: model:ir.model,name:account.model_account_move_line_reconcile
#: model:ir.model,name:account.model_account_move_line_reconcile_writeoff
msgid "Account move line reconcile"
-msgstr ""
+msgstr "Account move line reconcile"
#. module: account
#: view:account.subscription.generate:0
@@ -7257,13 +7566,13 @@ msgstr "Partner"
#. module: account
#: help:account.change.currency,currency_id:0
msgid "Select a currency to apply on the invoice"
-msgstr ""
+msgstr "Odaberite valutu računa"
#. module: account
#: code:addons/account/wizard/account_invoice_refund.py:100
#, python-format
msgid "Can not %s draft/proforma/cancel invoice."
-msgstr ""
+msgstr "Nije moguće %s račun u stanju nacrt/proforma/otkazan."
#. module: account
#: code:addons/account/invoice.py:787
@@ -7297,6 +7606,8 @@ msgid ""
"Select Fiscal Year which you want to remove entries for its End of year "
"entries journal"
msgstr ""
+"Select Fiscal Year which you want to remove entries for its End of year "
+"entries journal"
#. module: account
#: field:account.tax.template,type_tax_use:0
@@ -7307,7 +7618,7 @@ msgstr "Primjena poreza za"
#: code:addons/account/account_bank_statement.py:346
#, python-format
msgid "The account entries lines are not in valid state."
-msgstr ""
+msgstr "The account entries lines are not in valid state."
#. module: account
#: field:account.account.type,close_method:0
@@ -7323,7 +7634,7 @@ msgstr "Račun '%s' je plaćen."
#. module: account
#: model:process.node,note:account.process_node_electronicfile0
msgid "Automatic entry"
-msgstr ""
+msgstr "Automatski upis"
#. module: account
#: constraint:account.tax.code.template:0
@@ -7341,8 +7652,8 @@ msgid ""
"If this box is checked, the system will try to group the accounting lines "
"when generating them from invoices."
msgstr ""
-"Ako je cekirano, sistem ce probati da grupise konta prilikom generisanja iz "
-"racuna."
+"Grupiranje istovrsnih redova računa u jednu stavku knjiženja (ako je isti "
+"konto, strana, porez ...)"
#. module: account
#: help:account.period,state:0
@@ -7350,6 +7661,8 @@ msgid ""
"When monthly periods are created. The state is 'Draft'. At the end of "
"monthly period it is in 'Done' state."
msgstr ""
+"When monthly periods are created. The state is 'Draft'. At the end of "
+"monthly period it is in 'Done' state."
#. module: account
#: report:account.analytic.account.inverted.balance:0
@@ -7413,11 +7726,14 @@ msgid ""
"will see the taxes with codes related to your legal statement according to "
"your country."
msgstr ""
+"The chart of taxes is used to generate your periodical tax statement. You "
+"will see the taxes with codes related to your legal statement according to "
+"your country."
#. module: account
#: view:account.installer.modules:0
msgid "Add extra Accounting functionalities to the ones already installed."
-msgstr ""
+msgstr "Add extra Accounting functionalities to the ones already installed."
#. module: account
#: report:account.analytic.account.cost_ledger:0
@@ -7447,7 +7763,7 @@ msgstr "Izaberite fiskalnu godinu"
#: code:addons/account/installer.py:495
#, python-format
msgid "Purchase Refund Journal"
-msgstr "Dnevnik povrata nabave"
+msgstr "Dnevnik odobrenja dobavljača"
#. module: account
#: help:account.tax.template,amount:0
@@ -7466,6 +7782,8 @@ msgid ""
"Modify Invoice: Cancels the current invoice and creates a new copy of it "
"ready for editing."
msgstr ""
+"Promjeni račun: Kreira storno/odobrenje cijelog računa, zatvara ga i kreira "
+"novu kopiju spremnu za izmjene."
#. module: account
#: model:ir.module.module,shortdesc:account.module_meta_information
@@ -7528,7 +7846,7 @@ msgstr "Dnevnik otpisa"
msgid ""
"This payment term will be used instead of the default one for the current "
"partner"
-msgstr "Ovi uvjeti plaćanja će se koristiti za ovog partnera."
+msgstr "Ovaj uvjet plaćanja će se koristiti kao uobičajeni za ovog partnera."
#. module: account
#: view:account.tax.template:0
@@ -7538,7 +7856,7 @@ msgstr "Kod za izračun cijena sa uključenim porezima"
#. module: account
#: field:account.chart.template,property_account_income_categ:0
msgid "Income Category Account"
-msgstr "Konto prihoda"
+msgstr "Zadani konto prihoda za grupu proizvoda"
#. module: account
#: model:ir.actions.act_window,name:account.action_account_fiscal_position_template_form
@@ -7564,6 +7882,10 @@ msgid ""
"can easily generate refunds and reconcile them directly from the invoice "
"form."
msgstr ""
+"With Customer Refunds you can manage the credit notes for your customers. A "
+"refund is a document that credits an invoice completely or partially. You "
+"can easily generate refunds and reconcile them directly from the invoice "
+"form."
#. module: account
#: model:ir.actions.act_window,help:account.action_account_vat_declaration
@@ -7575,6 +7897,12 @@ msgid ""
"useful because it enables you to preview at any time the tax that you owe at "
"the start and end of the month or quarter."
msgstr ""
+"This menu print a VAT declaration based on invoices or payments. You can "
+"select one or several periods of the fiscal year. Information required for a "
+"tax declaration is automatically generated by OpenERP from invoices (or "
+"payments, in some countries). This data is updated in real time. That’s very "
+"useful because it enables you to preview at any time the tax that you owe at "
+"the start and end of the month or quarter."
#. module: account
#: report:account.invoice:0
@@ -7584,7 +7912,7 @@ msgstr "Tel.:"
#. module: account
#: field:account.account,company_currency_id:0
msgid "Company Currency"
-msgstr "Valuta tvrtke"
+msgstr "Valuta organizacije"
#. module: account
#: model:process.node,name:account.process_node_paymententries0
@@ -7599,6 +7927,9 @@ msgid ""
"added, Loss: Amount will be duducted), which is calculated from Profilt & "
"Loss Report"
msgstr ""
+"This Account is used for transfering Profit/Loss (Profit: Amount will be "
+"added, Loss: Amount will be duducted), which is calculated from Profilt & "
+"Loss Report"
#. module: account
#: help:account.move.line,blocked:0
@@ -7606,6 +7937,8 @@ msgid ""
"You can check this box to mark this journal item as a litigation with the "
"associated partner"
msgstr ""
+"Možete provjeriti ovaj okvir kako bi obilježili stavku temeljnice kao "
+"poveznicu s pripadajućim partnerom."
#. module: account
#: field:account.move.line,reconcile_partial_id:0
@@ -7616,17 +7949,17 @@ msgstr "Djelomično zatvaranje"
#. module: account
#: model:ir.model,name:account.model_account_analytic_inverted_balance
msgid "Account Analytic Inverted Balance"
-msgstr ""
+msgstr "Account Analytic Inverted Balance"
#. module: account
#: model:ir.model,name:account.model_account_common_report
msgid "Account Common Report"
-msgstr ""
+msgstr "Računovodstveni izvještaji"
#. module: account
#: model:process.transition,name:account.process_transition_filestatement0
msgid "Automatic import of the bank sta"
-msgstr ""
+msgstr "Automatski uvoz bankovnih izvoda"
#. module: account
#: model:ir.actions.act_window,name:account.action_account_journal_view
@@ -7637,19 +7970,19 @@ msgstr "Pogledi dnevnika"
#. module: account
#: model:ir.model,name:account.model_account_move_bank_reconcile
msgid "Move bank reconcile"
-msgstr ""
+msgstr "Move bank reconcile"
#. module: account
#: model:ir.actions.act_window,name:account.action_account_type_form
#: model:ir.ui.menu,name:account.menu_action_account_type_form
msgid "Account Types"
-msgstr "Tipovi konta"
+msgstr "Account Types"
#. module: account
#: code:addons/account/invoice.py:897
#, python-format
msgid "Cannot create invoice move on centralised journal"
-msgstr ""
+msgstr "Cannot create invoice move on centralised journal"
#. module: account
#: field:account.account.type,report_type:0
@@ -7684,7 +8017,7 @@ msgstr "Saldo blagajne"
#. module: account
#: model:ir.model,name:account.model_account_fiscalyear_close_state
msgid "Fiscalyear Close state"
-msgstr ""
+msgstr "Fiscalyear Close state"
#. module: account
#: field:account.invoice.refund,journal_id:0
@@ -7714,18 +8047,22 @@ msgid ""
"sales orders or deliveries. You should only confirm them before sending them "
"to your customers."
msgstr ""
+"Izlazni računi koje izdajete Vašim kupcima. OpenERP obično kreira račune "
+"automatski iz prodajnih naloga ili otpremnica. Vi ih trebate provjeriti i "
+"potvrditi prije slanja kupcima. Potvrdom se generira broj računa i "
+"automatsko knjiženje dokumenta."
#. module: account
#: view:account.entries.report:0
#: view:board.board:0
#: model:ir.actions.act_window,name:account.action_company_analysis_tree
msgid "Company Analysis"
-msgstr "Analiza tvrtke"
+msgstr "Analiza organizacije"
#. module: account
#: help:account.invoice,account_id:0
msgid "The partner account used for this invoice."
-msgstr "Konto partnera za ovu fakturu"
+msgstr "Konto partnera za ovaj račun"
#. module: account
#: field:account.tax.code,parent_id:0
@@ -7750,6 +8087,7 @@ msgstr "Dnevnik URA"
#: view:account.invoice.refund:0
msgid "Refund Invoice: Creates the refund invoice, ready for editing."
msgstr ""
+"Račun odobrenja: Kreira nacrt računa odobrenja, spremnog za promjene."
#. module: account
#: field:account.invoice.line,price_subtotal:0
@@ -7759,12 +8097,12 @@ msgstr "Podzbroj"
#. module: account
#: view:account.vat.declaration:0
msgid "Print Tax Statement"
-msgstr ""
+msgstr "Ispis porezne izjave"
#. module: account
#: view:account.model.line:0
msgid "Journal Entry Model Line"
-msgstr ""
+msgstr "Stavka modela temeljnice"
#. module: account
#: view:account.invoice:0
@@ -7786,6 +8124,7 @@ msgstr "Dobavljači"
msgid ""
"You cannot create more than one move per period on centralized journal"
msgstr ""
+"You cannot create more than one move per period on centralized journal"
#. module: account
#: view:account.journal:0
@@ -7795,14 +8134,14 @@ msgstr "Dozvoljene vrste konta (prazno za bez kontrole)"
#. module: account
#: view:res.partner:0
msgid "Supplier Accounting Properties"
-msgstr "Svojstva računovodstva dobavljača"
+msgstr "SK Dobavljača"
#. module: account
#: help:account.move.line,amount_residual:0
msgid ""
"The residual amount on a receivable or payable of a journal entry expressed "
"in the company currency."
-msgstr ""
+msgstr "Ostatak iznosa dugovanja ili potraživanja u valuti organizacije."
#. module: account
#: view:account.payment.term.line:0
@@ -7828,7 +8167,7 @@ msgstr "Fiskalna godina zatvorena"
#. module: account
#: sql_constraint:account.account:0
msgid "The code of the account must be unique per company !"
-msgstr ""
+msgstr "Šifra konta mora biti jedinstvena za jednu organizaciju !"
#. module: account
#: model:ir.actions.act_window,name:account.act_account_journal_2_account_invoice_opened
@@ -7905,7 +8244,7 @@ msgstr ""
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
#: code:addons/account/account_move_line.py:1131
@@ -7923,14 +8262,14 @@ msgstr "Prazno za sve otvorene fiskalne godine"
#: code:addons/account/account_move_line.py:1056
#, python-format
msgid "The account move (%s) for centralisation has been confirmed!"
-msgstr ""
+msgstr "The account move (%s) for centralisation has been confirmed!"
#. module: account
#: help:account.move.line,amount_currency:0
msgid ""
"The amount expressed in an optional other currency if it is a multi-currency "
"entry."
-msgstr ""
+msgstr "Iznos u drugoj valuti ."
#. module: account
#: view:account.account:0
@@ -7965,11 +8304,12 @@ msgstr "Valuta"
msgid ""
"Gives the sequence order when displaying a list of bank statement lines."
msgstr ""
+"Gives the sequence order when displaying a list of bank statement lines."
#. module: account
#: model:process.transition,note:account.process_transition_validentries0
msgid "Accountant validates the accounting entries coming from the invoice."
-msgstr ""
+msgstr "Knjigovođa potvrđuje temeljnicu nastalu potvrdom računa."
#. module: account
#: model:ir.actions.act_window,help:account.action_account_fiscalyear_form
@@ -7982,6 +8322,13 @@ msgid ""
"would be referred to as FY 2011. You are not obliged to follow the actual "
"calendar year."
msgstr ""
+"Definirajte financijsku godinu poduzeća u skladu s vašim potrebama. "
+"Financijska godina je razdoblje na temelju kojeg su postavljeni računi "
+"poduzeća (najčešće 12 mjeseci) .Financijska godina obično nazivaju prema "
+"datum u kojem ista završava. Na primjer, ako tvrtka je financijskoj godini "
+"završava 30. studenoga 2011, sve između 1 prosinca 2010 i 30. studeni 2011 "
+"odnositi će se kao FG 2011. Niste dužni slijediti stvarei kalendarske "
+"godine."
#. module: account
#: model:ir.actions.act_window,name:account.act_account_acount_move_line_reconcile_open
@@ -8005,6 +8352,15 @@ msgid ""
"* The 'Paid' state is set automatically when invoice is paid. \n"
"* The 'Cancelled' state is used when user cancel invoice."
msgstr ""
+" * 'Nacrt' - upis računa je u tijeku, račun još nije potvrđen. \n"
+"* 'Pro-forma' - račun još nije pravovaljan - nije mu dodijeljen broj računa. "
+" \n"
+"* 'Otvoren' - broj računa je dodijeljen, račun je s tim brojem knjižen i "
+"ostaje otvoren dok se ne plati. \n"
+"* 'Plaćen' - stanje se automatski postavlja zatvaranjem svih IOS-a ovog "
+"računa. \n"
+"* 'Otkazan' - račun je iz nekog razloga otkazan i ostaje u sistemu radi "
+"evidencije."
#. module: account
#: field:account.invoice.refund,period:0
@@ -8014,7 +8370,7 @@ msgstr "Forsiraj period"
#. module: account
#: model:ir.model,name:account.model_account_partner_balance
msgid "Print Account Partner Balance"
-msgstr ""
+msgstr "Print Account Partner Balance"
#. module: account
#: field:res.partner,contract_ids:0
@@ -8036,7 +8392,7 @@ msgstr "Dnevnik početnog stanja"
#. module: account
#: model:process.transition,note:account.process_transition_customerinvoice0
msgid "Draft invoices are checked, validated and printed."
-msgstr ""
+msgstr "Nacrti računa se provjeravaju, potvrđuju i ispisuju."
#. module: account
#: help:account.chart.template,property_reserve_and_surplus_account:0
@@ -8045,6 +8401,9 @@ msgid ""
"will be added, Loss: Amount will be deducted.), Which is calculated from "
"Profilt & Loss Report"
msgstr ""
+"Ovaj račun se koristi za prijenos Dobiti / gubitka (ako je Profit: Iznos će "
+"biti dodan, gubitak: Iznos će biti odbijen.),Izračunava se iz Izvješća o "
+"dobiti / gubitku"
#. module: account
#: field:account.invoice,reference_type:0
@@ -8083,6 +8442,8 @@ msgid ""
"the amount of this case into its parent. For example, set 1/-1 if you want "
"to add/substract it."
msgstr ""
+"Koeficijent zbrajanja na nadređenu grupu. Npr. 1/-1 za zbrajanje/oduzimanje "
+"ili 0 za izostavljanje."
#. module: account
#: view:account.invoice:0
@@ -8106,7 +8467,7 @@ msgstr "Otvori dnevnik"
#. module: account
#: report:account.analytic.account.journal:0
msgid "KI"
-msgstr ""
+msgstr "KI"
#. module: account
#: report:account.analytic.account.cost_ledger:0
@@ -8120,7 +8481,7 @@ msgstr "Od perioda"
#: code:addons/account/installer.py:476
#, python-format
msgid "Sales Refund Journal"
-msgstr "Dnevnik povrata IRA"
+msgstr "Dnevnik odobrenja kupcima"
#. module: account
#: code:addons/account/account.py:927
@@ -8129,6 +8490,8 @@ msgid ""
"You cannot modify company of this period as its related record exist in "
"Entry Lines"
msgstr ""
+"You cannot modify company of this period as its related record exist in "
+"Entry Lines"
#. module: account
#: view:account.move:0
@@ -8145,7 +8508,7 @@ msgstr "Registrirana plaćanja"
#. module: account
#: view:account.fiscalyear.close.state:0
msgid "Close states of Fiscal year and periods"
-msgstr ""
+msgstr "Close states of Fiscal year and periods"
#. module: account
#: view:account.analytic.line:0
@@ -8164,7 +8527,7 @@ msgstr "Analitika"
#: model:process.node,name:account.process_node_invoiceinvoice0
#: model:process.node,name:account.process_node_supplierinvoiceinvoice0
msgid "Create Invoice"
-msgstr "Stvori račun"
+msgstr "Kreiraj račun"
#. module: account
#: field:account.installer,purchase_tax:0
@@ -8192,7 +8555,7 @@ msgstr "Postavke Vaše računovodstvene aplikacije"
#: code:addons/account/installer.py:479
#, python-format
msgid "SCNJ"
-msgstr ""
+msgstr "SCNJ"
#. module: account
#: model:process.transition,note:account.process_transition_analyticinvoice0
@@ -8200,6 +8563,8 @@ msgid ""
"Analytic costs (timesheets, some purchased products, ...) come from analytic "
"accounts. These generate draft invoices."
msgstr ""
+"Analitički troškovi (ev. rada, nabava, ...) dolaze sa analitičkih "
+"konta(računa). Oni mogu kreirati nacrte računa."
#. module: account
#: help:account.journal,view_id:0
@@ -8209,6 +8574,10 @@ msgid ""
"in which order. You can create your own view for a faster encoding in each "
"journal."
msgstr ""
+"Gives the view used when writing or browsing entries in this journal. The "
+"view tells OpenERP which fields should be visible, required or readonly and "
+"in which order. You can create your own view for a faster encoding in each "
+"journal."
#. module: account
#: field:account.period,date_stop:0
@@ -8243,7 +8612,7 @@ msgstr "Od perioda"
#: code:addons/account/account.py:2333
#, python-format
msgid "Cannot locate parent code for template account!"
-msgstr ""
+msgstr "Cannot locate parent code for template account!"
#. module: account
#: field:account.aged.trial.balance,direction_selection:0
@@ -8274,7 +8643,7 @@ msgstr "Ukupno potražuje"
#. module: account
#: model:process.transition,note:account.process_transition_suppliervalidentries0
msgid "Accountant validates the accounting entries coming from the invoice. "
-msgstr ""
+msgstr "Knjigovođa potvrđuje temeljnicu nastalu potvrdom računa. "
#. module: account
#: code:addons/account/invoice.py:1008
@@ -8283,6 +8652,7 @@ msgid ""
"You cannot cancel the Invoice which is Partially Paid! You need to "
"unreconcile concerned payment entries!"
msgstr ""
+"Ne možete otkazati račun koji je djelomično plaćen, dok ne otvorite stavke!"
#. module: account
#: report:account.overdue:0
@@ -8308,7 +8678,7 @@ msgstr "Ne može se knjižiti na sintetički konto."
#: code:addons/account/wizard/account_change_currency.py:71
#, python-format
msgid "Current currency is not confirured properly !"
-msgstr ""
+msgstr "Current currency is not confirured properly !"
#. module: account
#: model:ir.actions.act_window,help:account.action_invoice_tree4
@@ -8318,6 +8688,10 @@ msgid ""
"partially. You can easily generate refunds and reconcile them directly from "
"the invoice form."
msgstr ""
+"With Supplier Refunds you can manage the credit notes you receive from your "
+"suppliers. A refund is a document that credits an invoice completely or "
+"partially. You can easily generate refunds and reconcile them directly from "
+"the invoice form."
#. module: account
#: view:account.account.template:0
@@ -8338,7 +8712,7 @@ msgstr "RDG (konta prihoda)"
#: view:account.tax:0
#: view:account.tax.template:0
msgid "Keep empty to use the income account"
-msgstr "Ostavite prazno za koto prihoda"
+msgstr "Ostavite prazno za konto prihoda"
#. module: account
#: field:account.account,balance:0
@@ -8373,7 +8747,7 @@ msgstr "Saldo"
#. module: account
#: model:process.node,note:account.process_node_supplierbankstatement0
msgid "Manually or automatically entered in the system"
-msgstr ""
+msgstr "Manually or automatically entered in the system"
#. module: account
#: report:account.account.balance:0
@@ -8410,6 +8784,8 @@ msgid ""
"This report is analysis by partner. It is a PDF report containing one line "
"per partner representing the cumulative credit balance."
msgstr ""
+"This report is analysis by partner. It is a PDF report containing one line "
+"per partner representing the cumulative credit balance."
#. module: account
#: selection:account.account,type:0
@@ -8445,18 +8821,24 @@ msgid ""
"the income account. OpenERP will propose to you automatically the Tax "
"related to this account and the counter-part \"Account receivable\"."
msgstr ""
+"Kartica za ručni upis knjiženja u OpenERP. Ako želite knjižiti izlazni račun "
+"kupcu, odaberite dnevnik (vrsta dnevnika - izlazni računi) i fiskalni "
+"period. Najprije upišite stavku prihoda, a program će automatski ponuditi "
+"slijedeću stavku(e) poreza prema definiranim porezima na kontu troška, a "
+"zatim i stavku ukupnog dugovanja kupca na konto dugovanja sa kartice "
+"partnera."
#. module: account
#: code:addons/account/account_bank_statement.py:391
#, python-format
msgid "Cannot delete bank statement(s) which are already confirmed !"
-msgstr ""
+msgstr "Ne možete obrisati bankovni izvod koji je prethodno potvrđen !"
#. module: account
#: code:addons/account/wizard/account_automatic_reconcile.py:152
#, python-format
msgid "You must select accounts to reconcile"
-msgstr ""
+msgstr "Morate odabrati konta za zatvaranje"
#. module: account
#: model:ir.actions.act_window,name:account.action_account_receivable_graph
@@ -8466,7 +8848,7 @@ msgstr "Saldo po vrsti konta"
#. module: account
#: model:process.transition,note:account.process_transition_entriesreconcile0
msgid "Accounting entries are the first input of the reconciliation."
-msgstr ""
+msgstr "Accounting entries are the first input of the reconciliation."
#. module: account
#: model:ir.actions.act_window,help:account.action_account_period_form
@@ -8478,6 +8860,11 @@ msgid ""
"closed or left open depending on your company's activities over a specific "
"period."
msgstr ""
+"Ovdje se definiraju fiskalni periodi. Ovi knjigovodstveni periodi bi trebali "
+"odgovarati periodima po kojima vaša organizacija ima obvezu prijave poreza "
+"na dodanu vrijednost. Najčešće se radi o mjesečnim ili tromjesečnim "
+"razdobljima. Zatvaranje perioda zabranjuje daljnja knjiženja za taj period. "
+"Preporuča se zatvaranje perioda nakon predaje porezne prijave."
#. module: account
#: report:account.move.voucher:0
@@ -8510,12 +8897,12 @@ msgstr "Temeljnica"
#: code:addons/account/account_move_line.py:1128
#, python-format
msgid "You can not change the tax, you should remove and recreate lines !"
-msgstr ""
+msgstr "You can not change the tax, you should remove and recreate lines !"
#. module: account
#: report:account.central.journal:0
msgid "A/C No."
-msgstr ""
+msgstr "A/C No."
#. module: account
#: model:ir.actions.act_window,name:account.act_account_journal_2_account_bank_statement
@@ -8527,11 +8914,12 @@ msgstr "Bankovni izvodi"
msgid ""
"Creates an account with the selected template under this existing parent."
msgstr ""
+"Creates an account with the selected template under this existing parent."
#. module: account
#: selection:account.model.line,date_maturity:0
msgid "Date of the day"
-msgstr ""
+msgstr "Date of the day"
#. module: account
#: code:addons/account/wizard/account_move_bank_reconcile.py:49
@@ -8551,7 +8939,7 @@ msgstr "Transakcije zatvaranja"
#. module: account
#: model:ir.actions.act_window,name:account.action_account_common_menu
msgid "Common Report"
-msgstr ""
+msgstr "Izvještaji"
#. module: account
#: view:account.account:0
@@ -8566,6 +8954,8 @@ msgid ""
"The journal must have centralised counterpart without the Skipping draft "
"state option checked!"
msgstr ""
+"The journal must have centralised counterpart without the Skipping draft "
+"state option checked!"
#. module: account
#: model:process.node,note:account.process_node_paymententries0
@@ -8585,7 +8975,7 @@ msgstr "Srpanj"
#. module: account
#: view:account.account:0
-msgid "Chart of Accounts"
+msgid "Chart of accounts"
msgstr "Kontni plan"
#. module: account
@@ -8632,7 +9022,7 @@ msgstr "Do perioda"
#: field:account.print.journal,chart_account_id:0
#: field:account.report.general.ledger,chart_account_id:0
#: field:account.vat.declaration,chart_account_id:0
-msgid "Chart of Accounts"
+msgid "Chart of account"
msgstr "Kontni plan"
#. module: account
@@ -8648,7 +9038,7 @@ msgstr "Standardne stavke"
#. module: account
#: model:ir.model,name:account.model_account_subscription
msgid "Account Subscription"
-msgstr ""
+msgstr "Pretplata"
#. module: account
#: code:addons/account/invoice.py:717
@@ -8698,7 +9088,7 @@ msgstr "Početni datum"
#. module: account
#: model:process.node,name:account.process_node_supplierdraftinvoices0
msgid "Draft Invoices"
-msgstr "Neodobreni računi"
+msgstr "Nacrti računa"
#. module: account
#: selection:account.account.type,close_method:0
@@ -8716,7 +9106,7 @@ msgstr "Pogrešan ukupni iznos !"
#. module: account
#: field:account.journal,sequence_id:0
msgid "Entry Sequence"
-msgstr "Redoslijed unosa"
+msgstr "Brojčana serija"
#. module: account
#: model:ir.actions.act_window,help:account.action_account_period_tree
@@ -8729,6 +9119,13 @@ msgid ""
"open period. Close a period when you do not want to record new entries and "
"want to lock this period for tax related calculation."
msgstr ""
+"A period is a fiscal period of time during which accounting entries should "
+"be recorded for accounting related activities. Monthly period is the norm "
+"but depending on your countries or company needs, you could also have "
+"quarterly periods. Closing a period will make it impossible to record new "
+"accounting entries, all new entries should then be made on the following "
+"open period. Close a period when you do not want to record new entries and "
+"want to lock this period for tax related calculation."
#. module: account
#: view:account.analytic.account:0
@@ -8739,7 +9136,7 @@ msgstr "Na čekanju"
#: model:process.transition,name:account.process_transition_analyticinvoice0
#: model:process.transition,name:account.process_transition_supplieranalyticcost0
msgid "From analytic accounts"
-msgstr ""
+msgstr "Iz analitičkog računa"
#. module: account
#: field:account.installer.modules,account_payment:0
@@ -8779,6 +9176,9 @@ msgid ""
"Make sure you have configured Payment Term properly !\n"
"It should contain atleast one Payment Term Line with type \"Balance\" !"
msgstr ""
+"You cannot validate a non-balanced entry !\n"
+"Make sure you have configured Payment Term properly !\n"
+"It should contain atleast one Payment Term Line with type \"Balance\" !"
#. module: account
#: help:res.partner,property_account_payable:0
@@ -8786,6 +9186,8 @@ msgid ""
"This account will be used instead of the default one as the payable account "
"for the current partner"
msgstr ""
+"Konto obveza prema dobavljačima za ovog partnera, ako je različit od "
+"uobičajenog (22...)"
#. module: account
#: field:account.period,special:0
@@ -8802,7 +9204,7 @@ msgstr "Sekundarna valuta"
#. module: account
#: model:ir.model,name:account.model_validate_account_move
msgid "Validate Account Move"
-msgstr ""
+msgstr "Validate Account Move"
#. module: account
#: field:account.account,credit:0
@@ -8836,6 +9238,8 @@ msgid ""
"created. If you leave that field empty, it will use the same journal as the "
"current invoice."
msgstr ""
+"Odaberite dnevnik za račun odobrenja/storna. Ako ostavite prazno, koristiti "
+"će se dnevnik ovog računa (isti dnevnik)."
#. module: account
#: report:account.move.voucher:0
@@ -8846,12 +9250,12 @@ msgstr ""
#: view:account.general.journal:0
#: model:ir.ui.menu,name:account.menu_account_general_journal
msgid "General Journals"
-msgstr ""
+msgstr "General Journals"
#. module: account
#: view:account.model:0
msgid "Journal Entry Model"
-msgstr ""
+msgstr "Model temeljnice"
#. module: account
#: code:addons/account/wizard/account_use_model.py:44
@@ -8861,6 +9265,8 @@ msgid ""
"payment term!\n"
"Please define partner on it!"
msgstr ""
+"Datum dospijeća stavke unosa generira se od strane modela linije '%s', te se "
+"temelji se na roku plaćanja partnera! NMolimo definirati partnera!"
#. module: account
#: field:account.cashbox.line,number:0
@@ -8942,7 +9348,7 @@ msgstr "Travanj"
#. module: account
#: view:account.move.line.reconcile.select:0
msgid "Open for Reconciliation"
-msgstr ""
+msgstr "Open for Reconciliation"
#. module: account
#: field:account.account,parent_left:0
@@ -8955,12 +9361,15 @@ msgid ""
"Refund invoice base on this type. You can not Modify and Cancel if the "
"invoice is already reconciled"
msgstr ""
+"Kreiraj račun odobrenja. Zatvorene (plaćene) račune ne možete mijenjati ili "
+"otkazati."
#. module: account
#: help:account.installer.modules,account_analytic_plans:0
msgid ""
"Allows invoice lines to impact multiple analytic accounts simultaneously."
msgstr ""
+"Allows invoice lines to impact multiple analytic accounts simultaneously."
#. module: account
#: field:account.installer,sale_tax:0
@@ -8971,7 +9380,7 @@ msgstr "Porez prodaje(%)"
#: model:ir.actions.act_window,name:account.action_invoice_tree2
#: model:ir.ui.menu,name:account.menu_action_invoice_tree2
msgid "Supplier Invoices"
-msgstr "Računi dobavljača"
+msgstr "Ulazni računi"
#. module: account
#: view:account.analytic.line:0
@@ -8996,6 +9405,9 @@ msgid ""
"and is the process of transferring debit and credit amounts from a journal "
"of original entry to a ledger book."
msgstr ""
+"Ažuriranje temeljnice \"knjiženje u gl. knjigu\" je proces prijenosa iznosa "
+"duguje i potražuje iz dnevnika u glavnu knjigu. Kod nekih izvještaja možete "
+"birati između ažuriranih stavaka ili svih evidentiranih stavaka."
#. module: account
#: report:account.tax.code.entries:0
@@ -9018,6 +9430,8 @@ msgid ""
"This report allows you to print or generate a pdf of your general ledger "
"with details of all your account journals"
msgstr ""
+"This report allows you to print or generate a pdf of your general ledger "
+"with details of all your account journals"
#. module: account
#: selection:account.account,type:0
@@ -9115,7 +9529,7 @@ msgstr "Dan u mjesecu"
#: field:account.fiscal.position.tax,tax_src_id:0
#: field:account.fiscal.position.tax.template,tax_src_id:0
msgid "Tax Source"
-msgstr "Porez"
+msgstr "Iz poreza"
#. module: account
#: report:account.balancesheet:0
@@ -9133,7 +9547,7 @@ msgstr "Brojači poslovne godine"
#. module: account
#: help:account.model,name:0
msgid "This is a model for recurring accounting entries"
-msgstr "Ovo je model za ponavljajuće računovodstvene unose"
+msgstr "Ovo je predložak za ponavljajuće temeljnice"
#. module: account
#: code:addons/account/account_analytic_line.py:100
@@ -9146,7 +9560,7 @@ msgstr "Ne postoji konto prihoda za ovaj proizvod: \"%s\" (id:%d)"
#: report:account.third_party_ledger:0
#: report:account.third_party_ledger_other:0
msgid "JRNL"
-msgstr ""
+msgstr "JRNL"
#. module: account
#: view:account.payment.term.line:0
@@ -9209,22 +9623,22 @@ msgstr "Dnevnik: Svi"
#: field:analytic.entries.report,company_id:0
#: field:wizard.multi.charts.accounts,company_id:0
msgid "Company"
-msgstr "Tvrtka"
+msgstr "Organizacija"
#. module: account
#: model:ir.ui.menu,name:account.menu_action_subscription_form
msgid "Define Recurring Entries"
-msgstr ""
+msgstr "Postava ponavljajućih dok."
#. module: account
#: field:account.entries.report,date_maturity:0
msgid "Date Maturity"
-msgstr ""
+msgstr "Datum valute"
#. module: account
#: help:account.bank.statement,total_entry_encoding:0
msgid "Total cash transactions"
-msgstr ""
+msgstr "Ukupno transakcije blagajne"
#. module: account
#: help:account.partner.reconcile.process,today_reconciled:0
@@ -9233,6 +9647,9 @@ msgid ""
"reconciliation process today. The current partner is counted as already "
"processed."
msgstr ""
+"This figure depicts the total number of partners that have gone throught the "
+"reconciliation process today. The current partner is counted as already "
+"processed."
#. module: account
#: view:account.fiscalyear:0
@@ -9242,12 +9659,12 @@ msgstr "Stvori mjesečna razdoblja"
#. module: account
#: field:account.tax.code.template,sign:0
msgid "Sign For Parent"
-msgstr "Predznak za nadređeni"
+msgstr "Predznak za nadređenog"
#. module: account
#: model:ir.model,name:account.model_account_balance_report
msgid "Trial Balance Report"
-msgstr ""
+msgstr "Izvješće stanja bilance"
#. module: account
#: model:ir.actions.act_window,name:account.action_bank_statement_draft_tree
@@ -9258,12 +9675,12 @@ msgstr "Nepotvrđeni izvodi"
#: model:process.transition,note:account.process_transition_statemententries0
msgid ""
"Manual or automatic creation of payment entries according to the statements"
-msgstr ""
+msgstr "Ručno ili automatsko kreiranje stavki plaćanja prema izvodima"
#. module: account
#: view:account.invoice:0
msgid "Invoice lines"
-msgstr "Retci računa"
+msgstr "Stavke računa"
#. module: account
#: field:account.aged.trial.balance,period_to:0
@@ -9320,17 +9737,17 @@ msgstr "Knjiženje otpisa"
#. module: account
#: model:process.node,note:account.process_node_paidinvoice0
msgid "Invoice's state is Done"
-msgstr ""
+msgstr "Stanje računa je zatvoreno/plaćeno"
#. module: account
#: model:ir.model,name:account.model_report_account_sales
msgid "Report of the Sales by Account"
-msgstr ""
+msgstr "Izvještaj o prodaji po kontu"
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_account
msgid "Accounts Fiscal Position"
-msgstr ""
+msgstr "Fiskalna pozicija"
#. module: account
#: report:account.invoice:0
@@ -9340,7 +9757,7 @@ msgstr ""
#: model:process.process,name:account.process_process_supplierinvoiceprocess0
#: selection:report.invoice.created,type:0
msgid "Supplier Invoice"
-msgstr "Račun Dobavljača"
+msgstr "Ulazni račun"
#. module: account
#: field:account.account,debit:0
@@ -9370,7 +9787,7 @@ msgstr "Duguje"
#. module: account
#: field:account.invoice,invoice_line:0
msgid "Invoice Lines"
-msgstr "Retci računa"
+msgstr "Stavke računa"
#. module: account
#: constraint:account.account.template:0
@@ -9399,7 +9816,7 @@ msgstr "Stavka je već zatvorena"
#. module: account
#: model:ir.model,name:account.model_report_account_receivable
msgid "Receivable accounts"
-msgstr "Konta Potraživanja"
+msgstr "Konta potraživanja"
#. module: account
#: selection:account.model.line,date_maturity:0
@@ -9451,7 +9868,7 @@ msgstr "Podatci analitičkog konta"
#. module: account
#: view:account.tax.code.template:0
msgid "Account Tax Code Template"
-msgstr "Predložak šifre poreza"
+msgstr "Predložak porezne grupe"
#. module: account
#: model:process.node,name:account.process_node_manually0
@@ -9476,7 +9893,7 @@ msgstr "Ispiši analitičke dnevnike"
#. module: account
#: view:account.analytic.line:0
msgid "Fin.Account"
-msgstr ""
+msgstr "Fin.konto"
#. module: account
#: model:ir.actions.act_window,name:account.action_aged_receivable_graph
@@ -9487,7 +9904,7 @@ msgstr "Stara potraživanja"
#. module: account
#: field:account.tax,applicable_type:0
msgid "Applicability"
-msgstr ""
+msgstr "Primjenjivost"
#. module: account
#: code:addons/account/wizard/account_move_journal.py:165
@@ -9498,18 +9915,18 @@ msgstr "Ovo razdoblje je već zatvoreno !"
#. module: account
#: help:account.move.line,currency_id:0
msgid "The optional other currency if it is a multi-currency entry."
-msgstr ""
+msgstr "The optional other currency if it is a multi-currency entry."
#. module: account
#: model:process.transition,note:account.process_transition_invoiceimport0
msgid ""
"Import of the statement in the system from a supplier or customer invoice"
-msgstr ""
+msgstr "Uvoz naloga u sistem iz ulaznog ili izlaznog računa"
#. module: account
#: model:ir.ui.menu,name:account.menu_finance_periodical_processing_billing
msgid "Billing"
-msgstr "Fakturiranje"
+msgstr "Billing"
#. module: account
#: view:account.account:0
@@ -9526,6 +9943,12 @@ msgid ""
"may keep several types of specialized journals such as a cash journal, "
"purchase journal, sales journal..."
msgstr ""
+"Upravljanje dnevnicima Vaše organizacije. Dnevnik se koristi za "
+"evidentiranje svih knjigovodstvenih transakcija koristeći dvojno "
+"knjigovodstvo. Prema naravi aktivnosti i broju transakcija organizacije "
+"koristite više tipova specijaliziranih dnevnika kao što su banka, blagajna, "
+"ulazni računi, izlazni računi i sl. Možete voditi neograničen broj dnevnika, "
+"već prema potrebama."
#. module: account
#: model:ir.model,name:account.model_account_analytic_chart
@@ -9535,7 +9958,7 @@ msgstr "Analitički kontni plan"
#. module: account
#: help:account.invoice,residual:0
msgid "Remaining amount due."
-msgstr "Ostatak dugovnog iznosa."
+msgstr "Ostatak dugovanja."
#. module: account
#: model:ir.ui.menu,name:account.menu_finance_statistic_report_statement
@@ -9558,7 +9981,7 @@ msgstr "Mapiranje konta"
#: code:addons/account/invoice.py:346
#, python-format
msgid "Invoice '%s' is waiting for validation."
-msgstr ""
+msgstr "Račun '%s' čeka potvrdu."
#. module: account
#: selection:account.entries.report,month:0
@@ -9583,7 +10006,7 @@ msgstr "Konto prihoda ili troškova vezan za odabrani proizvod."
#: code:addons/account/account_move_line.py:1117
#, python-format
msgid "The date of your Journal Entry is not in the defined period!"
-msgstr ""
+msgstr "The date of your Journal Entry is not in the defined period!"
#. module: account
#: field:account.subscription,period_total:0
@@ -9594,7 +10017,7 @@ msgstr "Broj perioda"
#: report:account.general.journal:0
#: model:ir.actions.report.xml,name:account.account_general_journal
msgid "General Journal"
-msgstr "Glavni dnevnik"
+msgstr "Opći dnevnik"
#. module: account
#: view:account.invoice:0
@@ -9638,7 +10061,7 @@ msgstr "Dokumenti računovodstva"
#. module: account
#: model:ir.model,name:account.model_validate_account_move_lines
msgid "Validate Account Move Lines"
-msgstr ""
+msgstr "Ažuriraj stavke"
#. module: account
#: model:ir.actions.act_window,name:account.action_account_analytic_cost_ledger_journal
@@ -9649,12 +10072,12 @@ msgstr "Knjiga troškova (Samo količine)"
#. module: account
#: model:process.node,note:account.process_node_supplierpaidinvoice0
msgid "Invoice's state is Done."
-msgstr ""
+msgstr "Stanje računa je zatvoreno/plaćeno."
#. module: account
#: model:process.transition,note:account.process_transition_reconcilepaid0
msgid "As soon as the reconciliation is done, the invoice can be paid."
-msgstr ""
+msgstr "Čim je obavljeno zatvaranje, račun može biti plaćen."
#. module: account
#: view:account.account.template:0
@@ -9685,7 +10108,7 @@ msgstr "account.addtmpl.wizard"
#: report:account.third_party_ledger:0
#: report:account.third_party_ledger_other:0
msgid "Partner's"
-msgstr "partneri"
+msgstr "Partneri"
#. module: account
#: model:ir.actions.act_window,name:account.action_account_fiscalyear_form
@@ -9700,6 +10123,8 @@ msgid ""
"If the active field is set to False, it will allow you to hide the analytic "
"journal without removing it."
msgstr ""
+"Ako aktivno polje postavljeno na False, to će vam omogućiti da sakrijete "
+"analitiku temeljnice bez da ju uklonite."
#. module: account
#: field:account.analytic.line,ref:0
@@ -9734,7 +10159,7 @@ msgstr "Bankovni račun"
#: model:ir.actions.act_window,name:account.action_account_central_journal
#: model:ir.model,name:account.model_account_central_journal
msgid "Account Central Journal"
-msgstr ""
+msgstr "Account Central Journal"
#. module: account
#: report:account.overdue:0
@@ -9749,7 +10174,7 @@ msgstr "Budućnost"
#. module: account
#: view:account.move.line:0
msgid "Search Journal Items"
-msgstr "Traži stavke dnevnika"
+msgstr "Traži stavke glavne knjige"
#. module: account
#: help:account.tax,base_sign:0
@@ -9771,7 +10196,7 @@ msgstr "Predlozak mapiranja konta"
#. module: account
#: field:account.chart.template,property_account_expense:0
msgid "Expense Account on Product Template"
-msgstr "Konto troškova na predlošku proizvoda"
+msgstr "Zadani konto troška za proizvode"
#. module: account
#: field:account.analytic.line,amount_currency:0
@@ -9801,6 +10226,9 @@ msgid ""
"certain amount of information. They have to be certified by an external "
"auditor annually."
msgstr ""
+"Kreirajte i upravljajte strukturom kontnih planova i kontima koje će te "
+"koristiti za evidenciju knjigovodstvenih dokumenata. Konto je dio glavne "
+"knjige koja omogućuje bilježenje poslovnih transakcija."
#. module: account
#: help:account.move.line,amount_residual_currency:0
@@ -9808,6 +10236,8 @@ msgid ""
"The residual amount on a receivable or payable of a journal entry expressed "
"in its currency (maybe different of the company currency)."
msgstr ""
+"Ostatak iznosa dugovanja ili potraživanja u svojoj valuti (ne nužno valuti "
+"organizacije)."
#. module: account
#: report:account.balancesheet:0
@@ -9887,9 +10317,6 @@ msgstr ""
#~ msgid "Bank Receipt"
#~ msgstr "Bankovni primitak"
-#~ msgid "Ending Balance"
-#~ msgstr "Završni saldo"
-
#, python-format
#~ msgid ""
#~ "The expected balance (%.2f) is different than the computed one. (%.2f)"
@@ -10211,6 +10638,9 @@ msgstr ""
#~ msgid "Credit Trans."
#~ msgstr "Dugovna transakcija"
+#~ msgid "JNRL"
+#~ msgstr "JNRL"
+
#~ msgid "Subscription Entries"
#~ msgstr "Stavke pretplate"
@@ -10339,9 +10769,6 @@ msgstr ""
#~ msgid "Invalid model name in the action definition."
#~ msgstr "Pogrešno ime modela u definiciji akcije."
-#~ msgid "Unreconciled entries"
-#~ msgstr "Otvorene stavke"
-
#~ msgid "Move line select"
#~ msgstr "Odabir stavke knjiženja"
@@ -10905,5 +11332,15 @@ msgstr ""
#~ msgid "Balance Sheet (Assets Accounts)"
#~ msgstr "Bilanca (konta imovine)"
-#~ msgid "Chart of Accounts"
+#~ msgid "Chart of Account"
#~ msgstr "Kontni plan"
+
+#, python-format
+#~ msgid "is validated."
+#~ msgstr "is validated."
+
+#~ msgid "Unreconciled entries"
+#~ msgstr "Unreconciled entries"
+
+#~ msgid "Ending Balance"
+#~ msgstr "Ending Balance"
diff --git a/addons/account/project/analytic_account_demo.xml b/addons/account/project/analytic_account_demo.xml
index 7cf5a59efc1..2661e67cd50 100644
--- a/addons/account/project/analytic_account_demo.xml
+++ b/addons/account/project/analytic_account_demo.xml
@@ -103,6 +103,7 @@
normalopen
+ Seagate P2
@@ -111,6 +112,7 @@
open
+ Magasin BML 1
@@ -118,6 +120,7 @@
normal
+ CampToCamp
@@ -127,6 +130,7 @@
+ open
@@ -135,13 +139,15 @@
normal
+ Asustek4normal
-
+
+ DistriPC
@@ -149,6 +155,7 @@
normal
+ Sednacom
@@ -158,6 +165,7 @@
normal
+ open
@@ -168,6 +176,7 @@
normal
+ open
@@ -178,6 +187,7 @@
normal
+ Desertic - Hispafuentes
@@ -187,6 +197,7 @@
normal
+ OpenERP SA AT Work
@@ -194,6 +205,7 @@
normal
+ Camp to Camp
@@ -203,6 +215,7 @@
normal
+ open
diff --git a/addons/account/project/project_view.xml b/addons/account/project/project_view.xml
index cc05092688b..d6df834f4e8 100644
--- a/addons/account/project/project_view.xml
+++ b/addons/account/project/project_view.xml
@@ -8,16 +8,16 @@
tree
-
-
+
+
-
+
@@ -57,11 +57,10 @@
treechild_complete_ids
-
+
-
@@ -85,7 +84,7 @@
-
+
@@ -194,7 +193,7 @@
-
+
diff --git a/addons/account/report/account_print_invoice.rml b/addons/account/report/account_print_invoice.rml
index db8f752a56d..ff2a8e525be 100644
--- a/addons/account/report/account_print_invoice.rml
+++ b/addons/account/report/account_print_invoice.rml
@@ -162,11 +162,7 @@
[[ (o.partner_id and o.partner_id.title and o.partner_id.title.name) or '' ]] [[ (o.partner_id and o.partner_id.name) or '' ]]
- [[ (o.address_invoice_id and o.address_invoice_id.street) or '' ]]
- [[ (o.address_invoice_id and o.address_invoice_id.street2) or removeParentNode('para') ]]
- [[ (o.address_invoice_id and o.address_invoice_id.zip) or '' ]] [[ (o.address_invoice_id and o.address_invoice_id.city) or '' ]]
- [[ (o.address_invoice_id and o.address_invoice_id.state_id and o.address_invoice_id.state_id.name) or removeParentNode('para') ]]
- [[ (o.address_invoice_id and o.address_invoice_id.country_id and o.address_invoice_id.country_id.name) or '' ]]
+ [[ display_address(o.address_invoice_id) ]]
@@ -198,7 +194,7 @@
Origin
- Your Reference
+ Customer Code
diff --git a/addons/account/security/account_security.xml b/addons/account/security/account_security.xml
index 5c4c9a0a525..c928ff3c8fe 100644
--- a/addons/account/security/account_security.xml
+++ b/addons/account/security/account_security.xml
@@ -49,13 +49,6 @@
['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]
-
- Analytic journal multi-company
-
-
- ['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]
-
-
Period multi-company
diff --git a/addons/account_accountant/__openerp__.py b/addons/account_accountant/__openerp__.py
index d808a38fa18..c1086285f93 100644
--- a/addons/account_accountant/__openerp__.py
+++ b/addons/account_accountant/__openerp__.py
@@ -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:
diff --git a/addons/account_accountant/i18n/az.po b/addons/account_accountant/i18n/az.po
new file mode 100644
index 00000000000..ede1216401d
--- /dev/null
+++ b/addons/account_accountant/i18n/az.po
@@ -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 , 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME \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 \n"
+"Language-Team: Azerbaijani \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"
diff --git a/addons/account_analytic_analysis/__openerp__.py b/addons/account_analytic_analysis/__openerp__.py
index 32642caf49c..ee887e1ff6a 100644
--- a/addons/account_analytic_analysis/__openerp__.py
+++ b/addons/account_analytic_analysis/__openerp__.py
@@ -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',
}
diff --git a/addons/account_analytic_analysis/account_analytic_analysis.py b/addons/account_analytic_analysis/account_analytic_analysis.py
index 36d62e32e63..3fe60e449cd 100644
--- a/addons/account_analytic_analysis/account_analytic_analysis.py
+++ b/addons/account_analytic_analysis/account_analytic_analysis.py
@@ -406,25 +406,25 @@ 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='Hours Tot',
- help="Number of hours you spent on the analytic account (from timesheet). It computes on all journal of type 'general'."),
+ '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."),
'last_worked_invoiced_date': fields.function(_analysis_all, multi='analytic_analysis', type='date', string='Date of Last Invoiced Cost',
help="If invoice from the costs, this is the date of the latest work or cost that have been invoiced."),
'last_worked_date': fields.function(_analysis_all, multi='analytic_analysis', type='date', string='Date of Last Cost/Work',
help="Date of the latest work done on this account."),
- 'hours_qtt_non_invoiced': fields.function(_analysis_all, multi='analytic_analysis', type='float', string='Uninvoiced Hours',
- help="Number of hours (from journal of type 'general') that can be invoiced if you invoice based on analytic account."),
- 'hours_qtt_invoiced': fields.function(_hours_qtt_invoiced_calc, type='float', string='Invoiced Hours',
- help="Number of hours that can be invoiced plus those that already have been invoiced."),
- 'remaining_hours': fields.function(_remaining_hours_calc, type='float', string='Remaining Hours',
- help="Computed using the formula: Maximum Quantity - Hours Tot."),
+ 'hours_qtt_non_invoiced': fields.function(_analysis_all, multi='analytic_analysis', type='float', string='Uninvoiced Time',
+ help="Number of time (hours/days) (from journal of type 'general') that can be invoiced if you invoice based on analytic account."),
+ '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 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 Hours (real)',
- help="Computed using the formula: Invoiced Amount / Hours Tot.",
+ 'revenue_per_hour': fields.function(_revenue_per_hour_calc, type='float', string='Revenue per Time (real)',
+ 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.",
diff --git a/addons/account_analytic_analysis/account_analytic_analysis_menu.xml b/addons/account_analytic_analysis/account_analytic_analysis_menu.xml
index 19271cb4af2..1f6444c7351 100644
--- a/addons/account_analytic_analysis/account_analytic_analysis_menu.xml
+++ b/addons/account_analytic_analysis/account_analytic_analysis_menu.xml
@@ -8,6 +8,7 @@
formtree,form[('invoice_id','=',False)]
+ {'search_default_to_invoice': 1}
@@ -58,18 +59,6 @@
-
- Contracts to Renew
- account.analytic.account
- form
- tree,form,graph
- {'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}
- [('type','=','normal')]
-
- 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.
-
-
-
Contracts to Renewaccount.analytic.account
diff --git a/addons/account_analytic_analysis/account_analytic_analysis_view.xml b/addons/account_analytic_analysis/account_analytic_analysis_view.xml
index c59717e8ad4..9bf66c18344 100644
--- a/addons/account_analytic_analysis/account_analytic_analysis_view.xml
+++ b/addons/account_analytic_analysis/account_analytic_analysis_view.xml
@@ -110,22 +110,5 @@
-
- account.analytic.account.simplified.tree
- account.analytic.account
- tree
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/addons/account_analytic_analysis/i18n/hr.po b/addons/account_analytic_analysis/i18n/hr.po
index 7467f5c21c1..6e47a09d215 100644
--- a/addons/account_analytic_analysis/i18n/hr.po
+++ b/addons/account_analytic_analysis/i18n/hr.po
@@ -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) \n"
+"PO-Revision-Date: 2011-12-08 16:13+0000\n"
+"Last-Translator: Goran Kliska \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"
diff --git a/addons/account_analytic_default/__openerp__.py b/addons/account_analytic_default/__openerp__.py
index e46f285d9c6..a842275cdee 100644
--- a/addons/account_analytic_default/__openerp__.py
+++ b/addons/account_analytic_default/__openerp__.py
@@ -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:
diff --git a/addons/account_analytic_default/i18n/hr.po b/addons/account_analytic_default/i18n/hr.po
index 88376676f6d..9fb8cc18a77 100644
--- a/addons/account_analytic_default/i18n/hr.po
+++ b/addons/account_analytic_default/i18n/hr.po
@@ -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) \n"
+"PO-Revision-Date: 2011-12-08 16:13+0000\n"
+"Last-Translator: Goran Kliska \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!"
diff --git a/addons/account_analytic_plans/i18n/hr.po b/addons/account_analytic_plans/i18n/hr.po
index f34ae4e36d3..8a203825445 100644
--- a/addons/account_analytic_plans/i18n/hr.po
+++ b/addons/account_analytic_plans/i18n/hr.po
@@ -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ć \n"
+"PO-Revision-Date: 2011-12-08 16:14+0000\n"
+"Last-Translator: Goran Kliska \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"
diff --git a/addons/account_asset/__openerp__.py b/addons/account_asset/__openerp__.py
index f3d00b08893..5ae0629c4eb 100644
--- a/addons/account_asset/__openerp__.py
+++ b/addons/account_asset/__openerp__.py
@@ -49,6 +49,7 @@
],
"active": False,
"installable": True,
+ "application": True,
}
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account_asset/account_asset_view.xml b/addons/account_asset/account_asset_view.xml
index d28579a6c1a..e986ef4bf0d 100644
--- a/addons/account_asset/account_asset_view.xml
+++ b/addons/account_asset/account_asset_view.xml
@@ -32,11 +32,11 @@
-
-
-
-
-
+
+
+
+
+
@@ -317,7 +317,7 @@
Review Asset Categoriesaccount.asset.categoryform
- form
+ tree,form
diff --git a/addons/account_asset/i18n/es_AR.po b/addons/account_asset/i18n/es_AR.po
new file mode 100644
index 00000000000..9102ec58885
--- /dev/null
+++ b/addons/account_asset/i18n/es_AR.po
@@ -0,0 +1,529 @@
+# Spanish (Argentina) 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 , 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME \n"
+"POT-Creation-Date: 2009-11-24 12:54+0000\n"
+"PO-Revision-Date: 2011-11-30 23:41+0000\n"
+"Last-Translator: Gustavo Earnshaw \n"
+"Language-Team: Spanish (Argentina) \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-02 04:47+0000\n"
+"X-Generator: Launchpad (build 14414)\n"
+
+#. module: account_asset
+#: model:ir.actions.act_window,name:account_asset.action_account_asset_asset_list_normal
+#: model:ir.ui.menu,name:account_asset.menu_action_account_asset_asset_list_normal
+msgid "Open Assets"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.property,method_end:0
+#: field:account.asset.property.history,method_end:0
+msgid "Ending date"
+msgstr ""
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "Depreciation board"
+msgstr ""
+
+#. module: account_asset
+#: view:account.asset.asset:0
+#: field:account.asset.asset,name:0
+#: field:account.asset.board,asset_id:0
+#: field:account.asset.property,asset_id:0
+#: field:account.invoice.line,asset_id:0
+#: field:account.move.line,asset_id:0
+#: model:ir.actions.act_window,name:account_asset.action_account_asset_asset_form
+#: 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 ""
+
+#. module: account_asset
+#: constraint:ir.actions.act_window:0
+msgid "Invalid model name in the action definition."
+msgstr ""
+
+#. module: account_asset
+#: selection:account.asset.property,method:0
+msgid "Linear"
+msgstr ""
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "Change duration"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.asset,child_ids:0
+msgid "Child assets"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.board,value_asset:0
+msgid "Asset Value"
+msgstr "valor de activos"
+
+#. module: account_asset
+#: wizard_field:account.asset.modify,init,name:0
+msgid "Reason"
+msgstr ""
+
+#. module: account_asset
+#: view:account.asset.asset:0
+#: field:account.asset.asset,entry_ids:0
+#: wizard_field:account.asset.compute,asset_compute,move_ids:0
+msgid "Entries"
+msgstr ""
+
+#. module: account_asset
+#: wizard_view:account.asset.compute,asset_compute:0
+msgid "Generated entries"
+msgstr ""
+
+#. module: account_asset
+#: wizard_field:account.asset.modify,init,method_delay:0
+#: field:account.asset.property,method_delay:0
+#: field:account.asset.property.history,method_delay:0
+msgid "Number of interval"
+msgstr ""
+
+#. module: account_asset
+#: wizard_button:account.asset.compute,asset_compute,asset_open:0
+msgid "Open entries"
+msgstr ""
+
+#. module: account_asset
+#: view:account.asset.asset:0
+#: model:ir.actions.act_window,name:account_asset.action_account_asset_asset_list
+#: model:ir.ui.menu,name:account_asset.menu_action_account_asset_asset_list
+#: model:ir.ui.menu,name:account_asset.menu_finance_Assets
+#: model:ir.ui.menu,name:account_asset.menu_finance_config_Assets
+msgid "Assets"
+msgstr ""
+
+#. module: account_asset
+#: selection:account.asset.property,method:0
+msgid "Progressive"
+msgstr ""
+
+#. module: account_asset
+#: model:ir.actions.act_window,name:account_asset.action_account_asset_asset_list_draft
+#: model:ir.ui.menu,name:account_asset.menu_action_account_asset_asset_list_draft
+msgid "Draft Assets"
+msgstr ""
+
+#. module: account_asset
+#: wizard_view:account.asset.modify,init:0
+#: wizard_field:account.asset.modify,init,note:0
+#: view:account.asset.property.history:0
+msgid "Notes"
+msgstr "Notas"
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "Change history"
+msgstr ""
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "Depreciation entries"
+msgstr ""
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "Methods"
+msgstr ""
+
+#. module: account_asset
+#: wizard_view:account.asset.modify,init:0
+msgid "Asset properties to modify"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.asset,partner_id:0
+msgid "Partner"
+msgstr ""
+
+#. module: account_asset
+#: wizard_field:account.asset.modify,init,method_period:0
+#: field:account.asset.property,method_period:0
+#: field:account.asset.property.history,method_period:0
+msgid "Period per interval"
+msgstr ""
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "Depreciation duration"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.property,account_analytic_id:0
+msgid "Analytic account"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.property,state:0
+msgid "State"
+msgstr ""
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "Depreciation methods"
+msgstr ""
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "Other information"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.board,value_asset_cumul:0
+msgid "Cumul. value"
+msgstr ""
+
+#. module: account_asset
+#: view:account.asset.property:0
+msgid "Assets methods"
+msgstr ""
+
+#. module: account_asset
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr ""
+
+#. module: account_asset
+#: model:ir.model,name:account_asset.model_account_asset_property
+msgid "Asset property"
+msgstr ""
+
+#. module: account_asset
+#: wizard_view:account.asset.compute,asset_compute:0
+#: wizard_view:account.asset.compute,init:0
+#: wizard_button:account.asset.compute,init,asset_compute:0
+#: 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 ""
+
+#. 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 ""
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "Confirm asset"
+msgstr ""
+
+#. module: account_asset
+#: view:account.asset.property.history:0
+#: model:ir.model,name:account_asset.model_account_asset_property_history
+msgid "Asset history"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.property,date:0
+msgid "Date created"
+msgstr ""
+
+#. module: account_asset
+#: model:ir.module.module,description:account_asset.module_meta_information
+msgid ""
+"Financial and accounting asset management.\n"
+" Allows to define\n"
+" * Asset category. \n"
+" * Assets.\n"
+" *Asset usage period and property.\n"
+" "
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.board,value_gross:0
+#: field:account.asset.property,value_total:0
+msgid "Gross value"
+msgstr ""
+
+#. module: account_asset
+#: selection:account.asset.property,method_time:0
+msgid "Ending period"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.board,name:0
+msgid "Asset name"
+msgstr ""
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "Accounts information"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.asset,note:0
+#: field:account.asset.category,note:0
+#: field:account.asset.property.history,note:0
+msgid "Note"
+msgstr ""
+
+#. module: account_asset
+#: selection:account.asset.asset,state:0
+#: selection:account.asset.property,state:0
+msgid "Draft"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.property,type:0
+msgid "Depr. method type"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.property,account_asset_id:0
+msgid "Asset account"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.property.history,asset_property_id:0
+msgid "Method"
+msgstr ""
+
+#. module: account_asset
+#: selection:account.asset.asset,state:0
+msgid "Normal"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.property,method_progress_factor:0
+msgid "Progressif factor"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.asset,localisation:0
+msgid "Localisation"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.property,method:0
+msgid "Computation method"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.property,method_time:0
+msgid "Time method"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.asset,active:0
+msgid "Active"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.property.history,user_id:0
+msgid "User"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.asset,property_ids:0
+msgid "Asset method name"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.asset,date:0
+#: field:account.asset.property.history,date:0
+msgid "Date"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.board,value_net:0
+msgid "Net value"
+msgstr ""
+
+#. module: account_asset
+#: wizard_view:account.asset.close,init:0
+#: model:ir.actions.wizard,name:account_asset.wizard_asset_close
+msgid "Close asset"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.property,history_ids:0
+msgid "History"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.property,account_actif_id:0
+msgid "Depreciation account"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.asset,period_id:0
+#: wizard_field:account.asset.compute,init,period_id:0
+msgid "Period"
+msgstr ""
+
+#. 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 ""
+
+#. 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 ""
+
+#. 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 ""
+
+#. module: account_asset
+#: selection:account.asset.property,state:0
+msgid "Open"
+msgstr ""
+
+#. module: account_asset
+#: constraint:ir.model:0
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
+msgstr ""
+
+#. module: account_asset
+#: model:ir.module.module,shortdesc:account_asset.module_meta_information
+msgid "Asset management"
+msgstr ""
+
+#. module: account_asset
+#: view:account.asset.board:0
+#: field:account.asset.property,board_ids:0
+#: model:ir.model,name:account_asset.model_account_asset_board
+msgid "Asset board"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.asset,state:0
+msgid "Global state"
+msgstr ""
+
+#. module: account_asset
+#: selection:account.asset.property,method_time:0
+msgid "Delay"
+msgstr ""
+
+#. module: account_asset
+#: wizard_view:account.asset.close,init:0
+msgid "General information"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.property,journal_analytic_id:0
+msgid "Analytic journal"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.property,name:0
+msgid "Method name"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.property,journal_id:0
+msgid "Journal"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.property.history,name:0
+msgid "History name"
+msgstr ""
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "Close method"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.property,entry_asset_ids:0
+msgid "Asset Entries"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.asset,category_id:0
+#: view:account.asset.category:0
+#: field:account.asset.category,name:0
+#: model:ir.model,name:account_asset.model_account_asset_category
+msgid "Asset category"
+msgstr ""
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "Depreciation"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.asset,code:0
+#: field:account.asset.category,code:0
+msgid "Asset code"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.asset,value_total:0
+msgid "Total value"
+msgstr ""
+
+#. module: account_asset
+#: selection:account.asset.asset,state:0
+msgid "View"
+msgstr ""
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "General info"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.asset,sequence:0
+msgid "Sequence"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.property,value_residual:0
+msgid "Residual value"
+msgstr ""
+
+#. module: account_asset
+#: wizard_button:account.asset.close,init,asset_close:0
+msgid "End of asset"
+msgstr ""
+
+#. module: account_asset
+#: selection:account.asset.property,type:0
+msgid "Direct"
+msgstr ""
+
+#. module: account_asset
+#: selection:account.asset.property,type:0
+msgid "Indirect"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.asset,parent_id:0
+msgid "Parent asset"
+msgstr ""
+
+#. module: account_asset
+#: 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 ""
diff --git a/addons/account_asset/i18n/hr.po b/addons/account_asset/i18n/hr.po
index 28b856aa75f..6bdd13d286c 100644
--- a/addons/account_asset/i18n/hr.po
+++ b/addons/account_asset/i18n/hr.po
@@ -8,14 +8,14 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME \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ć \n"
+"PO-Revision-Date: 2011-12-08 16:13+0000\n"
+"Last-Translator: Tomislav Bosnjakovic \n"
"Language-Team: Croatian \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"
diff --git a/addons/account_cancel/__openerp__.py b/addons/account_cancel/__openerp__.py
index ac73a2b8c31..647146f98fb 100644
--- a/addons/account_cancel/__openerp__.py
+++ b/addons/account_cancel/__openerp__.py
@@ -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.
diff --git a/addons/account_cancel/i18n/hr.po b/addons/account_cancel/i18n/hr.po
index e64a2743ae6..91a5c4c300f 100644
--- a/addons/account_cancel/i18n/hr.po
+++ b/addons/account_cancel/i18n/hr.po
@@ -8,14 +8,14 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME \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 \n"
+"PO-Revision-Date: 2011-12-08 15:10+0000\n"
+"Last-Translator: Goran Kliska \n"
"Language-Team: Croatian \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"
diff --git a/addons/account_chart/__openerp__.py b/addons/account_chart/__openerp__.py
index 948f13b5dcb..d476eb1f443 100644
--- a/addons/account_chart/__openerp__.py
+++ b/addons/account_chart/__openerp__.py
@@ -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.
=============================
diff --git a/addons/account_coda/__openerp__.py b/addons/account_coda/__openerp__.py
index dd604e41aca..a51a9a1ede7 100644
--- a/addons/account_coda/__openerp__.py
+++ b/addons/account_coda/__openerp__.py
@@ -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.
diff --git a/addons/account_coda/i18n/hr.po b/addons/account_coda/i18n/hr.po
index f18ad9a000f..688d9a3383b 100644
--- a/addons/account_coda/i18n/hr.po
+++ b/addons/account_coda/i18n/hr.po
@@ -8,14 +8,14 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME \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 \n"
+"PO-Revision-Date: 2011-12-08 16:14+0000\n"
+"Last-Translator: Goran Kliska \n"
"Language-Team: Croatian \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"
diff --git a/addons/account_followup/i18n/hr.po b/addons/account_followup/i18n/hr.po
index 949e2a81f10..3dca6a73c32 100644
--- a/addons/account_followup/i18n/hr.po
+++ b/addons/account_followup/i18n/hr.po
@@ -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 \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"
diff --git a/addons/account_followup/report/account_followup_print.py b/addons/account_followup/report/account_followup_print.py
index f2cf476e674..56004cebde3 100644
--- a/addons/account_followup/report/account_followup_print.py
+++ b/addons/account_followup/report/account_followup_print.py
@@ -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,
diff --git a/addons/account_invoice_layout/__openerp__.py b/addons/account_invoice_layout/__openerp__.py
index 557f3c2e02c..cff01fa768b 100644
--- a/addons/account_invoice_layout/__openerp__.py
+++ b/addons/account_invoice_layout/__openerp__.py
@@ -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.
diff --git a/addons/account_invoice_layout/i18n/hr.po b/addons/account_invoice_layout/i18n/hr.po
index 8c006706eaa..93e3154792a 100644
--- a/addons/account_invoice_layout/i18n/hr.po
+++ b/addons/account_invoice_layout/i18n/hr.po
@@ -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ć \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"
diff --git a/addons/account_invoice_layout/report/report_account_invoice_layout.rml b/addons/account_invoice_layout/report/report_account_invoice_layout.rml
index c2dc0e036bb..6a8a286b66c 100644
--- a/addons/account_invoice_layout/report/report_account_invoice_layout.rml
+++ b/addons/account_invoice_layout/report/report_account_invoice_layout.rml
@@ -193,11 +193,7 @@
[[ (o.partner_id and o.partner_id.title and o.partner_id.title.name) or '' ]] [[ (o.partner_id and o.partner_id.name) or '' ]]
- [[ (o.address_invoice_id and o.address_invoice_id.street) or '' ]]
- [[ (o.address_invoice_id and o.address_invoice_id.street2) or removeParentNode('para') ]]
- [[ (o.address_invoice_id and o.address_invoice_id.zip) or '' ]] [[ (o.address_invoice_id and o.address_invoice_id.city) or '' ]]
- [[ (o.address_invoice_id and o.address_invoice_id.state_id and o.address_invoice_id.state_id.name) or removeParentNode('para') ]]
- [[ (o.address_invoice_id and o.address_invoice_id.country_id and o.address_invoice_id.country_id.name) or '' ]]
+ [[ display_address(o.address_invoice_id) ]]
@@ -235,7 +231,7 @@
Origin
[[ (o.partner_id and o.partner_id.title and o.partner_id.title.name) or '' ]] [[ (o.partner_id and o.partner_id.name) or '' ]]
- [[ (o.address_invoice_id and o.address_invoice_id.street) or '' ]]
- [[ (o.address_invoice_id and o.address_invoice_id.street2) or removeParentNode('para') ]]
- [[ (o.address_invoice_id and o.address_invoice_id.zip) or '' ]] [[ (o.address_invoice_id and o.address_invoice_id.city) or '' ]]
- [[ (o.address_invoice_id and o.address_invoice_id.state_id and o.address_invoice_id.state_id.name) or removeParentNode('para') ]]
- [[ (o.address_invoice_id and o.address_invoice_id.country_id and o.address_invoice_id.country_id.name) or '' ]]
+ [[ display_address(o.address_invoice_id) ]]
diff --git a/addons/account_payment/i18n/hr.po b/addons/account_payment/i18n/hr.po
index fbb8a4251ac..02d1ade77aa 100644
--- a/addons/account_payment/i18n/hr.po
+++ b/addons/account_payment/i18n/hr.po
@@ -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 \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."
diff --git a/addons/account_sequence/__openerp__.py b/addons/account_sequence/__openerp__.py
index 31d4f373e2f..7ad66a5b428 100644
--- a/addons/account_sequence/__openerp__.py
+++ b/addons/account_sequence/__openerp__.py
@@ -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.
diff --git a/addons/account_sequence/i18n/hr.po b/addons/account_sequence/i18n/hr.po
new file mode 100644
index 00000000000..14005991bb8
--- /dev/null
+++ b/addons/account_sequence/i18n/hr.po
@@ -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 , 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME \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 \n"
+"Language-Team: Croatian \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."
diff --git a/addons/account_voucher/__openerp__.py b/addons/account_voucher/__openerp__.py
index 5e6e6ab0513..74e9097b57c 100644
--- a/addons/account_voucher/__openerp__.py
+++ b/addons/account_voucher/__openerp__.py
@@ -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,
}
diff --git a/addons/account_voucher/account_voucher.py b/addons/account_voucher/account_voucher.py
index fd6dac9f90d..535f76b8d64 100644
--- a/addons/account_voucher/account_voucher.py
+++ b/addons/account_voucher/account_voucher.py
@@ -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)
@@ -958,6 +1144,7 @@ class account_voucher(osv.osv):
'debit': diff < 0 and -diff or 0.0,
'amount_currency': company_currency <> current_currency and voucher_brw.writeoff_amount or False,
'currency_id': company_currency <> current_currency and current_currency or False,
+ 'analytic_account_id': voucher_brw.analytic_id and voucher_brw.analytic_id.id or False,
}
return move_line
@@ -999,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',
@@ -1028,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):
@@ -1083,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'),
@@ -1098,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
@@ -1121,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,
@@ -1261,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)
@@ -1268,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:
diff --git a/addons/account_voucher/account_voucher_report.xml b/addons/account_voucher/account_voucher_report.xml
index 8af204efbbe..97de2b89f3a 100644
--- a/addons/account_voucher/account_voucher_report.xml
+++ b/addons/account_voucher/account_voucher_report.xml
@@ -11,13 +11,14 @@
header = "False"
menu="True"/> -->
-
+
diff --git a/addons/account_voucher/account_voucher_view.xml b/addons/account_voucher/account_voucher_view.xml
index 4e218e04714..cbe35b5fc5f 100644
--- a/addons/account_voucher/account_voucher_view.xml
+++ b/addons/account_voucher/account_voucher_view.xml
@@ -259,5 +259,19 @@
+
+
+ res.company.form.inherit
+
+ res.company
+ form
+
+
+
+
+
+
+
+
diff --git a/addons/account_voucher/i18n/hr.po b/addons/account_voucher/i18n/hr.po
index 3b1a5db220d..5904967f99a 100644
--- a/addons/account_voucher/i18n/hr.po
+++ b/addons/account_voucher/i18n/hr.po
@@ -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 \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"
diff --git a/addons/account_voucher/test/account_voucher.yml b/addons/account_voucher/test/account_voucher.yml
index 33ae609e3f3..7e5482aa931 100644
--- a/addons/account_voucher/test/account_voucher.yml
+++ b/addons/account_voucher/test/account_voucher.yml
@@ -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
diff --git a/addons/account_voucher/test/account_voucher_report.yml b/addons/account_voucher/test/account_voucher_report.yml
index b41c33e4470..85432f747aa 100644
--- a/addons/account_voucher/test/account_voucher_report.yml
+++ b/addons/account_voucher/test/account_voucher_report.yml
@@ -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)
diff --git a/addons/account_voucher/test/case1_usd_usd.yml b/addons/account_voucher/test/case1_usd_usd.yml
index e19e7e3ee46..3432d3cf27b 100644
--- a/addons/account_voucher/test/case1_usd_usd.yml
+++ b/addons/account_voucher/test/case1_usd_usd.yml
@@ -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
-
+ 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
-
-
+ 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
diff --git a/addons/account_voucher/test/case2_suppl_usd_eur.yml b/addons/account_voucher/test/case2_suppl_usd_eur.yml
index 23f11d28803..0ad523b8004 100644
--- a/addons/account_voucher/test/case2_suppl_usd_eur.yml
+++ b/addons/account_voucher/test/case2_suppl_usd_eur.yml
@@ -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
-
+ 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
-
+-
+ 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
diff --git a/addons/account_voucher/test/case2_usd_eur_debtor_in_eur.yml b/addons/account_voucher/test/case2_usd_eur_debtor_in_eur.yml
index 67287591778..ac77aef622d 100644
--- a/addons/account_voucher/test/case2_usd_eur_debtor_in_eur.yml
+++ b/addons/account_voucher/test/case2_usd_eur_debtor_in_eur.yml
@@ -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
-
+ 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
-
+-
+ 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
diff --git a/addons/account_voucher/test/case2_usd_eur_debtor_in_usd.yml b/addons/account_voucher/test/case2_usd_eur_debtor_in_usd.yml
index ec4d653c8ab..a3a32a32082 100644
--- a/addons/account_voucher/test/case2_usd_eur_debtor_in_usd.yml
+++ b/addons/account_voucher/test/case2_usd_eur_debtor_in_usd.yml
@@ -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
-
+ 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
-
+-
+ 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"))
diff --git a/addons/account_voucher/test/case3_eur_eur.yml b/addons/account_voucher/test/case3_eur_eur.yml
index 09034fadf51..a2fc39e1844 100644
--- a/addons/account_voucher/test/case3_eur_eur.yml
+++ b/addons/account_voucher/test/case3_eur_eur.yml
@@ -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
-
+ 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.
-
+ 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
diff --git a/addons/account_voucher/test/case4_cad_chf.yml b/addons/account_voucher/test/case4_cad_chf.yml
index b3abbb25e01..f31a7393a8e 100644
--- a/addons/account_voucher/test/case4_cad_chf.yml
+++ b/addons/account_voucher/test/case4_cad_chf.yml
@@ -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
-
+ 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."
diff --git a/addons/account_voucher/test/sales_receipt.yml b/addons/account_voucher/test/sales_receipt.yml
index d3fd720ec6d..7ea4f7d1c55 100644
--- a/addons/account_voucher/test/sales_receipt.yml
+++ b/addons/account_voucher/test/sales_receipt.yml
@@ -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
diff --git a/addons/account_voucher/voucher_payment_receipt_view.xml b/addons/account_voucher/voucher_payment_receipt_view.xml
index 46720b2732c..5cf9b42be0b 100644
--- a/addons/account_voucher/voucher_payment_receipt_view.xml
+++ b/addons/account_voucher/voucher_payment_receipt_view.xml
@@ -75,13 +75,13 @@
[[ o['partner'] and o['partner'].name or False]]
- [[o['partner'] and o['partner'].address[0].street or False]]
- [[o['partner'] and o['partner'].address[0].zip or False]][[o['partner'] and o['partner'].address[0].city or False]]
- [[o['partner'] and o['partner'].address[0].country_id.name or False]]
+ [[o['partner'] and o['partner'].address and display_address(o['partner'].address[0]) ]]
[[ o['partner'] and o['partner'].name or False]]
- [[o['partner'] and o['partner'].address[0].street or False]]
- [[o['partner'] and o['partner'].address[0].zip or False]][[o['partner'] and o['partner'].address[0].city or False]]
- [[o['partner'] and o['partner'].address[0].country_id.name or False]]
+ [[ o['partner'] and o['partner'].address and display_address(o['partner'].address[0])
diff --git a/addons/audittrail/__openerp__.py b/addons/audittrail/__openerp__.py
index 7d2a5955ac0..5bfd023ac39 100644
--- a/addons/audittrail/__openerp__.py
+++ b/addons/audittrail/__openerp__.py
@@ -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.
===========================================================================================
diff --git a/addons/audittrail/i18n/hr.po b/addons/audittrail/i18n/hr.po
index ce60dcea9cc..9d9a378c7fe 100644
--- a/addons/audittrail/i18n/hr.po
+++ b/addons/audittrail/i18n/hr.po
@@ -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ć \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"
diff --git a/addons/auth_openid/__openerp__.py b/addons/auth_openid/__openerp__.py
index 040a96a3995..6fa802b94e3 100644
--- a/addons/auth_openid/__openerp__.py
+++ b/addons/auth_openid/__openerp__.py
@@ -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.',
diff --git a/addons/base_action_rule/__openerp__.py b/addons/base_action_rule/__openerp__.py
index 18af8d09459..a8788bdddcb 100644
--- a/addons/base_action_rule/__openerp__.py
+++ b/addons/base_action_rule/__openerp__.py
@@ -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.
============================================================
diff --git a/addons/base_calendar/__openerp__.py b/addons/base_calendar/__openerp__.py
index 0dd72a17038..6edb978301f 100644
--- a/addons/base_calendar/__openerp__.py
+++ b/addons/base_calendar/__openerp__.py
@@ -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'
diff --git a/addons/crm/test/test_crm_recurrent_meeting_case2.yml b/addons/base_calendar/test/test_crm_recurrent_meeting_case2.yml
similarity index 100%
rename from addons/crm/test/test_crm_recurrent_meeting_case2.yml
rename to addons/base_calendar/test/test_crm_recurrent_meeting_case2.yml
diff --git a/addons/base_contact/__openerp__.py b/addons/base_contact/__openerp__.py
index 5537d6f91eb..f5969b6e309 100644
--- a/addons/base_contact/__openerp__.py
+++ b/addons/base_contact/__openerp__.py
@@ -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.
diff --git a/addons/base_contact/i18n/ar.po b/addons/base_contact/i18n/ar.po
index 6264b1aa32d..e5610421181 100644
--- a/addons/base_contact/i18n/ar.po
+++ b/addons/base_contact/i18n/ar.po
@@ -7,104 +7,104 @@ msgstr ""
"Project-Id-Version: OpenERP Server 5.0.4\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2011-01-11 11:14+0000\n"
-"PO-Revision-Date: 2009-02-03 06:25+0000\n"
-"Last-Translator: <>\n"
+"PO-Revision-Date: 2011-12-03 15:19+0000\n"
+"Last-Translator: kifcaliph \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:04+0000\n"
-"X-Generator: Launchpad (build 14231)\n"
+"X-Launchpad-Export-Date: 2011-12-04 04:43+0000\n"
+"X-Generator: Launchpad (build 14418)\n"
#. module: base_contact
#: field:res.partner.contact,title:0
msgid "Title"
-msgstr ""
+msgstr "اللقب"
#. module: base_contact
#: view:res.partner.address:0
msgid "# of Contacts"
-msgstr ""
+msgstr "عدد جهات الاتصال"
#. module: base_contact
#: field:res.partner.job,fax:0
msgid "Fax"
-msgstr ""
+msgstr "فاكس"
#. module: base_contact
#: view:base.contact.installer:0
msgid "title"
-msgstr ""
+msgstr "الاسم"
#. module: base_contact
#: help:res.partner.job,date_start:0
msgid "Start date of job(Joining Date)"
-msgstr ""
+msgstr "تاريخ الالتحاق بالوظيفة"
#. module: base_contact
#: view:base.contact.installer:0
msgid "Select the Option for Addresses Migration"
-msgstr ""
+msgstr "حدد الخيار لنقل العناوين"
#. module: base_contact
#: help:res.partner.job,function:0
msgid "Function of this contact with this partner"
-msgstr ""
+msgstr "مهمة جهة الاتصال هذه عند هذا الشريك"
#. module: base_contact
#: help:res.partner.job,state:0
msgid "Status of Address"
-msgstr ""
+msgstr "حالة العنوان"
#. module: base_contact
#: help:res.partner.job,name:0
msgid ""
"You may enter Address first,Partner will be linked "
"automatically if any."
-msgstr ""
+msgstr "يمكنك إدخال العنوان أولاً، وسيتمّ ربط الشريك تلقائياً إن وُجِد."
#. module: base_contact
#: help:res.partner.job,fax:0
msgid "Job FAX no."
-msgstr ""
+msgstr "فاكس العمل"
#. module: base_contact
#: field:res.partner.contact,mobile:0
msgid "Mobile"
-msgstr ""
+msgstr "الجوال"
#. module: base_contact
#: view:res.partner.contact:0
#: field:res.partner.contact,comment:0
msgid "Notes"
-msgstr ""
+msgstr "ملاحظات"
#. module: base_contact
#: model:process.node,note:base_contact.process_node_contacts0
msgid "People you work with."
-msgstr ""
+msgstr "أشخاص تعمل معهم."
#. module: base_contact
#: model:process.transition,note:base_contact.process_transition_functiontoaddress0
msgid "Define functions and address."
-msgstr ""
+msgstr "تعريف المهام والعنوان"
#. module: base_contact
#: help:res.partner.job,date_stop:0
msgid "Last date of job"
-msgstr ""
+msgstr "تاريخ ترك الوظيفة"
#. module: base_contact
#: view:base.contact.installer:0
#: field:base.contact.installer,migrate:0
msgid "Migrate"
-msgstr ""
+msgstr "نقل"
#. module: base_contact
#: view:res.partner.contact:0
#: field:res.partner.job,name:0
msgid "Partner"
-msgstr ""
+msgstr "الشريك"
#. module: base_contact
#: model:process.node,note:base_contact.process_node_function0
@@ -114,12 +114,12 @@ msgstr ""
#. module: base_contact
#: model:process.node,name:base_contact.process_node_partners0
msgid "Partners"
-msgstr ""
+msgstr "الشركاء"
#. module: base_contact
#: field:res.partner.job,state:0
msgid "State"
-msgstr ""
+msgstr "المحافظة"
#. module: base_contact
#: help:res.partner.contact,active:0
@@ -151,27 +151,42 @@ msgid ""
"an other object.\n"
" "
msgstr ""
+"\n"
+" تمكنك هذه الوحدة البرمجية من إدارة جهات الاتصال بشكل كامل.\n"
+" فهي تسمح لك بـتعرف:\n"
+" * جهات اتصال غير ذات صلة بشريك،\n"
+" * جهات اتصال ذات عناوين عمل متعددة (ربما لارتباطها بشركاء مختلفين)،\n"
+" * جهات اتصال ذات مهام مختلفة لكل عنوان من عناوين وظائفها\n"
+"\n"
+" كذلك تضيف هذه الوحدة البرمجية عناصر جديدة إلى القائمة تحت\n"
+" الشركاء / جهات الاتصال\n"
+" الشركاء / المهام\n"
+"\n"
+" تنبه إلى أن هذه الوحدة البرمجية تقوم بتحويل العناوين الموجودة مسبقاً إلى "
+"\"عناوين\" و \"جهات اتصال\"، مما يعني أن بعض حقول العناوين سيتم حذفها (مثل "
+"اسم جهة الاتصال) لأنه من المفترض أن يتم تعريفها في كائن آخر.\n"
+" "
#. module: base_contact
#: model:ir.module.module,shortdesc:base_contact.module_meta_information
#: model:process.process,name:base_contact.process_process_basecontactprocess0
msgid "Base Contact"
-msgstr ""
+msgstr "جهة الاتصال الأساسية"
#. module: base_contact
#: field:res.partner.job,date_stop:0
msgid "Date Stop"
-msgstr ""
+msgstr "تاريخ التوقف"
#. module: base_contact
#: model:ir.actions.act_window,name:base_contact.action_res_partner_job
msgid "Contact's Jobs"
-msgstr ""
+msgstr "الوظائف"
#. module: base_contact
#: view:res.partner:0
msgid "Categories"
-msgstr ""
+msgstr "الفئات"
#. module: base_contact
#: help:res.partner.job,sequence_partner:0
@@ -179,70 +194,72 @@ msgid ""
"Order of importance of this job title in the list of job "
"title of the linked partner"
msgstr ""
+"ترتيب المسمى الوظيفي هذا حسب الأهمية بين المسميات الوظيغية المستخدمة لدى "
+"الشريك"
#. module: base_contact
#: field:res.partner.job,extension:0
msgid "Extension"
-msgstr ""
+msgstr "الامتداد"
#. module: base_contact
#: help:res.partner.job,extension:0
msgid "Internal/External extension phone number"
-msgstr ""
+msgstr "امتداد رقم الهاتف الداخلي/الخارجي"
#. module: base_contact
#: help:res.partner.job,phone:0
msgid "Job Phone no."
-msgstr ""
+msgstr "هاتف العمل"
#. module: base_contact
#: view:res.partner.contact:0
#: field:res.partner.contact,job_ids:0
msgid "Functions and Addresses"
-msgstr ""
+msgstr "المهام والعناوين"
#. module: base_contact
#: model:ir.model,name:base_contact.model_res_partner_contact
#: field:res.partner.job,contact_id:0
msgid "Contact"
-msgstr ""
+msgstr "جهة الاتصال"
#. module: base_contact
#: help:res.partner.job,email:0
msgid "Job E-Mail"
-msgstr ""
+msgstr "البريد الإلكتروني للعمل"
#. module: base_contact
#: field:res.partner.job,sequence_partner:0
msgid "Partner Seq."
-msgstr ""
+msgstr "رقم الشريك"
#. module: base_contact
#: model:process.transition,name:base_contact.process_transition_functiontoaddress0
msgid "Function to address"
-msgstr ""
+msgstr "مهمة إلى عنوان"
#. module: base_contact
#: field:base.contact.installer,progress:0
msgid "Configuration Progress"
-msgstr ""
+msgstr "سير الإعدادات"
#. module: base_contact
#: field:res.partner.contact,name:0
msgid "Last Name"
-msgstr ""
+msgstr "اسم العائلة"
#. module: base_contact
#: view:res.partner:0
#: view:res.partner.contact:0
msgid "Communication"
-msgstr ""
+msgstr "التواصل"
#. module: base_contact
#: field:base.contact.installer,config_logo:0
#: field:res.partner.contact,photo:0
msgid "Image"
-msgstr ""
+msgstr "صورة"
#. module: base_contact
#: selection:res.partner.job,state:0
@@ -252,7 +269,7 @@ msgstr ""
#. module: base_contact
#: model:ir.model,name:base_contact.model_res_partner_address
msgid "Partner Addresses"
-msgstr ""
+msgstr "عناوين الشريك"
#. module: base_contact
#: view:base.contact.installer:0
@@ -262,12 +279,12 @@ msgstr ""
#. module: base_contact
#: field:res.partner.job,sequence_contact:0
msgid "Contact Seq."
-msgstr ""
+msgstr "رقم جهة الاتصال"
#. module: base_contact
#: view:res.partner.address:0
msgid "Search Contact"
-msgstr ""
+msgstr "بحث جهة الإتصال"
#. module: base_contact
#: model:ir.actions.act_window,name:base_contact.action_partner_contact_form
@@ -277,7 +294,7 @@ msgstr ""
#: view:res.partner:0
#: field:res.partner.address,job_ids:0
msgid "Contacts"
-msgstr ""
+msgstr "جهات الاتصال"
#. module: base_contact
#: view:base.contact.installer:0
@@ -289,58 +306,58 @@ msgstr ""
#. module: base_contact
#: model:process.node,note:base_contact.process_node_addresses0
msgid "Working and private addresses."
-msgstr ""
+msgstr "عناوين العمل والعناوين الخاصة"
#. module: base_contact
#: help:res.partner.job,address_id:0
msgid "Address which is linked to the Partner"
-msgstr ""
+msgstr "العنوان المرتبط بالشريك"
#. module: base_contact
#: field:res.partner.job,function:0
msgid "Partner Function"
-msgstr ""
+msgstr "مهمة الشريك"
#. module: base_contact
#: help:res.partner.job,other:0
msgid "Additional phone field"
-msgstr ""
+msgstr "حقل هاتف إضافي"
#. module: base_contact
#: field:res.partner.contact,website:0
msgid "Website"
-msgstr ""
+msgstr "الموقع الإلكتروني"
#. module: base_contact
#: view:base.contact.installer:0
msgid "Otherwise these details will not be visible from address/contact."
-msgstr ""
+msgstr "وإلا فلن تظهر هذه التفاصيل في العنوان/جهة الاتصال."
#. module: base_contact
#: view:base.contact.installer:0
msgid "Configure"
-msgstr ""
+msgstr "ضبط الإعدادات"
#. module: base_contact
#: field:res.partner.contact,email:0
#: field:res.partner.job,email:0
msgid "E-Mail"
-msgstr ""
+msgstr "البريد الإلكتروني"
#. module: base_contact
#: model:ir.model,name:base_contact.model_base_contact_installer
msgid "base.contact.installer"
-msgstr ""
+msgstr "base.contact.installer"
#. module: base_contact
#: view:res.partner.job:0
msgid "Contact Functions"
-msgstr ""
+msgstr "مهام جهة الاتصال"
#. module: base_contact
#: field:res.partner.job,phone:0
msgid "Phone"
-msgstr ""
+msgstr "هاتف"
#. module: base_contact
#: view:base.contact.installer:0
@@ -350,164 +367,164 @@ msgstr ""
#. module: base_contact
#: field:res.partner.contact,active:0
msgid "Active"
-msgstr ""
+msgstr "نشِط"
#. module: base_contact
#: field:res.partner.contact,function:0
msgid "Main Function"
-msgstr ""
+msgstr "المهمة الرئيسية"
#. module: base_contact
#: model:process.transition,note:base_contact.process_transition_partnertoaddress0
msgid "Define partners and their addresses."
-msgstr ""
+msgstr "تعريف الشركاء وعناوينهم"
#. module: base_contact
#: view:res.partner.contact:0
msgid "Seq."
-msgstr ""
+msgstr "رقم"
#. module: base_contact
#: field:res.partner.contact,lang_id:0
msgid "Language"
-msgstr ""
+msgstr "اللغة"
#. module: base_contact
#: view:res.partner.contact:0
msgid "Extra Information"
-msgstr ""
+msgstr "معلومات إضافية"
#. module: base_contact
#: model:process.node,note:base_contact.process_node_partners0
msgid "Companies you work with."
-msgstr ""
+msgstr "الشركات التي تتعامل معها."
#. module: base_contact
#: view:res.partner.contact:0
msgid "Partner Contact"
-msgstr ""
+msgstr "جهة الاتصال بالشريك"
#. module: base_contact
#: view:res.partner.contact:0
msgid "General"
-msgstr ""
+msgstr "عام"
#. module: base_contact
#: view:res.partner.contact:0
msgid "Photo"
-msgstr ""
+msgstr "صورة"
#. module: base_contact
#: field:res.partner.contact,birthdate:0
msgid "Birth Date"
-msgstr ""
+msgstr "تاريخ الميلاد"
#. module: base_contact
#: help:base.contact.installer,migrate:0
msgid "If you select this, all addresses will be migrated."
-msgstr ""
+msgstr "إذا اخترت هذا الخيار، سيتم نقل جميع العناوين."
#. module: base_contact
#: selection:res.partner.job,state:0
msgid "Current"
-msgstr ""
+msgstr "الحالي"
#. module: base_contact
#: field:res.partner.contact,first_name:0
msgid "First Name"
-msgstr ""
+msgstr "الاسم الأول"
#. module: base_contact
#: model:ir.model,name:base_contact.model_res_partner_job
msgid "Contact Partner Function"
-msgstr ""
+msgstr "مهمة الشريك"
#. module: base_contact
#: field:res.partner.job,other:0
msgid "Other"
-msgstr ""
+msgstr "غير ذلك"
#. module: base_contact
#: model:process.node,name:base_contact.process_node_function0
msgid "Function"
-msgstr ""
+msgstr "المهمة"
#. module: base_contact
#: field:res.partner.address,job_id:0
#: field:res.partner.contact,job_id:0
msgid "Main Job"
-msgstr ""
+msgstr "الوظيفة الرئيسية"
#. module: base_contact
#: model:process.transition,note:base_contact.process_transition_contacttofunction0
msgid "Defines contacts and functions."
-msgstr ""
+msgstr "تعريف جهات الاتصال والمهام."
#. module: base_contact
#: model:process.transition,name:base_contact.process_transition_contacttofunction0
msgid "Contact to function"
-msgstr ""
+msgstr "جهة اتصال إلى مهمة"
#. module: base_contact
#: view:res.partner:0
#: field:res.partner.job,address_id:0
msgid "Address"
-msgstr ""
+msgstr "العنوان"
#. module: base_contact
#: field:res.partner.contact,country_id:0
msgid "Nationality"
-msgstr ""
+msgstr "الجنسية"
#. module: base_contact
#: model:ir.actions.act_window,name:base_contact.act_res_partner_jobs
msgid "Open Jobs"
-msgstr ""
+msgstr "الوظائف المفتوحة"
#. module: base_contact
#: field:base.contact.installer,name:0
msgid "Name"
-msgstr ""
+msgstr "الاسم"
#. module: base_contact
#: view:base.contact.installer:0
msgid "You can migrate Partner's current addresses to the contact."
-msgstr ""
+msgstr "يمكنك نقل العناوين الحالية للشريك إلى جهة الاتصال"
#. module: base_contact
#: field:res.partner.contact,partner_id:0
msgid "Main Employer"
-msgstr ""
+msgstr "صاحب العمل الرئيسي"
#. module: base_contact
#: model:ir.actions.act_window,name:base_contact.action_base_contact_installer
msgid "Address Migration"
-msgstr ""
+msgstr "نقل العنوان"
#. module: base_contact
#: view:res.partner:0
msgid "Postal Address"
-msgstr ""
+msgstr "العنوان البريدي"
#. module: base_contact
#: model:process.node,name:base_contact.process_node_addresses0
#: view:res.partner:0
msgid "Addresses"
-msgstr ""
+msgstr "العناوين"
#. module: base_contact
#: model:process.transition,name:base_contact.process_transition_partnertoaddress0
msgid "Partner to address"
-msgstr ""
+msgstr "شريك إلى عنوان"
#. module: base_contact
#: field:res.partner.job,date_start:0
msgid "Date Start"
-msgstr ""
+msgstr "تاريخ البدء"
#. module: base_contact
#: help:res.partner.job,sequence_contact:0
msgid ""
"Order of importance of this address in the list of "
"addresses of the linked contact"
-msgstr ""
+msgstr "ترتيب هذا العنوان حسب الأهمية بين عناوين جهة الاتصال"
diff --git a/addons/base_crypt/__openerp__.py b/addons/base_crypt/__openerp__.py
index 23e29420036..fc85100b41c 100644
--- a/addons/base_crypt/__openerp__.py
+++ b/addons/base_crypt/__openerp__.py
@@ -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
diff --git a/addons/base_iban/__openerp__.py b/addons/base_iban/__openerp__.py
index c9bc3866b4f..2692e63e55d 100644
--- a/addons/base_iban/__openerp__.py
+++ b/addons/base_iban/__openerp__.py
@@ -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.
diff --git a/addons/base_module_doc_rst/__openerp__.py b/addons/base_module_doc_rst/__openerp__.py
index 22a3b39028b..5e3674269d7 100644
--- a/addons/base_module_doc_rst/__openerp__.py
+++ b/addons/base_module_doc_rst/__openerp__.py
@@ -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).
=================================================================================================
diff --git a/addons/base_module_quality/__openerp__.py b/addons/base_module_quality/__openerp__.py
index 02d09e0919d..df57b88fcc2 100644
--- a/addons/base_module_quality/__openerp__.py
+++ b/addons/base_module_quality/__openerp__.py
@@ -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.
================================================================
diff --git a/addons/base_module_record/__openerp__.py b/addons/base_module_record/__openerp__.py
index 3e1cf79792a..fdb576e0ddd 100644
--- a/addons/base_module_record/__openerp__.py
+++ b/addons/base_module_record/__openerp__.py
@@ -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.
======================================================================
diff --git a/addons/base_report_creator/security/ir.model.access.csv b/addons/base_report_creator/security/ir.model.access.csv
index 24e5a1c4cee..c9e78315b67 100644
--- a/addons/base_report_creator/security/ir.model.access.csv
+++ b/addons/base_report_creator/security/ir.model.access.csv
@@ -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
diff --git a/addons/base_setup/__openerp__.py b/addons/base_setup/__openerp__.py
index 4417ebf2439..bd62a097934 100644
--- a/addons/base_setup/__openerp__.py
+++ b/addons/base_setup/__openerp__.py
@@ -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.
diff --git a/addons/base_setup/base_setup.py b/addons/base_setup/base_setup.py
index ecb9b5bf3c4..c10dee7b14b 100644
--- a/addons/base_setup/base_setup.py
+++ b/addons/base_setup/base_setup.py
@@ -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 = ['')
-
- 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):
diff --git a/addons/base_setup/base_setup_views.xml b/addons/base_setup/base_setup_views.xml
index d3536b10cf1..9450057f53f 100644
--- a/addons/base_setup/base_setup_views.xml
+++ b/addons/base_setup/base_setup_views.xml
@@ -1,36 +1,6 @@
-
- Install Applications
- base.setup.installer
- form
- form
- new
-
-
-
-
-
-
- 2
-
-
-
- Start Configuration
-
- code
-
-
-
-
-
- Add More Features
- ir.ui.menu
-
-
-
-
Create or Import Customers
@@ -162,6 +132,7 @@
formform{'res_id': user.company_id.id}
+ 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.
diff --git a/addons/base_synchro/__openerp__.py b/addons/base_synchro/__openerp__.py
index fba793e0473..a9fd08bccf6 100644
--- a/addons/base_synchro/__openerp__.py
+++ b/addons/base_synchro/__openerp__.py
@@ -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.
=================================
diff --git a/addons/base_tools/__openerp__.py b/addons/base_tools/__openerp__.py
index 6fff6c3c207..d3c8a4716e0 100644
--- a/addons/base_tools/__openerp__.py
+++ b/addons/base_tools/__openerp__.py
@@ -4,7 +4,7 @@
"author": "OpenERP SA",
"version": "1.0",
"depends": ["base"],
- "category" : "Hidden",
+ "category" : "Tools",
'complexity': "easy",
'description': """
Common base for tools modules.
diff --git a/addons/base_vat/__openerp__.py b/addons/base_vat/__openerp__.py
index 147eb47b9e2..858b5c2c070 100644
--- a/addons/base_vat/__openerp__.py
+++ b/addons/base_vat/__openerp__.py
@@ -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
diff --git a/addons/board/__openerp__.py b/addons/board/__openerp__.py
index 6cb0e3ecce7..afb8cc42a95 100644
--- a/addons/board/__openerp__.py
+++ b/addons/board/__openerp__.py
@@ -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.
diff --git a/addons/caldav/__openerp__.py b/addons/caldav/__openerp__.py
index 53bee3d0e94..edf852e4d5e 100644
--- a/addons/caldav/__openerp__.py
+++ b/addons/caldav/__openerp__.py
@@ -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"],
diff --git a/addons/claim_from_delivery/__openerp__.py b/addons/claim_from_delivery/__openerp__.py
index c3eec37a229..178da7d1913 100644
--- a/addons/claim_from_delivery/__openerp__.py
+++ b/addons/claim_from_delivery/__openerp__.py
@@ -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" : [],
diff --git a/addons/crm/__openerp__.py b/addons/crm/__openerp__.py
index 54dfc335a2b..29a1f6107b3 100644
--- a/addons/crm/__openerp__.py
+++ b/addons/crm/__openerp__.py
@@ -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',
@@ -118,20 +119,17 @@ Creates a dashboard for CRM that includes:
'crm_phonecall_demo.xml',
],
'test': [
- 'test/test_crm_lead.yml',
- 'test/test_crm_meeting.yml',
- 'test/test_crm_opportunity.yml',
- 'test/test_crm_phonecall.yml',
- 'test/test_crm_recurrent_meeting.yml',
- 'test/test_crm_stage_changes.yml',
- 'test/test_crm_recurrent_meeting_case2.yml',
- 'test/test_crm_lead_case2.yml',
- 'test/test_crm_opportunity_case2.yml',
- 'test/test_crm_phonecall_case2.yml',
- 'test/test_crm_partner2opportunity.yml',
- 'test/test_crm_segmentation.yml',
+ 'test/process/communication_with_customer.yml',
+ 'test/process/lead2opportunity2win.yml',
+ 'test/process/merge_opportunity.yml',
+ 'test/process/cancel_lead.yml',
+ 'test/process/segmentation.yml',
+ 'test/ui/crm_demo.yml',
+ 'test/ui/duplicate_lead.yml',
+ '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'],
diff --git a/addons/crm/board_crm_view.xml b/addons/crm/board_crm_view.xml
index 7b80feffd30..3418dc99423 100644
--- a/addons/crm/board_crm_view.xml
+++ b/addons/crm/board_crm_view.xml
@@ -121,10 +121,10 @@
+ name="%(act_my_oppor)d" creatable="true"/>
+ name="%(act_my_meetings)d" creatable="true"/>
-
+
@@ -12,5 +12,17 @@
+
+ Sales Marketing Department
+ Sales Marketing
+
+
+
+
+ OpenERP partners
+ True
+
+
+
diff --git a/addons/crm/crm_lead.py b/addons/crm/crm_lead.py
index 3a5c411993d..49272c97576 100644
--- a/addons/crm/crm_lead.py
+++ b/addons/crm/crm_lead.py
@@ -27,7 +27,7 @@ from tools.translate import _
from crm import crm_case
import binascii
import tools
-
+from mail.mail_message import to_email
CRM_LEAD_PENDING_STATES = (
crm.AVAILABLE_STATES[2][0], # Cancelled
@@ -352,36 +352,380 @@ class crm_lead(crm_case, osv.osv):
"""
return self.set_priority(cr, uid, ids, '3')
- def convert_opportunity(self, cr, uid, ids, context=None):
- """ Precomputation for converting lead to opportunity
+
+ def _merge_data(self, cr, uid, ids, oldest, fields, context=None):
+ # prepare opportunity data into dictionary for merging
+ opportunities = self.browse(cr, uid, ids, context=context)
+ def _get_first_not_null(attr):
+ if hasattr(oldest, attr):
+ return getattr(oldest, attr)
+ for opportunity in opportunities:
+ if hasattr(opportunity, attr):
+ return getattr(opportunity, attr)
+ return False
+
+ def _get_first_not_null_id(attr):
+ res = _get_first_not_null(attr)
+ return res and res.id or False
+
+ def _concat_all(attr):
+ return ', '.join(filter(lambda x: x, [getattr(opportunity, attr) or '' for opportunity in opportunities if hasattr(opportunity, attr)]))
+
+ data = {}
+ for field_name in fields:
+ field_info = self._all_columns.get(field_name)
+ if field_info is None:
+ continue
+ field = field_info.column
+ if field._type in ('many2many', 'one2many'):
+ continue
+ elif field._type == 'many2one':
+ data[field_name] = _get_first_not_null_id(field_name) # !!
+ elif field._type == 'text':
+ data[field_name] = _concat_all(field_name) #not lost
+ else:
+ data[field_name] = _get_first_not_null(field_name) #not lost
+ return data
+
+ def _merge_find_oldest(self, cr, uid, ids, context=None):
+ if context is None:
+ context = {}
+ #TOCHECK: where pass 'convert' in context ?
+ if context.get('convert'):
+ ids = list(set(ids) - set(context.get('lead_ids', False)) )
+
+ #search opportunities order by create date
+ opportunity_ids = self.search(cr, uid, [('id', 'in', ids)], order='create_date' , context=context)
+ oldest_id = opportunity_ids[0]
+ return self.browse(cr, uid, oldest_id, context=context)
+
+ def _mail_body_text(self, cr, uid, lead, fields, title=False, context=None):
+ body = []
+ if title:
+ body.append("%s\n" % (title))
+ for field_name in fields:
+ field_info = self._all_columns.get(field_name)
+ if field_info is None:
+ continue
+ field = field_info.column
+ value = None
+
+ if field._type == 'selection':
+ if hasattr(field.selection, '__call__'):
+ key = field.selection(self, cr, uid, context=context)
+ else:
+ key = field.selection
+ value = dict(key).get(lead[field_name], lead[field_name])
+ elif field._type == 'many2one':
+ if lead[field_name]:
+ value = lead[field_name].name_get()[0][1]
+ else:
+ value = lead[field_name]
+
+ body.append("%s: %s" % (field.string, value or ''))
+ return "\n".join(body + ['---'])
+
+ def _merge_notification(self, cr, uid, opportunity_id, opportunities, context=None):
+ #TOFIX: mail template should be used instead of fix body, subject text
+ details = []
+ merge_message = _('Merged opportunities')
+ subject = [merge_message]
+ fields = ['name', 'partner_id', 'stage_id', 'section_id', 'user_id', 'categ_id', 'channel_id', 'company_id', 'contact_name',
+ 'email_from', 'phone', 'fax', 'mobile', 'state_id', 'description', 'probability', 'planned_revenue',
+ 'country_id', 'city', 'street', 'street2', 'zip']
+ for opportunity in opportunities:
+ subject.append(opportunity.name)
+ title = "%s : %s" % (merge_message, opportunity.name)
+ details.append(self._mail_body_text(cr, uid, opportunity, fields, title=title, context=context))
+
+ subject = subject[0] + ", ".join(subject[1:])
+ details = "\n\n".join(details)
+ return self.message_append(cr, uid, [opportunity_id], subject, body_text=details, context=context)
+
+ def _merge_opportunity_history(self, cr, uid, opportunity_id, opportunities, context=None):
+ message = self.pool.get('mail.message')
+ for opportunity in opportunities:
+ for history in opportunity.message_ids:
+ message.write(cr, uid, history.id, {
+ 'res_id': opportunity_id,
+ 'subject' : _("From %s : %s") % (opportunity.name, history.subject)
+ }, context=context)
+
+ return True
+
+ def _merge_opportunity_attachments(self, cr, uid, opportunity_id, opportunities, context=None):
+ attachment = self.pool.get('ir.attachment')
+
+ # return attachments of opportunity
+ def _get_attachments(opportunity_id):
+ attachment_ids = attachment.search(cr, uid, [('res_model', '=', self._name), ('res_id', '=', opportunity_id)], context=context)
+ return attachment.browse(cr, uid, attachment_ids, context=context)
+
+ count = 1
+ first_attachments = _get_attachments(opportunity_id)
+ for opportunity in opportunities:
+ attachments = _get_attachments(opportunity.id)
+ for first in first_attachments:
+ for attachment in attachments:
+ if attachment.name == first.name:
+ values = dict(
+ name = "%s (%s)" % (attachment.name, count,),
+ res_id = opportunity_id,
+ )
+ attachment.write(values)
+ count+=1
+
+ return True
+
+ def merge_opportunity(self, cr, uid, ids, context=None):
+ """
+ To merge opportunities
+ :param ids: list of opportunities ids to merge
+ """
+ if context is None: context = {}
+
+ #TOCHECK: where pass lead_ids in context?
+ lead_ids = context and context.get('lead_ids', []) or []
+
+ if len(ids) <= 1:
+ raise osv.except_osv(_('Warning !'),_('Please select more than one opportunities.'))
+
+ ctx_opportunities = self.browse(cr, uid, lead_ids, context=context)
+ opportunities = self.browse(cr, uid, ids, context=context)
+ opportunities_list = list(set(opportunities) - set(ctx_opportunities))
+ oldest = self._merge_find_oldest(cr, uid, ids, context=context)
+ if ctx_opportunities :
+ first_opportunity = ctx_opportunities[0]
+ tail_opportunities = opportunities_list
+ else:
+ first_opportunity = opportunities_list[0]
+ tail_opportunities = opportunities_list[1:]
+
+ fields = ['partner_id', 'title', 'name', 'categ_id', 'channel_id', 'city', 'company_id', 'contact_name', 'country_id',
+ 'partner_address_id', 'type_id', 'user_id', 'section_id', 'state_id', 'description', 'email', 'fax', 'mobile',
+ 'partner_name', 'phone', 'probability', 'planned_revenue', 'street', 'street2', 'zip', 'create_date', 'date_action_last',
+ 'date_action_next', 'email_from', 'email_cc', 'partner_name']
+
+ data = self._merge_data(cr, uid, ids, oldest, fields, context=context)
+
+ # merge data into first opportunity
+ self.write(cr, uid, [first_opportunity.id], data, context=context)
+
+ #copy message and attachements into the first opportunity
+ self._merge_opportunity_history(cr, uid, first_opportunity.id, tail_opportunities, context=context)
+ self._merge_opportunity_attachments(cr, uid, first_opportunity.id, tail_opportunities, context=context)
+
+ #Notification about loss of information
+ self._merge_notification(cr, uid, first_opportunity, opportunities, context=context)
+ #delete tail opportunities
+ self.unlink(cr, uid, [x.id for x in tail_opportunities], context=context)
+
+ #open first opportunity
+ self.case_open(cr, uid, [first_opportunity.id])
+ return first_opportunity.id
+
+ def _convert_opportunity_data(self, cr, uid, lead, customer, section_id=False, context=None):
+ crm_stage = self.pool.get('crm.case.stage')
+ contact_id = False
+ if customer:
+ contact_id = self.pool.get('res.partner').address_get(cr, uid, [customer.id])['default']
+ if not section_id:
+ section_id = lead.section_id and lead.section_id.id or False
+ if section_id:
+ stage_ids = crm_stage.search(cr, uid, [('sequence','>=',1), ('section_ids','=', section_id)])
+ else:
+ stage_ids = crm_stage.search(cr, uid, [('sequence','>=',1)])
+ stage_id = stage_ids and stage_ids[0] or False
+ return {
+ 'planned_revenue': lead.planned_revenue,
+ 'probability': lead.probability,
+ 'name': lead.name,
+ 'partner_id': customer and customer.id or False,
+ 'user_id': (lead.user_id and lead.user_id.id),
+ 'type': 'opportunity',
+ 'stage_id': stage_id or False,
+ 'date_action': time.strftime('%Y-%m-%d %H:%M:%S'),
+ 'partner_address_id': contact_id
+ }
+ def _convert_opportunity_notification(self, cr, uid, lead, context=None):
+ success_message = _("Lead '%s' has been converted to an opportunity.") % lead.name
+ self.message_append(cr, uid, [lead.id], success_message, body_text=success_message, context=context)
+ self.log(cr, uid, lead.id, success_message)
+ self._send_mail_to_salesman(cr, uid, lead, context=context)
+ return True
+
+ def convert_opportunity(self, cr, uid, ids, partner_id, user_ids=False, section_id=False, context=None):
+ partner = self.pool.get('res.partner')
+ mail_message = self.pool.get('mail.message')
+ customer = False
+ if partner_id:
+ customer = partner.browse(cr, uid, partner_id, context=context)
+ for lead in self.browse(cr, uid, ids, context=context):
+ if lead.state in ('done', 'cancel'):
+ continue
+ if user_ids or section_id:
+ self.allocate_salesman(cr, uid, [lead.id], user_ids, section_id, context=context)
+
+ vals = self._convert_opportunity_data(cr, uid, lead, customer, section_id, context=context)
+ self.write(cr, uid, [lead.id], vals, context=context)
+
+ self._convert_opportunity_notification(cr, uid, lead, context=context)
+ #TOCHECK: why need to change partner details in all messages of lead ?
+ if lead.partner_id:
+ msg_ids = [ x.id for x in lead.message_ids]
+ mail_message.write(cr, uid, msg_ids, {
+ 'partner_id': lead.partner_id.id
+ }, context=context)
+ return True
+
+ def _lead_create_partner(self, cr, uid, lead, context=None):
+ partner = self.pool.get('res.partner')
+ partner_id = partner.create(cr, uid, {
+ 'name': lead.partner_name or lead.contact_name or lead.name,
+ 'user_id': lead.user_id.id,
+ 'comment': lead.description,
+ 'section_id': lead.section_id.id or False,
+ 'address': []
+ })
+ return partner_id
+
+ def _lead_set_partner(self, cr, uid, lead, partner_id, context=None):
+ res = False
+ res_partner = self.pool.get('res.partner')
+ if partner_id:
+ res_partner.write(cr, uid, partner_id, {'section_id': lead.section_id.id or False})
+ contact_id = res_partner.address_get(cr, uid, [partner_id])['default']
+ res = lead.write({'partner_id' : partner_id, 'partner_address_id': contact_id}, context=context)
+
+ return res
+
+ def _lead_create_partner_address(self, cr, uid, lead, partner_id, context=None):
+ address = self.pool.get('res.partner.address')
+ return address.create(cr, uid, {
+ 'partner_id': partner_id,
+ 'name': lead.contact_name,
+ 'phone': lead.phone,
+ 'mobile': lead.mobile,
+ 'email': lead.email_from and to_email(lead.email_from)[0],
+ 'fax': lead.fax,
+ 'title': lead.title and lead.title.id or False,
+ 'function': lead.function,
+ 'street': lead.street,
+ 'street2': lead.street2,
+ 'zip': lead.zip,
+ 'city': lead.city,
+ 'country_id': lead.country_id and lead.country_id.id or False,
+ 'state_id': lead.state_id and lead.state_id.id or False,
+ })
+
+ def convert_partner(self, cr, uid, ids, action='create', partner_id=False, context=None):
+ """
+ This function convert partner based on action.
+ if action is 'create', create new partner with contact and assign lead to new partner_id.
+ otherwise assign lead to specified partner_id
"""
if context is None:
context = {}
- context.update({'active_ids': ids})
+ partner_ids = {}
+ for lead in self.browse(cr, uid, ids, context=context):
+ if action == 'create':
+ if not partner_id:
+ partner_id = self._lead_create_partner(cr, uid, lead, context=context)
+ self._lead_create_partner_address(cr, uid, lead, partner_id, context=context)
+ self._lead_set_partner(cr, uid, lead, partner_id, context=context)
+ partner_ids[lead.id] = partner_id
+ return partner_ids
- data_obj = self.pool.get('ir.model.data')
- value = {}
+ def _send_mail_to_salesman(self, cr, uid, lead, context=None):
+ """
+ Send mail to salesman with updated Lead details.
+ @ lead: browse record of 'crm.lead' object.
+ """
+ #TOFIX: mail template should be used here instead of fix subject, body text.
+ message = self.pool.get('mail.message')
+ email_to = lead.user_id and lead.user_id.user_email
+ if not email_to:
+ return False
+
+ email_from = lead.section_id and lead.section_id.user_id and lead.section_id.user_id.user_email or email_to
+ partner = lead.partner_id and lead.partner_id.name or lead.partner_name
+ subject = "lead %s converted into opportunity" % lead.name
+ body = "Info \n Id : %s \n Subject: %s \n Partner: %s \n Description : %s " % (lead.id, lead.name, lead.partner_id.name, lead.description)
+ return message.schedule_with_attach(cr, uid, email_from, [email_to], subject, body)
- for case in self.browse(cr, uid, ids, context=context):
- context.update({'active_id': case.id})
- data_id = data_obj._get_id(cr, uid, 'crm', 'view_crm_lead2opportunity_partner')
- view_id1 = False
- if data_id:
- view_id1 = data_obj.browse(cr, uid, data_id, context=context).res_id
- value = {
- 'name': _('Create Partner'),
- 'view_type': 'form',
- 'view_mode': 'form,tree',
- 'res_model': 'crm.lead2opportunity.partner',
- 'view_id': False,
- 'context': context,
- 'views': [(view_id1, 'form')],
- 'type': 'ir.actions.act_window',
- 'target': 'new',
- 'nodestroy': True
+ def allocate_salesman(self, cr, uid, ids, user_ids, team_id=False, context=None):
+ index = 0
+ for lead_id in ids:
+ value = {}
+ if team_id:
+ value['section_id'] = team_id
+ if index < len(user_ids):
+ value['user_id'] = user_ids[index]
+ index += 1
+ if value:
+ self.write(cr, uid, [lead_id], value, context=context)
+ return True
+
+ def schedule_phonecall(self, cr, uid, ids, schedule_time, call_summary, desc, phone, contact_name, user_id=False, section_id=False, categ_id=False, action='schedule', context=None):
+ """
+ action :('schedule','Schedule a call'), ('log','Log a call')
+ """
+ phonecall = self.pool.get('crm.phonecall')
+ model_data = self.pool.get('ir.model.data')
+ phonecall_dict = {}
+ if not categ_id:
+ res_id = model_data._get_id(cr, uid, 'crm', 'categ_phone2')
+ if res_id:
+ categ_id = model_data.browse(cr, uid, res_id, context=context).res_id
+ for lead in self.browse(cr, uid, ids, context=context):
+ if not section_id:
+ section_id = lead.section_id and lead.section_id.id or False
+ if not user_id:
+ user_id = lead.user_id and lead.user_id.id or False
+ vals = {
+ 'name' : call_summary,
+ 'opportunity_id' : lead.id,
+ 'user_id' : user_id or False,
+ 'categ_id' : categ_id or False,
+ 'description' : desc or '',
+ 'date' : schedule_time,
+ 'section_id' : section_id or False,
+ 'partner_id': lead.partner_id and lead.partner_id.id or False,
+ 'partner_address_id': lead.partner_address_id and lead.partner_address_id.id or False,
+ 'partner_phone' : phone or lead.phone or (lead.partner_address_id and lead.partner_address_id.phone or False),
+ 'partner_mobile' : lead.partner_address_id and lead.partner_address_id.mobile or False,
+ 'priority': lead.priority,
}
- return value
+
+ new_id = phonecall.create(cr, uid, vals, context=context)
+ phonecall.case_open(cr, uid, [new_id])
+ if action == 'log':
+ phonecall.case_close(cr, uid, [new_id])
+ phonecall_dict[lead.id] = new_id
+ return phonecall_dict
+
+
+ def redirect_opportunity_view(self, cr, uid, opportunity_id, context=None):
+ models_data = self.pool.get('ir.model.data')
+
+ # Get Opportunity views
+ form_view = models_data.get_object_reference(cr, uid, 'crm', 'crm_case_form_view_oppor')
+ tree_view = models_data.get_object_reference(cr, uid, 'crm', 'crm_case_tree_view_oppor')
+ return {
+ 'name': _('Opportunity'),
+ 'view_type': 'form',
+ 'view_mode': 'tree, form',
+ 'res_model': 'crm.lead',
+ 'domain': [('type', '=', 'opportunity')],
+ 'res_id': int(opportunity_id),
+ 'view_id': False,
+ 'views': [(form_view and form_view[1] or False, 'form'),
+ (tree_view and tree_view[1] or False, 'tree'),
+ (False, 'calendar'), (False, 'graph')],
+ 'type': 'ir.actions.act_window',
+ }
+
def message_new(self, cr, uid, msg, custom_values=None, context=None):
"""Automatically calls when new email message arrives"""
@@ -447,17 +791,10 @@ class crm_lead(crm_case, osv.osv):
data_obj = self.pool.get('ir.model.data')
for opp in self.browse(cr, uid, ids, context=context):
# Get meeting views
- result = data_obj._get_id(cr, uid, 'crm', 'view_crm_case_meetings_filter')
- res = data_obj.read(cr, uid, result, ['res_id'])
- id1 = data_obj._get_id(cr, uid, 'crm', 'crm_case_calendar_view_meet')
- id2 = data_obj._get_id(cr, uid, 'crm', 'crm_case_form_view_meet')
- id3 = data_obj._get_id(cr, uid, 'crm', 'crm_case_tree_view_meet')
- if id1:
- id1 = data_obj.browse(cr, uid, id1, context=context).res_id
- if id2:
- id2 = data_obj.browse(cr, uid, id2, context=context).res_id
- if id3:
- id3 = data_obj.browse(cr, uid, id3, context=context).res_id
+ tree_view = data_obj.get_object_reference(cr, uid, 'crm', 'crm_case_tree_view_meet')
+ form_view = data_obj.get_object_reference(cr, uid, 'crm', 'crm_case_form_view_meet')
+ calander_view = data_obj.get_object_reference(cr, uid, 'crm', 'crm_case_calendar_view_meet')
+ search_view = data_obj.get_object_reference(cr, uid, 'crm', 'view_crm_case_meetings_filter')
context.update({
'default_opportunity_id': opp.id,
'default_partner_id': opp.partner_id and opp.partner_id.id or False,
@@ -474,9 +811,9 @@ class crm_lead(crm_case, osv.osv):
'view_mode': 'calendar,form,tree',
'res_model': 'crm.meeting',
'view_id': False,
- 'views': [(id1, 'calendar'), (id2, 'form'), (id3, 'tree')],
+ 'views': [(calander_view and calander_view[1] or False, 'calendar'), (form_view and form_view[1] or False, 'form'), (tree_view and tree_view[1] or False, 'tree')],
'type': 'ir.actions.act_window',
- 'search_view_id': res['res_id'],
+ 'search_view_id': search_view and search_view[1] or False,
'nodestroy': True
}
return value
diff --git a/addons/crm/crm_lead_demo.xml b/addons/crm/crm_lead_demo.xml
index 576f258facc..830b572676d 100644
--- a/addons/crm/crm_lead_demo.xml
+++ b/addons/crm/crm_lead_demo.xml
@@ -1,6 +1,6 @@
-
+
@@ -9,8 +9,8 @@
-
-
+
+
@@ -92,7 +92,7 @@
-
+
diff --git a/addons/crm/crm_lead_menu.xml b/addons/crm/crm_lead_menu.xml
index 9b0581844a5..d0197fd82cd 100644
--- a/addons/crm/crm_lead_menu.xml
+++ b/addons/crm/crm_lead_menu.xml
@@ -60,16 +60,23 @@
Opportunitiescrm.lead
- tree,form,graph,calendar,kanban
+ kanban,tree,form,graph,calendar[('type','=','opportunity')]{'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'}
-
+ 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.
+
+
+ kanban
+
+
+
+
tree
diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index 9a6aaea66b4..e9c77b3bdc6 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -59,10 +59,11 @@
widget="selection"
domain="[('object_id.model','=','crm.lead')]"/>
+ type="action"
+ />
@@ -142,6 +143,29 @@
type="object" icon="gtk-convert" />
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -170,58 +194,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -325,7 +297,7 @@
-
+
-
@@ -459,7 +431,7 @@
Opportunitiescrm.leadform
- 10
+ 20
+
+
+ Create a Partner
+ ir.actions.act_window
+ crm.lead2opportunity.partner
+ form
+
+ new
+ ,]+)', lead.email_from or '')
- email = map(lambda x: "'" + x + "'", email)
- if email:
- cr.execute("""select partner_id from res_partner_address
- where
- substring(email from '([^ ,<@]+@[^> ,]+)') in (%s)""" % (','.join(email)))
- partner_ids = map(lambda x: x[0], cr.fetchall())
-
- # Find partner name that matches the name of the lead
- if not partner_ids and lead.partner_name:
- partner_ids = partner_obj.search(cr, uid, [('name', '=ilike', lead.partner_name)], context=context)
-
- partner_id = partner_ids and partner_ids[0] or False
- if 'partner_id' in fields:
- res.update({'partner_id': partner_id})
- if 'action' in fields:
- res.update({'action': partner_id and 'exist' or 'create'})
- if 'opportunity_ids' in fields:
- res.update({'opportunity_ids': data})
-
+ if 'partner_id' in fields:
+ res.update({'partner_id': partner_id})
+ if 'action' in fields:
+ res.update({'action': partner_id and 'exist' or 'create'})
+
return res
def open_create_partner(self, cr, uid, ids, context=None):
"""
This function Opens form of create partner.
- @param self: The object pointer
- @param cr: the current row, from the database cursor,
- @param uid: the current user’s ID for security checks,
- @param ids: List of Lead to Partner's IDs
- @param context: A standard dictionary for contextual values
-
- @return : Dictionary value for next form.
"""
- if context is None:
- context = {}
-
view_obj = self.pool.get('ir.ui.view')
- view_id = view_obj.search(cr, uid, [('model', '=', 'crm.lead2partner'), \
- ('name', '=', 'crm.lead2partner.view')])
+ view_id = view_obj.search(cr, uid, [('model', '=', self._name), \
+ ('name', '=', self._name+'.view')])
return {
'view_mode': 'form',
'view_type': 'form',
'view_id': view_id or False,
- 'res_model': 'crm.lead2partner',
+ 'res_model': self._name,
'context': context,
'type': 'ir.actions.act_window',
'target': 'new',
- }
-
+ }
def _create_partner(self, cr, uid, ids, context=None):
"""
This function Creates partner based on action.
- @param self: The object pointer
- @param cr: the current row, from the database cursor,
- @param uid: the current user’s ID for security checks,
- @param ids: List of Lead to Partner's IDs
- @param context: A standard dictionary for contextual values
-
- @return : Dictionary {}.
"""
if context is None:
context = {}
-
- lead_obj = self.pool.get('crm.lead')
- partner_obj = self.pool.get('res.partner')
- contact_obj = self.pool.get('res.partner.address')
- partner_ids = []
- partner_id = False
- rec_ids = context and context.get('active_ids', [])
-
- for data in self.browse(cr, uid, ids, context=context):
- for lead in lead_obj.browse(cr, uid, rec_ids, context=context):
- if data.action == 'create':
- partner_id = partner_obj.create(cr, uid, {
- 'name': lead.partner_name or lead.contact_name or lead.name,
- 'user_id': lead.user_id.id,
- 'comment': lead.description,
- 'address': []
- })
- contact_obj.create(cr, uid, {
- 'partner_id': partner_id,
- 'name': lead.contact_name,
- 'phone': lead.phone,
- 'mobile': lead.mobile,
- 'email': lead.email_from,
- 'fax': lead.fax,
- 'title': lead.title and lead.title.id or False,
- 'function': lead.function,
- 'street': lead.street,
- 'street2': lead.street2,
- 'zip': lead.zip,
- 'city': lead.city,
- 'country_id': lead.country_id and lead.country_id.id or False,
- 'state_id': lead.state_id and lead.state_id.id or False,
- })
-
- else:
- if data.partner_id:
- partner_id = data.partner_id.id
- self.assign_partner(cr, uid, lead.id, partner_id)
- partner_ids.append(partner_id)
- return partner_ids
-
-
- def assign_partner(self, cr, uid, lead_id, partner_id):
- self.pool.get("crm.lead").write(cr, uid, [lead_id], {'partner_id' : partner_id})
-
+ lead = self.pool.get('crm.lead')
+ lead_ids = context and context.get('active_ids') or []
+ data = self.browse(cr, uid, ids, context=context)[0]
+ partner_id = data.partner_id and data.partner_id.id or False
+ partner_ids = lead.convert_partner(cr, uid, lead_ids, data.action, partner_id, context=context)
+ return partner_ids[lead_ids[0]]
def make_partner(self, cr, uid, ids, context=None):
"""
This function Makes partner based on action.
- @param self: The object pointer
- @param cr: the current row, from the database cursor,
- @param uid: the current user’s ID for security checks,
- @param ids: List of Lead to Partner's IDs
- @param context: A standard dictionary for contextual values
-
- @return : Dictionary value for created Partner form.
"""
- if context is None:
- context = {}
-
- partner_ids = self._create_partner(cr, uid, ids, context=context)
- return {'type': 'ir.actions.act_window_close'}
+ partner_id = self._create_partner(cr, uid, ids, context=context)
+ return self.pool.get('res.partner').redirect_partner_form(cr, uid, partner_id, context=context)
crm_lead2partner()
diff --git a/addons/crm/wizard/crm_merge_opportunities.py b/addons/crm/wizard/crm_merge_opportunities.py
index f092d6ad0b6..381bb9871ea 100644
--- a/addons/crm/wizard/crm_merge_opportunities.py
+++ b/addons/crm/wizard/crm_merge_opportunities.py
@@ -26,195 +26,16 @@ class crm_merge_opportunity(osv.osv_memory):
_name = 'crm.merge.opportunity'
_description = 'Merge two Opportunities'
- def _get_first_not_null_id(self, attr, ops, oldest):
- if hasattr(oldest, attr) and getattr(oldest, attr):
- return getattr(oldest, attr).id
-
- for op in ops:
- if hasattr(op, attr) and getattr(op, attr):
- return getattr(op, attr).id
- return False
-
- def _get_first_not_null(self, attr, ops, oldest):
- if hasattr(oldest, attr) and getattr(oldest, attr):
- return getattr(oldest, attr)
-
- for op in ops:
- if hasattr(op, attr) and getattr(op, attr):
- return getattr(op, attr)
- return False
-
- def _concat_all(self, attr, ops):
- return ', '.join([getattr(op, attr) for op in ops if hasattr(op, attr) and getattr(op, attr)])
-
-
- def get_attachments(self, cr, uid, id, context=None):
- proxy = self.pool.get('ir.attachment')
- ids = proxy.search(cr, uid, [('res_model', '=', 'crm.lead'), ('res_id', '=', id)], context=context)
- return proxy.browse(cr, uid, ids, context=context)
-
- def find_oldest(self, cr, uid, op_ids, context=None):
- if not context:
- context = {}
- ids = [op_id.id for op_id in op_ids]
- if context.get('convert'):
- ids = list(set(ids) - set(context.get('lead_ids', False)) )
- lead_obj = self.pool.get('crm.lead')
- op_id = lead_obj.search(cr, uid, [('id', 'in', ids)], order='create_date' , context=context)
- if not op_id:
- return False
- opps = lead_obj.browse(cr, uid, [op_id[0]], context=context)
- return opps[0]
-
- def _update_data(self, op_ids, oldest_opp):
- data = {
- 'partner_id': self._get_first_not_null_id('partner_id', op_ids, oldest_opp), # !!
- 'title': self._get_first_not_null_id('title', op_ids, oldest_opp),
- 'name' : self._get_first_not_null('name', op_ids, oldest_opp), #not lost
- 'categ_id' : self._get_first_not_null_id('categ_id', op_ids, oldest_opp), # !!
- 'channel_id' : self._get_first_not_null_id('channel_id', op_ids, oldest_opp), # !!
- 'city' : self._get_first_not_null('city', op_ids, oldest_opp), # !!
- 'company_id' : self._get_first_not_null_id('company_id', op_ids, oldest_opp), #!!
- 'contact_name' : self._get_first_not_null('contact_name', op_ids, oldest_opp), #not lost
- 'country_id' : self._get_first_not_null_id('country_id', op_ids, oldest_opp), #!!
- 'partner_address_id' : self._get_first_not_null_id('partner_address_id', op_ids, oldest_opp), #!!
- 'type_id' : self._get_first_not_null_id('type_id', op_ids, oldest_opp), #!!
- 'user_id' : self._get_first_not_null_id('user_id', op_ids, oldest_opp), #!!
- 'section_id' : self._get_first_not_null_id('section_id', op_ids, oldest_opp), #!!
- 'state_id' : self._get_first_not_null_id('state_id', op_ids, oldest_opp),
- 'description' : self._concat_all('description', op_ids), #not lost
- 'email' : self._get_first_not_null('email', op_ids, oldest_opp), # !!
- 'fax' : self._get_first_not_null('fax', op_ids, oldest_opp),
- 'mobile' : self._get_first_not_null('mobile', op_ids, oldest_opp),
- 'partner_name' : self._get_first_not_null('partner_name', op_ids, oldest_opp),
- 'phone' : self._get_first_not_null('phone', op_ids, oldest_opp),
- 'probability' : self._get_first_not_null('probability', op_ids, oldest_opp),
- 'planned_revenue' : self._get_first_not_null('planned_revenue', op_ids, oldest_opp),
- 'street' : self._get_first_not_null('street', op_ids, oldest_opp),
- 'street2' : self._get_first_not_null('street2', op_ids, oldest_opp),
- 'zip' : self._get_first_not_null('zip', op_ids, oldest_opp),
- 'state' : 'open',
- 'create_date' : self._get_first_not_null('create_date', op_ids, oldest_opp),
- 'date_action_last': self._get_first_not_null('date_action_last', op_ids, oldest_opp),
- 'date_action_next': self._get_first_not_null('date_action_next', op_ids, oldest_opp),
- 'email_from' : self._get_first_not_null('email_from', op_ids, oldest_opp),
- 'email_cc' : self._get_first_not_null('email_cc', op_ids, oldest_opp),
- 'partner_name' : self._get_first_not_null('partner_name', op_ids, oldest_opp),
- }
- return data
-
- def merge(self, cr, uid, op_ids, context=None):
- """
- :param opp_ids: list of opportunities ids to merge
- """
- opp_obj = self.pool.get('crm.lead')
- message_obj = self.pool.get('mail.message')
-
- lead_ids = context and context.get('lead_ids', []) or []
-
- if len(op_ids) <= 1:
- raise osv.except_osv(_('Warning !'),_('Please select more than one opportunities.'))
-
- opportunities = opp_obj.browse(cr, uid, lead_ids, context=context)
- opportunities_list = list(set(op_ids) - set(opportunities))
- oldest_opp = self.find_oldest(cr, uid, op_ids, context=context)
- if opportunities :
- first_opportunity = opportunities[0]
- tail_opportunities = opportunities_list
- else:
- first_opportunity = opportunities_list[0]
- tail_opportunities = opportunities_list[1:]
- data = self._update_data(op_ids, oldest_opp)
-
- #copy message into the first opportunity + merge attachement
- count = 1
- first_attachments = self.get_attachments(cr, uid, first_opportunity, context=context)
- for opp in tail_opportunities:
- attachments = self.get_attachments(cr, uid, opp, context=context)
- for first in first_attachments:
- for attachment in attachments:
- if attachment.name == first.name:
- values = dict(
- name = "%s (%s)" % (attachment.name, count,),
- res_id = first_opportunity.id,
- )
- attachment.write(values)
- count+=1
-
- for history in opp.message_ids:
- message_obj.write(cr, uid, history.id, {'res_id': first_opportunity.id, 'subject' : _("From %s : %s") % (opp.name, history.subject) }, context=context)
-
- #Notification about loss of information
- details = []
- subject = ['Merged opportunities :']
- for opp in op_ids:
- subject.append(opp.name)
- details.append(_('Merged Opportunity: %s\n Partner: %s\n Stage: %s\n Section: %s\n Salesman: %s\n Category: %s\n Channel: %s\n Company: %s\n Contact name: %s\n Email: %s\n Phone number: %s\n Fax: %s\n Mobile: %s\n State: %s\n Description: %s\n Probability: %s\n Planned revennue: %s\n Country: %s\n City: %s\n Street: %s\n Street 2: %s\n Zip 2: %s') % ( opp.name, opp.partner_id.name or '',
- opp.stage_id.name or '',
- opp.section_id.name or '',
- opp.user_id.name or '',
- opp.categ_id.name or '',
- opp.channel_id.name or '',
- opp.company_id.name or '',
- opp.contact_name or '',
- opp.email_from or '',
- opp.phone or '',
- opp.fax or '',
- opp.mobile or '',
- opp.state_id.name or '',
- opp.description or '',
- opp.probability or '',
- opp.planned_revenue or '',
- opp.country_id.name or '',
- opp.city or '',
- opp.street or '',
- opp.street2 or '',
- opp.zip or '',
- ))
- subject = subject[0] + ", ".join(subject[1:])
- details = "\n\n".join(details)
-
- opp_obj.message_append(cr, uid, [first_opportunity], subject, body_text=details)
- #data.update({'message_ids' : [(6, 0 ,self._concat_o2m('message_ids', op_ids))]})
- opp_obj.write(cr, uid, [first_opportunity.id], data, context=context)
- unlink_ids = map(lambda x: x.id, tail_opportunities)
- opp_obj.unlink(cr, uid, unlink_ids, context=context)
-
- models_data = self.pool.get('ir.model.data')
-
- # Get Opportunity views
- opportunity_view_form = models_data._get_id(
- cr, uid, 'crm', 'crm_case_form_view_oppor')
- opportunity_view_tree = models_data._get_id(
- cr, uid, 'crm', 'crm_case_tree_view_oppor')
- if opportunity_view_form:
- opportunity_view_form = models_data.browse(
- cr, uid, opportunity_view_form, context=context).res_id
- if opportunity_view_tree:
- opportunity_view_tree = models_data.browse(
- cr, uid, opportunity_view_tree, context=context).res_id
-
- return {
- 'name': _('Opportunity'),
- 'view_type': 'form',
- 'view_mode': 'tree, form',
- 'res_model': 'crm.lead',
- 'domain': [('type', '=', 'opportunity')],
- 'res_id': int(first_opportunity.id),
- 'view_id': False,
- 'views': [(opportunity_view_form, 'form'),
- (opportunity_view_tree, 'tree'),
- (False, 'calendar'), (False, 'graph')],
- 'type': 'ir.actions.act_window',
- }
-
-
def action_merge(self, cr, uid, ids, context=None):
- obj_opportunity = self.browse(cr, uid, ids[0], context=context)
- op_ids = obj_opportunity.opportunity_ids
- self.write(cr, uid, ids, {'opportunity_ids' : [(6,0, [op_ids[0].id])]}, context=context)
- context['lead_ids'] = [op_ids[0].id]
- return self.merge(cr, uid, op_ids, context)
+ lead = self.pool.get('crm.lead')
+ record = self.browse(cr, uid, ids[0], context=context)
+ opportunities = record.opportunity_ids
+ #TOFIX: why need to check lead_ids here
+ lead_ids = [opportunities[0].id]
+ self.write(cr, uid, ids, {'opportunity_ids' : [(6,0, lead_ids)]}, context=context)
+ context['lead_ids'] = lead_ids
+ merge_id = lead.merge_opportunity(cr, uid, [x.id for x in opportunities], context=context)
+ return lead.redirect_opportunity_view(cr, uid, merge_id, context=context)
_columns = {
'opportunity_ids' : fields.many2many('crm.lead', 'merge_opportunity_rel', 'merge_id', 'opportunity_id', 'Opportunities', domain=[('type', '=', 'opportunity')]),
@@ -223,13 +44,6 @@ class crm_merge_opportunity(osv.osv_memory):
def default_get(self, cr, uid, fields, context=None):
"""
This function gets default values
- @param self: The object pointer
- @param cr: the current row, from the database cursor,
- @param uid: the current users ID for security checks,
- @param fields: List of fields for default value
- @param context: A standard dictionary for contextual values
-
- @return : default values of fields.
"""
record_ids = context and context.get('active_ids', False) or False
res = super(crm_merge_opportunity, self).default_get(cr, uid, fields, context=context)
diff --git a/addons/crm/wizard/crm_opportunity_to_phonecall.py b/addons/crm/wizard/crm_opportunity_to_phonecall.py
index b0bfbf3b817..a45c87b1a6f 100644
--- a/addons/crm/wizard/crm_opportunity_to_phonecall.py
+++ b/addons/crm/wizard/crm_opportunity_to_phonecall.py
@@ -28,36 +28,11 @@ import time
class crm_opportunity2phonecall(osv.osv_memory):
"""Converts Opportunity to Phonecall"""
-
+ _inherit = 'crm.phonecall2phonecall'
_name = 'crm.opportunity2phonecall'
_description = 'Opportunity to Phonecall'
- _columns = {
- 'name' : fields.char('Call summary', size=64, required=True, select=1),
- 'user_id' : fields.many2one('res.users', "Assign To"),
- 'contact_name':fields.char('Contact', size=64),
- 'phone':fields.char('Phone', size=64),
- 'partner_id' : fields.many2one('res.partner', "Partner"),
- 'date': fields.datetime('Date'),
- 'section_id': fields.many2one('crm.case.section', 'Sales Team'),
- 'categ_id': fields.many2one('crm.case.categ', 'Category', \
- domain="['|',('section_id','=',False),('section_id','=',section_id),\
- ('object_id.model', '=', 'crm.phonecall')]"),
- 'action': fields.selection([('schedule','Schedule a call'), ('log','Log a call')], 'Action', required=True),
- 'note':fields.text('Note'),
- }
-
def default_get(self, cr, uid, fields, context=None):
- """
- This function gets default values
- @param self: The object pointer
- @param cr: the current row, from the database cursor,
- @param uid: the current user’s ID for security checks,
- @param fields: List of fields for default value
- @param context: A standard dictionary for contextual values
-
- @return : default values of fields.
- """
opp_obj = self.pool.get('crm.lead')
categ_id = False
data_obj = self.pool.get('ir.model.data')
@@ -66,8 +41,8 @@ class crm_opportunity2phonecall(osv.osv_memory):
categ_id = data_obj.browse(cr, uid, res_id, context=context).res_id
record_ids = context and context.get('active_ids', []) or []
- res = super(crm_opportunity2phonecall, self).default_get(cr, uid, fields, context=context)
- res.update({'action': 'log', 'date': time.strftime('%Y-%m-%d %H:%M:%S')})
+ res = {}
+ res.update({'action': 'schedule', 'date': time.strftime('%Y-%m-%d %H:%M:%S')})
for opp in opp_obj.browse(cr, uid, record_ids, context=context):
if 'name' in fields:
res.update({'name': opp.name})
@@ -87,84 +62,20 @@ class crm_opportunity2phonecall(osv.osv_memory):
res.update({'phone': opp.phone or (opp.partner_address_id and opp.partner_address_id.phone or False)})
return res
- def action_cancel(self, cr, uid, ids, context=None):
- """
- Closes Opportunity to Phonecall form
- @param self: The object pointer
- @param cr: the current row, from the database cursor,
- @param uid: the current user’s ID for security checks,
- @param ids: List of Opportunity to Phonecall's IDs
- @param context: A standard dictionary for contextual values
- """
- return {'type': 'ir.actions.act_window_close'}
-
- def action_apply(self, cr, uid, ids, context=None):
- """
- This converts Opportunity to Phonecall and opens Phonecall view
- @param self: The object pointer
- @param cr: the current row, from the database cursor,
- @param uid: the current user's ID for security checks,
- @param ids: List of Opportunity to Phonecall IDs
- @param context: A standard dictionary for contextual values
-
- @return : Dictionary value for created Opportunity form
- """
+ def action_schedule(self, cr, uid, ids, context=None):
value = {}
- record_ids = context and context.get('active_ids', []) or []
-
- phonecall_obj = self.pool.get('crm.phonecall')
- opp_obj = self.pool.get('crm.lead')
- mod_obj = self.pool.get('ir.model.data')
- result = mod_obj._get_id(cr, uid, 'crm', 'view_crm_case_phonecalls_filter')
- res = mod_obj.read(cr, uid, result, ['res_id'])
-
- data_obj = self.pool.get('ir.model.data')
-
- # Select the view
- id2 = data_obj._get_id(cr, uid, 'crm', 'crm_case_phone_tree_view')
- id3 = data_obj._get_id(cr, uid, 'crm', 'crm_case_phone_form_view')
- if id2:
- id2 = data_obj.browse(cr, uid, id2, context=context).res_id
- if id3:
- id3 = data_obj.browse(cr, uid, id3, context=context).res_id
-
- for this in self.browse(cr, uid, ids, context=context):
- for opp in opp_obj.browse(cr, uid, record_ids, context=context):
- vals = {
- 'name' : opp.name,
- 'case_id' : opp.id,
- 'user_id' : this.user_id and this.user_id.id or False,
- 'categ_id' : this.categ_id.id,
- 'description' : opp.description or False,
- 'date' : this.date,
- 'section_id' : this.section_id.id or False,
- 'partner_id': opp.partner_id and opp.partner_id.id or False,
- 'partner_address_id': opp.partner_address_id and opp.partner_address_id.id or False,
- 'partner_phone' : opp.phone or (opp.partner_address_id and opp.partner_address_id.phone or False),
- 'partner_mobile' : opp.partner_address_id and opp.partner_address_id.mobile or False,
- 'priority': opp.priority,
- 'opportunity_id': opp.id,
- 'date_open': time.strftime('%Y-%m-%d %H:%M:%S')
- }
-
- new_case = phonecall_obj.create(cr, uid, vals, context=context)
-
- if this.action == 'log':
- phonecall_obj.case_close(cr, uid, [new_case])
- return {'type': 'ir.actions.act_window_close'}
-
- value = {
- 'name': _('Phone Call'),
- 'domain': "[('user_id','=',%s),('opportunity_id','=',%s)]" % (uid,opp.id),
- 'view_type': 'form',
- 'view_mode': 'tree,form',
- 'res_model': 'crm.phonecall',
- 'res_id' : new_case,
- 'views': [(id3, 'form'), (id2, 'tree'), (False, 'calendar')],
- 'type': 'ir.actions.act_window',
- 'search_view_id': res['res_id'],
- }
- return value
+ if context is None:
+ context = {}
+ phonecall = self.pool.get('crm.phonecall')
+ opportunity_ids = context and context.get('active_ids') or []
+ opportunity = self.pool.get('crm.lead')
+ data = self.browse(cr, uid, ids, context=context)[0]
+ call_ids = opportunity.schedule_phonecall(cr, uid, opportunity_ids, data.date, data.name, \
+ data.note, data.phone, data.contact_name, data.user_id and data.user_id.id or False, \
+ data.section_id and data.section_id.id or False, \
+ data.categ_id and data.categ_id.id or False, \
+ action=data.action, context=context)
+ return phonecall.redirect_phonecall_view(cr, uid, call_ids[opportunity_ids[0]], context=context)
crm_opportunity2phonecall()
diff --git a/addons/crm/wizard/crm_opportunity_to_phonecall_view.xml b/addons/crm/wizard/crm_opportunity_to_phonecall_view.xml
index 980b93500d2..a12bd92115c 100644
--- a/addons/crm/wizard/crm_opportunity_to_phonecall_view.xml
+++ b/addons/crm/wizard/crm_opportunity_to_phonecall_view.xml
@@ -16,24 +16,19 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-
-
+
+
diff --git a/addons/crm/wizard/crm_partner_to_opportunity.py b/addons/crm/wizard/crm_partner_to_opportunity.py
index 4d24bd5b78f..6322d0341c1 100644
--- a/addons/crm/wizard/crm_partner_to_opportunity.py
+++ b/addons/crm/wizard/crm_partner_to_opportunity.py
@@ -35,16 +35,15 @@ class crm_partner2opportunity(osv.osv_memory):
'partner_id': fields.many2one('res.partner', 'Partner'),
}
+ def action_cancel(self, cr, uid, ids, context=None):
+ """
+ Closes Partner 2 Opportunity
+ """
+ return {'type':'ir.actions.act_window_close'}
+
def default_get(self, cr, uid, fields, context=None):
"""
This function gets default values
- @param self: The object pointer
- @param cr: the current row, from the database cursor,
- @param uid: the current user’s ID for security checks,
- @param fields: List of fields for default value
- @param context: A standard dictionary for contextual values
-
- @return : default values of fields.
"""
partner_obj = self.pool.get('res.partner')
data = context and context.get('active_ids', []) or []
@@ -58,56 +57,17 @@ class crm_partner2opportunity(osv.osv_memory):
return res
def make_opportunity(self, cr, uid, ids, context=None):
- """
- @param self: The object pointer
- @param cr: the current row, from the database cursor,
- @param uid: the current user’s ID for security checks,
- @param context: A standard dictionary for contextual values
- """
-
- data = context and context.get('active_ids', []) or []
- make_opportunity = self.pool.get('crm.partner2opportunity')
- data_obj = self.pool.get('ir.model.data')
- part_obj = self.pool.get('res.partner')
- categ_obj = self.pool.get('crm.case.categ')
- case_obj = self.pool.get('crm.lead')
-
- for make_opportunity_obj in make_opportunity.browse(cr, uid, ids, context=context):
- result = data_obj._get_id(cr, uid, 'crm', 'view_crm_case_opportunities_filter')
- res = data_obj.read(cr, uid, result, ['res_id'])
-
- id2 = data_obj._get_id(cr, uid, 'crm', 'crm_case_form_view_oppor')
- id3 = data_obj._get_id(cr, uid, 'crm', 'crm_case_tree_view_oppor')
- if id2:
- id2 = data_obj.browse(cr, uid, id2, context=context).res_id
- if id3:
- id3 = data_obj.browse(cr, uid, id3, context=context).res_id
-
- address = part_obj.address_get(cr, uid, data)
- categ_ids = categ_obj.search(cr, uid, [('object_id.model','=','crm.lead')])
-
- opp_id = case_obj.create(cr, uid, {
- 'name' : make_opportunity_obj.name,
- 'planned_revenue' : make_opportunity_obj.planned_revenue,
- 'probability' : make_opportunity_obj.probability,
- 'partner_id' : make_opportunity_obj.partner_id.id,
- 'partner_address_id' : address['default'],
- 'categ_id' : categ_ids and categ_ids[0] or '',
- 'state' :'draft',
- 'type': 'opportunity'
- })
- value = {
- 'name' : _('Opportunity'),
- 'view_type' : 'form',
- 'view_mode' : 'form,tree',
- 'res_model' : 'crm.lead',
- 'res_id' : opp_id,
- 'view_id' : False,
- 'views' : [(id2, 'form'), (id3, 'tree'), (False, 'calendar'), (False, 'graph')],
- 'type' : 'ir.actions.act_window',
- 'search_view_id' : res['res_id']
- }
- return value
+ partner_ids = context and context.get('active_ids', []) or []
+ partner = self.pool.get('res.partner')
+ lead = self.pool.get('crm.lead')
+ data = self.browse(cr, uid, ids, context=context)[0]
+ opportunity_ids = partner.make_opportunity(cr, uid, partner_ids,
+ data.name,
+ data.planned_revenue,
+ data.probability,
+ )
+ opportunity_id = opportunity_ids[partner_ids[0]]
+ return lead.redirect_opportunity_view(cr, uid, opportunity_id, context=context)
crm_partner2opportunity()
diff --git a/addons/crm/wizard/crm_partner_to_opportunity_view.xml b/addons/crm/wizard/crm_partner_to_opportunity_view.xml
index 1111bbbbc50..f75f3d5b90e 100644
--- a/addons/crm/wizard/crm_partner_to_opportunity_view.xml
+++ b/addons/crm/wizard/crm_partner_to_opportunity_view.xml
@@ -16,7 +16,7 @@
-
+
diff --git a/addons/crm/wizard/crm_phonecall_to_opportunity.py b/addons/crm/wizard/crm_phonecall_to_opportunity.py
index ffab1867ebb..7305cbd8b5f 100644
--- a/addons/crm/wizard/crm_phonecall_to_opportunity.py
+++ b/addons/crm/wizard/crm_phonecall_to_opportunity.py
@@ -26,97 +26,31 @@ class crm_phonecall2opportunity(osv.osv_memory):
""" Converts Phonecall to Opportunity"""
_name = 'crm.phonecall2opportunity'
+ _inherit = 'crm.partner2opportunity'
_description = 'Phonecall To Opportunity'
- def action_cancel(self, cr, uid, ids, context=None):
- """
- Closes Phonecall to Opportunity form
- """
-
- return {'type':'ir.actions.act_window_close'}
-
-
- def action_apply(self, cr, uid, ids, context=None):
+ def make_opportunity(self, cr, uid, ids, context=None):
"""
This converts Phonecall to Opportunity and opens Phonecall view
"""
- record_id = context and context.get('active_id', False) or False
- if record_id:
- opp_obj = self.pool.get('crm.lead')
- phonecall_obj = self.pool.get('crm.phonecall')
- case = phonecall_obj.browse(cr, uid, record_id, context=context)
- data_obj = self.pool.get('ir.model.data')
- result = data_obj._get_id(cr, uid, 'crm', 'view_crm_case_opportunities_filter')
- res = data_obj.read(cr, uid, result, ['res_id'])
- id2 = data_obj._get_id(cr, uid, 'crm', 'crm_case_form_view_oppor')
- id3 = data_obj._get_id(cr, uid, 'crm', 'crm_case_tree_view_oppor')
- if id2:
- id2 = data_obj.browse(cr, uid, id2, context=context).res_id
- if id3:
- id3 = data_obj.browse(cr, uid, id3, context=context).res_id
-
- for this in self.browse(cr, uid, ids, context=context):
- address = None
- if this.partner_id:
- address_id = self.pool.get('res.partner').address_get(cr, uid, [this.partner_id.id])
- if address_id['default']:
- address = self.pool.get('res.partner.address').browse(cr, uid, address_id['default'], context=context)
- new_opportunity_id = opp_obj.create(cr, uid, {
- 'name': this.name,
- 'planned_revenue': this.planned_revenue,
- 'probability': this.probability,
- 'partner_id': this.partner_id and this.partner_id.id or False,
- 'partner_address_id': address and address.id,
- 'phone': address and address.phone,
- 'mobile': address and address.mobile,
- 'section_id': case.section_id and case.section_id.id or False,
- 'description': case.description or False,
- 'phonecall_id': case.id,
- 'priority': case.priority,
- 'type': 'opportunity',
- 'phone': case.partner_phone or False,
- })
- vals = {
- 'partner_id': this.partner_id.id,
- 'opportunity_id' : new_opportunity_id,
- }
- phonecall_obj.write(cr, uid, [case.id], vals)
- phonecall_obj.case_close(cr, uid, [case.id])
- opp_obj.case_open(cr, uid, [new_opportunity_id])
-
- value = {
- 'name': _('Opportunity'),
- 'view_type': 'form',
- 'view_mode': 'form,tree',
- 'res_model': 'crm.lead',
- 'res_id': int(new_opportunity_id),
- 'view_id': False,
- 'views': [(id2, 'form'), (id3, 'tree'), (False, 'calendar'), (False, 'graph')],
- 'type': 'ir.actions.act_window',
- 'search_view_id': res['res_id']
- }
- return value
-
- _columns = {
- 'name' : fields.char('Opportunity Summary', size=64, required=True, select=1),
- 'probability': fields.float('Success Probability'),
- 'planned_revenue': fields.float('Expected Revenue'),
- 'partner_id': fields.many2one('res.partner', 'Partner'),
- }
+ if not len(ids):
+ return False
+ call_ids = context and context.get('active_ids', False) or False
+ this = self.browse(cr, uid, ids[0], context=context)
+ if not call_ids:
+ return {}
+ opportunity = self.pool.get('crm.lead')
+ phonecall = self.pool.get('crm.phonecall')
+ opportunity_ids = phonecall.convert_opportunity(cr, uid, call_ids, this.name, this.partner_id and this.partner_id.id or False, \
+ this.planned_revenue, this.probability, context=context)
+ return opportunity.redirect_opportunity_view(cr, uid, opportunity_ids[call_ids[0]], context=context)
def default_get(self, cr, uid, fields, context=None):
"""
This function gets default values
- @param self: The object pointer
- @param cr: the current row, from the database cursor,
- @param uid: the current user’s ID for security checks,
- @param fields: List of fields for default value
- @param context: A standard dictionary for contextual values
-
- @return : default values of fields.
"""
record_id = context and context.get('active_id', False) or False
- res = super(crm_phonecall2opportunity, self).default_get(cr, uid, fields, context=context)
+ res = {}
if record_id:
phonecall = self.pool.get('crm.phonecall').browse(cr, uid, record_id, context=context)
diff --git a/addons/crm/wizard/crm_phonecall_to_opportunity_view.xml b/addons/crm/wizard/crm_phonecall_to_opportunity_view.xml
index ea024831b54..d3c59f89433 100644
--- a/addons/crm/wizard/crm_phonecall_to_opportunity_view.xml
+++ b/addons/crm/wizard/crm_phonecall_to_opportunity_view.xml
@@ -19,7 +19,7 @@
-
+
diff --git a/addons/crm/wizard/crm_phonecall_to_partner.py b/addons/crm/wizard/crm_phonecall_to_partner.py
index 38e673108e4..0fa077bbf42 100644
--- a/addons/crm/wizard/crm_phonecall_to_partner.py
+++ b/addons/crm/wizard/crm_phonecall_to_partner.py
@@ -26,42 +26,12 @@ class crm_phonecall2partner(osv.osv_memory):
""" Converts phonecall to partner """
_name = 'crm.phonecall2partner'
+ _inherit = 'crm.lead2partner'
_description = 'Phonecall to Partner'
-
- _columns = {
- 'action': fields.selection([('exist', 'Link to an existing partner'), \
- ('create', 'Create a new partner')], \
- 'Action', required=True),
- 'partner_id': fields.many2one('res.partner', 'Partner')
- }
-
- def view_init(self, cr, uid, fields, context=None):
- """
- This function checks for precondition before wizard executes
- @param self: The object pointer
- @param cr: the current row, from the database cursor,
- @param uid: the current user’s ID for security checks,
- @param fields: List of fields for default value
- @param context: A standard dictionary for contextual values
-
- """
- phonecall_obj = self.pool.get('crm.phonecall')
- rec_ids = context and context.get('active_ids', [])
- for phonecall in phonecall_obj.browse(cr, uid, rec_ids, context=context):
- if phonecall.partner_id:
- raise osv.except_osv(_('Warning !'),
- _('A partner is already defined on this phonecall.'))
-
+
def _select_partner(self, cr, uid, context=None):
"""
This function Searches for Partner from selected phonecall.
- @param self: The object pointer
- @param cr: the current row, from the database cursor,
- @param uid: the current user’s ID for security checks,
- @param fields: List of fields for default value
- @param context: A standard dictionary for contextual values
-
- @return : Partner id if any for selected phonecall.
"""
if context is None:
context = {}
@@ -75,7 +45,7 @@ class crm_phonecall2partner(osv.osv_memory):
for phonecall in phonecall_obj.browse(cr, uid, rec_ids, context=context):
partner_ids = partner_obj.search(cr, uid, [('name', '=', phonecall.name or phonecall.name)])
if not partner_ids and phonecall.email_from:
- address_ids = contact_obj.search(cr, uid, [('email', '=', phonecall.email_from)])
+ address_ids = contact_obj.search(cr, uid, ['|', ('phone', '=', phonecall.partner_phone), ('mobile','=',phonecall.partner_mobile)])
if address_ids:
addresses = contact_obj.browse(cr, uid, address_ids)
partner_ids = addresses and [addresses[0].partner_id.id] or False
@@ -83,117 +53,20 @@ class crm_phonecall2partner(osv.osv_memory):
partner_id = partner_ids and partner_ids[0] or False
return partner_id
- _defaults = {
- 'action': lambda *a:'exist',
- 'partner_id': _select_partner
- }
-
- def open_create_partner(self, cr, uid, ids, context=None):
- """
- This function Opens form of create partner.
- @param self: The object pointer
- @param cr: the current row, from the database cursor,
- @param uid: the current user’s ID for security checks,
- @param ids: List of Phonecall to Partner's IDs
- @param context: A standard dictionary for contextual values
-
- @return : Dictionary value for next form.
- """
-
- view_obj = self.pool.get('ir.ui.view')
- view_id = view_obj.search(cr, uid, [('model', '=', 'crm.phonecall2partner'), \
- ('name', '=', 'crm.phonecall2partner.view')])
- return {
- 'view_mode': 'form',
- 'view_type': 'form',
- 'view_id': view_id or False,
- 'res_model': 'crm.phonecall2partner',
- 'context': context,
- 'type': 'ir.actions.act_window',
- 'target': 'new',
- }
-
def _create_partner(self, cr, uid, ids, context=None):
"""
This function Creates partner based on action.
- @param self: The object pointer
- @param cr: the current row, from the database cursor,
- @param uid: the current user’s ID for security checks,
- @param ids: List of Phonecall to Partner's IDs
- @param context: A standard dictionary for contextual values
-
- @return : Dictionary {}.
"""
if context is None:
context = {}
+ phonecall = self.pool.get('crm.phonecall')
- phonecall_obj = self.pool.get('crm.phonecall')
- partner_obj = self.pool.get('res.partner')
- contact_obj = self.pool.get('res.partner.address')
- partner_ids = []
- contact_id = False
-
- rec_ids = context and context.get('active_ids', [])
-
- for data in self.browse(cr, uid, ids, context=context):
- for phonecall in phonecall_obj.browse(cr, uid, rec_ids, context=context):
- if data.action == 'create':
- partner_id = partner_obj.create(cr, uid, {
- 'name': phonecall.name or phonecall.name,
- 'user_id': phonecall.user_id.id,
- 'comment': phonecall.description,
- })
- contact_id = contact_obj.create(cr, uid, {
- 'partner_id': partner_id,
- 'name': phonecall.name,
- 'phone': phonecall.partner_phone,
- })
-
- else:
- if data.partner_id:
- partner_id = data.partner_id.id
- contact_id = partner_obj.address_get(cr, uid, [partner_id])['default']
-
- partner_ids.append(partner_id)
-
- vals = {}
- if partner_id:
- vals.update({'partner_id': partner_id})
- if contact_id:
- vals.update({'partner_address_id': contact_id})
- phonecall_obj.write(cr, uid, [phonecall.id], vals)
- return partner_ids
-
- def make_partner(self, cr, uid, ids, context=None):
- """
- This function Makes partner based on action.
- @param self: The object pointer
- @param cr: the current row, from the database cursor,
- @param uid: the current user’s ID for security checks,
- @param ids: List of Phonecall to Partner's IDs
- @param context: A standard dictionary for contextual values
-
- @return : Dictionary value for created Partner form.
- """
-
- partner_ids = self._create_partner(cr, uid, ids, context=context)
- mod_obj = self.pool.get('ir.model.data')
- result = mod_obj._get_id(cr, uid, 'base', 'view_res_partner_filter')
- res = mod_obj.read(cr, uid, result, ['res_id'])
-
- value = {
- 'domain': "[]",
- 'view_type': 'form',
- 'view_mode': 'form,tree',
- 'res_model': 'res.partner',
- 'res_id': partner_ids and int(partner_ids[0]) or False,
- 'view_id': False,
- 'context': context,
- 'type': 'ir.actions.act_window',
- 'search_view_id': res['res_id']
- }
- return value
+ data = self.browse(cr, uid, ids, context=context)[0]
+ call_ids = context and context.get('active_ids') or []
+ partner_id = data.partner_id and data.partner_id.id or False
+ partner_ids = phonecall.convert_partner(cr, uid, call_ids, data.action, partner_id, context=context)
+ return partner_ids[call_ids[0]]
crm_phonecall2partner()
diff --git a/addons/crm/wizard/crm_phonecall_to_phonecall.py b/addons/crm/wizard/crm_phonecall_to_phonecall.py
index 2872acad4eb..d68591ab0b7 100644
--- a/addons/crm/wizard/crm_phonecall_to_phonecall.py
+++ b/addons/crm/wizard/crm_phonecall_to_phonecall.py
@@ -25,108 +25,50 @@ from tools.translate import _
import time
class crm_phonecall2phonecall(osv.osv_memory):
- """ Converts Phonecall to Phonecall"""
-
_name = 'crm.phonecall2phonecall'
_description = 'Phonecall To Phonecall'
+ _columns = {
+ 'name' : fields.char('Call summary', size=64, required=True, select=1),
+ 'user_id' : fields.many2one('res.users',"Assign To"),
+ 'contact_name':fields.char('Contact', size=64),
+ 'phone':fields.char('Phone', size=64),
+ 'categ_id': fields.many2one('crm.case.categ', 'Category', \
+ domain="['|',('section_id','=',False),('section_id','=',section_id),\
+ ('object_id.model', '=', 'crm.phonecall')]"),
+ 'date': fields.datetime('Date'),
+ 'section_id':fields.many2one('crm.case.section','Sales Team'),
+ 'action': fields.selection([('schedule','Schedule a call'), ('log','Log a call')], 'Action', required=True),
+ 'partner_id' : fields.many2one('res.partner', "Partner"),
+ 'note':fields.text('Note')
+ }
+
+
def action_cancel(self, cr, uid, ids, context=None):
"""
Closes Phonecall to Phonecall form
- @param self: The object pointer
- @param cr: the current row, from the database cursor,
- @param uid: the current user’s ID for security checks,
- @param ids: List of Phonecall to Phonecall's IDs
- @param context: A standard dictionary for contextual values
"""
return {'type':'ir.actions.act_window_close'}
- def action_apply(self, cr, uid, ids, context=None):
- """
- This converts Phonecall to Phonecall and opens Phonecall view
- @param self: The object pointer
- @param cr: the current row, from the database cursor,
- @param uid: the current user’s ID for security checks,
- @param ids: List of Phonecall to Phonecall IDs
- @param context: A standard dictionary for contextual values
-
- @return : Dictionary value for created Opportunity form
- """
- res = {}
- record_id = context and context.get('active_id', False) or False
- phonecall_obj = self.pool.get('crm.phonecall')
-
- if record_id:
- data_obj = self.pool.get('ir.model.data')
-
- # Get Phonecall views
- result = data_obj._get_id(cr, uid, 'crm', 'view_crm_case_phonecalls_filter')
- res = data_obj.read(cr, uid, result, ['res_id'])
- id2 = data_obj._get_id(cr, uid, 'crm', 'crm_case_phone_form_view')
- id3 = data_obj._get_id(cr, uid, 'crm', 'crm_case_phone_tree_view')
- if id2:
- id2 = data_obj.browse(cr, uid, id2, context=context).res_id
- if id3:
- id3 = data_obj.browse(cr, uid, id3, context=context).res_id
-
- phonecall = phonecall_obj.browse(cr, uid, record_id, context=context)
-
- for this in self.browse(cr, uid, ids, context=context):
- values = {
- 'name': this.name,
- 'user_id': this.user_id and this.user_id.id,
- 'categ_id': this.categ_id.id,
- 'section_id': this.section_id.id or (phonecall.section_id and phonecall.section_id.id),
- 'description': phonecall.description or '',
- 'partner_id': phonecall.partner_id.id,
- 'partner_address_id': phonecall.partner_address_id.id,
- 'partner_mobile': phonecall.partner_mobile or False,
- 'priority': phonecall.priority,
- 'partner_phone': phonecall.partner_phone or False,
- 'date': this.date
- }
- phonecall_id = phonecall_obj.create(cr, uid, values, context=context)
- if this.action == 'schedule':
- phonecall_obj.case_open(cr, uid, [phonecall_id])
- elif this.action == 'log':
- phonecall_obj.case_close(cr, uid, [phonecall_id])
-
- res = {
- 'name': _('Phone Call'),
- 'view_type': 'form',
- 'view_mode': 'form',
- 'res_model': 'crm.phonecall',
- 'view_id': False,
- 'views': [(id2, 'form'), (id3, 'tree'), (False, 'calendar'), (False, 'graph')],
- 'type': 'ir.actions.act_window',
- 'res_id': phonecall_id,
- 'domain': [('id', '=', phonecall_id)],
- 'search_view_id': res['res_id']
- }
- return res
-
- _columns = {
- 'name' : fields.char('Call summary', size=64, required=True, select=1),
- 'user_id' : fields.many2one('res.users',"Assign To"),
- 'categ_id': fields.many2one('crm.case.categ', 'Category', \
- domain="['|',('section_id','=',False),('section_id','=',section_id),\
- ('object_id.model', '=', 'crm.phonecall')]"),
- 'date': fields.datetime('Date'),
- 'section_id':fields.many2one('crm.case.section','Sales Team'),
- 'action': fields.selection([('schedule','Schedule a call'), ('log','Log a call')], 'Action', required=True),
- 'partner_id' : fields.many2one('res.partner', "Partner"),
- }
+ def action_schedule(self, cr, uid, ids, context=None):
+ value = {}
+ if context is None:
+ context = {}
+ phonecall = self.pool.get('crm.phonecall')
+ phonecall_ids = context and context.get('active_ids') or []
+ for this in self.browse(cr, uid, ids, context=context):
+ phocall_ids = phonecall.schedule_another_phonecall(cr, uid, phonecall_ids, this.date, this.name, \
+ this.user_id and this.user_id.id or False, \
+ this.section_id and this.section_id.id or False, \
+ this.categ_id and this.categ_id.id or False, \
+ action=this.action, context=context)
+ return phonecall.redirect_phonecall_view(cr, uid, phocall_ids[phonecall_ids[0]], context=context)
+
def default_get(self, cr, uid, fields, context=None):
"""
This function gets default values
- @param self: The object pointer
- @param cr: the current row, from the database cursor,
- @param uid: the current user’s ID for security checks,
- @param fields: List of fields for default value
- @param context: A standard dictionary for contextual values
-
- @return : default values of fields.
+
"""
res = super(crm_phonecall2phonecall, self).default_get(cr, uid, fields, context=context)
record_id = context and context.get('active_id', False) or False
diff --git a/addons/crm/wizard/crm_phonecall_to_phonecall_view.xml b/addons/crm/wizard/crm_phonecall_to_phonecall_view.xml
index 794634da4f1..572fbb8b9a1 100644
--- a/addons/crm/wizard/crm_phonecall_to_phonecall_view.xml
+++ b/addons/crm/wizard/crm_phonecall_to_phonecall_view.xml
@@ -22,8 +22,8 @@
-
-
+
+
diff --git a/addons/crm_caldav/i18n/ar.po b/addons/crm_caldav/i18n/ar.po
new file mode 100644
index 00000000000..7865b4a8797
--- /dev/null
+++ b/addons/crm_caldav/i18n/ar.po
@@ -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 , 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME \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 \n"
+"Language-Team: Arabic \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 ""
diff --git a/addons/crm_claim/__openerp__.py b/addons/crm_claim/__openerp__.py
index ae493c5dac2..8c21fee5de0 100644
--- a/addons/crm_claim/__openerp__.py
+++ b/addons/crm_claim/__openerp__.py
@@ -48,8 +48,11 @@ automatically new claims based on incoming emails.
'demo_xml': [
'crm_claim_demo.xml',
],
- 'test': ['test/test_crm_claim.yml'],
+ 'test': ['test/process/claim.yml',
+ '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'],
diff --git a/addons/crm_claim/crm_claim.py b/addons/crm_claim/crm_claim.py
index b5cd2009698..7875d6a2f1a 100644
--- a/addons/crm_claim/crm_claim.py
+++ b/addons/crm_claim/crm_claim.py
@@ -46,6 +46,7 @@ class crm_claim(crm.crm_case, osv.osv):
_columns = {
'id': fields.integer('ID', readonly=True),
'name': fields.char('Claim Subject', size=128, required=True),
+ 'active': fields.boolean('Active'),
'action_next': fields.char('Next Action', size=200),
'date_action_next': fields.datetime('Next Action Date'),
'description': fields.text('Description'),
@@ -95,6 +96,7 @@ class crm_claim(crm.crm_case, osv.osv):
'date': lambda *a: time.strftime('%Y-%m-%d %H:%M:%S'),
'company_id': lambda s, cr, uid, c: s.pool.get('res.company')._company_default_get(cr, uid, 'crm.case', context=c),
'priority': lambda *a: crm.AVAILABLE_PRIORITIES[2][0],
+ 'active': lambda *a: 1
}
def onchange_partner_id(self, cr, uid, ids, part, email=False):
@@ -129,8 +131,6 @@ class crm_claim(crm.crm_case, osv.osv):
if l.state == 'draft':
message = _("The claim '%s' has been opened.") % l.name
self.log(cr, uid, l.id, message)
- value = {'date_open': time.strftime('%Y-%m-%d %H:%M:%S')}
- self.write(cr, uid, [l.id], value)
stage_id = self.stage_find(cr, uid, l.section_id.id or False, [('sequence','>',0)])
if stage_id:
self.stage_set(cr, uid, [l.id], stage_id)
diff --git a/addons/crm_claim/crm_claim_demo.xml b/addons/crm_claim/crm_claim_demo.xml
index 0f8488628b5..8279e04eb6f 100644
--- a/addons/crm_claim/crm_claim_demo.xml
+++ b/addons/crm_claim/crm_claim_demo.xml
@@ -15,8 +15,6 @@
-
-
@@ -31,8 +29,6 @@
-
-
@@ -47,8 +43,6 @@
-
-
@@ -63,8 +57,6 @@
-
-
@@ -79,8 +71,6 @@
-
-
@@ -88,14 +78,12 @@
-
-
@@ -104,14 +92,12 @@
-
-
diff --git a/addons/crm_claim/crm_claim_view.xml b/addons/crm_claim/crm_claim_view.xml
index 7ec18da18eb..08237d06094 100644
--- a/addons/crm_claim/crm_claim_view.xml
+++ b/addons/crm_claim/crm_claim_view.xml
@@ -151,7 +151,7 @@
-
+
@@ -161,32 +161,6 @@
context="{'mail.compose.message.mode':'reply'}"
icon="terp-mail-replied" type="action" />
-
-
- crm.new.mass.forward.mail.form
- crm.lead.mass.forward.to.partner
- form
-
-
-
-
-
+
diff --git a/addons/crm_profiling/__openerp__.py b/addons/crm_profiling/__openerp__.py
index 656f8360f0b..1d8f9f7ee79 100644
--- a/addons/crm_profiling/__openerp__.py
+++ b/addons/crm_profiling/__openerp__.py
@@ -41,7 +41,9 @@ It also has been merged with the earlier CRM & SRM segmentation tool because the
'init_xml': [],
'update_xml': ['security/ir.model.access.csv', 'crm_profiling_view.xml'],
'demo_xml': ['crm_profiling_demo.xml'],
- 'test': ['test/test_crm_profiling.yml'],
+ 'test': [
+ #'test/process/profiling.yml', #TODO:It's not debuging because problem to write data for open.questionnaire from partner section.
+ ],
'installable': True,
'active': False,
'certificate': '0033984979005',
diff --git a/addons/crm_profiling/crm_profiling_demo.xml b/addons/crm_profiling/crm_profiling_demo.xml
index 1789e8bace8..6a0ca130ec3 100644
--- a/addons/crm_profiling/crm_profiling_demo.xml
+++ b/addons/crm_profiling/crm_profiling_demo.xml
@@ -102,7 +102,7 @@
Profiles / crm.segmentation
-->
-
+ OpenERP partners
@@ -111,22 +111,23 @@
Bronze partners
-
+ TrueSilver partners
-
+ TrueGold partners
-
+
+ TrueTrue
diff --git a/addons/crm_profiling/test/process/profiling.yml b/addons/crm_profiling/test/process/profiling.yml
new file mode 100644
index 00000000000..91c48410f8d
--- /dev/null
+++ b/addons/crm_profiling/test/process/profiling.yml
@@ -0,0 +1,10 @@
+-
+ I check segmentation which allows users to perform segmentation within partners
+ and set the category according to question, so first compute questions(answers)
+ scenario with parther and check that category set according to questions.
+-
+ !python {model: res.partner}: |
+ data ={'form': {'quest_form3': ref("partner_quality3"), 'quest_form2': ref("nb_employees2"),'quest_form1': ref("sector1"),'questionnaire_name': ref('questionnaire1')}, 'ids': [ref('base.res_partner_ericdubois0')], 'report_type': 'pdf', 'model': 'res.partner', 'id': ref('base.res_partner_ericdubois0')}
+ data = self._questionnaire_compute(cr, uid, data, context)
+ partner = self.browse(cr, uid, ref('base.res_partner_ericdubois0'))
+ assert partner.category_id[0].id == ref("base.res_partner_category_17"), "Category not assign properly"
diff --git a/addons/crm_profiling/test/test_crm_profiling.yml b/addons/crm_profiling/test/test_crm_profiling.yml
deleted file mode 100644
index 2b70cac592b..00000000000
--- a/addons/crm_profiling/test/test_crm_profiling.yml
+++ /dev/null
@@ -1,77 +0,0 @@
-- |
- I check segmentation which allows users to perform segmentation within partners.
--
- I create a crm profiling question record.
--
- !record {model: crm_profiling.question, id: crm_profiling_question_openerppartner0}:
- answers_ids:
- - name: 'no'
- name: OpenERP partner?
--
- I create a crm profiling answer record.
--
- !record {model: crm_profiling.answer, id: crm_profiling_answer_openerppartner0}:
- name: 'yes'
- question_id: crm_profiling_question_openerppartner0
--
- I create Partner category Customers.
--
- !record {model: res.partner.category, id: res_partner_category_customers0}:
- name: Customers
-- |
- I'm creating new partner "John" with his email "info@mycustomer.com".
--
- !record {model: res.partner, id: res_partner_john0}:
- address:
- - city: Bruxelles
- country_id: base.be
- street: Rue des Palais 51, bte 33
- type: default
- zip: '1000'
- email: 'info@mycustomer.com'
- name: John
- category_id:
- - res_partner_category_customers0
- answers_ids:
- - crm_profiling_answer_openerppartner0
-
--
- Define the answers and category to partner.
--
- !python {model: res.partner}: |
- data ={'form': {'questionnaire_name': ref('res_partner_john0')}, 'ids': [ref('res_partner_john0')], 'report_type': 'pdf', 'model': 'res.partner', 'id': ref('res_partner_john0')}
- self._questionnaire_compute(cr, uid, data, context)
-- |
- I start by creating new Questionnaire.
--
- !record {model: crm_profiling.questionnaire, id: crm_profiling_questionnaire_basequestionnaire0}:
- description: First questionnaire.
- name: Base questionnaire
- questions_ids:
- - crm_profiling.activity_sector
- - crm_profiling.nb_employees
- - crm_profiling.partner_level
-- |
- I create the form for the "Base questionnaire".
--
- !python {model: crm_profiling.questionnaire}: |
- context.update({'active_id':ref('res_partner_john0')})
- data ={'form': {'questionnaire_name': ref('res_partner_john0')}, 'ids': [ref('res_partner_john0')], 'report_type': 'pdf', 'model': 'res.partner', 'id': ref('res_partner_john0')}
- self.build_form(cr, uid, data, context)
--
- I create a segmentation record.
--
- !record {model: crm.segmentation, id: crm_segmentation_test1}:
- answer_yes:
- - crm_profiling_answer_openerppartner0
- categ_id: res_partner_category_customers0
- name: test
- parent_id: crm_profiling.crm_segmentation0
- profiling_active: true
- som_interval: 0.0
-- |
- I continue the process of segmentation.
--
- !python {model: crm.segmentation}: |
- self.process_continue(cr, uid, [ref('crm_segmentation_test1')], start=False)
-
diff --git a/addons/crm_todo/__openerp__.py b/addons/crm_todo/__openerp__.py
index 3b870153347..01f66160b0b 100644
--- a/addons/crm_todo/__openerp__.py
+++ b/addons/crm_todo/__openerp__.py
@@ -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.
diff --git a/addons/decimal_precision/__openerp__.py b/addons/decimal_precision/__openerp__.py
index 91e7ce57029..303d42558b3 100644
--- a/addons/decimal_precision/__openerp__.py
+++ b/addons/decimal_precision/__openerp__.py
@@ -30,7 +30,7 @@ The decimal precision is configured per company.
"author": "OpenERP SA",
"version": "0.1",
"depends": ["base"],
- "category" : "Hidden",
+ "category" : "Tools",
'complexity': "easy",
"init_xml": [],
"update_xml": [
diff --git a/addons/delivery/report/shipping.rml b/addons/delivery/report/shipping.rml
index 563c3bda826..1ed7e7098bc 100644
--- a/addons/delivery/report/shipping.rml
+++ b/addons/delivery/report/shipping.rml
@@ -131,19 +131,11 @@
Invoiced to[[ o.sale_id and o.sale_id.partner_invoice_id and o.sale_id.partner_invoice_id.name or '']]
- [[ o.sale_id and o.sale_id.partner_invoice_id and o.sale_id.partner_invoice_id.street or '']]
- [[ (o.sale_id and o.sale_id.partner_invoice_id and o.sale_id.partner_invoice_id.street2) or removeParentNode('para')]]
- [[ o.sale_id and o.sale_id.partner_invoice_id and o.sale_id.partner_invoice_id.zip or '']] [[ o.sale_id and o.sale_id.partner_invoice_id and o.sale_id.partner_invoice_id.city or '' ]]
- [[ (o.sale_id and o.sale_id.partner_invoice_id and o.sale_id.partner_invoice_id.state_id and o.sale_id.partner_invoice_id.state_id.name) or removeParentNode('para') ]]
- [[ o.sale_id and o.sale_id.partner_invoice_id and o.sale_id.partner_invoice_id.country_id and o.sale_id.partner_invoice_id.country_id.name or '']]
+ [[ o.sale_id and o.sale_id.partner_invoice_id and display_address(o.sale_id.partner_invoice_id) ]]
[[ o.address_id and o.address_id.partner_id and o.address_id.partner_id.name or '' ]]
- [[ o.address_id and o.address_id.street or '']]
- [[ o.address_id and o.address_id.street2 or removeParentNode('para')]]
- [[ o.address_id and o.address_id.zip or '']] [[ o.address_id and o.address_id.city or '']]
- [[ (o.address_id and o.address_id.state_id and o.address_id.state_id.name) or removeParentNode('para') ]]
- [[ o.address_id and o.address_id.country_id and o.address_id.country_id.name or '']]
+ [[ o.address_id and o.address_id and display_address(o.address_id) ]]
diff --git a/addons/document/document.py b/addons/document/document.py
index 1bf177f50e6..36b10b34e4b 100644
--- a/addons/document/document.py
+++ b/addons/document/document.py
@@ -254,7 +254,6 @@ class document_file(osv.osv):
del vals['file_size']
if ids and vals:
result = super(document_file,self).write(cr, uid, ids, vals, context=context)
- cr.commit() # ?
return result
def create(self, cr, uid, vals, context=None):
@@ -299,7 +298,6 @@ class document_file(osv.osv):
else:
#raise osv.except_osv(_('ValidateError'), _('File name must be unique!'))
result = super(document_file, self).create(cr, uid, vals, context)
- cr.commit() # ?
return result
def __get_partner_id(self, cr, uid, res_model, res_id, context=None):
diff --git a/addons/document/test/document_test2.yml b/addons/document/test/document_test2.yml
index 65312eaf10d..be91bfb3644 100644
--- a/addons/document/test/document_test2.yml
+++ b/addons/document/test/document_test2.yml
@@ -80,4 +80,3 @@
-
!python {model: document.directory}: |
self.unlink(cr, uid, [ref('dir_tests')])
- cr.commit()
diff --git a/addons/document_ftp/__openerp__.py b/addons/document_ftp/__openerp__.py
index 499a928c077..a7b5a65e227 100644
--- a/addons/document_ftp/__openerp__.py
+++ b/addons/document_ftp/__openerp__.py
@@ -49,6 +49,7 @@ FTP client.
],
'installable': True,
'active': False,
+ 'application': True,
'certificate': '00934787762705016005',
'images': ['images/1_configure_ftp.jpeg','images/2_document_browse.jpeg','images/3_document_ftp.jpeg'],
'post_load': 'post_load',
diff --git a/addons/document_ftp/test/document_ftp_test2.yml b/addons/document_ftp/test/document_ftp_test2.yml
index 33ce1416ec8..eb86a99407d 100644
--- a/addons/document_ftp/test/document_ftp_test2.yml
+++ b/addons/document_ftp/test/document_ftp_test2.yml
@@ -100,11 +100,11 @@
fdata = StringIO('abcd')
ftp.storbinary('STOR test2.txt', fdata)
ftp.close()
- cr.commit()
-
I look for the "test2.txt" file at the server
-
!python {model: ir.attachment }: |
+ cr.rollback() # restart transaction to see changes (FTP-FS uses its own cursor)
ids = self.search(cr, uid, [('name', '=', 'test2.txt')])
assert ids, "No test2.txt file found."
-
@@ -116,11 +116,11 @@
ftp = te.get_ftp_folder(cr, uid, self, 'Documents')
ftp.delete('test2.txt')
ftp.close()
- cr.commit()
-
I check at the server that test2.txt is deleted
-
!python {model: ir.attachment }: |
+ cr.rollback() # restart transaction to see changes (FTP-FS uses its own cursor)
ids = self.search(cr, uid, [('name', '=', 'test2.txt')])
assert not ids, "test2.txt file can still be found."
-
@@ -133,7 +133,7 @@
fdata = StringIO('abcd')
ftp.storbinary('STOR test2.txt', fdata)
ftp.close()
- cr.commit()
+ cr.rollback() # restart transaction to see changes (FTP-FS uses its own cursor)
-
I delete the test2.txt from the server (RPC).
-
diff --git a/addons/document_ftp/test/document_ftp_test4.yml b/addons/document_ftp/test/document_ftp_test4.yml
index 0a3ff33333e..9b311f64605 100644
--- a/addons/document_ftp/test/document_ftp_test4.yml
+++ b/addons/document_ftp/test/document_ftp_test4.yml
@@ -4,7 +4,6 @@
!python {model: ir.attachment}: |
from document_ftp import test_easyftp as te
ftp = te.get_plain_ftp(timeout=1.0)
- cr.commit()
- |
I create two partners 'Partner1' and 'Partner2'.
I create three partner categories: 'none', 'pat1' and 'all'
@@ -54,7 +53,6 @@
dirs = ftp.nlst()
for dir in [ 'All Partner1+2', 'No partners', 'Pat 1' ]:
assert dir in dirs, "Dir %s not in folder" % dir
- cr.commit()
-
I create a 'partners' folder by the first resource one.
-
@@ -65,6 +63,8 @@
ressource_type_id: base.model_res_partner
domain: "[('category_id','in',[active_id])]"
ressource_parent_type_id : base.model_res_partner_category
+-
+ I commit (because FTP operations are on different transaction)
-
!python {model: document.directory, id: }: |
cr.commit()
@@ -81,7 +81,6 @@
for dir in correct:
res = ftp.nlst(dir+'/Partners of Test')
assert res == correct[dir], "Dir %s falsely contains %s" %(dir, res)
- cr.commit()
-
I create an ir.attachment, attached (not related) to Partner1
-
@@ -89,6 +88,11 @@
name: File of pat1
res_model: res.partner
res_id: !eval ref("tpartner1")
+-
+ I commit (because FTP operations are on different transaction)
+-
+ !python {model: document.directory, id: }: |
+ cr.commit()
-
I check that pat1/Partner1 folder has the file.
I check that all/Partner1 folder has the file
@@ -109,6 +113,7 @@
ftp = te.get_ftp_folder(cr, uid, self, 'Documents/Partners Testing/Pat 1/Partners of Test/Partner 1')
fdata = StringIO('abcd')
ftp.storbinary('STOR pat1-dynamic.txt', fdata)
+ cr.rollback() # restart transaction to see changes (FTP-FS uses its own cursor)
-
I check at the server that the file is attached to Partner1
-
@@ -159,7 +164,8 @@
from cStringIO import StringIO
ftp = te.get_ftp_folder(cr, uid, self, 'Documents/Partners Testing/Pat 1/Partners of Test/Partner 1')
ftp.delete('pat1-dynamic.txt')
- ftp.close()
+ ftp.close()
+ cr.rollback() # restart transaction to see changes (FTP-FS uses its own cursor)
-
I delete the Partners Testing folder, "File of pat1" file, Partner and Partner category.
@@ -177,5 +183,5 @@
partner_categ_pool.unlink(cr, uid, [ref('tpat_categ_all')])
partner_pool.unlink(cr, uid, [ref('tpartner1')])
partner_pool.unlink(cr, uid, [ref('tpartner_2')])
- cr.commit()
+ cr.commit() #required because all the operations via FTP were committed
diff --git a/addons/document_ics/__openerp__.py b/addons/document_ics/__openerp__.py
index 7d718266d6a..679a6adabb6 100644
--- a/addons/document_ics/__openerp__.py
+++ b/addons/document_ics/__openerp__.py
@@ -21,9 +21,9 @@
{
- 'name': 'Support for iCal based on Document Management System',
+ 'name': 'iCal Support',
'version': '1.0',
- 'category': 'Hidden',
+ 'category': 'Tools',
'complexity': "normal",
'description': """
Allows to synchronise calendars with others applications.
diff --git a/addons/email_template/security/ir.model.access.csv b/addons/email_template/security/ir.model.access.csv
index f5f61240a96..3903a95f9ce 100644
--- a/addons/email_template/security/ir.model.access.csv
+++ b/addons/email_template/security/ir.model.access.csv
@@ -2,3 +2,4 @@
"access_email_template","email.template","model_email_template",,1,0,0,0
"access_email_template_system","email.template system","model_email_template","base.group_system",1,1,1,1
"access_email_template_manager","email.template","model_email_template",,1,1,1,1
+"access_email_template_preview_system","email.template.preview system","model_email_template_preview","base.group_system",1,1,1,1
diff --git a/addons/event/__openerp__.py b/addons/event/__openerp__.py
index 1890ed7bf84..abd3f6393b5 100644
--- a/addons/event/__openerp__.py
+++ b/addons/event/__openerp__.py
@@ -21,9 +21,9 @@
{
- 'name': 'Event',
+ 'name': 'Events Organisation',
'version': '0.1',
- 'category': 'Hidden',
+ 'category': 'Tools',
'complexity': "easy",
'description': """
Organization and management of Events.
@@ -56,6 +56,7 @@ Note that:
'demo_xml': ['event_demo.xml'],
'test': ['test/test_event.yml'],
'installable': True,
+ 'application': True,
'active': False,
'certificate': '0083059161581',
'images': ['images/1_event_type_list.jpeg','images/2_events.jpeg','images/3_registrations.jpeg'],
diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml
index 6a057fe204d..31fb353c113 100644
--- a/addons/event/event_view.xml
+++ b/addons/event/event_view.xml
@@ -388,7 +388,7 @@
-
+
@@ -398,32 +398,6 @@
context="{'mail.compose.message.mode':'reply', 'message_id':active_id}"
icon="terp-mail-replied" type="action" />
-
@@ -39,10 +37,8 @@
diff --git a/addons/hr/hr_department_view.xml b/addons/hr/hr_department_view.xml
index 9fdb64651f5..a48103ad2e0 100644
--- a/addons/hr/hr_department_view.xml
+++ b/addons/hr/hr_department_view.xml
@@ -19,14 +19,6 @@
-
-
-
-
-
-
-
-
diff --git a/addons/hr/hr_view.xml b/addons/hr/hr_view.xml
index c2b0626fab0..f51280f4465 100644
--- a/addons/hr/hr_view.xml
+++ b/addons/hr/hr_view.xml
@@ -131,45 +131,46 @@
hr.employeekanban
-
+
+
+
+
Job:
+
+
-
-
+
-
-
+
+
-
-
-
-
-
-
-
-
-
- ,
-
-
-
-
- ,
-
-
-
-
-
+
+
+ ❖
+
+
+ ✜
+
+
+ ✉
+
+
+ ☎
+
+
+ ☏
+
+
-
+
-
+
@@ -201,21 +202,26 @@
Employeeshr.employeeform
- tree,form,kanban
+ kanban,tree,form[]{"search_default_department_id": department_id,"search_default_active":eval('True')}
-
+ Here you can manage your work force by creating employees and assigning them specific properties in the system. Maintain all employee related information and keep track of anything that needs to be recorded for them. The personal information tab will help you maintain their identity data. The Categories tab gives you the opportunity to assign them related employee categories depending on their position and activities within the company. A category can be a seniority level within the company or a department. The Timesheets tab allows to assign them a specific timesheet and analytic journal where they will be able to enter time through the system. In the note tab, you can enter text data that should be recorded for a specific employee.
-
+
+
+
+ kanban
+
+ tree
-
+
form
diff --git a/addons/hr_attendance/hr_attendance_demo.xml b/addons/hr_attendance/hr_attendance_demo.xml
index a1f42eb1004..f478e099b87 100644
--- a/addons/hr_attendance/hr_attendance_demo.xml
+++ b/addons/hr_attendance/hr_attendance_demo.xml
@@ -122,21 +122,5 @@
-
diff --git a/addons/hr_evaluation/__openerp__.py b/addons/hr_evaluation/__openerp__.py
index 720c49302d4..4c1b32e1395 100644
--- a/addons/hr_evaluation/__openerp__.py
+++ b/addons/hr_evaluation/__openerp__.py
@@ -27,7 +27,7 @@
'complexity': "easy",
"website": "http://www.openerp.com",
"images": ["images/hr_evaluation_analysis.jpeg","images/hr_evaluation.jpeg"],
- "depends": ["hr",'hr_recruitment','survey'],
+ "depends": ["hr","base_calendar","survey"],
"description": """
Ability to create employees evaluation.
=======================================
@@ -54,6 +54,7 @@ in the form of pdf file. Implements a dashboard for My Current Evaluations
"active": False,
"installable": True,
"certificate" : "00883207679172998429",
+ 'application': True,
}
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/hr_evaluation/board_hr_evaluation_view.xml b/addons/hr_evaluation/board_hr_evaluation_view.xml
index 7f6d3142db5..3e437833c2d 100644
--- a/addons/hr_evaluation/board_hr_evaluation_view.xml
+++ b/addons/hr_evaluation/board_hr_evaluation_view.xml
@@ -2,7 +2,7 @@
- My Evaluation Remaining
+ My Appraisal Remainingir.actions.act_windowhr_evaluation.evaluationform
@@ -17,8 +17,8 @@
form
-
-
+
+
diff --git a/addons/hr_evaluation/hr_evaluation_data.xml b/addons/hr_evaluation/hr_evaluation_data.xml
index 40ff397534e..ec4b46f8a62 100644
--- a/addons/hr_evaluation/hr_evaluation_data.xml
+++ b/addons/hr_evaluation/hr_evaluation_data.xml
@@ -2,7 +2,7 @@
- Employee Evaluation
+ Employee Appraisal20
@@ -11,7 +11,7 @@
open
- Employee Evaluation Form
+ Employee Appraisal Form
@@ -128,7 +128,7 @@
descriptive_textThe comment you entered is in an invalid format.
- * The employee will be responsible for completing a draft of the Appraisal Form as a tool for self-evaluation and a starting point for the supervisor’s evaluation. The employee can add examples of achievements for each criterion.
+ * The employee will be responsible for completing a draft of the Appraisal Form as a tool for self-appraisal and a starting point for the supervisor’s evaluation. The employee can add examples of achievements for each criterion.
Once the form had been filled, the employee send it to his supervisor.
* It is the primary responsibility of the supervisor to gather the necessary input from the appropriate sources of feedback (internal and/or external customers, peers). In case of collaboration with OpenERP SA Belgium, the supervisor must receive completed evaluation form from the employee's Belgian project manager.
@@ -204,7 +204,7 @@ Once the form had been filled, the employee send it to his supervisor.
Subjectmatrix_of_choices_only_one_ans
- Recommendations / Evaluations
+ Recommendations / AppraisalsThe comment you entered is in an invalid format.
@@ -227,7 +227,7 @@ Once the form had been filled, the employee send it to his supervisor.
Supervisors only : matrix_of_choices_only_one_ans
- Recommendations / Evaluations
+ Recommendations / AppraisalsThe comment you entered is in an invalid format.
@@ -1150,7 +1150,7 @@ Once the form had been filled, the employee send it to his supervisor.
- Manager's Evaluation Plan
+ Manager's Appraisal Plan
@@ -1205,7 +1205,7 @@ Once the form had been filled, the employee send it to his supervisor.
final
-
+
@@ -1219,7 +1219,7 @@ Once the form had been filled, the employee send it to his supervisor.
- Run Employee Evaluation
+ Run Employee Appraisal1
diff --git a/addons/hr_evaluation/hr_evaluation_installer.xml b/addons/hr_evaluation/hr_evaluation_installer.xml
index 842363559a9..10e7773bc62 100644
--- a/addons/hr_evaluation/hr_evaluation_installer.xml
+++ b/addons/hr_evaluation/hr_evaluation_installer.xml
@@ -2,11 +2,12 @@
- Review Evaluation Plans
+ Review Appraisal Plansir.actions.act_windowhr_evaluation.planformtree,form
+ You can define appraisal plans (ex: first interview after 6 months, then every year). Then, each employee can be linked to an appraisal plan so that OpenERP can automatically generate interview requests to managers and/or subordinates.
diff --git a/addons/hr_expense/__openerp__.py b/addons/hr_expense/__openerp__.py
index 4a22f00e076..e0a8a002a6a 100644
--- a/addons/hr_expense/__openerp__.py
+++ b/addons/hr_expense/__openerp__.py
@@ -21,7 +21,7 @@
{
- 'name': 'Expenses',
+ 'name': 'Expenses Management',
'version': '1.0',
'category': 'Human Resources',
'complexity': "easy",
@@ -68,5 +68,6 @@ re-invoice your customer's expenses if your work by project.
'installable': True,
'active': False,
'certificate': '0062479841789',
+ 'application': True,
}
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/hr_expense/board_hr_expense_view.xml b/addons/hr_expense/board_hr_expense_view.xml
index d9c80d6f755..3383f734f7d 100644
--- a/addons/hr_expense/board_hr_expense_view.xml
+++ b/addons/hr_expense/board_hr_expense_view.xml
@@ -17,7 +17,7 @@
form
-
+
diff --git a/addons/hr_holidays/__openerp__.py b/addons/hr_holidays/__openerp__.py
index ec12b884201..61d613ad0c5 100644
--- a/addons/hr_holidays/__openerp__.py
+++ b/addons/hr_holidays/__openerp__.py
@@ -21,9 +21,9 @@
{
- "name": "Leave Management",
+ "name": "Leaves Management",
"version": "1.5",
- "author": ['OpenERP SA', 'Axelor'],
+ "author": "OpenERP SA",
"category": "Human Resources",
'complexity': "easy",
"website": "http://www.openerp.com",
@@ -72,6 +72,7 @@ Note that:
'test/hr_holidays_report.yml',
],
'installable': True,
+ 'application': True,
'active': False,
'certificate': '0086579209325',
}
diff --git a/addons/hr_holidays/board_hr_holidays_view.xml b/addons/hr_holidays/board_hr_holidays_view.xml
index f0a0ab0741a..178602725ae 100644
--- a/addons/hr_holidays/board_hr_holidays_view.xml
+++ b/addons/hr_holidays/board_hr_holidays_view.xml
@@ -16,7 +16,7 @@
form
-
+
diff --git a/addons/hr_holidays/hr_holidays.py b/addons/hr_holidays/hr_holidays.py
index d22c5b9f1bb..746c2764315 100644
--- a/addons/hr_holidays/hr_holidays.py
+++ b/addons/hr_holidays/hr_holidays.py
@@ -262,7 +262,7 @@ class hr_holidays(osv.osv):
'name': record.name,
'categ_id': record.holiday_status_id.categ_id.id,
'duration': record.number_of_days_temp * 8,
- 'note': record.notes,
+ 'description': record.notes,
'user_id': record.user_id.id,
'date': record.date_from,
'end_date': record.date_to,
diff --git a/addons/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml
index 9eaf7cda025..8af2392f6e4 100644
--- a/addons/hr_holidays/hr_holidays_view.xml
+++ b/addons/hr_holidays/hr_holidays_view.xml
@@ -286,7 +286,7 @@
hr.holidaysform{'default_type': 'add', 'search_default_approve':1,"search_default_department_id": department_id}
- [('type','=','add')]
+ [('type','=','remove')]
diff --git a/addons/hr_payroll/__openerp__.py b/addons/hr_payroll/__openerp__.py
index 5c78b80f095..c659444551e 100644
--- a/addons/hr_payroll/__openerp__.py
+++ b/addons/hr_payroll/__openerp__.py
@@ -71,6 +71,7 @@ Generic Payroll system.
'installable': True,
'active': False,
'certificate' : '001046261404562128861',
+ 'application': True,
}
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/hr_payroll/hr_payroll.py b/addons/hr_payroll/hr_payroll.py
index affd81cce6d..aaf215c87f5 100644
--- a/addons/hr_payroll/hr_payroll.py
+++ b/addons/hr_payroll/hr_payroll.py
@@ -298,6 +298,14 @@ class hr_payslip(osv.osv):
context=context).company_id.id,
}
+ def _check_dates(self, cr, uid, ids, context=None):
+ for payslip in self.browse(cr, uid, ids, context=context):
+ if payslip.date_from > payslip.date_to:
+ return False
+ return True
+
+ _constraints = [(_check_dates, "Payslip 'Date From' must be before 'Date To'.", ['date_from', 'date_to'])]
+
def copy(self, cr, uid, id, default=None, context=None):
if not default:
default = {}
diff --git a/addons/hr_payroll/hr_payroll_demo.xml b/addons/hr_payroll/hr_payroll_demo.xml
index e888ad6f133..7d670d6cafa 100644
--- a/addons/hr_payroll/hr_payroll_demo.xml
+++ b/addons/hr_payroll/hr_payroll_demo.xml
@@ -146,7 +146,7 @@
Default contract for marketing executives
-
+
@@ -158,7 +158,6 @@
This is Quentin Paolino's contract
-
diff --git a/addons/hr_payroll/hr_payroll_report.xml b/addons/hr_payroll/hr_payroll_report.xml
index a0027d70e0d..a1b3587313a 100644
--- a/addons/hr_payroll/hr_payroll_report.xml
+++ b/addons/hr_payroll/hr_payroll_report.xml
@@ -6,7 +6,7 @@
auto="False"
id="payslip_report"
model="hr.payslip"
- name="test.pdf"
+ name="payslip"
rml="hr_payroll/report/report_payslip.rml"
string="Employee PaySlip" />
diff --git a/addons/hr_payroll/hr_payroll_view.xml b/addons/hr_payroll/hr_payroll_view.xml
index 98ec4be407b..5f2e977f116 100644
--- a/addons/hr_payroll/hr_payroll_view.xml
+++ b/addons/hr_payroll/hr_payroll_view.xml
@@ -262,7 +262,7 @@
-
+
diff --git a/addons/hr_payroll/report/report_payslip.py b/addons/hr_payroll/report/report_payslip.py
index 0fc37b44ac7..e2ef7dab974 100644
--- a/addons/hr_payroll/report/report_payslip.py
+++ b/addons/hr_payroll/report/report_payslip.py
@@ -44,6 +44,6 @@ class payslip_report(report_sxw.rml_parse):
res = payslip_line.browse(self.cr, self.uid, ids)
return res
-report_sxw.report_sxw('report.test.pdf', 'hr.payslip', 'hr_payroll/report/report_payslip.rml', parser=payslip_report)
+report_sxw.report_sxw('report.payslip', 'hr.payslip', 'hr_payroll/report/report_payslip.rml', parser=payslip_report)
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/hr_payroll_account/hr_payroll_account.py b/addons/hr_payroll_account/hr_payroll_account.py
index 3463713d37d..a022cac05b1 100644
--- a/addons/hr_payroll_account/hr_payroll_account.py
+++ b/addons/hr_payroll_account/hr_payroll_account.py
@@ -40,6 +40,17 @@ class hr_payslip(osv.osv):
'move_id': fields.many2one('account.move', 'Accounting Entry', readonly=True),
}
+ def _get_default_journal(self, cr, uid, context=None):
+ model_data = self.pool.get('ir.model.data')
+ res = model_data.search(cr, uid, [('name', '=', 'expenses_journal')])
+ if res:
+ return model_data.browse(cr, uid, res[0]).res_id
+ return False
+
+ _defaults = {
+ 'journal_id': _get_default_journal,
+ }
+
def copy(self, cr, uid, id, default=None, context=None):
if default is None:
default = {}
@@ -171,7 +182,7 @@ class hr_payslip(osv.osv):
line_ids.append(adjust_debit)
move.update({'line_id': line_ids})
move_id = move_pool.create(cr, uid, move, context=context)
- self.write(cr, uid, [slip.id], {'move_id': move_id}, context=context)
+ self.write(cr, uid, [slip.id], {'move_id': move_id, 'period_id' : period_id}, context=context)
if slip.journal_id.entry_posted:
move_pool.post(cr, uid, [move_id], context=context)
return super(hr_payslip, self).process_sheet(cr, uid, [slip.id], context=context)
diff --git a/addons/hr_recruitment/__openerp__.py b/addons/hr_recruitment/__openerp__.py
index 1e864817266..0ce5ff66c0f 100644
--- a/addons/hr_recruitment/__openerp__.py
+++ b/addons/hr_recruitment/__openerp__.py
@@ -37,7 +37,7 @@ system to store and search in your CV base.
'author': 'OpenERP SA',
'website': 'http://www.openerp.com',
'images': ['images/hr_recruitment_analysis.jpeg','images/hr_recruitment_applicants.jpeg'],
- 'depends': ['decimal_precision', 'hr', 'survey', 'crm'],
+ 'depends': ['decimal_precision', 'hr', 'survey', 'crm', 'fetchmail'],
'update_xml': [
'wizard/hr_recruitment_phonecall_view.xml',
'wizard/hr_recruitment_employee_hired.xml',
@@ -62,6 +62,7 @@ system to store and search in your CV base.
'installable': True,
'active': False,
'certificate' : '001073437025460275621',
+ 'application': True,
}
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/hr_recruitment/hr_recruitment.py b/addons/hr_recruitment/hr_recruitment.py
index 56afda6997e..8730d1fbf32 100644
--- a/addons/hr_recruitment/hr_recruitment.py
+++ b/addons/hr_recruitment/hr_recruitment.py
@@ -181,6 +181,7 @@ class hr_applicant(crm.crm_case, osv.osv):
'day_close': fields.function(_compute_day, string='Days to Close', \
multi='day_close', type="float", store=True),
'color': fields.integer('Color Index'),
+ 'user_email': fields.related('user_id', 'user_email', type='char', string='User Email', readonly=True),
}
def _get_stage(self, cr, uid, context=None):
@@ -457,19 +458,19 @@ class hr_applicant(crm.crm_case, osv.osv):
res = super(hr_applicant, self).case_reset(cr, uid, ids, *args)
self.write(cr, uid, ids, {'date_open': False, 'date_closed': False})
return res
-
- def set_priority(self, cr, uid, ids, priority):
- """Set lead priority
+
+ def set_priority(self, cr, uid, ids, priority, *args):
+ """Set applicant priority
"""
return self.write(cr, uid, ids, {'priority' : priority})
def set_high_priority(self, cr, uid, ids, *args):
- """Set lead priority to high
+ """Set applicant priority to high
"""
return self.set_priority(cr, uid, ids, '1')
def set_normal_priority(self, cr, uid, ids, *args):
- """Set lead priority to normal
+ """Set applicant priority to normal
"""
return self.set_priority(cr, uid, ids, '3')
diff --git a/addons/hr_recruitment/hr_recruitment_menu.xml b/addons/hr_recruitment/hr_recruitment_menu.xml
index 7fe746f580b..04d73dcd2a8 100644
--- a/addons/hr_recruitment/hr_recruitment_menu.xml
+++ b/addons/hr_recruitment/hr_recruitment_menu.xml
@@ -6,13 +6,20 @@
Applicantshr.applicant
- tree,form,graph,calendar,kanban
-
+ kanban,tree,form,graph,calendar
+ {'search_default_filter_inprogress':1,'search_default_filter_new':1,"search_default_department_id": department_id}From this menu you can track applicants in the recruitment process and manage all operations: meetings, interviews, phone calls, etc. If you setup the email gateway, applicants and their attached CV are created automatically when an email is sent to jobs@yourcompany.com. If you install the document management modules, all documents (CV and motivation letters) are indexed automatically, so that you can easily search through their content.
+
+
+ kanban
+
+
+
+
tree
diff --git a/addons/hr_recruitment/hr_recruitment_view.xml b/addons/hr_recruitment/hr_recruitment_view.xml
index 202a6c2eecb..4bd68949bd5 100644
--- a/addons/hr_recruitment/hr_recruitment_view.xml
+++ b/addons/hr_recruitment/hr_recruitment_view.xml
@@ -145,7 +145,7 @@
-
+
@@ -155,32 +155,6 @@
context="{'mail.compose.message.mode':'reply', 'message_id':active_id}"
icon="terp-mail-replied" type="action" />
-
-
+
-
+ Hr Applicants kanbanhr.applicantkanban
@@ -290,47 +264,70 @@
+
+
+
+
diff --git a/addons/hr_timesheet/__openerp__.py b/addons/hr_timesheet/__openerp__.py
index 76886a45aaf..43f5e62e37c 100644
--- a/addons/hr_timesheet/__openerp__.py
+++ b/addons/hr_timesheet/__openerp__.py
@@ -23,7 +23,7 @@
{
'name': 'Human Resources (Timesheet encoding)',
'version': '1.0',
- 'category': 'Hidden',
+ "category": "Human Resources",
'complexity': "easy",
'description': """
This module implements a timesheet system.
diff --git a/addons/hr_timesheet_invoice/__openerp__.py b/addons/hr_timesheet_invoice/__openerp__.py
index d4237baf36c..bd5c58fde1b 100644
--- a/addons/hr_timesheet_invoice/__openerp__.py
+++ b/addons/hr_timesheet_invoice/__openerp__.py
@@ -21,9 +21,9 @@
{
- 'name': 'Invoice on analytic lines',
+ 'name': 'Invoice on Analytic Lines',
'version': '1.0',
- 'category': 'Hidden/Link',
+ 'category': 'Sales Management',
'description': """Generate your Invoices from Expenses, Timesheet Entries, ...
Module to generate invoices based on costs (human resources, expenses, ...).
============================================================================
diff --git a/addons/hr_timesheet_invoice/wizard/hr_timesheet_analytic_profit.py b/addons/hr_timesheet_invoice/wizard/hr_timesheet_analytic_profit.py
index 7d5d7a36867..518bb981df9 100644
--- a/addons/hr_timesheet_invoice/wizard/hr_timesheet_analytic_profit.py
+++ b/addons/hr_timesheet_invoice/wizard/hr_timesheet_analytic_profit.py
@@ -31,18 +31,18 @@ class account_analytic_profit(osv.osv_memory):
'date_to': fields.date('To', required=True),
'journal_ids': fields.many2many('account.analytic.journal', 'analytic_profit_journal_rel', 'analytic_id', 'journal_id', 'Journal', required=True),
'employee_ids': fields.many2many('res.users', 'analytic_profit_emp_rel', 'analytic_id', 'emp_id', 'User', required=True),
- }
+ }
def _date_from(*a):
- return datetime.datetime.today().strftime('%Y-%m-1')
+ return datetime.date.today().replace(day=1).strftime('%Y-%m-%d')
def _date_to(*a):
- return datetime.datetime.today().strftime('%Y-%m-%d')
+ return datetime.date.today().strftime('%Y-%m-%d')
_defaults = {
- 'date_from': _date_from,
- 'date_to': _date_to
- }
+ 'date_from': _date_from,
+ 'date_to': _date_to
+ }
def print_report(self, cr, uid, ids, context=None):
line_obj = self.pool.get('account.analytic.line')
@@ -72,4 +72,4 @@ class account_analytic_profit(osv.osv_memory):
account_analytic_profit()
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create_final_view.xml b/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create_final_view.xml
index d366e795c15..514996816cc 100644
--- a/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create_final_view.xml
+++ b/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create_final_view.xml
@@ -13,7 +13,6 @@
- Invoiceclient_action_multi
diff --git a/addons/hr_timesheet_sheet/__openerp__.py b/addons/hr_timesheet_sheet/__openerp__.py
index 403d435df71..3421083a1cc 100644
--- a/addons/hr_timesheet_sheet/__openerp__.py
+++ b/addons/hr_timesheet_sheet/__openerp__.py
@@ -69,5 +69,6 @@ The validation can be configured in the company:
'installable': True,
'active': False,
'certificate': '0073297700829',
+ 'application': True,
}
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/hr_timesheet_sheet/board_hr_timesheet_view.xml b/addons/hr_timesheet_sheet/board_hr_timesheet_view.xml
index 39ab5fe3482..74530b81859 100644
--- a/addons/hr_timesheet_sheet/board_hr_timesheet_view.xml
+++ b/addons/hr_timesheet_sheet/board_hr_timesheet_view.xml
@@ -40,7 +40,7 @@
form
-
+
diff --git a/addons/html_view/__openerp__.py b/addons/html_view/__openerp__.py
index 3deceff9d6f..c4a7f033993 100644
--- a/addons/html_view/__openerp__.py
+++ b/addons/html_view/__openerp__.py
@@ -2,7 +2,7 @@
"name" : "Html View",
"version" : "1.1",
"author" : "OpenERP SA",
- "category" : "Hidden",
+ "category" : "Tools",
"depends" : ['base'],
"init_xml" : ['html_view.xml'],
"demo_xml" : [],
diff --git a/addons/idea/__openerp__.py b/addons/idea/__openerp__.py
index 66709824c4a..e482aa18d3a 100644
--- a/addons/idea/__openerp__.py
+++ b/addons/idea/__openerp__.py
@@ -53,6 +53,7 @@ Once installed, check the menu 'Ideas' in the 'Tools' main menu.""",
'test/test_idea.yml'
],
'installable': True,
+ 'application': True,
'certificate': '0071515601309',
'images': ['images/1_ideas.jpeg','images/2_idea_categories.jpeg','images/3_vote_idea.jpeg'],
}
diff --git a/addons/import_base/__openerp__.py b/addons/import_base/__openerp__.py
index 0f65cf166b6..78988d00fec 100644
--- a/addons/import_base/__openerp__.py
+++ b/addons/import_base/__openerp__.py
@@ -20,9 +20,9 @@
##############################################################################
{
- 'name': 'Base framework for module that need to import complex data',
+ 'name': 'Framework for complex import',
'version': '0.9',
- 'category': 'Hidden',
+ 'category': 'Tools',
'description': """
This module provide a class import_framework to help importing
complex data from other software
diff --git a/addons/import_sugarcrm/__openerp__.py b/addons/import_sugarcrm/__openerp__.py
index 927a4b542ed..c0ad1ba250b 100644
--- a/addons/import_sugarcrm/__openerp__.py
+++ b/addons/import_sugarcrm/__openerp__.py
@@ -28,10 +28,12 @@
'author': 'OpenERP SA',
'website': 'http://www.openerp.com',
'depends': ['import_base','crm', 'document'],
- 'init_xml': [],
- 'update_xml': ["wizard/import_message_view.xml",
- "import_sugarcrm_view.xml"],
- 'demo_xml': [],
+ 'data': [
+ "wizard/import_message_view.xml",
+ "import_sugarcrm_view.xml",
+ "security/ir.model.access.csv",
+ ],
+ 'demo': [],
'test': [],
'installable': True,
'active': False,
diff --git a/addons/import_sugarcrm/import_sugarcrm_view.xml b/addons/import_sugarcrm/import_sugarcrm_view.xml
index 1f12a8fde57..3c1f9df60fb 100644
--- a/addons/import_sugarcrm/import_sugarcrm_view.xml
+++ b/addons/import_sugarcrm/import_sugarcrm_view.xml
@@ -1,105 +1,104 @@
-
+
-
- import.sugarcrm.form
- import.sugarcrm
- form
-
-
-
-
+
+ import.sugarcrm.form
+ import.sugarcrm
+ form
+
+
+
-
+
+
+
+ Import SugarCRM
+ import.sugarcrm
+ form
+ tree,form
+
+ new
+
+
+
-
+
-
diff --git a/addons/import_sugarcrm/security/ir.model.access.csv b/addons/import_sugarcrm/security/ir.model.access.csv
new file mode 100644
index 00000000000..20e93035b6c
--- /dev/null
+++ b/addons/import_sugarcrm/security/ir.model.access.csv
@@ -0,0 +1,3 @@
+"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
+"access_import_sugarcrm_system","import.sugarcrm system","model_import_sugarcrm","base.group_system",1,1,1,1
+"access_import_message_system","import.message system","model_import_message","base.group_system",1,1,1,1
diff --git a/addons/knowledge/__openerp__.py b/addons/knowledge/__openerp__.py
index 2ca58e9861f..27333f59c41 100644
--- a/addons/knowledge/__openerp__.py
+++ b/addons/knowledge/__openerp__.py
@@ -21,11 +21,11 @@
{
- "name" : "Knowledge Management System",
+ "name" : "Document Management System",
"version" : "1.0",
"depends" : ["base","base_setup"],
"author" : "OpenERP SA",
- "category": 'Hidden',
+ 'category': 'Knowledge Management',
'complexity': "easy",
"description": """
Installer for knowledge-based Hidden.
diff --git a/addons/l10n_be/l10n_be_wizard.yml b/addons/l10n_be/l10n_be_wizard.yml
index 0e9b04a6cf2..5acc10c629f 100644
--- a/addons/l10n_be/l10n_be_wizard.yml
+++ b/addons/l10n_be/l10n_be_wizard.yml
@@ -5,16 +5,15 @@
type: automatic
-
!python {model: ir.actions.todo}: |
- if self.browse(cr, uid, ref('l10n_be.config_call_account_template')).state=='open':
+ install_todo = self.browse(cr, uid, ref('l10n_be.config_call_account_template'))
+ if install_todo.state == 'open':
wiz = self.pool.get('wizard.multi.charts.accounts')
values = {
'chart_template_id': ref('l10n_be.l10nbe_chart_template')
}
values.update(
- wiz.onchange_chart_template_id(cr, uid, False, ref('l10n_be.l10nbe_chart_template')).get('values', {})
+ wiz.onchange_chart_template_id(cr, uid, False, ref('l10n_be.l10nbe_chart_template')).get('value', {})
)
wiz_id = wiz.create(cr, uid, values)
wiz.execute(cr, uid, [wiz_id])
- self.write(cr, uid, [ref('l10n_be.config_call_account_template')], {
- 'state': 'done'
- })
+ install_todo.write({'state':'done'})
diff --git a/addons/l10n_be/wizard/l10n_be_account_vat_declaration.py b/addons/l10n_be/wizard/l10n_be_account_vat_declaration.py
index 77d8515d78b..138f6f668f8 100644
--- a/addons/l10n_be/wizard/l10n_be_account_vat_declaration.py
+++ b/addons/l10n_be/wizard/l10n_be_account_vat_declaration.py
@@ -70,9 +70,10 @@ class l10n_be_vat_declaration(osv.osv_memory):
obj_company = data_tax.tax_code_id.company_id
else:
obj_company = obj_user.browse(cr, uid, uid, context=context).company_id
- vat_no = obj_company.partner_id.vat.replace(' ','').upper()
+ vat_no = obj_company.partner_id.vat
if not vat_no:
raise osv.except_osv(_('Data Insufficient'), _('No VAT Number Associated with Main Company!'))
+ vat_no = vat_no.replace(' ','').upper()
tax_code_ids = obj_tax_code.search(cr, uid, [], context=context)
ctx = context.copy()
diff --git a/addons/l10n_be_hr_payroll/l10n_be_hr_payroll_data.xml b/addons/l10n_be_hr_payroll/l10n_be_hr_payroll_data.xml
index 799c544a0c8..5acb2729abb 100644
--- a/addons/l10n_be_hr_payroll/l10n_be_hr_payroll_data.xml
+++ b/addons/l10n_be_hr_payroll/l10n_be_hr_payroll_data.xml
@@ -165,7 +165,7 @@
carfix15
- none
+ none
@@ -266,7 +266,7 @@
165pythonresult = bool(contract.insurance_employee_deduction)
- result = -contract.insurance_employee_deduction
+ result = -contract.insurance_employee_deduction
diff --git a/addons/l10n_br/data/account_tax_template.xml b/addons/l10n_br/data/account_tax_template.xml
index 58f860e0d90..fcdcb4d30e6 100644
--- a/addons/l10n_br/data/account_tax_template.xml
+++ b/addons/l10n_br/data/account_tax_template.xml
@@ -5,7 +5,6 @@
IPIIPI
- vat0.00
@@ -21,7 +20,6 @@
IPI 2%IPI 2%
- vat0.02
@@ -37,7 +35,6 @@
IPI 3%IPI 3%
- vat0.03
@@ -53,7 +50,6 @@
IPI 4%IPI 4%
- vat0.04
@@ -69,7 +65,6 @@
IPI 5%IPI 5%
- vat0.05
@@ -85,7 +80,6 @@
IPI 7%IPI 7%
- vat0.07
@@ -101,7 +95,6 @@
IPI 8%IPI 8%
- vat0.08
@@ -117,7 +110,6 @@
IPI 10%IPI 10%
- vat0.10
@@ -133,7 +125,6 @@
IPI 12%IPI 12%
- vat0.12
@@ -149,7 +140,6 @@
IPI 13%IPI 13%
- vat0.13
@@ -165,7 +155,6 @@
IPI 15%IPI 15%
- vat0.15
@@ -181,7 +170,6 @@
IPI 16%IPI 16%
- vat0.16
@@ -197,7 +185,6 @@
IPI 18%IPI 18%
- vat0.18
@@ -213,7 +200,6 @@
IPI 20%IPI 20%
- vat0.20
@@ -229,7 +215,6 @@
IPI 22%IPI 22%
- vat0.22
@@ -245,7 +230,6 @@
IPI 25%IPI 25%
- vat0.25
@@ -261,7 +245,6 @@
IPI 27%IPI 27%
- vat0.27
@@ -277,7 +260,6 @@
IPI 30%IPI 30%
- vat0.30
@@ -293,7 +275,6 @@
IPI 35%IPI 35%
- vat0.35
@@ -309,7 +290,6 @@
IPI 40%IPI 40%
- vat0.40
@@ -325,7 +305,6 @@
IPI 42%IPI 42%
- vat0.42
@@ -341,7 +320,6 @@
IPI 45%IPI 45%
- vat0.45
@@ -357,7 +335,6 @@
IPI 50%IPI 50%
- vat0.50
@@ -373,7 +350,6 @@
IPI 60%IPI 60%
- vat0.60
@@ -389,7 +365,6 @@
IPI 330%IPI 330%
- vat3.30
@@ -405,7 +380,6 @@
ICMS InternoICMS Interno
- vat0.00
@@ -421,7 +395,6 @@
ICMS ExternoICMS Externo
- vat0.00
@@ -437,7 +410,6 @@
ICMS SubistICMS Subist
- vat0.00
@@ -451,7 +423,6 @@
ICMS Externo 7%ICMS Externo 7%
- vat0.07
@@ -467,7 +438,6 @@
ICMS Externo 12%ICMS Externo 12%
- vat0.12
@@ -483,7 +453,6 @@
ICMS Interno 19%ICMS Interno 19%
- vat0.19
@@ -499,7 +468,6 @@
ICMS Interno 26%ICMS Interno 26%
- vat0.26
@@ -515,7 +483,6 @@
PISPIS
- vat0.00
@@ -531,7 +498,6 @@
PIS 0,65%PIS 0,65%
- vat0.0065
@@ -547,7 +513,6 @@
COFINSCOFINS
- vat0.00
@@ -563,7 +528,6 @@
COFINS 3%COFINS 3%
- vat0.03
@@ -579,7 +543,6 @@
IRPJIRPJ
- vat0.00
@@ -593,7 +556,6 @@
IRIR
- vat0.00
@@ -607,7 +569,6 @@
ISSISS
- vat0.00
@@ -621,7 +582,6 @@
ISS 1%ISS 1%
- vat0.01
@@ -635,7 +595,6 @@
ISS 2%ISS 2%
- vat0.02
@@ -649,7 +608,6 @@
ISS 3%ISS 3%
- vat0.03
@@ -663,7 +621,6 @@
ISS 4%ISS 4%
- vat0.04
@@ -677,7 +634,6 @@
ISS 5%ISS 5%
- vat0.05
@@ -691,7 +647,6 @@
CSLLCSLL
- vat0.00
@@ -703,4 +658,4 @@
-
\ No newline at end of file
+
diff --git a/addons/l10n_br/data/l10n_br_account_chart_template.xml b/addons/l10n_br/data/l10n_br_account_chart_template.xml
index 9dbcb4d558f..89ccee11edc 100644
--- a/addons/l10n_br/data/l10n_br_account_chart_template.xml
+++ b/addons/l10n_br/data/l10n_br_account_chart_template.xml
@@ -19,7 +19,7 @@
This is the same wizard that runs from Financial Management/Configuration/Financial Accounting/Financial Accounts/Generate Chart of Accounts from a Chart Template.
open
- onskip
+ once
diff --git a/addons/l10n_ch/__openerp__.py b/addons/l10n_ch/__openerp__.py
index cabd15e42de..cde4d7d496d 100644
--- a/addons/l10n_ch/__openerp__.py
+++ b/addons/l10n_ch/__openerp__.py
@@ -99,8 +99,9 @@ TODO :
'test' : [
'test/l10n_ch_report.yml',
'test/l10n_ch_dta.yml',
- 'test/l10n_ch_v11.yml',
- 'test/l10n_ch_v11_part.yml',
+ #TODO: uncomment the 2 following tests once they are fixed
+ #'test/l10n_ch_v11.yml',
+ #'test/l10n_ch_v11_part.yml',
],
"active": False,
"installable": True,
diff --git a/addons/l10n_ch/bank_view.xml b/addons/l10n_ch/bank_view.xml
index 705e2d63ef4..e23be1bb6ac 100644
--- a/addons/l10n_ch/bank_view.xml
+++ b/addons/l10n_ch/bank_view.xml
@@ -6,7 +6,6 @@
res.bank.formres.bankform
-
@@ -23,7 +22,6 @@
res.bank.treeres.banktree
-
@@ -40,7 +38,6 @@
res.partner_bank.form.hide.f1res.partnerform
-
@@ -51,7 +48,6 @@
res.partner_bank.form.hide.f2res.partnerform
-
@@ -63,7 +59,6 @@
res.partner_bank.form.hide.f2res.partnerform
-
@@ -94,7 +89,6 @@
res.partner_bank.form.hide.acc_number.frominvoiceres.partner.bankform
-
@@ -106,7 +100,6 @@
res.partner_bank.form.hide.bank.frominvoiceres.partner.bankform
-
@@ -118,7 +111,6 @@
res.partner_bank.form.hide.frominvoiceres.partner.bankform
-
diff --git a/addons/l10n_ch/sterchi_chart/account.xml b/addons/l10n_ch/sterchi_chart/account.xml
index ded5f542fe5..8fdd29fe8a8 100644
--- a/addons/l10n_ch/sterchi_chart/account.xml
+++ b/addons/l10n_ch/sterchi_chart/account.xml
@@ -177,14 +177,12 @@
Bilan : Debiteursreceivable
- TrueunreconcilednoneBilan : Fournisseurspayable
- Trueunreconcilednone
diff --git a/addons/l10n_ch/wizard/bvr_import.py b/addons/l10n_ch/wizard/bvr_import.py
index 31c1e9ab96f..e98053513cd 100644
--- a/addons/l10n_ch/wizard/bvr_import.py
+++ b/addons/l10n_ch/wizard/bvr_import.py
@@ -168,7 +168,7 @@ def _import(self, cursor, user, data, context=None):
# line2reconcile = line.id
account_id = line.account_id.id
break
- result = voucher_obj.onchange_partner_id(cursor, user, [], partner_id, journal_id=statement.journal_id.id, price=abs(record['amount']), currency_id= statement.currency.id, ttype='receipt', date=statement.date ,context=context)
+ result = voucher_obj.onchange_partner_id(cursor, user, [], partner_id, journal_id=statement.journal_id.id, amount=abs(record['amount']), currency_id= statement.currency.id, ttype='receipt', date=statement.date ,context=context)
voucher_res = { 'type': 'receipt' ,
'name': values['name'],
diff --git a/addons/l10n_cr/data/account_tax_template.xml b/addons/l10n_cr/data/account_tax_template.xml
index 7626b25b5ad..42b5ca03a13 100644
--- a/addons/l10n_cr/data/account_tax_template.xml
+++ b/addons/l10n_cr/data/account_tax_template.xml
@@ -11,7 +11,6 @@
1013percent
-
alltrue
@@ -34,7 +33,6 @@
1013percent
-
alltrue
diff --git a/addons/crm_partner_assign/wizard/crm_merge_opportunity.py b/addons/l10n_fr_rib/__init__.py
similarity index 52%
rename from addons/crm_partner_assign/wizard/crm_merge_opportunity.py
rename to addons/l10n_fr_rib/__init__.py
index 3c56fada5a1..a061d3f40a2 100644
--- a/addons/crm_partner_assign/wizard/crm_merge_opportunity.py
+++ b/addons/l10n_fr_rib/__init__.py
@@ -1,8 +1,8 @@
-# -*- coding: utf-8 -*-
+# -*- encoding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
-# Copyright (C) 2004-2010 Tiny SPRL ().
+# Copyright (C) 2011 Numérigraphe SARL.
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as
@@ -18,27 +18,8 @@
# along with this program. If not, see .
#
##############################################################################
-from osv import osv, fields
-from tools.translate import _
-
-class crm_merge_opportunity_assign_partner(osv.osv_memory):
- """Merge two Opportunities"""
-
- _inherit = 'crm.merge.opportunity'
-
- def _update_data(self, op_ids, oldest_opp):
- data = super(crm_merge_opportunity_assign_partner, self)._update_data(op_ids, oldest_opp)
-
- new_data = {
- 'partner_latitude': self._get_first_not_null('partner_latitude', op_ids, oldest_opp),
- 'partner_longitude': self._get_first_not_null('partner_longitude', op_ids, oldest_opp),
- 'partner_assigned_id': self._get_first_not_null_id('partner_assigned_id', op_ids, oldest_opp),
- 'date_assign' : self._get_first_not_null('date_assign', op_ids, oldest_opp),
- }
- data.update(new_data)
- return data
-
-crm_merge_opportunity_assign_partner()
+import bank
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/l10n_fr_rib/__openerp__.py b/addons/l10n_fr_rib/__openerp__.py
new file mode 100644
index 00000000000..16d26995dc4
--- /dev/null
+++ b/addons/l10n_fr_rib/__openerp__.py
@@ -0,0 +1,49 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+# OpenERP, Open Source Management Solution
+# Copyright (C) 2011 Numérigraphe SARL.
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as
+# published by the Free Software Foundation, either version 3 of the
+# License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program. If not, see .
+#
+##############################################################################
+
+{
+ 'name': 'French RIB Bank Details',
+ 'version': '1.0',
+ "category": 'Accounting & Finance',
+ 'description': '''
+This module lets users enter the banking details of Partners in the RIB format (French standard for bank accounts details).
+RIB Bank Accounts can be entered in the "Accounting" tab of the Partner form by specifying the account type "RIB". The four standard RIB fields will then become mandatory:
+- Bank Code
+- Office Code
+- Account number
+- RIB key
+As a safety measure, OpenERP will check the RIB key whenever a RIB is saved, and will refuse to record the data if the key is incorrect. Please bear in mind that this can only happen when the user presses the "save" button, for example on the Partner Form.
+Since each bank account may relate to a Bank, users may enter the RIB Bank Code in the Bank form - it will the pre-fill the Bank Code on the RIB when they select the Bank.
+To make this easier, this module will also let users find Banks using their RIB code.
+
+The module base_iban can be a useful addition to this module, because French banks are now progressively adopting the international IBAN format instead of the RIB format.
+The RIB and IBAN codes for a single account can be entered by recording two Bank Accounts in OpenERP: the first with the type "RIB", the second with the type "IBAN".
+''',
+ 'author' : u'Numérigraphe SARL',
+ 'depends': ['base', 'account'],
+ 'init_xml': ['bank_data.xml', ],
+ 'update_xml': ['bank_view.xml', ],
+ 'installable': True,
+ 'certificate': '003407950790',
+ 'active': False,
+}
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/l10n_fr_rib/bank.py b/addons/l10n_fr_rib/bank.py
new file mode 100644
index 00000000000..03f71f60dee
--- /dev/null
+++ b/addons/l10n_fr_rib/bank.py
@@ -0,0 +1,118 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+# OpenERP, Open Source Management Solution
+# Copyright (C) 2011 Numérigraphe SARL.
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as
+# published by the Free Software Foundation, either version 3 of the
+# License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program. If not, see .
+#
+##############################################################################
+
+import netsvc
+from osv import fields, osv
+from tools.translate import _
+
+class res_partner_bank(osv.osv):
+ """Add fields and behavior for French RIB"""
+ _inherit = "res.partner.bank"
+
+ def _check_key(self, cr, uid, ids):
+ """Check the RIB key"""
+ for bank_acc in self.browse(cr, uid, ids):
+ # Ignore the accounts of type other than rib
+ if bank_acc.state !='rib':
+ continue
+ # Fail if the needed values are empty of too short
+ if (not bank_acc.bank_code
+ or len(bank_acc.bank_code) != 5
+ or not bank_acc.office or len(bank_acc.office) != 5
+ or not bank_acc.acc_number or len(bank_acc.acc_number) != 11
+ or not bank_acc.key or len(bank_acc.key) != 2):
+ return False
+ # Get the rib data (without the key)
+ rib = "%s%s%s" % (bank_acc.bank_code, bank_acc.office,
+ bank_acc.acc_number)
+ # Translate letters into numbers according to a specific table
+ # (notice how s -> 2)
+ table = dict((ord(a), b) for a, b in zip(
+ u'abcdefghijklmnopqrstuvwxyz', u'12345678912345678923456789'))
+ rib = rib.lower().translate(table)
+ # compute the key
+ key = 97 - (100 * int(rib)) % 97
+ if int(bank_acc.key) != key:
+ return False
+ return True
+
+ def onchange_bank_id(self, cr, uid, ids, bank_id, context=None):
+ """Change the bank code"""
+ result = super(res_partner_bank, self).onchange_bank_id(cr, uid, ids, bank_id,
+ context=context)
+ if bank_id:
+ value = result.setdefault('value', {})
+ bank = self.pool.get('res.bank').browse(cr, uid, bank_id,
+ context=context)
+ value['bank_code'] = bank.rib_code
+ return result
+
+ _columns = {
+ 'bank_code': fields.char('Bank Code', size=64, readonly=True,),
+ 'office': fields.char('Office Code', size=5, readonly=True,),
+ 'key': fields.char('Key', size=2, readonly=True,
+ help="The key is a number allowing to check the "
+ "correctness of the other codes."),
+ }
+
+ def _construct_constraint_msg(self, cr, uid, ids, context=None):
+ """Quote the data in the warning message"""
+ # Only process the first id
+ if type(ids) not in (int, long):
+ id = ids[0]
+ rib = self.browse(cr, uid, id, context=context)
+ if rib:
+ return (_("\nThe RIB key %s does not correspond to the other "
+ "codes: %s %s %s.") %
+ (rib.key,
+ rib.bank_code,
+ rib.office,
+ rib.acc_number) )
+
+ _constraints = [(_check_key,
+ _construct_constraint_msg,
+ ["key"])]
+
+res_partner_bank()
+
+class res_bank(osv.osv):
+ """Add the bank code to make it easier to enter RIB data"""
+ _inherit = 'res.bank'
+
+ def name_search(self, cr, user, name, args=None, operator='ilike',
+ context=None, limit=80):
+ """Search by bank code in addition to the standard search"""
+ # Get the standard results
+ results = super(res_bank, self).name_search(cr, user,
+ name, args=args ,operator=operator, context=context, limit=limit)
+ # Get additional results using the RIB code
+ ids = self.search(cr, user, [('rib_code', operator, name)],
+ limit=limit, context=context)
+ # Merge the results
+ results = list(set(results + self.name_get(cr, user, ids, context)))
+ return results
+
+ _columns = {
+ 'rib_code': fields.char('RIB Bank Code', size=64),
+ }
+res_bank()
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/l10n_fr_rib/bank_data.xml b/addons/l10n_fr_rib/bank_data.xml
new file mode 100644
index 00000000000..1dc9f4c88fd
--- /dev/null
+++ b/addons/l10n_fr_rib/bank_data.xml
@@ -0,0 +1,44 @@
+
+
+
+
+
+
+ RIB Bank Details
+ rib
+
+
+
+ bank_code
+
+
+
+
+
+ office
+
+
+
+
+
+ acc_number
+
+
+
+ 11
+
+
+ key
+
+
+
+
+
+ bank_bic
+
+
+
+
+
diff --git a/addons/l10n_fr_rib/bank_view.xml b/addons/l10n_fr_rib/bank_view.xml
new file mode 100644
index 00000000000..56eb8393aef
--- /dev/null
+++ b/addons/l10n_fr_rib/bank_view.xml
@@ -0,0 +1,44 @@
+
+
+
+
+
+ res.partner.form.rib1.inherit
+ res.partner
+
+ form
+
+
+
+
+
+
+
+
+
+
+ res.partner.form.rib2.inherit
+ res.partner
+
+ form
+
+
+
+
+
+
+
+
+
+ res.bank.form.rib.inherit
+ res.bank
+
+ form
+
+
+
+
+
+
+
+
diff --git a/addons/l10n_fr_rib/i18n/fr.po b/addons/l10n_fr_rib/i18n/fr.po
new file mode 100644
index 00000000000..4057dafb803
--- /dev/null
+++ b/addons/l10n_fr_rib/i18n/fr.po
@@ -0,0 +1,116 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+# * l10n_fr_rib
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 6.1beta\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-11-21 12:37+0000\n"
+"PO-Revision-Date: 2011-11-21 12:37+0000\n"
+"Last-Translator: <>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: l10n_fr_rib
+#: constraint:res.partner.bank:0
+msgid "\n"
+"Please define BIC/Swift code on bank for bank type IBAN Account to make valid payments"
+msgstr "\n"
+"Please define BIC/Swift code on bank for bank type IBAN Account to make valid payments"
+
+#. module: l10n_fr_rib
+#: model:ir.model,name:l10n_fr_rib.model_res_partner_bank
+msgid "Bank Accounts"
+msgstr "Comptes bancaires"
+
+#. module: l10n_fr_rib
+#: field:res.partner.bank,bank_code:0
+msgid "Bank Code"
+msgstr "Code banque"
+
+#. module: l10n_fr_rib
+#: model:res.partner.bank.type.field,name:l10n_fr_rib.rib_bic_field
+msgid "bank_bic"
+msgstr "bank_bic"
+
+#. module: l10n_fr_rib
+#: model:res.partner.bank.type.field,name:l10n_fr_rib.rib_office_field
+msgid "office"
+msgstr "Agence"
+
+#. module: l10n_fr_rib
+#: field:res.bank,rib_code:0
+msgid "RIB Bank Code"
+msgstr "Code banque RIB"
+
+#. module: l10n_fr_rib
+#: model:ir.module.module,description:l10n_fr_rib.module_meta_information
+msgid "\n"
+"This module installs the base for RIB bank accounts (French standard for bank accounts). \n"
+"To make it easier to enter RIB data, it will also allow to search for banks by code."
+msgstr "\n"
+"Ce module installe la base pour les comptes bancaires RIB (norme française pour les n° de compte). \n"
+"Pour faciliter la saisie des RIBs, il permet aussi de chercher les banques par code."
+
+#. module: l10n_fr_rib
+#: field:res.partner.bank,office:0
+msgid "Office Code"
+msgstr "Code agence"
+
+#. module: l10n_fr_rib
+#: model:res.partner.bank.type,name:l10n_fr_rib.bank_rib
+msgid "RIB Bank Details"
+msgstr "Relevé d'identité bancaire (RIB)"
+
+#. module: l10n_fr_rib
+#: model:res.partner.bank.type.field,name:l10n_fr_rib.rib_bank_code_field
+msgid "bank_code"
+msgstr "bank_code"
+
+#. module: l10n_fr_rib
+#: code:addons/l10n_fr_rib/bank.py:109
+#, python-format
+msgid "\n"
+"The RIB key %s does not correspond to the other codes: %s %s %s."
+msgstr "\n"
+"La clé RIB %s ne correspond pas aux autres codes : %s %s %s."
+
+#. module: l10n_fr_rib
+#: model:res.partner.bank.type.field,name:l10n_fr_rib.rib_key_field
+msgid "key"
+msgstr "key"
+
+#. module: l10n_fr_rib
+#: model:ir.module.module,shortdesc:l10n_fr_rib.module_meta_information
+msgid "French RIB Bank Details"
+msgstr "Relevés d'identité bancaire français (RIB)"
+
+#. module: l10n_fr_rib
+#: help:res.partner.bank,key:0
+msgid "The key is a number allowing to check the correctness of the other codes."
+msgstr "La clé est un nombre permettant de vérifier que les autres codes sont corrects."
+
+#. module: l10n_fr_rib
+#: field:res.partner.bank,key:0
+msgid "Key"
+msgstr "Clé"
+
+#. module: l10n_fr_rib
+#: model:res.partner.bank.type,format_layout:l10n_fr_rib.bank_rib
+msgid "%(bank_name)s: %(acc_number)s"
+msgstr "%(bank_name)s: %(acc_number)s"
+
+#. module: l10n_fr_rib
+#: model:ir.model,name:l10n_fr_rib.model_res_bank
+msgid "Bank"
+msgstr "Banque"
+
+#. module: l10n_fr_rib
+#: model:res.partner.bank.type.field,name:l10n_fr_rib.bank_acc_number_field
+msgid "acc_number"
+msgstr "acc_number"
+
diff --git a/addons/l10n_fr_rib/i18n/l10n_fr_rib.pot b/addons/l10n_fr_rib/i18n/l10n_fr_rib.pot
new file mode 100644
index 00000000000..5db922fe20f
--- /dev/null
+++ b/addons/l10n_fr_rib/i18n/l10n_fr_rib.pot
@@ -0,0 +1,112 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+# * l10n_fr_rib
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 6.1beta\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-11-21 12:36+0000\n"
+"PO-Revision-Date: 2011-11-21 12:36+0000\n"
+"Last-Translator: <>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: l10n_fr_rib
+#: constraint:res.partner.bank:0
+msgid "\n"
+"Please define BIC/Swift code on bank for bank type IBAN Account to make valid payments"
+msgstr ""
+
+#. module: l10n_fr_rib
+#: model:ir.model,name:l10n_fr_rib.model_res_partner_bank
+msgid "Bank Accounts"
+msgstr ""
+
+#. module: l10n_fr_rib
+#: field:res.partner.bank,bank_code:0
+msgid "Bank Code"
+msgstr ""
+
+#. module: l10n_fr_rib
+#: model:res.partner.bank.type.field,name:l10n_fr_rib.rib_bic_field
+msgid "bank_bic"
+msgstr ""
+
+#. module: l10n_fr_rib
+#: model:res.partner.bank.type.field,name:l10n_fr_rib.rib_office_field
+msgid "office"
+msgstr ""
+
+#. module: l10n_fr_rib
+#: field:res.bank,rib_code:0
+msgid "RIB Bank Code"
+msgstr ""
+
+#. module: l10n_fr_rib
+#: model:ir.module.module,description:l10n_fr_rib.module_meta_information
+msgid "\n"
+"This module installs the base for RIB bank accounts (French standard for bank accounts). \n"
+"To make it easier to enter RIB data, it will also allow to search for banks by code."
+msgstr ""
+
+#. module: l10n_fr_rib
+#: field:res.partner.bank,office:0
+msgid "Office Code"
+msgstr ""
+
+#. module: l10n_fr_rib
+#: model:res.partner.bank.type,name:l10n_fr_rib.bank_rib
+msgid "RIB Bank Details"
+msgstr ""
+
+#. module: l10n_fr_rib
+#: model:res.partner.bank.type.field,name:l10n_fr_rib.rib_bank_code_field
+msgid "bank_code"
+msgstr ""
+
+#. module: l10n_fr_rib
+#: code:addons/l10n_fr_rib/bank.py:109
+#, python-format
+msgid "\n"
+"The RIB key %s does not correspond to the other codes: %s %s %s."
+msgstr ""
+
+#. module: l10n_fr_rib
+#: model:res.partner.bank.type.field,name:l10n_fr_rib.rib_key_field
+msgid "key"
+msgstr ""
+
+#. module: l10n_fr_rib
+#: model:ir.module.module,shortdesc:l10n_fr_rib.module_meta_information
+msgid "French RIB Bank Details"
+msgstr ""
+
+#. module: l10n_fr_rib
+#: help:res.partner.bank,key:0
+msgid "The key is a number allowing to check the correctness of the other codes."
+msgstr ""
+
+#. module: l10n_fr_rib
+#: field:res.partner.bank,key:0
+msgid "Key"
+msgstr ""
+
+#. module: l10n_fr_rib
+#: model:res.partner.bank.type,format_layout:l10n_fr_rib.bank_rib
+msgid "%(bank_name)s: %(acc_number)s"
+msgstr ""
+
+#. module: l10n_fr_rib
+#: model:ir.model,name:l10n_fr_rib.model_res_bank
+msgid "Bank"
+msgstr ""
+
+#. module: l10n_fr_rib
+#: model:res.partner.bank.type.field,name:l10n_fr_rib.bank_acc_number_field
+msgid "acc_number"
+msgstr ""
+
diff --git a/addons/l10n_gt/l10n_gt_base.xml b/addons/l10n_gt/l10n_gt_base.xml
index c52e7e94532..5238d7b4f23 100644
--- a/addons/l10n_gt/l10n_gt_base.xml
+++ b/addons/l10n_gt/l10n_gt_base.xml
@@ -16,7 +16,6 @@
GTQ
- GTQQ0.014
diff --git a/addons/l10n_uk/l10n_uk_wizard.xml b/addons/l10n_uk/l10n_uk_wizard.xml
index b7da2ee5c6b..b4f96afc700 100644
--- a/addons/l10n_uk/l10n_uk_wizard.xml
+++ b/addons/l10n_uk/l10n_uk_wizard.xml
@@ -34,7 +34,7 @@
10
- onskip
+ onceopen
diff --git a/addons/lunch/__openerp__.py b/addons/lunch/__openerp__.py
index 6d5cd576912..02092ffd366 100644
--- a/addons/lunch/__openerp__.py
+++ b/addons/lunch/__openerp__.py
@@ -20,7 +20,7 @@
##############################################################################
{
- "name": "Lunch",
+ "name": "Lunch Orders",
"author": "OpenERP SA",
'complexity': "easy",
"Description": """
@@ -55,6 +55,7 @@
"demo_xml": ['lunch_demo.xml'],
"test": ['test/test_lunch.yml', 'test/lunch_report.yml'],
"installable": True,
+ 'application': True,
"certificate" : "001292377792581874189",
'images': ['images/cash_moves.jpeg','images/lunch_orders.jpeg','images/products.jpeg'],
}
diff --git a/addons/mail/__openerp__.py b/addons/mail/__openerp__.py
index 1cb97ce182e..94f2361d05d 100644
--- a/addons/mail/__openerp__.py
+++ b/addons/mail/__openerp__.py
@@ -20,9 +20,9 @@
##############################################################################
{
- 'name': 'Email Subsystem',
+ 'name': 'Emails Management',
'version': '1.0',
- 'category': 'Hidden',
+ 'category': 'Tools',
'complexity': "easy",
'description': """
A generic email subsystem with message storage and queuing
diff --git a/addons/mail/mail_thread_view.xml b/addons/mail/mail_thread_view.xml
index bd10a72faf2..3a7ed8f46fe 100644
--- a/addons/mail/mail_thread_view.xml
+++ b/addons/mail/mail_thread_view.xml
@@ -8,29 +8,10 @@
diff --git a/addons/mail/wizard/mail_compose_message.py b/addons/mail/wizard/mail_compose_message.py
index 93bf0b004d8..f5906d2b186 100644
--- a/addons/mail/wizard/mail_compose_message.py
+++ b/addons/mail/wizard/mail_compose_message.py
@@ -236,7 +236,7 @@ class mail_compose_message(osv.osv_memory):
attachments=attachment, references=references, res_id=int(mail.res_id),
subtype=mail.subtype, headers=headers, context=context)
# in normal mode, we send the email immediately, as the user expects us to (delay should be sufficiently small)
- mail_message.send(cr, uid, [msg_id], context)
+ mail_message.send(cr, uid, [msg_id], context=context)
return {'type': 'ir.actions.act_window_close'}
diff --git a/addons/marketing_campaign/__openerp__.py b/addons/marketing_campaign/__openerp__.py
index 44a2f1e30bd..61492300c97 100644
--- a/addons/marketing_campaign/__openerp__.py
+++ b/addons/marketing_campaign/__openerp__.py
@@ -60,6 +60,7 @@ Note: If you need demo data, you can install the marketing_campaign_crm_demo mod
'demo_xml': [
],
'installable': True,
+ 'application': True,
'active': False,
'certificate' : '00421723279617928365',
'images': ['images/campaign.png', 'images/campaigns.jpeg','images/email_account.jpeg','images/email_templates.jpeg','images/segments.jpeg'],
diff --git a/addons/marketing_campaign_crm_demo/__openerp__.py b/addons/marketing_campaign_crm_demo/__openerp__.py
index 4841cc1a2e8..d394088aca5 100644
--- a/addons/marketing_campaign_crm_demo/__openerp__.py
+++ b/addons/marketing_campaign_crm_demo/__openerp__.py
@@ -21,13 +21,13 @@
{
- "name" : "Demo data for Marketing Campaign",
+ "name" : "Marketing Campaign, demo data",
"version" : "1.0",
"depends" : ["marketing_campaign",
"crm",
],
"author" : "OpenERP SA",
- "category": 'Hidden',
+ "category": 'Marketing',
"description": """
Demo data for the module marketing_campaign.
============================================
diff --git a/addons/marketing_campaign_crm_demo/marketing_campaign_demo.xml b/addons/marketing_campaign_crm_demo/marketing_campaign_demo.xml
index ee11fbcdb75..abf29f2c011 100644
--- a/addons/marketing_campaign_crm_demo/marketing_campaign_demo.xml
+++ b/addons/marketing_campaign_crm_demo/marketing_campaign_demo.xml
@@ -34,137 +34,113 @@
- Thanks for showing interest in OpenERP
- info@tinyerp.com
-
+ Thanks for showing interest in OpenERP
+ info@tinyerp.com
-
-
- Hello,Thanks for generous interest you have shown in the openERP.Regards,OpenERP Team,
- mako
+
+
+ Hello,Thanks for generous interest you have shown in the openERP.Regards,OpenERP Team,For OpenERP OnDemand Free Trial 2010
- crm.lead
- Propose to subscribe to the OpenERP Discovery Day on May 2010
- info@tinyerp.com
-
+ Propose to subscribe to the OpenERP Discovery Day on May 2010
+ info@tinyerp.com
-
-
- Hello,We have very good offer that might suit you.
+
+
+ Hello,We have very good offer that might suit you.
We propose you to subscribe to the OpenERP Discovery Day on May 2010.
If any further information required kindly revert back.
We really appreciate your co-operation on this.
Regards,OpenERP Team,
- makoFor OpenERP Discovery Day on May 2010
- crm.lead
- Thanks for subscribing to the OpenERP Discovery Day
- info@tinyerp.com
-
+ Thanks for subscribing to the OpenERP Discovery Day
+ info@tinyerp.com
-
-
- Hello,Thanks for showing intrest and for subscribing to the OpenERP Discovery Day.
+
+
+ Hello,Thanks for showing intrest and for subscribing to the OpenERP Discovery Day.
If any further information required kindly revert back.
I really appreciate your co-operation on this.
Regards,OpenERP Team,
- makoFor OpenERP Discovery Day
- crm.lead
- Thanks for buying the OpenERP book
- info@tinyerp.com
-
+ Thanks for buying the OpenERP book
+ info@tinyerp.com
-
-
- Hello,Thanks for showing intrest and buying the OpenERP book.
+
+
+ Hello,Thanks for showing intrest and buying the OpenERP book.
If any further information required kindly revert back.
I really appreciate your co-operation on this.
Regards,OpenERP Team,
- makoFor OpenERP book
- crm.lead
- Propose a free technical training to Gold partners
- info@tinyerp.com
-
+ Propose a free technical training to Gold partners
+ info@tinyerp.com
-
-
- Hello, We have very good offer that might suit you.
+
+
+ Hello, We have very good offer that might suit you.
For our gold partners,We are arranging free technical training on june,2010.
If any further information required kindly revert back.
I really appreciate your co-operation on this.
Regards,OpenERP Team,
- makoFor technical training to Gold partners
- crm.lead
- Propose paid training to Silver partners
- info@tinyerp.com
-
+ Propose paid training to Silver partners
+ info@tinyerp.com
-
-
- Hello, We have very good offer that might suit you.
+
+
+ Hello, We have very good offer that might suit you.
For our silver partners,We are paid technical training on june,2010.
If any further information required kindly revert back.
I really appreciate your co-operation on this.
Regards,OpenERP Team,
- makoFor training to Silver partners
- crm.lead
- Propose gold partnership to silver partners
- info@tinyerp.com
-
+ Propose gold partnership to silver partners
+ info@tinyerp.com
-
-
- Hello, We have very good offer that might suit you.
+
+
+ Hello, We have very good offer that might suit you.
For our silver partners,We are offering Gold partnership.
If any further information required kindly revert back.
I really appreciate your co-operation on this.
Regards,OpenERP Team,
- makoFor gold partnership to silver partners
- crm.lead
- Thanks for subscribing to technical training
- info@tinyerp.com
-
+ Thanks for subscribing to technical training
+ info@tinyerp.com
-
-
- Hello, Thanks for showing intrest and for subscribing to technical training.If any further information required kindly revert back.I really appreciate your co-operation on this.
+
+
+ Hello, Thanks for showing intrest and for subscribing to technical training.If any further information required kindly revert back.I really appreciate your co-operation on this.
Regards,OpenERP Team,
- makoFor subscribing to technical training
- crm.lead
diff --git a/addons/membership/__openerp__.py b/addons/membership/__openerp__.py
index 20d01b6a60e..3e78b4775ab 100644
--- a/addons/membership/__openerp__.py
+++ b/addons/membership/__openerp__.py
@@ -23,7 +23,7 @@
{
'name': 'Membership',
'version': '0.1',
- 'category': 'Hidden',
+ 'category': 'Association',
'description': """
This module allows you to manage all operations for managing memberships.
=========================================================================
diff --git a/addons/mrp/__openerp__.py b/addons/mrp/__openerp__.py
index 38c5fa9a9d1..c9311b701a2 100644
--- a/addons/mrp/__openerp__.py
+++ b/addons/mrp/__openerp__.py
@@ -101,6 +101,7 @@ Dashboard provided by this module:
],
'installable': True,
+ 'application': True,
'active': False,
'certificate': '0032052481373',
}
diff --git a/addons/mrp/board_manufacturing_view.xml b/addons/mrp/board_manufacturing_view.xml
index 427780f344c..ea6d44026ab 100644
--- a/addons/mrp/board_manufacturing_view.xml
+++ b/addons/mrp/board_manufacturing_view.xml
@@ -7,9 +7,9 @@
form
@@ -58,11 +57,9 @@
-
-
-
+
@@ -116,7 +113,7 @@
-
+
diff --git a/addons/mrp_operations/mrp_operations_workflow_instance.xml b/addons/mrp_operations/mrp_operations_workflow_instance.xml
new file mode 100644
index 00000000000..b8239c18ccf
--- /dev/null
+++ b/addons/mrp_operations/mrp_operations_workflow_instance.xml
@@ -0,0 +1,10 @@
+
+
+
+
+
+
+
+
+
+
diff --git a/addons/mrp_repair/__openerp__.py b/addons/mrp_repair/__openerp__.py
index a1f060cf7c3..cf141b61978 100644
--- a/addons/mrp_repair/__openerp__.py
+++ b/addons/mrp_repair/__openerp__.py
@@ -21,7 +21,7 @@
{
- 'name': 'Repairs',
+ 'name': 'Repairs Management',
'version': '1.0',
'category': 'Manufacturing',
'description': """
@@ -51,6 +51,7 @@ The aim is to have a complete module to manage all products repairs. The followi
'demo_xml': [],
'test': ['test/test_mrp_repair.yml', 'test/mrp_repair_report.yml','test/mrp_repair_cancel.yml'],
'installable': True,
+ 'application': True,
'active': False,
'certificate': '0060814381277',
}
diff --git a/addons/mrp_repair/report/order.rml b/addons/mrp_repair/report/order.rml
index b72f3d7a130..ecec220edbb 100644
--- a/addons/mrp_repair/report/order.rml
+++ b/addons/mrp_repair/report/order.rml
@@ -189,21 +189,13 @@
Shipping address :[[ o.partner_id.name ]]
- [[ o.address_id.street ]]
- [[ o.address_id.street2 or removeParentNode('para') ]]
- [[ o.address_id.city or '' ]] [[ o.address_id.zip or '' ]]
- [[ (o.address_id.state_id and o.address_id.state_id.name) or removeParentNode('para') ]]
- [[ o.address_id.country_id and o.address_id.country_id.name or '' ]]
+ [[ o.address_id and display_address(o.address_id) ]] Invoice address :[[ o.partner_id and o.partner_id.property_payment_term.name ]]
- [[ o.partner_invoice_id.street ]]
- [[ o.partner_invoice_id.street2 or removeParentNode('para') ]]
- [[ o.partner_invoice_id.zip or '' ]] [[ o.partner_invoice_id.city or '' ]]
- [[ (o.partner_invoice_id.state_id and o.partner_invoice_id.state_id.name) or removeParentNode('para') ]]
- [[ o.partner_invoice_id.country_id and o.partner_invoice_id.country_id.name or '' ]]
+ [[ o.partner_invoice_id and display_address(o.partner_invoice_id) ]]
@@ -212,11 +204,7 @@
[[ o.partner_id.name or removeParentNode('para') ]]
- [[ o.default_address_id and o.default_address_id.street or removeParentNode('para') ]]
- [[ o.default_address_id and o.default_address_id.street2 or removeParentNode('para') ]]
- [[ o.default_address_id and o.default_address_id.zip or removeParentNode('para') ]][[ o.default_address_id and o.default_address_id.city or removeParentNode('para') ]]
- [[ o.default_address_id and o.default_address_id.state_id and o.default_address_id.state_id.name or removeParentNode('para') ]]
- [[ o.default_address_id and o.default_address_id.country_id and o.default_address_id.country_id.name or removeParentNode('para') ]]
+ [[ o.default_address_id and display_address(o.default_address_id) ]]
diff --git a/addons/multi_company/__openerp__.py b/addons/multi_company/__openerp__.py
index 636ff1cac29..d82f0e1eb7c 100644
--- a/addons/multi_company/__openerp__.py
+++ b/addons/multi_company/__openerp__.py
@@ -23,7 +23,7 @@
{
'name': 'Multi-Company',
'version': '1.0',
- 'category': 'Hidden',
+ 'category': 'Tools',
'complexity': "expert",
'description': """
This module is for managing a multicompany environment.
diff --git a/addons/pad/__openerp__.py b/addons/pad/__openerp__.py
index 9630e74c27a..14ee68334a8 100644
--- a/addons/pad/__openerp__.py
+++ b/addons/pad/__openerp__.py
@@ -1,8 +1,8 @@
# -*- coding: utf-8 -*-
{
- 'name': 'Collaborative Note Pad',
+ 'name': 'Collaborative Pads',
'version': '2.0',
- 'category': 'Hidden',
+ "category": "Project Management",
'complexity': "easy",
'description': """
Adds enhanced support for (Ether)Pad attachments in the web client.
diff --git a/addons/pad_project/__openerp__.py b/addons/pad_project/__openerp__.py
index a9ec6282ab7..be7cb82af2e 100644
--- a/addons/pad_project/__openerp__.py
+++ b/addons/pad_project/__openerp__.py
@@ -20,9 +20,9 @@
##############################################################################
{
- 'name': 'Project PAD',
+ 'name': 'Project Specs as PADs',
'version': '1.0',
- 'category': 'Hidden/Link',
+ "category": "Project Management",
'complexity': "easy",
'description': """
This module adds a PAD in all project kanban views
diff --git a/addons/plugin/__openerp__.py b/addons/plugin/__openerp__.py
index b598690cbf2..2b05305c5ce 100644
--- a/addons/plugin/__openerp__.py
+++ b/addons/plugin/__openerp__.py
@@ -21,9 +21,9 @@
{
- 'name': 'Common interface for CRM plugin (Thunderbird and Outlook)',
+ 'name': 'CRM Plugins',
'version': '1.0',
- 'category': 'Hidden',
+ 'category': 'Tools',
'complexity': "easy",
'description': """
The common interface for pugin.
diff --git a/addons/point_of_sale/__openerp__.py b/addons/point_of_sale/__openerp__.py
index 4daeabb9129..62df15f5954 100644
--- a/addons/point_of_sale/__openerp__.py
+++ b/addons/point_of_sale/__openerp__.py
@@ -79,6 +79,7 @@ Main features :
'test/point_of_sale_report.yml'
],
'installable': True,
+ 'application': True,
'certificate' : '001156338024966477869',
# Web client
'js': ['static/lib/backbone/backbone-0.5.3.js', 'static/src/js/pos.js'],
diff --git a/addons/point_of_sale/point_of_sale.py b/addons/point_of_sale/point_of_sale.py
index b19405bd43f..1afa10b1be3 100644
--- a/addons/point_of_sale/point_of_sale.py
+++ b/addons/point_of_sale/point_of_sale.py
@@ -122,10 +122,10 @@ class pos_order(osv.osv):
'partner_id': fields.many2one('res.partner', 'Customer', change_default=True, select=1, states={'draft': [('readonly', False)], 'paid': [('readonly', False)]}),
'state': fields.selection([('draft', 'New'),
- ('paid', 'Done'),
+ ('cancel', 'Cancelled'),
+ ('paid', 'Paid'),
('done', 'Posted'),
- ('invoiced', 'Invoiced'),
- ('cancel', 'Cancelled')],
+ ('invoiced', 'Invoiced')],
'State', readonly=True),
'invoice_id': fields.many2one('account.invoice', 'Invoice'),
@@ -691,10 +691,12 @@ pos_category()
class product_product(osv.osv):
_inherit = 'product.product'
_columns = {
- 'income_pdt': fields.boolean('Product for Input'),
- 'expense_pdt': fields.boolean('Product for Output'),
- 'img': fields.binary('Pos Image, must be 50x50'),
- 'pos_categ_id': fields.many2one('pos.category','POS Category', change_default=True, domain="[('type','=','normal')]" ,help="Select a pos category for the current product")
+ 'income_pdt': fields.boolean('PoS Cash Input', help="This is a product you can use to put cash into a statement for the point of sale backend."),
+ 'expense_pdt': fields.boolean('PoS Cash Output', help="This is a product you can use to take cash from a statement for the point of sale backend, exemple: money lost, transfer to bank, etc."),
+ 'img': fields.binary('Product Image, must be 50x50', help="Use an image size of 50x50."),
+ 'pos_categ_id': fields.many2one('pos.category','PoS Category',
+ domain="[('type','=','normal')]",
+ help="If you want to sell this product through the point of sale, select the category it belongs to.")
}
product_product()
diff --git a/addons/point_of_sale/point_of_sale_demo.xml b/addons/point_of_sale/point_of_sale_demo.xml
index 5e9c00ace54..95270721b8e 100644
--- a/addons/point_of_sale/point_of_sale_demo.xml
+++ b/addons/point_of_sale/point_of_sale_demo.xml
@@ -66,7 +66,6 @@
-
@@ -76,7 +75,6 @@
paidPOS/019
- tax_excluded
@@ -106,7 +104,6 @@
POS/019
- direct
@@ -137,7 +134,6 @@
Stock move (POS 12)
-
@@ -157,7 +153,6 @@
- tax_excluded
@@ -165,7 +160,6 @@
- tax_excluded
@@ -173,11 +167,9 @@
- [PC3] Medium PC
- 4502No Discount
@@ -185,11 +177,9 @@
- [PC2] Basic+ PC (assembly on order)
- 4502No Discount
@@ -197,11 +187,9 @@
- [PC1] Basic PC
- 45050.10
diff --git a/addons/point_of_sale/point_of_sale_view.xml b/addons/point_of_sale/point_of_sale_view.xml
index 1c3dceedc68..b69305c1a30 100644
--- a/addons/point_of_sale/point_of_sale_view.xml
+++ b/addons/point_of_sale/point_of_sale_view.xml
@@ -1,9 +1,9 @@
-
@@ -12,11 +12,11 @@
pos.orderform
-
- Point of Sale
+ PoS Ordersir.actions.act_windowpos.orderform
-
+ tree,form
+ []
@@ -154,10 +155,10 @@
-
+
-
+
Sale lines
@@ -580,6 +581,19 @@
[('date_order','like',time.strftime('%Y-%m'))]
+
+ product.normal.pos.form.inherit
+ product.product
+ form
+
+
+
+
+
+
+
+
+
product.normal.form.inheritproduct.product
@@ -599,68 +613,24 @@
pos.category.treepos.categorytree
- child_id
+
-
+
- Products by POS-Category
+ PoS Categoriesir.actions.act_windowpos.category
- [('parent_id','=',False)]
- tree
-
- Here is a list of all your products classified by POS category. You can click a category to get the list of all products linked to this category or to a child of this category.
+ form
+ tree,form
+
-
- product.normal.form.inherit
- product.product
- form
-
-
-
-
-
@@ -673,18 +643,6 @@
[('expense_pdt','=',True)]{'default_expense_pdt': True}
-
-
- tree
-
-
-
-
-
- form
-
-
-
-
-
- tree
-
-
-
-
-
- form
-
-
-
-
-
+
+
@@ -526,13 +526,23 @@
Tasksproject.taskform
- tree,form,calendar,gantt,graph,kanban
+ kanban,tree,form,calendar,gantt,graph
-
+ {"search_default_draft": 1, "search_default_open":1, "search_default_project_id": project_id}A task represents a work that has to be done. Each user works in his own list of tasks where he can record his task work in hours. He can work and close the task itself or delegate it to another user. If you delegate a task to another user, you get a new task in pending state, which will be reopened when you have to review the work achieved. If you install the project_timesheet module, task work can be invoiced based on the project configuration. With the project_mrp module, sales orders can create tasks automatically when they are confirmed.
+
+
+ kanban
+
+
+
+
+ tree
+
+
diff --git a/addons/project/report/project_cumulative.xml b/addons/project/report/project_cumulative.xml
new file mode 100644
index 00000000000..aff90aea94e
--- /dev/null
+++ b/addons/project/report/project_cumulative.xml
@@ -0,0 +1,81 @@
+
+
+
+
+
+ project.task.history.cumulative.tree
+ project.task.history.cumulative
+ tree
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ project.task.history.cumulative.graph
+ project.task.history.cumulative
+ graph
+
+
+
+
+
+
+
+
+
+
+ project.task.history.cumulative.search
+ project.task.history.cumulative
+ search
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Cumulative Flow
+ project.task.history.cumulative
+ form
+ graph,tree
+
+ {"search_default_open":1, "search_default_this_month": 1}
+
+
+
+
+
+
diff --git a/addons/project/report/project_report_view.xml b/addons/project/report/project_report_view.xml
index cfa667c7590..bf828d6b231 100644
--- a/addons/project/report/project_report_view.xml
+++ b/addons/project/report/project_report_view.xml
@@ -5,6 +5,8 @@
+
report.project.task.user.tree
@@ -152,7 +154,7 @@
This report allows you to analyse the performance of your projects and users. You can analyse the quantities of tasks, the hours spent compared to the planned hours, the average number of days to open or close a task, etc.
-
+
diff --git a/addons/project/res_partner_view.xml b/addons/project/res_partner_view.xml
index dc0226ba50e..31c88377ddb 100644
--- a/addons/project/res_partner_view.xml
+++ b/addons/project/res_partner_view.xml
@@ -25,6 +25,9 @@
+
+
+
diff --git a/addons/project/security/ir.model.access.csv b/addons/project/security/ir.model.access.csv
index 659948bc4d0..955a6ef0c97 100644
--- a/addons/project/security/ir.model.access.csv
+++ b/addons/project/security/ir.model.access.csv
@@ -22,3 +22,5 @@
"access_project_task_sale_user","project.task salesman","model_project_task","base.group_sale_salesman",1,0,0,0
"access_project_project_sale_user","project.project salesman","model_project_project","base.group_sale_salesman",1,0,0,0
"access_account_analytic_line_project","account.analytic.line project","analytic.model_account_analytic_line","project.group_project_manager",1,1,1,1
+"access_project_task_history","project.task.history project","project.model_project_task_history","project.group_project_user",1,1,1,0
+"access_project_task_history_cumulative","project.task.history project","project.model_project_task_history_cumulative","project.group_project_manager",1,0,0,0
diff --git a/addons/project_caldav/__openerp__.py b/addons/project_caldav/__openerp__.py
index 6e716a2e9d0..6055a1f9f3d 100644
--- a/addons/project_caldav/__openerp__.py
+++ b/addons/project_caldav/__openerp__.py
@@ -23,7 +23,7 @@
"name": "CalDAV for Task Management",
"version": "1.1",
"author": "OpenERP SA",
- "category": "Hidden",
+ "category": "Project Management",
"description": """
Synchronization between Project Task and Caldav Vtodo.
======================================================
diff --git a/addons/project_gtd/__openerp__.py b/addons/project_gtd/__openerp__.py
index 761b2b44708..61ed601829f 100644
--- a/addons/project_gtd/__openerp__.py
+++ b/addons/project_gtd/__openerp__.py
@@ -21,7 +21,7 @@
{
- 'name': 'Todo List based on the GTD methodology',
+ 'name': 'Todo Lists',
'version': '1.0',
'category': 'Project Management',
'complexity': "easy",
@@ -60,6 +60,7 @@ performing those tasks.
'test/gtd_test.yml'
],
'installable': True,
+ 'application': True,
'active': False,
'certificate': '0043525236301',
}
diff --git a/addons/project_issue/__openerp__.py b/addons/project_issue/__openerp__.py
index e77499df3d0..215e4971bf2 100644
--- a/addons/project_issue/__openerp__.py
+++ b/addons/project_issue/__openerp__.py
@@ -59,6 +59,7 @@ and decide on their status as they evolve.
],
'installable': True,
'active': False,
+ 'application': True,
'certificate' : '001236490750848623845',
}
diff --git a/addons/project_issue/project_issue.py b/addons/project_issue/project_issue.py
index b83efbc4996..22cc02b8645 100644
--- a/addons/project_issue/project_issue.py
+++ b/addons/project_issue/project_issue.py
@@ -312,7 +312,7 @@ class project_issue(crm.crm_case, osv.osv):
'name': bug.name,
'partner_id': bug.partner_id.id,
'description':bug.description,
- 'date': bug.date,
+ 'date_deadline': bug.date,
'project_id': bug.project_id.id,
'priority': bug.priority,
'user_id': bug.user_id.id,
diff --git a/addons/project_issue/project_issue_menu.xml b/addons/project_issue/project_issue_menu.xml
index 5830fcb37fb..9d88418720b 100644
--- a/addons/project_issue/project_issue_menu.xml
+++ b/addons/project_issue/project_issue_menu.xml
@@ -8,13 +8,19 @@
Issuesproject.issueform
- tree,calendar,kanban
-
+ kanban,tree,calendar
+ {"search_default_user_id": uid, "search_default_draft": 1,"search_default_todo": 1, "search_default_project_id":project_id}Issues such as system bugs, customer complaints, and material breakdowns are collected here. You can define the stages assigned when solving the project issue (analysis, development, done). With the mailgateway module, issues can be integrated through an email address (example: support@mycompany.com)
-
+
+
+
+
+ kanban
+
+
diff --git a/addons/project_issue/project_issue_view.xml b/addons/project_issue/project_issue_view.xml
index 51440e1cbff..d50501279fd 100644
--- a/addons/project_issue/project_issue_view.xml
+++ b/addons/project_issue/project_issue_view.xml
@@ -96,7 +96,7 @@
-
+
@@ -106,32 +106,6 @@
context="{'mail.compose.message.mode':'reply', 'message_id':active_id}"
icon="terp-mail-replied" type="action" />
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
@@ -327,7 +293,7 @@
-
+
diff --git a/addons/project_issue_sheet/__openerp__.py b/addons/project_issue_sheet/__openerp__.py
index 972245533ad..0914be9d335 100644
--- a/addons/project_issue_sheet/__openerp__.py
+++ b/addons/project_issue_sheet/__openerp__.py
@@ -21,9 +21,9 @@
##############################################################################
{
- 'name': 'Add the Timesheet support for Issue Management in Project Management',
+ 'name': 'Timesheet on Issues',
'version': '1.0',
- 'category': 'Hidden/Link',
+ "category": "Project Management",
'description': """
This module adds the Timesheet support for the Issues/Bugs Management in Project.
=================================================================================
diff --git a/addons/project_long_term/__openerp__.py b/addons/project_long_term/__openerp__.py
index f4b8ce34ad0..fffed6128ac 100644
--- a/addons/project_long_term/__openerp__.py
+++ b/addons/project_long_term/__openerp__.py
@@ -20,7 +20,7 @@
##############################################################################
{
- "name": "Long Term Planning",
+ "name": "Long Term Projects",
"version": "1.1",
"author": "OpenERP SA",
"website": "http://www.openerp.com",
@@ -60,6 +60,7 @@ Features
"wizard/project_compute_tasks_view.xml",
],
'installable': True,
+ 'application': True,
'active': False,
'certificate': '001227470751077315069',
}
diff --git a/addons/project_mailgate/__openerp__.py b/addons/project_mailgate/__openerp__.py
index ba3e2e57ba5..7f55c580fb8 100644
--- a/addons/project_mailgate/__openerp__.py
+++ b/addons/project_mailgate/__openerp__.py
@@ -21,11 +21,11 @@
{
- "name": "Project Tasks - Mail Integration",
+ "name": "Tasks Mail Integration",
"version": "1.1",
"author": "OpenERP SA",
"website": "http://www.openerp.com",
- "category": "Hidden",
+ "category": "Project Management",
'complexity': "easy",
"images": ["images/project_mailgate_task.jpeg"],
"depends": ["project", "mail"],
diff --git a/addons/project_mailgate/project_mailgate_view.xml b/addons/project_mailgate/project_mailgate_view.xml
index c3cd4bf9db2..6bf9855f98a 100644
--- a/addons/project_mailgate/project_mailgate_view.xml
+++ b/addons/project_mailgate/project_mailgate_view.xml
@@ -9,32 +9,10 @@
-
+
-
diff --git a/addons/project_messages/__openerp__.py b/addons/project_messages/__openerp__.py
index f7e50110784..a146056e921 100644
--- a/addons/project_messages/__openerp__.py
+++ b/addons/project_messages/__openerp__.py
@@ -26,7 +26,7 @@
"images": ["images/project_message.jpeg"],
"depends": ["project"],
"author": "OpenERP SA",
- "category": 'Hidden',
+ "category": "Project Management",
'complexity': "easy",
"description": """
This module provides the functionality to send messages within a project.
diff --git a/addons/project_messages/project_messages_view.xml b/addons/project_messages/project_messages_view.xml
index f8c98d15785..85e2c02f8ff 100644
--- a/addons/project_messages/project_messages_view.xml
+++ b/addons/project_messages/project_messages_view.xml
@@ -15,15 +15,6 @@
-
diff --git a/addons/project_mrp/__openerp__.py b/addons/project_mrp/__openerp__.py
index 3cb2fb40179..e5722b92da9 100644
--- a/addons/project_mrp/__openerp__.py
+++ b/addons/project_mrp/__openerp__.py
@@ -21,9 +21,9 @@
{
- 'name': 'Automatic task creation from procurement lines',
+ 'name': 'Create Tasks on SO',
'version': '1.0',
- 'category': 'Hidden/Link',
+ "category": "Project Management",
'complexity': "easy",
'description': """
Automatically creates project tasks from procurement lines
diff --git a/addons/project_planning/__openerp__.py b/addons/project_planning/__openerp__.py
index 9ce5e8a2d9a..23d900d86ff 100644
--- a/addons/project_planning/__openerp__.py
+++ b/addons/project_planning/__openerp__.py
@@ -23,7 +23,7 @@
{
'name': 'Planning Management Module',
'version': '1.0',
- 'category': 'Hidden',
+ "category": "Project Management",
'complexity': "easy",
'description': """Keep track of your planning
This module helps you to manage your plannings.
diff --git a/addons/project_retro_planning/__openerp__.py b/addons/project_retro_planning/__openerp__.py
index 68ea9d5d78e..5ca01a3a0e1 100644
--- a/addons/project_retro_planning/__openerp__.py
+++ b/addons/project_retro_planning/__openerp__.py
@@ -20,9 +20,9 @@
##############################################################################
{
- 'name': 'Project Retro planning',
+ 'name': 'Project Retro-planning',
'version': '0.1',
- 'category': 'Hidden',
+ 'category': 'Project Management',
'description': """
Changes dates according to change in project End Date.
======================================================
diff --git a/addons/project_scrum/board_project_scrum_view.xml b/addons/project_scrum/board_project_scrum_view.xml
index 2a9d3532b2d..dd01832b575 100644
--- a/addons/project_scrum/board_project_scrum_view.xml
+++ b/addons/project_scrum/board_project_scrum_view.xml
@@ -76,7 +76,7 @@
form
-->
-
-
+
+ Customer Projects
+ account.analytic.account
+ form
+ tree,form,graph
+ {'search_default_has_partner':1, 'search_default_my_accounts':1, 'search_default_draft':1, 'search_default_pending':1, 'search_default_open':1}
+ [('type','=','normal')]
+
+ You will find here the contracts related to your customer projects in order to track the invoicing progress.
+
+
+
diff --git a/addons/purchase/__openerp__.py b/addons/purchase/__openerp__.py
index b4f3a9adf30..010b0369edf 100644
--- a/addons/purchase/__openerp__.py
+++ b/addons/purchase/__openerp__.py
@@ -78,5 +78,6 @@ Dashboard for purchase management that includes:
'installable': True,
'active': False,
'certificate': '0057234283549',
+ 'application': True,
}
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/purchase/report/order.rml b/addons/purchase/report/order.rml
index a1201c7b452..dfd93f0d45a 100644
--- a/addons/purchase/report/order.rml
+++ b/addons/purchase/report/order.rml
@@ -167,11 +167,7 @@
Shipping address :[[ (o.dest_address_id and o.dest_address_id.partner_id.name) or (o.warehouse_id and o.warehouse_id.name) or '']]
- [[ (o.dest_address_id and o.dest_address_id and o.dest_address_id.street) or (o.warehouse_id and o.warehouse_id.partner_address_id and o.warehouse_id.partner_address_id.street) or '']]
- [[ (o.dest_address_id and o.dest_address_id and o.dest_address_id.street2) or (o.warehouse_id and o.warehouse_id.partner_address_id and o.warehouse_id.partner_address_id.street2) or removeParentNode('para') ]]
- [[ (o.dest_address_id and o.dest_address_id and o.dest_address_id.zip) or (o.warehouse_id and o.warehouse_id.partner_address_id and o.warehouse_id.partner_address_id.zip) or '' ]] [[ (o.dest_address_id and o.dest_address_id and o.dest_address_id.city) or (o.warehouse_id and o.warehouse_id.partner_address_id and o.warehouse_id.partner_address_id.city) or '' ]]
- [[ (o.dest_address_id and o.dest_address_id.state_id and o.dest_address_id.state_id.name) or (o.warehouse_id and o.warehouse_id.partner_address_id and o.warehouse_id.partner_address_id.state_id and o.warehouse_id.partner_address_id.state_id.name) or removeParentNode('para') ]]
- [[ (o.dest_address_id and o.dest_address_id.country_id and o.dest_address_id.country_id.name) or (o.warehouse_id and o.warehouse_id.partner_address_id and o.warehouse_id.partner_address_id.country_id and o.warehouse_id.partner_address_id.country_id.name) ]]
+ [[ (o.dest_address_id and display_address(o.dest_address_id)) or (o.warehouse_id and displaye_address(o.warehouse_id.partner_address_id)) or '']]
@@ -186,11 +182,7 @@
[[ (o.partner_id and o.partner_id.title and o.partner_id.title.name) or '' ]] [[ (o.partner_id and o.partner_id.name) or '' ]]
- [[ (o.partner_address_id and o.partner_address_id.street ) or '']]
- [[ (o.partner_address_id and o.partner_address_id.street2) or removeParentNode('para') ]]
- [[ (o.partner_address_id and o.partner_address_id.zip) or '' ]] [[ (o.partner_address_id and o.partner_address_id.city) or '' ]]
- [[ (o.partner_address_id and o.partner_address_id.state_id and o.partner_address_id.state_id.name) or removeParentNode('para')]]
- [[ (o.partner_address_id and o.partner_address_id.country_id and o.partner_address_id.country_id.name) or '' ]]
+ [[ o.partner_address_id and display_address(o.partner_address_id) ]]
diff --git a/addons/purchase/report/request_quotation.rml b/addons/purchase/report/request_quotation.rml
index 27e4ac39602..866e3e9003b 100644
--- a/addons/purchase/report/request_quotation.rml
+++ b/addons/purchase/report/request_quotation.rml
@@ -92,11 +92,7 @@
Expected Delivery address:[[ (order.dest_address_id and order.dest_address_id.partner_id.name) or (order.warehouse_id and order.warehouse_id.name) or '']]
- [[ (order.dest_address_id and order.dest_address_id and order.dest_address_id.street) or (order.warehouse_id and order.warehouse_id.partner_address_id and order.warehouse_id.partner_address_id.street) or '']]
- [[ (order.dest_address_id and order.dest_address_id and order.dest_address_id.street2) or (order.warehouse_id and order.warehouse_id.partner_address_id and order.warehouse_id.partner_address_id.street2) or removeParentNode('para') ]]
- [[ (order.dest_address_id and order.dest_address_id and order.dest_address_id.zip) or (order.warehouse_id and order.warehouse_id.partner_address_id and order.warehouse_id.partner_address_id.zip) or '' ]][[ (order.dest_address_id and order.dest_address_id and order.dest_address_id.city) or (order.warehouse_id and order.warehouse_id.partner_address_id and order.warehouse_id.partner_address_id.city) or '' ]]
- [[(order.warehouse_id and order.warehouse_id.partner_address_id and order.warehouse_id.partner_address_id.state_id and order.warehouse_id.partner_address_id.state_id.name) or order.partner_address_id and order.partner_address_id.state_id and order.partner_address_id.state_id.name or removeParentNode('para') ]]
- [[(order.warehouse_id and order.warehouse_id.partner_address_id and order.warehouse_id.partner_address_id.country_id and order.warehouse_id.partner_address_id.country_id.name) or order.partner_address_id.country_id.name ]]
+ [[ order.dest_address_id and display_address(order.dest_address_id) ]]
@@ -105,11 +101,7 @@
[[ (order.partner_id and order.partner_id.title and order.partner_id.title.name) or '' ]] [[ order.partner_id.name ]]
- [[ (order.partner_address_id and order.partner_address_id.street) or '']]
- [[ (order.partner_address_id.street2) or removeParentNode('para') ]]
- [[ (order.partner_address_id and order.partner_address_id.zip) or '' ]][[ (order.partner_address_id and order.partner_address_id.city) or '' ]]
- [[ (order.partner_address_id.state_id.name) or removeParentNode('para') ]]
- [[ (order.partner_address_id and order.partner_address_id.country_id and order.partner_address_id.country_id.name) or '' ]]
+ [[ order.partner_address_id and display_address(order.partner_address_id) ]]
diff --git a/addons/purchase_double_validation/__openerp__.py b/addons/purchase_double_validation/__openerp__.py
index cd379afdb59..eda89e81aa8 100644
--- a/addons/purchase_double_validation/__openerp__.py
+++ b/addons/purchase_double_validation/__openerp__.py
@@ -20,9 +20,9 @@
##############################################################################
{
- "name" : "Double Validation for Purchase",
+ "name" : "Double Validation on Purchases",
"version" : "1.1",
- "category": 'Hidden',
+ 'category': 'Purchase Management',
'complexity': "easy",
"images" : ["images/purchase_validation.jpeg"],
"depends" : ["base","purchase"],
diff --git a/addons/report_designer/__openerp__.py b/addons/report_designer/__openerp__.py
index fd29d2b96ee..77b37fd507b 100644
--- a/addons/report_designer/__openerp__.py
+++ b/addons/report_designer/__openerp__.py
@@ -21,11 +21,11 @@
{
- "name" : "Reporting Hidden Installer",
+ "name" : "Report Designer",
"version" : "1.0",
"depends" : ["base", "base_setup"],
"author" : "OpenERP SA",
- "category": "Hidden",
+ "category": "Tools",
"description": """
Installer for reporting Hidden.
==============================
diff --git a/addons/report_intrastat/__openerp__.py b/addons/report_intrastat/__openerp__.py
index 6c80e0f2b81..2f0bb6b46d9 100644
--- a/addons/report_intrastat/__openerp__.py
+++ b/addons/report_intrastat/__openerp__.py
@@ -23,7 +23,7 @@
{
'name': 'Intrastat Reporting',
'version': '1.0',
- 'category': 'Hidden',
+ "category": 'Accounting & Finance',
'description': """
A module that adds intrastat reports.
=====================================
diff --git a/addons/report_intrastat/report/invoice.rml b/addons/report_intrastat/report/invoice.rml
index c66a39413ee..0c635a611c8 100644
--- a/addons/report_intrastat/report/invoice.rml
+++ b/addons/report_intrastat/report/invoice.rml
@@ -142,11 +142,7 @@
[[ (o.partner_id and o.partner_id.title and o.partner_id.title.name) or '' ]] [[ (o.partner_id and o.partner_id.name) or '' ]]
- [[ (o.address_invoice_id and o.address_invoice_id.street) or '' ]]
- [[ (o.address_invoice_id and o.address_invoice_id.street2) or removeParentNode('para') ]]
- [[ (o.address_invoice_id and o.address_invoice_id.zip) or '' ]] [[ (o.address_invoice_id and o.address_invoice_id.city) or '' ]]
- [[ (o.address_invoice_id and o.address_invoice_id.state_id and o.address_invoice_id.state_id.name) or removeParentNode('para') ]]
- [[ (o.address_invoice_id and o.address_invoice_id.country_id and o.address_invoice_id.country_id.name) or '' ]]
+ [[ o.address_invoice_id and display_address(o.address_invoice_id) ]]
diff --git a/addons/report_webkit/__openerp__.py b/addons/report_webkit/__openerp__.py
index 56496a2d130..5db184a8c58 100644
--- a/addons/report_webkit/__openerp__.py
+++ b/addons/report_webkit/__openerp__.py
@@ -84,7 +84,7 @@ TODO
"version" : "0.9",
"depends" : ["base"],
"author" : "Camptocamp",
- "category": "Hidden", # i.e a technical module, not shown in Application install menu
+ "category": "Tools", # i.e a technical module, not shown in Application install menu
"url": "http://http://www.camptocamp.com/",
"data": [ "security/ir.model.access.csv",
"data.xml",
diff --git a/addons/report_webkit_sample/__openerp__.py b/addons/report_webkit_sample/__openerp__.py
index 4e144736c24..9fb1f713d24 100644
--- a/addons/report_webkit_sample/__openerp__.py
+++ b/addons/report_webkit_sample/__openerp__.py
@@ -43,7 +43,7 @@ You have to create the print buttons by calling the wizard. For more details see
""",
"version" : "0.9",
"depends" : ["base", "account", "report_webkit"],
- "category": "Hidden",
+ "category": "Tools",
"author" : "Camptocamp SA - NBessi",
"url": "http://www.camptocamp.com/",
"data": ["report_webkit_html_view.xml",
diff --git a/addons/resource/__openerp__.py b/addons/resource/__openerp__.py
index f1e020215a6..2b8c27359d8 100644
--- a/addons/resource/__openerp__.py
+++ b/addons/resource/__openerp__.py
@@ -23,7 +23,7 @@
"name" : "Resource",
"version" : "1.1",
"author" : "OpenERP SA",
- "category" : "Hidden",
+ "category" : "Tools",
"website" : "http://www.openerp.com",
"description": """
Module for resource management.
diff --git a/addons/sale/board_sale_view.xml b/addons/sale/board_sale_view.xml
index c57ed5c6144..99eb8c831c4 100644
--- a/addons/sale/board_sale_view.xml
+++ b/addons/sale/board_sale_view.xml
@@ -7,9 +7,9 @@
form
+