\n"
+" Yeni bir kategori tanımlamak için tıklayın.\n"
+"
\n"
+" Kategoriler aracılığıyla ürünlerini göz atmak için "
+"kullanılır\n"
+" dokunmatik ekran arayüzü.\n"
+"
\n"
+" Eğer kategori bir fotoğraf, düzenini koyarsanız\n"
+" dokunmatik ekran arayüzü otomatik olacak. Biz "
+"önermeyeceğizyükleme\n"
+" Küçük (1024x768) ekranlar için kategoriler bir fotoğraf.\n"
+"
\n"
+" "
#. module: point_of_sale
#: view:pos.receipt:0
msgid "Print the Receipt of the Sale"
-msgstr "Satışın fişini yazdır"
+msgstr "Satışın Fişini Yazdır"
#. module: point_of_sale
#: field:pos.session,cash_register_balance_end:0
@@ -63,7 +76,7 @@ msgstr "Bugün"
#. module: point_of_sale
#: field:pos.config,iface_electronic_scale:0
msgid "Electronic Scale Interface"
-msgstr "Elektronik Kantar Arayüz"
+msgstr "Elektronik Tartı Arayüz"
#. module: point_of_sale
#: model:pos.category,name:point_of_sale.plain_water
@@ -80,7 +93,7 @@ msgstr ""
#: code:addons/point_of_sale/static/src/xml/pos.xml:398
#, python-format
msgid "ã"
-msgstr ""
+msgstr "ã"
#. module: point_of_sale
#: field:pos.config,journal_id:0
@@ -103,7 +116,7 @@ msgstr "Satış Detayları"
#. module: point_of_sale
#: constraint:pos.config:0
msgid "You cannot have two cash controls in one Point Of Sale !"
-msgstr "Sen bir SatışNoktası iki nakiti kontrol edemezsin !"
+msgstr "Sen bir SatışNoktasından iki nakiti kontrol edemezsin !"
#. module: point_of_sale
#: field:pos.payment.report.user,user_id:0
@@ -129,13 +142,13 @@ msgstr "Ürün Adı"
#. module: point_of_sale
#: model:product.template,name:point_of_sale.pamplemousse_rouge_pamplemousse_product_template
msgid "Red grapefruit"
-msgstr ""
+msgstr "Kırmızı greyfurt"
#. module: point_of_sale
#: code:addons/point_of_sale/point_of_sale.py:1343
#, python-format
msgid "Assign a Custom EAN"
-msgstr "EAN Özel atama"
+msgstr "EAN Özel Atama"
#. module: point_of_sale
#: view:pos.session.opening:0
@@ -144,6 +157,9 @@ msgid ""
" being able to start selling through the "
"touchscreen interface."
msgstr ""
+"Daha önce, sizin kasa içinde nakit miktarın kontrolu gerekebilir\n"
+" ile satış başlatmak mümkün olmanın dokunmatik "
+"ekran arayüzü."
#. module: point_of_sale
#: report:account.statement:0
@@ -262,7 +278,7 @@ msgstr "Muahsebe Bilgisi"
#: code:addons/point_of_sale/static/src/xml/pos.xml:427
#, python-format
msgid "0.00€"
-msgstr ""
+msgstr "0.00€"
#. module: point_of_sale
#: field:pos.session.opening,show_config:0
@@ -345,6 +361,9 @@ msgid ""
"Check this if this point of sale should open by default in a self checkout "
"mode. If unchecked, OpenERP uses the normal cashier mode by default."
msgstr ""
+"Satış bu noktada kendi kendine çıkış varsayılan olarak açık olmalıdır Bu "
+"kontrol edin modu. İşaretlenmezse, OpenERP varsayılan olarak normal kasiyer "
+"modunu kullanır."
#. module: point_of_sale
#: model:ir.actions.report.xml,name:point_of_sale.pos_sales_user
@@ -394,7 +413,7 @@ msgstr "Satış Noktanızı Seçin"
#: field:report.sales.by.margin.pos,total:0
#: field:report.sales.by.margin.pos.month,total:0
msgid "Margin"
-msgstr "Sınır"
+msgstr "Marj"
#. module: point_of_sale
#: field:pos.discount,discount:0
@@ -430,7 +449,7 @@ msgstr "Donanım Etkinlikler"
#: code:addons/point_of_sale/point_of_sale.py:301
#, python-format
msgid "You should assign a Point of Sale to your session."
-msgstr "oturumuna Satış Nokta atamanız gerekir"
+msgstr "Oturumuna Satış Nokta atamanız gerekir"
#. module: point_of_sale
#: view:pos.order.line:0
@@ -451,6 +470,9 @@ msgid ""
"close this session, you can update the 'Closing Cash Control' to avoid any "
"difference."
msgstr ""
+"Ödeme yöntemi '%s' üzerinde kar ve zarar hesapları ayarlayın. bu OpenERP "
+"sizin biten bakiye %.2f fark sonrası sağlayacak. karşı Bu oturumu kapatmak, "
+"herhangi önlemek için 'Kapanış Nakit Kontrol' güncelleyebilirsinizfark."
#. module: point_of_sale
#: code:addons/point_of_sale/point_of_sale.py:315
@@ -470,11 +492,12 @@ msgid ""
"Difference between the counted cash control at the closing and the computed "
"balance."
msgstr ""
+"Kapanış nakit kontrolü sayılır ve bilgisayarlı arasındaki fark bakiyesi."
#. module: point_of_sale
#: view:pos.session.opening:0
msgid ") is \""
-msgstr ""
+msgstr ") is \""
#. module: point_of_sale
#: model:product.template,name:point_of_sale.Onions_product_template
@@ -519,7 +542,7 @@ msgstr ""
#. module: point_of_sale
#: view:pos.session.opening:0
msgid "Open Session"
-msgstr "Oturum Açma"
+msgstr "Oturum Aç"
#. module: point_of_sale
#: model:ir.ui.menu,name:point_of_sale.menu_point_of_sale
@@ -536,7 +559,7 @@ msgstr "Google Chrome"
#. module: point_of_sale
#: model:pos.category,name:point_of_sale.sparkling_water
msgid "Sparkling Water"
-msgstr "Sparkling Water"
+msgstr "Sparkling Su"
#. module: point_of_sale
#: view:account.bank.statement:0
@@ -591,7 +614,7 @@ msgstr "Siparişiniz kasiyer tarafından onay edilmelidir."
#. module: point_of_sale
#: model:product.template,name:point_of_sale.fanta_orange_50cl_product_template
msgid "Fanta Orange 50cl"
-msgstr "Fanta Orange 50cl"
+msgstr "Fanta Portakal 50cl"
#. module: point_of_sale
#: field:pos.category,child_id:0
@@ -618,6 +641,21 @@ msgid ""
" \n"
" "
msgstr ""
+"
\n"
+" Yeni bir oturum başlatmak için tıklayın.\n"
+"
\n"
+" Bir oturum sırasında, genellikle, tek bir günlük bir süre "
+"olduğunu which\n"
+" sen satış noktası üzerinden satmatış Kullanıcı kontrol etmek "
+"vardır the\n"
+" nakit para birimlerinin başında kaydeder ve biten\n"
+" Her oturumun.\n"
+"
\n"
+" Menü kullanımı ile daha iyi gerektiğini unutmayın Sizin "
+"Oturum\n"
+" hızla yeni bir oturum açmak için.\n"
+"
\n"
+" "
#. module: point_of_sale
#: code:addons/point_of_sale/point_of_sale.py:867
@@ -631,6 +669,8 @@ msgid ""
"You can continue sales from the touchscreen interface by clicking on \"Start "
"Selling\" or close the cash register session."
msgstr ""
+"Sen \"Satış Başlat\" tıklayarak dokunmatik ekran arayüzü satış devam "
+"edebilirsiniz veya yazarkasa oturumu kapatın."
#. module: point_of_sale
#: report:account.statement:0
@@ -663,7 +703,7 @@ msgstr "Özet"
#. module: point_of_sale
#: model:product.template,name:point_of_sale.lays_naturel_45g_product_template
msgid "Lays Natural 45g"
-msgstr ""
+msgstr "Lays Natural 45g"
#. module: point_of_sale
#: model:product.template,name:point_of_sale.chaudfontaine_50cl_product_template
@@ -704,7 +744,7 @@ msgstr "Net Toplam:"
#. module: point_of_sale
#: model:ir.actions.client,name:point_of_sale.action_client_pos_menu
msgid "Open POS Menu"
-msgstr "POS Menüsü Açma"
+msgstr "POS Menüsü Aç"
#. module: point_of_sale
#: report:pos.details_summary:0
@@ -714,7 +754,7 @@ msgstr "Ödeme Biçimi"
#. module: point_of_sale
#: model:ir.model,name:point_of_sale.model_pos_confirm
msgid "Post POS Journal Entries"
-msgstr "İşleme POS Yevmiye Girişlerini"
+msgstr "POS Yevmiye Girişlerini İşle"
#. module: point_of_sale
#. openerp-web
@@ -734,6 +774,9 @@ msgid ""
"Check if, this is a product you can use to take cash from a statement for "
"the point of sale backend, example: money lost, transfer to bank, etc."
msgstr ""
+"Olmadığını kontrol edin, bu sizin için bir açıklama nakit almak için "
+"kullanabileceğiniz bir üründür satış noktası arka uç, örnek noktası: para "
+"kaybetti, banka, vb transfer."
#. module: point_of_sale
#: view:report.pos.order:0
@@ -750,6 +793,9 @@ msgid ""
"use\n"
" a modern browser like"
msgstr ""
+"Satış Noktası Microsoft Internet Explorer tarafından desteklenmiyor. lütfen "
+"use\n"
+" Firefox gibi modern bir tarayıcı seçin"
#. module: point_of_sale
#: view:pos.session.opening:0
@@ -777,7 +823,7 @@ msgstr "Pizza"
#. module: point_of_sale
#: view:pos.session:0
msgid "= Theoretical Balance"
-msgstr ""
+msgstr "= Teorik Bakiye"
#. module: point_of_sale
#: code:addons/point_of_sale/wizard/pos_return.py:85
@@ -818,7 +864,7 @@ msgstr "Fiş"
#: field:report.sales.by.margin.pos,net_margin_per_qty:0
#: field:report.sales.by.margin.pos.month,net_margin_per_qty:0
msgid "Net margin per Qty"
-msgstr "Adet başına net oran"
+msgstr "Adet başına net Oran"
#. module: point_of_sale
#: view:pos.confirm:0
@@ -924,7 +970,7 @@ msgstr "Yevmiye"
#. module: point_of_sale
#: view:pos.session:0
msgid "Statements"
-msgstr "Tablolar"
+msgstr "Ekstreler"
#. module: point_of_sale
#: report:pos.details:0
@@ -975,7 +1021,7 @@ msgstr "Faturalama Yok"
#. module: point_of_sale
#: model:product.template,name:point_of_sale.lays_pickles_250g_product_template
msgid "250g Lays Pickels"
-msgstr ""
+msgstr "250g Lays Pickels"
#. module: point_of_sale
#: field:pos.session.opening,pos_session_id:0
@@ -1027,7 +1073,7 @@ msgstr "Spa Reine 33cl"
#. module: point_of_sale
#: model:ir.model,name:point_of_sale.model_pos_discount
msgid "Add a Global Discount"
-msgstr "Genel iskonto ekle"
+msgstr "Genel İskonto Ekle"
#. module: point_of_sale
#: view:pos.config:0
@@ -1069,7 +1115,7 @@ msgstr "EAN Özel Ayarlama"
#: code:addons/point_of_sale/static/src/xml/pos.xml:235
#, python-format
msgid "Remaining:"
-msgstr "Kalan:"
+msgstr "Bakiye:"
#. module: point_of_sale
#: model:pos.category,name:point_of_sale.legumes
@@ -1098,7 +1144,7 @@ msgstr "Açılış Bakiyesi"
#. module: point_of_sale
#: model:product.template,name:point_of_sale.lays_naturel_oven_150g_product_template
msgid "Oven Baked Lays Natural 150g"
-msgstr ""
+msgstr "Oven Baked Lays Natural 150g"
#. module: point_of_sale
#: sql_constraint:pos.session:0
@@ -1128,7 +1174,7 @@ msgstr "Chimay Bleu 75cl"
#. module: point_of_sale
#: report:pos.payment.report.user:0
msgid "Payment By User"
-msgstr "Kullanıcıya göre ödemeler"
+msgstr "Kullanıcı Ödemeleri"
#. module: point_of_sale
#. openerp-web
@@ -1163,7 +1209,7 @@ msgstr "(güncelle)"
#. module: point_of_sale
#: model:product.template,name:point_of_sale.ijsboerke_vanille_2,5l_product_template
msgid "IJsboerke Vanilla 2.5L"
-msgstr ""
+msgstr "IJsboerke Vanilya 2.5L"
#. module: point_of_sale
#: model:ir.actions.act_window,name:point_of_sale.action_report_pos_details
@@ -1214,7 +1260,7 @@ msgstr "ABC"
#. module: point_of_sale
#: model:product.template,name:point_of_sale.ijsboerke_dame_blanche_2,5l_product_template
msgid "IJsboerke 2.5L White Lady"
-msgstr "Copy text \t IJsboerke 2.5L White Lady"
+msgstr "IJsboerke 2.5L White Lady"
#. module: point_of_sale
#: field:pos.order,lines:0
@@ -1243,7 +1289,7 @@ msgstr "Ağırlık Ölçü Okuma"
#: code:addons/point_of_sale/static/src/xml/pos.xml:426
#, python-format
msgid "0.00 €"
-msgstr ""
+msgstr "0.00 €"
#. module: point_of_sale
#: field:pos.order.line,create_date:0
@@ -1301,7 +1347,7 @@ msgstr "Kaldırılan Ayarlayın"
#. module: point_of_sale
#: model:product.template,name:point_of_sale.limon_product_template
msgid "Stringers"
-msgstr ""
+msgstr "Stringers"
#. module: point_of_sale
#: field:pos.order,pricelist_id:0
@@ -1370,14 +1416,14 @@ msgstr "Stella Artois 33cl"
#. module: point_of_sale
#: model:product.template,name:point_of_sale.lays_naturel_300g_product_template
msgid "Lays Natural XXL 300g"
-msgstr ""
+msgstr "Lays Natural XXL 300g"
#. module: point_of_sale
#. openerp-web
#: code:addons/point_of_sale/static/src/xml/pos.xml:479
#, python-format
msgid "Scan Item Unrecognized"
-msgstr ""
+msgstr "Tarama Ürünü Tanınmayan"
#. module: point_of_sale
#: report:all.closed.cashbox.of.the.day:0
@@ -1398,7 +1444,7 @@ msgstr "Taslak Fatura"
#. module: point_of_sale
#: model:product.template,name:point_of_sale.lays_paprika_oven_150g_product_template
msgid "Oven Baked Lays Paprika 150g"
-msgstr ""
+msgstr "Oven Baked Lays Paprika 150g"
#. module: point_of_sale
#: report:pos.invoice:0
@@ -1524,7 +1570,7 @@ msgstr "bilinmeyen"
#. module: point_of_sale
#: field:product.product,income_pdt:0
msgid "Point of Sale Cash In"
-msgstr "SatışNoktası Nakit olarak"
+msgstr "SatışNoktası Nakit Olarak"
#. module: point_of_sale
#. openerp-web
@@ -1622,6 +1668,8 @@ msgid ""
"Enter a reference, it will be converted\n"
" automatically to a valid EAN number."
msgstr ""
+"Bir referans girin, bu dönüştürülür \n"
+" otomatik olarak EAN geçerli bir sayı için."
#. module: point_of_sale
#: field:product.product,expense_pdt:0
@@ -1657,6 +1705,8 @@ msgid ""
"Your ending balance is too different from the theorical cash closing (%.2f), "
"the maximum allowed is: %.2f. You can contact your manager to force it."
msgstr ""
+"Sizin biten bakiyesi teorik nakit kapanış (%.2f), çok farklı izin verilen "
+"maksimum: %.2f. Bunu zorlamak için yöneticiniz irtibata geçebilirsiniz."
#. module: point_of_sale
#: view:pos.session:0
@@ -1675,8 +1725,8 @@ msgid ""
"There is no receivable account defined to make payment for the partner: "
"\"%s\" (id:%d)."
msgstr ""
-"Partner için ödeme yapmak için tanımlanmış bir alacak hesabı yok: \"% s\" "
-"(id:% d)."
+"Partner için ödeme yapmak için tanımlanmış bir alacak hesabı yok: \"%s\" "
+"(id:%d)."
#. module: point_of_sale
#: view:pos.config:0
@@ -1706,7 +1756,7 @@ msgstr "İptal"
#: code:addons/point_of_sale/static/src/xml/pos.xml:296
#, python-format
msgid "Please put your product on the scale"
-msgstr ""
+msgstr "Tartıya ürün koyunuz"
#. module: point_of_sale
#: model:ir.actions.report.xml,name:point_of_sale.pos_details_summary
@@ -1829,7 +1879,7 @@ msgstr "POS"
#: code:addons/point_of_sale/static/src/xml/pos.xml:587
#, python-format
msgid "Subtotal:"
-msgstr "Ara toplam:"
+msgstr "Ara Toplam:"
#. module: point_of_sale
#: model:product.template,name:point_of_sale.coca_regular_33cl_product_template
@@ -1907,6 +1957,8 @@ msgid ""
"complete\n"
" your purchase"
msgstr ""
+"Okuyucu kartınızı takın ve talimatları uygulayın tamamlama\n"
+" satınalman"
#. module: point_of_sale
#: help:product.product,income_pdt:0
@@ -1914,16 +1966,18 @@ msgid ""
"Check if, this is a product you can use to put cash into a statement for the "
"point of sale backend."
msgstr ""
+"Olmadığını kontrol edin, bu sizin için bir açıklama içine para koymak için "
+"kullanabileceğiniz bir üründür satış noktası arka uçu."
#. module: point_of_sale
#: model:product.template,name:point_of_sale.ijsboerke_moka_2,5l_product_template
msgid "IJsboerke Mocha 2.5L"
-msgstr "Copy text \t IJsboerke Mocha 2.5L"
+msgstr "IJsboerke Mocha 2.5L"
#. module: point_of_sale
#: field:pos.session,cash_control:0
msgid "Has Cash Control"
-msgstr ""
+msgstr "Nakit Kontrol Var"
#. module: point_of_sale
#: model:ir.actions.act_window,name:point_of_sale.action_report_pos_order_all
@@ -1945,7 +1999,8 @@ msgid ""
"Unable to open the session. You have to assign a sale journal to your point "
"of sale."
msgstr ""
-"Oturum açılamıyor. Satış noktasına bir satış yevmiyesi atamak zorundasınız."
+"Oturum açılamıyor. Satış noktasına bir satış yevmiyesi atamak "
+"zorundasınız.satış olarak."
#. module: point_of_sale
#: view:report.pos.order:0
@@ -1971,7 +2026,7 @@ msgstr "Yazdırma Tarihi"
#. module: point_of_sale
#: model:product.template,name:point_of_sale.poireaux_poireaux_product_template
msgid "Leeks"
-msgstr ""
+msgstr "Pırasa"
#. module: point_of_sale
#: help:pos.category,sequence:0
@@ -1997,7 +2052,7 @@ msgstr "Mağza:"
#. module: point_of_sale
#: field:account.journal,self_checkout_payment_method:0
msgid "Self Checkout Payment Method"
-msgstr ""
+msgstr "Kendi Ödeme Ödeme Yöntemi"
#. module: point_of_sale
#: view:pos.order:0
@@ -2007,7 +2062,7 @@ msgstr "POS Siparişleri"
#. module: point_of_sale
#: model:ir.actions.report.xml,name:point_of_sale.all_closed_cashbox_of_the_day
msgid "All Closed CashBox"
-msgstr "Tüm kapalı kasalar"
+msgstr "Tüm Kapalı Kasalar"
#. module: point_of_sale
#: field:pos.details,user_ids:0
@@ -2020,7 +2075,7 @@ msgstr "Satışelamanı"
#: code:addons/point_of_sale/wizard/pos_box_out.py:91
#, python-format
msgid "You have to open at least one cashbox."
-msgstr "En az bir kasa açmak zorunda."
+msgstr "En az bir kasa açmak zorundasın."
#. module: point_of_sale
#: code:addons/point_of_sale/point_of_sale.py:1142
@@ -2043,7 +2098,7 @@ msgstr "büyük harf kilidi"
#. module: point_of_sale
#: model:product.template,name:point_of_sale.grisette_cerise_25cl_product_template
msgid "Grisette Cherry 25cl"
-msgstr ""
+msgstr "Grisette Cherry 25cl"
#. module: point_of_sale
#: report:pos.invoice:0
@@ -2145,7 +2200,7 @@ msgstr "Croky Natural 45g"
#. module: point_of_sale
#: model:product.template,name:point_of_sale.tomate_en_grappe_product_template
msgid "In Cluster Tomatoes"
-msgstr ""
+msgstr "Domates Öbekleri"
#. module: point_of_sale
#: model:ir.actions.client,name:point_of_sale.action_pos_pos
@@ -2211,6 +2266,18 @@ msgid ""
" \n"
" "
msgstr ""
+"
\n"
+" Yeni bir ürün eklemek için tıklayın.\n"
+"
\n"
+" Satmak için Ürün tanımlamalısınız\n"
+" satış notası arayüzünde.\n"
+"
\n"
+" Fiyat ve satış noktasını ayarlamayı unutmayınkategori\n"
+" o görünmelidir. Bir ürünün herhangi bir noktası varsa satış\n"
+" kategori,sen satış noktası üzerinden satmaman değil\n"
+" arayüz.\n"
+"
\n"
+" "
#. module: point_of_sale
#: view:pos.order:0
@@ -2337,7 +2404,7 @@ msgstr "Bekleme Onayı"
#. module: point_of_sale
#: field:pos.order,nb_print:0
msgid "Number of Print"
-msgstr "Yazılacak adet"
+msgstr "Yazılacak Adet"
#. module: point_of_sale
#: model:ir.model,name:point_of_sale.model_pos_make_payment
@@ -2428,6 +2495,8 @@ msgid ""
"Check if the product should be weighted (mainly used with self check-out "
"interface)."
msgstr ""
+"Ürünün tartılmalıdır kontrol edin (ağırlıklı olarak kullanılır ile self "
+"check-out arayüzde)."
#. module: point_of_sale
#: model:ir.actions.act_window,name:point_of_sale.action_new_bank_statement_tree
@@ -2466,7 +2535,7 @@ msgstr "Armut"
#. module: point_of_sale
#: field:report.transaction.pos,journal_id:0
msgid "Sales Journal"
-msgstr "Satış Günlüğü"
+msgstr "Satış Yevmiye"
#. module: point_of_sale
#: view:pos.session:0
@@ -2517,7 +2586,7 @@ msgstr "Beers"
#. module: point_of_sale
#: help:pos.config,name:0
msgid "An internal identification of the point of sale"
-msgstr ""
+msgstr "Satış noktasında bir dahili kimlik"
#. module: point_of_sale
#: view:pos.config:0
@@ -2545,7 +2614,7 @@ msgstr "Ödeme Yöntemleri Özet"
#: code:addons/point_of_sale/static/src/xml/pos.xml:470
#, python-format
msgid "Hardware Status"
-msgstr "Donanım Durum"
+msgstr "Donanım Durumu"
#. module: point_of_sale
#. openerp-web
@@ -2580,7 +2649,7 @@ msgstr "Orana göre Satışlar"
#. module: point_of_sale
#: view:pos.order:0
msgid "Statement lines"
-msgstr "Ekstre satırlar"
+msgstr "Ekstre satırları"
#. module: point_of_sale
#: model:product.template,name:point_of_sale.croky_paprika_45g_product_template
@@ -2743,13 +2812,13 @@ msgstr "Kasa Satırları"
#. module: point_of_sale
#: model:ir.actions.report.xml,name:point_of_sale.pos_payment_report_user
msgid "Today's Payment By User"
-msgstr "Günün kullanıcı Ödemeleri"
+msgstr "Günün Kullanıcı Ödemeleri"
#. module: point_of_sale
#: view:report.sales.by.margin.pos:0
#: view:report.sales.by.margin.pos.month:0
msgid "Sales by User Margin"
-msgstr "Kullanıcı oranına göre satışlar"
+msgstr "Kullanıcı Oranına göre Satışlar"
#. module: point_of_sale
#. openerp-web
@@ -2789,7 +2858,7 @@ msgstr "Dr. Oetker Ristorante Pollo"
#: constraint:pos.session:0
msgid ""
"You cannot create two active sessions related to the same point of sale!"
-msgstr "Bu satış noktaya aynı iki etkin oturum oluşturamazsınız!"
+msgstr "Bu satış noktasında iki etkin oturum oluşturamazsınız!"
#. module: point_of_sale
#: field:pos.category,image_small:0
@@ -2931,7 +3000,7 @@ msgstr "Yönetici"
#. module: point_of_sale
#: model:product.template,name:point_of_sale.lays_poivre_sel_oven_150g_product_template
msgid "Lays Salt and Pepper Oven Baked 150g"
-msgstr ""
+msgstr "Lays Salt and Pepper Oven Baked 150g"
#. module: point_of_sale
#: field:pos.details,date_start:0
@@ -2988,7 +3057,7 @@ msgstr "Satış Siparişi Arma"
#. module: point_of_sale
#: field:pos.config,iface_self_checkout:0
msgid "Self Checkout Mode"
-msgstr ""
+msgstr "Kendi kendine Ödeme Modu"
#. module: point_of_sale
#: field:account.journal,journal_user:0
@@ -3006,6 +3075,8 @@ msgid ""
"Person who uses the the cash register. It can be a reliever, a student or an "
"interim employee."
msgstr ""
+"Yazarkasa kullanan kişi. Bu ...., bir öğrenci ya da olabilir veya geçici "
+"personel."
#. module: point_of_sale
#: model:product.template,name:point_of_sale.coca_zero_decaf_33cl_product_template
@@ -3027,7 +3098,7 @@ msgstr "Fanta Orange 25cl"
#. module: point_of_sale
#: view:pos.confirm:0
msgid "Generate Journal Entries"
-msgstr "Yevmiye kayıtlarını Oluştur"
+msgstr "Yevmiye Kayıtlarını Oluştur"
#. module: point_of_sale
#: report:account.statement:0
@@ -3105,7 +3176,7 @@ msgstr "Tamam"
#: code:addons/point_of_sale/static/src/xml/pos.xml:278
#, python-format
msgid "Please scan an item"
-msgstr ""
+msgstr "Lütfen ürün barkodunu tarayın"
#. module: point_of_sale
#: model:ir.actions.act_window,name:point_of_sale.action_pos_box_in
@@ -3116,12 +3187,12 @@ msgstr "Para Koy"
#. module: point_of_sale
#: model:product.template,name:point_of_sale.fanta_zero_orange_1,5l_product_template
msgid "Fanta Orange Zero 1.5L"
-msgstr ""
+msgstr "Fanta Orange Zero 1.5L"
#. module: point_of_sale
#: model:product.template,name:point_of_sale.boni_orange_product_template
msgid "Boni Oranges"
-msgstr ""
+msgstr "Boni Portakaları"
#. module: point_of_sale
#: code:addons/point_of_sale/point_of_sale.py:300
@@ -3147,7 +3218,7 @@ msgstr "Hata!"
#. module: point_of_sale
#: report:pos.lines:0
msgid "No. Of Articles"
-msgstr "Eşya adedi"
+msgstr "Ürün Adedi"
#. module: point_of_sale
#: selection:pos.order,state:0
@@ -3166,6 +3237,8 @@ msgid ""
"The Point of Sale Category this products belongs to. Those categories are "
"used to group similar products and are specific to the Point of Sale."
msgstr ""
+"Satılık Kategorisi Bu ürünlerin Satış Noktasına aittir. Bu kategoride benzer "
+"grub ürünler için kullanılır ve Satış Noktasına özgüdür."
#. module: point_of_sale
#: model:product.template,name:point_of_sale.orangina_1,5l_product_template
@@ -3180,7 +3253,7 @@ msgstr "Satış Noktası Analizi"
#. module: point_of_sale
#: model:pos.category,name:point_of_sale.ice_cream
msgid "Ice Cream"
-msgstr "Ice Cream"
+msgstr "Dondurma"
#. module: point_of_sale
#: field:pos.config,shop_id:0
@@ -3193,12 +3266,12 @@ msgstr "Mağza"
#: code:addons/point_of_sale/wizard/pos_box_entries.py:123
#, python-format
msgid "Please check that income account is set to %s."
-msgstr ""
+msgstr "Bu gelir hesabı %s olarak ayarlanır kontrol edin."
#. module: point_of_sale
#: model:ir.model,name:point_of_sale.model_account_bank_statement_line
msgid "Bank Statement Line"
-msgstr "Banka Ekstresi Satırı"
+msgstr "Banka Ekstre Satırı"
#. module: point_of_sale
#: model:product.template,name:point_of_sale.belle_vue_kriek_25cl_product_template
@@ -3213,7 +3286,7 @@ msgstr "Chaudfontaine Petillante 1.5l"
#. module: point_of_sale
#: model:product.template,name:point_of_sale.ijsboerke_stracciatella_2,5l_product_template
msgid "IJsboerke Stracciatella 2.5L"
-msgstr ""
+msgstr "IJsboerke Stracciatella 2.5L"
#. module: point_of_sale
#: view:report.sales.by.user.pos:0
@@ -3231,7 +3304,7 @@ msgstr "Chaudfontaine 1.5l"
#: code:addons/point_of_sale/point_of_sale.py:1069
#, python-format
msgid "Trade Receivables"
-msgstr ""
+msgstr "Ticari Alacaklar"
#. module: point_of_sale
#: code:addons/point_of_sale/point_of_sale.py:529
@@ -3274,7 +3347,7 @@ msgstr "Yevmiye Girişleri"
#: code:addons/point_of_sale/point_of_sale.py:736
#, python-format
msgid "There is no receivable account defined to make payment."
-msgstr ""
+msgstr "Ödeme yapmak için tanımlanmış bir alacak hesabı yok."
#. module: point_of_sale
#: model:product.template,name:point_of_sale.citron_product_template
@@ -3284,7 +3357,7 @@ msgstr "Limon"
#. module: point_of_sale
#: report:pos.invoice:0
msgid "Cancelled Invoice"
-msgstr "İptal edilimiş fatura"
+msgstr "İptal edilimiş Fatura"
#. module: point_of_sale
#: model:product.template,name:point_of_sale.coca_zero_50cl_product_template
@@ -3308,6 +3381,7 @@ msgid ""
"You cannot confirm all orders of this session, because they have not the "
"'paid' status"
msgstr ""
+"Bu oturumun tüm siparişler teyit edemez.çünkü olmayanlar var'ödeme' durumu"
#. module: point_of_sale
#: view:pos.order:0
@@ -3324,12 +3398,12 @@ msgstr "Yazarkasaları açmak istiyor musun?"
#. module: point_of_sale
#: model:product.template,name:point_of_sale.perrier_50cl_product_template
msgid "50cl Perrier"
-msgstr ""
+msgstr "50cl Perrier"
#. module: point_of_sale
#: model:ir.model,name:point_of_sale.model_cash_box_out
msgid "cash.box.out"
-msgstr ""
+msgstr "cash.box.out"
#. module: point_of_sale
#: model:product.template,name:point_of_sale.fanta_zero_orange_33cl_product_template
@@ -3340,6 +3414,7 @@ msgstr "Fanta Zero Orange 33cl"
#: help:product.product,available_in_pos:0
msgid "Check if you want this product to appear in the Point of Sale"
msgstr ""
+"Bu ürünün Satış Noktası görünmesini istediğinizin olmadığını kontrol edin"
#. module: point_of_sale
#: view:report.pos.order:0
@@ -3389,7 +3464,7 @@ msgstr "Teslimat iptal edilemiyor."
#. module: point_of_sale
#: view:pos.config:0
msgid "Material Interfaces"
-msgstr ""
+msgstr "Malzeme Arayüzler"
#. module: point_of_sale
#: model:pos.category,name:point_of_sale.fruits
@@ -3399,7 +3474,7 @@ msgstr "Taze Meyveler"
#. module: point_of_sale
#: model:product.template,name:point_of_sale.lindemans_pecheresse_37,,5cl_product_template
msgid "Lindemans sinful 37.5cl"
-msgstr ""
+msgstr "Lindemans sinful 37.5cl"
#. module: point_of_sale
#: model:ir.actions.act_window,name:point_of_sale.action_pos_invoice
@@ -3414,7 +3489,7 @@ msgstr "Aralık"
#. module: point_of_sale
#: field:pos.category,image:0
msgid "Image"
-msgstr ""
+msgstr "Resim"
#. module: point_of_sale
#: model:product.template,name:point_of_sale.spa_gazeuse_1,5l_product_template
@@ -3443,7 +3518,7 @@ msgstr "Fatura Yazdır"
#. module: point_of_sale
#: field:pos.order,pos_reference:0
msgid "Receipt Ref"
-msgstr ""
+msgstr "Makbuz Ref"
#. module: point_of_sale
#: model:ir.model,name:point_of_sale.model_pos_details
@@ -3519,13 +3594,23 @@ msgid ""
" \n"
" "
msgstr ""
+"
\n"
+" Yeni bir sipariş oluşturmak için tıklayın.\n"
+"
\n"
+" Sizin Bundan önceki siparişleri göz atmak için bu menüyü "
+"kullanın. kaydetmek içinyeni\n"
+" siparişleri, daha iyi menü Oturum kullanmalısınız "
+"için\n"
+" dokunmatik ekran arayüzü.\n"
+"
\n"
+" "
#. module: point_of_sale
#. openerp-web
#: code:addons/point_of_sale/static/src/xml/pos.xml:450
#, python-format
msgid "Electronic Scale"
-msgstr "Elektronik Kantar"
+msgstr "Elektronik Tartı"
#. module: point_of_sale
#: model:product.template,name:point_of_sale.spa_gazeuse_50cl_product_template
@@ -3541,7 +3626,7 @@ msgstr "Öntanımlı SatışNoktası"
#: code:addons/point_of_sale/wizard/pos_box.py:24
#, python-format
msgid "There is no cash register for this PoS Session"
-msgstr ""
+msgstr "Bu POS Oturum için bir kasa yok"
#. module: point_of_sale
#: model:pos.category,name:point_of_sale.special_beers
@@ -3574,7 +3659,7 @@ msgstr "Ödendi"
#: code:addons/point_of_sale/static/src/xml/pos.xml:464
#, python-format
msgid "3.141Kg Oranges"
-msgstr ""
+msgstr "3.141Kg Oranges"
#. module: point_of_sale
#: report:pos.invoice:0
@@ -3585,34 +3670,34 @@ msgstr "PROFORMA"
#: code:addons/point_of_sale/point_of_sale.py:818
#, python-format
msgid "Please provide a partner for the sale."
-msgstr "Satış için bir Cari belirtin"
+msgstr "Satış için bir partner belirtin"
#. module: point_of_sale
#: model:pos.category,name:point_of_sale.fruity_beers
msgid "Fruity Beers"
-msgstr "Fruity Beers"
+msgstr "Meyveli Biralar"
#. module: point_of_sale
#: view:pos.session:0
msgid "You can define another list of available currencies on the"
-msgstr "mevcut parabirimini başka bir liste tanımlayabilirsiniz"
+msgstr "Mevcut parabirimini başka bir liste tanımlayabilirsiniz"
#. module: point_of_sale
#. openerp-web
#: code:addons/point_of_sale/static/src/xml/pos.xml:463
#, python-format
msgid "Soda 33cl"
-msgstr ""
+msgstr "Soda 33cl"
#. module: point_of_sale
#: help:pos.session,cash_register_balance_start:0
msgid "Computed using the cash control at the opening."
-msgstr ""
+msgstr "Açılışında nakit kontrolü kullanılarak hesaplanmıştır."
#. module: point_of_sale
#: model:pos.category,name:point_of_sale.raisins
msgid "Grapes"
-msgstr ""
+msgstr "Üzüm"
#. module: point_of_sale
#: model:ir.actions.act_window,name:point_of_sale.action_trans_pos_tree
@@ -3672,7 +3757,7 @@ msgstr "Nakit Kotrolü"
#. module: point_of_sale
#: model:product.template,name:point_of_sale.oetker_vegetale_product_template
msgid "Dr. Oetker Ristorante Vegetable"
-msgstr ""
+msgstr "Dr. Oetker Ristorante Vegetable"
#. module: point_of_sale
#: model:pos.category,name:point_of_sale.soda
@@ -3694,7 +3779,7 @@ msgstr "İade"
#: code:addons/point_of_sale/static/src/xml/pos.xml:417
#, python-format
msgid "Your shopping cart is empty"
-msgstr ""
+msgstr "Alışveriş sepetiniz boş"
#. module: point_of_sale
#: code:addons/point_of_sale/report/pos_invoice.py:46
@@ -3716,7 +3801,7 @@ msgstr "İnd(%)"
#. module: point_of_sale
#: view:pos.session.opening:0
msgid "The session"
-msgstr ""
+msgstr "Oturum"
#. module: point_of_sale
#: view:pos.order:0
@@ -3764,13 +3849,13 @@ msgstr "Spa Reine 50cl"
#. module: point_of_sale
#: model:product.template,name:point_of_sale.chicon_flandria_extra_product_template
msgid "Extra Flandria chicory"
-msgstr ""
+msgstr "Ekstra Flandria hindiba"
#. module: point_of_sale
#: model:product.template,name:point_of_sale.lays_light_naturel_170g_product_template
#: model:product.template,name:point_of_sale.lays_naturel_170g_product_template
msgid "Lays Natural Light 170g"
-msgstr ""
+msgstr "Lays Natural Light 170g"
#. module: point_of_sale
#: model:product.template,name:point_of_sale.leffe_blonde_33cl_product_template
@@ -3795,12 +3880,12 @@ msgstr "Oturum:"
#. module: point_of_sale
#: field:pos.config,iface_print_via_proxy:0
msgid "Print via Proxy"
-msgstr ""
+msgstr "Proxy ile Yazdır"
#. module: point_of_sale
#: report:pos.sales.user.today:0
msgid "Today's Sales By User"
-msgstr "Kullanıcıya göre günlük satışlar"
+msgstr "Kullanıcı Günlük Satışlar"
#. module: point_of_sale
#: help:account.journal,amount_authorized_diff:0
@@ -3810,6 +3895,10 @@ msgid ""
"maximum is reached, the user will have an error message at the closing of "
"his session saying that he needs to contact his manager."
msgstr ""
+"Bu alan, bitiş bakiyesi arasındaki izin verilen maksimum farkı gösterirve "
+"teorik nakit bir oturum kapatırken, POS yöneticisi olmayan için. Bu "
+"iseMaksimum ulaşıldığında, kullanıcının kapanışında bir hata mesajı "
+"alacakonun Oturum onun yöneticisi ile irtibata geçmesi gerektiğini söyler."
#. module: point_of_sale
#: report:pos.invoice:0
@@ -3846,7 +3935,7 @@ msgstr "Dahili Notlar"
#. module: point_of_sale
#: model:product.template,name:point_of_sale.ijsboerke_chocolat_2,5l_product_template
msgid "IJsboerke Chocolat 2.5L"
-msgstr ""
+msgstr "IJsboerke Chocolat 2.5L"
#. module: point_of_sale
#: help:pos.category,image_small:0
@@ -3855,6 +3944,9 @@ msgid ""
"image, with aspect ratio preserved. Use this field anywhere a small image is "
"required."
msgstr ""
+"Kategorinin küçük boyutlu görüntü. Otomatik olarak bir 64x64px olarak "
+"yeniden boyutlandırılır korunmuş boy oranı ile görüntü,. Her yerde küçük bir "
+"görüntüdür bu alanı kullanın gereklidir."
#. module: point_of_sale
#: field:pos.session.opening,pos_state:0
@@ -3882,6 +3974,18 @@ msgid ""
" \n"
" "
msgstr ""
+"
\n"
+" Bir ödeme yöntemi eklemek için tıklayın.\n"
+"
\n"
+" Ödeme yöntemleri olan muhasebe yevmiye tarafından tanımlanır "
+"the\n"
+" alan POS Ödeme Şekli kontrol etti. sipariş için "
+"kullanılabilir\n"
+" dokunmatik ekran arayüzü, size ödeme ayarlamanız gerekir "
+"yöntem\n"
+" Satış yapılandırmasının Satış Noktası.\n"
+"
\n"
+" "
#. module: point_of_sale
#: view:pos.order:0
@@ -3903,17 +4007,17 @@ msgstr "Düzenle"
#. module: point_of_sale
#: view:pos.session.opening:0
msgid "Click to continue the session."
-msgstr ""
+msgstr "Oturum Devamı için tıklayınız."
#. module: point_of_sale
#: view:pos.config:0
msgid "Set to Active"
-msgstr ""
+msgstr "Aktif olarak Ayarlayın"
#. module: point_of_sale
#: view:pos.category:0
msgid "Product PoS Categories"
-msgstr ""
+msgstr "Ürün POS Kategorileri"
#. module: point_of_sale
#: view:pos.session.opening:0
@@ -3967,12 +4071,12 @@ msgstr ""
#: code:addons/point_of_sale/static/src/xml/pos.xml:41
#, python-format
msgid "Mozilla Firefox"
-msgstr ""
+msgstr "Mozilla Firefox"
#. module: point_of_sale
#: model:product.template,name:point_of_sale.raisins_noir_product_template
msgid "Black Grapes"
-msgstr ""
+msgstr "Siyah Üzüm"
#. module: point_of_sale
#: field:pos.category,sequence:0
@@ -4001,7 +4105,7 @@ msgstr "Kullanıcı Bugünki Stışları"
#: code:addons/point_of_sale/static/src/xml/pos.xml:351
#, python-format
msgid "Sorry, we could not create a session for this user."
-msgstr ""
+msgstr "Üzgünüz, bu kullanıcı için bir oturum oluşturamadı."
#. module: point_of_sale
#: code:addons/point_of_sale/point_of_sale.py:98
@@ -4009,7 +4113,7 @@ msgstr ""
#: selection:pos.session.opening,pos_state:0
#, python-format
msgid "Opening Control"
-msgstr ""
+msgstr "Kontrol açılış"
#. module: point_of_sale
#: view:report.pos.order:0
@@ -4027,12 +4131,12 @@ msgstr "Yıl"
#: code:addons/point_of_sale/static/src/xml/pos.xml:505
#, python-format
msgid "at"
-msgstr ""
+msgstr "de"
#. module: point_of_sale
#: model:ir.model,name:point_of_sale.model_cash_box_in
msgid "cash.box.in"
-msgstr ""
+msgstr "cash.box.in"
#. module: point_of_sale
#: model:ir.actions.act_window,name:point_of_sale.act_pos_session_orders
diff --git a/addons/portal_sale/i18n/fr.po b/addons/portal_sale/i18n/fr.po
index bf65092f4d7..9c09375b830 100644
--- a/addons/portal_sale/i18n/fr.po
+++ b/addons/portal_sale/i18n/fr.po
@@ -8,14 +8,14 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2013-03-07 08:38+0000\n"
-"PO-Revision-Date: 2013-04-24 10:19+0000\n"
+"PO-Revision-Date: 2013-05-07 07:57+0000\n"
"Last-Translator: WANTELLET Sylvain \n"
"Language-Team: French \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-04-25 06:06+0000\n"
-"X-Generator: Launchpad (build 16580)\n"
+"X-Launchpad-Export-Date: 2013-05-08 06:17+0000\n"
+"X-Generator: Launchpad (build 16598)\n"
#. module: portal_sale
#: model:ir.model,name:portal_sale.model_account_config_settings
@@ -30,7 +30,7 @@ msgstr "[('share','=', False)]"
#. module: portal_sale
#: model:ir.actions.act_window,help:portal_sale.portal_action_invoices
msgid "We haven't sent you any invoice."
-msgstr ""
+msgstr "Nous ne vous avons envoyé aucune facture."
#. module: portal_sale
#: model:email.template,report_name:portal_sale.email_template_edi_sale
@@ -44,7 +44,7 @@ msgstr ""
#. module: portal_sale
#: model:res.groups,name:portal_sale.group_payment_options
msgid "View Online Payment Options"
-msgstr ""
+msgstr "Voir les options de paiement en ligne"
#. module: portal_sale
#: field:account.config.settings,group_payment_options:0
@@ -63,12 +63,12 @@ msgstr ""
#. module: portal_sale
#: model:ir.actions.act_window,help:portal_sale.action_quotations_portal
msgid "We haven't sent you any quotation."
-msgstr ""
+msgstr "Nous ne vous avons envoyé aucun devis."
#. module: portal_sale
#: model:ir.ui.menu,name:portal_sale.portal_sales_orders
msgid "Sales Orders"
-msgstr ""
+msgstr "Commandes de vente"
#. module: portal_sale
#: model:res.groups,comment:portal_sale.group_payment_options
@@ -303,7 +303,7 @@ msgstr "${object.company_id.name} Facture (Ref ${object.number or 'n/a' })"
#. module: portal_sale
#: model:ir.model,name:portal_sale.model_mail_mail
msgid "Outgoing Mails"
-msgstr ""
+msgstr "Courriels sortants"
#. module: portal_sale
#: model:ir.actions.act_window,name:portal_sale.action_quotations_portal
@@ -314,7 +314,7 @@ msgstr "Devis"
#. module: portal_sale
#: model:ir.model,name:portal_sale.model_sale_order
msgid "Sales Order"
-msgstr ""
+msgstr "Commande de vente"
#. module: portal_sale
#: field:account.invoice,portal_payment_options:0
diff --git a/addons/product/i18n/fr.po b/addons/product/i18n/fr.po
index 4ab8fd11ec5..17465c9cdf6 100644
--- a/addons/product/i18n/fr.po
+++ b/addons/product/i18n/fr.po
@@ -8,14 +8,14 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2013-03-07 08:38+0000\n"
-"PO-Revision-Date: 2013-03-21 02:08+0000\n"
-"Last-Translator: Florian Hatat \n"
+"PO-Revision-Date: 2013-05-07 07:59+0000\n"
+"Last-Translator: Gilles Major (OpenERP) \n"
"Language-Team: French \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-03-28 05:54+0000\n"
-"X-Generator: Launchpad (build 16546)\n"
+"X-Launchpad-Export-Date: 2013-05-08 06:18+0000\n"
+"X-Generator: Launchpad (build 16598)\n"
#. module: product
#: field:product.packaging,rows:0
@@ -494,7 +494,7 @@ msgstr "Quantité-3"
#. module: product
#: model:res.groups,name:product.group_product_variant
msgid "Product Variant (not supported)"
-msgstr ""
+msgstr "Variante d'article (non supportée)"
#. module: product
#: field:product.price_list,qty4:0
@@ -818,7 +818,7 @@ msgstr "Disque dur externe"
#. module: product
#: view:product.product:0
msgid "describe the product characteristics..."
-msgstr ""
+msgstr "Décrivez les caractéristiques de l'article"
#. module: product
#: help:product.template,standard_price:0
@@ -1418,7 +1418,7 @@ msgstr ""
#. module: product
#: view:product.product:0
msgid "This note will be displayed on requests for quotation..."
-msgstr ""
+msgstr "Cette note sera affichée sur les demandes de prix..."
#. module: product
#: view:product.product:0
@@ -2032,7 +2032,7 @@ msgstr "Composants"
#. module: product
#: view:product.product:0
msgid "e.g. 5901234123457"
-msgstr ""
+msgstr "ex: 5901234123457"
#. module: product
#: model:ir.model,name:product.model_product_pricelist_type
@@ -2615,7 +2615,7 @@ msgstr "Unité de mesure fournisseur"
#. module: product
#: view:product.product:0
msgid "note to be displayed on quotations..."
-msgstr ""
+msgstr "Note à afficher sur les devis..."
#. module: product
#: view:product.product:0
diff --git a/addons/product_manufacturer/i18n/lt.po b/addons/product_manufacturer/i18n/lt.po
index 09a24313c05..7a1e20f650d 100644
--- a/addons/product_manufacturer/i18n/lt.po
+++ b/addons/product_manufacturer/i18n/lt.po
@@ -8,25 +8,25 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2013-03-07 08:38+0000\n"
-"PO-Revision-Date: 2013-01-26 14:43+0000\n"
-"Last-Translator: FULL NAME \n"
+"PO-Revision-Date: 2013-05-07 10:16+0000\n"
+"Last-Translator: Paulius Sladkevičius \n"
"Language-Team: Lithuanian \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-03-28 05:55+0000\n"
-"X-Generator: Launchpad (build 16546)\n"
+"X-Launchpad-Export-Date: 2013-05-08 06:18+0000\n"
+"X-Generator: Launchpad (build 16598)\n"
#. module: product_manufacturer
#: field:product.product,manufacturer_pref:0
msgid "Manufacturer Product Code"
-msgstr ""
+msgstr "Produkto kodas"
#. module: product_manufacturer
#: model:ir.model,name:product_manufacturer.model_product_product
#: field:product.manufacturer.attribute,product_id:0
msgid "Product"
-msgstr ""
+msgstr "Produktas"
#. module: product_manufacturer
#: view:product.manufacturer.attribute:0
@@ -52,7 +52,7 @@ msgstr ""
#. module: product_manufacturer
#: field:product.manufacturer.attribute,value:0
msgid "Value"
-msgstr ""
+msgstr "Reikšmė"
#. module: product_manufacturer
#: view:product.product:0
@@ -63,10 +63,10 @@ msgstr ""
#. module: product_manufacturer
#: field:product.product,manufacturer_pname:0
msgid "Manufacturer Product Name"
-msgstr ""
+msgstr "Produkto pavadinimas"
#. module: product_manufacturer
#: view:product.product:0
#: field:product.product,manufacturer:0
msgid "Manufacturer"
-msgstr ""
+msgstr "Gamintojas"
diff --git a/addons/project/i18n/fr.po b/addons/project/i18n/fr.po
index 319fc9b4cb2..30757be9744 100644
--- a/addons/project/i18n/fr.po
+++ b/addons/project/i18n/fr.po
@@ -8,19 +8,19 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2013-03-07 08:37+0000\n"
-"PO-Revision-Date: 2013-03-11 09:24+0000\n"
-"Last-Translator: Numérigraphe \n"
+"PO-Revision-Date: 2013-05-07 08:14+0000\n"
+"Last-Translator: WANTELLET Sylvain \n"
"Language-Team: French \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-03-28 05:56+0000\n"
-"X-Generator: Launchpad (build 16546)\n"
+"X-Launchpad-Export-Date: 2013-05-08 06:18+0000\n"
+"X-Generator: Launchpad (build 16598)\n"
#. module: project
#: view:project.project:0
msgid "Email Interface"
-msgstr "Interace courriel"
+msgstr "Interface courriel"
#. module: project
#: help:account.analytic.account,use_tasks:0
@@ -28,6 +28,8 @@ msgid ""
"If checked, this contract will be available in the project menu and you will "
"be able to manage tasks or track issues"
msgstr ""
+"Si cochée, le présent contrat sera disponible dans le menu projet et vous "
+"serez en mesure de gérer des tâches ou le suivi des problèmes"
#. module: project
#: field:project.project,progress_rate:0
@@ -352,7 +354,7 @@ msgstr "Juin"
#. module: project
#: view:project.task:0
msgid "Gantt View"
-msgstr ""
+msgstr "Vue de Gantt"
#. module: project
#: selection:report.project.task.user,month:0
@@ -390,7 +392,7 @@ msgstr "Résumé"
#. module: project
#: view:project.task:0
msgid "Task summary..."
-msgstr ""
+msgstr "Résumé de la tâche..."
#. module: project
#: view:project.project:0
@@ -509,7 +511,7 @@ msgstr "Date de création"
#. module: project
#: view:project.task:0
msgid "Add a Description..."
-msgstr ""
+msgstr "Ajoutez une description..."
#. module: project
#: view:res.partner:0
@@ -789,7 +791,7 @@ msgstr "Ouvrir les tâches en brouillon"
#. module: project
#: field:project.project,alias_model:0
msgid "Alias Model"
-msgstr ""
+msgstr "Modèle d'alias"
#. module: project
#: help:report.project.task.user,closing_days:0
@@ -901,7 +903,7 @@ msgstr "GTD"
#. module: project
#: view:project.project:0
msgid "Project Stages"
-msgstr ""
+msgstr "Étapes de projet"
#. module: project
#: help:project.task,state:0
@@ -934,6 +936,8 @@ msgid ""
"Provides management of issues/bugs in projects.\n"
" This installs the module project_issue."
msgstr ""
+"Permet de gérer les problèmes / bugs dans les projets.\n"
+" Ceci installe le module project_issue."
#. module: project
#: help:project.task,kanban_state:0
@@ -1007,6 +1011,8 @@ msgid ""
"Follow this project to automatically track the events associated to tasks "
"and issues of this project."
msgstr ""
+"Permet de suivre automatiquement les événements associés aux tâches et aux "
+"problèmes de ce projet."
#. module: project
#: view:project.task:0
diff --git a/addons/purchase/i18n/fr.po b/addons/purchase/i18n/fr.po
index 1d9f22ab934..93a033dda68 100644
--- a/addons/purchase/i18n/fr.po
+++ b/addons/purchase/i18n/fr.po
@@ -8,14 +8,14 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2013-03-07 08:37+0000\n"
-"PO-Revision-Date: 2013-04-30 08:15+0000\n"
-"Last-Translator: WANTELLET Sylvain \n"
+"PO-Revision-Date: 2013-05-07 09:56+0000\n"
+"Last-Translator: Olivier Dony (OpenERP) \n"
"Language-Team: French \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-05-01 05:15+0000\n"
-"X-Generator: Launchpad (build 16580)\n"
+"X-Launchpad-Export-Date: 2013-05-08 06:18+0000\n"
+"X-Generator: Launchpad (build 16598)\n"
#. module: purchase
#: model:res.groups,name:purchase.group_analytic_accounting
@@ -659,6 +659,9 @@ msgid ""
"A Pick list generates an invoice. Depending on the Invoicing control of the "
"sales order, the invoice is based on delivered or on ordered quantities."
msgstr ""
+"Un bon de transfert génère une facture. En fonction de la méthode de "
+"contrôle de facturation du bon de commande, la facture sera basée sur les "
+"quantités réceptionnées ou sur les quantités commandées."
#. module: purchase
#: view:purchase.report:0
@@ -697,7 +700,7 @@ msgstr "Impossible d'annuler ce bon de commande d'achat"
#. module: purchase
#: model:ir.ui.menu,name:purchase.menu_procurement_management_invoice
msgid "Invoice Control"
-msgstr "Contrôle facture"
+msgstr "Contrôle facturation"
#. module: purchase
#: model:ir.actions.act_window,help:purchase.action_stock_move_report_po
@@ -905,12 +908,12 @@ msgstr "Sociétés"
#. module: purchase
#: view:purchase.order.group:0
msgid "Are you sure you want to merge these orders?"
-msgstr ""
+msgstr "Êtes-vous sûr de vouloir fusionner ces commandes ?"
#. module: purchase
#: field:account.config.settings,module_purchase_analytic_plans:0
msgid "Use multiple analytic accounts on orders"
-msgstr ""
+msgstr "Utiliser plusieurs comptes analytiques pour les commandes"
#. module: purchase
#: view:product.product:0
@@ -1231,7 +1234,7 @@ msgstr "Unités de mesure"
#. module: purchase
#: field:purchase.config.settings,group_purchase_pricelist:0
msgid "Manage pricelist per supplier"
-msgstr ""
+msgstr "Gérer les listes de prix par fournisseur"
#. module: purchase
#: view:board.board:0
@@ -1243,11 +1246,13 @@ msgstr "Tableau de bord des achats"
#, python-format
msgid "First cancel all receptions related to this purchase order."
msgstr ""
+"Il faut préalablement annuler toutes les réceptions liées à ce bon de "
+"commande."
#. module: purchase
#: view:purchase.order:0
msgid "Approve Order"
-msgstr ""
+msgstr "Approuver la commande"
#. module: purchase
#: help:purchase.report,date:0
@@ -1302,7 +1307,7 @@ msgstr "Notes"
#. module: purchase
#: field:purchase.config.settings,module_purchase_requisition:0
msgid "Manage purchase requisitions"
-msgstr ""
+msgstr "Gérer les appels d'offre"
#. module: purchase
#: report:purchase.order:0
@@ -1360,7 +1365,7 @@ msgstr "Demandes de prix."
#. module: purchase
#: view:purchase.order:0
msgid "Source"
-msgstr ""
+msgstr "Origine"
#. module: purchase
#: model:ir.model,name:purchase.model_stock_picking
@@ -1381,7 +1386,7 @@ msgstr "Factures générées pour un bon de commande"
#. module: purchase
#: selection:purchase.config.settings,default_invoice_method:0
msgid "Pre-generate draft invoices based on purchase orders"
-msgstr ""
+msgstr "Une facture brouillon sera générée sur base du bon de commande"
#. module: purchase
#: help:product.template,purchase_ok:0
@@ -1437,7 +1442,7 @@ msgstr "un bon de commande d'achat brouillon"
#: code:addons/purchase/purchase.py:320
#, python-format
msgid "Please create Invoices."
-msgstr ""
+msgstr "Veuillez créer les factures"
#. module: purchase
#: model:ir.model,name:purchase.model_procurement_order
@@ -1458,7 +1463,7 @@ msgstr "Mars"
#. module: purchase
#: view:purchase.order:0
msgid "Receive Invoice"
-msgstr ""
+msgstr "Réception Facture"
#. module: purchase
#: view:purchase.order:0
@@ -1539,6 +1544,7 @@ msgstr "Expéditions à facturer"
#, python-format
msgid "Define purchase journal for this company: \"%s\" (id:%d)."
msgstr ""
+"Veuillez configurer un journal d'achat pour cette société: \"%s\" (id:%d)."
#. module: purchase
#: view:purchase.order:0
@@ -1571,7 +1577,7 @@ msgstr "Bon de réception"
#: model:ir.actions.act_window,name:purchase.purchase_line_form_action2
#: model:ir.ui.menu,name:purchase.menu_purchase_line_order_draft
msgid "On Purchase Order Lines"
-msgstr ""
+msgstr "Sur lignes de commande"
#. module: purchase
#: report:purchase.quotation:0
@@ -1584,6 +1590,8 @@ msgid ""
"This is the list of incoming shipments that have been generated for this "
"purchase order."
msgstr ""
+"Voici la liste des livraisons entrantes qui ont été générées pour ce bon de "
+"commande."
#. module: purchase
#: field:purchase.config.settings,module_purchase_double_validation:0
@@ -1782,7 +1790,7 @@ msgstr "Responsable"
#. module: purchase
#: selection:purchase.order,invoice_method:0
msgid "Based on Purchase Order lines"
-msgstr "Basé sur les lignes de commande d'achat"
+msgstr "Basé sur les lignes de commande"
#. module: purchase
#: field:purchase.order,amount_total:0
@@ -1813,7 +1821,7 @@ msgstr "Adresse client (livraison directe)"
#. module: purchase
#: model:ir.actions.client,name:purchase.action_client_purchase_menu
msgid "Open Purchase Menu"
-msgstr ""
+msgstr "Ouvrir le menu des achats"
#. module: purchase
#: code:addons/purchase/purchase.py:1028
@@ -1926,7 +1934,7 @@ msgstr "Annulé"
#. module: purchase
#: field:res.partner,purchase_order_count:0
msgid "# of Purchase Order"
-msgstr ""
+msgstr "Nb. de commandes d'achat"
#. module: purchase
#: model:ir.model,name:purchase.model_mail_compose_message
@@ -1941,7 +1949,7 @@ msgstr "Tél. :"
#. module: purchase
#: view:purchase.order:0
msgid "Resend Purchase Order"
-msgstr ""
+msgstr "Renvoyer le bon de commande"
#. module: purchase
#: report:purchase.order:0
@@ -2113,7 +2121,7 @@ msgstr "Liste des produits commandés"
#. module: purchase
#: view:purchase.order:0
msgid "Incoming Shipments & Invoices"
-msgstr ""
+msgstr "Factures & Bons de Réception"
#. module: purchase
#: selection:purchase.order,state:0
@@ -2186,6 +2194,14 @@ msgid ""
"Bases on incoming shipments: let you create an invoice when receptions are "
"validated."
msgstr ""
+"Basé sur les lignes de commande: les factures pourront être générées depuis "
+"la liste des lignes de commandes à facturer via le menu 'Contrôle "
+"facturation > Sur lignes de commande'.\n"
+"Basé sur les factures brouillon: les factures pourront être générées depuis "
+"les bons de commande et manuellement confirmée depuis le menu 'Contrôle "
+"facturation > Sur factures brouillon'.\n"
+"Basé sur les réceptions: les factures pourront être générées depuis la liste "
+"des réceptions à facturer via le menu 'Contrôle facturation > Sur réceptions'"
#. module: purchase
#: model:ir.ui.menu,name:purchase.menu_partner_categories_in_form
@@ -2205,7 +2221,7 @@ msgstr "Demande de prix N°"
#. module: purchase
#: view:purchase.config.settings:0
msgid "Invoicing Settings"
-msgstr ""
+msgstr "Facturation"
#. module: purchase
#: model:ir.actions.act_window,name:purchase.action_purchase_order_by_user_all
@@ -2215,7 +2231,7 @@ msgstr "Total des commandes par utilisateur par mois"
#. module: purchase
#: selection:purchase.order,invoice_method:0
msgid "Based on incoming shipments"
-msgstr ""
+msgstr "Basé sur les réceptions"
#. module: purchase
#: code:addons/purchase/purchase.py:1018
@@ -2260,7 +2276,7 @@ msgstr "Février"
#: model:ir.actions.act_window,name:purchase.action_invoice_pending
#: model:ir.ui.menu,name:purchase.menu_procurement_management_pending_invoice
msgid "On Draft Invoices"
-msgstr ""
+msgstr "Sur factures brouillon"
#. module: purchase
#: model:ir.actions.act_window,name:purchase.action_purchase_order_report_all
@@ -2330,7 +2346,7 @@ msgstr "Versions de la liste de prix"
#. module: purchase
#: field:purchase.order,payment_term_id:0
msgid "Payment Term"
-msgstr ""
+msgstr "Conditions de règlement"
#. module: purchase
#: view:purchase.order:0
@@ -2346,7 +2362,7 @@ msgstr "Année"
#. module: purchase
#: selection:purchase.config.settings,default_invoice_method:0
msgid "Based on purchase order lines"
-msgstr ""
+msgstr "Basé sur les lignes de commande"
#. module: purchase
#: model:ir.actions.act_window,help:purchase.act_res_partner_2_purchase_order
diff --git a/addons/purchase_requisition/i18n/fr.po b/addons/purchase_requisition/i18n/fr.po
index 59c43756343..3796fb79805 100644
--- a/addons/purchase_requisition/i18n/fr.po
+++ b/addons/purchase_requisition/i18n/fr.po
@@ -8,14 +8,14 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2013-03-07 08:38+0000\n"
-"PO-Revision-Date: 2012-12-21 23:00+0000\n"
-"Last-Translator: Numérigraphe \n"
+"PO-Revision-Date: 2013-05-07 07:54+0000\n"
+"Last-Translator: Gilles Major (OpenERP) \n"
"Language-Team: French \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-03-28 05:59+0000\n"
-"X-Generator: Launchpad (build 16546)\n"
+"X-Launchpad-Export-Date: 2013-05-08 06:18+0000\n"
+"X-Generator: Launchpad (build 16598)\n"
#. module: purchase_requisition
#: view:purchase.requisition:0
@@ -59,7 +59,7 @@ msgstr "Responsable"
#. module: purchase_requisition
#: view:purchase.requisition:0
msgid "Cancel Requisition"
-msgstr ""
+msgstr "Annuler l'appel"
#. module: purchase_requisition
#: view:purchase.requisition:0
@@ -70,7 +70,7 @@ msgstr ""
#. module: purchase_requisition
#: view:purchase.requisition:0
msgid "Send to Suppliers"
-msgstr ""
+msgstr "Envoyer aux fournisseurs"
#. module: purchase_requisition
#: view:purchase.requisition:0
@@ -81,7 +81,7 @@ msgstr "Regrouper par..."
#: view:purchase.requisition:0
#: selection:purchase.requisition,state:0
msgid "Purchase Done"
-msgstr ""
+msgstr "Achat effectué"
#. module: purchase_requisition
#: field:purchase.requisition,message_follower_ids:0
@@ -209,7 +209,7 @@ msgstr "Revenir à l'état \"Brouillon\""
#. module: purchase_requisition
#: view:purchase.requisition:0
msgid "Current Purchase Requisition"
-msgstr ""
+msgstr "Appel d'offres en cours"
#. module: purchase_requisition
#: model:res.groups,name:purchase_requisition.group_purchase_requisition_user
@@ -277,7 +277,7 @@ msgstr "Produits à acheter"
#: view:purchase.requisition:0
#: selection:purchase.requisition,state:0
msgid "Sent to Suppliers"
-msgstr ""
+msgstr "Envoyé aux fournisseurs"
#. module: purchase_requisition
#: view:purchase.requisition:0
@@ -345,7 +345,7 @@ msgstr "Type d'appel d'offres"
#. module: purchase_requisition
#: view:purchase.requisition:0
msgid "New Purchase Requisition"
-msgstr ""
+msgstr "Nouvel appel d'offres"
#. module: purchase_requisition
#: view:purchase.requisition:0
@@ -483,6 +483,8 @@ msgid ""
"Check this box to generates purchase requisition instead of generating "
"requests for quotation from procurement."
msgstr ""
+"Cochez cette case pour générer un appel d'offres plutôt qu'une demande de "
+"prix pour réapprovisionner le stock."
#. module: purchase_requisition
#: field:purchase.requisition,purchase_ids:0
From 7351a7312d3a20b3406b1f152353b75f9c719467 Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)"
Date: Wed, 8 May 2013 10:59:38 +0200
Subject: [PATCH 069/210] [FIX] hr_timesheet: improved perfomances on the read
of timesheet sheets
bzr revid: qdp-launchpad@openerp.com-20130508085938-a2uyalx1cy2musj0
---
.../hr_timesheet_sheet/hr_timesheet_sheet.py | 20 +++++--------------
.../test/test_hr_timesheet_sheet.yml | 7 ++++---
2 files changed, 9 insertions(+), 18 deletions(-)
diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet.py b/addons/hr_timesheet_sheet/hr_timesheet_sheet.py
index 2cf79596148..768d85860df 100644
--- a/addons/hr_timesheet_sheet/hr_timesheet_sheet.py
+++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet.py
@@ -293,7 +293,7 @@ class hr_timesheet_line(osv.osv):
return ts_line_ids
_columns = {
- 'sheet_id': fields.function(_sheet, string='Sheet',
+ 'sheet_id': fields.function(_sheet, string='Sheet', select="1",
type='many2one', relation='hr_timesheet_sheet.sheet', ondelete="cascade",
store={
'hr_timesheet_sheet.sheet': (_get_hr_timesheet_sheet, ['employee_id', 'date_from', 'date_to'], 10),
@@ -479,12 +479,8 @@ class hr_timesheet_sheet_sheet_day(osv.osv):
0.0 as total_attendance
from
hr_analytic_timesheet hrt
- left join (account_analytic_line l
- LEFT JOIN hr_timesheet_sheet_sheet s
- ON (s.date_to >= l.date
- AND s.date_from <= l.date
- AND s.user_id = l.user_id))
- on (l.id = hrt.line_id)
+ JOIN account_analytic_line l ON l.id = hrt.line_id
+ LEFT JOIN hr_timesheet_sheet_sheet s ON s.id = hrt.sheet_id
group by l.date::date, s.id
) union (
select
@@ -495,14 +491,8 @@ class hr_timesheet_sheet_sheet_day(osv.osv):
SUM(((EXTRACT(hour FROM a.name) * 60) + EXTRACT(minute FROM a.name)) * (CASE WHEN a.action = 'sign_in' THEN -1 ELSE 1 END)) as total_attendance
from
hr_attendance a
- LEFT JOIN (hr_timesheet_sheet_sheet s
- LEFT JOIN resource_resource r
- LEFT JOIN hr_employee e
- ON (e.resource_id = r.id)
- ON (s.user_id = r.user_id))
- ON (a.employee_id = e.id
- AND s.date_to >= date_trunc('day',a.name)
- AND s.date_from <= a.name)
+ LEFT JOIN hr_timesheet_sheet_sheet s
+ ON s.id = a.sheet_id
WHERE action in ('sign_in', 'sign_out')
group by a.name::date, s.id
)) AS foo
diff --git a/addons/hr_timesheet_sheet/test/test_hr_timesheet_sheet.yml b/addons/hr_timesheet_sheet/test/test_hr_timesheet_sheet.yml
index 71776af61ba..0dfeee54879 100644
--- a/addons/hr_timesheet_sheet/test/test_hr_timesheet_sheet.yml
+++ b/addons/hr_timesheet_sheet/test/test_hr_timesheet_sheet.yml
@@ -13,11 +13,11 @@
product_id: product.product_product_consultant
journal_id: hr_timesheet.analytic_journal
-
- I create a timesheet for employee "Quentin Paolinon".
+ I create a timesheet for employee "Quentin Paolino".
-
!record {model: hr_timesheet_sheet.sheet, id: hr_timesheet_sheet_sheet_deddk0}:
date_from: !eval time.strftime('%Y-%m-01')
- name: Quentin Paolinon
+ name: Quentin Paolino
state: new
user_id: base.user_demo
employee_id: 'hr.employee_qdp'
@@ -65,6 +65,7 @@
self.button_confirm(cr, uid, [ref('hr_timesheet_sheet_sheet_deddk0')], {"active_ids":
[ref("hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form")],"active_id": ref("hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form"),
})
+ assert True, "The validation of the timesheet was unexpectedly accepted despite the 2:30 hours of difference"
except:
pass
-
@@ -87,7 +88,7 @@
!record {model: res.company, id: base.main_company}:
timesheet_max_difference: 1.00
-
- I tried again to confirm the timesheet after modification.
+ I try again to confirm the timesheet after modification.
-
!python {model: hr_timesheet_sheet.sheet}: |
uid = ref('base.user_root')
From ea0316e3f1b75bc80890dc8bbfe6d4e26e6f71bf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?=
Date: Wed, 8 May 2013 12:23:04 +0200
Subject: [PATCH 070/210] [FIX] [FIX] mail: fixed subscription of an already
subscribed follower erasing already existing subtypes + added tests
bzr revid: tde@openerp.com-20130508102304-p52bq0qux9s7rses
---
addons/mail/mail_thread.py | 27 ++++++++---
addons/mail/tests/test_mail_features.py | 63 +++++++++++++++++++++++--
2 files changed, 79 insertions(+), 11 deletions(-)
diff --git a/addons/mail/mail_thread.py b/addons/mail/mail_thread.py
index 83a1df96bdf..b869a032ad5 100644
--- a/addons/mail/mail_thread.py
+++ b/addons/mail/mail_thread.py
@@ -1163,15 +1163,28 @@ class mail_thread(osv.AbstractModel):
else:
self.check_access_rights(cr, uid, 'write')
+ # subscribe partners
self.write(cr, SUPERUSER_ID, ids, {'message_follower_ids': [(4, pid) for pid in partner_ids]}, context=context)
- # if subtypes are not specified (and not set to a void list), fetch default ones
- if subtype_ids is None:
- subtype_obj = self.pool.get('mail.message.subtype')
- subtype_ids = subtype_obj.search(cr, uid, [('default', '=', True), '|', ('res_model', '=', self._name), ('res_model', '=', False)], context=context)
- # update the subscriptions
+
+ # subtype specified: update the subscriptions
fol_obj = self.pool.get('mail.followers')
- fol_ids = fol_obj.search(cr, SUPERUSER_ID, [('res_model', '=', self._name), ('res_id', 'in', ids), ('partner_id', 'in', partner_ids)], context=context)
- fol_obj.write(cr, SUPERUSER_ID, fol_ids, {'subtype_ids': [(6, 0, subtype_ids)]}, context=context)
+ if subtype_ids is not None:
+ fol_ids = fol_obj.search(cr, SUPERUSER_ID, [('res_model', '=', self._name), ('res_id', 'in', ids), ('partner_id', 'in', partner_ids)], context=context)
+ fol_obj.write(cr, SUPERUSER_ID, fol_ids, {'subtype_ids': [(6, 0, subtype_ids)]}, context=context)
+ # no subtypes: default ones for new subscription, do not update existing subscriptions
+ else:
+ # search new subscriptions: subtype_ids is False
+ fol_ids = fol_obj.search(cr, SUPERUSER_ID, [
+ ('res_model', '=', self._name),
+ ('res_id', 'in', ids),
+ ('partner_id', 'in', partner_ids),
+ ('subtype_ids', '=', False)
+ ], context=context)
+ if fol_ids:
+ subtype_obj = self.pool.get('mail.message.subtype')
+ subtype_ids = subtype_obj.search(cr, uid, [('default', '=', True), '|', ('res_model', '=', self._name), ('res_model', '=', False)], context=context)
+ fol_obj.write(cr, SUPERUSER_ID, fol_ids, {'subtype_ids': [(6, 0, subtype_ids)]}, context=context)
+
return True
def message_unsubscribe_users(self, cr, uid, ids, user_ids=None, context=None):
diff --git a/addons/mail/tests/test_mail_features.py b/addons/mail/tests/test_mail_features.py
index 7eea66b3b90..e1bef837010 100644
--- a/addons/mail/tests/test_mail_features.py
+++ b/addons/mail/tests/test_mail_features.py
@@ -116,18 +116,66 @@ class test_mail(TestMailBase):
# CASE1: test subscriptions with subtypes
# ----------------------------------------
- # Do: Subscribe Raoul three times (niak niak) through message_subscribe_users
+ # Do: subscribe Raoul, should have default subtypes
+ group_pigs.message_subscribe_users([user_raoul.id])
+ group_pigs.refresh()
+ # Test: 2 followers (Admin and Raoul)
+ follower_ids = [follower.id for follower in group_pigs.message_follower_ids]
+ self.assertEqual(set(follower_ids), set([user_raoul.partner_id.id, user_admin.partner_id.id]),
+ 'message_subscribe: Admin and Raoul should be the only 2 Pigs fans')
+ # Raoul follows default subtypes
+ fol_ids = self.mail_followers.search(cr, uid, [
+ ('res_model', '=', 'mail.group'),
+ ('res_id', '=', self.group_pigs_id),
+ ('partner_id', '=', user_raoul.partner_id.id)
+ ])
+ fol_obj = self.mail_followers.browse(cr, uid, fol_ids)[0]
+ fol_subtype_ids = set([subtype.id for subtype in fol_obj.subtype_ids])
+ self.assertEqual(set(fol_subtype_ids), set(default_group_subtypes),
+ 'message_subscribe: Raoul subscription subtypes are incorrect, should be all default ones')
+
+ # Do: subscribe Raoul with specified new subtypes
+ group_pigs.message_subscribe_users([user_raoul.id], subtype_ids=[mt_mg_nodef])
+ # Test: 2 followers (Admin and Raoul)
+ follower_ids = [follower.id for follower in group_pigs.message_follower_ids]
+ self.assertEqual(set(follower_ids), set([user_raoul.partner_id.id, user_admin.partner_id.id]),
+ 'message_subscribe: Admin and Raoul should be the only 2 Pigs fans')
+ # Test: 2 lines in mail.followers (no duplicate for Raoul)
+ fol_ids = self.mail_followers.search(cr, uid, [
+ ('res_model', '=', 'mail.group'),
+ ('res_id', '=', self.group_pigs_id),
+ ])
+ self.assertEqual(len(fol_ids), 2,
+ 'message_subscribe: subscribing an already-existing follower should not create new entries in mail.followers')
+ # Test: Raoul follows only specified subtypes
+ fol_ids = self.mail_followers.search(cr, uid, [
+ ('res_model', '=', 'mail.group'),
+ ('res_id', '=', self.group_pigs_id),
+ ('partner_id', '=', user_raoul.partner_id.id)
+ ])
+ fol_obj = self.mail_followers.browse(cr, uid, fol_ids)[0]
+ fol_subtype_ids = set([subtype.id for subtype in fol_obj.subtype_ids])
+ self.assertEqual(set(fol_subtype_ids), set([mt_mg_nodef]),
+ 'message_subscribe: Raoul subscription subtypes are incorrect, should be only specified')
+
+ # Do: Subscribe Raoul without specified subtypes: should not erase existing subscription subtypes
group_pigs.message_subscribe_users([user_raoul.id, user_raoul.id])
group_pigs.message_subscribe_users([user_raoul.id])
group_pigs.refresh()
# Test: 2 followers (Admin and Raoul)
follower_ids = [follower.id for follower in group_pigs.message_follower_ids]
- self.assertEqual(set(follower_ids), set([user_raoul.partner_id.id, user_admin.partner_id.id]), 'Admin and Raoul should be the only 2 Pigs fans')
+ self.assertEqual(set(follower_ids), set([user_raoul.partner_id.id, user_admin.partner_id.id]),
+ 'message_subscribe: Admin and Raoul should be the only 2 Pigs fans')
# Test: Raoul follows default subtypes
- fol_ids = self.mail_followers.search(cr, uid, [('res_model', '=', 'mail.group'), ('res_id', '=', self.group_pigs_id), ('partner_id', '=', user_raoul.partner_id.id)])
+ fol_ids = self.mail_followers.search(cr, uid, [
+ ('res_model', '=', 'mail.group'),
+ ('res_id', '=', self.group_pigs_id),
+ ('partner_id', '=', user_raoul.partner_id.id)
+ ])
fol_obj = self.mail_followers.browse(cr, uid, fol_ids)[0]
fol_subtype_ids = set([subtype.id for subtype in fol_obj.subtype_ids])
- self.assertEqual(set(fol_subtype_ids), set(default_group_subtypes), 'subscription subtypes are incorrect')
+ self.assertEqual(set(fol_subtype_ids), set([mt_mg_nodef]),
+ 'message_subscribe: Raoul subscription subtypes are incorrect, should be only specified')
# Do: Unsubscribe Raoul twice through message_unsubscribe_users
group_pigs.message_unsubscribe_users([user_raoul.id, user_raoul.id])
@@ -135,6 +183,13 @@ class test_mail(TestMailBase):
# Test: 1 follower (Admin)
follower_ids = [follower.id for follower in group_pigs.message_follower_ids]
self.assertEqual(follower_ids, [user_admin.partner_id.id], 'Admin must be the only Pigs fan')
+ # Test: 1 lines in mail.followers (no duplicate for Raoul)
+ fol_ids = self.mail_followers.search(cr, uid, [
+ ('res_model', '=', 'mail.group'),
+ ('res_id', '=', self.group_pigs_id)
+ ])
+ self.assertEqual(len(fol_ids), 1,
+ 'message_subscribe: group should have only 1 entry in mail.follower for 1 follower')
# Do: subscribe Admin with subtype_ids
group_pigs.message_subscribe_users([uid], [mt_mg_nodef, mt_all_nodef])
From 67b94fa511311cdd28549de4a89e6659d1934b38 Mon Sep 17 00:00:00 2001
From: Martin Trigaux
Date: Wed, 8 May 2013 12:50:44 +0200
Subject: [PATCH 071/210] [FIX] opw584557: account: better default fiscalyear
dates for fiscalyears not 1/1-12/31
bzr revid: mat@openerp.com-20130508105044-fr3tf2t1zwmd6hko
---
addons/account/res_config.py | 51 ++++++++++++++++++++++++++++++++++--
1 file changed, 49 insertions(+), 2 deletions(-)
diff --git a/addons/account/res_config.py b/addons/account/res_config.py
index 53c604161ea..bae18ec9476 100644
--- a/addons/account/res_config.py
+++ b/addons/account/res_config.py
@@ -132,11 +132,58 @@ class account_config_settings(osv.osv_memory):
count = self.pool.get('res.company').search_count(cr, uid, [], context=context)
return bool(count == 1)
+ def _default_start_date(self, cr, uid, context=None):
+ """Compute default starting date for fiscalyear
+ - if no fiscal year, use 1st jan of this year
+ - if in a fiscal year, use its starting date
+ - if past fiscal year, use the ending date of the latest +1 day
+ """
+ company_id = self._default_company(cr, uid, context=context)
+ fiscalyear_ids = self.pool.get('account.fiscalyear').search(cr, uid,
+ [('date_start', '<=', time.strftime('%Y-%m-%d')), ('date_stop', '>=', time.strftime('%Y-%m-%d')),
+ ('company_id', '=', company_id)])
+ if fiscalyear_ids:
+ # has a current fiscal year, use this one
+ return self.pool.get('account.fiscalyear').browse(cr, uid, fiscalyear_ids[0], context=context).date_start
+ else:
+ past_fiscalyear_ids = self.pool.get('account.fiscalyear').search(cr, uid,
+ [('date_stop', '<=', time.strftime('%Y-%m-%d')), ('company_id', '=', company_id)])
+ if past_fiscalyear_ids:
+ # use the latest fiscal year+1 day, sorted by start_date
+ latest_stop = self.pool.get('account.fiscalyear').browse(cr, uid, past_fiscalyear_ids[-1], context=context).date_stop
+ return (datetime.datetime.strptime(latest_stop, "%Y-%m-%d") + datetime.timedelta(days=1)).strftime('%Y-%m-%d')
+ else:
+ return time.strftime('%Y-01-01')
+
+ def _default_stop_date(self, cr, uid, context=None):
+ """Compute default ending date for fiscalyear
+ - if no fiscal year, use 31th dec of this year
+ - if in a fiscal year, use its ending date
+ - if past fiscal year, use 31th dec of year of the latest fiscalyear +1 day
+ """
+ company_id = self._default_company(cr, uid, context=context)
+ fiscalyear_ids = self.pool.get('account.fiscalyear').search(cr, uid,
+ [('date_start', '<=', time.strftime('%Y-%m-%d')), ('date_stop', '>=', time.strftime('%Y-%m-%d')),
+ ('company_id', '=', company_id)])
+ if fiscalyear_ids:
+ # has a current fiscal year, use this one
+ return self.pool.get('account.fiscalyear').browse(cr, uid, fiscalyear_ids[0], context=context).date_stop
+ else:
+ past_fiscalyear_ids = self.pool.get('account.fiscalyear').search(cr, uid,
+ [('date_stop', '<=', time.strftime('%Y-%m-%d')), ('company_id', '=', company_id)])
+ if past_fiscalyear_ids:
+ # use the latest fiscal year+1 day, sorted by start_date
+ latest_stop = self.pool.get('account.fiscalyear').browse(cr, uid, past_fiscalyear_ids[-1], context=context).date_stop
+ return latest_stop.replace(year= latest_stop.year+1).strftime('%Y-%m-%d')
+ else:
+ return time.strftime('%Y-12-31')
+
+
_defaults = {
'company_id': _default_company,
'has_default_company': _default_has_default_company,
- 'date_start': lambda *a: time.strftime('%Y-01-01'),
- 'date_stop': lambda *a: time.strftime('%Y-12-31'),
+ 'date_start': _default_start_date,
+ 'date_stop': _default_stop_date,
'period': 'month',
}
From 2a2a539be6988e8b237e72b55f54d70b0d584a51 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?=
Date: Wed, 8 May 2013 13:39:52 +0200
Subject: [PATCH 072/210] [FIX] chatter: yet another protection against
reloading a non-existing menu
bzr revid: tde@openerp.com-20130508113952-29a1xk9holyvhc13
---
addons/mail/static/src/js/mail.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js
index 527a57fa481..f3e762d1f31 100644
--- a/addons/mail/static/src/js/mail.js
+++ b/addons/mail/static/src/js/mail.js
@@ -1710,7 +1710,7 @@ openerp.mail = function (session) {
*/
do_reload_menu_emails: function () {
var menu = session.webclient.menu;
- if (!menu) {
+ if (!menu || !menu.current_menu) {
return $.when();
}
return menu.rpc("/web/menu/load_needaction", {'menu_ids': [menu.current_menu]}).done(function(r) {
From bf8fc82ecb4a663f51f60077e6109c046247361d Mon Sep 17 00:00:00 2001
From: Martin Trigaux
Date: Wed, 8 May 2013 13:57:08 +0200
Subject: [PATCH 073/210] [FIX] use correctly datetime objects
bzr revid: mat@openerp.com-20130508115708-ut4jlp572dhxntsd
---
addons/account/res_config.py | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/addons/account/res_config.py b/addons/account/res_config.py
index bae18ec9476..ed0355f77e7 100644
--- a/addons/account/res_config.py
+++ b/addons/account/res_config.py
@@ -173,8 +173,9 @@ class account_config_settings(osv.osv_memory):
[('date_stop', '<=', time.strftime('%Y-%m-%d')), ('company_id', '=', company_id)])
if past_fiscalyear_ids:
# use the latest fiscal year+1 day, sorted by start_date
- latest_stop = self.pool.get('account.fiscalyear').browse(cr, uid, past_fiscalyear_ids[-1], context=context).date_stop
- return latest_stop.replace(year= latest_stop.year+1).strftime('%Y-%m-%d')
+ latest_year = self.pool.get('account.fiscalyear').browse(cr, uid, past_fiscalyear_ids[-1], context=context)
+ latest_stop = datetime.datetime.strptime(latest_year.date_stop, "%Y-%m-%d")
+ return latest_stop.replace(year=latest_stop.year+1).strftime('%Y-%m-%d')
else:
return time.strftime('%Y-12-31')
From dff5615b9ee7882e05121858d405a96f117cf664 Mon Sep 17 00:00:00 2001
From: Martin Trigaux
Date: Wed, 8 May 2013 14:06:26 +0200
Subject: [PATCH 074/210] [IMP] better comment
bzr revid: mat@openerp.com-20130508120626-tz68kaunfdv45paj
---
addons/account/res_config.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/addons/account/res_config.py b/addons/account/res_config.py
index ed0355f77e7..7d164f73f94 100644
--- a/addons/account/res_config.py
+++ b/addons/account/res_config.py
@@ -159,7 +159,7 @@ class account_config_settings(osv.osv_memory):
"""Compute default ending date for fiscalyear
- if no fiscal year, use 31th dec of this year
- if in a fiscal year, use its ending date
- - if past fiscal year, use 31th dec of year of the latest fiscalyear +1 day
+ - if past fiscal year, use the ending date of latest fiscalyear +1 year
"""
company_id = self._default_company(cr, uid, context=context)
fiscalyear_ids = self.pool.get('account.fiscalyear').search(cr, uid,
From f2c5aee290db938fa084513a1bdfb5bee3cee783 Mon Sep 17 00:00:00 2001
From: Martin Trigaux
Date: Wed, 8 May 2013 14:34:40 +0200
Subject: [PATCH 075/210] [IMP] account: use DEFAULT_SERVER_DATETIME_FORMAT
bzr revid: mat@openerp.com-20130508123440-kmtbv1vq4x03gr8k
---
addons/account/res_config.py | 15 ++++++++-------
1 file changed, 8 insertions(+), 7 deletions(-)
diff --git a/addons/account/res_config.py b/addons/account/res_config.py
index 7d164f73f94..adce6814b25 100644
--- a/addons/account/res_config.py
+++ b/addons/account/res_config.py
@@ -25,6 +25,7 @@ from dateutil.relativedelta import relativedelta
from operator import itemgetter
from os.path import join as opj
+from openerp.tools import DEFAULT_SERVER_DATE_FORMAT, DEFAULT_SERVER_DATETIME_FORMAT as DF
from openerp.tools.translate import _
from openerp.osv import fields, osv
from openerp import tools
@@ -140,18 +141,18 @@ class account_config_settings(osv.osv_memory):
"""
company_id = self._default_company(cr, uid, context=context)
fiscalyear_ids = self.pool.get('account.fiscalyear').search(cr, uid,
- [('date_start', '<=', time.strftime('%Y-%m-%d')), ('date_stop', '>=', time.strftime('%Y-%m-%d')),
+ [('date_start', '<=', time.strftime(DF)), ('date_stop', '>=', time.strftime(DF)),
('company_id', '=', company_id)])
if fiscalyear_ids:
# has a current fiscal year, use this one
return self.pool.get('account.fiscalyear').browse(cr, uid, fiscalyear_ids[0], context=context).date_start
else:
past_fiscalyear_ids = self.pool.get('account.fiscalyear').search(cr, uid,
- [('date_stop', '<=', time.strftime('%Y-%m-%d')), ('company_id', '=', company_id)])
+ [('date_stop', '<=', time.strftime(DF)), ('company_id', '=', company_id)])
if past_fiscalyear_ids:
# use the latest fiscal year+1 day, sorted by start_date
latest_stop = self.pool.get('account.fiscalyear').browse(cr, uid, past_fiscalyear_ids[-1], context=context).date_stop
- return (datetime.datetime.strptime(latest_stop, "%Y-%m-%d") + datetime.timedelta(days=1)).strftime('%Y-%m-%d')
+ return (datetime.datetime.strptime(latest_stop, DF) + datetime.timedelta(days=1)).strftime(DF)
else:
return time.strftime('%Y-01-01')
@@ -163,19 +164,19 @@ class account_config_settings(osv.osv_memory):
"""
company_id = self._default_company(cr, uid, context=context)
fiscalyear_ids = self.pool.get('account.fiscalyear').search(cr, uid,
- [('date_start', '<=', time.strftime('%Y-%m-%d')), ('date_stop', '>=', time.strftime('%Y-%m-%d')),
+ [('date_start', '<=', time.strftime(DF)), ('date_stop', '>=', time.strftime(DF)),
('company_id', '=', company_id)])
if fiscalyear_ids:
# has a current fiscal year, use this one
return self.pool.get('account.fiscalyear').browse(cr, uid, fiscalyear_ids[0], context=context).date_stop
else:
past_fiscalyear_ids = self.pool.get('account.fiscalyear').search(cr, uid,
- [('date_stop', '<=', time.strftime('%Y-%m-%d')), ('company_id', '=', company_id)])
+ [('date_stop', '<=', time.strftime(DF)), ('company_id', '=', company_id)])
if past_fiscalyear_ids:
# use the latest fiscal year+1 day, sorted by start_date
latest_year = self.pool.get('account.fiscalyear').browse(cr, uid, past_fiscalyear_ids[-1], context=context)
- latest_stop = datetime.datetime.strptime(latest_year.date_stop, "%Y-%m-%d")
- return latest_stop.replace(year=latest_stop.year+1).strftime('%Y-%m-%d')
+ latest_stop = datetime.datetime.strptime(latest_year.date_stop, DF)
+ return latest_stop.replace(year=latest_stop.year+1).strftime(DF)
else:
return time.strftime('%Y-12-31')
From e15811a6a1a698adc21465e4a7d69389661cff5a Mon Sep 17 00:00:00 2001
From: Martin Trigaux
Date: Wed, 8 May 2013 14:55:20 +0200
Subject: [PATCH 076/210] [IMP] account: use DEFAULT_SERVER_DATETIME_FORMAT and
merging in one method
bzr revid: mat@openerp.com-20130508125520-kf0pbgfislf34vay
---
addons/account/res_config.py | 41 +++++++++---------------------------
1 file changed, 10 insertions(+), 31 deletions(-)
diff --git a/addons/account/res_config.py b/addons/account/res_config.py
index adce6814b25..ef16638905f 100644
--- a/addons/account/res_config.py
+++ b/addons/account/res_config.py
@@ -133,42 +133,20 @@ class account_config_settings(osv.osv_memory):
count = self.pool.get('res.company').search_count(cr, uid, [], context=context)
return bool(count == 1)
- def _default_start_date(self, cr, uid, context=None):
- """Compute default starting date for fiscalyear
+ def _get_default_fiscalyear_dates(self, cr, uid, company_id, context=None):
+ """Compute default starting and ending date for fiscalyear
- if no fiscal year, use 1st jan of this year
- if in a fiscal year, use its starting date
- if past fiscal year, use the ending date of the latest +1 day
+ :return: (date_start, date_stop) at format DEFAULT_SERVER_DATETIME_FORMAT
"""
- company_id = self._default_company(cr, uid, context=context)
fiscalyear_ids = self.pool.get('account.fiscalyear').search(cr, uid,
[('date_start', '<=', time.strftime(DF)), ('date_stop', '>=', time.strftime(DF)),
('company_id', '=', company_id)])
if fiscalyear_ids:
# has a current fiscal year, use this one
- return self.pool.get('account.fiscalyear').browse(cr, uid, fiscalyear_ids[0], context=context).date_start
- else:
- past_fiscalyear_ids = self.pool.get('account.fiscalyear').search(cr, uid,
- [('date_stop', '<=', time.strftime(DF)), ('company_id', '=', company_id)])
- if past_fiscalyear_ids:
- # use the latest fiscal year+1 day, sorted by start_date
- latest_stop = self.pool.get('account.fiscalyear').browse(cr, uid, past_fiscalyear_ids[-1], context=context).date_stop
- return (datetime.datetime.strptime(latest_stop, DF) + datetime.timedelta(days=1)).strftime(DF)
- else:
- return time.strftime('%Y-01-01')
-
- def _default_stop_date(self, cr, uid, context=None):
- """Compute default ending date for fiscalyear
- - if no fiscal year, use 31th dec of this year
- - if in a fiscal year, use its ending date
- - if past fiscal year, use the ending date of latest fiscalyear +1 year
- """
- company_id = self._default_company(cr, uid, context=context)
- fiscalyear_ids = self.pool.get('account.fiscalyear').search(cr, uid,
- [('date_start', '<=', time.strftime(DF)), ('date_stop', '>=', time.strftime(DF)),
- ('company_id', '=', company_id)])
- if fiscalyear_ids:
- # has a current fiscal year, use this one
- return self.pool.get('account.fiscalyear').browse(cr, uid, fiscalyear_ids[0], context=context).date_stop
+ fiscalyear = self.pool.get('account.fiscalyear').browse(cr, uid, fiscalyear_ids[0], context=context)
+ return (fiscalyear.date_start, fiscalyear.date_stop)
else:
past_fiscalyear_ids = self.pool.get('account.fiscalyear').search(cr, uid,
[('date_stop', '<=', time.strftime(DF)), ('company_id', '=', company_id)])
@@ -176,16 +154,14 @@ class account_config_settings(osv.osv_memory):
# use the latest fiscal year+1 day, sorted by start_date
latest_year = self.pool.get('account.fiscalyear').browse(cr, uid, past_fiscalyear_ids[-1], context=context)
latest_stop = datetime.datetime.strptime(latest_year.date_stop, DF)
- return latest_stop.replace(year=latest_stop.year+1).strftime(DF)
+ return ((latest_stop+datetime.timedelta(days=1)).strftime(DF), latest_stop.replace(year=latest_stop.year+1).strftime(DF))
else:
- return time.strftime('%Y-12-31')
+ return (time.strftime('%Y-01-01'), time.strftime('%Y-12-31'))
_defaults = {
'company_id': _default_company,
'has_default_company': _default_has_default_company,
- 'date_start': _default_start_date,
- 'date_stop': _default_stop_date,
'period': 'month',
}
@@ -210,6 +186,7 @@ class account_config_settings(osv.osv_memory):
fiscalyear_count = self.pool.get('account.fiscalyear').search_count(cr, uid,
[('date_start', '<=', time.strftime('%Y-%m-%d')), ('date_stop', '>=', time.strftime('%Y-%m-%d')),
('company_id', '=', company_id)])
+ date_start, date_stop = self._get_default_fiscalyear_dates(cr, uid, company_id, context=context)
values = {
'expects_chart_of_accounts': company.expects_chart_of_accounts,
'currency_id': company.currency_id.id,
@@ -219,6 +196,8 @@ class account_config_settings(osv.osv_memory):
'has_fiscal_year': bool(fiscalyear_count),
'chart_template_id': False,
'tax_calculation_rounding_method': company.tax_calculation_rounding_method,
+ 'date_start': date_start,
+ 'date_stop': date_stop,
}
# update journals and sequences
for journal_type in ('sale', 'sale_refund', 'purchase', 'purchase_refund'):
From b9ee794a2bbe1d851764948a40f81128473fd946 Mon Sep 17 00:00:00 2001
From: Martin Trigaux
Date: Wed, 8 May 2013 15:14:38 +0200
Subject: [PATCH 077/210] [IMP] account: compute default period for fiscal year
bzr revid: mat@openerp.com-20130508131438-nyzi49wbn61giecf
---
addons/account/res_config.py | 34 +++++++++++++++++++++-------------
1 file changed, 21 insertions(+), 13 deletions(-)
diff --git a/addons/account/res_config.py b/addons/account/res_config.py
index ef16638905f..f1f1aee7d41 100644
--- a/addons/account/res_config.py
+++ b/addons/account/res_config.py
@@ -133,36 +133,43 @@ class account_config_settings(osv.osv_memory):
count = self.pool.get('res.company').search_count(cr, uid, [], context=context)
return bool(count == 1)
- def _get_default_fiscalyear_dates(self, cr, uid, company_id, context=None):
- """Compute default starting and ending date for fiscalyear
- - if no fiscal year, use 1st jan of this year
- - if in a fiscal year, use its starting date
- - if past fiscal year, use the ending date of the latest +1 day
- :return: (date_start, date_stop) at format DEFAULT_SERVER_DATETIME_FORMAT
+ def _get_default_fiscalyear_data(self, cr, uid, company_id, context=None):
+ """Compute default period, starting and ending date for fiscalyear
+ - if in a fiscal year, use its period, starting and ending date
+ - if past fiscal year, use its period, and new dates [ending date of the latest +1 day ; ending date of the latest +1 year]
+ - if no fiscal year, use monthly, 1st jan, 31th dec of this year
+ :return: (date_start, date_stop, period) at format DEFAULT_SERVER_DATETIME_FORMAT
"""
fiscalyear_ids = self.pool.get('account.fiscalyear').search(cr, uid,
[('date_start', '<=', time.strftime(DF)), ('date_stop', '>=', time.strftime(DF)),
('company_id', '=', company_id)])
if fiscalyear_ids:
- # has a current fiscal year, use this one
+ # is in a current fiscal year, use this one
fiscalyear = self.pool.get('account.fiscalyear').browse(cr, uid, fiscalyear_ids[0], context=context)
- return (fiscalyear.date_start, fiscalyear.date_stop)
+ if len(fiscalyear.period_ids) == 5: # 4 periods of 3 months + opening period
+ period = '3months'
+ else:
+ period = 'month'
+ return (fiscalyear.date_start, fiscalyear.date_stop, period)
else:
past_fiscalyear_ids = self.pool.get('account.fiscalyear').search(cr, uid,
[('date_stop', '<=', time.strftime(DF)), ('company_id', '=', company_id)])
if past_fiscalyear_ids:
- # use the latest fiscal year+1 day, sorted by start_date
+ # use the latest fiscal, sorted by (start_date, id)
latest_year = self.pool.get('account.fiscalyear').browse(cr, uid, past_fiscalyear_ids[-1], context=context)
latest_stop = datetime.datetime.strptime(latest_year.date_stop, DF)
- return ((latest_stop+datetime.timedelta(days=1)).strftime(DF), latest_stop.replace(year=latest_stop.year+1).strftime(DF))
+ if len(latest_year.period_ids) == 5:
+ period = '3months'
+ else:
+ period = 'month'
+ return ((latest_stop+datetime.timedelta(days=1)).strftime(DF), latest_stop.replace(year=latest_stop.year+1).strftime(DF), period)
else:
- return (time.strftime('%Y-01-01'), time.strftime('%Y-12-31'))
+ return (time.strftime('%Y-01-01'), time.strftime('%Y-12-31'), 'month')
_defaults = {
'company_id': _default_company,
'has_default_company': _default_has_default_company,
- 'period': 'month',
}
def create(self, cr, uid, values, context=None):
@@ -186,7 +193,7 @@ class account_config_settings(osv.osv_memory):
fiscalyear_count = self.pool.get('account.fiscalyear').search_count(cr, uid,
[('date_start', '<=', time.strftime('%Y-%m-%d')), ('date_stop', '>=', time.strftime('%Y-%m-%d')),
('company_id', '=', company_id)])
- date_start, date_stop = self._get_default_fiscalyear_dates(cr, uid, company_id, context=context)
+ date_start, date_stop, period = self._get_default_fiscalyear_data(cr, uid, company_id, context=context)
values = {
'expects_chart_of_accounts': company.expects_chart_of_accounts,
'currency_id': company.currency_id.id,
@@ -198,6 +205,7 @@ class account_config_settings(osv.osv_memory):
'tax_calculation_rounding_method': company.tax_calculation_rounding_method,
'date_start': date_start,
'date_stop': date_stop,
+ 'period': period,
}
# update journals and sequences
for journal_type in ('sale', 'sale_refund', 'purchase', 'purchase_refund'):
From a7ee9acdaf057e06eafa7abbe1ab55e617884d52 Mon Sep 17 00:00:00 2001
From: Martin Trigaux
Date: Wed, 8 May 2013 16:21:04 +0200
Subject: [PATCH 078/210] [IMP] resource: use float_compare instead
bzr revid: mat@openerp.com-20130508142104-clgs1khxgktxlxsm
---
addons/resource/resource.py | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
diff --git a/addons/resource/resource.py b/addons/resource/resource.py
index a37d8ca89fe..276bcdc434c 100644
--- a/addons/resource/resource.py
+++ b/addons/resource/resource.py
@@ -25,6 +25,7 @@ from dateutil import rrule
import math
from faces import *
from openerp.osv import fields, osv
+from openerp.tools.float_utils import float_compare
from openerp.tools.translate import _
from itertools import groupby
@@ -108,7 +109,7 @@ class resource_calendar(osv.osv):
result = []
maxrecur = 100
current_hour = dt_from.hour
- while (todo>0) and maxrecur:
+ while float_compare(todo,0) and maxrecur:
cr.execute("select hour_from,hour_to from resource_calendar_attendance where dayofweek='%s' and calendar_id=%s order by hour_from desc", (dt_from.weekday(),id))
for (hour_from,hour_to) in cr.fetchall():
leave_flag = False
@@ -128,8 +129,7 @@ class resource_calendar(osv.osv):
d2 = datetime(dt_from.year, dt_from.month, dt_from.day, int(math.floor(m)), int((m%1) * 60))
result.append((d1, d2))
current_hour = hour_from
- # avoid float point error with round
- todo = round(todo - (hour_to - m), 4)
+ todo -= hour_to - m
dt_from -= timedelta(days=1)
current_hour = 24
maxrecur -= 1
@@ -162,7 +162,7 @@ class resource_calendar(osv.osv):
result = []
maxrecur = 100
current_hour = dt_from.hour
- while (todo>0) and maxrecur:
+ while float_compare(todo,0) and maxrecur:
for (hour_from,hour_to) in [(item['hour_from'], item['hour_to']) for item in hours_by_cal[id] if item['dayofweek'] == str(dt_from.weekday())]:
leave_flag = False
if (hour_to>current_hour) and (todo>0):
@@ -181,8 +181,7 @@ class resource_calendar(osv.osv):
d2 = datetime(dt_from.year, dt_from.month, dt_from.day, int(math.floor(hour_to)), int((hour_to%1) * 60))
result.append((d1, d2))
current_hour = hour_to
- # avoid float point error with round
- todo = round(todo - (hour_to - m), 4)
+ todo -= hour_to - m
dt_from += timedelta(days=1)
current_hour = 0
maxrecur -= 1
From 0934155fa6303cd6d0fa53126f6ce679c39cc369 Mon Sep 17 00:00:00 2001
From: Launchpad Translations on behalf of openerp <>
Date: Fri, 10 May 2013 06:51:22 +0000
Subject: [PATCH 079/210] Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20130509061134-n0s13s5mudwpofan
bzr revid: launchpad_translations_on_behalf_of_openerp-20130510065122-6968relnf5rj67w4
---
addons/account_cancel/i18n/fr.po | 10 ++--
addons/account_payment/i18n/fr.po | 10 ++--
addons/event_moodle/i18n/fr.po | 10 ++--
addons/mail/i18n/fr.po | 6 +-
addons/mail/i18n/lt.po | 11 ++--
addons/membership/i18n/tr.po | 56 +++++++++----------
addons/point_of_sale/i18n/tr.po | 2 +-
addons/product/i18n/fr.po | 8 +--
addons/product/i18n/lt.po | 10 ++--
addons/project/i18n/fr.po | 31 ++++++++---
addons/project/i18n/lt.po | 56 ++++++++++---------
addons/project_gtd/i18n/lt.po | 86 ++++++++++++++---------------
addons/project_long_term/i18n/fr.po | 21 +++----
addons/project_long_term/i18n/tr.po | 10 ++--
addons/project_timesheet/i18n/tr.po | 56 ++++++++++++++-----
addons/stock/i18n/ar.po | 22 ++++----
addons/stock/i18n/tr.po | 8 +--
17 files changed, 231 insertions(+), 182 deletions(-)
diff --git a/addons/account_cancel/i18n/fr.po b/addons/account_cancel/i18n/fr.po
index 3bac853120e..869fb8741eb 100644
--- a/addons/account_cancel/i18n/fr.po
+++ b/addons/account_cancel/i18n/fr.po
@@ -8,19 +8,19 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2013-03-07 08:37+0000\n"
-"PO-Revision-Date: 2012-12-21 23:00+0000\n"
-"Last-Translator: FULL NAME \n"
+"PO-Revision-Date: 2013-05-09 10:15+0000\n"
+"Last-Translator: Florian Hatat \n"
"Language-Team: French \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-03-28 05:29+0000\n"
-"X-Generator: Launchpad (build 16546)\n"
+"X-Launchpad-Export-Date: 2013-05-10 06:50+0000\n"
+"X-Generator: Launchpad (build 16598)\n"
#. module: account_cancel
#: view:account.invoice:0
msgid "Cancel Invoice"
-msgstr ""
+msgstr "Annuler la facture"
#~ msgid "Cancel"
#~ msgstr "Annuler"
diff --git a/addons/account_payment/i18n/fr.po b/addons/account_payment/i18n/fr.po
index 12b88c558aa..f401f5151b2 100644
--- a/addons/account_payment/i18n/fr.po
+++ b/addons/account_payment/i18n/fr.po
@@ -8,14 +8,14 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2013-03-07 08:37+0000\n"
-"PO-Revision-Date: 2012-12-21 23:00+0000\n"
-"Last-Translator: FULL NAME \n"
+"PO-Revision-Date: 2013-05-09 10:15+0000\n"
+"Last-Translator: Florian Hatat \n"
"Language-Team: French \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-03-28 05:30+0000\n"
-"X-Generator: Launchpad (build 16546)\n"
+"X-Launchpad-Export-Date: 2013-05-10 06:50+0000\n"
+"X-Generator: Launchpad (build 16598)\n"
#. module: account_payment
#: model:ir.actions.act_window,help:account_payment.action_payment_order_tree
@@ -683,7 +683,7 @@ msgstr "Commande"
#. module: account_payment
#: view:payment.order:0
msgid "Cancel Payments"
-msgstr ""
+msgstr "Annuler les paiements"
#. module: account_payment
#: field:payment.order,total:0
diff --git a/addons/event_moodle/i18n/fr.po b/addons/event_moodle/i18n/fr.po
index 592b5a729a9..06a5d8cb5be 100644
--- a/addons/event_moodle/i18n/fr.po
+++ b/addons/event_moodle/i18n/fr.po
@@ -8,14 +8,14 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2013-03-07 08:38+0000\n"
-"PO-Revision-Date: 2013-01-03 15:01+0000\n"
-"Last-Translator: Numérigraphe \n"
+"PO-Revision-Date: 2013-05-09 10:20+0000\n"
+"Last-Translator: Florian Hatat \n"
"Language-Team: French \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-03-28 05:39+0000\n"
-"X-Generator: Launchpad (build 16546)\n"
+"X-Launchpad-Export-Date: 2013-05-10 06:51+0000\n"
+"X-Generator: Launchpad (build 16598)\n"
#. module: event_moodle
#: view:event.moodle.config.wiz:0
@@ -25,7 +25,7 @@ msgstr "Connexion avec identifiant et mot de passe"
#. module: event_moodle
#: model:ir.model,name:event_moodle.model_event_moodle_config_wiz
msgid "event.moodle.config.wiz"
-msgstr ""
+msgstr "event.moodle.config.wiz"
#. module: event_moodle
#: help:event.moodle.config.wiz,server_moodle:0
diff --git a/addons/mail/i18n/fr.po b/addons/mail/i18n/fr.po
index bb4717fb0ab..e6e08676927 100644
--- a/addons/mail/i18n/fr.po
+++ b/addons/mail/i18n/fr.po
@@ -8,13 +8,13 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2013-03-07 08:37+0000\n"
-"PO-Revision-Date: 2013-05-07 07:56+0000\n"
+"PO-Revision-Date: 2013-05-09 10:13+0000\n"
"Last-Translator: Gilles Major (OpenERP) \n"
"Language-Team: French \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-05-08 06:17+0000\n"
+"X-Launchpad-Export-Date: 2013-05-10 06:51+0000\n"
"X-Generator: Launchpad (build 16598)\n"
#. module: mail
@@ -1281,6 +1281,8 @@ msgstr "Résumé"
msgid ""
"Model the subtype applies to. If False, this subtype applies to all models."
msgstr ""
+"Modèle auquel le sous-type s'applique. Si False est spécifié, le sous-type "
+"s'applique à tous les modèles."
#. module: mail
#: view:mail.compose.message:0
diff --git a/addons/mail/i18n/lt.po b/addons/mail/i18n/lt.po
index 6cc1dfae980..935cb3437bb 100644
--- a/addons/mail/i18n/lt.po
+++ b/addons/mail/i18n/lt.po
@@ -8,13 +8,13 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2013-03-07 08:37+0000\n"
-"PO-Revision-Date: 2013-05-08 06:15+0000\n"
+"PO-Revision-Date: 2013-05-10 05:45+0000\n"
"Last-Translator: Andrius Preimantas \n"
"Language-Team: Lithuanian \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-05-08 06:17+0000\n"
+"X-Launchpad-Export-Date: 2013-05-10 06:51+0000\n"
"X-Generator: Launchpad (build 16598)\n"
#. module: mail
@@ -873,11 +873,10 @@ msgid ""
" "
msgstr ""
"
\n"
-" Šiame lange rodomos privačios žinutės, el. laiškai "
-"siųsti jums bei informacija susijusi su prenumeruojamais dokumentais ar "
-"žmonėmis.\n"
+" Šiame lange rodomos privačios žinutės, el. laiškai siųsti "
+"jums bei informacija susijusi su prenumeruojamais dokumentais ar žmonėmis.\n"
"
\n"
" "
diff --git a/addons/membership/i18n/tr.po b/addons/membership/i18n/tr.po
index 96f37127bd2..7fc8d51b24d 100644
--- a/addons/membership/i18n/tr.po
+++ b/addons/membership/i18n/tr.po
@@ -8,19 +8,19 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2013-03-07 08:38+0000\n"
-"PO-Revision-Date: 2012-12-21 23:00+0000\n"
-"Last-Translator: FULL NAME \n"
+"PO-Revision-Date: 2013-05-08 08:13+0000\n"
+"Last-Translator: Ediz Duman \n"
"Language-Team: Turkish
\n"
+" Cliquez pour démarrer un nouveau projet.\n"
+"
\n"
+" Les projets sont utilisés pour organiser vos activités, "
+"planifier des tâches, \n"
+" le suivi des problèmes, facturer le temps passé. Vous "
+"pouvez définir des\n"
+" projets internes (R&D, améliorer le processus de "
+"ventes),\n"
+" des projets privés (Mes tâches) ou ceux du client.\n"
+"
\n"
+" Vous serez en mesure de collaborer avec des utilisateurs "
+"internes sur\n"
+" des projets ou inviter les clients à partager vos "
+"activités.\n"
+"
\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-03-28 05:57+0000\n"
-"X-Generator: Launchpad (build 16546)\n"
+"X-Launchpad-Export-Date: 2013-05-09 06:11+0000\n"
+"X-Generator: Launchpad (build 16598)\n"
#. module: project_timesheet
#: view:report.timesheet.task.user:0
@@ -34,7 +34,7 @@ msgstr "Haziran"
#. module: project_timesheet
#: field:project.task.work,hr_analytic_timesheet_id:0
msgid "Related Timeline Id"
-msgstr ""
+msgstr "İlgili Zaman Çizelgesi Id"
#. module: project_timesheet
#: code:addons/project_timesheet/project_timesheet.py:266
@@ -43,6 +43,8 @@ msgid ""
"You cannot delete a partner which is assigned to project, but you can "
"uncheck the active box."
msgstr ""
+"Bu projeye atanmış bir parneri silemezsiniz, veya aktif kutuişaretini "
+"kaldırınız."
#. module: project_timesheet
#: model:ir.model,name:project_timesheet.model_project_task_work
@@ -54,7 +56,7 @@ msgstr "Proje Görevi Çalışma"
#, python-format
msgid ""
"You cannot select a Analytic Account which is in Close or Cancelled state."
-msgstr ""
+msgstr "Kapat veya İptal durumda bir Analitik Hesap seçemezsiniz."
#. module: project_timesheet
#: view:report.timesheet.task.user:0
@@ -89,6 +91,13 @@ msgid ""
" \n"
" "
msgstr ""
+"
\n"
+" Bir müşteri sözleşmesi eklemek için tıklayın.\n"
+"
\n"
+" Burada müşteri ile ilgili sözleşmeler ve \n"
+" proje faturalamada ilerlemeyi izlemeyi bulacaksınız.\n"
+"
\n"
+" "
#. module: project_timesheet
#: view:account.analytic.line:0
@@ -113,6 +122,8 @@ msgid ""
"employee.\n"
"Fill in the HR Settings tab of the employee form."
msgstr ""
+"ilgili üzerinde ürün ve ürün kategorisi özellik hesabı tanımlama personel.\n"
+"Personel formun İK Ayarlar sekmesinde doldurun."
#. module: project_timesheet
#: model:ir.model,name:project_timesheet.model_account_analytic_line
@@ -146,6 +157,8 @@ msgid ""
"Please define journal on the related employee.\n"
"Fill in the timesheet tab of the employee form."
msgstr ""
+"Ilgili personelin üzerinde yevmiye belirtiniz.\n"
+"Personel formun zanmançizelgesi sekmesinde doldurun."
#. module: project_timesheet
#: model:ir.ui.menu,name:project_timesheet.menu_hr_timesheet_sign_in
@@ -160,7 +173,7 @@ msgstr "Fauralanabilir Proje"
#. module: project_timesheet
#: model:ir.ui.menu,name:project_timesheet.menu_invoicing_contracts
msgid "Contracts to Renew"
-msgstr "Yenileneek Sözleşmeler"
+msgstr "Yenilencek Sözleşmeler"
#. module: project_timesheet
#: view:project.project:0
@@ -170,7 +183,7 @@ msgstr "Saatler"
#. module: project_timesheet
#: view:report.timesheet.task.user:0
msgid "Group by month of date"
-msgstr "Ayın Günlerini gurupla"
+msgstr "Ayın Günlerine gurupla"
#. module: project_timesheet
#: model:ir.model,name:project_timesheet.model_project_task
@@ -197,7 +210,7 @@ msgstr "Temmuz"
#. module: project_timesheet
#: model:process.node,note:project_timesheet.process_node_timesheettask0
msgid "Complete Your Timesheet."
-msgstr "Sizin ZamanÇizelgenizi Tamamlayın."
+msgstr "ZamanÇizelgenizi Tamamlayın."
#. module: project_timesheet
#: field:report.timesheet.task.user,task_hrs:0
@@ -220,6 +233,13 @@ msgid ""
" \n"
" "
msgstr ""
+"
\n"
+" Burada zaman çizelgeleri ve için yaptığınız alımları "
+"bulacaksınız müşteriye yeniden fatura edilebilir sözleşmeler.\n"
+" Eğer faturaya yeni iş kaydetmek istiyorsanız, zamançizelgesi "
+"menüsü yerine kullanmalısınız.\n"
+"
\n"
+" "
#. module: project_timesheet
#: model:process.node,name:project_timesheet.process_node_timesheettask0
@@ -234,7 +254,7 @@ msgstr "Görev kodlama"
#. module: project_timesheet
#: model:process.transition,note:project_timesheet.process_transition_filltimesheet0
msgid "Task summary is comes into the timesheet line"
-msgstr ""
+msgstr "Görev özeti zamançizelge satırlarına gelir"
#. module: project_timesheet
#: selection:report.timesheet.task.user,month:0
@@ -244,7 +264,7 @@ msgstr "Ocak"
#. module: project_timesheet
#: model:process.node,name:project_timesheet.process_node_triggerinvoice0
msgid "Trigger Invoice"
-msgstr ""
+msgstr "Fatura Tetikleme"
#. module: project_timesheet
#: selection:report.timesheet.task.user,month:0
@@ -269,18 +289,19 @@ msgstr "Nisan"
#. module: project_timesheet
#: model:ir.model,name:project_timesheet.model_report_timesheet_task_user
msgid "report.timesheet.task.user"
-msgstr ""
+msgstr "report.timesheet.task.user"
#. module: project_timesheet
#: model:process.transition,note:project_timesheet.process_transition_taskencoding0
msgid "Encode how much time u spent on your task"
-msgstr ""
+msgstr "Kodlama U görev harcanan ne kadar zaman"
#. module: project_timesheet
#: code:addons/project_timesheet/project_timesheet.py:85
#, python-format
msgid "Please define employee for user \"%s\". You must create one."
msgstr ""
+"Lütfen kullanıcı için personel tanımlama \"%s\". Oluşturmanız gerekir."
#. module: project_timesheet
#: model:ir.model,name:project_timesheet.model_res_partner
@@ -315,7 +336,7 @@ msgstr "Faturalama"
#. module: project_timesheet
#: model:process.node,note:project_timesheet.process_node_triggerinvoice0
msgid "Trigger invoices from sales order lines"
-msgstr ""
+msgstr "Faturayı satış sipariş satırlarında Tetikle"
#. module: project_timesheet
#: code:addons/project_timesheet/project_timesheet.py:100
@@ -325,6 +346,9 @@ msgid ""
"employee.\n"
"Fill in the timesheet tab of the employee form."
msgstr ""
+"Ilgili üzerinde ürün ve ürün kategorisi özellik hesabı tanımlamak Lütfen "
+"personel.\n"
+"Personel formun zamançizelgesi sekmesinde doldurun."
#. module: project_timesheet
#: code:addons/project_timesheet/project_timesheet.py:60
@@ -333,6 +357,8 @@ msgid ""
"
Timesheets on this project may be invoiced to %s, according to the terms "
"defined in the contract.
"
msgstr ""
+"
Bu proje üzerinde zamançizelgeleri fatura edilebilir %s, sözleşmede "
+"tanımlanan şartlarına göre.
\n"
+" A lunch order is defined by its user, date and order lines.\n"
+" Each order line corresponds to a product, an additional note "
+"and a price.\n"
+" Before selecting your order lines, don't forget to read the "
+"warnings displayed in the reddish area.\n"
+"
\n"
+" Here you can see your cash moves. A cash moves can be "
+"either an expense or a payment.\n"
+" An expense is automatically created when an order is "
+"received while a payment is a reimbursement to the company encoded by the "
+"manager.\n"
+"
\n"
+" Here you can see every orders grouped by suppliers and by "
+"date.\n"
+"
\n"
+"
\n"
+" - Click on the to announce "
+"that the order is ordered \n"
+" - Click on the to announce that "
+"the order is received \n"
+" - Click on the red X to announce "
+"that the order isn't available\n"
+"
\n"
+" Here you can see today's orders grouped by suppliers.\n"
+"
\n"
+"
\n"
+" - Click on the to announce "
+"that the order is ordered \n"
+" - Click on the to announce that "
+"the order is received \n"
+" - Click on the to announce that "
+"the order isn't available\n"
+"
\n"
+" Alerts are used to warn employee from possible issues "
+"concerning the lunch orders.\n"
+" To create a lunch alert you have to define its recurrency, "
+"the time interval during which the alert should be executed and the message "
+"to display.\n"
+"
\n"
+"
\n"
+" Example: \n"
+" - Recurency: Everyday \n"
+" - Time interval: from 00h00 am to 11h59 pm \n"
+" - Message: \"You must order before 10h30 am\"\n"
+"
\n"
+" Here you can see the employees' payment. A payment is a cash "
+"move from the employee to the company.\n"
+"
\n"
+" "
+msgstr ""
+
+#. module: lunch
+#: code:addons/lunch/lunch.py:186
+#, python-format
+msgid "Your favorite meals will be created based on your last orders."
+msgstr ""
+
+#. module: lunch
+#: model:ir.module.category,description:lunch.module_lunch_category
+msgid ""
+"Helps you handle your lunch needs, if you are a manager you will be able to "
+"create new products, cashmoves and to confirm or cancel orders."
+msgstr ""
+
+#. module: lunch
+#: model:ir.actions.act_window,help:lunch.action_lunch_control_accounts
+msgid ""
+"
\n"
+" Click to create a new payment. \n"
+"
\n"
+"
\n"
+" A cashmove can either be an expense or a payment. \n"
+" An expense is automatically created at the order "
+"receipt. \n"
+" A payment represents the employee reimbursement to the "
+"company.\n"
+"
\n"
+" "
+msgstr ""
+
+#. module: lunch
+#: field:lunch.alert,alter_type:0
+msgid "Recurrency"
+msgstr ""
+
+#. module: lunch
+#: code:addons/lunch/lunch.py:189
+#, python-format
+msgid "Don't forget the alerts displayed in the reddish area"
+msgstr ""
+
+#. module: lunch
+#: field:lunch.alert,thursday:0
+msgid "Thursday"
+msgstr ""
+
+#. module: lunch
+#: report:lunch.order.line:0
+msgid "Unit Price"
+msgstr ""
+
+#. module: lunch
+#: view:lunch.cashmove:0
+msgid "By User"
+msgstr ""
+
+#. module: lunch
+#: field:lunch.order.line,product_id:0
+#: field:lunch.product,name:0
+msgid "Product"
+msgstr ""
+
+#. module: lunch
+#: field:lunch.cashmove,description:0
+#: report:lunch.order.line:0
+#: field:lunch.product,description:0
+msgid "Description"
+msgstr ""
+
+#. module: lunch
+#: selection:report.lunch.order.line,month:0
+msgid "May"
+msgstr ""
+
+#. module: lunch
+#: field:lunch.order.line,price:0
+#: field:lunch.product,price:0
+msgid "Price"
+msgstr ""
+
+#. module: lunch
+#: field:lunch.cashmove,state:0
+msgid "Is an order or a Payment"
+msgstr ""
+
+#. module: lunch
+#: model:ir.actions.act_window,name:lunch.action_lunch_order_form
+#: model:ir.ui.menu,name:lunch.menu_lunch_order_form
+msgid "New Order"
+msgstr ""
+
+#. module: lunch
+#: view:lunch.cashmove:0
+msgid "cashmove tree"
+msgstr ""
+
+#. module: lunch
+#: view:lunch.cancel:0
+msgid "Cancel a meal means that we didn't receive it from the supplier."
+msgstr ""
+
+#. module: lunch
+#: view:lunch.cashmove:0
+msgid "My Account grouped"
+msgstr ""
+
+#. module: lunch
+#: model:ir.ui.menu,name:lunch.menu_lunch_cashmove
+msgid "Employee Payments"
+msgstr ""
+
+#. module: lunch
+#: view:lunch.cashmove:0
+#: selection:lunch.cashmove,state:0
+msgid "Payment"
+msgstr ""
+
+#. module: lunch
+#: selection:report.lunch.order.line,month:0
+msgid "February"
+msgstr ""
+
+#. module: lunch
+#: field:report.lunch.order.line,year:0
+msgid "Year"
+msgstr ""
+
+#. module: lunch
+#: view:lunch.order:0
+msgid "List"
+msgstr ""
+
+#. module: lunch
+#: model:ir.ui.menu,name:lunch.menu_lunch_admin
+msgid "Administrate Orders"
+msgstr ""
+
+#. module: lunch
+#: selection:report.lunch.order.line,month:0
+msgid "April"
+msgstr ""
+
+#. module: lunch
+#: view:lunch.order:0
+msgid "Select your order"
+msgstr ""
+
+#. module: lunch
+#: field:lunch.cashmove,order_id:0
+#: selection:lunch.cashmove,state:0
+#: report:lunch.order.line:0
+#: view:lunch.order.line:0
+#: field:lunch.order.line,order_id:0
+msgid "Order"
+msgstr ""
+
+#. module: lunch
+#: model:ir.actions.report.xml,name:lunch.report_lunch_order
+#: model:ir.model,name:lunch.model_lunch_order
+#: report:lunch.order.line:0
+msgid "Lunch Order"
+msgstr ""
+
+#. module: lunch
+#: view:lunch.order.order:0
+msgid "Are you sure you want to order these meals?"
+msgstr ""
+
+#. module: lunch
+#: view:lunch.cancel:0
+msgid "cancel order lines"
+msgstr ""
+
+#. module: lunch
+#: model:ir.model,name:lunch.model_lunch_product_category
+msgid "lunch product category"
+msgstr ""
+
+#. module: lunch
+#: field:lunch.alert,saturday:0
+msgid "Saturday"
+msgstr ""
+
+#. module: lunch
+#: model:res.groups,name:lunch.group_lunch_manager
+msgid "Manager"
+msgstr ""
+
+#. module: lunch
+#: view:lunch.validation:0
+msgid "Did your received these meals?"
+msgstr ""
+
+#. module: lunch
+#: view:lunch.validation:0
+msgid "Once a meal is received a new cash move is created for the employee."
+msgstr ""
+
+#. module: lunch
+#: view:lunch.product:0
+msgid "Products Tree"
+msgstr ""
+
+#. module: lunch
+#: view:lunch.cashmove:0
+#: view:lunch.order:0
+#: field:lunch.order,total:0
+#: view:lunch.order.line:0
+msgid "Total"
+msgstr ""
+
+#. module: lunch
+#: model:ir.ui.menu,name:lunch.menu_lunch_order_tree
+msgid "Previous Orders"
+msgstr ""
diff --git a/addons/mail/i18n/ko.po b/addons/mail/i18n/ko.po
new file mode 100644
index 00000000000..10ed3f37964
--- /dev/null
+++ b/addons/mail/i18n/ko.po
@@ -0,0 +1,1783 @@
+# Korean translation for openobject-addons
+# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR , 2013.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME \n"
+"POT-Creation-Date: 2013-03-07 08:37+0000\n"
+"PO-Revision-Date: 2013-05-12 07:39+0000\n"
+"Last-Translator: AhnJD \n"
+"Language-Team: Korean \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2013-05-13 06:46+0000\n"
+"X-Generator: Launchpad (build 16614)\n"
+
+#. module: mail
+#: view:mail.followers:0
+msgid "Followers Form"
+msgstr ""
+
+#. module: mail
+#: model:ir.model,name:mail.model_publisher_warranty_contract
+msgid "publisher_warranty.contract"
+msgstr ""
+
+#. module: mail
+#: field:mail.compose.message,author_id:0
+#: field:mail.message,author_id:0
+msgid "Author"
+msgstr "작성자"
+
+#. module: mail
+#: view:mail.mail:0
+msgid "Message Details"
+msgstr ""
+
+#. module: mail
+#: help:mail.mail,email_to:0
+msgid "Message recipients"
+msgstr ""
+
+#. module: mail
+#: help:mail.message.subtype,default:0
+msgid "Activated by default when subscribing."
+msgstr ""
+
+#. module: mail
+#: view:mail.message:0
+msgid "Comments"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:296
+#, python-format
+msgid "more messages"
+msgstr ""
+
+#. module: mail
+#: view:mail.alias:0
+#: view:mail.mail:0
+msgid "Group By..."
+msgstr ""
+
+#. module: mail
+#: help:mail.compose.message,body:0
+#: help:mail.message,body:0
+msgid "Automatically sanitized HTML contents"
+msgstr ""
+
+#. module: mail
+#: help:mail.alias,alias_name:0
+msgid ""
+"The name of the email alias, e.g. 'jobs' if you want to catch emails for "
+""
+msgstr ""
+
+#. module: mail
+#: model:ir.actions.act_window,name:mail.action_email_compose_message_wizard
+#: view:mail.compose.message:0
+msgid "Compose Email"
+msgstr "메일 작성"
+
+#. module: mail
+#: constraint:mail.alias:0
+msgid ""
+"Invalid expression, it must be a literal python dictionary definition e.g. "
+"\"{'field': 'value'}\""
+msgstr ""
+
+#. module: mail
+#: view:mail.group:0
+msgid "Group Name"
+msgstr "그룹명"
+
+#. module: mail
+#: selection:mail.group,public:0
+msgid "Public"
+msgstr ""
+
+#. module: mail
+#: view:mail.message:0
+msgid "Unread"
+msgstr "읽지 않음"
+
+#. module: mail
+#: view:mail.mail:0
+msgid "Body"
+msgstr "본문"
+
+#. module: mail
+#: view:mail.message:0
+msgid "Show messages to read"
+msgstr ""
+
+#. module: mail
+#: help:mail.compose.message,email_from:0
+#: help:mail.message,email_from:0
+msgid ""
+"Email address of the sender. This field is set when no matching partner is "
+"found for incoming emails."
+msgstr "보내는 사람의 이메일 주소. 이 필드는 수신 메일에서 일치하는 파트너를 찾을 수 없을 때 설정됩니다."
+
+#. module: mail
+#: model:ir.model,name:mail.model_mail_compose_message
+msgid "Email composition wizard"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail_followers.xml:23
+#, python-format
+msgid "Add others"
+msgstr ""
+
+#. module: mail
+#: field:mail.message.subtype,parent_id:0
+msgid "Parent"
+msgstr ""
+
+#. module: mail
+#: field:mail.group,message_unread:0
+#: field:mail.thread,message_unread:0
+#: field:res.partner,message_unread:0
+msgid "Unread Messages"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:267
+#, python-format
+msgid "to"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:296
+#, python-format
+msgid "show"
+msgstr ""
+
+#. module: mail
+#: help:mail.group,group_ids:0
+msgid ""
+"Members of those groups will automatically added as followers. Note that "
+"they will be able to manage their subscription manually if necessary."
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/js/mail.js:1019
+#, python-format
+msgid "Do you really want to delete this message?"
+msgstr ""
+
+#. module: mail
+#: view:mail.message:0
+#: field:mail.notification,read:0
+msgid "Read"
+msgstr ""
+
+#. module: mail
+#: view:mail.group:0
+msgid "Search Groups"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/js/mail_followers.js:110
+#, python-format
+msgid ""
+"Warning! \n"
+" %s won't be notified of any email or discussion on this document. Do you "
+"really want to remove him from the followers ?"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/js/mail_followers.js:159
+#, python-format
+msgid "followers"
+msgstr ""
+
+#. module: mail
+#: code:addons/mail/mail_message.py:726
+#, python-format
+msgid "Access Denied"
+msgstr ""
+
+#. module: mail
+#: help:mail.group,image_medium:0
+msgid ""
+"Medium-sized photo of the group. It is automatically resized as a 128x128px "
+"image, with aspect ratio preserved. Use this field in form views or some "
+"kanban views."
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:212
+#, python-format
+msgid "Uploading error"
+msgstr ""
+
+#. module: mail
+#: model:mail.group,name:mail.group_support
+msgid "Support"
+msgstr ""
+
+#. module: mail
+#: code:addons/mail/mail_message.py:727
+#, python-format
+msgid ""
+"The requested operation cannot be completed due to security restrictions. "
+"Please contact your system administrator.\n"
+"\n"
+"(Document type: %s, Operation: %s)"
+msgstr ""
+
+#. module: mail
+#: view:mail.mail:0
+#: selection:mail.mail,state:0
+msgid "Received"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:73
+#, python-format
+msgid "Attach a File"
+msgstr ""
+
+#. module: mail
+#: view:mail.mail:0
+msgid "Thread"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:29
+#, python-format
+msgid "Open the full mail composer"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:29
+#, python-format
+msgid "ò"
+msgstr ""
+
+#. module: mail
+#: field:base.config.settings,alias_domain:0
+msgid "Alias Domain"
+msgstr ""
+
+#. module: mail
+#: field:mail.group,group_ids:0
+msgid "Auto Subscription"
+msgstr ""
+
+#. module: mail
+#: field:mail.mail,references:0
+msgid "References"
+msgstr ""
+
+#. module: mail
+#: view:mail.wizard.invite:0
+msgid "Add Followers"
+msgstr ""
+
+#. module: mail
+#: help:mail.compose.message,author_id:0
+#: help:mail.message,author_id:0
+msgid ""
+"Author of the message. If not set, email_from may hold an email address that "
+"did not match any partner."
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:98
+#: code:addons/mail/static/src/xml/mail.xml:110
+#, python-format
+msgid "uploading"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail_followers.xml:52
+#, python-format
+msgid "more."
+msgstr ""
+
+#. module: mail
+#: help:mail.compose.message,type:0
+#: help:mail.message,type:0
+msgid ""
+"Message type: email for email message, notification for system message, "
+"comment for other messages such as user replies"
+msgstr ""
+
+#. module: mail
+#: help:mail.message.subtype,relation_field:0
+msgid ""
+"Field used to link the related model to the subtype model when using "
+"automatic subscription on a related document. The field is used to compute "
+"getattr(related_document.relation_field)."
+msgstr ""
+
+#. module: mail
+#: selection:mail.mail,state:0
+msgid "Cancelled"
+msgstr ""
+
+#. module: mail
+#: field:mail.mail,reply_to:0
+msgid "Reply-To"
+msgstr ""
+
+#. module: mail
+#: code:addons/mail/wizard/invite.py:37
+#, python-format
+msgid "
You have been invited to follow %s.
"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:54
+#, python-format
+msgid "Send a message"
+msgstr ""
+
+#. module: mail
+#: help:mail.group,message_unread:0
+#: help:mail.thread,message_unread:0
+#: help:res.partner,message_unread:0
+msgid "If checked new messages require your attention."
+msgstr ""
+
+#. module: mail
+#: field:mail.group,image_medium:0
+msgid "Medium-sized photo"
+msgstr ""
+
+#. module: mail
+#: model:ir.actions.client,name:mail.action_mail_to_me_feeds
+#: model:ir.ui.menu,name:mail.mail_tomefeeds
+msgid "To: me"
+msgstr ""
+
+#. module: mail
+#: field:mail.message.subtype,name:0
+msgid "Message Type"
+msgstr ""
+
+#. module: mail
+#: field:mail.mail,auto_delete:0
+msgid "Auto Delete"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:264
+#, python-format
+msgid "logged a note"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail_followers.xml:12
+#: view:mail.group:0
+#, python-format
+msgid "Unfollow"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:295
+#, python-format
+msgid "show one more message"
+msgstr ""
+
+#. module: mail
+#: code:addons/mail/mail_mail.py:74
+#: code:addons/mail/res_users.py:69
+#, python-format
+msgid "Invalid Action!"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:25
+#, python-format
+msgid "User img"
+msgstr ""
+
+#. module: mail
+#: model:ir.actions.act_window,name:mail.action_view_mail_mail
+#: model:ir.ui.menu,name:mail.menu_mail_mail
+#: view:mail.mail:0
+#: view:mail.message:0
+msgid "Emails"
+msgstr ""
+
+#. module: mail
+#: field:mail.followers,partner_id:0
+msgid "Related Partner"
+msgstr ""
+
+#. module: mail
+#: help:mail.group,message_summary:0
+#: help:mail.thread,message_summary:0
+#: help:res.partner,message_summary:0
+msgid ""
+"Holds the Chatter summary (number of messages, ...). This summary is "
+"directly in html format in order to be inserted in kanban views."
+msgstr ""
+
+#. module: mail
+#: help:mail.alias,alias_model_id:0
+msgid ""
+"The model (OpenERP Document Kind) to which this alias corresponds. Any "
+"incoming email that does not reply to an existing record will cause the "
+"creation of a new record of this model (e.g. a Project Task)"
+msgstr ""
+
+#. module: mail
+#: view:base.config.settings:0
+msgid "mycompany.my.openerp.com"
+msgstr ""
+
+#. module: mail
+#: field:mail.message.subtype,relation_field:0
+msgid "Relation field"
+msgstr ""
+
+#. module: mail
+#: selection:mail.compose.message,type:0
+#: selection:mail.message,type:0
+msgid "System notification"
+msgstr ""
+
+#. module: mail
+#: model:ir.model,name:mail.model_res_partner
+#: view:mail.mail:0
+msgid "Partner"
+msgstr ""
+
+#. module: mail
+#: model:ir.ui.menu,name:mail.mail_my_stuff
+msgid "Organizer"
+msgstr ""
+
+#. module: mail
+#: field:mail.compose.message,subject:0
+#: field:mail.message,subject:0
+msgid "Subject"
+msgstr ""
+
+#. module: mail
+#: field:mail.wizard.invite,partner_ids:0
+msgid "Partners"
+msgstr ""
+
+#. module: mail
+#: view:mail.mail:0
+msgid "Retry"
+msgstr ""
+
+#. module: mail
+#: field:mail.compose.message,email_from:0
+#: field:mail.mail,email_from:0
+#: field:mail.message,email_from:0
+msgid "From"
+msgstr ""
+
+#. module: mail
+#: field:mail.compose.message,subtype_id:0
+#: field:mail.followers,subtype_ids:0
+#: field:mail.message,subtype_id:0
+#: view:mail.message.subtype:0
+msgid "Subtype"
+msgstr ""
+
+#. module: mail
+#: view:mail.mail:0
+#: view:mail.message.subtype:0
+msgid "Email message"
+msgstr ""
+
+#. module: mail
+#: model:ir.model,name:mail.model_base_config_settings
+msgid "base.config.settings"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:128
+#, python-format
+msgid "this document"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:36
+#: view:mail.compose.message:0
+#, python-format
+msgid "Send"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/js/mail_followers.js:155
+#, python-format
+msgid "No followers"
+msgstr ""
+
+#. module: mail
+#: view:mail.mail:0
+msgid "Failed"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:154
+#, python-format
+msgid "Attach a note that will not be send to the followers"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail_followers.xml:22
+#: model:ir.actions.act_window,name:mail.action_view_followers
+#: model:ir.ui.menu,name:mail.menu_email_followers
+#: view:mail.followers:0
+#: field:mail.group,message_follower_ids:0
+#: field:mail.thread,message_follower_ids:0
+#: field:res.partner,message_follower_ids:0
+#, python-format
+msgid "Followers"
+msgstr ""
+
+#. module: mail
+#: model:ir.actions.client,name:mail.action_mail_archives_feeds
+#: model:ir.ui.menu,name:mail.mail_archivesfeeds
+msgid "Archives"
+msgstr ""
+
+#. module: mail
+#: view:mail.compose.message:0
+msgid "Subject..."
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:97
+#: code:addons/mail/static/src/xml/mail.xml:109
+#, python-format
+msgid "Delete this attachment"
+msgstr ""
+
+#. module: mail
+#: code:addons/mail/mail_thread.py:112
+#, python-format
+msgid "New"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/js/mail_followers.js:157
+#, python-format
+msgid "One follower"
+msgstr ""
+
+#. module: mail
+#: field:mail.compose.message,type:0
+#: field:mail.message,type:0
+msgid "Type"
+msgstr ""
+
+#. module: mail
+#: selection:mail.compose.message,type:0
+#: view:mail.mail:0
+#: selection:mail.message,type:0
+msgid "Email"
+msgstr ""
+
+#. module: mail
+#: field:ir.ui.menu,mail_group_id:0
+msgid "Mail Group"
+msgstr ""
+
+#. module: mail
+#: selection:res.partner,notification_email_send:0
+msgid "Comments and Emails"
+msgstr ""
+
+#. module: mail
+#: field:mail.alias,alias_defaults:0
+msgid "Default Values"
+msgstr ""
+
+#. module: mail
+#: code:addons/mail/res_users.py:89
+#, python-format
+msgid "%s has joined the %s network."
+msgstr ""
+
+#. module: mail
+#: help:mail.group,image_small:0
+msgid ""
+"Small-sized photo of the group. It is automatically resized as a 64x64px "
+"image, with aspect ratio preserved. Use this field anywhere a small image is "
+"required."
+msgstr ""
+
+#. module: mail
+#: view:mail.compose.message:0
+#: field:mail.message,partner_ids:0
+msgid "Recipients"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:142
+#, python-format
+msgid "<<<"
+msgstr ""
+
+#. module: mail
+#: field:mail.group,group_public_id:0
+msgid "Authorized Group"
+msgstr ""
+
+#. module: mail
+#: view:mail.group:0
+msgid "Join Group"
+msgstr ""
+
+#. module: mail
+#: help:mail.mail,email_from:0
+msgid "Message sender, taken from user preferences."
+msgstr ""
+
+#. module: mail
+#: code:addons/mail/wizard/invite.py:40
+#, python-format
+msgid "
You have been invited to follow a new document.
"
+msgstr ""
+
+#. module: mail
+#: field:mail.compose.message,parent_id:0
+#: field:mail.message,parent_id:0
+msgid "Parent Message"
+msgstr ""
+
+#. module: mail
+#: field:mail.compose.message,res_id:0
+#: field:mail.followers,res_id:0
+#: field:mail.message,res_id:0
+#: field:mail.wizard.invite,res_id:0
+msgid "Related Document ID"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/js/mail_followers.js:254
+#, python-format
+msgid ""
+"Warning! \n"
+"You won't be notified of any email or discussion on this document. Do you "
+"really want to unfollow this document ?"
+msgstr ""
+
+#. module: mail
+#: model:ir.actions.client,help:mail.action_mail_to_me_feeds
+msgid ""
+"
\n"
+" No private message.\n"
+"
\n"
+" This list contains messages sent to you.\n"
+"
\n"
+" "
+msgstr ""
+
+#. module: mail
+#: model:mail.group,name:mail.group_rd
+msgid "R&D"
+msgstr ""
+
+#. module: mail
+#: model:ir.model,name:mail.model_mail_wizard_invite
+msgid "Invite wizard"
+msgstr ""
+
+#. module: mail
+#: model:ir.model,name:mail.model_mail_thread
+msgid "Email Thread"
+msgstr ""
+
+#. module: mail
+#: view:mail.mail:0
+msgid "Advanced"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:244
+#, python-format
+msgid "Move to Inbox"
+msgstr ""
+
+#. module: mail
+#: code:addons/mail/wizard/mail_compose_message.py:165
+#, python-format
+msgid "Re:"
+msgstr ""
+
+#. module: mail
+#: field:mail.compose.message,to_read:0
+#: field:mail.message,to_read:0
+msgid "To read"
+msgstr ""
+
+#. module: mail
+#: code:addons/mail/res_users.py:69
+#, python-format
+msgid ""
+"You may not create a user. To create new users, you should use the "
+"\"Settings > Users\" menu."
+msgstr ""
+
+#. module: mail
+#: help:mail.followers,res_model:0
+#: help:mail.wizard.invite,res_model:0
+msgid "Model of the followed resource"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:320
+#, python-format
+msgid "like"
+msgstr ""
+
+#. module: mail
+#: view:mail.compose.message:0
+#: view:mail.wizard.invite:0
+msgid "Cancel"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:47
+#, python-format
+msgid "Share with my followers..."
+msgstr ""
+
+#. module: mail
+#: field:mail.notification,partner_id:0
+msgid "Contact"
+msgstr ""
+
+#. module: mail
+#: view:mail.group:0
+msgid ""
+"Only the invited followers can read the\n"
+" discussions on this group."
+msgstr ""
+
+#. module: mail
+#: model:ir.model,name:mail.model_ir_ui_menu
+msgid "ir.ui.menu"
+msgstr ""
+
+#. module: mail
+#: view:mail.message:0
+msgid "Has attachments"
+msgstr ""
+
+#. module: mail
+#: view:mail.mail:0
+msgid "on"
+msgstr ""
+
+#. module: mail
+#: code:addons/mail/mail_message.py:915
+#, python-format
+msgid ""
+"The following partners chosen as recipients for the email have no email "
+"address linked :"
+msgstr ""
+
+#. module: mail
+#: help:mail.alias,alias_defaults:0
+msgid ""
+"A Python dictionary that will be evaluated to provide default values when "
+"creating new records for this alias."
+msgstr ""
+
+#. module: mail
+#: model:ir.model,name:mail.model_mail_message_subtype
+msgid "Message subtypes"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:37
+#: code:addons/mail/static/src/xml/mail.xml:57
+#, python-format
+msgid "Log a note"
+msgstr ""
+
+#. module: mail
+#: selection:mail.compose.message,type:0
+#: view:mail.mail:0
+#: selection:mail.message,type:0
+msgid "Comment"
+msgstr ""
+
+#. module: mail
+#: model:ir.actions.client,help:mail.action_mail_inbox_feeds
+msgid ""
+"
\n"
+" Good Job! Your inbox is empty.\n"
+"
\n"
+" Your inbox contains private messages or emails sent to "
+"you\n"
+" as well as information related to documents or people "
+"you\n"
+" follow.\n"
+"
\n"
+" "
+msgstr ""
+
+#. module: mail
+#: field:mail.mail,notification:0
+msgid "Is Notification"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:188
+#, python-format
+msgid "Compose a new message"
+msgstr ""
+
+#. module: mail
+#: view:mail.mail:0
+msgid "Send Now"
+msgstr ""
+
+#. module: mail
+#: code:addons/mail/mail_mail.py:74
+#, python-format
+msgid ""
+"Unable to send email, please configure the sender's email address or alias."
+msgstr ""
+
+#. module: mail
+#: help:res.users,alias_id:0
+msgid ""
+"Email address internally associated with this user. Incoming emails will "
+"appear in the user's notifications."
+msgstr ""
+
+#. module: mail
+#: field:mail.group,image:0
+msgid "Photo"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:56
+#: code:addons/mail/static/src/xml/mail.xml:191
+#: view:mail.compose.message:0
+#: view:mail.wizard.invite:0
+#, python-format
+msgid "or"
+msgstr ""
+
+#. module: mail
+#: help:mail.compose.message,vote_user_ids:0
+#: help:mail.message,vote_user_ids:0
+msgid "Users that voted for this message"
+msgstr ""
+
+#. module: mail
+#: help:mail.group,alias_id:0
+msgid ""
+"The email address associated with this group. New emails received will "
+"automatically create new topics."
+msgstr ""
+
+#. module: mail
+#: view:mail.mail:0
+msgid "Month"
+msgstr ""
+
+#. module: mail
+#: view:mail.mail:0
+msgid "Email Search"
+msgstr ""
+
+#. module: mail
+#: field:mail.compose.message,child_ids:0
+#: field:mail.message,child_ids:0
+msgid "Child Messages"
+msgstr ""
+
+#. module: mail
+#: field:mail.alias,alias_user_id:0
+msgid "Owner"
+msgstr ""
+
+#. module: mail
+#: code:addons/mail/res_partner.py:49
+#, python-format
+msgid "Partner Profile"
+msgstr ""
+
+#. module: mail
+#: model:ir.model,name:mail.model_mail_message
+#: field:mail.mail,mail_message_id:0
+#: view:mail.message:0
+#: field:mail.notification,message_id:0
+#: field:mail.wizard.invite,message:0
+msgid "Message"
+msgstr ""
+
+#. module: mail
+#: help:mail.followers,res_id:0
+#: help:mail.wizard.invite,res_id:0
+msgid "Id of the followed resource"
+msgstr ""
+
+#. module: mail
+#: field:mail.compose.message,body:0
+#: field:mail.message,body:0
+msgid "Contents"
+msgstr ""
+
+#. module: mail
+#: model:ir.actions.act_window,name:mail.action_view_mail_alias
+#: model:ir.ui.menu,name:mail.mail_alias_menu
+msgid "Aliases"
+msgstr ""
+
+#. module: mail
+#: help:mail.message.subtype,description:0
+msgid ""
+"Description that will be added in the message posted for this subtype. If "
+"void, the name will be added instead."
+msgstr ""
+
+#. module: mail
+#: field:mail.compose.message,vote_user_ids:0
+#: field:mail.message,vote_user_ids:0
+msgid "Votes"
+msgstr ""
+
+#. module: mail
+#: view:mail.group:0
+msgid "Group"
+msgstr ""
+
+#. module: mail
+#: help:mail.compose.message,starred:0
+#: help:mail.message,starred:0
+msgid "Current user has a starred notification linked to this message"
+msgstr ""
+
+#. module: mail
+#: field:mail.group,public:0
+msgid "Privacy"
+msgstr ""
+
+#. module: mail
+#: view:mail.mail:0
+msgid "Notification"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/js/mail.js:650
+#, python-format
+msgid "Please complete partner's informations"
+msgstr ""
+
+#. module: mail
+#: code:addons/mail/mail_mail.py:187
+#, python-format
+msgid "
"
+msgstr ""
+
+#. module: portal
+#: field:portal.payment.acquirer,form_template:0
+msgid "Payment form template (HTML)"
+msgstr ""
+
+#. module: portal
+#: field:portal.wizard.user,partner_id:0
+msgid "Contact"
+msgstr ""
+
+#. module: portal
+#: model:ir.model,name:portal.model_mail_mail
+msgid "Outgoing Mails"
+msgstr ""
+
+#. module: portal
+#: code:addons/portal/wizard/portal_wizard.py:193
+#, python-format
+msgid "Email required"
+msgstr ""
+
+#. module: portal
+#: model:ir.ui.menu,name:portal.portal_messages
+msgid "Messaging"
+msgstr ""
+
+#. module: portal
+#: model:res.groups,comment:portal.group_anonymous
+msgid ""
+"Anonymous users have specific access rights (such as record rules and "
+"restricted menus).\n"
+" They usually do not belong to the usual OpenERP groups."
+msgstr ""
+
+#. module: portal
+#: model:ir.model,name:portal.model_portal_payment_acquirer
+msgid "Online Payment Acquirer"
+msgstr ""
+
+#. module: portal
+#: model:mail.group,name:portal.company_news_feed
+msgid "Company News"
+msgstr ""
+
+#. module: portal
+#: code:addons/portal/acquirer.py:76
+#, python-format
+msgid ""
+"You can finish the configuration in the Bank&Cash settings"
+msgstr ""
+
+#. module: portal
+#: view:portal.payment.acquirer:0
+msgid "cr: the current database cursor"
+msgstr ""
+
+#. module: portal
+#: model:ir.actions.client,help:portal.action_mail_inbox_feeds_portal
+msgid ""
+"
\n"
+" Good Job! Your inbox is empty.\n"
+"
\n"
+" Your inbox contains private messages or emails sent to "
+"you\n"
+" as well as information related to documents or people "
+"you\n"
+" follow.\n"
+"
\n"
+" "
+msgstr ""
+
+#. module: portal
+#: view:portal.payment.acquirer:0
+msgid ""
+"object: the document on which the payment form is rendered (usually an "
+"invoice or sales order record)"
+msgstr ""
+
+#. module: portal
+#: help:portal.wizard,welcome_message:0
+msgid "This text is included in the email sent to new users of the portal."
+msgstr ""
+
+#. module: portal
+#: model:ir.ui.menu,name:portal.portal_company
+msgid "About Us"
+msgstr ""
+
+#. module: portal
+#: help:res.groups,is_portal:0
+msgid "If checked, this group is usable as a portal."
+msgstr ""
+
+#. module: portal
+#: view:portal.payment.acquirer:0
+msgid "Payment Acquirer"
+msgstr ""
+
+#. module: portal
+#: code:addons/portal/wizard/portal_wizard.py:35
+#, python-format
+msgid ""
+"Dear %(name)s,\n"
+"\n"
+"You have been given access to %(portal)s.\n"
+"\n"
+"Your login account data is:\n"
+"Database: %(db)s\n"
+"Username: %(login)s\n"
+"\n"
+"In order to complete the signin process, click on the following url:\n"
+"%(url)s\n"
+"\n"
+"%(welcome_message)s\n"
+"\n"
+"--\n"
+"OpenERP - Open Source Business Applications\n"
+"http://www.openerp.com\n"
+msgstr ""
+
+#. module: portal
+#: view:portal.payment.acquirer:0
+msgid ""
+"currency: the currency record in which the document is issued (e.g. "
+"currency.name could be EUR)"
+msgstr ""
+
+#. module: portal
+#: model:portal.payment.acquirer,form_template:portal.paypal_acquirer
+msgid ""
+"\n"
+"% if object.company_id.paypal_account:\n"
+"\n"
+"% endif\n"
+" "
+msgstr ""
+
+#. module: portal
+#: model:ir.model,name:portal.model_portal_wizard_user
+msgid "Portal User Config"
+msgstr ""
+
+#. module: portal
+#: view:portal.payment.acquirer:0
+msgid ""
+"If the template renders to an empty result in a certain context it will be "
+"ignored, as if it was inactive."
+msgstr ""
+
+#. module: portal
+#: field:portal.payment.acquirer,visible:0
+msgid "Visible"
+msgstr ""
+
+#. module: portal
+#: code:addons/portal/wizard/share_wizard.py:39
+#, python-format
+msgid "Existing Groups (e.g Portal Groups)"
+msgstr ""
+
+#. module: portal
+#: view:portal.wizard:0
+msgid "Cancel"
+msgstr ""
+
+#. module: portal
+#: view:portal.wizard:0
+msgid "Apply"
+msgstr ""
+
+#. module: portal
+#: view:portal.payment.acquirer:0
+msgid "ctx: the current context dictionary"
+msgstr ""
+
+#. module: portal
+#: view:portal.payment.acquirer:0
+msgid ""
+"This is an HTML form template to submit a payment through this acquirer.\n"
+" The template will be rendered with"
+msgstr ""
+
+#. module: portal
+#: model:ir.actions.client,help:portal.action_mail_star_feeds_portal
+msgid ""
+"
\n"
+" No todo.\n"
+"
\n"
+" When you process messages in your inbox, you can mark "
+"some\n"
+" as todo. From this menu, you can process all your "
+"todo.\n"
+"
\n"
+" "
+msgstr ""
+
+#. module: portal
+#: view:portal.payment.acquirer:0
+msgid "Form Template"
+msgstr ""
+
+#. module: portal
+#: view:share.wizard:0
+msgid "Details"
+msgstr ""
diff --git a/addons/project_long_term/i18n/tr.po b/addons/project_long_term/i18n/tr.po
index f0f67b82700..2a2d28e6d35 100644
--- a/addons/project_long_term/i18n/tr.po
+++ b/addons/project_long_term/i18n/tr.po
@@ -7,14 +7,14 @@ msgstr ""
"Project-Id-Version: OpenERP Server 7.0\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2013-03-07 08:38+0000\n"
-"PO-Revision-Date: 2013-05-08 09:17+0000\n"
-"Last-Translator: Ediz Duman \n"
+"PO-Revision-Date: 2013-05-13 10:14+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: 2013-05-09 06:11+0000\n"
-"X-Generator: Launchpad (build 16598)\n"
+"X-Launchpad-Export-Date: 2013-05-14 06:25+0000\n"
+"X-Generator: Launchpad (build 16617)\n"
#. module: project_long_term
#: help:project.phase,constraint_date_end:0
@@ -436,6 +436,8 @@ msgid ""
"It's computed by the scheduler according the project date or the end date of "
"the previous phase."
msgstr ""
+"Planlamacı tarafından proje tarihine göre ya da önceki aşamanın bitiş "
+"tarihine göre hesaplanmıştır."
#. module: project_long_term
#: model:ir.actions.act_window,name:project_long_term.act_project_phase
diff --git a/addons/report_intrastat/i18n/tr.po b/addons/report_intrastat/i18n/tr.po
index d3d5e2699e9..563bc4a1b6a 100644
--- a/addons/report_intrastat/i18n/tr.po
+++ b/addons/report_intrastat/i18n/tr.po
@@ -8,14 +8,14 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2013-03-07 08:38+0000\n"
-"PO-Revision-Date: 2012-12-21 23:00+0000\n"
-"Last-Translator: FULL NAME \n"
+"PO-Revision-Date: 2013-05-13 10:10+0000\n"
+"Last-Translator: serkan erdoğan \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: 2013-03-28 05:59+0000\n"
-"X-Generator: Launchpad (build 16546)\n"
+"X-Launchpad-Export-Date: 2013-05-14 06:25+0000\n"
+"X-Generator: Launchpad (build 16617)\n"
#. module: report_intrastat
#: report:account.invoice.intrastat:0
@@ -51,7 +51,7 @@ msgstr "İçe Aktar"
#: report:account.invoice.intrastat:0
#: field:report.intrastat.code,description:0
msgid "Description"
-msgstr ""
+msgstr "Açıklama"
#. module: report_intrastat
#: report:account.invoice.intrastat:0
From 852479d5bec692791829995ac43441fd4cc3f2d3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?=
Date: Mon, 13 May 2013 16:26:33 +0200
Subject: [PATCH 088/210] [FIX] mail_followers: avoid partners_to_notify
parameter in _notify only if None, not if void.
bzr revid: tde@openerp.com-20130513142633-bf02usbabnncy6me
---
addons/mail/mail_followers.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/addons/mail/mail_followers.py b/addons/mail/mail_followers.py
index fe2362eecc0..fcd32ec7315 100644
--- a/addons/mail/mail_followers.py
+++ b/addons/mail/mail_followers.py
@@ -88,7 +88,7 @@ class mail_notification(osv.Model):
continue
partner = notification.partner_id
# If partners_to_notify specified: restrict to them
- if partners_to_notify and partner.id not in partners_to_notify:
+ if partners_to_notify is not None and partner.id not in partners_to_notify:
continue
# Do not send to partners without email address defined
if not partner.email:
From 77e51ba1e2e661cf5db799c94a5f1e3053a82d9e Mon Sep 17 00:00:00 2001
From: Christophe Matthieu
Date: Mon, 13 May 2013 16:40:24 +0200
Subject: [PATCH 089/210] [FIX] portal mail: Override of _search and
check_access_rule of mail_message to add specific access rights of
mail.message, to remove all no discussion message if uid is a portal user.
bzr revid: chm@openerp.com-20130513144024-m1o4q8in62fe123b
---
addons/portal/__init__.py | 1 +
addons/portal/mail_message.py | 57 +++++++++++++++++++++++++++++++++++
2 files changed, 58 insertions(+)
create mode 100644 addons/portal/mail_message.py
diff --git a/addons/portal/__init__.py b/addons/portal/__init__.py
index 0045a557a49..e7026986ea4 100644
--- a/addons/portal/__init__.py
+++ b/addons/portal/__init__.py
@@ -21,6 +21,7 @@
import portal
import mail_mail
+import mail_message
import wizard
import acquirer
diff --git a/addons/portal/mail_message.py b/addons/portal/mail_message.py
new file mode 100644
index 00000000000..38516268c24
--- /dev/null
+++ b/addons/portal/mail_message.py
@@ -0,0 +1,57 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+# OpenERP, Open Source Management Solution
+# Copyright (C) 2004-2011 OpenERP S.A ().
+#
+# 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 openerp.osv import osv, orm
+from openerp.tools.translate import _
+
+
+class mail_message(osv.Model):
+ """ Update of mail_message class, to restrict mail access. """
+ _inherit = 'mail.message'
+
+ def _search(self, cr, uid, args, offset=0, limit=None, order=None,
+ context=None, count=False, access_rights_uid=None):
+ """ Override that adds specific access rights of mail.message, to remove
+ all no discussion message if uid is a portal user.
+ """
+ group_ids = self.pool.get('res.users').browse(cr, uid, uid, context=context).groups_id
+ if any(group.is_portal for group in group_ids):
+ subtype_id = self.pool.get("ir.model.data").get_object_reference(cr, uid, 'mail', 'mt_comment')[1]
+ args = ['&', ('subtype_id', '=', subtype_id)] + args
+
+ return super(mail_message, self)._search(cr, uid, args, offset=offset, limit=limit, order=order,
+ context=context, count=False, access_rights_uid=access_rights_uid)
+
+ def check_access_rule(self, cr, uid, ids, operation, context=None):
+ """ Add Access rules of mail.message for portal user:
+ - read:
+ - raise if the type is not 'comment' or 'email'
+ """
+ group_ids = self.pool.get('res.users').browse(cr, uid, uid, context=context).groups_id
+ if any(group.is_portal for group in group_ids):
+ subtype_id = self.pool.get("ir.model.data").get_object_reference(cr, uid, 'mail', 'mt_comment')[1]
+ cr.execute('SELECT DISTINCT id FROM "%s" WHERE subtype_id != %s AND id = ANY (%%s)' % (self._table, subtype_id), (ids,))
+ if cr.fetchall():
+ raise orm.except_orm(_('Access Denied'),
+ _('The requested operation cannot be completed due to security restrictions. Please contact your system administrator.\n\n(Document type: %s, Operation: %s)') % \
+ (self._description, operation))
+
+ return super(mail_message, self).check_access_rule(cr, uid, ids=ids, operation=operation, context=context)
From 8beab22311187fe0cae25090c462dd2e38f3e6c7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?=
Date: Tue, 14 May 2013 12:45:21 +0200
Subject: [PATCH 090/210] [IMP] mail_message for portal users: actually only
comment without subtype are not shown (internal notes).
bzr revid: tde@openerp.com-20130514104521-e8pbgvgn2xtmyr5o
---
addons/portal/mail_message.py | 12 ++++++------
addons/portal/tests/test_portal.py | 22 +++++++++++++++++++++-
2 files changed, 27 insertions(+), 7 deletions(-)
diff --git a/addons/portal/mail_message.py b/addons/portal/mail_message.py
index 38516268c24..d0a4db5853e 100644
--- a/addons/portal/mail_message.py
+++ b/addons/portal/mail_message.py
@@ -33,9 +33,9 @@ class mail_message(osv.Model):
all no discussion message if uid is a portal user.
"""
group_ids = self.pool.get('res.users').browse(cr, uid, uid, context=context).groups_id
- if any(group.is_portal for group in group_ids):
- subtype_id = self.pool.get("ir.model.data").get_object_reference(cr, uid, 'mail', 'mt_comment')[1]
- args = ['&', ('subtype_id', '=', subtype_id)] + args
+ group_user_id = self.pool.get("ir.model.data").get_object_reference(cr, uid, 'base', 'group_user')[1]
+ if group_user_id not in [group.id for group in group_ids]:
+ args = ['&', '|', ('type', '!=', 'comment'), ('subtype_id', '!=', False)] + list(args)
return super(mail_message, self)._search(cr, uid, args, offset=offset, limit=limit, order=order,
context=context, count=False, access_rights_uid=access_rights_uid)
@@ -46,9 +46,9 @@ class mail_message(osv.Model):
- raise if the type is not 'comment' or 'email'
"""
group_ids = self.pool.get('res.users').browse(cr, uid, uid, context=context).groups_id
- if any(group.is_portal for group in group_ids):
- subtype_id = self.pool.get("ir.model.data").get_object_reference(cr, uid, 'mail', 'mt_comment')[1]
- cr.execute('SELECT DISTINCT id FROM "%s" WHERE subtype_id != %s AND id = ANY (%%s)' % (self._table, subtype_id), (ids,))
+ group_user_id = self.pool.get("ir.model.data").get_object_reference(cr, uid, 'base', 'group_user')[1]
+ if group_user_id not in [group.id for group in group_ids]:
+ cr.execute('SELECT DISTINCT id FROM "%s" WHERE type = %%s AND subtype_id != NULL AND id = ANY (%%s)' % (self._table), ('comment', ids,))
if cr.fetchall():
raise orm.except_orm(_('Access Denied'),
_('The requested operation cannot be completed due to security restrictions. Please contact your system administrator.\n\n(Document type: %s, Operation: %s)') % \
diff --git a/addons/portal/tests/test_portal.py b/addons/portal/tests/test_portal.py
index 03f2491315b..1cfb2aef269 100644
--- a/addons/portal/tests/test_portal.py
+++ b/addons/portal/tests/test_portal.py
@@ -40,7 +40,9 @@ class test_portal(TestMailBase):
self.partner_chell_id = self.user_chell.partner_id.id
# Create a PigsPortal group
- self.group_port_id = self.mail_group.create(cr, uid, {'name': 'PigsPortal', 'public': 'groups', 'group_public_id': self.group_portal_id})
+ self.group_port_id = self.mail_group.create(cr, uid,
+ {'name': 'PigsPortal', 'public': 'groups', 'group_public_id': self.group_portal_id},
+ {'mail_create_nolog': True})
# Set an email address for the user running the tests, used as Sender for outgoing mails
self.res_users.write(cr, uid, uid, {'email': 'test@localhost'})
@@ -130,3 +132,21 @@ class test_portal(TestMailBase):
'body of invitation email is incorrect')
self.assertTrue(partner_carine.signup_url in sent_email.get('body'),
'body of invitation email does not contain signup url')
+
+ def test_20_message_read(self):
+ cr, uid, group_port_id = self.cr, self.uid, self.group_port_id
+
+ # Data: custom subtypes
+ mt_group_public_id = self.mail_message_subtype.create(cr, uid, {'name': 'group_public', 'description': 'Group changed'})
+ self.ir_model_data.create(cr, uid, {'name': 'mt_group_public', 'model': 'mail.message.subtype', 'module': 'mail', 'res_id': mt_group_public_id})
+ # Data: post messages with various subtypes
+ msg1_id = self.mail_group.message_post(cr, uid, group_port_id, body='Body1', type='comment', subtype='mail.mt_comment')
+ msg2_id = self.mail_group.message_post(cr, uid, group_port_id, body='Body2', type='comment', subtype='mail.mt_group_public')
+ msg3_id = self.mail_group.message_post(cr, uid, group_port_id, body='Body3', type='comment', subtype='mail.mt_comment')
+ msg4_id = self.mail_group.message_post(cr, uid, group_port_id, body='Body4', type='comment')
+ msg5_id = self.mail_group.message_post(cr, uid, group_port_id, body='Body5', type='notification')
+
+ # Do: Chell search messages: should not see internal notes (comment without subtype)
+ msg_ids = self.mail_message.search(cr, self.user_chell_id, [('model', '=', 'mail.group'), ('res_id', '=', group_port_id)])
+ self.assertEqual(set(msg_ids), set([msg1_id, msg2_id, msg3_id, msg5_id]),
+ 'mail_message: portal user has access to messages he should not read')
From 0b7b3213106c6cab686fccfae5ea1a3224fecafc Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)"
Date: Mon, 13 May 2013 15:24:22 +0200
Subject: [PATCH 091/210] [FIX] account_voucher: display the multi-currency
options each time needed
bzr revid: qdp-launchpad@openerp.com-20130513132422-q78dopdnnyd2x8dy
---
addons/account_voucher/account_voucher.py | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/addons/account_voucher/account_voucher.py b/addons/account_voucher/account_voucher.py
index 4b4639daeb6..f8b380a7ea4 100644
--- a/addons/account_voucher/account_voucher.py
+++ b/addons/account_voucher/account_voucher.py
@@ -247,13 +247,12 @@ class account_voucher(osv.osv):
line_osv = self.pool.get("account.voucher.line")
line_dr_ids = resolve_o2m_operations(cr, uid, line_osv, line_dr_ids, ['amount'], context)
line_cr_ids = resolve_o2m_operations(cr, uid, line_osv, line_cr_ids, ['amount'], context)
-
#compute the field is_multi_currency that is used to hide/display options linked to secondary currency on the voucher
is_multi_currency = False
#loop on the voucher lines to see if one of these has a secondary currency. If yes, we need to see the options
for voucher_line in line_dr_ids+line_cr_ids:
- line_currency = voucher_line.get('move_line_id', False) and self.pool.get('account.move.line').browse(cr, uid, voucher_line.get('move_line_id'), context=context).currency_id
- if line_currency:
+ line_id = voucher_line.get('id') and self.pool.get('account.voucher.line').browse(cr, uid, voucher_line['id'], context=context).move_line_id.id or voucher_line.get('move_line_id')
+ if line_id and self.pool.get('account.move.line').browse(cr, uid, line_id, context=context).currency_id:
is_multi_currency = True
break
return {'value': {'writeoff_amount': self._compute_writeoff_amount(cr, uid, line_dr_ids, line_cr_ids, amount, type), 'is_multi_currency': is_multi_currency}}
From 9b01552b79e67af818c96b37f292b7f2d26fc8ef Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)"
Date: Mon, 13 May 2013 16:21:16 +0200
Subject: [PATCH 092/210] [IMP] account_voucher, usability: reset the amount to
0 in the 'pay invoice wizard' if the currency is not the same than the
invoice currency to avoid a common mistake
bzr revid: qdp-launchpad@openerp.com-20130513142116-wyuud8n9fcnafc7l
---
addons/account_voucher/account_voucher.py | 6 ++++++
addons/account_voucher/invoice.py | 1 +
2 files changed, 7 insertions(+)
diff --git a/addons/account_voucher/account_voucher.py b/addons/account_voucher/account_voucher.py
index f8b380a7ea4..322d9dab6d5 100644
--- a/addons/account_voucher/account_voucher.py
+++ b/addons/account_voucher/account_voucher.py
@@ -880,6 +880,12 @@ class account_voucher(osv.osv):
else:
currency_id = journal.company_id.currency_id.id
vals['value'].update({'currency_id': currency_id})
+ #in case we want to register the payment directly from an invoice, it's confusing to allow to switch the journal
+ #without seeing that the amount is expressed in the journal currency, and not in the invoice currency. So to avoid
+ #this common mistake, we simply reset the amount to 0 if the currency is not the invoice currency.
+ if context.get('payment_expected_currency') and currency_id != context.get('payment_expected_currency'):
+ vals['value']['amount'] = 0
+ amount = 0
res = self.onchange_partner_id(cr, uid, ids, partner_id, journal_id, amount, currency_id, ttype, date, context)
for key in res.keys():
vals[key].update(res[key])
diff --git a/addons/account_voucher/invoice.py b/addons/account_voucher/invoice.py
index c0584ddbd52..a38a3d3e9b6 100644
--- a/addons/account_voucher/invoice.py
+++ b/addons/account_voucher/invoice.py
@@ -41,6 +41,7 @@ class invoice(osv.osv):
'target': 'new',
'domain': '[]',
'context': {
+ 'payment_expected_currency': inv.currency_id.id,
'default_partner_id': self.pool.get('res.partner')._find_accounting_partner(inv.partner_id).id,
'default_amount': inv.type in ('out_refund', 'in_refund') and -inv.residual or inv.residual,
'default_reference': inv.name,
From e19d5e4685d3d98fcb3b9f6020e4717542d85726 Mon Sep 17 00:00:00 2001
From: Cedric Snauwaert
Date: Mon, 13 May 2013 16:53:18 +0200
Subject: [PATCH 093/210] [FIX]purchase/stock: when validating a PO,
information on scheduled_date was not correct, should take into account,
schedule_date for each product instead of PO date. Also add a message in
chatter whenever we receive a product. Added a function in tools/misc/py for
the purpose of printing correct date in user timezone + timezone information.
bzr revid: csn@openerp.com-20130513145318-qterabm7vmjkezi4
---
addons/purchase/purchase.py | 2 +-
addons/stock/stock.py | 10 +++++++---
addons/stock/stock_view.xml | 2 +-
3 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/addons/purchase/purchase.py b/addons/purchase/purchase.py
index b1f552b64cc..a7973a40a47 100644
--- a/addons/purchase/purchase.py
+++ b/addons/purchase/purchase.py
@@ -641,7 +641,7 @@ class purchase_order(osv.osv):
'product_uom': order_line.product_uom.id,
'product_uos': order_line.product_uom.id,
'date': self.date_to_datetime(cr, uid, order.date_order, context),
- 'date_expected': self.date_to_datetime(cr, uid, order.date_order, context),
+ 'date_expected': self.date_to_datetime(cr, uid, order_line.date_planned, context),
'location_id': order.partner_id.property_stock_supplier.id,
'location_dest_id': order.location_id.id,
'picking_id': picking_id,
diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index 6d9cb1aae84..fbbee7771b1 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -29,7 +29,7 @@ from openerp.osv import fields, osv
from openerp.tools.translate import _
from openerp import netsvc
from openerp import tools
-from openerp.tools import float_compare
+from openerp.tools import float_compare, DEFAULT_SERVER_DATETIME_FORMAT, server_to_local_timestamp_info
import openerp.addons.decimal_precision as dp
import logging
_logger = logging.getLogger(__name__)
@@ -651,7 +651,7 @@ class stock_picking(osv.osv):
),
'min_date': fields.function(get_min_max_date, fnct_inv=_set_minimum_date, multi="min_max_date",
store=True, type='datetime', string='Scheduled Time', select=1, help="Scheduled time for the shipment to be processed"),
- 'date': fields.datetime('Time', help="Creation time, usually the time of the order.", select=True, states={'done':[('readonly', True)], 'cancel':[('readonly',True)]}),
+ 'date': fields.datetime('Creation Date', help="Creation date, usually the time of the order.", select=True, states={'done':[('readonly', True)], 'cancel':[('readonly',True)]}),
'date_done': fields.datetime('Date of Transfer', help="Date of Completion", states={'done':[('readonly', True)], 'cancel':[('readonly',True)]}),
'max_date': fields.function(get_min_max_date, fnct_inv=_set_maximum_date, multi="min_max_date",
store=True, type='datetime', string='Max. Expected Date', select=2),
@@ -2360,6 +2360,10 @@ class stock_move(osv.osv):
if move.picking_id:
picking_ids.append(move.picking_id.id)
+ #add a message in chatter to say that product has been received
+ user_time = server_to_local_timestamp_info(fields.datetime.now(),context=context)
+ message = _('Product \'%s\' has been received at \'%s\'') % (move.name, user_time)
+ move.picking_id.message_post(body = message)
if move.move_dest_id.id and (move.state != 'done'):
# Downstream move should only be triggered if this move is the last pending upstream move
other_upstream_move_ids = self.search(cr, uid, [('id','!=',move.id),('state','not in',['done','cancel']),
@@ -2380,7 +2384,7 @@ class stock_move(osv.osv):
if todo:
self.action_confirm(cr, uid, todo, context=context)
- self.write(cr, uid, move_ids, {'state': 'done', 'date': time.strftime('%Y-%m-%d %H:%M:%S')}, context=context)
+ self.write(cr, uid, move_ids, {'state': 'done', 'date': time.strftime(DEFAULT_SERVER_DATETIME_FORMAT)}, context=context)
for id in move_ids:
wf_service.trg_trigger(uid, 'stock.move', id, cr)
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index 83362ab5d6f..5865ad31994 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -1253,7 +1253,7 @@
-
+
From 55b4b2d1d066cd7ac88ed76cf54223499e769573 Mon Sep 17 00:00:00 2001
From: Cedric Snauwaert
Date: Mon, 13 May 2013 17:45:46 +0200
Subject: [PATCH 094/210] [FIX]stock: add method that was added in server here
to prevent user to have to update base do not forward in trunk
bzr revid: csn@openerp.com-20130513154546-v5zqi6723aeiymxl
---
addons/stock/stock.py | 29 +++++++++++++++++++++++++++--
1 file changed, 27 insertions(+), 2 deletions(-)
diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index fbbee7771b1..bacea01968f 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -29,7 +29,7 @@ from openerp.osv import fields, osv
from openerp.tools.translate import _
from openerp import netsvc
from openerp import tools
-from openerp.tools import float_compare, DEFAULT_SERVER_DATETIME_FORMAT, server_to_local_timestamp_info
+from openerp.tools import float_compare, DEFAULT_SERVER_DATETIME_FORMAT, server_to_local_timestamp
import openerp.addons.decimal_precision as dp
import logging
_logger = logging.getLogger(__name__)
@@ -2334,6 +2334,31 @@ class stock_move(osv.osv):
'line_id': move_lines,
'ref': move.picking_id and move.picking_id.name})
+ #Should be add in server/tools/misc.py in trunk
+ def server_to_local_timestamp_info(self, str_date, src_format, context=None):
+ """
+ Convert a source timestamp string into a destination timestamp string, attempting to apply the
+ correct offset if both the server and local timezone are recognized, or no
+ offset at all if they aren't.
+ This will return a string representing the date in the timezone of the user with the details of
+ which timezone is used (for example UTC+0200 (CEST))
+
+ @param src_date: the str value containing the timestamp in the server timezone.
+ @param src_format: the format to use when parsing the server timestamp.
+ @param context: context to be used (should contain the user local timezone)
+
+ @return local/client formatted timestamp, expressed in the local/client timezone if possible
+ and add information about that timezone.
+ example: str_date = '2013-03-10 10:35:00' (if server timezone is UTC), if user is in UTC+0200
+ return: '2013-03-10 10:35:00 UTC+0200 (CEST)'
+ """
+ if not str_date:
+ return False
+ if not context:
+ context = {}
+ dst_format = src_format + ' UTC%z (%Z)'
+ return server_to_local_timestamp(str_date, src_format, dst_format, context.get('tz') or 'UTC')
+
def action_done(self, cr, uid, ids, context=None):
""" Makes the move done and if all moves are done, it will finish the picking.
@@ -2361,7 +2386,7 @@ class stock_move(osv.osv):
if move.picking_id:
picking_ids.append(move.picking_id.id)
#add a message in chatter to say that product has been received
- user_time = server_to_local_timestamp_info(fields.datetime.now(),context=context)
+ user_time = self.server_to_local_timestamp_info(fields.datetime.now(), DEFAULT_SERVER_DATETIME_FORMAT, context=context)
message = _('Product \'%s\' has been received at \'%s\'') % (move.name, user_time)
move.picking_id.message_post(body = message)
if move.move_dest_id.id and (move.state != 'done'):
From 725bb2aa223306463e50ea403a15ce8e21254e73 Mon Sep 17 00:00:00 2001
From: Launchpad Translations on behalf of openerp <>
Date: Tue, 14 May 2013 06:25:31 +0000
Subject: [PATCH 095/210] Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20130508061745-3w2v8zqbedx53bx0
bzr revid: launchpad_translations_on_behalf_of_openerp-20130513064606-6ynxgbs7f50s891m
bzr revid: launchpad_translations_on_behalf_of_openerp-20130514062531-mifd04b012g1kcz4
---
openerp/addons/base/i18n/fr.po | 87 +++++++++++++++++++---------------
openerp/addons/base/i18n/id.po | 13 +++--
openerp/addons/base/i18n/lt.po | 10 ++--
openerp/addons/base/i18n/ro.po | 10 ++--
4 files changed, 68 insertions(+), 52 deletions(-)
diff --git a/openerp/addons/base/i18n/fr.po b/openerp/addons/base/i18n/fr.po
index 8f906b7c04d..215d0502b70 100644
--- a/openerp/addons/base/i18n/fr.po
+++ b/openerp/addons/base/i18n/fr.po
@@ -8,14 +8,14 @@ msgstr ""
"Project-Id-Version: openobject-server\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2013-03-07 08:36+0000\n"
-"PO-Revision-Date: 2013-04-23 13:12+0000\n"
-"Last-Translator: Christophe Chauvet - http://www.syleam.fr/ \n"
+"PO-Revision-Date: 2013-05-13 14:03+0000\n"
+"Last-Translator: WANTELLET Sylvain \n"
"Language-Team: French \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-04-24 05:28+0000\n"
-"X-Generator: Launchpad (build 16580)\n"
+"X-Launchpad-Export-Date: 2013-05-14 06:25+0000\n"
+"X-Generator: Launchpad (build 16617)\n"
#. module: base
#: model:ir.module.module,description:base.module_account_check_writing
@@ -607,7 +607,7 @@ msgstr "Guyane Française"
#. module: base
#: model:ir.module.module,summary:base.module_hr
msgid "Jobs, Departments, Employees Details"
-msgstr "Postes, Départements, Détail des Employés"
+msgstr "Postes, départements, coordonnées des employés"
#. module: base
#: model:ir.module.module,description:base.module_analytic
@@ -1282,7 +1282,7 @@ msgstr "Utilisateurs Google"
#. module: base
#: model:ir.module.module,shortdesc:base.module_fleet
msgid "Fleet Management"
-msgstr "Gestion de flotte"
+msgstr "Parc automobile"
#. module: base
#: help:ir.server.object.lines,value:0
@@ -6837,7 +6837,7 @@ msgstr "Lancer l'assistant de configuration"
#. module: base
#: model:ir.module.module,summary:base.module_mrp
msgid "Manufacturing Orders, Bill of Materials, Routing"
-msgstr "Ordres de fabrication, Nomenclature, Gammes opératoire"
+msgstr "Ordres de fabrication, nomenclature, gammes opératoires"
#. module: base
#: field:ir.attachment,name:0
@@ -8695,7 +8695,7 @@ msgstr "Somalie"
#. module: base
#: model:res.partner.title,shortcut:base.res_partner_title_doctor
msgid "Dr."
-msgstr ""
+msgstr "Dr."
#. module: base
#: model:res.groups,name:base.group_user
@@ -8802,7 +8802,7 @@ msgstr "Territoire britannique de l'océan Indien"
#. module: base
#: model:ir.actions.server,name:base.action_server_module_immediate_install
msgid "Module Immediate Install"
-msgstr ""
+msgstr "Installation immédiate du module"
#. module: base
#: view:ir.actions.server:0
@@ -8998,12 +8998,12 @@ msgstr "Îles Mariannes du Nord"
#. module: base
#: field:change.password.user,user_login:0
msgid "User Login"
-msgstr ""
+msgstr "Identifiant"
#. module: base
#: view:ir.filters:0
msgid "Filters created by myself"
-msgstr ""
+msgstr "Mes filtres"
#. module: base
#: model:ir.module.module,shortdesc:base.module_l10n_hn
@@ -9082,7 +9082,7 @@ msgstr ""
#. module: base
#: model:res.partner.category,name:base.res_partner_category_14
msgid "Manufacturer"
-msgstr ""
+msgstr "Fabricant"
#. module: base
#: help:res.users,company_id:0
@@ -9178,7 +9178,7 @@ msgstr "mdx"
#. module: base
#: view:ir.cron:0
msgid "Scheduled Action"
-msgstr ""
+msgstr "Action plannifiée"
#. module: base
#: model:res.country,name:base.bi
@@ -9228,7 +9228,7 @@ msgstr "Prochain numéro pour cette séquence"
#: view:res.partner:0
#: view:res.users:0
msgid "Tags..."
-msgstr ""
+msgstr "Étiquettes..."
#. module: base
#: view:res.partner:0
@@ -9258,7 +9258,7 @@ msgstr "Format de fichier"
#. module: base
#: view:ir.filters:0
msgid "My filters"
-msgstr ""
+msgstr "Mes filtres"
#. module: base
#: field:res.lang,iso_code:0
@@ -9504,7 +9504,7 @@ msgstr "Canada"
#. module: base
#: view:base.language.export:0
msgid "Launchpad"
-msgstr ""
+msgstr "Launchpad"
#. module: base
#: help:res.currency.rate,currency_rate_type_id:0
@@ -9572,7 +9572,7 @@ msgstr "Champ personalisé"
#. module: base
#: model:ir.module.module,summary:base.module_account_accountant
msgid "Financial and Analytic Accounting"
-msgstr ""
+msgstr "Comptabilité financière et analytique"
#. module: base
#: model:ir.module.module,shortdesc:base.module_portal_project
@@ -9595,7 +9595,7 @@ msgstr "init"
#: view:res.partner:0
#: field:res.partner,user_id:0
msgid "Salesperson"
-msgstr ""
+msgstr "Vendeur"
#. module: base
#: view:res.lang:0
@@ -9667,7 +9667,7 @@ msgstr "Mot de passe (facultatif) pour l'authentification SMTP"
#: code:addons/base/ir/ir_model.py:728
#, python-format
msgid "Sorry, you are not allowed to modify this document."
-msgstr ""
+msgstr "Désolé, vous n’êtes pas autorisé à modifier ce document."
#. module: base
#: code:addons/base/res/res_config.py:350
@@ -9758,7 +9758,7 @@ msgstr "French (CH) / Français (CH)"
#. module: base
#: model:res.partner.category,name:base.res_partner_category_13
msgid "Distributor"
-msgstr ""
+msgstr "Distributeur"
#. module: base
#: help:ir.actions.server,subject:0
@@ -9929,7 +9929,7 @@ msgstr "Finlande"
#. module: base
#: model:ir.module.module,shortdesc:base.module_web_shortcuts
msgid "Web Shortcuts"
-msgstr ""
+msgstr "Raccourcis Web"
#. module: base
#: view:res.partner:0
@@ -9972,7 +9972,7 @@ msgstr "Comptabilité analytique"
#. module: base
#: model:ir.model,name:base.model_ir_model_constraint
msgid "ir.model.constraint"
-msgstr ""
+msgstr "ir.model.constraint"
#. module: base
#: model:ir.module.module,shortdesc:base.module_web_graph
@@ -10015,7 +10015,7 @@ msgstr "Koweït"
#. module: base
#: model:ir.module.module,shortdesc:base.module_account_followup
msgid "Payment Follow-up Management"
-msgstr ""
+msgstr "Gestion des relances de paiement"
#. module: base
#: code:addons/orm.py:5334
@@ -10263,7 +10263,7 @@ msgstr "Dominique"
#. module: base
#: field:ir.translation,name:0
msgid "Translated field"
-msgstr ""
+msgstr "Champ traduit"
#. module: base
#: model:ir.module.module,shortdesc:base.module_stock_location
@@ -10283,7 +10283,7 @@ msgstr "Népal"
#. module: base
#: model:ir.module.module,shortdesc:base.module_document_page
msgid "Document Page"
-msgstr ""
+msgstr "Gestion documentaire de pages Web"
#. module: base
#: model:ir.module.module,shortdesc:base.module_l10n_ar
@@ -10293,7 +10293,7 @@ msgstr ""
#. module: base
#: field:ir.module.module,description_html:0
msgid "Description HTML"
-msgstr ""
+msgstr "Description HTML"
#. module: base
#: help:res.groups,implied_ids:0
@@ -10304,7 +10304,7 @@ msgstr ""
#. module: base
#: model:ir.module.module,summary:base.module_note
msgid "Sticky notes, Collaborative, Memos"
-msgstr ""
+msgstr "Notes repositionnables, collaboratif, mémos"
#. module: base
#: model:ir.module.module,shortdesc:base.module_hr_attendance
@@ -10451,7 +10451,7 @@ msgstr "Slovène / slovenščina"
#. module: base
#: field:res.currency,position:0
msgid "Symbol Position"
-msgstr ""
+msgstr "Position du symbole"
#. module: base
#: model:ir.module.module,description:base.module_l10n_de
@@ -10489,7 +10489,7 @@ msgstr ""
#. module: base
#: view:base.language.export:0
msgid "documentation"
-msgstr ""
+msgstr "documentation"
#. module: base
#: help:ir.model,osv_memory:0
@@ -10535,7 +10535,7 @@ msgstr "%b - Abréviation du nom du mois."
#: code:addons/base/ir/ir_model.py:730
#, python-format
msgid "Sorry, you are not allowed to delete this document."
-msgstr ""
+msgstr "Désolé, vous n’êtes pas autorisé à supprimer ce document."
#. module: base
#: constraint:ir.rule:0
@@ -10608,7 +10608,7 @@ msgstr "Samoa américaines"
#. module: base
#: view:ir.attachment:0
msgid "My Document(s)"
-msgstr ""
+msgstr "Mes documents"
#. module: base
#: help:ir.actions.act_window,res_model:0
@@ -10685,12 +10685,12 @@ msgstr ""
#. module: base
#: model:res.partner.category,name:base.res_partner_category_5
msgid "Silver"
-msgstr ""
+msgstr "Argent"
#. module: base
#: field:res.partner.title,shortcut:0
msgid "Abbreviation"
-msgstr ""
+msgstr "Abréviation"
#. module: base
#: model:ir.ui.menu,name:base.menu_crm_case_job_req_main
@@ -10893,7 +10893,7 @@ msgstr ""
#. module: base
#: model:ir.module.category,name:base.module_category_warehouse_management
msgid "Warehouse"
-msgstr ""
+msgstr "Entrepôt"
#. module: base
#: field:ir.exports,resource:0
@@ -10994,6 +10994,19 @@ msgid ""
"Thank you in advance for your cooperation.\n"
"Best Regards,"
msgstr ""
+"Madame, Monsieur,\n"
+"\n"
+"D'après nos relevés, il semble que nous sommes encore en attente à ce jour "
+"de paiements de votre part, dont les détails sont indiqués ci-dessous.\n"
+"Si ces sommes ont déjà été réglées, vous pouvez ignorer ce rappel. Dans le "
+"cas contraire, nous vous remercions de bien vouloir nous faire parvenir "
+"votre règlement.\n"
+"Si vous avez d'autres questions concernant votre compte, vous pouvez nous "
+"contacter directement.\n"
+"\n"
+"En vous remerciant par avance.\n"
+"\n"
+"Cordialement,"
#. module: base
#: view:ir.module.category:0
@@ -11163,7 +11176,7 @@ msgstr "Modèles"
#: code:addons/base/module/module.py:499
#, python-format
msgid "The `base` module cannot be uninstalled"
-msgstr ""
+msgstr "Le module \"base\" ne peut pas être désinstallé"
#. module: base
#: code:addons/base/ir/ir_cron.py:254
@@ -11190,7 +11203,7 @@ msgstr "osv_memory.autovacuum"
#: code:addons/base/ir/ir_model.py:729
#, python-format
msgid "Sorry, you are not allowed to create this kind of document."
-msgstr ""
+msgstr "Désolé, vous n'êtes pas autorisé à créer ce type de document."
#. module: base
#: field:base.language.export,lang:0
@@ -11232,7 +11245,7 @@ msgstr "%H - Heure (Affichage 24h) [00,23]."
#. module: base
#: field:ir.model.fields,on_delete:0
msgid "On Delete"
-msgstr ""
+msgstr "En cas de suppression"
#. module: base
#: code:addons/base/ir/ir_model.py:348
diff --git a/openerp/addons/base/i18n/id.po b/openerp/addons/base/i18n/id.po
index 30be59c85ee..c4c3917579e 100644
--- a/openerp/addons/base/i18n/id.po
+++ b/openerp/addons/base/i18n/id.po
@@ -8,14 +8,14 @@ msgstr ""
"Project-Id-Version: openobject-server\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2013-03-07 08:36+0000\n"
-"PO-Revision-Date: 2012-12-21 23:09+0000\n"
-"Last-Translator: FULL NAME \n"
+"PO-Revision-Date: 2013-05-13 05:49+0000\n"
+"Last-Translator: David Leonardi \n"
"Language-Team: Indonesian \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-03-08 05:18+0000\n"
-"X-Generator: Launchpad (build 16523)\n"
+"X-Launchpad-Export-Date: 2013-05-14 06:25+0000\n"
+"X-Generator: Launchpad (build 16617)\n"
#. module: base
#: model:ir.module.module,description:base.module_account_check_writing
@@ -25,6 +25,9 @@ msgid ""
"================================================\n"
" "
msgstr ""
+"\n"
+"Modul untuk menulis dan mencetak Cek\n"
+" "
#. module: base
#: view:res.partner.bank:0
@@ -63,7 +66,7 @@ msgstr "Arsitektur View"
#. module: base
#: model:ir.module.module,summary:base.module_sale_stock
msgid "Quotation, Sale Orders, Delivery & Invoicing Control"
-msgstr ""
+msgstr "Kontrol Penawaran, Pesanan Penjualan, Pengiriman & Faktur"
#. module: base
#: selection:ir.sequence,implementation:0
diff --git a/openerp/addons/base/i18n/lt.po b/openerp/addons/base/i18n/lt.po
index 7f59c2daa5e..61f5a4004ac 100644
--- a/openerp/addons/base/i18n/lt.po
+++ b/openerp/addons/base/i18n/lt.po
@@ -8,14 +8,14 @@ msgstr ""
"Project-Id-Version: openobject-server\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2013-03-07 08:36+0000\n"
-"PO-Revision-Date: 2013-04-30 16:23+0000\n"
-"Last-Translator: Giedrius Slavinskas - inovera.lt \n"
+"PO-Revision-Date: 2013-05-07 09:54+0000\n"
+"Last-Translator: Paulius Sladkevičius \n"
"Language-Team: Lithuanian \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-05-01 05:14+0000\n"
-"X-Generator: Launchpad (build 16580)\n"
+"X-Launchpad-Export-Date: 2013-05-08 06:17+0000\n"
+"X-Generator: Launchpad (build 16598)\n"
#. module: base
#: model:ir.module.module,description:base.module_account_check_writing
@@ -9665,7 +9665,7 @@ msgstr ""
#. module: base
#: model:ir.module.module,shortdesc:base.module_purchase
msgid "Purchase Management"
-msgstr ""
+msgstr "Pirkimų valdymas"
#. module: base
#: field:ir.module.module,published_version:0
diff --git a/openerp/addons/base/i18n/ro.po b/openerp/addons/base/i18n/ro.po
index 7dd438d24e3..fc05e36310f 100644
--- a/openerp/addons/base/i18n/ro.po
+++ b/openerp/addons/base/i18n/ro.po
@@ -8,14 +8,14 @@ msgstr ""
"Project-Id-Version: openobject-server\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2013-03-07 08:36+0000\n"
-"PO-Revision-Date: 2013-04-13 15:04+0000\n"
+"PO-Revision-Date: 2013-05-07 16:32+0000\n"
"Last-Translator: Dorin \n"
"Language-Team: Romanian \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-04-14 05:49+0000\n"
-"X-Generator: Launchpad (build 16564)\n"
+"X-Launchpad-Export-Date: 2013-05-08 06:17+0000\n"
+"X-Generator: Launchpad (build 16598)\n"
#. module: base
#: model:ir.module.module,description:base.module_account_check_writing
@@ -1631,7 +1631,7 @@ msgstr "Uganda"
#. module: base
#: field:ir.model.access,perm_unlink:0
msgid "Delete Access"
-msgstr "Ștergeti accesul"
+msgstr "Acces Ștergere"
#. module: base
#: model:res.country,name:base.ne
@@ -8876,7 +8876,7 @@ msgstr ""
#. module: base
#: field:ir.model.access,perm_create:0
msgid "Create Access"
-msgstr "Creeaza Acces"
+msgstr "Acces Creare"
#. module: base
#: model:ir.module.module,description:base.module_hr_timesheet
From a4c6c62e75966f6bd58dcaab593c944c76a7fe45 Mon Sep 17 00:00:00 2001
From: Cedric Snauwaert
Date: Tue, 14 May 2013 11:19:14 +0200
Subject: [PATCH 096/210] [FIX]stock: remove message from chatter, useless
since information appears with tracking state and change view so that
schedule date appears when product hasn't been received and date of reception
appears when it has been received
bzr revid: csn@openerp.com-20130514091914-rod821mkj7v4s97c
---
addons/stock/stock.py | 32 +-------------------------------
addons/stock/stock_view.xml | 4 ++--
2 files changed, 3 insertions(+), 33 deletions(-)
diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index bacea01968f..fca3d9ff073 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -29,7 +29,7 @@ from openerp.osv import fields, osv
from openerp.tools.translate import _
from openerp import netsvc
from openerp import tools
-from openerp.tools import float_compare, DEFAULT_SERVER_DATETIME_FORMAT, server_to_local_timestamp
+from openerp.tools import float_compare, DEFAULT_SERVER_DATETIME_FORMAT
import openerp.addons.decimal_precision as dp
import logging
_logger = logging.getLogger(__name__)
@@ -2334,32 +2334,6 @@ class stock_move(osv.osv):
'line_id': move_lines,
'ref': move.picking_id and move.picking_id.name})
- #Should be add in server/tools/misc.py in trunk
- def server_to_local_timestamp_info(self, str_date, src_format, context=None):
- """
- Convert a source timestamp string into a destination timestamp string, attempting to apply the
- correct offset if both the server and local timezone are recognized, or no
- offset at all if they aren't.
- This will return a string representing the date in the timezone of the user with the details of
- which timezone is used (for example UTC+0200 (CEST))
-
- @param src_date: the str value containing the timestamp in the server timezone.
- @param src_format: the format to use when parsing the server timestamp.
- @param context: context to be used (should contain the user local timezone)
-
- @return local/client formatted timestamp, expressed in the local/client timezone if possible
- and add information about that timezone.
- example: str_date = '2013-03-10 10:35:00' (if server timezone is UTC), if user is in UTC+0200
- return: '2013-03-10 10:35:00 UTC+0200 (CEST)'
- """
- if not str_date:
- return False
- if not context:
- context = {}
- dst_format = src_format + ' UTC%z (%Z)'
- return server_to_local_timestamp(str_date, src_format, dst_format, context.get('tz') or 'UTC')
-
-
def action_done(self, cr, uid, ids, context=None):
""" Makes the move done and if all moves are done, it will finish the picking.
@return:
@@ -2385,10 +2359,6 @@ class stock_move(osv.osv):
if move.picking_id:
picking_ids.append(move.picking_id.id)
- #add a message in chatter to say that product has been received
- user_time = self.server_to_local_timestamp_info(fields.datetime.now(), DEFAULT_SERVER_DATETIME_FORMAT, context=context)
- message = _('Product \'%s\' has been received at \'%s\'') % (move.name, user_time)
- move.picking_id.message_post(body = message)
if move.move_dest_id.id and (move.state != 'done'):
# Downstream move should only be triggered if this move is the last pending upstream move
other_upstream_move_ids = self.search(cr, uid, [('id','!=',move.id),('state','not in',['done','cancel']),
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index 5865ad31994..3c3967e2e2e 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -1252,8 +1252,8 @@
-
-
+
+
From c8c298c83cfd337a7ce304c68fb9c2df48d0e9a5 Mon Sep 17 00:00:00 2001
From: Martin Trigaux
Date: Tue, 14 May 2013 12:31:13 +0200
Subject: [PATCH 097/210] [IMP] clean permissions and shebang in files
bzr revid: mat@openerp.com-20130514103113-8idhvhokt0e8jzea
---
addons/account/wizard/pos_box.py | 1 -
addons/auth_openid/res_users.py | 1 -
addons/auth_openid/utils.py | 1 -
addons/base_report_designer/openerp_sxw2rml/openerp_sxw2rml.py | 0
addons/document/odt2txt.py | 0
addons/document_webdav/test_davclient.py | 1 -
addons/email_template/html2text.py | 0
addons/hr_payroll/report/__init__.py | 1 -
addons/hr_payroll/report/report_contribution_register.py | 1 -
addons/hr_payroll/report/report_payslip.py | 1 -
addons/hr_payroll/report/report_payslip_details.py | 1 -
addons/l10n_fr_hr_payroll/report/__init__.py | 1 -
addons/l10n_in_hr_payroll/report/__init__.py | 1 -
addons/mail/static/scripts/openerp_mailgate.py | 0
addons/pad/py_etherpad/__init__.py | 1 -
addons/point_of_sale/res_partner.py | 1 -
addons/point_of_sale/res_users.py | 1 -
addons/point_of_sale/wizard/pos_box.py | 1 -
addons/point_of_sale/wizard/pos_session_opening.py | 1 -
19 files changed, 15 deletions(-)
mode change 100644 => 100755 addons/base_report_designer/openerp_sxw2rml/openerp_sxw2rml.py
mode change 100644 => 100755 addons/document/odt2txt.py
mode change 100644 => 100755 addons/email_template/html2text.py
mode change 100644 => 100755 addons/mail/static/scripts/openerp_mailgate.py
diff --git a/addons/account/wizard/pos_box.py b/addons/account/wizard/pos_box.py
index 49178dfd3ea..c884f1bbe78 100644
--- a/addons/account/wizard/pos_box.py
+++ b/addons/account/wizard/pos_box.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
from openerp.osv import fields, osv
import openerp.addons.decimal_precision as dp
from openerp.tools.translate import _
diff --git a/addons/auth_openid/res_users.py b/addons/auth_openid/res_users.py
index feea2d8d396..79d86a1bac3 100644
--- a/addons/auth_openid/res_users.py
+++ b/addons/auth_openid/res_users.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/auth_openid/utils.py b/addons/auth_openid/utils.py
index 806198f99c2..0474e23fe4b 100644
--- a/addons/auth_openid/utils.py
+++ b/addons/auth_openid/utils.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/base_report_designer/openerp_sxw2rml/openerp_sxw2rml.py b/addons/base_report_designer/openerp_sxw2rml/openerp_sxw2rml.py
old mode 100644
new mode 100755
diff --git a/addons/document/odt2txt.py b/addons/document/odt2txt.py
old mode 100644
new mode 100755
diff --git a/addons/document_webdav/test_davclient.py b/addons/document_webdav/test_davclient.py
index 058dc1c748d..76a5e4514b3 100644
--- a/addons/document_webdav/test_davclient.py
+++ b/addons/document_webdav/test_davclient.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
# -*- encoding: utf-8 -*-
#
# Copyright P. Christeas 2008,2009
diff --git a/addons/email_template/html2text.py b/addons/email_template/html2text.py
old mode 100644
new mode 100755
diff --git a/addons/hr_payroll/report/__init__.py b/addons/hr_payroll/report/__init__.py
index 8de2f51d18f..e5b8dea8e48 100644
--- a/addons/hr_payroll/report/__init__.py
+++ b/addons/hr_payroll/report/__init__.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
#-*- coding:utf-8 -*-
##############################################################################
diff --git a/addons/hr_payroll/report/report_contribution_register.py b/addons/hr_payroll/report/report_contribution_register.py
index 39c913adada..72500a9c6c9 100644
--- a/addons/hr_payroll/report/report_contribution_register.py
+++ b/addons/hr_payroll/report/report_contribution_register.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
#-*- coding:utf-8 -*-
##############################################################################
diff --git a/addons/hr_payroll/report/report_payslip.py b/addons/hr_payroll/report/report_payslip.py
index 8ed91bd9a82..3e1dc2b1966 100644
--- a/addons/hr_payroll/report/report_payslip.py
+++ b/addons/hr_payroll/report/report_payslip.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
#-*- coding:utf-8 -*-
##############################################################################
diff --git a/addons/hr_payroll/report/report_payslip_details.py b/addons/hr_payroll/report/report_payslip_details.py
index 1251fedd826..6b561b8d688 100644
--- a/addons/hr_payroll/report/report_payslip_details.py
+++ b/addons/hr_payroll/report/report_payslip_details.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
#-*- coding:utf-8 -*-
##############################################################################
diff --git a/addons/l10n_fr_hr_payroll/report/__init__.py b/addons/l10n_fr_hr_payroll/report/__init__.py
index 40d2ccc3c05..d6c9481579e 100644
--- a/addons/l10n_fr_hr_payroll/report/__init__.py
+++ b/addons/l10n_fr_hr_payroll/report/__init__.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
#-*- coding:utf-8 -*-
##############################################################################
diff --git a/addons/l10n_in_hr_payroll/report/__init__.py b/addons/l10n_in_hr_payroll/report/__init__.py
index 8a20170c384..e76f45b69c0 100644
--- a/addons/l10n_in_hr_payroll/report/__init__.py
+++ b/addons/l10n_in_hr_payroll/report/__init__.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
#-*- coding:utf-8 -*-
##############################################################################
diff --git a/addons/mail/static/scripts/openerp_mailgate.py b/addons/mail/static/scripts/openerp_mailgate.py
old mode 100644
new mode 100755
diff --git a/addons/pad/py_etherpad/__init__.py b/addons/pad/py_etherpad/__init__.py
index 6af310b48aa..0db607fe16f 100644
--- a/addons/pad/py_etherpad/__init__.py
+++ b/addons/pad/py_etherpad/__init__.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
"""Module to talk to EtherpadLite API."""
import json
diff --git a/addons/point_of_sale/res_partner.py b/addons/point_of_sale/res_partner.py
index 81a0f6083be..d7969b0e21a 100644
--- a/addons/point_of_sale/res_partner.py
+++ b/addons/point_of_sale/res_partner.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
import math
diff --git a/addons/point_of_sale/res_users.py b/addons/point_of_sale/res_users.py
index 05e49a5545d..ed2c6fae598 100644
--- a/addons/point_of_sale/res_users.py
+++ b/addons/point_of_sale/res_users.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
import math
diff --git a/addons/point_of_sale/wizard/pos_box.py b/addons/point_of_sale/wizard/pos_box.py
index 776d962a3a8..b8354666919 100644
--- a/addons/point_of_sale/wizard/pos_box.py
+++ b/addons/point_of_sale/wizard/pos_box.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
from openerp.osv import osv, fields
from openerp.tools.translate import _
diff --git a/addons/point_of_sale/wizard/pos_session_opening.py b/addons/point_of_sale/wizard/pos_session_opening.py
index 1aa4cb702c4..355cd407d14 100644
--- a/addons/point_of_sale/wizard/pos_session_opening.py
+++ b/addons/point_of_sale/wizard/pos_session_opening.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
from openerp import netsvc
from openerp.osv import osv, fields
From 8ecd022348ec5e952bcac9398b3bcb5772c8f7ae Mon Sep 17 00:00:00 2001
From: Martin Trigaux
Date: Tue, 14 May 2013 12:33:33 +0200
Subject: [PATCH 098/210] [IMP] clean permissions and shebang in files
bzr revid: mat@openerp.com-20130514103333-puuj4kmxq3bwzwec
---
history/check_profile_l10n_all.py | 1 -
openerp/addons/base_quality_interrogation.py | 1 +
openerp/cli/server.py | 1 -
openerp/netsvc.py | 1 -
openerp/osv/expression.py | 1 -
openerp/service/cron.py | 1 -
6 files changed, 1 insertion(+), 5 deletions(-)
diff --git a/history/check_profile_l10n_all.py b/history/check_profile_l10n_all.py
index 5c1c1fa9bca..e7b391a942a 100644
--- a/history/check_profile_l10n_all.py
+++ b/history/check_profile_l10n_all.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
# -*- coding: utf-8 -*-
##############################################################################
#
diff --git a/openerp/addons/base_quality_interrogation.py b/openerp/addons/base_quality_interrogation.py
index 1795db7e13f..085d91f3db6 100755
--- a/openerp/addons/base_quality_interrogation.py
+++ b/openerp/addons/base_quality_interrogation.py
@@ -1,3 +1,4 @@
+#!/usr/bin/env python
# -*- coding: utf-8 -*-
##############################################################################
#
diff --git a/openerp/cli/server.py b/openerp/cli/server.py
index 549b6529aa5..943ce9a53a8 100644
--- a/openerp/cli/server.py
+++ b/openerp/cli/server.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
# -*- coding: utf-8 -*-
##############################################################################
#
diff --git a/openerp/netsvc.py b/openerp/netsvc.py
index 9495cecd6fb..d96449cbf2b 100644
--- a/openerp/netsvc.py
+++ b/openerp/netsvc.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
# -*- coding: utf-8 -*-
##############################################################################
#
diff --git a/openerp/osv/expression.py b/openerp/osv/expression.py
index 8d0e9376277..58f35149ddd 100644
--- a/openerp/osv/expression.py
+++ b/openerp/osv/expression.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
# -*- coding: utf-8 -*-
##############################################################################
#
diff --git a/openerp/service/cron.py b/openerp/service/cron.py
index 773191d0095..a20c8fc603f 100644
--- a/openerp/service/cron.py
+++ b/openerp/service/cron.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
# -*- coding: utf-8 -*-
##############################################################################
#
From eb90dd937077aa5e5dd0b1b36fa0655b45f2a97f Mon Sep 17 00:00:00 2001
From: Martin Trigaux
Date: Tue, 14 May 2013 12:37:36 +0200
Subject: [PATCH 099/210] [IMP] clean permissions and shebang in files
bzr revid: mat@openerp.com-20130514103736-kfuk3nutvezyo7l0
---
addons/web/session.py | 1 -
addons/web/static/lib/jquery.placeholder/jquery.placeholder.js | 0
addons/web/static/src/font/entypo-webfont.svg | 0
addons/web/static/src/font/mnmliconsv21-webfont.svg | 0
addons/web_calendar/__init__.py | 1 -
addons/web_gantt/__init__.py | 1 -
addons/web_hello/__init__.py | 1 -
7 files changed, 4 deletions(-)
mode change 100755 => 100644 addons/web/static/lib/jquery.placeholder/jquery.placeholder.js
mode change 100755 => 100644 addons/web/static/src/font/entypo-webfont.svg
mode change 100755 => 100644 addons/web/static/src/font/mnmliconsv21-webfont.svg
diff --git a/addons/web/session.py b/addons/web/session.py
index 8a083e0dec9..0104c68f9f9 100644
--- a/addons/web/session.py
+++ b/addons/web/session.py
@@ -1,4 +1,3 @@
-#!/usr/bin/python
import datetime
import babel
import dateutil.relativedelta
diff --git a/addons/web/static/lib/jquery.placeholder/jquery.placeholder.js b/addons/web/static/lib/jquery.placeholder/jquery.placeholder.js
old mode 100755
new mode 100644
diff --git a/addons/web/static/src/font/entypo-webfont.svg b/addons/web/static/src/font/entypo-webfont.svg
old mode 100755
new mode 100644
diff --git a/addons/web/static/src/font/mnmliconsv21-webfont.svg b/addons/web/static/src/font/mnmliconsv21-webfont.svg
old mode 100755
new mode 100644
diff --git a/addons/web_calendar/__init__.py b/addons/web_calendar/__init__.py
index 013e4b7ec4e..e69de29bb2d 100644
--- a/addons/web_calendar/__init__.py
+++ b/addons/web_calendar/__init__.py
@@ -1 +0,0 @@
-#!/usr/bin/python
diff --git a/addons/web_gantt/__init__.py b/addons/web_gantt/__init__.py
index 013e4b7ec4e..e69de29bb2d 100644
--- a/addons/web_gantt/__init__.py
+++ b/addons/web_gantt/__init__.py
@@ -1 +0,0 @@
-#!/usr/bin/python
diff --git a/addons/web_hello/__init__.py b/addons/web_hello/__init__.py
index 013e4b7ec4e..e69de29bb2d 100644
--- a/addons/web_hello/__init__.py
+++ b/addons/web_hello/__init__.py
@@ -1 +0,0 @@
-#!/usr/bin/python
From 5a367b4c9a453eb532157bbc3cb05a9574ee07b6 Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)"
Date: Tue, 14 May 2013 13:52:13 +0200
Subject: [PATCH 100/210] [IMP] account_voucher, usability: added
currency_help_label to help at the understanding when using the payment rate
fields
bzr revid: qdp-launchpad@openerp.com-20130514115213-cklf7s6r889ahen7
---
addons/account_voucher/account_voucher.py | 36 +++++++++++++++++--
.../voucher_payment_receipt_view.xml | 28 +++++++++++----
.../voucher_sales_purchase_view.xml | 6 ++--
3 files changed, 59 insertions(+), 11 deletions(-)
diff --git a/addons/account_voucher/account_voucher.py b/addons/account_voucher/account_voucher.py
index 322d9dab6d5..bbd8976f36c 100644
--- a/addons/account_voucher/account_voucher.py
+++ b/addons/account_voucher/account_voucher.py
@@ -27,6 +27,7 @@ from openerp.osv import fields, osv
import openerp.addons.decimal_precision as dp
from openerp.tools.translate import _
from openerp.tools import float_compare
+from openerp.report import report_sxw
class res_currency(osv.osv):
_inherit = "res.currency"
@@ -293,6 +294,36 @@ class account_voucher(osv.osv):
res[voucher.id] = self.pool.get('res.currency').compute(cr, uid, voucher.currency_id.id, voucher.company_id.currency_id.id, voucher.amount, context=ctx)
return res
+ def _get_currency_help_label(self, cr, uid, currency_id, payment_rate, payment_rate_currency_id, context=None):
+ """
+ This function builds a string to help the users to understand the behavior of the payment rate fields they can specify on the voucher.
+ This string is only used to improve the usability in the voucher form view and has no other effect.
+
+ :param currency_id: the voucher currency
+ :type currency_id: integer
+ :param payment_rate: the value of the payment_rate field of the voucher
+ :type payment_rate: float
+ :param payment_rate_currency_id: the value of the payment_rate_currency_id field of the voucher
+ :type payment_rate_currency_id: integer
+ :return: translated string giving a tip on what's the effect of the current payment rate specified
+ :rtype: str
+ """
+ rml_parser = report_sxw.rml_parse(cr, uid, 'currency_help_label', context=context)
+ currency_pool = self.pool.get('res.currency')
+ currency_str = payment_rate_str = ''
+ if currency_id:
+ currency_str = rml_parser.formatLang(1, currency_obj=currency_pool.browse(cr, uid, currency_id, context=context))
+ if payment_rate_currency_id:
+ payment_rate_str = rml_parser.formatLang(payment_rate, currency_obj=currency_pool.browse(cr, uid, payment_rate_currency_id, context=context))
+ currency_help_label = _('At the operation date, the exchange rate was\n%s = %s') % (currency_str, payment_rate_str)
+ return currency_help_label
+
+ def _fnct_currency_help_label(self, cr, uid, ids, name, args, context=None):
+ res = {}
+ for voucher in self.browse(cr, uid, ids, context=context):
+ res[voucher.id] = self._get_currency_help_label(cr, uid, voucher.currency_id.id, voucher.payment_rate, voucher.payment_rate_currency_id.id, context=context)
+ return res
+
_name = 'account.voucher'
_description = 'Accounting Voucher'
_inherit = ['mail.thread']
@@ -364,6 +395,7 @@ class account_voucher(osv.osv):
help='The specific rate that will be used, in this voucher, between the selected currency (in \'Payment Rate Currency\' field) and the voucher currency.'),
'paid_amount_in_company_currency': fields.function(_paid_amount_in_company_currency, string='Paid Amount in Company Currency', type='float', readonly=True),
'is_multi_currency': fields.boolean('Multi Currency Voucher', help='Fields with internal purpose only that depicts if the voucher is a multi currency one or not'),
+ 'currency_help_label': fields.function(_fnct_currency_help_label, type='text', string="Helping Sentence", help="This sentence helps you to know how to specify the payment rate by giving you the direct effect it has"),
}
_defaults = {
'active': True,
@@ -536,7 +568,7 @@ class account_voucher(osv.osv):
return default
def onchange_rate(self, cr, uid, ids, rate, amount, currency_id, payment_rate_currency_id, company_id, context=None):
- res = {'value': {'paid_amount_in_company_currency': amount}}
+ res = {'value': {'paid_amount_in_company_currency': amount, 'currency_help_label': self._get_currency_help_label(cr, uid, currency_id, rate, payment_rate_currency_id, context=context)}}
if rate and amount and currency_id:
company_currency = self.pool.get('res.company').browse(cr, uid, company_id, context=context).currency_id
#context should contain the date, the payment currency and the payment rate specified on the voucher
@@ -815,7 +847,7 @@ class account_voucher(osv.osv):
if context is None:
context = {}
res = {'value': {}}
- if currency_id and currency_id == payment_rate_currency_id:
+ if currency_id:
#set the default payment rate of the voucher and compute the paid amount in company currency
ctx = context.copy()
ctx.update({'date': date})
diff --git a/addons/account_voucher/voucher_payment_receipt_view.xml b/addons/account_voucher/voucher_payment_receipt_view.xml
index e7296a6670f..dea94d59f4e 100644
--- a/addons/account_voucher/voucher_payment_receipt_view.xml
+++ b/addons/account_voucher/voucher_payment_receipt_view.xml
@@ -46,6 +46,9 @@
+
+
+
account.voucher.payment.low.priority.formaccount.voucher
@@ -119,6 +122,7 @@
+
account.voucher.payment.formaccount.voucher
@@ -193,12 +197,16 @@
-
-
+
+
-
-
-
+
+
+
diff --git a/addons/account_voucher/voucher_sales_purchase_view.xml b/addons/account_voucher/voucher_sales_purchase_view.xml
index ca7e46053b4..dc732129803 100644
--- a/addons/account_voucher/voucher_sales_purchase_view.xml
+++ b/addons/account_voucher/voucher_sales_purchase_view.xml
@@ -147,8 +147,9 @@
-
-
+
+
+
@@ -243,6 +244,7 @@
on_change="onchange_journal(journal_id, line_dr_ids, tax_id, partner_id, date, amount, type, company_id, context)"
groups="account.group_account_user"/>
+
From 7c1353a1e4d6f82bb54c5a0b28ea38f544085aa9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?=
Date: Tue, 14 May 2013 13:15:59 +0200
Subject: [PATCH 101/210] [FIX] portal_project_long_term: fixed access right
using a non-existing field.
bzr revid: tde@openerp.com-20130514111559-az39rnmrow5v30oi
---
.../security/portal_security.xml | 9 +--------
1 file changed, 1 insertion(+), 8 deletions(-)
diff --git a/addons/portal_project_long_term/security/portal_security.xml b/addons/portal_project_long_term/security/portal_security.xml
index eab70ebe734..cd3f591df0c 100644
--- a/addons/portal_project_long_term/security/portal_security.xml
+++ b/addons/portal_project_long_term/security/portal_security.xml
@@ -5,14 +5,7 @@
Project/Phase: portal users: public or portal and following
- ['|',
- ('project_id.privacy_visibility', '=', 'public'),
- '&',
- ('project_id.privacy_visibility', 'in', ['portal', 'followers']),
- '|',
- ('message_follower_ids','in', [user.partner_id.id]),
- ('user_id', '=', user.id),
- ]
+ [('project_id.privacy_visibility', 'in', ['public', 'portal'])]
From 1e03e6df7806619cc753fb9740146f276b116ed3 Mon Sep 17 00:00:00 2001
From: Cedric Snauwaert
Date: Tue, 14 May 2013 13:31:00 +0200
Subject: [PATCH 102/210] [FIX]res_partner: change fields selection of tz so
that timezone starting with Etc/ are at the end of the selection, that way
it's less confusing for the users.
bzr revid: csn@openerp.com-20130514113100-h2oihowcplaba10j
---
openerp/addons/base/res/res_partner.py | 12 +++++++++++-
1 file changed, 11 insertions(+), 1 deletion(-)
diff --git a/openerp/addons/base/res/res_partner.py b/openerp/addons/base/res/res_partner.py
index fb4387fb3ae..fa31e26375c 100644
--- a/openerp/addons/base/res/res_partner.py
+++ b/openerp/addons/base/res/res_partner.py
@@ -74,7 +74,17 @@ class format_address(object):
def _tz_get(self,cr,uid, context=None):
- return [(x, x) for x in pytz.all_timezones]
+ #the timezone with name Etc/GMT+x are different than GMT+x, Etc/GMT+x actually is UTC-x and not UTC+x
+ #not a bug but an historical fact. Can be confusing, so we put those at the end of the list so that
+ #user won't get to much confused if they find in the list their country first
+ tz = []
+ etc_tz = []
+ for x in pytz.all_timezones:
+ if x.startswith('Etc/'):
+ etc_tz.append((x, x))
+ else:
+ tz.append((x, x))
+ return tz+etc_tz
class res_partner_category(osv.osv):
From 18ad74bef3ceae6d1eb7f38d99c75c452fb96316 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?=
Date: Tue, 14 May 2013 13:38:59 +0200
Subject: [PATCH 103/210] [FIX] portal: mail_message: fixed wrong condition for
check_access_rule introduced at revision 9117. Added tests by the way.
bzr revid: tde@openerp.com-20130514113859-3yucygu3pkav7qbt
---
addons/portal/mail_message.py | 2 +-
addons/portal/tests/test_portal.py | 7 +++++++
2 files changed, 8 insertions(+), 1 deletion(-)
diff --git a/addons/portal/mail_message.py b/addons/portal/mail_message.py
index d5acfdf74c1..d6a38f27378 100644
--- a/addons/portal/mail_message.py
+++ b/addons/portal/mail_message.py
@@ -48,7 +48,7 @@ class mail_message(osv.Model):
group_ids = self.pool.get('res.users').browse(cr, uid, uid, context=context).groups_id
group_user_id = self.pool.get("ir.model.data").get_object_reference(cr, uid, 'base', 'group_user')[1]
if group_user_id not in [group.id for group in group_ids]:
- cr.execute('SELECT DISTINCT id FROM "%s" WHERE type = %%s AND subtype_id != NULL AND id = ANY (%%s)' % (self._table), ('comment', ids,))
+ cr.execute('SELECT DISTINCT id FROM "%s" WHERE type = %%s AND subtype_id IS NULL AND id = ANY (%%s)' % (self._table), ('comment', ids,))
if cr.fetchall():
raise orm.except_orm(_('Access Denied'),
_('The requested operation cannot be completed due to security restrictions. Please contact your system administrator.\n\n(Document type: %s, Operation: %s)') % \
diff --git a/addons/portal/tests/test_portal.py b/addons/portal/tests/test_portal.py
index 1cfb2aef269..c0b5709ac4f 100644
--- a/addons/portal/tests/test_portal.py
+++ b/addons/portal/tests/test_portal.py
@@ -150,3 +150,10 @@ class test_portal(TestMailBase):
msg_ids = self.mail_message.search(cr, self.user_chell_id, [('model', '=', 'mail.group'), ('res_id', '=', group_port_id)])
self.assertEqual(set(msg_ids), set([msg1_id, msg2_id, msg3_id, msg5_id]),
'mail_message: portal user has access to messages he should not read')
+
+ # Do: Chell read messages she can read
+ self.mail_message.read(cr, self.user_chell_id, msg_ids, ['body', 'type', 'subtype_id'])
+
+ # Do: Chell read a message she should not be able to read
+ with self.assertRaises(except_orm):
+ self.mail_message.read(cr, self.user_chell_id, [msg4_id], ['body', 'type', 'subtype_id'])
From 44d71fd38e847895589a61e82f120e11399acc17 Mon Sep 17 00:00:00 2001
From: Martin Trigaux
Date: Tue, 14 May 2013 13:40:45 +0200
Subject: [PATCH 104/210] [IMP] remove shebang
bzr revid: mat@openerp.com-20130514114045-b6xbkbjlp5bsm7h2
---
openerp-wsgi.py | 1 -
setup.py | 1 -
2 files changed, 2 deletions(-)
mode change 100755 => 100644 setup.py
diff --git a/openerp-wsgi.py b/openerp-wsgi.py
index 9ae18ffc69e..90f43ddab21 100644
--- a/openerp-wsgi.py
+++ b/openerp-wsgi.py
@@ -1,4 +1,3 @@
-#!/usr/bin/python
# WSGI Handler sample configuration file.
#
# Change the appropriate settings below, in order to provide the parameters
diff --git a/setup.py b/setup.py
old mode 100755
new mode 100644
index ae349d4241d..b53c9a47b31
--- a/setup.py
+++ b/setup.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
# -*- coding: utf-8 -*-
##############################################################################
#
From 60c0ad3992f3561365b446c4340c9035d4c46841 Mon Sep 17 00:00:00 2001
From: Martin Trigaux
Date: Tue, 14 May 2013 14:04:06 +0200
Subject: [PATCH 105/210] [FIX] fix FSF address
bzr revid: mat@openerp.com-20130514120406-mz9mo1cnif04pyz9
---
addons/web_calendar/static/lib/dhtmlxScheduler/license.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/addons/web_calendar/static/lib/dhtmlxScheduler/license.txt b/addons/web_calendar/static/lib/dhtmlxScheduler/license.txt
index 4a7d08c91e4..82120142269 100644
--- a/addons/web_calendar/static/lib/dhtmlxScheduler/license.txt
+++ b/addons/web_calendar/static/lib/dhtmlxScheduler/license.txt
@@ -5,7 +5,7 @@ Version 2, June 1991
Copyright (C) 1989, 1991 Free Software Foundation, Inc.
-59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
Everyone is permitted to copy and distribute verbatim copies
From 4eeac4015c6e00e10ba4e7e5566c0611faa14550 Mon Sep 17 00:00:00 2001
From: Martin Trigaux
Date: Tue, 14 May 2013 14:04:13 +0200
Subject: [PATCH 106/210] [FIX] fix FSF address
bzr revid: mat@openerp.com-20130514120413-r39mu6lsn04nh5zi
---
openerp/report/render/rml2html/rml2html.py | 2 +-
openerp/report/render/rml2html/utils.py | 2 +-
openerp/report/render/rml2pdf/utils.py | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/openerp/report/render/rml2html/rml2html.py b/openerp/report/render/rml2html/rml2html.py
index c80698150b8..8231c84dc36 100644
--- a/openerp/report/render/rml2html/rml2html.py
+++ b/openerp/report/render/rml2html/rml2html.py
@@ -16,7 +16,7 @@
#
# You should have received a copy of the GNU Lesser General Public
# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-13017 USA
#
##############################################################################
diff --git a/openerp/report/render/rml2html/utils.py b/openerp/report/render/rml2html/utils.py
index c40118477f8..8c180d398f9 100644
--- a/openerp/report/render/rml2html/utils.py
+++ b/openerp/report/render/rml2html/utils.py
@@ -16,7 +16,7 @@
#
# You should have received a copy of the GNU Lesser General Public
# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-13017 USA
#
##############################################################################
diff --git a/openerp/report/render/rml2pdf/utils.py b/openerp/report/render/rml2pdf/utils.py
index 79ae31ea755..bc3aa06135a 100644
--- a/openerp/report/render/rml2pdf/utils.py
+++ b/openerp/report/render/rml2pdf/utils.py
@@ -16,7 +16,7 @@
#
# You should have received a copy of the GNU Lesser General Public
# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-13017 USA
#
##############################################################################
From 7b8f704f90a52dee73a4e65ea51f842f16f05fc4 Mon Sep 17 00:00:00 2001
From: Martin Trigaux
Date: Tue, 14 May 2013 14:04:24 +0200
Subject: [PATCH 107/210] [FIX] fix FSF address
bzr revid: mat@openerp.com-20130514120424-xwjzdf3mufifl90d
---
addons/account/report/account_general_ledger.py | 2 +-
addons/account_test/account_test.py | 2 +-
.../plugin/openerp_report_designer/bin/script/About.py | 2 +-
.../plugin/openerp_report_designer/bin/script/AddAttachment.py | 2 +-
.../plugin/openerp_report_designer/bin/script/Change.py | 2 +-
.../openerp_report_designer/bin/script/ConvertBracesToField.py | 2 +-
.../openerp_report_designer/bin/script/ConvertFieldsToBraces.py | 2 +-
.../plugin/openerp_report_designer/bin/script/ExportToRML.py | 2 +-
.../plugin/openerp_report_designer/bin/script/Expression.py | 2 +-
.../plugin/openerp_report_designer/bin/script/Fields.py | 2 +-
.../plugin/openerp_report_designer/bin/script/LoginTest.py | 2 +-
.../openerp_report_designer/bin/script/ModifyExistingReport.py | 2 +-
.../plugin/openerp_report_designer/bin/script/NewReport.py | 2 +-
.../plugin/openerp_report_designer/bin/script/Repeatln.py | 2 +-
.../plugin/openerp_report_designer/bin/script/SendToServer.py | 2 +-
.../openerp_report_designer/bin/script/ServerParameter.py | 2 +-
.../plugin/openerp_report_designer/bin/script/Translation.py | 2 +-
.../plugin/openerp_report_designer/bin/script/__init__.py | 2 +-
.../plugin/openerp_report_designer/bin/script/compile_all.py | 2 +-
.../plugin/openerp_report_designer/bin/script/modify.py | 2 +-
addons/document_webdav/__openerp__.py | 2 +-
addons/document_webdav/test_davclient.py | 2 +-
addons/document_webdav/webdav_server.py | 2 +-
addons/l10n_ar/__init__.py | 2 +-
addons/l10n_bo/__init__.py | 2 +-
addons/l10n_cl/__init__.py | 2 +-
addons/l10n_fr/__init__.py | 2 +-
addons/l10n_fr/__openerp__.py | 2 +-
addons/l10n_fr/report/__init__.py | 2 +-
addons/l10n_fr/report/base_report.py | 2 +-
addons/l10n_fr/report/bilan_report.py | 2 +-
addons/l10n_fr/report/compute_resultant_report.py | 2 +-
addons/l10n_fr/wizard/__init__.py | 2 +-
addons/l10n_fr/wizard/fr_report_bilan.py | 2 +-
addons/l10n_fr/wizard/fr_report_compute_resultant.py | 2 +-
addons/l10n_nl/__init__.py | 2 +-
addons/l10n_nl/__openerp__.py | 2 +-
addons/l10n_pa/__init__.py | 2 +-
addons/l10n_pe/__init__.py | 2 +-
addons/report_webkit/__init__.py | 2 +-
addons/report_webkit/__openerp__.py | 2 +-
addons/report_webkit/company.py | 2 +-
addons/report_webkit/convert.py | 2 +-
addons/report_webkit/header.py | 2 +-
addons/report_webkit/ir_report.py | 2 +-
addons/report_webkit/report_helper.py | 2 +-
addons/report_webkit/webkit_report.py | 2 +-
addons/report_webkit/wizard/__init__.py | 2 +-
addons/report_webkit/wizard/report_webkit_actions.py | 2 +-
addons/resource/faces/observer.py | 2 +-
addons/resource/faces/pcalendar.py | 2 +-
addons/resource/faces/plocale.py | 2 +-
addons/resource/faces/resource.py | 2 +-
addons/resource/faces/task.py | 2 +-
addons/resource/faces/timescale.py | 2 +-
addons/resource/faces/utils.py | 2 +-
56 files changed, 56 insertions(+), 56 deletions(-)
diff --git a/addons/account/report/account_general_ledger.py b/addons/account/report/account_general_ledger.py
index 498cb1369a8..50ab732ea5f 100644
--- a/addons/account/report/account_general_ledger.py
+++ b/addons/account/report/account_general_ledger.py
@@ -23,7 +23,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#
##############################################################################
diff --git a/addons/account_test/account_test.py b/addons/account_test/account_test.py
index 7cea7b3afd6..3ed26556fd9 100644
--- a/addons/account_test/account_test.py
+++ b/addons/account_test/account_test.py
@@ -24,7 +24,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#
##############################################################################
diff --git a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/About.py b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/About.py
index 3ede2c5ae6a..e412a714f61 100644
--- a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/About.py
+++ b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/About.py
@@ -15,7 +15,7 @@
#
# You should have received a copy of the GNU Lesser General Public
# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-13017 USA
#
# See: http://www.gnu.org/licenses/lgpl.html
#
diff --git a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/AddAttachment.py b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/AddAttachment.py
index c7f743f916e..353be998710 100644
--- a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/AddAttachment.py
+++ b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/AddAttachment.py
@@ -15,7 +15,7 @@
#
# You should have received a copy of the GNU Lesser General Public
# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-13017 USA
#
# See: http://www.gnu.org/licenses/lgpl.html
#
diff --git a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/Change.py b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/Change.py
index cfea09c7163..82db7426b40 100644
--- a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/Change.py
+++ b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/Change.py
@@ -15,7 +15,7 @@
#
# You should have received a copy of the GNU Lesser General Public
# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-13017 USA
#
# See: http://www.gnu.org/licenses/lgpl.html
#
diff --git a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/ConvertBracesToField.py b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/ConvertBracesToField.py
index b84c94fcc75..9753592562b 100644
--- a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/ConvertBracesToField.py
+++ b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/ConvertBracesToField.py
@@ -15,7 +15,7 @@
#
# You should have received a copy of the GNU Lesser General Public
# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-13017 USA
#
# See: http://www.gnu.org/licenses/lgpl.html
#
diff --git a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/ConvertFieldsToBraces.py b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/ConvertFieldsToBraces.py
index e4e3f4ca31c..24db3a9ef82 100644
--- a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/ConvertFieldsToBraces.py
+++ b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/ConvertFieldsToBraces.py
@@ -15,7 +15,7 @@
#
# You should have received a copy of the GNU Lesser General Public
# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-13017 USA
#
# See: http://www.gnu.org/licenses/lgpl.html
#
diff --git a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/ExportToRML.py b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/ExportToRML.py
index c09bac21b3f..ffc74f91796 100644
--- a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/ExportToRML.py
+++ b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/ExportToRML.py
@@ -15,7 +15,7 @@
#
# You should have received a copy of the GNU Lesser General Public
# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-13017 USA
#
# See: http://www.gnu.org/licenses/lgpl.html
#
diff --git a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/Expression.py b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/Expression.py
index 9ba40432c6d..aae838ea302 100644
--- a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/Expression.py
+++ b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/Expression.py
@@ -15,7 +15,7 @@
#
# You should have received a copy of the GNU Lesser General Public
# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-13017 USA
#
# See: http://www.gnu.org/licenses/lgpl.html
#
diff --git a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/Fields.py b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/Fields.py
index edfc35e30ae..45695757799 100644
--- a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/Fields.py
+++ b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/Fields.py
@@ -15,7 +15,7 @@
#
# You should have received a copy of the GNU Lesser General Public
# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-13017 USA
#
# See: http://www.gnu.org/licenses/lgpl.html
#
diff --git a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/LoginTest.py b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/LoginTest.py
index c6d4b3733cd..f16ed3eb8b2 100644
--- a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/LoginTest.py
+++ b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/LoginTest.py
@@ -15,7 +15,7 @@
#
# You should have received a copy of the GNU Lesser General Public
# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-13017 USA
#
# See: http://www.gnu.org/licenses/lgpl.html
#
diff --git a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/ModifyExistingReport.py b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/ModifyExistingReport.py
index ff75e0bcd75..a70271f9285 100644
--- a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/ModifyExistingReport.py
+++ b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/ModifyExistingReport.py
@@ -15,7 +15,7 @@
#
# You should have received a copy of the GNU Lesser General Public
# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-13017 USA
#
# See: http://www.gnu.org/licenses/lgpl.html
#
diff --git a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/NewReport.py b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/NewReport.py
index 884e601b9ad..df339c771d7 100644
--- a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/NewReport.py
+++ b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/NewReport.py
@@ -15,7 +15,7 @@
#
# You should have received a copy of the GNU Lesser General Public
# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-13017 USA
#
# See: http://www.gnu.org/licenses/lgpl.html
#
diff --git a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/Repeatln.py b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/Repeatln.py
index 35e4966de84..4acca9e8e04 100644
--- a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/Repeatln.py
+++ b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/Repeatln.py
@@ -15,7 +15,7 @@
#
# You should have received a copy of the GNU Lesser General Public
# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-13017 USA
#
# See: http://www.gnu.org/licenses/lgpl.html
#
diff --git a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/SendToServer.py b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/SendToServer.py
index eec2131a8bf..f8f088ec181 100644
--- a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/SendToServer.py
+++ b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/SendToServer.py
@@ -15,7 +15,7 @@
#
# You should have received a copy of the GNU Lesser General Public
# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-13017 USA
#
# See: http://www.gnu.org/licenses/lgpl.html
#
diff --git a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/ServerParameter.py b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/ServerParameter.py
index b65fe403a80..2c763907a72 100644
--- a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/ServerParameter.py
+++ b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/ServerParameter.py
@@ -15,7 +15,7 @@
#
# You should have received a copy of the GNU Lesser General Public
# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-13017 USA
#
# See: http://www.gnu.org/licenses/lgpl.html
#
diff --git a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/Translation.py b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/Translation.py
index 0b513b1256d..b2c863e7395 100644
--- a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/Translation.py
+++ b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/Translation.py
@@ -15,7 +15,7 @@
#
# You should have received a copy of the GNU Lesser General Public
# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-13017 USA
#
# See: http://www.gnu.org/licenses/lgpl.html
#
diff --git a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/__init__.py b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/__init__.py
index 8c2545c6fdc..fdb0c078d7c 100644
--- a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/__init__.py
+++ b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/__init__.py
@@ -15,7 +15,7 @@
#
# You should have received a copy of the GNU Lesser General Public
# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-13017 USA
#
# See: http://www.gnu.org/licenses/lgpl.html
#
diff --git a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/compile_all.py b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/compile_all.py
index 05decaaab5d..9dd6ea68295 100644
--- a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/compile_all.py
+++ b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/compile_all.py
@@ -15,7 +15,7 @@
#
# You should have received a copy of the GNU Lesser General Public
# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-13017 USA
#
# See: http://www.gnu.org/licenses/lgpl.html
#
diff --git a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/modify.py b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/modify.py
index aed354771d1..7ea486a2f03 100644
--- a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/modify.py
+++ b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/modify.py
@@ -15,7 +15,7 @@
#
# You should have received a copy of the GNU Lesser General Public
# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-13017 USA
#
# See: http://www.gnu.org/licenses/lgpl.html
#
diff --git a/addons/document_webdav/__openerp__.py b/addons/document_webdav/__openerp__.py
index ec112ec7c38..faf943cc4e3 100644
--- a/addons/document_webdav/__openerp__.py
+++ b/addons/document_webdav/__openerp__.py
@@ -24,7 +24,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#
##############################################################################
diff --git a/addons/document_webdav/test_davclient.py b/addons/document_webdav/test_davclient.py
index 76a5e4514b3..bd9296ec94e 100644
--- a/addons/document_webdav/test_davclient.py
+++ b/addons/document_webdav/test_davclient.py
@@ -23,7 +23,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
###############################################################################
""" A trivial HTTP/WebDAV client, used for testing the server
diff --git a/addons/document_webdav/webdav_server.py b/addons/document_webdav/webdav_server.py
index 2c008abe02f..351b71b3a14 100644
--- a/addons/document_webdav/webdav_server.py
+++ b/addons/document_webdav/webdav_server.py
@@ -30,7 +30,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
###############################################################################
diff --git a/addons/l10n_ar/__init__.py b/addons/l10n_ar/__init__.py
index 92da5dbf966..4bfa5fda319 100644
--- a/addons/l10n_ar/__init__.py
+++ b/addons/l10n_ar/__init__.py
@@ -23,7 +23,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#
##############################################################################
diff --git a/addons/l10n_bo/__init__.py b/addons/l10n_bo/__init__.py
index 92da5dbf966..4bfa5fda319 100644
--- a/addons/l10n_bo/__init__.py
+++ b/addons/l10n_bo/__init__.py
@@ -23,7 +23,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#
##############################################################################
diff --git a/addons/l10n_cl/__init__.py b/addons/l10n_cl/__init__.py
index 92da5dbf966..4bfa5fda319 100644
--- a/addons/l10n_cl/__init__.py
+++ b/addons/l10n_cl/__init__.py
@@ -23,7 +23,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#
##############################################################################
diff --git a/addons/l10n_fr/__init__.py b/addons/l10n_fr/__init__.py
index 8d5728e334e..8631b775662 100644
--- a/addons/l10n_fr/__init__.py
+++ b/addons/l10n_fr/__init__.py
@@ -22,7 +22,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#
##############################################################################
diff --git a/addons/l10n_fr/__openerp__.py b/addons/l10n_fr/__openerp__.py
index e1d4b9ac334..7d7ef3dbd65 100644
--- a/addons/l10n_fr/__openerp__.py
+++ b/addons/l10n_fr/__openerp__.py
@@ -22,7 +22,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#
##############################################################################
{
diff --git a/addons/l10n_fr/report/__init__.py b/addons/l10n_fr/report/__init__.py
index 9907a2f5765..2608e4f397e 100644
--- a/addons/l10n_fr/report/__init__.py
+++ b/addons/l10n_fr/report/__init__.py
@@ -22,7 +22,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#
##############################################################################
diff --git a/addons/l10n_fr/report/base_report.py b/addons/l10n_fr/report/base_report.py
index 39a18bc7ca4..0e85f4b8536 100644
--- a/addons/l10n_fr/report/base_report.py
+++ b/addons/l10n_fr/report/base_report.py
@@ -22,7 +22,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#
##############################################################################
diff --git a/addons/l10n_fr/report/bilan_report.py b/addons/l10n_fr/report/bilan_report.py
index a7947434da0..559074e12f4 100644
--- a/addons/l10n_fr/report/bilan_report.py
+++ b/addons/l10n_fr/report/bilan_report.py
@@ -22,7 +22,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#
##############################################################################
diff --git a/addons/l10n_fr/report/compute_resultant_report.py b/addons/l10n_fr/report/compute_resultant_report.py
index 9a1809fd7cc..f67e00495c4 100644
--- a/addons/l10n_fr/report/compute_resultant_report.py
+++ b/addons/l10n_fr/report/compute_resultant_report.py
@@ -22,7 +22,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#
##############################################################################
diff --git a/addons/l10n_fr/wizard/__init__.py b/addons/l10n_fr/wizard/__init__.py
index 6e29471a975..f1ccf013477 100644
--- a/addons/l10n_fr/wizard/__init__.py
+++ b/addons/l10n_fr/wizard/__init__.py
@@ -22,7 +22,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#
##############################################################################
diff --git a/addons/l10n_fr/wizard/fr_report_bilan.py b/addons/l10n_fr/wizard/fr_report_bilan.py
index 90e97389eed..0fc1ac0e39d 100644
--- a/addons/l10n_fr/wizard/fr_report_bilan.py
+++ b/addons/l10n_fr/wizard/fr_report_bilan.py
@@ -22,7 +22,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#
##############################################################################
diff --git a/addons/l10n_fr/wizard/fr_report_compute_resultant.py b/addons/l10n_fr/wizard/fr_report_compute_resultant.py
index eff52189bc9..4d7069f8440 100644
--- a/addons/l10n_fr/wizard/fr_report_compute_resultant.py
+++ b/addons/l10n_fr/wizard/fr_report_compute_resultant.py
@@ -22,7 +22,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#
##############################################################################
diff --git a/addons/l10n_nl/__init__.py b/addons/l10n_nl/__init__.py
index 57a3bb10df3..45c8387f5e8 100644
--- a/addons/l10n_nl/__init__.py
+++ b/addons/l10n_nl/__init__.py
@@ -22,7 +22,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#
##############################################################################
diff --git a/addons/l10n_nl/__openerp__.py b/addons/l10n_nl/__openerp__.py
index 5e811511c01..c85ee24f74c 100644
--- a/addons/l10n_nl/__openerp__.py
+++ b/addons/l10n_nl/__openerp__.py
@@ -22,7 +22,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#
##############################################################################
#
diff --git a/addons/l10n_pa/__init__.py b/addons/l10n_pa/__init__.py
index 92da5dbf966..4bfa5fda319 100644
--- a/addons/l10n_pa/__init__.py
+++ b/addons/l10n_pa/__init__.py
@@ -23,7 +23,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#
##############################################################################
diff --git a/addons/l10n_pe/__init__.py b/addons/l10n_pe/__init__.py
index 92da5dbf966..4bfa5fda319 100644
--- a/addons/l10n_pe/__init__.py
+++ b/addons/l10n_pe/__init__.py
@@ -23,7 +23,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#
##############################################################################
diff --git a/addons/report_webkit/__init__.py b/addons/report_webkit/__init__.py
index dd44517e787..d548f4edebe 100644
--- a/addons/report_webkit/__init__.py
+++ b/addons/report_webkit/__init__.py
@@ -25,7 +25,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#
##############################################################################
diff --git a/addons/report_webkit/__openerp__.py b/addons/report_webkit/__openerp__.py
index 5b88cb78eb4..c494c252a75 100644
--- a/addons/report_webkit/__openerp__.py
+++ b/addons/report_webkit/__openerp__.py
@@ -25,7 +25,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#
##############################################################################
diff --git a/addons/report_webkit/company.py b/addons/report_webkit/company.py
index f9ae4191528..0b2069b9ef5 100644
--- a/addons/report_webkit/company.py
+++ b/addons/report_webkit/company.py
@@ -25,7 +25,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#
##############################################################################
diff --git a/addons/report_webkit/convert.py b/addons/report_webkit/convert.py
index b4d42325bb6..0a394c47adb 100644
--- a/addons/report_webkit/convert.py
+++ b/addons/report_webkit/convert.py
@@ -25,7 +25,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#
##############################################################################
diff --git a/addons/report_webkit/header.py b/addons/report_webkit/header.py
index 71deb57c370..5363f2e9951 100644
--- a/addons/report_webkit/header.py
+++ b/addons/report_webkit/header.py
@@ -25,7 +25,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#
##############################################################################
diff --git a/addons/report_webkit/ir_report.py b/addons/report_webkit/ir_report.py
index 1385f504928..7f5dae3ff88 100644
--- a/addons/report_webkit/ir_report.py
+++ b/addons/report_webkit/ir_report.py
@@ -25,7 +25,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#
##############################################################################
diff --git a/addons/report_webkit/report_helper.py b/addons/report_webkit/report_helper.py
index f1df1e786e3..35a38718254 100644
--- a/addons/report_webkit/report_helper.py
+++ b/addons/report_webkit/report_helper.py
@@ -25,7 +25,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#
##############################################################################
diff --git a/addons/report_webkit/webkit_report.py b/addons/report_webkit/webkit_report.py
index 99e1aa31058..b552769fe8e 100644
--- a/addons/report_webkit/webkit_report.py
+++ b/addons/report_webkit/webkit_report.py
@@ -26,7 +26,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#
##############################################################################
diff --git a/addons/report_webkit/wizard/__init__.py b/addons/report_webkit/wizard/__init__.py
index e8ae8b79fc0..f14ff575845 100644
--- a/addons/report_webkit/wizard/__init__.py
+++ b/addons/report_webkit/wizard/__init__.py
@@ -25,7 +25,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#
##############################################################################
diff --git a/addons/report_webkit/wizard/report_webkit_actions.py b/addons/report_webkit/wizard/report_webkit_actions.py
index b0e761752f6..f471ab67e98 100644
--- a/addons/report_webkit/wizard/report_webkit_actions.py
+++ b/addons/report_webkit/wizard/report_webkit_actions.py
@@ -25,7 +25,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#
##############################################################################
diff --git a/addons/resource/faces/observer.py b/addons/resource/faces/observer.py
index 894345230ea..4d2a3790796 100644
--- a/addons/resource/faces/observer.py
+++ b/addons/resource/faces/observer.py
@@ -22,7 +22,7 @@
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the
# Free Software Foundation, Inc.,
-# 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
############################################################################
#@-node:<< Copyright >>
diff --git a/addons/resource/faces/pcalendar.py b/addons/resource/faces/pcalendar.py
index c82c49d4816..231cb21fbef 100644
--- a/addons/resource/faces/pcalendar.py
+++ b/addons/resource/faces/pcalendar.py
@@ -22,7 +22,7 @@
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the
# Free Software Foundation, Inc.,
-# 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
############################################################################
#@-node:<< Copyright >>
diff --git a/addons/resource/faces/plocale.py b/addons/resource/faces/plocale.py
index 61bfa91917b..75478dc538a 100644
--- a/addons/resource/faces/plocale.py
+++ b/addons/resource/faces/plocale.py
@@ -17,7 +17,7 @@
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the
# Free Software Foundation, Inc.,
-# 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
############################################################################
import gettext
diff --git a/addons/resource/faces/resource.py b/addons/resource/faces/resource.py
index 3451806444e..48e74290ff5 100644
--- a/addons/resource/faces/resource.py
+++ b/addons/resource/faces/resource.py
@@ -22,7 +22,7 @@
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the
# Free Software Foundation, Inc.,
-# 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
############################################################################
#@-node:<< Copyright >>
diff --git a/addons/resource/faces/task.py b/addons/resource/faces/task.py
index 7516f41db2a..2a7ec4f271f 100644
--- a/addons/resource/faces/task.py
+++ b/addons/resource/faces/task.py
@@ -22,7 +22,7 @@
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the
# Free Software Foundation, Inc.,
-# 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
############################################################################
#@-node:<< Copyright >>
diff --git a/addons/resource/faces/timescale.py b/addons/resource/faces/timescale.py
index 3e7c3c1dc89..0c4dedcd9b3 100644
--- a/addons/resource/faces/timescale.py
+++ b/addons/resource/faces/timescale.py
@@ -17,7 +17,7 @@
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the
# Free Software Foundation, Inc.,
-# 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
############################################################################
import faces.pcalendar as pcal
diff --git a/addons/resource/faces/utils.py b/addons/resource/faces/utils.py
index 54985767613..9412f045a38 100644
--- a/addons/resource/faces/utils.py
+++ b/addons/resource/faces/utils.py
@@ -17,7 +17,7 @@
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the
# Free Software Foundation, Inc.,
-# 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
############################################################################
import observer
From 7d79e8ade46001ba6d1797c1f84f060cae72c313 Mon Sep 17 00:00:00 2001
From: Martin Trigaux
Date: Tue, 14 May 2013 15:51:50 +0200
Subject: [PATCH 108/210] [IMP] fix EOL : CRLF to unix
bzr revid: mat@openerp.com-20130514135150-j0flc0ffsddx09bw
---
.../static/lib/dhtmlxScheduler/license.txt | 456 +++++++++---------
1 file changed, 228 insertions(+), 228 deletions(-)
diff --git a/addons/web_calendar/static/lib/dhtmlxScheduler/license.txt b/addons/web_calendar/static/lib/dhtmlxScheduler/license.txt
index 82120142269..d273d6c65a8 100644
--- a/addons/web_calendar/static/lib/dhtmlxScheduler/license.txt
+++ b/addons/web_calendar/static/lib/dhtmlxScheduler/license.txt
@@ -1,228 +1,228 @@
-
- GNU GENERAL PUBLIC LICENSE
-
-Version 2, June 1991
-
-Copyright (C) 1989, 1991 Free Software Foundation, Inc.
-
-51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
-
-Everyone is permitted to copy and distribute verbatim copies
-
-of this license document, but changing it is not allowed.
-
-TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-0. This License applies to any program or other work which contains a
-notice placed by the copyright holder saying it may be distributed under
-the terms of this General Public License. The "Program", below, refers
-to any such program or work, and a "work based on the Program" means
-either the Program or any derivative work under copyright law: that is
-to say, a work containing the Program or a portion of it, either
-verbatim or with modifications and/or translated into another language.
-(Hereinafter, translation is included without limitation in the term
-"modification".) Each licensee is addressed as "you".
-
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope. The act of running
-the Program is not restricted, and the output from the Program is
-covered only if its contents constitute a work based on the Program
-(independent of having been made by running the Program). Whether that
-is true depends on what the Program does.
-
-1. You may copy and distribute verbatim copies of the Program's source
-code as you receive it, in any medium, provided that you conspicuously
-and appropriately publish on each copy an appropriate copyright notice
-and disclaimer of warranty; keep intact all the notices that refer to
-this License and to the absence of any warranty; and give any other
-recipients of the Program a copy of this License along with the Program.
-
-You may charge a fee for the physical act of transferring a copy, and
-you may at your option offer warranty protection in exchange for a fee.
-
-2. You may modify your copy or copies of the Program or any portion of
-it, thus forming a work based on the Program, and copy and distribute
-such modifications or work under the terms of Section 1 above, provided
-that you also meet all of these conditions:
-
-a) You must cause the modified files to carry prominent notices stating
-that you changed the files and the date of any change.
-
-b) You must cause any work that you distribute or publish, that in whole
-or in part contains or is derived from the Program or any part thereof,
-to be licensed as a whole at no charge to all third parties under the
-terms of this License.
-
-c) If the modified program normally reads commands interactively when
-run, you must cause it, when started running for such interactive use in
-the most ordinary way, to print or display an announcement including an
-appropriate copyright notice and a notice that there is no warranty (or
-else, saying that you provide a warranty) and that users may
-redistribute the program under these conditions, and telling the user
-how to view a copy of this License. (Exception: if the Program itself is
-interactive but does not normally print such an announcement, your work
-based on the Program is not required to print an announcement.)
-
-These requirements apply to the modified work as a whole. If
-identifiable sections of that work are not derived from the Program, and
-can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works. But when you
-distribute the same sections as part of a whole which is a work based on
-the Program, the distribution of the whole must be on the terms of this
-License, whose permissions for other licensees extend to the entire
-whole, and thus to each and every part regardless of who wrote it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Program.
-
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of a
-storage or distribution medium does not bring the other work under the
-scope of this License.
-
-3. You may copy and distribute the Program (or a work based on it, under
-Section 2) in object code or executable form under the terms of Sections
-1 and 2 above provided that you also do one of the following:
-
-a) Accompany it with the complete corresponding machine-readable source
-code, which must be distributed under the terms of Sections 1 and 2
-above on a medium customarily used for software interchange; or,
-
-b) Accompany it with a written offer, valid for at least three years, to
-give any third party, for a charge no more than your cost of physically
-performing source distribution, a complete machine-readable copy of the
-corresponding source code, to be distributed under the terms of Sections
-1 and 2 above on a medium customarily used for software interchange; or,
-
-c) Accompany it with the information you received as to the offer to
-distribute corresponding source code. (This alternative is allowed only
-for noncommercial distribution and only if you received the program in
-object code or executable form with such an offer, in accord with
-Subsection b above.)
-
-The source code for a work means the preferred form of the work for
-making modifications to it. For an executable work, complete source code
-means all the source code for all modules it contains, plus any
-associated interface definition files, plus the scripts used to control
-compilation and installation of the executable. However, as a special
-exception, the source code distributed need not include anything that is
-normally distributed (in either source or binary form) with the major
-components (compiler, kernel, and so on) of the operating system on
-which the executable runs, unless that component itself accompanies the
-executable.
-
-If distribution of executable or object code is made by offering access
-to copy from a designated place, then offering equivalent access to copy
-the source code from the same place counts as distribution of the source
-code, even though third parties are not compelled to copy the source
-along with the object code.
-
-4. You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License. Any attempt otherwise
-to copy, modify, sublicense or distribute the Program is void, and will
-automatically terminate your rights under this License. However, parties
-who have received copies, or rights, from you under this License will
-not have their licenses terminated so long as such parties remain in
-full compliance.
-
-5. You are not required to accept this License, since you have not
-signed it. However, nothing else grants you permission to modify or
-distribute the Program or its derivative works. These actions are
-prohibited by law if you do not accept this License. Therefore, by
-modifying or distributing the Program (or any work based on the
-Program), you indicate your acceptance of this License to do so, and all
-its terms and conditions for copying, distributing or modifying the
-Program or works based on it.
-
-6. Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program subject to
-these terms and conditions. You may not impose any further restrictions
-on the recipients' exercise of the rights granted herein. You are not
-responsible for enforcing compliance by third parties to this License.
-
-7. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License. If you cannot distribute
-so as to satisfy simultaneously your obligations under this License and
-any other pertinent obligations, then as a consequence you may not
-distribute the Program at all. For example, if a patent license would
-not permit royalty-free redistribution of the Program by all those who
-receive copies directly or indirectly through you, then the only way you
-could satisfy both it and this License would be to refrain entirely from
-distribution of the Program.
-
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply and the section as a whole is intended to apply in other
-circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system, which is implemented
-by public license practices. Many people have made generous
-contributions to the wide range of software distributed through that
-system in reliance on consistent application of that system; it is up to
-the author/donor to decide if he or she is willing to distribute
-software through any other system and a licensee cannot impose that choice.
-
-This section is intended to make thoroughly clear what is believed to be
-a consequence of the rest of this License.
-
-8. If the distribution and/or use of the Program is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Program under this License may
-add an explicit geographical distribution limitation excluding those
-countries, so that distribution is permitted only in or among countries
-not thus excluded. In such case, this License incorporates the
-limitation as if written in the body of this License.
-
-9. The Free Software Foundation may publish revised and/or new versions
-of the General Public License from time to time. Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-Each version is given a distinguishing version number. If the Program
-specifies a version number of this License which applies to it and "any
-later version", you have the option of following the terms and
-conditions either of that version or of any later version published by
-the Free Software Foundation. If the Program does not specify a version
-number of this License, you may choose any version ever published by the
-Free Software Foundation.
-
-10. If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, write to the
-author to ask for permission. For software which is copyrighted by the
-Free Software Foundation, write to the Free Software Foundation; we
-sometimes make exceptions for this. Our decision will be guided by the
-two goals of preserving the free status of all derivatives of our free
-software and of promoting the sharing and reuse of software generally.
-
-NO WARRANTY
-
-11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
-OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER
-EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE
-ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH
-YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL
-NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
-WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
-AND/OR REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR
-DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL
-DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE PROGRAM
-(INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED
-INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF
-THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR
-OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
+
+ GNU GENERAL PUBLIC LICENSE
+
+Version 2, June 1991
+
+Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+
+51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
+
+Everyone is permitted to copy and distribute verbatim copies
+
+of this license document, but changing it is not allowed.
+
+TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+0. This License applies to any program or other work which contains a
+notice placed by the copyright holder saying it may be distributed under
+the terms of this General Public License. The "Program", below, refers
+to any such program or work, and a "work based on the Program" means
+either the Program or any derivative work under copyright law: that is
+to say, a work containing the Program or a portion of it, either
+verbatim or with modifications and/or translated into another language.
+(Hereinafter, translation is included without limitation in the term
+"modification".) Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope. The act of running
+the Program is not restricted, and the output from the Program is
+covered only if its contents constitute a work based on the Program
+(independent of having been made by running the Program). Whether that
+is true depends on what the Program does.
+
+1. You may copy and distribute verbatim copies of the Program's source
+code as you receive it, in any medium, provided that you conspicuously
+and appropriately publish on each copy an appropriate copyright notice
+and disclaimer of warranty; keep intact all the notices that refer to
+this License and to the absence of any warranty; and give any other
+recipients of the Program a copy of this License along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+2. You may modify your copy or copies of the Program or any portion of
+it, thus forming a work based on the Program, and copy and distribute
+such modifications or work under the terms of Section 1 above, provided
+that you also meet all of these conditions:
+
+a) You must cause the modified files to carry prominent notices stating
+that you changed the files and the date of any change.
+
+b) You must cause any work that you distribute or publish, that in whole
+or in part contains or is derived from the Program or any part thereof,
+to be licensed as a whole at no charge to all third parties under the
+terms of this License.
+
+c) If the modified program normally reads commands interactively when
+run, you must cause it, when started running for such interactive use in
+the most ordinary way, to print or display an announcement including an
+appropriate copyright notice and a notice that there is no warranty (or
+else, saying that you provide a warranty) and that users may
+redistribute the program under these conditions, and telling the user
+how to view a copy of this License. (Exception: if the Program itself is
+interactive but does not normally print such an announcement, your work
+based on the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole. If
+identifiable sections of that work are not derived from the Program, and
+can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works. But when you
+distribute the same sections as part of a whole which is a work based on
+the Program, the distribution of the whole must be on the terms of this
+License, whose permissions for other licensees extend to the entire
+whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of a
+storage or distribution medium does not bring the other work under the
+scope of this License.
+
+3. You may copy and distribute the Program (or a work based on it, under
+Section 2) in object code or executable form under the terms of Sections
+1 and 2 above provided that you also do one of the following:
+
+a) Accompany it with the complete corresponding machine-readable source
+code, which must be distributed under the terms of Sections 1 and 2
+above on a medium customarily used for software interchange; or,
+
+b) Accompany it with a written offer, valid for at least three years, to
+give any third party, for a charge no more than your cost of physically
+performing source distribution, a complete machine-readable copy of the
+corresponding source code, to be distributed under the terms of Sections
+1 and 2 above on a medium customarily used for software interchange; or,
+
+c) Accompany it with the information you received as to the offer to
+distribute corresponding source code. (This alternative is allowed only
+for noncommercial distribution and only if you received the program in
+object code or executable form with such an offer, in accord with
+Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it. For an executable work, complete source code
+means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to control
+compilation and installation of the executable. However, as a special
+exception, the source code distributed need not include anything that is
+normally distributed (in either source or binary form) with the major
+components (compiler, kernel, and so on) of the operating system on
+which the executable runs, unless that component itself accompanies the
+executable.
+
+If distribution of executable or object code is made by offering access
+to copy from a designated place, then offering equivalent access to copy
+the source code from the same place counts as distribution of the source
+code, even though third parties are not compelled to copy the source
+along with the object code.
+
+4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License. Any attempt otherwise
+to copy, modify, sublicense or distribute the Program is void, and will
+automatically terminate your rights under this License. However, parties
+who have received copies, or rights, from you under this License will
+not have their licenses terminated so long as such parties remain in
+full compliance.
+
+5. You are not required to accept this License, since you have not
+signed it. However, nothing else grants you permission to modify or
+distribute the Program or its derivative works. These actions are
+prohibited by law if you do not accept this License. Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and all
+its terms and conditions for copying, distributing or modifying the
+Program or works based on it.
+
+6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions. You may not impose any further restrictions
+on the recipients' exercise of the rights granted herein. You are not
+responsible for enforcing compliance by third parties to this License.
+
+7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License. If you cannot distribute
+so as to satisfy simultaneously your obligations under this License and
+any other pertinent obligations, then as a consequence you may not
+distribute the Program at all. For example, if a patent license would
+not permit royalty-free redistribution of the Program by all those who
+receive copies directly or indirectly through you, then the only way you
+could satisfy both it and this License would be to refrain entirely from
+distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is implemented
+by public license practices. Many people have made generous
+contributions to the wide range of software distributed through that
+system in reliance on consistent application of that system; it is up to
+the author/donor to decide if he or she is willing to distribute
+software through any other system and a licensee cannot impose that choice.
+
+This section is intended to make thoroughly clear what is believed to be
+a consequence of the rest of this License.
+
+8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License may
+add an explicit geographical distribution limitation excluding those
+countries, so that distribution is permitted only in or among countries
+not thus excluded. In such case, this License incorporates the
+limitation as if written in the body of this License.
+
+9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time. Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number. If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and
+conditions either of that version or of any later version published by
+the Free Software Foundation. If the Program does not specify a version
+number of this License, you may choose any version ever published by the
+Free Software Foundation.
+
+10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the
+author to ask for permission. For software which is copyrighted by the
+Free Software Foundation, write to the Free Software Foundation; we
+sometimes make exceptions for this. Our decision will be guided by the
+two goals of preserving the free status of all derivatives of our free
+software and of promoting the sharing and reuse of software generally.
+
+NO WARRANTY
+
+11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER
+EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE
+ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH
+YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL
+NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
+WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
+AND/OR REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR
+DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL
+DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE PROGRAM
+(INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED
+INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF
+THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR
+OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+
From 53a6042e38b4c2ef0e96bdc935a38768c3aa50fc Mon Sep 17 00:00:00 2001
From: Martin Trigaux
Date: Tue, 14 May 2013 15:52:40 +0200
Subject: [PATCH 109/210] [IMP] remove empty line
bzr revid: mat@openerp.com-20130514135240-66zvm1uv91snpbnm
---
addons/l10n_ro/res_partner.py | 1 -
1 file changed, 1 deletion(-)
diff --git a/addons/l10n_ro/res_partner.py b/addons/l10n_ro/res_partner.py
index 4720c6f8157..4835f75bb40 100644
--- a/addons/l10n_ro/res_partner.py
+++ b/addons/l10n_ro/res_partner.py
@@ -1,4 +1,3 @@
-
# -*- encoding: utf-8 -*-
##############################################################################
#
From 46210a930db79fd3f1a8ee2b032b0d993ccc7985 Mon Sep 17 00:00:00 2001
From: Martin Trigaux
Date: Tue, 14 May 2013 15:55:53 +0200
Subject: [PATCH 110/210] [IMP] fix EOL : CRLF to unix
bzr revid: mat@openerp.com-20130514135553-50jrqn7dkg77hhe6
---
.../static/lib/dhtmlxGantt/index.html | 214 +++++++++---------
1 file changed, 107 insertions(+), 107 deletions(-)
diff --git a/addons/web_gantt/static/lib/dhtmlxGantt/index.html b/addons/web_gantt/static/lib/dhtmlxGantt/index.html
index 5196d426ca6..d35c33ca747 100644
--- a/addons/web_gantt/static/lib/dhtmlxGantt/index.html
+++ b/addons/web_gantt/static/lib/dhtmlxGantt/index.html
@@ -1,107 +1,107 @@
-
-
- Gantt Chart
-
-
-
-
-
-
-
-
-
-
-
-
DHTML Gantt sample
-
-
Initialize object on page
-
You can place this JavaScript Gantt Chart anywhere on your web page, attaching it
- to any div object.
-
You can place this JavaScript Gantt Chart anywhere on your web page, attaching it
+ to any div object.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
From 3c11652facfe1c540b005fb961e20a48b7a1b3d9 Mon Sep 17 00:00:00 2001
From: Martin Trigaux
Date: Tue, 14 May 2013 16:11:32 +0200
Subject: [PATCH 111/210] [IMP] trmove double space in fsf address
bzr revid: mat@openerp.com-20130514141132-610k885sxtcr8vpb
---
addons/account/report/account_general_ledger.py | 2 +-
addons/account_test/account_test.py | 2 +-
.../plugin/openerp_report_designer/bin/script/About.py | 2 +-
.../plugin/openerp_report_designer/bin/script/AddAttachment.py | 2 +-
.../plugin/openerp_report_designer/bin/script/Change.py | 2 +-
.../openerp_report_designer/bin/script/ConvertBracesToField.py | 2 +-
.../openerp_report_designer/bin/script/ConvertFieldsToBraces.py | 2 +-
.../plugin/openerp_report_designer/bin/script/ExportToRML.py | 2 +-
.../plugin/openerp_report_designer/bin/script/Expression.py | 2 +-
.../plugin/openerp_report_designer/bin/script/Fields.py | 2 +-
.../plugin/openerp_report_designer/bin/script/LoginTest.py | 2 +-
.../openerp_report_designer/bin/script/ModifyExistingReport.py | 2 +-
.../plugin/openerp_report_designer/bin/script/NewReport.py | 2 +-
.../plugin/openerp_report_designer/bin/script/Repeatln.py | 2 +-
.../plugin/openerp_report_designer/bin/script/SendToServer.py | 2 +-
.../openerp_report_designer/bin/script/ServerParameter.py | 2 +-
.../plugin/openerp_report_designer/bin/script/Translation.py | 2 +-
.../plugin/openerp_report_designer/bin/script/__init__.py | 2 +-
.../plugin/openerp_report_designer/bin/script/compile_all.py | 2 +-
.../plugin/openerp_report_designer/bin/script/lib/actions.py | 2 +-
.../plugin/openerp_report_designer/bin/script/lib/error.py | 2 +-
.../plugin/openerp_report_designer/bin/script/lib/functions.py | 2 +-
.../plugin/openerp_report_designer/bin/script/lib/gui.py | 2 +-
.../plugin/openerp_report_designer/bin/script/modify.py | 2 +-
addons/document_webdav/__openerp__.py | 2 +-
addons/document_webdav/test_davclient.py | 2 +-
addons/document_webdav/webdav_server.py | 2 +-
addons/l10n_ar/__init__.py | 2 +-
addons/l10n_bo/__init__.py | 2 +-
addons/l10n_cl/__init__.py | 2 +-
addons/l10n_fr/__init__.py | 2 +-
addons/l10n_fr/__openerp__.py | 2 +-
addons/l10n_fr/report/__init__.py | 2 +-
addons/l10n_fr/report/base_report.py | 2 +-
addons/l10n_fr/report/bilan_report.py | 2 +-
addons/l10n_fr/report/compute_resultant_report.py | 2 +-
addons/l10n_fr/wizard/__init__.py | 2 +-
addons/l10n_fr/wizard/fr_report_bilan.py | 2 +-
addons/l10n_fr/wizard/fr_report_compute_resultant.py | 2 +-
addons/l10n_nl/__init__.py | 2 +-
addons/l10n_nl/__openerp__.py | 2 +-
addons/l10n_pa/__init__.py | 2 +-
addons/l10n_pe/__init__.py | 2 +-
addons/report_webkit/__init__.py | 2 +-
addons/report_webkit/__openerp__.py | 2 +-
addons/report_webkit/company.py | 2 +-
addons/report_webkit/convert.py | 2 +-
addons/report_webkit/header.py | 2 +-
addons/report_webkit/ir_report.py | 2 +-
addons/report_webkit/report_helper.py | 2 +-
addons/report_webkit/webkit_report.py | 2 +-
addons/report_webkit/wizard/__init__.py | 2 +-
addons/report_webkit/wizard/report_webkit_actions.py | 2 +-
addons/resource/faces/observer.py | 2 +-
addons/resource/faces/pcalendar.py | 2 +-
addons/resource/faces/plocale.py | 2 +-
addons/resource/faces/resource.py | 2 +-
addons/resource/faces/task.py | 2 +-
addons/resource/faces/timescale.py | 2 +-
addons/resource/faces/utils.py | 2 +-
60 files changed, 60 insertions(+), 60 deletions(-)
diff --git a/addons/account/report/account_general_ledger.py b/addons/account/report/account_general_ledger.py
index 50ab732ea5f..e0f24c432e9 100644
--- a/addons/account/report/account_general_ledger.py
+++ b/addons/account/report/account_general_ledger.py
@@ -23,7 +23,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#
##############################################################################
diff --git a/addons/account_test/account_test.py b/addons/account_test/account_test.py
index 3ed26556fd9..0a5f6ce5617 100644
--- a/addons/account_test/account_test.py
+++ b/addons/account_test/account_test.py
@@ -24,7 +24,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#
##############################################################################
diff --git a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/About.py b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/About.py
index e412a714f61..5d6bea06b9c 100644
--- a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/About.py
+++ b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/About.py
@@ -15,7 +15,7 @@
#
# You should have received a copy of the GNU Lesser General Public
# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-13017 USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-13017 USA
#
# See: http://www.gnu.org/licenses/lgpl.html
#
diff --git a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/AddAttachment.py b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/AddAttachment.py
index 353be998710..a820b38ad35 100644
--- a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/AddAttachment.py
+++ b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/AddAttachment.py
@@ -15,7 +15,7 @@
#
# You should have received a copy of the GNU Lesser General Public
# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-13017 USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-13017 USA
#
# See: http://www.gnu.org/licenses/lgpl.html
#
diff --git a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/Change.py b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/Change.py
index 82db7426b40..0448a1ebda4 100644
--- a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/Change.py
+++ b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/Change.py
@@ -15,7 +15,7 @@
#
# You should have received a copy of the GNU Lesser General Public
# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-13017 USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-13017 USA
#
# See: http://www.gnu.org/licenses/lgpl.html
#
diff --git a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/ConvertBracesToField.py b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/ConvertBracesToField.py
index 9753592562b..3115f2435ee 100644
--- a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/ConvertBracesToField.py
+++ b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/ConvertBracesToField.py
@@ -15,7 +15,7 @@
#
# You should have received a copy of the GNU Lesser General Public
# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-13017 USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-13017 USA
#
# See: http://www.gnu.org/licenses/lgpl.html
#
diff --git a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/ConvertFieldsToBraces.py b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/ConvertFieldsToBraces.py
index 24db3a9ef82..24efa36c8b2 100644
--- a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/ConvertFieldsToBraces.py
+++ b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/ConvertFieldsToBraces.py
@@ -15,7 +15,7 @@
#
# You should have received a copy of the GNU Lesser General Public
# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-13017 USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-13017 USA
#
# See: http://www.gnu.org/licenses/lgpl.html
#
diff --git a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/ExportToRML.py b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/ExportToRML.py
index ffc74f91796..4ed19466ed2 100644
--- a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/ExportToRML.py
+++ b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/ExportToRML.py
@@ -15,7 +15,7 @@
#
# You should have received a copy of the GNU Lesser General Public
# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-13017 USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-13017 USA
#
# See: http://www.gnu.org/licenses/lgpl.html
#
diff --git a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/Expression.py b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/Expression.py
index aae838ea302..1ec7c8c3cde 100644
--- a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/Expression.py
+++ b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/Expression.py
@@ -15,7 +15,7 @@
#
# You should have received a copy of the GNU Lesser General Public
# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-13017 USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-13017 USA
#
# See: http://www.gnu.org/licenses/lgpl.html
#
diff --git a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/Fields.py b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/Fields.py
index 45695757799..6edb8165dfa 100644
--- a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/Fields.py
+++ b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/Fields.py
@@ -15,7 +15,7 @@
#
# You should have received a copy of the GNU Lesser General Public
# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-13017 USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-13017 USA
#
# See: http://www.gnu.org/licenses/lgpl.html
#
diff --git a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/LoginTest.py b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/LoginTest.py
index f16ed3eb8b2..e1d3bd05b20 100644
--- a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/LoginTest.py
+++ b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/LoginTest.py
@@ -15,7 +15,7 @@
#
# You should have received a copy of the GNU Lesser General Public
# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-13017 USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-13017 USA
#
# See: http://www.gnu.org/licenses/lgpl.html
#
diff --git a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/ModifyExistingReport.py b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/ModifyExistingReport.py
index a70271f9285..d91333a6445 100644
--- a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/ModifyExistingReport.py
+++ b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/ModifyExistingReport.py
@@ -15,7 +15,7 @@
#
# You should have received a copy of the GNU Lesser General Public
# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-13017 USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-13017 USA
#
# See: http://www.gnu.org/licenses/lgpl.html
#
diff --git a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/NewReport.py b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/NewReport.py
index df339c771d7..86d1beff331 100644
--- a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/NewReport.py
+++ b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/NewReport.py
@@ -15,7 +15,7 @@
#
# You should have received a copy of the GNU Lesser General Public
# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-13017 USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-13017 USA
#
# See: http://www.gnu.org/licenses/lgpl.html
#
diff --git a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/Repeatln.py b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/Repeatln.py
index 4acca9e8e04..086a55f1a81 100644
--- a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/Repeatln.py
+++ b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/Repeatln.py
@@ -15,7 +15,7 @@
#
# You should have received a copy of the GNU Lesser General Public
# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-13017 USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-13017 USA
#
# See: http://www.gnu.org/licenses/lgpl.html
#
diff --git a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/SendToServer.py b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/SendToServer.py
index f8f088ec181..17a6049049b 100644
--- a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/SendToServer.py
+++ b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/SendToServer.py
@@ -15,7 +15,7 @@
#
# You should have received a copy of the GNU Lesser General Public
# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-13017 USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-13017 USA
#
# See: http://www.gnu.org/licenses/lgpl.html
#
diff --git a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/ServerParameter.py b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/ServerParameter.py
index 2c763907a72..0b5d452ebfd 100644
--- a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/ServerParameter.py
+++ b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/ServerParameter.py
@@ -15,7 +15,7 @@
#
# You should have received a copy of the GNU Lesser General Public
# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-13017 USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-13017 USA
#
# See: http://www.gnu.org/licenses/lgpl.html
#
diff --git a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/Translation.py b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/Translation.py
index b2c863e7395..5fc3b9f6bc7 100644
--- a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/Translation.py
+++ b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/Translation.py
@@ -15,7 +15,7 @@
#
# You should have received a copy of the GNU Lesser General Public
# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-13017 USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-13017 USA
#
# See: http://www.gnu.org/licenses/lgpl.html
#
diff --git a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/__init__.py b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/__init__.py
index fdb0c078d7c..352099df61c 100644
--- a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/__init__.py
+++ b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/__init__.py
@@ -15,7 +15,7 @@
#
# You should have received a copy of the GNU Lesser General Public
# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-13017 USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-13017 USA
#
# See: http://www.gnu.org/licenses/lgpl.html
#
diff --git a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/compile_all.py b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/compile_all.py
index 9dd6ea68295..bdfb9c8564b 100644
--- a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/compile_all.py
+++ b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/compile_all.py
@@ -15,7 +15,7 @@
#
# You should have received a copy of the GNU Lesser General Public
# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-13017 USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-13017 USA
#
# See: http://www.gnu.org/licenses/lgpl.html
#
diff --git a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/lib/actions.py b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/lib/actions.py
index 03c632aeaa9..5dda402b2d7 100644
--- a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/lib/actions.py
+++ b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/lib/actions.py
@@ -15,7 +15,7 @@
#
# You should have received a copy of the GNU Lesser General Public
# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
#
# See: http://www.gnu.org/licenses/lgpl.html
#
diff --git a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/lib/error.py b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/lib/error.py
index fd2bd7d2195..f8e22ea33d5 100644
--- a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/lib/error.py
+++ b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/lib/error.py
@@ -15,7 +15,7 @@
#
# You should have received a copy of the GNU Lesser General Public
# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
#
# See: http://www.gnu.org/licenses/lgpl.html
#
diff --git a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/lib/functions.py b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/lib/functions.py
index 4b863405a4d..2e1f45cf0df 100644
--- a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/lib/functions.py
+++ b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/lib/functions.py
@@ -15,7 +15,7 @@
#
# You should have received a copy of the GNU Lesser General Public
# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
#
# See: http://www.gnu.org/licenses/lgpl.html
#
diff --git a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/lib/gui.py b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/lib/gui.py
index 6c3b7d4c11d..df2171ce22e 100644
--- a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/lib/gui.py
+++ b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/lib/gui.py
@@ -15,7 +15,7 @@
#
# You should have received a copy of the GNU Lesser General Public
# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
#
# See: http://www.gnu.org/licenses/lgpl.html
#
diff --git a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/modify.py b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/modify.py
index 7ea486a2f03..3687a34ee3a 100644
--- a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/modify.py
+++ b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/modify.py
@@ -15,7 +15,7 @@
#
# You should have received a copy of the GNU Lesser General Public
# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-13017 USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-13017 USA
#
# See: http://www.gnu.org/licenses/lgpl.html
#
diff --git a/addons/document_webdav/__openerp__.py b/addons/document_webdav/__openerp__.py
index faf943cc4e3..b2aacc9593a 100644
--- a/addons/document_webdav/__openerp__.py
+++ b/addons/document_webdav/__openerp__.py
@@ -24,7 +24,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#
##############################################################################
diff --git a/addons/document_webdav/test_davclient.py b/addons/document_webdav/test_davclient.py
index bd9296ec94e..5ee02819e09 100644
--- a/addons/document_webdav/test_davclient.py
+++ b/addons/document_webdav/test_davclient.py
@@ -23,7 +23,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
###############################################################################
""" A trivial HTTP/WebDAV client, used for testing the server
diff --git a/addons/document_webdav/webdav_server.py b/addons/document_webdav/webdav_server.py
index 351b71b3a14..4284f25d1c0 100644
--- a/addons/document_webdav/webdav_server.py
+++ b/addons/document_webdav/webdav_server.py
@@ -30,7 +30,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
###############################################################################
diff --git a/addons/l10n_ar/__init__.py b/addons/l10n_ar/__init__.py
index 4bfa5fda319..bef6fa84279 100644
--- a/addons/l10n_ar/__init__.py
+++ b/addons/l10n_ar/__init__.py
@@ -23,7 +23,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#
##############################################################################
diff --git a/addons/l10n_bo/__init__.py b/addons/l10n_bo/__init__.py
index 4bfa5fda319..bef6fa84279 100644
--- a/addons/l10n_bo/__init__.py
+++ b/addons/l10n_bo/__init__.py
@@ -23,7 +23,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#
##############################################################################
diff --git a/addons/l10n_cl/__init__.py b/addons/l10n_cl/__init__.py
index 4bfa5fda319..bef6fa84279 100644
--- a/addons/l10n_cl/__init__.py
+++ b/addons/l10n_cl/__init__.py
@@ -23,7 +23,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#
##############################################################################
diff --git a/addons/l10n_fr/__init__.py b/addons/l10n_fr/__init__.py
index 8631b775662..fda93f21bd5 100644
--- a/addons/l10n_fr/__init__.py
+++ b/addons/l10n_fr/__init__.py
@@ -22,7 +22,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#
##############################################################################
diff --git a/addons/l10n_fr/__openerp__.py b/addons/l10n_fr/__openerp__.py
index 7d7ef3dbd65..9a956a9b284 100644
--- a/addons/l10n_fr/__openerp__.py
+++ b/addons/l10n_fr/__openerp__.py
@@ -22,7 +22,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#
##############################################################################
{
diff --git a/addons/l10n_fr/report/__init__.py b/addons/l10n_fr/report/__init__.py
index 2608e4f397e..c6881fdac81 100644
--- a/addons/l10n_fr/report/__init__.py
+++ b/addons/l10n_fr/report/__init__.py
@@ -22,7 +22,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#
##############################################################################
diff --git a/addons/l10n_fr/report/base_report.py b/addons/l10n_fr/report/base_report.py
index 0e85f4b8536..0bc139196f1 100644
--- a/addons/l10n_fr/report/base_report.py
+++ b/addons/l10n_fr/report/base_report.py
@@ -22,7 +22,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#
##############################################################################
diff --git a/addons/l10n_fr/report/bilan_report.py b/addons/l10n_fr/report/bilan_report.py
index 559074e12f4..9c477e17813 100644
--- a/addons/l10n_fr/report/bilan_report.py
+++ b/addons/l10n_fr/report/bilan_report.py
@@ -22,7 +22,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#
##############################################################################
diff --git a/addons/l10n_fr/report/compute_resultant_report.py b/addons/l10n_fr/report/compute_resultant_report.py
index f67e00495c4..94f2d275fbb 100644
--- a/addons/l10n_fr/report/compute_resultant_report.py
+++ b/addons/l10n_fr/report/compute_resultant_report.py
@@ -22,7 +22,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#
##############################################################################
diff --git a/addons/l10n_fr/wizard/__init__.py b/addons/l10n_fr/wizard/__init__.py
index f1ccf013477..a4640d111da 100644
--- a/addons/l10n_fr/wizard/__init__.py
+++ b/addons/l10n_fr/wizard/__init__.py
@@ -22,7 +22,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#
##############################################################################
diff --git a/addons/l10n_fr/wizard/fr_report_bilan.py b/addons/l10n_fr/wizard/fr_report_bilan.py
index 0fc1ac0e39d..c2c851785d9 100644
--- a/addons/l10n_fr/wizard/fr_report_bilan.py
+++ b/addons/l10n_fr/wizard/fr_report_bilan.py
@@ -22,7 +22,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#
##############################################################################
diff --git a/addons/l10n_fr/wizard/fr_report_compute_resultant.py b/addons/l10n_fr/wizard/fr_report_compute_resultant.py
index 4d7069f8440..35f5e296185 100644
--- a/addons/l10n_fr/wizard/fr_report_compute_resultant.py
+++ b/addons/l10n_fr/wizard/fr_report_compute_resultant.py
@@ -22,7 +22,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#
##############################################################################
diff --git a/addons/l10n_nl/__init__.py b/addons/l10n_nl/__init__.py
index 45c8387f5e8..af15e1b315d 100644
--- a/addons/l10n_nl/__init__.py
+++ b/addons/l10n_nl/__init__.py
@@ -22,7 +22,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#
##############################################################################
diff --git a/addons/l10n_nl/__openerp__.py b/addons/l10n_nl/__openerp__.py
index c85ee24f74c..39a9c70080f 100644
--- a/addons/l10n_nl/__openerp__.py
+++ b/addons/l10n_nl/__openerp__.py
@@ -22,7 +22,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#
##############################################################################
#
diff --git a/addons/l10n_pa/__init__.py b/addons/l10n_pa/__init__.py
index 4bfa5fda319..bef6fa84279 100644
--- a/addons/l10n_pa/__init__.py
+++ b/addons/l10n_pa/__init__.py
@@ -23,7 +23,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#
##############################################################################
diff --git a/addons/l10n_pe/__init__.py b/addons/l10n_pe/__init__.py
index 4bfa5fda319..bef6fa84279 100644
--- a/addons/l10n_pe/__init__.py
+++ b/addons/l10n_pe/__init__.py
@@ -23,7 +23,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#
##############################################################################
diff --git a/addons/report_webkit/__init__.py b/addons/report_webkit/__init__.py
index d548f4edebe..aa091570540 100644
--- a/addons/report_webkit/__init__.py
+++ b/addons/report_webkit/__init__.py
@@ -25,7 +25,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#
##############################################################################
diff --git a/addons/report_webkit/__openerp__.py b/addons/report_webkit/__openerp__.py
index c494c252a75..fff9dafd81a 100644
--- a/addons/report_webkit/__openerp__.py
+++ b/addons/report_webkit/__openerp__.py
@@ -25,7 +25,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#
##############################################################################
diff --git a/addons/report_webkit/company.py b/addons/report_webkit/company.py
index 0b2069b9ef5..26578d80fd5 100644
--- a/addons/report_webkit/company.py
+++ b/addons/report_webkit/company.py
@@ -25,7 +25,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#
##############################################################################
diff --git a/addons/report_webkit/convert.py b/addons/report_webkit/convert.py
index 0a394c47adb..3c6163528c1 100644
--- a/addons/report_webkit/convert.py
+++ b/addons/report_webkit/convert.py
@@ -25,7 +25,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#
##############################################################################
diff --git a/addons/report_webkit/header.py b/addons/report_webkit/header.py
index 5363f2e9951..b1ced68609f 100644
--- a/addons/report_webkit/header.py
+++ b/addons/report_webkit/header.py
@@ -25,7 +25,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#
##############################################################################
diff --git a/addons/report_webkit/ir_report.py b/addons/report_webkit/ir_report.py
index 7f5dae3ff88..5121ffc866c 100644
--- a/addons/report_webkit/ir_report.py
+++ b/addons/report_webkit/ir_report.py
@@ -25,7 +25,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#
##############################################################################
diff --git a/addons/report_webkit/report_helper.py b/addons/report_webkit/report_helper.py
index 35a38718254..5cfa431f74e 100644
--- a/addons/report_webkit/report_helper.py
+++ b/addons/report_webkit/report_helper.py
@@ -25,7 +25,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#
##############################################################################
diff --git a/addons/report_webkit/webkit_report.py b/addons/report_webkit/webkit_report.py
index b552769fe8e..aeb48cfb975 100644
--- a/addons/report_webkit/webkit_report.py
+++ b/addons/report_webkit/webkit_report.py
@@ -26,7 +26,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#
##############################################################################
diff --git a/addons/report_webkit/wizard/__init__.py b/addons/report_webkit/wizard/__init__.py
index f14ff575845..a53b21220c5 100644
--- a/addons/report_webkit/wizard/__init__.py
+++ b/addons/report_webkit/wizard/__init__.py
@@ -25,7 +25,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#
##############################################################################
diff --git a/addons/report_webkit/wizard/report_webkit_actions.py b/addons/report_webkit/wizard/report_webkit_actions.py
index f471ab67e98..130c2212e62 100644
--- a/addons/report_webkit/wizard/report_webkit_actions.py
+++ b/addons/report_webkit/wizard/report_webkit_actions.py
@@ -25,7 +25,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#
##############################################################################
diff --git a/addons/resource/faces/observer.py b/addons/resource/faces/observer.py
index 4d2a3790796..08ac8de217e 100644
--- a/addons/resource/faces/observer.py
+++ b/addons/resource/faces/observer.py
@@ -22,7 +22,7 @@
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the
# Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
############################################################################
#@-node:<< Copyright >>
diff --git a/addons/resource/faces/pcalendar.py b/addons/resource/faces/pcalendar.py
index 231cb21fbef..e4c42894429 100644
--- a/addons/resource/faces/pcalendar.py
+++ b/addons/resource/faces/pcalendar.py
@@ -22,7 +22,7 @@
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the
# Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
############################################################################
#@-node:<< Copyright >>
diff --git a/addons/resource/faces/plocale.py b/addons/resource/faces/plocale.py
index 75478dc538a..b2fd3c2721b 100644
--- a/addons/resource/faces/plocale.py
+++ b/addons/resource/faces/plocale.py
@@ -17,7 +17,7 @@
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the
# Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
############################################################################
import gettext
diff --git a/addons/resource/faces/resource.py b/addons/resource/faces/resource.py
index 48e74290ff5..fd10a65b764 100644
--- a/addons/resource/faces/resource.py
+++ b/addons/resource/faces/resource.py
@@ -22,7 +22,7 @@
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the
# Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
############################################################################
#@-node:<< Copyright >>
diff --git a/addons/resource/faces/task.py b/addons/resource/faces/task.py
index 2a7ec4f271f..cd9a12e986f 100644
--- a/addons/resource/faces/task.py
+++ b/addons/resource/faces/task.py
@@ -22,7 +22,7 @@
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the
# Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
############################################################################
#@-node:<< Copyright >>
diff --git a/addons/resource/faces/timescale.py b/addons/resource/faces/timescale.py
index 0c4dedcd9b3..2ed516f7f3f 100644
--- a/addons/resource/faces/timescale.py
+++ b/addons/resource/faces/timescale.py
@@ -17,7 +17,7 @@
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the
# Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
############################################################################
import faces.pcalendar as pcal
diff --git a/addons/resource/faces/utils.py b/addons/resource/faces/utils.py
index 9412f045a38..fa9be096e65 100644
--- a/addons/resource/faces/utils.py
+++ b/addons/resource/faces/utils.py
@@ -17,7 +17,7 @@
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the
# Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
############################################################################
import observer
From 810edc8cf93dd6720b4a9a7a30cc98da0e39c01a Mon Sep 17 00:00:00 2001
From: Martin Trigaux
Date: Tue, 14 May 2013 16:16:19 +0200
Subject: [PATCH 112/210] [IMP] use new fsf address
bzr revid: mat@openerp.com-20130514141619-xd30aqer3f3gii31
---
history/gen_graph.sh | 2 +-
openerp/report/render/rml2html/rml2html.py | 2 +-
openerp/report/render/rml2html/utils.py | 2 +-
openerp/report/render/rml2pdf/utils.py | 2 +-
openerp/service/http_server.py | 2 +-
openerp/service/websrv_lib.py | 2 +-
setup.nsi | 2 +-
7 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/history/gen_graph.sh b/history/gen_graph.sh
index b052528eef4..1136764cc54 100755
--- a/history/gen_graph.sh
+++ b/history/gen_graph.sh
@@ -24,7 +24,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#
##############################################################################
diff --git a/openerp/report/render/rml2html/rml2html.py b/openerp/report/render/rml2html/rml2html.py
index 8231c84dc36..ba5122eae54 100644
--- a/openerp/report/render/rml2html/rml2html.py
+++ b/openerp/report/render/rml2html/rml2html.py
@@ -16,7 +16,7 @@
#
# You should have received a copy of the GNU Lesser General Public
# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-13017 USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-13017 USA
#
##############################################################################
diff --git a/openerp/report/render/rml2html/utils.py b/openerp/report/render/rml2html/utils.py
index 8c180d398f9..3bedcff074d 100644
--- a/openerp/report/render/rml2html/utils.py
+++ b/openerp/report/render/rml2html/utils.py
@@ -16,7 +16,7 @@
#
# You should have received a copy of the GNU Lesser General Public
# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-13017 USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-13017 USA
#
##############################################################################
diff --git a/openerp/report/render/rml2pdf/utils.py b/openerp/report/render/rml2pdf/utils.py
index bc3aa06135a..bdf19d3cf77 100644
--- a/openerp/report/render/rml2pdf/utils.py
+++ b/openerp/report/render/rml2pdf/utils.py
@@ -16,7 +16,7 @@
#
# You should have received a copy of the GNU Lesser General Public
# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-13017 USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-13017 USA
#
##############################################################################
diff --git a/openerp/service/http_server.py b/openerp/service/http_server.py
index 6134f75f93e..4c7e925b0d1 100644
--- a/openerp/service/http_server.py
+++ b/openerp/service/http_server.py
@@ -23,7 +23,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
###############################################################################
#.apidoc title: HTTP and XML-RPC Server
diff --git a/openerp/service/websrv_lib.py b/openerp/service/websrv_lib.py
index 2ce6d3fa09d..7bbf8c74739 100644
--- a/openerp/service/websrv_lib.py
+++ b/openerp/service/websrv_lib.py
@@ -21,7 +21,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
###############################################################################
#.apidoc title: HTTP Layer library (websrv_lib)
diff --git a/setup.nsi b/setup.nsi
index 653a8798bb2..4316928917f 100644
--- a/setup.nsi
+++ b/setup.nsi
@@ -21,7 +21,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#####################################################################################
!include 'MUI2.nsh'
From f95fd751df6c5947020e73ad45005abfe4635c2f Mon Sep 17 00:00:00 2001
From: Martin Trigaux
Date: Tue, 14 May 2013 16:17:23 +0200
Subject: [PATCH 113/210] [IMP] remove double space in fsf address
bzr revid: mat@openerp.com-20130514141723-xvtiru2fvhp6enbq
---
addons/web_calendar/static/lib/dhtmlxScheduler/license.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/addons/web_calendar/static/lib/dhtmlxScheduler/license.txt b/addons/web_calendar/static/lib/dhtmlxScheduler/license.txt
index d273d6c65a8..aa990f0d035 100644
--- a/addons/web_calendar/static/lib/dhtmlxScheduler/license.txt
+++ b/addons/web_calendar/static/lib/dhtmlxScheduler/license.txt
@@ -5,7 +5,7 @@ Version 2, June 1991
Copyright (C) 1989, 1991 Free Software Foundation, Inc.
-51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
+51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
Everyone is permitted to copy and distribute verbatim copies
From 8fd6cb92e7308ebd8e2bf7711fe4db3d90313b32 Mon Sep 17 00:00:00 2001
From: Martin Trigaux
Date: Tue, 14 May 2013 16:28:37 +0200
Subject: [PATCH 114/210] [IMP] use exact writing for fsf address
bzr revid: mat@openerp.com-20130514142837-jt65d8xjd1eozqst
---
addons/account/report/account_general_ledger.py | 2 +-
addons/account_test/account_test.py | 2 +-
addons/document_webdav/__openerp__.py | 2 +-
addons/document_webdav/test_davclient.py | 2 +-
addons/document_webdav/webdav_server.py | 2 +-
addons/l10n_ar/__init__.py | 2 +-
addons/l10n_bo/__init__.py | 2 +-
addons/l10n_cl/__init__.py | 2 +-
addons/l10n_fr/__init__.py | 2 +-
addons/l10n_fr/__openerp__.py | 2 +-
addons/l10n_fr/report/__init__.py | 2 +-
addons/l10n_fr/report/base_report.py | 2 +-
addons/l10n_fr/report/bilan_report.py | 2 +-
addons/l10n_fr/report/compute_resultant_report.py | 2 +-
addons/l10n_fr/wizard/__init__.py | 2 +-
addons/l10n_fr/wizard/fr_report_bilan.py | 2 +-
addons/l10n_fr/wizard/fr_report_compute_resultant.py | 2 +-
addons/l10n_nl/__init__.py | 2 +-
addons/l10n_nl/__openerp__.py | 2 +-
addons/l10n_pa/__init__.py | 2 +-
addons/l10n_pe/__init__.py | 2 +-
addons/report_webkit/__init__.py | 2 +-
addons/report_webkit/__openerp__.py | 2 +-
addons/report_webkit/company.py | 2 +-
addons/report_webkit/convert.py | 2 +-
addons/report_webkit/header.py | 2 +-
addons/report_webkit/ir_report.py | 2 +-
addons/report_webkit/report_helper.py | 2 +-
addons/report_webkit/webkit_report.py | 2 +-
addons/report_webkit/wizard/__init__.py | 2 +-
addons/report_webkit/wizard/report_webkit_actions.py | 2 +-
addons/resource/faces/observer.py | 2 +-
addons/resource/faces/pcalendar.py | 2 +-
addons/resource/faces/plocale.py | 2 +-
addons/resource/faces/resource.py | 2 +-
addons/resource/faces/task.py | 2 +-
addons/resource/faces/timescale.py | 2 +-
addons/resource/faces/utils.py | 2 +-
38 files changed, 38 insertions(+), 38 deletions(-)
diff --git a/addons/account/report/account_general_ledger.py b/addons/account/report/account_general_ledger.py
index e0f24c432e9..4f712ad58cc 100644
--- a/addons/account/report/account_general_ledger.py
+++ b/addons/account/report/account_general_ledger.py
@@ -23,7 +23,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
#
##############################################################################
diff --git a/addons/account_test/account_test.py b/addons/account_test/account_test.py
index 0a5f6ce5617..4542511e726 100644
--- a/addons/account_test/account_test.py
+++ b/addons/account_test/account_test.py
@@ -24,7 +24,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
#
##############################################################################
diff --git a/addons/document_webdav/__openerp__.py b/addons/document_webdav/__openerp__.py
index b2aacc9593a..befb87829ed 100644
--- a/addons/document_webdav/__openerp__.py
+++ b/addons/document_webdav/__openerp__.py
@@ -24,7 +24,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
#
##############################################################################
diff --git a/addons/document_webdav/test_davclient.py b/addons/document_webdav/test_davclient.py
index 5ee02819e09..f3a8b35b582 100644
--- a/addons/document_webdav/test_davclient.py
+++ b/addons/document_webdav/test_davclient.py
@@ -23,7 +23,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
###############################################################################
""" A trivial HTTP/WebDAV client, used for testing the server
diff --git a/addons/document_webdav/webdav_server.py b/addons/document_webdav/webdav_server.py
index 4284f25d1c0..1ee89eb04c3 100644
--- a/addons/document_webdav/webdav_server.py
+++ b/addons/document_webdav/webdav_server.py
@@ -30,7 +30,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
###############################################################################
diff --git a/addons/l10n_ar/__init__.py b/addons/l10n_ar/__init__.py
index bef6fa84279..25e7e337165 100644
--- a/addons/l10n_ar/__init__.py
+++ b/addons/l10n_ar/__init__.py
@@ -23,7 +23,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
#
##############################################################################
diff --git a/addons/l10n_bo/__init__.py b/addons/l10n_bo/__init__.py
index bef6fa84279..25e7e337165 100644
--- a/addons/l10n_bo/__init__.py
+++ b/addons/l10n_bo/__init__.py
@@ -23,7 +23,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
#
##############################################################################
diff --git a/addons/l10n_cl/__init__.py b/addons/l10n_cl/__init__.py
index bef6fa84279..25e7e337165 100644
--- a/addons/l10n_cl/__init__.py
+++ b/addons/l10n_cl/__init__.py
@@ -23,7 +23,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
#
##############################################################################
diff --git a/addons/l10n_fr/__init__.py b/addons/l10n_fr/__init__.py
index fda93f21bd5..592068eedda 100644
--- a/addons/l10n_fr/__init__.py
+++ b/addons/l10n_fr/__init__.py
@@ -22,7 +22,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
#
##############################################################################
diff --git a/addons/l10n_fr/__openerp__.py b/addons/l10n_fr/__openerp__.py
index 9a956a9b284..9a563eeb197 100644
--- a/addons/l10n_fr/__openerp__.py
+++ b/addons/l10n_fr/__openerp__.py
@@ -22,7 +22,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
#
##############################################################################
{
diff --git a/addons/l10n_fr/report/__init__.py b/addons/l10n_fr/report/__init__.py
index c6881fdac81..c73179a9023 100644
--- a/addons/l10n_fr/report/__init__.py
+++ b/addons/l10n_fr/report/__init__.py
@@ -22,7 +22,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
#
##############################################################################
diff --git a/addons/l10n_fr/report/base_report.py b/addons/l10n_fr/report/base_report.py
index 0bc139196f1..bc2cd308bf8 100644
--- a/addons/l10n_fr/report/base_report.py
+++ b/addons/l10n_fr/report/base_report.py
@@ -22,7 +22,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
#
##############################################################################
diff --git a/addons/l10n_fr/report/bilan_report.py b/addons/l10n_fr/report/bilan_report.py
index 9c477e17813..2ffbd24cc4f 100644
--- a/addons/l10n_fr/report/bilan_report.py
+++ b/addons/l10n_fr/report/bilan_report.py
@@ -22,7 +22,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
#
##############################################################################
diff --git a/addons/l10n_fr/report/compute_resultant_report.py b/addons/l10n_fr/report/compute_resultant_report.py
index 94f2d275fbb..5eb62d7e82d 100644
--- a/addons/l10n_fr/report/compute_resultant_report.py
+++ b/addons/l10n_fr/report/compute_resultant_report.py
@@ -22,7 +22,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
#
##############################################################################
diff --git a/addons/l10n_fr/wizard/__init__.py b/addons/l10n_fr/wizard/__init__.py
index a4640d111da..1bbaf351ea4 100644
--- a/addons/l10n_fr/wizard/__init__.py
+++ b/addons/l10n_fr/wizard/__init__.py
@@ -22,7 +22,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
#
##############################################################################
diff --git a/addons/l10n_fr/wizard/fr_report_bilan.py b/addons/l10n_fr/wizard/fr_report_bilan.py
index c2c851785d9..046161befd8 100644
--- a/addons/l10n_fr/wizard/fr_report_bilan.py
+++ b/addons/l10n_fr/wizard/fr_report_bilan.py
@@ -22,7 +22,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
#
##############################################################################
diff --git a/addons/l10n_fr/wizard/fr_report_compute_resultant.py b/addons/l10n_fr/wizard/fr_report_compute_resultant.py
index 35f5e296185..d00d9165f6e 100644
--- a/addons/l10n_fr/wizard/fr_report_compute_resultant.py
+++ b/addons/l10n_fr/wizard/fr_report_compute_resultant.py
@@ -22,7 +22,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
#
##############################################################################
diff --git a/addons/l10n_nl/__init__.py b/addons/l10n_nl/__init__.py
index af15e1b315d..ee9f0292f12 100644
--- a/addons/l10n_nl/__init__.py
+++ b/addons/l10n_nl/__init__.py
@@ -22,7 +22,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
#
##############################################################################
diff --git a/addons/l10n_nl/__openerp__.py b/addons/l10n_nl/__openerp__.py
index 39a9c70080f..aec85016ea5 100644
--- a/addons/l10n_nl/__openerp__.py
+++ b/addons/l10n_nl/__openerp__.py
@@ -22,7 +22,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
#
##############################################################################
#
diff --git a/addons/l10n_pa/__init__.py b/addons/l10n_pa/__init__.py
index bef6fa84279..25e7e337165 100644
--- a/addons/l10n_pa/__init__.py
+++ b/addons/l10n_pa/__init__.py
@@ -23,7 +23,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
#
##############################################################################
diff --git a/addons/l10n_pe/__init__.py b/addons/l10n_pe/__init__.py
index bef6fa84279..25e7e337165 100644
--- a/addons/l10n_pe/__init__.py
+++ b/addons/l10n_pe/__init__.py
@@ -23,7 +23,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
#
##############################################################################
diff --git a/addons/report_webkit/__init__.py b/addons/report_webkit/__init__.py
index aa091570540..3a3c6663d92 100644
--- a/addons/report_webkit/__init__.py
+++ b/addons/report_webkit/__init__.py
@@ -25,7 +25,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
#
##############################################################################
diff --git a/addons/report_webkit/__openerp__.py b/addons/report_webkit/__openerp__.py
index fff9dafd81a..84130728065 100644
--- a/addons/report_webkit/__openerp__.py
+++ b/addons/report_webkit/__openerp__.py
@@ -25,7 +25,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
#
##############################################################################
diff --git a/addons/report_webkit/company.py b/addons/report_webkit/company.py
index 26578d80fd5..b29354938de 100644
--- a/addons/report_webkit/company.py
+++ b/addons/report_webkit/company.py
@@ -25,7 +25,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
#
##############################################################################
diff --git a/addons/report_webkit/convert.py b/addons/report_webkit/convert.py
index 3c6163528c1..e30209a77dc 100644
--- a/addons/report_webkit/convert.py
+++ b/addons/report_webkit/convert.py
@@ -25,7 +25,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
#
##############################################################################
diff --git a/addons/report_webkit/header.py b/addons/report_webkit/header.py
index b1ced68609f..688517b91fb 100644
--- a/addons/report_webkit/header.py
+++ b/addons/report_webkit/header.py
@@ -25,7 +25,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
#
##############################################################################
diff --git a/addons/report_webkit/ir_report.py b/addons/report_webkit/ir_report.py
index 5121ffc866c..b95ee78dc10 100644
--- a/addons/report_webkit/ir_report.py
+++ b/addons/report_webkit/ir_report.py
@@ -25,7 +25,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
#
##############################################################################
diff --git a/addons/report_webkit/report_helper.py b/addons/report_webkit/report_helper.py
index 5cfa431f74e..884893a5eb7 100644
--- a/addons/report_webkit/report_helper.py
+++ b/addons/report_webkit/report_helper.py
@@ -25,7 +25,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
#
##############################################################################
diff --git a/addons/report_webkit/webkit_report.py b/addons/report_webkit/webkit_report.py
index aeb48cfb975..9cd509b0543 100644
--- a/addons/report_webkit/webkit_report.py
+++ b/addons/report_webkit/webkit_report.py
@@ -26,7 +26,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
#
##############################################################################
diff --git a/addons/report_webkit/wizard/__init__.py b/addons/report_webkit/wizard/__init__.py
index a53b21220c5..e95244cc7aa 100644
--- a/addons/report_webkit/wizard/__init__.py
+++ b/addons/report_webkit/wizard/__init__.py
@@ -25,7 +25,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
#
##############################################################################
diff --git a/addons/report_webkit/wizard/report_webkit_actions.py b/addons/report_webkit/wizard/report_webkit_actions.py
index 130c2212e62..713c2f80009 100644
--- a/addons/report_webkit/wizard/report_webkit_actions.py
+++ b/addons/report_webkit/wizard/report_webkit_actions.py
@@ -25,7 +25,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
#
##############################################################################
diff --git a/addons/resource/faces/observer.py b/addons/resource/faces/observer.py
index 08ac8de217e..28ae58eb2b6 100644
--- a/addons/resource/faces/observer.py
+++ b/addons/resource/faces/observer.py
@@ -22,7 +22,7 @@
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the
# Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
############################################################################
#@-node:<< Copyright >>
diff --git a/addons/resource/faces/pcalendar.py b/addons/resource/faces/pcalendar.py
index e4c42894429..24c974233d8 100644
--- a/addons/resource/faces/pcalendar.py
+++ b/addons/resource/faces/pcalendar.py
@@ -22,7 +22,7 @@
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the
# Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
############################################################################
#@-node:<< Copyright >>
diff --git a/addons/resource/faces/plocale.py b/addons/resource/faces/plocale.py
index b2fd3c2721b..908fd1252e9 100644
--- a/addons/resource/faces/plocale.py
+++ b/addons/resource/faces/plocale.py
@@ -17,7 +17,7 @@
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the
# Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
############################################################################
import gettext
diff --git a/addons/resource/faces/resource.py b/addons/resource/faces/resource.py
index fd10a65b764..faee8174994 100644
--- a/addons/resource/faces/resource.py
+++ b/addons/resource/faces/resource.py
@@ -22,7 +22,7 @@
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the
# Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
############################################################################
#@-node:<< Copyright >>
diff --git a/addons/resource/faces/task.py b/addons/resource/faces/task.py
index cd9a12e986f..961f6213d1d 100644
--- a/addons/resource/faces/task.py
+++ b/addons/resource/faces/task.py
@@ -22,7 +22,7 @@
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the
# Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
############################################################################
#@-node:<< Copyright >>
diff --git a/addons/resource/faces/timescale.py b/addons/resource/faces/timescale.py
index 2ed516f7f3f..818c031b7d5 100644
--- a/addons/resource/faces/timescale.py
+++ b/addons/resource/faces/timescale.py
@@ -17,7 +17,7 @@
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the
# Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
############################################################################
import faces.pcalendar as pcal
diff --git a/addons/resource/faces/utils.py b/addons/resource/faces/utils.py
index fa9be096e65..6568c314fb5 100644
--- a/addons/resource/faces/utils.py
+++ b/addons/resource/faces/utils.py
@@ -17,7 +17,7 @@
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the
# Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
############################################################################
import observer
From 7f3b9ef9e322e9ca21abe63fa3289bd6d3156a5b Mon Sep 17 00:00:00 2001
From: Martin Trigaux
Date: Tue, 14 May 2013 16:29:26 +0200
Subject: [PATCH 115/210] [IMP] use exact writing for fsf address
bzr revid: mat@openerp.com-20130514142926-twja0tqy64s9eo09
---
history/gen_graph.sh | 2 +-
openerp/service/http_server.py | 2 +-
openerp/service/websrv_lib.py | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/history/gen_graph.sh b/history/gen_graph.sh
index 1136764cc54..7be31ed8061 100755
--- a/history/gen_graph.sh
+++ b/history/gen_graph.sh
@@ -24,7 +24,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
#
##############################################################################
diff --git a/openerp/service/http_server.py b/openerp/service/http_server.py
index 4c7e925b0d1..03ec1541ee7 100644
--- a/openerp/service/http_server.py
+++ b/openerp/service/http_server.py
@@ -23,7 +23,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
###############################################################################
#.apidoc title: HTTP and XML-RPC Server
diff --git a/openerp/service/websrv_lib.py b/openerp/service/websrv_lib.py
index 7bbf8c74739..bc7e37bdf91 100644
--- a/openerp/service/websrv_lib.py
+++ b/openerp/service/websrv_lib.py
@@ -21,7 +21,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
###############################################################################
#.apidoc title: HTTP Layer library (websrv_lib)
From c22dd59c8589457aba7b1afd323321db507ff50f Mon Sep 17 00:00:00 2001
From: Martin Trigaux
Date: Tue, 14 May 2013 16:32:54 +0200
Subject: [PATCH 116/210] [IMP] use exact writing for fsf address
bzr revid: mat@openerp.com-20130514143254-f9ap1pkh7253xs1g
---
debian/copyright | 8 ++++----
openerp/report/render/rml2html/rml2html.py | 2 +-
openerp/report/render/rml2html/utils.py | 2 +-
openerp/report/render/rml2pdf/utils.py | 2 +-
setup.nsi | 2 +-
5 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/debian/copyright b/debian/copyright
index f681d540a0a..e477adb524d 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -40,7 +40,7 @@ License: GPL-2+
.
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
.
On Debian systems, the complete text of the GNU General Public License
can be found in /usr/share/common-licenses/GPL-2 file.
@@ -93,7 +93,7 @@ License: LGPL-2.1
.
You should have received a copy of the GNU Library General Public
License along with this library; if not, write to the Free
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
.
On Debian systems, the complete text of the GNU Library General Public License
can be found in /usr/share/common-licenses/LGPL-2.1 file.
@@ -137,7 +137,7 @@ License: GPL-2+
.
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
.
On Debian systems, the complete text of the GNU General Public License
can be found in /usr/share/common-licenses/GPL-2 file.
@@ -159,7 +159,7 @@ License: GPL-2+
.
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
.
On Debian systems, the complete text of the GNU General Public License
can be found in /usr/share/common-licenses/GPL-2 file.
diff --git a/openerp/report/render/rml2html/rml2html.py b/openerp/report/render/rml2html/rml2html.py
index ba5122eae54..9122d068e6e 100644
--- a/openerp/report/render/rml2html/rml2html.py
+++ b/openerp/report/render/rml2html/rml2html.py
@@ -16,7 +16,7 @@
#
# You should have received a copy of the GNU Lesser General Public
# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-13017 USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
#
##############################################################################
diff --git a/openerp/report/render/rml2html/utils.py b/openerp/report/render/rml2html/utils.py
index 3bedcff074d..7c81a65a4e8 100644
--- a/openerp/report/render/rml2html/utils.py
+++ b/openerp/report/render/rml2html/utils.py
@@ -16,7 +16,7 @@
#
# You should have received a copy of the GNU Lesser General Public
# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-13017 USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
#
##############################################################################
diff --git a/openerp/report/render/rml2pdf/utils.py b/openerp/report/render/rml2pdf/utils.py
index bdf19d3cf77..954ef842fbb 100644
--- a/openerp/report/render/rml2pdf/utils.py
+++ b/openerp/report/render/rml2pdf/utils.py
@@ -16,7 +16,7 @@
#
# You should have received a copy of the GNU Lesser General Public
# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-13017 USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
#
##############################################################################
diff --git a/setup.nsi b/setup.nsi
index 4316928917f..859ebdb39e2 100644
--- a/setup.nsi
+++ b/setup.nsi
@@ -21,7 +21,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
#####################################################################################
!include 'MUI2.nsh'
From 8c08d178d25be7daa5a68cdac17a19f0b676f9a6 Mon Sep 17 00:00:00 2001
From: Martin Trigaux
Date: Tue, 14 May 2013 16:34:02 +0200
Subject: [PATCH 117/210] [IMP] use exact writing for fsf address
bzr revid: mat@openerp.com-20130514143402-amqukyz9mpeq5y95
---
addons/web_calendar/static/lib/dhtmlxScheduler/license.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/addons/web_calendar/static/lib/dhtmlxScheduler/license.txt b/addons/web_calendar/static/lib/dhtmlxScheduler/license.txt
index aa990f0d035..f695d8ecb2c 100644
--- a/addons/web_calendar/static/lib/dhtmlxScheduler/license.txt
+++ b/addons/web_calendar/static/lib/dhtmlxScheduler/license.txt
@@ -5,7 +5,7 @@ Version 2, June 1991
Copyright (C) 1989, 1991 Free Software Foundation, Inc.
-51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
+51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
Everyone is permitted to copy and distribute verbatim copies
From 66544243880e9c37752afb9d38e54673a83c96c4 Mon Sep 17 00:00:00 2001
From: Martin Trigaux
Date: Tue, 14 May 2013 16:37:28 +0200
Subject: [PATCH 118/210] [IMP] use exact writing for fsf address
bzr revid: mat@openerp.com-20130514143728-s341hmkw5dw9l7o1
---
.../plugin/openerp_report_designer/bin/script/About.py | 2 +-
.../plugin/openerp_report_designer/bin/script/AddAttachment.py | 2 +-
.../plugin/openerp_report_designer/bin/script/Change.py | 2 +-
.../openerp_report_designer/bin/script/ConvertBracesToField.py | 2 +-
.../openerp_report_designer/bin/script/ConvertFieldsToBraces.py | 2 +-
.../plugin/openerp_report_designer/bin/script/ExportToRML.py | 2 +-
.../plugin/openerp_report_designer/bin/script/Expression.py | 2 +-
.../plugin/openerp_report_designer/bin/script/Fields.py | 2 +-
.../plugin/openerp_report_designer/bin/script/LoginTest.py | 2 +-
.../openerp_report_designer/bin/script/ModifyExistingReport.py | 2 +-
.../plugin/openerp_report_designer/bin/script/NewReport.py | 2 +-
.../plugin/openerp_report_designer/bin/script/Repeatln.py | 2 +-
.../plugin/openerp_report_designer/bin/script/SendToServer.py | 2 +-
.../openerp_report_designer/bin/script/ServerParameter.py | 2 +-
.../plugin/openerp_report_designer/bin/script/Translation.py | 2 +-
.../plugin/openerp_report_designer/bin/script/__init__.py | 2 +-
.../plugin/openerp_report_designer/bin/script/compile_all.py | 2 +-
.../plugin/openerp_report_designer/bin/script/lib/actions.py | 2 +-
.../plugin/openerp_report_designer/bin/script/lib/error.py | 2 +-
.../plugin/openerp_report_designer/bin/script/lib/functions.py | 2 +-
.../plugin/openerp_report_designer/bin/script/lib/gui.py | 2 +-
.../plugin/openerp_report_designer/bin/script/modify.py | 2 +-
22 files changed, 22 insertions(+), 22 deletions(-)
diff --git a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/About.py b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/About.py
index 5d6bea06b9c..9fb6cd11219 100644
--- a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/About.py
+++ b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/About.py
@@ -15,7 +15,7 @@
#
# You should have received a copy of the GNU Lesser General Public
# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-13017 USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
#
# See: http://www.gnu.org/licenses/lgpl.html
#
diff --git a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/AddAttachment.py b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/AddAttachment.py
index a820b38ad35..2dce1750e34 100644
--- a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/AddAttachment.py
+++ b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/AddAttachment.py
@@ -15,7 +15,7 @@
#
# You should have received a copy of the GNU Lesser General Public
# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-13017 USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
#
# See: http://www.gnu.org/licenses/lgpl.html
#
diff --git a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/Change.py b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/Change.py
index 0448a1ebda4..e0b66780e8b 100644
--- a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/Change.py
+++ b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/Change.py
@@ -15,7 +15,7 @@
#
# You should have received a copy of the GNU Lesser General Public
# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-13017 USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
#
# See: http://www.gnu.org/licenses/lgpl.html
#
diff --git a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/ConvertBracesToField.py b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/ConvertBracesToField.py
index 3115f2435ee..17cc25687b1 100644
--- a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/ConvertBracesToField.py
+++ b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/ConvertBracesToField.py
@@ -15,7 +15,7 @@
#
# You should have received a copy of the GNU Lesser General Public
# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-13017 USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
#
# See: http://www.gnu.org/licenses/lgpl.html
#
diff --git a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/ConvertFieldsToBraces.py b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/ConvertFieldsToBraces.py
index 24efa36c8b2..b8abcb1dc6c 100644
--- a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/ConvertFieldsToBraces.py
+++ b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/ConvertFieldsToBraces.py
@@ -15,7 +15,7 @@
#
# You should have received a copy of the GNU Lesser General Public
# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-13017 USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
#
# See: http://www.gnu.org/licenses/lgpl.html
#
diff --git a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/ExportToRML.py b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/ExportToRML.py
index 4ed19466ed2..a12becdc68c 100644
--- a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/ExportToRML.py
+++ b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/ExportToRML.py
@@ -15,7 +15,7 @@
#
# You should have received a copy of the GNU Lesser General Public
# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-13017 USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
#
# See: http://www.gnu.org/licenses/lgpl.html
#
diff --git a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/Expression.py b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/Expression.py
index 1ec7c8c3cde..896a5954c7d 100644
--- a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/Expression.py
+++ b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/Expression.py
@@ -15,7 +15,7 @@
#
# You should have received a copy of the GNU Lesser General Public
# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-13017 USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
#
# See: http://www.gnu.org/licenses/lgpl.html
#
diff --git a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/Fields.py b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/Fields.py
index 6edb8165dfa..8ed4d2c25e8 100644
--- a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/Fields.py
+++ b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/Fields.py
@@ -15,7 +15,7 @@
#
# You should have received a copy of the GNU Lesser General Public
# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-13017 USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
#
# See: http://www.gnu.org/licenses/lgpl.html
#
diff --git a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/LoginTest.py b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/LoginTest.py
index e1d3bd05b20..11c74555447 100644
--- a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/LoginTest.py
+++ b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/LoginTest.py
@@ -15,7 +15,7 @@
#
# You should have received a copy of the GNU Lesser General Public
# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-13017 USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
#
# See: http://www.gnu.org/licenses/lgpl.html
#
diff --git a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/ModifyExistingReport.py b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/ModifyExistingReport.py
index d91333a6445..ef1d3548a6e 100644
--- a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/ModifyExistingReport.py
+++ b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/ModifyExistingReport.py
@@ -15,7 +15,7 @@
#
# You should have received a copy of the GNU Lesser General Public
# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-13017 USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
#
# See: http://www.gnu.org/licenses/lgpl.html
#
diff --git a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/NewReport.py b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/NewReport.py
index 86d1beff331..3c6316d9fdb 100644
--- a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/NewReport.py
+++ b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/NewReport.py
@@ -15,7 +15,7 @@
#
# You should have received a copy of the GNU Lesser General Public
# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-13017 USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
#
# See: http://www.gnu.org/licenses/lgpl.html
#
diff --git a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/Repeatln.py b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/Repeatln.py
index 086a55f1a81..b6edaecdc44 100644
--- a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/Repeatln.py
+++ b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/Repeatln.py
@@ -15,7 +15,7 @@
#
# You should have received a copy of the GNU Lesser General Public
# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-13017 USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
#
# See: http://www.gnu.org/licenses/lgpl.html
#
diff --git a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/SendToServer.py b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/SendToServer.py
index 17a6049049b..dbd0a51d66d 100644
--- a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/SendToServer.py
+++ b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/SendToServer.py
@@ -15,7 +15,7 @@
#
# You should have received a copy of the GNU Lesser General Public
# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-13017 USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
#
# See: http://www.gnu.org/licenses/lgpl.html
#
diff --git a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/ServerParameter.py b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/ServerParameter.py
index 0b5d452ebfd..b09b02699b0 100644
--- a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/ServerParameter.py
+++ b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/ServerParameter.py
@@ -15,7 +15,7 @@
#
# You should have received a copy of the GNU Lesser General Public
# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-13017 USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
#
# See: http://www.gnu.org/licenses/lgpl.html
#
diff --git a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/Translation.py b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/Translation.py
index 5fc3b9f6bc7..132882e0932 100644
--- a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/Translation.py
+++ b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/Translation.py
@@ -15,7 +15,7 @@
#
# You should have received a copy of the GNU Lesser General Public
# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-13017 USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
#
# See: http://www.gnu.org/licenses/lgpl.html
#
diff --git a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/__init__.py b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/__init__.py
index 352099df61c..d7f93351fac 100644
--- a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/__init__.py
+++ b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/__init__.py
@@ -15,7 +15,7 @@
#
# You should have received a copy of the GNU Lesser General Public
# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-13017 USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
#
# See: http://www.gnu.org/licenses/lgpl.html
#
diff --git a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/compile_all.py b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/compile_all.py
index bdfb9c8564b..897f9abd00c 100644
--- a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/compile_all.py
+++ b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/compile_all.py
@@ -15,7 +15,7 @@
#
# You should have received a copy of the GNU Lesser General Public
# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-13017 USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
#
# See: http://www.gnu.org/licenses/lgpl.html
#
diff --git a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/lib/actions.py b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/lib/actions.py
index 5dda402b2d7..cf82d0e1a76 100644
--- a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/lib/actions.py
+++ b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/lib/actions.py
@@ -15,7 +15,7 @@
#
# You should have received a copy of the GNU Lesser General Public
# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
#
# See: http://www.gnu.org/licenses/lgpl.html
#
diff --git a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/lib/error.py b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/lib/error.py
index f8e22ea33d5..f44404eaa16 100644
--- a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/lib/error.py
+++ b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/lib/error.py
@@ -15,7 +15,7 @@
#
# You should have received a copy of the GNU Lesser General Public
# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
#
# See: http://www.gnu.org/licenses/lgpl.html
#
diff --git a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/lib/functions.py b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/lib/functions.py
index 2e1f45cf0df..52af0821790 100644
--- a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/lib/functions.py
+++ b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/lib/functions.py
@@ -15,7 +15,7 @@
#
# You should have received a copy of the GNU Lesser General Public
# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
#
# See: http://www.gnu.org/licenses/lgpl.html
#
diff --git a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/lib/gui.py b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/lib/gui.py
index df2171ce22e..92b5ab750ca 100644
--- a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/lib/gui.py
+++ b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/lib/gui.py
@@ -15,7 +15,7 @@
#
# You should have received a copy of the GNU Lesser General Public
# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
#
# See: http://www.gnu.org/licenses/lgpl.html
#
diff --git a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/modify.py b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/modify.py
index 3687a34ee3a..f8d90c30d75 100644
--- a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/modify.py
+++ b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/modify.py
@@ -15,7 +15,7 @@
#
# You should have received a copy of the GNU Lesser General Public
# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-13017 USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
#
# See: http://www.gnu.org/licenses/lgpl.html
#
From b4bc1a38bf4e389f2bd2ea3027af82daf84c5e20 Mon Sep 17 00:00:00 2001
From: Launchpad Translations on behalf of openerp <>
Date: Wed, 15 May 2013 06:07:47 +0000
Subject: [PATCH 119/210] Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20130515060747-d8cgvt2npsgcihpk
---
addons/account/i18n/ko.po | 2 +-
addons/hr/i18n/ru.po | 10 +++++-----
addons/portal/i18n/ko.po | 2 +-
3 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/addons/account/i18n/ko.po b/addons/account/i18n/ko.po
index 36b61c2ea77..3ce33e32685 100644
--- a/addons/account/i18n/ko.po
+++ b/addons/account/i18n/ko.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: 2013-05-14 06:25+0000\n"
+"X-Launchpad-Export-Date: 2013-05-15 06:07+0000\n"
"X-Generator: Launchpad (build 16617)\n"
#. module: account
diff --git a/addons/hr/i18n/ru.po b/addons/hr/i18n/ru.po
index 56f4d34c8ea..19dca6ea133 100644
--- a/addons/hr/i18n/ru.po
+++ b/addons/hr/i18n/ru.po
@@ -8,14 +8,14 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2013-03-07 08:37+0000\n"
-"PO-Revision-Date: 2012-12-21 23:00+0000\n"
-"Last-Translator: FULL NAME \n"
+"PO-Revision-Date: 2013-05-14 12:42+0000\n"
+"Last-Translator: Paul Korotkov \n"
"Language-Team: Russian \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-03-28 05:40+0000\n"
-"X-Generator: Launchpad (build 16546)\n"
+"X-Launchpad-Export-Date: 2013-05-15 06:07+0000\n"
+"X-Generator: Launchpad (build 16617)\n"
#. module: hr
#: model:process.node,name:hr.process_node_openerpuser0
@@ -69,7 +69,7 @@ msgstr ""
#: view:hr.employee:0
#: view:hr.job:0
msgid "Group By..."
-msgstr "Объеденить по..."
+msgstr "Группировать по ..."
#. module: hr
#: model:ir.actions.act_window,name:hr.view_department_form_installer
diff --git a/addons/portal/i18n/ko.po b/addons/portal/i18n/ko.po
index f6325669652..6aee5f9a5c8 100644
--- a/addons/portal/i18n/ko.po
+++ b/addons/portal/i18n/ko.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: 2013-05-14 06:25+0000\n"
+"X-Launchpad-Export-Date: 2013-05-15 06:07+0000\n"
"X-Generator: Launchpad (build 16617)\n"
#. module: portal
From b1338a1c8fb32cbd66a9b5b78bc573c0a32af68f Mon Sep 17 00:00:00 2001
From: niv-openerp
Date: Wed, 15 May 2013 10:56:18 +0200
Subject: [PATCH 120/210] fix
bzr revid: nicolas.vanhoren@openerp.com-20130515085618-m72mahjie4iguwhy
---
addons/web/controllers/main.py | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/addons/web/controllers/main.py b/addons/web/controllers/main.py
index 01624ceb1ce..64df4a95ecf 100644
--- a/addons/web/controllers/main.py
+++ b/addons/web/controllers/main.py
@@ -281,8 +281,9 @@ def concat_files(file_list, reader=None, intersperse=""):
if reader is None:
def reader(f):
- with open(f, 'rb') as fp:
- return fp.read()
+ import codecs
+ with codecs.open(f, 'r', "utf-8-sig") as fp:
+ return fp.read().encode("utf-8")
files_content = []
for fname in file_list:
From f77cf1b6036401b46c80e76b06b22d01f3726cc3 Mon Sep 17 00:00:00 2001
From: niv-openerp
Date: Wed, 15 May 2013 11:02:31 +0200
Subject: [PATCH 121/210] wip
bzr revid: nicolas.vanhoren@openerp.com-20130515090231-pj7q042poo2183sp
---
addons/web/controllers/main.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/addons/web/controllers/main.py b/addons/web/controllers/main.py
index 64df4a95ecf..c0117043b43 100644
--- a/addons/web/controllers/main.py
+++ b/addons/web/controllers/main.py
@@ -282,7 +282,7 @@ def concat_files(file_list, reader=None, intersperse=""):
if reader is None:
def reader(f):
import codecs
- with codecs.open(f, 'r', "utf-8-sig") as fp:
+ with codecs.open(f, 'rb', "utf-8-sig") as fp:
return fp.read().encode("utf-8")
files_content = []
From 90d278a6a6249da0dba3bf7a4f7fc84e7fe3b015 Mon Sep 17 00:00:00 2001
From: niv-openerp
Date: Wed, 15 May 2013 11:54:13 +0200
Subject: [PATCH 122/210] changed encodings
bzr revid: nicolas.vanhoren@openerp.com-20130515095413-tdvyurv8dwgvj0vd
---
addons/web/static/lib/datejs/date.js | 4 +-
.../static/lib/flotr2/lib/canvastext.js | 110 +++++++++---------
2 files changed, 57 insertions(+), 57 deletions(-)
diff --git a/addons/web/static/lib/datejs/date.js b/addons/web/static/lib/datejs/date.js
index eda450113bb..96b96924da4 100644
--- a/addons/web/static/lib/datejs/date.js
+++ b/addons/web/static/lib/datejs/date.js
@@ -7,7 +7,7 @@
* date.js // English (United States)
* date-en-US.js // English (United States)
* date-de-DE.js // Deutsch (Deutschland)
- * date-es-MX.js // français (France)
+ * date-es-MX.js // français (France)
*/
alert(
@@ -17,5 +17,5 @@ alert(
" date.js // English (United States)\n" +
" date-en-US.js // English (United States)\n" +
" date-de-DE.js // Deutsch (Deutschland)\n" +
- " date-es-MX.js // français (France)\n"
+ " date-es-MX.js // français (France)\n"
);
\ No newline at end of file
diff --git a/addons/web_graph/static/lib/flotr2/lib/canvastext.js b/addons/web_graph/static/lib/flotr2/lib/canvastext.js
index 3266729f6a6..2df45bae0d8 100644
--- a/addons/web_graph/static/lib/flotr2/lib/canvastext.js
+++ b/addons/web_graph/static/lib/flotr2/lib/canvastext.js
@@ -1,7 +1,7 @@
/**
* This code is released to the public domain by Jim Studt, 2007.
* He may keep some sort of up to date copy at http://www.federated.com/~jim/canvastext/
- * It as been modified by Fabien Ménager to handle font style like size, weight, color and rotation.
+ * It as been modified by Fabien Ménager to handle font style like size, weight, color and rotation.
* A partial support for special characters has been added too.
*/
var CanvasText = {
@@ -108,71 +108,71 @@ var CanvasText = {
'~': { width: 24, points: [[3,6],[3,8],[4,11],[6,12],[8,12],[10,11],[14,8],[16,7],[18,7],[20,8],[21,10],null,[3,8],[4,10],[6,11],[8,11],[10,10],[14,7],[16,6],[18,6],[20,7],[21,10],[21,12]] },
// Lower case Latin-1
- 'à': { diacritic: '`', letter: 'a' },
- 'á': { diacritic: '´', letter: 'a' },
- 'â': { diacritic: '^', letter: 'a' },
- 'ä': { diacritic: '¨', letter: 'a' },
- 'ã': { diacritic: '~', letter: 'a' },
+ 'à': { diacritic: '`', letter: 'a' },
+ 'á': { diacritic: '´', letter: 'a' },
+ 'â': { diacritic: '^', letter: 'a' },
+ 'ä': { diacritic: '¨', letter: 'a' },
+ 'ã': { diacritic: '~', letter: 'a' },
- 'è': { diacritic: '`', letter: 'e' },
- 'é': { diacritic: '´', letter: 'e' },
- 'ê': { diacritic: '^', letter: 'e' },
- 'ë': { diacritic: '¨', letter: 'e' },
+ 'è': { diacritic: '`', letter: 'e' },
+ 'é': { diacritic: '´', letter: 'e' },
+ 'ê': { diacritic: '^', letter: 'e' },
+ 'ë': { diacritic: '¨', letter: 'e' },
- 'ì': { diacritic: '`', letter: 'i' },
- 'í': { diacritic: '´', letter: 'i' },
- 'î': { diacritic: '^', letter: 'i' },
- 'ï': { diacritic: '¨', letter: 'i' },
+ 'ì': { diacritic: '`', letter: 'i' },
+ 'í': { diacritic: '´', letter: 'i' },
+ 'î': { diacritic: '^', letter: 'i' },
+ 'ï': { diacritic: '¨', letter: 'i' },
- 'ò': { diacritic: '`', letter: 'o' },
- 'ó': { diacritic: '´', letter: 'o' },
- 'ô': { diacritic: '^', letter: 'o' },
- 'ö': { diacritic: '¨', letter: 'o' },
- 'õ': { diacritic: '~', letter: 'o' },
+ 'ò': { diacritic: '`', letter: 'o' },
+ 'ó': { diacritic: '´', letter: 'o' },
+ 'ô': { diacritic: '^', letter: 'o' },
+ 'ö': { diacritic: '¨', letter: 'o' },
+ 'õ': { diacritic: '~', letter: 'o' },
- 'ù': { diacritic: '`', letter: 'u' },
- 'ú': { diacritic: '´', letter: 'u' },
- 'û': { diacritic: '^', letter: 'u' },
- 'ü': { diacritic: '¨', letter: 'u' },
+ 'ù': { diacritic: '`', letter: 'u' },
+ 'ú': { diacritic: '´', letter: 'u' },
+ 'û': { diacritic: '^', letter: 'u' },
+ 'ü': { diacritic: '¨', letter: 'u' },
- 'ý': { diacritic: '´', letter: 'y' },
- 'ÿ': { diacritic: '¨', letter: 'y' },
+ 'ý': { diacritic: '´', letter: 'y' },
+ 'ÿ': { diacritic: '¨', letter: 'y' },
- 'ç': { diacritic: '¸', letter: 'c' },
- 'ñ': { diacritic: '~', letter: 'n' },
+ 'ç': { diacritic: '¸', letter: 'c' },
+ 'ñ': { diacritic: '~', letter: 'n' },
// Upper case Latin-1
- 'À': { diacritic: '`', letter: 'A' },
- 'Á': { diacritic: '´', letter: 'A' },
- 'Â': { diacritic: '^', letter: 'A' },
- 'Ä': { diacritic: '¨', letter: 'A' },
- 'Ã': { diacritic: '~', letter: 'A' },
+ 'À': { diacritic: '`', letter: 'A' },
+ 'Á': { diacritic: '´', letter: 'A' },
+ 'Â': { diacritic: '^', letter: 'A' },
+ 'Ä': { diacritic: '¨', letter: 'A' },
+ 'Ã': { diacritic: '~', letter: 'A' },
- 'È': { diacritic: '`', letter: 'E' },
- 'É': { diacritic: '´', letter: 'E' },
- 'Ê': { diacritic: '^', letter: 'E' },
- 'Ë': { diacritic: '¨', letter: 'E' },
+ 'È': { diacritic: '`', letter: 'E' },
+ 'É': { diacritic: '´', letter: 'E' },
+ 'Ê': { diacritic: '^', letter: 'E' },
+ 'Ë': { diacritic: '¨', letter: 'E' },
- 'Ì': { diacritic: '`', letter: 'I' },
- 'Í': { diacritic: '´', letter: 'I' },
- 'Î': { diacritic: '^', letter: 'I' },
- 'Ï': { diacritic: '¨', letter: 'I' },
+ 'Ì': { diacritic: '`', letter: 'I' },
+ 'Í': { diacritic: '´', letter: 'I' },
+ 'Î': { diacritic: '^', letter: 'I' },
+ 'Ï': { diacritic: '¨', letter: 'I' },
- 'Ò': { diacritic: '`', letter: 'O' },
- 'Ó': { diacritic: '´', letter: 'O' },
- 'Ô': { diacritic: '^', letter: 'O' },
- 'Ö': { diacritic: '¨', letter: 'O' },
- 'Õ': { diacritic: '~', letter: 'O' },
+ 'Ò': { diacritic: '`', letter: 'O' },
+ 'Ó': { diacritic: '´', letter: 'O' },
+ 'Ô': { diacritic: '^', letter: 'O' },
+ 'Ö': { diacritic: '¨', letter: 'O' },
+ 'Õ': { diacritic: '~', letter: 'O' },
- 'Ù': { diacritic: '`', letter: 'U' },
- 'Ú': { diacritic: '´', letter: 'U' },
- 'Û': { diacritic: '^', letter: 'U' },
- 'Ü': { diacritic: '¨', letter: 'U' },
+ 'Ù': { diacritic: '`', letter: 'U' },
+ 'Ú': { diacritic: '´', letter: 'U' },
+ 'Û': { diacritic: '^', letter: 'U' },
+ 'Ü': { diacritic: '¨', letter: 'U' },
- 'Ý': { diacritic: '´', letter: 'Y' },
+ 'Ý': { diacritic: '´', letter: 'Y' },
- 'Ç': { diacritic: '¸', letter: 'C' },
- 'Ñ': { diacritic: '~', letter: 'N' }
+ 'Ç': { diacritic: '¸', letter: 'C' },
+ 'Ñ': { diacritic: '~', letter: 'N' }
},
specialchars: {
@@ -181,11 +181,11 @@ var CanvasText = {
/** Diacritics, used to draw accentuated letters */
diacritics: {
- '¸': { entity: 'cedil', points: [[6,-4],[4,-6],[2,-7],[1,-7]] },
- '´': { entity: 'acute', points: [[8,19],[13,22]] },
+ '¸': { entity: 'cedil', points: [[6,-4],[4,-6],[2,-7],[1,-7]] },
+ '´': { entity: 'acute', points: [[8,19],[13,22]] },
'`': { entity: 'grave', points: [[7,22],[12,19]] },
'^': { entity: 'circ', points: [[5.5,19],[9.5,23],[12.5,19]] },
- '¨': { entity: 'trema', points: [[5,21],[6,20],[7,21],[6,22],[5,21],null,[12,21],[13,20],[14,21],[13,22],[12,21]] },
+ '¨': { entity: 'trema', points: [[5,21],[6,20],[7,21],[6,22],[5,21],null,[12,21],[13,20],[14,21],[13,22],[12,21]] },
'~': { entity: 'tilde', points: [[4,18],[7,22],[10,18],[13,22]] }
},
From 8a0adc0f33a273a2e4cae600c25bbdcf9cbeffb5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?=
Date: Wed, 15 May 2013 15:33:32 +0200
Subject: [PATCH 123/210] [FIX] mail: notification email: notification sent for
private discussions now have a correct subject, aka the subject of the
original email.
bzr revid: tde@openerp.com-20130515133332-g3wtttsnasfz0y8b
---
addons/mail/mail_mail.py | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/addons/mail/mail_mail.py b/addons/mail/mail_mail.py
index 351ff0130e5..2cbfec2f72a 100644
--- a/addons/mail/mail_mail.py
+++ b/addons/mail/mail_mail.py
@@ -157,8 +157,10 @@ class mail_mail(osv.Model):
:param browse_record mail: mail.mail browse_record
:param browse_record partner: specific recipient partner
"""
- if force or (not mail.subject and mail.model and mail.res_id):
+ if (force or not mail.subject) and mail.record_name:
return 'Re: %s' % (mail.record_name)
+ elif (force or not mail.subject) and mail.parent_id and mail.parent_id.subject:
+ return 'Re: %s' % (mail.parent_id.subject)
return mail.subject
def send_get_mail_body(self, cr, uid, mail, partner=None, context=None):
From 50da4f37ab493acae529ed8ca301fceb5e2251fc Mon Sep 17 00:00:00 2001
From: Launchpad Translations on behalf of openerp <>
Date: Thu, 16 May 2013 05:55:22 +0000
Subject: [PATCH 124/210] Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20130516055522-vvzc9h3p43b3zkwb
---
addons/account_asset/i18n/th.po | 758 ++++++++++
addons/account_cancel/i18n/th.po | 23 +
addons/account_voucher/i18n/nl.po | 8 +-
addons/contacts/i18n/th.po | 37 +
addons/project/i18n/th.po | 2153 +++++++++++++++++++++++++++++
addons/warning/i18n/th.po | 215 +++
6 files changed, 3190 insertions(+), 4 deletions(-)
create mode 100644 addons/account_asset/i18n/th.po
create mode 100644 addons/account_cancel/i18n/th.po
create mode 100644 addons/contacts/i18n/th.po
create mode 100644 addons/project/i18n/th.po
create mode 100644 addons/warning/i18n/th.po
diff --git a/addons/account_asset/i18n/th.po b/addons/account_asset/i18n/th.po
new file mode 100644
index 00000000000..8e3cbfda27b
--- /dev/null
+++ b/addons/account_asset/i18n/th.po
@@ -0,0 +1,758 @@
+# Thai translation for openobject-addons
+# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR , 2013.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME \n"
+"POT-Creation-Date: 2013-03-07 08:37+0000\n"
+"PO-Revision-Date: 2013-05-15 10:09+0000\n"
+"Last-Translator: FULL NAME \n"
+"Language-Team: Thai
\n"
+" From this report, you can have an overview on all depreciation. "
+"The\n"
+" tool search can also be used to personalise your Assets reports "
+"and\n"
+" so, match this analysis to your needs;\n"
+"
\n"
+" "
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.asset,purchase_value:0
+msgid "Gross Value"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.category,name:0
+msgid "Name"
+msgstr ""
+
+#. module: account_asset
+#: help:account.asset.category,open_asset:0
+msgid ""
+"Check this if you want to automatically confirm the assets of this category "
+"when created by invoices."
+msgstr ""
+
+#. module: account_asset
+#: field:asset.asset.report,name:0
+msgid "Year"
+msgstr ""
+
+#. module: account_asset
+#: model:ir.model,name:account_asset.model_account_asset_depreciation_line
+msgid "Asset depreciation line"
+msgstr ""
+
+#. module: account_asset
+#: view:account.asset.category:0
+#: field:asset.asset.report,asset_category_id:0
+#: model:ir.model,name:account_asset.model_account_asset_category
+msgid "Asset category"
+msgstr ""
+
+#. module: account_asset
+#: view:asset.asset.report:0
+#: field:asset.asset.report,depreciation_value:0
+msgid "Amount of Depreciation Lines"
+msgstr ""
+
+#. module: account_asset
+#: code:addons/account_asset/wizard/wizard_asset_compute.py:49
+#, python-format
+msgid "Created Asset Moves"
+msgstr ""
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "Add an internal note here..."
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.depreciation.line,sequence:0
+msgid "Sequence"
+msgstr ""
+
+#. module: account_asset
+#: help:account.asset.category,method_period:0
+msgid "State here the time between 2 depreciations, in months"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.history,date:0
+msgid "Date"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.asset,method_number:0
+#: selection:account.asset.asset,method_time:0
+#: field:account.asset.category,method_number:0
+#: selection:account.asset.category,method_time:0
+#: field:account.asset.history,method_number:0
+#: selection:account.asset.history,method_time:0
+#: field:asset.modify,method_number:0
+msgid "Number of Depreciations"
+msgstr ""
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "Create Move"
+msgstr ""
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "Confirm Asset"
+msgstr ""
+
+#. module: account_asset
+#: model:ir.actions.act_window,name:account_asset.action_account_asset_asset_tree
+#: model:ir.ui.menu,name:account_asset.menu_action_account_asset_asset_tree
+msgid "Asset Hierarchy"
+msgstr ""
diff --git a/addons/account_cancel/i18n/th.po b/addons/account_cancel/i18n/th.po
new file mode 100644
index 00000000000..69466eca258
--- /dev/null
+++ b/addons/account_cancel/i18n/th.po
@@ -0,0 +1,23 @@
+# Thai translation for openobject-addons
+# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR , 2013.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME \n"
+"POT-Creation-Date: 2013-03-07 08:37+0000\n"
+"PO-Revision-Date: 2013-05-15 07:04+0000\n"
+"Last-Translator: FULL NAME \n"
+"Language-Team: Thai
\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2013-05-16 05:55+0000\n"
+"X-Generator: Launchpad (build 16626)\n"
+
+#. module: account_cancel
+#: view:account.invoice:0
+msgid "Cancel Invoice"
+msgstr ""
diff --git a/addons/account_voucher/i18n/nl.po b/addons/account_voucher/i18n/nl.po
index 5dab67c2ef8..a5a979874c3 100644
--- a/addons/account_voucher/i18n/nl.po
+++ b/addons/account_voucher/i18n/nl.po
@@ -8,14 +8,14 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2013-03-07 08:37+0000\n"
-"PO-Revision-Date: 2013-05-01 18:15+0000\n"
+"PO-Revision-Date: 2013-05-15 17:31+0000\n"
"Last-Translator: Erwin van der Ploeg (Endian Solutions) \n"
"Language-Team: Dutch \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-05-02 06:08+0000\n"
-"X-Generator: Launchpad (build 16580)\n"
+"X-Launchpad-Export-Date: 2013-05-16 05:55+0000\n"
+"X-Generator: Launchpad (build 16626)\n"
#. module: account_voucher
#: field:account.bank.statement.line,voucher_id:0
@@ -526,7 +526,7 @@ msgstr "Weet u zeker dat u het afletteren van deze regel wilt afbreken?"
#. module: account_voucher
#: view:account.voucher:0
msgid "Sales Receipt"
-msgstr "Verkoopbon"
+msgstr "Betaalbewijs"
#. module: account_voucher
#: field:account.voucher,is_multi_currency:0
diff --git a/addons/contacts/i18n/th.po b/addons/contacts/i18n/th.po
new file mode 100644
index 00000000000..31afb7a52e3
--- /dev/null
+++ b/addons/contacts/i18n/th.po
@@ -0,0 +1,37 @@
+# Thai translation for openobject-addons
+# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR , 2013.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME \n"
+"POT-Creation-Date: 2013-03-07 08:38+0000\n"
+"PO-Revision-Date: 2013-05-15 07:10+0000\n"
+"Last-Translator: FULL NAME \n"
+"Language-Team: Thai
\n"
+" Click to add a contact in your address book.\n"
+"
\n"
+" OpenERP helps you easily track all activities related to\n"
+" a customer; discussions, history of business opportunities,\n"
+" documents, etc.\n"
+"
\n"
+" "
+msgstr ""
+
+#. module: contacts
+#: model:ir.actions.act_window,name:contacts.action_contacts
+#: model:ir.ui.menu,name:contacts.menu_contacts
+msgid "Contacts"
+msgstr ""
diff --git a/addons/project/i18n/th.po b/addons/project/i18n/th.po
new file mode 100644
index 00000000000..5543150aae3
--- /dev/null
+++ b/addons/project/i18n/th.po
@@ -0,0 +1,2153 @@
+# Thai translation for openobject-addons
+# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR , 2013.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME \n"
+"POT-Creation-Date: 2013-03-07 08:37+0000\n"
+"PO-Revision-Date: 2013-05-15 07:02+0000\n"
+"Last-Translator: FULL NAME \n"
+"Language-Team: Thai
\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2013-05-16 05:55+0000\n"
+"X-Generator: Launchpad (build 16626)\n"
+
+#. module: project
+#: view:project.project:0
+msgid "Email Interface"
+msgstr ""
+
+#. module: project
+#: help:account.analytic.account,use_tasks:0
+msgid ""
+"If checked, this contract will be available in the project menu and you will "
+"be able to manage tasks or track issues"
+msgstr ""
+
+#. module: project
+#: field:project.project,progress_rate:0
+#: view:report.project.task.user:0
+#: field:report.project.task.user,progress:0
+msgid "Progress"
+msgstr ""
+
+#. module: project
+#: model:process.node,name:project.process_node_taskbydelegate0
+msgid "Task by delegate"
+msgstr ""
+
+#. module: project
+#: view:project.project:0
+msgid "Parent"
+msgstr ""
+
+#. module: project
+#: model:ir.actions.act_window,name:project.dblc_proj
+msgid "Project's tasks"
+msgstr ""
+
+#. module: project
+#: field:project.task.type,name:0
+msgid "Stage Name"
+msgstr ""
+
+#. module: project
+#: model:process.transition.action,name:project.process_transition_action_openpendingtask0
+msgid "Set pending"
+msgstr ""
+
+#. module: project
+#: view:project.project:0
+msgid "New Project Based on Template"
+msgstr ""
+
+#. module: project
+#: view:report.project.task.user:0
+#: field:report.project.task.user,day:0
+msgid "Day"
+msgstr ""
+
+#. module: project
+#: model:project.task.type,name:project.project_tt_merge
+msgid "Merge"
+msgstr ""
+
+#. module: project
+#: view:res.partner:0
+msgid "Start Task"
+msgstr ""
+
+#. module: project
+#: code:addons/project/project.py:932
+#, python-format
+msgid "Warning !"
+msgstr ""
+
+#. module: project
+#: help:project.project,message_unread:0
+#: help:project.task,message_unread:0
+msgid "If checked new messages require your attention."
+msgstr ""
+
+#. module: project
+#: model:process.node,name:project.process_node_donetask0
+msgid "Done task"
+msgstr ""
+
+#. module: project
+#: model:process.node,note:project.process_node_donetask0
+msgid "Task is Completed"
+msgstr ""
+
+#. module: project
+#: view:res.partner:0
+msgid "False"
+msgstr ""
+
+#. module: project
+#: model:project.task.type,name:project.project_tt_testing
+msgid "Testing"
+msgstr ""
+
+#. module: project
+#: model:ir.model,name:project.model_account_analytic_account
+msgid "Analytic Account"
+msgstr ""
+
+#. module: project
+#: field:project.config.settings,group_time_work_estimation_tasks:0
+msgid "Manage time estimation on tasks"
+msgstr ""
+
+#. module: project
+#: help:project.project,message_summary:0
+#: help:project.task,message_summary:0
+msgid ""
+"Holds the Chatter summary (number of messages, ...). This summary is "
+"directly in html format in order to be inserted in kanban views."
+msgstr ""
+
+#. module: project
+#: code:addons/project/project.py:432
+#: code:addons/project/project.py:1318
+#, python-format
+msgid "Warning!"
+msgstr ""
+
+#. module: project
+#: model:ir.model,name:project.model_res_partner
+msgid "Partner"
+msgstr ""
+
+#. module: project
+#: field:project.config.settings,group_manage_delegation_task:0
+msgid "Allow task delegation"
+msgstr ""
+
+#. module: project
+#: field:project.task.delegate,planned_hours:0
+#: view:report.project.task.user:0
+#: field:report.project.task.user,hours_planned:0
+msgid "Planned Hours"
+msgstr ""
+
+#. module: project
+#: view:project.project:0
+msgid "Reset as Project"
+msgstr ""
+
+#. module: project
+#: view:report.project.task.user:0
+msgid "In progress tasks"
+msgstr ""
+
+#. module: project
+#: help:project.project,progress_rate:0
+msgid "Percent of tasks closed according to the total of tasks todo."
+msgstr ""
+
+#. module: project
+#: model:ir.actions.client,name:project.action_client_project_menu
+msgid "Open Project Menu"
+msgstr ""
+
+#. module: project
+#: model:ir.actions.act_window,help:project.action_project_task_user_tree
+msgid ""
+"This report allows you to analyse the performance of your projects and "
+"users. You can analyse the quantities of tasks, the hours spent compared to "
+"the planned hours, the average number of days to open or close a task, etc."
+msgstr ""
+
+#. module: project
+#: view:project.task.delegate:0
+msgid "Validation Task Title"
+msgstr ""
+
+#. module: project
+#: model:res.groups,name:project.group_delegate_task
+msgid "Task Delegation"
+msgstr ""
+
+#. module: project
+#: field:project.project,planned_hours:0
+#: field:project.task.history,planned_hours:0
+#: field:project.task.history.cumulative,planned_hours:0
+msgid "Planned Time"
+msgstr ""
+
+#. module: project
+#: selection:project.project,privacy_visibility:0
+msgid "Public"
+msgstr ""
+
+#. module: project
+#: view:project.task:0
+#: selection:project.task,state:0
+#: selection:project.task.delegate,state:0
+#: selection:project.task.history,state:0
+#: selection:project.task.history.cumulative,state:0
+#: model:project.task.type,name:project.project_tt_deployment
+#: selection:project.task.type,state:0
+#: view:report.project.task.user:0
+#: selection:report.project.task.user,state:0
+#: view:res.partner:0
+msgid "Done"
+msgstr ""
+
+#. module: project
+#: model:project.category,name:project.project_category_01
+msgid "Contact's suggestion"
+msgstr ""
+
+#. module: project
+#: help:project.config.settings,group_time_work_estimation_tasks:0
+msgid "Allows you to compute Time Estimation on tasks."
+msgstr ""
+
+#. module: project
+#: field:report.project.task.user,user_id:0
+msgid "Assigned To"
+msgstr ""
+
+#. module: project
+#: model:mail.message.subtype,name:project.mt_project_task_closed
+#: model:mail.message.subtype,name:project.mt_task_closed
+msgid "Task Done"
+msgstr ""
+
+#. module: project
+#: view:project.project:0
+#: view:report.project.task.user:0
+#: field:report.project.task.user,partner_id:0
+msgid "Contact"
+msgstr ""
+
+#. module: project
+#: model:process.transition,name:project.process_transition_delegate0
+#: view:project.task:0
+msgid "Delegate"
+msgstr ""
+
+#. module: project
+#: model:ir.actions.act_window,name:project.open_view_template_project
+#: view:project.project:0
+msgid "Templates of Projects"
+msgstr ""
+
+#. module: project
+#: field:project.project,analytic_account_id:0
+msgid "Contract/Analytic"
+msgstr ""
+
+#. module: project
+#: view:project.config.settings:0
+msgid "Project Management"
+msgstr ""
+
+#. module: project
+#: model:ir.actions.act_window,name:project.action_project_task_delegate
+#: view:project.task.delegate:0
+msgid "Project Task Delegate"
+msgstr ""
+
+#. module: project
+#: model:mail.message.subtype,name:project.mt_project_task_started
+#: model:mail.message.subtype,name:project.mt_task_started
+msgid "Task Started"
+msgstr ""
+
+#. module: project
+#: view:project.task:0
+msgid "Very Important"
+msgstr ""
+
+#. module: project
+#: view:project.config.settings:0
+msgid "Support"
+msgstr ""
+
+#. module: project
+#: view:project.project:0
+msgid "Member"
+msgstr ""
+
+#. module: project
+#: view:project.task:0
+msgid "Cancel Task"
+msgstr ""
+
+#. module: project
+#: help:project.project,members:0
+msgid ""
+"Project's members are users who can have an access to the tasks related to "
+"this project."
+msgstr ""
+
+#. module: project
+#: view:project.project:0
+#: field:project.task,manager_id:0
+msgid "Project Manager"
+msgstr ""
+
+#. module: project
+#: field:project.project,state:0
+#: field:project.task,state:0
+#: field:project.task.history,state:0
+#: field:project.task.history.cumulative,state:0
+#: field:report.project.task.user,state:0
+msgid "Status"
+msgstr ""
+
+#. module: project
+#: selection:report.project.task.user,month:0
+msgid "August"
+msgstr ""
+
+#. module: project
+#: view:project.project:0
+#: field:project.project,complete_name:0
+msgid "Project Name"
+msgstr ""
+
+#. module: project
+#: selection:report.project.task.user,month:0
+msgid "June"
+msgstr ""
+
+#. module: project
+#: view:project.task:0
+msgid "Gantt View"
+msgstr ""
+
+#. module: project
+#: selection:report.project.task.user,month:0
+msgid "October"
+msgstr ""
+
+#. module: project
+#: help:project.project,total_hours:0
+msgid ""
+"Sum of total hours of all tasks related to this project and its child "
+"projects."
+msgstr ""
+
+#. module: project
+#: help:project.project,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the project "
+"without removing it."
+msgstr ""
+
+#. module: project
+#: model:process.transition,note:project.process_transition_opendonetask0
+msgid "When task is completed, it will come into the done state."
+msgstr ""
+
+#. module: project
+#: field:project.project,message_summary:0
+#: field:project.task,message_summary:0
+msgid "Summary"
+msgstr ""
+
+#. module: project
+#: view:project.task:0
+msgid "Task summary..."
+msgstr ""
+
+#. module: project
+#: view:project.project:0
+msgid "Append this project to another one using analytic accounts hierarchy"
+msgstr ""
+
+#. module: project
+#: view:project.task:0
+#: view:project.task.history.cumulative:0
+msgid "In Progress Tasks"
+msgstr ""
+
+#. module: project
+#: help:res.company,project_time_mode_id:0
+msgid ""
+"This will set the unit of measure used in projects and tasks.\n"
+"If you use the timesheet linked to projects (project_timesheet module), "
+"don't forget to setup the right unit of measure in your employees."
+msgstr ""
+
+#. module: project
+#: field:project.task,user_id:0
+#: view:report.project.task.user:0
+msgid "Assigned to"
+msgstr ""
+
+#. module: project
+#: code:addons/project/project.py:1021
+#, python-format
+msgid "Delegated User should be specified"
+msgstr ""
+
+#. module: project
+#: view:project.project:0
+msgid "Project(s) Manager"
+msgstr ""
+
+#. module: project
+#: selection:project.project,state:0
+#: view:project.task:0
+#: selection:project.task,state:0
+#: selection:project.task.history,state:0
+#: selection:project.task.history.cumulative,state:0
+#: selection:project.task.type,state:0
+#: selection:report.project.task.user,state:0
+msgid "In Progress"
+msgstr ""
+
+#. module: project
+#: view:project.task:0
+msgid "Reactivate"
+msgstr ""
+
+#. module: project
+#: field:project.project,resource_calendar_id:0
+msgid "Working Time"
+msgstr ""
+
+#. module: project
+#: model:ir.actions.act_window,name:project.action_project_task_reevaluate
+msgid "Re-evaluate Task"
+msgstr ""
+
+#. module: project
+#: view:project.task:0
+msgid "Validate planned time"
+msgstr ""
+
+#. module: project
+#: field:project.config.settings,module_pad:0
+msgid "Use integrated collaborative note pads on task"
+msgstr ""
+
+#. module: project
+#: model:mail.message.subtype,name:project.mt_project_task_blocked
+#: model:mail.message.subtype,name:project.mt_task_blocked
+msgid "Task Blocked"
+msgstr ""
+
+#. module: project
+#: model:process.node,note:project.process_node_opentask0
+msgid "Encode your working hours."
+msgstr ""
+
+#. module: project
+#: field:project.project,alias_id:0
+msgid "Alias"
+msgstr ""
+
+#. module: project
+#: view:project.task:0
+msgid "oe_kanban_text_red"
+msgstr ""
+
+#. module: project
+#: model:mail.message.subtype,description:project.mt_task_blocked
+msgid "Task blocked"
+msgstr ""
+
+#. module: project
+#: view:project.task:0
+msgid "Delegation"
+msgstr ""
+
+#. module: project
+#: field:project.task,create_date:0
+msgid "Create Date"
+msgstr ""
+
+#. module: project
+#: view:project.task:0
+msgid "Add a Description..."
+msgstr ""
+
+#. module: project
+#: view:res.partner:0
+msgid "For changing to open state"
+msgstr ""
+
+#. module: project
+#: view:project.config.settings:0
+msgid "Apply"
+msgstr ""
+
+#. module: project
+#: model:ir.model,name:project.model_project_task_delegate
+msgid "Task Delegate"
+msgstr ""
+
+#. module: project
+#: help:project.task.delegate,new_task_description:0
+msgid "Reinclude the description of the task in the task of the user"
+msgstr ""
+
+#. module: project
+#: view:project.project:0
+msgid "Project Settings"
+msgstr ""
+
+#. module: project
+#: view:report.project.task.user:0
+msgid "My tasks"
+msgstr ""
+
+#. module: project
+#: model:process.transition,name:project.process_transition_opendonetask0
+msgid "Open Done Task"
+msgstr ""
+
+#. module: project
+#: field:project.task.delegate,planned_hours_me:0
+msgid "Hours to Validate"
+msgstr ""
+
+#. module: project
+#: help:project.task,remaining_hours:0
+msgid ""
+"Total remaining time, can be re-estimated periodically by the assignee of "
+"the task."
+msgstr ""
+
+#. module: project
+#: selection:report.project.task.user,month:0
+msgid "March"
+msgstr ""
+
+#. module: project
+#: view:board.board:0
+#: model:ir.actions.act_window,name:project.my_open_tasks_action
+#: view:project.task:0
+#: view:project.task.history.cumulative:0
+msgid "My Tasks"
+msgstr ""
+
+#. module: project
+#: constraint:project.task:0
+msgid "Error ! You cannot create recursive tasks."
+msgstr ""
+
+#. module: project
+#: view:report.project.task.user:0
+msgid "Pending tasks"
+msgstr ""
+
+#. module: project
+#: view:project.task.reevaluate:0
+msgid "_Evaluate"
+msgstr ""
+
+#. module: project
+#: view:report.project.task.user:0
+#: field:report.project.task.user,opening_days:0
+msgid "Days to Open"
+msgstr ""
+
+#. module: project
+#: selection:report.project.task.user,priority:0
+msgid "Very urgent"
+msgstr ""
+
+#. module: project
+#: help:project.task.delegate,project_id:0
+#: help:project.task.delegate,user_id:0
+msgid "User you want to delegate this task to"
+msgstr ""
+
+#. module: project
+#: view:project.project:0
+msgid "Set as Template"
+msgstr ""
+
+#. module: project
+#: model:ir.model,name:project.model_project_task
+#: view:project.config.settings:0
+#: view:project.project:0
+#: view:project.task:0
+#: field:project.task.history,task_id:0
+#: field:project.task.history.cumulative,task_id:0
+#: field:project.task.work,task_id:0
+#: view:report.project.task.user:0
+msgid "Task"
+msgstr ""
+
+#. module: project
+#: help:project.config.settings,group_tasks_work_on_tasks:0
+msgid "Allows you to compute work on tasks."
+msgstr ""
+
+#. module: project
+#: view:project.project:0
+msgid "Administration"
+msgstr ""
+
+#. module: project
+#: field:project.config.settings,group_tasks_work_on_tasks:0
+msgid "Log work activities on tasks"
+msgstr ""
+
+#. module: project
+#: model:project.task.type,name:project.project_tt_analysis
+msgid "Analysis"
+msgstr ""
+
+#. module: project
+#: field:project.task,name:0
+#: field:report.project.task.user,name:0
+msgid "Task Summary"
+msgstr ""
+
+#. module: project
+#: field:project.task,active:0
+msgid "Not a Template Task"
+msgstr ""
+
+#. module: project
+#: field:project.task,planned_hours:0
+msgid "Initially Planned Hours"
+msgstr ""
+
+#. module: project
+#: model:process.transition,note:project.process_transition_delegate0
+msgid "Delegates tasks to the other user"
+msgstr ""
+
+#. module: project
+#: help:project.task,effective_hours:0
+msgid "Computed using the sum of the task work done."
+msgstr ""
+
+#. module: project
+#: model:ir.actions.act_window,help:project.open_view_project_all
+msgid ""
+"
\n"
+" Click to start a new project.\n"
+"
\n"
+" Projects are used to organize your activities; plan\n"
+" tasks, track issues, invoice timesheets. You can define\n"
+" internal projects (R&D, Improve Sales Process),\n"
+" private projects (My Todos) or customer ones.\n"
+"
\n"
+" You will be able collaborate with internal users on\n"
+" projects or invite customers to share your activities.\n"
+"
\n"
+" "
+msgstr ""
+
+#. module: project
+#: view:project.config.settings:0
+msgid "Planning"
+msgstr ""
+
+#. module: project
+#: view:project.task:0
+#: field:project.task,date_deadline:0
+#: field:report.project.task.user,date_deadline:0
+msgid "Deadline"
+msgstr ""
+
+#. module: project
+#: view:project.task.history.cumulative:0
+msgid "Ready"
+msgstr ""
+
+#. module: project
+#: view:project.task:0
+msgid "New Tasks"
+msgstr ""
+
+#. module: project
+#: field:project.config.settings,module_project_issue_sheet:0
+msgid "Invoice working time on issues"
+msgstr ""
+
+#. module: project
+#: view:project.project:0
+#: view:project.task:0
+#: field:project.task.history,end_date:0
+#: field:project.task.history.cumulative,end_date:0
+msgid "End Date"
+msgstr ""
+
+#. module: project
+#: model:project.task.type,name:project.project_tt_specification
+msgid "Specification"
+msgstr ""
+
+#. module: project
+#: model:process.transition,note:project.process_transition_draftopentask0
+msgid "From draft state, it will come into the open state."
+msgstr ""
+
+#. module: project
+#: view:project.task.history.cumulative:0
+msgid "Task's Analysis"
+msgstr ""
+
+#. module: project
+#: view:project.task.delegate:0
+#: field:project.task.delegate,new_task_description:0
+msgid "New Task Description"
+msgstr ""
+
+#. module: project
+#: field:report.project.task.user,delay_endings_days:0
+msgid "Overpassed Deadline"
+msgstr ""
+
+#. module: project
+#: view:report.project.task.user:0
+msgid "New tasks"
+msgstr ""
+
+#. module: project
+#: selection:project.task,priority:0
+#: selection:report.project.task.user,priority:0
+msgid "Medium"
+msgstr ""
+
+#. module: project
+#: field:project.project,total_hours:0
+msgid "Total Time"
+msgstr ""
+
+#. module: project
+#: view:report.project.task.user:0
+msgid "Creation Date"
+msgstr ""
+
+#. module: project
+#: view:project.project:0
+msgid "Miscellaneous"
+msgstr ""
+
+#. module: project
+#: view:project.task:0
+#: field:project.task,stage_id:0
+#: field:project.task.history,type_id:0
+#: field:project.task.history.cumulative,type_id:0
+msgid "Stage"
+msgstr ""
+
+#. module: project
+#: model:process.transition,name:project.process_transition_draftopentask0
+msgid "Draft Open task"
+msgstr ""
+
+#. module: project
+#: field:project.project,alias_model:0
+msgid "Alias Model"
+msgstr ""
+
+#. module: project
+#: help:report.project.task.user,closing_days:0
+msgid "Number of Days to close the task"
+msgstr ""
+
+#. module: project
+#: view:board.board:0
+msgid "My Board"
+msgstr ""
+
+#. module: project
+#: model:ir.actions.act_window,name:project.open_task_type_form
+msgid "Stages"
+msgstr ""
+
+#. module: project
+#: view:project.project:0
+#: view:project.task:0
+msgid "Delete"
+msgstr ""
+
+#. module: project
+#: view:report.project.task.user:0
+msgid "In progress"
+msgstr ""
+
+#. module: project
+#: selection:report.project.task.user,month:0
+msgid "September"
+msgstr ""
+
+#. module: project
+#: selection:report.project.task.user,priority:0
+msgid "Urgent"
+msgstr ""
+
+#. module: project
+#: model:project.category,name:project.project_category_02
+msgid "Feature request"
+msgstr ""
+
+#. module: project
+#: view:project.task:0
+msgid "Delegated tasks"
+msgstr ""
+
+#. module: project
+#: model:ir.model,name:project.model_project_task_work
+msgid "Project Task Work"
+msgstr ""
+
+#. module: project
+#: code:addons/project/wizard/project_task_delegate.py:81
+#, python-format
+msgid "CHECK: %s"
+msgstr ""
+
+#. module: project
+#: view:project.project:0
+msgid "Close Project"
+msgstr ""
+
+#. module: project
+#: field:project.project,tasks:0
+msgid "Task Activities"
+msgstr ""
+
+#. module: project
+#: field:project.project,effective_hours:0
+#: field:project.task.work,hours:0
+msgid "Time Spent"
+msgstr ""
+
+#. module: project
+#: view:project.project:0
+#: view:project.task:0
+msgid "í"
+msgstr ""
+
+#. module: project
+#: field:account.analytic.account,company_uom_id:0
+msgid "unknown"
+msgstr ""
+
+#. module: project
+#: field:project.project,message_is_follower:0
+#: field:project.task,message_is_follower:0
+msgid "Is a Follower"
+msgstr ""
+
+#. module: project
+#: field:project.task.history,date:0
+#: field:project.task.history.cumulative,date:0
+#: field:project.task.work,date:0
+msgid "Date"
+msgstr ""
+
+#. module: project
+#: view:report.project.task.user:0
+msgid "Extended Filters..."
+msgstr ""
+
+#. module: project
+#: model:ir.ui.menu,name:project.menu_tasks_config
+msgid "GTD"
+msgstr ""
+
+#. module: project
+#: view:project.project:0
+msgid "Project Stages"
+msgstr ""
+
+#. module: project
+#: help:project.task,state:0
+msgid ""
+"The status is set to 'Draft', when a case is created. "
+"If the case is in progress the status is set to 'Open'. "
+"When the case is over, the status is set to 'Done'. If "
+"the case needs to be reviewed then the status is set "
+"to 'Pending'."
+msgstr ""
+
+#. module: project
+#: model:ir.model,name:project.model_res_company
+msgid "Companies"
+msgstr ""
+
+#. module: project
+#: field:project.task.type,fold:0
+msgid "Folded by Default"
+msgstr ""
+
+#. module: project
+#: field:project.task,work_ids:0
+msgid "Work done"
+msgstr ""
+
+#. module: project
+#: help:project.config.settings,module_project_issue:0
+msgid ""
+"Provides management of issues/bugs in projects.\n"
+" This installs the module project_issue."
+msgstr ""
+
+#. module: project
+#: help:project.task,kanban_state:0
+msgid ""
+"A task's kanban state indicates special situations affecting it:\n"
+" * Normal is the default situation\n"
+" * Blocked indicates something is preventing the progress of this task\n"
+" * Ready for next stage indicates the task is ready to be pulled to the next "
+"stage"
+msgstr ""
+
+#. module: project
+#: view:project.task:0
+msgid "10"
+msgstr ""
+
+#. module: project
+#: view:project.project:0
+msgid "Cancel Project"
+msgstr ""
+
+#. module: project
+#: help:project.project,analytic_account_id:0
+msgid ""
+"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."
+msgstr ""
+
+#. module: project
+#: model:process.transition.action,name:project.process_transition_action_draftcanceltask0
+#: model:process.transition.action,name:project.process_transition_action_opencanceltask0
+#: view:project.config.settings:0
+#: view:project.task.delegate:0
+#: view:project.task.reevaluate:0
+msgid "Cancel"
+msgstr ""
+
+#. module: project
+#: view:project.project:0
+msgid "Other Info"
+msgstr ""
+
+#. module: project
+#: view:project.task.delegate:0
+msgid "_Delegate"
+msgstr ""
+
+#. module: project
+#: selection:project.task,priority:0
+#: selection:report.project.task.user,priority:0
+msgid "Very Low"
+msgstr ""
+
+#. module: project
+#: help:project.project,effective_hours:0
+msgid ""
+"Sum of spent hours of all tasks related to this project and its child "
+"projects."
+msgstr ""
+
+#. module: project
+#: view:project.project:0
+msgid ""
+"Follow this project to automatically track the events associated to tasks "
+"and issues of this project."
+msgstr ""
+
+#. module: project
+#: view:project.task:0
+msgid "Users"
+msgstr ""
+
+#. module: project
+#: model:mail.message.subtype,name:project.mt_task_stage
+msgid "Stage Changed"
+msgstr ""
+
+#. module: project
+#: view:project.project:0
+#: model:res.groups,name:project.group_project_manager
+msgid "Manager"
+msgstr ""
+
+#. module: project
+#: model:ir.actions.act_window,help:project.project_category_action
+msgid ""
+"
\n"
+" Click to add a stage in the task pipeline.\n"
+"
\n"
+" Define the steps that will be used in the project from the\n"
+" creation of the task, up to the closing of the task or "
+"issue.\n"
+" You will use these stages in order to track the progress in\n"
+" solving a task or an issue.\n"
+"
\n"
+" "
+msgstr ""
+
+#. module: project
+#: help:project.task,total_hours:0
+msgid "Computed as: Time Spent + Remaining Time."
+msgstr ""
+
+#. module: project
+#: code:addons/project/project.py:356
+#: code:addons/project/project.py:377
+#: code:addons/project/project.py:709
+#, python-format
+msgid "%s (copy)"
+msgstr ""
+
+#. module: project
+#: model:mail.message.subtype,name:project.mt_project_task_stage
+msgid "Task Stage Changed"
+msgstr ""
+
+#. module: project
+#: view:project.task:0
+#: field:project.task.history,remaining_hours:0
+#: field:project.task.history.cumulative,remaining_hours:0
+msgid "Remaining Time"
+msgstr ""
+
+#. module: project
+#: field:project.task.delegate,name:0
+msgid "Delegated Title"
+msgstr ""
+
+#. module: project
+#: selection:report.project.task.user,month:0
+msgid "July"
+msgstr ""
+
+#. module: project
+#: model:ir.model,name:project.model_project_task_reevaluate
+msgid "project.task.reevaluate"
+msgstr ""
+
+#. module: project
+#: field:project.task,delay_hours:0
+msgid "Delay Hours"
+msgstr ""
+
+#. module: project
+#: view:project.task.type:0
+msgid "Add a description..."
+msgstr ""
+
+#. module: project
+#: view:project.project:0
+msgid "Team"
+msgstr ""
+
+#. module: project
+#: help:project.config.settings,time_unit:0
+msgid "This will set the unit of measure used in projects and tasks."
+msgstr ""
+
+#. module: project
+#: selection:project.task,priority:0
+msgid "Very important"
+msgstr ""
+
+#. module: project
+#: view:report.project.task.user:0
+#: field:report.project.task.user,month:0
+msgid "Month"
+msgstr ""
+
+#. module: project
+#: model:project.task.type,name:project.project_tt_design
+msgid "Design"
+msgstr ""
+
+#. module: project
+#: view:project.task:0
+msgid "Start Date"
+msgstr ""
+
+#. module: project
+#: view:project.task:0
+#: selection:project.task,kanban_state:0
+#: selection:project.task.history,kanban_state:0
+#: view:project.task.history.cumulative:0
+#: selection:project.task.history.cumulative,kanban_state:0
+msgid "Blocked"
+msgstr ""
+
+#. module: project
+#: help:project.task,progress:0
+msgid ""
+"If the task has a progress of 99.99% you should close the task if it's "
+"finished or reevaluate the time"
+msgstr ""
+
+#. module: project
+#: field:project.task,user_email:0
+msgid "User Email"
+msgstr ""
+
+#. module: project
+#: help:project.task.delegate,prefix:0
+msgid "Title for your validation task"
+msgstr ""
+
+#. module: project
+#: field:project.config.settings,time_unit:0
+msgid "Working time unit"
+msgstr ""
+
+#. module: project
+#: view:project.project:0
+msgid "Projects in which I am a member."
+msgstr ""
+
+#. module: project
+#: selection:project.task,priority:0
+#: selection:report.project.task.user,priority:0
+msgid "Low"
+msgstr ""
+
+#. module: project
+#: selection:project.project,state:0
+msgid "Closed"
+msgstr ""
+
+#. module: project
+#: view:project.project:0
+#: selection:project.project,state:0
+#: view:project.task:0
+#: selection:project.task,state:0
+#: selection:project.task.delegate,state:0
+#: selection:project.task.history,state:0
+#: selection:project.task.history.cumulative,state:0
+#: selection:project.task.type,state:0
+#: view:report.project.task.user:0
+#: selection:report.project.task.user,state:0
+msgid "Pending"
+msgstr ""
+
+#. module: project
+#: model:ir.actions.act_window,name:project.project_category_action
+#: model:ir.ui.menu,name:project.menu_project_category_act
+#: view:project.category:0
+#: field:project.task,categ_ids:0
+msgid "Tags"
+msgstr ""
+
+#. module: project
+#: model:ir.model,name:project.model_project_task_history
+#: model:ir.model,name:project.model_project_task_history_cumulative
+msgid "History of Tasks"
+msgstr ""
+
+#. module: project
+#: help:project.task.delegate,state:0
+msgid ""
+"New state of your own task. Pending will be reopened automatically when the "
+"delegated task is closed"
+msgstr ""
+
+#. module: project
+#: help:project.config.settings,group_manage_delegation_task:0
+msgid "Allows you to delegate tasks to other users."
+msgstr ""
+
+#. module: project
+#: field:project.project,active:0
+msgid "Active"
+msgstr ""
+
+#. module: project
+#: model:ir.model,name:project.model_project_category
+msgid "Category of project's task, issue, ..."
+msgstr ""
+
+#. module: project
+#: help:project.project,resource_calendar_id:0
+msgid "Timetable working hours to adjust the gantt diagram report"
+msgstr ""
+
+#. module: project
+#: help:project.task,delay_hours:0
+msgid ""
+"Computed as difference between planned hours by the project manager and the "
+"total hours of the task."
+msgstr ""
+
+#. module: project
+#: view:project.config.settings:0
+msgid "Helpdesk & Support"
+msgstr ""
+
+#. module: project
+#: help:report.project.task.user,opening_days:0
+msgid "Number of Days to Open the task"
+msgstr ""
+
+#. module: project
+#: field:project.task,delegated_user_id:0
+msgid "Delegated To"
+msgstr ""
+
+#. module: project
+#: help:project.task,planned_hours:0
+msgid ""
+"Estimated time to do the task, usually set by the project manager when the "
+"task is in draft state."
+msgstr ""
+
+#. module: project
+#: code:addons/project/project.py:220
+#, python-format
+msgid "Attachments"
+msgstr ""
+
+#. module: project
+#: view:project.category:0
+msgid "Issue Version"
+msgstr ""
+
+#. module: project
+#: code:addons/project/project.py:182
+#, python-format
+msgid ""
+"You cannot delete a project containing tasks. You can either delete all the "
+"project's tasks and then delete the project or simply deactivate the project."
+msgstr ""
+
+#. module: project
+#: model:process.transition.action,name:project.process_transition_action_draftopentask0
+#: view:project.project:0
+msgid "Open"
+msgstr ""
+
+#. module: project
+#: field:project.project,privacy_visibility:0
+msgid "Privacy / Visibility"
+msgstr ""
+
+#. module: project
+#: view:project.task:0
+#: field:project.task,remaining_hours:0
+#: field:project.task.reevaluate,remaining_hours:0
+#: view:report.project.task.user:0
+#: field:report.project.task.user,remaining_hours:0
+msgid "Remaining Hours"
+msgstr ""
+
+#. module: project
+#: model:mail.message.subtype,description:project.mt_task_stage
+msgid "Stage changed"
+msgstr ""
+
+#. module: project
+#: constraint:project.task:0
+msgid "Error ! Task end-date must be greater then task start-date"
+msgstr ""
+
+#. module: project
+#: field:project.task.history,user_id:0
+#: field:project.task.history.cumulative,user_id:0
+msgid "Responsible"
+msgstr ""
+
+#. module: project
+#: view:project.project:0
+msgid "Search Project"
+msgstr ""
+
+#. module: project
+#: view:project.task.delegate:0
+msgid "Delegated Task"
+msgstr ""
+
+#. module: project
+#: view:report.project.task.user:0
+#: field:report.project.task.user,total_hours:0
+msgid "Total Hours"
+msgstr ""
+
+#. module: project
+#: model:ir.model,name:project.model_project_config_settings
+msgid "project.config.settings"
+msgstr ""
+
+#. module: project
+#: model:project.task.type,name:project.project_tt_development
+msgid "Development"
+msgstr ""
+
+#. module: project
+#: help:project.task,active:0
+msgid ""
+"This field is computed automatically and have the same behavior than the "
+"boolean 'active' field: if the task is linked to a template or unactivated "
+"project, it will be hidden unless specifically asked."
+msgstr ""
+
+#. module: project
+#: model:res.request.link,name:project.req_link_task
+msgid "Project task"
+msgstr ""
+
+#. module: project
+#: field:project.task,effective_hours:0
+msgid "Hours Spent"
+msgstr ""
+
+#. module: project
+#: help:project.config.settings,module_pad:0
+msgid ""
+"Lets the company customize which Pad installation should be used to link to "
+"new pads\n"
+" (by default, http://ietherpad.com/).\n"
+" This installs the module pad."
+msgstr ""
+
+#. module: project
+#: field:project.task,id:0
+msgid "ID"
+msgstr ""
+
+#. module: project
+#: model:ir.actions.act_window,name:project.action_view_task_overpassed_draft
+msgid "Overpassed Tasks"
+msgstr ""
+
+#. module: project
+#: code:addons/project/project.py:932
+#, python-format
+msgid ""
+"Child task still open.\n"
+"Please cancel or complete child task first."
+msgstr ""
+
+#. module: project
+#: field:project.task.delegate,user_id:0
+msgid "Assign To"
+msgstr ""
+
+#. module: project
+#: model:res.groups,name:project.group_time_work_estimation_tasks
+msgid "Time Estimation on Tasks"
+msgstr ""
+
+#. module: project
+#: field:project.task,total_hours:0
+msgid "Total"
+msgstr ""
+
+#. module: project
+#: model:process.node,note:project.process_node_taskbydelegate0
+msgid "Delegate your task to the other user"
+msgstr ""
+
+#. module: project
+#: model:mail.message.subtype,description:project.mt_task_started
+msgid "Task started"
+msgstr ""
+
+#. module: project
+#: help:project.task.reevaluate,remaining_hours:0
+msgid "Put here the remaining hours required to close the task."
+msgstr ""
+
+#. module: project
+#: help:project.task.type,fold:0
+msgid ""
+"This stage is not visible, for example in status bar or kanban view, when "
+"there are no records in that stage to display."
+msgstr ""
+
+#. module: project
+#: view:project.task:0
+msgid "Deadlines"
+msgstr ""
+
+#. module: project
+#: code:addons/project/wizard/project_task_delegate.py:69
+#: code:addons/project/wizard/project_task_delegate.py:70
+#: code:addons/project/wizard/project_task_delegate.py:77
+#: code:addons/project/wizard/project_task_delegate.py:78
+#, python-format
+msgid "CHECK: "
+msgstr ""
+
+#. module: project
+#: code:addons/project/project.py:432
+#, python-format
+msgid "You must assign members on the project '%s' !"
+msgstr ""
+
+#. module: project
+#: view:project.project:0
+msgid "Pending Projects"
+msgstr ""
+
+#. module: project
+#: view:project.task:0
+msgid "Remaining"
+msgstr ""
+
+#. module: project
+#: field:project.task,progress:0
+msgid "Progress (%)"
+msgstr ""
+
+#. module: project
+#: field:project.task,company_id:0
+#: field:project.task.work,company_id:0
+#: view:report.project.task.user:0
+#: field:report.project.task.user,company_id:0
+msgid "Company"
+msgstr ""
+
+#. module: project
+#: help:project.config.settings,module_project_timesheet:0
+msgid ""
+"This allows you to transfer the entries under tasks defined for Project "
+"Management to\n"
+" the timesheet line entries for particular date and user, "
+"with the effect of creating,\n"
+" editing and deleting either ways.\n"
+" This installs the module project_timesheet."
+msgstr ""
+
+#. module: project
+#: field:project.config.settings,module_project_issue:0
+msgid "Track issues and bugs"
+msgstr ""
+
+#. module: project
+#: field:project.config.settings,module_project_mrp:0
+msgid "Generate tasks from sale orders"
+msgstr ""
+
+#. module: project
+#: selection:project.task,priority:0
+msgid "Important"
+msgstr ""
+
+#. module: project
+#: model:process.node,note:project.process_node_drafttask0
+msgid "Define the Requirements and Set Planned Hours."
+msgstr ""
+
+#. module: project
+#: field:project.project,message_ids:0
+#: field:project.task,message_ids:0
+msgid "Messages"
+msgstr ""
+
+#. module: project
+#: field:project.project,color:0
+#: field:project.task,color:0
+msgid "Color Index"
+msgstr ""
+
+#. module: project
+#: model:ir.actions.act_window,name:project.open_board_project
+#: model:ir.model,name:project.model_project_project
+#: model:ir.ui.menu,name:project.menu_project_dashboard
+#: model:ir.ui.menu,name:project.menu_project_management
+#: view:project.project:0
+#: view:project.task:0
+#: field:project.task,project_id:0
+#: field:project.task.delegate,project_id:0
+#: field:project.task.history.cumulative,project_id:0
+#: view:report.project.task.user:0
+#: field:report.project.task.user,project_id:0
+#: model:res.request.link,name:project.req_link_project
+msgid "Project"
+msgstr ""
+
+#. module: project
+#: selection:project.project,state:0
+#: selection:project.task,state:0
+#: selection:project.task.history,state:0
+#: selection:project.task.history.cumulative,state:0
+#: model:project.task.type,name:project.project_tt_cancel
+#: selection:project.task.type,state:0
+#: selection:report.project.task.user,state:0
+msgid "Cancelled"
+msgstr ""
+
+#. module: project
+#: model:ir.actions.act_window,help:project.act_project_project_2_project_task_all
+#: model:ir.actions.act_window,help:project.action_view_task
+msgid ""
+"
\n"
+" Click to create a new task.\n"
+"
\n"
+" OpenERP's project management allows you to manage the "
+"pipeline\n"
+" of tasks in order to get things done efficiently. You can\n"
+" track progress, discuss on tasks, attach documents, etc.\n"
+"
\n"
+" "
+msgstr ""
+
+#. module: project
+#: field:project.task,date_end:0
+#: field:report.project.task.user,date_end:0
+msgid "Ending Date"
+msgstr ""
+
+#. module: project
+#: field:project.task.type,state:0
+msgid "Related Status"
+msgstr ""
+
+#. module: project
+#: view:project.project:0
+msgid "Documents"
+msgstr ""
+
+#. module: project
+#: model:mail.message.subtype,description:project.mt_task_new
+msgid "Task created"
+msgstr ""
+
+#. module: project
+#: view:report.project.task.user:0
+#: field:report.project.task.user,no_of_days:0
+msgid "# of Days"
+msgstr ""
+
+#. module: project
+#: field:project.project,message_follower_ids:0
+#: field:project.task,message_follower_ids:0
+msgid "Followers"
+msgstr ""
+
+#. module: project
+#: selection:project.project,state:0
+#: view:project.task:0
+#: selection:project.task,state:0
+#: selection:project.task.history,state:0
+#: selection:project.task.history.cumulative,state:0
+#: selection:project.task.type,state:0
+#: view:report.project.task.user:0
+msgid "New"
+msgstr ""
+
+#. module: project
+#: model:ir.actions.act_window,name:project.action_view_task_history_cumulative
+#: model:ir.ui.menu,name:project.menu_action_view_task_history_cumulative
+msgid "Cumulative Flow"
+msgstr ""
+
+#. module: project
+#: view:report.project.task.user:0
+#: field:report.project.task.user,hours_effective:0
+msgid "Effective Hours"
+msgstr ""
+
+#. module: project
+#: view:report.project.task.user:0
+msgid "OverPass delay"
+msgstr ""
+
+#. module: project
+#: view:project.task.delegate:0
+msgid "Validation Task"
+msgstr ""
+
+#. module: project
+#: field:project.config.settings,module_project_long_term:0
+msgid "Manage resources planning on gantt view"
+msgstr ""
+
+#. module: project
+#: view:project.task:0
+#: view:project.task.history.cumulative:0
+msgid "Unassigned Tasks"
+msgstr ""
+
+#. module: project
+#: help:project.project,planned_hours:0
+msgid ""
+"Sum of planned hours of all tasks related to this project and its child "
+"projects."
+msgstr ""
+
+#. module: project
+#: view:res.partner:0
+msgid "For changing to done state"
+msgstr ""
+
+#. module: project
+#: view:report.project.task.user:0
+msgid "My Task"
+msgstr ""
+
+#. module: project
+#: view:project.task:0
+#: view:project.task.history.cumulative:0
+#: view:report.project.task.user:0
+msgid "My Projects"
+msgstr ""
+
+#. module: project
+#: help:project.task,sequence:0
+msgid "Gives the sequence order when displaying a list of tasks."
+msgstr ""
+
+#. module: project
+#: field:project.task,date_start:0
+#: field:report.project.task.user,date_start:0
+msgid "Starting Date"
+msgstr ""
+
+#. module: project
+#: code:addons/project/project.py:398
+#: model:ir.actions.act_window,name:project.open_view_project_all
+#: model:ir.ui.menu,name:project.menu_projects
+#: view:project.project:0
+#: field:project.task.type,project_ids:0
+#: view:res.company:0
+#, python-format
+msgid "Projects"
+msgstr ""
+
+#. module: project
+#: model:res.groups,name:project.group_tasks_work_on_tasks
+msgid "Task's Work on Tasks"
+msgstr ""
+
+#. module: project
+#: help:project.task.delegate,name:0
+msgid "New title of the task delegated to the user"
+msgstr ""
+
+#. module: project
+#: model:ir.actions.act_window,name:project.action_project_task_user_tree
+#: model:ir.ui.menu,name:project.menu_project_task_user_tree
+#: view:report.project.task.user:0
+msgid "Tasks Analysis"
+msgstr ""
+
+#. module: project
+#: view:project.task:0
+#: view:project.task.history.cumulative:0
+msgid "Project Tasks"
+msgstr ""
+
+#. module: project
+#: field:account.analytic.account,use_tasks:0
+#: model:ir.actions.act_window,name:project.act_project_project_2_project_task_all
+#: model:ir.actions.act_window,name:project.action_view_task
+#: model:ir.ui.menu,name:project.menu_action_view_task
+#: model:process.process,name:project.process_process_tasksprocess0
+#: view:project.project:0
+#: view:project.task:0
+#: view:res.partner:0
+#: field:res.partner,task_ids:0
+msgid "Tasks"
+msgstr ""
+
+#. module: project
+#: selection:report.project.task.user,month:0
+msgid "December"
+msgstr ""
+
+#. module: project
+#: view:project.config.settings:0
+#: view:project.task.delegate:0
+#: view:project.task.reevaluate:0
+msgid "or"
+msgstr ""
+
+#. module: project
+#: help:project.config.settings,module_project_mrp:0
+msgid ""
+"This feature automatically creates project tasks from service products in "
+"sale orders.\n"
+" More precisely, tasks are created for procurement lines with "
+"product of type 'Service',\n"
+" procurement method 'Make to Order', and supply method "
+"'Manufacture'.\n"
+" This installs the module project_mrp."
+msgstr ""
+
+#. module: project
+#: help:project.task.delegate,planned_hours:0
+msgid "Estimated time to close this task by the delegated user"
+msgstr ""
+
+#. module: project
+#: model:project.category,name:project.project_category_03
+msgid "Experiment"
+msgstr ""
+
+#. module: project
+#: model:process.transition.action,name:project.process_transition_action_opendrafttask0
+#: selection:report.project.task.user,state:0
+msgid "Draft"
+msgstr ""
+
+#. module: project
+#: field:project.task,kanban_state:0
+#: field:project.task.history,kanban_state:0
+#: field:project.task.history.cumulative,kanban_state:0
+msgid "Kanban State"
+msgstr ""
+
+#. module: project
+#: field:project.config.settings,module_project_timesheet:0
+msgid "Record timesheet lines per tasks"
+msgstr ""
+
+#. module: project
+#: model:ir.model,name:project.model_report_project_task_user
+msgid "Tasks by user and project"
+msgstr ""
+
+#. module: project
+#: field:res.company,project_time_mode_id:0
+msgid "Project Time Unit"
+msgstr ""
+
+#. module: project
+#: view:project.task:0
+#: selection:project.task,kanban_state:0
+#: selection:project.task.history,kanban_state:0
+#: selection:project.task.history.cumulative,kanban_state:0
+msgid "Normal"
+msgstr ""
+
+#. module: project
+#: view:report.project.task.user:0
+#: field:report.project.task.user,closing_days:0
+msgid "Days to Close"
+msgstr ""
+
+#. module: project
+#: model:res.groups,name:project.group_project_user
+msgid "User"
+msgstr ""
+
+#. module: project
+#: help:project.project,alias_model:0
+msgid ""
+"The kind of document created when an email is received on this project's "
+"email alias"
+msgstr ""
+
+#. module: project
+#: model:ir.actions.act_window,name:project.action_config_settings
+#: view:project.config.settings:0
+msgid "Configure Project"
+msgstr ""
+
+#. module: project
+#: view:project.task.history.cumulative:0
+msgid "Tasks's Cumulative Flow"
+msgstr ""
+
+#. module: project
+#: selection:report.project.task.user,month:0
+msgid "January"
+msgstr ""
+
+#. module: project
+#: field:project.task.delegate,prefix:0
+msgid "Your Task Title"
+msgstr ""
+
+#. module: project
+#: view:project.task.reevaluate:0
+msgid "Reevaluation Task"
+msgstr ""
+
+#. module: project
+#: code:addons/project/project.py:1318
+#, python-format
+msgid "Please delete the project linked with this account first."
+msgstr ""
+
+#. module: project
+#: model:mail.message.subtype,name:project.mt_project_task_new
+#: model:mail.message.subtype,name:project.mt_task_new
+msgid "Task Created"
+msgstr ""
+
+#. module: project
+#: view:report.project.task.user:0
+msgid "Non Assigned Tasks to users"
+msgstr ""
+
+#. module: project
+#: view:project.project:0
+msgid "Projects in which I am a manager"
+msgstr ""
+
+#. module: project
+#: view:project.task:0
+#: selection:project.task,kanban_state:0
+#: selection:project.task.history,kanban_state:0
+#: selection:project.task.history.cumulative,kanban_state:0
+msgid "Ready for next stage"
+msgstr ""
+
+#. module: project
+#: field:project.task.type,case_default:0
+msgid "Default for New Projects"
+msgstr ""
+
+#. module: project
+#: view:project.task:0
+#: field:project.task,description:0
+#: field:project.task.type,description:0
+msgid "Description"
+msgstr ""
+
+#. module: project
+#: selection:report.project.task.user,month:0
+msgid "May"
+msgstr ""
+
+#. module: project
+#: help:project.task.type,case_default:0
+msgid ""
+"If you check this field, this stage will be proposed by default on each new "
+"project. It will not assign this stage to existing projects."
+msgstr ""
+
+#. module: project
+#: field:project.task,partner_id:0
+msgid "Customer"
+msgstr ""
+
+#. module: project
+#: selection:report.project.task.user,month:0
+msgid "February"
+msgstr ""
+
+#. module: project
+#: help:project.config.settings,module_project_long_term:0
+msgid ""
+"A long term project management module that tracks planning, scheduling, and "
+"resource allocation.\n"
+" This installs the module project_long_term."
+msgstr ""
+
+#. module: project
+#: model:mail.message.subtype,description:project.mt_task_closed
+msgid "Task closed"
+msgstr ""
+
+#. module: project
+#: selection:report.project.task.user,month:0
+msgid "April"
+msgstr ""
+
+#. module: project
+#: view:project.task:0
+msgid "Spent Hours"
+msgstr ""
+
+#. module: project
+#: help:project.project,sequence:0
+msgid "Gives the sequence order when displaying a list of Projects."
+msgstr ""
+
+#. module: project
+#: model:ir.actions.act_window,name:project.act_res_users_2_project_task_opened
+msgid "Assigned Tasks"
+msgstr ""
+
+#. module: project
+#: help:project.config.settings,module_project_issue_sheet:0
+msgid ""
+"Provides timesheet support for the issues/bugs management in project.\n"
+" This installs the module project_issue_sheet."
+msgstr ""
+
+#. module: project
+#: selection:project.project,privacy_visibility:0
+msgid "Followers Only"
+msgstr ""
+
+#. module: project
+#: view:board.board:0
+#: field:project.project,task_count:0
+msgid "Open Tasks"
+msgstr ""
+
+#. module: project
+#: field:project.project,priority:0
+#: field:project.project,sequence:0
+#: field:project.task,sequence:0
+#: field:project.task.type,sequence:0
+msgid "Sequence"
+msgstr ""
+
+#. module: project
+#: view:project.task:0
+#: view:project.task.work:0
+msgid "Task Work"
+msgstr ""
+
+#. module: project
+#: help:project.task.delegate,planned_hours_me:0
+msgid ""
+"Estimated time for you to validate the work done by the user to whom you "
+"delegate this task"
+msgstr ""
+
+#. module: project
+#: view:report.project.task.user:0
+#: field:report.project.task.user,year:0
+msgid "Year"
+msgstr ""
+
+#. module: project
+#: field:project.project,type_ids:0
+#: view:project.task.type:0
+msgid "Tasks Stages"
+msgstr ""
diff --git a/addons/warning/i18n/th.po b/addons/warning/i18n/th.po
new file mode 100644
index 00000000000..a790bcd9700
--- /dev/null
+++ b/addons/warning/i18n/th.po
@@ -0,0 +1,215 @@
+# Thai translation for openobject-addons
+# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR , 2013.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME \n"
+"POT-Creation-Date: 2013-03-07 08:39+0000\n"
+"PO-Revision-Date: 2013-05-15 07:12+0000\n"
+"Last-Translator: FULL NAME \n"
+"Language-Team: Thai
\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2013-05-16 05:55+0000\n"
+"X-Generator: Launchpad (build 16626)\n"
+
+#. module: warning
+#: model:ir.model,name:warning.model_purchase_order_line
+#: field:product.product,purchase_line_warn:0
+msgid "Purchase Order Line"
+msgstr ""
+
+#. module: warning
+#: model:ir.model,name:warning.model_stock_picking_in
+msgid "Incoming Shipments"
+msgstr ""
+
+#. module: warning
+#: field:product.product,purchase_line_warn_msg:0
+msgid "Message for Purchase Order Line"
+msgstr ""
+
+#. module: warning
+#: model:ir.model,name:warning.model_stock_picking
+msgid "Picking List"
+msgstr ""
+
+#. module: warning
+#: view:product.product:0
+msgid "Warning when Purchasing this Product"
+msgstr ""
+
+#. module: warning
+#: model:ir.model,name:warning.model_product_product
+msgid "Product"
+msgstr ""
+
+#. module: warning
+#: view:product.product:0
+#: view:res.partner:0
+msgid "Warnings"
+msgstr ""
+
+#. module: warning
+#: selection:product.product,purchase_line_warn:0
+#: selection:product.product,sale_line_warn:0
+#: selection:res.partner,invoice_warn:0
+#: selection:res.partner,picking_warn:0
+#: selection:res.partner,purchase_warn:0
+#: selection:res.partner,sale_warn:0
+msgid "Blocking Message"
+msgstr ""
+
+#. module: warning
+#: view:res.partner:0
+msgid "Warning on the Invoice"
+msgstr ""
+
+#. module: warning
+#: selection:product.product,purchase_line_warn:0
+#: selection:product.product,sale_line_warn:0
+#: selection:res.partner,invoice_warn:0
+#: selection:res.partner,picking_warn:0
+#: selection:res.partner,purchase_warn:0
+#: selection:res.partner,sale_warn:0
+msgid "No Message"
+msgstr ""
+
+#. module: warning
+#: model:ir.model,name:warning.model_account_invoice
+#: field:res.partner,invoice_warn:0
+msgid "Invoice"
+msgstr ""
+
+#. module: warning
+#: view:product.product:0
+msgid "Warning when Selling this Product"
+msgstr ""
+
+#. module: warning
+#: field:res.partner,picking_warn:0
+msgid "Stock Picking"
+msgstr ""
+
+#. module: warning
+#: model:ir.model,name:warning.model_purchase_order
+#: field:res.partner,purchase_warn:0
+msgid "Purchase Order"
+msgstr ""
+
+#. module: warning
+#: field:res.partner,purchase_warn_msg:0
+msgid "Message for Purchase Order"
+msgstr ""
+
+#. module: warning
+#: code:addons/warning/warning.py:32
+#: help:product.product,purchase_line_warn:0
+#: help:product.product,sale_line_warn:0
+#: help:res.partner,invoice_warn:0
+#: help:res.partner,picking_warn:0
+#: help:res.partner,purchase_warn:0
+#: help:res.partner,sale_warn:0
+#, python-format
+msgid ""
+"Selecting the \"Warning\" option will notify user with the message, "
+"Selecting \"Blocking Message\" will throw an exception with the message and "
+"block the flow. The Message has to be written in the next field."
+msgstr ""
+
+#. module: warning
+#: code:addons/warning/warning.py:67
+#: code:addons/warning/warning.py:96
+#: code:addons/warning/warning.py:130
+#: code:addons/warning/warning.py:162
+#: code:addons/warning/warning.py:192
+#: code:addons/warning/warning.py:218
+#: code:addons/warning/warning.py:266
+#: code:addons/warning/warning.py:299
+#, python-format
+msgid "Alert for %s !"
+msgstr ""
+
+#. module: warning
+#: view:res.partner:0
+msgid "Warning on the Sales Order"
+msgstr ""
+
+#. module: warning
+#: field:res.partner,invoice_warn_msg:0
+msgid "Message for Invoice"
+msgstr ""
+
+#. module: warning
+#: field:res.partner,sale_warn_msg:0
+msgid "Message for Sales Order"
+msgstr ""
+
+#. module: warning
+#: view:res.partner:0
+msgid "Warning on the Picking"
+msgstr ""
+
+#. module: warning
+#: view:res.partner:0
+msgid "Warning on the Purchase Order"
+msgstr ""
+
+#. module: warning
+#: code:addons/warning/warning.py:68
+#: code:addons/warning/warning.py:97
+#: code:addons/warning/warning.py:132
+#: code:addons/warning/warning.py:163
+#: code:addons/warning/warning.py:193
+#: code:addons/warning/warning.py:219
+#: code:addons/warning/warning.py:267
+#: code:addons/warning/warning.py:300
+#, python-format
+msgid "Warning for %s"
+msgstr ""
+
+#. module: warning
+#: field:product.product,sale_line_warn_msg:0
+msgid "Message for Sales Order Line"
+msgstr ""
+
+#. module: warning
+#: selection:product.product,purchase_line_warn:0
+#: selection:product.product,sale_line_warn:0
+#: selection:res.partner,invoice_warn:0
+#: selection:res.partner,picking_warn:0
+#: selection:res.partner,purchase_warn:0
+#: selection:res.partner,sale_warn:0
+msgid "Warning"
+msgstr ""
+
+#. module: warning
+#: field:res.partner,picking_warn_msg:0
+msgid "Message for Stock Picking"
+msgstr ""
+
+#. module: warning
+#: model:ir.model,name:warning.model_res_partner
+msgid "Partner"
+msgstr ""
+
+#. module: warning
+#: model:ir.model,name:warning.model_sale_order
+#: field:res.partner,sale_warn:0
+msgid "Sales Order"
+msgstr ""
+
+#. module: warning
+#: model:ir.model,name:warning.model_stock_picking_out
+msgid "Delivery Orders"
+msgstr ""
+
+#. module: warning
+#: model:ir.model,name:warning.model_sale_order_line
+#: field:product.product,sale_line_warn:0
+msgid "Sales Order Line"
+msgstr ""
From 5ceb9a84daf9af1bee2982ba78a02b051ab24b21 Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)"
Date: Thu, 16 May 2013 10:52:54 +0200
Subject: [PATCH 125/210] [FIX] account: validation of an invoice from another
company was not allowed because of default value of company_id field on
account.move
lp bug: https://launchpad.net/bugs/810548 fixed
bzr revid: qdp-launchpad@openerp.com-20130516085254-it0ff5oqlnodt5mm
---
addons/account/account_invoice.py | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/addons/account/account_invoice.py b/addons/account/account_invoice.py
index 2d09753e584..09b18da6e31 100644
--- a/addons/account/account_invoice.py
+++ b/addons/account/account_invoice.py
@@ -980,7 +980,8 @@ class account_invoice(osv.osv):
'line_id': line,
'journal_id': journal_id,
'date': date,
- 'narration':inv.comment
+ 'narration': inv.comment,
+ 'company_id': inv.company_id.id,
}
period_id = inv.period_id and inv.period_id.id or False
ctx.update(company_id=inv.company_id.id,
From 231103feebb4d233e26abbc8b3019c923b8a5ae3 Mon Sep 17 00:00:00 2001
From: Cedric Snauwaert
Date: Thu, 16 May 2013 12:16:16 +0200
Subject: [PATCH 126/210] [FIX]project: show tasks of project that are in
template state when clicking on the show task button from the project.
bzr revid: csn@openerp.com-20130516101616-g4unvwc2e1dxb5dc
---
addons/project/project.py | 3 ++-
addons/project/project_view.xml | 2 +-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/addons/project/project.py b/addons/project/project.py
index a5e540c8be7..0e86ed1399d 100644
--- a/addons/project/project.py
+++ b/addons/project/project.py
@@ -199,7 +199,8 @@ class project(osv.osv):
def _task_count(self, cr, uid, ids, field_name, arg, context=None):
res = dict.fromkeys(ids, 0)
- task_ids = self.pool.get('project.task').search(cr, uid, [('project_id', 'in', ids)])
+ context['active_test'] = False
+ task_ids = self.pool.get('project.task').search(cr, uid, [('project_id', 'in', ids)], context=context)
for task in self.pool.get('project.task').browse(cr, uid, task_ids, context):
res[task.project_id.id] += 1
return res
diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index f0092a1dd33..85e8d513b42 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -50,7 +50,7 @@
Tasksproject.taskkanban,tree,form,calendar,gantt,graph
- {'search_default_project_id': [active_id], 'default_project_id': active_id}
+ {'search_default_project_id': [active_id], 'default_project_id': active_id, 'active_test': False}
From 4bb3995680cf8f43e2496c9526f5b6e909ffe97b Mon Sep 17 00:00:00 2001
From: Xavier Morel
Date: Thu, 16 May 2013 13:03:35 +0200
Subject: [PATCH 127/210] [IMP] replace literal values by symbolic ones for
node types dispatching
bzr revid: xmo@openerp.com-20130516110335-dk803tjn1qpqd0ro
---
addons/web/static/src/js/coresetup.js | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/addons/web/static/src/js/coresetup.js b/addons/web/static/src/js/coresetup.js
index fd1ace312a9..6fc837333b6 100644
--- a/addons/web/static/src/js/coresetup.js
+++ b/addons/web/static/src/js/coresetup.js
@@ -555,8 +555,8 @@ instance.web.qweb.default_dict = {
instance.web.qweb.preprocess_node = function() {
// Note that 'this' is the Qweb Node
switch (this.node.nodeType) {
- case 3:
- case 4:
+ case Node.TEXT_NODE:
+ case Node.CDATA_SECTION_NODE:
// Text and CDATAs
var translation = this.node.parentNode.attributes['t-translation'];
if (translation && translation.value === 'off') {
@@ -567,7 +567,7 @@ instance.web.qweb.preprocess_node = function() {
this.node.data = match[1] + instance.web._t(match[2]) + match[3];
}
break;
- case 1:
+ case Node.ELEMENT_NODE:
// Element
var attr, attrs = ['label', 'title', 'alt', 'placeholder'];
while (attr = attrs.pop()) {
From 54ef169ce31df13a274168c21320f893b907dca9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?=
Date: Thu, 16 May 2013 14:02:27 +0200
Subject: [PATCH 128/210] [FIX] mail_alias, hr_job: when migrating to aliases,
allow to have aliases creating records from a different model than the parent
model; for example hr_job create hr_applicant records.
bzr revid: tde@openerp.com-20130516120227-z819lxy30mghc1hv
---
addons/hr_recruitment/hr_recruitment.py | 7 +++++--
addons/mail/mail_alias.py | 14 ++++++++------
2 files changed, 13 insertions(+), 8 deletions(-)
diff --git a/addons/hr_recruitment/hr_recruitment.py b/addons/hr_recruitment/hr_recruitment.py
index c2ee322bda9..daca2188a2b 100644
--- a/addons/hr_recruitment/hr_recruitment.py
+++ b/addons/hr_recruitment/hr_recruitment.py
@@ -503,8 +503,11 @@ class hr_job(osv.osv):
def _auto_init(self, cr, context=None):
"""Installation hook to create aliases for all jobs and avoid constraint errors."""
- self.pool.get('mail.alias').migrate_to_alias(cr, self._name, self._table, super(hr_job,self)._auto_init,
- self._columns['alias_id'], 'name', alias_prefix='job+', alias_defaults={'job_id': 'id'}, context=context)
+ if context is None:
+ context = {}
+ alias_context = dict(context, alias_model_name='hr.applicant')
+ self.pool.get('mail.alias').migrate_to_alias(cr, self._name, self._table, super(hr_job, self)._auto_init,
+ self._columns['alias_id'], 'name', alias_prefix='job+', alias_defaults={'job_id': 'id'}, context=alias_context)
def create(self, cr, uid, vals, context=None):
mail_alias = self.pool.get('mail.alias')
diff --git a/addons/mail/mail_alias.py b/addons/mail/mail_alias.py
index d5e3b675b56..987ac32c76c 100644
--- a/addons/mail/mail_alias.py
+++ b/addons/mail/mail_alias.py
@@ -134,7 +134,7 @@ class mail_alias(osv.Model):
return new_name
def migrate_to_alias(self, cr, child_model_name, child_table_name, child_model_auto_init_fct,
- alias_id_column, alias_key, alias_prefix = '', alias_force_key = '', alias_defaults = {}, context=None):
+ alias_id_column, alias_key, alias_prefix='', alias_force_key='', alias_defaults={}, context=None):
""" Installation hook to create aliases for all users and avoid constraint errors.
:param child_model_name: model name of the child class (i.e. res.users)
@@ -149,8 +149,10 @@ class mail_alias(osv.Model):
:param alias_defaults: dict, keys = mail.alias columns, values = child
model column name used for default values (i.e. {'job_id': 'id'})
"""
+ if context is None:
+ context = {}
- # disable the unique alias_id not null constraint, to avoid spurious warning during
+ # disable the unique alias_id not null constraint, to avoid spurious warning during
# super.auto_init. We'll reinstall it afterwards.
alias_id_column.required = False
@@ -160,14 +162,14 @@ class mail_alias(osv.Model):
registry = RegistryManager.get(cr.dbname)
mail_alias = registry.get('mail.alias')
child_class_model = registry.get(child_model_name)
- no_alias_ids = child_class_model.search(cr, SUPERUSER_ID, [('alias_id', '=', False)], context={'active_test':False})
+ no_alias_ids = child_class_model.search(cr, SUPERUSER_ID, [('alias_id', '=', False)], context={'active_test': False})
# Use read() not browse(), to avoid prefetching uninitialized inherited fields
for obj_data in child_class_model.read(cr, SUPERUSER_ID, no_alias_ids, [alias_key]):
- alias_vals = {'alias_name': '%s%s' % (alias_prefix, obj_data[alias_key]) }
+ alias_vals = {'alias_name': '%s%s' % (alias_prefix, obj_data[alias_key])}
if alias_force_key:
alias_vals['alias_force_thread_id'] = obj_data[alias_force_key]
- alias_vals['alias_defaults'] = dict( (k, obj_data[v]) for k, v in alias_defaults.iteritems())
- alias_id = mail_alias.create_unique_alias(cr, SUPERUSER_ID, alias_vals, model_name=child_model_name)
+ alias_vals['alias_defaults'] = dict((k, obj_data[v]) for k, v in alias_defaults.iteritems())
+ alias_id = mail_alias.create_unique_alias(cr, SUPERUSER_ID, alias_vals, model_name=context.get('alias_model_name', child_model_name))
child_class_model.write(cr, SUPERUSER_ID, obj_data['id'], {'alias_id': alias_id})
_logger.info('Mail alias created for %s %s (uid %s)', child_model_name, obj_data[alias_key], obj_data['id'])
From 655e36bc5047173740493d4ae69681553c1ca9f9 Mon Sep 17 00:00:00 2001
From: Cedric Snauwaert
Date: Thu, 16 May 2013 17:12:55 +0200
Subject: [PATCH 129/210] [FIX]sale_crm: when validating a SO with a sale team
associated, information was not in associated invoice.
bzr revid: csn@openerp.com-20130516151255-azu6a3x6les0tzu6
---
addons/sale_crm/sale_crm.py | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/addons/sale_crm/sale_crm.py b/addons/sale_crm/sale_crm.py
index c6aad296d76..3e3c445e474 100644
--- a/addons/sale_crm/sale_crm.py
+++ b/addons/sale_crm/sale_crm.py
@@ -29,6 +29,12 @@ class sale_order(osv.osv):
domain="['|',('section_id','=',section_id),('section_id','=',False), ('object_id.model', '=', 'crm.lead')]")
}
+ def _prepare_invoice(self, cr, uid, order, lines, context=None):
+ invoice_vals = super(sale_order, self)._prepare_invoice(cr, uid, order, lines, context=context)
+ if order.section_id and order.section_id.id:
+ invoice_vals['section_id'] = order.section_id.id
+ return invoice_vals
+
class res_users(osv.Model):
_inherit = 'res.users'
From f97439e0cebbd7ef5178ec53a9662b76a43528e0 Mon Sep 17 00:00:00 2001
From: Olivier Dony
Date: Thu, 16 May 2013 18:19:49 +0200
Subject: [PATCH 130/210] [FIX] portal_hr_employee: use dedicated employee
kanban view, avoids leaking undesired employee information in case parent
view is inherited
lp bug: https://launchpad.net/bugs/1179349 fixed
bzr revid: odo@openerp.com-20130516161949-0wvysc20f9m1vn63
---
.../portal_hr_employees/hr_employee_view.xml | 32 ++++++++++++++++---
1 file changed, 28 insertions(+), 4 deletions(-)
diff --git a/addons/portal_hr_employees/hr_employee_view.xml b/addons/portal_hr_employees/hr_employee_view.xml
index a3182cd5b1c..ace0daaff87 100644
--- a/addons/portal_hr_employees/hr_employee_view.xml
+++ b/addons/portal_hr_employees/hr_employee_view.xml
@@ -35,11 +35,35 @@
HR - Employess Kanbanhr.employee
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Tel:
+
Mobile:
+
+
+
+
+
+
+
+
+
From d6024fa36b1406f3f0da27001e66007963bfa2e5 Mon Sep 17 00:00:00 2001
From: Vidhin Mehta
Date: Thu, 16 May 2013 22:34:03 +0530
Subject: [PATCH 131/210] [FIX]add callback function to fetch_lang and in *drop
db* which is not created,after drop it shows 'db succesfully droped'.
bzr revid: vme@tinyerp.com-20130516170403-7oil1k6em99a1hmp
---
addons/web/controllers/main.py | 12 ++++--------
addons/web/static/src/js/chrome.js | 2 +-
2 files changed, 5 insertions(+), 9 deletions(-)
diff --git a/addons/web/controllers/main.py b/addons/web/controllers/main.py
index 0c94e9fe55a..6919def601a 100644
--- a/addons/web/controllers/main.py
+++ b/addons/web/controllers/main.py
@@ -780,17 +780,13 @@ class Database(openerpweb.Controller):
password, db = operator.itemgetter(
'drop_pwd', 'drop_db')(
dict(map(operator.itemgetter('name', 'value'), fields)))
- error = {'error':_('Could not drop database !'), 'title': _('Drop Database') }
+
try:
- proxy = req.session.proxy("db")
- if db in proxy.list(True):
- return proxy.drop(password, db)
- else:
- error.update({'error': "Database '%s' does not exist !" % db})
+ if req.session.proxy("db").drop(password, db):return True
except xmlrpclib.Fault, e:
if e.faultCode and e.faultCode.split(':')[0] == 'AccessDenied':
- error.update({'error': e.faultCode})
- return error
+ return {'error': e.faultCode, 'title': 'Drop Database'}
+ return {'error': _('Could not drop database !'), 'title': _('Drop Database')}
@openerpweb.httprequest
def backup(self, req, backup_db, backup_pwd, token):
diff --git a/addons/web/static/src/js/chrome.js b/addons/web/static/src/js/chrome.js
index ee8e741e6da..2ecf5328fd4 100644
--- a/addons/web/static/src/js/chrome.js
+++ b/addons/web/static/src/js/chrome.js
@@ -380,7 +380,7 @@ instance.web.DatabaseManager = instance.web.Widget.extend({
var fetch_langs = this.rpc("/web/session/get_lang_list", {}).done(function(result) {
self.lang_list = result;
});
- return $.when(fetch_langs).done(fetch_db.always(self.do_render));
+ return $.when(fetch_langs).done(function(){fetch_db.always(self.do_render)});
},
do_render: function() {
var self = this;
From 3a7a4f7d5e908e5d099e5f1da07ca179c4859359 Mon Sep 17 00:00:00 2001
From: Paramjit Singh Sahota
Date: Fri, 17 May 2013 11:31:33 +0530
Subject: [PATCH 132/210] [IMP] Removed 'cursor on '.openerp .oe_searchview
.oe_searchview_drawer .oe_searchview_advanced li' and then added
'cursor:default' on '.openerp .oe_searchview .oe_searchview_drawer'.
bzr revid: psa@tinyerp.com-20130517060133-zw7zpuvxhc459s5e
---
addons/web/static/src/css/base.css | 6 +-----
addons/web/static/src/css/base.sass | 6 +-----
2 files changed, 2 insertions(+), 10 deletions(-)
diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index 66997040bde..4c1a9ff65bd 100644
--- a/addons/web/static/src/css/base.css
+++ b/addons/web/static/src/css/base.css
@@ -1812,6 +1812,7 @@
display: block;
}
.openerp .oe_searchview .oe_searchview_drawer {
+ cursor: default;
position: absolute;
z-index: 2;
margin-top: 4px;
@@ -1958,7 +1959,6 @@
padding: 0;
}
.openerp .oe_searchview .oe_searchview_drawer .oe_searchview_advanced li {
- cursor: pointer;
position: relative;
list-style: none;
margin: 0;
@@ -1970,10 +1970,6 @@
.openerp .oe_searchview .oe_searchview_drawer .oe_searchview_advanced .searchview_extended_prop_or {
opacity: 0.5;
margin-left: -14px;
- cursor: cell;
- position: absolute;
- width: 16px;
- top: 5px;
}
.openerp .oe_searchview .oe_searchview_drawer .oe_opened h4:before {
content: "▾ ";
diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass
index 3f4f3e58bbe..88566b02d38 100644
--- a/addons/web/static/src/css/base.sass
+++ b/addons/web/static/src/css/base.sass
@@ -1441,6 +1441,7 @@ $sheet-padding: 16px
display: block
.oe_searchview_drawer
+ cursor: default
position: absolute
z-index: 2
// detach drawer from field slightly
@@ -1554,7 +1555,6 @@ $sheet-padding: 16px
list-style: none
padding: 0
li
- cursor: pointer
position: relative
list-style: none
margin: 0
@@ -1564,10 +1564,6 @@ $sheet-padding: 16px
.searchview_extended_prop_or
opacity: 0.5
margin-left: -14px
- cursor: cell
- position: absolute
- width: 16px
- top: 5px
.oe_opened
h4:before
content: "▾ "
From 8bdccc5cd26cea8a6b180b8953414cc4f55e1ff8 Mon Sep 17 00:00:00 2001
From: Alexandre Fayolle
Date: Fri, 17 May 2013 09:35:16 +0200
Subject: [PATCH 133/210] [FIX] work around bug preventing to validate invoices
in multicompany setting
lp bug: https://launchpad.net/bugs/1111298 fixed
bzr revid: alexandre.fayolle@camptocamp.com-20130517073516-yko5zp0j8zlopq2d
---
addons/account/account_invoice.py | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/addons/account/account_invoice.py b/addons/account/account_invoice.py
index 09b18da6e31..79ee5b3fe88 100644
--- a/addons/account/account_invoice.py
+++ b/addons/account/account_invoice.py
@@ -764,6 +764,8 @@ class account_invoice(osv.osv):
return move_lines
def check_tax_lines(self, cr, uid, inv, compute_taxes, ait_obj):
+ # work around bug lp:1111298 : problem in multicompany setting when accessing inv.company_id.currency_id
+ company_currency = self.pool['res.company'].browse(cr, uid, inv.company_id.id).currency_id
if not inv.tax_line:
for tax in compute_taxes.values():
ait_obj.create(cr, uid, tax)
@@ -777,7 +779,7 @@ class account_invoice(osv.osv):
if not key in compute_taxes:
raise osv.except_osv(_('Warning!'), _('Global taxes defined, but they are not in invoice lines !'))
base = compute_taxes[key]['base']
- if abs(base - tax.base) > inv.company_id.currency_id.rounding:
+ if abs(base - tax.base) > company_currency.rounding:
raise osv.except_osv(_('Warning!'), _('Tax base different!\nClick on compute to update the tax base.'))
for key in compute_taxes:
if not key in tax_key:
@@ -864,7 +866,8 @@ class account_invoice(osv.osv):
ctx.update({'lang': inv.partner_id.lang})
if not inv.date_invoice:
self.write(cr, uid, [inv.id], {'date_invoice': fields.date.context_today(self,cr,uid,context=context)}, context=ctx)
- company_currency = inv.company_id.currency_id.id
+ # work around bug lp:1111298 : problem in multicompany setting when accessing inv.company_id.currency_id
+ company_currency = self.pool['res.company'].browse(cr, uid, inv.company_id.id).currency_id.id
# create the analytical lines
# one move line per invoice line
iml = self._get_analytic_lines(cr, uid, inv.id, context=ctx)
From b0ee634dec85e2513430b567559e52b9e4d60026 Mon Sep 17 00:00:00 2001
From: Alexandre Fayolle
Date: Fri, 17 May 2013 10:00:31 +0200
Subject: [PATCH 134/210] [FIX] some missed access to currency_id through
company_id
bzr revid: alexandre.fayolle@camptocamp.com-20130517080031-7j72snb9mdv91cto
---
addons/account/account_invoice.py | 10 +++-------
1 file changed, 3 insertions(+), 7 deletions(-)
diff --git a/addons/account/account_invoice.py b/addons/account/account_invoice.py
index 79ee5b3fe88..057947205f0 100644
--- a/addons/account/account_invoice.py
+++ b/addons/account/account_invoice.py
@@ -717,7 +717,7 @@ class account_invoice(osv.osv):
inv = self.browse(cr, uid, id)
cur_obj = self.pool.get('res.currency')
- company_currency = inv.company_id.currency_id.id
+ company_currency = self.pool['res.company'].browse(cr, uid, inv.company_id.id).currency_id.id
if inv.type in ('out_invoice', 'in_refund'):
sign = 1
else:
@@ -764,7 +764,6 @@ class account_invoice(osv.osv):
return move_lines
def check_tax_lines(self, cr, uid, inv, compute_taxes, ait_obj):
- # work around bug lp:1111298 : problem in multicompany setting when accessing inv.company_id.currency_id
company_currency = self.pool['res.company'].browse(cr, uid, inv.company_id.id).currency_id
if not inv.tax_line:
for tax in compute_taxes.values():
@@ -866,7 +865,6 @@ class account_invoice(osv.osv):
ctx.update({'lang': inv.partner_id.lang})
if not inv.date_invoice:
self.write(cr, uid, [inv.id], {'date_invoice': fields.date.context_today(self,cr,uid,context=context)}, context=ctx)
- # work around bug lp:1111298 : problem in multicompany setting when accessing inv.company_id.currency_id
company_currency = self.pool['res.company'].browse(cr, uid, inv.company_id.id).currency_id.id
# create the analytical lines
# one move line per invoice line
@@ -1517,8 +1515,7 @@ class account_invoice_line(osv.osv):
if context is None:
context = {}
inv = self.pool.get('account.invoice').browse(cr, uid, invoice_id, context=context)
- company_currency = inv.company_id.currency_id.id
-
+ company_currency = self.pool['res.company'].browse(cr, uid, inv.company_id.id).currency_id.id
for line in inv.invoice_line:
mres = self.move_line_get_item(cr, uid, line, context)
if not mres:
@@ -1663,8 +1660,7 @@ class account_invoice_tax(osv.osv):
cur_obj = self.pool.get('res.currency')
inv = self.pool.get('account.invoice').browse(cr, uid, invoice_id, context=context)
cur = inv.currency_id
- company_currency = inv.company_id.currency_id.id
-
+ company_currency = self.pool['res.company'].browse(cr, uid, inv.company_id.id).currency_id.id
for line in inv.invoice_line:
for tax in tax_obj.compute_all(cr, uid, line.invoice_line_tax_id, (line.price_unit* (1-(line.discount or 0.0)/100.0)), line.quantity, line.product_id, inv.partner_id)['taxes']:
val={}
From 3d9c8b0513627cfa516e46e06907a11b4a19965e Mon Sep 17 00:00:00 2001
From: "cbi@openerp.my.openerp.com" <>
Date: Fri, 17 May 2013 10:02:46 +0200
Subject: [PATCH 135/210] [FIX] missing multi company currency access rules,
set currency.company_id to False by default
lp bug: https://launchpad.net/bugs/1111298 fixed
bzr revid: alexandre.fayolle@camptocamp.com-20130517080246-k23d8hd0ks36cr5l
---
openerp/addons/base/res/res_currency.py | 1 +
openerp/addons/base/security/base_security.xml | 8 ++++++++
2 files changed, 9 insertions(+)
diff --git a/openerp/addons/base/res/res_currency.py b/openerp/addons/base/res/res_currency.py
index 98dd6ed00d8..4756cdbe01a 100644
--- a/openerp/addons/base/res/res_currency.py
+++ b/openerp/addons/base/res/res_currency.py
@@ -73,6 +73,7 @@ class res_currency(osv.osv):
'position' : 'after',
'rounding': 0.01,
'accuracy': 4,
+ 'company_id': False,
}
_sql_constraints = [
# this constraint does not cover all cases due to SQL NULL handling for company_id,
diff --git a/openerp/addons/base/security/base_security.xml b/openerp/addons/base/security/base_security.xml
index b0de06078af..6bddd57d4b3 100644
--- a/openerp/addons/base/security/base_security.xml
+++ b/openerp/addons/base/security/base_security.xml
@@ -87,6 +87,14 @@
['|','|',('company_id.child_ids','child_of',[user.company_id.id]),('company_id','child_of',[user.company_id.id]),('company_id','=',False)]
+
+
+ currency rule
+
+
+ ['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]
+
+
From 89efc89651c2cb00242c6699a75d403bcb643598 Mon Sep 17 00:00:00 2001
From: Alexandre Fayolle
Date: Fri, 17 May 2013 10:03:19 +0200
Subject: [PATCH 136/210] [FIX] remove company_id from currencies in
currency_data.xml
lp bug: https://launchpad.net/bugs/1111298 fixed
bzr revid: alexandre.fayolle@camptocamp.com-20130517080319-ct4j81mc01dr1e2v
---
openerp/addons/base/currency_data.xml | 174 --------------------------
1 file changed, 174 deletions(-)
diff --git a/openerp/addons/base/currency_data.xml b/openerp/addons/base/currency_data.xml
index 7173b8492ab..96ff81cc0d1 100644
--- a/openerp/addons/base/currency_data.xml
+++ b/openerp/addons/base/currency_data.xml
@@ -9,7 +9,6 @@
0.014before
- 1.2834
@@ -23,7 +22,6 @@
Bs.F0.00014
- 5.864
@@ -36,7 +34,6 @@
$0.014
- 1.3388
@@ -50,7 +47,6 @@
CHF0.014
- 1.3086
@@ -63,7 +59,6 @@
R$0.014
- 2.2344
@@ -76,7 +71,6 @@
¥0.014
- 8.7556
@@ -90,7 +84,6 @@
$0.014
- 2933.8378
@@ -103,7 +96,6 @@
Kč0.014
- 26.5634
@@ -116,7 +108,6 @@
kr0.014
- 7.4445
@@ -130,7 +121,6 @@
Ft0.014
- 271.5621
@@ -143,7 +133,6 @@
Rp0.014
- 14352.00
@@ -161,7 +150,6 @@
Ls0.014
- 0.7086
@@ -174,7 +162,6 @@
kr0.014
- 7.8668
@@ -187,7 +174,6 @@
XPF1.004
- 119.331742
@@ -200,7 +186,6 @@
B/.0.014
- 1.2676
@@ -213,7 +198,6 @@
zł0.014
- 4.1005
@@ -226,7 +210,6 @@
kr0.014
- 10.3004
@@ -239,7 +222,6 @@
$0.014
- 5.0881
@@ -252,7 +234,6 @@
₹0.014
- 59.9739
@@ -265,7 +246,6 @@
$0.014
- 1.4070
@@ -278,7 +258,6 @@
₴0.014
- 10.1969
@@ -291,7 +270,6 @@
₫0.014
- 26330.01
@@ -304,7 +282,6 @@
$0.014
- 11.1608
@@ -317,7 +294,6 @@
¥0.014
- 133.62
@@ -330,7 +306,6 @@
лв0.014
- 1.9558
@@ -343,7 +318,6 @@
Lt0.014
- 3.4528
@@ -356,7 +330,6 @@
lei0.014
- 4.2253
@@ -369,7 +342,6 @@
kn0.014
- 7.2936
@@ -382,7 +354,6 @@
руб0.014
- 43.16
@@ -395,7 +366,6 @@
TL0.014
- 2.1411
@@ -408,7 +378,6 @@
₩0.014
- 1662.37
@@ -421,7 +390,6 @@
$0.014
- 18.6664
@@ -434,7 +402,6 @@
RM0.014
- 4.8887
@@ -447,7 +414,6 @@
$0.014
- 1.9764
@@ -460,7 +426,6 @@
Php0.014
- 66.1
@@ -473,7 +438,6 @@
$0.014
- 2.0126
@@ -486,7 +450,6 @@
R0.014
- 10.5618
@@ -515,7 +478,6 @@
Rs0.014
- 40.28
@@ -528,7 +490,6 @@
CFA14
- 655.957
@@ -541,7 +502,6 @@
FCFA14
- 655.957
@@ -554,7 +514,6 @@
USh14
- 3401.91388
@@ -567,7 +526,6 @@
L0.014
- 25
@@ -580,7 +538,6 @@
$0.014
- 710
@@ -593,7 +550,6 @@
$0.014
-
@@ -606,7 +562,6 @@
Afs0.014
-
@@ -619,7 +574,6 @@
Kz0.014
-
@@ -632,7 +586,6 @@
$0.014
-
@@ -645,7 +598,6 @@
դր.0.014
-
@@ -658,7 +610,6 @@
Afl.0.014
-
@@ -671,7 +622,6 @@
m0.014
-
@@ -684,7 +634,6 @@
B$0.014
-
@@ -697,7 +646,6 @@
BD0.014
-
@@ -710,7 +658,6 @@
৳0.014
-
@@ -723,7 +670,6 @@
Bds$0.014
-
@@ -736,7 +682,6 @@
BR0.014
-
@@ -749,7 +694,6 @@
BZ$0.014
-
@@ -762,7 +706,6 @@
BD$0.014
-
@@ -775,7 +718,6 @@
Nu.0.014
-
@@ -788,7 +730,6 @@
Bs.0.014
-
@@ -801,7 +742,6 @@
KM0.014
-
@@ -814,7 +754,6 @@
P0.014
-
@@ -827,7 +766,6 @@
FBu0.014
-
@@ -840,7 +778,6 @@
៛0.014
-
@@ -853,7 +790,6 @@
$0.014
-
@@ -866,7 +802,6 @@
CF0.014
-
@@ -879,7 +814,6 @@
Fr0.014
-
@@ -892,7 +826,6 @@
$0.014
-
@@ -905,7 +838,6 @@
ƒ0.014
-
@@ -918,7 +850,6 @@
£0.014
-
@@ -931,7 +862,6 @@
Fdj0.014
-
@@ -944,7 +874,6 @@
RD$0.014
-
@@ -957,7 +886,6 @@
TPE0.014
-
@@ -970,7 +898,6 @@
S/.0.014
-
@@ -983,7 +910,6 @@
E£0.014
-
@@ -996,7 +922,6 @@
¢0.014
-
@@ -1009,7 +934,6 @@
Nfk0.014
-
@@ -1022,7 +946,6 @@
kr0.014
-
@@ -1035,7 +958,6 @@
Br0.014
-
@@ -1048,7 +970,6 @@
£0.014
-
@@ -1061,7 +982,6 @@
FJ$0.014
-
@@ -1074,7 +994,6 @@
ლ0.014
-
@@ -1087,7 +1006,6 @@
£0.014
-
@@ -1100,7 +1018,6 @@
Q0.014
-
@@ -1113,7 +1030,6 @@
FG0.014
-
@@ -1125,7 +1041,6 @@
GWP0.014
-
@@ -1138,7 +1053,6 @@
$0.014
-
@@ -1151,7 +1065,6 @@
G0.014
-
@@ -1164,7 +1077,6 @@
kr0.014
-
@@ -1177,7 +1089,6 @@
﷼0.014
-
@@ -1190,7 +1101,6 @@
ع.د0.014
-
@@ -1203,7 +1113,6 @@
₪0.014
-
@@ -1216,7 +1125,6 @@
$0.014
-
@@ -1229,7 +1137,6 @@
د.ا 0.014
-
@@ -1242,7 +1149,6 @@
лв0.014
-
@@ -1255,7 +1161,6 @@
KSh0.014
-
@@ -1268,7 +1173,6 @@
د.ك 0.014
-
@@ -1281,7 +1185,6 @@
лв0.014
-
@@ -1294,7 +1197,6 @@
₭0.014
-
@@ -1307,7 +1209,6 @@
ل.ل0.014
-
@@ -1320,7 +1221,6 @@
L0.014
-
@@ -1333,7 +1233,6 @@
L$0.014
-
@@ -1346,7 +1245,6 @@
ل.د 0.014
-
@@ -1359,7 +1257,6 @@
MOP$0.014
-
@@ -1372,7 +1269,6 @@
ден0.014
-
@@ -1385,7 +1281,6 @@
Ar0.014
-
@@ -1398,7 +1293,6 @@
MK0.014
-
@@ -1411,7 +1305,6 @@
.ރ0.014
-
@@ -1424,7 +1317,6 @@
UM0.014
-
@@ -1437,7 +1329,6 @@
L0.014
-
@@ -1450,7 +1341,6 @@
₮0.014
-
@@ -1463,7 +1353,6 @@
د.م. 0.014
-
@@ -1476,7 +1365,6 @@
$0.014
-
@@ -1489,7 +1377,6 @@
DZ0.014
-
@@ -1502,7 +1389,6 @@
GH¢0.014
-
@@ -1515,7 +1401,6 @@
D0.014
-
@@ -1528,7 +1413,6 @@
Ƶ0.014
-
@@ -1541,7 +1425,6 @@
MT0.014
-
@@ -1554,7 +1437,6 @@
K0.014
-
@@ -1567,7 +1449,6 @@
$0.014
-
@@ -1580,7 +1461,6 @@
₨0.014
-
@@ -1593,7 +1473,6 @@
L0.014
-
@@ -1606,7 +1485,6 @@
C$0.014
-
@@ -1619,7 +1497,6 @@
₦0.014
-
@@ -1632,7 +1509,6 @@
₩0.014
-
@@ -1645,7 +1521,6 @@
Z$0.014
-
@@ -1658,7 +1533,6 @@
ZK0.014
-
@@ -1671,7 +1545,6 @@
﷼0.014
-
@@ -1684,7 +1557,6 @@
Bs0.014
-
@@ -1697,7 +1569,6 @@
€0.014
-
@@ -1710,7 +1581,6 @@
VT0.014
-
@@ -1723,7 +1593,6 @@
лв0.014
-
@@ -1736,7 +1605,6 @@
$U0.014
-
@@ -1749,7 +1617,6 @@
د.إ0.014
-
@@ -1762,7 +1629,6 @@
₴0.014
-
@@ -1775,7 +1641,6 @@
m0.014
-
@@ -1788,7 +1653,6 @@
TL0.014
-
@@ -1801,7 +1665,6 @@
DT0.014
-
@@ -1814,7 +1677,6 @@
$0.014
-
@@ -1827,7 +1689,6 @@
T$0.014
-
@@ -1840,7 +1701,6 @@
฿0.014
-
@@ -1853,7 +1713,6 @@
x/y0.014
-
@@ -1865,7 +1724,6 @@
TJR0.014
-
@@ -1878,7 +1736,6 @@
NT$0.014
-
@@ -1891,7 +1748,6 @@
£0.014
-
@@ -1904,7 +1760,6 @@
E0.014
-
@@ -1917,7 +1772,6 @@
$0.014
-
@@ -1930,7 +1784,6 @@
£Sd0.014
-
@@ -1943,7 +1796,6 @@
Rs0.014
-
@@ -1956,7 +1808,6 @@
£0.014
-
@@ -1970,7 +1821,6 @@
0.014before
-
@@ -1983,7 +1833,6 @@
Sh.0.014
-
@@ -1996,7 +1845,6 @@
SI$0.014
-
@@ -2009,7 +1857,6 @@
Le0.014
-
@@ -2022,7 +1869,6 @@
SR0.014
-
@@ -2035,7 +1881,6 @@
din.0.014
-
@@ -2048,7 +1893,6 @@
SR0.014
-
@@ -2061,7 +1905,6 @@
Db0.014
-
@@ -2074,7 +1917,6 @@
₤0.014
-
@@ -2087,7 +1929,6 @@
WS$0.014
-
@@ -2100,7 +1941,6 @@
£0.014
-
@@ -2113,7 +1953,6 @@
RF0.014
-
@@ -2126,7 +1965,6 @@
R0.014
-
@@ -2139,7 +1977,6 @@
L0.014
-
@@ -2152,7 +1989,6 @@
QR0.014
-
@@ -2165,7 +2001,6 @@
zł0.014
-
@@ -2178,7 +2013,6 @@
S/.0.014
-
@@ -2191,7 +2025,6 @@
₲0.014
-
@@ -2204,7 +2037,6 @@
K0.014
-
@@ -2217,7 +2049,6 @@
Rs.0.014
-
@@ -2230,7 +2061,6 @@
ر.ع.0.014
-
@@ -2243,7 +2073,6 @@
$0.014
-
@@ -2256,7 +2085,6 @@
Sk0.014
-
@@ -2268,7 +2096,6 @@
SIT0.014
-
@@ -2281,7 +2108,6 @@
дин.0.014
-
From ce5c5557a383beec75650778462d0b6126cf8dcb Mon Sep 17 00:00:00 2001
From: Cedric Snauwaert
Date: Fri, 17 May 2013 11:04:21 +0200
Subject: [PATCH 137/210] [FIX]ir_sequence: fix cryptic error message when
prefix/suffix is not in a valid format and update number_next in order for it
to have same value as the sql sequence preventing the sql sequence to restart
from one if a write is done.
bzr revid: csn@openerp.com-20130517090421-kik3215az48lg02f
---
openerp/addons/base/ir/ir_sequence.py | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/openerp/addons/base/ir/ir_sequence.py b/openerp/addons/base/ir/ir_sequence.py
index 44c9e57af32..9ab74bc3302 100644
--- a/openerp/addons/base/ir/ir_sequence.py
+++ b/openerp/addons/base/ir/ir_sequence.py
@@ -200,18 +200,22 @@ class ir_sequence(openerp.osv.osv.osv):
force_company = context.get('force_company')
if not force_company:
force_company = self.pool.get('res.users').browse(cr, uid, uid).company_id.id
- sequences = self.read(cr, uid, seq_ids, ['company_id','implementation','number_next','prefix','suffix','padding'])
+ sequences = self.read(cr, uid, seq_ids, ['name','company_id','implementation','number_next','prefix','suffix','padding'])
preferred_sequences = [s for s in sequences if s['company_id'] and s['company_id'][0] == force_company ]
seq = preferred_sequences[0] if preferred_sequences else sequences[0]
if seq['implementation'] == 'standard':
cr.execute("SELECT nextval('ir_sequence_%03d')" % seq['id'])
seq['number_next'] = cr.fetchone()
+ cr.execute("UPDATE ir_sequence SET number_next=%s WHERE id=%s ", (seq['number_next'], seq['id'],))
else:
cr.execute("SELECT number_next FROM ir_sequence WHERE id=%s FOR UPDATE NOWAIT", (seq['id'],))
cr.execute("UPDATE ir_sequence SET number_next=number_next+number_increment WHERE id=%s ", (seq['id'],))
d = self._interpolation_dict()
- interpolated_prefix = self._interpolate(seq['prefix'], d)
- interpolated_suffix = self._interpolate(seq['suffix'], d)
+ try:
+ interpolated_prefix = self._interpolate(seq['prefix'], d)
+ interpolated_suffix = self._interpolate(seq['suffix'], d)
+ except ValueError:
+ raise osv.except_osv(_('Warning'), _('Invalid prefix or suffix for sequence \'%s\'') % (seq.get('name')))
return interpolated_prefix + '%%0%sd' % seq['padding'] % seq['number_next'] + interpolated_suffix
def next_by_id(self, cr, uid, sequence_id, context=None):
From e60802725634166854e190353ca01ae37969ddd8 Mon Sep 17 00:00:00 2001
From: Olivier Dony
Date: Fri, 17 May 2013 12:29:33 +0200
Subject: [PATCH 138/210] [FIX] openerp/tests/test_mail.py marked executable as
it should
lp bug: https://launchpad.net/bugs/993414 fixed
bzr revid: odo@openerp.com-20130517102933-u1u4n2ad5jxnndw5
---
openerp/tests/test_mail.py | 0
1 file changed, 0 insertions(+), 0 deletions(-)
mode change 100644 => 100755 openerp/tests/test_mail.py
diff --git a/openerp/tests/test_mail.py b/openerp/tests/test_mail.py
old mode 100644
new mode 100755
From fb3835e8dca4190bae097be8117b8c415d70096b Mon Sep 17 00:00:00 2001
From: Olivier Dony
Date: Fri, 17 May 2013 12:35:02 +0200
Subject: [PATCH 139/210] [FIX] l10n_vn: removed incorrect exec bit on files
that have no reason to have it
lp bug: https://launchpad.net/bugs/993414 fixed
bzr revid: odo@openerp.com-20130517103502-llfmq8m9hk1tjz6c
---
addons/l10n_vn/__init__.py | 0
addons/l10n_vn/__openerp__.py | 0
2 files changed, 0 insertions(+), 0 deletions(-)
mode change 100755 => 100644 addons/l10n_vn/__init__.py
mode change 100755 => 100644 addons/l10n_vn/__openerp__.py
diff --git a/addons/l10n_vn/__init__.py b/addons/l10n_vn/__init__.py
old mode 100755
new mode 100644
diff --git a/addons/l10n_vn/__openerp__.py b/addons/l10n_vn/__openerp__.py
old mode 100755
new mode 100644
From 9182621004d7689da999ff1e00442c7358ed9307 Mon Sep 17 00:00:00 2001
From: Vidhin Mehta
Date: Fri, 17 May 2013 16:31:50 +0530
Subject: [PATCH 140/210] [IMP]
bzr revid: vme@tinyerp.com-20130517110150-c7wm67kfnp1p2lkd
---
addons/web/static/src/js/chrome.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/addons/web/static/src/js/chrome.js b/addons/web/static/src/js/chrome.js
index 2ecf5328fd4..35b57cb430b 100644
--- a/addons/web/static/src/js/chrome.js
+++ b/addons/web/static/src/js/chrome.js
@@ -380,7 +380,7 @@ instance.web.DatabaseManager = instance.web.Widget.extend({
var fetch_langs = this.rpc("/web/session/get_lang_list", {}).done(function(result) {
self.lang_list = result;
});
- return $.when(fetch_langs).done(function(){fetch_db.always(self.do_render)});
+ return $.when(fetch_db, fetch_langs).always(self.do_render);
},
do_render: function() {
var self = this;
From 913a7a6e5c45ba2b9f4011e1aff83989fb127752 Mon Sep 17 00:00:00 2001
From: Cedric Snauwaert
Date: Fri, 17 May 2013 14:43:28 +0200
Subject: [PATCH 141/210] [FIX]ir_sequence: only execute a change on postgresql
sequence when really needed and add a field to get an approximation of the
current next_number.
bzr revid: csn@openerp.com-20130517124328-kex5katw2tgpgdty
---
openerp/addons/base/ir/ir_sequence.py | 47 ++++++++++++++++++---
openerp/addons/base/ir/ir_sequence_view.xml | 4 +-
2 files changed, 43 insertions(+), 8 deletions(-)
diff --git a/openerp/addons/base/ir/ir_sequence.py b/openerp/addons/base/ir/ir_sequence.py
index 9ab74bc3302..5ac126ebfed 100644
--- a/openerp/addons/base/ir/ir_sequence.py
+++ b/openerp/addons/base/ir/ir_sequence.py
@@ -54,6 +54,34 @@ class ir_sequence(openerp.osv.osv.osv):
"""
_name = 'ir.sequence'
_order = 'name'
+
+ def _get_number_next_actual(self, cr, user, ids, field_name, arg, context=None):
+ '''Return number from ir_sequence row when no_gap implementation,
+ and number from postgres sequence when standard implementation.'''
+ res = dict.fromkeys(ids)
+ for element in self.browse(cr, user, ids, context=context):
+ if element.implementation != 'standard':
+ res[element.id] = element.number_next
+ else:
+ # get number from postgres sequence. Cannot use
+ # currval, because that might give an error when
+ # not having used nextval before.
+ statement = (
+ "SELECT last_value, increment_by, is_called"
+ " FROM ir_sequence_%03d"
+ % element.id)
+ cr.execute(statement)
+ (last_value, increment_by, is_called) = cr.fetchone()
+ if is_called:
+ res[element.id] = last_value + increment_by
+ else:
+ res[element.id] = last_value
+ return res
+
+ def _set_number_next_actual(self, cr, uid, id, name, value, args=None, context=None):
+ return self.write(cr, uid, id, {'number_next': value or 0}, context=context)
+
+
_columns = {
'name': openerp.osv.fields.char('Name', size=64, required=True),
'code': openerp.osv.fields.selection(_code_get, 'Code', size=64),
@@ -67,6 +95,7 @@ class ir_sequence(openerp.osv.osv.osv):
'prefix': openerp.osv.fields.char('Prefix', size=64, help="Prefix value of the record for the sequence"),
'suffix': openerp.osv.fields.char('Suffix', size=64, help="Suffix value of the record for the sequence"),
'number_next': openerp.osv.fields.integer('Next Number', required=True, help="Next number of this sequence"),
+ 'number_next_actual': openerp.osv.fields.function(_get_number_next_actual, fnct_inv=_set_number_next_actual, type='integer', required=True, string='Actual Next Number', help='Next number that will be used. Number is only informative and can differ from real number'),
'number_increment': openerp.osv.fields.integer('Increment Number', required=True, help="The next number of the sequence will be incremented by this number"),
'padding' : openerp.osv.fields.integer('Number Padding', required=True, help="OpenERP will automatically adds some '0' on the left of the 'Next Number' to get the required padding size."),
'company_id': openerp.osv.fields.many2one('res.company', 'Company'),
@@ -121,7 +150,7 @@ class ir_sequence(openerp.osv.osv.osv):
# object depends on it.
cr.execute("DROP SEQUENCE IF EXISTS %s RESTRICT " % names)
- def _alter_sequence(self, cr, id, number_increment, number_next):
+ def _alter_sequence(self, cr, id, number_increment, number_next=0):
""" Alter a PostreSQL sequence.
There is no access rights check.
@@ -129,9 +158,10 @@ class ir_sequence(openerp.osv.osv.osv):
if number_increment == 0:
raise osv.except_osv(_('Warning!'),_("Increment number must not be zero."))
assert isinstance(id, (int, long))
- cr.execute("""
- ALTER SEQUENCE ir_sequence_%03d INCREMENT BY %%s RESTART WITH %%s
- """ % id, (number_increment, number_next))
+ statement = ("ALTER SEQUENCE ir_sequence_%03d INCREMENT BY %d" % (id, number_increment))
+ if number_next:
+ statement += " RESTART WITH %d" % (number_next, )
+ cr.execute(statement)
def create(self, cr, uid, values, context=None):
""" Create a sequence, in implementation == standard a fast gaps-allowed PostgreSQL sequence is used.
@@ -160,7 +190,13 @@ class ir_sequence(openerp.osv.osv.osv):
n = values.get('number_next', row['number_next'])
if row['implementation'] == 'standard':
if new_implementation in ('standard', None):
- self._alter_sequence(cr, row['id'], i, n)
+ # Implementation has NOT changed.
+ # Only change sequence if really requested.
+ if row['number_next'] != n:
+ self._alter_sequence(cr, row['id'], i, n)
+ else:
+ # Just in case only increment changed
+ self._alter_sequence(cr, row['id'], i)
else:
self._drop_sequence(cr, row['id'])
else:
@@ -206,7 +242,6 @@ class ir_sequence(openerp.osv.osv.osv):
if seq['implementation'] == 'standard':
cr.execute("SELECT nextval('ir_sequence_%03d')" % seq['id'])
seq['number_next'] = cr.fetchone()
- cr.execute("UPDATE ir_sequence SET number_next=%s WHERE id=%s ", (seq['number_next'], seq['id'],))
else:
cr.execute("SELECT number_next FROM ir_sequence WHERE id=%s FOR UPDATE NOWAIT", (seq['id'],))
cr.execute("UPDATE ir_sequence SET number_next=number_next+number_increment WHERE id=%s ", (seq['id'],))
diff --git a/openerp/addons/base/ir/ir_sequence_view.xml b/openerp/addons/base/ir/ir_sequence_view.xml
index 0fa46d61957..050eb9e2333 100644
--- a/openerp/addons/base/ir/ir_sequence_view.xml
+++ b/openerp/addons/base/ir/ir_sequence_view.xml
@@ -20,7 +20,7 @@
-
+
@@ -57,7 +57,7 @@
-
+
From 8d639576f070807e7b5ad6e746be1e55ec59b333 Mon Sep 17 00:00:00 2001
From: Olivier Dony
Date: Fri, 17 May 2013 16:17:26 +0200
Subject: [PATCH 142/210] [FIX] modify domain evaluation tests to avoid relying
on res.currency entries assigned to companies, as demo data was modified for
bug 1111298
lp bug: https://launchpad.net/bugs/1111298 fixed
bzr revid: odo@openerp.com-20130517141726-67utxubzdflsgsnx
---
.../addons/base/test/test_osv_expression.yml | 26 +++++++++----------
1 file changed, 13 insertions(+), 13 deletions(-)
diff --git a/openerp/addons/base/test/test_osv_expression.yml b/openerp/addons/base/test/test_osv_expression.yml
index f1610e8b3a4..1516f090e94 100644
--- a/openerp/addons/base/test/test_osv_expression.yml
+++ b/openerp/addons/base/test/test_osv_expression.yml
@@ -291,22 +291,22 @@
assert res_101 == [], 'res_101: expected %r, got %r' % ([], res_101)
assert res_102 == company_ids, 'res_102: expected %r, got %r' % (company_ids, res_102)
-
- Property of the query (one2many != False).
+ Verify domain evaluation for `one2many != False`
-
- !python {model: res.currency }: |
- ids = self.search(cr, uid, [])
- referenced_companies = set([x.company_id.id for x in self.browse(cr, uid, ids)])
- companies = set(self.pool.get('res.company').search(cr, uid, [('currency_ids', '!=', False)]))
- assert referenced_companies == companies
+ !python {model: res.partner.category }: |
+ all_ids = self.search(cr, uid, [])
+ parent_categs = set([c.parent_id.id for c in self.browse(cr, uid, all_ids) if c.parent_id])
+ result = set(self.search(cr, uid, [('child_ids', '!=', False)]))
+ assert result and result == parent_categs, "Got %r, expected %r" % (result, parent_categs)
-
- Property of the query (one2many = False).
+ Verify domain evaluation for `one2many == False`
-
- !python {model: res.currency }: |
- ids = self.search(cr, uid, [])
- referenced_companies = set([x.company_id.id for x in self.browse(cr, uid, ids)])
- unreferenced_companies = set(self.pool.get('res.company').search(cr, uid, [])).difference(referenced_companies)
- companies = set(self.pool.get('res.company').search(cr, uid, [('currency_ids', '=', False)]))
- assert unreferenced_companies == companies
+ !python {model: res.partner.category }: |
+ all_ids = self.search(cr, uid, [])
+ parent_categs = set([c.parent_id.id for c in self.browse(cr, uid, all_ids) if c.parent_id])
+ leaf_categs = set(all_ids) - parent_categs
+ result = set(self.search(cr, uid, [('child_ids', '=', False)]))
+ assert result and result == leaf_categs, "Got %r, expected %r" % (result, leaf_categs)
-
Equivalent queries.
-
From 33ec8239d1d2595e6fce651f3aad19c431ca8102 Mon Sep 17 00:00:00 2001
From: Cedric Snauwaert
Date: Fri, 17 May 2013 17:45:44 +0200
Subject: [PATCH 143/210] [FIX]ir_sequence: better args definition
bzr revid: csn@openerp.com-20130517154544-c9jywavo9pnfn4rt
---
openerp/addons/base/ir/ir_sequence.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/openerp/addons/base/ir/ir_sequence.py b/openerp/addons/base/ir/ir_sequence.py
index 5ac126ebfed..1254f73e664 100644
--- a/openerp/addons/base/ir/ir_sequence.py
+++ b/openerp/addons/base/ir/ir_sequence.py
@@ -150,7 +150,7 @@ class ir_sequence(openerp.osv.osv.osv):
# object depends on it.
cr.execute("DROP SEQUENCE IF EXISTS %s RESTRICT " % names)
- def _alter_sequence(self, cr, id, number_increment, number_next=0):
+ def _alter_sequence(self, cr, id, number_increment, number_next=None):
""" Alter a PostreSQL sequence.
There is no access rights check.
@@ -159,7 +159,7 @@ class ir_sequence(openerp.osv.osv.osv):
raise osv.except_osv(_('Warning!'),_("Increment number must not be zero."))
assert isinstance(id, (int, long))
statement = ("ALTER SEQUENCE ir_sequence_%03d INCREMENT BY %d" % (id, number_increment))
- if number_next:
+ if number_next is not None:
statement += " RESTART WITH %d" % (number_next, )
cr.execute(statement)
From c694837a645cb43287ad1af1a033ee09bb8faf53 Mon Sep 17 00:00:00 2001
From: Xavier Morel
Date: Fri, 17 May 2013 18:22:15 +0200
Subject: [PATCH 144/210] [FIX] parsing of domains with non-ascii unicode
literals
update py.js to support parsing of escape sequences in string literals
bzr revid: xmo@openerp.com-20130517162215-4afen1mdzbfx1mxi
---
addons/web/static/lib/py.js/.hg_archival.txt | 4 +-
addons/web/static/lib/py.js/lib/py.js | 142 ++++++++++++++++---
2 files changed, 125 insertions(+), 21 deletions(-)
diff --git a/addons/web/static/lib/py.js/.hg_archival.txt b/addons/web/static/lib/py.js/.hg_archival.txt
index 1d47dff4445..94f4a9ad6e8 100644
--- a/addons/web/static/lib/py.js/.hg_archival.txt
+++ b/addons/web/static/lib/py.js/.hg_archival.txt
@@ -1,5 +1,5 @@
repo: 076b192d0d8ab2b92d1dbcfa3da055382f30eaea
-node: 142c22b230636674a0cee6bc29e6975f0f1600a5
+node: 7ee0bc7b4e9138f485cdc9ec791961d8ef452f17
branch: default
latesttag: 0.7
-latesttagdistance: 9
+latesttagdistance: 11
diff --git a/addons/web/static/lib/py.js/lib/py.js b/addons/web/static/lib/py.js/lib/py.js
index 8d6443b7753..2c738dc95d1 100644
--- a/addons/web/static/lib/py.js/lib/py.js
+++ b/addons/web/static/lib/py.js/lib/py.js
@@ -273,7 +273,7 @@ var py = {};
var Special = '[:;.,`@]';
var Funny = group(Operator, Bracket, Special);
- var ContStr = group("[uU]?'([^']*)'", '[uU]?"([^"]*)"');
+ var ContStr = group("([uU])?'([^']*)'", '([uU])?"([^"]*)"');
var PseudoToken = Whitespace + group(Number, Funny, ContStr, Name);
@@ -311,7 +311,8 @@ var py = {};
} else if (string_pattern.test(token)) {
var m = string_pattern.exec(token);
tokens.push(create(symbols['(string)'], {
- value: (m[2] !== undefined ? m[2] : m[3])
+ unicode: !!(m[2] || m[4]),
+ value: (m[3] !== undefined ? m[3] : m[5])
}));
} else if (token in symbols) {
var symbol;
@@ -393,13 +394,14 @@ var py = {};
switch(val.constructor) {
case Object:
- var out = py.PY_call(py.object);
- for(var k in val) {
- if (val.hasOwnProperty(k)) {
- out[k] = val[k];
+ // TODO: why py.object instead of py.dict?
+ var o = py.PY_call(py.object);
+ for (var prop in val) {
+ if (val.hasOwnProperty(prop)) {
+ o[prop] = val[prop];
}
}
- return out;
+ return o;
case Array:
return py.list.fromJSON(val);
}
@@ -521,7 +523,7 @@ var py = {};
}
};
py.PY_getAttr = function (o, attr_name) {
- return PY_ensurepy(o.__getattribute__(attr_name),attr_name);
+ return PY_ensurepy(o.__getattribute__(attr_name));
};
py.PY_str = function (o) {
var v = o.__str__();
@@ -762,14 +764,7 @@ var py = {};
// Conversion
toJSON: function () {
- var out = {};
- for(var k in this) {
- if (this.hasOwnProperty(k) && !/^__/.test(k)) {
- var val = this[k];
- out[k] = val.toJSON ? val.toJSON() : val;
- }
- }
- return out;
+ throw new Error(this.constructor.name + ' can not be converted to JSON');
}
});
var NoneType = py.type('NoneType', null, {
@@ -998,7 +993,7 @@ var py = {};
}
var t = py.PY_call(py.tuple);
for(var i=0; i
Date: Fri, 17 May 2013 20:15:14 +0200
Subject: [PATCH 145/210] [FIX] ir.sequence: add a proper default value for
number_next_actual (0 is disallowed by default) + avoid error when trying to
alter a sequence during creation
lp bug: https://launchpad.net/bugs/960201 fixed
bzr revid: odo@openerp.com-20130517181514-xcy83yakpuqa3oik
---
openerp/addons/base/ir/ir_sequence.py | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/openerp/addons/base/ir/ir_sequence.py b/openerp/addons/base/ir/ir_sequence.py
index a479d1e9023..0f505814c0c 100644
--- a/openerp/addons/base/ir/ir_sequence.py
+++ b/openerp/addons/base/ir/ir_sequence.py
@@ -106,6 +106,7 @@ class ir_sequence(openerp.osv.osv.osv):
'company_id': lambda s,cr,uid,c: s.pool.get('res.company')._company_default_get(cr, uid, 'ir.sequence', context=c),
'number_increment': 1,
'number_next': 1,
+ 'number_next_actual': 1,
'padding' : 0,
}
@@ -158,7 +159,12 @@ class ir_sequence(openerp.osv.osv.osv):
if number_increment == 0:
raise osv.except_osv(_('Warning!'),_("Increment number must not be zero."))
assert isinstance(id, (int, long))
- statement = ("ALTER SEQUENCE ir_sequence_%03d INCREMENT BY %d" % (id, number_increment))
+ seq_name = 'ir_sequence_%03d' % (id,)
+ cr.execute("SELECT relname FROM pg_class WHERE relkind = %s AND relname=%s", ('S', seq_name))
+ if not cr.fetchone():
+ # sequence is not created yet, we're inside create() so ignore it, will be set later
+ return
+ statement = "ALTER SEQUENCE %s INCREMENT BY %d" % (seq_name, number_increment)
if number_next is not None:
statement += " RESTART WITH %d" % (number_next, )
cr.execute(statement)
From f0ae319dec9db6256c41e70e4be4c800c5d470e4 Mon Sep 17 00:00:00 2001
From: Nhomar Hernandez
Date: Fri, 17 May 2013 16:26:08 -0430
Subject: [PATCH 146/210] [IMP] When we go step by step, change the Case for a
variable in a diff Is a little confufing, in our case 100% of time our team
had problems confusing Action with action Obtaining an error with prototype
because incorrect declaration.
IMHO this is a No-Brain merge, but i explain well to be sure you understand my point.
bzr revid: nhomar@gmail.com-20130517205608-wykuz0oxjccf6021
---
addons/web/doc/module/static/src/js/first_module.js.2.diff | 4 ++--
addons/web/doc/module/static/src/js/first_module.js.3.diff | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/addons/web/doc/module/static/src/js/first_module.js.2.diff b/addons/web/doc/module/static/src/js/first_module.js.2.diff
index 88a80f50fff..f3bceecdc78 100644
--- a/addons/web/doc/module/static/src/js/first_module.js.2.diff
+++ b/addons/web/doc/module/static/src/js/first_module.js.2.diff
@@ -4,8 +4,8 @@
// static/src/js/first_module.js
openerp.web_example = function (instance) {
- console.log("Module loaded");
-+ instance.web.client_actions.add('example.action', 'instance.web_example.action');
-+ instance.web_example.action = function (parent, action) {
++ instance.web.client_actions.add('example.action', 'instance.web_example.Action');
++ instance.web_example.Action = function (parent, action) {
+ console.log("Executed the action", action);
+ };
};
diff --git a/addons/web/doc/module/static/src/js/first_module.js.3.diff b/addons/web/doc/module/static/src/js/first_module.js.3.diff
index 295e90b6840..ecab3ee1832 100644
--- a/addons/web/doc/module/static/src/js/first_module.js.3.diff
+++ b/addons/web/doc/module/static/src/js/first_module.js.3.diff
@@ -3,8 +3,8 @@
@@ -1,7 +1,11 @@
// static/src/js/first_module.js
openerp.web_example = function (instance) {
-- instance.web.client_actions.add('example.action', 'instance.web_example.action');
-- instance.web_example.action = function (parent, action) {
+- instance.web.client_actions.add('example.action', 'instance.web_example.Action');
+- instance.web_example.Action = function (parent, action) {
- console.log("Executed the action", action);
- };
+ instance.web.client_actions.add('example.action', 'instance.web_example.Action');
From c8136cee66098709db68c41d275b14d83f6ecfd1 Mon Sep 17 00:00:00 2001
From: Launchpad Translations on behalf of openerp <>
Date: Sun, 19 May 2013 06:13:01 +0000
Subject: [PATCH 147/210] Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20130519061301-tarop35lwadoymxh
---
addons/web/i18n/lt.po | 28 ++---
addons/web_view_editor/i18n/lv.po | 184 ++++++++++++++++++++++++++++++
2 files changed, 198 insertions(+), 14 deletions(-)
create mode 100644 addons/web_view_editor/i18n/lv.po
diff --git a/addons/web/i18n/lt.po b/addons/web/i18n/lt.po
index 1a38635acb0..52252cde9c5 100644
--- a/addons/web/i18n/lt.po
+++ b/addons/web/i18n/lt.po
@@ -8,14 +8,14 @@ msgstr ""
"Project-Id-Version: openerp-web\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2013-03-07 08:39+0000\n"
-"PO-Revision-Date: 2013-04-30 16:22+0000\n"
-"Last-Translator: Giedrius Slavinskas - inovera.lt \n"
+"PO-Revision-Date: 2013-05-18 07:51+0000\n"
+"Last-Translator: Mantas Kriaučiūnas \n"
"Language-Team: Lithuanian \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-05-01 05:15+0000\n"
-"X-Generator: Launchpad (build 16580)\n"
+"X-Launchpad-Export-Date: 2013-05-19 06:13+0000\n"
+"X-Generator: Launchpad (build 16626)\n"
#. module: web
#. openerp-web
@@ -685,7 +685,7 @@ msgstr "Žiūrėti"
#: code:addons/web/static/src/xml/base.xml:1473
#, python-format
msgid "Save Filter"
-msgstr "Išsaugoti filtrą"
+msgstr "Įrašyti filtrą"
#. module: web
#. openerp-web
@@ -750,7 +750,7 @@ msgstr "Taikyti"
#: code:addons/web/static/src/xml/base.xml:1395
#, python-format
msgid "Save & New"
-msgstr "Išsaugoti ir kurti naują"
+msgstr "Įrašyti ir kurti naują"
#. module: web
#. openerp-web
@@ -758,7 +758,7 @@ msgstr "Išsaugoti ir kurti naują"
#: code:addons/web/static/src/xml/base.xml:1234
#, python-format
msgid "Save As"
-msgstr "Išsaugoti kaip"
+msgstr "Įrašyti kaip"
#. module: web
#. openerp-web
@@ -786,7 +786,7 @@ msgstr "prieš dieną"
#: code:addons/web/static/src/xml/base.xml:1787
#, python-format
msgid "Does your file have titles?"
-msgstr "Ar jūsų fails turi antraštes?"
+msgstr "Ar jūsų failas turi antraštes?"
#. module: web
#. openerp-web
@@ -939,7 +939,7 @@ msgstr "Pašalinti šį priedą"
#: code:addons/web/static/src/xml/base.xml:1610
#, python-format
msgid "Save"
-msgstr "Išsaugoti"
+msgstr "Įrašyti"
#. module: web
#. openerp-web
@@ -1023,7 +1023,7 @@ msgstr "Neteisingas duomenų bazės pavadinimas"
#: code:addons/web/static/src/xml/base.xml:1691
#, python-format
msgid "Save fields list"
-msgstr "Saugoti laukų sarašą"
+msgstr "Įrašyti laukų sarašą"
#. module: web
#. openerp-web
@@ -1378,7 +1378,7 @@ msgstr "Keisti įmonės duomenis"
#: code:addons/web/static/src/js/view_form.js:4923
#, python-format
msgid "Save As..."
-msgstr "Išsaugoti kaip..."
+msgstr "Įrašyti kaip..."
#. module: web
#. openerp-web
@@ -1686,7 +1686,7 @@ msgstr ""
#: code:addons/web/static/src/js/view_form.js:1064
#, python-format
msgid "Save default"
-msgstr "Išsaugoti numatytąją reikšmę"
+msgstr "Įrašyti numatytąją reikšmę"
#. module: web
#. openerp-web
@@ -1787,7 +1787,7 @@ msgstr ""
#: code:addons/web/static/src/xml/base.xml:1748
#, python-format
msgid "Save as:"
-msgstr "Išsaugoti kaip:"
+msgstr "Įrašyti kaip:"
#. module: web
#. openerp-web
@@ -2567,7 +2567,7 @@ msgstr "Ar tikrai norite ištrinti šį įrašą?"
#: code:addons/web/static/src/xml/base.xml:1394
#, python-format
msgid "Save & Close"
-msgstr "Tik Išsaugoti"
+msgstr "Tik įrašyti"
#. module: web
#. openerp-web
diff --git a/addons/web_view_editor/i18n/lv.po b/addons/web_view_editor/i18n/lv.po
new file mode 100644
index 00000000000..f9a8160e88b
--- /dev/null
+++ b/addons/web_view_editor/i18n/lv.po
@@ -0,0 +1,184 @@
+# Latvian translation for openerp-web
+# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
+# This file is distributed under the same license as the openerp-web package.
+# FIRST AUTHOR , 2013.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openerp-web\n"
+"Report-Msgid-Bugs-To: FULL NAME \n"
+"POT-Creation-Date: 2013-03-07 08:39+0000\n"
+"PO-Revision-Date: 2013-05-17 11:15+0000\n"
+"Last-Translator: sieks \n"
+"Language-Team: Latvian \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2013-05-19 06:13+0000\n"
+"X-Generator: Launchpad (build 16626)\n"
+
+#. module: web_view_editor
+#. openerp-web
+#: code:addons/web_view_editor/static/src/js/view_editor.js:164
+#, python-format
+msgid "The following fields are invalid :"
+msgstr ""
+
+#. module: web_view_editor
+#. openerp-web
+#: code:addons/web_view_editor/static/src/js/view_editor.js:63
+#, python-format
+msgid "Create"
+msgstr "Izveidot"
+
+#. module: web_view_editor
+#. openerp-web
+#: code:addons/web_view_editor/static/src/js/view_editor.js:986
+#, python-format
+msgid "New Field"
+msgstr "Jauns lauks"
+
+#. module: web_view_editor
+#. openerp-web
+#: code:addons/web_view_editor/static/src/js/view_editor.js:386
+#, python-format
+msgid "Do you really wants to create an inherited view here?"
+msgstr ""
+
+#. module: web_view_editor
+#. openerp-web
+#: code:addons/web_view_editor/static/src/js/view_editor.js:396
+#, python-format
+msgid "Preview"
+msgstr ""
+
+#. module: web_view_editor
+#. openerp-web
+#: code:addons/web_view_editor/static/src/js/view_editor.js:183
+#, python-format
+msgid "Do you really want to remove this view?"
+msgstr ""
+
+#. module: web_view_editor
+#. openerp-web
+#: code:addons/web_view_editor/static/src/js/view_editor.js:90
+#, python-format
+msgid "Save"
+msgstr "Saglabāt"
+
+#. module: web_view_editor
+#. openerp-web
+#: code:addons/web_view_editor/static/src/js/view_editor.js:393
+#, python-format
+msgid "Select an element"
+msgstr ""
+
+#. module: web_view_editor
+#. openerp-web
+#: code:addons/web_view_editor/static/src/js/view_editor.js:828
+#: code:addons/web_view_editor/static/src/js/view_editor.js:954
+#, python-format
+msgid "Update"
+msgstr ""
+
+#. module: web_view_editor
+#. openerp-web
+#: code:addons/web_view_editor/static/src/js/view_editor.js:263
+#, python-format
+msgid "Please select view in list :"
+msgstr ""
+
+#. module: web_view_editor
+#. openerp-web
+#: code:addons/web_view_editor/static/src/js/view_editor.js:37
+#, python-format
+msgid "Manage Views (%s)"
+msgstr "Pārvaldīt skatus (%s)"
+
+#. module: web_view_editor
+#. openerp-web
+#: code:addons/web_view_editor/static/src/js/view_editor.js:13
+#, python-format
+msgid "Manage Views"
+msgstr ""
+
+#. module: web_view_editor
+#. openerp-web
+#: code:addons/web_view_editor/static/src/js/view_editor.js:825
+#: code:addons/web_view_editor/static/src/js/view_editor.js:951
+#, python-format
+msgid "Properties"
+msgstr "Īpašības"
+
+#. module: web_view_editor
+#. openerp-web
+#: code:addons/web_view_editor/static/src/js/view_editor.js:64
+#, python-format
+msgid "Edit"
+msgstr "Labot"
+
+#. module: web_view_editor
+#. openerp-web
+#: code:addons/web_view_editor/static/src/js/view_editor.js:14
+#, python-format
+msgid "Could not find current view declaration"
+msgstr ""
+
+#. module: web_view_editor
+#. openerp-web
+#: code:addons/web_view_editor/static/src/js/view_editor.js:382
+#, python-format
+msgid "Inherited View"
+msgstr ""
+
+#. module: web_view_editor
+#. openerp-web
+#: code:addons/web_view_editor/static/src/js/view_editor.js:65
+#, python-format
+msgid "Remove"
+msgstr ""
+
+#. module: web_view_editor
+#. openerp-web
+#: code:addons/web_view_editor/static/src/js/view_editor.js:516
+#, python-format
+msgid "Do you really want to remove this node?"
+msgstr ""
+
+#. module: web_view_editor
+#. openerp-web
+#: code:addons/web_view_editor/static/src/js/view_editor.js:390
+#, python-format
+msgid "Can't Update View"
+msgstr ""
+
+#. module: web_view_editor
+#. openerp-web
+#: code:addons/web_view_editor/static/src/js/view_editor.js:379
+#, python-format
+msgid "View Editor %d - %s"
+msgstr ""
+
+#. module: web_view_editor
+#. openerp-web
+#: code:addons/web_view_editor/static/src/js/view_editor.js:112
+#: code:addons/web_view_editor/static/src/js/view_editor.js:846
+#: code:addons/web_view_editor/static/src/js/view_editor.js:974
+#, python-format
+msgid "Cancel"
+msgstr ""
+
+#. module: web_view_editor
+#. openerp-web
+#: code:addons/web_view_editor/static/src/js/view_editor.js:66
+#: code:addons/web_view_editor/static/src/js/view_editor.js:413
+#, python-format
+msgid "Close"
+msgstr ""
+
+#. module: web_view_editor
+#. openerp-web
+#: code:addons/web_view_editor/static/src/js/view_editor.js:88
+#, python-format
+msgid "Create a view (%s)"
+msgstr ""
From 1647391acc19c67fb0b62dea247b16c7d6627f33 Mon Sep 17 00:00:00 2001
From: Launchpad Translations on behalf of openerp <>
Date: Tue, 21 May 2013 05:43:52 +0000
Subject: [PATCH 148/210] Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20130519061236-r4zubxtanesjqld0
bzr revid: launchpad_translations_on_behalf_of_openerp-20130520063148-0crtjtoieit1g5k8
bzr revid: launchpad_translations_on_behalf_of_openerp-20130521054352-g6yw7uvuietnscm6
---
openerp/addons/base/i18n/ko.po | 26 ++++++++++++++++++++++----
openerp/addons/base/i18n/sl.po | 13 ++++++++-----
openerp/addons/base/i18n/tr.po | 8 +++++---
3 files changed, 35 insertions(+), 12 deletions(-)
diff --git a/openerp/addons/base/i18n/ko.po b/openerp/addons/base/i18n/ko.po
index cdde048b78b..f4dc8d4a714 100644
--- a/openerp/addons/base/i18n/ko.po
+++ b/openerp/addons/base/i18n/ko.po
@@ -8,14 +8,14 @@ msgstr ""
"Project-Id-Version: openobject-server\n"
"Report-Msgid-Bugs-To: FULL NAME