diff --git a/addons/account/account_report.xml b/addons/account/account_report.xml
index 656d9d2f595..6480178d1ae 100644
--- a/addons/account/account_report.xml
+++ b/addons/account/account_report.xml
@@ -23,7 +23,7 @@
-
+
-
+
-
+
-
+
+ string="Budget"/>
diff --git a/addons/account_coda/i18n/el.po b/addons/account_coda/i18n/el.po
new file mode 100644
index 00000000000..9ed3156d138
--- /dev/null
+++ b/addons/account_coda/i18n/el.po
@@ -0,0 +1,168 @@
+# Greek 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-24 13:11+0000\n"
+"PO-Revision-Date: 2010-06-09 02:57+0000\n"
+"Last-Translator: Panayiotis Konstantinidis \n"
+"Language-Team: Greek \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-09 03:36+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: account_coda
+#: field:account.coda,journal_id:0
+#: wizard_field:account.coda_import,init,journal_id:0
+msgid "Bank Journal"
+msgstr ""
+
+#. module: account_coda
+#: constraint:ir.model:0
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
+msgstr ""
+"Το όνομα του Αντικειμένου πρέπει να ξεκινά με x_ και δεν πρέπει να περιέχει "
+"ειδικούς χαρακτήρες!"
+
+#. module: account_coda
+#: wizard_field:account.coda_import,extraction,note:0
+msgid "Log"
+msgstr "Καταγραφή"
+
+#. module: account_coda
+#: wizard_button:account.coda_import,extraction,open:0
+msgid "_Open Statement"
+msgstr ""
+
+#. module: account_coda
+#: model:ir.module.module,shortdesc:account_coda.module_meta_information
+msgid "Account CODA"
+msgstr ""
+
+#. module: account_coda
+#: field:account.coda,name:0
+msgid "Coda file"
+msgstr ""
+
+#. module: account_coda
+#: wizard_view:account.coda_import,init:0
+msgid "Clic on 'New' to select your file :"
+msgstr "Πατήστε \"Νέο\" για να επιλέξετε το αρχείο σας"
+
+#. module: account_coda
+#: model:ir.actions.wizard,name:account_coda.wizard_account_coda_import
+msgid "Import Coda File"
+msgstr ""
+
+#. module: account_coda
+#: constraint:ir.actions.act_window:0
+msgid "Invalid model name in the action definition."
+msgstr "Λανθασμένο όνομα μοντέλου στον ορισμό ενέργειας"
+
+#. module: account_coda
+#: field:account.coda,note:0
+msgid "Import log"
+msgstr "Εισαγωγή ιστορικού καταγραφής"
+
+#. module: account_coda
+#: wizard_field:account.coda_import,init,def_receivable:0
+msgid "Default receivable Account"
+msgstr "Προεπιλεγμένος λογαριασμός είσπραξης"
+
+#. module: account_coda
+#: model:ir.module.module,description:account_coda.module_meta_information
+msgid ""
+"Module provides functionality to import\n"
+" bank statements from .csv file.\n"
+" Import coda file wizard is used to import bank statements."
+msgstr ""
+
+#. module: account_coda
+#: wizard_button:account.coda_import,extraction,end:0
+msgid "_Close"
+msgstr "_Κλείσιμο"
+
+#. module: account_coda
+#: field:account.coda,statement_id:0
+msgid "Generated Bank Statement"
+msgstr "Δημιουργημένος τραπεζικός λογαριασμός"
+
+#. module: account_coda
+#: view:account.coda:0
+#: model:ir.actions.act_window,name:account_coda.act_account_payment_account_bank_statement
+#: model:ir.actions.act_window,name:account_coda.action_account_coda
+msgid "Coda import"
+msgstr ""
+
+#. module: account_coda
+#: field:account.coda,user_id:0
+msgid "User"
+msgstr "Χρήστης"
+
+#. module: account_coda
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "Λανθασμένο XML για αρχιτεκτονική όψης!"
+
+#. module: account_coda
+#: model:ir.model,name:account_coda.model_account_coda
+msgid "coda for an Account"
+msgstr ""
+
+#. module: account_coda
+#: wizard_field:account.coda_import,init,def_payable:0
+msgid "Default Payable Account"
+msgstr "Προεπιλεγμένος λογαριασμός πληρωμής"
+
+#. module: account_coda
+#: model:ir.ui.menu,name:account_coda.menu_account_coda
+msgid "Coda Statements"
+msgstr ""
+
+#. module: account_coda
+#: model:ir.ui.menu,name:account_coda.menu_account_coda_wizard
+msgid "Import Coda Statements"
+msgstr ""
+
+#. module: account_coda
+#: wizard_button:account.coda_import,init,extraction:0
+msgid "_Ok"
+msgstr "_Εντάξει"
+
+#. module: account_coda
+#: wizard_view:account.coda_import,extraction:0
+#: wizard_view:account.coda_import,init:0
+msgid "Import Coda Statement"
+msgstr ""
+
+#. module: account_coda
+#: field:account.bank.statement,coda_id:0
+msgid "Coda"
+msgstr ""
+
+#. module: account_coda
+#: wizard_view:account.coda_import,extraction:0
+msgid "Results :"
+msgstr "Αποτελέσματα :"
+
+#. module: account_coda
+#: wizard_field:account.coda_import,init,coda:0
+msgid "Coda File"
+msgstr ""
+
+#. module: account_coda
+#: field:account.coda,date:0
+msgid "Import Date"
+msgstr "Εισαγωγή ημερομηνίας"
+
+#. module: account_coda
+#: wizard_view:account.coda_import,init:0
+msgid "Select your bank journal :"
+msgstr ""
diff --git a/addons/account_coda/i18n/et.po b/addons/account_coda/i18n/et.po
new file mode 100644
index 00000000000..ca0c9a210fb
--- /dev/null
+++ b/addons/account_coda/i18n/et.po
@@ -0,0 +1,167 @@
+# Estonian 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-24 13:11+0000\n"
+"PO-Revision-Date: 2010-06-08 17:34+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-09 03:36+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: account_coda
+#: field:account.coda,journal_id:0
+#: wizard_field:account.coda_import,init,journal_id:0
+msgid "Bank Journal"
+msgstr ""
+
+#. module: account_coda
+#: 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: account_coda
+#: wizard_field:account.coda_import,extraction,note:0
+msgid "Log"
+msgstr "Logi"
+
+#. module: account_coda
+#: wizard_button:account.coda_import,extraction,open:0
+msgid "_Open Statement"
+msgstr ""
+
+#. module: account_coda
+#: model:ir.module.module,shortdesc:account_coda.module_meta_information
+msgid "Account CODA"
+msgstr ""
+
+#. module: account_coda
+#: field:account.coda,name:0
+msgid "Coda file"
+msgstr ""
+
+#. module: account_coda
+#: wizard_view:account.coda_import,init:0
+msgid "Clic on 'New' to select your file :"
+msgstr ""
+
+#. module: account_coda
+#: model:ir.actions.wizard,name:account_coda.wizard_account_coda_import
+msgid "Import Coda File"
+msgstr ""
+
+#. module: account_coda
+#: constraint:ir.actions.act_window:0
+msgid "Invalid model name in the action definition."
+msgstr "Vigane mudeli nimi toimingu definitsioonis."
+
+#. module: account_coda
+#: field:account.coda,note:0
+msgid "Import log"
+msgstr "Impordi logi"
+
+#. module: account_coda
+#: wizard_field:account.coda_import,init,def_receivable:0
+msgid "Default receivable Account"
+msgstr ""
+
+#. module: account_coda
+#: model:ir.module.module,description:account_coda.module_meta_information
+msgid ""
+"Module provides functionality to import\n"
+" bank statements from .csv file.\n"
+" Import coda file wizard is used to import bank statements."
+msgstr ""
+
+#. module: account_coda
+#: wizard_button:account.coda_import,extraction,end:0
+msgid "_Close"
+msgstr "_Sulge"
+
+#. module: account_coda
+#: field:account.coda,statement_id:0
+msgid "Generated Bank Statement"
+msgstr ""
+
+#. module: account_coda
+#: view:account.coda:0
+#: model:ir.actions.act_window,name:account_coda.act_account_payment_account_bank_statement
+#: model:ir.actions.act_window,name:account_coda.action_account_coda
+msgid "Coda import"
+msgstr ""
+
+#. module: account_coda
+#: field:account.coda,user_id:0
+msgid "User"
+msgstr "Kasutaja"
+
+#. module: account_coda
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "Vigane XML vaate arhitektuurile!"
+
+#. module: account_coda
+#: model:ir.model,name:account_coda.model_account_coda
+msgid "coda for an Account"
+msgstr ""
+
+#. module: account_coda
+#: wizard_field:account.coda_import,init,def_payable:0
+msgid "Default Payable Account"
+msgstr "Vaikimisi on tasulised konto"
+
+#. module: account_coda
+#: model:ir.ui.menu,name:account_coda.menu_account_coda
+msgid "Coda Statements"
+msgstr ""
+
+#. module: account_coda
+#: model:ir.ui.menu,name:account_coda.menu_account_coda_wizard
+msgid "Import Coda Statements"
+msgstr ""
+
+#. module: account_coda
+#: wizard_button:account.coda_import,init,extraction:0
+msgid "_Ok"
+msgstr "_Ok"
+
+#. module: account_coda
+#: wizard_view:account.coda_import,extraction:0
+#: wizard_view:account.coda_import,init:0
+msgid "Import Coda Statement"
+msgstr ""
+
+#. module: account_coda
+#: field:account.bank.statement,coda_id:0
+msgid "Coda"
+msgstr ""
+
+#. module: account_coda
+#: wizard_view:account.coda_import,extraction:0
+msgid "Results :"
+msgstr "Tulemused :"
+
+#. module: account_coda
+#: wizard_field:account.coda_import,init,coda:0
+msgid "Coda File"
+msgstr ""
+
+#. module: account_coda
+#: field:account.coda,date:0
+msgid "Import Date"
+msgstr "Importimise aeg"
+
+#. module: account_coda
+#: wizard_view:account.coda_import,init:0
+msgid "Select your bank journal :"
+msgstr ""
diff --git a/addons/account_followup/i18n/hr.po b/addons/account_followup/i18n/hr.po
index e647ce85b34..32aaa2a926d 100644
--- a/addons/account_followup/i18n/hr.po
+++ b/addons/account_followup/i18n/hr.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-06-08 03:40+0000\n"
+"X-Launchpad-Export-Date: 2010-06-09 03:35+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_followup
diff --git a/addons/account_invoice_layout/i18n/el.po b/addons/account_invoice_layout/i18n/el.po
index 71b80936ffb..1b106512a00 100644
--- a/addons/account_invoice_layout/i18n/el.po
+++ b/addons/account_invoice_layout/i18n/el.po
@@ -8,13 +8,13 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-09-08 13:37+0000\n"
-"Last-Translator: Makis Nicolaou \n"
+"PO-Revision-Date: 2010-06-09 03:16+0000\n"
+"Last-Translator: Panayiotis Konstantinidis \n"
"Language-Team: Greek \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-09 03:35+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_invoice_layout
@@ -38,7 +38,7 @@ msgstr ""
#. module: account_invoice_layout
#: rml:account.invoice.layout:0
msgid "Cancelled Invoice"
-msgstr ""
+msgstr "Ακυρωμένο τιμολόγιο"
#. module: account_invoice_layout
#: selection:account.invoice.line,state:0
@@ -59,7 +59,7 @@ msgstr "Εκπτ. (%)"
#. module: account_invoice_layout
#: rml:account.invoice.layout:0
msgid "(Incl. taxes):"
-msgstr ""
+msgstr "(με φόρους)"
#. module: account_invoice_layout
#: selection:account.invoice.line,state:0
@@ -87,7 +87,7 @@ msgstr "Τιμή Μονάδας"
#. module: account_invoice_layout
#: constraint:ir.actions.act_window:0
msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "Λανθασμένο όνομα μοντέλου στον ορισμό ενέργειας"
#. module: account_invoice_layout
#: model:ir.model,name:account_invoice_layout.model_notify_message
@@ -122,7 +122,7 @@ msgstr "Σχετ. Πελάτης:"
#. module: account_invoice_layout
#: rml:account.invoice.layout:0
msgid ")"
-msgstr ""
+msgstr ")"
#. module: account_invoice_layout
#: field:account.invoice.line,state:0
@@ -137,7 +137,7 @@ msgstr "Τιμή"
#. module: account_invoice_layout
#: rml:account.invoice.layout:0
msgid "/ ("
-msgstr ""
+msgstr "/ ("
#. module: account_invoice_layout
#: rml:account.invoice.layout:0
@@ -192,7 +192,7 @@ msgstr "Page Break"
#. module: account_invoice_layout
#: rml:account.invoice.layout:0
msgid "Document:"
-msgstr ""
+msgstr "Έγγραφο:"
#. module: account_invoice_layout
#: wizard_view:wizard.notify_message,init:0
@@ -217,7 +217,7 @@ msgstr "Τιμολόγια με Διάταξη"
#. module: account_invoice_layout
#: rml:account.invoice.layout:0
msgid "Description / Taxes"
-msgstr ""
+msgstr "Περιγραφή / Φόροι"
#. module: account_invoice_layout
#: rml:account.invoice.layout:0
@@ -227,7 +227,7 @@ msgstr "Ποσό"
#. module: account_invoice_layout
#: rml:account.invoice.layout:0
msgid "Description/Taxes"
-msgstr ""
+msgstr "Περιγραφή/Φόροι"
#. module: account_invoice_layout
#: rml:account.invoice.layout:0
@@ -267,7 +267,7 @@ msgstr "Τιμολόγιο Προμηθευτή"
#. module: account_invoice_layout
#: rml:account.invoice.layout:0
msgid "Note :"
-msgstr ""
+msgstr "Σημείωση :"
#. module: account_invoice_layout
#: rml:account.invoice.layout:0
@@ -282,7 +282,7 @@ msgstr "account_invoice_layout"
#. module: account_invoice_layout
#: rml:account.invoice.layout:0
msgid "Total (Excl. taxes):"
-msgstr ""
+msgstr "Σύνολο (Χωρίς φόρους)"
#. module: account_invoice_layout
#: rml:account.invoice.layout:0
diff --git a/addons/account_payment/i18n/zh_CN.po b/addons/account_payment/i18n/zh_CN.po
index 519155a16d0..28a412cb5c6 100644
--- a/addons/account_payment/i18n/zh_CN.po
+++ b/addons/account_payment/i18n/zh_CN.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-06-08 03:40+0000\n"
+"X-Launchpad-Export-Date: 2010-06-09 03:35+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_payment
diff --git a/addons/account_report/account_report.xml b/addons/account_report/account_report.xml
index 4576e421c2e..48273cdd3b3 100644
--- a/addons/account_report/account_report.xml
+++ b/addons/account_report/account_report.xml
@@ -11,6 +11,6 @@
menu="False"
model="account.report.report"
name="print.indicator.pdf"
- string="Print Indicators in PDF"/>
+ string="Indicators in PDF"/>
diff --git a/addons/account_tax_include/i18n/ru.po b/addons/account_tax_include/i18n/ru.po
index de13c665c78..ea07038c8ce 100644
--- a/addons/account_tax_include/i18n/ru.po
+++ b/addons/account_tax_include/i18n/ru.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-06-08 03:40+0000\n"
+"X-Launchpad-Export-Date: 2010-06-09 03:35+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_tax_include
diff --git a/addons/account_voucher/voucher_report.xml b/addons/account_voucher/voucher_report.xml
index 56353628bd1..c0dfed1c683 100644
--- a/addons/account_voucher/voucher_report.xml
+++ b/addons/account_voucher/voucher_report.xml
@@ -2,16 +2,16 @@
-
+
, 2010.
+#
+msgid ""
+msgstr ""
+"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-06-08 17:42+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-09 03:36+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: account_voucher_payment
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "Vigane XML vaate arhitektuurile!"
+
+#. module: account_voucher_payment
+#: wizard_view:account.voucher.unreconcile,init:0
+msgid "Unreconciliation transactions"
+msgstr "Mittesobivad tehingud"
+
+#. module: account_voucher_payment
+#: model:ir.module.module,description:account_voucher_payment.module_name_translation
+msgid ""
+"This module includes :\n"
+" * It reconcile the invoice (supplier, customer) while paying through \n"
+" Accounting Vouchers\n"
+" "
+msgstr ""
+
+#. module: account_voucher_payment
+#: wizard_view:account.voucher.unreconcile,init:0
+msgid ""
+"If you unreconciliate transactions, you must also verify all the actions "
+"that are linked to those transactions because they will not be disable"
+msgstr ""
+
+#. module: account_voucher_payment
+#: view:account.voucher:0
+#: field:account.voucher,voucher_line_ids:0
+msgid "Voucher Lines"
+msgstr "Tähiku read"
+
+#. module: account_voucher_payment
+#: model:ir.module.module,shortdesc:account_voucher_payment.module_name_translation
+msgid "Invoice Payment/Receipt by Vouchers."
+msgstr ""
+
+#. module: account_voucher_payment
+#: model:ir.actions.wizard,name:account_voucher_payment.wizard_unreconcile_voucher
+msgid "Unreconcile entries"
+msgstr "Kooskõlastamatta kirjed"
+
+#. module: account_voucher_payment
+#: field:account.move.line,voucher_invoice:0
+#: field:account.voucher.line,invoice_id:0
+msgid "Invoice"
+msgstr "Arve"
+
+#. module: account_voucher_payment
+#: wizard_button:account.voucher.unreconcile,init,end:0
+msgid "Cancel"
+msgstr "Katkesta"
+
+#. module: account_voucher_payment
+#: field:account.voucher,partner_id:0
+msgid "Partner"
+msgstr "Partner"
+
+#. module: account_voucher_payment
+#: wizard_button:account.voucher.unreconcile,init,unrec:0
+msgid "Unreconcile"
+msgstr ""
+
+#. module: account_voucher_payment
+#: wizard_view:account.voucher.unreconcile,init:0
+msgid "Unreconciliation"
+msgstr ""
diff --git a/addons/auction/i18n/pl.po b/addons/auction/i18n/pl.po
index aab4490920c..ca940cf469a 100644
--- a/addons/auction/i18n/pl.po
+++ b/addons/auction/i18n/pl.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-06-08 03:41+0000\n"
+"X-Launchpad-Export-Date: 2010-06-09 03:35+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: auction
diff --git a/addons/auction/i18n/zh_CN.po b/addons/auction/i18n/zh_CN.po
index bde1b397caa..eb36642e385 100644
--- a/addons/auction/i18n/zh_CN.po
+++ b/addons/auction/i18n/zh_CN.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-06-08 03:41+0000\n"
+"X-Launchpad-Export-Date: 2010-06-09 03:36+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: auction
diff --git a/addons/base_action_rule/__openerp__.py b/addons/base_action_rule/__openerp__.py
index ab1ae6c965b..cdb62316d15 100644
--- a/addons/base_action_rule/__openerp__.py
+++ b/addons/base_action_rule/__openerp__.py
@@ -27,7 +27,9 @@
'author': 'Tiny',
'website': 'http://www.openerp.com',
'depends': ['base'],
- 'init_xml': [],
+ 'init_xml': [
+ 'base_action_rule_data.xml'
+ ],
'update_xml': [
'base_action_rule_view.xml',
'security/ir.model.access.csv',
diff --git a/addons/base_action_rule/base_action_rule.py b/addons/base_action_rule/base_action_rule.py
index 85c4e9d4480..7d9d7ea63ff 100644
--- a/addons/base_action_rule/base_action_rule.py
+++ b/addons/base_action_rule/base_action_rule.py
@@ -136,7 +136,7 @@ the rule to mark CC(mail to any other person defined in actions)."),
def pre_action(self, cr, uid, ids, model, context=None):
# Searching for action rules
- cr.execute("SELECT m.model, r.id from base_action_rule r left join ir_model m on (m.id = r.name)")
+ cr.execute("SELECT model.model, rule.id FROM base_action_rule rule LEFT JOIN ir_model model on (model.id = rule.name)")
res = cr.fetchall()
# Check if any rule matching with current object
for obj_name, rule_id in res:
@@ -147,7 +147,7 @@ the rule to mark CC(mail to any other person defined in actions)."),
self._action(cr, uid, [rule_id], obj.browse(cr, uid, ids, context=context))
return True
- def new_create(self, old_create, model, context=None):
+ def _create(self, old_create, model, context=None):
if not context:
context = {}
def make_call_old(cr, uid, vals, context=context):
@@ -157,7 +157,7 @@ the rule to mark CC(mail to any other person defined in actions)."),
return new_id
return make_call_old
- def new_write(self, old_write, model, context=None):
+ def _write(self, old_write, model, context=None):
if not context:
context = {}
def make_call_old(cr, uid, ids, vals, context=context):
@@ -168,38 +168,35 @@ the rule to mark CC(mail to any other person defined in actions)."),
return old_write(cr, uid, ids, vals, context=context)
return make_call_old
- def create(self, cr, uid, vals, context=None):
+ def _register_hook(self, cr, uid, ids, context=None):
if not context:
context = {}
- res_id = super(base_action_rule, self).create(cr, uid, vals, context)
model_pool = self.pool.get('ir.model')
- model = model_pool.browse(cr, uid, vals.get('name'), context=context).model
- obj_pool = self.pool.get(model)
- obj_pool.__setattr__('old_create', obj_pool.create)
- obj_pool.__setattr__('old_write', obj_pool.write)
- obj_pool.__setattr__('create', self.new_create(obj_pool.create, model, context=context))
- obj_pool.__setattr__('write', self.new_write(obj_pool.write, model, context=context))
+ for action_rule in self.browse(cr, uid, ids, context=context):
+ model = action_rule.name.model
+ obj_pool = self.pool.get(model)
+ obj_pool.__setattr__('create', self._create(obj_pool.create, model, context=context))
+ obj_pool.__setattr__('write', self._write(obj_pool.write, model, context=context))
+ return True
+
+ def create(self, cr, uid, vals, context=None):
+ res_id = super(base_action_rule, self).create(cr, uid, vals, context)
+ self._register_hook(cr, uid, [res_id], context=context)
return res_id
def write(self, cr, uid, ids, vals, context=None):
res = super(base_action_rule, self).write(cr, uid, ids, vals, context)
- model_pool = self.pool.get('ir.model')
- if not context:
- context = {}
- for rule in self.browse(cr, uid, ids, context=context):
- model = model_pool.browse(cr, uid, rule.name.id, context=context).model
- obj_pool = self.pool.get(model)
- obj_pool.__setattr__('old_create', obj_pool.create)
- obj_pool.__setattr__('old_write', obj_pool.write)
- obj_pool.__setattr__('create', self.new_create(obj_pool.create, model, context=context))
- obj_pool.__setattr__('write', self.new_write(obj_pool.write, model, context=context))
+ self._register_hook(cr, uid, ids, context=context)
return res
def _check(self, cr, uid, automatic=False, use_new_cursor=False, \
context=None):
+ """
+ This Function is call by scheduler.
+ """
rule_pool= self.pool.get('base.action.rule')
rule_ids = rule_pool.search(cr, uid, [], context=context)
- return rule_pool.write(cr, uid, rule_ids, {}, context=context)
+ return self._register_hook(cr, uid, rule_ids, context=context)
def format_body(self, body):
diff --git a/addons/base_action_rule/base_action_rule_data.xml b/addons/base_action_rule/base_action_rule_data.xml
new file mode 100644
index 00000000000..288215202d6
--- /dev/null
+++ b/addons/base_action_rule/base_action_rule_data.xml
@@ -0,0 +1,19 @@
+
+
+
+
+ Check Action Rules
+ 4
+ hours
+ -1
+
+
+
+
+
+
+
+
+
+
+
diff --git a/addons/base_contact/base_contact_view.xml b/addons/base_contact/base_contact_view.xml
index 8852ea19980..b4e7fa3e2ed 100644
--- a/addons/base_contact/base_contact_view.xml
+++ b/addons/base_contact/base_contact_view.xml
@@ -134,7 +134,8 @@
diff --git a/addons/crm/i18n/et.po b/addons/crm/i18n/et.po
index 014dcf6987e..5e399b2e416 100644
--- a/addons/crm/i18n/et.po
+++ b/addons/crm/i18n/et.po
@@ -7,19 +7,19 @@ msgstr ""
"Project-Id-Version: OpenERP Server 5.0.0\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2010-01-05 05:59+0000\n"
-"PO-Revision-Date: 2009-11-09 16:56+0000\n"
-"Last-Translator: Fabien (Open ERP) \n"
+"PO-Revision-Date: 2010-06-08 18:36+0000\n"
+"Last-Translator: lyyser \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:01+0000\n"
+"X-Launchpad-Export-Date: 2010-06-09 03:35+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: crm
#: field:crm.email.add.cc,name:0
msgid "Send to"
-msgstr ""
+msgstr "Saada"
#. module: crm
#: help:crm.meeting,exdate:0
@@ -37,17 +37,17 @@ msgstr ""
#. module: crm
#: view:crm.meeting:0
msgid "Title"
-msgstr ""
+msgstr "Pealkiri"
#. module: crm
#: model:ir.model,name:crm.model_report_crm_case_section_categ2
msgid "Cases by section and category2"
-msgstr ""
+msgstr "Juhtumid jaotise ja staatusejärgi2"
#. module: crm
#: wizard_field:crm.lead.partner_create,init,close:0
msgid "Close Lead"
-msgstr ""
+msgstr "Sulge juhtimine"
#. module: crm
#: view:crm.job:0
@@ -55,12 +55,12 @@ msgstr ""
#: view:crm.opportunity:0
#: view:crm.phonecall:0
msgid " 7 Days "
-msgstr ""
+msgstr " 7 päeva "
#. module: crm
#: help:crm.menu.config_wizard,helpdesk:0
msgid "Manages an Helpdesk service."
-msgstr ""
+msgstr "Haldab helpdesk teenust."
#. module: crm
#: view:crm.job:0
@@ -80,7 +80,7 @@ msgstr "Planeeritud maksumus"
#. module: crm
#: wizard_field:crm.job.partner_create,init,close:0
msgid "Close job request"
-msgstr ""
+msgstr "Sulge töö taotlus"
#. module: crm
#: field:crm.case.stage,name:0
@@ -109,12 +109,12 @@ msgstr ""
#. module: crm
#: model:ir.ui.menu,name:crm.menu_hr
msgid "Human Resources"
-msgstr ""
+msgstr "Inimressursid"
#. module: crm
#: model:ir.ui.menu,name:crm.menu_action_report_crm_case_oppor_categ_categ2
msgid "Cases by Opportunities, Category and Type"
-msgstr ""
+msgstr "Juhtude võimalused, kategooria ja tüüp"
#. module: crm
#: help:crm.menu.config_wizard,claims:0
@@ -122,22 +122,24 @@ msgid ""
"Manages the supplier and customers claims, including your corrective or "
"preventive actions."
msgstr ""
+"Haldab tarnijate ja klientide nõudeid, sealjuures sinu korrigeerivaid ja "
+"vältivaid tegevusi."
#. module: crm
#: view:crm.fundraising:0
msgid "Amount"
-msgstr ""
+msgstr "Kogus"
#. module: crm
#: model:process.transition,note:crm.process_transition_opportunitymeeting0
msgid "Normal or phone meeting for opportunity"
-msgstr ""
+msgstr "Normaalne või telefonikohtumine võimalusega"
#. module: crm
#: model:crm.case.stage,name:crm.stage_claim2
#: model:crm.case.stage,name:crm.stage_meet1
msgid "Fixed"
-msgstr ""
+msgstr "Fikseeritud"
#. module: crm
#: code:addons/crm/crm.py:0
@@ -152,34 +154,34 @@ msgstr "Ettevaatust !"
#: code:addons/crm/wizard/wizard_crm_new_send_email.py:0
#, python-format
msgid "Please specify user's email address !"
-msgstr ""
+msgstr "Palun täpsustage kasutaja e-posti aadress!"
#. module: crm
#: model:crm.case.categ,name:crm.categ_oppor5
msgid "Campaign"
-msgstr ""
+msgstr "Kampaania"
#. module: crm
#: view:crm.opportunity:0
msgid "Search Opportunities"
-msgstr ""
+msgstr "Otsingu võimalused"
#. module: crm
#: model:ir.ui.menu,name:crm.menu_crm_case_section_stage_tree
#: view:report.crm.case.section.stage:0
msgid "Cases by Section and Stage"
-msgstr ""
+msgstr "Juhtumid sektsiooni ja olekujärgi"
#. module: crm
#: wizard_field:crm.job.meeting_set,init,duration:0
#: wizard_field:crm.phonecall.meeting_set,init,duration:0
msgid "Duration (Hours)"
-msgstr ""
+msgstr "Kestvus (Tundides)"
#. module: crm
#: selection:crm.meeting,transparent:0
msgid "TRANSPARENT"
-msgstr ""
+msgstr "LÄBIPAISTEV"
#. module: crm
#: help:crm.case.rule,server_action_id:0
@@ -227,7 +229,7 @@ msgstr "Juhtumi Jaotis"
#. module: crm
#: view:crm.job:0
msgid "Proposed Salary"
-msgstr ""
+msgstr "Pakutav Palk"
#. module: crm
#: help:crm.case.section,sequence:0
@@ -240,12 +242,12 @@ msgstr ""
#: model:crm.case.categ,name:crm.categ_meet3
#, python-format
msgid "Phone Call"
-msgstr ""
+msgstr "Telefonikõne"
#. module: crm
#: model:ir.model,name:crm.model_report_crm_case_section_stage
msgid "Cases by section and stage"
-msgstr ""
+msgstr "Juhtumid sektsiooni ja olekujärgi"
#. module: crm
#: field:crm.case.rule,act_mail_to_email:0
@@ -270,7 +272,7 @@ msgstr "Spetsiaalsed võtmesõnad sisus kasutamiseks."
#: view:crm.lead:0
#: view:crm.opportunity:0
msgid "Send New Email"
-msgstr ""
+msgstr "Saada uus e-kiri"
#. module: crm
#: view:crm.case.history:0
@@ -291,12 +293,12 @@ msgstr "Jaotised"
#. module: crm
#: help:crm.menu.config_wizard,opportunity:0
msgid "Tracks identified business opportunities for your sales pipeline."
-msgstr ""
+msgstr "Jälgib tuvastatud ärivõimalusi sinu müükide konveierile."
#. module: crm
#: view:crm.meeting:0
msgid "Exception Dates"
-msgstr ""
+msgstr "Väljajäetavad kuupäevad"
#. module: crm
#: selection:crm.case.rule,trg_date_type:0
@@ -306,12 +308,12 @@ msgstr "Viimase Toimingu Kuupäev"
#. module: crm
#: view:crm.job:0
msgid "Appreciation"
-msgstr ""
+msgstr "Hindamine"
#. module: crm
#: model:crm.case.stage,name:crm.stage_job3
msgid "Second Interview"
-msgstr ""
+msgstr "Teine Intervjuu"
#. module: crm
#: model:ir.actions.wizard,name:crm.wizard_crm_cal_subscribe
@@ -328,7 +330,7 @@ msgstr "Kategooriad"
#: code:addons/crm/wizard/wizard_crm_new_send_email.py:0
#, python-format
msgid "Warning!"
-msgstr ""
+msgstr "Hoiatus!"
#. module: crm
#: view:crm.case:0
@@ -354,12 +356,12 @@ msgstr ""
#: view:crm.fundraising:0
#: view:crm.opportunity:0
msgid "Description Information"
-msgstr ""
+msgstr "Kirjeldus info"
#. module: crm
#: view:crm.lead:0
msgid "Contact Name"
-msgstr ""
+msgstr "Kontakti nimi"
#. module: crm
#: selection:crm.lead.opportunity_set,create_partner,action:0
@@ -380,12 +382,12 @@ msgstr "Viivituse tüüp"
#: view:crm.opportunity:0
#: view:crm.phonecall:0
msgid "Contact"
-msgstr ""
+msgstr "Kontakt"
#. module: crm
#: view:crm.job:0
msgid "Next Interview"
-msgstr ""
+msgstr "Järgmine Intervjuu"
#. module: crm
#: field:crm.case.rule,regex_history:0
@@ -400,7 +402,7 @@ msgstr ""
#. module: crm
#: model:process.transition,name:crm.process_transition_opportunitymeeting0
msgid "Opportunity Meeting"
-msgstr ""
+msgstr "Võimalusega kohtumine"
#. module: crm
#: help:crm.case,canal_id:0
@@ -419,12 +421,12 @@ msgstr ""
#: field:crm.menu.config_wizard,opportunity:0
#: model:ir.actions.report.xml,name:crm.crm_business_opportunities_report
msgid "Business Opportunities"
-msgstr ""
+msgstr "Äri võimalused"
#. module: crm
#: model:crm.case.stage,name:crm.stage_claim1
msgid "Accepted as Claim"
-msgstr ""
+msgstr "Aksepteeritud kui nõue"
#. module: crm
#: view:crm.case.rule:0
@@ -432,6 +434,8 @@ msgid ""
"The rule use a AND operator. The case must match all non empty fields so "
"that the rule execute the action described in the 'Actions' tab."
msgstr ""
+"See reegel kasutab AND operaatorit. Juhtum peab sobima kõigi tühjade "
+"väljadega nii, et reegel käivitab 'Toimingud' kaardil kirjeldatud toimingu."
#. module: crm
#: field:crm.case,history_line:0
@@ -441,28 +445,28 @@ msgstr "Suhtlus"
#. module: crm
#: view:crm.case.rule:0
msgid "%(email_from)s = Partner email"
-msgstr ""
+msgstr "%(email_vorm)id = Partner email"
#. module: crm
#: model:crm.case.stage,name:crm.stage_lead6
msgid "Dead"
-msgstr ""
+msgstr "Surnud"
#. module: crm
#: view:crm.meeting:0
msgid "Confirm Meeting"
-msgstr ""
+msgstr "Kinnita koosolek"
#. module: crm
#: model:crm.case.categ,name:crm.categ_lead1
#: model:crm.case.categ,name:crm.categ_oppor1
msgid "Existing Customer"
-msgstr ""
+msgstr "Olemasolev klient"
#. module: crm
#: model:crm.case.category2,name:crm.category_meet2
msgid "Home"
-msgstr ""
+msgstr "Kodu"
#. module: crm
#: field:crm.case,categ_id:0
@@ -481,7 +485,7 @@ msgstr "Kategooria"
#: model:ir.ui.menu,name:crm.menu_crm_case_section_categ_stage_tree
#: view:report.crm.case.section.categ.stage:0
msgid "Cases by Section, Category and Stage"
-msgstr ""
+msgstr "Juhtumid jaotise, kategooria ja olekujärgi"
#. module: crm
#: help:crm.case.rule,act_mail_to_watchers:0
@@ -493,12 +497,12 @@ msgstr ""
#. module: crm
#: field:crm.meeting,class:0
msgid "Privacy"
-msgstr ""
+msgstr "Privaatsus"
#. module: crm
#: view:crm.case.rule:0
msgid "%(partner)s = Partner name"
-msgstr ""
+msgstr "%(partner)id = Partneri nimi"
#. module: crm
#: view:crm.case:0
@@ -513,7 +517,7 @@ msgstr "Toimingu Informatsioon"
#. module: crm
#: view:crm.case.rule:0
msgid "%(case_user_phone)s = Responsible phone"
-msgstr ""
+msgstr "%(juhtumi_kasutaja_telefon)id = Vastutaja telefon"
#. module: crm
#: constraint:ir.model:0
@@ -552,7 +556,7 @@ msgstr "Staatus"
#: model:ir.actions.wizard,name:crm.wizard_partner_create_opportunity
#: model:ir.actions.wizard,name:crm.wizard_partner_create_opportunity1
msgid "Create Opportunity"
-msgstr ""
+msgstr "Loo võimalus"
#. module: crm
#: selection:report.crm.case.section.categ.categ2,month:0
@@ -560,12 +564,12 @@ msgstr ""
#: selection:report.crm.case.section.categ2,month:0
#: selection:report.crm.case.section.stage,month:0
msgid "August"
-msgstr ""
+msgstr "August"
#. module: crm
#: view:crm.meeting:0
msgid "Meetings Tree"
-msgstr ""
+msgstr "Koosolekute puu"
#. module: crm
#: code:addons/crm/crm.py:0
@@ -582,7 +586,7 @@ msgstr "Eskaleeri"
#. module: crm
#: model:ir.ui.menu,name:crm.menu_crm_case_categ_meet
msgid "All Meetings"
-msgstr ""
+msgstr "Kõik koosolekud"
#. module: crm
#: model:ir.module.module,shortdesc:crm.module_meta_information
@@ -601,7 +605,7 @@ msgstr ""
#: selection:report.crm.case.section.categ2,month:0
#: selection:report.crm.case.section.stage,month:0
msgid "June"
-msgstr ""
+msgstr "Juuni"
#. module: crm
#: field:crm.segmentation,som_interval_default:0
@@ -611,7 +615,7 @@ msgstr "Vaikimisi (0=Puudub)"
#. module: crm
#: model:crm.case.stage,name:crm.stage_job7
msgid "Refused by Company"
-msgstr ""
+msgstr "Tagasi lükatud firmapoolt"
#. module: crm
#: field:crm.case,planned_revenue:0
@@ -629,32 +633,32 @@ msgstr "Luba kustutamine"
#: selection:report.crm.case.section.categ2,month:0
#: selection:report.crm.case.section.stage,month:0
msgid "October"
-msgstr ""
+msgstr "Oktoober"
#. module: crm
#: model:crm.case.stage,name:crm.stage_oppor3
msgid "Value Proposition"
-msgstr ""
+msgstr "Avalduse väärtus"
#. module: crm
#: view:crm.case.rule:0
msgid "%(case_id)s = Case ID"
-msgstr ""
+msgstr "%(juhtumi_id)d = Juhtumi ID"
#. module: crm
#: model:crm.case.category2,name:crm.category_oppor2
msgid "New Business"
-msgstr ""
+msgstr "Uus Firma"
#. module: crm
#: help:crm.case,email_from:0
msgid "These people will receive email."
-msgstr ""
+msgstr "Nendele inimestele saadetakse e-kiri."
#. module: crm
#: help:crm.case.section,calendar:0
msgid "Allows to show calendar"
-msgstr ""
+msgstr "Allows to show calendar"
#. module: crm
#: view:crm.job:0
@@ -662,13 +666,13 @@ msgstr ""
#: view:crm.opportunity:0
#: view:crm.phonecall:0
msgid " Today "
-msgstr ""
+msgstr " Täna "
#. module: crm
#: wizard_view:crm.job.reschedule_phone_call,init:0
#: wizard_view:crm.opportunity.reschedule_phone_call,init:0
msgid "Phone Call Description"
-msgstr ""
+msgstr "Telefonikõnede kirjeldus"
#. module: crm
#: view:crm.case.categ:0
@@ -687,7 +691,7 @@ msgstr ""
#. module: crm
#: model:crm.case.categ,name:crm.categ_claim3
msgid "Policy Claims"
-msgstr ""
+msgstr "Nõuete eeskiri"
#. module: crm
#: code:addons/crm/crm.py:0
@@ -697,11 +701,12 @@ msgstr ""
msgid ""
"You must define a responsible user for this case in order to use this action!"
msgstr ""
+"Peate määratlema vastutav kasutaja Sel juhul, et kasutada seda tegevust!"
#. module: crm
#: view:crm.phonecall:0
msgid "Assigned to"
-msgstr ""
+msgstr "Omistatud"
#. module: crm
#: view:res.partner.events:0
@@ -711,12 +716,12 @@ msgstr "Partneri sündmused"
#. module: crm
#: model:crm.case.stage,name:crm.stage_job4
msgid "Contract Proposed"
-msgstr ""
+msgstr "Leping esitatud"
#. module: crm
#: model:ir.ui.menu,name:crm.menu_crm_case_job_req_main
msgid "Jobs - Hiring Process"
-msgstr ""
+msgstr "Töökohad - Töölevõtmise protsess"
#. module: crm
#: view:crm.case:0
@@ -732,7 +737,7 @@ msgstr ""
#: selection:report.crm.case.section.categ2,month:0
#: selection:report.crm.case.section.stage,month:0
msgid "September"
-msgstr ""
+msgstr "September"
#. module: crm
#: view:crm.case:0
@@ -752,18 +757,18 @@ msgstr ""
#. module: crm
#: view:crm.meeting:0
msgid "Meetings Form"
-msgstr ""
+msgstr "Koosolekute vorm"
#. module: crm
#: model:crm.case.stage,name:crm.stage_oppor5
msgid "Negotiation/Review"
-msgstr ""
+msgstr "Läbirääkimine/Ülevaade"
#. module: crm
#: code:addons/crm/wizard/crm_phonecall_wizard.py:0
#, python-format
msgid "A partner is already defined on this phonecall."
-msgstr ""
+msgstr "Partner on juba määratletud selle telefonikõne."
#. module: crm
#: model:ir.ui.menu,name:crm.menu_action_report_crm_case_oppor_stage
@@ -773,7 +778,7 @@ msgstr ""
#. module: crm
#: view:crm.claim:0
msgid "Date of Claim"
-msgstr ""
+msgstr "Nõude kuupäev"
#. module: crm
#: view:crm.segmentation.line:0
@@ -783,12 +788,12 @@ msgstr "Partneri Segmenteerimise Read"
#. module: crm
#: model:ir.actions.act_window,name:crm.crm_case_category_act_leads_all
msgid "All Leads"
-msgstr ""
+msgstr "Kõik juhtimised"
#. module: crm
#: view:crm.lead:0
msgid "Leads Form"
-msgstr ""
+msgstr "Juhtimised alates"
#. module: crm
#: view:crm.segmentation:0
@@ -799,7 +804,7 @@ msgstr "Partneri Segmenteerimine"
#. module: crm
#: model:crm.case.stage,name:crm.stage_job5
msgid "Contract Signed"
-msgstr ""
+msgstr "Leping allakirjutatud"
#. module: crm
#: wizard_view:caldav.crm.subscribe,init:0
@@ -809,7 +814,7 @@ msgstr ""
#. module: crm
#: model:crm.case.category2,name:crm.category_oppor1
msgid "Existing Business"
-msgstr ""
+msgstr "Eksisteeriv äri"
#. module: crm
#: field:crm.case,probability:0
@@ -847,7 +852,7 @@ msgstr "Juhtumi Reegel"
#: model:ir.ui.menu,name:crm.menu_action_report_crm_case_oppor
#, python-format
msgid "Opportunity"
-msgstr ""
+msgstr "Võimalus"
#. module: crm
#: view:crm.case:0
@@ -857,12 +862,12 @@ msgstr ""
#: view:crm.lead:0
#: view:crm.opportunity:0
msgid "Emails"
-msgstr ""
+msgstr "E-postid"
#. module: crm
#: model:crm.case.category2,name:crm.category_lead7
msgid "Television"
-msgstr ""
+msgstr "Televisioon"
#. module: crm
#: view:crm.segmentation:0
@@ -872,18 +877,18 @@ msgstr "Peata Protsess"
#. module: crm
#: model:crm.case.categ,name:crm.categ_claim1
msgid "Factual Claims"
-msgstr ""
+msgstr "Reaalsed nõuded"
#. module: crm
#: view:crm.phonecall:0
msgid "Search Phonecalls"
-msgstr ""
+msgstr "Otsi telefonikõnesi"
#. module: crm
#: wizard_button:crm.lead.opportunity_set,create_partner,create:0
#: wizard_button:crm.phonecall.opportunity_set,create_partner,create:0
msgid "Continue"
-msgstr ""
+msgstr "Jätka"
#. module: crm
#: field:crm.segmentation,som_interval:0
@@ -898,13 +903,13 @@ msgstr "Väärtus"
#. module: crm
#: help:caldav.crm.export,init,name:0
msgid "Save in .ics format"
-msgstr ""
+msgstr "Salvesta .ics vormingusse"
#. module: crm
#: wizard_field:crm.new.send.mail,init,text:0
#: wizard_field:crm.send.mail,init,text:0
msgid "Message"
-msgstr ""
+msgstr "Sõnum"
#. module: crm
#: help:crm.segmentation,exclusif:0
@@ -920,7 +925,7 @@ msgstr ""
#. module: crm
#: field:crm.segmentation,exclusif:0
msgid "Exclusive"
-msgstr ""
+msgstr "Eksklusiivne"
#. module: crm
#: help:crm.case,categ_id:0
@@ -938,12 +943,12 @@ msgstr "Sea olekusse"
#: code:addons/crm/crm.py:0
#, python-format
msgid "Email!"
-msgstr ""
+msgstr "E-kiri!"
#. module: crm
#: model:crm.case.category2,name:crm.category_lead6
msgid "Radio"
-msgstr ""
+msgstr "Raadio"
#. module: crm
#: model:ir.model,name:crm.model_crm_opportunity_assign_wizard
@@ -953,7 +958,7 @@ msgstr ""
#. module: crm
#: view:crm.case.rule:0
msgid "Conditions on States"
-msgstr ""
+msgstr "Staatuste seisukord"
#. module: crm
#: field:crm.case.rule,trg_date_type:0
@@ -963,7 +968,7 @@ msgstr "Päästiku kuupäev"
#. module: crm
#: view:crm.case.history:0
msgid "Search Histories"
-msgstr ""
+msgstr "Otsi ajalugu"
#. module: crm
#: help:crm.case.stage,sequence:0
@@ -976,7 +981,7 @@ msgstr ""
#: model:ir.ui.menu,name:crm.menu_crm_case_opp
#: model:process.node,name:crm.process_node_opportunities0
msgid "Opportunities"
-msgstr ""
+msgstr "Võimalused"
#. module: crm
#: help:crm.segmentation,name:0
@@ -1002,7 +1007,7 @@ msgstr "Ostu Kogus"
#. module: crm
#: view:crm.phonecall:0
msgid "Direction"
-msgstr ""
+msgstr "Suund"
#. module: crm
#: help:crm.case,email_cc:0
@@ -1018,7 +1023,7 @@ msgstr ""
#: selection:report.crm.case.section.categ2,month:0
#: selection:report.crm.case.section.stage,month:0
msgid "March"
-msgstr ""
+msgstr "Märts"
#. module: crm
#: view:crm.case.rule:0
@@ -1035,7 +1040,7 @@ msgstr "Reeglid"
#: wizard_view:crm.job.meeting_set,init:0
#: wizard_view:crm.phonecall.meeting_set,init:0
msgid "Plan Meeting"
-msgstr ""
+msgstr "Koosoleku plaan"
#. module: crm
#: wizard_field:crm.new.send.mail,init,state:0
@@ -1056,7 +1061,7 @@ msgstr ""
#: model:ir.actions.wizard,name:crm.wizard_crm_lead_partner_create
#: model:ir.actions.wizard,name:crm.wizard_crm_phonecall_partner_create
msgid "Create Partner"
-msgstr ""
+msgstr "Loo partner"
#. module: crm
#: selection:crm.segmentation.line,expr_operator:0
@@ -1066,17 +1071,17 @@ msgstr "<"
#. module: crm
#: view:crm.case.rule:0
msgid "%(case_description)s = Case description"
-msgstr ""
+msgstr "%(case_description)s = Juhtumi kirjeldus"
#. module: crm
#: view:crm.fundraising:0
msgid "My Funds"
-msgstr ""
+msgstr "Minu vahendid"
#. module: crm
#: field:crm.case,partner_mobile:0
msgid "Mobile"
-msgstr ""
+msgstr "Mobiil"
#. module: crm
#: field:crm.case.rule,name:0
@@ -1097,12 +1102,12 @@ msgstr "Juhtumi ajalugu"
#. module: crm
#: model:crm.case.categ,name:crm.categ_job2
msgid "Junior Developer"
-msgstr ""
+msgstr "Noorem Arendaja"
#. module: crm
#: view:crm.meeting:0
msgid "My Meetings"
-msgstr ""
+msgstr "Minu kohtumised"
#. module: crm
#: field:crm.case.categ,name:0
@@ -1112,7 +1117,7 @@ msgstr "Juhtumi Kategooria Nimi"
#. module: crm
#: model:crm.case.category2,name:crm.category_claim2
msgid "Preventive"
-msgstr ""
+msgstr "Ennetav"
#. module: crm
#: field:crm.case.rule,act_email_cc:0
@@ -1150,7 +1155,7 @@ msgstr ""
#: view:crm.meeting:0
#, python-format
msgid "Meetings"
-msgstr ""
+msgstr "Koosolekud"
#. module: crm
#: view:crm.case.rule:0
@@ -1175,12 +1180,12 @@ msgstr "Tähtaeg"
#: wizard_button:caldav.crm.import,init,end:0
#: wizard_button:caldav.crm.subscribe,init,end:0
msgid "_Cancel"
-msgstr ""
+msgstr "_Katkesta"
#. module: crm
#: field:crm.case,category2_id:0
msgid "Category Name"
-msgstr ""
+msgstr "Kategooria nimi"
#. module: crm
#: view:crm.segmentation:0
@@ -1204,12 +1209,12 @@ msgstr "Juhtumi Kategooria"
#: view:crm.phonecall:0
#: wizard_field:crm.send.mail,init,subject:0
msgid "Subject"
-msgstr ""
+msgstr "Subjekt"
#. module: crm
#: field:crm.meeting,attendees:0
msgid "Attendees"
-msgstr ""
+msgstr "Osalejad"
#. module: crm
#: model:ir.module.module,description:crm.module_meta_information
@@ -1269,7 +1274,7 @@ msgstr ""
#. module: crm
#: model:process.transition,note:crm.process_transition_leadpartner0
msgid "Prospect is converting to business partner"
-msgstr ""
+msgstr "Perspektiiv konverditakse äripartneriks"
#. module: crm
#: view:crm.case.rule:0
@@ -1289,7 +1294,7 @@ msgstr ""
#. module: crm
#: model:crm.case.category2,name:crm.category_lead4
msgid "Print"
-msgstr ""
+msgstr "Prindi"
#. module: crm
#: field:crm.case,som:0
@@ -1304,12 +1309,12 @@ msgstr "Meeleolu"
#: field:report.crm.case.section.categ.categ2,category2_id:0
#: field:report.crm.case.section.categ2,category2_id:0
msgid "Type"
-msgstr ""
+msgstr "Tüüp"
#. module: crm
#: view:crm.job:0
msgid "Candidate Refused"
-msgstr ""
+msgstr "Kandidaat tagasilükatud"
#. module: crm
#: view:crm.segmentation:0
@@ -1339,12 +1344,12 @@ msgstr "Loomise Kuupäev"
#: view:crm.phonecall:0
#: model:process.node,name:crm.process_node_meeting0
msgid "Meeting"
-msgstr ""
+msgstr "Kohtumine"
#. module: crm
#: view:crm.case.rule:0
msgid "%(partner_email)s = Partner email"
-msgstr ""
+msgstr "%(partner_email)id = Partneri e-mail"
#. module: crm
#: view:crm.case:0
@@ -1360,12 +1365,12 @@ msgstr "Lähtesta mustandiks"
#. module: crm
#: model:ir.model,name:crm.model_report_crm_case_section_categ_categ2
msgid "Cases by section, Category and Category2"
-msgstr ""
+msgstr "Juhtumid sektsiooni kaupa, kategooria ja kategooria2"
#. module: crm
#: model:crm.case.stage,name:crm.stage_oppor6
msgid "Closed Won"
-msgstr ""
+msgstr "Suletud Võidetud"
#. module: crm
#: model:ir.actions.act_window,name:crm.act_crm_case_categ_crm_case_opened
@@ -1384,7 +1389,7 @@ msgstr "Avatud juhtumid"
#: field:report.crm.case.section.categ2,stage_id:0
#: field:report.crm.case.section.stage,stage_id:0
msgid "Stage"
-msgstr ""
+msgstr "Tase"
#. module: crm
#: constraint:ir.ui.view:0
@@ -1401,7 +1406,7 @@ msgstr ""
#. module: crm
#: model:crm.case.categ,name:crm.categ_fund2
msgid "Learning And Education"
-msgstr ""
+msgstr "Õppimine ja haridus"
#. module: crm
#: wizard_view:crm.phonecall.opportunity_set,create_partner:0
@@ -1414,36 +1419,36 @@ msgstr ""
#: model:ir.actions.act_window,name:crm.crm_case_stage_act
#: model:ir.ui.menu,name:crm.menu_crm_case_stage_act
msgid "Stages"
-msgstr ""
+msgstr "Etapid"
#. module: crm
#: wizard_field:crm.case.opportunity.partner_opportunity,init,planned_revenue:0
#: wizard_field:crm.lead.opportunity_set,opportunity,planned_revenue:0
#: wizard_field:crm.phonecall.opportunity_set,opportunity,planned_revenue:0
msgid "Expected Revenue"
-msgstr ""
+msgstr "Eeldatav tulu"
#. module: crm
#: view:crm.meeting:0
msgid "Meeting Date"
-msgstr ""
+msgstr "Koosoleku kuupäev"
#. module: crm
#: view:crm.job:0
#: view:crm.lead:0
#: view:crm.phonecall:0
msgid "Convert to Partner"
-msgstr ""
+msgstr "Muuda partneriks"
#. module: crm
#: model:ir.actions.act_window,name:crm.crm_case_category_act_meetall3
msgid "Next Meetings"
-msgstr ""
+msgstr "Järgmised kohtumised"
#. module: crm
#: field:crm.segmentation,partner_id:0
msgid "Max Partner ID processed"
-msgstr ""
+msgstr "Maks Partner ID töödeldud"
#. module: crm
#: code:addons/crm/crm.py:0
@@ -1454,7 +1459,7 @@ msgstr "Sa ei saa seda juhtumit kustutada. Parem tühista see."
#. module: crm
#: wizard_button:caldav.crm.subscribe,init,open:0
msgid "_Subscribe"
-msgstr ""
+msgstr "_Telli"
#. module: crm
#: field:crm.case.rule,trg_priority_from:0
@@ -1469,12 +1474,12 @@ msgstr ""
#. module: crm
#: model:crm.case.categ,name:crm.categ_claim2
msgid "Value Claims"
-msgstr ""
+msgstr "Nõuete Väärtus"
#. module: crm
#: wizard_view:caldav.crm.subscribe,display:0
msgid "Message..."
-msgstr ""
+msgstr "Sõnum..."
#. module: crm
#: model:ir.model,name:crm.model_crm_phonecall_assign_wizard
@@ -1484,7 +1489,7 @@ msgstr ""
#. module: crm
#: view:report.crm.case.section.categ2:0
msgid "Cases by Section and Category2"
-msgstr ""
+msgstr "Juhtumid jaotise ja kategooria2 järgi"
#. module: crm
#: code:addons/crm/crm.py:0
@@ -1496,7 +1501,7 @@ msgstr "valmis"
#: view:crm.meeting:0
#: view:crm.phonecall:0
msgid "Reminder"
-msgstr ""
+msgstr "Meeldetuletus"
#. module: crm
#: help:crm.segmentation,sales_purchase_active:0
@@ -1522,7 +1527,7 @@ msgstr "Meeldetuletus manusega"
#: model:crm.case.categ,name:crm.categ_lead6
#: model:crm.case.categ,name:crm.categ_oppor6
msgid "Website"
-msgstr ""
+msgstr "Veebileht"
#. module: crm
#: field:crm.case.rule,act_remind_user:0
@@ -1532,7 +1537,7 @@ msgstr "Meeldetuletus vastutajale"
#. module: crm
#: field:crm.segmentation,state:0
msgid "Execution Status"
-msgstr ""
+msgstr "Täideviimise olek"
#. module: crm
#: help:crm.menu.config_wizard,jobs:0
@@ -1544,7 +1549,7 @@ msgstr ""
#. module: crm
#: view:crm.fundraising:0
msgid "Funds"
-msgstr ""
+msgstr "Vahendid"
#. module: crm
#: code:addons/crm/crm.py:0
@@ -1556,7 +1561,7 @@ msgstr "mustand"
#: model:crm.case.stage,name:crm.stage_claim5
#: model:crm.case.stage,name:crm.stage_meet4
msgid "Awaiting Response"
-msgstr ""
+msgstr "Vastuse ootel"
#. module: crm
#: field:crm.case,date:0
@@ -1570,13 +1575,13 @@ msgstr "Kuupäev"
#. module: crm
#: view:crm.job:0
msgid "Candidate Name"
-msgstr ""
+msgstr "Kandidaadi Nimi"
#. module: crm
#: model:crm.case.categ,name:crm.categ_lead2
#: model:crm.case.categ,name:crm.categ_oppor2
msgid "Self Generated"
-msgstr ""
+msgstr "Endal genereeritud"
#. module: crm
#: model:crm.case.stage,name:crm.stage_claim3
@@ -1586,7 +1591,7 @@ msgstr ""
#. module: crm
#: model:crm.case.stage,name:crm.stage_lead4
msgid "Converted"
-msgstr ""
+msgstr "Muudetud"
#. module: crm
#: view:crm.case:0
@@ -1626,7 +1631,7 @@ msgstr ""
#. module: crm
#: view:crm.job:0
msgid "Jobs - Recruitment Tree"
-msgstr ""
+msgstr "Töökohad - Värbamise puu"
#. module: crm
#: field:crm.case.rule,regex_name:0
@@ -1640,7 +1645,7 @@ msgstr ""
#: field:report.crm.case.section.categ2,state:0
#: field:report.crm.case.section.stage,state:0
msgid "State"
-msgstr ""
+msgstr "Riik"
#. module: crm
#: view:crm.case:0
@@ -1701,12 +1706,12 @@ msgstr ""
#. module: crm
#: view:crm.claim:0
msgid "Type of claim"
-msgstr ""
+msgstr "Nõude tüüp"
#. module: crm
#: view:crm.case:0
msgid "Helpdesk Support Tree"
-msgstr ""
+msgstr "Helpdesk toetuse puu"
#. module: crm
#: view:res.partner.events:0
@@ -1716,12 +1721,12 @@ msgstr "Üldine kirjeldus"
#. module: crm
#: view:crm.meeting:0
msgid "Other Info"
-msgstr ""
+msgstr "Muu info"
#. module: crm
#: view:crm.claim:0
msgid "Claim Cost"
-msgstr ""
+msgstr "Nõude kulud"
#. module: crm
#: view:crm.job:0
@@ -1747,7 +1752,7 @@ msgstr ""
#. module: crm
#: model:crm.case.category2,name:crm.category_lead2
msgid "Mail"
-msgstr ""
+msgstr "E-Kiri"
#. module: crm
#: field:crm.case.rule,act_priority:0
@@ -1757,7 +1762,7 @@ msgstr "Sea prioriteet"
#. module: crm
#: model:crm.case.stage,name:crm.stage_oppor2
msgid "Needs Analysis"
-msgstr ""
+msgstr "Vajab analüüsi"
#. module: crm
#: view:crm.claim:0
@@ -1772,7 +1777,7 @@ msgstr "Maili keha"
#. module: crm
#: help:crm.menu.config_wizard,meeting:0
msgid "Manages the calendar of meetings of the users."
-msgstr ""
+msgstr "Haldab kasutajate koosolekute kalendrit."
#. module: crm
#: selection:crm.segmentation.line,expr_name:0
@@ -1805,12 +1810,12 @@ msgstr "Nimi"
#. module: crm
#: view:crm.opportunity:0
msgid "Sales Stage"
-msgstr ""
+msgstr "Müügistaatus"
#. module: crm
#: field:crm.meeting,alarm_id:0
msgid "Alarm"
-msgstr ""
+msgstr "Alarm"
#. module: crm
#: field:crm.case.rule,act_mail_to_watchers:0
@@ -1821,7 +1826,7 @@ msgstr ""
#: view:crm.fundraising:0
#: view:crm.meeting:0
msgid "Next Meeting"
-msgstr ""
+msgstr "Järgmine Koosolek"
#. module: crm
#: code:addons/crm/crm.py:0
@@ -1844,7 +1849,7 @@ msgstr ""
#. module: crm
#: field:crm.menu.config_wizard,bugs:0
msgid "Bug Tracking"
-msgstr ""
+msgstr "Vigade jälgimine"
#. module: crm
#: view:crm.case:0
@@ -1883,7 +1888,7 @@ msgstr ""
#. module: crm
#: model:crm.case.stage,name:crm.stage_oppor4
msgid "Proposal/Price Quote"
-msgstr ""
+msgstr "Ettepanek/Hinnapakkumine"
#. module: crm
#: view:crm.case.rule:0
@@ -1893,12 +1898,12 @@ msgstr "Viivitus peale päästiku kuupäeva:"
#. module: crm
#: model:crm.case.category2,name:crm.category_lead5
msgid "Web"
-msgstr ""
+msgstr "Veeb"
#. module: crm
#: view:crm.lead:0
msgid "Campaign Type"
-msgstr ""
+msgstr "Kampaanja tüüp"
#. module: crm
#: view:crm.segmentation:0
@@ -1910,7 +1915,7 @@ msgstr "Meeleolu arvutamine"
#: code:addons/crm/wizard/wizard_crm_send_email.py:0
#, python-format
msgid "Error"
-msgstr ""
+msgstr "Viga"
#. module: crm
#: model:ir.model,name:crm.model_crm_meeting_generic_wizard
@@ -1920,12 +1925,12 @@ msgstr ""
#. module: crm
#: model:ir.actions.act_window,name:crm.crm_case_history-act
msgid "Histories"
-msgstr ""
+msgstr "Aja lood"
#. module: crm
#: model:crm.case.category2,name:crm.category_job1
msgid "Graduate"
-msgstr ""
+msgstr "Teaduslik kraad"
#. module: crm
#: wizard_view:crm.job.meeting_set,init:0
@@ -1934,11 +1939,13 @@ msgid ""
"Note that you can also use the calendar view to graphically schedule your "
"next meeting."
msgstr ""
+"Sa saad kasutada ka kalendrivaadet, et graafiliselt planeerida oma järgmist "
+"kohtumist."
#. module: crm
#: view:crm.lead:0
msgid "Leads Tree"
-msgstr ""
+msgstr "Algatuste puu"
#. module: crm
#: field:crm.meeting,caldav_url:0
@@ -1948,7 +1955,7 @@ msgstr ""
#. module: crm
#: view:crm.meeting:0
msgid "Attendee"
-msgstr ""
+msgstr "Osaleja"
#. module: crm
#: code:addons/crm/crm.py:0
@@ -1962,12 +1969,12 @@ msgstr ""
#: model:ir.actions.act_window,name:crm.crm_case_categ_phone_incoming0
#: model:ir.ui.menu,name:crm.menu_crm_case_phone_inbound
msgid "Inbound"
-msgstr ""
+msgstr "Sissetulev"
#. module: crm
#: constraint:crm.case.section:0
msgid "Error ! You cannot create recursive sections."
-msgstr ""
+msgstr "Viga! Sa ei saa luua rekursiivseid sektsioone."
#. module: crm
#: model:ir.ui.menu,name:crm.menu_crm
@@ -1980,6 +1987,8 @@ msgid ""
" Will allow you to synchronise your Open ERP calendars with your phone, "
"outlook, Sunbird, ical, ..."
msgstr ""
+" Lubab sul sünkroniseerida Open ERP kalendreid telefoni, Outlook, Sunbird, "
+"ical, ..."
#. module: crm
#: view:report.crm.case.section.categ.categ2:0
@@ -1987,7 +1996,7 @@ msgstr ""
#: view:report.crm.case.section.categ2:0
#: view:report.crm.case.section.stage:0
msgid "This Year"
-msgstr ""
+msgstr "See aasta"
#. module: crm
#: field:crm.case.rule,act_remind_partner:0
@@ -2005,7 +2014,7 @@ msgstr "Kõrgeim"
#. module: crm
#: view:crm.job:0
msgid "Contract Data"
-msgstr ""
+msgstr "Lepingu andmed"
#. module: crm
#: selection:crm.case.rule,trg_date_range_type:0
@@ -2020,7 +2029,7 @@ msgstr ""
#. module: crm
#: field:crm.menu.config_wizard,document_ics:0
msgid "Shared Calendar"
-msgstr ""
+msgstr "Jagatud kalender"
#. module: crm
#: field:crm.case.section,reply_to:0
@@ -2041,12 +2050,12 @@ msgstr "Minutid"
#: field:report.crm.case.section.categ2,amount_revenue:0
#: field:report.crm.case.section.stage,amount_revenue:0
msgid "Est.Revenue"
-msgstr ""
+msgstr "Loodetav tulu"
#. module: crm
#: model:crm.case.stage,name:crm.stage_job1
msgid "Initial Jobs Demand"
-msgstr ""
+msgstr "Esialgne töökohtade vajadus"
#. module: crm
#: field:crm.case.rule,trg_priority_to:0
@@ -2056,17 +2065,17 @@ msgstr "Maksimaalne Prioriteet"
#. module: crm
#: selection:crm.meeting,transparent:0
msgid "OPAQUE"
-msgstr ""
+msgstr "LÄBIPAISTMATU"
#. module: crm
#: view:crm.claim:0
msgid "Claims Info"
-msgstr ""
+msgstr "Nõuete Info"
#. module: crm
#: field:crm.case.category2,name:0
msgid "Case Category2 Name"
-msgstr ""
+msgstr "Juhtumi Kategooria2 nimi"
#. module: crm
#: wizard_view:crm.lead.opportunity_set,opportunity:0
@@ -2074,7 +2083,7 @@ msgstr ""
#: model:ir.actions.wizard,name:crm.wizard_crm_lead_opportunity_set
#: model:ir.actions.wizard,name:crm.wizard_crm_phonecall_opportunity_set
msgid "Convert To Opportunity"
-msgstr ""
+msgstr "Konverdi võimaluseks"
#. module: crm
#: model:crm.case.stage,name:crm.stage_phone2
@@ -2085,7 +2094,7 @@ msgstr ""
#. module: crm
#: view:crm.case:0
msgid "Helpdesk Supports"
-msgstr ""
+msgstr "Helpdesk'i toed"
#. module: crm
#: model:crm.case.section,name:crm.section_support4
diff --git a/addons/crm_vertical/i18n/et.po b/addons/crm_vertical/i18n/et.po
index 6cb97a11a69..2fc01790b28 100644
--- a/addons/crm_vertical/i18n/et.po
+++ b/addons/crm_vertical/i18n/et.po
@@ -7,16 +7,16 @@ 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-09-22 23:21+0000\n"
-"Last-Translator: Fabien (Open ERP) \n"
+"PO-Revision-Date: 2010-06-08 17:43+0000\n"
+"Last-Translator: lyyser \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:20+0000\n"
+"X-Launchpad-Export-Date: 2010-06-09 03:36+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: crm_vertical
#: model:ir.module.module,description:crm_vertical.module_meta_information
msgid "Simplification of the interface for CRM."
-msgstr ""
+msgstr "Kasutajaliidese lihtsustus KSH jaoks."
diff --git a/addons/document_ics/i18n/et.po b/addons/document_ics/i18n/et.po
index 79dbad26d26..aa769e50473 100644
--- a/addons/document_ics/i18n/et.po
+++ b/addons/document_ics/i18n/et.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-09-16 15:43+0000\n"
-"Last-Translator: Fabien (Open ERP) \n"
+"PO-Revision-Date: 2010-06-08 17:44+0000\n"
+"Last-Translator: lyyser \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:18+0000\n"
+"X-Launchpad-Export-Date: 2010-06-09 03:36+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: document_ics
@@ -36,7 +36,7 @@ msgstr "Viga! Sa ei saa luua regrussiivseid kaustu."
#. module: document_ics
#: field:document.ics.crm.wizard,jobs:0
msgid "Jobs Hiring Process"
-msgstr ""
+msgstr "Töökohad Töölevõtmise Protsess"
#. module: document_ics
#: view:document.ics.crm.wizard:0
@@ -122,7 +122,7 @@ msgstr "Seadista kalendrid sektsioonide jaoks "
#. module: document_ics
#: help:document.ics.crm.wizard,opportunity:0
msgid "Tracks identified business opportunities for your sales pipeline."
-msgstr ""
+msgstr "Jälgib tuvastatud ärivõimalusi sinu müükide konveierile."
#. module: document_ics
#: help:document.ics.crm.wizard,fund:0
@@ -209,6 +209,8 @@ msgid ""
"Manages the supplier and customers claims, including your corrective or "
"preventive actions."
msgstr ""
+"Haldab tarnijate ja klientide nõudeid, sealjuures sinu korrigeerivaid ja "
+"vältivaid tegevusi."
#. module: document_ics
#: selection:document.directory.ics.fields,name:0
@@ -241,6 +243,8 @@ msgid ""
"Help you to encode the result of a phone call or to planify a list of phone "
"calls to process."
msgstr ""
+"Aitab sul arvutada telefonikõne tulemust või planeerida nimekirja "
+"telefonikõnedest töötlemiseks."
#. module: document_ics
#: selection:document.directory.ics.fields,name:0
@@ -315,7 +319,7 @@ msgstr "Tühista"
#. module: document_ics
#: field:document.ics.crm.wizard,opportunity:0
msgid "Business Opportunities"
-msgstr ""
+msgstr "Äri võimalused"
#. module: document_ics
#: selection:document.directory.ics.fields,name:0
diff --git a/addons/event/i18n/et.po b/addons/event/i18n/et.po
index 90fba2749fb..678759f8938 100644
--- a/addons/event/i18n/et.po
+++ b/addons/event/i18n/et.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-05-13 08:53+0000\n"
+"PO-Revision-Date: 2010-06-08 17:51+0000\n"
"Last-Translator: lyyser \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-09 03:35+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: event
@@ -60,7 +60,7 @@ msgstr "Sündmuse registreerimine"
#. module: event
#: model:ir.actions.wizard,name:event.event_reg_invoice
msgid "Make Invoice"
-msgstr ""
+msgstr "Loo arve"
#. module: event
#: field:report.event.type.registration,draft_state:0
@@ -145,7 +145,7 @@ msgstr "Registreerimine"
#: field:event.type,name:0
#: model:ir.model,name:event.model_event_type
msgid "Event type"
-msgstr ""
+msgstr "Sündmuse liik"
#. module: event
#: view:event.event:0
@@ -153,34 +153,34 @@ msgstr ""
#: model:ir.module.module,shortdesc:event.module_meta_information
#: field:report.event.registration,name:0
msgid "Event"
-msgstr ""
+msgstr "Sündmus"
#. module: event
#: selection:event.event,state:0
msgid "Confirmed"
-msgstr ""
+msgstr "Kinnitatud"
#. module: event
#: wizard_view:event.confirm_registration,split:0
msgid "Registration Confirmation"
-msgstr ""
+msgstr "Registreerimise kinnitus"
#. module: event
#: view:event.registration:0
msgid "Dates"
-msgstr ""
+msgstr "Kuupäevad"
#. module: event
#: field:event.event,register_current:0
#: model:ir.actions.act_window,name:event.action_registration_confirm
#: model:ir.ui.menu,name:event.menu_action_registration_confirm
msgid "Confirmed Registrations"
-msgstr ""
+msgstr "Kinnitatud registreerimised"
#. module: event
#: field:event.event,mail_auto_registr:0
msgid "Mail Auto Register"
-msgstr ""
+msgstr "Autoregistreerimise mail"
#. module: event
#: view:event.registration:0
@@ -190,12 +190,12 @@ msgstr "Tunnusmärk"
#. module: event
#: field:event.event,section_id:0
msgid "Case section"
-msgstr ""
+msgstr "Juhtumi jaotis"
#. module: event
#: field:event.registration,tobe_invoiced:0
msgid "To be Invoiced"
-msgstr ""
+msgstr "Tehakse arve"
#. module: event
#: model:ir.ui.menu,name:event.menu_event_event
@@ -220,7 +220,7 @@ msgstr "Sündmused kategooria järgi"
#. module: event
#: wizard_view:event.confirm_registration,split:0
msgid "The event limit is reached. What do you want to do?"
-msgstr ""
+msgstr "Sündmuste limiidipiir on saavutatud. Mida sa soovid teha?"
#. module: event
#: field:report.event.type.registration,confirm_state:0
@@ -237,7 +237,7 @@ msgstr "Viited"
#: model:ir.ui.menu,name:event.menu_report_event_type_registration
#: view:report.event.type.registration:0
msgid "Registration By Event Types"
-msgstr ""
+msgstr "Registreerimine sündmuse liigijärgi"
#. module: event
#: model:ir.ui.menu,name:event.menu_event_config
@@ -262,12 +262,12 @@ msgstr "Viga: TÜ kategooria peab erinema MÜ kategooriast"
#. module: event
#: view:event.event:0
msgid "Parent Category"
-msgstr ""
+msgstr "Peaktegooria"
#. module: event
#: view:event.registration:0
msgid "Registration Invoiced"
-msgstr ""
+msgstr "Registreerimine arveks tehtud"
#. module: event
#: field:report.event.type.registration,nbevent:0
@@ -277,7 +277,7 @@ msgstr "Sündmuste arv"
#. module: event
#: view:event.event:0
msgid "Cancel Event"
-msgstr ""
+msgstr "Loobu sündmusest"
#. module: event
#: wizard_field:event.reg_make_invoice,init,inv_rej_reason:0
@@ -287,12 +287,12 @@ msgstr "Veateated"
#. module: event
#: view:event.event:0
msgid "Mailing"
-msgstr ""
+msgstr "Postitan"
#. module: event
#: model:product.template,name:event.event_product_0_product_template
msgid "Ticket for Concert"
-msgstr ""
+msgstr "Kontserdi pilet"
#. module: event
#: field:event.event,register_prospect:0
@@ -304,12 +304,12 @@ msgstr "Kinnitamatta registreerimised"
#. module: event
#: field:event.registration,partner_invoice_id:0
msgid "Partner Invoiced"
-msgstr ""
+msgstr "Partnerile arve tehtud"
#. module: event
#: view:event.registration:0
msgid "Communication history"
-msgstr ""
+msgstr "Kommunikatsiooni alalugu"
#. module: event
#: selection:event.event,state:0
@@ -319,18 +319,18 @@ msgstr "Katkestatud"
#. module: event
#: view:event.event:0
msgid "Event Done"
-msgstr ""
+msgstr "Sündmus valmis"
#. module: event
#: field:event.registration,badge_name:0
msgid "Badge Name"
-msgstr ""
+msgstr "Embleemi nimi"
#. module: event
#: model:ir.actions.act_window,name:event.action_event_registration
#: model:ir.ui.menu,name:event.menu_report_event_registration
msgid "Events On Registrations"
-msgstr ""
+msgstr "Registreerimiste sündmused"
#. module: event
#: constraint:product.template:0
@@ -342,27 +342,27 @@ msgstr ""
#. module: event
#: wizard_field:event.reg_make_invoice,init,inv_created:0
msgid "Invoice Created"
-msgstr ""
+msgstr "Arve loodud"
#. module: event
#: view:event.event:0
msgid "Statistics"
-msgstr ""
+msgstr "Statistika"
#. module: event
#: selection:event.event,state:0
msgid "Draft"
-msgstr ""
+msgstr "Mustand"
#. module: event
#: view:event.event:0
msgid "Event description"
-msgstr ""
+msgstr "Sündmuse kirjeldus"
#. module: event
#: model:ir.model,name:event.model_report_event_type_registration
msgid "Event type on registration"
-msgstr ""
+msgstr "Registreerimise sündmuse liik"
#. module: event
#: constraint:ir.model:0
@@ -374,7 +374,7 @@ msgstr ""
#. module: event
#: field:event.registration,event_id:0
msgid "Event Related"
-msgstr ""
+msgstr "Seotud sündmus"
#. module: event
#: model:crm.case.section,name:event.case_section_event
@@ -386,167 +386,169 @@ msgstr "Sündmused"
#. module: event
#: field:event.registration,nb_register:0
msgid "Number of Registration"
-msgstr ""
+msgstr "Registreerimiste arv"
#. module: event
#: view:event.event:0
#: field:event.event,state:0
#: view:event.registration:0
msgid "Status"
-msgstr ""
+msgstr "Olek"
#. module: event
#: model:ir.actions.act_window,name:event.action_event_categories
msgid "Events by section"
-msgstr ""
+msgstr "Sündmused sektsioonijärgi"
#. module: event
#: model:ir.ui.menu,name:event.menu_action_registration
msgid "All Registrations"
-msgstr ""
+msgstr "Kõik registreerimised"
#. module: event
#: help:event.event,mail_auto_registr:0
msgid ""
"Check this box if you want to use the automatic mailing for new registration"
msgstr ""
+"Märgi see kast, kui sa tahad kasutada automaatset kirja saatmist uuel "
+"registreerimisel"
#. module: event
#: view:event.event:0
msgid "Set To Draft"
-msgstr ""
+msgstr "Sea mustandiks"
#. module: event
#: view:event.registration:0
#: model:ir.actions.wizard,name:event.event_confirm_registration
#: field:report.event.registration,confirm_state:0
msgid "Confirm Registration"
-msgstr ""
+msgstr "Kinnita registreerimine"
#. module: event
#: view:event.registration:0
msgid "History"
-msgstr ""
+msgstr "Ajalugu"
#. module: event
#: model:ir.ui.menu,name:event.menu_event_type
msgid "Types of Events"
-msgstr ""
+msgstr "Sündmuste liigid"
#. module: event
#: field:event.registration,contact_id:0
msgid "Partner Contact"
-msgstr ""
+msgstr "Partneri kontakt"
#. module: event
#: view:event.event:0
msgid "Auto Confirmation Email"
-msgstr ""
+msgstr "Automaatne kinnitamise e-kiri"
#. module: event
#: view:event.event:0
#: view:event.registration:0
msgid "General"
-msgstr ""
+msgstr "Üldine"
#. module: event
#: view:event.registration:0
msgid "Send Reminder"
-msgstr ""
+msgstr "Saada meeldetuletus"
#. module: event
#: selection:event.event,state:0
msgid "Done"
-msgstr ""
+msgstr "Valmis"
#. module: event
#: field:event.event,date_begin:0
#: field:report.event.registration,date_begin:0
msgid "Beginning date"
-msgstr ""
+msgstr "Alguskuupäev"
#. module: event
#: field:event.registration,invoice_id:0
msgid "Invoice"
-msgstr ""
+msgstr "Arve"
#. module: event
#: model:ir.model,name:event.model_report_event_registration
msgid "Events on registrations"
-msgstr ""
+msgstr "Sündmused registreerimisel"
#. module: event
#: wizard_button:event.confirm_registration,split,end:0
msgid "Cancel"
-msgstr ""
+msgstr "Katkesta"
#. module: event
#: wizard_button:event.reg_make_invoice,init,open:0
msgid "Open"
-msgstr ""
+msgstr "Ava"
#. module: event
#: field:event.registration,badge_title:0
msgid "Badge Title"
-msgstr ""
+msgstr "Embleemi pealkiri"
#. module: event
#: model:ir.actions.act_window,name:event.action_new_event_form
#: model:ir.ui.menu,name:event.menu_event_new_event
msgid "New event"
-msgstr ""
+msgstr "Uus sündmus"
#. module: event
#: field:event.registration,unit_price:0
msgid "Unit Price"
-msgstr ""
+msgstr "Ühiku hind"
#. module: event
#: model:crm.case.section,name:event.event_2_crm_case_section
msgid "Conference on ERP Buisness"
-msgstr ""
+msgstr "ERP äri konverents"
#. module: event
#: field:event.registration,badge_partner:0
msgid "Badge Partner"
-msgstr ""
+msgstr "Partneri embleem"
#. module: event
#: model:ir.actions.act_window,name:event.action_event_view_confirm
#: model:ir.ui.menu,name:event.menu_event_event_confirm
msgid "Confirmed Events"
-msgstr ""
+msgstr "Kinnitatud sündmused"
#. module: event
#: field:event.event,register_max:0
#: field:report.event.registration,register_max:0
msgid "Maximum Registrations"
-msgstr ""
+msgstr "Maks. registreerimised"
#. module: event
#: field:event.event,type:0
msgid "Type"
-msgstr ""
+msgstr "Tüüp"
#. module: event
#: help:event.event,mail_registr:0
msgid "This email will be sent when someone subscribes to the event."
-msgstr ""
+msgstr "See e-kiri saadetakse, kui keegi ühineb sündmusega."
#. module: event
#: model:product.template,name:event.event_product_2_product_template
msgid "Ticket for Conference"
-msgstr ""
+msgstr "Pilet konverentsile"
#. module: event
#: field:event.registration,case_id:0
msgid "Case"
-msgstr ""
+msgstr "Juhtum"
#. module: event
#: view:event.event:0
msgid "Name"
-msgstr ""
+msgstr "Nimi"
#. module: event
#: help:event.event,mail_auto_confirm:0
@@ -554,6 +556,8 @@ msgid ""
"Check this box if you want ot use the automatic confirmation emailing or the "
"reminder"
msgstr ""
+"Märgi see kast, kui sa tahad automaatset kinnitamise või meeldetuletuse "
+"kirja saatmist."
#. module: event
#: help:event.event,mail_confirm:0
@@ -562,55 +566,57 @@ msgid ""
"subscribes to a confirmed event. This is also the email sent to remind "
"someone about the event."
msgstr ""
+"See e-kiri saadetakse, kui sündmus kinnitatakse või keegi ühineb kinnitatud "
+"sündmusega. See on ka kiri, mis saaadetakse sündmuse meelde tuletuseks."
#. module: event
#: field:event.event,product_id:0
msgid "Product"
-msgstr ""
+msgstr "Toode"
#. module: event
#: field:event.registration,invoice_label:0
msgid "Label Invoice"
-msgstr ""
+msgstr "Märgista arve"
#. module: event
#: view:event.registration:0
msgid "Payments"
-msgstr ""
+msgstr "Maksed"
#. module: event
#: view:event.type:0
#: field:report.event.type.registration,name:0
msgid "Event Type"
-msgstr ""
+msgstr "Sündmuse tüüp"
#. module: event
#: view:event.event:0
#: model:ir.actions.act_window,name:event.action_registration
#: model:ir.actions.wizard,name:event.wizard_event_registration
msgid "Registrations"
-msgstr ""
+msgstr "Registreerimised"
#. module: event
#: model:ir.actions.act_window,name:event.action_event_view_draft
#: model:ir.ui.menu,name:event.menu_event_event_draft
msgid "Draft Events"
-msgstr ""
+msgstr "Sündmuste mustandid"
#. module: event
#: model:ir.ui.menu,name:event.menu_event_main
msgid "Events Organisation"
-msgstr ""
+msgstr "Sündmuste organiseerimine"
#. module: event
#: view:event.registration:0
msgid "Actions"
-msgstr ""
+msgstr "Toimingud"
#. module: event
#: model:ir.actions.wizard,name:event.wizard_event_reg_partners
msgid "List Register Partners"
-msgstr ""
+msgstr "Registreeritud partnerite nimekiri"
#. module: event
#: constraint:product.product:0
@@ -620,4 +626,4 @@ msgstr "Viga: Vigane EAN kood"
#. module: event
#: view:event.event:0
msgid "Auto Registration Email"
-msgstr ""
+msgstr "Automaatne registreerimise e-kiri"
diff --git a/addons/hr/i18n/hr.po b/addons/hr/i18n/hr.po
index d342519af6c..b6e0d22d239 100644
--- a/addons/hr/i18n/hr.po
+++ b/addons/hr/i18n/hr.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-06-08 03:41+0000\n"
+"X-Launchpad-Export-Date: 2010-06-09 03:36+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
"Language: hr\n"
diff --git a/addons/hr_evaluation/i18n/hr.po b/addons/hr_evaluation/i18n/hr.po
index 4c93f32f7de..46e439abb22 100644
--- a/addons/hr_evaluation/i18n/hr.po
+++ b/addons/hr_evaluation/i18n/hr.po
@@ -14,7 +14,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-06-08 03:41+0000\n"
+"X-Launchpad-Export-Date: 2010-06-09 03:36+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: hr_evaluation
diff --git a/addons/hr_expense/hr_expense_report.xml b/addons/hr_expense/hr_expense_report.xml
index bad8e790801..9d5f0c3e2c1 100644
--- a/addons/hr_expense/hr_expense_report.xml
+++ b/addons/hr_expense/hr_expense_report.xml
@@ -1,6 +1,6 @@
-
+
diff --git a/addons/hr_timesheet/i18n/hr.po b/addons/hr_timesheet/i18n/hr.po
index 6e180f8cd55..b1b8ed90ca7 100644
--- a/addons/hr_timesheet/i18n/hr.po
+++ b/addons/hr_timesheet/i18n/hr.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-06-08 03:40+0000\n"
+"X-Launchpad-Export-Date: 2010-06-09 03:35+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
"Language: hr\n"
diff --git a/addons/hr_timesheet/wizard/hr_timesheet_print_employee_view.xml b/addons/hr_timesheet/wizard/hr_timesheet_print_employee_view.xml
index d6c7398864a..9b37db8b0c6 100644
--- a/addons/hr_timesheet/wizard/hr_timesheet_print_employee_view.xml
+++ b/addons/hr_timesheet/wizard/hr_timesheet_print_employee_view.xml
@@ -57,7 +57,7 @@
- Print My Timesheet
+ My Timesheet
hr.analytical.timesheet.employee
form
tree,form
diff --git a/addons/hr_timesheet_invoice/i18n/pl.po b/addons/hr_timesheet_invoice/i18n/pl.po
index 2309fa6b3d2..f8b962079b1 100644
--- a/addons/hr_timesheet_invoice/i18n/pl.po
+++ b/addons/hr_timesheet_invoice/i18n/pl.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-06-08 03:41+0000\n"
+"X-Launchpad-Export-Date: 2010-06-09 03:35+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: hr_timesheet_invoice
diff --git a/addons/idea/i18n/hr.po b/addons/idea/i18n/hr.po
index 34c35557cc1..57d37c82a61 100644
--- a/addons/idea/i18n/hr.po
+++ b/addons/idea/i18n/hr.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-06-08 03:40+0000\n"
+"X-Launchpad-Export-Date: 2010-06-09 03:35+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
"Language: hr\n"
diff --git a/addons/l10n_fr/i18n/pl.po b/addons/l10n_fr/i18n/pl.po
index 2638031c7b9..8605f1e63d3 100644
--- a/addons/l10n_fr/i18n/pl.po
+++ b/addons/l10n_fr/i18n/pl.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-06-08 03:40+0000\n"
+"X-Launchpad-Export-Date: 2010-06-09 03:35+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: l10n_fr
diff --git a/addons/lunch/lunch_report.xml b/addons/lunch/lunch_report.xml
index 6503c99a6ea..c5e933847cd 100644
--- a/addons/lunch/lunch_report.xml
+++ b/addons/lunch/lunch_report.xml
@@ -3,7 +3,7 @@
, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME \n"
+"POT-Creation-Date: 2009-08-28 16:01+0000\n"
+"PO-Revision-Date: 2010-06-08 13:08+0000\n"
+"Last-Translator: vir (Open ERP) \n"
+"Language-Team: Hindi \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-09 03:35+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: mrp
+#: field:mrp.production,move_created_ids:0
+msgid "Moves Created"
+msgstr ""
+
+#. module: mrp
+#: rml:mrp.production.order:0
+msgid "No. Of Cycles"
+msgstr ""
+
+#. module: mrp
+#: help:mrp.procurement.compute.all,init,automatic:0
+msgid ""
+"Triggers an automatic procurement for all products that have a virtual stock "
+"under 0. You should probably not use this option, we suggest using a MTO "
+"configuration on products."
+msgstr ""
+
+#. module: mrp
+#: model:ir.module.module,shortdesc:mrp.module_meta_information
+msgid "Manufacturing Resource Planning"
+msgstr ""
+
+#. module: mrp
+#: constraint:ir.actions.act_window:0
+msgid "Invalid model name in the action definition."
+msgstr ""
+
+#. module: mrp
+#: field:mrp.bom.revision,indice:0
+msgid "Revision"
+msgstr ""
+
+#. module: mrp
+#: model:ir.actions.wizard,name:mrp.wiz_mrp_proc2
+#: model:ir.ui.menu,name:mrp.menu_wiz_mrp_proc2
+msgid "Compute Stock Minimum Rules Only"
+msgstr ""
+
+#. module: mrp
+#: model:ir.actions.act_window,name:mrp.mrp_procurement_action5
+#: model:ir.ui.menu,name:mrp.menu_mrp_procurement_action5
+msgid "Exceptions Procurements"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.routing.workcenter:0
+msgid "Routing Workcenters"
+msgstr ""
+
+#. module: mrp
+#: help:mrp.property,composition:0
+msgid "Not used in computations, for information purpose only."
+msgstr ""
+
+#. module: mrp
+#: model:ir.actions.act_window,name:mrp.mrp_routing_action
+#: model:ir.ui.menu,name:mrp.menu_mrp_routing_action
+msgid "Routings"
+msgstr ""
+
+#. module: mrp
+#: field:mrp.production,picking_id:0
+msgid "Packing list"
+msgstr ""
+
+#. module: mrp
+#: model:process.node,name:mrp.process_node_stock0
+msgid "Stockable Stock"
+msgstr ""
+
+#. module: mrp
+#: field:mrp.procurement,origin:0
+#: field:mrp.production,origin:0
+msgid "Origin"
+msgstr "मूल श्रोत"
+
+#. module: mrp
+#: model:ir.ui.menu,name:mrp.menu_mrp_configuration
+#: view:res.company:0
+msgid "Configuration"
+msgstr "कॉन्फ़िगरेशन"
+
+#. module: mrp
+#: field:mrp.production,name:0
+msgid "Reference"
+msgstr "संदर्भ"
+
+#. module: mrp
+#: view:mrp.production:0
+msgid "Finished Products"
+msgstr ""
+
+#. module: mrp
+#: wizard_field:mrp.procurement.compute.all,init,automatic:0
+#: wizard_field:mrp.procurement.orderpoint.compute,init,automatic:0
+msgid "Automatic orderpoint"
+msgstr ""
+
+#. module: mrp
+#: selection:mrp.bom,method:0
+msgid "Set / Pack"
+msgstr ""
+
+#. module: mrp
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "संरचना देखने के लिए अमान्य XML!"
+
+#. module: mrp
+#: help:res.company,security_lead:0
+msgid ""
+"This is the days added to what you promise to customers for security purpose"
+msgstr ""
+
+#. module: mrp
+#: field:mrp.workcenter,costs_hour:0
+msgid "Cost per hour"
+msgstr "मूल्य प्रति घंटा"
+
+#. module: mrp
+#: selection:stock.warehouse.orderpoint,logic:0
+msgid "Best price (not yet active!)"
+msgstr "सर्वश्रेष्ठ (कीमत अभी तक सक्रिय नहीं!)"
+
+#. module: mrp
+#: view:mrp.procurement:0
+msgid "Product & Location"
+msgstr "उत्पाद और स्थान"
+
+#. module: mrp
+#: view:res.company:0
+msgid "MRP & Logistic Scheduler"
+msgstr ""
+
+#. module: mrp
+#: help:mrp.workcenter,capacity_per_cycle:0
+msgid ""
+"Number of operation this workcenter can do in parallel. If this workcenter "
+"represent a team of 5 workers, the capacity per cycle is 5."
+msgstr ""
+
+#. module: mrp
+#: wizard_button:product.product.procurement,init,create:0
+msgid "Ask New Products"
+msgstr "नए उत्पादों के लिए पूछें"
+
+#. module: mrp
+#: model:ir.ui.menu,name:mrp.menu_mrp_reordering
+msgid "Automatic Procurements"
+msgstr ""
+
+#. module: mrp
+#: wizard_field:change_production_qty,confirm,product_qty:0
+#: field:mrp.bom,product_qty:0
+#: field:mrp.production,product_qty:0
+#: field:mrp.production.product.line,product_qty:0
+msgid "Product Qty"
+msgstr "उत्पाद मात्रा"
+
+#. module: mrp
+#: field:mrp.production,move_lines:0
+msgid "Products Consummed"
+msgstr "उत्पादों की खपत"
+
+#. module: mrp
+#: field:mrp.workcenter,costs_cycle_account_id:0
+msgid "Cycle Account"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.workcenter:0
+msgid "Capacity Information"
+msgstr "क्षमता सूचना"
+
+#. module: mrp
+#: selection:mrp.production,state:0
+msgid "Packing Exception"
+msgstr "पैकिंग अपवाद"
+
+#. module: mrp
+#: model:process.node,note:mrp.process_node_orderrfq0
+msgid "A purchase order is created for a sub-contracting demand."
+msgstr ""
+
+#. module: mrp
+#: rml:mrp.production.order:0
+msgid "Destination Location"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.workcenter:0
+msgid "Analytic Accounting"
+msgstr ""
+
+#. module: mrp
+#: model:process.node,note:mrp.process_node_servicemts0
+msgid "Do nothing"
+msgstr "कुछ ना करें"
+
+#. module: mrp
+#: rml:mrp.production.order:0
+msgid "Partner Ref"
+msgstr ""
+
+#. module: mrp
+#: help:mrp.procurement.orderpoint.compute,init,automatic:0
+msgid "If the stock of a product is under 0, it will act like an orderpoint"
+msgstr ""
+
+#. module: mrp
+#: selection:mrp.workcenter.load,init,measure_unit:0
+msgid "Amount in hours"
+msgstr "घंटों में राशि"
+
+#. module: mrp
+#: field:mrp.production,product_lines:0
+msgid "Scheduled goods"
+msgstr "अनुसूचित माल"
+
+#. module: mrp
+#: model:process.transition,note:mrp.process_transition_producttostockrules0
+msgid "you can see the minimum stock rules from product"
+msgstr "आप उत्पाद से न्यूनतम स्टॉक नियमों को देख सकते हैं"
+
+#. module: mrp
+#: selection:mrp.bom,type:0
+msgid "Sets / Phantom"
+msgstr ""
+
+#. module: mrp
+#: wizard_view:mrp.procurement.compute,init:0
+msgid "This wizard will schedule procurements."
+msgstr ""
+
+#. module: mrp
+#: field:mrp.bom,position:0
+msgid "Internal Ref."
+msgstr ""
+
+#. module: mrp
+#: view:mrp.procurement:0
+#: field:mrp.procurement,state:0
+#: field:mrp.production,state:0
+msgid "Status"
+msgstr "स्थिति"
+
+#. module: mrp
+#: model:process.transition,name:mrp.process_transition_stockproduction0
+msgid "Stockable Production Order"
+msgstr ""
+
+#. module: mrp
+#: help:mrp.bom,position:0
+msgid "Reference to a position in an external plan."
+msgstr ""
+
+#. module: mrp
+#: model:process.transition,name:mrp.process_transition_stockrfq0
+msgid "Stockable Request"
+msgstr ""
+
+#. module: mrp
+#: model:process.node,name:mrp.process_node_serviceonorder0
+msgid "Service on Order"
+msgstr ""
+
+#. module: mrp
+#: help:stock.warehouse.orderpoint,product_max_qty:0
+#: help:stock.warehouse.orderpoint,product_min_qty:0
+msgid ""
+"When the virtual stock goes belong the Min Quantity, Open ERP generates a "
+"procurement to bring the virtual stock to the Max Quantity."
+msgstr ""
+
+#. module: mrp
+#: model:process.transition,name:mrp.process_transition_stockmts0
+msgid "Stockable Make to Stock"
+msgstr ""
+
+#. module: mrp
+#: model:ir.actions.act_window,name:mrp.mrp_production_action
+#: model:ir.ui.menu,name:mrp.menu_mrp_production_action
+#: view:mrp.production:0
+msgid "Production Orders"
+msgstr ""
+
+#. module: mrp
+#: rml:bom.structure:0
+#: field:mrp.procurement,product_qty:0
+#: rml:mrp.production.order:0
+#: wizard_field:product.product.procurement,init,qty:0
+msgid "Quantity"
+msgstr ""
+
+#. module: mrp
+#: selection:mrp.procurement,priority:0
+#: selection:mrp.production,priority:0
+msgid "Not urgent"
+msgstr ""
+
+#. module: mrp
+#: model:process.transition,name:mrp.process_transition_procureserviceproduct0
+msgid "Procure Service Product"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.production:0
+msgid "Confirm Production"
+msgstr ""
+
+#. module: mrp
+#: model:process.node,name:mrp.process_node_purchaseprocure0
+#: field:stock.move,procurements:0
+msgid "Procurements"
+msgstr ""
+
+#. module: mrp
+#: model:ir.model,name:mrp.model_mrp_production_product_line
+msgid "Production scheduled products"
+msgstr ""
+
+#. module: mrp
+#: field:mrp.workcenter,timesheet_id:0
+msgid "Working Time"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.procurement:0
+msgid "Details"
+msgstr ""
+
+#. module: mrp
+#: model:process.process,name:mrp.process_process_procurementprocess0
+msgid "Procurement Process"
+msgstr ""
+
+#. module: mrp
+#: field:mrp.production,date_planned_date:0
+msgid "Scheduled Date"
+msgstr ""
+
+#. module: mrp
+#: selection:mrp.procurement,priority:0
+#: selection:mrp.production,priority:0
+msgid "Urgent"
+msgstr ""
+
+#. module: mrp
+#: help:mrp.bom,product_rounding:0
+msgid ""
+"Rounding applied on the product quantity. For integer only values, put 1.0"
+msgstr ""
+
+#. module: mrp
+#: rml:mrp.production.order:0
+msgid "Bill Of Material"
+msgstr ""
+
+#. module: mrp
+#: help:mrp.routing,location_id:0
+msgid ""
+"Keep empty if you produce at the location where the finished products are "
+"needed.Set a location if you produce at a fixed location. This can be a "
+"partner location if you subcontract the manufacturing operations."
+msgstr ""
+
+#. module: mrp
+#: field:mrp.procurement,move_id:0
+msgid "Reservation"
+msgstr ""
+
+#. module: mrp
+#: model:ir.actions.act_window,name:mrp.action2
+msgid "Bill of Materials Structure"
+msgstr ""
+
+#. module: mrp
+#: wizard_field:product.product.procurement,init,product_id:0
+msgid "product"
+msgstr ""
+
+#. module: mrp
+#: selection:mrp.property,composition:0
+msgid "max"
+msgstr ""
+
+#. module: mrp
+#: model:process.transition,name:mrp.process_transition_producttostockrules0
+msgid "Product to stock rules"
+msgstr ""
+
+#. module: mrp
+#: wizard_button:product_price,init,price:0
+msgid "Print product price"
+msgstr ""
+
+#. module: mrp
+#: wizard_view:product.product.procurement,done:0
+msgid "Make Procurement"
+msgstr ""
+
+#. module: mrp
+#: field:mrp.bom.revision,date:0
+msgid "Modification Date"
+msgstr ""
+
+#. module: mrp
+#: help:mrp.workcenter,costs_cycle_account_id:0
+#: help:mrp.workcenter,costs_hour_account_id:0
+msgid ""
+"Complete this only if you want automatic analytic accounting entries on "
+"production orders."
+msgstr ""
+
+#. module: mrp
+#: model:process.transition,note:mrp.process_transition_stockproduction0
+msgid "If Procure method is Make to order and supply method is produce"
+msgstr ""
+
+#. module: mrp
+#: field:res.company,po_lead:0
+msgid "Purchase Lead Time"
+msgstr ""
+
+#. module: mrp
+#: field:mrp.routing,location_id:0
+msgid "Production Location"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.production:0
+msgid "Change Qty"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.production:0
+msgid "Force Reservation"
+msgstr ""
+
+#. module: mrp
+#: field:mrp.bom.revision,author_id:0
+msgid "Author"
+msgstr ""
+
+#. module: mrp
+#: model:process.transition,name:mrp.process_transition_stockproduct0
+msgid "Stockable Product Stock"
+msgstr ""
+
+#. module: mrp
+#: field:mrp.bom,product_uos:0
+#: field:mrp.production.product.line,product_uos:0
+msgid "Product UOS"
+msgstr ""
+
+#. module: mrp
+#: model:process.transition,name:mrp.process_transition_productionprocureproducts0
+msgid "Production Procure Products"
+msgstr ""
+
+#. module: mrp
+#: model:process.process,name:mrp.process_process_serviceproductprocess0
+msgid "Service Product Process"
+msgstr ""
+
+#. module: mrp
+#: model:process.transition,note:mrp.process_transition_purchaseprocure0
+msgid "Procurement convert into the draft purchase order."
+msgstr ""
+
+#. module: mrp
+#: field:mrp.procurement,message:0
+msgid "Latest error"
+msgstr ""
+
+#. module: mrp
+#: field:mrp.bom,bom_lines:0
+msgid "BoM Lines"
+msgstr ""
+
+#. module: mrp
+#: field:mrp.workcenter,time_start:0
+msgid "Time before prod."
+msgstr ""
+
+#. module: mrp
+#: model:ir.model,name:mrp.model_mrp_routing_workcenter
+msgid "Routing workcenter usage"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.production:0
+msgid "Consumed Products"
+msgstr ""
+
+#. module: mrp
+#: constraint:mrp.bom:0
+msgid "Error ! You can not create recursive BoM."
+msgstr ""
+
+#. module: mrp
+#: model:process.transition,note:mrp.process_transition_stockmts0
+#: model:process.transition,note:mrp.process_transition_stockrfq0
+msgid "If Product type is Stockable and procure method is make to stock"
+msgstr ""
+
+#. module: mrp
+#: field:res.company,manufacturing_lead:0
+msgid "Manufacturity Lead Time"
+msgstr ""
+
+#. module: mrp
+#: model:ir.actions.act_window,name:mrp.mrp_procurement_action4
+#: model:ir.ui.menu,name:mrp.menu_mrp_procurement_action4
+msgid "Exceptions Procurements to Fix"
+msgstr ""
+
+#. module: mrp
+#: selection:mrp.procurement,state:0
+msgid "Ready"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.routing:0
+msgid "Workcenter Operations"
+msgstr ""
+
+#. module: mrp
+#: model:ir.actions.act_window,name:mrp.mrp_production_action2_gantt
+#: model:ir.ui.menu,name:mrp.menu_production_orders_start_gantt
+msgid "Production Orders Planning"
+msgstr ""
+
+#. module: mrp
+#: help:mrp.workcenter,time_efficiency:0
+msgid "Factor that multiplies all times expressed in the workcenter."
+msgstr ""
+
+#. module: mrp
+#: help:mrp.workcenter,time_cycle:0
+msgid "Time in hours for doing one cycle."
+msgstr ""
+
+#. module: mrp
+#: field:mrp.production,date_finnished:0
+msgid "End Date"
+msgstr ""
+
+#. module: mrp
+#: help:mrp.production,picking_id:0
+msgid ""
+"This is the internal picking list take bring the raw materials to the "
+"production plan."
+msgstr ""
+
+#. module: mrp
+#: selection:mrp.production,state:0
+msgid "In Production"
+msgstr ""
+
+#. module: mrp
+#: field:stock.warehouse.orderpoint,qty_multiple:0
+msgid "Qty Multiple"
+msgstr ""
+
+#. module: mrp
+#: selection:mrp.procurement,state:0
+msgid "Waiting"
+msgstr ""
+
+#. module: mrp
+#: model:ir.model,name:mrp.model_mrp_routing
+#: field:mrp.bom,routing_id:0
+#: field:mrp.production,routing_id:0
+#: view:mrp.routing:0
+#: model:process.node,name:mrp.process_node_routing0
+msgid "Routing"
+msgstr ""
+
+#. module: mrp
+#: wizard_button:mrp.workcenter.load,init,report:0
+msgid "Print"
+msgstr ""
+
+#. module: mrp
+#: field:mrp.workcenter,type:0
+msgid "Type"
+msgstr ""
+
+#. module: mrp
+#: model:process.node,note:mrp.process_node_stockproduct0
+#: model:process.node,note:mrp.process_node_stockproduct1
+msgid "For stockable and consumable"
+msgstr ""
+
+#. module: mrp
+#: selection:mrp.workcenter.load,init,time_unit:0
+msgid "Per month"
+msgstr ""
+
+#. module: mrp
+#: field:mrp.procurement,product_uos_qty:0
+msgid "UoS Quantity"
+msgstr ""
+
+#. module: mrp
+#: rml:bom.structure:0
+msgid "Product Name"
+msgstr ""
+
+#. module: mrp
+#: rml:mrp.production.order:0
+msgid "Printing date"
+msgstr ""
+
+#. module: mrp
+#: model:process.node,name:mrp.process_node_orderrfq0
+#: model:process.node,name:mrp.process_node_rfq0
+msgid "RFQ"
+msgstr ""
+
+#. module: mrp
+#: field:mrp.bom,revision_type:0
+msgid "indice type"
+msgstr ""
+
+#. module: mrp
+#: model:process.node,note:mrp.process_node_production0
+msgid "Production orders are created for the product manufacturing."
+msgstr ""
+
+#. module: mrp
+#: rml:mrp.production.order:0
+msgid "WorkCenter"
+msgstr ""
+
+#. module: mrp
+#: field:stock.warehouse.orderpoint,product_min_qty:0
+msgid "Min Quantity"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.production:0
+msgid "Production orders"
+msgstr ""
+
+#. module: mrp
+#: field:mrp.bom,child_complete_ids:0
+#: field:mrp.bom,child_ids:0
+msgid "BoM Hyerarchy"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.procurement:0
+msgid "Procurement Lines"
+msgstr ""
+
+#. module: mrp
+#: model:process.transition,note:mrp.process_transition_servicemts0
+msgid "If Product type is service and procure method is Make to stock"
+msgstr ""
+
+#. module: mrp
+#: model:process.node,note:mrp.process_node_serviceproduct0
+#: model:process.node,note:mrp.process_node_serviceproduct1
+msgid "If Product type is service"
+msgstr ""
+
+#. module: mrp
+#: field:res.company,security_lead:0
+msgid "Security Days"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.production:0
+#: field:mrp.production,cycle_total:0
+msgid "Total Cycles"
+msgstr ""
+
+#. module: mrp
+#: selection:mrp.production,state:0
+msgid "Ready to Produce"
+msgstr ""
+
+#. module: mrp
+#: field:mrp.bom.revision,name:0
+msgid "Modification name"
+msgstr ""
+
+#. module: mrp
+#: field:mrp.bom,type:0
+msgid "BoM Type"
+msgstr ""
+
+#. module: mrp
+#: selection:mrp.procurement,state:0
+msgid "Exception"
+msgstr ""
+
+#. module: mrp
+#: wizard_view:product.product.procurement,init:0
+msgid ""
+"This wizard will planify the procurement for this product. This procurement "
+"may generate task, production orders or purchase orders."
+msgstr ""
+
+#. module: mrp
+#: model:process.node,note:mrp.process_node_mts0
+msgid "The system waits for requested products in stock."
+msgstr ""
+
+#. module: mrp
+#: model:process.transition,name:mrp.process_transition_servicemto0
+msgid "Serivce Stockable Order"
+msgstr ""
+
+#. module: mrp
+#: model:process.transition,note:mrp.process_transition_minimumstockprocure0
+msgid "From minimum stock rules, it goes for procure product."
+msgstr ""
+
+#. module: mrp
+#: model:process.node,name:mrp.process_node_stockproduct0
+#: model:process.node,name:mrp.process_node_stockproduct1
+msgid "Stockable Product"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.production:0
+msgid "Production done"
+msgstr ""
+
+#. module: mrp
+#: rml:bom.structure:0
+#: field:mrp.bom,code:0
+#: field:mrp.routing,code:0
+#: field:mrp.workcenter,code:0
+msgid "Code"
+msgstr ""
+
+#. module: mrp
+#: rml:mrp.production.order:0
+msgid "No. Of Hours"
+msgstr ""
+
+#. module: mrp
+#: model:ir.model,name:mrp.model_mrp_property_group
+#: field:mrp.property,group_id:0
+#: field:mrp.property.group,name:0
+msgid "Property Group"
+msgstr ""
+
+#. module: mrp
+#: field:mrp.bom,bom_id:0
+msgid "Parent BoM"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.procurement:0
+msgid "References"
+msgstr ""
+
+#. module: mrp
+#: wizard_button:change_production_qty,confirm,end:0
+#: view:mrp.procurement:0
+#: selection:mrp.procurement,state:0
+#: wizard_button:mrp.procurement.compute,init,end:0
+#: wizard_button:mrp.procurement.compute.all,init,end:0
+#: wizard_button:mrp.procurement.orderpoint.compute,init,end:0
+#: view:mrp.production:0
+#: wizard_button:mrp.workcenter.load,init,end:0
+#: wizard_button:product.product.procurement,init,end:0
+#: wizard_button:product_price,init,end:0
+msgid "Cancel"
+msgstr ""
+
+#. module: mrp
+#: field:mrp.production,move_prod_id:0
+msgid "Move product"
+msgstr ""
+
+#. module: mrp
+#: selection:mrp.workcenter,type:0
+msgid "Machine"
+msgstr ""
+
+#. module: mrp
+#: model:process.node,name:mrp.process_node_servicemts0
+msgid "Make to stock"
+msgstr ""
+
+#. module: mrp
+#: field:mrp.workcenter,name:0
+msgid "Workcenter Name"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.production:0
+msgid "Start Production"
+msgstr ""
+
+#. module: mrp
+#: selection:mrp.property,composition:0
+msgid "min"
+msgstr ""
+
+#. module: mrp
+#: help:mrp.workcenter,note:0
+msgid ""
+"Description of the workcenter. Explain here what's a cycle according to this "
+"workcenter."
+msgstr ""
+
+#. module: mrp
+#: rml:bom.structure:0
+msgid "-"
+msgstr ""
+
+#. module: mrp
+#: selection:mrp.workcenter,type:0
+msgid "Human Resource"
+msgstr ""
+
+#. module: mrp
+#: model:ir.actions.act_window,name:mrp.mrp_workcenter_action
+#: model:ir.ui.menu,name:mrp.menu_mrp_workcenter_action
+#: field:mrp.routing,workcenter_lines:0
+msgid "Workcenters"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.procurement:0
+msgid "UOM"
+msgstr ""
+
+#. module: mrp
+#: selection:mrp.procurement,procure_method:0
+msgid "on order"
+msgstr ""
+
+#. module: mrp
+#: model:ir.actions.wizard,name:mrp.wiz_mrp_proc0
+#: model:ir.ui.menu,name:mrp.mrp_Sched_all
+msgid "Compute All Schedulers"
+msgstr ""
+
+#. module: mrp
+#: field:mrp.production.workcenter.line,cycle:0
+msgid "Nbr of cycle"
+msgstr ""
+
+#. module: mrp
+#: field:mrp.bom,name:0
+#: field:mrp.procurement,name:0
+#: rml:mrp.production.order:0
+#: field:mrp.production.product.line,name:0
+#: field:mrp.property,name:0
+#: field:mrp.routing,name:0
+#: field:mrp.routing.workcenter,name:0
+#: field:stock.warehouse.orderpoint,name:0
+msgid "Name"
+msgstr ""
+
+#. module: mrp
+#: field:mrp.routing.workcenter,cycle_nbr:0
+msgid "Number of Cycle"
+msgstr ""
+
+#. module: mrp
+#: wizard_field:mrp.workcenter.load,init,measure_unit:0
+msgid "Amount measuring unit"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.procurement:0
+msgid "Run procurement"
+msgstr ""
+
+#. module: mrp
+#: help:res.company,schedule_range:0
+msgid ""
+"This is the time frame analysed by the scheduler when computing "
+"procurements. All procurement that are not between today and today+range are "
+"skipped for futur computation."
+msgstr ""
+
+#. module: mrp
+#: field:mrp.workcenter,time_efficiency:0
+msgid "Time Efficiency"
+msgstr ""
+
+#. module: mrp
+#: help:res.company,manufacturing_lead:0
+msgid "Security days for each manufacturing operation."
+msgstr ""
+
+#. module: mrp
+#: wizard_view:mrp.procurement.compute.all,init:0
+msgid "Scheduler Parameters"
+msgstr ""
+
+#. module: mrp
+#: help:mrp.routing.workcenter,cycle_nbr:0
+msgid "A cycle is defined in the workcenter definition."
+msgstr ""
+
+#. module: mrp
+#: selection:mrp.workcenter.load,init,measure_unit:0
+msgid "Amount in cycles"
+msgstr ""
+
+#. module: mrp
+#: field:mrp.production,location_dest_id:0
+msgid "Finished Products Location"
+msgstr ""
+
+#. module: mrp
+#: wizard_field:product.product.procurement,init,uom_id:0
+msgid "Unit of Measure"
+msgstr ""
+
+#. module: mrp
+#: field:mrp.procurement,procure_method:0
+msgid "Procurement Method"
+msgstr ""
+
+#. module: mrp
+#: field:mrp.workcenter,costs_journal_id:0
+msgid "Analytic Journal"
+msgstr ""
+
+#. module: mrp
+#: selection:mrp.workcenter.load,init,time_unit:0
+msgid "Per week"
+msgstr ""
+
+#. module: mrp
+#: wizard_button:mrp.procurement.compute,init,compute:0
+#: wizard_button:mrp.procurement.compute.all,init,compute:0
+#: wizard_button:mrp.procurement.orderpoint.compute,init,compute:0
+msgid "Compute Procurements"
+msgstr ""
+
+#. module: mrp
+#: model:process.node,note:mrp.process_node_stock0
+msgid "Wait for available products for reservation"
+msgstr ""
+
+#. module: mrp
+#: wizard_button:change_production_qty,confirm,validate:0
+msgid "Validate"
+msgstr ""
+
+#. module: mrp
+#: model:process.transition,name:mrp.process_transition_purchaseprocure0
+msgid "Procurement Purchase"
+msgstr ""
+
+#. module: mrp
+#: field:mrp.production.workcenter.line,hour:0
+msgid "Nbr of hour"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.procurement:0
+msgid "Notes"
+msgstr ""
+
+#. module: mrp
+#: model:ir.model,name:mrp.model_mrp_bom
+#: view:mrp.bom:0
+#: field:mrp.production,bom_id:0
+msgid "Bill of Material"
+msgstr ""
+
+#. module: mrp
+#: wizard_view:mrp.workcenter.load,init:0
+msgid "Select time unit"
+msgstr ""
+
+#. module: mrp
+#: wizard_field:product_price,init,number:0
+msgid "Number of products to produce"
+msgstr ""
+
+#. module: mrp
+#: help:mrp.production,location_dest_id:0
+msgid "Location where the system will stock the finished products."
+msgstr ""
+
+#. module: mrp
+#: model:process.transition,name:mrp.process_transition_billofmaterialrouting0
+msgid "Material routing"
+msgstr ""
+
+#. module: mrp
+#: selection:mrp.workcenter.load,init,time_unit:0
+msgid "Day by day"
+msgstr ""
+
+#. module: mrp
+#: model:process.node,name:mrp.process_node_productminimumstockrule0
+msgid "Minimum stock rule"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.bom:0
+msgid "Revisions"
+msgstr ""
+
+#. module: mrp
+#: field:mrp.bom,product_efficiency:0
+msgid "Product Efficiency"
+msgstr ""
+
+#. module: mrp
+#: model:ir.model,name:mrp.model_stock_warehouse_orderpoint
+msgid "Orderpoint minimum rule"
+msgstr ""
+
+#. module: mrp
+#: model:process.transition,name:mrp.process_transition_servicemts0
+msgid "Service Make to Stock"
+msgstr ""
+
+#. module: mrp
+#: field:mrp.production,sale_ref:0
+msgid "Sale Ref"
+msgstr ""
+
+#. module: mrp
+#: field:mrp.procurement,priority:0
+#: field:mrp.production,priority:0
+#: rml:mrp.production.order:0
+msgid "Priority"
+msgstr ""
+
+#. module: mrp
+#: field:mrp.procurement,location_id:0
+#: field:stock.warehouse.orderpoint,location_id:0
+msgid "Location"
+msgstr ""
+
+#. module: mrp
+#: model:ir.actions.act_window,name:mrp.mrp_procurement_new
+#: model:ir.ui.menu,name:mrp.menu_mrp_procurement_new
+msgid "New Procurement"
+msgstr ""
+
+#. module: mrp
+#: rml:mrp.production.order:0
+msgid "Production Order N° :"
+msgstr ""
+
+#. module: mrp
+#: selection:mrp.workcenter,type:0
+msgid "Tool"
+msgstr ""
+
+#. module: mrp
+#: help:mrp.production,location_src_id:0
+msgid ""
+"Location where the system will look for products used in raw materials."
+msgstr ""
+
+#. module: mrp
+#: rml:mrp.production.order:0
+#: wizard_field:product.product.procurement,init,date_planned:0
+msgid "Planned Date"
+msgstr ""
+
+#. module: mrp
+#: model:process.node,note:mrp.process_node_purchaseprocure0
+msgid "Procurement orders"
+msgstr ""
+
+#. module: mrp
+#: model:process.node,name:mrp.process_node_mts0
+msgid "Make to Stock"
+msgstr ""
+
+#. module: mrp
+#: model:process.transition,note:mrp.process_transition_servicemto0
+msgid "If product type is service and procure method is Make to order"
+msgstr ""
+
+#. module: mrp
+#: field:res.company,schedule_range:0
+msgid "Scheduler Range"
+msgstr ""
+
+#. module: mrp
+#: field:stock.warehouse.orderpoint,product_max_qty:0
+msgid "Max Quantity"
+msgstr ""
+
+#. module: mrp
+#: model:ir.model,name:mrp.model_mrp_procurement
+#: view:mrp.procurement:0
+msgid "Procurement"
+msgstr ""
+
+#. module: mrp
+#: model:ir.actions.wizard,name:mrp.product_procurement_wizard
+msgid "Procurement Request"
+msgstr ""
+
+#. module: mrp
+#: model:ir.actions.wizard,name:mrp.wizard_price
+msgid "Product Cost Structure"
+msgstr ""
+
+#. module: mrp
+#: model:process.transition,name:mrp.process_transition_minimumstockprocure0
+msgid "Minimum Stock Procure"
+msgstr ""
+
+#. module: mrp
+#: help:res.company,po_lead:0
+msgid "This is the leads/security time for each purchase order."
+msgstr ""
+
+#. module: mrp
+#: view:mrp.bom:0
+msgid "BoM Structure"
+msgstr ""
+
+#. module: mrp
+#: field:mrp.production,date_start:0
+msgid "Start Date"
+msgstr ""
+
+#. module: mrp
+#: field:mrp.workcenter,costs_hour_account_id:0
+msgid "Hour Account"
+msgstr ""
+
+#. module: mrp
+#: selection:mrp.bom,revision_type:0
+msgid "alphabetical indices"
+msgstr ""
+
+#. module: mrp
+#: model:process.node,note:mrp.process_node_productionorder0
+msgid "Procurement for raw materials."
+msgstr ""
+
+#. module: mrp
+#: view:mrp.procurement:0
+#: field:mrp.procurement,note:0
+#: rml:mrp.production.order:0
+msgid "Note"
+msgstr ""
+
+#. module: mrp
+#: model:process.transition,name:mrp.process_transition_procurestockableproduct0
+msgid "Procure Stockable Product"
+msgstr ""
+
+#. module: mrp
+#: field:mrp.bom,method:0
+msgid "Method"
+msgstr ""
+
+#. module: mrp
+#: wizard_view:product_price,init:0
+msgid "Paid ?"
+msgstr ""
+
+#. module: mrp
+#: model:process.node,note:mrp.process_node_routing0
+msgid "Define a routing to describe the manufacturing steps."
+msgstr ""
+
+#. module: mrp
+#: field:mrp.bom,active:0
+#: field:mrp.routing,active:0
+#: field:mrp.workcenter,active:0
+#: field:stock.warehouse.orderpoint,active:0
+msgid "Active"
+msgstr ""
+
+#. module: mrp
+#: model:process.node,name:mrp.process_node_procureproducts0
+msgid "Procure Products"
+msgstr ""
+
+#. module: mrp
+#: model:ir.actions.act_window,name:mrp.mrp_property_action
+#: model:ir.ui.menu,name:mrp.menu_mrp_property_action
+#: model:ir.ui.menu,name:mrp.menu_mrp_property_group_action_prop
+#: view:mrp.bom:0
+#: field:mrp.bom,property_ids:0
+#: view:mrp.procurement:0
+#: field:mrp.procurement,property_ids:0
+#: view:mrp.property:0
+msgid "Properties"
+msgstr ""
+
+#. module: mrp
+#: field:mrp.procurement,date_planned:0
+#: field:mrp.production,date_planned:0
+msgid "Scheduled date"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.procurement:0
+#: view:mrp.production:0
+msgid "Extra Information"
+msgstr ""
+
+#. module: mrp
+#: model:process.node,note:mrp.process_node_billofmaterial0
+msgid "Define the product structure, with sub-products and/or components."
+msgstr ""
+
+#. module: mrp
+#: model:process.node,note:mrp.process_node_minimumstockrule0
+msgid ""
+"Procurement is created if the product quantity is lower than the minimum "
+"limit."
+msgstr ""
+
+#. module: mrp
+#: field:mrp.procurement,date_close:0
+msgid "Date Closed"
+msgstr ""
+
+#. module: mrp
+#: field:mrp.workcenter,costs_general_account_id:0
+msgid "General Account"
+msgstr ""
+
+#. module: mrp
+#: field:mrp.property,composition:0
+msgid "Properties composition"
+msgstr ""
+
+#. module: mrp
+#: model:ir.actions.act_window,name:mrp.mrp_production_action4
+#: model:ir.ui.menu,name:mrp.menu_production_orders_waiting4
+msgid "Production Orders Waiting Products"
+msgstr ""
+
+#. module: mrp
+#: rml:mrp.production.order:0
+msgid "SO Number"
+msgstr ""
+
+#. module: mrp
+#: model:ir.actions.wizard,name:mrp.wizard_change_production_qty
+msgid "Change Product Qty."
+msgstr ""
+
+#. module: mrp
+#: selection:mrp.procurement,state:0
+#: selection:mrp.production,state:0
+msgid "Done"
+msgstr ""
+
+#. module: mrp
+#: help:stock.warehouse.orderpoint,qty_multiple:0
+msgid "The procurement quantity will by rounded up to this multiple."
+msgstr ""
+
+#. module: mrp
+#: field:stock.warehouse.orderpoint,logic:0
+msgid "Reordering Mode"
+msgstr ""
+
+#. module: mrp
+#: constraint:ir.model:0
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
+msgstr ""
+
+#. module: mrp
+#: model:process.node,note:mrp.process_node_procureproducts0
+msgid "Central document to procure products"
+msgstr ""
+
+#. module: mrp
+#: model:ir.actions.act_window,name:mrp.mrp_production_action3
+#: model:ir.ui.menu,name:mrp.menu_mrp_production_action3
+msgid "Production Orders in Progress"
+msgstr ""
+
+#. module: mrp
+#: model:ir.actions.act_window,name:mrp.act_product_product_2_stock_warehouse_orderpoint
+#: model:ir.actions.act_window,name:mrp.act_stock_warehouse_2_stock_warehouse_orderpoint
+#: model:ir.actions.act_window,name:mrp.action_orderpoint_form
+#: model:ir.ui.menu,name:mrp.menu_action_orderpoint_form
+#: view:stock.warehouse.orderpoint:0
+msgid "Minimum Stock Rules"
+msgstr ""
+
+#. module: mrp
+#: field:mrp.workcenter,capacity_per_cycle:0
+msgid "Capacity per Cycle"
+msgstr ""
+
+#. module: mrp
+#: field:mrp.bom,product_id:0
+#: field:mrp.procurement,product_id:0
+#: field:mrp.production,product_id:0
+#: rml:mrp.production.order:0
+#: field:mrp.production.product.line,product_id:0
+#: field:stock.warehouse.orderpoint,product_id:0
+msgid "Product"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.production:0
+#: field:mrp.production,hour_total:0
+msgid "Total Hours"
+msgstr ""
+
+#. module: mrp
+#: field:mrp.production,location_src_id:0
+msgid "Raw Materials Location"
+msgstr ""
+
+#. module: mrp
+#: model:ir.actions.act_window,name:mrp.action_product_bom_structure
+msgid "Product BoM Structure"
+msgstr ""
+
+#. module: mrp
+#: field:mrp.bom,product_uom:0
+#: field:mrp.production,product_uom:0
+#: field:mrp.production.product.line,product_uom:0
+#: field:stock.warehouse.orderpoint,product_uom:0
+msgid "Product UOM"
+msgstr ""
+
+#. module: mrp
+#: help:mrp.procurement,origin:0
+msgid ""
+"Reference of the document that created this procurement.\n"
+"This is automatically completed by Open ERP."
+msgstr ""
+
+#. module: mrp
+#: view:mrp.production.lot.line:0
+msgid "Production Products"
+msgstr ""
+
+#. module: mrp
+#: model:process.transition,note:mrp.process_transition_stockproduct0
+msgid "Product type is Stockable and procure method is make to stock"
+msgstr ""
+
+#. module: mrp
+#: help:mrp.bom,date_start:0
+#: help:mrp.bom,date_stop:0
+msgid "Validity of this BoM or component. Keep empty if it's always valid."
+msgstr ""
+
+#. module: mrp
+#: field:mrp.procurement,product_uos:0
+#: field:mrp.production,product_uos:0
+msgid "Product UoS"
+msgstr ""
+
+#. module: mrp
+#: field:mrp.procurement,product_uom:0
+msgid "Product UoM"
+msgstr ""
+
+#. module: mrp
+#: model:ir.model,name:mrp.model_mrp_workcenter
+#: field:mrp.production.workcenter.line,workcenter_id:0
+#: field:mrp.routing.workcenter,workcenter_id:0
+#: view:mrp.workcenter:0
+msgid "Workcenter"
+msgstr ""
+
+#. module: mrp
+#: selection:mrp.procurement,priority:0
+#: selection:mrp.production,priority:0
+msgid "Very Urgent"
+msgstr ""
+
+#. module: mrp
+#: field:mrp.procurement,purchase_id:0
+#: field:stock.warehouse.orderpoint,procurement_id:0
+msgid "Purchase Order"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.production:0
+msgid "Production Workcenters"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.property.group:0
+msgid "Properties categories"
+msgstr ""
+
+#. module: mrp
+#: help:mrp.procurement,procure_method:0
+msgid ""
+"If you encode manually a procurement, you probably want to use a make to "
+"order method."
+msgstr ""
+
+#. module: mrp
+#: rml:mrp.production.order:0
+msgid "Source Location"
+msgstr ""
+
+#. module: mrp
+#: model:process.transition,name:mrp.process_transition_servicerfq0
+msgid "Stockable Order Request"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.production:0
+#: view:mrp.production.product.line:0
+msgid "Scheduled Products"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.production.lot.line:0
+msgid "Production Products Consommation"
+msgstr ""
+
+#. module: mrp
+#: selection:mrp.bom,revision_type:0
+msgid "numeric indices"
+msgstr ""
+
+#. module: mrp
+#: model:process.transition,note:mrp.process_transition_servicerfq0
+msgid "If Procure method is Make to order and supply method is buy"
+msgstr ""
+
+#. module: mrp
+#: model:process.transition,note:mrp.process_transition_procurestockableproduct0
+msgid "if Product type is Stockable in procurement order"
+msgstr ""
+
+#. module: mrp
+#: model:ir.model,name:mrp.model_mrp_production_workcenter_line
+#: view:mrp.production:0
+#: rml:mrp.production.order:0
+msgid "Work Orders"
+msgstr ""
+
+#. module: mrp
+#: field:mrp.workcenter,costs_cycle:0
+msgid "Cost per cycle"
+msgstr ""
+
+#. module: mrp
+#: model:ir.model,name:mrp.model_mrp_bom_revision
+msgid "Bill of material revisions"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.procurement:0
+msgid "Planification"
+msgstr ""
+
+#. module: mrp
+#: rml:bom.structure:0
+#: model:process.transition,name:mrp.process_transition_bom0
+msgid "BOM"
+msgstr ""
+
+#. module: mrp
+#: help:mrp.bom,type:0
+msgid ""
+"Use a phantom bill of material in raw materials lines that have to be "
+"automatically computed in on eproduction order and not one per level.If you "
+"put \"Phantom/Set\" at the root level of a bill of material it is considered "
+"as a set or pack: the products are replaced by the components between the "
+"sale order to the picking without going through the production order.The "
+"normal BoM will generate one production order per BoM level."
+msgstr ""
+
+#. module: mrp
+#: field:mrp.workcenter,time_cycle:0
+msgid "Time for 1 cycle (hour)"
+msgstr ""
+
+#. module: mrp
+#: wizard_view:product.product.procurement,done:0
+msgid "Your procurement request has been sent !"
+msgstr ""
+
+#. module: mrp
+#: wizard_view:product.product.procurement,init:0
+msgid "Internal Procurement Request"
+msgstr ""
+
+#. module: mrp
+#: model:ir.actions.report.xml,name:mrp.report_mrp_production_report
+#: field:mrp.production.product.line,production_id:0
+#: field:mrp.production.workcenter.line,production_id:0
+#: model:process.node,name:mrp.process_node_production0
+#: model:process.node,name:mrp.process_node_productionorder0
+msgid "Production Order"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.production:0
+msgid "Compute Data"
+msgstr ""
+
+#. module: mrp
+#: model:ir.actions.act_window,name:mrp.mrp_property_group_action
+#: model:ir.ui.menu,name:mrp.menu_mrp_property_group_action
+msgid "Property Categories"
+msgstr ""
+
+#. module: mrp
+#: model:ir.actions.wizard,name:mrp.wiz_mrp_proc1
+#: model:ir.ui.menu,name:mrp.menu_wiz_mrp_proc1
+msgid "Compute Procurements Only"
+msgstr ""
+
+#. module: mrp
+#: field:mrp.production,product_uos_qty:0
+msgid "Product UoS Qty"
+msgstr ""
+
+#. module: mrp
+#: rml:bom.structure:0
+#: model:ir.actions.report.xml,name:mrp.report_bom_structure
+msgid "BOM Structure"
+msgstr ""
+
+#. module: mrp
+#: field:mrp.bom,date_stop:0
+msgid "Valid Until"
+msgstr ""
+
+#. module: mrp
+#: model:ir.actions.act_window,name:mrp.mrp_procurement_action11
+#: model:ir.ui.menu,name:mrp.menu_mrp_procurement_action11
+msgid "Temporary Procurement Exceptions"
+msgstr ""
+
+#. module: mrp
+#: field:mrp.bom,date_start:0
+msgid "Valid From"
+msgstr ""
+
+#. module: mrp
+#: selection:mrp.bom,type:0
+msgid "Normal BoM"
+msgstr ""
+
+#. module: mrp
+#: field:mrp.bom,product_uos_qty:0
+#: field:mrp.production.product.line,product_uos_qty:0
+msgid "Product UOS Qty"
+msgstr ""
+
+#. module: mrp
+#: selection:mrp.procurement,state:0
+msgid "Confirmed"
+msgstr ""
+
+#. module: mrp
+#: wizard_view:mrp.procurement.compute,init:0
+#: wizard_view:mrp.procurement.orderpoint.compute,init:0
+msgid "Parameters"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.procurement:0
+msgid "Confirm"
+msgstr ""
+
+#. module: mrp
+#: field:mrp.production,workcenter_lines:0
+msgid "Workcenters Utilisation"
+msgstr ""
+
+#. module: mrp
+#: help:mrp.bom,product_efficiency:0
+msgid ""
+"Efficiency on the production. A factor of 0.9 means a loss of 10% in the "
+"production."
+msgstr ""
+
+#. module: mrp
+#: field:mrp.bom,product_rounding:0
+msgid "Product Rounding"
+msgstr ""
+
+#. module: mrp
+#: field:mrp.production.workcenter.line,name:0
+msgid "Work Order"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.production:0
+msgid "Recreate Picking"
+msgstr ""
+
+#. module: mrp
+#: model:process.node,note:mrp.process_node_serviceonorder0
+msgid "If procurement is make to order"
+msgstr ""
+
+#. module: mrp
+#: selection:mrp.bom,method:0
+msgid "On Order"
+msgstr ""
+
+#. module: mrp
+#: model:process.node,name:mrp.process_node_minimumstockrule0
+msgid "Minimum Stock Rule"
+msgstr ""
+
+#. module: mrp
+#: model:ir.actions.act_window,name:mrp.mrp_bom_form_action_new
+#: model:ir.ui.menu,name:mrp.menu_mrp_bom_form_action_new
+msgid "New Bill of Materials"
+msgstr ""
+
+#. module: mrp
+#: field:mrp.workcenter,time_stop:0
+msgid "Time after prod."
+msgstr ""
+
+#. module: mrp
+#: wizard_field:mrp.workcenter.load,init,time_unit:0
+msgid "Type of period"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.production:0
+msgid "Total Qty"
+msgstr ""
+
+#. module: mrp
+#: field:mrp.routing.workcenter,hour_nbr:0
+msgid "Number of Hours"
+msgstr ""
+
+#. module: mrp
+#: model:ir.actions.act_window,name:mrp.mrp_procurement_action
+#: model:ir.ui.menu,name:mrp.menu_mrp_procurement_action
+msgid "Procurement Orders"
+msgstr ""
+
+#. module: mrp
+#: model:ir.model,name:mrp.model_mrp_property
+msgid "Property"
+msgstr ""
+
+#. module: mrp
+#: field:mrp.routing.workcenter,routing_id:0
+msgid "Parent Routing"
+msgstr ""
+
+#. module: mrp
+#: help:mrp.workcenter,time_start:0
+msgid "Time in hours for the setup."
+msgstr ""
+
+#. module: mrp
+#: selection:mrp.production,state:0
+msgid "Canceled"
+msgstr ""
+
+#. module: mrp
+#: selection:mrp.property,composition:0
+msgid "plus"
+msgstr ""
+
+#. module: mrp
+#: field:mrp.bom.revision,bom_id:0
+#: field:mrp.procurement,bom_id:0
+msgid "BoM"
+msgstr ""
+
+#. module: mrp
+#: help:mrp.bom,routing_id:0
+msgid ""
+"The list of operations (list of workcenters) to produce the finished "
+"product. The routing is mainly used to compute workcenter costs during "
+"operations and to plan futur loads on workcenters based on production "
+"plannification."
+msgstr ""
+
+#. module: mrp
+#: selection:mrp.production,state:0
+msgid "Waiting Goods"
+msgstr ""
+
+#. module: mrp
+#: model:process.process,name:mrp.process_process_stockableproductprocess0
+msgid "Stockable Product Process"
+msgstr ""
+
+#. module: mrp
+#: model:ir.actions.act_window,name:mrp.mrp_production_new
+#: model:ir.ui.menu,name:mrp.menu_production_orders_new
+msgid "New Production Order"
+msgstr ""
+
+#. module: mrp
+#: model:process.node,note:mrp.process_node_rfq0
+msgid "A Request for Quotation is created and sent to the supplier."
+msgstr ""
+
+#. module: mrp
+#: field:mrp.bom.revision,last_indice:0
+msgid "last indice"
+msgstr ""
+
+#. module: mrp
+#: field:mrp.bom,revision_ids:0
+#: view:mrp.bom.revision:0
+msgid "BoM Revisions"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.procurement:0
+msgid "Retry"
+msgstr ""
+
+#. module: mrp
+#: selection:mrp.procurement,state:0
+#: selection:mrp.production,state:0
+msgid "Draft"
+msgstr ""
+
+#. module: mrp
+#: selection:mrp.procurement,priority:0
+#: selection:mrp.production,priority:0
+msgid "Normal"
+msgstr ""
+
+#. module: mrp
+#: model:process.transition,note:mrp.process_transition_productionprocureproducts0
+msgid "When any procuere products, it comes into the prpcurement orders"
+msgstr ""
+
+#. module: mrp
+#: model:ir.actions.act_window,name:mrp.mrp_production_action2
+#: model:ir.ui.menu,name:mrp.menu_production_orders_start
+msgid "Production Orders To Start"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.procurement:0
+msgid "Procurement Reason"
+msgstr ""
+
+#. module: mrp
+#: model:process.transition,note:mrp.process_transition_billofmaterialrouting0
+msgid "An entry is being made from billing material to routing."
+msgstr ""
+
+#. module: mrp
+#: help:mrp.workcenter,timesheet_id:0
+msgid "The normal working time of the workcenter."
+msgstr ""
+
+#. module: mrp
+#: selection:stock.warehouse.orderpoint,logic:0
+msgid "Order to Max"
+msgstr ""
+
+#. module: mrp
+#: model:ir.actions.act_window,name:mrp.act_product_product_2_mrp_bom
+#: model:ir.actions.act_window,name:mrp.mrp_bom_form_action
+#: model:ir.ui.menu,name:mrp.menu_mrp_bom_form_action
+#: model:process.node,name:mrp.process_node_billofmaterial0
+msgid "Bill of Materials"
+msgstr ""
+
+#. module: mrp
+#: model:process.transition,note:mrp.process_transition_procureserviceproduct0
+msgid "In procurement order, if product type is service"
+msgstr ""
+
+#. module: mrp
+#: selection:mrp.procurement,procure_method:0
+msgid "from stock"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.bom:0
+#: view:mrp.property:0
+#: view:mrp.property.group:0
+#: view:mrp.routing:0
+#: view:mrp.routing.workcenter:0
+msgid "General Information"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.production:0
+msgid "Productions"
+msgstr ""
+
+#. module: mrp
+#: wizard_button:product.product.procurement,done,end:0
+msgid "Close"
+msgstr ""
+
+#. module: mrp
+#: field:mrp.production,sale_name:0
+msgid "Sale Name"
+msgstr ""
+
+#. module: mrp
+#: model:process.node,note:mrp.process_node_productminimumstockrule0
+msgid "Create minimum stock rules"
+msgstr ""
+
+#. module: mrp
+#: wizard_field:product.product.procurement,init,warehouse_id:0
+#: field:stock.warehouse.orderpoint,warehouse_id:0
+msgid "Warehouse"
+msgstr ""
+
+#. module: mrp
+#: model:ir.model,name:mrp.model_mrp_production
+#: field:stock.move,production_id:0
+msgid "Production"
+msgstr ""
+
+#. module: mrp
+#: model:process.node,name:mrp.process_node_serviceproduct0
+#: model:process.node,name:mrp.process_node_serviceproduct1
+msgid "Service Product"
+msgstr ""
+
+#. module: mrp
+#: field:mrp.procurement,close_move:0
+msgid "Close Move at end"
+msgstr ""
+
+#. module: mrp
+#: wizard_view:change_production_qty,confirm:0
+msgid "Change Product Qty"
+msgstr ""
+
+#. module: mrp
+#: field:mrp.bom.revision,description:0
+#: view:mrp.property:0
+#: field:mrp.property,description:0
+#: field:mrp.property.group,description:0
+#: view:mrp.routing:0
+#: field:mrp.routing,note:0
+#: field:mrp.routing.workcenter,note:0
+#: view:mrp.workcenter:0
+#: field:mrp.workcenter,note:0
+msgid "Description"
+msgstr ""
+
+#. module: mrp
+#: selection:mrp.procurement,state:0
+msgid "Running"
+msgstr ""
+
+#. module: mrp
+#: model:ir.ui.menu,name:mrp.menu_mrp_root
+msgid "Manufacturing"
+msgstr ""
+
+#. module: mrp
+#: model:ir.actions.act_window,name:mrp.mrp_procurement_action3
+#: model:ir.ui.menu,name:mrp.menu_mrp_procurement_action3
+msgid "Unscheduled procurements"
+msgstr ""
+
+#. module: mrp
+#: model:ir.actions.act_window,name:mrp.mrp_bom_tree_action
+#: model:ir.ui.menu,name:mrp.menu_bom_tree
+msgid "Bill of Material Structure"
+msgstr ""
+
+#. module: mrp
+#: model:ir.actions.wizard,name:mrp.wizard_workcenter_load
+msgid "Workcenter load"
+msgstr ""
+
+#. module: mrp
+#: help:mrp.workcenter,time_stop:0
+msgid "Time in hours for the cleaning."
+msgstr ""
+
+#. module: mrp
+#: view:mrp.procurement:0
+msgid "Procurement Details"
+msgstr "खरीद के विवरण"
+
+#. module: mrp
+#: model:process.transition,note:mrp.process_transition_bom0
+msgid "You can see its bill of material which are used to make product"
+msgstr ""
+
+#. module: mrp
+#: field:mrp.production,date_planned_end:0
+msgid "Scheduled End"
+msgstr "अनुसूचित समाप्ति"
+
+#. module: mrp
+#: selection:mrp.bom,method:0
+msgid "On Stock"
+msgstr ""
+
+#. module: mrp
+#: field:mrp.bom,sequence:0
+#: rml:mrp.production.order:0
+#: field:mrp.production.workcenter.line,sequence:0
+#: field:mrp.routing.workcenter,sequence:0
+msgid "Sequence"
+msgstr "अनुक्रम"
+
+#. module: mrp
+#: model:ir.actions.act_window,name:mrp.mrp_bom_form_action2
+#: model:ir.ui.menu,name:mrp.menu_mrp_bom_form_action2
+msgid "Bill of Materials Components"
+msgstr ""
diff --git a/addons/olap/i18n/es.po b/addons/olap/i18n/es.po
index 13fb70934e9..0074a9e2a2d 100644
--- a/addons/olap/i18n/es.po
+++ b/addons/olap/i18n/es.po
@@ -8,13 +8,13 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2009-11-26 05:24+0000\n"
-"PO-Revision-Date: 2010-04-11 22:28+0000\n"
-"Last-Translator: Juan Eduardo Riva \n"
+"PO-Revision-Date: 2010-06-08 14:19+0000\n"
+"Last-Translator: victor tejada yau \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-04-17 04:21+0000\n"
+"X-Launchpad-Export-Date: 2010-06-09 03:36+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: olap
@@ -57,7 +57,7 @@ msgstr ""
#. module: olap
#: field:olap.cube.table,schema_id:0
msgid "Schema id"
-msgstr ""
+msgstr "Schema id"
#. module: olap
#: field:olap.schema,database_id:0
@@ -186,7 +186,7 @@ msgstr ""
#. module: olap
#: field:olap.measure,formatstring:0
msgid "Format string"
-msgstr ""
+msgstr "Formato de cadena"
#. module: olap
#: wizard_button:olap.query_builder,exec,exec:0
@@ -307,17 +307,17 @@ msgstr "Nombre de la aplicación"
#. module: olap
#: field:olap.cube.table,column_link_id:0
msgid "Relational Column"
-msgstr ""
+msgstr "columna relacional"
#. module: olap
#: field:olap.level,type:0
msgid "Level class"
-msgstr ""
+msgstr "Nivel de clase"
#. module: olap
#: field:olap.cube,name:0
msgid "Cube name"
-msgstr ""
+msgstr "nombre de cubo"
#. module: olap
#: model:ir.actions.act_window,name:olap.action_view_olap_application_table_form
diff --git a/addons/process/i18n/hr.po b/addons/process/i18n/hr.po
index 3ddf32b0cdd..eed215147b5 100644
--- a/addons/process/i18n/hr.po
+++ b/addons/process/i18n/hr.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-06-08 03:40+0000\n"
+"X-Launchpad-Export-Date: 2010-06-09 03:35+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
"Language: hr\n"
diff --git a/addons/product_price_unit/__init__.py b/addons/product_price_unit/__init__.py
new file mode 100644
index 00000000000..1ef4ebd8563
--- /dev/null
+++ b/addons/product_price_unit/__init__.py
@@ -0,0 +1,23 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+# OpenERP, Open Source Management Solution
+# Copyright (C) 2004-2010 Tiny SPRL ().
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as
+# published by the Free Software Foundation, either version 3 of the
+# License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program. If not, see .
+#
+##############################################################################
+import product_price_unit
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/product_price_unit/__openerp__.py b/addons/product_price_unit/__openerp__.py
new file mode 100644
index 00000000000..a4be771312d
--- /dev/null
+++ b/addons/product_price_unit/__openerp__.py
@@ -0,0 +1,39 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+# OpenERP, Open Source Management Solution
+# Copyright (C) 2004-2010 Tiny SPRL ().
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as
+# published by the Free Software Foundation, either version 3 of the
+# License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program. If not, see .
+#
+##############################################################################
+
+{
+ "name" : "Product Price Unit",
+ "version" : "1.1",
+ "author" : "Tiny",
+ "category" : "",
+ "depends" : ["base", 'account','hr_expense','mrp', 'sale'],
+ "init_xml" : [],
+ "demo_xml" : [],
+ "description": """
+ """,
+ 'update_xml': [
+ 'product_price_unit_data.xml',
+ 'product_price_unit_view.xml',
+ ],
+ 'installable': True,
+ 'active': False,
+}
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/product_price_unit/product_price_unit.py b/addons/product_price_unit/product_price_unit.py
new file mode 100644
index 00000000000..64439056aca
--- /dev/null
+++ b/addons/product_price_unit/product_price_unit.py
@@ -0,0 +1,1051 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+# OpenERP, Open Source Management Solution
+# Copyright (C) 2004-2010 Tiny SPRL ().
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as
+# published by the Free Software Foundation, either version 3 of the
+# License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program. If not, see .
+#
+##############################################################################
+
+from osv import osv
+from osv import fields
+from tools.translate import _
+import decimal_precision as dp
+import time
+from datetime import datetime
+from dateutil.relativedelta import relativedelta
+
+class product_price_unit(osv.osv):
+ _name = "product.price.unit"
+ _description = 'Product Price Unit'
+ _order = "coefficient asc,name"
+ _columns = {
+ 'code': fields.char('PU', size=3, required=True, translate=True, help="A three characters code to be placed next to the price"),
+ 'coefficient': fields.integer('Coefficient', required=True, help="Values will be calculated as price / coefficient"),
+ 'name': fields.char('Price per Unit', size=32, required=True, translate=True, help="Enter something like: Price for 100 units"),
+ }
+
+product_price_unit()
+
+class product_category(osv.osv):
+ _inherit = "product.category"
+ _name = "product.category"
+
+ _columns = {
+ 'property_stock_location': fields.property('stock.location',
+ relation='stock.location', type='many2one',
+ string='Stock Location', method=True, view_load=True,
+ help="This location will be proposed for the stock move"),
+ 'allow_negative_stock' : fields.boolean('Allow Negative Stock', help="Allows negative stock quantities for this category - use with care !"),
+ }
+product_category()
+
+class product_template(osv.osv):
+ _inherit = "product.template"
+ _name = "product.template"
+
+ def _get_price_unit_id(self, cr, uid, *args):
+ cr.execute('select id from product_price_unit where coefficient = 1')
+ res = cr.fetchone()
+ return res and res[0] or False
+
+ _columns = {
+ 'price_unit_id': fields.many2one('product.price.unit','Price Unit', help="Use if Price is not defined for UoM"),
+ 'standard_price_coeff': fields.float(string='Standard Price/Coeff',digits=(16,8)) ,
+ 'list_price_coeff': fields.float(string='List Price/Coeff',digits=(16,8)),
+ 'property_stock_location': fields.property('stock.location',
+ relation='stock.location', type='many2one',
+ string='Stock Location', method=True, view_load=True,
+ help="This location will be proposed for the stock move"),
+ 'allow_negative_stock' : fields.boolean('Allow Negative Stock', help="Allows negative stock quantities - use with care !"),
+
+ }
+
+ _defaults = {
+ 'price_unit_id': _get_price_unit_id,
+ }
+
+ def init(self, cr):
+ cr.execute("""
+ update product_template
+ set price_unit_id = (select id from product_price_unit where coefficient = 1)
+ where price_unit_id is null
+ and exists (select id from product_price_unit where coefficient = 1)"""
+ )
+
+product_template()
+
+class product_product(osv.osv):
+ _name = "product.product"
+ _inherit = "product.product"
+
+ def _avg_price(self, cr, uid, ids, field_names=None, arg=False, context={}):
+ res = {}
+ for product in self.browse(cr, uid, ids, context=context):
+ avg_price = 0.0
+ value = self._stock_value( cr, uid, [product.id], ['stock_value',], arg, context)[product.id]['stock_value']
+ qty = self._product_available( cr, uid, ids, ['qty_available',], arg, context)[product.id]['qty_available']
+ if qty > 0.0 and value > 0.0:
+ pu = self.pool.get('product.price.unit').browse(cr, uid, product.price_unit_id.id)
+ coeff = pu.coefficient
+ avg_price = value / qty * coeff
+ res[product.id] = avg_price
+ return res
+
+ def get_stock_value(self, cr, uid, ids, context=None):
+ if not context:
+ context = {}
+ states=context.get('states',[])
+ what=context.get('what',())
+ if not ids:
+ ids = self.search(cr, uid, [])
+ res = {}.fromkeys(ids, 0.0)
+ if not ids:
+ return res
+
+ if context.get('shop', False):
+ cr.execute('select warehouse_id from sale_shop where id=%s', (int(context['shop']),))
+ res2 = cr.fetchone()
+ if res2:
+ context['warehouse'] = res2[0]
+
+ if context.get('warehouse', False):
+ cr.execute('select lot_stock_id from stock_warehouse where id=%s', (int(context['warehouse']),))
+ res2 = cr.fetchone()
+ if res2:
+ context['location'] = res2[0]
+
+ if context.get('location', False):
+ if type(context['location']) == type(1):
+ location_ids = [context['location']]
+ else:
+ location_ids = context['location']
+ else:
+ cr.execute("select lot_stock_id from stock_warehouse")
+ location_ids = [id for (id,) in cr.fetchall()]
+
+ # build the list of ids of children of the location given by id
+ if context.get('compute_child',True):
+ child_location_ids = self.pool.get('stock.location').search(cr, uid, [('location_id', 'child_of', location_ids)])
+ location_ids= len(child_location_ids) and child_location_ids or location_ids
+ else:
+ location_ids= location_ids
+
+ states_str = ','.join(map(lambda s: "'%s'" % s, states))
+
+ uoms_o = {}
+ product2uom = {}
+ for product in self.browse(cr, uid, ids, context=context):
+ product2uom[product.id] = product.uom_id.id
+ uoms_o[product.uom_id.id] = product.uom_id
+
+ prod_ids_str = ','.join(map(str, ids))
+ location_ids_str = ','.join(map(str, location_ids))
+ results = []
+ results2 = []
+
+ from_date=context.get('from_date',False)
+ to_date=context.get('to_date',False)
+ date_str=False
+ if from_date and to_date:
+ date_str="date_planned>='%s' and date_planned<='%s'"%(from_date,to_date)
+ elif from_date:
+ date_str="date_planned>='%s'"%(from_date)
+ elif to_date:
+ date_str="date_planned<='%s'"%(to_date)
+
+ cr.execute(
+ 'select sum('\
+ 'case when location_dest_id in ('+location_ids_str+') then move_value else 0 end + '\
+ 'case when location_id in ('+location_ids_str+') then -move_value else 0 end '\
+ '), product_id '\
+ 'from stock_move '\
+ 'where (location_id in ('+location_ids_str+') '\
+ 'or location_dest_id in ('+location_ids_str+')) '\
+ 'and product_id in ('+prod_ids_str+') '\
+ 'and state in ('+states_str+') '+ (date_str and 'and '+date_str+' ' or '') +''\
+ 'group by product_id'
+ )
+ results = cr.fetchall()
+
+ for amount, prod_id in results:
+ if amount: res[prod_id] += amount
+ return res
+
+ def _stock_value(self, cr, uid, ids, field_names=None, arg=False, context={}):
+ if not field_names:
+ field_names=[]
+ res = {}
+ for id in ids:
+ res[id] = {}.fromkeys(field_names, 0.0)
+ for f in field_names:
+ c = context.copy()
+ if f=='stock_value':
+ c.update({ 'states':('done',), 'what':('in', 'out') })
+ stock=self.get_stock_value(cr,uid,ids,context=c)
+ for id in ids:
+ res[id][f] = stock.get(id, 0.0)
+ return res
+
+ def _product_available(self, cr, uid, ids, field_names=None, arg=False, context={}):
+ res = super(product_product, self)._product_available(cr, uid, ids, field_names, arg, context)
+ for f in field_names:
+ c = context.copy()
+ if f=='stock_value':
+ c.update({ 'states':('done',), 'what':('in', 'out') })
+ stock = self.get_product_available(cr, uid, ids, context=c)
+ for id in ids:
+ res[id][f] = stock.get(id, 0.0)
+ return res
+
+ _columns = {
+ 'stock_value': fields.function(_stock_value, method=True, type='float', string='Value', help="Current Value products in selected locations or all internal if none have been selected.", multi='stock_value'),
+ 'average_price': fields.function(_avg_price, method=True, type='float', string='Average Price',digits=(16,4)),
+ }
+
+ def _check_allow_negative_stock(self, cr, uid, ids):
+ for product in self.browse(cr, uid, ids):
+ if product.qty_available < 0.0:
+ allow_negative = product.allow_negative_stock
+ if not allow_negative:
+ allow_neagtive = product.categ_id.allow_negative_stock
+ if allow_negative != True :
+ return False
+ return True
+
+ _constraints = [(_check_allow_negative_stock, 'Error: Negative stock quantities are not allowed for this product or product category', ['name']),]
+
+
+ def on_change_price_unit(self, cr, uid, ids,price_unit_id,standard_price,list_price):
+ standard_price_coeff = ''
+ list_price_coeff=''
+ if price_unit_id:
+ pu = self.pool.get('product.price.unit').browse(cr, uid, [price_unit_id])[0]
+ coeff = pu.coefficient
+ standard_price_coeff = standard_price / coeff
+ list_price_coeff = list_price / coeff
+ return {'value':{'standard_price_coeff': standard_price_coeff, 'list_price_coeff': list_price_coeff }}
+
+ def name_get(self, cr, uid, ids, context={}):
+ results = super(product_product, self).name_get(cr, uid, ids, context)
+ new_results = []
+ for product_id, product_name in results:
+ product = self.browse(cr, uid, product_id, context)
+ if product.price_unit_id and product.price_unit_id.name:
+ product_name = "%s (%s)" %(product_name, product.price_unit_id.name)
+ new_results.append((product_id, product_name))
+ return new_results
+
+ #
+ # returns the price respecting the price unit for multiplications qty * price / coeff
+ #
+ def price_coeff_get(self, cr, uid, ids, ptype='list_price', context={}):
+ res = {}
+ for product in self.browse(cr, uid, ids, context=context):
+ coeff = 1.0
+ if product.price_unit_id:
+ coeff = product.price_unit_id.coefficient
+ res[product.id] = product.price_get(ptype, context)[product.id] / coeff
+
+ return res
+
+product_product()
+
+class account_invoice_line(osv.osv):
+ _name = "account.invoice.line"
+ _inherit = "account.invoice.line"
+
+ def _get_price_unit_id(self, cr, uid, *args):
+ cr.execute('select id from product_price_unit where coefficient = 1')
+ res = cr.fetchone()
+ return res and res[0] or False
+
+ def _amount_line(self, cr, uid, ids, prop, unknow_none, unknow_dict):
+ res = super(account_invoice_line,self)._amount_line(cr, uid, ids, prop, unknow_none, unknow_dict)
+ cur_obj = self.pool.get('res.currency')
+ for line in self.browse(cr, uid, ids):
+ if line.price_unit_id:
+ if line.invoice_id:
+ res[line.id] = line.price_unit * line.quantity * (1-(line.discount or 0.0)/100.0) / line.price_unit_id.coefficient
+ 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)/ line.price_unit_id.coefficient,self.pool.get('decimal.precision').precision_get(cr, uid, 'Account'))
+ return res
+
+ _columns = {
+ 'price_unit_id': fields.many2one('product.price.unit','Price Unit', help="Use if Price is not defined for UoM"),
+ 'price_subtotal': fields.function(_amount_line, method=True, string='Subtotal',store=True, type="float", digits_compute= dp.get_precision('Account')),
+ }
+ _defaults = {
+ 'price_unit_id': _get_price_unit_id,
+ }
+
+ def price_product_id_change(self, cr, uid, ids, product, uom, qty=0, name='', type='out_invoice', partner_id=False, fposition_id=False, price_unit=False, price_unit_id=False, address_invoice_id=False, currency_id=False, context=None):
+ result = super(account_invoice_line, self).product_id_change(cr, uid, ids, product, uom, qty, name, type, partner_id, fposition_id, price_unit, address_invoice_id, currency_id, context)
+ if product and 'value' in result:
+ pu = self.pool.get('product.product').browse(cr, uid, product)
+ if pu.price_unit_id:
+ result['value']['price_unit_id'] = pu.price_unit_id.id
+ return result
+
+account_invoice_line()
+
+class account_analytic_line(osv.osv):
+ _inherit = 'account.analytic.line'
+
+ def on_change_unit_amount(self, cr, uid, id, prod_id, unit_amount,company_id,
+ unit=False, context=None):
+ res = super(account_analytic_line, self).on_change_unit_amount(cr, uid, id, prod_id, unit_amount, company_id, unit, context)
+ product_obj = self.pool.get('product.product')
+ if prod_id:
+ prod = product_obj.browse(cr, uid, prod_id)
+ amount_unit = prod.price_coeff_get()[prod.id]
+ amount = amount_unit * unit_amount or 1.0
+ res['value']['amount'] = - round(amount, 2)
+ return res
+
+account_analytic_line()
+
+class account_invoice_tax(osv.osv):
+ _inherit = "account.invoice.tax"
+
+ def compute(self, cr, uid, invoice_id, context={}):
+ tax_grouped = super(account_invoice_tax, self).compute(cr, uid, invoice_id, context)
+ tax_obj = self.pool.get('account.tax')
+ cur_obj = self.pool.get('res.currency')
+ inv = self.pool.get('account.invoice').browse(cr, uid, invoice_id, context)
+ company_currency = inv.company_id.currency_id.id
+ for t in tax_grouped.values():
+ t['base'] = 0.0
+ t['base_amount'] = 0.0
+ for line in inv.invoice_line:
+ if line.price_unit_id:
+ 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.price_unit_id.coefficient)), line.quantity, inv.address_invoice_id.id, line.product_id, inv.partner_id):
+ for t in tax_grouped.values():
+ t['base'] += tax['price_unit'] * line['quantity'] / line['price_unit_id'].coefficient
+ if inv.type in ('out_invoice','in_invoice'):
+ t['base_amount'] = cur_obj.compute(cr, uid, inv.currency_id.id, company_currency, t['base'] * tax['base_sign'], context={'date': inv.date_invoice or time.strftime('%Y-%m-%d')}, round=False)
+ else:
+ t['base_amount'] = cur_obj.compute(cr, uid, inv.currency_id.id, company_currency, t['base'] * tax['ref_base_sign'], context={'date': inv.date_invoice or time.strftime('%Y-%m-%d')}, round=False)
+ return tax_grouped
+
+account_invoice_tax()
+
+class hr_expense_line(osv.osv):
+ _name = "hr.expense.line"
+ _inherit = "hr.expense.line"
+
+ def _get_price_unit_id(self, cr, uid, *args):
+ cr.execute('select id from product_price_unit where coefficient = 1')
+ res = cr.fetchone()
+ return res and res[0] or False
+
+ def _amount(self, cr, uid, ids, field_name, arg, context):
+ if not len(ids):
+ return {}
+ cr.execute("SELECT l.id,COALESCE(SUM(l.unit_amount*l.unit_quantity/pu.coefficient),0) AS amount FROM hr_expense_line l ,product_price_unit pu WHERE pu.id = l.price_unit_id and l.id =ANY(%s) GROUP BY l.id ",(ids,))
+ res = dict(cr.fetchall())
+ return res
+
+ _columns = {
+ 'price_unit_id': fields.many2one('product.price.unit','Price Unit', help="Use if Price is not defined for UoM"),
+ 'total_amount': fields.function(_amount, method=True, string='Total'),
+ }
+ _defaults = {
+ 'price_unit_id': _get_price_unit_id,
+ }
+hr_expense_line()
+
+class hr_expense_expense(osv.osv):
+ _name = "hr.expense.expense"
+ _inherit = "hr.expense.expense"
+
+ def _amount(self, cr, uid, ids, field_name, arg, context):
+ if not len(ids):
+ return {}
+ cr.execute("SELECT s.id,COALESCE(SUM(l.unit_amount*l.unit_quantity/pu.coefficient),0) AS amount FROM hr_expense_expense s LEFT OUTER JOIN hr_expense_line l ON (s.id=l.expense_id) LEFT JOIN product_price_unit pu ON (pu.id=l.price_unit_id) WHERE s.id = ANY(%s) GROUP BY s.id ",(ids,))
+ res = dict(cr.fetchall())
+ return res
+
+ _columns = {
+ 'amount': fields.function(_amount, method=True, string='Total Amount'),
+ }
+
+hr_expense_expense()
+
+class mrp_bom(osv.osv):
+ _inherit = 'mrp.bom'
+
+ def _get_price_unit_id(self, cr, uid, *args):
+ cr.execute('select id from product_price_unit where coefficient = 1')
+ res = cr.fetchone()
+ return res and res[0] or False
+
+ _columns = {
+ 'price_unit_id': fields.many2one('product.price.unit','Price Unit' ),
+ }
+
+ _defaults = {
+ 'price_unit_id': _get_price_unit_id,
+ }
+mrp_bom()
+
+class stock_move(osv.osv):
+ _inherit = 'stock.move'
+ _columns = {
+ 'price_unit_id': fields.many2one('product.price.unit','Price Unit internal'),
+ 'price_unit_sale_id': fields.many2one('product.price.unit','Price Unit Sale' ),
+ 'move_value': fields.float('Amount', digits_compute= dp.get_precision('Account')),
+ 'move_value_sale': fields.float('Amount Sale',digits_compute= dp.get_precision('Account') ),
+ }
+stock_move()
+
+class stock_avg_price(osv.osv):
+ _name = "stock_avg_price"
+ def init(self, cr):
+ cr.execute("SELECT true FROM pg_catalog.pg_language WHERE lanname = 'plpgsql';")
+ if not cr.fetchall():
+ cr.execute("create language plpgsql;")
+
+ cr.execute("""
+CREATE OR REPLACE FUNCTION get_stock_avg_price(product_id_i integer,location_id_i integer) RETURNS numeric AS $$
+DECLARE
+ avg_price decimal(16,8);
+ value float;
+ qty float;
+ usage_p varchar(32);
+
+BEGIN
+
+select into usage_p usage
+ from stock_location
+ where id = location_id_i;
+
+if usage_p = 'internal'
+then
+select into value,qty
+ sum(case when location_id = location_id_i then -move_value
+ when location_dest_id = location_id_i then move_value
+ else 0 end),
+ sum(case when location_id = location_id_i then -product_qty
+ when location_dest_id = location_id_i then product_qty
+ else 0 end)
+ from stock_move
+ where product_id = product_id_i
+ and (location_id = location_id_i or location_dest_id = location_id_i)
+ and state = 'done';
+
+if qty = 0
+ then avg_price = 0;
+ else avg_price = value/qty;
+end if;
+end if;
+
+if avg_price is null
+ then avg_price = 0;
+end if;
+
+
+RETURN avg_price;
+END;
+$$ LANGUAGE plpgsql;""")
+stock_avg_price()
+
+class sale_order(osv.osv):
+ _inherit = 'sale.order'
+
+ def _amount_line_tax(self, cr, uid, line, context={}):
+ val = super(sale_order,self)._amount_line_tax(cr, uid, line, context)
+ if line.price_unit_id:
+ 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.price_unit_id.coefficient, line.product_uom_qty, line.order_id.partner_invoice_id.id, line.product_id, line.order_id.partner_id):
+ val+= c['amount']
+ return val
+
+ def action_ship_create(self, cr, uid, ids, *args):
+ val = super(sale_order, self).action_ship_create(cr, uid, ids, *args)
+ move_obj = self.pool.get('stock.move')
+ for order in self.browse(cr, uid, ids, context={}):
+ for line in order.order_line:
+ now = datetime.now()
+ order_date = datetime.strptime(order.date_order,"%Y-%m-%d")
+ date_planned = order_date + relativedelta(days=line.delay or 0.0)
+ if date_planned < now:
+ date_planned = now
+
+ users_roles = self.pool.get('res.users').browse(cr, uid, uid).roles_id
+ for role in users_roles:
+ if role.name=='Document date manual data':
+ date_planned = order_date
+ if line.product_id and line.product_id.product_tmpl_id.type in ('product', 'consu'):
+ location_id = line.product_id.property_stock_location.id
+ if not location_id:
+ location_id = line.product_id.categ_id.property_stock_location.id
+ if not location_id:
+ location_id = order.shop_id.warehouse_id.lot_stock_id.id
+ move_ids = move_obj.search(cr, uid, [('sale_line_id','=',line.id)])
+ cr.execute("""select get_stock_avg_price(%s,%s) ; """ % (line.product_id.id,location_id))
+ res = cr.fetchone()
+ stock_avg_price = (res and res[0]) or False
+ move_obj.write(cr, uid, move_ids, {
+ 'date': line.order_id.date_order,
+ 'price_unit' : stock_avg_price,
+ 'price_unit_id': line.product_id.price_unit_id.id,
+ 'price_unit_sale_id': line.price_unit_id.id,
+ 'move_value' : line.product_uom_qty * stock_avg_price,
+ 'move_value_sale': line.price_subtotal,
+ })
+ return True
+sale_order()
+
+class sale_order_line(osv.osv):
+ _inherit = 'sale.order.line'
+
+ def _get_price_unit_id(self, cr, uid, *args):
+ cr.execute('select id from product_price_unit where coefficient = 1')
+ res = cr.fetchone()
+ return res and res[0] or False
+
+ def _amount_line(self, cr, uid, ids, field_name, arg, context):
+ res = {}
+ cur_obj = self.pool.get('res.currency')
+ for line in self.browse(cr, uid, ids):
+ res[line.id] = line.price_unit * line.product_uom_qty * (1 - (line.discount or 0.0) / 100.0) / line.price_unit_id.coefficient
+ cur = line.order_id.pricelist_id.currency_id
+ res[line.id] = cur_obj.round(cr, uid, cur, res[line.id])
+ return res
+
+ _columns = {
+ 'price_unit_id': fields.many2one('product.price.unit','Price Unit'),
+ }
+
+ _defaults = {
+ 'price_unit_id': _get_price_unit_id,
+ }
+
+ def invoice_line_create(self, cr, uid, ids, context={}):
+ created_ids = super(sale_order_line,self).invoice_line_create(cr, uid, ids, context=context)
+ inv_line_obj = self.pool.get('account.invoice.line')
+ def _get_line_pu_id(line):
+ return line.price_unit_id.id
+ for line in self.browse(cr, uid, ids, context):
+ pu_id = _get_line_pu_id(line)
+ inv_line_obj.write(cr, uid, created_ids, {'price_unit_id': pu_id})
+ return created_ids
+
+ def product_id_change(self, cr, uid, ids, pricelist, product, qty=0,
+ uom=False, qty_uos=0, uos=False, name='', partner_id=False,
+ lang=False, update_tax=True, date_order=False, packaging=False,
+ fiscal_position=False, flag=False):
+ result = super(sale_order_line, self).product_id_change(cr, uid, ids, pricelist,
+ product, qty, uom, qty_uos, uos, name, partner_id, lang,
+ update_tax, date_order, packaging, fiscal_position, flag)
+ if not product:
+ return result
+
+ product_obj = self.pool.get('product.product')
+ product_obj = product_obj.browse(cr, uid, product)
+ pu_id = product_obj.price_unit_id.id
+ result['value']['price_unit_id'] = pu_id
+
+ pname = product_obj.name
+ if product_obj.variants:
+ pname = pname + ' ['+product_obj.variants + ']'
+ if product_obj.price_unit_id and product_obj.price_unit_id.coefficient != 1.0:
+ pname = pname + ' (' + product_obj.price_unit_id.name + ')'
+ result['name'] = pname
+ return result
+
+sale_order_line()
+
+class purchase_order(osv.osv):
+ _name = "purchase.order"
+ _inherit = "purchase.order"
+
+ def _calc_amount(self, cr, uid, ids, prop, unknow_none, unknow_dict):
+ res = {}
+ for order in self.browse(cr, uid, ids):
+ res[order.id] = 0
+ for oline in order.order_line:
+ res[order.id] += oline.price_unit * oline.product_qty / oline.price_unit_id.coefficient
+ return res
+
+ def _amount_all(self, cr, uid, ids, field_name, arg, context):
+ res = super(purchase_order,self)._amount_all(cr, uid, ids, field_name, arg, context)
+ cur_obj=self.pool.get('res.currency')
+ for order in self.browse(cr, uid, ids):
+ res[order.id] = {
+ 'amount_untaxed': 0.0,
+ 'amount_tax': 0.0,
+ 'amount_total': 0.0,
+ }
+ 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):
+ if line.price_unit_id:
+ val+= c['amount'] / line.price_unit_id.coefficient
+ 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']
+ return res
+
+ def _get_order(self, cr, uid, ids, context={}):
+ result = {}
+ for line in self.pool.get('purchase.order.line').browse(cr, uid, ids, context=context):
+ result[line.order_id.id] = True
+ return result.keys()
+
+ _columns = {
+ 'amount_untaxed': fields.function(_amount_all, method=True, digits_compute= dp.get_precision('Purchase Price'), string='Untaxed Amount',
+ store={
+ 'purchase.order.line': (_get_order, None, 10),
+ }, multi="sums"),
+ 'amount_tax': fields.function(_amount_all, method=True, digits_compute= dp.get_precision('Purchase Price'), string='Taxes',
+ store={
+ 'purchase.order.line': (_get_order, None, 10),
+ }, multi="sums"),
+ 'amount_total': fields.function(_amount_all, method=True, digits_compute= dp.get_precision('Purchase Price'), string='Total',
+ store={
+ 'purchase.order.line': (_get_order, None, 10),
+ }, multi="sums"),
+ }
+
+ def inv_line_create(self, cr, uid, a, ol):
+ result = super(purchase_order, self).inv_line_create(cr, uid, a, ol)
+ result[2].update({'price_unit_id': ol.price_unit_id.id})
+ return result
+
+ def action_picking_create(self,cr, uid, ids, *args):
+ picking_id = super(purchase_order, self).action_picking_create(cr, uid, ids, *args)
+ move_obj = self.pool.get('stock.move')
+ for order in self.browse(cr, uid, ids):
+ for line in order.order_line:
+ move_ids = move_obj.search(cr, uid, [('purchase_line_id','=',line.id),('picking_id','=',picking_id)])
+ move_obj.write(cr, uid, move_ids, {
+ 'price_unit_id': line.price_unit_id.id,
+ })
+ return picking_id
+
+purchase_order()
+
+class purchase_order_line(osv.osv):
+ _name = 'purchase.order.line'
+ _inherit = 'purchase.order.line'
+
+ def _get_price_unit_id(self, cr, uid, *args):
+ cr.execute('select id from product_price_unit where coefficient = 1')
+ res = cr.fetchone()
+ return res and res[0] or False
+
+ def _amount_line(self, cr, uid, ids, prop, unknow_none, unknow_dict):
+ res = super(purchase_order_line,self)._amount_line(cr, uid, ids, prop, unknow_none, unknow_dict)
+ cur_obj=self.pool.get('res.currency')
+ for line in self.browse(cr, uid, ids):
+ cur = line.order_id.pricelist_id.currency_id
+ if line.price_unit_id:
+ res[line.id] = cur_obj.round(cr, uid, cur, line.price_unit * line.product_qty / line.price_unit_id.coefficient)
+ return res
+
+ _columns = {
+ 'price_unit_id' : fields.many2one('product.price.unit','Price Unit'),
+ 'price_subtotal': fields.function(_amount_line, method=True, string='Subtotal', digits_compute= dp.get_precision('Purchase Price')),
+ }
+ _defaults = {
+ 'price_unit_id': _get_price_unit_id,
+ }
+
+ def price_product_id_change(self, cr, uid, ids, pricelist, price_unit_id, product, qty, uom,
+ partner_id, date_order=False, fiscal_position=False, date_planned=False,
+ name=False, price_unit=False, notes=False):
+ result = super(purchase_order_line, self).product_id_change(cr, uid, ids, pricelist, product, qty, uom,
+ partner_id, date_order, fiscal_position, date_planned, name, price_unit, notes)
+ if product and 'value' in result:
+ pu = self.pool.get('product.product').browse(cr, uid, product)
+ if pu.price_unit_id:
+ result['value']['price_unit_id'] = pu.price_unit_id.id
+ return result
+
+purchase_order_line()
+
+class stock_partial_move(osv.osv_memory):
+ _inherit = "stock.partial.move"
+
+ def view_init(self, cr, uid, fields_list, context=None):
+ res = super(stock_partial_move, self).view_init(cr, uid, fields_list, context=context)
+ move_obj = self.pool.get('stock.move')
+ if not context:
+ context={}
+ moveids = []
+ for m in move_obj.browse(cr, uid, context.get('active_ids', [])):
+ if m.state in ('done', 'cancel'):
+ continue
+ if 'move%s_product_id'%(m.id) not in self._columns:
+ self._columns['move%s_product_id'%(m.id)] = fields.many2one('product.product',string="Product")
+ if 'move%s_product_qty'%(m.id) not in self._columns:
+ self._columns['move%s_product_qty'%(m.id)] = fields.float("Quantity")
+ if 'move%s_product_uom'%(m.id) not in self._columns:
+ self._columns['move%s_product_uom'%(m.id)] = fields.many2one('product.uom',string="Product UOM")
+
+ if (m.picking_id.type == 'in') and (m.product_id.cost_method == 'average'):
+ if 'move%s_product_price'%(m.id) not in self._columns:
+ self._columns['move%s_product_price'%(m.id)] = fields.float("Price")
+ if 'move%s_product_currency'%(m.id) not in self._columns:
+ self._columns['move%s_product_currency'%(m.id)] = fields.many2one('res.currency',string="Currency")
+ if 'move%s_product_price_unit_id'%(m.id) not in self._columns:
+ self._columns['move%s_product_price_unit_id'%(m.id)] = fields.float("Price Unit")
+ return res
+
+ def fields_view_get(self, cr, uid, view_id=None, view_type='form', context=None, toolbar=False,submenu=False):
+ result = super(stock_partial_move, self).fields_view_get(cr, uid, view_id, view_type, context, toolbar,submenu)
+ move_obj = self.pool.get('stock.move')
+ move_ids = context.get('active_ids', False)
+ move_ids = move_obj.search(cr, uid, [('id','in',move_ids)])
+ _moves_arch_lst = """"""
+ result['arch'] = _moves_arch_lst
+ result['fields'] = _moves_fields
+ return result
+
+ def default_get(self, cr, uid, fields, context=None):
+ res = super(stock_partial_move, self).default_get(cr, uid, fields, context=context)
+ move_obj = self.pool.get('stock.move')
+ if not context:
+ context={}
+ moveids = []
+ if 'date' in fields:
+ res.update({'date': time.strftime('%Y-%m-%d %H:%M:%S')})
+ for m in move_obj.browse(cr, uid, context.get('active_ids', [])):
+ if m.state in ('done', 'cancel'):
+ continue
+ if 'move%s_product_id'%(m.id) in fields:
+ res['move%s_product_id'%(m.id)] = m.product_id.id
+ if 'move%s_product_qty'%(m.id) in fields:
+ res['move%s_product_qty'%(m.id)] = m.product_qty
+ if 'move%s_product_uom'%(m.id) in fields:
+ res['move%s_product_uom'%(m.id)] = m.product_uom.id
+
+ if (m.picking_id.type == 'in') and (m.product_id.cost_method == 'average'):
+ price = 0
+ price_unit_id = False
+ if hasattr(m, 'purchase_line_id') and m.purchase_line_id:
+ price = m.purchase_line_id.price_unit
+ if hasattr(m, 'purchase_line_id') and m.price_unit_id:
+ price_unit_id = m.purchase_line_id.price_unit_id.id
+
+ currency = False
+ if hasattr(m.picking_id, 'purchase_id') and m.picking_id.purchase_id:
+ currency = m.picking_id.purchase_id.pricelist_id.currency_id.id
+
+ if 'move%s_product_price'%(m.id) in fields:
+ res['move%s_product_price'%(m.id)] = price
+ if 'move%s_product_currency'%(m.id) in fields:
+ res['move%s_product_currency'%(m.id)] = currency
+ if 'move%s_product_price_unit_id'%(m.id) in fields:
+ res['move%s_product_price_unit_id'%(m.id)] = price_unit_id
+ return res
+
+ def do_partial(self, cr, uid, ids, context):
+ move_obj = self.pool.get('stock.move')
+ move_ids = context.get('active_ids', False)
+ partial = self.browse(cr, uid, ids[0], context)
+ partial_datas = {
+ 'delivery_date' : partial.date
+ }
+ for m in move_obj.browse(cr, uid, move_ids):
+ if m.state in ('done', 'cancel'):
+ continue
+ partial_datas['move%s'%(m.id)] = {
+ 'product_id' : getattr(partial, 'move%s_product_id'%(m.id)).id,
+ 'product_qty' : getattr(partial, 'move%s_product_qty'%(m.id)),
+ 'product_uom' : getattr(partial, 'move%s_product_uom'%(m.id)).id
+ }
+
+ if (m.picking_id.type == 'in') and (m.product_id.cost_method == 'average'):
+ partial_datas['move%s'%(m.id)].update({
+ 'product_price' : getattr(partial, 'move%s_product_price'%(m.id)),
+ 'product_currency': getattr(partial, 'move%s_product_currency'%(m.id)).id,
+ 'product_price_unit_id' : getattr(partial, 'move%s_product_price_unit_id'%(m.id)),
+ })
+
+ res = move_obj.do_partial(cr, uid, move_ids, partial_datas, context=context)
+ return {}
+
+stock_partial_move()
+
+class stock_partial_picking(osv.osv_memory):
+ _inherit = "stock.partial.picking"
+
+ def view_init(self, cr, uid, fields_list, context=None):
+ res = super(stock_partial_picking, self).view_init(cr, uid, fields_list, context=context)
+ pick_obj = self.pool.get('stock.picking')
+ if not context:
+ context={}
+ moveids = []
+ for pick in pick_obj.browse(cr, uid, context.get('active_ids', [])):
+ for m in pick.move_lines:
+ if m.state in ('done', 'cancel'):
+ continue
+ if 'move%s_product_id'%(m.id) not in self._columns:
+ self._columns['move%s_product_id'%(m.id)] = fields.many2one('product.product',string="Product")
+ if 'move%s_product_qty'%(m.id) not in self._columns:
+ self._columns['move%s_product_qty'%(m.id)] = fields.float("Quantity")
+ if 'move%s_product_uom'%(m.id) not in self._columns:
+ self._columns['move%s_product_uom'%(m.id)] = fields.many2one('product.uom',string="Product UOM")
+
+ if (pick.type == 'in') and (m.product_id.cost_method == 'average'):
+ if 'move%s_product_price'%(m.id) not in self._columns:
+ self._columns['move%s_product_price'%(m.id)] = fields.float("Price")
+ if 'move%s_product_currency'%(m.id) not in self._columns:
+ self._columns['move%s_product_currency'%(m.id)] = fields.many2one('res.currency',string="Currency")
+ if 'move%s_product_price_unit_id'%(m.id) not in self._columns:
+ self._columns['move%s_product_price_unit_id'%(m.id)] = fields.float("Price Unit")
+ return res
+
+ def fields_view_get(self, cr, uid, view_id=None, view_type='form', context=None, toolbar=False,submenu=False):
+ result = super(stock_partial_picking, self).fields_view_get(cr, uid, view_id, view_type, context, toolbar,submenu)
+ pick_obj = self.pool.get('stock.picking')
+ picking_ids = context.get('active_ids', False)
+ picking_ids = pick_obj.search(cr, uid, [('id', 'in', picking_ids)])
+ _moves_arch_lst = """"""
+ result['arch'] = _moves_arch_lst
+ result['fields'] = _moves_fields
+ return result
+
+ def default_get(self, cr, uid, fields, context=None):
+ res = super(stock_partial_picking, self).default_get(cr, uid, fields, context=context)
+ pick_obj = self.pool.get('stock.picking')
+ if not context:
+ context={}
+ moveids = []
+ if 'date' in fields:
+ res.update({'date': time.strftime('%Y-%m-%d %H:%M:%S')})
+ for pick in pick_obj.browse(cr, uid, context.get('active_ids', [])):
+ if 'partner_id' in fields:
+ res.update({'partner_id': pick.address_id.partner_id.id})
+ if 'address_id' in fields:
+ res.update({'address_id': pick.address_id.id})
+ for m in pick.move_lines:
+ if m.state in ('done', 'cancel'):
+ continue
+ if 'move%s_product_id'%(m.id) in fields:
+ res['move%s_product_id'%(m.id)] = m.product_id.id
+ if 'move%s_product_qty'%(m.id) in fields:
+ res['move%s_product_qty'%(m.id)] = m.product_qty
+ if 'move%s_product_uom'%(m.id) in fields:
+ res['move%s_product_uom'%(m.id)] = m.product_uom.id
+
+ if (pick.type == 'in') and (m.product_id.cost_method == 'average'):
+ price = 0
+ price_unit_id = False
+ if hasattr(m, 'purchase_line_id') and m.purchase_line_id:
+ price = m.purchase_line_id.price_unit
+ if hasattr(m, 'purchase_line_id') and m.price_unit_id:
+ price_unit_id = m.purchase_line_id.price_unit_id.id
+
+ currency = False
+ if hasattr(pick, 'purchase_id') and pick.purchase_id:
+ currency = pick.purchase_id.pricelist_id.currency_id.id
+
+ if 'move%s_product_price'%(m.id) in fields:
+ res['move%s_product_price'%(m.id)] = price
+ if 'move%s_product_currency'%(m.id) in fields:
+ res['move%s_product_currency'%(m.id)] = currency
+ if 'move%s_product_price_unit_id'%(m.id) in fields:
+ res['move%s_product_price_unit_id'%(m.id)] = price_unit_id
+ return res
+
+ def do_partial(self, cr, uid, ids, context):
+ pick_obj = self.pool.get('stock.picking')
+ picking_ids = context.get('active_ids', False)
+ partial = self.browse(cr, uid, ids[0], context)
+ partial_datas = {
+ 'partner_id' : partial.partner_id and partial.partner_id.id or False,
+ 'address_id' : partial.address_id and partial.address_id.id or False,
+ 'delivery_date' : partial.date
+ }
+ for pick in pick_obj.browse(cr, uid, picking_ids):
+ for m in pick.move_lines:
+ if m.state in ('done', 'cancel'):
+ continue
+ partial_datas['move%s'%(m.id)] = {
+ 'product_id' : getattr(partial, 'move%s_product_id'%(m.id)).id,
+ 'product_qty' : getattr(partial, 'move%s_product_qty'%(m.id)),
+ 'product_uom' : getattr(partial, 'move%s_product_uom'%(m.id)).id
+ }
+
+ if (pick.type == 'in') and (m.product_id.cost_method == 'average'):
+ partial_datas['move%s'%(m.id)].update({
+ 'product_price' : getattr(partial, 'move%s_product_price'%(m.id)),
+ 'product_currency': getattr(partial, 'move%s_product_currency'%(m.id)).id,
+ 'product_price_unit_id' : getattr(partial, 'move%s_product_price_unit_id'%(m.id)),
+ })
+ res = pick_obj.do_partial(cr, uid, picking_ids, partial_datas, context=context)
+ return {}
+
+stock_partial_picking()
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/product_price_unit/product_price_unit_data.xml b/addons/product_price_unit/product_price_unit_data.xml
new file mode 100644
index 00000000000..fca300c7009
--- /dev/null
+++ b/addons/product_price_unit/product_price_unit_data.xml
@@ -0,0 +1,32 @@
+
+
+
+
+
+ Price/Unit
+
+ 1
+
+
+
+ Price/100 Units
+ %
+ 100
+
+
+
+ Price/1000 Units
+ ‰
+ 1000
+
+
+
+ Price in Cents
+ ¢
+ 100
+
+
+
+
diff --git a/addons/product_price_unit/product_price_unit_view.xml b/addons/product_price_unit/product_price_unit_view.xml
new file mode 100644
index 00000000000..a0f94e841a7
--- /dev/null
+++ b/addons/product_price_unit/product_price_unit_view.xml
@@ -0,0 +1,196 @@
+
+
+
+
+
+ product_price_unit_form
+ product.product
+
+ form
+
+
+
+
+
+
+
+
+
+
+
+ product.product.tree
+ product.product
+ tree
+
+
+
+
+
+
+
+
+
+
+ product.category.stock.property.form.inherit
+ product.category
+ form
+
+
+
+
+
+
+
+
+
+ product.category.stock.allow_negative.form.inherit
+ product.category
+ form
+
+
+
+
+
+
+
+
+
+ product.normal.stock.property.form.inherit
+ product.product
+ form
+
+
+
+
+
+
+
+
+
+ product.normal.stock.allow_negative.form.inherit
+ product.product
+ form
+
+
+
+
+
+
+
+
+
+
+ invoice_price_unit_form
+ account.invoice.line
+
+ form
+
+
+
+
+
+
+
+
+ invoice_price_unit_form1
+ account.invoice.line
+
+ form
+
+
+
+
+
+
+
+
+
+ invoice_price_unit_tree
+ account.invoice.line
+
+ tree
+
+
+
+
+
+
+
+
+
+ hr_expense_line_price_unit_form
+ hr.expense.expense
+
+ form
+
+
+
+
+
+
+
+
+
+ hr_expense_line_price_unit_tree
+ hr.expense.line
+
+ tree
+
+
+
+
+
+
+
+
+
+ mrp.bom.form.inherit
+ mrp.bom
+
+ form
+
+
+
+
+
+
+
+
+ sale.order.form.inherit5
+ sale.order
+
+ form
+
+
+
+
+
+
+
+
+
+ purchase_order_line_price_unit_form
+ purchase.order.line
+
+ form
+
+
+
+
+
+
+
+
+ purchase_order_line_price_unit_form
+ purchase.order.line
+
+ form
+
+
+
+
+
+
+
+
+
diff --git a/addons/project/project.py b/addons/project/project.py
index 61720675f49..d511757c8dc 100644
--- a/addons/project/project.py
+++ b/addons/project/project.py
@@ -123,7 +123,7 @@ class project(osv.osv):
'active': fields.boolean('Active', help="If the active field is set to true, it will allow you to hide the project without removing it."),
'sequence': fields.integer('Sequence', help="Gives the sequence order when displaying a list of Projects."),
'category_id': fields.many2one('account.analytic.account','Analytic Account', help="Link this project to an analytic account if you need financial management on projects. It enables you to connect projects with budgets, planning, cost and revenue analysis, timesheets on projects, etc."),
- 'priority': fields.integer('Sequence'),
+ 'priority': fields.integer('Sequence', help="Gives the sequence order when displaying a list of task"),
'warn_manager': fields.boolean('Warn Manager', help="If you check this field, the project manager will receive a request each time a task is completed by his team."),
'members': fields.many2many('res.users', 'project_user_rel', 'project_id', 'uid', 'Project Members', help="Project's member. Not used in any computation, just for information purpose."),
'tasks': fields.one2many('project.task', 'project_id', "Project tasks"),
@@ -150,14 +150,14 @@ class project(osv.osv):
if leave['date_start'] > leave['date']:
return False
return True
-
+
def _check_escalation(self, cr, uid, ids):
project_obj = self.browse(cr, uid, ids[0])
if project_obj.project_escalation_id:
if project_obj.project_escalation_id.id == project_obj.id:
return False
- return True
-
+ return True
+
_constraints = [
(_check_dates, 'Error! project start-date must be lower then project end-date.', ['date_start', 'date']),
(_check_escalation, 'Error! You cannot assign escalation to the same project!', ['project_escalation_id'])
diff --git a/addons/purchase/__openerp__.py b/addons/purchase/__openerp__.py
index 46d7c3296b9..e172e5e73f1 100644
--- a/addons/purchase/__openerp__.py
+++ b/addons/purchase/__openerp__.py
@@ -34,7 +34,7 @@
'depends': ['base', 'account', 'stock', 'process', 'mrp_procurement'],
'init_xml': [],
'update_xml': [
-
+
'security/purchase_security.xml',
'security/ir.model.access.csv',
'purchase_workflow.xml',
diff --git a/addons/purchase/i18n/pl.po b/addons/purchase/i18n/pl.po
index 2e46481a6e1..09a529c020e 100644
--- a/addons/purchase/i18n/pl.po
+++ b/addons/purchase/i18n/pl.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-06-08 03:40+0000\n"
+"X-Launchpad-Export-Date: 2010-06-09 03:35+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: purchase
diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml
index 10c5ccd9749..17fd47b7012 100644
--- a/addons/purchase/purchase_view.xml
+++ b/addons/purchase/purchase_view.xml
@@ -23,6 +23,7 @@
name="Incoming Shipments" sequence="9"/>
+
+
+ Outcoming Shipments
+ stock.picking
+ ir.actions.act_window
+ form
+ tree,form,calendar
+ [('type','=','out')]
+ {'contact_display': 'partner',"search_default_available":1}
+
+
+
+
+ tree
+
+
+
+
+
+ form
+
+
+
+
+
+ calendar
+
+
diff --git a/addons/survey/i18n/hr.po b/addons/survey/i18n/hr.po
index 39cb6d5b773..a465b4c3ca9 100644
--- a/addons/survey/i18n/hr.po
+++ b/addons/survey/i18n/hr.po
@@ -14,7 +14,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-06-08 03:41+0000\n"
+"X-Launchpad-Export-Date: 2010-06-09 03:36+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
"Language: hr\n"
diff --git a/addons/survey/survey_report.xml b/addons/survey/survey_report.xml
index c5e76dd133f..3ca05f6ba63 100644
--- a/addons/survey/survey_report.xml
+++ b/addons/survey/survey_report.xml
@@ -6,20 +6,20 @@
id="report_survey_form"
model="survey"
name="survey.form"
- string="Print Survey"/>
+ string="Surveys"/>
-
+ rml=""
+ string="Surveys Statistics"/>
-
+ string="Surveys Answers"/>
diff --git a/addons/survey/wizard/survey_print.xml b/addons/survey/wizard/survey_print.xml
index 9470a8bfc3b..8f8793e6b1e 100644
--- a/addons/survey/wizard/survey_print.xml
+++ b/addons/survey/wizard/survey_print.xml
@@ -1,9 +1,9 @@
-
+
-
+
Survey Print
survey.print
@@ -35,7 +35,7 @@
new
-
diff --git a/addons/survey/wizard/survey_print_answer.xml b/addons/survey/wizard/survey_print_answer.xml
index fc754fa2e6c..1e34fc1029f 100644
--- a/addons/survey/wizard/survey_print_answer.xml
+++ b/addons/survey/wizard/survey_print_answer.xml
@@ -1,9 +1,9 @@
-
+
-
+
Survey Print Answer
survey.print.answer
@@ -36,7 +36,7 @@
new
-
diff --git a/addons/survey/wizard/survey_print_statistics.xml b/addons/survey/wizard/survey_print_statistics.xml
index 8838a18098c..5659b82e896 100644
--- a/addons/survey/wizard/survey_print_statistics.xml
+++ b/addons/survey/wizard/survey_print_statistics.xml
@@ -1,9 +1,9 @@
-
+
-
+
Survey Print Statistics
survey.print.statistics
@@ -30,7 +30,7 @@
new
-
diff --git a/addons/thunderbird/i18n/hr.po b/addons/thunderbird/i18n/hr.po
index 4ac0603558f..67e99a7d48f 100644
--- a/addons/thunderbird/i18n/hr.po
+++ b/addons/thunderbird/i18n/hr.po
@@ -14,7 +14,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-06-08 03:41+0000\n"
+"X-Launchpad-Export-Date: 2010-06-09 03:36+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
"Language: hr\n"
diff --git a/addons/warning/i18n/hr.po b/addons/warning/i18n/hr.po
index e126c187a9c..21b61af3c22 100644
--- a/addons/warning/i18n/hr.po
+++ b/addons/warning/i18n/hr.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-06-08 03:41+0000\n"
+"X-Launchpad-Export-Date: 2010-06-09 03:36+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
"Language: hr\n"