diff --git a/addons/account/account.py b/addons/account/account.py
index 67abf8b4520..e19c4027039 100644
--- a/addons/account/account.py
+++ b/addons/account/account.py
@@ -629,8 +629,8 @@ class account_journal(osv.osv):
'currency': fields.many2one('res.currency', 'Currency', help='The currency used to enter statement'),
'entry_posted': fields.boolean('Skip \'Draft\' State for Created Entries', help='Check this box if you don\'t want new account moves to pass through the \'draft\' state and instead goes directly to the \'posted state\' without any manual validation.'),
'company_id': fields.many2one('res.company', 'Company', required=True, select=1, help="Company related to this journal"),
-# 'invoice_sequence_id': fields.many2one('ir.sequence', 'Invoice Sequence', \
-# help="The sequence used for invoice numbers in this journal."),
+ 'invoice_sequence_id': fields.many2one('ir.sequence', 'Invoice Sequence', \
+ help="The sequence used for invoice numbers in this journal."),
'allow_date':fields.boolean('Check Date not in the Period', help= 'If set to True then do not accept the entry if the entry date is not into the period dates'),
}
@@ -695,13 +695,13 @@ class account_journal(osv.osv):
'sequence_id':seq_id
})
-# if journal.type in journal_type and not journal.invoice_sequence_id:
-# res_ids = date_pool.search(cr, uid, [('model','=','ir.sequence'), ('name','=',journal_seq.get(journal.type, 'sale'))])
-# inv_seq_id = date_pool.browse(cr, uid, res_ids[0]).res_id
-# inv_seq_id
-# res.update({
-# 'invoice_sequence_id':inv_seq_id
-# })
+ if journal.type in journal_type and not journal.invoice_sequence_id:
+ res_ids = date_pool.search(cr, uid, [('model','=','ir.sequence'), ('name','=',journal_seq.get(journal.type, 'sale'))])
+ inv_seq_id = date_pool.browse(cr, uid, res_ids[0]).res_id
+ inv_seq_id
+ res.update({
+ 'invoice_sequence_id':inv_seq_id
+ })
result = self.write(cr, uid, [journal.id], res)
@@ -1620,13 +1620,41 @@ class account_tax(osv.osv):
'type_tax_use': fields.selection([('sale','Sale'),('purchase','Purchase'),('all','All')], 'Tax Application', required=True)
}
- def search(self, cr, uid, args, offset=0, limit=None, order=None,
- context=None, count=False):
+
+ def name_search(self, cr, user, name, args=None, operator='ilike', context=None, limit=80):
+ """
+ Returns a list of tupples containing id, name, as internally it is called {def name_get}
+ result format : {[(id, name), (id, name), ...]}
+
+ @param cr: A database cursor
+ @param user: ID of the user currently logged in
+ @param name: name to search
+ @param args: other arguments
+ @param operator: default operator is 'ilike', it can be changed
+ @param context: context arguments, like lang, time zone
+ @param limit: Returns first 'n' ids of complete result, default is 80.
+
+ @return: Returns a list of tupples containing id and name
+ """
+
+ if not args:
+ args=[]
+ if not context:
+ context={}
+ ids = []
+ ids = self.search(cr, user, args, limit=limit, context=context)
+ return self.name_get(cr, user, ids, context=context)
+
+ def search(self, cr, uid, args, offset=0, limit=None, order=None, context=None, count=False):
if context and context.has_key('type'):
- if context['type'] in ('out_invoice','out_refund'):
- args.append(('type_tax_use','in',['sale','all']))
- elif context['type'] in ('in_invoice','in_refund'):
- args.append(('type_tax_use','in',['purchase','all']))
+ if context.get('type') in ('out_invoice','out_refund'):
+ args += [('type_tax_use','in',['sale','all'])]
+ elif context.get('type') in ('in_invoice','in_refund'):
+ args += [('type_tax_use','in',['purchase','all'])]
+
+ if context and context.has_key('journal_id'):
+ args += [('type_tax_use','in',[context.get('journal_id'),'all'])]
+
return super(account_tax, self).search(cr, uid, args, offset, limit, order, context, count)
def name_get(self, cr, uid, ids, context={}):
@@ -1643,6 +1671,7 @@ class account_tax(osv.osv):
if user.company_id:
return user.company_id.id
return self.pool.get('res.company').search(cr, uid, [('parent_id', '=', False)])[0]
+
_defaults = {
'python_compute': lambda *a: '''# price_unit\n# address : res.partner.address object or False\n# product : product.product object or None\n# partner : res.partner object or None\n\nresult = price_unit * 0.10''',
'python_compute_inv': lambda *a: '''# price_unit\n# address : res.partner.address object or False\n# product : product.product object or False\n\nresult = price_unit * 0.10''',
diff --git a/addons/account/account_bank_statement.py b/addons/account/account_bank_statement.py
index e5581f3f05d..52e1b20a744 100644
--- a/addons/account/account_bank_statement.py
+++ b/addons/account/account_bank_statement.py
@@ -49,9 +49,16 @@ class account_bank_statement(osv.osv):
}
def _default_journal_id(self, cr, uid, context={}):
- if context.get('journal_id', False):
- return context['journal_id']
- return False
+ journal_pool = self.pool.get('account.journal')
+ journal_type = context.get('journal_type', False)
+ journal_id = False
+
+ if journal_type:
+ ids = journal_pool.search(cr, uid, [('type', '=', journal_type)])
+ if ids:
+ journal_id = ids[0]
+
+ return journal_id
def _default_balance_start(self, cr, uid, context={}):
cr.execute('select id from account_bank_statement where journal_id=%s order by date desc limit 1', (1,))
@@ -128,7 +135,7 @@ class account_bank_statement(osv.osv):
'date': fields.date('Date', required=True,
states={'confirm': [('readonly', True)]}),
'journal_id': fields.many2one('account.journal', 'Journal', required=True,
- states={'confirm': [('readonly', True)]}, domain=[('type', '=', 'cash')]),
+ states={'confirm': [('readonly', True)]}, domain=[('type', '=', 'bank')]),
'period_id': fields.many2one('account.period', 'Period', required=True,
states={'confirm':[('readonly', True)]}),
'balance_start': fields.float('Starting Balance', digits_compute=dp.get_precision('Account'),
diff --git a/addons/account/account_cash_statement.py b/addons/account/account_cash_statement.py
index af92d59b89b..f618bcfeefd 100644
--- a/addons/account/account_cash_statement.py
+++ b/addons/account/account_cash_statement.py
@@ -118,18 +118,18 @@ class account_cash_statement(osv.osv):
res2[statement.id]=encoding_total
return res2
- def _default_journal_id(self, cr, uid, context={}):
+# def _default_journal_id(self, cr, uid, context={}):
- """ To get default journal for the object"
- @param name: Names of fields.
- @return: journal
- """
- company_id = self.pool.get('res.users').browse(cr, uid, uid).company_id.id
- journal = self.pool.get('account.journal').search(cr, uid, [('type', '=', 'cash'), ('company_id', '=', company_id)])
- if journal:
- return journal[0]
- else:
- return False
+# """ To get default journal for the object"
+# @param name: Names of fields.
+# @return: journal
+# """
+# company_id = self.pool.get('res.users').browse(cr, uid, uid).company_id.id
+# journal = self.pool.get('account.journal').search(cr, uid, [('type', '=', 'cash'), ('company_id', '=', company_id)])
+# if journal:
+# return journal[0]
+# else:
+# return False
def _end_balance(self, cursor, user, ids, name, attr, context=None):
res_currency_obj = self.pool.get('res.currency')
@@ -174,7 +174,7 @@ class account_cash_statement(osv.osv):
return company_id
- def _get_cash_box_lines(self, cr, uid, ids, context={}):
+ def _get_cash_open_box_lines(self, cr, uid, ids, context={}):
res = []
curr = [1, 2, 5, 10, 20, 50, 100, 500]
for rs in curr:
@@ -182,12 +182,23 @@ class account_cash_statement(osv.osv):
'pieces':rs,
'number':0
}
- res.append((0,0,dct))
+ res.append(dct)
return res
-
+
+ def _get_cash_close_box_lines(self, cr, uid, ids, context={}):
+ res = []
+ curr = [1, 2, 5, 10, 20, 50, 100, 500]
+ for rs in curr:
+ dct = {
+ 'pieces':rs,
+ 'number':0
+ }
+ res.append((0, 0, dct))
+ return res
+
_columns = {
'company_id':fields.many2one('res.company', 'Company', required=False),
- 'journal_id': fields.many2one('account.journal', 'Journal', required=True),
+ 'journal_id': fields.many2one('account.journal', 'Journal', required=True, domain=[('type', '=', 'cash')]),
'balance_end_real': fields.float('Closing Balance', digits_compute=dp.get_precision('Account'), states={'confirm':[('readonly', True)]}, help="closing balance entered by the cashbox verifier"),
'state': fields.selection(
[('draft', 'Draft'),
@@ -206,11 +217,10 @@ class account_cash_statement(osv.osv):
'state': lambda *a: 'draft',
'name': lambda *a: '/',
'date': lambda *a:time.strftime("%Y-%m-%d %H:%M:%S"),
- 'journal_id': _default_journal_id,
'user_id': lambda self, cr, uid, context=None: uid,
'company_id': _get_company,
- 'starting_details_ids':_get_cash_box_lines,
- 'ending_details_ids':_get_cash_box_lines
+ 'starting_details_ids':_get_cash_open_box_lines,
+ 'ending_details_ids':_get_cash_open_box_lines
}
def create(self, cr, uid, vals, context=None):
@@ -224,7 +234,19 @@ class account_cash_statement(osv.osv):
open_jrnl = self.search(cr, uid, sql)
if open_jrnl:
raise osv.except_osv('Error', _('You can not have two open register for the same journal'))
+
+ if self.pool.get('account.journal').browse(cr, uid, vals['journal_id']).type == 'cash':
+ lines = end_lines = self._get_cash_close_box_lines(cr, uid, [], context)
+ vals.update({
+ 'ending_details_ids':lines
+ })
+ else:
+ vals.update({
+ 'ending_details_ids':False,
+ 'starting_details_ids':False
+ })
res_id = super(account_cash_statement, self).create(cr, uid, vals, context=context)
+ self.write(cr, uid, [res_id], {})
return res_id
def write(self, cr, uid, ids, vals, context=None):
diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml
index ac82fc1b6cc..22df9059305 100644
--- a/addons/account/account_invoice_view.xml
+++ b/addons/account/account_invoice_view.xml
@@ -138,7 +138,7 @@
-
+
@@ -216,7 +216,7 @@
-
+
diff --git a/addons/account/account_move_line.py b/addons/account/account_move_line.py
index 9dfb5fe1e6a..1d839b0f86e 100644
--- a/addons/account/account_move_line.py
+++ b/addons/account/account_move_line.py
@@ -873,20 +873,14 @@ class account_move_line(osv.osv):
elif field == 'credit':
attrs.append('sum="Total credit"')
elif field == 'account_tax_id':
- attrs.append('domain="[(\'parent_id\',\'=\',False), (\'type_tax_use\',\'=\',context.get(journal_id.type, \'sale\'))]"')
+ attrs.append('domain="[(\'parent_id\',\'=\',False)]"')
elif field == 'account_id' and journal.id:
attrs.append('domain="[(\'journal_id\', \'=\', '+str(journal.id)+'),(\'type\',\'<>\',\'view\'), (\'type\',\'<>\',\'closed\')]" on_change="onchange_account_id(account_id, partner_id)"')
elif field == 'partner_id':
attrs.append('on_change="onchange_partner_id(move_id, partner_id, account_id, debit, credit, date, journal_id)"')
-# elif field == 'date':
-# attrs.append('on_change="onchange_date(date)"')
+ elif field == 'journal_id':
+ attrs.append("context=\"{'journal_id':journal_id.type}\"")
-# if field.readonly:
-# attrs.append('readonly="1"')
-# if field.required:
-# attrs.append('required="1"')
-# else:
-# attrs.append('required="0"')
if field in ('amount_currency','currency_id'):
attrs.append('on_change="onchange_currency(account_id, amount_currency,currency_id, date, journal_id)"')
diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index 3ae70200ffb..ac2440cd5d6 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -152,12 +152,16 @@
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
@@ -388,14 +392,15 @@
+
+
+
+
+
-
-
-
-
@@ -455,7 +460,7 @@
-
+
@@ -530,12 +535,16 @@
-
+
+
+
+
-
+
@@ -546,6 +555,7 @@
form
tree,form,graph
[('journal_id.type', '=', 'bank')]
+ {'journal_type':'bank'}
@@ -1261,7 +1271,7 @@
-
+
@@ -1481,7 +1491,7 @@
-
+
@@ -1649,7 +1659,7 @@
form
tree,form
-
+
+
Running Subscriptions
@@ -2433,7 +2450,7 @@
-
+
@@ -2537,7 +2554,7 @@
-
+
@@ -2563,6 +2580,7 @@
[('journal_id.type', '=', 'cash')]
+ {'journal_type':'cash'}
diff --git a/addons/account/i18n/bs.po b/addons/account/i18n/bs.po
index 2acdb44977c..4bc36b56132 100644
--- a/addons/account/i18n/bs.po
+++ b/addons/account/i18n/bs.po
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 5.0.4\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-07-07 08:48+0000\n"
+"PO-Revision-Date: 2010-08-01 11:48+0000\n"
"Last-Translator: Bojan Markovic \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: 2010-07-08 03:50+0000\n"
+"X-Launchpad-Export-Date: 2010-08-02 03:49+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account
@@ -35,7 +35,7 @@ msgstr "Neplaćeni ulazni računi"
#. module: account
#: model:ir.ui.menu,name:account.menu_finance_entries
msgid "Entries Encoding"
-msgstr ""
+msgstr "Kodiranje unosa"
#. module: account
#: model:ir.actions.todo,note:account.config_wizard_account_base_setup_form
@@ -192,8 +192,6 @@ msgstr "Odabir retka prijenosa"
#. module: account
#: rml:account.journal.period.print:0
#: rml:account.tax.code.entries:0
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
msgid "Entry label"
msgstr "Oznaka unosa"
@@ -217,7 +215,7 @@ msgstr "Kod za izračunavanje (ako je tip=Python kod)"
#: view:account.move:0
#: view:account.move.line:0
msgid "Account Entry Line"
-msgstr "Redak računa"
+msgstr "Linija stavke računa"
#. module: account
#: wizard_view:account.aged.trial.balance,init:0
@@ -238,7 +236,6 @@ msgstr "Ponavljajuće stavke"
#: field:account.move,amount:0
#: field:account.tax,amount:0
#: field:account.tax.template,amount:0
-#: xsl:account.transfer:0
msgid "Amount"
msgstr "Iznos"
@@ -286,6 +283,11 @@ msgid ""
"date empty, it means direct payment. The payment term may compute several "
"due dates, for example 50% now, 50% in one month."
msgstr ""
+"Ukoliko koristite uvjete plaćanja, datum dospijeća biti će izračunat "
+"automatski prilikom generiranja računovodstvenih unosa. Ukoliko ostavite "
+"uvjete plaćanja i datum dospijeća praznim, to znači avansnu uplatu. Uvjeti "
+"plaćanja mogu izračunati nekoliko datuma dospijeća npr. 50% avansno, 50% za "
+"30 dana."
#. module: account
#: selection:account.tax,type:0
@@ -302,7 +304,6 @@ msgstr "Dospijela plaćanja"
#. module: account
#: wizard_view:account.account.balance.report,checktype:0
#: wizard_view:account.analytic.account.analytic.check.report,init:0
-#: wizard_view:account.analytic.account.balance.report,init:0
#: wizard_view:account.analytic.account.cost_ledger.report,init:0
#: wizard_view:account.analytic.account.inverted.balance.report,init:0
#: wizard_view:account.analytic.account.quantity_cost_ledger.report,init:0
@@ -342,6 +343,7 @@ msgid "Delta Debit"
msgstr "Delta duguje"
#. module: account
+#: model:account.account.type,name:account.account_type_tax
#: rml:account.invoice:0
#: field:account.invoice,amount_tax:0
#: field:account.move.line,account_tax_id:0
@@ -356,7 +358,9 @@ msgstr "Dugovna transakcija"
#. module: account
#: field:account.analytic.line,account_id:0
#: field:account.invoice.line,account_analytic_id:0
+#: wizard_field:account.invoice.pay,addendum,analytic_id:0
#: field:account.move.line,analytic_account_id:0
+#: wizard_field:account.move.line.reconcile,addendum,analytic_id:0
#: field:report.hr.timesheet.invoice.journal,account_id:0
msgid "Analytic Account"
msgstr "Analitičko konto"
@@ -429,7 +433,7 @@ msgstr "Negativan"
#. module: account
#: rml:account.partner.balance:0
msgid "(Account/Partner) Name"
-msgstr ""
+msgstr "Naziv (Konta/Partnera)"
#. module: account
#: selection:account.move,type:0
@@ -487,7 +491,7 @@ msgstr "Referenca"
#. module: account
#: field:account.tax.template,type_tax_use:0
msgid "Tax Use In"
-msgstr ""
+msgstr "Upotreba poreza u"
#. module: account
#: help:account.tax.template,include_base_amount:0
@@ -495,11 +499,13 @@ msgid ""
"Set if the amount of tax must be included in the base amount before "
"computing the next taxes."
msgstr ""
+"Postaviti ako se iznos poreza mora uključiti u osnovicu prije izračuna "
+"narednih poreza."
#. module: account
#: model:ir.ui.menu,name:account.menu_finance_periodical_processing
msgid "Periodical Processing"
-msgstr ""
+msgstr "Periodička obrada"
#. module: account
#: view:report.hr.timesheet.invoice.journal:0
@@ -612,6 +618,8 @@ msgid ""
"The sequence field is used to order the resources from lower sequences to "
"higher ones"
msgstr ""
+"Polje sekvence se koristi da se resursi poredaju od najnižih sekvenci ka "
+"višima"
#. module: account
#: wizard_view:account.analytic.account.chart,init:0
@@ -674,8 +682,11 @@ msgstr "Sub-Total :"
#. module: account
#: field:account.analytic.account,line_ids:0
#: view:account.analytic.line:0
+#: code:addons/account/project/wizard/wizard_account_analytic_line.py:0
#: model:ir.actions.act_window,name:account.action_account_analytic_line_form
+#: model:ir.actions.act_window,name:account.action_account_tree1
#: model:ir.ui.menu,name:account.next_id_41
+#, python-format
msgid "Analytic Entries"
msgstr "Analitičke stavke"
@@ -687,9 +698,10 @@ msgstr "Mjesec"
#. module: account
#: field:account.analytic.account,partner_id:0
msgid "Associated Partner"
-msgstr ""
+msgstr "Vezani partner"
#. module: account
+#: view:account.invoice:0
#: field:account.invoice,comment:0
msgid "Additional Information"
msgstr "Dodatne informacije"
@@ -828,6 +840,8 @@ msgid ""
"These types are defined according to your country. The type contain more "
"information about the account and it's specificities."
msgstr ""
+"Ovi tipovi su definirani prema vašoj zemlji. Tip sadrži više informacija o "
+"jednom kontu i njegovim specifičnostima."
#. module: account
#: selection:account.automatic.reconcile,init,power:0
@@ -912,6 +926,8 @@ msgid ""
"If a default tax is given in the partner it only overrides taxes from "
"accounts (or products) in the same group."
msgstr ""
+"Ako je podrazumijevani porez definiran kod partnera, on samo prepisuje "
+"poreze iz konta (ili proizvoda) iz iste grupe."
#. module: account
#: wizard_field:account.open_closed_fiscalyear,init,fyear_id:0
@@ -1121,7 +1137,7 @@ msgstr "Konto kategorije dobiti"
#: model:ir.actions.act_window,name:account.analytic_account_form
#: model:ir.ui.menu,name:account.account_analytic_form
msgid "New Analytic Account"
-msgstr "Novi analitički konto"
+msgstr "Novo analitičko konto"
#. module: account
#: model:ir.actions.act_window,name:account.action_account_fiscal_position_template_form
@@ -1216,6 +1232,11 @@ msgid ""
"software system you may have to use the rate at date. Incoming transactions "
"always use the rate at date."
msgstr ""
+"Ovo će odabrati kako se trenutni kurs valute za izlazne transakcije računa. "
+"U većini zemalja zakonska metoda je \"prosječni kurs\" ali samo nekolicina "
+"softverskih sistema to rade. Tako da, ukoliko uvozite podatke iz drugog "
+"softverskog sistema, možda ćete morati koristiti dnevni kurs. Ulazne "
+"transakcije uvijek koriste dnevni kurs."
#. module: account
#: field:account.account,company_currency_id:0
@@ -1225,7 +1246,7 @@ msgstr "Valuta preduzeća"
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_account_template
msgid "Fiscal Position Template Account Mapping"
-msgstr ""
+msgstr "Mapiranje fiskalne pozicije na konto predloška"
#. module: account
#: field:account.analytic.account,parent_id:0
@@ -1463,6 +1484,9 @@ msgstr "Ne popunjavati za upotrebu računa za prihod"
#: field:account.bank.statement.reconcile,line_new_ids:0
#: wizard_view:account.move.line.reconcile,init_full:0
#: wizard_view:account.move.line.reconcile,init_partial:0
+#: code:addons/account/wizard/wizard_pay_invoice.py:0
+#: code:addons/account/wizard/wizard_reconcile.py:0
+#, python-format
msgid "Write-Off"
msgstr "Otpis"
@@ -1472,6 +1496,8 @@ msgid ""
"The partner bank account to pay\n"
"Keep empty to use the default"
msgstr ""
+"Bankovni račun partnera na koji se vrši plaćanje\n"
+"Ostaviti prazno da koristite podrazumijevani"
#. module: account
#: field:res.partner,debit:0
@@ -1868,7 +1894,6 @@ msgstr "x Nalog za knjiženje knjižnih odobrenja troškova"
#: field:account.journal,type:0
#: field:account.move,type:0
#: field:account.move.reconcile,type:0
-#: xsl:account.transfer:0
msgid "Type"
msgstr "Tip"
@@ -1992,7 +2017,7 @@ msgstr " Početni datum"
#. module: account
#: wizard_view:account.analytic.account.journal.report,init:0
msgid "Analytic Journal Report"
-msgstr ""
+msgstr "Analitički izvještaj knjiženja"
#. module: account
#: model:ir.actions.act_window,name:account.action_invoice_tree3
@@ -2028,6 +2053,8 @@ msgid ""
"'draft' state and instead goes directly to the 'posted state' without any "
"manual validation."
msgstr ""
+"Označite ovo ako ne želite da nova knjiženja konta prolaze kroz stanje 'u "
+"izradi' nego da direktno idu u 'proknjiženo' stanje bez ručne validacije."
#. module: account
#: field:account.bank.statement.line,partner_id:0
@@ -2062,7 +2089,7 @@ msgstr "Trošak"
#. module: account
#: field:account.journal,invoice_sequence_id:0
msgid "Invoice Sequence"
-msgstr ""
+msgstr "Sekvenca fakture"
#. module: account
#: wizard_view:account.automatic.reconcile,init:0
@@ -2077,7 +2104,7 @@ msgstr "Proces fakturiranja kupcu"
#. module: account
#: rml:account.invoice:0
msgid "Fiscal Position Remark :"
-msgstr ""
+msgstr "Napomena za fiskalnu poziciju"
#. module: account
#: wizard_field:account.fiscalyear.close,init,period_id:0
@@ -2290,11 +2317,12 @@ msgstr "2"
#: wizard_view:account.chart,init:0
msgid "(If you do not select Fiscal year it will take all open fiscal years)"
msgstr ""
+"(ako ne odaberete fiskalnu godinu uzeti će sve otvorene fiskalne godine)"
#. module: account
#: help:account.invoice.tax,base_code_id:0
msgid "The account basis of the tax declaration."
-msgstr ""
+msgstr "Osnovni konto porezne prijave."
#. module: account
#: rml:account.analytic.account.journal:0
@@ -2306,13 +2334,13 @@ msgstr ""
#: selection:account.general.ledger.report,checktype,sortbydate:0
#: rml:account.journal.period.print:0
#: field:account.move,date:0
+#: wizard_field:account.move.line.reconcile,addendum,date_p:0
#: rml:account.overdue:0
#: wizard_field:account.subscription.generate,init,date:0
#: field:account.subscription.line,date:0
#: rml:account.tax.code.entries:0
#: rml:account.third_party_ledger:0
#: rml:account.third_party_ledger_other:0
-#: xsl:account.transfer:0
msgid "Date"
msgstr "Datum"
@@ -2369,12 +2397,12 @@ msgstr "Broj jamca"
#: model:ir.actions.wizard,name:account.wizard_automatic_reconcile
#: model:ir.ui.menu,name:account.menu_automatic_reconcile
msgid "Automatic reconciliation"
-msgstr ""
+msgstr "Automatsko izjednačenje"
#. module: account
#: view:account.bank.statement:0
msgid "Import Invoice"
-msgstr ""
+msgstr "Uvezi fakturu"
#. module: account
#: wizard_view:account.analytic.account.quantity_cost_ledger.report,init:0
@@ -2402,6 +2430,8 @@ msgid ""
"Set if the tax computation is based on the computation of child taxes rather "
"than on the total amount."
msgstr ""
+"Postaviti ako je izračun poreza baziran na izračunu podporeza a ne na "
+"ukupnom iznosu."
#. module: account
#: rml:account.central.journal:0
@@ -2414,6 +2444,8 @@ msgid ""
"If not applicable (computed through a Python code), the tax won't appear on "
"the invoice."
msgstr ""
+"Ukoliko nije izvedivo (računa se u Python kodu), porez se neće pojaviti na "
+"fakturi."
#. module: account
#: field:account.model,lines_id:0
@@ -2429,6 +2461,7 @@ msgstr "Završni datum"
#: view:account.bank.statement:0
#: field:account.move.reconcile,line_id:0
#: model:ir.actions.act_window,name:account.action_move_line_search
+#: model:ir.actions.act_window,name:account.action_move_line_select
#: model:ir.actions.act_window,name:account.action_move_line_tree1
#: model:ir.ui.menu,name:account.menu_action_move_line_search
msgid "Entry Lines"
@@ -2618,9 +2651,12 @@ msgstr "Nalog za plaćanje"
msgid ""
"Check this option if you want the user to reconcile entries in this account."
msgstr ""
+"Označite ovu opciju ako želite da korisnik izjednači unose u ovaj konto."
#. module: account
#: rml:account.analytic.account.journal:0
+#: wizard_view:account.invoice.pay,addendum:0
+#: wizard_view:account.move.line.reconcile,addendum:0
#: model:ir.ui.menu,name:account.next_id_40
#: model:process.node,name:account.process_node_analytic0
#: model:process.node,name:account.process_node_analyticcost0
@@ -2661,6 +2697,11 @@ msgid ""
"partners accounts (for debit/credit computations), closed for deprecated "
"accounts."
msgstr ""
+"Ovaj tip se koristi za difirencijaciju tipova sa posebnim efektima u Open "
+"ERP-u: pogled ne može imati unose, konsolidacije su konta koja imaju "
+"podkonta za više-kompanijske konsolidacije, dugovanja/potraživanja su za "
+"partnerska konta (za izračun duga/potraživanja), zatvorena su za konta koja "
+"izlaze iz upotrebe."
#. module: account
#: model:ir.ui.menu,name:account.menu_account_end_year_treatments
@@ -2692,7 +2733,7 @@ msgstr "Cijena"
#: rml:account.third_party_ledger:0
#: rml:account.third_party_ledger_other:0
msgid "-"
-msgstr ""
+msgstr "-"
#. module: account
#: rml:account.analytic.account.journal:0
@@ -2724,6 +2765,7 @@ msgid "Invoice Number"
msgstr "Broj fakture"
#. module: account
+#: wizard_field:account.analytic.account.balance.report,init,date2:0
#: field:account.period,date_stop:0
msgid "End of Period"
msgstr "Kraj Perioda"
@@ -2910,8 +2952,6 @@ msgstr "Puno ime konta"
#: rml:account.journal.period.print:0
#: rml:account.partner.balance:0
#: rml:account.tax.code.entries:0
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
#: rml:account.vat.declaration:0
msgid "1cm 27.7cm 20cm 27.7cm"
msgstr "1cm 27.7cm 20cm 27.7cm"
@@ -2930,7 +2970,7 @@ msgstr "Računovodstveni izvod"
#. module: account
#: rml:account.overdue:0
msgid "Document: Customer account statement"
-msgstr ""
+msgstr "Dokument: Izvještaj konta kupca"
#. module: account
#: view:product.product:0
@@ -2968,9 +3008,11 @@ msgstr "Stavke unosa"
#: wizard_view:account.move.line.reconcile,init_full:0
#: wizard_view:account.move.line.reconcile,init_partial:0
#: wizard_view:account.move.line.reconcile.select,init:0
+#: code:addons/account/wizard/wizard_reconcile_select.py:0
#: model:ir.ui.menu,name:account.next_id_20
#: model:process.node,name:account.process_node_reconciliation0
#: model:process.node,name:account.process_node_supplierreconciliation0
+#, python-format
msgid "Reconciliation"
msgstr "Usklađivanje"
@@ -3032,7 +3074,6 @@ msgstr "Stanje"
#. module: account
#: rml:account.invoice:0
-#: xsl:account.transfer:0
msgid "Document"
msgstr "Dokument"
@@ -3057,6 +3098,8 @@ msgid ""
"If this box is checked, the system will try to group the accounting lines "
"when generating them from invoices."
msgstr ""
+"Ukoliko je ovo polje označeno sistem će pokušati da grupira unose knjiženja "
+"kada ih generira iz faktura."
#. module: account
#: wizard_field:account.move.line.reconcile,init_full,trans_nbr:0
@@ -3080,6 +3123,8 @@ msgstr "Analitička knjiženja"
#. module: account
#: rml:account.general.ledger:0
+#: rml:account.third_party_ledger:0
+#: rml:account.third_party_ledger_other:0
msgid "Entry Label"
msgstr "Oznaka stavke"
@@ -3271,6 +3316,7 @@ msgid "Generate Fiscal Year Opening Entries"
msgstr "Generiraj stavke za otvaranje fiskalne godine"
#. module: account
+#: view:account.move.reconcile:0
#: model:ir.actions.wizard,name:account.wizard_reconcile
msgid "Reconcile Entries"
msgstr "Uskladi stavke"
@@ -3338,7 +3384,7 @@ msgstr "Saldo analitike"
#. module: account
#: view:account.move.line:0
msgid "Total debit"
-msgstr "Ukupno duguje"
+msgstr "Ukupan dug"
#. module: account
#: selection:account.analytic.account,state:0
@@ -3375,6 +3421,8 @@ msgid ""
"This account will be used instead of the default one as the receivable "
"account for the current partner"
msgstr ""
+"Ovaj konte će se koristiti umjesto podrazumijevanog kao konto potraživanja "
+"za trenutnog partnera"
#. module: account
#: selection:account.tax,applicable_type:0
@@ -3516,7 +3564,7 @@ msgstr "Donešeni saldo"
#. module: account
#: field:account.account,child_consol_ids:0
msgid "Consolidated Children"
-msgstr ""
+msgstr "Konsolidirani potomci"
#. module: account
#: wizard_field:account.account.balance.report,checktype,fiscalyear:0
@@ -3625,7 +3673,6 @@ msgstr ""
"partnera."
#. module: account
-#: wizard_field:account.invoice.pay,addendum,comment:0
#: wizard_field:account.invoice.pay,init,name:0
msgid "Entry Name"
msgstr "Naziv stavke"
@@ -3642,6 +3689,8 @@ msgid ""
"Check this box if you don't want any VAT related to this Tax Code to appear "
"on invoices"
msgstr ""
+"Označite ovo polje ako ne želite da se PDV vezan uz ovu poreznu šifru "
+"pojavljuje na fakturama."
#. module: account
#: field:account.account.type,sequence:0
@@ -3766,7 +3815,7 @@ msgstr "Fakture u pripremi"
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_tax_template
msgid "Fiscal Position Template Tax Mapping"
-msgstr ""
+msgstr "Mapiranje fiskalne pozicije na predložak poreza"
#. module: account
#: rml:account.invoice:0
@@ -3797,6 +3846,15 @@ msgid ""
" Bank statements\n"
" "
msgstr ""
+"Finansijski i računovodstveni modul koji pokriva:\n"
+" Glavno računovodstvo\n"
+" Troškovno / analitičko računovodstvo\n"
+" Računovodstvo trećih strana\n"
+" Upravljanje porezima\n"
+" Budžetiranje\n"
+" Ulazne i izlazne fakture\n"
+" Bankovne izvode\n"
+" "
#. module: account
#: field:account.journal,sequence_id:0
@@ -3817,7 +3875,7 @@ msgstr "Stavke plaćanja"
#. module: account
#: help:account.move.line,tax_code_id:0
msgid "The Account can either be a base tax code or tax code account."
-msgstr ""
+msgstr "Ovaj konto može biti ili konto poreske osnovice ili konto poreza."
#. module: account
#: help:account.automatic.reconcile,init,account_ids:0
@@ -3832,7 +3890,7 @@ msgstr ""
#: model:ir.actions.act_window,name:account.action_wizard_company_setup_form
#: view:wizard.company.setup:0
msgid "Overdue Payment Report Message"
-msgstr ""
+msgstr "Poruka izvještaja dospjelih dugovanja"
#. module: account
#: selection:account.tax,tax_group:0
@@ -3856,7 +3914,7 @@ msgstr "Kolone"
#. module: account
#: selection:account.general.ledger.report,checktype,sortbydate:0
msgid "Movement"
-msgstr ""
+msgstr "Knjiženje"
#. module: account
#: help:account.period,special:0
@@ -3869,6 +3927,8 @@ msgid ""
"This account will be used instead of the default one to value outgoing stock "
"for the current product"
msgstr ""
+"Ovaj konto će se koristiti umjesto podrazumijevanog za vrijednovanje "
+"izlaznih količina trenutnog proizvoda."
#. module: account
#: model:process.node,note:account.process_node_manually0
@@ -3892,7 +3952,7 @@ msgstr "Po razdoblju"
#. module: account
#: help:account.invoice,date_invoice:0
msgid "Keep empty to use the current date"
-msgstr ""
+msgstr "Ostaviti prazno da se koristi današnji datum"
#. module: account
#: rml:account.overdue:0
@@ -4405,6 +4465,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 ""
+"Polje sekvence koristi se da se poreske stavke poredaju od najniže sekvence "
+"ka višima. Redoslijed je bitan ukoliko imate porez sa više podporeza. U ovom "
+"slučaju, bitan je redosljed evaluacije."
#. module: account
#: view:account.tax:0
@@ -4455,7 +4518,7 @@ msgstr "Jeste sigurni da želite otvoriti ovu fakturu ?"
#. module: account
#: model:ir.actions.report.xml,name:account.account_3rdparty_ledger_other
msgid "Partner Other Ledger"
-msgstr ""
+msgstr "Druga knjiga partnera"
#. module: account
#: view:res.partner:0
@@ -4465,7 +4528,7 @@ msgstr "Dugovanje dobavljaču"
#. module: account
#: help:account.model.line,quantity:0
msgid "The optional quantity on entries"
-msgstr ""
+msgstr "Opcionalna količina na unosima"
#. module: account
#: rml:account.third_party_ledger:0
@@ -4758,6 +4821,9 @@ msgid ""
"new counterpart but will share the same counterpart. This is used in fiscal "
"year closing."
msgstr ""
+"Označite ovo polje da odredite da svaka unesena u ovu knjigu neće kreirati "
+"novu nego će koristiti istu protustavku. Ovo se koristi prilikom zatvaranja "
+"fiskalne godine."
#. module: account
#: selection:account.invoice,state:0
@@ -4955,6 +5021,7 @@ msgid "Invoice Lines"
msgstr "Retci fakture"
#. module: account
+#: wizard_field:account.analytic.account.balance.report,init,date1:0
#: field:account.period,date_start:0
msgid "Start of Period"
msgstr "Početak Perioda"
@@ -5223,7 +5290,7 @@ msgstr "Predznak u izvješćima"
#. module: account
#: help:account.move.line,currency_id:0
msgid "The optional other currency if it is a multi-currency entry."
-msgstr ""
+msgstr "Opcionalna druga valuta ako je u pitanju viševalutni unos."
#. module: account
#: view:account.invoice:0
@@ -5255,7 +5322,7 @@ msgstr "Sve stavke konta"
#. module: account
#: help:account.invoice.tax,tax_code_id:0
msgid "The tax basis of the tax declaration."
-msgstr ""
+msgstr "Poreska osnovica za poreznu deklaraciju."
#. module: account
#: wizard_view:account.account.balance.report,checktype:0
@@ -5349,8 +5416,6 @@ msgstr "Proces fakturiranja dobavljača"
#: rml:account.journal.period.print:0
#: rml:account.partner.balance:0
#: rml:account.tax.code.entries:0
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
#: rml:account.vat.declaration:0
msgid "Page"
msgstr "Stranica"
@@ -5395,6 +5460,8 @@ msgid ""
"amount.If the tax account is base tax code, this field "
"will contain the basic amount(without tax)."
msgstr ""
+"Ako je ovaj konto konto poreza, ovo polje sadrži oporezovani iznos. Ako je "
+"polje konto osnovice, ovo polje sadrži samo iznos osnovice (bez poreza)."
#. module: account
#: view:account.bank.statement:0
@@ -5411,7 +5478,7 @@ msgstr "Račun prihoda ili troškova vezan za odabrani proizvod."
#. module: account
#: field:account.tax,type_tax_use:0
msgid "Tax Application"
-msgstr ""
+msgstr "Porezna prijava"
#. module: account
#: model:ir.actions.act_window,name:account.action_subscription_form
@@ -5432,7 +5499,6 @@ msgstr "Broj perioda"
#. module: account
#: wizard_field:account.analytic.account.analytic.check.report,init,date2:0
-#: wizard_field:account.analytic.account.balance.report,init,date2:0
#: wizard_field:account.analytic.account.cost_ledger.report,init,date2:0
#: wizard_field:account.analytic.account.inverted.balance.report,init,date2:0
#: wizard_field:account.analytic.account.journal.report,init,date2:0
@@ -5505,11 +5571,13 @@ msgid ""
"Invalid period ! Some periods overlap or the date period is not in the scope "
"of the fiscal year. "
msgstr ""
+"Neispravan period ! Došlo je do preklapanja perioda ili period nije u sklopu "
+"fiskalne godine. "
#. module: account
#: help:account.journal,invoice_sequence_id:0
msgid "The sequence used for invoice numbers in this journal."
-msgstr ""
+msgstr "Sekvence korištene za brojeve faktura u ovoj knjizi."
#. module: account
#: view:account.account:0
@@ -5624,7 +5692,6 @@ msgstr "Fiskalna godina za zatvaranje"
#. module: account
#: wizard_field:account.aged.trial.balance,init,date1:0
#: wizard_field:account.analytic.account.analytic.check.report,init,date1:0
-#: wizard_field:account.analytic.account.balance.report,init,date1:0
#: wizard_field:account.analytic.account.cost_ledger.report,init,date1:0
#: wizard_field:account.analytic.account.inverted.balance.report,init,date1:0
#: wizard_field:account.analytic.account.journal.report,init,date1:0
@@ -5670,11 +5737,13 @@ msgid ""
"This account will be used instead of the default one to value incoming stock "
"for the current product"
msgstr ""
+"Ovaj konto će se koristiti umjesto podrazumijevanog za vrijednost ulazne "
+"količine za trenutni proizvod."
#. module: account
#: field:account.tax,child_ids:0
msgid "Child Tax Accounts"
-msgstr ""
+msgstr "Konta potporeza."
#. module: account
#: field:account.account,parent_right:0
@@ -5702,6 +5771,8 @@ msgid ""
"This account will be used instead of the default one as the payable account "
"for the current partner"
msgstr ""
+"Ovaj konto se koristi umjesto podrazumijevanog kao konto dugovanja prema "
+"trenutnom partneru."
#. module: account
#: field:account.tax.code,code:0
@@ -5954,6 +6025,8 @@ msgid ""
"Check this if the price you use on the product and invoices includes this "
"tax."
msgstr ""
+"Odaberite ovo ako cijena koju koristite na proizvodu i računima uključuje "
+"ovaj porez."
#. module: account
#: field:account.journal.column,name:0
@@ -5987,30 +6060,30 @@ msgstr "Izračunaj datume stavaka"
#. module: account
#: view:board.board:0
msgid "Analytic accounts to close"
-msgstr ""
+msgstr "Analitička konta koja će biti zatvorena"
#. module: account
#: view:board.board:0
msgid "Draft invoices"
-msgstr ""
+msgstr "Predračuni"
#. module: account
#: model:ir.actions.act_window,name:account.open_board_account
#: model:ir.ui.menu,name:account.menu_board_account
msgid "Accounting Dashboard"
-msgstr ""
+msgstr "Računovodstvena kontrolna tabla"
#. module: account
#: view:board.board:0
#: model:ir.actions.act_window,name:account.act_my_account
msgid "Accounts to invoice"
-msgstr ""
+msgstr "Konta za fakturisanje"
#. module: account
#: view:board.board:0
#: model:ir.actions.act_window,name:account.action_account_analytic_line_to_invoice
msgid "Costs to invoice"
-msgstr ""
+msgstr "Troškovi za fakturisanje"
#. module: account
#: view:board.board:0
@@ -6025,84 +6098,84 @@ msgstr "Tabla za računovođu"
#. module: account
#: model:ir.actions.act_window,name:account.action_aged_income
msgid "Income Accounts"
-msgstr ""
+msgstr "Konta prihoda"
#. module: account
#: view:board.board:0
msgid "My indicators"
-msgstr ""
+msgstr "Moji indikatori"
#. module: account
#: view:board.board:0
msgid "Account Board"
-msgstr ""
+msgstr "Tabla konta"
#. module: account
#: view:board.board:0
msgid "Aged income"
-msgstr ""
+msgstr "Zastarjeli prihodi"
#. module: account
#: wizard_field:account.balance.account.balance.report,init,show_columns:0
msgid "Show Debit/Credit Information"
-msgstr ""
+msgstr "Prikaži duguje/potražuje podatke"
#. module: account
#: selection:account.balance.account.balance.report,init,account_choice:0
msgid "All accounts"
-msgstr ""
+msgstr "Sva konta"
#. module: account
#: wizard_field:account.balance.account.balance.report,init,period_manner:0
msgid "Entries Selection Based on"
-msgstr ""
+msgstr "Odabir stavki zasnovan na"
#. module: account
#: wizard_view:account.balance.account.balance.report,backtoinit:0
#: wizard_view:account.balance.account.balance.report,zero_years:0
msgid "Notification"
-msgstr ""
+msgstr "Obavijest"
#. module: account
#: selection:account.balance.account.balance.report,init,period_manner:0
msgid "Financial Period"
-msgstr ""
+msgstr "Financijski period"
#. module: account
#: model:ir.actions.report.xml,name:account.account_account_balance
#: model:ir.actions.report.xml,name:account.account_account_balance_landscape
msgid "Account balance"
-msgstr ""
+msgstr "Saldo konta"
#. module: account
#: wizard_view:account.balance.account.balance.report,init:0
msgid "Select Period(s)"
-msgstr ""
+msgstr "Odaberite periode"
#. module: account
#: selection:account.balance.account.balance.report,init,compare_pattern:0
msgid "Percentage"
-msgstr ""
+msgstr "Postotak"
#. module: account
#: wizard_field:account.balance.account.balance.report,init,compare_pattern:0
msgid "Compare Selected Years In Terms Of"
-msgstr ""
+msgstr "Usporedi odabrane godine pod slijedećim uvjetima:"
#. module: account
#: wizard_view:account.balance.account.balance.report,init:0
msgid "Select Fiscal Year(s)(Maximum Three Years)"
-msgstr ""
+msgstr "Odaberite fiskalne godine (Maksimalno 3 godine)"
#. module: account
#: wizard_field:account.balance.account.balance.report,init,select_account:0
msgid "Select Reference Account(for % comparision)"
-msgstr ""
+msgstr "Odaberite referentna konta (za poređenje u %)"
#. module: account
#: model:ir.actions.wizard,name:account.wizard_account_balance_report
msgid "Account balance-Compare Years"
-msgstr ""
+msgstr "Saldo konta - poređenje godina"
#. module: account
#: model:ir.module.module,description:account.module_meta_information
@@ -6125,68 +6198,84 @@ msgid ""
" 5. You have an option to print the desired report in Landscape format.\n"
" "
msgstr ""
+"Modul za računovodstvene bilanse je dodatna funkcionalnost modula "
+"finansijskog upravljanja.\n"
+"\n"
+" Ovaj modul nudi slijedeće mogućnosti za printanje bilansi.\n"
+"\n"
+" 1. Možete porediti bilanse različitih godina.\n"
+"\n"
+" 2. Možete odabrati poređenje po novcu ili procentualno.\n"
+"\n"
+" 3. Možete odabrati referentna konta za procentualno poređenje za "
+"određenje godine.\n"
+"\n"
+" 4. Možete odabrati periode stvarnog datuma ili periode datuma unosa.\n"
+"\n"
+" 5. Imate mogućnost ispisa željenog izvještaja u položenom formatu.\n"
+" "
#. module: account
#: wizard_view:account.balance.account.balance.report,backtoinit:0
msgid "You have to select 'Landscape' option. Please Check it."
-msgstr ""
+msgstr "Morate odabrati opciju 'Položeno'. Molimo označite je."
#. module: account
#: wizard_field:account.balance.account.balance.report,init,landscape:0
msgid "Show Report in Landscape Form"
-msgstr ""
+msgstr "Prikaži izvješće u položenoj formi"
#. module: account
#: rml:account.account.balance.landscape:0
#: rml:account.balance.account.balance:0
msgid "Total :"
-msgstr ""
+msgstr "Ukupno :"
#. module: account
#: wizard_field:account.balance.account.balance.report,init,format_perc:0
msgid "Show Comparision in %"
-msgstr ""
+msgstr "Prikaži usporedbu u %"
#. module: account
-#: wizard_view:account.balance.account.balance.report,init:0
+#: wizard_view:account.analytic.account.balance.report,init:0
msgid "Select Period"
-msgstr ""
+msgstr "Odaberite Period"
#. module: account
#: wizard_view:account.balance.account.balance.report,init:0
msgid "Report Options"
-msgstr ""
+msgstr "Postavke izvješća"
#. module: account
#: selection:account.balance.account.balance.report,init,compare_pattern:0
msgid "Don't Compare"
-msgstr ""
+msgstr "Ne uspoređuj"
#. module: account
#: wizard_field:account.balance.account.balance.report,init,account_choice:0
msgid "Show Accounts"
-msgstr ""
+msgstr "Prikaži konta"
#. module: account
#: wizard_view:account.balance.account.balance.report,backtoinit:0
msgid "1. You have selected more than 3 years in any case."
-msgstr ""
+msgstr "1. Odabrali ste više od 3 godine u svakom slučaju."
#. module: account
#: model:ir.module.module,shortdesc:account.module_meta_information
msgid "Accounting and financial management-Compare Accounts"
-msgstr ""
+msgstr "Upravljanje računovodstvom i finansijama - Usporedi konta"
#. module: account
#: rml:account.account.balance.landscape:0
#: rml:account.balance.account.balance:0
msgid "Year :"
-msgstr ""
+msgstr "Godina :"
#. module: account
#: wizard_view:account.balance.account.balance.report,backtoinit:0
msgid "You can select maximum 3 years. Please check again."
-msgstr ""
+msgstr "Možete odabrati maksimalno 3 godine. Molimo pokušajte ponovno."
#. module: account
#: wizard_view:account.balance.account.balance.report,backtoinit:0
@@ -6194,6 +6283,8 @@ msgid ""
"3. You have selected 'Percentage' option with more than 2 years, but you "
"have not selected landscape format."
msgstr ""
+"3. Izabrali ste opciju \"Postotak\" sa više od dvije godine, ali niste "
+"odabrali \"Položeni\" format."
#. module: account
#: wizard_view:account.balance.account.balance.report,backtoinit:0
@@ -6205,12 +6296,12 @@ msgstr ""
#. module: account
#: help:account.balance.account.balance.report,init,select_account:0
msgid "Keep empty for comparision to its parent"
-msgstr ""
+msgstr "Ostavite prazno za usporedbu sa roditeljem"
#. module: account
#: selection:account.balance.account.balance.report,init,period_manner:0
msgid "Creation Date"
-msgstr ""
+msgstr "Datum kreiranja"
#. module: account
#: wizard_view:account.balance.account.balance.report,backtoinit:0
@@ -6218,6 +6309,7 @@ msgid ""
"2. You have not selected 'Percentage' option, but you have selected more "
"than 2 years."
msgstr ""
+"2. Niste odabrali opciju 'Postotak', ali ste odabrali više od 2 godine."
#. module: account
#: wizard_view:account.balance.account.balance.report,zero_years:0
@@ -6226,26 +6318,29 @@ msgid ""
"credit/debit columns and % option.This can lead contents to be printed out "
"of the paper.Please try again."
msgstr ""
+"Postoji mogućnost da ste odabrali postavke usporedbe sa više od 1 godine sa "
+"stupcima duguje/potražuje i % opcijom. Ovo može biti uzrok ispisa van "
+"papira. Molimo pokušajte ponovno."
#. module: account
#: wizard_view:account.balance.account.balance.report,zero_years:0
msgid "You have to select at least 1 Fiscal Year. Try again."
-msgstr ""
+msgstr "Morate odabrati bar 1 fiskalnu godinu. Pokušajte ponovno."
#. module: account
#: wizard_view:account.balance.account.balance.report,init:0
msgid "Customize Report"
-msgstr ""
+msgstr "Prilagodite izvješće"
#. module: account
#: field:report.aged.receivable,name:0
msgid "Month Range"
-msgstr ""
+msgstr "Raspon mjeseci"
#. module: account
#: model:ir.actions.act_window,name:report_account.action_view_created_invoice_dashboard
msgid "Invoices Created Within Past 15 Days"
-msgstr ""
+msgstr "Fakture unesene u zadnjih 15 dana"
#. module: account
#: model:ir.model,name:report_account.model_report_invoice_created
@@ -6255,61 +6350,65 @@ msgstr "Izvještaj o fakturama unesenim u zadnjih 15 dana"
#. module: account
#: view:report.invoice.created:0
msgid "Total Amount"
-msgstr ""
+msgstr "Ukupan iznos"
#. module: account
#: view:report.account.receivable:0
msgid "Accounts by type"
-msgstr ""
+msgstr "Konta po vrstama"
#. module: account
#: model:ir.model,name:report_account.model_report_aged_receivable
msgid "Aged Receivable Till Today"
-msgstr ""
+msgstr "Zastarjela potraživanja do danas"
#. module: account
#: model:ir.model,name:report_account.model_report_account_receivable
msgid "Receivable accounts"
-msgstr ""
+msgstr "Konta potraživanja"
#. module: account
#: field:temp.range,name:0
msgid "Range"
-msgstr ""
+msgstr "Raspon"
#. module: account
#: model:ir.module.module,description:report_account.module_meta_information
msgid "A module that adds new reports based on the account module."
msgstr ""
+"Modul koji dodaje nove izvještaje baziran na računovodstvenom modulu."
#. module: account
#: model:ir.module.module,shortdesc:report_account.module_meta_information
msgid "Account Reporting - Reporting"
-msgstr ""
+msgstr "Računovodstveno izvještavanje - izvještavanje."
#. module: account
#: model:ir.actions.act_window,name:report_account.action_account_receivable_graph
#: model:ir.ui.menu,name:report_account.menu_account_receivable_graph
msgid "Balance by Type of Account"
-msgstr ""
+msgstr "Saldo po vrsti konta"
#. module: account
#: field:report.account.receivable,name:0
msgid "Week of Year"
-msgstr ""
+msgstr "Sedmica u godini"
#. module: account
#: field:report.invoice.created,create_date:0
msgid "Create Date"
-msgstr ""
+msgstr "Datum unosa"
#. module: account
#: model:ir.actions.act_window,name:report_account.action_aged_receivable_graph
#: view:report.aged.receivable:0
msgid "Aged Receivable"
-msgstr ""
+msgstr "Zastarjela potraživanja"
#. module: account
#: view:report.invoice.created:0
msgid "Untaxed Amount"
-msgstr ""
+msgstr "Neoporezovan iznos"
+
+#~ msgid "account.config.wizard"
+#~ msgstr "account.config.wizard"
diff --git a/addons/account/i18n/pl.po b/addons/account/i18n/pl.po
index c2ba8b00b14..7a4443baa69 100644
--- a/addons/account/i18n/pl.po
+++ b/addons/account/i18n/pl.po
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 5.0.0\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-07-21 07:21+0000\n"
+"PO-Revision-Date: 2010-08-01 09:31+0000\n"
"Last-Translator: Grzegorz Grzelak (Cirrus.pl) \n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-07-22 03:56+0000\n"
+"X-Launchpad-Export-Date: 2010-08-02 03:49+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account
@@ -24,7 +24,7 @@ msgstr "Nazwa wewnętrzna"
#. module: account
#: view:account.tax.code:0
msgid "Account Tax Code"
-msgstr "Kod podatkowy konta"
+msgstr "Rejestr podatkowy"
#. module: account
#: model:ir.actions.act_window,name:account.action_invoice_tree9
@@ -96,7 +96,7 @@ msgstr "Zapisy nieuzgodnione"
#: field:account.tax,base_code_id:0
#: field:account.tax.template,base_code_id:0
msgid "Base Code"
-msgstr "Kod bazowy"
+msgstr "Rejestr podstawy"
#. module: account
#: view:account.account:0
@@ -130,7 +130,7 @@ msgstr "Pozostało"
#: field:account.tax.template,base_sign:0
#: field:account.tax.template,ref_base_sign:0
msgid "Base Code Sign"
-msgstr "Znak dla podstawy"
+msgstr "Znak dla rejestru podstawy"
#. module: account
#: model:ir.actions.wizard,name:account.wizard_unreconcile_select
@@ -516,7 +516,7 @@ msgstr "Statystyka zapisów analitycznych"
#: 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 "Szablony kodów podatkowych"
+msgstr "Szablony rejestrów podatkowych"
#. module: account
#: view:account.invoice:0
@@ -559,7 +559,7 @@ msgstr "Włącz do wartości bazowej"
#: field:account.tax,ref_base_code_id:0
#: field:account.tax.template,ref_base_code_id:0
msgid "Refund Base Code"
-msgstr "Podstawa zwrotu"
+msgstr "Rejestr podstawy dla korekt"
#. module: account
#: view:account.invoice.line:0
@@ -722,7 +722,7 @@ msgstr "Wybierz okres do analizy"
#: field:account.tax.template,ref_tax_sign:0
#: field:account.tax.template,tax_sign:0
msgid "Tax Code Sign"
-msgstr "Znak kodu podatkowego"
+msgstr "Znak dla rejestru podatku"
#. module: account
#: help:res.partner,credit:0
@@ -753,7 +753,7 @@ msgstr "Nazwa pola"
#: field:account.tax.code,sign:0
#: field:account.tax.code.template,sign:0
msgid "Sign for parent"
-msgstr "Znak dla nadrzędnego"
+msgstr "Znak do nadrzędnego"
#. module: account
#: field:account.fiscalyear,end_journal_period_id:0
@@ -963,7 +963,7 @@ msgstr "Data końcowa"
#. module: account
#: field:account.invoice.tax,base_amount:0
msgid "Base Code Amount"
-msgstr "Kwota kodu podstawowego"
+msgstr "Kwota do rejestru podstawy"
#. module: account
#: help:account.journal,user_id:0
@@ -1054,7 +1054,7 @@ msgstr "Podrzędne"
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_tax
msgid "Fiscal Position Taxes Mapping"
-msgstr "Mapowanie podatków obszarów podatkowych"
+msgstr "Mapowanie podatków wg obszarów podatkowych"
#. module: account
#: model:ir.actions.act_window,name:account.action_invoice_tree2_new
@@ -1119,7 +1119,7 @@ msgstr "Wylicz kod dla cen z podatkiem"
#: 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 "Rejestr podatkowy"
+msgstr "Rejestry podatkowe"
#. module: account
#: field:account.fiscal.position.template,chart_template_id:0
@@ -1542,7 +1542,7 @@ msgstr "Tel. :"
#. module: account
#: field:account.invoice.tax,tax_amount:0
msgid "Tax Code Amount"
-msgstr "Kwota podatku"
+msgstr "Kwota do rejestru podatku"
#. module: account
#: selection:account.account.type,sign:0
@@ -1911,7 +1911,7 @@ msgstr "Kwota bez podatku"
#: field:account.tax,account_collected_id:0
#: field:account.tax.template,account_collected_id:0
msgid "Invoice Tax Account"
-msgstr "Konto podatkowe faktury"
+msgstr "Konto podatku dla faktur"
#. module: account
#: view:account.move.line:0
@@ -2184,7 +2184,7 @@ msgstr "Komunikat przeterminowanych płatności"
#: model:ir.actions.act_window,name:account.action_tax_code_tree
#: model:ir.ui.menu,name:account.menu_action_tax_code_tree
msgid "Chart of Taxes"
-msgstr "Schemat podatków"
+msgstr "Struktura ewidencji podatkowej"
#. module: account
#: field:account.payment.term.line,value_amount:0
@@ -2323,7 +2323,7 @@ msgstr ""
#. module: account
#: help:account.invoice.tax,base_code_id:0
msgid "The account basis of the tax declaration."
-msgstr "Konto podstawy do deklaracji podatkowej"
+msgstr "Rejestr podstawy podatku"
#. module: account
#: rml:account.analytic.account.journal:0
@@ -2413,7 +2413,7 @@ msgstr "i dzienniki"
#. module: account
#: view:account.tax:0
msgid "Account Tax"
-msgstr "Konto podatkowe"
+msgstr "Podatki"
#. module: account
#: field:account.analytic.line,move_id:0
@@ -2603,7 +2603,7 @@ msgstr "Nazwa typu konta"
#: help:account.tax.template,ref_tax_code_id:0
#: help:account.tax.template,tax_code_id:0
msgid "Use this code for the VAT declaration."
-msgstr "Użyj tego kodu do deklaracji VAT."
+msgstr "Użyj tego rejestru do deklaracji VAT."
#. module: account
#: field:account.move.line,blocked:0
@@ -2683,7 +2683,7 @@ msgstr "Komunikat przeterminowanej płatności"
#. module: account
#: model:ir.model,name:account.model_account_tax_code_template
msgid "Tax Code Template"
-msgstr "Szablon kodu podatkowego"
+msgstr "Szablon rejestru podatkowego"
#. module: account
#: rml:account.partner.balance:0
@@ -2933,7 +2933,7 @@ msgstr "Pomiń stan 'Projekt' dla tworzonych zapisów"
#: field:account.invoice.tax,account_id:0
#: field:account.move.line,tax_code_id:0
msgid "Tax Account"
-msgstr "Konto Podatkowe"
+msgstr "Konto/rejestr podatkowy"
#. module: account
#: model:process.transition,note:account.process_transition_statemententries0
@@ -3029,7 +3029,7 @@ msgstr "Centralizacja"
#: field:account.tax.template,tax_code_id:0
#: model:ir.model,name:account.model_account_tax_code
msgid "Tax Code"
-msgstr "Kod podatku"
+msgstr "Rejestr podatku"
#. module: account
#: rml:account.analytic.account.journal:0
@@ -3353,7 +3353,7 @@ msgstr "30 dni od końca miesiąca"
#. module: account
#: field:account.chart.template,tax_code_root_id:0
msgid "Root Tax Code"
-msgstr "Główny kod podatkowy"
+msgstr "Główny rejestr podatkowy"
#. module: account
#: constraint:account.invoice:0
@@ -3375,7 +3375,7 @@ msgstr "Zapis"
#: field:account.fiscal.position.tax,tax_src_id:0
#: field:account.fiscal.position.tax.template,tax_src_id:0
msgid "Tax Source"
-msgstr "Źródło podatku"
+msgstr "Podatek źródłowy"
#. module: account
#: model:ir.actions.report.xml,name:account.account_analytic_account_balance
@@ -3516,7 +3516,7 @@ msgstr "Wartość wyrażona w drugiej walucie, jeśli zapis jest wielowalutowy."
#: field:account.tax,parent_id:0
#: field:account.tax.template,parent_id:0
msgid "Parent Tax Account"
-msgstr "Nadrzędne konto podatkowe"
+msgstr "Podatek nadrzędny"
#. module: account
#: field:account.account,user_type:0
@@ -3689,8 +3689,8 @@ msgid ""
"Check this box if you don't want any VAT related to this Tax Code to appear "
"on invoices"
msgstr ""
-"Zaznacz tę opcję, jeśli nie chcesz, aby jakikolwiek VAT związany z tym kodem "
-"podatkowym pojawił się na fakturach."
+"Zaznacz tę opcję, jeśli nie chcesz, aby jakikolwiek VAT związany z tym "
+"rejestrem podatkowym pojawił się na fakturach."
#. module: account
#: field:account.account.type,sequence:0
@@ -3815,7 +3815,7 @@ msgstr "Projekty faktur"
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_tax_template
msgid "Fiscal Position Template Tax Mapping"
-msgstr "Mapowanie szablonów podatków obszarów podatkowych"
+msgstr "Mapowanie podatków wg szablonów obszarów podatkowych"
#. module: account
#: rml:account.invoice:0
@@ -3875,7 +3875,7 @@ msgstr "Zapisy płatności"
#. module: account
#: help:account.move.line,tax_code_id:0
msgid "The Account can either be a base tax code or tax code account."
-msgstr "Konto musi być dla podstawy lub podatku."
+msgstr "To może być rejestr podatku lub podstawy podatku."
#. module: account
#: help:account.automatic.reconcile,init,account_ids:0
@@ -4080,13 +4080,13 @@ msgstr ""
#: field:account.tax,account_paid_id:0
#: field:account.tax.template,account_paid_id:0
msgid "Refund Tax Account"
-msgstr "Konto zwrotów podatku"
+msgstr "Konto podatku dla korekt"
#. module: account
#: field:account.tax.code,child_ids:0
#: field:account.tax.code.template,child_ids:0
msgid "Child Codes"
-msgstr "Kody podrzędne"
+msgstr "Rejestry podrzędne"
#. module: account
#: field:account.invoice,move_name:0
@@ -4102,7 +4102,7 @@ msgstr "Pozycje wyciągu"
#. module: account
#: field:account.move.line,amount_taxed:0
msgid "Taxed Amount"
-msgstr "Kwota opodatkowana"
+msgstr ""
#. module: account
#: field:account.invoice.line,price_subtotal:0
@@ -4468,16 +4468,12 @@ 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 ""
-"Pole numeracji jest stosowane do porządkowania pozycji podatków od numeru "
-"najniższego do najwyższego. Kolejność jest istotna jeśli są podatki z "
-"kilkoma podatkami podrzędnymi. W takim przypadku ważna jest kolejność "
-"obliczania."
#. module: account
#: view:account.tax:0
#: view:account.tax.template:0
msgid "Tax Declaration"
-msgstr "Deklaracja podatkowa"
+msgstr "Rejestry podatkowe"
#. module: account
#: model:process.transition,name:account.process_transition_filestatement0
@@ -4497,7 +4493,7 @@ msgstr "Pozycja modelu zapisu"
#. module: account
#: view:account.tax.template:0
msgid "Account Tax Template"
-msgstr "Szablon konta podatkowego"
+msgstr "Szablon podatku"
#. module: account
#: help:account.model,name:0
@@ -5044,12 +5040,12 @@ msgstr "Utwórz zapisy"
#: field:account.tax,ref_tax_code_id:0
#: field:account.tax.template,ref_tax_code_id:0
msgid "Refund Tax Code"
-msgstr "Kod zwrotu podatku"
+msgstr "Rejestr podatku w korektach"
#. module: account
#: field:account.invoice.tax,name:0
msgid "Tax Description"
-msgstr "Opis podatku"
+msgstr "Podatek"
#. module: account
#: help:account.invoice,move_id:0
@@ -5213,7 +5209,7 @@ msgstr "Dane konta"
#. module: account
#: view:account.tax.code.template:0
msgid "Account Tax Code Template"
-msgstr "Szablon kodu konta podatkowego"
+msgstr "Szablon rejestru konta podatkowego"
#. module: account
#: view:account.subscription:0
@@ -5274,7 +5270,7 @@ msgstr "Potwierdzenie gotówki"
#: field:account.fiscal.position.tax,tax_dest_id:0
#: field:account.fiscal.position.tax.template,tax_dest_id:0
msgid "Replacement Tax"
-msgstr "Podatek zamienny"
+msgstr "Podatek docelowy"
#. module: account
#: model:process.transition,note:account.process_transition_invoicemanually0
@@ -5326,7 +5322,7 @@ msgstr "Wszystkie zapisy konta"
#. module: account
#: help:account.invoice.tax,tax_code_id:0
msgid "The tax basis of the tax declaration."
-msgstr "Podatek bazowy deklaracji podatkowej"
+msgstr "Rejestr podstawy podatku do ewidencji podatkowej."
#. module: account
#: wizard_view:account.account.balance.report,checktype:0
@@ -5464,9 +5460,9 @@ msgid ""
"amount.If the tax account is base tax code, this field "
"will contain the basic amount(without tax)."
msgstr ""
-"Jeśli konto podatkowe jest kontem podatku, to pole będzie zawierało kwotę "
-"podatku. Jeśli konto podatkowe jest kontem podstawy, to pole zawiera wartość "
-"bazową (bez podatku)."
+"Jeśli konto/rejestr podatkowy jest rejestrem podatku, to pole będzie "
+"zawierało kwotę podatku. Jeśli konto/rejestr podatkowy jest rejestrem "
+"podstawy, to pole zawiera wartość bazową (bez podatku)."
#. module: account
#: view:account.bank.statement:0
@@ -5676,7 +5672,7 @@ msgstr "Zapisy otwartych dzienników analitycznych"
#. module: account
#: view:account.invoice.tax:0
msgid "Manual Invoice Taxes"
-msgstr "Podatki ręcznych faktur"
+msgstr "Ręczne podatki faktur"
#. module: account
#: field:account.model.line,date:0
@@ -5748,7 +5744,7 @@ msgstr ""
#. module: account
#: field:account.tax,child_ids:0
msgid "Child Tax Accounts"
-msgstr "Konta podatków podrzędnych"
+msgstr "Podatki podrzędne"
#. module: account
#: field:account.account,parent_right:0
@@ -5932,7 +5928,7 @@ msgstr "Faktura zapłacona przy uzgadnianiu"
#: field:account.tax,python_compute_inv:0
#: field:account.tax.template,python_compute_inv:0
msgid "Python Code (reverse)"
-msgstr ""
+msgstr "Kod Pythona (reverse)"
#. module: account
#: model:ir.module.module,shortdesc:account.module_meta_information
diff --git a/addons/account/installer.py b/addons/account/installer.py
index 4dd01f9ec8b..cd613f7a6be 100644
--- a/addons/account/installer.py
+++ b/addons/account/installer.py
@@ -81,7 +81,7 @@ class account_installer(osv.osv_memory):
'bank_accounts_id': fields.one2many('account.bank.accounts.wizard', 'bank_account_id', 'Bank Accounts',required=True),
'sale_tax':fields.float('Sale Tax(%)'),
'purchase_tax':fields.float('Purchase Tax(%)')
- }
+ }
_defaults = {
'date_start': lambda *a: time.strftime('%Y-01-01'),
'date_stop': lambda *a: time.strftime('%Y-12-31'),
@@ -90,7 +90,7 @@ class account_installer(osv.osv_memory):
'purchase_tax':lambda *a:0.0,
#'charts':'configurable',
'bank_accounts_id':_get_default_accounts
- }
+ }
def on_change_tax(self, cr, uid, id, tax):
return{'value':{'purchase_tax':tax}}
@@ -115,6 +115,7 @@ class account_installer(osv.osv_memory):
obj_acc_template = self.pool.get('account.account.template')
obj_fiscal_position_template = self.pool.get('account.fiscal.position.template')
obj_fiscal_position = self.pool.get('account.fiscal.position')
+ data_pool = self.pool.get('ir.model.data')
company_id = self.pool.get('res.users').browse(cr, uid, [uid], context)[0].company_id
seq_journal = True
@@ -298,8 +299,8 @@ class account_installer(osv.osv_memory):
# Creating Journals Sales and Purchase
vals_journal={}
- data_id = data_pool.search(cr, uid, [('model','=','account.journal.view'), ('name','=','account_sp_journal_view')])
- data = data_pool.browse(cr, uid, data_id[0])
+ data_id = mod_obj.search(cr, uid, [('model','=','account.journal.view'), ('name','=','account_sp_journal_view')])
+ data = mod_obj.browse(cr, uid, data_id[0])
view_id = data.res_id
seq_id = obj_sequence.search(cr,uid,[('name','=','Account Journal')])[0]
diff --git a/addons/account/invoice.py b/addons/account/invoice.py
index b15c8667972..1816f4c31bf 100644
--- a/addons/account/invoice.py
+++ b/addons/account/invoice.py
@@ -231,8 +231,8 @@ class account_invoice(osv.osv):
('in_refund','Supplier Refund'),
],'Type', readonly=True, select=True, change_default=True),
- 'number': fields.related('move_id','name', type='char', readonly=True, size=64, relation='account.move', store=True, string='Number'),
- #'number': fields.char('Invoice Number', size=32, readonly=True, help="Unique number of the invoice, computed automatically when the invoice is created."),
+# 'number': fields.related('move_id','name', type='char', readonly=True, size=64, relation='account.move', store=True, string='Number'),
+ 'number': fields.char('Invoice Number', size=32, readonly=True, help="Unique number of the invoice, computed automatically when the invoice is created."),
'reference': fields.char('Invoice Reference', size=64, help="The partner reference of this invoice."),
'reference_type': fields.selection(_get_reference_type, 'Reference Type',
required=True, readonly=True, states={'draft':[('readonly',False)]}),
@@ -769,7 +769,7 @@ class account_invoice(osv.osv):
cur_obj = self.pool.get('res.currency')
context = {}
for inv in self.browse(cr, uid, ids):
- if not inv.journal_id.sequence_id:
+ if not inv.journal_id.invoice_sequence_id:
raise osv.except_osv(_('Error !'), _('Please define sequence on invoice journal'))
if not inv.invoice_line:
raise osv.except_osv(_('No Invoice Lines !'), _('Please create some invoice lines.'))
@@ -927,35 +927,45 @@ class account_invoice(osv.osv):
}
def action_number(self, cr, uid, ids, *args):
- #TODO: not correct fix but required a frech values before reading it.
- self.write(cr, uid, ids, {})
+# #TODO: not correct fix but required a frech values before reading it.
+# self.write(cr, uid, ids, {})
+#
+ cr.execute('SELECT id, type, number, move_id, reference ' \
+ 'FROM account_invoice ' \
+ 'WHERE id IN ('+','.join(map(str,ids))+')')
+ obj_inv = self.browse(cr, uid, ids)[0]
- for obj_inv in self.browse(cr, uid, ids):
- id = obj_inv.id
- invtype = obj_inv.type
- number = obj_inv.number
- move_id = obj_inv.move_id and obj_inv.move_id.id or False
- reference = obj_inv.reference or ''
-
- if invtype in ('in_invoice', 'in_refund'):
- ref = reference
- else:
- ref = self._convert_ref(cr, uid, number)
-
- cr.execute('UPDATE account_move SET ref=%s ' \
- 'WHERE id=%s AND (ref is null OR ref = \'\')',
- (ref, move_id))
- cr.execute('UPDATE account_move_line SET ref=%s ' \
- 'WHERE move_id=%s AND (ref is null OR ref = \'\')',
- (ref, move_id))
- cr.execute('UPDATE account_analytic_line SET ref=%s ' \
- 'FROM account_move_line ' \
- 'WHERE account_move_line.move_id = %s ' \
- 'AND account_analytic_line.move_id = account_move_line.id',
+ for (id, invtype, number, move_id, reference) in cr.fetchall():
+ if not number:
+ if obj_inv.journal_id.invoice_sequence_id:
+ sid = obj_inv.journal_id.invoice_sequence_id.id
+ number = self.pool.get('ir.sequence').get_id(cr, uid, sid, 'id', {'fiscalyear_id': obj_inv.period_id.fiscalyear_id.id})
+ else:
+ number = self.pool.get('ir.sequence').get(cr, uid, 'account.invoice.' + invtype)
+
+ if invtype in ('in_invoice', 'in_refund'):
+ ref = reference
+ else:
+ ref = self._convert_ref(cr, uid, number)
+
+ cr.execute('UPDATE account_invoice SET number=%s ' \
+ 'WHERE id=%s', (number, id))
+ cr.execute('UPDATE account_move SET ref=%s ' \
+ 'WHERE id=%s AND (ref is null OR ref = \'\')',
(ref, move_id))
+ cr.execute('UPDATE account_move_line SET ref=%s ' \
+ 'WHERE move_id=%s AND (ref is null OR ref = \'\')',
+ (ref, move_id))
+ cr.execute('UPDATE account_analytic_line SET ref=%s ' \
+ 'FROM account_move_line ' \
+ 'WHERE account_move_line.move_id = %s ' \
+ 'AND account_analytic_line.move_id = account_move_line.id',
+ (ref, move_id))
+
for inv_id, name in self.name_get(cr, uid, [id]):
message = _('Invoice ') + " '" + name + "' "+ _("is validated.")
self.log(cr, uid, inv_id, message)
+
return True
def action_cancel(self, cr, uid, ids, *args):
diff --git a/addons/account/project/project_view.xml b/addons/account/project/project_view.xml
index f1b970edf3c..65223706f40 100644
--- a/addons/account/project/project_view.xml
+++ b/addons/account/project/project_view.xml
@@ -54,13 +54,13 @@
+
+
+
+
-
-
-
-
diff --git a/addons/account/report/account_analytic_entries_report_view.xml b/addons/account/report/account_analytic_entries_report_view.xml
index ade9452e135..da0269c227f 100644
--- a/addons/account/report/account_analytic_entries_report_view.xml
+++ b/addons/account/report/account_analytic_entries_report_view.xml
@@ -71,7 +71,7 @@
-
+
diff --git a/addons/account/report/account_entries_report_view.xml b/addons/account/report/account_entries_report_view.xml
index 2f597a4c48b..1ad686ff5b7 100644
--- a/addons/account/report/account_entries_report_view.xml
+++ b/addons/account/report/account_entries_report_view.xml
@@ -93,7 +93,7 @@
-
+
diff --git a/addons/account/report/account_invoice_report_view.xml b/addons/account/report/account_invoice_report_view.xml
index 49d2080d56c..2bd3018ff7c 100644
--- a/addons/account/report/account_invoice_report_view.xml
+++ b/addons/account/report/account_invoice_report_view.xml
@@ -113,7 +113,7 @@
-
+
diff --git a/addons/account/wizard/account_balance_report.py b/addons/account/wizard/account_balance_report.py
index 5d02f9fa972..0d2a56d96d6 100644
--- a/addons/account/wizard/account_balance_report.py
+++ b/addons/account/wizard/account_balance_report.py
@@ -109,7 +109,6 @@ class account_balance_report(osv.osv_memory):
'type': 'ir.actions.report.xml',
'report_name': 'account.account.balance',
'datas': data,
- 'nodestroy':True,
}
def _check_date(self, cr, uid, data, context=None):
@@ -128,7 +127,6 @@ class account_balance_report(osv.osv_memory):
'type': 'ir.actions.report.xml',
'report_name': 'account.account.balance',
'datas': data,
- 'nodestroy':True,
}
else:
raise osv.except_osv(_('UserError'),_('Date not in a defined fiscal year'))
diff --git a/addons/account/wizard/account_bs_report.py b/addons/account/wizard/account_bs_report.py
index dfd035680f2..193e33395f5 100644
--- a/addons/account/wizard/account_bs_report.py
+++ b/addons/account/wizard/account_bs_report.py
@@ -139,14 +139,12 @@ class account_bs_report(osv.osv_memory):
'type': 'ir.actions.report.xml',
'report_name': 'account.balancesheet.horizontal',
'datas': data,
- 'nodestroy':True,
}
else:
return {
'type': 'ir.actions.report.xml',
'report_name': 'account.balancesheet',
'datas': data,
- 'nodestroy':True,
}
else:
raise osv.except_osv(_('UserError'),_('Date not in a defined fiscal year'))
diff --git a/addons/account/wizard/account_central_journal.py b/addons/account/wizard/account_central_journal.py
index b1a0f3c2849..dc213f159ab 100644
--- a/addons/account/wizard/account_central_journal.py
+++ b/addons/account/wizard/account_central_journal.py
@@ -52,7 +52,6 @@ class account_central_journal(osv.osv_memory):
'type': 'ir.actions.report.xml',
'report_name': 'account.central.journal',
'datas': datas,
- 'nodestroy':True,
}
account_central_journal()
diff --git a/addons/account/wizard/account_compare_account_balance_report.py b/addons/account/wizard/account_compare_account_balance_report.py
index af844854271..629e1ae798e 100644
--- a/addons/account/wizard/account_compare_account_balance_report.py
+++ b/addons/account/wizard/account_compare_account_balance_report.py
@@ -74,14 +74,12 @@ class account_compare_account_balance_report(osv.osv_memory):
'type': 'ir.actions.report.xml',
'report_name': 'account.account.balance.landscape',
'datas': data,
- 'nodestroy':True,
}
else:
return {
'type': 'ir.actions.report.xml',
'report_name': 'account.balance.account.balance',
'datas': data,
- 'nodestroy':True,
}
if data['form']['format_perc']==1:
if len(data['form']['fiscalyear'])<=2:
@@ -90,14 +88,12 @@ class account_compare_account_balance_report(osv.osv_memory):
'type': 'ir.actions.report.xml',
'report_name': 'account.account.balance.landscape',
'datas': data,
- 'nodestroy':True,
}
else:
return {
'type': 'ir.actions.report.xml',
'report_name': 'account.balance.account.balance',
'datas': data,
- 'nodestroy':True,
}
else:
if len(data['form']['fiscalyear'])==3:
@@ -106,7 +102,6 @@ class account_compare_account_balance_report(osv.osv_memory):
'type': 'ir.actions.report.xml',
'report_name': 'account.account.balance.landscape',
'datas': data,
- 'nodestroy':True,
}
else:
raise osv.except_osv(_('Warning !'), _('You might have done following mistakes. Please correct them and try again. \n 1. You have selected more than 3 years in any case. \n 2. You have not selected Percentage option, but you have selected more than 2 years. \n You can select maximum 3 years. Please check again. \n 3. You have selected Percentage option with more than 2 years, but you have not selected landscape format. You have to select Landscape option. Please Check it.'))
@@ -119,7 +114,6 @@ class account_compare_account_balance_report(osv.osv_memory):
'type': 'ir.actions.report.xml',
'report_name': 'account.account.balance.landscape',
'datas': data,
- 'nodestroy':True,
}
else:
raise osv.except_osv(_('Warning !'), _('You might have done following mistakes. Please correct them and try again. \n 1. You have selected more than 3 years in any case. \n 2. You have not selected Percentage option, but you have selected more than 2 years. \n You can select maximum 3 years. Please check again. \n 3. You have selected Percentage option with more than 2 years, but you have not selected landscape format. You have to select Landscape option. Please Check it.'))
@@ -129,14 +123,12 @@ class account_compare_account_balance_report(osv.osv_memory):
'type': 'ir.actions.report.xml',
'report_name': 'account.account.balance.landscape',
'datas': data,
- 'nodestroy':True,
}
else:
return {
'type': 'ir.actions.report.xml',
'report_name': 'account.balance.account.balance',
'datas': data,
- 'nodestroy':True,
}
account_compare_account_balance_report()
diff --git a/addons/account/wizard/account_general_journal.py b/addons/account/wizard/account_general_journal.py
index 8bd2913ae62..f22846f1637 100644
--- a/addons/account/wizard/account_general_journal.py
+++ b/addons/account/wizard/account_general_journal.py
@@ -52,7 +52,6 @@ class account_general_journal(osv.osv_memory):
'type': 'ir.actions.report.xml',
'report_name': 'account.general.journal',
'datas': datas,
- 'nodestroy':True,
}
account_general_journal()
diff --git a/addons/account/wizard/account_general_ledger_report.py b/addons/account/wizard/account_general_ledger_report.py
index ad5e74786b0..f8c7794673b 100644
--- a/addons/account/wizard/account_general_ledger_report.py
+++ b/addons/account/wizard/account_general_ledger_report.py
@@ -107,14 +107,12 @@ class account_general_ledger_report(osv.osv_memory):
'type': 'ir.actions.report.xml',
'report_name': 'account.general.ledger_landscape',
'datas': data,
- 'nodestroy':True,
}
else:
return {
'type': 'ir.actions.report.xml',
'report_name': 'account.general.ledger',
'datas': data,
- 'nodestroy':True,
}
else:
raise osv.except_osv(_('UserError'),_('Date not in a defined fiscal year'))
@@ -141,14 +139,12 @@ class account_general_ledger_report(osv.osv_memory):
'type': 'ir.actions.report.xml',
'report_name': 'account.general.ledger_landscape',
'datas': data,
- 'nodestroy':True,
}
else:
return {
'type': 'ir.actions.report.xml',
'report_name': 'account.general.ledger',
'datas': data,
- 'nodestroy':True,
}
account_general_ledger_report()
diff --git a/addons/account/wizard/account_invoice_state_view.xml b/addons/account/wizard/account_invoice_state_view.xml
index 1fd466a9dce..7130e7dc758 100644
--- a/addons/account/wizard/account_invoice_state_view.xml
+++ b/addons/account/wizard/account_invoice_state_view.xml
@@ -44,7 +44,7 @@
-
+
diff --git a/addons/account/wizard/account_journal_select_view.xml b/addons/account/wizard/account_journal_select_view.xml
index 4fc94ec0d6c..f5df24fa585 100644
--- a/addons/account/wizard/account_journal_select_view.xml
+++ b/addons/account/wizard/account_journal_select_view.xml
@@ -11,7 +11,7 @@
-
+
diff --git a/addons/account/wizard/account_move_bank_reconcile_view.xml b/addons/account/wizard/account_move_bank_reconcile_view.xml
index b80e17f18c8..d41993733df 100644
--- a/addons/account/wizard/account_move_bank_reconcile_view.xml
+++ b/addons/account/wizard/account_move_bank_reconcile_view.xml
@@ -13,7 +13,7 @@
-
+
diff --git a/addons/account/wizard/account_move_journal_view.xml b/addons/account/wizard/account_move_journal_view.xml
index af9dd313255..d766153a9b4 100644
--- a/addons/account/wizard/account_move_journal_view.xml
+++ b/addons/account/wizard/account_move_journal_view.xml
@@ -16,7 +16,7 @@
-
+
diff --git a/addons/account/wizard/account_move_line_reconcile_select_view.xml b/addons/account/wizard/account_move_line_reconcile_select_view.xml
index 4f88f618727..22bc289f816 100644
--- a/addons/account/wizard/account_move_line_reconcile_select_view.xml
+++ b/addons/account/wizard/account_move_line_reconcile_select_view.xml
@@ -13,7 +13,7 @@
-
+
diff --git a/addons/account/wizard/account_move_line_select_view.xml b/addons/account/wizard/account_move_line_select_view.xml
index 8c462318271..645b5a098e3 100644
--- a/addons/account/wizard/account_move_line_select_view.xml
+++ b/addons/account/wizard/account_move_line_select_view.xml
@@ -11,7 +11,7 @@
-
+
diff --git a/addons/account/wizard/account_move_line_unreconcile_select_view.xml b/addons/account/wizard/account_move_line_unreconcile_select_view.xml
index f2a3882db91..ae1b069a1dc 100644
--- a/addons/account/wizard/account_move_line_unreconcile_select_view.xml
+++ b/addons/account/wizard/account_move_line_unreconcile_select_view.xml
@@ -13,7 +13,7 @@
-
+
diff --git a/addons/account/wizard/account_open_closed_fiscalyear_view.xml b/addons/account/wizard/account_open_closed_fiscalyear_view.xml
index afc7b7e6828..435f15388c1 100644
--- a/addons/account/wizard/account_open_closed_fiscalyear_view.xml
+++ b/addons/account/wizard/account_open_closed_fiscalyear_view.xml
@@ -13,7 +13,7 @@
-
+
diff --git a/addons/account/wizard/account_partner_balance_report.py b/addons/account/wizard/account_partner_balance_report.py
index c6d82128256..5d023d8f8ec 100644
--- a/addons/account/wizard/account_partner_balance_report.py
+++ b/addons/account/wizard/account_partner_balance_report.py
@@ -82,7 +82,6 @@ class account_partner_balance(osv.osv_memory):
'type': 'ir.actions.report.xml',
'report_name': 'account.partner.balance',
'datas': data,
- 'nodestroy':True,
}
def _check_date(self, cr, uid, data, context):
@@ -98,7 +97,6 @@ class account_partner_balance(osv.osv_memory):
'type': 'ir.actions.report.xml',
'report_name': 'account.partner.balance',
'datas': data,
- 'nodestroy':True,
}
else:
raise osv.except_osv(_('UserError'),_('Date not in a defined fiscal year'))
diff --git a/addons/account/wizard/account_partner_balance_report_view.xml b/addons/account/wizard/account_partner_balance_report_view.xml
index 4827fac5480..abbddcd5074 100644
--- a/addons/account/wizard/account_partner_balance_report_view.xml
+++ b/addons/account/wizard/account_partner_balance_report_view.xml
@@ -33,7 +33,7 @@
-
+
diff --git a/addons/account/wizard/account_pl_report.py b/addons/account/wizard/account_pl_report.py
index 9ae7a4dbedf..87f5accf068 100644
--- a/addons/account/wizard/account_pl_report.py
+++ b/addons/account/wizard/account_pl_report.py
@@ -136,14 +136,12 @@ class account_pl_report(osv.osv_memory):
'type': 'ir.actions.report.xml',
'report_name': 'pl.account.horizontal',
'datas': data,
- 'nodestroy':True,
}
else:
return {
'type': 'ir.actions.report.xml',
'report_name': 'pl.account',
'datas': data,
- 'nodestroy':True,
}
else:
raise osv.except_osv(_('UserError'),_('Date not in a defined fiscal year'))
diff --git a/addons/account/wizard/account_print_journal.py b/addons/account/wizard/account_print_journal.py
index f40efe3eb99..53c73e66355 100644
--- a/addons/account/wizard/account_print_journal.py
+++ b/addons/account/wizard/account_print_journal.py
@@ -59,7 +59,6 @@ class account_print_journal(osv.osv_memory):
'type': 'ir.actions.report.xml',
'report_name': 'account.journal.period.print',
'datas': datas,
- 'nodestroy':True,
}
account_print_journal()
diff --git a/addons/account/wizard/account_reconcile_view.xml b/addons/account/wizard/account_reconcile_view.xml
index 5ce124bfcc7..4d8283ab0c1 100644
--- a/addons/account/wizard/account_reconcile_view.xml
+++ b/addons/account/wizard/account_reconcile_view.xml
@@ -2,30 +2,30 @@
-
+
-
-
-
+
+
+
-
-
+
+
-
-
+
+
-
-
+
+
@@ -36,41 +36,41 @@
-
-
-
+
+
+
account.move.line.reconcile.full.form
account.move.line.reconcile
form
-
-
- Reconcile Entries
+
+
+ Reconcile Entries
account.move.line.reconcile
form
tree,form
-
- new
+
+ new
@@ -81,72 +81,72 @@
action
account.move.line
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-
+
account.move.line.reconcile.writeoff.form
account.move.line.reconcile.writeoff
form
-
+
diff --git a/addons/account/wizard/account_third_party_ledger.py b/addons/account/wizard/account_third_party_ledger.py
index daff801f3bd..fa40cd0bdc6 100644
--- a/addons/account/wizard/account_third_party_ledger.py
+++ b/addons/account/wizard/account_third_party_ledger.py
@@ -97,14 +97,12 @@ class account_partner_ledger(osv.osv_memory):
'type': 'ir.actions.report.xml',
'report_name': 'account.third_party_ledger',
'datas': data,
- 'nodestroy':True,
}
else:
return {
'type': 'ir.actions.report.xml',
'report_name': 'account.third_party_ledger_other',
'datas': data,
- 'nodestroy':True,
}
def _check_date(self, cr, uid, data, context=None):
@@ -122,7 +120,6 @@ class account_partner_ledger(osv.osv_memory):
'type': 'ir.actions.report.xml',
'report_name': 'account.third_party_ledger',
'datas': data,
- 'nodestroy':True,
}
else:
raise osv.except_osv(_('UserError'),_('Date not in a defined fiscal year'))
diff --git a/addons/account/wizard/account_use_model_view.xml b/addons/account/wizard/account_use_model_view.xml
index 6bae6c55d74..f4cd436c9a2 100644
--- a/addons/account/wizard/account_use_model_view.xml
+++ b/addons/account/wizard/account_use_model_view.xml
@@ -70,7 +70,7 @@
-
+
diff --git a/addons/account/wizard/account_vat.py b/addons/account/wizard/account_vat.py
index 15c5a55203a..80f4f8360a1 100644
--- a/addons/account/wizard/account_vat.py
+++ b/addons/account/wizard/account_vat.py
@@ -22,43 +22,42 @@
from osv import osv, fields
class account_vat_declaration(osv.osv_memory):
- _name = 'account.vat.declaration'
- _description = 'Account Vat Declaration'
+ _name = 'account.vat.declaration'
+ _description = 'Account Vat Declaration'
- _columns = {
+ _columns = {
'based_on': fields.selection([('invoices','Invoices'),
- ('payments','Payments'),],
- 'Based On', required=True),
+ ('payments','Payments'),],
+ 'Based On', required=True),
'company_id': fields.many2one('res.company', 'Company', required=True),
- 'periods': fields.many2many('account.period', 'vat_period_rel', 'vat_id', 'period_id', 'Periods', help="All periods if empty"),
- }
+ 'periods': fields.many2many('account.period', 'vat_period_rel', 'vat_id', 'period_id', 'Periods', help="All periods if empty"),
+ }
- def _get_company(self, cr, uid, context={}):
- user_obj = self.pool.get('res.users')
- company_obj = self.pool.get('res.company')
- user = user_obj.browse(cr, uid, uid, context=context)
- if user.company_id:
- return user.company_id.id
- else:
- return company_obj.search(cr, uid, [('parent_id', '=', False)])[0]
+ def _get_company(self, cr, uid, context={}):
+ user_obj = self.pool.get('res.users')
+ company_obj = self.pool.get('res.company')
+ user = user_obj.browse(cr, uid, uid, context=context)
+ if user.company_id:
+ return user.company_id.id
+ else:
+ return company_obj.search(cr, uid, [('parent_id', '=', False)])[0]
- _defaults = {
- 'based_on': 'invoices',
- 'company_id': _get_company
- }
+ _defaults = {
+ 'based_on': 'invoices',
+ 'company_id': _get_company
+ }
- def create_vat(self, cr, uid, ids, context={}):
- if context is None:
- context = {}
- datas = {'ids': context.get('active_ids', [])}
- datas['model'] = 'account.tax.code'
- datas['form'] = self.read(cr, uid, ids)[0]
- return {
- 'type': 'ir.actions.report.xml',
- 'report_name': 'account.vat.declaration',
- 'datas': datas,
- 'nodestroy':True,
- }
+ def create_vat(self, cr, uid, ids, context={}):
+ if context is None:
+ context = {}
+ datas = {'ids': context.get('active_ids', [])}
+ datas['model'] = 'account.tax.code'
+ datas['form'] = self.read(cr, uid, ids)[0]
+ return {
+ 'type': 'ir.actions.report.xml',
+ 'report_name': 'account.vat.declaration',
+ 'datas': datas,
+ }
account_vat_declaration()
diff --git a/addons/account_analytic_analysis/i18n/bs.po b/addons/account_analytic_analysis/i18n/bs.po
index befb349e7a0..00719ef3f2e 100644
--- a/addons/account_analytic_analysis/i18n/bs.po
+++ b/addons/account_analytic_analysis/i18n/bs.po
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 5.0.4\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-02-12 13:13+0000\n"
-"Last-Translator: Tarik_985 \n"
+"PO-Revision-Date: 2010-08-01 11:50+0000\n"
+"Last-Translator: Bojan Markovic \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: 2010-06-22 04:09+0000\n"
+"X-Launchpad-Export-Date: 2010-08-02 03:49+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_analytic_analysis
@@ -200,6 +200,9 @@ msgid ""
"important data for project manager of services companies.\n"
"Add menu to show relevant information for each manager."
msgstr ""
+"Izmijeni analitički pregled konta da prikazuje\n"
+"bitne podatke za projekt menadžere uslužnih poduzeća.\n"
+"Dodaj meni za prikazivanje relevantnih informacija za svakog menadžera."
#. module: account_analytic_analysis
#: field:account.analytic.account,hours_qtt_non_invoiced:0
diff --git a/addons/account_analytic_plans/wizard/account_crossovered_analytic.py b/addons/account_analytic_plans/wizard/account_crossovered_analytic.py
index 825ab26aaf9..2429650a800 100644
--- a/addons/account_analytic_plans/wizard/account_crossovered_analytic.py
+++ b/addons/account_analytic_plans/wizard/account_crossovered_analytic.py
@@ -67,7 +67,6 @@ class account_crossovered_analytic(osv.osv_memory):
'type': 'ir.actions.report.xml',
'report_name': 'account.analytic.account.crossovered.analytic',
'datas': datas,
- 'nodestroy': True
}
account_crossovered_analytic()
diff --git a/addons/account_followup/i18n/bs.po b/addons/account_followup/i18n/bs.po
index bcf9815bf0e..b0ac6a29bc6 100644
--- a/addons/account_followup/i18n/bs.po
+++ b/addons/account_followup/i18n/bs.po
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 5.0.4\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-07-07 09:15+0000\n"
+"PO-Revision-Date: 2010-08-01 15:26+0000\n"
"Last-Translator: Bojan Markovic \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: 2010-07-08 03:50+0000\n"
+"X-Launchpad-Export-Date: 2010-08-02 03:49+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_followup
@@ -35,22 +35,22 @@ msgstr "Refernca kupca:"
#: model:ir.actions.act_window,name:account_followup.act_account_partner_account_move_payable_all
#: model:ir.ui.menu,name:account_followup.menu_account_move_open_unreconcile_payable
msgid "All payable entries"
-msgstr ""
+msgstr "Sve stavke dugovanja"
#. module: account_followup
#: constraint:ir.actions.act_window:0
msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "Neispravan naziv modela u definiciji zadatka."
#. module: account_followup
#: field:account_followup.followup.line,description:0
msgid "Printed Message"
-msgstr ""
+msgstr "Ispisana poruka"
#. module: account_followup
#: rml:account_followup.followup.print:0
msgid "Amount In Currency"
-msgstr ""
+msgstr "Iznos u valuti"
#. module: account_followup
#: rml:account_followup.followup.print:0
@@ -66,7 +66,7 @@ msgstr "Ukupan dug"
#: view:account_followup.followup.line:0
#: wizard_view:account_followup.followup.print.all,next:0
msgid "%(user_signature)s: User name"
-msgstr ""
+msgstr "%(user_signature)s: Korisničko ime"
#. module: account_followup
#: wizard_view:account_followup.followup.print.all,next:0
@@ -77,12 +77,12 @@ msgstr "Izabeeri partnere"
#: view:account_followup.followup:0
#: field:account_followup.followup,followup_line:0
msgid "Follow-Up"
-msgstr ""
+msgstr "Opomena"
#. module: account_followup
#: field:account_followup.stat,debit:0
msgid "Debit"
-msgstr ""
+msgstr "Dugovanje"
#. module: account_followup
#: wizard_view:account_followup.followup.print.all,next:0
@@ -92,39 +92,39 @@ msgstr "E-mail Postavke"
#. module: account_followup
#: field:account_followup.stat,account_type:0
msgid "Account Type"
-msgstr "Vrsta Računa"
+msgstr "Vrsta konta"
#. module: account_followup
#: rml:account_followup.followup.print:0
msgid "Ref"
-msgstr ""
+msgstr "Referenca"
#. module: account_followup
#: wizard_view:account_followup.followup.print.all,next:0
msgid "%(followup_amount)s: Total Amount Due"
-msgstr "%(followup_amount): Ukupan dospjeli iznos"
+msgstr "%(followup_amount)s: Ukupan dospjeli iznos"
#. module: account_followup
#: view:account_followup.followup.line:0
#: wizard_view:account_followup.followup.print.all,next:0
msgid "%(date)s: Current Date"
-msgstr ""
+msgstr "%(date)s: Trenutni datum"
#. module: account_followup
#: field:account.move.line,followup_date:0
msgid "Latest Follow-up"
-msgstr ""
+msgstr "Poslijednja opomena"
#. module: account_followup
#: field:account_followup.followup.line,followup_id:0
#: field:account_followup.stat,followup_id:0
msgid "Follow Ups"
-msgstr ""
+msgstr "Opomene"
#. module: account_followup
#: wizard_field:account_followup.followup.print.all,init,date:0
msgid "Follow-up Sending Date"
-msgstr ""
+msgstr "Datum slanja opomene"
#. module: account_followup
#: view:account_followup.followup:0
@@ -136,17 +136,17 @@ msgstr "Opis"
#. module: account_followup
#: rml:account_followup.followup.print:0
msgid "Balance:"
-msgstr "Balans:"
+msgstr "Saldo"
#. module: account_followup
#: rml:account_followup.followup.print:0
msgid "VAT:"
-msgstr "VAT:"
+msgstr "PDV:"
#. module: account_followup
#: field:account_followup.followup,company_id:0
msgid "Company"
-msgstr "Kompanija"
+msgstr "Poduzeće"
#. module: account_followup
#: rml:account_followup.followup.print:0
@@ -156,7 +156,7 @@ msgstr "Datum Fakture"
#. module: account_followup
#: wizard_field:account_followup.followup.print.all,next,email_subject:0
msgid "Email Subject"
-msgstr ""
+msgstr "Predmet email-a"
#. module: account_followup
#: rml:account_followup.followup.print:0
@@ -166,27 +166,27 @@ msgstr "Plaćeno"
#. module: account_followup
#: wizard_view:account_followup.followup.print.all,next:0
msgid "%(line)s: Account Move lines"
-msgstr ""
+msgstr "%(line)s: Stavke unosa na kontu"
#. module: account_followup
#: field:account_followup.stat,date_followup:0
msgid "Latest followup"
-msgstr ""
+msgstr "Poslijednja opomena"
#. module: account_followup
#: view:account.move.line:0
msgid "Partner entries"
-msgstr ""
+msgstr "Stavke partnera"
#. module: account_followup
#: model:ir.model,name:account_followup.model_account_followup_followup_line
msgid "Follow-Ups Criteria"
-msgstr ""
+msgstr "Kriteriji opomena"
#. module: account_followup
#: wizard_view:account_followup.followup.print.all,next:0
msgid "Partner Selection"
-msgstr "Biranje Partnera"
+msgstr "Odabir Partnera"
#. module: account_followup
#: constraint:ir.ui.view:0
@@ -196,17 +196,17 @@ msgstr "Neodgovarajući XML za arhitekturu prikaza!"
#. module: account_followup
#: field:account_followup.followup.line,start:0
msgid "Type of Term"
-msgstr ""
+msgstr "Vrsta uvjeta"
#. module: account_followup
#: wizard_view:account_followup.followup.print.all,init:0
msgid "Follow-up and Date Selection"
-msgstr ""
+msgstr "Odabir datuma i opomene"
#. module: account_followup
#: wizard_view:account_followup.followup.print.all,next:0
msgid "Select partners to remind"
-msgstr ""
+msgstr "Odaberite partnere za opomenu"
#. module: account_followup
#: rml:account_followup.followup.print:0
@@ -230,6 +230,19 @@ msgid ""
"Best Regards,\n"
"\t\t\t"
msgstr ""
+"\n"
+"Poštovani %(partner_name)s,\n"
+"\n"
+"Zanemarite ovu poruku ukoliko je u pitanju naša greška. Izgleda da je "
+"slijedeći iznos ostao neplaćen. Molimo Vas da poduzmete mjere potrebne da se "
+"ovaj dug izmiri u narednih 8 dana.\n"
+"\n"
+"Ukoliko ste izvršili uplatu nako što je ova poruka poslana, molimo vas da "
+"zanemarite ovu poruku. Ne ustručavajte se kontaktirati nas na broj: (br. "
+"telefona).\n"
+"\n"
+"Srdačan pozdrav.\n"
+"\t\t\t"
#. module: account_followup
#: constraint:ir.model:0
@@ -247,55 +260,55 @@ msgstr "U redu"
#: 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
msgid "First move"
-msgstr ""
+msgstr "Prvo knjiženje"
#. module: account_followup
#: selection:account_followup.followup.line,start:0
msgid "End of Month"
-msgstr "Kraj Mjeseca"
+msgstr "Kraj mjeseca"
#. module: account_followup
#: view:account_followup.followup.line:0
#: wizard_view:account_followup.followup.print.all,next:0
msgid "%(company_name)s: User's Company name"
-msgstr ""
+msgstr "%(company_name)s: Naziv poduzeća korisnika"
#. module: account_followup
#: model:ir.actions.act_window,name:account_followup.act_account_partner_account_move_all
#: model:ir.ui.menu,name:account_followup.menu_account_move_open_unreconcile
msgid "All receivable entries"
-msgstr ""
+msgstr "Sve stavke potraživanja"
#. module: account_followup
#: view:account_followup.followup:0
msgid "Lines"
-msgstr "Linije"
+msgstr "Stavke"
#. module: account_followup
#: model:ir.actions.wizard,name:account_followup.action_account_followup_all_wizard
#: model:ir.ui.menu,name:account_followup.account_followup_wizard_menu
msgid "Send followups"
-msgstr "Pošaljite napomene"
+msgstr "Pošaljite opomene"
#. module: account_followup
#: field:account.move.line,followup_line_id:0
msgid "Follow-up Level"
-msgstr "Stupanj napomene"
+msgstr "Stupanj opomene"
#. module: account_followup
#: field:account_followup.stat,credit:0
msgid "Credit"
-msgstr ""
+msgstr "Potraživanje"
#. module: account_followup
#: model:ir.model,name:account_followup.model_account_followup_stat
msgid "Followup statistics"
-msgstr ""
+msgstr "Statistike opomena"
#. module: account_followup
#: wizard_button:account_followup.followup.print.all,init,next:0
@@ -305,49 +318,49 @@ msgstr "Nastavi"
#. module: account_followup
#: model:ir.module.module,shortdesc:account_followup.module_meta_information
msgid "Accounting follow-ups management"
-msgstr ""
+msgstr "Upravljanje računovodstvenim opomenama"
#. module: account_followup
#: wizard_view:account_followup.followup.print.all,summary:0
#: wizard_field:account_followup.followup.print.all,summary,summary:0
msgid "Summary"
-msgstr ""
+msgstr "Sažetak"
#. module: account_followup
#: view:account_followup.followup.line:0
msgid "Follow-Up Lines"
-msgstr ""
+msgstr "Stavke opomene"
#. module: account_followup
#: rml:account_followup.followup.print:0
msgid "Document : Customer account statement"
-msgstr ""
+msgstr "Dokument : Izvod konta kupca"
#. module: account_followup
#: view:account_followup.stat:0
msgid "Follow-Up lines"
-msgstr ""
+msgstr "Stavke opomene"
#. module: account_followup
#: wizard_view:account_followup.followup.print.all,next:0
msgid "%(company_currency)s: User's Company Currency"
-msgstr "%(company_currency): Valuta poduzeća korisnika"
+msgstr "%(company_currency)s: Valuta poduzeća korisnika"
#. module: account_followup
#: field:account_followup.stat,balance:0
msgid "Balance"
-msgstr "Balans"
+msgstr "Saldo"
#. module: account_followup
#: help:account_followup.followup.print.all,init,date:0
msgid ""
"This field allow you to select a forecast date to plan your follow-ups"
-msgstr ""
+msgstr "Ovo polje omogućuje odabir budućeg datuma za planiranje opomena"
#. module: account_followup
#: view:account.move.line:0
msgid "Total credit"
-msgstr ""
+msgstr "Ukupno potražuje"
#. module: account_followup
#: model:account_followup.followup.line,description:account_followup.demo_followup_line2
@@ -373,16 +386,35 @@ msgid ""
"Best Regards,\n"
"\t\t\t"
msgstr ""
+"\n"
+"Poštovani %(partner_name)s,\n"
+"\n"
+"Razočarani smo što ste, usprkos našoj napomeni, sada u ozbiljnom "
+"prekoračenju plaćanja.\n"
+"\n"
+"Neophodno je da odmah izmirite svoja dugovanja, u suprotnom morati ćemo "
+"razmotriti obustavljanje naše suradnje.\n"
+"\n"
+"Molimo Vas da poduzmete neophodne mjere da se dugovanje izmiri odmah.\n"
+"\n"
+"Ukoliko postoje problemi sa plaćanjem kojih mi možda nismo svjesni, ne "
+"ustručavajte se kontaktirati naše računovodstvo na broj (br. tel.) tako da "
+"odmah pristupimo rješavanju problema.\n"
+"\n"
+"Detalji dospjelih potraživanje su ispod.\n"
+"\n"
+"Srdačan pozdrav,\n"
+"\t\t\t"
#. module: account_followup
#: rml:account_followup.followup.print:0
msgid "Sub-Total:"
-msgstr ""
+msgstr "Suma:"
#. module: account_followup
#: selection:account_followup.followup.line,start:0
msgid "Net Days"
-msgstr ""
+msgstr "Ukupno dana"
#. module: account_followup
#: model:ir.actions.act_window,name:account_followup.action_account_followup_definition_form
@@ -391,7 +423,7 @@ msgstr ""
#: model:ir.ui.menu,name:account_followup.account_followup_menu
#: model:ir.ui.menu,name:account_followup.menu_action_followup_stat
msgid "Follow-Ups"
-msgstr ""
+msgstr "Opomene"
#. module: account_followup
#: wizard_view:account_followup.followup.print.all,next:0
@@ -402,17 +434,17 @@ msgstr "E-mail tekst"
#. module: account_followup
#: field:account_followup.stat,date_move_last:0
msgid "Last move"
-msgstr ""
+msgstr "Poslijenje knjiženje"
#. module: account_followup
#: rml:account_followup.followup.print:0
msgid "Maturity"
-msgstr "Dospijeće"
+msgstr "Dospjelost"
#. module: account_followup
#: model:ir.actions.report.xml,name:account_followup.account_followup_followup_report
msgid "Followup Report"
-msgstr "Izvještaj o napomenama"
+msgstr "Izvještaj o opomenama"
#. module: account_followup
#: model:account_followup.followup.line,description:account_followup.demo_followup_line3
@@ -434,17 +466,34 @@ msgid ""
"Best Regards,\n"
"\t\t\t"
msgstr ""
+"\n"
+"Poštovani %(partner_name)s,\n"
+"\n"
+"Usprkos slanju nekoliko napomena, vaš dug nije izmiren.\n"
+"\n"
+"Ukoliko ne izvršite uplatu dugovanja u narednih 8 dana, poduzeti ćemo "
+"zakonom predviđene mjere za povrat duga bez daljih upozorenja.\n"
+"\n"
+"Vjerujemo da do toga neće morati doći te Vam ponovo dostavljamo detalje "
+"dospjelih potraživanja.\n"
+"\n"
+"U slučaju bilo kakvih nejasnoća vezanih uz ovo pitanje, ne ustručavajte se "
+"kontaktirati naše računovodstvo na \n"
+"(br. tel.)\n"
+"\n"
+"S poštovanjem.\n"
+"\t\t\t"
#. module: account_followup
#: rml:account_followup.followup.print:0
msgid "Maturity Date"
-msgstr "Datum Dospijeać"
+msgstr "Datum dospjelosti"
#. module: account_followup
#: view:account_followup.followup.line:0
#: wizard_view:account_followup.followup.print.all,next:0
msgid "Legend"
-msgstr ""
+msgstr "Legenda"
#. module: account_followup
#: field:account_followup.followup.line,sequence:0
@@ -460,7 +509,7 @@ msgstr "%(heading)s: Zaglavlje retka izmjena"
#: view:account_followup.followup.line:0
#: wizard_view:account_followup.followup.print.all,next:0
msgid "%(partner_name)s: Partner name"
-msgstr ""
+msgstr "%(partner_name)s: Naziv partnera"
#. module: account_followup
#: wizard_field:account_followup.followup.print.all,next,email_conf:0
@@ -470,7 +519,7 @@ msgstr "Pošalji e-mail potvrdu"
#. module: account_followup
#: wizard_field:account_followup.followup.print.all,init,followup_id:0
msgid "Follow-up"
-msgstr ""
+msgstr "Opomena"
#. module: account_followup
#: field:account_followup.stat,name:0
@@ -491,4 +540,4 @@ msgstr "Dani kašnjenja"
#. module: account_followup
#: wizard_button:account_followup.followup.print.all,next,print:0
msgid "Print Follow Ups & Send Mails"
-msgstr ""
+msgstr "Ispiši opomene i pošalji email-ove"
diff --git a/addons/account_followup/wizard/account_followup_print.py b/addons/account_followup/wizard/account_followup_print.py
index 868249365ee..c3fd73370eb 100644
--- a/addons/account_followup/wizard/account_followup_print.py
+++ b/addons/account_followup/wizard/account_followup_print.py
@@ -304,7 +304,6 @@ class account_followup_print_all(osv.osv_memory):
'type': 'ir.actions.report.xml',
'report_name': 'account_followup.followup.print',
'datas': datas,
- 'nodestroy': True
}
account_followup_print_all()
diff --git a/addons/account_invoice_layout/i18n/bs.po b/addons/account_invoice_layout/i18n/bs.po
index 91f8f8eff7b..83246875150 100644
--- a/addons/account_invoice_layout/i18n/bs.po
+++ b/addons/account_invoice_layout/i18n/bs.po
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 5.0.4\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-07-07 09:53+0000\n"
+"PO-Revision-Date: 2010-08-01 12:20+0000\n"
"Last-Translator: Bojan Markovic \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: 2010-07-08 03:50+0000\n"
+"X-Launchpad-Export-Date: 2010-08-02 03:49+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_invoice_layout
@@ -36,7 +36,7 @@ msgstr ""
#. module: account_invoice_layout
#: rml:account.invoice.layout:0
msgid "Cancelled Invoice"
-msgstr "Poništena faktura"
+msgstr "Opozvana faktura"
#. module: account_invoice_layout
#: selection:account.invoice.line,state:0
@@ -93,7 +93,7 @@ msgstr "Napomeni po porukama"
#. module: account_invoice_layout
#: rml:account.invoice.layout:0
msgid "PRO-FORMA"
-msgstr "PRO-FORMA"
+msgstr "Pro-forma"
#. module: account_invoice_layout
#: field:account.invoice,abstract_line_ids:0
@@ -113,7 +113,7 @@ msgstr "Poruka napomene"
#. module: account_invoice_layout
#: rml:account.invoice.layout:0
msgid "Customer Ref:"
-msgstr "Referenca kupca"
+msgstr "Referenca kupca:"
#. module: account_invoice_layout
#: rml:account.invoice.layout:0
@@ -183,7 +183,7 @@ msgstr "Neodgovarajući XML za arhitekturu prikaza!"
#. module: account_invoice_layout
#: selection:account.invoice.line,state:0
msgid "Page Break"
-msgstr ""
+msgstr "Prelom stranice"
#. module: account_invoice_layout
#: rml:account.invoice.layout:0
@@ -263,7 +263,7 @@ msgstr "Faktura dobavljača"
#. module: account_invoice_layout
#: rml:account.invoice.layout:0
msgid "Note :"
-msgstr ""
+msgstr "Napomena :"
#. module: account_invoice_layout
#: rml:account.invoice.layout:0
diff --git a/addons/account_report/i18n/bs.po b/addons/account_report/i18n/bs.po
index bd0c14775ad..e9935b69256 100644
--- a/addons/account_report/i18n/bs.po
+++ b/addons/account_report/i18n/bs.po
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 5.0.4\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-07-09 06:46+0000\n"
+"PO-Revision-Date: 2010-08-01 17:48+0000\n"
"Last-Translator: Bojan Markovic \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: 2010-07-10 04:02+0000\n"
+"X-Launchpad-Export-Date: 2010-08-02 03:49+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_report
@@ -21,7 +21,7 @@ msgstr ""
#: selection:account.report.report,type:0
#: model:ir.model,name:account_report.model_account_report_history
msgid "Indicator"
-msgstr ""
+msgstr "Indikator"
#. module: account_report
#: wizard_field:print.indicators.pdf,init,file:0
@@ -81,7 +81,7 @@ msgstr "= Limit indikatora dobrote:"
#. module: account_report
#: view:account.report.report:0
msgid "Very bad"
-msgstr ""
+msgstr "Vrlo loše"
#. module: account_report
#: field:account.report.history,val:0
@@ -92,38 +92,38 @@ msgstr "Vrijednost"
#. module: account_report
#: view:account.report.report:0
msgid "= Badness Indicator Limit:"
-msgstr ""
+msgstr "= Limit indikatora za loše:"
#. module: account_report
#: view:account.report.report:0
#: selection:account.report.report,status:0
msgid "Bad"
-msgstr ""
+msgstr "Loše"
#. module: account_report
#: wizard_view:print.indicators.pdf,init:0
msgid "Select the PDF file on which Indicators will be printed."
-msgstr ""
+msgstr "Odaberi PDF datoteku na kojoj će indikatori biti ispisani"
#. module: account_report
#: view:account.report.report:0
msgid "> Goodness Indicator Limit:"
-msgstr ""
+msgstr "> Limit indikatora dobrog:"
#. module: account_report
#: field:account.report.report,badness_limit:0
msgid "Badness Indicator Limit"
-msgstr ""
+msgstr "Limit indikatora lošeg"
#. module: account_report
#: selection:account.report.report,status:0
msgid "Very Bad"
-msgstr ""
+msgstr "Vrlo loše"
#. module: account_report
#: model:ir.actions.act_window,name:account_report.account_report_history_record_structure
msgid "Indicator history"
-msgstr ""
+msgstr "Istorija indikatora"
#. module: account_report
#: view:account.report.report:0
@@ -143,7 +143,7 @@ msgstr "Fiskalni izvod"
#. module: account_report
#: wizard_button:print.indicators,init,next:0
msgid "Next"
-msgstr ""
+msgstr "Slijedeći"
#. module: account_report
#: model:ir.module.module,shortdesc:account_report.module_meta_information
@@ -154,12 +154,12 @@ msgstr "Izvještavanje za računovodstvo"
#: wizard_button:print.indicators,next,print:0
#: wizard_button:print.indicators.pdf,init,print:0
msgid "Print"
-msgstr ""
+msgstr "Ispis"
#. module: account_report
#: field:account.report.report,type:0
msgid "Type"
-msgstr ""
+msgstr "Vrsta"
#. module: account_report
#: model:ir.actions.report.xml,name:account_report.report_indicator_pdf
@@ -169,18 +169,18 @@ msgstr "Ispiši indikatore u PDF"
#. module: account_report
#: view:account.report.report:0
msgid "Account Tax Code:"
-msgstr ""
+msgstr "Porezni broj konta"
#. module: account_report
#: view:account.report.report:0
#: selection:account.report.report,status:0
msgid "Good"
-msgstr ""
+msgstr "Dobro"
#. module: account_report
#: view:account.report.history:0
msgid "Account Report History"
-msgstr ""
+msgstr "Istorija izvještaja konta"
#. module: account_report
#: constraint:ir.ui.view:0
@@ -190,12 +190,12 @@ msgstr "Neodgovarajući XML za arhitekturu prikaza!"
#. module: account_report
#: help:account.report.report,badness_limit:0
msgid "This Value sets the limit of badness."
-msgstr ""
+msgstr "Ova vrijednost postavlja limit lošeg."
#. module: account_report
#: wizard_field:print.indicators,init,select_base:0
msgid "Choose Criteria"
-msgstr ""
+msgstr "Odaberite kriterij"
#. module: account_report
#: view:account.report.report:0
@@ -205,39 +205,39 @@ msgstr ""
#. module: account_report
#: view:account.report.report:0
msgid "Account Credit:"
-msgstr ""
+msgstr "Potraživanje konta:"
#. module: account_report
#: wizard_view:print.indicators,init:0
msgid "Select the criteria based on which Indicators will be printed."
-msgstr ""
+msgstr "Odaberite kriterije prema kojima će indikatori biti ispisani."
#. module: account_report
#: view:account.report.report:0
msgid "< Badness Indicator Limit:"
-msgstr ""
+msgstr "< Limit indikatora lođeg:"
#. module: account_report
#: view:account.report.report:0
#: selection:account.report.report,status:0
msgid "Very Good"
-msgstr ""
+msgstr "Vrlo dobro"
#. module: account_report
#: field:account.report.report,note:0
msgid "Note"
-msgstr ""
+msgstr "Bilješka"
#. module: account_report
#: rml:accounting.report:0
#: rml:print.indicators:0
msgid "Currency:"
-msgstr ""
+msgstr "Valuta:"
#. module: account_report
#: field:account.report.report,status:0
msgid "Status"
-msgstr ""
+msgstr "Status"
#. module: account_report
#: help:account.report.report,disp_tree:0
@@ -245,6 +245,9 @@ msgid ""
"When the indicators are printed, if one indicator is set with this field to "
"True, then it will display one more graphs with all its children in tree"
msgstr ""
+"Kad su indikatori ispisani, ako je jedan od indikatora postavljen sa ovim "
+"poljem, prikazat će jedan ili više grafova sa svim svojim podindikatorima u "
+"stablu."
#. module: account_report
#: selection:account.report.report,status:0
@@ -254,32 +257,32 @@ msgstr "Normalno"
#. module: account_report
#: view:account.report.report:0
msgid "Example: (balance(['6','45'],-1) - credit(['7'])) / report('RPT1')"
-msgstr ""
+msgstr "Npr: (balance(['6','45'],-1) - credit(['7'])) / report('RPT1')"
#. module: account_report
#: field:account.report.report,active:0
msgid "Active"
-msgstr ""
+msgstr "Aktivan"
#. module: account_report
#: field:account.report.report,disp_tree:0
msgid "Display Tree"
-msgstr ""
+msgstr "Prikaz stabla"
#. module: account_report
#: selection:print.indicators,init,select_base:0
msgid "Based On Fiscal Years"
-msgstr ""
+msgstr "Bazirano na fiskalnim godinama"
#. module: account_report
#: model:ir.model,name:account_report.model_account_report_report
msgid "Account reporting"
-msgstr ""
+msgstr "Izvještavanje za konto"
#. module: account_report
#: view:account.report.report:0
msgid "Account Balance:"
-msgstr ""
+msgstr "Saldo konta:"
#. module: account_report
#: rml:print.indicators:0
@@ -299,62 +302,63 @@ msgstr "Izraz"
#. module: account_report
#: view:account.report.report:0
msgid "Accounting reporting"
-msgstr ""
+msgstr "Izvještavanje za računovodsvto"
#. module: account_report
#: model:ir.actions.act_window,name:account_report.action_account_report_form
#: model:ir.ui.menu,name:account_report.menu_action_account_report_form
msgid "New Reporting Item Formula"
-msgstr ""
+msgstr "Formula nove stavke izvještavanja"
#. module: account_report
#: field:account.report.report,code:0
#: rml:accounting.report:0
msgid "Code"
-msgstr ""
+msgstr "Šifra"
#. module: account_report
#: field:account.report.history,tmp:0
msgid "temp"
-msgstr ""
+msgstr "temp"
#. module: account_report
#: field:account.report.history,period_id:0
msgid "Period"
-msgstr ""
+msgstr "Period"
#. module: account_report
#: view:account.report.report:0
msgid "General"
-msgstr ""
+msgstr "Općenito"
#. module: account_report
#: view:account.report.report:0
msgid "Legend of operators"
-msgstr ""
+msgstr "Legenda operatora"
#. module: account_report
#: wizard_button:print.indicators,init,end:0
#: wizard_button:print.indicators,next,end:0
#: wizard_button:print.indicators.pdf,init,end:0
msgid "Cancel"
-msgstr ""
+msgstr "Otkaži"
#. module: account_report
#: field:account.report.report,child_ids:0
msgid "Children"
-msgstr ""
+msgstr "Potomci"
#. module: account_report
#: constraint:ir.model:0
msgid ""
"The Object name must start with x_ and not contain any special character !"
msgstr ""
+"Naziv objekta mora počinjati sa x_ i ne smije sadržavati specijalne znakove!"
#. module: account_report
#: help:account.report.report,goodness_limit:0
msgid "This Value sets the limit of goodness."
-msgstr ""
+msgstr "Ova vrijednost postavlja limit za dobro."
#. module: account_report
#: model:ir.actions.wizard,name:account_report.wizard_print_indicators
@@ -362,7 +366,7 @@ msgstr ""
#: wizard_view:print.indicators,init:0
#: wizard_view:print.indicators,next:0
msgid "Print Indicators"
-msgstr ""
+msgstr "Ispis indikatora"
#. module: account_report
#: view:account.report.report:0
@@ -373,12 +377,12 @@ msgstr ""
#: rml:accounting.report:0
#: rml:print.indicators:0
msgid "Printing date:"
-msgstr ""
+msgstr "Datum ispisa:"
#. module: account_report
#: model:ir.actions.wizard,name:account_report.wizard_indicators_with_pdf
msgid "Indicators in PDF"
-msgstr ""
+msgstr "Indikatori u PDF-u"
#. module: account_report
#: rml:accounting.report:0
@@ -389,18 +393,18 @@ msgstr ""
#. module: account_report
#: rml:accounting.report:0
msgid "Accounting Report"
-msgstr ""
+msgstr "Računovodstveni izvještaj"
#. module: account_report
#: field:account.report.report,goodness_limit:0
msgid "Goodness Indicator Limit"
-msgstr ""
+msgstr "Limit indikatora dobroga"
#. module: account_report
#: model:ir.actions.act_window,name:account_report.action_account_report_tree_view_other
#: model:ir.ui.menu,name:account_report.menu_action_account_report_tree_view_other
msgid "Other reports"
-msgstr ""
+msgstr "Ostali izvještaji"
#. module: account_report
#: view:account.report.report:0
@@ -408,6 +412,8 @@ msgid ""
"Note: The second arguement 'fiscalyear' and 'period' are optional "
"arguements.If the value is -1,previous fiscalyear or period is considered."
msgstr ""
+"Napomena: Drugi argumenti 'fiscalyear' i 'period' su opcionalni. Ako je "
+"vrijdnost -1, uzima se prethodna fiskalna gofina odn. period."
#. module: account_report
#: rml:print.indicators:0
@@ -418,41 +424,41 @@ msgstr ""
#: model:ir.actions.act_window,name:account_report.action_account_report_tree_view_fiscal
#: model:ir.ui.menu,name:account_report.menu_action_account_report_tree_view_fiscal
msgid "Fiscal Statements reporting"
-msgstr ""
+msgstr "Izještavanje fiskalnim izvodima"
#. module: account_report
#: selection:print.indicators,init,select_base:0
msgid "Based on Fiscal Periods"
-msgstr ""
+msgstr "Bazirano na fiskalnim periodima"
#. module: account_report
#: model:ir.actions.report.xml,name:account_report.report_print_indicators
#: rml:print.indicators:0
msgid "Indicators"
-msgstr ""
+msgstr "Indikatori"
#. module: account_report
#: wizard_view:print.indicators.pdf,init:0
msgid "Print Indicators with PDF"
-msgstr ""
+msgstr "Ipis indikatora u PDF"
#. module: account_report
#: model:ir.actions.act_window,name:account_report.action_account_report_tree_view_indicator
#: model:ir.ui.menu,name:account_report.menu_action_account_report_tree_view_indicator
msgid "Indicators reporting"
-msgstr ""
+msgstr "Izvještavanje indikatora"
#. module: account_report
#: field:account.report.report,name:0
#: rml:accounting.report:0
#: rml:print.indicators:0
msgid "Name"
-msgstr ""
+msgstr "Naziv"
#. module: account_report
#: wizard_field:print.indicators,next,base_selection:0
msgid "Select Criteria"
-msgstr ""
+msgstr "Odaberite kriterij"
#. module: account_report
#: view:account.report.report:0
@@ -462,7 +468,7 @@ msgstr ""
#. module: account_report
#: field:account.report.history,fiscalyear_id:0
msgid "Fiscal Year"
-msgstr ""
+msgstr "Fisklana godina"
#. module: account_report
#: model:ir.actions.act_window,name:account_report.action_account_report_tree
@@ -470,22 +476,22 @@ msgstr ""
#: model:ir.ui.menu,name:account_report.menu_action_account_report_tree_define
#: model:ir.ui.menu,name:account_report.menu_action_account_report_tree_view
msgid "Custom reporting"
-msgstr ""
+msgstr "Prilagođeno izvještavanje"
#. module: account_report
#: rml:print.indicators:0
msgid "Page"
-msgstr ""
+msgstr "Stranica"
#. module: account_report
#: selection:account.report.report,type:0
msgid "View"
-msgstr ""
+msgstr "Prikaz"
#. module: account_report
#: rml:print.indicators:0
msgid "Indicators -"
-msgstr ""
+msgstr "Indikatori -"
#. module: account_report
#: help:account.report.report,disp_graph:0
@@ -493,26 +499,28 @@ msgid ""
"If the field is set to True, information will be printed as a Graph, "
"otherwise as an array."
msgstr ""
+"Ukoliko je ovo polje postavljeno, informacija će biti ispisana kao grafikon. "
+"U suprotnom, biti će ispisana kao niz."
#. module: account_report
#: view:account.report.report:0
msgid "Return value for status"
-msgstr ""
+msgstr "Povratna vrijednost statusa"
#. module: account_report
#: field:account.report.report,sequence:0
msgid "Sequence"
-msgstr ""
+msgstr "Sekvenca"
#. module: account_report
#: rml:accounting.report:0
msgid "Amount"
-msgstr ""
+msgstr "Iznos"
#. module: account_report
#: rml:print.indicators:0
msgid "1cm 27.7cm 20cm 27.7cm"
-msgstr ""
+msgstr "1cm 27.7cm 20cm 27.7cm"
#. module: account_report
#: model:ir.module.module,description:account_report.module_meta_information
@@ -522,8 +530,12 @@ msgid ""
" Indicators\n"
" "
msgstr ""
+"Finansijsko i računovodstveno izvještavanje\n"
+" Fiskalni izvodi\n"
+" Indikator\n"
+" "
#. module: account_report
#: selection:account.report.report,type:0
msgid "Fiscal Statement"
-msgstr ""
+msgstr "Fiskalni izvod"
diff --git a/addons/account_reporting/i18n/bs.po b/addons/account_reporting/i18n/bs.po
index 9c9a849642e..91ce3faaffc 100644
--- a/addons/account_reporting/i18n/bs.po
+++ b/addons/account_reporting/i18n/bs.po
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 5.0.4\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-07-07 09:23+0000\n"
+"PO-Revision-Date: 2010-08-01 17:51+0000\n"
"Last-Translator: Bojan Markovic \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: 2010-07-08 03:50+0000\n"
+"X-Launchpad-Export-Date: 2010-08-02 03:49+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_reporting
@@ -26,37 +26,38 @@ msgstr "šifra"
msgid ""
"The Object name must start with x_ and not contain any special character !"
msgstr ""
+"Naziv objekta mora počinjati sa x_ i ne smije sadržavati specijalne znakove!"
#. module: account_reporting
#: selection:account.report.bs,font_style:0
msgid "Helvetica-Bold"
-msgstr ""
+msgstr "Helvetica-Bold"
#. module: account_reporting
#: selection:account.report.bs,font_style:0
msgid "Helvetica"
-msgstr ""
+msgstr "Helvetica"
#. module: account_reporting
#: field:account.report.bs,note:0
msgid "Note"
-msgstr ""
+msgstr "Bilješka"
#. module: account_reporting
#: field:account.report.bs,report_type:0
msgid "Report Type"
-msgstr ""
+msgstr "Vrsta izvještaja"
#. module: account_reporting
#: model:ir.ui.menu,name:account_reporting.action_account_report_bs_form
#: model:ir.ui.menu,name:account_reporting.menu_finan_config_BSheet
msgid "Balance Sheet Report"
-msgstr ""
+msgstr "Bilansni izvješaj"
#. module: account_reporting
#: constraint:ir.actions.act_window:0
msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "Neispravan naziv modela u definiciji zadatka."
#. module: account_reporting
#: selection:account.report.bs,font_style:0
@@ -66,27 +67,27 @@ msgstr "Courier"
#. module: account_reporting
#: selection:account.report.bs,font_style:0
msgid "Courier-BoldOblique"
-msgstr ""
+msgstr "Courier-BoldOblique"
#. module: account_reporting
#: wizard_button:account.account.balancesheet.report,init,report:0
msgid "Print BalanceSheet"
-msgstr ""
+msgstr "Ispis bilansnog izvještaja"
#. module: account_reporting
#: help:account.account.balancesheet.report,init,periods:0
msgid "All periods if empty"
-msgstr ""
+msgstr "Ako je prazno, sva razdoblja"
#. module: account_reporting
#: field:account.report.bs,color_font:0
msgid "Font Color"
-msgstr ""
+msgstr "Boja slova"
#. module: account_reporting
#: selection:account.report.bs,report_type:0
msgid "Report Objects With Accounts and child of Accounts"
-msgstr ""
+msgstr "Objekti izvještaja sa kontima i podkontima"
#. module: account_reporting
#: model:ir.module.module,description:account_reporting.module_meta_information
@@ -94,6 +95,8 @@ msgid ""
"Financial and accounting reporting\n"
" Balance Sheet Report"
msgstr ""
+"Finansijsko i računovodstveno izvještavanje\n"
+" Bilansni izvještaj"
#. module: account_reporting
#: selection:account.report.bs,report_type:0
@@ -103,7 +106,7 @@ msgstr "Objekti izvještaja sa kontima"
#. module: account_reporting
#: selection:account.report.bs,font_style:0
msgid "Courier-Oblique"
-msgstr ""
+msgstr "Courier-Oblique"
#. module: account_reporting
#: constraint:ir.ui.view:0
@@ -114,32 +117,32 @@ msgstr "Neodgovarajući XML za arhitekturu prikaza!"
#: field:account.report.bs,name:0
#: field:color.rml,name:0
msgid "Name"
-msgstr ""
+msgstr "Naziv"
#. module: account_reporting
#: view:account.report.bs:0
msgid "Account reporting"
-msgstr ""
+msgstr "Računovodstveno izvještavanje"
#. module: account_reporting
#: model:ir.ui.menu,name:account_reporting.bs_report_action_form
msgid "Balance Sheet Report Form"
-msgstr ""
+msgstr "Forma bilansnog izvještaja"
#. module: account_reporting
#: view:account.report.bs:0
msgid "Notes"
-msgstr ""
+msgstr "Bilješke"
#. module: account_reporting
#: selection:account.report.bs,font_style:0
msgid "Times-BoldItalic"
-msgstr ""
+msgstr "Times-BoldItalic"
#. module: account_reporting
#: model:ir.model,name:account_reporting.model_account_report_bs
msgid "Account reporting for Balance Sheet"
-msgstr ""
+msgstr "Računovodstveno izvještavanje za bilansu stanja"
#. module: account_reporting
#: selection:account.report.bs,font_style:0
@@ -154,32 +157,32 @@ msgstr "Times-Italic"
#. module: account_reporting
#: selection:account.report.bs,report_type:0
msgid "Report Objects Only"
-msgstr ""
+msgstr "Samo objekti izvještaja"
#. module: account_reporting
#: model:ir.model,name:account_reporting.model_color_rml
msgid "Rml Colors"
-msgstr ""
+msgstr "Rml boje"
#. module: account_reporting
#: model:ir.module.module,shortdesc:account_reporting.module_meta_information
msgid "Reporting of Balancesheet for accounting"
-msgstr ""
+msgstr "Bilansno izvještavanje za računovodstvo"
#. module: account_reporting
#: field:account.report.bs,code:0
msgid "Code"
-msgstr ""
+msgstr "Šifra"
#. module: account_reporting
#: field:account.report.bs,parent_id:0
msgid "Parent"
-msgstr ""
+msgstr "Roditelj"
#. module: account_reporting
#: field:account.report.bs,sequence:0
msgid "Sequence"
-msgstr ""
+msgstr "Sekvenca"
#. module: account_reporting
#: selection:account.report.bs,font_style:0
@@ -194,13 +197,13 @@ msgstr "Općenito"
#. module: account_reporting
#: wizard_field:account.account.balancesheet.report,init,fiscalyear:0
msgid "Fiscal year"
-msgstr ""
+msgstr "Fiskalna godina"
#. module: account_reporting
#: view:account.report.bs:0
#: field:account.report.bs,account_id:0
msgid "Accounts"
-msgstr ""
+msgstr "Konta"
#. module: account_reporting
#: wizard_field:account.account.balancesheet.report,init,periods:0
@@ -210,34 +213,34 @@ msgstr "Periodi"
#. module: account_reporting
#: field:account.report.bs,color_back:0
msgid "Back Color"
-msgstr ""
+msgstr "Boja pozadine"
#. module: account_reporting
#: field:account.report.bs,child_id:0
msgid "Children"
-msgstr ""
+msgstr "Potomci"
#. module: account_reporting
#: wizard_button:account.account.balancesheet.report,init,end:0
msgid "Cancel"
-msgstr ""
+msgstr "Otkaži"
#. module: account_reporting
#: selection:account.report.bs,font_style:0
msgid "Times-Roman"
-msgstr ""
+msgstr "Times-Roman"
#. module: account_reporting
#: selection:account.report.bs,font_style:0
msgid "Helvetica-Oblique"
-msgstr ""
+msgstr "Helvetica-Oblique"
#. module: account_reporting
#: field:account.report.bs,font_style:0
msgid "Font"
-msgstr ""
+msgstr "Font"
#. module: account_reporting
#: wizard_view:account.account.balancesheet.report,init:0
msgid "Customize Report"
-msgstr ""
+msgstr "Prilagodite izvještaj"
diff --git a/addons/account_voucher/voucher.py b/addons/account_voucher/voucher.py
index e1005512127..22e06a25f3a 100644
--- a/addons/account_voucher/voucher.py
+++ b/addons/account_voucher/voucher.py
@@ -269,8 +269,16 @@ class account_voucher(osv.osv):
continue
journal = journal_pool.browse(cr, uid, inv.journal_id.id)
- if journal.sequence_id:
- name = sequence_pool.get_id(cr, uid, journal.sequence_id.id)
+ if inv.type in ('journal_pur_voucher', 'journal_sale_vou'):
+ if journal.invoice_sequence_id:
+ name = sequence_pool.get_id(cr, uid, journal.invoice_sequence_id.id)
+ else:
+ raise osv.except_osv(_('Error !'), _('Please define invoice sequence on %s journal !' % (journal.name)))
+ else:
+ if journal.sequence_id:
+ name = sequence_pool.get_id(cr, uid, journal.sequence_id.id)
+ else:
+ raise osv.except_osv(_('Error !'), _('Please define sequence on journal !'))
ref = False
if inv.type in ('journal_pur_voucher', 'bank_rec_voucher', 'rec_voucher'):
@@ -462,25 +470,24 @@ class account_voucher_line(osv.osv):
account_id = False
partner = partner_pool.browse(cr, uid, partner_id)
+ balance = 0.0
- if type1 in ('rec_voucher','bank_rec_voucher', 'journal_voucher'):
+ if type1 in ('rec_voucher', 'bank_rec_voucher', 'journal_voucher'):
account_id = partner.property_account_receivable.id
balance = partner.credit
ttype = 'cr'
- elif type1 in ('pay_voucher','bank_pay_voucher','cont_voucher') :
+ elif type1 in ('pay_voucher', 'bank_pay_voucher', 'journal_voucher') :
account_id = partner.property_account_payable.id
balance = partner.debit
ttype = 'dr'
elif type1 in ('journal_sale_vou') :
account_id = partner.property_account_receivable.id
- balance = partner.credit
ttype = 'dr'
elif type1 in ('journal_pur_voucher') :
account_id = partner.property_account_payable.id
- balance = partner.debit
ttype = 'cr'
if company.currency_id != currency:
diff --git a/addons/account_voucher/voucher_view.xml b/addons/account_voucher/voucher_view.xml
index 46e1f7342c1..aaebfe4c09d 100644
--- a/addons/account_voucher/voucher_view.xml
+++ b/addons/account_voucher/voucher_view.xml
@@ -89,7 +89,7 @@
-
+
@@ -126,7 +126,7 @@
-
+
diff --git a/addons/account_voucher_payment/account_voucher_payment.py b/addons/account_voucher_payment/account_voucher_payment.py
index 2bae0e6f75a..8c4e3984da4 100755
--- a/addons/account_voucher_payment/account_voucher_payment.py
+++ b/addons/account_voucher_payment/account_voucher_payment.py
@@ -40,13 +40,15 @@ class account_invoice(osv.osv):
@return: Returns a list of ids based on search domain
"""
+ if not context:
+ context = {}
ttype = context.get('ttype', False)
if ttype and ttype in ('rec_voucher', 'bank_rec_voucher'):
args += [('type','in', ['out_invoice', 'in_refund'])]
elif ttype and ttype in ('pay_voucher', 'bank_pay_voucher'):
args += [('type','in', ['in_invoice', 'out_refund'])]
elif ttype and ttype in('journal_sale_vou', 'journal_pur_voucher', 'journal_voucher'):
- raise osv.except_osv(_('Invalid action !'), _('You can not reconcile sales, purchase, or journal entry with invoice !'))
+ raise osv.except_osv(_('Invalid action !'), _('You can not reconcile sales, purchase, or journal voucher with invoice !'))
args += [('type','=', 'do_not_allow_search')]
res = super(account_invoice, self).search(cr, user, args, offset, limit, order, context, count)
@@ -79,13 +81,21 @@ class account_voucher(osv.osv):
invoice_pool = self.pool.get('account.invoice')
for inv in self.browse(cr, uid, ids):
-
+
if inv.move_id:
continue
-
+
journal = journal_pool.browse(cr, uid, inv.journal_id.id)
- if journal.sequence_id:
- name = sequence_pool.get_id(cr, uid, journal.sequence_id.id)
+ if inv.type in ('journal_pur_voucher', 'journal_sale_vou'):
+ if journal.invoice_sequence_id:
+ name = sequence_pool.get_id(cr, uid, journal.invoice_sequence_id.id)
+ else:
+ raise osv.except_osv(_('Error !'), _('Please define invoice sequence on %s journal !' % (journal.name)))
+ else:
+ if journal.sequence_id:
+ name = sequence_pool.get_id(cr, uid, journal.sequence_id.id)
+ else:
+ raise osv.except_osv(_('Error !'), _('Please define sequence on journal !'))
ref = False
if inv.type in ('journal_pur_voucher', 'bank_rec_voucher', 'rec_voucher'):
diff --git a/addons/crm/__openerp__.py b/addons/crm/__openerp__.py
index 0b170a85924..16306abfb44 100644
--- a/addons/crm/__openerp__.py
+++ b/addons/crm/__openerp__.py
@@ -124,7 +124,7 @@ Create dashboard for CRM that includes:
],
'test': [
'test/test_crm_lead.yml',
- #'test/test_crm_meeting.yml',
+ 'test/test_crm_meeting.yml',
'test/test_crm_opportunity.yml',
'test/test_crm_phonecall.yml',
],
diff --git a/addons/crm/crm_lead.py b/addons/crm/crm_lead.py
index 0ad779d403f..6606dfdef4a 100644
--- a/addons/crm/crm_lead.py
+++ b/addons/crm/crm_lead.py
@@ -163,11 +163,6 @@ class crm_lead(osv.osv, crm_case):
'priority': lambda *a: crm.AVAILABLE_PRIORITIES[2][0],
}
- def create(self, cr, uid, vals, context=None):
- if not vals.get('stage_id',False):
- raise osv.except_osv('Error', _('There is no stage defined for this Sales Team'))
- return super(crm_lead, self).create(cr, uid, vals, context=context)
-
def onchange_partner_address_id(self, cr, uid, ids, add, email=False):
"""This function returns value of partner email based on Partner Address
@param self: The object pointer
@@ -181,7 +176,7 @@ class crm_lead(osv.osv, crm_case):
return {'value': {'email_from': False, 'country_id': False}}
address = self.pool.get('res.partner.address').browse(cr, uid, add)
return {'value': {'email_from': address.email, 'phone': address.phone, 'country_id': address.country_id.id}}
-
+
def case_open(self, cr, uid, ids, *args):
"""Overrides cancel for crm_case for setting Open Date
@param self: The object pointer
@@ -194,9 +189,10 @@ class crm_lead(osv.osv, crm_case):
res = super(crm_lead, self).case_open(cr, uid, ids, *args)
if old_state == 'draft':
stage_id = super(crm_lead, self).stage_next(cr, uid, ids, *args)
- if not stage_id:
- raise osv.except_osv(_('Warning !'), _('There is no stage defined for this Sale Team.'))
- value = self.onchange_stage_id(cr, uid, ids, stage_id, context={})['value']
+ if stage_id:
+ value = self.onchange_stage_id(cr, uid, ids, stage_id, context={})['value']
+ else:
+ value = {}
value.update({'date_open': time.strftime('%Y-%m-%d %H:%M:%S'), 'stage_id': stage_id})
self.write(cr, uid, ids, value)
diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index 14a23bd6a18..709178a2cc3 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -317,20 +317,6 @@
help="Show Sales Team"/>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -343,6 +329,20 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/addons/crm/crm_opportunity_view.xml b/addons/crm/crm_opportunity_view.xml
index 0ab4529b75f..ca094469c69 100644
--- a/addons/crm/crm_opportunity_view.xml
+++ b/addons/crm/crm_opportunity_view.xml
@@ -309,20 +309,6 @@
help="Show Sales Team"/>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -345,6 +331,20 @@
help="Expected Closing" domain="[]"
context="{'group_by':'date_deadline'}" />
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/addons/crm/report/crm_lead_report_view.xml b/addons/crm/report/crm_lead_report_view.xml
index 9006fda66cb..36e0633cfe9 100644
--- a/addons/crm/report/crm_lead_report_view.xml
+++ b/addons/crm/report/crm_lead_report_view.xml
@@ -131,7 +131,7 @@
domain="[]" context="{'group_by':'name'}" />
-
+
diff --git a/addons/crm/report/crm_phonecall_report_view.xml b/addons/crm/report/crm_phonecall_report_view.xml
index dabacecd978..120bc9f859d 100644
--- a/addons/crm/report/crm_phonecall_report_view.xml
+++ b/addons/crm/report/crm_phonecall_report_view.xml
@@ -145,7 +145,7 @@
-
+
diff --git a/addons/crm/test/test_crm_meeting.yml b/addons/crm/test/test_crm_meeting.yml
index 6365c913b1f..ef86261f091 100644
--- a/addons/crm/test/test_crm_meeting.yml
+++ b/addons/crm/test/test_crm_meeting.yml
@@ -55,8 +55,8 @@
I will search for one of the recurrent event and count the number of meeting.
-
!python {model: crm.meeting}: |
- ids = self.search(cr, uid, [('date', '>=', '2010-05-21 00:00:00'), ('date', '<=', '2010-04-21 00:00:00')] )
- assert len(ids) == 9
+ ids = self.search(cr, uid, [('date', '>=', '2010-04-21 00:00:00'), ('date', '<=', '2010-05-21 00:00:00')] )
+ assert len(ids) == 10
- |
Now If I want to edit meetings information for all occurence I click on "Edit All" button.
@@ -81,11 +81,6 @@
partner_id: base.res_partner_9
user_ids:
- base.user_demo
-- |
- If I set Send mail boolean as True I can see that an email is send to
- specified email address with proper meeting information.
--
- #This is not working for send mail boolean as True.
-
I click on "Invite" button of "Invite attendee" wizard.
-
diff --git a/addons/crm/test/test_crm_phonecall.yml b/addons/crm/test/test_crm_phonecall.yml
index af28c19a10e..1351ba88199 100644
--- a/addons/crm/test/test_crm_phonecall.yml
+++ b/addons/crm/test/test_crm_phonecall.yml
@@ -72,7 +72,6 @@
partner_address_id: base.res_partner_address_1
partner_id: base.res_partner_9
phonecall_id: 'crm_phonecall_interviewcall0'
- rrule_type: weekly
state: open
- |
diff --git a/addons/crm_claim/report/crm_claim_report_view.xml b/addons/crm_claim/report/crm_claim_report_view.xml
index 45aec4ead2b..37fd3ec015a 100644
--- a/addons/crm_claim/report/crm_claim_report_view.xml
+++ b/addons/crm_claim/report/crm_claim_report_view.xml
@@ -162,12 +162,12 @@
domain="[]" context="{'group_by':'name'}" />
-
+
-
diff --git a/addons/crm_fundraising/report/crm_fundraising_report_view.xml b/addons/crm_fundraising/report/crm_fundraising_report_view.xml
index 94bf096c622..a0fd2e35583 100644
--- a/addons/crm_fundraising/report/crm_fundraising_report_view.xml
+++ b/addons/crm_fundraising/report/crm_fundraising_report_view.xml
@@ -153,12 +153,12 @@
-
+
-
diff --git a/addons/crm_helpdesk/report/crm_helpdesk_report_view.xml b/addons/crm_helpdesk/report/crm_helpdesk_report_view.xml
index ee7b74c7191..2544a506fd5 100644
--- a/addons/crm_helpdesk/report/crm_helpdesk_report_view.xml
+++ b/addons/crm_helpdesk/report/crm_helpdesk_report_view.xml
@@ -144,7 +144,7 @@
-
+
diff --git a/addons/document/test/document_test2.yml b/addons/document/test/document_test2.yml
index 712399afac3..34e834a5306 100644
--- a/addons/document/test/document_test2.yml
+++ b/addons/document/test/document_test2.yml
@@ -1,10 +1,10 @@
--
- In order to test the document management
-
- I make sure the default installation has some storage and root directory.
+ In order to test the document management I make sure the default installation has some storage.
-
!assert {model: document.storage, id: storage_default }:
- id != False
+-
+ I make sure the default installation has some root directory.
-
!assert {model: document.directory, id: dir_root}:
- storage_id != False
@@ -19,11 +19,12 @@
defaults work)
-
!record {model: ir.attachment, id: file_test1 }:
- name: Test file
+ name: Test file.txt
-
I delete the attachment from the root folder
-
- !delete {model: ir.attachment, id: file_test1, search: }
+ !python {model: ir.attachment}: |
+ self.unlink(cr, uid, [ref('file_test1')])
-
I create an attachment into the Testing folder.
-
@@ -34,13 +35,13 @@
I update the attachment with data, namely "abcd"
-
!record {model: ir.attachment, id: file_test2 }:
- datas: "abcd"
+ datas: "YWJjZA==\n"
-
I test that the datas of the attachment are correct
-
!assert {model: ir.attachment, id: file_test2 }:
- - datas == "abcd\n"
- - file_size == 5
+ - datas == "YWJjZA==\n"
+ - file_size == 4
- file_type == 'text/plain'
-
I rename the attachment.
@@ -57,9 +58,9 @@
I create an attachment to a 3rd resource, eg. a res.country
-
!record {model: ir.attachment, id: attach_3rd }:
- name: 'Res country attachment.txt'
+ name: 'Country attachment.txt'
parent_id: dir_tests
- datas: 'defg'
+ datas: "Q291bnRyeSBhdHRhY2htZW50IGNvbnRlbnQ=\n"
res_model: res.country
res_id: !eval ref("base.za")
-
@@ -69,4 +70,7 @@
ids = self.search(cr, uid, [('res_model', '=', 'res.country'), ('res_id', '=', ref("base.za"))])
assert ids == [ ref("attach_3rd")], ids
-
- !delete {model: ir.attachment, id: attach_3rd, search: }
+ I delete the attachment
+-
+ !python {model: ir.attachment}: |
+ self.unlink(cr, uid, [ref('attach_3rd')])
diff --git a/addons/document_ics/document_ics_config_wizard.xml b/addons/document_ics/document_ics_config_wizard.xml
index 39ec392d3f9..d19951deb38 100644
--- a/addons/document_ics/document_ics_config_wizard.xml
+++ b/addons/document_ics/document_ics_config_wizard.xml
@@ -23,6 +23,9 @@
15
+
+ Configure
+
diff --git a/addons/hr/i18n/fr.po b/addons/hr/i18n/fr.po
index a68c6d05cfc..089a82e7615 100644
--- a/addons/hr/i18n/fr.po
+++ b/addons/hr/i18n/fr.po
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 5.0.0\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-11-17 07:24+0000\n"
-"Last-Translator: Fabien (Open ERP) \n"
+"PO-Revision-Date: 2010-07-30 14:35+0000\n"
+"Last-Translator: Julien Thewys (OpenERP) \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: 2010-06-22 04:15+0000\n"
+"X-Launchpad-Export-Date: 2010-07-31 03:40+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: hr
@@ -57,7 +57,7 @@ msgstr "Parents"
#. module: hr
#: constraint:ir.actions.act_window:0
msgid "Invalid model name in the action definition."
-msgstr "Nom de Modèle non valide pour la définition de l'action."
+msgstr "Nom de modèle invalide pour la définition de l'action."
#. module: hr
#: view:hr.department:0
diff --git a/addons/hr_evaluation/report/hr_evaluation_report_view.xml b/addons/hr_evaluation/report/hr_evaluation_report_view.xml
index c18a385ea11..b4ab2743c0b 100644
--- a/addons/hr_evaluation/report/hr_evaluation_report_view.xml
+++ b/addons/hr_evaluation/report/hr_evaluation_report_view.xml
@@ -74,7 +74,7 @@
-
+
diff --git a/addons/hr_evaluation/test/test_hr_evaluation.yml b/addons/hr_evaluation/test/test_hr_evaluation.yml
index 6e9b11df3bc..cdee65dde26 100644
--- a/addons/hr_evaluation/test/test_hr_evaluation.yml
+++ b/addons/hr_evaluation/test/test_hr_evaluation.yml
@@ -1,16 +1,14 @@
-- |
+-
In order to test hr_evaluation module for OpenERP, I will create plan then create evaluation under that plan.
-
- |
- Given that I have "R & D" Department for employee.
--
+
+ I create new Department.
+-
!record {model: hr.department, id: hr_department_rd0}:
manager_id: base.user_root
- name: 'R & D '
--
- |
- Given that I have Employee “Mark Johnson” which take Interview.
- select "R & D" Department.
+ name: 'R & D'
+-
+ I create a new employee.
-
!record {model: hr.employee, id: hr_employee_employee0}:
address_home_id: base.res_partner_address_1
@@ -20,32 +18,31 @@
name: Mark Johnson
user_id: base.user_root
department_id: 'hr_department_rd0'
-- |
- I create new employee “Phil Graves ” and select "Mark Johnson" as
- Manager.
--
+-
+ I create another new employee and assign first one as it's Manager.
+-
!record {model: hr.employee, id: hr_employee_employee1}:
address_home_id: base.res_partner_address_3000
company_id: base.main_company
gender: male
- name: Phil Graves
+ name: Phil Graves
user_id: base.user_demo
parent_id: 'hr_employee_employee0'
-- |
- I Create "Employee Evaluation" survey for Manager's Evaluation Plan.
+-
+ I Create an "Employee Evaluation" survey for Manager's Evaluation Plan.
-
!record {model: 'survey', id: survey_0}:
title: 'Employee Evaluation'
max_response_limit: 20
response_user: 2
-- |
- I Create "Employee Evaluation" page in "Employee Evaluation" survey.
+-
+ I Create an "Employee Evaluation" page in "Employee Evaluation" survey.
-
!record {model: 'survey.page', id: survey_employee_page_0}:
title: 'Employee Evaluation'
survey_id: survey_0
-- |
+-
I Create "What is your Name" question in "Employee Evaluation" survey page.
-
!record {model: 'survey.question', id: survey_p_question_0}:
@@ -53,7 +50,7 @@
type: 'single_textbox'
sequence: 1
page_id: survey_employee_page_0
-- |
+-
I Create "What is your gender" Question in "Employee Evaluation" survey page.
-
!record {model: 'survey.question', id: survey_p_question_1}:
@@ -62,30 +59,30 @@
sequence: 2
is_require_answer: true
page_id: survey_employee_page_0
-- |
+-
I Create "Male" answer in question "What is your gender?"
-
!record {model: 'survey.answer', id: survey_p_1_1}:
answer: 'Male'
sequence: 1
question_id : survey_p_question_1
-- |
+-
I Create "Female" answer in question "What is your gender?"
-
!record {model: 'survey.answer', id: survey_p_1_2}:
answer: 'Female'
sequence: 2
question_id : survey_p_question_1
-
-- |
- Now Survey set in open state.
+
+-
+ I set the survey in open state.
-
!python {model: survey}: |
self.survey_open(cr, uid, [ref("survey_0")], context)
-- |
- I creating a Evaluation plan and select "Employee Evaluation" survey for "Send to Subordinates" and "Final interview with Manager" Phase.
--
+-
+ I create an Evaluation plan and select "Employee Evaluation" survey for "Send to Subordinates" and "Final interview with Manager" Phase.
+-
!record {model: hr_evaluation.plan, id: hr_evaluation_plan_managersplan0}:
company_id: base.main_company
month_first: 3
@@ -99,54 +96,52 @@
name: Final Interview with manager
sequence: 2
survey_id: 'survey_0'
-
-- |
- Now I create Evaluation for "Phil Graves" Employee under "Manager Evaluation Plan".
--
+
+-
+ I create an Evaluation for employee under "Manager Evaluation Plan".
+-
!record {model: hr_evaluation.evaluation, id: hr_evaluation_evaluation_0}:
date: '2010-06-28'
employee_id: 'hr_employee_employee1'
plan_id: 'hr_evaluation_plan_managersplan0'
progress: 0.0
state: draft
-- |
- I check that Evaluation is in "Draft" state.
+-
+ I check that evaluation is in "Draft" state.
-
!assert {model: hr_evaluation.evaluation, id: hr_evaluation_evaluation_0}:
- - state == 'draft'
-- |
- I start Evaluation process by click on "Start Evaluation" button.
+ - state == 'draft'
+-
+ I start the evaluation process by click on "Start Evaluation" button.
-
!python {model: hr_evaluation.evaluation}: |
- self.button_plan_in_progress(cr, uid, [ref('hr_evaluation_evaluation_0')])
+ self.button_plan_in_progress(cr, uid, [ref('hr_evaluation_evaluation_0')])
-- |
- After that Manager Evaluation plan is In Progress.
- I close this servey request by giving answer of survey question.
+-
+ I close this servey request by giving answer of survey question.
-
!python {model: hr.evaluation.interview}: |
self.survey_req_done(cr, uid, [ref('hr_evaluation_evaluation_0')])
-- |
- I click on "Final Validation" button to finalize Evaluation.
--
+-
+ I click on "Final Validation" button to finalise evaluation.
+-
!python {model: hr_evaluation.evaluation}: |
self.button_final_validation(cr, uid, [ref("hr_evaluation.hr_evaluation_evaluation_0")],
{"active_ids": [ref("hr_evaluation.menu_open_view_hr_evaluation_tree")]})
-
-- |
+
+-
I check that state is "Final Validation".
-
- !assert {model: hr_evaluation.evaluation, id: hr_evaluation_evaluation_0}:
- - state == 'progress'
-- |
+ !assert {model: hr_evaluation.evaluation, id: hr_evaluation_evaluation_0}:
+ - state == 'progress'
+-
Give Rating "Meet expectations" by selecting overall Rating.
--
+-
!record {model: hr_evaluation.evaluation, id: hr_evaluation.hr_evaluation_evaluation_0}:
rating: '2'
-
-- |
+
+-
I close this Evaluation by click on "Done" button of this wizard.
--
+-
!python {model: hr_evaluation.evaluation}: |
self.button_done(cr, uid, [ref("hr_evaluation.hr_evaluation_evaluation_0")], {"active_ids": [ref("hr_evaluation.menu_open_view_hr_evaluation_tree")]})
-
\ No newline at end of file
diff --git a/addons/hr_expense/test/test_hr_expense.yml b/addons/hr_expense/test/test_hr_expense.yml
index 70e2bfb874d..5fa0175eba1 100644
--- a/addons/hr_expense/test/test_hr_expense.yml
+++ b/addons/hr_expense/test/test_hr_expense.yml
@@ -1,27 +1,27 @@
-- |
- In order to test hr_expenses for OpenERP, I create expense for employee and manage employee's expenses.
-- |
- Creating unit of measure category "Working Time".
+-
+ In order to test hr_expenses for OpenERP, I create expenses for employee and manage employee's expenses.
+-
+ I create an unit of measure category "Working Time".
-
!record {model: product.uom.categ, id: product_uom_categ_workingtime0}:
name: Working Time.
-- |
- Given that I have employee "Marc John" and his address.
+-
+ I create a new employee.
-
!record {model: hr.employee, id: hr.employee1}:
address_home_id: base.res_partner_address_1
address_id: base.main_address
-- |
- I create product unit of measure "Hour".
+-
+ I create product unit of measure "Hour".
-
!record {model: product.uom, id: product_uom_hour0}:
category_id: 'product_uom_categ_workingtime0'
factor: 8.0
name: Hour
rounding: 0.01
-- |
- Creating a product "travel" and select uom "Hour" and category "Working Time".
+-
+ I Create a product "travel".
-
!record {model: product.product, id: product_product_travel0}:
categ_id: product.product_category_services
@@ -41,8 +41,8 @@
weight: 0.0
weight_net: 0.0
-- |
- Now I create Expense "September Expenses" for Marc John.And select product "travel".
+-
+ I create an expense.
-
!record {model: hr.expense.expense, id: hr_expense_expense_september0}:
company_id: base.main_company
@@ -58,38 +58,38 @@
uom_id: product.product_uom_unit
unit_amount: 700.0
user_id: base.user_root
-- |
- I check that expenses on "draft" state.
+-
+ I check that expense is in "Draft" state.
-
!assert {model: hr.expense.expense, id: hr_expense_expense_september0}:
- state == 'draft'
-- |
+-
I confirm this expenses by click on "Confirm" button.
-
!workflow {model: hr.expense.expense, action: confirm, ref: hr_expense_expense_september0}
-- |
+-
I check that state is "Waiting Confirmation".
-
!assert {model: hr.expense.expense, id: hr_expense_expense_september0}:
- state == 'confirm'
-- |
+-
I accept this expense by click on "Accept" button.
-
!workflow {model: hr.expense.expense, action: validate, ref: hr_expense_expense_september0}
-- |
+-
I invoiced this expenses by click on "Invoice" button.
-
!workflow {model: hr.expense.expense, action: invoice, ref: hr_expense_expense_september0}
-- |
+-
I check that state is "Invoiced"
-
!assert {model: hr.expense.expense, id: hr_expense_expense_september0}:
- state == 'invoiced'
-- |
- Now I check that Invoice is created for that expenses.
+-
+ I check that Invoice is created for the expense.
-
!python {model: hr.expense.expense}: |
exp = self.browse(cr, uid, [ref('hr_expense_expense_september0')])[0]
diff --git a/addons/hr_holidays/report/available_holidays_view.xml b/addons/hr_holidays/report/available_holidays_view.xml
index a172e7eb0ea..205e8ce31ed 100644
--- a/addons/hr_holidays/report/available_holidays_view.xml
+++ b/addons/hr_holidays/report/available_holidays_view.xml
@@ -71,7 +71,7 @@
-
+
diff --git a/addons/hr_holidays/report/hr_holidays_report_view.xml b/addons/hr_holidays/report/hr_holidays_report_view.xml
index 9f7b3a43cfc..e25a7487e51 100644
--- a/addons/hr_holidays/report/hr_holidays_report_view.xml
+++ b/addons/hr_holidays/report/hr_holidays_report_view.xml
@@ -56,7 +56,7 @@
help = "Draft and Confirmed leaves"/>
-
+
@@ -80,7 +80,7 @@
-
+
diff --git a/addons/hr_payroll/hr_payroll_demo.xml b/addons/hr_payroll/hr_payroll_demo.xml
index 2d77c1d820e..9c2ce90cd7a 100644
--- a/addons/hr_payroll/hr_payroll_demo.xml
+++ b/addons/hr_payroll/hr_payroll_demo.xml
@@ -8,6 +8,7 @@
Marketing Executive
+
per
@@ -19,6 +20,7 @@
House Rant Allowance
+
fix
@@ -30,6 +32,7 @@
Convance Allowance
+
fix
@@ -41,6 +44,7 @@
Professional Tax
+
per
@@ -52,7 +56,7 @@
Provident Fund
-
+
@@ -62,7 +66,7 @@
Bonamy
user
-
+
@@ -74,7 +78,7 @@
-
+
SLIP/001
@@ -87,6 +91,6 @@
Salary Slip of Bonamy for June-2010
-
+
diff --git a/addons/hr_payroll/test/payment_advice.yml b/addons/hr_payroll/test/payment_advice.yml
index de86d8c27be..a2a9c3d5dbe 100644
--- a/addons/hr_payroll/test/payment_advice.yml
+++ b/addons/hr_payroll/test/payment_advice.yml
@@ -2,7 +2,7 @@
I test the 'Payment Advice' in order to check the hr_payroll in OpenERP
-
I create a new employee “Richie”
--
+-
!record {model: hr.employee, id: hr_employee_richie0}:
address_home_id: base.res_partner_address_1
address_id: base.res_partner_address_9
@@ -27,8 +27,8 @@
salary_account: account.a_recv
vehicle_distance: 0.0
-
- Then I create a new payment advice record
--
+ I create a new payment advice record
+-
!record {model: hr.payroll.advice, id: hr_payroll_advice_advice0}:
account_id: account.cash
line_ids:
@@ -38,15 +38,15 @@
flag: C
name: Axis Bank
name: advice1
--
- In order to confirm a sheet I click on "Confirm Sheet" button
--
+-
+ I confirmed the sheet by click on "Confirm Sheet" button.
+-
!python {model: hr.payroll.advice}: |
self.confirm_sheet(cr, uid, [ref("hr_payroll_advice_advice0")], {"lang": "en_US",
"active_model": "ir.ui.menu", "active_ids": [ref("hr_payroll.hr_menu_payment_advice")],
"tz": False, "active_id": ref("hr_payroll.hr_menu_payment_advice")})
-
- I check that a state has transferred from draft to confirm
+ I check that a state is "Confirm"
-
!python {model: hr.payroll.advice}: |
from tools.translate import _
diff --git a/addons/hr_payroll/test/payroll_register.yml b/addons/hr_payroll/test/payroll_register.yml
index 317ad40ac32..f5772602db4 100644
--- a/addons/hr_payroll/test/payroll_register.yml
+++ b/addons/hr_payroll/test/payroll_register.yml
@@ -2,7 +2,7 @@
I test the 'Payroll Register' in order to check the hr_payroll in OpenERP
-
I create a new employee “Keith”
--
+-
!record {model: hr.employee, id: hr_employee_keith0}:
address_home_id: base.res_partner_address_3
address_id: base.res_partner_address_9
@@ -27,7 +27,7 @@
salary_account: account.a_recv
vehicle_distance: 0.0
-
- I create a payroll register record
+ I create a payroll register record.
-
!record {model: hr.payroll.register, id: hr_payroll_register_payroll0}:
bank_journal_id: account.bank_journal
@@ -38,8 +38,8 @@
bank_journal_id: account.bank_journal
journal_id: account.expenses_journal
name: payroll1
--
- I click on Compute button
+-
+ I click on Compute button.
-
!python {model: hr.payroll.register}: |
self.compute_sheet(cr, uid, [ref("hr_payroll_register_payroll0")], {"lang": "en_US",
@@ -47,7 +47,7 @@
[ref("hr_payroll.hr_menu_payroll_register")], "section_id": False, "active_id":
ref("hr_payroll.hr_menu_payroll_register"), })
-
- Then I click on Verify Sheet button
+ Then I click on Verify Sheet button.
-
!python {model: hr.payroll.register}: |
self.verify_sheet(cr, uid, [ref("hr_payroll_register_payroll0")], {"lang": "en_US",
@@ -60,4 +60,4 @@
!python {model: hr.payroll.register}: |
from tools.translate import _
reg_brw=self.browse(cr, uid, ref("hr_payroll_register_payroll0"))
- assert(reg_brw.state == 'hr_check'), _('State not changed!')
+ assert(reg_brw.state == 'hr_check'), _('State not changed!')
diff --git a/addons/hr_payroll/test/payslip.yml b/addons/hr_payroll/test/payslip.yml
index 1ecab075da0..f1c860f8edd 100644
--- a/addons/hr_payroll/test/payslip.yml
+++ b/addons/hr_payroll/test/payslip.yml
@@ -1,8 +1,16 @@
-
I test the 'Payment Advice' in order to check the hr_payroll in OpenERP
+-
+ I Create a bank record
+-
+ !record {model: res.partner.bank, id: res_partner_bank_0}:
+ acc_number: '987654321'
+ partner_id: base.res_partner_desertic_hispafuentes
+ sequence: 0.0
+ state: bank
-
I create a new employee “Richard”
--
+-
!record {model: hr.employee, id: hr_employee_richard0}:
address_home_id: base.res_partner_address_2
address_id: base.res_partner_address_9
@@ -24,10 +32,11 @@
name: Richard
pg_joining: '2009-12-01'
property_bank_account: account.cash
+ bank_account_id: res_partner_bank_0
salary_account: account.a_recv
vehicle_distance: 0.0
-
- I create a new payroll structure for software developer
+ I create a new payroll structure for software developer
-
!record {model: hr.payroll.structure, id: hr_payroll_structure_softwaredeveloper0}:
code: SD
@@ -75,58 +84,60 @@
name: Software Developer
-
I create a employee payslip record
--
+-
!record {model: hr.payslip, id: hr_payslip_0}:
bank_journal_id: account.bank_journal
employee_id: hr_payroll.hr_employee_richard0
journal_id: account.expenses_journal
--
+-
I click on 'Compute Sheet' button
--
+-
!workflow {model: hr.payslip, action: compute_sheet, ref: hr_payslip_0}
--
+-
+ just to test
+-
!python {model: hr.payslip}: |
self.compute_sheet(cr, uid, [ref("hr_payslip_0")], {"lang": "en_US", "tz": False,
"active_model": "ir.ui.menu", "department_id": False, "active_ids": [ref("hr_payroll.menu_department_tree")],
"section_id": False, "active_id": ref("hr_payroll.menu_department_tree"),
})
-
- I check that an order which was in the "New Slip" state has transit to "Wating for Verification" state
+ I check that the order is now in "Waiting for Verification" state
-
!python {model: hr.payslip}: |
from tools.translate import _
payslip_brw=self.browse(cr, uid, ref("hr_payslip_0"))
- assert(payslip_brw.state == 'draft'), _('State not changed!')
+ assert(payslip_brw.state == 'draft'), _('State not changed!')
+-
+ I click on Verify Sheet button.
-
- Then I click on Verify Sheet button
--
!workflow {model: hr.payslip, action: verify_sheet, ref: hr_payslip_0}
-
- I check that an order which was in the "Wating for Verification" state has transit to "Wating for HR Verification" state
+ I check that the order is in the "Waiting for HR Verification" state
-
!python {model: hr.payslip}: |
from tools.translate import _
payslip_brw=self.browse(cr, uid, ref("hr_payslip_0"))
- assert(payslip_brw.state == 'hr_check'), _('State not changed!')
+ assert(payslip_brw.state == 'hr_check'), _('State not changed!')
-
- Then I click on Complete HR Checking button
+ I click on Complete HR Checking button.
-
!workflow {model: hr.payslip, action: final_verify_sheet, ref: hr_payslip_0}
-
- I check that an order which was in the "'Wating for HR Verification'" state has transit to "Confirm Sheet" state
+ I check that the order is in "Confirm Sheet" state.
-
!python {model: hr.payslip}: |
from tools.translate import _
payslip_brw=self.browse(cr, uid, ref("hr_payslip_0"))
- assert(payslip_brw.state == 'confirm'), _('State not changed!')
--
- Then I click on Pay Salary button
--
+ assert(payslip_brw.state == 'confirm'), _('State not changed!')
+-
+ I click on Pay Salary button
+-
!workflow {model: hr.payslip, action: process_sheet, ref: hr_payslip_0}
-
- I check that an order which was in the "Confirm Sheet" state has transit to "Paid Salary" state
+ I check that the order is in "Paid Salary" state.
-
!python {model: hr.payslip}: |
from tools.translate import _
payslip_brw=self.browse(cr, uid, ref("hr_payslip_0"))
- assert(payslip_brw.state == 'done'), _('State not changed!')
+ assert(payslip_brw.state == 'done'), _('State not changed!')
diff --git a/addons/hr_payroll/wizard/hr_payroll_employees_detail.py b/addons/hr_payroll/wizard/hr_payroll_employees_detail.py
index 314dcfa94bb..c2d0e3c4116 100755
--- a/addons/hr_payroll/wizard/hr_payroll_employees_detail.py
+++ b/addons/hr_payroll/wizard/hr_payroll_employees_detail.py
@@ -63,7 +63,6 @@ class hr_payroll_employees_detail(osv.osv_memory):
'type': 'ir.actions.report.xml',
'report_name': 'employees.salary',
'datas': datas,
- 'nodestroy':True,
}
hr_payroll_employees_detail()
diff --git a/addons/hr_payroll/wizard/hr_payroll_year_salary.py b/addons/hr_payroll/wizard/hr_payroll_year_salary.py
index 0445d559f58..a7091540894 100755
--- a/addons/hr_payroll/wizard/hr_payroll_year_salary.py
+++ b/addons/hr_payroll/wizard/hr_payroll_year_salary.py
@@ -65,7 +65,6 @@ class hr_payroll_year_salary(osv.osv_memory):
'type': 'ir.actions.report.xml',
'report_name': 'year.salary',
'datas': datas,
- 'nodestroy':True,
}
hr_payroll_year_salary()
diff --git a/addons/hr_recruitment/report/hr_recruitment_report_view.xml b/addons/hr_recruitment/report/hr_recruitment_report_view.xml
index 3ebdfdf8a0f..a6cc5830de8 100644
--- a/addons/hr_recruitment/report/hr_recruitment_report_view.xml
+++ b/addons/hr_recruitment/report/hr_recruitment_report_view.xml
@@ -101,7 +101,7 @@
-
+
diff --git a/addons/hr_recruitment/test/test_hr_recruitment.yml b/addons/hr_recruitment/test/test_hr_recruitment.yml
index 3b865efe113..f5689b67787 100644
--- a/addons/hr_recruitment/test/test_hr_recruitment.yml
+++ b/addons/hr_recruitment/test/test_hr_recruitment.yml
@@ -1,91 +1,86 @@
-- |
- In order to test hr_recruitment module for OpenERP, I will create applicants form, Manages job positions and the recruitement process.
-- |
- I create job position for employee to manage job position.
-
- |
- For that First I create Department "R & D" in Department form for which I make recruitment.
--
+ In order to test hr_recruitment module for OpenERP, I will create applicants form, Manages job positions and the recruitment process.
+-
+
+ I create a department.
+-
!record {model: hr.department, id: hr_department_rd0}:
manager_id: base.user_root
name: 'R & D '
-
-- |
- Now I will create new Job Position. I will check successfull creation of new Job Position by adding the information.
--
+
+-
+ I create new Job Position.
+-
!record {model: hr.job, id: hr_job_jea0}:
department_id: 'hr_department_rd0'
- description: 'Position of Junier Application Engineer '
+ description: 'Position of Jr. Application Engineer'
expected_employees: 5
- name: 'JEA '
-- |
- Given that I have stage "Initial Jobs Demand".
--
+ name: 'JAE '
+-
+ I create a recruitment stage "Initial Jobs Demand".
+-
!record {model: hr.recruitment.stage, id: hr_recrutiment_stage_first0}:
name: 'Initial Jobs Demand'
- sequence: 1
-- |
- I create applicants for "Fresher" and specify job information for that applicant.
--
+ sequence: 1
+-
+ I create an applicant.
+-
!record {model: hr.applicant, id: hr_applicant_fresher0}:
availability: 0.0
department_id: hr.dep_it
name: Fresher
partner_address_id: base.res_partner_address_tang
partner_id: base.res_partner_asus
- partner_name: Jose
- partner_phone: '999666735'
+ partner_name: Marion Jones
+ partner_phone: '1111112223'
response: 0.0
salary_expected: 0.0
salary_proposed: 0.0
- stage_id: crm.stage_lead3
- type_id: hr_recruitment.type_job2
- stage_id: hr_recrutiment_stage_first0
-
-- |
- I check that applicant is on "draft" state.
+ stage_id: hr_recrutiment_stage_first0
+ type_id: hr_recruitment.degree_licenced
+
+-
+ I check that applicant is on "draft" state.
-
!assert {model: hr.applicant, id: hr_applicant_fresher0}:
- - state == 'draft'
-
-- |
- I start progress by click on "In Progress" button.
--
+ - state == 'draft'
+
+-
+ I change the state by click on "In Progress" button.
+-
!python {model: hr.applicant}: |
self.case_open(cr, uid, [ref("hr_applicant_fresher0")], {"active_ids": [ref("hr_recruitment.menu_crm_case_categ0_act_job")],
- })
+ })
-- |
- Given that I have case category "Employee".
+-
+ I create a new case category.
-
!record {model: crm.case.categ, id: crm_case_categ_employee0}:
name: 'Employee'
-
-- |
- I make phonecall for this applicant by click on "Schedule a Phone Call" button.
+
-
- !record {model: hr.recruitment.job2phonecall, id: hr_recruitment_forinterview0}:
+ I schedule a phonecall for this applicant by click on "Schedule a Phone Call" button.
+-
+ !record {model: hr.recruitment.job2phonecall, id: hr_recruitment_forinterview0}:
user_id: base.user_root
deadline: '05/28/2010 11:51:00'
note: 'For interview.'
category_id: 'crm_case_categ_employee0'
-
-- |
+
+-
I click on "Schedule phonecall" button of this wizard.
-
!python {model: hr.recruitment.job2phonecall}: |
- self.make_phonecall(cr, uid, [ref('hr_recruitment_forinterview0')], {'active_ids': [ref('hr_applicant_fresher0')]})
-
-- |
- I schedule meeting for interview of this applicant by click on "Schdule Meeting" button.
--
+ self.make_phonecall(cr, uid, [ref('hr_recruitment_forinterview0')], {'active_ids': [ref('hr_applicant_fresher0')]})
+
+-
+ I schedule meeting for interview of this applicant by click on "Schedule Meeting" button.
+-
!python {model: hr.applicant}: |
self.action_makeMeeting(cr, uid, [ref('hr_recruitment_forinterview0')])
-- |
- I can see that Meeting's calendar view is shown.
- then I click on the date on which I want schedule meeting.
- I fill proper data for that meeting and save it.
--
+-
+ I create an entry for the meeting with the applicant.
+-
!record {model: crm.meeting, id: crm_meeting_fresher0}:
alarm_id: base_calendar.alarm1
count: 0.0
@@ -101,15 +96,14 @@
rrule_type: none
state: open
user_id: base.user_root
-
-- |
- After Meeting of this applicant , I hired employee by click on "Hired" button of this form.
--
+
+-
+ On a successful meeting with the applicant, I hired employee by click on "Hired" button.
+-
!python {model: hr.applicant}: |
self.case_close(cr, uid, [ref('hr_applicant_fresher0')])
-- |
- I check that applicant state is "done".
+-
+ I check that applicant state is "Hired".
-
!assert {model: hr.applicant, id: hr_applicant_fresher0}:
- state == 'done'
-
\ No newline at end of file
diff --git a/addons/hr_timesheet_invoice/hr_timesheet_invoice.py b/addons/hr_timesheet_invoice/hr_timesheet_invoice.py
index a848fc6d352..730adebe049 100644
--- a/addons/hr_timesheet_invoice/hr_timesheet_invoice.py
+++ b/addons/hr_timesheet_invoice/hr_timesheet_invoice.py
@@ -154,9 +154,10 @@ class account_invoice(osv.osv):
inv = self.browse(cr, uid, [id])[0]
if inv.type == 'in_invoice':
+ obj_analytic_account = self.pool.get('account.analytic.account')
for il in iml:
if il['account_analytic_id']:
- to_invoice = self.pool.get('account.analytic.account').read(cr, uid, [il['account_analytic_id']], ['to_invoice'])[0]['to_invoice']
+ to_invoice = obj_analytic_account.read(cr, uid, [il['account_analytic_id']], ['to_invoice'])[0]['to_invoice']
if to_invoice:
il['analytic_lines'][0][2]['to_invoice'] = to_invoice[0]
return iml
diff --git a/addons/hr_timesheet_invoice/report/hr_timesheet_invoice_report_view.xml b/addons/hr_timesheet_invoice/report/hr_timesheet_invoice_report_view.xml
index 58215a087b7..cbdef2a28ba 100644
--- a/addons/hr_timesheet_invoice/report/hr_timesheet_invoice_report_view.xml
+++ b/addons/hr_timesheet_invoice/report/hr_timesheet_invoice_report_view.xml
@@ -81,7 +81,7 @@
-
+
diff --git a/addons/hr_timesheet_invoice/test/test_hr_timesheet_invoice.yml b/addons/hr_timesheet_invoice/test/test_hr_timesheet_invoice.yml
index 431c30d8cb1..51d507f1df0 100644
--- a/addons/hr_timesheet_invoice/test/test_hr_timesheet_invoice.yml
+++ b/addons/hr_timesheet_invoice/test/test_hr_timesheet_invoice.yml
@@ -1,8 +1,8 @@
-- |
+-
In order to test hr_timesheet_invoice in OpenERP, I create account line to manage invoice based on costs.
-- |
- In order to test flow, I create analytic line for sednacom analytic account.
--
+-
+ I create an account analytic line.
+-
!record {model: account.analytic.line, id: account_analytic_line_developyamlforhrmodule0}:
account_id: account.analytic_sednacom
amount: -1.0
@@ -17,17 +17,16 @@
unit_amount: 5.00
user_id: base.user_root
-- |
- Give partner name and price list in analytic account.
--
+-
+ Assign partner name and price list in analytic account.
+-
!record {model: account.analytic.account, id: account.analytic_sednacom}:
partner_id: base.res_partner_9
pricelist_id: product.list0
-
-- |
+
+-
I create invoice on analytic Line using "Invoice analytic Line" wizard.
- Give date , detail of each work , time spend on that work on this wizard.
--
+-
!record {model: hr.timesheet.invoice.create, id: hr_timesheet_invoice_create_0}:
accounts:
- account.analytic_sednacom
@@ -36,54 +35,50 @@
price: 1
product: hr_timesheet.product_consultant
time: 1
-
-- |
+
+-
I click on "Create Invoice" button of "Invoice analytic Line" wizard to create invoice.
--
+-
!python {model: hr.timesheet.invoice.create}: |
self.do_create(cr, uid, [ref("hr_timesheet_invoice_create_0")], {"active_ids": [ref("hr_timesheet_invoice.account_analytic_line_developyamlforhrmodule0")]})
-
-- |
- I check that Invoice is create for this timesheet.
+
+-
+ I check that Invoice is created for this timesheet.
-
!python {model: account.analytic.line}: |
exp = self.browse(cr, uid, [ref('account_analytic_line_developyamlforhrmodule0')])[0]
-
analytic_account_obj = self.pool.get('account.analytic.account')
-
data = self.pool.get('hr.timesheet.invoice.create').read(cr, uid, [ref("hr_timesheet_invoice_create_0")], [], context)[0]
-
account_ids = data['accounts']
for account in analytic_account_obj.browse(cr, uid, account_ids, context):
partner = account.partner_id.id
-
+
invoice_obj = self.pool.get('account.invoice')
invoice_ids = invoice_obj.search(cr, uid, [('partner_id', '=', partner)])
invoice_id = invoice_obj.browse(cr, uid, invoice_ids)[0]
for invoice in invoice_id.invoice_line:
product = invoice.product_id.id
-
+
product_exp = data['product']
assert product == product_exp
-- |
- I creating a final invoice for "Sednacom" analytic account.
--
+-
+ I create final invoice for this analytic account.
+-
!record {model: hr.timesheet.invoice.create.final, id: hr_timesheet_invoice_create_final_0}:
balance_product: hr_timesheet.product_consultant
date: 1
name: 1
price: 1
time: 1
-- |
- I click on "Create Invoice" button to create Invoice.
--
+-
+ I click on "Create Invoice" button to create Invoice.
+-
!python {model: hr.timesheet.invoice.create.final}: |
self.do_create(cr, uid, [ref("hr_timesheet_invoice_create_final_0")], {"active_ids": [ref("account.analytic_sednacom")]})
-
-
-- |
- I can also make some theoretical revenue reports.
-- |
- I can also see timesheet profit using Timesheet profit report.
\ No newline at end of file
+
+-
+ I can also make some theoretical revenue reports.
+-
+ I can also see timesheet profit using Timesheet profit report.
\ No newline at end of file
diff --git a/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py b/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py
index 1ed01c53281..57a1e4aaaa2 100644
--- a/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py
+++ b/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py
@@ -166,7 +166,7 @@ class hr_timesheet_invoice_create(osv.osv_memory):
#
# Compute for lines
#
- cr.execute("SELECT * FROM account_analytic_line WHERE account_id = %s and id IN %s AND product_id=%s and to_invoice=%s ORDER BY account_analytic_line.date", (account.id, tuple(data['ids']), product_id, factor_id))
+ cr.execute("SELECT * FROM account_analytic_line WHERE account_id = %s and id IN %s AND product_id=%s and to_invoice=%s ORDER BY account_analytic_line.date", (account.id, tuple(context['active_ids']), product_id, factor_id))
line_ids = cr.dictfetchall()
note = []
@@ -188,7 +188,7 @@ class hr_timesheet_invoice_create(osv.osv_memory):
curr_line['note'] = "\n".join(map(lambda x: unicode(x) or '',note))
invoice_line_obj.create(cr, uid, curr_line, context=context)
- cr.execute("update account_analytic_line set invoice_id=%s WHERE account_id = %s and id IN %s" ,(last_invoice, account.id,tuple(data['ids'])))
+ cr.execute("update account_analytic_line set invoice_id=%s WHERE account_id = %s and id IN %s" ,(last_invoice, account.id, tuple(context['active_ids'])))
invoice_obj.button_reset_taxes(cr, uid, [last_invoice], context)
diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
index cc28c24c5ee..be04a9d5186 100644
--- a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
+++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
@@ -180,7 +180,7 @@
-
+
diff --git a/addons/hr_timesheet_sheet/report/hr_timesheet_report_view.xml b/addons/hr_timesheet_sheet/report/hr_timesheet_report_view.xml
index 9dadb599ba7..8ab227a1870 100644
--- a/addons/hr_timesheet_sheet/report/hr_timesheet_report_view.xml
+++ b/addons/hr_timesheet_sheet/report/hr_timesheet_report_view.xml
@@ -72,7 +72,7 @@
-
+
diff --git a/addons/hr_timesheet_sheet/report/timesheet_report_view.xml b/addons/hr_timesheet_sheet/report/timesheet_report_view.xml
index eae573f89bc..0a4aaf1dbf3 100644
--- a/addons/hr_timesheet_sheet/report/timesheet_report_view.xml
+++ b/addons/hr_timesheet_sheet/report/timesheet_report_view.xml
@@ -96,7 +96,7 @@
-
+
diff --git a/addons/hr_timesheet_sheet/test/test_hr_timesheet_sheet.yml b/addons/hr_timesheet_sheet/test/test_hr_timesheet_sheet.yml
index c21a5b36ebb..1486d7f9bb4 100644
--- a/addons/hr_timesheet_sheet/test/test_hr_timesheet_sheet.yml
+++ b/addons/hr_timesheet_sheet/test/test_hr_timesheet_sheet.yml
@@ -99,6 +99,7 @@
-
!python {model: hr_timesheet_sheet.sheet}: |
uid = ref('base.user_root')
+ import netsvc
for sheet in self.browse(cr, uid, [ref('hr_timesheet_sheet_sheet_deddk0')]):
di = sheet.user_id.company_id.timesheet_max_difference
if (abs(sheet.total_difference) < di) or not di:
diff --git a/addons/lunch/lunch_view.xml b/addons/lunch/lunch_view.xml
index 07f996942c5..5d0fe20c801 100644
--- a/addons/lunch/lunch_view.xml
+++ b/addons/lunch/lunch_view.xml
@@ -62,7 +62,7 @@
name="%(action_lunch_order_cancel)d"
string="Cancel Order"
type="action" states="confirmed"
- icon="terp-gtk-stop" />
+ icon="gtk-cancel" />
diff --git a/addons/marketing_campaign/marketing_campaign.py b/addons/marketing_campaign/marketing_campaign.py
index 46e1e28ade7..787557145e3 100644
--- a/addons/marketing_campaign/marketing_campaign.py
+++ b/addons/marketing_campaign/marketing_campaign.py
@@ -674,7 +674,6 @@ class marketing_campaign_workitem(osv.osv):
'type' : 'ir.actions.report.xml',
'report_name': wi_obj.activity_id.report_id.report_name,
'datas' : datas,
- 'nodestroy': True,
}
else:
raise osv.except_osv(_('No preview'),_('The current step for this item has no email or report to preview.'))
diff --git a/addons/mrp/mrp.py b/addons/mrp/mrp.py
index 813133385be..4f33b0c1558 100644
--- a/addons/mrp/mrp.py
+++ b/addons/mrp/mrp.py
@@ -60,7 +60,8 @@ class mrp_workcenter(osv.osv):
'resource_id': fields.many2one('resource.resource','Resource',ondelete='cascade'),
}
_defaults = {
- 'capacity_per_cycle': lambda *a: 1.0,
+ 'capacity_per_cycle': 1.0,
+ 'resource_type': 'material',
}
mrp_workcenter()
diff --git a/addons/mrp/report/mrp_production_order_view.xml b/addons/mrp/report/mrp_production_order_view.xml
index 18dc07e4b78..7617c8f55e4 100644
--- a/addons/mrp/report/mrp_production_order_view.xml
+++ b/addons/mrp/report/mrp_production_order_view.xml
@@ -86,7 +86,7 @@
-
+
diff --git a/addons/point_of_sale/report/report_pos_order_view.xml b/addons/point_of_sale/report/report_pos_order_view.xml
index e655633877a..6bd136426e1 100644
--- a/addons/point_of_sale/report/report_pos_order_view.xml
+++ b/addons/point_of_sale/report/report_pos_order_view.xml
@@ -86,7 +86,7 @@
-
+
diff --git a/addons/product/product_view.xml b/addons/product/product_view.xml
index 7b95054a4b7..bd3becd3cdd 100644
--- a/addons/product/product_view.xml
+++ b/addons/product/product_view.xml
@@ -27,7 +27,7 @@
-
+
diff --git a/addons/product_manufacturer/i18n/et.po b/addons/product_manufacturer/i18n/et.po
index 9213df55e2b..3ec28061a9a 100644
--- a/addons/product_manufacturer/i18n/et.po
+++ b/addons/product_manufacturer/i18n/et.po
@@ -8,99 +8,99 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2009-11-25 13:27+0000\n"
-"PO-Revision-Date: 2010-06-25 18:10+0000\n"
+"PO-Revision-Date: 2010-07-30 09:04+0000\n"
"Last-Translator: lyyser \n"
"Language-Team: Estonian \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-06-26 03:58+0000\n"
+"X-Launchpad-Export-Date: 2010-07-31 03:40+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
-#. module: product_electronic
-#: model:ir.module.module,description:product_electronic.module_meta_information
+#. module: product_manufacturer
+#: model:ir.module.module,description:product_manufacturer.module_meta_information
msgid "A module that add manufacturers and attributes on the product form"
msgstr ""
-#. module: product_electronic
+#. module: product_manufacturer
#: field:product.product,manufacturer_pref:0
msgid "Manufacturer product code"
msgstr "Tootja tootekood"
-#. module: product_electronic
+#. module: product_manufacturer
#: constraint:ir.ui.view:0
msgid "Invalid XML for View Architecture!"
msgstr "Vigane XML vaate arhitektuurile!"
-#. module: product_electronic
-#: view:product.electronic.attribute:0
+#. module: product_manufacturer
+#: view:product.manufacturer.attribute:0
msgid "Product Template Name"
msgstr "Toote Malli nimi"
-#. module: product_electronic
+#. module: product_manufacturer
#: constraint:ir.model:0
msgid ""
"The Object name must start with x_ and not contain any special character !"
msgstr ""
"Objekti nimi peab algama x_'ga ja ei tohi sisaldada ühtegi erisümbolit !"
-#. module: product_electronic
-#: model:ir.model,name:product_electronic.model_product_electronic_attribute
+#. module: product_manufacturer
+#: model:ir.model,name:product_manufacturer.model_product_electronic_attribute
msgid "Product attributes"
msgstr "Toote omadused"
-#. module: product_electronic
+#. module: product_manufacturer
#: view:product.product:0
msgid "Manufacturing data"
msgstr "Tootmise andmed"
-#. module: product_electronic
+#. module: product_manufacturer
#: view:product.product:0
msgid "Product reference"
msgstr "Toote viide"
-#. module: product_electronic
-#: field:product.electronic.attribute,name:0
+#. module: product_manufacturer
+#: field:product.manufacturer.attribute,name:0
msgid "Attribute"
msgstr "Atribuut"
-#. module: product_electronic
-#: field:product.electronic.attribute,product_id:0
+#. module: product_manufacturer
+#: field:product.manufacturer.attribute,product_id:0
msgid "Product"
msgstr "Toode"
-#. module: product_electronic
-#: field:product.electronic.attribute,value:0
+#. module: product_manufacturer
+#: field:product.manufacturer.attribute,value:0
msgid "Value"
msgstr "Väärtus"
-#. module: product_electronic
+#. module: product_manufacturer
#: view:product.product:0
msgid "Manufacturing Data"
msgstr "Valmistusandmeid"
-#. module: product_electronic
+#. module: product_manufacturer
#: view:product.product:0
msgid "Product name"
msgstr "Toote nimi"
-#. module: product_electronic
+#. module: product_manufacturer
#: view:product.product:0
#: field:product.product,attribute_ids:0
msgid "Attributes"
msgstr "Omadused"
-#. module: product_electronic
-#: model:ir.module.module,shortdesc:product_electronic.module_meta_information
+#. module: product_manufacturer
+#: model:ir.module.module,shortdesc:product_manufacturer.module_meta_information
msgid "Products Attributes & Manufacturers"
msgstr ""
-#. module: product_electronic
+#. module: product_manufacturer
#: field:product.product,manufacturer_pname:0
msgid "Manufacturer product name"
msgstr "Toote nimetus"
-#. module: product_electronic
+#. module: product_manufacturer
#: field:product.product,manufacturer:0
msgid "Manufacturer"
-msgstr "Tootja"
+msgstr "Valmistaja"
diff --git a/addons/project/report/project_report_view.xml b/addons/project/report/project_report_view.xml
index 442b4ea89c2..0292864397e 100644
--- a/addons/project/report/project_report_view.xml
+++ b/addons/project/report/project_report_view.xml
@@ -123,7 +123,7 @@
-
+
diff --git a/addons/project_issue/report/project_issue_report_view.xml b/addons/project_issue/report/project_issue_report_view.xml
index 7405026d05d..2389e65e1d7 100644
--- a/addons/project_issue/report/project_issue_report_view.xml
+++ b/addons/project_issue/report/project_issue_report_view.xml
@@ -130,7 +130,7 @@
-
+
diff --git a/addons/project_long_term/project_long_term.py b/addons/project_long_term/project_long_term.py
index 03b8ae8edc8..f4ae126ee67 100644
--- a/addons/project_long_term/project_long_term.py
+++ b/addons/project_long_term/project_long_term.py
@@ -190,6 +190,8 @@ class project_phase(osv.osv):
return super(project_phase, self).write(cr, uid, ids, vals, context=context)
# Consider calendar and efficiency if the phase is performed by a resource
# otherwise consider the project's working calendar
+ if isinstance(ids, (int, long)):
+ ids = [ids]
phase = self.browse(cr, uid, ids[0], context=context)
calendar_id = phase.project_id.resource_calendar_id and phase.project_id.resource_calendar_id.id or False
resource_id = resource_obj.search(cr, uid, [('user_id', '=', phase.responsible_id.id)],context=context)
@@ -246,7 +248,7 @@ class project_resource_allocation(osv.osv):
_rec_name = 'resource_id'
_columns = {
'resource_id': fields.many2one('resource.resource', 'Resource', required=True),
- 'phase_id': fields.many2one('project.phase', 'Project Phase', required=True),
+ 'phase_id': fields.many2one('project.phase', 'Project Phase', ondelete='cascade', required=True),
'phase_id_date_start': fields.related('phase_id', 'date_start', type='date', string='Starting Date of the phase'),
'phase_id_date_end': fields.related('phase_id', 'date_end', type='date', string='Ending Date of the phase'),
'useability': fields.float('Usability', help="Usability of this resource for this project phase in percentage (=50%)"),
diff --git a/addons/sale/report/sale_report_view.xml b/addons/sale/report/sale_report_view.xml
index ec63f1079a1..ed11f80e3a0 100644
--- a/addons/sale/report/sale_report_view.xml
+++ b/addons/sale/report/sale_report_view.xml
@@ -104,7 +104,7 @@
-
+
diff --git a/addons/sale_margin/report/report_margin_view.xml b/addons/sale_margin/report/report_margin_view.xml
index b22c2e28801..1dcafe50de3 100644
--- a/addons/sale_margin/report/report_margin_view.xml
+++ b/addons/sale_margin/report/report_margin_view.xml
@@ -50,7 +50,7 @@
-
+
diff --git a/addons/stock/report/report_stock_move_view.xml b/addons/stock/report/report_stock_move_view.xml
index 38466f14e71..9d269160fb9 100644
--- a/addons/stock/report/report_stock_move_view.xml
+++ b/addons/stock/report/report_stock_move_view.xml
@@ -103,7 +103,7 @@
-
+
@@ -201,7 +201,7 @@
-
+
diff --git a/addons/stock/report/report_stock_picking_view.xml b/addons/stock/report/report_stock_picking_view.xml
index 77910b29fdd..13cdd624cf2 100644
--- a/addons/stock/report/report_stock_picking_view.xml
+++ b/addons/stock/report/report_stock_picking_view.xml
@@ -90,7 +90,7 @@
-
+
diff --git a/addons/survey/survey.py b/addons/survey/survey.py
index 8cac202fe40..a78fe55ea2d 100644
--- a/addons/survey/survey.py
+++ b/addons/survey/survey.py
@@ -124,7 +124,6 @@ class survey(osv.osv):
'type': 'ir.actions.report.xml',
'report_name': 'survey.browse.response',
'datas': datas,
- 'nodestroy': True,
'context' : context
}
else:
@@ -135,7 +134,6 @@ class survey(osv.osv):
'type': 'ir.actions.report.xml',
'report_name': 'survey.form',
'datas': datas,
- 'nodestroy':True,
'context' : context
}
return report