diff --git a/addons/account/account.py b/addons/account/account.py
index 61319f7f973..e30912aa187 100644
--- a/addons/account/account.py
+++ b/addons/account/account.py
@@ -1567,8 +1567,42 @@ class account_tax(osv.osv):
cur_price_unit+=amount2
return res
- def compute(self, cr, uid, taxes, price_unit, quantity, address_id=None, product=None, partner=None):
+ def compute_all(self, cr, uid, taxes, price_unit, quantity, address_id=None, product=None, partner=None):
+ """
+ RETURN: {
+ 'total': 0.0, # Total without taxes
+ 'total_included: 0.0, # Total with taxes
+ 'taxes': [] # List of taxes, see compute for the format
+ }
+ """
+ precision = self.pool.get('decimal.precision').precision_get(cr, uid, 'Account')
+ totalin = totalex = round(price_unit * quantity, precision)
+ tin = []
+ tex = []
+ for tax in taxes:
+ if tax.price_include:
+ tin.append(tax)
+ else:
+ tex.append(tax)
+ tin = self.compute_inv(cr, uid, tin, price_unit, quantity, address_id=address_id, product=product, partner=partner)
+ for r in tin:
+ totalex -= r['amount']
+ tex = self._compute(cr, uid, tex, totalex/quantity, quantity, address_id=address_id, product=product, partner=partner)
+ for r in tex:
+ totalin += r['amount']
+ return {
+ 'total': totalex,
+ 'total_included': totalin,
+ 'taxes': tin + tex
+ }
+ def compute(self, cr, uid, taxes, price_unit, quantity, address_id=None, product=None, partner=None):
+ logger = netsvc.Logger()
+ logger.notifyChannel("warning", netsvc.LOG_WARNING,
+ "Deprecated, use compute_all(...)['taxes'] instead of compute(...) to manage prices with tax included")
+ return self._compute(cr, uid, taxes, price_unit, quantity, address_id, product, partner)
+
+ def _compute(self, cr, uid, taxes, price_unit, quantity, address_id=None, product=None, partner=None):
"""
Compute tax values for given PRICE_UNIT, QUANTITY and a buyer/seller ADDRESS_ID.
@@ -1585,7 +1619,6 @@ class account_tax(osv.osv):
else:
r['amount'] = round(r['amount'] * quantity, self.pool.get('decimal.precision').precision_get(cr, uid, 'Account'))
total += r['amount']
-
return res
def _unit_compute_inv(self, cr, uid, taxes, price_unit, address_id=None, product=None, partner=None):
diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml
index 77369bdca25..4c4a3f3a9ef 100644
--- a/addons/account/account_invoice_view.xml
+++ b/addons/account/account_invoice_view.xml
@@ -63,6 +63,7 @@
+
@@ -146,7 +147,7 @@
-
+
diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index a2729676fe3..5e8edd306e3 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -623,7 +623,7 @@
-
+
diff --git a/addons/account/i18n/ca.po b/addons/account/i18n/ca.po
index 6a5f47dfb24..87f0c741768 100644
--- a/addons/account/i18n/ca.po
+++ b/addons/account/i18n/ca.po
@@ -7,14 +7,14 @@ 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-04-18 09:39+0000\n"
-"Last-Translator: Albert Cervera i Areny - http://www.NaN-tic.com \n"
+"PO-Revision-Date: 2010-06-04 09:39+0000\n"
+"Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
+"\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-04-21 04:06+0000\n"
+"X-Launchpad-Export-Date: 2010-06-05 03:36+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account
@@ -61,12 +61,12 @@ msgstr "Nom de model no vàlid en la definició de l'acció."
#. module: account
#: help:account.journal,currency:0
msgid "The currency used to enter statement"
-msgstr "La moneda utilitzada per introduir assentaments"
+msgstr "La divisa utilitzada per introduir assentaments"
#. module: account
#: wizard_view:account_use_models,init_form:0
msgid "Select Message"
-msgstr "Selecciona missatge"
+msgstr "Seleccioneu missatge"
#. module: account
#: help:product.category,property_account_income_categ:0
@@ -189,7 +189,7 @@ msgstr "Plans comptables"
#. module: account
#: model:ir.actions.wizard,name:account.wizard_move_line_select
msgid "Move line select"
-msgstr "Selecciona línia moviment"
+msgstr "Seleccioneu línia moviment"
#. module: account
#: rml:account.journal.period.print:0
@@ -202,7 +202,7 @@ msgstr "Ref. assentament"
#. module: account
#: model:ir.model,name:account.model_account_model_line
msgid "Account Model Entries"
-msgstr "Línia de model d'assentament"
+msgstr "Líniees de model d'assentament"
#. module: account
#: field:account.tax.code,sum_period:0
@@ -315,7 +315,7 @@ msgstr "Pagaments fora de termini"
#: wizard_view:account.analytic.account.quantity_cost_ledger.report,init:0
#: wizard_view:account.vat.declaration,init:0
msgid "Select period"
-msgstr "Selecciona període"
+msgstr "Seleccioneu període"
#. module: account
#: field:account.invoice,origin:0
@@ -457,7 +457,7 @@ msgstr "Estat"
#: model:ir.actions.act_window,name:account.action_invoice_tree13
#: model:ir.ui.menu,name:account.menu_action_invoice_tree13
msgid "Unpaid Supplier Refunds"
-msgstr "Factures d'abonament de proveïdor sense pagar"
+msgstr "Factures rectificatives (abonament) de proveïdor sense pagar"
#. module: account
#: view:account.tax:0
@@ -710,7 +710,7 @@ msgstr "Informació addicional"
#. module: account
#: selection:account.invoice,type:0
msgid "Customer Refund"
-msgstr "Factura d'abonament de client"
+msgstr "Factura rectificativa (abonament) de client"
#. module: account
#: wizard_view:account.analytic.account.chart,init:0
@@ -909,7 +909,7 @@ msgstr "Diari de desajust"
#: field:account.model.line,amount_currency:0
#: field:account.move.line,amount_currency:0
msgid "Amount Currency"
-msgstr "Import canvi"
+msgstr "Import divisa"
#. module: account
#: field:account.chart.template,property_account_expense_categ:0
@@ -938,7 +938,7 @@ msgstr "Exercici fiscal per obrir"
#. module: account
#: view:account.config.wizard:0
msgid "Select Chart of Accounts"
-msgstr "Selecciona pla comptable"
+msgstr "Seleccioneu un pla comptable"
#. module: account
#: field:account.analytic.account,quantity:0
@@ -1242,7 +1242,7 @@ msgstr ""
#. module: account
#: field:account.account,company_currency_id:0
msgid "Company Currency"
-msgstr "Moneda de la companyia"
+msgstr "Divisa de la companyia"
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_account_template
@@ -1353,7 +1353,7 @@ msgstr "Missatge"
#. module: account
#: model:process.node,note:account.process_node_supplierpaymentorder0
msgid "Select invoices you want to pay and manages advances"
-msgstr "Selecciona factures que es volen pagar i gestiona avançaments"
+msgstr "Seleccioneu les factures que voleu pagar i gestionar avançaments"
#. module: account
#: selection:account.account,type:0
@@ -1887,7 +1887,7 @@ msgstr "Data inicial"
#. module: account
#: model:account.journal,name:account.refund_expenses_journal
msgid "x Expenses Credit Notes Journal"
-msgstr "x Diari factures d'abonament de despeses"
+msgstr "x Diari factures rectificatives (abonament) de despeses"
#. module: account
#: field:account.analytic.journal,type:0
@@ -1914,7 +1914,7 @@ msgstr "Base imposable"
#: field:account.tax,account_collected_id:0
#: field:account.tax.template,account_collected_id:0
msgid "Invoice Tax Account"
-msgstr "Compte impostos de factura"
+msgstr "Compte impostos de factures"
#. module: account
#: view:account.move.line:0
@@ -2026,7 +2026,7 @@ msgstr "Informe analític de diari"
#: model:ir.actions.act_window,name:account.action_invoice_tree3
#: model:ir.ui.menu,name:account.menu_action_invoice_tree3
msgid "Customer Refunds"
-msgstr "Factures d'abonament de client"
+msgstr "Factures rectificatives (abonament) de client"
#. module: account
#: rml:account.vat.declaration:0
@@ -2047,7 +2047,7 @@ msgstr "Nom diari-període"
#: field:account.tax.code,name:0
#: field:account.tax.code.template,name:0
msgid "Tax Case Name"
-msgstr "Nom impost del cas"
+msgstr "Nom codi d'impost"
#. module: account
#: help:account.journal,entry_posted:0
@@ -2057,7 +2057,7 @@ msgid ""
"manual validation."
msgstr ""
"Marqueu aquesta casella si no voleu que els nous assentaments passin per "
-"l'estat 'esborrany' i vagin directament a l'estat 'fixat' sense validar-se "
+"l'estat 'Esborrany' i vagin directament a l'estat 'Fixat' sense validar-los "
"manualment."
#. module: account
@@ -2144,7 +2144,7 @@ msgstr "Anterior"
#: field:account.model.line,currency_id:0
#: field:account.move.line,currency_id:0
msgid "Currency"
-msgstr "Moneda"
+msgstr "Divisa"
#. module: account
#: model:ir.actions.act_window,name:account.act_account_journal_2_account_invoice_opened
@@ -2179,7 +2179,8 @@ msgid "Analytic Entry"
msgstr "Assentament analític"
#. module: account
-#: view:res.company:0 field:res.company,overdue_msg:0
+#: view:res.company:0
+#: field:res.company,overdue_msg:0
msgid "Overdue Payments Message"
msgstr "Missatge de pagaments fora de termini"
@@ -2285,7 +2286,7 @@ msgstr "Diari assentaments d'obertura"
#. module: account
#: view:account.config.wizard:0
msgid "Create a Fiscal Year"
-msgstr "Crea un exercici fiscal"
+msgstr "Creeu un exercici fiscal"
#. module: account
#: field:product.template,taxes_id:0
@@ -2320,7 +2321,8 @@ msgstr "2"
#: wizard_view:account.chart,init:0
msgid "(If you do not select Fiscal year it will take all open fiscal years)"
msgstr ""
-"(Si no es selecciona cap any fiscal s'utilitzen tots els anys fiscals oberts)"
+"(Si no es selecciona cap exercici fiscal s'utilitzen tots els exercicis "
+"fiscals oberts)"
#. module: account
#: help:account.invoice.tax,base_code_id:0
@@ -2467,7 +2469,7 @@ msgstr "Data final"
#: 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"
-msgstr "Línies de l'extracte"
+msgstr "Apunts"
#. module: account
#: view:account.tax:0
@@ -2526,7 +2528,7 @@ msgstr "Assentaments conciliats"
#. module: account
#: help:account.bank.statement.reconcile,total_second_amount:0
msgid "The amount in the currency of the journal"
-msgstr "La quantitat en la moneda del diari"
+msgstr "La quantitat en la divisa del diari"
#. module: account
#: wizard_field:account.general.ledger.report,checktype,landscape:0
@@ -2836,7 +2838,7 @@ msgstr "Companyies que es refereixen a l'empresa"
#. module: account
#: field:account.move.line,date:0
msgid "Effective date"
-msgstr "Data vigència"
+msgstr "Data"
#. module: account
#: help:account.tax.template,sequence:0
@@ -2961,7 +2963,7 @@ msgstr "1cm 27.7cm 20cm 27.7cm"
#: model:ir.actions.act_window,name:account.action_invoice_tree12
#: model:ir.ui.menu,name:account.menu_action_invoice_tree12
msgid "Draft Supplier Refunds"
-msgstr "Factures d'abonament de proveïdor esborrany"
+msgstr "Factures rectificatives (abonament) de proveïdor esborrany"
#. module: account
#: model:process.node,name:account.process_node_accountingstatemententries0
@@ -3048,7 +3050,7 @@ msgstr "Taxa de divises de sortida"
#: model:ir.actions.act_window,name:account.action_invoice_tree10
#: model:ir.ui.menu,name:account.menu_action_invoice_tree10
msgid "Draft Customer Refunds"
-msgstr "Factures d'abonament de client esborrany"
+msgstr "Factures rectificatives (abonament) de client esborrany"
#. module: account
#: field:account.journal.column,readonly:0
@@ -3606,7 +3608,7 @@ msgstr "Impressió"
#: model:ir.actions.act_window,name:account.action_invoice_tree4_new
#: model:ir.ui.menu,name:account.menu_action_invoice_tree4_new
msgid "New Supplier Refund"
-msgstr "Nova factura d'abonament de proveïdor"
+msgstr "Nova factura rectificativa (abonament) de proveïdor"
#. module: account
#: view:account.model:0
@@ -3616,7 +3618,7 @@ msgstr "Model d'assentament"
#. module: account
#: wizard_field:account.general.ledger.report,checktype,amount_currency:0
msgid "With Currency"
-msgstr "Amb moneda"
+msgstr "Mostra divisa"
#. module: account
#: view:account.account:0
@@ -3721,12 +3723,12 @@ msgstr "Codificació extracte"
#: wizard_view:account.invoice.refund,init:0
#: model:ir.actions.wizard,name:account.wizard_invoice_refund
msgid "Credit Note"
-msgstr "Factura d'abonament"
+msgstr "Factura rectificativa (abonament)"
#. module: account
#: model:ir.actions.todo,note:account.config_fiscalyear
msgid "Define Fiscal Years and Select Charts of Account"
-msgstr "Defineix exercicis fiscals i selecciona pla comptable"
+msgstr "Definiu els exercicis fiscals i seleccioneu el pla comptable"
#. module: account
#: wizard_field:account.move.line.reconcile,addendum,period_id:0
@@ -3736,7 +3738,7 @@ msgstr "Període de desajust"
#. module: account
#: selection:account.config.wizard,period:0
msgid "3 Months"
-msgstr "3 mesos"
+msgstr "Trimestral"
#. module: account
#: wizard_view:account.move.journal,init:0
@@ -3800,7 +3802,7 @@ msgstr "Data inicial"
#. module: account
#: wizard_view:account.general.ledger.report,account_selection:0
msgid "Select Chart"
-msgstr "Selecciona pla comptable"
+msgstr "Seleccioneu un pla comptable"
#. module: account
#: selection:account.chart,init,target_move:0
@@ -3867,7 +3869,7 @@ msgstr "Seqüència de l'assentament"
#: selection:account.account,type:0
#: selection:account.account.template,type:0
msgid "Closed"
-msgstr "Tancat"
+msgstr "Tancament"
#. module: account
#: model:process.node,name:account.process_node_paymententries0
@@ -4022,7 +4024,7 @@ msgstr "Propietats de comptabilitat del client"
#. module: account
#: view:account.bank.statement:0
msgid "Select entries"
-msgstr "Selecciona les entrades"
+msgstr "Seleccioneu les entrades"
#. module: account
#: selection:account.chart,init,target_move:0
@@ -4048,7 +4050,7 @@ msgstr "Compte a pagar"
#: field:account.account,currency_id:0
#: field:account.account.template,currency_id:0
msgid "Secondary Currency"
-msgstr "Moneda secundària"
+msgstr "Divisa secundària"
#. module: account
#: field:account.account,credit:0
@@ -4083,7 +4085,7 @@ msgstr ""
#: field:account.tax,account_paid_id:0
#: field:account.tax.template,account_paid_id:0
msgid "Refund Tax Account"
-msgstr "Compte impostos de devolucions"
+msgstr "Compte impostos de reintegraments"
#. module: account
#: field:account.tax.code,child_ids:0
@@ -4186,7 +4188,7 @@ msgstr "Seqüències de diaris separades"
#. module: account
#: help:account.bank.statement.reconcile,total_second_currency:0
msgid "The currency of the journal"
-msgstr "La moneda del diari"
+msgstr "La divisa del diari"
#. module: account
#: view:account.journal.column:0
@@ -4429,7 +4431,7 @@ msgstr "Fixat"
#: view:account.tax:0
#: view:account.tax.template:0
msgid "Credit Notes"
-msgstr "Factures d'abonament"
+msgstr "Factures rectificatives (abonament)"
#. module: account
#: field:account.config.wizard,date2:0
@@ -4621,7 +4623,7 @@ msgstr "Per data"
#: model:ir.actions.act_window,name:account.action_invoice_tree4
#: model:ir.ui.menu,name:account.menu_action_invoice_tree4
msgid "Supplier Refunds"
-msgstr "Factures d'abonament de proveïdor"
+msgstr "Factures rectificatives (abonament) de proveïdor"
#. module: account
#: help:account.model.line,date:0
@@ -4951,7 +4953,7 @@ msgstr "Confirmat"
#. module: account
#: wizard_view:account.account.balance.report,account_selection:0
msgid "Select parent account"
-msgstr "Selecciona compte pare"
+msgstr "Seleccioneu el compte pare"
#. module: account
#: field:account.account.template,parent_id:0
@@ -5126,7 +5128,7 @@ msgstr "Compte d'ingressos en plantilla producte"
#: help:account.account.template,currency_id:0
msgid "Force all moves for this account to have this secondary currency."
msgstr ""
-"Força a tots els moviments d'aquest compte que tinguin aquesta moneda "
+"Força a tots els moviments d'aquest compte que tinguin aquesta divisa "
"secundària."
#. module: account
@@ -5140,7 +5142,7 @@ msgstr "_Cancel·la"
#: wizard_view:account.partner.balance.report,init:0
#: wizard_view:account.third_party_ledger.report,init:0
msgid "Select Date-Period"
-msgstr "Selecciona data-període"
+msgstr "Seleccioneu data-període"
#. module: account
#: rml:account.analytic.account.inverted.balance:0
@@ -5169,7 +5171,7 @@ msgstr "Grup de l'impost"
#: model:ir.actions.act_window,name:account.action_invoice_tree3_new
#: model:ir.ui.menu,name:account.menu_action_invoice_tree3_new
msgid "New Customer Refund"
-msgstr "Nova factura d'abonament de client"
+msgstr "Nova factura rectificativa (abonament) de client"
#. module: account
#: help:wizard.multi.charts.accounts,seq_journal:0
@@ -5343,7 +5345,7 @@ msgstr "Filtrat per data"
#. module: account
#: wizard_view:populate_statement_from_inv,init:0
msgid "Choose Journal and Payment Date"
-msgstr "Selecciona diari i data de pagament"
+msgstr "Seleccioneu diari i data de pagament"
#. module: account
#: selection:account.analytic.account,state:0
@@ -5367,7 +5369,7 @@ msgstr "Pagat"
#: model:ir.actions.act_window,name:account.action_invoice_tree11
#: model:ir.ui.menu,name:account.menu_action_invoice_tree11
msgid "Unpaid Customer Refunds"
-msgstr "Factures d'abonament de client sense pagar"
+msgstr "Factures rectificatives (abonament) de client sense pagar"
#. module: account
#: help:account.invoice,residual:0
@@ -5524,7 +5526,7 @@ msgstr "Fi del període"
#: view:account.move:0
#: model:ir.model,name:account.model_account_move
msgid "Account Entry"
-msgstr "Assentament de compte"
+msgstr "Assentament comptable"
#. module: account
#: rml:account.general.journal:0
@@ -5555,7 +5557,7 @@ msgstr "Saldo pendent"
#. module: account
#: rml:account.invoice:0
msgid "Refund"
-msgstr "Factura d'abonament"
+msgstr "Factura rectificativa (abonament)"
#. module: account
#: model:ir.model,name:account.model_account_invoice_tax
@@ -5792,7 +5794,7 @@ msgstr ""
#: field:account.tax.code,code:0
#: field:account.tax.code.template,code:0
msgid "Case Code"
-msgstr "Codi cas"
+msgstr "Codi"
#. module: account
#: selection:account.automatic.reconcile,init,power:0
@@ -5916,7 +5918,7 @@ msgstr "Deixeu-lo buit per a tots els exercicis fiscals oberts"
#: rml:account.invoice:0
#: selection:account.invoice,type:0
msgid "Supplier Refund"
-msgstr "Factura d'abonament de proveïdor"
+msgstr "Factura rectificativa (abonament) de proveïdor"
#. module: account
#: model:process.transition,note:account.process_transition_entriesreconcile0
@@ -6072,3 +6074,6 @@ msgstr ""
#: wizard_button:account.subscription.generate,init,generate:0
msgid "Compute Entry Dates"
msgstr "Calcula les dates de l'assentament"
+
+#~ msgid "account.config.wizard"
+#~ msgstr "account.config.assistent"
diff --git a/addons/account/i18n/it.po b/addons/account/i18n/it.po
index d5cb2f7dc84..0181308a55e 100644
--- a/addons/account/i18n/it.po
+++ b/addons/account/i18n/it.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-05-13 14:03+0000\n"
-"Last-Translator: Carlo - didotech.com \n"
+"PO-Revision-Date: 2010-06-04 16:42+0000\n"
+"Last-Translator: eLBati - albatos.com \n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-05-14 04:55+0000\n"
+"X-Launchpad-Export-Date: 2010-06-05 03:36+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account
@@ -3047,7 +3047,7 @@ msgstr ""
#. module: account
#: field:account.invoice.line,uos_id:0
msgid "Unit of Measure"
-msgstr ""
+msgstr "Unità di misura"
#. module: account
#: field:account.chart.template,property_account_receivable:0
@@ -3107,7 +3107,7 @@ msgstr "Imposta come bozza"
#: help:account.invoice,origin:0
#: help:account.invoice.line,origin:0
msgid "Reference of the document that produced this invoice."
-msgstr ""
+msgstr "Riferimento al documento che ha prodotto questa fattura."
#. module: account
#: selection:account.account,type:0
@@ -3608,7 +3608,7 @@ msgstr "Manuale"
#. module: account
#: view:account.invoice:0
msgid "Compute Taxes"
-msgstr ""
+msgstr "Calcola tasse"
#. module: account
#: field:wizard.multi.charts.accounts,code_digits:0
@@ -4596,7 +4596,7 @@ msgstr ""
#. module: account
#: field:account.tax,price_include:0
msgid "Tax Included in Price"
-msgstr ""
+msgstr "Tassa compresa nel prezzo"
#. module: account
#: model:ir.actions.act_window,name:account.action_account_analytic_journal_tree2
diff --git a/addons/account/invoice.py b/addons/account/invoice.py
index d8205ababa7..5ef80d40560 100644
--- a/addons/account/invoice.py
+++ b/addons/account/invoice.py
@@ -333,6 +333,7 @@ class account_invoice(osv.osv):
raise orm.except_orm(_('Configuration Error!'),
_('There is no Accounting Journal of type Sale/Purchase defined!'))
else:
+ raise
raise orm.except_orm(_('UnknownError'), str(e))
def confirm_paid(self, cr, uid, ids, context=None):
@@ -1131,17 +1132,17 @@ account_invoice()
class account_invoice_line(osv.osv):
def _amount_line(self, cr, uid, ids, prop, unknow_none,unknow_dict):
res = {}
- cur_obj=self.pool.get('res.currency')
+ tax_obj = self.pool.get('account.tax')
+ cur_obj = self.pool.get('res.currency')
for line in self.browse(cr, uid, ids):
+ price = line.price_unit * (1-(line.discount or 0.0)/100.0)
+ taxes = tax_obj.compute_all(cr, uid, line.invoice_line_tax_id, price, line.quantity)
+ res[line.id] = taxes['total']
if line.invoice_id:
- res[line.id] = line.price_unit * line.quantity * (1-(line.discount or 0.0)/100.0)
cur = line.invoice_id.currency_id
res[line.id] = cur_obj.round(cr, uid, cur, res[line.id])
- else:
- res[line.id] = round(line.price_unit * line.quantity * (1-(line.discount or 0.0)/100.0),self.pool.get('decimal.precision').precision_get(cr, uid, 'Account'))
return res
-
def _price_unit_default(self, cr, uid, context=None):
if context is None:
context = {}
@@ -1155,7 +1156,7 @@ class account_invoice_line(osv.osv):
taxes = l[2].get('invoice_line_tax_id')
if len(taxes[0]) >= 3 and taxes[0][2]:
taxes = tax_obj.browse(cr, uid, taxes[0][2])
- for tax in tax_obj.compute(cr, uid, taxes, p,l[2].get('quantity'), context.get('address_invoice_id', False), l[2].get('product_id', False), context.get('partner_id', False)):
+ for tax in tax_obj.compute_all(cr, uid, taxes, p,l[2].get('quantity'), context.get('address_invoice_id', False), l[2].get('product_id', False), context.get('partner_id', False))['taxes']:
t = t - tax['amount']
return t
return 0
@@ -1170,7 +1171,8 @@ class account_invoice_line(osv.osv):
'product_id': fields.many2one('product.product', 'Product', ondelete='set null'),
'account_id': fields.many2one('account.account', 'Account', required=True, domain=[('type','<>','view'), ('type', '<>', 'closed')], help="The income or expense account related to the selected product."),
'price_unit': fields.float('Unit Price', required=True, digits_compute= dp.get_precision('Account')),
- 'price_subtotal': fields.function(_amount_line, method=True, string='Subtotal',store=True, type="float", digits_compute= dp.get_precision('Account')),
+ 'price_subtotal': fields.function(_amount_line, method=True, string='Subtotal', type="float",
+ digits_compute= dp.get_precision('Account'), store=True),
'quantity': fields.float('Quantity', required=True),
'discount': fields.float('Discount (%)', digits_compute= dp.get_precision('Account')),
'invoice_line_tax_id': fields.many2many('account.tax', 'account_invoice_line_tax', 'invoice_line_id', 'tax_id', 'Taxes', domain=[('parent_id','=',False)]),
@@ -1339,10 +1341,10 @@ class account_invoice_line(osv.osv):
continue
res.append(mres)
tax_code_found= False
- for tax in tax_obj.compute(cr, uid, line.invoice_line_tax_id,
+ for tax in tax_obj.compute_all(cr, uid, line.invoice_line_tax_id,
(line.price_unit * (1.0 - (line['discount'] or 0.0) / 100.0)),
line.quantity, inv.address_invoice_id.id, line.product_id,
- inv.partner_id):
+ inv.partner_id)['taxes']:
if inv.type in ('out_invoice', 'in_invoice'):
tax_code_id = tax['base_code_id']
@@ -1445,7 +1447,7 @@ class account_invoice_tax(osv.osv):
company_currency = inv.company_id.currency_id.id
for line in inv.invoice_line:
- for tax in tax_obj.compute(cr, uid, line.invoice_line_tax_id, (line.price_unit* (1-(line.discount or 0.0)/100.0)), line.quantity, inv.address_invoice_id.id, line.product_id, inv.partner_id):
+ for tax in tax_obj.compute_all(cr, uid, line.invoice_line_tax_id, (line.price_unit* (1-(line.discount or 0.0)/100.0)), line.quantity, inv.address_invoice_id.id, line.product_id, inv.partner_id)['taxes']:
val={}
val['invoice_id'] = inv.id
val['name'] = tax['name']
@@ -1507,11 +1509,7 @@ account_invoice_tax()
class res_partner(osv.osv):
""" Inherits partner and adds invoice information in the partner form """
_inherit = 'res.partner'
-
_columns = {
- 'invoice_ids': fields.one2many('account.invoice.line', 'partner_id', 'Invoices', readonly=True),
- }
-
+ 'invoice_ids': fields.one2many('account.invoice.line', 'partner_id', 'Invoices', readonly=True),
+ }
res_partner()
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account_payment/i18n/zh_CN.po b/addons/account_payment/i18n/zh_CN.po
index 2dbc570776c..fa12e8b9841 100644
--- a/addons/account_payment/i18n/zh_CN.po
+++ b/addons/account_payment/i18n/zh_CN.po
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 5.0.6\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-03-20 07:13+0000\n"
-"Last-Translator: Black Jack \n"
+"PO-Revision-Date: 2010-06-04 13:32+0000\n"
+"Last-Translator: Eleanor Chen \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-04-17 04:12+0000\n"
+"X-Launchpad-Export-Date: 2010-06-05 03:36+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_payment
@@ -251,12 +251,12 @@ msgstr "无效XML视图结构!"
#: wizard_button:populate_payment,search,end:0
#: wizard_button:populate_statement,init,end:0
msgid "_Cancel"
-msgstr "取消"
+msgstr "取消(_C)"
#. module: account_payment
#: field:payment.line,create_date:0
msgid "Created"
-msgstr "创建"
+msgstr "已创建"
#. module: account_payment
#: view:payment.line:0
diff --git a/addons/account_voucher_payment/i18n/ca.po b/addons/account_voucher_payment/i18n/ca.po
index daf15f0ea67..baf4157d3ab 100644
--- a/addons/account_voucher_payment/i18n/ca.po
+++ b/addons/account_voucher_payment/i18n/ca.po
@@ -1,20 +1,20 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-# * account_voucher_payment
+# Catalan translation for openobject-addons
+# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR , 2010.
#
msgid ""
msgstr ""
-"Project-Id-Version: OpenERP Server 5.0.0\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2009-05-13 20:11+0000\n"
-"PO-Revision-Date: 2010-01-26 11:00+0000\n"
-"Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
-"\n"
-"Language-Team: \n"
+"PO-Revision-Date: 2010-06-04 09:33+0000\n"
+"Last-Translator: FULL NAME \n"
+"Language-Team: Catalan \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-05-21 03:47+0000\n"
+"X-Launchpad-Export-Date: 2010-06-05 03:36+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_voucher_payment
diff --git a/addons/account_voucher_payment/i18n/es.po b/addons/account_voucher_payment/i18n/es.po
index a3df62eaec2..7cdb7cd2526 100644
--- a/addons/account_voucher_payment/i18n/es.po
+++ b/addons/account_voucher_payment/i18n/es.po
@@ -1,19 +1,20 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-# * account_voucher_payment
+# Spanish translation for openobject-addons
+# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR , 2010.
#
msgid ""
msgstr ""
-"Project-Id-Version: OpenERP Server 5.0.0\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2009-05-13 20:11+0000\n"
-"PO-Revision-Date: 2010-02-19 05:54+0000\n"
-"Last-Translator: Luis Alejandro Rangel Sánchez \n"
-"Language-Team: \n"
+"PO-Revision-Date: 2010-06-04 09:33+0000\n"
+"Last-Translator: FULL NAME \n"
+"Language-Team: Spanish \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-05-21 03:47+0000\n"
+"X-Launchpad-Export-Date: 2010-06-05 03:36+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_voucher_payment
diff --git a/addons/auction/i18n/pl.po b/addons/auction/i18n/pl.po
index c5219bd77b3..326474f19c4 100644
--- a/addons/auction/i18n/pl.po
+++ b/addons/auction/i18n/pl.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: 2009-02-03 11:09+0000\n"
-"Last-Translator: Fabien (Open ERP) \n"
+"PO-Revision-Date: 2010-06-04 21:56+0000\n"
+"Last-Translator: ErnestŻyciński \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-04-17 04:14+0000\n"
+"X-Launchpad-Export-Date: 2010-06-06 03:34+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: auction
@@ -39,12 +39,12 @@ msgstr ""
#: field:report.seller.auction,seller:0
#: field:report.seller.auction2,seller:0
msgid "Seller"
-msgstr ""
+msgstr "Sprzedawca"
#. module: auction
#: constraint:ir.actions.act_window:0
msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "Nieprawidłowa nazwa modelu w definicji akcji."
#. module: auction
#: selection:auction.lots.send.aie,date_ask,numerotation:0
@@ -102,7 +102,7 @@ msgstr ""
#: field:report.buyer.auction,buyer:0
#: field:report.buyer.auction2,buyer:0
msgid "Buyer"
-msgstr ""
+msgstr "Kupujący"
#. module: auction
#: field:report.auction.view,nobjects:0
@@ -140,7 +140,7 @@ msgstr ""
#: wizard_field:auction.lots.make_invoice,init,amount:0
#: wizard_field:auction.lots.make_invoice_buyer,init,amount:0
msgid "Invoiced Amount"
-msgstr ""
+msgstr "Kwota zafakturowana"
#. module: auction
#: selection:auction.lot.category,aie_categ:0
@@ -165,7 +165,7 @@ msgstr ""
#. module: auction
#: field:auction.deposit.cost,amount:0
msgid "Amount"
-msgstr ""
+msgstr "Kwota"
#. module: auction
#: model:ir.actions.act_window,name:auction.action_deposit_border
@@ -191,12 +191,12 @@ msgstr ""
#. module: auction
#: field:auction.dates,account_analytic_id:0
msgid "Analytic Account"
-msgstr ""
+msgstr "Konto analityczne"
#. module: auction
#: selection:auction.lot.category,aie_categ:0
msgid "Unclassifieds"
-msgstr ""
+msgstr "Niesklasyfikowane"
#. module: auction
#: model:ir.ui.menu,name:auction.menu_auction_dates_next_by_auction
@@ -232,7 +232,7 @@ msgstr "Rodzaj obiektu"
#. module: auction
#: wizard_field:auction.lots.sms_send,init,text:0
msgid "SMS Message"
-msgstr ""
+msgstr "Wiadomość SMS"
#. module: auction
#: selection:auction.lot.category,aie_categ:0
@@ -243,7 +243,7 @@ msgstr "Sztuka nowoczesna"
#: view:auction.lots:0
#: view:report.unclassified.objects:0
msgid "Ref"
-msgstr ""
+msgstr "Odnośnik"
#. module: auction
#: field:report.auction.view,nseller:0
diff --git a/addons/auction/i18n/zh_CN.po b/addons/auction/i18n/zh_CN.po
index 58ebcb44914..534ec4e0e32 100644
--- a/addons/auction/i18n/zh_CN.po
+++ b/addons/auction/i18n/zh_CN.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-03-20 07:33+0000\n"
-"Last-Translator: Black Jack \n"
+"PO-Revision-Date: 2010-06-04 12:37+0000\n"
+"Last-Translator: Eleanor Chen \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-04-17 04:14+0000\n"
+"X-Launchpad-Export-Date: 2010-06-05 03:36+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: auction
@@ -415,7 +415,7 @@ msgstr "库存数量"
#: wizard_button:auction.lots.numerotate,search,end:0
#: wizard_button:auction.lots.numerotate_cont,init,end:0
msgid "Exit"
-msgstr "出口"
+msgstr "退出"
#. module: auction
#: field:report.buyer.auction2,net_revenue:0
diff --git a/addons/base_report_designer/i18n/hr.po b/addons/base_report_designer/i18n/hr.po
index f63fe3a567e..6adc7468085 100644
--- a/addons/base_report_designer/i18n/hr.po
+++ b/addons/base_report_designer/i18n/hr.po
@@ -7,25 +7,25 @@ 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-03-24 09:27+0000\n"
+"PO-Revision-Date: 2010-06-06 23:30+0000\n"
"Last-Translator: Drazen Bosak \n"
"Language-Team: Vinteh\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-04-17 04:13+0000\n"
+"X-Launchpad-Export-Date: 2010-06-07 03:43+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
"Language: hr\n"
#. module: base_report_designer
#: wizard_field:base_report_designer.modify,init,text:0
msgid "Introduction"
-msgstr ""
+msgstr "Uvod"
#. module: base_report_designer
#: wizard_view:base_report_designer.modify,send_form:0
msgid "Upload your modified report"
-msgstr ""
+msgstr "Pošalji promijenjen izvještaj na Server"
#. module: base_report_designer
#: wizard_button:base_report_designer.modify,get_form_result,send_form:0
diff --git a/addons/base_setup/i18n/hr.po b/addons/base_setup/i18n/hr.po
index 0774c70a0e7..687d398b8f6 100644
--- a/addons/base_setup/i18n/hr.po
+++ b/addons/base_setup/i18n/hr.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-03-26 01:09+0000\n"
+"PO-Revision-Date: 2010-06-06 23:31+0000\n"
"Last-Translator: Drazen Bosak \n"
"Language-Team: Vinteh\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-04-17 04:05+0000\n"
+"X-Launchpad-Export-Date: 2010-06-07 03:43+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
"Language: hr\n"
@@ -22,7 +22,7 @@ msgstr ""
#: wizard_field:base_setup.base_setup,init,city:0
#: wizard_field:base_setup.base_setup,update,city:0
msgid "City"
-msgstr ""
+msgstr "Grad"
#. module: base_setup
#: wizard_view:base_setup.base_setup,finish:0
diff --git a/addons/hr_evaluation/i18n/hr.po b/addons/hr_evaluation/i18n/hr.po
new file mode 100644
index 00000000000..32aeb52c2e9
--- /dev/null
+++ b/addons/hr_evaluation/i18n/hr.po
@@ -0,0 +1,277 @@
+# Croatian translation for openobject-addons
+# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR , 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME \n"
+"POT-Creation-Date: 2009-11-25 12:18+0000\n"
+"PO-Revision-Date: 2010-06-06 23:51+0000\n"
+"Last-Translator: FULL NAME \n"
+"Language-Team: Croatian \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2010-06-07 03:43+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: hr_evaluation
+#: view:hr_evaluation.type:0
+#: field:hr_evaluation.type,info:0
+msgid "Information"
+msgstr ""
+
+#. module: hr_evaluation
+#: constraint:ir.model:0
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
+msgstr ""
+
+#. module: hr_evaluation
+#: view:hr_evaluation.evaluation:0
+msgid "Schedule next evaluation"
+msgstr ""
+
+#. module: hr_evaluation
+#: view:hr_evaluation.evaluation:0
+#: field:hr_evaluation.evaluation,info_bad:0
+msgid "Bad Points"
+msgstr ""
+
+#. module: hr_evaluation
+#: model:ir.actions.act_window,name:hr_evaluation.open_view_employee_evaluation_next_my_list
+msgid "My Next Evaluation"
+msgstr ""
+
+#. module: hr_evaluation
+#: field:hr_evaluation.type,value_ids:0
+msgid "Values"
+msgstr ""
+
+#. module: hr_evaluation
+#: view:hr_evaluation.evaluation:0
+#: field:hr_evaluation.evaluation,info_good:0
+msgid "Good Points"
+msgstr ""
+
+#. module: hr_evaluation
+#: field:hr_evaluation.evaluation,state:0
+msgid "State"
+msgstr ""
+
+#. module: hr_evaluation
+#: field:hr_evaluation.evaluation,score:0
+#: field:hr_evaluation.quote,score:0
+#: field:hr_evaluation.type,score:0
+#: field:hr_evaluation.type.value,score:0
+msgid "Score"
+msgstr ""
+
+#. module: hr_evaluation
+#: selection:hr_evaluation.evaluation,state:0
+msgid "Draft"
+msgstr ""
+
+#. module: hr_evaluation
+#: view:hr_evaluation.evaluation:0
+msgid "Informal Data"
+msgstr ""
+
+#. module: hr_evaluation
+#: constraint:ir.actions.act_window:0
+msgid "Invalid model name in the action definition."
+msgstr ""
+
+#. module: hr_evaluation
+#: field:hr_evaluation.evaluation,employee_id:0
+msgid "Employee"
+msgstr ""
+
+#. module: hr_evaluation
+#: view:hr_evaluation.evaluation:0
+#: field:hr_evaluation.evaluation,info_improve:0
+msgid "To Improve"
+msgstr ""
+
+#. module: hr_evaluation
+#: field:hr_evaluation.quote,evaluation_id:0
+msgid "Evaluation"
+msgstr ""
+
+#. module: hr_evaluation
+#: field:hr_evaluation.type.value,type_id:0
+msgid "Evaluation Type"
+msgstr ""
+
+#. module: hr_evaluation
+#: view:hr_evaluation.evaluation:0
+msgid "Status"
+msgstr ""
+
+#. module: hr_evaluation
+#: view:hr_evaluation.type:0
+msgid "Apply to categories"
+msgstr ""
+
+#. module: hr_evaluation
+#: model:ir.module.module,description:hr_evaluation.module_meta_information
+msgid "Ability to create employees evaluation."
+msgstr ""
+
+#. module: hr_evaluation
+#: field:hr_evaluation.quote,name:0
+msgid "Quote"
+msgstr ""
+
+#. module: hr_evaluation
+#: field:hr_evaluation.type,category_ids:0
+msgid "Appliable Role"
+msgstr ""
+
+#. module: hr_evaluation
+#: field:hr_evaluation.evaluation,user_id:0
+msgid "Evaluation User"
+msgstr ""
+
+#. module: hr_evaluation
+#: view:hr_evaluation.type:0
+msgid "Choices Results"
+msgstr ""
+
+#. module: hr_evaluation
+#: field:hr_evaluation.evaluation,date:0
+msgid "Date"
+msgstr ""
+
+#. module: hr_evaluation
+#: model:ir.ui.menu,name:hr_evaluation.menu_eval_hr
+#: model:ir.ui.menu,name:hr_evaluation.menu_open_view_employee_evaluation_form
+msgid "Evaluations"
+msgstr ""
+
+#. module: hr_evaluation
+#: model:ir.ui.menu,name:hr_evaluation.menu_eval_config
+msgid "Configuration"
+msgstr ""
+
+#. module: hr_evaluation
+#: model:ir.ui.menu,name:hr_evaluation.menu_open_view_employee_evaluation_next_list
+msgid "Next Evaluations"
+msgstr ""
+
+#. module: hr_evaluation
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr ""
+
+#. module: hr_evaluation
+#: model:ir.ui.menu,name:hr_evaluation.menu_open_view_evaluation_type_form
+msgid "Evaluation Criterions"
+msgstr ""
+
+#. module: hr_evaluation
+#: model:ir.ui.menu,name:hr_evaluation.menu_open_view_employee_my_old_evaluation_list
+msgid "My Preceeding Evaluations"
+msgstr ""
+
+#. module: hr_evaluation
+#: model:ir.ui.menu,name:hr_evaluation.menu_resp_hr
+msgid "HR Responsible"
+msgstr ""
+
+#. module: hr_evaluation
+#: field:hr_evaluation.quote,value_id:0
+#: field:hr_evaluation.type.value,name:0
+msgid "Value"
+msgstr ""
+
+#. module: hr_evaluation
+#: field:hr_evaluation.evaluation,name:0
+msgid "Summary"
+msgstr ""
+
+#. module: hr_evaluation
+#: field:hr_evaluation.type,active:0
+msgid "Active"
+msgstr ""
+
+#. module: hr_evaluation
+#: view:hr_evaluation.type:0
+msgid "Notes"
+msgstr ""
+
+#. module: hr_evaluation
+#: view:hr_evaluation.evaluation:0
+#: model:ir.model,name:hr_evaluation.model_hr_evaluation_evaluation
+msgid "Employee Evaluation"
+msgstr ""
+
+#. module: hr_evaluation
+#: model:ir.model,name:hr_evaluation.model_hr_evaluation_type
+msgid "Employee Evaluation Type"
+msgstr ""
+
+#. module: hr_evaluation
+#: view:hr_evaluation.evaluation:0
+msgid "Quotations"
+msgstr ""
+
+#. module: hr_evaluation
+#: model:ir.actions.act_window,name:hr_evaluation.open_view_employee_evaluation_next_list
+msgid "Next Employee Evaluation"
+msgstr ""
+
+#. module: hr_evaluation
+#: field:hr_evaluation.quote,type_id:0
+msgid "Type"
+msgstr ""
+
+#. module: hr_evaluation
+#: view:hr_evaluation.type:0
+#: field:hr_evaluation.type,name:0
+msgid "Evaluation Criterion"
+msgstr ""
+
+#. module: hr_evaluation
+#: model:ir.ui.menu,name:hr_evaluation.menu_open_view_employee_evaluation_next_my_list
+msgid "My Next Evaluations"
+msgstr ""
+
+#. module: hr_evaluation
+#: view:hr_evaluation.quote:0
+msgid "Evalution Quote"
+msgstr ""
+
+#. module: hr_evaluation
+#: model:ir.module.module,shortdesc:hr_evaluation.module_meta_information
+msgid "Human Resources Evaluation"
+msgstr ""
+
+#. module: hr_evaluation
+#: field:hr_evaluation.evaluation,quote_ids:0
+msgid "Quotes"
+msgstr ""
+
+#. module: hr_evaluation
+#: view:hr_evaluation.evaluation:0
+#: selection:hr_evaluation.evaluation,state:0
+msgid "Done"
+msgstr ""
+
+#. module: hr_evaluation
+#: model:ir.model,name:hr_evaluation.model_hr_evaluation_quote
+msgid "Employee Evaluation Quote"
+msgstr ""
+
+#. module: hr_evaluation
+#: view:hr_evaluation.evaluation:0
+#: field:hr_evaluation.evaluation,info_employee:0
+msgid "Employee Response"
+msgstr ""
+
+#. module: hr_evaluation
+#: model:ir.model,name:hr_evaluation.model_hr_evaluation_type_value
+msgid "Evaluation Type Value"
+msgstr ""
diff --git a/addons/hr_expense/__openerp__.py b/addons/hr_expense/__openerp__.py
index 83113558c43..08103af1b68 100644
--- a/addons/hr_expense/__openerp__.py
+++ b/addons/hr_expense/__openerp__.py
@@ -40,7 +40,7 @@
""",
'author': 'Tiny',
'website': 'http://www.openerp.com',
- 'depends': ['hr', 'account', 'account_tax_include'],
+ 'depends': ['hr', 'account'],
'init_xml': [],
'update_xml': [
'security/ir.model.access.csv',
diff --git a/addons/hr_expense/hr_expense.py b/addons/hr_expense/hr_expense.py
index 820d3467660..e0d55bee5fe 100644
--- a/addons/hr_expense/hr_expense.py
+++ b/addons/hr_expense/hr_expense.py
@@ -153,7 +153,6 @@ class hr_expense_expense(osv.osv):
'address_contact_id': exp.employee_id.address_id.id,
'origin': exp.name,
'invoice_line': lines,
- 'price_type': 'tax_included',
'currency_id': exp.currency_id.id,
'payment_term': payment_term_id,
'fiscal_position': exp.employee_id.address_id.partner_id.property_account_position.id
diff --git a/addons/hr_timesheet_invoice/i18n/pl.po b/addons/hr_timesheet_invoice/i18n/pl.po
index 8f95108f331..6ba221731f2 100644
--- a/addons/hr_timesheet_invoice/i18n/pl.po
+++ b/addons/hr_timesheet_invoice/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-05-24 15:59+0000\n"
-"Last-Translator: Grzegorz Grzelak (Cirrus.pl) \n"
+"PO-Revision-Date: 2010-06-04 21:45+0000\n"
+"Last-Translator: ErnestŻyciński \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-05-25 03:42+0000\n"
+"X-Launchpad-Export-Date: 2010-06-06 03:34+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: hr_timesheet_invoice
@@ -327,7 +327,7 @@ msgstr "Upust (%)"
#. module: hr_timesheet_invoice
#: rml:account.analytic.profit:0
msgid "Eff."
-msgstr ""
+msgstr "Eff."
#. module: hr_timesheet_invoice
#: wizard_field:hr.timesheet.invoice.create,init,accounts:0
@@ -433,7 +433,7 @@ msgstr "Produkt"
#. module: hr_timesheet_invoice
#: rml:account.analytic.profit:0
msgid "%"
-msgstr ""
+msgstr "%"
#. module: hr_timesheet_invoice
#: field:hr_timesheet_invoice.factor,name:0
diff --git a/addons/l10n_ch/__openerp__.py b/addons/l10n_ch/__openerp__.py
index 9d0b2852abd..7de9b5eb77e 100644
--- a/addons/l10n_ch/__openerp__.py
+++ b/addons/l10n_ch/__openerp__.py
@@ -77,7 +77,6 @@ TODO :
"base_vat",
"base_iban",
"account_payment",
- "account_tax_include",
],
"init_xml" : [
"dta_data.xml",
diff --git a/addons/l10n_fr/i18n/pl.po b/addons/l10n_fr/i18n/pl.po
index 9ab5656cf1c..f221278c9f0 100644
--- a/addons/l10n_fr/i18n/pl.po
+++ b/addons/l10n_fr/i18n/pl.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: 2009-02-03 09:18+0000\n"
-"Last-Translator: Fabien (Open ERP) \n"
+"PO-Revision-Date: 2010-06-04 21:52+0000\n"
+"Last-Translator: ErnestŻyciński \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-04-17 04:04+0000\n"
+"X-Launchpad-Export-Date: 2010-06-06 03:34+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: l10n_fr
@@ -77,7 +77,7 @@ msgstr "Własność"
#. module: l10n_fr
#: model:account.account.type,name:l10n_fr.account_type_income
msgid "Income"
-msgstr ""
+msgstr "Przychody"
#. module: l10n_fr
#: rml:l10n.fr.cdr:0
@@ -113,12 +113,12 @@ msgstr ""
#. module: l10n_fr
#: model:account.account.type,name:l10n_fr.account_type_payable
msgid "Payable"
-msgstr ""
+msgstr "Należności"
#. module: l10n_fr
#: rml:l10n.fr.bilan:0
msgid "( IV )"
-msgstr ""
+msgstr "( IV )"
#. module: l10n_fr
#: model:account.fiscal.position.template,name:l10n_fr.fiscal_position_template_4
@@ -138,7 +138,7 @@ msgstr ""
#. module: l10n_fr
#: rml:l10n.fr.cdr:0
msgid "+ IV+ V+ VI"
-msgstr ""
+msgstr "+ IV+ V+ VI"
#. module: l10n_fr
#: rml:l10n.fr.cdr:0
@@ -153,12 +153,12 @@ msgstr ""
#. module: l10n_fr
#: rml:l10n.fr.bilan:0
msgid "D"
-msgstr ""
+msgstr "D"
#. module: l10n_fr
#: rml:l10n.fr.bilan:0
msgid "PROVISIONS"
-msgstr ""
+msgstr "PROWIZJA"
#. module: l10n_fr
#: rml:l10n.fr.bilan:0
@@ -183,7 +183,7 @@ msgstr ""
#. module: l10n_fr
#: rml:l10n.fr.bilan:0
msgid "P"
-msgstr ""
+msgstr "P"
#. module: l10n_fr
#: model:account.account.type,name:l10n_fr.account_type_stocks
@@ -193,7 +193,7 @@ msgstr ""
#. module: l10n_fr
#: rml:l10n.fr.bilan:0
msgid "T"
-msgstr ""
+msgstr "T"
#. module: l10n_fr
#: rml:l10n.fr.bilan:0
@@ -213,12 +213,12 @@ msgstr ""
#. module: l10n_fr
#: wizard_view:l10n.fr.cdr.report,init:0
msgid "Select period"
-msgstr ""
+msgstr "Wybierz okres"
#. module: l10n_fr
#: rml:l10n.fr.bilan:0
msgid "RÉSERVES"
-msgstr ""
+msgstr "ZAREZERWOWANY"
#. module: l10n_fr
#: rml:l10n.fr.bilan:0
@@ -228,7 +228,7 @@ msgstr ""
#. module: l10n_fr
#: model:account.account.type,name:l10n_fr.account_type_tax
msgid "Tax"
-msgstr ""
+msgstr "Podatek"
#. module: l10n_fr
#: rml:l10n.fr.cdr:0
@@ -290,7 +290,7 @@ msgstr ""
#: model:account.fiscal.position.template,name:l10n_fr.fiscal_position_template_1
#: model:account.fiscal.position.template,name:l10n_fr.fiscal_position_template_5
msgid "France"
-msgstr ""
+msgstr "Francja"
#. module: l10n_fr
#: rml:l10n.fr.bilan:0
@@ -306,7 +306,7 @@ msgstr ""
#: wizard_button:l10n.fr.bilan.report,init,report:0
#: wizard_button:l10n.fr.cdr.report,init,report:0
msgid "Print"
-msgstr ""
+msgstr "Drukuj"
#. module: l10n_fr
#: rml:l10n.fr.bilan:0
@@ -316,7 +316,7 @@ msgstr ""
#. module: l10n_fr
#: rml:l10n.fr.bilan:0
msgid "Net"
-msgstr ""
+msgstr "Sieć"
#. module: l10n_fr
#: rml:l10n.fr.cdr:0
@@ -331,7 +331,7 @@ msgstr ""
#. module: l10n_fr
#: rml:l10n.fr.cdr:0
msgid "( VI )"
-msgstr ""
+msgstr "( VI )"
#. module: l10n_fr
#: constraint:account.account.template:0
@@ -341,7 +341,7 @@ msgstr ""
#. module: l10n_fr
#: model:account.account.type,name:l10n_fr.account_type_provision
msgid "Provisions"
-msgstr ""
+msgstr "Prowizja"
#. module: l10n_fr
#: rml:l10n.fr.cdr:0
@@ -378,7 +378,7 @@ msgstr ""
#. module: l10n_fr
#: field:l10n.fr.line,report_id:0
msgid "Report"
-msgstr ""
+msgstr "Raport"
#. module: l10n_fr
#: constraint:account.tax.code.template:0
@@ -408,12 +408,12 @@ msgstr ""
#. module: l10n_fr
#: rml:l10n.fr.bilan:0
msgid "C"
-msgstr ""
+msgstr "C"
#. module: l10n_fr
#: rml:l10n.fr.bilan:0
msgid "M"
-msgstr ""
+msgstr "M"
#. module: l10n_fr
#: model:ir.module.module,description:l10n_fr.module_meta_information
@@ -441,7 +441,7 @@ msgstr ""
#. module: l10n_fr
#: model:account.account.type,name:l10n_fr.account_type_expense
msgid "Expense"
-msgstr ""
+msgstr "Koszty"
#. module: l10n_fr
#: rml:l10n.fr.bilan:0
diff --git a/addons/process/i18n/hr.po b/addons/process/i18n/hr.po
index 1c615bec606..b3cd672494d 100644
--- a/addons/process/i18n/hr.po
+++ b/addons/process/i18n/hr.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-03-22 00:55+0000\n"
+"PO-Revision-Date: 2010-06-06 23:26+0000\n"
"Last-Translator: Drazen Bosak \n"
"Language-Team: Vinteh\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-04-17 04:04+0000\n"
+"X-Launchpad-Export-Date: 2010-06-07 03:43+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
"Language: hr\n"
@@ -21,7 +21,7 @@ msgstr ""
#: view:process.node:0
#: view:process.process:0
msgid "Process Node"
-msgstr ""
+msgstr "Procesni čvor"
#. module: process
#: constraint:ir.model:0
@@ -138,7 +138,7 @@ msgstr "ID Radnje"
#. module: process
#: view:process.transition:0
msgid "Process Transition"
-msgstr "Prijelaz Procesa"
+msgstr "Promjena Procesa"
#. module: process
#: model:ir.model,name:process.model_process_condition
@@ -150,7 +150,7 @@ msgstr "Uvjet"
#. module: process
#: selection:process.transition.action,state:0
msgid "Dummy"
-msgstr "Dummy"
+msgstr "Prazan"
#. module: process
#: constraint:ir.ui.view:0
diff --git a/addons/project_issue/project_issue.py b/addons/project_issue/project_issue.py
index 533466f1615..ecc42a00be2 100644
--- a/addons/project_issue/project_issue.py
+++ b/addons/project_issue/project_issue.py
@@ -63,36 +63,43 @@ class project_issue(osv.osv, crm.crm_case):
res_obj = self.pool.get('resource.resource')
res = {}
- for issue in self.browse(cr, uid, ids , context):
+ for issue in self.browse(cr, uid, ids, context):
for field in fields:
res[issue.id] = {}
duration = 0
ans = False
- if field == 'day_open':
+ hours = 0
+
+ if field in ['working_hours_open','day_open']:
if issue.date_open:
date_create = datetime.strptime(issue.create_date, "%Y-%m-%d %H:%M:%S")
date_open = datetime.strptime(issue.date_open, "%Y-%m-%d %H:%M:%S")
ans = date_open - date_create
date_until = issue.date_open
- elif field == 'day_close':
+ hours = cal_obj.interval_hours_get(cr, uid, issue.project_id.resource_calendar_id.id,
+ mx.DateTime.strptime(issue.create_date, '%Y-%m-%d %H:%M:%S'),
+ mx.DateTime.strptime(issue.date_open, '%Y-%m-%d %H:%M:%S'))
+ elif field in ['working_hours_close','day_close']:
if issue.date_closed:
date_create = datetime.strptime(issue.create_date, "%Y-%m-%d %H:%M:%S")
date_close = datetime.strptime(issue.date_closed, "%Y-%m-%d %H:%M:%S")
date_until = issue.date_closed
ans = date_close - date_create
+ hours = cal_obj.interval_hours_get(cr, uid, issue.project_id.resource_calendar_id.id,
+ mx.DateTime.strptime(issue.create_date, '%Y-%m-%d %H:%M:%S'),
+ mx.DateTime.strptime(issue.date_closed, '%Y-%m-%d %H:%M:%S'))
if ans:
resource_id = False
if issue.user_id:
resource_ids = res_obj.search(cr, uid, [('user_id','=',issue.user_id.id)])
if resource_ids and len(resource_ids):
resource_id = resource_ids[0]
-
duration = float(ans.days)
- if issue.section_id and issue.section_id.resource_calendar_id:
- duration = float(ans.days) * 24
- new_dates = cal_obj.interval_get(cr,
+ if issue.project_id and issue.project_id.resource_calendar_id:
+ duration = float(ans.days) * 24
+ new_dates = cal_obj.interval_min_get(cr,
uid,
- issue.section_id.resource_calendar_id and issue.section_id.resource_calendar_id.id or False,
+ issue.project_id.resource_calendar_id.id,
mx.DateTime.strptime(issue.create_date, '%Y-%m-%d %H:%M:%S'),
duration,
resource=resource_id
@@ -104,9 +111,11 @@ class project_issue(osv.osv, crm.crm_case):
no_days.append(in_time.date)
if out_time > date_until:
break
- duration = len(no_days)
- res[issue.id][field] = abs(float(duration))
-
+ duration = len(no_days)
+ if field in ['working_hours_open','working_hours_close']:
+ res[issue.id][field] = hours
+ else:
+ res[issue.id][field] = abs(float(duration))
return res
_columns = {
@@ -164,8 +173,10 @@ class project_issue(osv.osv, crm.crm_case):
'day_close': fields.function(_compute_day, string='Days to Close', \
method=True, multi='day_close', type="float", store=True),
'assigned_to' : fields.many2one('res.users', 'Assigned to'),
- 'working_hours_open': fields.float('Working Hours to Open the Issue'),
- 'working_hours_close': fields.float('Working Hours to Close the Issue'),
+ 'working_hours_open': fields.function(_compute_day, string='Working Hours to Open the Issue', \
+ method=True, multi='working_days_open', type="float", store=True),
+ 'working_hours_close': fields.function(_compute_day, string='Working Hours to Close the Issue', \
+ method=True, multi='working_days_close', type="float", store=True),
}
def _get_project(self, cr, uid, context):
diff --git a/addons/project_issue_sheet/project_issue_sheet.py b/addons/project_issue_sheet/project_issue_sheet.py
index c48ff73b0f0..4027dab3572 100644
--- a/addons/project_issue_sheet/project_issue_sheet.py
+++ b/addons/project_issue_sheet/project_issue_sheet.py
@@ -19,17 +19,7 @@
#
##############################################################################
-import base64
-import os
-import re
-import time
-import mx.DateTime
-from datetime import datetime, timedelta
-
-import tools
-from crm import crm
from osv import fields,osv,orm
-from osv.orm import except_orm
from tools.translate import _
class project_issue(osv.osv):
diff --git a/addons/purchase/i18n/pl.po b/addons/purchase/i18n/pl.po
index 214ea309fba..af8ed99ffbe 100644
--- a/addons/purchase/i18n/pl.po
+++ b/addons/purchase/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-02-18 15:42+0000\n"
+"PO-Revision-Date: 2010-06-04 18:08+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-04-17 03:59+0000\n"
+"X-Launchpad-Export-Date: 2010-06-05 03:35+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: purchase
@@ -195,11 +195,11 @@ msgid ""
msgstr ""
"Stan zamówienia zakupu lub zapytania ofertowego. Zapytanie ofertowe jest "
"zamówieniem zakupu w stanie 'Projekt'. Następnie zamówienie może być "
-"potwierdzone i jego stan zmieni się w 'Zatwierdzone'. Następnie po "
-"potwierdzeniu przez dostawcę stan zmienia się w 'Zaaprobowane'. Kiedy "
+"potwierdzone i jego stan zmieni się w 'Potwierdzone'. Następnie po "
+"zaaprobowaniu przez dostawcę stan zmienia się w 'Zaaprobowane'. Kiedy "
"zamówienie jest zrealizowane i zapłacone stan zmienia się na 'Wykonano'. "
-"Jeśłi wystąpi operacja anulowania lub w trakcie fakturowania lub "
-"przyjmowania towarów, to stan zmieni się na Wyjątek."
+"Jeśli wystąpi operacja anulowania w trakcie fakturowania lub przyjmowania "
+"towarów, to stan zmieni się na Wyjątek."
#. module: purchase
#: field:purchase.order,origin:0
diff --git a/addons/purchase/purchase.py b/addons/purchase/purchase.py
index c2e871f685a..443a279e3f2 100644
--- a/addons/purchase/purchase.py
+++ b/addons/purchase/purchase.py
@@ -59,12 +59,13 @@ class purchase_order(osv.osv):
val = val1 = 0.0
cur=order.pricelist_id.currency_id
for line in order.order_line:
- for c in self.pool.get('account.tax').compute(cr, uid, line.taxes_id, line.price_unit, line.product_qty, order.partner_address_id.id, line.product_id, order.partner_id):
+ for c in self.pool.get('account.tax').compute_all(cr, uid, line.taxes_id, line.price_unit, line.product_qty, order.partner_address_id.id, line.product_id, order.partner_id)['taxes']:
val+= c['amount']
val1 += line.price_subtotal
res[order.id]['amount_tax']=cur_obj.round(cr, uid, cur, val)
res[order.id]['amount_untaxed']=cur_obj.round(cr, uid, cur, val1)
res[order.id]['amount_total']=res[order.id]['amount_untaxed'] + res[order.id]['amount_tax']
+ print res
return res
def _set_minimum_planned_date(self, cr, uid, ids, name, value, arg, context):
@@ -569,12 +570,14 @@ class purchase_order(osv.osv):
purchase_order()
class purchase_order_line(osv.osv):
- def _amount_line(self, cr, uid, ids, prop, unknow_none,unknow_dict):
+ def _amount_line(self, cr, uid, ids, prop, arg,context):
res = {}
cur_obj=self.pool.get('res.currency')
- for line in self.browse(cr, uid, ids):
+ tax_obj = self.pool.get('account.tax')
+ for line in self.browse(cr, uid, ids, context=context):
+ taxes = tax_obj.compute_all(cr, uid, line.taxes_id, line.price_unit, line.product_qty)
cur = line.order_id.pricelist_id.currency_id
- res[line.id] = cur_obj.round(cr, uid, cur, line.price_unit * line.product_qty)
+ res[line.id] = cur_obj.round(cr, uid, cur, taxes['total'])
return res
_columns = {
diff --git a/addons/purchase/purchase_unit_test.xml b/addons/purchase/purchase_unit_test.xml
index 00678589999..d32f2f30a53 100644
--- a/addons/purchase/purchase_unit_test.xml
+++ b/addons/purchase/purchase_unit_test.xml
@@ -29,7 +29,7 @@
3
-
+
@@ -50,9 +50,11 @@
-
+
+
draft
diff --git a/addons/report_account/i18n/hr.po b/addons/report_account/i18n/hr.po
index 27ea37fd939..80572ec3975 100644
--- a/addons/report_account/i18n/hr.po
+++ b/addons/report_account/i18n/hr.po
@@ -7,20 +7,20 @@ 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-03-25 00:58+0000\n"
+"PO-Revision-Date: 2010-06-06 23:33+0000\n"
"Last-Translator: Drazen Bosak \n"
"Language-Team: Vinteh\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-04-17 04:11+0000\n"
+"X-Launchpad-Export-Date: 2010-06-07 03:43+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
"Language: hr\n"
#. module: report_account
#: selection:report.invoice.created,type:0
msgid "Customer Refund"
-msgstr ""
+msgstr "Povrat novca kupcu"
#. module: report_account
#: constraint:ir.model:0
diff --git a/addons/report_analytic/i18n/hr.po b/addons/report_analytic/i18n/hr.po
index 4a2873d8fad..927bf538d9a 100644
--- a/addons/report_analytic/i18n/hr.po
+++ b/addons/report_analytic/i18n/hr.po
@@ -7,20 +7,20 @@ 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-03-25 10:39+0000\n"
+"PO-Revision-Date: 2010-06-06 23:37+0000\n"
"Last-Translator: Drazen Bosak \n"
"Language-Team: Vinteh\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-04-17 03:59+0000\n"
+"X-Launchpad-Export-Date: 2010-06-07 03:43+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
"Language: hr\n"
#. module: report_analytic
#: model:ir.model,name:report_analytic.model_report_analytic_account_close
msgid "Analytic account to close"
-msgstr ""
+msgstr "Analitički konto koji treba zatvoriti"
#. module: report_analytic
#: constraint:ir.model:0
diff --git a/addons/report_analytic_planning/i18n/hr.po b/addons/report_analytic_planning/i18n/hr.po
index 2d5dabb1225..8b91cf0c0a6 100644
--- a/addons/report_analytic_planning/i18n/hr.po
+++ b/addons/report_analytic_planning/i18n/hr.po
@@ -7,20 +7,20 @@ 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-03-25 10:49+0000\n"
+"PO-Revision-Date: 2010-06-06 23:40+0000\n"
"Last-Translator: Drazen Bosak \n"
"Language-Team: Vinteh\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-04-17 03:59+0000\n"
+"X-Launchpad-Export-Date: 2010-06-07 03:43+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
"Language: hr\n"
#. module: report_analytic_planning
#: rml:report_account_analytic.planning.print:0
msgid "To:"
-msgstr ""
+msgstr "Za:"
#. module: report_analytic_planning
#: view:report_account_analytic.planning:0
@@ -202,7 +202,7 @@ msgstr "Korisnik"
#. module: report_analytic_planning
#: rml:report_account_analytic.planning.print:0
msgid "Project"
-msgstr ""
+msgstr "Projekt"
#. module: report_analytic_planning
#: view:report_account_analytic.planning:0
@@ -317,7 +317,7 @@ msgstr "Planiranje"
#. module: report_analytic_planning
#: selection:report_account_analytic.planning,state:0
msgid "Done"
-msgstr ""
+msgstr "Gotovo"
#. module: report_analytic_planning
#: view:report_account_analytic.planning:0
diff --git a/addons/report_document/i18n/hr.po b/addons/report_document/i18n/hr.po
index c357a52df8f..68c557c8f48 100644
--- a/addons/report_document/i18n/hr.po
+++ b/addons/report_document/i18n/hr.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-03-25 10:49+0000\n"
+"PO-Revision-Date: 2010-06-06 23:40+0000\n"
"Last-Translator: Drazen Bosak \n"
"Language-Team: Vinteh\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-04-17 04:17+0000\n"
+"X-Launchpad-Export-Date: 2010-06-07 03:43+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
"Language: hr\n"
@@ -21,7 +21,7 @@ msgstr ""
#: field:report.document.user,create_date:0
#: field:report.files.partner,create_date:0
msgid "Date Created"
-msgstr ""
+msgstr "Datum stvaranja"
#. module: report_document
#: model:ir.actions.act_window,name:report_document.action_view_files_by_partner
diff --git a/addons/report_intrastat/i18n/hr.po b/addons/report_intrastat/i18n/hr.po
index 70646bd777f..8acb596f530 100644
--- a/addons/report_intrastat/i18n/hr.po
+++ b/addons/report_intrastat/i18n/hr.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-03-25 10:49+0000\n"
+"PO-Revision-Date: 2010-06-06 23:41+0000\n"
"Last-Translator: Drazen Bosak \n"
"Language-Team: Vinteh\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-04-17 04:09+0000\n"
+"X-Launchpad-Export-Date: 2010-06-07 03:43+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
"Language: hr\n"
@@ -174,7 +174,7 @@ msgstr "Porezi"
#. module: report_intrastat
#: rml:account.invoice.intrastat:0
msgid "Amount"
-msgstr ""
+msgstr "Iznos"
#. module: report_intrastat
#: view:report.intrastat:0
diff --git a/addons/report_project/i18n/hr.po b/addons/report_project/i18n/hr.po
index e5bfa077090..9993f03eb9e 100644
--- a/addons/report_project/i18n/hr.po
+++ b/addons/report_project/i18n/hr.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-03-22 19:24+0000\n"
+"PO-Revision-Date: 2010-06-06 23:41+0000\n"
"Last-Translator: Drazen Bosak \n"
"Language-Team: Vinteh\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-04-17 03:59+0000\n"
+"X-Launchpad-Export-Date: 2010-06-07 03:43+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
"Language: hr\n"
@@ -21,7 +21,7 @@ msgstr ""
#: model:ir.actions.act_window,name:report_project.action_project_task_tree_month
#: model:ir.ui.menu,name:report_project.menu_project_task_tree_month
msgid "Tasks finished by project (this month)"
-msgstr ""
+msgstr "Izvršeni zadaci prema Projektu (Ovaj mjesec)"
#. module: report_project
#: constraint:ir.model:0
diff --git a/addons/report_purchase/i18n/hr.po b/addons/report_purchase/i18n/hr.po
index 35c7a3d8ce8..52a3fbf6ada 100644
--- a/addons/report_purchase/i18n/hr.po
+++ b/addons/report_purchase/i18n/hr.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-03-22 21:23+0000\n"
+"PO-Revision-Date: 2010-06-06 23:42+0000\n"
"Last-Translator: Drazen Bosak \n"
"Language-Team: Vinteh\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-04-17 03:54+0000\n"
+"X-Launchpad-Export-Date: 2010-06-07 03:43+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
"Language: hr\n"
@@ -21,7 +21,7 @@ msgstr ""
#: field:report.purchase.order.category,price_average:0
#: field:report.purchase.order.product,price_average:0
msgid "Average Price"
-msgstr ""
+msgstr "Prosječna cijena"
#. module: report_purchase
#: field:report.purchase.order.category,state:0
diff --git a/addons/report_sale/i18n/hr.po b/addons/report_sale/i18n/hr.po
index 6e2d5c4d644..61af04b6fad 100644
--- a/addons/report_sale/i18n/hr.po
+++ b/addons/report_sale/i18n/hr.po
@@ -7,33 +7,33 @@ 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-03-22 21:28+0000\n"
+"PO-Revision-Date: 2010-06-06 23:42+0000\n"
"Last-Translator: Drazen Bosak \n"
"Language-Team: Vinteh\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-04-17 04:13+0000\n"
+"X-Launchpad-Export-Date: 2010-06-07 03:43+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
"Language: hr\n"
#. module: report_sale
#: selection:report.sale.order.created,state:0
msgid "In Progress"
-msgstr ""
+msgstr "U razvoju"
#. module: report_sale
#: field:report.sale.order.category,price_average:0
#: field:report.sale.order.product,price_average:0
msgid "Average Price"
-msgstr ""
+msgstr "Prosječna cijena"
#. module: report_sale
#: field:report.sale.order.category,state:0
#: field:report.sale.order.created,state:0
#: field:report.sale.order.product,state:0
msgid "Order State"
-msgstr ""
+msgstr "Stanje Narudžbe"
#. module: report_sale
#: model:ir.model,name:report_sale.model_report_sale_order_created
diff --git a/addons/report_task/i18n/es.po b/addons/report_task/i18n/es.po
index 0f580ae034e..17a1ae549dd 100644
--- a/addons/report_task/i18n/es.po
+++ b/addons/report_task/i18n/es.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 10:28+0000\n"
-"Last-Translator: Fabien (Open ERP) \n"
+"PO-Revision-Date: 2010-06-04 12:29+0000\n"
+"Last-Translator: Jonay \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-04-17 04:21+0000\n"
+"X-Launchpad-Export-Date: 2010-06-05 03:36+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: report_task
@@ -179,7 +179,7 @@ msgstr "Proyecto"
#. module: report_task
#: field:report.task.user.pipeline.open,task_nbr:0
msgid "Task Number"
-msgstr ""
+msgstr "Número de tarea"
#. module: report_task
#: model:ir.model,name:report_task.model_report_timesheet_task_user
@@ -194,13 +194,13 @@ msgstr "Tareas por usuario y proyecto"
#. module: report_task
#: view:report.closed.task:0
msgid "Planned"
-msgstr ""
+msgstr "Planificado"
#. module: report_task
#: selection:report.closed.task,state:0
#: selection:report.task.user.pipeline.open,task_state:0
msgid "Cancelled"
-msgstr ""
+msgstr "Cancelado"
#. module: report_task
#: view:report.timesheet.task.user:0
@@ -210,22 +210,22 @@ msgstr ""
#. module: report_task
#: field:report.task.user.pipeline.open,task_progress:0
msgid "Task Progress"
-msgstr ""
+msgstr "Progreso de la tarea"
#. module: report_task
#: field:report.closed.task,date_close:0
msgid "Date Closed"
-msgstr ""
+msgstr "Fecha de cierre"
#. module: report_task
#: field:report.closed.task,user_id:0
msgid "Assigned to"
-msgstr ""
+msgstr "Asignado a"
#. module: report_task
#: field:report.closed.task,sequence:0
msgid "Sequence"
-msgstr ""
+msgstr "Secuencia"
#. module: report_task
#: model:ir.model,name:report_task.model_report_closed_task
@@ -235,17 +235,17 @@ msgstr ""
#. module: report_task
#: field:report.timesheet.task.user,name:0
msgid "Month"
-msgstr ""
+msgstr "Mes"
#. module: report_task
#: selection:report.closed.task,priority:0
msgid "Urgent"
-msgstr ""
+msgstr "Urgente"
#. module: report_task
#: field:report.closed.task,date_deadline:0
msgid "Deadline"
-msgstr ""
+msgstr "Fecha límite"
#. module: report_task
#: field:report.timesheet.task.user,timesheet_hrs:0
@@ -255,12 +255,12 @@ msgstr ""
#. module: report_task
#: view:report.closed.task:0
msgid "Closed Tasks"
-msgstr ""
+msgstr "Tareas cerradas"
#. module: report_task
#: selection:report.task.user.pipeline.open,task_state:0
msgid "Open"
-msgstr ""
+msgstr "Abrir"
#. module: report_task
#: field:report.closed.task,planned_hours:0
diff --git a/addons/resource/resource.py b/addons/resource/resource.py
index 6e8b7539fdc..d8eb378b7d8 100644
--- a/addons/resource/resource.py
+++ b/addons/resource/resource.py
@@ -37,21 +37,28 @@ class resource_calendar(osv.osv):
_defaults = {
'company_id': lambda self, cr, uid, context: self.pool.get('res.company')._company_default_get(cr, uid, 'resource.calendar', context=context)
}
-
- def interval_min_get(self, cr, uid, id, dt_from, hours, resource=False):
+
+ def _get_leaves(self, cr, uid, id, resource):
resource_cal_leaves = self.pool.get('resource.calendar.leaves')
dt_leave = []
- if not id:
- return [(dt_from - mx.DateTime.RelativeDateTime(hours=int(hours)*3), dt_from)]
+
resource_leave_ids = resource_cal_leaves.search(cr, uid, [('calendar_id','=',id), '|', ('resource_id','=',False), ('resource_id','=',resource)])
res_leaves = resource_cal_leaves.read(cr, uid, resource_leave_ids, ['date_from', 'date_to'])
+
for leave in res_leaves:
dtf = mx.DateTime.strptime(leave['date_from'], '%Y-%m-%d %H:%M:%S')
dtt = mx.DateTime.strptime(leave['date_to'], '%Y-%m-%d %H:%M:%S')
no = dtt - dtf
[dt_leave.append((dtf + mx.DateTime.RelativeDateTime(days=x)).strftime('%Y-%m-%d')) for x in range(int(no.days + 1))]
dt_leave.sort()
- dt_leave.reverse()
+
+ return dt_leave
+
+ def interval_min_get(self, cr, uid, id, dt_from, hours, resource=False):
+ if not id:
+ return [(dt_from - mx.DateTime.RelativeDateTime(hours=int(hours)*3), dt_from)]
+ dt_leave = self._get_leaves(cr, uid, id, resource)
+ dt_leave.reverse()
todo = hours
cycle = 0
result = []
@@ -85,18 +92,9 @@ class resource_calendar(osv.osv):
return result
def interval_get(self, cr, uid, id, dt_from, hours, resource=False, byday=True):
- resource_cal_leaves = self.pool.get('resource.calendar.leaves')
- dt_leave = []
if not id:
return [(dt_from,dt_from + mx.DateTime.RelativeDateTime(hours=int(hours)*3))]
- resource_leave_ids = resource_cal_leaves.search(cr, uid, [('calendar_id','=',id), '|', ('resource_id','=',False), ('resource_id','=',resource)])
- res_leaves = resource_cal_leaves.read(cr, uid, resource_leave_ids, ['date_from', 'date_to'])
- for leave in res_leaves:
- dtf = mx.DateTime.strptime(leave['date_from'], '%Y-%m-%d %H:%M:%S')
- dtt = mx.DateTime.strptime(leave['date_to'], '%Y-%m-%d %H:%M:%S')
- no = dtt - dtf
- [dt_leave.append((dtf + mx.DateTime.RelativeDateTime(days=x)).strftime('%Y-%m-%d')) for x in range(int(no.days + 1))]
- dt_leave.sort()
+ dt_leave = self._get_leaves(cr, uid, id, resource)
todo = hours
cycle = 0
result = []
@@ -105,29 +103,70 @@ class resource_calendar(osv.osv):
while (todo>0) and maxrecur:
cr.execute("select hour_from,hour_to from resource_calendar_week where dayofweek='%s' and calendar_id=%s order by hour_from", (dt_from.day_of_week,id))
for (hour_from,hour_to) in cr.fetchall():
- leave_flag = False
- if (hour_to>current_hour) and (todo>0):
- m = max(hour_from, current_hour)
- if (hour_to-m)>todo:
- hour_to = m+todo
- dt_check = dt_from.strftime('%Y-%m-%d')
- for leave in dt_leave:
- if dt_check == leave:
- dt_check = mx.DateTime.strptime(dt_check, "%Y-%m-%d") + mx.DateTime.RelativeDateTime(days=1)
- leave_flag = True
- if leave_flag:
- break
- else:
- d1 = mx.DateTime.DateTime(dt_from.year, dt_from.month, dt_from.day, int(math.floor(m)), int((m%1) * 60))
- d2 = mx.DateTime.DateTime(dt_from.year, dt_from.month, dt_from.day, int(math.floor(hour_to)), int((hour_to%1) * 60))
- result.append((d1, d2))
- current_hour = hour_to
- todo -= (hour_to - m)
+ leave_flag = False
+ if (hour_to>current_hour) and (todo>0):
+ m = max(hour_from, current_hour)
+ if (hour_to-m)>todo:
+ hour_to = m+todo
+ dt_check = dt_from.strftime('%Y-%m-%d')
+ for leave in dt_leave:
+ if dt_check == leave:
+ dt_check = mx.DateTime.strptime(dt_check, "%Y-%m-%d") + mx.DateTime.RelativeDateTime(days=1)
+ leave_flag = True
+ if leave_flag:
+ break
+ else:
+ d1 = mx.DateTime.DateTime(dt_from.year, dt_from.month, dt_from.day, int(math.floor(m)), int((m%1) * 60))
+ d2 = mx.DateTime.DateTime(dt_from.year, dt_from.month, dt_from.day, int(math.floor(hour_to)), int((hour_to%1) * 60))
+ result.append((d1, d2))
+ current_hour = hour_to
+ todo -= (hour_to - m)
dt_from += mx.DateTime.RelativeDateTime(days=1)
current_hour = 0
maxrecur -= 1
return result
+
+ def interval_hours_get(self, cr, uid, id, dt_from, dt_to, resource=False):
+ result = []
+ if not id:
+ return 0.0
+ dt_leave = self._get_leaves(cr, uid, id, resource)
+ hours = 0.0
+
+ current_hour = dt_from.hour
+ while (dt_from <= dt_to):
+ cr.execute("select hour_from,hour_to from resource_calendar_week where dayofweek='%s' and calendar_id=%s order by hour_from", (dt_from.day_of_week,id))
+ der = cr.fetchall()
+ for (hour_from,hour_to) in der:
+ if hours != 0.0:#For first time of the loop only,hours will be 0
+ current_hour = hour_from
+ leave_flag = False
+ if (hour_to>=current_hour):
+ dt_check = dt_from.strftime('%Y-%m-%d')
+ for leave in dt_leave:
+ if dt_check == leave:
+ dt_check = mx.DateTime.strptime(dt_check, "%Y-%m-%d") + mx.DateTime.RelativeDateTime(days=1)
+ leave_flag = True
+
+ if leave_flag:
+ break
+ else:
+ d1 = dt_from
+ d2 = mx.DateTime.DateTime(dt_from.year, dt_from.month, dt_from.day, int(math.floor(hour_to)), int((hour_to%1) * 60))
+
+ if hours != 0.0:#For first time of the loop only,hours will be 0
+ d1 = mx.DateTime.DateTime(dt_from.year, dt_from.month, dt_from.day, int(math.floor(current_hour)), int((current_hour%1) * 60))
+
+ if dt_from.day == dt_to.day:
+ if hour_from <= dt_to.hour <= hour_to:
+ d2 = dt_to
+ dt_from = d2
+ hours += (d2-d1).seconds
+ dt_from = mx.DateTime.DateTime(dt_from.year, dt_from.month, dt_from.day, int(math.floor(current_hour)), int((current_hour%1) * 60)) + mx.DateTime.RelativeDateTime(days=1)
+ current_hour = 0.0
+ return (hours/3600)
+
resource_calendar()
class resource_calendar_week(osv.osv):
diff --git a/addons/sale/i18n/ca.po b/addons/sale/i18n/ca.po
index 40ef81e54c5..90b6341eea9 100644
--- a/addons/sale/i18n/ca.po
+++ b/addons/sale/i18n/ca.po
@@ -7,14 +7,14 @@ msgstr ""
"Project-Id-Version: OpenERP Server 5.0.0_rc3\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-12-31 12:42+0000\n"
-"Last-Translator: Albert Cervera i Areny - http://www.NaN-tic.com \n"
+"PO-Revision-Date: 2010-06-04 09:30+0000\n"
+"Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
+"\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-04-17 04:09+0000\n"
+"X-Launchpad-Export-Date: 2010-06-05 03:36+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: sale
@@ -659,8 +659,8 @@ msgid ""
"This Configuration step use to set default picking policy when make sale "
"order"
msgstr ""
-"Aquest pas en la configuració fixa la política d'empaquetament per defecte "
-"quan es crea una comanda de venda"
+"Aquest pas fixa la política d'empaquetament per defecte quan es crea una "
+"comanda de venda"
#. module: sale
#: model:process.process,name:sale.process_process_salesprocess0
@@ -734,7 +734,7 @@ msgstr "Proveïment de venda"
#. module: sale
#: view:sale.config.picking_policy:0
msgid "Configure Sale Order Logistic"
-msgstr "Configura logística comanda de venda"
+msgstr "Configureu la logística de les comandes de venda"
#. module: sale
#: field:sale.order,amount_untaxed:0
@@ -749,7 +749,7 @@ msgstr "Estat"
#. module: sale
#: field:sale.order,picking_policy:0
msgid "Packing Policy"
-msgstr "Política d'enviament"
+msgstr "Forma d'enviament"
#. module: sale
#: model:ir.actions.act_window,name:sale.action_order_line_product_tree
@@ -1200,10 +1200,10 @@ msgid ""
"and simple methods to deliver products to the customer in one or two "
"operations by the worker."
msgstr ""
-"Por defecte, OpenERP pot gestionar rutes complexes i rutes de productes en "
-"el vostre magatzem i en les ubicacions d'empreses. Això configurarà els "
-"mètodes més comuns i senzills per enviar productes al client en una o dues "
-"operacions realitzades pel treballador."
+"Per defecte, OpenERP pot gestionar rutes complexes i rutes de productes en "
+"el vostre magatzem i en les ubicacions d'empreses. Aquesta opció us "
+"configurarà els mètodes més comuns i senzills per enviar productes al client "
+"en una o dues operacions realitzades pel treballador."
#. module: sale
#: model:ir.actions.act_window,name:sale.action_config_picking_policy
diff --git a/addons/sale/i18n/hr.po b/addons/sale/i18n/hr.po
index b2ba5dbc8d4..c17d591e485 100644
--- a/addons/sale/i18n/hr.po
+++ b/addons/sale/i18n/hr.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-03-24 00:11+0000\n"
+"PO-Revision-Date: 2010-06-06 23:44+0000\n"
"Last-Translator: Drazen Bosak \n"
"Language-Team: Vinteh\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-04-17 04:09+0000\n"
+"X-Launchpad-Export-Date: 2010-06-07 03:43+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
"Language: hr\n"
@@ -797,7 +797,7 @@ msgstr "Ponuda"
#. module: sale
#: model:product.template,name:sale.advance_product_0_product_template
msgid "Advance Product"
-msgstr ""
+msgstr "Proslijediti Proizvod"
#. module: sale
#: model:process.transition,note:sale.process_transition_invoice0
@@ -1031,7 +1031,7 @@ msgstr "Želite li zaista kreirati Račune?"
#. module: sale
#: model:process.node,note:sale.process_node_invoiceafterdelivery0
msgid "Invoice based on packing lists"
-msgstr ""
+msgstr "Račun napravljen prema tovarnom listi"
#. module: sale
#: view:sale.config.picking_policy:0
diff --git a/addons/sale/sale.py b/addons/sale/sale.py
index e684a1a6c1d..07c66ef91dc 100644
--- a/addons/sale/sale.py
+++ b/addons/sale/sale.py
@@ -72,7 +72,7 @@ class sale_order(osv.osv):
if context is None:
context = {}
val = 0.0
- for c in self.pool.get('account.tax').compute(cr, uid, line.tax_id, line.price_unit * (1-(line.discount or 0.0)/100.0), line.product_uom_qty, line.order_id.partner_invoice_id.id, line.product_id, line.order_id.partner_id):
+ for c in self.pool.get('account.tax').compute_all(cr, uid, line.tax_id, line.price_unit * (1-(line.discount or 0.0)/100.0), line.product_uom_qty, line.order_id.partner_invoice_id.id, line.product_id, line.order_id.partner_id)['taxes']:
val += c['amount']
return val
@@ -774,23 +774,16 @@ sale_order()
# - update it on change product and unit price
# - use it in report if there is a uos
class sale_order_line(osv.osv):
- def _amount_line_net(self, cr, uid, ids, field_name, arg, context=None):
- if context is None:
- context = {}
- res = {}
- for line in self.browse(cr, uid, ids, context=context):
- res[line.id] = line.price_unit * (1 - (line.discount or 0.0) / 100.0)
- return res
-
def _amount_line(self, cr, uid, ids, field_name, arg, context=None):
- if context is None:
- context = {}
res = {}
+ context = context or {}
+ tax_obj = self.pool.get('account.tax')
cur_obj = self.pool.get('res.currency')
for line in self.browse(cr, uid, ids, context=context):
- res[line.id] = line.price_unit * line.product_uom_qty * (1 - (line.discount or 0.0) / 100.0)
+ price = line.price_unit * line.product_uom_qty * (1 - (line.discount or 0.0) / 100.0)
+ taxes = tax_obj.compute_all(cr, uid, line.tax_id, price, line.product_uom_qty)
cur = line.order_id.pricelist_id.currency_id
- res[line.id] = cur_obj.round(cr, uid, cur, res[line.id])
+ res[line.id] = cur_obj.round(cr, uid, cur, taxes['total'])
return res
def _number_packages(self, cr, uid, ids, field_name, arg, context=None):
@@ -799,7 +792,7 @@ class sale_order_line(osv.osv):
res = {}
for line in self.browse(cr, uid, ids, context=context):
try:
- res[line.id] = int(line.product_uom_qty / line.product_packaging.qty)
+ res[line.id] = int((line.product_uom_qty+line.product_packaging.qty-0.0001) / line.product_packaging.qty)
except:
res[line.id] = 1
return res
@@ -816,7 +809,6 @@ class sale_order_line(osv.osv):
'invoiced': fields.boolean('Invoiced', readonly=True),
'procurement_id': fields.many2one('mrp.procurement', 'Procurement'),
'price_unit': fields.float('Unit Price', required=True, digits_compute= dp.get_precision('Sale Price'), readonly=True, states={'draft':[('readonly',False)]}),
- 'price_net': fields.function(_amount_line_net, method=True, string='Net Price', digits_compute= dp.get_precision('Sale Price')),
'price_subtotal': fields.function(_amount_line, method=True, string='Subtotal', digits_compute= dp.get_precision('Sale Price')),
'tax_id': fields.many2many('account.tax', 'sale_order_tax', 'order_line_id', 'tax_id', 'Taxes', readonly=True, states={'draft':[('readonly',False)]}),
'type': fields.selection([('make_to_stock', 'from stock'), ('make_to_order', 'on order')], 'Procurement Method', required=True, readonly=True, states={'draft':[('readonly',False)]}),
diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index 4d82e8595ad..c236b669580 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -131,8 +131,7 @@
on_change="product_id_change(parent.pricelist_id,product_id,product_uom_qty,product_uom,product_uos_qty,product_uos,name,parent.partner_id, 'lang' in context and context['lang'], False, parent.date_order, product_packaging, parent.fiscal_position, True)"
/>
+ on_change="product_uom_change(parent.pricelist_id,product_id,product_uom_qty,product_uom,product_uos_qty,product_uos,name,parent.partner_id, 'lang' in context and context['lang'], False, parent.date_order)"/>
-
-
+
@@ -351,7 +349,6 @@
-
diff --git a/addons/sale_crm/i18n/hr.po b/addons/sale_crm/i18n/hr.po
index 5ab251827fc..2e5036d7030 100644
--- a/addons/sale_crm/i18n/hr.po
+++ b/addons/sale_crm/i18n/hr.po
@@ -7,20 +7,20 @@ 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-03-22 00:56+0000\n"
+"PO-Revision-Date: 2010-06-06 23:44+0000\n"
"Last-Translator: Drazen Bosak \n"
"Language-Team: Vinteh\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-04-17 04:03+0000\n"
+"X-Launchpad-Export-Date: 2010-06-07 03:43+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
"Language: hr\n"
#. module: sale_crm
#: model:process.transition,name:sale_crm.process_transition_crmopportunityquotation
msgid "Crm opportunity quotation"
-msgstr ""
+msgstr "Ponuda CRM prilici"
#. module: sale_crm
#: model:process.transition,name:sale_crm.process_transition_opportunityanalytic0
diff --git a/addons/sale_journal/i18n/hr.po b/addons/sale_journal/i18n/hr.po
index 87f36a5ca04..8e1ce7fb070 100644
--- a/addons/sale_journal/i18n/hr.po
+++ b/addons/sale_journal/i18n/hr.po
@@ -7,20 +7,20 @@ 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-03-24 00:49+0000\n"
+"PO-Revision-Date: 2010-06-06 23:45+0000\n"
"Last-Translator: Drazen Bosak \n"
"Language-Team: Vinteh\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-04-17 04:12+0000\n"
+"X-Launchpad-Export-Date: 2010-06-07 03:43+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
"Language: hr\n"
#. module: sale_journal
#: model:ir.actions.act_window,name:sale_journal.act_sale_journal_sale_journal_2_sale_journal_sale_stats
msgid "Monthly sales"
-msgstr ""
+msgstr "Mjesečne prodaje"
#. module: sale_journal
#: model:ir.actions.act_window,name:sale_journal.act_sale_journal_picking_journal_2_stock_picking_assigned
@@ -378,7 +378,7 @@ msgstr "Pregled Pakiranja"
#: selection:sale_journal.sale.journal,state:0
#: selection:sale_journal.sale.stats,state:0
msgid "Done"
-msgstr ""
+msgstr "Gotovo"
#. module: sale_journal
#: selection:sale_journal.sale.stats,state:0
@@ -441,7 +441,7 @@ msgstr "Tip Računa"
#. module: sale_journal
#: selection:sale_journal.invoice.type.stats,invoice_state:0
msgid "invoiced"
-msgstr ""
+msgstr "Izdan račun"
#. module: sale_journal
#: selection:sale_journal.invoice.type.stats,state:0
diff --git a/addons/survey/i18n/hr.po b/addons/survey/i18n/hr.po
index b652ccf0225..d6b54e0ce1a 100644
--- a/addons/survey/i18n/hr.po
+++ b/addons/survey/i18n/hr.po
@@ -8,20 +8,20 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2009-11-26 06:01+0000\n"
-"PO-Revision-Date: 2010-03-22 00:56+0000\n"
+"PO-Revision-Date: 2010-06-06 23:46+0000\n"
"Last-Translator: Drazen Bosak \n"
"Language-Team: Vinteh\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-04-17 04:21+0000\n"
+"X-Launchpad-Export-Date: 2010-06-07 03:43+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
"Language: hr\n"
#. module: survey
#: model:ir.ui.menu,name:survey.menu_survey_form
msgid "Surveys"
-msgstr ""
+msgstr "Upitnici"
#. module: survey
#: model:ir.actions.report.xml,name:survey.survey
@@ -310,18 +310,18 @@ msgstr "Manualno"
#. module: survey
#: model:ir.actions.act_window,name:survey.action_survey_form1
msgid "All Surveys"
-msgstr ""
+msgstr "Svi Upitnici"
#. module: survey
#: view:survey:0
#: field:survey,users:0
msgid "Users"
-msgstr ""
+msgstr "Korisnici"
#. module: survey
#: wizard_view:wizard.send.invitation,init:0
msgid "Message"
-msgstr ""
+msgstr "Poruka"
#. module: survey
#: field:survey.name.wiz,page_no:0
diff --git a/addons/thunderbird/i18n/hr.po b/addons/thunderbird/i18n/hr.po
index e7accb0d6e0..7911a4acbe5 100644
--- a/addons/thunderbird/i18n/hr.po
+++ b/addons/thunderbird/i18n/hr.po
@@ -8,20 +8,20 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2009-11-26 06:05+0000\n"
-"PO-Revision-Date: 2010-03-21 23:36+0000\n"
+"PO-Revision-Date: 2010-06-06 23:47+0000\n"
"Last-Translator: Drazen Bosak \n"
"Language-Team: Vinteh\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-04-17 04:21+0000\n"
+"X-Launchpad-Export-Date: 2010-06-07 03:43+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
"Language: hr\n"
#. module: thunderbird
#: field:tinythunderbird.partner,copy_to:0
msgid "Copy To"
-msgstr ""
+msgstr "Kopiraj na"
#. module: thunderbird
#: constraint:ir.model:0
diff --git a/addons/warning/i18n/hr.po b/addons/warning/i18n/hr.po
index 53602bfba7d..cd9463a0d2c 100644
--- a/addons/warning/i18n/hr.po
+++ b/addons/warning/i18n/hr.po
@@ -7,20 +7,20 @@ 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-03-22 00:56+0000\n"
+"PO-Revision-Date: 2010-06-06 23:49+0000\n"
"Last-Translator: Drazen Bosak \n"
"Language-Team: Vinteh\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-04-17 04:19+0000\n"
+"X-Launchpad-Export-Date: 2010-06-07 03:43+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
"Language: hr\n"
#. module: warning
#: field:product.product,purchase_line_warn:0
msgid "Purchase Order Line"
-msgstr ""
+msgstr "Niz Prodajne Narudžbe"
#. module: warning
#: field:product.product,sale_line_warn_msg:0