|
- [[ line2.sequence ]]
+ [[ str(line2.sequence) ]]
|
[[ line2.name ]]
diff --git a/addons/mrp/wizard/mrp_product_produce.py b/addons/mrp/wizard/mrp_product_produce.py
index 811c707eb2a..69fc3a9dd7d 100644
--- a/addons/mrp/wizard/mrp_product_produce.py
+++ b/addons/mrp/wizard/mrp_product_produce.py
@@ -20,13 +20,14 @@
##############################################################################
from osv import fields, osv
+import decimal_precision as dp
class mrp_product_produce(osv.osv_memory):
_name = "mrp.product.produce"
_description = "Product Produce"
_columns = {
- 'product_qty': fields.float('Select Quantity', required=True),
+ 'product_qty': fields.float('Select Quantity', digits_compute=dp.get_precision('Product UoM'), required=True),
'mode': fields.selection([('consume_produce', 'Consume & Produce'),
('consume', 'Consume Only')], 'Mode', required=True,
help="'Consume only' mode will only consume the products with the quantity selected.\n"
diff --git a/addons/mrp_repair/i18n/sv.po b/addons/mrp_repair/i18n/sv.po
index 58aba31d1b1..6f58b0cad9d 100644
--- a/addons/mrp_repair/i18n/sv.po
+++ b/addons/mrp_repair/i18n/sv.po
@@ -7,14 +7,14 @@ msgstr ""
"Project-Id-Version: OpenERP Server 5.0.14\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2011-01-11 11:15+0000\n"
-"PO-Revision-Date: 2010-12-09 10:02+0000\n"
-"Last-Translator: OpenERP Administrators \n"
+"PO-Revision-Date: 2011-06-03 14:18+0000\n"
+"Last-Translator: Jan-Eric Lindh \n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-29 05:38+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-06-04 04:53+0000\n"
+"X-Generator: Launchpad (build 12959)\n"
#. module: mrp_repair
#: view:mrp.repair:0
@@ -93,7 +93,7 @@ msgid "Group by partner invoice address"
msgstr ""
#. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:427
+#: code:addons/mrp_repair/mrp_repair.py:430
#, python-format
msgid "No product defined on Fees!"
msgstr ""
@@ -168,7 +168,7 @@ msgid "Net Total :"
msgstr ""
#. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:427
+#: code:addons/mrp_repair/mrp_repair.py:430
#, python-format
msgid "Warning !"
msgstr ""
@@ -189,7 +189,7 @@ msgid "Move"
msgstr "Flytta"
#. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:362
+#: code:addons/mrp_repair/mrp_repair.py:365
#, python-format
msgid "You have to select a Partner Invoice Address in the repair form !"
msgstr ""
@@ -222,7 +222,7 @@ msgid "Draft"
msgstr ""
#. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:376
+#: code:addons/mrp_repair/mrp_repair.py:379
#, python-format
msgid "No account defined for partner \"%s\"."
msgstr ""
@@ -246,6 +246,7 @@ msgstr ""
#. module: mrp_repair
#: field:mrp.repair,prodlot_id:0
+#: field:mrp.repair.line,prodlot_id:0
#: report:repair.order:0
msgid "Lot Number"
msgstr ""
@@ -276,9 +277,9 @@ msgid "Shipping address :"
msgstr ""
#. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:376
-#: code:addons/mrp_repair/mrp_repair.py:405
-#: code:addons/mrp_repair/mrp_repair.py:434
+#: code:addons/mrp_repair/mrp_repair.py:379
+#: code:addons/mrp_repair/mrp_repair.py:408
+#: code:addons/mrp_repair/mrp_repair.py:437
#, python-format
msgid "Error !"
msgstr ""
@@ -511,8 +512,8 @@ msgid "End Repair"
msgstr ""
#. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:405
-#: code:addons/mrp_repair/mrp_repair.py:434
+#: code:addons/mrp_repair/mrp_repair.py:408
+#: code:addons/mrp_repair/mrp_repair.py:437
#, python-format
msgid "No account defined for product \"%s\"."
msgstr ""
@@ -543,7 +544,7 @@ msgstr ""
#. module: mrp_repair
#: view:mrp.repair:0
msgid "Qty"
-msgstr ""
+msgstr "Antal"
#. module: mrp_repair
#: field:mrp.repair.fee,price_unit:0
@@ -762,7 +763,7 @@ msgid "Ready to Repair"
msgstr ""
#. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:362
+#: code:addons/mrp_repair/mrp_repair.py:365
#, python-format
msgid "No partner !"
msgstr ""
diff --git a/addons/mrp_repair/i18n/tr.po b/addons/mrp_repair/i18n/tr.po
index 03e1833a574..73051f4a724 100644
--- a/addons/mrp_repair/i18n/tr.po
+++ b/addons/mrp_repair/i18n/tr.po
@@ -7,19 +7,19 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2011-01-11 11:15+0000\n"
-"PO-Revision-Date: 2010-09-09 07:21+0000\n"
-"Last-Translator: Fabien (Open ERP) \n"
+"PO-Revision-Date: 2011-06-23 20:16+0000\n"
+"Last-Translator: Ayhan KIZILTAN \n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-29 05:38+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-06-24 04:59+0000\n"
+"X-Generator: Launchpad (build 13168)\n"
#. module: mrp_repair
#: view:mrp.repair:0
msgid "Fees Line"
-msgstr ""
+msgstr "Ücret Kallemleri"
#. module: mrp_repair
#: help:mrp.repair,state:0
@@ -35,6 +35,17 @@ msgid ""
"* The 'Done' state is set when repairing is completed. \n"
"* The 'Cancelled' state is used when user cancel repair order."
msgstr ""
+" * 'Taslak' durumu, bir kullanıcı yeni ve onaylanmamış bir onarım siparişi "
+"girerken kullanılır. \n"
+"* 'Onaylı' durumu, bir kullanıcı bir onarım siparişini onaylarken "
+"kullanılır. \n"
+"* 'Onarıma Hazır' durumu, kullanıcı onarıma başlarken kullanılır, kullanıcı "
+"ancak onarım siparişi onaylandıktan sonra onarıma başlayabilir. "
+"\n"
+"* 'Faturalandırılacak' durumu, onarımdan önce ya da sonra fatura oluşturmak "
+"için kullanılır. \n"
+"* 'Bitti' durumu, onarım bittiğinde kullanılır. \n"
+"* 'İptal' durumu, onarım siparişi iptal edildiğinde kullanılır."
#. module: mrp_repair
#: field:mrp.repair.line,move_id:0
@@ -50,11 +61,16 @@ msgid ""
"date on the production lot in order to know if whether the repair should be "
"invoiced to the customer or not."
msgstr ""
+"Onarım siparişleri ürün onarımlarınızı düzenlemenizi sağlar. Bir onarım "
+"siparişinde, kaldırılacak bileşenleri ayrıntılayabilir, farklı işlemler için "
+"harcadığınız süreleri ekleyebilir, çıkarabilir ve kayıt edebilirsiniz. "
+"Onarım siparişi, müşteriye kesilip kesilmeyeceğini belirlemek için ürün "
+"partisine ait garanti tarihini kullanır."
#. module: mrp_repair
#: view:mrp.repair:0
msgid "Group By..."
-msgstr ""
+msgstr "Şuna göre grupla"
#. module: mrp_repair
#: view:mrp.repair:0
@@ -69,18 +85,21 @@ msgid ""
"that you can select the locations in the Info tab, if you have the extended "
"view."
msgstr ""
+"Bu kutuyu, ürün onarılır onarılmaz teslimatı yapmak isterseniz işaretleyin. "
+"İşaretlenirse, seçilen ürün için toplama oluşturulacaktır. Genişletilmiş "
+"görünümdeyseniz, Bilgi Sekmesinde konumları seçebileceğinize dikkat edin."
#. module: mrp_repair
#: model:ir.actions.act_window,name:mrp_repair.action_cancel_repair
#: view:mrp.repair.cancel:0
msgid "Cancel Repair Order"
-msgstr ""
+msgstr "Onarım Siparişini İptal Et"
#. module: mrp_repair
#: field:mrp.repair.fee,to_invoice:0
#: field:mrp.repair.line,to_invoice:0
msgid "To Invoice"
-msgstr "Fatura Adresi"
+msgstr "Faturalandırılacak"
#. module: mrp_repair
#: report:repair.order:0
@@ -90,18 +109,18 @@ msgstr "Yazdırma Tarihi"
#. module: mrp_repair
#: field:mrp.repair.make_invoice,group:0
msgid "Group by partner invoice address"
-msgstr "Cari Fatura Adreslerine göre Gruplandı"
+msgstr "Paydaş Fatura Adreslerine göre Gruplandır"
#. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:427
+#: code:addons/mrp_repair/mrp_repair.py:430
#, python-format
msgid "No product defined on Fees!"
-msgstr ""
+msgstr "Ücretlerde tanımlanmış ürün yok!"
#. module: mrp_repair
#: view:mrp.repair:0
msgid "Set to Draft"
-msgstr "Taslak olarak Ayarla"
+msgstr "Taslağa Ayarla"
#. module: mrp_repair
#: selection:mrp.repair,state:0
@@ -118,13 +137,13 @@ msgstr "Teslimat Adresi"
#: model:ir.model,name:mrp_repair.model_mrp_repair_make_invoice
#: view:mrp.repair:0
msgid "Make Invoice"
-msgstr ""
+msgstr "Fatura Oluştur"
#. module: mrp_repair
#: field:mrp.repair.fee,price_subtotal:0
#: field:mrp.repair.line,price_subtotal:0
msgid "Subtotal"
-msgstr "Alt Toplam"
+msgstr "Ara Toplam"
#. module: mrp_repair
#: report:repair.order:0
@@ -134,12 +153,12 @@ msgstr "Fatura Adresi:"
#. module: mrp_repair
#: field:mrp.repair,guarantee_limit:0
msgid "Guarantee limit"
-msgstr "Garanti limiti"
+msgstr "Garanti sınırı"
#. module: mrp_repair
#: view:mrp.repair:0
msgid "Notes"
-msgstr ""
+msgstr "Notlar"
#. module: mrp_repair
#: model:ir.module.module,description:mrp_repair.module_meta_information
@@ -154,13 +173,22 @@ msgid ""
" * Repair quotation report\n"
" * Notes for the technician and for the final customer\n"
msgstr ""
+"\n"
+" Amaç, bütün ürün onarımlarını yapmak için tam bir modül elde "
+"etmektir. Aşağıdaki konular bu modülün kapsamındadır:\n"
+" * Onarımdaki ürünleri ekle/kaldır\n"
+" * Stokları etkile\n"
+" * Faturalama (ürünler ve/veya hizmetler)\n"
+" * Garanti kavramı\n"
+" * Onarım teklifi raporu\n"
+" * Teknisyen ve son müşteri için notlar\n"
#. module: mrp_repair
#: field:mrp.repair,amount_tax:0
#: field:mrp.repair.fee,tax_id:0
#: field:mrp.repair.line,tax_id:0
msgid "Taxes"
-msgstr "Vergi"
+msgstr "Vergiler"
#. module: mrp_repair
#: report:repair.order:0
@@ -168,10 +196,10 @@ msgid "Net Total :"
msgstr "Net Toplam :"
#. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:427
+#: code:addons/mrp_repair/mrp_repair.py:430
#, python-format
msgid "Warning !"
-msgstr ""
+msgstr "Uyarı !"
#. module: mrp_repair
#: report:repair.order:0
@@ -181,7 +209,7 @@ msgstr "KDV"
#. module: mrp_repair
#: view:mrp.repair:0
msgid "Operations"
-msgstr "Operasyonlar"
+msgstr "İşlemler"
#. module: mrp_repair
#: field:mrp.repair,move_id:0
@@ -189,16 +217,16 @@ msgid "Move"
msgstr "Hareket"
#. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:362
+#: code:addons/mrp_repair/mrp_repair.py:365
#, python-format
msgid "You have to select a Partner Invoice Address in the repair form !"
-msgstr ""
+msgstr "Onarım formundan bir Paydaş Adresi seçmelisiniz !"
#. module: mrp_repair
#: model:ir.actions.act_window,name:mrp_repair.action_repair_order_tree
#: model:ir.ui.menu,name:mrp_repair.menu_repair_order
msgid "Repair Orders"
-msgstr "Onarım Emirleri"
+msgstr "Onarım Siparişleri"
#. module: mrp_repair
#: model:ir.actions.report.xml,name:mrp_repair.report_mrp_repair
@@ -208,13 +236,13 @@ msgstr "Teklif / Sipariş"
#. module: mrp_repair
#: view:mrp.repair:0
msgid "Extra Info"
-msgstr "Extra Bilgi"
+msgstr "Ek Bilgi"
#. module: mrp_repair
#: field:mrp.repair.fee,repair_id:0
#: field:mrp.repair.line,repair_id:0
msgid "Repair Order Reference"
-msgstr ""
+msgstr "Onarım Siparişi Referansı"
#. module: mrp_repair
#: selection:mrp.repair.line,state:0
@@ -222,10 +250,10 @@ msgid "Draft"
msgstr "Taslak"
#. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:376
+#: code:addons/mrp_repair/mrp_repair.py:379
#, python-format
msgid "No account defined for partner \"%s\"."
-msgstr ""
+msgstr "\"%s\" Paydaşı için tanımlanmış bir hesap yok."
#. module: mrp_repair
#: view:mrp.repair:0
@@ -237,33 +265,34 @@ msgstr "Onaylandı"
#. module: mrp_repair
#: view:mrp.repair:0
msgid "Repairs order"
-msgstr "Onarım Emri"
+msgstr "Onarım Siparişi"
#. module: mrp_repair
#: report:repair.order:0
msgid "Repair Order N° :"
-msgstr "Onarım Emri N° :"
+msgstr "Onarım Siparişi N° :"
#. module: mrp_repair
#: field:mrp.repair,prodlot_id:0
+#: field:mrp.repair.line,prodlot_id:0
#: report:repair.order:0
msgid "Lot Number"
-msgstr "Lot Numarası"
+msgstr "Parti Numarası"
#. module: mrp_repair
#: field:mrp.repair,fees_lines:0
msgid "Fees Lines"
-msgstr ""
+msgstr "Ücret Kalemleri"
#. module: mrp_repair
#: field:mrp.repair.line,type:0
msgid "Type"
-msgstr "Tipi"
+msgstr "Tür"
#. module: mrp_repair
#: report:repair.order:0
msgid "Fees Line(s)"
-msgstr ""
+msgstr "Ücret Kalemi(leri)"
#. module: mrp_repair
#: selection:mrp.repair,state:0
@@ -276,17 +305,17 @@ msgid "Shipping address :"
msgstr "Sevk Adresi :"
#. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:376
-#: code:addons/mrp_repair/mrp_repair.py:405
-#: code:addons/mrp_repair/mrp_repair.py:434
+#: code:addons/mrp_repair/mrp_repair.py:379
+#: code:addons/mrp_repair/mrp_repair.py:408
+#: code:addons/mrp_repair/mrp_repair.py:437
#, python-format
msgid "Error !"
-msgstr ""
+msgstr "Hata !"
#. module: mrp_repair
#: field:mrp.repair.line,product_uom_qty:0
msgid "Quantity (UoM)"
-msgstr "Miktar (Birim)"
+msgstr "Miktar (Ölçü Birimi)"
#. module: mrp_repair
#: help:mrp.repair.line,state:0
@@ -299,6 +328,14 @@ msgid ""
" \n"
"* The 'Cancelled' state is set automatically when user cancel repair order."
msgstr ""
+" * 'Taslak' durumu, onarım siparişi taslak durumundayken otomatik olarak "
+"ayarlanır. \n"
+"* 'Onaylı' durumu, onarım siparişi onaylı durumdayken otomatik olarak "
+"ayarlanır. \n"
+"* 'Done' durumu, onarım siparişi tamamlandığında otomatik olarak ayarlanır. "
+" \n"
+"* 'Cancelled' durumu, kullanıcı onarım siparişini iptal ettiğinde otomatik "
+"olarak ayarlanır."
#. module: mrp_repair
#: report:repair.order:0
@@ -311,6 +348,8 @@ msgid ""
"This operation will cancel the Repair process, but will not cancel it's "
"Invoice. Do you want to continue?"
msgstr ""
+"Bu eylem Onarım işlemini iptal edecektir ama faturasını iptal etmeyecektir. "
+"Devam etmek istiyor musunuz?"
#. module: mrp_repair
#: field:mrp.repair,pricelist_id:0
@@ -327,17 +366,17 @@ msgstr "Teklif Notları"
#: code:addons/mrp_repair/wizard/cancel_repair.py:49
#, python-format
msgid "Warning!"
-msgstr ""
+msgstr "Uyarı!"
#. module: mrp_repair
#: view:mrp.repair:0
msgid "Search Reair Orders"
-msgstr ""
+msgstr "Onarım Siparişi Ara"
#. module: mrp_repair
#: report:repair.order:0
msgid "(Add)"
-msgstr ""
+msgstr "(Ekle)"
#. module: mrp_repair
#: model:ir.model,name:mrp_repair.model_mrp_repair_line
@@ -349,7 +388,7 @@ msgstr "Onarım Kalemi"
#: view:mrp.repair:0
#: field:mrp.repair,partner_id:0
msgid "Partner"
-msgstr "Ortak"
+msgstr "Paydaş"
#. module: mrp_repair
#: field:mrp.repair,invoice_method:0
@@ -364,7 +403,7 @@ msgstr "Onarıldı"
#. module: mrp_repair
#: model:ir.module.module,shortdesc:mrp_repair.module_meta_information
msgid "Products Repairs Module - Manage All products Repairs"
-msgstr ""
+msgstr "Ürün Onarımları Modülü - Bütün ürün Onarımlarını Yönet"
#. module: mrp_repair
#: field:mrp.repair.fee,invoice_line_id:0
@@ -385,7 +424,7 @@ msgstr "Onarım Öncesi"
#. module: mrp_repair
#: field:mrp.repair,location_id:0
msgid "Current Location"
-msgstr "Geçerli Lokasyon"
+msgstr "Geçerli Konum"
#. module: mrp_repair
#: view:mrp.repair.cancel:0
@@ -402,7 +441,7 @@ msgstr "Faturalandı"
#. module: mrp_repair
#: view:mrp.repair.cancel:0
msgid "No"
-msgstr "Hayır"
+msgstr "No"
#. module: mrp_repair
#: view:mrp.repair.make_invoice:0
@@ -412,78 +451,78 @@ msgstr "Faturaları Oluştur"
#. module: mrp_repair
#: report:repair.order:0
msgid "(Remove)"
-msgstr ""
+msgstr "(Kaldır)"
#. module: mrp_repair
#: selection:mrp.repair.line,type:0
msgid "Add"
-msgstr ""
+msgstr "Ekle"
#. module: mrp_repair
#: view:mrp.repair.make_invoice:0
msgid "Do you really want to create the invoice(s) ?"
-msgstr ""
+msgstr "Gerçekten fatura(ları) oluşturmak istiyor musunuz?"
#. module: mrp_repair
#: field:mrp.repair,name:0
msgid "Repair Reference"
-msgstr ""
+msgstr "Onarım Referansı"
#. module: mrp_repair
#: model:ir.model,name:mrp_repair.model_mrp_repair
msgid "Repair Order"
-msgstr ""
+msgstr "Onarım Siparişi"
#. module: mrp_repair
#: selection:mrp.repair,state:0
msgid "Under Repair"
-msgstr "Onarımdakiler"
+msgstr "Onarımda"
#. module: mrp_repair
#: view:mrp.repair:0
msgid "Ready To Repair"
-msgstr ""
+msgstr "Onarıma Hazır"
#. module: mrp_repair
#: field:mrp.repair,amount_untaxed:0
msgid "Untaxed Amount"
-msgstr "Tutar"
+msgstr "Vergisiz Tutar"
#. module: mrp_repair
#: report:repair.order:0
msgid "Guarantee Limit"
-msgstr "Garanti Limiti"
+msgstr "Garanti Sınırı"
#. module: mrp_repair
#: field:mrp.repair,default_address_id:0
msgid "unknown"
-msgstr ""
+msgstr "bilinmeyen"
#. module: mrp_repair
#: field:mrp.repair,product_id:0
#: report:repair.order:0
msgid "Product to Repair"
-msgstr "Ürün Onarımı"
+msgstr "Onarılacak Ürün"
#. module: mrp_repair
#: report:repair.order:0
msgid "N° :"
-msgstr ""
+msgstr "N° :"
#. module: mrp_repair
#: help:mrp.repair,pricelist_id:0
msgid "The pricelist comes from the selected partner, by default."
-msgstr ""
+msgstr "Fiyat Listesi, varsayılan olarak seçilen paydaşa aittir."
#. module: mrp_repair
#: view:mrp.repair:0
msgid "Date"
-msgstr ""
+msgstr "Tarih"
#. module: mrp_repair
#: model:ir.model,name:mrp_repair.model_mrp_repair_fee
msgid "Repair Fees Line"
-msgstr ""
+msgstr "Onarım Ücretleri Kalemi"
#. module: mrp_repair
#: selection:mrp.repair,state:0
@@ -498,7 +537,7 @@ msgstr "Hesapla"
#. module: mrp_repair
#: view:mrp.repair:0
msgid "Confirm Repair"
-msgstr "Düzeltmeyi Onayla"
+msgstr "Onarımı Onayla"
#. module: mrp_repair
#: report:repair.order:0
@@ -511,16 +550,16 @@ msgid "End Repair"
msgstr "Onarım Bitir"
#. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:405
-#: code:addons/mrp_repair/mrp_repair.py:434
+#: code:addons/mrp_repair/mrp_repair.py:408
+#: code:addons/mrp_repair/mrp_repair.py:437
#, python-format
msgid "No account defined for product \"%s\"."
-msgstr ""
+msgstr "\"%s\" Ürünü için tanımlı hesap yok."
#. module: mrp_repair
#: view:mrp.repair:0
msgid "Quotations"
-msgstr ""
+msgstr "Teklifler"
#. module: mrp_repair
#: field:mrp.repair.fee,product_uom_qty:0
@@ -538,7 +577,7 @@ msgstr "Onarımı Başlat"
#: field:mrp.repair,state:0
#: field:mrp.repair.line,state:0
msgid "State"
-msgstr ""
+msgstr "Durum"
#. module: mrp_repair
#: view:mrp.repair:0
@@ -566,6 +605,10 @@ msgid ""
"operation and fee you will add will be set as 'not to invoiced' by default. "
"Note that you can change manually afterwards."
msgstr ""
+"Garanti sınırı şöyle hesaplanır: son işlem tarihi + seçilen ürüne ait "
+"tanımlı garanti. Eğer geçerli tarih garanti sınırının altındaysa, "
+"ekleyeceğiniz her işlem ve ücret varsayılan olarak faturalandırılmayacak "
+"olarak işaretlenir. Daha sonra el ile değiştirebileceğinizi unutmayın."
#. module: mrp_repair
#: field:mrp.repair,invoice_id:0
@@ -575,18 +618,18 @@ msgstr "Fatura"
#. module: mrp_repair
#: view:mrp.repair:0
msgid "Fees"
-msgstr ""
+msgstr "Ücretler"
#. module: mrp_repair
#: selection:mrp.repair,state:0
#: view:mrp.repair.make_invoice:0
msgid "Cancel"
-msgstr "İptal"
+msgstr "Vazgeç"
#. module: mrp_repair
#: field:mrp.repair.line,location_dest_id:0
msgid "Dest. Location"
-msgstr "Hedef Lokasyon"
+msgstr "Hedef Konum"
#. module: mrp_repair
#: report:repair.order:0
@@ -596,12 +639,12 @@ msgstr "Operasyon Kalemi (leri)"
#. module: mrp_repair
#: view:mrp.repair:0
msgid "History"
-msgstr "Geçmiş Bilgisi"
+msgstr "Geçmiş"
#. module: mrp_repair
#: field:mrp.repair,location_dest_id:0
msgid "Delivery Location"
-msgstr "Teslimat Lokasyonu"
+msgstr "Teslimat Konumu"
#. module: mrp_repair
#: help:mrp.repair,invoice_method:0
@@ -610,11 +653,14 @@ msgid ""
"selected is different from 'No Invoice', it also allow you to select the "
"pricelist and invoicing address."
msgstr ""
+"Bu alan, sipariş emrine ait işakışını değiştirmenizi sağlar. Seçilen değer "
+"'Faturasız' dan farklı ise, fiyat listesi ve fatura adresi seçmenize izin "
+"verir."
#. module: mrp_repair
#: view:mrp.repair.make_invoice:0
msgid "Create Invoice"
-msgstr ""
+msgstr "Fatura Oluştur"
#. module: mrp_repair
#: field:mrp.repair.fee,name:0
@@ -626,12 +672,12 @@ msgstr "Açıklama"
#. module: mrp_repair
#: field:mrp.repair,operations:0
msgid "Operation Lines"
-msgstr "Operasyon Kalemleri"
+msgstr "İşlem Kalemleri"
#. module: mrp_repair
#: view:mrp.repair:0
msgid "invoiced"
-msgstr ""
+msgstr "faturalanmış"
#. module: mrp_repair
#: view:mrp.repair:0
@@ -643,7 +689,7 @@ msgstr "Ürün"
#. module: mrp_repair
#: view:mrp.repair:0
msgid "Invoice Corrected"
-msgstr ""
+msgstr "Fatura Düzeltildi"
#. module: mrp_repair
#: report:repair.order:0
@@ -653,13 +699,13 @@ msgstr "Fiyat"
#. module: mrp_repair
#: field:mrp.repair,deliver_bool:0
msgid "Deliver"
-msgstr "Teslimat"
+msgstr "Teslim Et"
#. module: mrp_repair
#: view:mrp.repair:0
#: field:mrp.repair,internal_notes:0
msgid "Internal Notes"
-msgstr "Dahili Notlar"
+msgstr "İç Notlar"
#. module: mrp_repair
#: report:repair.order:0
@@ -669,24 +715,24 @@ msgstr "Vergi:"
#. module: mrp_repair
#: field:mrp.repair,picking_id:0
msgid "Picking"
-msgstr ""
+msgstr "Toplama"
#. module: mrp_repair
#: view:mrp.repair:0
msgid "Untaxed amount"
-msgstr "Tutar"
+msgstr "Vergisiz Tutar"
#. module: mrp_repair
#: code:addons/mrp_repair/wizard/cancel_repair.py:41
#, python-format
msgid "Active ID is not Found"
-msgstr ""
+msgstr "Etkin No Bulunmadı"
#. module: mrp_repair
#: code:addons/mrp_repair/wizard/cancel_repair.py:49
#, python-format
msgid "Repair order is not invoiced."
-msgstr ""
+msgstr "Onarım siparişi faturanladırılmamış"
#. module: mrp_repair
#: view:mrp.repair:0
@@ -696,12 +742,12 @@ msgstr "Toplam Tutar"
#. module: mrp_repair
#: view:mrp.repair:0
msgid "UoM"
-msgstr "Birim"
+msgstr "Ölçü Birimi"
#. module: mrp_repair
#: selection:mrp.repair.line,type:0
msgid "Remove"
-msgstr ""
+msgstr "Kaldır"
#. module: mrp_repair
#: field:mrp.repair.fee,product_uom:0
@@ -750,6 +796,7 @@ msgstr "Durumlar"
msgid ""
"This field allow you to choose the parner that will be invoiced and delivered"
msgstr ""
+"Bu alan faturalandırılacak ve teslimat yapılacak paydaşı seçmenizi sağlar"
#. module: mrp_repair
#: field:mrp.repair,amount_total:0
@@ -762,10 +809,10 @@ msgid "Ready to Repair"
msgstr "Onarıma Hazır"
#. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:362
+#: code:addons/mrp_repair/mrp_repair.py:365
#, python-format
msgid "No partner !"
-msgstr ""
+msgstr "Paydaş Yok !"
#~ msgid "Invalid XML for View Architecture!"
#~ msgstr "Görüntüleme mimarisi için Geçersiz XML"
diff --git a/addons/mrp_repair/mrp_repair.py b/addons/mrp_repair/mrp_repair.py
index bedaa22b433..e95e3fb6058 100644
--- a/addons/mrp_repair/mrp_repair.py
+++ b/addons/mrp_repair/mrp_repair.py
@@ -558,7 +558,7 @@ class mrp_repair(osv.osv):
'name': repair.name,
'picking_id': picking,
'product_id': repair.product_id.id,
- 'product_qty': 1.0,
+ 'product_qty': move.product_uom_qty or 1.0,
'product_uom': repair.product_id.uom_id.id,
'prodlot_id': repair.prodlot_id and repair.prodlot_id.id or False,
'address_id': repair.address_id and repair.address_id.id or False,
diff --git a/addons/mrp_repair/mrp_repair_view.xml b/addons/mrp_repair/mrp_repair_view.xml
index c8554070a7c..16cdfc86b3d 100644
--- a/addons/mrp_repair/mrp_repair_view.xml
+++ b/addons/mrp_repair/mrp_repair_view.xml
@@ -116,7 +116,7 @@
diff --git a/addons/outlook/i18n/fi.po b/addons/outlook/i18n/fi.po
new file mode 100644
index 00000000000..c99b602787c
--- /dev/null
+++ b/addons/outlook/i18n/fi.po
@@ -0,0 +1,147 @@
+# Finnish translation for openobject-addons
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR , 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME \n"
+"POT-Creation-Date: 2011-01-11 11:15+0000\n"
+"PO-Revision-Date: 2011-06-20 09:14+0000\n"
+"Last-Translator: FULL NAME \n"
+"Language-Team: Finnish \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2011-06-21 04:37+0000\n"
+"X-Generator: Launchpad (build 13168)\n"
+
+#. module: outlook
+#: field:outlook.installer,doc_file:0
+msgid "Installation Manual"
+msgstr "Asennusohje"
+
+#. module: outlook
+#: field:outlook.installer,plugin_file:0
+msgid "Outlook Plug-in"
+msgstr "Outlook liitännäinen"
+
+#. module: outlook
+#: field:outlook.installer,description:0
+msgid "Description"
+msgstr "Kuvaus"
+
+#. module: outlook
+#: model:ir.ui.menu,name:outlook.menu_base_config_plugins_outlook
+#: view:outlook.installer:0
+msgid "Outlook Plug-In"
+msgstr "Outlook liitännäinen"
+
+#. module: outlook
+#: view:outlook.installer:0
+msgid "Skip"
+msgstr "Ohita"
+
+#. module: outlook
+#: model:ir.module.module,shortdesc:outlook.module_meta_information
+msgid "Outlook Interface"
+msgstr "Outlook liittymä"
+
+#. module: outlook
+#: field:outlook.installer,doc_name:0
+#: field:outlook.installer,name:0
+msgid "File name"
+msgstr "Tiedostonimi"
+
+#. module: outlook
+#: field:outlook.installer,outlook:0
+msgid "Outlook Plug-in "
+msgstr "Outlook liitännäinen "
+
+#. module: outlook
+#: model:ir.module.module,description:outlook.module_meta_information
+msgid ""
+"\n"
+" This module provide the Outlook plug-in. \n"
+"\n"
+" Outlook plug-in allows you to select an object that you’d like to add\n"
+" to your email and its attachments from MS Outlook. You can select a "
+"partner, a task,\n"
+" a project, an analytical account, or any other object and Archived "
+"selected\n"
+" mail in mailgate.messages with attachments.\n"
+"\n"
+" "
+msgstr ""
+
+#. module: outlook
+#: help:outlook.installer,doc_file:0
+msgid "The documentation file :- how to install Outlook Plug-in."
+msgstr "Dokumentointi : -kuinka outlook liitännäinen asennetaan."
+
+#. module: outlook
+#: model:ir.model,name:outlook.model_outlook_installer
+msgid "outlook.installer"
+msgstr ""
+
+#. module: outlook
+#: model:ir.actions.act_window,name:outlook.action_outlook_installer
+#: model:ir.actions.act_window,name:outlook.action_outlook_wizard
+#: view:outlook.installer:0
+msgid "Outlook Plug-In Configuration"
+msgstr "Outlook liitännäisen konfiguraatio"
+
+#. module: outlook
+#: field:outlook.installer,progress:0
+msgid "Configuration Progress"
+msgstr "Konfiguraation eteneminen"
+
+#. module: outlook
+#: view:outlook.installer:0
+msgid ""
+"This plug-in allows you to link your e-mail to OpenERP's documents. You can "
+"attach it to any existing one in OpenERP or create a new one."
+msgstr ""
+"Tämä liitännäien sallii sinun linkittää sähköpostisi OpenERP dokumentteihin. "
+"Voit liittää sen mihin tahansa OpenERP:iin tai luoda uuden."
+
+#. module: outlook
+#: help:outlook.installer,outlook:0
+msgid ""
+"Allows you to select an object that you would like to add to your email and "
+"its attachments."
+msgstr ""
+"Voit valita objektin jonka haluat liittää sähköpostiin ja sen liitteisiin."
+
+#. module: outlook
+#: view:outlook.installer:0
+msgid "title"
+msgstr "otsikko"
+
+#. module: outlook
+#: view:outlook.installer:0
+msgid "_Close"
+msgstr ""
+
+#. module: outlook
+#: view:outlook.installer:0
+msgid "Installation and Configuration Steps"
+msgstr "Asennus ja konfigurointivaiheet"
+
+#. module: outlook
+#: field:outlook.installer,config_logo:0
+msgid "Image"
+msgstr "Kuva"
+
+#. module: outlook
+#: help:outlook.installer,plugin_file:0
+msgid ""
+"outlook plug-in file. Save as this file and install this plug-in in outlook."
+msgstr ""
+"Outlook liitännäistiedosto. Talleta se tiedostona ja asenna outlookissa."
+
+#. module: outlook
+#: view:outlook.installer:0
+msgid "Configure"
+msgstr "Konfiguroi"
diff --git a/addons/outlook/i18n/pt_BR.po b/addons/outlook/i18n/pt_BR.po
index 632c054af70..ebc9c361bbc 100644
--- a/addons/outlook/i18n/pt_BR.po
+++ b/addons/outlook/i18n/pt_BR.po
@@ -8,14 +8,14 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2011-01-11 11:15+0000\n"
-"PO-Revision-Date: 2011-01-24 12:41+0000\n"
-"Last-Translator: Adriano Prado \n"
+"PO-Revision-Date: 2011-05-24 18:04+0000\n"
+"Last-Translator: Eduardo de Jesus \n"
"Language-Team: Brazilian Portuguese \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-29 05:53+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-05-25 04:39+0000\n"
+"X-Generator: Launchpad (build 12959)\n"
#. module: outlook
#: field:outlook.installer,doc_file:0
@@ -138,9 +138,9 @@ msgstr "Imagem"
#: help:outlook.installer,plugin_file:0
msgid ""
"outlook plug-in file. Save as this file and install this plug-in in outlook."
-msgstr ""
+msgstr "Plug-in do Outlook. Salve e instale esse plug-in no Outlook."
#. module: outlook
#: view:outlook.installer:0
msgid "Configure"
-msgstr ""
+msgstr "Configurar"
diff --git a/addons/pad/i18n/fi.po b/addons/pad/i18n/fi.po
new file mode 100644
index 00000000000..fbec40b9370
--- /dev/null
+++ b/addons/pad/i18n/fi.po
@@ -0,0 +1,77 @@
+# Finnish translation for openobject-addons
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR , 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME \n"
+"POT-Creation-Date: 2011-01-11 11:15+0000\n"
+"PO-Revision-Date: 2011-06-20 09:18+0000\n"
+"Last-Translator: FULL NAME \n"
+"Language-Team: Finnish \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2011-06-21 04:37+0000\n"
+"X-Generator: Launchpad (build 13168)\n"
+
+#. module: pad
+#: code:addons/pad/web/editors.py:32
+#, python-format
+msgid "Ok"
+msgstr "OK"
+
+#. module: pad
+#: code:addons/pad/web/editors.py:29
+#, python-format
+msgid "Name"
+msgstr "Nimi"
+
+#. module: pad
+#: help:res.company,pad_index:0
+msgid "The root URL of the company's pad instance"
+msgstr "Peruspolku yrityksen PAD instassiin"
+
+#. module: pad
+#: model:ir.model,name:pad.model_res_company
+msgid "Companies"
+msgstr "Yritykset"
+
+#. module: pad
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr "Virhe! Et voi luoda sisäkkäisiä yrityksiä."
+
+#. module: pad
+#: code:addons/pad/web/editors.py:17
+#, python-format
+msgid "Write"
+msgstr "Kirjoita"
+
+#. module: pad
+#: model:ir.module.module,description:pad.module_meta_information
+msgid ""
+"\n"
+"Adds enhanced support for (Ether)Pad attachments in the web client, lets "
+"the\n"
+"company customize which Pad installation should be used to link to new pads\n"
+"(by default, pad.openerp.com)\n"
+" "
+msgstr ""
+
+#. module: pad
+#: field:res.company,pad_index:0
+msgid "Pad root URL"
+msgstr "Padin peruspolku (URL)"
+
+#. module: pad
+#: view:res.company:0
+msgid "Pad"
+msgstr ""
+
+#. module: pad
+#: model:ir.module.module,shortdesc:pad.module_meta_information
+msgid "Enhanced support for (Ether)Pad attachments"
+msgstr "Parannettu tuki (Ether)PAD liitännöille"
diff --git a/addons/pad/i18n/tr.po b/addons/pad/i18n/tr.po
new file mode 100644
index 00000000000..39cfd9f874d
--- /dev/null
+++ b/addons/pad/i18n/tr.po
@@ -0,0 +1,77 @@
+# Turkish translation for openobject-addons
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR , 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME \n"
+"POT-Creation-Date: 2011-01-11 11:15+0000\n"
+"PO-Revision-Date: 2011-05-28 19:33+0000\n"
+"Last-Translator: FULL NAME \n"
+"Language-Team: Turkish \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2011-05-29 04:36+0000\n"
+"X-Generator: Launchpad (build 12959)\n"
+
+#. module: pad
+#: code:addons/pad/web/editors.py:32
+#, python-format
+msgid "Ok"
+msgstr "Tamam"
+
+#. module: pad
+#: code:addons/pad/web/editors.py:29
+#, python-format
+msgid "Name"
+msgstr "Ad"
+
+#. module: pad
+#: help:res.company,pad_index:0
+msgid "The root URL of the company's pad instance"
+msgstr ""
+
+#. module: pad
+#: model:ir.model,name:pad.model_res_company
+msgid "Companies"
+msgstr "Firmalar"
+
+#. module: pad
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr "Hata! İç içe tekrarlayan şirketler seçemezsiniz."
+
+#. module: pad
+#: code:addons/pad/web/editors.py:17
+#, python-format
+msgid "Write"
+msgstr "Yaz"
+
+#. module: pad
+#: model:ir.module.module,description:pad.module_meta_information
+msgid ""
+"\n"
+"Adds enhanced support for (Ether)Pad attachments in the web client, lets "
+"the\n"
+"company customize which Pad installation should be used to link to new pads\n"
+"(by default, pad.openerp.com)\n"
+" "
+msgstr ""
+
+#. module: pad
+#: field:res.company,pad_index:0
+msgid "Pad root URL"
+msgstr ""
+
+#. module: pad
+#: view:res.company:0
+msgid "Pad"
+msgstr ""
+
+#. module: pad
+#: model:ir.module.module,shortdesc:pad.module_meta_information
+msgid "Enhanced support for (Ether)Pad attachments"
+msgstr ""
diff --git a/addons/procurement/i18n/fi.po b/addons/procurement/i18n/fi.po
new file mode 100644
index 00000000000..6895606767f
--- /dev/null
+++ b/addons/procurement/i18n/fi.po
@@ -0,0 +1,899 @@
+# Finnish translation for openobject-addons
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR , 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME \n"
+"POT-Creation-Date: 2011-01-11 11:15+0000\n"
+"PO-Revision-Date: 2011-06-20 09:20+0000\n"
+"Last-Translator: FULL NAME \n"
+"Language-Team: Finnish \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2011-06-21 04:37+0000\n"
+"X-Generator: Launchpad (build 13168)\n"
+
+#. module: procurement
+#: view:make.procurement:0
+msgid "Ask New Products"
+msgstr "Kysy uusia tuotteita"
+
+#. module: procurement
+#: model:ir.ui.menu,name:procurement.menu_stock_sched
+msgid "Schedulers"
+msgstr "Ajastimet"
+
+#. module: procurement
+#: model:ir.model,name:procurement.model_make_procurement
+msgid "Make Procurements"
+msgstr "Tee hankinnat"
+
+#. module: procurement
+#: help:procurement.order.compute.all,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 ""
+"Liipaisee automaattisen hankinnan kaikille tuotteille joiden näennäisvarasto "
+"on alle 0. Tätä vaihtoehtoa ei yleensä käytetä, vaan tuotteille on parempi "
+"määrittää varastosäännöt."
+
+#. module: procurement
+#: view:stock.warehouse.orderpoint:0
+msgid "Group By..."
+msgstr "Ryhmittely.."
+
+#. module: procurement
+#: help:stock.warehouse.orderpoint,procurement_draft_ids:0
+msgid "Draft procurement of the product and location of that orderpoint"
+msgstr "Luonnnos hankinta tuotteelle ja tilauspisteen paikalle"
+
+#. module: procurement
+#: code:addons/procurement/procurement.py:288
+#, python-format
+msgid "No supplier defined for this product !"
+msgstr "Tuotteelle ei ole määritelty toimittajaa!"
+
+#. module: procurement
+#: field:make.procurement,uom_id:0
+msgid "Unit of Measure"
+msgstr "Mittayksikkö"
+
+#. module: procurement
+#: field:procurement.order,procure_method:0
+msgid "Procurement Method"
+msgstr "Hankintatapa"
+
+#. module: procurement
+#: code:addons/procurement/procurement.py:304
+#, python-format
+msgid "No address defined for the supplier"
+msgstr "Toimittajan osoitetta ei ole määritetty"
+
+#. module: procurement
+#: model:ir.actions.act_window,name:procurement.action_procurement_compute
+msgid "Compute Stock Minimum Rules Only"
+msgstr "Laske vain varaston minimirajat"
+
+#. module: procurement
+#: field:procurement.order,company_id:0
+#: field:stock.warehouse.orderpoint,company_id:0
+msgid "Company"
+msgstr "Yritys"
+
+#. module: procurement
+#: field:procurement.order,product_uos_qty:0
+msgid "UoS Quantity"
+msgstr "Myyntiyksikkö määrä"
+
+#. module: procurement
+#: view:procurement.order:0
+#: field:procurement.order,name:0
+msgid "Reason"
+msgstr "Syy"
+
+#. module: procurement
+#: view:procurement.order.compute:0
+msgid "Compute Procurements"
+msgstr "Laske hankinnat"
+
+#. module: procurement
+#: field:procurement.order,message:0
+msgid "Latest error"
+msgstr "Viimeisin virhe"
+
+#. module: procurement
+#: help:mrp.property,composition:0
+msgid "Not used in computations, for information purpose only."
+msgstr "Ei käytetä laskutoimituksiin - vain tietoja varten."
+
+#. module: procurement
+#: field:stock.warehouse.orderpoint,procurement_id:0
+msgid "Latest procurement"
+msgstr "Viimeisin hankinta"
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "Notes"
+msgstr "Huomautukset"
+
+#. module: procurement
+#: selection:procurement.order,procure_method:0
+msgid "on order"
+msgstr "tilauksessa"
+
+#. module: procurement
+#: help:procurement.order,message:0
+msgid "Exception occurred while computing procurement orders."
+msgstr "Hankintatilausten laskennassa sattui poikkeus."
+
+#. module: procurement
+#: help:procurement.order,state:0
+msgid ""
+"When a procurement is created the state is set to 'Draft'.\n"
+" If the procurement is confirmed, the state is set to 'Confirmed'. "
+" \n"
+"After confirming the state is set to 'Running'.\n"
+" If any exception arises in the order then the state is set to 'Exception'.\n"
+" Once the exception is removed the state becomes 'Ready'.\n"
+" It is in 'Waiting'. state when the procurement is waiting for another one "
+"to finish."
+msgstr ""
+
+#. module: procurement
+#: view:stock.warehouse.orderpoint:0
+msgid "Minimum Stock Rules Search"
+msgstr "Minimivarasto sääntöjen haku"
+
+#. module: procurement
+#: help:stock.warehouse.orderpoint,product_min_qty:0
+msgid ""
+"When the virtual stock goes belong the Min Quantity, OpenERP generates a "
+"procurement to bring the virtual stock to the Max Quantity."
+msgstr ""
+
+#. module: procurement
+#: view:procurement.order.compute.all:0
+msgid "Scheduler Parameters"
+msgstr "Aikataulutuksen parametrit"
+
+#. module: procurement
+#: model:ir.model,name:procurement.model_stock_move
+msgid "Stock Move"
+msgstr "Varastosiirto"
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "Planification"
+msgstr "Suunnittelu"
+
+#. module: procurement
+#: selection:procurement.order,state:0
+msgid "Ready"
+msgstr "Valmis"
+
+#. module: procurement
+#: field:procurement.order.compute.all,automatic:0
+msgid "Automatic orderpoint"
+msgstr "Automaattinen tilauspiste"
+
+#. module: procurement
+#: field:mrp.property,composition:0
+msgid "Properties composition"
+msgstr "Ominaisuuksien koostumus"
+
+#. module: procurement
+#: selection:procurement.order,state:0
+msgid "Confirmed"
+msgstr "Vahvistettu"
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "Retry"
+msgstr "Yritä uudelleen"
+
+#. module: procurement
+#: view:procurement.order.compute:0
+#: view:procurement.orderpoint.compute:0
+msgid "Parameters"
+msgstr "Parametrit"
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "Confirm"
+msgstr "Vahvista"
+
+#. module: procurement
+#: help:procurement.order,origin:0
+msgid ""
+"Reference of the document that created this Procurement.\n"
+"This is automatically completed by OpenERP."
+msgstr ""
+
+#. module: procurement
+#: view:stock.warehouse.orderpoint:0
+msgid "Procurement Orders to Process"
+msgstr "Prosessoitavat hankintatilaukset"
+
+#. module: procurement
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr "Virhe! Et voi luoda sisäkkäisiä yrityksiä."
+
+#. module: procurement
+#: field:procurement.order,priority:0
+msgid "Priority"
+msgstr "Prioriteetti"
+
+#. module: procurement
+#: view:procurement.order:0
+#: field:procurement.order,state:0
+msgid "State"
+msgstr "Tila"
+
+#. module: procurement
+#: field:procurement.order,location_id:0
+#: view:stock.warehouse.orderpoint:0
+#: field:stock.warehouse.orderpoint,location_id:0
+msgid "Location"
+msgstr "Sijainti"
+
+#. module: procurement
+#: model:ir.model,name:procurement.model_stock_picking
+msgid "Picking List"
+msgstr "Keräilylista"
+
+#. module: procurement
+#: field:make.procurement,warehouse_id:0
+#: view:stock.warehouse.orderpoint:0
+#: field:stock.warehouse.orderpoint,warehouse_id:0
+msgid "Warehouse"
+msgstr "Varasto"
+
+#. module: procurement
+#: selection:stock.warehouse.orderpoint,logic:0
+msgid "Best price (not yet active!)"
+msgstr "Paras hinta (ei vielä aktiivinen!)"
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "Product & Location"
+msgstr "Tuote & Sijainti"
+
+#. module: procurement
+#: model:ir.model,name:procurement.model_procurement_order_compute
+msgid "Compute Procurement"
+msgstr "Laske hankinta"
+
+#. module: procurement
+#: model:ir.module.module,shortdesc:procurement.module_meta_information
+#: field:stock.move,procurements:0
+msgid "Procurements"
+msgstr "Hankinnat"
+
+#. module: procurement
+#: field:res.company,schedule_range:0
+msgid "Scheduler Range Days"
+msgstr "Ajastimen jakson päivät"
+
+#. module: procurement
+#: model:ir.actions.act_window,help:procurement.procurement_action
+msgid ""
+"A procurement order is used to record a need for a specific product at a "
+"specific location. A procurement order is usually created automatically from "
+"sales orders, a Pull Logistics rule or Minimum Stock Rules. When the "
+"procurement order is confirmed, it automatically creates the necessary "
+"operations to fullfil the need: purchase order proposition, manufacturing "
+"order, etc."
+msgstr ""
+
+#. module: procurement
+#: field:make.procurement,date_planned:0
+msgid "Planned Date"
+msgstr "Suunniteltu päivämäärä"
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "Group By"
+msgstr "Ryhmittelyn peruste"
+
+#. module: procurement
+#: field:make.procurement,qty:0
+#: field:procurement.order,product_qty:0
+msgid "Quantity"
+msgstr "Määrä"
+
+#. module: procurement
+#: code:addons/procurement/procurement.py:377
+#, python-format
+msgid "Not enough stock and no minimum orderpoint rule defined."
+msgstr "Ei tarpeeksi varastoa eikä minimitilauspistesääntöä määriteltynä"
+
+#. module: procurement
+#: code:addons/procurement/procurement.py:137
+#, python-format
+msgid "Invalid action !"
+msgstr "Virheellinen toiminto!"
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "References"
+msgstr "Viitteet"
+
+#. module: procurement
+#: view:res.company:0
+msgid "Configuration"
+msgstr "Konfiguraatio"
+
+#. module: procurement
+#: field:stock.warehouse.orderpoint,qty_multiple:0
+msgid "Qty Multiple"
+msgstr "Määrän kerroin"
+
+#. module: procurement
+#: help:procurement.order,procure_method:0
+msgid ""
+"If you encode manually a Procurement, you probably want to use a make to "
+"order method."
+msgstr ""
+
+#. module: procurement
+#: model:ir.ui.menu,name:procurement.menu_stock_procurement
+msgid "Automatic Procurements"
+msgstr "Automaattiset hankinnat"
+
+#. module: procurement
+#: field:stock.warehouse.orderpoint,product_max_qty:0
+msgid "Max Quantity"
+msgstr "Maksimimäärä"
+
+#. module: procurement
+#: model:ir.model,name:procurement.model_procurement_order
+#: model:process.process,name:procurement.process_process_procurementprocess0
+#: view:procurement.order:0
+msgid "Procurement"
+msgstr "Hankinta"
+
+#. module: procurement
+#: model:ir.actions.act_window,name:procurement.procurement_action
+msgid "Procurement Orders"
+msgstr "Hankintatilaukset"
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "To Fix"
+msgstr "Korjattavaksi"
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "Exceptions"
+msgstr "Poikkeukset"
+
+#. module: procurement
+#: model:process.node,note:procurement.process_node_serviceonorder0
+msgid "Assignment from Production or Purchase Order."
+msgstr "Määritys tuotannosta tai ostotilaukselta."
+
+#. module: procurement
+#: model:ir.model,name:procurement.model_mrp_property
+msgid "Property"
+msgstr "Ominaisuus"
+
+#. module: procurement
+#: model:ir.actions.act_window,name:procurement.act_make_procurement
+#: view:make.procurement:0
+msgid "Procurement Request"
+msgstr "Hankintapyyntö"
+
+#. module: procurement
+#: view:procurement.orderpoint.compute:0
+msgid "Compute Stock"
+msgstr "Laske varasto"
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "Late"
+msgstr "Myöhässä"
+
+#. module: procurement
+#: model:process.process,name:procurement.process_process_serviceproductprocess0
+msgid "Service"
+msgstr "Palvelu"
+
+#. module: procurement
+#: model:ir.module.module,description:procurement.module_meta_information
+msgid ""
+"\n"
+" This is the module for computing Procurements.\n"
+" "
+msgstr ""
+
+#. module: procurement
+#: field:stock.warehouse.orderpoint,procurement_draft_ids:0
+msgid "Related Procurement Orders"
+msgstr "Liittyvät hankintatilaukset"
+
+#. module: procurement
+#: view:procurement.orderpoint.compute:0
+msgid ""
+"Wizard checks all the stock minimum rules and generate procurement order."
+msgstr "Velho tarkistaa kaikki minimivarastosäännöt ja luo hankintatilauksen"
+
+#. module: procurement
+#: field:stock.warehouse.orderpoint,product_min_qty:0
+msgid "Min Quantity"
+msgstr "Minimimäärä"
+
+#. module: procurement
+#: selection:procurement.order,priority:0
+msgid "Urgent"
+msgstr "Kiireellinen"
+
+#. module: procurement
+#: selection:mrp.property,composition:0
+msgid "plus"
+msgstr "plus"
+
+#. module: procurement
+#: code:addons/procurement/procurement.py:325
+#, python-format
+msgid ""
+"Please check the Quantity in Procurement Order(s), it should not be less "
+"than 1!"
+msgstr ""
+"Ole hyvä ja tarkista määrä hankintatilauksella. Sen ei tulisi olla alle 1 !"
+
+#. module: procurement
+#: help:stock.warehouse.orderpoint,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the "
+"orderpoint without removing it."
+msgstr ""
+"Jos aktiivisen kentän tilaksi asetetaan epätosi (false) se mahdollistaa "
+"tilauspisteen piilottamisen ilman sen poistamista"
+
+#. module: procurement
+#: help:stock.warehouse.orderpoint,product_max_qty:0
+msgid ""
+"When the virtual stock goes belong the Max Quantity, OpenERP generates a "
+"procurement to bring the virtual stock to the Max Quantity."
+msgstr ""
+
+#. module: procurement
+#: help:procurement.orderpoint.compute,automatic:0
+msgid "If the stock of a product is under 0, it will act like an orderpoint"
+msgstr "Jos tuotteen varastosaldo on alle 0, toimii se tilauspisteenä"
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "Procurement Lines"
+msgstr "Hankinnan rivit"
+
+#. module: procurement
+#: view:procurement.order.compute.all:0
+msgid ""
+"This wizard allows you to run all procurement, production and/or purchase "
+"orders that should be processed based on their configuration. By default, "
+"the scheduler is launched automatically every night by OpenERP. You can use "
+"this menu to force it to be launched now. Note that it runs in the "
+"background, you may have to wait for a few minutes until it has finished "
+"computing."
+msgstr ""
+
+#. module: procurement
+#: view:procurement.order:0
+#: field:procurement.order,note:0
+msgid "Note"
+msgstr "Huomautus"
+
+#. module: procurement
+#: selection:procurement.order,state:0
+msgid "Draft"
+msgstr "Luonnos"
+
+#. module: procurement
+#: view:procurement.order.compute:0
+msgid "This wizard will schedule procurements."
+msgstr "Tämä ohjattu toiminto ajoittaa hankinnat."
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "Status"
+msgstr "Tila"
+
+#. module: procurement
+#: selection:procurement.order,priority:0
+msgid "Normal"
+msgstr "Tavallinen"
+
+#. module: procurement
+#: constraint:stock.move:0
+msgid "You try to assign a lot which is not from the same product"
+msgstr "Erä ei ole samaa tuotetta"
+
+#. module: procurement
+#: field:stock.warehouse.orderpoint,active:0
+msgid "Active"
+msgstr "Aktiivinen"
+
+#. module: procurement
+#: model:process.node,name:procurement.process_node_procureproducts0
+msgid "Procure Products"
+msgstr "Hanki tuotteita"
+
+#. module: procurement
+#: field:procurement.order,date_planned:0
+msgid "Scheduled date"
+msgstr "Arvioitu päivämäärä"
+
+#. module: procurement
+#: selection:procurement.order,state:0
+msgid "Exception"
+msgstr "Poikkeus"
+
+#. module: procurement
+#: code:addons/procurement/schedulers.py:179
+#, python-format
+msgid "Automatic OP: %s"
+msgstr "Automaattinen tilauspiste: %s"
+
+#. module: procurement
+#: model:ir.model,name:procurement.model_procurement_orderpoint_compute
+msgid "Automatic Order Point"
+msgstr "Automaattinen tilauspiste"
+
+#. module: procurement
+#: model:ir.model,name:procurement.model_stock_warehouse_orderpoint
+msgid "Minimum Inventory Rule"
+msgstr "Minimivarastosääntö"
+
+#. module: procurement
+#: model:ir.model,name:procurement.model_res_company
+msgid "Companies"
+msgstr "Yritykset"
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "Extra Information"
+msgstr "Lisätiedot"
+
+#. module: procurement
+#: help:procurement.order,name:0
+msgid "Procurement name."
+msgstr "Hankinnan nimi"
+
+#. module: procurement
+#: constraint:stock.move:0
+msgid "You must assign a production lot for this product"
+msgstr "Tälle tuotteelle pitää määrittää valmistuserä"
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "Procurement Reason"
+msgstr "Hankinnan syy"
+
+#. module: procurement
+#: sql_constraint:stock.warehouse.orderpoint:0
+msgid "Qty Multiple must be greater than zero."
+msgstr "Määrän kertoimen tulee olla yli 0"
+
+#. module: procurement
+#: selection:stock.warehouse.orderpoint,logic:0
+msgid "Order to Max"
+msgstr "Tilaa maksimiin"
+
+#. module: procurement
+#: field:procurement.order,date_close:0
+msgid "Date Closed"
+msgstr "Sulkemispäivä"
+
+#. module: procurement
+#: code:addons/procurement/procurement.py:372
+#, python-format
+msgid "Procurement '%s' is in exception: not enough stock."
+msgstr ""
+
+#. module: procurement
+#: code:addons/procurement/procurement.py:138
+#, python-format
+msgid "Cannot delete Procurement Order(s) which are in %s State!"
+msgstr "Ei voi poistaa hankintatilauksia jotka ovat tilassa %s !"
+
+#. module: procurement
+#: code:addons/procurement/procurement.py:324
+#, python-format
+msgid "Data Insufficient !"
+msgstr "Riittämätön data!"
+
+#. module: procurement
+#: model:ir.model,name:procurement.model_mrp_property_group
+#: field:mrp.property,group_id:0
+#: field:mrp.property.group,name:0
+msgid "Property Group"
+msgstr "Ominaisuusryhmä"
+
+#. module: procurement
+#: view:stock.warehouse.orderpoint:0
+msgid "Misc"
+msgstr "Sekalaiset"
+
+#. module: procurement
+#: view:stock.warehouse.orderpoint:0
+msgid "Locations"
+msgstr "Sijainnit"
+
+#. module: procurement
+#: selection:procurement.order,procure_method:0
+msgid "from stock"
+msgstr "varastosta"
+
+#. module: procurement
+#: view:stock.warehouse.orderpoint:0
+msgid "General Information"
+msgstr "Yleiset tiedot"
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "Run Procurement"
+msgstr "Suorita hankinta"
+
+#. module: procurement
+#: selection:procurement.order,state:0
+msgid "Done"
+msgstr "Valmis"
+
+#. module: procurement
+#: help:stock.warehouse.orderpoint,qty_multiple:0
+msgid "The procurement quantity will by rounded up to this multiple."
+msgstr "Hankinnan määrä pyöristetään ylös tähän moninkertaan."
+
+#. module: procurement
+#: view:make.procurement:0
+#: view:procurement.order:0
+#: selection:procurement.order,state:0
+#: view:procurement.order.compute:0
+#: view:procurement.order.compute.all:0
+#: view:procurement.orderpoint.compute:0
+msgid "Cancel"
+msgstr "Peruuta"
+
+#. module: procurement
+#: field:stock.warehouse.orderpoint,logic:0
+msgid "Reordering Mode"
+msgstr "Uusintatilauksen tapa"
+
+#. module: procurement
+#: field:procurement.order,origin:0
+msgid "Source Document"
+msgstr "Lähdedokumentti"
+
+#. module: procurement
+#: selection:procurement.order,priority:0
+msgid "Not urgent"
+msgstr "Ei kiireellinen"
+
+#. module: procurement
+#: model:ir.model,name:procurement.model_procurement_order_compute_all
+msgid "Compute all schedulers"
+msgstr "Laske kaikki ajastimet"
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "Current"
+msgstr "Nykyinen"
+
+#. module: procurement
+#: view:board.board:0
+msgid "Procurements in Exception"
+msgstr "Poikkeavat hankinnat"
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "Details"
+msgstr "Yksityiskohdat"
+
+#. module: procurement
+#: model:ir.actions.act_window,name:procurement.procurement_action5
+#: model:ir.actions.act_window,name:procurement.procurement_action_board
+#: model:ir.actions.act_window,name:procurement.procurement_exceptions
+#: model:ir.ui.menu,name:procurement.menu_stock_procurement_action
+msgid "Procurement Exceptions"
+msgstr "Hankinnan poikkeamat"
+
+#. module: procurement
+#: model:ir.actions.act_window,name:procurement.act_procurement_2_stock_warehouse_orderpoint
+#: model:ir.actions.act_window,name:procurement.act_product_product_2_stock_warehouse_orderpoint
+#: model:ir.actions.act_window,name:procurement.act_stock_warehouse_2_stock_warehouse_orderpoint
+#: model:ir.actions.act_window,name:procurement.action_orderpoint_form
+#: model:ir.ui.menu,name:procurement.menu_stock_order_points
+#: view:stock.warehouse.orderpoint:0
+msgid "Minimum Stock Rules"
+msgstr "Varaston minimirajat"
+
+#. module: procurement
+#: field:procurement.order,close_move:0
+msgid "Close Move at end"
+msgstr "Sulje siirto lopussa"
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "Scheduled Date"
+msgstr "Suunniteltu päivämäärä"
+
+#. module: procurement
+#: field:make.procurement,product_id:0
+#: view:procurement.order:0
+#: field:procurement.order,product_id:0
+#: field:stock.warehouse.orderpoint,product_id:0
+msgid "Product"
+msgstr "Tuote"
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "Temporary"
+msgstr "Väliaikainen"
+
+#. module: procurement
+#: field:mrp.property,description:0
+#: field:mrp.property.group,description:0
+msgid "Description"
+msgstr "Kuvaus"
+
+#. module: procurement
+#: selection:mrp.property,composition:0
+msgid "min"
+msgstr "minimi"
+
+#. module: procurement
+#: view:stock.warehouse.orderpoint:0
+msgid "Quantity Rules"
+msgstr "Määräsäännöt"
+
+#. module: procurement
+#: selection:procurement.order,state:0
+msgid "Running"
+msgstr "Käynnissä olevat"
+
+#. module: procurement
+#: field:stock.warehouse.orderpoint,product_uom:0
+msgid "Product UOM"
+msgstr "Tuotteen mittayksikkö"
+
+#. module: procurement
+#: model:process.node,name:procurement.process_node_serviceonorder0
+msgid "Make to Order"
+msgstr "Valmista tilaukselle"
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "UOM"
+msgstr "Mittayksikkö"
+
+#. module: procurement
+#: selection:procurement.order,state:0
+msgid "Waiting"
+msgstr "Odotetaan"
+
+#. module: procurement
+#: model:ir.actions.act_window,help:procurement.action_orderpoint_form
+msgid ""
+"You can define your minimum stock rules, so that OpenERP will automatically "
+"create draft manufacturing orders or purchase quotations according to the "
+"stock level. Once the virtual stock of a product (= stock on hand minus all "
+"confirmed orders and reservations) is below the minimum quantity, OpenERP "
+"will generate a procurement request to increase the stock up to the maximum "
+"quantity."
+msgstr ""
+
+#. module: procurement
+#: field:procurement.order,move_id:0
+msgid "Reservation"
+msgstr "Varaus"
+
+#. module: procurement
+#: model:process.node,note:procurement.process_node_procureproducts0
+msgid "The way to procurement depends on the product type."
+msgstr "Hankintatapa riippuu tuotteen tyypistä"
+
+#. module: procurement
+#: view:make.procurement:0
+msgid ""
+"This wizard will plan the procurement for this product. This procurement may "
+"generate task, production orders or purchase orders."
+msgstr ""
+
+#. module: procurement
+#: view:res.company:0
+msgid "MRP & Logistics Scheduler"
+msgstr "MRP ja logistiikka ajastin"
+
+#. module: procurement
+#: field:mrp.property,name:0
+#: field:stock.warehouse.orderpoint,name:0
+msgid "Name"
+msgstr "Nimi"
+
+#. module: procurement
+#: selection:mrp.property,composition:0
+msgid "max"
+msgstr "maksimi"
+
+#. module: procurement
+#: field:procurement.order,product_uos:0
+msgid "Product UoS"
+msgstr "Tuotteen myyntiyksikkö"
+
+#. module: procurement
+#: code:addons/procurement/procurement.py:353
+#, python-format
+msgid "from stock: products assigned."
+msgstr "varastosta: tuotteet määrätty."
+
+#. module: procurement
+#: model:ir.actions.act_window,name:procurement.action_compute_schedulers
+#: model:ir.ui.menu,name:procurement.menu_stock_proc_schedulers
+#: view:procurement.order.compute.all:0
+msgid "Compute Schedulers"
+msgstr "Laske ajastimet"
+
+#. module: procurement
+#: model:ir.actions.act_window,help:procurement.procurement_exceptions
+msgid ""
+"Procurement Orders represent the need for a certain quantity of products, at "
+"a given time, in a given location. Sales Orders are one typical source of "
+"Procurement Orders (but these are distinct documents). Depending on the "
+"procurement parameters and the product configuration, the procurement engine "
+"will attempt to satisfy the need by reserving products from stock, ordering "
+"products from a supplier, or passing a manufacturing order, etc. A "
+"Procurement Exception occurs when the system cannot find a way to fulfill a "
+"procurement. Some exceptions will resolve themselves automatically, but "
+"others require manual intervention (those are identified by a specific error "
+"message)."
+msgstr ""
+
+#. module: procurement
+#: field:procurement.order,product_uom:0
+msgid "Product UoM"
+msgstr "Tuotteen mittayksikkö"
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "Search Procurement"
+msgstr "Hae hankinnoista"
+
+#. module: procurement
+#: help:res.company,schedule_range:0
+msgid ""
+"This is the time frame analysed by the scheduler when computing "
+"procurements. All procurements that are not between today and today+range "
+"are skipped for future computation."
+msgstr ""
+"Aikaikkuna jonka ajastin analysoi hankintojen laskennassa. Kaikki hankinnat "
+"jotka eivät ole jakson tänään ja tänään+jakso sisällä ohitetaan tulevia "
+"laskentoja varten"
+
+#. module: procurement
+#: selection:procurement.order,priority:0
+msgid "Very Urgent"
+msgstr "Erittäin kiireellinen"
+
+#. module: procurement
+#: field:procurement.orderpoint.compute,automatic:0
+msgid "Automatic Orderpoint"
+msgstr "Automaattinen tilauspiste"
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "Procurement Details"
+msgstr "Hankinnan yksityiskohdat"
+
+#. module: procurement
+#: code:addons/procurement/schedulers.py:180
+#, python-format
+msgid "SCHEDULER"
+msgstr "AJASTIN"
diff --git a/addons/procurement/security/procurement_security.xml b/addons/procurement/security/procurement_security.xml
index 2e250db461c..b6b15d565c6 100644
--- a/addons/procurement/security/procurement_security.xml
+++ b/addons/procurement/security/procurement_security.xml
@@ -6,14 +6,14 @@
procurement multi-company
- ['|','|',('company_id','child_of',[user.company_id.id]),('company_id','=',False),('company_id.child_ids','child_of',[user.company_id.id])]
+ ['|',('company_id','child_of',[user.company_id.id]),('company_id','=',False)]
stock_warehouse.orderpoint multi-company
- ['|','|',('company_id','child_of',[user.company_id.id]),('company_id','=',False),('company_id.child_ids','child_of',[user.company_id.id])]
+ ['|',('company_id','child_of',[user.company_id.id]),('company_id','=',False)]
diff --git a/addons/product/i18n/vi.po b/addons/product/i18n/vi.po
index 854d6666f3d..fab7b68520a 100644
--- a/addons/product/i18n/vi.po
+++ b/addons/product/i18n/vi.po
@@ -8,24 +8,24 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2011-01-11 11:15+0000\n"
-"PO-Revision-Date: 2010-12-15 23:51+0000\n"
-"Last-Translator: OpenERP Administrators \n"
+"PO-Revision-Date: 2011-06-04 14:36+0000\n"
+"Last-Translator: Phong Nguyen-Thanh \n"
"Language-Team: Vietnamese \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-29 05:19+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-06-05 04:35+0000\n"
+"X-Generator: Launchpad (build 12959)\n"
#. module: product
#: model:product.template,name:product.product_product_ram512_product_template
msgid "DDR 512MB PC400"
-msgstr ""
+msgstr "DDR 512MB PC400"
#. module: product
#: field:product.packaging,rows:0
msgid "Number of Layers"
-msgstr ""
+msgstr "số lớp"
#. module: product
#: constraint:product.pricelist.item:0
@@ -53,12 +53,12 @@ msgstr "Có thể bán"
#. module: product
#: model:product.template,name:product.product_product_mb2_product_template
msgid "Mainboard ASUStek A7V8X-X"
-msgstr ""
+msgstr "Mainboard ASUStek A7V8X-X"
#. module: product
#: help:product.template,seller_qty:0
msgid "This is minimum quantity to purchase from Main Supplier."
-msgstr ""
+msgstr "Đây là số lượng tối thiểu để mua từ Nhà cung cấp Chính."
#. module: product
#: model:product.uom,name:product.uom_day
@@ -73,7 +73,7 @@ msgstr "Đơn vị đo"
#. module: product
#: model:product.template,name:product.product_product_pc2_product_template
msgid "Basic+ PC (assembly on order)"
-msgstr ""
+msgstr "Cơ bản + PC (lắp ráp về trật tự)"
#. module: product
#: field:product.product,incoming_qty:0
@@ -91,6 +91,7 @@ msgid ""
"This pricelist will be used, instead of the default one, for sales to the "
"current partner"
msgstr ""
+"Bảng giá này sẽ được sử dụng, thay vì mặc định, để bán cho đối tác hiện tại"
#. module: product
#: constraint:product.supplierinfo:0
@@ -98,11 +99,13 @@ msgid ""
"Error: The default UOM and the Supplier Product UOM must be in the same "
"category."
msgstr ""
+"Lỗi: Đơn vị đo lường và mặc định của Nhà cung cấp sản phẩm của đơn vị đo "
+"phải được trong cùng thể loại."
#. module: product
#: field:product.template,seller_qty:0
msgid "Supplier Quantity"
-msgstr ""
+msgstr "Chất lượng cung ứng"
#. module: product
#: selection:product.template,mes_type:0
@@ -111,8 +114,8 @@ msgstr "Cố định"
#. module: product
#: code:addons/product/pricelist.py:186
-#: code:addons/product/pricelist.py:339
-#: code:addons/product/pricelist.py:357
+#: code:addons/product/pricelist.py:342
+#: code:addons/product/pricelist.py:360
#, python-format
msgid "Warning !"
msgstr "Cảnh báo !"
@@ -146,7 +149,7 @@ msgstr "Tham chiếu"
#. module: product
#: constraint:product.category:0
msgid "Error ! You can not create recursive categories."
-msgstr ""
+msgstr "Lỗi ! Bạn không thể tạo ra loại đệ quy."
#. module: product
#: help:pricelist.partnerinfo,min_quantity:0
@@ -154,6 +157,9 @@ msgid ""
"The minimal quantity to trigger this rule, expressed in the supplier UoM if "
"any or in the default UoM of the product otherrwise."
msgstr ""
+"Số lượng tối thiểu để kích hoạt các quy tắc này, thể hiện trong các đơn vị "
+"cung cấp số đo nếu có hoặc trong các đơn vị đo mặc định của các sản phẩm "
+"khác khôn ngoan."
#. module: product
#: model:product.template,name:product.product_product_24_product_template
@@ -193,12 +199,12 @@ msgstr "Các loại đơn vị đo"
#. module: product
#: model:product.template,name:product.product_product_cpu1_product_template
msgid "Processor AMD Athlon XP 1800+"
-msgstr ""
+msgstr "Processor AMD Athlon XP 1800+"
#. module: product
#: model:product.template,name:product.product_product_20_product_template
msgid "HDD on demand"
-msgstr ""
+msgstr "HDD theo yêu cầu"
#. module: product
#: field:product.price_list,price_list:0
@@ -223,7 +229,7 @@ msgstr "Khác"
#. module: product
#: model:product.template,name:product.product_product_worker0_product_template
msgid "Worker"
-msgstr ""
+msgstr "Công nhân"
#. module: product
#: help:product.template,sale_ok:0
@@ -231,6 +237,8 @@ msgid ""
"Determines if the product can be visible in the list of product within a "
"selection from a sale order line."
msgstr ""
+"Xác định các sản phẩm có thể được hiển thị trong danh sách các sản phẩm "
+"trong một lựa chọn từ một đường để bán."
#. module: product
#: model:product.pricelist.version,name:product.ver0
@@ -257,10 +265,10 @@ msgstr "Loại sản phẩm"
#. module: product
#: view:product.uom:0
msgid " e.g: 1 * (this unit) = ratio * (reference unit)"
-msgstr ""
+msgstr " e.g: 1 * (đơn vị) = ratio * (đơn vị tham chiếu)"
#. module: product
-#: code:addons/product/product.py:378
+#: code:addons/product/product.py:380
#, python-format
msgid "Products: "
msgstr "Sản phẩm: "
@@ -293,12 +301,12 @@ msgstr ""
#. module: product
#: model:process.node,note:product.process_node_supplier0
msgid "Supplier name, price, product code, ..."
-msgstr ""
+msgstr "tên NCC, giá, mã sản phẩm, ..."
#. module: product
#: model:product.template,name:product.product_product_hdd3_product_template
msgid "HDD Seagate 7200.8 160GB"
-msgstr ""
+msgstr "HDD Seagate 7200.8 160GB"
#. module: product
#: field:product.product,ean13:0
@@ -308,7 +316,7 @@ msgstr "EAN13"
#. module: product
#: field:product.template,seller_id:0
msgid "Main Supplier"
-msgstr ""
+msgstr "Nhà Cung Cấp Chính"
#. module: product
#: model:ir.actions.act_window,name:product.product_ul_form_action
@@ -335,7 +343,7 @@ msgstr "Quy tắc này chỉ áp dụng nếu đối tác mua/bán nhiều hơn
#. module: product
#: model:product.template,name:product.product_product_woodmm0_product_template
msgid "Wood 2mm"
-msgstr ""
+msgstr "gỗ 2mm"
#. module: product
#: field:product.price_list,qty1:0
@@ -345,7 +353,7 @@ msgstr "Số lượng-1"
#. module: product
#: help:product.packaging,ul_qty:0
msgid "The number of packages by layer"
-msgstr ""
+msgstr "Số lượng các gói của lớp"
#. module: product
#: field:product.packaging,qty:0
@@ -362,7 +370,7 @@ msgstr "Tình trạng"
#. module: product
#: help:product.template,categ_id:0
msgid "Select category for the current product"
-msgstr ""
+msgstr "lựa chọn danh mục của sản phẩm"
#. module: product
#: field:product.product,outgoing_qty:0
@@ -533,7 +541,7 @@ msgid "Metal Cleats"
msgstr ""
#. module: product
-#: code:addons/product/pricelist.py:340
+#: code:addons/product/pricelist.py:343
#, python-format
msgid ""
"No active version for the selected pricelist !\n"
@@ -1258,7 +1266,7 @@ msgid "Pallet Dimension"
msgstr "Kích thước pallet"
#. module: product
-#: code:addons/product/product.py:603
+#: code:addons/product/product.py:618
#, python-format
msgid " (copy)"
msgstr ""
@@ -1728,7 +1736,7 @@ msgstr ""
"Giá cơ bản để tính giá bán cho khách hàng. Đôi khi được gọi là giá catalog."
#. module: product
-#: code:addons/product/pricelist.py:515
+#: code:addons/product/pricelist.py:518
#, python-format
msgid "Partner section of the product form"
msgstr "Mục đối tác của form sản phẩm"
@@ -2150,7 +2158,7 @@ msgid "Description"
msgstr "Mô tả"
#. module: product
-#: code:addons/product/pricelist.py:358
+#: code:addons/product/pricelist.py:361
#, python-format
msgid ""
"Could not resolve product category, you have defined cyclic categories of "
@@ -2197,7 +2205,7 @@ msgid "Shelves"
msgstr ""
#. module: product
-#: code:addons/product/pricelist.py:514
+#: code:addons/product/pricelist.py:517
#, python-format
msgid "Other Pricelist"
msgstr "Bảng giá khác"
diff --git a/addons/product/product.py b/addons/product/product.py
index 38ee641507c..fa6796b3953 100644
--- a/addons/product/product.py
+++ b/addons/product/product.py
@@ -317,8 +317,12 @@ class product_template(osv.osv):
if 'categ_id' in context and context['categ_id']:
return context['categ_id']
md = self.pool.get('ir.model.data')
- res = md.get_object_reference(cr, uid, 'product', 'cat0') or False
- return res and res[1] or False
+ res = False
+ try:
+ res = md.get_object_reference(cr, uid, 'product', 'cat0')[1]
+ except ValueError:
+ res = False
+ return res
def onchange_uom(self, cursor, user, ids, uom_id,uom_po_id):
if uom_id:
diff --git a/addons/product/product_view.xml b/addons/product/product_view.xml
index 844ad6dc8fd..5e5123b43de 100644
--- a/addons/product/product_view.xml
+++ b/addons/product/product_view.xml
@@ -21,6 +21,8 @@
+
+
@@ -29,6 +31,8 @@
+
+
@@ -54,6 +58,7 @@
+
@@ -280,8 +285,7 @@
product.product
form
tree,form
- [('categ_id','child_of',[active_id])]
- {'categ_id':active_id}
+ {'categ_id':active_id, 'search_default_categ_id':active_id}
diff --git a/addons/product_manufacturer/i18n/fi.po b/addons/product_manufacturer/i18n/fi.po
new file mode 100644
index 00000000000..4d8ac103ccc
--- /dev/null
+++ b/addons/product_manufacturer/i18n/fi.po
@@ -0,0 +1,87 @@
+# Finnish translation for openobject-addons
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR , 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME \n"
+"POT-Creation-Date: 2011-01-11 11:15+0000\n"
+"PO-Revision-Date: 2011-06-20 10:09+0000\n"
+"Last-Translator: FULL NAME \n"
+"Language-Team: Finnish \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2011-06-21 04:36+0000\n"
+"X-Generator: Launchpad (build 13168)\n"
+
+#. module: product_manufacturer
+#: model:ir.module.module,description:product_manufacturer.module_meta_information
+msgid "A module that add manufacturers and attributes on the product form"
+msgstr "Moduuli jo lisää valmistajia ja attribuutteja tuotelomakkeelle"
+
+#. module: product_manufacturer
+#: field:product.product,manufacturer_pref:0
+msgid "Manufacturer Product Code"
+msgstr "Valmistajan tuotekoodi"
+
+#. module: product_manufacturer
+#: model:ir.model,name:product_manufacturer.model_product_product
+#: field:product.manufacturer.attribute,product_id:0
+msgid "Product"
+msgstr "Tuote"
+
+#. module: product_manufacturer
+#: view:product.manufacturer.attribute:0
+msgid "Product Template Name"
+msgstr "Tuotemallipohjan nimi"
+
+#. module: product_manufacturer
+#: model:ir.model,name:product_manufacturer.model_product_manufacturer_attribute
+msgid "Product attributes"
+msgstr "Tuotteen attribuutit"
+
+#. module: product_manufacturer
+#: view:product.manufacturer.attribute:0
+#: view:product.product:0
+msgid "Product Attributes"
+msgstr "Tuotteen attribuutit"
+
+#. module: product_manufacturer
+#: field:product.manufacturer.attribute,name:0
+msgid "Attribute"
+msgstr "Attribuutti"
+
+#. module: product_manufacturer
+#: field:product.manufacturer.attribute,value:0
+msgid "Value"
+msgstr "Arvo"
+
+#. module: product_manufacturer
+#: constraint:product.product:0
+msgid "Error: Invalid ean code"
+msgstr "Virhe: Väärä EAN-koodi"
+
+#. module: product_manufacturer
+#: view:product.product:0
+#: field:product.product,attribute_ids:0
+msgid "Attributes"
+msgstr "Attribuutit"
+
+#. module: product_manufacturer
+#: model:ir.module.module,shortdesc:product_manufacturer.module_meta_information
+msgid "Products Attributes & Manufacturers"
+msgstr "Tuotteen attribuutit ja valmistajat"
+
+#. module: product_manufacturer
+#: field:product.product,manufacturer_pname:0
+msgid "Manufacturer Product Name"
+msgstr "Valmistajan tuotenimi"
+
+#. module: product_manufacturer
+#: view:product.product:0
+#: field:product.product,manufacturer:0
+msgid "Manufacturer"
+msgstr "Valmistaja"
diff --git a/addons/product_visible_discount/i18n/fi.po b/addons/product_visible_discount/i18n/fi.po
new file mode 100644
index 00000000000..5e067054acc
--- /dev/null
+++ b/addons/product_visible_discount/i18n/fi.po
@@ -0,0 +1,81 @@
+# Finnish translation for openobject-addons
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR , 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME \n"
+"POT-Creation-Date: 2011-01-11 11:15+0000\n"
+"PO-Revision-Date: 2011-06-09 10:44+0000\n"
+"Last-Translator: FULL NAME \n"
+"Language-Team: Finnish \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2011-06-10 04:37+0000\n"
+"X-Generator: Launchpad (build 13168)\n"
+
+#. module: product_visible_discount
+#: code:addons/product_visible_discount/product_visible_discount.py:147
+#, python-format
+msgid "No Purchase Pricelist Found !"
+msgstr "Ostohintalistaa ei löytynyt!"
+
+#. module: product_visible_discount
+#: code:addons/product_visible_discount/product_visible_discount.py:155
+#, python-format
+msgid "No Sale Pricelist Found "
+msgstr "Myyntihintalisaa ei löytynyt "
+
+#. module: product_visible_discount
+#: model:ir.module.module,description:product_visible_discount.module_meta_information
+msgid ""
+"\n"
+" This module lets you calculate discounts on Sale Order lines and Invoice "
+"lines base on the partner's pricelist.\n"
+" To this end, a new check box named \"Visible Discount\" is added to the "
+"pricelist form.\n"
+" Example:\n"
+" For the product PC1 and the partner \"Asustek\": if listprice=450, "
+"and the price calculated using Asustek's pricelist is 225\n"
+" If the check box is checked, we will have on the sale order line: "
+"Unit price=450, Discount=50,00, Net price=225\n"
+" If the check box is unchecked, we will have on Sale Order and "
+"Invoice lines: Unit price=225, Discount=0,00, Net price=225\n"
+" "
+msgstr ""
+
+#. module: product_visible_discount
+#: model:ir.module.module,shortdesc:product_visible_discount.module_meta_information
+#: field:product.pricelist,visible_discount:0
+msgid "Visible Discount"
+msgstr "Näkyvä alennus"
+
+#. module: product_visible_discount
+#: model:ir.model,name:product_visible_discount.model_account_invoice_line
+msgid "Invoice Line"
+msgstr "Laskun rivi"
+
+#. module: product_visible_discount
+#: code:addons/product_visible_discount/product_visible_discount.py:155
+#, python-format
+msgid "You must first define a pricelist for Customer !"
+msgstr "Sinun täytyy ensin määritellä asiakkaan hinnasto!"
+
+#. module: product_visible_discount
+#: model:ir.model,name:product_visible_discount.model_product_pricelist
+msgid "Pricelist"
+msgstr "Hinnasto"
+
+#. module: product_visible_discount
+#: code:addons/product_visible_discount/product_visible_discount.py:147
+#, python-format
+msgid "You must first define a pricelist for Supplier !"
+msgstr "Sinun täytyy ensin määritellä toimittajan hinnasto!"
+
+#. module: product_visible_discount
+#: model:ir.model,name:product_visible_discount.model_sale_order_line
+msgid "Sales Order Line"
+msgstr "Myyntitilausrivi"
diff --git a/addons/profile_tools/i18n/fi.po b/addons/profile_tools/i18n/fi.po
new file mode 100644
index 00000000000..54edf5dbbbd
--- /dev/null
+++ b/addons/profile_tools/i18n/fi.po
@@ -0,0 +1,145 @@
+# Finnish translation for openobject-addons
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR , 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME \n"
+"POT-Creation-Date: 2011-01-11 11:15+0000\n"
+"PO-Revision-Date: 2011-06-22 09:37+0000\n"
+"Last-Translator: FULL NAME \n"
+"Language-Team: Finnish \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2011-06-23 04:56+0000\n"
+"X-Generator: Launchpad (build 13168)\n"
+
+#. module: profile_tools
+#: help:misc_tools.installer,idea:0
+msgid "Promote ideas of the employees, votes and discussion on best ideas."
+msgstr ""
+"Edistää työntekijöiden ideoita, äänestystä ja keskustelua parhaista ideoista."
+
+#. module: profile_tools
+#: help:misc_tools.installer,share:0
+msgid ""
+"Allows you to give restricted access to your OpenERP documents to external "
+"users, such as customers, suppliers, or accountants. You can share any "
+"OpenERP Menu such as your project tasks, support requests, invoices, etc."
+msgstr ""
+
+#. module: profile_tools
+#: help:misc_tools.installer,lunch:0
+msgid "A simple module to help you to manage Lunch orders."
+msgstr "yksinkertainen moduuli lounastilausten hallintaan."
+
+#. module: profile_tools
+#: field:misc_tools.installer,subscription:0
+msgid "Recurring Documents"
+msgstr "Toistuvat dokumentit"
+
+#. module: profile_tools
+#: model:ir.model,name:profile_tools.model_misc_tools_installer
+msgid "misc_tools.installer"
+msgstr ""
+
+#. module: profile_tools
+#: model:ir.module.module,description:profile_tools.module_meta_information
+msgid ""
+"Installs tools for lunch,survey,subscription and audittrail\n"
+" module\n"
+" "
+msgstr ""
+
+#. module: profile_tools
+#: view:misc_tools.installer:0
+msgid ""
+"Extra Tools are applications that can help you improve your organization "
+"although they are not key for company management."
+msgstr ""
+
+#. module: profile_tools
+#: view:misc_tools.installer:0
+msgid "Configure"
+msgstr "Konfiguroi"
+
+#. module: profile_tools
+#: help:misc_tools.installer,survey:0
+msgid "Allows you to organize surveys."
+msgstr "Mahdollistaa kyselyjen organisoinnin."
+
+#. module: profile_tools
+#: model:ir.module.module,shortdesc:profile_tools.module_meta_information
+msgid "Miscellaneous Tools"
+msgstr "Sekalaiset työkalut"
+
+#. module: profile_tools
+#: help:misc_tools.installer,pad:0
+msgid ""
+"This module creates a tighter integration between a Pad instance of your "
+"choosing and your OpenERP Web Client by letting you easily link pads to "
+"OpenERP objects via OpenERP attachments."
+msgstr ""
+
+#. module: profile_tools
+#: field:misc_tools.installer,lunch:0
+msgid "Lunch"
+msgstr "Lunch"
+
+#. module: profile_tools
+#: view:misc_tools.installer:0
+msgid "Extra Tools Configuration"
+msgstr "Ylimääräisten työkalujen konfiguaatio"
+
+#. module: profile_tools
+#: field:misc_tools.installer,idea:0
+msgid "Ideas Box"
+msgstr "Idealaatikkoa"
+
+#. module: profile_tools
+#: help:misc_tools.installer,subscription:0
+msgid "Helps to generate automatically recurring documents."
+msgstr "Auttaa luomaan toistuvia automaattisia dokumentteja."
+
+#. module: profile_tools
+#: model:ir.actions.act_window,name:profile_tools.action_misc_tools_installer
+msgid "Tools Configuration"
+msgstr "Työkalujen konfigurointi"
+
+#. module: profile_tools
+#: field:misc_tools.installer,pad:0
+msgid "Collaborative Note Pads"
+msgstr "Yhteiset muistiinpanot"
+
+#. module: profile_tools
+#: field:misc_tools.installer,survey:0
+msgid "Survey"
+msgstr "Kysely"
+
+#. module: profile_tools
+#: view:misc_tools.installer:0
+msgid "Configure Extra Tools"
+msgstr "Konfiguroi ylimääräiset työkalut"
+
+#. module: profile_tools
+#: field:misc_tools.installer,progress:0
+msgid "Configuration Progress"
+msgstr "Konfiguraation eteneminen"
+
+#. module: profile_tools
+#: field:misc_tools.installer,config_logo:0
+msgid "Image"
+msgstr "Kuva"
+
+#. module: profile_tools
+#: view:misc_tools.installer:0
+msgid "title"
+msgstr "otsikko"
+
+#. module: profile_tools
+#: field:misc_tools.installer,share:0
+msgid "Web Share"
+msgstr "Nettijako"
diff --git a/addons/project/project.py b/addons/project/project.py
index 6a262e16428..072f7cc31c3 100644
--- a/addons/project/project.py
+++ b/addons/project/project.py
@@ -433,7 +433,7 @@ class task(osv.osv):
'date_start': fields.datetime('Starting Date',select=True),
'date_end': fields.datetime('Ending Date',select=True),
'date_deadline': fields.date('Deadline',select=True),
- 'project_id': fields.many2one('project.project', 'Project', ondelete='cascade'),
+ 'project_id': fields.many2one('project.project', 'Project', ondelete='set null', select="1"),
'parent_ids': fields.many2many('project.task', 'project_task_parent_rel', 'task_id', 'parent_id', 'Parent Tasks'),
'child_ids': fields.many2many('project.task', 'project_task_parent_rel', 'parent_id', 'task_id', 'Delegated Tasks'),
'notes': fields.text('Notes'),
@@ -714,27 +714,35 @@ class task(osv.osv):
self.log(cr, uid, id, message)
return True
- def next_type(self, cr, uid, ids, *args):
+ def _change_type(self, cr, uid, ids, next, *args):
+ """
+ go to the next stage
+ if next is False, go to previous stage
+ """
for task in self.browse(cr, uid, ids):
- typeid = task.type_id.id
- types = map(lambda x:x.id, task.project_id.type_ids or [])
- if types:
+ if task.project_id.type_ids:
+ typeid = task.type_id.id
+ types_seq={}
+ for type in task.project_id.type_ids :
+ types_seq[type.id] = type.sequence
+ if next:
+ types = sorted(types_seq.items(), lambda x, y: cmp(x[1], y[1]))
+ else:
+ types = sorted(types_seq.items(), lambda x, y: cmp(y[1], x[1]))
+ sorted_types = [x[0] for x in types]
if not typeid:
- self.write(cr, uid, task.id, {'type_id': types[0]})
- elif typeid and typeid in types and types.index(typeid) != len(types)-1:
- index = types.index(typeid)
- self.write(cr, uid, task.id, {'type_id': types[index+1]})
+ self.write(cr, uid, task.id, {'type_id': sorted_types[0]})
+ elif typeid and typeid in sorted_types and sorted_types.index(typeid) != len(sorted_types)-1:
+ index = sorted_types.index(typeid)
+ self.write(cr, uid, task.id, {'type_id': sorted_types[index+1]})
return True
+
+ def next_type(self, cr, uid, ids, *args):
+ return self._change_type(cr, uid, ids, True, *args)
def prev_type(self, cr, uid, ids, *args):
- for task in self.browse(cr, uid, ids):
- typeid = task.type_id.id
- types = map(lambda x:x.id, task.project_id and task.project_id.type_ids or [])
- if types:
- if typeid and typeid in types:
- index = types.index(typeid)
- self.write(cr, uid, task.id, {'type_id': index and types[index-1] or False})
- return True
+ return self._change_type(cr, uid, ids, False, *args)
+
task()
@@ -743,10 +751,10 @@ class project_work(osv.osv):
_description = "Project Task Work"
_columns = {
'name': fields.char('Work summary', size=128),
- 'date': fields.datetime('Date'),
- 'task_id': fields.many2one('project.task', 'Task', ondelete='cascade', required=True),
+ 'date': fields.datetime('Date', select="1"),
+ 'task_id': fields.many2one('project.task', 'Task', ondelete='cascade', required=True, select="1"),
'hours': fields.float('Time Spent'),
- 'user_id': fields.many2one('res.users', 'Done by', required=True),
+ 'user_id': fields.many2one('res.users', 'Done by', required=True, select="1"),
'company_id': fields.related('task_id', 'company_id', type='many2one', relation='res.company', string='Company', store=True, readonly=True)
}
diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index d3b28c0d562..5faa0090a15 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -224,7 +224,7 @@
|