, 2018\n"
"Language-Team: Turkish (https://www.transifex.com/odoo/teams/41243/tr/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -566,6 +568,8 @@ msgid ""
"Depicts the date where the Quotation should be validated and converted into "
"a purchase order."
msgstr ""
+"Teklifin onaylanması ve satın alma siparişine dönüştürülmesi gereken tarihi "
+"gösterir."
#. module: purchase
#: model:ir.model.fields,field_description:purchase.field_purchase_order_line__name
@@ -625,6 +629,8 @@ msgid ""
"Encoding help. When selected, the associated purchase order lines are added "
"to the vendor bill. Several PO can be selected."
msgstr ""
+"Kodlama yardımı. Seçildiği zaman, ilişkili satın alma sipariş satırları "
+"tedarikçi faturasına eklenir. Bir çok PO seçilebilir."
#. module: purchase
#: model:ir.ui.view,arch_db:purchase.exception_on_po
@@ -668,6 +674,7 @@ msgstr "Sonraki Aktiviteler"
#: selection:res.company,po_double_validation:0
msgid "Get 2 levels of approvals to confirm a purchase order"
msgstr ""
+"Bir satın alma siparişinin onaylanması için 2 onay seviyesi almak gerekir."
#. module: purchase
#: model:ir.ui.view,arch_db:purchase.res_config_settings_view_form_purchase
@@ -884,6 +891,9 @@ msgid ""
"Orders for procuring products, they will be scheduled that many days earlier"
" to cope with unexpected vendor delays."
msgstr ""
+"Satıcı teslimat süreleri için hata payı. Sistem, ürün tedarik etmek için "
+"Satın Alma Siparişleri ürettiğinde, beklenmedik satıcı gecikmeleriyle başa "
+"çıkacakları günler öncesinden planlanacaktır."
#. module: purchase
#: model:ir.model.fields,help:purchase.field_res_config_settings__use_po_lead
@@ -920,7 +930,7 @@ msgstr "Min. Envanter Kuralı"
#: model:ir.model.fields,help:purchase.field_res_company__po_double_validation_amount
#: model:ir.model.fields,help:purchase.field_res_config_settings__po_double_validation_amount
msgid "Minimum amount for which a double validation is required"
-msgstr ""
+msgstr " Çift doğrulama gerektiren minimum miktar"
#. module: purchase
#: model:ir.filters,name:purchase.filter_purchase_order_monthly_purchases
@@ -1228,6 +1238,10 @@ msgid ""
"purchase history and performance. From this menu you can track your "
"negotiation performance, the delivery performance of your vendors, etc."
msgstr ""
+"Satınalma Analizi, şirket satın alma geçmişinizi ve performansınızı kolayca "
+"kontrol etmenizi ve analiz etmenizi sağlar. Bu menüden görüşme "
+"performansınızı, satıcılarınızın teslim performanslarını vb. "
+"Izleyebilirsiniz."
#. module: purchase
#: model:ir.model.fields,field_description:purchase.field_res_company__po_lead
@@ -1303,6 +1317,8 @@ msgid ""
"Purchase Order Modification used when you want to purchase order editable "
"after confirm"
msgstr ""
+"Onaydan sonra satın alma siparişi vermek istediğinizde düzenlenebilir olması"
+" için Satın Alma Siparişi Değiştirme kullanılır."
#. module: purchase
#: model:ir.actions.act_window,name:purchase.purchase_form_action
@@ -1344,7 +1360,7 @@ msgstr ""
#. module: purchase
#: model:ir.ui.view,arch_db:purchase.view_purchase_order_filter
msgid "Purchase orders that have been invoiced."
-msgstr ""
+msgstr "Faturalanan satın alma siparişi."
#. module: purchase
#: model:ir.ui.view,arch_db:purchase.view_purchase_order_filter
@@ -1380,6 +1396,8 @@ msgid ""
"Put an address if you want to deliver directly from the vendor to the "
"customer. Otherwise, keep empty to deliver to your own company."
msgstr ""
+"Eğer doğrudan tedarikçiden müşteriye teslimat olmasını istiyorsanız, adres "
+"girin. Eğer boş tutarsanız şirketinize teslimat olur."
#. module: purchase
#: model:ir.ui.view,arch_db:purchase.res_config_settings_view_form_purchase
@@ -1558,7 +1576,7 @@ msgstr "Satınalma Siparişi Ara"
#. module: purchase
#: model:ir.model.fields,field_description:purchase.field_res_config_settings__use_po_lead
msgid "Security Lead Time for Purchase"
-msgstr ""
+msgstr "Satın Alma için Teslimat Zaman Güvenliği"
#. module: purchase
#: model:ir.model.fields,help:purchase.field_product_product__purchase_line_warn
@@ -1669,7 +1687,7 @@ msgstr "Vergiler:"
#. module: purchase
#: model:ir.model.fields,help:purchase.field_purchase_order__default_location_dest_id_usage
msgid "Technical field used to display the Drop Ship Address"
-msgstr ""
+msgstr "Teslimat Bırakma Adresini görüntülemek için kullanılan teknik alan"
#. module: purchase
#: model:ir.model.fields,field_description:purchase.field_purchase_order__notes
@@ -1703,6 +1721,9 @@ msgid ""
" converted into a purchase order, you will be able to control the receipt\n"
" of the products and the vendor bill."
msgstr ""
+"Teklif için gerekli ilk adım satın alma adımı. Satın alma siparişine "
+"dönüştürüldükten sonra, ürün makbuzunu ve tedarikçi faturasını kontrol "
+"edebileceksiniz."
#. module: purchase
#: code:addons/purchase/models/purchase.py:931
@@ -1718,6 +1739,8 @@ msgid ""
"This account will be used to value price difference between purchase price "
"and accounting cost."
msgstr ""
+"Bu hesap, satın alma fiyatı ile muhasebe maliyeti arasındaki fiyat farkı "
+"değeri için kullanılacaktır."
#. module: purchase
#: model:ir.model.fields,help:purchase.field_product_product__property_account_creditor_price_difference
@@ -1773,7 +1796,7 @@ msgstr "Buraya yazacağınız açıklamalar satınalma siparişlerinde görünec
#: code:addons/purchase/models/account_invoice.py:216
#, python-format
msgid "This vendor bill has been created from: %s"
-msgstr ""
+msgstr "Bu satıcı faturası üzerinden oluşturuldu: %s"
#. module: purchase
#: code:addons/purchase/models/account_invoice.py:230
diff --git a/addons/purchase/models/account_invoice.py b/addons/purchase/models/account_invoice.py
index f2636e003ff..36dad6857f5 100644
--- a/addons/purchase/models/account_invoice.py
+++ b/addons/purchase/models/account_invoice.py
@@ -172,6 +172,11 @@ class AccountInvoice(models.Model):
stock_move_obj = self.env['stock.move']
valuation_stock_move = stock_move_obj.search([('purchase_line_id', '=', i_line.purchase_line_id.id), ('state', '=', 'done')])
+ if self.type == 'in_refund':
+ valuation_stock_move = valuation_stock_move.filtered(lambda m: m._is_out())
+ elif self.type == 'in_invoice':
+ valuation_stock_move = valuation_stock_move.filtered(lambda m: m._is_in())
+
if valuation_stock_move:
valuation_price_unit_total = 0
valuation_total_qty = 0
diff --git a/addons/purchase/models/purchase.py b/addons/purchase/models/purchase.py
index c3cb22e2694..c520e6914b3 100644
--- a/addons/purchase/models/purchase.py
+++ b/addons/purchase/models/purchase.py
@@ -92,7 +92,7 @@ class PurchaseOrder(models.Model):
@api.depends('picking_ids', 'picking_ids.state')
def _compute_is_shipped(self):
for order in self:
- if order.picking_ids and all([x.state == 'done' for x in order.picking_ids]):
+ if order.picking_ids and all([x.state in ['done', 'cancel'] for x in order.picking_ids]):
order.is_shipped = True
READONLY_STATES = {
@@ -1055,7 +1055,7 @@ class ProcurementRule(models.Model):
gpo = self.group_propagation_option
group = (gpo == 'fixed' and self.group_id.id) or \
- (gpo == 'propagate' and 'group_id' in values and values['group_id'].id) or False
+ (gpo == 'propagate' and values.get('group_id') and values['group_id'].id) or False
return {
'partner_id': partner.id,
diff --git a/addons/purchase/tests/test_stockvaluation.py b/addons/purchase/tests/test_stockvaluation.py
index cb5e4b2040e..1471fafbba1 100644
--- a/addons/purchase/tests/test_stockvaluation.py
+++ b/addons/purchase/tests/test_stockvaluation.py
@@ -4,7 +4,8 @@
import time
from datetime import datetime
-from odoo.tests.common import TransactionCase
+from odoo.tests.common import TransactionCase, tagged
+from odoo.addons.account.tests.account_test_classes import AccountingTestCase
from odoo.tools import DEFAULT_SERVER_DATETIME_FORMAT
@@ -271,3 +272,140 @@ class TestStockValuation(TransactionCase):
self.assertEqual(move2.price_unit, 100)
self.assertEqual(move2.product_qty, 5)
+
+@tagged('post_install', '-at_install')
+class TestStockValuationWithCOA(AccountingTestCase):
+ def setUp(self):
+ super(TestStockValuationWithCOA, self).setUp()
+ self.supplier_location = self.env.ref('stock.stock_location_suppliers')
+ self.stock_location = self.env.ref('stock.stock_location_stock')
+ self.partner_id = self.env.ref('base.res_partner_1')
+ self.product1 = self.env.ref('product.product_product_8')
+ Account = self.env['account.account']
+ self.stock_input_account = Account.create({
+ 'name': 'Stock Input',
+ 'code': 'StockIn',
+ 'user_type_id': self.env.ref('account.data_account_type_current_assets').id,
+ })
+ self.stock_output_account = Account.create({
+ 'name': 'Stock Output',
+ 'code': 'StockOut',
+ 'user_type_id': self.env.ref('account.data_account_type_current_assets').id,
+ })
+ self.stock_valuation_account = Account.create({
+ 'name': 'Stock Valuation',
+ 'code': 'Stock Valuation',
+ 'user_type_id': self.env.ref('account.data_account_type_current_assets').id,
+ })
+ self.stock_journal = self.env['account.journal'].create({
+ 'name': 'Stock Journal',
+ 'code': 'STJTEST',
+ 'type': 'general',
+ })
+ self.product1.categ_id.write({
+ 'property_stock_account_input_categ_id': self.stock_input_account.id,
+ 'property_stock_account_output_categ_id': self.stock_output_account.id,
+ 'property_stock_valuation_account_id': self.stock_valuation_account.id,
+ 'property_stock_journal': self.stock_journal.id,
+ })
+
+ def test_fifo_anglosaxon_return(self):
+ self.env.user.company_id.anglo_saxon_accounting = True
+ self.product1.product_tmpl_id.cost_method = 'fifo'
+ self.product1.product_tmpl_id.valuation = 'real_time'
+ self.product1.product_tmpl_id.invoice_policy = 'delivery'
+ price_diff_account = self.env['account.account'].create({
+ 'name': 'price diff account',
+ 'code': 'price diff account',
+ 'user_type_id': self.env.ref('account.data_account_type_current_assets').id,
+ })
+ self.product1.property_account_creditor_price_difference = price_diff_account
+
+ # Receive 10@10 ; create the vendor bill
+ po1 = self.env['purchase.order'].create({
+ 'partner_id': self.partner_id.id,
+ 'order_line': [
+ (0, 0, {
+ 'name': self.product1.name,
+ 'product_id': self.product1.id,
+ 'product_qty': 10.0,
+ 'product_uom': self.product1.uom_po_id.id,
+ 'price_unit': 10.0,
+ 'date_planned': datetime.today().strftime(DEFAULT_SERVER_DATETIME_FORMAT),
+ }),
+ ],
+ })
+ po1.button_confirm()
+ receipt_po1 = po1.picking_ids[0]
+ receipt_po1.move_lines.quantity_done = 10
+ receipt_po1.button_validate()
+
+ invoice_po1 = self.env['account.invoice'].create({
+ 'partner_id': self.partner_id.id,
+ 'purchase_id': po1.id,
+ 'account_id': self.partner_id.property_account_payable_id.id,
+ 'type': 'in_invoice',
+ })
+ invoice_po1.purchase_order_change()
+ invoice_po1.action_invoice_open()
+
+ # Receive 10@20 ; create the vendor bill
+ po2 = self.env['purchase.order'].create({
+ 'partner_id': self.partner_id.id,
+ 'order_line': [
+ (0, 0, {
+ 'name': self.product1.name,
+ 'product_id': self.product1.id,
+ 'product_qty': 10.0,
+ 'product_uom': self.product1.uom_po_id.id,
+ 'price_unit': 20.0,
+ 'date_planned': datetime.today().strftime(DEFAULT_SERVER_DATETIME_FORMAT),
+ }),
+ ],
+ })
+ po2.button_confirm()
+ receipt_po2 = po2.picking_ids[0]
+ receipt_po2.move_lines.quantity_done = 10
+ receipt_po2.button_validate()
+
+ invoice_po2 = self.env['account.invoice'].create({
+ 'partner_id': self.partner_id.id,
+ 'purchase_id': po2.id,
+ 'account_id': self.partner_id.property_account_payable_id.id,
+ 'type': 'in_invoice',
+ })
+ invoice_po2.purchase_order_change()
+ invoice_po2.action_invoice_open()
+
+ # valuation of product1 should be 300
+ self.assertEqual(self.product1.stock_value, 300)
+
+ # return the second po
+ stock_return_picking = self.env['stock.return.picking']\
+ .with_context(active_ids=receipt_po2.ids, active_id=receipt_po2.ids[0])\
+ .create({})
+ stock_return_picking.product_return_moves.quantity = 10
+ stock_return_picking_action = stock_return_picking.create_returns()
+ return_pick = self.env['stock.picking'].browse(stock_return_picking_action['res_id'])
+ return_pick.move_lines[0].move_line_ids[0].qty_done = 10
+ return_pick.do_transfer()
+
+ # valuation of product1 should be 200 as the first items will be sent out
+ self.assertEqual(self.product1.stock_value, 200)
+
+ # create a credit note for po2
+ creditnote_po2 = self.env['account.invoice'].create({
+ 'partner_id': self.partner_id.id,
+ 'purchase_id': po2.id,
+ 'account_id': self.partner_id.property_account_payable_id.id,
+ 'type': 'in_refund',
+ })
+
+ creditnote_po2.purchase_order_change()
+ creditnote_po2.invoice_line_ids[0].quantity = 10
+ creditnote_po2.action_invoice_open()
+
+ # check the anglo saxon entries
+ price_diff_entry = self.env['account.move.line'].search([('account_id', '=', price_diff_account.id)])
+ self.assertEqual(price_diff_entry.credit, 100)
+
diff --git a/addons/purchase/views/portal_templates.xml b/addons/purchase/views/portal_templates.xml
index 664fef96626..9bded7c7de0 100644
--- a/addons/purchase/views/portal_templates.xml
+++ b/addons/purchase/views/portal_templates.xml
@@ -44,6 +44,9 @@
+
+
diff --git a/addons/purchase_requisition/i18n/ru.po b/addons/purchase_requisition/i18n/ru.po
index 97d091327ff..23255945053 100644
--- a/addons/purchase_requisition/i18n/ru.po
+++ b/addons/purchase_requisition/i18n/ru.po
@@ -111,7 +111,7 @@ msgstr "Тип соглашения"
#. module: purchase_requisition
#: model:ir.ui.view,arch_db:purchase_requisition.res_config_settings_view_form
msgid "Agreement Types"
-msgstr ""
+msgstr "Типы соглашений"
#. module: purchase_requisition
#: model:ir.model.fields,field_description:purchase_requisition.field_purchase_requisition_line__account_analytic_id
diff --git a/addons/purchase_requisition/i18n/tr.po b/addons/purchase_requisition/i18n/tr.po
index fb968a38fe4..6a04f3fa2f7 100644
--- a/addons/purchase_requisition/i18n/tr.po
+++ b/addons/purchase_requisition/i18n/tr.po
@@ -130,7 +130,7 @@ msgstr "Tedarikçi Seçimi"
#. module: purchase_requisition
#: model:purchase.requisition.type,name:purchase_requisition.type_single
msgid "Blanket Order"
-msgstr ""
+msgstr "Açık Sipariş"
#. module: purchase_requisition
#: model:ir.model.fields,field_description:purchase_requisition.field_product_supplierinfo__purchase_requisition_id
@@ -141,7 +141,7 @@ msgstr ""
#: model:ir.actions.report,name:purchase_requisition.action_report_purchase_requisitions
#: model:ir.ui.view,arch_db:purchase_requisition.report_purchaserequisitions
msgid "Call for Tenders"
-msgstr ""
+msgstr "Teklif Çağrısı"
#. module: purchase_requisition
#: model:ir.ui.view,arch_db:purchase_requisition.view_purchase_requisition_form
@@ -158,7 +158,7 @@ msgstr "İptal Edildi"
#: code:addons/purchase_requisition/models/purchase_requisition.py:115
#, python-format
msgid "Cancelled by the agreement associated to this quotation."
-msgstr ""
+msgstr "Bu teklifle ilişkili anlaşma tarafından iptal edildi."
#. module: purchase_requisition
#: model:ir.ui.view,arch_db:purchase_requisition.view_purchase_requisition_form
@@ -238,7 +238,7 @@ msgstr "Görünüm Adı"
#. module: purchase_requisition
#: selection:purchase.requisition.type,line_copy:0
msgid "Do not create RfQ lines automatically"
-msgstr ""
+msgstr "Otomatik olarak RfQ satırı oluşturamazsınız."
#. module: purchase_requisition
#: model:ir.ui.view,arch_db:purchase_requisition.view_purchase_requisition_filter
@@ -248,7 +248,7 @@ msgstr "Biten"
#. module: purchase_requisition
#: model:ir.model.fields,field_description:purchase_requisition.field_purchase_requisition_line__move_dest_id
msgid "Downstream Move"
-msgstr ""
+msgstr "Satışa Dönük Hareket"
#. module: purchase_requisition
#: model:ir.ui.view,arch_db:purchase_requisition.view_purchase_requisition_filter
@@ -266,7 +266,7 @@ msgstr "Bitiş Ayı"
#: model:ir.actions.act_window,help:purchase_requisition.action_purchase_requisition
msgid ""
"Example of purchase agreements include call for tenders and blanket orders."
-msgstr ""
+msgstr "Satın alma anlaşma örnekleri teklif çağrısı ve açık sipariş içerir."
#. module: purchase_requisition
#: model:ir.actions.act_window,help:purchase_requisition.action_purchase_requisition
@@ -275,6 +275,9 @@ msgid ""
" (e.g. a year) and you order products within this agreement, benefiting\n"
" from the negociated prices."
msgstr ""
+"Açık Sipariş için, belirli zaman aralıkları için bir sözleşme kaydedebilir "
+"ve bu anlaşma daghilindeki ürünler belirlenen fiyattan sipariş "
+"edebilirsiniz."
#. module: purchase_requisition
#: model:ir.ui.view,arch_db:purchase_requisition.view_purchase_requisition_filter
@@ -296,11 +299,15 @@ msgid ""
" been registered, you can review and compare them and you can\n"
" validate some and cancel others."
msgstr ""
+"Bir teklif çağrısında, ihtiyacınız olan ürünü kaydedebilir ve tedarikçiler "
+"için RfQ lar oluşturabilirsiniz. Teklifler kaydedildikten sonra bunları "
+"inceleyebilir ve karşılaştırabilir, bazılarını doğrulayabilir ve diğerlerini"
+" iptal edebilirsiniz."
#. module: purchase_requisition
#: model:ir.ui.view,arch_db:purchase_requisition.view_purchase_requisition_filter
msgid "In negotiation"
-msgstr ""
+msgstr "Müzakerede"
#. module: purchase_requisition
#: model:ir.model,name:purchase_requisition.model_product_supplierinfo
@@ -356,7 +363,7 @@ msgstr "Yeni Teklif"
#. module: purchase_requisition
#: model:ir.model.fields,field_description:purchase_requisition.field_purchase_requisition__order_count
msgid "Number of Orders"
-msgstr ""
+msgstr "Sipariş Sayısı"
#. module: purchase_requisition
#: selection:purchase.requisition,state:0
@@ -491,7 +498,7 @@ msgstr "Satınalma Talep Satırı"
#. module: purchase_requisition
#: model:purchase.requisition.type,name:purchase_requisition.type_multi
msgid "Purchase Tender"
-msgstr ""
+msgstr "Satın Alma Teklifi"
#. module: purchase_requisition
#: model:ir.actions.act_window,name:purchase_requisition.act_res_partner_2_purchase_order
@@ -576,6 +583,8 @@ msgid ""
"\n"
" Select multiple RFQ: allows multiple purchase orders. On confirmation of a purchase order it does not cancel the remaining orders"
msgstr ""
+"Sadece bir teklif talebi (özel) seçin: Satın alma siparişi onaylandığında, kalan satın alma siparişini iptal edin.\n"
+"Birden çok RFQ seçin: Birden fazla satın alma siparişine izin verir. Satın alma siparişinin onaylanması durumunda kalan siparişler iptal edilmez."
#. module: purchase_requisition
#: model:ir.model.fields,field_description:purchase_requisition.field_purchase_requisition_type__sequence
@@ -585,7 +594,7 @@ msgstr "Sıra"
#. module: purchase_requisition
#: selection:purchase.requisition.type,quantity_copy:0
msgid "Set quantities manually"
-msgstr ""
+msgstr "Miktarı manuel olarak ayarlayın"
#. module: purchase_requisition
#: model:ir.ui.view,arch_db:purchase_requisition.view_purchase_requisition_filter
@@ -632,7 +641,7 @@ msgstr "Şartlar ve Koşullar"
#: model:ir.model.fields,help:purchase_requisition.field_purchase_requisition__schedule_date
msgid ""
"The expected and scheduled delivery date where all the products are received"
-msgstr ""
+msgstr "Tüm ürünlerin alındığı beklenen ve planlanan teslimat tarihi ."
#. module: purchase_requisition
#: code:addons/purchase_requisition/models/purchase_requisition.py:94
@@ -660,12 +669,12 @@ msgstr "Birim Fiyat"
#. module: purchase_requisition
#: selection:purchase.requisition.type,line_copy:0
msgid "Use lines of agreement"
-msgstr ""
+msgstr "Anlaşma satırları kullan"
#. module: purchase_requisition
#: selection:purchase.requisition.type,quantity_copy:0
msgid "Use quantities of agreement"
-msgstr ""
+msgstr "Anlaşma miktarı kullan"
#. module: purchase_requisition
#: model:ir.ui.view,arch_db:purchase_requisition.view_purchase_requisition_form
@@ -721,6 +730,8 @@ msgid ""
"You have to cancel or validate every RfQ before closing the purchase "
"requisition."
msgstr ""
+"Satın alma isteği kapanmadan önce, her RfQ ya iptal etmeli ya da "
+"onaylamalısınız."
#. module: purchase_requisition
#: model:ir.ui.view,arch_db:purchase_requisition.view_purchase_requisition_form
diff --git a/addons/rating/i18n/nl.po b/addons/rating/i18n/nl.po
index b4c89a08c16..4baa8d1da76 100644
--- a/addons/rating/i18n/nl.po
+++ b/addons/rating/i18n/nl.po
@@ -286,7 +286,7 @@ msgstr "Beoordeling Mixin"
#. module: rating
#: model:ir.model.fields,field_description:rating.field_rating_rating__rating
msgid "Rating Number"
-msgstr ""
+msgstr "Beoordelingscijfer"
#. module: rating
#: model:ir.model.fields,field_description:rating.field_mail_compose_message__rating_value
diff --git a/addons/resource/i18n/tr.po b/addons/resource/i18n/tr.po
index 310029d221f..7e79c010fa2 100644
--- a/addons/resource/i18n/tr.po
+++ b/addons/resource/i18n/tr.po
@@ -12,13 +12,14 @@
# Güven YILMAZ , 2017
# Ayhan KIZILTAN , 2017
# Gökhan Erdoğdu , 2017
+# Umur Akın , 2018
msgid ""
msgstr ""
"Project-Id-Version: Odoo Server saas~11.2\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2018-03-22 14:10+0000\n"
"PO-Revision-Date: 2018-03-22 14:10+0000\n"
-"Last-Translator: Gökhan Erdoğdu , 2017\n"
+"Last-Translator: Umur Akın , 2018\n"
"Language-Team: Turkish (https://www.transifex.com/odoo/teams/41243/tr/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -98,7 +99,7 @@ msgstr "Haftanın Günü"
#: model:ir.model.fields,field_description:resource.field_res_company__resource_calendar_id
#: model:ir.model.fields,field_description:resource.field_res_users__resource_calendar_id
msgid "Default Working Hours"
-msgstr ""
+msgstr "Varsayılan Çalışma Saatleri"
#. module: resource
#: model:ir.model.fields,help:resource.field_hr_employee__resource_calendar_id
@@ -155,13 +156,13 @@ msgstr "Cuma"
#: code:addons/resource/models/resource.py:79
#, python-format
msgid "Friday Evening"
-msgstr ""
+msgstr "Cuma Akşamı"
#. module: resource
#: code:addons/resource/models/resource.py:78
#, python-format
msgid "Friday Morning"
-msgstr ""
+msgstr "Cuma Sabahı"
#. module: resource
#: model:ir.model.fields,field_description:resource.field_resource_calendar__global_leave_ids
@@ -278,13 +279,13 @@ msgstr "Pazartesi"
#: code:addons/resource/models/resource.py:71
#, python-format
msgid "Monday Evening"
-msgstr ""
+msgstr "Pazartesi Akşamı"
#. module: resource
#: code:addons/resource/models/resource.py:70
#, python-format
msgid "Monday Morning"
-msgstr ""
+msgstr "Pazartesi Sabahı"
#. module: resource
#: model:ir.model.fields,field_description:resource.field_resource_calendar__name
@@ -340,7 +341,7 @@ msgstr "Kaynak İzinler"
#. module: resource
#: model:ir.model,name:resource.model_resource_mixin
msgid "Resource Mixin"
-msgstr ""
+msgstr "Kaynak Karışımı"
#. module: resource
#: model:ir.model.fields,field_description:resource.field_resource_resource__resource_type
@@ -402,7 +403,7 @@ msgstr "Çalışma Süresi Ara"
#: code:addons/resource/models/res_company.py:23
#, python-format
msgid "Standard 40 hours/week"
-msgstr ""
+msgstr "Standart 40 saat/hafta"
#. module: resource
#: model:ir.model.fields,field_description:resource.field_resource_calendar_leaves__date_from
@@ -432,13 +433,13 @@ msgstr "Pazar"
#. module: resource
#: model:ir.model,name:resource.model_resource_test
msgid "Test Resource Model"
-msgstr ""
+msgstr "Test Kaynak Modeli"
#. module: resource
#: code:addons/resource/models/resource.py:711
#, python-format
msgid "The efficiency factor cannot be equal to 0."
-msgstr ""
+msgstr "Etki faktörü sıfıra eşit olamaz"
#. module: resource
#: code:addons/resource/models/resource.py:668
@@ -469,18 +470,18 @@ msgstr "Perşembe"
#: code:addons/resource/models/resource.py:77
#, python-format
msgid "Thursday Evening"
-msgstr ""
+msgstr "Salı Akşamı"
#. module: resource
#: code:addons/resource/models/resource.py:76
#, python-format
msgid "Thursday Morning"
-msgstr ""
+msgstr "Perşembe Sabahı"
#. module: resource
#: sql_constraint:resource.resource:0
msgid "Time efficiency must be strictly positive"
-msgstr ""
+msgstr "Zaman etkinliği mutlaka pozitif olmalı"
#. module: resource
#: model:ir.model.fields,field_description:resource.field_resource_calendar_leaves__tz
@@ -503,13 +504,13 @@ msgstr "Salı"
#: code:addons/resource/models/resource.py:73
#, python-format
msgid "Tuesday Evening"
-msgstr ""
+msgstr "Salı Akşamı"
#. module: resource
#: code:addons/resource/models/resource.py:72
#, python-format
msgid "Tuesday Morning"
-msgstr ""
+msgstr "Salı Sabahı"
#. module: resource
#: model:ir.ui.view,arch_db:resource.view_resource_resource_search
@@ -536,13 +537,13 @@ msgstr "Çarşamba"
#: code:addons/resource/models/resource.py:75
#, python-format
msgid "Wednesday Evening"
-msgstr ""
+msgstr "Çarşamba Akşamı"
#. module: resource
#: code:addons/resource/models/resource.py:74
#, python-format
msgid "Wednesday Morning"
-msgstr ""
+msgstr "Çarşamba Sabahı"
#. module: resource
#: model:ir.model,name:resource.model_resource_calendar_attendance
@@ -552,7 +553,7 @@ msgstr "Çalışma Ayrıntısı"
#. module: resource
#: model:ir.ui.view,arch_db:resource.resource_calendar_form
msgid "Work Resources"
-msgstr ""
+msgstr "İş Kaynakları"
#. module: resource
#: model:ir.model.fields,field_description:resource.field_resource_calendar_attendance__hour_from
diff --git a/addons/sale/i18n/tr.po b/addons/sale/i18n/tr.po
index e927411e0ea..7d1a01a26a4 100644
--- a/addons/sale/i18n/tr.po
+++ b/addons/sale/i18n/tr.po
@@ -19,13 +19,15 @@
# Güven YILMAZ , 2017
# Alexander B. , 2017
# selim kartal , 2017
+# Ertuğrul Güreş , 2018
+# Umur Akın , 2018
msgid ""
msgstr ""
"Project-Id-Version: Odoo Server saas~11.2\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2018-03-22 14:10+0000\n"
"PO-Revision-Date: 2018-03-22 14:10+0000\n"
-"Last-Translator: selim kartal , 2017\n"
+"Last-Translator: Umur Akın , 2018\n"
"Language-Team: Turkish (https://www.transifex.com/odoo/teams/41243/tr/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -318,7 +320,7 @@ msgstr "Referans Numaranız: "
#. module: sale
#: selection:res.config.settings,sale_pricelist_setting:0
msgid "A single sales price per product"
-msgstr ""
+msgstr "Ürün başına tek bir satış fiyatı"
#. module: sale
#: model:ir.actions.act_window,help:sale.action_orders_upselling
@@ -386,7 +388,7 @@ msgstr "Avans: %s"
#. module: sale
#: model:ir.model,name:sale.model_report_all_channels_sales
msgid "All sales orders grouped by sales channels"
-msgstr ""
+msgstr "Tüm satış siparişleri satış kanalları tarafından gruplandırıldı"
#. module: sale
#: model:ir.ui.view,arch_db:sale.res_config_settings_view_form
@@ -1473,7 +1475,7 @@ msgstr "Sipariş #"
#. module: sale
#: model:ir.model.fields,field_description:sale.field_sale_advance_payment_inv__count
msgid "Order Count"
-msgstr ""
+msgstr "Sipariş Sayımı"
#. module: sale
#: code:addons/sale/controllers/portal.py:86
@@ -2520,7 +2522,7 @@ msgstr ""
#: code:addons/sale/models/sale.py:431 code:addons/sale/models/sale.py:435
#, python-format
msgid "There is no invoiceable line."
-msgstr ""
+msgstr "Burada faturalanabilir satır yok."
#. module: sale
#: model:ir.ui.view,arch_db:sale.portal_order_error
diff --git a/addons/sale/models/sale.py b/addons/sale/models/sale.py
index 843b091c4d2..43253923f36 100644
--- a/addons/sale/models/sale.py
+++ b/addons/sale/models/sale.py
@@ -426,6 +426,9 @@ class SaleOrder(models.Model):
precision = self.env['decimal.precision'].precision_get('Product Unit of Measure')
invoices = {}
references = {}
+ invoices_origin = {}
+ invoices_name = {}
+
for order in self:
group_key = order.id if grouped else (order.partner_invoice_id.id, order.currency_id.id)
for line in order.order_line.sorted(key=lambda l: l.qty_to_invoice < 0):
@@ -436,13 +439,14 @@ class SaleOrder(models.Model):
invoice = inv_obj.create(inv_data)
references[invoice] = order
invoices[group_key] = invoice
+ invoices_origin[group_key] = [invoice.origin]
+ invoices_name[group_key] = [invoice.name]
elif group_key in invoices:
- vals = {}
- if order.name not in invoices[group_key].origin.split(', '):
- vals['origin'] = invoices[group_key].origin + ', ' + order.name
- if order.client_order_ref and order.client_order_ref not in invoices[group_key].name.split(', ') and order.client_order_ref != invoices[group_key].name:
- vals['name'] = invoices[group_key].name + ', ' + order.client_order_ref
- invoices[group_key].write(vals)
+ if order.name not in invoices_origin[group_key]:
+ invoices_origin[group_key].append(order.name)
+ if order.client_order_ref and order.client_order_ref not in invoices_name[group_key]:
+ invoices_name[group_key].append(order.client_order_ref)
+
if line.qty_to_invoice > 0:
line.invoice_line_create(invoices[group_key].id, line.qty_to_invoice)
elif line.qty_to_invoice < 0 and final:
@@ -452,6 +456,10 @@ class SaleOrder(models.Model):
if order not in references[invoices[group_key]]:
references[invoices[group_key]] |= order
+ for group_key in invoices:
+ invoices[group_key].write({'name': ', '.join(invoices_name[group_key]),
+ 'origin': ', '.join(invoices_origin[group_key])})
+
if not invoices:
raise UserError(_('There is no invoiceable line.'))
diff --git a/addons/sale_crm/i18n/tr.po b/addons/sale_crm/i18n/tr.po
index b3a2b14bda4..7c9eb2ca7da 100644
--- a/addons/sale_crm/i18n/tr.po
+++ b/addons/sale_crm/i18n/tr.po
@@ -8,14 +8,15 @@
# Esin Kandemir , 2017
# Ediz Duman , 2017
# Murat Kaplan , 2017
-# Martin Trigaux , 2017
+# Martin Trigaux, 2017
+# Umur Akın , 2018
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server saas~11.1\n"
+"Project-Id-Version: Odoo Server saas~11.2\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-12-13 14:37+0000\n"
-"PO-Revision-Date: 2017-12-13 14:37+0000\n"
-"Last-Translator: Martin Trigaux , 2017\n"
+"POT-Creation-Date: 2018-03-22 14:10+0000\n"
+"PO-Revision-Date: 2018-03-22 14:10+0000\n"
+"Last-Translator: Umur Akın , 2018\n"
"Language-Team: Turkish (https://www.transifex.com/odoo/teams/41243/tr/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -39,9 +40,9 @@ msgid "Invoice"
msgstr "Fatura"
#. module: sale_crm
-#: model:ir.model.fields,field_description:sale_crm.field_res_users_target_sales_invoiced
+#: model:ir.model.fields,field_description:sale_crm.field_res_users__target_sales_invoiced
msgid "Invoiced in Sales Orders Target"
-msgstr ""
+msgstr "Satış Siparişi Hedefinde Faturalandı"
#. module: sale_crm
#: model:ir.model,name:sale_crm.model_crm_lead
@@ -64,17 +65,17 @@ msgid "New Quotation"
msgstr "Yeni Teklif"
#. module: sale_crm
-#: model:ir.model.fields,field_description:sale_crm.field_crm_lead_sale_number
+#: model:ir.model.fields,field_description:sale_crm.field_crm_lead__sale_number
msgid "Number of Quotations"
msgstr "Teklif Sayısı"
#. module: sale_crm
-#: model:ir.model.fields,field_description:sale_crm.field_sale_order_opportunity_id
+#: model:ir.model.fields,field_description:sale_crm.field_sale_order__opportunity_id
msgid "Opportunity"
msgstr "Fırsat"
#. module: sale_crm
-#: model:ir.model.fields,field_description:sale_crm.field_crm_lead_order_ids
+#: model:ir.model.fields,field_description:sale_crm.field_crm_lead__order_ids
msgid "Orders"
msgstr "Siparişler"
@@ -99,7 +100,7 @@ msgstr "Teklifler"
#. module: sale_crm
#: model:ir.actions.act_window,name:sale_crm.sale_action_orders
msgid "Sale orders"
-msgstr ""
+msgstr "Satış siparişleri"
#. module: sale_crm
#: model:ir.model,name:sale_crm.model_crm_team
@@ -107,17 +108,17 @@ msgid "Sales Channel"
msgstr "Satış Ekibi"
#. module: sale_crm
-#: model:ir.model.fields,field_description:sale_crm.field_crm_lead_sale_amount_total
+#: model:ir.model.fields,field_description:sale_crm.field_crm_lead__sale_amount_total
msgid "Sum of Orders"
msgstr "Siparişlerin Toplamı"
#. module: sale_crm
-#: model:ir.model.fields,field_description:sale_crm.field_sale_order_tag_ids
+#: model:ir.model.fields,field_description:sale_crm.field_sale_order__tag_ids
msgid "Tags"
msgstr "Etiketler"
#. module: sale_crm
-#: model:ir.model.fields,help:sale_crm.field_crm_lead_sale_amount_total
+#: model:ir.model.fields,help:sale_crm.field_crm_lead__sale_amount_total
msgid "Untaxed Total of Confirmed Orders"
msgstr "Onaylı Siparişlerin Vergi Hariç Toplamı"
diff --git a/addons/sale_payment/i18n/tr.po b/addons/sale_payment/i18n/tr.po
index 3eb03b35e68..115b2b54e86 100644
--- a/addons/sale_payment/i18n/tr.po
+++ b/addons/sale_payment/i18n/tr.po
@@ -109,7 +109,7 @@ msgstr ""
#. module: sale_payment
#: model:ir.ui.view,arch_db:sale_payment.crm_team_salesteams_view_kanban_inherit_website_portal_sale
msgid "Awaiting Payments"
-msgstr ""
+msgstr "Beklemedeki Ödemeler"
#. module: sale_payment
#: code:addons/sale_payment/controllers/payment.py:52
@@ -145,7 +145,7 @@ msgstr ""
#: code:addons/sale_payment/controllers/payment.py:49
#, python-format
msgid "Pay"
-msgstr ""
+msgstr "Öde"
#. module: sale_payment
#: code:addons/sale_payment/models/payment.py:201
@@ -196,7 +196,7 @@ msgstr "Teklif"
#. module: sale_payment
#: model:ir.model.fields,field_description:sale_payment.field_payment_transaction__so_state
msgid "Sale Order State"
-msgstr ""
+msgstr "Satış Siparişi Durumu"
#. module: sale_payment
#: model:ir.model,name:sale_payment.model_crm_team
diff --git a/addons/sale_payment/models/payment.py b/addons/sale_payment/models/payment.py
index 8076addab09..831af37550f 100644
--- a/addons/sale_payment/models/payment.py
+++ b/addons/sale_payment/models/payment.py
@@ -3,6 +3,7 @@
import logging
from odoo import api, fields, models, _
+from odoo.exceptions import UserError
from odoo.tools import float_compare
_logger = logging.getLogger(__name__)
@@ -84,8 +85,16 @@ class PaymentTransaction(models.Model):
# force_company needed for company_dependent fields
ctx_company = {'company_id': self.sale_order_id.company_id.id,
'force_company': self.sale_order_id.company_id.id}
- created_invoice = self.sale_order_id.with_context(**ctx_company).action_invoice_create()
- created_invoice = self.env['account.invoice'].browse(created_invoice).with_context(**ctx_company)
+
+ # We might fail to create the invoice because there is no invoiceable lines. This will
+ # raise a UserError and break the workflow. Better catch the error.
+ try:
+ created_invoice = self.sale_order_id.with_context(**ctx_company).action_invoice_create()
+ created_invoice = self.env['account.invoice'].browse(created_invoice).with_context(**ctx_company)
+ except UserError:
+ _logger.warning('<%s> transaction completed, could not auto-generate invoice for %s (ID %s)',
+ self.acquirer_id.provider, self.sale_order_id.name, self.sale_order_id.id, exc_info=True)
+ return
if created_invoice:
_logger.info('<%s> transaction completed, auto-generated invoice %s (ID %s) for %s (ID %s)',
diff --git a/addons/sale_stock/i18n/nl.po b/addons/sale_stock/i18n/nl.po
index e6f44988c9f..1ae548aa691 100644
--- a/addons/sale_stock/i18n/nl.po
+++ b/addons/sale_stock/i18n/nl.po
@@ -290,7 +290,7 @@ msgstr "Verpakking"
#. module: sale_stock
#: model:ir.model.fields,field_description:sale_stock.field_res_config_settings__default_picking_policy
msgid "Picking Policy"
-msgstr ""
+msgstr "Levering policy"
#. module: sale_stock
#: model:ir.model.fields,field_description:sale_stock.field_sale_order__picking_ids
diff --git a/addons/sale_stock/i18n/tr.po b/addons/sale_stock/i18n/tr.po
index 85113c732d6..207a5953d2f 100644
--- a/addons/sale_stock/i18n/tr.po
+++ b/addons/sale_stock/i18n/tr.po
@@ -9,13 +9,14 @@
# Güven YILMAZ , 2017
# Hüseyin Cem Aras , 2017
# Ayhan KIZILTAN , 2018
+# Umur Akın , 2018
msgid ""
msgstr ""
"Project-Id-Version: Odoo Server saas~11.2\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2018-03-22 14:10+0000\n"
"PO-Revision-Date: 2018-03-22 14:10+0000\n"
-"Last-Translator: Ayhan KIZILTAN , 2018\n"
+"Last-Translator: Umur Akın , 2018\n"
"Language-Team: Turkish (https://www.transifex.com/odoo/teams/41243/tr/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -242,6 +243,9 @@ msgid ""
"for delivery that many days earlier than the actual promised date, to cope "
"with unexpected delays in the supply chain."
msgstr ""
+"Müşterilere söz verilen tarihler için hata payı. Ürünler, tedarik zincirinde"
+" beklenmedik gecikmelerle başa çıkmak için gerçek vaat edilen tarihten "
+"önceki günlerden daha uzun bir süre önce teslimat için planlanacaktır."
#. module: sale_stock
#: model:ir.model.fields,help:sale_stock.field_res_company__security_lead
diff --git a/addons/sale_timesheet/i18n/tr.po b/addons/sale_timesheet/i18n/tr.po
index db55029396b..5095908ef3f 100644
--- a/addons/sale_timesheet/i18n/tr.po
+++ b/addons/sale_timesheet/i18n/tr.po
@@ -8,13 +8,14 @@
# Gökhan Erdoğdu , 2017
# Murat Kaplan , 2017
# Martin Trigaux, 2017
+# Umur Akın , 2018
msgid ""
msgstr ""
"Project-Id-Version: Odoo Server saas~11.2\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2018-03-22 14:10+0000\n"
"PO-Revision-Date: 2018-03-22 14:10+0000\n"
-"Last-Translator: Martin Trigaux, 2017\n"
+"Last-Translator: Umur Akın , 2018\n"
"Language-Team: Turkish (https://www.transifex.com/odoo/teams/41243/tr/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -180,7 +181,7 @@ msgstr "Faturalanan"
#. module: sale_timesheet
#: model:ir.model.fields,field_description:sale_timesheet.field_sale_order_line__is_service
msgid "Is a Service"
-msgstr ""
+msgstr "Hizmet "
#. module: sale_timesheet
#: model:ir.ui.view,arch_db:sale_timesheet.product_template_search_view_sale_timesheet
@@ -226,6 +227,8 @@ msgid ""
"On Sales order confirmation, this product can generate a project and/or "
"task. From those, you can track the service you are selling."
msgstr ""
+"Satış siparişi onayının üzerine, bu ürün bir proje/görev oluşturabilir. "
+"Bunlardan, sattığınız hizmeti takip edebilirsiniz."
#. module: sale_timesheet
#: selection:product.template,service_policy:0
@@ -442,7 +445,7 @@ msgstr "Zaman Çizelgesi"
#. module: sale_timesheet
#: model:ir.model.fields,field_description:sale_timesheet.field_hr_employee__timesheet_cost
msgid "Timesheet Cost"
-msgstr ""
+msgstr "Zaman Çizelgesi Maliyeti"
#. module: sale_timesheet
#: model:ir.model.fields,field_description:sale_timesheet.field_sale_order__timesheet_count
@@ -452,7 +455,7 @@ msgstr "Zaman Çizelgesi etkinlikler"
#. module: sale_timesheet
#: model:ir.model.fields,field_description:sale_timesheet.field_sale_order__timesheet_ids
msgid "Timesheet activities associated to this sale"
-msgstr ""
+msgstr "Zaman çizelgesi etkinlikleri bu satışla birleştirildi."
#. module: sale_timesheet
#: code:addons/sale_timesheet/controllers/main.py:105
diff --git a/addons/sale_timesheet/models/project.py b/addons/sale_timesheet/models/project.py
index 4d3a45876f7..2750a45a00b 100644
--- a/addons/sale_timesheet/models/project.py
+++ b/addons/sale_timesheet/models/project.py
@@ -95,7 +95,7 @@ class ProjectTask(models.Model):
@api.model
def create(self, values):
# sub task has the same so line than their parent
- if 'parent_id' in values:
+ if 'parent_id' in values and values['parent_id']:
values['sale_line_id'] = self.env['project.task'].browse(values['parent_id']).sudo().sale_line_id.id
return super(ProjectTask, self).create(values)
diff --git a/addons/sales_team/i18n/tr.po b/addons/sales_team/i18n/tr.po
index 280dc80f495..24147a59be2 100644
--- a/addons/sales_team/i18n/tr.po
+++ b/addons/sales_team/i18n/tr.po
@@ -9,13 +9,14 @@
# Ediz Duman , 2017
# Levent Karakaş , 2017
# Ayhan KIZILTAN , 2017
+# Umur Akın , 2018
msgid ""
msgstr ""
"Project-Id-Version: Odoo Server saas~11.2\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2018-03-22 14:10+0000\n"
"PO-Revision-Date: 2018-03-22 14:10+0000\n"
-"Last-Translator: Ayhan KIZILTAN , 2017\n"
+"Last-Translator: Umur Akın , 2018\n"
"Language-Team: Turkish (https://www.transifex.com/odoo/teams/41243/tr/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -153,13 +154,15 @@ msgstr "Görünüm Adı"
#. module: sales_team
#: model:ir.model.fields,field_description:sales_team.field_crm_team__favorite_user_ids
msgid "Favorite Members"
-msgstr ""
+msgstr "Favori Üyeler"
#. module: sales_team
#: model:ir.model.fields,help:sales_team.field_crm_team__is_favorite
msgid ""
"Favorite teams to display them in the dashboard and access them easily."
msgstr ""
+"Favori takımlarınızı panelde görüntüleyebilir ve onlara kolayca "
+"erişebilirsiniz."
#. module: sales_team
#: model:ir.ui.view,arch_db:sales_team.crm_team_view_form
@@ -202,6 +205,8 @@ msgid ""
"If set, this sales channel will be used for sales and assignations related "
"to this partner"
msgstr ""
+"Eğer ayarlanırsa, bu satış kanalı satış ve iş ortağı ile ilgili atamalar "
+"için kullanılacaktır."
#. module: sales_team
#: model:ir.model.fields,help:sales_team.field_crm_team__active
@@ -209,6 +214,8 @@ msgid ""
"If the active field is set to false, it will allow you to hide the sales "
"channel without removing it."
msgstr ""
+"Eğer etkin alan yanlış olarak ayarlanırsa, bu satış kanalını kaldırmadan "
+"gizlemenize izin verecektir."
#. module: sales_team
#: selection:crm.team,dashboard_graph_model:0
@@ -243,7 +250,7 @@ msgstr "Son Hafta"
#. module: sales_team
#: selection:crm.team,dashboard_graph_period:0
msgid "Last Year"
-msgstr ""
+msgstr "Geçen Sene"
#. module: sales_team
#: selection:crm.team,dashboard_graph_type:0
@@ -269,7 +276,7 @@ msgstr "Favorilerim"
#: code:addons/sales_team/models/crm_team.py:255
#, python-format
msgid "Not Defined"
-msgstr ""
+msgstr "Tanımlanmamış"
#. module: sales_team
#: selection:crm.team,dashboard_graph_model:0
@@ -314,6 +321,8 @@ msgid ""
"Sales Channel the user is member of. Used to compute the members of a sales "
"channel through the inverse one2many"
msgstr ""
+"Satış kanalı kullanıcı üyesidir. Ters one2many üzerinden satış kanalı "
+"üyelerini hesaplamak için kullanılır."
#. module: sales_team
#: model:ir.actions.act_window,name:sales_team.sales_team_config_action
@@ -353,7 +362,7 @@ msgstr "Ayarlar"
#. module: sales_team
#: model:ir.model.fields,field_description:sales_team.field_crm_team__is_favorite
msgid "Show on dashboard"
-msgstr ""
+msgstr "Panelde göster"
#. module: sales_team
#: model:ir.ui.view,arch_db:sales_team.crm_team_salesteams_search
@@ -368,7 +377,7 @@ msgstr "Satış Ekip Üyeleri"
#. module: sales_team
#: model:ir.model.fields,help:sales_team.field_crm_team__color
msgid "The color of the channel"
-msgstr ""
+msgstr "Kanalın rengi"
#. module: sales_team
#: model:ir.model.fields,help:sales_team.field_crm_team__reply_to
@@ -376,11 +385,13 @@ msgid ""
"The email address put in the 'Reply-To' of all emails sent by Odoo about "
"cases in this sales channel"
msgstr ""
+"Odoo tarafından bu satış kanalındaki vakalarla ilgili gönderilen tüm "
+"e-postaların 'Yanıt Ver' bölümünde yer alan e-posta adresi"
#. module: sales_team
#: model:ir.model.fields,help:sales_team.field_crm_team__dashboard_graph_model
msgid "The graph this channel will display in the Dashboard.\n"
-msgstr ""
+msgstr "Bu kanal grafiği panel üzerinde gösterilecek.\n"
#. module: sales_team
#: model:ir.model.fields,help:sales_team.field_crm_team__dashboard_graph_period
@@ -390,13 +401,13 @@ msgstr "UNTRANSLATED"
#. module: sales_team
#: model:ir.model.fields,help:sales_team.field_crm_team__dashboard_graph_type
msgid "The type of graph this channel will display in the dashboard."
-msgstr ""
+msgstr "Bu kanalın grafik türü panel üzerinde gösterilecek."
#. module: sales_team
#: model:ir.model.fields,help:sales_team.field_crm_team__team_type
msgid ""
"The type of this channel, it will define the resources this channel uses."
-msgstr ""
+msgstr "Bu kanalın türü, kanalın kullandığı kaynakları tanımlayacaktır."
#. module: sales_team
#: model:ir.model.fields,field_description:sales_team.field_crm_team__dashboard_graph_type
@@ -417,6 +428,8 @@ msgid ""
"Use sales channels to organize your sales departments. \n"
" Each channel will work with a separate pipeline."
msgstr ""
+"Satış departmanınızı organize etmek için satış kanallarını kullanın\n"
+"Her kanal ayrı kanallar ile çalışır."
#. module: sales_team
#: model:res.groups,name:sales_team.group_sale_salesman_all_leads
diff --git a/addons/stock/i18n/nl.po b/addons/stock/i18n/nl.po
index c5d9c07c801..90ec0e3c55a 100644
--- a/addons/stock/i18n/nl.po
+++ b/addons/stock/i18n/nl.po
@@ -366,17 +366,17 @@ msgstr "Actief"
#. module: stock
#: model:ir.actions.act_window,help:stock.action_production_lot_form
msgid "Add a lot/serial number"
-msgstr ""
+msgstr "Voeg een partij/serienummer toe"
#. module: stock
#: model:ir.actions.act_window,help:stock.action_location_form
msgid "Add a new location"
-msgstr ""
+msgstr "Voeg een nieuwe locatie toe"
#. module: stock
#: model:ir.actions.act_window,help:stock.action_routes_form
msgid "Add a new route"
-msgstr ""
+msgstr "Voeg een nieuwe route toe"
#. module: stock
#: model:ir.model.fields,help:stock.field_res_config_settings__group_stock_adv_location
diff --git a/addons/stock/i18n/tr.po b/addons/stock/i18n/tr.po
index 0c1443817db..5eb3786cd5d 100644
--- a/addons/stock/i18n/tr.po
+++ b/addons/stock/i18n/tr.po
@@ -43,6 +43,9 @@ msgid ""
"\n"
"Blocking: %s"
msgstr ""
+"\n"
+"\n"
+"Bloklama: %s"
#. module: stock
#: code:addons/stock/models/stock_move.py:320
@@ -66,6 +69,12 @@ msgid ""
" * Done: has been processed, can't be modified or cancelled anymore.\n"
" * Cancelled: has been cancelled, can't be confirmed anymore."
msgstr ""
+" * Taslak: henüz onaylanmamış ve onaylanana kadar planlanmayacaktır\n"
+"* Başka Bir İşlem Bekliyor: otomatik olarak hazır olmadan önce yürütülmek üzere başka bir hareket bekliyor (örn. Sipariş Verme Akışı)\n"
+"* Bekliyor: Eğer göndermek için hazır değilse, gerekli ürünler saklanamaz\n"
+"* Hazır: Ürün saklanmış ve gönderilmeye hazır. Eğer sevkıyat poliçesi 'olabildiğince çabuk' ise herhangi bir ürün saklandığında gönderilecektir. \n"
+"* Yapıldı: işlem gerçekleşmiş, değiştirilemez ve iptal edilemez.\n"
+"* İptal Edildi: iptal edilmiştir, artık onaylanamaz."
#. module: stock
#: model:ir.ui.view,arch_db:stock.view_move_picking_form
@@ -112,6 +121,14 @@ msgid ""
"* Production: Virtual counterpart location for production operations: this location consumes the raw material and produces finished products\n"
"* Transit Location: Counterpart location that should be used in inter-company or inter-warehouses operations"
msgstr ""
+"* Tedarikçi Lokasyonu: Tedarikçilerinizden gelen ürünlerin kaynak konumunu temsil eden sanal konum\n"
+"* Görünüm: Deponuz için, alt konumlarını birleştiren bir hiyerarşik yapı oluşturan sanal konum; doğrudan ürünleri içeremez\n"
+"* İç Konum: Kendi depolarınızdaki fiziksel konumlar,\n"
+"* Müşteri Konumu: Müşterilerinize gönderilen ürünler için hedef konumu temsil eden sanal konum\n"
+"* Envanter: Stok seviyelerini düzeltmek için envanter operasyonları muadili olarak görev yapan sanal konum(Fiziksel envanterler)\n"
+"* Satınalma: Kaynak (tedarikçi veya üretim) henüz bilinmiyorken satınalma operasyonları geçici muadili olarak görev yapan sanal konum. Satınalma zamanlayıcısı çalışmayı durdurduğunda, bu konum boş olmalıdır.\n"
+"* Üretim: Üretim operasyonları için sanal muadil: bu konum işlenmemiş materyalleri sarf ederek tamamlanmış ürün oluşturur\n"
+"* Transit Konumları: Şirket içi veya depolar arası operasyonlarda kullanılması gereken muhatap konum "
#. module: stock
#: model:ir.ui.view,arch_db:stock.exception_on_picking
@@ -294,13 +311,13 @@ msgstr "Paket"
#: code:addons/stock/models/stock_move_line.py:94
#, python-format
msgid "A done move line should never have a reserved quantity."
-msgstr ""
+msgstr "Bir bitmiş hareket satırında rezerve edilmiş miktar olmamalıdır."
#. module: stock
#: code:addons/stock/models/stock_quant.py:80
#, python-format
msgid "A serial number should only be linked to a single product."
-msgstr ""
+msgstr "Bir seri numarası sadece bir ürüne bağlanmış olmalıdır."
#. module: stock
#: model:ir.model.fields,help:stock.field_stock_move__product_type
@@ -358,6 +375,8 @@ msgid ""
"Add and customize route operations to process product moves in your warehouse(s): e.g. unload > quality control > stock for incoming products, pick > pack > ship for outgoing products. \n"
" You can also set putaway strategies on warehouse locations in order to send incoming products into specific child locations straight away (e.g. specific bins, racks)."
msgstr ""
+"Deponuzda ki ürün hareketleri işlemlerini yönetmek için rota ekleyin ve özelleştirin: Örn. Mal kabul > kalite kontrol > gelen ürünlerin depolanması, seçim > paketleme > giden ürünün sevkıyatı.\n"
+"Ayrıca gelen ürünleri göndermek için belirli alt konumları depo konum stratejinizde ayarlayabilirsiniz. ( Örn. belirli ambarlar, raflar)"
#. module: stock
#: model:ir.ui.view,arch_db:stock.res_config_settings_view_form
@@ -368,6 +387,8 @@ msgid ""
"strategies on warehouse locations in order to send incoming products into "
"specific child locations straight away (e.g. specific bins, racks)."
msgstr ""
+"Deponuzda ki ürün hareketleri işlemlerini yönetmek için rota ekleyin ve özelleştirin: Örn. Mal kabul > kalite kontrol > gelen ürünlerin depolanması, seçim > paketleme > giden ürünün sevkıyatı.\n"
+"Ayrıca gelen ürünleri göndermek için belirli alt konumları depo konum stratejinizde ayarlayabilirsiniz. ( Örn. belirli ambarlar, raflar)"
#. module: stock
#: model:ir.ui.view,arch_db:stock.view_picking_form
@@ -439,7 +460,7 @@ msgstr "Tüm iade hareketleri"
#: code:addons/stock/models/stock_quant.py:86
#, python-format
msgid "An incoming date cannot be set to an untracked product."
-msgstr ""
+msgstr "Geliş tarihi izlenmeyen ürüne ayarlanamaz."
#. module: stock
#: model:ir.ui.view,arch_db:stock.stock_location_route_form_view
@@ -484,6 +505,8 @@ msgid ""
"Are you sure you want to confirm this operation? This may lead to "
"inconsistencies in your inventory."
msgstr ""
+"Bu operasyonu onaylamak istediğinize emin misiniz? Bu stoğunuzda "
+"tutarsızlığa neden olabilir."
#. module: stock
#: model:ir.ui.view,arch_db:stock.view_overprocessed_transfer
@@ -662,6 +685,11 @@ msgid ""
"current stock) to gather products. If we want to chain moves and have this "
"one to wait for the previous, this second option should be chosen."
msgstr ""
+"Varsayılan olarak, sistem kaynak konumdaki stoktan alacak ve pasif olarak "
+"stok durumunun uygun olmasını bekleyecektir. Diğer olasılık, ürün toplamak "
+"için kaynak konumda doğrudan bir satınalma yaratmanıza (dolayısıyla mevcut "
+"stoğunuzu yok saymanıza) olanak tanır. Bağlantılı hareket oluşturmak ve bir "
+"önceki hareketi beklemek istiyorsak, bu ikinci seçenek daha uygun olabilir."
#. module: stock
#: model:ir.model.fields,help:stock.field_stock_location__active
@@ -770,12 +798,12 @@ msgstr "Ürün Miktarını Değiştir"
#. module: stock
#: model:ir.ui.view,arch_db:stock.res_config_settings_view_form
msgid "Change must be higher than"
-msgstr ""
+msgstr "Değişiklik daha yüksek olmalıdır"
#. module: stock
#: model:ir.model.fields,help:stock.field_stock_move_line__move_id
msgid "Change to a better name"
-msgstr ""
+msgstr "Daha iyi bir isimle değiştir"
#. module: stock
#: model:ir.ui.view,arch_db:stock.view_picking_form
@@ -785,7 +813,7 @@ msgstr "Uygunluk Kontrolü"
#. module: stock
#: model:ir.model.fields,help:stock.field_stock_picking__has_packages
msgid "Check the existence of destination packages on move lines"
-msgstr ""
+msgstr "Hareket satırlarındaki paketlerin var olan duraklarını kontrol edin."
#. module: stock
#: model:ir.model.fields,help:stock.field_stock_picking__move_line_exist
@@ -1000,7 +1028,7 @@ msgstr "Bekleyen Transfer Sayısı"
#. module: stock
#: model:ir.ui.view,arch_db:stock.view_template_property_form
msgid "Counterpart Locations"
-msgstr ""
+msgstr "Karşı Konum"
#. module: stock
#: model:ir.ui.view,arch_db:stock.view_backorder_confirmation
@@ -1193,7 +1221,7 @@ msgstr "Kümülatif Miktar"
#. module: stock
#: model:ir.model.fields,field_description:stock.field_stock_quant_package__current_destination_location_id
msgid "Current Destination Location"
-msgstr ""
+msgstr "Mevcut Hedef Konumu"
#. module: stock
#: selection:stock.quantity.history,compute_at_date:0
@@ -1213,7 +1241,7 @@ msgstr "Mevcut Transfer Hareketi"
#. module: stock
#: model:ir.model.fields,field_description:stock.field_stock_quant_package__current_source_location_id
msgid "Current Source Location"
-msgstr ""
+msgstr "Mevcut Kaynak Konumu"
#. module: stock
#: model:ir.actions.act_window,name:stock.location_open_quants
@@ -1489,7 +1517,7 @@ msgstr "Teslimat Emirleri"
#. module: stock
#: model:ir.model.fields,field_description:stock.field_res_config_settings__group_stock_tracking_lot
msgid "Delivery Packages"
-msgstr ""
+msgstr "Teslimat Paketi"
#. module: stock
#: model:ir.model.fields,field_description:stock.field_stock_warehouse__delivery_route_id
@@ -1583,13 +1611,13 @@ msgstr "Hedef Konum"
#. module: stock
#: model:ir.ui.view,arch_db:stock.message_body
msgid "Destination Location:"
-msgstr ""
+msgstr "Hedef Konum :"
#. module: stock
#: model:ir.model.fields,field_description:stock.field_stock_move__move_dest_ids
#: model:ir.ui.view,arch_db:stock.view_move_form
msgid "Destination Moves"
-msgstr ""
+msgstr "Hedef Hareket"
#. module: stock
#: model:ir.model.fields,field_description:stock.field_stock_move_line__result_package_id
@@ -1600,7 +1628,7 @@ msgstr "Hedef Paketi"
#. module: stock
#: model:ir.ui.view,arch_db:stock.message_body
msgid "Destination Package :"
-msgstr ""
+msgstr "Hedef Paketi :"
#. module: stock
#: model:ir.model.fields,field_description:stock.field_stock_move__route_ids
@@ -1612,7 +1640,7 @@ msgstr "Hedef rota"
#: model:ir.ui.view,arch_db:stock.view_picking_form
#, python-format
msgid "Detailed Operations"
-msgstr ""
+msgstr "Detaylı Operasyonlar"
#. module: stock
#: model:ir.ui.view,arch_db:stock.stock_location_path_form
@@ -1622,7 +1650,7 @@ msgstr "Detaylar"
#. module: stock
#: model:ir.model.fields,field_description:stock.field_stock_move__show_details_visible
msgid "Details Visible"
-msgstr ""
+msgstr "Görünür Detaylar"
#. module: stock
#: model:ir.model.fields,help:stock.field_procurement_rule__procure_method
@@ -1703,7 +1731,7 @@ msgstr "Tarihe Göre Tamamlanan Transferler "
#. module: stock
#: model:ir.ui.view,arch_db:stock.res_config_settings_view_form
msgid "Don’t propagate scheduling changes through chains of operations"
-msgstr ""
+msgstr "Zamanlama değişikliklerini işlem zincirleriyle yaymayın"
#. module: stock
#: model:ir.ui.view,arch_db:stock.view_picking_internal_search
@@ -1725,12 +1753,12 @@ msgstr "EX WORKS"
#. module: stock
#: model:ir.model.fields,field_description:stock.field_stock_picking__entire_package_ids
msgid "Entire Package"
-msgstr ""
+msgstr "Bütün Paket"
#. module: stock
#: model:ir.model.fields,field_description:stock.field_stock_picking__entire_package_detail_ids
msgid "Entire Package Detail"
-msgstr ""
+msgstr "Bütün Paket Detayı"
#. module: stock
#. openerp-web
@@ -1885,12 +1913,12 @@ msgstr "Kimden:"
#. module: stock
#: model:ir.model.fields,field_description:stock.field_stock_move_line__from_loc
msgid "From Loc"
-msgstr ""
+msgstr "Nereden?"
#. module: stock
#: model:ir.model.fields,field_description:stock.field_stock_move__show_reserved_availability
msgid "From Supplier"
-msgstr ""
+msgstr "Tedarikçiden"
#. module: stock
#: model:ir.model.fields,field_description:stock.field_stock_location__complete_name
@@ -1943,6 +1971,7 @@ msgstr ""
#: model:ir.ui.view,arch_db:stock.res_config_settings_view_form
msgid "Get informative or blocking warnings on partners"
msgstr ""
+"İş ortaklarınız hakkında bilgilendirici ya da engelleyici uyarıları alın."
#. module: stock
#: model:ir.model.fields,help:stock.field_stock_fixed_putaway_strat__sequence
@@ -2000,7 +2029,7 @@ msgstr "Paket İşlemi mi?"
#. module: stock
#: model:ir.model.fields,field_description:stock.field_stock_picking__has_packages
msgid "Has Packages"
-msgstr ""
+msgstr "Paketleri Var"
#. module: stock
#: model:ir.model.fields,field_description:stock.field_stock_picking__has_scrap_move
@@ -2143,6 +2172,8 @@ msgid ""
"If the picking is unlocked you can edit initial demand (for a draft picking)"
" or done quantities (for a done picking)."
msgstr ""
+"Eğer seçim kilitlenmemiş ise,ilk talebi düzenleyebilir (bir taslak seçimi "
+"için) ya da miktarı tamamlayabilirsiniz (yapılmış seçimler için)."
#. module: stock
#: model:ir.ui.view,arch_db:stock.stock_location_path_filter
@@ -2156,6 +2187,8 @@ msgid ""
"If this checkbox is ticked, Odoo will show which products are reserved "
"(lot/serial number, source location, source package)."
msgstr ""
+"Eğer kutucuk işaretli ise, Odoo odoo hangi ürünlerin rezerve olduğunu "
+"gösterecek (lot/seri numarası, kaynak konumu, kaynak paketi)."
#. module: stock
#: model:ir.model.fields,help:stock.field_stock_move__show_operations
@@ -2165,6 +2198,9 @@ msgid ""
" operations. If not, the picking lines will represent an aggregate of "
"detailed stock operations."
msgstr ""
+"Eğer kutucuk işaretli ise, seçim satırları detaylı stok operasyonlarını "
+"temsil eder. Eğer değilse, seçim satırları stok işlemlerinin bir toplamını "
+"temsil eder."
#. module: stock
#: model:ir.model.fields,help:stock.field_stock_picking_type__use_create_lots
@@ -2238,12 +2274,12 @@ msgstr "Hemen transfer?"
#. module: stock
#: selection:res.config.settings,module_procurement_jit:0
msgid "Immediately after sales order confirmation"
-msgstr ""
+msgstr "Satış sipariş onayından hemen sonra "
#. module: stock
#: model:ir.model.fields,field_description:stock.field_stock_move_line__in_entire_package
msgid "In Entire Package"
-msgstr ""
+msgstr "Bütün Paket İçinde"
#. module: stock
#: selection:stock.inventory,state:0
@@ -2489,7 +2525,7 @@ msgstr "Envanter Satırı"
#. module: stock
#: model:ir.actions.act_window,name:stock.action_inventory_line_tree
msgid "Inventory Lines"
-msgstr ""
+msgstr "Envanter Satırları"
#. module: stock
#: model:ir.model.fields,field_description:stock.field_product_product__property_stock_inventory
@@ -2511,7 +2547,7 @@ msgstr "Envanter Zararı"
#. module: stock
#: model:ir.ui.view,arch_db:stock.view_inventory_filter
msgid "Inventory Product"
-msgstr ""
+msgstr "Stok Ürün"
#. module: stock
#: model:ir.model.fields,field_description:stock.field_stock_inventory__name
@@ -2570,7 +2606,7 @@ msgstr "Kilitli"
#. module: stock
#: model:ir.model.fields,field_description:stock.field_stock_quant_package__is_processed
msgid "Is Processed"
-msgstr ""
+msgstr "İşlendi"
#. module: stock
#: model:ir.model.fields,field_description:stock.field_stock_location__return_location
@@ -2586,12 +2622,12 @@ msgstr "Hurda Konumu Mu?"
#: model:ir.model.fields,field_description:stock.field_stock_move__is_initial_demand_editable
#: model:ir.model.fields,field_description:stock.field_stock_move_line__is_initial_demand_editable
msgid "Is initial demand editable"
-msgstr ""
+msgstr "İlk talep düzenlenebilir"
#. module: stock
#: model:ir.model.fields,field_description:stock.field_stock_move__is_quantity_done_editable
msgid "Is quantity done editable"
-msgstr ""
+msgstr "Gerçekleşmiş miktar düzenlenebilir"
#. module: stock
#: code:addons/stock/models/stock_quant.py:258
@@ -2787,7 +2823,7 @@ msgstr "Bağlantılı Hareketler"
#. module: stock
#: model:ir.ui.view,arch_db:stock.view_inventory_form
msgid "List view of lines"
-msgstr ""
+msgstr "Satırların görünümünü düzenle"
#. module: stock
#: model:ir.ui.view,arch_db:stock.view_location_form
@@ -2903,7 +2939,7 @@ msgstr ""
#. module: stock
#: model:ir.ui.view,arch_db:stock.message_body
msgid "Lot/Serial :"
-msgstr ""
+msgstr "Lot/Seri"
#. module: stock
#: model:ir.model.fields,field_description:stock.field_stock_change_product_qty__lot_id
@@ -2987,12 +3023,12 @@ msgstr "Lot / Seri Numaralarını Yönet"
#. module: stock
#: model:res.groups,name:stock.group_stock_multi_locations
msgid "Manage Multiple Stock Locations"
-msgstr ""
+msgstr "Birden Fazla Stok Konumu Yönetin"
#. module: stock
#: model:res.groups,name:stock.group_stock_multi_warehouses
msgid "Manage Multiple Warehouses"
-msgstr ""
+msgstr "Birden Fazla Depo Yönetin"
#. module: stock
#: model:res.groups,name:stock.group_tracking_lot
@@ -3027,7 +3063,7 @@ msgstr "Manuel Operasyon"
#. module: stock
#: selection:res.config.settings,module_procurement_jit:0
msgid "Manually or based on automatic scheduler"
-msgstr ""
+msgstr "Manuel ya da otomatik zamanlayıcı"
#. module: stock
#: selection:procurement.rule,action:0
@@ -3121,7 +3157,7 @@ msgstr "Hareket"
#. module: stock
#: model:ir.ui.view,arch_db:stock.view_stock_move_operations
msgid "Move Detail"
-msgstr ""
+msgstr "Hareket Detayı"
#. module: stock
#: model:ir.model.fields,field_description:stock.field_stock_picking__picking_type_entire_packs
@@ -3149,7 +3185,7 @@ msgstr ""
#: model:ir.ui.view,arch_db:stock.view_move_line_form
#: model:ir.ui.view,arch_db:stock.view_move_line_tree
msgid "Move Lines"
-msgstr ""
+msgstr "Hareket Satırları"
#. module: stock
#: model:ir.model.fields,field_description:stock.field_procurement_rule__procure_method
@@ -3194,12 +3230,12 @@ msgstr ""
#. module: stock
#: model:ir.model.fields,field_description:stock.field_res_config_settings__group_stock_adv_location
msgid "Multi-Step Routes"
-msgstr ""
+msgstr "Çok Adımlı Rotalar"
#. module: stock
#: model:ir.model.fields,field_description:stock.field_res_config_settings__group_stock_multi_warehouses
msgid "Multi-Warehouses"
-msgstr ""
+msgstr "Çoklu Depo"
#. module: stock
#: model:ir.ui.view,arch_db:stock.view_picking_internal_search
@@ -3234,7 +3270,7 @@ msgstr "Yeni"
#: code:addons/stock/models/stock_picking.py:634
#, python-format
msgid "New Move:"
-msgstr ""
+msgstr "Yeni Hareket :"
#. module: stock
#: model:ir.model.fields,field_description:stock.field_stock_change_product_qty__new_quantity
@@ -3264,7 +3300,7 @@ msgstr "Uyarı Yok"
#. module: stock
#: model:ir.model.fields,field_description:stock.field_res_config_settings__use_propagation_minimum_delta
msgid "No Rescheduling Propagation"
-msgstr ""
+msgstr "Planlanmayan Yayılma"
#. module: stock
#: selection:product.template,tracking:0
@@ -3285,14 +3321,14 @@ msgstr "Eksi(-) miktara izin verilmez"
#. module: stock
#: model:ir.ui.view,arch_db:stock.report_stock_inventory
msgid "No operation made on this lot."
-msgstr ""
+msgstr "Bu lotta operasyon yapılmadı"
#. module: stock
#: code:addons/stock/models/procurement.py:184
#, python-format
msgid ""
"No procurement rule found. Please verify the configuration of your routes"
-msgstr ""
+msgstr "Satış kuralı bulunamadı. Lütfen rota yapılandırmalarınızı doğrulayın."
#. module: stock
#: code:addons/stock/wizard/stock_picking_return.py:58
@@ -3331,7 +3367,7 @@ msgstr "Notlar"
#: code:addons/stock/models/stock_picking.py:582
#, python-format
msgid "Nothing to check the availability for."
-msgstr ""
+msgstr "Uygunluğu kontrol edebilecek bir şey yok."
#. module: stock
#: model:ir.model.fields,field_description:stock.field_procurement_rule__delay
@@ -3400,7 +3436,7 @@ msgstr "Bir ürün kategorisi"
#: code:addons/stock/models/stock_inventory.py:111
#, python-format
msgid "One product for a specific owner"
-msgstr ""
+msgstr "Belirli mal sahibi için bir ürün"
#. module: stock
#: code:addons/stock/models/stock_inventory.py:107
@@ -3429,6 +3465,7 @@ msgid ""
"Operation Type determines the way the picking should be shown in the view, "
"reports, ..."
msgstr ""
+"Operasyon türü toplama yolunun raporlarda gösterilme biçimini belirler,..."
#. module: stock
#: model:ir.model.fields,field_description:stock.field_stock_picking_type__return_picking_type_id
@@ -3507,7 +3544,7 @@ msgstr "Siparişin Miktarı"
#. module: stock
#: model:ir.ui.view,arch_db:stock.view_move_search
msgid "Orders processed today or scheduled for today"
-msgstr ""
+msgstr "Bugün işlenen ya da bugün planlanan siparişler"
#. module: stock
#: model:ir.ui.view,arch_db:stock.view_move_form
@@ -3567,7 +3604,7 @@ msgstr "Çıkış Konumu"
#. module: stock
#: model:ir.model.fields,field_description:stock.field_stock_overprocessed_transfer__overprocessed_product_name
msgid "Overprocessed Product Name"
-msgstr ""
+msgstr "Fazla işlem görmüş ürün adı"
#. module: stock
#: model:ir.model.fields,field_description:stock.field_stock_inventory_line__partner_id
@@ -3590,7 +3627,7 @@ msgstr "Sahibi "
#. module: stock
#: model:ir.ui.view,arch_db:stock.message_body
msgid "Owner :"
-msgstr ""
+msgstr "Mal Sahibi :"
#. module: stock
#: model:ir.model.fields,help:stock.field_stock_location__partner_id
@@ -3613,7 +3650,7 @@ msgstr "Kâr&Zarar Miktarı"
#: code:addons/stock/static/src/xml/stock_traceability_report_backend.xml:6
#, python-format
msgid "PRINT"
-msgstr ""
+msgstr "YAZDIR"
#. module: stock
#: code:addons/stock/models/stock_warehouse.py:216
@@ -3654,7 +3691,7 @@ msgstr ""
#. module: stock
#: model:ir.ui.view,arch_db:stock.report_package_barcode
msgid "Package Content"
-msgstr ""
+msgstr "Paket İçeriği"
#. module: stock
#: model:ir.ui.view,arch_db:stock.quant_package_search_view
@@ -3670,7 +3707,7 @@ msgstr "Paket Referansı"
#. module: stock
#: model:ir.ui.view,arch_db:stock.report_package_barcode_small
msgid "Package Reference:"
-msgstr ""
+msgstr "Paket Referansı:"
#. module: stock
#: model:ir.ui.view,arch_db:stock.view_quant_package_form
@@ -3686,7 +3723,7 @@ msgstr "Paket Türü"
#: model:ir.ui.view,arch_db:stock.report_package_barcode
#: model:ir.ui.view,arch_db:stock.report_package_barcode_small
msgid "Package Type:"
-msgstr ""
+msgstr "Paket Türü"
#. module: stock
#: model:ir.actions.act_window,name:stock.action_package_view
@@ -3877,13 +3914,13 @@ msgstr "Pivot"
#. module: stock
#: model:ir.ui.view,arch_db:stock.stock_picking_type_kanban
msgid "Planned Transfer"
-msgstr ""
+msgstr "Planlanan Transfer"
#. module: stock
#: code:addons/stock/models/stock_picking.py:693
#, python-format
msgid "Please add some lines to move"
-msgstr ""
+msgstr "Hareket için lütfen satır ekleyiniz."
#. module: stock
#: code:addons/stock/models/stock_picking.py:1018
@@ -3900,7 +3937,7 @@ msgstr "Lütfen sıfır olmayan bir miktar girin."
#. module: stock
#: model:ir.ui.view,arch_db:stock.quant_search_view
msgid "Positive Stock"
-msgstr ""
+msgstr "Pozitif Stok"
#. module: stock
#: model:ir.model.fields,field_description:stock.field_stock_move__product_packaging
@@ -3910,7 +3947,7 @@ msgstr "Tercih Edilen Paketleme"
#. module: stock
#: model:ir.model.fields,help:stock.field_stock_move__route_ids
msgid "Preferred route"
-msgstr ""
+msgstr "Tercih edilen rota"
#. module: stock
#: model:ir.ui.view,arch_db:stock.view_picking_form
@@ -3941,17 +3978,17 @@ msgstr ""
#. module: stock
#: model:ir.ui.view,arch_db:stock.res_config_settings_view_form
msgid "Process operations faster with barcodes"
-msgstr ""
+msgstr "İşlem operasyonları barkodlarla birlikte daha hızlı"
#. module: stock
#: model:ir.ui.view,arch_db:stock.res_config_settings_view_form
msgid "Process picking in batch per worker"
-msgstr ""
+msgstr "Toplama işlemlerini, çalışan başına toplama olarak işleyin."
#. module: stock
#: model:ir.ui.view,arch_db:stock.view_overprocessed_transfer
msgid "Processed more than initial demand"
-msgstr ""
+msgstr "İlk talepten daha fazla ürün işlendi."
#. module: stock
#: selection:stock.location,usage:0
@@ -4010,7 +4047,7 @@ msgstr "Tedarikler"
#. module: stock
#: model:ir.model.fields,field_description:stock.field_stock_move_line__produce_line_ids
msgid "Produce Line"
-msgstr ""
+msgstr "Üretim Hattı "
#. module: stock
#: code:addons/stock/models/product.py:347
@@ -4123,11 +4160,13 @@ msgid ""
"Product this lot/serial number contains. You cannot change it anymore if it "
"has already been moved."
msgstr ""
+"Ürün bu lot/seri numaralarını içeriyor. Eğer numaralar taşındıysa bunu "
+"değiştiremezsiniz."
#. module: stock
#: model:ir.model.fields,field_description:stock.field_stock_move__has_tracking
msgid "Product with Tracking"
-msgstr ""
+msgstr "İzlenen Ürün"
#. module: stock
#: model:stock.location,name:stock.location_production
@@ -4215,12 +4254,12 @@ msgstr "Yerleştirme Strateji"
#. module: stock
#: model:ir.ui.view,arch_db:stock.view_picking_form
msgid "Put in Pack"
-msgstr ""
+msgstr "Pakete Koy"
#. module: stock
#: model:ir.ui.view,arch_db:stock.res_config_settings_view_form
msgid "Put your products in packs (e.g. parcels, boxes) and track them"
-msgstr ""
+msgstr "Ürünlerinizi pakete koyun (örn: koliler, kutular) ve onları izleyin"
#. module: stock
#: model:ir.ui.view,arch_db:stock.view_putaway
@@ -4255,7 +4294,7 @@ msgstr "Kalite Kontrol Konumu"
#: model:ir.model.fields,field_description:stock.field_stock_warn_insufficient_qty_scrap__quant_ids
#: model:ir.model.fields,field_description:stock.field_stock_warn_insufficient_qty_unbuild__quant_ids
msgid "Quant"
-msgstr ""
+msgstr "Miktar"
#. module: stock
#: model:ir.model.fields,field_description:stock.field_report_stock_forecast__quantity
@@ -4274,7 +4313,7 @@ msgstr "Adet"
#. module: stock
#: model:ir.ui.view,arch_db:stock.message_body
msgid "Quantity :"
-msgstr ""
+msgstr "Miktar :"
#. module: stock
#: model:ir.model.fields,field_description:stock.field_stock_move__quantity_done
@@ -4313,7 +4352,7 @@ msgstr "Miktar eksi olamaz"
#: code:addons/stock/models/stock_move.py:624
#, python-format
msgid "Quantity decreased!"
-msgstr ""
+msgstr "Miktar azaldı!"
#. module: stock
#: model:ir.model.fields,help:stock.field_stock_move__availability
@@ -4333,6 +4372,10 @@ msgid ""
"In a context with a single Warehouse, this includes goods arriving to the Stock Location of this Warehouse, or any of its children.\n"
"Otherwise, this includes goods arriving to any Stock Location with 'internal' type."
msgstr ""
+"Gelmesi gereken ürünlerin miktarı\n"
+"Tek Stok Konumu içeriğinde, bu konuma gelen malları ve alt malları içerir.\n"
+"Tek Depolu içeriğinde, bu Depo Konumuna gelen malları ve alt malları içerir.\n"
+"Yoksa 'iç Tipli' mallar herhangi bir Stok Konumuna gelebilir."
#. module: stock
#: model:ir.model.fields,help:stock.field_product_product__outgoing_qty
@@ -4342,6 +4385,10 @@ msgid ""
"In a context with a single Warehouse, this includes goods leaving the Stock Location of this Warehouse, or any of its children.\n"
"Otherwise, this includes goods leaving any Stock Location with 'internal' type."
msgstr ""
+"Gitmesii gereken ürünlerin miktarı\n"
+"Tek Stok Konumu içeriğinde, bu konumdan giden malları ve alt malları içerir.\n"
+"Tek Depolu içeriğinde, bu Depo Konumundan giden malları ve alt malları içerir.\n"
+"Yoksa 'iç Tipli' mallar herhangi bir Stok Konumuna gelebilir."
#. module: stock
#: model:ir.model.fields,help:stock.field_stock_quant__quantity
@@ -4356,6 +4403,7 @@ msgid ""
"Quantity of reserved products in this quant, in the default unit of measure "
"of the product"
msgstr ""
+"Ürünün varsayılan ölçü biriminde, bu miktardaki ayrılmış ürünlerin miktarı."
#. module: stock
#: model:ir.model.fields,help:stock.field_stock_move__reserved_availability
@@ -4374,7 +4422,7 @@ msgstr "Stoklar"
#: code:addons/stock/models/stock_quant.py:74
#, python-format
msgid "Quants cannot be created for consumables or services."
-msgstr ""
+msgstr "Miktarlar hizmet ya da tüketilebilirlik için oluşturulamaz."
#. module: stock
#: model:ir.model.fields,field_description:stock.field_stock_picking_type__rate_picking_backorders
@@ -4404,7 +4452,7 @@ msgstr "Gerçek Miktar"
#. module: stock
#: model:ir.model.fields,field_description:stock.field_stock_move_line__product_qty
msgid "Real Reserved Quantity"
-msgstr ""
+msgstr "Gerçek Rezerve Miktarı"
#. module: stock
#: model:ir.model.fields,field_description:stock.field_stock_warehouse__reception_route_id
@@ -4492,7 +4540,7 @@ msgstr ""
#. module: stock
#: model:ir.ui.view,arch_db:stock.view_picking_form
msgid "Register lots, packs, location"
-msgstr ""
+msgstr "Lot, ambalaj, konum kaydet."
#. module: stock
#: model:ir.ui.view,arch_db:stock.view_picking_internal_search
@@ -4557,6 +4605,8 @@ msgid ""
"Rescheduling applies to any chain of operations (e.g. Make To Order, Pick Pack Ship). In the case of MTO sales, a vendor delay (updated incoming date) impacts the expected delivery date to the customer. \n"
" This option allows to not propagate the rescheduling if the change is not critical."
msgstr ""
+"Yeniden planlama herhangi bir operasyon zincirine uygular (örn: Sipariş Emri, Topla, Paketle, Sevk Et). MTO satışları için, müşteri için beklenen teslimat tarihini, bir tedarikçi gecikmesi etkiler (gelecek zamana güncellenen) .\n"
+"Eğer değişim çok önemli değilse, bu seçenek yeniden planlamanın yayılmasına izin vermez."
#. module: stock
#: model:ir.ui.view,arch_db:stock.res_config_settings_view_form
@@ -4566,6 +4616,8 @@ msgid ""
" impacts the expected delivery date to the customer. This option allows to "
"not propagate the rescheduling if the change is not critical."
msgstr ""
+"Yeniden planlama herhangi bir operasyon zincirine uygular (örn: Sipariş Emri, Topla- Paketle- Sevk Et). MTO satışları için, müşteri için beklenen teslimat tarihini, bir tedarikçi gecikmesi etkiler (gelecek zamana güncellenen) .\n"
+"Eğer değişim çok önemli değilse, bu seçenek yeniden planlamanın yayılmasına izin vermez."
#. module: stock
#: model:ir.model.fields,field_description:stock.field_res_config_settings__module_procurement_jit
@@ -4575,7 +4627,7 @@ msgstr "Rezervasyon"
#. module: stock
#: model:ir.ui.view,arch_db:stock.quant_search_view
msgid "Reservations"
-msgstr ""
+msgstr "Rezervasyonlar"
#. module: stock
#: model:ir.model.fields,field_description:stock.field_stock_move_line__product_uom_qty
@@ -4588,7 +4640,7 @@ msgstr "Rezerve"
#. module: stock
#: model:ir.model.fields,field_description:stock.field_stock_quant__reserved_quantity
msgid "Reserved Quantity"
-msgstr ""
+msgstr "Ayrılan Miktar"
#. module: stock
#: model:ir.model.fields,help:stock.field_res_config_settings__module_procurement_jit
@@ -4597,6 +4649,10 @@ msgid ""
"is advised to better manage priorities in case of long customer lead times "
"or/and frequent stock-outs."
msgstr ""
+"Teslimat emirlerinde manuel olarak rezerve ederek veya stok planlayıcısını "
+"çalıştırmak, müşteri güvenli teslimat tampon süresinin uzun olması ve / veya"
+" stokların sık sık tükenmesi durumunda önceliklerin daha iyi yönetilmesini "
+"sağlar."
#. module: stock
#: model:ir.model.fields,field_description:stock.field_product_product__responsible_id
@@ -4789,6 +4845,8 @@ msgid ""
"Scrapping a product will remove it from your stock. The product will\n"
" end up in a scrap location that can be used for reporting purpose."
msgstr ""
+"Hurdaya çıkan bir ürün stoktan düşülecektir. Ürün raporlama amacıyla "
+"kullanılmak hurda konumuna düşecek. "
#. module: stock
#: model:ir.ui.view,arch_db:stock.view_picking_form
@@ -4803,7 +4861,7 @@ msgstr "Envanter Arama"
#. module: stock
#: model:ir.ui.view,arch_db:stock.stock_inventory_line_search
msgid "Search Inventory Lines"
-msgstr ""
+msgstr "Stok Satırları Arama "
#. module: stock
#: model:ir.ui.view,arch_db:stock.view_procurement_rule_filter
@@ -4896,12 +4954,12 @@ msgstr "İlgili Depo"
#. module: stock
#: model:ir.ui.view,arch_db:stock.res_config_settings_view_form
msgid "Set Putaway Strategies on Locations"
-msgstr ""
+msgstr "Konumlardaki Yerleştirme Stratejilerini Ayarlama"
#. module: stock
#: model:ir.ui.view,arch_db:stock.res_config_settings_view_form
msgid "Set Warehouse Routes"
-msgstr ""
+msgstr "Depo Rotalarını Ayarla"
#. module: stock
#: model:ir.model.fields,help:stock.field_product_category__removal_strategy_id
@@ -4920,7 +4978,7 @@ msgstr ""
#. module: stock
#: model:ir.ui.view,arch_db:stock.res_config_settings_view_form
msgid "Set owner on stored products"
-msgstr ""
+msgstr "Depolanmış ürünlerin sahibini ayarla."
#. module: stock
#: model:ir.ui.view,arch_db:stock.res_config_settings_view_form
@@ -4982,6 +5040,10 @@ msgid ""
" labels and request carrier picking at your warehouse to ship to the "
"customer. Apply shipping connector from delivery methods."
msgstr ""
+"Nakliye bağlantıları, doğru nakliye maliyetlerini hesaplamaya, gönderim "
+"etiketlerini basmaya ve müşteriye gönderilmek üzere depoda taşıyıcı seçimini"
+" talep etmeyi sağlar. Gönderim bağlantılarını teslimat yöntemlerinden "
+"uygulayın."
#. module: stock
#: model:ir.model.fields,field_description:stock.field_stock_warehouse__code
@@ -4996,7 +5058,7 @@ msgstr "Kısa adı depo tanımlamak için kullanın"
#. module: stock
#: model:ir.model.fields,field_description:stock.field_stock_picking__show_check_availability
msgid "Show Check Availability"
-msgstr ""
+msgstr "Uygunluk Kontrolünü Göster"
#. module: stock
#: model:ir.model.fields,field_description:stock.field_stock_move__show_operations
@@ -5007,17 +5069,17 @@ msgstr "Operasyon Detaylarını Göster"
#. module: stock
#: model:ir.model.fields,field_description:stock.field_stock_picking__show_lots_text
msgid "Show Lots Text"
-msgstr ""
+msgstr "Lot Metinlerini Göster"
#. module: stock
#: model:ir.model.fields,field_description:stock.field_stock_picking__show_mark_as_todo
msgid "Show Mark As Todo"
-msgstr ""
+msgstr "Yapılacak Olarak İşaretlenenleri Göster"
#. module: stock
#: model:ir.model.fields,field_description:stock.field_stock_picking__show_operations
msgid "Show Operations"
-msgstr ""
+msgstr "Operasyonları Göster"
#. module: stock
#: model:ir.model.fields,field_description:stock.field_stock_picking_type__show_reserved
@@ -5027,7 +5089,7 @@ msgstr "Rezerveyi Göster"
#. module: stock
#: model:ir.model.fields,field_description:stock.field_stock_picking__show_validate
msgid "Show Validate"
-msgstr ""
+msgstr "Doğrulamayı Göster"
#. module: stock
#: model:ir.ui.view,arch_db:stock.view_picking_internal_search
@@ -5063,7 +5125,7 @@ msgstr "Kaynak Konumu"
#. module: stock
#: model:ir.ui.view,arch_db:stock.message_body
msgid "Source Location:"
-msgstr ""
+msgstr "Kaynak Konumu :"
#. module: stock
#: model:ir.model.fields,field_description:stock.field_stock_move_line__package_id
@@ -5074,7 +5136,7 @@ msgstr "Kaynak Paket"
#. module: stock
#: model:ir.ui.view,arch_db:stock.message_body
msgid "Source Package :"
-msgstr ""
+msgstr "Kaynak Paketi :"
#. module: stock
#: model:ir.model.fields,help:stock.field_procurement_rule__location_src_id
@@ -5232,7 +5294,7 @@ msgstr "Stok Miktarı"
#. module: stock
#: model:ir.model,name:stock.model_stock_quantity_history
msgid "Stock Quantity History"
-msgstr ""
+msgstr "Stok Miktarının Geçmişi"
#. module: stock
#: model:ir.ui.view,arch_db:stock.view_move_search
@@ -5266,6 +5328,8 @@ msgid ""
"Store products in specific locations of your warehouse (e.g. bins, racks) "
"and to track inventory accordingly."
msgstr ""
+"Ürünlei deponuzda belirli konumlarda depolayın ( varil, raf vs) ve stoğunuza"
+" göre takip edin."
#. module: stock
#: model:ir.model.fields,field_description:stock.field_stock_location_route__supplied_wh_id
@@ -5315,6 +5379,8 @@ msgid ""
"Technical field used to compute whether the check availability button should"
" be shown."
msgstr ""
+"Kontrol kullanılabilirlik düğmesinin gösterilip gösterilmeyeceğini "
+"hesaplamak için kullanılan teknik alan."
#. module: stock
#: model:ir.model.fields,help:stock.field_stock_picking__show_mark_as_todo
@@ -5322,11 +5388,14 @@ msgid ""
"Technical field used to compute whether the mark as todo button should be "
"shown."
msgstr ""
+"Yapılacak olarak işaretlenen düğmenin gösterilip gösterilmeyeceğini "
+"hesaplamak için kullanılan teknik alan."
#. module: stock
#: model:ir.model.fields,help:stock.field_stock_picking__show_validate
msgid "Technical field used to compute whether the validate should be shown."
msgstr ""
+"Onayın gösterilip gösterilmeyeceğini hesaplamak için kullanılan teknik alan."
#. module: stock
#: model:ir.model.fields,help:stock.field_stock_move__restrict_partner_id
@@ -5352,12 +5421,12 @@ msgstr ""
#. module: stock
#: model:ir.model.fields,help:stock.field_stock_move_line__produce_line_ids
msgid "Technical link to see which line was produced with this. "
-msgstr ""
+msgstr "Bununla hangi hattın üretildiğini görmek için teknik bağlantı."
#. module: stock
#: model:ir.model.fields,help:stock.field_stock_move_line__consume_line_ids
msgid "Technical link to see who consumed what. "
-msgstr ""
+msgstr "Kimin ne tükettiğini görmek için teknik bağlantı."
#. module: stock
#: model:ir.model.fields,help:stock.field_stock_move__product_tmpl_id
@@ -5382,6 +5451,9 @@ msgid ""
" With 'Automatic No Step Added', the location is replaced in the original "
"move."
msgstr ""
+"'Manuel Operasyon' değeri,mevcut adımdan sonra bir stok hareketi "
+"oluşturacaktır. 'Otomatik Adım Ekleme Yok' ile, konum orijinal harekette "
+"değiştirilir."
#. module: stock
#: code:addons/stock/models/stock_picking.py:829
@@ -5441,6 +5513,13 @@ msgid ""
"point. That way, it is always known where we need to go and that is why they"
" are preferred over push rules."
msgstr ""
+"Bir satış siparişi, yeniden sipariş kuralı, başka hareketler gibi satışlar "
+"tarafından temsil edilen talep, çözüm için satın alma kuralının "
+"uygulanmasına ihtiyaç duyar. Satın alma kuralının uygulanmasına bağlı "
+"olarak bir satın alma siparişini, üretim siparişini ya da başka bir hareketi"
+" tetikler. Bu yol, ters siparişteki başlangıç noktasındaki orijinal talep "
+"ile bitiş noktasına kadar zincir oluşturan yoldur. Bu yol,her zaman nereye "
+"gidilmesi gerektiğini ve bu yüzden itme kuralları sayesinde tercih edilir."
#. module: stock
#: model:ir.ui.view,arch_db:stock.product_category_form_view_inherit
@@ -5474,6 +5553,10 @@ msgid ""
" On the operation type you could e.g. specify if packing is needed by default,\n"
" if it should show the customer."
msgstr ""
+"Operasyon türü sistemi, her stok operasyonunda, görünümlerini buna göre "
+"değiştirecek belirli bir türe atamanıza izin verir. Operasyon tipinde, "
+"örneğin müşteriye göstermesi gerekiyorsa, paketlemede varsayılan olarak "
+"gerekli olup olmadığını belirtebilirsiniz."
#. module: stock
#: model:ir.model.fields,help:stock.field_stock_quant__package_id
@@ -5505,7 +5588,7 @@ msgstr "Bu stok hareketini oluşturan satınalma kuralı"
#. module: stock
#: model:ir.ui.view,arch_db:stock.stock_warn_insufficient_qty_form_view
msgid "The product"
-msgstr ""
+msgstr "Ürün"
#. module: stock
#: model:ir.model.fields,help:stock.field_stock_move__push_rule_id
@@ -5593,6 +5676,9 @@ msgid ""
"routes put another location. If it is empty, it will check for the customer "
"location on the partner. "
msgstr ""
+"Bu operasyon türü ile manuel toplama oluşturduğunuzda, bu varsayılan hedef "
+"konumdur. Ancak değiştirmek mümkündür veya başka rotalar seçilebilir. Boş "
+"ise, iş ortağı kartının üzerindeki müşteri konumunu kontrol edecektir"
#. module: stock
#: model:ir.model.fields,help:stock.field_stock_picking_type__default_location_src_id
@@ -5602,6 +5688,9 @@ msgid ""
"put another location. If it is empty, it will check for the supplier "
"location on the partner. "
msgstr ""
+"Bu operasyon türü ile manuel toplama oluşturduğunuzda, bu varsayılan hedef "
+"konumdur. Ancak değiştirmek mümkündür veya başka rotalar seçilebilir. Boş "
+"ise, iş ortağı kartının üzerindeki müşteri konumunu kontrol edecektir"
#. module: stock
#: model:ir.actions.act_window,help:stock.action_production_lot_form
@@ -5615,7 +5704,7 @@ msgstr ""
#. module: stock
#: model:ir.model.fields,help:stock.field_stock_location_path__picking_type_id
msgid "This is the operation type that will be put on the stock moves"
-msgstr ""
+msgstr "Bu, stok hareketlerine koyulacak olan bir operasyon türüdür."
#. module: stock
#: model:ir.model.fields,help:stock.field_stock_quant__owner_id
@@ -5649,7 +5738,7 @@ msgstr ""
#, python-format
msgid ""
"This location's usage cannot be changed to view as it contains products."
-msgstr ""
+msgstr "Bu konum kullanımı, ürünleri içerdiğinden görüntüyü değiştiremez."
#. module: stock
#: model:ir.actions.act_window,help:stock.stock_move_action
@@ -5768,12 +5857,15 @@ msgid ""
"Those are the entire packages of a picking shown in the view of detailed "
"operations"
msgstr ""
+"Bunlar, detaylı operasyon görüntüsünde gösterilen toplama paketlerinin "
+"tümüdür."
#. module: stock
#: model:ir.model.fields,help:stock.field_stock_picking__entire_package_ids
msgid ""
"Those are the entire packages of a picking shown in the view of operations"
msgstr ""
+"Bunlar, operasyon görüntüsünde gösterilen toplama paketlerinin tümüdür."
#. module: stock
#: model:ir.model.fields,field_description:stock.field_stock_move_line__location_dest_id
@@ -5795,7 +5887,7 @@ msgstr "Yapılacak"
#. module: stock
#: model:ir.model.fields,field_description:stock.field_stock_move_line__to_loc
msgid "To Loc"
-msgstr ""
+msgstr "Nereye?"
#. module: stock
#: model:ir.ui.view,arch_db:stock.stock_picking_type_kanban
@@ -5843,6 +5935,8 @@ msgid ""
"Track following dates on lots & serial numbers: best before, removal, end of life, alert. \n"
" Such dates are set automatically at lot/serial number creation based on values set on the product (in days)."
msgstr ""
+"Devam eden seri numaraları ve lotlar üzerindeki tarihleri izleyin: Önceki en iyi, çıkarılan, ömrünün bitmesi, uyarı.\n"
+"Bu tarihler ürün değerlerine bağlı olarak oluşturulan seri/lot numaralarında otomatik olarak ayarlanır."
#. module: stock
#: model:ir.ui.view,arch_db:stock.res_config_settings_view_form
@@ -5851,11 +5945,14 @@ msgid ""
" life, alert. Such dates are set automatically at lot/serial number creation"
" based on values set on the product (in days)."
msgstr ""
+"Devam eden seri numaraları ve lotlar üzerindeki tarihleri izleyin: Önceki en"
+" iyi, çıkarılan, ömrünün bitmesi, uyarı. Bu tarihler ürün değerlerine bağlı "
+"olarak oluşturulan seri/lot numaralarında otomatik olarak ayarlanır."
#. module: stock
#: model:ir.ui.view,arch_db:stock.res_config_settings_view_form
msgid "Track product location in your warehouse"
-msgstr ""
+msgstr "Deponuzdaki ürün konumunu izleyin"
#. module: stock
#: model:ir.model.fields,field_description:stock.field_product_product__tracking
@@ -6052,7 +6149,7 @@ msgstr "Varolan Lot/seri numaraları kullanın"
#. module: stock
#: model:ir.ui.view,arch_db:stock.res_config_settings_view_form
msgid "Use your own routes and putaway strategies"
-msgstr ""
+msgstr "Kendi rotanızı ve yerleştirme stratejinizi kullanın"
#. module: stock
#: model:ir.model.fields,help:stock.field_stock_picking_type__sequence
@@ -6256,6 +6353,12 @@ msgid ""
"finished product manual manufacturing order. In other cases, it is important"
" to use pull rules where you know where you are going based on a demand."
msgstr ""
+"Bir hareketin bir konuma öngörüldüğü zaman, itme kuralı bir sonraki konuma "
+"otomatik olarak bir hareket oluşturacaktır. Bu esas olarak sadece manuel "
+"işlemler oluştururken gereklidir, örn. 2/3 adımlı manuel satın alma siparişi"
+" veya 2/3 adımlı ürün manuel bitmiş ürün siparişi. Diğer durumlarda, talep "
+"üzerine nereye gideceğinizi bildiğiniz durumlarda çekme kurallarını "
+"kullanmak önemlidir."
#. module: stock
#: model:ir.model.fields,help:stock.field_stock_location_route__warehouse_selectable
@@ -6306,6 +6409,8 @@ msgid ""
"When the picking is not done this allows changing the initial demand. When "
"the picking is done this allows changing the done quantities."
msgstr ""
+"Toplama tamamlanmamış ise, başlangıç talebinin değişmesine izin verir. Eğer "
+"toplama tamamlanmış ise, tamamlanmış miktarların değişimine izin verir."
#. module: stock
#: model:ir.model.fields,help:stock.field_stock_warehouse_orderpoint__product_min_qty
@@ -6349,7 +6454,7 @@ msgstr ""
#. module: stock
#: model:ir.model.fields,field_description:stock.field_stock_move__additional
msgid "Whether the move was added after the picking's confirmation"
-msgstr ""
+msgstr "Toplama onayından sonra hareket eklenip eklenmediği"
#. module: stock
#: model:ir.model.fields,field_description:stock.field_stock_return_picking_line__wizard_id
@@ -6372,6 +6477,11 @@ msgid ""
"valuate your stock or change its rounding precision to a smaller value "
"(example: 0.00001)."
msgstr ""
+"Ürün stoğunuz için kullandığınızdan daha küçük bir ölçü birimi "
+"kullanıyorsunuz. Bu ayrılan miktardaki yuvarlama problemine sebep olabilir! "
+"Stoğunuzu değerlendirmek ya da daha küçük bir değer için yuvarlama "
+"hassasiyetinizi daha küçük bir değere değiştirmek için, olabilecek daha "
+"küçük bir ölçü birimin kullanmalısınız. (örn: 0.00001)"
#. module: stock
#: model:ir.actions.act_window,help:stock.action_routes_form
@@ -6395,6 +6505,9 @@ msgid ""
"stock move. If you need to change the type, you should first unreserve the "
"stock move."
msgstr ""
+"Stok hareketlerinde mevcut olarak ayrılmış bir ürün türünü "
+"değiştiremezsiniz. Eğer tür değişikliğine ihtiyacınız varsa, stok "
+"hareketlerinde ayrılmayan olarak belirlemelisiniz."
#. module: stock
#: code:addons/stock/models/product.py:510
@@ -6415,18 +6528,20 @@ msgid ""
"You can not delete product moves if the picking is done. You can only "
"correct the done quantities."
msgstr ""
+"Eğer toplanma tamamlanmışsa, ürün hareketini silemezsiniz. Sadece "
+"tamamlanmış miktarı düzeltebilirsiniz."
#. module: stock
#: code:addons/stock/models/stock_move_line.py:153
#, python-format
msgid "You can not enter negative quantities!"
-msgstr ""
+msgstr "Negatif miktar giremezsiniz!"
#. module: stock
#: code:addons/stock/models/stock_inventory.py:381
#, python-format
msgid "You can only adjust stockable products."
-msgstr ""
+msgstr "Sadece stoklanabilir ürünleri ayarlayabilirsiniz."
#. module: stock
#: code:addons/stock/models/stock_move.py:1077
@@ -6491,6 +6606,8 @@ msgid ""
"You cannot take products from or deliver products to a location of type "
"\"view\"."
msgstr ""
+"Ürünleri \"görünüm\" türündeki bir yere götüremez veya ürünlere teslim "
+"edemezsiniz."
#. module: stock
#: code:addons/stock/models/stock_move_line.py:128
@@ -6500,6 +6617,8 @@ msgid ""
"You cannot use the same serial number twice. Please correct the serial "
"numbers encoded."
msgstr ""
+"Aynı seri numarasını iki kere kullanamazsınız. Lütfen kodlanmış seri "
+"numarasını düzeltin."
#. module: stock
#: code:addons/stock/models/stock_picking.py:716
@@ -6550,7 +6669,7 @@ msgstr "İlk talepten daha az ürün işlediniz."
msgid ""
"You have processed more than what was initially\n"
" planned for the product"
-msgstr ""
+msgstr "Ürün için en başta ne planlandıysa bundan daha fazlasını yaptınız"
#. module: stock
#: code:addons/stock/models/product.py:304
@@ -6583,7 +6702,7 @@ msgstr ""
#: code:addons/stock/models/stock_location.py:96
#, python-format
msgid "You have to set a name for this location."
-msgstr ""
+msgstr "Bu konum için bir isim ayarlayın."
#. module: stock
#: code:addons/stock/wizard/stock_picking_return.py:46
@@ -6616,7 +6735,7 @@ msgstr ""
#: code:addons/stock/models/stock_move.py:1061
#, python-format
msgid "You should not put the contents of a package in different locations."
-msgstr ""
+msgstr "Farklı konumlara, bir paket içeriği koymamalısınız."
#. module: stock
#: code:addons/stock/models/product.py:371
@@ -6626,6 +6745,8 @@ msgid ""
"You still have some active reordering rules on this product. Please archive "
"or delete them first."
msgstr ""
+"Bu ürün için hala bazı aktif ihtiyaç kurallarınız var. Lütfen önce bunları "
+"silin ya da arşivleyin."
#. module: stock
#: code:addons/stock/models/stock_move.py:330
@@ -6669,7 +6790,7 @@ msgstr "gün"
#. module: stock
#: model:ir.ui.view,arch_db:stock.res_config_settings_view_form
msgid "days to be propagated"
-msgstr ""
+msgstr "Yayılma günleri"
#. module: stock
#: model:ir.ui.view,arch_db:stock.view_inventory_form
@@ -6695,12 +6816,12 @@ msgstr "örn. PO0032"
#. module: stock
#: model:ir.ui.view,arch_db:stock.stock_warn_insufficient_qty_form_view
msgid "in"
-msgstr ""
+msgstr "içinde"
#. module: stock
#: model:ir.ui.view,arch_db:stock.stock_warn_insufficient_qty_form_view
msgid "is not available in sufficient quantity"
-msgstr ""
+msgstr "yeterli miktar mevcut değil"
#. module: stock
#: model:ir.ui.view,arch_db:stock.exception_on_picking
diff --git a/addons/stock/models/procurement.py b/addons/stock/models/procurement.py
index ba047badef8..fd08b362949 100644
--- a/addons/stock/models/procurement.py
+++ b/addons/stock/models/procurement.py
@@ -77,7 +77,7 @@ class ProcurementRule(models.Model):
data = self._get_stock_move_values(product_id, product_qty, product_uom, location_id, name, origin, values, group_id)
# Since action_confirm launch following procurement_group we should activate it.
- move = self.env['stock.move'].sudo().create(data)
+ move = self.env['stock.move'].sudo().with_context(force_company=data.get('company_id', False)).create(data)
move._action_confirm()
return True
diff --git a/addons/stock/models/product.py b/addons/stock/models/product.py
index 4146e2ef586..75223abea24 100644
--- a/addons/stock/models/product.py
+++ b/addons/stock/models/product.py
@@ -411,8 +411,11 @@ class ProductTemplate(models.Model):
outgoing_qty = fields.Float(
'Outgoing', compute='_compute_quantities', search='_search_outgoing_qty',
digits=dp.get_precision('Product Unit of Measure'))
- location_id = fields.Many2one('stock.location', 'Location')
- warehouse_id = fields.Many2one('stock.warehouse', 'Warehouse')
+ # The goal of these fields is not to be able to search a location_id/warehouse_id but
+ # to properly make these fields "dummy": only used to put some keys in context from
+ # the search view in order to influence computed field
+ location_id = fields.Many2one('stock.location', 'Location', store=False, search=lambda operator, operand, vals: [])
+ warehouse_id = fields.Many2one('stock.warehouse', 'Warehouse', store=False, search=lambda operator, operand, vals: [])
route_ids = fields.Many2many(
'stock.location.route', 'stock_route_product', 'product_id', 'route_id', 'Routes',
domain=[('product_selectable', '=', True)],
@@ -504,7 +507,7 @@ class ProductTemplate(models.Model):
if 'uom_id' in vals:
new_uom = self.env['uom.uom'].browse(vals['uom_id'])
updated = self.filtered(lambda template: template.uom_id != new_uom)
- done_moves = self.env['stock.move'].search([('product_id', 'in', updated.mapped('product_variant_ids').ids)], limit=1)
+ done_moves = self.env['stock.move'].search([('product_id', 'in', updated.with_context(active_test=False).mapped('product_variant_ids').ids)], limit=1)
if done_moves:
raise UserError(_("You can not change the unit of measure of a product that has already been used in a done stock move. If you need to change the unit of measure, you may deactivate this product."))
if 'type' in vals and vals['type'] != 'product' and sum(self.mapped('nbr_reordering_rules')) != 0:
diff --git a/addons/stock/models/stock_move.py b/addons/stock/models/stock_move.py
index 78b6f34c938..fdbf05f1866 100644
--- a/addons/stock/models/stock_move.py
+++ b/addons/stock/models/stock_move.py
@@ -487,9 +487,19 @@ class StockMove(models.Model):
}
def _do_unreserve(self):
- if any(move.state in ('done', 'cancel') for move in self):
- raise UserError(_('Cannot unreserve a done move'))
- self.mapped('move_line_ids').unlink()
+ moves_to_unreserve = self.env['stock.move']
+ for move in self:
+ if move.state == 'cancel':
+ # We may have cancelled move in an open picking in a "propagate_cancel" scenario.
+ continue
+ if move.state == 'done':
+ if move.scrapped:
+ # We may have done move in an open picking in a scrap scenario.
+ continue
+ else:
+ raise UserError(_('Cannot unreserve a done move'))
+ moves_to_unreserve |= move
+ moves_to_unreserve.mapped('move_line_ids').unlink()
return True
def _push_apply(self):
@@ -590,7 +600,7 @@ class StockMove(models.Model):
# We are using propagate to False in order to not cancel destination moves merged in moves[0]
moves_to_unlink.write({'propagate': False})
moves_to_unlink._action_cancel()
- moves_to_unlink.unlink()
+ moves_to_unlink.sudo().unlink()
return (self | self.env['stock.move'].concat(*moves_to_merge)) - moves_to_unlink
def _get_relevant_state_among_moves(self):
@@ -811,7 +821,12 @@ class StockMove(models.Model):
}
if quantity:
uom_quantity = self.product_id.uom_id._compute_quantity(quantity, self.product_uom, rounding_method='HALF-UP')
- vals = dict(vals, product_uom_qty=uom_quantity)
+ uom_quantity_back_to_product_uom = self.product_uom._compute_quantity(uom_quantity, self.product_id.uom_id, rounding_method='HALF-UP')
+ rounding = self.env['decimal.precision'].precision_get('Product Unit of Measure')
+ if float_compare(quantity, uom_quantity_back_to_product_uom, precision_digits=rounding) == 0:
+ vals = dict(vals, product_uom_qty=uom_quantity)
+ else:
+ vals = dict(vals, product_uom_qty=quantity, product_uom_id=self.product_id.uom_id.id)
if reserved_quant:
vals = dict(
vals,
@@ -841,11 +856,20 @@ class StockMove(models.Model):
# is if the move's unit of measure's rounding does not allow fractional reservation. We chose
# to convert `taken_quantity` to the move's unit of measure with a down rounding method and
# then get it back in the quants unit of measure with an half-up rounding_method. This
- # way, we'll never reserve more than allowed.
- taken_quantity_move_uom = self.product_id.uom_id._compute_quantity(taken_quantity, self.product_uom, rounding_method='DOWN')
- taken_quantity = self.product_uom._compute_quantity(taken_quantity_move_uom, self.product_id.uom_id, rounding_method='HALF-UP')
+ # way, we'll never reserve more than allowed. We do not apply this logic if
+ # `available_quantity` is brought by a chained move line. In this case, `_prepare_move_line_vals`
+ # will take care of changing the UOM to the UOM of the product.
+ if not strict:
+ taken_quantity_move_uom = self.product_id.uom_id._compute_quantity(taken_quantity, self.product_uom, rounding_method='DOWN')
+ taken_quantity = self.product_uom._compute_quantity(taken_quantity_move_uom, self.product_id.uom_id, rounding_method='HALF-UP')
quants = []
+
+ if self.product_id.tracking == 'serial':
+ rounding = self.env['decimal.precision'].precision_get('Product Unit of Measure')
+ if float_compare(taken_quantity, int(taken_quantity), precision_digits=rounding) != 0:
+ taken_quantity = 0
+
try:
if not float_is_zero(taken_quantity, precision_rounding=self.product_id.uom_id.rounding):
quants = self.env['stock.quant']._update_reserved_quantity(
@@ -865,7 +889,7 @@ class StockMove(models.Model):
to_update = self.move_line_ids.filtered(lambda m: m.product_id.tracking != 'serial' and
m.location_id.id == reserved_quant.location_id.id and m.lot_id.id == reserved_quant.lot_id.id and m.package_id.id == reserved_quant.package_id.id and m.owner_id.id == reserved_quant.owner_id.id)
if to_update:
- to_update[0].with_context(bypass_reservation_update=True).product_uom_qty += self.product_id.uom_id._compute_quantity(quantity, self.product_uom, rounding_method='HALF-UP')
+ to_update[0].with_context(bypass_reservation_update=True).product_uom_qty += self.product_id.uom_id._compute_quantity(quantity, to_update[0].product_uom_id, rounding_method='HALF-UP')
else:
if self.product_id.tracking == 'serial':
for i in range(0, int(quantity)):
@@ -883,7 +907,7 @@ class StockMove(models.Model):
assigned_moves = self.env['stock.move']
partially_available_moves = self.env['stock.move']
for move in self.filtered(lambda m: m.state in ['confirmed', 'waiting', 'partially_available']):
- if move.location_id.usage in ('supplier', 'inventory', 'production', 'customer')\
+ if move.location_id.should_bypass_reservation()\
or move.product_id.type == 'consu':
# create the move line(s) but do not impact quants
if move.product_id.tracking == 'serial' and (move.picking_type_id.use_create_lots or move.picking_type_id.use_existing_lots):
@@ -1022,8 +1046,8 @@ class StockMove(models.Model):
# create the extra moves
extra_move_quantity = float_round(
self.quantity_done - self.product_uom_qty,
- precision_rounding=self.product_uom.rounding,
- rounding_method ='UP')
+ precision_rounding=rounding,
+ rounding_method='HALF-UP')
extra_move_vals = self._prepare_extra_move_vals(extra_move_quantity)
extra_move = self.copy(default=extra_move_vals)
if extra_move.picking_id:
@@ -1093,7 +1117,7 @@ class StockMove(models.Model):
pass
# If you were already putting stock.move.lots on the next one in the work order, transfer those to the new move
- move.move_line_ids.filtered(lambda x: x.qty_done == 0.0).write({'move_id': new_move})
+ move.move_line_ids.filtered(lambda x: x.qty_done == 0.0).write({'move_id': new_move, 'product_uom_qty': 0})
move.move_line_ids._action_done()
# Check the consistency of the result packages; there should be an unique location across
# the contained quants.
diff --git a/addons/stock/models/stock_quant.py b/addons/stock/models/stock_quant.py
index 11b34b51413..7b82cb01f79 100644
--- a/addons/stock/models/stock_quant.py
+++ b/addons/stock/models/stock_quant.py
@@ -253,13 +253,21 @@ class StockQuant(models.Model):
self = self.sudo()
rounding = product_id.uom_id.rounding
quants = self._gather(product_id, location_id, lot_id=lot_id, package_id=package_id, owner_id=owner_id, strict=strict)
- available_quantity = self._get_available_quantity(product_id, location_id, lot_id=lot_id, package_id=package_id, owner_id=owner_id, strict=strict)
- if float_compare(quantity, 0, precision_rounding=rounding) > 0 and float_compare(quantity, available_quantity, precision_rounding=rounding) > 0:
- raise UserError(_('It is not possible to reserve more products of %s than you have in stock.') % (', '.join(quants.mapped('product_id').mapped('display_name'))))
- elif float_compare(quantity, 0, precision_rounding=rounding) < 0 and float_compare(abs(quantity), sum(quants.mapped('reserved_quantity')), precision_rounding=rounding) > 0:
- raise UserError(_('It is not possible to unreserve more products of %s than you have in stock.') % (', '.join(quants.mapped('product_id').mapped('display_name'))))
-
reserved_quants = []
+
+ if float_compare(quantity, 0, precision_rounding=rounding) > 0:
+ # if we want to reserve
+ available_quantity = self._get_available_quantity(product_id, location_id, lot_id=lot_id, package_id=package_id, owner_id=owner_id, strict=strict)
+ if float_compare(quantity, available_quantity, precision_rounding=rounding) > 0:
+ raise UserError(_('It is not possible to reserve more products of %s than you have in stock.') % (', '.join(quants.mapped('product_id').mapped('display_name'))))
+ elif float_compare(quantity, 0, precision_rounding=rounding) < 0:
+ # if we want to unreserve
+ available_quantity = sum(quants.mapped('reserved_quantity'))
+ if float_compare(abs(quantity), available_quantity, precision_rounding=rounding) > 0:
+ raise UserError(_('It is not possible to unreserve more products of %s than you have in stock.') % (', '.join(quants.mapped('product_id').mapped('display_name'))))
+ else:
+ return reserved_quants
+
for quant in quants:
if float_compare(quantity, 0, precision_rounding=rounding) > 0:
max_quantity_on_quant = quant.quantity - quant.reserved_quantity
diff --git a/addons/stock/models/stock_warehouse.py b/addons/stock/models/stock_warehouse.py
index a69813c218d..7fc13f8b07c 100644
--- a/addons/stock/models/stock_warehouse.py
+++ b/addons/stock/models/stock_warehouse.py
@@ -150,11 +150,14 @@ class Warehouse(models.Model):
# If another partner assigned
if vals.get('partner_id'):
warehouses._update_partner_data(vals['partner_id'], vals.get('company_id'))
+
res = super(Warehouse, self).write(vals)
# check if we need to delete and recreate route
if vals.get('reception_steps') or vals.get('delivery_steps'):
- warehouses._update_routes()
+ route_vals = warehouses._update_routes()
+ if route_vals:
+ self.write(route_vals)
if vals.get('resupply_wh_ids') and not vals.get('resupply_route_ids'):
for warehouse in warehouses:
@@ -280,7 +283,7 @@ class Warehouse(models.Model):
reception_route.pull_ids.write({'active': False})
reception_route.push_ids.write({'active': False})
else:
- reception_route = self.env['stock.location.route'].create(warehouse._get_reception_delivery_route_values(warehouse.reception_steps))
+ warehouse.reception_route_id = reception_route = self.env['stock.location.route'].create(warehouse._get_reception_delivery_route_values(warehouse.reception_steps))
# push / procurement (pull) rules for reception
routings = routes_data[warehouse.id][warehouse.reception_steps]
push_rules_list, pull_rules_list = warehouse._get_push_pull_rules_values(
@@ -593,11 +596,18 @@ class Warehouse(models.Model):
routes_data = self.get_routes_dict()
# change the default source and destination location and (de)activate operation types
self._update_picking_type()
- self._create_or_update_delivery_route(routes_data)
- self._create_or_update_reception_route(routes_data)
- self._create_or_update_crossdock_route(routes_data)
- self._create_or_update_mto_pull(routes_data)
- return True
+ delivery_route = self._create_or_update_delivery_route(routes_data)
+ reception_route = self._create_or_update_reception_route(routes_data)
+ crossdock_route = self._create_or_update_crossdock_route(routes_data)
+ mto_pull = self._create_or_update_mto_pull(routes_data)
+
+ return {
+ 'route_ids': [(4, route.id) for route in reception_route | delivery_route | crossdock_route],
+ 'mto_pull_id': mto_pull.id,
+ 'reception_route_id': reception_route.id,
+ 'delivery_route_id': delivery_route.id,
+ 'crossdock_route_id': crossdock_route.id,
+ }
@api.one
def _update_picking_type(self):
diff --git a/addons/stock/tests/test_move.py b/addons/stock/tests/test_move.py
index a98ed3fd72c..7f1cc17b0cf 100644
--- a/addons/stock/tests/test_move.py
+++ b/addons/stock/tests/test_move.py
@@ -1033,6 +1033,47 @@ class StockMove(TransactionCase):
move._action_done()
self.assertEqual(self.env['stock.quant']._get_available_quantity(self.product1, self.customer_location), 12.0)
+ def test_availability_7(self):
+ """ Check that, in the scenario where a move is in a bigger uom than the uom of the quants
+ and this uom only allows entire numbers, we only reserve quantity honouring the uom's
+ rounding even if the quantity is set across multiple quants.
+ """
+ # on the dozen uom, set the rounding set 1.0
+ self.uom_dozen.rounding = 1
+
+ # make 12 quants of 1
+ for i in range(1, 13):
+ lot_id = self.env['stock.production.lot'].create({
+ 'name': 'lot%s' % str(i),
+ 'product_id': self.product2.id,
+ })
+ self.env['stock.quant']._update_available_quantity(self.product2, self.stock_location, 1.0, lot_id=lot_id)
+
+ # the move should be reserved
+ move = self.env['stock.move'].create({
+ 'name': 'test_availability_7',
+ 'location_id': self.stock_location.id,
+ 'location_dest_id': self.customer_location.id,
+ 'product_id': self.product2.id,
+ 'product_uom': self.uom_dozen.id,
+ 'product_uom_qty': 1,
+ })
+ move._action_confirm()
+ move._action_assign()
+ self.assertEqual(move.state, 'assigned')
+ self.assertEqual(len(move.move_line_ids.mapped('product_uom_id')), 1)
+ self.assertEqual(move.move_line_ids.mapped('product_uom_id'), self.uom_unit)
+
+ for move_line in move.move_line_ids:
+ move_line.qty_done = 1
+ move._action_done()
+
+ self.assertEqual(move.product_uom_qty, 1)
+ self.assertEqual(move.product_uom.id, self.uom_dozen.id)
+ self.assertEqual(move.state, 'done')
+ self.assertEqual(self.env['stock.quant']._get_available_quantity(self.product2, self.customer_location), 12.0)
+ self.assertEqual(len(self.env['stock.quant']._gather(self.product2, self.customer_location)), 12)
+
def test_unreserve_1(self):
""" Check that unreserving a stock move sets the products reserved as available and
set the state back to confirmed.
@@ -1228,6 +1269,47 @@ class StockMove(TransactionCase):
for quant in quants:
self.assertEqual(quant.reserved_quantity, 0)
+ def test_unreserve_6(self):
+ """ In a situation with a negative and a positive quant, reserve and unreserve.
+ """
+ q1 = self.env['stock.quant'].create({
+ 'product_id': self.product1.id,
+ 'location_id': self.stock_location.id,
+ 'quantity': -10,
+ 'reserved_quantity': 0,
+ })
+
+ q2 = self.env['stock.quant'].create({
+ 'product_id': self.product1.id,
+ 'location_id': self.stock_location.id,
+ 'quantity': 30.0,
+ 'reserved_quantity': 10.0,
+ })
+
+ self.assertEqual(self.env['stock.quant']._get_available_quantity(self.product1, self.stock_location), 10.0)
+
+ move1 = self.env['stock.move'].create({
+ 'name': 'test_unreserve_6',
+ 'location_id': self.stock_location.id,
+ 'location_dest_id': self.customer_location.id,
+ 'product_id': self.product1.id,
+ 'product_uom': self.uom_unit.id,
+ 'product_uom_qty': 10.0,
+ })
+ move1._action_confirm()
+ move1._action_assign()
+ self.assertEqual(move1.state, 'assigned')
+ self.assertEqual(len(move1.move_line_ids), 1)
+ self.assertEqual(move1.move_line_ids.product_qty, 10)
+ self.assertEqual(self.env['stock.quant']._get_available_quantity(self.product1, self.stock_location), 0.0)
+ self.assertEqual(q2.reserved_quantity, 20)
+
+ move1._do_unreserve()
+ self.assertEqual(move1.state, 'confirmed')
+ self.assertEqual(len(move1.move_line_ids), 0)
+ self.assertEqual(self.env['stock.quant']._get_available_quantity(self.product1, self.stock_location), 10.0)
+ self.assertEqual(q2.reserved_quantity, 10)
+
def test_link_assign_1(self):
""" Test the assignment mechanism when two chained stock moves try to move one unit of an
untracked product.
@@ -1635,7 +1717,10 @@ class StockMove(TransactionCase):
# the second move should not be reservable because of the rounding on the dozen
move_pack_cust._action_assign()
- self.assertEqual(move_pack_cust.state, 'waiting')
+ self.assertEqual(move_pack_cust.state, 'partially_available')
+ move_line_pack_cust = move_pack_cust.move_line_ids
+ self.assertEqual(move_line_pack_cust.product_uom_qty, 6)
+ self.assertEqual(move_line_pack_cust.product_uom_id.id, self.uom_unit.id)
# move a dozen on the backorder to see how we handle the extra move
backorder = self.env['stock.picking'].search([('backorder_id', '=', picking_stock_pack.id)])
@@ -1663,6 +1748,152 @@ class StockMove(TransactionCase):
# the second move should now be reservable
move_pack_cust._action_assign()
self.assertEqual(move_pack_cust.state, 'assigned')
+ self.assertEqual(move_line_pack_cust.product_uom_qty, 12)
+ self.assertEqual(move_line_pack_cust.product_uom_id.id, self.uom_unit.id)
+ self.assertEqual(self.env['stock.quant']._get_available_quantity(self.product1, move_stock_pack.location_dest_id), 6)
+
+ def test_link_assign_8(self):
+ """ Set the rounding of the dozen to 1.0, create a chain of two move for a dozen, the product
+ concerned is tracked by serial number. Check that the flow is ok.
+ """
+ # on the dozen uom, set the rounding set 1.0
+ self.uom_dozen.rounding = 1
+
+ # 6 units are available in stock
+ for i in range(1, 13):
+ lot_id = self.env['stock.production.lot'].create({
+ 'name': 'lot%s' % str(i),
+ 'product_id': self.product2.id,
+ })
+ self.env['stock.quant']._update_available_quantity(self.product2, self.stock_location, 1.0, lot_id=lot_id)
+
+ # create pickings and moves for a pick -> pack mto scenario
+ picking_stock_pack = self.env['stock.picking'].create({
+ 'location_id': self.stock_location.id,
+ 'location_dest_id': self.pack_location.id,
+ 'picking_type_id': self.env.ref('stock.picking_type_internal').id,
+ })
+ move_stock_pack = self.env['stock.move'].create({
+ 'name': 'test_link_assign_7',
+ 'location_id': self.stock_location.id,
+ 'location_dest_id': self.pack_location.id,
+ 'product_id': self.product2.id,
+ 'product_uom': self.uom_dozen.id,
+ 'product_uom_qty': 1.0,
+ 'picking_id': picking_stock_pack.id,
+ })
+ picking_pack_cust = self.env['stock.picking'].create({
+ 'location_id': self.pack_location.id,
+ 'location_dest_id': self.customer_location.id,
+ 'picking_type_id': self.env.ref('stock.picking_type_out').id,
+ })
+ move_pack_cust = self.env['stock.move'].create({
+ 'name': 'test_link_assign_7',
+ 'location_id': self.pack_location.id,
+ 'location_dest_id': self.customer_location.id,
+ 'product_id': self.product2.id,
+ 'product_uom': self.uom_dozen.id,
+ 'product_uom_qty': 1.0,
+ 'picking_id': picking_pack_cust.id,
+ })
+ move_stock_pack.write({'move_dest_ids': [(4, move_pack_cust.id, 0)]})
+ move_pack_cust.write({'move_orig_ids': [(4, move_stock_pack.id, 0)]})
+ (move_stock_pack + move_pack_cust)._action_confirm()
+
+ move_stock_pack._action_assign()
+ self.assertEqual(move_stock_pack.state, 'assigned')
+ move_pack_cust._action_assign()
+ self.assertEqual(move_pack_cust.state, 'waiting')
+
+ for ml in move_stock_pack.move_line_ids:
+ ml.qty_done = 1
+ picking_stock_pack.button_validate()
+ self.assertEqual(move_pack_cust.state, 'assigned')
+ for ml in move_pack_cust.move_line_ids:
+ self.assertEqual(ml.product_uom_qty, 1)
+ self.assertEqual(ml.product_uom_id.id, self.uom_unit.id)
+ self.assertTrue(bool(ml.lot_id.id))
+
+ def test_link_assign_9(self):
+ """ Create an uom "3 units" which is 3 times the units but without rounding. Create 3
+ quants in stock and two chained moves. The first move will bring the 3 quants but the
+ second only validate 2 and create a backorder for the last one. Check that the reservation
+ is correctly cleared up for the last one.
+ """
+ uom_3units = self.env['product.uom'].create({
+ 'name': '3 units',
+ 'category_id': self.uom_unit.category_id.id,
+ 'factor_inv': 3,
+ 'rounding': 1,
+ })
+ for i in range(1, 4):
+ lot_id = self.env['stock.production.lot'].create({
+ 'name': 'lot%s' % str(i),
+ 'product_id': self.product2.id,
+ })
+ self.env['stock.quant']._update_available_quantity(self.product2, self.stock_location, 1.0, lot_id=lot_id)
+
+ picking_stock_pack = self.env['stock.picking'].create({
+ 'location_id': self.stock_location.id,
+ 'location_dest_id': self.pack_location.id,
+ 'picking_type_id': self.env.ref('stock.picking_type_internal').id,
+ })
+ move_stock_pack = self.env['stock.move'].create({
+ 'name': 'test_link_assign_9',
+ 'location_id': self.stock_location.id,
+ 'location_dest_id': self.pack_location.id,
+ 'product_id': self.product2.id,
+ 'product_uom': uom_3units.id,
+ 'product_uom_qty': 1.0,
+ 'picking_id': picking_stock_pack.id,
+ })
+ picking_pack_cust = self.env['stock.picking'].create({
+ 'location_id': self.pack_location.id,
+ 'location_dest_id': self.customer_location.id,
+ 'picking_type_id': self.env.ref('stock.picking_type_out').id,
+ })
+ move_pack_cust = self.env['stock.move'].create({
+ 'name': 'test_link_assign_0',
+ 'location_id': self.pack_location.id,
+ 'location_dest_id': self.customer_location.id,
+ 'product_id': self.product2.id,
+ 'product_uom': uom_3units.id,
+ 'product_uom_qty': 1.0,
+ 'picking_id': picking_pack_cust.id,
+ })
+ move_stock_pack.write({'move_dest_ids': [(4, move_pack_cust.id, 0)]})
+ move_pack_cust.write({'move_orig_ids': [(4, move_stock_pack.id, 0)]})
+ (move_stock_pack + move_pack_cust)._action_confirm()
+
+ picking_stock_pack.action_assign()
+ for ml in picking_stock_pack.move_lines.move_line_ids:
+ ml.qty_done = 1
+ picking_stock_pack.button_validate()
+ self.assertEqual(picking_pack_cust.state, 'assigned')
+ for ml in picking_pack_cust.move_lines.move_line_ids:
+ if ml.lot_id.name != 'lot3':
+ ml.qty_done = 1
+ res_dict_for_back_order = picking_pack_cust.button_validate()
+ backorder_wizard = self.env[(res_dict_for_back_order.get('res_model'))].browse(res_dict_for_back_order.get('res_id'))
+ backorder_wizard.with_context(debug=True).process()
+ backorder = self.env['stock.picking'].search([('backorder_id', '=', picking_pack_cust.id)])
+ backordered_ml = backorder.move_line_ids
+ quant_lot3 = self.env['stock.quant'].search([('lot_id', '=', backordered_ml.lot_id.id)])
+
+ # due to the rounding, the backordered quantity is 0.999 ; we shoudln't be able to reserve
+ # 0.999 on a tracked by serial number quant
+ self.assertEqual(backordered_ml.product_uom_qty, 0)
+ self.assertTrue(backordered_ml.lot_id)
+
+ # force the serial number and validate
+ backordered_ml.qty_done = 1
+
+ overprocessed_wizard = backorder.button_validate()
+ overprocessed_wizard = self.env['stock.overprocessed.transfer'].browse(overprocessed_wizard['res_id'])
+ overprocessed_wizard.action_confirm()
+
+ self.assertEqual(self.env['stock.quant']._get_available_quantity(self.product2, self.customer_location), 3)
+ self.assertEqual(self.env['stock.quant']._get_available_quantity(self.product2, self.pack_location), 0)
def test_use_unreserved_move_line_1(self):
""" Test that validating a stock move linked to an untracked product reserved by another one
@@ -3474,39 +3705,6 @@ class StockMove(TransactionCase):
self.assertEqual(self.product1.qty_available, 5.0)
self.assertEqual(self.product1.with_context(company_owned=True).qty_available, 10.0)
- def test_split_1(self):
- """ When we split a move line and having one without quantity done, we want to keep reservation
- on the new one as it has not been unreserved during the copy.
- """
- move1 = self.env['stock.move'].create({
- 'name': 'test_split_1',
- 'location_id': self.stock_location.id,
- 'location_dest_id': self.customer_location.id,
- 'product_id': self.product1.id,
- 'product_uom': self.uom_unit.id,
- 'product_uom_qty': 10.0,
- 'picking_type_id': self.env.ref('stock.picking_type_in').id,
- })
-
- self.env['stock.quant']._update_available_quantity(self.product1, self.stock_location, 10)
-
- move1._action_confirm()
- move1._action_assign()
- move_line = move1.move_line_ids
-
- default = {'product_uom_qty': 3,
- 'qty_done': 3}
- move_line.copy(default=default)
- move_line.with_context(bypass_reservation_update=True).write({'product_uom_qty': 7, 'qty_done': 0})
- move1._action_done()
-
- new_move = self.env['stock.move'].search([('name', '=', 'test_split_1'), ('state', '=', 'confirmed')])
-
- self.assertEqual(move1.move_line_ids.product_uom_qty, 0.0)
- self.assertEqual(move1.move_line_ids.qty_done, 3.0)
- self.assertEqual(new_move.move_line_ids.product_uom_qty, 7.0)
- self.assertEqual(new_move.move_line_ids.qty_done, 0.0)
-
def test_edit_initial_demand_1(self):
""" Increase initial demand once everything is reserved and check if
the existing move_line is updated.
diff --git a/addons/stock/tests/test_move2.py b/addons/stock/tests/test_move2.py
index 660aff0619d..53081b78761 100644
--- a/addons/stock/tests/test_move2.py
+++ b/addons/stock/tests/test_move2.py
@@ -1059,6 +1059,38 @@ class TestSinglePicking(TestStockCommon):
for move in delivery.move_lines:
self.assertEqual(move.quantity_done, move.product_uom_qty, 'Initial demand should be equals to quantity done')
+ def test_extra_move_5(self):
+ """ Create a picking a move that is problematic with
+ rounding (5.95 - 5.5 = 0.4500000000000002). Ensure that
+ initial demand is corrct afer action_done and backoder
+ are not created.
+ """
+ delivery = self.env['stock.picking'].create({
+ 'location_id': self.stock_location,
+ 'location_dest_id': self.customer_location,
+ 'partner_id': self.partner_delta_id,
+ 'picking_type_id': self.picking_type_out,
+ })
+ self.MoveObj.create({
+ 'name': self.productA.name,
+ 'product_id': self.productA.id,
+ 'product_uom_qty': 5.5,
+ 'quantity_done': 5.95,
+ 'product_uom': self.productA.uom_id.id,
+ 'picking_id': delivery.id,
+ 'location_id': self.stock_location,
+ 'location_dest_id': self.customer_location,
+ })
+ stock_location = self.env['stock.location'].browse(self.stock_location)
+ self.env['stock.quant']._update_available_quantity(self.productA, stock_location, 5.5)
+ delivery.action_confirm()
+ delivery.action_assign()
+ delivery.action_done()
+ self.assertEqual(delivery.move_lines.product_uom_qty, 5.95, 'Move initial demand should be 5.95')
+
+ back_order = self.env['stock.picking'].search([('backorder_id', '=', delivery.id)])
+ self.assertFalse(back_order, 'There should be no back order')
+
def test_recheck_availability_1(self):
""" Check the good behavior of check availability. I create a DO for 2 unit with
only one in stock. After the first check availability, I should have 1 reserved
diff --git a/addons/stock_account/i18n/tr.po b/addons/stock_account/i18n/tr.po
index 28995f7d032..e35c1661e90 100644
--- a/addons/stock_account/i18n/tr.po
+++ b/addons/stock_account/i18n/tr.po
@@ -11,13 +11,14 @@
# gezgin biri , 2017
# Ahmet Altinisik , 2017
# Fırat Kaya , 2017
+# Umur Akın , 2018
msgid ""
msgstr ""
"Project-Id-Version: Odoo Server saas~11.2\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2018-03-22 14:09+0000\n"
"PO-Revision-Date: 2018-03-22 14:09+0000\n"
-"Last-Translator: Fırat Kaya , 2017\n"
+"Last-Translator: Umur Akın , 2018\n"
"Language-Team: Turkish (https://www.transifex.com/odoo/teams/41243/tr/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -33,7 +34,7 @@ msgstr "Muhasebe Kaydı"
#. module: stock_account
#: model:ir.model.fields,field_description:stock_account.field_stock_move__account_move_ids
msgid "Account Move"
-msgstr ""
+msgstr "Hesap Hareketi"
#. module: stock_account
#: model:ir.ui.view,arch_db:stock_account.view_category_property_form
@@ -61,13 +62,13 @@ msgstr ""
#. module: stock_account
#: selection:product.category,property_valuation:0
msgid "Automated"
-msgstr ""
+msgstr "Otomatikleşmiş"
#. module: stock_account
#: selection:product.category,property_cost_method:0
#: selection:product.template,property_cost_method:0
msgid "Average Cost (AVCO)"
-msgstr ""
+msgstr "Ortalama Maliyet (AVCO)"
#. module: stock_account
#: model:ir.ui.view,arch_db:stock_account.view_change_standard_price
@@ -114,6 +115,8 @@ msgid ""
"Changing your cost method is an important change that will impact your "
"inventory valuation. Are you sure you want to make that change?"
msgstr ""
+"Maliyet yönteminizi değiştirmek, stok değerlerinize önemli etki yapabilecek "
+"bir değişikliktir."
#. module: stock_account
#: model:ir.model.fields,help:stock_account.field_stock_inventory__accounting_date
@@ -148,7 +151,7 @@ msgstr "Maliyet Yöntemi"
#. module: stock_account
#: model:ir.ui.view,arch_db:stock_account.res_config_settings_view_form
msgid "Costing"
-msgstr ""
+msgstr "Malyetlendirme"
#. module: stock_account
#: model:ir.model.fields,field_description:stock_account.field_product_category__property_cost_method
@@ -196,7 +199,7 @@ msgstr "Görünüm Adı"
#: selection:product.category,property_cost_method:0
#: selection:product.template,property_cost_method:0
msgid "First In First Out (FIFO)"
-msgstr ""
+msgstr "First in First Out (FIFO)"
#. module: stock_account
#: model:ir.model.fields,field_description:stock_account.field_stock_inventory__accounting_date
@@ -220,7 +223,7 @@ msgstr ""
#. module: stock_account
#: model:ir.actions.act_window,help:stock_account.product_valuation_action
msgid "If there are products, you will see its name and valuation."
-msgstr ""
+msgstr "Eğer burada ürünler varsa, adını ve değerini göreceksiniz."
#. module: stock_account
#: model:ir.ui.view,arch_db:stock_account.res_config_settings_view_form
@@ -290,6 +293,7 @@ msgid ""
"Manual: The accounting entries to value the inventory are not posted automatically.\n"
" Automated: An accounting entry is automatically created to value the inventory when a product enters or leaves the company."
msgstr ""
+"Manuel: Stok değer veren muhasebe kayıtları,otomatik olarak postalanmaz."
#. module: stock_account
#: model:ir.model.fields,help:stock_account.field_product_category__property_valuation
@@ -298,6 +302,8 @@ msgid ""
" Automated: An accounting entry is automatically created to value the inventory when a product enters or leaves the company.\n"
" "
msgstr ""
+"Manuel: Stok değeri veren muhasebe kayıtları,otomatik olarak postalanmaz. \n"
+"Otomatik: Bir ürün şirkete girdiğinde veya şirketten ayrıldığında envantere değer vermek için otomatik olarak bir muhasebe girişi oluşturulur. "
#. module: stock_account
#: model:ir.ui.view,arch_db:stock_account.view_move_tree_valuation
@@ -412,6 +418,7 @@ msgid ""
" Average Cost (AVCO): The products are valued at weighted average cost.\n"
" First In First Out (FIFO): The products are valued supposing those that enter the company first will also leave it first."
msgstr ""
+"Standart Fiyat : Ürünler tanımlanan standart maliyetlerine göre değerlenir."
#. module: stock_account
#: model:ir.model.fields,help:stock_account.field_product_category__property_cost_method
@@ -421,6 +428,9 @@ msgid ""
" First In First Out (FIFO): The products are valued supposing those that enter the company first will also leave it first.\n"
" "
msgstr ""
+"Standart Fiyat : Ürünler tanımlanan standart maliyetlerine göre değerlenir.\n"
+"Ortalama Maliyet (AVCO): Ürünler ağırlıklı ortalama maliyetine göre değerlenir.\n"
+"First in First Out (FIFO): Ürünler, şirkete önce girenlerin, ilk önce de bırakacaklarını var sayar."
#. module: stock_account
#: model:ir.model.fields,field_description:stock_account.field_product_category__property_stock_account_input_categ_id
@@ -461,7 +471,7 @@ msgstr "Stok Çıkış Hesabı"
#: model:ir.ui.view,arch_db:stock_account.view_move_tree_valuation
#: model:ir.ui.view,arch_db:stock_account.view_template_property_form
msgid "Stock Valuation"
-msgstr ""
+msgstr "Stok Değerleme"
#. module: stock_account
#: model:ir.model.fields,field_description:stock_account.field_product_category__property_stock_valuation_account_id
@@ -481,7 +491,7 @@ msgstr "Stok Değerleme Hesabı (Çıkan)"
#. module: stock_account
#: model:ir.actions.server,name:stock_account.action_stock_account_valuation_report
msgid "Stock Valuation Report"
-msgstr ""
+msgstr "Stok Değerleme Raporu"
#. module: stock_account
#: model:ir.model,name:stock_account.model_account_chart_template
@@ -503,6 +513,8 @@ msgid ""
"The move lines are not in a consistent state: some are entering and other "
"are leaving the company. "
msgstr ""
+"Hareket satırları istikrarlı bir durumda değildir: Bazıları girilir, "
+"diğerleri şirketten ayrılır."
#. module: stock_account
#: code:addons/stock_account/models/stock.py:343
@@ -512,6 +524,9 @@ msgid ""
"intercompany in a single step while they should go through the intercompany "
"transit location."
msgstr ""
+"Hareket çizgileri tutarlı bir durumda değil: şirketler arası geçiş "
+"konumundan geçmeleri gerektiğinde tek bir adımda şirketler arası ilişkiler "
+"yapıyorlar."
#. module: stock_account
#: code:addons/stock_account/models/stock.py:341
@@ -520,12 +535,14 @@ msgid ""
"The move lines are not in a consistent states: they do not share the same "
"origin or destination company."
msgstr ""
+"Hareket satırları istikrarlı bir durumda değil: aynı başlangıcı ya da hedefi"
+" paylaşmıyorlar. "
#. module: stock_account
#: model:ir.model.fields,field_description:stock_account.field_stock_move__to_refund
#: model:ir.model.fields,field_description:stock_account.field_stock_return_picking_line__to_refund
msgid "To Refund (update SO/PO)"
-msgstr ""
+msgstr "İade (Satış/Satın Alma Siparişlerinde İade)"
#. module: stock_account
#: model:ir.ui.view,arch_db:stock_account.product_valuation_tree
@@ -539,6 +556,8 @@ msgid ""
"Trigger a decrease of the delivered/received quantity in the associated Sale"
" Order/Purchase Order"
msgstr ""
+"ilişkili Satış/Satın Alma Siparişinde ki teslimat/alınan miktarındaki düşüşü"
+" tetikle."
#. module: stock_account
#: model:ir.ui.view,arch_db:stock_account.view_move_tree_valuation
@@ -548,7 +567,7 @@ msgstr "Ölçü Birimi"
#. module: stock_account
#: model:ir.ui.view,arch_db:stock_account.view_template_property_form
msgid "Update Cost"
-msgstr ""
+msgstr "Maliyeti Güncelle"
#. module: stock_account
#: model:ir.model.fields,help:stock_account.field_stock_location__valuation_in_account_id
diff --git a/addons/stock_account/models/stock.py b/addons/stock_account/models/stock.py
index 60f534bf298..039a934d1bf 100644
--- a/addons/stock_account/models/stock.py
+++ b/addons/stock_account/models/stock.py
@@ -260,7 +260,7 @@ class StockMove(models.Model):
# Update the standard price with the price of the last used candidate, if any.
if new_standard_price and move.product_id.cost_method == 'fifo':
- move.product_id.standard_price = new_standard_price
+ move.product_id.sudo().standard_price = new_standard_price
# If there's still quantity to value but we're out of candidates, we fall in the
# negative stock use case. We chose to value the out move at the price of the
@@ -312,7 +312,9 @@ class StockMove(models.Model):
self.write(vals)
elif self._is_out():
valued_move_lines = self.move_line_ids.filtered(lambda ml: ml.location_id._should_be_valued() and not ml.location_dest_id._should_be_valued() and not ml.owner_id)
- valued_quantity = sum(valued_move_lines.mapped('qty_done'))
+ valued_quantity = 0
+ for valued_move_line in valued_move_lines:
+ valued_quantity += valued_move_line.product_uom_id._compute_quantity(valued_move_line.qty_done, self.product_id.uom_id)
self.env['stock.move']._run_fifo(self, quantity=quantity)
if self.product_id.cost_method in ['standard', 'average']:
curr_rounding = self.company_id.currency_id.rounding
@@ -523,17 +525,6 @@ class StockMove(models.Model):
raise UserError(_("The cost of %s is currently equal to 0. Change the cost or the configuration of your product to avoid an incorrect valuation.") % (self.product_id.name,))
credit_value = debit_value
- if self.product_id.cost_method == 'average' and self.company_id.anglo_saxon_accounting:
- # in case of a supplier return in anglo saxon mode, for products in average costing method, the stock_input
- # account books the real purchase price, while the stock account books the average price. The difference is
- # booked in the dedicated price difference account.
- if self.location_dest_id.usage == 'supplier' and self.origin_returned_move_id and self.origin_returned_move_id.purchase_line_id:
- debit_value = self.origin_returned_move_id.price_unit * qty
- # in case of a customer return in anglo saxon mode, for products in average costing method, the stock valuation
- # is made using the original average price to negate the delivery effect.
- if self.location_id.usage == 'customer' and self.origin_returned_move_id:
- debit_value = self.origin_returned_move_id.price_unit * qty
- credit_value = debit_value
valuation_partner_id = self._get_partner_id_for_valuation_lines()
res = [(0, 0, line_vals) for line_vals in self._generate_valuation_lines_data(valuation_partner_id, qty, debit_value, credit_value, debit_account_id, credit_account_id).values()]
@@ -617,7 +608,7 @@ class StockMove(models.Model):
move_lines = self.with_context(forced_ref=ref)._prepare_account_move_line(quantity, abs(self.value), credit_account_id, debit_account_id)
if move_lines:
date = self._context.get('force_period_date', fields.Date.context_today(self))
- new_account_move = AccountMove.create({
+ new_account_move = AccountMove.sudo().create({
'journal_id': journal_id,
'line_ids': move_lines,
'date': date,
diff --git a/addons/stock_landed_costs/i18n/tr.po b/addons/stock_landed_costs/i18n/tr.po
index 9da45985e24..f65bb56ac38 100644
--- a/addons/stock_landed_costs/i18n/tr.po
+++ b/addons/stock_landed_costs/i18n/tr.po
@@ -12,13 +12,14 @@
# Ahmet Altinisik , 2017
# Ramiz Deniz Öner , 2017
# Güven YILMAZ , 2017
+# Umur Akın , 2018
msgid ""
msgstr ""
"Project-Id-Version: Odoo Server saas~11.2\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2018-03-22 14:10+0000\n"
"PO-Revision-Date: 2018-03-22 14:10+0000\n"
-"Last-Translator: Güven YILMAZ , 2017\n"
+"Last-Translator: Umur Akın , 2018\n"
"Language-Team: Turkish (https://www.transifex.com/odoo/teams/41243/tr/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -112,6 +113,8 @@ msgid ""
"Cost and adjustments lines do not match. You should maybe recompute the "
"landed costs."
msgstr ""
+"Maliyet ve ayarlama satırları eşleşmiyor. Belki de teslim alma maliyetlerini"
+" yeniden hesaplamalısınız."
#. module: stock_landed_costs
#: model:ir.actions.act_window,help:stock_landed_costs.action_stock_landed_cost
@@ -183,6 +186,11 @@ msgid ""
"By Weight : Cost will be divided depending on its weight.\n"
"By Volume : Cost will be divided depending on its volume."
msgstr ""
+"Eşit: Maliyet eşit olarak ayrılır.\n"
+"Miktar: Maliyet ürünlerin miktarına göre ayrılır.\n"
+"Mevcut Maliyet: Maliyet ürünlerin mevcut maliyetine göre ayrılır.\n"
+"Ağırlık: Maliyet ağırlığa bağlı olarak ayrılır.\n"
+"Hacim: Maliyet hacme bağlı olarak ayrılır."
#. module: stock_landed_costs
#: model:ir.model.fields,field_description:stock_landed_costs.field_stock_valuation_adjustment_lines__final_cost
@@ -225,7 +233,7 @@ msgstr "Envanter Değeri"
#: model:ir.model.fields,field_description:stock_landed_costs.field_product_product__landed_cost_ok
#: model:ir.model.fields,field_description:stock_landed_costs.field_product_template__landed_cost_ok
msgid "Is a Landed Cost"
-msgstr ""
+msgstr "Bir maliyet yüklemesi mi"
#. module: stock_landed_costs
#: model:ir.model.fields,field_description:stock_landed_costs.field_stock_landed_cost__description
@@ -320,6 +328,8 @@ msgstr "Yeni"
msgid ""
"No valuation adjustments lines. You should maybe recompute the landed costs."
msgstr ""
+"Değerleme ayarlama satırı yok. Belki maliyet yüklemeyi tekrar "
+"hesaplamalısınız."
#. module: stock_landed_costs
#: code:addons/stock_landed_costs/models/stock_landed_cost.py:87
@@ -417,6 +427,10 @@ msgid ""
" time valuation with real price costing method. Please make sure it is the "
"case, or you selected the correct picking"
msgstr ""
+"Seçilen toplama maliyet yüklemeye etki edebilen bir hareket içermez. Maliyet"
+" yükleme, sadece gerçek zamanlı fiyat yöntemi ile gerçek zamanlı "
+"değerlemenin ürün yapılandırması ile mümkündür. Lütfen durumun doğru "
+"olduğundan veya doğru toplamayı seçtiğinizden emin olun ."
#. module: stock_landed_costs
#: model:ir.model.fields,field_description:stock_landed_costs.field_stock_landed_cost__amount_total
diff --git a/addons/stock_picking_batch/i18n/tr.po b/addons/stock_picking_batch/i18n/tr.po
index b7359c9f7a7..b3cdbdccff0 100644
--- a/addons/stock_picking_batch/i18n/tr.po
+++ b/addons/stock_picking_batch/i18n/tr.po
@@ -9,13 +9,14 @@
# Martin Trigaux, 2017
# Güven YILMAZ , 2017
# Ramiz Deniz Öner , 2017
+# Umur Akın , 2018
msgid ""
msgstr ""
"Project-Id-Version: Odoo Server saas~11.2\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2018-03-22 14:10+0000\n"
"PO-Revision-Date: 2018-03-22 14:10+0000\n"
-"Last-Translator: Ramiz Deniz Öner , 2017\n"
+"Last-Translator: Umur Akın , 2018\n"
"Language-Team: Turkish (https://www.transifex.com/odoo/teams/41243/tr/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -38,7 +39,7 @@ msgstr "Transferleri toplu transfere ekle"
#: model:ir.actions.act_window,name:stock_picking_batch.stock_picking_to_batch_action_stock_picking
#: model:ir.ui.view,arch_db:stock_picking_batch.stock_picking_to_batch_form
msgid "Add to Batch"
-msgstr ""
+msgstr "Toplu İş Ekleyin"
#. module: stock_picking_batch
#: model:ir.ui.view,arch_db:stock_picking_batch.view_picking_internal_search_inherit_stock_picking_batch
@@ -205,7 +206,7 @@ msgstr "Bu toplu transferden sorumlu kişi"
#. module: stock_picking_batch
#: model:ir.model.fields,field_description:stock_picking_batch.field_stock_immediate_transfer__pick_to_backorder_ids
msgid "Pick To Backorder"
-msgstr ""
+msgstr "Ön Siparişleri Topla"
#. module: stock_picking_batch
#: model:ir.model.fields,help:stock_picking_batch.field_stock_immediate_transfer__pick_to_backorder_ids
@@ -241,7 +242,7 @@ msgstr "Toplu Transfer Ara"
#. module: stock_picking_batch
#: model:ir.ui.view,arch_db:stock_picking_batch.stock_picking_to_batch_form
msgid "Select a batch"
-msgstr ""
+msgstr "Bir Toplu İş Seç"
#. module: stock_picking_batch
#: code:addons/stock_picking_batch/models/stock_picking_batch.py:59
@@ -250,6 +251,8 @@ msgid ""
"Some pickings are still waiting for goods. Please check or force their "
"availability before setting this batch to done."
msgstr ""
+"Bazı toplamalar hala malzemeler için bekliyor. Lütfen bu toplu işlemi "
+"tamamlandı yapmadan önce uyumluluğunu kontrol edin veya zorlayın."
#. module: stock_picking_batch
#: code:addons/stock_picking_batch/models/stock_picking_batch.py:77
@@ -287,6 +290,10 @@ msgid ""
" It may also be useful to assign jobs (one person = one batch) or\n"
" help the timing management of operations (tasks to be done at 1pm)."
msgstr ""
+"Toplu transferlerin amacı birlikte tamamlanan olarak grup operasyon "
+"verimliliklerini arttırmaktır. Bu personele iş atamalarında ya da "
+"operasyonların zaman yönetiminde kullanışlı olabilir (saat 1 de bitti olarak"
+" görevlendir)."
#. module: stock_picking_batch
#: model:ir.model,name:stock_picking_batch.model_stock_picking
diff --git a/addons/survey/i18n/fr.po b/addons/survey/i18n/fr.po
index 7de065546cd..e8adefac7d0 100644
--- a/addons/survey/i18n/fr.po
+++ b/addons/survey/i18n/fr.po
@@ -1598,7 +1598,7 @@ msgstr "Ce sondage n'est ouvert qu'aux utilisateurs enregistrés. Veuillez "
#: model:ir.model.fields,field_description:survey.field_survey_survey__title
#: model:ir.ui.view,arch_db:survey.survey_survey_view_search
msgid "Title"
-msgstr "Civilité"
+msgstr "Titre"
#. module: survey
#: model:ir.ui.view,arch_db:survey.survey_survey_view_search
diff --git a/addons/survey/i18n/tr.po b/addons/survey/i18n/tr.po
index 06576205c1e..6b65dfade66 100644
--- a/addons/survey/i18n/tr.po
+++ b/addons/survey/i18n/tr.po
@@ -14,13 +14,14 @@
# Fırat Kaya , 2017
# Saban Yildiz , 2017
# Ahmet Altinisik , 2017
+# Umur Akın , 2018
msgid ""
msgstr ""
"Project-Id-Version: Odoo Server saas~11.2\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2018-03-22 14:11+0000\n"
"PO-Revision-Date: 2018-03-22 14:11+0000\n"
-"Last-Translator: Ahmet Altinisik , 2017\n"
+"Last-Translator: Umur Akın , 2018\n"
"Language-Team: Turkish (https://www.transifex.com/odoo/teams/41243/tr/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -207,6 +208,8 @@ msgid ""
"A positive score indicates a correct choice; a negative or null score "
"indicates a wrong answer"
msgstr ""
+"Bir pozitif skor doğru seçimi gösterir; bir negatif ya da sıfır puan yanlış "
+"bir cevabı gösterir."
#. module: survey
#: model:ir.ui.view,arch_db:survey.page
@@ -235,6 +238,8 @@ msgid ""
"Add a list of email of recipients (will not be converted into contacts). "
"Separated by commas, semicolons or newline..."
msgstr ""
+"Alıcıların e-postalarının bir listesini ekleyin ( kişiye dönüştürülemez). "
+"Virgül, noktalı virgül veya satır sonu ile ayrılmış ."
#. module: survey
#: model:ir.actions.act_window,help:survey.action_survey_form
@@ -244,7 +249,7 @@ msgstr ""
#. module: survey
#: model:ir.ui.view,arch_db:survey.survey_email_compose_message
msgid "Add existing contacts..."
-msgstr ""
+msgstr "Varolan kişileri ekle"
#. module: survey
#: model:ir.ui.view,arch_db:survey.survey_question_form
@@ -317,7 +322,7 @@ msgstr "İptal"
#. module: survey
#: model:ir.ui.view,arch_db:survey.survey_question_form
msgid "Choices"
-msgstr ""
+msgstr "Seçimler"
#. module: survey
#: model:ir.ui.view,arch_db:survey.simple_choice
@@ -464,6 +469,8 @@ msgid ""
"Deadline to which the invitation to respond for this survey is valid. If the"
" field is empty, the invitation is still valid."
msgstr ""
+"Bu anket için yanıt vermek için davet geçerli olduğu son tarih. Alan boşsa, "
+"davet hala geçerli."
#. module: survey
#: model:ir.model.fields,field_description:survey.field_survey_mail_compose_message__date_deadline
@@ -490,7 +497,7 @@ msgstr "Tasarım"
#. module: survey
#: model:ir.ui.view,arch_db:survey.survey_form
msgid "Design Survey"
-msgstr ""
+msgstr "Anket Tasarla"
#. module: survey
#: model:ir.actions.act_window,help:survey.action_survey_form
@@ -498,6 +505,8 @@ msgid ""
"Design easily your survey, send invitations to answer by email and analyse "
"answers."
msgstr ""
+"Anketinizi kolayca tasarlayın, e-mail ile cevaplamak üzere davet gönderin ve"
+" cevapları analiz edin."
#. module: survey
#: model:ir.model.fields,field_description:survey.field_survey_question__display_mode
@@ -661,7 +670,7 @@ msgstr "Davetiyeler gönderildi"
#. module: survey
#: model:ir.model.fields,field_description:survey.field_survey_survey__is_closed
msgid "Is closed"
-msgstr ""
+msgstr "Kapalı"
#. module: survey
#: model:ir.model.fields,field_description:survey.field_survey_survey__designed
@@ -820,7 +829,7 @@ msgstr "En küçük değer"
#. module: survey
#: selection:survey.question,type:0
msgid "Multiple Lines Text Box"
-msgstr ""
+msgstr "Çok Satırlı Metin Kutusu"
#. module: survey
#: selection:survey.question,type:0
@@ -1066,7 +1075,7 @@ msgstr "Soru"
#. module: survey
#: model:ir.model.fields,field_description:survey.field_survey_label__question_id_2
msgid "Question 2"
-msgstr ""
+msgstr "Soru 2"
#. module: survey
#: model:ir.model.fields,field_description:survey.field_survey_question__question
@@ -1091,12 +1100,12 @@ msgstr "Sorular"
#. module: survey
#: model:ir.model.fields,field_description:survey.field_survey_survey__quizz_mode
msgid "Quizz Mode"
-msgstr ""
+msgstr "Quiz Modu"
#. module: survey
#: selection:survey.question,display_mode:0
msgid "Radio Buttons"
-msgstr ""
+msgstr "Radyo Düğmesi"
#. module: survey
#: model:ir.model.fields,field_description:survey.field_survey_survey__result_url
@@ -1111,17 +1120,17 @@ msgstr "Satır cevap"
#. module: survey
#: model:ir.ui.view,arch_db:survey.survey_question_form
msgid "Row1"
-msgstr ""
+msgstr "Satır 1"
#. module: survey
#: model:ir.ui.view,arch_db:survey.survey_question_form
msgid "Row2"
-msgstr ""
+msgstr "Satır 2"
#. module: survey
#: model:ir.ui.view,arch_db:survey.survey_question_form
msgid "Row3"
-msgstr ""
+msgstr "Satır 3"
#. module: survey
#: model:ir.ui.view,arch_db:survey.survey_question_form
@@ -1151,12 +1160,12 @@ msgstr "Test için Puan"
#. module: survey
#: model:ir.model.fields,field_description:survey.field_survey_label__quizz_mark
msgid "Score for this choice"
-msgstr ""
+msgstr "Bu seçim için puan"
#. module: survey
#: model:ir.model.fields,field_description:survey.field_survey_user_input_line__quizz_mark
msgid "Score given for this choice"
-msgstr ""
+msgstr "Verilen bu seçeneğin skoru"
#. module: survey
#: model:ir.ui.view,arch_db:survey.survey_label_search
@@ -1255,7 +1264,7 @@ msgstr "Bir sonraki eylem tarihi bugünden önce olan tüm kayıtları göster"
#. module: survey
#: selection:survey.question,type:0
msgid "Single Line Text Box"
-msgstr ""
+msgstr "Tek Satırlı Metin Kutusu"
#. module: survey
#: model:ir.model.fields,field_description:survey.field_survey_user_input_line__skipped
@@ -1408,7 +1417,7 @@ msgstr "Anket Sayfası"
#. module: survey
#: model:ir.actions.server,name:survey.survey_action_server_clean_test_answers
msgid "Survey: Clean test answers"
-msgstr ""
+msgstr "Anket: Test cevaplarını temizle"
#. module: survey
#: model:ir.actions.act_window,name:survey.action_survey_form
@@ -1492,7 +1501,7 @@ msgstr "Bu cevap e-posta adresi olmalıdır."
#: code:addons/survey/tests/test_survey.py:107
#, python-format
msgid "This is not a date"
-msgstr ""
+msgstr "Bu bir tarih değildir."
#. module: survey
#: code:addons/survey/models/survey.py:564
@@ -1507,6 +1516,8 @@ msgid ""
"This list of emails of recipients will not be converted in contacts. "
"Emails must be separated by commas, semicolons or newline."
msgstr ""
+"Alıcıların bu e-mail listesi kişilere dönüştürülemez. E-postalar virgül, "
+"noktalı virgül yada satır başı ile ayrılmalıdır."
#. module: survey
#: model:ir.model.fields,help:survey.field_survey_survey__thank_you_message
@@ -1568,7 +1579,7 @@ msgstr "Yanıt türleri"
#. module: survey
#: model:ir.ui.view,arch_db:survey.survey_survey_view_search
msgid "Upcoming Activities"
-msgstr ""
+msgstr "Yaklaşan Aktiviteler"
#. module: survey
#: model:ir.ui.view,arch_db:survey.survey_email_compose_message
@@ -1579,7 +1590,7 @@ msgstr "Şablonu Kullan"
#: model:ir.model.fields,help:survey.field_survey_question__description
msgid ""
"Use this field to add additional explanations about your question"
-msgstr ""
+msgstr "Sorunuz hakkında ek açıklamalar eklemek için bu alanı kullanın"
#. module: survey
#: model:res.groups,name:survey.group_survey_user
@@ -1641,7 +1652,7 @@ msgstr "Girdisini doğrulamak"
#. module: survey
#: model:ir.model.fields,field_description:survey.field_survey_question__validation_error_msg
msgid "Validation Error message"
-msgstr ""
+msgstr "Doğrulama hatası mesajı"
#. module: survey
#: model:ir.ui.view,arch_db:survey.survey_user_input_form
@@ -1672,6 +1683,9 @@ msgid ""
"feedback, recruitment interviews, employee's periodical evaluations, "
"marketing campaigns, etc."
msgstr ""
+"Farklı amaçlar için anketler oluşturabilirsin: müşteri görüşleri, servis "
+"geri bildirimleri, işe alım görüşmeleri, periyodik personel "
+"değerlendirmeleri, pazarlama kampanyaları gibi."
#. module: survey
#: model:ir.ui.view,arch_db:survey.survey_email_compose_message
@@ -1681,6 +1695,10 @@ msgid ""
"want with the public web link (in this case, the \"Login Required\" setting "
"must be disabled)."
msgstr ""
+"Anketinizin web linkini genele ve/veya özel davetle ilgili kişiye "
+"paylaşabilirsiniz. İnsanlar, davet başına bir kez cevap verebilir ve genel "
+"web linki ile istedikleri zaman cevap verebilirler ( bu durumda, 'Üye Girişi"
+" Gereklidir' uyarısı pasif yapılmalıdır)"
#. module: survey
#: code:addons/survey/models/survey.py:315
@@ -1702,7 +1720,7 @@ msgstr "Seni attı"
#. module: survey
#: model:ir.ui.view,arch_db:survey.survey_question_form
msgid "ans"
-msgstr ""
+msgstr "cevap"
#. module: survey
#: model:ir.model,name:survey.model_ir_autovacuum
diff --git a/addons/utm/i18n/nl.po b/addons/utm/i18n/nl.po
index be50e48c0f6..4e6816d3cf3 100644
--- a/addons/utm/i18n/nl.po
+++ b/addons/utm/i18n/nl.po
@@ -227,7 +227,7 @@ msgid ""
" e.g. Fall_Drive, Christmas_Special"
msgstr ""
"Dit is een naam die u helpt bij het volgen van uw verschillende campagne "
-"inspanningen, bijvoorbeeld Herst_Rit, Kerstmis_Special"
+"inspanningen, bijvoorbeeld Herfst_Rit, Kerstmis_Special"
#. module: utm
#: model:ir.model.fields,help:utm.field_account_invoice__medium_id
diff --git a/addons/utm/i18n/tr.po b/addons/utm/i18n/tr.po
index 7ac76c78f80..d3346a943e8 100644
--- a/addons/utm/i18n/tr.po
+++ b/addons/utm/i18n/tr.po
@@ -10,13 +10,14 @@
# Murat Kaplan , 2017
# Ayhan KIZILTAN , 2017
# Ramiz Deniz Öner , 2017
+# Umur Akın , 2018
msgid ""
msgstr ""
"Project-Id-Version: Odoo Server saas~11.2\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2018-03-22 14:10+0000\n"
"PO-Revision-Date: 2018-03-22 14:10+0000\n"
-"Last-Translator: Ramiz Deniz Öner , 2017\n"
+"Last-Translator: Umur Akın , 2018\n"
"Language-Team: Turkish (https://www.transifex.com/odoo/teams/41243/tr/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -228,6 +229,8 @@ msgid ""
"This is a name that helps you keep track of your different campaign efforts,"
" e.g. Fall_Drive, Christmas_Special"
msgstr ""
+"Farklı kampanya çabalarınızı izlemenize yardımcı olacak bir isimdir Örn: "
+"Sonbahar_Sürüşü, Yılbaşı_Özel"
#. module: utm
#: model:ir.model.fields,help:utm.field_account_invoice__medium_id
@@ -237,7 +240,7 @@ msgstr ""
#: model:ir.model.fields,help:utm.field_sale_order__medium_id
#: model:ir.model.fields,help:utm.field_utm_mixin__medium_id
msgid "This is the method of delivery, e.g. Postcard, Email, or Banner Ad"
-msgstr ""
+msgstr "Bu teslimat yöntemidir. örn: Postakartı, Eposta yada Banner reklamı"
#. module: utm
#: model:ir.model.fields,help:utm.field_account_invoice__source_id
@@ -250,6 +253,8 @@ msgid ""
"This is the source of the link, e.g. Search Engine, another domain, or name "
"of email list"
msgstr ""
+"Bu bağlantı kaynağıdır. örn: Arama Motoru, başka alan adı yada bir e-posta "
+"listesi adı"
#. module: utm
#: model:utm.source,name:utm.utm_source_twitter
@@ -259,9 +264,9 @@ msgstr "Twitter"
#. module: utm
#: model:ir.ui.menu,name:utm.marketing_utm
msgid "UTMs"
-msgstr ""
+msgstr "UTMs"
#. module: utm
#: model:ir.model,name:utm.model_utm_mixin
msgid "utm.mixin"
-msgstr ""
+msgstr "utm.mixin"
diff --git a/addons/web/i18n/nl.po b/addons/web/i18n/nl.po
index 9b960e441ac..068c20c10e5 100644
--- a/addons/web/i18n/nl.po
+++ b/addons/web/i18n/nl.po
@@ -333,7 +333,7 @@ msgstr "Conditie toevoegen"
#: code:addons/web/static/src/xml/kanban.xml:44
#, python-format
msgid "Add a new Column"
-msgstr ""
+msgstr "Nieuwe kolom toevoegen"
#. module: web
#. openerp-web
diff --git a/addons/web/i18n/tr.po b/addons/web/i18n/tr.po
index fca1a956f29..3b883a5c214 100644
--- a/addons/web/i18n/tr.po
+++ b/addons/web/i18n/tr.po
@@ -52,7 +52,7 @@ msgstr " [Bana]"
#: code:addons/web/static/src/js/chrome/search_filters.js:226
#, python-format
msgid " and "
-msgstr ""
+msgstr "ve"
#. module: web
#. openerp-web
@@ -218,7 +218,7 @@ msgstr "(etiketyok)"
#: code:addons/web/static/src/js/fields/field_utils.js:256
#, python-format
msgid "1 record"
-msgstr ""
+msgstr "1 kayıt"
#. module: web
#: model:ir.ui.view,arch_db:web.menu_secondary
@@ -244,14 +244,14 @@ msgstr ""
#: code:addons/web/static/src/xml/base.xml:604
#, python-format
msgid "ALL"
-msgstr ""
+msgstr "Tümü"
#. module: web
#. openerp-web
#: code:addons/web/static/src/xml/base.xml:605
#, python-format
msgid "ANY"
-msgstr ""
+msgstr "Hiçbiri"
#. module: web
#. openerp-web
@@ -300,7 +300,7 @@ msgstr "Etkinleştir"
#: code:addons/web/static/src/xml/base.xml:228
#, python-format
msgid "Activate Assets Debugging"
-msgstr ""
+msgstr "Varlıklar Ayıklamasını Etkinleştir"
#. module: web
#. openerp-web
@@ -361,21 +361,21 @@ msgstr "Özelleşmiş grup ekle"
#: code:addons/web/static/src/xml/base.xml:612
#, python-format
msgid "Add filter"
-msgstr ""
+msgstr "Filtre ekle"
#. module: web
#. openerp-web
#: code:addons/web/static/src/xml/base.xml:672
#, python-format
msgid "Add new value"
-msgstr ""
+msgstr "Yeni değer ekle"
#. module: web
#. openerp-web
#: code:addons/web/static/src/js/fields/basic_fields.js:1578
#, python-format
msgid "Add to Favorites"
-msgstr ""
+msgstr "Favorilerinize Ekleyin"
#. module: web
#. openerp-web
@@ -433,7 +433,7 @@ msgstr "Tüm kullanıcılar"
#: code:addons/web/static/src/xml/base.xml:145
#, python-format
msgid "An error occurred"
-msgstr ""
+msgstr "Bir hata oluştu"
#. module: web
#. openerp-web
@@ -443,6 +443,8 @@ msgid ""
"An unknown CORS error occured. The error probably originates from a "
"JavaScript file served from a different origin."
msgstr ""
+"Bilinmeyen bir CORS hatası oluştur. Hata muhtemelen farklı orijinlerden "
+"hizmet veren JavaScript dosyalarından dolayı oluştu."
#. module: web
#. openerp-web
@@ -595,7 +597,7 @@ msgstr "İptal"
#: code:addons/web/static/src/js/views/graph/graph_renderer.js:70
#, python-format
msgid "Cannot render chart with mode : "
-msgstr ""
+msgstr "Mod ile çizelge oluşturulamaz: "
#. module: web
#. openerp-web
@@ -713,7 +715,7 @@ msgstr "Kopyalandı!"
#: code:addons/web/static/src/xml/base.xml:143
#, python-format
msgid "Copy the full error to clipboard"
-msgstr ""
+msgstr "Tüm hataları panele kopyala"
#. module: web
#. openerp-web
@@ -760,7 +762,7 @@ msgstr "Oluştur"
#: code:addons/web/static/src/js/views/form/form_controller.js:502
#, python-format
msgid "Create "
-msgstr ""
+msgstr "Oluştur"
#. module: web
#. openerp-web
@@ -895,7 +897,7 @@ msgstr "Vazgeç"
#: code:addons/web/static/src/js/widgets/data_export.js:336
#, python-format
msgid "Do you really want to delete this export template?"
-msgstr ""
+msgstr "Bu dışa aktarma şablonunu gerçekten silmek istiyor musunuz?"
#. module: web
#. openerp-web
@@ -923,7 +925,7 @@ msgstr "Domain"
#: code:addons/web/static/src/js/widgets/domain_selector.js:520
#, python-format
msgid "Domain error"
-msgstr ""
+msgstr "Domain hatası"
#. module: web
#. openerp-web
@@ -977,7 +979,7 @@ msgstr "İşlemi Düzenle"
#: code:addons/web/static/src/xml/base.xml:273
#, python-format
msgid "Edit Calendar view"
-msgstr ""
+msgstr "Takvim düzenleme görüntüsü"
#. module: web
#. openerp-web
@@ -991,49 +993,49 @@ msgstr "Kolonu Düzenle"
#: code:addons/web/static/src/xml/base.xml:580
#, python-format
msgid "Edit Domain"
-msgstr ""
+msgstr "Domain Düzenle"
#. module: web
#. openerp-web
#: code:addons/web/static/src/xml/base.xml:267
#, python-format
msgid "Edit Form view"
-msgstr ""
+msgstr "Form görünümünü düzenle"
#. module: web
#. openerp-web
#: code:addons/web/static/src/xml/base.xml:271
#, python-format
msgid "Edit Gantt view"
-msgstr ""
+msgstr "Gantt görünümünü düzenle"
#. module: web
#. openerp-web
#: code:addons/web/static/src/xml/base.xml:270
#, python-format
msgid "Edit Graph view"
-msgstr ""
+msgstr "Grafik görünümünü düzenle"
#. module: web
#. openerp-web
#: code:addons/web/static/src/xml/base.xml:269
#, python-format
msgid "Edit Kanban view"
-msgstr ""
+msgstr "Kanban görünümünü düzenle"
#. module: web
#. openerp-web
#: code:addons/web/static/src/xml/base.xml:268
#, python-format
msgid "Edit List view"
-msgstr ""
+msgstr "Liste görünümünü düzenle"
#. module: web
#. openerp-web
#: code:addons/web/static/src/xml/base.xml:272
#, python-format
msgid "Edit Pivot view"
-msgstr ""
+msgstr "Pivot görünümünü düzenle"
#. module: web
#. openerp-web
@@ -1054,7 +1056,7 @@ msgstr "Aşamayı Düzenle"
#: code:addons/web/static/src/xml/base.xml:274
#, python-format
msgid "Edit view, type:"
-msgstr ""
+msgstr "görünümü düzenle, tür:"
#. module: web
#: model:ir.ui.view,arch_db:web.login
@@ -1100,7 +1102,7 @@ msgstr "Herkesin takvimi"
#: code:addons/web/static/src/js/views/calendar/calendar_model.js:507
#, python-format
msgid "Everything"
-msgstr ""
+msgstr "Herşey"
#. module: web
#. openerp-web
@@ -1287,6 +1289,9 @@ msgid ""
"\n"
"Tip: try to flip axis, filter further or reduce the number of measures."
msgstr ""
+"Excel uyumluluğu için, 256 sütundan daha fazla ise dışa aktarılamaz.\n"
+"\n"
+"İpucu: ekseni çevirmeye, daha fazla filtrelemeye veya önlem sayısını azaltmaya çalışın."
#. module: web
#. openerp-web
@@ -1356,7 +1361,7 @@ msgstr ""
#: code:addons/web/static/src/js/core/dialog.js:250
#, python-format
msgid "I am sure about this."
-msgstr ""
+msgstr "Bu konu hakkında eminim."
#. module: web
#. openerp-web
@@ -1402,13 +1407,15 @@ msgid ""
"Invalid database name. Only alphanumerical characters, underscore, hyphen "
"and dot are allowed."
msgstr ""
+"Geçersiz veritabanı adı. Yalnızca alfasayısal karakterler, alt çizgi, tire "
+"ve nokta izin verilir."
#. module: web
#. openerp-web
#: code:addons/web/static/src/xml/base.xml:578
#, python-format
msgid "Invalid domain"
-msgstr ""
+msgstr "Geçersiz Domain"
#. module: web
#. openerp-web
@@ -1416,21 +1423,21 @@ msgstr ""
#: code:addons/web/static/src/xml/base.xml:709
#, python-format
msgid "Invalid field chain"
-msgstr ""
+msgstr "Geçersiz alan zinciri"
#. module: web
#. openerp-web
#: code:addons/web/static/src/js/views/graph/graph_renderer.js:69
#, python-format
msgid "Invalid mode for chart"
-msgstr ""
+msgstr "Çizelge için geçersiz mod"
#. module: web
#. openerp-web
#: code:addons/web/static/src/js/widgets/debug_manager.js:207
#, python-format
msgid "JS Mobile Tests"
-msgstr ""
+msgstr "JS Mobil Testleri"
#. module: web
#. openerp-web
@@ -1537,7 +1544,7 @@ msgstr "M2O arama alanları henüz çok öntanımlı değerleri desteklemiyor"
#. module: web
#: model:ir.ui.view,arch_db:web.external_layout_boxed
msgid "Mail:"
-msgstr ""
+msgstr "Mail:"
#. module: web
#: model:ir.ui.view,arch_db:web.login_layout
@@ -1557,21 +1564,21 @@ msgstr "Filtreleri Yönet"
#: code:addons/web/static/src/xml/base.xml:611
#, python-format
msgid "Match"
-msgstr ""
+msgstr "Eşleştir"
#. module: web
#. openerp-web
#: code:addons/web/static/src/xml/base.xml:618
#, python-format
msgid "Match records with"
-msgstr ""
+msgstr "Kayıtları eşleştir"
#. module: web
#. openerp-web
#: code:addons/web/static/src/xml/base.xml:616
#, python-format
msgid "Match records with the following rule:"
-msgstr ""
+msgstr "Kayıtları takip eden kuralla birlikte eşleştir:"
#. module: web
#. openerp-web
@@ -1678,7 +1685,7 @@ msgstr "Odoo.com hesabım"
#: code:addons/web/static/src/xml/base.xml:606
#, python-format
msgid "NONE"
-msgstr ""
+msgstr "Hiç"
#. module: web
#. openerp-web
@@ -1735,7 +1742,7 @@ msgstr "Gösterilecek veri yok"
#: code:addons/web/static/src/js/widgets/debug_manager.js:355
#, python-format
msgid "No metadata available"
-msgstr ""
+msgstr "Kılavuz bilgi yok"
#. module: web
#. openerp-web
@@ -1794,7 +1801,7 @@ msgstr "Odoo Apps yakında hazır olacak"
#: code:addons/web/static/src/js/services/crash_manager.js:156
#, python-format
msgid "Odoo Client Error"
-msgstr ""
+msgstr "Odoo Müşteri Hatası"
#. module: web
#. openerp-web
@@ -1808,14 +1815,14 @@ msgstr "Odoo Enterprise"
#: code:addons/web/static/src/js/services/crash_manager.js:118
#, python-format
msgid "Odoo Error"
-msgstr ""
+msgstr "Odoo Hatası"
#. module: web
#. openerp-web
#: code:addons/web/static/src/js/services/crash_manager.js:58
#, python-format
msgid "Odoo Session Expired"
-msgstr ""
+msgstr "Odoo Oturumu Sonlandı"
#. module: web
#. openerp-web
@@ -1823,7 +1830,7 @@ msgstr ""
#: code:addons/web/static/src/js/services/crash_manager.js:197
#, python-format
msgid "Odoo Warning"
-msgstr ""
+msgstr "Odoo Uyarısı"
#. module: web
#. openerp-web
@@ -1878,6 +1885,8 @@ msgstr "Sadece tamsayı değeri geçerli olmalıdır."
msgid ""
"Only employee can access this database. Please contact the administrator."
msgstr ""
+"Bu veri tabanına sadece personel erişebilir. Lütfen yöneticinizle bağlantıya"
+" geçin."
#. module: web
#. openerp-web
@@ -1983,7 +1992,7 @@ msgstr "Pivot"
#: code:addons/web/static/src/js/views/list/list_renderer.js:333
#, python-format
msgid "Please click on the \"save\" button first"
-msgstr ""
+msgstr "Lütfen ilk önce 'kaydet' butonuna basın."
#. module: web
#. openerp-web
@@ -2038,6 +2047,7 @@ msgstr ""
msgid ""
"Please use the copy button to report the error to your support service."
msgstr ""
+"Lütfen destek serisine hatayı raporlamak için kopyala butonunu kullanın."
#. module: web
#: model:ir.ui.view,arch_db:web.menu_secondary
@@ -2093,7 +2103,7 @@ msgstr ""
#: code:addons/web/static/src/js/widgets/model_field_selector.js:455
#, python-format
msgid "Relation not allowed"
-msgstr ""
+msgstr "Bağlantıya izin verilmiyor"
#. module: web
#. openerp-web
@@ -2149,7 +2159,7 @@ msgstr "Geriyükle"
#: code:addons/web/static/src/xml/base.xml:220
#, python-format
msgid "Run JS Mobile Tests"
-msgstr ""
+msgstr "JS Mobil Testlerini Başlat"
#. module: web
#. openerp-web
@@ -2261,7 +2271,7 @@ msgstr "Ara: "
#: code:addons/web/static/src/xml/base.xml:150
#, python-format
msgid "See details"
-msgstr ""
+msgstr "Detayları gör."
#. module: web
#. openerp-web
@@ -2282,7 +2292,7 @@ msgstr "Seç } resolves to the finished resource
*/
_postprocess: function (record, options) {
var self = this;
var defs = [];
- _.each(record.getFieldNames(), function (name) {
+
+ _.each(record.getFieldNames(options), function (name) {
var field = record.fields[name];
var fieldInfo = record.fieldsInfo[record.viewType][name] || {};
var options = fieldInfo.options || {};
@@ -3879,14 +3894,20 @@ var BasicModel = AbstractModel.extend({
var emptyGroupsIDs = _.difference(_.pluck(previousGroups, 'id'), list.data);
_.each(emptyGroupsIDs, function (groupID) {
list.data.push(groupID);
+ var emptyGroup = self.localData[groupID];
+ // this attribute hasn't been updated in the previous
+ // loop for empty groups
+ emptyGroup.aggregateValues = {};
});
}
return $.when.apply($, defs).then(function () {
- // generate the res_ids of the main list, being the concatenation
- // of the fetched res_ids in each group
- list.res_ids = _.flatten(_.map(arguments, function (group) {
- return group ? group.res_ids : [];
- }));
+ if (!options || !options.onlyGroups) {
+ // generate the res_ids of the main list, being the concatenation
+ // of the fetched res_ids in each group
+ list.res_ids = _.flatten(_.map(arguments, function (group) {
+ return group ? group.res_ids : [];
+ }));
+ }
return list;
});
});
diff --git a/addons/web/static/src/js/views/calendar/calendar_view.js b/addons/web/static/src/js/views/calendar/calendar_view.js
index a813a626565..6c12d508937 100644
--- a/addons/web/static/src/js/views/calendar/calendar_view.js
+++ b/addons/web/static/src/js/views/calendar/calendar_view.js
@@ -118,8 +118,20 @@ var CalendarView = AbstractView.extend({
//if quick_add = is NOT False and IS specified in view, we this one for widgets.QuickCreate'
this.controllerParams.quickAddPop = (!('quick_add' in attrs) || utils.toBoolElse(attrs.quick_add+'', true));
this.controllerParams.disableQuickCreate = params.disable_quick_create || !this.controllerParams.quickAddPop;
- // If this field is set ot true, we don't open the event in form view, but in a popup with the view_id passed by this parameter
- this.controllerParams.formViewId = !attrs.form_view_id || !utils.toBoolElse(attrs.form_view_id, true) ? false : attrs.form_view_id;
+
+ // If form_view_id is set, then the calendar view will open a form view
+ // with this id, when it needs to edit or create an event.
+ this.controllerParams.formViewId =
+ attrs.form_view_id ? parseInt(attrs.form_view_id, 10) : false;
+ if (!this.controllerParams.formViewId && params.action) {
+ var formViewDescr = _.find(params.action.views, function (v) {
+ return v[1] === 'form';
+ });
+ if (formViewDescr) {
+ this.controllerParams.formViewId = formViewDescr[0];
+ }
+ }
+
this.controllerParams.readonlyFormViewId = !attrs.readonly_form_view_id || !utils.toBoolElse(attrs.readonly_form_view_id, true) ? false : attrs.readonly_form_view_id;
this.controllerParams.eventOpenPopup = utils.toBoolElse(attrs.event_open_popup || '', false);
this.controllerParams.mapping = mapping;
diff --git a/addons/web/static/src/js/views/form/form_controller.js b/addons/web/static/src/js/views/form/form_controller.js
index e66194dcf99..3fefd7ca173 100644
--- a/addons/web/static/src/js/views/form/form_controller.js
+++ b/addons/web/static/src/js/views/form/form_controller.js
@@ -232,6 +232,16 @@ var FormController = BasicController.extend({
return changedFields;
});
},
+ /**
+ * Overrides to force the viewType to 'form', so that we ensure that the
+ * correct fields are reloaded (this is only useful for one2many form views).
+ *
+ * @override
+ */
+ update: function (params, options) {
+ params = _.extend({viewType: 'form'}, params);
+ return this._super(params, options);
+ },
//--------------------------------------------------------------------------
// Private
diff --git a/addons/web/static/src/js/views/form/form_view.js b/addons/web/static/src/js/views/form/form_view.js
index 10fc9a12b20..d8693586590 100644
--- a/addons/web/static/src/js/views/form/form_view.js
+++ b/addons/web/static/src/js/views/form/form_view.js
@@ -73,6 +73,14 @@ var FormView = BasicView.extend({
_.each(this.loadParams.fieldsInfo.form, function (attrs, fieldName) {
var field = fields[fieldName];
+ if (!field) {
+ // when a one2many record is opened in a form view, the fields
+ // of the main one2many view (list or kanban) are added to the
+ // fieldsInfo of its form view, but those fields aren't in the
+ // loadParams.fields, as they are not displayed in the view, so
+ // we can ignore them.
+ return;
+ }
if (field.type !== 'one2many' && field.type !== 'many2many') {
return;
}
diff --git a/addons/web/static/src/js/views/kanban/kanban_model.js b/addons/web/static/src/js/views/kanban/kanban_model.js
index 411d4cc7b14..6c4ea1f133c 100644
--- a/addons/web/static/src/js/views/kanban/kanban_model.js
+++ b/addons/web/static/src/js/views/kanban/kanban_model.js
@@ -398,9 +398,8 @@ var KanbanModel = BasicModel.extend({
return $.when();
},
/**
- * Reloads all progressbar data if the given id is a record's one. This is
- * done after given deferred and insures that the given deferred's result is
- * not lost.
+ * Reloads all progressbar data. This is done after given deferred and
+ * insures that the given deferred's result is not lost.
*
* @private
* @param {string} recordID
@@ -409,7 +408,9 @@ var KanbanModel = BasicModel.extend({
*/
_reloadProgressBarGroupFromRecord: function (recordID, def) {
var element = this.localData[recordID];
- if (element.type !== 'record') {
+ if (element.type === 'list' && !element.parentID) {
+ // we are reloading the whole view, so there is no need to manually
+ // reload the progressbars
return def;
}
diff --git a/addons/web/static/src/js/views/list/list_editable_renderer.js b/addons/web/static/src/js/views/list/list_editable_renderer.js
index f3dc79cd4bf..a12b85abdd0 100644
--- a/addons/web/static/src/js/views/list/list_editable_renderer.js
+++ b/addons/web/static/src/js/views/list/list_editable_renderer.js
@@ -538,8 +538,13 @@ ListRenderer.include({
* @returns {Deferred} this deferred is resolved immediately
*/
_renderView: function () {
+ var self = this;
this.currentRow = null;
- return this._super.apply(this, arguments);
+ return this._super.apply(this, arguments).then(function () {
+ if (self._isEditable()) {
+ self.$('table').addClass('o_editable_list');
+ }
+ });
},
/**
* Force the resequencing of the items in the list.
diff --git a/addons/web/static/src/js/views/pivot/pivot_model.js b/addons/web/static/src/js/views/pivot/pivot_model.js
index 4a5d9b45b4a..b45f7a9ffdf 100644
--- a/addons/web/static/src/js/views/pivot/pivot_model.js
+++ b/addons/web/static/src/js/views/pivot/pivot_model.js
@@ -17,6 +17,7 @@ odoo.define('web.PivotModel', function (require) {
*/
var AbstractModel = require('web.AbstractModel');
+var concurrency = require('web.concurrency');
var core = require('web.core');
var session = require('web.session');
var utils = require('web.utils');
@@ -32,6 +33,7 @@ var PivotModel = AbstractModel.extend({
this._super.apply(this, arguments);
this.numbering = {};
this.data = null;
+ this._loadDataDropPrevious = new concurrency.DropPrevious();
},
//--------------------------------------------------------------------------
@@ -556,7 +558,7 @@ var PivotModel = AbstractModel.extend({
}
}
- return $.when.apply(null, groupBys.map(function (groupBy) {
+ return this._loadDataDropPrevious.add($.when.apply(null, groupBys.map(function (groupBy) {
return self._rpc({
model: self.modelName,
method: 'read_group',
@@ -566,7 +568,7 @@ var PivotModel = AbstractModel.extend({
groupBy: groupBy,
lazy: false,
});
- })).then(function () {
+ }))).then(function () {
var data = Array.prototype.slice.call(arguments);
if (data[0][0].__count === 0) {
self.data.has_data = false;
diff --git a/addons/web/static/src/less/list_view.less b/addons/web/static/src/less/list_view.less
index b5237d305cb..666b4a8e116 100644
--- a/addons/web/static/src/less/list_view.less
+++ b/addons/web/static/src/less/list_view.less
@@ -6,6 +6,14 @@
background-color: @odoo-view-background-color;
margin-bottom: 0px;
+ // Checkbox in editable list
+ // should be clickable and activate the row
+ &.o_editable_list .o_data_row:not(.o_selected_row) .o_data_cell {
+ .o_checkbox:not(.o_readonly_modifier) {
+ pointer-events: none;
+ }
+ }
+
&.table {
td, th {
vertical-align: middle;
diff --git a/addons/web/static/tests/fields/relational_fields_tests.js b/addons/web/static/tests/fields/relational_fields_tests.js
index 4ba6c124db2..b8358796b7f 100644
--- a/addons/web/static/tests/fields/relational_fields_tests.js
+++ b/addons/web/static/tests/fields/relational_fields_tests.js
@@ -599,6 +599,35 @@ QUnit.module('relational_fields', {
form.destroy();
});
+ QUnit.test('many2one in non edit mode', function (assert) {
+ assert.expect(3);
+
+ var form = createView({
+ View: FormView,
+ model: 'partner',
+ data: this.data,
+ arch: '',
+ res_id: 1,
+ });
+
+ assert.strictEqual(form.$('a.o_form_uri').length, 1,
+ "should display 1 m2o link in form");
+ assert.strictEqual(form.$('a.o_form_uri').attr('href'), "#id=4&model=partner",
+ "href should contain id and model");
+
+ // Remove value from many2one and then save, there should not have href with id and model on m2o anchor
+ form.$buttons.find('.o_form_button_edit').click();
+ form.$('.o_field_many2one input').val('').trigger('keyup').trigger('focusout');
+ form.$buttons.find('.o_form_button_save').click();
+
+ assert.strictEqual(form.$('a.o_form_uri').attr('href'), "#",
+ "href should have #");
+
+ form.destroy();
+ });
+
QUnit.test('many2one searches with correct value', function (assert) {
var done = assert.async();
assert.expect(6);
@@ -5731,7 +5760,7 @@ QUnit.module('relational_fields', {
rpcCount++;
if (args.method === 'write') {
assert.deepEqual(args.args[1].p, [[0, args.args[1].p[0][1], {
- int_field: 123, product_id: 41
+ foo: false, int_field: 123, product_id: 41,
}]]);
}
return this._super(route, args);
@@ -8889,6 +8918,74 @@ QUnit.module('relational_fields', {
form.destroy();
});
+ QUnit.test('one2many form view with action button', function (assert) {
+ // once the action button is clicked, the record is reloaded (via the
+ // on_close handler, executed because the python method does not return
+ // any action, or an ir.action.act_window_close) ; this test ensures that
+ // it reloads the fields of the opened view (i.e. the form in this case).
+ // See https://github.com/odoo/odoo/issues/24189
+ assert.expect(7);
+
+ var data = this.data;
+ data.partner.records[0].p = [2];
+
+ var form = createView({
+ View: FormView,
+ model: 'partner',
+ data: data,
+ res_id: 1,
+ arch: '',
+ archs: {
+ 'partner_type,false,list': ''+
+ ' ',
+ archs: archs,
+ viewOptions: {
+ initialDate: initialDate,
+ },
+ mockRPC: function (route, args) {
+ if (args.method === "create") {
+ // we simulate here the case where a create call with just
+ // the field name fails. This is a normal flow, the server
+ // reject the create rpc (quick create), then the web client
+ // fall back to a form view. This happens typically when a
+ // model has required fields
+ return $.Deferred().reject('None shall pass!');
+ }
+ return this._super(route, args);
+ },
+ intercepts: {
+ do_action: function (event) {
+ assert.strictEqual(event.data.action.views[0][0], 42,
+ "should do a do_action with view id 42");
+ },
+ },
+ });
+
+ var $cell = calendar.$('.fc-day-grid .fc-row:eq(2) .fc-day:eq(2)');
+ testUtils.triggerMouseEvent($cell, "mousedown");
+ testUtils.triggerMouseEvent($cell, "mouseup");
+ var $input = $('.modal-body input:first');
+ $input.val("It's just a fleshwound").trigger('input');
+ $('.modal button.btn:contains(Create)').trigger('click');
+
+ calendar.destroy();
+ });
+
+ QUnit.test('calendar fallback to form view id in action if necessary', function (assert) {
+ assert.expect(1);
+
+ var calendar = createView({
+ View: CalendarView,
+ model: 'event',
+ data: this.data,
+ arch: ' '+
+ ' ',
+ archs: archs,
+ viewOptions: {
+ initialDate: initialDate,
+ action: {views: [[1, 'kanban'], [43, 'form']]}
+ },
+ mockRPC: function (route, args) {
+ if (args.method === "create") {
+ // we simulate here the case where a create call with just
+ // the field name fails. This is a normal flow, the server
+ // reject the create rpc (quick create), then the web client
+ // fall back to a form view. This happens typically when a
+ // model has required fields
+ return $.Deferred().reject('None shall pass!');
+ }
+ return this._super(route, args);
+ },
+ intercepts: {
+ do_action: function (event) {
+ assert.strictEqual(event.data.action.views[0][0], 43,
+ "should do a do_action with view id 43");
+ },
+ },
+ });
+
+ var $cell = calendar.$('.fc-day-grid .fc-row:eq(2) .fc-day:eq(2)');
+ testUtils.triggerMouseEvent($cell, "mousedown");
+ testUtils.triggerMouseEvent($cell, "mouseup");
+ var $input = $('.modal-body input:first');
+ $input.val("It's just a fleshwound").trigger('input');
+ $('.modal button.btn:contains(Create)').trigger('click');
+
+ calendar.destroy();
+ });
+
});
});
diff --git a/addons/web/static/tests/views/kanban_tests.js b/addons/web/static/tests/views/kanban_tests.js
index 9a5f9f8f0a0..04a117f97b6 100644
--- a/addons/web/static/tests/views/kanban_tests.js
+++ b/addons/web/static/tests/views/kanban_tests.js
@@ -3222,6 +3222,132 @@ QUnit.module('Views', {
kanban.destroy();
});
+ // XXX test deactivated in saas~11.2 as kanban archiving has been removed (and readded in saas~11.4)
+ QUnit.skip('column progressbars on archiving records update counter', function (assert) {
+ assert.expect(4);
+
+ // add active field on partner model and make all records active
+ this.data.partner.fields.active = {string: 'Active', type: 'char', default: true};
+
+ var kanban = createView({
+ View: KanbanView,
+ model: 'partner',
+ data: this.data,
+ arch:
+ '' +
+ '' +
+ '' +
+ '
' +
+ ' ',
+ groupBy: ['bar'],
+ });
+
+ assert.strictEqual(kanban.$('.o_kanban_group:eq(1) .o_kanban_counter_side').text(), "36",
+ "counter should contain the correct value");
+ assert.strictEqual(kanban.$('.o_kanban_group:eq(1) .o_kanban_counter_progress > .progress-bar:first').data('originalTitle'), "1 yop",
+ "the counter progressbars should be correctly displayed");
+
+ // archive all records of the second columns
+ kanban.$('.o_kanban_group:eq(1) .o_column_archive').click();
+
+ assert.strictEqual(kanban.$('.o_kanban_group:eq(1) .o_kanban_counter_side').text(), "0",
+ "counter should contain the correct value");
+ assert.strictEqual(kanban.$('.o_kanban_group:eq(1) .o_kanban_counter_progress > .progress-bar:first').data('originalTitle'), "0 yop",
+ "the counter progressbars should have been correctly updated");
+
+ kanban.destroy();
+ });
+
+ QUnit.skip('kanban with progressbars: correctly update env when archiving records', function (assert) {
+ assert.expect(3);
+
+ // add active field on partner model and make all records active
+ this.data.partner.fields.active = {string: 'Active', type: 'char', default: true};
+
+ var kanban = createView({
+ View: KanbanView,
+ model: 'partner',
+ data: this.data,
+ arch:
+ '' +
+ '' +
+ '' +
+ '
' +
+ ' ',
+ groupBy: ['bar'],
+ intercepts: {
+ env_updated: function (ev) {
+ assert.step(ev.data.ids);
+ },
+ },
+ });
+
+ // archive all records of the first column
+ kanban.$('.o_kanban_group:first .o_column_archive').click();
+
+ assert.verifySteps([
+ [1, 2, 3, 4],
+ [1, 2, 3],
+ ]);
+
+ kanban.destroy();
+ });
+
+ QUnit.test('RPCs when (re)loading kanban view progressbars', function (assert) {
+ assert.expect(9);
+
+ var kanban = createView({
+ View: KanbanView,
+ model: 'partner',
+ data: this.data,
+ arch:
+ '' +
+ '' +
+ '' +
+ '
' +
+ ' ',
+ groupBy: ['bar'],
+ mockRPC: function (route, args) {
+ assert.step(args.method || route);
+ return this._super.apply(this, arguments);
+ },
+ });
+
+ kanban.reload();
+
+ assert.verifySteps([
+ // initial load
+ 'read_group',
+ '/web/dataset/search_read',
+ '/web/dataset/search_read',
+ 'read_progress_bar',
+ // reload
+ 'read_group',
+ '/web/dataset/search_read',
+ '/web/dataset/search_read',
+ 'read_progress_bar',
+ ]);
+
+ kanban.destroy();
+ });
+
QUnit.test('drag & drop records grouped by m2o with progressbar', function (assert) {
assert.expect(4);
@@ -3291,7 +3417,7 @@ QUnit.module('Views', {
"Initial count should be Three");
kanban.$('.bg-success-full').click();
var lastCount = parseInt(kanban.$('.o_kanban_counter_side').eq(1).text());
- assert.strictEqual(lastCount, 0,
+ assert.strictEqual(lastCount, 1,
"kanban counters should vary according to what subgroup is selected");
kanban.destroy();
diff --git a/addons/web/static/tests/views/pivot_tests.js b/addons/web/static/tests/views/pivot_tests.js
index 26733a5edca..56d228bbf30 100644
--- a/addons/web/static/tests/views/pivot_tests.js
+++ b/addons/web/static/tests/views/pivot_tests.js
@@ -1124,4 +1124,37 @@ QUnit.module('Views', {
pivot.destroy();
});
+
+ QUnit.test('parallel data loading should discard all but the last one', function (assert) {
+ assert.expect(2);
+
+ var def;
+
+ var pivot = createView({
+ View: PivotView,
+ model: "partner",
+ data: this.data,
+ arch: '' +
+ ' ',
+ mockRPC: function (route, args) {
+ var result = this._super.apply(this, arguments);
+ if (args.method === 'read_group') {
+ return $.when(def).then(_.constant(result));
+ }
+ return result;
+ },
+ });
+
+ def = $.Deferred();
+ pivot.update({groupBy: ['product_id']});
+ pivot.update({groupBy: ['product_id', 'customer']});
+ def.resolve();
+
+ assert.strictEqual(pivot.$('.o_pivot_cell_value').length, 6,
+ "should have 6 cells");
+ assert.strictEqual(pivot.$('tbody tr').length, 6,
+ "should have 6 rows");
+ pivot.destroy();
+ });
});});
diff --git a/addons/web/tests/test_js.py b/addons/web/tests/test_js.py
index f903fa704c5..04df8be91c1 100644
--- a/addons/web/tests/test_js.py
+++ b/addons/web/tests/test_js.py
@@ -32,6 +32,6 @@ class WebSuite(odoo.tests.HttpCase):
filename = asset['filename']
if not filename or asset['atype'] != 'text/javascript':
continue
- with open(filename, 'r') as fp:
- if RE_ONLY.search(fp.read()):
+ with open(filename, 'rb') as fp:
+ if RE_ONLY.search(fp.read().decode('utf-8')):
self.fail("`QUnit.only()` used in file %r" % asset['url'])
diff --git a/addons/web_diagram/i18n/tr.po b/addons/web_diagram/i18n/tr.po
index c9cc5fde86d..c2c16d8b245 100644
--- a/addons/web_diagram/i18n/tr.po
+++ b/addons/web_diagram/i18n/tr.po
@@ -3,14 +3,15 @@
# * web_diagram
#
# Translators:
-# Martin Trigaux , 2017
+# Martin Trigaux, 2017
+# Umur Akın , 2018
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server 10.saas~18\n"
+"Project-Id-Version: Odoo Server saas~11.2\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-09-20 09:54+0000\n"
-"PO-Revision-Date: 2017-09-20 09:54+0000\n"
-"Last-Translator: Martin Trigaux , 2017\n"
+"POT-Creation-Date: 2018-03-22 14:11+0000\n"
+"PO-Revision-Date: 2018-03-22 14:11+0000\n"
+"Last-Translator: Umur Akın , 2018\n"
"Language-Team: Turkish (https://www.transifex.com/odoo/teams/41243/tr/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -34,13 +35,15 @@ msgid ""
"Are you sure you want to remove this node ? This will remove its connected "
"transitions as well."
msgstr ""
+"Bu düğümü kaldırmak istediğinizden emin misiniz? Bu bağlı geçişleri de "
+"kaldıracaktır."
#. module: web_diagram
#. openerp-web
#: code:addons/web_diagram/static/src/js/diagram_controller.js:172
#, python-format
msgid "Are you sure you want to remove this transition?"
-msgstr ""
+msgstr "Bu geçişi kaldırmak istediğinize emin misiniz?"
#. module: web_diagram
#. openerp-web
@@ -70,7 +73,7 @@ msgstr "Yeni Düğüm"
#: code:addons/web_diagram/static/src/js/diagram_controller.js:160
#, python-format
msgid "Open:"
-msgstr ""
+msgstr "Aç:"
#. module: web_diagram
#. openerp-web
diff --git a/addons/web_editor/i18n/tr.po b/addons/web_editor/i18n/tr.po
index 619a84af27d..228dd930fa4 100644
--- a/addons/web_editor/i18n/tr.po
+++ b/addons/web_editor/i18n/tr.po
@@ -35,7 +35,7 @@ msgstr ""
#: code:addons/web_editor/static/src/xml/editor.xml:193
#, python-format
msgid "(URL or Embed)"
-msgstr ""
+msgstr "(URL ya da Gömülü)"
#. module: web_editor
#. openerp-web
@@ -47,32 +47,32 @@ msgstr "(YouTube, Vimeo, Vine, Instagram, DailyMotion or Youku)"
#. module: web_editor
#: model:ir.ui.view,arch_db:web_editor.colorpicker
msgid "25% Black"
-msgstr ""
+msgstr "%25 Siyah"
#. module: web_editor
#: model:ir.ui.view,arch_db:web_editor.colorpicker
msgid "25% White"
-msgstr ""
+msgstr "%25 Beyaz"
#. module: web_editor
#: model:ir.ui.view,arch_db:web_editor.colorpicker
msgid "50% Black"
-msgstr ""
+msgstr "%50 Siyah"
#. module: web_editor
#: model:ir.ui.view,arch_db:web_editor.colorpicker
msgid "50% White"
-msgstr ""
+msgstr "%50 Beyaz"
#. module: web_editor
#: model:ir.ui.view,arch_db:web_editor.colorpicker
msgid "75% Black"
-msgstr ""
+msgstr "%75 Siyah"
#. module: web_editor
#: model:ir.ui.view,arch_db:web_editor.colorpicker
msgid "75% White"
-msgstr ""
+msgstr "%75 Beyaz"
#. module: web_editor
#: model:ir.ui.view,arch_db:web_editor.snippets
@@ -93,7 +93,7 @@ msgstr ""
#: code:addons/web_editor/static/src/xml/editor.xml:198
#, python-format
msgid "Accepts"
-msgstr ""
+msgstr "Kabuller"
#. module: web_editor
#. openerp-web
@@ -119,33 +119,33 @@ msgstr "Bir resim URL ekle"
#. module: web_editor
#: model:ir.ui.view,arch_db:web_editor.snippets
msgid "Add blocks"
-msgstr ""
+msgstr "Reklam Engelleyici"
#. module: web_editor
#. openerp-web
#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:966
#, python-format
msgid "Align center"
-msgstr ""
+msgstr "Merkeze hizalama"
#. module: web_editor
#. openerp-web
#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:965
#, python-format
msgid "Align left"
-msgstr ""
+msgstr "Sola hizala"
#. module: web_editor
#. openerp-web
#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:967
#, python-format
msgid "Align right"
-msgstr ""
+msgstr "Sağa hizala"
#. module: web_editor
#: model:ir.ui.view,arch_db:web_editor.colorpicker
msgid "Alpha"
-msgstr ""
+msgstr "Alpha"
#. module: web_editor
#. openerp-web
@@ -159,7 +159,7 @@ msgstr "Alternatif Yükleme"
#: code:addons/web_editor/static/src/xml/editor.xml:315
#, python-format
msgid "Assign a focal point that will always be visible"
-msgstr ""
+msgstr "Her zaman görünecek bir merkez noktaya hizala"
#. module: web_editor
#: model:ir.model.fields,field_description:web_editor.field_ir_attachment__local_url
@@ -186,47 +186,47 @@ msgstr "Arkaplan Rengi"
#: code:addons/web_editor/static/src/js/editor/snippets.options.js:950
#, python-format
msgid "Background Image Sizing"
-msgstr ""
+msgstr "Arka Plan Resim Boyutu"
#. module: web_editor
#. openerp-web
#: code:addons/web_editor/static/src/xml/editor.xml:354
#, python-format
msgid "Background height"
-msgstr ""
+msgstr "Arkaplan Yüksekliği"
#. module: web_editor
#. openerp-web
#: code:addons/web_editor/static/src/xml/editor.xml:364
#, python-format
msgid "Background position"
-msgstr ""
+msgstr "Arkaplan Konumu"
#. module: web_editor
#. openerp-web
#: code:addons/web_editor/static/src/xml/editor.xml:386
#, python-format
msgid "Background repeat"
-msgstr ""
+msgstr "Arkaplan Tekrarı"
#. module: web_editor
#. openerp-web
#: code:addons/web_editor/static/src/xml/editor.xml:342
#, python-format
msgid "Background size"
-msgstr ""
+msgstr "Arkaplan Boyutu"
#. module: web_editor
#. openerp-web
#: code:addons/web_editor/static/src/xml/editor.xml:345
#, python-format
msgid "Background width"
-msgstr ""
+msgstr "Arkaplan Genişliği"
#. module: web_editor
#: model:ir.ui.view,arch_db:web_editor.colorpicker
msgid "Beta"
-msgstr ""
+msgstr "Beta"
#. module: web_editor
#: model:ir.ui.view,arch_db:web_editor.colorpicker
@@ -245,28 +245,28 @@ msgstr "Blok"
#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:893
#, python-format
msgid "Bold"
-msgstr ""
+msgstr "Kalın"
#. module: web_editor
#. openerp-web
#: code:addons/web_editor/static/src/js/widgets/ace.js:832
#, python-format
msgid "Careful !"
-msgstr ""
+msgstr "Dikkat !"
#. module: web_editor
#. openerp-web
#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:96
#, python-format
msgid "Center"
-msgstr ""
+msgstr "Merkez"
#. module: web_editor
#. openerp-web
#: code:addons/web_editor/static/src/js/widgets/widgets.js:81
#, python-format
msgid "Change media description and tooltip"
-msgstr ""
+msgstr "Medya tanımını ve araç bilgisini değiştir"
#. module: web_editor
#. openerp-web
@@ -289,7 +289,7 @@ msgstr "Kod"
#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:959
#, python-format
msgid "Code View"
-msgstr ""
+msgstr "Kod Görünümü"
#. module: web_editor
#. openerp-web
@@ -310,14 +310,14 @@ msgstr "Sütun"
#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:62
#, python-format
msgid "Common colors"
-msgstr ""
+msgstr "Yaygın renkler"
#. module: web_editor
#. openerp-web
#: code:addons/web_editor/static/src/xml/editor.xml:310
#, python-format
msgid "Contain"
-msgstr ""
+msgstr "İçerir"
#. module: web_editor
#. openerp-web
@@ -331,7 +331,7 @@ msgstr "İçereği çevirmek için"
#: code:addons/web_editor/static/src/xml/editor.xml:194
#, python-format
msgid "Copy-paste your URL or embed code here"
-msgstr ""
+msgstr "URL kodunuzu ya da gömülü kodunuzu buraya kopyalayıp-yapıştırın."
#. module: web_editor
#. openerp-web
@@ -369,7 +369,7 @@ msgstr "Özelleştirme"
#: code:addons/web_editor/static/src/xml/editor.xml:198
#, python-format
msgid "Dailymotion"
-msgstr ""
+msgstr "Dailymotion"
#. module: web_editor
#: model:ir.ui.view,arch_db:web_editor.colorpicker
@@ -388,12 +388,12 @@ msgstr "Öntanımlı"
#: code:addons/web_editor/static/src/xml/editor.xml:387
#, python-format
msgid "Define if/how the background image will be repeated"
-msgstr ""
+msgstr "Arka plan resminin tekrarlanacağını / nasıl olacağını tanımlayın"
#. module: web_editor
#: model:ir.ui.view,arch_db:web_editor.colorpicker
msgid "Delta"
-msgstr ""
+msgstr "Delta"
#. module: web_editor
#. openerp-web
@@ -436,7 +436,7 @@ msgstr "Belge"
#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:986
#, python-format
msgid "Document Style"
-msgstr ""
+msgstr "Doküman Türü"
#. module: web_editor
#. openerp-web
@@ -450,7 +450,7 @@ msgstr "Düzenlemek için çift-tıkla"
#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:913
#, python-format
msgid "Drag an image here"
-msgstr ""
+msgstr "Buraya bir fotoğraf sürükleyin"
#. module: web_editor
#. openerp-web
@@ -477,14 +477,14 @@ msgstr "Düzenle"
#. module: web_editor
#: model:ir.ui.view,arch_db:web_editor.colorpicker
msgid "Epsilon"
-msgstr ""
+msgstr "Epsilon"
#. module: web_editor
#. openerp-web
#: code:addons/web_editor/static/src/js/widgets/ace.js:97
#, python-format
msgid "Expected "
-msgstr ""
+msgstr "Umulan"
#. module: web_editor
#. openerp-web
@@ -498,49 +498,49 @@ msgstr "Ekstra Küçük"
#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:905
#, python-format
msgid "File / Image"
-msgstr ""
+msgstr "Dosya / Resim"
#. module: web_editor
#. openerp-web
#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:910
#, python-format
msgid "Float Left"
-msgstr ""
+msgstr "Sola yay"
#. module: web_editor
#. openerp-web
#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:912
#, python-format
msgid "Float None"
-msgstr ""
+msgstr "Asla Kaydırma"
#. module: web_editor
#. openerp-web
#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:911
#, python-format
msgid "Float Right"
-msgstr ""
+msgstr "Sağa Kaydır"
#. module: web_editor
#. openerp-web
#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:974
#, python-format
msgid "Font Color"
-msgstr ""
+msgstr "Font Rengi"
#. module: web_editor
#. openerp-web
#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:901
#, python-format
msgid "Font Family"
-msgstr ""
+msgstr "Font Ailesi"
#. module: web_editor
#. openerp-web
#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:902
#, python-format
msgid "Font Size"
-msgstr ""
+msgstr "Font Boyutu"
#. module: web_editor
#. openerp-web
@@ -559,32 +559,32 @@ msgstr "Tam Ekran"
#. module: web_editor
#: model:ir.ui.view,arch_db:web_editor.colorpicker
msgid "Gamma"
-msgstr ""
+msgstr "Gama"
#. module: web_editor
#: model:ir.ui.view,arch_db:web_editor.colorpicker
msgid "Gray"
-msgstr ""
+msgstr "Gri"
#. module: web_editor
#: model:ir.ui.view,arch_db:web_editor.colorpicker
msgid "Gray Dark"
-msgstr ""
+msgstr "Koyu Gri"
#. module: web_editor
#: model:ir.ui.view,arch_db:web_editor.colorpicker
msgid "Gray Darker"
-msgstr ""
+msgstr "Daha Koyu Gri"
#. module: web_editor
#: model:ir.ui.view,arch_db:web_editor.colorpicker
msgid "Gray Light"
-msgstr ""
+msgstr "Aydınlat"
#. module: web_editor
#: model:ir.ui.view,arch_db:web_editor.colorpicker
msgid "Gray Lighter"
-msgstr ""
+msgstr "Daha fazla aydınlat"
#. module: web_editor
#: model:ir.model,name:web_editor.model_ir_http
@@ -596,42 +596,42 @@ msgstr "HTTP yönlendirme"
#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:945
#, python-format
msgid "Header 1"
-msgstr ""
+msgstr "Başlık 1"
#. module: web_editor
#. openerp-web
#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:946
#, python-format
msgid "Header 2"
-msgstr ""
+msgstr "Başlık 2"
#. module: web_editor
#. openerp-web
#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:947
#, python-format
msgid "Header 3"
-msgstr ""
+msgstr "Başlık 3"
#. module: web_editor
#. openerp-web
#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:948
#, python-format
msgid "Header 4"
-msgstr ""
+msgstr "Başlık 4"
#. module: web_editor
#. openerp-web
#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:949
#, python-format
msgid "Header 5"
-msgstr ""
+msgstr "Başlık 5"
#. module: web_editor
#. openerp-web
#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:950
#, python-format
msgid "Header 6"
-msgstr ""
+msgstr "Başlık 6"
#. module: web_editor
#. openerp-web
@@ -652,42 +652,42 @@ msgstr "İşte etkili bir şekilde tercüme etmek amacıyla kullanılan Görsell
#: code:addons/web_editor/static/src/xml/editor.xml:219
#, python-format
msgid "Hide Dailymotion logo"
-msgstr ""
+msgstr "Dailymotion logosunu gizle"
#. module: web_editor
#. openerp-web
#: code:addons/web_editor/static/src/xml/editor.xml:216
#, python-format
msgid "Hide Youtube logo"
-msgstr ""
+msgstr "Youtube logosunu gizle"
#. module: web_editor
#. openerp-web
#: code:addons/web_editor/static/src/xml/editor.xml:213
#, python-format
msgid "Hide fullscreen button"
-msgstr ""
+msgstr "Tam ekran butonunu gizle"
#. module: web_editor
#. openerp-web
#: code:addons/web_editor/static/src/xml/editor.xml:210
#, python-format
msgid "Hide player controls"
-msgstr ""
+msgstr "Oyuncu kontrollerini gizle"
#. module: web_editor
#. openerp-web
#: code:addons/web_editor/static/src/xml/editor.xml:222
#, python-format
msgid "Hide sharing button"
-msgstr ""
+msgstr "Paylaşım butonunu gizle"
#. module: web_editor
#. openerp-web
#: code:addons/web_editor/static/src/xml/editor.xml:367
#, python-format
msgid "Horizontal"
-msgstr ""
+msgstr "Yatay"
#. module: web_editor
#: model:ir.model.fields,field_description:web_editor.field_web_editor_converter_test_sub__id
@@ -702,6 +702,8 @@ msgid ""
"If you discard the current edition, all unsaved changes will be lost. You "
"can cancel to return to the edition mode."
msgstr ""
+"Eğer mevcut düzenlemeyi iptal ederseniz, tüm kaydedilmemiş değişiklikler "
+"kaybedilecek. Düzenleme moduna dönmek için iptal edebilirsiniz."
#. module: web_editor
#. openerp-web
@@ -711,6 +713,8 @@ msgid ""
"If you reset this file, all your customizations will be lost as it will be "
"reverted to the default file."
msgstr ""
+"Eğer bu dosyayı sıfırlarsanız, tüm özelleştirmeleriniz varsayılan dosyaya "
+"döndürüldüğü için kaybolur."
#. module: web_editor
#. openerp-web
@@ -724,7 +728,7 @@ msgstr "Resim"
#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:915
#, python-format
msgid "Image URL"
-msgstr ""
+msgstr "URL Resmi"
#. module: web_editor
#. openerp-web
@@ -734,27 +738,29 @@ msgid ""
"In this mode, you can only translate texts. To change the structure of the page, you must edit the master page.\n"
" Each modification on the master page is automatically applied to all translated versions."
msgstr ""
+"Bu modda sadece metinleri çevirebilirsiniz. Sayfa yapısını değiştirmek için ana sayfayı düzenlemelisiniz.\n"
+"Anasayfadaki her değişiklik tüm çevirilmiş versiyonlara otomatik olarak uygulanır."
#. module: web_editor
#. openerp-web
#: code:addons/web_editor/static/src/xml/ace.xml:23
#, python-format
msgid "Include All LESS Files"
-msgstr ""
+msgstr "Tüm LESS dosyalarını içerir"
#. module: web_editor
#. openerp-web
#: code:addons/web_editor/static/src/xml/ace.xml:17
#, python-format
msgid "Include Asset Bundles"
-msgstr ""
+msgstr "Varlık Paketlerini İçerir"
#. module: web_editor
#. openerp-web
#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:964
#, python-format
msgid "Indent"
-msgstr ""
+msgstr "Sipariş Ver"
#. module: web_editor
#: model:ir.ui.view,arch_db:web_editor.colorpicker
@@ -766,35 +772,35 @@ msgstr "Info"
#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:938
#, python-format
msgid "Insert Horizontal Rule"
-msgstr ""
+msgstr "Yatay Kuralı Ekle"
#. module: web_editor
#. openerp-web
#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:906
#, python-format
msgid "Insert Image"
-msgstr ""
+msgstr "Resim Ekle"
#. module: web_editor
#. openerp-web
#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:920
#, python-format
msgid "Insert Link"
-msgstr ""
+msgstr "Bağlantı Ekle"
#. module: web_editor
#. openerp-web
#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:930
#, python-format
msgid "Insert Video"
-msgstr ""
+msgstr "Video Ekle"
#. module: web_editor
#. openerp-web
#: code:addons/web_editor/static/src/xml/editor.xml:198
#, python-format
msgid "Instagram"
-msgstr ""
+msgstr "Instagram"
#. module: web_editor
#. openerp-web
@@ -808,28 +814,28 @@ msgstr "Yükle"
#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:894
#, python-format
msgid "Italic"
-msgstr ""
+msgstr "Eğik"
#. module: web_editor
#. openerp-web
#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:968
#, python-format
msgid "Justify full"
-msgstr ""
+msgstr "Tam hak ver"
#. module: web_editor
#. openerp-web
#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:981
#, python-format
msgid "Keyboard shortcuts"
-msgstr ""
+msgstr "Klavye kısa yolları"
#. module: web_editor
#. openerp-web
#: code:addons/web_editor/static/src/xml/ace.xml:11
#, python-format
msgid "LESS (CSS)"
-msgstr ""
+msgstr "LESS (CSS)"
#. module: web_editor
#. openerp-web
@@ -866,7 +872,7 @@ msgstr ""
#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:900
#, python-format
msgid "Line Height"
-msgstr ""
+msgstr "Çizgi Yüksekliği"
#. module: web_editor
#. openerp-web
@@ -880,7 +886,7 @@ msgstr "Bağlantı"
#: code:addons/web_editor/static/src/xml/editor.xml:242
#, python-format
msgid "Link Label"
-msgstr ""
+msgstr "Bağlantı Etiketi"
#. module: web_editor
#. openerp-web
@@ -894,7 +900,7 @@ msgstr "Bağlantı oluştur"
#: code:addons/web_editor/static/src/xml/editor.xml:207
#, python-format
msgid "Loop"
-msgstr ""
+msgstr "Döngü"
#. module: web_editor
#. openerp-web
@@ -928,7 +934,7 @@ msgstr "Sonraki"
#: code:addons/web_editor/static/src/xml/editor.xml:389
#, python-format
msgid "No repeat"
-msgstr ""
+msgstr "Tekrar yok"
#. module: web_editor
#. openerp-web
@@ -958,7 +964,7 @@ msgstr "Tamam"
#: code:addons/web_editor/static/src/js/editor/translator.js:93
#, python-format
msgid "Ok, never show me this again"
-msgstr ""
+msgstr "Ok, bunu tekrar gösterme"
#. module: web_editor
#. openerp-web
@@ -980,7 +986,7 @@ msgstr "Seçenekler"
#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:954
#, python-format
msgid "Ordered list"
-msgstr ""
+msgstr "Sipariş listesi"
#. module: web_editor
#. openerp-web
@@ -994,21 +1000,21 @@ msgstr ""
#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:114
#, python-format
msgid "Padding"
-msgstr ""
+msgstr "Dolgu"
#. module: web_editor
#. openerp-web
#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:962
#, python-format
msgid "Paragraph"
-msgstr ""
+msgstr "Paragraf"
#. module: web_editor
#. openerp-web
#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:985
#, python-format
msgid "Paragraph formatting"
-msgstr ""
+msgstr "Paragraf formatı"
#. module: web_editor
#. openerp-web
@@ -1049,14 +1055,14 @@ msgstr "Alıntı"
#: code:addons/web_editor/static/src/js/editor/rte.js:309
#, python-format
msgid "Readonly field"
-msgstr ""
+msgstr "Salt okunur alan"
#. module: web_editor
#. openerp-web
#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:971
#, python-format
msgid "Recent Color"
-msgstr ""
+msgstr "Mevcut Renk"
#. module: web_editor
#. openerp-web
@@ -1084,14 +1090,14 @@ msgstr "Bloku Kaldır"
#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:899
#, python-format
msgid "Remove Font Style"
-msgstr ""
+msgstr "Font Stilini Kaldır"
#. module: web_editor
#. openerp-web
#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:916
#, python-format
msgid "Remove Image"
-msgstr ""
+msgstr "Resmi Kaldır"
#. module: web_editor
#. openerp-web
@@ -1105,21 +1111,21 @@ msgstr "Tekrarla"
#: code:addons/web_editor/static/src/xml/editor.xml:390
#, python-format
msgid "Repeat both"
-msgstr ""
+msgstr "İkisini de tekrarla"
#. module: web_editor
#. openerp-web
#: code:addons/web_editor/static/src/xml/editor.xml:391
#, python-format
msgid "Repeat x"
-msgstr ""
+msgstr "x'i tekrarla"
#. module: web_editor
#. openerp-web
#: code:addons/web_editor/static/src/xml/editor.xml:392
#, python-format
msgid "Repeat y"
-msgstr ""
+msgstr "y'yi tekrarla"
#. module: web_editor
#. openerp-web
@@ -1134,35 +1140,35 @@ msgstr "Sıfırla"
#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:978
#, python-format
msgid "Reset to default"
-msgstr ""
+msgstr "Varsayılana sıfırla"
#. module: web_editor
#. openerp-web
#: code:addons/web_editor/static/src/js/widgets/ace.js:490
#, python-format
msgid "Reseting views is not supported yet"
-msgstr ""
+msgstr "Henüz desteklenmeyen görünümlerin sıfırlanması"
#. module: web_editor
#. openerp-web
#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:907
#, python-format
msgid "Resize Full"
-msgstr ""
+msgstr "Tamamını Yeniden Boyutlandır"
#. module: web_editor
#. openerp-web
#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:908
#, python-format
msgid "Resize Half"
-msgstr ""
+msgstr "Yarısını Yeniden Boyutlandır"
#. module: web_editor
#. openerp-web
#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:909
#, python-format
msgid "Resize Quarter"
-msgstr ""
+msgstr "Çeyreğini Yeniden Boyulandır"
#. module: web_editor
#. openerp-web
@@ -1185,14 +1191,14 @@ msgstr "Arama"
#: code:addons/web_editor/static/src/xml/snippets.xml:43
#, python-format
msgid "Search Contact"
-msgstr ""
+msgstr "Kişi Ara"
#. module: web_editor
#. openerp-web
#: code:addons/web_editor/static/src/xml/snippets.xml:13
#, python-format
msgid "Select Parent Container"
-msgstr ""
+msgstr "Üst Kapsayıcı Seç"
#. module: web_editor
#. openerp-web
@@ -1213,7 +1219,7 @@ msgstr "Resim Seç"
#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:914
#, python-format
msgid "Select from files"
-msgstr ""
+msgstr "Dosyalardan seç"
#. module: web_editor
#. openerp-web
@@ -1227,14 +1233,14 @@ msgstr "Sunucu hatas"
#: code:addons/web_editor/static/src/xml/editor.xml:365
#, python-format
msgid "Set the starting position of the background image."
-msgstr ""
+msgstr "Arkaplan resminin başlangıç konumunu belirle."
#. module: web_editor
#. openerp-web
#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:976
#, python-format
msgid "Set transparent"
-msgstr ""
+msgstr "Transparan ayarla"
#. module: web_editor
#. openerp-web
@@ -1244,6 +1250,8 @@ msgid ""
"Sets the width and height of the background image in percent of the parent "
"element."
msgstr ""
+"Arka plan resminin genişliğini ve yüksekliğini üst elemanın yüzdesi olarak "
+"ayarlar."
#. module: web_editor
#. openerp-web
@@ -1279,7 +1287,7 @@ msgstr "Dönme"
#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:896
#, python-format
msgid "Strikethrough"
-msgstr ""
+msgstr "Üstü Çizgili"
#. module: web_editor
#. openerp-web
@@ -1293,7 +1301,7 @@ msgstr "Stil"
#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:897
#, python-format
msgid "Subscript"
-msgstr ""
+msgstr "Abone Ol"
#. module: web_editor
#: model:ir.ui.view,arch_db:web_editor.colorpicker
@@ -1305,7 +1313,7 @@ msgstr "Başarı"
#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:898
#, python-format
msgid "Superscript"
-msgstr ""
+msgstr "Üst Simge"
#. module: web_editor
#. openerp-web
@@ -1326,14 +1334,14 @@ msgstr "Tema ID:%s"
#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:983
#, python-format
msgid "Text formatting"
-msgstr ""
+msgstr "Metin Formatı"
#. module: web_editor
#. openerp-web
#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:923
#, python-format
msgid "Text to display"
-msgstr ""
+msgstr "Gösterilecek Metin"
#. module: web_editor
#. openerp-web
@@ -1351,21 +1359,21 @@ msgstr ""
#: code:addons/web_editor/static/src/js/widgets/widgets.js:1018
#, python-format
msgid "The provided url does not reference any supported video"
-msgstr ""
+msgstr "Sağlanan url desteklenen hiç bir videoyu referans göstermiyor."
#. module: web_editor
#. openerp-web
#: code:addons/web_editor/static/src/js/widgets/widgets.js:1012
#, python-format
msgid "The provided url is not valid"
-msgstr ""
+msgstr "Sağlanan url geçersiz"
#. module: web_editor
#. openerp-web
#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:54
#, python-format
msgid "Theme colors"
-msgstr ""
+msgstr "Tema renkleri"
#. module: web_editor
#. openerp-web
@@ -1373,42 +1381,42 @@ msgstr ""
#: code:addons/web_editor/static/src/js/editor/translator.js:177
#, python-format
msgid "This document is not saved!"
-msgstr ""
+msgstr "Bu belge kaydedilmedi !"
#. module: web_editor
#. openerp-web
#: code:addons/web_editor/static/src/xml/editor.xml:147
#, python-format
msgid "This file is a public view attachment"
-msgstr ""
+msgstr "Bu belge bir ortak görünüm ekidir."
#. module: web_editor
#. openerp-web
#: code:addons/web_editor/static/src/xml/editor.xml:148
#, python-format
msgid "This file is attached to the current record"
-msgstr ""
+msgstr "Bu dosya mevcut kayda eklenmiştir."
#. module: web_editor
#. openerp-web
#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:924
#, python-format
msgid "To what URL should this link go?"
-msgstr ""
+msgstr "Bubağlantı hangi URL'ye gitmeli?"
#. module: web_editor
#. openerp-web
#: code:addons/web_editor/static/src/xml/editor.xml:40
#, python-format
msgid "Tooltip"
-msgstr ""
+msgstr "Bilgi Çubuğu"
#. module: web_editor
#. openerp-web
#: code:addons/web_editor/static/src/js/editor/translator.js:50
#, python-format
msgid "Translate Attribute"
-msgstr ""
+msgstr "Nitelikli Tercüme"
#. module: web_editor
#. openerp-web
@@ -1422,7 +1430,7 @@ msgstr "İçerik Çevrildi"
#: code:addons/web_editor/static/src/js/editor/translator.js:91
#, python-format
msgid "Translation Info"
-msgstr ""
+msgstr "Çeviri Bilgisi"
#. module: web_editor
#. openerp-web
@@ -1430,21 +1438,21 @@ msgstr ""
#: model:ir.ui.view,arch_db:web_editor.colorpicker
#, python-format
msgid "Transparent"
-msgstr ""
+msgstr "Transparan"
#. module: web_editor
#. openerp-web
#: code:addons/web_editor/static/src/xml/editor.xml:248
#, python-format
msgid "URL or Email"
-msgstr ""
+msgstr "URL yada E-posta"
#. module: web_editor
#. openerp-web
#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:895
#, python-format
msgid "Underline"
-msgstr ""
+msgstr "Altı çizili"
#. module: web_editor
#. openerp-web
@@ -1458,28 +1466,28 @@ msgstr "Geri Alma"
#: code:addons/web_editor/static/src/js/widgets/ace.js:90
#, python-format
msgid "Unexpected "
-msgstr ""
+msgstr "Beklenmeyen"
#. module: web_editor
#. openerp-web
#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:921
#, python-format
msgid "Unlink"
-msgstr ""
+msgstr "Bağlantıyı kopar"
#. module: web_editor
#. openerp-web
#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:953
#, python-format
msgid "Unordered list"
-msgstr ""
+msgstr "Sırasız liste"
#. module: web_editor
#. openerp-web
#: code:addons/web_editor/static/src/xml/editor.xml:96
#, python-format
msgid "Upload an image"
-msgstr ""
+msgstr "Bir resim yükleyin"
#. module: web_editor
#. openerp-web
@@ -1493,7 +1501,7 @@ msgstr "Resim optimizasyon olmadan yükleme"
#: code:addons/web_editor/static/src/xml/editor.xml:376
#, python-format
msgid "Vertical"
-msgstr ""
+msgstr "Dikey"
#. module: web_editor
#. openerp-web
@@ -1522,21 +1530,21 @@ msgstr "Video URL?"
#: code:addons/web_editor/static/src/xml/editor.xml:193
#, python-format
msgid "Video code"
-msgstr ""
+msgstr "Video kodu"
#. module: web_editor
#. openerp-web
#: code:addons/web_editor/static/src/xml/editor.xml:198
#, python-format
msgid "Vimeo"
-msgstr ""
+msgstr "Vimeo"
#. module: web_editor
#. openerp-web
#: code:addons/web_editor/static/src/xml/editor.xml:198
#, python-format
msgid "Vine.co"
-msgstr ""
+msgstr "Vine.co"
#. module: web_editor
#: model:ir.ui.view,arch_db:web_editor.colorpicker
@@ -1554,14 +1562,14 @@ msgstr "Beyaz"
#: code:addons/web_editor/static/src/xml/ace.xml:10
#, python-format
msgid "XML (HTML)"
-msgstr ""
+msgstr "XML (HTML)"
#. module: web_editor
#. openerp-web
#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:111
#, python-format
msgid "Xl"
-msgstr ""
+msgstr "XI"
#. module: web_editor
#. openerp-web
@@ -1575,14 +1583,14 @@ msgstr "Çeviri modu girmek üzeresiniz."
#: code:addons/web_editor/static/src/xml/editor.xml:198
#, python-format
msgid "Youku"
-msgstr ""
+msgstr "Youku"
#. module: web_editor
#. openerp-web
#: code:addons/web_editor/static/src/xml/editor.xml:198
#, python-format
msgid "Youtube"
-msgstr ""
+msgstr "Youtube"
#. module: web_editor
#. openerp-web
@@ -1599,14 +1607,14 @@ msgstr "ve"
#: code:addons/web_editor/static/src/xml/editor.xml:379
#, python-format
msgid "auto"
-msgstr ""
+msgstr "oto"
#. module: web_editor
#. openerp-web
#: code:addons/web_editor/static/src/xml/editor.xml:112
#, python-format
msgid "https://www.odoo.com/logo.png"
-msgstr ""
+msgstr "https://www.odoo.com/logo.png"
#. module: web_editor
#: model:ir.model,name:web_editor.model_ir_attachment
@@ -1708,7 +1716,7 @@ msgstr "ir.ui.view"
#: code:addons/web_editor/static/src/xml/editor.xml:198
#, python-format
msgid "videos"
-msgstr ""
+msgstr "videolar"
#. module: web_editor
#: model:ir.model,name:web_editor.model_web_editor_converter_test
diff --git a/addons/web_editor/static/lib/summernote/src/js/EventHandler.js b/addons/web_editor/static/lib/summernote/src/js/EventHandler.js
index 9701b8728d2..efa57f8111c 100644
--- a/addons/web_editor/static/lib/summernote/src/js/EventHandler.js
+++ b/addons/web_editor/static/lib/summernote/src/js/EventHandler.js
@@ -472,7 +472,8 @@ define([
onImageUpload: options.onImageUpload,
onImageUploadError: options.onImageUploadError,
onMediaDelete: options.onMediaDelete,
- onToolbarClick: options.onToolbarClick
+ onToolbarClick: options.onToolbarClick,
+ onUpload: options.onUpload,
});
var styleInfo = modules.editor.styleFromNode(layoutInfo.editable());
diff --git a/addons/web_editor/static/lib/summernote/src/js/module/Clipboard.js b/addons/web_editor/static/lib/summernote/src/js/module/Clipboard.js
index 955b49437a8..4cd9088da75 100644
--- a/addons/web_editor/static/lib/summernote/src/js/module/Clipboard.js
+++ b/addons/web_editor/static/lib/summernote/src/js/module/Clipboard.js
@@ -1,256 +1,41 @@
define([
- 'summernote/core/list',
- 'summernote/core/dom',
- 'summernote/core/key',
- 'summernote/core/agent',
- 'summernote/core/range'
+ 'summernote/core/list',
+ 'summernote/core/dom',
+ 'summernote/core/key',
+ 'summernote/core/agent',
+ 'summernote/core/range'
], function (list, dom, key, agent, range) {
- var Clipboard = function (handler) {
- var $paste;
+ // ODOO override: use 0.8.10 version of this, adapted for the old summernote
+ // version odoo is using
+ var Clipboard = function (handler) {
+ /**
+ * paste by clipboard event
+ *
+ * @param {Event} event
+ */
+ var pasteByEvent = function (event) {
+ if (["INPUT", "TEXTAREA"].indexOf(event.target.tagName) !== -1) {
+ // ODOO override: from old summernote version
+ return;
+ }
- this.attach = function (layoutInfo) {
- // [workaround] getting image from clipboard
- // - IE11 and Firefox: CTRL+v hook
- // - Webkit: event.clipboardData
- if (agent.isMSIE && agent.browserVersion > 10) {
- $paste = $('
').attr('contenteditable', true).css({
- position : 'absolute',
- left : -100000,
- opacity : 0
- });
+ var clipboardData = event.originalEvent.clipboardData;
+ var layoutInfo = dom.makeLayoutInfo(event.currentTarget || event.target);
+ var $editable = layoutInfo.editable();
- layoutInfo.editable().on('keydown', function (e) {
- if (e.ctrlKey && e.keyCode === key.code.V) {
- handler.invoke('saveRange', layoutInfo.editable());
- $paste.focus();
+ if (clipboardData && clipboardData.items && clipboardData.items.length) {
+ var item = list.head(clipboardData.items);
+ if (item.kind === 'file' && item.type.indexOf('image/') !== -1) {
+ handler.insertImages(layoutInfo, [item.getAsFile()]);
+ }
+ handler.invoke('editor.afterCommand', $editable);
+ }
+ };
- setTimeout(function () {
- pasteByHook(layoutInfo);
- }, 0);
- }
- });
-
- layoutInfo.editable().before($paste);
- } else {
- layoutInfo.editable().on('paste', pasteByEvent);
- }
+ this.attach = function (layoutInfo) {
+ layoutInfo.editable().on('paste', pasteByEvent);
+ };
};
- var pasteByHook = function (layoutInfo) {
- var $editable = layoutInfo.editable();
- var node = $paste[0].firstChild;
-
- if (dom.isImg(node)) {
- var dataURI = node.src;
- var decodedData = atob(dataURI.split(',')[1]);
- var array = new Uint8Array(decodedData.length);
- for (var i = 0; i < decodedData.length; i++) {
- array[i] = decodedData.charCodeAt(i);
- }
-
- var blob = new Blob([array], { type : 'image/png' });
- blob.name = 'clipboard.png';
-
- handler.invoke('restoreRange', $editable);
- handler.invoke('focus', $editable);
- handler.insertImages(layoutInfo, [blob]);
- } else {
- var pasteContent = $('
').html($paste.html()).html();
- handler.invoke('restoreRange', $editable);
- handler.invoke('focus', $editable);
-
- if (pasteContent) {
- handler.invoke('pasteHTML', $editable, pasteContent);
- }
- }
-
- $paste.empty();
- };
-
- /**
- * paste by clipboard event
- *
- * @param {Event} event
- */
- var pasteByEvent = function (event) {
- var clipboardData = event.originalEvent.clipboardData;
- var layoutInfo = dom.makeLayoutInfo(event.currentTarget || event.target);
- var $editable = layoutInfo.editable();
-
- if (["INPUT", "TEXTAREA"].indexOf(event.target.tagName) !== -1) {
- return;
- }
-
- if (clipboardData && clipboardData.items && clipboardData.items.length) {
- var item = list.head(clipboardData.items);
- if (item.kind === 'file' && item.type.indexOf('image/') !== -1) {
- handler.insertImages(layoutInfo, [item.getAsFile()]);
- }
- handler.invoke('editor.afterCommand', $editable);
- }
-
- event.preventDefault();
-
- var html = clipboardData.getData("text/html");
- var $node = $('
').html(html);
- // if copying source did not provide html, default to plain text
- if(!html) {
- $node.text(clipboardData.getData("text/plain")).html(function(_, html){
- return html.replace(/\r?\n/g,' tag
- */
- var $arch = $('
');
- var $last = $arch;
- $node.contents().each(function () {
- if (dom.isBR(this)) {
- $(this).remove();
- $last = $('
');
- $arch.append($last);
- } else if (/h[0-9]+|li|table|p/i.test(this.tagName)) {
- $last = $('
');
- $arch.append(this).append($last);
- } else if ($arch.is(':empty') && dom.isText(this)) {
- $last = $('
').append(this);
- $arch.append($last);
- } else if (this.nodeType !== Node.COMMENT_NODE) {
- $last.append(this);
- }
- });
- $arch.find(':not([class]):not([style]):empty, p:empty').remove();
-
- /*
- history
- */
- $editable.data('NoteHistory').recordUndo($editable, "paste");
-
- /*
- remove selected content
- */
- var r = range.create();
- if (!r.isCollapsed()) {
- r = r.deleteContents();
- r.select();
- }
-
- // If only pasting a
element in an unique
element, only paste
- // the
element text
- var $p = $arch.children('p');
- var onlyAP = ($p.length === 1 && $arch.children().length === 1);
- if (onlyAP) {
- var $p1 = $(r.sc).closest('p');
- var $p2 = $(r.ec).closest('p');
- if ($p1.length && $p2.length && $p1[0] === $p2[0]) {
- $arch.html($p.text());
- }
- }
-
- /*
- insert content
- */
- var $nodes = $();
- $editable.on('DOMNodeInserted', function (event) {
- $nodes = $nodes.add(event.originalEvent.target);
- });
- window.document.execCommand('insertHTML', false, $arch.html());
- $editable.off('DOMNodeInserted');
-
- /*
- clean insterted content
- */
- var $span = $nodes.filter('span');
- $span = $span.first().add($span.last());
- $span = $span.add($span.prev('span'));
- $span = $span.add($span.next('span'));
- filter_tag($span, $editable);
- $span.not('[span], [style]').each(function () {
- _.each(this.childNodes, function (node) {
- $(node.parentNode).after(node);
- });
- $(this).remove();
- });
- r = range.create();
- if (!dom.isText(r.ec)) {
- r = range.create(r.sc.childNodes[r.so], dom.nodeLength(r.sc.childNodes[r.so]));
- }
- r.clean().select();
-
- $editable.trigger('content_changed');
- };
- };
-
- return Clipboard;
+ return Clipboard;
});
diff --git a/addons/web_editor/static/src/js/backend/fields.js b/addons/web_editor/static/src/js/backend/fields.js
index 479a26469a3..a636b7e5be3 100644
--- a/addons/web_editor/static/src/js/backend/fields.js
+++ b/addons/web_editor/static/src/js/backend/fields.js
@@ -163,7 +163,7 @@ var FieldTextHtmlSimple = basic_fields.DebouncedField.extend(TranslatableFieldMi
if (fieldNameAttachment) {
this.fieldNameAttachment = fieldNameAttachment;
this.attachments = [];
- summernoteConfig.onImageUpload = this._onImageUpload.bind(this);
+ summernoteConfig.onUpload = this._onUpload.bind(this);
summernoteConfig.getMediaDomain = this._getAttachmentsDomain.bind(this);
}
@@ -195,7 +195,7 @@ var FieldTextHtmlSimple = basic_fields.DebouncedField.extend(TranslatableFieldMi
*
* @private
*/
- _onImageUpload: function (attachments) {
+ _onUpload: function (attachments) {
var self = this;
attachments = _.filter(attachments, function (attachment) {
return !_.findWhere(self.attachments, {id: attachment.id});
diff --git a/addons/web_editor/static/src/js/editor/rte.summernote.js b/addons/web_editor/static/src/js/editor/rte.summernote.js
index ddf588eb569..3de70e5fcda 100644
--- a/addons/web_editor/static/src/js/editor/rte.summernote.js
+++ b/addons/web_editor/static/src/js/editor/rte.summernote.js
@@ -397,7 +397,7 @@ eventHandler.modules.imageDialog.showImageDialog = function ($editable) {
media: media,
options: {
lastFilters: ['background'],
- onUpload: $editable.data('callbacks').onImageUpload,
+ onUpload: $editable.data('callbacks').onUpload,
},
});
return new $.Deferred().reject();
@@ -675,7 +675,7 @@ function summernote_mousedown(event) {
return;
}
var editables = $(".o_editable[contenteditable], .note-editable[contenteditable]");
- var r_editable = editables.has((r||{}).sc);
+ var r_editable = editables.has((r||{}).sc).addBack(editables.filter((r||{}).sc));
if (!r_editable.closest('.note-editor').is($editable) && !r_editable.filter('.o_editable').is(editables)) {
var saved_editable = editables.has((remember_selection||{}).sc);
if ($editable.length && !saved_editable.closest('.o_editable, .note-editor').is($editable)) {
diff --git a/addons/website/models/website.py b/addons/website/models/website.py
index 09dced17b03..8058c6d8cda 100644
--- a/addons/website/models/website.py
+++ b/addons/website/models/website.py
@@ -884,9 +884,10 @@ class Menu(models.Model):
for menu in data['data']:
menu_id = self.browse(menu['id'])
# if the url match a website.page, set the m2o relation
- page = self.env['website.page'].search([('url', '=', menu['url'])], limit=1)
+ page = self.env['website.page'].search(['|', ('url', '=', menu['url']), ('url', '=', '/' + menu['url'])], limit=1)
if page:
menu['page_id'] = page.id
+ menu['url'] = page.url
elif menu_id.page_id:
menu_id.page_id.write({'url': menu['url']})
menu_id.write(menu)
diff --git a/addons/website/views/website_templates.xml b/addons/website/views/website_templates.xml
index fb6f004f27f..e1a2af66317 100644
--- a/addons/website/views/website_templates.xml
+++ b/addons/website/views/website_templates.xml
@@ -74,7 +74,7 @@
diff --git a/addons/website_event/static/src/js/website_event.js b/addons/website_event/static/src/js/website_event.js
index c677b0bda2c..3aa8691fca7 100644
--- a/addons/website_event/static/src/js/website_event.js
+++ b/addons/website_event/static/src/js/website_event.js
@@ -41,6 +41,7 @@ var EventRegistrationForm = Widget.extend({
ev.preventDefault();
ev.stopPropagation();
var $form = $(ev.currentTarget).closest('form');
+ var $button = $(ev.currentTarget).closest('[type="submit"]');
var post = {};
$('#registration_form select').each(function () {
post[$(this).attr('name')] = $(this).val();
@@ -54,9 +55,10 @@ var EventRegistrationForm = Widget.extend({
return ajax.jsonRpc($form.attr('action'), 'call', post).then(function (modal) {
var $modal = $(modal);
$modal.find('.modal-body > div').removeClass('container'); // retrocompatibility - REMOVE ME in master / saas-19
- $modal.after($form).modal();
+ $modal.insertAfter($form).modal();
$modal.on('click', '.js_goto_event', function () {
$modal.modal('hide');
+ $button.prop('disabled', false);
});
});
}
diff --git a/addons/website_forum/static/src/js/website_forum.js b/addons/website_forum/static/src/js/website_forum.js
index 255ba20b87e..96cc4946b64 100644
--- a/addons/website_forum/static/src/js/website_forum.js
+++ b/addons/website_forum/static/src/js/website_forum.js
@@ -25,13 +25,14 @@ odoo.define('website_forum.website_forum', function (require) {
if ($('a[href*="/login"]').length) {
msg = _t('Sorry you must be logged in to perform this action');
}
- var $warning = $(''+
+ var $warning = $('
'+
'× '+
msg + '
');
- var vote_alert = $(ev.currentTarget).parent().find("#vote_alert");
- if (vote_alert.length === 0) {
- $(ev.currentTarget).parent().append($warning);
+ var $voteAlert = $('#karma_alert');
+ if ($voteAlert.length) {
+ $voteAlert.remove();
}
+ $(ev.currentTarget).after($warning);
}
});
diff --git a/addons/website_forum/static/src/less/website_forum.less b/addons/website_forum/static/src/less/website_forum.less
index fde4b88d78c..b4fb02792c2 100644
--- a/addons/website_forum/static/src/less/website_forum.less
+++ b/addons/website_forum/static/src/less/website_forum.less
@@ -130,6 +130,7 @@ a.no-decoration {
.close.comment_delete {
font-size: 16px;
+ float: none;
}
.country_flag {
@@ -154,8 +155,6 @@ a.no-decoration {
.oe_forum_alert {
position: absolute;
- margin-top: -30px;
- margin-left: 90px;
width: 300px;
z-index: 9999;
}
diff --git a/addons/website_forum/views/website_forum.xml b/addons/website_forum/views/website_forum.xml
index 3fc580ef4a5..af35b1356a8 100644
--- a/addons/website_forum/views/website_forum.xml
+++ b/addons/website_forum/views/website_forum.xml
@@ -32,7 +32,7 @@
-