summaryrefslogtreecommitdiff
path: root/addons/sale
diff options
context:
space:
mode:
authorLaunchpad Translations on behalf of openerp <>2011-12-23 07:36:09 +0000
committerLaunchpad Translations on behalf of openerp <>2011-12-23 07:36:09 +0000
commita6c649dd4e590b4f60fe2236701c9beeaee971e0 (patch)
treedbd455612b810575f239e3dfcfa65be4bc16a195 /addons/sale
parent8e66fe7f89937d2e346303304c9541248dfebd00 (diff)
Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20111223054503-il515335tdfkghbw bzr revid: launchpad_translations_on_behalf_of_openerp-20111223073609-mpe8e232ykba47y0
Diffstat (limited to 'addons/sale')
-rw-r--r--addons/sale/i18n/ar.po1142
-rw-r--r--addons/sale/i18n/bg.po1066
-rw-r--r--addons/sale/i18n/bs.po968
-rw-r--r--addons/sale/i18n/ca.po1349
-rw-r--r--addons/sale/i18n/cs.po1147
-rw-r--r--addons/sale/i18n/da.po945
-rw-r--r--addons/sale/i18n/de.po1351
-rw-r--r--addons/sale/i18n/el.po1086
-rw-r--r--addons/sale/i18n/es.po1349
-rw-r--r--addons/sale/i18n/es_AR.po970
-rw-r--r--addons/sale/i18n/es_CL.po1289
-rw-r--r--addons/sale/i18n/es_EC.po1155
-rw-r--r--addons/sale/i18n/et.po976
-rw-r--r--addons/sale/i18n/fi.po1210
-rw-r--r--addons/sale/i18n/fr.po1355
-rw-r--r--addons/sale/i18n/gl.po916
-rw-r--r--addons/sale/i18n/hr.po1319
-rw-r--r--addons/sale/i18n/hu.po1718
-rw-r--r--addons/sale/i18n/id.po1344
-rw-r--r--addons/sale/i18n/it.po1353
-rw-r--r--addons/sale/i18n/ko.po970
-rw-r--r--addons/sale/i18n/lt.po968
-rw-r--r--addons/sale/i18n/lv.po965
-rw-r--r--addons/sale/i18n/mn.po1094
-rw-r--r--addons/sale/i18n/nb.po1202
-rw-r--r--addons/sale/i18n/nl.po1343
-rw-r--r--addons/sale/i18n/oc.po890
-rw-r--r--addons/sale/i18n/pl.po1324
-rw-r--r--addons/sale/i18n/pt.po1075
-rw-r--r--addons/sale/i18n/pt_BR.po1326
-rw-r--r--addons/sale/i18n/ro.po1350
-rw-r--r--addons/sale/i18n/ru.po1333
-rw-r--r--addons/sale/i18n/sk.po1072
-rw-r--r--addons/sale/i18n/sl.po1106
-rw-r--r--addons/sale/i18n/sq.po890
-rw-r--r--addons/sale/i18n/sr.po1132
-rw-r--r--addons/sale/i18n/sr@latin.po1132
-rw-r--r--addons/sale/i18n/sv.po1204
-rw-r--r--addons/sale/i18n/th.po964
-rw-r--r--addons/sale/i18n/tlh.po890
-rw-r--r--addons/sale/i18n/tr.po1308
-rw-r--r--addons/sale/i18n/uk.po943
-rw-r--r--addons/sale/i18n/vi.po1025
-rw-r--r--addons/sale/i18n/zh_CN.po1293
-rw-r--r--addons/sale/i18n/zh_TW.po970
45 files changed, 32488 insertions, 19289 deletions
diff --git a/addons/sale/i18n/ar.po b/addons/sale/i18n/ar.po
index 6b96c7e08eb..1660ab7a4ff 100644
--- a/addons/sale/i18n/ar.po
+++ b/addons/sale/i18n/ar.po
@@ -6,15 +6,27 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2011-01-11 11:16+0000\n"
+"POT-Creation-Date: 2011-12-22 18:43+0000\n"
"PO-Revision-Date: 2011-11-05 10:31+0000\n"
"Last-Translator: Ahmad Khayyat <Unknown>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-06 05:23+0000\n"
-"X-Generator: Launchpad (build 14231)\n"
+"X-Launchpad-Export-Date: 2011-12-23 06:46+0000\n"
+"X-Generator: Launchpad (build 14560)\n"
+
+#. module: sale
+#: field:sale.config.picking_policy,timesheet:0
+msgid "Based on Timesheet"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid ""
+"Sale Order Lines that are confirmed, done or in exception state and haven't "
+"yet been invoiced"
+msgstr ""
#. module: sale
#: view:board.board:0
@@ -23,11 +35,6 @@ msgid "Sales by Salesman in last 90 days"
msgstr "مبيعات مندوب المبيعات آخر 90 يوماً"
#. module: sale
-#: help:sale.installer,delivery:0
-msgid "Allows you to compute delivery costs on your quotations."
-msgstr "إضافة إمكانية حساب تكاليف التسليم في التسعيرات."
-
-#. module: sale
#: help:sale.order,picking_policy:0
msgid ""
"If you don't have enough stock available to deliver all at once, do you "
@@ -37,6 +44,11 @@ msgstr ""
"بالشحن الجزئي؟"
#. module: sale
+#: view:sale.order:0
+msgid "UoS"
+msgstr ""
+
+#. module: sale
#: help:sale.order,partner_shipping_id:0
msgid "Shipping address for current sales order."
msgstr "عنوان الشحن لطلب المبيعات الحالي"
@@ -60,22 +72,12 @@ msgid "Cancel Order"
msgstr "إلغاء الطلب"
#. module: sale
-#: view:sale.config.picking_policy:0
-msgid "Configure Sales Order Logistics"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:603
+#: code:addons/sale/sale.py:638
#, python-format
msgid "The quotation '%s' has been converted to a sales order."
msgstr "تم تحويل العرض المالي '%s' إلى طلب مبيعات"
#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Payment Before Delivery"
-msgstr "الدفع قبل التسليم"
-
-#. module: sale
#: code:addons/sale/wizard/sale_make_invoice.py:42
#, python-format
msgid "Warning !"
@@ -92,12 +94,6 @@ msgid "Drives procurement orders for every sales order line."
msgstr "يحدد أوامر التحصيل لكل سطر في أوامر المبيعات."
#. module: sale
-#: selection:sale.config.picking_policy,picking_policy:0
-msgid "All at Once"
-msgstr "الجميع معاً"
-
-#. module: sale
-#: field:sale.order,project_id:0
#: view:sale.report:0
#: field:sale.report,analytic_account_id:0
#: field:sale.shop,project_id:0
@@ -116,6 +112,15 @@ msgstr ""
"تقوم بالفوترة حسب أوامر التسليم أو إذا كنت لا تستخدم الفوترة الجزئية."
#. module: sale
+#: code:addons/sale/sale.py:295
+#, python-format
+msgid ""
+"In order to delete a confirmed sale order, you must cancel it before ! To "
+"cancel a sale order, you must first cancel related picking or delivery "
+"orders."
+msgstr ""
+
+#. module: sale
#: model:process.node,name:sale.process_node_saleprocurement0
msgid "Procurement Order"
msgstr "أمر تحصيل"
@@ -127,6 +132,11 @@ msgid "Partner"
msgstr "شريك"
#. module: sale
+#: selection:sale.order,order_policy:0
+msgid "Invoice based on deliveries"
+msgstr ""
+
+#. module: sale
#: view:sale.order:0
msgid "Order Line"
msgstr "سطر الأمر"
@@ -159,9 +169,14 @@ msgid "Default Payment Term"
msgstr "أجل السداد الافتراضي"
#. module: sale
-#: model:ir.actions.act_window,name:sale.action_config_picking_policy
-msgid "Configure Picking Policy for Sales Order"
-msgstr "إعدادات سياسة الالتقاط لأمر المبيعات"
+#: field:sale.config.picking_policy,deli_orders:0
+msgid "Based on Delivery Orders"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.picking_policy,time_unit:0
+msgid "Main Working Time Unit"
+msgstr ""
#. module: sale
#: view:sale.order:0
@@ -177,9 +192,10 @@ msgid "Disc.(%)"
msgstr "نسبة الخصم (%)"
#. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_forceassignation0
-msgid "Force Assignation"
-msgstr ""
+#: view:sale.report:0
+#: field:sale.report,price_total:0
+msgid "Total Price"
+msgstr "السعر الإجمالي"
#. module: sale
#: help:sale.make.invoice,grouped:0
@@ -187,6 +203,11 @@ msgid "Check the box to group the invoices for the same customers"
msgstr "اختر لتجميع الفواتير حسب العميل"
#. module: sale
+#: view:sale.order:0
+msgid "My Sale Orders"
+msgstr ""
+
+#. module: sale
#: selection:sale.order,invoice_quantity:0
msgid "Ordered Quantities"
msgstr "الكميات المطلوبة"
@@ -225,14 +246,25 @@ msgid ""
msgstr ""
#. module: sale
+#: field:sale.config.picking_policy,task_work:0
+msgid "Based on Tasks' Work"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
+msgid "Quotations and Sales"
+msgstr ""
+
+#. module: sale
#: model:ir.model,name:sale.model_sale_make_invoice
msgid "Sales Make Invoice"
msgstr ""
#. module: sale
-#: view:sale.order:0
-msgid "Recreate Packing"
-msgstr "إعادة إنشاء التعبئة"
+#: code:addons/sale/sale.py:330
+#, python-format
+msgid "Pricelist Warning!"
+msgstr ""
#. module: sale
#: field:sale.order.line,discount:0
@@ -240,10 +272,10 @@ msgid "Discount (%)"
msgstr "الخصم (%)"
#. module: sale
-#: help:res.company,security_lead:0
-msgid ""
-"This is the days added to what you promise to customers for security purpose"
-msgstr "الأيام المضافة لأسباب أمنية"
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_quotation_for_sale
+msgid "My Quotations"
+msgstr ""
#. module: sale
#: view:board.board:0
@@ -268,7 +300,22 @@ msgid "Shop Name"
msgstr "اسم المتجر"
#. module: sale
-#: code:addons/sale/sale.py:1014
+#: help:sale.order,order_policy:0
+msgid ""
+"The Invoice Policy is used to synchronise invoice and delivery operations.\n"
+" - The 'Pay before delivery' choice will first generate the invoice and "
+"then generate the picking order after the payment of this invoice.\n"
+" - The 'Deliver & Invoice on demand' will create the picking order directly "
+"and wait for the user to manually click on the 'Invoice' button to generate "
+"the draft invoice based on the sale order or the sale order lines.\n"
+" - The 'Invoice on order after delivery' choice will generate the draft "
+"invoice based on sales order after all picking lists have been finished.\n"
+" - The 'Invoice based on deliveries' choice is used to create an invoice "
+"during the picking process."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:1158
#, python-format
msgid "No Customer Defined !"
msgstr "لا يوجد عملاء"
@@ -279,9 +326,12 @@ msgid "Sales in Exception"
msgstr "المبيعات ذات الخلل"
#. module: sale
-#: view:sale.order:0
-msgid "Set to Draft"
-msgstr "مسودّة"
+#: code:addons/sale/sale.py:1145
+#: code:addons/sale/sale.py:1264
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:70
+#, python-format
+msgid "Configuration Error !"
+msgstr ""
#. module: sale
#: view:sale.order:0
@@ -289,22 +339,7 @@ msgid "Conditions"
msgstr ""
#. module: sale
-#: help:sale.order,order_policy:0
-msgid ""
-"The Shipping Policy is used to synchronise invoice and delivery operations.\n"
-" - The 'Pay Before delivery' choice will first generate the invoice and "
-"then generate the picking order after the payment of this invoice.\n"
-" - The 'Shipping & Manual Invoice' will create the picking order directly "
-"and wait for the user to manually click on the 'Invoice' button to generate "
-"the draft invoice.\n"
-" - The 'Invoice On Order After Delivery' choice will generate the draft "
-"invoice based on sales order after all picking lists have been finished.\n"
-" - The 'Invoice From The Picking' choice is used to create an invoice "
-"during the picking process."
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:939
+#: code:addons/sale/sale.py:1034
#, python-format
msgid ""
"There is no income category account defined in default Properties for "
@@ -312,9 +347,9 @@ msgid ""
msgstr ""
#. module: sale
-#: view:sale.installer:0
-msgid "Configure"
-msgstr "ضبط الإعدادات"
+#: selection:sale.report,month:0
+msgid "August"
+msgstr "أغسطس/آب"
#. module: sale
#: constraint:stock.move:0
@@ -322,7 +357,7 @@ msgid "You try to assign a lot which is not from the same product"
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:620
+#: code:addons/sale/sale.py:655
#, python-format
msgid "invalid mode for test_state"
msgstr ""
@@ -333,7 +368,7 @@ msgid "June"
msgstr "يونيو/حزيران"
#. module: sale
-#: code:addons/sale/sale.py:584
+#: code:addons/sale/sale.py:617
#, python-format
msgid "Could not cancel this sales order !"
msgstr "لم يمكن إلغاء أمر البيع"
@@ -354,8 +389,12 @@ msgid "October"
msgstr "أكتوبر/تشرين الأول"
#. module: sale
+#: sql_constraint:stock.picking:0
+msgid "Reference must be unique per Company!"
+msgstr ""
+
+#. module: sale
#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_quotation_for_sale
#: view:sale.order:0
#: view:sale.report:0
msgid "Quotations"
@@ -367,11 +406,6 @@ msgid "Pricelist for current sales order."
msgstr "قائمة الأسعار لأمر البيع الحالي"
#. module: sale
-#: selection:sale.config.picking_policy,step:0
-msgid "Delivery Order Only"
-msgstr "أمر تسليم فقط"
-
-#. module: sale
#: report:sale.order:0
msgid "TVA :"
msgstr ""
@@ -396,6 +430,7 @@ msgstr "الوضع المالي"
#. module: sale
#: view:sale.order:0
#: view:sale.order.line:0
+#: field:sale.report,product_uom:0
msgid "UoM"
msgstr "وحدة القياس"
@@ -420,13 +455,19 @@ msgstr ""
"'قيد التنفيذ يدوياً'."
#. module: sale
-#: code:addons/sale/sale.py:971
+#: code:addons/sale/sale.py:1061
+#, python-format
+msgid "You cannot cancel a sale order line that has already been invoiced!"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:1066
#, python-format
msgid "You must first cancel stock moves attached to this sales order line."
msgstr "يجب أولاً أن تلغي عمليات نقل المخزون المرتبطة بسطر أمر المبيعات هذا."
#. module: sale
-#: code:addons/sale/sale.py:1042
+#: code:addons/sale/sale.py:1134
#, python-format
msgid "(n/a)"
msgstr "(غير ممكن)"
@@ -460,14 +501,36 @@ msgid "Notes"
msgstr "ملاحظات"
#. module: sale
+#: sql_constraint:res.company:0
+msgid "The company name must be unique !"
+msgstr ""
+
+#. module: sale
#: help:sale.order,partner_invoice_id:0
msgid "Invoice address for current sales order."
msgstr "عنوان الفاتورة لأمر البيع الحالي"
#. module: sale
-#: view:sale.installer:0
-msgid "Enhance your core Sales Application with additional functionalities."
-msgstr "تحسين تطبيق المبيعات بإمكانيات إضافية."
+#: view:sale.report:0
+msgid "Month-1"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered month of the sales order"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:504
+#, python-format
+msgid ""
+"You cannot group sales having different currencies for the same partner."
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,picking_policy:0
+msgid "Deliver each product when available"
+msgstr ""
#. module: sale
#: field:sale.order,invoiced_rate:0
@@ -486,14 +549,14 @@ msgid "Confirmation Date"
msgstr "تاريخ التأكيد"
#. module: sale
-#: field:sale.order.line,address_allotment_id:0
-msgid "Allotment Partner"
+#: field:sale.order,incoterm:0
+msgid "Incoterm"
msgstr ""
#. module: sale
-#: sql_constraint:sale.order:0
-msgid "Order Reference must be unique !"
-msgstr "لا بدّ أن يكون مرجع الأمر فريداً"
+#: field:sale.order.line,address_allotment_id:0
+msgid "Allotment Partner"
+msgstr ""
#. module: sale
#: selection:sale.report,month:0
@@ -501,6 +564,28 @@ msgid "March"
msgstr "مارس/آذار"
#. module: sale
+#: constraint:stock.move:0
+msgid "You can not move products from or to a location of the type view."
+msgstr ""
+
+#. module: sale
+#: field:sale.config.picking_policy,sale_orders:0
+msgid "Based on Sales Orders"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,state:0
+msgid ""
+"Givwizard = self.browse(cr, uid, ids)[0]es the state of the quotation or "
+"sales order. \n"
+"The exception state is automatically set when a cancel operation occurs in "
+"the invoice validation (Invoice Exception) or in the picking list process "
+"(Shipping Exception). \n"
+"The 'Waiting Schedule' state is set when the invoice is confirmed but "
+"waiting for the scheduler to run on the order date."
+msgstr ""
+
+#. module: sale
#: help:sale.order,amount_total:0
msgid "The total amount."
msgstr "المبلغ الإجمالي"
@@ -516,6 +601,11 @@ msgid "Invoice address :"
msgstr "عنوان الفاتورة:"
#. module: sale
+#: field:sale.order.line,sequence:0
+msgid "Line Sequence"
+msgstr ""
+
+#. module: sale
#: model:process.transition,note:sale.process_transition_saleorderprocurement0
msgid ""
"For every sales order line, a procurement order is created to supply the "
@@ -562,11 +652,6 @@ msgid "Sales Order Line"
msgstr "سطر أمر المبيعات"
#. module: sale
-#: view:sale.config.picking_policy:0
-msgid "Setup your sales workflow and default values."
-msgstr "إعداد سير عمل المبيعات والقيم الافتراضية"
-
-#. module: sale
#: field:sale.shop,warehouse_id:0
msgid "Warehouse"
msgstr "المستودع"
@@ -603,6 +688,11 @@ msgid "Creation Date"
msgstr "تاريخ الإنشاء"
#. module: sale
+#: model:ir.ui.menu,name:sale.menu_sales_configuration_misc
+msgid "Miscellaneous"
+msgstr ""
+
+#. module: sale
#: model:ir.actions.act_window,name:sale.action_order_line_tree3
msgid "Uninvoiced and Delivered Lines"
msgstr "السطور المستلمة غير المفوترة"
@@ -618,14 +708,19 @@ msgid "My Sales"
msgstr "مبيعاتي"
#. module: sale
-#: code:addons/sale/sale.py:290
-#: code:addons/sale/sale.py:966
-#: code:addons/sale/sale.py:1165
+#: code:addons/sale/sale.py:295
+#: code:addons/sale/sale.py:1061
+#: code:addons/sale/sale.py:1290
#, python-format
msgid "Invalid action !"
msgstr "لا يمكن إجراء هذه العملية!"
#. module: sale
+#: view:sale.order:0
+msgid "Extra Info"
+msgstr "معلومات إضافية"
+
+#. module: sale
#: field:sale.order,pricelist_id:0
#: field:sale.report,pricelist_id:0
#: field:sale.shop,pricelist_id:0
@@ -639,13 +734,21 @@ msgid "# of Qty"
msgstr ""
#. module: sale
+#: code:addons/sale/sale.py:1314
+#, python-format
+msgid "Hour"
+msgstr ""
+
+#. module: sale
#: view:sale.order:0
msgid "Order Date"
msgstr "تاريخ الأمر"
#. module: sale
#: view:sale.order.line:0
+#: view:sale.report:0
#: field:sale.report,shipped:0
+#: field:sale.report,shipped_qty_1:0
msgid "Shipped"
msgstr "تمّ الشحن"
@@ -655,9 +758,9 @@ msgid "All Quotations"
msgstr "جميع التسعيرات"
#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Invoice On Order After Delivery"
-msgstr "أصدر فاتورة الأمر بعد التسليم"
+#: view:sale.config.picking_policy:0
+msgid "Options"
+msgstr ""
#. module: sale
#: selection:sale.report,month:0
@@ -665,6 +768,20 @@ msgid "September"
msgstr "سبتمبر/أيلول"
#. module: sale
+#: code:addons/sale/sale.py:632
+#, python-format
+msgid "You cannot confirm a sale order which has no line."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:1246
+#, python-format
+msgid ""
+"You have to select a pricelist or a customer in the sales form !\n"
+"Please set one before choosing a product."
+msgstr ""
+
+#. module: sale
#: view:sale.report:0
#: field:sale.report,categ_id:0
msgid "Category of Product"
@@ -681,11 +798,6 @@ msgid "Stock Moves"
msgstr "تحركات المخزون"
#. module: sale
-#: view:sale.report:0
-msgid " Year "
-msgstr " السنة "
-
-#. module: sale
#: field:sale.order,state:0
#: field:sale.report,state:0
msgid "Order State"
@@ -703,7 +815,7 @@ msgid "Sales By Month"
msgstr "المبيعات حسب الشهر"
#. module: sale
-#: code:addons/sale/sale.py:970
+#: code:addons/sale/sale.py:1065
#, python-format
msgid "Could not cancel sales order line!"
msgstr "لم يمكن إلغاء سطر أمر المبيعات!"
@@ -737,42 +849,19 @@ msgstr ""
"تمّ تسليم أمر المبيعات. لا يتمّ تحديث هذا الحقل إلا بعد تشغيل المجدوِل."
#. module: sale
+#: field:sale.order,date_order:0
+msgid "Date"
+msgstr ""
+
+#. module: sale
#: view:sale.report:0
msgid "Extended Filters..."
msgstr "مرشحات مفصلة"
#. module: sale
-#: model:ir.module.module,description:sale.module_meta_information
-msgid ""
-"\n"
-" The base module to manage quotations and sales orders.\n"
-"\n"
-" * Workflow with validation steps:\n"
-" - Quotation -> Sales order -> Invoice\n"
-" * Invoicing methods:\n"
-" - Invoice on order (before or after shipping)\n"
-" - Invoice on delivery\n"
-" - Invoice on timesheets\n"
-" - Advance invoice\n"
-" * Partners preferences (shipping, invoicing, incoterm, ...)\n"
-" * Products stocks and prices\n"
-" * Delivery methods:\n"
-" - all at once, multi-parcel\n"
-" - delivery costs\n"
-" * Dashboard for salesman that includes:\n"
-" * Your open quotations\n"
-" * Top 10 sales of the month\n"
-" * Cases statistics\n"
-" * Graph of sales by product\n"
-" * Graph of cases of the month\n"
-" "
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_shop
-#: view:sale.shop:0
-msgid "Sales Shop"
-msgstr "متجر المبيعات"
+#: selection:sale.order.line,state:0
+msgid "Exception"
+msgstr "استثناء"
#. module: sale
#: model:ir.model,name:sale.model_res_company
@@ -780,9 +869,10 @@ msgid "Companies"
msgstr "الشركات"
#. module: sale
-#: selection:sale.report,month:0
-msgid "November"
-msgstr "نوفمبر/تشرين الثاني"
+#: code:addons/sale/sale.py:1259
+#, python-format
+msgid "No valid pricelist line found ! :"
+msgstr ""
#. module: sale
#: view:sale.order:0
@@ -790,9 +880,9 @@ msgid "History"
msgstr "المحفوظات"
#. module: sale
-#: field:sale.config.picking_policy,picking_policy:0
-msgid "Picking Default Policy"
-msgstr "اختيار السياسة الافتراضية"
+#: selection:sale.order,order_policy:0
+msgid "Invoice on order after delivery"
+msgstr ""
#. module: sale
#: help:sale.order,invoice_ids:0
@@ -816,13 +906,12 @@ msgid ""
msgstr "اسم وعنوان جهة الاتصال التي طلبت الأمر أو التسعيرة"
#. module: sale
-#: code:addons/sale/sale.py:966
-#, python-format
-msgid "You cannot cancel a sales order line that has already been invoiced !"
-msgstr "لا يمكنك إلغاء أمر مبيعات تمّت فوترته!"
+#: help:res.company,security_lead:0
+msgid ""
+"This is the days added to what you promise to customers for security purpose"
+msgstr "الأيام المضافة لأسباب أمنية"
#. module: sale
-#: view:sale.order:0
#: view:sale.order.line:0
msgid "Qty"
msgstr "الكمية"
@@ -833,6 +922,11 @@ msgid "References"
msgstr "المراجع"
#. module: sale
+#: view:sale.order.line:0
+msgid "My Sales Order Lines"
+msgstr ""
+
+#. module: sale
#: model:process.transition.action,name:sale.process_transition_action_cancel0
#: model:process.transition.action,name:sale.process_transition_action_cancel1
#: model:process.transition.action,name:sale.process_transition_action_cancel2
@@ -844,14 +938,9 @@ msgid "Cancel"
msgstr "إلغاء"
#. module: sale
-#: field:sale.installer,sale_order_dates:0
-msgid "Sales Order Dates"
-msgstr "تواريخ أوامر المبيعات"
-
-#. module: sale
-#: selection:sale.order.line,state:0
-msgid "Exception"
-msgstr "استثناء"
+#: sql_constraint:sale.order:0
+msgid "Order Reference must be unique per Company!"
+msgstr ""
#. module: sale
#: model:process.transition,name:sale.process_transition_invoice0
@@ -863,19 +952,19 @@ msgid "Create Invoice"
msgstr "إنشاء فاتورة"
#. module: sale
-#: field:sale.installer,sale_margin:0
-msgid "Margins in Sales Orders"
-msgstr "هوامش أوامر المبيعات"
-
-#. module: sale
#: view:sale.order:0
msgid "Total Tax Excluded"
msgstr "المجموع دون ضرائب"
#. module: sale
-#: view:sale.order:0
-msgid "Compute"
-msgstr "احسب"
+#: view:sale.order.line:0
+msgid "Order reference"
+msgstr ""
+
+#. module: sale
+#: view:sale.open.invoice:0
+msgid "You invoice has been successfully created!"
+msgstr "تمّ إنشاء الفاتورة بنجاح!"
#. module: sale
#: view:sale.report:0
@@ -894,23 +983,20 @@ msgid "Open Invoice"
msgstr "فاتورة غير مسددة"
#. module: sale
-#: report:sale.order:0
-#: view:sale.order.line:0
-msgid "Price"
-msgstr "السعر"
+#: model:ir.actions.server,name:sale.ir_actions_server_edi_sale
+msgid "Auto-email confirmed sale orders"
+msgstr ""
#. module: sale
-#: model:ir.actions.act_window,name:sale.action_sale_installer
-#: view:sale.config.picking_policy:0
-#: view:sale.installer:0
-msgid "Sales Application Configuration"
-msgstr "إعدادات تطبيق المبيعات"
+#: code:addons/sale/sale.py:413
+#, python-format
+msgid "There is no sales journal defined for this company: \"%s\" (id:%d)"
+msgstr "لا يوجد دفتر يومية مبيعات معرّف لهذه الشركة: \"%s\" (id: %d)"
#. module: sale
-#: view:sale.report:0
-#: field:sale.report,price_total:0
-msgid "Total Price"
-msgstr "السعر الإجمالي"
+#: model:process.transition.action,name:sale.process_transition_action_forceassignation0
+msgid "Force Assignation"
+msgstr ""
#. module: sale
#: selection:sale.order.line,type:0
@@ -923,6 +1009,11 @@ msgid "Based on the shipped or on the ordered quantities."
msgstr "بناءً على الكميات المشحونة أو المطلوبة"
#. module: sale
+#: selection:sale.order,picking_policy:0
+msgid "Deliver all products at once"
+msgstr ""
+
+#. module: sale
#: field:sale.order,picking_ids:0
msgid "Related Picking"
msgstr "عمليات التقاط ذات علاقة"
@@ -954,9 +1045,15 @@ msgid "Create Delivery Order"
msgstr "إنشاء أمر تسليم"
#. module: sale
-#: field:sale.installer,delivery:0
-msgid "Delivery Costs"
-msgstr "تكاليف التسليم"
+#: code:addons/sale/sale.py:1290
+#, python-format
+msgid "Cannot delete a sales order line which is in state '%s'!"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Qty(UoS)"
+msgstr ""
#. module: sale
#: view:sale.order:0
@@ -970,13 +1067,13 @@ msgstr "إنشاء قائمة الالتقاط"
#. module: sale
#: view:sale.report:0
-msgid "Sales by Product Category"
-msgstr "المبيعات حسب فئة المنتج"
+msgid "Ordered date of the sales order"
+msgstr ""
#. module: sale
-#: selection:sale.order,picking_policy:0
-msgid "Partial Delivery"
-msgstr "التسليم الجزئي"
+#: view:sale.report:0
+msgid "Sales by Product Category"
+msgstr "المبيعات حسب فئة المنتج"
#. module: sale
#: model:process.transition,name:sale.process_transition_confirmquotation0
@@ -984,9 +1081,10 @@ msgid "Confirm Quotation"
msgstr "تأكيد التسعيرة"
#. module: sale
-#: help:sale.order,origin:0
-msgid "Reference of the document that generated this sales order request."
-msgstr "مرجع المستند الذي أصدر طلب أمر المبيعات هذا"
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:63
+#, python-format
+msgid "Error"
+msgstr "خطأ"
#. module: sale
#: view:sale.order:0
@@ -1018,20 +1116,14 @@ msgid "Procurement Method"
msgstr "طريقة التحصيل"
#. module: sale
-#: view:sale.config.picking_policy:0
-#: view:sale.installer:0
-msgid "title"
-msgstr "العنوان"
-
-#. module: sale
#: model:process.node,name:sale.process_node_packinglist0
msgid "Pick List"
msgstr "قائمة الالتقاط"
#. module: sale
#: view:sale.order:0
-msgid "Order date"
-msgstr "تاريخ الأمر"
+msgid "Set to Draft"
+msgstr "مسودّة"
#. module: sale
#: model:process.node,note:sale.process_node_packinglist0
@@ -1039,6 +1131,85 @@ msgid "Document of the move to the output or to the customer."
msgstr ""
#. module: sale
+#: model:email.template,body_text:sale.email_template_edi_sale
+msgid ""
+"\n"
+"Hello${object.partner_order_id.name and ' ' or "
+"''}${object.partner_order_id.name or ''},\n"
+"\n"
+"Here is your order confirmation for ${object.partner_id.name}:\n"
+" | Order number: *${object.name}*\n"
+" | Order total: *${object.amount_total} "
+"${object.pricelist_id.currency_id.name}*\n"
+" | Order date: ${object.date_order}\n"
+" % if object.origin:\n"
+" | Order reference: ${object.origin}\n"
+" % endif\n"
+" % if object.client_order_ref:\n"
+" | Your reference: ${object.client_order_ref}<br />\n"
+" % endif\n"
+" | Your contact: ${object.user_id.name} ${object.user_id.user_email "
+"and '<%s>'%(object.user_id.user_email) or ''}\n"
+"\n"
+"You can view the order confirmation, download it and even pay online using "
+"the following link:\n"
+" ${ctx.get('edi_web_url_view') or 'n/a'}\n"
+"\n"
+"% if object.order_policy in ('prepaid','manual') and "
+"object.company_id.paypal_account:\n"
+"<% \n"
+"comp_name = quote(object.company_id.name)\n"
+"order_name = quote(object.name)\n"
+"paypal_account = quote(object.company_id.paypal_account)\n"
+"order_amount = quote(str(object.amount_total))\n"
+"cur_name = quote(object.pricelist_id.currency_id.name)\n"
+"paypal_url = \"https://www.paypal.com/cgi-"
+"bin/webscr?cmd=_xclick&business=%s&item_name=%s%%20Order%%20%s&invoice=%s&amo"
+"unt=%s\" \\\n"
+" "
+"\"&currency_code=%s&button_subtype=services&no_note=1&bn=OpenERP_Order_PayNow"
+"_%s\" % \\\n"
+" "
+"(paypal_account,comp_name,order_name,order_name,order_amount,cur_name,cur_nam"
+"e)\n"
+"%>\n"
+"It is also possible to directly pay with Paypal:\n"
+" ${paypal_url}\n"
+"% endif\n"
+"\n"
+"If you have any question, do not hesitate to contact us.\n"
+"\n"
+"\n"
+"Thank you for choosing ${object.company_id.name}!\n"
+"\n"
+"\n"
+"--\n"
+"${object.user_id.name} ${object.user_id.user_email and "
+"'<%s>'%(object.user_id.user_email) or ''}\n"
+"${object.company_id.name}\n"
+"% if object.company_id.street:\n"
+"${object.company_id.street or ''}\n"
+"% endif\n"
+"% if object.company_id.street2:\n"
+"${object.company_id.street2}\n"
+"% endif\n"
+"% if object.company_id.city or object.company_id.zip:\n"
+"${object.company_id.zip or ''} ${object.company_id.city or ''}\n"
+"% endif\n"
+"% if object.company_id.country_id:\n"
+"${object.company_id.state_id and ('%s, ' % object.company_id.state_id.name) "
+"or ''} ${object.company_id.country_id.name or ''}\n"
+"% endif\n"
+"% if object.company_id.phone:\n"
+"Phone: ${object.company_id.phone}\n"
+"% endif\n"
+"% if object.company_id.website:\n"
+"${object.company_id.website or ''}\n"
+"% endif\n"
+" "
+msgstr ""
+
+#. module: sale
#: model:process.transition.action,name:sale.process_transition_action_validate0
msgid "Validate"
msgstr "تحقق"
@@ -1061,9 +1232,9 @@ msgid "Taxes"
msgstr "الضرائب"
#. module: sale
-#: field:sale.order,order_policy:0
-msgid "Shipping Policy"
-msgstr "سياسة الشحن"
+#: view:sale.order:0
+msgid "Sales Order ready to be invoiced"
+msgstr ""
#. module: sale
#: help:sale.order,create_date:0
@@ -1082,9 +1253,9 @@ msgid "Create Invoices"
msgstr "إنشاء الفواتير"
#. module: sale
-#: view:sale.order:0
-msgid "Extra Info"
-msgstr "معلومات إضافية"
+#: view:sale.report:0
+msgid "Sales order created in current month"
+msgstr ""
#. module: sale
#: report:sale.order:0
@@ -1092,11 +1263,24 @@ msgid "Fax :"
msgstr "الفاكس:"
#. module: sale
+#: help:sale.order.line,type:0
+msgid ""
+"If 'on order', it triggers a procurement when the sale order is confirmed to "
+"create a task, purchase order or manufacturing order linked to this sale "
+"order line."
+msgstr ""
+
+#. module: sale
#: field:sale.advance.payment.inv,amount:0
msgid "Advance Amount"
msgstr "مبلغ الدفع المقدم"
#. module: sale
+#: field:sale.config.picking_policy,charge_delivery:0
+msgid "Do you charge the delivery?"
+msgstr ""
+
+#. module: sale
#: selection:sale.order,invoice_quantity:0
msgid "Shipped Quantities"
msgstr "الكميات المشحونة"
@@ -1107,25 +1291,45 @@ msgid "Invoice Based on Sales Orders"
msgstr "أصدر الفواتير بناءً على أوامر المبيعات"
#. module: sale
+#: code:addons/sale/sale.py:331
+#, python-format
+msgid ""
+"If you change the pricelist of this order (and eventually the currency), "
+"prices of existing order lines will not be updated."
+msgstr ""
+
+#. module: sale
#: model:ir.model,name:sale.model_stock_picking
msgid "Picking List"
msgstr "قائمة الالتقاط"
#. module: sale
-#: code:addons/sale/sale.py:387
-#: code:addons/sale/sale.py:920
-#: code:addons/sale/sale.py:938
+#: code:addons/sale/sale.py:412
+#: code:addons/sale/sale.py:503
+#: code:addons/sale/sale.py:632
+#: code:addons/sale/sale.py:1015
+#: code:addons/sale/sale.py:1033
#, python-format
msgid "Error !"
msgstr "خطأ !"
#. module: sale
-#: code:addons/sale/sale.py:570
+#: code:addons/sale/sale.py:603
#, python-format
msgid "Could not cancel sales order !"
msgstr "لم يمكن إلغاء أمر المبيعات!"
#. module: sale
+#: view:sale.order:0
+msgid "Qty(UoM)"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered Year of the sales order"
+msgstr ""
+
+#. module: sale
#: selection:sale.report,month:0
msgid "July"
msgstr "يوليو/تموز"
@@ -1142,36 +1346,26 @@ msgid "Shipping Exception"
msgstr "خلل شحن"
#. module: sale
-#: field:sale.make.invoice,grouped:0
-msgid "Group the invoices"
-msgstr "تجميع الفواتير"
-
-#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Shipping & Manual Invoice"
-msgstr "شحن وفوترة يدوية"
-
-#. module: sale
-#: code:addons/sale/sale.py:1051
+#: code:addons/sale/sale.py:1143
#, python-format
-msgid "Picking Information !"
-msgstr "معلومات الالتقاط!"
+msgid "Picking Information ! : "
+msgstr ""
#. module: sale
-#: view:sale.report:0
-#: field:sale.report,month:0
-msgid "Month"
-msgstr "الشهر"
+#: field:sale.make.invoice,grouped:0
+msgid "Group the invoices"
+msgstr "تجميع الفواتير"
#. module: sale
-#: model:ir.module.module,shortdesc:sale.module_meta_information
-msgid "Sales Management"
-msgstr "إدارة المبيعات"
+#: field:sale.order,order_policy:0
+msgid "Invoice Policy"
+msgstr ""
#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Invoice From The Picking"
-msgstr "أصدر الفاتورة بناءً على الالتقاط"
+#: model:ir.actions.act_window,name:sale.action_config_picking_policy
+#: view:sale.config.picking_policy:0
+msgid "Setup your Invoicing Method"
+msgstr ""
#. module: sale
#: model:process.node,note:sale.process_node_invoice0
@@ -1180,28 +1374,31 @@ msgstr "بحاجة إلى مراجعة المحاسِب"
#. module: sale
#: view:sale.report:0
-#: field:sale.report,uom_name:0
msgid "Reference UoM"
msgstr "وحدة القياس المرجعية"
#. module: sale
+#: view:sale.config.picking_policy:0
+msgid ""
+"This tool will help you to install the right module and configure the system "
+"according to the method you use to invoice your customers."
+msgstr ""
+
+#. module: sale
#: model:ir.model,name:sale.model_sale_order_line_make_invoice
msgid "Sale OrderLine Make_invoice"
msgstr ""
#. module: sale
-#: help:sale.config.picking_policy,step:0
-msgid ""
-"By default, OpenERP is able to manage complex routing and paths of products "
-"in your warehouse and partner locations. This will configure the most common "
-"and simple methods to deliver products to the customer in one or two "
-"operations by the worker."
-msgstr ""
+#: selection:sale.order,state:0
+#: selection:sale.report,state:0
+msgid "Invoice Exception"
+msgstr "خلل في الفاتورة"
#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_tree
-msgid "Old Quotations"
-msgstr "التسعيرات السابقة"
+#: model:process.node,note:sale.process_node_saleorder0
+msgid "Drives procurement and invoicing"
+msgstr "يحدد كلاً من التحصيل والفواتير"
#. module: sale
#: field:sale.order,invoiced:0
@@ -1216,6 +1413,22 @@ msgid "Sales Analysis"
msgstr "تحليل المبيعات"
#. module: sale
+#: code:addons/sale/sale.py:1138
+#, python-format
+msgid ""
+"You selected a quantity of %d Units.\n"
+"But it's not compatible with the selected packaging.\n"
+"Here is a proposition of quantities according to the packaging:\n"
+"EAN: %s Quantity: %s Type of ul: %s"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Recreate Packing"
+msgstr "إعادة إنشاء التعبئة"
+
+#. module: sale
+#: view:sale.order:0
#: field:sale.order.line,property_ids:0
msgid "Properties"
msgstr "الخصائص"
@@ -1242,7 +1455,17 @@ msgid ""
msgstr "يمكنك إنشاء الفواتير بناءً على أوامر المبيعات أو بناءً على الشحنات."
#. module: sale
-#: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
+#: view:sale.order.line:0
+msgid "Confirmed sale order lines, not yet delivered"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:473
+#, python-format
+msgid "Customer Invoices"
+msgstr ""
+
+#. module: sale
#: model:process.process,name:sale.process_process_salesprocess0
#: view:sale.order:0
#: view:sale.report:0
@@ -1264,18 +1487,13 @@ msgid "Done"
msgstr "تمّ"
#. module: sale
-#: model:ir.model,name:sale.model_sale_installer
-msgid "sale.installer"
-msgstr ""
-
-#. module: sale
#: model:process.node,name:sale.process_node_invoice0
#: model:process.node,name:sale.process_node_invoiceafterdelivery0
msgid "Invoice"
msgstr "الفاتورة"
#. module: sale
-#: code:addons/sale/sale.py:1014
+#: code:addons/sale/sale.py:1158
#, python-format
msgid ""
"You have to select a customer in the sales form !\n"
@@ -1285,11 +1503,6 @@ msgstr ""
"فضلاً حدّد عميلاً قبل اختيار المنتج."
#. module: sale
-#: selection:sale.config.picking_policy,step:0
-msgid "Picking List & Delivery Order"
-msgstr "قائمة الالتقاط وأمر التسليم"
-
-#. module: sale
#: field:sale.order,origin:0
msgid "Source Document"
msgstr "المستند المصدر"
@@ -1315,7 +1528,7 @@ msgid "The amount without tax."
msgstr "المبلغ دون ضرائب"
#. module: sale
-#: code:addons/sale/sale.py:571
+#: code:addons/sale/sale.py:604
#, python-format
msgid "You must first cancel all picking attached to this sales order."
msgstr "يجب أولاً أن تلغي جميع الالتقاطات المرتبطة بأمر المبيعات هذا."
@@ -1326,8 +1539,14 @@ msgid "Sales Advance Payment Invoice"
msgstr "فاتورة الدفع المقدم للمبيعات"
#. module: sale
-#: field:sale.order,incoterm:0
-msgid "Incoterm"
+#: view:sale.report:0
+#: field:sale.report,month:0
+msgid "Month"
+msgstr "الشهر"
+
+#. module: sale
+#: model:email.template,subject:sale.email_template_edi_sale
+msgid "${object.company_id.name} Order (Ref ${object.name or 'n/a' })"
msgstr ""
#. module: sale
@@ -1339,11 +1558,6 @@ msgid "Product"
msgstr "المنتج"
#. module: sale
-#: model:ir.ui.menu,name:sale.menu_invoiced
-msgid "Invoicing"
-msgstr "الفواتير"
-
-#. module: sale
#: model:process.transition.action,name:sale.process_transition_action_cancelassignation0
msgid "Cancel Assignation"
msgstr ""
@@ -1354,14 +1568,10 @@ msgid "sale.config.picking_policy"
msgstr ""
#. module: sale
-#: help:sale.order,state:0
-msgid ""
-"Gives the state of the quotation or sales order. \n"
-"The exception state is automatically set when a cancel operation occurs in "
-"the invoice validation (Invoice Exception) or in the picking list process "
-"(Shipping Exception). \n"
-"The 'Waiting Schedule' state is set when the invoice is confirmed but "
-"waiting for the scheduler to run on the date 'Ordered Date'."
+#: view:account.invoice.report:0
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_turnover_by_month
+msgid "Monthly Turnover"
msgstr ""
#. module: sale
@@ -1380,7 +1590,6 @@ msgid "Product UoS"
msgstr "وحدة البيع للمنتج"
#. module: sale
-#: selection:sale.order,state:0
#: selection:sale.report,state:0
msgid "Manual In Progress"
msgstr "قيد التنفيذ يدوياً"
@@ -1401,7 +1610,8 @@ msgid "Order"
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:921
+#: code:addons/sale/sale.py:1016
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:71
#, python-format
msgid "There is no income account defined for this product: \"%s\" (id:%d)"
msgstr "لا يوجد حساب دخل معرّف لهذا المنتج: \"%s\" (id:%d)"
@@ -1421,7 +1631,7 @@ msgid ""
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:1116
+#: code:addons/sale/sale.py:1238
#, python-format
msgid ""
"You plan to sell %.2f %s but you only have %.2f %s available !\n"
@@ -1452,10 +1662,10 @@ msgid "Total"
msgstr "المجموع"
#. module: sale
-#: code:addons/sale/sale.py:388
-#, python-format
-msgid "There is no sales journal defined for this company: \"%s\" (id:%d)"
-msgstr "لا يوجد دفتر يومية مبيعات معرّف لهذه الشركة: \"%s\" (id: %d)"
+#: report:sale.order:0
+#: view:sale.order.line:0
+msgid "Price"
+msgstr "السعر"
#. module: sale
#: model:process.transition,note:sale.process_transition_deliver0
@@ -1466,10 +1676,15 @@ msgid ""
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:1165
-#, python-format
-msgid "Cannot delete a sales order line which is %s !"
-msgstr "لا يمكن حذف سطر أمر المبيعات %s!"
+#: selection:sale.order,order_policy:0
+msgid "Pay before delivery"
+msgstr ""
+
+#. module: sale
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.open_board_sales
+msgid "Sales Dashboard"
+msgstr ""
#. module: sale
#: model:ir.actions.act_window,name:sale.action_sale_order_make_invoice
@@ -1480,6 +1695,7 @@ msgstr "أصدر الفواتير"
#. module: sale
#: view:sale.order:0
+#: selection:sale.order,state:0
#: view:sale.order.line:0
msgid "To Invoice"
msgstr "في انتظار الفوترة"
@@ -1490,6 +1706,11 @@ msgid "Date on which sales order is confirmed."
msgstr "تاريخ تأكيد أمر المبيعات"
#. module: sale
+#: field:sale.order,project_id:0
+msgid "Contract/Analytic Account"
+msgstr ""
+
+#. module: sale
#: field:sale.order,company_id:0
#: field:sale.order.line,company_id:0
#: view:sale.report:0
@@ -1509,10 +1730,12 @@ msgid "The amount to be invoiced in advance."
msgstr "المبلغ المفوتر مقدماً"
#. module: sale
-#: selection:sale.order,state:0
-#: selection:sale.report,state:0
-msgid "Invoice Exception"
-msgstr "خلل في الفاتورة"
+#: code:addons/sale/sale.py:1256
+#, python-format
+msgid ""
+"Couldn't find a pricelist line matching this product and quantity.\n"
+"You have to change either the product, the quantity or the pricelist."
+msgstr ""
#. module: sale
#: help:sale.order,picking_ids:0
@@ -1521,13 +1744,6 @@ msgid ""
msgstr "هذه قائمة الالتقاط الخاصة بأمر المبيعات هذا."
#. module: sale
-#: help:sale.installer,sale_margin:0
-msgid ""
-"Gives the margin of profitability by calculating the difference between Unit "
-"Price and Cost Price."
-msgstr "يعطي هامش الربح بواسطة حساب الفرق بين سعر الوحدة وسعر التكلفة."
-
-#. module: sale
#: view:sale.make.invoice:0
#: view:sale.order.line.make.invoice:0
msgid "Create invoices"
@@ -1546,6 +1762,11 @@ msgid "Cancelled"
msgstr "ملغي"
#. module: sale
+#: view:sale.order.line:0
+msgid "Sales Order Lines related to a Sales Order of mine"
+msgstr ""
+
+#. module: sale
#: model:ir.actions.act_window,name:sale.action_shop_form
#: model:ir.ui.menu,name:sale.menu_action_shop_form
#: field:sale.order,shop_id:0
@@ -1555,17 +1776,12 @@ msgid "Shop"
msgstr "المتجر"
#. module: sale
-#: view:sale.report:0
-msgid " Month "
-msgstr " الشهر "
-
-#. module: sale
#: field:sale.report,date_confirm:0
msgid "Date Confirm"
msgstr ""
#. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:111
+#: code:addons/sale/wizard/sale_line_invoice.py:113
#, python-format
msgid "Warning"
msgstr "تحذير"
@@ -1577,17 +1793,6 @@ msgid "Sales by Month"
msgstr "المبيعات حسب الشهر"
#. module: sale
-#: code:addons/sale/sale.py:1045
-#, python-format
-msgid ""
-"You selected a quantity of %d Units.\n"
-"But it's not compatible with the selected packaging.\n"
-"Here is a proposition of quantities according to the packaging:\n"
-"\n"
-"EAN: %s Quantity: %s Type of ul: %s"
-msgstr ""
-
-#. module: sale
#: model:ir.model,name:sale.model_sale_order
#: model:process.node,name:sale.process_node_order0
#: model:process.node,name:sale.process_node_saleorder0
@@ -1603,6 +1808,11 @@ msgid "Quantity (UoS)"
msgstr "الكمية (وحدة البيع)"
#. module: sale
+#: view:sale.order.line:0
+msgid "Sale Order Lines that are in 'done' state"
+msgstr ""
+
+#. module: sale
#: model:process.transition,note:sale.process_transition_packing0
msgid ""
"The Pick List form is created as soon as the sales order is confirmed, in "
@@ -1617,6 +1827,11 @@ msgid "Confirmed"
msgstr "مؤكد"
#. module: sale
+#: field:sale.config.picking_policy,order_policy:0
+msgid "Main Method Based On"
+msgstr ""
+
+#. module: sale
#: model:process.transition.action,name:sale.process_transition_action_confirm0
msgid "Confirm"
msgstr "تأكيد"
@@ -1639,6 +1854,7 @@ msgid "Invoice Lines"
msgstr "سطور الفواتير"
#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_product_tree
#: view:sale.order:0
#: view:sale.order.line:0
msgid "Sales Order Lines"
@@ -1655,30 +1871,18 @@ msgid "Configuration"
msgstr "الإعدادات"
#. module: sale
-#: selection:sale.order,picking_policy:0
-msgid "Complete Delivery"
-msgstr "تسليم كامل"
+#: code:addons/sale/edi/sale_order.py:146
+#, python-format
+msgid "EDI Pricelist (%s)"
+msgstr ""
#. module: sale
#: view:sale.report:0
-msgid " Month-1 "
-msgstr " الشهر 1 "
-
-#. module: sale
-#: help:sale.config.picking_policy,picking_policy:0
-msgid ""
-"The Shipping Policy is used to configure per order if you want to deliver as "
-"soon as possible when one product is available or you wait that all products "
-"are available.."
+msgid "Sales order created in current year"
msgstr ""
#. module: sale
-#: selection:sale.report,month:0
-msgid "August"
-msgstr "أغسطس/آب"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:111
+#: code:addons/sale/wizard/sale_line_invoice.py:113
#, python-format
msgid ""
"Invoice cannot be created for this Sales Order Line due to one of the "
@@ -1691,6 +1895,11 @@ msgstr ""
"2. سطر أمر المبيعات مفوتر!"
#. module: sale
+#: view:sale.order.line:0
+msgid "Sale order lines done"
+msgstr ""
+
+#. module: sale
#: field:sale.order.line,th_weight:0
msgid "Weight"
msgstr "الوزن"
@@ -1709,7 +1918,6 @@ msgstr "ديسمبر/كانون الأول"
#. module: sale
#: field:sale.config.picking_policy,config_logo:0
-#: field:sale.installer,config_logo:0
msgid "Image"
msgstr "الصورة"
@@ -1739,9 +1947,9 @@ msgid "Salesman"
msgstr "مندوب المبيعات"
#. module: sale
-#: model:process.node,note:sale.process_node_saleorder0
-msgid "Drives procurement and invoicing"
-msgstr "يحدد كلاً من التحصيل والفواتير"
+#: model:ir.actions.act_window,name:sale.action_order_tree
+msgid "Old Quotations"
+msgstr "التسعيرات السابقة"
#. module: sale
#: field:sale.order,amount_untaxed:0
@@ -1749,7 +1957,7 @@ msgid "Untaxed Amount"
msgstr "المبلغ دون ضرائب"
#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:163
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:170
#: model:ir.actions.act_window,name:sale.action_view_sale_advance_payment_inv
#: view:sale.advance.payment.inv:0
#: view:sale.order:0
@@ -1758,7 +1966,7 @@ msgid "Advance Invoice"
msgstr "فاتورة الدفع المقدم"
#. module: sale
-#: code:addons/sale/sale.py:591
+#: code:addons/sale/sale.py:624
#, python-format
msgid "The sales order '%s' has been cancelled."
msgstr "تمّ إلغاء أمر المبيعات '%s'"
@@ -1793,20 +2001,20 @@ msgid "Packings"
msgstr ""
#. module: sale
-#: field:sale.config.picking_policy,progress:0
-#: field:sale.installer,progress:0
-msgid "Configuration Progress"
-msgstr "سير الإعدادات"
+#: view:sale.order.line:0
+msgid "Sale Order Lines ready to be invoiced"
+msgstr ""
#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_product_tree
-msgid "Product sales"
-msgstr "مبيعات المنتج"
+#: view:sale.report:0
+msgid "Sales order created in last month"
+msgstr ""
#. module: sale
-#: field:sale.order,date_order:0
-msgid "Ordered Date"
-msgstr "تاريخ الأمر"
+#: model:ir.actions.act_window,name:sale.action_email_templates
+#: model:ir.ui.menu,name:sale.menu_email_templates
+msgid "Email Templates"
+msgstr ""
#. module: sale
#: model:ir.actions.act_window,name:sale.action_order_form
@@ -1816,14 +2024,15 @@ msgid "Sales Orders"
msgstr "أوامر المبيعات"
#. module: sale
-#: selection:sale.config.picking_policy,picking_policy:0
-msgid "Direct Delivery"
-msgstr "تسليم مباشر"
+#: model:ir.model,name:sale.model_sale_shop
+#: view:sale.shop:0
+msgid "Sales Shop"
+msgstr "متجر المبيعات"
#. module: sale
-#: field:sale.installer,sale_journal:0
-msgid "Invoicing journals"
-msgstr "الدفاتر اليومية للفواتير"
+#: selection:sale.report,month:0
+msgid "November"
+msgstr "نوفمبر/تشرين الثاني"
#. module: sale
#: field:sale.advance.payment.inv,product_id:0
@@ -1831,18 +2040,12 @@ msgid "Advance Product"
msgstr "منتج الدفع المقدم"
#. module: sale
-#: view:sale.report:0
-#: field:sale.report,shipped_qty_1:0
-msgid "Shipped Qty"
-msgstr "الكمية المشحونة"
-
-#. module: sale
-#: view:sale.open.invoice:0
-msgid "You invoice has been successfully created!"
-msgstr "تمّ إنشاء الفاتورة بنجاح!"
+#: view:sale.order:0
+msgid "Compute"
+msgstr "احسب"
#. module: sale
-#: code:addons/sale/sale.py:585
+#: code:addons/sale/sale.py:618
#, python-format
msgid "You must first cancel all invoices attached to this sales order."
msgstr "يجب أولاً إلغاء جميع الفواتير المرتبطة بأمر المبيعات هذا."
@@ -1853,25 +2056,14 @@ msgid "January"
msgstr "يناير/كانون الثاني"
#. module: sale
-#: view:sale.installer:0
-msgid "Configure Your Sales Management Application"
-msgstr "إعدادات تطبيق إدارة المبيعات"
-
-#. module: sale
#: model:ir.actions.act_window,name:sale.action_order_tree4
msgid "Sales Order in Progress"
msgstr "أمر المبيعات قيد التنفيذ"
#. module: sale
-#: field:sale.installer,sale_layout:0
-msgid "Sales Order Layout Improvement"
-msgstr "تحسين تنسيق أوامر المبيعات"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:63
-#, python-format
-msgid "Error"
-msgstr "خطأ"
+#: help:sale.order,origin:0
+msgid "Reference of the document that generated this sales order request."
+msgstr "مرجع المستند الذي أصدر طلب أمر المبيعات هذا"
#. module: sale
#: view:sale.report:0
@@ -1880,6 +2072,11 @@ msgid "Commitment Delay"
msgstr "تأخير في الالتزام"
#. module: sale
+#: selection:sale.order,order_policy:0
+msgid "Deliver & invoice on demand"
+msgstr ""
+
+#. module: sale
#: model:process.node,note:sale.process_node_saleprocurement0
msgid ""
"One Procurement order for each sales order line and for each of the "
@@ -1902,13 +2099,12 @@ msgid "Confirmed sales order to invoice."
msgstr "فوترة أمر المبيعات المؤكّد"
#. module: sale
-#: code:addons/sale/sale.py:290
-#, python-format
-msgid "Cannot delete Sales Order(s) which are already confirmed !"
-msgstr "لا يمكن حذف أوامر المبيعات التي تمّ تأكيدها!"
+#: view:sale.order:0
+msgid "Sales Order that haven't yet been confirmed"
+msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:316
+#: code:addons/sale/sale.py:322
#, python-format
msgid "The sales order '%s' has been set in draft state."
msgstr "تمّ وضع أمر المبيعات '%s' في حالة \"مسودّة\"."
@@ -1919,37 +2115,27 @@ msgid "from stock"
msgstr "من المخزون"
#. module: sale
-#: field:sale.config.picking_policy,order_policy:0
-msgid "Shipping Default Policy"
-msgstr "سياسة الشحن الافتراضية"
-
-#. module: sale
#: view:sale.open.invoice:0
msgid "Close"
msgstr "إغلاق"
#. module: sale
+#: code:addons/sale/sale.py:1248
+#, python-format
+msgid "No Pricelist ! : "
+msgstr ""
+
+#. module: sale
#: field:sale.order,shipped:0
msgid "Delivered"
msgstr "تمّ التسليم"
#. module: sale
-#: code:addons/sale/sale.py:1115
-#, python-format
-msgid "Not enough stock !"
-msgstr "المخزون غير كافٍ!"
-
-#. module: sale
#: constraint:stock.move:0
msgid "You must assign a production lot for this product"
msgstr "يجب تعيين دفعة إنتاج لهذا المنتج"
#. module: sale
-#: field:sale.order.line,sequence:0
-msgid "Layout Sequence"
-msgstr ""
-
-#. module: sale
#: model:ir.actions.act_window,help:sale.action_shop_form
msgid ""
"If you have more than one shop reselling your company products, you can "
@@ -1976,11 +2162,6 @@ msgid "May"
msgstr "مايو/أيار"
#. module: sale
-#: help:sale.installer,sale_order_dates:0
-msgid "Adds commitment, requested and effective dates on Sales Orders."
-msgstr "إضافة كل من الالتزام وتواريخ الطلب والتفعيل لأوامر المبيعات."
-
-#. module: sale
#: view:sale.order:0
#: field:sale.order,partner_id:0
#: field:sale.order.line,order_partner_id:0
@@ -1988,25 +2169,11 @@ msgid "Customer"
msgstr "العميل"
#. module: sale
-#: model:product.template,name:sale.advance_product_0_product_template
-msgid "Advance"
-msgstr "الدفع المقدم"
-
-#. module: sale
#: selection:sale.report,month:0
msgid "February"
msgstr "فبراير/شباط"
#. module: sale
-#: help:sale.installer,sale_journal:0
-msgid ""
-"Allows you to group and invoice your delivery orders according to different "
-"invoicing types: daily, weekly, etc."
-msgstr ""
-"إضافة إمكانية تجميع وفوترة أوامر التسليم حسب عدد من أنواع الفوترة المختلفة: "
-"يومياً، أسبوعياً، إلخ."
-
-#. module: sale
#: selection:sale.report,month:0
msgid "April"
msgstr "أبريل/نيسان"
@@ -2017,11 +2184,6 @@ msgid "Accounting"
msgstr "المحاسبة"
#. module: sale
-#: field:sale.config.picking_policy,step:0
-msgid "Steps To Deliver a Sales Order"
-msgstr "خطوات تسليم أمر مبيعات"
-
-#. module: sale
#: view:sale.order:0
#: view:sale.order.line:0
msgid "Search Sales Order"
@@ -2033,18 +2195,18 @@ msgid "Sales Order Requisition"
msgstr "طلب أمر مبيعات"
#. module: sale
+#: code:addons/sale/sale.py:1242
+#, python-format
+msgid "Not enough stock ! : "
+msgstr ""
+
+#. module: sale
#: report:sale.order:0
#: field:sale.order,payment_term:0
msgid "Payment Term"
msgstr "أجل السداد"
#. module: sale
-#: help:sale.installer,sale_layout:0
-msgid ""
-"Provides some features to improve the layout of the Sales Order reports."
-msgstr "مزايا إضافية لتحسين تنسيق تقارير أوامر المبيعات."
-
-#. module: sale
#: model:ir.actions.act_window,help:sale.action_order_report_all
msgid ""
"This report performs analysis on your quotations and sales orders. Analysis "
@@ -2079,6 +2241,9 @@ msgstr "أصدر الفواتير بناءً على التسليم"
#~ msgid "Recreate Procurement"
#~ msgstr "إعادة الشراء"
+#~ msgid "Partial Delivery"
+#~ msgstr "التسليم الجزئي"
+
#~ msgid "Steps To Deliver a Sale Order"
#~ msgstr "خطوات لتقديم طلب للبيع"
@@ -2114,3 +2279,156 @@ msgstr "أصدر الفواتير بناءً على التسليم"
#~ msgid "Sale Shop"
#~ msgstr "محل البيع"
+
+#~ msgid "All at Once"
+#~ msgstr "الجميع معاً"
+
+#~ msgid "Configure"
+#~ msgstr "ضبط الإعدادات"
+
+#~ msgid "Delivery Order Only"
+#~ msgstr "أمر تسليم فقط"
+
+#~ msgid "Order Reference must be unique !"
+#~ msgstr "لا بدّ أن يكون مرجع الأمر فريداً"
+
+#~ msgid "Setup your sales workflow and default values."
+#~ msgstr "إعداد سير عمل المبيعات والقيم الافتراضية"
+
+#~ msgid "Invoice On Order After Delivery"
+#~ msgstr "أصدر فاتورة الأمر بعد التسليم"
+
+#~ msgid " Year "
+#~ msgstr " السنة "
+
+#~ msgid "Sales Order Dates"
+#~ msgstr "تواريخ أوامر المبيعات"
+
+#~ msgid "Picking Default Policy"
+#~ msgstr "اختيار السياسة الافتراضية"
+
+#, python-format
+#~ msgid "You cannot cancel a sales order line that has already been invoiced !"
+#~ msgstr "لا يمكنك إلغاء أمر مبيعات تمّت فوترته!"
+
+#~ msgid "Margins in Sales Orders"
+#~ msgstr "هوامش أوامر المبيعات"
+
+#~ msgid "Sales Application Configuration"
+#~ msgstr "إعدادات تطبيق المبيعات"
+
+#~ msgid "Delivery Costs"
+#~ msgstr "تكاليف التسليم"
+
+#~ msgid "Shipping Policy"
+#~ msgstr "سياسة الشحن"
+
+#~ msgid "Order date"
+#~ msgstr "تاريخ الأمر"
+
+#~ msgid "title"
+#~ msgstr "العنوان"
+
+#~ msgid "Invoice From The Picking"
+#~ msgstr "أصدر الفاتورة بناءً على الالتقاط"
+
+#, python-format
+#~ msgid "Picking Information !"
+#~ msgstr "معلومات الالتقاط!"
+
+#~ msgid "Shipping & Manual Invoice"
+#~ msgstr "شحن وفوترة يدوية"
+
+#~ msgid "Sales Management"
+#~ msgstr "إدارة المبيعات"
+
+#~ msgid "Picking List & Delivery Order"
+#~ msgstr "قائمة الالتقاط وأمر التسليم"
+
+#~ msgid "Invoicing"
+#~ msgstr "الفواتير"
+
+#, python-format
+#~ msgid "Cannot delete a sales order line which is %s !"
+#~ msgstr "لا يمكن حذف سطر أمر المبيعات %s!"
+
+#~ msgid ""
+#~ "Gives the margin of profitability by calculating the difference between Unit "
+#~ "Price and Cost Price."
+#~ msgstr "يعطي هامش الربح بواسطة حساب الفرق بين سعر الوحدة وسعر التكلفة."
+
+#~ msgid " Month "
+#~ msgstr " الشهر "
+
+#~ msgid " Month-1 "
+#~ msgstr " الشهر 1 "
+
+#~ msgid "Complete Delivery"
+#~ msgstr "تسليم كامل"
+
+#~ msgid "Product sales"
+#~ msgstr "مبيعات المنتج"
+
+#~ msgid "Ordered Date"
+#~ msgstr "تاريخ الأمر"
+
+#~ msgid "Configure Your Sales Management Application"
+#~ msgstr "إعدادات تطبيق إدارة المبيعات"
+
+#~ msgid "Invoicing journals"
+#~ msgstr "الدفاتر اليومية للفواتير"
+
+#~ msgid "Shipped Qty"
+#~ msgstr "الكمية المشحونة"
+
+#~ msgid "Direct Delivery"
+#~ msgstr "تسليم مباشر"
+
+#~ msgid "Sales Order Layout Improvement"
+#~ msgstr "تحسين تنسيق أوامر المبيعات"
+
+#, python-format
+#~ msgid "Cannot delete Sales Order(s) which are already confirmed !"
+#~ msgstr "لا يمكن حذف أوامر المبيعات التي تمّ تأكيدها!"
+
+#~ msgid "Shipping Default Policy"
+#~ msgstr "سياسة الشحن الافتراضية"
+
+#, python-format
+#~ msgid "Not enough stock !"
+#~ msgstr "المخزون غير كافٍ!"
+
+#~ msgid "Adds commitment, requested and effective dates on Sales Orders."
+#~ msgstr "إضافة كل من الالتزام وتواريخ الطلب والتفعيل لأوامر المبيعات."
+
+#~ msgid ""
+#~ "Allows you to group and invoice your delivery orders according to different "
+#~ "invoicing types: daily, weekly, etc."
+#~ msgstr ""
+#~ "إضافة إمكانية تجميع وفوترة أوامر التسليم حسب عدد من أنواع الفوترة المختلفة: "
+#~ "يومياً، أسبوعياً، إلخ."
+
+#~ msgid "Steps To Deliver a Sales Order"
+#~ msgstr "خطوات تسليم أمر مبيعات"
+
+#~ msgid ""
+#~ "Provides some features to improve the layout of the Sales Order reports."
+#~ msgstr "مزايا إضافية لتحسين تنسيق تقارير أوامر المبيعات."
+
+#~ msgid "Advance"
+#~ msgstr "الدفع المقدم"
+
+#~ msgid "Allows you to compute delivery costs on your quotations."
+#~ msgstr "إضافة إمكانية حساب تكاليف التسليم في التسعيرات."
+
+#~ msgid "Payment Before Delivery"
+#~ msgstr "الدفع قبل التسليم"
+
+#~ msgid "Configure Picking Policy for Sales Order"
+#~ msgstr "إعدادات سياسة الالتقاط لأمر المبيعات"
+
+#~ msgid "Enhance your core Sales Application with additional functionalities."
+#~ msgstr "تحسين تطبيق المبيعات بإمكانيات إضافية."
+
+#~ msgid "Configuration Progress"
+#~ msgstr "تقدم الإعدادات"
diff --git a/addons/sale/i18n/bg.po b/addons/sale/i18n/bg.po
index 3c965012e5c..b73ef2a9253 100644
--- a/addons/sale/i18n/bg.po
+++ b/addons/sale/i18n/bg.po
@@ -6,15 +6,27 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2011-01-11 11:16+0000\n"
+"POT-Creation-Date: 2011-12-22 18:43+0000\n"
"PO-Revision-Date: 2011-03-01 14:35+0000\n"
"Last-Translator: Dimitar Markov <dimitar.markov@gmail.com>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-05 05:16+0000\n"
-"X-Generator: Launchpad (build 14231)\n"
+"X-Launchpad-Export-Date: 2011-12-23 06:46+0000\n"
+"X-Generator: Launchpad (build 14560)\n"
+
+#. module: sale
+#: field:sale.config.picking_policy,timesheet:0
+msgid "Based on Timesheet"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid ""
+"Sale Order Lines that are confirmed, done or in exception state and haven't "
+"yet been invoiced"
+msgstr ""
#. module: sale
#: view:board.board:0
@@ -23,11 +35,6 @@ msgid "Sales by Salesman in last 90 days"
msgstr "Продажби по търговец за последните 90 дни"
#. module: sale
-#: help:sale.installer,delivery:0
-msgid "Allows you to compute delivery costs on your quotations."
-msgstr "Позволява да се изчисли цена за доставка за quotations."
-
-#. module: sale
#: help:sale.order,picking_policy:0
msgid ""
"If you don't have enough stock available to deliver all at once, do you "
@@ -37,6 +44,11 @@ msgstr ""
"части?"
#. module: sale
+#: view:sale.order:0
+msgid "UoS"
+msgstr ""
+
+#. module: sale
#: help:sale.order,partner_shipping_id:0
msgid "Shipping address for current sales order."
msgstr "Адрес за получаване текущата заявка"
@@ -60,22 +72,12 @@ msgid "Cancel Order"
msgstr "Отказ на поръчка"
#. module: sale
-#: view:sale.config.picking_policy:0
-msgid "Configure Sales Order Logistics"
-msgstr "Настройка на логистиката на продажби"
-
-#. module: sale
-#: code:addons/sale/sale.py:603
+#: code:addons/sale/sale.py:638
#, python-format
msgid "The quotation '%s' has been converted to a sales order."
msgstr ""
#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Payment Before Delivery"
-msgstr "Плащане преди доставка"
-
-#. module: sale
#: code:addons/sale/wizard/sale_make_invoice.py:42
#, python-format
msgid "Warning !"
@@ -92,12 +94,6 @@ msgid "Drives procurement orders for every sales order line."
msgstr ""
#. module: sale
-#: selection:sale.config.picking_policy,picking_policy:0
-msgid "All at Once"
-msgstr "Всичко накуп"
-
-#. module: sale
-#: field:sale.order,project_id:0
#: view:sale.report:0
#: field:sale.report,analytic_account_id:0
#: field:sale.shop,project_id:0
@@ -113,6 +109,15 @@ msgid ""
msgstr ""
#. module: sale
+#: code:addons/sale/sale.py:295
+#, python-format
+msgid ""
+"In order to delete a confirmed sale order, you must cancel it before ! To "
+"cancel a sale order, you must first cancel related picking or delivery "
+"orders."
+msgstr ""
+
+#. module: sale
#: model:process.node,name:sale.process_node_saleprocurement0
msgid "Procurement Order"
msgstr "Поръчки за доставка"
@@ -124,6 +129,11 @@ msgid "Partner"
msgstr "Контрагент"
#. module: sale
+#: selection:sale.order,order_policy:0
+msgid "Invoice based on deliveries"
+msgstr ""
+
+#. module: sale
#: view:sale.order:0
msgid "Order Line"
msgstr "Ред от поръчка"
@@ -156,8 +166,13 @@ msgid "Default Payment Term"
msgstr "Условия за плащане по подрабиране"
#. module: sale
-#: model:ir.actions.act_window,name:sale.action_config_picking_policy
-msgid "Configure Picking Policy for Sales Order"
+#: field:sale.config.picking_policy,deli_orders:0
+msgid "Based on Delivery Orders"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.picking_policy,time_unit:0
+msgid "Main Working Time Unit"
msgstr ""
#. module: sale
@@ -174,9 +189,10 @@ msgid "Disc.(%)"
msgstr "Отстъпка (%)"
#. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_forceassignation0
-msgid "Force Assignation"
-msgstr "Принудително задаване"
+#: view:sale.report:0
+#: field:sale.report,price_total:0
+msgid "Total Price"
+msgstr "Крайна цена"
#. module: sale
#: help:sale.make.invoice,grouped:0
@@ -184,6 +200,11 @@ msgid "Check the box to group the invoices for the same customers"
msgstr "Слежете отметка за да групирате фактурите за едни и същи клиенти"
#. module: sale
+#: view:sale.order:0
+msgid "My Sale Orders"
+msgstr ""
+
+#. module: sale
#: selection:sale.order,invoice_quantity:0
msgid "Ordered Quantities"
msgstr "Поръчани количества"
@@ -222,13 +243,24 @@ msgid ""
msgstr ""
#. module: sale
+#: field:sale.config.picking_policy,task_work:0
+msgid "Based on Tasks' Work"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
+msgid "Quotations and Sales"
+msgstr ""
+
+#. module: sale
#: model:ir.model,name:sale.model_sale_make_invoice
msgid "Sales Make Invoice"
msgstr ""
#. module: sale
-#: view:sale.order:0
-msgid "Recreate Packing"
+#: code:addons/sale/sale.py:330
+#, python-format
+msgid "Pricelist Warning!"
msgstr ""
#. module: sale
@@ -237,10 +269,10 @@ msgid "Discount (%)"
msgstr "Отстъпка (%)"
#. module: sale
-#: help:res.company,security_lead:0
-msgid ""
-"This is the days added to what you promise to customers for security purpose"
-msgstr "Дните към обещанието Ви към клиентите - за сигурност"
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_quotation_for_sale
+msgid "My Quotations"
+msgstr "Мои оферти"
#. module: sale
#: view:board.board:0
@@ -265,7 +297,22 @@ msgid "Shop Name"
msgstr "Име на магазин"
#. module: sale
-#: code:addons/sale/sale.py:1014
+#: help:sale.order,order_policy:0
+msgid ""
+"The Invoice Policy is used to synchronise invoice and delivery operations.\n"
+" - The 'Pay before delivery' choice will first generate the invoice and "
+"then generate the picking order after the payment of this invoice.\n"
+" - The 'Deliver & Invoice on demand' will create the picking order directly "
+"and wait for the user to manually click on the 'Invoice' button to generate "
+"the draft invoice based on the sale order or the sale order lines.\n"
+" - The 'Invoice on order after delivery' choice will generate the draft "
+"invoice based on sales order after all picking lists have been finished.\n"
+" - The 'Invoice based on deliveries' choice is used to create an invoice "
+"during the picking process."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:1158
#, python-format
msgid "No Customer Defined !"
msgstr "Не е определен клиент!"
@@ -276,9 +323,12 @@ msgid "Sales in Exception"
msgstr "Продажби с грешки"
#. module: sale
-#: view:sale.order:0
-msgid "Set to Draft"
-msgstr "Пращане в проект"
+#: code:addons/sale/sale.py:1145
+#: code:addons/sale/sale.py:1264
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:70
+#, python-format
+msgid "Configuration Error !"
+msgstr ""
#. module: sale
#: view:sale.order:0
@@ -286,22 +336,7 @@ msgid "Conditions"
msgstr "Условия"
#. module: sale
-#: help:sale.order,order_policy:0
-msgid ""
-"The Shipping Policy is used to synchronise invoice and delivery operations.\n"
-" - The 'Pay Before delivery' choice will first generate the invoice and "
-"then generate the picking order after the payment of this invoice.\n"
-" - The 'Shipping & Manual Invoice' will create the picking order directly "
-"and wait for the user to manually click on the 'Invoice' button to generate "
-"the draft invoice.\n"
-" - The 'Invoice On Order After Delivery' choice will generate the draft "
-"invoice based on sales order after all picking lists have been finished.\n"
-" - The 'Invoice From The Picking' choice is used to create an invoice "
-"during the picking process."
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:939
+#: code:addons/sale/sale.py:1034
#, python-format
msgid ""
"There is no income category account defined in default Properties for "
@@ -309,9 +344,9 @@ msgid ""
msgstr ""
#. module: sale
-#: view:sale.installer:0
-msgid "Configure"
-msgstr "Настройване"
+#: selection:sale.report,month:0
+msgid "August"
+msgstr "Август"
#. module: sale
#: constraint:stock.move:0
@@ -319,7 +354,7 @@ msgid "You try to assign a lot which is not from the same product"
msgstr "Опитвате да свържете партида, която не е от същия продукт"
#. module: sale
-#: code:addons/sale/sale.py:620
+#: code:addons/sale/sale.py:655
#, python-format
msgid "invalid mode for test_state"
msgstr "невалиден режим за test_state"
@@ -330,7 +365,7 @@ msgid "June"
msgstr "Юни"
#. module: sale
-#: code:addons/sale/sale.py:584
+#: code:addons/sale/sale.py:617
#, python-format
msgid "Could not cancel this sales order !"
msgstr "Не можете да откажете това нареждане за продажба"
@@ -351,8 +386,12 @@ msgid "October"
msgstr "Октомври"
#. module: sale
+#: sql_constraint:stock.picking:0
+msgid "Reference must be unique per Company!"
+msgstr ""
+
+#. module: sale
#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_quotation_for_sale
#: view:sale.order:0
#: view:sale.report:0
msgid "Quotations"
@@ -364,11 +403,6 @@ msgid "Pricelist for current sales order."
msgstr "Ценова листа за настоящото нарежданае за продажба"
#. module: sale
-#: selection:sale.config.picking_policy,step:0
-msgid "Delivery Order Only"
-msgstr "Поръчка само за доставка"
-
-#. module: sale
#: report:sale.order:0
msgid "TVA :"
msgstr "ДДС"
@@ -395,6 +429,7 @@ msgstr "Финансова позиция"
#. module: sale
#: view:sale.order:0
#: view:sale.order.line:0
+#: field:sale.report,product_uom:0
msgid "UoM"
msgstr "Мер. единици"
@@ -419,13 +454,19 @@ msgstr ""
"става \"В развитие\" или \"Ръчно\"."
#. module: sale
-#: code:addons/sale/sale.py:971
+#: code:addons/sale/sale.py:1061
+#, python-format
+msgid "You cannot cancel a sale order line that has already been invoiced!"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:1066
#, python-format
msgid "You must first cancel stock moves attached to this sales order line."
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:1042
+#: code:addons/sale/sale.py:1134
#, python-format
msgid "(n/a)"
msgstr "не е налично/и"
@@ -459,15 +500,36 @@ msgid "Notes"
msgstr "Бележки"
#. module: sale
+#: sql_constraint:res.company:0
+msgid "The company name must be unique !"
+msgstr ""
+
+#. module: sale
#: help:sale.order,partner_invoice_id:0
msgid "Invoice address for current sales order."
msgstr "Адрес за фактурата за настоящото нареждане за продажба."
#. module: sale
-#: view:sale.installer:0
-msgid "Enhance your core Sales Application with additional functionalities."
+#: view:sale.report:0
+msgid "Month-1"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered month of the sales order"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:504
+#, python-format
+msgid ""
+"You cannot group sales having different currencies for the same partner."
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,picking_policy:0
+msgid "Deliver each product when available"
msgstr ""
-"Разширяване на ядрото на приложение Продажби с допълнителни функционалностти."
#. module: sale
#: field:sale.order,invoiced_rate:0
@@ -486,21 +548,43 @@ msgid "Confirmation Date"
msgstr "Дата на потвърждаване"
#. module: sale
+#: field:sale.order,incoterm:0
+msgid "Incoterm"
+msgstr "Инкотермс"
+
+#. module: sale
#: field:sale.order.line,address_allotment_id:0
msgid "Allotment Partner"
msgstr "Партньор в разпределние"
#. module: sale
-#: sql_constraint:sale.order:0
-msgid "Order Reference must be unique !"
-msgstr ""
-
-#. module: sale
#: selection:sale.report,month:0
msgid "March"
msgstr "Март"
#. module: sale
+#: constraint:stock.move:0
+msgid "You can not move products from or to a location of the type view."
+msgstr ""
+
+#. module: sale
+#: field:sale.config.picking_policy,sale_orders:0
+msgid "Based on Sales Orders"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,state:0
+msgid ""
+"Givwizard = self.browse(cr, uid, ids)[0]es the state of the quotation or "
+"sales order. \n"
+"The exception state is automatically set when a cancel operation occurs in "
+"the invoice validation (Invoice Exception) or in the picking list process "
+"(Shipping Exception). \n"
+"The 'Waiting Schedule' state is set when the invoice is confirmed but "
+"waiting for the scheduler to run on the order date."
+msgstr ""
+
+#. module: sale
#: help:sale.order,amount_total:0
msgid "The total amount."
msgstr "Общата сума"
@@ -516,6 +600,11 @@ msgid "Invoice address :"
msgstr "Адрес за фактура:"
#. module: sale
+#: field:sale.order.line,sequence:0
+msgid "Line Sequence"
+msgstr ""
+
+#. module: sale
#: model:process.transition,note:sale.process_transition_saleorderprocurement0
msgid ""
"For every sales order line, a procurement order is created to supply the "
@@ -562,11 +651,6 @@ msgid "Sales Order Line"
msgstr "Ред от нареждане за продажба"
#. module: sale
-#: view:sale.config.picking_policy:0
-msgid "Setup your sales workflow and default values."
-msgstr "Настойте работния поток при продажби и стойностите по подразбиране."
-
-#. module: sale
#: field:sale.shop,warehouse_id:0
msgid "Warehouse"
msgstr "Склад"
@@ -603,6 +687,11 @@ msgid "Creation Date"
msgstr "Дата на създаване"
#. module: sale
+#: model:ir.ui.menu,name:sale.menu_sales_configuration_misc
+msgid "Miscellaneous"
+msgstr ""
+
+#. module: sale
#: model:ir.actions.act_window,name:sale.action_order_line_tree3
msgid "Uninvoiced and Delivered Lines"
msgstr "Редове с нефактурирани и доставени"
@@ -618,14 +707,19 @@ msgid "My Sales"
msgstr "Мои продажби"
#. module: sale
-#: code:addons/sale/sale.py:290
-#: code:addons/sale/sale.py:966
-#: code:addons/sale/sale.py:1165
+#: code:addons/sale/sale.py:295
+#: code:addons/sale/sale.py:1061
+#: code:addons/sale/sale.py:1290
#, python-format
msgid "Invalid action !"
msgstr "Невалидно действие !"
#. module: sale
+#: view:sale.order:0
+msgid "Extra Info"
+msgstr "Допълнителна информация"
+
+#. module: sale
#: field:sale.order,pricelist_id:0
#: field:sale.report,pricelist_id:0
#: field:sale.shop,pricelist_id:0
@@ -639,13 +733,21 @@ msgid "# of Qty"
msgstr "# от кол."
#. module: sale
+#: code:addons/sale/sale.py:1314
+#, python-format
+msgid "Hour"
+msgstr ""
+
+#. module: sale
#: view:sale.order:0
msgid "Order Date"
msgstr "Дата на поръчка"
#. module: sale
#: view:sale.order.line:0
+#: view:sale.report:0
#: field:sale.report,shipped:0
+#: field:sale.report,shipped_qty_1:0
msgid "Shipped"
msgstr "Изпратена"
@@ -655,9 +757,9 @@ msgid "All Quotations"
msgstr "Всички оферти"
#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Invoice On Order After Delivery"
-msgstr "Фактура по поръчка след доставка"
+#: view:sale.config.picking_policy:0
+msgid "Options"
+msgstr ""
#. module: sale
#: selection:sale.report,month:0
@@ -665,6 +767,20 @@ msgid "September"
msgstr "Септември"
#. module: sale
+#: code:addons/sale/sale.py:632
+#, python-format
+msgid "You cannot confirm a sale order which has no line."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:1246
+#, python-format
+msgid ""
+"You have to select a pricelist or a customer in the sales form !\n"
+"Please set one before choosing a product."
+msgstr ""
+
+#. module: sale
#: view:sale.report:0
#: field:sale.report,categ_id:0
msgid "Category of Product"
@@ -681,11 +797,6 @@ msgid "Stock Moves"
msgstr "Движения на стоки"
#. module: sale
-#: view:sale.report:0
-msgid " Year "
-msgstr " Година "
-
-#. module: sale
#: field:sale.order,state:0
#: field:sale.report,state:0
msgid "Order State"
@@ -703,7 +814,7 @@ msgid "Sales By Month"
msgstr "Продажби по месец"
#. module: sale
-#: code:addons/sale/sale.py:970
+#: code:addons/sale/sale.py:1065
#, python-format
msgid "Could not cancel sales order line!"
msgstr "Не може да бъде отказан ред от нареждане за продажба!"
@@ -736,42 +847,19 @@ msgid ""
msgstr ""
#. module: sale
+#: field:sale.order,date_order:0
+msgid "Date"
+msgstr ""
+
+#. module: sale
#: view:sale.report:0
msgid "Extended Filters..."
msgstr "Разширени филтри"
#. module: sale
-#: model:ir.module.module,description:sale.module_meta_information
-msgid ""
-"\n"
-" The base module to manage quotations and sales orders.\n"
-"\n"
-" * Workflow with validation steps:\n"
-" - Quotation -> Sales order -> Invoice\n"
-" * Invoicing methods:\n"
-" - Invoice on order (before or after shipping)\n"
-" - Invoice on delivery\n"
-" - Invoice on timesheets\n"
-" - Advance invoice\n"
-" * Partners preferences (shipping, invoicing, incoterm, ...)\n"
-" * Products stocks and prices\n"
-" * Delivery methods:\n"
-" - all at once, multi-parcel\n"
-" - delivery costs\n"
-" * Dashboard for salesman that includes:\n"
-" * Your open quotations\n"
-" * Top 10 sales of the month\n"
-" * Cases statistics\n"
-" * Graph of sales by product\n"
-" * Graph of cases of the month\n"
-" "
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_shop
-#: view:sale.shop:0
-msgid "Sales Shop"
-msgstr "Магазин"
+#: selection:sale.order.line,state:0
+msgid "Exception"
+msgstr "Грешка"
#. module: sale
#: model:ir.model,name:sale.model_res_company
@@ -779,9 +867,10 @@ msgid "Companies"
msgstr "Фирми"
#. module: sale
-#: selection:sale.report,month:0
-msgid "November"
-msgstr "Ноември"
+#: code:addons/sale/sale.py:1259
+#, python-format
+msgid "No valid pricelist line found ! :"
+msgstr ""
#. module: sale
#: view:sale.order:0
@@ -789,8 +878,8 @@ msgid "History"
msgstr "История"
#. module: sale
-#: field:sale.config.picking_policy,picking_policy:0
-msgid "Picking Default Policy"
+#: selection:sale.order,order_policy:0
+msgid "Invoice on order after delivery"
msgstr ""
#. module: sale
@@ -815,13 +904,12 @@ msgid ""
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:966
-#, python-format
-msgid "You cannot cancel a sales order line that has already been invoiced !"
-msgstr "Не можете да откажете вече фактурирана поръчка!"
+#: help:res.company,security_lead:0
+msgid ""
+"This is the days added to what you promise to customers for security purpose"
+msgstr "Дните към обещанието Ви към клиентите - за сигурност"
#. module: sale
-#: view:sale.order:0
#: view:sale.order.line:0
msgid "Qty"
msgstr "К-во"
@@ -832,6 +920,11 @@ msgid "References"
msgstr "Препратки"
#. module: sale
+#: view:sale.order.line:0
+msgid "My Sales Order Lines"
+msgstr ""
+
+#. module: sale
#: model:process.transition.action,name:sale.process_transition_action_cancel0
#: model:process.transition.action,name:sale.process_transition_action_cancel1
#: model:process.transition.action,name:sale.process_transition_action_cancel2
@@ -843,14 +936,9 @@ msgid "Cancel"
msgstr "Отказ"
#. module: sale
-#: field:sale.installer,sale_order_dates:0
-msgid "Sales Order Dates"
-msgstr "Дати на поръчки за продажби"
-
-#. module: sale
-#: selection:sale.order.line,state:0
-msgid "Exception"
-msgstr "Грешка"
+#: sql_constraint:sale.order:0
+msgid "Order Reference must be unique per Company!"
+msgstr ""
#. module: sale
#: model:process.transition,name:sale.process_transition_invoice0
@@ -862,19 +950,19 @@ msgid "Create Invoice"
msgstr "Създаване на фактура"
#. module: sale
-#: field:sale.installer,sale_margin:0
-msgid "Margins in Sales Orders"
-msgstr "Марж в Поръчки за продажби"
-
-#. module: sale
#: view:sale.order:0
msgid "Total Tax Excluded"
msgstr ""
#. module: sale
-#: view:sale.order:0
-msgid "Compute"
-msgstr "Изчисляване"
+#: view:sale.order.line:0
+msgid "Order reference"
+msgstr ""
+
+#. module: sale
+#: view:sale.open.invoice:0
+msgid "You invoice has been successfully created!"
+msgstr ""
#. module: sale
#: view:sale.report:0
@@ -893,23 +981,20 @@ msgid "Open Invoice"
msgstr "Отворена фактура"
#. module: sale
-#: report:sale.order:0
-#: view:sale.order.line:0
-msgid "Price"
-msgstr "Цена"
+#: model:ir.actions.server,name:sale.ir_actions_server_edi_sale
+msgid "Auto-email confirmed sale orders"
+msgstr ""
#. module: sale
-#: model:ir.actions.act_window,name:sale.action_sale_installer
-#: view:sale.config.picking_policy:0
-#: view:sale.installer:0
-msgid "Sales Application Configuration"
-msgstr "Настройки на приложение продажби"
+#: code:addons/sale/sale.py:413
+#, python-format
+msgid "There is no sales journal defined for this company: \"%s\" (id:%d)"
+msgstr ""
#. module: sale
-#: view:sale.report:0
-#: field:sale.report,price_total:0
-msgid "Total Price"
-msgstr "Крайна цена"
+#: model:process.transition.action,name:sale.process_transition_action_forceassignation0
+msgid "Force Assignation"
+msgstr "Принудително задаване"
#. module: sale
#: selection:sale.order.line,type:0
@@ -922,6 +1007,11 @@ msgid "Based on the shipped or on the ordered quantities."
msgstr ""
#. module: sale
+#: selection:sale.order,picking_policy:0
+msgid "Deliver all products at once"
+msgstr ""
+
+#. module: sale
#: field:sale.order,picking_ids:0
msgid "Related Picking"
msgstr "Свързано товарене"
@@ -953,9 +1043,15 @@ msgid "Create Delivery Order"
msgstr ""
#. module: sale
-#: field:sale.installer,delivery:0
-msgid "Delivery Costs"
-msgstr "Цени за доставка"
+#: code:addons/sale/sale.py:1290
+#, python-format
+msgid "Cannot delete a sales order line which is in state '%s'!"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Qty(UoS)"
+msgstr ""
#. module: sale
#: view:sale.order:0
@@ -969,13 +1065,13 @@ msgstr ""
#. module: sale
#: view:sale.report:0
-msgid "Sales by Product Category"
-msgstr "Продажби по продуктова категория"
+msgid "Ordered date of the sales order"
+msgstr ""
#. module: sale
-#: selection:sale.order,picking_policy:0
-msgid "Partial Delivery"
-msgstr "Частична доставка"
+#: view:sale.report:0
+msgid "Sales by Product Category"
+msgstr "Продажби по продуктова категория"
#. module: sale
#: model:process.transition,name:sale.process_transition_confirmquotation0
@@ -983,9 +1079,10 @@ msgid "Confirm Quotation"
msgstr "Потвърждаване на оферта"
#. module: sale
-#: help:sale.order,origin:0
-msgid "Reference of the document that generated this sales order request."
-msgstr ""
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:63
+#, python-format
+msgid "Error"
+msgstr "Грешка"
#. module: sale
#: view:sale.order:0
@@ -1017,20 +1114,14 @@ msgid "Procurement Method"
msgstr "Начин на снабдяване"
#. module: sale
-#: view:sale.config.picking_policy:0
-#: view:sale.installer:0
-msgid "title"
-msgstr "заглавие"
-
-#. module: sale
#: model:process.node,name:sale.process_node_packinglist0
msgid "Pick List"
msgstr ""
#. module: sale
#: view:sale.order:0
-msgid "Order date"
-msgstr "Дата на поръка"
+msgid "Set to Draft"
+msgstr "Пращане в проект"
#. module: sale
#: model:process.node,note:sale.process_node_packinglist0
@@ -1038,6 +1129,85 @@ msgid "Document of the move to the output or to the customer."
msgstr ""
#. module: sale
+#: model:email.template,body_text:sale.email_template_edi_sale
+msgid ""
+"\n"
+"Hello${object.partner_order_id.name and ' ' or "
+"''}${object.partner_order_id.name or ''},\n"
+"\n"
+"Here is your order confirmation for ${object.partner_id.name}:\n"
+" | Order number: *${object.name}*\n"
+" | Order total: *${object.amount_total} "
+"${object.pricelist_id.currency_id.name}*\n"
+" | Order date: ${object.date_order}\n"
+" % if object.origin:\n"
+" | Order reference: ${object.origin}\n"
+" % endif\n"
+" % if object.client_order_ref:\n"
+" | Your reference: ${object.client_order_ref}<br />\n"
+" % endif\n"
+" | Your contact: ${object.user_id.name} ${object.user_id.user_email "
+"and '<%s>'%(object.user_id.user_email) or ''}\n"
+"\n"
+"You can view the order confirmation, download it and even pay online using "
+"the following link:\n"
+" ${ctx.get('edi_web_url_view') or 'n/a'}\n"
+"\n"
+"% if object.order_policy in ('prepaid','manual') and "
+"object.company_id.paypal_account:\n"
+"<% \n"
+"comp_name = quote(object.company_id.name)\n"
+"order_name = quote(object.name)\n"
+"paypal_account = quote(object.company_id.paypal_account)\n"
+"order_amount = quote(str(object.amount_total))\n"
+"cur_name = quote(object.pricelist_id.currency_id.name)\n"
+"paypal_url = \"https://www.paypal.com/cgi-"
+"bin/webscr?cmd=_xclick&business=%s&item_name=%s%%20Order%%20%s&invoice=%s&amo"
+"unt=%s\" \\\n"
+" "
+"\"&currency_code=%s&button_subtype=services&no_note=1&bn=OpenERP_Order_PayNow"
+"_%s\" % \\\n"
+" "
+"(paypal_account,comp_name,order_name,order_name,order_amount,cur_name,cur_nam"
+"e)\n"
+"%>\n"
+"It is also possible to directly pay with Paypal:\n"
+" ${paypal_url}\n"
+"% endif\n"
+"\n"
+"If you have any question, do not hesitate to contact us.\n"
+"\n"
+"\n"
+"Thank you for choosing ${object.company_id.name}!\n"
+"\n"
+"\n"
+"--\n"
+"${object.user_id.name} ${object.user_id.user_email and "
+"'<%s>'%(object.user_id.user_email) or ''}\n"
+"${object.company_id.name}\n"
+"% if object.company_id.street:\n"
+"${object.company_id.street or ''}\n"
+"% endif\n"
+"% if object.company_id.street2:\n"
+"${object.company_id.street2}\n"
+"% endif\n"
+"% if object.company_id.city or object.company_id.zip:\n"
+"${object.company_id.zip or ''} ${object.company_id.city or ''}\n"
+"% endif\n"
+"% if object.company_id.country_id:\n"
+"${object.company_id.state_id and ('%s, ' % object.company_id.state_id.name) "
+"or ''} ${object.company_id.country_id.name or ''}\n"
+"% endif\n"
+"% if object.company_id.phone:\n"
+"Phone: ${object.company_id.phone}\n"
+"% endif\n"
+"% if object.company_id.website:\n"
+"${object.company_id.website or ''}\n"
+"% endif\n"
+" "
+msgstr ""
+
+#. module: sale
#: model:process.transition.action,name:sale.process_transition_action_validate0
msgid "Validate"
msgstr "Проверка"
@@ -1060,9 +1230,9 @@ msgid "Taxes"
msgstr "Данъци"
#. module: sale
-#: field:sale.order,order_policy:0
-msgid "Shipping Policy"
-msgstr "Политика на доставки"
+#: view:sale.order:0
+msgid "Sales Order ready to be invoiced"
+msgstr ""
#. module: sale
#: help:sale.order,create_date:0
@@ -1081,9 +1251,9 @@ msgid "Create Invoices"
msgstr "Създаване на фактури"
#. module: sale
-#: view:sale.order:0
-msgid "Extra Info"
-msgstr "Допълнителна информация"
+#: view:sale.report:0
+msgid "Sales order created in current month"
+msgstr ""
#. module: sale
#: report:sale.order:0
@@ -1091,11 +1261,24 @@ msgid "Fax :"
msgstr "Факс:"
#. module: sale
+#: help:sale.order.line,type:0
+msgid ""
+"If 'on order', it triggers a procurement when the sale order is confirmed to "
+"create a task, purchase order or manufacturing order linked to this sale "
+"order line."
+msgstr ""
+
+#. module: sale
#: field:sale.advance.payment.inv,amount:0
msgid "Advance Amount"
msgstr ""
#. module: sale
+#: field:sale.config.picking_policy,charge_delivery:0
+msgid "Do you charge the delivery?"
+msgstr ""
+
+#. module: sale
#: selection:sale.order,invoice_quantity:0
msgid "Shipped Quantities"
msgstr "Доставени количества"
@@ -1106,25 +1289,45 @@ msgid "Invoice Based on Sales Orders"
msgstr "Фактури върху поръчки за продажби"
#. module: sale
+#: code:addons/sale/sale.py:331
+#, python-format
+msgid ""
+"If you change the pricelist of this order (and eventually the currency), "
+"prices of existing order lines will not be updated."
+msgstr ""
+
+#. module: sale
#: model:ir.model,name:sale.model_stock_picking
msgid "Picking List"
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:387
-#: code:addons/sale/sale.py:920
-#: code:addons/sale/sale.py:938
+#: code:addons/sale/sale.py:412
+#: code:addons/sale/sale.py:503
+#: code:addons/sale/sale.py:632
+#: code:addons/sale/sale.py:1015
+#: code:addons/sale/sale.py:1033
#, python-format
msgid "Error !"
msgstr "Грешка!"
#. module: sale
-#: code:addons/sale/sale.py:570
+#: code:addons/sale/sale.py:603
#, python-format
msgid "Could not cancel sales order !"
msgstr "Не може да бъде отказана поръчка за продажба!"
#. module: sale
+#: view:sale.order:0
+msgid "Qty(UoM)"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered Year of the sales order"
+msgstr ""
+
+#. module: sale
#: selection:sale.report,month:0
msgid "July"
msgstr "Юли"
@@ -1141,35 +1344,25 @@ msgid "Shipping Exception"
msgstr "Грешка при доставка"
#. module: sale
-#: field:sale.make.invoice,grouped:0
-msgid "Group the invoices"
-msgstr "Групиране на фактури"
-
-#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Shipping & Manual Invoice"
-msgstr "Доставка и ръчно фактуриране"
-
-#. module: sale
-#: code:addons/sale/sale.py:1051
+#: code:addons/sale/sale.py:1143
#, python-format
-msgid "Picking Information !"
+msgid "Picking Information ! : "
msgstr ""
#. module: sale
-#: view:sale.report:0
-#: field:sale.report,month:0
-msgid "Month"
-msgstr "Месец"
+#: field:sale.make.invoice,grouped:0
+msgid "Group the invoices"
+msgstr "Групиране на фактури"
#. module: sale
-#: model:ir.module.module,shortdesc:sale.module_meta_information
-msgid "Sales Management"
-msgstr "Управление на продажби"
+#: field:sale.order,order_policy:0
+msgid "Invoice Policy"
+msgstr ""
#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Invoice From The Picking"
+#: model:ir.actions.act_window,name:sale.action_config_picking_policy
+#: view:sale.config.picking_policy:0
+msgid "Setup your Invoicing Method"
msgstr ""
#. module: sale
@@ -1179,27 +1372,30 @@ msgstr ""
#. module: sale
#: view:sale.report:0
-#: field:sale.report,uom_name:0
msgid "Reference UoM"
msgstr ""
#. module: sale
+#: view:sale.config.picking_policy:0
+msgid ""
+"This tool will help you to install the right module and configure the system "
+"according to the method you use to invoice your customers."
+msgstr ""
+
+#. module: sale
#: model:ir.model,name:sale.model_sale_order_line_make_invoice
msgid "Sale OrderLine Make_invoice"
msgstr ""
#. module: sale
-#: help:sale.config.picking_policy,step:0
-msgid ""
-"By default, OpenERP is able to manage complex routing and paths of products "
-"in your warehouse and partner locations. This will configure the most common "
-"and simple methods to deliver products to the customer in one or two "
-"operations by the worker."
-msgstr ""
+#: selection:sale.order,state:0
+#: selection:sale.report,state:0
+msgid "Invoice Exception"
+msgstr "Грешка в фактура"
#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_tree
-msgid "Old Quotations"
+#: model:process.node,note:sale.process_node_saleorder0
+msgid "Drives procurement and invoicing"
msgstr ""
#. module: sale
@@ -1215,6 +1411,22 @@ msgid "Sales Analysis"
msgstr "Анализ на продажби"
#. module: sale
+#: code:addons/sale/sale.py:1138
+#, python-format
+msgid ""
+"You selected a quantity of %d Units.\n"
+"But it's not compatible with the selected packaging.\n"
+"Here is a proposition of quantities according to the packaging:\n"
+"EAN: %s Quantity: %s Type of ul: %s"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Recreate Packing"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
#: field:sale.order.line,property_ids:0
msgid "Properties"
msgstr "Свойства"
@@ -1244,7 +1456,17 @@ msgid ""
msgstr ""
#. module: sale
-#: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
+#: view:sale.order.line:0
+msgid "Confirmed sale order lines, not yet delivered"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:473
+#, python-format
+msgid "Customer Invoices"
+msgstr ""
+
+#. module: sale
#: model:process.process,name:sale.process_process_salesprocess0
#: view:sale.order:0
#: view:sale.report:0
@@ -1266,18 +1488,13 @@ msgid "Done"
msgstr "Готов"
#. module: sale
-#: model:ir.model,name:sale.model_sale_installer
-msgid "sale.installer"
-msgstr ""
-
-#. module: sale
#: model:process.node,name:sale.process_node_invoice0
#: model:process.node,name:sale.process_node_invoiceafterdelivery0
msgid "Invoice"
msgstr "Фактура"
#. module: sale
-#: code:addons/sale/sale.py:1014
+#: code:addons/sale/sale.py:1158
#, python-format
msgid ""
"You have to select a customer in the sales form !\n"
@@ -1285,11 +1502,6 @@ msgid ""
msgstr ""
#. module: sale
-#: selection:sale.config.picking_policy,step:0
-msgid "Picking List & Delivery Order"
-msgstr ""
-
-#. module: sale
#: field:sale.order,origin:0
msgid "Source Document"
msgstr "Изходен документ"
@@ -1315,7 +1527,7 @@ msgid "The amount without tax."
msgstr "Сумата без данък."
#. module: sale
-#: code:addons/sale/sale.py:571
+#: code:addons/sale/sale.py:604
#, python-format
msgid "You must first cancel all picking attached to this sales order."
msgstr ""
@@ -1326,9 +1538,15 @@ msgid "Sales Advance Payment Invoice"
msgstr ""
#. module: sale
-#: field:sale.order,incoterm:0
-msgid "Incoterm"
-msgstr "Инкотермс"
+#: view:sale.report:0
+#: field:sale.report,month:0
+msgid "Month"
+msgstr "Месец"
+
+#. module: sale
+#: model:email.template,subject:sale.email_template_edi_sale
+msgid "${object.company_id.name} Order (Ref ${object.name or 'n/a' })"
+msgstr ""
#. module: sale
#: view:sale.order.line:0
@@ -1339,11 +1557,6 @@ msgid "Product"
msgstr "Продукт"
#. module: sale
-#: model:ir.ui.menu,name:sale.menu_invoiced
-msgid "Invoicing"
-msgstr "Фактуриране"
-
-#. module: sale
#: model:process.transition.action,name:sale.process_transition_action_cancelassignation0
msgid "Cancel Assignation"
msgstr "Отказване на назначение"
@@ -1354,14 +1567,10 @@ msgid "sale.config.picking_policy"
msgstr "sale.config.picking_policy"
#. module: sale
-#: help:sale.order,state:0
-msgid ""
-"Gives the state of the quotation or sales order. \n"
-"The exception state is automatically set when a cancel operation occurs in "
-"the invoice validation (Invoice Exception) or in the picking list process "
-"(Shipping Exception). \n"
-"The 'Waiting Schedule' state is set when the invoice is confirmed but "
-"waiting for the scheduler to run on the date 'Ordered Date'."
+#: view:account.invoice.report:0
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_turnover_by_month
+msgid "Monthly Turnover"
msgstr ""
#. module: sale
@@ -1380,7 +1589,6 @@ msgid "Product UoS"
msgstr "Прод. единици на продукт"
#. module: sale
-#: selection:sale.order,state:0
#: selection:sale.report,state:0
msgid "Manual In Progress"
msgstr "Ръчно в развитие"
@@ -1401,7 +1609,8 @@ msgid "Order"
msgstr "Ред"
#. module: sale
-#: code:addons/sale/sale.py:921
+#: code:addons/sale/sale.py:1016
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:71
#, python-format
msgid "There is no income account defined for this product: \"%s\" (id:%d)"
msgstr ""
@@ -1421,7 +1630,7 @@ msgid ""
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:1116
+#: code:addons/sale/sale.py:1238
#, python-format
msgid ""
"You plan to sell %.2f %s but you only have %.2f %s available !\n"
@@ -1450,10 +1659,10 @@ msgid "Total"
msgstr "Общо"
#. module: sale
-#: code:addons/sale/sale.py:388
-#, python-format
-msgid "There is no sales journal defined for this company: \"%s\" (id:%d)"
-msgstr ""
+#: report:sale.order:0
+#: view:sale.order.line:0
+msgid "Price"
+msgstr "Цена"
#. module: sale
#: model:process.transition,note:sale.process_transition_deliver0
@@ -1464,9 +1673,14 @@ msgid ""
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:1165
-#, python-format
-msgid "Cannot delete a sales order line which is %s !"
+#: selection:sale.order,order_policy:0
+msgid "Pay before delivery"
+msgstr ""
+
+#. module: sale
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.open_board_sales
+msgid "Sales Dashboard"
msgstr ""
#. module: sale
@@ -1478,6 +1692,7 @@ msgstr "Направи фактури"
#. module: sale
#: view:sale.order:0
+#: selection:sale.order,state:0
#: view:sale.order.line:0
msgid "To Invoice"
msgstr ""
@@ -1488,6 +1703,11 @@ msgid "Date on which sales order is confirmed."
msgstr ""
#. module: sale
+#: field:sale.order,project_id:0
+msgid "Contract/Analytic Account"
+msgstr ""
+
+#. module: sale
#: field:sale.order,company_id:0
#: field:sale.order.line,company_id:0
#: view:sale.report:0
@@ -1507,22 +1727,17 @@ msgid "The amount to be invoiced in advance."
msgstr ""
#. module: sale
-#: selection:sale.order,state:0
-#: selection:sale.report,state:0
-msgid "Invoice Exception"
-msgstr "Грешка в фактура"
-
-#. module: sale
-#: help:sale.order,picking_ids:0
+#: code:addons/sale/sale.py:1256
+#, python-format
msgid ""
-"This is a list of picking that has been generated for this sales order."
+"Couldn't find a pricelist line matching this product and quantity.\n"
+"You have to change either the product, the quantity or the pricelist."
msgstr ""
#. module: sale
-#: help:sale.installer,sale_margin:0
+#: help:sale.order,picking_ids:0
msgid ""
-"Gives the margin of profitability by calculating the difference between Unit "
-"Price and Cost Price."
+"This is a list of picking that has been generated for this sales order."
msgstr ""
#. module: sale
@@ -1544,6 +1759,11 @@ msgid "Cancelled"
msgstr "Отказан"
#. module: sale
+#: view:sale.order.line:0
+msgid "Sales Order Lines related to a Sales Order of mine"
+msgstr ""
+
+#. module: sale
#: model:ir.actions.act_window,name:sale.action_shop_form
#: model:ir.ui.menu,name:sale.menu_action_shop_form
#: field:sale.order,shop_id:0
@@ -1553,17 +1773,12 @@ msgid "Shop"
msgstr "Магазин"
#. module: sale
-#: view:sale.report:0
-msgid " Month "
-msgstr " Месец "
-
-#. module: sale
#: field:sale.report,date_confirm:0
msgid "Date Confirm"
msgstr ""
#. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:111
+#: code:addons/sale/wizard/sale_line_invoice.py:113
#, python-format
msgid "Warning"
msgstr "Предупреждение"
@@ -1575,17 +1790,6 @@ msgid "Sales by Month"
msgstr "Продажби по месец"
#. module: sale
-#: code:addons/sale/sale.py:1045
-#, python-format
-msgid ""
-"You selected a quantity of %d Units.\n"
-"But it's not compatible with the selected packaging.\n"
-"Here is a proposition of quantities according to the packaging:\n"
-"\n"
-"EAN: %s Quantity: %s Type of ul: %s"
-msgstr ""
-
-#. module: sale
#: model:ir.model,name:sale.model_sale_order
#: model:process.node,name:sale.process_node_order0
#: model:process.node,name:sale.process_node_saleorder0
@@ -1601,6 +1805,11 @@ msgid "Quantity (UoS)"
msgstr "Кол-во (бр. за продажба)"
#. module: sale
+#: view:sale.order.line:0
+msgid "Sale Order Lines that are in 'done' state"
+msgstr ""
+
+#. module: sale
#: model:process.transition,note:sale.process_transition_packing0
msgid ""
"The Pick List form is created as soon as the sales order is confirmed, in "
@@ -1615,6 +1824,11 @@ msgid "Confirmed"
msgstr "Потвърден"
#. module: sale
+#: field:sale.config.picking_policy,order_policy:0
+msgid "Main Method Based On"
+msgstr ""
+
+#. module: sale
#: model:process.transition.action,name:sale.process_transition_action_confirm0
msgid "Confirm"
msgstr "Потвърждение"
@@ -1637,6 +1851,7 @@ msgid "Invoice Lines"
msgstr "Редове на фактура"
#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_product_tree
#: view:sale.order:0
#: view:sale.order.line:0
msgid "Sales Order Lines"
@@ -1653,30 +1868,18 @@ msgid "Configuration"
msgstr "Настройки"
#. module: sale
-#: selection:sale.order,picking_policy:0
-msgid "Complete Delivery"
-msgstr "Приключване на доставката"
+#: code:addons/sale/edi/sale_order.py:146
+#, python-format
+msgid "EDI Pricelist (%s)"
+msgstr ""
#. module: sale
#: view:sale.report:0
-msgid " Month-1 "
-msgstr " Месец-1 "
-
-#. module: sale
-#: help:sale.config.picking_policy,picking_policy:0
-msgid ""
-"The Shipping Policy is used to configure per order if you want to deliver as "
-"soon as possible when one product is available or you wait that all products "
-"are available.."
+msgid "Sales order created in current year"
msgstr ""
#. module: sale
-#: selection:sale.report,month:0
-msgid "August"
-msgstr "Август"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:111
+#: code:addons/sale/wizard/sale_line_invoice.py:113
#, python-format
msgid ""
"Invoice cannot be created for this Sales Order Line due to one of the "
@@ -1686,6 +1889,11 @@ msgid ""
msgstr ""
#. module: sale
+#: view:sale.order.line:0
+msgid "Sale order lines done"
+msgstr ""
+
+#. module: sale
#: field:sale.order.line,th_weight:0
msgid "Weight"
msgstr "Тегло"
@@ -1704,7 +1912,6 @@ msgstr "Декември"
#. module: sale
#: field:sale.config.picking_policy,config_logo:0
-#: field:sale.installer,config_logo:0
msgid "Image"
msgstr "Изображение"
@@ -1734,8 +1941,8 @@ msgid "Salesman"
msgstr "Търговец"
#. module: sale
-#: model:process.node,note:sale.process_node_saleorder0
-msgid "Drives procurement and invoicing"
+#: model:ir.actions.act_window,name:sale.action_order_tree
+msgid "Old Quotations"
msgstr ""
#. module: sale
@@ -1744,7 +1951,7 @@ msgid "Untaxed Amount"
msgstr "Необложена сума"
#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:163
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:170
#: model:ir.actions.act_window,name:sale.action_view_sale_advance_payment_inv
#: view:sale.advance.payment.inv:0
#: view:sale.order:0
@@ -1753,7 +1960,7 @@ msgid "Advance Invoice"
msgstr "Фактура за предплащане"
#. module: sale
-#: code:addons/sale/sale.py:591
+#: code:addons/sale/sale.py:624
#, python-format
msgid "The sales order '%s' has been cancelled."
msgstr "Нареждане за продажба '%s' е отменено."
@@ -1788,19 +1995,19 @@ msgid "Packings"
msgstr ""
#. module: sale
-#: field:sale.config.picking_policy,progress:0
-#: field:sale.installer,progress:0
-msgid "Configuration Progress"
+#: view:sale.order.line:0
+msgid "Sale Order Lines ready to be invoiced"
msgstr ""
#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_product_tree
-msgid "Product sales"
-msgstr "Продажби на продукти"
+#: view:sale.report:0
+msgid "Sales order created in last month"
+msgstr ""
#. module: sale
-#: field:sale.order,date_order:0
-msgid "Ordered Date"
+#: model:ir.actions.act_window,name:sale.action_email_templates
+#: model:ir.ui.menu,name:sale.menu_email_templates
+msgid "Email Templates"
msgstr ""
#. module: sale
@@ -1811,14 +2018,15 @@ msgid "Sales Orders"
msgstr "Поръчки за продажби"
#. module: sale
-#: selection:sale.config.picking_policy,picking_policy:0
-msgid "Direct Delivery"
-msgstr "Директна доставка"
+#: model:ir.model,name:sale.model_sale_shop
+#: view:sale.shop:0
+msgid "Sales Shop"
+msgstr "Магазин"
#. module: sale
-#: field:sale.installer,sale_journal:0
-msgid "Invoicing journals"
-msgstr ""
+#: selection:sale.report,month:0
+msgid "November"
+msgstr "Ноември"
#. module: sale
#: field:sale.advance.payment.inv,product_id:0
@@ -1826,18 +2034,12 @@ msgid "Advance Product"
msgstr "Предварителен продукт"
#. module: sale
-#: view:sale.report:0
-#: field:sale.report,shipped_qty_1:0
-msgid "Shipped Qty"
-msgstr ""
-
-#. module: sale
-#: view:sale.open.invoice:0
-msgid "You invoice has been successfully created!"
-msgstr ""
+#: view:sale.order:0
+msgid "Compute"
+msgstr "Изчисляване"
#. module: sale
-#: code:addons/sale/sale.py:585
+#: code:addons/sale/sale.py:618
#, python-format
msgid "You must first cancel all invoices attached to this sales order."
msgstr ""
@@ -1848,33 +2050,27 @@ msgid "January"
msgstr "Януари"
#. module: sale
-#: view:sale.installer:0
-msgid "Configure Your Sales Management Application"
-msgstr "Настройки на приложение Продажби"
-
-#. module: sale
#: model:ir.actions.act_window,name:sale.action_order_tree4
msgid "Sales Order in Progress"
msgstr "Активни поръчки за продажба"
#. module: sale
-#: field:sale.installer,sale_layout:0
-msgid "Sales Order Layout Improvement"
+#: help:sale.order,origin:0
+msgid "Reference of the document that generated this sales order request."
msgstr ""
#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:63
-#, python-format
-msgid "Error"
-msgstr "Грешка"
-
-#. module: sale
#: view:sale.report:0
#: field:sale.report,delay:0
msgid "Commitment Delay"
msgstr ""
#. module: sale
+#: selection:sale.order,order_policy:0
+msgid "Deliver & invoice on demand"
+msgstr ""
+
+#. module: sale
#: model:process.node,note:sale.process_node_saleprocurement0
msgid ""
"One Procurement order for each sales order line and for each of the "
@@ -1897,14 +2093,12 @@ msgid "Confirmed sales order to invoice."
msgstr "Потвърдени нареждания за продажби за фактуриране."
#. module: sale
-#: code:addons/sale/sale.py:290
-#, python-format
-msgid "Cannot delete Sales Order(s) which are already confirmed !"
+#: view:sale.order:0
+msgid "Sales Order that haven't yet been confirmed"
msgstr ""
-"Не могат да бъдат изтриване нареждания за продажби ако са вече потвърдени!"
#. module: sale
-#: code:addons/sale/sale.py:316
+#: code:addons/sale/sale.py:322
#, python-format
msgid "The sales order '%s' has been set in draft state."
msgstr ""
@@ -1915,37 +2109,27 @@ msgid "from stock"
msgstr "от склад"
#. module: sale
-#: field:sale.config.picking_policy,order_policy:0
-msgid "Shipping Default Policy"
-msgstr "Политика на доставка (по подразбиране)"
-
-#. module: sale
#: view:sale.open.invoice:0
msgid "Close"
msgstr "Затваряне"
#. module: sale
+#: code:addons/sale/sale.py:1248
+#, python-format
+msgid "No Pricelist ! : "
+msgstr ""
+
+#. module: sale
#: field:sale.order,shipped:0
msgid "Delivered"
msgstr "Доставен/а/и"
#. module: sale
-#: code:addons/sale/sale.py:1115
-#, python-format
-msgid "Not enough stock !"
-msgstr "Няма достатъчна наличност"
-
-#. module: sale
#: constraint:stock.move:0
msgid "You must assign a production lot for this product"
msgstr ""
#. module: sale
-#: field:sale.order.line,sequence:0
-msgid "Layout Sequence"
-msgstr ""
-
-#. module: sale
#: model:ir.actions.act_window,help:sale.action_shop_form
msgid ""
"If you have more than one shop reselling your company products, you can "
@@ -1972,11 +2156,6 @@ msgid "May"
msgstr "Май"
#. module: sale
-#: help:sale.installer,sale_order_dates:0
-msgid "Adds commitment, requested and effective dates on Sales Orders."
-msgstr ""
-
-#. module: sale
#: view:sale.order:0
#: field:sale.order,partner_id:0
#: field:sale.order.line,order_partner_id:0
@@ -1984,23 +2163,11 @@ msgid "Customer"
msgstr "Клиент"
#. module: sale
-#: model:product.template,name:sale.advance_product_0_product_template
-msgid "Advance"
-msgstr "Напред"
-
-#. module: sale
#: selection:sale.report,month:0
msgid "February"
msgstr "Февруари"
#. module: sale
-#: help:sale.installer,sale_journal:0
-msgid ""
-"Allows you to group and invoice your delivery orders according to different "
-"invoicing types: daily, weekly, etc."
-msgstr ""
-
-#. module: sale
#: selection:sale.report,month:0
msgid "April"
msgstr "Април"
@@ -2011,11 +2178,6 @@ msgid "Accounting"
msgstr "Счетоводство"
#. module: sale
-#: field:sale.config.picking_policy,step:0
-msgid "Steps To Deliver a Sales Order"
-msgstr ""
-
-#. module: sale
#: view:sale.order:0
#: view:sale.order.line:0
msgid "Search Sales Order"
@@ -2027,18 +2189,18 @@ msgid "Sales Order Requisition"
msgstr ""
#. module: sale
+#: code:addons/sale/sale.py:1242
+#, python-format
+msgid "Not enough stock ! : "
+msgstr ""
+
+#. module: sale
#: report:sale.order:0
#: field:sale.order,payment_term:0
msgid "Payment Term"
msgstr "Условие за плащане"
#. module: sale
-#: help:sale.installer,sale_layout:0
-msgid ""
-"Provides some features to improve the layout of the Sales Order reports."
-msgstr ""
-
-#. module: sale
#: model:ir.actions.act_window,help:sale.action_order_report_all
msgid ""
"This report performs analysis on your quotations and sales orders. Analysis "
@@ -2082,6 +2244,12 @@ msgstr "Фактура базирана на доставки"
#~ msgid "Outgoing Products"
#~ msgstr "Изходящи продукти"
+#~ msgid "Shipping Policy"
+#~ msgstr "Политика на доставки"
+
+#~ msgid "All at Once"
+#~ msgstr "Всичко накуп"
+
#~ msgid "Reference"
#~ msgstr "Отпратка"
@@ -2126,6 +2294,9 @@ msgstr "Фактура базирана на доставки"
#~ "Когато изберете Правила за доставка = 'Автоматично фактуриране след доствка' "
#~ "ще бъде автоматично създадена след доставката"
+#~ msgid "Complete Delivery"
+#~ msgstr "Приключване на доставката"
+
#~ msgid "Total amount"
#~ msgstr "Обща сума"
@@ -2205,6 +2376,9 @@ msgstr "Фактура базирана на доставки"
#~ msgid "Sale Pricelists"
#~ msgstr "Ценови лист за продажба"
+#~ msgid "Direct Delivery"
+#~ msgstr "Директна доставка"
+
#~ msgid "Packing OUT is created for stockable products."
#~ msgstr "За продуктите от склад бе създадено пакетиране ОТ"
@@ -2242,6 +2416,9 @@ msgstr "Фактура базирана на доставки"
#~ msgid "Set Default"
#~ msgstr "По подрабиране"
+#~ msgid "Shipping & Manual Invoice"
+#~ msgstr "Доставка и ръчно фактуриране"
+
#~ msgid "Open Advance Invoice"
#~ msgstr "Отваряне на предварителна фактура"
@@ -2260,6 +2437,9 @@ msgstr "Фактура базирана на доставки"
#~ msgid "Sales order lines"
#~ msgstr "Редове от поръчки за продажба"
+#~ msgid "Delivery Order Only"
+#~ msgstr "Поръчка само за доставка"
+
#~ msgid ""
#~ "The name and address of the contact that requested the order or quotation."
#~ msgstr "Името и адреса на контакта който е поискал запитване или поръчка"
@@ -2267,6 +2447,9 @@ msgstr "Фактура базирана на доставки"
#~ msgid "Sales order"
#~ msgstr "Поръчка за продажба"
+#~ msgid "Sales Management"
+#~ msgstr "Управление на продажби"
+
#~ msgid ""
#~ "By default, Open ERP is able to manage complex routing and paths of products "
#~ "in your warehouse and partner locations. This will configure the most common "
@@ -2284,6 +2467,9 @@ msgstr "Фактура базирана на доставки"
#~ msgid "Related invoices"
#~ msgstr "Свързани поръчки"
+#~ msgid "Payment Before Delivery"
+#~ msgstr "Плащане преди доставка"
+
#~ msgid "Delivery Delay"
#~ msgstr "Забаване на доставка"
@@ -2359,6 +2545,9 @@ msgstr "Фактура базирана на доставки"
#~ msgstr ""
#~ "Грешка: Продажни Единици трябва да е в различна категория от Мерни Единици"
+#~ msgid "Partial Delivery"
+#~ msgstr "Частична доставка"
+
#~ msgid "Invalid model name in the action definition."
#~ msgstr "Невалидно име на модел при задаване на действие"
@@ -2391,6 +2580,9 @@ msgstr "Фактура базирана на доставки"
#~ msgid "Packing Default Policy"
#~ msgstr "Политика на пакетиране (по подразбиране)"
+#~ msgid "Shipping Default Policy"
+#~ msgstr "Политика на доставка (по подразбиране)"
+
#~ msgid "Create Advance Invoice"
#~ msgstr "Създаване на предварителна фактура"
@@ -2426,11 +2618,79 @@ msgstr "Фактура базирана на доставки"
#~ msgid "Quotation (A sale order in draft state)"
#~ msgstr "Оферта (поръчка за продажба в етап на проект)"
-#~ msgid "My Quotations"
-#~ msgstr "Мои оферти"
-
#~ msgid "My sales order in progress"
#~ msgstr "Мои активни поръчки за продажба"
#~ msgid "My sales order waiting Invoice"
#~ msgstr "Мои поръчки за продажба, очакващи фактура"
+
+#~ msgid "Allows you to compute delivery costs on your quotations."
+#~ msgstr "Позволява да се изчисли цена за доставка за quotations."
+
+#~ msgid "Configure"
+#~ msgstr "Настройване"
+
+#~ msgid " Year "
+#~ msgstr " Година "
+
+#, python-format
+#~ msgid "You cannot cancel a sales order line that has already been invoiced !"
+#~ msgstr "Не можете да откажете вече фактурирана поръчка!"
+
+#~ msgid "Delivery Costs"
+#~ msgstr "Цени за доставка"
+
+#~ msgid "title"
+#~ msgstr "заглавие"
+
+#~ msgid "Order date"
+#~ msgstr "Дата на поръка"
+
+#~ msgid "Invoicing"
+#~ msgstr "Фактуриране"
+
+#~ msgid " Month "
+#~ msgstr " Месец "
+
+#~ msgid " Month-1 "
+#~ msgstr " Месец-1 "
+
+#, python-format
+#~ msgid "Not enough stock !"
+#~ msgstr "Няма достатъчна наличност"
+
+#~ msgid "Advance"
+#~ msgstr "Напред"
+
+#~ msgid "Invoice On Order After Delivery"
+#~ msgstr "Фактура по поръчка след доставка"
+
+#~ msgid "Configure Sales Order Logistics"
+#~ msgstr "Настройка на логистиката на продажби"
+
+#~ msgid "Setup your sales workflow and default values."
+#~ msgstr "Настойте работния поток при продажби и стойностите по подразбиране."
+
+#~ msgid "Enhance your core Sales Application with additional functionalities."
+#~ msgstr ""
+#~ "Разширяване на ядрото на приложение Продажби с допълнителни функционалностти."
+
+#~ msgid "Sales Order Dates"
+#~ msgstr "Дати на поръчки за продажби"
+
+#~ msgid "Margins in Sales Orders"
+#~ msgstr "Марж в Поръчки за продажби"
+
+#~ msgid "Sales Application Configuration"
+#~ msgstr "Настройки на приложение продажби"
+
+#~ msgid "Configure Your Sales Management Application"
+#~ msgstr "Настройки на приложение Продажби"
+
+#~ msgid "Product sales"
+#~ msgstr "Продажби на продукти"
+
+#, python-format
+#~ msgid "Cannot delete Sales Order(s) which are already confirmed !"
+#~ msgstr ""
+#~ "Не могат да бъдат изтриване нареждания за продажби ако са вече потвърдени!"
diff --git a/addons/sale/i18n/bs.po b/addons/sale/i18n/bs.po
index 96d62bc06c5..eb08d3cc42b 100644
--- a/addons/sale/i18n/bs.po
+++ b/addons/sale/i18n/bs.po
@@ -6,25 +6,32 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2011-01-11 11:16+0000\n"
+"POT-Creation-Date: 2011-12-22 18:43+0000\n"
"PO-Revision-Date: 2010-12-15 20:56+0000\n"
"Last-Translator: qdp (OpenERP) <qdp-launchpad@tinyerp.com>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-05 05:16+0000\n"
-"X-Generator: Launchpad (build 14231)\n"
+"X-Launchpad-Export-Date: 2011-12-23 06:46+0000\n"
+"X-Generator: Launchpad (build 14560)\n"
#. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_sales_by_salesman
-msgid "Sales by Salesman in last 90 days"
+#: field:sale.config.picking_policy,timesheet:0
+msgid "Based on Timesheet"
msgstr ""
#. module: sale
-#: help:sale.installer,delivery:0
-msgid "Allows you to compute delivery costs on your quotations."
+#: view:sale.order.line:0
+msgid ""
+"Sale Order Lines that are confirmed, done or in exception state and haven't "
+"yet been invoiced"
+msgstr ""
+
+#. module: sale
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_sales_by_salesman
+msgid "Sales by Salesman in last 90 days"
msgstr ""
#. module: sale
@@ -37,6 +44,11 @@ msgstr ""
"prihvatate djelimičnu isporuku?"
#. module: sale
+#: view:sale.order:0
+msgid "UoS"
+msgstr ""
+
+#. module: sale
#: help:sale.order,partner_shipping_id:0
msgid "Shipping address for current sales order."
msgstr ""
@@ -60,22 +72,12 @@ msgid "Cancel Order"
msgstr "Otkaži naruđbu"
#. module: sale
-#: view:sale.config.picking_policy:0
-msgid "Configure Sales Order Logistics"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:603
+#: code:addons/sale/sale.py:638
#, python-format
msgid "The quotation '%s' has been converted to a sales order."
msgstr ""
#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Payment Before Delivery"
-msgstr "Plaćanje prije isporuke"
-
-#. module: sale
#: code:addons/sale/wizard/sale_make_invoice.py:42
#, python-format
msgid "Warning !"
@@ -92,12 +94,6 @@ msgid "Drives procurement orders for every sales order line."
msgstr ""
#. module: sale
-#: selection:sale.config.picking_policy,picking_policy:0
-msgid "All at Once"
-msgstr "Sve odjednom"
-
-#. module: sale
-#: field:sale.order,project_id:0
#: view:sale.report:0
#: field:sale.report,analytic_account_id:0
#: field:sale.shop,project_id:0
@@ -113,6 +109,15 @@ msgid ""
msgstr ""
#. module: sale
+#: code:addons/sale/sale.py:295
+#, python-format
+msgid ""
+"In order to delete a confirmed sale order, you must cancel it before ! To "
+"cancel a sale order, you must first cancel related picking or delivery "
+"orders."
+msgstr ""
+
+#. module: sale
#: model:process.node,name:sale.process_node_saleprocurement0
msgid "Procurement Order"
msgstr ""
@@ -124,6 +129,11 @@ msgid "Partner"
msgstr ""
#. module: sale
+#: selection:sale.order,order_policy:0
+msgid "Invoice based on deliveries"
+msgstr ""
+
+#. module: sale
#: view:sale.order:0
msgid "Order Line"
msgstr "Stavka Naloga"
@@ -156,8 +166,13 @@ msgid "Default Payment Term"
msgstr "Standardni uslovi plaćanja"
#. module: sale
-#: model:ir.actions.act_window,name:sale.action_config_picking_policy
-msgid "Configure Picking Policy for Sales Order"
+#: field:sale.config.picking_policy,deli_orders:0
+msgid "Based on Delivery Orders"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.picking_policy,time_unit:0
+msgid "Main Working Time Unit"
msgstr ""
#. module: sale
@@ -174,9 +189,10 @@ msgid "Disc.(%)"
msgstr "Popust (%)"
#. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_forceassignation0
-msgid "Force Assignation"
-msgstr "Prinudni prenos"
+#: view:sale.report:0
+#: field:sale.report,price_total:0
+msgid "Total Price"
+msgstr ""
#. module: sale
#: help:sale.make.invoice,grouped:0
@@ -184,6 +200,11 @@ msgid "Check the box to group the invoices for the same customers"
msgstr ""
#. module: sale
+#: view:sale.order:0
+msgid "My Sale Orders"
+msgstr ""
+
+#. module: sale
#: selection:sale.order,invoice_quantity:0
msgid "Ordered Quantities"
msgstr "Naručena količina"
@@ -222,13 +243,24 @@ msgid ""
msgstr ""
#. module: sale
+#: field:sale.config.picking_policy,task_work:0
+msgid "Based on Tasks' Work"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
+msgid "Quotations and Sales"
+msgstr ""
+
+#. module: sale
#: model:ir.model,name:sale.model_sale_make_invoice
msgid "Sales Make Invoice"
msgstr ""
#. module: sale
-#: view:sale.order:0
-msgid "Recreate Packing"
+#: code:addons/sale/sale.py:330
+#, python-format
+msgid "Pricelist Warning!"
msgstr ""
#. module: sale
@@ -237,10 +269,10 @@ msgid "Discount (%)"
msgstr "Popust (%)"
#. module: sale
-#: help:res.company,security_lead:0
-msgid ""
-"This is the days added to what you promise to customers for security purpose"
-msgstr ""
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_quotation_for_sale
+msgid "My Quotations"
+msgstr "Moje Ponude"
#. module: sale
#: view:board.board:0
@@ -265,7 +297,22 @@ msgid "Shop Name"
msgstr "Naziv prodajnog mjesta"
#. module: sale
-#: code:addons/sale/sale.py:1014
+#: help:sale.order,order_policy:0
+msgid ""
+"The Invoice Policy is used to synchronise invoice and delivery operations.\n"
+" - The 'Pay before delivery' choice will first generate the invoice and "
+"then generate the picking order after the payment of this invoice.\n"
+" - The 'Deliver & Invoice on demand' will create the picking order directly "
+"and wait for the user to manually click on the 'Invoice' button to generate "
+"the draft invoice based on the sale order or the sale order lines.\n"
+" - The 'Invoice on order after delivery' choice will generate the draft "
+"invoice based on sales order after all picking lists have been finished.\n"
+" - The 'Invoice based on deliveries' choice is used to create an invoice "
+"during the picking process."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:1158
#, python-format
msgid "No Customer Defined !"
msgstr ""
@@ -276,9 +323,12 @@ msgid "Sales in Exception"
msgstr "Iznimka u prodaji"
#. module: sale
-#: view:sale.order:0
-msgid "Set to Draft"
-msgstr "Postaviti kao draft"
+#: code:addons/sale/sale.py:1145
+#: code:addons/sale/sale.py:1264
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:70
+#, python-format
+msgid "Configuration Error !"
+msgstr ""
#. module: sale
#: view:sale.order:0
@@ -286,22 +336,7 @@ msgid "Conditions"
msgstr ""
#. module: sale
-#: help:sale.order,order_policy:0
-msgid ""
-"The Shipping Policy is used to synchronise invoice and delivery operations.\n"
-" - The 'Pay Before delivery' choice will first generate the invoice and "
-"then generate the picking order after the payment of this invoice.\n"
-" - The 'Shipping & Manual Invoice' will create the picking order directly "
-"and wait for the user to manually click on the 'Invoice' button to generate "
-"the draft invoice.\n"
-" - The 'Invoice On Order After Delivery' choice will generate the draft "
-"invoice based on sales order after all picking lists have been finished.\n"
-" - The 'Invoice From The Picking' choice is used to create an invoice "
-"during the picking process."
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:939
+#: code:addons/sale/sale.py:1034
#, python-format
msgid ""
"There is no income category account defined in default Properties for "
@@ -309,8 +344,8 @@ msgid ""
msgstr ""
#. module: sale
-#: view:sale.installer:0
-msgid "Configure"
+#: selection:sale.report,month:0
+msgid "August"
msgstr ""
#. module: sale
@@ -319,7 +354,7 @@ msgid "You try to assign a lot which is not from the same product"
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:620
+#: code:addons/sale/sale.py:655
#, python-format
msgid "invalid mode for test_state"
msgstr ""
@@ -330,7 +365,7 @@ msgid "June"
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:584
+#: code:addons/sale/sale.py:617
#, python-format
msgid "Could not cancel this sales order !"
msgstr ""
@@ -351,8 +386,12 @@ msgid "October"
msgstr ""
#. module: sale
+#: sql_constraint:stock.picking:0
+msgid "Reference must be unique per Company!"
+msgstr ""
+
+#. module: sale
#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_quotation_for_sale
#: view:sale.order:0
#: view:sale.report:0
msgid "Quotations"
@@ -364,11 +403,6 @@ msgid "Pricelist for current sales order."
msgstr ""
#. module: sale
-#: selection:sale.config.picking_policy,step:0
-msgid "Delivery Order Only"
-msgstr "Samo isporuka"
-
-#. module: sale
#: report:sale.order:0
msgid "TVA :"
msgstr ""
@@ -393,6 +427,7 @@ msgstr "Fiskalna pozicija"
#. module: sale
#: view:sale.order:0
#: view:sale.order.line:0
+#: field:sale.report,product_uom:0
msgid "UoM"
msgstr "JM"
@@ -415,13 +450,19 @@ msgid ""
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:971
+#: code:addons/sale/sale.py:1061
+#, python-format
+msgid "You cannot cancel a sale order line that has already been invoiced!"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:1066
#, python-format
msgid "You must first cancel stock moves attached to this sales order line."
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:1042
+#: code:addons/sale/sale.py:1134
#, python-format
msgid "(n/a)"
msgstr ""
@@ -455,13 +496,35 @@ msgid "Notes"
msgstr "Bilješke"
#. module: sale
+#: sql_constraint:res.company:0
+msgid "The company name must be unique !"
+msgstr ""
+
+#. module: sale
#: help:sale.order,partner_invoice_id:0
msgid "Invoice address for current sales order."
msgstr ""
#. module: sale
-#: view:sale.installer:0
-msgid "Enhance your core Sales Application with additional functionalities."
+#: view:sale.report:0
+msgid "Month-1"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered month of the sales order"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:504
+#, python-format
+msgid ""
+"You cannot group sales having different currencies for the same partner."
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,picking_policy:0
+msgid "Deliver each product when available"
msgstr ""
#. module: sale
@@ -481,18 +544,40 @@ msgid "Confirmation Date"
msgstr ""
#. module: sale
+#: field:sale.order,incoterm:0
+msgid "Incoterm"
+msgstr "Incoterm"
+
+#. module: sale
#: field:sale.order.line,address_allotment_id:0
msgid "Allotment Partner"
msgstr ""
#. module: sale
-#: sql_constraint:sale.order:0
-msgid "Order Reference must be unique !"
+#: selection:sale.report,month:0
+msgid "March"
msgstr ""
#. module: sale
-#: selection:sale.report,month:0
-msgid "March"
+#: constraint:stock.move:0
+msgid "You can not move products from or to a location of the type view."
+msgstr ""
+
+#. module: sale
+#: field:sale.config.picking_policy,sale_orders:0
+msgid "Based on Sales Orders"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,state:0
+msgid ""
+"Givwizard = self.browse(cr, uid, ids)[0]es the state of the quotation or "
+"sales order. \n"
+"The exception state is automatically set when a cancel operation occurs in "
+"the invoice validation (Invoice Exception) or in the picking list process "
+"(Shipping Exception). \n"
+"The 'Waiting Schedule' state is set when the invoice is confirmed but "
+"waiting for the scheduler to run on the order date."
msgstr ""
#. module: sale
@@ -511,6 +596,11 @@ msgid "Invoice address :"
msgstr "Adresa fakture (kupca):"
#. module: sale
+#: field:sale.order.line,sequence:0
+msgid "Line Sequence"
+msgstr ""
+
+#. module: sale
#: model:process.transition,note:sale.process_transition_saleorderprocurement0
msgid ""
"For every sales order line, a procurement order is created to supply the "
@@ -557,11 +647,6 @@ msgid "Sales Order Line"
msgstr ""
#. module: sale
-#: view:sale.config.picking_policy:0
-msgid "Setup your sales workflow and default values."
-msgstr ""
-
-#. module: sale
#: field:sale.shop,warehouse_id:0
msgid "Warehouse"
msgstr "Skladište"
@@ -598,6 +683,11 @@ msgid "Creation Date"
msgstr ""
#. module: sale
+#: model:ir.ui.menu,name:sale.menu_sales_configuration_misc
+msgid "Miscellaneous"
+msgstr ""
+
+#. module: sale
#: model:ir.actions.act_window,name:sale.action_order_line_tree3
msgid "Uninvoiced and Delivered Lines"
msgstr "Stavke koje su isporučene a nisu fakturisane."
@@ -613,14 +703,19 @@ msgid "My Sales"
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:290
-#: code:addons/sale/sale.py:966
-#: code:addons/sale/sale.py:1165
+#: code:addons/sale/sale.py:295
+#: code:addons/sale/sale.py:1061
+#: code:addons/sale/sale.py:1290
#, python-format
msgid "Invalid action !"
msgstr ""
#. module: sale
+#: view:sale.order:0
+msgid "Extra Info"
+msgstr "Dodatni podaci"
+
+#. module: sale
#: field:sale.order,pricelist_id:0
#: field:sale.report,pricelist_id:0
#: field:sale.shop,pricelist_id:0
@@ -634,13 +729,21 @@ msgid "# of Qty"
msgstr ""
#. module: sale
+#: code:addons/sale/sale.py:1314
+#, python-format
+msgid "Hour"
+msgstr ""
+
+#. module: sale
#: view:sale.order:0
msgid "Order Date"
msgstr ""
#. module: sale
#: view:sale.order.line:0
+#: view:sale.report:0
#: field:sale.report,shipped:0
+#: field:sale.report,shipped_qty_1:0
msgid "Shipped"
msgstr ""
@@ -650,8 +753,8 @@ msgid "All Quotations"
msgstr "Sve Ponude"
#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Invoice On Order After Delivery"
+#: view:sale.config.picking_policy:0
+msgid "Options"
msgstr ""
#. module: sale
@@ -660,6 +763,20 @@ msgid "September"
msgstr ""
#. module: sale
+#: code:addons/sale/sale.py:632
+#, python-format
+msgid "You cannot confirm a sale order which has no line."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:1246
+#, python-format
+msgid ""
+"You have to select a pricelist or a customer in the sales form !\n"
+"Please set one before choosing a product."
+msgstr ""
+
+#. module: sale
#: view:sale.report:0
#: field:sale.report,categ_id:0
msgid "Category of Product"
@@ -676,11 +793,6 @@ msgid "Stock Moves"
msgstr "Kretanje zaliha"
#. module: sale
-#: view:sale.report:0
-msgid " Year "
-msgstr ""
-
-#. module: sale
#: field:sale.order,state:0
#: field:sale.report,state:0
msgid "Order State"
@@ -698,7 +810,7 @@ msgid "Sales By Month"
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:970
+#: code:addons/sale/sale.py:1065
#, python-format
msgid "Could not cancel sales order line!"
msgstr ""
@@ -731,42 +843,19 @@ msgid ""
msgstr ""
#. module: sale
-#: view:sale.report:0
-msgid "Extended Filters..."
+#: field:sale.order,date_order:0
+msgid "Date"
msgstr ""
#. module: sale
-#: model:ir.module.module,description:sale.module_meta_information
-msgid ""
-"\n"
-" The base module to manage quotations and sales orders.\n"
-"\n"
-" * Workflow with validation steps:\n"
-" - Quotation -> Sales order -> Invoice\n"
-" * Invoicing methods:\n"
-" - Invoice on order (before or after shipping)\n"
-" - Invoice on delivery\n"
-" - Invoice on timesheets\n"
-" - Advance invoice\n"
-" * Partners preferences (shipping, invoicing, incoterm, ...)\n"
-" * Products stocks and prices\n"
-" * Delivery methods:\n"
-" - all at once, multi-parcel\n"
-" - delivery costs\n"
-" * Dashboard for salesman that includes:\n"
-" * Your open quotations\n"
-" * Top 10 sales of the month\n"
-" * Cases statistics\n"
-" * Graph of sales by product\n"
-" * Graph of cases of the month\n"
-" "
+#: view:sale.report:0
+msgid "Extended Filters..."
msgstr ""
#. module: sale
-#: model:ir.model,name:sale.model_sale_shop
-#: view:sale.shop:0
-msgid "Sales Shop"
-msgstr ""
+#: selection:sale.order.line,state:0
+msgid "Exception"
+msgstr "Izuzetak"
#. module: sale
#: model:ir.model,name:sale.model_res_company
@@ -774,8 +863,9 @@ msgid "Companies"
msgstr ""
#. module: sale
-#: selection:sale.report,month:0
-msgid "November"
+#: code:addons/sale/sale.py:1259
+#, python-format
+msgid "No valid pricelist line found ! :"
msgstr ""
#. module: sale
@@ -784,8 +874,8 @@ msgid "History"
msgstr "Historija"
#. module: sale
-#: field:sale.config.picking_policy,picking_policy:0
-msgid "Picking Default Policy"
+#: selection:sale.order,order_policy:0
+msgid "Invoice on order after delivery"
msgstr ""
#. module: sale
@@ -808,13 +898,12 @@ msgid ""
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:966
-#, python-format
-msgid "You cannot cancel a sales order line that has already been invoiced !"
+#: help:res.company,security_lead:0
+msgid ""
+"This is the days added to what you promise to customers for security purpose"
msgstr ""
#. module: sale
-#: view:sale.order:0
#: view:sale.order.line:0
msgid "Qty"
msgstr "Količina"
@@ -825,6 +914,11 @@ msgid "References"
msgstr ""
#. module: sale
+#: view:sale.order.line:0
+msgid "My Sales Order Lines"
+msgstr ""
+
+#. module: sale
#: model:process.transition.action,name:sale.process_transition_action_cancel0
#: model:process.transition.action,name:sale.process_transition_action_cancel1
#: model:process.transition.action,name:sale.process_transition_action_cancel2
@@ -836,16 +930,11 @@ msgid "Cancel"
msgstr "Otkaži"
#. module: sale
-#: field:sale.installer,sale_order_dates:0
-msgid "Sales Order Dates"
+#: sql_constraint:sale.order:0
+msgid "Order Reference must be unique per Company!"
msgstr ""
#. module: sale
-#: selection:sale.order.line,state:0
-msgid "Exception"
-msgstr "Izuzetak"
-
-#. module: sale
#: model:process.transition,name:sale.process_transition_invoice0
#: model:process.transition,name:sale.process_transition_invoiceafterdelivery0
#: model:process.transition.action,name:sale.process_transition_action_createinvoice0
@@ -855,19 +944,19 @@ msgid "Create Invoice"
msgstr "Kreriaj Fakturu"
#. module: sale
-#: field:sale.installer,sale_margin:0
-msgid "Margins in Sales Orders"
+#: view:sale.order:0
+msgid "Total Tax Excluded"
msgstr ""
#. module: sale
-#: view:sale.order:0
-msgid "Total Tax Excluded"
+#: view:sale.order.line:0
+msgid "Order reference"
msgstr ""
#. module: sale
-#: view:sale.order:0
-msgid "Compute"
-msgstr "Izračunaj"
+#: view:sale.open.invoice:0
+msgid "You invoice has been successfully created!"
+msgstr ""
#. module: sale
#: view:sale.report:0
@@ -886,23 +975,20 @@ msgid "Open Invoice"
msgstr ""
#. module: sale
-#: report:sale.order:0
-#: view:sale.order.line:0
-msgid "Price"
-msgstr "Cijena"
+#: model:ir.actions.server,name:sale.ir_actions_server_edi_sale
+msgid "Auto-email confirmed sale orders"
+msgstr ""
#. module: sale
-#: model:ir.actions.act_window,name:sale.action_sale_installer
-#: view:sale.config.picking_policy:0
-#: view:sale.installer:0
-msgid "Sales Application Configuration"
+#: code:addons/sale/sale.py:413
+#, python-format
+msgid "There is no sales journal defined for this company: \"%s\" (id:%d)"
msgstr ""
#. module: sale
-#: view:sale.report:0
-#: field:sale.report,price_total:0
-msgid "Total Price"
-msgstr ""
+#: model:process.transition.action,name:sale.process_transition_action_forceassignation0
+msgid "Force Assignation"
+msgstr "Prinudni prenos"
#. module: sale
#: selection:sale.order.line,type:0
@@ -915,6 +1001,11 @@ msgid "Based on the shipped or on the ordered quantities."
msgstr ""
#. module: sale
+#: selection:sale.order,picking_policy:0
+msgid "Deliver all products at once"
+msgstr ""
+
+#. module: sale
#: field:sale.order,picking_ids:0
msgid "Related Picking"
msgstr ""
@@ -946,8 +1037,14 @@ msgid "Create Delivery Order"
msgstr ""
#. module: sale
-#: field:sale.installer,delivery:0
-msgid "Delivery Costs"
+#: code:addons/sale/sale.py:1290
+#, python-format
+msgid "Cannot delete a sales order line which is in state '%s'!"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Qty(UoS)"
msgstr ""
#. module: sale
@@ -962,13 +1059,13 @@ msgstr ""
#. module: sale
#: view:sale.report:0
-msgid "Sales by Product Category"
+msgid "Ordered date of the sales order"
msgstr ""
#. module: sale
-#: selection:sale.order,picking_policy:0
-msgid "Partial Delivery"
-msgstr "Djelomična isporuka"
+#: view:sale.report:0
+msgid "Sales by Product Category"
+msgstr ""
#. module: sale
#: model:process.transition,name:sale.process_transition_confirmquotation0
@@ -976,8 +1073,9 @@ msgid "Confirm Quotation"
msgstr "Potvrdi Ponudu"
#. module: sale
-#: help:sale.order,origin:0
-msgid "Reference of the document that generated this sales order request."
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:63
+#, python-format
+msgid "Error"
msgstr ""
#. module: sale
@@ -1010,20 +1108,14 @@ msgid "Procurement Method"
msgstr ""
#. module: sale
-#: view:sale.config.picking_policy:0
-#: view:sale.installer:0
-msgid "title"
-msgstr ""
-
-#. module: sale
#: model:process.node,name:sale.process_node_packinglist0
msgid "Pick List"
msgstr ""
#. module: sale
#: view:sale.order:0
-msgid "Order date"
-msgstr ""
+msgid "Set to Draft"
+msgstr "Postaviti kao draft"
#. module: sale
#: model:process.node,note:sale.process_node_packinglist0
@@ -1031,6 +1123,85 @@ msgid "Document of the move to the output or to the customer."
msgstr ""
#. module: sale
+#: model:email.template,body_text:sale.email_template_edi_sale
+msgid ""
+"\n"
+"Hello${object.partner_order_id.name and ' ' or "
+"''}${object.partner_order_id.name or ''},\n"
+"\n"
+"Here is your order confirmation for ${object.partner_id.name}:\n"
+" | Order number: *${object.name}*\n"
+" | Order total: *${object.amount_total} "
+"${object.pricelist_id.currency_id.name}*\n"
+" | Order date: ${object.date_order}\n"
+" % if object.origin:\n"
+" | Order reference: ${object.origin}\n"
+" % endif\n"
+" % if object.client_order_ref:\n"
+" | Your reference: ${object.client_order_ref}<br />\n"
+" % endif\n"
+" | Your contact: ${object.user_id.name} ${object.user_id.user_email "
+"and '<%s>'%(object.user_id.user_email) or ''}\n"
+"\n"
+"You can view the order confirmation, download it and even pay online using "
+"the following link:\n"
+" ${ctx.get('edi_web_url_view') or 'n/a'}\n"
+"\n"
+"% if object.order_policy in ('prepaid','manual') and "
+"object.company_id.paypal_account:\n"
+"<% \n"
+"comp_name = quote(object.company_id.name)\n"
+"order_name = quote(object.name)\n"
+"paypal_account = quote(object.company_id.paypal_account)\n"
+"order_amount = quote(str(object.amount_total))\n"
+"cur_name = quote(object.pricelist_id.currency_id.name)\n"
+"paypal_url = \"https://www.paypal.com/cgi-"
+"bin/webscr?cmd=_xclick&business=%s&item_name=%s%%20Order%%20%s&invoice=%s&amo"
+"unt=%s\" \\\n"
+" "
+"\"&currency_code=%s&button_subtype=services&no_note=1&bn=OpenERP_Order_PayNow"
+"_%s\" % \\\n"
+" "
+"(paypal_account,comp_name,order_name,order_name,order_amount,cur_name,cur_nam"
+"e)\n"
+"%>\n"
+"It is also possible to directly pay with Paypal:\n"
+" ${paypal_url}\n"
+"% endif\n"
+"\n"
+"If you have any question, do not hesitate to contact us.\n"
+"\n"
+"\n"
+"Thank you for choosing ${object.company_id.name}!\n"
+"\n"
+"\n"
+"--\n"
+"${object.user_id.name} ${object.user_id.user_email and "
+"'<%s>'%(object.user_id.user_email) or ''}\n"
+"${object.company_id.name}\n"
+"% if object.company_id.street:\n"
+"${object.company_id.street or ''}\n"
+"% endif\n"
+"% if object.company_id.street2:\n"
+"${object.company_id.street2}\n"
+"% endif\n"
+"% if object.company_id.city or object.company_id.zip:\n"
+"${object.company_id.zip or ''} ${object.company_id.city or ''}\n"
+"% endif\n"
+"% if object.company_id.country_id:\n"
+"${object.company_id.state_id and ('%s, ' % object.company_id.state_id.name) "
+"or ''} ${object.company_id.country_id.name or ''}\n"
+"% endif\n"
+"% if object.company_id.phone:\n"
+"Phone: ${object.company_id.phone}\n"
+"% endif\n"
+"% if object.company_id.website:\n"
+"${object.company_id.website or ''}\n"
+"% endif\n"
+" "
+msgstr ""
+
+#. module: sale
#: model:process.transition.action,name:sale.process_transition_action_validate0
msgid "Validate"
msgstr "Potvrdi"
@@ -1053,9 +1224,9 @@ msgid "Taxes"
msgstr "Porezi"
#. module: sale
-#: field:sale.order,order_policy:0
-msgid "Shipping Policy"
-msgstr "Način otpreme"
+#: view:sale.order:0
+msgid "Sales Order ready to be invoiced"
+msgstr ""
#. module: sale
#: help:sale.order,create_date:0
@@ -1074,9 +1245,9 @@ msgid "Create Invoices"
msgstr ""
#. module: sale
-#: view:sale.order:0
-msgid "Extra Info"
-msgstr "Dodatni podaci"
+#: view:sale.report:0
+msgid "Sales order created in current month"
+msgstr ""
#. module: sale
#: report:sale.order:0
@@ -1084,11 +1255,24 @@ msgid "Fax :"
msgstr "Fax:"
#. module: sale
+#: help:sale.order.line,type:0
+msgid ""
+"If 'on order', it triggers a procurement when the sale order is confirmed to "
+"create a task, purchase order or manufacturing order linked to this sale "
+"order line."
+msgstr ""
+
+#. module: sale
#: field:sale.advance.payment.inv,amount:0
msgid "Advance Amount"
msgstr ""
#. module: sale
+#: field:sale.config.picking_policy,charge_delivery:0
+msgid "Do you charge the delivery?"
+msgstr ""
+
+#. module: sale
#: selection:sale.order,invoice_quantity:0
msgid "Shipped Quantities"
msgstr "Isporučena količina"
@@ -1099,25 +1283,45 @@ msgid "Invoice Based on Sales Orders"
msgstr "Faktura kreirana na osnovu Prodajnog naloga"
#. module: sale
+#: code:addons/sale/sale.py:331
+#, python-format
+msgid ""
+"If you change the pricelist of this order (and eventually the currency), "
+"prices of existing order lines will not be updated."
+msgstr ""
+
+#. module: sale
#: model:ir.model,name:sale.model_stock_picking
msgid "Picking List"
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:387
-#: code:addons/sale/sale.py:920
-#: code:addons/sale/sale.py:938
+#: code:addons/sale/sale.py:412
+#: code:addons/sale/sale.py:503
+#: code:addons/sale/sale.py:632
+#: code:addons/sale/sale.py:1015
+#: code:addons/sale/sale.py:1033
#, python-format
msgid "Error !"
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:570
+#: code:addons/sale/sale.py:603
#, python-format
msgid "Could not cancel sales order !"
msgstr ""
#. module: sale
+#: view:sale.order:0
+msgid "Qty(UoM)"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered Year of the sales order"
+msgstr ""
+
+#. module: sale
#: selection:sale.report,month:0
msgid "July"
msgstr ""
@@ -1134,35 +1338,25 @@ msgid "Shipping Exception"
msgstr "Izuzeci otpreme"
#. module: sale
-#: field:sale.make.invoice,grouped:0
-msgid "Group the invoices"
-msgstr "Grupiraj Fakture"
-
-#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Shipping & Manual Invoice"
-msgstr "Isporuka i Fakture"
-
-#. module: sale
-#: code:addons/sale/sale.py:1051
+#: code:addons/sale/sale.py:1143
#, python-format
-msgid "Picking Information !"
+msgid "Picking Information ! : "
msgstr ""
#. module: sale
-#: view:sale.report:0
-#: field:sale.report,month:0
-msgid "Month"
-msgstr ""
+#: field:sale.make.invoice,grouped:0
+msgid "Group the invoices"
+msgstr "Grupiraj Fakture"
#. module: sale
-#: model:ir.module.module,shortdesc:sale.module_meta_information
-msgid "Sales Management"
-msgstr "Upravljanje Prodajom"
+#: field:sale.order,order_policy:0
+msgid "Invoice Policy"
+msgstr ""
#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Invoice From The Picking"
+#: model:ir.actions.act_window,name:sale.action_config_picking_policy
+#: view:sale.config.picking_policy:0
+msgid "Setup your Invoicing Method"
msgstr ""
#. module: sale
@@ -1172,27 +1366,30 @@ msgstr ""
#. module: sale
#: view:sale.report:0
-#: field:sale.report,uom_name:0
msgid "Reference UoM"
msgstr ""
#. module: sale
+#: view:sale.config.picking_policy:0
+msgid ""
+"This tool will help you to install the right module and configure the system "
+"according to the method you use to invoice your customers."
+msgstr ""
+
+#. module: sale
#: model:ir.model,name:sale.model_sale_order_line_make_invoice
msgid "Sale OrderLine Make_invoice"
msgstr ""
#. module: sale
-#: help:sale.config.picking_policy,step:0
-msgid ""
-"By default, OpenERP is able to manage complex routing and paths of products "
-"in your warehouse and partner locations. This will configure the most common "
-"and simple methods to deliver products to the customer in one or two "
-"operations by the worker."
-msgstr ""
+#: selection:sale.order,state:0
+#: selection:sale.report,state:0
+msgid "Invoice Exception"
+msgstr "Fakture izuzeci"
#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_tree
-msgid "Old Quotations"
+#: model:process.node,note:sale.process_node_saleorder0
+msgid "Drives procurement and invoicing"
msgstr ""
#. module: sale
@@ -1208,6 +1405,22 @@ msgid "Sales Analysis"
msgstr ""
#. module: sale
+#: code:addons/sale/sale.py:1138
+#, python-format
+msgid ""
+"You selected a quantity of %d Units.\n"
+"But it's not compatible with the selected packaging.\n"
+"Here is a proposition of quantities according to the packaging:\n"
+"EAN: %s Quantity: %s Type of ul: %s"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Recreate Packing"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
#: field:sale.order.line,property_ids:0
msgid "Properties"
msgstr "Postavke"
@@ -1234,7 +1447,17 @@ msgid ""
msgstr ""
#. module: sale
-#: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
+#: view:sale.order.line:0
+msgid "Confirmed sale order lines, not yet delivered"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:473
+#, python-format
+msgid "Customer Invoices"
+msgstr ""
+
+#. module: sale
#: model:process.process,name:sale.process_process_salesprocess0
#: view:sale.order:0
#: view:sale.report:0
@@ -1256,18 +1479,13 @@ msgid "Done"
msgstr "Urađeno"
#. module: sale
-#: model:ir.model,name:sale.model_sale_installer
-msgid "sale.installer"
-msgstr ""
-
-#. module: sale
#: model:process.node,name:sale.process_node_invoice0
#: model:process.node,name:sale.process_node_invoiceafterdelivery0
msgid "Invoice"
msgstr "Faktura"
#. module: sale
-#: code:addons/sale/sale.py:1014
+#: code:addons/sale/sale.py:1158
#, python-format
msgid ""
"You have to select a customer in the sales form !\n"
@@ -1275,11 +1493,6 @@ msgid ""
msgstr ""
#. module: sale
-#: selection:sale.config.picking_policy,step:0
-msgid "Picking List & Delivery Order"
-msgstr ""
-
-#. module: sale
#: field:sale.order,origin:0
msgid "Source Document"
msgstr ""
@@ -1305,7 +1518,7 @@ msgid "The amount without tax."
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:571
+#: code:addons/sale/sale.py:604
#, python-format
msgid "You must first cancel all picking attached to this sales order."
msgstr ""
@@ -1316,9 +1529,15 @@ msgid "Sales Advance Payment Invoice"
msgstr ""
#. module: sale
-#: field:sale.order,incoterm:0
-msgid "Incoterm"
-msgstr "Incoterm"
+#: view:sale.report:0
+#: field:sale.report,month:0
+msgid "Month"
+msgstr ""
+
+#. module: sale
+#: model:email.template,subject:sale.email_template_edi_sale
+msgid "${object.company_id.name} Order (Ref ${object.name or 'n/a' })"
+msgstr ""
#. module: sale
#: view:sale.order.line:0
@@ -1329,11 +1548,6 @@ msgid "Product"
msgstr "Proizvod"
#. module: sale
-#: model:ir.ui.menu,name:sale.menu_invoiced
-msgid "Invoicing"
-msgstr ""
-
-#. module: sale
#: model:process.transition.action,name:sale.process_transition_action_cancelassignation0
msgid "Cancel Assignation"
msgstr "Otkazi prijenos"
@@ -1344,14 +1558,10 @@ msgid "sale.config.picking_policy"
msgstr "sale.config.picking_policy"
#. module: sale
-#: help:sale.order,state:0
-msgid ""
-"Gives the state of the quotation or sales order. \n"
-"The exception state is automatically set when a cancel operation occurs in "
-"the invoice validation (Invoice Exception) or in the picking list process "
-"(Shipping Exception). \n"
-"The 'Waiting Schedule' state is set when the invoice is confirmed but "
-"waiting for the scheduler to run on the date 'Ordered Date'."
+#: view:account.invoice.report:0
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_turnover_by_month
+msgid "Monthly Turnover"
msgstr ""
#. module: sale
@@ -1370,7 +1580,6 @@ msgid "Product UoS"
msgstr "Proizvod JM"
#. module: sale
-#: selection:sale.order,state:0
#: selection:sale.report,state:0
msgid "Manual In Progress"
msgstr "U toku"
@@ -1391,7 +1600,8 @@ msgid "Order"
msgstr "Nalog"
#. module: sale
-#: code:addons/sale/sale.py:921
+#: code:addons/sale/sale.py:1016
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:71
#, python-format
msgid "There is no income account defined for this product: \"%s\" (id:%d)"
msgstr ""
@@ -1411,7 +1621,7 @@ msgid ""
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:1116
+#: code:addons/sale/sale.py:1238
#, python-format
msgid ""
"You plan to sell %.2f %s but you only have %.2f %s available !\n"
@@ -1440,10 +1650,10 @@ msgid "Total"
msgstr "Ukupno"
#. module: sale
-#: code:addons/sale/sale.py:388
-#, python-format
-msgid "There is no sales journal defined for this company: \"%s\" (id:%d)"
-msgstr ""
+#: report:sale.order:0
+#: view:sale.order.line:0
+msgid "Price"
+msgstr "Cijena"
#. module: sale
#: model:process.transition,note:sale.process_transition_deliver0
@@ -1454,9 +1664,14 @@ msgid ""
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:1165
-#, python-format
-msgid "Cannot delete a sales order line which is %s !"
+#: selection:sale.order,order_policy:0
+msgid "Pay before delivery"
+msgstr ""
+
+#. module: sale
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.open_board_sales
+msgid "Sales Dashboard"
msgstr ""
#. module: sale
@@ -1468,6 +1683,7 @@ msgstr ""
#. module: sale
#: view:sale.order:0
+#: selection:sale.order,state:0
#: view:sale.order.line:0
msgid "To Invoice"
msgstr ""
@@ -1478,6 +1694,11 @@ msgid "Date on which sales order is confirmed."
msgstr ""
#. module: sale
+#: field:sale.order,project_id:0
+msgid "Contract/Analytic Account"
+msgstr ""
+
+#. module: sale
#: field:sale.order,company_id:0
#: field:sale.order.line,company_id:0
#: view:sale.report:0
@@ -1497,22 +1718,17 @@ msgid "The amount to be invoiced in advance."
msgstr ""
#. module: sale
-#: selection:sale.order,state:0
-#: selection:sale.report,state:0
-msgid "Invoice Exception"
-msgstr "Fakture izuzeci"
-
-#. module: sale
-#: help:sale.order,picking_ids:0
+#: code:addons/sale/sale.py:1256
+#, python-format
msgid ""
-"This is a list of picking that has been generated for this sales order."
+"Couldn't find a pricelist line matching this product and quantity.\n"
+"You have to change either the product, the quantity or the pricelist."
msgstr ""
#. module: sale
-#: help:sale.installer,sale_margin:0
+#: help:sale.order,picking_ids:0
msgid ""
-"Gives the margin of profitability by calculating the difference between Unit "
-"Price and Cost Price."
+"This is a list of picking that has been generated for this sales order."
msgstr ""
#. module: sale
@@ -1534,6 +1750,11 @@ msgid "Cancelled"
msgstr "Poništeno"
#. module: sale
+#: view:sale.order.line:0
+msgid "Sales Order Lines related to a Sales Order of mine"
+msgstr ""
+
+#. module: sale
#: model:ir.actions.act_window,name:sale.action_shop_form
#: model:ir.ui.menu,name:sale.menu_action_shop_form
#: field:sale.order,shop_id:0
@@ -1543,17 +1764,12 @@ msgid "Shop"
msgstr "Prodavnica"
#. module: sale
-#: view:sale.report:0
-msgid " Month "
-msgstr ""
-
-#. module: sale
#: field:sale.report,date_confirm:0
msgid "Date Confirm"
msgstr ""
#. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:111
+#: code:addons/sale/wizard/sale_line_invoice.py:113
#, python-format
msgid "Warning"
msgstr ""
@@ -1565,17 +1781,6 @@ msgid "Sales by Month"
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:1045
-#, python-format
-msgid ""
-"You selected a quantity of %d Units.\n"
-"But it's not compatible with the selected packaging.\n"
-"Here is a proposition of quantities according to the packaging:\n"
-"\n"
-"EAN: %s Quantity: %s Type of ul: %s"
-msgstr ""
-
-#. module: sale
#: model:ir.model,name:sale.model_sale_order
#: model:process.node,name:sale.process_node_order0
#: model:process.node,name:sale.process_node_saleorder0
@@ -1591,6 +1796,11 @@ msgid "Quantity (UoS)"
msgstr "Količina (JM)"
#. module: sale
+#: view:sale.order.line:0
+msgid "Sale Order Lines that are in 'done' state"
+msgstr ""
+
+#. module: sale
#: model:process.transition,note:sale.process_transition_packing0
msgid ""
"The Pick List form is created as soon as the sales order is confirmed, in "
@@ -1605,6 +1815,11 @@ msgid "Confirmed"
msgstr "Potvrđeno"
#. module: sale
+#: field:sale.config.picking_policy,order_policy:0
+msgid "Main Method Based On"
+msgstr ""
+
+#. module: sale
#: model:process.transition.action,name:sale.process_transition_action_confirm0
msgid "Confirm"
msgstr "Potvrdi"
@@ -1627,6 +1842,7 @@ msgid "Invoice Lines"
msgstr "Stavka Fakture"
#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_product_tree
#: view:sale.order:0
#: view:sale.order.line:0
msgid "Sales Order Lines"
@@ -1643,30 +1859,18 @@ msgid "Configuration"
msgstr "Konfiguracija"
#. module: sale
-#: selection:sale.order,picking_policy:0
-msgid "Complete Delivery"
-msgstr "Potpuna isporuka"
-
-#. module: sale
-#: view:sale.report:0
-msgid " Month-1 "
-msgstr ""
-
-#. module: sale
-#: help:sale.config.picking_policy,picking_policy:0
-msgid ""
-"The Shipping Policy is used to configure per order if you want to deliver as "
-"soon as possible when one product is available or you wait that all products "
-"are available.."
+#: code:addons/sale/edi/sale_order.py:146
+#, python-format
+msgid "EDI Pricelist (%s)"
msgstr ""
#. module: sale
-#: selection:sale.report,month:0
-msgid "August"
+#: view:sale.report:0
+msgid "Sales order created in current year"
msgstr ""
#. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:111
+#: code:addons/sale/wizard/sale_line_invoice.py:113
#, python-format
msgid ""
"Invoice cannot be created for this Sales Order Line due to one of the "
@@ -1676,6 +1880,11 @@ msgid ""
msgstr ""
#. module: sale
+#: view:sale.order.line:0
+msgid "Sale order lines done"
+msgstr ""
+
+#. module: sale
#: field:sale.order.line,th_weight:0
msgid "Weight"
msgstr "Težina"
@@ -1694,7 +1903,6 @@ msgstr ""
#. module: sale
#: field:sale.config.picking_policy,config_logo:0
-#: field:sale.installer,config_logo:0
msgid "Image"
msgstr ""
@@ -1724,8 +1932,8 @@ msgid "Salesman"
msgstr "Prodavač"
#. module: sale
-#: model:process.node,note:sale.process_node_saleorder0
-msgid "Drives procurement and invoicing"
+#: model:ir.actions.act_window,name:sale.action_order_tree
+msgid "Old Quotations"
msgstr ""
#. module: sale
@@ -1734,7 +1942,7 @@ msgid "Untaxed Amount"
msgstr "Neoporezovan iznos"
#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:163
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:170
#: model:ir.actions.act_window,name:sale.action_view_sale_advance_payment_inv
#: view:sale.advance.payment.inv:0
#: view:sale.order:0
@@ -1743,7 +1951,7 @@ msgid "Advance Invoice"
msgstr "Predračun"
#. module: sale
-#: code:addons/sale/sale.py:591
+#: code:addons/sale/sale.py:624
#, python-format
msgid "The sales order '%s' has been cancelled."
msgstr ""
@@ -1778,19 +1986,19 @@ msgid "Packings"
msgstr ""
#. module: sale
-#: field:sale.config.picking_policy,progress:0
-#: field:sale.installer,progress:0
-msgid "Configuration Progress"
+#: view:sale.order.line:0
+msgid "Sale Order Lines ready to be invoiced"
msgstr ""
#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_product_tree
-msgid "Product sales"
-msgstr "Prodaja proizvoda"
+#: view:sale.report:0
+msgid "Sales order created in last month"
+msgstr ""
#. module: sale
-#: field:sale.order,date_order:0
-msgid "Ordered Date"
+#: model:ir.actions.act_window,name:sale.action_email_templates
+#: model:ir.ui.menu,name:sale.menu_email_templates
+msgid "Email Templates"
msgstr ""
#. module: sale
@@ -1801,13 +2009,14 @@ msgid "Sales Orders"
msgstr "Prodajni nalozi"
#. module: sale
-#: selection:sale.config.picking_policy,picking_policy:0
-msgid "Direct Delivery"
-msgstr "Direktna isporuka"
+#: model:ir.model,name:sale.model_sale_shop
+#: view:sale.shop:0
+msgid "Sales Shop"
+msgstr ""
#. module: sale
-#: field:sale.installer,sale_journal:0
-msgid "Invoicing journals"
+#: selection:sale.report,month:0
+msgid "November"
msgstr ""
#. module: sale
@@ -1816,18 +2025,12 @@ msgid "Advance Product"
msgstr "Proizvod"
#. module: sale
-#: view:sale.report:0
-#: field:sale.report,shipped_qty_1:0
-msgid "Shipped Qty"
-msgstr ""
-
-#. module: sale
-#: view:sale.open.invoice:0
-msgid "You invoice has been successfully created!"
-msgstr ""
+#: view:sale.order:0
+msgid "Compute"
+msgstr "Izračunaj"
#. module: sale
-#: code:addons/sale/sale.py:585
+#: code:addons/sale/sale.py:618
#, python-format
msgid "You must first cancel all invoices attached to this sales order."
msgstr ""
@@ -1838,24 +2041,13 @@ msgid "January"
msgstr ""
#. module: sale
-#: view:sale.installer:0
-msgid "Configure Your Sales Management Application"
-msgstr ""
-
-#. module: sale
#: model:ir.actions.act_window,name:sale.action_order_tree4
msgid "Sales Order in Progress"
msgstr "Prodajni nalog u obradi"
#. module: sale
-#: field:sale.installer,sale_layout:0
-msgid "Sales Order Layout Improvement"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:63
-#, python-format
-msgid "Error"
+#: help:sale.order,origin:0
+msgid "Reference of the document that generated this sales order request."
msgstr ""
#. module: sale
@@ -1865,6 +2057,11 @@ msgid "Commitment Delay"
msgstr ""
#. module: sale
+#: selection:sale.order,order_policy:0
+msgid "Deliver & invoice on demand"
+msgstr ""
+
+#. module: sale
#: model:process.node,note:sale.process_node_saleprocurement0
msgid ""
"One Procurement order for each sales order line and for each of the "
@@ -1887,13 +2084,12 @@ msgid "Confirmed sales order to invoice."
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:290
-#, python-format
-msgid "Cannot delete Sales Order(s) which are already confirmed !"
+#: view:sale.order:0
+msgid "Sales Order that haven't yet been confirmed"
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:316
+#: code:addons/sale/sale.py:322
#, python-format
msgid "The sales order '%s' has been set in draft state."
msgstr ""
@@ -1904,24 +2100,19 @@ msgid "from stock"
msgstr "sa zaliha"
#. module: sale
-#: field:sale.config.picking_policy,order_policy:0
-msgid "Shipping Default Policy"
-msgstr "Standardni način isporuke"
-
-#. module: sale
#: view:sale.open.invoice:0
msgid "Close"
msgstr "Zatvori"
#. module: sale
-#: field:sale.order,shipped:0
-msgid "Delivered"
+#: code:addons/sale/sale.py:1248
+#, python-format
+msgid "No Pricelist ! : "
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:1115
-#, python-format
-msgid "Not enough stock !"
+#: field:sale.order,shipped:0
+msgid "Delivered"
msgstr ""
#. module: sale
@@ -1930,11 +2121,6 @@ msgid "You must assign a production lot for this product"
msgstr ""
#. module: sale
-#: field:sale.order.line,sequence:0
-msgid "Layout Sequence"
-msgstr ""
-
-#. module: sale
#: model:ir.actions.act_window,help:sale.action_shop_form
msgid ""
"If you have more than one shop reselling your company products, you can "
@@ -1961,11 +2147,6 @@ msgid "May"
msgstr ""
#. module: sale
-#: help:sale.installer,sale_order_dates:0
-msgid "Adds commitment, requested and effective dates on Sales Orders."
-msgstr ""
-
-#. module: sale
#: view:sale.order:0
#: field:sale.order,partner_id:0
#: field:sale.order.line,order_partner_id:0
@@ -1973,23 +2154,11 @@ msgid "Customer"
msgstr "Kupac"
#. module: sale
-#: model:product.template,name:sale.advance_product_0_product_template
-msgid "Advance"
-msgstr ""
-
-#. module: sale
#: selection:sale.report,month:0
msgid "February"
msgstr ""
#. module: sale
-#: help:sale.installer,sale_journal:0
-msgid ""
-"Allows you to group and invoice your delivery orders according to different "
-"invoicing types: daily, weekly, etc."
-msgstr ""
-
-#. module: sale
#: selection:sale.report,month:0
msgid "April"
msgstr ""
@@ -2000,11 +2169,6 @@ msgid "Accounting"
msgstr "Računovodstvo"
#. module: sale
-#: field:sale.config.picking_policy,step:0
-msgid "Steps To Deliver a Sales Order"
-msgstr ""
-
-#. module: sale
#: view:sale.order:0
#: view:sale.order.line:0
msgid "Search Sales Order"
@@ -2016,18 +2180,18 @@ msgid "Sales Order Requisition"
msgstr ""
#. module: sale
+#: code:addons/sale/sale.py:1242
+#, python-format
+msgid "Not enough stock ! : "
+msgstr ""
+
+#. module: sale
#: report:sale.order:0
#: field:sale.order,payment_term:0
msgid "Payment Term"
msgstr "Uslovi plaćanja"
#. module: sale
-#: help:sale.installer,sale_layout:0
-msgid ""
-"Provides some features to improve the layout of the Sales Order reports."
-msgstr ""
-
-#. module: sale
#: model:ir.actions.act_window,help:sale.action_order_report_all
msgid ""
"This report performs analysis on your quotations and sales orders. Analysis "
@@ -2071,6 +2235,9 @@ msgstr "Račun sa referencom na isporuku"
#~ msgid "Recreate Procurement"
#~ msgstr "Ponovo kreiraj nabavni nalog"
+#~ msgid "Partial Delivery"
+#~ msgstr "Djelomična isporuka"
+
#~ msgid "Sale Order Line"
#~ msgstr "Stavka prodajnog naloga"
@@ -2089,12 +2256,18 @@ msgstr "Račun sa referencom na isporuku"
#~ msgid "Total amount"
#~ msgstr "Ukupni iznos"
+#~ msgid "Payment Before Delivery"
+#~ msgstr "Plaćanje prije isporuke"
+
#~ msgid "Delivery Delay"
#~ msgstr "Odgoda isporuke"
#~ msgid "Origin"
#~ msgstr "Porijeklo"
+#~ msgid "Shipping Policy"
+#~ msgstr "Način otpreme"
+
#~ msgid "Net Price"
#~ msgstr "Neto cijena"
@@ -2107,6 +2280,9 @@ msgstr "Račun sa referencom na isporuku"
#~ msgid "Sale Shop"
#~ msgstr "Prodavnica"
+#~ msgid "Complete Delivery"
+#~ msgstr "Potpuna isporuka"
+
#~ msgid "Sale Order Procurement"
#~ msgstr "Nabavka na osnovu Prodajnog naloga"
@@ -2125,6 +2301,12 @@ msgstr "Račun sa referencom na isporuku"
#~ msgid "Order Ref"
#~ msgstr "Referenca naloga"
+#~ msgid "Shipping Default Policy"
+#~ msgstr "Standardni način isporuke"
+
+#~ msgid "Sales Management"
+#~ msgstr "Upravljanje Prodajom"
+
#~ msgid "Packing Default Policy"
#~ msgstr "Standardni način pakiranja"
@@ -2151,9 +2333,15 @@ msgstr "Račun sa referencom na isporuku"
#~ msgid "Packing Policy"
#~ msgstr "Način pakiranja"
+#~ msgid "Product sales"
+#~ msgstr "Prodaja proizvoda"
+
#~ msgid "One procurement for each product."
#~ msgstr "Pojedinačna nabavka za svaki proizvod."
+#~ msgid "Direct Delivery"
+#~ msgstr "Direktna isporuka"
+
#~ msgid "Sale Pricelists"
#~ msgstr "Cjenovnik"
@@ -2163,6 +2351,9 @@ msgstr "Račun sa referencom na isporuku"
#~ msgid "Our Salesman"
#~ msgstr "Naš Prodavač"
+#~ msgid "Delivery Order Only"
+#~ msgstr "Samo isporuka"
+
#~ msgid "Sales order lines"
#~ msgstr "Stavke Prodajnog naloga"
@@ -2236,6 +2427,9 @@ msgstr "Račun sa referencom na isporuku"
#~ msgid "Procurement is created after confirmation of sale order."
#~ msgstr "Nabavka je nastala nakon potvrde naloga za prodaju."
+#~ msgid "All at Once"
+#~ msgstr "Sve odjednom"
+
#~ msgid ""
#~ "The sale order will automatically create the invoice proposition (draft "
#~ "invoice). Ordered and delivered quantities may not be the same. You have to "
@@ -2288,9 +2482,6 @@ msgstr "Račun sa referencom na isporuku"
#~ msgid "Draft customer invoice, to be reviewed by accountant."
#~ msgstr "Draft fakture kupca će biti pregledane od strane računovodsvta."
-#~ msgid "My Quotations"
-#~ msgstr "Moje Ponude"
-
#~ msgid "Draft Invoice"
#~ msgstr "Faktura u pripremi"
@@ -2317,6 +2508,9 @@ msgstr "Račun sa referencom na isporuku"
#~ msgid "Sales Configuration"
#~ msgstr "Konfiguracija prodaje"
+#~ msgid "Shipping & Manual Invoice"
+#~ msgstr "Isporuka i Fakture"
+
#~ msgid ""
#~ "Invoice is created when 'Create Invoice' is being clicked after confirming "
#~ "the sale order. This transaction moves the sale order to invoices."
diff --git a/addons/sale/i18n/ca.po b/addons/sale/i18n/ca.po
index 54defa8c890..19df11a3db9 100644
--- a/addons/sale/i18n/ca.po
+++ b/addons/sale/i18n/ca.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2011-01-11 11:16+0000\n"
+"POT-Creation-Date: 2011-12-22 18:43+0000\n"
"PO-Revision-Date: 2010-12-15 20:48+0000\n"
"Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
"<jesteve@zikzakmedia.com>\n"
@@ -14,8 +14,20 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-05 05:16+0000\n"
-"X-Generator: Launchpad (build 14231)\n"
+"X-Launchpad-Export-Date: 2011-12-23 06:46+0000\n"
+"X-Generator: Launchpad (build 14560)\n"
+
+#. module: sale
+#: field:sale.config.picking_policy,timesheet:0
+msgid "Based on Timesheet"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid ""
+"Sale Order Lines that are confirmed, done or in exception state and haven't "
+"yet been invoiced"
+msgstr ""
#. module: sale
#: view:board.board:0
@@ -24,11 +36,6 @@ msgid "Sales by Salesman in last 90 days"
msgstr "Vendes per comercial últims 90 dies"
#. module: sale
-#: help:sale.installer,delivery:0
-msgid "Allows you to compute delivery costs on your quotations."
-msgstr "Us permet calcular els costos d'enviament als vostres pressupostos."
-
-#. module: sale
#: help:sale.order,picking_policy:0
msgid ""
"If you don't have enough stock available to deliver all at once, do you "
@@ -38,6 +45,11 @@ msgstr ""
"accepteu enviaments parcials o no?"
#. module: sale
+#: view:sale.order:0
+msgid "UoS"
+msgstr ""
+
+#. module: sale
#: help:sale.order,partner_shipping_id:0
msgid "Shipping address for current sales order."
msgstr "Adreça d'enviament per a la comanda de venda actual."
@@ -61,22 +73,12 @@ msgid "Cancel Order"
msgstr "Cancel·la comanda"
#. module: sale
-#: view:sale.config.picking_policy:0
-msgid "Configure Sales Order Logistics"
-msgstr "Configura la logística de les comandes de venda"
-
-#. module: sale
-#: code:addons/sale/sale.py:603
+#: code:addons/sale/sale.py:638
#, python-format
msgid "The quotation '%s' has been converted to a sales order."
msgstr "El pressupost '%s' s'ha convertit a una comanda de venda."
#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Payment Before Delivery"
-msgstr "Pagament abans de l'enviament"
-
-#. module: sale
#: code:addons/sale/wizard/sale_make_invoice.py:42
#, python-format
msgid "Warning !"
@@ -93,12 +95,6 @@ msgid "Drives procurement orders for every sales order line."
msgstr "Genera ordres de proveïment per a cada línia de comanda de venda."
#. module: sale
-#: selection:sale.config.picking_policy,picking_policy:0
-msgid "All at Once"
-msgstr "Tot a la vegada"
-
-#. module: sale
-#: field:sale.order,project_id:0
#: view:sale.report:0
#: field:sale.report,analytic_account_id:0
#: field:sale.shop,project_id:0
@@ -118,6 +114,15 @@ msgstr ""
"factureu comandes de venda completes."
#. module: sale
+#: code:addons/sale/sale.py:295
+#, python-format
+msgid ""
+"In order to delete a confirmed sale order, you must cancel it before ! To "
+"cancel a sale order, you must first cancel related picking or delivery "
+"orders."
+msgstr ""
+
+#. module: sale
#: model:process.node,name:sale.process_node_saleprocurement0
msgid "Procurement Order"
msgstr "Ordre de proveïment"
@@ -129,6 +134,11 @@ msgid "Partner"
msgstr "Empresa"
#. module: sale
+#: selection:sale.order,order_policy:0
+msgid "Invoice based on deliveries"
+msgstr ""
+
+#. module: sale
#: view:sale.order:0
msgid "Order Line"
msgstr "Línia de la comanda"
@@ -174,9 +184,14 @@ msgid "Default Payment Term"
msgstr "Termini pagament per defecte"
#. module: sale
-#: model:ir.actions.act_window,name:sale.action_config_picking_policy
-msgid "Configure Picking Policy for Sales Order"
-msgstr "Configura la política enviament per a comandes de venda"
+#: field:sale.config.picking_policy,deli_orders:0
+msgid "Based on Delivery Orders"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.picking_policy,time_unit:0
+msgid "Main Working Time Unit"
+msgstr ""
#. module: sale
#: view:sale.order:0
@@ -192,9 +207,10 @@ msgid "Disc.(%)"
msgstr "Desc.(%)"
#. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_forceassignation0
-msgid "Force Assignation"
-msgstr "Força assignació"
+#: view:sale.report:0
+#: field:sale.report,price_total:0
+msgid "Total Price"
+msgstr "Preu total"
#. module: sale
#: help:sale.make.invoice,grouped:0
@@ -203,6 +219,11 @@ msgstr ""
"Marqueu aquesta opció per agrupar les factures dels mateixos clients."
#. module: sale
+#: view:sale.order:0
+msgid "My Sale Orders"
+msgstr ""
+
+#. module: sale
#: selection:sale.order,invoice_quantity:0
msgid "Ordered Quantities"
msgstr "Quantitats demanades"
@@ -243,14 +264,25 @@ msgstr ""
"\"Facturar des de l'albarà\" o \"Facturar comanda després de l'enviament\"."
#. module: sale
+#: field:sale.config.picking_policy,task_work:0
+msgid "Based on Tasks' Work"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
+msgid "Quotations and Sales"
+msgstr ""
+
+#. module: sale
#: model:ir.model,name:sale.model_sale_make_invoice
msgid "Sales Make Invoice"
msgstr "Vendes. Realitza factura"
#. module: sale
-#: view:sale.order:0
-msgid "Recreate Packing"
-msgstr "Recrea albarà"
+#: code:addons/sale/sale.py:330
+#, python-format
+msgid "Pricelist Warning!"
+msgstr ""
#. module: sale
#: field:sale.order.line,discount:0
@@ -258,11 +290,10 @@ msgid "Discount (%)"
msgstr "Descompte (%)"
#. module: sale
-#: help:res.company,security_lead:0
-msgid ""
-"This is the days added to what you promise to customers for security purpose"
-msgstr ""
-"Aquests dies per raons de seguretat s'afegeixen als que prometeu als clients."
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_quotation_for_sale
+msgid "My Quotations"
+msgstr "Els meus pressuposts"
#. module: sale
#: view:board.board:0
@@ -287,7 +318,22 @@ msgid "Shop Name"
msgstr "Nom tenda"
#. module: sale
-#: code:addons/sale/sale.py:1014
+#: help:sale.order,order_policy:0
+msgid ""
+"The Invoice Policy is used to synchronise invoice and delivery operations.\n"
+" - The 'Pay before delivery' choice will first generate the invoice and "
+"then generate the picking order after the payment of this invoice.\n"
+" - The 'Deliver & Invoice on demand' will create the picking order directly "
+"and wait for the user to manually click on the 'Invoice' button to generate "
+"the draft invoice based on the sale order or the sale order lines.\n"
+" - The 'Invoice on order after delivery' choice will generate the draft "
+"invoice based on sales order after all picking lists have been finished.\n"
+" - The 'Invoice based on deliveries' choice is used to create an invoice "
+"during the picking process."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:1158
#, python-format
msgid "No Customer Defined !"
msgstr "No s'ha definit un client!"
@@ -298,9 +344,12 @@ msgid "Sales in Exception"
msgstr "Vendes en excepció"
#. module: sale
-#: view:sale.order:0
-msgid "Set to Draft"
-msgstr "Canvia a esborrany"
+#: code:addons/sale/sale.py:1145
+#: code:addons/sale/sale.py:1264
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:70
+#, python-format
+msgid "Configuration Error !"
+msgstr ""
#. module: sale
#: view:sale.order:0
@@ -308,34 +357,7 @@ msgid "Conditions"
msgstr "Condicions"
#. module: sale
-#: help:sale.order,order_policy:0
-msgid ""
-"The Shipping Policy is used to synchronise invoice and delivery operations.\n"
-" - The 'Pay Before delivery' choice will first generate the invoice and "
-"then generate the picking order after the payment of this invoice.\n"
-" - The 'Shipping & Manual Invoice' will create the picking order directly "
-"and wait for the user to manually click on the 'Invoice' button to generate "
-"the draft invoice.\n"
-" - The 'Invoice On Order After Delivery' choice will generate the draft "
-"invoice based on sales order after all picking lists have been finished.\n"
-" - The 'Invoice From The Picking' choice is used to create an invoice "
-"during the picking process."
-msgstr ""
-"La política d'enviament s'utilitza per sincronitzar les operacions "
-"d'enviament i facturació.\n"
-" -L'opció 'Paga abans de l'enviament' primer generarà la factura i més tard "
-"l'albarà, després del pagament d'aquesta factura.\n"
-" -L'opció 'Enviament i factura manual' crearà l'albarà directament i "
-"esperarà al fet que un usuari faci clic manualment sobre el botó 'Factura' "
-"per generar la factura en l'estat esborrany.\n"
-" -L'opció 'Factura comanda després de l'enviament' generarà la factura en "
-"estat esborrany basant-se en la comanda de venda després que tots els "
-"albarans hagin estat realitzats.\n"
-" -L'opció 'Factura des d'albarà' s'utilitza per crear una factura durant el "
-"procés de preparació de la comanda."
-
-#. module: sale
-#: code:addons/sale/sale.py:939
+#: code:addons/sale/sale.py:1034
#, python-format
msgid ""
"There is no income category account defined in default Properties for "
@@ -345,9 +367,9 @@ msgstr ""
"defecte de la categoria del producte o la posició fiscal no està definida!"
#. module: sale
-#: view:sale.installer:0
-msgid "Configure"
-msgstr "Configuració"
+#: selection:sale.report,month:0
+msgid "August"
+msgstr "Agost"
#. module: sale
#: constraint:stock.move:0
@@ -355,7 +377,7 @@ msgid "You try to assign a lot which is not from the same product"
msgstr "Esteu intentant assignar un lot que no és del mateix producte"
#. module: sale
-#: code:addons/sale/sale.py:620
+#: code:addons/sale/sale.py:655
#, python-format
msgid "invalid mode for test_state"
msgstr "Mode no vàlit pe ra test_state"
@@ -366,7 +388,7 @@ msgid "June"
msgstr "Juny"
#. module: sale
-#: code:addons/sale/sale.py:584
+#: code:addons/sale/sale.py:617
#, python-format
msgid "Could not cancel this sales order !"
msgstr "No podeu cancel·lar aquesta comanda de venda!"
@@ -387,8 +409,12 @@ msgid "October"
msgstr "Octubre"
#. module: sale
+#: sql_constraint:stock.picking:0
+msgid "Reference must be unique per Company!"
+msgstr ""
+
+#. module: sale
#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_quotation_for_sale
#: view:sale.order:0
#: view:sale.report:0
msgid "Quotations"
@@ -400,11 +426,6 @@ msgid "Pricelist for current sales order."
msgstr "Tarifa per la comanda de venda actual."
#. module: sale
-#: selection:sale.config.picking_policy,step:0
-msgid "Delivery Order Only"
-msgstr "Només ordre d'enviament"
-
-#. module: sale
#: report:sale.order:0
msgid "TVA :"
msgstr "IVA :"
@@ -431,6 +452,7 @@ msgstr "Posició fiscal"
#. module: sale
#: view:sale.order:0
#: view:sale.order.line:0
+#: field:sale.report,product_uom:0
msgid "UoM"
msgstr "UdM"
@@ -455,7 +477,13 @@ msgstr ""
"converteix 'En procés' o 'Procés manual'."
#. module: sale
-#: code:addons/sale/sale.py:971
+#: code:addons/sale/sale.py:1061
+#, python-format
+msgid "You cannot cancel a sale order line that has already been invoiced!"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:1066
#, python-format
msgid "You must first cancel stock moves attached to this sales order line."
msgstr ""
@@ -463,7 +491,7 @@ msgstr ""
"comanda de venda."
#. module: sale
-#: code:addons/sale/sale.py:1042
+#: code:addons/sale/sale.py:1134
#, python-format
msgid "(n/a)"
msgstr "(n/a)"
@@ -502,15 +530,36 @@ msgid "Notes"
msgstr "Notes"
#. module: sale
+#: sql_constraint:res.company:0
+msgid "The company name must be unique !"
+msgstr ""
+
+#. module: sale
#: help:sale.order,partner_invoice_id:0
msgid "Invoice address for current sales order."
msgstr "Adreça de facturació per a la comanda de venda actual."
#. module: sale
-#: view:sale.installer:0
-msgid "Enhance your core Sales Application with additional functionalities."
+#: view:sale.report:0
+msgid "Month-1"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered month of the sales order"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:504
+#, python-format
+msgid ""
+"You cannot group sales having different currencies for the same partner."
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,picking_policy:0
+msgid "Deliver each product when available"
msgstr ""
-"Optimitza la vostra aplicació de vendes amb funcionalitats addicionals."
#. module: sale
#: field:sale.order,invoiced_rate:0
@@ -529,21 +578,43 @@ msgid "Confirmation Date"
msgstr "Data de confirmació"
#. module: sale
+#: field:sale.order,incoterm:0
+msgid "Incoterm"
+msgstr "Incoterm"
+
+#. module: sale
#: field:sale.order.line,address_allotment_id:0
msgid "Allotment Partner"
msgstr "Ubicació empresa"
#. module: sale
-#: sql_constraint:sale.order:0
-msgid "Order Reference must be unique !"
-msgstr "La referència de la comanda ha de ser única!"
-
-#. module: sale
#: selection:sale.report,month:0
msgid "March"
msgstr "Març"
#. module: sale
+#: constraint:stock.move:0
+msgid "You can not move products from or to a location of the type view."
+msgstr ""
+
+#. module: sale
+#: field:sale.config.picking_policy,sale_orders:0
+msgid "Based on Sales Orders"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,state:0
+msgid ""
+"Givwizard = self.browse(cr, uid, ids)[0]es the state of the quotation or "
+"sales order. \n"
+"The exception state is automatically set when a cancel operation occurs in "
+"the invoice validation (Invoice Exception) or in the picking list process "
+"(Shipping Exception). \n"
+"The 'Waiting Schedule' state is set when the invoice is confirmed but "
+"waiting for the scheduler to run on the order date."
+msgstr ""
+
+#. module: sale
#: help:sale.order,amount_total:0
msgid "The total amount."
msgstr "L'import total."
@@ -559,6 +630,11 @@ msgid "Invoice address :"
msgstr "Adreça de factura :"
#. module: sale
+#: field:sale.order.line,sequence:0
+msgid "Line Sequence"
+msgstr ""
+
+#. module: sale
#: model:process.transition,note:sale.process_transition_saleorderprocurement0
msgid ""
"For every sales order line, a procurement order is created to supply the "
@@ -609,11 +685,6 @@ msgid "Sales Order Line"
msgstr "Línia comanda de venda"
#. module: sale
-#: view:sale.config.picking_policy:0
-msgid "Setup your sales workflow and default values."
-msgstr "Configura el vostre flux de vendes i valors per defecte."
-
-#. module: sale
#: field:sale.shop,warehouse_id:0
msgid "Warehouse"
msgstr "Magatzem"
@@ -650,6 +721,11 @@ msgid "Creation Date"
msgstr "Data creació"
#. module: sale
+#: model:ir.ui.menu,name:sale.menu_sales_configuration_misc
+msgid "Miscellaneous"
+msgstr ""
+
+#. module: sale
#: model:ir.actions.act_window,name:sale.action_order_line_tree3
msgid "Uninvoiced and Delivered Lines"
msgstr "Línies no facturades i lliuraments"
@@ -665,14 +741,19 @@ msgid "My Sales"
msgstr "Les meves vendes"
#. module: sale
-#: code:addons/sale/sale.py:290
-#: code:addons/sale/sale.py:966
-#: code:addons/sale/sale.py:1165
+#: code:addons/sale/sale.py:295
+#: code:addons/sale/sale.py:1061
+#: code:addons/sale/sale.py:1290
#, python-format
msgid "Invalid action !"
msgstr "Acció no vàlida!"
#. module: sale
+#: view:sale.order:0
+msgid "Extra Info"
+msgstr "Informació extra"
+
+#. module: sale
#: field:sale.order,pricelist_id:0
#: field:sale.report,pricelist_id:0
#: field:sale.shop,pricelist_id:0
@@ -686,13 +767,21 @@ msgid "# of Qty"
msgstr "Nº de qtat"
#. module: sale
+#: code:addons/sale/sale.py:1314
+#, python-format
+msgid "Hour"
+msgstr ""
+
+#. module: sale
#: view:sale.order:0
msgid "Order Date"
msgstr "Data comanda"
#. module: sale
#: view:sale.order.line:0
+#: view:sale.report:0
#: field:sale.report,shipped:0
+#: field:sale.report,shipped_qty_1:0
msgid "Shipped"
msgstr "Enviat"
@@ -702,9 +791,9 @@ msgid "All Quotations"
msgstr "Tots els pressupostos"
#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Invoice On Order After Delivery"
-msgstr "Factura comanda després de l'enviament"
+#: view:sale.config.picking_policy:0
+msgid "Options"
+msgstr ""
#. module: sale
#: selection:sale.report,month:0
@@ -712,6 +801,20 @@ msgid "September"
msgstr "Setembre"
#. module: sale
+#: code:addons/sale/sale.py:632
+#, python-format
+msgid "You cannot confirm a sale order which has no line."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:1246
+#, python-format
+msgid ""
+"You have to select a pricelist or a customer in the sales form !\n"
+"Please set one before choosing a product."
+msgstr ""
+
+#. module: sale
#: view:sale.report:0
#: field:sale.report,categ_id:0
msgid "Category of Product"
@@ -728,11 +831,6 @@ msgid "Stock Moves"
msgstr "Moviments d'estoc"
#. module: sale
-#: view:sale.report:0
-msgid " Year "
-msgstr " Any "
-
-#. module: sale
#: field:sale.order,state:0
#: field:sale.report,state:0
msgid "Order State"
@@ -750,7 +848,7 @@ msgid "Sales By Month"
msgstr "Vendes per mes"
#. module: sale
-#: code:addons/sale/sale.py:970
+#: code:addons/sale/sale.py:1065
#, python-format
msgid "Could not cancel sales order line!"
msgstr "No podeu cancel·lar la línia de comanda de venda!"
@@ -785,64 +883,19 @@ msgstr ""
"només després que el planificador(s) s'ha executat."
#. module: sale
+#: field:sale.order,date_order:0
+msgid "Date"
+msgstr ""
+
+#. module: sale
#: view:sale.report:0
msgid "Extended Filters..."
msgstr "Filtres extensos..."
#. module: sale
-#: model:ir.module.module,description:sale.module_meta_information
-msgid ""
-"\n"
-" The base module to manage quotations and sales orders.\n"
-"\n"
-" * Workflow with validation steps:\n"
-" - Quotation -> Sales order -> Invoice\n"
-" * Invoicing methods:\n"
-" - Invoice on order (before or after shipping)\n"
-" - Invoice on delivery\n"
-" - Invoice on timesheets\n"
-" - Advance invoice\n"
-" * Partners preferences (shipping, invoicing, incoterm, ...)\n"
-" * Products stocks and prices\n"
-" * Delivery methods:\n"
-" - all at once, multi-parcel\n"
-" - delivery costs\n"
-" * Dashboard for salesman that includes:\n"
-" * Your open quotations\n"
-" * Top 10 sales of the month\n"
-" * Cases statistics\n"
-" * Graph of sales by product\n"
-" * Graph of cases of the month\n"
-" "
-msgstr ""
-"\n"
-" El mòdul bàsic per gestionar pressupostos i comandes de venda.\n"
-"\n"
-"* Flux de treball amb etapes de validació:\n"
-"- Pressupost -> Comanda de venda -> Factura\n"
-"* Mètodes de facturació:\n"
-"- Factura de la comanda (abans o després de l'enviament)\n"
-"- Factura de l'albarà\n"
-"- Factura del full de serveis\n"
-"- Avançar factura\n"
-"* Preferències dels clients (enviament, facturació, incoterm, ...)\n"
-"* Existències dels productes i preus\n"
-"* Formes d'enviament:\n"
-"- Tot alhora, En diversos paquets\n"
-"- Despeses d'enviament\n"
-"* El quadre per al comercial inclou:\n"
-"* Els vostres pressupostos oberts\n"
-"* Les 10 millors vendes del mes\n"
-"* Estadístiques de casos\n"
-"* Gràfic de les vendes per producte\n"
-"* Gràfic dels casos per mes\n"
-" "
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_shop
-#: view:sale.shop:0
-msgid "Sales Shop"
-msgstr "Tenda vendes"
+#: selection:sale.order.line,state:0
+msgid "Exception"
+msgstr "Excepció"
#. module: sale
#: model:ir.model,name:sale.model_res_company
@@ -850,9 +903,10 @@ msgid "Companies"
msgstr "Companyies"
#. module: sale
-#: selection:sale.report,month:0
-msgid "November"
-msgstr "Novembre"
+#: code:addons/sale/sale.py:1259
+#, python-format
+msgid "No valid pricelist line found ! :"
+msgstr ""
#. module: sale
#: view:sale.order:0
@@ -860,9 +914,9 @@ msgid "History"
msgstr "Historial"
#. module: sale
-#: field:sale.config.picking_policy,picking_policy:0
-msgid "Picking Default Policy"
-msgstr "Política d'empaquetat per defecte"
+#: selection:sale.order,order_policy:0
+msgid "Invoice on order after delivery"
+msgstr ""
#. module: sale
#: help:sale.order,invoice_ids:0
@@ -888,14 +942,13 @@ msgstr ""
"El nom i l'adreça del contacte que ha sol·licitat la comanda o pressupost."
#. module: sale
-#: code:addons/sale/sale.py:966
-#, python-format
-msgid "You cannot cancel a sales order line that has already been invoiced !"
+#: help:res.company,security_lead:0
+msgid ""
+"This is the days added to what you promise to customers for security purpose"
msgstr ""
-"No podeu cancel·lar una línia de comanda de venda que ja ha estat facturada!"
+"Aquests dies per raons de seguretat s'afegeixen als que prometeu als clients."
#. module: sale
-#: view:sale.order:0
#: view:sale.order.line:0
msgid "Qty"
msgstr "Qtat"
@@ -906,6 +959,11 @@ msgid "References"
msgstr "Referències"
#. module: sale
+#: view:sale.order.line:0
+msgid "My Sales Order Lines"
+msgstr ""
+
+#. module: sale
#: model:process.transition.action,name:sale.process_transition_action_cancel0
#: model:process.transition.action,name:sale.process_transition_action_cancel1
#: model:process.transition.action,name:sale.process_transition_action_cancel2
@@ -917,14 +975,9 @@ msgid "Cancel"
msgstr "Cancel·la"
#. module: sale
-#: field:sale.installer,sale_order_dates:0
-msgid "Sales Order Dates"
-msgstr "Dates en comandes de venda"
-
-#. module: sale
-#: selection:sale.order.line,state:0
-msgid "Exception"
-msgstr "Excepció"
+#: sql_constraint:sale.order:0
+msgid "Order Reference must be unique per Company!"
+msgstr ""
#. module: sale
#: model:process.transition,name:sale.process_transition_invoice0
@@ -936,19 +989,19 @@ msgid "Create Invoice"
msgstr "Crea factura"
#. module: sale
-#: field:sale.installer,sale_margin:0
-msgid "Margins in Sales Orders"
-msgstr "Marges en comandes de venda"
-
-#. module: sale
#: view:sale.order:0
msgid "Total Tax Excluded"
msgstr "Total sense impostos"
#. module: sale
-#: view:sale.order:0
-msgid "Compute"
-msgstr "Calcula"
+#: view:sale.order.line:0
+msgid "Order reference"
+msgstr ""
+
+#. module: sale
+#: view:sale.open.invoice:0
+msgid "You invoice has been successfully created!"
+msgstr "La factura s'ha creat correctament!"
#. module: sale
#: view:sale.report:0
@@ -967,23 +1020,21 @@ msgid "Open Invoice"
msgstr "Obre factura"
#. module: sale
-#: report:sale.order:0
-#: view:sale.order.line:0
-msgid "Price"
-msgstr "Preu"
+#: model:ir.actions.server,name:sale.ir_actions_server_edi_sale
+msgid "Auto-email confirmed sale orders"
+msgstr ""
#. module: sale
-#: model:ir.actions.act_window,name:sale.action_sale_installer
-#: view:sale.config.picking_policy:0
-#: view:sale.installer:0
-msgid "Sales Application Configuration"
-msgstr "Configuració d'aplicacions de vendes"
+#: code:addons/sale/sale.py:413
+#, python-format
+msgid "There is no sales journal defined for this company: \"%s\" (id:%d)"
+msgstr ""
+"No s'ha definit un diari de vendes per a aquesta companyia: \"%s\" (id:%d)"
#. module: sale
-#: view:sale.report:0
-#: field:sale.report,price_total:0
-msgid "Total Price"
-msgstr "Preu total"
+#: model:process.transition.action,name:sale.process_transition_action_forceassignation0
+msgid "Force Assignation"
+msgstr "Força assignació"
#. module: sale
#: selection:sale.order.line,type:0
@@ -996,6 +1047,11 @@ msgid "Based on the shipped or on the ordered quantities."
msgstr "Basat en les quantitats enviades o comandades"
#. module: sale
+#: selection:sale.order,picking_policy:0
+msgid "Deliver all products at once"
+msgstr ""
+
+#. module: sale
#: field:sale.order,picking_ids:0
msgid "Related Picking"
msgstr "Albarà relacionat"
@@ -1027,9 +1083,15 @@ msgid "Create Delivery Order"
msgstr "Crea ordre de lliurament"
#. module: sale
-#: field:sale.installer,delivery:0
-msgid "Delivery Costs"
-msgstr "Costos d'enviament"
+#: code:addons/sale/sale.py:1290
+#, python-format
+msgid "Cannot delete a sales order line which is in state '%s'!"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Qty(UoS)"
+msgstr ""
#. module: sale
#: view:sale.order:0
@@ -1043,13 +1105,13 @@ msgstr "Crea albarà"
#. module: sale
#: view:sale.report:0
-msgid "Sales by Product Category"
-msgstr "Vendes per categoria de productes"
+msgid "Ordered date of the sales order"
+msgstr ""
#. module: sale
-#: selection:sale.order,picking_policy:0
-msgid "Partial Delivery"
-msgstr "Enviament parcial"
+#: view:sale.report:0
+msgid "Sales by Product Category"
+msgstr "Vendes per categoria de productes"
#. module: sale
#: model:process.transition,name:sale.process_transition_confirmquotation0
@@ -1057,11 +1119,10 @@ msgid "Confirm Quotation"
msgstr "Confirma pressupost"
#. module: sale
-#: help:sale.order,origin:0
-msgid "Reference of the document that generated this sales order request."
-msgstr ""
-"Referència del document que ha generat aquesta sol·licitud de comanda de "
-"venda."
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:63
+#, python-format
+msgid "Error"
+msgstr "Error"
#. module: sale
#: view:sale.order:0
@@ -1093,20 +1154,14 @@ msgid "Procurement Method"
msgstr "Mètode proveïment"
#. module: sale
-#: view:sale.config.picking_policy:0
-#: view:sale.installer:0
-msgid "title"
-msgstr "títol"
-
-#. module: sale
#: model:process.node,name:sale.process_node_packinglist0
msgid "Pick List"
msgstr "Albarà"
#. module: sale
#: view:sale.order:0
-msgid "Order date"
-msgstr "Data de comanda"
+msgid "Set to Draft"
+msgstr "Canvia a esborrany"
#. module: sale
#: model:process.node,note:sale.process_node_packinglist0
@@ -1114,6 +1169,85 @@ msgid "Document of the move to the output or to the customer."
msgstr "Document del moviment a la sortida o al client."
#. module: sale
+#: model:email.template,body_text:sale.email_template_edi_sale
+msgid ""
+"\n"
+"Hello${object.partner_order_id.name and ' ' or "
+"''}${object.partner_order_id.name or ''},\n"
+"\n"
+"Here is your order confirmation for ${object.partner_id.name}:\n"
+" | Order number: *${object.name}*\n"
+" | Order total: *${object.amount_total} "
+"${object.pricelist_id.currency_id.name}*\n"
+" | Order date: ${object.date_order}\n"
+" % if object.origin:\n"
+" | Order reference: ${object.origin}\n"
+" % endif\n"
+" % if object.client_order_ref:\n"
+" | Your reference: ${object.client_order_ref}<br />\n"
+" % endif\n"
+" | Your contact: ${object.user_id.name} ${object.user_id.user_email "
+"and '<%s>'%(object.user_id.user_email) or ''}\n"
+"\n"
+"You can view the order confirmation, download it and even pay online using "
+"the following link:\n"
+" ${ctx.get('edi_web_url_view') or 'n/a'}\n"
+"\n"
+"% if object.order_policy in ('prepaid','manual') and "
+"object.company_id.paypal_account:\n"
+"<% \n"
+"comp_name = quote(object.company_id.name)\n"
+"order_name = quote(object.name)\n"
+"paypal_account = quote(object.company_id.paypal_account)\n"
+"order_amount = quote(str(object.amount_total))\n"
+"cur_name = quote(object.pricelist_id.currency_id.name)\n"
+"paypal_url = \"https://www.paypal.com/cgi-"
+"bin/webscr?cmd=_xclick&business=%s&item_name=%s%%20Order%%20%s&invoice=%s&amo"
+"unt=%s\" \\\n"
+" "
+"\"&currency_code=%s&button_subtype=services&no_note=1&bn=OpenERP_Order_PayNow"
+"_%s\" % \\\n"
+" "
+"(paypal_account,comp_name,order_name,order_name,order_amount,cur_name,cur_nam"
+"e)\n"
+"%>\n"
+"It is also possible to directly pay with Paypal:\n"
+" ${paypal_url}\n"
+"% endif\n"
+"\n"
+"If you have any question, do not hesitate to contact us.\n"
+"\n"
+"\n"
+"Thank you for choosing ${object.company_id.name}!\n"
+"\n"
+"\n"
+"--\n"
+"${object.user_id.name} ${object.user_id.user_email and "
+"'<%s>'%(object.user_id.user_email) or ''}\n"
+"${object.company_id.name}\n"
+"% if object.company_id.street:\n"
+"${object.company_id.street or ''}\n"
+"% endif\n"
+"% if object.company_id.street2:\n"
+"${object.company_id.street2}\n"
+"% endif\n"
+"% if object.company_id.city or object.company_id.zip:\n"
+"${object.company_id.zip or ''} ${object.company_id.city or ''}\n"
+"% endif\n"
+"% if object.company_id.country_id:\n"
+"${object.company_id.state_id and ('%s, ' % object.company_id.state_id.name) "
+"or ''} ${object.company_id.country_id.name or ''}\n"
+"% endif\n"
+"% if object.company_id.phone:\n"
+"Phone: ${object.company_id.phone}\n"
+"% endif\n"
+"% if object.company_id.website:\n"
+"${object.company_id.website or ''}\n"
+"% endif\n"
+" "
+msgstr ""
+
+#. module: sale
#: model:process.transition.action,name:sale.process_transition_action_validate0
msgid "Validate"
msgstr "Valida"
@@ -1136,9 +1270,9 @@ msgid "Taxes"
msgstr "Impostos"
#. module: sale
-#: field:sale.order,order_policy:0
-msgid "Shipping Policy"
-msgstr "Política de facturació"
+#: view:sale.order:0
+msgid "Sales Order ready to be invoiced"
+msgstr ""
#. module: sale
#: help:sale.order,create_date:0
@@ -1157,9 +1291,9 @@ msgid "Create Invoices"
msgstr "Crea factures"
#. module: sale
-#: view:sale.order:0
-msgid "Extra Info"
-msgstr "Informació extra"
+#: view:sale.report:0
+msgid "Sales order created in current month"
+msgstr ""
#. module: sale
#: report:sale.order:0
@@ -1167,11 +1301,24 @@ msgid "Fax :"
msgstr "Fax :"
#. module: sale
+#: help:sale.order.line,type:0
+msgid ""
+"If 'on order', it triggers a procurement when the sale order is confirmed to "
+"create a task, purchase order or manufacturing order linked to this sale "
+"order line."
+msgstr ""
+
+#. module: sale
#: field:sale.advance.payment.inv,amount:0
msgid "Advance Amount"
msgstr "Import avançat"
#. module: sale
+#: field:sale.config.picking_policy,charge_delivery:0
+msgid "Do you charge the delivery?"
+msgstr ""
+
+#. module: sale
#: selection:sale.order,invoice_quantity:0
msgid "Shipped Quantities"
msgstr "Quantitats enviades"
@@ -1182,25 +1329,45 @@ msgid "Invoice Based on Sales Orders"
msgstr "Factura basada en comandes de venda"
#. module: sale
+#: code:addons/sale/sale.py:331
+#, python-format
+msgid ""
+"If you change the pricelist of this order (and eventually the currency), "
+"prices of existing order lines will not be updated."
+msgstr ""
+
+#. module: sale
#: model:ir.model,name:sale.model_stock_picking
msgid "Picking List"
msgstr "Albarà"
#. module: sale
-#: code:addons/sale/sale.py:387
-#: code:addons/sale/sale.py:920
-#: code:addons/sale/sale.py:938
+#: code:addons/sale/sale.py:412
+#: code:addons/sale/sale.py:503
+#: code:addons/sale/sale.py:632
+#: code:addons/sale/sale.py:1015
+#: code:addons/sale/sale.py:1033
#, python-format
msgid "Error !"
msgstr "Error!"
#. module: sale
-#: code:addons/sale/sale.py:570
+#: code:addons/sale/sale.py:603
#, python-format
msgid "Could not cancel sales order !"
msgstr "No es pot cancel·lar la comanda de venda!"
#. module: sale
+#: view:sale.order:0
+msgid "Qty(UoM)"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered Year of the sales order"
+msgstr ""
+
+#. module: sale
#: selection:sale.report,month:0
msgid "July"
msgstr "Juliol"
@@ -1217,36 +1384,26 @@ msgid "Shipping Exception"
msgstr "Excepció d'enviament"
#. module: sale
-#: field:sale.make.invoice,grouped:0
-msgid "Group the invoices"
-msgstr "Agrupa les factures"
-
-#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Shipping & Manual Invoice"
-msgstr "Enviar & Factura manual"
-
-#. module: sale
-#: code:addons/sale/sale.py:1051
+#: code:addons/sale/sale.py:1143
#, python-format
-msgid "Picking Information !"
-msgstr "Informació d'albarà!"
+msgid "Picking Information ! : "
+msgstr ""
#. module: sale
-#: view:sale.report:0
-#: field:sale.report,month:0
-msgid "Month"
-msgstr "Mes"
+#: field:sale.make.invoice,grouped:0
+msgid "Group the invoices"
+msgstr "Agrupa les factures"
#. module: sale
-#: model:ir.module.module,shortdesc:sale.module_meta_information
-msgid "Sales Management"
-msgstr "Vendes"
+#: field:sale.order,order_policy:0
+msgid "Invoice Policy"
+msgstr ""
#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Invoice From The Picking"
-msgstr "Factura des de l'albarà"
+#: model:ir.actions.act_window,name:sale.action_config_picking_policy
+#: view:sale.config.picking_policy:0
+msgid "Setup your Invoicing Method"
+msgstr ""
#. module: sale
#: model:process.node,note:sale.process_node_invoice0
@@ -1255,32 +1412,31 @@ msgstr "Per ser revisat pel comptable."
#. module: sale
#: view:sale.report:0
-#: field:sale.report,uom_name:0
msgid "Reference UoM"
msgstr "Referència UdM"
#. module: sale
+#: view:sale.config.picking_policy:0
+msgid ""
+"This tool will help you to install the right module and configure the system "
+"according to the method you use to invoice your customers."
+msgstr ""
+
+#. module: sale
#: model:ir.model,name:sale.model_sale_order_line_make_invoice
msgid "Sale OrderLine Make_invoice"
msgstr "Venda Línia_comanda Realitzar_factura"
#. module: sale
-#: help:sale.config.picking_policy,step:0
-msgid ""
-"By default, OpenERP is able to manage complex routing and paths of products "
-"in your warehouse and partner locations. This will configure the most common "
-"and simple methods to deliver products to the customer in one or two "
-"operations by the worker."
-msgstr ""
-"Per defecte, OpenERP és capaç de gestionar complexes rutes i camins dels "
-"productes en el vostre magatzem i en les ubicacions d'altres empreses. Això "
-"configurarà els mètodes més comuns i senzills per lliurar els productes al "
-"client en una o dues operacions realitzades pel treballador."
+#: selection:sale.order,state:0
+#: selection:sale.report,state:0
+msgid "Invoice Exception"
+msgstr "Excepció de factura"
#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_tree
-msgid "Old Quotations"
-msgstr "Pressupostos antics"
+#: model:process.node,note:sale.process_node_saleorder0
+msgid "Drives procurement and invoicing"
+msgstr "Genera proveïment i facturació"
#. module: sale
#: field:sale.order,invoiced:0
@@ -1295,6 +1451,22 @@ msgid "Sales Analysis"
msgstr "Anàlisi de vendes"
#. module: sale
+#: code:addons/sale/sale.py:1138
+#, python-format
+msgid ""
+"You selected a quantity of %d Units.\n"
+"But it's not compatible with the selected packaging.\n"
+"Here is a proposition of quantities according to the packaging:\n"
+"EAN: %s Quantity: %s Type of ul: %s"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Recreate Packing"
+msgstr "Recrea albarà"
+
+#. module: sale
+#: view:sale.order:0
#: field:sale.order.line,property_ids:0
msgid "Properties"
msgstr "Propietats"
@@ -1326,7 +1498,17 @@ msgstr ""
"Podeu generar factures basades en comandes de venda o basades en enviaments."
#. module: sale
-#: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
+#: view:sale.order.line:0
+msgid "Confirmed sale order lines, not yet delivered"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:473
+#, python-format
+msgid "Customer Invoices"
+msgstr ""
+
+#. module: sale
#: model:process.process,name:sale.process_process_salesprocess0
#: view:sale.order:0
#: view:sale.report:0
@@ -1348,18 +1530,13 @@ msgid "Done"
msgstr "Realitzada"
#. module: sale
-#: model:ir.model,name:sale.model_sale_installer
-msgid "sale.installer"
-msgstr "venda.instal·lador"
-
-#. module: sale
#: model:process.node,name:sale.process_node_invoice0
#: model:process.node,name:sale.process_node_invoiceafterdelivery0
msgid "Invoice"
msgstr "Factura"
#. module: sale
-#: code:addons/sale/sale.py:1014
+#: code:addons/sale/sale.py:1158
#, python-format
msgid ""
"You have to select a customer in the sales form !\n"
@@ -1369,11 +1546,6 @@ msgstr ""
"Introduïu un client abans de seleccionar un producte."
#. module: sale
-#: selection:sale.config.picking_policy,step:0
-msgid "Picking List & Delivery Order"
-msgstr "Albarà i Ordre de lliurament"
-
-#. module: sale
#: field:sale.order,origin:0
msgid "Source Document"
msgstr "Document d'origen"
@@ -1399,7 +1571,7 @@ msgid "The amount without tax."
msgstr "L'import sense impostos."
#. module: sale
-#: code:addons/sale/sale.py:571
+#: code:addons/sale/sale.py:604
#, python-format
msgid "You must first cancel all picking attached to this sales order."
msgstr ""
@@ -1412,9 +1584,15 @@ msgid "Sales Advance Payment Invoice"
msgstr "Vendes. Bestreta pagament factura"
#. module: sale
-#: field:sale.order,incoterm:0
-msgid "Incoterm"
-msgstr "Incoterm"
+#: view:sale.report:0
+#: field:sale.report,month:0
+msgid "Month"
+msgstr "Mes"
+
+#. module: sale
+#: model:email.template,subject:sale.email_template_edi_sale
+msgid "${object.company_id.name} Order (Ref ${object.name or 'n/a' })"
+msgstr ""
#. module: sale
#: view:sale.order.line:0
@@ -1425,11 +1603,6 @@ msgid "Product"
msgstr "Producte"
#. module: sale
-#: model:ir.ui.menu,name:sale.menu_invoiced
-msgid "Invoicing"
-msgstr "Facturació"
-
-#. module: sale
#: model:process.transition.action,name:sale.process_transition_action_cancelassignation0
msgid "Cancel Assignation"
msgstr "Cancel·la assignació"
@@ -1440,22 +1613,11 @@ msgid "sale.config.picking_policy"
msgstr "sale.config.picking_policy"
#. module: sale
-#: help:sale.order,state:0
-msgid ""
-"Gives the state of the quotation or sales order. \n"
-"The exception state is automatically set when a cancel operation occurs in "
-"the invoice validation (Invoice Exception) or in the picking list process "
-"(Shipping Exception). \n"
-"The 'Waiting Schedule' state is set when the invoice is confirmed but "
-"waiting for the scheduler to run on the date 'Ordered Date'."
+#: view:account.invoice.report:0
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_turnover_by_month
+msgid "Monthly Turnover"
msgstr ""
-"Indica l'estat del pressupost o comanda de venda. \n"
-"L'estat d'excepció s'estableix automàticament quan es produeix una operació "
-"de cancel·lació en la validació de factura (excepció de factura) o en el "
-"processament de l'albarà (excepció d'enviament).\n"
-"L'estat 'Esperant planificació' s'estableix quan es confirma la factura, "
-"però està esperant que el planificador l'activi en la data de \"Data "
-"ordenada\"."
#. module: sale
#: field:sale.order,invoice_quantity:0
@@ -1473,7 +1635,6 @@ msgid "Product UoS"
msgstr "UdV del producte"
#. module: sale
-#: selection:sale.order,state:0
#: selection:sale.report,state:0
msgid "Manual In Progress"
msgstr "Manual en procés"
@@ -1494,7 +1655,8 @@ msgid "Order"
msgstr "Comanda"
#. module: sale
-#: code:addons/sale/sale.py:921
+#: code:addons/sale/sale.py:1016
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:71
#, python-format
msgid "There is no income account defined for this product: \"%s\" (id:%d)"
msgstr ""
@@ -1519,7 +1681,7 @@ msgstr ""
"comercial."
#. module: sale
-#: code:addons/sale/sale.py:1116
+#: code:addons/sale/sale.py:1238
#, python-format
msgid ""
"You plan to sell %.2f %s but you only have %.2f %s available !\n"
@@ -1550,11 +1712,10 @@ msgid "Total"
msgstr "Total"
#. module: sale
-#: code:addons/sale/sale.py:388
-#, python-format
-msgid "There is no sales journal defined for this company: \"%s\" (id:%d)"
-msgstr ""
-"No s'ha definit un diari de vendes per a aquesta companyia: \"%s\" (id:%d)"
+#: report:sale.order:0
+#: view:sale.order.line:0
+msgid "Price"
+msgstr "Preu"
#. module: sale
#: model:process.transition,note:sale.process_transition_deliver0
@@ -1568,10 +1729,15 @@ msgstr ""
"forma manual o automàtica."
#. module: sale
-#: code:addons/sale/sale.py:1165
-#, python-format
-msgid "Cannot delete a sales order line which is %s !"
-msgstr "No es pot eliminar una línia de comanda de venda que està %s!"
+#: selection:sale.order,order_policy:0
+msgid "Pay before delivery"
+msgstr ""
+
+#. module: sale
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.open_board_sales
+msgid "Sales Dashboard"
+msgstr ""
#. module: sale
#: model:ir.actions.act_window,name:sale.action_sale_order_make_invoice
@@ -1582,6 +1748,7 @@ msgstr "Realitza factures"
#. module: sale
#: view:sale.order:0
+#: selection:sale.order,state:0
#: view:sale.order.line:0
msgid "To Invoice"
msgstr "Per facturar"
@@ -1592,6 +1759,11 @@ msgid "Date on which sales order is confirmed."
msgstr "Data en la qual es confirma la comanda de venda."
#. module: sale
+#: field:sale.order,project_id:0
+msgid "Contract/Analytic Account"
+msgstr ""
+
+#. module: sale
#: field:sale.order,company_id:0
#: field:sale.order.line,company_id:0
#: view:sale.report:0
@@ -1611,10 +1783,12 @@ msgid "The amount to be invoiced in advance."
msgstr "L'import a facturar per endavant."
#. module: sale
-#: selection:sale.order,state:0
-#: selection:sale.report,state:0
-msgid "Invoice Exception"
-msgstr "Excepció de factura"
+#: code:addons/sale/sale.py:1256
+#, python-format
+msgid ""
+"Couldn't find a pricelist line matching this product and quantity.\n"
+"You have to change either the product, the quantity or the pricelist."
+msgstr ""
#. module: sale
#: help:sale.order,picking_ids:0
@@ -1625,15 +1799,6 @@ msgstr ""
"de venda."
#. module: sale
-#: help:sale.installer,sale_margin:0
-msgid ""
-"Gives the margin of profitability by calculating the difference between Unit "
-"Price and Cost Price."
-msgstr ""
-"Indica el marge de rendibilitat mitjançant el càlcul de la diferència entre "
-"el preu unitari i el preu de cost."
-
-#. module: sale
#: view:sale.make.invoice:0
#: view:sale.order.line.make.invoice:0
msgid "Create invoices"
@@ -1652,6 +1817,11 @@ msgid "Cancelled"
msgstr "Cancel·lada"
#. module: sale
+#: view:sale.order.line:0
+msgid "Sales Order Lines related to a Sales Order of mine"
+msgstr ""
+
+#. module: sale
#: model:ir.actions.act_window,name:sale.action_shop_form
#: model:ir.ui.menu,name:sale.menu_action_shop_form
#: field:sale.order,shop_id:0
@@ -1661,17 +1831,12 @@ msgid "Shop"
msgstr "Tenda"
#. module: sale
-#: view:sale.report:0
-msgid " Month "
-msgstr " Mes "
-
-#. module: sale
#: field:sale.report,date_confirm:0
msgid "Date Confirm"
msgstr "Data de confirmació"
#. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:111
+#: code:addons/sale/wizard/sale_line_invoice.py:113
#, python-format
msgid "Warning"
msgstr "Avís"
@@ -1683,22 +1848,6 @@ msgid "Sales by Month"
msgstr "Vendes per mes"
#. module: sale
-#: code:addons/sale/sale.py:1045
-#, python-format
-msgid ""
-"You selected a quantity of %d Units.\n"
-"But it's not compatible with the selected packaging.\n"
-"Here is a proposition of quantities according to the packaging:\n"
-"\n"
-"EAN: %s Quantity: %s Type of ul: %s"
-msgstr ""
-"Heu seleccionat una quantitat de %d unitats.\n"
-"Però no és compatible amb l'embalatge seleccionat.\n"
-"Aquí teniu una proposta de quantitats d'acord amb aquest embalatge:\n"
-"\n"
-"EAN: %s Quantitat: %s Tipus de ul: %s"
-
-#. module: sale
#: model:ir.model,name:sale.model_sale_order
#: model:process.node,name:sale.process_node_order0
#: model:process.node,name:sale.process_node_saleorder0
@@ -1714,6 +1863,11 @@ msgid "Quantity (UoS)"
msgstr "Quantitat (UdV)"
#. module: sale
+#: view:sale.order.line:0
+msgid "Sale Order Lines that are in 'done' state"
+msgstr ""
+
+#. module: sale
#: model:process.transition,note:sale.process_transition_packing0
msgid ""
"The Pick List form is created as soon as the sales order is confirmed, in "
@@ -1732,6 +1886,11 @@ msgid "Confirmed"
msgstr "Confirmada"
#. module: sale
+#: field:sale.config.picking_policy,order_policy:0
+msgid "Main Method Based On"
+msgstr ""
+
+#. module: sale
#: model:process.transition.action,name:sale.process_transition_action_confirm0
msgid "Confirm"
msgstr "Confirma"
@@ -1754,6 +1913,7 @@ msgid "Invoice Lines"
msgstr "Línies de factura"
#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_product_tree
#: view:sale.order:0
#: view:sale.order.line:0
msgid "Sales Order Lines"
@@ -1770,33 +1930,18 @@ msgid "Configuration"
msgstr "Configuració"
#. module: sale
-#: selection:sale.order,picking_policy:0
-msgid "Complete Delivery"
-msgstr "Enviament complet"
+#: code:addons/sale/edi/sale_order.py:146
+#, python-format
+msgid "EDI Pricelist (%s)"
+msgstr ""
#. module: sale
#: view:sale.report:0
-msgid " Month-1 "
-msgstr " Mes-1 "
-
-#. module: sale
-#: help:sale.config.picking_policy,picking_policy:0
-msgid ""
-"The Shipping Policy is used to configure per order if you want to deliver as "
-"soon as possible when one product is available or you wait that all products "
-"are available.."
+msgid "Sales order created in current year"
msgstr ""
-"La política d'enviament s'utilitza per configurar la comanda si s'ha de "
-"lliurar tan aviat com sigui possible quan un producte està disponible o heu "
-"d'esperar a que tots els productes estiguin disponibles."
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "August"
-msgstr "Agost"
#. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:111
+#: code:addons/sale/wizard/sale_line_invoice.py:113
#, python-format
msgid ""
"Invoice cannot be created for this Sales Order Line due to one of the "
@@ -1811,6 +1956,11 @@ msgstr ""
"2. La línia de la comanda de venda està facturada."
#. module: sale
+#: view:sale.order.line:0
+msgid "Sale order lines done"
+msgstr ""
+
+#. module: sale
#: field:sale.order.line,th_weight:0
msgid "Weight"
msgstr "Pes"
@@ -1829,7 +1979,6 @@ msgstr "Desembre"
#. module: sale
#: field:sale.config.picking_policy,config_logo:0
-#: field:sale.installer,config_logo:0
msgid "Image"
msgstr "Imatge"
@@ -1862,9 +2011,9 @@ msgid "Salesman"
msgstr "Comercial"
#. module: sale
-#: model:process.node,note:sale.process_node_saleorder0
-msgid "Drives procurement and invoicing"
-msgstr "Genera proveïment i facturació"
+#: model:ir.actions.act_window,name:sale.action_order_tree
+msgid "Old Quotations"
+msgstr "Pressupostos antics"
#. module: sale
#: field:sale.order,amount_untaxed:0
@@ -1872,7 +2021,7 @@ msgid "Untaxed Amount"
msgstr "Base imposable"
#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:163
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:170
#: model:ir.actions.act_window,name:sale.action_view_sale_advance_payment_inv
#: view:sale.advance.payment.inv:0
#: view:sale.order:0
@@ -1881,7 +2030,7 @@ msgid "Advance Invoice"
msgstr "Avança factura"
#. module: sale
-#: code:addons/sale/sale.py:591
+#: code:addons/sale/sale.py:624
#, python-format
msgid "The sales order '%s' has been cancelled."
msgstr "La comanda de venda '%s' ha estat cancel·lada."
@@ -1926,20 +2075,20 @@ msgid "Packings"
msgstr "Albarans"
#. module: sale
-#: field:sale.config.picking_policy,progress:0
-#: field:sale.installer,progress:0
-msgid "Configuration Progress"
-msgstr "Progrés de la configuració"
+#: view:sale.order.line:0
+msgid "Sale Order Lines ready to be invoiced"
+msgstr ""
#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_product_tree
-msgid "Product sales"
-msgstr "Vendes de producte"
+#: view:sale.report:0
+msgid "Sales order created in last month"
+msgstr ""
#. module: sale
-#: field:sale.order,date_order:0
-msgid "Ordered Date"
-msgstr "Data ordenada"
+#: model:ir.actions.act_window,name:sale.action_email_templates
+#: model:ir.ui.menu,name:sale.menu_email_templates
+msgid "Email Templates"
+msgstr ""
#. module: sale
#: model:ir.actions.act_window,name:sale.action_order_form
@@ -1949,14 +2098,15 @@ msgid "Sales Orders"
msgstr "Comandes de venda"
#. module: sale
-#: selection:sale.config.picking_policy,picking_policy:0
-msgid "Direct Delivery"
-msgstr "Enviament directe"
+#: model:ir.model,name:sale.model_sale_shop
+#: view:sale.shop:0
+msgid "Sales Shop"
+msgstr "Tenda vendes"
#. module: sale
-#: field:sale.installer,sale_journal:0
-msgid "Invoicing journals"
-msgstr "Diaris de facturació"
+#: selection:sale.report,month:0
+msgid "November"
+msgstr "Novembre"
#. module: sale
#: field:sale.advance.payment.inv,product_id:0
@@ -1964,18 +2114,12 @@ msgid "Advance Product"
msgstr "Producte avançat"
#. module: sale
-#: view:sale.report:0
-#: field:sale.report,shipped_qty_1:0
-msgid "Shipped Qty"
-msgstr "Qtat enviada"
-
-#. module: sale
-#: view:sale.open.invoice:0
-msgid "You invoice has been successfully created!"
-msgstr "La factura s'ha creat correctament!"
+#: view:sale.order:0
+msgid "Compute"
+msgstr "Calcula"
#. module: sale
-#: code:addons/sale/sale.py:585
+#: code:addons/sale/sale.py:618
#, python-format
msgid "You must first cancel all invoices attached to this sales order."
msgstr ""
@@ -1988,25 +2132,16 @@ msgid "January"
msgstr "Gener"
#. module: sale
-#: view:sale.installer:0
-msgid "Configure Your Sales Management Application"
-msgstr "Configura la vostra aplicació de gestió de vendes"
-
-#. module: sale
#: model:ir.actions.act_window,name:sale.action_order_tree4
msgid "Sales Order in Progress"
msgstr "Comanda de venda en procés"
#. module: sale
-#: field:sale.installer,sale_layout:0
-msgid "Sales Order Layout Improvement"
-msgstr "Millora plantilla comanda de venda"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:63
-#, python-format
-msgid "Error"
-msgstr "Error"
+#: help:sale.order,origin:0
+msgid "Reference of the document that generated this sales order request."
+msgstr ""
+"Referència del document que ha generat aquesta sol·licitud de comanda de "
+"venda."
#. module: sale
#: view:sale.report:0
@@ -2015,6 +2150,11 @@ msgid "Commitment Delay"
msgstr "Retard realització"
#. module: sale
+#: selection:sale.order,order_policy:0
+msgid "Deliver & invoice on demand"
+msgstr ""
+
+#. module: sale
#: model:process.node,note:sale.process_node_saleprocurement0
msgid ""
"One Procurement order for each sales order line and for each of the "
@@ -2039,13 +2179,12 @@ msgid "Confirmed sales order to invoice."
msgstr "Comanda de venda confirmada a facturar"
#. module: sale
-#: code:addons/sale/sale.py:290
-#, python-format
-msgid "Cannot delete Sales Order(s) which are already confirmed !"
-msgstr "No podeu eliminar comanda(es) de venda que ja han estat confirmades!"
+#: view:sale.order:0
+msgid "Sales Order that haven't yet been confirmed"
+msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:316
+#: code:addons/sale/sale.py:322
#, python-format
msgid "The sales order '%s' has been set in draft state."
msgstr "La comanda de venda '%s' ha estat canviada a estat esborrany."
@@ -2056,37 +2195,27 @@ msgid "from stock"
msgstr "des d'estoc"
#. module: sale
-#: field:sale.config.picking_policy,order_policy:0
-msgid "Shipping Default Policy"
-msgstr "Política de facturació per defecte"
-
-#. module: sale
#: view:sale.open.invoice:0
msgid "Close"
msgstr "Tanca"
#. module: sale
+#: code:addons/sale/sale.py:1248
+#, python-format
+msgid "No Pricelist ! : "
+msgstr ""
+
+#. module: sale
#: field:sale.order,shipped:0
msgid "Delivered"
msgstr "Lliurat"
#. module: sale
-#: code:addons/sale/sale.py:1115
-#, python-format
-msgid "Not enough stock !"
-msgstr "No hi ha estoc suficient!"
-
-#. module: sale
#: constraint:stock.move:0
msgid "You must assign a production lot for this product"
msgstr "Heu d'assignar un lot de producció per a aquest producte"
#. module: sale
-#: field:sale.order.line,sequence:0
-msgid "Layout Sequence"
-msgstr "Seqüencia plantilla"
-
-#. module: sale
#: model:ir.actions.act_window,help:sale.action_shop_form
msgid ""
"If you have more than one shop reselling your company products, you can "
@@ -2118,12 +2247,6 @@ msgid "May"
msgstr "Maig"
#. module: sale
-#: help:sale.installer,sale_order_dates:0
-msgid "Adds commitment, requested and effective dates on Sales Orders."
-msgstr ""
-"Afegeix dates de realització, sol·licitud i efectiu en comandes de venda."
-
-#. module: sale
#: view:sale.order:0
#: field:sale.order,partner_id:0
#: field:sale.order.line,order_partner_id:0
@@ -2131,25 +2254,11 @@ msgid "Customer"
msgstr "Client"
#. module: sale
-#: model:product.template,name:sale.advance_product_0_product_template
-msgid "Advance"
-msgstr "Bestreta"
-
-#. module: sale
#: selection:sale.report,month:0
msgid "February"
msgstr "Febrer"
#. module: sale
-#: help:sale.installer,sale_journal:0
-msgid ""
-"Allows you to group and invoice your delivery orders according to different "
-"invoicing types: daily, weekly, etc."
-msgstr ""
-"Permet agrupar i facturar els vostres albarans d'acord a diferents tipus de "
-"facturació: diària, setmanal, etc."
-
-#. module: sale
#: selection:sale.report,month:0
msgid "April"
msgstr "Abril"
@@ -2160,11 +2269,6 @@ msgid "Accounting"
msgstr "Comptabilitat"
#. module: sale
-#: field:sale.config.picking_policy,step:0
-msgid "Steps To Deliver a Sales Order"
-msgstr "Passos per lliurar una comanda de venda"
-
-#. module: sale
#: view:sale.order:0
#: view:sale.order.line:0
msgid "Search Sales Order"
@@ -2176,20 +2280,18 @@ msgid "Sales Order Requisition"
msgstr "Sol·licitud comanda de venda"
#. module: sale
+#: code:addons/sale/sale.py:1242
+#, python-format
+msgid "Not enough stock ! : "
+msgstr ""
+
+#. module: sale
#: report:sale.order:0
#: field:sale.order,payment_term:0
msgid "Payment Term"
msgstr "Termini de pagament"
#. module: sale
-#: help:sale.installer,sale_layout:0
-msgid ""
-"Provides some features to improve the layout of the Sales Order reports."
-msgstr ""
-"Proporciona algunes funcionalitats per millorar la plantilla dels informes "
-"de comandes de vendes."
-
-#. module: sale
#: model:ir.actions.act_window,help:sale.action_order_report_all
msgid ""
"This report performs analysis on your quotations and sales orders. Analysis "
@@ -2230,6 +2332,9 @@ msgstr "Factura des d'albarans"
#~ msgid "Configure Sale Order Logistic"
#~ msgstr "Configureu la logística de les comandes de venda"
+#~ msgid "Partial Delivery"
+#~ msgstr "Enviament parcial"
+
#~ msgid "Recreate Procurement"
#~ msgstr "Recrea proveïment"
@@ -2275,6 +2380,9 @@ msgstr "Factura des d'albarans"
#~ msgid "Reference"
#~ msgstr "Referència"
+#~ msgid "All at Once"
+#~ msgstr "Tot a la vegada"
+
#~ msgid "Procurement is created after confirmation of sale order."
#~ msgstr "El proveïment es creat després de confirmar una comanda de venda."
@@ -2330,6 +2438,9 @@ msgstr "Factura des d'albarans"
#~ "Quan seleccioneu una política de enviament = 'Factura automàtica després de "
#~ "l'enviament', la crearà automàticament després de l'enviament."
+#~ msgid "Complete Delivery"
+#~ msgstr "Enviament complet"
+
#~ msgid "Manual Description"
#~ msgstr "Descripció manual"
@@ -2372,9 +2483,6 @@ msgstr "Factura des d'albarans"
#~ msgid "Procurement for each line"
#~ msgstr "Proveïment per a cada línia"
-#~ msgid "My Quotations"
-#~ msgstr "Els meus pressuposts"
-
#~ msgid "Manages the delivery and invoicing progress"
#~ msgstr "Gestiona el progrés d'enviament i facturació"
@@ -2416,9 +2524,15 @@ msgstr "Factura des d'albarans"
#~ msgid "Procurement Corrected"
#~ msgstr "Proveïment corregit"
+#~ msgid "Shipping & Manual Invoice"
+#~ msgstr "Enviar & Factura manual"
+
#~ msgid "Sale Procurement"
#~ msgstr "Proveïment de venda"
+#~ msgid "Product sales"
+#~ msgstr "Vendes de producte"
+
#~ msgid "Our Salesman"
#~ msgstr "El nostre comercial"
@@ -2434,6 +2548,9 @@ msgstr "Factura des d'albarans"
#~ msgid "Sale Pricelists"
#~ msgstr "Tarifes de venda"
+#~ msgid "Direct Delivery"
+#~ msgstr "Enviament directe"
+
#~ msgid ""
#~ "Invoice is created when 'Create Invoice' is being clicked after confirming "
#~ "the sale order. This transaction moves the sale order to invoices."
@@ -2445,6 +2562,9 @@ msgstr "Factura des d'albarans"
#~ msgid "Make Invoice"
#~ msgstr "Crea factura"
+#~ msgid "Delivery Order Only"
+#~ msgstr "Només ordre d'enviament"
+
#~ msgid "Sales order lines"
#~ msgstr "Línies de la comanda de venda"
@@ -2546,6 +2666,9 @@ msgstr "Factura des d'albarans"
#~ msgid "Related invoices"
#~ msgstr "Factures relacionades"
+#~ msgid "Payment Before Delivery"
+#~ msgstr "Pagament abans de l'enviament"
+
#~ msgid ""
#~ "This is the list of invoices that have been generated for this sale order. "
#~ "The same sale order may have been invoiced in several times (by line for "
@@ -2615,9 +2738,18 @@ msgstr "Factura des d'albarans"
#~ "confirma la factura però s'espera que el planificador processi la comanda en "
#~ "la data 'Data de la comanda'."
+#~ msgid "Shipping Policy"
+#~ msgstr "Política de facturació"
+
#~ msgid "Packing Default Policy"
#~ msgstr "Política d'enviament per defecte"
+#~ msgid "Shipping Default Policy"
+#~ msgstr "Política de facturació per defecte"
+
+#~ msgid "Sales Management"
+#~ msgstr "Vendes"
+
#~ msgid "Status"
#~ msgstr "Estat"
@@ -2663,3 +2795,264 @@ msgstr "Factura des d'albarans"
#~ "processin.\n"
#~ " - L'opció 'Factura des de albarà' s'utilitza per crear una factura durant "
#~ "el procés dels albarans."
+
+#~ msgid "Configure Sales Order Logistics"
+#~ msgstr "Configura la logística de les comandes de venda"
+
+#~ msgid "Configure Picking Policy for Sales Order"
+#~ msgstr "Configura la política enviament per a comandes de venda"
+
+#~ msgid "Configure"
+#~ msgstr "Configuració"
+
+#~ msgid "Order Reference must be unique !"
+#~ msgstr "La referència de la comanda ha de ser única!"
+
+#~ msgid " Year "
+#~ msgstr " Any "
+
+#~ msgid "Picking Default Policy"
+#~ msgstr "Política d'empaquetat per defecte"
+
+#~ msgid "Sales Order Dates"
+#~ msgstr "Dates en comandes de venda"
+
+#~ msgid "Margins in Sales Orders"
+#~ msgstr "Marges en comandes de venda"
+
+#~ msgid "Sales Application Configuration"
+#~ msgstr "Configuració d'aplicacions de vendes"
+
+#, python-format
+#~ msgid "You cannot cancel a sales order line that has already been invoiced !"
+#~ msgstr ""
+#~ "No podeu cancel·lar una línia de comanda de venda que ja ha estat facturada!"
+
+#~ msgid "Delivery Costs"
+#~ msgstr "Costos d'enviament"
+
+#~ msgid "title"
+#~ msgstr "títol"
+
+#~ msgid "Order date"
+#~ msgstr "Data de comanda"
+
+#, python-format
+#~ msgid "Picking Information !"
+#~ msgstr "Informació d'albarà!"
+
+#~ msgid "Invoice From The Picking"
+#~ msgstr "Factura des de l'albarà"
+
+#~ msgid "Picking List & Delivery Order"
+#~ msgstr "Albarà i Ordre de lliurament"
+
+#~ msgid "sale.installer"
+#~ msgstr "venda.instal·lador"
+
+#~ msgid ""
+#~ "Gives the state of the quotation or sales order. \n"
+#~ "The exception state is automatically set when a cancel operation occurs in "
+#~ "the invoice validation (Invoice Exception) or in the picking list process "
+#~ "(Shipping Exception). \n"
+#~ "The 'Waiting Schedule' state is set when the invoice is confirmed but "
+#~ "waiting for the scheduler to run on the date 'Ordered Date'."
+#~ msgstr ""
+#~ "Indica l'estat del pressupost o comanda de venda. \n"
+#~ "L'estat d'excepció s'estableix automàticament quan es produeix una operació "
+#~ "de cancel·lació en la validació de factura (excepció de factura) o en el "
+#~ "processament de l'albarà (excepció d'enviament).\n"
+#~ "L'estat 'Esperant planificació' s'estableix quan es confirma la factura, "
+#~ "però està esperant que el planificador l'activi en la data de \"Data "
+#~ "ordenada\"."
+
+#~ msgid "Invoicing"
+#~ msgstr "Facturació"
+
+#, python-format
+#~ msgid "Cannot delete a sales order line which is %s !"
+#~ msgstr "No es pot eliminar una línia de comanda de venda que està %s!"
+
+#~ msgid ""
+#~ "Gives the margin of profitability by calculating the difference between Unit "
+#~ "Price and Cost Price."
+#~ msgstr ""
+#~ "Indica el marge de rendibilitat mitjançant el càlcul de la diferència entre "
+#~ "el preu unitari i el preu de cost."
+
+#~ msgid " Month "
+#~ msgstr " Mes "
+
+#, python-format
+#~ msgid ""
+#~ "You selected a quantity of %d Units.\n"
+#~ "But it's not compatible with the selected packaging.\n"
+#~ "Here is a proposition of quantities according to the packaging:\n"
+#~ "\n"
+#~ "EAN: %s Quantity: %s Type of ul: %s"
+#~ msgstr ""
+#~ "Heu seleccionat una quantitat de %d unitats.\n"
+#~ "Però no és compatible amb l'embalatge seleccionat.\n"
+#~ "Aquí teniu una proposta de quantitats d'acord amb aquest embalatge:\n"
+#~ "\n"
+#~ "EAN: %s Quantitat: %s Tipus de ul: %s"
+
+#~ msgid " Month-1 "
+#~ msgstr " Mes-1 "
+
+#~ msgid "Ordered Date"
+#~ msgstr "Data ordenada"
+
+#~ msgid "Configuration Progress"
+#~ msgstr "Progrés de la configuració"
+
+#~ msgid "Invoicing journals"
+#~ msgstr "Diaris de facturació"
+
+#~ msgid "Sales Order Layout Improvement"
+#~ msgstr "Millora plantilla comanda de venda"
+
+#~ msgid "Shipped Qty"
+#~ msgstr "Qtat enviada"
+
+#, python-format
+#~ msgid "Not enough stock !"
+#~ msgstr "No hi ha estoc suficient!"
+
+#~ msgid "Layout Sequence"
+#~ msgstr "Seqüencia plantilla"
+
+#, python-format
+#~ msgid "Cannot delete Sales Order(s) which are already confirmed !"
+#~ msgstr "No podeu eliminar comanda(es) de venda que ja han estat confirmades!"
+
+#~ msgid ""
+#~ "Provides some features to improve the layout of the Sales Order reports."
+#~ msgstr ""
+#~ "Proporciona algunes funcionalitats per millorar la plantilla dels informes "
+#~ "de comandes de vendes."
+
+#~ msgid "Adds commitment, requested and effective dates on Sales Orders."
+#~ msgstr ""
+#~ "Afegeix dates de realització, sol·licitud i efectiu en comandes de venda."
+
+#~ msgid "Advance"
+#~ msgstr "Bestreta"
+
+#~ msgid "Steps To Deliver a Sales Order"
+#~ msgstr "Passos per lliurar una comanda de venda"
+
+#~ msgid ""
+#~ "The Shipping Policy is used to synchronise invoice and delivery operations.\n"
+#~ " - The 'Pay Before delivery' choice will first generate the invoice and "
+#~ "then generate the picking order after the payment of this invoice.\n"
+#~ " - The 'Shipping & Manual Invoice' will create the picking order directly "
+#~ "and wait for the user to manually click on the 'Invoice' button to generate "
+#~ "the draft invoice.\n"
+#~ " - The 'Invoice On Order After Delivery' choice will generate the draft "
+#~ "invoice based on sales order after all picking lists have been finished.\n"
+#~ " - The 'Invoice From The Picking' choice is used to create an invoice "
+#~ "during the picking process."
+#~ msgstr ""
+#~ "La política d'enviament s'utilitza per sincronitzar les operacions "
+#~ "d'enviament i facturació.\n"
+#~ " -L'opció 'Paga abans de l'enviament' primer generarà la factura i més tard "
+#~ "l'albarà, després del pagament d'aquesta factura.\n"
+#~ " -L'opció 'Enviament i factura manual' crearà l'albarà directament i "
+#~ "esperarà al fet que un usuari faci clic manualment sobre el botó 'Factura' "
+#~ "per generar la factura en l'estat esborrany.\n"
+#~ " -L'opció 'Factura comanda després de l'enviament' generarà la factura en "
+#~ "estat esborrany basant-se en la comanda de venda després que tots els "
+#~ "albarans hagin estat realitzats.\n"
+#~ " -L'opció 'Factura des d'albarà' s'utilitza per crear una factura durant el "
+#~ "procés de preparació de la comanda."
+
+#~ msgid "Allows you to compute delivery costs on your quotations."
+#~ msgstr "Us permet calcular els costos d'enviament als vostres pressupostos."
+
+#~ msgid "Enhance your core Sales Application with additional functionalities."
+#~ msgstr ""
+#~ "Optimitza la vostra aplicació de vendes amb funcionalitats addicionals."
+
+#~ msgid "Setup your sales workflow and default values."
+#~ msgstr "Configura el vostre flux de vendes i valors per defecte."
+
+#~ msgid "Invoice On Order After Delivery"
+#~ msgstr "Factura comanda després de l'enviament"
+
+#~ msgid ""
+#~ "\n"
+#~ " The base module to manage quotations and sales orders.\n"
+#~ "\n"
+#~ " * Workflow with validation steps:\n"
+#~ " - Quotation -> Sales order -> Invoice\n"
+#~ " * Invoicing methods:\n"
+#~ " - Invoice on order (before or after shipping)\n"
+#~ " - Invoice on delivery\n"
+#~ " - Invoice on timesheets\n"
+#~ " - Advance invoice\n"
+#~ " * Partners preferences (shipping, invoicing, incoterm, ...)\n"
+#~ " * Products stocks and prices\n"
+#~ " * Delivery methods:\n"
+#~ " - all at once, multi-parcel\n"
+#~ " - delivery costs\n"
+#~ " * Dashboard for salesman that includes:\n"
+#~ " * Your open quotations\n"
+#~ " * Top 10 sales of the month\n"
+#~ " * Cases statistics\n"
+#~ " * Graph of sales by product\n"
+#~ " * Graph of cases of the month\n"
+#~ " "
+#~ msgstr ""
+#~ "\n"
+#~ " El mòdul bàsic per gestionar pressupostos i comandes de venda.\n"
+#~ "\n"
+#~ "* Flux de treball amb etapes de validació:\n"
+#~ "- Pressupost -> Comanda de venda -> Factura\n"
+#~ "* Mètodes de facturació:\n"
+#~ "- Factura de la comanda (abans o després de l'enviament)\n"
+#~ "- Factura de l'albarà\n"
+#~ "- Factura del full de serveis\n"
+#~ "- Avançar factura\n"
+#~ "* Preferències dels clients (enviament, facturació, incoterm, ...)\n"
+#~ "* Existències dels productes i preus\n"
+#~ "* Formes d'enviament:\n"
+#~ "- Tot alhora, En diversos paquets\n"
+#~ "- Despeses d'enviament\n"
+#~ "* El quadre per al comercial inclou:\n"
+#~ "* Els vostres pressupostos oberts\n"
+#~ "* Les 10 millors vendes del mes\n"
+#~ "* Estadístiques de casos\n"
+#~ "* Gràfic de les vendes per producte\n"
+#~ "* Gràfic dels casos per mes\n"
+#~ " "
+
+#~ msgid ""
+#~ "By default, OpenERP is able to manage complex routing and paths of products "
+#~ "in your warehouse and partner locations. This will configure the most common "
+#~ "and simple methods to deliver products to the customer in one or two "
+#~ "operations by the worker."
+#~ msgstr ""
+#~ "Per defecte, OpenERP és capaç de gestionar complexes rutes i camins dels "
+#~ "productes en el vostre magatzem i en les ubicacions d'altres empreses. Això "
+#~ "configurarà els mètodes més comuns i senzills per lliurar els productes al "
+#~ "client en una o dues operacions realitzades pel treballador."
+
+#~ msgid "Configure Your Sales Management Application"
+#~ msgstr "Configura la vostra aplicació de gestió de vendes"
+
+#~ msgid ""
+#~ "Allows you to group and invoice your delivery orders according to different "
+#~ "invoicing types: daily, weekly, etc."
+#~ msgstr ""
+#~ "Permet agrupar i facturar els vostres albarans d'acord a diferents tipus de "
+#~ "facturació: diària, setmanal, etc."
+
+#~ msgid ""
+#~ "The Shipping Policy is used to configure per order if you want to deliver as "
+#~ "soon as possible when one product is available or you wait that all products "
+#~ "are available.."
+#~ msgstr ""
+#~ "La política d'enviament s'utilitza per configurar la comanda si s'ha de "
+#~ "lliurar tan aviat com sigui possible quan un producte està disponible o heu "
+#~ "d'esperar a que tots els productes estiguin disponibles."
diff --git a/addons/sale/i18n/cs.po b/addons/sale/i18n/cs.po
index 86f3ad30352..0aad0c6f92e 100644
--- a/addons/sale/i18n/cs.po
+++ b/addons/sale/i18n/cs.po
@@ -6,29 +6,36 @@ msgid ""
msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2011-01-11 11:16+0000\n"
+"POT-Creation-Date: 2011-12-22 18:43+0000\n"
"PO-Revision-Date: 2010-08-03 08:32+0000\n"
"Last-Translator: Mantavya Gajjar (Open ERP) <Unknown>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-05 05:16+0000\n"
-"X-Generator: Launchpad (build 14231)\n"
+"X-Launchpad-Export-Date: 2011-12-23 06:46+0000\n"
+"X-Generator: Launchpad (build 14560)\n"
"X-Poedit-Language: Czech\n"
#. module: sale
+#: field:sale.config.picking_policy,timesheet:0
+msgid "Based on Timesheet"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid ""
+"Sale Order Lines that are confirmed, done or in exception state and haven't "
+"yet been invoiced"
+msgstr ""
+
+#. module: sale
#: view:board.board:0
#: model:ir.actions.act_window,name:sale.action_sales_by_salesman
msgid "Sales by Salesman in last 90 days"
msgstr "Prodeje podle Prodejce v posledních 90 dnech"
#. module: sale
-#: help:sale.installer,delivery:0
-msgid "Allows you to compute delivery costs on your quotations."
-msgstr "Povolí vám spočítat cenu doručení při vašem ocenění."
-
-#. module: sale
#: help:sale.order,picking_policy:0
msgid ""
"If you don't have enough stock available to deliver all at once, do you "
@@ -36,6 +43,11 @@ msgid ""
msgstr ""
#. module: sale
+#: view:sale.order:0
+msgid "UoS"
+msgstr ""
+
+#. module: sale
#: help:sale.order,partner_shipping_id:0
msgid "Shipping address for current sales order."
msgstr "Dodací adresa aktuální prodejní objednávky."
@@ -59,22 +71,12 @@ msgid "Cancel Order"
msgstr "Zrušit objednávku"
#. module: sale
-#: view:sale.config.picking_policy:0
-msgid "Configure Sales Order Logistics"
-msgstr "Nastavit logistiku prodejní objednávky"
-
-#. module: sale
-#: code:addons/sale/sale.py:603
+#: code:addons/sale/sale.py:638
#, python-format
msgid "The quotation '%s' has been converted to a sales order."
msgstr "Ocenění '%s' bylo převedeno na prodejní objednávku."
#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Payment Before Delivery"
-msgstr "Platba před doručením"
-
-#. module: sale
#: code:addons/sale/wizard/sale_make_invoice.py:42
#, python-format
msgid "Warning !"
@@ -91,12 +93,6 @@ msgid "Drives procurement orders for every sales order line."
msgstr "Řídí příkazy zásobování pro každý řádek prodejní objednávky"
#. module: sale
-#: selection:sale.config.picking_policy,picking_policy:0
-msgid "All at Once"
-msgstr "Vše najednou"
-
-#. module: sale
-#: field:sale.order,project_id:0
#: view:sale.report:0
#: field:sale.report,analytic_account_id:0
#: field:sale.shop,project_id:0
@@ -112,6 +108,15 @@ msgid ""
msgstr ""
#. module: sale
+#: code:addons/sale/sale.py:295
+#, python-format
+msgid ""
+"In order to delete a confirmed sale order, you must cancel it before ! To "
+"cancel a sale order, you must first cancel related picking or delivery "
+"orders."
+msgstr ""
+
+#. module: sale
#: model:process.node,name:sale.process_node_saleprocurement0
msgid "Procurement Order"
msgstr "Zásobovací příkaz"
@@ -123,6 +128,11 @@ msgid "Partner"
msgstr "Partner"
#. module: sale
+#: selection:sale.order,order_policy:0
+msgid "Invoice based on deliveries"
+msgstr ""
+
+#. module: sale
#: view:sale.order:0
msgid "Order Line"
msgstr "Řádek objednávky"
@@ -155,9 +165,14 @@ msgid "Default Payment Term"
msgstr "Výchozí datum splatnosti"
#. module: sale
-#: model:ir.actions.act_window,name:sale.action_config_picking_policy
-msgid "Configure Picking Policy for Sales Order"
-msgstr "Nastavit politiku navádění pro prodejní objednávku"
+#: field:sale.config.picking_policy,deli_orders:0
+msgid "Based on Delivery Orders"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.picking_policy,time_unit:0
+msgid "Main Working Time Unit"
+msgstr ""
#. module: sale
#: view:sale.order:0
@@ -173,9 +188,10 @@ msgid "Disc.(%)"
msgstr "Slev.(%)"
#. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_forceassignation0
-msgid "Force Assignation"
-msgstr "Vynutit přiřazení"
+#: view:sale.report:0
+#: field:sale.report,price_total:0
+msgid "Total Price"
+msgstr "Celková cena"
#. module: sale
#: help:sale.make.invoice,grouped:0
@@ -183,6 +199,11 @@ msgid "Check the box to group the invoices for the same customers"
msgstr "Zaškrtněte políčko pro seskupení faktůr pro stejného zákazníka"
#. module: sale
+#: view:sale.order:0
+msgid "My Sale Orders"
+msgstr ""
+
+#. module: sale
#: selection:sale.order,invoice_quantity:0
msgid "Ordered Quantities"
msgstr "Objednané množství"
@@ -221,14 +242,25 @@ msgid ""
msgstr ""
#. module: sale
+#: field:sale.config.picking_policy,task_work:0
+msgid "Based on Tasks' Work"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
+msgid "Quotations and Sales"
+msgstr ""
+
+#. module: sale
#: model:ir.model,name:sale.model_sale_make_invoice
msgid "Sales Make Invoice"
msgstr ""
#. module: sale
-#: view:sale.order:0
-msgid "Recreate Packing"
-msgstr "Znovu vytvořit balení"
+#: code:addons/sale/sale.py:330
+#, python-format
+msgid "Pricelist Warning!"
+msgstr ""
#. module: sale
#: field:sale.order.line,discount:0
@@ -236,9 +268,9 @@ msgid "Discount (%)"
msgstr "Sleva (%)"
#. module: sale
-#: help:res.company,security_lead:0
-msgid ""
-"This is the days added to what you promise to customers for security purpose"
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_quotation_for_sale
+msgid "My Quotations"
msgstr ""
#. module: sale
@@ -264,7 +296,22 @@ msgid "Shop Name"
msgstr "Jméno obchodu"
#. module: sale
-#: code:addons/sale/sale.py:1014
+#: help:sale.order,order_policy:0
+msgid ""
+"The Invoice Policy is used to synchronise invoice and delivery operations.\n"
+" - The 'Pay before delivery' choice will first generate the invoice and "
+"then generate the picking order after the payment of this invoice.\n"
+" - The 'Deliver & Invoice on demand' will create the picking order directly "
+"and wait for the user to manually click on the 'Invoice' button to generate "
+"the draft invoice based on the sale order or the sale order lines.\n"
+" - The 'Invoice on order after delivery' choice will generate the draft "
+"invoice based on sales order after all picking lists have been finished.\n"
+" - The 'Invoice based on deliveries' choice is used to create an invoice "
+"during the picking process."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:1158
#, python-format
msgid "No Customer Defined !"
msgstr "Neurčen zákazník !"
@@ -275,9 +322,12 @@ msgid "Sales in Exception"
msgstr "Prodeje ve výjimce"
#. module: sale
-#: view:sale.order:0
-msgid "Set to Draft"
-msgstr "Nastavit na koncept"
+#: code:addons/sale/sale.py:1145
+#: code:addons/sale/sale.py:1264
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:70
+#, python-format
+msgid "Configuration Error !"
+msgstr ""
#. module: sale
#: view:sale.order:0
@@ -285,22 +335,7 @@ msgid "Conditions"
msgstr "Podmínky"
#. module: sale
-#: help:sale.order,order_policy:0
-msgid ""
-"The Shipping Policy is used to synchronise invoice and delivery operations.\n"
-" - The 'Pay Before delivery' choice will first generate the invoice and "
-"then generate the picking order after the payment of this invoice.\n"
-" - The 'Shipping & Manual Invoice' will create the picking order directly "
-"and wait for the user to manually click on the 'Invoice' button to generate "
-"the draft invoice.\n"
-" - The 'Invoice On Order After Delivery' choice will generate the draft "
-"invoice based on sales order after all picking lists have been finished.\n"
-" - The 'Invoice From The Picking' choice is used to create an invoice "
-"during the picking process."
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:939
+#: code:addons/sale/sale.py:1034
#, python-format
msgid ""
"There is no income category account defined in default Properties for "
@@ -308,9 +343,9 @@ msgid ""
msgstr ""
#. module: sale
-#: view:sale.installer:0
-msgid "Configure"
-msgstr "Nastavit"
+#: selection:sale.report,month:0
+msgid "August"
+msgstr "Srpen"
#. module: sale
#: constraint:stock.move:0
@@ -318,7 +353,7 @@ msgid "You try to assign a lot which is not from the same product"
msgstr "Snažíte se přiřadit dávku, která není ze stejného výrobku"
#. module: sale
-#: code:addons/sale/sale.py:620
+#: code:addons/sale/sale.py:655
#, python-format
msgid "invalid mode for test_state"
msgstr "neplatný režim pro test_state"
@@ -329,7 +364,7 @@ msgid "June"
msgstr "Červen"
#. module: sale
-#: code:addons/sale/sale.py:584
+#: code:addons/sale/sale.py:617
#, python-format
msgid "Could not cancel this sales order !"
msgstr "Nelze zrušit tuto prodejní objednávku !"
@@ -350,8 +385,12 @@ msgid "October"
msgstr "Říjen"
#. module: sale
+#: sql_constraint:stock.picking:0
+msgid "Reference must be unique per Company!"
+msgstr ""
+
+#. module: sale
#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_quotation_for_sale
#: view:sale.order:0
#: view:sale.report:0
msgid "Quotations"
@@ -363,11 +402,6 @@ msgid "Pricelist for current sales order."
msgstr "Ceník pro aktuální prodejní objednávku."
#. module: sale
-#: selection:sale.config.picking_policy,step:0
-msgid "Delivery Order Only"
-msgstr "Pouze doručovací příkaz"
-
-#. module: sale
#: report:sale.order:0
msgid "TVA :"
msgstr "TVA :"
@@ -392,6 +426,7 @@ msgstr "Finanční pozice"
#. module: sale
#: view:sale.order:0
#: view:sale.order.line:0
+#: field:sale.report,product_uom:0
msgid "UoM"
msgstr "MJ"
@@ -416,7 +451,13 @@ msgstr ""
"'Ručně v běhu'."
#. module: sale
-#: code:addons/sale/sale.py:971
+#: code:addons/sale/sale.py:1061
+#, python-format
+msgid "You cannot cancel a sale order line that has already been invoiced!"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:1066
#, python-format
msgid "You must first cancel stock moves attached to this sales order line."
msgstr ""
@@ -424,7 +465,7 @@ msgstr ""
"příkazu."
#. module: sale
-#: code:addons/sale/sale.py:1042
+#: code:addons/sale/sale.py:1134
#, python-format
msgid "(n/a)"
msgstr "(nedost.)"
@@ -458,14 +499,36 @@ msgid "Notes"
msgstr "Poznámky"
#. module: sale
+#: sql_constraint:res.company:0
+msgid "The company name must be unique !"
+msgstr ""
+
+#. module: sale
#: help:sale.order,partner_invoice_id:0
msgid "Invoice address for current sales order."
msgstr "Fakturační adresa pro aktuální prodejní objednávku."
#. module: sale
-#: view:sale.installer:0
-msgid "Enhance your core Sales Application with additional functionalities."
-msgstr "Rozšiřuje vaší základní Prodejní aplikaci o doplňující funkce."
+#: view:sale.report:0
+msgid "Month-1"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered month of the sales order"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:504
+#, python-format
+msgid ""
+"You cannot group sales having different currencies for the same partner."
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,picking_policy:0
+msgid "Deliver each product when available"
+msgstr ""
#. module: sale
#: field:sale.order,invoiced_rate:0
@@ -484,21 +547,43 @@ msgid "Confirmation Date"
msgstr "Datum potvrzení"
#. module: sale
+#: field:sale.order,incoterm:0
+msgid "Incoterm"
+msgstr "Incoterm"
+
+#. module: sale
#: field:sale.order.line,address_allotment_id:0
msgid "Allotment Partner"
msgstr "Podílový partner"
#. module: sale
-#: sql_constraint:sale.order:0
-msgid "Order Reference must be unique !"
-msgstr "Odkaz objednávky musí být jedinečný !"
-
-#. module: sale
#: selection:sale.report,month:0
msgid "March"
msgstr "Březen"
#. module: sale
+#: constraint:stock.move:0
+msgid "You can not move products from or to a location of the type view."
+msgstr ""
+
+#. module: sale
+#: field:sale.config.picking_policy,sale_orders:0
+msgid "Based on Sales Orders"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,state:0
+msgid ""
+"Givwizard = self.browse(cr, uid, ids)[0]es the state of the quotation or "
+"sales order. \n"
+"The exception state is automatically set when a cancel operation occurs in "
+"the invoice validation (Invoice Exception) or in the picking list process "
+"(Shipping Exception). \n"
+"The 'Waiting Schedule' state is set when the invoice is confirmed but "
+"waiting for the scheduler to run on the order date."
+msgstr ""
+
+#. module: sale
#: help:sale.order,amount_total:0
msgid "The total amount."
msgstr "Celkové množství"
@@ -514,6 +599,11 @@ msgid "Invoice address :"
msgstr "Fakturační adresa :"
#. module: sale
+#: field:sale.order.line,sequence:0
+msgid "Line Sequence"
+msgstr ""
+
+#. module: sale
#: model:process.transition,note:sale.process_transition_saleorderprocurement0
msgid ""
"For every sales order line, a procurement order is created to supply the "
@@ -562,11 +652,6 @@ msgid "Sales Order Line"
msgstr "Řádek prodejní objednávky"
#. module: sale
-#: view:sale.config.picking_policy:0
-msgid "Setup your sales workflow and default values."
-msgstr "Nastavení vašeho pracovního toku a výchozích hodnot prodeje."
-
-#. module: sale
#: field:sale.shop,warehouse_id:0
msgid "Warehouse"
msgstr "Sklad"
@@ -603,6 +688,11 @@ msgid "Creation Date"
msgstr "Datum vytvoření"
#. module: sale
+#: model:ir.ui.menu,name:sale.menu_sales_configuration_misc
+msgid "Miscellaneous"
+msgstr ""
+
+#. module: sale
#: model:ir.actions.act_window,name:sale.action_order_line_tree3
msgid "Uninvoiced and Delivered Lines"
msgstr "Nefakturované a doručené řádky"
@@ -618,14 +708,19 @@ msgid "My Sales"
msgstr "Moje prodeje"
#. module: sale
-#: code:addons/sale/sale.py:290
-#: code:addons/sale/sale.py:966
-#: code:addons/sale/sale.py:1165
+#: code:addons/sale/sale.py:295
+#: code:addons/sale/sale.py:1061
+#: code:addons/sale/sale.py:1290
#, python-format
msgid "Invalid action !"
msgstr "Neplatná akce !"
#. module: sale
+#: view:sale.order:0
+msgid "Extra Info"
+msgstr "Rozšířené informace"
+
+#. module: sale
#: field:sale.order,pricelist_id:0
#: field:sale.report,pricelist_id:0
#: field:sale.shop,pricelist_id:0
@@ -639,13 +734,21 @@ msgid "# of Qty"
msgstr "# z množ."
#. module: sale
+#: code:addons/sale/sale.py:1314
+#, python-format
+msgid "Hour"
+msgstr ""
+
+#. module: sale
#: view:sale.order:0
msgid "Order Date"
msgstr "Datum objednávky"
#. module: sale
#: view:sale.order.line:0
+#: view:sale.report:0
#: field:sale.report,shipped:0
+#: field:sale.report,shipped_qty_1:0
msgid "Shipped"
msgstr "Odesláno"
@@ -655,9 +758,9 @@ msgid "All Quotations"
msgstr "Včechny cenové nabídky"
#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Invoice On Order After Delivery"
-msgstr "Fakturovat při objednávce po doručení"
+#: view:sale.config.picking_policy:0
+msgid "Options"
+msgstr ""
#. module: sale
#: selection:sale.report,month:0
@@ -665,6 +768,20 @@ msgid "September"
msgstr "Září"
#. module: sale
+#: code:addons/sale/sale.py:632
+#, python-format
+msgid "You cannot confirm a sale order which has no line."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:1246
+#, python-format
+msgid ""
+"You have to select a pricelist or a customer in the sales form !\n"
+"Please set one before choosing a product."
+msgstr ""
+
+#. module: sale
#: view:sale.report:0
#: field:sale.report,categ_id:0
msgid "Category of Product"
@@ -681,11 +798,6 @@ msgid "Stock Moves"
msgstr "Phyby zboží"
#. module: sale
-#: view:sale.report:0
-msgid " Year "
-msgstr " Rok "
-
-#. module: sale
#: field:sale.order,state:0
#: field:sale.report,state:0
msgid "Order State"
@@ -703,7 +815,7 @@ msgid "Sales By Month"
msgstr "Prodeje podle měsíce"
#. module: sale
-#: code:addons/sale/sale.py:970
+#: code:addons/sale/sale.py:1065
#, python-format
msgid "Could not cancel sales order line!"
msgstr "Nelze zrušit řádek prodejní objednávky!"
@@ -736,42 +848,19 @@ msgid ""
msgstr ""
#. module: sale
+#: field:sale.order,date_order:0
+msgid "Date"
+msgstr ""
+
+#. module: sale
#: view:sale.report:0
msgid "Extended Filters..."
msgstr "Rozšířené filtry..."
#. module: sale
-#: model:ir.module.module,description:sale.module_meta_information
-msgid ""
-"\n"
-" The base module to manage quotations and sales orders.\n"
-"\n"
-" * Workflow with validation steps:\n"
-" - Quotation -> Sales order -> Invoice\n"
-" * Invoicing methods:\n"
-" - Invoice on order (before or after shipping)\n"
-" - Invoice on delivery\n"
-" - Invoice on timesheets\n"
-" - Advance invoice\n"
-" * Partners preferences (shipping, invoicing, incoterm, ...)\n"
-" * Products stocks and prices\n"
-" * Delivery methods:\n"
-" - all at once, multi-parcel\n"
-" - delivery costs\n"
-" * Dashboard for salesman that includes:\n"
-" * Your open quotations\n"
-" * Top 10 sales of the month\n"
-" * Cases statistics\n"
-" * Graph of sales by product\n"
-" * Graph of cases of the month\n"
-" "
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_shop
-#: view:sale.shop:0
-msgid "Sales Shop"
-msgstr "Prodejní obchod"
+#: selection:sale.order.line,state:0
+msgid "Exception"
+msgstr "Vyjímka"
#. module: sale
#: model:ir.model,name:sale.model_res_company
@@ -779,9 +868,10 @@ msgid "Companies"
msgstr "Společnosti"
#. module: sale
-#: selection:sale.report,month:0
-msgid "November"
-msgstr "Listopad"
+#: code:addons/sale/sale.py:1259
+#, python-format
+msgid "No valid pricelist line found ! :"
+msgstr ""
#. module: sale
#: view:sale.order:0
@@ -789,9 +879,9 @@ msgid "History"
msgstr "Historie"
#. module: sale
-#: field:sale.config.picking_policy,picking_policy:0
-msgid "Picking Default Policy"
-msgstr "Výchozí politika naskladnění"
+#: selection:sale.order,order_policy:0
+msgid "Invoice on order after delivery"
+msgstr ""
#. module: sale
#: help:sale.order,invoice_ids:0
@@ -816,13 +906,12 @@ msgid ""
msgstr "Jméno a adresa kontaktu, který vyžádal objednávku nebo ocenění."
#. module: sale
-#: code:addons/sale/sale.py:966
-#, python-format
-msgid "You cannot cancel a sales order line that has already been invoiced !"
-msgstr "Nemůžete zrušit prodejní objednávku, která už byla fakturována !"
+#: help:res.company,security_lead:0
+msgid ""
+"This is the days added to what you promise to customers for security purpose"
+msgstr ""
#. module: sale
-#: view:sale.order:0
#: view:sale.order.line:0
msgid "Qty"
msgstr "Množ."
@@ -833,6 +922,11 @@ msgid "References"
msgstr "Odkazy"
#. module: sale
+#: view:sale.order.line:0
+msgid "My Sales Order Lines"
+msgstr ""
+
+#. module: sale
#: model:process.transition.action,name:sale.process_transition_action_cancel0
#: model:process.transition.action,name:sale.process_transition_action_cancel1
#: model:process.transition.action,name:sale.process_transition_action_cancel2
@@ -844,14 +938,9 @@ msgid "Cancel"
msgstr "Zrušit"
#. module: sale
-#: field:sale.installer,sale_order_dates:0
-msgid "Sales Order Dates"
-msgstr "Data prodejních objednávek"
-
-#. module: sale
-#: selection:sale.order.line,state:0
-msgid "Exception"
-msgstr "Vyjímka"
+#: sql_constraint:sale.order:0
+msgid "Order Reference must be unique per Company!"
+msgstr ""
#. module: sale
#: model:process.transition,name:sale.process_transition_invoice0
@@ -863,19 +952,19 @@ msgid "Create Invoice"
msgstr "Vytvořit fakturu"
#. module: sale
-#: field:sale.installer,sale_margin:0
-msgid "Margins in Sales Orders"
-msgstr "Marže v prodejních objednávkách"
-
-#. module: sale
#: view:sale.order:0
msgid "Total Tax Excluded"
msgstr "Celkem nezahrnuté daně"
#. module: sale
-#: view:sale.order:0
-msgid "Compute"
-msgstr "Spočítat"
+#: view:sale.order.line:0
+msgid "Order reference"
+msgstr ""
+
+#. module: sale
+#: view:sale.open.invoice:0
+msgid "You invoice has been successfully created!"
+msgstr "Vaše faktura byla úspěšně vytvořena!"
#. module: sale
#: view:sale.report:0
@@ -894,23 +983,20 @@ msgid "Open Invoice"
msgstr "Otevřít fakturu"
#. module: sale
-#: report:sale.order:0
-#: view:sale.order.line:0
-msgid "Price"
-msgstr "Cena"
+#: model:ir.actions.server,name:sale.ir_actions_server_edi_sale
+msgid "Auto-email confirmed sale orders"
+msgstr ""
#. module: sale
-#: model:ir.actions.act_window,name:sale.action_sale_installer
-#: view:sale.config.picking_policy:0
-#: view:sale.installer:0
-msgid "Sales Application Configuration"
-msgstr "Nastavení prodejní aplikace"
+#: code:addons/sale/sale.py:413
+#, python-format
+msgid "There is no sales journal defined for this company: \"%s\" (id:%d)"
+msgstr "V této společnosti není definován prodejní deník: \"%s\" (id:%d)"
#. module: sale
-#: view:sale.report:0
-#: field:sale.report,price_total:0
-msgid "Total Price"
-msgstr "Celková cena"
+#: model:process.transition.action,name:sale.process_transition_action_forceassignation0
+msgid "Force Assignation"
+msgstr "Vynutit přiřazení"
#. module: sale
#: selection:sale.order.line,type:0
@@ -923,6 +1009,11 @@ msgid "Based on the shipped or on the ordered quantities."
msgstr "Založeno přepraveném nebo objednaném množství."
#. module: sale
+#: selection:sale.order,picking_policy:0
+msgid "Deliver all products at once"
+msgstr ""
+
+#. module: sale
#: field:sale.order,picking_ids:0
msgid "Related Picking"
msgstr "Sousivející navádění"
@@ -954,9 +1045,15 @@ msgid "Create Delivery Order"
msgstr "Vytvořit dodací příkaz"
#. module: sale
-#: field:sale.installer,delivery:0
-msgid "Delivery Costs"
-msgstr "Ceny dodání"
+#: code:addons/sale/sale.py:1290
+#, python-format
+msgid "Cannot delete a sales order line which is in state '%s'!"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Qty(UoS)"
+msgstr ""
#. module: sale
#: view:sale.order:0
@@ -970,13 +1067,13 @@ msgstr "Vytvořit seznam naskladnění"
#. module: sale
#: view:sale.report:0
-msgid "Sales by Product Category"
-msgstr "Prodeje podle kategorie výrobků"
+msgid "Ordered date of the sales order"
+msgstr ""
#. module: sale
-#: selection:sale.order,picking_policy:0
-msgid "Partial Delivery"
-msgstr "Částečné doručení"
+#: view:sale.report:0
+msgid "Sales by Product Category"
+msgstr "Prodeje podle kategorie výrobků"
#. module: sale
#: model:process.transition,name:sale.process_transition_confirmquotation0
@@ -984,10 +1081,10 @@ msgid "Confirm Quotation"
msgstr "Potvrdit ocenění"
#. module: sale
-#: help:sale.order,origin:0
-msgid "Reference of the document that generated this sales order request."
-msgstr ""
-"Odkaz na dokument, který generoval tento požadavek na prodejní objednávku."
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:63
+#, python-format
+msgid "Error"
+msgstr "Chyba"
#. module: sale
#: view:sale.order:0
@@ -1019,20 +1116,14 @@ msgid "Procurement Method"
msgstr "Metoda zásobování"
#. module: sale
-#: view:sale.config.picking_policy:0
-#: view:sale.installer:0
-msgid "title"
-msgstr "nadpis"
-
-#. module: sale
#: model:process.node,name:sale.process_node_packinglist0
msgid "Pick List"
msgstr "Seznam naskladnění"
#. module: sale
#: view:sale.order:0
-msgid "Order date"
-msgstr "Datum objednávky"
+msgid "Set to Draft"
+msgstr "Nastavit na koncept"
#. module: sale
#: model:process.node,note:sale.process_node_packinglist0
@@ -1040,6 +1131,85 @@ msgid "Document of the move to the output or to the customer."
msgstr "Dokument přesunu na výstup nebo k zákazníkovi"
#. module: sale
+#: model:email.template,body_text:sale.email_template_edi_sale
+msgid ""
+"\n"
+"Hello${object.partner_order_id.name and ' ' or "
+"''}${object.partner_order_id.name or ''},\n"
+"\n"
+"Here is your order confirmation for ${object.partner_id.name}:\n"
+" | Order number: *${object.name}*\n"
+" | Order total: *${object.amount_total} "
+"${object.pricelist_id.currency_id.name}*\n"
+" | Order date: ${object.date_order}\n"
+" % if object.origin:\n"
+" | Order reference: ${object.origin}\n"
+" % endif\n"
+" % if object.client_order_ref:\n"
+" | Your reference: ${object.client_order_ref}<br />\n"
+" % endif\n"
+" | Your contact: ${object.user_id.name} ${object.user_id.user_email "
+"and '<%s>'%(object.user_id.user_email) or ''}\n"
+"\n"
+"You can view the order confirmation, download it and even pay online using "
+"the following link:\n"
+" ${ctx.get('edi_web_url_view') or 'n/a'}\n"
+"\n"
+"% if object.order_policy in ('prepaid','manual') and "
+"object.company_id.paypal_account:\n"
+"<% \n"
+"comp_name = quote(object.company_id.name)\n"
+"order_name = quote(object.name)\n"
+"paypal_account = quote(object.company_id.paypal_account)\n"
+"order_amount = quote(str(object.amount_total))\n"
+"cur_name = quote(object.pricelist_id.currency_id.name)\n"
+"paypal_url = \"https://www.paypal.com/cgi-"
+"bin/webscr?cmd=_xclick&business=%s&item_name=%s%%20Order%%20%s&invoice=%s&amo"
+"unt=%s\" \\\n"
+" "
+"\"&currency_code=%s&button_subtype=services&no_note=1&bn=OpenERP_Order_PayNow"
+"_%s\" % \\\n"
+" "
+"(paypal_account,comp_name,order_name,order_name,order_amount,cur_name,cur_nam"
+"e)\n"
+"%>\n"
+"It is also possible to directly pay with Paypal:\n"
+" ${paypal_url}\n"
+"% endif\n"
+"\n"
+"If you have any question, do not hesitate to contact us.\n"
+"\n"
+"\n"
+"Thank you for choosing ${object.company_id.name}!\n"
+"\n"
+"\n"
+"--\n"
+"${object.user_id.name} ${object.user_id.user_email and "
+"'<%s>'%(object.user_id.user_email) or ''}\n"
+"${object.company_id.name}\n"
+"% if object.company_id.street:\n"
+"${object.company_id.street or ''}\n"
+"% endif\n"
+"% if object.company_id.street2:\n"
+"${object.company_id.street2}\n"
+"% endif\n"
+"% if object.company_id.city or object.company_id.zip:\n"
+"${object.company_id.zip or ''} ${object.company_id.city or ''}\n"
+"% endif\n"
+"% if object.company_id.country_id:\n"
+"${object.company_id.state_id and ('%s, ' % object.company_id.state_id.name) "
+"or ''} ${object.company_id.country_id.name or ''}\n"
+"% endif\n"
+"% if object.company_id.phone:\n"
+"Phone: ${object.company_id.phone}\n"
+"% endif\n"
+"% if object.company_id.website:\n"
+"${object.company_id.website or ''}\n"
+"% endif\n"
+" "
+msgstr ""
+
+#. module: sale
#: model:process.transition.action,name:sale.process_transition_action_validate0
msgid "Validate"
msgstr "Ověřit"
@@ -1062,9 +1232,9 @@ msgid "Taxes"
msgstr "Daně"
#. module: sale
-#: field:sale.order,order_policy:0
-msgid "Shipping Policy"
-msgstr "Přepravní politika"
+#: view:sale.order:0
+msgid "Sales Order ready to be invoiced"
+msgstr ""
#. module: sale
#: help:sale.order,create_date:0
@@ -1083,9 +1253,9 @@ msgid "Create Invoices"
msgstr "Vytvořit faktury"
#. module: sale
-#: view:sale.order:0
-msgid "Extra Info"
-msgstr "Rozšířené informace"
+#: view:sale.report:0
+msgid "Sales order created in current month"
+msgstr ""
#. module: sale
#: report:sale.order:0
@@ -1093,11 +1263,24 @@ msgid "Fax :"
msgstr "Fax :"
#. module: sale
+#: help:sale.order.line,type:0
+msgid ""
+"If 'on order', it triggers a procurement when the sale order is confirmed to "
+"create a task, purchase order or manufacturing order linked to this sale "
+"order line."
+msgstr ""
+
+#. module: sale
#: field:sale.advance.payment.inv,amount:0
msgid "Advance Amount"
msgstr "Částka dopředu"
#. module: sale
+#: field:sale.config.picking_policy,charge_delivery:0
+msgid "Do you charge the delivery?"
+msgstr ""
+
+#. module: sale
#: selection:sale.order,invoice_quantity:0
msgid "Shipped Quantities"
msgstr "Přepravované množství"
@@ -1108,25 +1291,45 @@ msgid "Invoice Based on Sales Orders"
msgstr "Faktura založená na Prodejních objednávkách"
#. module: sale
+#: code:addons/sale/sale.py:331
+#, python-format
+msgid ""
+"If you change the pricelist of this order (and eventually the currency), "
+"prices of existing order lines will not be updated."
+msgstr ""
+
+#. module: sale
#: model:ir.model,name:sale.model_stock_picking
msgid "Picking List"
msgstr "Naváděcí seznam"
#. module: sale
-#: code:addons/sale/sale.py:387
-#: code:addons/sale/sale.py:920
-#: code:addons/sale/sale.py:938
+#: code:addons/sale/sale.py:412
+#: code:addons/sale/sale.py:503
+#: code:addons/sale/sale.py:632
+#: code:addons/sale/sale.py:1015
+#: code:addons/sale/sale.py:1033
#, python-format
msgid "Error !"
msgstr "Chyba !"
#. module: sale
-#: code:addons/sale/sale.py:570
+#: code:addons/sale/sale.py:603
#, python-format
msgid "Could not cancel sales order !"
msgstr "Nelze zrušit prodejní příkaz !"
#. module: sale
+#: view:sale.order:0
+msgid "Qty(UoM)"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered Year of the sales order"
+msgstr ""
+
+#. module: sale
#: selection:sale.report,month:0
msgid "July"
msgstr "Červenec"
@@ -1143,36 +1346,26 @@ msgid "Shipping Exception"
msgstr "Výjimka přepravy"
#. module: sale
-#: field:sale.make.invoice,grouped:0
-msgid "Group the invoices"
-msgstr "Seskupit faktury"
-
-#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Shipping & Manual Invoice"
-msgstr "Přeprava & Ruční faktura"
-
-#. module: sale
-#: code:addons/sale/sale.py:1051
+#: code:addons/sale/sale.py:1143
#, python-format
-msgid "Picking Information !"
-msgstr "Informace naskladnění !"
+msgid "Picking Information ! : "
+msgstr ""
#. module: sale
-#: view:sale.report:0
-#: field:sale.report,month:0
-msgid "Month"
-msgstr "Měsíc"
+#: field:sale.make.invoice,grouped:0
+msgid "Group the invoices"
+msgstr "Seskupit faktury"
#. module: sale
-#: model:ir.module.module,shortdesc:sale.module_meta_information
-msgid "Sales Management"
-msgstr "Řízení prodeje"
+#: field:sale.order,order_policy:0
+msgid "Invoice Policy"
+msgstr ""
#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Invoice From The Picking"
-msgstr "Faktura z naskladnění"
+#: model:ir.actions.act_window,name:sale.action_config_picking_policy
+#: view:sale.config.picking_policy:0
+msgid "Setup your Invoicing Method"
+msgstr ""
#. module: sale
#: model:process.node,note:sale.process_node_invoice0
@@ -1181,28 +1374,31 @@ msgstr "K překontrolování účetním."
#. module: sale
#: view:sale.report:0
-#: field:sale.report,uom_name:0
msgid "Reference UoM"
msgstr "Referenční MJ"
#. module: sale
+#: view:sale.config.picking_policy:0
+msgid ""
+"This tool will help you to install the right module and configure the system "
+"according to the method you use to invoice your customers."
+msgstr ""
+
+#. module: sale
#: model:ir.model,name:sale.model_sale_order_line_make_invoice
msgid "Sale OrderLine Make_invoice"
msgstr ""
#. module: sale
-#: help:sale.config.picking_policy,step:0
-msgid ""
-"By default, OpenERP is able to manage complex routing and paths of products "
-"in your warehouse and partner locations. This will configure the most common "
-"and simple methods to deliver products to the customer in one or two "
-"operations by the worker."
-msgstr ""
+#: selection:sale.order,state:0
+#: selection:sale.report,state:0
+msgid "Invoice Exception"
+msgstr "Vyjímka faktury"
#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_tree
-msgid "Old Quotations"
-msgstr "Staré ocenění"
+#: model:process.node,note:sale.process_node_saleorder0
+msgid "Drives procurement and invoicing"
+msgstr "Řídí zásobování a fakturace"
#. module: sale
#: field:sale.order,invoiced:0
@@ -1217,6 +1413,22 @@ msgid "Sales Analysis"
msgstr "Analýza prodeje"
#. module: sale
+#: code:addons/sale/sale.py:1138
+#, python-format
+msgid ""
+"You selected a quantity of %d Units.\n"
+"But it's not compatible with the selected packaging.\n"
+"Here is a proposition of quantities according to the packaging:\n"
+"EAN: %s Quantity: %s Type of ul: %s"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Recreate Packing"
+msgstr "Znovu vytvořit balení"
+
+#. module: sale
+#: view:sale.order:0
#: field:sale.order.line,property_ids:0
msgid "Properties"
msgstr "Vlastnosti"
@@ -1248,7 +1460,17 @@ msgstr ""
"přepravě."
#. module: sale
-#: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
+#: view:sale.order.line:0
+msgid "Confirmed sale order lines, not yet delivered"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:473
+#, python-format
+msgid "Customer Invoices"
+msgstr ""
+
+#. module: sale
#: model:process.process,name:sale.process_process_salesprocess0
#: view:sale.order:0
#: view:sale.report:0
@@ -1270,18 +1492,13 @@ msgid "Done"
msgstr "Dokončeno"
#. module: sale
-#: model:ir.model,name:sale.model_sale_installer
-msgid "sale.installer"
-msgstr "sale.installer"
-
-#. module: sale
#: model:process.node,name:sale.process_node_invoice0
#: model:process.node,name:sale.process_node_invoiceafterdelivery0
msgid "Invoice"
msgstr "Faktura"
#. module: sale
-#: code:addons/sale/sale.py:1014
+#: code:addons/sale/sale.py:1158
#, python-format
msgid ""
"You have to select a customer in the sales form !\n"
@@ -1291,11 +1508,6 @@ msgstr ""
"Před výběrem výrobku prosíme nastavte zákazníka."
#. module: sale
-#: selection:sale.config.picking_policy,step:0
-msgid "Picking List & Delivery Order"
-msgstr "Seznam naskladnění & Dodací příkaz"
-
-#. module: sale
#: field:sale.order,origin:0
msgid "Source Document"
msgstr "Zdrojový dokument"
@@ -1321,7 +1533,7 @@ msgid "The amount without tax."
msgstr "Množství bez daně."
#. module: sale
-#: code:addons/sale/sale.py:571
+#: code:addons/sale/sale.py:604
#, python-format
msgid "You must first cancel all picking attached to this sales order."
msgstr ""
@@ -1333,9 +1545,15 @@ msgid "Sales Advance Payment Invoice"
msgstr "Prodejní platba faktury dopředu"
#. module: sale
-#: field:sale.order,incoterm:0
-msgid "Incoterm"
-msgstr "Incoterm"
+#: view:sale.report:0
+#: field:sale.report,month:0
+msgid "Month"
+msgstr "Měsíc"
+
+#. module: sale
+#: model:email.template,subject:sale.email_template_edi_sale
+msgid "${object.company_id.name} Order (Ref ${object.name or 'n/a' })"
+msgstr ""
#. module: sale
#: view:sale.order.line:0
@@ -1346,11 +1564,6 @@ msgid "Product"
msgstr "Výrobek"
#. module: sale
-#: model:ir.ui.menu,name:sale.menu_invoiced
-msgid "Invoicing"
-msgstr "Fakturování"
-
-#. module: sale
#: model:process.transition.action,name:sale.process_transition_action_cancelassignation0
msgid "Cancel Assignation"
msgstr "Zrušit přiřazení"
@@ -1361,14 +1574,10 @@ msgid "sale.config.picking_policy"
msgstr "sale.config.picking_policy"
#. module: sale
-#: help:sale.order,state:0
-msgid ""
-"Gives the state of the quotation or sales order. \n"
-"The exception state is automatically set when a cancel operation occurs in "
-"the invoice validation (Invoice Exception) or in the picking list process "
-"(Shipping Exception). \n"
-"The 'Waiting Schedule' state is set when the invoice is confirmed but "
-"waiting for the scheduler to run on the date 'Ordered Date'."
+#: view:account.invoice.report:0
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_turnover_by_month
+msgid "Monthly Turnover"
msgstr ""
#. module: sale
@@ -1387,7 +1596,6 @@ msgid "Product UoS"
msgstr "UoS výrobku"
#. module: sale
-#: selection:sale.order,state:0
#: selection:sale.report,state:0
msgid "Manual In Progress"
msgstr "Ruční v běhu"
@@ -1408,7 +1616,8 @@ msgid "Order"
msgstr "Objednávka"
#. module: sale
-#: code:addons/sale/sale.py:921
+#: code:addons/sale/sale.py:1016
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:71
#, python-format
msgid "There is no income account defined for this product: \"%s\" (id:%d)"
msgstr "Pro tento výrobek není definován příjmový účet: \"%s\" (id: %d)"
@@ -1428,7 +1637,7 @@ msgid ""
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:1116
+#: code:addons/sale/sale.py:1238
#, python-format
msgid ""
"You plan to sell %.2f %s but you only have %.2f %s available !\n"
@@ -1457,10 +1666,10 @@ msgid "Total"
msgstr "Celkem"
#. module: sale
-#: code:addons/sale/sale.py:388
-#, python-format
-msgid "There is no sales journal defined for this company: \"%s\" (id:%d)"
-msgstr "V této společnosti není definován prodejní deník: \"%s\" (id:%d)"
+#: report:sale.order:0
+#: view:sale.order.line:0
+msgid "Price"
+msgstr "Cena"
#. module: sale
#: model:process.transition,note:sale.process_transition_deliver0
@@ -1471,10 +1680,15 @@ msgid ""
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:1165
-#, python-format
-msgid "Cannot delete a sales order line which is %s !"
-msgstr "Nelze odstranit řádek prodejní objednávky, který je %s !"
+#: selection:sale.order,order_policy:0
+msgid "Pay before delivery"
+msgstr ""
+
+#. module: sale
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.open_board_sales
+msgid "Sales Dashboard"
+msgstr ""
#. module: sale
#: model:ir.actions.act_window,name:sale.action_sale_order_make_invoice
@@ -1485,6 +1699,7 @@ msgstr "Vytvoření faktůr"
#. module: sale
#: view:sale.order:0
+#: selection:sale.order,state:0
#: view:sale.order.line:0
msgid "To Invoice"
msgstr "K fakturaci"
@@ -1495,6 +1710,11 @@ msgid "Date on which sales order is confirmed."
msgstr "Datum, pro které prodejní objednávka potvrzena."
#. module: sale
+#: field:sale.order,project_id:0
+msgid "Contract/Analytic Account"
+msgstr ""
+
+#. module: sale
#: field:sale.order,company_id:0
#: field:sale.order.line,company_id:0
#: view:sale.report:0
@@ -1514,10 +1734,12 @@ msgid "The amount to be invoiced in advance."
msgstr "Částka, která je fakturována dopředu."
#. module: sale
-#: selection:sale.order,state:0
-#: selection:sale.report,state:0
-msgid "Invoice Exception"
-msgstr "Vyjímka faktury"
+#: code:addons/sale/sale.py:1256
+#, python-format
+msgid ""
+"Couldn't find a pricelist line matching this product and quantity.\n"
+"You have to change either the product, the quantity or the pricelist."
+msgstr ""
#. module: sale
#: help:sale.order,picking_ids:0
@@ -1527,15 +1749,6 @@ msgstr ""
"Toto je seznam navádění, který byl vygenerován pro tuto prodejní objednávku."
#. module: sale
-#: help:sale.installer,sale_margin:0
-msgid ""
-"Gives the margin of profitability by calculating the difference between Unit "
-"Price and Cost Price."
-msgstr ""
-"Dává marži výnosnosti vypočítáním rozdílu mezi jednotkovou cenou a výrobní "
-"cenou."
-
-#. module: sale
#: view:sale.make.invoice:0
#: view:sale.order.line.make.invoice:0
msgid "Create invoices"
@@ -1554,6 +1767,11 @@ msgid "Cancelled"
msgstr "Zrušeno"
#. module: sale
+#: view:sale.order.line:0
+msgid "Sales Order Lines related to a Sales Order of mine"
+msgstr ""
+
+#. module: sale
#: model:ir.actions.act_window,name:sale.action_shop_form
#: model:ir.ui.menu,name:sale.menu_action_shop_form
#: field:sale.order,shop_id:0
@@ -1563,17 +1781,12 @@ msgid "Shop"
msgstr "Obchod"
#. module: sale
-#: view:sale.report:0
-msgid " Month "
-msgstr " Měsíc "
-
-#. module: sale
#: field:sale.report,date_confirm:0
msgid "Date Confirm"
msgstr "Datum potvrzení"
#. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:111
+#: code:addons/sale/wizard/sale_line_invoice.py:113
#, python-format
msgid "Warning"
msgstr "Varování"
@@ -1585,17 +1798,6 @@ msgid "Sales by Month"
msgstr "Prodeje podle měsíce"
#. module: sale
-#: code:addons/sale/sale.py:1045
-#, python-format
-msgid ""
-"You selected a quantity of %d Units.\n"
-"But it's not compatible with the selected packaging.\n"
-"Here is a proposition of quantities according to the packaging:\n"
-"\n"
-"EAN: %s Quantity: %s Type of ul: %s"
-msgstr ""
-
-#. module: sale
#: model:ir.model,name:sale.model_sale_order
#: model:process.node,name:sale.process_node_order0
#: model:process.node,name:sale.process_node_saleorder0
@@ -1611,6 +1813,11 @@ msgid "Quantity (UoS)"
msgstr "Množství (PJ)"
#. module: sale
+#: view:sale.order.line:0
+msgid "Sale Order Lines that are in 'done' state"
+msgstr ""
+
+#. module: sale
#: model:process.transition,note:sale.process_transition_packing0
msgid ""
"The Pick List form is created as soon as the sales order is confirmed, in "
@@ -1625,6 +1832,11 @@ msgid "Confirmed"
msgstr "Potvrzeno"
#. module: sale
+#: field:sale.config.picking_policy,order_policy:0
+msgid "Main Method Based On"
+msgstr ""
+
+#. module: sale
#: model:process.transition.action,name:sale.process_transition_action_confirm0
msgid "Confirm"
msgstr "Potvrdit"
@@ -1647,6 +1859,7 @@ msgid "Invoice Lines"
msgstr "Řádky faktury"
#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_product_tree
#: view:sale.order:0
#: view:sale.order.line:0
msgid "Sales Order Lines"
@@ -1663,30 +1876,18 @@ msgid "Configuration"
msgstr "Nastavení"
#. module: sale
-#: selection:sale.order,picking_policy:0
-msgid "Complete Delivery"
-msgstr "Úplné doručení"
+#: code:addons/sale/edi/sale_order.py:146
+#, python-format
+msgid "EDI Pricelist (%s)"
+msgstr ""
#. module: sale
#: view:sale.report:0
-msgid " Month-1 "
-msgstr " Měsíc-1 "
-
-#. module: sale
-#: help:sale.config.picking_policy,picking_policy:0
-msgid ""
-"The Shipping Policy is used to configure per order if you want to deliver as "
-"soon as possible when one product is available or you wait that all products "
-"are available.."
+msgid "Sales order created in current year"
msgstr ""
#. module: sale
-#: selection:sale.report,month:0
-msgid "August"
-msgstr "Srpen"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:111
+#: code:addons/sale/wizard/sale_line_invoice.py:113
#, python-format
msgid ""
"Invoice cannot be created for this Sales Order Line due to one of the "
@@ -1696,6 +1897,11 @@ msgid ""
msgstr ""
#. module: sale
+#: view:sale.order.line:0
+msgid "Sale order lines done"
+msgstr ""
+
+#. module: sale
#: field:sale.order.line,th_weight:0
msgid "Weight"
msgstr "Váha"
@@ -1714,7 +1920,6 @@ msgstr "Prosinec"
#. module: sale
#: field:sale.config.picking_policy,config_logo:0
-#: field:sale.installer,config_logo:0
msgid "Image"
msgstr "Obrázek"
@@ -1744,9 +1949,9 @@ msgid "Salesman"
msgstr "Obchodník"
#. module: sale
-#: model:process.node,note:sale.process_node_saleorder0
-msgid "Drives procurement and invoicing"
-msgstr "Řídí zásobování a fakturace"
+#: model:ir.actions.act_window,name:sale.action_order_tree
+msgid "Old Quotations"
+msgstr "Staré ocenění"
#. module: sale
#: field:sale.order,amount_untaxed:0
@@ -1754,7 +1959,7 @@ msgid "Untaxed Amount"
msgstr "Nezdaněná částka"
#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:163
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:170
#: model:ir.actions.act_window,name:sale.action_view_sale_advance_payment_inv
#: view:sale.advance.payment.inv:0
#: view:sale.order:0
@@ -1763,7 +1968,7 @@ msgid "Advance Invoice"
msgstr "Faktura dopředu"
#. module: sale
-#: code:addons/sale/sale.py:591
+#: code:addons/sale/sale.py:624
#, python-format
msgid "The sales order '%s' has been cancelled."
msgstr "Prodejní objednávka '%s' byla zrušena."
@@ -1798,20 +2003,20 @@ msgid "Packings"
msgstr "Balení"
#. module: sale
-#: field:sale.config.picking_policy,progress:0
-#: field:sale.installer,progress:0
-msgid "Configuration Progress"
-msgstr "Průběh nastavení"
+#: view:sale.order.line:0
+msgid "Sale Order Lines ready to be invoiced"
+msgstr ""
#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_product_tree
-msgid "Product sales"
-msgstr "Prodeje výrobků"
+#: view:sale.report:0
+msgid "Sales order created in last month"
+msgstr ""
#. module: sale
-#: field:sale.order,date_order:0
-msgid "Ordered Date"
-msgstr "Datum objednání"
+#: model:ir.actions.act_window,name:sale.action_email_templates
+#: model:ir.ui.menu,name:sale.menu_email_templates
+msgid "Email Templates"
+msgstr ""
#. module: sale
#: model:ir.actions.act_window,name:sale.action_order_form
@@ -1821,14 +2026,15 @@ msgid "Sales Orders"
msgstr "Prodejní objednávky"
#. module: sale
-#: selection:sale.config.picking_policy,picking_policy:0
-msgid "Direct Delivery"
-msgstr "Přímé dodání"
+#: model:ir.model,name:sale.model_sale_shop
+#: view:sale.shop:0
+msgid "Sales Shop"
+msgstr "Prodejní obchod"
#. module: sale
-#: field:sale.installer,sale_journal:0
-msgid "Invoicing journals"
-msgstr "Fakturační deníky"
+#: selection:sale.report,month:0
+msgid "November"
+msgstr "Listopad"
#. module: sale
#: field:sale.advance.payment.inv,product_id:0
@@ -1836,18 +2042,12 @@ msgid "Advance Product"
msgstr ""
#. module: sale
-#: view:sale.report:0
-#: field:sale.report,shipped_qty_1:0
-msgid "Shipped Qty"
-msgstr "Přepravené množ."
-
-#. module: sale
-#: view:sale.open.invoice:0
-msgid "You invoice has been successfully created!"
-msgstr "Vaše faktura byla úspěšně vytvořena!"
+#: view:sale.order:0
+msgid "Compute"
+msgstr "Spočítat"
#. module: sale
-#: code:addons/sale/sale.py:585
+#: code:addons/sale/sale.py:618
#, python-format
msgid "You must first cancel all invoices attached to this sales order."
msgstr ""
@@ -1859,25 +2059,15 @@ msgid "January"
msgstr "Leden"
#. module: sale
-#: view:sale.installer:0
-msgid "Configure Your Sales Management Application"
-msgstr "Nastavit vaše aplikaci Řízení prodeje"
-
-#. module: sale
#: model:ir.actions.act_window,name:sale.action_order_tree4
msgid "Sales Order in Progress"
msgstr "Prodejní objednávky v běhu"
#. module: sale
-#: field:sale.installer,sale_layout:0
-msgid "Sales Order Layout Improvement"
-msgstr "Vylepšení rozvržení prodejní objednávky"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:63
-#, python-format
-msgid "Error"
-msgstr "Chyba"
+#: help:sale.order,origin:0
+msgid "Reference of the document that generated this sales order request."
+msgstr ""
+"Odkaz na dokument, který generoval tento požadavek na prodejní objednávku."
#. module: sale
#: view:sale.report:0
@@ -1886,6 +2076,11 @@ msgid "Commitment Delay"
msgstr "Zpoždění závazku"
#. module: sale
+#: selection:sale.order,order_policy:0
+msgid "Deliver & invoice on demand"
+msgstr ""
+
+#. module: sale
#: model:process.node,note:sale.process_node_saleprocurement0
msgid ""
"One Procurement order for each sales order line and for each of the "
@@ -1908,14 +2103,12 @@ msgid "Confirmed sales order to invoice."
msgstr "Potvrzení prodejní objednávky k fakturaci."
#. module: sale
-#: code:addons/sale/sale.py:290
-#, python-format
-msgid "Cannot delete Sales Order(s) which are already confirmed !"
+#: view:sale.order:0
+msgid "Sales Order that haven't yet been confirmed"
msgstr ""
-"Potvrzené prodejní objednávky, které jsou již potvrzené nelze smazat."
#. module: sale
-#: code:addons/sale/sale.py:316
+#: code:addons/sale/sale.py:322
#, python-format
msgid "The sales order '%s' has been set in draft state."
msgstr "Prodejní objednávka '%s' byla nastavena do stavu koncept."
@@ -1926,37 +2119,27 @@ msgid "from stock"
msgstr "ze skladu"
#. module: sale
-#: field:sale.config.picking_policy,order_policy:0
-msgid "Shipping Default Policy"
-msgstr "Výchozí přepravní politika"
-
-#. module: sale
#: view:sale.open.invoice:0
msgid "Close"
msgstr "Uzavřít"
#. module: sale
+#: code:addons/sale/sale.py:1248
+#, python-format
+msgid "No Pricelist ! : "
+msgstr ""
+
+#. module: sale
#: field:sale.order,shipped:0
msgid "Delivered"
msgstr "Doručené množ."
#. module: sale
-#: code:addons/sale/sale.py:1115
-#, python-format
-msgid "Not enough stock !"
-msgstr "Nedostatek zásob !"
-
-#. module: sale
#: constraint:stock.move:0
msgid "You must assign a production lot for this product"
msgstr "Pro tento výrobek musíte přiřadit výrobní dávku."
#. module: sale
-#: field:sale.order.line,sequence:0
-msgid "Layout Sequence"
-msgstr "Posloupnost rozvržení"
-
-#. module: sale
#: model:ir.actions.act_window,help:sale.action_shop_form
msgid ""
"If you have more than one shop reselling your company products, you can "
@@ -1983,11 +2166,6 @@ msgid "May"
msgstr "Květen"
#. module: sale
-#: help:sale.installer,sale_order_dates:0
-msgid "Adds commitment, requested and effective dates on Sales Orders."
-msgstr ""
-
-#. module: sale
#: view:sale.order:0
#: field:sale.order,partner_id:0
#: field:sale.order.line,order_partner_id:0
@@ -1995,23 +2173,11 @@ msgid "Customer"
msgstr "Zákazník"
#. module: sale
-#: model:product.template,name:sale.advance_product_0_product_template
-msgid "Advance"
-msgstr "Dopředu"
-
-#. module: sale
#: selection:sale.report,month:0
msgid "February"
msgstr "Únor"
#. module: sale
-#: help:sale.installer,sale_journal:0
-msgid ""
-"Allows you to group and invoice your delivery orders according to different "
-"invoicing types: daily, weekly, etc."
-msgstr ""
-
-#. module: sale
#: selection:sale.report,month:0
msgid "April"
msgstr "Duben"
@@ -2022,11 +2188,6 @@ msgid "Accounting"
msgstr "Účetnictví"
#. module: sale
-#: field:sale.config.picking_policy,step:0
-msgid "Steps To Deliver a Sales Order"
-msgstr "Kroky k dodání prodejní objednávky"
-
-#. module: sale
#: view:sale.order:0
#: view:sale.order.line:0
msgid "Search Sales Order"
@@ -2038,19 +2199,18 @@ msgid "Sales Order Requisition"
msgstr "Vyžádání Prodejní objednávky"
#. module: sale
+#: code:addons/sale/sale.py:1242
+#, python-format
+msgid "Not enough stock ! : "
+msgstr ""
+
+#. module: sale
#: report:sale.order:0
#: field:sale.order,payment_term:0
msgid "Payment Term"
msgstr "Platební období"
#. module: sale
-#: help:sale.installer,sale_layout:0
-msgid ""
-"Provides some features to improve the layout of the Sales Order reports."
-msgstr ""
-"Poskytuje některé funkce k vylepšení rozvržení výkazu prodejních objednávek."
-
-#. module: sale
#: model:ir.actions.act_window,help:sale.action_order_report_all
msgid ""
"This report performs analysis on your quotations and sales orders. Analysis "
@@ -2097,3 +2257,162 @@ msgstr "Faktura založená na dodávce"
#~ msgid "Invalid XML for View Architecture!"
#~ msgstr "Invalidní XML pro zobrazení architektury!"
+
+#~ msgid "Allows you to compute delivery costs on your quotations."
+#~ msgstr "Povolí vám spočítat cenu doručení při vašem ocenění."
+
+#~ msgid "Configure Sales Order Logistics"
+#~ msgstr "Nastavit logistiku prodejní objednávky"
+
+#~ msgid "Payment Before Delivery"
+#~ msgstr "Platba před doručením"
+
+#~ msgid "All at Once"
+#~ msgstr "Vše najednou"
+
+#~ msgid "Configure Picking Policy for Sales Order"
+#~ msgstr "Nastavit politiku navádění pro prodejní objednávku"
+
+#~ msgid "Configure"
+#~ msgstr "Nastavit"
+
+#~ msgid "Delivery Order Only"
+#~ msgstr "Pouze doručovací příkaz"
+
+#~ msgid "Enhance your core Sales Application with additional functionalities."
+#~ msgstr "Rozšiřuje vaší základní Prodejní aplikaci o doplňující funkce."
+
+#~ msgid "Order Reference must be unique !"
+#~ msgstr "Odkaz objednávky musí být jedinečný !"
+
+#~ msgid "Setup your sales workflow and default values."
+#~ msgstr "Nastavení vašeho pracovního toku a výchozích hodnot prodeje."
+
+#~ msgid "Invoice On Order After Delivery"
+#~ msgstr "Fakturovat při objednávce po doručení"
+
+#~ msgid " Year "
+#~ msgstr " Rok "
+
+#~ msgid "Picking Default Policy"
+#~ msgstr "Výchozí politika naskladnění"
+
+#, python-format
+#~ msgid "You cannot cancel a sales order line that has already been invoiced !"
+#~ msgstr "Nemůžete zrušit prodejní objednávku, která už byla fakturována !"
+
+#~ msgid "Sales Order Dates"
+#~ msgstr "Data prodejních objednávek"
+
+#~ msgid "Margins in Sales Orders"
+#~ msgstr "Marže v prodejních objednávkách"
+
+#~ msgid "Sales Application Configuration"
+#~ msgstr "Nastavení prodejní aplikace"
+
+#~ msgid "Delivery Costs"
+#~ msgstr "Ceny dodání"
+
+#~ msgid "Partial Delivery"
+#~ msgstr "Částečné doručení"
+
+#~ msgid "title"
+#~ msgstr "nadpis"
+
+#~ msgid "Order date"
+#~ msgstr "Datum objednávky"
+
+#~ msgid "Shipping Policy"
+#~ msgstr "Přepravní politika"
+
+#~ msgid "Shipping & Manual Invoice"
+#~ msgstr "Přeprava & Ruční faktura"
+
+#, python-format
+#~ msgid "Picking Information !"
+#~ msgstr "Informace naskladnění !"
+
+#~ msgid "Sales Management"
+#~ msgstr "Řízení prodeje"
+
+#~ msgid "Invoice From The Picking"
+#~ msgstr "Faktura z naskladnění"
+
+#~ msgid "sale.installer"
+#~ msgstr "sale.installer"
+
+#~ msgid "Picking List & Delivery Order"
+#~ msgstr "Seznam naskladnění & Dodací příkaz"
+
+#~ msgid "Invoicing"
+#~ msgstr "Fakturování"
+
+#, python-format
+#~ msgid "Cannot delete a sales order line which is %s !"
+#~ msgstr "Nelze odstranit řádek prodejní objednávky, který je %s !"
+
+#~ msgid ""
+#~ "Gives the margin of profitability by calculating the difference between Unit "
+#~ "Price and Cost Price."
+#~ msgstr ""
+#~ "Dává marži výnosnosti vypočítáním rozdílu mezi jednotkovou cenou a výrobní "
+#~ "cenou."
+
+#~ msgid " Month "
+#~ msgstr " Měsíc "
+
+#~ msgid "Complete Delivery"
+#~ msgstr "Úplné doručení"
+
+#~ msgid " Month-1 "
+#~ msgstr " Měsíc-1 "
+
+#~ msgid "Configuration Progress"
+#~ msgstr "Průběh nastavení"
+
+#~ msgid "Product sales"
+#~ msgstr "Prodeje výrobků"
+
+#~ msgid "Ordered Date"
+#~ msgstr "Datum objednání"
+
+#~ msgid "Direct Delivery"
+#~ msgstr "Přímé dodání"
+
+#~ msgid "Invoicing journals"
+#~ msgstr "Fakturační deníky"
+
+#~ msgid "Shipped Qty"
+#~ msgstr "Přepravené množ."
+
+#~ msgid "Configure Your Sales Management Application"
+#~ msgstr "Nastavit vaše aplikaci Řízení prodeje"
+
+#~ msgid "Sales Order Layout Improvement"
+#~ msgstr "Vylepšení rozvržení prodejní objednávky"
+
+#, python-format
+#~ msgid "Cannot delete Sales Order(s) which are already confirmed !"
+#~ msgstr ""
+#~ "Potvrzené prodejní objednávky, které jsou již potvrzené nelze smazat."
+
+#~ msgid "Shipping Default Policy"
+#~ msgstr "Výchozí přepravní politika"
+
+#, python-format
+#~ msgid "Not enough stock !"
+#~ msgstr "Nedostatek zásob !"
+
+#~ msgid "Layout Sequence"
+#~ msgstr "Posloupnost rozvržení"
+
+#~ msgid "Advance"
+#~ msgstr "Dopředu"
+
+#~ msgid "Steps To Deliver a Sales Order"
+#~ msgstr "Kroky k dodání prodejní objednávky"
+
+#~ msgid ""
+#~ "Provides some features to improve the layout of the Sales Order reports."
+#~ msgstr ""
+#~ "Poskytuje některé funkce k vylepšení rozvržení výkazu prodejních objednávek."
diff --git a/addons/sale/i18n/da.po b/addons/sale/i18n/da.po
index f0c4e392425..99f04b7146e 100644
--- a/addons/sale/i18n/da.po
+++ b/addons/sale/i18n/da.po
@@ -7,15 +7,27 @@ msgid ""
msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-01-11 11:16+0000\n"
+"POT-Creation-Date: 2011-12-22 18:43+0000\n"
"PO-Revision-Date: 2011-11-08 17:59+0000\n"
"Last-Translator: OpenERP Danmark / Mikhael Saxtorph <Unknown>\n"
"Language-Team: Danish <da@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-10 04:57+0000\n"
-"X-Generator: Launchpad (build 14263)\n"
+"X-Launchpad-Export-Date: 2011-12-23 06:46+0000\n"
+"X-Generator: Launchpad (build 14560)\n"
+
+#. module: sale
+#: field:sale.config.picking_policy,timesheet:0
+msgid "Based on Timesheet"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid ""
+"Sale Order Lines that are confirmed, done or in exception state and haven't "
+"yet been invoiced"
+msgstr ""
#. module: sale
#: view:board.board:0
@@ -24,12 +36,6 @@ msgid "Sales by Salesman in last 90 days"
msgstr "Salg pr. sælger de sidste 90 dage"
#. module: sale
-#: help:sale.installer,delivery:0
-msgid "Allows you to compute delivery costs on your quotations."
-msgstr ""
-"Gir dig mulighed for at beregne leveringsomkostninger på dine tilbud."
-
-#. module: sale
#: help:sale.order,picking_policy:0
msgid ""
"If you don't have enough stock available to deliver all at once, do you "
@@ -39,6 +45,11 @@ msgstr ""
"dellevering?"
#. module: sale
+#: view:sale.order:0
+msgid "UoS"
+msgstr ""
+
+#. module: sale
#: help:sale.order,partner_shipping_id:0
msgid "Shipping address for current sales order."
msgstr "Leveringsaddresse for den aktuelle salgsordre"
@@ -62,22 +73,12 @@ msgid "Cancel Order"
msgstr "Annuller ordre"
#. module: sale
-#: view:sale.config.picking_policy:0
-msgid "Configure Sales Order Logistics"
-msgstr "Konfigurer kundeordrelogistik"
-
-#. module: sale
-#: code:addons/sale/sale.py:603
+#: code:addons/sale/sale.py:638
#, python-format
msgid "The quotation '%s' has been converted to a sales order."
msgstr "Tilbuddets '%s' er konverteret til salgsordre."
#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Payment Before Delivery"
-msgstr "Forudbetaling"
-
-#. module: sale
#: code:addons/sale/wizard/sale_make_invoice.py:42
#, python-format
msgid "Warning !"
@@ -94,12 +95,6 @@ msgid "Drives procurement orders for every sales order line."
msgstr ""
#. module: sale
-#: selection:sale.config.picking_policy,picking_policy:0
-msgid "All at Once"
-msgstr "Alt på en gang"
-
-#. module: sale
-#: field:sale.order,project_id:0
#: view:sale.report:0
#: field:sale.report,analytic_account_id:0
#: field:sale.shop,project_id:0
@@ -115,6 +110,15 @@ msgid ""
msgstr ""
#. module: sale
+#: code:addons/sale/sale.py:295
+#, python-format
+msgid ""
+"In order to delete a confirmed sale order, you must cancel it before ! To "
+"cancel a sale order, you must first cancel related picking or delivery "
+"orders."
+msgstr ""
+
+#. module: sale
#: model:process.node,name:sale.process_node_saleprocurement0
msgid "Procurement Order"
msgstr "Indkøbsordre"
@@ -126,6 +130,11 @@ msgid "Partner"
msgstr "Kontakt"
#. module: sale
+#: selection:sale.order,order_policy:0
+msgid "Invoice based on deliveries"
+msgstr ""
+
+#. module: sale
#: view:sale.order:0
msgid "Order Line"
msgstr "Ordrelinie"
@@ -160,9 +169,14 @@ msgid "Default Payment Term"
msgstr "Standard betalingsbetinelser"
#. module: sale
-#: model:ir.actions.act_window,name:sale.action_config_picking_policy
-msgid "Configure Picking Policy for Sales Order"
-msgstr "Konfigurerer plukpolitik for salgsorder"
+#: field:sale.config.picking_policy,deli_orders:0
+msgid "Based on Delivery Orders"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.picking_policy,time_unit:0
+msgid "Main Working Time Unit"
+msgstr ""
#. module: sale
#: view:sale.order:0
@@ -178,9 +192,10 @@ msgid "Disc.(%)"
msgstr "Rabat (%)."
#. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_forceassignation0
-msgid "Force Assignation"
-msgstr ""
+#: view:sale.report:0
+#: field:sale.report,price_total:0
+msgid "Total Price"
+msgstr "Total pris"
#. module: sale
#: help:sale.make.invoice,grouped:0
@@ -188,6 +203,11 @@ msgid "Check the box to group the invoices for the same customers"
msgstr "Afkryds for at gruppere fakturaer pr. kunde."
#. module: sale
+#: view:sale.order:0
+msgid "My Sale Orders"
+msgstr ""
+
+#. module: sale
#: selection:sale.order,invoice_quantity:0
msgid "Ordered Quantities"
msgstr "Ordret antal"
@@ -228,13 +248,24 @@ msgstr ""
"af plukliste' eller 'Fakturer på grundlag af ordre efter levering'."
#. module: sale
+#: field:sale.config.picking_policy,task_work:0
+msgid "Based on Tasks' Work"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
+msgid "Quotations and Sales"
+msgstr ""
+
+#. module: sale
#: model:ir.model,name:sale.model_sale_make_invoice
msgid "Sales Make Invoice"
msgstr ""
#. module: sale
-#: view:sale.order:0
-msgid "Recreate Packing"
+#: code:addons/sale/sale.py:330
+#, python-format
+msgid "Pricelist Warning!"
msgstr ""
#. module: sale
@@ -243,12 +274,10 @@ msgid "Discount (%)"
msgstr "Rabat (%)"
#. module: sale
-#: help:res.company,security_lead:0
-msgid ""
-"This is the days added to what you promise to customers for security purpose"
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_quotation_for_sale
+msgid "My Quotations"
msgstr ""
-"Det er det antal dage som du lägger till det datum som du lovat kunden av "
-"säkerhetsskäl"
#. module: sale
#: view:board.board:0
@@ -273,7 +302,22 @@ msgid "Shop Name"
msgstr "Butiksnavn"
#. module: sale
-#: code:addons/sale/sale.py:1014
+#: help:sale.order,order_policy:0
+msgid ""
+"The Invoice Policy is used to synchronise invoice and delivery operations.\n"
+" - The 'Pay before delivery' choice will first generate the invoice and "
+"then generate the picking order after the payment of this invoice.\n"
+" - The 'Deliver & Invoice on demand' will create the picking order directly "
+"and wait for the user to manually click on the 'Invoice' button to generate "
+"the draft invoice based on the sale order or the sale order lines.\n"
+" - The 'Invoice on order after delivery' choice will generate the draft "
+"invoice based on sales order after all picking lists have been finished.\n"
+" - The 'Invoice based on deliveries' choice is used to create an invoice "
+"during the picking process."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:1158
#, python-format
msgid "No Customer Defined !"
msgstr "Kunde mangler!"
@@ -284,8 +328,11 @@ msgid "Sales in Exception"
msgstr ""
#. module: sale
-#: view:sale.order:0
-msgid "Set to Draft"
+#: code:addons/sale/sale.py:1145
+#: code:addons/sale/sale.py:1264
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:70
+#, python-format
+msgid "Configuration Error !"
msgstr ""
#. module: sale
@@ -294,22 +341,7 @@ msgid "Conditions"
msgstr "Betingelser"
#. module: sale
-#: help:sale.order,order_policy:0
-msgid ""
-"The Shipping Policy is used to synchronise invoice and delivery operations.\n"
-" - The 'Pay Before delivery' choice will first generate the invoice and "
-"then generate the picking order after the payment of this invoice.\n"
-" - The 'Shipping & Manual Invoice' will create the picking order directly "
-"and wait for the user to manually click on the 'Invoice' button to generate "
-"the draft invoice.\n"
-" - The 'Invoice On Order After Delivery' choice will generate the draft "
-"invoice based on sales order after all picking lists have been finished.\n"
-" - The 'Invoice From The Picking' choice is used to create an invoice "
-"during the picking process."
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:939
+#: code:addons/sale/sale.py:1034
#, python-format
msgid ""
"There is no income category account defined in default Properties for "
@@ -317,9 +349,9 @@ msgid ""
msgstr ""
#. module: sale
-#: view:sale.installer:0
-msgid "Configure"
-msgstr ""
+#: selection:sale.report,month:0
+msgid "August"
+msgstr "August"
#. module: sale
#: constraint:stock.move:0
@@ -327,7 +359,7 @@ msgid "You try to assign a lot which is not from the same product"
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:620
+#: code:addons/sale/sale.py:655
#, python-format
msgid "invalid mode for test_state"
msgstr ""
@@ -338,7 +370,7 @@ msgid "June"
msgstr "Juni"
#. module: sale
-#: code:addons/sale/sale.py:584
+#: code:addons/sale/sale.py:617
#, python-format
msgid "Could not cancel this sales order !"
msgstr "Denne ordre kunne ikke annulléres"
@@ -359,8 +391,12 @@ msgid "October"
msgstr "Oktober"
#. module: sale
+#: sql_constraint:stock.picking:0
+msgid "Reference must be unique per Company!"
+msgstr ""
+
+#. module: sale
#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_quotation_for_sale
#: view:sale.order:0
#: view:sale.report:0
msgid "Quotations"
@@ -372,11 +408,6 @@ msgid "Pricelist for current sales order."
msgstr ""
#. module: sale
-#: selection:sale.config.picking_policy,step:0
-msgid "Delivery Order Only"
-msgstr ""
-
-#. module: sale
#: report:sale.order:0
msgid "TVA :"
msgstr ""
@@ -401,6 +432,7 @@ msgstr ""
#. module: sale
#: view:sale.order:0
#: view:sale.order.line:0
+#: field:sale.report,product_uom:0
msgid "UoM"
msgstr ""
@@ -423,13 +455,19 @@ msgid ""
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:971
+#: code:addons/sale/sale.py:1061
+#, python-format
+msgid "You cannot cancel a sale order line that has already been invoiced!"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:1066
#, python-format
msgid "You must first cancel stock moves attached to this sales order line."
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:1042
+#: code:addons/sale/sale.py:1134
#, python-format
msgid "(n/a)"
msgstr ""
@@ -463,13 +501,35 @@ msgid "Notes"
msgstr ""
#. module: sale
+#: sql_constraint:res.company:0
+msgid "The company name must be unique !"
+msgstr ""
+
+#. module: sale
#: help:sale.order,partner_invoice_id:0
msgid "Invoice address for current sales order."
msgstr ""
#. module: sale
-#: view:sale.installer:0
-msgid "Enhance your core Sales Application with additional functionalities."
+#: view:sale.report:0
+msgid "Month-1"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered month of the sales order"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:504
+#, python-format
+msgid ""
+"You cannot group sales having different currencies for the same partner."
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,picking_policy:0
+msgid "Deliver each product when available"
msgstr ""
#. module: sale
@@ -489,13 +549,13 @@ msgid "Confirmation Date"
msgstr ""
#. module: sale
-#: field:sale.order.line,address_allotment_id:0
-msgid "Allotment Partner"
-msgstr ""
+#: field:sale.order,incoterm:0
+msgid "Incoterm"
+msgstr "Incoterm"
#. module: sale
-#: sql_constraint:sale.order:0
-msgid "Order Reference must be unique !"
+#: field:sale.order.line,address_allotment_id:0
+msgid "Allotment Partner"
msgstr ""
#. module: sale
@@ -504,6 +564,28 @@ msgid "March"
msgstr "Marts"
#. module: sale
+#: constraint:stock.move:0
+msgid "You can not move products from or to a location of the type view."
+msgstr ""
+
+#. module: sale
+#: field:sale.config.picking_policy,sale_orders:0
+msgid "Based on Sales Orders"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,state:0
+msgid ""
+"Givwizard = self.browse(cr, uid, ids)[0]es the state of the quotation or "
+"sales order. \n"
+"The exception state is automatically set when a cancel operation occurs in "
+"the invoice validation (Invoice Exception) or in the picking list process "
+"(Shipping Exception). \n"
+"The 'Waiting Schedule' state is set when the invoice is confirmed but "
+"waiting for the scheduler to run on the order date."
+msgstr ""
+
+#. module: sale
#: help:sale.order,amount_total:0
msgid "The total amount."
msgstr ""
@@ -519,6 +601,11 @@ msgid "Invoice address :"
msgstr "Faktura adresse:"
#. module: sale
+#: field:sale.order.line,sequence:0
+msgid "Line Sequence"
+msgstr ""
+
+#. module: sale
#: model:process.transition,note:sale.process_transition_saleorderprocurement0
msgid ""
"For every sales order line, a procurement order is created to supply the "
@@ -565,11 +652,6 @@ msgid "Sales Order Line"
msgstr ""
#. module: sale
-#: view:sale.config.picking_policy:0
-msgid "Setup your sales workflow and default values."
-msgstr ""
-
-#. module: sale
#: field:sale.shop,warehouse_id:0
msgid "Warehouse"
msgstr "Lagersted"
@@ -606,6 +688,11 @@ msgid "Creation Date"
msgstr "Oprettelses dato"
#. module: sale
+#: model:ir.ui.menu,name:sale.menu_sales_configuration_misc
+msgid "Miscellaneous"
+msgstr ""
+
+#. module: sale
#: model:ir.actions.act_window,name:sale.action_order_line_tree3
msgid "Uninvoiced and Delivered Lines"
msgstr ""
@@ -621,14 +708,19 @@ msgid "My Sales"
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:290
-#: code:addons/sale/sale.py:966
-#: code:addons/sale/sale.py:1165
+#: code:addons/sale/sale.py:295
+#: code:addons/sale/sale.py:1061
+#: code:addons/sale/sale.py:1290
#, python-format
msgid "Invalid action !"
msgstr ""
#. module: sale
+#: view:sale.order:0
+msgid "Extra Info"
+msgstr ""
+
+#. module: sale
#: field:sale.order,pricelist_id:0
#: field:sale.report,pricelist_id:0
#: field:sale.shop,pricelist_id:0
@@ -642,13 +734,21 @@ msgid "# of Qty"
msgstr ""
#. module: sale
+#: code:addons/sale/sale.py:1314
+#, python-format
+msgid "Hour"
+msgstr ""
+
+#. module: sale
#: view:sale.order:0
msgid "Order Date"
msgstr "Ordredato"
#. module: sale
#: view:sale.order.line:0
+#: view:sale.report:0
#: field:sale.report,shipped:0
+#: field:sale.report,shipped_qty_1:0
msgid "Shipped"
msgstr "Afsendt"
@@ -658,8 +758,8 @@ msgid "All Quotations"
msgstr ""
#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Invoice On Order After Delivery"
+#: view:sale.config.picking_policy:0
+msgid "Options"
msgstr ""
#. module: sale
@@ -668,6 +768,20 @@ msgid "September"
msgstr "September"
#. module: sale
+#: code:addons/sale/sale.py:632
+#, python-format
+msgid "You cannot confirm a sale order which has no line."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:1246
+#, python-format
+msgid ""
+"You have to select a pricelist or a customer in the sales form !\n"
+"Please set one before choosing a product."
+msgstr ""
+
+#. module: sale
#: view:sale.report:0
#: field:sale.report,categ_id:0
msgid "Category of Product"
@@ -684,11 +798,6 @@ msgid "Stock Moves"
msgstr "Lagerflytning"
#. module: sale
-#: view:sale.report:0
-msgid " Year "
-msgstr " År "
-
-#. module: sale
#: field:sale.order,state:0
#: field:sale.report,state:0
msgid "Order State"
@@ -706,7 +815,7 @@ msgid "Sales By Month"
msgstr "Salg pr. måned"
#. module: sale
-#: code:addons/sale/sale.py:970
+#: code:addons/sale/sale.py:1065
#, python-format
msgid "Could not cancel sales order line!"
msgstr ""
@@ -739,41 +848,18 @@ msgid ""
msgstr ""
#. module: sale
-#: view:sale.report:0
-msgid "Extended Filters..."
+#: field:sale.order,date_order:0
+msgid "Date"
msgstr ""
#. module: sale
-#: model:ir.module.module,description:sale.module_meta_information
-msgid ""
-"\n"
-" The base module to manage quotations and sales orders.\n"
-"\n"
-" * Workflow with validation steps:\n"
-" - Quotation -> Sales order -> Invoice\n"
-" * Invoicing methods:\n"
-" - Invoice on order (before or after shipping)\n"
-" - Invoice on delivery\n"
-" - Invoice on timesheets\n"
-" - Advance invoice\n"
-" * Partners preferences (shipping, invoicing, incoterm, ...)\n"
-" * Products stocks and prices\n"
-" * Delivery methods:\n"
-" - all at once, multi-parcel\n"
-" - delivery costs\n"
-" * Dashboard for salesman that includes:\n"
-" * Your open quotations\n"
-" * Top 10 sales of the month\n"
-" * Cases statistics\n"
-" * Graph of sales by product\n"
-" * Graph of cases of the month\n"
-" "
+#: view:sale.report:0
+msgid "Extended Filters..."
msgstr ""
#. module: sale
-#: model:ir.model,name:sale.model_sale_shop
-#: view:sale.shop:0
-msgid "Sales Shop"
+#: selection:sale.order.line,state:0
+msgid "Exception"
msgstr ""
#. module: sale
@@ -782,9 +868,10 @@ msgid "Companies"
msgstr "Virksomheder"
#. module: sale
-#: selection:sale.report,month:0
-msgid "November"
-msgstr "November"
+#: code:addons/sale/sale.py:1259
+#, python-format
+msgid "No valid pricelist line found ! :"
+msgstr ""
#. module: sale
#: view:sale.order:0
@@ -792,8 +879,8 @@ msgid "History"
msgstr ""
#. module: sale
-#: field:sale.config.picking_policy,picking_policy:0
-msgid "Picking Default Policy"
+#: selection:sale.order,order_policy:0
+msgid "Invoice on order after delivery"
msgstr ""
#. module: sale
@@ -816,13 +903,14 @@ msgid ""
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:966
-#, python-format
-msgid "You cannot cancel a sales order line that has already been invoiced !"
+#: help:res.company,security_lead:0
+msgid ""
+"This is the days added to what you promise to customers for security purpose"
msgstr ""
+"Det er det antal dage som du lägger till det datum som du lovat kunden av "
+"säkerhetsskäl"
#. module: sale
-#: view:sale.order:0
#: view:sale.order.line:0
msgid "Qty"
msgstr "Antal"
@@ -833,6 +921,11 @@ msgid "References"
msgstr ""
#. module: sale
+#: view:sale.order.line:0
+msgid "My Sales Order Lines"
+msgstr ""
+
+#. module: sale
#: model:process.transition.action,name:sale.process_transition_action_cancel0
#: model:process.transition.action,name:sale.process_transition_action_cancel1
#: model:process.transition.action,name:sale.process_transition_action_cancel2
@@ -844,13 +937,8 @@ msgid "Cancel"
msgstr ""
#. module: sale
-#: field:sale.installer,sale_order_dates:0
-msgid "Sales Order Dates"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order.line,state:0
-msgid "Exception"
+#: sql_constraint:sale.order:0
+msgid "Order Reference must be unique per Company!"
msgstr ""
#. module: sale
@@ -863,18 +951,18 @@ msgid "Create Invoice"
msgstr ""
#. module: sale
-#: field:sale.installer,sale_margin:0
-msgid "Margins in Sales Orders"
+#: view:sale.order:0
+msgid "Total Tax Excluded"
msgstr ""
#. module: sale
-#: view:sale.order:0
-msgid "Total Tax Excluded"
+#: view:sale.order.line:0
+msgid "Order reference"
msgstr ""
#. module: sale
-#: view:sale.order:0
-msgid "Compute"
+#: view:sale.open.invoice:0
+msgid "You invoice has been successfully created!"
msgstr ""
#. module: sale
@@ -894,23 +982,20 @@ msgid "Open Invoice"
msgstr ""
#. module: sale
-#: report:sale.order:0
-#: view:sale.order.line:0
-msgid "Price"
-msgstr "Pris"
+#: model:ir.actions.server,name:sale.ir_actions_server_edi_sale
+msgid "Auto-email confirmed sale orders"
+msgstr ""
#. module: sale
-#: model:ir.actions.act_window,name:sale.action_sale_installer
-#: view:sale.config.picking_policy:0
-#: view:sale.installer:0
-msgid "Sales Application Configuration"
+#: code:addons/sale/sale.py:413
+#, python-format
+msgid "There is no sales journal defined for this company: \"%s\" (id:%d)"
msgstr ""
#. module: sale
-#: view:sale.report:0
-#: field:sale.report,price_total:0
-msgid "Total Price"
-msgstr "Total pris"
+#: model:process.transition.action,name:sale.process_transition_action_forceassignation0
+msgid "Force Assignation"
+msgstr ""
#. module: sale
#: selection:sale.order.line,type:0
@@ -923,6 +1008,11 @@ msgid "Based on the shipped or on the ordered quantities."
msgstr ""
#. module: sale
+#: selection:sale.order,picking_policy:0
+msgid "Deliver all products at once"
+msgstr ""
+
+#. module: sale
#: field:sale.order,picking_ids:0
msgid "Related Picking"
msgstr ""
@@ -954,8 +1044,14 @@ msgid "Create Delivery Order"
msgstr ""
#. module: sale
-#: field:sale.installer,delivery:0
-msgid "Delivery Costs"
+#: code:addons/sale/sale.py:1290
+#, python-format
+msgid "Cannot delete a sales order line which is in state '%s'!"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Qty(UoS)"
msgstr ""
#. module: sale
@@ -970,12 +1066,12 @@ msgstr ""
#. module: sale
#: view:sale.report:0
-msgid "Sales by Product Category"
+msgid "Ordered date of the sales order"
msgstr ""
#. module: sale
-#: selection:sale.order,picking_policy:0
-msgid "Partial Delivery"
+#: view:sale.report:0
+msgid "Sales by Product Category"
msgstr ""
#. module: sale
@@ -984,8 +1080,9 @@ msgid "Confirm Quotation"
msgstr ""
#. module: sale
-#: help:sale.order,origin:0
-msgid "Reference of the document that generated this sales order request."
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:63
+#, python-format
+msgid "Error"
msgstr ""
#. module: sale
@@ -1018,19 +1115,13 @@ msgid "Procurement Method"
msgstr ""
#. module: sale
-#: view:sale.config.picking_policy:0
-#: view:sale.installer:0
-msgid "title"
-msgstr ""
-
-#. module: sale
#: model:process.node,name:sale.process_node_packinglist0
msgid "Pick List"
msgstr ""
#. module: sale
#: view:sale.order:0
-msgid "Order date"
+msgid "Set to Draft"
msgstr ""
#. module: sale
@@ -1039,6 +1130,85 @@ msgid "Document of the move to the output or to the customer."
msgstr ""
#. module: sale
+#: model:email.template,body_text:sale.email_template_edi_sale
+msgid ""
+"\n"
+"Hello${object.partner_order_id.name and ' ' or "
+"''}${object.partner_order_id.name or ''},\n"
+"\n"
+"Here is your order confirmation for ${object.partner_id.name}:\n"
+" | Order number: *${object.name}*\n"
+" | Order total: *${object.amount_total} "
+"${object.pricelist_id.currency_id.name}*\n"
+" | Order date: ${object.date_order}\n"
+" % if object.origin:\n"
+" | Order reference: ${object.origin}\n"
+" % endif\n"
+" % if object.client_order_ref:\n"
+" | Your reference: ${object.client_order_ref}<br />\n"
+" % endif\n"
+" | Your contact: ${object.user_id.name} ${object.user_id.user_email "
+"and '<%s>'%(object.user_id.user_email) or ''}\n"
+"\n"
+"You can view the order confirmation, download it and even pay online using "
+"the following link:\n"
+" ${ctx.get('edi_web_url_view') or 'n/a'}\n"
+"\n"
+"% if object.order_policy in ('prepaid','manual') and "
+"object.company_id.paypal_account:\n"
+"<% \n"
+"comp_name = quote(object.company_id.name)\n"
+"order_name = quote(object.name)\n"
+"paypal_account = quote(object.company_id.paypal_account)\n"
+"order_amount = quote(str(object.amount_total))\n"
+"cur_name = quote(object.pricelist_id.currency_id.name)\n"
+"paypal_url = \"https://www.paypal.com/cgi-"
+"bin/webscr?cmd=_xclick&business=%s&item_name=%s%%20Order%%20%s&invoice=%s&amo"
+"unt=%s\" \\\n"
+" "
+"\"&currency_code=%s&button_subtype=services&no_note=1&bn=OpenERP_Order_PayNow"
+"_%s\" % \\\n"
+" "
+"(paypal_account,comp_name,order_name,order_name,order_amount,cur_name,cur_nam"
+"e)\n"
+"%>\n"
+"It is also possible to directly pay with Paypal:\n"
+" ${paypal_url}\n"
+"% endif\n"
+"\n"
+"If you have any question, do not hesitate to contact us.\n"
+"\n"
+"\n"
+"Thank you for choosing ${object.company_id.name}!\n"
+"\n"
+"\n"
+"--\n"
+"${object.user_id.name} ${object.user_id.user_email and "
+"'<%s>'%(object.user_id.user_email) or ''}\n"
+"${object.company_id.name}\n"
+"% if object.company_id.street:\n"
+"${object.company_id.street or ''}\n"
+"% endif\n"
+"% if object.company_id.street2:\n"
+"${object.company_id.street2}\n"
+"% endif\n"
+"% if object.company_id.city or object.company_id.zip:\n"
+"${object.company_id.zip or ''} ${object.company_id.city or ''}\n"
+"% endif\n"
+"% if object.company_id.country_id:\n"
+"${object.company_id.state_id and ('%s, ' % object.company_id.state_id.name) "
+"or ''} ${object.company_id.country_id.name or ''}\n"
+"% endif\n"
+"% if object.company_id.phone:\n"
+"Phone: ${object.company_id.phone}\n"
+"% endif\n"
+"% if object.company_id.website:\n"
+"${object.company_id.website or ''}\n"
+"% endif\n"
+" "
+msgstr ""
+
+#. module: sale
#: model:process.transition.action,name:sale.process_transition_action_validate0
msgid "Validate"
msgstr ""
@@ -1061,8 +1231,8 @@ msgid "Taxes"
msgstr ""
#. module: sale
-#: field:sale.order,order_policy:0
-msgid "Shipping Policy"
+#: view:sale.order:0
+msgid "Sales Order ready to be invoiced"
msgstr ""
#. module: sale
@@ -1082,8 +1252,8 @@ msgid "Create Invoices"
msgstr ""
#. module: sale
-#: view:sale.order:0
-msgid "Extra Info"
+#: view:sale.report:0
+msgid "Sales order created in current month"
msgstr ""
#. module: sale
@@ -1092,11 +1262,24 @@ msgid "Fax :"
msgstr ""
#. module: sale
+#: help:sale.order.line,type:0
+msgid ""
+"If 'on order', it triggers a procurement when the sale order is confirmed to "
+"create a task, purchase order or manufacturing order linked to this sale "
+"order line."
+msgstr ""
+
+#. module: sale
#: field:sale.advance.payment.inv,amount:0
msgid "Advance Amount"
msgstr ""
#. module: sale
+#: field:sale.config.picking_policy,charge_delivery:0
+msgid "Do you charge the delivery?"
+msgstr ""
+
+#. module: sale
#: selection:sale.order,invoice_quantity:0
msgid "Shipped Quantities"
msgstr ""
@@ -1107,25 +1290,45 @@ msgid "Invoice Based on Sales Orders"
msgstr ""
#. module: sale
+#: code:addons/sale/sale.py:331
+#, python-format
+msgid ""
+"If you change the pricelist of this order (and eventually the currency), "
+"prices of existing order lines will not be updated."
+msgstr ""
+
+#. module: sale
#: model:ir.model,name:sale.model_stock_picking
msgid "Picking List"
msgstr "Plukkeliste"
#. module: sale
-#: code:addons/sale/sale.py:387
-#: code:addons/sale/sale.py:920
-#: code:addons/sale/sale.py:938
+#: code:addons/sale/sale.py:412
+#: code:addons/sale/sale.py:503
+#: code:addons/sale/sale.py:632
+#: code:addons/sale/sale.py:1015
+#: code:addons/sale/sale.py:1033
#, python-format
msgid "Error !"
msgstr "Fejl!"
#. module: sale
-#: code:addons/sale/sale.py:570
+#: code:addons/sale/sale.py:603
#, python-format
msgid "Could not cancel sales order !"
msgstr ""
#. module: sale
+#: view:sale.order:0
+msgid "Qty(UoM)"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered Year of the sales order"
+msgstr ""
+
+#. module: sale
#: selection:sale.report,month:0
msgid "July"
msgstr "Juli"
@@ -1142,35 +1345,25 @@ msgid "Shipping Exception"
msgstr ""
#. module: sale
-#: field:sale.make.invoice,grouped:0
-msgid "Group the invoices"
+#: code:addons/sale/sale.py:1143
+#, python-format
+msgid "Picking Information ! : "
msgstr ""
#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Shipping & Manual Invoice"
+#: field:sale.make.invoice,grouped:0
+msgid "Group the invoices"
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:1051
-#, python-format
-msgid "Picking Information !"
+#: field:sale.order,order_policy:0
+msgid "Invoice Policy"
msgstr ""
#. module: sale
-#: view:sale.report:0
-#: field:sale.report,month:0
-msgid "Month"
-msgstr "Måned"
-
-#. module: sale
-#: model:ir.module.module,shortdesc:sale.module_meta_information
-msgid "Sales Management"
-msgstr "Salgs administration"
-
-#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Invoice From The Picking"
+#: model:ir.actions.act_window,name:sale.action_config_picking_policy
+#: view:sale.config.picking_policy:0
+msgid "Setup your Invoicing Method"
msgstr ""
#. module: sale
@@ -1180,27 +1373,30 @@ msgstr ""
#. module: sale
#: view:sale.report:0
-#: field:sale.report,uom_name:0
msgid "Reference UoM"
msgstr ""
#. module: sale
+#: view:sale.config.picking_policy:0
+msgid ""
+"This tool will help you to install the right module and configure the system "
+"according to the method you use to invoice your customers."
+msgstr ""
+
+#. module: sale
#: model:ir.model,name:sale.model_sale_order_line_make_invoice
msgid "Sale OrderLine Make_invoice"
msgstr ""
#. module: sale
-#: help:sale.config.picking_policy,step:0
-msgid ""
-"By default, OpenERP is able to manage complex routing and paths of products "
-"in your warehouse and partner locations. This will configure the most common "
-"and simple methods to deliver products to the customer in one or two "
-"operations by the worker."
+#: selection:sale.order,state:0
+#: selection:sale.report,state:0
+msgid "Invoice Exception"
msgstr ""
#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_tree
-msgid "Old Quotations"
+#: model:process.node,note:sale.process_node_saleorder0
+msgid "Drives procurement and invoicing"
msgstr ""
#. module: sale
@@ -1216,6 +1412,22 @@ msgid "Sales Analysis"
msgstr ""
#. module: sale
+#: code:addons/sale/sale.py:1138
+#, python-format
+msgid ""
+"You selected a quantity of %d Units.\n"
+"But it's not compatible with the selected packaging.\n"
+"Here is a proposition of quantities according to the packaging:\n"
+"EAN: %s Quantity: %s Type of ul: %s"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Recreate Packing"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
#: field:sale.order.line,property_ids:0
msgid "Properties"
msgstr ""
@@ -1242,7 +1454,17 @@ msgid ""
msgstr ""
#. module: sale
-#: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
+#: view:sale.order.line:0
+msgid "Confirmed sale order lines, not yet delivered"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:473
+#, python-format
+msgid "Customer Invoices"
+msgstr ""
+
+#. module: sale
#: model:process.process,name:sale.process_process_salesprocess0
#: view:sale.order:0
#: view:sale.report:0
@@ -1264,18 +1486,13 @@ msgid "Done"
msgstr "Udført!"
#. module: sale
-#: model:ir.model,name:sale.model_sale_installer
-msgid "sale.installer"
-msgstr ""
-
-#. module: sale
#: model:process.node,name:sale.process_node_invoice0
#: model:process.node,name:sale.process_node_invoiceafterdelivery0
msgid "Invoice"
msgstr "Faktura"
#. module: sale
-#: code:addons/sale/sale.py:1014
+#: code:addons/sale/sale.py:1158
#, python-format
msgid ""
"You have to select a customer in the sales form !\n"
@@ -1283,11 +1500,6 @@ msgid ""
msgstr ""
#. module: sale
-#: selection:sale.config.picking_policy,step:0
-msgid "Picking List & Delivery Order"
-msgstr ""
-
-#. module: sale
#: field:sale.order,origin:0
msgid "Source Document"
msgstr ""
@@ -1313,7 +1525,7 @@ msgid "The amount without tax."
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:571
+#: code:addons/sale/sale.py:604
#, python-format
msgid "You must first cancel all picking attached to this sales order."
msgstr ""
@@ -1324,9 +1536,15 @@ msgid "Sales Advance Payment Invoice"
msgstr ""
#. module: sale
-#: field:sale.order,incoterm:0
-msgid "Incoterm"
-msgstr "Incoterm"
+#: view:sale.report:0
+#: field:sale.report,month:0
+msgid "Month"
+msgstr "Måned"
+
+#. module: sale
+#: model:email.template,subject:sale.email_template_edi_sale
+msgid "${object.company_id.name} Order (Ref ${object.name or 'n/a' })"
+msgstr ""
#. module: sale
#: view:sale.order.line:0
@@ -1337,11 +1555,6 @@ msgid "Product"
msgstr "Vare"
#. module: sale
-#: model:ir.ui.menu,name:sale.menu_invoiced
-msgid "Invoicing"
-msgstr "Fakturering"
-
-#. module: sale
#: model:process.transition.action,name:sale.process_transition_action_cancelassignation0
msgid "Cancel Assignation"
msgstr ""
@@ -1352,14 +1565,10 @@ msgid "sale.config.picking_policy"
msgstr ""
#. module: sale
-#: help:sale.order,state:0
-msgid ""
-"Gives the state of the quotation or sales order. \n"
-"The exception state is automatically set when a cancel operation occurs in "
-"the invoice validation (Invoice Exception) or in the picking list process "
-"(Shipping Exception). \n"
-"The 'Waiting Schedule' state is set when the invoice is confirmed but "
-"waiting for the scheduler to run on the date 'Ordered Date'."
+#: view:account.invoice.report:0
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_turnover_by_month
+msgid "Monthly Turnover"
msgstr ""
#. module: sale
@@ -1378,7 +1587,6 @@ msgid "Product UoS"
msgstr ""
#. module: sale
-#: selection:sale.order,state:0
#: selection:sale.report,state:0
msgid "Manual In Progress"
msgstr ""
@@ -1399,7 +1607,8 @@ msgid "Order"
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:921
+#: code:addons/sale/sale.py:1016
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:71
#, python-format
msgid "There is no income account defined for this product: \"%s\" (id:%d)"
msgstr ""
@@ -1419,7 +1628,7 @@ msgid ""
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:1116
+#: code:addons/sale/sale.py:1238
#, python-format
msgid ""
"You plan to sell %.2f %s but you only have %.2f %s available !\n"
@@ -1448,10 +1657,10 @@ msgid "Total"
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:388
-#, python-format
-msgid "There is no sales journal defined for this company: \"%s\" (id:%d)"
-msgstr ""
+#: report:sale.order:0
+#: view:sale.order.line:0
+msgid "Price"
+msgstr "Pris"
#. module: sale
#: model:process.transition,note:sale.process_transition_deliver0
@@ -1462,9 +1671,14 @@ msgid ""
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:1165
-#, python-format
-msgid "Cannot delete a sales order line which is %s !"
+#: selection:sale.order,order_policy:0
+msgid "Pay before delivery"
+msgstr ""
+
+#. module: sale
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.open_board_sales
+msgid "Sales Dashboard"
msgstr ""
#. module: sale
@@ -1476,6 +1690,7 @@ msgstr ""
#. module: sale
#: view:sale.order:0
+#: selection:sale.order,state:0
#: view:sale.order.line:0
msgid "To Invoice"
msgstr ""
@@ -1486,6 +1701,11 @@ msgid "Date on which sales order is confirmed."
msgstr ""
#. module: sale
+#: field:sale.order,project_id:0
+msgid "Contract/Analytic Account"
+msgstr ""
+
+#. module: sale
#: field:sale.order,company_id:0
#: field:sale.order.line,company_id:0
#: view:sale.report:0
@@ -1505,9 +1725,11 @@ msgid "The amount to be invoiced in advance."
msgstr ""
#. module: sale
-#: selection:sale.order,state:0
-#: selection:sale.report,state:0
-msgid "Invoice Exception"
+#: code:addons/sale/sale.py:1256
+#, python-format
+msgid ""
+"Couldn't find a pricelist line matching this product and quantity.\n"
+"You have to change either the product, the quantity or the pricelist."
msgstr ""
#. module: sale
@@ -1517,13 +1739,6 @@ msgid ""
msgstr ""
#. module: sale
-#: help:sale.installer,sale_margin:0
-msgid ""
-"Gives the margin of profitability by calculating the difference between Unit "
-"Price and Cost Price."
-msgstr ""
-
-#. module: sale
#: view:sale.make.invoice:0
#: view:sale.order.line.make.invoice:0
msgid "Create invoices"
@@ -1542,6 +1757,11 @@ msgid "Cancelled"
msgstr ""
#. module: sale
+#: view:sale.order.line:0
+msgid "Sales Order Lines related to a Sales Order of mine"
+msgstr ""
+
+#. module: sale
#: model:ir.actions.act_window,name:sale.action_shop_form
#: model:ir.ui.menu,name:sale.menu_action_shop_form
#: field:sale.order,shop_id:0
@@ -1551,17 +1771,12 @@ msgid "Shop"
msgstr ""
#. module: sale
-#: view:sale.report:0
-msgid " Month "
-msgstr " Måned "
-
-#. module: sale
#: field:sale.report,date_confirm:0
msgid "Date Confirm"
msgstr ""
#. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:111
+#: code:addons/sale/wizard/sale_line_invoice.py:113
#, python-format
msgid "Warning"
msgstr ""
@@ -1573,17 +1788,6 @@ msgid "Sales by Month"
msgstr "Salg pr. måned"
#. module: sale
-#: code:addons/sale/sale.py:1045
-#, python-format
-msgid ""
-"You selected a quantity of %d Units.\n"
-"But it's not compatible with the selected packaging.\n"
-"Here is a proposition of quantities according to the packaging:\n"
-"\n"
-"EAN: %s Quantity: %s Type of ul: %s"
-msgstr ""
-
-#. module: sale
#: model:ir.model,name:sale.model_sale_order
#: model:process.node,name:sale.process_node_order0
#: model:process.node,name:sale.process_node_saleorder0
@@ -1599,6 +1803,11 @@ msgid "Quantity (UoS)"
msgstr ""
#. module: sale
+#: view:sale.order.line:0
+msgid "Sale Order Lines that are in 'done' state"
+msgstr ""
+
+#. module: sale
#: model:process.transition,note:sale.process_transition_packing0
msgid ""
"The Pick List form is created as soon as the sales order is confirmed, in "
@@ -1613,6 +1822,11 @@ msgid "Confirmed"
msgstr ""
#. module: sale
+#: field:sale.config.picking_policy,order_policy:0
+msgid "Main Method Based On"
+msgstr ""
+
+#. module: sale
#: model:process.transition.action,name:sale.process_transition_action_confirm0
msgid "Confirm"
msgstr ""
@@ -1635,6 +1849,7 @@ msgid "Invoice Lines"
msgstr ""
#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_product_tree
#: view:sale.order:0
#: view:sale.order.line:0
msgid "Sales Order Lines"
@@ -1651,30 +1866,18 @@ msgid "Configuration"
msgstr ""
#. module: sale
-#: selection:sale.order,picking_policy:0
-msgid "Complete Delivery"
+#: code:addons/sale/edi/sale_order.py:146
+#, python-format
+msgid "EDI Pricelist (%s)"
msgstr ""
#. module: sale
#: view:sale.report:0
-msgid " Month-1 "
+msgid "Sales order created in current year"
msgstr ""
#. module: sale
-#: help:sale.config.picking_policy,picking_policy:0
-msgid ""
-"The Shipping Policy is used to configure per order if you want to deliver as "
-"soon as possible when one product is available or you wait that all products "
-"are available.."
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "August"
-msgstr "August"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:111
+#: code:addons/sale/wizard/sale_line_invoice.py:113
#, python-format
msgid ""
"Invoice cannot be created for this Sales Order Line due to one of the "
@@ -1684,6 +1887,11 @@ msgid ""
msgstr ""
#. module: sale
+#: view:sale.order.line:0
+msgid "Sale order lines done"
+msgstr ""
+
+#. module: sale
#: field:sale.order.line,th_weight:0
msgid "Weight"
msgstr ""
@@ -1702,7 +1910,6 @@ msgstr "December"
#. module: sale
#: field:sale.config.picking_policy,config_logo:0
-#: field:sale.installer,config_logo:0
msgid "Image"
msgstr "Billede"
@@ -1732,8 +1939,8 @@ msgid "Salesman"
msgstr "Sælger"
#. module: sale
-#: model:process.node,note:sale.process_node_saleorder0
-msgid "Drives procurement and invoicing"
+#: model:ir.actions.act_window,name:sale.action_order_tree
+msgid "Old Quotations"
msgstr ""
#. module: sale
@@ -1742,7 +1949,7 @@ msgid "Untaxed Amount"
msgstr ""
#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:163
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:170
#: model:ir.actions.act_window,name:sale.action_view_sale_advance_payment_inv
#: view:sale.advance.payment.inv:0
#: view:sale.order:0
@@ -1751,7 +1958,7 @@ msgid "Advance Invoice"
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:591
+#: code:addons/sale/sale.py:624
#, python-format
msgid "The sales order '%s' has been cancelled."
msgstr ""
@@ -1786,19 +1993,19 @@ msgid "Packings"
msgstr ""
#. module: sale
-#: field:sale.config.picking_policy,progress:0
-#: field:sale.installer,progress:0
-msgid "Configuration Progress"
+#: view:sale.order.line:0
+msgid "Sale Order Lines ready to be invoiced"
msgstr ""
#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_product_tree
-msgid "Product sales"
+#: view:sale.report:0
+msgid "Sales order created in last month"
msgstr ""
#. module: sale
-#: field:sale.order,date_order:0
-msgid "Ordered Date"
+#: model:ir.actions.act_window,name:sale.action_email_templates
+#: model:ir.ui.menu,name:sale.menu_email_templates
+msgid "Email Templates"
msgstr ""
#. module: sale
@@ -1809,14 +2016,15 @@ msgid "Sales Orders"
msgstr "Salgsordrer"
#. module: sale
-#: selection:sale.config.picking_policy,picking_policy:0
-msgid "Direct Delivery"
+#: model:ir.model,name:sale.model_sale_shop
+#: view:sale.shop:0
+msgid "Sales Shop"
msgstr ""
#. module: sale
-#: field:sale.installer,sale_journal:0
-msgid "Invoicing journals"
-msgstr ""
+#: selection:sale.report,month:0
+msgid "November"
+msgstr "November"
#. module: sale
#: field:sale.advance.payment.inv,product_id:0
@@ -1824,18 +2032,12 @@ msgid "Advance Product"
msgstr ""
#. module: sale
-#: view:sale.report:0
-#: field:sale.report,shipped_qty_1:0
-msgid "Shipped Qty"
-msgstr ""
-
-#. module: sale
-#: view:sale.open.invoice:0
-msgid "You invoice has been successfully created!"
+#: view:sale.order:0
+msgid "Compute"
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:585
+#: code:addons/sale/sale.py:618
#, python-format
msgid "You must first cancel all invoices attached to this sales order."
msgstr ""
@@ -1846,24 +2048,13 @@ msgid "January"
msgstr "Januar"
#. module: sale
-#: view:sale.installer:0
-msgid "Configure Your Sales Management Application"
-msgstr ""
-
-#. module: sale
#: model:ir.actions.act_window,name:sale.action_order_tree4
msgid "Sales Order in Progress"
msgstr ""
#. module: sale
-#: field:sale.installer,sale_layout:0
-msgid "Sales Order Layout Improvement"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:63
-#, python-format
-msgid "Error"
+#: help:sale.order,origin:0
+msgid "Reference of the document that generated this sales order request."
msgstr ""
#. module: sale
@@ -1873,6 +2064,11 @@ msgid "Commitment Delay"
msgstr ""
#. module: sale
+#: selection:sale.order,order_policy:0
+msgid "Deliver & invoice on demand"
+msgstr ""
+
+#. module: sale
#: model:process.node,note:sale.process_node_saleprocurement0
msgid ""
"One Procurement order for each sales order line and for each of the "
@@ -1895,13 +2091,12 @@ msgid "Confirmed sales order to invoice."
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:290
-#, python-format
-msgid "Cannot delete Sales Order(s) which are already confirmed !"
+#: view:sale.order:0
+msgid "Sales Order that haven't yet been confirmed"
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:316
+#: code:addons/sale/sale.py:322
#, python-format
msgid "The sales order '%s' has been set in draft state."
msgstr ""
@@ -1912,13 +2107,14 @@ msgid "from stock"
msgstr ""
#. module: sale
-#: field:sale.config.picking_policy,order_policy:0
-msgid "Shipping Default Policy"
+#: view:sale.open.invoice:0
+msgid "Close"
msgstr ""
#. module: sale
-#: view:sale.open.invoice:0
-msgid "Close"
+#: code:addons/sale/sale.py:1248
+#, python-format
+msgid "No Pricelist ! : "
msgstr ""
#. module: sale
@@ -1927,22 +2123,11 @@ msgid "Delivered"
msgstr "Leveret"
#. module: sale
-#: code:addons/sale/sale.py:1115
-#, python-format
-msgid "Not enough stock !"
-msgstr ""
-
-#. module: sale
#: constraint:stock.move:0
msgid "You must assign a production lot for this product"
msgstr ""
#. module: sale
-#: field:sale.order.line,sequence:0
-msgid "Layout Sequence"
-msgstr ""
-
-#. module: sale
#: model:ir.actions.act_window,help:sale.action_shop_form
msgid ""
"If you have more than one shop reselling your company products, you can "
@@ -1969,11 +2154,6 @@ msgid "May"
msgstr "Maj"
#. module: sale
-#: help:sale.installer,sale_order_dates:0
-msgid "Adds commitment, requested and effective dates on Sales Orders."
-msgstr ""
-
-#. module: sale
#: view:sale.order:0
#: field:sale.order,partner_id:0
#: field:sale.order.line,order_partner_id:0
@@ -1981,23 +2161,11 @@ msgid "Customer"
msgstr "Kunde"
#. module: sale
-#: model:product.template,name:sale.advance_product_0_product_template
-msgid "Advance"
-msgstr ""
-
-#. module: sale
#: selection:sale.report,month:0
msgid "February"
msgstr "Februar"
#. module: sale
-#: help:sale.installer,sale_journal:0
-msgid ""
-"Allows you to group and invoice your delivery orders according to different "
-"invoicing types: daily, weekly, etc."
-msgstr ""
-
-#. module: sale
#: selection:sale.report,month:0
msgid "April"
msgstr "April"
@@ -2008,11 +2176,6 @@ msgid "Accounting"
msgstr ""
#. module: sale
-#: field:sale.config.picking_policy,step:0
-msgid "Steps To Deliver a Sales Order"
-msgstr ""
-
-#. module: sale
#: view:sale.order:0
#: view:sale.order.line:0
msgid "Search Sales Order"
@@ -2024,15 +2187,15 @@ msgid "Sales Order Requisition"
msgstr ""
#. module: sale
-#: report:sale.order:0
-#: field:sale.order,payment_term:0
-msgid "Payment Term"
+#: code:addons/sale/sale.py:1242
+#, python-format
+msgid "Not enough stock ! : "
msgstr ""
#. module: sale
-#: help:sale.installer,sale_layout:0
-msgid ""
-"Provides some features to improve the layout of the Sales Order reports."
+#: report:sale.order:0
+#: field:sale.order,payment_term:0
+msgid "Payment Term"
msgstr ""
#. module: sale
@@ -2066,3 +2229,31 @@ msgstr "År"
#: selection:sale.config.picking_policy,order_policy:0
msgid "Invoice Based on Deliveries"
msgstr ""
+
+#~ msgid " Year "
+#~ msgstr " År "
+
+#~ msgid "Invoicing"
+#~ msgstr "Fakturering"
+
+#~ msgid " Month "
+#~ msgstr " Måned "
+
+#~ msgid "Sales Management"
+#~ msgstr "Salgs administration"
+
+#~ msgid "Payment Before Delivery"
+#~ msgstr "Forudbetaling"
+
+#~ msgid "Allows you to compute delivery costs on your quotations."
+#~ msgstr ""
+#~ "Gir dig mulighed for at beregne leveringsomkostninger på dine tilbud."
+
+#~ msgid "Configure Sales Order Logistics"
+#~ msgstr "Konfigurer kundeordrelogistik"
+
+#~ msgid "All at Once"
+#~ msgstr "Alt på en gang"
+
+#~ msgid "Configure Picking Policy for Sales Order"
+#~ msgstr "Konfigurerer plukpolitik for salgsorder"
diff --git a/addons/sale/i18n/de.po b/addons/sale/i18n/de.po
index da222851524..4922a9980fe 100644
--- a/addons/sale/i18n/de.po
+++ b/addons/sale/i18n/de.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2011-01-11 11:16+0000\n"
+"POT-Creation-Date: 2011-12-22 18:43+0000\n"
"PO-Revision-Date: 2011-01-18 11:11+0000\n"
"Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
"consulting.net>\n"
@@ -15,8 +15,20 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-05 05:16+0000\n"
-"X-Generator: Launchpad (build 14231)\n"
+"X-Launchpad-Export-Date: 2011-12-23 06:46+0000\n"
+"X-Generator: Launchpad (build 14560)\n"
+
+#. module: sale
+#: field:sale.config.picking_policy,timesheet:0
+msgid "Based on Timesheet"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid ""
+"Sale Order Lines that are confirmed, done or in exception state and haven't "
+"yet been invoiced"
+msgstr ""
#. module: sale
#: view:board.board:0
@@ -25,11 +37,6 @@ msgid "Sales by Salesman in last 90 days"
msgstr "Verkäufe pro Verkäufer der letzten 90 Tage"
#. module: sale
-#: help:sale.installer,delivery:0
-msgid "Allows you to compute delivery costs on your quotations."
-msgstr "Erlaubt die Kalkulation von Lieferkosten für das Angebot"
-
-#. module: sale
#: help:sale.order,picking_policy:0
msgid ""
"If you don't have enough stock available to deliver all at once, do you "
@@ -37,6 +44,11 @@ msgid ""
msgstr "Erlaube Teillieferung, wenn nicht genügend auf Lager liegt."
#. module: sale
+#: view:sale.order:0
+msgid "UoS"
+msgstr ""
+
+#. module: sale
#: help:sale.order,partner_shipping_id:0
msgid "Shipping address for current sales order."
msgstr "Lieferadresse für diesen Verkaufsauftrag."
@@ -60,22 +72,12 @@ msgid "Cancel Order"
msgstr "Auftrag stornieren"
#. module: sale
-#: view:sale.config.picking_policy:0
-msgid "Configure Sales Order Logistics"
-msgstr "Logistik für Verkaufsaufträge konfigurieren"
-
-#. module: sale
-#: code:addons/sale/sale.py:603
+#: code:addons/sale/sale.py:638
#, python-format
msgid "The quotation '%s' has been converted to a sales order."
msgstr "Das Angebot '%s' wurde in einen Verkaufsauftrag konvertiert."
#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Payment Before Delivery"
-msgstr "Zahlung vor Auslieferung"
-
-#. module: sale
#: code:addons/sale/wizard/sale_make_invoice.py:42
#, python-format
msgid "Warning !"
@@ -94,12 +96,6 @@ msgstr ""
"Verkaufsauftragsposition."
#. module: sale
-#: selection:sale.config.picking_policy,picking_policy:0
-msgid "All at Once"
-msgstr "Nur Gesamtmenge liefern"
-
-#. module: sale
-#: field:sale.order,project_id:0
#: view:sale.report:0
#: field:sale.report,analytic_account_id:0
#: field:sale.shop,project_id:0
@@ -119,6 +115,15 @@ msgstr ""
"fakturieren."
#. module: sale
+#: code:addons/sale/sale.py:295
+#, python-format
+msgid ""
+"In order to delete a confirmed sale order, you must cancel it before ! To "
+"cancel a sale order, you must first cancel related picking or delivery "
+"orders."
+msgstr ""
+
+#. module: sale
#: model:process.node,name:sale.process_node_saleprocurement0
msgid "Procurement Order"
msgstr "Beschaffungsauftrag"
@@ -130,6 +135,11 @@ msgid "Partner"
msgstr "Partner"
#. module: sale
+#: selection:sale.order,order_policy:0
+msgid "Invoice based on deliveries"
+msgstr ""
+
+#. module: sale
#: view:sale.order:0
msgid "Order Line"
msgstr "Auftragszeile"
@@ -179,9 +189,14 @@ msgid "Default Payment Term"
msgstr "Standard Zahlungsbedingung"
#. module: sale
-#: model:ir.actions.act_window,name:sale.action_config_picking_policy
-msgid "Configure Picking Policy for Sales Order"
-msgstr "Konfiguration der Lieferbedingungen für diesen Verkaufsauftrag"
+#: field:sale.config.picking_policy,deli_orders:0
+msgid "Based on Delivery Orders"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.picking_policy,time_unit:0
+msgid "Main Working Time Unit"
+msgstr ""
#. module: sale
#: view:sale.order:0
@@ -197,9 +212,10 @@ msgid "Disc.(%)"
msgstr "Rabatt (%)"
#. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_forceassignation0
-msgid "Force Assignation"
-msgstr "Erzwinge Zuweisung"
+#: view:sale.report:0
+#: field:sale.report,price_total:0
+msgid "Total Price"
+msgstr "Gesamtumsatz"
#. module: sale
#: help:sale.make.invoice,grouped:0
@@ -209,6 +225,11 @@ msgstr ""
"sollen"
#. module: sale
+#: view:sale.order:0
+msgid "My Sale Orders"
+msgstr ""
+
+#. module: sale
#: selection:sale.order,invoice_quantity:0
msgid "Ordered Quantities"
msgstr "Beauftragte Menge"
@@ -249,14 +270,25 @@ msgstr ""
"Lieferung\" und \" Rechnung durch Auftrag\" automatisch erzeugt."
#. module: sale
+#: field:sale.config.picking_policy,task_work:0
+msgid "Based on Tasks' Work"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
+msgid "Quotations and Sales"
+msgstr ""
+
+#. module: sale
#: model:ir.model,name:sale.model_sale_make_invoice
msgid "Sales Make Invoice"
msgstr "Verkauf erstellt Rechnung"
#. module: sale
-#: view:sale.order:0
-msgid "Recreate Packing"
-msgstr "Erneut Verpacken"
+#: code:addons/sale/sale.py:330
+#, python-format
+msgid "Pricelist Warning!"
+msgstr ""
#. module: sale
#: field:sale.order.line,discount:0
@@ -264,12 +296,10 @@ msgid "Discount (%)"
msgstr "Rabatt (%)"
#. module: sale
-#: help:res.company,security_lead:0
-msgid ""
-"This is the days added to what you promise to customers for security purpose"
-msgstr ""
-"Diese Tage werden aus Sicherheitsgründen addiert zur versprochenen "
-"Auslieferungszeit (an den Kunden)."
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_quotation_for_sale
+msgid "My Quotations"
+msgstr "Meine Angebote"
#. module: sale
#: view:board.board:0
@@ -294,7 +324,22 @@ msgid "Shop Name"
msgstr "Bezeichnung Shop"
#. module: sale
-#: code:addons/sale/sale.py:1014
+#: help:sale.order,order_policy:0
+msgid ""
+"The Invoice Policy is used to synchronise invoice and delivery operations.\n"
+" - The 'Pay before delivery' choice will first generate the invoice and "
+"then generate the picking order after the payment of this invoice.\n"
+" - The 'Deliver & Invoice on demand' will create the picking order directly "
+"and wait for the user to manually click on the 'Invoice' button to generate "
+"the draft invoice based on the sale order or the sale order lines.\n"
+" - The 'Invoice on order after delivery' choice will generate the draft "
+"invoice based on sales order after all picking lists have been finished.\n"
+" - The 'Invoice based on deliveries' choice is used to create an invoice "
+"during the picking process."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:1158
#, python-format
msgid "No Customer Defined !"
msgstr "Kein Kunde definiert !"
@@ -305,9 +350,12 @@ msgid "Sales in Exception"
msgstr "Verkaufsaufträge in Fehlerliste"
#. module: sale
-#: view:sale.order:0
-msgid "Set to Draft"
-msgstr "Setze auf Entwurf"
+#: code:addons/sale/sale.py:1145
+#: code:addons/sale/sale.py:1264
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:70
+#, python-format
+msgid "Configuration Error !"
+msgstr ""
#. module: sale
#: view:sale.order:0
@@ -315,32 +363,7 @@ msgid "Conditions"
msgstr "Bedingungen"
#. module: sale
-#: help:sale.order,order_policy:0
-msgid ""
-"The Shipping Policy is used to synchronise invoice and delivery operations.\n"
-" - The 'Pay Before delivery' choice will first generate the invoice and "
-"then generate the picking order after the payment of this invoice.\n"
-" - The 'Shipping & Manual Invoice' will create the picking order directly "
-"and wait for the user to manually click on the 'Invoice' button to generate "
-"the draft invoice.\n"
-" - The 'Invoice On Order After Delivery' choice will generate the draft "
-"invoice based on sales order after all picking lists have been finished.\n"
-" - The 'Invoice From The Picking' choice is used to create an invoice "
-"during the picking process."
-msgstr ""
-"Die Abrechnungsbedingung bei einem Auftrag steuert und synchronisiert die "
-"zeitliche Abfolge von Lieferung und Rechnung.\n"
-" - Durch \"Zahlung vor Lieferung\" wird zuerst die Rechnung generiert, dann "
-"erst erfolgt ein Lieferauftrag aufgrund der Zahlung.\n"
-" - Durch \"Lieferung & Manuelle Rechnung\" ist der Lieferauftrag "
-"unmittelbar verfügbar. Die Rechnung muss noch manuell erstellt werden.\n"
-" - Durch \"Rechnung durch Auftrag\" erfolgt eine automatische Rechnung im "
-"Zustand Entwurf, wenn die Lieferung vollständig abgeschlossen wurde.\n"
-" - Durch \"Rechnung durch Lieferung\" kann bei Abschluss einer Lieferung "
-"die Rechnung gleich mit erstellt werden."
-
-#. module: sale
-#: code:addons/sale/sale.py:939
+#: code:addons/sale/sale.py:1034
#, python-format
msgid ""
"There is no income category account defined in default Properties for "
@@ -350,9 +373,9 @@ msgstr ""
"Auftrag zugewiesene Steuerzuordnung definiert !"
#. module: sale
-#: view:sale.installer:0
-msgid "Configure"
-msgstr "Konfigurieren"
+#: selection:sale.report,month:0
+msgid "August"
+msgstr "August"
#. module: sale
#: constraint:stock.move:0
@@ -361,7 +384,7 @@ msgstr ""
"Sie versuchen eine Losnummer ohne Bezug zu diesem Produkt zuzuweisen."
#. module: sale
-#: code:addons/sale/sale.py:620
+#: code:addons/sale/sale.py:655
#, python-format
msgid "invalid mode for test_state"
msgstr "Fehlerhafter Modus für test_state"
@@ -372,7 +395,7 @@ msgid "June"
msgstr "Juni"
#. module: sale
-#: code:addons/sale/sale.py:584
+#: code:addons/sale/sale.py:617
#, python-format
msgid "Could not cancel this sales order !"
msgstr "Kann diesen Verkaufsauftrag nicht abbrechen."
@@ -393,8 +416,12 @@ msgid "October"
msgstr "Oktober"
#. module: sale
+#: sql_constraint:stock.picking:0
+msgid "Reference must be unique per Company!"
+msgstr ""
+
+#. module: sale
#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_quotation_for_sale
#: view:sale.order:0
#: view:sale.report:0
msgid "Quotations"
@@ -406,11 +433,6 @@ msgid "Pricelist for current sales order."
msgstr "Preisliste für diesen Verkaufsauftrag."
#. module: sale
-#: selection:sale.config.picking_policy,step:0
-msgid "Delivery Order Only"
-msgstr "Auslieferung"
-
-#. module: sale
#: report:sale.order:0
msgid "TVA :"
msgstr "USt.:"
@@ -436,6 +458,7 @@ msgstr "Steuerzuordnung"
#. module: sale
#: view:sale.order:0
#: view:sale.order.line:0
+#: field:sale.report,product_uom:0
msgid "UoM"
msgstr "ME"
@@ -461,7 +484,13 @@ msgstr ""
"in Bearbeitung'."
#. module: sale
-#: code:addons/sale/sale.py:971
+#: code:addons/sale/sale.py:1061
+#, python-format
+msgid "You cannot cancel a sale order line that has already been invoiced!"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:1066
#, python-format
msgid "You must first cancel stock moves attached to this sales order line."
msgstr ""
@@ -469,7 +498,7 @@ msgstr ""
"abbrechen."
#. module: sale
-#: code:addons/sale/sale.py:1042
+#: code:addons/sale/sale.py:1134
#, python-format
msgid "(n/a)"
msgstr "(n/v)"
@@ -508,15 +537,36 @@ msgid "Notes"
msgstr "Bemerkungen"
#. module: sale
+#: sql_constraint:res.company:0
+msgid "The company name must be unique !"
+msgstr ""
+
+#. module: sale
#: help:sale.order,partner_invoice_id:0
msgid "Invoice address for current sales order."
msgstr "Rechnungsadresse für diesen Verkaufsauftrag."
#. module: sale
-#: view:sale.installer:0
-msgid "Enhance your core Sales Application with additional functionalities."
+#: view:sale.report:0
+msgid "Month-1"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered month of the sales order"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:504
+#, python-format
+msgid ""
+"You cannot group sales having different currencies for the same partner."
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,picking_policy:0
+msgid "Deliver each product when available"
msgstr ""
-"Erweitern Sie Ihre Anwendung für den Verkauf durch weitere Funktionen."
#. module: sale
#: field:sale.order,invoiced_rate:0
@@ -535,21 +585,43 @@ msgid "Confirmation Date"
msgstr "Datum Auftragsbestätigung"
#. module: sale
+#: field:sale.order,incoterm:0
+msgid "Incoterm"
+msgstr "Lieferbedingung"
+
+#. module: sale
#: field:sale.order.line,address_allotment_id:0
msgid "Allotment Partner"
msgstr "Vertriebspartner"
#. module: sale
-#: sql_constraint:sale.order:0
-msgid "Order Reference must be unique !"
-msgstr "Die Referenz muss eindeutig sein!"
-
-#. module: sale
#: selection:sale.report,month:0
msgid "March"
msgstr "März"
#. module: sale
+#: constraint:stock.move:0
+msgid "You can not move products from or to a location of the type view."
+msgstr ""
+
+#. module: sale
+#: field:sale.config.picking_policy,sale_orders:0
+msgid "Based on Sales Orders"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,state:0
+msgid ""
+"Givwizard = self.browse(cr, uid, ids)[0]es the state of the quotation or "
+"sales order. \n"
+"The exception state is automatically set when a cancel operation occurs in "
+"the invoice validation (Invoice Exception) or in the picking list process "
+"(Shipping Exception). \n"
+"The 'Waiting Schedule' state is set when the invoice is confirmed but "
+"waiting for the scheduler to run on the order date."
+msgstr ""
+
+#. module: sale
#: help:sale.order,amount_total:0
msgid "The total amount."
msgstr "Gesamtsumme."
@@ -565,6 +637,11 @@ msgid "Invoice address :"
msgstr "Rechnungsanschrift:"
#. module: sale
+#: field:sale.order.line,sequence:0
+msgid "Line Sequence"
+msgstr ""
+
+#. module: sale
#: model:process.transition,note:sale.process_transition_saleorderprocurement0
msgid ""
"For every sales order line, a procurement order is created to supply the "
@@ -616,11 +693,6 @@ msgid "Sales Order Line"
msgstr "Auftragsposition"
#. module: sale
-#: view:sale.config.picking_policy:0
-msgid "Setup your sales workflow and default values."
-msgstr "Verkaufsabfolge und Vorgabewerte einrichten"
-
-#. module: sale
#: field:sale.shop,warehouse_id:0
msgid "Warehouse"
msgstr "Zentrallager"
@@ -657,6 +729,11 @@ msgid "Creation Date"
msgstr "Datum Auftragserstellung"
#. module: sale
+#: model:ir.ui.menu,name:sale.menu_sales_configuration_misc
+msgid "Miscellaneous"
+msgstr ""
+
+#. module: sale
#: model:ir.actions.act_window,name:sale.action_order_line_tree3
msgid "Uninvoiced and Delivered Lines"
msgstr "Abzurechnende Auslieferungen"
@@ -672,14 +749,19 @@ msgid "My Sales"
msgstr "Meine Verkäufe"
#. module: sale
-#: code:addons/sale/sale.py:290
-#: code:addons/sale/sale.py:966
-#: code:addons/sale/sale.py:1165
+#: code:addons/sale/sale.py:295
+#: code:addons/sale/sale.py:1061
+#: code:addons/sale/sale.py:1290
#, python-format
msgid "Invalid action !"
msgstr "Fehlerhafte Aktion !"
#. module: sale
+#: view:sale.order:0
+msgid "Extra Info"
+msgstr "Extra Information"
+
+#. module: sale
#: field:sale.order,pricelist_id:0
#: field:sale.report,pricelist_id:0
#: field:sale.shop,pricelist_id:0
@@ -693,13 +775,21 @@ msgid "# of Qty"
msgstr "Menge"
#. module: sale
+#: code:addons/sale/sale.py:1314
+#, python-format
+msgid "Hour"
+msgstr ""
+
+#. module: sale
#: view:sale.order:0
msgid "Order Date"
msgstr "Auftragsdatum"
#. module: sale
#: view:sale.order.line:0
+#: view:sale.report:0
#: field:sale.report,shipped:0
+#: field:sale.report,shipped_qty_1:0
msgid "Shipped"
msgstr "Ausgeliefert"
@@ -709,9 +799,9 @@ msgid "All Quotations"
msgstr "Alle Angebote"
#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Invoice On Order After Delivery"
-msgstr "Rechnung durch Auftrag nach Lieferung"
+#: view:sale.config.picking_policy:0
+msgid "Options"
+msgstr ""
#. module: sale
#: selection:sale.report,month:0
@@ -719,6 +809,20 @@ msgid "September"
msgstr "September"
#. module: sale
+#: code:addons/sale/sale.py:632
+#, python-format
+msgid "You cannot confirm a sale order which has no line."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:1246
+#, python-format
+msgid ""
+"You have to select a pricelist or a customer in the sales form !\n"
+"Please set one before choosing a product."
+msgstr ""
+
+#. module: sale
#: view:sale.report:0
#: field:sale.report,categ_id:0
msgid "Category of Product"
@@ -735,11 +839,6 @@ msgid "Stock Moves"
msgstr "Bestandsbuchungen"
#. module: sale
-#: view:sale.report:0
-msgid " Year "
-msgstr " Jahr "
-
-#. module: sale
#: field:sale.order,state:0
#: field:sale.report,state:0
msgid "Order State"
@@ -757,7 +856,7 @@ msgid "Sales By Month"
msgstr "Verkäufe nach Monaten"
#. module: sale
-#: code:addons/sale/sale.py:970
+#: code:addons/sale/sale.py:1065
#, python-format
msgid "Could not cancel sales order line!"
msgstr "Konnte Auftragsposition nicht stornieren!"
@@ -793,66 +892,19 @@ msgstr ""
"aktualisiert."
#. module: sale
+#: field:sale.order,date_order:0
+msgid "Date"
+msgstr ""
+
+#. module: sale
#: view:sale.report:0
msgid "Extended Filters..."
msgstr "Erweiterter Filter..."
#. module: sale
-#: model:ir.module.module,description:sale.module_meta_information
-msgid ""
-"\n"
-" The base module to manage quotations and sales orders.\n"
-"\n"
-" * Workflow with validation steps:\n"
-" - Quotation -> Sales order -> Invoice\n"
-" * Invoicing methods:\n"
-" - Invoice on order (before or after shipping)\n"
-" - Invoice on delivery\n"
-" - Invoice on timesheets\n"
-" - Advance invoice\n"
-" * Partners preferences (shipping, invoicing, incoterm, ...)\n"
-" * Products stocks and prices\n"
-" * Delivery methods:\n"
-" - all at once, multi-parcel\n"
-" - delivery costs\n"
-" * Dashboard for salesman that includes:\n"
-" * Your open quotations\n"
-" * Top 10 sales of the month\n"
-" * Cases statistics\n"
-" * Graph of sales by product\n"
-" * Graph of cases of the month\n"
-" "
-msgstr ""
-"\n"
-" Das Basismodul für die Angebotserstellung und das Management von "
-"Verkaufsaufträgen.\n"
-"\n"
-" * Verkaufsvorgang über eine schrittweise Abfolge:\n"
-" - Angebot -> Kundenauftrag -> Rechnung\n"
-" * Verschiedene Abrechnungsmethoden:\n"
-" - Rechnung durch Auftrag (vor oder nach der Auslieferung)\n"
-" - Rechnung durch Lieferung\n"
-" - Rechnung durch Zeiterfassung\n"
-" - Anzahlungsrechnung\n"
-" * Verwaltung der Partner Präferenzen (Versand, Rechnungsstellung, "
-"incoterm, ...)\n"
-" * Produkte Bestände und Preise\n"
-" * Lieferbedingungen:\n"
-" - Komplettlieferung, Teillieferung\n"
-" - Berechnung von Versandkosten\n"
-" * Pinnwand für den Verkäufer mit folgenden Inhalten:\n"
-" * Offene Angebote des Verkäufers\n"
-" * Top 10 Verkäufe des Monats\n"
-" * Statistiken zu Vertriebsvorgängen\n"
-" * Grafik des Umsatz nach Produkten\n"
-" * Grafik der Vertriebsvorgänge des Monats\n"
-" "
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_shop
-#: view:sale.shop:0
-msgid "Sales Shop"
-msgstr "Verkaufsshop"
+#: selection:sale.order.line,state:0
+msgid "Exception"
+msgstr "Fehlerliste"
#. module: sale
#: model:ir.model,name:sale.model_res_company
@@ -860,9 +912,10 @@ msgid "Companies"
msgstr "Unternehmen"
#. module: sale
-#: selection:sale.report,month:0
-msgid "November"
-msgstr "November"
+#: code:addons/sale/sale.py:1259
+#, python-format
+msgid "No valid pricelist line found ! :"
+msgstr ""
#. module: sale
#: view:sale.order:0
@@ -870,9 +923,9 @@ msgid "History"
msgstr "Historie"
#. module: sale
-#: field:sale.config.picking_policy,picking_policy:0
-msgid "Picking Default Policy"
-msgstr "Standard für Ausführung Lieferauftrag"
+#: selection:sale.order,order_policy:0
+msgid "Invoice on order after delivery"
+msgstr ""
#. module: sale
#: help:sale.order,invoice_ids:0
@@ -899,14 +952,14 @@ msgstr ""
"erbeten hat."
#. module: sale
-#: code:addons/sale/sale.py:966
-#, python-format
-msgid "You cannot cancel a sales order line that has already been invoiced !"
+#: help:res.company,security_lead:0
+msgid ""
+"This is the days added to what you promise to customers for security purpose"
msgstr ""
-"Sie können keinen Verkaufsauftrag stornieren, der bereits abgerechnet wurde."
+"Diese Tage werden aus Sicherheitsgründen addiert zur versprochenen "
+"Auslieferungszeit (an den Kunden)."
#. module: sale
-#: view:sale.order:0
#: view:sale.order.line:0
msgid "Qty"
msgstr "Anz."
@@ -917,6 +970,11 @@ msgid "References"
msgstr "Referenzen"
#. module: sale
+#: view:sale.order.line:0
+msgid "My Sales Order Lines"
+msgstr ""
+
+#. module: sale
#: model:process.transition.action,name:sale.process_transition_action_cancel0
#: model:process.transition.action,name:sale.process_transition_action_cancel1
#: model:process.transition.action,name:sale.process_transition_action_cancel2
@@ -928,14 +986,9 @@ msgid "Cancel"
msgstr "Abbrechen"
#. module: sale
-#: field:sale.installer,sale_order_dates:0
-msgid "Sales Order Dates"
-msgstr "Auftragsdaten"
-
-#. module: sale
-#: selection:sale.order.line,state:0
-msgid "Exception"
-msgstr "Fehlerliste"
+#: sql_constraint:sale.order:0
+msgid "Order Reference must be unique per Company!"
+msgstr ""
#. module: sale
#: model:process.transition,name:sale.process_transition_invoice0
@@ -947,19 +1000,19 @@ msgid "Create Invoice"
msgstr "Erzeuge Rechnung"
#. module: sale
-#: field:sale.installer,sale_margin:0
-msgid "Margins in Sales Orders"
-msgstr "Spannen im Verkaufsauftrag"
-
-#. module: sale
#: view:sale.order:0
msgid "Total Tax Excluded"
msgstr "Nettobetrag"
#. module: sale
-#: view:sale.order:0
-msgid "Compute"
-msgstr "Berechne Umsatzsteuer"
+#: view:sale.order.line:0
+msgid "Order reference"
+msgstr ""
+
+#. module: sale
+#: view:sale.open.invoice:0
+msgid "You invoice has been successfully created!"
+msgstr "Ihre Rechnung wurde erfolgreich generiert!"
#. module: sale
#: view:sale.report:0
@@ -978,23 +1031,22 @@ msgid "Open Invoice"
msgstr "Offene Posten"
#. module: sale
-#: report:sale.order:0
-#: view:sale.order.line:0
-msgid "Price"
-msgstr "Verkaufspreis"
+#: model:ir.actions.server,name:sale.ir_actions_server_edi_sale
+msgid "Auto-email confirmed sale orders"
+msgstr ""
#. module: sale
-#: model:ir.actions.act_window,name:sale.action_sale_installer
-#: view:sale.config.picking_policy:0
-#: view:sale.installer:0
-msgid "Sales Application Configuration"
-msgstr "Konfiguration des Verkaufs"
+#: code:addons/sale/sale.py:413
+#, python-format
+msgid "There is no sales journal defined for this company: \"%s\" (id:%d)"
+msgstr ""
+"Es wurde für das Unternehmen \"%s\" (id:%d) kein explizites Verkaufsjournal "
+"definiert."
#. module: sale
-#: view:sale.report:0
-#: field:sale.report,price_total:0
-msgid "Total Price"
-msgstr "Gesamtumsatz"
+#: model:process.transition.action,name:sale.process_transition_action_forceassignation0
+msgid "Force Assignation"
+msgstr "Erzwinge Zuweisung"
#. module: sale
#: selection:sale.order.line,type:0
@@ -1007,6 +1059,11 @@ msgid "Based on the shipped or on the ordered quantities."
msgstr "Basierend auf gelieferte oder bestellte Mengen"
#. module: sale
+#: selection:sale.order,picking_policy:0
+msgid "Deliver all products at once"
+msgstr ""
+
+#. module: sale
#: field:sale.order,picking_ids:0
msgid "Related Picking"
msgstr "Zugehöriger Lieferaufträge"
@@ -1038,9 +1095,15 @@ msgid "Create Delivery Order"
msgstr "Erzeugt Lieferauftrag"
#. module: sale
-#: field:sale.installer,delivery:0
-msgid "Delivery Costs"
-msgstr "Lieferkosten"
+#: code:addons/sale/sale.py:1290
+#, python-format
+msgid "Cannot delete a sales order line which is in state '%s'!"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Qty(UoS)"
+msgstr ""
#. module: sale
#: view:sale.order:0
@@ -1054,13 +1117,13 @@ msgstr "Erzeuge Packauftrag"
#. module: sale
#: view:sale.report:0
-msgid "Sales by Product Category"
-msgstr "Verkäufe je Produkt Kategorie"
+msgid "Ordered date of the sales order"
+msgstr ""
#. module: sale
-#: selection:sale.order,picking_policy:0
-msgid "Partial Delivery"
-msgstr "Lieferung von Teilmenge"
+#: view:sale.report:0
+msgid "Sales by Product Category"
+msgstr "Verkäufe je Produkt Kategorie"
#. module: sale
#: model:process.transition,name:sale.process_transition_confirmquotation0
@@ -1068,9 +1131,10 @@ msgid "Confirm Quotation"
msgstr "Bestätige Angebot"
#. module: sale
-#: help:sale.order,origin:0
-msgid "Reference of the document that generated this sales order request."
-msgstr "Referenz zu Beleg, der den Verkaufsauftrag ausgelöst hat"
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:63
+#, python-format
+msgid "Error"
+msgstr "Fehler"
#. module: sale
#: view:sale.order:0
@@ -1102,20 +1166,14 @@ msgid "Procurement Method"
msgstr "Dispositionsmethode"
#. module: sale
-#: view:sale.config.picking_policy:0
-#: view:sale.installer:0
-msgid "title"
-msgstr "Titel"
-
-#. module: sale
#: model:process.node,name:sale.process_node_packinglist0
msgid "Pick List"
msgstr "Kommissionsliste"
#. module: sale
#: view:sale.order:0
-msgid "Order date"
-msgstr "Auftragsdatum"
+msgid "Set to Draft"
+msgstr "Setze auf Entwurf"
#. module: sale
#: model:process.node,note:sale.process_node_packinglist0
@@ -1123,6 +1181,85 @@ msgid "Document of the move to the output or to the customer."
msgstr "Beleg für Warenversand oder Auslieferung"
#. module: sale
+#: model:email.template,body_text:sale.email_template_edi_sale
+msgid ""
+"\n"
+"Hello${object.partner_order_id.name and ' ' or "
+"''}${object.partner_order_id.name or ''},\n"
+"\n"
+"Here is your order confirmation for ${object.partner_id.name}:\n"
+" | Order number: *${object.name}*\n"
+" | Order total: *${object.amount_total} "
+"${object.pricelist_id.currency_id.name}*\n"
+" | Order date: ${object.date_order}\n"
+" % if object.origin:\n"
+" | Order reference: ${object.origin}\n"
+" % endif\n"
+" % if object.client_order_ref:\n"
+" | Your reference: ${object.client_order_ref}<br />\n"
+" % endif\n"
+" | Your contact: ${object.user_id.name} ${object.user_id.user_email "
+"and '<%s>'%(object.user_id.user_email) or ''}\n"
+"\n"
+"You can view the order confirmation, download it and even pay online using "
+"the following link:\n"
+" ${ctx.get('edi_web_url_view') or 'n/a'}\n"
+"\n"
+"% if object.order_policy in ('prepaid','manual') and "
+"object.company_id.paypal_account:\n"
+"<% \n"
+"comp_name = quote(object.company_id.name)\n"
+"order_name = quote(object.name)\n"
+"paypal_account = quote(object.company_id.paypal_account)\n"
+"order_amount = quote(str(object.amount_total))\n"
+"cur_name = quote(object.pricelist_id.currency_id.name)\n"
+"paypal_url = \"https://www.paypal.com/cgi-"
+"bin/webscr?cmd=_xclick&business=%s&item_name=%s%%20Order%%20%s&invoice=%s&amo"
+"unt=%s\" \\\n"
+" "
+"\"&currency_code=%s&button_subtype=services&no_note=1&bn=OpenERP_Order_PayNow"
+"_%s\" % \\\n"
+" "
+"(paypal_account,comp_name,order_name,order_name,order_amount,cur_name,cur_nam"
+"e)\n"
+"%>\n"
+"It is also possible to directly pay with Paypal:\n"
+" ${paypal_url}\n"
+"% endif\n"
+"\n"
+"If you have any question, do not hesitate to contact us.\n"
+"\n"
+"\n"
+"Thank you for choosing ${object.company_id.name}!\n"
+"\n"
+"\n"
+"--\n"
+"${object.user_id.name} ${object.user_id.user_email and "
+"'<%s>'%(object.user_id.user_email) or ''}\n"
+"${object.company_id.name}\n"
+"% if object.company_id.street:\n"
+"${object.company_id.street or ''}\n"
+"% endif\n"
+"% if object.company_id.street2:\n"
+"${object.company_id.street2}\n"
+"% endif\n"
+"% if object.company_id.city or object.company_id.zip:\n"
+"${object.company_id.zip or ''} ${object.company_id.city or ''}\n"
+"% endif\n"
+"% if object.company_id.country_id:\n"
+"${object.company_id.state_id and ('%s, ' % object.company_id.state_id.name) "
+"or ''} ${object.company_id.country_id.name or ''}\n"
+"% endif\n"
+"% if object.company_id.phone:\n"
+"Phone: ${object.company_id.phone}\n"
+"% endif\n"
+"% if object.company_id.website:\n"
+"${object.company_id.website or ''}\n"
+"% endif\n"
+" "
+msgstr ""
+
+#. module: sale
#: model:process.transition.action,name:sale.process_transition_action_validate0
msgid "Validate"
msgstr "Validieren"
@@ -1145,9 +1282,9 @@ msgid "Taxes"
msgstr "Umsatzsteuer"
#. module: sale
-#: field:sale.order,order_policy:0
-msgid "Shipping Policy"
-msgstr "Abrechnungsbedingung"
+#: view:sale.order:0
+msgid "Sales Order ready to be invoiced"
+msgstr ""
#. module: sale
#: help:sale.order,create_date:0
@@ -1166,9 +1303,9 @@ msgid "Create Invoices"
msgstr "Erzeuge Rechnungen"
#. module: sale
-#: view:sale.order:0
-msgid "Extra Info"
-msgstr "Extra Information"
+#: view:sale.report:0
+msgid "Sales order created in current month"
+msgstr ""
#. module: sale
#: report:sale.order:0
@@ -1176,11 +1313,24 @@ msgid "Fax :"
msgstr "Fax:"
#. module: sale
+#: help:sale.order.line,type:0
+msgid ""
+"If 'on order', it triggers a procurement when the sale order is confirmed to "
+"create a task, purchase order or manufacturing order linked to this sale "
+"order line."
+msgstr ""
+
+#. module: sale
#: field:sale.advance.payment.inv,amount:0
msgid "Advance Amount"
msgstr "Anzahlung"
#. module: sale
+#: field:sale.config.picking_policy,charge_delivery:0
+msgid "Do you charge the delivery?"
+msgstr ""
+
+#. module: sale
#: selection:sale.order,invoice_quantity:0
msgid "Shipped Quantities"
msgstr "Ausgelieferte Menge"
@@ -1191,25 +1341,45 @@ msgid "Invoice Based on Sales Orders"
msgstr "Rechnung durch Auftrag"
#. module: sale
+#: code:addons/sale/sale.py:331
+#, python-format
+msgid ""
+"If you change the pricelist of this order (and eventually the currency), "
+"prices of existing order lines will not be updated."
+msgstr ""
+
+#. module: sale
#: model:ir.model,name:sale.model_stock_picking
msgid "Picking List"
msgstr "Lieferschein"
#. module: sale
-#: code:addons/sale/sale.py:387
-#: code:addons/sale/sale.py:920
-#: code:addons/sale/sale.py:938
+#: code:addons/sale/sale.py:412
+#: code:addons/sale/sale.py:503
+#: code:addons/sale/sale.py:632
+#: code:addons/sale/sale.py:1015
+#: code:addons/sale/sale.py:1033
#, python-format
msgid "Error !"
msgstr "Fehler !"
#. module: sale
-#: code:addons/sale/sale.py:570
+#: code:addons/sale/sale.py:603
#, python-format
msgid "Could not cancel sales order !"
msgstr "Verkaufsauftrag konnte nicht storniert werden"
#. module: sale
+#: view:sale.order:0
+msgid "Qty(UoM)"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered Year of the sales order"
+msgstr ""
+
+#. module: sale
#: selection:sale.report,month:0
msgid "July"
msgstr "Juli"
@@ -1226,36 +1396,26 @@ msgid "Shipping Exception"
msgstr "Versand Fehlerliste"
#. module: sale
-#: field:sale.make.invoice,grouped:0
-msgid "Group the invoices"
-msgstr "Gruppiere Rechnungen"
-
-#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Shipping & Manual Invoice"
-msgstr "Lieferung & Manuelle Rechnung"
-
-#. module: sale
-#: code:addons/sale/sale.py:1051
+#: code:addons/sale/sale.py:1143
#, python-format
-msgid "Picking Information !"
-msgstr "Lieferschein Information"
+msgid "Picking Information ! : "
+msgstr ""
#. module: sale
-#: view:sale.report:0
-#: field:sale.report,month:0
-msgid "Month"
-msgstr "Monat"
+#: field:sale.make.invoice,grouped:0
+msgid "Group the invoices"
+msgstr "Gruppiere Rechnungen"
#. module: sale
-#: model:ir.module.module,shortdesc:sale.module_meta_information
-msgid "Sales Management"
-msgstr "Verkauf"
+#: field:sale.order,order_policy:0
+msgid "Invoice Policy"
+msgstr ""
#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Invoice From The Picking"
-msgstr "Rechnung durch Lieferung"
+#: model:ir.actions.act_window,name:sale.action_config_picking_policy
+#: view:sale.config.picking_policy:0
+msgid "Setup your Invoicing Method"
+msgstr ""
#. module: sale
#: model:process.node,note:sale.process_node_invoice0
@@ -1264,31 +1424,31 @@ msgstr "Vom Rechnungswesen zu überprüfen"
#. module: sale
#: view:sale.report:0
-#: field:sale.report,uom_name:0
msgid "Reference UoM"
msgstr "Referenz ME"
#. module: sale
+#: view:sale.config.picking_policy:0
+msgid ""
+"This tool will help you to install the right module and configure the system "
+"according to the method you use to invoice your customers."
+msgstr ""
+
+#. module: sale
#: model:ir.model,name:sale.model_sale_order_line_make_invoice
msgid "Sale OrderLine Make_invoice"
msgstr "Verkaufsauftragszeile Erzeuge Rechnung"
#. module: sale
-#: help:sale.config.picking_policy,step:0
-msgid ""
-"By default, OpenERP is able to manage complex routing and paths of products "
-"in your warehouse and partner locations. This will configure the most common "
-"and simple methods to deliver products to the customer in one or two "
-"operations by the worker."
-msgstr ""
-"Standardmäßig kann OpenERP komplexe Warenbewegungen zwischen Lager und "
-"Kunden abbilden. Dieser Vorgang konfiguriert die übliche Auslieferung an den "
-"Kunden in 1 oder 2 Schritten."
+#: selection:sale.order,state:0
+#: selection:sale.report,state:0
+msgid "Invoice Exception"
+msgstr "Abrechnungsfehler"
#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_tree
-msgid "Old Quotations"
-msgstr "Vorherige Angebote"
+#: model:process.node,note:sale.process_node_saleorder0
+msgid "Drives procurement and invoicing"
+msgstr "Steuert Beschaffung und Rechnungsstellung"
#. module: sale
#: field:sale.order,invoiced:0
@@ -1303,6 +1463,22 @@ msgid "Sales Analysis"
msgstr "Statistik Verkaufsaufträge"
#. module: sale
+#: code:addons/sale/sale.py:1138
+#, python-format
+msgid ""
+"You selected a quantity of %d Units.\n"
+"But it's not compatible with the selected packaging.\n"
+"Here is a proposition of quantities according to the packaging:\n"
+"EAN: %s Quantity: %s Type of ul: %s"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Recreate Packing"
+msgstr "Erneut Verpacken"
+
+#. module: sale
+#: view:sale.order:0
#: field:sale.order.line,property_ids:0
msgid "Properties"
msgstr "Eigenschaften"
@@ -1334,7 +1510,17 @@ msgstr ""
"erstellt werden."
#. module: sale
-#: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
+#: view:sale.order.line:0
+msgid "Confirmed sale order lines, not yet delivered"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:473
+#, python-format
+msgid "Customer Invoices"
+msgstr ""
+
+#. module: sale
#: model:process.process,name:sale.process_process_salesprocess0
#: view:sale.order:0
#: view:sale.report:0
@@ -1356,18 +1542,13 @@ msgid "Done"
msgstr "Erledigt"
#. module: sale
-#: model:ir.model,name:sale.model_sale_installer
-msgid "sale.installer"
-msgstr "sale.installer"
-
-#. module: sale
#: model:process.node,name:sale.process_node_invoice0
#: model:process.node,name:sale.process_node_invoiceafterdelivery0
msgid "Invoice"
msgstr "Rechnung"
#. module: sale
-#: code:addons/sale/sale.py:1014
+#: code:addons/sale/sale.py:1158
#, python-format
msgid ""
"You have to select a customer in the sales form !\n"
@@ -1378,11 +1559,6 @@ msgstr ""
"einzelner Produkte bei den Auftragspositionen aus."
#. module: sale
-#: selection:sale.config.picking_policy,step:0
-msgid "Picking List & Delivery Order"
-msgstr "Lieferauftrag & Auslieferung"
-
-#. module: sale
#: field:sale.order,origin:0
msgid "Source Document"
msgstr "Belegreferenz"
@@ -1408,7 +1584,7 @@ msgid "The amount without tax."
msgstr "Nettobetrag"
#. module: sale
-#: code:addons/sale/sale.py:571
+#: code:addons/sale/sale.py:604
#, python-format
msgid "You must first cancel all picking attached to this sales order."
msgstr "Zuerst müssen Sie alle Lieferungen zu diesem Auftrag stornieren."
@@ -1419,9 +1595,15 @@ msgid "Sales Advance Payment Invoice"
msgstr "Anzahlungsrechnung"
#. module: sale
-#: field:sale.order,incoterm:0
-msgid "Incoterm"
-msgstr "Lieferbedingung"
+#: view:sale.report:0
+#: field:sale.report,month:0
+msgid "Month"
+msgstr "Monat"
+
+#. module: sale
+#: model:email.template,subject:sale.email_template_edi_sale
+msgid "${object.company_id.name} Order (Ref ${object.name or 'n/a' })"
+msgstr ""
#. module: sale
#: view:sale.order.line:0
@@ -1432,11 +1614,6 @@ msgid "Product"
msgstr "Produkt"
#. module: sale
-#: model:ir.ui.menu,name:sale.menu_invoiced
-msgid "Invoicing"
-msgstr "Ausgangsrechnungen"
-
-#. module: sale
#: model:process.transition.action,name:sale.process_transition_action_cancelassignation0
msgid "Cancel Assignation"
msgstr "Abbruch Zuweisung"
@@ -1447,25 +1624,11 @@ msgid "sale.config.picking_policy"
msgstr "sale.config.picking_policy"
#. module: sale
-#: help:sale.order,state:0
-msgid ""
-"Gives the state of the quotation or sales order. \n"
-"The exception state is automatically set when a cancel operation occurs in "
-"the invoice validation (Invoice Exception) or in the picking list process "
-"(Shipping Exception). \n"
-"The 'Waiting Schedule' state is set when the invoice is confirmed but "
-"waiting for the scheduler to run on the date 'Ordered Date'."
+#: view:account.invoice.report:0
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_turnover_by_month
+msgid "Monthly Turnover"
msgstr ""
-"Zeigt den Zustand des Verkaufsauftrags:\n"
-"\n"
-"Der Fehlerzustand wird automatisch zugewiesen, wenn bei der "
-"Auftragsabwicklung bei der Erstellung der Lieferbelege oder der Erstellung "
-"von Rechnungsbelegen ein Fehler aufgetreten ist und somit eine vorherige "
-"Überarbeitung erforderlich ist.\n"
-"\n"
-"Der Wartezustand wird automatisch zugewiesen, wenn eine Rechnung bereits "
-"bestätigt wurde, zunächst aber ein weiterer automatischer "
-"Beschaffungsvorschlag für das Bestelldatum durchgeführt werden sollte."
#. module: sale
#: field:sale.order,invoice_quantity:0
@@ -1483,7 +1646,6 @@ msgid "Product UoS"
msgstr "Produkt - Verkaufseinheit"
#. module: sale
-#: selection:sale.order,state:0
#: selection:sale.report,state:0
msgid "Manual In Progress"
msgstr "Manuell in Bearbeitung"
@@ -1504,7 +1666,8 @@ msgid "Order"
msgstr "Auftrag"
#. module: sale
-#: code:addons/sale/sale.py:921
+#: code:addons/sale/sale.py:1016
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:71
#, python-format
msgid "There is no income account defined for this product: \"%s\" (id:%d)"
msgstr ""
@@ -1530,7 +1693,7 @@ msgstr ""
"optional vorgesehen werden kann."
#. module: sale
-#: code:addons/sale/sale.py:1116
+#: code:addons/sale/sale.py:1238
#, python-format
msgid ""
"You plan to sell %.2f %s but you only have %.2f %s available !\n"
@@ -1561,12 +1724,10 @@ msgid "Total"
msgstr "Bruttobetrag"
#. module: sale
-#: code:addons/sale/sale.py:388
-#, python-format
-msgid "There is no sales journal defined for this company: \"%s\" (id:%d)"
-msgstr ""
-"Es wurde für das Unternehmen \"%s\" (id:%d) kein explizites Verkaufsjournal "
-"definiert."
+#: report:sale.order:0
+#: view:sale.order.line:0
+msgid "Price"
+msgstr "Verkaufspreis"
#. module: sale
#: model:process.transition,note:sale.process_transition_deliver0
@@ -1580,10 +1741,15 @@ msgstr ""
"oder automatisch erstellt"
#. module: sale
-#: code:addons/sale/sale.py:1165
-#, python-format
-msgid "Cannot delete a sales order line which is %s !"
-msgstr "Auftragspositionen, die %s sind, können nicht gelöscht werden!"
+#: selection:sale.order,order_policy:0
+msgid "Pay before delivery"
+msgstr ""
+
+#. module: sale
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.open_board_sales
+msgid "Sales Dashboard"
+msgstr ""
#. module: sale
#: model:ir.actions.act_window,name:sale.action_sale_order_make_invoice
@@ -1594,6 +1760,7 @@ msgstr "Rechnungen erstellen"
#. module: sale
#: view:sale.order:0
+#: selection:sale.order,state:0
#: view:sale.order.line:0
msgid "To Invoice"
msgstr "Abzurechnen"
@@ -1604,6 +1771,11 @@ msgid "Date on which sales order is confirmed."
msgstr "Datum der Auftragsbestätigung"
#. module: sale
+#: field:sale.order,project_id:0
+msgid "Contract/Analytic Account"
+msgstr ""
+
+#. module: sale
#: field:sale.order,company_id:0
#: field:sale.order.line,company_id:0
#: view:sale.report:0
@@ -1623,10 +1795,12 @@ msgid "The amount to be invoiced in advance."
msgstr "Der Vorauszahlungsbetrag"
#. module: sale
-#: selection:sale.order,state:0
-#: selection:sale.report,state:0
-msgid "Invoice Exception"
-msgstr "Abrechnungsfehler"
+#: code:addons/sale/sale.py:1256
+#, python-format
+msgid ""
+"Couldn't find a pricelist line matching this product and quantity.\n"
+"You have to change either the product, the quantity or the pricelist."
+msgstr ""
#. module: sale
#: help:sale.order,picking_ids:0
@@ -1636,15 +1810,6 @@ msgstr ""
"Diese Liste beinhaltet die Lieferaufträge für diesen Verkaufsauftrag."
#. module: sale
-#: help:sale.installer,sale_margin:0
-msgid ""
-"Gives the margin of profitability by calculating the difference between Unit "
-"Price and Cost Price."
-msgstr ""
-"Berechnet die Spanne aufgrund von Verkaufspreis und Herstellkosten oder "
-"Einkaufspreis"
-
-#. module: sale
#: view:sale.make.invoice:0
#: view:sale.order.line.make.invoice:0
msgid "Create invoices"
@@ -1663,6 +1828,11 @@ msgid "Cancelled"
msgstr "Abgebrochen"
#. module: sale
+#: view:sale.order.line:0
+msgid "Sales Order Lines related to a Sales Order of mine"
+msgstr ""
+
+#. module: sale
#: model:ir.actions.act_window,name:sale.action_shop_form
#: model:ir.ui.menu,name:sale.menu_action_shop_form
#: field:sale.order,shop_id:0
@@ -1672,17 +1842,12 @@ msgid "Shop"
msgstr "Vertriebsshop"
#. module: sale
-#: view:sale.report:0
-msgid " Month "
-msgstr " Monat "
-
-#. module: sale
#: field:sale.report,date_confirm:0
msgid "Date Confirm"
msgstr "Geplante Lieferung am"
#. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:111
+#: code:addons/sale/wizard/sale_line_invoice.py:113
#, python-format
msgid "Warning"
msgstr "Warnung"
@@ -1694,21 +1859,6 @@ msgid "Sales by Month"
msgstr "Verkäufe pro Monat"
#. module: sale
-#: code:addons/sale/sale.py:1045
-#, python-format
-msgid ""
-"You selected a quantity of %d Units.\n"
-"But it's not compatible with the selected packaging.\n"
-"Here is a proposition of quantities according to the packaging:\n"
-"\n"
-"EAN: %s Quantity: %s Type of ul: %s"
-msgstr ""
-"Sie haben %d Einheiten ausgewählt.\n"
-"Dies passt aber nicht zum ausgewählten Paket.\n"
-"Hier ist ein Vorschlag der zum Paket passt:\n"
-"EAN: %s Anzahl: %s Einheit: %s"
-
-#. module: sale
#: model:ir.model,name:sale.model_sale_order
#: model:process.node,name:sale.process_node_order0
#: model:process.node,name:sale.process_node_saleorder0
@@ -1724,6 +1874,11 @@ msgid "Quantity (UoS)"
msgstr "Menge (Verkaufseinheit)"
#. module: sale
+#: view:sale.order.line:0
+msgid "Sale Order Lines that are in 'done' state"
+msgstr ""
+
+#. module: sale
#: model:process.transition,note:sale.process_transition_packing0
msgid ""
"The Pick List form is created as soon as the sales order is confirmed, in "
@@ -1744,6 +1899,11 @@ msgid "Confirmed"
msgstr "Bestätigt"
#. module: sale
+#: field:sale.config.picking_policy,order_policy:0
+msgid "Main Method Based On"
+msgstr ""
+
+#. module: sale
#: model:process.transition.action,name:sale.process_transition_action_confirm0
msgid "Confirm"
msgstr "Bestätigen"
@@ -1766,6 +1926,7 @@ msgid "Invoice Lines"
msgstr "Rechnungszeilen"
#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_product_tree
#: view:sale.order:0
#: view:sale.order.line:0
msgid "Sales Order Lines"
@@ -1782,32 +1943,18 @@ msgid "Configuration"
msgstr "Konfiguration"
#. module: sale
-#: selection:sale.order,picking_policy:0
-msgid "Complete Delivery"
-msgstr "Lieferung der Gesamtmenge"
+#: code:addons/sale/edi/sale_order.py:146
+#, python-format
+msgid "EDI Pricelist (%s)"
+msgstr ""
#. module: sale
#: view:sale.report:0
-msgid " Month-1 "
-msgstr " Monat -1 "
-
-#. module: sale
-#: help:sale.config.picking_policy,picking_policy:0
-msgid ""
-"The Shipping Policy is used to configure per order if you want to deliver as "
-"soon as possible when one product is available or you wait that all products "
-"are available.."
+msgid "Sales order created in current year"
msgstr ""
-"Die Auslieferungsbedingung bestimmt je Verkaufsauftrag, ob alles auf einmal "
-"oder jedes Produkt nach Verfügbarkeit geliefert wreden soll."
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "August"
-msgstr "August"
#. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:111
+#: code:addons/sale/wizard/sale_line_invoice.py:113
#, python-format
msgid ""
"Invoice cannot be created for this Sales Order Line due to one of the "
@@ -1821,6 +1968,11 @@ msgstr ""
"2. Der Verkaufsauftrag wurde bereits abgerechnet"
#. module: sale
+#: view:sale.order.line:0
+msgid "Sale order lines done"
+msgstr ""
+
+#. module: sale
#: field:sale.order.line,th_weight:0
msgid "Weight"
msgstr "Gewicht"
@@ -1839,7 +1991,6 @@ msgstr "Dezember"
#. module: sale
#: field:sale.config.picking_policy,config_logo:0
-#: field:sale.installer,config_logo:0
msgid "Image"
msgstr "Bild / Photo"
@@ -1873,9 +2024,9 @@ msgid "Salesman"
msgstr "Verkäufer"
#. module: sale
-#: model:process.node,note:sale.process_node_saleorder0
-msgid "Drives procurement and invoicing"
-msgstr "Steuert Beschaffung und Rechnungsstellung"
+#: model:ir.actions.act_window,name:sale.action_order_tree
+msgid "Old Quotations"
+msgstr "Vorherige Angebote"
#. module: sale
#: field:sale.order,amount_untaxed:0
@@ -1883,7 +2034,7 @@ msgid "Untaxed Amount"
msgstr "Nettobetrag"
#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:163
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:170
#: model:ir.actions.act_window,name:sale.action_view_sale_advance_payment_inv
#: view:sale.advance.payment.inv:0
#: view:sale.order:0
@@ -1892,7 +2043,7 @@ msgid "Advance Invoice"
msgstr "Anzahlungsrechnung"
#. module: sale
-#: code:addons/sale/sale.py:591
+#: code:addons/sale/sale.py:624
#, python-format
msgid "The sales order '%s' has been cancelled."
msgstr "Der Auftrag '%s' wurde abgebrochen."
@@ -1937,20 +2088,20 @@ msgid "Packings"
msgstr "Verpackungen"
#. module: sale
-#: field:sale.config.picking_policy,progress:0
-#: field:sale.installer,progress:0
-msgid "Configuration Progress"
-msgstr "Konfiguration"
+#: view:sale.order.line:0
+msgid "Sale Order Lines ready to be invoiced"
+msgstr ""
#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_product_tree
-msgid "Product sales"
-msgstr "Verkaufsaufträge"
+#: view:sale.report:0
+msgid "Sales order created in last month"
+msgstr ""
#. module: sale
-#: field:sale.order,date_order:0
-msgid "Ordered Date"
-msgstr "Auftragsdatum"
+#: model:ir.actions.act_window,name:sale.action_email_templates
+#: model:ir.ui.menu,name:sale.menu_email_templates
+msgid "Email Templates"
+msgstr ""
#. module: sale
#: model:ir.actions.act_window,name:sale.action_order_form
@@ -1960,14 +2111,15 @@ msgid "Sales Orders"
msgstr "Verkaufsaufträge"
#. module: sale
-#: selection:sale.config.picking_policy,picking_policy:0
-msgid "Direct Delivery"
-msgstr "Teilmengen direkt liefern"
+#: model:ir.model,name:sale.model_sale_shop
+#: view:sale.shop:0
+msgid "Sales Shop"
+msgstr "Verkaufsshop"
#. module: sale
-#: field:sale.installer,sale_journal:0
-msgid "Invoicing journals"
-msgstr "Rechnungsjournale"
+#: selection:sale.report,month:0
+msgid "November"
+msgstr "November"
#. module: sale
#: field:sale.advance.payment.inv,product_id:0
@@ -1975,18 +2127,12 @@ msgid "Advance Product"
msgstr "Produktfortschritt"
#. module: sale
-#: view:sale.report:0
-#: field:sale.report,shipped_qty_1:0
-msgid "Shipped Qty"
-msgstr "Gelieferte Menge"
-
-#. module: sale
-#: view:sale.open.invoice:0
-msgid "You invoice has been successfully created!"
-msgstr "Ihre Rechnung wurde erfolgreich generiert!"
+#: view:sale.order:0
+msgid "Compute"
+msgstr "Berechne Umsatzsteuer"
#. module: sale
-#: code:addons/sale/sale.py:585
+#: code:addons/sale/sale.py:618
#, python-format
msgid "You must first cancel all invoices attached to this sales order."
msgstr ""
@@ -1999,25 +2145,14 @@ msgid "January"
msgstr "Januar"
#. module: sale
-#: view:sale.installer:0
-msgid "Configure Your Sales Management Application"
-msgstr "Konfigurieren Sie Ihre Anwendungen für den Verkauf"
-
-#. module: sale
#: model:ir.actions.act_window,name:sale.action_order_tree4
msgid "Sales Order in Progress"
msgstr "Auftrag in Bearbeitung"
#. module: sale
-#: field:sale.installer,sale_layout:0
-msgid "Sales Order Layout Improvement"
-msgstr "Alternatives Layout für Verkaufsauftrag"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:63
-#, python-format
-msgid "Error"
-msgstr "Fehler"
+#: help:sale.order,origin:0
+msgid "Reference of the document that generated this sales order request."
+msgstr "Referenz zu Beleg, der den Verkaufsauftrag ausgelöst hat"
#. module: sale
#: view:sale.report:0
@@ -2026,6 +2161,11 @@ msgid "Commitment Delay"
msgstr "Tage bis Auftrag"
#. module: sale
+#: selection:sale.order,order_policy:0
+msgid "Deliver & invoice on demand"
+msgstr ""
+
+#. module: sale
#: model:process.node,note:sale.process_node_saleprocurement0
msgid ""
"One Procurement order for each sales order line and for each of the "
@@ -2050,13 +2190,12 @@ msgid "Confirmed sales order to invoice."
msgstr "Bestätigte Verkaufsaufträge zur Abrechnung"
#. module: sale
-#: code:addons/sale/sale.py:290
-#, python-format
-msgid "Cannot delete Sales Order(s) which are already confirmed !"
-msgstr "Bereits bestätigte Verkaufsaufträge können nicht gelöscht werden !"
+#: view:sale.order:0
+msgid "Sales Order that haven't yet been confirmed"
+msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:316
+#: code:addons/sale/sale.py:322
#, python-format
msgid "The sales order '%s' has been set in draft state."
msgstr "Der Auftrag '%s' wurde in den Zustand Entwurf versetzt"
@@ -2067,37 +2206,27 @@ msgid "from stock"
msgstr "Beschaffung an Lager"
#. module: sale
-#: field:sale.config.picking_policy,order_policy:0
-msgid "Shipping Default Policy"
-msgstr "Standard für Abrechnung Lieferauftrag"
-
-#. module: sale
#: view:sale.open.invoice:0
msgid "Close"
msgstr "Fertig"
#. module: sale
+#: code:addons/sale/sale.py:1248
+#, python-format
+msgid "No Pricelist ! : "
+msgstr ""
+
+#. module: sale
#: field:sale.order,shipped:0
msgid "Delivered"
msgstr "Ausgeliefert"
#. module: sale
-#: code:addons/sale/sale.py:1115
-#, python-format
-msgid "Not enough stock !"
-msgstr "Nicht genügend Lagerware!"
-
-#. module: sale
#: constraint:stock.move:0
msgid "You must assign a production lot for this product"
msgstr "Sie müssen zwingend eine Losnummer für dieses Produkt angeben"
#. module: sale
-#: field:sale.order.line,sequence:0
-msgid "Layout Sequence"
-msgstr "Reihenfolge Auftragslayout"
-
-#. module: sale
#: model:ir.actions.act_window,help:sale.action_shop_form
msgid ""
"If you have more than one shop reselling your company products, you can "
@@ -2129,13 +2258,6 @@ msgid "May"
msgstr "Mai"
#. module: sale
-#: help:sale.installer,sale_order_dates:0
-msgid "Adds commitment, requested and effective dates on Sales Orders."
-msgstr ""
-"Fügt Erstellungs-, Angebots-, Bestätigungsdatum u.a. Daten zum "
-"Verkaufsauftrag hinzu"
-
-#. module: sale
#: view:sale.order:0
#: field:sale.order,partner_id:0
#: field:sale.order.line,order_partner_id:0
@@ -2143,25 +2265,11 @@ msgid "Customer"
msgstr "Kunde"
#. module: sale
-#: model:product.template,name:sale.advance_product_0_product_template
-msgid "Advance"
-msgstr "Vorschuss"
-
-#. module: sale
#: selection:sale.report,month:0
msgid "February"
msgstr "Februar"
#. module: sale
-#: help:sale.installer,sale_journal:0
-msgid ""
-"Allows you to group and invoice your delivery orders according to different "
-"invoicing types: daily, weekly, etc."
-msgstr ""
-"Gruppierung und Fakturierung der Lieferaufträge je Abrechnungstyp (täglich, "
-"wöchentlich..)"
-
-#. module: sale
#: selection:sale.report,month:0
msgid "April"
msgstr "April"
@@ -2172,11 +2280,6 @@ msgid "Accounting"
msgstr "Finanzbuchhaltung"
#. module: sale
-#: field:sale.config.picking_policy,step:0
-msgid "Steps To Deliver a Sales Order"
-msgstr "Abfolge für die Auslieferung"
-
-#. module: sale
#: view:sale.order:0
#: view:sale.order.line:0
msgid "Search Sales Order"
@@ -2188,20 +2291,18 @@ msgid "Sales Order Requisition"
msgstr "Anfrage Verkaufsauftrag"
#. module: sale
+#: code:addons/sale/sale.py:1242
+#, python-format
+msgid "Not enough stock ! : "
+msgstr ""
+
+#. module: sale
#: report:sale.order:0
#: field:sale.order,payment_term:0
msgid "Payment Term"
msgstr "Zahlungsbedingung"
#. module: sale
-#: help:sale.installer,sale_layout:0
-msgid ""
-"Provides some features to improve the layout of the Sales Order reports."
-msgstr ""
-"Erweiterung der Anwendung, wodurch es ermöglicht wird zu den "
-"Verkaufsaufträgen zusätzliche Angaben zu erfassen und auszugeben."
-
-#. module: sale
#: model:ir.actions.act_window,help:sale.action_order_report_all
msgid ""
"This report performs analysis on your quotations and sales orders. Analysis "
@@ -2375,9 +2476,6 @@ msgstr "Rechnung durch Lieferung"
#~ msgid "Procurement for each line"
#~ msgstr "Beschaffungsvorschlag für jede Position"
-#~ msgid "My Quotations"
-#~ msgstr "Meine Angebote"
-
#~ msgid "Packing Default Policy"
#~ msgstr "Verpackung Standard"
@@ -2425,6 +2523,9 @@ msgstr "Rechnung durch Lieferung"
#~ msgid "Packing Policy"
#~ msgstr "Packregeln"
+#~ msgid "Product sales"
+#~ msgstr "Verkaufsaufträge"
+
#~ msgid "Our Salesman"
#~ msgstr "Unser Verkäufer"
@@ -2451,6 +2552,9 @@ msgstr "Rechnung durch Lieferung"
#~ msgid "Make Invoice"
#~ msgstr "Erzeuge Rechnung"
+#~ msgid "Delivery Order Only"
+#~ msgstr "Auslieferung"
+
#~ msgid "Sales order lines"
#~ msgstr "Auftragspositionen"
@@ -2510,6 +2614,9 @@ msgstr "Rechnung durch Lieferung"
#~ msgid "Open Advance Invoice"
#~ msgstr "Öffne Rechnung in Bearbeitung"
+#~ msgid "Sales Management"
+#~ msgstr "Verkauf"
+
#~ msgid "Deliver"
#~ msgstr "Auslieferung"
@@ -2562,6 +2669,9 @@ msgstr "Rechnung durch Lieferung"
#~ msgid "Related invoices"
#~ msgstr "bezugnehmende Rechnungen"
+#~ msgid "Payment Before Delivery"
+#~ msgstr "Zahlung vor Auslieferung"
+
#~ msgid ""
#~ "This is the list of invoices that have been generated for this sale order. "
#~ "The same sale order may have been invoiced in several times (by line for "
@@ -2639,9 +2749,62 @@ msgstr "Rechnung durch Lieferung"
#~ "Fehler: Die Verkaufseinheit sollte in einer anderen Kategorie sein als die "
#~ "Mengeneinheit"
+#~ msgid " Year "
+#~ msgstr " Jahr "
+
+#~ msgid "Allows you to compute delivery costs on your quotations."
+#~ msgstr "Erlaubt die Kalkulation von Lieferkosten für das Angebot"
+
+#~ msgid "Margins in Sales Orders"
+#~ msgstr "Spannen im Verkaufsauftrag"
+
+#~ msgid "Sales Application Configuration"
+#~ msgstr "Konfiguration des Verkaufs"
+
+#~ msgid "Delivery Costs"
+#~ msgstr "Lieferkosten"
+
+#~ msgid "title"
+#~ msgstr "Titel"
+
+#~ msgid "Order date"
+#~ msgstr "Auftragsdatum"
+
+#, python-format
+#~ msgid "Picking Information !"
+#~ msgstr "Lieferschein Information"
+
+#~ msgid "sale.installer"
+#~ msgstr "sale.installer"
+
+#~ msgid " Month "
+#~ msgstr " Monat "
+
+#~ msgid " Month-1 "
+#~ msgstr " Monat -1 "
+
+#~ msgid "Configuration Progress"
+#~ msgstr "Konfiguration"
+
+#~ msgid "Invoicing journals"
+#~ msgstr "Rechnungsjournale"
+
+#~ msgid "Shipped Qty"
+#~ msgstr "Gelieferte Menge"
+
+#, python-format
+#~ msgid "Not enough stock !"
+#~ msgstr "Nicht genügend Lagerware!"
+
#~ msgid "Invalid model name in the action definition."
#~ msgstr "Ungültiger Modulname in der Aktionsdefinition."
+#~ msgid "All at Once"
+#~ msgstr "Nur Gesamtmenge liefern"
+
+#~ msgid "Configure Picking Policy for Sales Order"
+#~ msgstr "Konfiguration der Lieferbedingungen für diesen Verkaufsauftrag"
+
#, python-format
#~ msgid ""
#~ "You have to select a customer in the sale form !\n"
@@ -2655,18 +2818,62 @@ msgstr "Rechnung durch Lieferung"
#~ msgstr "Kann diesen Verkaufsauftrag nicht abbrechen !"
#~ msgid ""
+#~ "Provides some features to improve the layout of the Sales Order reports."
+#~ msgstr ""
+#~ "Erweiterung der Anwendung, wodurch es ermöglicht wird zu den "
+#~ "Verkaufsaufträgen zusätzliche Angaben zu erfassen und auszugeben."
+
+#~ msgid "Sales Order Dates"
+#~ msgstr "Auftragsdaten"
+
+#~ msgid "Partial Delivery"
+#~ msgstr "Lieferung von Teilmenge"
+
+#~ msgid ""
#~ "This is the list of picking list that have been generated for this invoice"
#~ msgstr "Diese Lieferaufträge wurden für diese Rechnung erstellt"
+#~ msgid "Shipping Policy"
+#~ msgstr "Abrechnungsbedingung"
+
+#~ msgid "Shipping & Manual Invoice"
+#~ msgstr "Lieferung & Manuelle Rechnung"
+
#~ msgid ""
#~ "Error: The default UOM and the purchase UOM must be in the same category."
#~ msgstr ""
#~ "Fehler: Die Standard Mengeneinheit sowie die Mengeneinheit für die "
#~ "Beschaffung muss in derselben Kategorie sein."
+#~ msgid ""
+#~ "By default, OpenERP is able to manage complex routing and paths of products "
+#~ "in your warehouse and partner locations. This will configure the most common "
+#~ "and simple methods to deliver products to the customer in one or two "
+#~ "operations by the worker."
+#~ msgstr ""
+#~ "Standardmäßig kann OpenERP komplexe Warenbewegungen zwischen Lager und "
+#~ "Kunden abbilden. Dieser Vorgang konfiguriert die übliche Auslieferung an den "
+#~ "Kunden in 1 oder 2 Schritten."
+
+#~ msgid "Picking List & Delivery Order"
+#~ msgstr "Lieferauftrag & Auslieferung"
+
+#~ msgid "Shipping Default Policy"
+#~ msgstr "Standard für Abrechnung Lieferauftrag"
+
+#~ msgid "Invoicing"
+#~ msgstr "Ausgangsrechnungen"
+
#~ msgid "Steps To Deliver a Sale Order"
#~ msgstr "Schritte für Auslieferung eines Verkaufsauftrags"
+#~ msgid ""
+#~ "Gives the margin of profitability by calculating the difference between Unit "
+#~ "Price and Cost Price."
+#~ msgstr ""
+#~ "Berechnet die Spanne aufgrund von Verkaufspreis und Herstellkosten oder "
+#~ "Einkaufspreis"
+
#, python-format
#~ msgid "You must first cancel all invoices attached to this sale order."
#~ msgstr ""
@@ -2675,3 +2882,189 @@ msgstr "Rechnung durch Lieferung"
#~ msgid "Invoice on Order After Delivery"
#~ msgstr "Rechnung durch Auftrag"
+
+#~ msgid "Complete Delivery"
+#~ msgstr "Lieferung der Gesamtmenge"
+
+#~ msgid ""
+#~ "The Shipping Policy is used to configure per order if you want to deliver as "
+#~ "soon as possible when one product is available or you wait that all products "
+#~ "are available.."
+#~ msgstr ""
+#~ "Die Auslieferungsbedingung bestimmt je Verkaufsauftrag, ob alles auf einmal "
+#~ "oder jedes Produkt nach Verfügbarkeit geliefert wreden soll."
+
+#~ msgid "Ordered Date"
+#~ msgstr "Auftragsdatum"
+
+#~ msgid "Direct Delivery"
+#~ msgstr "Teilmengen direkt liefern"
+
+#~ msgid "Sales Order Layout Improvement"
+#~ msgstr "Alternatives Layout für Verkaufsauftrag"
+
+#~ msgid "Adds commitment, requested and effective dates on Sales Orders."
+#~ msgstr ""
+#~ "Fügt Erstellungs-, Angebots-, Bestätigungsdatum u.a. Daten zum "
+#~ "Verkaufsauftrag hinzu"
+
+#~ msgid ""
+#~ "Allows you to group and invoice your delivery orders according to different "
+#~ "invoicing types: daily, weekly, etc."
+#~ msgstr ""
+#~ "Gruppierung und Fakturierung der Lieferaufträge je Abrechnungstyp (täglich, "
+#~ "wöchentlich..)"
+
+#~ msgid "Picking Default Policy"
+#~ msgstr "Standard für Ausführung Lieferauftrag"
+
+#~ msgid "Configure Sales Order Logistics"
+#~ msgstr "Logistik für Verkaufsaufträge konfigurieren"
+
+#~ msgid "Configure"
+#~ msgstr "Konfigurieren"
+
+#~ msgid ""
+#~ "The Shipping Policy is used to synchronise invoice and delivery operations.\n"
+#~ " - The 'Pay Before delivery' choice will first generate the invoice and "
+#~ "then generate the picking order after the payment of this invoice.\n"
+#~ " - The 'Shipping & Manual Invoice' will create the picking order directly "
+#~ "and wait for the user to manually click on the 'Invoice' button to generate "
+#~ "the draft invoice.\n"
+#~ " - The 'Invoice On Order After Delivery' choice will generate the draft "
+#~ "invoice based on sales order after all picking lists have been finished.\n"
+#~ " - The 'Invoice From The Picking' choice is used to create an invoice "
+#~ "during the picking process."
+#~ msgstr ""
+#~ "Die Abrechnungsbedingung bei einem Auftrag steuert und synchronisiert die "
+#~ "zeitliche Abfolge von Lieferung und Rechnung.\n"
+#~ " - Durch \"Zahlung vor Lieferung\" wird zuerst die Rechnung generiert, dann "
+#~ "erst erfolgt ein Lieferauftrag aufgrund der Zahlung.\n"
+#~ " - Durch \"Lieferung & Manuelle Rechnung\" ist der Lieferauftrag "
+#~ "unmittelbar verfügbar. Die Rechnung muss noch manuell erstellt werden.\n"
+#~ " - Durch \"Rechnung durch Auftrag\" erfolgt eine automatische Rechnung im "
+#~ "Zustand Entwurf, wenn die Lieferung vollständig abgeschlossen wurde.\n"
+#~ " - Durch \"Rechnung durch Lieferung\" kann bei Abschluss einer Lieferung "
+#~ "die Rechnung gleich mit erstellt werden."
+
+#~ msgid "Enhance your core Sales Application with additional functionalities."
+#~ msgstr ""
+#~ "Erweitern Sie Ihre Anwendung für den Verkauf durch weitere Funktionen."
+
+#~ msgid "Setup your sales workflow and default values."
+#~ msgstr "Verkaufsabfolge und Vorgabewerte einrichten"
+
+#~ msgid ""
+#~ "\n"
+#~ " The base module to manage quotations and sales orders.\n"
+#~ "\n"
+#~ " * Workflow with validation steps:\n"
+#~ " - Quotation -> Sales order -> Invoice\n"
+#~ " * Invoicing methods:\n"
+#~ " - Invoice on order (before or after shipping)\n"
+#~ " - Invoice on delivery\n"
+#~ " - Invoice on timesheets\n"
+#~ " - Advance invoice\n"
+#~ " * Partners preferences (shipping, invoicing, incoterm, ...)\n"
+#~ " * Products stocks and prices\n"
+#~ " * Delivery methods:\n"
+#~ " - all at once, multi-parcel\n"
+#~ " - delivery costs\n"
+#~ " * Dashboard for salesman that includes:\n"
+#~ " * Your open quotations\n"
+#~ " * Top 10 sales of the month\n"
+#~ " * Cases statistics\n"
+#~ " * Graph of sales by product\n"
+#~ " * Graph of cases of the month\n"
+#~ " "
+#~ msgstr ""
+#~ "\n"
+#~ " Das Basismodul für die Angebotserstellung und das Management von "
+#~ "Verkaufsaufträgen.\n"
+#~ "\n"
+#~ " * Verkaufsvorgang über eine schrittweise Abfolge:\n"
+#~ " - Angebot -> Kundenauftrag -> Rechnung\n"
+#~ " * Verschiedene Abrechnungsmethoden:\n"
+#~ " - Rechnung durch Auftrag (vor oder nach der Auslieferung)\n"
+#~ " - Rechnung durch Lieferung\n"
+#~ " - Rechnung durch Zeiterfassung\n"
+#~ " - Anzahlungsrechnung\n"
+#~ " * Verwaltung der Partner Präferenzen (Versand, Rechnungsstellung, "
+#~ "incoterm, ...)\n"
+#~ " * Produkte Bestände und Preise\n"
+#~ " * Lieferbedingungen:\n"
+#~ " - Komplettlieferung, Teillieferung\n"
+#~ " - Berechnung von Versandkosten\n"
+#~ " * Pinnwand für den Verkäufer mit folgenden Inhalten:\n"
+#~ " * Offene Angebote des Verkäufers\n"
+#~ " * Top 10 Verkäufe des Monats\n"
+#~ " * Statistiken zu Vertriebsvorgängen\n"
+#~ " * Grafik des Umsatz nach Produkten\n"
+#~ " * Grafik der Vertriebsvorgänge des Monats\n"
+#~ " "
+
+#~ msgid "Invoice From The Picking"
+#~ msgstr "Rechnung durch Lieferung"
+
+#, python-format
+#~ msgid "You cannot cancel a sales order line that has already been invoiced !"
+#~ msgstr ""
+#~ "Sie können keinen Verkaufsauftrag stornieren, der bereits abgerechnet wurde."
+
+#, python-format
+#~ msgid "Cannot delete a sales order line which is %s !"
+#~ msgstr "Auftragspositionen, die %s sind, können nicht gelöscht werden!"
+
+#, python-format
+#~ msgid ""
+#~ "You selected a quantity of %d Units.\n"
+#~ "But it's not compatible with the selected packaging.\n"
+#~ "Here is a proposition of quantities according to the packaging:\n"
+#~ "\n"
+#~ "EAN: %s Quantity: %s Type of ul: %s"
+#~ msgstr ""
+#~ "Sie haben %d Einheiten ausgewählt.\n"
+#~ "Dies passt aber nicht zum ausgewählten Paket.\n"
+#~ "Hier ist ein Vorschlag der zum Paket passt:\n"
+#~ "EAN: %s Anzahl: %s Einheit: %s"
+
+#~ msgid "Configure Your Sales Management Application"
+#~ msgstr "Konfigurieren Sie Ihre Anwendungen für den Verkauf"
+
+#~ msgid "Layout Sequence"
+#~ msgstr "Reihenfolge Auftragslayout"
+
+#, python-format
+#~ msgid "Cannot delete Sales Order(s) which are already confirmed !"
+#~ msgstr "Bereits bestätigte Verkaufsaufträge können nicht gelöscht werden !"
+
+#~ msgid "Steps To Deliver a Sales Order"
+#~ msgstr "Abfolge für die Auslieferung"
+
+#~ msgid "Invoice On Order After Delivery"
+#~ msgstr "Rechnung durch Auftrag nach Lieferung"
+
+#~ msgid "Order Reference must be unique !"
+#~ msgstr "Die Referenz muss eindeutig sein!"
+
+#~ msgid "Advance"
+#~ msgstr "Vorschuss"
+
+#~ msgid ""
+#~ "Gives the state of the quotation or sales order. \n"
+#~ "The exception state is automatically set when a cancel operation occurs in "
+#~ "the invoice validation (Invoice Exception) or in the picking list process "
+#~ "(Shipping Exception). \n"
+#~ "The 'Waiting Schedule' state is set when the invoice is confirmed but "
+#~ "waiting for the scheduler to run on the date 'Ordered Date'."
+#~ msgstr ""
+#~ "Zeigt den Zustand des Verkaufsauftrags:\n"
+#~ "\n"
+#~ "Der Fehlerzustand wird automatisch zugewiesen, wenn bei der "
+#~ "Auftragsabwicklung bei der Erstellung der Lieferbelege oder der Erstellung "
+#~ "von Rechnungsbelegen ein Fehler aufgetreten ist und somit eine vorherige "
+#~ "Überarbeitung erforderlich ist.\n"
+#~ "\n"
+#~ "Der Wartezustand wird automatisch zugewiesen, wenn eine Rechnung bereits "
+#~ "bestätigt wurde, zunächst aber ein weiterer automatischer "
+#~ "Beschaffungsvorschlag für das Bestelldatum durchgeführt werden sollte."
diff --git a/addons/sale/i18n/el.po b/addons/sale/i18n/el.po
index 5c3d09d42bc..5816feb3ee2 100644
--- a/addons/sale/i18n/el.po
+++ b/addons/sale/i18n/el.po
@@ -7,15 +7,27 @@ msgid ""
msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-01-11 11:16+0000\n"
+"POT-Creation-Date: 2011-12-22 18:43+0000\n"
"PO-Revision-Date: 2011-04-01 18:34+0000\n"
"Last-Translator: Dimitris Andavoglou <dimitrisand@gmail.com>\n"
"Language-Team: Greek <el@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-05 05:16+0000\n"
-"X-Generator: Launchpad (build 14231)\n"
+"X-Launchpad-Export-Date: 2011-12-23 06:46+0000\n"
+"X-Generator: Launchpad (build 14560)\n"
+
+#. module: sale
+#: field:sale.config.picking_policy,timesheet:0
+msgid "Based on Timesheet"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid ""
+"Sale Order Lines that are confirmed, done or in exception state and haven't "
+"yet been invoiced"
+msgstr ""
#. module: sale
#: view:board.board:0
@@ -24,11 +36,6 @@ msgid "Sales by Salesman in last 90 days"
msgstr "Πωλήσεις ανά Πωλητή τις τελευταίες 90 μέρες"
#. module: sale
-#: help:sale.installer,delivery:0
-msgid "Allows you to compute delivery costs on your quotations."
-msgstr "Επιτρέπει τον υπολογισμό του κόστους μεταφοράς στις προσφορές σου"
-
-#. module: sale
#: help:sale.order,picking_policy:0
msgid ""
"If you don't have enough stock available to deliver all at once, do you "
@@ -38,6 +45,11 @@ msgstr ""
"αποδέχεστε μερικώς εκτελεσμένες αποστολές ή όχι;"
#. module: sale
+#: view:sale.order:0
+msgid "UoS"
+msgstr ""
+
+#. module: sale
#: help:sale.order,partner_shipping_id:0
msgid "Shipping address for current sales order."
msgstr "Διέυθυνση αποστολής για την τρέχουσα παραγγελία πώλησης."
@@ -61,22 +73,12 @@ msgid "Cancel Order"
msgstr "Ακύρωση Εντολής"
#. module: sale
-#: view:sale.config.picking_policy:0
-msgid "Configure Sales Order Logistics"
-msgstr "Διαμορφώστε την Εφοδιαστικ΄΄η των Παραγγελιών Πώλησης"
-
-#. module: sale
-#: code:addons/sale/sale.py:603
+#: code:addons/sale/sale.py:638
#, python-format
msgid "The quotation '%s' has been converted to a sales order."
msgstr ""
#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Payment Before Delivery"
-msgstr "Πληρωμή Πριν Την Παράδοση"
-
-#. module: sale
#: code:addons/sale/wizard/sale_make_invoice.py:42
#, python-format
msgid "Warning !"
@@ -93,12 +95,6 @@ msgid "Drives procurement orders for every sales order line."
msgstr ""
#. module: sale
-#: selection:sale.config.picking_policy,picking_policy:0
-msgid "All at Once"
-msgstr "Όλα Αμέσως"
-
-#. module: sale
-#: field:sale.order,project_id:0
#: view:sale.report:0
#: field:sale.report,analytic_account_id:0
#: field:sale.shop,project_id:0
@@ -114,6 +110,15 @@ msgid ""
msgstr ""
#. module: sale
+#: code:addons/sale/sale.py:295
+#, python-format
+msgid ""
+"In order to delete a confirmed sale order, you must cancel it before ! To "
+"cancel a sale order, you must first cancel related picking or delivery "
+"orders."
+msgstr ""
+
+#. module: sale
#: model:process.node,name:sale.process_node_saleprocurement0
msgid "Procurement Order"
msgstr "Παραγγελία Προμήθειας"
@@ -125,6 +130,11 @@ msgid "Partner"
msgstr "Συνεργάτης"
#. module: sale
+#: selection:sale.order,order_policy:0
+msgid "Invoice based on deliveries"
+msgstr ""
+
+#. module: sale
#: view:sale.order:0
msgid "Order Line"
msgstr "Γραμμή Εντολής"
@@ -157,9 +167,14 @@ msgid "Default Payment Term"
msgstr "Προκαθορισμένος Όρος Πληρωμής"
#. module: sale
-#: model:ir.actions.act_window,name:sale.action_config_picking_policy
-msgid "Configure Picking Policy for Sales Order"
-msgstr "Προσδιορίστε Πολιτική Μεταφορικών για την Παραγγελία Πώλησης"
+#: field:sale.config.picking_policy,deli_orders:0
+msgid "Based on Delivery Orders"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.picking_policy,time_unit:0
+msgid "Main Working Time Unit"
+msgstr ""
#. module: sale
#: view:sale.order:0
@@ -175,9 +190,10 @@ msgid "Disc.(%)"
msgstr "Εκπτ.(%)"
#. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_forceassignation0
-msgid "Force Assignation"
-msgstr "Δυναμική Ανάθεση"
+#: view:sale.report:0
+#: field:sale.report,price_total:0
+msgid "Total Price"
+msgstr "Συνολική Τιμή"
#. module: sale
#: help:sale.make.invoice,grouped:0
@@ -185,6 +201,11 @@ msgid "Check the box to group the invoices for the same customers"
msgstr "Τσέκαρε αυτό το κουτί για να ομαδοποιήσεις τα τιμολόγια ανά πελάτη"
#. module: sale
+#: view:sale.order:0
+msgid "My Sale Orders"
+msgstr ""
+
+#. module: sale
#: selection:sale.order,invoice_quantity:0
msgid "Ordered Quantities"
msgstr "Παραγγελθέντα Τεμάχια"
@@ -225,14 +246,25 @@ msgstr ""
"'Τιμολόγιο από παραλαβή' ή 'Τιμολόγιο με παραγγελία μετά την παραλαβή'."
#. module: sale
+#: field:sale.config.picking_policy,task_work:0
+msgid "Based on Tasks' Work"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
+msgid "Quotations and Sales"
+msgstr ""
+
+#. module: sale
#: model:ir.model,name:sale.model_sale_make_invoice
msgid "Sales Make Invoice"
msgstr "Πωλήσεις Δημιουργία Τιμολογίου"
#. module: sale
-#: view:sale.order:0
-msgid "Recreate Packing"
-msgstr "Επαναδημιουργία Συσκευασίας"
+#: code:addons/sale/sale.py:330
+#, python-format
+msgid "Pricelist Warning!"
+msgstr ""
#. module: sale
#: field:sale.order.line,discount:0
@@ -240,12 +272,10 @@ msgid "Discount (%)"
msgstr "Έκπτωση (%)"
#. module: sale
-#: help:res.company,security_lead:0
-msgid ""
-"This is the days added to what you promise to customers for security purpose"
-msgstr ""
-"Αυτές είναι οι μέρες που προστέθηκαν σε αυτό που υποσχεθήκατε στους πελάτες "
-"για λόγους ασφαλείας."
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_quotation_for_sale
+msgid "My Quotations"
+msgstr "Οι Προσφορές Μου"
#. module: sale
#: view:board.board:0
@@ -270,7 +300,22 @@ msgid "Shop Name"
msgstr "Όνομα καταστήματος"
#. module: sale
-#: code:addons/sale/sale.py:1014
+#: help:sale.order,order_policy:0
+msgid ""
+"The Invoice Policy is used to synchronise invoice and delivery operations.\n"
+" - The 'Pay before delivery' choice will first generate the invoice and "
+"then generate the picking order after the payment of this invoice.\n"
+" - The 'Deliver & Invoice on demand' will create the picking order directly "
+"and wait for the user to manually click on the 'Invoice' button to generate "
+"the draft invoice based on the sale order or the sale order lines.\n"
+" - The 'Invoice on order after delivery' choice will generate the draft "
+"invoice based on sales order after all picking lists have been finished.\n"
+" - The 'Invoice based on deliveries' choice is used to create an invoice "
+"during the picking process."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:1158
#, python-format
msgid "No Customer Defined !"
msgstr "Δεν έχει Οριστεί Πελάτης!"
@@ -281,9 +326,12 @@ msgid "Sales in Exception"
msgstr "Πωλήσεις σε Εξαίρεση"
#. module: sale
-#: view:sale.order:0
-msgid "Set to Draft"
-msgstr "Ρύθμιση σε πρόχειρο"
+#: code:addons/sale/sale.py:1145
+#: code:addons/sale/sale.py:1264
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:70
+#, python-format
+msgid "Configuration Error !"
+msgstr ""
#. module: sale
#: view:sale.order:0
@@ -291,22 +339,7 @@ msgid "Conditions"
msgstr "Συνθήκες"
#. module: sale
-#: help:sale.order,order_policy:0
-msgid ""
-"The Shipping Policy is used to synchronise invoice and delivery operations.\n"
-" - The 'Pay Before delivery' choice will first generate the invoice and "
-"then generate the picking order after the payment of this invoice.\n"
-" - The 'Shipping & Manual Invoice' will create the picking order directly "
-"and wait for the user to manually click on the 'Invoice' button to generate "
-"the draft invoice.\n"
-" - The 'Invoice On Order After Delivery' choice will generate the draft "
-"invoice based on sales order after all picking lists have been finished.\n"
-" - The 'Invoice From The Picking' choice is used to create an invoice "
-"during the picking process."
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:939
+#: code:addons/sale/sale.py:1034
#, python-format
msgid ""
"There is no income category account defined in default Properties for "
@@ -314,9 +347,9 @@ msgid ""
msgstr ""
#. module: sale
-#: view:sale.installer:0
-msgid "Configure"
-msgstr "Παραμετροποίηση"
+#: selection:sale.report,month:0
+msgid "August"
+msgstr "Αύγουστος"
#. module: sale
#: constraint:stock.move:0
@@ -324,7 +357,7 @@ msgid "You try to assign a lot which is not from the same product"
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:620
+#: code:addons/sale/sale.py:655
#, python-format
msgid "invalid mode for test_state"
msgstr "άκυρη κατάσταση για test_state"
@@ -335,7 +368,7 @@ msgid "June"
msgstr "Ιούνιος"
#. module: sale
-#: code:addons/sale/sale.py:584
+#: code:addons/sale/sale.py:617
#, python-format
msgid "Could not cancel this sales order !"
msgstr "Δεν μπορεί να κυρωθεί αυτή η παραγγελία πώλησης !"
@@ -356,8 +389,12 @@ msgid "October"
msgstr "Οκτώβριος"
#. module: sale
+#: sql_constraint:stock.picking:0
+msgid "Reference must be unique per Company!"
+msgstr ""
+
+#. module: sale
#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_quotation_for_sale
#: view:sale.order:0
#: view:sale.report:0
msgid "Quotations"
@@ -369,11 +406,6 @@ msgid "Pricelist for current sales order."
msgstr "Τιμοκατάλογος για την τρέχουσα παραγγελία πώλησης."
#. module: sale
-#: selection:sale.config.picking_policy,step:0
-msgid "Delivery Order Only"
-msgstr "Μόνον Εντολή Παράδοσης"
-
-#. module: sale
#: report:sale.order:0
msgid "TVA :"
msgstr "TVA :"
@@ -400,6 +432,7 @@ msgstr "Λογιστική Θέση"
#. module: sale
#: view:sale.order:0
#: view:sale.order.line:0
+#: field:sale.report,product_uom:0
msgid "UoM"
msgstr "1η ΜΜ"
@@ -422,7 +455,13 @@ msgid ""
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:971
+#: code:addons/sale/sale.py:1061
+#, python-format
+msgid "You cannot cancel a sale order line that has already been invoiced!"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:1066
#, python-format
msgid "You must first cancel stock moves attached to this sales order line."
msgstr ""
@@ -430,7 +469,7 @@ msgstr ""
"π΄΄ωλησης."
#. module: sale
-#: code:addons/sale/sale.py:1042
+#: code:addons/sale/sale.py:1134
#, python-format
msgid "(n/a)"
msgstr "(δεν υπάρχει)"
@@ -467,14 +506,36 @@ msgid "Notes"
msgstr "Σημειώσεις"
#. module: sale
+#: sql_constraint:res.company:0
+msgid "The company name must be unique !"
+msgstr ""
+
+#. module: sale
#: help:sale.order,partner_invoice_id:0
msgid "Invoice address for current sales order."
msgstr "Διέυθυνση Τιμολόγησης για την τρέχουσα παραγγελία πώλησης."
#. module: sale
-#: view:sale.installer:0
-msgid "Enhance your core Sales Application with additional functionalities."
-msgstr "Εμπλουτίστε την βασική Εφαρμογή Πωλήσεων με επιπλέον λειτουργίες"
+#: view:sale.report:0
+msgid "Month-1"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered month of the sales order"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:504
+#, python-format
+msgid ""
+"You cannot group sales having different currencies for the same partner."
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,picking_policy:0
+msgid "Deliver each product when available"
+msgstr ""
#. module: sale
#: field:sale.order,invoiced_rate:0
@@ -493,21 +554,43 @@ msgid "Confirmation Date"
msgstr "Ημερομηνία Επιβεβαίωσης"
#. module: sale
+#: field:sale.order,incoterm:0
+msgid "Incoterm"
+msgstr "Incoterm"
+
+#. module: sale
#: field:sale.order.line,address_allotment_id:0
msgid "Allotment Partner"
msgstr "Συνεργάτης Παροχής"
#. module: sale
-#: sql_constraint:sale.order:0
-msgid "Order Reference must be unique !"
-msgstr "Η αναφορά Παραγγελίας πρέπει να είναι μοναδική"
-
-#. module: sale
#: selection:sale.report,month:0
msgid "March"
msgstr "Μάρτιος"
#. module: sale
+#: constraint:stock.move:0
+msgid "You can not move products from or to a location of the type view."
+msgstr ""
+
+#. module: sale
+#: field:sale.config.picking_policy,sale_orders:0
+msgid "Based on Sales Orders"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,state:0
+msgid ""
+"Givwizard = self.browse(cr, uid, ids)[0]es the state of the quotation or "
+"sales order. \n"
+"The exception state is automatically set when a cancel operation occurs in "
+"the invoice validation (Invoice Exception) or in the picking list process "
+"(Shipping Exception). \n"
+"The 'Waiting Schedule' state is set when the invoice is confirmed but "
+"waiting for the scheduler to run on the order date."
+msgstr ""
+
+#. module: sale
#: help:sale.order,amount_total:0
msgid "The total amount."
msgstr "Το συνολικό ποσό."
@@ -523,6 +606,11 @@ msgid "Invoice address :"
msgstr "Διεύθυνση τιμολογίου:"
#. module: sale
+#: field:sale.order.line,sequence:0
+msgid "Line Sequence"
+msgstr ""
+
+#. module: sale
#: model:process.transition,note:sale.process_transition_saleorderprocurement0
msgid ""
"For every sales order line, a procurement order is created to supply the "
@@ -569,11 +657,6 @@ msgid "Sales Order Line"
msgstr "Γραμμή Παραγγελίας Πώλησης"
#. module: sale
-#: view:sale.config.picking_policy:0
-msgid "Setup your sales workflow and default values."
-msgstr ""
-
-#. module: sale
#: field:sale.shop,warehouse_id:0
msgid "Warehouse"
msgstr "Αποθήκη"
@@ -610,6 +693,11 @@ msgid "Creation Date"
msgstr "Ημερομηνία Δημιουργίας"
#. module: sale
+#: model:ir.ui.menu,name:sale.menu_sales_configuration_misc
+msgid "Miscellaneous"
+msgstr ""
+
+#. module: sale
#: model:ir.actions.act_window,name:sale.action_order_line_tree3
msgid "Uninvoiced and Delivered Lines"
msgstr "Μή τιμολογημένα και Απεσταλμένες Γραμμές"
@@ -625,14 +713,19 @@ msgid "My Sales"
msgstr "Οι πωλήσεις μου"
#. module: sale
-#: code:addons/sale/sale.py:290
-#: code:addons/sale/sale.py:966
-#: code:addons/sale/sale.py:1165
+#: code:addons/sale/sale.py:295
+#: code:addons/sale/sale.py:1061
+#: code:addons/sale/sale.py:1290
#, python-format
msgid "Invalid action !"
msgstr "Άκυρη ενέργεια!"
#. module: sale
+#: view:sale.order:0
+msgid "Extra Info"
+msgstr "Επιπλέον Πληροφορία"
+
+#. module: sale
#: field:sale.order,pricelist_id:0
#: field:sale.report,pricelist_id:0
#: field:sale.shop,pricelist_id:0
@@ -646,13 +739,21 @@ msgid "# of Qty"
msgstr "# από Ποσ."
#. module: sale
+#: code:addons/sale/sale.py:1314
+#, python-format
+msgid "Hour"
+msgstr ""
+
+#. module: sale
#: view:sale.order:0
msgid "Order Date"
msgstr "Ημερομηνία Παραγγελίας"
#. module: sale
#: view:sale.order.line:0
+#: view:sale.report:0
#: field:sale.report,shipped:0
+#: field:sale.report,shipped_qty_1:0
msgid "Shipped"
msgstr "Απεσταλμένο"
@@ -662,9 +763,9 @@ msgid "All Quotations"
msgstr "Όλες οι προσφορές"
#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Invoice On Order After Delivery"
-msgstr "Τιμολογήση σε Παραγγελία μετά την Παραλαβή"
+#: view:sale.config.picking_policy:0
+msgid "Options"
+msgstr ""
#. module: sale
#: selection:sale.report,month:0
@@ -672,6 +773,20 @@ msgid "September"
msgstr "Σεπτέμβριος"
#. module: sale
+#: code:addons/sale/sale.py:632
+#, python-format
+msgid "You cannot confirm a sale order which has no line."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:1246
+#, python-format
+msgid ""
+"You have to select a pricelist or a customer in the sales form !\n"
+"Please set one before choosing a product."
+msgstr ""
+
+#. module: sale
#: view:sale.report:0
#: field:sale.report,categ_id:0
msgid "Category of Product"
@@ -688,11 +803,6 @@ msgid "Stock Moves"
msgstr "Κινήσεις Αποθεμάτων"
#. module: sale
-#: view:sale.report:0
-msgid " Year "
-msgstr " Έτος "
-
-#. module: sale
#: field:sale.order,state:0
#: field:sale.report,state:0
msgid "Order State"
@@ -710,7 +820,7 @@ msgid "Sales By Month"
msgstr "Πωλήσεις ανά Μήνα"
#. module: sale
-#: code:addons/sale/sale.py:970
+#: code:addons/sale/sale.py:1065
#, python-format
msgid "Could not cancel sales order line!"
msgstr ""
@@ -743,42 +853,19 @@ msgid ""
msgstr ""
#. module: sale
+#: field:sale.order,date_order:0
+msgid "Date"
+msgstr ""
+
+#. module: sale
#: view:sale.report:0
msgid "Extended Filters..."
msgstr "Εκτεταμένα Φίλτρα..."
#. module: sale
-#: model:ir.module.module,description:sale.module_meta_information
-msgid ""
-"\n"
-" The base module to manage quotations and sales orders.\n"
-"\n"
-" * Workflow with validation steps:\n"
-" - Quotation -> Sales order -> Invoice\n"
-" * Invoicing methods:\n"
-" - Invoice on order (before or after shipping)\n"
-" - Invoice on delivery\n"
-" - Invoice on timesheets\n"
-" - Advance invoice\n"
-" * Partners preferences (shipping, invoicing, incoterm, ...)\n"
-" * Products stocks and prices\n"
-" * Delivery methods:\n"
-" - all at once, multi-parcel\n"
-" - delivery costs\n"
-" * Dashboard for salesman that includes:\n"
-" * Your open quotations\n"
-" * Top 10 sales of the month\n"
-" * Cases statistics\n"
-" * Graph of sales by product\n"
-" * Graph of cases of the month\n"
-" "
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_shop
-#: view:sale.shop:0
-msgid "Sales Shop"
-msgstr "Κατάστημα Πώλησης"
+#: selection:sale.order.line,state:0
+msgid "Exception"
+msgstr "Εξαίρεση"
#. module: sale
#: model:ir.model,name:sale.model_res_company
@@ -786,9 +873,10 @@ msgid "Companies"
msgstr "Εταιρίες"
#. module: sale
-#: selection:sale.report,month:0
-msgid "November"
-msgstr "Νοέμβριος"
+#: code:addons/sale/sale.py:1259
+#, python-format
+msgid "No valid pricelist line found ! :"
+msgstr ""
#. module: sale
#: view:sale.order:0
@@ -796,9 +884,9 @@ msgid "History"
msgstr "Ιστορικό"
#. module: sale
-#: field:sale.config.picking_policy,picking_policy:0
-msgid "Picking Default Policy"
-msgstr "Προεπιλεγμένη Πολιτική Παραλαβής"
+#: selection:sale.order,order_policy:0
+msgid "Invoice on order after delivery"
+msgstr ""
#. module: sale
#: help:sale.order,invoice_ids:0
@@ -821,13 +909,14 @@ msgstr ""
"Το όνομα και οι διευθύνσεις της επαφής που ζήτησε παραγγελία ή προσφορά."
#. module: sale
-#: code:addons/sale/sale.py:966
-#, python-format
-msgid "You cannot cancel a sales order line that has already been invoiced !"
+#: help:res.company,security_lead:0
+msgid ""
+"This is the days added to what you promise to customers for security purpose"
msgstr ""
+"Αυτές είναι οι μέρες που προστέθηκαν σε αυτό που υποσχεθήκατε στους πελάτες "
+"για λόγους ασφαλείας."
#. module: sale
-#: view:sale.order:0
#: view:sale.order.line:0
msgid "Qty"
msgstr "Ποσότητα"
@@ -838,6 +927,11 @@ msgid "References"
msgstr "Παραπομπές"
#. module: sale
+#: view:sale.order.line:0
+msgid "My Sales Order Lines"
+msgstr ""
+
+#. module: sale
#: model:process.transition.action,name:sale.process_transition_action_cancel0
#: model:process.transition.action,name:sale.process_transition_action_cancel1
#: model:process.transition.action,name:sale.process_transition_action_cancel2
@@ -849,14 +943,9 @@ msgid "Cancel"
msgstr "Άκυρο"
#. module: sale
-#: field:sale.installer,sale_order_dates:0
-msgid "Sales Order Dates"
-msgstr "Ημερομηνίες Παραγγελιών Πώλησης"
-
-#. module: sale
-#: selection:sale.order.line,state:0
-msgid "Exception"
-msgstr "Εξαίρεση"
+#: sql_constraint:sale.order:0
+msgid "Order Reference must be unique per Company!"
+msgstr ""
#. module: sale
#: model:process.transition,name:sale.process_transition_invoice0
@@ -868,19 +957,19 @@ msgid "Create Invoice"
msgstr "Δημιουργία Τιμολογίου"
#. module: sale
-#: field:sale.installer,sale_margin:0
-msgid "Margins in Sales Orders"
-msgstr "Περιθώρια στις Παραγγελίες Πωλήσεων"
-
-#. module: sale
#: view:sale.order:0
msgid "Total Tax Excluded"
msgstr "Συνολικός Φόρος που δεν εμπεριέχεται"
#. module: sale
-#: view:sale.order:0
-msgid "Compute"
-msgstr "Υπολογισμός"
+#: view:sale.order.line:0
+msgid "Order reference"
+msgstr ""
+
+#. module: sale
+#: view:sale.open.invoice:0
+msgid "You invoice has been successfully created!"
+msgstr "Το Τιμολόγιό σας δημιουργήθηκε επιτυχώς!"
#. module: sale
#: view:sale.report:0
@@ -899,23 +988,20 @@ msgid "Open Invoice"
msgstr "Άνοιχτο Τιμολογίου"
#. module: sale
-#: report:sale.order:0
-#: view:sale.order.line:0
-msgid "Price"
-msgstr "Τιμή"
+#: model:ir.actions.server,name:sale.ir_actions_server_edi_sale
+msgid "Auto-email confirmed sale orders"
+msgstr ""
#. module: sale
-#: model:ir.actions.act_window,name:sale.action_sale_installer
-#: view:sale.config.picking_policy:0
-#: view:sale.installer:0
-msgid "Sales Application Configuration"
+#: code:addons/sale/sale.py:413
+#, python-format
+msgid "There is no sales journal defined for this company: \"%s\" (id:%d)"
msgstr ""
#. module: sale
-#: view:sale.report:0
-#: field:sale.report,price_total:0
-msgid "Total Price"
-msgstr "Συνολική Τιμή"
+#: model:process.transition.action,name:sale.process_transition_action_forceassignation0
+msgid "Force Assignation"
+msgstr "Δυναμική Ανάθεση"
#. module: sale
#: selection:sale.order.line,type:0
@@ -928,6 +1014,11 @@ msgid "Based on the shipped or on the ordered quantities."
msgstr ""
#. module: sale
+#: selection:sale.order,picking_policy:0
+msgid "Deliver all products at once"
+msgstr ""
+
+#. module: sale
#: field:sale.order,picking_ids:0
msgid "Related Picking"
msgstr "Σχετική Παραλαβή"
@@ -959,9 +1050,15 @@ msgid "Create Delivery Order"
msgstr "Δημιουργία Παραγγελία Παραλαβής"
#. module: sale
-#: field:sale.installer,delivery:0
-msgid "Delivery Costs"
-msgstr "Κόστος Μεταφορικών"
+#: code:addons/sale/sale.py:1290
+#, python-format
+msgid "Cannot delete a sales order line which is in state '%s'!"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Qty(UoS)"
+msgstr ""
#. module: sale
#: view:sale.order:0
@@ -975,13 +1072,13 @@ msgstr "Δημιουργία Λίστας Παραλαβής"
#. module: sale
#: view:sale.report:0
-msgid "Sales by Product Category"
-msgstr "Πωλήσεις κατά Κατηγορία Προϊόντος"
+msgid "Ordered date of the sales order"
+msgstr ""
#. module: sale
-#: selection:sale.order,picking_policy:0
-msgid "Partial Delivery"
-msgstr "Μερική Παράδοση"
+#: view:sale.report:0
+msgid "Sales by Product Category"
+msgstr "Πωλήσεις κατά Κατηγορία Προϊόντος"
#. module: sale
#: model:process.transition,name:sale.process_transition_confirmquotation0
@@ -989,9 +1086,10 @@ msgid "Confirm Quotation"
msgstr "Επιβεβαίωση Πώλησης"
#. module: sale
-#: help:sale.order,origin:0
-msgid "Reference of the document that generated this sales order request."
-msgstr ""
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:63
+#, python-format
+msgid "Error"
+msgstr "Σφάλμα"
#. module: sale
#: view:sale.order:0
@@ -1023,20 +1121,14 @@ msgid "Procurement Method"
msgstr "Μέθοδος Προμήθειας"
#. module: sale
-#: view:sale.config.picking_policy:0
-#: view:sale.installer:0
-msgid "title"
-msgstr "τίτλος"
-
-#. module: sale
#: model:process.node,name:sale.process_node_packinglist0
msgid "Pick List"
msgstr ""
#. module: sale
#: view:sale.order:0
-msgid "Order date"
-msgstr "Ημερομηνία παραγγελίας"
+msgid "Set to Draft"
+msgstr "Ρύθμιση σε πρόχειρο"
#. module: sale
#: model:process.node,note:sale.process_node_packinglist0
@@ -1044,6 +1136,85 @@ msgid "Document of the move to the output or to the customer."
msgstr ""
#. module: sale
+#: model:email.template,body_text:sale.email_template_edi_sale
+msgid ""
+"\n"
+"Hello${object.partner_order_id.name and ' ' or "
+"''}${object.partner_order_id.name or ''},\n"
+"\n"
+"Here is your order confirmation for ${object.partner_id.name}:\n"
+" | Order number: *${object.name}*\n"
+" | Order total: *${object.amount_total} "
+"${object.pricelist_id.currency_id.name}*\n"
+" | Order date: ${object.date_order}\n"
+" % if object.origin:\n"
+" | Order reference: ${object.origin}\n"
+" % endif\n"
+" % if object.client_order_ref:\n"
+" | Your reference: ${object.client_order_ref}<br />\n"
+" % endif\n"
+" | Your contact: ${object.user_id.name} ${object.user_id.user_email "
+"and '<%s>'%(object.user_id.user_email) or ''}\n"
+"\n"
+"You can view the order confirmation, download it and even pay online using "
+"the following link:\n"
+" ${ctx.get('edi_web_url_view') or 'n/a'}\n"
+"\n"
+"% if object.order_policy in ('prepaid','manual') and "
+"object.company_id.paypal_account:\n"
+"<% \n"
+"comp_name = quote(object.company_id.name)\n"
+"order_name = quote(object.name)\n"
+"paypal_account = quote(object.company_id.paypal_account)\n"
+"order_amount = quote(str(object.amount_total))\n"
+"cur_name = quote(object.pricelist_id.currency_id.name)\n"
+"paypal_url = \"https://www.paypal.com/cgi-"
+"bin/webscr?cmd=_xclick&business=%s&item_name=%s%%20Order%%20%s&invoice=%s&amo"
+"unt=%s\" \\\n"
+" "
+"\"&currency_code=%s&button_subtype=services&no_note=1&bn=OpenERP_Order_PayNow"
+"_%s\" % \\\n"
+" "
+"(paypal_account,comp_name,order_name,order_name,order_amount,cur_name,cur_nam"
+"e)\n"
+"%>\n"
+"It is also possible to directly pay with Paypal:\n"
+" ${paypal_url}\n"
+"% endif\n"
+"\n"
+"If you have any question, do not hesitate to contact us.\n"
+"\n"
+"\n"
+"Thank you for choosing ${object.company_id.name}!\n"
+"\n"
+"\n"
+"--\n"
+"${object.user_id.name} ${object.user_id.user_email and "
+"'<%s>'%(object.user_id.user_email) or ''}\n"
+"${object.company_id.name}\n"
+"% if object.company_id.street:\n"
+"${object.company_id.street or ''}\n"
+"% endif\n"
+"% if object.company_id.street2:\n"
+"${object.company_id.street2}\n"
+"% endif\n"
+"% if object.company_id.city or object.company_id.zip:\n"
+"${object.company_id.zip or ''} ${object.company_id.city or ''}\n"
+"% endif\n"
+"% if object.company_id.country_id:\n"
+"${object.company_id.state_id and ('%s, ' % object.company_id.state_id.name) "
+"or ''} ${object.company_id.country_id.name or ''}\n"
+"% endif\n"
+"% if object.company_id.phone:\n"
+"Phone: ${object.company_id.phone}\n"
+"% endif\n"
+"% if object.company_id.website:\n"
+"${object.company_id.website or ''}\n"
+"% endif\n"
+" "
+msgstr ""
+
+#. module: sale
#: model:process.transition.action,name:sale.process_transition_action_validate0
msgid "Validate"
msgstr "Επιβεβαίωση"
@@ -1066,9 +1237,9 @@ msgid "Taxes"
msgstr "Φόροι"
#. module: sale
-#: field:sale.order,order_policy:0
-msgid "Shipping Policy"
-msgstr "Πολτική Μεταφορών"
+#: view:sale.order:0
+msgid "Sales Order ready to be invoiced"
+msgstr ""
#. module: sale
#: help:sale.order,create_date:0
@@ -1087,9 +1258,9 @@ msgid "Create Invoices"
msgstr "Δημιουργία τιμολογίων"
#. module: sale
-#: view:sale.order:0
-msgid "Extra Info"
-msgstr "Επιπλέον Πληροφορία"
+#: view:sale.report:0
+msgid "Sales order created in current month"
+msgstr ""
#. module: sale
#: report:sale.order:0
@@ -1097,11 +1268,24 @@ msgid "Fax :"
msgstr "Fax:"
#. module: sale
+#: help:sale.order.line,type:0
+msgid ""
+"If 'on order', it triggers a procurement when the sale order is confirmed to "
+"create a task, purchase order or manufacturing order linked to this sale "
+"order line."
+msgstr ""
+
+#. module: sale
#: field:sale.advance.payment.inv,amount:0
msgid "Advance Amount"
msgstr ""
#. module: sale
+#: field:sale.config.picking_policy,charge_delivery:0
+msgid "Do you charge the delivery?"
+msgstr ""
+
+#. module: sale
#: selection:sale.order,invoice_quantity:0
msgid "Shipped Quantities"
msgstr "Παραδοθέντα Τεμάχια"
@@ -1112,25 +1296,45 @@ msgid "Invoice Based on Sales Orders"
msgstr "Τιμολόγια βάσει εντολών πώλησης"
#. module: sale
+#: code:addons/sale/sale.py:331
+#, python-format
+msgid ""
+"If you change the pricelist of this order (and eventually the currency), "
+"prices of existing order lines will not be updated."
+msgstr ""
+
+#. module: sale
#: model:ir.model,name:sale.model_stock_picking
msgid "Picking List"
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:387
-#: code:addons/sale/sale.py:920
-#: code:addons/sale/sale.py:938
+#: code:addons/sale/sale.py:412
+#: code:addons/sale/sale.py:503
+#: code:addons/sale/sale.py:632
+#: code:addons/sale/sale.py:1015
+#: code:addons/sale/sale.py:1033
#, python-format
msgid "Error !"
msgstr "Σφάλμα!"
#. module: sale
-#: code:addons/sale/sale.py:570
+#: code:addons/sale/sale.py:603
#, python-format
msgid "Could not cancel sales order !"
msgstr ""
#. module: sale
+#: view:sale.order:0
+msgid "Qty(UoM)"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered Year of the sales order"
+msgstr ""
+
+#. module: sale
#: selection:sale.report,month:0
msgid "July"
msgstr "Ιούλιος"
@@ -1147,35 +1351,25 @@ msgid "Shipping Exception"
msgstr "Εξαίρεση Παράδοσης"
#. module: sale
-#: field:sale.make.invoice,grouped:0
-msgid "Group the invoices"
-msgstr "Ομαδοποίηση τιμολογίων"
-
-#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Shipping & Manual Invoice"
-msgstr "Παράδοση & Χειροκίνητη Τιμολόγηση"
-
-#. module: sale
-#: code:addons/sale/sale.py:1051
+#: code:addons/sale/sale.py:1143
#, python-format
-msgid "Picking Information !"
+msgid "Picking Information ! : "
msgstr ""
#. module: sale
-#: view:sale.report:0
-#: field:sale.report,month:0
-msgid "Month"
-msgstr "Μήνας"
+#: field:sale.make.invoice,grouped:0
+msgid "Group the invoices"
+msgstr "Ομαδοποίηση τιμολογίων"
#. module: sale
-#: model:ir.module.module,shortdesc:sale.module_meta_information
-msgid "Sales Management"
-msgstr "Διαχείριση Πωλήσεων"
+#: field:sale.order,order_policy:0
+msgid "Invoice Policy"
+msgstr ""
#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Invoice From The Picking"
+#: model:ir.actions.act_window,name:sale.action_config_picking_policy
+#: view:sale.config.picking_policy:0
+msgid "Setup your Invoicing Method"
msgstr ""
#. module: sale
@@ -1185,27 +1379,30 @@ msgstr ""
#. module: sale
#: view:sale.report:0
-#: field:sale.report,uom_name:0
msgid "Reference UoM"
msgstr ""
#. module: sale
+#: view:sale.config.picking_policy:0
+msgid ""
+"This tool will help you to install the right module and configure the system "
+"according to the method you use to invoice your customers."
+msgstr ""
+
+#. module: sale
#: model:ir.model,name:sale.model_sale_order_line_make_invoice
msgid "Sale OrderLine Make_invoice"
msgstr ""
#. module: sale
-#: help:sale.config.picking_policy,step:0
-msgid ""
-"By default, OpenERP is able to manage complex routing and paths of products "
-"in your warehouse and partner locations. This will configure the most common "
-"and simple methods to deliver products to the customer in one or two "
-"operations by the worker."
-msgstr ""
+#: selection:sale.order,state:0
+#: selection:sale.report,state:0
+msgid "Invoice Exception"
+msgstr "Εξαίρεση Τιμολογίου"
#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_tree
-msgid "Old Quotations"
+#: model:process.node,note:sale.process_node_saleorder0
+msgid "Drives procurement and invoicing"
msgstr ""
#. module: sale
@@ -1221,6 +1418,22 @@ msgid "Sales Analysis"
msgstr "Ανάλυση Πωλήσεων"
#. module: sale
+#: code:addons/sale/sale.py:1138
+#, python-format
+msgid ""
+"You selected a quantity of %d Units.\n"
+"But it's not compatible with the selected packaging.\n"
+"Here is a proposition of quantities according to the packaging:\n"
+"EAN: %s Quantity: %s Type of ul: %s"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Recreate Packing"
+msgstr "Επαναδημιουργία Συσκευασίας"
+
+#. module: sale
+#: view:sale.order:0
#: field:sale.order.line,property_ids:0
msgid "Properties"
msgstr "Ιδιότητες"
@@ -1247,7 +1460,17 @@ msgid ""
msgstr ""
#. module: sale
-#: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
+#: view:sale.order.line:0
+msgid "Confirmed sale order lines, not yet delivered"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:473
+#, python-format
+msgid "Customer Invoices"
+msgstr ""
+
+#. module: sale
#: model:process.process,name:sale.process_process_salesprocess0
#: view:sale.order:0
#: view:sale.report:0
@@ -1269,18 +1492,13 @@ msgid "Done"
msgstr "Εκπληρωμένο"
#. module: sale
-#: model:ir.model,name:sale.model_sale_installer
-msgid "sale.installer"
-msgstr ""
-
-#. module: sale
#: model:process.node,name:sale.process_node_invoice0
#: model:process.node,name:sale.process_node_invoiceafterdelivery0
msgid "Invoice"
msgstr "Τιμολόγιο"
#. module: sale
-#: code:addons/sale/sale.py:1014
+#: code:addons/sale/sale.py:1158
#, python-format
msgid ""
"You have to select a customer in the sales form !\n"
@@ -1288,11 +1506,6 @@ msgid ""
msgstr ""
#. module: sale
-#: selection:sale.config.picking_policy,step:0
-msgid "Picking List & Delivery Order"
-msgstr ""
-
-#. module: sale
#: field:sale.order,origin:0
msgid "Source Document"
msgstr ""
@@ -1318,7 +1531,7 @@ msgid "The amount without tax."
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:571
+#: code:addons/sale/sale.py:604
#, python-format
msgid "You must first cancel all picking attached to this sales order."
msgstr ""
@@ -1329,9 +1542,15 @@ msgid "Sales Advance Payment Invoice"
msgstr ""
#. module: sale
-#: field:sale.order,incoterm:0
-msgid "Incoterm"
-msgstr "Incoterm"
+#: view:sale.report:0
+#: field:sale.report,month:0
+msgid "Month"
+msgstr "Μήνας"
+
+#. module: sale
+#: model:email.template,subject:sale.email_template_edi_sale
+msgid "${object.company_id.name} Order (Ref ${object.name or 'n/a' })"
+msgstr ""
#. module: sale
#: view:sale.order.line:0
@@ -1342,11 +1561,6 @@ msgid "Product"
msgstr "Προϊόν"
#. module: sale
-#: model:ir.ui.menu,name:sale.menu_invoiced
-msgid "Invoicing"
-msgstr "Τιμολόγηση"
-
-#. module: sale
#: model:process.transition.action,name:sale.process_transition_action_cancelassignation0
msgid "Cancel Assignation"
msgstr "Ακύρωση Ανάθεσης"
@@ -1357,14 +1571,10 @@ msgid "sale.config.picking_policy"
msgstr "sale.config.picking_policy"
#. module: sale
-#: help:sale.order,state:0
-msgid ""
-"Gives the state of the quotation or sales order. \n"
-"The exception state is automatically set when a cancel operation occurs in "
-"the invoice validation (Invoice Exception) or in the picking list process "
-"(Shipping Exception). \n"
-"The 'Waiting Schedule' state is set when the invoice is confirmed but "
-"waiting for the scheduler to run on the date 'Ordered Date'."
+#: view:account.invoice.report:0
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_turnover_by_month
+msgid "Monthly Turnover"
msgstr ""
#. module: sale
@@ -1383,7 +1593,6 @@ msgid "Product UoS"
msgstr "ΜοΠ Προϊόντος"
#. module: sale
-#: selection:sale.order,state:0
#: selection:sale.report,state:0
msgid "Manual In Progress"
msgstr "Χειροκίνητη σε εξέλιξη"
@@ -1404,7 +1613,8 @@ msgid "Order"
msgstr "Εντολή"
#. module: sale
-#: code:addons/sale/sale.py:921
+#: code:addons/sale/sale.py:1016
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:71
#, python-format
msgid "There is no income account defined for this product: \"%s\" (id:%d)"
msgstr ""
@@ -1424,7 +1634,7 @@ msgid ""
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:1116
+#: code:addons/sale/sale.py:1238
#, python-format
msgid ""
"You plan to sell %.2f %s but you only have %.2f %s available !\n"
@@ -1453,10 +1663,10 @@ msgid "Total"
msgstr "Σύνολο"
#. module: sale
-#: code:addons/sale/sale.py:388
-#, python-format
-msgid "There is no sales journal defined for this company: \"%s\" (id:%d)"
-msgstr ""
+#: report:sale.order:0
+#: view:sale.order.line:0
+msgid "Price"
+msgstr "Τιμή"
#. module: sale
#: model:process.transition,note:sale.process_transition_deliver0
@@ -1467,9 +1677,14 @@ msgid ""
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:1165
-#, python-format
-msgid "Cannot delete a sales order line which is %s !"
+#: selection:sale.order,order_policy:0
+msgid "Pay before delivery"
+msgstr ""
+
+#. module: sale
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.open_board_sales
+msgid "Sales Dashboard"
msgstr ""
#. module: sale
@@ -1481,6 +1696,7 @@ msgstr ""
#. module: sale
#: view:sale.order:0
+#: selection:sale.order,state:0
#: view:sale.order.line:0
msgid "To Invoice"
msgstr ""
@@ -1491,6 +1707,11 @@ msgid "Date on which sales order is confirmed."
msgstr "Ημερομηνία στην οποία η παραγγελία πώλησης επιβεβαιώνεται."
#. module: sale
+#: field:sale.order,project_id:0
+msgid "Contract/Analytic Account"
+msgstr ""
+
+#. module: sale
#: field:sale.order,company_id:0
#: field:sale.order.line,company_id:0
#: view:sale.report:0
@@ -1510,10 +1731,12 @@ msgid "The amount to be invoiced in advance."
msgstr ""
#. module: sale
-#: selection:sale.order,state:0
-#: selection:sale.report,state:0
-msgid "Invoice Exception"
-msgstr "Εξαίρεση Τιμολογίου"
+#: code:addons/sale/sale.py:1256
+#, python-format
+msgid ""
+"Couldn't find a pricelist line matching this product and quantity.\n"
+"You have to change either the product, the quantity or the pricelist."
+msgstr ""
#. module: sale
#: help:sale.order,picking_ids:0
@@ -1524,13 +1747,6 @@ msgstr ""
"πώλησης."
#. module: sale
-#: help:sale.installer,sale_margin:0
-msgid ""
-"Gives the margin of profitability by calculating the difference between Unit "
-"Price and Cost Price."
-msgstr ""
-
-#. module: sale
#: view:sale.make.invoice:0
#: view:sale.order.line.make.invoice:0
msgid "Create invoices"
@@ -1549,6 +1765,11 @@ msgid "Cancelled"
msgstr "Ακυρώθηκε"
#. module: sale
+#: view:sale.order.line:0
+msgid "Sales Order Lines related to a Sales Order of mine"
+msgstr ""
+
+#. module: sale
#: model:ir.actions.act_window,name:sale.action_shop_form
#: model:ir.ui.menu,name:sale.menu_action_shop_form
#: field:sale.order,shop_id:0
@@ -1558,17 +1779,12 @@ msgid "Shop"
msgstr "Κατάστημα"
#. module: sale
-#: view:sale.report:0
-msgid " Month "
-msgstr " Μήνας "
-
-#. module: sale
#: field:sale.report,date_confirm:0
msgid "Date Confirm"
msgstr "Ημερομηνία Επιβεβαίωσης"
#. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:111
+#: code:addons/sale/wizard/sale_line_invoice.py:113
#, python-format
msgid "Warning"
msgstr "Προειδοποίηση"
@@ -1580,17 +1796,6 @@ msgid "Sales by Month"
msgstr "Πωλήσεις ανά Μήνα"
#. module: sale
-#: code:addons/sale/sale.py:1045
-#, python-format
-msgid ""
-"You selected a quantity of %d Units.\n"
-"But it's not compatible with the selected packaging.\n"
-"Here is a proposition of quantities according to the packaging:\n"
-"\n"
-"EAN: %s Quantity: %s Type of ul: %s"
-msgstr ""
-
-#. module: sale
#: model:ir.model,name:sale.model_sale_order
#: model:process.node,name:sale.process_node_order0
#: model:process.node,name:sale.process_node_saleorder0
@@ -1606,6 +1811,11 @@ msgid "Quantity (UoS)"
msgstr "Ποσότητα (ΜοΠ)"
#. module: sale
+#: view:sale.order.line:0
+msgid "Sale Order Lines that are in 'done' state"
+msgstr ""
+
+#. module: sale
#: model:process.transition,note:sale.process_transition_packing0
msgid ""
"The Pick List form is created as soon as the sales order is confirmed, in "
@@ -1620,6 +1830,11 @@ msgid "Confirmed"
msgstr "Επιβεβαιωμένο"
#. module: sale
+#: field:sale.config.picking_policy,order_policy:0
+msgid "Main Method Based On"
+msgstr ""
+
+#. module: sale
#: model:process.transition.action,name:sale.process_transition_action_confirm0
msgid "Confirm"
msgstr "Επιβεβαίωση"
@@ -1642,6 +1857,7 @@ msgid "Invoice Lines"
msgstr "Γραμμές Τιμολογίου"
#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_product_tree
#: view:sale.order:0
#: view:sale.order.line:0
msgid "Sales Order Lines"
@@ -1658,30 +1874,18 @@ msgid "Configuration"
msgstr "Παραμετροποίηση"
#. module: sale
-#: selection:sale.order,picking_policy:0
-msgid "Complete Delivery"
-msgstr "Ολοκληρωμένη Παράδοση"
+#: code:addons/sale/edi/sale_order.py:146
+#, python-format
+msgid "EDI Pricelist (%s)"
+msgstr ""
#. module: sale
#: view:sale.report:0
-msgid " Month-1 "
-msgstr " Μήνας-1 "
-
-#. module: sale
-#: help:sale.config.picking_policy,picking_policy:0
-msgid ""
-"The Shipping Policy is used to configure per order if you want to deliver as "
-"soon as possible when one product is available or you wait that all products "
-"are available.."
+msgid "Sales order created in current year"
msgstr ""
#. module: sale
-#: selection:sale.report,month:0
-msgid "August"
-msgstr "Αύγουστος"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:111
+#: code:addons/sale/wizard/sale_line_invoice.py:113
#, python-format
msgid ""
"Invoice cannot be created for this Sales Order Line due to one of the "
@@ -1691,6 +1895,11 @@ msgid ""
msgstr ""
#. module: sale
+#: view:sale.order.line:0
+msgid "Sale order lines done"
+msgstr ""
+
+#. module: sale
#: field:sale.order.line,th_weight:0
msgid "Weight"
msgstr "Βάρος"
@@ -1709,7 +1918,6 @@ msgstr "Δεκέμβριος"
#. module: sale
#: field:sale.config.picking_policy,config_logo:0
-#: field:sale.installer,config_logo:0
msgid "Image"
msgstr "Εικόνα"
@@ -1739,8 +1947,8 @@ msgid "Salesman"
msgstr "Πωλητής"
#. module: sale
-#: model:process.node,note:sale.process_node_saleorder0
-msgid "Drives procurement and invoicing"
+#: model:ir.actions.act_window,name:sale.action_order_tree
+msgid "Old Quotations"
msgstr ""
#. module: sale
@@ -1749,7 +1957,7 @@ msgid "Untaxed Amount"
msgstr "Αφορολόγητο Ποσό"
#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:163
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:170
#: model:ir.actions.act_window,name:sale.action_view_sale_advance_payment_inv
#: view:sale.advance.payment.inv:0
#: view:sale.order:0
@@ -1758,7 +1966,7 @@ msgid "Advance Invoice"
msgstr "Advance Invoice"
#. module: sale
-#: code:addons/sale/sale.py:591
+#: code:addons/sale/sale.py:624
#, python-format
msgid "The sales order '%s' has been cancelled."
msgstr ""
@@ -1793,20 +2001,20 @@ msgid "Packings"
msgstr ""
#. module: sale
-#: field:sale.config.picking_policy,progress:0
-#: field:sale.installer,progress:0
-msgid "Configuration Progress"
-msgstr "Πρόοδος Παραμετροποίησης"
+#: view:sale.order.line:0
+msgid "Sale Order Lines ready to be invoiced"
+msgstr ""
#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_product_tree
-msgid "Product sales"
-msgstr "Πωλήσεις προϊόντος"
+#: view:sale.report:0
+msgid "Sales order created in last month"
+msgstr ""
#. module: sale
-#: field:sale.order,date_order:0
-msgid "Ordered Date"
-msgstr "Ημερομηνία Παραγγελίας"
+#: model:ir.actions.act_window,name:sale.action_email_templates
+#: model:ir.ui.menu,name:sale.menu_email_templates
+msgid "Email Templates"
+msgstr ""
#. module: sale
#: model:ir.actions.act_window,name:sale.action_order_form
@@ -1816,14 +2024,15 @@ msgid "Sales Orders"
msgstr "Εντολές Πώλησης"
#. module: sale
-#: selection:sale.config.picking_policy,picking_policy:0
-msgid "Direct Delivery"
-msgstr "Απευθείας Παράδοση"
+#: model:ir.model,name:sale.model_sale_shop
+#: view:sale.shop:0
+msgid "Sales Shop"
+msgstr "Κατάστημα Πώλησης"
#. module: sale
-#: field:sale.installer,sale_journal:0
-msgid "Invoicing journals"
-msgstr "Ημερολόγια Τιμολόγησης"
+#: selection:sale.report,month:0
+msgid "November"
+msgstr "Νοέμβριος"
#. module: sale
#: field:sale.advance.payment.inv,product_id:0
@@ -1831,18 +2040,12 @@ msgid "Advance Product"
msgstr "Advance Product"
#. module: sale
-#: view:sale.report:0
-#: field:sale.report,shipped_qty_1:0
-msgid "Shipped Qty"
-msgstr "Παραδόμενη Ποσ."
-
-#. module: sale
-#: view:sale.open.invoice:0
-msgid "You invoice has been successfully created!"
-msgstr "Το Τιμολόγιό σας δημιουργήθηκε επιτυχώς!"
+#: view:sale.order:0
+msgid "Compute"
+msgstr "Υπολογισμός"
#. module: sale
-#: code:addons/sale/sale.py:585
+#: code:addons/sale/sale.py:618
#, python-format
msgid "You must first cancel all invoices attached to this sales order."
msgstr ""
@@ -1855,33 +2058,27 @@ msgid "January"
msgstr "Ιανουάριος"
#. module: sale
-#: view:sale.installer:0
-msgid "Configure Your Sales Management Application"
-msgstr "Παραμετροποιήστε την Εφαρμογή Διαχείρισης Πωλήσεων"
-
-#. module: sale
#: model:ir.actions.act_window,name:sale.action_order_tree4
msgid "Sales Order in Progress"
msgstr "Εντολές Πώλησης σε Εξέλιξη"
#. module: sale
-#: field:sale.installer,sale_layout:0
-msgid "Sales Order Layout Improvement"
+#: help:sale.order,origin:0
+msgid "Reference of the document that generated this sales order request."
msgstr ""
#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:63
-#, python-format
-msgid "Error"
-msgstr "Σφάλμα"
-
-#. module: sale
#: view:sale.report:0
#: field:sale.report,delay:0
msgid "Commitment Delay"
msgstr ""
#. module: sale
+#: selection:sale.order,order_policy:0
+msgid "Deliver & invoice on demand"
+msgstr ""
+
+#. module: sale
#: model:process.node,note:sale.process_node_saleprocurement0
msgid ""
"One Procurement order for each sales order line and for each of the "
@@ -1904,13 +2101,12 @@ msgid "Confirmed sales order to invoice."
msgstr "Επιβεβαιωμένη παραγγελία πώλησης για τιμολόγηση."
#. module: sale
-#: code:addons/sale/sale.py:290
-#, python-format
-msgid "Cannot delete Sales Order(s) which are already confirmed !"
+#: view:sale.order:0
+msgid "Sales Order that haven't yet been confirmed"
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:316
+#: code:addons/sale/sale.py:322
#, python-format
msgid "The sales order '%s' has been set in draft state."
msgstr "Η παραγγελία πώλησης '%s' είναι σε κατάσταση πρόχειρη."
@@ -1921,37 +2117,27 @@ msgid "from stock"
msgstr "Απο στόκ"
#. module: sale
-#: field:sale.config.picking_policy,order_policy:0
-msgid "Shipping Default Policy"
-msgstr "Προκαθορισμένη Πολιτική Παραδόσεων"
-
-#. module: sale
#: view:sale.open.invoice:0
msgid "Close"
msgstr "Κλείσιμο"
#. module: sale
+#: code:addons/sale/sale.py:1248
+#, python-format
+msgid "No Pricelist ! : "
+msgstr ""
+
+#. module: sale
#: field:sale.order,shipped:0
msgid "Delivered"
msgstr "Παραδόθηκε"
#. module: sale
-#: code:addons/sale/sale.py:1115
-#, python-format
-msgid "Not enough stock !"
-msgstr "Δεν υπάρχει αρκετό απόθεμα !"
-
-#. module: sale
#: constraint:stock.move:0
msgid "You must assign a production lot for this product"
msgstr ""
#. module: sale
-#: field:sale.order.line,sequence:0
-msgid "Layout Sequence"
-msgstr ""
-
-#. module: sale
#: model:ir.actions.act_window,help:sale.action_shop_form
msgid ""
"If you have more than one shop reselling your company products, you can "
@@ -1978,11 +2164,6 @@ msgid "May"
msgstr "Μάιος"
#. module: sale
-#: help:sale.installer,sale_order_dates:0
-msgid "Adds commitment, requested and effective dates on Sales Orders."
-msgstr ""
-
-#. module: sale
#: view:sale.order:0
#: field:sale.order,partner_id:0
#: field:sale.order.line,order_partner_id:0
@@ -1990,23 +2171,11 @@ msgid "Customer"
msgstr "Πελάτης"
#. module: sale
-#: model:product.template,name:sale.advance_product_0_product_template
-msgid "Advance"
-msgstr ""
-
-#. module: sale
#: selection:sale.report,month:0
msgid "February"
msgstr "Φεβρουάριος"
#. module: sale
-#: help:sale.installer,sale_journal:0
-msgid ""
-"Allows you to group and invoice your delivery orders according to different "
-"invoicing types: daily, weekly, etc."
-msgstr ""
-
-#. module: sale
#: selection:sale.report,month:0
msgid "April"
msgstr "Απρίλιος"
@@ -2017,11 +2186,6 @@ msgid "Accounting"
msgstr "Λογιστική"
#. module: sale
-#: field:sale.config.picking_policy,step:0
-msgid "Steps To Deliver a Sales Order"
-msgstr ""
-
-#. module: sale
#: view:sale.order:0
#: view:sale.order.line:0
msgid "Search Sales Order"
@@ -2033,20 +2197,18 @@ msgid "Sales Order Requisition"
msgstr ""
#. module: sale
+#: code:addons/sale/sale.py:1242
+#, python-format
+msgid "Not enough stock ! : "
+msgstr ""
+
+#. module: sale
#: report:sale.order:0
#: field:sale.order,payment_term:0
msgid "Payment Term"
msgstr "Όροι Πληρωμής"
#. module: sale
-#: help:sale.installer,sale_layout:0
-msgid ""
-"Provides some features to improve the layout of the Sales Order reports."
-msgstr ""
-"Παρέχει ορισμένα χαρακτηριστικά για να βελτιώσουν τη διάρθρωση των εκθέσεων "
-"Παραγγελιών Πωλήσεων."
-
-#. module: sale
#: model:ir.actions.act_window,help:sale.action_order_report_all
msgid ""
"This report performs analysis on your quotations and sales orders. Analysis "
@@ -2084,6 +2246,9 @@ msgstr "Τιμολόγηση Βασισμένη Σε Παραδόσεις"
#~ msgid "Recreate Procurement"
#~ msgstr "Επαναδημιουργία Προμήθειας"
+#~ msgid "Partial Delivery"
+#~ msgstr "Μερική Παράδοση"
+
#~ msgid "Delivery, from the warehouse to the customer."
#~ msgstr "Παράδοση, απο την αποθήκη στον πελάτη."
@@ -2118,6 +2283,9 @@ msgstr "Τιμολόγηση Βασισμένη Σε Παραδόσεις"
#~ msgid "Origin"
#~ msgstr "Καταγωγή"
+#~ msgid "Shipping Policy"
+#~ msgstr "Πολτική Μεταφορών"
+
#~ msgid "Outgoing Products"
#~ msgstr "Εξερχόμενα Προϊόντα"
@@ -2146,6 +2314,9 @@ msgstr "Τιμολόγηση Βασισμένη Σε Παραδόσεις"
#~ msgstr ""
#~ "Οι προμήθειες δημιουργούνται κατόπιν επιβεβαίωσης της εντολής πώλησης."
+#~ msgid "All at Once"
+#~ msgstr "Όλα Αμέσως"
+
#~ msgid "My sales order in progress"
#~ msgstr "Οι εντολή πώλησης μου σε εξέλιξη"
@@ -2185,6 +2356,9 @@ msgstr "Τιμολόγηση Βασισμένη Σε Παραδόσεις"
#~ msgid "Packing"
#~ msgstr "Συσκευασία"
+#~ msgid "Complete Delivery"
+#~ msgstr "Ολοκληρωμένη Παράδοση"
+
#~ msgid "Total amount"
#~ msgstr "Συνολικό ποσό"
@@ -2214,9 +2388,6 @@ msgstr "Τιμολόγηση Βασισμένη Σε Παραδόσεις"
#~ msgid "Sales Order To Be Invoiced"
#~ msgstr "Εντολή Πώλησης Προς Τιμολόγηση"
-#~ msgid "My Quotations"
-#~ msgstr "Οι Προσφορές Μου"
-
#~ msgid "Packing Default Policy"
#~ msgstr "Προκαθορισμένη Πολιτική Συσκευασιών"
@@ -2224,6 +2395,9 @@ msgstr "Τιμολόγηση Βασισμένη Σε Παραδόσεις"
#~ msgid "Could not cancel sale order !"
#~ msgstr "Αδύνατη η ακύρωση της εντολής πώλησης!"
+#~ msgid "Shipping Default Policy"
+#~ msgstr "Προκαθορισμένη Πολιτική Παραδόσεων"
+
#~ msgid "Manages the delivery and invoicing progress"
#~ msgstr "Διαχειρίζεται την εξέλιξη στις παράδοσεις και τις τιμολόγησεις"
@@ -2277,6 +2451,9 @@ msgstr "Τιμολόγηση Βασισμένη Σε Παραδόσεις"
#~ msgid "Packing Policy"
#~ msgstr "Πολιτική Συσκευασιών"
+#~ msgid "Product sales"
+#~ msgstr "Πωλήσεις προϊόντος"
+
#~ msgid "Our Salesman"
#~ msgstr "Οι πωλητές μας"
@@ -2297,12 +2474,18 @@ msgstr "Τιμολόγηση Βασισμένη Σε Παραδόσεις"
#~ msgid "Sale Pricelists"
#~ msgstr "Τιμοκατάλογοι Πώλησης"
+#~ msgid "Direct Delivery"
+#~ msgstr "Απευθείας Παράδοση"
+
#~ msgid "Draft customer invoice, to be reviewed by accountant."
#~ msgstr "Πρόχειρο τιμολόγιο πελάτη, για έλεγχο απο λογιστή."
#~ msgid "Make Invoice"
#~ msgstr "Δημιουργία Τιμολογίου"
+#~ msgid "Delivery Order Only"
+#~ msgstr "Μόνον Εντολή Παράδοσης"
+
#~ msgid "Sales order lines"
#~ msgstr "Γραμμές εντολών πώλησης"
@@ -2315,6 +2498,9 @@ msgstr "Τιμολόγηση Βασισμένη Σε Παραδόσεις"
#~ msgid "Confirm sale order and Create invoice."
#~ msgstr "Επιβεβαίωση εντολής πώλησης και Δημιουργία τιμολογίου"
+#~ msgid "Shipping & Manual Invoice"
+#~ msgstr "Παράδοση & Χειροκίνητη Τιμολόγηση"
+
#~ msgid ""
#~ "The Object name must start with x_ and not contain any special character !"
#~ msgstr ""
@@ -2355,6 +2541,9 @@ msgstr "Τιμολόγηση Βασισμένη Σε Παραδόσεις"
#~ msgid "Open Advance Invoice"
#~ msgstr "Open Advance Invoice"
+#~ msgid "Sales Management"
+#~ msgstr "Διαχείριση Πωλήσεων"
+
#~ msgid "Deliver"
#~ msgstr "Μεταφορά"
@@ -2410,6 +2599,9 @@ msgstr "Τιμολόγηση Βασισμένη Σε Παραδόσεις"
#~ "πώλησης. Η ίδια εντολή πώλησης μπορεί να έχει τιμολογηθεί πολλές φορές (ως "
#~ "παράδειγμα σε γραμμή)."
+#~ msgid "Payment Before Delivery"
+#~ msgstr "Πληρωμή Πριν Την Παράδοση"
+
#~ msgid "Delivery Delay"
#~ msgstr "Καθυστέρηση Παράδοσης"
@@ -2477,11 +2669,87 @@ msgstr "Τιμολόγηση Βασισμένη Σε Παραδόσεις"
#~ "τιμολόγιο επιβεβαιωθεί αλλά περιμένει τον Χρονοπρογραμματιστή να τρέξει κατα "
#~ "'Ημερομηνία Παραγγελίας'."
+#~ msgid " Year "
+#~ msgstr " Έτος "
+
+#~ msgid "Delivery Costs"
+#~ msgstr "Κόστος Μεταφορικών"
+
+#~ msgid " Month "
+#~ msgstr " Μήνας "
+
+#~ msgid " Month-1 "
+#~ msgstr " Μήνας-1 "
+
+#, python-format
+#~ msgid "Not enough stock !"
+#~ msgstr "Δεν υπάρχει αρκετό απόθεμα !"
+
#~ msgid "Invalid model name in the action definition."
#~ msgstr "Λανθασμένο όνομα μοντέλου στον ορισμό ενέργειας"
+#~ msgid ""
+#~ "Provides some features to improve the layout of the Sales Order reports."
+#~ msgstr ""
+#~ "Παρέχει ορισμένα χαρακτηριστικά για να βελτιώσουν τη διάρθρωση των εκθέσεων "
+#~ "Παραγγελιών Πωλήσεων."
+
+#~ msgid "Configure Picking Policy for Sales Order"
+#~ msgstr "Προσδιορίστε Πολιτική Μεταφορικών για την Παραγγελία Πώλησης"
+
#, python-format
#~ msgid "You cannot cancel a sale order line that has already been invoiced !"
#~ msgstr ""
#~ "Δεν μπορεί να γίνει ακύρωση μιας γραμμής παραγγελίας πώλησης η οποία έχει "
#~ "τιμολογηθεί !"
+
+#~ msgid "Allows you to compute delivery costs on your quotations."
+#~ msgstr "Επιτρέπει τον υπολογισμό του κόστους μεταφοράς στις προσφορές σου"
+
+#~ msgid "Order date"
+#~ msgstr "Ημερομηνία παραγγελίας"
+
+#~ msgid "Invoicing"
+#~ msgstr "Τιμολόγηση"
+
+#~ msgid "Sales Order Dates"
+#~ msgstr "Ημερομηνίες Παραγγελιών Πώλησης"
+
+#~ msgid "Margins in Sales Orders"
+#~ msgstr "Περιθώρια στις Παραγγελίες Πωλήσεων"
+
+#~ msgid "Picking Default Policy"
+#~ msgstr "Προεπιλεγμένη Πολιτική Παραλαβής"
+
+#~ msgid "Configure Your Sales Management Application"
+#~ msgstr "Παραμετροποιήστε την Εφαρμογή Διαχείρισης Πωλήσεων"
+
+#~ msgid "Shipped Qty"
+#~ msgstr "Παραδόμενη Ποσ."
+
+#~ msgid "Ordered Date"
+#~ msgstr "Ημερομηνία Παραγγελίας"
+
+#~ msgid "Configuration Progress"
+#~ msgstr "Πρόοδος Παραμετροποίησης"
+
+#~ msgid "Invoicing journals"
+#~ msgstr "Ημερολόγια Τιμολόγησης"
+
+#~ msgid "Configure"
+#~ msgstr "Παραμετροποίηση"
+
+#~ msgid "title"
+#~ msgstr "τίτλος"
+
+#~ msgid "Order Reference must be unique !"
+#~ msgstr "Η αναφορά Παραγγελίας πρέπει να είναι μοναδική"
+
+#~ msgid "Enhance your core Sales Application with additional functionalities."
+#~ msgstr "Εμπλουτίστε την βασική Εφαρμογή Πωλήσεων με επιπλέον λειτουργίες"
+
+#~ msgid "Configure Sales Order Logistics"
+#~ msgstr "Διαμορφώστε την Εφοδιαστικ΄΄η των Παραγγελιών Πώλησης"
+
+#~ msgid "Invoice On Order After Delivery"
+#~ msgstr "Τιμολογήση σε Παραγγελία μετά την Παραλαβή"
diff --git a/addons/sale/i18n/es.po b/addons/sale/i18n/es.po
index 7aa29742cd9..ae07b9d6e61 100644
--- a/addons/sale/i18n/es.po
+++ b/addons/sale/i18n/es.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2011-01-11 11:16+0000\n"
+"POT-Creation-Date: 2011-12-22 18:43+0000\n"
"PO-Revision-Date: 2011-01-18 01:15+0000\n"
"Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
"<jesteve@zikzakmedia.com>\n"
@@ -14,8 +14,20 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-05 05:17+0000\n"
-"X-Generator: Launchpad (build 14231)\n"
+"X-Launchpad-Export-Date: 2011-12-23 06:47+0000\n"
+"X-Generator: Launchpad (build 14560)\n"
+
+#. module: sale
+#: field:sale.config.picking_policy,timesheet:0
+msgid "Based on Timesheet"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid ""
+"Sale Order Lines that are confirmed, done or in exception state and haven't "
+"yet been invoiced"
+msgstr ""
#. module: sale
#: view:board.board:0
@@ -24,11 +36,6 @@ msgid "Sales by Salesman in last 90 days"
msgstr "Ventas por comercial últimos 90 días"
#. module: sale
-#: help:sale.installer,delivery:0
-msgid "Allows you to compute delivery costs on your quotations."
-msgstr "Le permite calcular los costos de envío en sus presupuestos."
-
-#. module: sale
#: help:sale.order,picking_policy:0
msgid ""
"If you don't have enough stock available to deliver all at once, do you "
@@ -38,6 +45,11 @@ msgstr ""
"¿acepta envíos parciales o no?"
#. module: sale
+#: view:sale.order:0
+msgid "UoS"
+msgstr ""
+
+#. module: sale
#: help:sale.order,partner_shipping_id:0
msgid "Shipping address for current sales order."
msgstr "Dirección de envío para el pedido de venta actual."
@@ -61,22 +73,12 @@ msgid "Cancel Order"
msgstr "Cancelar pedido"
#. module: sale
-#: view:sale.config.picking_policy:0
-msgid "Configure Sales Order Logistics"
-msgstr "Configurar logística pedidos de venta"
-
-#. module: sale
-#: code:addons/sale/sale.py:603
+#: code:addons/sale/sale.py:638
#, python-format
msgid "The quotation '%s' has been converted to a sales order."
msgstr "El presupuesto '%s' ha sido convertido a un pedido de venta."
#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Payment Before Delivery"
-msgstr "Pago antes del envío"
-
-#. module: sale
#: code:addons/sale/wizard/sale_make_invoice.py:42
#, python-format
msgid "Warning !"
@@ -93,12 +95,6 @@ msgid "Drives procurement orders for every sales order line."
msgstr "Genera órdenes de abastecimiento para cada línea de pedido de venta."
#. module: sale
-#: selection:sale.config.picking_policy,picking_policy:0
-msgid "All at Once"
-msgstr "Todo a la vez"
-
-#. module: sale
-#: field:sale.order,project_id:0
#: view:sale.report:0
#: field:sale.report,analytic_account_id:0
#: field:sale.shop,project_id:0
@@ -118,6 +114,15 @@ msgstr ""
"venta completos."
#. module: sale
+#: code:addons/sale/sale.py:295
+#, python-format
+msgid ""
+"In order to delete a confirmed sale order, you must cancel it before ! To "
+"cancel a sale order, you must first cancel related picking or delivery "
+"orders."
+msgstr ""
+
+#. module: sale
#: model:process.node,name:sale.process_node_saleprocurement0
msgid "Procurement Order"
msgstr "Orden de abastecimiento"
@@ -129,6 +134,11 @@ msgid "Partner"
msgstr "Empresa"
#. module: sale
+#: selection:sale.order,order_policy:0
+msgid "Invoice based on deliveries"
+msgstr ""
+
+#. module: sale
#: view:sale.order:0
msgid "Order Line"
msgstr "Línea del pedido"
@@ -174,9 +184,14 @@ msgid "Default Payment Term"
msgstr "Plazo de pago por defecto"
#. module: sale
-#: model:ir.actions.act_window,name:sale.action_config_picking_policy
-msgid "Configure Picking Policy for Sales Order"
-msgstr "Configurar la política envío para pedidos de venta"
+#: field:sale.config.picking_policy,deli_orders:0
+msgid "Based on Delivery Orders"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.picking_policy,time_unit:0
+msgid "Main Working Time Unit"
+msgstr ""
#. module: sale
#: view:sale.order:0
@@ -192,9 +207,10 @@ msgid "Disc.(%)"
msgstr "Desc.(%)"
#. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_forceassignation0
-msgid "Force Assignation"
-msgstr "Forzar asignación"
+#: view:sale.report:0
+#: field:sale.report,price_total:0
+msgid "Total Price"
+msgstr "Precio total"
#. module: sale
#: help:sale.make.invoice,grouped:0
@@ -202,6 +218,11 @@ msgid "Check the box to group the invoices for the same customers"
msgstr "Marque esta opción para agrupar las facturas de los mismos clientes."
#. module: sale
+#: view:sale.order:0
+msgid "My Sale Orders"
+msgstr ""
+
+#. module: sale
#: selection:sale.order,invoice_quantity:0
msgid "Ordered Quantities"
msgstr "Cantidades pedidas"
@@ -242,14 +263,25 @@ msgstr ""
"\"Facturar desde el albarán\" o \"Facturar pedido después del envío\"."
#. module: sale
+#: field:sale.config.picking_policy,task_work:0
+msgid "Based on Tasks' Work"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
+msgid "Quotations and Sales"
+msgstr ""
+
+#. module: sale
#: model:ir.model,name:sale.model_sale_make_invoice
msgid "Sales Make Invoice"
msgstr "Ventas. Realizar factura"
#. module: sale
-#: view:sale.order:0
-msgid "Recreate Packing"
-msgstr "Recrear albarán"
+#: code:addons/sale/sale.py:330
+#, python-format
+msgid "Pricelist Warning!"
+msgstr ""
#. module: sale
#: field:sale.order.line,discount:0
@@ -257,12 +289,10 @@ msgid "Discount (%)"
msgstr "Descuento (%)"
#. module: sale
-#: help:res.company,security_lead:0
-msgid ""
-"This is the days added to what you promise to customers for security purpose"
-msgstr ""
-"Estos días por razones de seguridad se añaden a los que promete a los "
-"clientes."
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_quotation_for_sale
+msgid "My Quotations"
+msgstr "Mis presupuestos"
#. module: sale
#: view:board.board:0
@@ -287,7 +317,22 @@ msgid "Shop Name"
msgstr "Nombre tienda"
#. module: sale
-#: code:addons/sale/sale.py:1014
+#: help:sale.order,order_policy:0
+msgid ""
+"The Invoice Policy is used to synchronise invoice and delivery operations.\n"
+" - The 'Pay before delivery' choice will first generate the invoice and "
+"then generate the picking order after the payment of this invoice.\n"
+" - The 'Deliver & Invoice on demand' will create the picking order directly "
+"and wait for the user to manually click on the 'Invoice' button to generate "
+"the draft invoice based on the sale order or the sale order lines.\n"
+" - The 'Invoice on order after delivery' choice will generate the draft "
+"invoice based on sales order after all picking lists have been finished.\n"
+" - The 'Invoice based on deliveries' choice is used to create an invoice "
+"during the picking process."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:1158
#, python-format
msgid "No Customer Defined !"
msgstr "¡No se ha definido un cliente!"
@@ -298,9 +343,12 @@ msgid "Sales in Exception"
msgstr "Ventas en excepción"
#. module: sale
-#: view:sale.order:0
-msgid "Set to Draft"
-msgstr "Cambiar a borrador"
+#: code:addons/sale/sale.py:1145
+#: code:addons/sale/sale.py:1264
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:70
+#, python-format
+msgid "Configuration Error !"
+msgstr ""
#. module: sale
#: view:sale.order:0
@@ -308,34 +356,7 @@ msgid "Conditions"
msgstr "Condiciones"
#. module: sale
-#: help:sale.order,order_policy:0
-msgid ""
-"The Shipping Policy is used to synchronise invoice and delivery operations.\n"
-" - The 'Pay Before delivery' choice will first generate the invoice and "
-"then generate the picking order after the payment of this invoice.\n"
-" - The 'Shipping & Manual Invoice' will create the picking order directly "
-"and wait for the user to manually click on the 'Invoice' button to generate "
-"the draft invoice.\n"
-" - The 'Invoice On Order After Delivery' choice will generate the draft "
-"invoice based on sales order after all picking lists have been finished.\n"
-" - The 'Invoice From The Picking' choice is used to create an invoice "
-"during the picking process."
-msgstr ""
-"La política de envío se utiliza para sincronizar las operaciones de envío y "
-"facturación.\n"
-" -La opción 'Pagar antes del envío' primero generará la factura y más tarde "
-"el albarán después del pago de dicha factura.\n"
-" -La opción 'Envío y factura manual' creará el albarán directamente y "
-"esperará a que un usuario haga clic manualemente sobre el botón 'Facturar' "
-"para generar la factura en el estado borrador.\n"
-" -La opción 'Facturar pedido después del envío' generará la factura en "
-"estado borrador basándose en el pedido de venta después de que todas los "
-"albaranes hayan sido realizados.\n"
-" -La opción 'Facturar desde albarán' se utiliza para crear una factura "
-"durante el proceso de preparación del pedido."
-
-#. module: sale
-#: code:addons/sale/sale.py:939
+#: code:addons/sale/sale.py:1034
#, python-format
msgid ""
"There is no income category account defined in default Properties for "
@@ -346,9 +367,9 @@ msgstr ""
"definida!"
#. module: sale
-#: view:sale.installer:0
-msgid "Configure"
-msgstr "Configurar"
+#: selection:sale.report,month:0
+msgid "August"
+msgstr "Agosto"
#. module: sale
#: constraint:stock.move:0
@@ -356,7 +377,7 @@ msgid "You try to assign a lot which is not from the same product"
msgstr "Está intentando asignar un lote que no es del mismo producto"
#. module: sale
-#: code:addons/sale/sale.py:620
+#: code:addons/sale/sale.py:655
#, python-format
msgid "invalid mode for test_state"
msgstr "Modo no válido para test_state"
@@ -367,7 +388,7 @@ msgid "June"
msgstr "Junio"
#. module: sale
-#: code:addons/sale/sale.py:584
+#: code:addons/sale/sale.py:617
#, python-format
msgid "Could not cancel this sales order !"
msgstr "¡No se puede cancelar este pedido de venta!"
@@ -388,8 +409,12 @@ msgid "October"
msgstr "Octubre"
#. module: sale
+#: sql_constraint:stock.picking:0
+msgid "Reference must be unique per Company!"
+msgstr ""
+
+#. module: sale
#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_quotation_for_sale
#: view:sale.order:0
#: view:sale.report:0
msgid "Quotations"
@@ -401,11 +426,6 @@ msgid "Pricelist for current sales order."
msgstr "Tarifa para el pedido de venta actual."
#. module: sale
-#: selection:sale.config.picking_policy,step:0
-msgid "Delivery Order Only"
-msgstr "Sólo orden de entrega"
-
-#. module: sale
#: report:sale.order:0
msgid "TVA :"
msgstr "IVA :"
@@ -432,6 +452,7 @@ msgstr "Posición fiscal"
#. module: sale
#: view:sale.order:0
#: view:sale.order.line:0
+#: field:sale.report,product_uom:0
msgid "UoM"
msgstr "UdM"
@@ -456,7 +477,13 @@ msgstr ""
"convierte 'En proceso' o 'Manual en proceso'."
#. module: sale
-#: code:addons/sale/sale.py:971
+#: code:addons/sale/sale.py:1061
+#, python-format
+msgid "You cannot cancel a sale order line that has already been invoiced!"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:1066
#, python-format
msgid "You must first cancel stock moves attached to this sales order line."
msgstr ""
@@ -464,7 +491,7 @@ msgstr ""
"pedido de venta."
#. module: sale
-#: code:addons/sale/sale.py:1042
+#: code:addons/sale/sale.py:1134
#, python-format
msgid "(n/a)"
msgstr "(n/a)"
@@ -503,14 +530,36 @@ msgid "Notes"
msgstr "Notas"
#. module: sale
+#: sql_constraint:res.company:0
+msgid "The company name must be unique !"
+msgstr ""
+
+#. module: sale
#: help:sale.order,partner_invoice_id:0
msgid "Invoice address for current sales order."
msgstr "Dirección de facturación para el pedido de venta actual."
#. module: sale
-#: view:sale.installer:0
-msgid "Enhance your core Sales Application with additional functionalities."
-msgstr "Optimizar su aplicación de ventas con funcionalidades adicionales."
+#: view:sale.report:0
+msgid "Month-1"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered month of the sales order"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:504
+#, python-format
+msgid ""
+"You cannot group sales having different currencies for the same partner."
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,picking_policy:0
+msgid "Deliver each product when available"
+msgstr ""
#. module: sale
#: field:sale.order,invoiced_rate:0
@@ -529,21 +578,43 @@ msgid "Confirmation Date"
msgstr "Fecha confirmación"
#. module: sale
+#: field:sale.order,incoterm:0
+msgid "Incoterm"
+msgstr "Incoterm"
+
+#. module: sale
#: field:sale.order.line,address_allotment_id:0
msgid "Allotment Partner"
msgstr "Ubicación empresa"
#. module: sale
-#: sql_constraint:sale.order:0
-msgid "Order Reference must be unique !"
-msgstr "¡La referencia del pedido debe ser única!"
-
-#. module: sale
#: selection:sale.report,month:0
msgid "March"
msgstr "Marzo"
#. module: sale
+#: constraint:stock.move:0
+msgid "You can not move products from or to a location of the type view."
+msgstr ""
+
+#. module: sale
+#: field:sale.config.picking_policy,sale_orders:0
+msgid "Based on Sales Orders"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,state:0
+msgid ""
+"Givwizard = self.browse(cr, uid, ids)[0]es the state of the quotation or "
+"sales order. \n"
+"The exception state is automatically set when a cancel operation occurs in "
+"the invoice validation (Invoice Exception) or in the picking list process "
+"(Shipping Exception). \n"
+"The 'Waiting Schedule' state is set when the invoice is confirmed but "
+"waiting for the scheduler to run on the order date."
+msgstr ""
+
+#. module: sale
#: help:sale.order,amount_total:0
msgid "The total amount."
msgstr "El importe total."
@@ -559,6 +630,11 @@ msgid "Invoice address :"
msgstr "Dirección de factura :"
#. module: sale
+#: field:sale.order.line,sequence:0
+msgid "Line Sequence"
+msgstr ""
+
+#. module: sale
#: model:process.transition,note:sale.process_transition_saleorderprocurement0
msgid ""
"For every sales order line, a procurement order is created to supply the "
@@ -609,11 +685,6 @@ msgid "Sales Order Line"
msgstr "Línea pedido de venta"
#. module: sale
-#: view:sale.config.picking_policy:0
-msgid "Setup your sales workflow and default values."
-msgstr "Configurar su flujo de ventas y valores por defecto."
-
-#. module: sale
#: field:sale.shop,warehouse_id:0
msgid "Warehouse"
msgstr "Almacén"
@@ -650,6 +721,11 @@ msgid "Creation Date"
msgstr "Fecha creación"
#. module: sale
+#: model:ir.ui.menu,name:sale.menu_sales_configuration_misc
+msgid "Miscellaneous"
+msgstr ""
+
+#. module: sale
#: model:ir.actions.act_window,name:sale.action_order_line_tree3
msgid "Uninvoiced and Delivered Lines"
msgstr "Líneas no facturadas y entregadas"
@@ -665,14 +741,19 @@ msgid "My Sales"
msgstr "Mis ventas"
#. module: sale
-#: code:addons/sale/sale.py:290
-#: code:addons/sale/sale.py:966
-#: code:addons/sale/sale.py:1165
+#: code:addons/sale/sale.py:295
+#: code:addons/sale/sale.py:1061
+#: code:addons/sale/sale.py:1290
#, python-format
msgid "Invalid action !"
msgstr "¡Acción no válida!"
#. module: sale
+#: view:sale.order:0
+msgid "Extra Info"
+msgstr "Información extra"
+
+#. module: sale
#: field:sale.order,pricelist_id:0
#: field:sale.report,pricelist_id:0
#: field:sale.shop,pricelist_id:0
@@ -686,13 +767,21 @@ msgid "# of Qty"
msgstr "Nº de ctdad"
#. module: sale
+#: code:addons/sale/sale.py:1314
+#, python-format
+msgid "Hour"
+msgstr ""
+
+#. module: sale
#: view:sale.order:0
msgid "Order Date"
msgstr "Fecha pedido"
#. module: sale
#: view:sale.order.line:0
+#: view:sale.report:0
#: field:sale.report,shipped:0
+#: field:sale.report,shipped_qty_1:0
msgid "Shipped"
msgstr "Enviado"
@@ -702,9 +791,9 @@ msgid "All Quotations"
msgstr "Todos los presupuestos"
#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Invoice On Order After Delivery"
-msgstr "Facturar pedido después de envío"
+#: view:sale.config.picking_policy:0
+msgid "Options"
+msgstr ""
#. module: sale
#: selection:sale.report,month:0
@@ -712,6 +801,20 @@ msgid "September"
msgstr "Septiembre"
#. module: sale
+#: code:addons/sale/sale.py:632
+#, python-format
+msgid "You cannot confirm a sale order which has no line."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:1246
+#, python-format
+msgid ""
+"You have to select a pricelist or a customer in the sales form !\n"
+"Please set one before choosing a product."
+msgstr ""
+
+#. module: sale
#: view:sale.report:0
#: field:sale.report,categ_id:0
msgid "Category of Product"
@@ -728,11 +831,6 @@ msgid "Stock Moves"
msgstr "Movimientos de stock"
#. module: sale
-#: view:sale.report:0
-msgid " Year "
-msgstr " Año "
-
-#. module: sale
#: field:sale.order,state:0
#: field:sale.report,state:0
msgid "Order State"
@@ -750,7 +848,7 @@ msgid "Sales By Month"
msgstr "Ventas por mes"
#. module: sale
-#: code:addons/sale/sale.py:970
+#: code:addons/sale/sale.py:1065
#, python-format
msgid "Could not cancel sales order line!"
msgstr "¡No se puede cancelar línea pedido de venta!"
@@ -785,64 +883,19 @@ msgstr ""
"sólo después que el planificador(es) se ha ejecutado."
#. module: sale
+#: field:sale.order,date_order:0
+msgid "Date"
+msgstr ""
+
+#. module: sale
#: view:sale.report:0
msgid "Extended Filters..."
msgstr "Filtros extendidos..."
#. module: sale
-#: model:ir.module.module,description:sale.module_meta_information
-msgid ""
-"\n"
-" The base module to manage quotations and sales orders.\n"
-"\n"
-" * Workflow with validation steps:\n"
-" - Quotation -> Sales order -> Invoice\n"
-" * Invoicing methods:\n"
-" - Invoice on order (before or after shipping)\n"
-" - Invoice on delivery\n"
-" - Invoice on timesheets\n"
-" - Advance invoice\n"
-" * Partners preferences (shipping, invoicing, incoterm, ...)\n"
-" * Products stocks and prices\n"
-" * Delivery methods:\n"
-" - all at once, multi-parcel\n"
-" - delivery costs\n"
-" * Dashboard for salesman that includes:\n"
-" * Your open quotations\n"
-" * Top 10 sales of the month\n"
-" * Cases statistics\n"
-" * Graph of sales by product\n"
-" * Graph of cases of the month\n"
-" "
-msgstr ""
-"\n"
-" El módulo base para gestionar presupuestos y pedidos de venta.\n"
-"\n"
-" * Flujo de trabajo con etapas de validación:\n"
-" - Presupuesto -> Pedido de venta -> Factura\n"
-" * Métodos de facturación:\n"
-" - Factura del pedido (antes o después del envío)\n"
-" - Factura del albarán\n"
-" - Factura de la hoja de servicios\n"
-" - Avanzar factura\n"
-" * Preferencias de los clientes (envío, facturación, incoterm, ...)\n"
-" * Existencias de los productos y precios\n"
-" * Formas de envío:\n"
-" - Todo a la vez, En varios paquetes\n"
-" - Gastos de envío\n"
-" * El tablero para el comercial incluye:\n"
-" * Sus presupuestos abiertos\n"
-" * Las 10 mejores ventas del mes\n"
-" * Estadísticas de casos\n"
-" * Gráfico de las ventas por producto\n"
-" * Gráfico de los casos por mes\n"
-" "
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_shop
-#: view:sale.shop:0
-msgid "Sales Shop"
-msgstr "Tienda ventas"
+#: selection:sale.order.line,state:0
+msgid "Exception"
+msgstr "Excepción"
#. module: sale
#: model:ir.model,name:sale.model_res_company
@@ -850,9 +903,10 @@ msgid "Companies"
msgstr "Compañías"
#. module: sale
-#: selection:sale.report,month:0
-msgid "November"
-msgstr "Noviembre"
+#: code:addons/sale/sale.py:1259
+#, python-format
+msgid "No valid pricelist line found ! :"
+msgstr ""
#. module: sale
#: view:sale.order:0
@@ -860,9 +914,9 @@ msgid "History"
msgstr "Historial"
#. module: sale
-#: field:sale.config.picking_policy,picking_policy:0
-msgid "Picking Default Policy"
-msgstr "Política de empaquetado por defecto"
+#: selection:sale.order,order_policy:0
+msgid "Invoice on order after delivery"
+msgstr ""
#. module: sale
#: help:sale.order,invoice_ids:0
@@ -889,14 +943,14 @@ msgstr ""
"presupuesto."
#. module: sale
-#: code:addons/sale/sale.py:966
-#, python-format
-msgid "You cannot cancel a sales order line that has already been invoiced !"
+#: help:res.company,security_lead:0
+msgid ""
+"This is the days added to what you promise to customers for security purpose"
msgstr ""
-"¡No puede cancelar una línea de pedido de venta que ya ha sido facturada!"
+"Estos días por razones de seguridad se añaden a los que promete a los "
+"clientes."
#. module: sale
-#: view:sale.order:0
#: view:sale.order.line:0
msgid "Qty"
msgstr "Ctdad"
@@ -907,6 +961,11 @@ msgid "References"
msgstr "Referencias"
#. module: sale
+#: view:sale.order.line:0
+msgid "My Sales Order Lines"
+msgstr ""
+
+#. module: sale
#: model:process.transition.action,name:sale.process_transition_action_cancel0
#: model:process.transition.action,name:sale.process_transition_action_cancel1
#: model:process.transition.action,name:sale.process_transition_action_cancel2
@@ -918,14 +977,9 @@ msgid "Cancel"
msgstr "Cancelar"
#. module: sale
-#: field:sale.installer,sale_order_dates:0
-msgid "Sales Order Dates"
-msgstr "Fechas en pedidos de venta"
-
-#. module: sale
-#: selection:sale.order.line,state:0
-msgid "Exception"
-msgstr "Excepción"
+#: sql_constraint:sale.order:0
+msgid "Order Reference must be unique per Company!"
+msgstr ""
#. module: sale
#: model:process.transition,name:sale.process_transition_invoice0
@@ -937,19 +991,19 @@ msgid "Create Invoice"
msgstr "Crear factura"
#. module: sale
-#: field:sale.installer,sale_margin:0
-msgid "Margins in Sales Orders"
-msgstr "Márgenes en pedidos de venta"
-
-#. module: sale
#: view:sale.order:0
msgid "Total Tax Excluded"
msgstr "Total sin impuestos"
#. module: sale
-#: view:sale.order:0
-msgid "Compute"
-msgstr "Calcular"
+#: view:sale.order.line:0
+msgid "Order reference"
+msgstr ""
+
+#. module: sale
+#: view:sale.open.invoice:0
+msgid "You invoice has been successfully created!"
+msgstr "¡La factura ha sido creada correctamente!"
#. module: sale
#: view:sale.report:0
@@ -968,23 +1022,21 @@ msgid "Open Invoice"
msgstr "Abrir factura"
#. module: sale
-#: report:sale.order:0
-#: view:sale.order.line:0
-msgid "Price"
-msgstr "Precio"
+#: model:ir.actions.server,name:sale.ir_actions_server_edi_sale
+msgid "Auto-email confirmed sale orders"
+msgstr ""
#. module: sale
-#: model:ir.actions.act_window,name:sale.action_sale_installer
-#: view:sale.config.picking_policy:0
-#: view:sale.installer:0
-msgid "Sales Application Configuration"
-msgstr "Configuración aplicaciones de ventas"
+#: code:addons/sale/sale.py:413
+#, python-format
+msgid "There is no sales journal defined for this company: \"%s\" (id:%d)"
+msgstr ""
+"No se ha definido un diario de ventas para esta compañía: \"%s\" (id:%d)"
#. module: sale
-#: view:sale.report:0
-#: field:sale.report,price_total:0
-msgid "Total Price"
-msgstr "Precio total"
+#: model:process.transition.action,name:sale.process_transition_action_forceassignation0
+msgid "Force Assignation"
+msgstr "Forzar asignación"
#. module: sale
#: selection:sale.order.line,type:0
@@ -997,6 +1049,11 @@ msgid "Based on the shipped or on the ordered quantities."
msgstr "Basado en las cantidades enviadas o pedidas."
#. module: sale
+#: selection:sale.order,picking_policy:0
+msgid "Deliver all products at once"
+msgstr ""
+
+#. module: sale
#: field:sale.order,picking_ids:0
msgid "Related Picking"
msgstr "Albarán relacionado"
@@ -1028,9 +1085,15 @@ msgid "Create Delivery Order"
msgstr "Crear orden de entrega"
#. module: sale
-#: field:sale.installer,delivery:0
-msgid "Delivery Costs"
-msgstr "Costes de envío"
+#: code:addons/sale/sale.py:1290
+#, python-format
+msgid "Cannot delete a sales order line which is in state '%s'!"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Qty(UoS)"
+msgstr ""
#. module: sale
#: view:sale.order:0
@@ -1044,13 +1107,13 @@ msgstr "Crear albarán"
#. module: sale
#: view:sale.report:0
-msgid "Sales by Product Category"
-msgstr "Ventas por categoría de producto"
+msgid "Ordered date of the sales order"
+msgstr ""
#. module: sale
-#: selection:sale.order,picking_policy:0
-msgid "Partial Delivery"
-msgstr "Envío parcial"
+#: view:sale.report:0
+msgid "Sales by Product Category"
+msgstr "Ventas por categoría de producto"
#. module: sale
#: model:process.transition,name:sale.process_transition_confirmquotation0
@@ -1058,10 +1121,10 @@ msgid "Confirm Quotation"
msgstr "Confirmar presupuesto"
#. module: sale
-#: help:sale.order,origin:0
-msgid "Reference of the document that generated this sales order request."
-msgstr ""
-"Referencia del documento que ha generado esta solicitud de pedido de venta."
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:63
+#, python-format
+msgid "Error"
+msgstr "Error"
#. module: sale
#: view:sale.order:0
@@ -1093,20 +1156,14 @@ msgid "Procurement Method"
msgstr "Método abastecimiento"
#. module: sale
-#: view:sale.config.picking_policy:0
-#: view:sale.installer:0
-msgid "title"
-msgstr "título"
-
-#. module: sale
#: model:process.node,name:sale.process_node_packinglist0
msgid "Pick List"
msgstr "Albarán"
#. module: sale
#: view:sale.order:0
-msgid "Order date"
-msgstr "Fecha pedido"
+msgid "Set to Draft"
+msgstr "Cambiar a borrador"
#. module: sale
#: model:process.node,note:sale.process_node_packinglist0
@@ -1114,6 +1171,85 @@ msgid "Document of the move to the output or to the customer."
msgstr "Documento del movimiento a la salida o al cliente."
#. module: sale
+#: model:email.template,body_text:sale.email_template_edi_sale
+msgid ""
+"\n"
+"Hello${object.partner_order_id.name and ' ' or "
+"''}${object.partner_order_id.name or ''},\n"
+"\n"
+"Here is your order confirmation for ${object.partner_id.name}:\n"
+" | Order number: *${object.name}*\n"
+" | Order total: *${object.amount_total} "
+"${object.pricelist_id.currency_id.name}*\n"
+" | Order date: ${object.date_order}\n"
+" % if object.origin:\n"
+" | Order reference: ${object.origin}\n"
+" % endif\n"
+" % if object.client_order_ref:\n"
+" | Your reference: ${object.client_order_ref}<br />\n"
+" % endif\n"
+" | Your contact: ${object.user_id.name} ${object.user_id.user_email "
+"and '<%s>'%(object.user_id.user_email) or ''}\n"
+"\n"
+"You can view the order confirmation, download it and even pay online using "
+"the following link:\n"
+" ${ctx.get('edi_web_url_view') or 'n/a'}\n"
+"\n"
+"% if object.order_policy in ('prepaid','manual') and "
+"object.company_id.paypal_account:\n"
+"<% \n"
+"comp_name = quote(object.company_id.name)\n"
+"order_name = quote(object.name)\n"
+"paypal_account = quote(object.company_id.paypal_account)\n"
+"order_amount = quote(str(object.amount_total))\n"
+"cur_name = quote(object.pricelist_id.currency_id.name)\n"
+"paypal_url = \"https://www.paypal.com/cgi-"
+"bin/webscr?cmd=_xclick&business=%s&item_name=%s%%20Order%%20%s&invoice=%s&amo"
+"unt=%s\" \\\n"
+" "
+"\"&currency_code=%s&button_subtype=services&no_note=1&bn=OpenERP_Order_PayNow"
+"_%s\" % \\\n"
+" "
+"(paypal_account,comp_name,order_name,order_name,order_amount,cur_name,cur_nam"
+"e)\n"
+"%>\n"
+"It is also possible to directly pay with Paypal:\n"
+" ${paypal_url}\n"
+"% endif\n"
+"\n"
+"If you have any question, do not hesitate to contact us.\n"
+"\n"
+"\n"
+"Thank you for choosing ${object.company_id.name}!\n"
+"\n"
+"\n"
+"--\n"
+"${object.user_id.name} ${object.user_id.user_email and "
+"'<%s>'%(object.user_id.user_email) or ''}\n"
+"${object.company_id.name}\n"
+"% if object.company_id.street:\n"
+"${object.company_id.street or ''}\n"
+"% endif\n"
+"% if object.company_id.street2:\n"
+"${object.company_id.street2}\n"
+"% endif\n"
+"% if object.company_id.city or object.company_id.zip:\n"
+"${object.company_id.zip or ''} ${object.company_id.city or ''}\n"
+"% endif\n"
+"% if object.company_id.country_id:\n"
+"${object.company_id.state_id and ('%s, ' % object.company_id.state_id.name) "
+"or ''} ${object.company_id.country_id.name or ''}\n"
+"% endif\n"
+"% if object.company_id.phone:\n"
+"Phone: ${object.company_id.phone}\n"
+"% endif\n"
+"% if object.company_id.website:\n"
+"${object.company_id.website or ''}\n"
+"% endif\n"
+" "
+msgstr ""
+
+#. module: sale
#: model:process.transition.action,name:sale.process_transition_action_validate0
msgid "Validate"
msgstr "Validar"
@@ -1136,9 +1272,9 @@ msgid "Taxes"
msgstr "Impuestos"
#. module: sale
-#: field:sale.order,order_policy:0
-msgid "Shipping Policy"
-msgstr "Política de facturación"
+#: view:sale.order:0
+msgid "Sales Order ready to be invoiced"
+msgstr ""
#. module: sale
#: help:sale.order,create_date:0
@@ -1157,9 +1293,9 @@ msgid "Create Invoices"
msgstr "Crear facturas"
#. module: sale
-#: view:sale.order:0
-msgid "Extra Info"
-msgstr "Información extra"
+#: view:sale.report:0
+msgid "Sales order created in current month"
+msgstr ""
#. module: sale
#: report:sale.order:0
@@ -1167,11 +1303,24 @@ msgid "Fax :"
msgstr "Fax :"
#. module: sale
+#: help:sale.order.line,type:0
+msgid ""
+"If 'on order', it triggers a procurement when the sale order is confirmed to "
+"create a task, purchase order or manufacturing order linked to this sale "
+"order line."
+msgstr ""
+
+#. module: sale
#: field:sale.advance.payment.inv,amount:0
msgid "Advance Amount"
msgstr "Importe avanzado"
#. module: sale
+#: field:sale.config.picking_policy,charge_delivery:0
+msgid "Do you charge the delivery?"
+msgstr ""
+
+#. module: sale
#: selection:sale.order,invoice_quantity:0
msgid "Shipped Quantities"
msgstr "Cantidades enviadas"
@@ -1182,25 +1331,45 @@ msgid "Invoice Based on Sales Orders"
msgstr "Factura basada en pedidos de venta"
#. module: sale
+#: code:addons/sale/sale.py:331
+#, python-format
+msgid ""
+"If you change the pricelist of this order (and eventually the currency), "
+"prices of existing order lines will not be updated."
+msgstr ""
+
+#. module: sale
#: model:ir.model,name:sale.model_stock_picking
msgid "Picking List"
msgstr "Albarán"
#. module: sale
-#: code:addons/sale/sale.py:387
-#: code:addons/sale/sale.py:920
-#: code:addons/sale/sale.py:938
+#: code:addons/sale/sale.py:412
+#: code:addons/sale/sale.py:503
+#: code:addons/sale/sale.py:632
+#: code:addons/sale/sale.py:1015
+#: code:addons/sale/sale.py:1033
#, python-format
msgid "Error !"
msgstr "¡Error!"
#. module: sale
-#: code:addons/sale/sale.py:570
+#: code:addons/sale/sale.py:603
#, python-format
msgid "Could not cancel sales order !"
msgstr "¡No se puede cancelar el pedido de venta!"
#. module: sale
+#: view:sale.order:0
+msgid "Qty(UoM)"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered Year of the sales order"
+msgstr ""
+
+#. module: sale
#: selection:sale.report,month:0
msgid "July"
msgstr "Julio"
@@ -1217,36 +1386,26 @@ msgid "Shipping Exception"
msgstr "Excepción de envío"
#. module: sale
-#: field:sale.make.invoice,grouped:0
-msgid "Group the invoices"
-msgstr "Agrupar las facturas"
-
-#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Shipping & Manual Invoice"
-msgstr "Enviar & Factura manual"
-
-#. module: sale
-#: code:addons/sale/sale.py:1051
+#: code:addons/sale/sale.py:1143
#, python-format
-msgid "Picking Information !"
-msgstr "¡Información albarán!"
+msgid "Picking Information ! : "
+msgstr ""
#. module: sale
-#: view:sale.report:0
-#: field:sale.report,month:0
-msgid "Month"
-msgstr "Mes"
+#: field:sale.make.invoice,grouped:0
+msgid "Group the invoices"
+msgstr "Agrupar las facturas"
#. module: sale
-#: model:ir.module.module,shortdesc:sale.module_meta_information
-msgid "Sales Management"
-msgstr "Ventas"
+#: field:sale.order,order_policy:0
+msgid "Invoice Policy"
+msgstr ""
#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Invoice From The Picking"
-msgstr "Factura desde el albarán"
+#: model:ir.actions.act_window,name:sale.action_config_picking_policy
+#: view:sale.config.picking_policy:0
+msgid "Setup your Invoicing Method"
+msgstr ""
#. module: sale
#: model:process.node,note:sale.process_node_invoice0
@@ -1255,32 +1414,31 @@ msgstr "Para ser revisado por el contable."
#. module: sale
#: view:sale.report:0
-#: field:sale.report,uom_name:0
msgid "Reference UoM"
msgstr "Referencia UdM"
#. module: sale
+#: view:sale.config.picking_policy:0
+msgid ""
+"This tool will help you to install the right module and configure the system "
+"according to the method you use to invoice your customers."
+msgstr ""
+
+#. module: sale
#: model:ir.model,name:sale.model_sale_order_line_make_invoice
msgid "Sale OrderLine Make_invoice"
msgstr "Venta Línea_pedido Realizar_factura"
#. module: sale
-#: help:sale.config.picking_policy,step:0
-msgid ""
-"By default, OpenERP is able to manage complex routing and paths of products "
-"in your warehouse and partner locations. This will configure the most common "
-"and simple methods to deliver products to the customer in one or two "
-"operations by the worker."
-msgstr ""
-"Por defecto, OpenERP es capaz de gestionar complejas rutas y caminos de los "
-"productos en su almacén y en las ubicaciones de otras empresas. Esto "
-"configurará los métodos más comunes y sencillos para entregar los productos "
-"al cliente en una o dos operaciones realizadas por el trabajador."
+#: selection:sale.order,state:0
+#: selection:sale.report,state:0
+msgid "Invoice Exception"
+msgstr "Excepción de factura"
#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_tree
-msgid "Old Quotations"
-msgstr "Presupuestos antiguos"
+#: model:process.node,note:sale.process_node_saleorder0
+msgid "Drives procurement and invoicing"
+msgstr "Genera abastecimiento y facturación"
#. module: sale
#: field:sale.order,invoiced:0
@@ -1295,6 +1453,22 @@ msgid "Sales Analysis"
msgstr "Análisis de ventas"
#. module: sale
+#: code:addons/sale/sale.py:1138
+#, python-format
+msgid ""
+"You selected a quantity of %d Units.\n"
+"But it's not compatible with the selected packaging.\n"
+"Here is a proposition of quantities according to the packaging:\n"
+"EAN: %s Quantity: %s Type of ul: %s"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Recreate Packing"
+msgstr "Recrear albarán"
+
+#. module: sale
+#: view:sale.order:0
#: field:sale.order.line,property_ids:0
msgid "Properties"
msgstr "Propiedades"
@@ -1325,7 +1499,17 @@ msgstr ""
"Puede generar facturas basadas en pedidos de venta o basadas en envíos."
#. module: sale
-#: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
+#: view:sale.order.line:0
+msgid "Confirmed sale order lines, not yet delivered"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:473
+#, python-format
+msgid "Customer Invoices"
+msgstr ""
+
+#. module: sale
#: model:process.process,name:sale.process_process_salesprocess0
#: view:sale.order:0
#: view:sale.report:0
@@ -1347,18 +1531,13 @@ msgid "Done"
msgstr "Realizado"
#. module: sale
-#: model:ir.model,name:sale.model_sale_installer
-msgid "sale.installer"
-msgstr "venta.instalador"
-
-#. module: sale
#: model:process.node,name:sale.process_node_invoice0
#: model:process.node,name:sale.process_node_invoiceafterdelivery0
msgid "Invoice"
msgstr "Factura"
#. module: sale
-#: code:addons/sale/sale.py:1014
+#: code:addons/sale/sale.py:1158
#, python-format
msgid ""
"You have to select a customer in the sales form !\n"
@@ -1368,11 +1547,6 @@ msgstr ""
"Introduzca un cliente antes de seleccionar un producto."
#. module: sale
-#: selection:sale.config.picking_policy,step:0
-msgid "Picking List & Delivery Order"
-msgstr "Albarán y Orden de entrega"
-
-#. module: sale
#: field:sale.order,origin:0
msgid "Source Document"
msgstr "Documento origen"
@@ -1398,7 +1572,7 @@ msgid "The amount without tax."
msgstr "El importe sin impuestos."
#. module: sale
-#: code:addons/sale/sale.py:571
+#: code:addons/sale/sale.py:604
#, python-format
msgid "You must first cancel all picking attached to this sales order."
msgstr ""
@@ -1411,9 +1585,15 @@ msgid "Sales Advance Payment Invoice"
msgstr "Ventas. Anticipo pago factura"
#. module: sale
-#: field:sale.order,incoterm:0
-msgid "Incoterm"
-msgstr "Incoterm"
+#: view:sale.report:0
+#: field:sale.report,month:0
+msgid "Month"
+msgstr "Mes"
+
+#. module: sale
+#: model:email.template,subject:sale.email_template_edi_sale
+msgid "${object.company_id.name} Order (Ref ${object.name or 'n/a' })"
+msgstr ""
#. module: sale
#: view:sale.order.line:0
@@ -1424,11 +1604,6 @@ msgid "Product"
msgstr "Producto"
#. module: sale
-#: model:ir.ui.menu,name:sale.menu_invoiced
-msgid "Invoicing"
-msgstr "Facturación"
-
-#. module: sale
#: model:process.transition.action,name:sale.process_transition_action_cancelassignation0
msgid "Cancel Assignation"
msgstr "Cancelar asignación"
@@ -1439,22 +1614,11 @@ msgid "sale.config.picking_policy"
msgstr "sale.config.picking_policy"
#. module: sale
-#: help:sale.order,state:0
-msgid ""
-"Gives the state of the quotation or sales order. \n"
-"The exception state is automatically set when a cancel operation occurs in "
-"the invoice validation (Invoice Exception) or in the picking list process "
-"(Shipping Exception). \n"
-"The 'Waiting Schedule' state is set when the invoice is confirmed but "
-"waiting for the scheduler to run on the date 'Ordered Date'."
+#: view:account.invoice.report:0
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_turnover_by_month
+msgid "Monthly Turnover"
msgstr ""
-"Indica el estado del presupuesto o pedido de venta. \n"
-"El estado de excepción se establece automáticamente cuando se produce una "
-"operación de cancelación en la validación de factura (excepción de factura) "
-"o en el procesado del albarán (excepción de envío). \n"
-"El estado 'Esperando planificación' se establece cuando se confirma la "
-"factura, pero está esperando que el planificador la active en la fecha de "
-"\"Fecha pedido\"."
#. module: sale
#: field:sale.order,invoice_quantity:0
@@ -1472,7 +1636,6 @@ msgid "Product UoS"
msgstr "UdV del producto"
#. module: sale
-#: selection:sale.order,state:0
#: selection:sale.report,state:0
msgid "Manual In Progress"
msgstr "Manual en proceso"
@@ -1493,7 +1656,8 @@ msgid "Order"
msgstr "Pedido"
#. module: sale
-#: code:addons/sale/sale.py:921
+#: code:addons/sale/sale.py:1016
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:71
#, python-format
msgid "There is no income account defined for this product: \"%s\" (id:%d)"
msgstr ""
@@ -1518,7 +1682,7 @@ msgstr ""
"confirmado por el comercial."
#. module: sale
-#: code:addons/sale/sale.py:1116
+#: code:addons/sale/sale.py:1238
#, python-format
msgid ""
"You plan to sell %.2f %s but you only have %.2f %s available !\n"
@@ -1549,11 +1713,10 @@ msgid "Total"
msgstr "Total"
#. module: sale
-#: code:addons/sale/sale.py:388
-#, python-format
-msgid "There is no sales journal defined for this company: \"%s\" (id:%d)"
-msgstr ""
-"No se ha definido un diario de ventas para esta compañía: \"%s\" (id:%d)"
+#: report:sale.order:0
+#: view:sale.order.line:0
+msgid "Price"
+msgstr "Precio"
#. module: sale
#: model:process.transition,note:sale.process_transition_deliver0
@@ -1567,10 +1730,15 @@ msgstr ""
"entrega de forma manual o automática."
#. module: sale
-#: code:addons/sale/sale.py:1165
-#, python-format
-msgid "Cannot delete a sales order line which is %s !"
-msgstr "¡No se puede eliminar una línea de pedido de venta que está %s!"
+#: selection:sale.order,order_policy:0
+msgid "Pay before delivery"
+msgstr ""
+
+#. module: sale
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.open_board_sales
+msgid "Sales Dashboard"
+msgstr ""
#. module: sale
#: model:ir.actions.act_window,name:sale.action_sale_order_make_invoice
@@ -1581,6 +1749,7 @@ msgstr "Realizar facturas"
#. module: sale
#: view:sale.order:0
+#: selection:sale.order,state:0
#: view:sale.order.line:0
msgid "To Invoice"
msgstr "Para facturar"
@@ -1591,6 +1760,11 @@ msgid "Date on which sales order is confirmed."
msgstr "Fecha en la que se confirma el pedido de venta."
#. module: sale
+#: field:sale.order,project_id:0
+msgid "Contract/Analytic Account"
+msgstr ""
+
+#. module: sale
#: field:sale.order,company_id:0
#: field:sale.order.line,company_id:0
#: view:sale.report:0
@@ -1610,10 +1784,12 @@ msgid "The amount to be invoiced in advance."
msgstr "El importe a facturar por adelantado."
#. module: sale
-#: selection:sale.order,state:0
-#: selection:sale.report,state:0
-msgid "Invoice Exception"
-msgstr "Excepción de factura"
+#: code:addons/sale/sale.py:1256
+#, python-format
+msgid ""
+"Couldn't find a pricelist line matching this product and quantity.\n"
+"You have to change either the product, the quantity or the pricelist."
+msgstr ""
#. module: sale
#: help:sale.order,picking_ids:0
@@ -1624,15 +1800,6 @@ msgstr ""
"venta."
#. module: sale
-#: help:sale.installer,sale_margin:0
-msgid ""
-"Gives the margin of profitability by calculating the difference between Unit "
-"Price and Cost Price."
-msgstr ""
-"Indica el margen de rentabilidad mediante el cálculo de la diferencia entre "
-"el precio unitario y el precio de coste."
-
-#. module: sale
#: view:sale.make.invoice:0
#: view:sale.order.line.make.invoice:0
msgid "Create invoices"
@@ -1651,6 +1818,11 @@ msgid "Cancelled"
msgstr "Cancelado"
#. module: sale
+#: view:sale.order.line:0
+msgid "Sales Order Lines related to a Sales Order of mine"
+msgstr ""
+
+#. module: sale
#: model:ir.actions.act_window,name:sale.action_shop_form
#: model:ir.ui.menu,name:sale.menu_action_shop_form
#: field:sale.order,shop_id:0
@@ -1660,17 +1832,12 @@ msgid "Shop"
msgstr "Tienda"
#. module: sale
-#: view:sale.report:0
-msgid " Month "
-msgstr " Mes "
-
-#. module: sale
#: field:sale.report,date_confirm:0
msgid "Date Confirm"
msgstr "Fecha confirmación"
#. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:111
+#: code:addons/sale/wizard/sale_line_invoice.py:113
#, python-format
msgid "Warning"
msgstr "Aviso"
@@ -1682,22 +1849,6 @@ msgid "Sales by Month"
msgstr "Ventas por mes"
#. module: sale
-#: code:addons/sale/sale.py:1045
-#, python-format
-msgid ""
-"You selected a quantity of %d Units.\n"
-"But it's not compatible with the selected packaging.\n"
-"Here is a proposition of quantities according to the packaging:\n"
-"\n"
-"EAN: %s Quantity: %s Type of ul: %s"
-msgstr ""
-"Ha seleccionado una cantidad de %d unidades.\n"
-"Pero no es compatible con el embalaje seleccionado.\n"
-"Aquí tiene una propuesta de cantidades acordes con este embalaje:\n"
-"\n"
-"EAN: %s Cantidad: %s Tipo de ul: %s"
-
-#. module: sale
#: model:ir.model,name:sale.model_sale_order
#: model:process.node,name:sale.process_node_order0
#: model:process.node,name:sale.process_node_saleorder0
@@ -1713,6 +1864,11 @@ msgid "Quantity (UoS)"
msgstr "Cantidad (UdV)"
#. module: sale
+#: view:sale.order.line:0
+msgid "Sale Order Lines that are in 'done' state"
+msgstr ""
+
+#. module: sale
#: model:process.transition,note:sale.process_transition_packing0
msgid ""
"The Pick List form is created as soon as the sales order is confirmed, in "
@@ -1731,6 +1887,11 @@ msgid "Confirmed"
msgstr "Confirmado"
#. module: sale
+#: field:sale.config.picking_policy,order_policy:0
+msgid "Main Method Based On"
+msgstr ""
+
+#. module: sale
#: model:process.transition.action,name:sale.process_transition_action_confirm0
msgid "Confirm"
msgstr "Confirmar"
@@ -1753,6 +1914,7 @@ msgid "Invoice Lines"
msgstr "Líneas de factura"
#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_product_tree
#: view:sale.order:0
#: view:sale.order.line:0
msgid "Sales Order Lines"
@@ -1769,33 +1931,18 @@ msgid "Configuration"
msgstr "Configuración"
#. module: sale
-#: selection:sale.order,picking_policy:0
-msgid "Complete Delivery"
-msgstr "Envío completo"
+#: code:addons/sale/edi/sale_order.py:146
+#, python-format
+msgid "EDI Pricelist (%s)"
+msgstr ""
#. module: sale
#: view:sale.report:0
-msgid " Month-1 "
-msgstr " Mes-1 "
-
-#. module: sale
-#: help:sale.config.picking_policy,picking_policy:0
-msgid ""
-"The Shipping Policy is used to configure per order if you want to deliver as "
-"soon as possible when one product is available or you wait that all products "
-"are available.."
+msgid "Sales order created in current year"
msgstr ""
-"La política de envío se utiliza para configurar el pedido si debe entregarse "
-"tan pronto como sea posible cuando un producto está disponible o debe "
-"esperar a que todos los productos están disponibles."
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "August"
-msgstr "Agosto"
#. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:111
+#: code:addons/sale/wizard/sale_line_invoice.py:113
#, python-format
msgid ""
"Invoice cannot be created for this Sales Order Line due to one of the "
@@ -1810,6 +1957,11 @@ msgstr ""
"2. La línea del pedido de venta está facturada."
#. module: sale
+#: view:sale.order.line:0
+msgid "Sale order lines done"
+msgstr ""
+
+#. module: sale
#: field:sale.order.line,th_weight:0
msgid "Weight"
msgstr "Peso"
@@ -1828,7 +1980,6 @@ msgstr "Diciembre"
#. module: sale
#: field:sale.config.picking_policy,config_logo:0
-#: field:sale.installer,config_logo:0
msgid "Image"
msgstr "Imagen"
@@ -1862,9 +2013,9 @@ msgid "Salesman"
msgstr "Comercial"
#. module: sale
-#: model:process.node,note:sale.process_node_saleorder0
-msgid "Drives procurement and invoicing"
-msgstr "Genera abastecimiento y facturación"
+#: model:ir.actions.act_window,name:sale.action_order_tree
+msgid "Old Quotations"
+msgstr "Presupuestos antiguos"
#. module: sale
#: field:sale.order,amount_untaxed:0
@@ -1872,7 +2023,7 @@ msgid "Untaxed Amount"
msgstr "Base imponible"
#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:163
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:170
#: model:ir.actions.act_window,name:sale.action_view_sale_advance_payment_inv
#: view:sale.advance.payment.inv:0
#: view:sale.order:0
@@ -1881,7 +2032,7 @@ msgid "Advance Invoice"
msgstr "Avanzar factura"
#. module: sale
-#: code:addons/sale/sale.py:591
+#: code:addons/sale/sale.py:624
#, python-format
msgid "The sales order '%s' has been cancelled."
msgstr "El pedido de venta '%s' ha sido cancelado."
@@ -1925,20 +2076,20 @@ msgid "Packings"
msgstr "Albaranes"
#. module: sale
-#: field:sale.config.picking_policy,progress:0
-#: field:sale.installer,progress:0
-msgid "Configuration Progress"
-msgstr "Progreso configuración"
+#: view:sale.order.line:0
+msgid "Sale Order Lines ready to be invoiced"
+msgstr ""
#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_product_tree
-msgid "Product sales"
-msgstr "Ventas de producto"
+#: view:sale.report:0
+msgid "Sales order created in last month"
+msgstr ""
#. module: sale
-#: field:sale.order,date_order:0
-msgid "Ordered Date"
-msgstr "Fecha pedido"
+#: model:ir.actions.act_window,name:sale.action_email_templates
+#: model:ir.ui.menu,name:sale.menu_email_templates
+msgid "Email Templates"
+msgstr ""
#. module: sale
#: model:ir.actions.act_window,name:sale.action_order_form
@@ -1948,14 +2099,15 @@ msgid "Sales Orders"
msgstr "Pedidos de ventas"
#. module: sale
-#: selection:sale.config.picking_policy,picking_policy:0
-msgid "Direct Delivery"
-msgstr "Envío directo"
+#: model:ir.model,name:sale.model_sale_shop
+#: view:sale.shop:0
+msgid "Sales Shop"
+msgstr "Tienda ventas"
#. module: sale
-#: field:sale.installer,sale_journal:0
-msgid "Invoicing journals"
-msgstr "Diarios de facturación"
+#: selection:sale.report,month:0
+msgid "November"
+msgstr "Noviembre"
#. module: sale
#: field:sale.advance.payment.inv,product_id:0
@@ -1963,18 +2115,12 @@ msgid "Advance Product"
msgstr "Producto avanzado"
#. module: sale
-#: view:sale.report:0
-#: field:sale.report,shipped_qty_1:0
-msgid "Shipped Qty"
-msgstr "Ctdad enviada"
-
-#. module: sale
-#: view:sale.open.invoice:0
-msgid "You invoice has been successfully created!"
-msgstr "¡La factura ha sido creada correctamente!"
+#: view:sale.order:0
+msgid "Compute"
+msgstr "Calcular"
#. module: sale
-#: code:addons/sale/sale.py:585
+#: code:addons/sale/sale.py:618
#, python-format
msgid "You must first cancel all invoices attached to this sales order."
msgstr ""
@@ -1987,25 +2133,15 @@ msgid "January"
msgstr "Enero"
#. module: sale
-#: view:sale.installer:0
-msgid "Configure Your Sales Management Application"
-msgstr "Configurar su aplicación de gestión de ventas"
-
-#. module: sale
#: model:ir.actions.act_window,name:sale.action_order_tree4
msgid "Sales Order in Progress"
msgstr "Pedidos de ventas en proceso"
#. module: sale
-#: field:sale.installer,sale_layout:0
-msgid "Sales Order Layout Improvement"
-msgstr "Mejora plantilla pedido de venta"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:63
-#, python-format
-msgid "Error"
-msgstr "Error"
+#: help:sale.order,origin:0
+msgid "Reference of the document that generated this sales order request."
+msgstr ""
+"Referencia del documento que ha generado esta solicitud de pedido de venta."
#. module: sale
#: view:sale.report:0
@@ -2014,6 +2150,11 @@ msgid "Commitment Delay"
msgstr "Retraso realización"
#. module: sale
+#: selection:sale.order,order_policy:0
+msgid "Deliver & invoice on demand"
+msgstr ""
+
+#. module: sale
#: model:process.node,note:sale.process_node_saleprocurement0
msgid ""
"One Procurement order for each sales order line and for each of the "
@@ -2038,13 +2179,12 @@ msgid "Confirmed sales order to invoice."
msgstr "Pedido de venta confirmado a factura."
#. module: sale
-#: code:addons/sale/sale.py:290
-#, python-format
-msgid "Cannot delete Sales Order(s) which are already confirmed !"
-msgstr "¡No se puede eliminar pedido(s) de venta que ya está confirmado!"
+#: view:sale.order:0
+msgid "Sales Order that haven't yet been confirmed"
+msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:316
+#: code:addons/sale/sale.py:322
#, python-format
msgid "The sales order '%s' has been set in draft state."
msgstr "El pedido de venta '%s' ha sido cambiado a estado borrador."
@@ -2055,37 +2195,27 @@ msgid "from stock"
msgstr "desde stock"
#. module: sale
-#: field:sale.config.picking_policy,order_policy:0
-msgid "Shipping Default Policy"
-msgstr "Política de envío por defecto"
-
-#. module: sale
#: view:sale.open.invoice:0
msgid "Close"
msgstr "Cerrar"
#. module: sale
+#: code:addons/sale/sale.py:1248
+#, python-format
+msgid "No Pricelist ! : "
+msgstr ""
+
+#. module: sale
#: field:sale.order,shipped:0
msgid "Delivered"
msgstr "Entregado"
#. module: sale
-#: code:addons/sale/sale.py:1115
-#, python-format
-msgid "Not enough stock !"
-msgstr "¡No hay stock suficiente!"
-
-#. module: sale
#: constraint:stock.move:0
msgid "You must assign a production lot for this product"
msgstr "Debe asignar un lote de producción para este producto"
#. module: sale
-#: field:sale.order.line,sequence:0
-msgid "Layout Sequence"
-msgstr "Secuencia plantilla"
-
-#. module: sale
#: model:ir.actions.act_window,help:sale.action_shop_form
msgid ""
"If you have more than one shop reselling your company products, you can "
@@ -2117,12 +2247,6 @@ msgid "May"
msgstr "Mayo"
#. module: sale
-#: help:sale.installer,sale_order_dates:0
-msgid "Adds commitment, requested and effective dates on Sales Orders."
-msgstr ""
-"Añade fechas de realización, solicitud y efectivo en pedidos de venta."
-
-#. module: sale
#: view:sale.order:0
#: field:sale.order,partner_id:0
#: field:sale.order.line,order_partner_id:0
@@ -2130,25 +2254,11 @@ msgid "Customer"
msgstr "Cliente"
#. module: sale
-#: model:product.template,name:sale.advance_product_0_product_template
-msgid "Advance"
-msgstr "Anticipo"
-
-#. module: sale
#: selection:sale.report,month:0
msgid "February"
msgstr "Febrero"
#. module: sale
-#: help:sale.installer,sale_journal:0
-msgid ""
-"Allows you to group and invoice your delivery orders according to different "
-"invoicing types: daily, weekly, etc."
-msgstr ""
-"Permite agrupar y facturar sus albaranes de acuerdo a diferentes tipos de "
-"facturación: diaria, semanal, etc."
-
-#. module: sale
#: selection:sale.report,month:0
msgid "April"
msgstr "Abril"
@@ -2159,11 +2269,6 @@ msgid "Accounting"
msgstr "Contabilidad"
#. module: sale
-#: field:sale.config.picking_policy,step:0
-msgid "Steps To Deliver a Sales Order"
-msgstr "Pasos para entregar un pedido de venta"
-
-#. module: sale
#: view:sale.order:0
#: view:sale.order.line:0
msgid "Search Sales Order"
@@ -2175,20 +2280,18 @@ msgid "Sales Order Requisition"
msgstr "Solicitud pedido de venta"
#. module: sale
+#: code:addons/sale/sale.py:1242
+#, python-format
+msgid "Not enough stock ! : "
+msgstr ""
+
+#. module: sale
#: report:sale.order:0
#: field:sale.order,payment_term:0
msgid "Payment Term"
msgstr "Plazo de pago"
#. module: sale
-#: help:sale.installer,sale_layout:0
-msgid ""
-"Provides some features to improve the layout of the Sales Order reports."
-msgstr ""
-"Proporciona algunas funcionalidades para mejorar la plantilla de los "
-"informes de pedidos de ventas."
-
-#. module: sale
#: model:ir.actions.act_window,help:sale.action_order_report_all
msgid ""
"This report performs analysis on your quotations and sales orders. Analysis "
@@ -2229,6 +2332,9 @@ msgstr "Facturar desde albaranes"
#~ msgid "Configure Sale Order Logistic"
#~ msgstr "Configurar la logística de los pedidos de venta"
+#~ msgid "Partial Delivery"
+#~ msgstr "Envío parcial"
+
#~ msgid "Recreate Procurement"
#~ msgstr "Recrear abastecimiento"
@@ -2273,6 +2379,9 @@ msgstr "Facturar desde albaranes"
#~ msgid "Reference"
#~ msgstr "Referencia"
+#~ msgid "All at Once"
+#~ msgstr "Todo a la vez"
+
#~ msgid "Procurement is created after confirmation of sale order."
#~ msgstr "El abastecimiento es creado después de confirmar un pedido de venta."
@@ -2328,6 +2437,9 @@ msgstr "Facturar desde albaranes"
#~ "Cuando selecciona una política de envío = 'Factura automática después del "
#~ "envío', la creará automáticamente después del envío."
+#~ msgid "Complete Delivery"
+#~ msgstr "Envío completo"
+
#~ msgid "Manual Description"
#~ msgstr "Descripción manual"
@@ -2369,12 +2481,12 @@ msgstr "Facturar desde albaranes"
#~ msgid "Procurement for each line"
#~ msgstr "Abastecimiento para cada línea"
-#~ msgid "My Quotations"
-#~ msgstr "Mis presupuestos"
-
#~ msgid "Manages the delivery and invoicing progress"
#~ msgstr "Gestiona el progreso de envío y facturación"
+#~ msgid "Shipping Default Policy"
+#~ msgstr "Política de envío por defecto"
+
#, python-format
#~ msgid "Could not cancel sale order !"
#~ msgstr "¡No puede cancelar el pedido de venta!"
@@ -2413,12 +2525,18 @@ msgstr "Facturar desde albaranes"
#~ msgid "Procurement Corrected"
#~ msgstr "Abastecimiento corregido"
+#~ msgid "Shipping & Manual Invoice"
+#~ msgstr "Enviar & Factura manual"
+
#~ msgid "Sale Procurement"
#~ msgstr "Abastecimiento de venta"
#~ msgid "Status"
#~ msgstr "Estado"
+#~ msgid "Product sales"
+#~ msgstr "Ventas de producto"
+
#~ msgid "Our Salesman"
#~ msgstr "Nuestro comercial"
@@ -2434,6 +2552,9 @@ msgstr "Facturar desde albaranes"
#~ msgid "Sale Pricelists"
#~ msgstr "Tarifas de venta"
+#~ msgid "Direct Delivery"
+#~ msgstr "Envío directo"
+
#~ msgid ""
#~ "Invoice is created when 'Create Invoice' is being clicked after confirming "
#~ "the sale order. This transaction moves the sale order to invoices."
@@ -2445,6 +2566,9 @@ msgstr "Facturar desde albaranes"
#~ msgid "Make Invoice"
#~ msgstr "Crear factura"
+#~ msgid "Delivery Order Only"
+#~ msgstr "Sólo orden de entrega"
+
#~ msgid "Sales order lines"
#~ msgstr "Líneas del pedido de ventas"
@@ -2550,6 +2674,9 @@ msgstr "Facturar desde albaranes"
#~ msgid "Related invoices"
#~ msgstr "Facturas relacionadas"
+#~ msgid "Payment Before Delivery"
+#~ msgstr "Pago antes del envío"
+
#~ msgid ""
#~ "This is the list of invoices that have been generated for this sale order. "
#~ "The same sale order may have been invoiced in several times (by line for "
@@ -2621,6 +2748,9 @@ msgstr "Facturar desde albaranes"
#~ "establece cuando se confirma la factura pero se espera a que el planificador "
#~ "procese el pedido en la fecha 'Fecha del pedido'."
+#~ msgid "Sales Management"
+#~ msgstr "Ventas"
+
#~ msgid ""
#~ "By default, Open ERP is able to manage complex routing and paths of products "
#~ "in your warehouse and partner locations. This will configure the most common "
@@ -2663,3 +2793,266 @@ msgstr "Facturar desde albaranes"
#~ "hayan procesado.\n"
#~ " - La opción 'Factura desde albarán' se utiliza para crear una factura "
#~ "durante el proceso de los albaranes."
+
+#~ msgid "Shipping Policy"
+#~ msgstr "Política de facturación"
+
+#~ msgid "Allows you to compute delivery costs on your quotations."
+#~ msgstr "Le permite calcular los costos de envío en sus presupuestos."
+
+#~ msgid "Configure Picking Policy for Sales Order"
+#~ msgstr "Configurar la política envío para pedidos de venta"
+
+#~ msgid ""
+#~ "Provides some features to improve the layout of the Sales Order reports."
+#~ msgstr ""
+#~ "Proporciona algunas funcionalidades para mejorar la plantilla de los "
+#~ "informes de pedidos de ventas."
+
+#~ msgid " Year "
+#~ msgstr " Año "
+
+#~ msgid "Sales Order Dates"
+#~ msgstr "Fechas en pedidos de venta"
+
+#~ msgid "Margins in Sales Orders"
+#~ msgstr "Márgenes en pedidos de venta"
+
+#~ msgid "Sales Application Configuration"
+#~ msgstr "Configuración aplicaciones de ventas"
+
+#~ msgid "Delivery Costs"
+#~ msgstr "Costes de envío"
+
+#~ msgid "Order date"
+#~ msgstr "Fecha pedido"
+
+#~ msgid "title"
+#~ msgstr "título"
+
+#, python-format
+#~ msgid "Picking Information !"
+#~ msgstr "¡Información albarán!"
+
+#~ msgid ""
+#~ "By default, OpenERP is able to manage complex routing and paths of products "
+#~ "in your warehouse and partner locations. This will configure the most common "
+#~ "and simple methods to deliver products to the customer in one or two "
+#~ "operations by the worker."
+#~ msgstr ""
+#~ "Por defecto, OpenERP es capaz de gestionar complejas rutas y caminos de los "
+#~ "productos en su almacén y en las ubicaciones de otras empresas. Esto "
+#~ "configurará los métodos más comunes y sencillos para entregar los productos "
+#~ "al cliente en una o dos operaciones realizadas por el trabajador."
+
+#~ msgid "Invoicing"
+#~ msgstr "Facturación"
+
+#~ msgid "Picking List & Delivery Order"
+#~ msgstr "Albarán y Orden de entrega"
+
+#~ msgid "sale.installer"
+#~ msgstr "venta.instalador"
+
+#~ msgid ""
+#~ "Gives the margin of profitability by calculating the difference between Unit "
+#~ "Price and Cost Price."
+#~ msgstr ""
+#~ "Indica el margen de rentabilidad mediante el cálculo de la diferencia entre "
+#~ "el precio unitario y el precio de coste."
+
+#~ msgid " Month "
+#~ msgstr " Mes "
+
+#~ msgid ""
+#~ "The Shipping Policy is used to configure per order if you want to deliver as "
+#~ "soon as possible when one product is available or you wait that all products "
+#~ "are available.."
+#~ msgstr ""
+#~ "La política de envío se utiliza para configurar el pedido si debe entregarse "
+#~ "tan pronto como sea posible cuando un producto está disponible o debe "
+#~ "esperar a que todos los productos están disponibles."
+
+#~ msgid " Month-1 "
+#~ msgstr " Mes-1 "
+
+#~ msgid "Sales Order Layout Improvement"
+#~ msgstr "Mejora plantilla pedido de venta"
+
+#~ msgid "Invoicing journals"
+#~ msgstr "Diarios de facturación"
+
+#~ msgid "Configuration Progress"
+#~ msgstr "Progreso configuración"
+
+#~ msgid "Shipped Qty"
+#~ msgstr "Ctdad enviada"
+
+#~ msgid "Adds commitment, requested and effective dates on Sales Orders."
+#~ msgstr ""
+#~ "Añade fechas de realización, solicitud y efectivo en pedidos de venta."
+
+#, python-format
+#~ msgid "Not enough stock !"
+#~ msgstr "¡No hay stock suficiente!"
+
+#~ msgid ""
+#~ "Allows you to group and invoice your delivery orders according to different "
+#~ "invoicing types: daily, weekly, etc."
+#~ msgstr ""
+#~ "Permite agrupar y facturar sus albaranes de acuerdo a diferentes tipos de "
+#~ "facturación: diaria, semanal, etc."
+
+#~ msgid "Picking Default Policy"
+#~ msgstr "Política de empaquetado por defecto"
+
+#~ msgid "Configure"
+#~ msgstr "Configurar"
+
+#~ msgid "Enhance your core Sales Application with additional functionalities."
+#~ msgstr "Optimizar su aplicación de ventas con funcionalidades adicionales."
+
+#~ msgid "Configure Sales Order Logistics"
+#~ msgstr "Configurar logística pedidos de venta"
+
+#~ msgid "Configure Your Sales Management Application"
+#~ msgstr "Configurar su aplicación de gestión de ventas"
+
+#~ msgid "Setup your sales workflow and default values."
+#~ msgstr "Configurar su flujo de ventas y valores por defecto."
+
+#, python-format
+#~ msgid ""
+#~ "You selected a quantity of %d Units.\n"
+#~ "But it's not compatible with the selected packaging.\n"
+#~ "Here is a proposition of quantities according to the packaging:\n"
+#~ "\n"
+#~ "EAN: %s Quantity: %s Type of ul: %s"
+#~ msgstr ""
+#~ "Ha seleccionado una cantidad de %d unidades.\n"
+#~ "Pero no es compatible con el embalaje seleccionado.\n"
+#~ "Aquí tiene una propuesta de cantidades acordes con este embalaje:\n"
+#~ "\n"
+#~ "EAN: %s Cantidad: %s Tipo de ul: %s"
+
+#~ msgid "Invoice On Order After Delivery"
+#~ msgstr "Facturar pedido después de envío"
+
+#, python-format
+#~ msgid "You cannot cancel a sales order line that has already been invoiced !"
+#~ msgstr ""
+#~ "¡No puede cancelar una línea de pedido de venta que ya ha sido facturada!"
+
+#~ msgid "Invoice From The Picking"
+#~ msgstr "Factura desde el albarán"
+
+#, python-format
+#~ msgid "Cannot delete a sales order line which is %s !"
+#~ msgstr "¡No se puede eliminar una línea de pedido de venta que está %s!"
+
+#~ msgid "Layout Sequence"
+#~ msgstr "Secuencia plantilla"
+
+#, python-format
+#~ msgid "Cannot delete Sales Order(s) which are already confirmed !"
+#~ msgstr "¡No se puede eliminar pedido(s) de venta que ya está confirmado!"
+
+#~ msgid "Steps To Deliver a Sales Order"
+#~ msgstr "Pasos para entregar un pedido de venta"
+
+#~ msgid "Order Reference must be unique !"
+#~ msgstr "¡La referencia del pedido debe ser única!"
+
+#~ msgid "Advance"
+#~ msgstr "Anticipo"
+
+#~ msgid ""
+#~ "The Shipping Policy is used to synchronise invoice and delivery operations.\n"
+#~ " - The 'Pay Before delivery' choice will first generate the invoice and "
+#~ "then generate the picking order after the payment of this invoice.\n"
+#~ " - The 'Shipping & Manual Invoice' will create the picking order directly "
+#~ "and wait for the user to manually click on the 'Invoice' button to generate "
+#~ "the draft invoice.\n"
+#~ " - The 'Invoice On Order After Delivery' choice will generate the draft "
+#~ "invoice based on sales order after all picking lists have been finished.\n"
+#~ " - The 'Invoice From The Picking' choice is used to create an invoice "
+#~ "during the picking process."
+#~ msgstr ""
+#~ "La política de envío se utiliza para sincronizar las operaciones de envío y "
+#~ "facturación.\n"
+#~ " -La opción 'Pagar antes del envío' primero generará la factura y más tarde "
+#~ "el albarán después del pago de dicha factura.\n"
+#~ " -La opción 'Envío y factura manual' creará el albarán directamente y "
+#~ "esperará a que un usuario haga clic manualemente sobre el botón 'Facturar' "
+#~ "para generar la factura en el estado borrador.\n"
+#~ " -La opción 'Facturar pedido después del envío' generará la factura en "
+#~ "estado borrador basándose en el pedido de venta después de que todas los "
+#~ "albaranes hayan sido realizados.\n"
+#~ " -La opción 'Facturar desde albarán' se utiliza para crear una factura "
+#~ "durante el proceso de preparación del pedido."
+
+#~ msgid ""
+#~ "\n"
+#~ " The base module to manage quotations and sales orders.\n"
+#~ "\n"
+#~ " * Workflow with validation steps:\n"
+#~ " - Quotation -> Sales order -> Invoice\n"
+#~ " * Invoicing methods:\n"
+#~ " - Invoice on order (before or after shipping)\n"
+#~ " - Invoice on delivery\n"
+#~ " - Invoice on timesheets\n"
+#~ " - Advance invoice\n"
+#~ " * Partners preferences (shipping, invoicing, incoterm, ...)\n"
+#~ " * Products stocks and prices\n"
+#~ " * Delivery methods:\n"
+#~ " - all at once, multi-parcel\n"
+#~ " - delivery costs\n"
+#~ " * Dashboard for salesman that includes:\n"
+#~ " * Your open quotations\n"
+#~ " * Top 10 sales of the month\n"
+#~ " * Cases statistics\n"
+#~ " * Graph of sales by product\n"
+#~ " * Graph of cases of the month\n"
+#~ " "
+#~ msgstr ""
+#~ "\n"
+#~ " El módulo base para gestionar presupuestos y pedidos de venta.\n"
+#~ "\n"
+#~ " * Flujo de trabajo con etapas de validación:\n"
+#~ " - Presupuesto -> Pedido de venta -> Factura\n"
+#~ " * Métodos de facturación:\n"
+#~ " - Factura del pedido (antes o después del envío)\n"
+#~ " - Factura del albarán\n"
+#~ " - Factura de la hoja de servicios\n"
+#~ " - Avanzar factura\n"
+#~ " * Preferencias de los clientes (envío, facturación, incoterm, ...)\n"
+#~ " * Existencias de los productos y precios\n"
+#~ " * Formas de envío:\n"
+#~ " - Todo a la vez, En varios paquetes\n"
+#~ " - Gastos de envío\n"
+#~ " * El tablero para el comercial incluye:\n"
+#~ " * Sus presupuestos abiertos\n"
+#~ " * Las 10 mejores ventas del mes\n"
+#~ " * Estadísticas de casos\n"
+#~ " * Gráfico de las ventas por producto\n"
+#~ " * Gráfico de los casos por mes\n"
+#~ " "
+
+#~ msgid ""
+#~ "Gives the state of the quotation or sales order. \n"
+#~ "The exception state is automatically set when a cancel operation occurs in "
+#~ "the invoice validation (Invoice Exception) or in the picking list process "
+#~ "(Shipping Exception). \n"
+#~ "The 'Waiting Schedule' state is set when the invoice is confirmed but "
+#~ "waiting for the scheduler to run on the date 'Ordered Date'."
+#~ msgstr ""
+#~ "Indica el estado del presupuesto o pedido de venta. \n"
+#~ "El estado de excepción se establece automáticamente cuando se produce una "
+#~ "operación de cancelación en la validación de factura (excepción de factura) "
+#~ "o en el procesado del albarán (excepción de envío). \n"
+#~ "El estado 'Esperando planificación' se establece cuando se confirma la "
+#~ "factura, pero está esperando que el planificador la active en la fecha de "
+#~ "\"Fecha pedido\"."
+
+#~ msgid "Ordered Date"
+#~ msgstr "Fecha pedido"
diff --git a/addons/sale/i18n/es_AR.po b/addons/sale/i18n/es_AR.po
index 459cf60bd97..d89746c2075 100644
--- a/addons/sale/i18n/es_AR.po
+++ b/addons/sale/i18n/es_AR.po
@@ -6,25 +6,32 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 5.0.0_rc3\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2011-01-11 11:16+0000\n"
+"POT-Creation-Date: 2011-12-22 18:43+0000\n"
"PO-Revision-Date: 2010-09-21 22:36+0000\n"
"Last-Translator: Margarita Manterola <ubuntu@marga.com.ar>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-05 05:17+0000\n"
-"X-Generator: Launchpad (build 14231)\n"
+"X-Launchpad-Export-Date: 2011-12-23 06:47+0000\n"
+"X-Generator: Launchpad (build 14560)\n"
#. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_sales_by_salesman
-msgid "Sales by Salesman in last 90 days"
+#: field:sale.config.picking_policy,timesheet:0
+msgid "Based on Timesheet"
msgstr ""
#. module: sale
-#: help:sale.installer,delivery:0
-msgid "Allows you to compute delivery costs on your quotations."
+#: view:sale.order.line:0
+msgid ""
+"Sale Order Lines that are confirmed, done or in exception state and haven't "
+"yet been invoiced"
+msgstr ""
+
+#. module: sale
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_sales_by_salesman
+msgid "Sales by Salesman in last 90 days"
msgstr ""
#. module: sale
@@ -37,6 +44,11 @@ msgstr ""
"envíos parciales?"
#. module: sale
+#: view:sale.order:0
+msgid "UoS"
+msgstr ""
+
+#. module: sale
#: help:sale.order,partner_shipping_id:0
msgid "Shipping address for current sales order."
msgstr ""
@@ -60,22 +72,12 @@ msgid "Cancel Order"
msgstr "Cancelar orden"
#. module: sale
-#: view:sale.config.picking_policy:0
-msgid "Configure Sales Order Logistics"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:603
+#: code:addons/sale/sale.py:638
#, python-format
msgid "The quotation '%s' has been converted to a sales order."
msgstr ""
#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Payment Before Delivery"
-msgstr "Pago antes de la entrega"
-
-#. module: sale
#: code:addons/sale/wizard/sale_make_invoice.py:42
#, python-format
msgid "Warning !"
@@ -92,12 +94,6 @@ msgid "Drives procurement orders for every sales order line."
msgstr ""
#. module: sale
-#: selection:sale.config.picking_policy,picking_policy:0
-msgid "All at Once"
-msgstr "Todo a la vez"
-
-#. module: sale
-#: field:sale.order,project_id:0
#: view:sale.report:0
#: field:sale.report,analytic_account_id:0
#: field:sale.shop,project_id:0
@@ -113,6 +109,15 @@ msgid ""
msgstr ""
#. module: sale
+#: code:addons/sale/sale.py:295
+#, python-format
+msgid ""
+"In order to delete a confirmed sale order, you must cancel it before ! To "
+"cancel a sale order, you must first cancel related picking or delivery "
+"orders."
+msgstr ""
+
+#. module: sale
#: model:process.node,name:sale.process_node_saleprocurement0
msgid "Procurement Order"
msgstr ""
@@ -124,6 +129,11 @@ msgid "Partner"
msgstr ""
#. module: sale
+#: selection:sale.order,order_policy:0
+msgid "Invoice based on deliveries"
+msgstr ""
+
+#. module: sale
#: view:sale.order:0
msgid "Order Line"
msgstr "Línea de la orden"
@@ -156,8 +166,13 @@ msgid "Default Payment Term"
msgstr "Término de pago predeterminado"
#. module: sale
-#: model:ir.actions.act_window,name:sale.action_config_picking_policy
-msgid "Configure Picking Policy for Sales Order"
+#: field:sale.config.picking_policy,deli_orders:0
+msgid "Based on Delivery Orders"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.picking_policy,time_unit:0
+msgid "Main Working Time Unit"
msgstr ""
#. module: sale
@@ -174,9 +189,10 @@ msgid "Disc.(%)"
msgstr "Desc.(%)"
#. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_forceassignation0
-msgid "Force Assignation"
-msgstr "Forzar asignación"
+#: view:sale.report:0
+#: field:sale.report,price_total:0
+msgid "Total Price"
+msgstr "Precio total"
#. module: sale
#: help:sale.make.invoice,grouped:0
@@ -184,6 +200,11 @@ msgid "Check the box to group the invoices for the same customers"
msgstr ""
#. module: sale
+#: view:sale.order:0
+msgid "My Sale Orders"
+msgstr ""
+
+#. module: sale
#: selection:sale.order,invoice_quantity:0
msgid "Ordered Quantities"
msgstr "Cantidades ordenadas"
@@ -222,13 +243,24 @@ msgid ""
msgstr ""
#. module: sale
+#: field:sale.config.picking_policy,task_work:0
+msgid "Based on Tasks' Work"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
+msgid "Quotations and Sales"
+msgstr ""
+
+#. module: sale
#: model:ir.model,name:sale.model_sale_make_invoice
msgid "Sales Make Invoice"
msgstr ""
#. module: sale
-#: view:sale.order:0
-msgid "Recreate Packing"
+#: code:addons/sale/sale.py:330
+#, python-format
+msgid "Pricelist Warning!"
msgstr ""
#. module: sale
@@ -237,10 +269,10 @@ msgid "Discount (%)"
msgstr "Descuento (%)"
#. module: sale
-#: help:res.company,security_lead:0
-msgid ""
-"This is the days added to what you promise to customers for security purpose"
-msgstr ""
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_quotation_for_sale
+msgid "My Quotations"
+msgstr "Mis cotizaciones"
#. module: sale
#: view:board.board:0
@@ -265,7 +297,22 @@ msgid "Shop Name"
msgstr "Nombre de sucursal"
#. module: sale
-#: code:addons/sale/sale.py:1014
+#: help:sale.order,order_policy:0
+msgid ""
+"The Invoice Policy is used to synchronise invoice and delivery operations.\n"
+" - The 'Pay before delivery' choice will first generate the invoice and "
+"then generate the picking order after the payment of this invoice.\n"
+" - The 'Deliver & Invoice on demand' will create the picking order directly "
+"and wait for the user to manually click on the 'Invoice' button to generate "
+"the draft invoice based on the sale order or the sale order lines.\n"
+" - The 'Invoice on order after delivery' choice will generate the draft "
+"invoice based on sales order after all picking lists have been finished.\n"
+" - The 'Invoice based on deliveries' choice is used to create an invoice "
+"during the picking process."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:1158
#, python-format
msgid "No Customer Defined !"
msgstr "¡No se ha definido un cliente!"
@@ -276,9 +323,12 @@ msgid "Sales in Exception"
msgstr "Ventas en excepción"
#. module: sale
-#: view:sale.order:0
-msgid "Set to Draft"
-msgstr "Establecer como borrador"
+#: code:addons/sale/sale.py:1145
+#: code:addons/sale/sale.py:1264
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:70
+#, python-format
+msgid "Configuration Error !"
+msgstr ""
#. module: sale
#: view:sale.order:0
@@ -286,22 +336,7 @@ msgid "Conditions"
msgstr ""
#. module: sale
-#: help:sale.order,order_policy:0
-msgid ""
-"The Shipping Policy is used to synchronise invoice and delivery operations.\n"
-" - The 'Pay Before delivery' choice will first generate the invoice and "
-"then generate the picking order after the payment of this invoice.\n"
-" - The 'Shipping & Manual Invoice' will create the picking order directly "
-"and wait for the user to manually click on the 'Invoice' button to generate "
-"the draft invoice.\n"
-" - The 'Invoice On Order After Delivery' choice will generate the draft "
-"invoice based on sales order after all picking lists have been finished.\n"
-" - The 'Invoice From The Picking' choice is used to create an invoice "
-"during the picking process."
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:939
+#: code:addons/sale/sale.py:1034
#, python-format
msgid ""
"There is no income category account defined in default Properties for "
@@ -309,8 +344,8 @@ msgid ""
msgstr ""
#. module: sale
-#: view:sale.installer:0
-msgid "Configure"
+#: selection:sale.report,month:0
+msgid "August"
msgstr ""
#. module: sale
@@ -319,7 +354,7 @@ msgid "You try to assign a lot which is not from the same product"
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:620
+#: code:addons/sale/sale.py:655
#, python-format
msgid "invalid mode for test_state"
msgstr "Modo no válido para test_state"
@@ -330,7 +365,7 @@ msgid "June"
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:584
+#: code:addons/sale/sale.py:617
#, python-format
msgid "Could not cancel this sales order !"
msgstr ""
@@ -351,8 +386,12 @@ msgid "October"
msgstr ""
#. module: sale
+#: sql_constraint:stock.picking:0
+msgid "Reference must be unique per Company!"
+msgstr ""
+
+#. module: sale
#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_quotation_for_sale
#: view:sale.order:0
#: view:sale.report:0
msgid "Quotations"
@@ -364,11 +403,6 @@ msgid "Pricelist for current sales order."
msgstr ""
#. module: sale
-#: selection:sale.config.picking_policy,step:0
-msgid "Delivery Order Only"
-msgstr "Sólo orden de entrega"
-
-#. module: sale
#: report:sale.order:0
msgid "TVA :"
msgstr "IVA :"
@@ -393,6 +427,7 @@ msgstr "Posición fiscal"
#. module: sale
#: view:sale.order:0
#: view:sale.order.line:0
+#: field:sale.report,product_uom:0
msgid "UoM"
msgstr "UdM"
@@ -415,13 +450,19 @@ msgid ""
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:971
+#: code:addons/sale/sale.py:1061
+#, python-format
+msgid "You cannot cancel a sale order line that has already been invoiced!"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:1066
#, python-format
msgid "You must first cancel stock moves attached to this sales order line."
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:1042
+#: code:addons/sale/sale.py:1134
#, python-format
msgid "(n/a)"
msgstr ""
@@ -455,13 +496,35 @@ msgid "Notes"
msgstr "Notas"
#. module: sale
+#: sql_constraint:res.company:0
+msgid "The company name must be unique !"
+msgstr ""
+
+#. module: sale
#: help:sale.order,partner_invoice_id:0
msgid "Invoice address for current sales order."
msgstr ""
#. module: sale
-#: view:sale.installer:0
-msgid "Enhance your core Sales Application with additional functionalities."
+#: view:sale.report:0
+msgid "Month-1"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered month of the sales order"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:504
+#, python-format
+msgid ""
+"You cannot group sales having different currencies for the same partner."
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,picking_policy:0
+msgid "Deliver each product when available"
msgstr ""
#. module: sale
@@ -481,18 +544,40 @@ msgid "Confirmation Date"
msgstr ""
#. module: sale
+#: field:sale.order,incoterm:0
+msgid "Incoterm"
+msgstr "Incoterm"
+
+#. module: sale
#: field:sale.order.line,address_allotment_id:0
msgid "Allotment Partner"
msgstr "Partner de Distribución"
#. module: sale
-#: sql_constraint:sale.order:0
-msgid "Order Reference must be unique !"
+#: selection:sale.report,month:0
+msgid "March"
msgstr ""
#. module: sale
-#: selection:sale.report,month:0
-msgid "March"
+#: constraint:stock.move:0
+msgid "You can not move products from or to a location of the type view."
+msgstr ""
+
+#. module: sale
+#: field:sale.config.picking_policy,sale_orders:0
+msgid "Based on Sales Orders"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,state:0
+msgid ""
+"Givwizard = self.browse(cr, uid, ids)[0]es the state of the quotation or "
+"sales order. \n"
+"The exception state is automatically set when a cancel operation occurs in "
+"the invoice validation (Invoice Exception) or in the picking list process "
+"(Shipping Exception). \n"
+"The 'Waiting Schedule' state is set when the invoice is confirmed but "
+"waiting for the scheduler to run on the order date."
msgstr ""
#. module: sale
@@ -511,6 +596,11 @@ msgid "Invoice address :"
msgstr "Domicilio de facturación :"
#. module: sale
+#: field:sale.order.line,sequence:0
+msgid "Line Sequence"
+msgstr ""
+
+#. module: sale
#: model:process.transition,note:sale.process_transition_saleorderprocurement0
msgid ""
"For every sales order line, a procurement order is created to supply the "
@@ -557,11 +647,6 @@ msgid "Sales Order Line"
msgstr ""
#. module: sale
-#: view:sale.config.picking_policy:0
-msgid "Setup your sales workflow and default values."
-msgstr ""
-
-#. module: sale
#: field:sale.shop,warehouse_id:0
msgid "Warehouse"
msgstr "Almacén"
@@ -598,6 +683,11 @@ msgid "Creation Date"
msgstr ""
#. module: sale
+#: model:ir.ui.menu,name:sale.menu_sales_configuration_misc
+msgid "Miscellaneous"
+msgstr ""
+
+#. module: sale
#: model:ir.actions.act_window,name:sale.action_order_line_tree3
msgid "Uninvoiced and Delivered Lines"
msgstr "Líneas no facturadas y entregadas"
@@ -613,14 +703,19 @@ msgid "My Sales"
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:290
-#: code:addons/sale/sale.py:966
-#: code:addons/sale/sale.py:1165
+#: code:addons/sale/sale.py:295
+#: code:addons/sale/sale.py:1061
+#: code:addons/sale/sale.py:1290
#, python-format
msgid "Invalid action !"
msgstr "Acción no válida !"
#. module: sale
+#: view:sale.order:0
+msgid "Extra Info"
+msgstr "Información extra"
+
+#. module: sale
#: field:sale.order,pricelist_id:0
#: field:sale.report,pricelist_id:0
#: field:sale.shop,pricelist_id:0
@@ -634,13 +729,21 @@ msgid "# of Qty"
msgstr ""
#. module: sale
+#: code:addons/sale/sale.py:1314
+#, python-format
+msgid "Hour"
+msgstr ""
+
+#. module: sale
#: view:sale.order:0
msgid "Order Date"
msgstr ""
#. module: sale
#: view:sale.order.line:0
+#: view:sale.report:0
#: field:sale.report,shipped:0
+#: field:sale.report,shipped_qty_1:0
msgid "Shipped"
msgstr ""
@@ -650,8 +753,8 @@ msgid "All Quotations"
msgstr "Todos las cotizaciones"
#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Invoice On Order After Delivery"
+#: view:sale.config.picking_policy:0
+msgid "Options"
msgstr ""
#. module: sale
@@ -660,6 +763,20 @@ msgid "September"
msgstr ""
#. module: sale
+#: code:addons/sale/sale.py:632
+#, python-format
+msgid "You cannot confirm a sale order which has no line."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:1246
+#, python-format
+msgid ""
+"You have to select a pricelist or a customer in the sales form !\n"
+"Please set one before choosing a product."
+msgstr ""
+
+#. module: sale
#: view:sale.report:0
#: field:sale.report,categ_id:0
msgid "Category of Product"
@@ -676,11 +793,6 @@ msgid "Stock Moves"
msgstr "Movimientos de stock"
#. module: sale
-#: view:sale.report:0
-msgid " Year "
-msgstr ""
-
-#. module: sale
#: field:sale.order,state:0
#: field:sale.report,state:0
msgid "Order State"
@@ -698,7 +810,7 @@ msgid "Sales By Month"
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:970
+#: code:addons/sale/sale.py:1065
#, python-format
msgid "Could not cancel sales order line!"
msgstr ""
@@ -731,42 +843,19 @@ msgid ""
msgstr ""
#. module: sale
-#: view:sale.report:0
-msgid "Extended Filters..."
+#: field:sale.order,date_order:0
+msgid "Date"
msgstr ""
#. module: sale
-#: model:ir.module.module,description:sale.module_meta_information
-msgid ""
-"\n"
-" The base module to manage quotations and sales orders.\n"
-"\n"
-" * Workflow with validation steps:\n"
-" - Quotation -> Sales order -> Invoice\n"
-" * Invoicing methods:\n"
-" - Invoice on order (before or after shipping)\n"
-" - Invoice on delivery\n"
-" - Invoice on timesheets\n"
-" - Advance invoice\n"
-" * Partners preferences (shipping, invoicing, incoterm, ...)\n"
-" * Products stocks and prices\n"
-" * Delivery methods:\n"
-" - all at once, multi-parcel\n"
-" - delivery costs\n"
-" * Dashboard for salesman that includes:\n"
-" * Your open quotations\n"
-" * Top 10 sales of the month\n"
-" * Cases statistics\n"
-" * Graph of sales by product\n"
-" * Graph of cases of the month\n"
-" "
+#: view:sale.report:0
+msgid "Extended Filters..."
msgstr ""
#. module: sale
-#: model:ir.model,name:sale.model_sale_shop
-#: view:sale.shop:0
-msgid "Sales Shop"
-msgstr ""
+#: selection:sale.order.line,state:0
+msgid "Exception"
+msgstr "Excepción"
#. module: sale
#: model:ir.model,name:sale.model_res_company
@@ -774,8 +863,9 @@ msgid "Companies"
msgstr ""
#. module: sale
-#: selection:sale.report,month:0
-msgid "November"
+#: code:addons/sale/sale.py:1259
+#, python-format
+msgid "No valid pricelist line found ! :"
msgstr ""
#. module: sale
@@ -784,8 +874,8 @@ msgid "History"
msgstr "Historial"
#. module: sale
-#: field:sale.config.picking_policy,picking_policy:0
-msgid "Picking Default Policy"
+#: selection:sale.order,order_policy:0
+msgid "Invoice on order after delivery"
msgstr ""
#. module: sale
@@ -808,13 +898,12 @@ msgid ""
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:966
-#, python-format
-msgid "You cannot cancel a sales order line that has already been invoiced !"
+#: help:res.company,security_lead:0
+msgid ""
+"This is the days added to what you promise to customers for security purpose"
msgstr ""
#. module: sale
-#: view:sale.order:0
#: view:sale.order.line:0
msgid "Qty"
msgstr "Ctd"
@@ -825,6 +914,11 @@ msgid "References"
msgstr ""
#. module: sale
+#: view:sale.order.line:0
+msgid "My Sales Order Lines"
+msgstr ""
+
+#. module: sale
#: model:process.transition.action,name:sale.process_transition_action_cancel0
#: model:process.transition.action,name:sale.process_transition_action_cancel1
#: model:process.transition.action,name:sale.process_transition_action_cancel2
@@ -836,16 +930,11 @@ msgid "Cancel"
msgstr "Cancelar"
#. module: sale
-#: field:sale.installer,sale_order_dates:0
-msgid "Sales Order Dates"
+#: sql_constraint:sale.order:0
+msgid "Order Reference must be unique per Company!"
msgstr ""
#. module: sale
-#: selection:sale.order.line,state:0
-msgid "Exception"
-msgstr "Excepción"
-
-#. module: sale
#: model:process.transition,name:sale.process_transition_invoice0
#: model:process.transition,name:sale.process_transition_invoiceafterdelivery0
#: model:process.transition.action,name:sale.process_transition_action_createinvoice0
@@ -855,19 +944,19 @@ msgid "Create Invoice"
msgstr "Crear factura"
#. module: sale
-#: field:sale.installer,sale_margin:0
-msgid "Margins in Sales Orders"
+#: view:sale.order:0
+msgid "Total Tax Excluded"
msgstr ""
#. module: sale
-#: view:sale.order:0
-msgid "Total Tax Excluded"
+#: view:sale.order.line:0
+msgid "Order reference"
msgstr ""
#. module: sale
-#: view:sale.order:0
-msgid "Compute"
-msgstr "Calcular"
+#: view:sale.open.invoice:0
+msgid "You invoice has been successfully created!"
+msgstr ""
#. module: sale
#: view:sale.report:0
@@ -886,23 +975,20 @@ msgid "Open Invoice"
msgstr ""
#. module: sale
-#: report:sale.order:0
-#: view:sale.order.line:0
-msgid "Price"
-msgstr "Precio"
+#: model:ir.actions.server,name:sale.ir_actions_server_edi_sale
+msgid "Auto-email confirmed sale orders"
+msgstr ""
#. module: sale
-#: model:ir.actions.act_window,name:sale.action_sale_installer
-#: view:sale.config.picking_policy:0
-#: view:sale.installer:0
-msgid "Sales Application Configuration"
+#: code:addons/sale/sale.py:413
+#, python-format
+msgid "There is no sales journal defined for this company: \"%s\" (id:%d)"
msgstr ""
#. module: sale
-#: view:sale.report:0
-#: field:sale.report,price_total:0
-msgid "Total Price"
-msgstr "Precio total"
+#: model:process.transition.action,name:sale.process_transition_action_forceassignation0
+msgid "Force Assignation"
+msgstr "Forzar asignación"
#. module: sale
#: selection:sale.order.line,type:0
@@ -915,6 +1001,11 @@ msgid "Based on the shipped or on the ordered quantities."
msgstr ""
#. module: sale
+#: selection:sale.order,picking_policy:0
+msgid "Deliver all products at once"
+msgstr ""
+
+#. module: sale
#: field:sale.order,picking_ids:0
msgid "Related Picking"
msgstr ""
@@ -946,8 +1037,14 @@ msgid "Create Delivery Order"
msgstr ""
#. module: sale
-#: field:sale.installer,delivery:0
-msgid "Delivery Costs"
+#: code:addons/sale/sale.py:1290
+#, python-format
+msgid "Cannot delete a sales order line which is in state '%s'!"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Qty(UoS)"
msgstr ""
#. module: sale
@@ -962,13 +1059,13 @@ msgstr ""
#. module: sale
#: view:sale.report:0
-msgid "Sales by Product Category"
+msgid "Ordered date of the sales order"
msgstr ""
#. module: sale
-#: selection:sale.order,picking_policy:0
-msgid "Partial Delivery"
-msgstr "Entrega parcial"
+#: view:sale.report:0
+msgid "Sales by Product Category"
+msgstr ""
#. module: sale
#: model:process.transition,name:sale.process_transition_confirmquotation0
@@ -976,9 +1073,10 @@ msgid "Confirm Quotation"
msgstr "Confirmar cotización"
#. module: sale
-#: help:sale.order,origin:0
-msgid "Reference of the document that generated this sales order request."
-msgstr ""
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:63
+#, python-format
+msgid "Error"
+msgstr "Error"
#. module: sale
#: view:sale.order:0
@@ -1010,20 +1108,14 @@ msgid "Procurement Method"
msgstr ""
#. module: sale
-#: view:sale.config.picking_policy:0
-#: view:sale.installer:0
-msgid "title"
-msgstr ""
-
-#. module: sale
#: model:process.node,name:sale.process_node_packinglist0
msgid "Pick List"
msgstr ""
#. module: sale
#: view:sale.order:0
-msgid "Order date"
-msgstr ""
+msgid "Set to Draft"
+msgstr "Establecer como borrador"
#. module: sale
#: model:process.node,note:sale.process_node_packinglist0
@@ -1031,6 +1123,85 @@ msgid "Document of the move to the output or to the customer."
msgstr ""
#. module: sale
+#: model:email.template,body_text:sale.email_template_edi_sale
+msgid ""
+"\n"
+"Hello${object.partner_order_id.name and ' ' or "
+"''}${object.partner_order_id.name or ''},\n"
+"\n"
+"Here is your order confirmation for ${object.partner_id.name}:\n"
+" | Order number: *${object.name}*\n"
+" | Order total: *${object.amount_total} "
+"${object.pricelist_id.currency_id.name}*\n"
+" | Order date: ${object.date_order}\n"
+" % if object.origin:\n"
+" | Order reference: ${object.origin}\n"
+" % endif\n"
+" % if object.client_order_ref:\n"
+" | Your reference: ${object.client_order_ref}<br />\n"
+" % endif\n"
+" | Your contact: ${object.user_id.name} ${object.user_id.user_email "
+"and '<%s>'%(object.user_id.user_email) or ''}\n"
+"\n"
+"You can view the order confirmation, download it and even pay online using "
+"the following link:\n"
+" ${ctx.get('edi_web_url_view') or 'n/a'}\n"
+"\n"
+"% if object.order_policy in ('prepaid','manual') and "
+"object.company_id.paypal_account:\n"
+"<% \n"
+"comp_name = quote(object.company_id.name)\n"
+"order_name = quote(object.name)\n"
+"paypal_account = quote(object.company_id.paypal_account)\n"
+"order_amount = quote(str(object.amount_total))\n"
+"cur_name = quote(object.pricelist_id.currency_id.name)\n"
+"paypal_url = \"https://www.paypal.com/cgi-"
+"bin/webscr?cmd=_xclick&business=%s&item_name=%s%%20Order%%20%s&invoice=%s&amo"
+"unt=%s\" \\\n"
+" "
+"\"&currency_code=%s&button_subtype=services&no_note=1&bn=OpenERP_Order_PayNow"
+"_%s\" % \\\n"
+" "
+"(paypal_account,comp_name,order_name,order_name,order_amount,cur_name,cur_nam"
+"e)\n"
+"%>\n"
+"It is also possible to directly pay with Paypal:\n"
+" ${paypal_url}\n"
+"% endif\n"
+"\n"
+"If you have any question, do not hesitate to contact us.\n"
+"\n"
+"\n"
+"Thank you for choosing ${object.company_id.name}!\n"
+"\n"
+"\n"
+"--\n"
+"${object.user_id.name} ${object.user_id.user_email and "
+"'<%s>'%(object.user_id.user_email) or ''}\n"
+"${object.company_id.name}\n"
+"% if object.company_id.street:\n"
+"${object.company_id.street or ''}\n"
+"% endif\n"
+"% if object.company_id.street2:\n"
+"${object.company_id.street2}\n"
+"% endif\n"
+"% if object.company_id.city or object.company_id.zip:\n"
+"${object.company_id.zip or ''} ${object.company_id.city or ''}\n"
+"% endif\n"
+"% if object.company_id.country_id:\n"
+"${object.company_id.state_id and ('%s, ' % object.company_id.state_id.name) "
+"or ''} ${object.company_id.country_id.name or ''}\n"
+"% endif\n"
+"% if object.company_id.phone:\n"
+"Phone: ${object.company_id.phone}\n"
+"% endif\n"
+"% if object.company_id.website:\n"
+"${object.company_id.website or ''}\n"
+"% endif\n"
+" "
+msgstr ""
+
+#. module: sale
#: model:process.transition.action,name:sale.process_transition_action_validate0
msgid "Validate"
msgstr "Validar"
@@ -1053,9 +1224,9 @@ msgid "Taxes"
msgstr "Impuestos"
#. module: sale
-#: field:sale.order,order_policy:0
-msgid "Shipping Policy"
-msgstr "Política de Envío"
+#: view:sale.order:0
+msgid "Sales Order ready to be invoiced"
+msgstr ""
#. module: sale
#: help:sale.order,create_date:0
@@ -1074,9 +1245,9 @@ msgid "Create Invoices"
msgstr ""
#. module: sale
-#: view:sale.order:0
-msgid "Extra Info"
-msgstr "Información extra"
+#: view:sale.report:0
+msgid "Sales order created in current month"
+msgstr ""
#. module: sale
#: report:sale.order:0
@@ -1084,11 +1255,24 @@ msgid "Fax :"
msgstr "Fax :"
#. module: sale
+#: help:sale.order.line,type:0
+msgid ""
+"If 'on order', it triggers a procurement when the sale order is confirmed to "
+"create a task, purchase order or manufacturing order linked to this sale "
+"order line."
+msgstr ""
+
+#. module: sale
#: field:sale.advance.payment.inv,amount:0
msgid "Advance Amount"
msgstr ""
#. module: sale
+#: field:sale.config.picking_policy,charge_delivery:0
+msgid "Do you charge the delivery?"
+msgstr ""
+
+#. module: sale
#: selection:sale.order,invoice_quantity:0
msgid "Shipped Quantities"
msgstr "Cantidades enviadas"
@@ -1099,25 +1283,45 @@ msgid "Invoice Based on Sales Orders"
msgstr "Factura basada en órdenes de venta"
#. module: sale
+#: code:addons/sale/sale.py:331
+#, python-format
+msgid ""
+"If you change the pricelist of this order (and eventually the currency), "
+"prices of existing order lines will not be updated."
+msgstr ""
+
+#. module: sale
#: model:ir.model,name:sale.model_stock_picking
msgid "Picking List"
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:387
-#: code:addons/sale/sale.py:920
-#: code:addons/sale/sale.py:938
+#: code:addons/sale/sale.py:412
+#: code:addons/sale/sale.py:503
+#: code:addons/sale/sale.py:632
+#: code:addons/sale/sale.py:1015
+#: code:addons/sale/sale.py:1033
#, python-format
msgid "Error !"
msgstr "Error !"
#. module: sale
-#: code:addons/sale/sale.py:570
+#: code:addons/sale/sale.py:603
#, python-format
msgid "Could not cancel sales order !"
msgstr ""
#. module: sale
+#: view:sale.order:0
+msgid "Qty(UoM)"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered Year of the sales order"
+msgstr ""
+
+#. module: sale
#: selection:sale.report,month:0
msgid "July"
msgstr ""
@@ -1134,35 +1338,25 @@ msgid "Shipping Exception"
msgstr "Excepción de Envío"
#. module: sale
-#: field:sale.make.invoice,grouped:0
-msgid "Group the invoices"
-msgstr "Agrupar las facturas"
-
-#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Shipping & Manual Invoice"
-msgstr "Envío & Factura manual"
-
-#. module: sale
-#: code:addons/sale/sale.py:1051
+#: code:addons/sale/sale.py:1143
#, python-format
-msgid "Picking Information !"
+msgid "Picking Information ! : "
msgstr ""
#. module: sale
-#: view:sale.report:0
-#: field:sale.report,month:0
-msgid "Month"
-msgstr "Mes"
+#: field:sale.make.invoice,grouped:0
+msgid "Group the invoices"
+msgstr "Agrupar las facturas"
#. module: sale
-#: model:ir.module.module,shortdesc:sale.module_meta_information
-msgid "Sales Management"
-msgstr "Gestión de ventas"
+#: field:sale.order,order_policy:0
+msgid "Invoice Policy"
+msgstr ""
#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Invoice From The Picking"
+#: model:ir.actions.act_window,name:sale.action_config_picking_policy
+#: view:sale.config.picking_policy:0
+msgid "Setup your Invoicing Method"
msgstr ""
#. module: sale
@@ -1172,27 +1366,30 @@ msgstr ""
#. module: sale
#: view:sale.report:0
-#: field:sale.report,uom_name:0
msgid "Reference UoM"
msgstr ""
#. module: sale
+#: view:sale.config.picking_policy:0
+msgid ""
+"This tool will help you to install the right module and configure the system "
+"according to the method you use to invoice your customers."
+msgstr ""
+
+#. module: sale
#: model:ir.model,name:sale.model_sale_order_line_make_invoice
msgid "Sale OrderLine Make_invoice"
msgstr ""
#. module: sale
-#: help:sale.config.picking_policy,step:0
-msgid ""
-"By default, OpenERP is able to manage complex routing and paths of products "
-"in your warehouse and partner locations. This will configure the most common "
-"and simple methods to deliver products to the customer in one or two "
-"operations by the worker."
-msgstr ""
+#: selection:sale.order,state:0
+#: selection:sale.report,state:0
+msgid "Invoice Exception"
+msgstr "Excepción de factura"
#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_tree
-msgid "Old Quotations"
+#: model:process.node,note:sale.process_node_saleorder0
+msgid "Drives procurement and invoicing"
msgstr ""
#. module: sale
@@ -1208,6 +1405,22 @@ msgid "Sales Analysis"
msgstr ""
#. module: sale
+#: code:addons/sale/sale.py:1138
+#, python-format
+msgid ""
+"You selected a quantity of %d Units.\n"
+"But it's not compatible with the selected packaging.\n"
+"Here is a proposition of quantities according to the packaging:\n"
+"EAN: %s Quantity: %s Type of ul: %s"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Recreate Packing"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
#: field:sale.order.line,property_ids:0
msgid "Properties"
msgstr "Propiedades"
@@ -1234,7 +1447,17 @@ msgid ""
msgstr ""
#. module: sale
-#: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
+#: view:sale.order.line:0
+msgid "Confirmed sale order lines, not yet delivered"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:473
+#, python-format
+msgid "Customer Invoices"
+msgstr ""
+
+#. module: sale
#: model:process.process,name:sale.process_process_salesprocess0
#: view:sale.order:0
#: view:sale.report:0
@@ -1256,18 +1479,13 @@ msgid "Done"
msgstr "Realizada"
#. module: sale
-#: model:ir.model,name:sale.model_sale_installer
-msgid "sale.installer"
-msgstr ""
-
-#. module: sale
#: model:process.node,name:sale.process_node_invoice0
#: model:process.node,name:sale.process_node_invoiceafterdelivery0
msgid "Invoice"
msgstr "Factura"
#. module: sale
-#: code:addons/sale/sale.py:1014
+#: code:addons/sale/sale.py:1158
#, python-format
msgid ""
"You have to select a customer in the sales form !\n"
@@ -1275,11 +1493,6 @@ msgid ""
msgstr ""
#. module: sale
-#: selection:sale.config.picking_policy,step:0
-msgid "Picking List & Delivery Order"
-msgstr ""
-
-#. module: sale
#: field:sale.order,origin:0
msgid "Source Document"
msgstr ""
@@ -1305,7 +1518,7 @@ msgid "The amount without tax."
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:571
+#: code:addons/sale/sale.py:604
#, python-format
msgid "You must first cancel all picking attached to this sales order."
msgstr ""
@@ -1316,9 +1529,15 @@ msgid "Sales Advance Payment Invoice"
msgstr ""
#. module: sale
-#: field:sale.order,incoterm:0
-msgid "Incoterm"
-msgstr "Incoterm"
+#: view:sale.report:0
+#: field:sale.report,month:0
+msgid "Month"
+msgstr "Mes"
+
+#. module: sale
+#: model:email.template,subject:sale.email_template_edi_sale
+msgid "${object.company_id.name} Order (Ref ${object.name or 'n/a' })"
+msgstr ""
#. module: sale
#: view:sale.order.line:0
@@ -1329,11 +1548,6 @@ msgid "Product"
msgstr "Producto"
#. module: sale
-#: model:ir.ui.menu,name:sale.menu_invoiced
-msgid "Invoicing"
-msgstr ""
-
-#. module: sale
#: model:process.transition.action,name:sale.process_transition_action_cancelassignation0
msgid "Cancel Assignation"
msgstr "Cancelar asignación"
@@ -1344,14 +1558,10 @@ msgid "sale.config.picking_policy"
msgstr "sale.config.picking_policy"
#. module: sale
-#: help:sale.order,state:0
-msgid ""
-"Gives the state of the quotation or sales order. \n"
-"The exception state is automatically set when a cancel operation occurs in "
-"the invoice validation (Invoice Exception) or in the picking list process "
-"(Shipping Exception). \n"
-"The 'Waiting Schedule' state is set when the invoice is confirmed but "
-"waiting for the scheduler to run on the date 'Ordered Date'."
+#: view:account.invoice.report:0
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_turnover_by_month
+msgid "Monthly Turnover"
msgstr ""
#. module: sale
@@ -1370,7 +1580,6 @@ msgid "Product UoS"
msgstr "UdV del producto"
#. module: sale
-#: selection:sale.order,state:0
#: selection:sale.report,state:0
msgid "Manual In Progress"
msgstr "Manual en proceso"
@@ -1391,7 +1600,8 @@ msgid "Order"
msgstr "Orden"
#. module: sale
-#: code:addons/sale/sale.py:921
+#: code:addons/sale/sale.py:1016
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:71
#, python-format
msgid "There is no income account defined for this product: \"%s\" (id:%d)"
msgstr ""
@@ -1411,7 +1621,7 @@ msgid ""
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:1116
+#: code:addons/sale/sale.py:1238
#, python-format
msgid ""
"You plan to sell %.2f %s but you only have %.2f %s available !\n"
@@ -1440,10 +1650,10 @@ msgid "Total"
msgstr "Total"
#. module: sale
-#: code:addons/sale/sale.py:388
-#, python-format
-msgid "There is no sales journal defined for this company: \"%s\" (id:%d)"
-msgstr ""
+#: report:sale.order:0
+#: view:sale.order.line:0
+msgid "Price"
+msgstr "Precio"
#. module: sale
#: model:process.transition,note:sale.process_transition_deliver0
@@ -1454,9 +1664,14 @@ msgid ""
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:1165
-#, python-format
-msgid "Cannot delete a sales order line which is %s !"
+#: selection:sale.order,order_policy:0
+msgid "Pay before delivery"
+msgstr ""
+
+#. module: sale
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.open_board_sales
+msgid "Sales Dashboard"
msgstr ""
#. module: sale
@@ -1468,6 +1683,7 @@ msgstr ""
#. module: sale
#: view:sale.order:0
+#: selection:sale.order,state:0
#: view:sale.order.line:0
msgid "To Invoice"
msgstr ""
@@ -1478,6 +1694,11 @@ msgid "Date on which sales order is confirmed."
msgstr ""
#. module: sale
+#: field:sale.order,project_id:0
+msgid "Contract/Analytic Account"
+msgstr ""
+
+#. module: sale
#: field:sale.order,company_id:0
#: field:sale.order.line,company_id:0
#: view:sale.report:0
@@ -1497,22 +1718,17 @@ msgid "The amount to be invoiced in advance."
msgstr ""
#. module: sale
-#: selection:sale.order,state:0
-#: selection:sale.report,state:0
-msgid "Invoice Exception"
-msgstr "Excepción de factura"
-
-#. module: sale
-#: help:sale.order,picking_ids:0
+#: code:addons/sale/sale.py:1256
+#, python-format
msgid ""
-"This is a list of picking that has been generated for this sales order."
+"Couldn't find a pricelist line matching this product and quantity.\n"
+"You have to change either the product, the quantity or the pricelist."
msgstr ""
#. module: sale
-#: help:sale.installer,sale_margin:0
+#: help:sale.order,picking_ids:0
msgid ""
-"Gives the margin of profitability by calculating the difference between Unit "
-"Price and Cost Price."
+"This is a list of picking that has been generated for this sales order."
msgstr ""
#. module: sale
@@ -1534,6 +1750,11 @@ msgid "Cancelled"
msgstr "Cancelada"
#. module: sale
+#: view:sale.order.line:0
+msgid "Sales Order Lines related to a Sales Order of mine"
+msgstr ""
+
+#. module: sale
#: model:ir.actions.act_window,name:sale.action_shop_form
#: model:ir.ui.menu,name:sale.menu_action_shop_form
#: field:sale.order,shop_id:0
@@ -1543,17 +1764,12 @@ msgid "Shop"
msgstr "Sucursal"
#. module: sale
-#: view:sale.report:0
-msgid " Month "
-msgstr ""
-
-#. module: sale
#: field:sale.report,date_confirm:0
msgid "Date Confirm"
msgstr ""
#. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:111
+#: code:addons/sale/wizard/sale_line_invoice.py:113
#, python-format
msgid "Warning"
msgstr ""
@@ -1565,17 +1781,6 @@ msgid "Sales by Month"
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:1045
-#, python-format
-msgid ""
-"You selected a quantity of %d Units.\n"
-"But it's not compatible with the selected packaging.\n"
-"Here is a proposition of quantities according to the packaging:\n"
-"\n"
-"EAN: %s Quantity: %s Type of ul: %s"
-msgstr ""
-
-#. module: sale
#: model:ir.model,name:sale.model_sale_order
#: model:process.node,name:sale.process_node_order0
#: model:process.node,name:sale.process_node_saleorder0
@@ -1591,6 +1796,11 @@ msgid "Quantity (UoS)"
msgstr "Cantidad (UdV)"
#. module: sale
+#: view:sale.order.line:0
+msgid "Sale Order Lines that are in 'done' state"
+msgstr ""
+
+#. module: sale
#: model:process.transition,note:sale.process_transition_packing0
msgid ""
"The Pick List form is created as soon as the sales order is confirmed, in "
@@ -1605,6 +1815,11 @@ msgid "Confirmed"
msgstr "Confirmada"
#. module: sale
+#: field:sale.config.picking_policy,order_policy:0
+msgid "Main Method Based On"
+msgstr ""
+
+#. module: sale
#: model:process.transition.action,name:sale.process_transition_action_confirm0
msgid "Confirm"
msgstr "Confirmar"
@@ -1627,6 +1842,7 @@ msgid "Invoice Lines"
msgstr "Líneas de Facturación"
#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_product_tree
#: view:sale.order:0
#: view:sale.order.line:0
msgid "Sales Order Lines"
@@ -1643,30 +1859,18 @@ msgid "Configuration"
msgstr "Configuración"
#. module: sale
-#: selection:sale.order,picking_policy:0
-msgid "Complete Delivery"
-msgstr "Entrega completa"
-
-#. module: sale
-#: view:sale.report:0
-msgid " Month-1 "
-msgstr ""
-
-#. module: sale
-#: help:sale.config.picking_policy,picking_policy:0
-msgid ""
-"The Shipping Policy is used to configure per order if you want to deliver as "
-"soon as possible when one product is available or you wait that all products "
-"are available.."
+#: code:addons/sale/edi/sale_order.py:146
+#, python-format
+msgid "EDI Pricelist (%s)"
msgstr ""
#. module: sale
-#: selection:sale.report,month:0
-msgid "August"
+#: view:sale.report:0
+msgid "Sales order created in current year"
msgstr ""
#. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:111
+#: code:addons/sale/wizard/sale_line_invoice.py:113
#, python-format
msgid ""
"Invoice cannot be created for this Sales Order Line due to one of the "
@@ -1676,6 +1880,11 @@ msgid ""
msgstr ""
#. module: sale
+#: view:sale.order.line:0
+msgid "Sale order lines done"
+msgstr ""
+
+#. module: sale
#: field:sale.order.line,th_weight:0
msgid "Weight"
msgstr "Peso"
@@ -1694,7 +1903,6 @@ msgstr ""
#. module: sale
#: field:sale.config.picking_policy,config_logo:0
-#: field:sale.installer,config_logo:0
msgid "Image"
msgstr ""
@@ -1724,8 +1932,8 @@ msgid "Salesman"
msgstr "Vendedor"
#. module: sale
-#: model:process.node,note:sale.process_node_saleorder0
-msgid "Drives procurement and invoicing"
+#: model:ir.actions.act_window,name:sale.action_order_tree
+msgid "Old Quotations"
msgstr ""
#. module: sale
@@ -1734,7 +1942,7 @@ msgid "Untaxed Amount"
msgstr "Importe sin impuestos"
#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:163
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:170
#: model:ir.actions.act_window,name:sale.action_view_sale_advance_payment_inv
#: view:sale.advance.payment.inv:0
#: view:sale.order:0
@@ -1743,7 +1951,7 @@ msgid "Advance Invoice"
msgstr "Avanzar factura"
#. module: sale
-#: code:addons/sale/sale.py:591
+#: code:addons/sale/sale.py:624
#, python-format
msgid "The sales order '%s' has been cancelled."
msgstr ""
@@ -1778,19 +1986,19 @@ msgid "Packings"
msgstr ""
#. module: sale
-#: field:sale.config.picking_policy,progress:0
-#: field:sale.installer,progress:0
-msgid "Configuration Progress"
+#: view:sale.order.line:0
+msgid "Sale Order Lines ready to be invoiced"
msgstr ""
#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_product_tree
-msgid "Product sales"
-msgstr "Ventas de producto"
+#: view:sale.report:0
+msgid "Sales order created in last month"
+msgstr ""
#. module: sale
-#: field:sale.order,date_order:0
-msgid "Ordered Date"
+#: model:ir.actions.act_window,name:sale.action_email_templates
+#: model:ir.ui.menu,name:sale.menu_email_templates
+msgid "Email Templates"
msgstr ""
#. module: sale
@@ -1801,13 +2009,14 @@ msgid "Sales Orders"
msgstr "Órdenes de venta"
#. module: sale
-#: selection:sale.config.picking_policy,picking_policy:0
-msgid "Direct Delivery"
-msgstr "Entrega directa"
+#: model:ir.model,name:sale.model_sale_shop
+#: view:sale.shop:0
+msgid "Sales Shop"
+msgstr ""
#. module: sale
-#: field:sale.installer,sale_journal:0
-msgid "Invoicing journals"
+#: selection:sale.report,month:0
+msgid "November"
msgstr ""
#. module: sale
@@ -1816,18 +2025,12 @@ msgid "Advance Product"
msgstr "Anticipo de producto"
#. module: sale
-#: view:sale.report:0
-#: field:sale.report,shipped_qty_1:0
-msgid "Shipped Qty"
-msgstr ""
-
-#. module: sale
-#: view:sale.open.invoice:0
-msgid "You invoice has been successfully created!"
-msgstr ""
+#: view:sale.order:0
+msgid "Compute"
+msgstr "Calcular"
#. module: sale
-#: code:addons/sale/sale.py:585
+#: code:addons/sale/sale.py:618
#, python-format
msgid "You must first cancel all invoices attached to this sales order."
msgstr ""
@@ -1838,33 +2041,27 @@ msgid "January"
msgstr ""
#. module: sale
-#: view:sale.installer:0
-msgid "Configure Your Sales Management Application"
-msgstr ""
-
-#. module: sale
#: model:ir.actions.act_window,name:sale.action_order_tree4
msgid "Sales Order in Progress"
msgstr "Órdenes de venta en proceso"
#. module: sale
-#: field:sale.installer,sale_layout:0
-msgid "Sales Order Layout Improvement"
+#: help:sale.order,origin:0
+msgid "Reference of the document that generated this sales order request."
msgstr ""
#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:63
-#, python-format
-msgid "Error"
-msgstr "Error"
-
-#. module: sale
#: view:sale.report:0
#: field:sale.report,delay:0
msgid "Commitment Delay"
msgstr ""
#. module: sale
+#: selection:sale.order,order_policy:0
+msgid "Deliver & invoice on demand"
+msgstr ""
+
+#. module: sale
#: model:process.node,note:sale.process_node_saleprocurement0
msgid ""
"One Procurement order for each sales order line and for each of the "
@@ -1887,13 +2084,12 @@ msgid "Confirmed sales order to invoice."
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:290
-#, python-format
-msgid "Cannot delete Sales Order(s) which are already confirmed !"
+#: view:sale.order:0
+msgid "Sales Order that haven't yet been confirmed"
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:316
+#: code:addons/sale/sale.py:322
#, python-format
msgid "The sales order '%s' has been set in draft state."
msgstr ""
@@ -1904,24 +2100,19 @@ msgid "from stock"
msgstr "desde stock"
#. module: sale
-#: field:sale.config.picking_policy,order_policy:0
-msgid "Shipping Default Policy"
-msgstr "Política de envío predeterminada"
-
-#. module: sale
#: view:sale.open.invoice:0
msgid "Close"
msgstr "Cerrar"
#. module: sale
-#: field:sale.order,shipped:0
-msgid "Delivered"
+#: code:addons/sale/sale.py:1248
+#, python-format
+msgid "No Pricelist ! : "
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:1115
-#, python-format
-msgid "Not enough stock !"
+#: field:sale.order,shipped:0
+msgid "Delivered"
msgstr ""
#. module: sale
@@ -1930,11 +2121,6 @@ msgid "You must assign a production lot for this product"
msgstr ""
#. module: sale
-#: field:sale.order.line,sequence:0
-msgid "Layout Sequence"
-msgstr ""
-
-#. module: sale
#: model:ir.actions.act_window,help:sale.action_shop_form
msgid ""
"If you have more than one shop reselling your company products, you can "
@@ -1961,11 +2147,6 @@ msgid "May"
msgstr ""
#. module: sale
-#: help:sale.installer,sale_order_dates:0
-msgid "Adds commitment, requested and effective dates on Sales Orders."
-msgstr ""
-
-#. module: sale
#: view:sale.order:0
#: field:sale.order,partner_id:0
#: field:sale.order.line,order_partner_id:0
@@ -1973,23 +2154,11 @@ msgid "Customer"
msgstr "Cliente"
#. module: sale
-#: model:product.template,name:sale.advance_product_0_product_template
-msgid "Advance"
-msgstr ""
-
-#. module: sale
#: selection:sale.report,month:0
msgid "February"
msgstr ""
#. module: sale
-#: help:sale.installer,sale_journal:0
-msgid ""
-"Allows you to group and invoice your delivery orders according to different "
-"invoicing types: daily, weekly, etc."
-msgstr ""
-
-#. module: sale
#: selection:sale.report,month:0
msgid "April"
msgstr ""
@@ -2000,11 +2169,6 @@ msgid "Accounting"
msgstr "Contabilidad"
#. module: sale
-#: field:sale.config.picking_policy,step:0
-msgid "Steps To Deliver a Sales Order"
-msgstr ""
-
-#. module: sale
#: view:sale.order:0
#: view:sale.order.line:0
msgid "Search Sales Order"
@@ -2016,18 +2180,18 @@ msgid "Sales Order Requisition"
msgstr ""
#. module: sale
+#: code:addons/sale/sale.py:1242
+#, python-format
+msgid "Not enough stock ! : "
+msgstr ""
+
+#. module: sale
#: report:sale.order:0
#: field:sale.order,payment_term:0
msgid "Payment Term"
msgstr "Término de pago"
#. module: sale
-#: help:sale.installer,sale_layout:0
-msgid ""
-"Provides some features to improve the layout of the Sales Order reports."
-msgstr ""
-
-#. module: sale
#: model:ir.actions.act_window,help:sale.action_order_report_all
msgid ""
"This report performs analysis on your quotations and sales orders. Analysis "
@@ -2086,6 +2250,9 @@ msgstr "Facturar desde órdenes de entrega"
#~ msgid "Net Price"
#~ msgstr "Precio neto"
+#~ msgid "All at Once"
+#~ msgstr "Todo a la vez"
+
#~ msgid "My sales order in progress"
#~ msgstr "Mis órdenes de venta en proceso"
@@ -2141,6 +2308,9 @@ msgstr "Facturar desde órdenes de entrega"
#~ msgid "Draft Invoice"
#~ msgstr "Factura borrador"
+#~ msgid "Shipping Default Policy"
+#~ msgstr "Política de envío predeterminada"
+
#~ msgid "Sales Order To Be Invoiced"
#~ msgstr "Órdenes de venta a facturar"
@@ -2179,6 +2349,9 @@ msgstr "Facturar desde órdenes de entrega"
#~ msgid "Status"
#~ msgstr "Estado"
+#~ msgid "Product sales"
+#~ msgstr "Ventas de producto"
+
#~ msgid "Configure Sale Order Logistic"
#~ msgstr "Configurar logística de orden de venta"
@@ -2197,6 +2370,9 @@ msgstr "Facturar desde órdenes de entrega"
#~ msgid "Sale Pricelists"
#~ msgstr "Lista de precios de venta"
+#~ msgid "Direct Delivery"
+#~ msgstr "Entrega directa"
+
#~ msgid "Draft customer invoice, to be reviewed by accountant."
#~ msgstr "Factura de cliente en borrador, para ser revisada por un contador"
@@ -2206,6 +2382,9 @@ msgstr "Facturar desde órdenes de entrega"
#~ msgid "Packing OUT is created for stockable products."
#~ msgstr "Se crea un empaque de salida OUT para productos almacenables."
+#~ msgid "Delivery Order Only"
+#~ msgstr "Sólo orden de entrega"
+
#~ msgid "Sales order lines"
#~ msgstr "Líneas de la orden de venta"
@@ -2218,6 +2397,9 @@ msgstr "Facturar desde órdenes de entrega"
#~ msgid "Advance Payment"
#~ msgstr "Pago anticipado"
+#~ msgid "Shipping & Manual Invoice"
+#~ msgstr "Envío & Factura manual"
+
#~ msgid "Sale Invoice"
#~ msgstr "Factura de venta"
@@ -2236,6 +2418,9 @@ msgstr "Facturar desde órdenes de entrega"
#~ msgid "Open Advance Invoice"
#~ msgstr "Abrir anticipo factura"
+#~ msgid "Sales Management"
+#~ msgstr "Gestión de ventas"
+
#~ msgid "Deliver"
#~ msgstr "Entregar"
@@ -2265,6 +2450,9 @@ msgstr "Facturar desde órdenes de entrega"
#~ "La misma orden puede haberse facturado en varias partes (por ejemplo por "
#~ "cada línea)."
+#~ msgid "Payment Before Delivery"
+#~ msgstr "Pago antes de la entrega"
+
#~ msgid "Delivery Delay"
#~ msgstr "Demora de entrega"
@@ -2286,6 +2474,9 @@ msgstr "Facturar desde órdenes de entrega"
#~ msgid "Manual Designation"
#~ msgstr "Designación manual"
+#~ msgid "Shipping Policy"
+#~ msgstr "Política de Envío"
+
#~ msgid "Origin"
#~ msgstr "Origen"
@@ -2365,6 +2556,9 @@ msgstr "Facturar desde órdenes de entrega"
#~ msgstr ""
#~ "¡No puede cancelar una línea de pedido de venta que ya ha sido facturada!"
+#~ msgid "Partial Delivery"
+#~ msgstr "Entrega parcial"
+
#~ msgid "Recreate Procurement"
#~ msgstr "Re-generar abastecimiento"
@@ -2391,6 +2585,9 @@ msgstr "Facturar desde órdenes de entrega"
#~ msgid "Procurement is created after confirmation of sale order."
#~ msgstr "El abastecimiento es creado después de confirmar una orden de venta."
+#~ msgid "Complete Delivery"
+#~ msgstr "Entrega completa"
+
#~ msgid "Packing"
#~ msgstr "Remito"
@@ -2403,9 +2600,6 @@ msgstr "Facturar desde órdenes de entrega"
#~ msgid "Related Packing"
#~ msgstr "Remito relacionado"
-#~ msgid "My Quotations"
-#~ msgstr "Mis cotizaciones"
-
#~ msgid "Packing Default Policy"
#~ msgstr "Política de entrega predeterminada"
diff --git a/addons/sale/i18n/es_CL.po b/addons/sale/i18n/es_CL.po
index ca227ac4115..db03e14b607 100644
--- a/addons/sale/i18n/es_CL.po
+++ b/addons/sale/i18n/es_CL.po
@@ -6,15 +6,27 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2011-01-11 11:16+0000\n"
+"POT-Creation-Date: 2011-12-22 18:43+0000\n"
"PO-Revision-Date: 2011-12-15 21:29+0000\n"
"Last-Translator: Francisco Reyes Acuña <Unknown>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-12-16 05:24+0000\n"
-"X-Generator: Launchpad (build 14523)\n"
+"X-Launchpad-Export-Date: 2011-12-23 06:47+0000\n"
+"X-Generator: Launchpad (build 14560)\n"
+
+#. module: sale
+#: field:sale.config.picking_policy,timesheet:0
+msgid "Based on Timesheet"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid ""
+"Sale Order Lines that are confirmed, done or in exception state and haven't "
+"yet been invoiced"
+msgstr ""
#. module: sale
#: view:board.board:0
@@ -23,11 +35,6 @@ msgid "Sales by Salesman in last 90 days"
msgstr "Ventas por vendedor en los últimos 90 días"
#. module: sale
-#: help:sale.installer,delivery:0
-msgid "Allows you to compute delivery costs on your quotations."
-msgstr "Le permite calcular los costos de envío en sus presupuestos."
-
-#. module: sale
#: help:sale.order,picking_policy:0
msgid ""
"If you don't have enough stock available to deliver all at once, do you "
@@ -37,6 +44,11 @@ msgstr ""
"¿acepta envíos parciales?"
#. module: sale
+#: view:sale.order:0
+msgid "UoS"
+msgstr ""
+
+#. module: sale
#: help:sale.order,partner_shipping_id:0
msgid "Shipping address for current sales order."
msgstr "Dirección de envío para el pedido de venta actual."
@@ -60,22 +72,12 @@ msgid "Cancel Order"
msgstr "Cancelar pedido"
#. module: sale
-#: view:sale.config.picking_policy:0
-msgid "Configure Sales Order Logistics"
-msgstr "Configurar logística pedidos de venta"
-
-#. module: sale
-#: code:addons/sale/sale.py:603
+#: code:addons/sale/sale.py:638
#, python-format
msgid "The quotation '%s' has been converted to a sales order."
msgstr "El presupuesto '%s' ha sido convertido a un pedido de venta."
#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Payment Before Delivery"
-msgstr "Pago antes del envío"
-
-#. module: sale
#: code:addons/sale/wizard/sale_make_invoice.py:42
#, python-format
msgid "Warning !"
@@ -92,12 +94,6 @@ msgid "Drives procurement orders for every sales order line."
msgstr "Genera órdenes de abastecimiento para cada línea de pedido de venta."
#. module: sale
-#: selection:sale.config.picking_policy,picking_policy:0
-msgid "All at Once"
-msgstr "Todo a la vez"
-
-#. module: sale
-#: field:sale.order,project_id:0
#: view:sale.report:0
#: field:sale.report,analytic_account_id:0
#: field:sale.shop,project_id:0
@@ -113,6 +109,15 @@ msgid ""
msgstr ""
#. module: sale
+#: code:addons/sale/sale.py:295
+#, python-format
+msgid ""
+"In order to delete a confirmed sale order, you must cancel it before ! To "
+"cancel a sale order, you must first cancel related picking or delivery "
+"orders."
+msgstr ""
+
+#. module: sale
#: model:process.node,name:sale.process_node_saleprocurement0
msgid "Procurement Order"
msgstr "Orden de abastecimiento"
@@ -124,6 +129,11 @@ msgid "Partner"
msgstr "Empresa"
#. module: sale
+#: selection:sale.order,order_policy:0
+msgid "Invoice based on deliveries"
+msgstr ""
+
+#. module: sale
#: view:sale.order:0
msgid "Order Line"
msgstr "Línea del pedido"
@@ -169,9 +179,14 @@ msgid "Default Payment Term"
msgstr "Plazo de pago por defecto"
#. module: sale
-#: model:ir.actions.act_window,name:sale.action_config_picking_policy
-msgid "Configure Picking Policy for Sales Order"
-msgstr "Configurar la política envío para pedidos de venta"
+#: field:sale.config.picking_policy,deli_orders:0
+msgid "Based on Delivery Orders"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.picking_policy,time_unit:0
+msgid "Main Working Time Unit"
+msgstr ""
#. module: sale
#: view:sale.order:0
@@ -187,9 +202,10 @@ msgid "Disc.(%)"
msgstr "Desc.(%)"
#. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_forceassignation0
-msgid "Force Assignation"
-msgstr "Forzar asignación"
+#: view:sale.report:0
+#: field:sale.report,price_total:0
+msgid "Total Price"
+msgstr "Precio total"
#. module: sale
#: help:sale.make.invoice,grouped:0
@@ -197,6 +213,11 @@ msgid "Check the box to group the invoices for the same customers"
msgstr "Marque esta opción para agrupar las facturas de los mismos clientes."
#. module: sale
+#: view:sale.order:0
+msgid "My Sale Orders"
+msgstr ""
+
+#. module: sale
#: selection:sale.order,invoice_quantity:0
msgid "Ordered Quantities"
msgstr "Cantidades ordenadas"
@@ -237,14 +258,25 @@ msgstr ""
"\"Facturar desde el albarán\" o \"Facturar pedido después del envío\"."
#. module: sale
+#: field:sale.config.picking_policy,task_work:0
+msgid "Based on Tasks' Work"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
+msgid "Quotations and Sales"
+msgstr ""
+
+#. module: sale
#: model:ir.model,name:sale.model_sale_make_invoice
msgid "Sales Make Invoice"
msgstr "Ventas. Realizar factura"
#. module: sale
-#: view:sale.order:0
-msgid "Recreate Packing"
-msgstr "Recrear albarán"
+#: code:addons/sale/sale.py:330
+#, python-format
+msgid "Pricelist Warning!"
+msgstr ""
#. module: sale
#: field:sale.order.line,discount:0
@@ -252,12 +284,10 @@ msgid "Discount (%)"
msgstr "Descuento (%)"
#. module: sale
-#: help:res.company,security_lead:0
-msgid ""
-"This is the days added to what you promise to customers for security purpose"
-msgstr ""
-"Estos días por razones de seguridad se añaden a los que promete a los "
-"clientes."
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_quotation_for_sale
+msgid "My Quotations"
+msgstr "Mis presupuestos"
#. module: sale
#: view:board.board:0
@@ -282,7 +312,22 @@ msgid "Shop Name"
msgstr "Nombre tienda"
#. module: sale
-#: code:addons/sale/sale.py:1014
+#: help:sale.order,order_policy:0
+msgid ""
+"The Invoice Policy is used to synchronise invoice and delivery operations.\n"
+" - The 'Pay before delivery' choice will first generate the invoice and "
+"then generate the picking order after the payment of this invoice.\n"
+" - The 'Deliver & Invoice on demand' will create the picking order directly "
+"and wait for the user to manually click on the 'Invoice' button to generate "
+"the draft invoice based on the sale order or the sale order lines.\n"
+" - The 'Invoice on order after delivery' choice will generate the draft "
+"invoice based on sales order after all picking lists have been finished.\n"
+" - The 'Invoice based on deliveries' choice is used to create an invoice "
+"during the picking process."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:1158
#, python-format
msgid "No Customer Defined !"
msgstr "¡No se ha definido un cliente!"
@@ -293,9 +338,12 @@ msgid "Sales in Exception"
msgstr "Ventas en excepción"
#. module: sale
-#: view:sale.order:0
-msgid "Set to Draft"
-msgstr "Cambiar a borrador"
+#: code:addons/sale/sale.py:1145
+#: code:addons/sale/sale.py:1264
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:70
+#, python-format
+msgid "Configuration Error !"
+msgstr ""
#. module: sale
#: view:sale.order:0
@@ -303,22 +351,7 @@ msgid "Conditions"
msgstr "Condiciones"
#. module: sale
-#: help:sale.order,order_policy:0
-msgid ""
-"The Shipping Policy is used to synchronise invoice and delivery operations.\n"
-" - The 'Pay Before delivery' choice will first generate the invoice and "
-"then generate the picking order after the payment of this invoice.\n"
-" - The 'Shipping & Manual Invoice' will create the picking order directly "
-"and wait for the user to manually click on the 'Invoice' button to generate "
-"the draft invoice.\n"
-" - The 'Invoice On Order After Delivery' choice will generate the draft "
-"invoice based on sales order after all picking lists have been finished.\n"
-" - The 'Invoice From The Picking' choice is used to create an invoice "
-"during the picking process."
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:939
+#: code:addons/sale/sale.py:1034
#, python-format
msgid ""
"There is no income category account defined in default Properties for "
@@ -329,9 +362,9 @@ msgstr ""
"definida!"
#. module: sale
-#: view:sale.installer:0
-msgid "Configure"
-msgstr "Configurar"
+#: selection:sale.report,month:0
+msgid "August"
+msgstr "Agosto"
#. module: sale
#: constraint:stock.move:0
@@ -339,7 +372,7 @@ msgid "You try to assign a lot which is not from the same product"
msgstr "Está intentando asignar un lote que no es del mismo producto"
#. module: sale
-#: code:addons/sale/sale.py:620
+#: code:addons/sale/sale.py:655
#, python-format
msgid "invalid mode for test_state"
msgstr "Modo no válido para test_state"
@@ -350,7 +383,7 @@ msgid "June"
msgstr "Junio"
#. module: sale
-#: code:addons/sale/sale.py:584
+#: code:addons/sale/sale.py:617
#, python-format
msgid "Could not cancel this sales order !"
msgstr "¡No se puede cancelar este pedido de venta!"
@@ -371,8 +404,12 @@ msgid "October"
msgstr "Octubre"
#. module: sale
+#: sql_constraint:stock.picking:0
+msgid "Reference must be unique per Company!"
+msgstr ""
+
+#. module: sale
#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_quotation_for_sale
#: view:sale.order:0
#: view:sale.report:0
msgid "Quotations"
@@ -384,11 +421,6 @@ msgid "Pricelist for current sales order."
msgstr "Tarifa para el pedido de venta actual."
#. module: sale
-#: selection:sale.config.picking_policy,step:0
-msgid "Delivery Order Only"
-msgstr "Sólo orden de entrega"
-
-#. module: sale
#: report:sale.order:0
msgid "TVA :"
msgstr "IVA :"
@@ -415,6 +447,7 @@ msgstr "Posición fiscal"
#. module: sale
#: view:sale.order:0
#: view:sale.order.line:0
+#: field:sale.report,product_uom:0
msgid "UoM"
msgstr "UdM"
@@ -439,7 +472,13 @@ msgstr ""
"convierte 'En proceso' o 'Manual en proceso'."
#. module: sale
-#: code:addons/sale/sale.py:971
+#: code:addons/sale/sale.py:1061
+#, python-format
+msgid "You cannot cancel a sale order line that has already been invoiced!"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:1066
#, python-format
msgid "You must first cancel stock moves attached to this sales order line."
msgstr ""
@@ -447,7 +486,7 @@ msgstr ""
"pedido de venta."
#. module: sale
-#: code:addons/sale/sale.py:1042
+#: code:addons/sale/sale.py:1134
#, python-format
msgid "(n/a)"
msgstr "(n/a)"
@@ -486,14 +525,36 @@ msgid "Notes"
msgstr "Notas"
#. module: sale
+#: sql_constraint:res.company:0
+msgid "The company name must be unique !"
+msgstr ""
+
+#. module: sale
#: help:sale.order,partner_invoice_id:0
msgid "Invoice address for current sales order."
msgstr "Dirección de facturación para el pedido de venta actual."
#. module: sale
-#: view:sale.installer:0
-msgid "Enhance your core Sales Application with additional functionalities."
-msgstr "Optimizar su aplicación de ventas con funcionalidades adicionales."
+#: view:sale.report:0
+msgid "Month-1"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered month of the sales order"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:504
+#, python-format
+msgid ""
+"You cannot group sales having different currencies for the same partner."
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,picking_policy:0
+msgid "Deliver each product when available"
+msgstr ""
#. module: sale
#: field:sale.order,invoiced_rate:0
@@ -512,21 +573,43 @@ msgid "Confirmation Date"
msgstr "Fecha confirmación"
#. module: sale
+#: field:sale.order,incoterm:0
+msgid "Incoterm"
+msgstr "Incoterm"
+
+#. module: sale
#: field:sale.order.line,address_allotment_id:0
msgid "Allotment Partner"
msgstr "Ubicación empresa"
#. module: sale
-#: sql_constraint:sale.order:0
-msgid "Order Reference must be unique !"
-msgstr "¡La referencia del pedido debe ser única!"
-
-#. module: sale
#: selection:sale.report,month:0
msgid "March"
msgstr "Marzo"
#. module: sale
+#: constraint:stock.move:0
+msgid "You can not move products from or to a location of the type view."
+msgstr ""
+
+#. module: sale
+#: field:sale.config.picking_policy,sale_orders:0
+msgid "Based on Sales Orders"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,state:0
+msgid ""
+"Givwizard = self.browse(cr, uid, ids)[0]es the state of the quotation or "
+"sales order. \n"
+"The exception state is automatically set when a cancel operation occurs in "
+"the invoice validation (Invoice Exception) or in the picking list process "
+"(Shipping Exception). \n"
+"The 'Waiting Schedule' state is set when the invoice is confirmed but "
+"waiting for the scheduler to run on the order date."
+msgstr ""
+
+#. module: sale
#: help:sale.order,amount_total:0
msgid "The total amount."
msgstr "El importe total."
@@ -542,6 +625,11 @@ msgid "Invoice address :"
msgstr "Dirección de factura :"
#. module: sale
+#: field:sale.order.line,sequence:0
+msgid "Line Sequence"
+msgstr ""
+
+#. module: sale
#: model:process.transition,note:sale.process_transition_saleorderprocurement0
msgid ""
"For every sales order line, a procurement order is created to supply the "
@@ -592,11 +680,6 @@ msgid "Sales Order Line"
msgstr "Línea pedido de venta"
#. module: sale
-#: view:sale.config.picking_policy:0
-msgid "Setup your sales workflow and default values."
-msgstr "Configurar su flujo de ventas y valores por defecto."
-
-#. module: sale
#: field:sale.shop,warehouse_id:0
msgid "Warehouse"
msgstr "Almacén"
@@ -633,6 +716,11 @@ msgid "Creation Date"
msgstr "Fecha creación"
#. module: sale
+#: model:ir.ui.menu,name:sale.menu_sales_configuration_misc
+msgid "Miscellaneous"
+msgstr ""
+
+#. module: sale
#: model:ir.actions.act_window,name:sale.action_order_line_tree3
msgid "Uninvoiced and Delivered Lines"
msgstr "Líneas no facturadas y entregadas"
@@ -648,14 +736,19 @@ msgid "My Sales"
msgstr "Mis ventas"
#. module: sale
-#: code:addons/sale/sale.py:290
-#: code:addons/sale/sale.py:966
-#: code:addons/sale/sale.py:1165
+#: code:addons/sale/sale.py:295
+#: code:addons/sale/sale.py:1061
+#: code:addons/sale/sale.py:1290
#, python-format
msgid "Invalid action !"
msgstr "¡Acción no válida!"
#. module: sale
+#: view:sale.order:0
+msgid "Extra Info"
+msgstr "Información extra"
+
+#. module: sale
#: field:sale.order,pricelist_id:0
#: field:sale.report,pricelist_id:0
#: field:sale.shop,pricelist_id:0
@@ -669,13 +762,21 @@ msgid "# of Qty"
msgstr "Nº de ctdad"
#. module: sale
+#: code:addons/sale/sale.py:1314
+#, python-format
+msgid "Hour"
+msgstr ""
+
+#. module: sale
#: view:sale.order:0
msgid "Order Date"
msgstr "Fecha pedido"
#. module: sale
#: view:sale.order.line:0
+#: view:sale.report:0
#: field:sale.report,shipped:0
+#: field:sale.report,shipped_qty_1:0
msgid "Shipped"
msgstr "Enviado"
@@ -685,9 +786,9 @@ msgid "All Quotations"
msgstr "Todos los presupuestos"
#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Invoice On Order After Delivery"
-msgstr "Facturar pedido después de envío"
+#: view:sale.config.picking_policy:0
+msgid "Options"
+msgstr ""
#. module: sale
#: selection:sale.report,month:0
@@ -695,6 +796,20 @@ msgid "September"
msgstr "Septiembre"
#. module: sale
+#: code:addons/sale/sale.py:632
+#, python-format
+msgid "You cannot confirm a sale order which has no line."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:1246
+#, python-format
+msgid ""
+"You have to select a pricelist or a customer in the sales form !\n"
+"Please set one before choosing a product."
+msgstr ""
+
+#. module: sale
#: view:sale.report:0
#: field:sale.report,categ_id:0
msgid "Category of Product"
@@ -711,11 +826,6 @@ msgid "Stock Moves"
msgstr "Movimientos de stock"
#. module: sale
-#: view:sale.report:0
-msgid " Year "
-msgstr " Año "
-
-#. module: sale
#: field:sale.order,state:0
#: field:sale.report,state:0
msgid "Order State"
@@ -733,7 +843,7 @@ msgid "Sales By Month"
msgstr "Ventas por mes"
#. module: sale
-#: code:addons/sale/sale.py:970
+#: code:addons/sale/sale.py:1065
#, python-format
msgid "Could not cancel sales order line!"
msgstr "¡No se puede cancelar línea pedido de venta!"
@@ -768,64 +878,19 @@ msgstr ""
"sólo después que el planificador(es) se ha ejecutado."
#. module: sale
+#: field:sale.order,date_order:0
+msgid "Date"
+msgstr ""
+
+#. module: sale
#: view:sale.report:0
msgid "Extended Filters..."
msgstr "Filtros extendidos..."
#. module: sale
-#: model:ir.module.module,description:sale.module_meta_information
-msgid ""
-"\n"
-" The base module to manage quotations and sales orders.\n"
-"\n"
-" * Workflow with validation steps:\n"
-" - Quotation -> Sales order -> Invoice\n"
-" * Invoicing methods:\n"
-" - Invoice on order (before or after shipping)\n"
-" - Invoice on delivery\n"
-" - Invoice on timesheets\n"
-" - Advance invoice\n"
-" * Partners preferences (shipping, invoicing, incoterm, ...)\n"
-" * Products stocks and prices\n"
-" * Delivery methods:\n"
-" - all at once, multi-parcel\n"
-" - delivery costs\n"
-" * Dashboard for salesman that includes:\n"
-" * Your open quotations\n"
-" * Top 10 sales of the month\n"
-" * Cases statistics\n"
-" * Graph of sales by product\n"
-" * Graph of cases of the month\n"
-" "
-msgstr ""
-"\n"
-" El módulo base para gestionar presupuestos y pedidos de venta.\n"
-"\n"
-" * Flujo de trabajo con etapas de validación:\n"
-" - Presupuesto -> Pedido de venta -> Factura\n"
-" * Métodos de facturación:\n"
-" - Factura del pedido (antes o después del envío)\n"
-" - Factura del albarán\n"
-" - Factura de la hoja de servicios\n"
-" - Avanzar factura\n"
-" * Preferencias de los clientes (envío, facturación, incoterm, ...)\n"
-" * Existencias de los productos y precios\n"
-" * Formas de envío:\n"
-" - Todo a la vez, En varios paquetes\n"
-" - Gastos de envío\n"
-" * El tablero para el comercial incluye:\n"
-" * Sus presupuestos abiertos\n"
-" * Las 10 mejores ventas del mes\n"
-" * Estadísticas de casos\n"
-" * Gráfico de las ventas por producto\n"
-" * Gráfico de los casos por mes\n"
-" "
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_shop
-#: view:sale.shop:0
-msgid "Sales Shop"
-msgstr "Tienda ventas"
+#: selection:sale.order.line,state:0
+msgid "Exception"
+msgstr "Excepción"
#. module: sale
#: model:ir.model,name:sale.model_res_company
@@ -833,9 +898,10 @@ msgid "Companies"
msgstr "Compañías"
#. module: sale
-#: selection:sale.report,month:0
-msgid "November"
-msgstr "Noviembre"
+#: code:addons/sale/sale.py:1259
+#, python-format
+msgid "No valid pricelist line found ! :"
+msgstr ""
#. module: sale
#: view:sale.order:0
@@ -843,9 +909,9 @@ msgid "History"
msgstr "Historial"
#. module: sale
-#: field:sale.config.picking_policy,picking_policy:0
-msgid "Picking Default Policy"
-msgstr "Política de empaquetado por defecto"
+#: selection:sale.order,order_policy:0
+msgid "Invoice on order after delivery"
+msgstr ""
#. module: sale
#: help:sale.order,invoice_ids:0
@@ -872,14 +938,14 @@ msgstr ""
"presupuesto."
#. module: sale
-#: code:addons/sale/sale.py:966
-#, python-format
-msgid "You cannot cancel a sales order line that has already been invoiced !"
+#: help:res.company,security_lead:0
+msgid ""
+"This is the days added to what you promise to customers for security purpose"
msgstr ""
-"¡No puede cancelar una línea de pedido de venta que ya ha sido facturada!"
+"Estos días por razones de seguridad se añaden a los que promete a los "
+"clientes."
#. module: sale
-#: view:sale.order:0
#: view:sale.order.line:0
msgid "Qty"
msgstr "Ctdad"
@@ -890,6 +956,11 @@ msgid "References"
msgstr "Referencias"
#. module: sale
+#: view:sale.order.line:0
+msgid "My Sales Order Lines"
+msgstr ""
+
+#. module: sale
#: model:process.transition.action,name:sale.process_transition_action_cancel0
#: model:process.transition.action,name:sale.process_transition_action_cancel1
#: model:process.transition.action,name:sale.process_transition_action_cancel2
@@ -901,14 +972,9 @@ msgid "Cancel"
msgstr "Cancelar"
#. module: sale
-#: field:sale.installer,sale_order_dates:0
-msgid "Sales Order Dates"
-msgstr "Fechas en pedidos de venta"
-
-#. module: sale
-#: selection:sale.order.line,state:0
-msgid "Exception"
-msgstr "Excepción"
+#: sql_constraint:sale.order:0
+msgid "Order Reference must be unique per Company!"
+msgstr ""
#. module: sale
#: model:process.transition,name:sale.process_transition_invoice0
@@ -920,19 +986,19 @@ msgid "Create Invoice"
msgstr "Crear factura"
#. module: sale
-#: field:sale.installer,sale_margin:0
-msgid "Margins in Sales Orders"
-msgstr "Márgenes en pedidos de venta"
-
-#. module: sale
#: view:sale.order:0
msgid "Total Tax Excluded"
msgstr "Total sin impuestos"
#. module: sale
-#: view:sale.order:0
-msgid "Compute"
-msgstr "Calcular"
+#: view:sale.order.line:0
+msgid "Order reference"
+msgstr ""
+
+#. module: sale
+#: view:sale.open.invoice:0
+msgid "You invoice has been successfully created!"
+msgstr "¡La factura ha sido creada correctamente!"
#. module: sale
#: view:sale.report:0
@@ -951,23 +1017,21 @@ msgid "Open Invoice"
msgstr "Abrir factura"
#. module: sale
-#: report:sale.order:0
-#: view:sale.order.line:0
-msgid "Price"
-msgstr "Precio"
+#: model:ir.actions.server,name:sale.ir_actions_server_edi_sale
+msgid "Auto-email confirmed sale orders"
+msgstr ""
#. module: sale
-#: model:ir.actions.act_window,name:sale.action_sale_installer
-#: view:sale.config.picking_policy:0
-#: view:sale.installer:0
-msgid "Sales Application Configuration"
-msgstr "Configuración aplicaciones de ventas"
+#: code:addons/sale/sale.py:413
+#, python-format
+msgid "There is no sales journal defined for this company: \"%s\" (id:%d)"
+msgstr ""
+"No se ha definido un diario de ventas para esta compañía: \"%s\" (id:%d)"
#. module: sale
-#: view:sale.report:0
-#: field:sale.report,price_total:0
-msgid "Total Price"
-msgstr "Precio total"
+#: model:process.transition.action,name:sale.process_transition_action_forceassignation0
+msgid "Force Assignation"
+msgstr "Forzar asignación"
#. module: sale
#: selection:sale.order.line,type:0
@@ -980,6 +1044,11 @@ msgid "Based on the shipped or on the ordered quantities."
msgstr "Basado en las cantidades enviadas o ordenadas."
#. module: sale
+#: selection:sale.order,picking_policy:0
+msgid "Deliver all products at once"
+msgstr ""
+
+#. module: sale
#: field:sale.order,picking_ids:0
msgid "Related Picking"
msgstr "Guía de despacho relacionada"
@@ -1011,9 +1080,15 @@ msgid "Create Delivery Order"
msgstr "Crear orden de entrega"
#. module: sale
-#: field:sale.installer,delivery:0
-msgid "Delivery Costs"
-msgstr "Costes de envío"
+#: code:addons/sale/sale.py:1290
+#, python-format
+msgid "Cannot delete a sales order line which is in state '%s'!"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Qty(UoS)"
+msgstr ""
#. module: sale
#: view:sale.order:0
@@ -1027,13 +1102,13 @@ msgstr "Crear albarán"
#. module: sale
#: view:sale.report:0
-msgid "Sales by Product Category"
-msgstr "Ventas por categoría de producto"
+msgid "Ordered date of the sales order"
+msgstr ""
#. module: sale
-#: selection:sale.order,picking_policy:0
-msgid "Partial Delivery"
-msgstr "Envío parcial"
+#: view:sale.report:0
+msgid "Sales by Product Category"
+msgstr "Ventas por categoría de producto"
#. module: sale
#: model:process.transition,name:sale.process_transition_confirmquotation0
@@ -1041,10 +1116,10 @@ msgid "Confirm Quotation"
msgstr "Confirmar presupuesto"
#. module: sale
-#: help:sale.order,origin:0
-msgid "Reference of the document that generated this sales order request."
-msgstr ""
-"Referencia del documento que ha generado esta solicitud de pedido de venta."
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:63
+#, python-format
+msgid "Error"
+msgstr "Error"
#. module: sale
#: view:sale.order:0
@@ -1076,20 +1151,14 @@ msgid "Procurement Method"
msgstr "Método abastecimiento"
#. module: sale
-#: view:sale.config.picking_policy:0
-#: view:sale.installer:0
-msgid "title"
-msgstr "título"
-
-#. module: sale
#: model:process.node,name:sale.process_node_packinglist0
msgid "Pick List"
msgstr "Guía de despacho"
#. module: sale
#: view:sale.order:0
-msgid "Order date"
-msgstr "Fecha pedido"
+msgid "Set to Draft"
+msgstr "Cambiar a borrador"
#. module: sale
#: model:process.node,note:sale.process_node_packinglist0
@@ -1097,6 +1166,85 @@ msgid "Document of the move to the output or to the customer."
msgstr "Documento del movimiento a la salida o al cliente."
#. module: sale
+#: model:email.template,body_text:sale.email_template_edi_sale
+msgid ""
+"\n"
+"Hello${object.partner_order_id.name and ' ' or "
+"''}${object.partner_order_id.name or ''},\n"
+"\n"
+"Here is your order confirmation for ${object.partner_id.name}:\n"
+" | Order number: *${object.name}*\n"
+" | Order total: *${object.amount_total} "
+"${object.pricelist_id.currency_id.name}*\n"
+" | Order date: ${object.date_order}\n"
+" % if object.origin:\n"
+" | Order reference: ${object.origin}\n"
+" % endif\n"
+" % if object.client_order_ref:\n"
+" | Your reference: ${object.client_order_ref}<br />\n"
+" % endif\n"
+" | Your contact: ${object.user_id.name} ${object.user_id.user_email "
+"and '<%s>'%(object.user_id.user_email) or ''}\n"
+"\n"
+"You can view the order confirmation, download it and even pay online using "
+"the following link:\n"
+" ${ctx.get('edi_web_url_view') or 'n/a'}\n"
+"\n"
+"% if object.order_policy in ('prepaid','manual') and "
+"object.company_id.paypal_account:\n"
+"<% \n"
+"comp_name = quote(object.company_id.name)\n"
+"order_name = quote(object.name)\n"
+"paypal_account = quote(object.company_id.paypal_account)\n"
+"order_amount = quote(str(object.amount_total))\n"
+"cur_name = quote(object.pricelist_id.currency_id.name)\n"
+"paypal_url = \"https://www.paypal.com/cgi-"
+"bin/webscr?cmd=_xclick&business=%s&item_name=%s%%20Order%%20%s&invoice=%s&amo"
+"unt=%s\" \\\n"
+" "
+"\"&currency_code=%s&button_subtype=services&no_note=1&bn=OpenERP_Order_PayNow"
+"_%s\" % \\\n"
+" "
+"(paypal_account,comp_name,order_name,order_name,order_amount,cur_name,cur_nam"
+"e)\n"
+"%>\n"
+"It is also possible to directly pay with Paypal:\n"
+" ${paypal_url}\n"
+"% endif\n"
+"\n"
+"If you have any question, do not hesitate to contact us.\n"
+"\n"
+"\n"
+"Thank you for choosing ${object.company_id.name}!\n"
+"\n"
+"\n"
+"--\n"
+"${object.user_id.name} ${object.user_id.user_email and "
+"'<%s>'%(object.user_id.user_email) or ''}\n"
+"${object.company_id.name}\n"
+"% if object.company_id.street:\n"
+"${object.company_id.street or ''}\n"
+"% endif\n"
+"% if object.company_id.street2:\n"
+"${object.company_id.street2}\n"
+"% endif\n"
+"% if object.company_id.city or object.company_id.zip:\n"
+"${object.company_id.zip or ''} ${object.company_id.city or ''}\n"
+"% endif\n"
+"% if object.company_id.country_id:\n"
+"${object.company_id.state_id and ('%s, ' % object.company_id.state_id.name) "
+"or ''} ${object.company_id.country_id.name or ''}\n"
+"% endif\n"
+"% if object.company_id.phone:\n"
+"Phone: ${object.company_id.phone}\n"
+"% endif\n"
+"% if object.company_id.website:\n"
+"${object.company_id.website or ''}\n"
+"% endif\n"
+" "
+msgstr ""
+
+#. module: sale
#: model:process.transition.action,name:sale.process_transition_action_validate0
msgid "Validate"
msgstr "Validar"
@@ -1119,9 +1267,9 @@ msgid "Taxes"
msgstr "Impuestos"
#. module: sale
-#: field:sale.order,order_policy:0
-msgid "Shipping Policy"
-msgstr "Política de facturación"
+#: view:sale.order:0
+msgid "Sales Order ready to be invoiced"
+msgstr ""
#. module: sale
#: help:sale.order,create_date:0
@@ -1140,9 +1288,9 @@ msgid "Create Invoices"
msgstr "Crear facturas"
#. module: sale
-#: view:sale.order:0
-msgid "Extra Info"
-msgstr "Información extra"
+#: view:sale.report:0
+msgid "Sales order created in current month"
+msgstr ""
#. module: sale
#: report:sale.order:0
@@ -1150,11 +1298,24 @@ msgid "Fax :"
msgstr "Fax :"
#. module: sale
+#: help:sale.order.line,type:0
+msgid ""
+"If 'on order', it triggers a procurement when the sale order is confirmed to "
+"create a task, purchase order or manufacturing order linked to this sale "
+"order line."
+msgstr ""
+
+#. module: sale
#: field:sale.advance.payment.inv,amount:0
msgid "Advance Amount"
msgstr "Importe avanzado"
#. module: sale
+#: field:sale.config.picking_policy,charge_delivery:0
+msgid "Do you charge the delivery?"
+msgstr ""
+
+#. module: sale
#: selection:sale.order,invoice_quantity:0
msgid "Shipped Quantities"
msgstr "Cantidades enviadas"
@@ -1165,25 +1326,45 @@ msgid "Invoice Based on Sales Orders"
msgstr "Factura basada en pedidos de venta"
#. module: sale
+#: code:addons/sale/sale.py:331
+#, python-format
+msgid ""
+"If you change the pricelist of this order (and eventually the currency), "
+"prices of existing order lines will not be updated."
+msgstr ""
+
+#. module: sale
#: model:ir.model,name:sale.model_stock_picking
msgid "Picking List"
msgstr "LIsta de guías de despacho"
#. module: sale
-#: code:addons/sale/sale.py:387
-#: code:addons/sale/sale.py:920
-#: code:addons/sale/sale.py:938
+#: code:addons/sale/sale.py:412
+#: code:addons/sale/sale.py:503
+#: code:addons/sale/sale.py:632
+#: code:addons/sale/sale.py:1015
+#: code:addons/sale/sale.py:1033
#, python-format
msgid "Error !"
msgstr "¡Error!"
#. module: sale
-#: code:addons/sale/sale.py:570
+#: code:addons/sale/sale.py:603
#, python-format
msgid "Could not cancel sales order !"
msgstr "¡No se puede cancelar el pedido de venta!"
#. module: sale
+#: view:sale.order:0
+msgid "Qty(UoM)"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered Year of the sales order"
+msgstr ""
+
+#. module: sale
#: selection:sale.report,month:0
msgid "July"
msgstr "Julio"
@@ -1200,36 +1381,26 @@ msgid "Shipping Exception"
msgstr "Excepción de envío"
#. module: sale
-#: field:sale.make.invoice,grouped:0
-msgid "Group the invoices"
-msgstr "Agrupar las facturas"
-
-#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Shipping & Manual Invoice"
-msgstr "Enviar & Factura manual"
-
-#. module: sale
-#: code:addons/sale/sale.py:1051
+#: code:addons/sale/sale.py:1143
#, python-format
-msgid "Picking Information !"
-msgstr "¡Información albarán!"
+msgid "Picking Information ! : "
+msgstr ""
#. module: sale
-#: view:sale.report:0
-#: field:sale.report,month:0
-msgid "Month"
-msgstr "Mes"
+#: field:sale.make.invoice,grouped:0
+msgid "Group the invoices"
+msgstr "Agrupar las facturas"
#. module: sale
-#: model:ir.module.module,shortdesc:sale.module_meta_information
-msgid "Sales Management"
-msgstr "Ventas"
+#: field:sale.order,order_policy:0
+msgid "Invoice Policy"
+msgstr ""
#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Invoice From The Picking"
-msgstr "Factura desde el albarán"
+#: model:ir.actions.act_window,name:sale.action_config_picking_policy
+#: view:sale.config.picking_policy:0
+msgid "Setup your Invoicing Method"
+msgstr ""
#. module: sale
#: model:process.node,note:sale.process_node_invoice0
@@ -1238,32 +1409,31 @@ msgstr "Para ser revisado por el contable."
#. module: sale
#: view:sale.report:0
-#: field:sale.report,uom_name:0
msgid "Reference UoM"
msgstr "Referencia UdM"
#. module: sale
+#: view:sale.config.picking_policy:0
+msgid ""
+"This tool will help you to install the right module and configure the system "
+"according to the method you use to invoice your customers."
+msgstr ""
+
+#. module: sale
#: model:ir.model,name:sale.model_sale_order_line_make_invoice
msgid "Sale OrderLine Make_invoice"
msgstr "Venta Línea_pedido Realizar_factura"
#. module: sale
-#: help:sale.config.picking_policy,step:0
-msgid ""
-"By default, OpenERP is able to manage complex routing and paths of products "
-"in your warehouse and partner locations. This will configure the most common "
-"and simple methods to deliver products to the customer in one or two "
-"operations by the worker."
-msgstr ""
-"Por defecto, OpenERP es capaz de gestionar complejas rutas y caminos de los "
-"productos en su almacén y en las ubicaciones de otras empresas. Esto "
-"configurará los métodos más comunes y sencillos para entregar los productos "
-"al cliente en una o dos operaciones realizadas por el trabajador."
+#: selection:sale.order,state:0
+#: selection:sale.report,state:0
+msgid "Invoice Exception"
+msgstr "Excepción de factura"
#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_tree
-msgid "Old Quotations"
-msgstr "Presupuestos antiguos"
+#: model:process.node,note:sale.process_node_saleorder0
+msgid "Drives procurement and invoicing"
+msgstr "Genera abastecimiento y facturación"
#. module: sale
#: field:sale.order,invoiced:0
@@ -1278,6 +1448,22 @@ msgid "Sales Analysis"
msgstr "Análisis ventas"
#. module: sale
+#: code:addons/sale/sale.py:1138
+#, python-format
+msgid ""
+"You selected a quantity of %d Units.\n"
+"But it's not compatible with the selected packaging.\n"
+"Here is a proposition of quantities according to the packaging:\n"
+"EAN: %s Quantity: %s Type of ul: %s"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Recreate Packing"
+msgstr "Recrear albarán"
+
+#. module: sale
+#: view:sale.order:0
#: field:sale.order.line,property_ids:0
msgid "Properties"
msgstr "Propiedades"
@@ -1308,7 +1494,17 @@ msgstr ""
"Puede generar facturas basadas en pedidos de venta o basadas en envíos."
#. module: sale
-#: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
+#: view:sale.order.line:0
+msgid "Confirmed sale order lines, not yet delivered"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:473
+#, python-format
+msgid "Customer Invoices"
+msgstr ""
+
+#. module: sale
#: model:process.process,name:sale.process_process_salesprocess0
#: view:sale.order:0
#: view:sale.report:0
@@ -1330,18 +1526,13 @@ msgid "Done"
msgstr "Realizado"
#. module: sale
-#: model:ir.model,name:sale.model_sale_installer
-msgid "sale.installer"
-msgstr "venta.instalador"
-
-#. module: sale
#: model:process.node,name:sale.process_node_invoice0
#: model:process.node,name:sale.process_node_invoiceafterdelivery0
msgid "Invoice"
msgstr "Factura"
#. module: sale
-#: code:addons/sale/sale.py:1014
+#: code:addons/sale/sale.py:1158
#, python-format
msgid ""
"You have to select a customer in the sales form !\n"
@@ -1351,11 +1542,6 @@ msgstr ""
"Introduzca un cliente antes de seleccionar un producto."
#. module: sale
-#: selection:sale.config.picking_policy,step:0
-msgid "Picking List & Delivery Order"
-msgstr "Guía de despacho y Orden de entrega"
-
-#. module: sale
#: field:sale.order,origin:0
msgid "Source Document"
msgstr "Documento origen"
@@ -1381,7 +1567,7 @@ msgid "The amount without tax."
msgstr "El importe sin impuestos."
#. module: sale
-#: code:addons/sale/sale.py:571
+#: code:addons/sale/sale.py:604
#, python-format
msgid "You must first cancel all picking attached to this sales order."
msgstr ""
@@ -1394,9 +1580,15 @@ msgid "Sales Advance Payment Invoice"
msgstr "Ventas. Anticipo pago factura"
#. module: sale
-#: field:sale.order,incoterm:0
-msgid "Incoterm"
-msgstr "Incoterm"
+#: view:sale.report:0
+#: field:sale.report,month:0
+msgid "Month"
+msgstr "Mes"
+
+#. module: sale
+#: model:email.template,subject:sale.email_template_edi_sale
+msgid "${object.company_id.name} Order (Ref ${object.name or 'n/a' })"
+msgstr ""
#. module: sale
#: view:sale.order.line:0
@@ -1407,11 +1599,6 @@ msgid "Product"
msgstr "Producto"
#. module: sale
-#: model:ir.ui.menu,name:sale.menu_invoiced
-msgid "Invoicing"
-msgstr "Facturación"
-
-#. module: sale
#: model:process.transition.action,name:sale.process_transition_action_cancelassignation0
msgid "Cancel Assignation"
msgstr "Cancelar asignación"
@@ -1422,14 +1609,10 @@ msgid "sale.config.picking_policy"
msgstr "sale.config.picking_policy"
#. module: sale
-#: help:sale.order,state:0
-msgid ""
-"Gives the state of the quotation or sales order. \n"
-"The exception state is automatically set when a cancel operation occurs in "
-"the invoice validation (Invoice Exception) or in the picking list process "
-"(Shipping Exception). \n"
-"The 'Waiting Schedule' state is set when the invoice is confirmed but "
-"waiting for the scheduler to run on the date 'Ordered Date'."
+#: view:account.invoice.report:0
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_turnover_by_month
+msgid "Monthly Turnover"
msgstr ""
#. module: sale
@@ -1448,7 +1631,6 @@ msgid "Product UoS"
msgstr "UdV del producto"
#. module: sale
-#: selection:sale.order,state:0
#: selection:sale.report,state:0
msgid "Manual In Progress"
msgstr "Manual en proceso"
@@ -1469,7 +1651,8 @@ msgid "Order"
msgstr "Pedido"
#. module: sale
-#: code:addons/sale/sale.py:921
+#: code:addons/sale/sale.py:1016
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:71
#, python-format
msgid "There is no income account defined for this product: \"%s\" (id:%d)"
msgstr ""
@@ -1490,7 +1673,7 @@ msgid ""
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:1116
+#: code:addons/sale/sale.py:1238
#, python-format
msgid ""
"You plan to sell %.2f %s but you only have %.2f %s available !\n"
@@ -1521,11 +1704,10 @@ msgid "Total"
msgstr "Total"
#. module: sale
-#: code:addons/sale/sale.py:388
-#, python-format
-msgid "There is no sales journal defined for this company: \"%s\" (id:%d)"
-msgstr ""
-"No se ha definido un diario de ventas para esta compañía: \"%s\" (id:%d)"
+#: report:sale.order:0
+#: view:sale.order.line:0
+msgid "Price"
+msgstr "Precio"
#. module: sale
#: model:process.transition,note:sale.process_transition_deliver0
@@ -1539,10 +1721,15 @@ msgstr ""
"entrega de forma manual o automática."
#. module: sale
-#: code:addons/sale/sale.py:1165
-#, python-format
-msgid "Cannot delete a sales order line which is %s !"
-msgstr "¡No se puede eliminar una línea de pedido de venta que está %s!"
+#: selection:sale.order,order_policy:0
+msgid "Pay before delivery"
+msgstr ""
+
+#. module: sale
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.open_board_sales
+msgid "Sales Dashboard"
+msgstr ""
#. module: sale
#: model:ir.actions.act_window,name:sale.action_sale_order_make_invoice
@@ -1553,6 +1740,7 @@ msgstr "Realizar facturas"
#. module: sale
#: view:sale.order:0
+#: selection:sale.order,state:0
#: view:sale.order.line:0
msgid "To Invoice"
msgstr "Para facturar"
@@ -1563,6 +1751,11 @@ msgid "Date on which sales order is confirmed."
msgstr "Fecha en la que se confirma el pedido de venta."
#. module: sale
+#: field:sale.order,project_id:0
+msgid "Contract/Analytic Account"
+msgstr ""
+
+#. module: sale
#: field:sale.order,company_id:0
#: field:sale.order.line,company_id:0
#: view:sale.report:0
@@ -1582,10 +1775,12 @@ msgid "The amount to be invoiced in advance."
msgstr "El importe a facturar por adelantado."
#. module: sale
-#: selection:sale.order,state:0
-#: selection:sale.report,state:0
-msgid "Invoice Exception"
-msgstr "Excepción de factura"
+#: code:addons/sale/sale.py:1256
+#, python-format
+msgid ""
+"Couldn't find a pricelist line matching this product and quantity.\n"
+"You have to change either the product, the quantity or the pricelist."
+msgstr ""
#. module: sale
#: help:sale.order,picking_ids:0
@@ -1596,15 +1791,6 @@ msgstr ""
"venta."
#. module: sale
-#: help:sale.installer,sale_margin:0
-msgid ""
-"Gives the margin of profitability by calculating the difference between Unit "
-"Price and Cost Price."
-msgstr ""
-"Indica el margen de rentabilidad mediante el cálculo de la diferencia entre "
-"el precio unitario y el precio de coste."
-
-#. module: sale
#: view:sale.make.invoice:0
#: view:sale.order.line.make.invoice:0
msgid "Create invoices"
@@ -1623,6 +1809,11 @@ msgid "Cancelled"
msgstr "Cancelado"
#. module: sale
+#: view:sale.order.line:0
+msgid "Sales Order Lines related to a Sales Order of mine"
+msgstr ""
+
+#. module: sale
#: model:ir.actions.act_window,name:sale.action_shop_form
#: model:ir.ui.menu,name:sale.menu_action_shop_form
#: field:sale.order,shop_id:0
@@ -1632,17 +1823,12 @@ msgid "Shop"
msgstr "Tienda"
#. module: sale
-#: view:sale.report:0
-msgid " Month "
-msgstr " Mes "
-
-#. module: sale
#: field:sale.report,date_confirm:0
msgid "Date Confirm"
msgstr "Fecha confirmación"
#. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:111
+#: code:addons/sale/wizard/sale_line_invoice.py:113
#, python-format
msgid "Warning"
msgstr "Aviso"
@@ -1654,22 +1840,6 @@ msgid "Sales by Month"
msgstr "Ventas por mes"
#. module: sale
-#: code:addons/sale/sale.py:1045
-#, python-format
-msgid ""
-"You selected a quantity of %d Units.\n"
-"But it's not compatible with the selected packaging.\n"
-"Here is a proposition of quantities according to the packaging:\n"
-"\n"
-"EAN: %s Quantity: %s Type of ul: %s"
-msgstr ""
-"Ha seleccionado una cantidad de %d unidades.\n"
-"Pero no es compatible con el embalaje seleccionado.\n"
-"Aquí tiene una propuesta de cantidades acordes con este embalaje:\n"
-"\n"
-"EAN: %s Cantidad: %s Tipo de ul: %s"
-
-#. module: sale
#: model:ir.model,name:sale.model_sale_order
#: model:process.node,name:sale.process_node_order0
#: model:process.node,name:sale.process_node_saleorder0
@@ -1685,6 +1855,11 @@ msgid "Quantity (UoS)"
msgstr "Cantidad (UdV)"
#. module: sale
+#: view:sale.order.line:0
+msgid "Sale Order Lines that are in 'done' state"
+msgstr ""
+
+#. module: sale
#: model:process.transition,note:sale.process_transition_packing0
msgid ""
"The Pick List form is created as soon as the sales order is confirmed, in "
@@ -1703,6 +1878,11 @@ msgid "Confirmed"
msgstr "Confirmado"
#. module: sale
+#: field:sale.config.picking_policy,order_policy:0
+msgid "Main Method Based On"
+msgstr ""
+
+#. module: sale
#: model:process.transition.action,name:sale.process_transition_action_confirm0
msgid "Confirm"
msgstr "Confirmar"
@@ -1725,6 +1905,7 @@ msgid "Invoice Lines"
msgstr "Líneas de factura"
#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_product_tree
#: view:sale.order:0
#: view:sale.order.line:0
msgid "Sales Order Lines"
@@ -1741,33 +1922,18 @@ msgid "Configuration"
msgstr "Configuración"
#. module: sale
-#: selection:sale.order,picking_policy:0
-msgid "Complete Delivery"
-msgstr "Envío completo"
+#: code:addons/sale/edi/sale_order.py:146
+#, python-format
+msgid "EDI Pricelist (%s)"
+msgstr ""
#. module: sale
#: view:sale.report:0
-msgid " Month-1 "
-msgstr " Mes-1 "
-
-#. module: sale
-#: help:sale.config.picking_policy,picking_policy:0
-msgid ""
-"The Shipping Policy is used to configure per order if you want to deliver as "
-"soon as possible when one product is available or you wait that all products "
-"are available.."
+msgid "Sales order created in current year"
msgstr ""
-"La política de envío se utiliza para configurar el pedido si debe entregarse "
-"tan pronto como sea posible cuando un producto está disponible o debe "
-"esperar a que todos los productos están disponibles."
#. module: sale
-#: selection:sale.report,month:0
-msgid "August"
-msgstr "Agosto"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:111
+#: code:addons/sale/wizard/sale_line_invoice.py:113
#, python-format
msgid ""
"Invoice cannot be created for this Sales Order Line due to one of the "
@@ -1782,6 +1948,11 @@ msgstr ""
"2. La línea del pedido de venta está facturada."
#. module: sale
+#: view:sale.order.line:0
+msgid "Sale order lines done"
+msgstr ""
+
+#. module: sale
#: field:sale.order.line,th_weight:0
msgid "Weight"
msgstr "Peso"
@@ -1800,7 +1971,6 @@ msgstr "Diciembre"
#. module: sale
#: field:sale.config.picking_policy,config_logo:0
-#: field:sale.installer,config_logo:0
msgid "Image"
msgstr "Imagen"
@@ -1834,9 +2004,9 @@ msgid "Salesman"
msgstr "Comercial"
#. module: sale
-#: model:process.node,note:sale.process_node_saleorder0
-msgid "Drives procurement and invoicing"
-msgstr "Genera abastecimiento y facturación"
+#: model:ir.actions.act_window,name:sale.action_order_tree
+msgid "Old Quotations"
+msgstr "Presupuestos antiguos"
#. module: sale
#: field:sale.order,amount_untaxed:0
@@ -1844,7 +2014,7 @@ msgid "Untaxed Amount"
msgstr "Base imponible"
#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:163
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:170
#: model:ir.actions.act_window,name:sale.action_view_sale_advance_payment_inv
#: view:sale.advance.payment.inv:0
#: view:sale.order:0
@@ -1853,7 +2023,7 @@ msgid "Advance Invoice"
msgstr "Avanzar factura"
#. module: sale
-#: code:addons/sale/sale.py:591
+#: code:addons/sale/sale.py:624
#, python-format
msgid "The sales order '%s' has been cancelled."
msgstr "El pedido de venta '%s' ha sido cancelado."
@@ -1897,20 +2067,20 @@ msgid "Packings"
msgstr "Albaranes"
#. module: sale
-#: field:sale.config.picking_policy,progress:0
-#: field:sale.installer,progress:0
-msgid "Configuration Progress"
-msgstr "Progreso configuración"
+#: view:sale.order.line:0
+msgid "Sale Order Lines ready to be invoiced"
+msgstr ""
#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_product_tree
-msgid "Product sales"
-msgstr "Ventas de producto"
+#: view:sale.report:0
+msgid "Sales order created in last month"
+msgstr ""
#. module: sale
-#: field:sale.order,date_order:0
-msgid "Ordered Date"
-msgstr "Fecha ordenada"
+#: model:ir.actions.act_window,name:sale.action_email_templates
+#: model:ir.ui.menu,name:sale.menu_email_templates
+msgid "Email Templates"
+msgstr ""
#. module: sale
#: model:ir.actions.act_window,name:sale.action_order_form
@@ -1920,14 +2090,15 @@ msgid "Sales Orders"
msgstr "Pedidos de ventas"
#. module: sale
-#: selection:sale.config.picking_policy,picking_policy:0
-msgid "Direct Delivery"
-msgstr "Envío directo"
+#: model:ir.model,name:sale.model_sale_shop
+#: view:sale.shop:0
+msgid "Sales Shop"
+msgstr "Tienda ventas"
#. module: sale
-#: field:sale.installer,sale_journal:0
-msgid "Invoicing journals"
-msgstr "Diarios de facturación"
+#: selection:sale.report,month:0
+msgid "November"
+msgstr "Noviembre"
#. module: sale
#: field:sale.advance.payment.inv,product_id:0
@@ -1935,18 +2106,12 @@ msgid "Advance Product"
msgstr "Producto avanzado"
#. module: sale
-#: view:sale.report:0
-#: field:sale.report,shipped_qty_1:0
-msgid "Shipped Qty"
-msgstr "Ctdad enviada"
-
-#. module: sale
-#: view:sale.open.invoice:0
-msgid "You invoice has been successfully created!"
-msgstr "¡La factura ha sido creada correctamente!"
+#: view:sale.order:0
+msgid "Compute"
+msgstr "Calcular"
#. module: sale
-#: code:addons/sale/sale.py:585
+#: code:addons/sale/sale.py:618
#, python-format
msgid "You must first cancel all invoices attached to this sales order."
msgstr ""
@@ -1959,25 +2124,15 @@ msgid "January"
msgstr "Enero"
#. module: sale
-#: view:sale.installer:0
-msgid "Configure Your Sales Management Application"
-msgstr "Configurar su aplicación de gestión de ventas"
-
-#. module: sale
#: model:ir.actions.act_window,name:sale.action_order_tree4
msgid "Sales Order in Progress"
msgstr "Pedidos de ventas en proceso"
#. module: sale
-#: field:sale.installer,sale_layout:0
-msgid "Sales Order Layout Improvement"
-msgstr "Mejora plantilla pedido de venta"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:63
-#, python-format
-msgid "Error"
-msgstr "Error"
+#: help:sale.order,origin:0
+msgid "Reference of the document that generated this sales order request."
+msgstr ""
+"Referencia del documento que ha generado esta solicitud de pedido de venta."
#. module: sale
#: view:sale.report:0
@@ -1986,6 +2141,11 @@ msgid "Commitment Delay"
msgstr "Retraso realización"
#. module: sale
+#: selection:sale.order,order_policy:0
+msgid "Deliver & invoice on demand"
+msgstr ""
+
+#. module: sale
#: model:process.node,note:sale.process_node_saleprocurement0
msgid ""
"One Procurement order for each sales order line and for each of the "
@@ -2010,13 +2170,12 @@ msgid "Confirmed sales order to invoice."
msgstr "Pedido de venta confirmado a factura."
#. module: sale
-#: code:addons/sale/sale.py:290
-#, python-format
-msgid "Cannot delete Sales Order(s) which are already confirmed !"
-msgstr "¡No se puede eliminar pedido(s) de venta que ya está confirmado!"
+#: view:sale.order:0
+msgid "Sales Order that haven't yet been confirmed"
+msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:316
+#: code:addons/sale/sale.py:322
#, python-format
msgid "The sales order '%s' has been set in draft state."
msgstr "El pedido de venta '%s' ha sido cambiado a estado borrador."
@@ -2027,37 +2186,27 @@ msgid "from stock"
msgstr "desde stock"
#. module: sale
-#: field:sale.config.picking_policy,order_policy:0
-msgid "Shipping Default Policy"
-msgstr "Política de envío por defecto"
-
-#. module: sale
#: view:sale.open.invoice:0
msgid "Close"
msgstr "Cerrar"
#. module: sale
+#: code:addons/sale/sale.py:1248
+#, python-format
+msgid "No Pricelist ! : "
+msgstr ""
+
+#. module: sale
#: field:sale.order,shipped:0
msgid "Delivered"
msgstr "Entregado"
#. module: sale
-#: code:addons/sale/sale.py:1115
-#, python-format
-msgid "Not enough stock !"
-msgstr "¡No hay stock suficiente!"
-
-#. module: sale
#: constraint:stock.move:0
msgid "You must assign a production lot for this product"
msgstr "Debe asignar un lote de producción para este producto"
#. module: sale
-#: field:sale.order.line,sequence:0
-msgid "Layout Sequence"
-msgstr "Secuencia plantilla"
-
-#. module: sale
#: model:ir.actions.act_window,help:sale.action_shop_form
msgid ""
"If you have more than one shop reselling your company products, you can "
@@ -2089,12 +2238,6 @@ msgid "May"
msgstr "Mayo"
#. module: sale
-#: help:sale.installer,sale_order_dates:0
-msgid "Adds commitment, requested and effective dates on Sales Orders."
-msgstr ""
-"Añade fechas de realización, solicitud y efectivo en pedidos de venta."
-
-#. module: sale
#: view:sale.order:0
#: field:sale.order,partner_id:0
#: field:sale.order.line,order_partner_id:0
@@ -2102,25 +2245,11 @@ msgid "Customer"
msgstr "Cliente"
#. module: sale
-#: model:product.template,name:sale.advance_product_0_product_template
-msgid "Advance"
-msgstr "Anticipo"
-
-#. module: sale
#: selection:sale.report,month:0
msgid "February"
msgstr "Febrero"
#. module: sale
-#: help:sale.installer,sale_journal:0
-msgid ""
-"Allows you to group and invoice your delivery orders according to different "
-"invoicing types: daily, weekly, etc."
-msgstr ""
-"Permite agrupar y facturar sus albaranes de acuerdo a diferentes tipos de "
-"facturación: diaria, semanal, etc."
-
-#. module: sale
#: selection:sale.report,month:0
msgid "April"
msgstr "Abril"
@@ -2131,11 +2260,6 @@ msgid "Accounting"
msgstr "Contabilidad"
#. module: sale
-#: field:sale.config.picking_policy,step:0
-msgid "Steps To Deliver a Sales Order"
-msgstr "Pasos para entregar un pedido de venta"
-
-#. module: sale
#: view:sale.order:0
#: view:sale.order.line:0
msgid "Search Sales Order"
@@ -2147,20 +2271,18 @@ msgid "Sales Order Requisition"
msgstr "Solicitud pedido de venta"
#. module: sale
+#: code:addons/sale/sale.py:1242
+#, python-format
+msgid "Not enough stock ! : "
+msgstr ""
+
+#. module: sale
#: report:sale.order:0
#: field:sale.order,payment_term:0
msgid "Payment Term"
msgstr "Plazo de pago"
#. module: sale
-#: help:sale.installer,sale_layout:0
-msgid ""
-"Provides some features to improve the layout of the Sales Order reports."
-msgstr ""
-"Proporciona algunas funcionalidades para mejorar la plantilla de los "
-"informes de pedidos de ventas."
-
-#. module: sale
#: model:ir.actions.act_window,help:sale.action_order_report_all
msgid ""
"This report performs analysis on your quotations and sales orders. Analysis "
@@ -2198,6 +2320,208 @@ msgstr "Año"
msgid "Invoice Based on Deliveries"
msgstr "Facturar desde albaranes"
+#~ msgid "Allows you to compute delivery costs on your quotations."
+#~ msgstr "Le permite calcular los costos de envío en sus presupuestos."
+
+#~ msgid "Configure Sales Order Logistics"
+#~ msgstr "Configurar logística pedidos de venta"
+
+#~ msgid "Payment Before Delivery"
+#~ msgstr "Pago antes del envío"
+
+#~ msgid "All at Once"
+#~ msgstr "Todo a la vez"
+
+#~ msgid "Configure Picking Policy for Sales Order"
+#~ msgstr "Configurar la política envío para pedidos de venta"
+
+#~ msgid "Shipping Default Policy"
+#~ msgstr "Política de envío por defecto"
+
+#~ msgid "Configure"
+#~ msgstr "Configurar"
+
+#~ msgid "Delivery Order Only"
+#~ msgstr "Sólo orden de entrega"
+
+#~ msgid "Enhance your core Sales Application with additional functionalities."
+#~ msgstr "Optimizar su aplicación de ventas con funcionalidades adicionales."
+
+#~ msgid "Order Reference must be unique !"
+#~ msgstr "¡La referencia del pedido debe ser única!"
+
+#~ msgid "Setup your sales workflow and default values."
+#~ msgstr "Configurar su flujo de ventas y valores por defecto."
+
+#~ msgid "Invoice On Order After Delivery"
+#~ msgstr "Facturar pedido después de envío"
+
+#~ msgid " Year "
+#~ msgstr " Año "
+
+#~ msgid "Picking Default Policy"
+#~ msgstr "Política de empaquetado por defecto"
+
+#, python-format
+#~ msgid "You cannot cancel a sales order line that has already been invoiced !"
+#~ msgstr ""
+#~ "¡No puede cancelar una línea de pedido de venta que ya ha sido facturada!"
+
+#~ msgid "Sales Order Dates"
+#~ msgstr "Fechas en pedidos de venta"
+
+#~ msgid "Margins in Sales Orders"
+#~ msgstr "Márgenes en pedidos de venta"
+
+#~ msgid "Sales Application Configuration"
+#~ msgstr "Configuración aplicaciones de ventas"
+
+#~ msgid "Delivery Costs"
+#~ msgstr "Costes de envío"
+
+#~ msgid "Partial Delivery"
+#~ msgstr "Envío parcial"
+
+#~ msgid "title"
+#~ msgstr "título"
+
+#~ msgid "Order date"
+#~ msgstr "Fecha pedido"
+
+#~ msgid "Shipping Policy"
+#~ msgstr "Política de facturación"
+
+#~ msgid "Shipping & Manual Invoice"
+#~ msgstr "Enviar & Factura manual"
+
+#, python-format
+#~ msgid "Picking Information !"
+#~ msgstr "¡Información albarán!"
+
+#~ msgid "Sales Management"
+#~ msgstr "Ventas"
+
+#~ msgid "Invoice From The Picking"
+#~ msgstr "Factura desde el albarán"
+
+#~ msgid ""
+#~ "By default, OpenERP is able to manage complex routing and paths of products "
+#~ "in your warehouse and partner locations. This will configure the most common "
+#~ "and simple methods to deliver products to the customer in one or two "
+#~ "operations by the worker."
+#~ msgstr ""
+#~ "Por defecto, OpenERP es capaz de gestionar complejas rutas y caminos de los "
+#~ "productos en su almacén y en las ubicaciones de otras empresas. Esto "
+#~ "configurará los métodos más comunes y sencillos para entregar los productos "
+#~ "al cliente en una o dos operaciones realizadas por el trabajador."
+
+#~ msgid "sale.installer"
+#~ msgstr "venta.instalador"
+
+#~ msgid "Invoicing"
+#~ msgstr "Facturación"
+
+#, python-format
+#~ msgid "Cannot delete a sales order line which is %s !"
+#~ msgstr "¡No se puede eliminar una línea de pedido de venta que está %s!"
+
+#~ msgid ""
+#~ "Gives the margin of profitability by calculating the difference between Unit "
+#~ "Price and Cost Price."
+#~ msgstr ""
+#~ "Indica el margen de rentabilidad mediante el cálculo de la diferencia entre "
+#~ "el precio unitario y el precio de coste."
+
+#~ msgid " Month "
+#~ msgstr " Mes "
+
+#, python-format
+#~ msgid ""
+#~ "You selected a quantity of %d Units.\n"
+#~ "But it's not compatible with the selected packaging.\n"
+#~ "Here is a proposition of quantities according to the packaging:\n"
+#~ "\n"
+#~ "EAN: %s Quantity: %s Type of ul: %s"
+#~ msgstr ""
+#~ "Ha seleccionado una cantidad de %d unidades.\n"
+#~ "Pero no es compatible con el embalaje seleccionado.\n"
+#~ "Aquí tiene una propuesta de cantidades acordes con este embalaje:\n"
+#~ "\n"
+#~ "EAN: %s Cantidad: %s Tipo de ul: %s"
+
+#~ msgid "Complete Delivery"
+#~ msgstr "Envío completo"
+
+#~ msgid " Month-1 "
+#~ msgstr " Mes-1 "
+
+#~ msgid ""
+#~ "The Shipping Policy is used to configure per order if you want to deliver as "
+#~ "soon as possible when one product is available or you wait that all products "
+#~ "are available.."
+#~ msgstr ""
+#~ "La política de envío se utiliza para configurar el pedido si debe entregarse "
+#~ "tan pronto como sea posible cuando un producto está disponible o debe "
+#~ "esperar a que todos los productos están disponibles."
+
+#~ msgid "Configuration Progress"
+#~ msgstr "Progreso configuración"
+
+#~ msgid "Product sales"
+#~ msgstr "Ventas de producto"
+
+#~ msgid "Ordered Date"
+#~ msgstr "Fecha ordenada"
+
+#~ msgid "Direct Delivery"
+#~ msgstr "Envío directo"
+
+#~ msgid "Invoicing journals"
+#~ msgstr "Diarios de facturación"
+
+#~ msgid "Shipped Qty"
+#~ msgstr "Ctdad enviada"
+
+#~ msgid "Configure Your Sales Management Application"
+#~ msgstr "Configurar su aplicación de gestión de ventas"
+
+#~ msgid "Sales Order Layout Improvement"
+#~ msgstr "Mejora plantilla pedido de venta"
+
+#, python-format
+#~ msgid "Cannot delete Sales Order(s) which are already confirmed !"
+#~ msgstr "¡No se puede eliminar pedido(s) de venta que ya está confirmado!"
+
+#, python-format
+#~ msgid "Not enough stock !"
+#~ msgstr "¡No hay stock suficiente!"
+
+#~ msgid "Layout Sequence"
+#~ msgstr "Secuencia plantilla"
+
+#~ msgid "Adds commitment, requested and effective dates on Sales Orders."
+#~ msgstr ""
+#~ "Añade fechas de realización, solicitud y efectivo en pedidos de venta."
+
+#~ msgid "Advance"
+#~ msgstr "Anticipo"
+
+#~ msgid ""
+#~ "Allows you to group and invoice your delivery orders according to different "
+#~ "invoicing types: daily, weekly, etc."
+#~ msgstr ""
+#~ "Permite agrupar y facturar sus albaranes de acuerdo a diferentes tipos de "
+#~ "facturación: diaria, semanal, etc."
+
+#~ msgid "Steps To Deliver a Sales Order"
+#~ msgstr "Pasos para entregar un pedido de venta"
+
+#~ msgid ""
+#~ "Provides some features to improve the layout of the Sales Order reports."
+#~ msgstr ""
+#~ "Proporciona algunas funcionalidades para mejorar la plantilla de los "
+#~ "informes de pedidos de ventas."
+
#~ msgid "Configure Sale Order Logistic"
#~ msgstr "Configurar la logística de los pedidos de venta"
@@ -2341,9 +2665,6 @@ msgstr "Facturar desde albaranes"
#~ msgid "Procurement for each line"
#~ msgstr "Abastecimiento para cada línea"
-#~ msgid "My Quotations"
-#~ msgstr "Mis presupuestos"
-
#~ msgid "Manages the delivery and invoicing progress"
#~ msgstr "Gestiona el progreso de envío y facturación"
@@ -2635,3 +2956,53 @@ msgstr "Facturar desde albaranes"
#~ "hayan procesado.\n"
#~ " - La opción 'Factura desde albarán' se utiliza para crear una factura "
#~ "durante el proceso de los albaranes."
+
+#~ msgid ""
+#~ "\n"
+#~ " The base module to manage quotations and sales orders.\n"
+#~ "\n"
+#~ " * Workflow with validation steps:\n"
+#~ " - Quotation -> Sales order -> Invoice\n"
+#~ " * Invoicing methods:\n"
+#~ " - Invoice on order (before or after shipping)\n"
+#~ " - Invoice on delivery\n"
+#~ " - Invoice on timesheets\n"
+#~ " - Advance invoice\n"
+#~ " * Partners preferences (shipping, invoicing, incoterm, ...)\n"
+#~ " * Products stocks and prices\n"
+#~ " * Delivery methods:\n"
+#~ " - all at once, multi-parcel\n"
+#~ " - delivery costs\n"
+#~ " * Dashboard for salesman that includes:\n"
+#~ " * Your open quotations\n"
+#~ " * Top 10 sales of the month\n"
+#~ " * Cases statistics\n"
+#~ " * Graph of sales by product\n"
+#~ " * Graph of cases of the month\n"
+#~ " "
+#~ msgstr ""
+#~ "\n"
+#~ " El módulo base para gestionar presupuestos y pedidos de venta.\n"
+#~ "\n"
+#~ " * Flujo de trabajo con etapas de validación:\n"
+#~ " - Presupuesto -> Pedido de venta -> Factura\n"
+#~ " * Métodos de facturación:\n"
+#~ " - Factura del pedido (antes o después del envío)\n"
+#~ " - Factura del albarán\n"
+#~ " - Factura de la hoja de servicios\n"
+#~ " - Avanzar factura\n"
+#~ " * Preferencias de los clientes (envío, facturación, incoterm, ...)\n"
+#~ " * Existencias de los productos y precios\n"
+#~ " * Formas de envío:\n"
+#~ " - Todo a la vez, En varios paquetes\n"
+#~ " - Gastos de envío\n"
+#~ " * El tablero para el comercial incluye:\n"
+#~ " * Sus presupuestos abiertos\n"
+#~ " * Las 10 mejores ventas del mes\n"
+#~ " * Estadísticas de casos\n"
+#~ " * Gráfico de las ventas por producto\n"
+#~ " * Gráfico de los casos por mes\n"
+#~ " "
+
+#~ msgid "Picking List & Delivery Order"
+#~ msgstr "Guía de despacho y Orden de entrega"
diff --git a/addons/sale/i18n/es_EC.po b/addons/sale/i18n/es_EC.po
index 09ca639be4c..479fecbcd14 100644
--- a/addons/sale/i18n/es_EC.po
+++ b/addons/sale/i18n/es_EC.po
@@ -6,15 +6,27 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2011-01-11 11:16+0000\n"
+"POT-Creation-Date: 2011-12-22 18:43+0000\n"
"PO-Revision-Date: 2010-12-21 04:49+0000\n"
"Last-Translator: Cristian Salamea (Gnuthink) <ovnicraft@gmail.com>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-05 05:17+0000\n"
-"X-Generator: Launchpad (build 14231)\n"
+"X-Launchpad-Export-Date: 2011-12-23 06:47+0000\n"
+"X-Generator: Launchpad (build 14560)\n"
+
+#. module: sale
+#: field:sale.config.picking_policy,timesheet:0
+msgid "Based on Timesheet"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid ""
+"Sale Order Lines that are confirmed, done or in exception state and haven't "
+"yet been invoiced"
+msgstr ""
#. module: sale
#: view:board.board:0
@@ -23,11 +35,6 @@ msgid "Sales by Salesman in last 90 days"
msgstr ""
#. module: sale
-#: help:sale.installer,delivery:0
-msgid "Allows you to compute delivery costs on your quotations."
-msgstr "Permite calcular los costos de envío en las peticiones."
-
-#. module: sale
#: help:sale.order,picking_policy:0
msgid ""
"If you don't have enough stock available to deliver all at once, do you "
@@ -37,6 +44,11 @@ msgstr ""
"¿acepta envíos parciales o no?"
#. module: sale
+#: view:sale.order:0
+msgid "UoS"
+msgstr ""
+
+#. module: sale
#: help:sale.order,partner_shipping_id:0
msgid "Shipping address for current sales order."
msgstr ""
@@ -60,22 +72,12 @@ msgid "Cancel Order"
msgstr "Cancelar pedido"
#. module: sale
-#: view:sale.config.picking_policy:0
-msgid "Configure Sales Order Logistics"
-msgstr "Configurar logística pedidos de venta"
-
-#. module: sale
-#: code:addons/sale/sale.py:603
+#: code:addons/sale/sale.py:638
#, python-format
msgid "The quotation '%s' has been converted to a sales order."
msgstr ""
#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Payment Before Delivery"
-msgstr "Pago antes del envío"
-
-#. module: sale
#: code:addons/sale/wizard/sale_make_invoice.py:42
#, python-format
msgid "Warning !"
@@ -92,12 +94,6 @@ msgid "Drives procurement orders for every sales order line."
msgstr ""
#. module: sale
-#: selection:sale.config.picking_policy,picking_policy:0
-msgid "All at Once"
-msgstr "Todo a la vez"
-
-#. module: sale
-#: field:sale.order,project_id:0
#: view:sale.report:0
#: field:sale.report,analytic_account_id:0
#: field:sale.shop,project_id:0
@@ -113,6 +109,15 @@ msgid ""
msgstr ""
#. module: sale
+#: code:addons/sale/sale.py:295
+#, python-format
+msgid ""
+"In order to delete a confirmed sale order, you must cancel it before ! To "
+"cancel a sale order, you must first cancel related picking or delivery "
+"orders."
+msgstr ""
+
+#. module: sale
#: model:process.node,name:sale.process_node_saleprocurement0
msgid "Procurement Order"
msgstr "Orden de Adquisición"
@@ -124,6 +129,11 @@ msgid "Partner"
msgstr "Empresa"
#. module: sale
+#: selection:sale.order,order_policy:0
+msgid "Invoice based on deliveries"
+msgstr ""
+
+#. module: sale
#: view:sale.order:0
msgid "Order Line"
msgstr "Línea de pedido"
@@ -161,10 +171,14 @@ msgid "Default Payment Term"
msgstr "Plazo de pago por defecto"
#. module: sale
-#: model:ir.actions.act_window,name:sale.action_config_picking_policy
-msgid "Configure Picking Policy for Sales Order"
+#: field:sale.config.picking_policy,deli_orders:0
+msgid "Based on Delivery Orders"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.picking_policy,time_unit:0
+msgid "Main Working Time Unit"
msgstr ""
-"Configurar la Politica de paquete de productos de los pedidos de ventas"
#. module: sale
#: view:sale.order:0
@@ -180,9 +194,10 @@ msgid "Disc.(%)"
msgstr "Desc.(%)"
#. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_forceassignation0
-msgid "Force Assignation"
-msgstr "Forzar asignación"
+#: view:sale.report:0
+#: field:sale.report,price_total:0
+msgid "Total Price"
+msgstr "Precio Total"
#. module: sale
#: help:sale.make.invoice,grouped:0
@@ -190,6 +205,11 @@ msgid "Check the box to group the invoices for the same customers"
msgstr "Seleccione para agrupar las facturas del mismo cliente"
#. module: sale
+#: view:sale.order:0
+msgid "My Sale Orders"
+msgstr ""
+
+#. module: sale
#: selection:sale.order,invoice_quantity:0
msgid "Ordered Quantities"
msgstr "Cantidades ordenadas"
@@ -230,14 +250,25 @@ msgstr ""
"from pick' o 'Factura después de la entrega'"
#. module: sale
+#: field:sale.config.picking_policy,task_work:0
+msgid "Based on Tasks' Work"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
+msgid "Quotations and Sales"
+msgstr ""
+
+#. module: sale
#: model:ir.model,name:sale.model_sale_make_invoice
msgid "Sales Make Invoice"
msgstr ""
#. module: sale
-#: view:sale.order:0
-msgid "Recreate Packing"
-msgstr "Recrear Picking"
+#: code:addons/sale/sale.py:330
+#, python-format
+msgid "Pricelist Warning!"
+msgstr ""
#. module: sale
#: field:sale.order.line,discount:0
@@ -245,11 +276,10 @@ msgid "Discount (%)"
msgstr "Descuento (%)"
#. module: sale
-#: help:res.company,security_lead:0
-msgid ""
-"This is the days added to what you promise to customers for security purpose"
-msgstr ""
-"Son los días agregados que garantiza a los clientes por razones de seguridad"
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_quotation_for_sale
+msgid "My Quotations"
+msgstr "Mis presupuestos"
#. module: sale
#: view:board.board:0
@@ -274,7 +304,22 @@ msgid "Shop Name"
msgstr "Nombre tienda"
#. module: sale
-#: code:addons/sale/sale.py:1014
+#: help:sale.order,order_policy:0
+msgid ""
+"The Invoice Policy is used to synchronise invoice and delivery operations.\n"
+" - The 'Pay before delivery' choice will first generate the invoice and "
+"then generate the picking order after the payment of this invoice.\n"
+" - The 'Deliver & Invoice on demand' will create the picking order directly "
+"and wait for the user to manually click on the 'Invoice' button to generate "
+"the draft invoice based on the sale order or the sale order lines.\n"
+" - The 'Invoice on order after delivery' choice will generate the draft "
+"invoice based on sales order after all picking lists have been finished.\n"
+" - The 'Invoice based on deliveries' choice is used to create an invoice "
+"during the picking process."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:1158
#, python-format
msgid "No Customer Defined !"
msgstr "¡Cliente no definido!"
@@ -285,9 +330,12 @@ msgid "Sales in Exception"
msgstr "Ventas en excepción"
#. module: sale
-#: view:sale.order:0
-msgid "Set to Draft"
-msgstr "Cambiar a borrador"
+#: code:addons/sale/sale.py:1145
+#: code:addons/sale/sale.py:1264
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:70
+#, python-format
+msgid "Configuration Error !"
+msgstr ""
#. module: sale
#: view:sale.order:0
@@ -295,22 +343,7 @@ msgid "Conditions"
msgstr "Condiciones"
#. module: sale
-#: help:sale.order,order_policy:0
-msgid ""
-"The Shipping Policy is used to synchronise invoice and delivery operations.\n"
-" - The 'Pay Before delivery' choice will first generate the invoice and "
-"then generate the picking order after the payment of this invoice.\n"
-" - The 'Shipping & Manual Invoice' will create the picking order directly "
-"and wait for the user to manually click on the 'Invoice' button to generate "
-"the draft invoice.\n"
-" - The 'Invoice On Order After Delivery' choice will generate the draft "
-"invoice based on sales order after all picking lists have been finished.\n"
-" - The 'Invoice From The Picking' choice is used to create an invoice "
-"during the picking process."
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:939
+#: code:addons/sale/sale.py:1034
#, python-format
msgid ""
"There is no income category account defined in default Properties for "
@@ -321,9 +354,9 @@ msgstr ""
"definida!"
#. module: sale
-#: view:sale.installer:0
-msgid "Configure"
-msgstr "Configurar"
+#: selection:sale.report,month:0
+msgid "August"
+msgstr "Agosto"
#. module: sale
#: constraint:stock.move:0
@@ -331,7 +364,7 @@ msgid "You try to assign a lot which is not from the same product"
msgstr "Está intentando asignar un lote que no es del mismo producto"
#. module: sale
-#: code:addons/sale/sale.py:620
+#: code:addons/sale/sale.py:655
#, python-format
msgid "invalid mode for test_state"
msgstr "modo invalido para test_state"
@@ -342,7 +375,7 @@ msgid "June"
msgstr "Junio"
#. module: sale
-#: code:addons/sale/sale.py:584
+#: code:addons/sale/sale.py:617
#, python-format
msgid "Could not cancel this sales order !"
msgstr ""
@@ -363,8 +396,12 @@ msgid "October"
msgstr "Octubre"
#. module: sale
+#: sql_constraint:stock.picking:0
+msgid "Reference must be unique per Company!"
+msgstr ""
+
+#. module: sale
#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_quotation_for_sale
#: view:sale.order:0
#: view:sale.report:0
msgid "Quotations"
@@ -376,11 +413,6 @@ msgid "Pricelist for current sales order."
msgstr ""
#. module: sale
-#: selection:sale.config.picking_policy,step:0
-msgid "Delivery Order Only"
-msgstr "Sólo orden de entrega"
-
-#. module: sale
#: report:sale.order:0
msgid "TVA :"
msgstr "TVA :"
@@ -407,6 +439,7 @@ msgstr "Posición fiscal"
#. module: sale
#: view:sale.order:0
#: view:sale.order.line:0
+#: field:sale.report,product_uom:0
msgid "UoM"
msgstr "UdM"
@@ -429,13 +462,19 @@ msgid ""
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:971
+#: code:addons/sale/sale.py:1061
+#, python-format
+msgid "You cannot cancel a sale order line that has already been invoiced!"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:1066
#, python-format
msgid "You must first cancel stock moves attached to this sales order line."
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:1042
+#: code:addons/sale/sale.py:1134
#, python-format
msgid "(n/a)"
msgstr "(n/a)"
@@ -471,14 +510,36 @@ msgid "Notes"
msgstr "Notas"
#. module: sale
+#: sql_constraint:res.company:0
+msgid "The company name must be unique !"
+msgstr ""
+
+#. module: sale
#: help:sale.order,partner_invoice_id:0
msgid "Invoice address for current sales order."
msgstr ""
#. module: sale
-#: view:sale.installer:0
-msgid "Enhance your core Sales Application with additional functionalities."
-msgstr "Optimizar su aplicación de ventas con funcionalidades adicionales."
+#: view:sale.report:0
+msgid "Month-1"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered month of the sales order"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:504
+#, python-format
+msgid ""
+"You cannot group sales having different currencies for the same partner."
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,picking_policy:0
+msgid "Deliver each product when available"
+msgstr ""
#. module: sale
#: field:sale.order,invoiced_rate:0
@@ -497,21 +558,43 @@ msgid "Confirmation Date"
msgstr "Fecha de confirmación"
#. module: sale
+#: field:sale.order,incoterm:0
+msgid "Incoterm"
+msgstr "Incoterm"
+
+#. module: sale
#: field:sale.order.line,address_allotment_id:0
msgid "Allotment Partner"
msgstr "Ubicación empresa"
#. module: sale
-#: sql_constraint:sale.order:0
-msgid "Order Reference must be unique !"
-msgstr ""
-
-#. module: sale
#: selection:sale.report,month:0
msgid "March"
msgstr "Marzo"
#. module: sale
+#: constraint:stock.move:0
+msgid "You can not move products from or to a location of the type view."
+msgstr ""
+
+#. module: sale
+#: field:sale.config.picking_policy,sale_orders:0
+msgid "Based on Sales Orders"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,state:0
+msgid ""
+"Givwizard = self.browse(cr, uid, ids)[0]es the state of the quotation or "
+"sales order. \n"
+"The exception state is automatically set when a cancel operation occurs in "
+"the invoice validation (Invoice Exception) or in the picking list process "
+"(Shipping Exception). \n"
+"The 'Waiting Schedule' state is set when the invoice is confirmed but "
+"waiting for the scheduler to run on the order date."
+msgstr ""
+
+#. module: sale
#: help:sale.order,amount_total:0
msgid "The total amount."
msgstr ""
@@ -527,6 +610,11 @@ msgid "Invoice address :"
msgstr "Dirección factura:"
#. module: sale
+#: field:sale.order.line,sequence:0
+msgid "Line Sequence"
+msgstr ""
+
+#. module: sale
#: model:process.transition,note:sale.process_transition_saleorderprocurement0
msgid ""
"For every sales order line, a procurement order is created to supply the "
@@ -573,11 +661,6 @@ msgid "Sales Order Line"
msgstr ""
#. module: sale
-#: view:sale.config.picking_policy:0
-msgid "Setup your sales workflow and default values."
-msgstr "Configura tu flujo de trabajo de ventas y tus valores por defecto"
-
-#. module: sale
#: field:sale.shop,warehouse_id:0
msgid "Warehouse"
msgstr "Almacén"
@@ -614,6 +697,11 @@ msgid "Creation Date"
msgstr "Fecha de creación"
#. module: sale
+#: model:ir.ui.menu,name:sale.menu_sales_configuration_misc
+msgid "Miscellaneous"
+msgstr ""
+
+#. module: sale
#: model:ir.actions.act_window,name:sale.action_order_line_tree3
msgid "Uninvoiced and Delivered Lines"
msgstr "Líneas no facturadas y entregadas"
@@ -629,14 +717,19 @@ msgid "My Sales"
msgstr "Mis Pedidos"
#. module: sale
-#: code:addons/sale/sale.py:290
-#: code:addons/sale/sale.py:966
-#: code:addons/sale/sale.py:1165
+#: code:addons/sale/sale.py:295
+#: code:addons/sale/sale.py:1061
+#: code:addons/sale/sale.py:1290
#, python-format
msgid "Invalid action !"
msgstr "¡Acción inválida!"
#. module: sale
+#: view:sale.order:0
+msgid "Extra Info"
+msgstr "Información extra"
+
+#. module: sale
#: field:sale.order,pricelist_id:0
#: field:sale.report,pricelist_id:0
#: field:sale.shop,pricelist_id:0
@@ -650,13 +743,21 @@ msgid "# of Qty"
msgstr "# of Qty"
#. module: sale
+#: code:addons/sale/sale.py:1314
+#, python-format
+msgid "Hour"
+msgstr ""
+
+#. module: sale
#: view:sale.order:0
msgid "Order Date"
msgstr "Fecha de orden"
#. module: sale
#: view:sale.order.line:0
+#: view:sale.report:0
#: field:sale.report,shipped:0
+#: field:sale.report,shipped_qty_1:0
msgid "Shipped"
msgstr "Enviada"
@@ -666,8 +767,8 @@ msgid "All Quotations"
msgstr "Todas las peticiones"
#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Invoice On Order After Delivery"
+#: view:sale.config.picking_policy:0
+msgid "Options"
msgstr ""
#. module: sale
@@ -676,6 +777,20 @@ msgid "September"
msgstr "Septiembre"
#. module: sale
+#: code:addons/sale/sale.py:632
+#, python-format
+msgid "You cannot confirm a sale order which has no line."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:1246
+#, python-format
+msgid ""
+"You have to select a pricelist or a customer in the sales form !\n"
+"Please set one before choosing a product."
+msgstr ""
+
+#. module: sale
#: view:sale.report:0
#: field:sale.report,categ_id:0
msgid "Category of Product"
@@ -692,11 +807,6 @@ msgid "Stock Moves"
msgstr "Movimientos de stock"
#. module: sale
-#: view:sale.report:0
-msgid " Year "
-msgstr " Año "
-
-#. module: sale
#: field:sale.order,state:0
#: field:sale.report,state:0
msgid "Order State"
@@ -714,7 +824,7 @@ msgid "Sales By Month"
msgstr "Ventas Mensuales"
#. module: sale
-#: code:addons/sale/sale.py:970
+#: code:addons/sale/sale.py:1065
#, python-format
msgid "Could not cancel sales order line!"
msgstr ""
@@ -747,42 +857,19 @@ msgid ""
msgstr ""
#. module: sale
+#: field:sale.order,date_order:0
+msgid "Date"
+msgstr ""
+
+#. module: sale
#: view:sale.report:0
msgid "Extended Filters..."
msgstr "Filtros extendidos..."
#. module: sale
-#: model:ir.module.module,description:sale.module_meta_information
-msgid ""
-"\n"
-" The base module to manage quotations and sales orders.\n"
-"\n"
-" * Workflow with validation steps:\n"
-" - Quotation -> Sales order -> Invoice\n"
-" * Invoicing methods:\n"
-" - Invoice on order (before or after shipping)\n"
-" - Invoice on delivery\n"
-" - Invoice on timesheets\n"
-" - Advance invoice\n"
-" * Partners preferences (shipping, invoicing, incoterm, ...)\n"
-" * Products stocks and prices\n"
-" * Delivery methods:\n"
-" - all at once, multi-parcel\n"
-" - delivery costs\n"
-" * Dashboard for salesman that includes:\n"
-" * Your open quotations\n"
-" * Top 10 sales of the month\n"
-" * Cases statistics\n"
-" * Graph of sales by product\n"
-" * Graph of cases of the month\n"
-" "
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_shop
-#: view:sale.shop:0
-msgid "Sales Shop"
-msgstr ""
+#: selection:sale.order.line,state:0
+msgid "Exception"
+msgstr "Excepción"
#. module: sale
#: model:ir.model,name:sale.model_res_company
@@ -790,9 +877,10 @@ msgid "Companies"
msgstr "Compañias"
#. module: sale
-#: selection:sale.report,month:0
-msgid "November"
-msgstr "Noviembre"
+#: code:addons/sale/sale.py:1259
+#, python-format
+msgid "No valid pricelist line found ! :"
+msgstr ""
#. module: sale
#: view:sale.order:0
@@ -800,9 +888,9 @@ msgid "History"
msgstr "Historial"
#. module: sale
-#: field:sale.config.picking_policy,picking_policy:0
-msgid "Picking Default Policy"
-msgstr "Política de paquete de productos por defecto"
+#: selection:sale.order,order_policy:0
+msgid "Invoice on order after delivery"
+msgstr ""
#. module: sale
#: help:sale.order,invoice_ids:0
@@ -824,13 +912,13 @@ msgid ""
msgstr "El nombre y dirección del contacto que solicitó la orden o petición"
#. module: sale
-#: code:addons/sale/sale.py:966
-#, python-format
-msgid "You cannot cancel a sales order line that has already been invoiced !"
+#: help:res.company,security_lead:0
+msgid ""
+"This is the days added to what you promise to customers for security purpose"
msgstr ""
+"Son los días agregados que garantiza a los clientes por razones de seguridad"
#. module: sale
-#: view:sale.order:0
#: view:sale.order.line:0
msgid "Qty"
msgstr "Ctdad"
@@ -841,6 +929,11 @@ msgid "References"
msgstr "Referencias"
#. module: sale
+#: view:sale.order.line:0
+msgid "My Sales Order Lines"
+msgstr ""
+
+#. module: sale
#: model:process.transition.action,name:sale.process_transition_action_cancel0
#: model:process.transition.action,name:sale.process_transition_action_cancel1
#: model:process.transition.action,name:sale.process_transition_action_cancel2
@@ -852,14 +945,9 @@ msgid "Cancel"
msgstr "Cancelar"
#. module: sale
-#: field:sale.installer,sale_order_dates:0
-msgid "Sales Order Dates"
-msgstr "Fechas de las ordenes de pedido"
-
-#. module: sale
-#: selection:sale.order.line,state:0
-msgid "Exception"
-msgstr "Excepción"
+#: sql_constraint:sale.order:0
+msgid "Order Reference must be unique per Company!"
+msgstr ""
#. module: sale
#: model:process.transition,name:sale.process_transition_invoice0
@@ -871,19 +959,19 @@ msgid "Create Invoice"
msgstr "Crear factura"
#. module: sale
-#: field:sale.installer,sale_margin:0
-msgid "Margins in Sales Orders"
-msgstr "Márgenes en ordenes de pedido"
-
-#. module: sale
#: view:sale.order:0
msgid "Total Tax Excluded"
msgstr "Total de impuestos excluidos"
#. module: sale
-#: view:sale.order:0
-msgid "Compute"
-msgstr "Calcular"
+#: view:sale.order.line:0
+msgid "Order reference"
+msgstr ""
+
+#. module: sale
+#: view:sale.open.invoice:0
+msgid "You invoice has been successfully created!"
+msgstr "¡La factura fue creada exitosamente!"
#. module: sale
#: view:sale.report:0
@@ -902,23 +990,20 @@ msgid "Open Invoice"
msgstr "Factura pendiente"
#. module: sale
-#: report:sale.order:0
-#: view:sale.order.line:0
-msgid "Price"
-msgstr "Precio"
+#: model:ir.actions.server,name:sale.ir_actions_server_edi_sale
+msgid "Auto-email confirmed sale orders"
+msgstr ""
#. module: sale
-#: model:ir.actions.act_window,name:sale.action_sale_installer
-#: view:sale.config.picking_policy:0
-#: view:sale.installer:0
-msgid "Sales Application Configuration"
-msgstr "Aplicación de configuración de Ventas"
+#: code:addons/sale/sale.py:413
+#, python-format
+msgid "There is no sales journal defined for this company: \"%s\" (id:%d)"
+msgstr ""
#. module: sale
-#: view:sale.report:0
-#: field:sale.report,price_total:0
-msgid "Total Price"
-msgstr "Precio Total"
+#: model:process.transition.action,name:sale.process_transition_action_forceassignation0
+msgid "Force Assignation"
+msgstr "Forzar asignación"
#. module: sale
#: selection:sale.order.line,type:0
@@ -931,6 +1016,11 @@ msgid "Based on the shipped or on the ordered quantities."
msgstr "Basado en el envío o en las cantidades ordenadas."
#. module: sale
+#: selection:sale.order,picking_policy:0
+msgid "Deliver all products at once"
+msgstr ""
+
+#. module: sale
#: field:sale.order,picking_ids:0
msgid "Related Picking"
msgstr "Paquete relacionado"
@@ -962,9 +1052,15 @@ msgid "Create Delivery Order"
msgstr "Crear orden de entrega"
#. module: sale
-#: field:sale.installer,delivery:0
-msgid "Delivery Costs"
-msgstr "Costos de entrega"
+#: code:addons/sale/sale.py:1290
+#, python-format
+msgid "Cannot delete a sales order line which is in state '%s'!"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Qty(UoS)"
+msgstr ""
#. module: sale
#: view:sale.order:0
@@ -978,13 +1074,13 @@ msgstr "Crear paquete de productos"
#. module: sale
#: view:sale.report:0
-msgid "Sales by Product Category"
-msgstr "Ventas por categoría de producto"
+msgid "Ordered date of the sales order"
+msgstr ""
#. module: sale
-#: selection:sale.order,picking_policy:0
-msgid "Partial Delivery"
-msgstr "Envío parcial"
+#: view:sale.report:0
+msgid "Sales by Product Category"
+msgstr "Ventas por categoría de producto"
#. module: sale
#: model:process.transition,name:sale.process_transition_confirmquotation0
@@ -992,9 +1088,10 @@ msgid "Confirm Quotation"
msgstr "Confirmar petición"
#. module: sale
-#: help:sale.order,origin:0
-msgid "Reference of the document that generated this sales order request."
-msgstr ""
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:63
+#, python-format
+msgid "Error"
+msgstr "Error"
#. module: sale
#: view:sale.order:0
@@ -1026,20 +1123,14 @@ msgid "Procurement Method"
msgstr "Método de abastecimiento"
#. module: sale
-#: view:sale.config.picking_policy:0
-#: view:sale.installer:0
-msgid "title"
-msgstr "título"
-
-#. module: sale
#: model:process.node,name:sale.process_node_packinglist0
msgid "Pick List"
msgstr "Paquete de productos"
#. module: sale
#: view:sale.order:0
-msgid "Order date"
-msgstr "Fecha de pedido"
+msgid "Set to Draft"
+msgstr "Cambiar a borrador"
#. module: sale
#: model:process.node,note:sale.process_node_packinglist0
@@ -1047,6 +1138,85 @@ msgid "Document of the move to the output or to the customer."
msgstr "Documento del movimiento de la salida o del cliente."
#. module: sale
+#: model:email.template,body_text:sale.email_template_edi_sale
+msgid ""
+"\n"
+"Hello${object.partner_order_id.name and ' ' or "
+"''}${object.partner_order_id.name or ''},\n"
+"\n"
+"Here is your order confirmation for ${object.partner_id.name}:\n"
+" | Order number: *${object.name}*\n"
+" | Order total: *${object.amount_total} "
+"${object.pricelist_id.currency_id.name}*\n"
+" | Order date: ${object.date_order}\n"
+" % if object.origin:\n"
+" | Order reference: ${object.origin}\n"
+" % endif\n"
+" % if object.client_order_ref:\n"
+" | Your reference: ${object.client_order_ref}<br />\n"
+" % endif\n"
+" | Your contact: ${object.user_id.name} ${object.user_id.user_email "
+"and '<%s>'%(object.user_id.user_email) or ''}\n"
+"\n"
+"You can view the order confirmation, download it and even pay online using "
+"the following link:\n"
+" ${ctx.get('edi_web_url_view') or 'n/a'}\n"
+"\n"
+"% if object.order_policy in ('prepaid','manual') and "
+"object.company_id.paypal_account:\n"
+"<% \n"
+"comp_name = quote(object.company_id.name)\n"
+"order_name = quote(object.name)\n"
+"paypal_account = quote(object.company_id.paypal_account)\n"
+"order_amount = quote(str(object.amount_total))\n"
+"cur_name = quote(object.pricelist_id.currency_id.name)\n"
+"paypal_url = \"https://www.paypal.com/cgi-"
+"bin/webscr?cmd=_xclick&business=%s&item_name=%s%%20Order%%20%s&invoice=%s&amo"
+"unt=%s\" \\\n"
+" "
+"\"&currency_code=%s&button_subtype=services&no_note=1&bn=OpenERP_Order_PayNow"
+"_%s\" % \\\n"
+" "
+"(paypal_account,comp_name,order_name,order_name,order_amount,cur_name,cur_nam"
+"e)\n"
+"%>\n"
+"It is also possible to directly pay with Paypal:\n"
+" ${paypal_url}\n"
+"% endif\n"
+"\n"
+"If you have any question, do not hesitate to contact us.\n"
+"\n"
+"\n"
+"Thank you for choosing ${object.company_id.name}!\n"
+"\n"
+"\n"
+"--\n"
+"${object.user_id.name} ${object.user_id.user_email and "
+"'<%s>'%(object.user_id.user_email) or ''}\n"
+"${object.company_id.name}\n"
+"% if object.company_id.street:\n"
+"${object.company_id.street or ''}\n"
+"% endif\n"
+"% if object.company_id.street2:\n"
+"${object.company_id.street2}\n"
+"% endif\n"
+"% if object.company_id.city or object.company_id.zip:\n"
+"${object.company_id.zip or ''} ${object.company_id.city or ''}\n"
+"% endif\n"
+"% if object.company_id.country_id:\n"
+"${object.company_id.state_id and ('%s, ' % object.company_id.state_id.name) "
+"or ''} ${object.company_id.country_id.name or ''}\n"
+"% endif\n"
+"% if object.company_id.phone:\n"
+"Phone: ${object.company_id.phone}\n"
+"% endif\n"
+"% if object.company_id.website:\n"
+"${object.company_id.website or ''}\n"
+"% endif\n"
+" "
+msgstr ""
+
+#. module: sale
#: model:process.transition.action,name:sale.process_transition_action_validate0
msgid "Validate"
msgstr "Validar"
@@ -1069,9 +1239,9 @@ msgid "Taxes"
msgstr "Impuestos"
#. module: sale
-#: field:sale.order,order_policy:0
-msgid "Shipping Policy"
-msgstr "Política de facturación"
+#: view:sale.order:0
+msgid "Sales Order ready to be invoiced"
+msgstr ""
#. module: sale
#: help:sale.order,create_date:0
@@ -1090,9 +1260,9 @@ msgid "Create Invoices"
msgstr "Crear facturas"
#. module: sale
-#: view:sale.order:0
-msgid "Extra Info"
-msgstr "Información extra"
+#: view:sale.report:0
+msgid "Sales order created in current month"
+msgstr ""
#. module: sale
#: report:sale.order:0
@@ -1100,11 +1270,24 @@ msgid "Fax :"
msgstr "Fax :"
#. module: sale
+#: help:sale.order.line,type:0
+msgid ""
+"If 'on order', it triggers a procurement when the sale order is confirmed to "
+"create a task, purchase order or manufacturing order linked to this sale "
+"order line."
+msgstr ""
+
+#. module: sale
#: field:sale.advance.payment.inv,amount:0
msgid "Advance Amount"
msgstr "Advance Amount"
#. module: sale
+#: field:sale.config.picking_policy,charge_delivery:0
+msgid "Do you charge the delivery?"
+msgstr ""
+
+#. module: sale
#: selection:sale.order,invoice_quantity:0
msgid "Shipped Quantities"
msgstr "Cantidades enviadas"
@@ -1115,25 +1298,45 @@ msgid "Invoice Based on Sales Orders"
msgstr "Factura basada en pedidos de venta"
#. module: sale
+#: code:addons/sale/sale.py:331
+#, python-format
+msgid ""
+"If you change the pricelist of this order (and eventually the currency), "
+"prices of existing order lines will not be updated."
+msgstr ""
+
+#. module: sale
#: model:ir.model,name:sale.model_stock_picking
msgid "Picking List"
msgstr "Paquete de productos"
#. module: sale
-#: code:addons/sale/sale.py:387
-#: code:addons/sale/sale.py:920
-#: code:addons/sale/sale.py:938
+#: code:addons/sale/sale.py:412
+#: code:addons/sale/sale.py:503
+#: code:addons/sale/sale.py:632
+#: code:addons/sale/sale.py:1015
+#: code:addons/sale/sale.py:1033
#, python-format
msgid "Error !"
msgstr "¡Error!"
#. module: sale
-#: code:addons/sale/sale.py:570
+#: code:addons/sale/sale.py:603
#, python-format
msgid "Could not cancel sales order !"
msgstr ""
#. module: sale
+#: view:sale.order:0
+msgid "Qty(UoM)"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered Year of the sales order"
+msgstr ""
+
+#. module: sale
#: selection:sale.report,month:0
msgid "July"
msgstr "Julio"
@@ -1150,35 +1353,25 @@ msgid "Shipping Exception"
msgstr "Excepción de envío"
#. module: sale
-#: field:sale.make.invoice,grouped:0
-msgid "Group the invoices"
-msgstr "Grupo de facturas"
-
-#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Shipping & Manual Invoice"
-msgstr "Enviar & Factura manual"
-
-#. module: sale
-#: code:addons/sale/sale.py:1051
+#: code:addons/sale/sale.py:1143
#, python-format
-msgid "Picking Information !"
-msgstr "¡Información de Paquete de productos!"
+msgid "Picking Information ! : "
+msgstr ""
#. module: sale
-#: view:sale.report:0
-#: field:sale.report,month:0
-msgid "Month"
-msgstr "Mes"
+#: field:sale.make.invoice,grouped:0
+msgid "Group the invoices"
+msgstr "Grupo de facturas"
#. module: sale
-#: model:ir.module.module,shortdesc:sale.module_meta_information
-msgid "Sales Management"
-msgstr "Ventas"
+#: field:sale.order,order_policy:0
+msgid "Invoice Policy"
+msgstr ""
#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Invoice From The Picking"
+#: model:ir.actions.act_window,name:sale.action_config_picking_policy
+#: view:sale.config.picking_policy:0
+msgid "Setup your Invoicing Method"
msgstr ""
#. module: sale
@@ -1188,32 +1381,31 @@ msgstr "Para ser reviado por el cliente."
#. module: sale
#: view:sale.report:0
-#: field:sale.report,uom_name:0
msgid "Reference UoM"
msgstr ""
#. module: sale
+#: view:sale.config.picking_policy:0
+msgid ""
+"This tool will help you to install the right module and configure the system "
+"according to the method you use to invoice your customers."
+msgstr ""
+
+#. module: sale
#: model:ir.model,name:sale.model_sale_order_line_make_invoice
msgid "Sale OrderLine Make_invoice"
msgstr "Crear factura de la línea de pedido"
#. module: sale
-#: help:sale.config.picking_policy,step:0
-msgid ""
-"By default, OpenERP is able to manage complex routing and paths of products "
-"in your warehouse and partner locations. This will configure the most common "
-"and simple methods to deliver products to the customer in one or two "
-"operations by the worker."
-msgstr ""
-"Por defecto, OpenERP puede manejar rutas complejas de productos en los "
-"almacenes o ubicaciones de empresas. Ésto configurará los más simples y "
-"comunes métodos de entrega de productos al cliente en una o dos operaciones "
-"del trabajador."
+#: selection:sale.order,state:0
+#: selection:sale.report,state:0
+msgid "Invoice Exception"
+msgstr "Excepción de factura"
#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_tree
-msgid "Old Quotations"
-msgstr "Peticiones anteriores"
+#: model:process.node,note:sale.process_node_saleorder0
+msgid "Drives procurement and invoicing"
+msgstr "Medios de abastecimiento y facturación"
#. module: sale
#: field:sale.order,invoiced:0
@@ -1228,6 +1420,22 @@ msgid "Sales Analysis"
msgstr "Análisis de ventas"
#. module: sale
+#: code:addons/sale/sale.py:1138
+#, python-format
+msgid ""
+"You selected a quantity of %d Units.\n"
+"But it's not compatible with the selected packaging.\n"
+"Here is a proposition of quantities according to the packaging:\n"
+"EAN: %s Quantity: %s Type of ul: %s"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Recreate Packing"
+msgstr "Recrear Picking"
+
+#. module: sale
+#: view:sale.order:0
#: field:sale.order.line,property_ids:0
msgid "Properties"
msgstr "Propiedades"
@@ -1259,7 +1467,17 @@ msgstr ""
"envíos."
#. module: sale
-#: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
+#: view:sale.order.line:0
+msgid "Confirmed sale order lines, not yet delivered"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:473
+#, python-format
+msgid "Customer Invoices"
+msgstr ""
+
+#. module: sale
#: model:process.process,name:sale.process_process_salesprocess0
#: view:sale.order:0
#: view:sale.report:0
@@ -1281,18 +1499,13 @@ msgid "Done"
msgstr "Realizado"
#. module: sale
-#: model:ir.model,name:sale.model_sale_installer
-msgid "sale.installer"
-msgstr "sale.installer"
-
-#. module: sale
#: model:process.node,name:sale.process_node_invoice0
#: model:process.node,name:sale.process_node_invoiceafterdelivery0
msgid "Invoice"
msgstr "Factura"
#. module: sale
-#: code:addons/sale/sale.py:1014
+#: code:addons/sale/sale.py:1158
#, python-format
msgid ""
"You have to select a customer in the sales form !\n"
@@ -1300,11 +1513,6 @@ msgid ""
msgstr ""
#. module: sale
-#: selection:sale.config.picking_policy,step:0
-msgid "Picking List & Delivery Order"
-msgstr "Paquete de productos y Orden de entrega"
-
-#. module: sale
#: field:sale.order,origin:0
msgid "Source Document"
msgstr ""
@@ -1330,7 +1538,7 @@ msgid "The amount without tax."
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:571
+#: code:addons/sale/sale.py:604
#, python-format
msgid "You must first cancel all picking attached to this sales order."
msgstr ""
@@ -1341,9 +1549,15 @@ msgid "Sales Advance Payment Invoice"
msgstr ""
#. module: sale
-#: field:sale.order,incoterm:0
-msgid "Incoterm"
-msgstr "Incoterm"
+#: view:sale.report:0
+#: field:sale.report,month:0
+msgid "Month"
+msgstr "Mes"
+
+#. module: sale
+#: model:email.template,subject:sale.email_template_edi_sale
+msgid "${object.company_id.name} Order (Ref ${object.name or 'n/a' })"
+msgstr ""
#. module: sale
#: view:sale.order.line:0
@@ -1354,11 +1568,6 @@ msgid "Product"
msgstr "Producto"
#. module: sale
-#: model:ir.ui.menu,name:sale.menu_invoiced
-msgid "Invoicing"
-msgstr "Facturación"
-
-#. module: sale
#: model:process.transition.action,name:sale.process_transition_action_cancelassignation0
msgid "Cancel Assignation"
msgstr "Cancelar asignación"
@@ -1369,14 +1578,10 @@ msgid "sale.config.picking_policy"
msgstr "sale.config.picking_policy"
#. module: sale
-#: help:sale.order,state:0
-msgid ""
-"Gives the state of the quotation or sales order. \n"
-"The exception state is automatically set when a cancel operation occurs in "
-"the invoice validation (Invoice Exception) or in the picking list process "
-"(Shipping Exception). \n"
-"The 'Waiting Schedule' state is set when the invoice is confirmed but "
-"waiting for the scheduler to run on the date 'Ordered Date'."
+#: view:account.invoice.report:0
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_turnover_by_month
+msgid "Monthly Turnover"
msgstr ""
#. module: sale
@@ -1395,7 +1600,6 @@ msgid "Product UoS"
msgstr "UdV del producto"
#. module: sale
-#: selection:sale.order,state:0
#: selection:sale.report,state:0
msgid "Manual In Progress"
msgstr "Manual en proceso"
@@ -1416,7 +1620,8 @@ msgid "Order"
msgstr "Orden"
#. module: sale
-#: code:addons/sale/sale.py:921
+#: code:addons/sale/sale.py:1016
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:71
#, python-format
msgid "There is no income account defined for this product: \"%s\" (id:%d)"
msgstr ""
@@ -1437,7 +1642,7 @@ msgid ""
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:1116
+#: code:addons/sale/sale.py:1238
#, python-format
msgid ""
"You plan to sell %.2f %s but you only have %.2f %s available !\n"
@@ -1468,10 +1673,10 @@ msgid "Total"
msgstr "Total"
#. module: sale
-#: code:addons/sale/sale.py:388
-#, python-format
-msgid "There is no sales journal defined for this company: \"%s\" (id:%d)"
-msgstr ""
+#: report:sale.order:0
+#: view:sale.order.line:0
+msgid "Price"
+msgstr "Precio"
#. module: sale
#: model:process.transition,note:sale.process_transition_deliver0
@@ -1485,9 +1690,14 @@ msgstr ""
"manualmente o automáticamente."
#. module: sale
-#: code:addons/sale/sale.py:1165
-#, python-format
-msgid "Cannot delete a sales order line which is %s !"
+#: selection:sale.order,order_policy:0
+msgid "Pay before delivery"
+msgstr ""
+
+#. module: sale
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.open_board_sales
+msgid "Sales Dashboard"
msgstr ""
#. module: sale
@@ -1499,6 +1709,7 @@ msgstr "Crear facturas"
#. module: sale
#: view:sale.order:0
+#: selection:sale.order,state:0
#: view:sale.order.line:0
msgid "To Invoice"
msgstr "A facturar"
@@ -1509,6 +1720,11 @@ msgid "Date on which sales order is confirmed."
msgstr ""
#. module: sale
+#: field:sale.order,project_id:0
+msgid "Contract/Analytic Account"
+msgstr ""
+
+#. module: sale
#: field:sale.order,company_id:0
#: field:sale.order.line,company_id:0
#: view:sale.report:0
@@ -1528,25 +1744,18 @@ msgid "The amount to be invoiced in advance."
msgstr "El moto a ser facturado por adelantado."
#. module: sale
-#: selection:sale.order,state:0
-#: selection:sale.report,state:0
-msgid "Invoice Exception"
-msgstr "Excepción de factura"
-
-#. module: sale
-#: help:sale.order,picking_ids:0
+#: code:addons/sale/sale.py:1256
+#, python-format
msgid ""
-"This is a list of picking that has been generated for this sales order."
+"Couldn't find a pricelist line matching this product and quantity.\n"
+"You have to change either the product, the quantity or the pricelist."
msgstr ""
#. module: sale
-#: help:sale.installer,sale_margin:0
+#: help:sale.order,picking_ids:0
msgid ""
-"Gives the margin of profitability by calculating the difference between Unit "
-"Price and Cost Price."
+"This is a list of picking that has been generated for this sales order."
msgstr ""
-"Margen de rentabilidad calculando la diferencia entre el Precio unitario y "
-"el costo."
#. module: sale
#: view:sale.make.invoice:0
@@ -1567,6 +1776,11 @@ msgid "Cancelled"
msgstr "Cancelado"
#. module: sale
+#: view:sale.order.line:0
+msgid "Sales Order Lines related to a Sales Order of mine"
+msgstr ""
+
+#. module: sale
#: model:ir.actions.act_window,name:sale.action_shop_form
#: model:ir.ui.menu,name:sale.menu_action_shop_form
#: field:sale.order,shop_id:0
@@ -1576,17 +1790,12 @@ msgid "Shop"
msgstr "Tienda"
#. module: sale
-#: view:sale.report:0
-msgid " Month "
-msgstr " Mes "
-
-#. module: sale
#: field:sale.report,date_confirm:0
msgid "Date Confirm"
msgstr "Fecha de confirmación"
#. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:111
+#: code:addons/sale/wizard/sale_line_invoice.py:113
#, python-format
msgid "Warning"
msgstr "Advertencia"
@@ -1598,17 +1807,6 @@ msgid "Sales by Month"
msgstr "Ventas por mes"
#. module: sale
-#: code:addons/sale/sale.py:1045
-#, python-format
-msgid ""
-"You selected a quantity of %d Units.\n"
-"But it's not compatible with the selected packaging.\n"
-"Here is a proposition of quantities according to the packaging:\n"
-"\n"
-"EAN: %s Quantity: %s Type of ul: %s"
-msgstr ""
-
-#. module: sale
#: model:ir.model,name:sale.model_sale_order
#: model:process.node,name:sale.process_node_order0
#: model:process.node,name:sale.process_node_saleorder0
@@ -1624,6 +1822,11 @@ msgid "Quantity (UoS)"
msgstr "Cantidad (UdV)"
#. module: sale
+#: view:sale.order.line:0
+msgid "Sale Order Lines that are in 'done' state"
+msgstr ""
+
+#. module: sale
#: model:process.transition,note:sale.process_transition_packing0
msgid ""
"The Pick List form is created as soon as the sales order is confirmed, in "
@@ -1638,6 +1841,11 @@ msgid "Confirmed"
msgstr "Confirmado"
#. module: sale
+#: field:sale.config.picking_policy,order_policy:0
+msgid "Main Method Based On"
+msgstr ""
+
+#. module: sale
#: model:process.transition.action,name:sale.process_transition_action_confirm0
msgid "Confirm"
msgstr "Confirmar"
@@ -1660,6 +1868,7 @@ msgid "Invoice Lines"
msgstr "Líneas de factura"
#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_product_tree
#: view:sale.order:0
#: view:sale.order.line:0
msgid "Sales Order Lines"
@@ -1676,33 +1885,18 @@ msgid "Configuration"
msgstr "Configuración"
#. module: sale
-#: selection:sale.order,picking_policy:0
-msgid "Complete Delivery"
-msgstr "Envío completo"
+#: code:addons/sale/edi/sale_order.py:146
+#, python-format
+msgid "EDI Pricelist (%s)"
+msgstr ""
#. module: sale
#: view:sale.report:0
-msgid " Month-1 "
-msgstr " Mes-1 "
-
-#. module: sale
-#: help:sale.config.picking_policy,picking_policy:0
-msgid ""
-"The Shipping Policy is used to configure per order if you want to deliver as "
-"soon as possible when one product is available or you wait that all products "
-"are available.."
+msgid "Sales order created in current year"
msgstr ""
-"La política de envío se utiliza para configurar los pedidos si desea "
-"entregar lo antes posible cuando un producto está disponible o esperar que "
-"todos los productos esten disponibles."
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "August"
-msgstr "Agosto"
#. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:111
+#: code:addons/sale/wizard/sale_line_invoice.py:113
#, python-format
msgid ""
"Invoice cannot be created for this Sales Order Line due to one of the "
@@ -1712,6 +1906,11 @@ msgid ""
msgstr ""
#. module: sale
+#: view:sale.order.line:0
+msgid "Sale order lines done"
+msgstr ""
+
+#. module: sale
#: field:sale.order.line,th_weight:0
msgid "Weight"
msgstr "Peso"
@@ -1730,7 +1929,6 @@ msgstr "Diciembre"
#. module: sale
#: field:sale.config.picking_policy,config_logo:0
-#: field:sale.installer,config_logo:0
msgid "Image"
msgstr "Imagen"
@@ -1760,9 +1958,9 @@ msgid "Salesman"
msgstr "Vendedor"
#. module: sale
-#: model:process.node,note:sale.process_node_saleorder0
-msgid "Drives procurement and invoicing"
-msgstr "Medios de abastecimiento y facturación"
+#: model:ir.actions.act_window,name:sale.action_order_tree
+msgid "Old Quotations"
+msgstr "Peticiones anteriores"
#. module: sale
#: field:sale.order,amount_untaxed:0
@@ -1770,7 +1968,7 @@ msgid "Untaxed Amount"
msgstr "Base imponible"
#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:163
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:170
#: model:ir.actions.act_window,name:sale.action_view_sale_advance_payment_inv
#: view:sale.advance.payment.inv:0
#: view:sale.order:0
@@ -1779,7 +1977,7 @@ msgid "Advance Invoice"
msgstr "Facturar por adelantado"
#. module: sale
-#: code:addons/sale/sale.py:591
+#: code:addons/sale/sale.py:624
#, python-format
msgid "The sales order '%s' has been cancelled."
msgstr ""
@@ -1814,20 +2012,20 @@ msgid "Packings"
msgstr ""
#. module: sale
-#: field:sale.config.picking_policy,progress:0
-#: field:sale.installer,progress:0
-msgid "Configuration Progress"
-msgstr "Progreso de configuración"
+#: view:sale.order.line:0
+msgid "Sale Order Lines ready to be invoiced"
+msgstr ""
#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_product_tree
-msgid "Product sales"
-msgstr "Ventas de producto"
+#: view:sale.report:0
+msgid "Sales order created in last month"
+msgstr ""
#. module: sale
-#: field:sale.order,date_order:0
-msgid "Ordered Date"
-msgstr "Fecha de pedido"
+#: model:ir.actions.act_window,name:sale.action_email_templates
+#: model:ir.ui.menu,name:sale.menu_email_templates
+msgid "Email Templates"
+msgstr ""
#. module: sale
#: model:ir.actions.act_window,name:sale.action_order_form
@@ -1837,14 +2035,15 @@ msgid "Sales Orders"
msgstr "Pedidos de ventas"
#. module: sale
-#: selection:sale.config.picking_policy,picking_policy:0
-msgid "Direct Delivery"
-msgstr "Envío directo"
+#: model:ir.model,name:sale.model_sale_shop
+#: view:sale.shop:0
+msgid "Sales Shop"
+msgstr ""
#. module: sale
-#: field:sale.installer,sale_journal:0
-msgid "Invoicing journals"
-msgstr "Invoicing journals"
+#: selection:sale.report,month:0
+msgid "November"
+msgstr "Noviembre"
#. module: sale
#: field:sale.advance.payment.inv,product_id:0
@@ -1852,18 +2051,12 @@ msgid "Advance Product"
msgstr "Producto avanzado"
#. module: sale
-#: view:sale.report:0
-#: field:sale.report,shipped_qty_1:0
-msgid "Shipped Qty"
-msgstr "Cantidad enviada"
-
-#. module: sale
-#: view:sale.open.invoice:0
-msgid "You invoice has been successfully created!"
-msgstr "¡La factura fue creada exitosamente!"
+#: view:sale.order:0
+msgid "Compute"
+msgstr "Calcular"
#. module: sale
-#: code:addons/sale/sale.py:585
+#: code:addons/sale/sale.py:618
#, python-format
msgid "You must first cancel all invoices attached to this sales order."
msgstr ""
@@ -1874,25 +2067,14 @@ msgid "January"
msgstr "Enero"
#. module: sale
-#: view:sale.installer:0
-msgid "Configure Your Sales Management Application"
-msgstr "Configurar su aplicación de gestión de ventas"
-
-#. module: sale
#: model:ir.actions.act_window,name:sale.action_order_tree4
msgid "Sales Order in Progress"
msgstr "Pedidos de ventas en proceso"
#. module: sale
-#: field:sale.installer,sale_layout:0
-msgid "Sales Order Layout Improvement"
-msgstr "Diseño mejorado de pedido de venta"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:63
-#, python-format
-msgid "Error"
-msgstr "Error"
+#: help:sale.order,origin:0
+msgid "Reference of the document that generated this sales order request."
+msgstr ""
#. module: sale
#: view:sale.report:0
@@ -1901,6 +2083,11 @@ msgid "Commitment Delay"
msgstr "Retraso de entrega"
#. module: sale
+#: selection:sale.order,order_policy:0
+msgid "Deliver & invoice on demand"
+msgstr ""
+
+#. module: sale
#: model:process.node,note:sale.process_node_saleprocurement0
msgid ""
"One Procurement order for each sales order line and for each of the "
@@ -1923,13 +2110,12 @@ msgid "Confirmed sales order to invoice."
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:290
-#, python-format
-msgid "Cannot delete Sales Order(s) which are already confirmed !"
+#: view:sale.order:0
+msgid "Sales Order that haven't yet been confirmed"
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:316
+#: code:addons/sale/sale.py:322
#, python-format
msgid "The sales order '%s' has been set in draft state."
msgstr ""
@@ -1940,37 +2126,27 @@ msgid "from stock"
msgstr "desde stock"
#. module: sale
-#: field:sale.config.picking_policy,order_policy:0
-msgid "Shipping Default Policy"
-msgstr "Política de envío por defecto"
-
-#. module: sale
#: view:sale.open.invoice:0
msgid "Close"
msgstr "Cerrado"
#. module: sale
+#: code:addons/sale/sale.py:1248
+#, python-format
+msgid "No Pricelist ! : "
+msgstr ""
+
+#. module: sale
#: field:sale.order,shipped:0
msgid "Delivered"
msgstr "Entregado"
#. module: sale
-#: code:addons/sale/sale.py:1115
-#, python-format
-msgid "Not enough stock !"
-msgstr "!Stock insuficiente!"
-
-#. module: sale
#: constraint:stock.move:0
msgid "You must assign a production lot for this product"
msgstr "Debe asignar un lote de producción para este producto"
#. module: sale
-#: field:sale.order.line,sequence:0
-msgid "Layout Sequence"
-msgstr ""
-
-#. module: sale
#: model:ir.actions.act_window,help:sale.action_shop_form
msgid ""
"If you have more than one shop reselling your company products, you can "
@@ -1997,12 +2173,6 @@ msgid "May"
msgstr "Mayo"
#. module: sale
-#: help:sale.installer,sale_order_dates:0
-msgid "Adds commitment, requested and effective dates on Sales Orders."
-msgstr ""
-"Agrega fechas de entrega, de petición y de efectivo en los pedidos de ventas."
-
-#. module: sale
#: view:sale.order:0
#: field:sale.order,partner_id:0
#: field:sale.order.line,order_partner_id:0
@@ -2010,25 +2180,11 @@ msgid "Customer"
msgstr "Cliente"
#. module: sale
-#: model:product.template,name:sale.advance_product_0_product_template
-msgid "Advance"
-msgstr ""
-
-#. module: sale
#: selection:sale.report,month:0
msgid "February"
msgstr "Febrero"
#. module: sale
-#: help:sale.installer,sale_journal:0
-msgid ""
-"Allows you to group and invoice your delivery orders according to different "
-"invoicing types: daily, weekly, etc."
-msgstr ""
-"Permite agrupar y facturar las ordenes de entrega de acuerdo a los "
-"diferentes tipos de facturación: diario, semanal, etc."
-
-#. module: sale
#: selection:sale.report,month:0
msgid "April"
msgstr "Abril"
@@ -2039,11 +2195,6 @@ msgid "Accounting"
msgstr "Contabilidad"
#. module: sale
-#: field:sale.config.picking_policy,step:0
-msgid "Steps To Deliver a Sales Order"
-msgstr ""
-
-#. module: sale
#: view:sale.order:0
#: view:sale.order.line:0
msgid "Search Sales Order"
@@ -2055,20 +2206,18 @@ msgid "Sales Order Requisition"
msgstr ""
#. module: sale
+#: code:addons/sale/sale.py:1242
+#, python-format
+msgid "Not enough stock ! : "
+msgstr ""
+
+#. module: sale
#: report:sale.order:0
#: field:sale.order,payment_term:0
msgid "Payment Term"
msgstr "Plazo de pago"
#. module: sale
-#: help:sale.installer,sale_layout:0
-msgid ""
-"Provides some features to improve the layout of the Sales Order reports."
-msgstr ""
-"Provee algunas características para mejorar los reportes de las ordenes de "
-"pedido."
-
-#. module: sale
#: model:ir.actions.act_window,help:sale.action_order_report_all
msgid ""
"This report performs analysis on your quotations and sales orders. Analysis "
@@ -2100,6 +2249,9 @@ msgstr "Año"
msgid "Invoice Based on Deliveries"
msgstr "Facturar desde albaranes"
+#~ msgid "Partial Delivery"
+#~ msgstr "Envío parcial"
+
#~ msgid "Recreate Procurement"
#~ msgstr "Recrear abastecimiento"
@@ -2131,6 +2283,9 @@ msgstr "Facturar desde albaranes"
#~ msgid "Invoice after delivery"
#~ msgstr "Facturar después del envío"
+#~ msgid "Shipping Policy"
+#~ msgstr "Política de facturación"
+
#~ msgid "Origin"
#~ msgstr "Origen"
@@ -2140,6 +2295,9 @@ msgstr "Facturar desde albaranes"
#~ msgid "Reference"
#~ msgstr "Referencia"
+#~ msgid "All at Once"
+#~ msgstr "Todo a la vez"
+
#~ msgid "Procurement is created after confirmation of sale order."
#~ msgstr "El abastecimiento es creado después de confirmar un pedido de venta."
@@ -2187,6 +2345,9 @@ msgstr "Facturar desde albaranes"
#~ "Cuando selecciona una política de envío = 'Factura automática después del "
#~ "envío', la creará automáticamente después del envío."
+#~ msgid "Complete Delivery"
+#~ msgstr "Envío completo"
+
#~ msgid "Manual Description"
#~ msgstr "Descripción manual"
@@ -2232,15 +2393,18 @@ msgstr "Facturar desde albaranes"
#~ msgid "Procurement for each line"
#~ msgstr "Abastecimiento para cada línea"
-#~ msgid "My Quotations"
-#~ msgstr "Mis presupuestos"
-
#~ msgid "Packing Default Policy"
#~ msgstr "Forma de envío por defecto"
#~ msgid "Manages the delivery and invoicing progress"
#~ msgstr "Gestiona el progreso de envío y facturación"
+#~ msgid "Shipping Default Policy"
+#~ msgstr "Política de envío por defecto"
+
+#~ msgid "Sales Management"
+#~ msgstr "Ventas"
+
#~ msgid "Order Ref"
#~ msgstr "Ref. pedido"
@@ -2279,6 +2443,9 @@ msgstr "Facturar desde albaranes"
#~ msgid "Procurement Corrected"
#~ msgstr "Abastecimiento corregido"
+#~ msgid "Shipping & Manual Invoice"
+#~ msgstr "Enviar & Factura manual"
+
#~ msgid "Sale Procurement"
#~ msgstr "Abastecimiento de venta"
@@ -2291,6 +2458,9 @@ msgstr "Facturar desde albaranes"
#~ msgid "Packing Policy"
#~ msgstr "Forma de envío"
+#~ msgid "Product sales"
+#~ msgstr "Ventas de producto"
+
#~ msgid "Create Advance Invoice"
#~ msgstr "Crear anticipo factura"
@@ -2300,6 +2470,9 @@ msgstr "Facturar desde albaranes"
#~ msgid "Sale Pricelists"
#~ msgstr "Tarifas de venta"
+#~ msgid "Direct Delivery"
+#~ msgstr "Envío directo"
+
#~ msgid ""
#~ "Invoice is created when 'Create Invoice' is being clicked after confirming "
#~ "the sale order. This transaction moves the sale order to invoices."
@@ -2308,6 +2481,9 @@ msgstr "Facturar desde albaranes"
#~ "confirmado el pedido de venta. Esta transacción convierte el pedido de venta "
#~ "a facturas."
+#~ msgid "Delivery Order Only"
+#~ msgstr "Sólo orden de entrega"
+
#~ msgid "Sales order lines"
#~ msgstr "Líneas del pedido de ventas"
@@ -2429,6 +2605,9 @@ msgstr "Facturar desde albaranes"
#~ msgid "Related invoices"
#~ msgstr "Facturas relacionadas"
+#~ msgid "Payment Before Delivery"
+#~ msgstr "Pago antes del envío"
+
#~ msgid ""
#~ "This is the list of invoices that have been generated for this sale order. "
#~ "The same sale order may have been invoiced in several times (by line for "
@@ -2453,10 +2632,17 @@ msgstr "Facturar desde albaranes"
#~ msgid "Invalid model name in the action definition."
#~ msgstr "Nombre de modelo no válido en la definición de la acción."
+#~ msgid "Configure Picking Policy for Sales Order"
+#~ msgstr ""
+#~ "Configurar la Politica de paquete de productos de los pedidos de ventas"
+
#, python-format
#~ msgid "Could not cancel sale order !"
#~ msgstr "¡No se puede cancelar la orden de pedido!"
+#~ msgid "Allows you to compute delivery costs on your quotations."
+#~ msgstr "Permite calcular los costos de envío en las peticiones."
+
#~ msgid "Our Salesman"
#~ msgstr "Nuestro vendedor"
@@ -2480,9 +2666,36 @@ msgstr "Facturar desde albaranes"
#~ msgid "Cannot delete Sale Order(s) which are already confirmed !"
#~ msgstr "¡No es posible eliminar ordenes de pedidos que fueron confirmadas!"
+#~ msgid ""
+#~ "Provides some features to improve the layout of the Sales Order reports."
+#~ msgstr ""
+#~ "Provee algunas características para mejorar los reportes de las ordenes de "
+#~ "pedido."
+
+#~ msgid " Year "
+#~ msgstr " Año "
+
+#~ msgid "Sales Order Dates"
+#~ msgstr "Fechas de las ordenes de pedido"
+
#~ msgid "Sale Order Line"
#~ msgstr "Línea de pedido"
+#~ msgid "Margins in Sales Orders"
+#~ msgstr "Márgenes en ordenes de pedido"
+
+#~ msgid "Sales Application Configuration"
+#~ msgstr "Aplicación de configuración de Ventas"
+
+#~ msgid "Delivery Costs"
+#~ msgstr "Costos de entrega"
+
+#~ msgid "title"
+#~ msgstr "título"
+
+#~ msgid "Order date"
+#~ msgstr "Fecha de pedido"
+
#~ msgid ""
#~ "This is the list of picking list that have been generated for this invoice"
#~ msgstr ""
@@ -2490,8 +2703,102 @@ msgstr "Facturar desde albaranes"
#~ "factura"
#, python-format
+#~ msgid "Picking Information !"
+#~ msgstr "¡Información de Paquete de productos!"
+
+#~ msgid ""
+#~ "By default, OpenERP is able to manage complex routing and paths of products "
+#~ "in your warehouse and partner locations. This will configure the most common "
+#~ "and simple methods to deliver products to the customer in one or two "
+#~ "operations by the worker."
+#~ msgstr ""
+#~ "Por defecto, OpenERP puede manejar rutas complejas de productos en los "
+#~ "almacenes o ubicaciones de empresas. Ésto configurará los más simples y "
+#~ "comunes métodos de entrega de productos al cliente en una o dos operaciones "
+#~ "del trabajador."
+
+#~ msgid "sale.installer"
+#~ msgstr "sale.installer"
+
+#~ msgid "Picking List & Delivery Order"
+#~ msgstr "Paquete de productos y Orden de entrega"
+
+#~ msgid "Invoicing"
+#~ msgstr "Facturación"
+
+#~ msgid ""
+#~ "Gives the margin of profitability by calculating the difference between Unit "
+#~ "Price and Cost Price."
+#~ msgstr ""
+#~ "Margen de rentabilidad calculando la diferencia entre el Precio unitario y "
+#~ "el costo."
+
+#, python-format
#~ msgid "You must first cancel all invoices attached to this sale order."
#~ msgstr "Debe primero cancelar todas las facturas de este pedido de venta."
+#~ msgid " Month "
+#~ msgstr " Mes "
+
+#~ msgid " Month-1 "
+#~ msgstr " Mes-1 "
+
+#~ msgid ""
+#~ "The Shipping Policy is used to configure per order if you want to deliver as "
+#~ "soon as possible when one product is available or you wait that all products "
+#~ "are available.."
+#~ msgstr ""
+#~ "La política de envío se utiliza para configurar los pedidos si desea "
+#~ "entregar lo antes posible cuando un producto está disponible o esperar que "
+#~ "todos los productos esten disponibles."
+
+#~ msgid "Configuration Progress"
+#~ msgstr "Progreso de configuración"
+
+#~ msgid "Ordered Date"
+#~ msgstr "Fecha de pedido"
+
#~ msgid "Payment Terms"
#~ msgstr "Terminos de pago"
+
+#~ msgid "Invoicing journals"
+#~ msgstr "Invoicing journals"
+
+#~ msgid "Shipped Qty"
+#~ msgstr "Cantidad enviada"
+
+#~ msgid "Sales Order Layout Improvement"
+#~ msgstr "Diseño mejorado de pedido de venta"
+
+#, python-format
+#~ msgid "Not enough stock !"
+#~ msgstr "!Stock insuficiente!"
+
+#~ msgid "Adds commitment, requested and effective dates on Sales Orders."
+#~ msgstr ""
+#~ "Agrega fechas de entrega, de petición y de efectivo en los pedidos de ventas."
+
+#~ msgid ""
+#~ "Allows you to group and invoice your delivery orders according to different "
+#~ "invoicing types: daily, weekly, etc."
+#~ msgstr ""
+#~ "Permite agrupar y facturar las ordenes de entrega de acuerdo a los "
+#~ "diferentes tipos de facturación: diario, semanal, etc."
+
+#~ msgid "Picking Default Policy"
+#~ msgstr "Política de paquete de productos por defecto"
+
+#~ msgid "Setup your sales workflow and default values."
+#~ msgstr "Configura tu flujo de trabajo de ventas y tus valores por defecto"
+
+#~ msgid "Enhance your core Sales Application with additional functionalities."
+#~ msgstr "Optimizar su aplicación de ventas con funcionalidades adicionales."
+
+#~ msgid "Configure Sales Order Logistics"
+#~ msgstr "Configurar logística pedidos de venta"
+
+#~ msgid "Configure"
+#~ msgstr "Configurar"
+
+#~ msgid "Configure Your Sales Management Application"
+#~ msgstr "Configurar su aplicación de gestión de ventas"
diff --git a/addons/sale/i18n/et.po b/addons/sale/i18n/et.po
index c3301eddd1d..0fa6dac9de7 100644
--- a/addons/sale/i18n/et.po
+++ b/addons/sale/i18n/et.po
@@ -6,20 +6,15 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2011-01-11 11:16+0000\n"
+"POT-Creation-Date: 2011-12-22 18:43+0000\n"
"PO-Revision-Date: 2011-10-11 18:12+0000\n"
"Last-Translator: Aare Vesi <Unknown>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-05 05:16+0000\n"
-"X-Generator: Launchpad (build 14231)\n"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Set to Draft"
-msgstr "Sea mustandiks"
+"X-Launchpad-Export-Date: 2011-12-23 06:46+0000\n"
+"X-Generator: Launchpad (build 14560)\n"
#. module: sale
#: model:process.node,name:sale.process_node_deliveryorder0
@@ -37,14 +32,19 @@ msgid "Untaxed amount"
msgstr "Maksustamata summa"
#. module: sale
-#: code:addons/sale/sale.py:290
-#: code:addons/sale/sale.py:966
-#: code:addons/sale/sale.py:1165
+#: code:addons/sale/sale.py:295
+#: code:addons/sale/sale.py:1061
+#: code:addons/sale/sale.py:1290
#, python-format
msgid "Invalid action !"
msgstr "Vigane tegevus !"
#. module: sale
+#: view:sale.order:0
+msgid "Set to Draft"
+msgstr "Sea mustandiks"
+
+#. module: sale
#: view:sale.order.line:0
msgid "Order"
msgstr "Korraldus"
@@ -86,14 +86,21 @@ msgstr "Müügitellimused"
#~ msgstr "Ostu hinnakirjad"
#. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_sales_by_salesman
-msgid "Sales by Salesman in last 90 days"
+#: field:sale.config.picking_policy,timesheet:0
+msgid "Based on Timesheet"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid ""
+"Sale Order Lines that are confirmed, done or in exception state and haven't "
+"yet been invoiced"
msgstr ""
#. module: sale
-#: help:sale.installer,delivery:0
-msgid "Allows you to compute delivery costs on your quotations."
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_sales_by_salesman
+msgid "Sales by Salesman in last 90 days"
msgstr ""
#. module: sale
@@ -106,6 +113,11 @@ msgstr ""
"tarnida kõik korraga."
#. module: sale
+#: view:sale.order:0
+msgid "UoS"
+msgstr ""
+
+#. module: sale
#: help:sale.order,partner_shipping_id:0
msgid "Shipping address for current sales order."
msgstr ""
@@ -129,22 +141,12 @@ msgid "Cancel Order"
msgstr "Tühista korraldus"
#. module: sale
-#: view:sale.config.picking_policy:0
-msgid "Configure Sales Order Logistics"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:603
+#: code:addons/sale/sale.py:638
#, python-format
msgid "The quotation '%s' has been converted to a sales order."
msgstr ""
#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Payment Before Delivery"
-msgstr "Maksmine enne kohaletoimetamist"
-
-#. module: sale
#: code:addons/sale/wizard/sale_make_invoice.py:42
#, python-format
msgid "Warning !"
@@ -161,12 +163,6 @@ msgid "Drives procurement orders for every sales order line."
msgstr ""
#. module: sale
-#: selection:sale.config.picking_policy,picking_policy:0
-msgid "All at Once"
-msgstr "Kõik korraga"
-
-#. module: sale
-#: field:sale.order,project_id:0
#: view:sale.report:0
#: field:sale.report,analytic_account_id:0
#: field:sale.shop,project_id:0
@@ -182,6 +178,15 @@ msgid ""
msgstr ""
#. module: sale
+#: code:addons/sale/sale.py:295
+#, python-format
+msgid ""
+"In order to delete a confirmed sale order, you must cancel it before ! To "
+"cancel a sale order, you must first cancel related picking or delivery "
+"orders."
+msgstr ""
+
+#. module: sale
#: model:process.node,name:sale.process_node_saleprocurement0
msgid "Procurement Order"
msgstr ""
@@ -193,6 +198,11 @@ msgid "Partner"
msgstr "Partner"
#. module: sale
+#: selection:sale.order,order_policy:0
+msgid "Invoice based on deliveries"
+msgstr ""
+
+#. module: sale
#: view:sale.order:0
msgid "Order Line"
msgstr "Korralduse rida"
@@ -225,8 +235,13 @@ msgid "Default Payment Term"
msgstr "Vaikimisi maksetähtaeg"
#. module: sale
-#: model:ir.actions.act_window,name:sale.action_config_picking_policy
-msgid "Configure Picking Policy for Sales Order"
+#: field:sale.config.picking_policy,deli_orders:0
+msgid "Based on Delivery Orders"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.picking_policy,time_unit:0
+msgid "Main Working Time Unit"
msgstr ""
#. module: sale
@@ -243,9 +258,10 @@ msgid "Disc.(%)"
msgstr "Allah. (%)"
#. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_forceassignation0
-msgid "Force Assignation"
-msgstr "Sunni omistamine"
+#: view:sale.report:0
+#: field:sale.report,price_total:0
+msgid "Total Price"
+msgstr "Hind kokku"
#. module: sale
#: help:sale.make.invoice,grouped:0
@@ -253,6 +269,11 @@ msgid "Check the box to group the invoices for the same customers"
msgstr ""
#. module: sale
+#: view:sale.order:0
+msgid "My Sale Orders"
+msgstr ""
+
+#. module: sale
#: selection:sale.order,invoice_quantity:0
msgid "Ordered Quantities"
msgstr "Tellitud kogused"
@@ -291,13 +312,24 @@ msgid ""
msgstr ""
#. module: sale
+#: field:sale.config.picking_policy,task_work:0
+msgid "Based on Tasks' Work"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
+msgid "Quotations and Sales"
+msgstr ""
+
+#. module: sale
#: model:ir.model,name:sale.model_sale_make_invoice
msgid "Sales Make Invoice"
msgstr ""
#. module: sale
-#: view:sale.order:0
-msgid "Recreate Packing"
+#: code:addons/sale/sale.py:330
+#, python-format
+msgid "Pricelist Warning!"
msgstr ""
#. module: sale
@@ -306,10 +338,10 @@ msgid "Discount (%)"
msgstr "Allahindlus (%)"
#. module: sale
-#: help:res.company,security_lead:0
-msgid ""
-"This is the days added to what you promise to customers for security purpose"
-msgstr ""
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_quotation_for_sale
+msgid "My Quotations"
+msgstr "Minu hinnapakkumised"
#. module: sale
#: view:board.board:0
@@ -334,7 +366,22 @@ msgid "Shop Name"
msgstr "Poe nimi"
#. module: sale
-#: code:addons/sale/sale.py:1014
+#: help:sale.order,order_policy:0
+msgid ""
+"The Invoice Policy is used to synchronise invoice and delivery operations.\n"
+" - The 'Pay before delivery' choice will first generate the invoice and "
+"then generate the picking order after the payment of this invoice.\n"
+" - The 'Deliver & Invoice on demand' will create the picking order directly "
+"and wait for the user to manually click on the 'Invoice' button to generate "
+"the draft invoice based on the sale order or the sale order lines.\n"
+" - The 'Invoice on order after delivery' choice will generate the draft "
+"invoice based on sales order after all picking lists have been finished.\n"
+" - The 'Invoice based on deliveries' choice is used to create an invoice "
+"during the picking process."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:1158
#, python-format
msgid "No Customer Defined !"
msgstr "Klienti pole määratud!"
@@ -345,27 +392,20 @@ msgid "Sales in Exception"
msgstr "Müügid erandis"
#. module: sale
-#: view:sale.order:0
-msgid "Conditions"
+#: code:addons/sale/sale.py:1145
+#: code:addons/sale/sale.py:1264
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:70
+#, python-format
+msgid "Configuration Error !"
msgstr ""
#. module: sale
-#: help:sale.order,order_policy:0
-msgid ""
-"The Shipping Policy is used to synchronise invoice and delivery operations.\n"
-" - The 'Pay Before delivery' choice will first generate the invoice and "
-"then generate the picking order after the payment of this invoice.\n"
-" - The 'Shipping & Manual Invoice' will create the picking order directly "
-"and wait for the user to manually click on the 'Invoice' button to generate "
-"the draft invoice.\n"
-" - The 'Invoice On Order After Delivery' choice will generate the draft "
-"invoice based on sales order after all picking lists have been finished.\n"
-" - The 'Invoice From The Picking' choice is used to create an invoice "
-"during the picking process."
+#: view:sale.order:0
+msgid "Conditions"
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:939
+#: code:addons/sale/sale.py:1034
#, python-format
msgid ""
"There is no income category account defined in default Properties for "
@@ -373,8 +413,8 @@ msgid ""
msgstr ""
#. module: sale
-#: view:sale.installer:0
-msgid "Configure"
+#: selection:sale.report,month:0
+msgid "August"
msgstr ""
#. module: sale
@@ -383,7 +423,7 @@ msgid "You try to assign a lot which is not from the same product"
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:620
+#: code:addons/sale/sale.py:655
#, python-format
msgid "invalid mode for test_state"
msgstr "vigane viis test_olekule"
@@ -394,7 +434,7 @@ msgid "June"
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:584
+#: code:addons/sale/sale.py:617
#, python-format
msgid "Could not cancel this sales order !"
msgstr ""
@@ -415,8 +455,12 @@ msgid "October"
msgstr ""
#. module: sale
+#: sql_constraint:stock.picking:0
+msgid "Reference must be unique per Company!"
+msgstr ""
+
+#. module: sale
#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_quotation_for_sale
#: view:sale.order:0
#: view:sale.report:0
msgid "Quotations"
@@ -428,11 +472,6 @@ msgid "Pricelist for current sales order."
msgstr ""
#. module: sale
-#: selection:sale.config.picking_policy,step:0
-msgid "Delivery Order Only"
-msgstr "Ainult kohaletoimetamise korraldus"
-
-#. module: sale
#: report:sale.order:0
msgid "TVA :"
msgstr "KM:"
@@ -457,6 +496,7 @@ msgstr "Finantspositsioon"
#. module: sale
#: view:sale.order:0
#: view:sale.order.line:0
+#: field:sale.report,product_uom:0
msgid "UoM"
msgstr "MÜ"
@@ -479,13 +519,19 @@ msgid ""
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:971
+#: code:addons/sale/sale.py:1061
+#, python-format
+msgid "You cannot cancel a sale order line that has already been invoiced!"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:1066
#, python-format
msgid "You must first cancel stock moves attached to this sales order line."
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:1042
+#: code:addons/sale/sale.py:1134
#, python-format
msgid "(n/a)"
msgstr ""
@@ -519,13 +565,35 @@ msgid "Notes"
msgstr "Märkmed"
#. module: sale
+#: sql_constraint:res.company:0
+msgid "The company name must be unique !"
+msgstr ""
+
+#. module: sale
#: help:sale.order,partner_invoice_id:0
msgid "Invoice address for current sales order."
msgstr ""
#. module: sale
-#: view:sale.installer:0
-msgid "Enhance your core Sales Application with additional functionalities."
+#: view:sale.report:0
+msgid "Month-1"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered month of the sales order"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:504
+#, python-format
+msgid ""
+"You cannot group sales having different currencies for the same partner."
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,picking_policy:0
+msgid "Deliver each product when available"
msgstr ""
#. module: sale
@@ -540,18 +608,40 @@ msgid "Confirmation Date"
msgstr ""
#. module: sale
+#: field:sale.order,incoterm:0
+msgid "Incoterm"
+msgstr "Tarneklausel"
+
+#. module: sale
#: field:sale.order.line,address_allotment_id:0
msgid "Allotment Partner"
msgstr ""
#. module: sale
-#: sql_constraint:sale.order:0
-msgid "Order Reference must be unique !"
+#: selection:sale.report,month:0
+msgid "March"
msgstr ""
#. module: sale
-#: selection:sale.report,month:0
-msgid "March"
+#: constraint:stock.move:0
+msgid "You can not move products from or to a location of the type view."
+msgstr ""
+
+#. module: sale
+#: field:sale.config.picking_policy,sale_orders:0
+msgid "Based on Sales Orders"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,state:0
+msgid ""
+"Givwizard = self.browse(cr, uid, ids)[0]es the state of the quotation or "
+"sales order. \n"
+"The exception state is automatically set when a cancel operation occurs in "
+"the invoice validation (Invoice Exception) or in the picking list process "
+"(Shipping Exception). \n"
+"The 'Waiting Schedule' state is set when the invoice is confirmed but "
+"waiting for the scheduler to run on the order date."
msgstr ""
#. module: sale
@@ -570,6 +660,11 @@ msgid "Invoice address :"
msgstr "Arve aadress :"
#. module: sale
+#: field:sale.order.line,sequence:0
+msgid "Line Sequence"
+msgstr ""
+
+#. module: sale
#: model:process.transition,note:sale.process_transition_saleorderprocurement0
msgid ""
"For every sales order line, a procurement order is created to supply the "
@@ -616,11 +711,6 @@ msgid "Sales Order Line"
msgstr ""
#. module: sale
-#: view:sale.config.picking_policy:0
-msgid "Setup your sales workflow and default values."
-msgstr ""
-
-#. module: sale
#: field:sale.shop,warehouse_id:0
msgid "Warehouse"
msgstr "Ladu"
@@ -647,6 +737,11 @@ msgid "Creation Date"
msgstr ""
#. module: sale
+#: model:ir.ui.menu,name:sale.menu_sales_configuration_misc
+msgid "Miscellaneous"
+msgstr ""
+
+#. module: sale
#: model:ir.actions.act_window,name:sale.action_order_line_tree3
msgid "Uninvoiced and Delivered Lines"
msgstr "Arveldamata ja kohaletoimetatud read"
@@ -662,6 +757,11 @@ msgid "My Sales"
msgstr ""
#. module: sale
+#: view:sale.order:0
+msgid "Extra Info"
+msgstr "Täiendav info"
+
+#. module: sale
#: field:sale.order,pricelist_id:0
#: field:sale.report,pricelist_id:0
#: field:sale.shop,pricelist_id:0
@@ -675,13 +775,21 @@ msgid "# of Qty"
msgstr ""
#. module: sale
+#: code:addons/sale/sale.py:1314
+#, python-format
+msgid "Hour"
+msgstr ""
+
+#. module: sale
#: view:sale.order:0
msgid "Order Date"
msgstr ""
#. module: sale
#: view:sale.order.line:0
+#: view:sale.report:0
#: field:sale.report,shipped:0
+#: field:sale.report,shipped_qty_1:0
msgid "Shipped"
msgstr ""
@@ -691,8 +799,8 @@ msgid "All Quotations"
msgstr "Kõik hinnapakkumised"
#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Invoice On Order After Delivery"
+#: view:sale.config.picking_policy:0
+msgid "Options"
msgstr ""
#. module: sale
@@ -701,6 +809,20 @@ msgid "September"
msgstr ""
#. module: sale
+#: code:addons/sale/sale.py:632
+#, python-format
+msgid "You cannot confirm a sale order which has no line."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:1246
+#, python-format
+msgid ""
+"You have to select a pricelist or a customer in the sales form !\n"
+"Please set one before choosing a product."
+msgstr ""
+
+#. module: sale
#: view:sale.report:0
#: field:sale.report,categ_id:0
msgid "Category of Product"
@@ -717,11 +839,6 @@ msgid "Stock Moves"
msgstr "Lao liikumised"
#. module: sale
-#: view:sale.report:0
-msgid " Year "
-msgstr ""
-
-#. module: sale
#: field:sale.order,state:0
#: field:sale.report,state:0
msgid "Order State"
@@ -739,7 +856,7 @@ msgid "Sales By Month"
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:970
+#: code:addons/sale/sale.py:1065
#, python-format
msgid "Could not cancel sales order line!"
msgstr ""
@@ -772,42 +889,19 @@ msgid ""
msgstr ""
#. module: sale
-#: view:sale.report:0
-msgid "Extended Filters..."
+#: field:sale.order,date_order:0
+msgid "Date"
msgstr ""
#. module: sale
-#: model:ir.module.module,description:sale.module_meta_information
-msgid ""
-"\n"
-" The base module to manage quotations and sales orders.\n"
-"\n"
-" * Workflow with validation steps:\n"
-" - Quotation -> Sales order -> Invoice\n"
-" * Invoicing methods:\n"
-" - Invoice on order (before or after shipping)\n"
-" - Invoice on delivery\n"
-" - Invoice on timesheets\n"
-" - Advance invoice\n"
-" * Partners preferences (shipping, invoicing, incoterm, ...)\n"
-" * Products stocks and prices\n"
-" * Delivery methods:\n"
-" - all at once, multi-parcel\n"
-" - delivery costs\n"
-" * Dashboard for salesman that includes:\n"
-" * Your open quotations\n"
-" * Top 10 sales of the month\n"
-" * Cases statistics\n"
-" * Graph of sales by product\n"
-" * Graph of cases of the month\n"
-" "
+#: view:sale.report:0
+msgid "Extended Filters..."
msgstr ""
#. module: sale
-#: model:ir.model,name:sale.model_sale_shop
-#: view:sale.shop:0
-msgid "Sales Shop"
-msgstr ""
+#: selection:sale.order.line,state:0
+msgid "Exception"
+msgstr "Erand"
#. module: sale
#: model:ir.model,name:sale.model_res_company
@@ -815,8 +909,9 @@ msgid "Companies"
msgstr ""
#. module: sale
-#: selection:sale.report,month:0
-msgid "November"
+#: code:addons/sale/sale.py:1259
+#, python-format
+msgid "No valid pricelist line found ! :"
msgstr ""
#. module: sale
@@ -825,8 +920,8 @@ msgid "History"
msgstr "Ajalugu"
#. module: sale
-#: field:sale.config.picking_policy,picking_policy:0
-msgid "Picking Default Policy"
+#: selection:sale.order,order_policy:0
+msgid "Invoice on order after delivery"
msgstr ""
#. module: sale
@@ -849,13 +944,12 @@ msgid ""
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:966
-#, python-format
-msgid "You cannot cancel a sales order line that has already been invoiced !"
+#: help:res.company,security_lead:0
+msgid ""
+"This is the days added to what you promise to customers for security purpose"
msgstr ""
#. module: sale
-#: view:sale.order:0
#: view:sale.order.line:0
msgid "Qty"
msgstr "Kogus"
@@ -866,6 +960,11 @@ msgid "References"
msgstr ""
#. module: sale
+#: view:sale.order.line:0
+msgid "My Sales Order Lines"
+msgstr ""
+
+#. module: sale
#: model:process.transition.action,name:sale.process_transition_action_cancel0
#: model:process.transition.action,name:sale.process_transition_action_cancel1
#: model:process.transition.action,name:sale.process_transition_action_cancel2
@@ -877,16 +976,11 @@ msgid "Cancel"
msgstr "Tühista"
#. module: sale
-#: field:sale.installer,sale_order_dates:0
-msgid "Sales Order Dates"
+#: sql_constraint:sale.order:0
+msgid "Order Reference must be unique per Company!"
msgstr ""
#. module: sale
-#: selection:sale.order.line,state:0
-msgid "Exception"
-msgstr "Erand"
-
-#. module: sale
#: model:process.transition,name:sale.process_transition_invoice0
#: model:process.transition,name:sale.process_transition_invoiceafterdelivery0
#: model:process.transition.action,name:sale.process_transition_action_createinvoice0
@@ -896,19 +990,19 @@ msgid "Create Invoice"
msgstr "Loo arve"
#. module: sale
-#: field:sale.installer,sale_margin:0
-msgid "Margins in Sales Orders"
+#: view:sale.order:0
+msgid "Total Tax Excluded"
msgstr ""
#. module: sale
-#: view:sale.order:0
-msgid "Total Tax Excluded"
+#: view:sale.order.line:0
+msgid "Order reference"
msgstr ""
#. module: sale
-#: view:sale.order:0
-msgid "Compute"
-msgstr "Arvuta"
+#: view:sale.open.invoice:0
+msgid "You invoice has been successfully created!"
+msgstr ""
#. module: sale
#: view:sale.report:0
@@ -927,23 +1021,20 @@ msgid "Open Invoice"
msgstr ""
#. module: sale
-#: report:sale.order:0
-#: view:sale.order.line:0
-msgid "Price"
-msgstr "Hind"
+#: model:ir.actions.server,name:sale.ir_actions_server_edi_sale
+msgid "Auto-email confirmed sale orders"
+msgstr ""
#. module: sale
-#: model:ir.actions.act_window,name:sale.action_sale_installer
-#: view:sale.config.picking_policy:0
-#: view:sale.installer:0
-msgid "Sales Application Configuration"
+#: code:addons/sale/sale.py:413
+#, python-format
+msgid "There is no sales journal defined for this company: \"%s\" (id:%d)"
msgstr ""
#. module: sale
-#: view:sale.report:0
-#: field:sale.report,price_total:0
-msgid "Total Price"
-msgstr "Hind kokku"
+#: model:process.transition.action,name:sale.process_transition_action_forceassignation0
+msgid "Force Assignation"
+msgstr "Sunni omistamine"
#. module: sale
#: selection:sale.order.line,type:0
@@ -956,6 +1047,11 @@ msgid "Based on the shipped or on the ordered quantities."
msgstr ""
#. module: sale
+#: selection:sale.order,picking_policy:0
+msgid "Deliver all products at once"
+msgstr ""
+
+#. module: sale
#: field:sale.order,picking_ids:0
msgid "Related Picking"
msgstr ""
@@ -987,8 +1083,14 @@ msgid "Create Delivery Order"
msgstr ""
#. module: sale
-#: field:sale.installer,delivery:0
-msgid "Delivery Costs"
+#: code:addons/sale/sale.py:1290
+#, python-format
+msgid "Cannot delete a sales order line which is in state '%s'!"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Qty(UoS)"
msgstr ""
#. module: sale
@@ -1003,13 +1105,13 @@ msgstr ""
#. module: sale
#: view:sale.report:0
-msgid "Sales by Product Category"
+msgid "Ordered date of the sales order"
msgstr ""
#. module: sale
-#: selection:sale.order,picking_policy:0
-msgid "Partial Delivery"
-msgstr "Osaline kohaletoimetamine"
+#: view:sale.report:0
+msgid "Sales by Product Category"
+msgstr ""
#. module: sale
#: model:process.transition,name:sale.process_transition_confirmquotation0
@@ -1017,9 +1119,10 @@ msgid "Confirm Quotation"
msgstr "Kinnita hinnapakkumine"
#. module: sale
-#: help:sale.order,origin:0
-msgid "Reference of the document that generated this sales order request."
-msgstr ""
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:63
+#, python-format
+msgid "Error"
+msgstr "Viga"
#. module: sale
#: view:sale.order:0
@@ -1051,24 +1154,92 @@ msgid "Procurement Method"
msgstr ""
#. module: sale
-#: view:sale.config.picking_policy:0
-#: view:sale.installer:0
-msgid "title"
-msgstr ""
-
-#. module: sale
#: model:process.node,name:sale.process_node_packinglist0
msgid "Pick List"
msgstr ""
#. module: sale
-#: view:sale.order:0
-msgid "Order date"
+#: model:process.node,note:sale.process_node_packinglist0
+msgid "Document of the move to the output or to the customer."
msgstr ""
#. module: sale
-#: model:process.node,note:sale.process_node_packinglist0
-msgid "Document of the move to the output or to the customer."
+#: model:email.template,body_text:sale.email_template_edi_sale
+msgid ""
+"\n"
+"Hello${object.partner_order_id.name and ' ' or "
+"''}${object.partner_order_id.name or ''},\n"
+"\n"
+"Here is your order confirmation for ${object.partner_id.name}:\n"
+" | Order number: *${object.name}*\n"
+" | Order total: *${object.amount_total} "
+"${object.pricelist_id.currency_id.name}*\n"
+" | Order date: ${object.date_order}\n"
+" % if object.origin:\n"
+" | Order reference: ${object.origin}\n"
+" % endif\n"
+" % if object.client_order_ref:\n"
+" | Your reference: ${object.client_order_ref}<br />\n"
+" % endif\n"
+" | Your contact: ${object.user_id.name} ${object.user_id.user_email "
+"and '<%s>'%(object.user_id.user_email) or ''}\n"
+"\n"
+"You can view the order confirmation, download it and even pay online using "
+"the following link:\n"
+" ${ctx.get('edi_web_url_view') or 'n/a'}\n"
+"\n"
+"% if object.order_policy in ('prepaid','manual') and "
+"object.company_id.paypal_account:\n"
+"<% \n"
+"comp_name = quote(object.company_id.name)\n"
+"order_name = quote(object.name)\n"
+"paypal_account = quote(object.company_id.paypal_account)\n"
+"order_amount = quote(str(object.amount_total))\n"
+"cur_name = quote(object.pricelist_id.currency_id.name)\n"
+"paypal_url = \"https://www.paypal.com/cgi-"
+"bin/webscr?cmd=_xclick&business=%s&item_name=%s%%20Order%%20%s&invoice=%s&amo"
+"unt=%s\" \\\n"
+" "
+"\"&currency_code=%s&button_subtype=services&no_note=1&bn=OpenERP_Order_PayNow"
+"_%s\" % \\\n"
+" "
+"(paypal_account,comp_name,order_name,order_name,order_amount,cur_name,cur_nam"
+"e)\n"
+"%>\n"
+"It is also possible to directly pay with Paypal:\n"
+" ${paypal_url}\n"
+"% endif\n"
+"\n"
+"If you have any question, do not hesitate to contact us.\n"
+"\n"
+"\n"
+"Thank you for choosing ${object.company_id.name}!\n"
+"\n"
+"\n"
+"--\n"
+"${object.user_id.name} ${object.user_id.user_email and "
+"'<%s>'%(object.user_id.user_email) or ''}\n"
+"${object.company_id.name}\n"
+"% if object.company_id.street:\n"
+"${object.company_id.street or ''}\n"
+"% endif\n"
+"% if object.company_id.street2:\n"
+"${object.company_id.street2}\n"
+"% endif\n"
+"% if object.company_id.city or object.company_id.zip:\n"
+"${object.company_id.zip or ''} ${object.company_id.city or ''}\n"
+"% endif\n"
+"% if object.company_id.country_id:\n"
+"${object.company_id.state_id and ('%s, ' % object.company_id.state_id.name) "
+"or ''} ${object.company_id.country_id.name or ''}\n"
+"% endif\n"
+"% if object.company_id.phone:\n"
+"Phone: ${object.company_id.phone}\n"
+"% endif\n"
+"% if object.company_id.website:\n"
+"${object.company_id.website or ''}\n"
+"% endif\n"
+" "
msgstr ""
#. module: sale
@@ -1094,9 +1265,9 @@ msgid "Taxes"
msgstr "Maksud"
#. module: sale
-#: field:sale.order,order_policy:0
-msgid "Shipping Policy"
-msgstr "Saatmispoliitika"
+#: view:sale.order:0
+msgid "Sales Order ready to be invoiced"
+msgstr ""
#. module: sale
#: help:sale.order,create_date:0
@@ -1115,9 +1286,9 @@ msgid "Create Invoices"
msgstr ""
#. module: sale
-#: view:sale.order:0
-msgid "Extra Info"
-msgstr "Täiendav info"
+#: view:sale.report:0
+msgid "Sales order created in current month"
+msgstr ""
#. module: sale
#: report:sale.order:0
@@ -1125,11 +1296,24 @@ msgid "Fax :"
msgstr "Faks :"
#. module: sale
+#: help:sale.order.line,type:0
+msgid ""
+"If 'on order', it triggers a procurement when the sale order is confirmed to "
+"create a task, purchase order or manufacturing order linked to this sale "
+"order line."
+msgstr ""
+
+#. module: sale
#: field:sale.advance.payment.inv,amount:0
msgid "Advance Amount"
msgstr ""
#. module: sale
+#: field:sale.config.picking_policy,charge_delivery:0
+msgid "Do you charge the delivery?"
+msgstr ""
+
+#. module: sale
#: selection:sale.order,invoice_quantity:0
msgid "Shipped Quantities"
msgstr "Saadetud kogused"
@@ -1140,25 +1324,45 @@ msgid "Invoice Based on Sales Orders"
msgstr "Arve müügikorralduste põhjal"
#. module: sale
+#: code:addons/sale/sale.py:331
+#, python-format
+msgid ""
+"If you change the pricelist of this order (and eventually the currency), "
+"prices of existing order lines will not be updated."
+msgstr ""
+
+#. module: sale
#: model:ir.model,name:sale.model_stock_picking
msgid "Picking List"
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:387
-#: code:addons/sale/sale.py:920
-#: code:addons/sale/sale.py:938
+#: code:addons/sale/sale.py:412
+#: code:addons/sale/sale.py:503
+#: code:addons/sale/sale.py:632
+#: code:addons/sale/sale.py:1015
+#: code:addons/sale/sale.py:1033
#, python-format
msgid "Error !"
msgstr "Viga !"
#. module: sale
-#: code:addons/sale/sale.py:570
+#: code:addons/sale/sale.py:603
#, python-format
msgid "Could not cancel sales order !"
msgstr ""
#. module: sale
+#: view:sale.order:0
+msgid "Qty(UoM)"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered Year of the sales order"
+msgstr ""
+
+#. module: sale
#: selection:sale.report,month:0
msgid "July"
msgstr ""
@@ -1175,35 +1379,25 @@ msgid "Shipping Exception"
msgstr "Kohaletoimetamise erand"
#. module: sale
-#: field:sale.make.invoice,grouped:0
-msgid "Group the invoices"
-msgstr "Grupeeri arved"
-
-#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Shipping & Manual Invoice"
-msgstr "Saatmine ja käsitsi arveldamine"
-
-#. module: sale
-#: code:addons/sale/sale.py:1051
+#: code:addons/sale/sale.py:1143
#, python-format
-msgid "Picking Information !"
+msgid "Picking Information ! : "
msgstr ""
#. module: sale
-#: view:sale.report:0
-#: field:sale.report,month:0
-msgid "Month"
-msgstr "Kuu"
+#: field:sale.make.invoice,grouped:0
+msgid "Group the invoices"
+msgstr "Grupeeri arved"
#. module: sale
-#: model:ir.module.module,shortdesc:sale.module_meta_information
-msgid "Sales Management"
-msgstr "Müügihaldus"
+#: field:sale.order,order_policy:0
+msgid "Invoice Policy"
+msgstr ""
#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Invoice From The Picking"
+#: model:ir.actions.act_window,name:sale.action_config_picking_policy
+#: view:sale.config.picking_policy:0
+msgid "Setup your Invoicing Method"
msgstr ""
#. module: sale
@@ -1213,27 +1407,30 @@ msgstr ""
#. module: sale
#: view:sale.report:0
-#: field:sale.report,uom_name:0
msgid "Reference UoM"
msgstr ""
#. module: sale
+#: view:sale.config.picking_policy:0
+msgid ""
+"This tool will help you to install the right module and configure the system "
+"according to the method you use to invoice your customers."
+msgstr ""
+
+#. module: sale
#: model:ir.model,name:sale.model_sale_order_line_make_invoice
msgid "Sale OrderLine Make_invoice"
msgstr ""
#. module: sale
-#: help:sale.config.picking_policy,step:0
-msgid ""
-"By default, OpenERP is able to manage complex routing and paths of products "
-"in your warehouse and partner locations. This will configure the most common "
-"and simple methods to deliver products to the customer in one or two "
-"operations by the worker."
-msgstr ""
+#: selection:sale.order,state:0
+#: selection:sale.report,state:0
+msgid "Invoice Exception"
+msgstr "Arve erand"
#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_tree
-msgid "Old Quotations"
+#: model:process.node,note:sale.process_node_saleorder0
+msgid "Drives procurement and invoicing"
msgstr ""
#. module: sale
@@ -1249,6 +1446,22 @@ msgid "Sales Analysis"
msgstr ""
#. module: sale
+#: code:addons/sale/sale.py:1138
+#, python-format
+msgid ""
+"You selected a quantity of %d Units.\n"
+"But it's not compatible with the selected packaging.\n"
+"Here is a proposition of quantities according to the packaging:\n"
+"EAN: %s Quantity: %s Type of ul: %s"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Recreate Packing"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
#: field:sale.order.line,property_ids:0
msgid "Properties"
msgstr "Omadused"
@@ -1275,7 +1488,17 @@ msgid ""
msgstr ""
#. module: sale
-#: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
+#: view:sale.order.line:0
+msgid "Confirmed sale order lines, not yet delivered"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:473
+#, python-format
+msgid "Customer Invoices"
+msgstr ""
+
+#. module: sale
#: model:process.process,name:sale.process_process_salesprocess0
#: view:sale.order:0
#: view:sale.report:0
@@ -1297,18 +1520,13 @@ msgid "Done"
msgstr "Valmis"
#. module: sale
-#: model:ir.model,name:sale.model_sale_installer
-msgid "sale.installer"
-msgstr ""
-
-#. module: sale
#: model:process.node,name:sale.process_node_invoice0
#: model:process.node,name:sale.process_node_invoiceafterdelivery0
msgid "Invoice"
msgstr "Arve"
#. module: sale
-#: code:addons/sale/sale.py:1014
+#: code:addons/sale/sale.py:1158
#, python-format
msgid ""
"You have to select a customer in the sales form !\n"
@@ -1316,11 +1534,6 @@ msgid ""
msgstr ""
#. module: sale
-#: selection:sale.config.picking_policy,step:0
-msgid "Picking List & Delivery Order"
-msgstr ""
-
-#. module: sale
#: field:sale.order,origin:0
msgid "Source Document"
msgstr ""
@@ -1346,7 +1559,7 @@ msgid "The amount without tax."
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:571
+#: code:addons/sale/sale.py:604
#, python-format
msgid "You must first cancel all picking attached to this sales order."
msgstr ""
@@ -1357,9 +1570,15 @@ msgid "Sales Advance Payment Invoice"
msgstr ""
#. module: sale
-#: field:sale.order,incoterm:0
-msgid "Incoterm"
-msgstr "Tarneklausel"
+#: view:sale.report:0
+#: field:sale.report,month:0
+msgid "Month"
+msgstr "Kuu"
+
+#. module: sale
+#: model:email.template,subject:sale.email_template_edi_sale
+msgid "${object.company_id.name} Order (Ref ${object.name or 'n/a' })"
+msgstr ""
#. module: sale
#: view:sale.order.line:0
@@ -1370,11 +1589,6 @@ msgid "Product"
msgstr "Toode"
#. module: sale
-#: model:ir.ui.menu,name:sale.menu_invoiced
-msgid "Invoicing"
-msgstr ""
-
-#. module: sale
#: model:process.transition.action,name:sale.process_transition_action_cancelassignation0
msgid "Cancel Assignation"
msgstr "Tühista omistamine"
@@ -1385,14 +1599,10 @@ msgid "sale.config.picking_policy"
msgstr "sale.config.picking_policy"
#. module: sale
-#: help:sale.order,state:0
-msgid ""
-"Gives the state of the quotation or sales order. \n"
-"The exception state is automatically set when a cancel operation occurs in "
-"the invoice validation (Invoice Exception) or in the picking list process "
-"(Shipping Exception). \n"
-"The 'Waiting Schedule' state is set when the invoice is confirmed but "
-"waiting for the scheduler to run on the date 'Ordered Date'."
+#: view:account.invoice.report:0
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_turnover_by_month
+msgid "Monthly Turnover"
msgstr ""
#. module: sale
@@ -1411,7 +1621,6 @@ msgid "Product UoS"
msgstr "Toote TÜ"
#. module: sale
-#: selection:sale.order,state:0
#: selection:sale.report,state:0
msgid "Manual In Progress"
msgstr "Edenemisel käsitsi"
@@ -1427,7 +1636,8 @@ msgid "Logistic"
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:921
+#: code:addons/sale/sale.py:1016
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:71
#, python-format
msgid "There is no income account defined for this product: \"%s\" (id:%d)"
msgstr ""
@@ -1447,7 +1657,7 @@ msgid ""
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:1116
+#: code:addons/sale/sale.py:1238
#, python-format
msgid ""
"You plan to sell %.2f %s but you only have %.2f %s available !\n"
@@ -1471,10 +1681,10 @@ msgid "Total"
msgstr "Kokku"
#. module: sale
-#: code:addons/sale/sale.py:388
-#, python-format
-msgid "There is no sales journal defined for this company: \"%s\" (id:%d)"
-msgstr ""
+#: report:sale.order:0
+#: view:sale.order.line:0
+msgid "Price"
+msgstr "Hind"
#. module: sale
#: model:process.transition,note:sale.process_transition_deliver0
@@ -1485,9 +1695,14 @@ msgid ""
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:1165
-#, python-format
-msgid "Cannot delete a sales order line which is %s !"
+#: selection:sale.order,order_policy:0
+msgid "Pay before delivery"
+msgstr ""
+
+#. module: sale
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.open_board_sales
+msgid "Sales Dashboard"
msgstr ""
#. module: sale
@@ -1499,6 +1714,7 @@ msgstr ""
#. module: sale
#: view:sale.order:0
+#: selection:sale.order,state:0
#: view:sale.order.line:0
msgid "To Invoice"
msgstr ""
@@ -1509,6 +1725,11 @@ msgid "Date on which sales order is confirmed."
msgstr ""
#. module: sale
+#: field:sale.order,project_id:0
+msgid "Contract/Analytic Account"
+msgstr ""
+
+#. module: sale
#: field:sale.order,company_id:0
#: field:sale.order.line,company_id:0
#: view:sale.report:0
@@ -1528,22 +1749,17 @@ msgid "The amount to be invoiced in advance."
msgstr ""
#. module: sale
-#: selection:sale.order,state:0
-#: selection:sale.report,state:0
-msgid "Invoice Exception"
-msgstr "Arve erand"
-
-#. module: sale
-#: help:sale.order,picking_ids:0
+#: code:addons/sale/sale.py:1256
+#, python-format
msgid ""
-"This is a list of picking that has been generated for this sales order."
+"Couldn't find a pricelist line matching this product and quantity.\n"
+"You have to change either the product, the quantity or the pricelist."
msgstr ""
#. module: sale
-#: help:sale.installer,sale_margin:0
+#: help:sale.order,picking_ids:0
msgid ""
-"Gives the margin of profitability by calculating the difference between Unit "
-"Price and Cost Price."
+"This is a list of picking that has been generated for this sales order."
msgstr ""
#. module: sale
@@ -1565,6 +1781,11 @@ msgid "Cancelled"
msgstr ""
#. module: sale
+#: view:sale.order.line:0
+msgid "Sales Order Lines related to a Sales Order of mine"
+msgstr ""
+
+#. module: sale
#: model:ir.actions.act_window,name:sale.action_shop_form
#: model:ir.ui.menu,name:sale.menu_action_shop_form
#: field:sale.order,shop_id:0
@@ -1574,17 +1795,12 @@ msgid "Shop"
msgstr "Pood"
#. module: sale
-#: view:sale.report:0
-msgid " Month "
-msgstr ""
-
-#. module: sale
#: field:sale.report,date_confirm:0
msgid "Date Confirm"
msgstr ""
#. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:111
+#: code:addons/sale/wizard/sale_line_invoice.py:113
#, python-format
msgid "Warning"
msgstr ""
@@ -1596,17 +1812,6 @@ msgid "Sales by Month"
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:1045
-#, python-format
-msgid ""
-"You selected a quantity of %d Units.\n"
-"But it's not compatible with the selected packaging.\n"
-"Here is a proposition of quantities according to the packaging:\n"
-"\n"
-"EAN: %s Quantity: %s Type of ul: %s"
-msgstr ""
-
-#. module: sale
#: model:ir.model,name:sale.model_sale_order
#: model:process.node,name:sale.process_node_order0
#: model:process.node,name:sale.process_node_saleorder0
@@ -1622,6 +1827,11 @@ msgid "Quantity (UoS)"
msgstr "Kogus (TÜ)"
#. module: sale
+#: view:sale.order.line:0
+msgid "Sale Order Lines that are in 'done' state"
+msgstr ""
+
+#. module: sale
#: model:process.transition,note:sale.process_transition_packing0
msgid ""
"The Pick List form is created as soon as the sales order is confirmed, in "
@@ -1636,6 +1846,11 @@ msgid "Confirmed"
msgstr "Kinnitatud"
#. module: sale
+#: field:sale.config.picking_policy,order_policy:0
+msgid "Main Method Based On"
+msgstr ""
+
+#. module: sale
#: model:process.transition.action,name:sale.process_transition_action_confirm0
msgid "Confirm"
msgstr "Kinnita"
@@ -1658,6 +1873,7 @@ msgid "Invoice Lines"
msgstr "Arve read"
#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_product_tree
#: view:sale.order:0
#: view:sale.order.line:0
msgid "Sales Order Lines"
@@ -1674,30 +1890,18 @@ msgid "Configuration"
msgstr "Seadistused"
#. module: sale
-#: selection:sale.order,picking_policy:0
-msgid "Complete Delivery"
-msgstr "Täielik kohaletoimetamine"
-
-#. module: sale
-#: view:sale.report:0
-msgid " Month-1 "
-msgstr ""
-
-#. module: sale
-#: help:sale.config.picking_policy,picking_policy:0
-msgid ""
-"The Shipping Policy is used to configure per order if you want to deliver as "
-"soon as possible when one product is available or you wait that all products "
-"are available.."
+#: code:addons/sale/edi/sale_order.py:146
+#, python-format
+msgid "EDI Pricelist (%s)"
msgstr ""
#. module: sale
-#: selection:sale.report,month:0
-msgid "August"
+#: view:sale.report:0
+msgid "Sales order created in current year"
msgstr ""
#. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:111
+#: code:addons/sale/wizard/sale_line_invoice.py:113
#, python-format
msgid ""
"Invoice cannot be created for this Sales Order Line due to one of the "
@@ -1707,6 +1911,11 @@ msgid ""
msgstr ""
#. module: sale
+#: view:sale.order.line:0
+msgid "Sale order lines done"
+msgstr ""
+
+#. module: sale
#: field:sale.order.line,th_weight:0
msgid "Weight"
msgstr "Kaal"
@@ -1725,7 +1934,6 @@ msgstr ""
#. module: sale
#: field:sale.config.picking_policy,config_logo:0
-#: field:sale.installer,config_logo:0
msgid "Image"
msgstr ""
@@ -1755,12 +1963,12 @@ msgid "Salesman"
msgstr "Müügimees"
#. module: sale
-#: model:process.node,note:sale.process_node_saleorder0
-msgid "Drives procurement and invoicing"
+#: model:ir.actions.act_window,name:sale.action_order_tree
+msgid "Old Quotations"
msgstr ""
#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:163
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:170
#: model:ir.actions.act_window,name:sale.action_view_sale_advance_payment_inv
#: view:sale.advance.payment.inv:0
#: view:sale.order:0
@@ -1769,7 +1977,7 @@ msgid "Advance Invoice"
msgstr "Ettemaksuarve"
#. module: sale
-#: code:addons/sale/sale.py:591
+#: code:addons/sale/sale.py:624
#, python-format
msgid "The sales order '%s' has been cancelled."
msgstr ""
@@ -1804,29 +2012,30 @@ msgid "Packings"
msgstr ""
#. module: sale
-#: field:sale.config.picking_policy,progress:0
-#: field:sale.installer,progress:0
-msgid "Configuration Progress"
+#: view:sale.order.line:0
+msgid "Sale Order Lines ready to be invoiced"
msgstr ""
#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_product_tree
-msgid "Product sales"
-msgstr "Toote müügid"
+#: view:sale.report:0
+msgid "Sales order created in last month"
+msgstr ""
#. module: sale
-#: field:sale.order,date_order:0
-msgid "Ordered Date"
+#: model:ir.actions.act_window,name:sale.action_email_templates
+#: model:ir.ui.menu,name:sale.menu_email_templates
+msgid "Email Templates"
msgstr ""
#. module: sale
-#: selection:sale.config.picking_policy,picking_policy:0
-msgid "Direct Delivery"
-msgstr "Otsetarne"
+#: model:ir.model,name:sale.model_sale_shop
+#: view:sale.shop:0
+msgid "Sales Shop"
+msgstr ""
#. module: sale
-#: field:sale.installer,sale_journal:0
-msgid "Invoicing journals"
+#: selection:sale.report,month:0
+msgid "November"
msgstr ""
#. module: sale
@@ -1835,18 +2044,12 @@ msgid "Advance Product"
msgstr "Ettemaksu toode"
#. module: sale
-#: view:sale.report:0
-#: field:sale.report,shipped_qty_1:0
-msgid "Shipped Qty"
-msgstr ""
-
-#. module: sale
-#: view:sale.open.invoice:0
-msgid "You invoice has been successfully created!"
-msgstr ""
+#: view:sale.order:0
+msgid "Compute"
+msgstr "Arvuta"
#. module: sale
-#: code:addons/sale/sale.py:585
+#: code:addons/sale/sale.py:618
#, python-format
msgid "You must first cancel all invoices attached to this sales order."
msgstr ""
@@ -1857,33 +2060,27 @@ msgid "January"
msgstr ""
#. module: sale
-#: view:sale.installer:0
-msgid "Configure Your Sales Management Application"
-msgstr ""
-
-#. module: sale
#: model:ir.actions.act_window,name:sale.action_order_tree4
msgid "Sales Order in Progress"
msgstr "Edenemisel müügikorraldused"
#. module: sale
-#: field:sale.installer,sale_layout:0
-msgid "Sales Order Layout Improvement"
+#: help:sale.order,origin:0
+msgid "Reference of the document that generated this sales order request."
msgstr ""
#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:63
-#, python-format
-msgid "Error"
-msgstr "Viga"
-
-#. module: sale
#: view:sale.report:0
#: field:sale.report,delay:0
msgid "Commitment Delay"
msgstr ""
#. module: sale
+#: selection:sale.order,order_policy:0
+msgid "Deliver & invoice on demand"
+msgstr ""
+
+#. module: sale
#: model:process.node,note:sale.process_node_saleprocurement0
msgid ""
"One Procurement order for each sales order line and for each of the "
@@ -1906,13 +2103,12 @@ msgid "Confirmed sales order to invoice."
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:290
-#, python-format
-msgid "Cannot delete Sales Order(s) which are already confirmed !"
+#: view:sale.order:0
+msgid "Sales Order that haven't yet been confirmed"
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:316
+#: code:addons/sale/sale.py:322
#, python-format
msgid "The sales order '%s' has been set in draft state."
msgstr ""
@@ -1923,24 +2119,19 @@ msgid "from stock"
msgstr "laost"
#. module: sale
-#: field:sale.config.picking_policy,order_policy:0
-msgid "Shipping Default Policy"
-msgstr "Tarnimise vaikimisi poliitika"
-
-#. module: sale
#: view:sale.open.invoice:0
msgid "Close"
msgstr "Sulge"
#. module: sale
-#: field:sale.order,shipped:0
-msgid "Delivered"
+#: code:addons/sale/sale.py:1248
+#, python-format
+msgid "No Pricelist ! : "
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:1115
-#, python-format
-msgid "Not enough stock !"
+#: field:sale.order,shipped:0
+msgid "Delivered"
msgstr ""
#. module: sale
@@ -1949,11 +2140,6 @@ msgid "You must assign a production lot for this product"
msgstr ""
#. module: sale
-#: field:sale.order.line,sequence:0
-msgid "Layout Sequence"
-msgstr ""
-
-#. module: sale
#: model:ir.actions.act_window,help:sale.action_shop_form
msgid ""
"If you have more than one shop reselling your company products, you can "
@@ -1980,11 +2166,6 @@ msgid "May"
msgstr ""
#. module: sale
-#: help:sale.installer,sale_order_dates:0
-msgid "Adds commitment, requested and effective dates on Sales Orders."
-msgstr ""
-
-#. module: sale
#: view:sale.order:0
#: field:sale.order,partner_id:0
#: field:sale.order.line,order_partner_id:0
@@ -1992,23 +2173,11 @@ msgid "Customer"
msgstr "Klient"
#. module: sale
-#: model:product.template,name:sale.advance_product_0_product_template
-msgid "Advance"
-msgstr ""
-
-#. module: sale
#: selection:sale.report,month:0
msgid "February"
msgstr ""
#. module: sale
-#: help:sale.installer,sale_journal:0
-msgid ""
-"Allows you to group and invoice your delivery orders according to different "
-"invoicing types: daily, weekly, etc."
-msgstr ""
-
-#. module: sale
#: selection:sale.report,month:0
msgid "April"
msgstr ""
@@ -2019,11 +2188,6 @@ msgid "Accounting"
msgstr "Raamatupidamine"
#. module: sale
-#: field:sale.config.picking_policy,step:0
-msgid "Steps To Deliver a Sales Order"
-msgstr ""
-
-#. module: sale
#: view:sale.order:0
#: view:sale.order.line:0
msgid "Search Sales Order"
@@ -2035,18 +2199,18 @@ msgid "Sales Order Requisition"
msgstr ""
#. module: sale
+#: code:addons/sale/sale.py:1242
+#, python-format
+msgid "Not enough stock ! : "
+msgstr ""
+
+#. module: sale
#: report:sale.order:0
#: field:sale.order,payment_term:0
msgid "Payment Term"
msgstr "Maksetingimus"
#. module: sale
-#: help:sale.installer,sale_layout:0
-msgid ""
-"Provides some features to improve the layout of the Sales Order reports."
-msgstr ""
-
-#. module: sale
#: model:ir.actions.act_window,help:sale.action_order_report_all
msgid ""
"This report performs analysis on your quotations and sales orders. Analysis "
@@ -2109,9 +2273,6 @@ msgstr "Arve kohaletoimetamiste põhjal"
#~ msgid "Invalid XML for View Architecture!"
#~ msgstr "Vigane XML vaate arhitektuurile!"
-#~ msgid "My Quotations"
-#~ msgstr "Minu hinnapakkumised"
-
#~ msgid "Canceled"
#~ msgstr "Tühistatud"
@@ -2135,6 +2296,9 @@ msgstr "Arve kohaletoimetamiste põhjal"
#~ msgid "Make invoices"
#~ msgstr "Loo arved"
+#~ msgid "Partial Delivery"
+#~ msgstr "Osaline kohaletoimetamine"
+
#~ msgid "Steps To Deliver a Sale Order"
#~ msgstr "Sammud müügikorralduse kohaletoimetamiseks"
@@ -2155,6 +2319,9 @@ msgstr "Arve kohaletoimetamiste põhjal"
#~ "This is the list of picking list that have been generated for this invoice"
#~ msgstr "See on nimekiri noppelehtedest, mis on genereeritud sellele arvele."
+#~ msgid "Shipping Policy"
+#~ msgstr "Saatmispoliitika"
+
#~ msgid "Manual Designation"
#~ msgstr "Käsitsi määramine"
@@ -2178,6 +2345,9 @@ msgstr "Arve kohaletoimetamiste põhjal"
#~ msgid "Outgoing Products"
#~ msgstr "Väljuvad tooted"
+#~ msgid "All at Once"
+#~ msgstr "Kõik korraga"
+
#~ msgid "Sale Shop"
#~ msgstr "Müügikauplus"
@@ -2225,6 +2395,9 @@ msgstr "Arve kohaletoimetamiste põhjal"
#~ msgid "Procurement for each line"
#~ msgstr "Hankimine igale reale"
+#~ msgid "Shipping Default Policy"
+#~ msgstr "Tarnimise vaikimisi poliitika"
+
#~ msgid "Sales Process"
#~ msgstr "Müügiprotsess"
@@ -2240,9 +2413,15 @@ msgstr "Arve kohaletoimetamiste põhjal"
#~ msgid "Configure Sale Order Logistic"
#~ msgstr "Seadista müügikorralduse logistika"
+#~ msgid "Shipping & Manual Invoice"
+#~ msgstr "Saatmine ja käsitsi arveldamine"
+
#~ msgid "Procurement Corrected"
#~ msgstr "Hange korrastatud"
+#~ msgid "Product sales"
+#~ msgstr "Toote müügid"
+
#~ msgid "Packing Policy"
#~ msgstr "Pakkimise poliitika"
@@ -2265,6 +2444,9 @@ msgstr "Arve kohaletoimetamiste põhjal"
#~ "Arve luuakse, kui klõpsatakse 'Loo arve' pärast müügikorralduse kinnitamist. "
#~ "See tehing liigutab müügikorralduse arvetele."
+#~ msgid "Direct Delivery"
+#~ msgstr "Otsetarne"
+
#~ msgid "Sequence"
#~ msgstr "Järjekord"
@@ -2358,6 +2540,9 @@ msgstr "Arve kohaletoimetamiste põhjal"
#~ "Sa pead valima kliendi müügivormis!\n"
#~ "Palun määra üks klient enne toote valimist."
+#~ msgid "Sales Management"
+#~ msgstr "Müügihaldus"
+
#~ msgid "Sales order"
#~ msgstr "Müügikorraldus"
@@ -2370,6 +2555,9 @@ msgstr "Arve kohaletoimetamiste põhjal"
#~ msgid "Delivery, from the warehouse to the customer."
#~ msgstr "Kohaletoimetamine laost kliendile."
+#~ msgid "Complete Delivery"
+#~ msgstr "Täielik kohaletoimetamine"
+
#~ msgid "After confirming order, Create the invoice."
#~ msgstr "Pärast korralduse kinnitamist loo arve."
@@ -2404,12 +2592,18 @@ msgstr "Arve kohaletoimetamiste põhjal"
#~ msgid "Sale Order line"
#~ msgstr "Müügikorralduse rida"
+#~ msgid "Delivery Order Only"
+#~ msgstr "Ainult kohaletoimetamise korraldus"
+
#~ msgid "Invoice after delivery"
#~ msgstr "Arvelda pärast kohaletoimetamist"
#~ msgid "Deliver"
#~ msgstr "Kohale toimetama"
+#~ msgid "Payment Before Delivery"
+#~ msgstr "Maksmine enne kohaletoimetamist"
+
#~ msgid "Packing List & Delivery Order"
#~ msgstr "Pakkeleht ja kohaletoimetamise korraldus"
diff --git a/addons/sale/i18n/fi.po b/addons/sale/i18n/fi.po
index 40844278015..192951e35d3 100644
--- a/addons/sale/i18n/fi.po
+++ b/addons/sale/i18n/fi.po
@@ -7,15 +7,27 @@ msgid ""
msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-01-11 11:16+0000\n"
+"POT-Creation-Date: 2011-12-22 18:43+0000\n"
"PO-Revision-Date: 2010-12-14 21:29+0000\n"
"Last-Translator: qdp (OpenERP) <qdp-launchpad@tinyerp.com>\n"
"Language-Team: Finnish <fi@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-05 05:16+0000\n"
-"X-Generator: Launchpad (build 14231)\n"
+"X-Launchpad-Export-Date: 2011-12-23 06:46+0000\n"
+"X-Generator: Launchpad (build 14560)\n"
+
+#. module: sale
+#: field:sale.config.picking_policy,timesheet:0
+msgid "Based on Timesheet"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid ""
+"Sale Order Lines that are confirmed, done or in exception state and haven't "
+"yet been invoiced"
+msgstr ""
#. module: sale
#: view:board.board:0
@@ -24,11 +36,6 @@ msgid "Sales by Salesman in last 90 days"
msgstr "Myynnit Myyjittäin viimeisen 90 päivän ajalta"
#. module: sale
-#: help:sale.installer,delivery:0
-msgid "Allows you to compute delivery costs on your quotations."
-msgstr "Mahdollistaa kuljetuskustannusten laskennan tarjouksellesi."
-
-#. module: sale
#: help:sale.order,picking_policy:0
msgid ""
"If you don't have enough stock available to deliver all at once, do you "
@@ -38,6 +45,11 @@ msgstr ""
"osittaisen lähettämisen?"
#. module: sale
+#: view:sale.order:0
+msgid "UoS"
+msgstr ""
+
+#. module: sale
#: help:sale.order,partner_shipping_id:0
msgid "Shipping address for current sales order."
msgstr "Toimitusosoite tälle tilaukselle"
@@ -61,22 +73,12 @@ msgid "Cancel Order"
msgstr "Peruuta tilaus"
#. module: sale
-#: view:sale.config.picking_policy:0
-msgid "Configure Sales Order Logistics"
-msgstr "Konfiguroi myyntitilauksen logistiikan"
-
-#. module: sale
-#: code:addons/sale/sale.py:603
+#: code:addons/sale/sale.py:638
#, python-format
msgid "The quotation '%s' has been converted to a sales order."
msgstr "Tarjous '%s' on muutettu tilaukseksi."
#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Payment Before Delivery"
-msgstr "Maksu ennen toimitusta"
-
-#. module: sale
#: code:addons/sale/wizard/sale_make_invoice.py:42
#, python-format
msgid "Warning !"
@@ -93,12 +95,6 @@ msgid "Drives procurement orders for every sales order line."
msgstr "Ohjaa hankintatilauksia jokaiselle myyntitilausriville"
#. module: sale
-#: selection:sale.config.picking_policy,picking_policy:0
-msgid "All at Once"
-msgstr "Kaikki kerralla"
-
-#. module: sale
-#: field:sale.order,project_id:0
#: view:sale.report:0
#: field:sale.report,analytic_account_id:0
#: field:sale.shop,project_id:0
@@ -118,6 +114,15 @@ msgstr ""
"koontilaskuilla."
#. module: sale
+#: code:addons/sale/sale.py:295
+#, python-format
+msgid ""
+"In order to delete a confirmed sale order, you must cancel it before ! To "
+"cancel a sale order, you must first cancel related picking or delivery "
+"orders."
+msgstr ""
+
+#. module: sale
#: model:process.node,name:sale.process_node_saleprocurement0
msgid "Procurement Order"
msgstr "Hankinta tilaus"
@@ -129,6 +134,11 @@ msgid "Partner"
msgstr "Kumppani"
#. module: sale
+#: selection:sale.order,order_policy:0
+msgid "Invoice based on deliveries"
+msgstr ""
+
+#. module: sale
#: view:sale.order:0
msgid "Order Line"
msgstr "Tilausrivi"
@@ -168,9 +178,14 @@ msgid "Default Payment Term"
msgstr "Oletusmaksuehto"
#. module: sale
-#: model:ir.actions.act_window,name:sale.action_config_picking_policy
-msgid "Configure Picking Policy for Sales Order"
-msgstr "Määritellään myyntitilauksen poimintasäännöt"
+#: field:sale.config.picking_policy,deli_orders:0
+msgid "Based on Delivery Orders"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.picking_policy,time_unit:0
+msgid "Main Working Time Unit"
+msgstr ""
#. module: sale
#: view:sale.order:0
@@ -186,9 +201,10 @@ msgid "Disc.(%)"
msgstr "Alennus (%)"
#. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_forceassignation0
-msgid "Force Assignation"
-msgstr "Pakota luovutus"
+#: view:sale.report:0
+#: field:sale.report,price_total:0
+msgid "Total Price"
+msgstr "Hinta yhteensä"
#. module: sale
#: help:sale.make.invoice,grouped:0
@@ -196,6 +212,11 @@ msgid "Check the box to group the invoices for the same customers"
msgstr "Ruksi laatikko ryhmitelläksesi samalle asiakkaalle menevät laskut."
#. module: sale
+#: view:sale.order:0
+msgid "My Sale Orders"
+msgstr ""
+
+#. module: sale
#: selection:sale.order,invoice_quantity:0
msgid "Ordered Quantities"
msgstr "Tilatut määrät"
@@ -236,14 +257,25 @@ msgstr ""
"keräilystä' tai 'laskuta tilauksesta toimituksen jälkeen'."
#. module: sale
+#: field:sale.config.picking_policy,task_work:0
+msgid "Based on Tasks' Work"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
+msgid "Quotations and Sales"
+msgstr ""
+
+#. module: sale
#: model:ir.model,name:sale.model_sale_make_invoice
msgid "Sales Make Invoice"
msgstr "Myynti luo lasku"
#. module: sale
-#: view:sale.order:0
-msgid "Recreate Packing"
-msgstr "Luo pakkaus uudelleen"
+#: code:addons/sale/sale.py:330
+#, python-format
+msgid "Pricelist Warning!"
+msgstr ""
#. module: sale
#: field:sale.order.line,discount:0
@@ -251,11 +283,10 @@ msgid "Discount (%)"
msgstr "Alennus (%)"
#. module: sale
-#: help:res.company,security_lead:0
-msgid ""
-"This is the days added to what you promise to customers for security purpose"
-msgstr ""
-"Nämä päivät lisätään asiakkaalle luvattuun aikaan toimituksen takaamiseksi."
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_quotation_for_sale
+msgid "My Quotations"
+msgstr "Omat tarjoukset"
#. module: sale
#: view:board.board:0
@@ -280,7 +311,22 @@ msgid "Shop Name"
msgstr "Myymälän nimi"
#. module: sale
-#: code:addons/sale/sale.py:1014
+#: help:sale.order,order_policy:0
+msgid ""
+"The Invoice Policy is used to synchronise invoice and delivery operations.\n"
+" - The 'Pay before delivery' choice will first generate the invoice and "
+"then generate the picking order after the payment of this invoice.\n"
+" - The 'Deliver & Invoice on demand' will create the picking order directly "
+"and wait for the user to manually click on the 'Invoice' button to generate "
+"the draft invoice based on the sale order or the sale order lines.\n"
+" - The 'Invoice on order after delivery' choice will generate the draft "
+"invoice based on sales order after all picking lists have been finished.\n"
+" - The 'Invoice based on deliveries' choice is used to create an invoice "
+"during the picking process."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:1158
#, python-format
msgid "No Customer Defined !"
msgstr "Asiakasta ei ole määritetty!"
@@ -291,9 +337,12 @@ msgid "Sales in Exception"
msgstr "Myydyt joissa poikkeus toimituksessa"
#. module: sale
-#: view:sale.order:0
-msgid "Set to Draft"
-msgstr "Aseta luonnokseksi"
+#: code:addons/sale/sale.py:1145
+#: code:addons/sale/sale.py:1264
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:70
+#, python-format
+msgid "Configuration Error !"
+msgstr ""
#. module: sale
#: view:sale.order:0
@@ -301,22 +350,7 @@ msgid "Conditions"
msgstr "Ehdot"
#. module: sale
-#: help:sale.order,order_policy:0
-msgid ""
-"The Shipping Policy is used to synchronise invoice and delivery operations.\n"
-" - The 'Pay Before delivery' choice will first generate the invoice and "
-"then generate the picking order after the payment of this invoice.\n"
-" - The 'Shipping & Manual Invoice' will create the picking order directly "
-"and wait for the user to manually click on the 'Invoice' button to generate "
-"the draft invoice.\n"
-" - The 'Invoice On Order After Delivery' choice will generate the draft "
-"invoice based on sales order after all picking lists have been finished.\n"
-" - The 'Invoice From The Picking' choice is used to create an invoice "
-"during the picking process."
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:939
+#: code:addons/sale/sale.py:1034
#, python-format
msgid ""
"There is no income category account defined in default Properties for "
@@ -326,9 +360,9 @@ msgstr ""
"taloudellista asemaa ei ole määritelty !"
#. module: sale
-#: view:sale.installer:0
-msgid "Configure"
-msgstr "Konfiguroi"
+#: selection:sale.report,month:0
+msgid "August"
+msgstr "Elokuu"
#. module: sale
#: constraint:stock.move:0
@@ -336,7 +370,7 @@ msgid "You try to assign a lot which is not from the same product"
msgstr "Erä ei ole samaa tuotetta"
#. module: sale
-#: code:addons/sale/sale.py:620
+#: code:addons/sale/sale.py:655
#, python-format
msgid "invalid mode for test_state"
msgstr "invalid mode for test_state"
@@ -347,7 +381,7 @@ msgid "June"
msgstr "Kesäkuu"
#. module: sale
-#: code:addons/sale/sale.py:584
+#: code:addons/sale/sale.py:617
#, python-format
msgid "Could not cancel this sales order !"
msgstr "Myyntitilausta ei voitu peruuttaa !"
@@ -368,8 +402,12 @@ msgid "October"
msgstr "Lokakuu"
#. module: sale
+#: sql_constraint:stock.picking:0
+msgid "Reference must be unique per Company!"
+msgstr ""
+
+#. module: sale
#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_quotation_for_sale
#: view:sale.order:0
#: view:sale.report:0
msgid "Quotations"
@@ -381,11 +419,6 @@ msgid "Pricelist for current sales order."
msgstr "Tilauksessa käytettävä hinnasto."
#. module: sale
-#: selection:sale.config.picking_policy,step:0
-msgid "Delivery Order Only"
-msgstr "Vain toimitusmääräys"
-
-#. module: sale
#: report:sale.order:0
msgid "TVA :"
msgstr "ALV:"
@@ -411,6 +444,7 @@ msgstr "Taloudellinen tilanne"
#. module: sale
#: view:sale.order:0
#: view:sale.order.line:0
+#: field:sale.report,product_uom:0
msgid "UoM"
msgstr "Mittayksikkö"
@@ -435,7 +469,13 @@ msgstr ""
"tai 'manuaalinen käynnissä'."
#. module: sale
-#: code:addons/sale/sale.py:971
+#: code:addons/sale/sale.py:1061
+#, python-format
+msgid "You cannot cancel a sale order line that has already been invoiced!"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:1066
#, python-format
msgid "You must first cancel stock moves attached to this sales order line."
msgstr ""
@@ -443,7 +483,7 @@ msgstr ""
"varastosiirrot."
#. module: sale
-#: code:addons/sale/sale.py:1042
+#: code:addons/sale/sale.py:1134
#, python-format
msgid "(n/a)"
msgstr "(ei saatavilla)"
@@ -481,14 +521,36 @@ msgid "Notes"
msgstr "Huomautukset"
#. module: sale
+#: sql_constraint:res.company:0
+msgid "The company name must be unique !"
+msgstr ""
+
+#. module: sale
#: help:sale.order,partner_invoice_id:0
msgid "Invoice address for current sales order."
msgstr "Laskutusosoite nykyiselle myyntitilaukselle"
#. module: sale
-#: view:sale.installer:0
-msgid "Enhance your core Sales Application with additional functionalities."
-msgstr "paranna perusmyyntiohjelmistoasi lisätoiminnoilla"
+#: view:sale.report:0
+msgid "Month-1"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered month of the sales order"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:504
+#, python-format
+msgid ""
+"You cannot group sales having different currencies for the same partner."
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,picking_policy:0
+msgid "Deliver each product when available"
+msgstr ""
#. module: sale
#: field:sale.order,invoiced_rate:0
@@ -507,21 +569,43 @@ msgid "Confirmation Date"
msgstr "Vahvistuspvm"
#. module: sale
+#: field:sale.order,incoterm:0
+msgid "Incoterm"
+msgstr "Incoterm"
+
+#. module: sale
#: field:sale.order.line,address_allotment_id:0
msgid "Allotment Partner"
msgstr "Jakelukumppani"
#. module: sale
-#: sql_constraint:sale.order:0
-msgid "Order Reference must be unique !"
-msgstr "Tilauksen viite tulee olla yksilöllinen!"
-
-#. module: sale
#: selection:sale.report,month:0
msgid "March"
msgstr "Maaliskuu"
#. module: sale
+#: constraint:stock.move:0
+msgid "You can not move products from or to a location of the type view."
+msgstr ""
+
+#. module: sale
+#: field:sale.config.picking_policy,sale_orders:0
+msgid "Based on Sales Orders"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,state:0
+msgid ""
+"Givwizard = self.browse(cr, uid, ids)[0]es the state of the quotation or "
+"sales order. \n"
+"The exception state is automatically set when a cancel operation occurs in "
+"the invoice validation (Invoice Exception) or in the picking list process "
+"(Shipping Exception). \n"
+"The 'Waiting Schedule' state is set when the invoice is confirmed but "
+"waiting for the scheduler to run on the order date."
+msgstr ""
+
+#. module: sale
#: help:sale.order,amount_total:0
msgid "The total amount."
msgstr "Kokonaismäärä"
@@ -537,6 +621,11 @@ msgid "Invoice address :"
msgstr "Laskutusosoite:"
#. module: sale
+#: field:sale.order.line,sequence:0
+msgid "Line Sequence"
+msgstr ""
+
+#. module: sale
#: model:process.transition,note:sale.process_transition_saleorderprocurement0
msgid ""
"For every sales order line, a procurement order is created to supply the "
@@ -588,11 +677,6 @@ msgid "Sales Order Line"
msgstr "Myyntitilauksen Rivi"
#. module: sale
-#: view:sale.config.picking_policy:0
-msgid "Setup your sales workflow and default values."
-msgstr "Aseta myynnin työkulu ja oletusarvot"
-
-#. module: sale
#: field:sale.shop,warehouse_id:0
msgid "Warehouse"
msgstr "Varasto"
@@ -629,6 +713,11 @@ msgid "Creation Date"
msgstr "Luontipäivämäärä"
#. module: sale
+#: model:ir.ui.menu,name:sale.menu_sales_configuration_misc
+msgid "Miscellaneous"
+msgstr ""
+
+#. module: sale
#: model:ir.actions.act_window,name:sale.action_order_line_tree3
msgid "Uninvoiced and Delivered Lines"
msgstr "Laskuttamattomat ja toimitetut rivit"
@@ -644,14 +733,19 @@ msgid "My Sales"
msgstr "Omat Myynnit"
#. module: sale
-#: code:addons/sale/sale.py:290
-#: code:addons/sale/sale.py:966
-#: code:addons/sale/sale.py:1165
+#: code:addons/sale/sale.py:295
+#: code:addons/sale/sale.py:1061
+#: code:addons/sale/sale.py:1290
#, python-format
msgid "Invalid action !"
msgstr "Virheellinen toiminto!"
#. module: sale
+#: view:sale.order:0
+msgid "Extra Info"
+msgstr "Lisätiedot"
+
+#. module: sale
#: field:sale.order,pricelist_id:0
#: field:sale.report,pricelist_id:0
#: field:sale.shop,pricelist_id:0
@@ -665,13 +759,21 @@ msgid "# of Qty"
msgstr "Määrä"
#. module: sale
+#: code:addons/sale/sale.py:1314
+#, python-format
+msgid "Hour"
+msgstr ""
+
+#. module: sale
#: view:sale.order:0
msgid "Order Date"
msgstr "Tilauksen päivämäärä"
#. module: sale
#: view:sale.order.line:0
+#: view:sale.report:0
#: field:sale.report,shipped:0
+#: field:sale.report,shipped_qty_1:0
msgid "Shipped"
msgstr "Toimitettu"
@@ -681,9 +783,9 @@ msgid "All Quotations"
msgstr "Kaikki tarjoukset"
#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Invoice On Order After Delivery"
-msgstr "Laskutetaan Tilauksen Mukaisesti Toimitettaessa"
+#: view:sale.config.picking_policy:0
+msgid "Options"
+msgstr ""
#. module: sale
#: selection:sale.report,month:0
@@ -691,6 +793,20 @@ msgid "September"
msgstr "Syyskuu"
#. module: sale
+#: code:addons/sale/sale.py:632
+#, python-format
+msgid "You cannot confirm a sale order which has no line."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:1246
+#, python-format
+msgid ""
+"You have to select a pricelist or a customer in the sales form !\n"
+"Please set one before choosing a product."
+msgstr ""
+
+#. module: sale
#: view:sale.report:0
#: field:sale.report,categ_id:0
msgid "Category of Product"
@@ -707,11 +823,6 @@ msgid "Stock Moves"
msgstr "Varastosiirrot"
#. module: sale
-#: view:sale.report:0
-msgid " Year "
-msgstr " Vuosi "
-
-#. module: sale
#: field:sale.order,state:0
#: field:sale.report,state:0
msgid "Order State"
@@ -729,7 +840,7 @@ msgid "Sales By Month"
msgstr "Myynnit Kuukausittain"
#. module: sale
-#: code:addons/sale/sale.py:970
+#: code:addons/sale/sale.py:1065
#, python-format
msgid "Could not cancel sales order line!"
msgstr "Myyntitilauksen Riviä ei voitu peruuttaa!"
@@ -764,42 +875,19 @@ msgstr ""
"ajastimet on laukaistu."
#. module: sale
+#: field:sale.order,date_order:0
+msgid "Date"
+msgstr ""
+
+#. module: sale
#: view:sale.report:0
msgid "Extended Filters..."
msgstr "Laajennetut Suotimet..."
#. module: sale
-#: model:ir.module.module,description:sale.module_meta_information
-msgid ""
-"\n"
-" The base module to manage quotations and sales orders.\n"
-"\n"
-" * Workflow with validation steps:\n"
-" - Quotation -> Sales order -> Invoice\n"
-" * Invoicing methods:\n"
-" - Invoice on order (before or after shipping)\n"
-" - Invoice on delivery\n"
-" - Invoice on timesheets\n"
-" - Advance invoice\n"
-" * Partners preferences (shipping, invoicing, incoterm, ...)\n"
-" * Products stocks and prices\n"
-" * Delivery methods:\n"
-" - all at once, multi-parcel\n"
-" - delivery costs\n"
-" * Dashboard for salesman that includes:\n"
-" * Your open quotations\n"
-" * Top 10 sales of the month\n"
-" * Cases statistics\n"
-" * Graph of sales by product\n"
-" * Graph of cases of the month\n"
-" "
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_shop
-#: view:sale.shop:0
-msgid "Sales Shop"
-msgstr "Myymälä"
+#: selection:sale.order.line,state:0
+msgid "Exception"
+msgstr "Poikkeus"
#. module: sale
#: model:ir.model,name:sale.model_res_company
@@ -807,9 +895,10 @@ msgid "Companies"
msgstr "Yritykset"
#. module: sale
-#: selection:sale.report,month:0
-msgid "November"
-msgstr "Marraskuu"
+#: code:addons/sale/sale.py:1259
+#, python-format
+msgid "No valid pricelist line found ! :"
+msgstr ""
#. module: sale
#: view:sale.order:0
@@ -817,9 +906,9 @@ msgid "History"
msgstr "Historia"
#. module: sale
-#: field:sale.config.picking_policy,picking_policy:0
-msgid "Picking Default Policy"
-msgstr "Keräyksen Oletuskäytäntö"
+#: selection:sale.order,order_policy:0
+msgid "Invoice on order after delivery"
+msgstr ""
#. module: sale
#: help:sale.order,invoice_ids:0
@@ -843,13 +932,13 @@ msgid ""
msgstr "Kontaktin nimi ja osoite, joka pyysi tilausta tai tarjousta"
#. module: sale
-#: code:addons/sale/sale.py:966
-#, python-format
-msgid "You cannot cancel a sales order line that has already been invoiced !"
-msgstr "Et voi peruuttaa myyntitilausriviä joka on jo laskutettu!"
+#: help:res.company,security_lead:0
+msgid ""
+"This is the days added to what you promise to customers for security purpose"
+msgstr ""
+"Nämä päivät lisätään asiakkaalle luvattuun aikaan toimituksen takaamiseksi."
#. module: sale
-#: view:sale.order:0
#: view:sale.order.line:0
msgid "Qty"
msgstr "Määrä"
@@ -860,6 +949,11 @@ msgid "References"
msgstr "Viitteet"
#. module: sale
+#: view:sale.order.line:0
+msgid "My Sales Order Lines"
+msgstr ""
+
+#. module: sale
#: model:process.transition.action,name:sale.process_transition_action_cancel0
#: model:process.transition.action,name:sale.process_transition_action_cancel1
#: model:process.transition.action,name:sale.process_transition_action_cancel2
@@ -871,14 +965,9 @@ msgid "Cancel"
msgstr "Peruuta"
#. module: sale
-#: field:sale.installer,sale_order_dates:0
-msgid "Sales Order Dates"
-msgstr "Myyntitilauksen Päiväykset"
-
-#. module: sale
-#: selection:sale.order.line,state:0
-msgid "Exception"
-msgstr "Poikkeus"
+#: sql_constraint:sale.order:0
+msgid "Order Reference must be unique per Company!"
+msgstr ""
#. module: sale
#: model:process.transition,name:sale.process_transition_invoice0
@@ -890,19 +979,19 @@ msgid "Create Invoice"
msgstr "Luo lasku"
#. module: sale
-#: field:sale.installer,sale_margin:0
-msgid "Margins in Sales Orders"
-msgstr "Myyntitilausten Marginaalit"
-
-#. module: sale
#: view:sale.order:0
msgid "Total Tax Excluded"
msgstr "Veroton Summa"
#. module: sale
-#: view:sale.order:0
-msgid "Compute"
-msgstr "Laske"
+#: view:sale.order.line:0
+msgid "Order reference"
+msgstr ""
+
+#. module: sale
+#: view:sale.open.invoice:0
+msgid "You invoice has been successfully created!"
+msgstr "Lasku on luotu onnistuneesti!"
#. module: sale
#: view:sale.report:0
@@ -921,23 +1010,20 @@ msgid "Open Invoice"
msgstr "Avoin Lasku"
#. module: sale
-#: report:sale.order:0
-#: view:sale.order.line:0
-msgid "Price"
-msgstr "Hinta"
+#: model:ir.actions.server,name:sale.ir_actions_server_edi_sale
+msgid "Auto-email confirmed sale orders"
+msgstr ""
#. module: sale
-#: model:ir.actions.act_window,name:sale.action_sale_installer
-#: view:sale.config.picking_policy:0
-#: view:sale.installer:0
-msgid "Sales Application Configuration"
-msgstr "Myyntiohjelmiston konfiguraatio"
+#: code:addons/sale/sale.py:413
+#, python-format
+msgid "There is no sales journal defined for this company: \"%s\" (id:%d)"
+msgstr "Myyntipäiväkirjaa ei ole määritelty tälle yritykselle \"%s\" (id:%d)"
#. module: sale
-#: view:sale.report:0
-#: field:sale.report,price_total:0
-msgid "Total Price"
-msgstr "Hinta yhteensä"
+#: model:process.transition.action,name:sale.process_transition_action_forceassignation0
+msgid "Force Assignation"
+msgstr "Pakota luovutus"
#. module: sale
#: selection:sale.order.line,type:0
@@ -950,6 +1036,11 @@ msgid "Based on the shipped or on the ordered quantities."
msgstr "Perustu joko lähetettyihin tai tilattuihin määriin"
#. module: sale
+#: selection:sale.order,picking_policy:0
+msgid "Deliver all products at once"
+msgstr ""
+
+#. module: sale
#: field:sale.order,picking_ids:0
msgid "Related Picking"
msgstr "Liittyvä keräily"
@@ -981,9 +1072,15 @@ msgid "Create Delivery Order"
msgstr "Luo toimitusmääräin"
#. module: sale
-#: field:sale.installer,delivery:0
-msgid "Delivery Costs"
-msgstr "Toimituskustannukset"
+#: code:addons/sale/sale.py:1290
+#, python-format
+msgid "Cannot delete a sales order line which is in state '%s'!"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Qty(UoS)"
+msgstr ""
#. module: sale
#: view:sale.order:0
@@ -997,13 +1094,13 @@ msgstr "Luo Keräyslista"
#. module: sale
#: view:sale.report:0
-msgid "Sales by Product Category"
-msgstr "Myynnit Tuoteluokittain"
+msgid "Ordered date of the sales order"
+msgstr ""
#. module: sale
-#: selection:sale.order,picking_policy:0
-msgid "Partial Delivery"
-msgstr "Osittaistoimitus"
+#: view:sale.report:0
+msgid "Sales by Product Category"
+msgstr "Myynnit Tuoteluokittain"
#. module: sale
#: model:process.transition,name:sale.process_transition_confirmquotation0
@@ -1011,9 +1108,10 @@ msgid "Confirm Quotation"
msgstr "Vahvista tarjous"
#. module: sale
-#: help:sale.order,origin:0
-msgid "Reference of the document that generated this sales order request."
-msgstr "Viite dokumenttiin joka loi tämän myyntitilauspyynnön."
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:63
+#, python-format
+msgid "Error"
+msgstr "Virhe"
#. module: sale
#: view:sale.order:0
@@ -1045,20 +1143,14 @@ msgid "Procurement Method"
msgstr "Hankintatapa"
#. module: sale
-#: view:sale.config.picking_policy:0
-#: view:sale.installer:0
-msgid "title"
-msgstr "otsake"
-
-#. module: sale
#: model:process.node,name:sale.process_node_packinglist0
msgid "Pick List"
msgstr "Keräilylista"
#. module: sale
#: view:sale.order:0
-msgid "Order date"
-msgstr "Tilauksen Päiväys"
+msgid "Set to Draft"
+msgstr "Aseta luonnokseksi"
#. module: sale
#: model:process.node,note:sale.process_node_packinglist0
@@ -1066,6 +1158,85 @@ msgid "Document of the move to the output or to the customer."
msgstr "Dokumentti siirrosta kohdepaikkaan tai asiakkalle."
#. module: sale
+#: model:email.template,body_text:sale.email_template_edi_sale
+msgid ""
+"\n"
+"Hello${object.partner_order_id.name and ' ' or "
+"''}${object.partner_order_id.name or ''},\n"
+"\n"
+"Here is your order confirmation for ${object.partner_id.name}:\n"
+" | Order number: *${object.name}*\n"
+" | Order total: *${object.amount_total} "
+"${object.pricelist_id.currency_id.name}*\n"
+" | Order date: ${object.date_order}\n"
+" % if object.origin:\n"
+" | Order reference: ${object.origin}\n"
+" % endif\n"
+" % if object.client_order_ref:\n"
+" | Your reference: ${object.client_order_ref}<br />\n"
+" % endif\n"
+" | Your contact: ${object.user_id.name} ${object.user_id.user_email "
+"and '<%s>'%(object.user_id.user_email) or ''}\n"
+"\n"
+"You can view the order confirmation, download it and even pay online using "
+"the following link:\n"
+" ${ctx.get('edi_web_url_view') or 'n/a'}\n"
+"\n"
+"% if object.order_policy in ('prepaid','manual') and "
+"object.company_id.paypal_account:\n"
+"<% \n"
+"comp_name = quote(object.company_id.name)\n"
+"order_name = quote(object.name)\n"
+"paypal_account = quote(object.company_id.paypal_account)\n"
+"order_amount = quote(str(object.amount_total))\n"
+"cur_name = quote(object.pricelist_id.currency_id.name)\n"
+"paypal_url = \"https://www.paypal.com/cgi-"
+"bin/webscr?cmd=_xclick&business=%s&item_name=%s%%20Order%%20%s&invoice=%s&amo"
+"unt=%s\" \\\n"
+" "
+"\"&currency_code=%s&button_subtype=services&no_note=1&bn=OpenERP_Order_PayNow"
+"_%s\" % \\\n"
+" "
+"(paypal_account,comp_name,order_name,order_name,order_amount,cur_name,cur_nam"
+"e)\n"
+"%>\n"
+"It is also possible to directly pay with Paypal:\n"
+" ${paypal_url}\n"
+"% endif\n"
+"\n"
+"If you have any question, do not hesitate to contact us.\n"
+"\n"
+"\n"
+"Thank you for choosing ${object.company_id.name}!\n"
+"\n"
+"\n"
+"--\n"
+"${object.user_id.name} ${object.user_id.user_email and "
+"'<%s>'%(object.user_id.user_email) or ''}\n"
+"${object.company_id.name}\n"
+"% if object.company_id.street:\n"
+"${object.company_id.street or ''}\n"
+"% endif\n"
+"% if object.company_id.street2:\n"
+"${object.company_id.street2}\n"
+"% endif\n"
+"% if object.company_id.city or object.company_id.zip:\n"
+"${object.company_id.zip or ''} ${object.company_id.city or ''}\n"
+"% endif\n"
+"% if object.company_id.country_id:\n"
+"${object.company_id.state_id and ('%s, ' % object.company_id.state_id.name) "
+"or ''} ${object.company_id.country_id.name or ''}\n"
+"% endif\n"
+"% if object.company_id.phone:\n"
+"Phone: ${object.company_id.phone}\n"
+"% endif\n"
+"% if object.company_id.website:\n"
+"${object.company_id.website or ''}\n"
+"% endif\n"
+" "
+msgstr ""
+
+#. module: sale
#: model:process.transition.action,name:sale.process_transition_action_validate0
msgid "Validate"
msgstr "Vahvista"
@@ -1088,9 +1259,9 @@ msgid "Taxes"
msgstr "Verot"
#. module: sale
-#: field:sale.order,order_policy:0
-msgid "Shipping Policy"
-msgstr "Toimituskäytäntö"
+#: view:sale.order:0
+msgid "Sales Order ready to be invoiced"
+msgstr ""
#. module: sale
#: help:sale.order,create_date:0
@@ -1109,9 +1280,9 @@ msgid "Create Invoices"
msgstr "Luo laskuja"
#. module: sale
-#: view:sale.order:0
-msgid "Extra Info"
-msgstr "Lisätiedot"
+#: view:sale.report:0
+msgid "Sales order created in current month"
+msgstr ""
#. module: sale
#: report:sale.order:0
@@ -1119,11 +1290,24 @@ msgid "Fax :"
msgstr "Faksi:"
#. module: sale
+#: help:sale.order.line,type:0
+msgid ""
+"If 'on order', it triggers a procurement when the sale order is confirmed to "
+"create a task, purchase order or manufacturing order linked to this sale "
+"order line."
+msgstr ""
+
+#. module: sale
#: field:sale.advance.payment.inv,amount:0
msgid "Advance Amount"
msgstr "Etukäteismäärä"
#. module: sale
+#: field:sale.config.picking_policy,charge_delivery:0
+msgid "Do you charge the delivery?"
+msgstr ""
+
+#. module: sale
#: selection:sale.order,invoice_quantity:0
msgid "Shipped Quantities"
msgstr "Toimitetut määrät"
@@ -1134,25 +1318,45 @@ msgid "Invoice Based on Sales Orders"
msgstr "Lasku perustuu myyntitilauksiin"
#. module: sale
+#: code:addons/sale/sale.py:331
+#, python-format
+msgid ""
+"If you change the pricelist of this order (and eventually the currency), "
+"prices of existing order lines will not be updated."
+msgstr ""
+
+#. module: sale
#: model:ir.model,name:sale.model_stock_picking
msgid "Picking List"
msgstr "Keräilylista"
#. module: sale
-#: code:addons/sale/sale.py:387
-#: code:addons/sale/sale.py:920
-#: code:addons/sale/sale.py:938
+#: code:addons/sale/sale.py:412
+#: code:addons/sale/sale.py:503
+#: code:addons/sale/sale.py:632
+#: code:addons/sale/sale.py:1015
+#: code:addons/sale/sale.py:1033
#, python-format
msgid "Error !"
msgstr "Virhe!"
#. module: sale
-#: code:addons/sale/sale.py:570
+#: code:addons/sale/sale.py:603
#, python-format
msgid "Could not cancel sales order !"
msgstr "Ei voi peruuttaa myyntitilausta !"
#. module: sale
+#: view:sale.order:0
+msgid "Qty(UoM)"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered Year of the sales order"
+msgstr ""
+
+#. module: sale
#: selection:sale.report,month:0
msgid "July"
msgstr "Heinäkuu"
@@ -1169,36 +1373,26 @@ msgid "Shipping Exception"
msgstr "Poikkeus toimituksessa"
#. module: sale
-#: field:sale.make.invoice,grouped:0
-msgid "Group the invoices"
-msgstr "Yhdistä laskut"
-
-#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Shipping & Manual Invoice"
-msgstr "Toimitus ja manuaalinen lasku"
-
-#. module: sale
-#: code:addons/sale/sale.py:1051
+#: code:addons/sale/sale.py:1143
#, python-format
-msgid "Picking Information !"
-msgstr "Keräilyn tiedot !"
+msgid "Picking Information ! : "
+msgstr ""
#. module: sale
-#: view:sale.report:0
-#: field:sale.report,month:0
-msgid "Month"
-msgstr "Kuukausi"
+#: field:sale.make.invoice,grouped:0
+msgid "Group the invoices"
+msgstr "Yhdistä laskut"
#. module: sale
-#: model:ir.module.module,shortdesc:sale.module_meta_information
-msgid "Sales Management"
-msgstr "Myynninhallinta"
+#: field:sale.order,order_policy:0
+msgid "Invoice Policy"
+msgstr ""
#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Invoice From The Picking"
-msgstr "Laskutus keräilystä"
+#: model:ir.actions.act_window,name:sale.action_config_picking_policy
+#: view:sale.config.picking_policy:0
+msgid "Setup your Invoicing Method"
+msgstr ""
#. module: sale
#: model:process.node,note:sale.process_node_invoice0
@@ -1207,33 +1401,31 @@ msgstr "Kirjanpitäjän tarkistettavaksi"
#. module: sale
#: view:sale.report:0
-#: field:sale.report,uom_name:0
msgid "Reference UoM"
msgstr "Viitemittayksikkö"
#. module: sale
+#: view:sale.config.picking_policy:0
+msgid ""
+"This tool will help you to install the right module and configure the system "
+"according to the method you use to invoice your customers."
+msgstr ""
+
+#. module: sale
#: model:ir.model,name:sale.model_sale_order_line_make_invoice
msgid "Sale OrderLine Make_invoice"
msgstr "Myyntiilausrivi tee lasku"
#. module: sale
-#: help:sale.config.picking_policy,step:0
-msgid ""
-"By default, OpenERP is able to manage complex routing and paths of products "
-"in your warehouse and partner locations. This will configure the most common "
-"and simple methods to deliver products to the customer in one or two "
-"operations by the worker."
-msgstr ""
-"OpenERP pystyy oletusarvoisesti hoitamaan monimutkaisia reitityksiä ja "
-"polkuja tuotteillesi omissa varastoissasi ja kumppanien tiloissa. Tämä "
-"konfiguroi yleisimmät ja yksinkertaisimmat metodit tuotteiden "
-"toimittamiseksi asiakkaalle yhdellä tai kahdella työntekijän tekemällä "
-"operaatiolla."
+#: selection:sale.order,state:0
+#: selection:sale.report,state:0
+msgid "Invoice Exception"
+msgstr "Poikkeus laskutuksessa"
#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_tree
-msgid "Old Quotations"
-msgstr "Vanhat Tarjoukset"
+#: model:process.node,note:sale.process_node_saleorder0
+msgid "Drives procurement and invoicing"
+msgstr "Ohjaa hankintaa ja laskutusta"
#. module: sale
#: field:sale.order,invoiced:0
@@ -1248,6 +1440,22 @@ msgid "Sales Analysis"
msgstr "Myyntianalyysi"
#. module: sale
+#: code:addons/sale/sale.py:1138
+#, python-format
+msgid ""
+"You selected a quantity of %d Units.\n"
+"But it's not compatible with the selected packaging.\n"
+"Here is a proposition of quantities according to the packaging:\n"
+"EAN: %s Quantity: %s Type of ul: %s"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Recreate Packing"
+msgstr "Luo pakkaus uudelleen"
+
+#. module: sale
+#: view:sale.order:0
#: field:sale.order.line,property_ids:0
msgid "Properties"
msgstr "Ominaisuudet"
@@ -1277,7 +1485,17 @@ msgid ""
msgstr "Voit luoda laskuja myyntitilausten tai toimitusten pohjalta."
#. module: sale
-#: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
+#: view:sale.order.line:0
+msgid "Confirmed sale order lines, not yet delivered"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:473
+#, python-format
+msgid "Customer Invoices"
+msgstr ""
+
+#. module: sale
#: model:process.process,name:sale.process_process_salesprocess0
#: view:sale.order:0
#: view:sale.report:0
@@ -1299,18 +1517,13 @@ msgid "Done"
msgstr "Valmis"
#. module: sale
-#: model:ir.model,name:sale.model_sale_installer
-msgid "sale.installer"
-msgstr "sale.installer"
-
-#. module: sale
#: model:process.node,name:sale.process_node_invoice0
#: model:process.node,name:sale.process_node_invoiceafterdelivery0
msgid "Invoice"
msgstr "Lasku"
#. module: sale
-#: code:addons/sale/sale.py:1014
+#: code:addons/sale/sale.py:1158
#, python-format
msgid ""
"You have to select a customer in the sales form !\n"
@@ -1320,11 +1533,6 @@ msgstr ""
"Ole hyvä ja valitse yksi asiakas enennkuin valitset tuotteen"
#. module: sale
-#: selection:sale.config.picking_policy,step:0
-msgid "Picking List & Delivery Order"
-msgstr "Keräilylista ja toimitusmääräin"
-
-#. module: sale
#: field:sale.order,origin:0
msgid "Source Document"
msgstr "Lähdedokumentti"
@@ -1350,7 +1558,7 @@ msgid "The amount without tax."
msgstr "Määrä ilman veroa."
#. module: sale
-#: code:addons/sale/sale.py:571
+#: code:addons/sale/sale.py:604
#, python-format
msgid "You must first cancel all picking attached to this sales order."
msgstr ""
@@ -1363,9 +1571,15 @@ msgid "Sales Advance Payment Invoice"
msgstr "Myynnin ennakkomaksulasku"
#. module: sale
-#: field:sale.order,incoterm:0
-msgid "Incoterm"
-msgstr "Incoterm"
+#: view:sale.report:0
+#: field:sale.report,month:0
+msgid "Month"
+msgstr "Kuukausi"
+
+#. module: sale
+#: model:email.template,subject:sale.email_template_edi_sale
+msgid "${object.company_id.name} Order (Ref ${object.name or 'n/a' })"
+msgstr ""
#. module: sale
#: view:sale.order.line:0
@@ -1376,11 +1590,6 @@ msgid "Product"
msgstr "Tuote"
#. module: sale
-#: model:ir.ui.menu,name:sale.menu_invoiced
-msgid "Invoicing"
-msgstr "Laskutus"
-
-#. module: sale
#: model:process.transition.action,name:sale.process_transition_action_cancelassignation0
msgid "Cancel Assignation"
msgstr "Peruuta luovutus"
@@ -1391,14 +1600,10 @@ msgid "sale.config.picking_policy"
msgstr "sale.config.picking_policy"
#. module: sale
-#: help:sale.order,state:0
-msgid ""
-"Gives the state of the quotation or sales order. \n"
-"The exception state is automatically set when a cancel operation occurs in "
-"the invoice validation (Invoice Exception) or in the picking list process "
-"(Shipping Exception). \n"
-"The 'Waiting Schedule' state is set when the invoice is confirmed but "
-"waiting for the scheduler to run on the date 'Ordered Date'."
+#: view:account.invoice.report:0
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_turnover_by_month
+msgid "Monthly Turnover"
msgstr ""
#. module: sale
@@ -1417,7 +1622,6 @@ msgid "Product UoS"
msgstr "Tuotteen myyntiyksikkö"
#. module: sale
-#: selection:sale.order,state:0
#: selection:sale.report,state:0
msgid "Manual In Progress"
msgstr "Manuaalisessa käsittelyssä"
@@ -1438,7 +1642,8 @@ msgid "Order"
msgstr "Tilaa"
#. module: sale
-#: code:addons/sale/sale.py:921
+#: code:addons/sale/sale.py:1016
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:71
#, python-format
msgid "There is no income account defined for this product: \"%s\" (id:%d)"
msgstr "Tulotiliä ei ole määritelty tälle tuotteelle: \"%s\" (id:%d)"
@@ -1458,7 +1663,7 @@ msgid ""
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:1116
+#: code:addons/sale/sale.py:1238
#, python-format
msgid ""
"You plan to sell %.2f %s but you only have %.2f %s available !\n"
@@ -1489,10 +1694,10 @@ msgid "Total"
msgstr "Yhteensä"
#. module: sale
-#: code:addons/sale/sale.py:388
-#, python-format
-msgid "There is no sales journal defined for this company: \"%s\" (id:%d)"
-msgstr "Myyntipäiväkirjaa ei ole määritelty tälle yritykselle \"%s\" (id:%d)"
+#: report:sale.order:0
+#: view:sale.order.line:0
+msgid "Price"
+msgstr "Hinta"
#. module: sale
#: model:process.transition,note:sale.process_transition_deliver0
@@ -1505,10 +1710,15 @@ msgstr ""
"asiakkaan välillä tehdään toimitusmääräimissä käsin tai automaattisest."
#. module: sale
-#: code:addons/sale/sale.py:1165
-#, python-format
-msgid "Cannot delete a sales order line which is %s !"
-msgstr "Ei voi oistaa myyntitilausriviä joka on %s !"
+#: selection:sale.order,order_policy:0
+msgid "Pay before delivery"
+msgstr ""
+
+#. module: sale
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.open_board_sales
+msgid "Sales Dashboard"
+msgstr ""
#. module: sale
#: model:ir.actions.act_window,name:sale.action_sale_order_make_invoice
@@ -1519,6 +1729,7 @@ msgstr "Luo Laskuja"
#. module: sale
#: view:sale.order:0
+#: selection:sale.order,state:0
#: view:sale.order.line:0
msgid "To Invoice"
msgstr "Laskutettavaa"
@@ -1529,6 +1740,11 @@ msgid "Date on which sales order is confirmed."
msgstr "Päivä jolloin myyntitilaus on vahvistettu"
#. module: sale
+#: field:sale.order,project_id:0
+msgid "Contract/Analytic Account"
+msgstr ""
+
+#. module: sale
#: field:sale.order,company_id:0
#: field:sale.order.line,company_id:0
#: view:sale.report:0
@@ -1548,10 +1764,12 @@ msgid "The amount to be invoiced in advance."
msgstr "Ennakkoon laskutettava määrä."
#. module: sale
-#: selection:sale.order,state:0
-#: selection:sale.report,state:0
-msgid "Invoice Exception"
-msgstr "Poikkeus laskutuksessa"
+#: code:addons/sale/sale.py:1256
+#, python-format
+msgid ""
+"Couldn't find a pricelist line matching this product and quantity.\n"
+"You have to change either the product, the quantity or the pricelist."
+msgstr ""
#. module: sale
#: help:sale.order,picking_ids:0
@@ -1560,15 +1778,6 @@ msgid ""
msgstr "Tämä on keräilylista joka on luotu tälle myyntitilaukselle."
#. module: sale
-#: help:sale.installer,sale_margin:0
-msgid ""
-"Gives the margin of profitability by calculating the difference between Unit "
-"Price and Cost Price."
-msgstr ""
-"Antaa voittomarginaalin laskemalla erotuksen yksikköhinnasta ja "
-"kustannushinnasta."
-
-#. module: sale
#: view:sale.make.invoice:0
#: view:sale.order.line.make.invoice:0
msgid "Create invoices"
@@ -1587,6 +1796,11 @@ msgid "Cancelled"
msgstr "Peruutettu"
#. module: sale
+#: view:sale.order.line:0
+msgid "Sales Order Lines related to a Sales Order of mine"
+msgstr ""
+
+#. module: sale
#: model:ir.actions.act_window,name:sale.action_shop_form
#: model:ir.ui.menu,name:sale.menu_action_shop_form
#: field:sale.order,shop_id:0
@@ -1596,17 +1810,12 @@ msgid "Shop"
msgstr "Myymälä"
#. module: sale
-#: view:sale.report:0
-msgid " Month "
-msgstr " Kuukausi "
-
-#. module: sale
#: field:sale.report,date_confirm:0
msgid "Date Confirm"
msgstr "Vahvistus Päivämäärä"
#. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:111
+#: code:addons/sale/wizard/sale_line_invoice.py:113
#, python-format
msgid "Warning"
msgstr "Varoitus"
@@ -1618,22 +1827,6 @@ msgid "Sales by Month"
msgstr "Myynnit Kuukausittain"
#. module: sale
-#: code:addons/sale/sale.py:1045
-#, python-format
-msgid ""
-"You selected a quantity of %d Units.\n"
-"But it's not compatible with the selected packaging.\n"
-"Here is a proposition of quantities according to the packaging:\n"
-"\n"
-"EAN: %s Quantity: %s Type of ul: %s"
-msgstr ""
-"Valitsit määräksi %d yksikköä.\n"
-"Mutta se ei ole yhteensopiva valitun pakkauksen kanssa.\n"
-"Tässä on ehdotus määristä pakkauksen mukaan:\n"
-"\n"
-"EAN: %s määrä %s Tyyppi %s"
-
-#. module: sale
#: model:ir.model,name:sale.model_sale_order
#: model:process.node,name:sale.process_node_order0
#: model:process.node,name:sale.process_node_saleorder0
@@ -1649,6 +1842,11 @@ msgid "Quantity (UoS)"
msgstr "Määrä (myyntiyksikkö)"
#. module: sale
+#: view:sale.order.line:0
+msgid "Sale Order Lines that are in 'done' state"
+msgstr ""
+
+#. module: sale
#: model:process.transition,note:sale.process_transition_packing0
msgid ""
"The Pick List form is created as soon as the sales order is confirmed, in "
@@ -1663,6 +1861,11 @@ msgid "Confirmed"
msgstr "Vahvistettu"
#. module: sale
+#: field:sale.config.picking_policy,order_policy:0
+msgid "Main Method Based On"
+msgstr ""
+
+#. module: sale
#: model:process.transition.action,name:sale.process_transition_action_confirm0
msgid "Confirm"
msgstr "Vahvista"
@@ -1685,6 +1888,7 @@ msgid "Invoice Lines"
msgstr "Laskurivit"
#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_product_tree
#: view:sale.order:0
#: view:sale.order.line:0
msgid "Sales Order Lines"
@@ -1701,33 +1905,18 @@ msgid "Configuration"
msgstr "Asetukset"
#. module: sale
-#: selection:sale.order,picking_policy:0
-msgid "Complete Delivery"
-msgstr "Kokonaistoimitus"
+#: code:addons/sale/edi/sale_order.py:146
+#, python-format
+msgid "EDI Pricelist (%s)"
+msgstr ""
#. module: sale
#: view:sale.report:0
-msgid " Month-1 "
-msgstr " Kuukausi-1 "
-
-#. module: sale
-#: help:sale.config.picking_policy,picking_policy:0
-msgid ""
-"The Shipping Policy is used to configure per order if you want to deliver as "
-"soon as possible when one product is available or you wait that all products "
-"are available.."
+msgid "Sales order created in current year"
msgstr ""
-"Toimitustyyppiä käytetään määrittelemään tilauksittain, haluatko toimittaa "
-"heti kun jokin tuotteista on saatavilla vai haluatko odottaa kunnes kaikki "
-"tuotteet ovat saatavilla.."
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "August"
-msgstr "Elokuu"
#. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:111
+#: code:addons/sale/wizard/sale_line_invoice.py:113
#, python-format
msgid ""
"Invoice cannot be created for this Sales Order Line due to one of the "
@@ -1740,6 +1929,11 @@ msgstr ""
"2. Myyntitilausrivi on laskutettu!"
#. module: sale
+#: view:sale.order.line:0
+msgid "Sale order lines done"
+msgstr ""
+
+#. module: sale
#: field:sale.order.line,th_weight:0
msgid "Weight"
msgstr "Paino"
@@ -1758,7 +1952,6 @@ msgstr "Joulukuu"
#. module: sale
#: field:sale.config.picking_policy,config_logo:0
-#: field:sale.installer,config_logo:0
msgid "Image"
msgstr "Kuva"
@@ -1791,9 +1984,9 @@ msgid "Salesman"
msgstr "Myyjä"
#. module: sale
-#: model:process.node,note:sale.process_node_saleorder0
-msgid "Drives procurement and invoicing"
-msgstr "Ohjaa hankintaa ja laskutusta"
+#: model:ir.actions.act_window,name:sale.action_order_tree
+msgid "Old Quotations"
+msgstr "Vanhat Tarjoukset"
#. module: sale
#: field:sale.order,amount_untaxed:0
@@ -1801,7 +1994,7 @@ msgid "Untaxed Amount"
msgstr "Veroton määrä"
#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:163
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:170
#: model:ir.actions.act_window,name:sale.action_view_sale_advance_payment_inv
#: view:sale.advance.payment.inv:0
#: view:sale.order:0
@@ -1810,7 +2003,7 @@ msgid "Advance Invoice"
msgstr "Ennakkolasku"
#. module: sale
-#: code:addons/sale/sale.py:591
+#: code:addons/sale/sale.py:624
#, python-format
msgid "The sales order '%s' has been cancelled."
msgstr "Myyntitilaus '%s' on peruttu."
@@ -1845,20 +2038,20 @@ msgid "Packings"
msgstr "Pakkaukset"
#. module: sale
-#: field:sale.config.picking_policy,progress:0
-#: field:sale.installer,progress:0
-msgid "Configuration Progress"
-msgstr "Määrityksen eteneminen"
+#: view:sale.order.line:0
+msgid "Sale Order Lines ready to be invoiced"
+msgstr ""
#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_product_tree
-msgid "Product sales"
-msgstr "Tuotteiden myynti"
+#: view:sale.report:0
+msgid "Sales order created in last month"
+msgstr ""
#. module: sale
-#: field:sale.order,date_order:0
-msgid "Ordered Date"
-msgstr "Tilauksen Päiväys"
+#: model:ir.actions.act_window,name:sale.action_email_templates
+#: model:ir.ui.menu,name:sale.menu_email_templates
+msgid "Email Templates"
+msgstr ""
#. module: sale
#: model:ir.actions.act_window,name:sale.action_order_form
@@ -1868,14 +2061,15 @@ msgid "Sales Orders"
msgstr "Myyntitilaukset"
#. module: sale
-#: selection:sale.config.picking_policy,picking_policy:0
-msgid "Direct Delivery"
-msgstr "Suora toimitus"
+#: model:ir.model,name:sale.model_sale_shop
+#: view:sale.shop:0
+msgid "Sales Shop"
+msgstr "Myymälä"
#. module: sale
-#: field:sale.installer,sale_journal:0
-msgid "Invoicing journals"
-msgstr "Laskutuspäiväkirja"
+#: selection:sale.report,month:0
+msgid "November"
+msgstr "Marraskuu"
#. module: sale
#: field:sale.advance.payment.inv,product_id:0
@@ -1883,18 +2077,12 @@ msgid "Advance Product"
msgstr "Ennakkotuote"
#. module: sale
-#: view:sale.report:0
-#: field:sale.report,shipped_qty_1:0
-msgid "Shipped Qty"
-msgstr "Toimitettu Määrä"
-
-#. module: sale
-#: view:sale.open.invoice:0
-msgid "You invoice has been successfully created!"
-msgstr "Lasku on luotu onnistuneesti!"
+#: view:sale.order:0
+msgid "Compute"
+msgstr "Laske"
#. module: sale
-#: code:addons/sale/sale.py:585
+#: code:addons/sale/sale.py:618
#, python-format
msgid "You must first cancel all invoices attached to this sales order."
msgstr ""
@@ -1907,25 +2095,14 @@ msgid "January"
msgstr "Tammikuu"
#. module: sale
-#: view:sale.installer:0
-msgid "Configure Your Sales Management Application"
-msgstr "Konfiguroi myynninhallinta ohjelmistosi"
-
-#. module: sale
#: model:ir.actions.act_window,name:sale.action_order_tree4
msgid "Sales Order in Progress"
msgstr "Myyntitilaukset käsittelyssä"
#. module: sale
-#: field:sale.installer,sale_layout:0
-msgid "Sales Order Layout Improvement"
-msgstr "Myyntitilauksen asettelun parannukset"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:63
-#, python-format
-msgid "Error"
-msgstr "Virhe"
+#: help:sale.order,origin:0
+msgid "Reference of the document that generated this sales order request."
+msgstr "Viite dokumenttiin joka loi tämän myyntitilauspyynnön."
#. module: sale
#: view:sale.report:0
@@ -1934,6 +2111,11 @@ msgid "Commitment Delay"
msgstr "Sitoutumisen viive"
#. module: sale
+#: selection:sale.order,order_policy:0
+msgid "Deliver & invoice on demand"
+msgstr ""
+
+#. module: sale
#: model:process.node,note:sale.process_node_saleprocurement0
msgid ""
"One Procurement order for each sales order line and for each of the "
@@ -1958,13 +2140,12 @@ msgid "Confirmed sales order to invoice."
msgstr "Laskutettavat vahvistetut myyntitilaukset."
#. module: sale
-#: code:addons/sale/sale.py:290
-#, python-format
-msgid "Cannot delete Sales Order(s) which are already confirmed !"
-msgstr "Ei voi poistaa myyntitilauksia jotka on jo vahvistettu !"
+#: view:sale.order:0
+msgid "Sales Order that haven't yet been confirmed"
+msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:316
+#: code:addons/sale/sale.py:322
#, python-format
msgid "The sales order '%s' has been set in draft state."
msgstr "Myyntitilaus '%s' on asetettu vedokseksi."
@@ -1975,37 +2156,27 @@ msgid "from stock"
msgstr "varastosta"
#. module: sale
-#: field:sale.config.picking_policy,order_policy:0
-msgid "Shipping Default Policy"
-msgstr "Toimituksen oletuskäytäntö"
-
-#. module: sale
#: view:sale.open.invoice:0
msgid "Close"
msgstr "Sulje"
#. module: sale
+#: code:addons/sale/sale.py:1248
+#, python-format
+msgid "No Pricelist ! : "
+msgstr ""
+
+#. module: sale
#: field:sale.order,shipped:0
msgid "Delivered"
msgstr "Toimitettu"
#. module: sale
-#: code:addons/sale/sale.py:1115
-#, python-format
-msgid "Not enough stock !"
-msgstr "Ei tarpeeksi varastoa !"
-
-#. module: sale
#: constraint:stock.move:0
msgid "You must assign a production lot for this product"
msgstr "Tälle tuotteelle pitää määrittää valmistuserä"
#. module: sale
-#: field:sale.order.line,sequence:0
-msgid "Layout Sequence"
-msgstr "Asettelun järjestys"
-
-#. module: sale
#: model:ir.actions.act_window,help:sale.action_shop_form
msgid ""
"If you have more than one shop reselling your company products, you can "
@@ -2032,11 +2203,6 @@ msgid "May"
msgstr "Toukokuu"
#. module: sale
-#: help:sale.installer,sale_order_dates:0
-msgid "Adds commitment, requested and effective dates on Sales Orders."
-msgstr "Lisää luvatun, pyydetyn ja todellisen päiväyksen myyntitilaukselle."
-
-#. module: sale
#: view:sale.order:0
#: field:sale.order,partner_id:0
#: field:sale.order.line,order_partner_id:0
@@ -2044,25 +2210,11 @@ msgid "Customer"
msgstr "Asiakas"
#. module: sale
-#: model:product.template,name:sale.advance_product_0_product_template
-msgid "Advance"
-msgstr "Ennakko"
-
-#. module: sale
#: selection:sale.report,month:0
msgid "February"
msgstr "Helmikuu"
#. module: sale
-#: help:sale.installer,sale_journal:0
-msgid ""
-"Allows you to group and invoice your delivery orders according to different "
-"invoicing types: daily, weekly, etc."
-msgstr ""
-"Mahdollistaa toimitusten laskujen ryhmittelyn eri jaksoille: päivittäin, "
-"viikottain jne."
-
-#. module: sale
#: selection:sale.report,month:0
msgid "April"
msgstr "Huhtikuu"
@@ -2073,11 +2225,6 @@ msgid "Accounting"
msgstr "Kirjanpito"
#. module: sale
-#: field:sale.config.picking_policy,step:0
-msgid "Steps To Deliver a Sales Order"
-msgstr "Vaiheet myyntitilauksen toimittamiseksi"
-
-#. module: sale
#: view:sale.order:0
#: view:sale.order.line:0
msgid "Search Sales Order"
@@ -2089,18 +2236,18 @@ msgid "Sales Order Requisition"
msgstr "Myyntitilausehdotus"
#. module: sale
+#: code:addons/sale/sale.py:1242
+#, python-format
+msgid "Not enough stock ! : "
+msgstr ""
+
+#. module: sale
#: report:sale.order:0
#: field:sale.order,payment_term:0
msgid "Payment Term"
msgstr "Maksuehto"
#. module: sale
-#: help:sale.installer,sale_layout:0
-msgid ""
-"Provides some features to improve the layout of the Sales Order reports."
-msgstr "Lisää joitaikin ominaisuuksia myyntitilausraporttien asetteluun."
-
-#. module: sale
#: model:ir.actions.act_window,help:sale.action_order_report_all
msgid ""
"This report performs analysis on your quotations and sales orders. Analysis "
@@ -2138,6 +2285,9 @@ msgstr "Lasku perustuen toimitettuihin"
#~ msgid "Recreate Procurement"
#~ msgstr "Hankinnan uudelleenluonti"
+#~ msgid "Partial Delivery"
+#~ msgstr "Osittaistoimitus"
+
#~ msgid "Delivery, from the warehouse to the customer."
#~ msgstr "Toimitus varastosta asiakkaalle"
@@ -2168,6 +2318,9 @@ msgstr "Lasku perustuen toimitettuihin"
#~ msgid "Origin"
#~ msgstr "Lähde"
+#~ msgid "Shipping Policy"
+#~ msgstr "Toimituskäytäntö"
+
#~ msgid "Reference"
#~ msgstr "Viite"
@@ -2191,6 +2344,9 @@ msgstr "Lasku perustuen toimitettuihin"
#~ msgid "Procurement is created after confirmation of sale order."
#~ msgstr "Hankinta luodaan myyntitilauksen vahvistamisen jälkeen."
+#~ msgid "All at Once"
+#~ msgstr "Kaikki kerralla"
+
#~ msgid "Procure Method"
#~ msgstr "Hankintatapa"
@@ -2236,6 +2392,9 @@ msgstr "Lasku perustuen toimitettuihin"
#~ msgid "Packing"
#~ msgstr "Pakkaus"
+#~ msgid "Complete Delivery"
+#~ msgstr "Kokonaistoimitus"
+
#~ msgid "Total amount"
#~ msgstr "Yhteensä"
@@ -2257,6 +2416,9 @@ msgstr "Lasku perustuen toimitettuihin"
#~ msgid "Sales orders"
#~ msgstr "Myyntitilaukset"
+#~ msgid "Shipping Default Policy"
+#~ msgstr "Toimituksen oletuskäytäntö"
+
#~ msgid "Packing Default Policy"
#~ msgstr "Pakkauksen oletuskäytäntö"
@@ -2310,6 +2472,9 @@ msgstr "Lasku perustuen toimitettuihin"
#~ msgid "Packing Policy"
#~ msgstr "Pakkauskäytäntö"
+#~ msgid "Product sales"
+#~ msgstr "Tuotteiden myynti"
+
#~ msgid "Configure Sale Order Logistic"
#~ msgstr "Myyntitilauksien logistiikan asetukset"
@@ -2338,6 +2503,12 @@ msgstr "Lasku perustuen toimitettuihin"
#~ msgid "Sale Pricelists"
#~ msgstr "Myynnin hinnastot"
+#~ msgid "Direct Delivery"
+#~ msgstr "Suora toimitus"
+
+#~ msgid "Delivery Order Only"
+#~ msgstr "Vain toimitusmääräys"
+
#~ msgid "Make Invoice"
#~ msgstr "Luo lasku"
@@ -2365,6 +2536,9 @@ msgstr "Lasku perustuen toimitettuihin"
#~ msgid "Advance Payment"
#~ msgstr "Ennakkomaksu"
+#~ msgid "Shipping & Manual Invoice"
+#~ msgstr "Toimitus ja manuaalinen lasku"
+
#~ msgid ""
#~ "The Object name must start with x_ and not contain any special character !"
#~ msgstr "Objektin nimen tulee alkaa x_ ja se ei saa sisältää erikoismerkkejä!"
@@ -2397,6 +2571,9 @@ msgstr "Lasku perustuen toimitettuihin"
#~ msgid "Sale Order Line"
#~ msgstr "Myyntitilausrivi"
+#~ msgid "Sales Management"
+#~ msgstr "Myynninhallinta"
+
#~ msgid "Deliver"
#~ msgstr "Toimita"
@@ -2429,6 +2606,9 @@ msgstr "Lasku perustuen toimitettuihin"
#~ msgid "Payment Terms"
#~ msgstr "Maksuehdot"
+#~ msgid "Payment Before Delivery"
+#~ msgstr "Maksu ennen toimitusta"
+
#~ msgid "Error: Invalid ean code"
#~ msgstr "Virhe: Virheellinen EAN-koodi"
@@ -2478,9 +2658,6 @@ msgstr "Lasku perustuen toimitettuihin"
#~ msgid "My sales order waiting Invoice"
#~ msgstr "Omat myyntitilaukset vailla laskutusta"
-#~ msgid "My Quotations"
-#~ msgstr "Omat tarjoukset"
-
#~ msgid "My sales in shipping exception"
#~ msgstr "Oma myynti joissa poikkeus toimituksessa"
@@ -2556,3 +2733,172 @@ msgstr "Lasku perustuen toimitettuihin"
#~ msgid "Other data"
#~ msgstr "Muut tiedot"
+
+#~ msgid "Invoice On Order After Delivery"
+#~ msgstr "Laskutetaan Tilauksen Mukaisesti Toimitettaessa"
+
+#~ msgid " Year "
+#~ msgstr " Vuosi "
+
+#~ msgid "Picking Default Policy"
+#~ msgstr "Keräyksen Oletuskäytäntö"
+
+#~ msgid "Sales Order Dates"
+#~ msgstr "Myyntitilauksen Päiväykset"
+
+#~ msgid "Margins in Sales Orders"
+#~ msgstr "Myyntitilausten Marginaalit"
+
+#~ msgid "Delivery Costs"
+#~ msgstr "Toimituskustannukset"
+
+#~ msgid "title"
+#~ msgstr "otsake"
+
+#~ msgid "Order date"
+#~ msgstr "Tilauksen Päiväys"
+
+#~ msgid "sale.installer"
+#~ msgstr "sale.installer"
+
+#~ msgid "Invoicing"
+#~ msgstr "Laskutus"
+
+#~ msgid " Month "
+#~ msgstr " Kuukausi "
+
+#~ msgid " Month-1 "
+#~ msgstr " Kuukausi-1 "
+
+#~ msgid "Ordered Date"
+#~ msgstr "Tilauksen Päiväys"
+
+#~ msgid "Configuration Progress"
+#~ msgstr "Määrityksen eteneminen"
+
+#~ msgid "Shipped Qty"
+#~ msgstr "Toimitettu Määrä"
+
+#~ msgid "Configure Picking Policy for Sales Order"
+#~ msgstr "Määritellään myyntitilauksen poimintasäännöt"
+
+#~ msgid "Configure Sales Order Logistics"
+#~ msgstr "Konfiguroi myyntitilauksen logistiikan"
+
+#~ msgid "Allows you to compute delivery costs on your quotations."
+#~ msgstr "Mahdollistaa kuljetuskustannusten laskennan tarjouksellesi."
+
+#~ msgid "Configure"
+#~ msgstr "Konfiguroi"
+
+#~ msgid "Order Reference must be unique !"
+#~ msgstr "Tilauksen viite tulee olla yksilöllinen!"
+
+#~ msgid "Enhance your core Sales Application with additional functionalities."
+#~ msgstr "paranna perusmyyntiohjelmistoasi lisätoiminnoilla"
+
+#~ msgid "Setup your sales workflow and default values."
+#~ msgstr "Aseta myynnin työkulu ja oletusarvot"
+
+#, python-format
+#~ msgid "You cannot cancel a sales order line that has already been invoiced !"
+#~ msgstr "Et voi peruuttaa myyntitilausriviä joka on jo laskutettu!"
+
+#~ msgid "Sales Application Configuration"
+#~ msgstr "Myyntiohjelmiston konfiguraatio"
+
+#, python-format
+#~ msgid "Picking Information !"
+#~ msgstr "Keräilyn tiedot !"
+
+#~ msgid "Invoice From The Picking"
+#~ msgstr "Laskutus keräilystä"
+
+#~ msgid "Picking List & Delivery Order"
+#~ msgstr "Keräilylista ja toimitusmääräin"
+
+#, python-format
+#~ msgid "Cannot delete a sales order line which is %s !"
+#~ msgstr "Ei voi oistaa myyntitilausriviä joka on %s !"
+
+#~ msgid ""
+#~ "Gives the margin of profitability by calculating the difference between Unit "
+#~ "Price and Cost Price."
+#~ msgstr ""
+#~ "Antaa voittomarginaalin laskemalla erotuksen yksikköhinnasta ja "
+#~ "kustannushinnasta."
+
+#~ msgid "Configure Your Sales Management Application"
+#~ msgstr "Konfiguroi myynninhallinta ohjelmistosi"
+
+#~ msgid "Invoicing journals"
+#~ msgstr "Laskutuspäiväkirja"
+
+#~ msgid "Sales Order Layout Improvement"
+#~ msgstr "Myyntitilauksen asettelun parannukset"
+
+#, python-format
+#~ msgid "Not enough stock !"
+#~ msgstr "Ei tarpeeksi varastoa !"
+
+#~ msgid "Layout Sequence"
+#~ msgstr "Asettelun järjestys"
+
+#, python-format
+#~ msgid "Cannot delete Sales Order(s) which are already confirmed !"
+#~ msgstr "Ei voi poistaa myyntitilauksia jotka on jo vahvistettu !"
+
+#~ msgid ""
+#~ "By default, OpenERP is able to manage complex routing and paths of products "
+#~ "in your warehouse and partner locations. This will configure the most common "
+#~ "and simple methods to deliver products to the customer in one or two "
+#~ "operations by the worker."
+#~ msgstr ""
+#~ "OpenERP pystyy oletusarvoisesti hoitamaan monimutkaisia reitityksiä ja "
+#~ "polkuja tuotteillesi omissa varastoissasi ja kumppanien tiloissa. Tämä "
+#~ "konfiguroi yleisimmät ja yksinkertaisimmat metodit tuotteiden "
+#~ "toimittamiseksi asiakkaalle yhdellä tai kahdella työntekijän tekemällä "
+#~ "operaatiolla."
+
+#~ msgid ""
+#~ "The Shipping Policy is used to configure per order if you want to deliver as "
+#~ "soon as possible when one product is available or you wait that all products "
+#~ "are available.."
+#~ msgstr ""
+#~ "Toimitustyyppiä käytetään määrittelemään tilauksittain, haluatko toimittaa "
+#~ "heti kun jokin tuotteista on saatavilla vai haluatko odottaa kunnes kaikki "
+#~ "tuotteet ovat saatavilla.."
+
+#, python-format
+#~ msgid ""
+#~ "You selected a quantity of %d Units.\n"
+#~ "But it's not compatible with the selected packaging.\n"
+#~ "Here is a proposition of quantities according to the packaging:\n"
+#~ "\n"
+#~ "EAN: %s Quantity: %s Type of ul: %s"
+#~ msgstr ""
+#~ "Valitsit määräksi %d yksikköä.\n"
+#~ "Mutta se ei ole yhteensopiva valitun pakkauksen kanssa.\n"
+#~ "Tässä on ehdotus määristä pakkauksen mukaan:\n"
+#~ "\n"
+#~ "EAN: %s määrä %s Tyyppi %s"
+
+#~ msgid ""
+#~ "Provides some features to improve the layout of the Sales Order reports."
+#~ msgstr "Lisää joitaikin ominaisuuksia myyntitilausraporttien asetteluun."
+
+#~ msgid "Adds commitment, requested and effective dates on Sales Orders."
+#~ msgstr "Lisää luvatun, pyydetyn ja todellisen päiväyksen myyntitilaukselle."
+
+#~ msgid ""
+#~ "Allows you to group and invoice your delivery orders according to different "
+#~ "invoicing types: daily, weekly, etc."
+#~ msgstr ""
+#~ "Mahdollistaa toimitusten laskujen ryhmittelyn eri jaksoille: päivittäin, "
+#~ "viikottain jne."
+
+#~ msgid "Advance"
+#~ msgstr "Ennakko"
+
+#~ msgid "Steps To Deliver a Sales Order"
+#~ msgstr "Vaiheet myyntitilauksen toimittamiseksi"
diff --git a/addons/sale/i18n/fr.po b/addons/sale/i18n/fr.po
index 645dbcc4e38..95a52ad9be3 100644
--- a/addons/sale/i18n/fr.po
+++ b/addons/sale/i18n/fr.po
@@ -6,18 +6,18 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2011-01-11 11:16+0000\n"
+"POT-Creation-Date: 2011-12-22 18:43+0000\n"
"PO-Revision-Date: 2011-12-07 09:17+0000\n"
"Last-Translator: Numérigraphe <Unknown>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-12-08 05:36+0000\n"
-"X-Generator: Launchpad (build 14443)\n"
+"X-Launchpad-Export-Date: 2011-12-23 06:46+0000\n"
+"X-Generator: Launchpad (build 14560)\n"
#. module: sale
-#: code:addons/sale/sale.py:620
+#: code:addons/sale/sale.py:655
#, python-format
msgid "invalid mode for test_state"
msgstr "Mode incorrect pour test_state"
@@ -57,17 +57,24 @@ msgstr "UdM du produit"
#~ "Erreur: l'UP par défaut et l'UP d'achat doivent être dans la même catégorie."
#. module: sale
+#: field:sale.config.picking_policy,timesheet:0
+msgid "Based on Timesheet"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid ""
+"Sale Order Lines that are confirmed, done or in exception state and haven't "
+"yet been invoiced"
+msgstr ""
+
+#. module: sale
#: view:board.board:0
#: model:ir.actions.act_window,name:sale.action_sales_by_salesman
msgid "Sales by Salesman in last 90 days"
msgstr "Ventes par vendeur ces 90 derniers jours"
#. module: sale
-#: help:sale.installer,delivery:0
-msgid "Allows you to compute delivery costs on your quotations."
-msgstr "Vous permet de calculer les frais de livraison sur vos devis."
-
-#. module: sale
#: help:sale.order,picking_policy:0
msgid ""
"If you don't have enough stock available to deliver all at once, do you "
@@ -77,6 +84,11 @@ msgstr ""
"acceptez vous les livraisons partielles ?"
#. module: sale
+#: view:sale.order:0
+msgid "UoS"
+msgstr ""
+
+#. module: sale
#: help:sale.order,partner_shipping_id:0
msgid "Shipping address for current sales order."
msgstr "Adresse d'expédition pour le bon de commande actuel."
@@ -100,22 +112,12 @@ msgid "Cancel Order"
msgstr "Annuler la commande"
#. module: sale
-#: view:sale.config.picking_policy:0
-msgid "Configure Sales Order Logistics"
-msgstr "Paramétrez la logistique des ventes"
-
-#. module: sale
-#: code:addons/sale/sale.py:603
+#: code:addons/sale/sale.py:638
#, python-format
msgid "The quotation '%s' has been converted to a sales order."
msgstr "Le devis '%s' a été transformé en bon de commande."
#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Payment Before Delivery"
-msgstr "Règlement avant livraison"
-
-#. module: sale
#: code:addons/sale/wizard/sale_make_invoice.py:42
#, python-format
msgid "Warning !"
@@ -132,12 +134,6 @@ msgid "Drives procurement orders for every sales order line."
msgstr "Génère des ordres d'approvisionnements pour chaque ligne de commande"
#. module: sale
-#: selection:sale.config.picking_policy,picking_policy:0
-msgid "All at Once"
-msgstr "Tout d'un coup"
-
-#. module: sale
-#: field:sale.order,project_id:0
#: view:sale.report:0
#: field:sale.report,analytic_account_id:0
#: field:sale.shop,project_id:0
@@ -157,6 +153,15 @@ msgstr ""
"si vous facturez totalement la commande."
#. module: sale
+#: code:addons/sale/sale.py:295
+#, python-format
+msgid ""
+"In order to delete a confirmed sale order, you must cancel it before ! To "
+"cancel a sale order, you must first cancel related picking or delivery "
+"orders."
+msgstr ""
+
+#. module: sale
#: model:process.node,name:sale.process_node_saleprocurement0
msgid "Procurement Order"
msgstr "Odre d'approvisionnement"
@@ -168,6 +173,11 @@ msgid "Partner"
msgstr "Partenaire"
#. module: sale
+#: selection:sale.order,order_policy:0
+msgid "Invoice based on deliveries"
+msgstr ""
+
+#. module: sale
#: view:sale.order:0
msgid "Order Line"
msgstr "Ligne de commande"
@@ -214,9 +224,14 @@ msgid "Default Payment Term"
msgstr "Condition de règlement par défaut"
#. module: sale
-#: model:ir.actions.act_window,name:sale.action_config_picking_policy
-msgid "Configure Picking Policy for Sales Order"
-msgstr "Configurer la politique de colisage pour les bons de commande"
+#: field:sale.config.picking_policy,deli_orders:0
+msgid "Based on Delivery Orders"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.picking_policy,time_unit:0
+msgid "Main Working Time Unit"
+msgstr ""
#. module: sale
#: view:sale.order:0
@@ -232,9 +247,10 @@ msgid "Disc.(%)"
msgstr "Rem.(%)"
#. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_forceassignation0
-msgid "Force Assignation"
-msgstr "Forcer l'assignation"
+#: view:sale.report:0
+#: field:sale.report,price_total:0
+msgid "Total Price"
+msgstr "Prix total"
#. module: sale
#: help:sale.make.invoice,grouped:0
@@ -242,6 +258,11 @@ msgid "Check the box to group the invoices for the same customers"
msgstr "Cochez cette case pour grouper les factures d'un même client"
#. module: sale
+#: view:sale.order:0
+msgid "My Sale Orders"
+msgstr ""
+
+#. module: sale
#: selection:sale.order,invoice_quantity:0
msgid "Ordered Quantities"
msgstr "Quantités commandées"
@@ -283,14 +304,25 @@ msgstr ""
"livraison'."
#. module: sale
+#: field:sale.config.picking_policy,task_work:0
+msgid "Based on Tasks' Work"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
+msgid "Quotations and Sales"
+msgstr ""
+
+#. module: sale
#: model:ir.model,name:sale.model_sale_make_invoice
msgid "Sales Make Invoice"
msgstr "Vente : Facturer"
#. module: sale
-#: view:sale.order:0
-msgid "Recreate Packing"
-msgstr "Régénérer la liste de colisage"
+#: code:addons/sale/sale.py:330
+#, python-format
+msgid "Pricelist Warning!"
+msgstr ""
#. module: sale
#: field:sale.order.line,discount:0
@@ -298,12 +330,10 @@ msgid "Discount (%)"
msgstr "Remise (%)"
#. module: sale
-#: help:res.company,security_lead:0
-msgid ""
-"This is the days added to what you promise to customers for security purpose"
-msgstr ""
-"C'est le nombre de jours ajoutés à ce que vous avez promis au client par "
-"sécurité"
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_quotation_for_sale
+msgid "My Quotations"
+msgstr "Mes devis"
#. module: sale
#: view:board.board:0
@@ -328,7 +358,22 @@ msgid "Shop Name"
msgstr "Nom du Magasin"
#. module: sale
-#: code:addons/sale/sale.py:1014
+#: help:sale.order,order_policy:0
+msgid ""
+"The Invoice Policy is used to synchronise invoice and delivery operations.\n"
+" - The 'Pay before delivery' choice will first generate the invoice and "
+"then generate the picking order after the payment of this invoice.\n"
+" - The 'Deliver & Invoice on demand' will create the picking order directly "
+"and wait for the user to manually click on the 'Invoice' button to generate "
+"the draft invoice based on the sale order or the sale order lines.\n"
+" - The 'Invoice on order after delivery' choice will generate the draft "
+"invoice based on sales order after all picking lists have been finished.\n"
+" - The 'Invoice based on deliveries' choice is used to create an invoice "
+"during the picking process."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:1158
#, python-format
msgid "No Customer Defined !"
msgstr "Aucun Client défini !"
@@ -339,9 +384,12 @@ msgid "Sales in Exception"
msgstr "Commandes avec incidents"
#. module: sale
-#: view:sale.order:0
-msgid "Set to Draft"
-msgstr "Mettre en brouillon"
+#: code:addons/sale/sale.py:1145
+#: code:addons/sale/sale.py:1264
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:70
+#, python-format
+msgid "Configuration Error !"
+msgstr ""
#. module: sale
#: view:sale.order:0
@@ -349,35 +397,7 @@ msgid "Conditions"
msgstr "Conditions"
#. module: sale
-#: help:sale.order,order_policy:0
-msgid ""
-"The Shipping Policy is used to synchronise invoice and delivery operations.\n"
-" - The 'Pay Before delivery' choice will first generate the invoice and "
-"then generate the picking order after the payment of this invoice.\n"
-" - The 'Shipping & Manual Invoice' will create the picking order directly "
-"and wait for the user to manually click on the 'Invoice' button to generate "
-"the draft invoice.\n"
-" - The 'Invoice On Order After Delivery' choice will generate the draft "
-"invoice based on sales order after all picking lists have been finished.\n"
-" - The 'Invoice From The Picking' choice is used to create an invoice "
-"during the picking process."
-msgstr ""
-"La politique d'expédition est utilisée pour synchroniser la facture et les "
-"opérations de livraison.\n"
-" - Le choix \"Paiement avant livraison\" générera en premier la facture et "
-"ensuite, générera l'ordre de préparation à la suite du paiement de la "
-"facture.\n"
-" - Le choix \"Expédition et facturation manuelle\" créera l'ordre de "
-"préparation directement et attendra que l'utilisateur clique sur le bouton "
-"\"Facturer\" pour générer la facture à l'état \"Brouillon\".\n"
-" - Le choix \"Facturation sur la commande après la livraison\" générera la "
-"facture à l'état \"Brouillon\" basée sur les bons de commande lorsque toutes "
-"les listes de préparation seront terminées.\n"
-" - Le choix \"Facturation depuis la préparation\" est utilisé pour créer "
-"des factures pendant le processus de préparation."
-
-#. module: sale
-#: code:addons/sale/sale.py:939
+#: code:addons/sale/sale.py:1034
#, python-format
msgid ""
"There is no income category account defined in default Properties for "
@@ -387,9 +407,9 @@ msgstr ""
"catégorie de produit, ou bien le régime fiscal n'est pas définit !"
#. module: sale
-#: view:sale.installer:0
-msgid "Configure"
-msgstr "Configurer"
+#: selection:sale.report,month:0
+msgid "August"
+msgstr "Août"
#. module: sale
#: constraint:stock.move:0
@@ -402,7 +422,7 @@ msgid "June"
msgstr "Juin"
#. module: sale
-#: code:addons/sale/sale.py:584
+#: code:addons/sale/sale.py:617
#, python-format
msgid "Could not cancel this sales order !"
msgstr "Impossible d'annuler ce bon de commandes"
@@ -423,8 +443,12 @@ msgid "October"
msgstr "Octobre"
#. module: sale
+#: sql_constraint:stock.picking:0
+msgid "Reference must be unique per Company!"
+msgstr ""
+
+#. module: sale
#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_quotation_for_sale
#: view:sale.order:0
#: view:sale.report:0
msgid "Quotations"
@@ -436,11 +460,6 @@ msgid "Pricelist for current sales order."
msgstr "liste de prix du bon de commandes actuel"
#. module: sale
-#: selection:sale.config.picking_policy,step:0
-msgid "Delivery Order Only"
-msgstr "Bon de livraison seul"
-
-#. module: sale
#: report:sale.order:0
msgid "TVA :"
msgstr "TVA :"
@@ -467,6 +486,7 @@ msgstr "Position Fiscale"
#. module: sale
#: view:sale.order:0
#: view:sale.order.line:0
+#: field:sale.report,product_uom:0
msgid "UoM"
msgstr "UdM"
@@ -491,7 +511,13 @@ msgstr ""
"ou \"Manuel, en cours\""
#. module: sale
-#: code:addons/sale/sale.py:971
+#: code:addons/sale/sale.py:1061
+#, python-format
+msgid "You cannot cancel a sale order line that has already been invoiced!"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:1066
#, python-format
msgid "You must first cancel stock moves attached to this sales order line."
msgstr ""
@@ -499,7 +525,7 @@ msgstr ""
"commandes."
#. module: sale
-#: code:addons/sale/sale.py:1042
+#: code:addons/sale/sale.py:1134
#, python-format
msgid "(n/a)"
msgstr "(n/a)"
@@ -538,15 +564,36 @@ msgid "Notes"
msgstr "Notes"
#. module: sale
+#: sql_constraint:res.company:0
+msgid "The company name must be unique !"
+msgstr ""
+
+#. module: sale
#: help:sale.order,partner_invoice_id:0
msgid "Invoice address for current sales order."
msgstr "Adresse de facturation pour le bon de commandes actuel"
#. module: sale
-#: view:sale.installer:0
-msgid "Enhance your core Sales Application with additional functionalities."
+#: view:sale.report:0
+msgid "Month-1"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered month of the sales order"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:504
+#, python-format
+msgid ""
+"You cannot group sales having different currencies for the same partner."
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,picking_policy:0
+msgid "Deliver each product when available"
msgstr ""
-"Complétez l'application \"Ventes\" avec de nouvelles fonctionnalités."
#. module: sale
#: field:sale.order,invoiced_rate:0
@@ -565,21 +612,43 @@ msgid "Confirmation Date"
msgstr "Date de confirmation"
#. module: sale
+#: field:sale.order,incoterm:0
+msgid "Incoterm"
+msgstr "Incoterm"
+
+#. module: sale
#: field:sale.order.line,address_allotment_id:0
msgid "Allotment Partner"
msgstr "Partenaire alloti"
#. module: sale
-#: sql_constraint:sale.order:0
-msgid "Order Reference must be unique !"
-msgstr "La référence de la commande doit être unique !"
-
-#. module: sale
#: selection:sale.report,month:0
msgid "March"
msgstr "Mars"
#. module: sale
+#: constraint:stock.move:0
+msgid "You can not move products from or to a location of the type view."
+msgstr ""
+
+#. module: sale
+#: field:sale.config.picking_policy,sale_orders:0
+msgid "Based on Sales Orders"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,state:0
+msgid ""
+"Givwizard = self.browse(cr, uid, ids)[0]es the state of the quotation or "
+"sales order. \n"
+"The exception state is automatically set when a cancel operation occurs in "
+"the invoice validation (Invoice Exception) or in the picking list process "
+"(Shipping Exception). \n"
+"The 'Waiting Schedule' state is set when the invoice is confirmed but "
+"waiting for the scheduler to run on the order date."
+msgstr ""
+
+#. module: sale
#: help:sale.order,amount_total:0
msgid "The total amount."
msgstr "Montant total"
@@ -595,6 +664,11 @@ msgid "Invoice address :"
msgstr "Adresse de facturation :"
#. module: sale
+#: field:sale.order.line,sequence:0
+msgid "Line Sequence"
+msgstr ""
+
+#. module: sale
#: model:process.transition,note:sale.process_transition_saleorderprocurement0
msgid ""
"For every sales order line, a procurement order is created to supply the "
@@ -646,11 +720,6 @@ msgid "Sales Order Line"
msgstr "Ligne de commandes de vente"
#. module: sale
-#: view:sale.config.picking_policy:0
-msgid "Setup your sales workflow and default values."
-msgstr "Configurez votre workflow de vente et vos valeurs par défaut."
-
-#. module: sale
#: field:sale.shop,warehouse_id:0
msgid "Warehouse"
msgstr "Entrepôt"
@@ -687,6 +756,11 @@ msgid "Creation Date"
msgstr "Date de création"
#. module: sale
+#: model:ir.ui.menu,name:sale.menu_sales_configuration_misc
+msgid "Miscellaneous"
+msgstr ""
+
+#. module: sale
#: model:ir.actions.act_window,name:sale.action_order_line_tree3
msgid "Uninvoiced and Delivered Lines"
msgstr "Lignes livrées et non-facturées"
@@ -702,14 +776,19 @@ msgid "My Sales"
msgstr "Mes ventes"
#. module: sale
-#: code:addons/sale/sale.py:290
-#: code:addons/sale/sale.py:966
-#: code:addons/sale/sale.py:1165
+#: code:addons/sale/sale.py:295
+#: code:addons/sale/sale.py:1061
+#: code:addons/sale/sale.py:1290
#, python-format
msgid "Invalid action !"
msgstr "Action invalide !"
#. module: sale
+#: view:sale.order:0
+msgid "Extra Info"
+msgstr "Info supplémentaires"
+
+#. module: sale
#: field:sale.order,pricelist_id:0
#: field:sale.report,pricelist_id:0
#: field:sale.shop,pricelist_id:0
@@ -723,13 +802,21 @@ msgid "# of Qty"
msgstr "Nb. de qté."
#. module: sale
+#: code:addons/sale/sale.py:1314
+#, python-format
+msgid "Hour"
+msgstr ""
+
+#. module: sale
#: view:sale.order:0
msgid "Order Date"
msgstr "Date de commande"
#. module: sale
#: view:sale.order.line:0
+#: view:sale.report:0
#: field:sale.report,shipped:0
+#: field:sale.report,shipped_qty_1:0
msgid "Shipped"
msgstr "Expédié"
@@ -739,9 +826,9 @@ msgid "All Quotations"
msgstr "Tous les devis"
#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Invoice On Order After Delivery"
-msgstr "Facturation sur le bon de commande après la livraison"
+#: view:sale.config.picking_policy:0
+msgid "Options"
+msgstr ""
#. module: sale
#: selection:sale.report,month:0
@@ -749,6 +836,20 @@ msgid "September"
msgstr "Septembre"
#. module: sale
+#: code:addons/sale/sale.py:632
+#, python-format
+msgid "You cannot confirm a sale order which has no line."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:1246
+#, python-format
+msgid ""
+"You have to select a pricelist or a customer in the sales form !\n"
+"Please set one before choosing a product."
+msgstr ""
+
+#. module: sale
#: view:sale.report:0
#: field:sale.report,categ_id:0
msgid "Category of Product"
@@ -765,11 +866,6 @@ msgid "Stock Moves"
msgstr "Mouvements de stock"
#. module: sale
-#: view:sale.report:0
-msgid " Year "
-msgstr " Année "
-
-#. module: sale
#: field:sale.order,state:0
#: field:sale.report,state:0
msgid "Order State"
@@ -787,7 +883,7 @@ msgid "Sales By Month"
msgstr "Ventes par mois"
#. module: sale
-#: code:addons/sale/sale.py:970
+#: code:addons/sale/sale.py:1065
#, python-format
msgid "Could not cancel sales order line!"
msgstr "Vous ne pouvez pas annuler une ligne de bon de commande !"
@@ -822,64 +918,19 @@ msgstr ""
"à jour seulement après que l'ordonnanceur ait été lancé."
#. module: sale
+#: field:sale.order,date_order:0
+msgid "Date"
+msgstr ""
+
+#. module: sale
#: view:sale.report:0
msgid "Extended Filters..."
msgstr "Filtres étendus..."
#. module: sale
-#: model:ir.module.module,description:sale.module_meta_information
-msgid ""
-"\n"
-" The base module to manage quotations and sales orders.\n"
-"\n"
-" * Workflow with validation steps:\n"
-" - Quotation -> Sales order -> Invoice\n"
-" * Invoicing methods:\n"
-" - Invoice on order (before or after shipping)\n"
-" - Invoice on delivery\n"
-" - Invoice on timesheets\n"
-" - Advance invoice\n"
-" * Partners preferences (shipping, invoicing, incoterm, ...)\n"
-" * Products stocks and prices\n"
-" * Delivery methods:\n"
-" - all at once, multi-parcel\n"
-" - delivery costs\n"
-" * Dashboard for salesman that includes:\n"
-" * Your open quotations\n"
-" * Top 10 sales of the month\n"
-" * Cases statistics\n"
-" * Graph of sales by product\n"
-" * Graph of cases of the month\n"
-" "
-msgstr ""
-"\n"
-" Le module de base pour gérer les devis et les bons de commande.\n"
-"\n"
-" * Flux avec étapes de validation :\n"
-" - Devis -> Bon de commande -> Facture\n"
-" * Méthodes de facturation :\n"
-" - Facturation sur la commande (avant ou après l'expédition)\n"
-" - Facturation sur la livraison\n"
-" - Facturation sur les feuilles de temps\n"
-" - Facture d'avance\n"
-" * Préférences des partenaires (expédition, facturation, incoterm, ...)\n"
-" * Stocks de produits et prix\n"
-" * Méthodes de livraison :\n"
-" - tout d'un coup, multi-parcelles\n"
-" - coûts de livraison\n"
-" * Tableau de bord pour les commerciaux qui inclue :\n"
-" * Vos devis ouverts\n"
-" * Le top 10 de vos ventes du mois\n"
-" * Statistiques des cas\n"
-" * Graphe des ventes par produits\n"
-" * Graphe des cas du mois\n"
-" "
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_shop
-#: view:sale.shop:0
-msgid "Sales Shop"
-msgstr "Magasin"
+#: selection:sale.order.line,state:0
+msgid "Exception"
+msgstr "Incident"
#. module: sale
#: model:ir.model,name:sale.model_res_company
@@ -887,9 +938,10 @@ msgid "Companies"
msgstr "Sociétés"
#. module: sale
-#: selection:sale.report,month:0
-msgid "November"
-msgstr "Novembre"
+#: code:addons/sale/sale.py:1259
+#, python-format
+msgid "No valid pricelist line found ! :"
+msgstr ""
#. module: sale
#: view:sale.order:0
@@ -897,9 +949,9 @@ msgid "History"
msgstr "Historique"
#. module: sale
-#: field:sale.config.picking_policy,picking_policy:0
-msgid "Picking Default Policy"
-msgstr "Politique de colisage par défaut"
+#: selection:sale.order,order_policy:0
+msgid "Invoice on order after delivery"
+msgstr ""
#. module: sale
#: help:sale.order,invoice_ids:0
@@ -925,14 +977,14 @@ msgstr ""
"Le nom et l'adresse du contact qui a passé la commande ou demandé le devis."
#. module: sale
-#: code:addons/sale/sale.py:966
-#, python-format
-msgid "You cannot cancel a sales order line that has already been invoiced !"
+#: help:res.company,security_lead:0
+msgid ""
+"This is the days added to what you promise to customers for security purpose"
msgstr ""
-"Vous ne pouvez pas annuler des lignes de vente qui ont déjà été facturées !"
+"C'est le nombre de jours ajoutés à ce que vous avez promis au client par "
+"sécurité"
#. module: sale
-#: view:sale.order:0
#: view:sale.order.line:0
msgid "Qty"
msgstr "Qté"
@@ -943,6 +995,11 @@ msgid "References"
msgstr "Références"
#. module: sale
+#: view:sale.order.line:0
+msgid "My Sales Order Lines"
+msgstr ""
+
+#. module: sale
#: model:process.transition.action,name:sale.process_transition_action_cancel0
#: model:process.transition.action,name:sale.process_transition_action_cancel1
#: model:process.transition.action,name:sale.process_transition_action_cancel2
@@ -954,14 +1011,9 @@ msgid "Cancel"
msgstr "Annuler"
#. module: sale
-#: field:sale.installer,sale_order_dates:0
-msgid "Sales Order Dates"
-msgstr "Dates de commande de ventes"
-
-#. module: sale
-#: selection:sale.order.line,state:0
-msgid "Exception"
-msgstr "Incident"
+#: sql_constraint:sale.order:0
+msgid "Order Reference must be unique per Company!"
+msgstr ""
#. module: sale
#: model:process.transition,name:sale.process_transition_invoice0
@@ -973,19 +1025,19 @@ msgid "Create Invoice"
msgstr "Créer facture"
#. module: sale
-#: field:sale.installer,sale_margin:0
-msgid "Margins in Sales Orders"
-msgstr "Marges sur bons de commandes"
-
-#. module: sale
#: view:sale.order:0
msgid "Total Tax Excluded"
msgstr "Total hors-taxes"
#. module: sale
-#: view:sale.order:0
-msgid "Compute"
-msgstr "Calculer"
+#: view:sale.order.line:0
+msgid "Order reference"
+msgstr ""
+
+#. module: sale
+#: view:sale.open.invoice:0
+msgid "You invoice has been successfully created!"
+msgstr "Votre facture a été créée avec succès !"
#. module: sale
#: view:sale.report:0
@@ -1004,23 +1056,22 @@ msgid "Open Invoice"
msgstr "Facture ouverte"
#. module: sale
-#: report:sale.order:0
-#: view:sale.order.line:0
-msgid "Price"
-msgstr "Prix"
+#: model:ir.actions.server,name:sale.ir_actions_server_edi_sale
+msgid "Auto-email confirmed sale orders"
+msgstr ""
#. module: sale
-#: model:ir.actions.act_window,name:sale.action_sale_installer
-#: view:sale.config.picking_policy:0
-#: view:sale.installer:0
-msgid "Sales Application Configuration"
-msgstr "Configuration de l'application des ventes"
+#: code:addons/sale/sale.py:413
+#, python-format
+msgid "There is no sales journal defined for this company: \"%s\" (id:%d)"
+msgstr ""
+"Il n'y a pas de journal de vente définit pour cette société : \"%s\" "
+"(identifiant : %d)"
#. module: sale
-#: view:sale.report:0
-#: field:sale.report,price_total:0
-msgid "Total Price"
-msgstr "Prix total"
+#: model:process.transition.action,name:sale.process_transition_action_forceassignation0
+msgid "Force Assignation"
+msgstr "Forcer l'assignation"
#. module: sale
#: selection:sale.order.line,type:0
@@ -1033,6 +1084,11 @@ msgid "Based on the shipped or on the ordered quantities."
msgstr "Basé sur les quantités expédiées ou commandées"
#. module: sale
+#: selection:sale.order,picking_policy:0
+msgid "Deliver all products at once"
+msgstr ""
+
+#. module: sale
#: field:sale.order,picking_ids:0
msgid "Related Picking"
msgstr "Colisage lié"
@@ -1064,9 +1120,15 @@ msgid "Create Delivery Order"
msgstr "Créer un bon de livraison"
#. module: sale
-#: field:sale.installer,delivery:0
-msgid "Delivery Costs"
-msgstr "Frais de port"
+#: code:addons/sale/sale.py:1290
+#, python-format
+msgid "Cannot delete a sales order line which is in state '%s'!"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Qty(UoS)"
+msgstr ""
#. module: sale
#: view:sale.order:0
@@ -1080,13 +1142,13 @@ msgstr "Créer un bon de transfert"
#. module: sale
#: view:sale.report:0
-msgid "Sales by Product Category"
-msgstr "Ventes par catégorie de produit"
+msgid "Ordered date of the sales order"
+msgstr ""
#. module: sale
-#: selection:sale.order,picking_policy:0
-msgid "Partial Delivery"
-msgstr "Livraison partielle"
+#: view:sale.report:0
+msgid "Sales by Product Category"
+msgstr "Ventes par catégorie de produit"
#. module: sale
#: model:process.transition,name:sale.process_transition_confirmquotation0
@@ -1094,9 +1156,10 @@ msgid "Confirm Quotation"
msgstr "Confirmer le devis"
#. module: sale
-#: help:sale.order,origin:0
-msgid "Reference of the document that generated this sales order request."
-msgstr "Référence du document qui a généré cette demande de commande."
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:63
+#, python-format
+msgid "Error"
+msgstr "Erreur"
#. module: sale
#: view:sale.order:0
@@ -1128,20 +1191,14 @@ msgid "Procurement Method"
msgstr "Méthode d'approvisionnement"
#. module: sale
-#: view:sale.config.picking_policy:0
-#: view:sale.installer:0
-msgid "title"
-msgstr "titre"
-
-#. module: sale
#: model:process.node,name:sale.process_node_packinglist0
msgid "Pick List"
msgstr "Bon de transfert"
#. module: sale
#: view:sale.order:0
-msgid "Order date"
-msgstr "Date de commande"
+msgid "Set to Draft"
+msgstr "Mettre en brouillon"
#. module: sale
#: model:process.node,note:sale.process_node_packinglist0
@@ -1149,6 +1206,85 @@ msgid "Document of the move to the output or to the customer."
msgstr "Document du mouvement vers la sortie ou vers le client."
#. module: sale
+#: model:email.template,body_text:sale.email_template_edi_sale
+msgid ""
+"\n"
+"Hello${object.partner_order_id.name and ' ' or "
+"''}${object.partner_order_id.name or ''},\n"
+"\n"
+"Here is your order confirmation for ${object.partner_id.name}:\n"
+" | Order number: *${object.name}*\n"
+" | Order total: *${object.amount_total} "
+"${object.pricelist_id.currency_id.name}*\n"
+" | Order date: ${object.date_order}\n"
+" % if object.origin:\n"
+" | Order reference: ${object.origin}\n"
+" % endif\n"
+" % if object.client_order_ref:\n"
+" | Your reference: ${object.client_order_ref}<br />\n"
+" % endif\n"
+" | Your contact: ${object.user_id.name} ${object.user_id.user_email "
+"and '<%s>'%(object.user_id.user_email) or ''}\n"
+"\n"
+"You can view the order confirmation, download it and even pay online using "
+"the following link:\n"
+" ${ctx.get('edi_web_url_view') or 'n/a'}\n"
+"\n"
+"% if object.order_policy in ('prepaid','manual') and "
+"object.company_id.paypal_account:\n"
+"<% \n"
+"comp_name = quote(object.company_id.name)\n"
+"order_name = quote(object.name)\n"
+"paypal_account = quote(object.company_id.paypal_account)\n"
+"order_amount = quote(str(object.amount_total))\n"
+"cur_name = quote(object.pricelist_id.currency_id.name)\n"
+"paypal_url = \"https://www.paypal.com/cgi-"
+"bin/webscr?cmd=_xclick&business=%s&item_name=%s%%20Order%%20%s&invoice=%s&amo"
+"unt=%s\" \\\n"
+" "
+"\"&currency_code=%s&button_subtype=services&no_note=1&bn=OpenERP_Order_PayNow"
+"_%s\" % \\\n"
+" "
+"(paypal_account,comp_name,order_name,order_name,order_amount,cur_name,cur_nam"
+"e)\n"
+"%>\n"
+"It is also possible to directly pay with Paypal:\n"
+" ${paypal_url}\n"
+"% endif\n"
+"\n"
+"If you have any question, do not hesitate to contact us.\n"
+"\n"
+"\n"
+"Thank you for choosing ${object.company_id.name}!\n"
+"\n"
+"\n"
+"--\n"
+"${object.user_id.name} ${object.user_id.user_email and "
+"'<%s>'%(object.user_id.user_email) or ''}\n"
+"${object.company_id.name}\n"
+"% if object.company_id.street:\n"
+"${object.company_id.street or ''}\n"
+"% endif\n"
+"% if object.company_id.street2:\n"
+"${object.company_id.street2}\n"
+"% endif\n"
+"% if object.company_id.city or object.company_id.zip:\n"
+"${object.company_id.zip or ''} ${object.company_id.city or ''}\n"
+"% endif\n"
+"% if object.company_id.country_id:\n"
+"${object.company_id.state_id and ('%s, ' % object.company_id.state_id.name) "
+"or ''} ${object.company_id.country_id.name or ''}\n"
+"% endif\n"
+"% if object.company_id.phone:\n"
+"Phone: ${object.company_id.phone}\n"
+"% endif\n"
+"% if object.company_id.website:\n"
+"${object.company_id.website or ''}\n"
+"% endif\n"
+" "
+msgstr ""
+
+#. module: sale
#: model:process.transition.action,name:sale.process_transition_action_validate0
msgid "Validate"
msgstr "Valider"
@@ -1171,9 +1307,9 @@ msgid "Taxes"
msgstr "Taxes"
#. module: sale
-#: field:sale.order,order_policy:0
-msgid "Shipping Policy"
-msgstr "Politique d'expédition"
+#: view:sale.order:0
+msgid "Sales Order ready to be invoiced"
+msgstr ""
#. module: sale
#: help:sale.order,create_date:0
@@ -1192,9 +1328,9 @@ msgid "Create Invoices"
msgstr "Créer les factures"
#. module: sale
-#: view:sale.order:0
-msgid "Extra Info"
-msgstr "Info supplémentaires"
+#: view:sale.report:0
+msgid "Sales order created in current month"
+msgstr ""
#. module: sale
#: report:sale.order:0
@@ -1202,11 +1338,24 @@ msgid "Fax :"
msgstr "Fax :"
#. module: sale
+#: help:sale.order.line,type:0
+msgid ""
+"If 'on order', it triggers a procurement when the sale order is confirmed to "
+"create a task, purchase order or manufacturing order linked to this sale "
+"order line."
+msgstr ""
+
+#. module: sale
#: field:sale.advance.payment.inv,amount:0
msgid "Advance Amount"
msgstr "Montant anticipé"
#. module: sale
+#: field:sale.config.picking_policy,charge_delivery:0
+msgid "Do you charge the delivery?"
+msgstr ""
+
+#. module: sale
#: selection:sale.order,invoice_quantity:0
msgid "Shipped Quantities"
msgstr "Quantités livrées"
@@ -1217,25 +1366,45 @@ msgid "Invoice Based on Sales Orders"
msgstr "Facturation basée sur les commandes"
#. module: sale
+#: code:addons/sale/sale.py:331
+#, python-format
+msgid ""
+"If you change the pricelist of this order (and eventually the currency), "
+"prices of existing order lines will not be updated."
+msgstr ""
+
+#. module: sale
#: model:ir.model,name:sale.model_stock_picking
msgid "Picking List"
msgstr "Bon de transfert"
#. module: sale
-#: code:addons/sale/sale.py:387
-#: code:addons/sale/sale.py:920
-#: code:addons/sale/sale.py:938
+#: code:addons/sale/sale.py:412
+#: code:addons/sale/sale.py:503
+#: code:addons/sale/sale.py:632
+#: code:addons/sale/sale.py:1015
+#: code:addons/sale/sale.py:1033
#, python-format
msgid "Error !"
msgstr "Erreur !"
#. module: sale
-#: code:addons/sale/sale.py:570
+#: code:addons/sale/sale.py:603
#, python-format
msgid "Could not cancel sales order !"
msgstr "Vous ne pouvez pas annuler le bon de commande !"
#. module: sale
+#: view:sale.order:0
+msgid "Qty(UoM)"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered Year of the sales order"
+msgstr ""
+
+#. module: sale
#: selection:sale.report,month:0
msgid "July"
msgstr "Juillet"
@@ -1252,36 +1421,26 @@ msgid "Shipping Exception"
msgstr "Incident d'expédition"
#. module: sale
-#: field:sale.make.invoice,grouped:0
-msgid "Group the invoices"
-msgstr "Grouper les factures"
-
-#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Shipping & Manual Invoice"
-msgstr "Livraison et facture manuelle"
-
-#. module: sale
-#: code:addons/sale/sale.py:1051
+#: code:addons/sale/sale.py:1143
#, python-format
-msgid "Picking Information !"
-msgstr "Informations de préparation !"
+msgid "Picking Information ! : "
+msgstr ""
#. module: sale
-#: view:sale.report:0
-#: field:sale.report,month:0
-msgid "Month"
-msgstr "Mois"
+#: field:sale.make.invoice,grouped:0
+msgid "Group the invoices"
+msgstr "Grouper les factures"
#. module: sale
-#: model:ir.module.module,shortdesc:sale.module_meta_information
-msgid "Sales Management"
-msgstr "Gestion des ventes"
+#: field:sale.order,order_policy:0
+msgid "Invoice Policy"
+msgstr ""
#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Invoice From The Picking"
-msgstr "Facturation depuis la préparation"
+#: model:ir.actions.act_window,name:sale.action_config_picking_policy
+#: view:sale.config.picking_policy:0
+msgid "Setup your Invoicing Method"
+msgstr ""
#. module: sale
#: model:process.node,note:sale.process_node_invoice0
@@ -1290,32 +1449,31 @@ msgstr "À vérifier par le comptable."
#. module: sale
#: view:sale.report:0
-#: field:sale.report,uom_name:0
msgid "Reference UoM"
msgstr "UdM référence"
#. module: sale
+#: view:sale.config.picking_policy:0
+msgid ""
+"This tool will help you to install the right module and configure the system "
+"according to the method you use to invoice your customers."
+msgstr ""
+
+#. module: sale
#: model:ir.model,name:sale.model_sale_order_line_make_invoice
msgid "Sale OrderLine Make_invoice"
msgstr "Lignes de vente : Facturer"
#. module: sale
-#: help:sale.config.picking_policy,step:0
-msgid ""
-"By default, OpenERP is able to manage complex routing and paths of products "
-"in your warehouse and partner locations. This will configure the most common "
-"and simple methods to deliver products to the customer in one or two "
-"operations by the worker."
-msgstr ""
-"Par défaut, OpenERP est capable de gérer des circuits et des chemins "
-"complexes pour les produits dans votre entrepôts et chez vos partenaires. "
-"Ceci va configurer les méthodes les plus communes et les plus simples pour "
-"livrer les produits au client : en une ou en deux opération(s)."
+#: selection:sale.order,state:0
+#: selection:sale.report,state:0
+msgid "Invoice Exception"
+msgstr "Incident de facturation"
#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_tree
-msgid "Old Quotations"
-msgstr "Anciens devis"
+#: model:process.node,note:sale.process_node_saleorder0
+msgid "Drives procurement and invoicing"
+msgstr "Pilote l'approvisionnement et la facturation"
#. module: sale
#: field:sale.order,invoiced:0
@@ -1330,6 +1488,22 @@ msgid "Sales Analysis"
msgstr "Analyse des ventes"
#. module: sale
+#: code:addons/sale/sale.py:1138
+#, python-format
+msgid ""
+"You selected a quantity of %d Units.\n"
+"But it's not compatible with the selected packaging.\n"
+"Here is a proposition of quantities according to the packaging:\n"
+"EAN: %s Quantity: %s Type of ul: %s"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Recreate Packing"
+msgstr "Régénérer la liste de colisage"
+
+#. module: sale
+#: view:sale.order:0
#: field:sale.order.line,property_ids:0
msgid "Properties"
msgstr "Propriétés"
@@ -1362,7 +1536,17 @@ msgstr ""
"expéditions."
#. module: sale
-#: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
+#: view:sale.order.line:0
+msgid "Confirmed sale order lines, not yet delivered"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:473
+#, python-format
+msgid "Customer Invoices"
+msgstr ""
+
+#. module: sale
#: model:process.process,name:sale.process_process_salesprocess0
#: view:sale.order:0
#: view:sale.report:0
@@ -1384,18 +1568,13 @@ msgid "Done"
msgstr "Terminée"
#. module: sale
-#: model:ir.model,name:sale.model_sale_installer
-msgid "sale.installer"
-msgstr "sale.installer"
-
-#. module: sale
#: model:process.node,name:sale.process_node_invoice0
#: model:process.node,name:sale.process_node_invoiceafterdelivery0
msgid "Invoice"
msgstr "Facture"
#. module: sale
-#: code:addons/sale/sale.py:1014
+#: code:addons/sale/sale.py:1158
#, python-format
msgid ""
"You have to select a customer in the sales form !\n"
@@ -1405,11 +1584,6 @@ msgstr ""
"Veuillez configurer un client avant de choisir un produit."
#. module: sale
-#: selection:sale.config.picking_policy,step:0
-msgid "Picking List & Delivery Order"
-msgstr "Bon de préparation + bon de livraison"
-
-#. module: sale
#: field:sale.order,origin:0
msgid "Source Document"
msgstr "Document d'origine"
@@ -1435,7 +1609,7 @@ msgid "The amount without tax."
msgstr "Le total hors-taxe"
#. module: sale
-#: code:addons/sale/sale.py:571
+#: code:addons/sale/sale.py:604
#, python-format
msgid "You must first cancel all picking attached to this sales order."
msgstr ""
@@ -1448,9 +1622,15 @@ msgid "Sales Advance Payment Invoice"
msgstr "Facture de paiement d'avance"
#. module: sale
-#: field:sale.order,incoterm:0
-msgid "Incoterm"
-msgstr "Incoterm"
+#: view:sale.report:0
+#: field:sale.report,month:0
+msgid "Month"
+msgstr "Mois"
+
+#. module: sale
+#: model:email.template,subject:sale.email_template_edi_sale
+msgid "${object.company_id.name} Order (Ref ${object.name or 'n/a' })"
+msgstr ""
#. module: sale
#: view:sale.order.line:0
@@ -1461,11 +1641,6 @@ msgid "Product"
msgstr "Produit"
#. module: sale
-#: model:ir.ui.menu,name:sale.menu_invoiced
-msgid "Invoicing"
-msgstr "Facturation"
-
-#. module: sale
#: model:process.transition.action,name:sale.process_transition_action_cancelassignation0
msgid "Cancel Assignation"
msgstr "Annuler l'assignation"
@@ -1476,23 +1651,11 @@ msgid "sale.config.picking_policy"
msgstr "sale.config.picking_policy"
#. module: sale
-#: help:sale.order,state:0
-msgid ""
-"Gives the state of the quotation or sales order. \n"
-"The exception state is automatically set when a cancel operation occurs in "
-"the invoice validation (Invoice Exception) or in the picking list process "
-"(Shipping Exception). \n"
-"The 'Waiting Schedule' state is set when the invoice is confirmed but "
-"waiting for the scheduler to run on the date 'Ordered Date'."
+#: view:account.invoice.report:0
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_turnover_by_month
+msgid "Monthly Turnover"
msgstr ""
-"Donne l'état du devis ou du bon de commande.\n"
-"L'état 'Exception' est automatiquement positionné quand une opération "
-"annulée intervient dans la validation de la facture (Exception de la "
-"facture) ou dans le processus de traitement de la liste de préparation "
-"(Exception lors de la préparation). \n"
-"L'état 'En attente de l'ordonnanceur' est positionné quand la facture est "
-"confirmée mais attend le lancement de l'ordonnanceur à la date 'Date de la "
-"commande'."
#. module: sale
#: field:sale.order,invoice_quantity:0
@@ -1510,7 +1673,6 @@ msgid "Product UoS"
msgstr "UdV du produit"
#. module: sale
-#: selection:sale.order,state:0
#: selection:sale.report,state:0
msgid "Manual In Progress"
msgstr "Manuelle en cours"
@@ -1526,7 +1688,8 @@ msgid "Order"
msgstr "Commande"
#. module: sale
-#: code:addons/sale/sale.py:921
+#: code:addons/sale/sale.py:1016
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:71
#, python-format
msgid "There is no income account defined for this product: \"%s\" (id:%d)"
msgstr ""
@@ -1552,7 +1715,7 @@ msgstr ""
"livraison dès qu'il a été confirmé par le commercial."
#. module: sale
-#: code:addons/sale/sale.py:1116
+#: code:addons/sale/sale.py:1238
#, python-format
msgid ""
"You plan to sell %.2f %s but you only have %.2f %s available !\n"
@@ -1584,12 +1747,10 @@ msgid "Total"
msgstr "Total"
#. module: sale
-#: code:addons/sale/sale.py:388
-#, python-format
-msgid "There is no sales journal defined for this company: \"%s\" (id:%d)"
-msgstr ""
-"Il n'y a pas de journal de vente définit pour cette société : \"%s\" "
-"(identifiant : %d)"
+#: report:sale.order:0
+#: view:sale.order.line:0
+msgid "Price"
+msgstr "Prix"
#. module: sale
#: model:process.transition,note:sale.process_transition_deliver0
@@ -1603,10 +1764,15 @@ msgstr ""
"automatiquement."
#. module: sale
-#: code:addons/sale/sale.py:1165
-#, python-format
-msgid "Cannot delete a sales order line which is %s !"
-msgstr "Vous ne pouvez pas supprimer les lignes de vente qui est %s !"
+#: selection:sale.order,order_policy:0
+msgid "Pay before delivery"
+msgstr ""
+
+#. module: sale
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.open_board_sales
+msgid "Sales Dashboard"
+msgstr ""
#. module: sale
#: model:ir.actions.act_window,name:sale.action_sale_order_make_invoice
@@ -1617,6 +1783,7 @@ msgstr "Générer les factures"
#. module: sale
#: view:sale.order:0
+#: selection:sale.order,state:0
#: view:sale.order.line:0
msgid "To Invoice"
msgstr "À facturer"
@@ -1627,6 +1794,11 @@ msgid "Date on which sales order is confirmed."
msgstr "Date à laquelle le bon de commande est confirmé."
#. module: sale
+#: field:sale.order,project_id:0
+msgid "Contract/Analytic Account"
+msgstr ""
+
+#. module: sale
#: field:sale.order,company_id:0
#: field:sale.order.line,company_id:0
#: view:sale.report:0
@@ -1646,10 +1818,12 @@ msgid "The amount to be invoiced in advance."
msgstr "Le montant à facturer par anticipation"
#. module: sale
-#: selection:sale.order,state:0
-#: selection:sale.report,state:0
-msgid "Invoice Exception"
-msgstr "Incident de facturation"
+#: code:addons/sale/sale.py:1256
+#, python-format
+msgid ""
+"Couldn't find a pricelist line matching this product and quantity.\n"
+"You have to change either the product, the quantity or the pricelist."
+msgstr ""
#. module: sale
#: help:sale.order,picking_ids:0
@@ -1660,15 +1834,6 @@ msgstr ""
"commande."
#. module: sale
-#: help:sale.installer,sale_margin:0
-msgid ""
-"Gives the margin of profitability by calculating the difference between Unit "
-"Price and Cost Price."
-msgstr ""
-"Donne la marge de rentabilité en calculant la différence entre le prix "
-"unitaire et le coût."
-
-#. module: sale
#: view:sale.make.invoice:0
#: view:sale.order.line.make.invoice:0
msgid "Create invoices"
@@ -1687,6 +1852,11 @@ msgid "Cancelled"
msgstr "Annuler"
#. module: sale
+#: view:sale.order.line:0
+msgid "Sales Order Lines related to a Sales Order of mine"
+msgstr ""
+
+#. module: sale
#: model:ir.actions.act_window,name:sale.action_shop_form
#: model:ir.ui.menu,name:sale.menu_action_shop_form
#: field:sale.order,shop_id:0
@@ -1696,17 +1866,12 @@ msgid "Shop"
msgstr "Magasin"
#. module: sale
-#: view:sale.report:0
-msgid " Month "
-msgstr " Mois "
-
-#. module: sale
#: field:sale.report,date_confirm:0
msgid "Date Confirm"
msgstr "Date de confirmation"
#. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:111
+#: code:addons/sale/wizard/sale_line_invoice.py:113
#, python-format
msgid "Warning"
msgstr "Attention"
@@ -1718,22 +1883,6 @@ msgid "Sales by Month"
msgstr "Ventes par mois"
#. module: sale
-#: code:addons/sale/sale.py:1045
-#, python-format
-msgid ""
-"You selected a quantity of %d Units.\n"
-"But it's not compatible with the selected packaging.\n"
-"Here is a proposition of quantities according to the packaging:\n"
-"\n"
-"EAN: %s Quantity: %s Type of ul: %s"
-msgstr ""
-"Vous avez sélectionné une quantité de %d unités.\n"
-"Mais ce n'est pas compatible avec l'emballage sélectionné.\n"
-"Ceci est une proposition des quantités en fonction de l'emballage :\n"
-"\n"
-"EAN : %s - Quantité : %s - Type d'unité logistique : %s"
-
-#. module: sale
#: model:ir.model,name:sale.model_sale_order
#: model:process.node,name:sale.process_node_order0
#: model:process.node,name:sale.process_node_saleorder0
@@ -1749,6 +1898,11 @@ msgid "Quantity (UoS)"
msgstr "Quantité (UdV)"
#. module: sale
+#: view:sale.order.line:0
+msgid "Sale Order Lines that are in 'done' state"
+msgstr ""
+
+#. module: sale
#: model:process.transition,note:sale.process_transition_packing0
msgid ""
"The Pick List form is created as soon as the sales order is confirmed, in "
@@ -1767,6 +1921,11 @@ msgid "Confirmed"
msgstr "Confirmée"
#. module: sale
+#: field:sale.config.picking_policy,order_policy:0
+msgid "Main Method Based On"
+msgstr ""
+
+#. module: sale
#: model:process.transition.action,name:sale.process_transition_action_confirm0
msgid "Confirm"
msgstr "Confirmer"
@@ -1789,6 +1948,7 @@ msgid "Invoice Lines"
msgstr "Lignes de facture"
#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_product_tree
#: view:sale.order:0
#: view:sale.order.line:0
msgid "Sales Order Lines"
@@ -1805,33 +1965,18 @@ msgid "Configuration"
msgstr "Configuration"
#. module: sale
-#: selection:sale.order,picking_policy:0
-msgid "Complete Delivery"
-msgstr "Livraison complète"
+#: code:addons/sale/edi/sale_order.py:146
+#, python-format
+msgid "EDI Pricelist (%s)"
+msgstr ""
#. module: sale
#: view:sale.report:0
-msgid " Month-1 "
-msgstr " Mois -1 "
-
-#. module: sale
-#: help:sale.config.picking_policy,picking_policy:0
-msgid ""
-"The Shipping Policy is used to configure per order if you want to deliver as "
-"soon as possible when one product is available or you wait that all products "
-"are available.."
+msgid "Sales order created in current year"
msgstr ""
-"La politique de livraison est utilisée pour configurer, par commande, si "
-"vous voulez livrer dés que possible lorsqu'un produit est disponible ou si "
-"vous attendez que tous les produits soient disponibles."
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "August"
-msgstr "Août"
#. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:111
+#: code:addons/sale/wizard/sale_line_invoice.py:113
#, python-format
msgid ""
"Invoice cannot be created for this Sales Order Line due to one of the "
@@ -1846,6 +1991,11 @@ msgstr ""
"2. La ligne de vente est déjà facturée !"
#. module: sale
+#: view:sale.order.line:0
+msgid "Sale order lines done"
+msgstr ""
+
+#. module: sale
#: field:sale.order.line,th_weight:0
msgid "Weight"
msgstr "Poids brut"
@@ -1864,7 +2014,6 @@ msgstr "Décembre"
#. module: sale
#: field:sale.config.picking_policy,config_logo:0
-#: field:sale.installer,config_logo:0
msgid "Image"
msgstr "Image"
@@ -1898,9 +2047,9 @@ msgid "Salesman"
msgstr "Vendeur"
#. module: sale
-#: model:process.node,note:sale.process_node_saleorder0
-msgid "Drives procurement and invoicing"
-msgstr "Pilote l'approvisionnement et la facturation"
+#: model:ir.actions.act_window,name:sale.action_order_tree
+msgid "Old Quotations"
+msgstr "Anciens devis"
#. module: sale
#: field:sale.order,amount_untaxed:0
@@ -1908,7 +2057,7 @@ msgid "Untaxed Amount"
msgstr "Montant hors-taxe"
#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:163
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:170
#: model:ir.actions.act_window,name:sale.action_view_sale_advance_payment_inv
#: view:sale.advance.payment.inv:0
#: view:sale.order:0
@@ -1917,7 +2066,7 @@ msgid "Advance Invoice"
msgstr "Facture Anticipée"
#. module: sale
-#: code:addons/sale/sale.py:591
+#: code:addons/sale/sale.py:624
#, python-format
msgid "The sales order '%s' has been cancelled."
msgstr "Le bon de commande \"%sé a été annulé."
@@ -1961,20 +2110,20 @@ msgid "Packings"
msgstr "Colisages"
#. module: sale
-#: field:sale.config.picking_policy,progress:0
-#: field:sale.installer,progress:0
-msgid "Configuration Progress"
-msgstr "Progression de la Configuration"
+#: view:sale.order.line:0
+msgid "Sale Order Lines ready to be invoiced"
+msgstr ""
#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_product_tree
-msgid "Product sales"
-msgstr "Ventes de produit"
+#: view:sale.report:0
+msgid "Sales order created in last month"
+msgstr ""
#. module: sale
-#: field:sale.order,date_order:0
-msgid "Ordered Date"
-msgstr "Date de commande"
+#: model:ir.actions.act_window,name:sale.action_email_templates
+#: model:ir.ui.menu,name:sale.menu_email_templates
+msgid "Email Templates"
+msgstr ""
#. module: sale
#: model:ir.actions.act_window,name:sale.action_order_form
@@ -1984,14 +2133,15 @@ msgid "Sales Orders"
msgstr "Bons de commande"
#. module: sale
-#: selection:sale.config.picking_policy,picking_policy:0
-msgid "Direct Delivery"
-msgstr "Livraison directe"
+#: model:ir.model,name:sale.model_sale_shop
+#: view:sale.shop:0
+msgid "Sales Shop"
+msgstr "Magasin"
#. module: sale
-#: field:sale.installer,sale_journal:0
-msgid "Invoicing journals"
-msgstr "Journaux de facturation"
+#: selection:sale.report,month:0
+msgid "November"
+msgstr "Novembre"
#. module: sale
#: field:sale.advance.payment.inv,product_id:0
@@ -1999,18 +2149,12 @@ msgid "Advance Product"
msgstr "Produit avancé"
#. module: sale
-#: view:sale.report:0
-#: field:sale.report,shipped_qty_1:0
-msgid "Shipped Qty"
-msgstr "Qté expédiée"
-
-#. module: sale
-#: view:sale.open.invoice:0
-msgid "You invoice has been successfully created!"
-msgstr "Votre facture a été créée avec succès !"
+#: view:sale.order:0
+msgid "Compute"
+msgstr "Calculer"
#. module: sale
-#: code:addons/sale/sale.py:585
+#: code:addons/sale/sale.py:618
#, python-format
msgid "You must first cancel all invoices attached to this sales order."
msgstr ""
@@ -2023,25 +2167,14 @@ msgid "January"
msgstr "Janvier"
#. module: sale
-#: view:sale.installer:0
-msgid "Configure Your Sales Management Application"
-msgstr "Configurez votre application de gestion des ventes"
-
-#. module: sale
#: model:ir.actions.act_window,name:sale.action_order_tree4
msgid "Sales Order in Progress"
msgstr "Bons de commande en cours"
#. module: sale
-#: field:sale.installer,sale_layout:0
-msgid "Sales Order Layout Improvement"
-msgstr "Amélioration de la disposition des bons de commande"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:63
-#, python-format
-msgid "Error"
-msgstr "Erreur"
+#: help:sale.order,origin:0
+msgid "Reference of the document that generated this sales order request."
+msgstr "Référence du document qui a généré cette demande de commande."
#. module: sale
#: view:sale.report:0
@@ -2050,6 +2183,11 @@ msgid "Commitment Delay"
msgstr "Période d'engagement"
#. module: sale
+#: selection:sale.order,order_policy:0
+msgid "Deliver & invoice on demand"
+msgstr ""
+
+#. module: sale
#: model:process.node,note:sale.process_node_saleprocurement0
msgid ""
"One Procurement order for each sales order line and for each of the "
@@ -2074,14 +2212,12 @@ msgid "Confirmed sales order to invoice."
msgstr "Bons de commande confirmé à facturer."
#. module: sale
-#: code:addons/sale/sale.py:290
-#, python-format
-msgid "Cannot delete Sales Order(s) which are already confirmed !"
+#: view:sale.order:0
+msgid "Sales Order that haven't yet been confirmed"
msgstr ""
-"Vous ne pouvez pas supprimer les bons de commande qui sont déjà confirmés !"
#. module: sale
-#: code:addons/sale/sale.py:316
+#: code:addons/sale/sale.py:322
#, python-format
msgid "The sales order '%s' has been set in draft state."
msgstr "Le bon de commande \"%s\" a bien été mis à l'état \"Brouillon\"."
@@ -2092,37 +2228,27 @@ msgid "from stock"
msgstr "Depuis le stock"
#. module: sale
-#: field:sale.config.picking_policy,order_policy:0
-msgid "Shipping Default Policy"
-msgstr "Politique de livraison par défaut"
-
-#. module: sale
#: view:sale.open.invoice:0
msgid "Close"
msgstr "Fermer"
#. module: sale
+#: code:addons/sale/sale.py:1248
+#, python-format
+msgid "No Pricelist ! : "
+msgstr ""
+
+#. module: sale
#: field:sale.order,shipped:0
msgid "Delivered"
msgstr "Livré"
#. module: sale
-#: code:addons/sale/sale.py:1115
-#, python-format
-msgid "Not enough stock !"
-msgstr "Pas assez de stock !"
-
-#. module: sale
#: constraint:stock.move:0
msgid "You must assign a production lot for this product"
msgstr "Vous devez affecter un lot de fabrication à ce produit."
#. module: sale
-#: field:sale.order.line,sequence:0
-msgid "Layout Sequence"
-msgstr "Séquence de disposition"
-
-#. module: sale
#: model:ir.actions.act_window,help:sale.action_shop_form
msgid ""
"If you have more than one shop reselling your company products, you can "
@@ -2154,13 +2280,6 @@ msgid "May"
msgstr "Mai"
#. module: sale
-#: help:sale.installer,sale_order_dates:0
-msgid "Adds commitment, requested and effective dates on Sales Orders."
-msgstr ""
-"Ajoute les dates d'engagement, désirées et effectives sur les bons de "
-"commandes."
-
-#. module: sale
#: view:sale.order:0
#: field:sale.order,partner_id:0
#: field:sale.order.line,order_partner_id:0
@@ -2168,25 +2287,11 @@ msgid "Customer"
msgstr "Client"
#. module: sale
-#: model:product.template,name:sale.advance_product_0_product_template
-msgid "Advance"
-msgstr "Avancé"
-
-#. module: sale
#: selection:sale.report,month:0
msgid "February"
msgstr "Février"
#. module: sale
-#: help:sale.installer,sale_journal:0
-msgid ""
-"Allows you to group and invoice your delivery orders according to different "
-"invoicing types: daily, weekly, etc."
-msgstr ""
-"Vous permet de regrouper et de facturer vos bons de livraison selon les "
-"différents types de facturation : quotidien, hebdomadaire, etc."
-
-#. module: sale
#: selection:sale.report,month:0
msgid "April"
msgstr "Avril"
@@ -2197,11 +2302,6 @@ msgid "Accounting"
msgstr "Comptabilité"
#. module: sale
-#: field:sale.config.picking_policy,step:0
-msgid "Steps To Deliver a Sales Order"
-msgstr "Étapes pour livrer les commandes"
-
-#. module: sale
#: view:sale.order:0
#: view:sale.order.line:0
msgid "Search Sales Order"
@@ -2213,20 +2313,18 @@ msgid "Sales Order Requisition"
msgstr "Réquisition du bon de commande"
#. module: sale
+#: code:addons/sale/sale.py:1242
+#, python-format
+msgid "Not enough stock ! : "
+msgstr ""
+
+#. module: sale
#: report:sale.order:0
#: field:sale.order,payment_term:0
msgid "Payment Term"
msgstr "Condition de règlement"
#. module: sale
-#: help:sale.installer,sale_layout:0
-msgid ""
-"Provides some features to improve the layout of the Sales Order reports."
-msgstr ""
-"Fournit quelques fonctionnalités pour améliorer la disposition des rapports "
-"de commandes de ventes."
-
-#. module: sale
#: model:ir.actions.act_window,help:sale.action_order_report_all
msgid ""
"This report performs analysis on your quotations and sales orders. Analysis "
@@ -2277,6 +2375,9 @@ msgstr "Facture basée sur les livraisons"
#~ "Quand le bouton \"confirmer\" est pressé, l'état passe de brouillon à "
#~ "manuel, c'est à dire que le devis est transformé en commande."
+#~ msgid "Shipping Policy"
+#~ msgstr "Politique d'expédition"
+
#~ msgid "Outgoing Products"
#~ msgstr "Produits à expédier"
@@ -2298,6 +2399,9 @@ msgstr "Facture basée sur les livraisons"
#~ msgid "Procure Method"
#~ msgstr "Méthode d'approvisionnement"
+#~ msgid "Payment Before Delivery"
+#~ msgstr "Règlement avant livraison"
+
#~ msgid "Payment Terms"
#~ msgstr "Conditions de règlement"
@@ -2307,6 +2411,9 @@ msgstr "Facture basée sur les livraisons"
#~ msgid "Quotation (A sale order in draft state)"
#~ msgstr "Devis (une commande en brouillon)"
+#~ msgid "Shipping Default Policy"
+#~ msgstr "Politique de livraison par défaut"
+
#~ msgid "Sale Procurement"
#~ msgstr "Approvisionnement des ventes"
@@ -2368,6 +2475,9 @@ msgstr "Facture basée sur les livraisons"
#~ "La liste de colisages est créée quand on clique sur le bouton « Assigner » "
#~ "après confirmation de la commande client."
+#~ msgid "Partial Delivery"
+#~ msgstr "Livraison partielle"
+
#~ msgid "Recreate Procurement"
#~ msgstr "Recréer l'approvisionnement"
@@ -2396,6 +2506,9 @@ msgstr "Facture basée sur les livraisons"
#~ msgid "Reference"
#~ msgstr "Référence"
+#~ msgid "All at Once"
+#~ msgstr "Tout d'un coup"
+
#~ msgid "Net Price"
#~ msgstr "Prix net"
@@ -2411,6 +2524,9 @@ msgstr "Facture basée sur les livraisons"
#~ msgid "My sales order waiting Invoice"
#~ msgstr "Mes commandes en attente de facturation"
+#~ msgid "Complete Delivery"
+#~ msgstr "Livraison complète"
+
#~ msgid "Manual Description"
#~ msgstr "Description manuelle"
@@ -2435,9 +2551,6 @@ msgstr "Facture basée sur les livraisons"
#~ msgid "Draft customer invoice, to be reviewed by accountant."
#~ msgstr "Facture client en brouillon, doit être vérifier par le comptable"
-#~ msgid "My Quotations"
-#~ msgstr "Mes devis"
-
#~ msgid "Manages the delivery and invoicing progress"
#~ msgstr "Gerer le suivi des livraisons et des factures"
@@ -2460,12 +2573,18 @@ msgstr "Facture basée sur les livraisons"
#~ msgid "Procurement Corrected"
#~ msgstr "Approvisionnement corrigé"
+#~ msgid "Shipping & Manual Invoice"
+#~ msgstr "Livraison et facture manuelle"
+
#~ msgid "Status"
#~ msgstr "État"
#~ msgid "Packing Policy"
#~ msgstr "Politique de Colisage"
+#~ msgid "Product sales"
+#~ msgstr "Ventes de produit"
+
#~ msgid "Our Salesman"
#~ msgstr "Notre Vendeur"
@@ -2478,6 +2597,9 @@ msgstr "Facture basée sur les livraisons"
#~ msgid "Sale Pricelists"
#~ msgstr "Liste de prix de ventes"
+#~ msgid "Direct Delivery"
+#~ msgstr "Livraison directe"
+
#~ msgid "Make Invoice"
#~ msgstr "Créer facture"
@@ -2523,6 +2645,9 @@ msgstr "Facture basée sur les livraisons"
#~ msgid "Sale Invoice"
#~ msgstr "Facture de vente"
+#~ msgid "Sales Management"
+#~ msgstr "Gestion des ventes"
+
#~ msgid "Deliver"
#~ msgstr "Livraison"
@@ -2664,9 +2789,277 @@ msgstr "Facture basée sur les livraisons"
#~ msgid "Related Packing"
#~ msgstr "Colisage lié"
+#~ msgid "Allows you to compute delivery costs on your quotations."
+#~ msgstr "Vous permet de calculer les frais de livraison sur vos devis."
+
+#~ msgid " Year "
+#~ msgstr " Année "
+
+#~ msgid "Sales Order Dates"
+#~ msgstr "Dates de commande de ventes"
+
+#~ msgid "title"
+#~ msgstr "titre"
+
+#~ msgid "Order date"
+#~ msgstr "Date de commande"
+
+#~ msgid "Invoicing"
+#~ msgstr "Facturation"
+
+#~ msgid " Month "
+#~ msgstr " Mois "
+
+#~ msgid "Invoicing journals"
+#~ msgstr "Journaux de facturation"
+
+#~ msgid "Ordered Date"
+#~ msgstr "Date de commande"
+
+#~ msgid "Shipped Qty"
+#~ msgstr "Qté expédiée"
+
+#~ msgid "Sales Application Configuration"
+#~ msgstr "Configuration de l'application des ventes"
+
+#~ msgid ""
+#~ "Provides some features to improve the layout of the Sales Order reports."
+#~ msgstr ""
+#~ "Fournit quelques fonctionnalités pour améliorer la disposition des rapports "
+#~ "de commandes de ventes."
+
+#~ msgid "sale.installer"
+#~ msgstr "sale.installer"
+
+#~ msgid ""
+#~ "Gives the margin of profitability by calculating the difference between Unit "
+#~ "Price and Cost Price."
+#~ msgstr ""
+#~ "Donne la marge de rentabilité en calculant la différence entre le prix "
+#~ "unitaire et le coût."
+
+#, python-format
+#~ msgid "Not enough stock !"
+#~ msgstr "Pas assez de stock !"
+
+#~ msgid "Delivery Costs"
+#~ msgstr "Frais de port"
+
#~ msgid "Steps To Deliver a Sale Order"
#~ msgstr "Étapes pour livrer un commande de vente"
+#~ msgid " Month-1 "
+#~ msgstr " Mois -1 "
+
+#, python-format
+#~ msgid "Picking Information !"
+#~ msgstr "Informations de préparation !"
+
#~ msgid ""
#~ "This is the list of picking list that have been generated for this invoice"
#~ msgstr "C'est la liste des expéditions générées pour cette commande"
+
+#~ msgid "Configuration Progress"
+#~ msgstr "Progression de la Configuration"
+
+#~ msgid "Sales Order Layout Improvement"
+#~ msgstr "Amélioration de la disposition des bons de commande"
+
+#~ msgid "Adds commitment, requested and effective dates on Sales Orders."
+#~ msgstr ""
+#~ "Ajoute les dates d'engagement, désirées et effectives sur les bons de "
+#~ "commandes."
+
+#~ msgid ""
+#~ "Allows you to group and invoice your delivery orders according to different "
+#~ "invoicing types: daily, weekly, etc."
+#~ msgstr ""
+#~ "Vous permet de regrouper et de facturer vos bons de livraison selon les "
+#~ "différents types de facturation : quotidien, hebdomadaire, etc."
+
+#~ msgid ""
+#~ "The Shipping Policy is used to configure per order if you want to deliver as "
+#~ "soon as possible when one product is available or you wait that all products "
+#~ "are available.."
+#~ msgstr ""
+#~ "La politique de livraison est utilisée pour configurer, par commande, si "
+#~ "vous voulez livrer dés que possible lorsqu'un produit est disponible ou si "
+#~ "vous attendez que tous les produits soient disponibles."
+
+#~ msgid "Margins in Sales Orders"
+#~ msgstr "Marges sur bons de commandes"
+
+#~ msgid ""
+#~ "By default, OpenERP is able to manage complex routing and paths of products "
+#~ "in your warehouse and partner locations. This will configure the most common "
+#~ "and simple methods to deliver products to the customer in one or two "
+#~ "operations by the worker."
+#~ msgstr ""
+#~ "Par défaut, OpenERP est capable de gérer des circuits et des chemins "
+#~ "complexes pour les produits dans votre entrepôts et chez vos partenaires. "
+#~ "Ceci va configurer les méthodes les plus communes et les plus simples pour "
+#~ "livrer les produits au client : en une ou en deux opération(s)."
+
+#~ msgid "Configure"
+#~ msgstr "Configurer"
+
+#~ msgid "Order Reference must be unique !"
+#~ msgstr "La référence de la commande doit être unique !"
+
+#~ msgid "Enhance your core Sales Application with additional functionalities."
+#~ msgstr ""
+#~ "Complétez l'application \"Ventes\" avec de nouvelles fonctionnalités."
+
+#~ msgid "Configure Sales Order Logistics"
+#~ msgstr "Paramétrez la logistique des ventes"
+
+#~ msgid "Invoice On Order After Delivery"
+#~ msgstr "Facturation sur le bon de commande après la livraison"
+
+#~ msgid ""
+#~ "\n"
+#~ " The base module to manage quotations and sales orders.\n"
+#~ "\n"
+#~ " * Workflow with validation steps:\n"
+#~ " - Quotation -> Sales order -> Invoice\n"
+#~ " * Invoicing methods:\n"
+#~ " - Invoice on order (before or after shipping)\n"
+#~ " - Invoice on delivery\n"
+#~ " - Invoice on timesheets\n"
+#~ " - Advance invoice\n"
+#~ " * Partners preferences (shipping, invoicing, incoterm, ...)\n"
+#~ " * Products stocks and prices\n"
+#~ " * Delivery methods:\n"
+#~ " - all at once, multi-parcel\n"
+#~ " - delivery costs\n"
+#~ " * Dashboard for salesman that includes:\n"
+#~ " * Your open quotations\n"
+#~ " * Top 10 sales of the month\n"
+#~ " * Cases statistics\n"
+#~ " * Graph of sales by product\n"
+#~ " * Graph of cases of the month\n"
+#~ " "
+#~ msgstr ""
+#~ "\n"
+#~ " Le module de base pour gérer les devis et les bons de commande.\n"
+#~ "\n"
+#~ " * Flux avec étapes de validation :\n"
+#~ " - Devis -> Bon de commande -> Facture\n"
+#~ " * Méthodes de facturation :\n"
+#~ " - Facturation sur la commande (avant ou après l'expédition)\n"
+#~ " - Facturation sur la livraison\n"
+#~ " - Facturation sur les feuilles de temps\n"
+#~ " - Facture d'avance\n"
+#~ " * Préférences des partenaires (expédition, facturation, incoterm, ...)\n"
+#~ " * Stocks de produits et prix\n"
+#~ " * Méthodes de livraison :\n"
+#~ " - tout d'un coup, multi-parcelles\n"
+#~ " - coûts de livraison\n"
+#~ " * Tableau de bord pour les commerciaux qui inclue :\n"
+#~ " * Vos devis ouverts\n"
+#~ " * Le top 10 de vos ventes du mois\n"
+#~ " * Statistiques des cas\n"
+#~ " * Graphe des ventes par produits\n"
+#~ " * Graphe des cas du mois\n"
+#~ " "
+
+#~ msgid ""
+#~ "Gives the state of the quotation or sales order. \n"
+#~ "The exception state is automatically set when a cancel operation occurs in "
+#~ "the invoice validation (Invoice Exception) or in the picking list process "
+#~ "(Shipping Exception). \n"
+#~ "The 'Waiting Schedule' state is set when the invoice is confirmed but "
+#~ "waiting for the scheduler to run on the date 'Ordered Date'."
+#~ msgstr ""
+#~ "Donne l'état du devis ou du bon de commande.\n"
+#~ "L'état 'Exception' est automatiquement positionné quand une opération "
+#~ "annulée intervient dans la validation de la facture (Exception de la "
+#~ "facture) ou dans le processus de traitement de la liste de préparation "
+#~ "(Exception lors de la préparation). \n"
+#~ "L'état 'En attente de l'ordonnanceur' est positionné quand la facture est "
+#~ "confirmée mais attend le lancement de l'ordonnanceur à la date 'Date de la "
+#~ "commande'."
+
+#~ msgid "Invoice From The Picking"
+#~ msgstr "Facturation depuis la préparation"
+
+#, python-format
+#~ msgid "Cannot delete a sales order line which is %s !"
+#~ msgstr "Vous ne pouvez pas supprimer les lignes de vente qui est %s !"
+
+#, python-format
+#~ msgid ""
+#~ "You selected a quantity of %d Units.\n"
+#~ "But it's not compatible with the selected packaging.\n"
+#~ "Here is a proposition of quantities according to the packaging:\n"
+#~ "\n"
+#~ "EAN: %s Quantity: %s Type of ul: %s"
+#~ msgstr ""
+#~ "Vous avez sélectionné une quantité de %d unités.\n"
+#~ "Mais ce n'est pas compatible avec l'emballage sélectionné.\n"
+#~ "Ceci est une proposition des quantités en fonction de l'emballage :\n"
+#~ "\n"
+#~ "EAN : %s - Quantité : %s - Type d'unité logistique : %s"
+
+#~ msgid "Steps To Deliver a Sales Order"
+#~ msgstr "Étapes pour livrer les commandes"
+
+#~ msgid "Layout Sequence"
+#~ msgstr "Séquence de disposition"
+
+#, python-format
+#~ msgid "You cannot cancel a sales order line that has already been invoiced !"
+#~ msgstr ""
+#~ "Vous ne pouvez pas annuler des lignes de vente qui ont déjà été facturées !"
+
+#~ msgid "Configure Your Sales Management Application"
+#~ msgstr "Configurez votre application de gestion des ventes"
+
+#, python-format
+#~ msgid "Cannot delete Sales Order(s) which are already confirmed !"
+#~ msgstr ""
+#~ "Vous ne pouvez pas supprimer les bons de commande qui sont déjà confirmés !"
+
+#~ msgid "Setup your sales workflow and default values."
+#~ msgstr "Configurez votre workflow de vente et vos valeurs par défaut."
+
+#~ msgid ""
+#~ "The Shipping Policy is used to synchronise invoice and delivery operations.\n"
+#~ " - The 'Pay Before delivery' choice will first generate the invoice and "
+#~ "then generate the picking order after the payment of this invoice.\n"
+#~ " - The 'Shipping & Manual Invoice' will create the picking order directly "
+#~ "and wait for the user to manually click on the 'Invoice' button to generate "
+#~ "the draft invoice.\n"
+#~ " - The 'Invoice On Order After Delivery' choice will generate the draft "
+#~ "invoice based on sales order after all picking lists have been finished.\n"
+#~ " - The 'Invoice From The Picking' choice is used to create an invoice "
+#~ "during the picking process."
+#~ msgstr ""
+#~ "La politique d'expédition est utilisée pour synchroniser la facture et les "
+#~ "opérations de livraison.\n"
+#~ " - Le choix \"Paiement avant livraison\" générera en premier la facture et "
+#~ "ensuite, générera l'ordre de préparation à la suite du paiement de la "
+#~ "facture.\n"
+#~ " - Le choix \"Expédition et facturation manuelle\" créera l'ordre de "
+#~ "préparation directement et attendra que l'utilisateur clique sur le bouton "
+#~ "\"Facturer\" pour générer la facture à l'état \"Brouillon\".\n"
+#~ " - Le choix \"Facturation sur la commande après la livraison\" générera la "
+#~ "facture à l'état \"Brouillon\" basée sur les bons de commande lorsque toutes "
+#~ "les listes de préparation seront terminées.\n"
+#~ " - Le choix \"Facturation depuis la préparation\" est utilisé pour créer "
+#~ "des factures pendant le processus de préparation."
+
+#~ msgid "Advance"
+#~ msgstr "Avancé"
+
+#~ msgid "Picking Default Policy"
+#~ msgstr "Politique de colisage par défaut"
+
+#~ msgid "Configure Picking Policy for Sales Order"
+#~ msgstr "Configurer la politique de colisage pour les bons de commande"
+
+#~ msgid "Delivery Order Only"
+#~ msgstr "Bon de livraison seul"
+
+#~ msgid "Picking List & Delivery Order"
+#~ msgstr "Bon de préparation + bon de livraison"
diff --git a/addons/sale/i18n/gl.po b/addons/sale/i18n/gl.po
index 559b2b52f18..445d2189cc7 100644
--- a/addons/sale/i18n/gl.po
+++ b/addons/sale/i18n/gl.po
@@ -7,25 +7,32 @@ msgid ""
msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-01-11 11:16+0000\n"
+"POT-Creation-Date: 2011-12-22 18:43+0000\n"
"PO-Revision-Date: 2011-04-19 14:52+0000\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: Galician <gl@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-05 05:16+0000\n"
-"X-Generator: Launchpad (build 14231)\n"
+"X-Launchpad-Export-Date: 2011-12-23 06:46+0000\n"
+"X-Generator: Launchpad (build 14560)\n"
#. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_sales_by_salesman
-msgid "Sales by Salesman in last 90 days"
+#: field:sale.config.picking_policy,timesheet:0
+msgid "Based on Timesheet"
msgstr ""
#. module: sale
-#: help:sale.installer,delivery:0
-msgid "Allows you to compute delivery costs on your quotations."
+#: view:sale.order.line:0
+msgid ""
+"Sale Order Lines that are confirmed, done or in exception state and haven't "
+"yet been invoiced"
+msgstr ""
+
+#. module: sale
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_sales_by_salesman
+msgid "Sales by Salesman in last 90 days"
msgstr ""
#. module: sale
@@ -36,6 +43,11 @@ msgid ""
msgstr ""
#. module: sale
+#: view:sale.order:0
+msgid "UoS"
+msgstr ""
+
+#. module: sale
#: help:sale.order,partner_shipping_id:0
msgid "Shipping address for current sales order."
msgstr ""
@@ -59,22 +71,12 @@ msgid "Cancel Order"
msgstr ""
#. module: sale
-#: view:sale.config.picking_policy:0
-msgid "Configure Sales Order Logistics"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:603
+#: code:addons/sale/sale.py:638
#, python-format
msgid "The quotation '%s' has been converted to a sales order."
msgstr ""
#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Payment Before Delivery"
-msgstr ""
-
-#. module: sale
#: code:addons/sale/wizard/sale_make_invoice.py:42
#, python-format
msgid "Warning !"
@@ -91,12 +93,6 @@ msgid "Drives procurement orders for every sales order line."
msgstr ""
#. module: sale
-#: selection:sale.config.picking_policy,picking_policy:0
-msgid "All at Once"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,project_id:0
#: view:sale.report:0
#: field:sale.report,analytic_account_id:0
#: field:sale.shop,project_id:0
@@ -112,6 +108,15 @@ msgid ""
msgstr ""
#. module: sale
+#: code:addons/sale/sale.py:295
+#, python-format
+msgid ""
+"In order to delete a confirmed sale order, you must cancel it before ! To "
+"cancel a sale order, you must first cancel related picking or delivery "
+"orders."
+msgstr ""
+
+#. module: sale
#: model:process.node,name:sale.process_node_saleprocurement0
msgid "Procurement Order"
msgstr ""
@@ -123,6 +128,11 @@ msgid "Partner"
msgstr ""
#. module: sale
+#: selection:sale.order,order_policy:0
+msgid "Invoice based on deliveries"
+msgstr ""
+
+#. module: sale
#: view:sale.order:0
msgid "Order Line"
msgstr ""
@@ -160,8 +170,13 @@ msgid "Default Payment Term"
msgstr ""
#. module: sale
-#: model:ir.actions.act_window,name:sale.action_config_picking_policy
-msgid "Configure Picking Policy for Sales Order"
+#: field:sale.config.picking_policy,deli_orders:0
+msgid "Based on Delivery Orders"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.picking_policy,time_unit:0
+msgid "Main Working Time Unit"
msgstr ""
#. module: sale
@@ -178,8 +193,9 @@ msgid "Disc.(%)"
msgstr ""
#. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_forceassignation0
-msgid "Force Assignation"
+#: view:sale.report:0
+#: field:sale.report,price_total:0
+msgid "Total Price"
msgstr ""
#. module: sale
@@ -188,6 +204,11 @@ msgid "Check the box to group the invoices for the same customers"
msgstr ""
#. module: sale
+#: view:sale.order:0
+msgid "My Sale Orders"
+msgstr ""
+
+#. module: sale
#: selection:sale.order,invoice_quantity:0
msgid "Ordered Quantities"
msgstr "Cantidades Pedidas"
@@ -226,13 +247,24 @@ msgid ""
msgstr ""
#. module: sale
+#: field:sale.config.picking_policy,task_work:0
+msgid "Based on Tasks' Work"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
+msgid "Quotations and Sales"
+msgstr ""
+
+#. module: sale
#: model:ir.model,name:sale.model_sale_make_invoice
msgid "Sales Make Invoice"
msgstr ""
#. module: sale
-#: view:sale.order:0
-msgid "Recreate Packing"
+#: code:addons/sale/sale.py:330
+#, python-format
+msgid "Pricelist Warning!"
msgstr ""
#. module: sale
@@ -241,9 +273,9 @@ msgid "Discount (%)"
msgstr ""
#. module: sale
-#: help:res.company,security_lead:0
-msgid ""
-"This is the days added to what you promise to customers for security purpose"
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_quotation_for_sale
+msgid "My Quotations"
msgstr ""
#. module: sale
@@ -269,7 +301,22 @@ msgid "Shop Name"
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:1014
+#: help:sale.order,order_policy:0
+msgid ""
+"The Invoice Policy is used to synchronise invoice and delivery operations.\n"
+" - The 'Pay before delivery' choice will first generate the invoice and "
+"then generate the picking order after the payment of this invoice.\n"
+" - The 'Deliver & Invoice on demand' will create the picking order directly "
+"and wait for the user to manually click on the 'Invoice' button to generate "
+"the draft invoice based on the sale order or the sale order lines.\n"
+" - The 'Invoice on order after delivery' choice will generate the draft "
+"invoice based on sales order after all picking lists have been finished.\n"
+" - The 'Invoice based on deliveries' choice is used to create an invoice "
+"during the picking process."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:1158
#, python-format
msgid "No Customer Defined !"
msgstr ""
@@ -280,8 +327,11 @@ msgid "Sales in Exception"
msgstr ""
#. module: sale
-#: view:sale.order:0
-msgid "Set to Draft"
+#: code:addons/sale/sale.py:1145
+#: code:addons/sale/sale.py:1264
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:70
+#, python-format
+msgid "Configuration Error !"
msgstr ""
#. module: sale
@@ -290,22 +340,7 @@ msgid "Conditions"
msgstr ""
#. module: sale
-#: help:sale.order,order_policy:0
-msgid ""
-"The Shipping Policy is used to synchronise invoice and delivery operations.\n"
-" - The 'Pay Before delivery' choice will first generate the invoice and "
-"then generate the picking order after the payment of this invoice.\n"
-" - The 'Shipping & Manual Invoice' will create the picking order directly "
-"and wait for the user to manually click on the 'Invoice' button to generate "
-"the draft invoice.\n"
-" - The 'Invoice On Order After Delivery' choice will generate the draft "
-"invoice based on sales order after all picking lists have been finished.\n"
-" - The 'Invoice From The Picking' choice is used to create an invoice "
-"during the picking process."
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:939
+#: code:addons/sale/sale.py:1034
#, python-format
msgid ""
"There is no income category account defined in default Properties for "
@@ -313,8 +348,8 @@ msgid ""
msgstr ""
#. module: sale
-#: view:sale.installer:0
-msgid "Configure"
+#: selection:sale.report,month:0
+msgid "August"
msgstr ""
#. module: sale
@@ -323,7 +358,7 @@ msgid "You try to assign a lot which is not from the same product"
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:620
+#: code:addons/sale/sale.py:655
#, python-format
msgid "invalid mode for test_state"
msgstr ""
@@ -334,7 +369,7 @@ msgid "June"
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:584
+#: code:addons/sale/sale.py:617
#, python-format
msgid "Could not cancel this sales order !"
msgstr ""
@@ -355,8 +390,12 @@ msgid "October"
msgstr ""
#. module: sale
+#: sql_constraint:stock.picking:0
+msgid "Reference must be unique per Company!"
+msgstr ""
+
+#. module: sale
#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_quotation_for_sale
#: view:sale.order:0
#: view:sale.report:0
msgid "Quotations"
@@ -368,11 +407,6 @@ msgid "Pricelist for current sales order."
msgstr ""
#. module: sale
-#: selection:sale.config.picking_policy,step:0
-msgid "Delivery Order Only"
-msgstr ""
-
-#. module: sale
#: report:sale.order:0
msgid "TVA :"
msgstr ""
@@ -397,6 +431,7 @@ msgstr ""
#. module: sale
#: view:sale.order:0
#: view:sale.order.line:0
+#: field:sale.report,product_uom:0
msgid "UoM"
msgstr ""
@@ -419,13 +454,19 @@ msgid ""
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:971
+#: code:addons/sale/sale.py:1061
+#, python-format
+msgid "You cannot cancel a sale order line that has already been invoiced!"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:1066
#, python-format
msgid "You must first cancel stock moves attached to this sales order line."
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:1042
+#: code:addons/sale/sale.py:1134
#, python-format
msgid "(n/a)"
msgstr ""
@@ -459,13 +500,35 @@ msgid "Notes"
msgstr ""
#. module: sale
+#: sql_constraint:res.company:0
+msgid "The company name must be unique !"
+msgstr ""
+
+#. module: sale
#: help:sale.order,partner_invoice_id:0
msgid "Invoice address for current sales order."
msgstr ""
#. module: sale
-#: view:sale.installer:0
-msgid "Enhance your core Sales Application with additional functionalities."
+#: view:sale.report:0
+msgid "Month-1"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered month of the sales order"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:504
+#, python-format
+msgid ""
+"You cannot group sales having different currencies for the same partner."
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,picking_policy:0
+msgid "Deliver each product when available"
msgstr ""
#. module: sale
@@ -485,13 +548,13 @@ msgid "Confirmation Date"
msgstr ""
#. module: sale
-#: field:sale.order.line,address_allotment_id:0
-msgid "Allotment Partner"
+#: field:sale.order,incoterm:0
+msgid "Incoterm"
msgstr ""
#. module: sale
-#: sql_constraint:sale.order:0
-msgid "Order Reference must be unique !"
+#: field:sale.order.line,address_allotment_id:0
+msgid "Allotment Partner"
msgstr ""
#. module: sale
@@ -500,6 +563,28 @@ msgid "March"
msgstr ""
#. module: sale
+#: constraint:stock.move:0
+msgid "You can not move products from or to a location of the type view."
+msgstr ""
+
+#. module: sale
+#: field:sale.config.picking_policy,sale_orders:0
+msgid "Based on Sales Orders"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,state:0
+msgid ""
+"Givwizard = self.browse(cr, uid, ids)[0]es the state of the quotation or "
+"sales order. \n"
+"The exception state is automatically set when a cancel operation occurs in "
+"the invoice validation (Invoice Exception) or in the picking list process "
+"(Shipping Exception). \n"
+"The 'Waiting Schedule' state is set when the invoice is confirmed but "
+"waiting for the scheduler to run on the order date."
+msgstr ""
+
+#. module: sale
#: help:sale.order,amount_total:0
msgid "The total amount."
msgstr ""
@@ -515,6 +600,11 @@ msgid "Invoice address :"
msgstr ""
#. module: sale
+#: field:sale.order.line,sequence:0
+msgid "Line Sequence"
+msgstr ""
+
+#. module: sale
#: model:process.transition,note:sale.process_transition_saleorderprocurement0
msgid ""
"For every sales order line, a procurement order is created to supply the "
@@ -561,11 +651,6 @@ msgid "Sales Order Line"
msgstr ""
#. module: sale
-#: view:sale.config.picking_policy:0
-msgid "Setup your sales workflow and default values."
-msgstr ""
-
-#. module: sale
#: field:sale.shop,warehouse_id:0
msgid "Warehouse"
msgstr ""
@@ -602,6 +687,11 @@ msgid "Creation Date"
msgstr ""
#. module: sale
+#: model:ir.ui.menu,name:sale.menu_sales_configuration_misc
+msgid "Miscellaneous"
+msgstr ""
+
+#. module: sale
#: model:ir.actions.act_window,name:sale.action_order_line_tree3
msgid "Uninvoiced and Delivered Lines"
msgstr ""
@@ -617,14 +707,19 @@ msgid "My Sales"
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:290
-#: code:addons/sale/sale.py:966
-#: code:addons/sale/sale.py:1165
+#: code:addons/sale/sale.py:295
+#: code:addons/sale/sale.py:1061
+#: code:addons/sale/sale.py:1290
#, python-format
msgid "Invalid action !"
msgstr ""
#. module: sale
+#: view:sale.order:0
+msgid "Extra Info"
+msgstr ""
+
+#. module: sale
#: field:sale.order,pricelist_id:0
#: field:sale.report,pricelist_id:0
#: field:sale.shop,pricelist_id:0
@@ -638,13 +733,21 @@ msgid "# of Qty"
msgstr ""
#. module: sale
+#: code:addons/sale/sale.py:1314
+#, python-format
+msgid "Hour"
+msgstr ""
+
+#. module: sale
#: view:sale.order:0
msgid "Order Date"
msgstr ""
#. module: sale
#: view:sale.order.line:0
+#: view:sale.report:0
#: field:sale.report,shipped:0
+#: field:sale.report,shipped_qty_1:0
msgid "Shipped"
msgstr ""
@@ -654,8 +757,8 @@ msgid "All Quotations"
msgstr ""
#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Invoice On Order After Delivery"
+#: view:sale.config.picking_policy:0
+msgid "Options"
msgstr ""
#. module: sale
@@ -664,6 +767,20 @@ msgid "September"
msgstr ""
#. module: sale
+#: code:addons/sale/sale.py:632
+#, python-format
+msgid "You cannot confirm a sale order which has no line."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:1246
+#, python-format
+msgid ""
+"You have to select a pricelist or a customer in the sales form !\n"
+"Please set one before choosing a product."
+msgstr ""
+
+#. module: sale
#: view:sale.report:0
#: field:sale.report,categ_id:0
msgid "Category of Product"
@@ -680,11 +797,6 @@ msgid "Stock Moves"
msgstr ""
#. module: sale
-#: view:sale.report:0
-msgid " Year "
-msgstr ""
-
-#. module: sale
#: field:sale.order,state:0
#: field:sale.report,state:0
msgid "Order State"
@@ -702,7 +814,7 @@ msgid "Sales By Month"
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:970
+#: code:addons/sale/sale.py:1065
#, python-format
msgid "Could not cancel sales order line!"
msgstr ""
@@ -735,41 +847,18 @@ msgid ""
msgstr ""
#. module: sale
-#: view:sale.report:0
-msgid "Extended Filters..."
+#: field:sale.order,date_order:0
+msgid "Date"
msgstr ""
#. module: sale
-#: model:ir.module.module,description:sale.module_meta_information
-msgid ""
-"\n"
-" The base module to manage quotations and sales orders.\n"
-"\n"
-" * Workflow with validation steps:\n"
-" - Quotation -> Sales order -> Invoice\n"
-" * Invoicing methods:\n"
-" - Invoice on order (before or after shipping)\n"
-" - Invoice on delivery\n"
-" - Invoice on timesheets\n"
-" - Advance invoice\n"
-" * Partners preferences (shipping, invoicing, incoterm, ...)\n"
-" * Products stocks and prices\n"
-" * Delivery methods:\n"
-" - all at once, multi-parcel\n"
-" - delivery costs\n"
-" * Dashboard for salesman that includes:\n"
-" * Your open quotations\n"
-" * Top 10 sales of the month\n"
-" * Cases statistics\n"
-" * Graph of sales by product\n"
-" * Graph of cases of the month\n"
-" "
+#: view:sale.report:0
+msgid "Extended Filters..."
msgstr ""
#. module: sale
-#: model:ir.model,name:sale.model_sale_shop
-#: view:sale.shop:0
-msgid "Sales Shop"
+#: selection:sale.order.line,state:0
+msgid "Exception"
msgstr ""
#. module: sale
@@ -778,8 +867,9 @@ msgid "Companies"
msgstr ""
#. module: sale
-#: selection:sale.report,month:0
-msgid "November"
+#: code:addons/sale/sale.py:1259
+#, python-format
+msgid "No valid pricelist line found ! :"
msgstr ""
#. module: sale
@@ -788,8 +878,8 @@ msgid "History"
msgstr ""
#. module: sale
-#: field:sale.config.picking_policy,picking_policy:0
-msgid "Picking Default Policy"
+#: selection:sale.order,order_policy:0
+msgid "Invoice on order after delivery"
msgstr ""
#. module: sale
@@ -812,13 +902,12 @@ msgid ""
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:966
-#, python-format
-msgid "You cannot cancel a sales order line that has already been invoiced !"
+#: help:res.company,security_lead:0
+msgid ""
+"This is the days added to what you promise to customers for security purpose"
msgstr ""
#. module: sale
-#: view:sale.order:0
#: view:sale.order.line:0
msgid "Qty"
msgstr ""
@@ -829,6 +918,11 @@ msgid "References"
msgstr ""
#. module: sale
+#: view:sale.order.line:0
+msgid "My Sales Order Lines"
+msgstr ""
+
+#. module: sale
#: model:process.transition.action,name:sale.process_transition_action_cancel0
#: model:process.transition.action,name:sale.process_transition_action_cancel1
#: model:process.transition.action,name:sale.process_transition_action_cancel2
@@ -840,13 +934,8 @@ msgid "Cancel"
msgstr ""
#. module: sale
-#: field:sale.installer,sale_order_dates:0
-msgid "Sales Order Dates"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order.line,state:0
-msgid "Exception"
+#: sql_constraint:sale.order:0
+msgid "Order Reference must be unique per Company!"
msgstr ""
#. module: sale
@@ -859,18 +948,18 @@ msgid "Create Invoice"
msgstr ""
#. module: sale
-#: field:sale.installer,sale_margin:0
-msgid "Margins in Sales Orders"
+#: view:sale.order:0
+msgid "Total Tax Excluded"
msgstr ""
#. module: sale
-#: view:sale.order:0
-msgid "Total Tax Excluded"
+#: view:sale.order.line:0
+msgid "Order reference"
msgstr ""
#. module: sale
-#: view:sale.order:0
-msgid "Compute"
+#: view:sale.open.invoice:0
+msgid "You invoice has been successfully created!"
msgstr ""
#. module: sale
@@ -890,22 +979,19 @@ msgid "Open Invoice"
msgstr ""
#. module: sale
-#: report:sale.order:0
-#: view:sale.order.line:0
-msgid "Price"
+#: model:ir.actions.server,name:sale.ir_actions_server_edi_sale
+msgid "Auto-email confirmed sale orders"
msgstr ""
#. module: sale
-#: model:ir.actions.act_window,name:sale.action_sale_installer
-#: view:sale.config.picking_policy:0
-#: view:sale.installer:0
-msgid "Sales Application Configuration"
+#: code:addons/sale/sale.py:413
+#, python-format
+msgid "There is no sales journal defined for this company: \"%s\" (id:%d)"
msgstr ""
#. module: sale
-#: view:sale.report:0
-#: field:sale.report,price_total:0
-msgid "Total Price"
+#: model:process.transition.action,name:sale.process_transition_action_forceassignation0
+msgid "Force Assignation"
msgstr ""
#. module: sale
@@ -919,6 +1005,11 @@ msgid "Based on the shipped or on the ordered quantities."
msgstr "Basado en nas cantidades enviadas ou pedidas."
#. module: sale
+#: selection:sale.order,picking_policy:0
+msgid "Deliver all products at once"
+msgstr ""
+
+#. module: sale
#: field:sale.order,picking_ids:0
msgid "Related Picking"
msgstr ""
@@ -950,8 +1041,14 @@ msgid "Create Delivery Order"
msgstr ""
#. module: sale
-#: field:sale.installer,delivery:0
-msgid "Delivery Costs"
+#: code:addons/sale/sale.py:1290
+#, python-format
+msgid "Cannot delete a sales order line which is in state '%s'!"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Qty(UoS)"
msgstr ""
#. module: sale
@@ -966,12 +1063,12 @@ msgstr ""
#. module: sale
#: view:sale.report:0
-msgid "Sales by Product Category"
+msgid "Ordered date of the sales order"
msgstr ""
#. module: sale
-#: selection:sale.order,picking_policy:0
-msgid "Partial Delivery"
+#: view:sale.report:0
+msgid "Sales by Product Category"
msgstr ""
#. module: sale
@@ -980,8 +1077,9 @@ msgid "Confirm Quotation"
msgstr ""
#. module: sale
-#: help:sale.order,origin:0
-msgid "Reference of the document that generated this sales order request."
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:63
+#, python-format
+msgid "Error"
msgstr ""
#. module: sale
@@ -1014,19 +1112,13 @@ msgid "Procurement Method"
msgstr ""
#. module: sale
-#: view:sale.config.picking_policy:0
-#: view:sale.installer:0
-msgid "title"
-msgstr ""
-
-#. module: sale
#: model:process.node,name:sale.process_node_packinglist0
msgid "Pick List"
msgstr ""
#. module: sale
#: view:sale.order:0
-msgid "Order date"
+msgid "Set to Draft"
msgstr ""
#. module: sale
@@ -1035,6 +1127,85 @@ msgid "Document of the move to the output or to the customer."
msgstr ""
#. module: sale
+#: model:email.template,body_text:sale.email_template_edi_sale
+msgid ""
+"\n"
+"Hello${object.partner_order_id.name and ' ' or "
+"''}${object.partner_order_id.name or ''},\n"
+"\n"
+"Here is your order confirmation for ${object.partner_id.name}:\n"
+" | Order number: *${object.name}*\n"
+" | Order total: *${object.amount_total} "
+"${object.pricelist_id.currency_id.name}*\n"
+" | Order date: ${object.date_order}\n"
+" % if object.origin:\n"
+" | Order reference: ${object.origin}\n"
+" % endif\n"
+" % if object.client_order_ref:\n"
+" | Your reference: ${object.client_order_ref}<br />\n"
+" % endif\n"
+" | Your contact: ${object.user_id.name} ${object.user_id.user_email "
+"and '<%s>'%(object.user_id.user_email) or ''}\n"
+"\n"
+"You can view the order confirmation, download it and even pay online using "
+"the following link:\n"
+" ${ctx.get('edi_web_url_view') or 'n/a'}\n"
+"\n"
+"% if object.order_policy in ('prepaid','manual') and "
+"object.company_id.paypal_account:\n"
+"<% \n"
+"comp_name = quote(object.company_id.name)\n"
+"order_name = quote(object.name)\n"
+"paypal_account = quote(object.company_id.paypal_account)\n"
+"order_amount = quote(str(object.amount_total))\n"
+"cur_name = quote(object.pricelist_id.currency_id.name)\n"
+"paypal_url = \"https://www.paypal.com/cgi-"
+"bin/webscr?cmd=_xclick&business=%s&item_name=%s%%20Order%%20%s&invoice=%s&amo"
+"unt=%s\" \\\n"
+" "
+"\"&currency_code=%s&button_subtype=services&no_note=1&bn=OpenERP_Order_PayNow"
+"_%s\" % \\\n"
+" "
+"(paypal_account,comp_name,order_name,order_name,order_amount,cur_name,cur_nam"
+"e)\n"
+"%>\n"
+"It is also possible to directly pay with Paypal:\n"
+" ${paypal_url}\n"
+"% endif\n"
+"\n"
+"If you have any question, do not hesitate to contact us.\n"
+"\n"
+"\n"
+"Thank you for choosing ${object.company_id.name}!\n"
+"\n"
+"\n"
+"--\n"
+"${object.user_id.name} ${object.user_id.user_email and "
+"'<%s>'%(object.user_id.user_email) or ''}\n"
+"${object.company_id.name}\n"
+"% if object.company_id.street:\n"
+"${object.company_id.street or ''}\n"
+"% endif\n"
+"% if object.company_id.street2:\n"
+"${object.company_id.street2}\n"
+"% endif\n"
+"% if object.company_id.city or object.company_id.zip:\n"
+"${object.company_id.zip or ''} ${object.company_id.city or ''}\n"
+"% endif\n"
+"% if object.company_id.country_id:\n"
+"${object.company_id.state_id and ('%s, ' % object.company_id.state_id.name) "
+"or ''} ${object.company_id.country_id.name or ''}\n"
+"% endif\n"
+"% if object.company_id.phone:\n"
+"Phone: ${object.company_id.phone}\n"
+"% endif\n"
+"% if object.company_id.website:\n"
+"${object.company_id.website or ''}\n"
+"% endif\n"
+" "
+msgstr ""
+
+#. module: sale
#: model:process.transition.action,name:sale.process_transition_action_validate0
msgid "Validate"
msgstr ""
@@ -1057,8 +1228,8 @@ msgid "Taxes"
msgstr ""
#. module: sale
-#: field:sale.order,order_policy:0
-msgid "Shipping Policy"
+#: view:sale.order:0
+msgid "Sales Order ready to be invoiced"
msgstr ""
#. module: sale
@@ -1078,8 +1249,8 @@ msgid "Create Invoices"
msgstr ""
#. module: sale
-#: view:sale.order:0
-msgid "Extra Info"
+#: view:sale.report:0
+msgid "Sales order created in current month"
msgstr ""
#. module: sale
@@ -1088,11 +1259,24 @@ msgid "Fax :"
msgstr ""
#. module: sale
+#: help:sale.order.line,type:0
+msgid ""
+"If 'on order', it triggers a procurement when the sale order is confirmed to "
+"create a task, purchase order or manufacturing order linked to this sale "
+"order line."
+msgstr ""
+
+#. module: sale
#: field:sale.advance.payment.inv,amount:0
msgid "Advance Amount"
msgstr ""
#. module: sale
+#: field:sale.config.picking_policy,charge_delivery:0
+msgid "Do you charge the delivery?"
+msgstr ""
+
+#. module: sale
#: selection:sale.order,invoice_quantity:0
msgid "Shipped Quantities"
msgstr ""
@@ -1103,25 +1287,45 @@ msgid "Invoice Based on Sales Orders"
msgstr ""
#. module: sale
+#: code:addons/sale/sale.py:331
+#, python-format
+msgid ""
+"If you change the pricelist of this order (and eventually the currency), "
+"prices of existing order lines will not be updated."
+msgstr ""
+
+#. module: sale
#: model:ir.model,name:sale.model_stock_picking
msgid "Picking List"
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:387
-#: code:addons/sale/sale.py:920
-#: code:addons/sale/sale.py:938
+#: code:addons/sale/sale.py:412
+#: code:addons/sale/sale.py:503
+#: code:addons/sale/sale.py:632
+#: code:addons/sale/sale.py:1015
+#: code:addons/sale/sale.py:1033
#, python-format
msgid "Error !"
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:570
+#: code:addons/sale/sale.py:603
#, python-format
msgid "Could not cancel sales order !"
msgstr ""
#. module: sale
+#: view:sale.order:0
+msgid "Qty(UoM)"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered Year of the sales order"
+msgstr ""
+
+#. module: sale
#: selection:sale.report,month:0
msgid "July"
msgstr ""
@@ -1138,35 +1342,25 @@ msgid "Shipping Exception"
msgstr ""
#. module: sale
-#: field:sale.make.invoice,grouped:0
-msgid "Group the invoices"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Shipping & Manual Invoice"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:1051
+#: code:addons/sale/sale.py:1143
#, python-format
-msgid "Picking Information !"
+msgid "Picking Information ! : "
msgstr ""
#. module: sale
-#: view:sale.report:0
-#: field:sale.report,month:0
-msgid "Month"
+#: field:sale.make.invoice,grouped:0
+msgid "Group the invoices"
msgstr ""
#. module: sale
-#: model:ir.module.module,shortdesc:sale.module_meta_information
-msgid "Sales Management"
+#: field:sale.order,order_policy:0
+msgid "Invoice Policy"
msgstr ""
#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Invoice From The Picking"
+#: model:ir.actions.act_window,name:sale.action_config_picking_policy
+#: view:sale.config.picking_policy:0
+msgid "Setup your Invoicing Method"
msgstr ""
#. module: sale
@@ -1176,27 +1370,30 @@ msgstr ""
#. module: sale
#: view:sale.report:0
-#: field:sale.report,uom_name:0
msgid "Reference UoM"
msgstr ""
#. module: sale
+#: view:sale.config.picking_policy:0
+msgid ""
+"This tool will help you to install the right module and configure the system "
+"according to the method you use to invoice your customers."
+msgstr ""
+
+#. module: sale
#: model:ir.model,name:sale.model_sale_order_line_make_invoice
msgid "Sale OrderLine Make_invoice"
msgstr ""
#. module: sale
-#: help:sale.config.picking_policy,step:0
-msgid ""
-"By default, OpenERP is able to manage complex routing and paths of products "
-"in your warehouse and partner locations. This will configure the most common "
-"and simple methods to deliver products to the customer in one or two "
-"operations by the worker."
+#: selection:sale.order,state:0
+#: selection:sale.report,state:0
+msgid "Invoice Exception"
msgstr ""
#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_tree
-msgid "Old Quotations"
+#: model:process.node,note:sale.process_node_saleorder0
+msgid "Drives procurement and invoicing"
msgstr ""
#. module: sale
@@ -1212,6 +1409,22 @@ msgid "Sales Analysis"
msgstr ""
#. module: sale
+#: code:addons/sale/sale.py:1138
+#, python-format
+msgid ""
+"You selected a quantity of %d Units.\n"
+"But it's not compatible with the selected packaging.\n"
+"Here is a proposition of quantities according to the packaging:\n"
+"EAN: %s Quantity: %s Type of ul: %s"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Recreate Packing"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
#: field:sale.order.line,property_ids:0
msgid "Properties"
msgstr ""
@@ -1238,7 +1451,17 @@ msgid ""
msgstr ""
#. module: sale
-#: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
+#: view:sale.order.line:0
+msgid "Confirmed sale order lines, not yet delivered"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:473
+#, python-format
+msgid "Customer Invoices"
+msgstr ""
+
+#. module: sale
#: model:process.process,name:sale.process_process_salesprocess0
#: view:sale.order:0
#: view:sale.report:0
@@ -1260,18 +1483,13 @@ msgid "Done"
msgstr ""
#. module: sale
-#: model:ir.model,name:sale.model_sale_installer
-msgid "sale.installer"
-msgstr ""
-
-#. module: sale
#: model:process.node,name:sale.process_node_invoice0
#: model:process.node,name:sale.process_node_invoiceafterdelivery0
msgid "Invoice"
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:1014
+#: code:addons/sale/sale.py:1158
#, python-format
msgid ""
"You have to select a customer in the sales form !\n"
@@ -1279,11 +1497,6 @@ msgid ""
msgstr ""
#. module: sale
-#: selection:sale.config.picking_policy,step:0
-msgid "Picking List & Delivery Order"
-msgstr ""
-
-#. module: sale
#: field:sale.order,origin:0
msgid "Source Document"
msgstr ""
@@ -1309,7 +1522,7 @@ msgid "The amount without tax."
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:571
+#: code:addons/sale/sale.py:604
#, python-format
msgid "You must first cancel all picking attached to this sales order."
msgstr ""
@@ -1320,8 +1533,14 @@ msgid "Sales Advance Payment Invoice"
msgstr ""
#. module: sale
-#: field:sale.order,incoterm:0
-msgid "Incoterm"
+#: view:sale.report:0
+#: field:sale.report,month:0
+msgid "Month"
+msgstr ""
+
+#. module: sale
+#: model:email.template,subject:sale.email_template_edi_sale
+msgid "${object.company_id.name} Order (Ref ${object.name or 'n/a' })"
msgstr ""
#. module: sale
@@ -1333,11 +1552,6 @@ msgid "Product"
msgstr ""
#. module: sale
-#: model:ir.ui.menu,name:sale.menu_invoiced
-msgid "Invoicing"
-msgstr ""
-
-#. module: sale
#: model:process.transition.action,name:sale.process_transition_action_cancelassignation0
msgid "Cancel Assignation"
msgstr ""
@@ -1348,21 +1562,11 @@ msgid "sale.config.picking_policy"
msgstr ""
#. module: sale
-#: help:sale.order,state:0
-msgid ""
-"Gives the state of the quotation or sales order. \n"
-"The exception state is automatically set when a cancel operation occurs in "
-"the invoice validation (Invoice Exception) or in the picking list process "
-"(Shipping Exception). \n"
-"The 'Waiting Schedule' state is set when the invoice is confirmed but "
-"waiting for the scheduler to run on the date 'Ordered Date'."
+#: view:account.invoice.report:0
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_turnover_by_month
+msgid "Monthly Turnover"
msgstr ""
-"Indica o estado do presuposto o pedido de venda.\n"
-"O estado de excepción establecese automáticamente cando se produce unha "
-"operación de cancelación na validación da factura (excepción de factura) ou "
-"no procesado do albará (excepción de envío).\n"
-"O estado 'Esperando planificación' establece cando se confirma a factura, "
-"pero está esperando que o planificador a active na data de \"Data pedido\"."
#. module: sale
#: field:sale.order,invoice_quantity:0
@@ -1380,7 +1584,6 @@ msgid "Product UoS"
msgstr ""
#. module: sale
-#: selection:sale.order,state:0
#: selection:sale.report,state:0
msgid "Manual In Progress"
msgstr ""
@@ -1401,7 +1604,8 @@ msgid "Order"
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:921
+#: code:addons/sale/sale.py:1016
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:71
#, python-format
msgid "There is no income account defined for this product: \"%s\" (id:%d)"
msgstr ""
@@ -1425,7 +1629,7 @@ msgstr ""
"polo comercial."
#. module: sale
-#: code:addons/sale/sale.py:1116
+#: code:addons/sale/sale.py:1238
#, python-format
msgid ""
"You plan to sell %.2f %s but you only have %.2f %s available !\n"
@@ -1454,9 +1658,9 @@ msgid "Total"
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:388
-#, python-format
-msgid "There is no sales journal defined for this company: \"%s\" (id:%d)"
+#: report:sale.order:0
+#: view:sale.order.line:0
+msgid "Price"
msgstr ""
#. module: sale
@@ -1468,9 +1672,14 @@ msgid ""
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:1165
-#, python-format
-msgid "Cannot delete a sales order line which is %s !"
+#: selection:sale.order,order_policy:0
+msgid "Pay before delivery"
+msgstr ""
+
+#. module: sale
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.open_board_sales
+msgid "Sales Dashboard"
msgstr ""
#. module: sale
@@ -1482,6 +1691,7 @@ msgstr ""
#. module: sale
#: view:sale.order:0
+#: selection:sale.order,state:0
#: view:sale.order.line:0
msgid "To Invoice"
msgstr ""
@@ -1492,6 +1702,11 @@ msgid "Date on which sales order is confirmed."
msgstr ""
#. module: sale
+#: field:sale.order,project_id:0
+msgid "Contract/Analytic Account"
+msgstr ""
+
+#. module: sale
#: field:sale.order,company_id:0
#: field:sale.order.line,company_id:0
#: view:sale.report:0
@@ -1511,9 +1726,11 @@ msgid "The amount to be invoiced in advance."
msgstr ""
#. module: sale
-#: selection:sale.order,state:0
-#: selection:sale.report,state:0
-msgid "Invoice Exception"
+#: code:addons/sale/sale.py:1256
+#, python-format
+msgid ""
+"Couldn't find a pricelist line matching this product and quantity.\n"
+"You have to change either the product, the quantity or the pricelist."
msgstr ""
#. module: sale
@@ -1523,13 +1740,6 @@ msgid ""
msgstr ""
#. module: sale
-#: help:sale.installer,sale_margin:0
-msgid ""
-"Gives the margin of profitability by calculating the difference between Unit "
-"Price and Cost Price."
-msgstr ""
-
-#. module: sale
#: view:sale.make.invoice:0
#: view:sale.order.line.make.invoice:0
msgid "Create invoices"
@@ -1548,6 +1758,11 @@ msgid "Cancelled"
msgstr ""
#. module: sale
+#: view:sale.order.line:0
+msgid "Sales Order Lines related to a Sales Order of mine"
+msgstr ""
+
+#. module: sale
#: model:ir.actions.act_window,name:sale.action_shop_form
#: model:ir.ui.menu,name:sale.menu_action_shop_form
#: field:sale.order,shop_id:0
@@ -1557,17 +1772,12 @@ msgid "Shop"
msgstr ""
#. module: sale
-#: view:sale.report:0
-msgid " Month "
-msgstr ""
-
-#. module: sale
#: field:sale.report,date_confirm:0
msgid "Date Confirm"
msgstr ""
#. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:111
+#: code:addons/sale/wizard/sale_line_invoice.py:113
#, python-format
msgid "Warning"
msgstr ""
@@ -1579,17 +1789,6 @@ msgid "Sales by Month"
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:1045
-#, python-format
-msgid ""
-"You selected a quantity of %d Units.\n"
-"But it's not compatible with the selected packaging.\n"
-"Here is a proposition of quantities according to the packaging:\n"
-"\n"
-"EAN: %s Quantity: %s Type of ul: %s"
-msgstr ""
-
-#. module: sale
#: model:ir.model,name:sale.model_sale_order
#: model:process.node,name:sale.process_node_order0
#: model:process.node,name:sale.process_node_saleorder0
@@ -1605,6 +1804,11 @@ msgid "Quantity (UoS)"
msgstr ""
#. module: sale
+#: view:sale.order.line:0
+msgid "Sale Order Lines that are in 'done' state"
+msgstr ""
+
+#. module: sale
#: model:process.transition,note:sale.process_transition_packing0
msgid ""
"The Pick List form is created as soon as the sales order is confirmed, in "
@@ -1619,6 +1823,11 @@ msgid "Confirmed"
msgstr ""
#. module: sale
+#: field:sale.config.picking_policy,order_policy:0
+msgid "Main Method Based On"
+msgstr ""
+
+#. module: sale
#: model:process.transition.action,name:sale.process_transition_action_confirm0
msgid "Confirm"
msgstr ""
@@ -1641,6 +1850,7 @@ msgid "Invoice Lines"
msgstr ""
#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_product_tree
#: view:sale.order:0
#: view:sale.order.line:0
msgid "Sales Order Lines"
@@ -1657,30 +1867,18 @@ msgid "Configuration"
msgstr ""
#. module: sale
-#: selection:sale.order,picking_policy:0
-msgid "Complete Delivery"
+#: code:addons/sale/edi/sale_order.py:146
+#, python-format
+msgid "EDI Pricelist (%s)"
msgstr ""
#. module: sale
#: view:sale.report:0
-msgid " Month-1 "
-msgstr ""
-
-#. module: sale
-#: help:sale.config.picking_policy,picking_policy:0
-msgid ""
-"The Shipping Policy is used to configure per order if you want to deliver as "
-"soon as possible when one product is available or you wait that all products "
-"are available.."
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "August"
+msgid "Sales order created in current year"
msgstr ""
#. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:111
+#: code:addons/sale/wizard/sale_line_invoice.py:113
#, python-format
msgid ""
"Invoice cannot be created for this Sales Order Line due to one of the "
@@ -1690,6 +1888,11 @@ msgid ""
msgstr ""
#. module: sale
+#: view:sale.order.line:0
+msgid "Sale order lines done"
+msgstr ""
+
+#. module: sale
#: field:sale.order.line,th_weight:0
msgid "Weight"
msgstr ""
@@ -1708,7 +1911,6 @@ msgstr ""
#. module: sale
#: field:sale.config.picking_policy,config_logo:0
-#: field:sale.installer,config_logo:0
msgid "Image"
msgstr ""
@@ -1738,8 +1940,8 @@ msgid "Salesman"
msgstr ""
#. module: sale
-#: model:process.node,note:sale.process_node_saleorder0
-msgid "Drives procurement and invoicing"
+#: model:ir.actions.act_window,name:sale.action_order_tree
+msgid "Old Quotations"
msgstr ""
#. module: sale
@@ -1748,7 +1950,7 @@ msgid "Untaxed Amount"
msgstr ""
#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:163
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:170
#: model:ir.actions.act_window,name:sale.action_view_sale_advance_payment_inv
#: view:sale.advance.payment.inv:0
#: view:sale.order:0
@@ -1757,7 +1959,7 @@ msgid "Advance Invoice"
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:591
+#: code:addons/sale/sale.py:624
#, python-format
msgid "The sales order '%s' has been cancelled."
msgstr ""
@@ -1792,20 +1994,20 @@ msgid "Packings"
msgstr ""
#. module: sale
-#: field:sale.config.picking_policy,progress:0
-#: field:sale.installer,progress:0
-msgid "Configuration Progress"
+#: view:sale.order.line:0
+msgid "Sale Order Lines ready to be invoiced"
msgstr ""
#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_product_tree
-msgid "Product sales"
+#: view:sale.report:0
+msgid "Sales order created in last month"
msgstr ""
#. module: sale
-#: field:sale.order,date_order:0
-msgid "Ordered Date"
-msgstr "Fecha Pedido"
+#: model:ir.actions.act_window,name:sale.action_email_templates
+#: model:ir.ui.menu,name:sale.menu_email_templates
+msgid "Email Templates"
+msgstr ""
#. module: sale
#: model:ir.actions.act_window,name:sale.action_order_form
@@ -1815,13 +2017,14 @@ msgid "Sales Orders"
msgstr ""
#. module: sale
-#: selection:sale.config.picking_policy,picking_policy:0
-msgid "Direct Delivery"
+#: model:ir.model,name:sale.model_sale_shop
+#: view:sale.shop:0
+msgid "Sales Shop"
msgstr ""
#. module: sale
-#: field:sale.installer,sale_journal:0
-msgid "Invoicing journals"
+#: selection:sale.report,month:0
+msgid "November"
msgstr ""
#. module: sale
@@ -1830,18 +2033,12 @@ msgid "Advance Product"
msgstr ""
#. module: sale
-#: view:sale.report:0
-#: field:sale.report,shipped_qty_1:0
-msgid "Shipped Qty"
-msgstr ""
-
-#. module: sale
-#: view:sale.open.invoice:0
-msgid "You invoice has been successfully created!"
+#: view:sale.order:0
+msgid "Compute"
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:585
+#: code:addons/sale/sale.py:618
#, python-format
msgid "You must first cancel all invoices attached to this sales order."
msgstr ""
@@ -1852,24 +2049,13 @@ msgid "January"
msgstr ""
#. module: sale
-#: view:sale.installer:0
-msgid "Configure Your Sales Management Application"
-msgstr ""
-
-#. module: sale
#: model:ir.actions.act_window,name:sale.action_order_tree4
msgid "Sales Order in Progress"
msgstr ""
#. module: sale
-#: field:sale.installer,sale_layout:0
-msgid "Sales Order Layout Improvement"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:63
-#, python-format
-msgid "Error"
+#: help:sale.order,origin:0
+msgid "Reference of the document that generated this sales order request."
msgstr ""
#. module: sale
@@ -1879,6 +2065,11 @@ msgid "Commitment Delay"
msgstr ""
#. module: sale
+#: selection:sale.order,order_policy:0
+msgid "Deliver & invoice on demand"
+msgstr ""
+
+#. module: sale
#: model:process.node,note:sale.process_node_saleprocurement0
msgid ""
"One Procurement order for each sales order line and for each of the "
@@ -1901,13 +2092,12 @@ msgid "Confirmed sales order to invoice."
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:290
-#, python-format
-msgid "Cannot delete Sales Order(s) which are already confirmed !"
+#: view:sale.order:0
+msgid "Sales Order that haven't yet been confirmed"
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:316
+#: code:addons/sale/sale.py:322
#, python-format
msgid "The sales order '%s' has been set in draft state."
msgstr ""
@@ -1918,24 +2108,19 @@ msgid "from stock"
msgstr ""
#. module: sale
-#: field:sale.config.picking_policy,order_policy:0
-msgid "Shipping Default Policy"
-msgstr ""
-
-#. module: sale
#: view:sale.open.invoice:0
msgid "Close"
msgstr ""
#. module: sale
-#: field:sale.order,shipped:0
-msgid "Delivered"
+#: code:addons/sale/sale.py:1248
+#, python-format
+msgid "No Pricelist ! : "
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:1115
-#, python-format
-msgid "Not enough stock !"
+#: field:sale.order,shipped:0
+msgid "Delivered"
msgstr ""
#. module: sale
@@ -1944,11 +2129,6 @@ msgid "You must assign a production lot for this product"
msgstr ""
#. module: sale
-#: field:sale.order.line,sequence:0
-msgid "Layout Sequence"
-msgstr ""
-
-#. module: sale
#: model:ir.actions.act_window,help:sale.action_shop_form
msgid ""
"If you have more than one shop reselling your company products, you can "
@@ -1975,11 +2155,6 @@ msgid "May"
msgstr ""
#. module: sale
-#: help:sale.installer,sale_order_dates:0
-msgid "Adds commitment, requested and effective dates on Sales Orders."
-msgstr ""
-
-#. module: sale
#: view:sale.order:0
#: field:sale.order,partner_id:0
#: field:sale.order.line,order_partner_id:0
@@ -1987,23 +2162,11 @@ msgid "Customer"
msgstr ""
#. module: sale
-#: model:product.template,name:sale.advance_product_0_product_template
-msgid "Advance"
-msgstr ""
-
-#. module: sale
#: selection:sale.report,month:0
msgid "February"
msgstr ""
#. module: sale
-#: help:sale.installer,sale_journal:0
-msgid ""
-"Allows you to group and invoice your delivery orders according to different "
-"invoicing types: daily, weekly, etc."
-msgstr ""
-
-#. module: sale
#: selection:sale.report,month:0
msgid "April"
msgstr ""
@@ -2014,11 +2177,6 @@ msgid "Accounting"
msgstr ""
#. module: sale
-#: field:sale.config.picking_policy,step:0
-msgid "Steps To Deliver a Sales Order"
-msgstr ""
-
-#. module: sale
#: view:sale.order:0
#: view:sale.order.line:0
msgid "Search Sales Order"
@@ -2030,15 +2188,15 @@ msgid "Sales Order Requisition"
msgstr ""
#. module: sale
-#: report:sale.order:0
-#: field:sale.order,payment_term:0
-msgid "Payment Term"
+#: code:addons/sale/sale.py:1242
+#, python-format
+msgid "Not enough stock ! : "
msgstr ""
#. module: sale
-#: help:sale.installer,sale_layout:0
-msgid ""
-"Provides some features to improve the layout of the Sales Order reports."
+#: report:sale.order:0
+#: field:sale.order,payment_term:0
+msgid "Payment Term"
msgstr ""
#. module: sale
@@ -2072,3 +2230,21 @@ msgstr ""
#: selection:sale.config.picking_policy,order_policy:0
msgid "Invoice Based on Deliveries"
msgstr ""
+
+#~ msgid ""
+#~ "Gives the state of the quotation or sales order. \n"
+#~ "The exception state is automatically set when a cancel operation occurs in "
+#~ "the invoice validation (Invoice Exception) or in the picking list process "
+#~ "(Shipping Exception). \n"
+#~ "The 'Waiting Schedule' state is set when the invoice is confirmed but "
+#~ "waiting for the scheduler to run on the date 'Ordered Date'."
+#~ msgstr ""
+#~ "Indica o estado do presuposto o pedido de venda.\n"
+#~ "O estado de excepción establecese automáticamente cando se produce unha "
+#~ "operación de cancelación na validación da factura (excepción de factura) ou "
+#~ "no procesado do albará (excepción de envío).\n"
+#~ "O estado 'Esperando planificación' establece cando se confirma a factura, "
+#~ "pero está esperando que o planificador a active na data de \"Data pedido\"."
+
+#~ msgid "Ordered Date"
+#~ msgstr "Fecha Pedido"
diff --git a/addons/sale/i18n/hr.po b/addons/sale/i18n/hr.po
index 5e1d0a6ed10..909093de2cb 100644
--- a/addons/sale/i18n/hr.po
+++ b/addons/sale/i18n/hr.po
@@ -6,29 +6,36 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2011-01-11 11:16+0000\n"
+"POT-Creation-Date: 2011-12-22 18:43+0000\n"
"PO-Revision-Date: 2010-12-29 14:33+0000\n"
"Last-Translator: qdp (OpenERP) <qdp-launchpad@tinyerp.com>\n"
"Language-Team: Vinteh <>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-05 05:17+0000\n"
-"X-Generator: Launchpad (build 14231)\n"
+"X-Launchpad-Export-Date: 2011-12-23 06:47+0000\n"
+"X-Generator: Launchpad (build 14560)\n"
"Language: hr\n"
#. module: sale
+#: field:sale.config.picking_policy,timesheet:0
+msgid "Based on Timesheet"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid ""
+"Sale Order Lines that are confirmed, done or in exception state and haven't "
+"yet been invoiced"
+msgstr ""
+
+#. module: sale
#: view:board.board:0
#: model:ir.actions.act_window,name:sale.action_sales_by_salesman
msgid "Sales by Salesman in last 90 days"
msgstr ""
#. module: sale
-#: help:sale.installer,delivery:0
-msgid "Allows you to compute delivery costs on your quotations."
-msgstr "Dozvoljava izračun troškova dostave prema ponudama."
-
-#. module: sale
#: help:sale.order,picking_policy:0
msgid ""
"If you don't have enough stock available to deliver all at once, do you "
@@ -38,6 +45,11 @@ msgstr ""
"na zalihi?"
#. module: sale
+#: view:sale.order:0
+msgid "UoS"
+msgstr ""
+
+#. module: sale
#: help:sale.order,partner_shipping_id:0
msgid "Shipping address for current sales order."
msgstr "Adresa otpreme za trenutnu narudžbu."
@@ -61,22 +73,12 @@ msgid "Cancel Order"
msgstr "Otkaži narudžbu"
#. module: sale
-#: view:sale.config.picking_policy:0
-msgid "Configure Sales Order Logistics"
-msgstr "Promijeni postavke narudžbi logistike"
-
-#. module: sale
-#: code:addons/sale/sale.py:603
+#: code:addons/sale/sale.py:638
#, python-format
msgid "The quotation '%s' has been converted to a sales order."
msgstr "Ponuda '%s' je promijenjena u narudžbu."
#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Payment Before Delivery"
-msgstr "Plaćanje prije isporuke"
-
-#. module: sale
#: code:addons/sale/wizard/sale_make_invoice.py:42
#, python-format
msgid "Warning !"
@@ -93,12 +95,6 @@ msgid "Drives procurement orders for every sales order line."
msgstr "Izvršava postavke nabave za svaku stavku narudžbe."
#. module: sale
-#: selection:sale.config.picking_policy,picking_policy:0
-msgid "All at Once"
-msgstr "Sve od jednom"
-
-#. module: sale
-#: field:sale.order,project_id:0
#: view:sale.report:0
#: field:sale.report,analytic_account_id:0
#: field:sale.shop,project_id:0
@@ -114,6 +110,15 @@ msgid ""
msgstr ""
#. module: sale
+#: code:addons/sale/sale.py:295
+#, python-format
+msgid ""
+"In order to delete a confirmed sale order, you must cancel it before ! To "
+"cancel a sale order, you must first cancel related picking or delivery "
+"orders."
+msgstr ""
+
+#. module: sale
#: model:process.node,name:sale.process_node_saleprocurement0
msgid "Procurement Order"
msgstr "Narudžba nabave"
@@ -125,6 +130,11 @@ msgid "Partner"
msgstr "Partner"
#. module: sale
+#: selection:sale.order,order_policy:0
+msgid "Invoice based on deliveries"
+msgstr ""
+
+#. module: sale
#: view:sale.order:0
msgid "Order Line"
msgstr "Stavka narudžbe"
@@ -161,9 +171,14 @@ msgid "Default Payment Term"
msgstr "Standardan uvjet plaćanja"
#. module: sale
-#: model:ir.actions.act_window,name:sale.action_config_picking_policy
-msgid "Configure Picking Policy for Sales Order"
-msgstr "Promijeni pravila odabira za narudžbu"
+#: field:sale.config.picking_policy,deli_orders:0
+msgid "Based on Delivery Orders"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.picking_policy,time_unit:0
+msgid "Main Working Time Unit"
+msgstr ""
#. module: sale
#: view:sale.order:0
@@ -179,9 +194,10 @@ msgid "Disc.(%)"
msgstr "Popust (%)"
#. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_forceassignation0
-msgid "Force Assignation"
-msgstr "Prisilno dodijeljivanje"
+#: view:sale.report:0
+#: field:sale.report,price_total:0
+msgid "Total Price"
+msgstr "Ukupna cijena"
#. module: sale
#: help:sale.make.invoice,grouped:0
@@ -189,6 +205,11 @@ msgid "Check the box to group the invoices for the same customers"
msgstr "Označite kućicu za grupiranje faktura istih kupaca"
#. module: sale
+#: view:sale.order:0
+msgid "My Sale Orders"
+msgstr ""
+
+#. module: sale
#: selection:sale.order,invoice_quantity:0
msgid "Ordered Quantities"
msgstr "Naručene količine"
@@ -229,14 +250,25 @@ msgstr ""
"slaganja robe' ili 'Faktura na narudžbu nakon dostave'."
#. module: sale
+#: field:sale.config.picking_policy,task_work:0
+msgid "Based on Tasks' Work"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
+msgid "Quotations and Sales"
+msgstr ""
+
+#. module: sale
#: model:ir.model,name:sale.model_sale_make_invoice
msgid "Sales Make Invoice"
msgstr "Faktura obavljene prodaje"
#. module: sale
-#: view:sale.order:0
-msgid "Recreate Packing"
-msgstr "Ponovno izradi pakiranje"
+#: code:addons/sale/sale.py:330
+#, python-format
+msgid "Pricelist Warning!"
+msgstr ""
#. module: sale
#: field:sale.order.line,discount:0
@@ -244,10 +276,10 @@ msgid "Discount (%)"
msgstr "Popust (%)"
#. module: sale
-#: help:res.company,security_lead:0
-msgid ""
-"This is the days added to what you promise to customers for security purpose"
-msgstr "Sigurnosni dani dodani na broj dana dogovorenih sa kupcima"
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_quotation_for_sale
+msgid "My Quotations"
+msgstr "Moje Ponude"
#. module: sale
#: view:board.board:0
@@ -272,7 +304,22 @@ msgid "Shop Name"
msgstr "Naziv prodavaonice"
#. module: sale
-#: code:addons/sale/sale.py:1014
+#: help:sale.order,order_policy:0
+msgid ""
+"The Invoice Policy is used to synchronise invoice and delivery operations.\n"
+" - The 'Pay before delivery' choice will first generate the invoice and "
+"then generate the picking order after the payment of this invoice.\n"
+" - The 'Deliver & Invoice on demand' will create the picking order directly "
+"and wait for the user to manually click on the 'Invoice' button to generate "
+"the draft invoice based on the sale order or the sale order lines.\n"
+" - The 'Invoice on order after delivery' choice will generate the draft "
+"invoice based on sales order after all picking lists have been finished.\n"
+" - The 'Invoice based on deliveries' choice is used to create an invoice "
+"during the picking process."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:1158
#, python-format
msgid "No Customer Defined !"
msgstr "Nije definiran kupac !"
@@ -283,9 +330,12 @@ msgid "Sales in Exception"
msgstr "Prodaje u iznimci"
#. module: sale
-#: view:sale.order:0
-msgid "Set to Draft"
-msgstr "Postavi na Nacrt"
+#: code:addons/sale/sale.py:1145
+#: code:addons/sale/sale.py:1264
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:70
+#, python-format
+msgid "Configuration Error !"
+msgstr ""
#. module: sale
#: view:sale.order:0
@@ -293,31 +343,7 @@ msgid "Conditions"
msgstr "Uvjeti"
#. module: sale
-#: help:sale.order,order_policy:0
-msgid ""
-"The Shipping Policy is used to synchronise invoice and delivery operations.\n"
-" - The 'Pay Before delivery' choice will first generate the invoice and "
-"then generate the picking order after the payment of this invoice.\n"
-" - The 'Shipping & Manual Invoice' will create the picking order directly "
-"and wait for the user to manually click on the 'Invoice' button to generate "
-"the draft invoice.\n"
-" - The 'Invoice On Order After Delivery' choice will generate the draft "
-"invoice based on sales order after all picking lists have been finished.\n"
-" - The 'Invoice From The Picking' choice is used to create an invoice "
-"during the picking process."
-msgstr ""
-"Pravila otpremanja se koriste za usklađivanje fakture i postupaka dostave.\n"
-" - 'Platiti prije dostave' izbor će prvo generirati fakturu, a zatim "
-"narudžbu za odabir nakon plaćanja ove fakture.\n"
-" - 'Otprema i ručno napravljena faktura' će izravno napraviti narudžbu za "
-"odabir i čekati da korisnik ručno pokrene kreiranje nacrta fakture klikom na "
-"gumb 'Faktura'.\n"
-" - 'Faktura na narudžbu nakon dostave' će napraviti nacrt fakture temeljen "
-"na narudžbi nakon što su sve liste odabira završene.\n"
-" - 'Faktura iz odabira' će kreirati fakturu za vrijeme postupka odabira."
-
-#. module: sale
-#: code:addons/sale/sale.py:939
+#: code:addons/sale/sale.py:1034
#, python-format
msgid ""
"There is no income category account defined in default Properties for "
@@ -327,9 +353,9 @@ msgstr ""
"kategoriju proizvoda ili Fiskalna pozicija nije definirana !"
#. module: sale
-#: view:sale.installer:0
-msgid "Configure"
-msgstr "Promijeni postavke"
+#: selection:sale.report,month:0
+msgid "August"
+msgstr "Kolovoz"
#. module: sale
#: constraint:stock.move:0
@@ -337,7 +363,7 @@ msgid "You try to assign a lot which is not from the same product"
msgstr "Pokušavate pridružiti lot koji nije iz istog proizvoda"
#. module: sale
-#: code:addons/sale/sale.py:620
+#: code:addons/sale/sale.py:655
#, python-format
msgid "invalid mode for test_state"
msgstr "Neispravan način za test_state"
@@ -348,7 +374,7 @@ msgid "June"
msgstr "Lipanj"
#. module: sale
-#: code:addons/sale/sale.py:584
+#: code:addons/sale/sale.py:617
#, python-format
msgid "Could not cancel this sales order !"
msgstr "Nije moguće otkazati ovu narudžbu !"
@@ -369,8 +395,12 @@ msgid "October"
msgstr "Listopad"
#. module: sale
+#: sql_constraint:stock.picking:0
+msgid "Reference must be unique per Company!"
+msgstr ""
+
+#. module: sale
#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_quotation_for_sale
#: view:sale.order:0
#: view:sale.report:0
msgid "Quotations"
@@ -382,11 +412,6 @@ msgid "Pricelist for current sales order."
msgstr "Cjenik za trenutnu narudžbu."
#. module: sale
-#: selection:sale.config.picking_policy,step:0
-msgid "Delivery Order Only"
-msgstr "Samo otpremnica"
-
-#. module: sale
#: report:sale.order:0
msgid "TVA :"
msgstr "TVA :"
@@ -411,6 +436,7 @@ msgstr "Porezna pozicija"
#. module: sale
#: view:sale.order:0
#: view:sale.order.line:0
+#: field:sale.report,product_uom:0
msgid "UoM"
msgstr "JM"
@@ -435,13 +461,19 @@ msgstr ""
"postupak u tijeku'."
#. module: sale
-#: code:addons/sale/sale.py:971
+#: code:addons/sale/sale.py:1061
+#, python-format
+msgid "You cannot cancel a sale order line that has already been invoiced!"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:1066
#, python-format
msgid "You must first cancel stock moves attached to this sales order line."
msgstr "Morate prije otkazati sve premještaje zalihe vezane uz ovu narudžbu."
#. module: sale
-#: code:addons/sale/sale.py:1042
+#: code:addons/sale/sale.py:1134
#, python-format
msgid "(n/a)"
msgstr "(n/a)"
@@ -479,14 +511,36 @@ msgid "Notes"
msgstr "Bilješke"
#. module: sale
+#: sql_constraint:res.company:0
+msgid "The company name must be unique !"
+msgstr ""
+
+#. module: sale
#: help:sale.order,partner_invoice_id:0
msgid "Invoice address for current sales order."
msgstr "Adresa fakture za trenutnu narudžbu."
#. module: sale
-#: view:sale.installer:0
-msgid "Enhance your core Sales Application with additional functionalities."
-msgstr "Poboljšajte aplikaciju za prodaju sa dodatnim funkcionalnostima."
+#: view:sale.report:0
+msgid "Month-1"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered month of the sales order"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:504
+#, python-format
+msgid ""
+"You cannot group sales having different currencies for the same partner."
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,picking_policy:0
+msgid "Deliver each product when available"
+msgstr ""
#. module: sale
#: field:sale.order,invoiced_rate:0
@@ -505,21 +559,43 @@ msgid "Confirmation Date"
msgstr "Datum potvrde"
#. module: sale
+#: field:sale.order,incoterm:0
+msgid "Incoterm"
+msgstr "Incoterm"
+
+#. module: sale
#: field:sale.order.line,address_allotment_id:0
msgid "Allotment Partner"
msgstr "Dodjeljeni partner"
#. module: sale
-#: sql_constraint:sale.order:0
-msgid "Order Reference must be unique !"
-msgstr ""
-
-#. module: sale
#: selection:sale.report,month:0
msgid "March"
msgstr "Ožujak"
#. module: sale
+#: constraint:stock.move:0
+msgid "You can not move products from or to a location of the type view."
+msgstr ""
+
+#. module: sale
+#: field:sale.config.picking_policy,sale_orders:0
+msgid "Based on Sales Orders"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,state:0
+msgid ""
+"Givwizard = self.browse(cr, uid, ids)[0]es the state of the quotation or "
+"sales order. \n"
+"The exception state is automatically set when a cancel operation occurs in "
+"the invoice validation (Invoice Exception) or in the picking list process "
+"(Shipping Exception). \n"
+"The 'Waiting Schedule' state is set when the invoice is confirmed but "
+"waiting for the scheduler to run on the order date."
+msgstr ""
+
+#. module: sale
#: help:sale.order,amount_total:0
msgid "The total amount."
msgstr "Ukupan iznos."
@@ -535,6 +611,11 @@ msgid "Invoice address :"
msgstr "Adresa fakture :"
#. module: sale
+#: field:sale.order.line,sequence:0
+msgid "Line Sequence"
+msgstr ""
+
+#. module: sale
#: model:process.transition,note:sale.process_transition_saleorderprocurement0
msgid ""
"For every sales order line, a procurement order is created to supply the "
@@ -585,11 +666,6 @@ msgid "Sales Order Line"
msgstr "Stavka narudžbe"
#. module: sale
-#: view:sale.config.picking_policy:0
-msgid "Setup your sales workflow and default values."
-msgstr "Podesi radni slijed i standardne vrijednosti."
-
-#. module: sale
#: field:sale.shop,warehouse_id:0
msgid "Warehouse"
msgstr "Skladište"
@@ -626,6 +702,11 @@ msgid "Creation Date"
msgstr "Datum kreiranja"
#. module: sale
+#: model:ir.ui.menu,name:sale.menu_sales_configuration_misc
+msgid "Miscellaneous"
+msgstr ""
+
+#. module: sale
#: model:ir.actions.act_window,name:sale.action_order_line_tree3
msgid "Uninvoiced and Delivered Lines"
msgstr "Nefakturirane i dostavljene stavke"
@@ -641,14 +722,19 @@ msgid "My Sales"
msgstr "Moje prodaje"
#. module: sale
-#: code:addons/sale/sale.py:290
-#: code:addons/sale/sale.py:966
-#: code:addons/sale/sale.py:1165
+#: code:addons/sale/sale.py:295
+#: code:addons/sale/sale.py:1061
+#: code:addons/sale/sale.py:1290
#, python-format
msgid "Invalid action !"
msgstr "Neispravna akcija !"
#. module: sale
+#: view:sale.order:0
+msgid "Extra Info"
+msgstr "Dodatne informacije"
+
+#. module: sale
#: field:sale.order,pricelist_id:0
#: field:sale.report,pricelist_id:0
#: field:sale.shop,pricelist_id:0
@@ -662,13 +748,21 @@ msgid "# of Qty"
msgstr "# količine"
#. module: sale
+#: code:addons/sale/sale.py:1314
+#, python-format
+msgid "Hour"
+msgstr ""
+
+#. module: sale
#: view:sale.order:0
msgid "Order Date"
msgstr "Datum narudžbe"
#. module: sale
#: view:sale.order.line:0
+#: view:sale.report:0
#: field:sale.report,shipped:0
+#: field:sale.report,shipped_qty_1:0
msgid "Shipped"
msgstr "Otpremljeno"
@@ -678,9 +772,9 @@ msgid "All Quotations"
msgstr "Sve ponude"
#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Invoice On Order After Delivery"
-msgstr "Faktura na narudžbu nakon dostave"
+#: view:sale.config.picking_policy:0
+msgid "Options"
+msgstr ""
#. module: sale
#: selection:sale.report,month:0
@@ -688,6 +782,20 @@ msgid "September"
msgstr "Rujan"
#. module: sale
+#: code:addons/sale/sale.py:632
+#, python-format
+msgid "You cannot confirm a sale order which has no line."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:1246
+#, python-format
+msgid ""
+"You have to select a pricelist or a customer in the sales form !\n"
+"Please set one before choosing a product."
+msgstr ""
+
+#. module: sale
#: view:sale.report:0
#: field:sale.report,categ_id:0
msgid "Category of Product"
@@ -704,11 +812,6 @@ msgid "Stock Moves"
msgstr "Premještaj zalihe"
#. module: sale
-#: view:sale.report:0
-msgid " Year "
-msgstr " Godina "
-
-#. module: sale
#: field:sale.order,state:0
#: field:sale.report,state:0
msgid "Order State"
@@ -726,7 +829,7 @@ msgid "Sales By Month"
msgstr "Prodaje po mjesecu"
#. module: sale
-#: code:addons/sale/sale.py:970
+#: code:addons/sale/sale.py:1065
#, python-format
msgid "Could not cancel sales order line!"
msgstr "Nije moguće otkazati stavke narudžbe !"
@@ -761,64 +864,19 @@ msgstr ""
"pokretanja planera."
#. module: sale
+#: field:sale.order,date_order:0
+msgid "Date"
+msgstr ""
+
+#. module: sale
#: view:sale.report:0
msgid "Extended Filters..."
msgstr "Prošireni filteri..."
#. module: sale
-#: model:ir.module.module,description:sale.module_meta_information
-msgid ""
-"\n"
-" The base module to manage quotations and sales orders.\n"
-"\n"
-" * Workflow with validation steps:\n"
-" - Quotation -> Sales order -> Invoice\n"
-" * Invoicing methods:\n"
-" - Invoice on order (before or after shipping)\n"
-" - Invoice on delivery\n"
-" - Invoice on timesheets\n"
-" - Advance invoice\n"
-" * Partners preferences (shipping, invoicing, incoterm, ...)\n"
-" * Products stocks and prices\n"
-" * Delivery methods:\n"
-" - all at once, multi-parcel\n"
-" - delivery costs\n"
-" * Dashboard for salesman that includes:\n"
-" * Your open quotations\n"
-" * Top 10 sales of the month\n"
-" * Cases statistics\n"
-" * Graph of sales by product\n"
-" * Graph of cases of the month\n"
-" "
-msgstr ""
-"\n"
-" Osnovni modul za upravljanje ponudama i narudžbama.\n"
-"\n"
-" * Radni slijed sa koracima provjere:\n"
-" - Ponuda -> Narudžba -> Faktura\n"
-" * Načini fakturiranja:\n"
-" - Faktura prema narudžbi (prije ili poslije otpremanja)\n"
-" - Faktura prema dostavi\n"
-" - Faktura prema vremenskom rasporedu\n"
-" - Faktura predujma\n"
-" * Postavke partnera (otpremanje, fakturiranje,incoterm, ...)\n"
-" * Zalihe i cijene proizvoda\n"
-" * Načini dostavljanja:\n"
-" - Sve odjednom, više pošiljki\n"
-" - troškovi dostave\n"
-" * Upravljačka ploča za prodavača uključuje:\n"
-" * Vaše otvorene ponude\n"
-" * Top 10 prodaja mjeseca\n"
-" * Statistike pakiranja\n"
-" * Graf prodaje po kutijama\n"
-" * Graf kutija po mjesecu\n"
-" "
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_shop
-#: view:sale.shop:0
-msgid "Sales Shop"
-msgstr "Prodavaonica"
+#: selection:sale.order.line,state:0
+msgid "Exception"
+msgstr "Iznimka"
#. module: sale
#: model:ir.model,name:sale.model_res_company
@@ -826,9 +884,10 @@ msgid "Companies"
msgstr "Tvrtke"
#. module: sale
-#: selection:sale.report,month:0
-msgid "November"
-msgstr "Studeni"
+#: code:addons/sale/sale.py:1259
+#, python-format
+msgid "No valid pricelist line found ! :"
+msgstr ""
#. module: sale
#: view:sale.order:0
@@ -836,9 +895,9 @@ msgid "History"
msgstr "Povijest"
#. module: sale
-#: field:sale.config.picking_policy,picking_policy:0
-msgid "Picking Default Policy"
-msgstr "Postavljena pravila odabira"
+#: selection:sale.order,order_policy:0
+msgid "Invoice on order after delivery"
+msgstr ""
#. module: sale
#: help:sale.order,invoice_ids:0
@@ -862,13 +921,12 @@ msgid ""
msgstr "Ime i adresa kontakta koji je zahtijevao narudžbu ili ponudu."
#. module: sale
-#: code:addons/sale/sale.py:966
-#, python-format
-msgid "You cannot cancel a sales order line that has already been invoiced !"
-msgstr "Ne možete otkazati stavku narudžbe koja je već fakturirana !"
+#: help:res.company,security_lead:0
+msgid ""
+"This is the days added to what you promise to customers for security purpose"
+msgstr "Sigurnosni dani dodani na broj dana dogovorenih sa kupcima"
#. module: sale
-#: view:sale.order:0
#: view:sale.order.line:0
msgid "Qty"
msgstr "Količina"
@@ -879,6 +937,11 @@ msgid "References"
msgstr "Reference"
#. module: sale
+#: view:sale.order.line:0
+msgid "My Sales Order Lines"
+msgstr ""
+
+#. module: sale
#: model:process.transition.action,name:sale.process_transition_action_cancel0
#: model:process.transition.action,name:sale.process_transition_action_cancel1
#: model:process.transition.action,name:sale.process_transition_action_cancel2
@@ -890,14 +953,9 @@ msgid "Cancel"
msgstr "Odustani"
#. module: sale
-#: field:sale.installer,sale_order_dates:0
-msgid "Sales Order Dates"
-msgstr "Datumi naručivanja"
-
-#. module: sale
-#: selection:sale.order.line,state:0
-msgid "Exception"
-msgstr "Iznimka"
+#: sql_constraint:sale.order:0
+msgid "Order Reference must be unique per Company!"
+msgstr ""
#. module: sale
#: model:process.transition,name:sale.process_transition_invoice0
@@ -909,19 +967,19 @@ msgid "Create Invoice"
msgstr "Napravi fakturu"
#. module: sale
-#: field:sale.installer,sale_margin:0
-msgid "Margins in Sales Orders"
-msgstr "Margine u narudžbama"
-
-#. module: sale
#: view:sale.order:0
msgid "Total Tax Excluded"
msgstr "Ukupan izuzeti porez"
#. module: sale
-#: view:sale.order:0
-msgid "Compute"
-msgstr "Izračunaj"
+#: view:sale.order.line:0
+msgid "Order reference"
+msgstr ""
+
+#. module: sale
+#: view:sale.open.invoice:0
+msgid "You invoice has been successfully created!"
+msgstr "Vaša faktura je uspješno kreirana!"
#. module: sale
#: view:sale.report:0
@@ -940,23 +998,20 @@ msgid "Open Invoice"
msgstr "Otvorena faktura"
#. module: sale
-#: report:sale.order:0
-#: view:sale.order.line:0
-msgid "Price"
-msgstr "Cijena"
+#: model:ir.actions.server,name:sale.ir_actions_server_edi_sale
+msgid "Auto-email confirmed sale orders"
+msgstr ""
#. module: sale
-#: model:ir.actions.act_window,name:sale.action_sale_installer
-#: view:sale.config.picking_policy:0
-#: view:sale.installer:0
-msgid "Sales Application Configuration"
-msgstr "Konfiguracija aplikacije"
+#: code:addons/sale/sale.py:413
+#, python-format
+msgid "There is no sales journal defined for this company: \"%s\" (id:%d)"
+msgstr "ne postoji dnevnik prodaje definiran za ovu tvrtku: \"%s\" (id:%d)"
#. module: sale
-#: view:sale.report:0
-#: field:sale.report,price_total:0
-msgid "Total Price"
-msgstr "Ukupna cijena"
+#: model:process.transition.action,name:sale.process_transition_action_forceassignation0
+msgid "Force Assignation"
+msgstr "Prisilno dodijeljivanje"
#. module: sale
#: selection:sale.order.line,type:0
@@ -969,6 +1024,11 @@ msgid "Based on the shipped or on the ordered quantities."
msgstr "Temeljeno na otpremljenim ili naručenim količinama."
#. module: sale
+#: selection:sale.order,picking_policy:0
+msgid "Deliver all products at once"
+msgstr ""
+
+#. module: sale
#: field:sale.order,picking_ids:0
msgid "Related Picking"
msgstr "Pripadajući odabir"
@@ -1000,9 +1060,15 @@ msgid "Create Delivery Order"
msgstr "Napravi otpremnicu"
#. module: sale
-#: field:sale.installer,delivery:0
-msgid "Delivery Costs"
-msgstr "Troškovi dostave"
+#: code:addons/sale/sale.py:1290
+#, python-format
+msgid "Cannot delete a sales order line which is in state '%s'!"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Qty(UoS)"
+msgstr ""
#. module: sale
#: view:sale.order:0
@@ -1016,13 +1082,13 @@ msgstr "Napravi listu odabira"
#. module: sale
#: view:sale.report:0
-msgid "Sales by Product Category"
-msgstr "Prodaje po kategoriji proizvoda"
+msgid "Ordered date of the sales order"
+msgstr ""
#. module: sale
-#: selection:sale.order,picking_policy:0
-msgid "Partial Delivery"
-msgstr "Djelomična isporuka"
+#: view:sale.report:0
+msgid "Sales by Product Category"
+msgstr "Prodaje po kategoriji proizvoda"
#. module: sale
#: model:process.transition,name:sale.process_transition_confirmquotation0
@@ -1030,9 +1096,10 @@ msgid "Confirm Quotation"
msgstr "Potvrdite ponudu"
#. module: sale
-#: help:sale.order,origin:0
-msgid "Reference of the document that generated this sales order request."
-msgstr "Referenca na dokument koji je generirao ovu narudžbenicu."
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:63
+#, python-format
+msgid "Error"
+msgstr "Pogreška"
#. module: sale
#: view:sale.order:0
@@ -1064,20 +1131,14 @@ msgid "Procurement Method"
msgstr "Metoda nabave"
#. module: sale
-#: view:sale.config.picking_policy:0
-#: view:sale.installer:0
-msgid "title"
-msgstr "naslov"
-
-#. module: sale
#: model:process.node,name:sale.process_node_packinglist0
msgid "Pick List"
msgstr "Lista odabira"
#. module: sale
#: view:sale.order:0
-msgid "Order date"
-msgstr "Datum narudžbe"
+msgid "Set to Draft"
+msgstr "Postavi na Nacrt"
#. module: sale
#: model:process.node,note:sale.process_node_packinglist0
@@ -1085,6 +1146,85 @@ msgid "Document of the move to the output or to the customer."
msgstr "Dokument premještaja na izlaz ili kod kupca."
#. module: sale
+#: model:email.template,body_text:sale.email_template_edi_sale
+msgid ""
+"\n"
+"Hello${object.partner_order_id.name and ' ' or "
+"''}${object.partner_order_id.name or ''},\n"
+"\n"
+"Here is your order confirmation for ${object.partner_id.name}:\n"
+" | Order number: *${object.name}*\n"
+" | Order total: *${object.amount_total} "
+"${object.pricelist_id.currency_id.name}*\n"
+" | Order date: ${object.date_order}\n"
+" % if object.origin:\n"
+" | Order reference: ${object.origin}\n"
+" % endif\n"
+" % if object.client_order_ref:\n"
+" | Your reference: ${object.client_order_ref}<br />\n"
+" % endif\n"
+" | Your contact: ${object.user_id.name} ${object.user_id.user_email "
+"and '<%s>'%(object.user_id.user_email) or ''}\n"
+"\n"
+"You can view the order confirmation, download it and even pay online using "
+"the following link:\n"
+" ${ctx.get('edi_web_url_view') or 'n/a'}\n"
+"\n"
+"% if object.order_policy in ('prepaid','manual') and "
+"object.company_id.paypal_account:\n"
+"<% \n"
+"comp_name = quote(object.company_id.name)\n"
+"order_name = quote(object.name)\n"
+"paypal_account = quote(object.company_id.paypal_account)\n"
+"order_amount = quote(str(object.amount_total))\n"
+"cur_name = quote(object.pricelist_id.currency_id.name)\n"
+"paypal_url = \"https://www.paypal.com/cgi-"
+"bin/webscr?cmd=_xclick&business=%s&item_name=%s%%20Order%%20%s&invoice=%s&amo"
+"unt=%s\" \\\n"
+" "
+"\"&currency_code=%s&button_subtype=services&no_note=1&bn=OpenERP_Order_PayNow"
+"_%s\" % \\\n"
+" "
+"(paypal_account,comp_name,order_name,order_name,order_amount,cur_name,cur_nam"
+"e)\n"
+"%>\n"
+"It is also possible to directly pay with Paypal:\n"
+" ${paypal_url}\n"
+"% endif\n"
+"\n"
+"If you have any question, do not hesitate to contact us.\n"
+"\n"
+"\n"
+"Thank you for choosing ${object.company_id.name}!\n"
+"\n"
+"\n"
+"--\n"
+"${object.user_id.name} ${object.user_id.user_email and "
+"'<%s>'%(object.user_id.user_email) or ''}\n"
+"${object.company_id.name}\n"
+"% if object.company_id.street:\n"
+"${object.company_id.street or ''}\n"
+"% endif\n"
+"% if object.company_id.street2:\n"
+"${object.company_id.street2}\n"
+"% endif\n"
+"% if object.company_id.city or object.company_id.zip:\n"
+"${object.company_id.zip or ''} ${object.company_id.city or ''}\n"
+"% endif\n"
+"% if object.company_id.country_id:\n"
+"${object.company_id.state_id and ('%s, ' % object.company_id.state_id.name) "
+"or ''} ${object.company_id.country_id.name or ''}\n"
+"% endif\n"
+"% if object.company_id.phone:\n"
+"Phone: ${object.company_id.phone}\n"
+"% endif\n"
+"% if object.company_id.website:\n"
+"${object.company_id.website or ''}\n"
+"% endif\n"
+" "
+msgstr ""
+
+#. module: sale
#: model:process.transition.action,name:sale.process_transition_action_validate0
msgid "Validate"
msgstr "Ovjeri"
@@ -1107,9 +1247,9 @@ msgid "Taxes"
msgstr "Porezi"
#. module: sale
-#: field:sale.order,order_policy:0
-msgid "Shipping Policy"
-msgstr "Pravila otpreme"
+#: view:sale.order:0
+msgid "Sales Order ready to be invoiced"
+msgstr ""
#. module: sale
#: help:sale.order,create_date:0
@@ -1128,9 +1268,9 @@ msgid "Create Invoices"
msgstr "Napravi fakture"
#. module: sale
-#: view:sale.order:0
-msgid "Extra Info"
-msgstr "Dodatne informacije"
+#: view:sale.report:0
+msgid "Sales order created in current month"
+msgstr ""
#. module: sale
#: report:sale.order:0
@@ -1138,11 +1278,24 @@ msgid "Fax :"
msgstr "Faks:"
#. module: sale
+#: help:sale.order.line,type:0
+msgid ""
+"If 'on order', it triggers a procurement when the sale order is confirmed to "
+"create a task, purchase order or manufacturing order linked to this sale "
+"order line."
+msgstr ""
+
+#. module: sale
#: field:sale.advance.payment.inv,amount:0
msgid "Advance Amount"
msgstr "Iznos predujma"
#. module: sale
+#: field:sale.config.picking_policy,charge_delivery:0
+msgid "Do you charge the delivery?"
+msgstr ""
+
+#. module: sale
#: selection:sale.order,invoice_quantity:0
msgid "Shipped Quantities"
msgstr "Otpremljene količine"
@@ -1153,25 +1306,45 @@ msgid "Invoice Based on Sales Orders"
msgstr "Faktura na temelju narudžbi"
#. module: sale
+#: code:addons/sale/sale.py:331
+#, python-format
+msgid ""
+"If you change the pricelist of this order (and eventually the currency), "
+"prices of existing order lines will not be updated."
+msgstr ""
+
+#. module: sale
#: model:ir.model,name:sale.model_stock_picking
msgid "Picking List"
msgstr "Lista odabira"
#. module: sale
-#: code:addons/sale/sale.py:387
-#: code:addons/sale/sale.py:920
-#: code:addons/sale/sale.py:938
+#: code:addons/sale/sale.py:412
+#: code:addons/sale/sale.py:503
+#: code:addons/sale/sale.py:632
+#: code:addons/sale/sale.py:1015
+#: code:addons/sale/sale.py:1033
#, python-format
msgid "Error !"
msgstr "Pogreška !"
#. module: sale
-#: code:addons/sale/sale.py:570
+#: code:addons/sale/sale.py:603
#, python-format
msgid "Could not cancel sales order !"
msgstr "Nije moguće otkazati narudžbu !"
#. module: sale
+#: view:sale.order:0
+msgid "Qty(UoM)"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered Year of the sales order"
+msgstr ""
+
+#. module: sale
#: selection:sale.report,month:0
msgid "July"
msgstr "Srpanj"
@@ -1188,36 +1361,26 @@ msgid "Shipping Exception"
msgstr "Izuzetak kod otpreme"
#. module: sale
-#: field:sale.make.invoice,grouped:0
-msgid "Group the invoices"
-msgstr "Grupiraj fakture"
-
-#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Shipping & Manual Invoice"
-msgstr "Otprema i ručno napravljena faktura"
-
-#. module: sale
-#: code:addons/sale/sale.py:1051
+#: code:addons/sale/sale.py:1143
#, python-format
-msgid "Picking Information !"
-msgstr "Informacija odabira !"
+msgid "Picking Information ! : "
+msgstr ""
#. module: sale
-#: view:sale.report:0
-#: field:sale.report,month:0
-msgid "Month"
-msgstr "Mjesec"
+#: field:sale.make.invoice,grouped:0
+msgid "Group the invoices"
+msgstr "Grupiraj fakture"
#. module: sale
-#: model:ir.module.module,shortdesc:sale.module_meta_information
-msgid "Sales Management"
-msgstr "Upravljanje prodajom"
+#: field:sale.order,order_policy:0
+msgid "Invoice Policy"
+msgstr ""
#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Invoice From The Picking"
-msgstr "Faktura iz odabira"
+#: model:ir.actions.act_window,name:sale.action_config_picking_policy
+#: view:sale.config.picking_policy:0
+msgid "Setup your Invoicing Method"
+msgstr ""
#. module: sale
#: model:process.node,note:sale.process_node_invoice0
@@ -1226,32 +1389,31 @@ msgstr "Potreban pregled od strane računovođe."
#. module: sale
#: view:sale.report:0
-#: field:sale.report,uom_name:0
msgid "Reference UoM"
msgstr ""
#. module: sale
+#: view:sale.config.picking_policy:0
+msgid ""
+"This tool will help you to install the right module and configure the system "
+"according to the method you use to invoice your customers."
+msgstr ""
+
+#. module: sale
#: model:ir.model,name:sale.model_sale_order_line_make_invoice
msgid "Sale OrderLine Make_invoice"
msgstr "Sale OrderLine Make_invoice"
#. module: sale
-#: help:sale.config.picking_policy,step:0
-msgid ""
-"By default, OpenERP is able to manage complex routing and paths of products "
-"in your warehouse and partner locations. This will configure the most common "
-"and simple methods to deliver products to the customer in one or two "
-"operations by the worker."
-msgstr ""
-"Uobičajeno, OpenERP može upravljati kompleksnim rutiranjem i putevima "
-"proizvoda u vašem skladištu i na partnerskim lokacijama. Ovo će definirati "
-"uobičajene i jednostavne metode za dostavu proizvoda kupcu sa jednom do "
-"dvije akcije radnika."
+#: selection:sale.order,state:0
+#: selection:sale.report,state:0
+msgid "Invoice Exception"
+msgstr "Iznimka fakture"
#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_tree
-msgid "Old Quotations"
-msgstr "Stare ponude"
+#: model:process.node,note:sale.process_node_saleorder0
+msgid "Drives procurement and invoicing"
+msgstr "Izvršava nabavu i fakturiranje"
#. module: sale
#: field:sale.order,invoiced:0
@@ -1266,6 +1428,22 @@ msgid "Sales Analysis"
msgstr "Analiza prodaje"
#. module: sale
+#: code:addons/sale/sale.py:1138
+#, python-format
+msgid ""
+"You selected a quantity of %d Units.\n"
+"But it's not compatible with the selected packaging.\n"
+"Here is a proposition of quantities according to the packaging:\n"
+"EAN: %s Quantity: %s Type of ul: %s"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Recreate Packing"
+msgstr "Ponovno izradi pakiranje"
+
+#. module: sale
+#: view:sale.order:0
#: field:sale.order.line,property_ids:0
msgid "Properties"
msgstr "Svojstva"
@@ -1295,7 +1473,17 @@ msgid ""
msgstr "Možete napraviti fakture prema narudžbama ili otpremnicama."
#. module: sale
-#: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
+#: view:sale.order.line:0
+msgid "Confirmed sale order lines, not yet delivered"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:473
+#, python-format
+msgid "Customer Invoices"
+msgstr ""
+
+#. module: sale
#: model:process.process,name:sale.process_process_salesprocess0
#: view:sale.order:0
#: view:sale.report:0
@@ -1317,18 +1505,13 @@ msgid "Done"
msgstr "Završeno"
#. module: sale
-#: model:ir.model,name:sale.model_sale_installer
-msgid "sale.installer"
-msgstr "sale.installer"
-
-#. module: sale
#: model:process.node,name:sale.process_node_invoice0
#: model:process.node,name:sale.process_node_invoiceafterdelivery0
msgid "Invoice"
msgstr "Faktura"
#. module: sale
-#: code:addons/sale/sale.py:1014
+#: code:addons/sale/sale.py:1158
#, python-format
msgid ""
"You have to select a customer in the sales form !\n"
@@ -1338,11 +1521,6 @@ msgstr ""
"Odaberite kupca prije odabira proizvoda."
#. module: sale
-#: selection:sale.config.picking_policy,step:0
-msgid "Picking List & Delivery Order"
-msgstr "Lista odabira i otpremnice"
-
-#. module: sale
#: field:sale.order,origin:0
msgid "Source Document"
msgstr "Izvorni dokument"
@@ -1368,7 +1546,7 @@ msgid "The amount without tax."
msgstr "Iznos bez poreza."
#. module: sale
-#: code:addons/sale/sale.py:571
+#: code:addons/sale/sale.py:604
#, python-format
msgid "You must first cancel all picking attached to this sales order."
msgstr "Morate prije otkazati sve odabire vezane uz ovu narudžbu."
@@ -1379,9 +1557,15 @@ msgid "Sales Advance Payment Invoice"
msgstr "Faktura za predujam plaćanja"
#. module: sale
-#: field:sale.order,incoterm:0
-msgid "Incoterm"
-msgstr "Incoterm"
+#: view:sale.report:0
+#: field:sale.report,month:0
+msgid "Month"
+msgstr "Mjesec"
+
+#. module: sale
+#: model:email.template,subject:sale.email_template_edi_sale
+msgid "${object.company_id.name} Order (Ref ${object.name or 'n/a' })"
+msgstr ""
#. module: sale
#: view:sale.order.line:0
@@ -1392,11 +1576,6 @@ msgid "Product"
msgstr "Proizvod"
#. module: sale
-#: model:ir.ui.menu,name:sale.menu_invoiced
-msgid "Invoicing"
-msgstr "Fakturiranje"
-
-#. module: sale
#: model:process.transition.action,name:sale.process_transition_action_cancelassignation0
msgid "Cancel Assignation"
msgstr "Otkaži dodjelu"
@@ -1407,20 +1586,11 @@ msgid "sale.config.picking_policy"
msgstr "sale.config.picking_policy"
#. module: sale
-#: help:sale.order,state:0
-msgid ""
-"Gives the state of the quotation or sales order. \n"
-"The exception state is automatically set when a cancel operation occurs in "
-"the invoice validation (Invoice Exception) or in the picking list process "
-"(Shipping Exception). \n"
-"The 'Waiting Schedule' state is set when the invoice is confirmed but "
-"waiting for the scheduler to run on the date 'Ordered Date'."
+#: view:account.invoice.report:0
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_turnover_by_month
+msgid "Monthly Turnover"
msgstr ""
-"Daje stanje ponude ili narudžbe.\n"
-"Stanje iznimke se postavlja automatski pri otkazivanju u validaciji fakture "
-"(Iznimka fakture) ili u procesu liste odabira (Iznimka otpreme).\n"
-"Stanje 'Čeka raspored' se postavlja kada je faktura potvrđena, ali čeka da "
-"planer pokrene akciju na datum 'Datum naručivanja'"
#. module: sale
#: field:sale.order,invoice_quantity:0
@@ -1438,7 +1608,6 @@ msgid "Product UoS"
msgstr "Proizvod - jedinica prodaje"
#. module: sale
-#: selection:sale.order,state:0
#: selection:sale.report,state:0
msgid "Manual In Progress"
msgstr "Ručni postupak u tijeku"
@@ -1459,7 +1628,8 @@ msgid "Order"
msgstr "Narudžba"
#. module: sale
-#: code:addons/sale/sale.py:921
+#: code:addons/sale/sale.py:1016
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:71
#, python-format
msgid "There is no income account defined for this product: \"%s\" (id:%d)"
msgstr "Ne postoji konto dohotka definiran za ovaj proizvod: \"%s\" (id:%d)"
@@ -1482,7 +1652,7 @@ msgstr ""
"fakturu ili otpremnicu onog trenutka kada je prodavač potvrdi."
#. module: sale
-#: code:addons/sale/sale.py:1116
+#: code:addons/sale/sale.py:1238
#, python-format
msgid ""
"You plan to sell %.2f %s but you only have %.2f %s available !\n"
@@ -1513,10 +1683,10 @@ msgid "Total"
msgstr "Ukupno"
#. module: sale
-#: code:addons/sale/sale.py:388
-#, python-format
-msgid "There is no sales journal defined for this company: \"%s\" (id:%d)"
-msgstr "ne postoji dnevnik prodaje definiran za ovu tvrtku: \"%s\" (id:%d)"
+#: report:sale.order:0
+#: view:sale.order.line:0
+msgid "Price"
+msgstr "Cijena"
#. module: sale
#: model:process.transition,note:sale.process_transition_deliver0
@@ -1529,10 +1699,15 @@ msgstr ""
"područja i kupca se izvršava preko otpremnice ručno ili automatski."
#. module: sale
-#: code:addons/sale/sale.py:1165
-#, python-format
-msgid "Cannot delete a sales order line which is %s !"
-msgstr "Ne možete pobrisati stavku narudžbe koja je %s !"
+#: selection:sale.order,order_policy:0
+msgid "Pay before delivery"
+msgstr ""
+
+#. module: sale
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.open_board_sales
+msgid "Sales Dashboard"
+msgstr ""
#. module: sale
#: model:ir.actions.act_window,name:sale.action_sale_order_make_invoice
@@ -1543,6 +1718,7 @@ msgstr "Napravi fakture"
#. module: sale
#: view:sale.order:0
+#: selection:sale.order,state:0
#: view:sale.order.line:0
msgid "To Invoice"
msgstr "Za fakturirati"
@@ -1553,6 +1729,11 @@ msgid "Date on which sales order is confirmed."
msgstr "Datum potvrde narudžbe"
#. module: sale
+#: field:sale.order,project_id:0
+msgid "Contract/Analytic Account"
+msgstr ""
+
+#. module: sale
#: field:sale.order,company_id:0
#: field:sale.order.line,company_id:0
#: view:sale.report:0
@@ -1572,10 +1753,12 @@ msgid "The amount to be invoiced in advance."
msgstr "Iznos za fakturiranje unaprijed."
#. module: sale
-#: selection:sale.order,state:0
-#: selection:sale.report,state:0
-msgid "Invoice Exception"
-msgstr "Iznimka fakture"
+#: code:addons/sale/sale.py:1256
+#, python-format
+msgid ""
+"Couldn't find a pricelist line matching this product and quantity.\n"
+"You have to change either the product, the quantity or the pricelist."
+msgstr ""
#. module: sale
#: help:sale.order,picking_ids:0
@@ -1584,15 +1767,6 @@ msgid ""
msgstr "Ovo je lista odabira koju je napravila narudžba."
#. module: sale
-#: help:sale.installer,sale_margin:0
-msgid ""
-"Gives the margin of profitability by calculating the difference between Unit "
-"Price and Cost Price."
-msgstr ""
-"Daje marginu profitabilnosti izračunom razlike prodajne cijene i cijene "
-"troška."
-
-#. module: sale
#: view:sale.make.invoice:0
#: view:sale.order.line.make.invoice:0
msgid "Create invoices"
@@ -1611,6 +1785,11 @@ msgid "Cancelled"
msgstr "Otkazano"
#. module: sale
+#: view:sale.order.line:0
+msgid "Sales Order Lines related to a Sales Order of mine"
+msgstr ""
+
+#. module: sale
#: model:ir.actions.act_window,name:sale.action_shop_form
#: model:ir.ui.menu,name:sale.menu_action_shop_form
#: field:sale.order,shop_id:0
@@ -1620,17 +1799,12 @@ msgid "Shop"
msgstr "Prodavaonica"
#. module: sale
-#: view:sale.report:0
-msgid " Month "
-msgstr " Mjesec "
-
-#. module: sale
#: field:sale.report,date_confirm:0
msgid "Date Confirm"
msgstr "Datum potvrde"
#. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:111
+#: code:addons/sale/wizard/sale_line_invoice.py:113
#, python-format
msgid "Warning"
msgstr "Upozorenje"
@@ -1642,22 +1816,6 @@ msgid "Sales by Month"
msgstr "Prodaje po mjesecu"
#. module: sale
-#: code:addons/sale/sale.py:1045
-#, python-format
-msgid ""
-"You selected a quantity of %d Units.\n"
-"But it's not compatible with the selected packaging.\n"
-"Here is a proposition of quantities according to the packaging:\n"
-"\n"
-"EAN: %s Quantity: %s Type of ul: %s"
-msgstr ""
-"Odabrali ste %d jedinica.\n"
-"Ali nije kompatibilno sa odabranim pakiranjem\n"
-"Prijedlog količina prema pakiranju:\n"
-"\n"
-"EAN: %s Količina: %s Vrsta ul: %s"
-
-#. module: sale
#: model:ir.model,name:sale.model_sale_order
#: model:process.node,name:sale.process_node_order0
#: model:process.node,name:sale.process_node_saleorder0
@@ -1673,6 +1831,11 @@ msgid "Quantity (UoS)"
msgstr "Količina (JP)"
#. module: sale
+#: view:sale.order.line:0
+msgid "Sale Order Lines that are in 'done' state"
+msgstr ""
+
+#. module: sale
#: model:process.transition,note:sale.process_transition_packing0
msgid ""
"The Pick List form is created as soon as the sales order is confirmed, in "
@@ -1691,6 +1854,11 @@ msgid "Confirmed"
msgstr "Potvrđeno"
#. module: sale
+#: field:sale.config.picking_policy,order_policy:0
+msgid "Main Method Based On"
+msgstr ""
+
+#. module: sale
#: model:process.transition.action,name:sale.process_transition_action_confirm0
msgid "Confirm"
msgstr "Potvrdi"
@@ -1713,6 +1881,7 @@ msgid "Invoice Lines"
msgstr "Stavke fakture"
#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_product_tree
#: view:sale.order:0
#: view:sale.order.line:0
msgid "Sales Order Lines"
@@ -1729,33 +1898,18 @@ msgid "Configuration"
msgstr "Konfiguracija"
#. module: sale
-#: selection:sale.order,picking_policy:0
-msgid "Complete Delivery"
-msgstr "Zaključite isporuku"
+#: code:addons/sale/edi/sale_order.py:146
+#, python-format
+msgid "EDI Pricelist (%s)"
+msgstr ""
#. module: sale
#: view:sale.report:0
-msgid " Month-1 "
-msgstr " Mjesec-1 "
-
-#. module: sale
-#: help:sale.config.picking_policy,picking_policy:0
-msgid ""
-"The Shipping Policy is used to configure per order if you want to deliver as "
-"soon as possible when one product is available or you wait that all products "
-"are available.."
+msgid "Sales order created in current year"
msgstr ""
-"Pravila otpremanja se koriste za definiranje (prema pojedinoj narudžbi) "
-"želite li da se roba dostavlja čim je jedan proizvod dostupan ili će se "
-"čekati dostupnost svih proizvoda."
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "August"
-msgstr "Kolovoz"
#. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:111
+#: code:addons/sale/wizard/sale_line_invoice.py:113
#, python-format
msgid ""
"Invoice cannot be created for this Sales Order Line due to one of the "
@@ -1768,6 +1922,11 @@ msgstr ""
"2.Stavka je već fakturirana!"
#. module: sale
+#: view:sale.order.line:0
+msgid "Sale order lines done"
+msgstr ""
+
+#. module: sale
#: field:sale.order.line,th_weight:0
msgid "Weight"
msgstr "Težina"
@@ -1786,7 +1945,6 @@ msgstr "Prosinac"
#. module: sale
#: field:sale.config.picking_policy,config_logo:0
-#: field:sale.installer,config_logo:0
msgid "Image"
msgstr "Slika"
@@ -1819,9 +1977,9 @@ msgid "Salesman"
msgstr "Prodavač"
#. module: sale
-#: model:process.node,note:sale.process_node_saleorder0
-msgid "Drives procurement and invoicing"
-msgstr "Izvršava nabavu i fakturiranje"
+#: model:ir.actions.act_window,name:sale.action_order_tree
+msgid "Old Quotations"
+msgstr "Stare ponude"
#. module: sale
#: field:sale.order,amount_untaxed:0
@@ -1829,7 +1987,7 @@ msgid "Untaxed Amount"
msgstr "Iznos bez poreza"
#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:163
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:170
#: model:ir.actions.act_window,name:sale.action_view_sale_advance_payment_inv
#: view:sale.advance.payment.inv:0
#: view:sale.order:0
@@ -1838,7 +1996,7 @@ msgid "Advance Invoice"
msgstr "Faktura predujma"
#. module: sale
-#: code:addons/sale/sale.py:591
+#: code:addons/sale/sale.py:624
#, python-format
msgid "The sales order '%s' has been cancelled."
msgstr "Narudžba '%s' je otkazana."
@@ -1882,20 +2040,20 @@ msgid "Packings"
msgstr "Pakiranja"
#. module: sale
-#: field:sale.config.picking_policy,progress:0
-#: field:sale.installer,progress:0
-msgid "Configuration Progress"
-msgstr "Tijek konfiguracije"
+#: view:sale.order.line:0
+msgid "Sale Order Lines ready to be invoiced"
+msgstr ""
#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_product_tree
-msgid "Product sales"
-msgstr "Prodaje proizvoda"
+#: view:sale.report:0
+msgid "Sales order created in last month"
+msgstr ""
#. module: sale
-#: field:sale.order,date_order:0
-msgid "Ordered Date"
-msgstr "Datum naručivanja"
+#: model:ir.actions.act_window,name:sale.action_email_templates
+#: model:ir.ui.menu,name:sale.menu_email_templates
+msgid "Email Templates"
+msgstr ""
#. module: sale
#: model:ir.actions.act_window,name:sale.action_order_form
@@ -1905,14 +2063,15 @@ msgid "Sales Orders"
msgstr "Narudžbe"
#. module: sale
-#: selection:sale.config.picking_policy,picking_policy:0
-msgid "Direct Delivery"
-msgstr "Izravna isporuka"
+#: model:ir.model,name:sale.model_sale_shop
+#: view:sale.shop:0
+msgid "Sales Shop"
+msgstr "Prodavaonica"
#. module: sale
-#: field:sale.installer,sale_journal:0
-msgid "Invoicing journals"
-msgstr "Dnevnici fakturiranja"
+#: selection:sale.report,month:0
+msgid "November"
+msgstr "Studeni"
#. module: sale
#: field:sale.advance.payment.inv,product_id:0
@@ -1920,18 +2079,12 @@ msgid "Advance Product"
msgstr "Proizvod predujma"
#. module: sale
-#: view:sale.report:0
-#: field:sale.report,shipped_qty_1:0
-msgid "Shipped Qty"
-msgstr "Otpremljena količina"
-
-#. module: sale
-#: view:sale.open.invoice:0
-msgid "You invoice has been successfully created!"
-msgstr "Vaša faktura je uspješno kreirana!"
+#: view:sale.order:0
+msgid "Compute"
+msgstr "Izračunaj"
#. module: sale
-#: code:addons/sale/sale.py:585
+#: code:addons/sale/sale.py:618
#, python-format
msgid "You must first cancel all invoices attached to this sales order."
msgstr "Morate prije otkazati sve fakture vezane uz ovu narudžbu."
@@ -1942,25 +2095,14 @@ msgid "January"
msgstr "Siječanj"
#. module: sale
-#: view:sale.installer:0
-msgid "Configure Your Sales Management Application"
-msgstr "Promijeni postavke aplikacije za upravljanje prodajom"
-
-#. module: sale
#: model:ir.actions.act_window,name:sale.action_order_tree4
msgid "Sales Order in Progress"
msgstr "Narudžbe u tijeku"
#. module: sale
-#: field:sale.installer,sale_layout:0
-msgid "Sales Order Layout Improvement"
-msgstr "Poboljšanje redoslijeda rasporeda"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:63
-#, python-format
-msgid "Error"
-msgstr "Pogreška"
+#: help:sale.order,origin:0
+msgid "Reference of the document that generated this sales order request."
+msgstr "Referenca na dokument koji je generirao ovu narudžbenicu."
#. module: sale
#: view:sale.report:0
@@ -1969,6 +2111,11 @@ msgid "Commitment Delay"
msgstr "Odgoda obveze"
#. module: sale
+#: selection:sale.order,order_policy:0
+msgid "Deliver & invoice on demand"
+msgstr ""
+
+#. module: sale
#: model:process.node,note:sale.process_node_saleprocurement0
msgid ""
"One Procurement order for each sales order line and for each of the "
@@ -1991,13 +2138,12 @@ msgid "Confirmed sales order to invoice."
msgstr "Potvrđene narudžbe u fakture"
#. module: sale
-#: code:addons/sale/sale.py:290
-#, python-format
-msgid "Cannot delete Sales Order(s) which are already confirmed !"
-msgstr "Ne možete pobrisati narudžbe koje su već potvrđene !"
+#: view:sale.order:0
+msgid "Sales Order that haven't yet been confirmed"
+msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:316
+#: code:addons/sale/sale.py:322
#, python-format
msgid "The sales order '%s' has been set in draft state."
msgstr "Narudžba '%s' je postavljena u stanje nacrta."
@@ -2008,37 +2154,27 @@ msgid "from stock"
msgstr "Iz zalihe"
#. module: sale
-#: field:sale.config.picking_policy,order_policy:0
-msgid "Shipping Default Policy"
-msgstr "Uobičajena pravila otpreme"
-
-#. module: sale
#: view:sale.open.invoice:0
msgid "Close"
msgstr "Zaključi"
#. module: sale
+#: code:addons/sale/sale.py:1248
+#, python-format
+msgid "No Pricelist ! : "
+msgstr ""
+
+#. module: sale
#: field:sale.order,shipped:0
msgid "Delivered"
msgstr "Dostavljeno"
#. module: sale
-#: code:addons/sale/sale.py:1115
-#, python-format
-msgid "Not enough stock !"
-msgstr "Nema dovoljno robe na zalihi !"
-
-#. module: sale
#: constraint:stock.move:0
msgid "You must assign a production lot for this product"
msgstr "Morate pridijeliti lot proizvodnje ovom proizvodu"
#. module: sale
-#: field:sale.order.line,sequence:0
-msgid "Layout Sequence"
-msgstr "Redoslijed rasporeda"
-
-#. module: sale
#: model:ir.actions.act_window,help:sale.action_shop_form
msgid ""
"If you have more than one shop reselling your company products, you can "
@@ -2065,11 +2201,6 @@ msgid "May"
msgstr "Svibanj"
#. module: sale
-#: help:sale.installer,sale_order_dates:0
-msgid "Adds commitment, requested and effective dates on Sales Orders."
-msgstr "Dodaje obvezu, zahtjevane i važeće datume na narudžbe."
-
-#. module: sale
#: view:sale.order:0
#: field:sale.order,partner_id:0
#: field:sale.order.line,order_partner_id:0
@@ -2077,25 +2208,11 @@ msgid "Customer"
msgstr "Kupac"
#. module: sale
-#: model:product.template,name:sale.advance_product_0_product_template
-msgid "Advance"
-msgstr ""
-
-#. module: sale
#: selection:sale.report,month:0
msgid "February"
msgstr "Veljača"
#. module: sale
-#: help:sale.installer,sale_journal:0
-msgid ""
-"Allows you to group and invoice your delivery orders according to different "
-"invoicing types: daily, weekly, etc."
-msgstr ""
-"Dozvoljava grupiranje i fakturiranje narudžbi prema različitim tipovima "
-"faktura: dnevno, tjedno, itd."
-
-#. module: sale
#: selection:sale.report,month:0
msgid "April"
msgstr "Travanj"
@@ -2106,11 +2223,6 @@ msgid "Accounting"
msgstr "Računovodstvo"
#. module: sale
-#: field:sale.config.picking_policy,step:0
-msgid "Steps To Deliver a Sales Order"
-msgstr "Koraci za dostavu narudžbe"
-
-#. module: sale
#: view:sale.order:0
#: view:sale.order.line:0
msgid "Search Sales Order"
@@ -2122,18 +2234,18 @@ msgid "Sales Order Requisition"
msgstr "Zahtjev za narudžbom"
#. module: sale
+#: code:addons/sale/sale.py:1242
+#, python-format
+msgid "Not enough stock ! : "
+msgstr ""
+
+#. module: sale
#: report:sale.order:0
#: field:sale.order,payment_term:0
msgid "Payment Term"
msgstr "Uvjet plaćanja"
#. module: sale
-#: help:sale.installer,sale_layout:0
-msgid ""
-"Provides some features to improve the layout of the Sales Order reports."
-msgstr "Omogućuje svojstva za poboljšavanje rasporeda izvještaja narudžbi."
-
-#. module: sale
#: model:ir.actions.act_window,help:sale.action_order_report_all
msgid ""
"This report performs analysis on your quotations and sales orders. Analysis "
@@ -2171,6 +2283,9 @@ msgstr "Godina"
msgid "Invoice Based on Deliveries"
msgstr "Faktura na temelju dostava"
+#~ msgid "Partial Delivery"
+#~ msgstr "Djelomična isporuka"
+
#~ msgid "Recreate Procurement"
#~ msgstr "Postavite Dobavu"
@@ -2209,6 +2324,9 @@ msgstr "Faktura na temelju dostava"
#~ msgid "Invoice after delivery"
#~ msgstr "Račun nakon isporuke"
+#~ msgid "Shipping Policy"
+#~ msgstr "Pravila otpreme"
+
#~ msgid "Origin"
#~ msgstr "Porijeklo"
@@ -2218,6 +2336,9 @@ msgstr "Faktura na temelju dostava"
#~ msgid "Reference"
#~ msgstr "Referenca"
+#~ msgid "All at Once"
+#~ msgstr "Sve od jednom"
+
#~ msgid "Procurement is created after confirmation of sale order."
#~ msgstr "Nabava je kreirana po potvrdi Prodajne Narudžbe"
@@ -2309,9 +2430,6 @@ msgstr "Faktura na temelju dostava"
#~ msgid "Procurement for each line"
#~ msgstr "Nabava za svaki liniju"
-#~ msgid "My Quotations"
-#~ msgstr "Moje Ponude"
-
#~ msgid "Packing Default Policy"
#~ msgstr "Uobičajena politika Pakiranja"
@@ -2503,6 +2621,9 @@ msgstr "Faktura na temelju dostava"
#~ msgid "Related invoices"
#~ msgstr "Srodni Računi"
+#~ msgid "Payment Before Delivery"
+#~ msgstr "Plaćanje prije isporuke"
+
#~ msgid ""
#~ "This is the list of invoices that have been generated for this sale order. "
#~ "The same sale order may have been invoiced in several times (by line for "
@@ -2526,3 +2647,269 @@ msgstr "Faktura na temelju dostava"
#~ msgid "Invoice based on packing lists"
#~ msgstr "Račun napravljen prema tovarnom listi"
+
+#~ msgid "Allows you to compute delivery costs on your quotations."
+#~ msgstr "Dozvoljava izračun troškova dostave prema ponudama."
+
+#~ msgid "Configure Sales Order Logistics"
+#~ msgstr "Promijeni postavke narudžbi logistike"
+
+#~ msgid "Configure Picking Policy for Sales Order"
+#~ msgstr "Promijeni pravila odabira za narudžbu"
+
+#~ msgid ""
+#~ "The Shipping Policy is used to synchronise invoice and delivery operations.\n"
+#~ " - The 'Pay Before delivery' choice will first generate the invoice and "
+#~ "then generate the picking order after the payment of this invoice.\n"
+#~ " - The 'Shipping & Manual Invoice' will create the picking order directly "
+#~ "and wait for the user to manually click on the 'Invoice' button to generate "
+#~ "the draft invoice.\n"
+#~ " - The 'Invoice On Order After Delivery' choice will generate the draft "
+#~ "invoice based on sales order after all picking lists have been finished.\n"
+#~ " - The 'Invoice From The Picking' choice is used to create an invoice "
+#~ "during the picking process."
+#~ msgstr ""
+#~ "Pravila otpremanja se koriste za usklađivanje fakture i postupaka dostave.\n"
+#~ " - 'Platiti prije dostave' izbor će prvo generirati fakturu, a zatim "
+#~ "narudžbu za odabir nakon plaćanja ove fakture.\n"
+#~ " - 'Otprema i ručno napravljena faktura' će izravno napraviti narudžbu za "
+#~ "odabir i čekati da korisnik ručno pokrene kreiranje nacrta fakture klikom na "
+#~ "gumb 'Faktura'.\n"
+#~ " - 'Faktura na narudžbu nakon dostave' će napraviti nacrt fakture temeljen "
+#~ "na narudžbi nakon što su sve liste odabira završene.\n"
+#~ " - 'Faktura iz odabira' će kreirati fakturu za vrijeme postupka odabira."
+
+#~ msgid "Configure"
+#~ msgstr "Promijeni postavke"
+
+#~ msgid "Delivery Order Only"
+#~ msgstr "Samo otpremnica"
+
+#~ msgid "Enhance your core Sales Application with additional functionalities."
+#~ msgstr "Poboljšajte aplikaciju za prodaju sa dodatnim funkcionalnostima."
+
+#~ msgid "Setup your sales workflow and default values."
+#~ msgstr "Podesi radni slijed i standardne vrijednosti."
+
+#~ msgid "Invoice On Order After Delivery"
+#~ msgstr "Faktura na narudžbu nakon dostave"
+
+#~ msgid " Year "
+#~ msgstr " Godina "
+
+#~ msgid ""
+#~ "\n"
+#~ " The base module to manage quotations and sales orders.\n"
+#~ "\n"
+#~ " * Workflow with validation steps:\n"
+#~ " - Quotation -> Sales order -> Invoice\n"
+#~ " * Invoicing methods:\n"
+#~ " - Invoice on order (before or after shipping)\n"
+#~ " - Invoice on delivery\n"
+#~ " - Invoice on timesheets\n"
+#~ " - Advance invoice\n"
+#~ " * Partners preferences (shipping, invoicing, incoterm, ...)\n"
+#~ " * Products stocks and prices\n"
+#~ " * Delivery methods:\n"
+#~ " - all at once, multi-parcel\n"
+#~ " - delivery costs\n"
+#~ " * Dashboard for salesman that includes:\n"
+#~ " * Your open quotations\n"
+#~ " * Top 10 sales of the month\n"
+#~ " * Cases statistics\n"
+#~ " * Graph of sales by product\n"
+#~ " * Graph of cases of the month\n"
+#~ " "
+#~ msgstr ""
+#~ "\n"
+#~ " Osnovni modul za upravljanje ponudama i narudžbama.\n"
+#~ "\n"
+#~ " * Radni slijed sa koracima provjere:\n"
+#~ " - Ponuda -> Narudžba -> Faktura\n"
+#~ " * Načini fakturiranja:\n"
+#~ " - Faktura prema narudžbi (prije ili poslije otpremanja)\n"
+#~ " - Faktura prema dostavi\n"
+#~ " - Faktura prema vremenskom rasporedu\n"
+#~ " - Faktura predujma\n"
+#~ " * Postavke partnera (otpremanje, fakturiranje,incoterm, ...)\n"
+#~ " * Zalihe i cijene proizvoda\n"
+#~ " * Načini dostavljanja:\n"
+#~ " - Sve odjednom, više pošiljki\n"
+#~ " - troškovi dostave\n"
+#~ " * Upravljačka ploča za prodavača uključuje:\n"
+#~ " * Vaše otvorene ponude\n"
+#~ " * Top 10 prodaja mjeseca\n"
+#~ " * Statistike pakiranja\n"
+#~ " * Graf prodaje po kutijama\n"
+#~ " * Graf kutija po mjesecu\n"
+#~ " "
+
+#~ msgid "Picking Default Policy"
+#~ msgstr "Postavljena pravila odabira"
+
+#, python-format
+#~ msgid "You cannot cancel a sales order line that has already been invoiced !"
+#~ msgstr "Ne možete otkazati stavku narudžbe koja je već fakturirana !"
+
+#~ msgid "Sales Order Dates"
+#~ msgstr "Datumi naručivanja"
+
+#~ msgid "Margins in Sales Orders"
+#~ msgstr "Margine u narudžbama"
+
+#~ msgid "Sales Application Configuration"
+#~ msgstr "Konfiguracija aplikacije"
+
+#~ msgid "Delivery Costs"
+#~ msgstr "Troškovi dostave"
+
+#~ msgid "title"
+#~ msgstr "naslov"
+
+#~ msgid "Order date"
+#~ msgstr "Datum narudžbe"
+
+#~ msgid "Shipping & Manual Invoice"
+#~ msgstr "Otprema i ručno napravljena faktura"
+
+#, python-format
+#~ msgid "Picking Information !"
+#~ msgstr "Informacija odabira !"
+
+#~ msgid "Sales Management"
+#~ msgstr "Upravljanje prodajom"
+
+#~ msgid "Invoice From The Picking"
+#~ msgstr "Faktura iz odabira"
+
+#~ msgid ""
+#~ "By default, OpenERP is able to manage complex routing and paths of products "
+#~ "in your warehouse and partner locations. This will configure the most common "
+#~ "and simple methods to deliver products to the customer in one or two "
+#~ "operations by the worker."
+#~ msgstr ""
+#~ "Uobičajeno, OpenERP može upravljati kompleksnim rutiranjem i putevima "
+#~ "proizvoda u vašem skladištu i na partnerskim lokacijama. Ovo će definirati "
+#~ "uobičajene i jednostavne metode za dostavu proizvoda kupcu sa jednom do "
+#~ "dvije akcije radnika."
+
+#~ msgid "sale.installer"
+#~ msgstr "sale.installer"
+
+#~ msgid "Picking List & Delivery Order"
+#~ msgstr "Lista odabira i otpremnice"
+
+#~ msgid "Invoicing"
+#~ msgstr "Fakturiranje"
+
+#~ msgid ""
+#~ "Gives the state of the quotation or sales order. \n"
+#~ "The exception state is automatically set when a cancel operation occurs in "
+#~ "the invoice validation (Invoice Exception) or in the picking list process "
+#~ "(Shipping Exception). \n"
+#~ "The 'Waiting Schedule' state is set when the invoice is confirmed but "
+#~ "waiting for the scheduler to run on the date 'Ordered Date'."
+#~ msgstr ""
+#~ "Daje stanje ponude ili narudžbe.\n"
+#~ "Stanje iznimke se postavlja automatski pri otkazivanju u validaciji fakture "
+#~ "(Iznimka fakture) ili u procesu liste odabira (Iznimka otpreme).\n"
+#~ "Stanje 'Čeka raspored' se postavlja kada je faktura potvrđena, ali čeka da "
+#~ "planer pokrene akciju na datum 'Datum naručivanja'"
+
+#, python-format
+#~ msgid "Cannot delete a sales order line which is %s !"
+#~ msgstr "Ne možete pobrisati stavku narudžbe koja je %s !"
+
+#~ msgid ""
+#~ "Gives the margin of profitability by calculating the difference between Unit "
+#~ "Price and Cost Price."
+#~ msgstr ""
+#~ "Daje marginu profitabilnosti izračunom razlike prodajne cijene i cijene "
+#~ "troška."
+
+#~ msgid " Month "
+#~ msgstr " Mjesec "
+
+#, python-format
+#~ msgid ""
+#~ "You selected a quantity of %d Units.\n"
+#~ "But it's not compatible with the selected packaging.\n"
+#~ "Here is a proposition of quantities according to the packaging:\n"
+#~ "\n"
+#~ "EAN: %s Quantity: %s Type of ul: %s"
+#~ msgstr ""
+#~ "Odabrali ste %d jedinica.\n"
+#~ "Ali nije kompatibilno sa odabranim pakiranjem\n"
+#~ "Prijedlog količina prema pakiranju:\n"
+#~ "\n"
+#~ "EAN: %s Količina: %s Vrsta ul: %s"
+
+#~ msgid "Complete Delivery"
+#~ msgstr "Zaključite isporuku"
+
+#~ msgid " Month-1 "
+#~ msgstr " Mjesec-1 "
+
+#~ msgid ""
+#~ "The Shipping Policy is used to configure per order if you want to deliver as "
+#~ "soon as possible when one product is available or you wait that all products "
+#~ "are available.."
+#~ msgstr ""
+#~ "Pravila otpremanja se koriste za definiranje (prema pojedinoj narudžbi) "
+#~ "želite li da se roba dostavlja čim je jedan proizvod dostupan ili će se "
+#~ "čekati dostupnost svih proizvoda."
+
+#~ msgid "Configuration Progress"
+#~ msgstr "Tijek konfiguracije"
+
+#~ msgid "Product sales"
+#~ msgstr "Prodaje proizvoda"
+
+#~ msgid "Ordered Date"
+#~ msgstr "Datum naručivanja"
+
+#~ msgid "Direct Delivery"
+#~ msgstr "Izravna isporuka"
+
+#~ msgid "Invoicing journals"
+#~ msgstr "Dnevnici fakturiranja"
+
+#~ msgid "Shipped Qty"
+#~ msgstr "Otpremljena količina"
+
+#~ msgid "Configure Your Sales Management Application"
+#~ msgstr "Promijeni postavke aplikacije za upravljanje prodajom"
+
+#~ msgid "Sales Order Layout Improvement"
+#~ msgstr "Poboljšanje redoslijeda rasporeda"
+
+#, python-format
+#~ msgid "Cannot delete Sales Order(s) which are already confirmed !"
+#~ msgstr "Ne možete pobrisati narudžbe koje su već potvrđene !"
+
+#~ msgid "Shipping Default Policy"
+#~ msgstr "Uobičajena pravila otpreme"
+
+#, python-format
+#~ msgid "Not enough stock !"
+#~ msgstr "Nema dovoljno robe na zalihi !"
+
+#~ msgid "Layout Sequence"
+#~ msgstr "Redoslijed rasporeda"
+
+#~ msgid "Adds commitment, requested and effective dates on Sales Orders."
+#~ msgstr "Dodaje obvezu, zahtjevane i važeće datume na narudžbe."
+
+#~ msgid ""
+#~ "Allows you to group and invoice your delivery orders according to different "
+#~ "invoicing types: daily, weekly, etc."
+#~ msgstr ""
+#~ "Dozvoljava grupiranje i fakturiranje narudžbi prema različitim tipovima "
+#~ "faktura: dnevno, tjedno, itd."
+
+#~ msgid "Steps To Deliver a Sales Order"
+#~ msgstr "Koraci za dostavu narudžbe"
+
+#~ msgid ""
+#~ "Provides some features to improve the layout of the Sales Order reports."
+#~ msgstr "Omogućuje svojstva za poboljšavanje rasporeda izvještaja narudžbi."
diff --git a/addons/sale/i18n/hu.po b/addons/sale/i18n/hu.po
index 5f58ab043e4..7389648d57c 100644
--- a/addons/sale/i18n/hu.po
+++ b/addons/sale/i18n/hu.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2011-01-11 11:16+0000\n"
+"POT-Creation-Date: 2011-12-22 18:43+0000\n"
"PO-Revision-Date: 2011-02-01 17:37+0000\n"
"Last-Translator: NOVOTRADE RENDSZERHÁZ ( novotrade.hu ) "
"<openerp@novotrade.hu>\n"
@@ -14,19 +14,26 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-05 05:16+0000\n"
-"X-Generator: Launchpad (build 14231)\n"
+"X-Launchpad-Export-Date: 2011-12-23 06:46+0000\n"
+"X-Generator: Launchpad (build 14560)\n"
+
+#. module: sale
+#: field:sale.config.picking_policy,timesheet:0
+msgid "Based on Timesheet"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid ""
+"Sale Order Lines that are confirmed, done or in exception state and haven't "
+"yet been invoiced"
+msgstr ""
#. module: sale
#: view:board.board:0
#: model:ir.actions.act_window,name:sale.action_sales_by_salesman
msgid "Sales by Salesman in last 90 days"
-msgstr "Üzletkötők szerinti értékesítés az elmúlt 90 napban"
-
-#. module: sale
-#: help:sale.installer,delivery:0
-msgid "Allows you to compute delivery costs on your quotations."
-msgstr "Az árajánlatokban lehetővé teszi szállítási költség számítását."
+msgstr "Az értékesítő eladásai az utolsó 90 napban"
#. module: sale
#: help:sale.order,picking_policy:0
@@ -34,13 +41,18 @@ msgid ""
"If you don't have enough stock available to deliver all at once, do you "
"accept partial shipments or not?"
msgstr ""
-"Ha nincs elegendő egyszerre kiszállítható készlet, elfogadja-e a részleges "
-"szállítást?"
+"Ha nincs elegendő áruja raktáron, hogy egyszerre leszállítson mindent, "
+"elfogadja a részleges szállításokat?"
+
+#. module: sale
+#: view:sale.order:0
+msgid "UoS"
+msgstr ""
#. module: sale
#: help:sale.order,partner_shipping_id:0
msgid "Shipping address for current sales order."
-msgstr "Az aktuális vevői megrendelés szállítási címe."
+msgstr "Szállítási cím a jelenlegi értékesítési megbízáshoz."
#. module: sale
#: field:sale.advance.payment.inv,qtty:0
@@ -58,29 +70,19 @@ msgstr "Nap"
#: model:process.transition.action,name:sale.process_transition_action_cancelorder0
#: view:sale.order:0
msgid "Cancel Order"
-msgstr "Rendelés törlése"
-
-#. module: sale
-#: view:sale.config.picking_policy:0
-msgid "Configure Sales Order Logistics"
-msgstr "Vevői megrendelés logisztika beállítása"
+msgstr "Rendelés visszavonása"
#. module: sale
-#: code:addons/sale/sale.py:603
+#: code:addons/sale/sale.py:638
#, python-format
msgid "The quotation '%s' has been converted to a sales order."
-msgstr "'%s' árajanlatot a rendszer átalakította vevői megrendeléssé."
-
-#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Payment Before Delivery"
-msgstr "Árukiadás előtti fizetés"
+msgstr "A %s árajánlat értékesítési megbízássá lett alakítva."
#. module: sale
#: code:addons/sale/wizard/sale_make_invoice.py:42
#, python-format
msgid "Warning !"
-msgstr "Vigyázat!"
+msgstr "Figyelem!"
#. module: sale
#: report:sale.order:0
@@ -90,20 +92,14 @@ msgstr "ÁFA"
#. module: sale
#: model:process.node,note:sale.process_node_saleorderprocurement0
msgid "Drives procurement orders for every sales order line."
-msgstr ""
-
-#. module: sale
-#: selection:sale.config.picking_policy,picking_policy:0
-msgid "All at Once"
-msgstr "Egyszerre"
+msgstr "Beszerzési megbízást generál minden értékesítési megbízási sorhoz."
#. module: sale
-#: field:sale.order,project_id:0
#: view:sale.report:0
#: field:sale.report,analytic_account_id:0
#: field:sale.shop,project_id:0
msgid "Analytic Account"
-msgstr "Gyűjtőkód"
+msgstr "Analitikus számla"
#. module: sale
#: model:ir.actions.act_window,help:sale.action_order_line_tree2
@@ -112,15 +108,24 @@ msgid ""
"sales orders partially, by lines of sales order. You do not need this list "
"if you invoice from the delivery orders or if you invoice sales totally."
msgstr ""
-"Ez a menüpont a kiszámlázandó vevői megrendelés sorokat listázza. A "
-"megrendeléseket részlegesen, soronként is számlázhatja. Nincs szükség erre a "
-"listára, ha szállítólevél alapján számláz, vagy ha teljesen kiszámlázza az "
-"értékesítéseket."
+"Ez egy lista az összes számlázandó értékesítési megbízási sorról. Az "
+"értékesítési megbízásokat részben is lehet számlázni, a megbízási sorok "
+"alapján. Nem szükséges ez a lista, ha a kiszállítási megbízásból számláz, "
+"vagy ha egyben számlázza a teljes értékesítést."
+
+#. module: sale
+#: code:addons/sale/sale.py:295
+#, python-format
+msgid ""
+"In order to delete a confirmed sale order, you must cancel it before ! To "
+"cancel a sale order, you must first cancel related picking or delivery "
+"orders."
+msgstr ""
#. module: sale
#: model:process.node,name:sale.process_node_saleprocurement0
msgid "Procurement Order"
-msgstr "Beszerzési megrendelés"
+msgstr "Beszerzési megbízás"
#. module: sale
#: view:sale.report:0
@@ -129,9 +134,14 @@ msgid "Partner"
msgstr "Partner"
#. module: sale
+#: selection:sale.order,order_policy:0
+msgid "Invoice based on deliveries"
+msgstr ""
+
+#. module: sale
#: view:sale.order:0
msgid "Order Line"
-msgstr "Megrendelés sor"
+msgstr "Rendelési sor"
#. module: sale
#: model:ir.actions.act_window,help:sale.action_order_form
@@ -144,13 +154,15 @@ msgid ""
"configuration of the sales order, a draft invoice will be generated so that "
"you just have to confirm it when you want to bill your customer."
msgstr ""
-"Ez a menüpont az árajánlatok és a vevői megrendelések kezelését segíti. A "
-"rendszer felajánlja, hogy az árajánlat készítésével kezdjen. Miután "
-"megerősítésre került, az árajánlat vevői megrendeléssé alakul át. A rendszer "
-"többféle terméktípust képes kezelni, így a vevői megrendelés elindíthat "
-"feladatokat, kiszedéseket, termelési utasításokat, beszerzéseket, stb. A "
-"vevői megrendelés beállításai alapján egy számlatervezet jön létre, amelyet "
-"csak jóvá kell hagynia, amikor számlázni akar a vevőnek."
+"Az értékesítési megbízások segítik Önt az árajánlatok és az "
+"ügyfélmegrendelések kezelésében. Azt javasoljuk, hogy kezdje a folyamatot az "
+"árajánlat elkészítésével az OpenERP-ben. Ha az árajánlatot megerősítette, "
+"abból létrejön egy értékesítési megbízás. Az OpenERP több terméktípust is "
+"tud kezelni, úgy, hogy egy értékesítési megbízás feladatokat, kiszállítási "
+"megbízásokat, gyártási rendeléseket, szállítói megrendeléseket stb. indít "
+"el. Az értékesítési megbízás beállítása alapján automatikusan "
+"számlapiszkozatot hoz létre, amelyet Önnek csak jóvá kell hagynia, amikor "
+"számlát készít az ügyfele részére."
#. module: sale
#: help:sale.order,invoice_quantity:0
@@ -161,11 +173,12 @@ msgid ""
"the product is a service, shipped quantities means hours spent on the "
"associated tasks."
msgstr ""
-"A vevői megrendelés automatikusan számlatervezeteket állít elő. A megrendelt "
-"és a kiszállított mennyiségek eltérhetnek egymástól. Önnek választania kell, "
-"hogy a számla a megrendelt vagy a kiadott mennyiségek alapján készüljön. Ha "
-"a termék egy szolgáltatás, akkor a kiszállított mennyiség a feladatra "
-"fordított órákat jelenti."
+"AZ értékesítési megbízás automatikusan létrehozza a számlapiszkozatot. "
+"Elképzelhető, hogy a megrendelési és a kiszállítási mennyiség nem ugyanaz. "
+"Ilyenkor ki kell választania, hogy a számlát a megrendelési vagy a "
+"kiszállítási mennyiség alapján készíti-e el. Ha a termék egy szolgáltatás, "
+"akkor a kiszállítási mennyiség alatt azokat a munkaórákat kell érteni, "
+"amelyeket a kapcsolódó feladatok ellátásával töltöttünk el."
#. module: sale
#: field:sale.shop,payment_default_id:0
@@ -173,8 +186,13 @@ msgid "Default Payment Term"
msgstr "Alapértelmezett fizetési feltétel"
#. module: sale
-#: model:ir.actions.act_window,name:sale.action_config_picking_policy
-msgid "Configure Picking Policy for Sales Order"
+#: field:sale.config.picking_policy,deli_orders:0
+msgid "Based on Delivery Orders"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.picking_policy,time_unit:0
+msgid "Main Working Time Unit"
msgstr ""
#. module: sale
@@ -188,39 +206,46 @@ msgstr "Állapot"
#. module: sale
#: report:sale.order:0
msgid "Disc.(%)"
-msgstr "Eng. (%)"
+msgstr "Áreng. (%)"
#. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_forceassignation0
-msgid "Force Assignation"
-msgstr "Hozzárendelés kényszerítése"
+#: view:sale.report:0
+#: field:sale.report,price_total:0
+msgid "Total Price"
+msgstr "Teljes ár"
#. module: sale
#: help:sale.make.invoice,grouped:0
msgid "Check the box to group the invoices for the same customers"
msgstr ""
-"Jelölje be, ha az ugyanarra a vevőre vonatkozó számlákat össze akarja vonni"
+"Jelölje be a négyzetet az ugyanazon vevőhöz tartozó számlák "
+"csoportosításához."
+
+#. module: sale
+#: view:sale.order:0
+msgid "My Sale Orders"
+msgstr ""
#. module: sale
#: selection:sale.order,invoice_quantity:0
msgid "Ordered Quantities"
-msgstr "Megrendelt mennyiségek"
+msgstr "Rendelt mennyiségek"
#. module: sale
#: view:sale.report:0
msgid "Sales by Salesman"
-msgstr "Üzletkötőnkénti értékesítés"
+msgstr "Az értékesítő eladásai"
#. module: sale
#: field:sale.order.line,move_ids:0
msgid "Inventory Moves"
-msgstr "Készletmozgások"
+msgstr "Leltármozgás"
#. module: sale
#: field:sale.order,name:0
#: field:sale.order.line,order_id:0
msgid "Order Reference"
-msgstr "Megrendelés hivatkozás"
+msgstr "Rendeléshivatkozás"
#. module: sale
#: view:sale.order:0
@@ -238,36 +263,47 @@ msgid ""
"The invoice is created automatically if the shipping policy is 'Invoice from "
"pick' or 'Invoice on order after delivery'."
msgstr ""
-"A rendszer automatikusan elkészíti a számlát, ha a számlázási mód 'számla "
-"szállítólevél alapján' vagy 'számla megrendelés alapján árukiadás után'."
+"A számla automatikusan létrejön, ha a kiszállítási szabály: számlázás "
+"kiszedésből vagy számlázás kiszállítás után."
+
+#. module: sale
+#: field:sale.config.picking_policy,task_work:0
+msgid "Based on Tasks' Work"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
+msgid "Quotations and Sales"
+msgstr ""
#. module: sale
#: model:ir.model,name:sale.model_sale_make_invoice
msgid "Sales Make Invoice"
-msgstr ""
+msgstr "Számla generálása értékesítésből"
#. module: sale
-#: view:sale.order:0
-msgid "Recreate Packing"
+#: code:addons/sale/sale.py:330
+#, python-format
+msgid "Pricelist Warning!"
msgstr ""
#. module: sale
#: field:sale.order.line,discount:0
msgid "Discount (%)"
-msgstr "Engedmény (%)"
+msgstr "Árengedmény (%)"
#. module: sale
-#: help:res.company,security_lead:0
-msgid ""
-"This is the days added to what you promise to customers for security purpose"
-msgstr ""
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_quotation_for_sale
+msgid "My Quotations"
+msgstr "Árajánlataim"
#. module: sale
#: view:board.board:0
#: model:ir.actions.act_window,name:sale.open_board_sales_manager
#: model:ir.ui.menu,name:sale.menu_board_sales_manager
msgid "Sales Manager Dashboard"
-msgstr "Értékesítő vezérlőpultja"
+msgstr "Értékesítői vezérlőpult"
#. module: sale
#: field:sale.order.line,product_packaging:0
@@ -277,7 +313,7 @@ msgstr "Csomagolás"
#. module: sale
#: model:process.transition,name:sale.process_transition_saleinvoice0
msgid "From a sales order"
-msgstr "Vevői megrendelésből"
+msgstr "Értékesítési megbízásból"
#. module: sale
#: field:sale.shop,name:0
@@ -285,20 +321,38 @@ msgid "Shop Name"
msgstr "Üzlet neve"
#. module: sale
-#: code:addons/sale/sale.py:1014
+#: help:sale.order,order_policy:0
+msgid ""
+"The Invoice Policy is used to synchronise invoice and delivery operations.\n"
+" - The 'Pay before delivery' choice will first generate the invoice and "
+"then generate the picking order after the payment of this invoice.\n"
+" - The 'Deliver & Invoice on demand' will create the picking order directly "
+"and wait for the user to manually click on the 'Invoice' button to generate "
+"the draft invoice based on the sale order or the sale order lines.\n"
+" - The 'Invoice on order after delivery' choice will generate the draft "
+"invoice based on sales order after all picking lists have been finished.\n"
+" - The 'Invoice based on deliveries' choice is used to create an invoice "
+"during the picking process."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:1158
#, python-format
msgid "No Customer Defined !"
-msgstr "Vevőt nem adtak meg!"
+msgstr "Nincs vevő megadva!"
#. module: sale
#: model:ir.actions.act_window,name:sale.action_order_tree2
msgid "Sales in Exception"
-msgstr ""
+msgstr "Hiba az értékesítés során"
#. module: sale
-#: view:sale.order:0
-msgid "Set to Draft"
-msgstr "Beállítás tervezetnek"
+#: code:addons/sale/sale.py:1145
+#: code:addons/sale/sale.py:1264
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:70
+#, python-format
+msgid "Configuration Error !"
+msgstr ""
#. module: sale
#: view:sale.order:0
@@ -306,56 +360,30 @@ msgid "Conditions"
msgstr "Feltételek"
#. module: sale
-#: help:sale.order,order_policy:0
-msgid ""
-"The Shipping Policy is used to synchronise invoice and delivery operations.\n"
-" - The 'Pay Before delivery' choice will first generate the invoice and "
-"then generate the picking order after the payment of this invoice.\n"
-" - The 'Shipping & Manual Invoice' will create the picking order directly "
-"and wait for the user to manually click on the 'Invoice' button to generate "
-"the draft invoice.\n"
-" - The 'Invoice On Order After Delivery' choice will generate the draft "
-"invoice based on sales order after all picking lists have been finished.\n"
-" - The 'Invoice From The Picking' choice is used to create an invoice "
-"during the picking process."
-msgstr ""
-"A számlázási mód szolgál a számlázás és az árukiadás összehangolására.\n"
-" - 'Árukiadás előtti fizetés' választása esetén először a számla készül el, "
-"majd a számla kifizetése után a kiszedési utasítás jön létre.\n"
-" - 'Árukiadás és kézi számla' esetén a kiszedési utasítás azonnal elkészül "
-"és a rendszer várja, hogy a felhasználó nyomja meg a Számla készítése "
-"gombot, hogy létrejöjjön a számlatervezet.\n"
-" - 'Számla megrendelés alapján árukiadás után' beállítása esetén a "
-"számlatervezet a vevői megrendelés alapján készül el, miután a kiszedés "
-"befejeződött.\n"
-" - 'Számla szállítólevél alapján' választása esetén a számla a kiszedés "
-"befejezése után készül el."
-
-#. module: sale
-#: code:addons/sale/sale.py:939
+#: code:addons/sale/sale.py:1034
#, python-format
msgid ""
"There is no income category account defined in default Properties for "
"Product Category or Fiscal Position is not defined !"
msgstr ""
-"A termék kategória alapértelmezett jellemzői között az árbevétel főkönyvi "
-"számlát nem határozták meg vagy az ÁFA pozíciót nem állították be!"
+"Nem határozott meg bevételi számlát a termékkategória alapértelmezett "
+"tulajdonságai között vagy az ÁFA pozíció nincs meghatározva!"
#. module: sale
-#: view:sale.installer:0
-msgid "Configure"
-msgstr "Beállítás"
+#: selection:sale.report,month:0
+msgid "August"
+msgstr "Augusztus"
#. module: sale
#: constraint:stock.move:0
msgid "You try to assign a lot which is not from the same product"
-msgstr ""
+msgstr "Termékeket próbál hozzárendelni a nem azonos termékből"
#. module: sale
-#: code:addons/sale/sale.py:620
+#: code:addons/sale/sale.py:655
#, python-format
msgid "invalid mode for test_state"
-msgstr ""
+msgstr "érvénytelen mód a tesztállapotban"
#. module: sale
#: selection:sale.report,month:0
@@ -363,20 +391,20 @@ msgid "June"
msgstr "Június"
#. module: sale
-#: code:addons/sale/sale.py:584
+#: code:addons/sale/sale.py:617
#, python-format
msgid "Could not cancel this sales order !"
-msgstr "Nem tudja törölni ezt a rendelést !"
+msgstr "Nem lehet visszavonni ezt az értékesítési megbízást!"
#. module: sale
#: model:ir.model,name:sale.model_sale_report
msgid "Sales Orders Statistics"
-msgstr "Vevői megrendelés statisztika"
+msgstr "Értékesítési megbízási statisztikák"
#. module: sale
#: help:sale.order,project_id:0
msgid "The analytic account related to a sales order."
-msgstr "A vevői megrendeléshez kapcsolt gyűjtőkód."
+msgstr "Az értékesítési megbízáshoz kapcsolódó analitikus számla."
#. module: sale
#: selection:sale.report,month:0
@@ -384,8 +412,12 @@ msgid "October"
msgstr "Október"
#. module: sale
+#: sql_constraint:stock.picking:0
+msgid "Reference must be unique per Company!"
+msgstr ""
+
+#. module: sale
#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_quotation_for_sale
#: view:sale.order:0
#: view:sale.report:0
msgid "Quotations"
@@ -394,17 +426,12 @@ msgstr "Árajánlatok"
#. module: sale
#: help:sale.order,pricelist_id:0
msgid "Pricelist for current sales order."
-msgstr "Az aktuális vevői megrendelésre vonatkozó árlista."
-
-#. module: sale
-#: selection:sale.config.picking_policy,step:0
-msgid "Delivery Order Only"
-msgstr "Csak szállítólevél"
+msgstr "A jelenlegi értékesítési megbízás árlistája."
#. module: sale
#: report:sale.order:0
msgid "TVA :"
-msgstr "ÁFA :"
+msgstr "ÁFA:"
#. module: sale
#: help:sale.order.line,delay:0
@@ -412,6 +439,8 @@ msgid ""
"Number of days between the order confirmation the shipping of the products "
"to the customer"
msgstr ""
+"A megrendelés megerősítése és a termékek vevőnek történő kiszállítása között "
+"eltelt napok száma."
#. module: sale
#: report:sale.order:0
@@ -426,6 +455,7 @@ msgstr "ÁFA pozíció"
#. module: sale
#: view:sale.order:0
#: view:sale.order.line:0
+#: field:sale.report,product_uom:0
msgid "UoM"
msgstr "ME"
@@ -446,18 +476,29 @@ msgid ""
"The salesman confirms the quotation. The state of the sales order becomes "
"'In progress' or 'Manual in progress'."
msgstr ""
+"Az értékesítő megerősíti az árajánlatot, az értékesítési megbízás állapota a "
+"következőkre változik: \"Folyamatban\" vagy \"Manuális vezérléssel "
+"folyamatban\""
+
+#. module: sale
+#: code:addons/sale/sale.py:1061
+#, python-format
+msgid "You cannot cancel a sale order line that has already been invoiced!"
+msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:971
+#: code:addons/sale/sale.py:1066
#, python-format
msgid "You must first cancel stock moves attached to this sales order line."
msgstr ""
+"Először érvénytelenítenie kell az ehhez az értékesítési megbízási sorhoz "
+"tartozó készletmozgásokat."
#. module: sale
-#: code:addons/sale/sale.py:1042
+#: code:addons/sale/sale.py:1134
#, python-format
msgid "(n/a)"
-msgstr "(n/a)"
+msgstr "(nem alkalmazható)"
#. module: sale
#: help:sale.advance.payment.inv,product_id:0
@@ -465,9 +506,9 @@ msgid ""
"Select a product of type service which is called 'Advance Product'. You may "
"have to create it and set it as a default value on this field."
msgstr ""
-"Válassza ki az 'előleg termék'-et, amely egy szolgáltatás típusú termék. Ha "
-"még nincs ilyen termék, hozza létre és állítsa be alapértelmezett értékként "
-"erre a mezőre."
+"Válasszon egy szolgáltatási típusú terméket, amelyet \"Előlegterméknek\" "
+"nevezünk. Létrehozhatja és beállíthatja alapértelmezett értékként ebben a "
+"mezőben."
#. module: sale
#: report:sale.order:0
@@ -481,8 +522,8 @@ msgid ""
"You cannot make an advance on a sales order "
"that is defined as 'Automatic Invoice after delivery'."
msgstr ""
-"Nem készíthet előlegszámlát olyan vevői megrendelésre, amelyre 'számla "
-"megrendelés alapján árukiadás után' számlázási módot állított be."
+"Nem haladhat tovább egy olyan értékesítési megbízással, amelyre a következő "
+"parancsot adta meg: \"Automatikus számlázás kiszállítás után\"."
#. module: sale
#: view:sale.order:0
@@ -493,25 +534,47 @@ msgid "Notes"
msgstr "Megjegyzések"
#. module: sale
+#: sql_constraint:res.company:0
+msgid "The company name must be unique !"
+msgstr ""
+
+#. module: sale
#: help:sale.order,partner_invoice_id:0
msgid "Invoice address for current sales order."
-msgstr "Az aktuális vevői megrendelésre vonatkozó számlázási cím."
+msgstr "Az aktuális értékesítési megbízás számlázási címe."
#. module: sale
-#: view:sale.installer:0
-msgid "Enhance your core Sales Application with additional functionalities."
+#: view:sale.report:0
+msgid "Month-1"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered month of the sales order"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:504
+#, python-format
+msgid ""
+"You cannot group sales having different currencies for the same partner."
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,picking_policy:0
+msgid "Deliver each product when available"
msgstr ""
#. module: sale
#: field:sale.order,invoiced_rate:0
#: field:sale.order.line,invoiced:0
msgid "Invoiced"
-msgstr "Számlázva"
+msgstr "Számlázott"
#. module: sale
#: model:process.node,name:sale.process_node_deliveryorder0
msgid "Delivery Order"
-msgstr "Szállítólevél"
+msgstr "Kiszállítási megbízás"
#. module: sale
#: field:sale.order,date_confirm:0
@@ -519,24 +582,46 @@ msgid "Confirmation Date"
msgstr "Megerősítés dátuma"
#. module: sale
+#: field:sale.order,incoterm:0
+msgid "Incoterm"
+msgstr "Nemzetközi Kereskedelmi Feltételek"
+
+#. module: sale
#: field:sale.order.line,address_allotment_id:0
msgid "Allotment Partner"
msgstr "Elosztási partner"
#. module: sale
-#: sql_constraint:sale.order:0
-msgid "Order Reference must be unique !"
-msgstr "A megrendelés hivatkozásnak egyedinek kell lennie!"
-
-#. module: sale
#: selection:sale.report,month:0
msgid "March"
msgstr "Március"
#. module: sale
+#: constraint:stock.move:0
+msgid "You can not move products from or to a location of the type view."
+msgstr ""
+
+#. module: sale
+#: field:sale.config.picking_policy,sale_orders:0
+msgid "Based on Sales Orders"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,state:0
+msgid ""
+"Givwizard = self.browse(cr, uid, ids)[0]es the state of the quotation or "
+"sales order. \n"
+"The exception state is automatically set when a cancel operation occurs in "
+"the invoice validation (Invoice Exception) or in the picking list process "
+"(Shipping Exception). \n"
+"The 'Waiting Schedule' state is set when the invoice is confirmed but "
+"waiting for the scheduler to run on the order date."
+msgstr ""
+
+#. module: sale
#: help:sale.order,amount_total:0
msgid "The total amount."
-msgstr "Végösszeg"
+msgstr "A végösszeg."
#. module: sale
#: field:sale.order.line,price_subtotal:0
@@ -546,7 +631,12 @@ msgstr "Részösszeg"
#. module: sale
#: report:sale.order:0
msgid "Invoice address :"
-msgstr "Számlázási cím :"
+msgstr "Számlázási cím:"
+
+#. module: sale
+#: field:sale.order.line,sequence:0
+msgid "Line Sequence"
+msgstr ""
#. module: sale
#: model:process.transition,note:sale.process_transition_saleorderprocurement0
@@ -554,6 +644,8 @@ msgid ""
"For every sales order line, a procurement order is created to supply the "
"sold product."
msgstr ""
+"Minden értékesítési megbízási sorhoz létrejön egy beszerzési megbízás is az "
+"eladott termék előteremtésére."
#. module: sale
#: help:sale.order,incoterm:0
@@ -561,6 +653,9 @@ msgid ""
"Incoterm which stands for 'International Commercial terms' implies its a "
"series of sales terms which are used in the commercial transaction."
msgstr ""
+"Az INCOTERMS, amely azt jelenti, hogy \"Nemzetközi Kereskedelmi "
+"Feltételek\", a nemzetközi kereskedelmi tranzakciókban használatos "
+"szakkifejezéseket tartalmazza."
#. module: sale
#: field:sale.order,partner_invoice_id:0
@@ -570,12 +665,12 @@ msgstr "Számlázási cím"
#. module: sale
#: view:sale.order.line:0
msgid "Search Uninvoiced Lines"
-msgstr "Nem számlázott sorok keresése"
+msgstr "Számlázatlan sorok keresése"
#. module: sale
#: model:ir.actions.report.xml,name:sale.report_sale_order
msgid "Quotation / Order"
-msgstr "Árajánlat / megrendelés"
+msgstr "Árajánlat / Megrendelés"
#. module: sale
#: view:sale.report:0
@@ -586,18 +681,13 @@ msgstr "Sorok száma"
#. module: sale
#: model:ir.model,name:sale.model_sale_open_invoice
msgid "Sales Open Invoice"
-msgstr ""
+msgstr "Értékesítési gyűjtő számla"
#. module: sale
#: model:ir.model,name:sale.model_sale_order_line
#: field:stock.move,sale_line_id:0
msgid "Sales Order Line"
-msgstr "Vevői megrendelés sor"
-
-#. module: sale
-#: view:sale.config.picking_policy:0
-msgid "Setup your sales workflow and default values."
-msgstr ""
+msgstr "Értékesítési megbízási sor"
#. module: sale
#: field:sale.shop,warehouse_id:0
@@ -612,23 +702,23 @@ msgstr "Megrendelés száma"
#. module: sale
#: field:sale.order,order_line:0
msgid "Order Lines"
-msgstr "Megrendelés sorok"
+msgstr "Megrendelési tételek"
#. module: sale
#: view:sale.order:0
msgid "Untaxed amount"
-msgstr "Nettó érték"
+msgstr "Nettó összeg"
#. module: sale
#: model:ir.actions.act_window,name:sale.action_order_line_tree2
#: model:ir.ui.menu,name:sale.menu_invoicing_sales_order_lines
msgid "Lines to Invoice"
-msgstr "Kiszámlázandó sorok"
+msgstr "Számla sorai"
#. module: sale
#: field:sale.order.line,product_uom_qty:0
msgid "Quantity (UoM)"
-msgstr "Mennyiség"
+msgstr "Mennyiség (ME)"
#. module: sale
#: field:sale.order,create_date:0
@@ -636,14 +726,19 @@ msgid "Creation Date"
msgstr "Létrehozás dátuma"
#. module: sale
+#: model:ir.ui.menu,name:sale.menu_sales_configuration_misc
+msgid "Miscellaneous"
+msgstr ""
+
+#. module: sale
#: model:ir.actions.act_window,name:sale.action_order_line_tree3
msgid "Uninvoiced and Delivered Lines"
-msgstr "Ki nem számlázott és szállított tételek"
+msgstr "Ki nem számlázott, de kiszállított tételek"
#. module: sale
#: report:sale.order:0
msgid "Total :"
-msgstr "Bruttó érték:"
+msgstr "Bruttó ár:"
#. module: sale
#: view:sale.report:0
@@ -651,12 +746,17 @@ msgid "My Sales"
msgstr "Értékesítéseim"
#. module: sale
-#: code:addons/sale/sale.py:290
-#: code:addons/sale/sale.py:966
-#: code:addons/sale/sale.py:1165
+#: code:addons/sale/sale.py:295
+#: code:addons/sale/sale.py:1061
+#: code:addons/sale/sale.py:1290
#, python-format
msgid "Invalid action !"
-msgstr "Érvénytelen művelet !"
+msgstr "Érvénytelen művelet!"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Extra Info"
+msgstr "Extra információ"
#. module: sale
#: field:sale.order,pricelist_id:0
@@ -669,7 +769,13 @@ msgstr "Árlista"
#: view:sale.report:0
#: field:sale.report,product_uom_qty:0
msgid "# of Qty"
-msgstr "Mennyiség"
+msgstr "# mennyiség"
+
+#. module: sale
+#: code:addons/sale/sale.py:1314
+#, python-format
+msgid "Hour"
+msgstr ""
#. module: sale
#: view:sale.order:0
@@ -678,7 +784,9 @@ msgstr "Megrendelés dátuma"
#. module: sale
#: view:sale.order.line:0
+#: view:sale.report:0
#: field:sale.report,shipped:0
+#: field:sale.report,shipped_qty_1:0
msgid "Shipped"
msgstr "Kiszállított"
@@ -688,9 +796,9 @@ msgid "All Quotations"
msgstr "Összes árajánlat"
#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Invoice On Order After Delivery"
-msgstr "Számla megrendelés alapján árukiadás után"
+#: view:sale.config.picking_policy:0
+msgid "Options"
+msgstr ""
#. module: sale
#: selection:sale.report,month:0
@@ -698,10 +806,24 @@ msgid "September"
msgstr "Szeptember"
#. module: sale
+#: code:addons/sale/sale.py:632
+#, python-format
+msgid "You cannot confirm a sale order which has no line."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:1246
+#, python-format
+msgid ""
+"You have to select a pricelist or a customer in the sales form !\n"
+"Please set one before choosing a product."
+msgstr ""
+
+#. module: sale
#: view:sale.report:0
#: field:sale.report,categ_id:0
msgid "Category of Product"
-msgstr "Termék katerógia"
+msgstr "Termékkaterógia"
#. module: sale
#: report:sale.order:0
@@ -714,11 +836,6 @@ msgid "Stock Moves"
msgstr "Készletmozgások"
#. module: sale
-#: view:sale.report:0
-msgid " Year "
-msgstr " Év "
-
-#. module: sale
#: field:sale.order,state:0
#: field:sale.report,state:0
msgid "Order State"
@@ -728,18 +845,18 @@ msgstr "Megrendelés állapota"
#: view:sale.make.invoice:0
#: view:sale.order.line.make.invoice:0
msgid "Do you really want to create the invoice(s) ?"
-msgstr "Valóban el akarja készíteni a számlá(ka)t?"
+msgstr "Biztosan létre akarja hozni a számlá(ka)t?"
#. module: sale
#: view:sale.report:0
msgid "Sales By Month"
-msgstr "Havonkénti értékesítés"
+msgstr "Havi eladások"
#. module: sale
-#: code:addons/sale/sale.py:970
+#: code:addons/sale/sale.py:1065
#, python-format
msgid "Could not cancel sales order line!"
-msgstr ""
+msgstr "Nem lehet visszavonni az értékesítési megbízási sort!"
#. module: sale
#: field:res.company,security_lead:0
@@ -749,12 +866,12 @@ msgstr "Biztonsági napok"
#. module: sale
#: model:process.transition,name:sale.process_transition_saleorderprocurement0
msgid "Procurement of sold material"
-msgstr ""
+msgstr "Az eladott anyagok beszerzése"
#. module: sale
#: view:sale.order:0
msgid "Create Final Invoice"
-msgstr "Végszámla készítése"
+msgstr "Számla létrehozása"
#. module: sale
#: field:sale.order,partner_shipping_id:0
@@ -767,6 +884,13 @@ msgid ""
"It indicates that the sales order has been delivered. This field is updated "
"only after the scheduler(s) have been launched."
msgstr ""
+"Jelzi, hogy az értékesítési megbízás kiszállításra került. Ez a mező csak "
+"akkor frissül, ha az ütemező(k) elindult(ak)."
+
+#. module: sale
+#: field:sale.order,date_order:0
+msgid "Date"
+msgstr ""
#. module: sale
#: view:sale.report:0
@@ -774,59 +898,9 @@ msgid "Extended Filters..."
msgstr "Kiterjesztett szűrők…"
#. module: sale
-#: model:ir.module.module,description:sale.module_meta_information
-msgid ""
-"\n"
-" The base module to manage quotations and sales orders.\n"
-"\n"
-" * Workflow with validation steps:\n"
-" - Quotation -> Sales order -> Invoice\n"
-" * Invoicing methods:\n"
-" - Invoice on order (before or after shipping)\n"
-" - Invoice on delivery\n"
-" - Invoice on timesheets\n"
-" - Advance invoice\n"
-" * Partners preferences (shipping, invoicing, incoterm, ...)\n"
-" * Products stocks and prices\n"
-" * Delivery methods:\n"
-" - all at once, multi-parcel\n"
-" - delivery costs\n"
-" * Dashboard for salesman that includes:\n"
-" * Your open quotations\n"
-" * Top 10 sales of the month\n"
-" * Cases statistics\n"
-" * Graph of sales by product\n"
-" * Graph of cases of the month\n"
-" "
-msgstr ""
-"\n"
-" Árajánlatok és vevői megrendelések kezelésére szolgáló alapmodul.\n"
-"\n"
-" * Munkafolyamat jóváhagyási lépésekkel:\n"
-" - árajánlat - > vevői megrendelés - > számla\n"
-" * Számlázási módok:\n"
-" - számla megrendelés alapján (árukiadás előtt vagy után)\n"
-" - számla szállítólevél alapján\n"
-" - számla munkaidő-kimutatás alapján\n"
-" - előlegszámla\n"
-" * Partner preferenciák (szállítási, számlázási, incoterms, stb.)\n"
-" * Termék készletek és árak\n"
-" * Szállítási módok:\n"
-" - egyszerre, többcsomagos\n"
-" - szállítási költségek\n"
-" * Vezérlőpult az üzletkötők számára, amely az alábbiakat tartalmazza:\n"
-" - nyitott árajánlatok\n"
-" - a hónap 10 legjobb értékesítése\n"
-" - esetstatisztika\n"
-" - termékenkénti értékesítési grafikon\n"
-" - havi esetgrafikon\n"
-" "
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_shop
-#: view:sale.shop:0
-msgid "Sales Shop"
-msgstr ""
+#: selection:sale.order.line,state:0
+msgid "Exception"
+msgstr "Hiba"
#. module: sale
#: model:ir.model,name:sale.model_res_company
@@ -834,18 +908,19 @@ msgid "Companies"
msgstr "Vállalatok"
#. module: sale
-#: selection:sale.report,month:0
-msgid "November"
-msgstr "November"
+#: code:addons/sale/sale.py:1259
+#, python-format
+msgid "No valid pricelist line found ! :"
+msgstr ""
#. module: sale
#: view:sale.order:0
msgid "History"
-msgstr "Előzmény"
+msgstr "Előzmények"
#. module: sale
-#: field:sale.config.picking_policy,picking_policy:0
-msgid "Picking Default Policy"
+#: selection:sale.order,order_policy:0
+msgid "Invoice on order after delivery"
msgstr ""
#. module: sale
@@ -855,32 +930,31 @@ msgid ""
"The same sales order may have been invoiced in several times (by line for "
"example)."
msgstr ""
-"A vevői megrendelés alapján készített számlák listája. Ugyanabból a vevői "
-"megrendelésből több számla is készülhet, ha a megrendelés sorokat külön "
-"számlázzák."
+"Ez egy olyan számlalista, amely ehhez az értékesítési megbízáshoz jött "
+"létre. Ugyanaz az értékesítési megbízás több alkalommal is számlázásra "
+"kerülhetett (például sorok alapján)."
#. module: sale
#: report:sale.order:0
msgid "Your Reference"
-msgstr "Vevő hivatkozása"
+msgstr "Az Ön hivatkozása"
#. module: sale
#: help:sale.order,partner_order_id:0
msgid ""
"The name and address of the contact who requested the order or quotation."
-msgstr ""
+msgstr "A megrendelést vagy árajánlatot igénylő kapcsolat neve és címe."
#. module: sale
-#: code:addons/sale/sale.py:966
-#, python-format
-msgid "You cannot cancel a sales order line that has already been invoiced !"
-msgstr ""
+#: help:res.company,security_lead:0
+msgid ""
+"This is the days added to what you promise to customers for security purpose"
+msgstr "A vevőknek ígért, biztonsági okokból hozzáadott napok száma."
#. module: sale
-#: view:sale.order:0
#: view:sale.order.line:0
msgid "Qty"
-msgstr "Menny"
+msgstr "Menny."
#. module: sale
#: view:sale.order:0
@@ -888,6 +962,11 @@ msgid "References"
msgstr "Hivatkozások"
#. module: sale
+#: view:sale.order.line:0
+msgid "My Sales Order Lines"
+msgstr ""
+
+#. module: sale
#: model:process.transition.action,name:sale.process_transition_action_cancel0
#: model:process.transition.action,name:sale.process_transition_action_cancel1
#: model:process.transition.action,name:sale.process_transition_action_cancel2
@@ -896,17 +975,12 @@ msgstr "Hivatkozások"
#: view:sale.order.line:0
#: view:sale.order.line.make.invoice:0
msgid "Cancel"
-msgstr "Mégse"
+msgstr "Mégsem"
#. module: sale
-#: field:sale.installer,sale_order_dates:0
-msgid "Sales Order Dates"
-msgstr "Vevői megrendelések dátumai"
-
-#. module: sale
-#: selection:sale.order.line,state:0
-msgid "Exception"
-msgstr "Kivétel"
+#: sql_constraint:sale.order:0
+msgid "Order Reference must be unique per Company!"
+msgstr ""
#. module: sale
#: model:process.transition,name:sale.process_transition_invoice0
@@ -918,29 +992,29 @@ msgid "Create Invoice"
msgstr "Számla készítése"
#. module: sale
-#: field:sale.installer,sale_margin:0
-msgid "Margins in Sales Orders"
-msgstr "Vevői megrendelés árrés"
-
-#. module: sale
#: view:sale.order:0
msgid "Total Tax Excluded"
-msgstr "Nettó érték"
+msgstr "Végösszeg adók nélkül"
#. module: sale
-#: view:sale.order:0
-msgid "Compute"
-msgstr "Számítás"
+#: view:sale.order.line:0
+msgid "Order reference"
+msgstr ""
+
+#. module: sale
+#: view:sale.open.invoice:0
+msgid "You invoice has been successfully created!"
+msgstr "A számla sikeresen elkészült!"
#. module: sale
#: view:sale.report:0
msgid "Sales by Partner"
-msgstr "Partnerenkénti értékesítés"
+msgstr "Partnerenkénti eladások"
#. module: sale
#: field:sale.order,partner_order_id:0
msgid "Ordering Contact"
-msgstr "Megrendelés kapcsolattartója"
+msgstr "Megrendelési kapcsolattartó"
#. module: sale
#: model:ir.actions.act_window,name:sale.action_view_sale_open_invoice
@@ -949,33 +1023,37 @@ msgid "Open Invoice"
msgstr "Számla megnyitása"
#. module: sale
-#: report:sale.order:0
-#: view:sale.order.line:0
-msgid "Price"
-msgstr "Ár"
+#: model:ir.actions.server,name:sale.ir_actions_server_edi_sale
+msgid "Auto-email confirmed sale orders"
+msgstr ""
#. module: sale
-#: model:ir.actions.act_window,name:sale.action_sale_installer
-#: view:sale.config.picking_policy:0
-#: view:sale.installer:0
-msgid "Sales Application Configuration"
+#: code:addons/sale/sale.py:413
+#, python-format
+msgid "There is no sales journal defined for this company: \"%s\" (id:%d)"
msgstr ""
+"Nem határozott meg értékesítési naplót a következő vállalat számára: \"%s\" "
+"(id:%d)"
#. module: sale
-#: view:sale.report:0
-#: field:sale.report,price_total:0
-msgid "Total Price"
-msgstr "Összérték"
+#: model:process.transition.action,name:sale.process_transition_action_forceassignation0
+msgid "Force Assignation"
+msgstr "Hozzárendelés eröltetése"
#. module: sale
#: selection:sale.order.line,type:0
msgid "on order"
-msgstr "rendelésre"
+msgstr "Megendelésre"
#. module: sale
#: model:process.node,note:sale.process_node_invoiceafterdelivery0
msgid "Based on the shipped or on the ordered quantities."
-msgstr "A kiadott vagy a megrendelt mennyiségek alapján."
+msgstr "A kiszálított vagy a megrendelt mennyiség alapján."
+
+#. module: sale
+#: selection:sale.order,picking_policy:0
+msgid "Deliver all products at once"
+msgstr ""
#. module: sale
#: field:sale.order,picking_ids:0
@@ -990,58 +1068,65 @@ msgstr "Név"
#. module: sale
#: report:sale.order:0
msgid "Shipping address :"
-msgstr "Szállítási cím :"
+msgstr "Szállítási cím:"
#. module: sale
#: view:board.board:0
#: model:ir.actions.act_window,name:sale.action_sales_by_partner
msgid "Sales per Customer in last 90 days"
-msgstr "Vevőnkénti értékesítés az elmúlt 90 napban"
+msgstr "Vevőnkénti eladások az utolsó 90 napban"
#. module: sale
#: model:process.node,note:sale.process_node_quotation0
msgid "Draft state of sales order"
-msgstr "Vevői megrendelés tervezet állapota"
+msgstr "Az értékesítési megbízás tervezet állapota"
#. module: sale
#: model:process.transition,name:sale.process_transition_deliver0
msgid "Create Delivery Order"
-msgstr "Szállítólevél létrehozása"
+msgstr "Kiszállítási megbízás létrehozása"
#. module: sale
-#: field:sale.installer,delivery:0
-msgid "Delivery Costs"
-msgstr "Szállítási költségek"
+#: code:addons/sale/sale.py:1290
+#, python-format
+msgid "Cannot delete a sales order line which is in state '%s'!"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Qty(UoS)"
+msgstr ""
#. module: sale
#: view:sale.order:0
msgid "Total Tax Included"
-msgstr "Bruttó érték"
+msgstr "Végösszeg adókkal együtt"
#. module: sale
#: model:process.transition,name:sale.process_transition_packing0
msgid "Create Pick List"
-msgstr ""
+msgstr "Kiszedési lista létrehozása"
#. module: sale
#: view:sale.report:0
-msgid "Sales by Product Category"
-msgstr "Termék kategóriánkénti értékesítés"
+msgid "Ordered date of the sales order"
+msgstr ""
#. module: sale
-#: selection:sale.order,picking_policy:0
-msgid "Partial Delivery"
-msgstr "Részleges szállítás"
+#: view:sale.report:0
+msgid "Sales by Product Category"
+msgstr "Termékkategóriánkénti eladások"
#. module: sale
#: model:process.transition,name:sale.process_transition_confirmquotation0
msgid "Confirm Quotation"
-msgstr "Árajánlat jóváhagyása"
+msgstr "Árajánlat megerősítése"
#. module: sale
-#: help:sale.order,origin:0
-msgid "Reference of the document that generated this sales order request."
-msgstr "Bizonylat, amely előállította ezt a vevői megrendelést."
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:63
+#, python-format
+msgid "Error"
+msgstr "Hiba"
#. module: sale
#: view:sale.order:0
@@ -1059,7 +1144,7 @@ msgstr "Számla újrakészítése"
#: model:ir.actions.act_window,name:sale.outgoing_picking_list_to_invoice
#: model:ir.ui.menu,name:sale.menu_action_picking_list_to_invoice
msgid "Deliveries to Invoice"
-msgstr ""
+msgstr "Számlázandó kiszállítások"
#. module: sale
#: selection:sale.order,state:0
@@ -1073,30 +1158,103 @@ msgid "Procurement Method"
msgstr "Beszerzési módszer"
#. module: sale
-#: view:sale.config.picking_policy:0
-#: view:sale.installer:0
-msgid "title"
-msgstr "Pozíció"
-
-#. module: sale
#: model:process.node,name:sale.process_node_packinglist0
msgid "Pick List"
-msgstr ""
+msgstr "Kiszedési lista"
#. module: sale
#: view:sale.order:0
-msgid "Order date"
-msgstr "Megrendelés dátuma"
+msgid "Set to Draft"
+msgstr "Tervezet beállítása"
#. module: sale
#: model:process.node,note:sale.process_node_packinglist0
msgid "Document of the move to the output or to the customer."
+msgstr "Dokumentum a gyártásnak vagy a vevőnek irányuló árumozgásról."
+
+#. module: sale
+#: model:email.template,body_text:sale.email_template_edi_sale
+msgid ""
+"\n"
+"Hello${object.partner_order_id.name and ' ' or "
+"''}${object.partner_order_id.name or ''},\n"
+"\n"
+"Here is your order confirmation for ${object.partner_id.name}:\n"
+" | Order number: *${object.name}*\n"
+" | Order total: *${object.amount_total} "
+"${object.pricelist_id.currency_id.name}*\n"
+" | Order date: ${object.date_order}\n"
+" % if object.origin:\n"
+" | Order reference: ${object.origin}\n"
+" % endif\n"
+" % if object.client_order_ref:\n"
+" | Your reference: ${object.client_order_ref}<br />\n"
+" % endif\n"
+" | Your contact: ${object.user_id.name} ${object.user_id.user_email "
+"and '<%s>'%(object.user_id.user_email) or ''}\n"
+"\n"
+"You can view the order confirmation, download it and even pay online using "
+"the following link:\n"
+" ${ctx.get('edi_web_url_view') or 'n/a'}\n"
+"\n"
+"% if object.order_policy in ('prepaid','manual') and "
+"object.company_id.paypal_account:\n"
+"<% \n"
+"comp_name = quote(object.company_id.name)\n"
+"order_name = quote(object.name)\n"
+"paypal_account = quote(object.company_id.paypal_account)\n"
+"order_amount = quote(str(object.amount_total))\n"
+"cur_name = quote(object.pricelist_id.currency_id.name)\n"
+"paypal_url = \"https://www.paypal.com/cgi-"
+"bin/webscr?cmd=_xclick&business=%s&item_name=%s%%20Order%%20%s&invoice=%s&amo"
+"unt=%s\" \\\n"
+" "
+"\"&currency_code=%s&button_subtype=services&no_note=1&bn=OpenERP_Order_PayNow"
+"_%s\" % \\\n"
+" "
+"(paypal_account,comp_name,order_name,order_name,order_amount,cur_name,cur_nam"
+"e)\n"
+"%>\n"
+"It is also possible to directly pay with Paypal:\n"
+" ${paypal_url}\n"
+"% endif\n"
+"\n"
+"If you have any question, do not hesitate to contact us.\n"
+"\n"
+"\n"
+"Thank you for choosing ${object.company_id.name}!\n"
+"\n"
+"\n"
+"--\n"
+"${object.user_id.name} ${object.user_id.user_email and "
+"'<%s>'%(object.user_id.user_email) or ''}\n"
+"${object.company_id.name}\n"
+"% if object.company_id.street:\n"
+"${object.company_id.street or ''}\n"
+"% endif\n"
+"% if object.company_id.street2:\n"
+"${object.company_id.street2}\n"
+"% endif\n"
+"% if object.company_id.city or object.company_id.zip:\n"
+"${object.company_id.zip or ''} ${object.company_id.city or ''}\n"
+"% endif\n"
+"% if object.company_id.country_id:\n"
+"${object.company_id.state_id and ('%s, ' % object.company_id.state_id.name) "
+"or ''} ${object.company_id.country_id.name or ''}\n"
+"% endif\n"
+"% if object.company_id.phone:\n"
+"Phone: ${object.company_id.phone}\n"
+"% endif\n"
+"% if object.company_id.website:\n"
+"${object.company_id.website or ''}\n"
+"% endif\n"
+" "
msgstr ""
#. module: sale
#: model:process.transition.action,name:sale.process_transition_action_validate0
msgid "Validate"
-msgstr "Jóváhagyás"
+msgstr "Érvényesítés"
#. module: sale
#: view:sale.order:0
@@ -1106,7 +1264,7 @@ msgstr "Megrendelés megerősítése"
#. module: sale
#: model:process.transition,name:sale.process_transition_saleprocurement0
msgid "Create Procurement Order"
-msgstr ""
+msgstr "Beszerzési megbízás létrehozása"
#. module: sale
#: view:sale.order:0
@@ -1116,14 +1274,14 @@ msgid "Taxes"
msgstr "Adók"
#. module: sale
-#: field:sale.order,order_policy:0
-msgid "Shipping Policy"
-msgstr "Számlázási mód"
+#: view:sale.order:0
+msgid "Sales Order ready to be invoiced"
+msgstr ""
#. module: sale
#: help:sale.order,create_date:0
msgid "Date on which sales order is created."
-msgstr "Vevői megrendelés készítésének dátuma."
+msgstr "Az értékesítési megbízás létrehozásának dátuma."
#. module: sale
#: model:ir.model,name:sale.model_stock_move
@@ -1134,22 +1292,35 @@ msgstr "Készletmozgás"
#: view:sale.make.invoice:0
#: view:sale.order.line.make.invoice:0
msgid "Create Invoices"
-msgstr "Számlák készítése"
+msgstr "Számlák létrehozása"
#. module: sale
-#: view:sale.order:0
-msgid "Extra Info"
-msgstr "Extra információ"
+#: view:sale.report:0
+msgid "Sales order created in current month"
+msgstr ""
#. module: sale
#: report:sale.order:0
msgid "Fax :"
-msgstr "Fax :"
+msgstr "Fax:"
+
+#. module: sale
+#: help:sale.order.line,type:0
+msgid ""
+"If 'on order', it triggers a procurement when the sale order is confirmed to "
+"create a task, purchase order or manufacturing order linked to this sale "
+"order line."
+msgstr ""
#. module: sale
#: field:sale.advance.payment.inv,amount:0
msgid "Advance Amount"
-msgstr "Előleg összege"
+msgstr "Előleg"
+
+#. module: sale
+#: field:sale.config.picking_policy,charge_delivery:0
+msgid "Do you charge the delivery?"
+msgstr ""
#. module: sale
#: selection:sale.order,invoice_quantity:0
@@ -1159,7 +1330,15 @@ msgstr "Kiszállított mennyiség"
#. module: sale
#: selection:sale.config.picking_policy,order_policy:0
msgid "Invoice Based on Sales Orders"
-msgstr "Számla a vevői megrendelés alapján"
+msgstr "Számla az értékesítési megbízás alapján"
+
+#. module: sale
+#: code:addons/sale/sale.py:331
+#, python-format
+msgid ""
+"If you change the pricelist of this order (and eventually the currency), "
+"prices of existing order lines will not be updated."
+msgstr ""
#. module: sale
#: model:ir.model,name:sale.model_stock_picking
@@ -1167,17 +1346,29 @@ msgid "Picking List"
msgstr "Kiszedési lista"
#. module: sale
-#: code:addons/sale/sale.py:387
-#: code:addons/sale/sale.py:920
-#: code:addons/sale/sale.py:938
+#: code:addons/sale/sale.py:412
+#: code:addons/sale/sale.py:503
+#: code:addons/sale/sale.py:632
+#: code:addons/sale/sale.py:1015
+#: code:addons/sale/sale.py:1033
#, python-format
msgid "Error !"
-msgstr "Hiba !"
+msgstr "Hiba!"
#. module: sale
-#: code:addons/sale/sale.py:570
+#: code:addons/sale/sale.py:603
#, python-format
msgid "Could not cancel sales order !"
+msgstr "Nem lehet visszavonni az értékesítési megbízást!"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Qty(UoM)"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered Year of the sales order"
msgstr ""
#. module: sale
@@ -1194,39 +1385,29 @@ msgstr "Beszerzés"
#: selection:sale.order,state:0
#: selection:sale.report,state:0
msgid "Shipping Exception"
-msgstr "Szállítási kivétel"
+msgstr "Szállítási hiba"
#. module: sale
-#: field:sale.make.invoice,grouped:0
-msgid "Group the invoices"
-msgstr "Számlák összevonása"
-
-#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Shipping & Manual Invoice"
-msgstr "Árukiadás és kézi számla"
-
-#. module: sale
-#: code:addons/sale/sale.py:1051
+#: code:addons/sale/sale.py:1143
#, python-format
-msgid "Picking Information !"
-msgstr "Kiszedési információ"
+msgid "Picking Information ! : "
+msgstr ""
#. module: sale
-#: view:sale.report:0
-#: field:sale.report,month:0
-msgid "Month"
-msgstr "Hónap"
+#: field:sale.make.invoice,grouped:0
+msgid "Group the invoices"
+msgstr "Számlák csoportosítása"
#. module: sale
-#: model:ir.module.module,shortdesc:sale.module_meta_information
-msgid "Sales Management"
-msgstr "Értékesítés menedzsment"
+#: field:sale.order,order_policy:0
+msgid "Invoice Policy"
+msgstr ""
#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Invoice From The Picking"
-msgstr "Számla szállítólevél alapján"
+#: model:ir.actions.act_window,name:sale.action_config_picking_policy
+#: view:sale.config.picking_policy:0
+msgid "Setup your Invoicing Method"
+msgstr ""
#. module: sale
#: model:process.node,note:sale.process_node_invoice0
@@ -1235,28 +1416,31 @@ msgstr "Ellenőrizendő a könyvelő által."
#. module: sale
#: view:sale.report:0
-#: field:sale.report,uom_name:0
msgid "Reference UoM"
msgstr "Hivatkozási ME"
#. module: sale
+#: view:sale.config.picking_policy:0
+msgid ""
+"This tool will help you to install the right module and configure the system "
+"according to the method you use to invoice your customers."
+msgstr ""
+
+#. module: sale
#: model:ir.model,name:sale.model_sale_order_line_make_invoice
msgid "Sale OrderLine Make_invoice"
-msgstr "Vevői megrendelés sorokból számla készítése"
+msgstr "Számla létrehozása az értékesítési megbízási sorból"
#. module: sale
-#: help:sale.config.picking_policy,step:0
-msgid ""
-"By default, OpenERP is able to manage complex routing and paths of products "
-"in your warehouse and partner locations. This will configure the most common "
-"and simple methods to deliver products to the customer in one or two "
-"operations by the worker."
-msgstr ""
+#: selection:sale.order,state:0
+#: selection:sale.report,state:0
+msgid "Invoice Exception"
+msgstr "Számlázási hiba"
#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_tree
-msgid "Old Quotations"
-msgstr "Régi árajánlatok"
+#: model:process.node,note:sale.process_node_saleorder0
+msgid "Drives procurement and invoicing"
+msgstr "Irányítja a beszerzést és a számlázást"
#. module: sale
#: field:sale.order,invoiced:0
@@ -1271,6 +1455,22 @@ msgid "Sales Analysis"
msgstr "Értékesítési elemzés"
#. module: sale
+#: code:addons/sale/sale.py:1138
+#, python-format
+msgid ""
+"You selected a quantity of %d Units.\n"
+"But it's not compatible with the selected packaging.\n"
+"Here is a proposition of quantities according to the packaging:\n"
+"EAN: %s Quantity: %s Type of ul: %s"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Recreate Packing"
+msgstr "Csomagolás újrakészítése"
+
+#. module: sale
+#: view:sale.order:0
#: field:sale.order.line,property_ids:0
msgid "Properties"
msgstr "Tulajdonságok"
@@ -1289,19 +1489,30 @@ msgid ""
"is 'Shipping and Manual in Progress'. The invoice is created automatically "
"if the shipping policy is 'Payment before Delivery'."
msgstr ""
-"Az üzletkötő manuálisan készíti a számlát, ha a vevői megrendelés számlázási "
-"módja 'árukiadás és kézi számla'. A számla automatikusan elkészül, ha a "
-"számlázási mód 'árukiadás előtti fizetés'."
+"Az értékesítő manuálisan létrehoz egy számlát, hogy ha az értékesítési "
+"megbízás szállítási szabálya: \"Szállítás és manuális vezérléssel "
+"folyamatban\". A számla automatikusan létrejön , ha a szállítási szabály: "
+"\"Fizetés kiszállítás előtt\"."
#. module: sale
#: help:sale.config.picking_policy,order_policy:0
msgid ""
"You can generate invoices based on sales orders or based on shippings."
msgstr ""
-"Ön a vevői megrendelések vagy az árukiadások alapján készíthet számlákat."
+"Létrehozhat számlát értékesítési megbízások vagy kiszállítások alapján."
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Confirmed sale order lines, not yet delivered"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:473
+#, python-format
+msgid "Customer Invoices"
+msgstr ""
#. module: sale
-#: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
#: model:process.process,name:sale.process_process_salesprocess0
#: view:sale.order:0
#: view:sale.report:0
@@ -1323,69 +1534,69 @@ msgid "Done"
msgstr "Kész"
#. module: sale
-#: model:ir.model,name:sale.model_sale_installer
-msgid "sale.installer"
-msgstr "sale.installer"
-
-#. module: sale
#: model:process.node,name:sale.process_node_invoice0
#: model:process.node,name:sale.process_node_invoiceafterdelivery0
msgid "Invoice"
msgstr "Számla"
#. module: sale
-#: code:addons/sale/sale.py:1014
+#: code:addons/sale/sale.py:1158
#, python-format
msgid ""
"You have to select a customer in the sales form !\n"
"Please set one customer before choosing a product."
msgstr ""
-
-#. module: sale
-#: selection:sale.config.picking_policy,step:0
-msgid "Picking List & Delivery Order"
-msgstr "Kiszedési lista & Szállítólevél"
+"Válasszon ki egy vevőt az értékesítési űrlapon !\n"
+"Kérem válasszon ki egy vevőt, mielőtt terméket választ."
#. module: sale
#: field:sale.order,origin:0
msgid "Source Document"
-msgstr "Forrásbizonylat"
+msgstr "Forrás dokumentum"
#. module: sale
#: view:sale.order.line:0
msgid "To Do"
-msgstr "Tennivalók"
+msgstr "Teendő"
#. module: sale
#: field:sale.order,picking_policy:0
msgid "Picking Policy"
-msgstr "Kiszedési politika"
+msgstr "Kiválasztási szabály"
#. module: sale
#: model:process.node,note:sale.process_node_deliveryorder0
msgid "Document of the move to the customer."
-msgstr ""
+msgstr "Dokumentum a vevőnek történő mozgásról."
#. module: sale
#: help:sale.order,amount_untaxed:0
msgid "The amount without tax."
-msgstr "Adó nélküli összeg."
+msgstr "Összeg adó nélkül."
#. module: sale
-#: code:addons/sale/sale.py:571
+#: code:addons/sale/sale.py:604
#, python-format
msgid "You must first cancel all picking attached to this sales order."
msgstr ""
+"Először vissza kell vonnia minden ehhez az értékesítési megbízáshoz csatolt "
+"kiválasztást."
#. module: sale
#: model:ir.model,name:sale.model_sale_advance_payment_inv
msgid "Sales Advance Payment Invoice"
-msgstr "Vevői előlegszámla"
+msgstr "Értékesítési Fizetési számla"
#. module: sale
-#: field:sale.order,incoterm:0
-msgid "Incoterm"
-msgstr "Nemzetközi Kereskedelmi Feltételek"
+#: view:sale.report:0
+#: field:sale.report,month:0
+msgid "Month"
+msgstr "Hónap"
+
+#. module: sale
+#: model:email.template,subject:sale.email_template_edi_sale
+msgid "${object.company_id.name} Order (Ref ${object.name or 'n/a' })"
+msgstr ""
#. module: sale
#: view:sale.order.line:0
@@ -1396,14 +1607,9 @@ msgid "Product"
msgstr "Termék"
#. module: sale
-#: model:ir.ui.menu,name:sale.menu_invoiced
-msgid "Invoicing"
-msgstr "Számlázás"
-
-#. module: sale
#: model:process.transition.action,name:sale.process_transition_action_cancelassignation0
msgid "Cancel Assignation"
-msgstr "Hozzárendelés megszüntetése"
+msgstr "Számla sztornó"
#. module: sale
#: model:ir.model,name:sale.model_sale_config_picking_policy
@@ -1411,14 +1617,10 @@ msgid "sale.config.picking_policy"
msgstr "sale.config.picking_policy"
#. module: sale
-#: help:sale.order,state:0
-msgid ""
-"Gives the state of the quotation or sales order. \n"
-"The exception state is automatically set when a cancel operation occurs in "
-"the invoice validation (Invoice Exception) or in the picking list process "
-"(Shipping Exception). \n"
-"The 'Waiting Schedule' state is set when the invoice is confirmed but "
-"waiting for the scheduler to run on the date 'Ordered Date'."
+#: view:account.invoice.report:0
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_turnover_by_month
+msgid "Monthly Turnover"
msgstr ""
#. module: sale
@@ -1429,18 +1631,17 @@ msgstr "Számlázás alapja"
#. module: sale
#: report:sale.order:0
msgid "Date Ordered"
-msgstr "Megrendelés dátuma"
+msgstr "Rendelés dátuma"
#. module: sale
#: field:sale.order.line,product_uos:0
msgid "Product UoS"
-msgstr "Termék EE"
+msgstr "Termék eladási egysége"
#. module: sale
-#: selection:sale.order,state:0
#: selection:sale.report,state:0
msgid "Manual In Progress"
-msgstr ""
+msgstr "Manuális vezérléssel folyamatban"
#. module: sale
#: field:sale.order.line,product_uom:0
@@ -1458,16 +1659,16 @@ msgid "Order"
msgstr "Megrendelés"
#. module: sale
-#: code:addons/sale/sale.py:921
+#: code:addons/sale/sale.py:1016
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:71
#, python-format
msgid "There is no income account defined for this product: \"%s\" (id:%d)"
-msgstr ""
-"\"%s\" (kód:%d) termékre nem határoztak meg árbevétel főkönyvi számlát."
+msgstr "Nem határozott meg bevételi számlát erre a termékre: %s (id:%d)"
#. module: sale
#: view:sale.order:0
msgid "Ignore Exception"
-msgstr ""
+msgstr "Hiba figyelmen kívül hagyása"
#. module: sale
#: model:process.transition,note:sale.process_transition_saleinvoice0
@@ -1477,20 +1678,21 @@ msgid ""
"generates an invoice or a delivery order as soon as it is confirmed by the "
"salesman."
msgstr ""
-"A vevői megrendelés számlázási módjától függően a számla a kiadott vagy a "
-"megrendelt mennyiségeken alapulhat. Így a vevői megrendelés előállíthat egy "
-"számlát vagy egy szállítólevelet, mihelyt az üzletkötő jóváhagyja a "
-"megrendelést."
+"Az értékesítési megbízás számlázási beállításaitól függően a számla "
+"alapulhat a kiszállítási vagy a megrendelési mennyiségen. A rendszer az "
+"értékesítési megbízásból létrehozhat egy számlát vagy egy kiszállítási "
+"megbízást, amint az értékesítő megerősíti azt."
#. module: sale
-#: code:addons/sale/sale.py:1116
+#: code:addons/sale/sale.py:1238
#, python-format
msgid ""
"You plan to sell %.2f %s but you only have %.2f %s available !\n"
"The real stock is %.2f %s. (without reservations)"
msgstr ""
-"A tervezett eladási mennyiség %.2f %s, de csak %.2f %s áll rendelkezésre!\n"
-"A valós készlet %.2f %s (foglalások nélkül)."
+"El szertné adni a következő mennyiséget: %.2f %s, de csak a következő "
+"mennyiség érhető el a raktáron: %.2f %s!\n"
+"A valós készlet: %.2f %s. (foglalások nélkül)"
#. module: sale
#: view:sale.order:0
@@ -1514,10 +1716,10 @@ msgid "Total"
msgstr "Összesen"
#. module: sale
-#: code:addons/sale/sale.py:388
-#, python-format
-msgid "There is no sales journal defined for this company: \"%s\" (id:%d)"
-msgstr "\"%s\" (kód: %d) vállalatra nem határoztak meg kimenő számla naplót."
+#: report:sale.order:0
+#: view:sale.order.line:0
+msgid "Price"
+msgstr "Ár"
#. module: sale
#: model:process.transition,note:sale.process_transition_deliver0
@@ -1526,11 +1728,19 @@ msgid ""
"output area and the customer is done through the Delivery Order manually or "
"automatically."
msgstr ""
+"A kiadási hely beállításától függően a kiadási terület és a vevő telephelye "
+"közötti árumozgás manuális vagy automatikus kiszállítási megbízással "
+"kezelhető."
#. module: sale
-#: code:addons/sale/sale.py:1165
-#, python-format
-msgid "Cannot delete a sales order line which is %s !"
+#: selection:sale.order,order_policy:0
+msgid "Pay before delivery"
+msgstr ""
+
+#. module: sale
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.open_board_sales
+msgid "Sales Dashboard"
msgstr ""
#. module: sale
@@ -1542,6 +1752,7 @@ msgstr "Számlák készítése"
#. module: sale
#: view:sale.order:0
+#: selection:sale.order,state:0
#: view:sale.order.line:0
msgid "To Invoice"
msgstr "Számlázandó"
@@ -1549,7 +1760,12 @@ msgstr "Számlázandó"
#. module: sale
#: help:sale.order,date_confirm:0
msgid "Date on which sales order is confirmed."
-msgstr "A vevői megrendelés megerősítésének dátuma."
+msgstr "Az értékesítési megbízás megerősítésének dátuma."
+
+#. module: sale
+#: field:sale.order,project_id:0
+msgid "Contract/Analytic Account"
+msgstr ""
#. module: sale
#: field:sale.order,company_id:0
@@ -1568,46 +1784,44 @@ msgstr "Számla kelte"
#. module: sale
#: help:sale.advance.payment.inv,amount:0
msgid "The amount to be invoiced in advance."
-msgstr "Az előleg összege."
+msgstr "Az előlegszámla összege."
#. module: sale
-#: selection:sale.order,state:0
-#: selection:sale.report,state:0
-msgid "Invoice Exception"
-msgstr "Számlázási kivétel"
+#: code:addons/sale/sale.py:1256
+#, python-format
+msgid ""
+"Couldn't find a pricelist line matching this product and quantity.\n"
+"You have to change either the product, the quantity or the pricelist."
+msgstr ""
#. module: sale
#: help:sale.order,picking_ids:0
msgid ""
"This is a list of picking that has been generated for this sales order."
-msgstr "A vevői megrendelés alapján készített kiszedési lista."
-
-#. module: sale
-#: help:sale.installer,sale_margin:0
-msgid ""
-"Gives the margin of profitability by calculating the difference between Unit "
-"Price and Cost Price."
-msgstr ""
-"Az egységár és a bekerülési érték közötti különbözet kiszámításával megadja "
-"az árrést."
+msgstr "Ez egy kiszedési lista ehhez az értékesítési megbízáshoz."
#. module: sale
#: view:sale.make.invoice:0
#: view:sale.order.line.make.invoice:0
msgid "Create invoices"
-msgstr "Számlák készítése"
+msgstr "Számlák létrehozása"
#. module: sale
#: report:sale.order:0
msgid "Net Total :"
-msgstr "Nettó érték :"
+msgstr "Nettó ár:"
#. module: sale
#: selection:sale.order,state:0
#: selection:sale.order.line,state:0
#: selection:sale.report,state:0
msgid "Cancelled"
-msgstr "Törölt"
+msgstr "Visszavonva"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sales Order Lines related to a Sales Order of mine"
+msgstr ""
#. module: sale
#: model:ir.actions.act_window,name:sale.action_shop_form
@@ -1619,17 +1833,12 @@ msgid "Shop"
msgstr "Üzlet"
#. module: sale
-#: view:sale.report:0
-msgid " Month "
-msgstr " Hónap "
-
-#. module: sale
#: field:sale.report,date_confirm:0
msgid "Date Confirm"
msgstr "Megerősítés dátuma"
#. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:111
+#: code:addons/sale/wizard/sale_line_invoice.py:113
#, python-format
msgid "Warning"
msgstr "Figyelmeztetés"
@@ -1638,18 +1847,7 @@ msgstr "Figyelmeztetés"
#: view:board.board:0
#: model:ir.actions.act_window,name:sale.action_view_sales_by_month
msgid "Sales by Month"
-msgstr "Havonkénti értékesítés"
-
-#. module: sale
-#: code:addons/sale/sale.py:1045
-#, python-format
-msgid ""
-"You selected a quantity of %d Units.\n"
-"But it's not compatible with the selected packaging.\n"
-"Here is a proposition of quantities according to the packaging:\n"
-"\n"
-"EAN: %s Quantity: %s Type of ul: %s"
-msgstr ""
+msgstr "Havi eladások"
#. module: sale
#: model:ir.model,name:sale.model_sale_order
@@ -1659,7 +1857,7 @@ msgstr ""
#: view:sale.order:0
#: field:stock.picking,sale_id:0
msgid "Sales Order"
-msgstr "Vevői megrendelés"
+msgstr "Értékesítési megbízás"
#. module: sale
#: field:sale.order.line,product_uos_qty:0
@@ -1667,6 +1865,11 @@ msgid "Quantity (UoS)"
msgstr "Mennyiség (EE)"
#. module: sale
+#: view:sale.order.line:0
+msgid "Sale Order Lines that are in 'done' state"
+msgstr ""
+
+#. module: sale
#: model:process.transition,note:sale.process_transition_packing0
msgid ""
"The Pick List form is created as soon as the sales order is confirmed, in "
@@ -1674,11 +1877,20 @@ msgid ""
"parts to the sales order. There is 1 pick list by sales order line which "
"evolves with the availability of parts."
msgstr ""
+"The Pick List form is created as soon as the sales order is confirmed, in "
+"the same time as the procurement order. It represents the assignment of "
+"parts to the sales order. There is 1 pick list by sales order line which "
+"evolves with the availability of parts."
#. module: sale
#: selection:sale.order.line,state:0
msgid "Confirmed"
-msgstr "Megerősített"
+msgstr "Megerősítve"
+
+#. module: sale
+#: field:sale.config.picking_policy,order_policy:0
+msgid "Main Method Based On"
+msgstr ""
#. module: sale
#: model:process.transition.action,name:sale.process_transition_action_confirm0
@@ -1688,13 +1900,13 @@ msgstr "Megerősítés"
#. module: sale
#: constraint:res.company:0
msgid "Error! You can not create recursive companies."
-msgstr "Hiba! Ön nem hozhat létre rekurzív vállalatokat."
+msgstr "Hiba! Nem hozhat létre rekurzív vállalatokat."
#. module: sale
#: view:board.board:0
#: model:ir.actions.act_window,name:sale.action_sales_product_total_price
msgid "Sales by Product's Category in last 90 days"
-msgstr "Termék kategóriánkénti értékesítés az elmúlt 90 napban"
+msgstr "Sales by Product's Category in last 90 days"
#. module: sale
#: view:sale.order:0
@@ -1703,46 +1915,35 @@ msgid "Invoice Lines"
msgstr "Számlasorok"
#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_product_tree
#: view:sale.order:0
#: view:sale.order.line:0
msgid "Sales Order Lines"
-msgstr "Vevői megrendelés sorok"
+msgstr "Értékesítési megbízási tételek"
#. module: sale
#: field:sale.order.line,delay:0
msgid "Delivery Lead Time"
-msgstr "Szállítási átfutási idő"
+msgstr "Kiszállítás átfutási idő"
#. module: sale
#: view:res.company:0
msgid "Configuration"
-msgstr "Beállítások"
+msgstr "Beállítás"
#. module: sale
-#: selection:sale.order,picking_policy:0
-msgid "Complete Delivery"
-msgstr "Teljes szállítás"
+#: code:addons/sale/edi/sale_order.py:146
+#, python-format
+msgid "EDI Pricelist (%s)"
+msgstr ""
#. module: sale
#: view:sale.report:0
-msgid " Month-1 "
-msgstr " Előző hónap "
-
-#. module: sale
-#: help:sale.config.picking_policy,picking_policy:0
-msgid ""
-"The Shipping Policy is used to configure per order if you want to deliver as "
-"soon as possible when one product is available or you wait that all products "
-"are available.."
+msgid "Sales order created in current year"
msgstr ""
#. module: sale
-#: selection:sale.report,month:0
-msgid "August"
-msgstr "Augusztus"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:111
+#: code:addons/sale/wizard/sale_line_invoice.py:113
#, python-format
msgid ""
"Invoice cannot be created for this Sales Order Line due to one of the "
@@ -1750,10 +1951,15 @@ msgid ""
"1.The state of this sales order line is either \"draft\" or \"cancel\"!\n"
"2.The Sales Order Line is Invoiced!"
msgstr ""
-"Erre a vevői megrendelés sorra számla nem készíthető a következő okok egyike "
-"miatt:\n"
-"1. A vevői megrendelés sor állapota 'tervezet' vagy 'érvénytelenített'.\n"
-"2. A vevői megrendelés sor már kiszámlázásra került."
+"Nem készíthet számlát ehhez az értékesítési megbízási sorhoz, az alábbi okok "
+"egyikének következtében:\n"
+"1. Az értékesítési megbízás sorának állapota: \"Tervezet\" vagy \"Mégsem\".\n"
+"2. Az értékesítési megbízás sor már kiszámlázásra került."
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sale order lines done"
+msgstr ""
#. module: sale
#: field:sale.order.line,th_weight:0
@@ -1774,7 +1980,6 @@ msgstr "December"
#. module: sale
#: field:sale.config.picking_policy,config_logo:0
-#: field:sale.installer,config_logo:0
msgid "Image"
msgstr "Kép"
@@ -1786,6 +1991,11 @@ msgid ""
"production of products regarding to the rules and to the sales order's "
"parameters. "
msgstr ""
+"A rendszer automatikusan egy beszerzési megbízást hoz létre, amint "
+"megerősítettük az értékesítési megbízást, vagy a számlát kifizették. A "
+"rendszer az értékesítési megbízásokon keresztül irányítja a szállítói "
+"megrendeléseket és a termékek gyártását is a beállított szabályoknak és az "
+"értékesítési megbízás paramétereinek megfelelően. "
#. module: sale
#: view:sale.order.line:0
@@ -1801,12 +2011,12 @@ msgstr "Nem számlázott"
#: view:sale.report:0
#: field:sale.report,user_id:0
msgid "Salesman"
-msgstr "Üzletkötő"
+msgstr "Értékesítő"
#. module: sale
-#: model:process.node,note:sale.process_node_saleorder0
-msgid "Drives procurement and invoicing"
-msgstr ""
+#: model:ir.actions.act_window,name:sale.action_order_tree
+msgid "Old Quotations"
+msgstr "Régi árajánlatok"
#. module: sale
#: field:sale.order,amount_untaxed:0
@@ -1814,7 +2024,7 @@ msgid "Untaxed Amount"
msgstr "Nettó érték"
#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:163
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:170
#: model:ir.actions.act_window,name:sale.action_view_sale_advance_payment_inv
#: view:sale.advance.payment.inv:0
#: view:sale.order:0
@@ -1823,10 +2033,10 @@ msgid "Advance Invoice"
msgstr "Előlegszámla"
#. module: sale
-#: code:addons/sale/sale.py:591
+#: code:addons/sale/sale.py:624
#, python-format
msgid "The sales order '%s' has been cancelled."
-msgstr "'%s' vevői megrendelés érvénytelenítésre került."
+msgstr "A következő értékesítési megbízás visszavonásra került: %s"
#. module: sale
#: selection:sale.order.line,state:0
@@ -1846,73 +2056,78 @@ msgid ""
" \n"
"* The 'Cancelled' state is set when a user cancel the sales order related."
msgstr ""
+"* A rendszer a \"Tervezet\" állapotot állítja be, amikor a kapcsolódó "
+"értékesítési megbízás tervezet állapotban van. \n"
+"* A rendszer a \"Megerősítve\" állapotot állítja be, amikor a kapcsolódó "
+"értékesítési megbízás megerősítésre került. \n"
+"* A rendszer a \"Hiba\" állapotot állítja be, amikor a kapcsolódó "
+"értékesítési megbízásban hiba van. \n"
+"* A rendszer a \"Kész\" állapotot állítja be, amikor az értékesítési "
+"megbízási sor eltűnt. \n"
+"* A rendszer a \"Visszavonva\" állapotot állítja be, amikor a kapcsolódó "
+"értékesítési megbízást a felhasználó visszavonja."
#. module: sale
#: help:sale.order,amount_tax:0
msgid "The tax amount."
-msgstr "Az adó összege."
+msgstr "Az adó összege"
#. module: sale
#: view:sale.order:0
msgid "Packings"
-msgstr "Csomagok"
+msgstr "Csomagolások"
#. module: sale
-#: field:sale.config.picking_policy,progress:0
-#: field:sale.installer,progress:0
-msgid "Configuration Progress"
-msgstr "Beállítás előrehaladása"
+#: view:sale.order.line:0
+msgid "Sale Order Lines ready to be invoiced"
+msgstr ""
#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_product_tree
-msgid "Product sales"
-msgstr "Termék értékesítés"
+#: view:sale.report:0
+msgid "Sales order created in last month"
+msgstr ""
#. module: sale
-#: field:sale.order,date_order:0
-msgid "Ordered Date"
-msgstr "Megrendelés dátuma"
+#: model:ir.actions.act_window,name:sale.action_email_templates
+#: model:ir.ui.menu,name:sale.menu_email_templates
+msgid "Email Templates"
+msgstr ""
#. module: sale
#: model:ir.actions.act_window,name:sale.action_order_form
#: model:ir.ui.menu,name:sale.menu_sale_order
#: view:sale.order:0
msgid "Sales Orders"
-msgstr "Vevői megrendelések"
+msgstr "Értékesítési megbízások"
#. module: sale
-#: selection:sale.config.picking_policy,picking_policy:0
-msgid "Direct Delivery"
-msgstr "Közvetlen szállítás"
+#: model:ir.model,name:sale.model_sale_shop
+#: view:sale.shop:0
+msgid "Sales Shop"
+msgstr "Értékesítési bolt"
#. module: sale
-#: field:sale.installer,sale_journal:0
-msgid "Invoicing journals"
-msgstr "Számlázási naplók"
+#: selection:sale.report,month:0
+msgid "November"
+msgstr "November"
#. module: sale
#: field:sale.advance.payment.inv,product_id:0
msgid "Advance Product"
-msgstr "Előleg termék"
-
-#. module: sale
-#: view:sale.report:0
-#: field:sale.report,shipped_qty_1:0
-msgid "Shipped Qty"
-msgstr "Kiszállított mennyiség"
+msgstr "Előlegtermék"
#. module: sale
-#: view:sale.open.invoice:0
-msgid "You invoice has been successfully created!"
-msgstr "A számla sikeresen elkészült!"
+#: view:sale.order:0
+msgid "Compute"
+msgstr "Számítás"
#. module: sale
-#: code:addons/sale/sale.py:585
+#: code:addons/sale/sale.py:618
#, python-format
msgid "You must first cancel all invoices attached to this sales order."
msgstr ""
-"Önnek először minden, a vevői megrendeléshez csatolt számlát "
-"érvénytelenítenie kell."
+"Először sztornózza az összes számlát, amely ehhez az értékesítési "
+"megbízáshoz kapcsolódik."
#. module: sale
#: selection:sale.report,month:0
@@ -1920,30 +2135,26 @@ msgid "January"
msgstr "Január"
#. module: sale
-#: view:sale.installer:0
-msgid "Configure Your Sales Management Application"
-msgstr ""
-
-#. module: sale
#: model:ir.actions.act_window,name:sale.action_order_tree4
msgid "Sales Order in Progress"
-msgstr "Vevői megrendelés folyamatban"
+msgstr "Értékesítési megbízás folyamatban"
#. module: sale
-#: field:sale.installer,sale_layout:0
-msgid "Sales Order Layout Improvement"
+#: help:sale.order,origin:0
+msgid "Reference of the document that generated this sales order request."
msgstr ""
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:63
-#, python-format
-msgid "Error"
-msgstr "Hiba"
+"A dokumentum hivatkozása, amely létrehozta ezt az értékesítési megbízási "
+"igényt."
#. module: sale
#: view:sale.report:0
#: field:sale.report,delay:0
msgid "Commitment Delay"
+msgstr "Árajánlati kötöttség ideje"
+
+#. module: sale
+#: selection:sale.order,order_policy:0
+msgid "Deliver & invoice on demand"
msgstr ""
#. module: sale
@@ -1952,33 +2163,35 @@ msgid ""
"One Procurement order for each sales order line and for each of the "
"components."
msgstr ""
+"Egy beszerzési megbízás minden egyes értékesítési megbízási sorhoz és minden "
+"egyes alkotóelemhez."
#. module: sale
#: model:process.transition.action,name:sale.process_transition_action_assign0
msgid "Assign"
-msgstr "Hozzárendel"
+msgstr "Hozzárendelés"
#. module: sale
#: field:sale.report,date:0
msgid "Date Order"
-msgstr "Megrendelés dátuma"
+msgstr "Megrendelési dátum"
#. module: sale
#: model:process.node,note:sale.process_node_order0
msgid "Confirmed sales order to invoice."
-msgstr "Számlázandó megerősített vevői megrendelés"
+msgstr "megerősített értékesítési megbízás, amely számlázható."
#. module: sale
-#: code:addons/sale/sale.py:290
-#, python-format
-msgid "Cannot delete Sales Order(s) which are already confirmed !"
-msgstr "Nem törölhet megerősített vevői megrendelés(eke)t!"
+#: view:sale.order:0
+msgid "Sales Order that haven't yet been confirmed"
+msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:316
+#: code:addons/sale/sale.py:322
#, python-format
msgid "The sales order '%s' has been set in draft state."
-msgstr "'%s' vevői megrendelést a rendszer tervezet állapotba állította."
+msgstr ""
+"A rendszer a következő értékesítési megbízást tervezet állapotba állított: %s"
#. module: sale
#: selection:sale.order.line,type:0
@@ -1986,35 +2199,25 @@ msgid "from stock"
msgstr "készletből"
#. module: sale
-#: field:sale.config.picking_policy,order_policy:0
-msgid "Shipping Default Policy"
-msgstr "Alapértelmezett számlázási mód"
-
-#. module: sale
#: view:sale.open.invoice:0
msgid "Close"
msgstr "Zárás"
#. module: sale
+#: code:addons/sale/sale.py:1248
+#, python-format
+msgid "No Pricelist ! : "
+msgstr ""
+
+#. module: sale
#: field:sale.order,shipped:0
msgid "Delivered"
msgstr "Kiszállított"
#. module: sale
-#: code:addons/sale/sale.py:1115
-#, python-format
-msgid "Not enough stock !"
-msgstr "Nincs elég készlet !"
-
-#. module: sale
#: constraint:stock.move:0
msgid "You must assign a production lot for this product"
-msgstr ""
-
-#. module: sale
-#: field:sale.order.line,sequence:0
-msgid "Layout Sequence"
-msgstr ""
+msgstr "Rendeljen hozzá egy gyártási tételt ehhez a termékhez!"
#. module: sale
#: model:ir.actions.act_window,help:sale.action_shop_form
@@ -2025,11 +2228,16 @@ msgid ""
"warehouse from which the products will be delivered for each particular "
"sales."
msgstr ""
+"Ha egynél több üzletben árulja a vállalata termékeit, akkor azokat az "
+"üzleteket itt kezelheti. Amikor egy új árajánlatot vagy értékesítési "
+"megbízást vesz fel, azt kapcsolnia kell az üzlethez. Az üzlethez kapcsolnia "
+"kell egy raktárat is, ahonnan minden egyes üzletben történő értékesítés "
+"esetén kiszállítják a termékeket."
#. module: sale
#: help:sale.order,invoiced:0
msgid "It indicates that an invoice has been paid."
-msgstr "Jelzi, hogy a számlát kifizették."
+msgstr "Azt jelzi, hogy a számla ki van fizetve."
#. module: sale
#: report:sale.order:0
@@ -2043,11 +2251,6 @@ msgid "May"
msgstr "Május"
#. module: sale
-#: help:sale.installer,sale_order_dates:0
-msgid "Adds commitment, requested and effective dates on Sales Orders."
-msgstr ""
-
-#. module: sale
#: view:sale.order:0
#: field:sale.order,partner_id:0
#: field:sale.order.line,order_partner_id:0
@@ -2055,25 +2258,11 @@ msgid "Customer"
msgstr "Vevő"
#. module: sale
-#: model:product.template,name:sale.advance_product_0_product_template
-msgid "Advance"
-msgstr "Előleg"
-
-#. module: sale
#: selection:sale.report,month:0
msgid "February"
msgstr "Február"
#. module: sale
-#: help:sale.installer,sale_journal:0
-msgid ""
-"Allows you to group and invoice your delivery orders according to different "
-"invoicing types: daily, weekly, etc."
-msgstr ""
-"Lehetővé teszi a szállítólevelek összevonását és számlázását a különböző "
-"számlázási típusok alapján: napi, heti, stb."
-
-#. module: sale
#: selection:sale.report,month:0
msgid "April"
msgstr "Április"
@@ -2084,20 +2273,21 @@ msgid "Accounting"
msgstr "Könyvelés"
#. module: sale
-#: field:sale.config.picking_policy,step:0
-msgid "Steps To Deliver a Sales Order"
-msgstr ""
-
-#. module: sale
#: view:sale.order:0
#: view:sale.order.line:0
msgid "Search Sales Order"
-msgstr "Vevői megrendelések keresése"
+msgstr "Értékesítési megbízás keresése"
#. module: sale
#: model:process.node,name:sale.process_node_saleorderprocurement0
msgid "Sales Order Requisition"
-msgstr "Vevői megrendelés igény"
+msgstr "Értékesítési megbízás igénylés"
+
+#. module: sale
+#: code:addons/sale/sale.py:1242
+#, python-format
+msgid "Not enough stock ! : "
+msgstr ""
#. module: sale
#: report:sale.order:0
@@ -2106,12 +2296,6 @@ msgid "Payment Term"
msgstr "Fizetési feltétel"
#. module: sale
-#: help:sale.installer,sale_layout:0
-msgid ""
-"Provides some features to improve the layout of the Sales Order reports."
-msgstr ""
-
-#. module: sale
#: model:ir.actions.act_window,help:sale.action_order_report_all
msgid ""
"This report performs analysis on your quotations and sales orders. Analysis "
@@ -2120,12 +2304,12 @@ msgid ""
"having invoiced yet. If you want to analyse your turnover, you should use "
"the Invoice Analysis report in the Accounting application."
msgstr ""
-"Ez a kimutatás az árajánlatokról és a vevői megrendelésekről nyújt elemzést. "
-"Ön ellenőrizheti az értékesítési forgalmat és különböző kritériumok "
-"(üzletkötő, partner, termék, stb) szerint csoportosíthatja. Használja ezt a "
-"kimutatást, hogy információt kapjon a még nem számlázott értékesítésekről. "
-"Ha a forgalmat akarja elemezni, akkor a pénzügy-számvitel modulban található "
-"számlaelemzés kimutatást kell használnia."
+"Ez a jelentés elemzést készít az árajánlatairól és az értékesítési "
+"megbízásairól. Az elemzés kimutatja az értékesítési bevételeit, és "
+"szétosztja különböző kritériumok alapján (értékesítő, partner, termék stb.). "
+"Használja ezt a jelentést, ha elemzést szeretne készíteni a még ki nem "
+"számlázott értékesítéseiről. Ha a forgalmát szeretné elemezni, akkor "
+"használja a számla elemző jelentést a könyvelési modulban."
#. module: sale
#: report:sale.order:0
@@ -2147,7 +2331,7 @@ msgstr "Év"
#. module: sale
#: selection:sale.config.picking_policy,order_policy:0
msgid "Invoice Based on Deliveries"
-msgstr "Számla árukiadás alapján"
+msgstr "Számlák kiszállítások alapján"
#~ msgid "Reference"
#~ msgstr "Hivatkozás"
@@ -2164,6 +2348,9 @@ msgstr "Számla árukiadás alapján"
#~ msgid "Sequence"
#~ msgstr "Sorszám"
+#~ msgid "Partial Delivery"
+#~ msgstr "Részleges kiszállítás"
+
#~ msgid "Procure Method"
#~ msgstr "Ellátás módja"
@@ -2332,9 +2519,6 @@ msgstr "Számla árukiadás alapján"
#~ msgid "Procurement for each line"
#~ msgstr "Minden tétel beszerzése"
-#~ msgid "My Quotations"
-#~ msgstr "Árajánlataim"
-
#~ msgid "Packing Default Policy"
#~ msgstr "Csomagolás alapértelmezett eljárásmódja"
@@ -2456,6 +2640,9 @@ msgstr "Számla árukiadás alapján"
#~ msgid "Open Advance Invoice"
#~ msgstr "Előzetes számla megnyitása"
+#~ msgid "Sales Management"
+#~ msgstr "Értékesítési menedzsment"
+
#~ msgid "Deliver"
#~ msgstr "Szállítás"
@@ -2515,6 +2702,9 @@ msgstr "Számla árukiadás alapján"
#~ msgid "Related invoices"
#~ msgstr "Kapcsolódó számlák"
+#~ msgid "Payment Before Delivery"
+#~ msgstr "Fizetés szállítás előtt"
+
#~ msgid ""
#~ "This is the list of invoices that have been generated for this sale order. "
#~ "The same sale order may have been invoiced in several times (by line for "
@@ -2532,3 +2722,291 @@ msgstr "Számla árukiadás alapján"
#~ msgid "Sale Order line"
#~ msgstr "Rendelési sor"
+
+#~ msgid "All at Once"
+#~ msgstr "Egyszerre"
+
+#~ msgid " Year "
+#~ msgstr " Év "
+
+#~ msgid "Shipping Policy"
+#~ msgstr "Szállítási szabályok"
+
+#~ msgid "Picking List & Delivery Order"
+#~ msgstr "Kiszedési lista és Szállítás megrendelése"
+
+#~ msgid "Invoicing"
+#~ msgstr "Számlázás"
+
+#~ msgid " Month "
+#~ msgstr " Hónap "
+
+#~ msgid "Complete Delivery"
+#~ msgstr "Teljes szállítás"
+
+#~ msgid "Ordered Date"
+#~ msgstr "Megrendelés dátuma"
+
+#~ msgid "Shipped Qty"
+#~ msgstr "Szállított mennyiség"
+
+#~ msgid "Shipping Default Policy"
+#~ msgstr "Alapértelmezett szállítási politika"
+
+#~ msgid "Configure"
+#~ msgstr "Beállítás"
+
+#~ msgid "sale.installer"
+#~ msgstr "sale.installer"
+
+#~ msgid "Advance"
+#~ msgstr "Előleg"
+
+#~ msgid "Configuration Progress"
+#~ msgstr "Beállítás előrehaladása"
+
+#~ msgid "Allows you to compute delivery costs on your quotations."
+#~ msgstr ""
+#~ "Lehetővé teszi a kiszállítási költségek kiszámítását az árajánlataiban."
+
+#~ msgid "Configure Sales Order Logistics"
+#~ msgstr "Értékesítési megbízás logisztikájának beállítása"
+
+#~ msgid "Configure Picking Policy for Sales Order"
+#~ msgstr "Kiszedési szabály beállítása értékesítési megbízáshoz"
+
+#~ msgid ""
+#~ "The Shipping Policy is used to synchronise invoice and delivery operations.\n"
+#~ " - The 'Pay Before delivery' choice will first generate the invoice and "
+#~ "then generate the picking order after the payment of this invoice.\n"
+#~ " - The 'Shipping & Manual Invoice' will create the picking order directly "
+#~ "and wait for the user to manually click on the 'Invoice' button to generate "
+#~ "the draft invoice.\n"
+#~ " - The 'Invoice On Order After Delivery' choice will generate the draft "
+#~ "invoice based on sales order after all picking lists have been finished.\n"
+#~ " - The 'Invoice From The Picking' choice is used to create an invoice "
+#~ "during the picking process."
+#~ msgstr ""
+#~ "A kiszállítási szabályok arra szolgálnak, hogy összhangba hozzák a "
+#~ "számlázást és a kiszállításokat.\n"
+#~ " - A \"Fizetés szállítás előtt\" parancs először létrehozza a számlát, "
+#~ "majd a számla kifizetését követően létrehozza a kapcsolódó kiszedési "
+#~ "megbízást. \n"
+#~ " - A \"Szállítás és kézi számlázás\" parancs választása esetén a rendszer "
+#~ "automatikusan létrehozza a kiszedési megbízást, majd vár a felhasználóra, "
+#~ "hogy az manuálisan rákattintson a \"Számlázás\" gombra a számlapiszkozat "
+#~ "létrehozásához.\n"
+#~ " - A \"Számlázás szállítás után\" parancs az értékesítési megbízás alapján "
+#~ "hozza létre a számlapiszkozatot, miután a kiszedési megbízások lezárásra "
+#~ "kerültek. \n"
+#~ " - A \"Számlázás kiszedés alapján\" parancs a számlát a kiszedési eljárás "
+#~ "alatt készíti el."
+
+#~ msgid "Delivery Order Only"
+#~ msgstr "Csak kiszállítási megbízás"
+
+#~ msgid "Enhance your core Sales Application with additional functionalities."
+#~ msgstr "Egészítse ki az alap értékesítési alkalmazását további funkciókkal."
+
+#~ msgid "Order Reference must be unique !"
+#~ msgstr "A megbízási referenciának egyedinek kell lennie!"
+
+#~ msgid "Setup your sales workflow and default values."
+#~ msgstr ""
+#~ "Állítsa be az értékesítési munkafolyamatát és az alapértelmezett értékeket."
+
+#~ msgid "Invoice On Order After Delivery"
+#~ msgstr "Számlázás kiszállítás után"
+
+#~ msgid ""
+#~ "\n"
+#~ " The base module to manage quotations and sales orders.\n"
+#~ "\n"
+#~ " * Workflow with validation steps:\n"
+#~ " - Quotation -> Sales order -> Invoice\n"
+#~ " * Invoicing methods:\n"
+#~ " - Invoice on order (before or after shipping)\n"
+#~ " - Invoice on delivery\n"
+#~ " - Invoice on timesheets\n"
+#~ " - Advance invoice\n"
+#~ " * Partners preferences (shipping, invoicing, incoterm, ...)\n"
+#~ " * Products stocks and prices\n"
+#~ " * Delivery methods:\n"
+#~ " - all at once, multi-parcel\n"
+#~ " - delivery costs\n"
+#~ " * Dashboard for salesman that includes:\n"
+#~ " * Your open quotations\n"
+#~ " * Top 10 sales of the month\n"
+#~ " * Cases statistics\n"
+#~ " * Graph of sales by product\n"
+#~ " * Graph of cases of the month\n"
+#~ " "
+#~ msgstr ""
+#~ "\n"
+#~ " Az árajánlatok és értékesítési megbízások kezeléséhez használt alapvető "
+#~ "modul. \n"
+#~ "\n"
+#~ " * Munkafolyamat ellenőrző lépésekkel: \n"
+#~ " - Árajánlat -> Értékesítési megbízás -> Számla \n"
+#~ " * Számlázási módok: \n"
+#~ " - Számlázás a megrendelés alapján (szállítás előtt vagy után) \n"
+#~ " - Számlázás a kiszállítás alapján\n"
+#~ " - Számlázás munkaidő alapján\n"
+#~ " - Előlegszámla\n"
+#~ " * Partnerek beállításai (szállítás, számlázás, Incoterms, ...) \n"
+#~ " * Termékkészletek és árak \n"
+#~ " * Szállítási módok: \n"
+#~ " - egyszerre, több csomagban \n"
+#~ " - szállítási költségek\n"
+#~ " * Értékesítői vezérlőpult, mely tartalmazza az alábbiakat: \n"
+#~ " - az Ön nyitott árajánlatait\n"
+#~ " - a hónap top 10 értékesítését\n"
+#~ " - eset statisztikákat\n"
+#~ " - termékek szerinti diagrammot az értékesítésekről\n"
+#~ " - havi esetek grafikonját\n"
+#~ " "
+
+#~ msgid "Picking Default Policy"
+#~ msgstr "Alapértelmezett kiszedési szabály"
+
+#, python-format
+#~ msgid "You cannot cancel a sales order line that has already been invoiced !"
+#~ msgstr ""
+#~ "Nem vonhat vissza olyan értékesítési megbízási sort, amely már számlázásra "
+#~ "került!"
+
+#~ msgid "Sales Order Dates"
+#~ msgstr "Értékesítési megbízás dátumai"
+
+#~ msgid "Margins in Sales Orders"
+#~ msgstr "Értékesítési megbízás árrései"
+
+#~ msgid "Sales Application Configuration"
+#~ msgstr "Értékesítési alkalmazás beállítása"
+
+#~ msgid "Delivery Costs"
+#~ msgstr "Kiszállítási költségek"
+
+#~ msgid "title"
+#~ msgstr "megszólítás"
+
+#~ msgid "Order date"
+#~ msgstr "Megrendelési dátum"
+
+#~ msgid "Shipping & Manual Invoice"
+#~ msgstr "Szállítás és kézi számlázás"
+
+#, python-format
+#~ msgid "Picking Information !"
+#~ msgstr "Kiszedési információ!"
+
+#~ msgid "Invoice From The Picking"
+#~ msgstr "Számlázás kiszedés alapján"
+
+#~ msgid ""
+#~ "By default, OpenERP is able to manage complex routing and paths of products "
+#~ "in your warehouse and partner locations. This will configure the most common "
+#~ "and simple methods to deliver products to the customer in one or two "
+#~ "operations by the worker."
+#~ msgstr ""
+#~ "Alapvetően az OpenERP képes a komplex útvonalak és a termékek raktárban "
+#~ "elfoglalt helyének, valamint a partnerek helyének menedzsélésére. Beállítjuk "
+#~ "a leggyakoribb és legegyszerűbb módokat a termékek kiszállítására a vevőnek, "
+#~ "amely csak egy vagy két műveletet igényel a dolgozótól."
+
+#~ msgid ""
+#~ "Gives the state of the quotation or sales order. \n"
+#~ "The exception state is automatically set when a cancel operation occurs in "
+#~ "the invoice validation (Invoice Exception) or in the picking list process "
+#~ "(Shipping Exception). \n"
+#~ "The 'Waiting Schedule' state is set when the invoice is confirmed but "
+#~ "waiting for the scheduler to run on the date 'Ordered Date'."
+#~ msgstr ""
+#~ "Megadja az árajánlát vagy értékesítési megbízás állapotát. \n"
+#~ "A hiba állapot automatikusan beállításra kerül, ha egy visszavonási művelet "
+#~ "történik a számla jóváhagyásánál (Számla hiba) vagy a kiválasztási lista "
+#~ "folyamatában (Szállítási hiba). \n"
+#~ "Az \"Ütemezésre vár\" állapot kerül beállításra, ha a számla elfogadásra "
+#~ "került, de vár az ütemezőre, hogy lefusson a \"Rendelés dátuma\" dátumon."
+
+#, python-format
+#~ msgid "Cannot delete a sales order line which is %s !"
+#~ msgstr "Nem törölheti a következő értékesítési megbízási sort: %s !"
+
+#~ msgid ""
+#~ "Gives the margin of profitability by calculating the difference between Unit "
+#~ "Price and Cost Price."
+#~ msgstr ""
+#~ "Megadja a nyereségi árrést az egységár és a bekerülési ár közötti különbség "
+#~ "kiszámításával."
+
+#, python-format
+#~ msgid ""
+#~ "You selected a quantity of %d Units.\n"
+#~ "But it's not compatible with the selected packaging.\n"
+#~ "Here is a proposition of quantities according to the packaging:\n"
+#~ "\n"
+#~ "EAN: %s Quantity: %s Type of ul: %s"
+#~ msgstr ""
+#~ "A következő mennyiségét (egység) választotta ki: %d.\n"
+#~ "Azonban ez nem kompatibilis a kiválasztott csomagolással.\n"
+#~ "Alább talál egy javaslatot a mennyiségre a csomagolásnak megfelelően:\n"
+#~ "\n"
+#~ "Vonalkód: %s Mennyiség: %s Típus: %s"
+
+#~ msgid " Month-1 "
+#~ msgstr " Hónap - 1 "
+
+#~ msgid ""
+#~ "The Shipping Policy is used to configure per order if you want to deliver as "
+#~ "soon as possible when one product is available or you wait that all products "
+#~ "are available.."
+#~ msgstr ""
+#~ "A szállítási szabály arra szolgál, hogy megrendelésenként beállítsuk, hogy "
+#~ "azonnal szeretnénk-e szállítani, amint egy termék elkészül, vagy megvárjuk, "
+#~ "amíg az összes termék elkészül."
+
+#~ msgid "Product sales"
+#~ msgstr "Termékértékesítés"
+
+#~ msgid "Direct Delivery"
+#~ msgstr "Közvetlen kiszállítás"
+
+#~ msgid "Invoicing journals"
+#~ msgstr "Számlanapló"
+
+#~ msgid "Configure Your Sales Management Application"
+#~ msgstr "Állítsa be az értékesítési menedzsment alkalmazását!"
+
+#~ msgid "Sales Order Layout Improvement"
+#~ msgstr "Értékesítési megbízás elrendezésének fejlesztése"
+
+#, python-format
+#~ msgid "Cannot delete Sales Order(s) which are already confirmed !"
+#~ msgstr ""
+#~ "Nem törölhet olyan értékesítési megbízás(ok)at, amelyeket már megerősített!"
+
+#, python-format
+#~ msgid "Not enough stock !"
+#~ msgstr "Nincs elég készlet!"
+
+#~ msgid "Adds commitment, requested and effective dates on Sales Orders."
+#~ msgstr ""
+#~ "Ez a funkció árajánlati kötöttséget, igényelt és tényleges dátumokat ad "
+#~ "hozzá az értékesítési megbízásokhoz."
+
+#~ msgid ""
+#~ "Allows you to group and invoice your delivery orders according to different "
+#~ "invoicing types: daily, weekly, etc."
+#~ msgstr ""
+#~ "Lehetővé teszi, hogy a kiszállítási megbízásait csoportosítsa és kiszámlázza "
+#~ "a különböző számlázási szokásoknak megfelelően: napi, heti, havi stb."
+
+#~ msgid "Steps To Deliver a Sales Order"
+#~ msgstr "Lépések az értékesítési megbízás kiszállításához"
+
+#~ msgid ""
+#~ "Provides some features to improve the layout of the Sales Order reports."
+#~ msgstr ""
+#~ "Biztosít néhány funkciót, amelyek fejlesztik értékesítési megbízási riportok "
+#~ "elrendezését."
diff --git a/addons/sale/i18n/id.po b/addons/sale/i18n/id.po
index 2e7a08e00c4..053e4bfbba5 100644
--- a/addons/sale/i18n/id.po
+++ b/addons/sale/i18n/id.po
@@ -7,15 +7,27 @@ msgid ""
msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-01-11 11:16+0000\n"
+"POT-Creation-Date: 2011-12-22 18:43+0000\n"
"PO-Revision-Date: 2011-01-19 05:08+0000\n"
"Last-Translator: opix <inur.opix@gmail.com>\n"
"Language-Team: Indonesian <id@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-05 05:16+0000\n"
-"X-Generator: Launchpad (build 14231)\n"
+"X-Launchpad-Export-Date: 2011-12-23 06:46+0000\n"
+"X-Generator: Launchpad (build 14560)\n"
+
+#. module: sale
+#: field:sale.config.picking_policy,timesheet:0
+msgid "Based on Timesheet"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid ""
+"Sale Order Lines that are confirmed, done or in exception state and haven't "
+"yet been invoiced"
+msgstr ""
#. module: sale
#: view:board.board:0
@@ -24,12 +36,6 @@ msgid "Sales by Salesman in last 90 days"
msgstr "Penjualan oleh Salesman dalam 90 hari terakhir"
#. module: sale
-#: help:sale.installer,delivery:0
-msgid "Allows you to compute delivery costs on your quotations."
-msgstr ""
-"Memungkinkan Anda untuk menghitung biaya pengiriman pada quotations Anda."
-
-#. module: sale
#: help:sale.order,picking_policy:0
msgid ""
"If you don't have enough stock available to deliver all at once, do you "
@@ -39,6 +45,11 @@ msgstr ""
"jika hanya dikirim sebagian?"
#. module: sale
+#: view:sale.order:0
+msgid "UoS"
+msgstr ""
+
+#. module: sale
#: help:sale.order,partner_shipping_id:0
msgid "Shipping address for current sales order."
msgstr "Alamat pengiriman untuk sales order saat ini."
@@ -62,22 +73,12 @@ msgid "Cancel Order"
msgstr "Batalkan order"
#. module: sale
-#: view:sale.config.picking_policy:0
-msgid "Configure Sales Order Logistics"
-msgstr "Konfigurasi Logistik Sales Order"
-
-#. module: sale
-#: code:addons/sale/sale.py:603
+#: code:addons/sale/sale.py:638
#, python-format
msgid "The quotation '%s' has been converted to a sales order."
msgstr "quotation \"%s\" telah dikonversikan pada sales order"
#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Payment Before Delivery"
-msgstr "Pembayaran Sebelum Pengiriman"
-
-#. module: sale
#: code:addons/sale/wizard/sale_make_invoice.py:42
#, python-format
msgid "Warning !"
@@ -94,12 +95,6 @@ msgid "Drives procurement orders for every sales order line."
msgstr "meningkatkan order pengadaan pada setiap daftar order penjualan"
#. module: sale
-#: selection:sale.config.picking_policy,picking_policy:0
-msgid "All at Once"
-msgstr "Sekaligus"
-
-#. module: sale
-#: field:sale.order,project_id:0
#: view:sale.report:0
#: field:sale.report,analytic_account_id:0
#: field:sale.shop,project_id:0
@@ -119,6 +114,15 @@ msgstr ""
"total penjualan anda"
#. module: sale
+#: code:addons/sale/sale.py:295
+#, python-format
+msgid ""
+"In order to delete a confirmed sale order, you must cancel it before ! To "
+"cancel a sale order, you must first cancel related picking or delivery "
+"orders."
+msgstr ""
+
+#. module: sale
#: model:process.node,name:sale.process_node_saleprocurement0
msgid "Procurement Order"
msgstr "Order procurement"
@@ -130,6 +134,11 @@ msgid "Partner"
msgstr "Rekanan"
#. module: sale
+#: selection:sale.order,order_policy:0
+msgid "Invoice based on deliveries"
+msgstr ""
+
+#. module: sale
#: view:sale.order:0
msgid "Order Line"
msgstr "Daftar Pesanan"
@@ -175,9 +184,14 @@ msgid "Default Payment Term"
msgstr "Default Term Pembayaran"
#. module: sale
-#: model:ir.actions.act_window,name:sale.action_config_picking_policy
-msgid "Configure Picking Policy for Sales Order"
-msgstr "Konfigurasi Pengambil Kebijakan untuk Sales Order"
+#: field:sale.config.picking_policy,deli_orders:0
+msgid "Based on Delivery Orders"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.picking_policy,time_unit:0
+msgid "Main Working Time Unit"
+msgstr ""
#. module: sale
#: view:sale.order:0
@@ -193,9 +207,10 @@ msgid "Disc.(%)"
msgstr "Potongan (%)"
#. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_forceassignation0
-msgid "Force Assignation"
-msgstr "Penetapan Tugas"
+#: view:sale.report:0
+#: field:sale.report,price_total:0
+msgid "Total Price"
+msgstr "Total Harga"
#. module: sale
#: help:sale.make.invoice,grouped:0
@@ -203,6 +218,11 @@ msgid "Check the box to group the invoices for the same customers"
msgstr "centang kotak untuk kelompok invoice untuk pelanggan yang sama"
#. module: sale
+#: view:sale.order:0
+msgid "My Sale Orders"
+msgstr ""
+
+#. module: sale
#: selection:sale.order,invoice_quantity:0
msgid "Ordered Quantities"
msgstr "Order Kuantitas"
@@ -243,14 +263,25 @@ msgstr ""
"penjemputan' atau 'invoice setelah pengiriman\""
#. module: sale
+#: field:sale.config.picking_policy,task_work:0
+msgid "Based on Tasks' Work"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
+msgid "Quotations and Sales"
+msgstr ""
+
+#. module: sale
#: model:ir.model,name:sale.model_sale_make_invoice
msgid "Sales Make Invoice"
msgstr "Sales membuat invoice"
#. module: sale
-#: view:sale.order:0
-msgid "Recreate Packing"
-msgstr "Pengemasan ulang"
+#: code:addons/sale/sale.py:330
+#, python-format
+msgid "Pricelist Warning!"
+msgstr ""
#. module: sale
#: field:sale.order.line,discount:0
@@ -258,12 +289,10 @@ msgid "Discount (%)"
msgstr "Potongan (%)"
#. module: sale
-#: help:res.company,security_lead:0
-msgid ""
-"This is the days added to what you promise to customers for security purpose"
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_quotation_for_sale
+msgid "My Quotations"
msgstr ""
-"Dimana anda menjanjikan kepada pelanggan masalah penambahan hari untuk "
-"keperluan keamanan"
#. module: sale
#: view:board.board:0
@@ -288,7 +317,22 @@ msgid "Shop Name"
msgstr "Nama toko"
#. module: sale
-#: code:addons/sale/sale.py:1014
+#: help:sale.order,order_policy:0
+msgid ""
+"The Invoice Policy is used to synchronise invoice and delivery operations.\n"
+" - The 'Pay before delivery' choice will first generate the invoice and "
+"then generate the picking order after the payment of this invoice.\n"
+" - The 'Deliver & Invoice on demand' will create the picking order directly "
+"and wait for the user to manually click on the 'Invoice' button to generate "
+"the draft invoice based on the sale order or the sale order lines.\n"
+" - The 'Invoice on order after delivery' choice will generate the draft "
+"invoice based on sales order after all picking lists have been finished.\n"
+" - The 'Invoice based on deliveries' choice is used to create an invoice "
+"during the picking process."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:1158
#, python-format
msgid "No Customer Defined !"
msgstr "Nama konsumen tidak ditemukan"
@@ -299,9 +343,12 @@ msgid "Sales in Exception"
msgstr "Sales dalam Pengecualian"
#. module: sale
-#: view:sale.order:0
-msgid "Set to Draft"
-msgstr "Atur ke draft"
+#: code:addons/sale/sale.py:1145
+#: code:addons/sale/sale.py:1264
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:70
+#, python-format
+msgid "Configuration Error !"
+msgstr ""
#. module: sale
#: view:sale.order:0
@@ -309,35 +356,7 @@ msgid "Conditions"
msgstr "Kondisi"
#. module: sale
-#: help:sale.order,order_policy:0
-msgid ""
-"The Shipping Policy is used to synchronise invoice and delivery operations.\n"
-" - The 'Pay Before delivery' choice will first generate the invoice and "
-"then generate the picking order after the payment of this invoice.\n"
-" - The 'Shipping & Manual Invoice' will create the picking order directly "
-"and wait for the user to manually click on the 'Invoice' button to generate "
-"the draft invoice.\n"
-" - The 'Invoice On Order After Delivery' choice will generate the draft "
-"invoice based on sales order after all picking lists have been finished.\n"
-" - The 'Invoice From The Picking' choice is used to create an invoice "
-"during the picking process."
-msgstr ""
-"Kebijakan Pengiriman digunakan untuk menyinkronkan operasi dan pengiriman "
-"invoice.\n"
-"- The 'Pembayaran Sebelum pengiriman' pilihan pertama akan menghasilkan "
-"invoice dan kemudian menghasilkan urutan pengambilan setelah pembayaran "
-"invoice ini.\n"
-"- The 'Pengiriman & Manual invoice' akan menciptakan urutan pengambilan "
-"langsung dan menunggu pengguna untuk secara manual klik tombol 'invoice' "
-"untuk menghasilkan invoice draft.\n"
-"- The 'invoice On Delivery Order Setelah' pilihan akan menghasilkan invoice "
-"draft berdasarkan pesanan sales setelah semua daftar pengambilan telah "
-"selesai.\n"
-"- 'invoice Dari Picking' Pilihan ini digunakan untuk membuat invoice selama "
-"proses pengambilan."
-
-#. module: sale
-#: code:addons/sale/sale.py:939
+#: code:addons/sale/sale.py:1034
#, python-format
msgid ""
"There is no income category account defined in default Properties for "
@@ -347,9 +366,9 @@ msgstr ""
"Properties untuk Produk Kategori atau Fiskal Posisi tidak ditemukan!"
#. module: sale
-#: view:sale.installer:0
-msgid "Configure"
-msgstr "Pengaturan"
+#: selection:sale.report,month:0
+msgid "August"
+msgstr "Agustus"
#. module: sale
#: constraint:stock.move:0
@@ -358,7 +377,7 @@ msgstr ""
"Anda mencoba untuk menetapkan banyak yang tidak dari produk yang sama"
#. module: sale
-#: code:addons/sale/sale.py:620
+#: code:addons/sale/sale.py:655
#, python-format
msgid "invalid mode for test_state"
msgstr "mode tidak sah untuk test_state"
@@ -369,7 +388,7 @@ msgid "June"
msgstr "Juni"
#. module: sale
-#: code:addons/sale/sale.py:584
+#: code:addons/sale/sale.py:617
#, python-format
msgid "Could not cancel this sales order !"
msgstr "Order penjualan ini tidak dapat dibatalkan"
@@ -390,8 +409,12 @@ msgid "October"
msgstr "Oktober"
#. module: sale
+#: sql_constraint:stock.picking:0
+msgid "Reference must be unique per Company!"
+msgstr ""
+
+#. module: sale
#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_quotation_for_sale
#: view:sale.order:0
#: view:sale.report:0
msgid "Quotations"
@@ -403,11 +426,6 @@ msgid "Pricelist for current sales order."
msgstr "Daftar harga sales order untuk saat ini"
#. module: sale
-#: selection:sale.config.picking_policy,step:0
-msgid "Delivery Order Only"
-msgstr "Hanya Order Pengiriman saja"
-
-#. module: sale
#: report:sale.order:0
msgid "TVA :"
msgstr "TVA :"
@@ -433,6 +451,7 @@ msgstr "Posisi Fiskal"
#. module: sale
#: view:sale.order:0
#: view:sale.order.line:0
+#: field:sale.report,product_uom:0
msgid "UoM"
msgstr "Satuan"
@@ -457,7 +476,13 @@ msgstr ""
"proses \"atau\" Proses manual'."
#. module: sale
-#: code:addons/sale/sale.py:971
+#: code:addons/sale/sale.py:1061
+#, python-format
+msgid "You cannot cancel a sale order line that has already been invoiced!"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:1066
#, python-format
msgid "You must first cancel stock moves attached to this sales order line."
msgstr ""
@@ -465,7 +490,7 @@ msgstr ""
"penjualan."
#. module: sale
-#: code:addons/sale/sale.py:1042
+#: code:addons/sale/sale.py:1134
#, python-format
msgid "(n/a)"
msgstr "tidak tersedia"
@@ -503,15 +528,36 @@ msgid "Notes"
msgstr "Catatan"
#. module: sale
+#: sql_constraint:res.company:0
+msgid "The company name must be unique !"
+msgstr ""
+
+#. module: sale
#: help:sale.order,partner_invoice_id:0
msgid "Invoice address for current sales order."
msgstr "Faktur alamat untuk order penjualan saat ini."
#. module: sale
-#: view:sale.installer:0
-msgid "Enhance your core Sales Application with additional functionalities."
+#: view:sale.report:0
+msgid "Month-1"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered month of the sales order"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:504
+#, python-format
+msgid ""
+"You cannot group sales having different currencies for the same partner."
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,picking_policy:0
+msgid "Deliver each product when available"
msgstr ""
-"Meningkatkan Aplikasi Penjualan anda dengan fungsionalitas tambahan."
#. module: sale
#: field:sale.order,invoiced_rate:0
@@ -530,21 +576,43 @@ msgid "Confirmation Date"
msgstr "Tanggal Konfirmasi"
#. module: sale
+#: field:sale.order,incoterm:0
+msgid "Incoterm"
+msgstr "Incoterm"
+
+#. module: sale
#: field:sale.order.line,address_allotment_id:0
msgid "Allotment Partner"
msgstr "Peruntukan rekanan"
#. module: sale
-#: sql_constraint:sale.order:0
-msgid "Order Reference must be unique !"
-msgstr "Referensi order harus unik !"
-
-#. module: sale
#: selection:sale.report,month:0
msgid "March"
msgstr "Maret"
#. module: sale
+#: constraint:stock.move:0
+msgid "You can not move products from or to a location of the type view."
+msgstr ""
+
+#. module: sale
+#: field:sale.config.picking_policy,sale_orders:0
+msgid "Based on Sales Orders"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,state:0
+msgid ""
+"Givwizard = self.browse(cr, uid, ids)[0]es the state of the quotation or "
+"sales order. \n"
+"The exception state is automatically set when a cancel operation occurs in "
+"the invoice validation (Invoice Exception) or in the picking list process "
+"(Shipping Exception). \n"
+"The 'Waiting Schedule' state is set when the invoice is confirmed but "
+"waiting for the scheduler to run on the order date."
+msgstr ""
+
+#. module: sale
#: help:sale.order,amount_total:0
msgid "The total amount."
msgstr "Jumlah total"
@@ -560,6 +628,11 @@ msgid "Invoice address :"
msgstr "Alamat faktur"
#. module: sale
+#: field:sale.order.line,sequence:0
+msgid "Line Sequence"
+msgstr ""
+
+#. module: sale
#: model:process.transition,note:sale.process_transition_saleorderprocurement0
msgid ""
"For every sales order line, a procurement order is created to supply the "
@@ -610,11 +683,6 @@ msgid "Sales Order Line"
msgstr "Daftar order penjualan"
#. module: sale
-#: view:sale.config.picking_policy:0
-msgid "Setup your sales workflow and default values."
-msgstr "Set alur proses penjulan dan nilai dasar"
-
-#. module: sale
#: field:sale.shop,warehouse_id:0
msgid "Warehouse"
msgstr "Gudang"
@@ -651,6 +719,11 @@ msgid "Creation Date"
msgstr "Tanggal Pembuatan"
#. module: sale
+#: model:ir.ui.menu,name:sale.menu_sales_configuration_misc
+msgid "Miscellaneous"
+msgstr ""
+
+#. module: sale
#: model:ir.actions.act_window,name:sale.action_order_line_tree3
msgid "Uninvoiced and Delivered Lines"
msgstr "Baris Order belum terfakturkan dan belum terkirim"
@@ -666,14 +739,19 @@ msgid "My Sales"
msgstr "Sales Saya"
#. module: sale
-#: code:addons/sale/sale.py:290
-#: code:addons/sale/sale.py:966
-#: code:addons/sale/sale.py:1165
+#: code:addons/sale/sale.py:295
+#: code:addons/sale/sale.py:1061
+#: code:addons/sale/sale.py:1290
#, python-format
msgid "Invalid action !"
msgstr "Tindakan tidak valid !"
#. module: sale
+#: view:sale.order:0
+msgid "Extra Info"
+msgstr "Penjelasan lebih lanjut"
+
+#. module: sale
#: field:sale.order,pricelist_id:0
#: field:sale.report,pricelist_id:0
#: field:sale.shop,pricelist_id:0
@@ -687,13 +765,21 @@ msgid "# of Qty"
msgstr "# of Qty"
#. module: sale
+#: code:addons/sale/sale.py:1314
+#, python-format
+msgid "Hour"
+msgstr ""
+
+#. module: sale
#: view:sale.order:0
msgid "Order Date"
msgstr "Tanggal Order"
#. module: sale
#: view:sale.order.line:0
+#: view:sale.report:0
#: field:sale.report,shipped:0
+#: field:sale.report,shipped_qty_1:0
msgid "Shipped"
msgstr "Dikirimkan"
@@ -703,9 +789,9 @@ msgid "All Quotations"
msgstr "Semua Penawaran"
#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Invoice On Order After Delivery"
-msgstr "Faktur Pada Order Setelah Pengiriman"
+#: view:sale.config.picking_policy:0
+msgid "Options"
+msgstr ""
#. module: sale
#: selection:sale.report,month:0
@@ -713,6 +799,20 @@ msgid "September"
msgstr "September"
#. module: sale
+#: code:addons/sale/sale.py:632
+#, python-format
+msgid "You cannot confirm a sale order which has no line."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:1246
+#, python-format
+msgid ""
+"You have to select a pricelist or a customer in the sales form !\n"
+"Please set one before choosing a product."
+msgstr ""
+
+#. module: sale
#: view:sale.report:0
#: field:sale.report,categ_id:0
msgid "Category of Product"
@@ -729,11 +829,6 @@ msgid "Stock Moves"
msgstr "Stok Bergerak"
#. module: sale
-#: view:sale.report:0
-msgid " Year "
-msgstr " Tahun "
-
-#. module: sale
#: field:sale.order,state:0
#: field:sale.report,state:0
msgid "Order State"
@@ -751,7 +846,7 @@ msgid "Sales By Month"
msgstr "Penjualan berdasarkan Bulan"
#. module: sale
-#: code:addons/sale/sale.py:970
+#: code:addons/sale/sale.py:1065
#, python-format
msgid "Could not cancel sales order line!"
msgstr "Daftar penjualan tidak dapat di batalkan !"
@@ -786,64 +881,19 @@ msgstr ""
"update hanya setelah penjadwalan telah di jalankan"
#. module: sale
+#: field:sale.order,date_order:0
+msgid "Date"
+msgstr ""
+
+#. module: sale
#: view:sale.report:0
msgid "Extended Filters..."
msgstr "Filter Tambahan"
#. module: sale
-#: model:ir.module.module,description:sale.module_meta_information
-msgid ""
-"\n"
-" The base module to manage quotations and sales orders.\n"
-"\n"
-" * Workflow with validation steps:\n"
-" - Quotation -> Sales order -> Invoice\n"
-" * Invoicing methods:\n"
-" - Invoice on order (before or after shipping)\n"
-" - Invoice on delivery\n"
-" - Invoice on timesheets\n"
-" - Advance invoice\n"
-" * Partners preferences (shipping, invoicing, incoterm, ...)\n"
-" * Products stocks and prices\n"
-" * Delivery methods:\n"
-" - all at once, multi-parcel\n"
-" - delivery costs\n"
-" * Dashboard for salesman that includes:\n"
-" * Your open quotations\n"
-" * Top 10 sales of the month\n"
-" * Cases statistics\n"
-" * Graph of sales by product\n"
-" * Graph of cases of the month\n"
-" "
-msgstr ""
-"\n"
-" Modul dasar untuk mengelola quotation dan sales order .\n"
-"\n"
-" * Alur Kerja dengan langkah-langkah validasi:\n"
-" - Quotation -> Sales order -> invoice\n"
-" * Metoda Invoicing :\n"
-" - invoice pada pesanan (sebelum atau sesudah pengiriman)\n"
-" - invoice pengiriman yang\n"
-" - invoice pada timesheets\n"
-" - invoice Advance\n"
-" * preferensi Mitra (pengiriman, invoicing, INCOTERM, ...)\n"
-" * Produk dan harga stok\n"
-" * Pengiriman :\n"
-" - semua sekaligus, multi-paket\n"
-" - Biaya pengiriman\n"
-" * Dashboard untuk salesman yang meliputi:\n"
-" * quotation terbuka Anda\n"
-" * Top 10 bulan ini\n"
-" * Kasus statistik\n"
-" * Grafik penjualan per produk\n"
-" * Grafik kasus bulan ini.\n"
-" "
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_shop
-#: view:sale.shop:0
-msgid "Sales Shop"
-msgstr "Toko Penjualan"
+#: selection:sale.order.line,state:0
+msgid "Exception"
+msgstr "Pengecualian"
#. module: sale
#: model:ir.model,name:sale.model_res_company
@@ -851,9 +901,10 @@ msgid "Companies"
msgstr "Perusahaan"
#. module: sale
-#: selection:sale.report,month:0
-msgid "November"
-msgstr "November"
+#: code:addons/sale/sale.py:1259
+#, python-format
+msgid "No valid pricelist line found ! :"
+msgstr ""
#. module: sale
#: view:sale.order:0
@@ -861,9 +912,9 @@ msgid "History"
msgstr "Riwayat"
#. module: sale
-#: field:sale.config.picking_policy,picking_policy:0
-msgid "Picking Default Policy"
-msgstr "Kebijakan dasar penjemputan"
+#: selection:sale.order,order_policy:0
+msgid "Invoice on order after delivery"
+msgstr ""
#. module: sale
#: help:sale.order,invoice_ids:0
@@ -887,14 +938,14 @@ msgid ""
msgstr "Nama dan alamat kontak yang meminta order atau penawaran"
#. module: sale
-#: code:addons/sale/sale.py:966
-#, python-format
-msgid "You cannot cancel a sales order line that has already been invoiced !"
+#: help:res.company,security_lead:0
+msgid ""
+"This is the days added to what you promise to customers for security purpose"
msgstr ""
-"Anda tidak dapan membatalkan daftar penjualan yang telah difakturkan !"
+"Dimana anda menjanjikan kepada pelanggan masalah penambahan hari untuk "
+"keperluan keamanan"
#. module: sale
-#: view:sale.order:0
#: view:sale.order.line:0
msgid "Qty"
msgstr "Qty"
@@ -905,6 +956,11 @@ msgid "References"
msgstr "Referensiya"
#. module: sale
+#: view:sale.order.line:0
+msgid "My Sales Order Lines"
+msgstr ""
+
+#. module: sale
#: model:process.transition.action,name:sale.process_transition_action_cancel0
#: model:process.transition.action,name:sale.process_transition_action_cancel1
#: model:process.transition.action,name:sale.process_transition_action_cancel2
@@ -916,14 +972,9 @@ msgid "Cancel"
msgstr "Batal"
#. module: sale
-#: field:sale.installer,sale_order_dates:0
-msgid "Sales Order Dates"
-msgstr "Tanggal Order Penjualan"
-
-#. module: sale
-#: selection:sale.order.line,state:0
-msgid "Exception"
-msgstr "Pengecualian"
+#: sql_constraint:sale.order:0
+msgid "Order Reference must be unique per Company!"
+msgstr ""
#. module: sale
#: model:process.transition,name:sale.process_transition_invoice0
@@ -935,19 +986,19 @@ msgid "Create Invoice"
msgstr "Buat Faktur"
#. module: sale
-#: field:sale.installer,sale_margin:0
-msgid "Margins in Sales Orders"
-msgstr "Margin Pesanan Penjualan"
-
-#. module: sale
#: view:sale.order:0
msgid "Total Tax Excluded"
msgstr "Jumlah total diluar pajak"
#. module: sale
-#: view:sale.order:0
-msgid "Compute"
-msgstr "Hitung"
+#: view:sale.order.line:0
+msgid "Order reference"
+msgstr ""
+
+#. module: sale
+#: view:sale.open.invoice:0
+msgid "You invoice has been successfully created!"
+msgstr "Faktur Anda telah berhasil dibuat !"
#. module: sale
#: view:sale.report:0
@@ -966,23 +1017,20 @@ msgid "Open Invoice"
msgstr "Buka Faktur"
#. module: sale
-#: report:sale.order:0
-#: view:sale.order.line:0
-msgid "Price"
-msgstr "Harga"
+#: model:ir.actions.server,name:sale.ir_actions_server_edi_sale
+msgid "Auto-email confirmed sale orders"
+msgstr ""
#. module: sale
-#: model:ir.actions.act_window,name:sale.action_sale_installer
-#: view:sale.config.picking_policy:0
-#: view:sale.installer:0
-msgid "Sales Application Configuration"
-msgstr "Konfugurasi aplikasi penjualan"
+#: code:addons/sale/sale.py:413
+#, python-format
+msgid "There is no sales journal defined for this company: \"%s\" (id:%d)"
+msgstr "Tidak ditemukan jurnal penjualan untuk perusahaan :\"%s\" (id:%d)"
#. module: sale
-#: view:sale.report:0
-#: field:sale.report,price_total:0
-msgid "Total Price"
-msgstr "Total Harga"
+#: model:process.transition.action,name:sale.process_transition_action_forceassignation0
+msgid "Force Assignation"
+msgstr "Penetapan Tugas"
#. module: sale
#: selection:sale.order.line,type:0
@@ -995,6 +1043,11 @@ msgid "Based on the shipped or on the ordered quantities."
msgstr "Berdasarkan pengiriman atau dalam jumlah pemesanan"
#. module: sale
+#: selection:sale.order,picking_policy:0
+msgid "Deliver all products at once"
+msgstr ""
+
+#. module: sale
#: field:sale.order,picking_ids:0
msgid "Related Picking"
msgstr "Penjemputan terkait"
@@ -1026,9 +1079,15 @@ msgid "Create Delivery Order"
msgstr "Buat pesanan pengiriman"
#. module: sale
-#: field:sale.installer,delivery:0
-msgid "Delivery Costs"
-msgstr "Biaya Pengiriman"
+#: code:addons/sale/sale.py:1290
+#, python-format
+msgid "Cannot delete a sales order line which is in state '%s'!"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Qty(UoS)"
+msgstr ""
#. module: sale
#: view:sale.order:0
@@ -1042,13 +1101,13 @@ msgstr "Buat daftar penjemputan"
#. module: sale
#: view:sale.report:0
-msgid "Sales by Product Category"
-msgstr "Penjualan berdasarkan Produk Kategori"
+msgid "Ordered date of the sales order"
+msgstr ""
#. module: sale
-#: selection:sale.order,picking_policy:0
-msgid "Partial Delivery"
-msgstr "Pengiriman Sebagian"
+#: view:sale.report:0
+msgid "Sales by Product Category"
+msgstr "Penjualan berdasarkan Produk Kategori"
#. module: sale
#: model:process.transition,name:sale.process_transition_confirmquotation0
@@ -1056,10 +1115,10 @@ msgid "Confirm Quotation"
msgstr "Konfirmasi Penawaran"
#. module: sale
-#: help:sale.order,origin:0
-msgid "Reference of the document that generated this sales order request."
-msgstr ""
-"Referensi dokumen yang dihasilkan dari permintaan pesanan penjualan."
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:63
+#, python-format
+msgid "Error"
+msgstr "Kesalahan"
#. module: sale
#: view:sale.order:0
@@ -1091,20 +1150,14 @@ msgid "Procurement Method"
msgstr "Metode Pengadaan"
#. module: sale
-#: view:sale.config.picking_policy:0
-#: view:sale.installer:0
-msgid "title"
-msgstr "Judul:"
-
-#. module: sale
#: model:process.node,name:sale.process_node_packinglist0
msgid "Pick List"
msgstr "Daftar Jemput"
#. module: sale
#: view:sale.order:0
-msgid "Order date"
-msgstr "Tanggal order"
+msgid "Set to Draft"
+msgstr "Atur ke draft"
#. module: sale
#: model:process.node,note:sale.process_node_packinglist0
@@ -1112,6 +1165,85 @@ msgid "Document of the move to the output or to the customer."
msgstr "Dokumen pindah ke output atau kepada pelanggan"
#. module: sale
+#: model:email.template,body_text:sale.email_template_edi_sale
+msgid ""
+"\n"
+"Hello${object.partner_order_id.name and ' ' or "
+"''}${object.partner_order_id.name or ''},\n"
+"\n"
+"Here is your order confirmation for ${object.partner_id.name}:\n"
+" | Order number: *${object.name}*\n"
+" | Order total: *${object.amount_total} "
+"${object.pricelist_id.currency_id.name}*\n"
+" | Order date: ${object.date_order}\n"
+" % if object.origin:\n"
+" | Order reference: ${object.origin}\n"
+" % endif\n"
+" % if object.client_order_ref:\n"
+" | Your reference: ${object.client_order_ref}<br />\n"
+" % endif\n"
+" | Your contact: ${object.user_id.name} ${object.user_id.user_email "
+"and '<%s>'%(object.user_id.user_email) or ''}\n"
+"\n"
+"You can view the order confirmation, download it and even pay online using "
+"the following link:\n"
+" ${ctx.get('edi_web_url_view') or 'n/a'}\n"
+"\n"
+"% if object.order_policy in ('prepaid','manual') and "
+"object.company_id.paypal_account:\n"
+"<% \n"
+"comp_name = quote(object.company_id.name)\n"
+"order_name = quote(object.name)\n"
+"paypal_account = quote(object.company_id.paypal_account)\n"
+"order_amount = quote(str(object.amount_total))\n"
+"cur_name = quote(object.pricelist_id.currency_id.name)\n"
+"paypal_url = \"https://www.paypal.com/cgi-"
+"bin/webscr?cmd=_xclick&business=%s&item_name=%s%%20Order%%20%s&invoice=%s&amo"
+"unt=%s\" \\\n"
+" "
+"\"&currency_code=%s&button_subtype=services&no_note=1&bn=OpenERP_Order_PayNow"
+"_%s\" % \\\n"
+" "
+"(paypal_account,comp_name,order_name,order_name,order_amount,cur_name,cur_nam"
+"e)\n"
+"%>\n"
+"It is also possible to directly pay with Paypal:\n"
+" ${paypal_url}\n"
+"% endif\n"
+"\n"
+"If you have any question, do not hesitate to contact us.\n"
+"\n"
+"\n"
+"Thank you for choosing ${object.company_id.name}!\n"
+"\n"
+"\n"
+"--\n"
+"${object.user_id.name} ${object.user_id.user_email and "
+"'<%s>'%(object.user_id.user_email) or ''}\n"
+"${object.company_id.name}\n"
+"% if object.company_id.street:\n"
+"${object.company_id.street or ''}\n"
+"% endif\n"
+"% if object.company_id.street2:\n"
+"${object.company_id.street2}\n"
+"% endif\n"
+"% if object.company_id.city or object.company_id.zip:\n"
+"${object.company_id.zip or ''} ${object.company_id.city or ''}\n"
+"% endif\n"
+"% if object.company_id.country_id:\n"
+"${object.company_id.state_id and ('%s, ' % object.company_id.state_id.name) "
+"or ''} ${object.company_id.country_id.name or ''}\n"
+"% endif\n"
+"% if object.company_id.phone:\n"
+"Phone: ${object.company_id.phone}\n"
+"% endif\n"
+"% if object.company_id.website:\n"
+"${object.company_id.website or ''}\n"
+"% endif\n"
+" "
+msgstr ""
+
+#. module: sale
#: model:process.transition.action,name:sale.process_transition_action_validate0
msgid "Validate"
msgstr "Validasi"
@@ -1134,9 +1266,9 @@ msgid "Taxes"
msgstr "Pajak"
#. module: sale
-#: field:sale.order,order_policy:0
-msgid "Shipping Policy"
-msgstr "Kebijakan dalam pengiriman"
+#: view:sale.order:0
+msgid "Sales Order ready to be invoiced"
+msgstr ""
#. module: sale
#: help:sale.order,create_date:0
@@ -1155,9 +1287,9 @@ msgid "Create Invoices"
msgstr "Buat Faktur"
#. module: sale
-#: view:sale.order:0
-msgid "Extra Info"
-msgstr "Penjelasan lebih lanjut"
+#: view:sale.report:0
+msgid "Sales order created in current month"
+msgstr ""
#. module: sale
#: report:sale.order:0
@@ -1165,11 +1297,24 @@ msgid "Fax :"
msgstr "Fax :"
#. module: sale
+#: help:sale.order.line,type:0
+msgid ""
+"If 'on order', it triggers a procurement when the sale order is confirmed to "
+"create a task, purchase order or manufacturing order linked to this sale "
+"order line."
+msgstr ""
+
+#. module: sale
#: field:sale.advance.payment.inv,amount:0
msgid "Advance Amount"
msgstr "Kenaikan jumlah"
#. module: sale
+#: field:sale.config.picking_policy,charge_delivery:0
+msgid "Do you charge the delivery?"
+msgstr ""
+
+#. module: sale
#: selection:sale.order,invoice_quantity:0
msgid "Shipped Quantities"
msgstr "Kwantitas Terkirim"
@@ -1180,25 +1325,45 @@ msgid "Invoice Based on Sales Orders"
msgstr "Tagihan/Invoice berdasakan pada Order Penjualan"
#. module: sale
+#: code:addons/sale/sale.py:331
+#, python-format
+msgid ""
+"If you change the pricelist of this order (and eventually the currency), "
+"prices of existing order lines will not be updated."
+msgstr ""
+
+#. module: sale
#: model:ir.model,name:sale.model_stock_picking
msgid "Picking List"
msgstr "Daftar Jemput"
#. module: sale
-#: code:addons/sale/sale.py:387
-#: code:addons/sale/sale.py:920
-#: code:addons/sale/sale.py:938
+#: code:addons/sale/sale.py:412
+#: code:addons/sale/sale.py:503
+#: code:addons/sale/sale.py:632
+#: code:addons/sale/sale.py:1015
+#: code:addons/sale/sale.py:1033
#, python-format
msgid "Error !"
msgstr "Ada Kesalahan !!!"
#. module: sale
-#: code:addons/sale/sale.py:570
+#: code:addons/sale/sale.py:603
#, python-format
msgid "Could not cancel sales order !"
msgstr "Order Penjualan tidak dapat di batalkan !"
#. module: sale
+#: view:sale.order:0
+msgid "Qty(UoM)"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered Year of the sales order"
+msgstr ""
+
+#. module: sale
#: selection:sale.report,month:0
msgid "July"
msgstr "Juli"
@@ -1215,36 +1380,26 @@ msgid "Shipping Exception"
msgstr "Pengecualian dalam pengiriman"
#. module: sale
-#: field:sale.make.invoice,grouped:0
-msgid "Group the invoices"
-msgstr "Mengelompokan Faktur"
-
-#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Shipping & Manual Invoice"
-msgstr "Pengiriman & Faktur manual"
-
-#. module: sale
-#: code:addons/sale/sale.py:1051
+#: code:addons/sale/sale.py:1143
#, python-format
-msgid "Picking Information !"
-msgstr "Informasi penjemputan !"
+msgid "Picking Information ! : "
+msgstr ""
#. module: sale
-#: view:sale.report:0
-#: field:sale.report,month:0
-msgid "Month"
-msgstr "Bulan"
+#: field:sale.make.invoice,grouped:0
+msgid "Group the invoices"
+msgstr "Mengelompokan Faktur"
#. module: sale
-#: model:ir.module.module,shortdesc:sale.module_meta_information
-msgid "Sales Management"
-msgstr "Manajemen Penjualan"
+#: field:sale.order,order_policy:0
+msgid "Invoice Policy"
+msgstr ""
#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Invoice From The Picking"
-msgstr "Faktur pengiriman"
+#: model:ir.actions.act_window,name:sale.action_config_picking_policy
+#: view:sale.config.picking_policy:0
+msgid "Setup your Invoicing Method"
+msgstr ""
#. module: sale
#: model:process.node,note:sale.process_node_invoice0
@@ -1253,32 +1408,31 @@ msgstr "Untuk di review oleh akuntan"
#. module: sale
#: view:sale.report:0
-#: field:sale.report,uom_name:0
msgid "Reference UoM"
msgstr "Referensi UoM"
#. module: sale
+#: view:sale.config.picking_policy:0
+msgid ""
+"This tool will help you to install the right module and configure the system "
+"according to the method you use to invoice your customers."
+msgstr ""
+
+#. module: sale
#: model:ir.model,name:sale.model_sale_order_line_make_invoice
msgid "Sale OrderLine Make_invoice"
msgstr "Penjualan Orderline Buat_invoice"
#. module: sale
-#: help:sale.config.picking_policy,step:0
-msgid ""
-"By default, OpenERP is able to manage complex routing and paths of products "
-"in your warehouse and partner locations. This will configure the most common "
-"and simple methods to deliver products to the customer in one or two "
-"operations by the worker."
-msgstr ""
-"Secara default, OpenERP mampu mengelola jalur routing yang kompleks dan "
-"produk di gudang anda dan lokasi mitra. Ini akan mengkonfigurasi metode "
-"yang paling umum dan sederhana untuk memberikan produk kepada pelanggan "
-"dalam operasi salah satu atau dua oleh pekerja."
+#: selection:sale.order,state:0
+#: selection:sale.report,state:0
+msgid "Invoice Exception"
+msgstr "Faktur pengecualian"
#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_tree
-msgid "Old Quotations"
-msgstr "Quotations Lama"
+#: model:process.node,note:sale.process_node_saleorder0
+msgid "Drives procurement and invoicing"
+msgstr "mendrive pengadaan dan faktur"
#. module: sale
#: field:sale.order,invoiced:0
@@ -1293,6 +1447,22 @@ msgid "Sales Analysis"
msgstr "Analisa Penjualan"
#. module: sale
+#: code:addons/sale/sale.py:1138
+#, python-format
+msgid ""
+"You selected a quantity of %d Units.\n"
+"But it's not compatible with the selected packaging.\n"
+"Here is a proposition of quantities according to the packaging:\n"
+"EAN: %s Quantity: %s Type of ul: %s"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Recreate Packing"
+msgstr "Pengemasan ulang"
+
+#. module: sale
+#: view:sale.order:0
#: field:sale.order.line,property_ids:0
msgid "Properties"
msgstr "Properti"
@@ -1325,7 +1495,17 @@ msgstr ""
"pengiriman."
#. module: sale
-#: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
+#: view:sale.order.line:0
+msgid "Confirmed sale order lines, not yet delivered"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:473
+#, python-format
+msgid "Customer Invoices"
+msgstr ""
+
+#. module: sale
#: model:process.process,name:sale.process_process_salesprocess0
#: view:sale.order:0
#: view:sale.report:0
@@ -1347,18 +1527,13 @@ msgid "Done"
msgstr "Selesai"
#. module: sale
-#: model:ir.model,name:sale.model_sale_installer
-msgid "sale.installer"
-msgstr "sale.installer"
-
-#. module: sale
#: model:process.node,name:sale.process_node_invoice0
#: model:process.node,name:sale.process_node_invoiceafterdelivery0
msgid "Invoice"
msgstr "Invoice"
#. module: sale
-#: code:addons/sale/sale.py:1014
+#: code:addons/sale/sale.py:1158
#, python-format
msgid ""
"You have to select a customer in the sales form !\n"
@@ -1368,11 +1543,6 @@ msgstr ""
"Silakan set satu pelanggan sebelum memilih produk."
#. module: sale
-#: selection:sale.config.picking_policy,step:0
-msgid "Picking List & Delivery Order"
-msgstr "Daftar jemput dan pengiriman pesanan"
-
-#. module: sale
#: field:sale.order,origin:0
msgid "Source Document"
msgstr "Sumber berkas"
@@ -1398,7 +1568,7 @@ msgid "The amount without tax."
msgstr "Jumlah tanpa pajak"
#. module: sale
-#: code:addons/sale/sale.py:571
+#: code:addons/sale/sale.py:604
#, python-format
msgid "You must first cancel all picking attached to this sales order."
msgstr ""
@@ -1411,9 +1581,15 @@ msgid "Sales Advance Payment Invoice"
msgstr "Pembayaran faktur penjualan"
#. module: sale
-#: field:sale.order,incoterm:0
-msgid "Incoterm"
-msgstr "Incoterm"
+#: view:sale.report:0
+#: field:sale.report,month:0
+msgid "Month"
+msgstr "Bulan"
+
+#. module: sale
+#: model:email.template,subject:sale.email_template_edi_sale
+msgid "${object.company_id.name} Order (Ref ${object.name or 'n/a' })"
+msgstr ""
#. module: sale
#: view:sale.order.line:0
@@ -1424,11 +1600,6 @@ msgid "Product"
msgstr "Produk"
#. module: sale
-#: model:ir.ui.menu,name:sale.menu_invoiced
-msgid "Invoicing"
-msgstr "Faktur"
-
-#. module: sale
#: model:process.transition.action,name:sale.process_transition_action_cancelassignation0
msgid "Cancel Assignation"
msgstr "Pembatalan penugasan"
@@ -1439,21 +1610,11 @@ msgid "sale.config.picking_policy"
msgstr "sale.config.picking_policy"
#. module: sale
-#: help:sale.order,state:0
-msgid ""
-"Gives the state of the quotation or sales order. \n"
-"The exception state is automatically set when a cancel operation occurs in "
-"the invoice validation (Invoice Exception) or in the picking list process "
-"(Shipping Exception). \n"
-"The 'Waiting Schedule' state is set when the invoice is confirmed but "
-"waiting for the scheduler to run on the date 'Ordered Date'."
+#: view:account.invoice.report:0
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_turnover_by_month
+msgid "Monthly Turnover"
msgstr ""
-"Memberikan status quotation atau sales order .\n"
-"Kondisi pengecualian secara otomatis mengatur kapan operasi dibatalkan yang "
-"terjadi pada validasi invoice (invoice Exception) atau dalam proses daftar "
-"memilih (Shipping Exception).\n"
-"Pada Status 'Waiting Schedule' ini mengatur kapan Invoice dikonfirmasi "
-"tetapi menunggu scheduler yang akan dijalankan pada tanggal 'Tanggal Ordered'"
#. module: sale
#: field:sale.order,invoice_quantity:0
@@ -1471,7 +1632,6 @@ msgid "Product UoS"
msgstr "Produk UoS"
#. module: sale
-#: selection:sale.order,state:0
#: selection:sale.report,state:0
msgid "Manual In Progress"
msgstr "Proses Manual sedang berlangsung"
@@ -1492,7 +1652,8 @@ msgid "Order"
msgstr "Pesanan"
#. module: sale
-#: code:addons/sale/sale.py:921
+#: code:addons/sale/sale.py:1016
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:71
#, python-format
msgid "There is no income account defined for this product: \"%s\" (id:%d)"
msgstr ""
@@ -1517,7 +1678,7 @@ msgstr ""
" secepat itu dikonfirmasi oleh penjual"
#. module: sale
-#: code:addons/sale/sale.py:1116
+#: code:addons/sale/sale.py:1238
#, python-format
msgid ""
"You plan to sell %.2f %s but you only have %.2f %s available !\n"
@@ -1549,10 +1710,10 @@ msgid "Total"
msgstr "Total"
#. module: sale
-#: code:addons/sale/sale.py:388
-#, python-format
-msgid "There is no sales journal defined for this company: \"%s\" (id:%d)"
-msgstr "Tidak ditemukan jurnal penjualan untuk perusahaan :\"%s\" (id:%d)"
+#: report:sale.order:0
+#: view:sale.order.line:0
+msgid "Price"
+msgstr "Harga"
#. module: sale
#: model:process.transition,note:sale.process_transition_deliver0
@@ -1566,10 +1727,15 @@ msgstr ""
"otomatis"
#. module: sale
-#: code:addons/sale/sale.py:1165
-#, python-format
-msgid "Cannot delete a sales order line which is %s !"
-msgstr "Tidak dapat menghapus daftar pesanan penjualan yang% s!"
+#: selection:sale.order,order_policy:0
+msgid "Pay before delivery"
+msgstr ""
+
+#. module: sale
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.open_board_sales
+msgid "Sales Dashboard"
+msgstr ""
#. module: sale
#: model:ir.actions.act_window,name:sale.action_sale_order_make_invoice
@@ -1580,6 +1746,7 @@ msgstr "Buat Faktur"
#. module: sale
#: view:sale.order:0
+#: selection:sale.order,state:0
#: view:sale.order.line:0
msgid "To Invoice"
msgstr "Pada Faktur"
@@ -1590,6 +1757,11 @@ msgid "Date on which sales order is confirmed."
msgstr "Tanggal dimana order penjualan di konfirmasi"
#. module: sale
+#: field:sale.order,project_id:0
+msgid "Contract/Analytic Account"
+msgstr ""
+
+#. module: sale
#: field:sale.order,company_id:0
#: field:sale.order.line,company_id:0
#: view:sale.report:0
@@ -1609,10 +1781,12 @@ msgid "The amount to be invoiced in advance."
msgstr "Jumlah harga yang di fakturkan"
#. module: sale
-#: selection:sale.order,state:0
-#: selection:sale.report,state:0
-msgid "Invoice Exception"
-msgstr "Faktur pengecualian"
+#: code:addons/sale/sale.py:1256
+#, python-format
+msgid ""
+"Couldn't find a pricelist line matching this product and quantity.\n"
+"You have to change either the product, the quantity or the pricelist."
+msgstr ""
#. module: sale
#: help:sale.order,picking_ids:0
@@ -1622,15 +1796,6 @@ msgstr ""
"Ini adalah daftar pengambilan yang di hasilkan untuk order penjualan saat ini"
#. module: sale
-#: help:sale.installer,sale_margin:0
-msgid ""
-"Gives the margin of profitability by calculating the difference between Unit "
-"Price and Cost Price."
-msgstr ""
-"Memberikan margin keuntungan berdasaran perhitungan dari perbedaan antara "
-"harga unit dengan ongkos produksi"
-
-#. module: sale
#: view:sale.make.invoice:0
#: view:sale.order.line.make.invoice:0
msgid "Create invoices"
@@ -1649,6 +1814,11 @@ msgid "Cancelled"
msgstr "Dibatalkan"
#. module: sale
+#: view:sale.order.line:0
+msgid "Sales Order Lines related to a Sales Order of mine"
+msgstr ""
+
+#. module: sale
#: model:ir.actions.act_window,name:sale.action_shop_form
#: model:ir.ui.menu,name:sale.menu_action_shop_form
#: field:sale.order,shop_id:0
@@ -1658,17 +1828,12 @@ msgid "Shop"
msgstr "Toko"
#. module: sale
-#: view:sale.report:0
-msgid " Month "
-msgstr " Bulan "
-
-#. module: sale
#: field:sale.report,date_confirm:0
msgid "Date Confirm"
msgstr "Tanggal konfirmasi"
#. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:111
+#: code:addons/sale/wizard/sale_line_invoice.py:113
#, python-format
msgid "Warning"
msgstr "Peringatan"
@@ -1680,22 +1845,6 @@ msgid "Sales by Month"
msgstr "Penjualan berdasarkan penjualan"
#. module: sale
-#: code:addons/sale/sale.py:1045
-#, python-format
-msgid ""
-"You selected a quantity of %d Units.\n"
-"But it's not compatible with the selected packaging.\n"
-"Here is a proposition of quantities according to the packaging:\n"
-"\n"
-"EAN: %s Quantity: %s Type of ul: %s"
-msgstr ""
-"Anda memilih kuantitas %d Units.\n"
-"Tetapi tidak sesuai dengan kemasan\n"
-"Ini adalah proporsi dari kuantitas berdasarkan kemasan:\n"
-"\n"
-"EAN: %s Quantity: %s Type of ul: %s"
-
-#. module: sale
#: model:ir.model,name:sale.model_sale_order
#: model:process.node,name:sale.process_node_order0
#: model:process.node,name:sale.process_node_saleorder0
@@ -1711,6 +1860,11 @@ msgid "Quantity (UoS)"
msgstr "Kwantitas (UoS)"
#. module: sale
+#: view:sale.order.line:0
+msgid "Sale Order Lines that are in 'done' state"
+msgstr ""
+
+#. module: sale
#: model:process.transition,note:sale.process_transition_packing0
msgid ""
"The Pick List form is created as soon as the sales order is confirmed, in "
@@ -1729,6 +1883,11 @@ msgid "Confirmed"
msgstr "Dikonfirmasi"
#. module: sale
+#: field:sale.config.picking_policy,order_policy:0
+msgid "Main Method Based On"
+msgstr ""
+
+#. module: sale
#: model:process.transition.action,name:sale.process_transition_action_confirm0
msgid "Confirm"
msgstr "Konfirmasi"
@@ -1751,6 +1910,7 @@ msgid "Invoice Lines"
msgstr "Detail Invoice"
#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_product_tree
#: view:sale.order:0
#: view:sale.order.line:0
msgid "Sales Order Lines"
@@ -1767,33 +1927,18 @@ msgid "Configuration"
msgstr "Pengaturan"
#. module: sale
-#: selection:sale.order,picking_policy:0
-msgid "Complete Delivery"
-msgstr "Pengiriman Selesai"
+#: code:addons/sale/edi/sale_order.py:146
+#, python-format
+msgid "EDI Pricelist (%s)"
+msgstr ""
#. module: sale
#: view:sale.report:0
-msgid " Month-1 "
-msgstr " Bulan - 1 "
-
-#. module: sale
-#: help:sale.config.picking_policy,picking_policy:0
-msgid ""
-"The Shipping Policy is used to configure per order if you want to deliver as "
-"soon as possible when one product is available or you wait that all products "
-"are available.."
+msgid "Sales order created in current year"
msgstr ""
-"Kebijakan Pengiriman yang digunakan untuk mengkonfigurasi per pesanan jika "
-"anda ingin menyampaikan sesegera mungkin ketika satu produk yang tersedia "
-"atau Anda menunggu bahwa semua produk yang tersedia"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "August"
-msgstr "Agustus"
#. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:111
+#: code:addons/sale/wizard/sale_line_invoice.py:113
#, python-format
msgid ""
"Invoice cannot be created for this Sales Order Line due to one of the "
@@ -1808,6 +1953,11 @@ msgstr ""
"2.Aktifitas Line Order Penjualan Faktur!"
#. module: sale
+#: view:sale.order.line:0
+msgid "Sale order lines done"
+msgstr ""
+
+#. module: sale
#: field:sale.order.line,th_weight:0
msgid "Weight"
msgstr "Berat"
@@ -1826,7 +1976,6 @@ msgstr "Desember"
#. module: sale
#: field:sale.config.picking_policy,config_logo:0
-#: field:sale.installer,config_logo:0
msgid "Image"
msgstr "Gambar"
@@ -1859,9 +2008,9 @@ msgid "Salesman"
msgstr "Sales"
#. module: sale
-#: model:process.node,note:sale.process_node_saleorder0
-msgid "Drives procurement and invoicing"
-msgstr "mendrive pengadaan dan faktur"
+#: model:ir.actions.act_window,name:sale.action_order_tree
+msgid "Old Quotations"
+msgstr "Quotations Lama"
#. module: sale
#: field:sale.order,amount_untaxed:0
@@ -1869,7 +2018,7 @@ msgid "Untaxed Amount"
msgstr "Jumlah sebelum kena pajak"
#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:163
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:170
#: model:ir.actions.act_window,name:sale.action_view_sale_advance_payment_inv
#: view:sale.advance.payment.inv:0
#: view:sale.order:0
@@ -1878,7 +2027,7 @@ msgid "Advance Invoice"
msgstr "Faktur"
#. module: sale
-#: code:addons/sale/sale.py:591
+#: code:addons/sale/sale.py:624
#, python-format
msgid "The sales order '%s' has been cancelled."
msgstr "Order penjualan '%s' telah dibatalkan"
@@ -1923,20 +2072,20 @@ msgid "Packings"
msgstr "kemasan"
#. module: sale
-#: field:sale.config.picking_policy,progress:0
-#: field:sale.installer,progress:0
-msgid "Configuration Progress"
-msgstr "Konfigurasi yang sedang berlangsung"
+#: view:sale.order.line:0
+msgid "Sale Order Lines ready to be invoiced"
+msgstr ""
#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_product_tree
-msgid "Product sales"
-msgstr "Produk penjualan"
+#: view:sale.report:0
+msgid "Sales order created in last month"
+msgstr ""
#. module: sale
-#: field:sale.order,date_order:0
-msgid "Ordered Date"
-msgstr "Tanggal pemesanan"
+#: model:ir.actions.act_window,name:sale.action_email_templates
+#: model:ir.ui.menu,name:sale.menu_email_templates
+msgid "Email Templates"
+msgstr ""
#. module: sale
#: model:ir.actions.act_window,name:sale.action_order_form
@@ -1946,14 +2095,15 @@ msgid "Sales Orders"
msgstr "Order Penjualan"
#. module: sale
-#: selection:sale.config.picking_policy,picking_policy:0
-msgid "Direct Delivery"
-msgstr "Pengiriman Langsung"
+#: model:ir.model,name:sale.model_sale_shop
+#: view:sale.shop:0
+msgid "Sales Shop"
+msgstr "Toko Penjualan"
#. module: sale
-#: field:sale.installer,sale_journal:0
-msgid "Invoicing journals"
-msgstr "Faktur Jurnal"
+#: selection:sale.report,month:0
+msgid "November"
+msgstr "November"
#. module: sale
#: field:sale.advance.payment.inv,product_id:0
@@ -1961,18 +2111,12 @@ msgid "Advance Product"
msgstr "Produk advance"
#. module: sale
-#: view:sale.report:0
-#: field:sale.report,shipped_qty_1:0
-msgid "Shipped Qty"
-msgstr "Kuantitas yang dikirim"
-
-#. module: sale
-#: view:sale.open.invoice:0
-msgid "You invoice has been successfully created!"
-msgstr "Faktur Anda telah berhasil dibuat !"
+#: view:sale.order:0
+msgid "Compute"
+msgstr "Hitung"
#. module: sale
-#: code:addons/sale/sale.py:585
+#: code:addons/sale/sale.py:618
#, python-format
msgid "You must first cancel all invoices attached to this sales order."
msgstr ""
@@ -1985,25 +2129,15 @@ msgid "January"
msgstr "Januari"
#. module: sale
-#: view:sale.installer:0
-msgid "Configure Your Sales Management Application"
-msgstr "Konfigurasi Aplikasi Penjualan Manajemen Anda"
-
-#. module: sale
#: model:ir.actions.act_window,name:sale.action_order_tree4
msgid "Sales Order in Progress"
msgstr "Order Penjualan dalam Penyelesaian"
#. module: sale
-#: field:sale.installer,sale_layout:0
-msgid "Sales Order Layout Improvement"
-msgstr "Order Penjualan Layout Peningkatan"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:63
-#, python-format
-msgid "Error"
-msgstr "Kesalahan"
+#: help:sale.order,origin:0
+msgid "Reference of the document that generated this sales order request."
+msgstr ""
+"Referensi dokumen yang dihasilkan dari permintaan pesanan penjualan."
#. module: sale
#: view:sale.report:0
@@ -2012,6 +2146,11 @@ msgid "Commitment Delay"
msgstr "Kesepakatan yang ditunda"
#. module: sale
+#: selection:sale.order,order_policy:0
+msgid "Deliver & invoice on demand"
+msgstr ""
+
+#. module: sale
#: model:process.node,note:sale.process_node_saleprocurement0
msgid ""
"One Procurement order for each sales order line and for each of the "
@@ -2036,13 +2175,12 @@ msgid "Confirmed sales order to invoice."
msgstr "Sales order untuk invoice dikonfirmasi."
#. module: sale
-#: code:addons/sale/sale.py:290
-#, python-format
-msgid "Cannot delete Sales Order(s) which are already confirmed !"
-msgstr "Tidak dapat menghapus Order Penjualan yang sudah dikonfirmasi!"
+#: view:sale.order:0
+msgid "Sales Order that haven't yet been confirmed"
+msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:316
+#: code:addons/sale/sale.py:322
#, python-format
msgid "The sales order '%s' has been set in draft state."
msgstr "'%s ' sales order telah diatur di bagian draf"
@@ -2053,37 +2191,27 @@ msgid "from stock"
msgstr "dari stok"
#. module: sale
-#: field:sale.config.picking_policy,order_policy:0
-msgid "Shipping Default Policy"
-msgstr "Kebijakan Dasar Pengiriman"
-
-#. module: sale
#: view:sale.open.invoice:0
msgid "Close"
msgstr "Selesai"
#. module: sale
+#: code:addons/sale/sale.py:1248
+#, python-format
+msgid "No Pricelist ! : "
+msgstr ""
+
+#. module: sale
#: field:sale.order,shipped:0
msgid "Delivered"
msgstr "Sudah Terkirim"
#. module: sale
-#: code:addons/sale/sale.py:1115
-#, python-format
-msgid "Not enough stock !"
-msgstr "Stok tidak mencukupi"
-
-#. module: sale
#: constraint:stock.move:0
msgid "You must assign a production lot for this product"
msgstr "Anda harus menetapkan lot produksi untuk produk ini"
#. module: sale
-#: field:sale.order.line,sequence:0
-msgid "Layout Sequence"
-msgstr "Urutan rancangan"
-
-#. module: sale
#: model:ir.actions.act_window,help:sale.action_shop_form
msgid ""
"If you have more than one shop reselling your company products, you can "
@@ -2115,12 +2243,6 @@ msgid "May"
msgstr "Mei"
#. module: sale
-#: help:sale.installer,sale_order_dates:0
-msgid "Adds commitment, requested and effective dates on Sales Orders."
-msgstr ""
-"Menambahkan komitmen, tanggal diminta dan efektif pada Permintaan Penjualan."
-
-#. module: sale
#: view:sale.order:0
#: field:sale.order,partner_id:0
#: field:sale.order.line,order_partner_id:0
@@ -2128,25 +2250,11 @@ msgid "Customer"
msgstr "Customer"
#. module: sale
-#: model:product.template,name:sale.advance_product_0_product_template
-msgid "Advance"
-msgstr "Advance"
-
-#. module: sale
#: selection:sale.report,month:0
msgid "February"
msgstr "Februari"
#. module: sale
-#: help:sale.installer,sale_journal:0
-msgid ""
-"Allows you to group and invoice your delivery orders according to different "
-"invoicing types: daily, weekly, etc."
-msgstr ""
-"Memungkinkan Anda untuk mengelompokan dan membuat faktur pengiriman pesanan "
-" Anda sesuai dengan jenis faktur yang berbeda: harian, mingguan, dll"
-
-#. module: sale
#: selection:sale.report,month:0
msgid "April"
msgstr "April"
@@ -2157,11 +2265,6 @@ msgid "Accounting"
msgstr "Akunting"
#. module: sale
-#: field:sale.config.picking_policy,step:0
-msgid "Steps To Deliver a Sales Order"
-msgstr "Langkah-langkah untuk pengiriman sales order."
-
-#. module: sale
#: view:sale.order:0
#: view:sale.order.line:0
msgid "Search Sales Order"
@@ -2173,20 +2276,18 @@ msgid "Sales Order Requisition"
msgstr "Permintaan Order Penjualan"
#. module: sale
+#: code:addons/sale/sale.py:1242
+#, python-format
+msgid "Not enough stock ! : "
+msgstr ""
+
+#. module: sale
#: report:sale.order:0
#: field:sale.order,payment_term:0
msgid "Payment Term"
msgstr "Termin Pembayaran"
#. module: sale
-#: help:sale.installer,sale_layout:0
-msgid ""
-"Provides some features to improve the layout of the Sales Order reports."
-msgstr ""
-"Menyediakan beberapa fitur untuk meningkatkan tata letak laporan Sales "
-"Order."
-
-#. module: sale
#: model:ir.actions.act_window,help:sale.action_order_report_all
msgid ""
"This report performs analysis on your quotations and sales orders. Analysis "
@@ -2230,6 +2331,9 @@ msgstr "Invoice berdasarkan pengiriman"
#~ msgid "You invoice has been successfully created !"
#~ msgstr "Invoice berhasil dibuat"
+#~ msgid "Partial Delivery"
+#~ msgstr "Pengiriman Sebagian"
+
#~ msgid "Delivery, from the warehouse to the customer."
#~ msgstr "Pengiriman, dari gudang ke pelanggan"
@@ -2256,6 +2360,9 @@ msgstr "Invoice berdasarkan pengiriman"
#~ msgid "Origin"
#~ msgstr "Asal"
+#~ msgid "All at Once"
+#~ msgstr "Sekaligus"
+
#~ msgid "Outgoing Products"
#~ msgstr "Barang Keluar"
@@ -2332,3 +2439,292 @@ msgstr "Invoice berdasarkan pengiriman"
#~ msgid "Draft Invoice"
#~ msgstr "Konsep Invoice"
+
+#~ msgid "Payment Before Delivery"
+#~ msgstr "Pembayaran Sebelum Pengiriman"
+
+#~ msgid "Delivery Order Only"
+#~ msgstr "Hanya Order Pengiriman saja"
+
+#~ msgid "Order Reference must be unique !"
+#~ msgstr "Referensi order harus unik !"
+
+#~ msgid "Enhance your core Sales Application with additional functionalities."
+#~ msgstr ""
+#~ "Meningkatkan Aplikasi Penjualan anda dengan fungsionalitas tambahan."
+
+#~ msgid "Setup your sales workflow and default values."
+#~ msgstr "Set alur proses penjulan dan nilai dasar"
+
+#~ msgid "Invoice On Order After Delivery"
+#~ msgstr "Faktur Pada Order Setelah Pengiriman"
+
+#~ msgid " Year "
+#~ msgstr " Tahun "
+
+#~ msgid "Sales Order Dates"
+#~ msgstr "Tanggal Order Penjualan"
+
+#~ msgid "Picking Default Policy"
+#~ msgstr "Kebijakan dasar penjemputan"
+
+#, python-format
+#~ msgid "You cannot cancel a sales order line that has already been invoiced !"
+#~ msgstr ""
+#~ "Anda tidak dapan membatalkan daftar penjualan yang telah difakturkan !"
+
+#~ msgid "Margins in Sales Orders"
+#~ msgstr "Margin Pesanan Penjualan"
+
+#~ msgid "Sales Application Configuration"
+#~ msgstr "Konfugurasi aplikasi penjualan"
+
+#~ msgid "Delivery Costs"
+#~ msgstr "Biaya Pengiriman"
+
+#~ msgid "Shipping Policy"
+#~ msgstr "Kebijakan dalam pengiriman"
+
+#~ msgid "Invoice From The Picking"
+#~ msgstr "Faktur pengiriman"
+
+#, python-format
+#~ msgid "Picking Information !"
+#~ msgstr "Informasi penjemputan !"
+
+#~ msgid "Shipping & Manual Invoice"
+#~ msgstr "Pengiriman & Faktur manual"
+
+#~ msgid "Sales Management"
+#~ msgstr "Manajemen Penjualan"
+
+#~ msgid ""
+#~ "By default, OpenERP is able to manage complex routing and paths of products "
+#~ "in your warehouse and partner locations. This will configure the most common "
+#~ "and simple methods to deliver products to the customer in one or two "
+#~ "operations by the worker."
+#~ msgstr ""
+#~ "Secara default, OpenERP mampu mengelola jalur routing yang kompleks dan "
+#~ "produk di gudang anda dan lokasi mitra. Ini akan mengkonfigurasi metode "
+#~ "yang paling umum dan sederhana untuk memberikan produk kepada pelanggan "
+#~ "dalam operasi salah satu atau dua oleh pekerja."
+
+#~ msgid "Picking List & Delivery Order"
+#~ msgstr "Daftar jemput dan pengiriman pesanan"
+
+#~ msgid "Invoicing"
+#~ msgstr "Faktur"
+
+#, python-format
+#~ msgid "Cannot delete a sales order line which is %s !"
+#~ msgstr "Tidak dapat menghapus daftar pesanan penjualan yang% s!"
+
+#~ msgid ""
+#~ "Gives the margin of profitability by calculating the difference between Unit "
+#~ "Price and Cost Price."
+#~ msgstr ""
+#~ "Memberikan margin keuntungan berdasaran perhitungan dari perbedaan antara "
+#~ "harga unit dengan ongkos produksi"
+
+#~ msgid " Month "
+#~ msgstr " Bulan "
+
+#, python-format
+#~ msgid ""
+#~ "You selected a quantity of %d Units.\n"
+#~ "But it's not compatible with the selected packaging.\n"
+#~ "Here is a proposition of quantities according to the packaging:\n"
+#~ "\n"
+#~ "EAN: %s Quantity: %s Type of ul: %s"
+#~ msgstr ""
+#~ "Anda memilih kuantitas %d Units.\n"
+#~ "Tetapi tidak sesuai dengan kemasan\n"
+#~ "Ini adalah proporsi dari kuantitas berdasarkan kemasan:\n"
+#~ "\n"
+#~ "EAN: %s Quantity: %s Type of ul: %s"
+
+#~ msgid ""
+#~ "The Shipping Policy is used to configure per order if you want to deliver as "
+#~ "soon as possible when one product is available or you wait that all products "
+#~ "are available.."
+#~ msgstr ""
+#~ "Kebijakan Pengiriman yang digunakan untuk mengkonfigurasi per pesanan jika "
+#~ "anda ingin menyampaikan sesegera mungkin ketika satu produk yang tersedia "
+#~ "atau Anda menunggu bahwa semua produk yang tersedia"
+
+#~ msgid " Month-1 "
+#~ msgstr " Bulan - 1 "
+
+#~ msgid "Complete Delivery"
+#~ msgstr "Pengiriman Selesai"
+
+#~ msgid "Product sales"
+#~ msgstr "Produk penjualan"
+
+#~ msgid "Ordered Date"
+#~ msgstr "Tanggal pemesanan"
+
+#~ msgid "Configuration Progress"
+#~ msgstr "Konfigurasi yang sedang berlangsung"
+
+#~ msgid "Configure Your Sales Management Application"
+#~ msgstr "Konfigurasi Aplikasi Penjualan Manajemen Anda"
+
+#~ msgid "Invoicing journals"
+#~ msgstr "Faktur Jurnal"
+
+#~ msgid "Shipped Qty"
+#~ msgstr "Kuantitas yang dikirim"
+
+#~ msgid "Direct Delivery"
+#~ msgstr "Pengiriman Langsung"
+
+#~ msgid "Sales Order Layout Improvement"
+#~ msgstr "Order Penjualan Layout Peningkatan"
+
+#, python-format
+#~ msgid "Cannot delete Sales Order(s) which are already confirmed !"
+#~ msgstr "Tidak dapat menghapus Order Penjualan yang sudah dikonfirmasi!"
+
+#~ msgid "Shipping Default Policy"
+#~ msgstr "Kebijakan Dasar Pengiriman"
+
+#, python-format
+#~ msgid "Not enough stock !"
+#~ msgstr "Stok tidak mencukupi"
+
+#~ msgid "Layout Sequence"
+#~ msgstr "Urutan rancangan"
+
+#~ msgid "Adds commitment, requested and effective dates on Sales Orders."
+#~ msgstr ""
+#~ "Menambahkan komitmen, tanggal diminta dan efektif pada Permintaan Penjualan."
+
+#~ msgid ""
+#~ "Allows you to group and invoice your delivery orders according to different "
+#~ "invoicing types: daily, weekly, etc."
+#~ msgstr ""
+#~ "Memungkinkan Anda untuk mengelompokan dan membuat faktur pengiriman pesanan "
+#~ " Anda sesuai dengan jenis faktur yang berbeda: harian, mingguan, dll"
+
+#~ msgid "Configure Sales Order Logistics"
+#~ msgstr "Konfigurasi Logistik Sales Order"
+
+#~ msgid "Allows you to compute delivery costs on your quotations."
+#~ msgstr ""
+#~ "Memungkinkan Anda untuk menghitung biaya pengiriman pada quotations Anda."
+
+#~ msgid "Configure Picking Policy for Sales Order"
+#~ msgstr "Konfigurasi Pengambil Kebijakan untuk Sales Order"
+
+#~ msgid "Configure"
+#~ msgstr "Pengaturan"
+
+#~ msgid ""
+#~ "The Shipping Policy is used to synchronise invoice and delivery operations.\n"
+#~ " - The 'Pay Before delivery' choice will first generate the invoice and "
+#~ "then generate the picking order after the payment of this invoice.\n"
+#~ " - The 'Shipping & Manual Invoice' will create the picking order directly "
+#~ "and wait for the user to manually click on the 'Invoice' button to generate "
+#~ "the draft invoice.\n"
+#~ " - The 'Invoice On Order After Delivery' choice will generate the draft "
+#~ "invoice based on sales order after all picking lists have been finished.\n"
+#~ " - The 'Invoice From The Picking' choice is used to create an invoice "
+#~ "during the picking process."
+#~ msgstr ""
+#~ "Kebijakan Pengiriman digunakan untuk menyinkronkan operasi dan pengiriman "
+#~ "invoice.\n"
+#~ "- The 'Pembayaran Sebelum pengiriman' pilihan pertama akan menghasilkan "
+#~ "invoice dan kemudian menghasilkan urutan pengambilan setelah pembayaran "
+#~ "invoice ini.\n"
+#~ "- The 'Pengiriman & Manual invoice' akan menciptakan urutan pengambilan "
+#~ "langsung dan menunggu pengguna untuk secara manual klik tombol 'invoice' "
+#~ "untuk menghasilkan invoice draft.\n"
+#~ "- The 'invoice On Delivery Order Setelah' pilihan akan menghasilkan invoice "
+#~ "draft berdasarkan pesanan sales setelah semua daftar pengambilan telah "
+#~ "selesai.\n"
+#~ "- 'invoice Dari Picking' Pilihan ini digunakan untuk membuat invoice selama "
+#~ "proses pengambilan."
+
+#~ msgid ""
+#~ "\n"
+#~ " The base module to manage quotations and sales orders.\n"
+#~ "\n"
+#~ " * Workflow with validation steps:\n"
+#~ " - Quotation -> Sales order -> Invoice\n"
+#~ " * Invoicing methods:\n"
+#~ " - Invoice on order (before or after shipping)\n"
+#~ " - Invoice on delivery\n"
+#~ " - Invoice on timesheets\n"
+#~ " - Advance invoice\n"
+#~ " * Partners preferences (shipping, invoicing, incoterm, ...)\n"
+#~ " * Products stocks and prices\n"
+#~ " * Delivery methods:\n"
+#~ " - all at once, multi-parcel\n"
+#~ " - delivery costs\n"
+#~ " * Dashboard for salesman that includes:\n"
+#~ " * Your open quotations\n"
+#~ " * Top 10 sales of the month\n"
+#~ " * Cases statistics\n"
+#~ " * Graph of sales by product\n"
+#~ " * Graph of cases of the month\n"
+#~ " "
+#~ msgstr ""
+#~ "\n"
+#~ " Modul dasar untuk mengelola quotation dan sales order .\n"
+#~ "\n"
+#~ " * Alur Kerja dengan langkah-langkah validasi:\n"
+#~ " - Quotation -> Sales order -> invoice\n"
+#~ " * Metoda Invoicing :\n"
+#~ " - invoice pada pesanan (sebelum atau sesudah pengiriman)\n"
+#~ " - invoice pengiriman yang\n"
+#~ " - invoice pada timesheets\n"
+#~ " - invoice Advance\n"
+#~ " * preferensi Mitra (pengiriman, invoicing, INCOTERM, ...)\n"
+#~ " * Produk dan harga stok\n"
+#~ " * Pengiriman :\n"
+#~ " - semua sekaligus, multi-paket\n"
+#~ " - Biaya pengiriman\n"
+#~ " * Dashboard untuk salesman yang meliputi:\n"
+#~ " * quotation terbuka Anda\n"
+#~ " * Top 10 bulan ini\n"
+#~ " * Kasus statistik\n"
+#~ " * Grafik penjualan per produk\n"
+#~ " * Grafik kasus bulan ini.\n"
+#~ " "
+
+#~ msgid "title"
+#~ msgstr "Judul:"
+
+#~ msgid "Order date"
+#~ msgstr "Tanggal order"
+
+#~ msgid ""
+#~ "Gives the state of the quotation or sales order. \n"
+#~ "The exception state is automatically set when a cancel operation occurs in "
+#~ "the invoice validation (Invoice Exception) or in the picking list process "
+#~ "(Shipping Exception). \n"
+#~ "The 'Waiting Schedule' state is set when the invoice is confirmed but "
+#~ "waiting for the scheduler to run on the date 'Ordered Date'."
+#~ msgstr ""
+#~ "Memberikan status quotation atau sales order .\n"
+#~ "Kondisi pengecualian secara otomatis mengatur kapan operasi dibatalkan yang "
+#~ "terjadi pada validasi invoice (invoice Exception) atau dalam proses daftar "
+#~ "memilih (Shipping Exception).\n"
+#~ "Pada Status 'Waiting Schedule' ini mengatur kapan Invoice dikonfirmasi "
+#~ "tetapi menunggu scheduler yang akan dijalankan pada tanggal 'Tanggal Ordered'"
+
+#~ msgid "sale.installer"
+#~ msgstr "sale.installer"
+
+#~ msgid ""
+#~ "Provides some features to improve the layout of the Sales Order reports."
+#~ msgstr ""
+#~ "Menyediakan beberapa fitur untuk meningkatkan tata letak laporan Sales "
+#~ "Order."
+
+#~ msgid "Advance"
+#~ msgstr "Advance"
+
+#~ msgid "Steps To Deliver a Sales Order"
+#~ msgstr "Langkah-langkah untuk pengiriman sales order."
diff --git a/addons/sale/i18n/it.po b/addons/sale/i18n/it.po
index 3910558f189..8dd28e19478 100644
--- a/addons/sale/i18n/it.po
+++ b/addons/sale/i18n/it.po
@@ -6,15 +6,27 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2011-01-11 11:16+0000\n"
+"POT-Creation-Date: 2011-12-22 18:43+0000\n"
"PO-Revision-Date: 2011-05-25 16:17+0000\n"
"Last-Translator: simone.sandri <lexluxsox@hotmail.it>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-05 05:16+0000\n"
-"X-Generator: Launchpad (build 14231)\n"
+"X-Launchpad-Export-Date: 2011-12-23 06:46+0000\n"
+"X-Generator: Launchpad (build 14560)\n"
+
+#. module: sale
+#: field:sale.config.picking_policy,timesheet:0
+msgid "Based on Timesheet"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid ""
+"Sale Order Lines that are confirmed, done or in exception state and haven't "
+"yet been invoiced"
+msgstr ""
#. module: sale
#: view:board.board:0
@@ -23,11 +35,6 @@ msgid "Sales by Salesman in last 90 days"
msgstr "Vendite per commerciale negli ultimi 90 giorni"
#. module: sale
-#: help:sale.installer,delivery:0
-msgid "Allows you to compute delivery costs on your quotations."
-msgstr "Permette di calcolare i costi di consegna sul preventivo."
-
-#. module: sale
#: help:sale.order,picking_policy:0
msgid ""
"If you don't have enough stock available to deliver all at once, do you "
@@ -37,6 +44,11 @@ msgstr ""
"sola volta, si accetta comunque la spedizione parziale oppure no?"
#. module: sale
+#: view:sale.order:0
+msgid "UoS"
+msgstr ""
+
+#. module: sale
#: help:sale.order,partner_shipping_id:0
msgid "Shipping address for current sales order."
msgstr "Ordine di spedizione per l'ordine di vendita corrente"
@@ -60,22 +72,12 @@ msgid "Cancel Order"
msgstr "Annulla Ordine"
#. module: sale
-#: view:sale.config.picking_policy:0
-msgid "Configure Sales Order Logistics"
-msgstr "(?)Configura la logistica dell'ordine di vendita"
-
-#. module: sale
-#: code:addons/sale/sale.py:603
+#: code:addons/sale/sale.py:638
#, python-format
msgid "The quotation '%s' has been converted to a sales order."
msgstr "Il preventivo '%s' è stato trasformato in un ordine di vendita"
#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Payment Before Delivery"
-msgstr "Pagamento prima della consegna"
-
-#. module: sale
#: code:addons/sale/wizard/sale_make_invoice.py:42
#, python-format
msgid "Warning !"
@@ -93,12 +95,6 @@ msgstr ""
"Imposta gli ordini di approvvigionamento per ogni linea d'ordine di vendita"
#. module: sale
-#: selection:sale.config.picking_policy,picking_policy:0
-msgid "All at Once"
-msgstr "Tutto in una volta"
-
-#. module: sale
-#: field:sale.order,project_id:0
#: view:sale.report:0
#: field:sale.report,analytic_account_id:0
#: field:sale.shop,project_id:0
@@ -118,6 +114,15 @@ msgstr ""
"spedizioni o effettuare fatture totali relative all'ordine di vendita."
#. module: sale
+#: code:addons/sale/sale.py:295
+#, python-format
+msgid ""
+"In order to delete a confirmed sale order, you must cancel it before ! To "
+"cancel a sale order, you must first cancel related picking or delivery "
+"orders."
+msgstr ""
+
+#. module: sale
#: model:process.node,name:sale.process_node_saleprocurement0
msgid "Procurement Order"
msgstr "Ordine di approvvigionamento"
@@ -129,6 +134,11 @@ msgid "Partner"
msgstr "Partner"
#. module: sale
+#: selection:sale.order,order_policy:0
+msgid "Invoice based on deliveries"
+msgstr ""
+
+#. module: sale
#: view:sale.order:0
msgid "Order Line"
msgstr "Riga Ordine"
@@ -174,9 +184,14 @@ msgid "Default Payment Term"
msgstr "Scadenza Pagamento Predefinita"
#. module: sale
-#: model:ir.actions.act_window,name:sale.action_config_picking_policy
-msgid "Configure Picking Policy for Sales Order"
-msgstr "Configura il metodo di approvvigionamento per l'ordine di vendita"
+#: field:sale.config.picking_policy,deli_orders:0
+msgid "Based on Delivery Orders"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.picking_policy,time_unit:0
+msgid "Main Working Time Unit"
+msgstr ""
#. module: sale
#: view:sale.order:0
@@ -192,9 +207,10 @@ msgid "Disc.(%)"
msgstr "Sconto (%)"
#. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_forceassignation0
-msgid "Force Assignation"
-msgstr "Forza Assegnazione"
+#: view:sale.report:0
+#: field:sale.report,price_total:0
+msgid "Total Price"
+msgstr "Prezzo Totale"
#. module: sale
#: help:sale.make.invoice,grouped:0
@@ -203,6 +219,11 @@ msgstr ""
"Spuntare il box per raggruppare le fatture riferite agli stessi clienti"
#. module: sale
+#: view:sale.order:0
+msgid "My Sale Orders"
+msgstr ""
+
+#. module: sale
#: selection:sale.order,invoice_quantity:0
msgid "Ordered Quantities"
msgstr "Quantità Ordinate"
@@ -243,14 +264,25 @@ msgstr ""
"'Fattura da prelievo' o 'Fattura su ordine dopo la consegna'."
#. module: sale
+#: field:sale.config.picking_policy,task_work:0
+msgid "Based on Tasks' Work"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
+msgid "Quotations and Sales"
+msgstr ""
+
+#. module: sale
#: model:ir.model,name:sale.model_sale_make_invoice
msgid "Sales Make Invoice"
msgstr "Crea fattura di vendita"
#. module: sale
-#: view:sale.order:0
-msgid "Recreate Packing"
-msgstr "Ricrea imballaggio"
+#: code:addons/sale/sale.py:330
+#, python-format
+msgid "Pricelist Warning!"
+msgstr ""
#. module: sale
#: field:sale.order.line,discount:0
@@ -258,11 +290,10 @@ msgid "Discount (%)"
msgstr "Sconto (%)"
#. module: sale
-#: help:res.company,security_lead:0
-msgid ""
-"This is the days added to what you promise to customers for security purpose"
-msgstr ""
-"I giorni aggiunti per sicurezza al tempo di consegna promesso al cliente"
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_quotation_for_sale
+msgid "My Quotations"
+msgstr "I Miei Preventivi"
#. module: sale
#: view:board.board:0
@@ -287,7 +318,22 @@ msgid "Shop Name"
msgstr "Nome Negozio"
#. module: sale
-#: code:addons/sale/sale.py:1014
+#: help:sale.order,order_policy:0
+msgid ""
+"The Invoice Policy is used to synchronise invoice and delivery operations.\n"
+" - The 'Pay before delivery' choice will first generate the invoice and "
+"then generate the picking order after the payment of this invoice.\n"
+" - The 'Deliver & Invoice on demand' will create the picking order directly "
+"and wait for the user to manually click on the 'Invoice' button to generate "
+"the draft invoice based on the sale order or the sale order lines.\n"
+" - The 'Invoice on order after delivery' choice will generate the draft "
+"invoice based on sales order after all picking lists have been finished.\n"
+" - The 'Invoice based on deliveries' choice is used to create an invoice "
+"during the picking process."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:1158
#, python-format
msgid "No Customer Defined !"
msgstr "Nessun cliente definito!"
@@ -298,9 +344,12 @@ msgid "Sales in Exception"
msgstr "Vendite in Eccezione"
#. module: sale
-#: view:sale.order:0
-msgid "Set to Draft"
-msgstr "Imposta come Bozza"
+#: code:addons/sale/sale.py:1145
+#: code:addons/sale/sale.py:1264
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:70
+#, python-format
+msgid "Configuration Error !"
+msgstr ""
#. module: sale
#: view:sale.order:0
@@ -308,35 +357,7 @@ msgid "Conditions"
msgstr "Condizioni"
#. module: sale
-#: help:sale.order,order_policy:0
-msgid ""
-"The Shipping Policy is used to synchronise invoice and delivery operations.\n"
-" - The 'Pay Before delivery' choice will first generate the invoice and "
-"then generate the picking order after the payment of this invoice.\n"
-" - The 'Shipping & Manual Invoice' will create the picking order directly "
-"and wait for the user to manually click on the 'Invoice' button to generate "
-"the draft invoice.\n"
-" - The 'Invoice On Order After Delivery' choice will generate the draft "
-"invoice based on sales order after all picking lists have been finished.\n"
-" - The 'Invoice From The Picking' choice is used to create an invoice "
-"during the picking process."
-msgstr ""
-"Il metodo di spedizione viene utilizzato per sincronizzare fatture ed "
-"operazioni di consegna.\n"
-" - Selezionando 'Pagamento prima della consegna' verrà prima generata la "
-"fattura e quindi, dopo il pagamento della stessa, l'ordine di magazzino "
-"associato.\n"
-" - Selezionando 'Spedizione e fatturazione manuale' verrà generato "
-"direttamente l'ordine di magazzino, mentre è necessario che l'utente generi "
-"manualmente la fattura in stato bozza premendo sul tasto 'Fattura'.\n"
-" - Selezionando invece 'Fattura su ordine dopo la consegna' verrà generata "
-"una fattura in bozza basata sull'ordine di vendita, non appena tutte le "
-"linee di prelievo sono state lavorate.\n"
-" - Selezionando infine 'Fattura da prelievo' è possibile creare una fattura "
-"contestualmente al processo di prelievo delle merci."
-
-#. module: sale
-#: code:addons/sale/sale.py:939
+#: code:addons/sale/sale.py:1034
#, python-format
msgid ""
"There is no income category account defined in default Properties for "
@@ -346,9 +367,9 @@ msgstr ""
"della categoria prodotti oppure non è stato definita una posizione fiscale!"
#. module: sale
-#: view:sale.installer:0
-msgid "Configure"
-msgstr "Configura"
+#: selection:sale.report,month:0
+msgid "August"
+msgstr "Agosto"
#. module: sale
#: constraint:stock.move:0
@@ -357,7 +378,7 @@ msgstr ""
"Si sta cercando di assegnare un lotto non legato allo stesso prodotto"
#. module: sale
-#: code:addons/sale/sale.py:620
+#: code:addons/sale/sale.py:655
#, python-format
msgid "invalid mode for test_state"
msgstr "stato invalido per test_state"
@@ -368,7 +389,7 @@ msgid "June"
msgstr "Giugno"
#. module: sale
-#: code:addons/sale/sale.py:584
+#: code:addons/sale/sale.py:617
#, python-format
msgid "Could not cancel this sales order !"
msgstr "Non è possibile cancellare questo ordine di vendita!"
@@ -389,8 +410,12 @@ msgid "October"
msgstr "Ottobre"
#. module: sale
+#: sql_constraint:stock.picking:0
+msgid "Reference must be unique per Company!"
+msgstr ""
+
+#. module: sale
#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_quotation_for_sale
#: view:sale.order:0
#: view:sale.report:0
msgid "Quotations"
@@ -402,11 +427,6 @@ msgid "Pricelist for current sales order."
msgstr "Listino prezzi per l'ordine di vendita corrente."
#. module: sale
-#: selection:sale.config.picking_policy,step:0
-msgid "Delivery Order Only"
-msgstr "Solamente ordine di consegna"
-
-#. module: sale
#: report:sale.order:0
msgid "TVA :"
msgstr "TVA :"
@@ -433,6 +453,7 @@ msgstr "Posizione Fiscale"
#. module: sale
#: view:sale.order:0
#: view:sale.order.line:0
+#: field:sale.report,product_uom:0
msgid "UoM"
msgstr "UoM"
@@ -457,7 +478,13 @@ msgstr ""
"quindi 'In corso' o 'In corso manualmente'."
#. module: sale
-#: code:addons/sale/sale.py:971
+#: code:addons/sale/sale.py:1061
+#, python-format
+msgid "You cannot cancel a sale order line that has already been invoiced!"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:1066
#, python-format
msgid "You must first cancel stock moves attached to this sales order line."
msgstr ""
@@ -465,7 +492,7 @@ msgstr ""
"linea d'ordine."
#. module: sale
-#: code:addons/sale/sale.py:1042
+#: code:addons/sale/sale.py:1134
#, python-format
msgid "(n/a)"
msgstr "(n/d)"
@@ -504,16 +531,36 @@ msgid "Notes"
msgstr "Note"
#. module: sale
+#: sql_constraint:res.company:0
+msgid "The company name must be unique !"
+msgstr ""
+
+#. module: sale
#: help:sale.order,partner_invoice_id:0
msgid "Invoice address for current sales order."
msgstr "Indirizzo di fatturazione per questo ordine di vendita."
#. module: sale
-#: view:sale.installer:0
-msgid "Enhance your core Sales Application with additional functionalities."
+#: view:sale.report:0
+msgid "Month-1"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered month of the sales order"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:504
+#, python-format
+msgid ""
+"You cannot group sales having different currencies for the same partner."
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,picking_policy:0
+msgid "Deliver each product when available"
msgstr ""
-"Migliora le funzionalità di base dell'applicazione di vendita con delle "
-"funzionalità aggiuntive."
#. module: sale
#: field:sale.order,invoiced_rate:0
@@ -532,21 +579,43 @@ msgid "Confirmation Date"
msgstr "Data di conferma"
#. module: sale
+#: field:sale.order,incoterm:0
+msgid "Incoterm"
+msgstr "Incoterm"
+
+#. module: sale
#: field:sale.order.line,address_allotment_id:0
msgid "Allotment Partner"
msgstr "Ripartizione Partner"
#. module: sale
-#: sql_constraint:sale.order:0
-msgid "Order Reference must be unique !"
-msgstr "Il riferimento ordine deve essere unico!"
-
-#. module: sale
#: selection:sale.report,month:0
msgid "March"
msgstr "Marzo"
#. module: sale
+#: constraint:stock.move:0
+msgid "You can not move products from or to a location of the type view."
+msgstr ""
+
+#. module: sale
+#: field:sale.config.picking_policy,sale_orders:0
+msgid "Based on Sales Orders"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,state:0
+msgid ""
+"Givwizard = self.browse(cr, uid, ids)[0]es the state of the quotation or "
+"sales order. \n"
+"The exception state is automatically set when a cancel operation occurs in "
+"the invoice validation (Invoice Exception) or in the picking list process "
+"(Shipping Exception). \n"
+"The 'Waiting Schedule' state is set when the invoice is confirmed but "
+"waiting for the scheduler to run on the order date."
+msgstr ""
+
+#. module: sale
#: help:sale.order,amount_total:0
msgid "The total amount."
msgstr "Il prezzo totale"
@@ -562,6 +631,11 @@ msgid "Invoice address :"
msgstr "Indirizzo di Fatturazione"
#. module: sale
+#: field:sale.order.line,sequence:0
+msgid "Line Sequence"
+msgstr ""
+
+#. module: sale
#: model:process.transition,note:sale.process_transition_saleorderprocurement0
msgid ""
"For every sales order line, a procurement order is created to supply the "
@@ -612,11 +686,6 @@ msgid "Sales Order Line"
msgstr "Linea d'ordine di vendita"
#. module: sale
-#: view:sale.config.picking_policy:0
-msgid "Setup your sales workflow and default values."
-msgstr "Setup del workflow di vendita e dei valori di default."
-
-#. module: sale
#: field:sale.shop,warehouse_id:0
msgid "Warehouse"
msgstr "Magazzino"
@@ -653,6 +722,11 @@ msgid "Creation Date"
msgstr "Data creazione"
#. module: sale
+#: model:ir.ui.menu,name:sale.menu_sales_configuration_misc
+msgid "Miscellaneous"
+msgstr ""
+
+#. module: sale
#: model:ir.actions.act_window,name:sale.action_order_line_tree3
msgid "Uninvoiced and Delivered Lines"
msgstr "Righe Consegnate e Non Fatturate"
@@ -668,14 +742,19 @@ msgid "My Sales"
msgstr "Le mie vendite"
#. module: sale
-#: code:addons/sale/sale.py:290
-#: code:addons/sale/sale.py:966
-#: code:addons/sale/sale.py:1165
+#: code:addons/sale/sale.py:295
+#: code:addons/sale/sale.py:1061
+#: code:addons/sale/sale.py:1290
#, python-format
msgid "Invalid action !"
msgstr "Azione non valida !"
#. module: sale
+#: view:sale.order:0
+msgid "Extra Info"
+msgstr "Informazioni Aggiuntive"
+
+#. module: sale
#: field:sale.order,pricelist_id:0
#: field:sale.report,pricelist_id:0
#: field:sale.shop,pricelist_id:0
@@ -689,13 +768,21 @@ msgid "# of Qty"
msgstr "Q.tà"
#. module: sale
+#: code:addons/sale/sale.py:1314
+#, python-format
+msgid "Hour"
+msgstr ""
+
+#. module: sale
#: view:sale.order:0
msgid "Order Date"
msgstr "Data dell'ordine"
#. module: sale
#: view:sale.order.line:0
+#: view:sale.report:0
#: field:sale.report,shipped:0
+#: field:sale.report,shipped_qty_1:0
msgid "Shipped"
msgstr "Spedite"
@@ -705,9 +792,9 @@ msgid "All Quotations"
msgstr "Tutti i Preventivi"
#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Invoice On Order After Delivery"
-msgstr "Fattura su ordine dopo la consegna"
+#: view:sale.config.picking_policy:0
+msgid "Options"
+msgstr ""
#. module: sale
#: selection:sale.report,month:0
@@ -715,6 +802,20 @@ msgid "September"
msgstr "Settembre"
#. module: sale
+#: code:addons/sale/sale.py:632
+#, python-format
+msgid "You cannot confirm a sale order which has no line."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:1246
+#, python-format
+msgid ""
+"You have to select a pricelist or a customer in the sales form !\n"
+"Please set one before choosing a product."
+msgstr ""
+
+#. module: sale
#: view:sale.report:0
#: field:sale.report,categ_id:0
msgid "Category of Product"
@@ -731,11 +832,6 @@ msgid "Stock Moves"
msgstr "Spostamenti Stock"
#. module: sale
-#: view:sale.report:0
-msgid " Year "
-msgstr " Anno "
-
-#. module: sale
#: field:sale.order,state:0
#: field:sale.report,state:0
msgid "Order State"
@@ -753,7 +849,7 @@ msgid "Sales By Month"
msgstr "Vendite per mese"
#. module: sale
-#: code:addons/sale/sale.py:970
+#: code:addons/sale/sale.py:1065
#, python-format
msgid "Could not cancel sales order line!"
msgstr "Impossibile cancellare la linea dell'ordine di vendita!"
@@ -788,64 +884,19 @@ msgstr ""
"aggiornato solo dopo che lo (gli) scheduler sono partiti."
#. module: sale
+#: field:sale.order,date_order:0
+msgid "Date"
+msgstr ""
+
+#. module: sale
#: view:sale.report:0
msgid "Extended Filters..."
msgstr "Filtri estesi..."
#. module: sale
-#: model:ir.module.module,description:sale.module_meta_information
-msgid ""
-"\n"
-" The base module to manage quotations and sales orders.\n"
-"\n"
-" * Workflow with validation steps:\n"
-" - Quotation -> Sales order -> Invoice\n"
-" * Invoicing methods:\n"
-" - Invoice on order (before or after shipping)\n"
-" - Invoice on delivery\n"
-" - Invoice on timesheets\n"
-" - Advance invoice\n"
-" * Partners preferences (shipping, invoicing, incoterm, ...)\n"
-" * Products stocks and prices\n"
-" * Delivery methods:\n"
-" - all at once, multi-parcel\n"
-" - delivery costs\n"
-" * Dashboard for salesman that includes:\n"
-" * Your open quotations\n"
-" * Top 10 sales of the month\n"
-" * Cases statistics\n"
-" * Graph of sales by product\n"
-" * Graph of cases of the month\n"
-" "
-msgstr ""
-"\n"
-" Il modulo base per gestire preventivi e ordini di vendita.\n"
-"\n"
-" * Workflow con passi di validazione:\n"
-" - Preventivo -> Ordine di vendita -> Fattura\n"
-" * Metodi di fatturazione:\n"
-" - Fattura su ordine (prima o dopo la consegna)\n"
-" - Fattura su consegna\n"
-" - Fattura su timesheet\n"
-" - Anticipo fattura\n"
-" * Preferenze del partner (spedizione, fatturazione, incoterm, ...)\n"
-" * Scorte prodotti e prezzi\n"
-" * Metodi di spedizione:\n"
-" - tutto in una volta, multi-partita\n"
-" - costi di spedizione\n"
-" * Dashboard venditore che include:\n"
-" * I propri preventivi\n"
-" * Top 10 delle vendite del mese\n"
-" * Statistiche dei casi di vendita\n"
-" * Grafici delle vendite per prodotto\n"
-" * Grafici dei casi del mese\n"
-" "
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_shop
-#: view:sale.shop:0
-msgid "Sales Shop"
-msgstr "Negozio"
+#: selection:sale.order.line,state:0
+msgid "Exception"
+msgstr "Eccezione"
#. module: sale
#: model:ir.model,name:sale.model_res_company
@@ -853,9 +904,10 @@ msgid "Companies"
msgstr "Aziende"
#. module: sale
-#: selection:sale.report,month:0
-msgid "November"
-msgstr "Novembre"
+#: code:addons/sale/sale.py:1259
+#, python-format
+msgid "No valid pricelist line found ! :"
+msgstr ""
#. module: sale
#: view:sale.order:0
@@ -863,9 +915,9 @@ msgid "History"
msgstr "Cronologia"
#. module: sale
-#: field:sale.config.picking_policy,picking_policy:0
-msgid "Picking Default Policy"
-msgstr "Politica di prelievo di default"
+#: selection:sale.order,order_policy:0
+msgid "Invoice on order after delivery"
+msgstr ""
#. module: sale
#: help:sale.order,invoice_ids:0
@@ -891,15 +943,13 @@ msgstr ""
"Il nome e l'indirizzo del contatto che ha richiesto l'ordine o il preventivo"
#. module: sale
-#: code:addons/sale/sale.py:966
-#, python-format
-msgid "You cannot cancel a sales order line that has already been invoiced !"
+#: help:res.company,security_lead:0
+msgid ""
+"This is the days added to what you promise to customers for security purpose"
msgstr ""
-"Non è possibile cancellare una riga di ordine di vendita che è stata già "
-"fatturata!"
+"I giorni aggiunti per sicurezza al tempo di consegna promesso al cliente"
#. module: sale
-#: view:sale.order:0
#: view:sale.order.line:0
msgid "Qty"
msgstr "Qta'"
@@ -910,6 +960,11 @@ msgid "References"
msgstr "Riferimenti"
#. module: sale
+#: view:sale.order.line:0
+msgid "My Sales Order Lines"
+msgstr ""
+
+#. module: sale
#: model:process.transition.action,name:sale.process_transition_action_cancel0
#: model:process.transition.action,name:sale.process_transition_action_cancel1
#: model:process.transition.action,name:sale.process_transition_action_cancel2
@@ -921,14 +976,9 @@ msgid "Cancel"
msgstr "Annulla"
#. module: sale
-#: field:sale.installer,sale_order_dates:0
-msgid "Sales Order Dates"
-msgstr "Date ordine di vendita"
-
-#. module: sale
-#: selection:sale.order.line,state:0
-msgid "Exception"
-msgstr "Eccezione"
+#: sql_constraint:sale.order:0
+msgid "Order Reference must be unique per Company!"
+msgstr ""
#. module: sale
#: model:process.transition,name:sale.process_transition_invoice0
@@ -940,19 +990,19 @@ msgid "Create Invoice"
msgstr "Crea fattura"
#. module: sale
-#: field:sale.installer,sale_margin:0
-msgid "Margins in Sales Orders"
-msgstr "Margini degli ordini di vendita"
-
-#. module: sale
#: view:sale.order:0
msgid "Total Tax Excluded"
msgstr "Totale non tassato"
#. module: sale
-#: view:sale.order:0
-msgid "Compute"
-msgstr "Calcola"
+#: view:sale.order.line:0
+msgid "Order reference"
+msgstr ""
+
+#. module: sale
+#: view:sale.open.invoice:0
+msgid "You invoice has been successfully created!"
+msgstr "La fattura è stata generata correttamente!"
#. module: sale
#: view:sale.report:0
@@ -971,23 +1021,21 @@ msgid "Open Invoice"
msgstr "Apri Fattura"
#. module: sale
-#: report:sale.order:0
-#: view:sale.order.line:0
-msgid "Price"
-msgstr "Prezzo"
+#: model:ir.actions.server,name:sale.ir_actions_server_edi_sale
+msgid "Auto-email confirmed sale orders"
+msgstr ""
#. module: sale
-#: model:ir.actions.act_window,name:sale.action_sale_installer
-#: view:sale.config.picking_policy:0
-#: view:sale.installer:0
-msgid "Sales Application Configuration"
-msgstr "Configurazione applicazione di vendita"
+#: code:addons/sale/sale.py:413
+#, python-format
+msgid "There is no sales journal defined for this company: \"%s\" (id:%d)"
+msgstr ""
+"Non è stato definito un registro vendite per questa azienda: \"%s\" (id:%d)"
#. module: sale
-#: view:sale.report:0
-#: field:sale.report,price_total:0
-msgid "Total Price"
-msgstr "Prezzo Totale"
+#: model:process.transition.action,name:sale.process_transition_action_forceassignation0
+msgid "Force Assignation"
+msgstr "Forza Assegnazione"
#. module: sale
#: selection:sale.order.line,type:0
@@ -1000,6 +1048,11 @@ msgid "Based on the shipped or on the ordered quantities."
msgstr "Basato sulle quantità spedite o ordinate."
#. module: sale
+#: selection:sale.order,picking_policy:0
+msgid "Deliver all products at once"
+msgstr ""
+
+#. module: sale
#: field:sale.order,picking_ids:0
msgid "Related Picking"
msgstr "Prelievi correlati"
@@ -1031,9 +1084,15 @@ msgid "Create Delivery Order"
msgstr "Crea ordine di consegna"
#. module: sale
-#: field:sale.installer,delivery:0
-msgid "Delivery Costs"
-msgstr "Costi di consegna"
+#: code:addons/sale/sale.py:1290
+#, python-format
+msgid "Cannot delete a sales order line which is in state '%s'!"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Qty(UoS)"
+msgstr ""
#. module: sale
#: view:sale.order:0
@@ -1047,13 +1106,13 @@ msgstr "Crea lista di prelievo"
#. module: sale
#: view:sale.report:0
-msgid "Sales by Product Category"
-msgstr "Vendite per categoria prodotto"
+msgid "Ordered date of the sales order"
+msgstr ""
#. module: sale
-#: selection:sale.order,picking_policy:0
-msgid "Partial Delivery"
-msgstr "Consegna parziale"
+#: view:sale.report:0
+msgid "Sales by Product Category"
+msgstr "Vendite per categoria prodotto"
#. module: sale
#: model:process.transition,name:sale.process_transition_confirmquotation0
@@ -1061,9 +1120,10 @@ msgid "Confirm Quotation"
msgstr "Confirm Quotation"
#. module: sale
-#: help:sale.order,origin:0
-msgid "Reference of the document that generated this sales order request."
-msgstr "Riferimento del documento che ha creato questa richiesta d'ordine"
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:63
+#, python-format
+msgid "Error"
+msgstr "Errore"
#. module: sale
#: view:sale.order:0
@@ -1095,20 +1155,14 @@ msgid "Procurement Method"
msgstr "Metodo di approvvigionamento"
#. module: sale
-#: view:sale.config.picking_policy:0
-#: view:sale.installer:0
-msgid "title"
-msgstr "titolo"
-
-#. module: sale
#: model:process.node,name:sale.process_node_packinglist0
msgid "Pick List"
msgstr "Lista prelievo"
#. module: sale
#: view:sale.order:0
-msgid "Order date"
-msgstr "Data dell'ordine"
+msgid "Set to Draft"
+msgstr "Imposta come Bozza"
#. module: sale
#: model:process.node,note:sale.process_node_packinglist0
@@ -1116,6 +1170,85 @@ msgid "Document of the move to the output or to the customer."
msgstr "Documento del movimento verso area di uscita o verso area cliente."
#. module: sale
+#: model:email.template,body_text:sale.email_template_edi_sale
+msgid ""
+"\n"
+"Hello${object.partner_order_id.name and ' ' or "
+"''}${object.partner_order_id.name or ''},\n"
+"\n"
+"Here is your order confirmation for ${object.partner_id.name}:\n"
+" | Order number: *${object.name}*\n"
+" | Order total: *${object.amount_total} "
+"${object.pricelist_id.currency_id.name}*\n"
+" | Order date: ${object.date_order}\n"
+" % if object.origin:\n"
+" | Order reference: ${object.origin}\n"
+" % endif\n"
+" % if object.client_order_ref:\n"
+" | Your reference: ${object.client_order_ref}<br />\n"
+" % endif\n"
+" | Your contact: ${object.user_id.name} ${object.user_id.user_email "
+"and '<%s>'%(object.user_id.user_email) or ''}\n"
+"\n"
+"You can view the order confirmation, download it and even pay online using "
+"the following link:\n"
+" ${ctx.get('edi_web_url_view') or 'n/a'}\n"
+"\n"
+"% if object.order_policy in ('prepaid','manual') and "
+"object.company_id.paypal_account:\n"
+"<% \n"
+"comp_name = quote(object.company_id.name)\n"
+"order_name = quote(object.name)\n"
+"paypal_account = quote(object.company_id.paypal_account)\n"
+"order_amount = quote(str(object.amount_total))\n"
+"cur_name = quote(object.pricelist_id.currency_id.name)\n"
+"paypal_url = \"https://www.paypal.com/cgi-"
+"bin/webscr?cmd=_xclick&business=%s&item_name=%s%%20Order%%20%s&invoice=%s&amo"
+"unt=%s\" \\\n"
+" "
+"\"&currency_code=%s&button_subtype=services&no_note=1&bn=OpenERP_Order_PayNow"
+"_%s\" % \\\n"
+" "
+"(paypal_account,comp_name,order_name,order_name,order_amount,cur_name,cur_nam"
+"e)\n"
+"%>\n"
+"It is also possible to directly pay with Paypal:\n"
+" ${paypal_url}\n"
+"% endif\n"
+"\n"
+"If you have any question, do not hesitate to contact us.\n"
+"\n"
+"\n"
+"Thank you for choosing ${object.company_id.name}!\n"
+"\n"
+"\n"
+"--\n"
+"${object.user_id.name} ${object.user_id.user_email and "
+"'<%s>'%(object.user_id.user_email) or ''}\n"
+"${object.company_id.name}\n"
+"% if object.company_id.street:\n"
+"${object.company_id.street or ''}\n"
+"% endif\n"
+"% if object.company_id.street2:\n"
+"${object.company_id.street2}\n"
+"% endif\n"
+"% if object.company_id.city or object.company_id.zip:\n"
+"${object.company_id.zip or ''} ${object.company_id.city or ''}\n"
+"% endif\n"
+"% if object.company_id.country_id:\n"
+"${object.company_id.state_id and ('%s, ' % object.company_id.state_id.name) "
+"or ''} ${object.company_id.country_id.name or ''}\n"
+"% endif\n"
+"% if object.company_id.phone:\n"
+"Phone: ${object.company_id.phone}\n"
+"% endif\n"
+"% if object.company_id.website:\n"
+"${object.company_id.website or ''}\n"
+"% endif\n"
+" "
+msgstr ""
+
+#. module: sale
#: model:process.transition.action,name:sale.process_transition_action_validate0
msgid "Validate"
msgstr "Convalida"
@@ -1138,9 +1271,9 @@ msgid "Taxes"
msgstr "Tasse"
#. module: sale
-#: field:sale.order,order_policy:0
-msgid "Shipping Policy"
-msgstr "Politica di Spedizione"
+#: view:sale.order:0
+msgid "Sales Order ready to be invoiced"
+msgstr ""
#. module: sale
#: help:sale.order,create_date:0
@@ -1159,9 +1292,9 @@ msgid "Create Invoices"
msgstr "Crea fatture"
#. module: sale
-#: view:sale.order:0
-msgid "Extra Info"
-msgstr "Informazioni Aggiuntive"
+#: view:sale.report:0
+msgid "Sales order created in current month"
+msgstr ""
#. module: sale
#: report:sale.order:0
@@ -1169,11 +1302,24 @@ msgid "Fax :"
msgstr "Fax"
#. module: sale
+#: help:sale.order.line,type:0
+msgid ""
+"If 'on order', it triggers a procurement when the sale order is confirmed to "
+"create a task, purchase order or manufacturing order linked to this sale "
+"order line."
+msgstr ""
+
+#. module: sale
#: field:sale.advance.payment.inv,amount:0
msgid "Advance Amount"
msgstr "Importo di anticipo"
#. module: sale
+#: field:sale.config.picking_policy,charge_delivery:0
+msgid "Do you charge the delivery?"
+msgstr ""
+
+#. module: sale
#: selection:sale.order,invoice_quantity:0
msgid "Shipped Quantities"
msgstr "Quantità Spedite"
@@ -1184,25 +1330,45 @@ msgid "Invoice Based on Sales Orders"
msgstr "Fattura basata su Ordini di Vendita"
#. module: sale
+#: code:addons/sale/sale.py:331
+#, python-format
+msgid ""
+"If you change the pricelist of this order (and eventually the currency), "
+"prices of existing order lines will not be updated."
+msgstr ""
+
+#. module: sale
#: model:ir.model,name:sale.model_stock_picking
msgid "Picking List"
msgstr "Documento di trasporto"
#. module: sale
-#: code:addons/sale/sale.py:387
-#: code:addons/sale/sale.py:920
-#: code:addons/sale/sale.py:938
+#: code:addons/sale/sale.py:412
+#: code:addons/sale/sale.py:503
+#: code:addons/sale/sale.py:632
+#: code:addons/sale/sale.py:1015
+#: code:addons/sale/sale.py:1033
#, python-format
msgid "Error !"
msgstr "Errore!"
#. module: sale
-#: code:addons/sale/sale.py:570
+#: code:addons/sale/sale.py:603
#, python-format
msgid "Could not cancel sales order !"
msgstr "Non è possibile cancellare l'ordine di vendita!"
#. module: sale
+#: view:sale.order:0
+msgid "Qty(UoM)"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered Year of the sales order"
+msgstr ""
+
+#. module: sale
#: selection:sale.report,month:0
msgid "July"
msgstr "Luglio"
@@ -1219,36 +1385,26 @@ msgid "Shipping Exception"
msgstr "Eccezione Spedizione"
#. module: sale
-#: field:sale.make.invoice,grouped:0
-msgid "Group the invoices"
-msgstr "Raggruppa Fatture"
-
-#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Shipping & Manual Invoice"
-msgstr "Spedizione & Fatturazione Manuale"
-
-#. module: sale
-#: code:addons/sale/sale.py:1051
+#: code:addons/sale/sale.py:1143
#, python-format
-msgid "Picking Information !"
-msgstr "Informazioni prelievo!"
+msgid "Picking Information ! : "
+msgstr ""
#. module: sale
-#: view:sale.report:0
-#: field:sale.report,month:0
-msgid "Month"
-msgstr "Mese"
+#: field:sale.make.invoice,grouped:0
+msgid "Group the invoices"
+msgstr "Raggruppa Fatture"
#. module: sale
-#: model:ir.module.module,shortdesc:sale.module_meta_information
-msgid "Sales Management"
-msgstr "Gestione Vendite"
+#: field:sale.order,order_policy:0
+msgid "Invoice Policy"
+msgstr ""
#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Invoice From The Picking"
-msgstr "Fattura da prelievo"
+#: model:ir.actions.act_window,name:sale.action_config_picking_policy
+#: view:sale.config.picking_policy:0
+msgid "Setup your Invoicing Method"
+msgstr ""
#. module: sale
#: model:process.node,note:sale.process_node_invoice0
@@ -1257,32 +1413,31 @@ msgstr "Richiede una revisione del responsabile della contabilità."
#. module: sale
#: view:sale.report:0
-#: field:sale.report,uom_name:0
msgid "Reference UoM"
msgstr "UoM di riferimento"
#. module: sale
+#: view:sale.config.picking_policy:0
+msgid ""
+"This tool will help you to install the right module and configure the system "
+"according to the method you use to invoice your customers."
+msgstr ""
+
+#. module: sale
#: model:ir.model,name:sale.model_sale_order_line_make_invoice
msgid "Sale OrderLine Make_invoice"
msgstr "Genera fattura - linea ordine di vendita"
#. module: sale
-#: help:sale.config.picking_policy,step:0
-msgid ""
-"By default, OpenERP is able to manage complex routing and paths of products "
-"in your warehouse and partner locations. This will configure the most common "
-"and simple methods to deliver products to the customer in one or two "
-"operations by the worker."
-msgstr ""
-"Di default, OpenERP è in grado di gestire un routing complesso per i "
-"prodotti del magazzino e dei punti di stoccaggio del partner. Questo "
-"configurerà i metodi più comuni e semplici per consegnare i prodotti al "
-"cliente, tramite un paio di operazioni dell'utente."
+#: selection:sale.order,state:0
+#: selection:sale.report,state:0
+msgid "Invoice Exception"
+msgstr "Eccezione Fattura"
#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_tree
-msgid "Old Quotations"
-msgstr "Vecchi preventivi"
+#: model:process.node,note:sale.process_node_saleorder0
+msgid "Drives procurement and invoicing"
+msgstr "Regola approvigionamenti e fatturazione"
#. module: sale
#: field:sale.order,invoiced:0
@@ -1297,6 +1452,22 @@ msgid "Sales Analysis"
msgstr "Analisi delle vendite"
#. module: sale
+#: code:addons/sale/sale.py:1138
+#, python-format
+msgid ""
+"You selected a quantity of %d Units.\n"
+"But it's not compatible with the selected packaging.\n"
+"Here is a proposition of quantities according to the packaging:\n"
+"EAN: %s Quantity: %s Type of ul: %s"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Recreate Packing"
+msgstr "Ricrea imballaggio"
+
+#. module: sale
+#: view:sale.order:0
#: field:sale.order.line,property_ids:0
msgid "Properties"
msgstr "Proprietà"
@@ -1329,7 +1500,17 @@ msgstr ""
"dalle spedizioni."
#. module: sale
-#: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
+#: view:sale.order.line:0
+msgid "Confirmed sale order lines, not yet delivered"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:473
+#, python-format
+msgid "Customer Invoices"
+msgstr ""
+
+#. module: sale
#: model:process.process,name:sale.process_process_salesprocess0
#: view:sale.order:0
#: view:sale.report:0
@@ -1351,18 +1532,13 @@ msgid "Done"
msgstr "Completato"
#. module: sale
-#: model:ir.model,name:sale.model_sale_installer
-msgid "sale.installer"
-msgstr "sale.installer"
-
-#. module: sale
#: model:process.node,name:sale.process_node_invoice0
#: model:process.node,name:sale.process_node_invoiceafterdelivery0
msgid "Invoice"
msgstr "Fattura"
#. module: sale
-#: code:addons/sale/sale.py:1014
+#: code:addons/sale/sale.py:1158
#, python-format
msgid ""
"You have to select a customer in the sales form !\n"
@@ -1372,11 +1548,6 @@ msgstr ""
"Selezionare quindi un cliente prima di scegliere un prodotto."
#. module: sale
-#: selection:sale.config.picking_policy,step:0
-msgid "Picking List & Delivery Order"
-msgstr "DDT & Ordine di consegna"
-
-#. module: sale
#: field:sale.order,origin:0
msgid "Source Document"
msgstr "Documento sorgente"
@@ -1402,7 +1573,7 @@ msgid "The amount without tax."
msgstr "Totale senza la tassazione"
#. module: sale
-#: code:addons/sale/sale.py:571
+#: code:addons/sale/sale.py:604
#, python-format
msgid "You must first cancel all picking attached to this sales order."
msgstr ""
@@ -1415,9 +1586,15 @@ msgid "Sales Advance Payment Invoice"
msgstr "Anticipo su fattura di vendita"
#. module: sale
-#: field:sale.order,incoterm:0
-msgid "Incoterm"
-msgstr "Incoterm"
+#: view:sale.report:0
+#: field:sale.report,month:0
+msgid "Month"
+msgstr "Mese"
+
+#. module: sale
+#: model:email.template,subject:sale.email_template_edi_sale
+msgid "${object.company_id.name} Order (Ref ${object.name or 'n/a' })"
+msgstr ""
#. module: sale
#: view:sale.order.line:0
@@ -1428,11 +1605,6 @@ msgid "Product"
msgstr "Prodotto"
#. module: sale
-#: model:ir.ui.menu,name:sale.menu_invoiced
-msgid "Invoicing"
-msgstr "Fatturazione"
-
-#. module: sale
#: model:process.transition.action,name:sale.process_transition_action_cancelassignation0
msgid "Cancel Assignation"
msgstr "Annulla Assegnazione"
@@ -1443,21 +1615,11 @@ msgid "sale.config.picking_policy"
msgstr "sale.config.picking_policy"
#. module: sale
-#: help:sale.order,state:0
-msgid ""
-"Gives the state of the quotation or sales order. \n"
-"The exception state is automatically set when a cancel operation occurs in "
-"the invoice validation (Invoice Exception) or in the picking list process "
-"(Shipping Exception). \n"
-"The 'Waiting Schedule' state is set when the invoice is confirmed but "
-"waiting for the scheduler to run on the date 'Ordered Date'."
+#: view:account.invoice.report:0
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_turnover_by_month
+msgid "Monthly Turnover"
msgstr ""
-"Stato del preventivo o dell'ordine di vendita. \n"
-"Lo stato di eccezione viene impostato automaticamente quando interviene "
-"un'operazione di cancellazione durante la sua validazione (Eccezione "
-"fattura) oppure nel processo di lista prelievo (Eccezione spedizione). \n"
-"Lo stato 'In attesa data programmazione' viene impostato quando la fattura "
-"viene confermata ma è ancora in attesa della data programmata 'Data Ordine'."
#. module: sale
#: field:sale.order,invoice_quantity:0
@@ -1475,7 +1637,6 @@ msgid "Product UoS"
msgstr "Unità di Vendita Prodotto"
#. module: sale
-#: selection:sale.order,state:0
#: selection:sale.report,state:0
msgid "Manual In Progress"
msgstr "Manuale in Progresso"
@@ -1496,7 +1657,8 @@ msgid "Order"
msgstr "Ordine"
#. module: sale
-#: code:addons/sale/sale.py:921
+#: code:addons/sale/sale.py:1016
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:71
#, python-format
msgid "There is no income account defined for this product: \"%s\" (id:%d)"
msgstr ""
@@ -1521,7 +1683,7 @@ msgstr ""
"non appena confermato da un venditore."
#. module: sale
-#: code:addons/sale/sale.py:1116
+#: code:addons/sale/sale.py:1238
#, python-format
msgid ""
"You plan to sell %.2f %s but you only have %.2f %s available !\n"
@@ -1553,11 +1715,10 @@ msgid "Total"
msgstr "Totale"
#. module: sale
-#: code:addons/sale/sale.py:388
-#, python-format
-msgid "There is no sales journal defined for this company: \"%s\" (id:%d)"
-msgstr ""
-"Non è stato definito un registro vendite per questa azienda: \"%s\" (id:%d)"
+#: report:sale.order:0
+#: view:sale.order.line:0
+msgid "Price"
+msgstr "Prezzo"
#. module: sale
#: model:process.transition,note:sale.process_transition_deliver0
@@ -1572,10 +1733,15 @@ msgstr ""
"uscita."
#. module: sale
-#: code:addons/sale/sale.py:1165
-#, python-format
-msgid "Cannot delete a sales order line which is %s !"
-msgstr "Non è possibile cancellare una linea di ordine di vendita che è %s!"
+#: selection:sale.order,order_policy:0
+msgid "Pay before delivery"
+msgstr ""
+
+#. module: sale
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.open_board_sales
+msgid "Sales Dashboard"
+msgstr ""
#. module: sale
#: model:ir.actions.act_window,name:sale.action_sale_order_make_invoice
@@ -1586,6 +1752,7 @@ msgstr "Genera fatture"
#. module: sale
#: view:sale.order:0
+#: selection:sale.order,state:0
#: view:sale.order.line:0
msgid "To Invoice"
msgstr "Da fatturare"
@@ -1596,6 +1763,11 @@ msgid "Date on which sales order is confirmed."
msgstr "Data nella quale l'ordine di vendita viene confermato."
#. module: sale
+#: field:sale.order,project_id:0
+msgid "Contract/Analytic Account"
+msgstr ""
+
+#. module: sale
#: field:sale.order,company_id:0
#: field:sale.order.line,company_id:0
#: view:sale.report:0
@@ -1615,10 +1787,12 @@ msgid "The amount to be invoiced in advance."
msgstr "Il totale da fatturare in anticipo."
#. module: sale
-#: selection:sale.order,state:0
-#: selection:sale.report,state:0
-msgid "Invoice Exception"
-msgstr "Eccezione Fattura"
+#: code:addons/sale/sale.py:1256
+#, python-format
+msgid ""
+"Couldn't find a pricelist line matching this product and quantity.\n"
+"You have to change either the product, the quantity or the pricelist."
+msgstr ""
#. module: sale
#: help:sale.order,picking_ids:0
@@ -1627,15 +1801,6 @@ msgid ""
msgstr "Lista di prelievo generata per questo ordine di vendita."
#. module: sale
-#: help:sale.installer,sale_margin:0
-msgid ""
-"Gives the margin of profitability by calculating the difference between Unit "
-"Price and Cost Price."
-msgstr ""
-"Fornisce il margine di guadagno calcolando la differenza fra il prezzo "
-"unitario e il costo."
-
-#. module: sale
#: view:sale.make.invoice:0
#: view:sale.order.line.make.invoice:0
msgid "Create invoices"
@@ -1654,6 +1819,11 @@ msgid "Cancelled"
msgstr "Annullato"
#. module: sale
+#: view:sale.order.line:0
+msgid "Sales Order Lines related to a Sales Order of mine"
+msgstr ""
+
+#. module: sale
#: model:ir.actions.act_window,name:sale.action_shop_form
#: model:ir.ui.menu,name:sale.menu_action_shop_form
#: field:sale.order,shop_id:0
@@ -1663,17 +1833,12 @@ msgid "Shop"
msgstr "Negozio"
#. module: sale
-#: view:sale.report:0
-msgid " Month "
-msgstr " Mese "
-
-#. module: sale
#: field:sale.report,date_confirm:0
msgid "Date Confirm"
msgstr "Data conferma"
#. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:111
+#: code:addons/sale/wizard/sale_line_invoice.py:113
#, python-format
msgid "Warning"
msgstr "Attenzione"
@@ -1685,23 +1850,6 @@ msgid "Sales by Month"
msgstr "Vendite per Mese"
#. module: sale
-#: code:addons/sale/sale.py:1045
-#, python-format
-msgid ""
-"You selected a quantity of %d Units.\n"
-"But it's not compatible with the selected packaging.\n"
-"Here is a proposition of quantities according to the packaging:\n"
-"\n"
-"EAN: %s Quantity: %s Type of ul: %s"
-msgstr ""
-"È stata selezionata una quantità di %d unità.\n"
-"Questa quantita non è però compatibile con l'imballaggio selezionato.\n"
-"Viene mostrato di seguito un suggerimento che è compatibile con "
-"l'imballaggio:\n"
-"\n"
-"EAN: %s Quantità: %s Tipo di imballaggio: %s"
-
-#. module: sale
#: model:ir.model,name:sale.model_sale_order
#: model:process.node,name:sale.process_node_order0
#: model:process.node,name:sale.process_node_saleorder0
@@ -1717,6 +1865,11 @@ msgid "Quantity (UoS)"
msgstr "Quantità (Unità di Vendita)"
#. module: sale
+#: view:sale.order.line:0
+msgid "Sale Order Lines that are in 'done' state"
+msgstr ""
+
+#. module: sale
#: model:process.transition,note:sale.process_transition_packing0
msgid ""
"The Pick List form is created as soon as the sales order is confirmed, in "
@@ -1736,6 +1889,11 @@ msgid "Confirmed"
msgstr "Confermato"
#. module: sale
+#: field:sale.config.picking_policy,order_policy:0
+msgid "Main Method Based On"
+msgstr ""
+
+#. module: sale
#: model:process.transition.action,name:sale.process_transition_action_confirm0
msgid "Confirm"
msgstr "Conferma"
@@ -1758,6 +1916,7 @@ msgid "Invoice Lines"
msgstr "Righe Fattura"
#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_product_tree
#: view:sale.order:0
#: view:sale.order.line:0
msgid "Sales Order Lines"
@@ -1774,33 +1933,18 @@ msgid "Configuration"
msgstr "Configurazione"
#. module: sale
-#: selection:sale.order,picking_policy:0
-msgid "Complete Delivery"
-msgstr "Consegna totale"
+#: code:addons/sale/edi/sale_order.py:146
+#, python-format
+msgid "EDI Pricelist (%s)"
+msgstr ""
#. module: sale
#: view:sale.report:0
-msgid " Month-1 "
-msgstr " Mese-1 "
-
-#. module: sale
-#: help:sale.config.picking_policy,picking_policy:0
-msgid ""
-"The Shipping Policy is used to configure per order if you want to deliver as "
-"soon as possible when one product is available or you wait that all products "
-"are available.."
+msgid "Sales order created in current year"
msgstr ""
-"La politica di spedizione è utilizzata per stabilire se si vuole consegnare "
-"il prodotto non appena questo sia disponibile oppure aspettare che tutti i "
-"prodotti siano disponibili.."
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "August"
-msgstr "Agosto"
#. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:111
+#: code:addons/sale/wizard/sale_line_invoice.py:113
#, python-format
msgid ""
"Invoice cannot be created for this Sales Order Line due to one of the "
@@ -1814,6 +1958,11 @@ msgstr ""
"2. La linea dell'ordine di vendita è stata fatturata!"
#. module: sale
+#: view:sale.order.line:0
+msgid "Sale order lines done"
+msgstr ""
+
+#. module: sale
#: field:sale.order.line,th_weight:0
msgid "Weight"
msgstr "Peso"
@@ -1832,7 +1981,6 @@ msgstr "Dicembre"
#. module: sale
#: field:sale.config.picking_policy,config_logo:0
-#: field:sale.installer,config_logo:0
msgid "Image"
msgstr "Immagine"
@@ -1866,9 +2014,9 @@ msgid "Salesman"
msgstr "Venditore"
#. module: sale
-#: model:process.node,note:sale.process_node_saleorder0
-msgid "Drives procurement and invoicing"
-msgstr "Regola approvigionamenti e fatturazione"
+#: model:ir.actions.act_window,name:sale.action_order_tree
+msgid "Old Quotations"
+msgstr "Vecchi preventivi"
#. module: sale
#: field:sale.order,amount_untaxed:0
@@ -1876,7 +2024,7 @@ msgid "Untaxed Amount"
msgstr "Totale Imponibile"
#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:163
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:170
#: model:ir.actions.act_window,name:sale.action_view_sale_advance_payment_inv
#: view:sale.advance.payment.inv:0
#: view:sale.order:0
@@ -1885,7 +2033,7 @@ msgid "Advance Invoice"
msgstr "Fattura di acconto"
#. module: sale
-#: code:addons/sale/sale.py:591
+#: code:addons/sale/sale.py:624
#, python-format
msgid "The sales order '%s' has been cancelled."
msgstr "L'ordine di vendita '%s' è stato cancellato."
@@ -1930,20 +2078,20 @@ msgid "Packings"
msgstr "Imballaggi"
#. module: sale
-#: field:sale.config.picking_policy,progress:0
-#: field:sale.installer,progress:0
-msgid "Configuration Progress"
-msgstr "Processo di configurazione"
+#: view:sale.order.line:0
+msgid "Sale Order Lines ready to be invoiced"
+msgstr ""
#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_product_tree
-msgid "Product sales"
-msgstr "Vendite Prodotto"
+#: view:sale.report:0
+msgid "Sales order created in last month"
+msgstr ""
#. module: sale
-#: field:sale.order,date_order:0
-msgid "Ordered Date"
-msgstr "Data ordine"
+#: model:ir.actions.act_window,name:sale.action_email_templates
+#: model:ir.ui.menu,name:sale.menu_email_templates
+msgid "Email Templates"
+msgstr ""
#. module: sale
#: model:ir.actions.act_window,name:sale.action_order_form
@@ -1953,14 +2101,15 @@ msgid "Sales Orders"
msgstr "Ordini di Vendita"
#. module: sale
-#: selection:sale.config.picking_policy,picking_policy:0
-msgid "Direct Delivery"
-msgstr "Consegna Diretta"
+#: model:ir.model,name:sale.model_sale_shop
+#: view:sale.shop:0
+msgid "Sales Shop"
+msgstr "Negozio"
#. module: sale
-#: field:sale.installer,sale_journal:0
-msgid "Invoicing journals"
-msgstr "Registri fatturazione"
+#: selection:sale.report,month:0
+msgid "November"
+msgstr "Novembre"
#. module: sale
#: field:sale.advance.payment.inv,product_id:0
@@ -1968,18 +2117,12 @@ msgid "Advance Product"
msgstr "Acconto prodotto"
#. module: sale
-#: view:sale.report:0
-#: field:sale.report,shipped_qty_1:0
-msgid "Shipped Qty"
-msgstr "Q.tà spedita"
-
-#. module: sale
-#: view:sale.open.invoice:0
-msgid "You invoice has been successfully created!"
-msgstr "La fattura è stata generata correttamente!"
+#: view:sale.order:0
+msgid "Compute"
+msgstr "Calcola"
#. module: sale
-#: code:addons/sale/sale.py:585
+#: code:addons/sale/sale.py:618
#, python-format
msgid "You must first cancel all invoices attached to this sales order."
msgstr ""
@@ -1992,25 +2135,14 @@ msgid "January"
msgstr "Gennaio"
#. module: sale
-#: view:sale.installer:0
-msgid "Configure Your Sales Management Application"
-msgstr "Configura la propria applicazione di gestione vendite"
-
-#. module: sale
#: model:ir.actions.act_window,name:sale.action_order_tree4
msgid "Sales Order in Progress"
msgstr "Ordini di Vendita in esecuzione"
#. module: sale
-#: field:sale.installer,sale_layout:0
-msgid "Sales Order Layout Improvement"
-msgstr "Miglioramento del layout dell'ordine di vendita"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:63
-#, python-format
-msgid "Error"
-msgstr "Errore"
+#: help:sale.order,origin:0
+msgid "Reference of the document that generated this sales order request."
+msgstr "Riferimento del documento che ha creato questa richiesta d'ordine"
#. module: sale
#: view:sale.report:0
@@ -2019,6 +2151,11 @@ msgid "Commitment Delay"
msgstr "Ritardo"
#. module: sale
+#: selection:sale.order,order_policy:0
+msgid "Deliver & invoice on demand"
+msgstr ""
+
+#. module: sale
#: model:process.node,note:sale.process_node_saleprocurement0
msgid ""
"One Procurement order for each sales order line and for each of the "
@@ -2043,15 +2180,12 @@ msgid "Confirmed sales order to invoice."
msgstr "Ordine di vendita confermato da fatturare."
#. module: sale
-#: code:addons/sale/sale.py:290
-#, python-format
-msgid "Cannot delete Sales Order(s) which are already confirmed !"
+#: view:sale.order:0
+msgid "Sales Order that haven't yet been confirmed"
msgstr ""
-"Non è possibile cancellare lo(gli) ordine(i) di vendita che sono già stati "
-"confermati!"
#. module: sale
-#: code:addons/sale/sale.py:316
+#: code:addons/sale/sale.py:322
#, python-format
msgid "The sales order '%s' has been set in draft state."
msgstr "L'ordine di vendita '%s' è stato impostato nello stato bozza."
@@ -2062,37 +2196,27 @@ msgid "from stock"
msgstr "da Stock"
#. module: sale
-#: field:sale.config.picking_policy,order_policy:0
-msgid "Shipping Default Policy"
-msgstr "Politica di spedizione di default"
-
-#. module: sale
#: view:sale.open.invoice:0
msgid "Close"
msgstr "Chiudi"
#. module: sale
+#: code:addons/sale/sale.py:1248
+#, python-format
+msgid "No Pricelist ! : "
+msgstr ""
+
+#. module: sale
#: field:sale.order,shipped:0
msgid "Delivered"
msgstr "Consegnato"
#. module: sale
-#: code:addons/sale/sale.py:1115
-#, python-format
-msgid "Not enough stock !"
-msgstr "Sotto scorta!"
-
-#. module: sale
#: constraint:stock.move:0
msgid "You must assign a production lot for this product"
msgstr "È necessario assegnare un lotto di produzione per questo prodotto"
#. module: sale
-#: field:sale.order.line,sequence:0
-msgid "Layout Sequence"
-msgstr "Sequenza di layout"
-
-#. module: sale
#: model:ir.actions.act_window,help:sale.action_shop_form
msgid ""
"If you have more than one shop reselling your company products, you can "
@@ -2124,12 +2248,6 @@ msgid "May"
msgstr "Maggio"
#. module: sale
-#: help:sale.installer,sale_order_dates:0
-msgid "Adds commitment, requested and effective dates on Sales Orders."
-msgstr ""
-"Aggiunge impegni, richieste e date definitive agli ordini di vendita."
-
-#. module: sale
#: view:sale.order:0
#: field:sale.order,partner_id:0
#: field:sale.order.line,order_partner_id:0
@@ -2137,25 +2255,11 @@ msgid "Customer"
msgstr "Cliente"
#. module: sale
-#: model:product.template,name:sale.advance_product_0_product_template
-msgid "Advance"
-msgstr "Avanzamento"
-
-#. module: sale
#: selection:sale.report,month:0
msgid "February"
msgstr "Febbraio"
#. module: sale
-#: help:sale.installer,sale_journal:0
-msgid ""
-"Allows you to group and invoice your delivery orders according to different "
-"invoicing types: daily, weekly, etc."
-msgstr ""
-"Permette di raggruppare e fatturare i propri ordini di consegna in accordo "
-"con le differenti tipologie di fatturazione: giornaliere, settimanali, etc."
-
-#. module: sale
#: selection:sale.report,month:0
msgid "April"
msgstr "Aprile"
@@ -2166,11 +2270,6 @@ msgid "Accounting"
msgstr "Contabilità"
#. module: sale
-#: field:sale.config.picking_policy,step:0
-msgid "Steps To Deliver a Sales Order"
-msgstr "Passi per emettere un ordine di vendita"
-
-#. module: sale
#: view:sale.order:0
#: view:sale.order.line:0
msgid "Search Sales Order"
@@ -2182,20 +2281,18 @@ msgid "Sales Order Requisition"
msgstr "Richiesta ordine di vendita"
#. module: sale
+#: code:addons/sale/sale.py:1242
+#, python-format
+msgid "Not enough stock ! : "
+msgstr ""
+
+#. module: sale
#: report:sale.order:0
#: field:sale.order,payment_term:0
msgid "Payment Term"
msgstr "Termini di pagamento"
#. module: sale
-#: help:sale.installer,sale_layout:0
-msgid ""
-"Provides some features to improve the layout of the Sales Order reports."
-msgstr ""
-"Fornisce alcune funzionalità per migliorare il layout dei report degli "
-"ordini di vendita"
-
-#. module: sale
#: model:ir.actions.act_window,help:sale.action_order_report_all
msgid ""
"This report performs analysis on your quotations and sales orders. Analysis "
@@ -2251,6 +2348,12 @@ msgstr "Fattura basata su Consegne"
#~ "organizzerà il modo più comune e semplice per consegnare prodotti ai clienti "
#~ "con una o due operazioni dell'operatore."
+#~ msgid "Complete Delivery"
+#~ msgstr "Consegna totale"
+
+#~ msgid "Partial Delivery"
+#~ msgstr "Consegna parziale"
+
#~ msgid "Recreate Procurement"
#~ msgstr "Ricrea Approvvigionamento"
@@ -2288,6 +2391,9 @@ msgstr "Fattura basata su Consegne"
#~ msgid "Reference"
#~ msgstr "Riferimento"
+#~ msgid "All at Once"
+#~ msgstr "Tutto in una volta"
+
#~ msgid "Procurement is created after confirmation of sale order."
#~ msgstr "L'approvvigionamento è creato dopo la conferma di vendita ordine."
@@ -2384,9 +2490,6 @@ msgstr "Fattura basata su Consegne"
#~ msgid "Procurement for each line"
#~ msgstr "Approvvigionamento per ogni riga"
-#~ msgid "My Quotations"
-#~ msgstr "I Miei Preventivi"
-
#~ msgid "Packing Default Policy"
#~ msgstr "Politica standard di ordine consegna"
@@ -2418,6 +2521,9 @@ msgstr "Fattura basata su Consegne"
#~ msgid "Procurement Corrected"
#~ msgstr "Approvvigionamento corretto"
+#~ msgid "Shipping & Manual Invoice"
+#~ msgstr "Spedizione & Fatturazione Manuale"
+
#~ msgid "Sale Procurement"
#~ msgstr "Vendita appalti"
@@ -2430,6 +2536,9 @@ msgstr "Fattura basata su Consegne"
#~ msgid "Packing Policy"
#~ msgstr "Politiche Preparazione Merci"
+#~ msgid "Product sales"
+#~ msgstr "Vendite Prodotto"
+
#~ msgid "Our Salesman"
#~ msgstr "Il Nostro Venditore"
@@ -2445,6 +2554,9 @@ msgstr "Fattura basata su Consegne"
#~ msgid "Sale Pricelists"
#~ msgstr "Listino prezzo vendita"
+#~ msgid "Direct Delivery"
+#~ msgstr "Consegna Diretta"
+
#~ msgid ""
#~ "Invoice is created when 'Create Invoice' is being clicked after confirming "
#~ "the sale order. This transaction moves the sale order to invoices."
@@ -2557,6 +2669,9 @@ msgstr "Fattura basata su Consegne"
#~ msgid "Related invoices"
#~ msgstr "Fatture correlate"
+#~ msgid "Payment Before Delivery"
+#~ msgstr "Pagamento prima della consegna"
+
#~ msgid ""
#~ "This is the list of invoices that have been generated for this sale order. "
#~ "The same sale order may have been invoiced in several times (by line for "
@@ -2581,6 +2696,9 @@ msgstr "Fattura basata su Consegne"
#~ msgid "Sales Process"
#~ msgstr "Processo di vendita"
+#~ msgid "Sales Management"
+#~ msgstr "Gestione Vendite"
+
#~ msgid "Invalid model name in the action definition."
#~ msgstr "Nome del modulo non valido nella definizione dell'azione."
@@ -2599,9 +2717,284 @@ msgstr "Fattura basata su Consegne"
#~ msgid "Payment Accounts"
#~ msgstr "Conto per Pagamenti"
+#~ msgid "Shipping Default Policy"
+#~ msgstr "Politica di spedizione di default"
+
#~ msgid "Steps To Deliver a Sale Order"
#~ msgstr "Procedura per consegnare un ordine di vendita"
#~ msgid ""
+#~ "By default, OpenERP is able to manage complex routing and paths of products "
+#~ "in your warehouse and partner locations. This will configure the most common "
+#~ "and simple methods to deliver products to the customer in one or two "
+#~ "operations by the worker."
+#~ msgstr ""
+#~ "Di default, OpenERP è in grado di gestire un routing complesso per i "
+#~ "prodotti del magazzino e dei punti di stoccaggio del partner. Questo "
+#~ "configurerà i metodi più comuni e semplici per consegnare i prodotti al "
+#~ "cliente, tramite un paio di operazioni dell'utente."
+
+#~ msgid "Delivery Order Only"
+#~ msgstr "Solamente ordine di consegna"
+
+#~ msgid "Invoicing"
+#~ msgstr "Fatturazione"
+
+#~ msgid "Order date"
+#~ msgstr "Data dell'ordine"
+
+#~ msgid "Ordered Date"
+#~ msgstr "Data ordine"
+
+#~ msgid "Picking Default Policy"
+#~ msgstr "Politica di prelievo di default"
+
+#~ msgid "Picking List & Delivery Order"
+#~ msgstr "DDT & Ordine di consegna"
+
+#~ msgid ""
+#~ "The Shipping Policy is used to configure per order if you want to deliver as "
+#~ "soon as possible when one product is available or you wait that all products "
+#~ "are available.."
+#~ msgstr ""
+#~ "La politica di spedizione è utilizzata per stabilire se si vuole consegnare "
+#~ "il prodotto non appena questo sia disponibile oppure aspettare che tutti i "
+#~ "prodotti siano disponibili.."
+
+#~ msgid "Shipping Policy"
+#~ msgstr "Politica di Spedizione"
+
+#~ msgid ""
#~ "This is the list of picking list that have been generated for this invoice"
#~ msgstr "Questa è la lista di DDT generati per questa Fattura"
+
+#~ msgid "Allows you to compute delivery costs on your quotations."
+#~ msgstr "Permette di calcolare i costi di consegna sul preventivo."
+
+#~ msgid "Configure Sales Order Logistics"
+#~ msgstr "(?)Configura la logistica dell'ordine di vendita"
+
+#~ msgid "Configure Picking Policy for Sales Order"
+#~ msgstr "Configura il metodo di approvvigionamento per l'ordine di vendita"
+
+#~ msgid ""
+#~ "The Shipping Policy is used to synchronise invoice and delivery operations.\n"
+#~ " - The 'Pay Before delivery' choice will first generate the invoice and "
+#~ "then generate the picking order after the payment of this invoice.\n"
+#~ " - The 'Shipping & Manual Invoice' will create the picking order directly "
+#~ "and wait for the user to manually click on the 'Invoice' button to generate "
+#~ "the draft invoice.\n"
+#~ " - The 'Invoice On Order After Delivery' choice will generate the draft "
+#~ "invoice based on sales order after all picking lists have been finished.\n"
+#~ " - The 'Invoice From The Picking' choice is used to create an invoice "
+#~ "during the picking process."
+#~ msgstr ""
+#~ "Il metodo di spedizione viene utilizzato per sincronizzare fatture ed "
+#~ "operazioni di consegna.\n"
+#~ " - Selezionando 'Pagamento prima della consegna' verrà prima generata la "
+#~ "fattura e quindi, dopo il pagamento della stessa, l'ordine di magazzino "
+#~ "associato.\n"
+#~ " - Selezionando 'Spedizione e fatturazione manuale' verrà generato "
+#~ "direttamente l'ordine di magazzino, mentre è necessario che l'utente generi "
+#~ "manualmente la fattura in stato bozza premendo sul tasto 'Fattura'.\n"
+#~ " - Selezionando invece 'Fattura su ordine dopo la consegna' verrà generata "
+#~ "una fattura in bozza basata sull'ordine di vendita, non appena tutte le "
+#~ "linee di prelievo sono state lavorate.\n"
+#~ " - Selezionando infine 'Fattura da prelievo' è possibile creare una fattura "
+#~ "contestualmente al processo di prelievo delle merci."
+
+#~ msgid "Configure"
+#~ msgstr "Configura"
+
+#~ msgid "Enhance your core Sales Application with additional functionalities."
+#~ msgstr ""
+#~ "Migliora le funzionalità di base dell'applicazione di vendita con delle "
+#~ "funzionalità aggiuntive."
+
+#~ msgid "Setup your sales workflow and default values."
+#~ msgstr "Setup del workflow di vendita e dei valori di default."
+
+#~ msgid "Invoice On Order After Delivery"
+#~ msgstr "Fattura su ordine dopo la consegna"
+
+#~ msgid " Year "
+#~ msgstr " Anno "
+
+#~ msgid ""
+#~ "\n"
+#~ " The base module to manage quotations and sales orders.\n"
+#~ "\n"
+#~ " * Workflow with validation steps:\n"
+#~ " - Quotation -> Sales order -> Invoice\n"
+#~ " * Invoicing methods:\n"
+#~ " - Invoice on order (before or after shipping)\n"
+#~ " - Invoice on delivery\n"
+#~ " - Invoice on timesheets\n"
+#~ " - Advance invoice\n"
+#~ " * Partners preferences (shipping, invoicing, incoterm, ...)\n"
+#~ " * Products stocks and prices\n"
+#~ " * Delivery methods:\n"
+#~ " - all at once, multi-parcel\n"
+#~ " - delivery costs\n"
+#~ " * Dashboard for salesman that includes:\n"
+#~ " * Your open quotations\n"
+#~ " * Top 10 sales of the month\n"
+#~ " * Cases statistics\n"
+#~ " * Graph of sales by product\n"
+#~ " * Graph of cases of the month\n"
+#~ " "
+#~ msgstr ""
+#~ "\n"
+#~ " Il modulo base per gestire preventivi e ordini di vendita.\n"
+#~ "\n"
+#~ " * Workflow con passi di validazione:\n"
+#~ " - Preventivo -> Ordine di vendita -> Fattura\n"
+#~ " * Metodi di fatturazione:\n"
+#~ " - Fattura su ordine (prima o dopo la consegna)\n"
+#~ " - Fattura su consegna\n"
+#~ " - Fattura su timesheet\n"
+#~ " - Anticipo fattura\n"
+#~ " * Preferenze del partner (spedizione, fatturazione, incoterm, ...)\n"
+#~ " * Scorte prodotti e prezzi\n"
+#~ " * Metodi di spedizione:\n"
+#~ " - tutto in una volta, multi-partita\n"
+#~ " - costi di spedizione\n"
+#~ " * Dashboard venditore che include:\n"
+#~ " * I propri preventivi\n"
+#~ " * Top 10 delle vendite del mese\n"
+#~ " * Statistiche dei casi di vendita\n"
+#~ " * Grafici delle vendite per prodotto\n"
+#~ " * Grafici dei casi del mese\n"
+#~ " "
+
+#, python-format
+#~ msgid "You cannot cancel a sales order line that has already been invoiced !"
+#~ msgstr ""
+#~ "Non è possibile cancellare una riga di ordine di vendita che è stata già "
+#~ "fatturata!"
+
+#~ msgid "Sales Order Dates"
+#~ msgstr "Date ordine di vendita"
+
+#~ msgid "Margins in Sales Orders"
+#~ msgstr "Margini degli ordini di vendita"
+
+#~ msgid "Sales Application Configuration"
+#~ msgstr "Configurazione applicazione di vendita"
+
+#~ msgid "Delivery Costs"
+#~ msgstr "Costi di consegna"
+
+#~ msgid "title"
+#~ msgstr "titolo"
+
+#, python-format
+#~ msgid "Picking Information !"
+#~ msgstr "Informazioni prelievo!"
+
+#~ msgid "Invoice From The Picking"
+#~ msgstr "Fattura da prelievo"
+
+#~ msgid "sale.installer"
+#~ msgstr "sale.installer"
+
+#~ msgid ""
+#~ "Gives the state of the quotation or sales order. \n"
+#~ "The exception state is automatically set when a cancel operation occurs in "
+#~ "the invoice validation (Invoice Exception) or in the picking list process "
+#~ "(Shipping Exception). \n"
+#~ "The 'Waiting Schedule' state is set when the invoice is confirmed but "
+#~ "waiting for the scheduler to run on the date 'Ordered Date'."
+#~ msgstr ""
+#~ "Stato del preventivo o dell'ordine di vendita. \n"
+#~ "Lo stato di eccezione viene impostato automaticamente quando interviene "
+#~ "un'operazione di cancellazione durante la sua validazione (Eccezione "
+#~ "fattura) oppure nel processo di lista prelievo (Eccezione spedizione). \n"
+#~ "Lo stato 'In attesa data programmazione' viene impostato quando la fattura "
+#~ "viene confermata ma è ancora in attesa della data programmata 'Data Ordine'."
+
+#, python-format
+#~ msgid "Cannot delete a sales order line which is %s !"
+#~ msgstr "Non è possibile cancellare una linea di ordine di vendita che è %s!"
+
+#~ msgid ""
+#~ "Gives the margin of profitability by calculating the difference between Unit "
+#~ "Price and Cost Price."
+#~ msgstr ""
+#~ "Fornisce il margine di guadagno calcolando la differenza fra il prezzo "
+#~ "unitario e il costo."
+
+#~ msgid " Month "
+#~ msgstr " Mese "
+
+#, python-format
+#~ msgid ""
+#~ "You selected a quantity of %d Units.\n"
+#~ "But it's not compatible with the selected packaging.\n"
+#~ "Here is a proposition of quantities according to the packaging:\n"
+#~ "\n"
+#~ "EAN: %s Quantity: %s Type of ul: %s"
+#~ msgstr ""
+#~ "È stata selezionata una quantità di %d unità.\n"
+#~ "Questa quantita non è però compatibile con l'imballaggio selezionato.\n"
+#~ "Viene mostrato di seguito un suggerimento che è compatibile con "
+#~ "l'imballaggio:\n"
+#~ "\n"
+#~ "EAN: %s Quantità: %s Tipo di imballaggio: %s"
+
+#~ msgid " Month-1 "
+#~ msgstr " Mese-1 "
+
+#~ msgid "Configuration Progress"
+#~ msgstr "Processo di configurazione"
+
+#~ msgid "Invoicing journals"
+#~ msgstr "Registri fatturazione"
+
+#~ msgid "Shipped Qty"
+#~ msgstr "Q.tà spedita"
+
+#~ msgid "Configure Your Sales Management Application"
+#~ msgstr "Configura la propria applicazione di gestione vendite"
+
+#~ msgid "Sales Order Layout Improvement"
+#~ msgstr "Miglioramento del layout dell'ordine di vendita"
+
+#, python-format
+#~ msgid "Cannot delete Sales Order(s) which are already confirmed !"
+#~ msgstr ""
+#~ "Non è possibile cancellare lo(gli) ordine(i) di vendita che sono già stati "
+#~ "confermati!"
+
+#, python-format
+#~ msgid "Not enough stock !"
+#~ msgstr "Sotto scorta!"
+
+#~ msgid "Layout Sequence"
+#~ msgstr "Sequenza di layout"
+
+#~ msgid "Adds commitment, requested and effective dates on Sales Orders."
+#~ msgstr ""
+#~ "Aggiunge impegni, richieste e date definitive agli ordini di vendita."
+
+#~ msgid ""
+#~ "Allows you to group and invoice your delivery orders according to different "
+#~ "invoicing types: daily, weekly, etc."
+#~ msgstr ""
+#~ "Permette di raggruppare e fatturare i propri ordini di consegna in accordo "
+#~ "con le differenti tipologie di fatturazione: giornaliere, settimanali, etc."
+
+#~ msgid "Steps To Deliver a Sales Order"
+#~ msgstr "Passi per emettere un ordine di vendita"
+
+#~ msgid ""
+#~ "Provides some features to improve the layout of the Sales Order reports."
+#~ msgstr ""
+#~ "Fornisce alcune funzionalità per migliorare il layout dei report degli "
+#~ "ordini di vendita"
+
+#~ msgid "Order Reference must be unique !"
+#~ msgstr "Il riferimento ordine deve essere unico!"
+
+#~ msgid "Advance"
+#~ msgstr "Avanzamento"
diff --git a/addons/sale/i18n/ko.po b/addons/sale/i18n/ko.po
index fbec57e8670..516f2a05889 100644
--- a/addons/sale/i18n/ko.po
+++ b/addons/sale/i18n/ko.po
@@ -7,25 +7,32 @@ msgid ""
msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-01-11 11:16+0000\n"
+"POT-Creation-Date: 2011-12-22 18:43+0000\n"
"PO-Revision-Date: 2010-12-15 21:56+0000\n"
"Last-Translator: ekodaq <ceo@ekosdaq.com>\n"
"Language-Team: Korean <ko@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-05 05:16+0000\n"
-"X-Generator: Launchpad (build 14231)\n"
+"X-Launchpad-Export-Date: 2011-12-23 06:46+0000\n"
+"X-Generator: Launchpad (build 14560)\n"
#. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_sales_by_salesman
-msgid "Sales by Salesman in last 90 days"
+#: field:sale.config.picking_policy,timesheet:0
+msgid "Based on Timesheet"
msgstr ""
#. module: sale
-#: help:sale.installer,delivery:0
-msgid "Allows you to compute delivery costs on your quotations."
+#: view:sale.order.line:0
+msgid ""
+"Sale Order Lines that are confirmed, done or in exception state and haven't "
+"yet been invoiced"
+msgstr ""
+
+#. module: sale
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_sales_by_salesman
+msgid "Sales by Salesman in last 90 days"
msgstr ""
#. module: sale
@@ -36,6 +43,11 @@ msgid ""
msgstr ""
#. module: sale
+#: view:sale.order:0
+msgid "UoS"
+msgstr ""
+
+#. module: sale
#: help:sale.order,partner_shipping_id:0
msgid "Shipping address for current sales order."
msgstr ""
@@ -59,22 +71,12 @@ msgid "Cancel Order"
msgstr "주문 취소"
#. module: sale
-#: view:sale.config.picking_policy:0
-msgid "Configure Sales Order Logistics"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:603
+#: code:addons/sale/sale.py:638
#, python-format
msgid "The quotation '%s' has been converted to a sales order."
msgstr ""
#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Payment Before Delivery"
-msgstr "배송 전 결제"
-
-#. module: sale
#: code:addons/sale/wizard/sale_make_invoice.py:42
#, python-format
msgid "Warning !"
@@ -91,12 +93,6 @@ msgid "Drives procurement orders for every sales order line."
msgstr ""
#. module: sale
-#: selection:sale.config.picking_policy,picking_policy:0
-msgid "All at Once"
-msgstr "일괄처리"
-
-#. module: sale
-#: field:sale.order,project_id:0
#: view:sale.report:0
#: field:sale.report,analytic_account_id:0
#: field:sale.shop,project_id:0
@@ -112,6 +108,15 @@ msgid ""
msgstr ""
#. module: sale
+#: code:addons/sale/sale.py:295
+#, python-format
+msgid ""
+"In order to delete a confirmed sale order, you must cancel it before ! To "
+"cancel a sale order, you must first cancel related picking or delivery "
+"orders."
+msgstr ""
+
+#. module: sale
#: model:process.node,name:sale.process_node_saleprocurement0
msgid "Procurement Order"
msgstr ""
@@ -123,6 +128,11 @@ msgid "Partner"
msgstr ""
#. module: sale
+#: selection:sale.order,order_policy:0
+msgid "Invoice based on deliveries"
+msgstr ""
+
+#. module: sale
#: view:sale.order:0
msgid "Order Line"
msgstr "주문 라인"
@@ -155,8 +165,13 @@ msgid "Default Payment Term"
msgstr "디폴트 결제 조건"
#. module: sale
-#: model:ir.actions.act_window,name:sale.action_config_picking_policy
-msgid "Configure Picking Policy for Sales Order"
+#: field:sale.config.picking_policy,deli_orders:0
+msgid "Based on Delivery Orders"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.picking_policy,time_unit:0
+msgid "Main Working Time Unit"
msgstr ""
#. module: sale
@@ -173,9 +188,10 @@ msgid "Disc.(%)"
msgstr "Disc.(%)"
#. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_forceassignation0
-msgid "Force Assignation"
-msgstr "할당"
+#: view:sale.report:0
+#: field:sale.report,price_total:0
+msgid "Total Price"
+msgstr ""
#. module: sale
#: help:sale.make.invoice,grouped:0
@@ -183,6 +199,11 @@ msgid "Check the box to group the invoices for the same customers"
msgstr ""
#. module: sale
+#: view:sale.order:0
+msgid "My Sale Orders"
+msgstr ""
+
+#. module: sale
#: selection:sale.order,invoice_quantity:0
msgid "Ordered Quantities"
msgstr "주문된 수량"
@@ -221,13 +242,24 @@ msgid ""
msgstr ""
#. module: sale
+#: field:sale.config.picking_policy,task_work:0
+msgid "Based on Tasks' Work"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
+msgid "Quotations and Sales"
+msgstr ""
+
+#. module: sale
#: model:ir.model,name:sale.model_sale_make_invoice
msgid "Sales Make Invoice"
msgstr ""
#. module: sale
-#: view:sale.order:0
-msgid "Recreate Packing"
+#: code:addons/sale/sale.py:330
+#, python-format
+msgid "Pricelist Warning!"
msgstr ""
#. module: sale
@@ -236,10 +268,10 @@ msgid "Discount (%)"
msgstr "할인 (%)"
#. module: sale
-#: help:res.company,security_lead:0
-msgid ""
-"This is the days added to what you promise to customers for security purpose"
-msgstr ""
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_quotation_for_sale
+msgid "My Quotations"
+msgstr "내 견적"
#. module: sale
#: view:board.board:0
@@ -264,7 +296,22 @@ msgid "Shop Name"
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:1014
+#: help:sale.order,order_policy:0
+msgid ""
+"The Invoice Policy is used to synchronise invoice and delivery operations.\n"
+" - The 'Pay before delivery' choice will first generate the invoice and "
+"then generate the picking order after the payment of this invoice.\n"
+" - The 'Deliver & Invoice on demand' will create the picking order directly "
+"and wait for the user to manually click on the 'Invoice' button to generate "
+"the draft invoice based on the sale order or the sale order lines.\n"
+" - The 'Invoice on order after delivery' choice will generate the draft "
+"invoice based on sales order after all picking lists have been finished.\n"
+" - The 'Invoice based on deliveries' choice is used to create an invoice "
+"during the picking process."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:1158
#, python-format
msgid "No Customer Defined !"
msgstr ""
@@ -275,9 +322,12 @@ msgid "Sales in Exception"
msgstr "예외적 판매"
#. module: sale
-#: view:sale.order:0
-msgid "Set to Draft"
-msgstr "초안으로 설정"
+#: code:addons/sale/sale.py:1145
+#: code:addons/sale/sale.py:1264
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:70
+#, python-format
+msgid "Configuration Error !"
+msgstr ""
#. module: sale
#: view:sale.order:0
@@ -285,22 +335,7 @@ msgid "Conditions"
msgstr ""
#. module: sale
-#: help:sale.order,order_policy:0
-msgid ""
-"The Shipping Policy is used to synchronise invoice and delivery operations.\n"
-" - The 'Pay Before delivery' choice will first generate the invoice and "
-"then generate the picking order after the payment of this invoice.\n"
-" - The 'Shipping & Manual Invoice' will create the picking order directly "
-"and wait for the user to manually click on the 'Invoice' button to generate "
-"the draft invoice.\n"
-" - The 'Invoice On Order After Delivery' choice will generate the draft "
-"invoice based on sales order after all picking lists have been finished.\n"
-" - The 'Invoice From The Picking' choice is used to create an invoice "
-"during the picking process."
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:939
+#: code:addons/sale/sale.py:1034
#, python-format
msgid ""
"There is no income category account defined in default Properties for "
@@ -308,8 +343,8 @@ msgid ""
msgstr ""
#. module: sale
-#: view:sale.installer:0
-msgid "Configure"
+#: selection:sale.report,month:0
+msgid "August"
msgstr ""
#. module: sale
@@ -318,7 +353,7 @@ msgid "You try to assign a lot which is not from the same product"
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:620
+#: code:addons/sale/sale.py:655
#, python-format
msgid "invalid mode for test_state"
msgstr "test_state에 유효하지 않은 모드"
@@ -329,7 +364,7 @@ msgid "June"
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:584
+#: code:addons/sale/sale.py:617
#, python-format
msgid "Could not cancel this sales order !"
msgstr ""
@@ -350,8 +385,12 @@ msgid "October"
msgstr ""
#. module: sale
+#: sql_constraint:stock.picking:0
+msgid "Reference must be unique per Company!"
+msgstr ""
+
+#. module: sale
#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_quotation_for_sale
#: view:sale.order:0
#: view:sale.report:0
msgid "Quotations"
@@ -363,11 +402,6 @@ msgid "Pricelist for current sales order."
msgstr ""
#. module: sale
-#: selection:sale.config.picking_policy,step:0
-msgid "Delivery Order Only"
-msgstr "배송주문 만"
-
-#. module: sale
#: report:sale.order:0
msgid "TVA :"
msgstr "TVA:"
@@ -392,6 +426,7 @@ msgstr "회계 포지션"
#. module: sale
#: view:sale.order:0
#: view:sale.order.line:0
+#: field:sale.report,product_uom:0
msgid "UoM"
msgstr "UoM"
@@ -414,13 +449,19 @@ msgid ""
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:971
+#: code:addons/sale/sale.py:1061
+#, python-format
+msgid "You cannot cancel a sale order line that has already been invoiced!"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:1066
#, python-format
msgid "You must first cancel stock moves attached to this sales order line."
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:1042
+#: code:addons/sale/sale.py:1134
#, python-format
msgid "(n/a)"
msgstr ""
@@ -454,13 +495,35 @@ msgid "Notes"
msgstr "노트"
#. module: sale
+#: sql_constraint:res.company:0
+msgid "The company name must be unique !"
+msgstr ""
+
+#. module: sale
#: help:sale.order,partner_invoice_id:0
msgid "Invoice address for current sales order."
msgstr ""
#. module: sale
-#: view:sale.installer:0
-msgid "Enhance your core Sales Application with additional functionalities."
+#: view:sale.report:0
+msgid "Month-1"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered month of the sales order"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:504
+#, python-format
+msgid ""
+"You cannot group sales having different currencies for the same partner."
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,picking_policy:0
+msgid "Deliver each product when available"
msgstr ""
#. module: sale
@@ -480,18 +543,40 @@ msgid "Confirmation Date"
msgstr ""
#. module: sale
+#: field:sale.order,incoterm:0
+msgid "Incoterm"
+msgstr "인코텀"
+
+#. module: sale
#: field:sale.order.line,address_allotment_id:0
msgid "Allotment Partner"
msgstr "Allotment 파트너"
#. module: sale
-#: sql_constraint:sale.order:0
-msgid "Order Reference must be unique !"
+#: selection:sale.report,month:0
+msgid "March"
msgstr ""
#. module: sale
-#: selection:sale.report,month:0
-msgid "March"
+#: constraint:stock.move:0
+msgid "You can not move products from or to a location of the type view."
+msgstr ""
+
+#. module: sale
+#: field:sale.config.picking_policy,sale_orders:0
+msgid "Based on Sales Orders"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,state:0
+msgid ""
+"Givwizard = self.browse(cr, uid, ids)[0]es the state of the quotation or "
+"sales order. \n"
+"The exception state is automatically set when a cancel operation occurs in "
+"the invoice validation (Invoice Exception) or in the picking list process "
+"(Shipping Exception). \n"
+"The 'Waiting Schedule' state is set when the invoice is confirmed but "
+"waiting for the scheduler to run on the order date."
msgstr ""
#. module: sale
@@ -510,6 +595,11 @@ msgid "Invoice address :"
msgstr "인보이스 주소:"
#. module: sale
+#: field:sale.order.line,sequence:0
+msgid "Line Sequence"
+msgstr ""
+
+#. module: sale
#: model:process.transition,note:sale.process_transition_saleorderprocurement0
msgid ""
"For every sales order line, a procurement order is created to supply the "
@@ -556,11 +646,6 @@ msgid "Sales Order Line"
msgstr ""
#. module: sale
-#: view:sale.config.picking_policy:0
-msgid "Setup your sales workflow and default values."
-msgstr ""
-
-#. module: sale
#: field:sale.shop,warehouse_id:0
msgid "Warehouse"
msgstr "창고"
@@ -597,6 +682,11 @@ msgid "Creation Date"
msgstr ""
#. module: sale
+#: model:ir.ui.menu,name:sale.menu_sales_configuration_misc
+msgid "Miscellaneous"
+msgstr ""
+
+#. module: sale
#: model:ir.actions.act_window,name:sale.action_order_line_tree3
msgid "Uninvoiced and Delivered Lines"
msgstr "인보이스되지 않고 배송된 라인들"
@@ -612,14 +702,19 @@ msgid "My Sales"
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:290
-#: code:addons/sale/sale.py:966
-#: code:addons/sale/sale.py:1165
+#: code:addons/sale/sale.py:295
+#: code:addons/sale/sale.py:1061
+#: code:addons/sale/sale.py:1290
#, python-format
msgid "Invalid action !"
msgstr "유효하지 않은 액션 !"
#. module: sale
+#: view:sale.order:0
+msgid "Extra Info"
+msgstr "기타 정보"
+
+#. module: sale
#: field:sale.order,pricelist_id:0
#: field:sale.report,pricelist_id:0
#: field:sale.shop,pricelist_id:0
@@ -633,13 +728,21 @@ msgid "# of Qty"
msgstr ""
#. module: sale
+#: code:addons/sale/sale.py:1314
+#, python-format
+msgid "Hour"
+msgstr ""
+
+#. module: sale
#: view:sale.order:0
msgid "Order Date"
msgstr ""
#. module: sale
#: view:sale.order.line:0
+#: view:sale.report:0
#: field:sale.report,shipped:0
+#: field:sale.report,shipped_qty_1:0
msgid "Shipped"
msgstr ""
@@ -649,8 +752,8 @@ msgid "All Quotations"
msgstr "모든 견적들"
#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Invoice On Order After Delivery"
+#: view:sale.config.picking_policy:0
+msgid "Options"
msgstr ""
#. module: sale
@@ -659,6 +762,20 @@ msgid "September"
msgstr ""
#. module: sale
+#: code:addons/sale/sale.py:632
+#, python-format
+msgid "You cannot confirm a sale order which has no line."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:1246
+#, python-format
+msgid ""
+"You have to select a pricelist or a customer in the sales form !\n"
+"Please set one before choosing a product."
+msgstr ""
+
+#. module: sale
#: view:sale.report:0
#: field:sale.report,categ_id:0
msgid "Category of Product"
@@ -675,11 +792,6 @@ msgid "Stock Moves"
msgstr "스톡 이동"
#. module: sale
-#: view:sale.report:0
-msgid " Year "
-msgstr ""
-
-#. module: sale
#: field:sale.order,state:0
#: field:sale.report,state:0
msgid "Order State"
@@ -697,7 +809,7 @@ msgid "Sales By Month"
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:970
+#: code:addons/sale/sale.py:1065
#, python-format
msgid "Could not cancel sales order line!"
msgstr ""
@@ -730,42 +842,19 @@ msgid ""
msgstr ""
#. module: sale
-#: view:sale.report:0
-msgid "Extended Filters..."
+#: field:sale.order,date_order:0
+msgid "Date"
msgstr ""
#. module: sale
-#: model:ir.module.module,description:sale.module_meta_information
-msgid ""
-"\n"
-" The base module to manage quotations and sales orders.\n"
-"\n"
-" * Workflow with validation steps:\n"
-" - Quotation -> Sales order -> Invoice\n"
-" * Invoicing methods:\n"
-" - Invoice on order (before or after shipping)\n"
-" - Invoice on delivery\n"
-" - Invoice on timesheets\n"
-" - Advance invoice\n"
-" * Partners preferences (shipping, invoicing, incoterm, ...)\n"
-" * Products stocks and prices\n"
-" * Delivery methods:\n"
-" - all at once, multi-parcel\n"
-" - delivery costs\n"
-" * Dashboard for salesman that includes:\n"
-" * Your open quotations\n"
-" * Top 10 sales of the month\n"
-" * Cases statistics\n"
-" * Graph of sales by product\n"
-" * Graph of cases of the month\n"
-" "
+#: view:sale.report:0
+msgid "Extended Filters..."
msgstr ""
#. module: sale
-#: model:ir.model,name:sale.model_sale_shop
-#: view:sale.shop:0
-msgid "Sales Shop"
-msgstr ""
+#: selection:sale.order.line,state:0
+msgid "Exception"
+msgstr "예외"
#. module: sale
#: model:ir.model,name:sale.model_res_company
@@ -773,8 +862,9 @@ msgid "Companies"
msgstr ""
#. module: sale
-#: selection:sale.report,month:0
-msgid "November"
+#: code:addons/sale/sale.py:1259
+#, python-format
+msgid "No valid pricelist line found ! :"
msgstr ""
#. module: sale
@@ -783,8 +873,8 @@ msgid "History"
msgstr "히스토리"
#. module: sale
-#: field:sale.config.picking_policy,picking_policy:0
-msgid "Picking Default Policy"
+#: selection:sale.order,order_policy:0
+msgid "Invoice on order after delivery"
msgstr ""
#. module: sale
@@ -807,13 +897,12 @@ msgid ""
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:966
-#, python-format
-msgid "You cannot cancel a sales order line that has already been invoiced !"
+#: help:res.company,security_lead:0
+msgid ""
+"This is the days added to what you promise to customers for security purpose"
msgstr ""
#. module: sale
-#: view:sale.order:0
#: view:sale.order.line:0
msgid "Qty"
msgstr "수량"
@@ -824,6 +913,11 @@ msgid "References"
msgstr ""
#. module: sale
+#: view:sale.order.line:0
+msgid "My Sales Order Lines"
+msgstr ""
+
+#. module: sale
#: model:process.transition.action,name:sale.process_transition_action_cancel0
#: model:process.transition.action,name:sale.process_transition_action_cancel1
#: model:process.transition.action,name:sale.process_transition_action_cancel2
@@ -835,16 +929,11 @@ msgid "Cancel"
msgstr "취소"
#. module: sale
-#: field:sale.installer,sale_order_dates:0
-msgid "Sales Order Dates"
+#: sql_constraint:sale.order:0
+msgid "Order Reference must be unique per Company!"
msgstr ""
#. module: sale
-#: selection:sale.order.line,state:0
-msgid "Exception"
-msgstr "예외"
-
-#. module: sale
#: model:process.transition,name:sale.process_transition_invoice0
#: model:process.transition,name:sale.process_transition_invoiceafterdelivery0
#: model:process.transition.action,name:sale.process_transition_action_createinvoice0
@@ -854,19 +943,19 @@ msgid "Create Invoice"
msgstr "인보이스 생성"
#. module: sale
-#: field:sale.installer,sale_margin:0
-msgid "Margins in Sales Orders"
+#: view:sale.order:0
+msgid "Total Tax Excluded"
msgstr ""
#. module: sale
-#: view:sale.order:0
-msgid "Total Tax Excluded"
+#: view:sale.order.line:0
+msgid "Order reference"
msgstr ""
#. module: sale
-#: view:sale.order:0
-msgid "Compute"
-msgstr "계산"
+#: view:sale.open.invoice:0
+msgid "You invoice has been successfully created!"
+msgstr ""
#. module: sale
#: view:sale.report:0
@@ -885,23 +974,20 @@ msgid "Open Invoice"
msgstr ""
#. module: sale
-#: report:sale.order:0
-#: view:sale.order.line:0
-msgid "Price"
-msgstr "가격"
+#: model:ir.actions.server,name:sale.ir_actions_server_edi_sale
+msgid "Auto-email confirmed sale orders"
+msgstr ""
#. module: sale
-#: model:ir.actions.act_window,name:sale.action_sale_installer
-#: view:sale.config.picking_policy:0
-#: view:sale.installer:0
-msgid "Sales Application Configuration"
+#: code:addons/sale/sale.py:413
+#, python-format
+msgid "There is no sales journal defined for this company: \"%s\" (id:%d)"
msgstr ""
#. module: sale
-#: view:sale.report:0
-#: field:sale.report,price_total:0
-msgid "Total Price"
-msgstr ""
+#: model:process.transition.action,name:sale.process_transition_action_forceassignation0
+msgid "Force Assignation"
+msgstr "할당"
#. module: sale
#: selection:sale.order.line,type:0
@@ -914,6 +1000,11 @@ msgid "Based on the shipped or on the ordered quantities."
msgstr ""
#. module: sale
+#: selection:sale.order,picking_policy:0
+msgid "Deliver all products at once"
+msgstr ""
+
+#. module: sale
#: field:sale.order,picking_ids:0
msgid "Related Picking"
msgstr ""
@@ -945,8 +1036,14 @@ msgid "Create Delivery Order"
msgstr ""
#. module: sale
-#: field:sale.installer,delivery:0
-msgid "Delivery Costs"
+#: code:addons/sale/sale.py:1290
+#, python-format
+msgid "Cannot delete a sales order line which is in state '%s'!"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Qty(UoS)"
msgstr ""
#. module: sale
@@ -961,13 +1058,13 @@ msgstr ""
#. module: sale
#: view:sale.report:0
-msgid "Sales by Product Category"
+msgid "Ordered date of the sales order"
msgstr ""
#. module: sale
-#: selection:sale.order,picking_policy:0
-msgid "Partial Delivery"
-msgstr "부분 배송"
+#: view:sale.report:0
+msgid "Sales by Product Category"
+msgstr ""
#. module: sale
#: model:process.transition,name:sale.process_transition_confirmquotation0
@@ -975,9 +1072,10 @@ msgid "Confirm Quotation"
msgstr "견적 확정"
#. module: sale
-#: help:sale.order,origin:0
-msgid "Reference of the document that generated this sales order request."
-msgstr ""
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:63
+#, python-format
+msgid "Error"
+msgstr "에러"
#. module: sale
#: view:sale.order:0
@@ -1009,20 +1107,14 @@ msgid "Procurement Method"
msgstr ""
#. module: sale
-#: view:sale.config.picking_policy:0
-#: view:sale.installer:0
-msgid "title"
-msgstr ""
-
-#. module: sale
#: model:process.node,name:sale.process_node_packinglist0
msgid "Pick List"
msgstr ""
#. module: sale
#: view:sale.order:0
-msgid "Order date"
-msgstr ""
+msgid "Set to Draft"
+msgstr "초안으로 설정"
#. module: sale
#: model:process.node,note:sale.process_node_packinglist0
@@ -1030,6 +1122,85 @@ msgid "Document of the move to the output or to the customer."
msgstr ""
#. module: sale
+#: model:email.template,body_text:sale.email_template_edi_sale
+msgid ""
+"\n"
+"Hello${object.partner_order_id.name and ' ' or "
+"''}${object.partner_order_id.name or ''},\n"
+"\n"
+"Here is your order confirmation for ${object.partner_id.name}:\n"
+" | Order number: *${object.name}*\n"
+" | Order total: *${object.amount_total} "
+"${object.pricelist_id.currency_id.name}*\n"
+" | Order date: ${object.date_order}\n"
+" % if object.origin:\n"
+" | Order reference: ${object.origin}\n"
+" % endif\n"
+" % if object.client_order_ref:\n"
+" | Your reference: ${object.client_order_ref}<br />\n"
+" % endif\n"
+" | Your contact: ${object.user_id.name} ${object.user_id.user_email "
+"and '<%s>'%(object.user_id.user_email) or ''}\n"
+"\n"
+"You can view the order confirmation, download it and even pay online using "
+"the following link:\n"
+" ${ctx.get('edi_web_url_view') or 'n/a'}\n"
+"\n"
+"% if object.order_policy in ('prepaid','manual') and "
+"object.company_id.paypal_account:\n"
+"<% \n"
+"comp_name = quote(object.company_id.name)\n"
+"order_name = quote(object.name)\n"
+"paypal_account = quote(object.company_id.paypal_account)\n"
+"order_amount = quote(str(object.amount_total))\n"
+"cur_name = quote(object.pricelist_id.currency_id.name)\n"
+"paypal_url = \"https://www.paypal.com/cgi-"
+"bin/webscr?cmd=_xclick&business=%s&item_name=%s%%20Order%%20%s&invoice=%s&amo"
+"unt=%s\" \\\n"
+" "
+"\"&currency_code=%s&button_subtype=services&no_note=1&bn=OpenERP_Order_PayNow"
+"_%s\" % \\\n"
+" "
+"(paypal_account,comp_name,order_name,order_name,order_amount,cur_name,cur_nam"
+"e)\n"
+"%>\n"
+"It is also possible to directly pay with Paypal:\n"
+" ${paypal_url}\n"
+"% endif\n"
+"\n"
+"If you have any question, do not hesitate to contact us.\n"
+"\n"
+"\n"
+"Thank you for choosing ${object.company_id.name}!\n"
+"\n"
+"\n"
+"--\n"
+"${object.user_id.name} ${object.user_id.user_email and "
+"'<%s>'%(object.user_id.user_email) or ''}\n"
+"${object.company_id.name}\n"
+"% if object.company_id.street:\n"
+"${object.company_id.street or ''}\n"
+"% endif\n"
+"% if object.company_id.street2:\n"
+"${object.company_id.street2}\n"
+"% endif\n"
+"% if object.company_id.city or object.company_id.zip:\n"
+"${object.company_id.zip or ''} ${object.company_id.city or ''}\n"
+"% endif\n"
+"% if object.company_id.country_id:\n"
+"${object.company_id.state_id and ('%s, ' % object.company_id.state_id.name) "
+"or ''} ${object.company_id.country_id.name or ''}\n"
+"% endif\n"
+"% if object.company_id.phone:\n"
+"Phone: ${object.company_id.phone}\n"
+"% endif\n"
+"% if object.company_id.website:\n"
+"${object.company_id.website or ''}\n"
+"% endif\n"
+" "
+msgstr ""
+
+#. module: sale
#: model:process.transition.action,name:sale.process_transition_action_validate0
msgid "Validate"
msgstr "검증"
@@ -1052,9 +1223,9 @@ msgid "Taxes"
msgstr "세금"
#. module: sale
-#: field:sale.order,order_policy:0
-msgid "Shipping Policy"
-msgstr "선적 정책"
+#: view:sale.order:0
+msgid "Sales Order ready to be invoiced"
+msgstr ""
#. module: sale
#: help:sale.order,create_date:0
@@ -1073,9 +1244,9 @@ msgid "Create Invoices"
msgstr ""
#. module: sale
-#: view:sale.order:0
-msgid "Extra Info"
-msgstr "기타 정보"
+#: view:sale.report:0
+msgid "Sales order created in current month"
+msgstr ""
#. module: sale
#: report:sale.order:0
@@ -1083,11 +1254,24 @@ msgid "Fax :"
msgstr "팩스:"
#. module: sale
+#: help:sale.order.line,type:0
+msgid ""
+"If 'on order', it triggers a procurement when the sale order is confirmed to "
+"create a task, purchase order or manufacturing order linked to this sale "
+"order line."
+msgstr ""
+
+#. module: sale
#: field:sale.advance.payment.inv,amount:0
msgid "Advance Amount"
msgstr ""
#. module: sale
+#: field:sale.config.picking_policy,charge_delivery:0
+msgid "Do you charge the delivery?"
+msgstr ""
+
+#. module: sale
#: selection:sale.order,invoice_quantity:0
msgid "Shipped Quantities"
msgstr "선적 수량"
@@ -1098,25 +1282,45 @@ msgid "Invoice Based on Sales Orders"
msgstr "판매 주문에 기초한 인보이스"
#. module: sale
+#: code:addons/sale/sale.py:331
+#, python-format
+msgid ""
+"If you change the pricelist of this order (and eventually the currency), "
+"prices of existing order lines will not be updated."
+msgstr ""
+
+#. module: sale
#: model:ir.model,name:sale.model_stock_picking
msgid "Picking List"
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:387
-#: code:addons/sale/sale.py:920
-#: code:addons/sale/sale.py:938
+#: code:addons/sale/sale.py:412
+#: code:addons/sale/sale.py:503
+#: code:addons/sale/sale.py:632
+#: code:addons/sale/sale.py:1015
+#: code:addons/sale/sale.py:1033
#, python-format
msgid "Error !"
msgstr "에러 !"
#. module: sale
-#: code:addons/sale/sale.py:570
+#: code:addons/sale/sale.py:603
#, python-format
msgid "Could not cancel sales order !"
msgstr ""
#. module: sale
+#: view:sale.order:0
+msgid "Qty(UoM)"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered Year of the sales order"
+msgstr ""
+
+#. module: sale
#: selection:sale.report,month:0
msgid "July"
msgstr ""
@@ -1133,35 +1337,25 @@ msgid "Shipping Exception"
msgstr "선적 예외"
#. module: sale
-#: field:sale.make.invoice,grouped:0
-msgid "Group the invoices"
-msgstr "인보이스 그룹화"
-
-#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Shipping & Manual Invoice"
-msgstr "선적 & 매뉴얼 인보이스"
-
-#. module: sale
-#: code:addons/sale/sale.py:1051
+#: code:addons/sale/sale.py:1143
#, python-format
-msgid "Picking Information !"
+msgid "Picking Information ! : "
msgstr ""
#. module: sale
-#: view:sale.report:0
-#: field:sale.report,month:0
-msgid "Month"
-msgstr ""
+#: field:sale.make.invoice,grouped:0
+msgid "Group the invoices"
+msgstr "인보이스 그룹화"
#. module: sale
-#: model:ir.module.module,shortdesc:sale.module_meta_information
-msgid "Sales Management"
-msgstr "판매 관리"
+#: field:sale.order,order_policy:0
+msgid "Invoice Policy"
+msgstr ""
#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Invoice From The Picking"
+#: model:ir.actions.act_window,name:sale.action_config_picking_policy
+#: view:sale.config.picking_policy:0
+msgid "Setup your Invoicing Method"
msgstr ""
#. module: sale
@@ -1171,27 +1365,30 @@ msgstr ""
#. module: sale
#: view:sale.report:0
-#: field:sale.report,uom_name:0
msgid "Reference UoM"
msgstr ""
#. module: sale
+#: view:sale.config.picking_policy:0
+msgid ""
+"This tool will help you to install the right module and configure the system "
+"according to the method you use to invoice your customers."
+msgstr ""
+
+#. module: sale
#: model:ir.model,name:sale.model_sale_order_line_make_invoice
msgid "Sale OrderLine Make_invoice"
msgstr ""
#. module: sale
-#: help:sale.config.picking_policy,step:0
-msgid ""
-"By default, OpenERP is able to manage complex routing and paths of products "
-"in your warehouse and partner locations. This will configure the most common "
-"and simple methods to deliver products to the customer in one or two "
-"operations by the worker."
-msgstr ""
+#: selection:sale.order,state:0
+#: selection:sale.report,state:0
+msgid "Invoice Exception"
+msgstr "인보이스 예외"
#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_tree
-msgid "Old Quotations"
+#: model:process.node,note:sale.process_node_saleorder0
+msgid "Drives procurement and invoicing"
msgstr ""
#. module: sale
@@ -1207,6 +1404,22 @@ msgid "Sales Analysis"
msgstr ""
#. module: sale
+#: code:addons/sale/sale.py:1138
+#, python-format
+msgid ""
+"You selected a quantity of %d Units.\n"
+"But it's not compatible with the selected packaging.\n"
+"Here is a proposition of quantities according to the packaging:\n"
+"EAN: %s Quantity: %s Type of ul: %s"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Recreate Packing"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
#: field:sale.order.line,property_ids:0
msgid "Properties"
msgstr "속성"
@@ -1233,7 +1446,17 @@ msgid ""
msgstr ""
#. module: sale
-#: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
+#: view:sale.order.line:0
+msgid "Confirmed sale order lines, not yet delivered"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:473
+#, python-format
+msgid "Customer Invoices"
+msgstr ""
+
+#. module: sale
#: model:process.process,name:sale.process_process_salesprocess0
#: view:sale.order:0
#: view:sale.report:0
@@ -1255,18 +1478,13 @@ msgid "Done"
msgstr "완료"
#. module: sale
-#: model:ir.model,name:sale.model_sale_installer
-msgid "sale.installer"
-msgstr ""
-
-#. module: sale
#: model:process.node,name:sale.process_node_invoice0
#: model:process.node,name:sale.process_node_invoiceafterdelivery0
msgid "Invoice"
msgstr "인보이스"
#. module: sale
-#: code:addons/sale/sale.py:1014
+#: code:addons/sale/sale.py:1158
#, python-format
msgid ""
"You have to select a customer in the sales form !\n"
@@ -1274,11 +1492,6 @@ msgid ""
msgstr ""
#. module: sale
-#: selection:sale.config.picking_policy,step:0
-msgid "Picking List & Delivery Order"
-msgstr ""
-
-#. module: sale
#: field:sale.order,origin:0
msgid "Source Document"
msgstr ""
@@ -1304,7 +1517,7 @@ msgid "The amount without tax."
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:571
+#: code:addons/sale/sale.py:604
#, python-format
msgid "You must first cancel all picking attached to this sales order."
msgstr ""
@@ -1315,9 +1528,15 @@ msgid "Sales Advance Payment Invoice"
msgstr ""
#. module: sale
-#: field:sale.order,incoterm:0
-msgid "Incoterm"
-msgstr "인코텀"
+#: view:sale.report:0
+#: field:sale.report,month:0
+msgid "Month"
+msgstr ""
+
+#. module: sale
+#: model:email.template,subject:sale.email_template_edi_sale
+msgid "${object.company_id.name} Order (Ref ${object.name or 'n/a' })"
+msgstr ""
#. module: sale
#: view:sale.order.line:0
@@ -1328,11 +1547,6 @@ msgid "Product"
msgstr "상품"
#. module: sale
-#: model:ir.ui.menu,name:sale.menu_invoiced
-msgid "Invoicing"
-msgstr ""
-
-#. module: sale
#: model:process.transition.action,name:sale.process_transition_action_cancelassignation0
msgid "Cancel Assignation"
msgstr "할당 취소"
@@ -1343,14 +1557,10 @@ msgid "sale.config.picking_policy"
msgstr "sale.config.picking_policy"
#. module: sale
-#: help:sale.order,state:0
-msgid ""
-"Gives the state of the quotation or sales order. \n"
-"The exception state is automatically set when a cancel operation occurs in "
-"the invoice validation (Invoice Exception) or in the picking list process "
-"(Shipping Exception). \n"
-"The 'Waiting Schedule' state is set when the invoice is confirmed but "
-"waiting for the scheduler to run on the date 'Ordered Date'."
+#: view:account.invoice.report:0
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_turnover_by_month
+msgid "Monthly Turnover"
msgstr ""
#. module: sale
@@ -1369,7 +1579,6 @@ msgid "Product UoS"
msgstr ""
#. module: sale
-#: selection:sale.order,state:0
#: selection:sale.report,state:0
msgid "Manual In Progress"
msgstr ""
@@ -1390,7 +1599,8 @@ msgid "Order"
msgstr "주문"
#. module: sale
-#: code:addons/sale/sale.py:921
+#: code:addons/sale/sale.py:1016
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:71
#, python-format
msgid "There is no income account defined for this product: \"%s\" (id:%d)"
msgstr ""
@@ -1410,7 +1620,7 @@ msgid ""
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:1116
+#: code:addons/sale/sale.py:1238
#, python-format
msgid ""
"You plan to sell %.2f %s but you only have %.2f %s available !\n"
@@ -1439,10 +1649,10 @@ msgid "Total"
msgstr "합계"
#. module: sale
-#: code:addons/sale/sale.py:388
-#, python-format
-msgid "There is no sales journal defined for this company: \"%s\" (id:%d)"
-msgstr ""
+#: report:sale.order:0
+#: view:sale.order.line:0
+msgid "Price"
+msgstr "가격"
#. module: sale
#: model:process.transition,note:sale.process_transition_deliver0
@@ -1453,9 +1663,14 @@ msgid ""
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:1165
-#, python-format
-msgid "Cannot delete a sales order line which is %s !"
+#: selection:sale.order,order_policy:0
+msgid "Pay before delivery"
+msgstr ""
+
+#. module: sale
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.open_board_sales
+msgid "Sales Dashboard"
msgstr ""
#. module: sale
@@ -1467,6 +1682,7 @@ msgstr ""
#. module: sale
#: view:sale.order:0
+#: selection:sale.order,state:0
#: view:sale.order.line:0
msgid "To Invoice"
msgstr ""
@@ -1477,6 +1693,11 @@ msgid "Date on which sales order is confirmed."
msgstr ""
#. module: sale
+#: field:sale.order,project_id:0
+msgid "Contract/Analytic Account"
+msgstr ""
+
+#. module: sale
#: field:sale.order,company_id:0
#: field:sale.order.line,company_id:0
#: view:sale.report:0
@@ -1496,22 +1717,17 @@ msgid "The amount to be invoiced in advance."
msgstr ""
#. module: sale
-#: selection:sale.order,state:0
-#: selection:sale.report,state:0
-msgid "Invoice Exception"
-msgstr "인보이스 예외"
-
-#. module: sale
-#: help:sale.order,picking_ids:0
+#: code:addons/sale/sale.py:1256
+#, python-format
msgid ""
-"This is a list of picking that has been generated for this sales order."
+"Couldn't find a pricelist line matching this product and quantity.\n"
+"You have to change either the product, the quantity or the pricelist."
msgstr ""
#. module: sale
-#: help:sale.installer,sale_margin:0
+#: help:sale.order,picking_ids:0
msgid ""
-"Gives the margin of profitability by calculating the difference between Unit "
-"Price and Cost Price."
+"This is a list of picking that has been generated for this sales order."
msgstr ""
#. module: sale
@@ -1533,6 +1749,11 @@ msgid "Cancelled"
msgstr ""
#. module: sale
+#: view:sale.order.line:0
+msgid "Sales Order Lines related to a Sales Order of mine"
+msgstr ""
+
+#. module: sale
#: model:ir.actions.act_window,name:sale.action_shop_form
#: model:ir.ui.menu,name:sale.menu_action_shop_form
#: field:sale.order,shop_id:0
@@ -1542,17 +1763,12 @@ msgid "Shop"
msgstr "샵"
#. module: sale
-#: view:sale.report:0
-msgid " Month "
-msgstr ""
-
-#. module: sale
#: field:sale.report,date_confirm:0
msgid "Date Confirm"
msgstr ""
#. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:111
+#: code:addons/sale/wizard/sale_line_invoice.py:113
#, python-format
msgid "Warning"
msgstr ""
@@ -1564,17 +1780,6 @@ msgid "Sales by Month"
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:1045
-#, python-format
-msgid ""
-"You selected a quantity of %d Units.\n"
-"But it's not compatible with the selected packaging.\n"
-"Here is a proposition of quantities according to the packaging:\n"
-"\n"
-"EAN: %s Quantity: %s Type of ul: %s"
-msgstr ""
-
-#. module: sale
#: model:ir.model,name:sale.model_sale_order
#: model:process.node,name:sale.process_node_order0
#: model:process.node,name:sale.process_node_saleorder0
@@ -1590,6 +1795,11 @@ msgid "Quantity (UoS)"
msgstr ""
#. module: sale
+#: view:sale.order.line:0
+msgid "Sale Order Lines that are in 'done' state"
+msgstr ""
+
+#. module: sale
#: model:process.transition,note:sale.process_transition_packing0
msgid ""
"The Pick List form is created as soon as the sales order is confirmed, in "
@@ -1604,6 +1814,11 @@ msgid "Confirmed"
msgstr "확정됨"
#. module: sale
+#: field:sale.config.picking_policy,order_policy:0
+msgid "Main Method Based On"
+msgstr ""
+
+#. module: sale
#: model:process.transition.action,name:sale.process_transition_action_confirm0
msgid "Confirm"
msgstr "확정"
@@ -1626,6 +1841,7 @@ msgid "Invoice Lines"
msgstr "인보이스 라인"
#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_product_tree
#: view:sale.order:0
#: view:sale.order.line:0
msgid "Sales Order Lines"
@@ -1642,30 +1858,18 @@ msgid "Configuration"
msgstr "구성"
#. module: sale
-#: selection:sale.order,picking_policy:0
-msgid "Complete Delivery"
-msgstr "배송 완료"
-
-#. module: sale
-#: view:sale.report:0
-msgid " Month-1 "
-msgstr ""
-
-#. module: sale
-#: help:sale.config.picking_policy,picking_policy:0
-msgid ""
-"The Shipping Policy is used to configure per order if you want to deliver as "
-"soon as possible when one product is available or you wait that all products "
-"are available.."
+#: code:addons/sale/edi/sale_order.py:146
+#, python-format
+msgid "EDI Pricelist (%s)"
msgstr ""
#. module: sale
-#: selection:sale.report,month:0
-msgid "August"
+#: view:sale.report:0
+msgid "Sales order created in current year"
msgstr ""
#. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:111
+#: code:addons/sale/wizard/sale_line_invoice.py:113
#, python-format
msgid ""
"Invoice cannot be created for this Sales Order Line due to one of the "
@@ -1675,6 +1879,11 @@ msgid ""
msgstr ""
#. module: sale
+#: view:sale.order.line:0
+msgid "Sale order lines done"
+msgstr ""
+
+#. module: sale
#: field:sale.order.line,th_weight:0
msgid "Weight"
msgstr "중량"
@@ -1693,7 +1902,6 @@ msgstr ""
#. module: sale
#: field:sale.config.picking_policy,config_logo:0
-#: field:sale.installer,config_logo:0
msgid "Image"
msgstr ""
@@ -1723,8 +1931,8 @@ msgid "Salesman"
msgstr "판매사원"
#. module: sale
-#: model:process.node,note:sale.process_node_saleorder0
-msgid "Drives procurement and invoicing"
+#: model:ir.actions.act_window,name:sale.action_order_tree
+msgid "Old Quotations"
msgstr ""
#. module: sale
@@ -1733,7 +1941,7 @@ msgid "Untaxed Amount"
msgstr "과세되지 않은 금액"
#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:163
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:170
#: model:ir.actions.act_window,name:sale.action_view_sale_advance_payment_inv
#: view:sale.advance.payment.inv:0
#: view:sale.order:0
@@ -1742,7 +1950,7 @@ msgid "Advance Invoice"
msgstr "Advance Invoice"
#. module: sale
-#: code:addons/sale/sale.py:591
+#: code:addons/sale/sale.py:624
#, python-format
msgid "The sales order '%s' has been cancelled."
msgstr ""
@@ -1777,19 +1985,19 @@ msgid "Packings"
msgstr ""
#. module: sale
-#: field:sale.config.picking_policy,progress:0
-#: field:sale.installer,progress:0
-msgid "Configuration Progress"
+#: view:sale.order.line:0
+msgid "Sale Order Lines ready to be invoiced"
msgstr ""
#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_product_tree
-msgid "Product sales"
-msgstr "상품 판매"
+#: view:sale.report:0
+msgid "Sales order created in last month"
+msgstr ""
#. module: sale
-#: field:sale.order,date_order:0
-msgid "Ordered Date"
+#: model:ir.actions.act_window,name:sale.action_email_templates
+#: model:ir.ui.menu,name:sale.menu_email_templates
+msgid "Email Templates"
msgstr ""
#. module: sale
@@ -1800,13 +2008,14 @@ msgid "Sales Orders"
msgstr "판매 주문"
#. module: sale
-#: selection:sale.config.picking_policy,picking_policy:0
-msgid "Direct Delivery"
-msgstr "직접 배송"
+#: model:ir.model,name:sale.model_sale_shop
+#: view:sale.shop:0
+msgid "Sales Shop"
+msgstr ""
#. module: sale
-#: field:sale.installer,sale_journal:0
-msgid "Invoicing journals"
+#: selection:sale.report,month:0
+msgid "November"
msgstr ""
#. module: sale
@@ -1815,18 +2024,12 @@ msgid "Advance Product"
msgstr "Advance Product"
#. module: sale
-#: view:sale.report:0
-#: field:sale.report,shipped_qty_1:0
-msgid "Shipped Qty"
-msgstr ""
-
-#. module: sale
-#: view:sale.open.invoice:0
-msgid "You invoice has been successfully created!"
-msgstr ""
+#: view:sale.order:0
+msgid "Compute"
+msgstr "계산"
#. module: sale
-#: code:addons/sale/sale.py:585
+#: code:addons/sale/sale.py:618
#, python-format
msgid "You must first cancel all invoices attached to this sales order."
msgstr ""
@@ -1837,33 +2040,27 @@ msgid "January"
msgstr ""
#. module: sale
-#: view:sale.installer:0
-msgid "Configure Your Sales Management Application"
-msgstr ""
-
-#. module: sale
#: model:ir.actions.act_window,name:sale.action_order_tree4
msgid "Sales Order in Progress"
msgstr "진행 중인 판매 주문"
#. module: sale
-#: field:sale.installer,sale_layout:0
-msgid "Sales Order Layout Improvement"
+#: help:sale.order,origin:0
+msgid "Reference of the document that generated this sales order request."
msgstr ""
#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:63
-#, python-format
-msgid "Error"
-msgstr "에러"
-
-#. module: sale
#: view:sale.report:0
#: field:sale.report,delay:0
msgid "Commitment Delay"
msgstr ""
#. module: sale
+#: selection:sale.order,order_policy:0
+msgid "Deliver & invoice on demand"
+msgstr ""
+
+#. module: sale
#: model:process.node,note:sale.process_node_saleprocurement0
msgid ""
"One Procurement order for each sales order line and for each of the "
@@ -1886,13 +2083,12 @@ msgid "Confirmed sales order to invoice."
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:290
-#, python-format
-msgid "Cannot delete Sales Order(s) which are already confirmed !"
+#: view:sale.order:0
+msgid "Sales Order that haven't yet been confirmed"
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:316
+#: code:addons/sale/sale.py:322
#, python-format
msgid "The sales order '%s' has been set in draft state."
msgstr ""
@@ -1903,24 +2099,19 @@ msgid "from stock"
msgstr "스톡으로부터"
#. module: sale
-#: field:sale.config.picking_policy,order_policy:0
-msgid "Shipping Default Policy"
-msgstr "선적 디폴트 정책"
-
-#. module: sale
#: view:sale.open.invoice:0
msgid "Close"
msgstr "닫기"
#. module: sale
-#: field:sale.order,shipped:0
-msgid "Delivered"
+#: code:addons/sale/sale.py:1248
+#, python-format
+msgid "No Pricelist ! : "
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:1115
-#, python-format
-msgid "Not enough stock !"
+#: field:sale.order,shipped:0
+msgid "Delivered"
msgstr ""
#. module: sale
@@ -1929,11 +2120,6 @@ msgid "You must assign a production lot for this product"
msgstr ""
#. module: sale
-#: field:sale.order.line,sequence:0
-msgid "Layout Sequence"
-msgstr ""
-
-#. module: sale
#: model:ir.actions.act_window,help:sale.action_shop_form
msgid ""
"If you have more than one shop reselling your company products, you can "
@@ -1960,11 +2146,6 @@ msgid "May"
msgstr ""
#. module: sale
-#: help:sale.installer,sale_order_dates:0
-msgid "Adds commitment, requested and effective dates on Sales Orders."
-msgstr ""
-
-#. module: sale
#: view:sale.order:0
#: field:sale.order,partner_id:0
#: field:sale.order.line,order_partner_id:0
@@ -1972,23 +2153,11 @@ msgid "Customer"
msgstr "고객"
#. module: sale
-#: model:product.template,name:sale.advance_product_0_product_template
-msgid "Advance"
-msgstr ""
-
-#. module: sale
#: selection:sale.report,month:0
msgid "February"
msgstr ""
#. module: sale
-#: help:sale.installer,sale_journal:0
-msgid ""
-"Allows you to group and invoice your delivery orders according to different "
-"invoicing types: daily, weekly, etc."
-msgstr ""
-
-#. module: sale
#: selection:sale.report,month:0
msgid "April"
msgstr ""
@@ -1999,11 +2168,6 @@ msgid "Accounting"
msgstr ""
#. module: sale
-#: field:sale.config.picking_policy,step:0
-msgid "Steps To Deliver a Sales Order"
-msgstr ""
-
-#. module: sale
#: view:sale.order:0
#: view:sale.order.line:0
msgid "Search Sales Order"
@@ -2015,18 +2179,18 @@ msgid "Sales Order Requisition"
msgstr ""
#. module: sale
+#: code:addons/sale/sale.py:1242
+#, python-format
+msgid "Not enough stock ! : "
+msgstr ""
+
+#. module: sale
#: report:sale.order:0
#: field:sale.order,payment_term:0
msgid "Payment Term"
msgstr "결제 조건"
#. module: sale
-#: help:sale.installer,sale_layout:0
-msgid ""
-"Provides some features to improve the layout of the Sales Order reports."
-msgstr ""
-
-#. module: sale
#: model:ir.actions.act_window,help:sale.action_order_report_all
msgid ""
"This report performs analysis on your quotations and sales orders. Analysis "
@@ -2064,6 +2228,9 @@ msgstr "베송에 기초한 인보이스"
#~ msgid "Recreate Procurement"
#~ msgstr "조달 재생성"
+#~ msgid "Partial Delivery"
+#~ msgstr "부분 배송"
+
#~ msgid "Delivery, from the warehouse to the customer."
#~ msgstr "창고에서 고객에게 전달"
@@ -2091,6 +2258,9 @@ msgstr "베송에 기초한 인보이스"
#~ msgid "After confirming order, Create the invoice."
#~ msgstr "주문을 확정한 뒤, 인보이스 생성"
+#~ msgid "Shipping Policy"
+#~ msgstr "선적 정책"
+
#~ msgid "Reference"
#~ msgstr "참조"
@@ -2116,6 +2286,9 @@ msgstr "베송에 기초한 인보이스"
#~ msgid "Procurement is created after confirmation of sale order."
#~ msgstr "판매 주문 확정 후에 조달이 생성됩니다."
+#~ msgid "All at Once"
+#~ msgstr "일괄처리"
+
#~ msgid "My sales order in progress"
#~ msgstr "진행 중인 내 판매 주문"
@@ -2158,6 +2331,9 @@ msgstr "베송에 기초한 인보이스"
#~ msgid "Packing"
#~ msgstr "포장"
+#~ msgid "Complete Delivery"
+#~ msgstr "배송 완료"
+
#~ msgid "Total amount"
#~ msgstr "총 금액"
@@ -2185,12 +2361,12 @@ msgstr "베송에 기초한 인보이스"
#~ msgid "Sales Order To Be Invoiced"
#~ msgstr "인보이스가 발행될 판매 주문"
-#~ msgid "My Quotations"
-#~ msgstr "내 견적"
-
#~ msgid "Packing Default Policy"
#~ msgstr "포장 디폴트 정잭"
+#~ msgid "Shipping Default Policy"
+#~ msgstr "선적 디폴트 정책"
+
#~ msgid "Manages the delivery and invoicing progress"
#~ msgstr "배송과 인보이스 진행 관리"
@@ -2257,6 +2433,9 @@ msgstr "베송에 기초한 인보이스"
#~ msgid "Sale Pricelists"
#~ msgstr "판매 가격리스트"
+#~ msgid "Direct Delivery"
+#~ msgstr "직접 배송"
+
#~ msgid "Make Invoice"
#~ msgstr "인보이스 만들기"
@@ -2266,6 +2445,9 @@ msgstr "베송에 기초한 인보이스"
#~ msgid "Packing OUT is created for stockable products."
#~ msgstr "스톡가능한 상품에 대해 포장 OUT이 생성됩니다."
+#~ msgid "Delivery Order Only"
+#~ msgstr "배송주문 만"
+
#~ msgid "Sales order lines"
#~ msgstr "판매 주문 라인"
@@ -2285,6 +2467,9 @@ msgstr "베송에 기초한 인보이스"
#~ msgid "Advance Payment"
#~ msgstr "Advance Payment"
+#~ msgid "Shipping & Manual Invoice"
+#~ msgstr "선적 & 매뉴얼 인보이스"
+
#~ msgid ""
#~ "Confirming the packing list moves them to delivery order. This can be done "
#~ "by clicking on 'Validate' button."
@@ -2317,6 +2502,9 @@ msgstr "베송에 기초한 인보이스"
#~ msgid "Open Advance Invoice"
#~ msgstr "Advance 인보이스 오픈"
+#~ msgid "Sales Management"
+#~ msgstr "판매 관리"
+
#~ msgid "Deliver"
#~ msgstr "배송"
@@ -2366,6 +2554,9 @@ msgstr "베송에 기초한 인보이스"
#~ msgstr ""
#~ "이 판매 주문을 위해 생성된 인보이스들의 목록입니다. 동일한 판매 주문이 여러 차례 인보이스들을 생성할 수도 있습니다 (가령, 라인 별)."
+#~ msgid "Payment Before Delivery"
+#~ msgstr "배송 전 결제"
+
#~ msgid "Delivery Delay"
#~ msgstr "배송 지연"
@@ -2390,6 +2581,9 @@ msgstr "베송에 기초한 인보이스"
#~ msgid "Packing Policy"
#~ msgstr "포장 정책"
+#~ msgid "Product sales"
+#~ msgstr "상품 판매"
+
#~ msgid "Create Advance Invoice"
#~ msgstr "Advance Invoice 생성"
diff --git a/addons/sale/i18n/lt.po b/addons/sale/i18n/lt.po
index 5cef5431853..ac0062dfb4d 100644
--- a/addons/sale/i18n/lt.po
+++ b/addons/sale/i18n/lt.po
@@ -6,25 +6,32 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2011-01-11 11:16+0000\n"
+"POT-Creation-Date: 2011-12-22 18:43+0000\n"
"PO-Revision-Date: 2010-12-14 21:49+0000\n"
"Last-Translator: qdp (OpenERP) <qdp-launchpad@tinyerp.com>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-05 05:16+0000\n"
-"X-Generator: Launchpad (build 14231)\n"
+"X-Launchpad-Export-Date: 2011-12-23 06:46+0000\n"
+"X-Generator: Launchpad (build 14560)\n"
#. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_sales_by_salesman
-msgid "Sales by Salesman in last 90 days"
+#: field:sale.config.picking_policy,timesheet:0
+msgid "Based on Timesheet"
msgstr ""
#. module: sale
-#: help:sale.installer,delivery:0
-msgid "Allows you to compute delivery costs on your quotations."
+#: view:sale.order.line:0
+msgid ""
+"Sale Order Lines that are confirmed, done or in exception state and haven't "
+"yet been invoiced"
+msgstr ""
+
+#. module: sale
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_sales_by_salesman
+msgid "Sales by Salesman in last 90 days"
msgstr ""
#. module: sale
@@ -36,6 +43,11 @@ msgstr ""
"Jeigu Jūs neturite pakankamai atsargų ar pritariate daliniam vežimui?"
#. module: sale
+#: view:sale.order:0
+msgid "UoS"
+msgstr ""
+
+#. module: sale
#: help:sale.order,partner_shipping_id:0
msgid "Shipping address for current sales order."
msgstr ""
@@ -59,22 +71,12 @@ msgid "Cancel Order"
msgstr "Atšaukti užsakymą"
#. module: sale
-#: view:sale.config.picking_policy:0
-msgid "Configure Sales Order Logistics"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:603
+#: code:addons/sale/sale.py:638
#, python-format
msgid "The quotation '%s' has been converted to a sales order."
msgstr ""
#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Payment Before Delivery"
-msgstr "Apmokėjimas prieš pristatymą"
-
-#. module: sale
#: code:addons/sale/wizard/sale_make_invoice.py:42
#, python-format
msgid "Warning !"
@@ -91,12 +93,6 @@ msgid "Drives procurement orders for every sales order line."
msgstr ""
#. module: sale
-#: selection:sale.config.picking_policy,picking_policy:0
-msgid "All at Once"
-msgstr "Viskas iš karto"
-
-#. module: sale
-#: field:sale.order,project_id:0
#: view:sale.report:0
#: field:sale.report,analytic_account_id:0
#: field:sale.shop,project_id:0
@@ -112,6 +108,15 @@ msgid ""
msgstr ""
#. module: sale
+#: code:addons/sale/sale.py:295
+#, python-format
+msgid ""
+"In order to delete a confirmed sale order, you must cancel it before ! To "
+"cancel a sale order, you must first cancel related picking or delivery "
+"orders."
+msgstr ""
+
+#. module: sale
#: model:process.node,name:sale.process_node_saleprocurement0
msgid "Procurement Order"
msgstr ""
@@ -123,6 +128,11 @@ msgid "Partner"
msgstr ""
#. module: sale
+#: selection:sale.order,order_policy:0
+msgid "Invoice based on deliveries"
+msgstr ""
+
+#. module: sale
#: view:sale.order:0
msgid "Order Line"
msgstr "Užsakymo eilutės"
@@ -155,8 +165,13 @@ msgid "Default Payment Term"
msgstr "Numatytasis mokėjimo terminas"
#. module: sale
-#: model:ir.actions.act_window,name:sale.action_config_picking_policy
-msgid "Configure Picking Policy for Sales Order"
+#: field:sale.config.picking_policy,deli_orders:0
+msgid "Based on Delivery Orders"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.picking_policy,time_unit:0
+msgid "Main Working Time Unit"
msgstr ""
#. module: sale
@@ -173,9 +188,10 @@ msgid "Disc.(%)"
msgstr "Nuol. (%)"
#. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_forceassignation0
-msgid "Force Assignation"
-msgstr "Paskyrimas"
+#: view:sale.report:0
+#: field:sale.report,price_total:0
+msgid "Total Price"
+msgstr ""
#. module: sale
#: help:sale.make.invoice,grouped:0
@@ -183,6 +199,11 @@ msgid "Check the box to group the invoices for the same customers"
msgstr ""
#. module: sale
+#: view:sale.order:0
+msgid "My Sale Orders"
+msgstr ""
+
+#. module: sale
#: selection:sale.order,invoice_quantity:0
msgid "Ordered Quantities"
msgstr "Užsakyti kiekiai"
@@ -221,13 +242,24 @@ msgid ""
msgstr ""
#. module: sale
+#: field:sale.config.picking_policy,task_work:0
+msgid "Based on Tasks' Work"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
+msgid "Quotations and Sales"
+msgstr ""
+
+#. module: sale
#: model:ir.model,name:sale.model_sale_make_invoice
msgid "Sales Make Invoice"
msgstr ""
#. module: sale
-#: view:sale.order:0
-msgid "Recreate Packing"
+#: code:addons/sale/sale.py:330
+#, python-format
+msgid "Pricelist Warning!"
msgstr ""
#. module: sale
@@ -236,10 +268,10 @@ msgid "Discount (%)"
msgstr "Nuolaida (%)"
#. module: sale
-#: help:res.company,security_lead:0
-msgid ""
-"This is the days added to what you promise to customers for security purpose"
-msgstr ""
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_quotation_for_sale
+msgid "My Quotations"
+msgstr "Mano pasiūlymai"
#. module: sale
#: view:board.board:0
@@ -264,7 +296,22 @@ msgid "Shop Name"
msgstr "Parduotuvės pavadinimas"
#. module: sale
-#: code:addons/sale/sale.py:1014
+#: help:sale.order,order_policy:0
+msgid ""
+"The Invoice Policy is used to synchronise invoice and delivery operations.\n"
+" - The 'Pay before delivery' choice will first generate the invoice and "
+"then generate the picking order after the payment of this invoice.\n"
+" - The 'Deliver & Invoice on demand' will create the picking order directly "
+"and wait for the user to manually click on the 'Invoice' button to generate "
+"the draft invoice based on the sale order or the sale order lines.\n"
+" - The 'Invoice on order after delivery' choice will generate the draft "
+"invoice based on sales order after all picking lists have been finished.\n"
+" - The 'Invoice based on deliveries' choice is used to create an invoice "
+"during the picking process."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:1158
#, python-format
msgid "No Customer Defined !"
msgstr "Nenurodytas klientas!"
@@ -275,9 +322,12 @@ msgid "Sales in Exception"
msgstr "Pardavimų išimtys"
#. module: sale
-#: view:sale.order:0
-msgid "Set to Draft"
-msgstr "Padaryti juodraščiu"
+#: code:addons/sale/sale.py:1145
+#: code:addons/sale/sale.py:1264
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:70
+#, python-format
+msgid "Configuration Error !"
+msgstr ""
#. module: sale
#: view:sale.order:0
@@ -285,22 +335,7 @@ msgid "Conditions"
msgstr ""
#. module: sale
-#: help:sale.order,order_policy:0
-msgid ""
-"The Shipping Policy is used to synchronise invoice and delivery operations.\n"
-" - The 'Pay Before delivery' choice will first generate the invoice and "
-"then generate the picking order after the payment of this invoice.\n"
-" - The 'Shipping & Manual Invoice' will create the picking order directly "
-"and wait for the user to manually click on the 'Invoice' button to generate "
-"the draft invoice.\n"
-" - The 'Invoice On Order After Delivery' choice will generate the draft "
-"invoice based on sales order after all picking lists have been finished.\n"
-" - The 'Invoice From The Picking' choice is used to create an invoice "
-"during the picking process."
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:939
+#: code:addons/sale/sale.py:1034
#, python-format
msgid ""
"There is no income category account defined in default Properties for "
@@ -308,8 +343,8 @@ msgid ""
msgstr ""
#. module: sale
-#: view:sale.installer:0
-msgid "Configure"
+#: selection:sale.report,month:0
+msgid "August"
msgstr ""
#. module: sale
@@ -318,7 +353,7 @@ msgid "You try to assign a lot which is not from the same product"
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:620
+#: code:addons/sale/sale.py:655
#, python-format
msgid "invalid mode for test_state"
msgstr "Klaidingas modelis test_state"
@@ -329,7 +364,7 @@ msgid "June"
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:584
+#: code:addons/sale/sale.py:617
#, python-format
msgid "Could not cancel this sales order !"
msgstr ""
@@ -350,8 +385,12 @@ msgid "October"
msgstr ""
#. module: sale
+#: sql_constraint:stock.picking:0
+msgid "Reference must be unique per Company!"
+msgstr ""
+
+#. module: sale
#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_quotation_for_sale
#: view:sale.order:0
#: view:sale.report:0
msgid "Quotations"
@@ -363,11 +402,6 @@ msgid "Pricelist for current sales order."
msgstr ""
#. module: sale
-#: selection:sale.config.picking_policy,step:0
-msgid "Delivery Order Only"
-msgstr "Tik pristatymo užsakymas"
-
-#. module: sale
#: report:sale.order:0
msgid "TVA :"
msgstr "PVM :"
@@ -392,6 +426,7 @@ msgstr "Fiskalinė pozicija"
#. module: sale
#: view:sale.order:0
#: view:sale.order.line:0
+#: field:sale.report,product_uom:0
msgid "UoM"
msgstr "Mato vnt."
@@ -414,13 +449,19 @@ msgid ""
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:971
+#: code:addons/sale/sale.py:1061
+#, python-format
+msgid "You cannot cancel a sale order line that has already been invoiced!"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:1066
#, python-format
msgid "You must first cancel stock moves attached to this sales order line."
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:1042
+#: code:addons/sale/sale.py:1134
#, python-format
msgid "(n/a)"
msgstr ""
@@ -454,13 +495,35 @@ msgid "Notes"
msgstr "Pastabos"
#. module: sale
+#: sql_constraint:res.company:0
+msgid "The company name must be unique !"
+msgstr ""
+
+#. module: sale
#: help:sale.order,partner_invoice_id:0
msgid "Invoice address for current sales order."
msgstr ""
#. module: sale
-#: view:sale.installer:0
-msgid "Enhance your core Sales Application with additional functionalities."
+#: view:sale.report:0
+msgid "Month-1"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered month of the sales order"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:504
+#, python-format
+msgid ""
+"You cannot group sales having different currencies for the same partner."
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,picking_policy:0
+msgid "Deliver each product when available"
msgstr ""
#. module: sale
@@ -480,18 +543,40 @@ msgid "Confirmation Date"
msgstr ""
#. module: sale
+#: field:sale.order,incoterm:0
+msgid "Incoterm"
+msgstr ""
+
+#. module: sale
#: field:sale.order.line,address_allotment_id:0
msgid "Allotment Partner"
msgstr "Važtaraščio eil. adresas"
#. module: sale
-#: sql_constraint:sale.order:0
-msgid "Order Reference must be unique !"
+#: selection:sale.report,month:0
+msgid "March"
msgstr ""
#. module: sale
-#: selection:sale.report,month:0
-msgid "March"
+#: constraint:stock.move:0
+msgid "You can not move products from or to a location of the type view."
+msgstr ""
+
+#. module: sale
+#: field:sale.config.picking_policy,sale_orders:0
+msgid "Based on Sales Orders"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,state:0
+msgid ""
+"Givwizard = self.browse(cr, uid, ids)[0]es the state of the quotation or "
+"sales order. \n"
+"The exception state is automatically set when a cancel operation occurs in "
+"the invoice validation (Invoice Exception) or in the picking list process "
+"(Shipping Exception). \n"
+"The 'Waiting Schedule' state is set when the invoice is confirmed but "
+"waiting for the scheduler to run on the order date."
msgstr ""
#. module: sale
@@ -510,6 +595,11 @@ msgid "Invoice address :"
msgstr "Sąskaitos adresas :"
#. module: sale
+#: field:sale.order.line,sequence:0
+msgid "Line Sequence"
+msgstr ""
+
+#. module: sale
#: model:process.transition,note:sale.process_transition_saleorderprocurement0
msgid ""
"For every sales order line, a procurement order is created to supply the "
@@ -556,11 +646,6 @@ msgid "Sales Order Line"
msgstr ""
#. module: sale
-#: view:sale.config.picking_policy:0
-msgid "Setup your sales workflow and default values."
-msgstr ""
-
-#. module: sale
#: field:sale.shop,warehouse_id:0
msgid "Warehouse"
msgstr "Sandėlis"
@@ -597,6 +682,11 @@ msgid "Creation Date"
msgstr ""
#. module: sale
+#: model:ir.ui.menu,name:sale.menu_sales_configuration_misc
+msgid "Miscellaneous"
+msgstr ""
+
+#. module: sale
#: model:ir.actions.act_window,name:sale.action_order_line_tree3
msgid "Uninvoiced and Delivered Lines"
msgstr "Neužpajamuotos ir pristatymo eilutės"
@@ -612,14 +702,19 @@ msgid "My Sales"
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:290
-#: code:addons/sale/sale.py:966
-#: code:addons/sale/sale.py:1165
+#: code:addons/sale/sale.py:295
+#: code:addons/sale/sale.py:1061
+#: code:addons/sale/sale.py:1290
#, python-format
msgid "Invalid action !"
msgstr "Klaidingas veiksmas!"
#. module: sale
+#: view:sale.order:0
+msgid "Extra Info"
+msgstr "Papildoma informacija"
+
+#. module: sale
#: field:sale.order,pricelist_id:0
#: field:sale.report,pricelist_id:0
#: field:sale.shop,pricelist_id:0
@@ -633,13 +728,21 @@ msgid "# of Qty"
msgstr ""
#. module: sale
+#: code:addons/sale/sale.py:1314
+#, python-format
+msgid "Hour"
+msgstr ""
+
+#. module: sale
#: view:sale.order:0
msgid "Order Date"
msgstr ""
#. module: sale
#: view:sale.order.line:0
+#: view:sale.report:0
#: field:sale.report,shipped:0
+#: field:sale.report,shipped_qty_1:0
msgid "Shipped"
msgstr ""
@@ -649,8 +752,8 @@ msgid "All Quotations"
msgstr "Visi pasiūlymai"
#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Invoice On Order After Delivery"
+#: view:sale.config.picking_policy:0
+msgid "Options"
msgstr ""
#. module: sale
@@ -659,6 +762,20 @@ msgid "September"
msgstr ""
#. module: sale
+#: code:addons/sale/sale.py:632
+#, python-format
+msgid "You cannot confirm a sale order which has no line."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:1246
+#, python-format
+msgid ""
+"You have to select a pricelist or a customer in the sales form !\n"
+"Please set one before choosing a product."
+msgstr ""
+
+#. module: sale
#: view:sale.report:0
#: field:sale.report,categ_id:0
msgid "Category of Product"
@@ -675,11 +792,6 @@ msgid "Stock Moves"
msgstr "Atsargų judėjimas"
#. module: sale
-#: view:sale.report:0
-msgid " Year "
-msgstr ""
-
-#. module: sale
#: field:sale.order,state:0
#: field:sale.report,state:0
msgid "Order State"
@@ -697,7 +809,7 @@ msgid "Sales By Month"
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:970
+#: code:addons/sale/sale.py:1065
#, python-format
msgid "Could not cancel sales order line!"
msgstr ""
@@ -730,42 +842,19 @@ msgid ""
msgstr ""
#. module: sale
-#: view:sale.report:0
-msgid "Extended Filters..."
+#: field:sale.order,date_order:0
+msgid "Date"
msgstr ""
#. module: sale
-#: model:ir.module.module,description:sale.module_meta_information
-msgid ""
-"\n"
-" The base module to manage quotations and sales orders.\n"
-"\n"
-" * Workflow with validation steps:\n"
-" - Quotation -> Sales order -> Invoice\n"
-" * Invoicing methods:\n"
-" - Invoice on order (before or after shipping)\n"
-" - Invoice on delivery\n"
-" - Invoice on timesheets\n"
-" - Advance invoice\n"
-" * Partners preferences (shipping, invoicing, incoterm, ...)\n"
-" * Products stocks and prices\n"
-" * Delivery methods:\n"
-" - all at once, multi-parcel\n"
-" - delivery costs\n"
-" * Dashboard for salesman that includes:\n"
-" * Your open quotations\n"
-" * Top 10 sales of the month\n"
-" * Cases statistics\n"
-" * Graph of sales by product\n"
-" * Graph of cases of the month\n"
-" "
+#: view:sale.report:0
+msgid "Extended Filters..."
msgstr ""
#. module: sale
-#: model:ir.model,name:sale.model_sale_shop
-#: view:sale.shop:0
-msgid "Sales Shop"
-msgstr ""
+#: selection:sale.order.line,state:0
+msgid "Exception"
+msgstr "Išimtis"
#. module: sale
#: model:ir.model,name:sale.model_res_company
@@ -773,8 +862,9 @@ msgid "Companies"
msgstr ""
#. module: sale
-#: selection:sale.report,month:0
-msgid "November"
+#: code:addons/sale/sale.py:1259
+#, python-format
+msgid "No valid pricelist line found ! :"
msgstr ""
#. module: sale
@@ -783,8 +873,8 @@ msgid "History"
msgstr "Istorija"
#. module: sale
-#: field:sale.config.picking_policy,picking_policy:0
-msgid "Picking Default Policy"
+#: selection:sale.order,order_policy:0
+msgid "Invoice on order after delivery"
msgstr ""
#. module: sale
@@ -807,13 +897,12 @@ msgid ""
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:966
-#, python-format
-msgid "You cannot cancel a sales order line that has already been invoiced !"
+#: help:res.company,security_lead:0
+msgid ""
+"This is the days added to what you promise to customers for security purpose"
msgstr ""
#. module: sale
-#: view:sale.order:0
#: view:sale.order.line:0
msgid "Qty"
msgstr "Kiekis"
@@ -824,6 +913,11 @@ msgid "References"
msgstr ""
#. module: sale
+#: view:sale.order.line:0
+msgid "My Sales Order Lines"
+msgstr ""
+
+#. module: sale
#: model:process.transition.action,name:sale.process_transition_action_cancel0
#: model:process.transition.action,name:sale.process_transition_action_cancel1
#: model:process.transition.action,name:sale.process_transition_action_cancel2
@@ -835,16 +929,11 @@ msgid "Cancel"
msgstr "Atšaukti"
#. module: sale
-#: field:sale.installer,sale_order_dates:0
-msgid "Sales Order Dates"
+#: sql_constraint:sale.order:0
+msgid "Order Reference must be unique per Company!"
msgstr ""
#. module: sale
-#: selection:sale.order.line,state:0
-msgid "Exception"
-msgstr "Išimtis"
-
-#. module: sale
#: model:process.transition,name:sale.process_transition_invoice0
#: model:process.transition,name:sale.process_transition_invoiceafterdelivery0
#: model:process.transition.action,name:sale.process_transition_action_createinvoice0
@@ -854,19 +943,19 @@ msgid "Create Invoice"
msgstr "Sukurti sąskaitą faktūrą"
#. module: sale
-#: field:sale.installer,sale_margin:0
-msgid "Margins in Sales Orders"
+#: view:sale.order:0
+msgid "Total Tax Excluded"
msgstr ""
#. module: sale
-#: view:sale.order:0
-msgid "Total Tax Excluded"
+#: view:sale.order.line:0
+msgid "Order reference"
msgstr ""
#. module: sale
-#: view:sale.order:0
-msgid "Compute"
-msgstr "Skaičiuoti"
+#: view:sale.open.invoice:0
+msgid "You invoice has been successfully created!"
+msgstr ""
#. module: sale
#: view:sale.report:0
@@ -885,23 +974,20 @@ msgid "Open Invoice"
msgstr ""
#. module: sale
-#: report:sale.order:0
-#: view:sale.order.line:0
-msgid "Price"
-msgstr "Kaina"
+#: model:ir.actions.server,name:sale.ir_actions_server_edi_sale
+msgid "Auto-email confirmed sale orders"
+msgstr ""
#. module: sale
-#: model:ir.actions.act_window,name:sale.action_sale_installer
-#: view:sale.config.picking_policy:0
-#: view:sale.installer:0
-msgid "Sales Application Configuration"
+#: code:addons/sale/sale.py:413
+#, python-format
+msgid "There is no sales journal defined for this company: \"%s\" (id:%d)"
msgstr ""
#. module: sale
-#: view:sale.report:0
-#: field:sale.report,price_total:0
-msgid "Total Price"
-msgstr ""
+#: model:process.transition.action,name:sale.process_transition_action_forceassignation0
+msgid "Force Assignation"
+msgstr "Paskyrimas"
#. module: sale
#: selection:sale.order.line,type:0
@@ -914,6 +1000,11 @@ msgid "Based on the shipped or on the ordered quantities."
msgstr ""
#. module: sale
+#: selection:sale.order,picking_policy:0
+msgid "Deliver all products at once"
+msgstr ""
+
+#. module: sale
#: field:sale.order,picking_ids:0
msgid "Related Picking"
msgstr ""
@@ -945,8 +1036,14 @@ msgid "Create Delivery Order"
msgstr ""
#. module: sale
-#: field:sale.installer,delivery:0
-msgid "Delivery Costs"
+#: code:addons/sale/sale.py:1290
+#, python-format
+msgid "Cannot delete a sales order line which is in state '%s'!"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Qty(UoS)"
msgstr ""
#. module: sale
@@ -961,13 +1058,13 @@ msgstr ""
#. module: sale
#: view:sale.report:0
-msgid "Sales by Product Category"
+msgid "Ordered date of the sales order"
msgstr ""
#. module: sale
-#: selection:sale.order,picking_policy:0
-msgid "Partial Delivery"
-msgstr "Dalinis pristatymas"
+#: view:sale.report:0
+msgid "Sales by Product Category"
+msgstr ""
#. module: sale
#: model:process.transition,name:sale.process_transition_confirmquotation0
@@ -975,9 +1072,10 @@ msgid "Confirm Quotation"
msgstr "Patvirtinti pasiūlymą"
#. module: sale
-#: help:sale.order,origin:0
-msgid "Reference of the document that generated this sales order request."
-msgstr ""
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:63
+#, python-format
+msgid "Error"
+msgstr "Klaida"
#. module: sale
#: view:sale.order:0
@@ -1009,20 +1107,14 @@ msgid "Procurement Method"
msgstr ""
#. module: sale
-#: view:sale.config.picking_policy:0
-#: view:sale.installer:0
-msgid "title"
-msgstr ""
-
-#. module: sale
#: model:process.node,name:sale.process_node_packinglist0
msgid "Pick List"
msgstr ""
#. module: sale
#: view:sale.order:0
-msgid "Order date"
-msgstr ""
+msgid "Set to Draft"
+msgstr "Padaryti juodraščiu"
#. module: sale
#: model:process.node,note:sale.process_node_packinglist0
@@ -1030,6 +1122,85 @@ msgid "Document of the move to the output or to the customer."
msgstr ""
#. module: sale
+#: model:email.template,body_text:sale.email_template_edi_sale
+msgid ""
+"\n"
+"Hello${object.partner_order_id.name and ' ' or "
+"''}${object.partner_order_id.name or ''},\n"
+"\n"
+"Here is your order confirmation for ${object.partner_id.name}:\n"
+" | Order number: *${object.name}*\n"
+" | Order total: *${object.amount_total} "
+"${object.pricelist_id.currency_id.name}*\n"
+" | Order date: ${object.date_order}\n"
+" % if object.origin:\n"
+" | Order reference: ${object.origin}\n"
+" % endif\n"
+" % if object.client_order_ref:\n"
+" | Your reference: ${object.client_order_ref}<br />\n"
+" % endif\n"
+" | Your contact: ${object.user_id.name} ${object.user_id.user_email "
+"and '<%s>'%(object.user_id.user_email) or ''}\n"
+"\n"
+"You can view the order confirmation, download it and even pay online using "
+"the following link:\n"
+" ${ctx.get('edi_web_url_view') or 'n/a'}\n"
+"\n"
+"% if object.order_policy in ('prepaid','manual') and "
+"object.company_id.paypal_account:\n"
+"<% \n"
+"comp_name = quote(object.company_id.name)\n"
+"order_name = quote(object.name)\n"
+"paypal_account = quote(object.company_id.paypal_account)\n"
+"order_amount = quote(str(object.amount_total))\n"
+"cur_name = quote(object.pricelist_id.currency_id.name)\n"
+"paypal_url = \"https://www.paypal.com/cgi-"
+"bin/webscr?cmd=_xclick&business=%s&item_name=%s%%20Order%%20%s&invoice=%s&amo"
+"unt=%s\" \\\n"
+" "
+"\"&currency_code=%s&button_subtype=services&no_note=1&bn=OpenERP_Order_PayNow"
+"_%s\" % \\\n"
+" "
+"(paypal_account,comp_name,order_name,order_name,order_amount,cur_name,cur_nam"
+"e)\n"
+"%>\n"
+"It is also possible to directly pay with Paypal:\n"
+" ${paypal_url}\n"
+"% endif\n"
+"\n"
+"If you have any question, do not hesitate to contact us.\n"
+"\n"
+"\n"
+"Thank you for choosing ${object.company_id.name}!\n"
+"\n"
+"\n"
+"--\n"
+"${object.user_id.name} ${object.user_id.user_email and "
+"'<%s>'%(object.user_id.user_email) or ''}\n"
+"${object.company_id.name}\n"
+"% if object.company_id.street:\n"
+"${object.company_id.street or ''}\n"
+"% endif\n"
+"% if object.company_id.street2:\n"
+"${object.company_id.street2}\n"
+"% endif\n"
+"% if object.company_id.city or object.company_id.zip:\n"
+"${object.company_id.zip or ''} ${object.company_id.city or ''}\n"
+"% endif\n"
+"% if object.company_id.country_id:\n"
+"${object.company_id.state_id and ('%s, ' % object.company_id.state_id.name) "
+"or ''} ${object.company_id.country_id.name or ''}\n"
+"% endif\n"
+"% if object.company_id.phone:\n"
+"Phone: ${object.company_id.phone}\n"
+"% endif\n"
+"% if object.company_id.website:\n"
+"${object.company_id.website or ''}\n"
+"% endif\n"
+" "
+msgstr ""
+
+#. module: sale
#: model:process.transition.action,name:sale.process_transition_action_validate0
msgid "Validate"
msgstr "Patvirtinti"
@@ -1052,9 +1223,9 @@ msgid "Taxes"
msgstr "Mokesčiai"
#. module: sale
-#: field:sale.order,order_policy:0
-msgid "Shipping Policy"
-msgstr "Dokumentų generavimo metodas"
+#: view:sale.order:0
+msgid "Sales Order ready to be invoiced"
+msgstr ""
#. module: sale
#: help:sale.order,create_date:0
@@ -1073,9 +1244,9 @@ msgid "Create Invoices"
msgstr ""
#. module: sale
-#: view:sale.order:0
-msgid "Extra Info"
-msgstr "Papildoma informacija"
+#: view:sale.report:0
+msgid "Sales order created in current month"
+msgstr ""
#. module: sale
#: report:sale.order:0
@@ -1083,11 +1254,24 @@ msgid "Fax :"
msgstr "Faksas :"
#. module: sale
+#: help:sale.order.line,type:0
+msgid ""
+"If 'on order', it triggers a procurement when the sale order is confirmed to "
+"create a task, purchase order or manufacturing order linked to this sale "
+"order line."
+msgstr ""
+
+#. module: sale
#: field:sale.advance.payment.inv,amount:0
msgid "Advance Amount"
msgstr ""
#. module: sale
+#: field:sale.config.picking_policy,charge_delivery:0
+msgid "Do you charge the delivery?"
+msgstr ""
+
+#. module: sale
#: selection:sale.order,invoice_quantity:0
msgid "Shipped Quantities"
msgstr "Pristatyti kiekiai"
@@ -1098,25 +1282,45 @@ msgid "Invoice Based on Sales Orders"
msgstr "Sąskaita faktūra sukurta iš pardavimų užsakymų"
#. module: sale
+#: code:addons/sale/sale.py:331
+#, python-format
+msgid ""
+"If you change the pricelist of this order (and eventually the currency), "
+"prices of existing order lines will not be updated."
+msgstr ""
+
+#. module: sale
#: model:ir.model,name:sale.model_stock_picking
msgid "Picking List"
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:387
-#: code:addons/sale/sale.py:920
-#: code:addons/sale/sale.py:938
+#: code:addons/sale/sale.py:412
+#: code:addons/sale/sale.py:503
+#: code:addons/sale/sale.py:632
+#: code:addons/sale/sale.py:1015
+#: code:addons/sale/sale.py:1033
#, python-format
msgid "Error !"
msgstr "Klaida!"
#. module: sale
-#: code:addons/sale/sale.py:570
+#: code:addons/sale/sale.py:603
#, python-format
msgid "Could not cancel sales order !"
msgstr ""
#. module: sale
+#: view:sale.order:0
+msgid "Qty(UoM)"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered Year of the sales order"
+msgstr ""
+
+#. module: sale
#: selection:sale.report,month:0
msgid "July"
msgstr ""
@@ -1133,35 +1337,25 @@ msgid "Shipping Exception"
msgstr "Pristatymo klaida"
#. module: sale
-#: field:sale.make.invoice,grouped:0
-msgid "Group the invoices"
-msgstr "Grupuoti sąskaitas faktūras"
-
-#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Shipping & Manual Invoice"
-msgstr "Pristatymas ir rankinis s/f sukūrimas"
-
-#. module: sale
-#: code:addons/sale/sale.py:1051
+#: code:addons/sale/sale.py:1143
#, python-format
-msgid "Picking Information !"
+msgid "Picking Information ! : "
msgstr ""
#. module: sale
-#: view:sale.report:0
-#: field:sale.report,month:0
-msgid "Month"
-msgstr ""
+#: field:sale.make.invoice,grouped:0
+msgid "Group the invoices"
+msgstr "Grupuoti sąskaitas faktūras"
#. module: sale
-#: model:ir.module.module,shortdesc:sale.module_meta_information
-msgid "Sales Management"
-msgstr "Pardavimų valdymas"
+#: field:sale.order,order_policy:0
+msgid "Invoice Policy"
+msgstr ""
#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Invoice From The Picking"
+#: model:ir.actions.act_window,name:sale.action_config_picking_policy
+#: view:sale.config.picking_policy:0
+msgid "Setup your Invoicing Method"
msgstr ""
#. module: sale
@@ -1171,27 +1365,30 @@ msgstr ""
#. module: sale
#: view:sale.report:0
-#: field:sale.report,uom_name:0
msgid "Reference UoM"
msgstr ""
#. module: sale
+#: view:sale.config.picking_policy:0
+msgid ""
+"This tool will help you to install the right module and configure the system "
+"according to the method you use to invoice your customers."
+msgstr ""
+
+#. module: sale
#: model:ir.model,name:sale.model_sale_order_line_make_invoice
msgid "Sale OrderLine Make_invoice"
msgstr ""
#. module: sale
-#: help:sale.config.picking_policy,step:0
-msgid ""
-"By default, OpenERP is able to manage complex routing and paths of products "
-"in your warehouse and partner locations. This will configure the most common "
-"and simple methods to deliver products to the customer in one or two "
-"operations by the worker."
-msgstr ""
+#: selection:sale.order,state:0
+#: selection:sale.report,state:0
+msgid "Invoice Exception"
+msgstr "Sąskaitos faktūros klaida"
#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_tree
-msgid "Old Quotations"
+#: model:process.node,note:sale.process_node_saleorder0
+msgid "Drives procurement and invoicing"
msgstr ""
#. module: sale
@@ -1207,6 +1404,22 @@ msgid "Sales Analysis"
msgstr ""
#. module: sale
+#: code:addons/sale/sale.py:1138
+#, python-format
+msgid ""
+"You selected a quantity of %d Units.\n"
+"But it's not compatible with the selected packaging.\n"
+"Here is a proposition of quantities according to the packaging:\n"
+"EAN: %s Quantity: %s Type of ul: %s"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Recreate Packing"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
#: field:sale.order.line,property_ids:0
msgid "Properties"
msgstr "Ypatybės"
@@ -1233,7 +1446,17 @@ msgid ""
msgstr ""
#. module: sale
-#: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
+#: view:sale.order.line:0
+msgid "Confirmed sale order lines, not yet delivered"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:473
+#, python-format
+msgid "Customer Invoices"
+msgstr ""
+
+#. module: sale
#: model:process.process,name:sale.process_process_salesprocess0
#: view:sale.order:0
#: view:sale.report:0
@@ -1255,18 +1478,13 @@ msgid "Done"
msgstr "Atlikta"
#. module: sale
-#: model:ir.model,name:sale.model_sale_installer
-msgid "sale.installer"
-msgstr ""
-
-#. module: sale
#: model:process.node,name:sale.process_node_invoice0
#: model:process.node,name:sale.process_node_invoiceafterdelivery0
msgid "Invoice"
msgstr "Sąskaita faktūra"
#. module: sale
-#: code:addons/sale/sale.py:1014
+#: code:addons/sale/sale.py:1158
#, python-format
msgid ""
"You have to select a customer in the sales form !\n"
@@ -1274,11 +1492,6 @@ msgid ""
msgstr ""
#. module: sale
-#: selection:sale.config.picking_policy,step:0
-msgid "Picking List & Delivery Order"
-msgstr ""
-
-#. module: sale
#: field:sale.order,origin:0
msgid "Source Document"
msgstr ""
@@ -1304,7 +1517,7 @@ msgid "The amount without tax."
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:571
+#: code:addons/sale/sale.py:604
#, python-format
msgid "You must first cancel all picking attached to this sales order."
msgstr ""
@@ -1315,8 +1528,14 @@ msgid "Sales Advance Payment Invoice"
msgstr ""
#. module: sale
-#: field:sale.order,incoterm:0
-msgid "Incoterm"
+#: view:sale.report:0
+#: field:sale.report,month:0
+msgid "Month"
+msgstr ""
+
+#. module: sale
+#: model:email.template,subject:sale.email_template_edi_sale
+msgid "${object.company_id.name} Order (Ref ${object.name or 'n/a' })"
msgstr ""
#. module: sale
@@ -1328,11 +1547,6 @@ msgid "Product"
msgstr "Produktas"
#. module: sale
-#: model:ir.ui.menu,name:sale.menu_invoiced
-msgid "Invoicing"
-msgstr ""
-
-#. module: sale
#: model:process.transition.action,name:sale.process_transition_action_cancelassignation0
msgid "Cancel Assignation"
msgstr "Atšaukti paskyrimą"
@@ -1343,14 +1557,10 @@ msgid "sale.config.picking_policy"
msgstr "Važtaraščių taisyklės"
#. module: sale
-#: help:sale.order,state:0
-msgid ""
-"Gives the state of the quotation or sales order. \n"
-"The exception state is automatically set when a cancel operation occurs in "
-"the invoice validation (Invoice Exception) or in the picking list process "
-"(Shipping Exception). \n"
-"The 'Waiting Schedule' state is set when the invoice is confirmed but "
-"waiting for the scheduler to run on the date 'Ordered Date'."
+#: view:account.invoice.report:0
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_turnover_by_month
+msgid "Monthly Turnover"
msgstr ""
#. module: sale
@@ -1369,7 +1579,6 @@ msgid "Product UoS"
msgstr "Produktas"
#. module: sale
-#: selection:sale.order,state:0
#: selection:sale.report,state:0
msgid "Manual In Progress"
msgstr "Vykdomas"
@@ -1390,7 +1599,8 @@ msgid "Order"
msgstr "Užsakymas"
#. module: sale
-#: code:addons/sale/sale.py:921
+#: code:addons/sale/sale.py:1016
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:71
#, python-format
msgid "There is no income account defined for this product: \"%s\" (id:%d)"
msgstr ""
@@ -1410,7 +1620,7 @@ msgid ""
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:1116
+#: code:addons/sale/sale.py:1238
#, python-format
msgid ""
"You plan to sell %.2f %s but you only have %.2f %s available !\n"
@@ -1439,10 +1649,10 @@ msgid "Total"
msgstr "Iš viso"
#. module: sale
-#: code:addons/sale/sale.py:388
-#, python-format
-msgid "There is no sales journal defined for this company: \"%s\" (id:%d)"
-msgstr ""
+#: report:sale.order:0
+#: view:sale.order.line:0
+msgid "Price"
+msgstr "Kaina"
#. module: sale
#: model:process.transition,note:sale.process_transition_deliver0
@@ -1453,9 +1663,14 @@ msgid ""
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:1165
-#, python-format
-msgid "Cannot delete a sales order line which is %s !"
+#: selection:sale.order,order_policy:0
+msgid "Pay before delivery"
+msgstr ""
+
+#. module: sale
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.open_board_sales
+msgid "Sales Dashboard"
msgstr ""
#. module: sale
@@ -1467,6 +1682,7 @@ msgstr ""
#. module: sale
#: view:sale.order:0
+#: selection:sale.order,state:0
#: view:sale.order.line:0
msgid "To Invoice"
msgstr ""
@@ -1477,6 +1693,11 @@ msgid "Date on which sales order is confirmed."
msgstr ""
#. module: sale
+#: field:sale.order,project_id:0
+msgid "Contract/Analytic Account"
+msgstr ""
+
+#. module: sale
#: field:sale.order,company_id:0
#: field:sale.order.line,company_id:0
#: view:sale.report:0
@@ -1496,22 +1717,17 @@ msgid "The amount to be invoiced in advance."
msgstr ""
#. module: sale
-#: selection:sale.order,state:0
-#: selection:sale.report,state:0
-msgid "Invoice Exception"
-msgstr "Sąskaitos faktūros klaida"
-
-#. module: sale
-#: help:sale.order,picking_ids:0
+#: code:addons/sale/sale.py:1256
+#, python-format
msgid ""
-"This is a list of picking that has been generated for this sales order."
+"Couldn't find a pricelist line matching this product and quantity.\n"
+"You have to change either the product, the quantity or the pricelist."
msgstr ""
#. module: sale
-#: help:sale.installer,sale_margin:0
+#: help:sale.order,picking_ids:0
msgid ""
-"Gives the margin of profitability by calculating the difference between Unit "
-"Price and Cost Price."
+"This is a list of picking that has been generated for this sales order."
msgstr ""
#. module: sale
@@ -1533,6 +1749,11 @@ msgid "Cancelled"
msgstr "Atšauktas"
#. module: sale
+#: view:sale.order.line:0
+msgid "Sales Order Lines related to a Sales Order of mine"
+msgstr ""
+
+#. module: sale
#: model:ir.actions.act_window,name:sale.action_shop_form
#: model:ir.ui.menu,name:sale.menu_action_shop_form
#: field:sale.order,shop_id:0
@@ -1542,17 +1763,12 @@ msgid "Shop"
msgstr "Parduotuvė"
#. module: sale
-#: view:sale.report:0
-msgid " Month "
-msgstr ""
-
-#. module: sale
#: field:sale.report,date_confirm:0
msgid "Date Confirm"
msgstr ""
#. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:111
+#: code:addons/sale/wizard/sale_line_invoice.py:113
#, python-format
msgid "Warning"
msgstr ""
@@ -1564,17 +1780,6 @@ msgid "Sales by Month"
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:1045
-#, python-format
-msgid ""
-"You selected a quantity of %d Units.\n"
-"But it's not compatible with the selected packaging.\n"
-"Here is a proposition of quantities according to the packaging:\n"
-"\n"
-"EAN: %s Quantity: %s Type of ul: %s"
-msgstr ""
-
-#. module: sale
#: model:ir.model,name:sale.model_sale_order
#: model:process.node,name:sale.process_node_order0
#: model:process.node,name:sale.process_node_saleorder0
@@ -1590,6 +1795,11 @@ msgid "Quantity (UoS)"
msgstr "Kiekis (Mat. vnt.)"
#. module: sale
+#: view:sale.order.line:0
+msgid "Sale Order Lines that are in 'done' state"
+msgstr ""
+
+#. module: sale
#: model:process.transition,note:sale.process_transition_packing0
msgid ""
"The Pick List form is created as soon as the sales order is confirmed, in "
@@ -1604,6 +1814,11 @@ msgid "Confirmed"
msgstr "Patvirtinta"
#. module: sale
+#: field:sale.config.picking_policy,order_policy:0
+msgid "Main Method Based On"
+msgstr ""
+
+#. module: sale
#: model:process.transition.action,name:sale.process_transition_action_confirm0
msgid "Confirm"
msgstr "Patvirtinti"
@@ -1626,6 +1841,7 @@ msgid "Invoice Lines"
msgstr "Sąskaitos eilutės"
#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_product_tree
#: view:sale.order:0
#: view:sale.order.line:0
msgid "Sales Order Lines"
@@ -1642,30 +1858,18 @@ msgid "Configuration"
msgstr "Nustatymai"
#. module: sale
-#: selection:sale.order,picking_policy:0
-msgid "Complete Delivery"
-msgstr "Pilnas pristatymas"
-
-#. module: sale
-#: view:sale.report:0
-msgid " Month-1 "
-msgstr ""
-
-#. module: sale
-#: help:sale.config.picking_policy,picking_policy:0
-msgid ""
-"The Shipping Policy is used to configure per order if you want to deliver as "
-"soon as possible when one product is available or you wait that all products "
-"are available.."
+#: code:addons/sale/edi/sale_order.py:146
+#, python-format
+msgid "EDI Pricelist (%s)"
msgstr ""
#. module: sale
-#: selection:sale.report,month:0
-msgid "August"
+#: view:sale.report:0
+msgid "Sales order created in current year"
msgstr ""
#. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:111
+#: code:addons/sale/wizard/sale_line_invoice.py:113
#, python-format
msgid ""
"Invoice cannot be created for this Sales Order Line due to one of the "
@@ -1675,6 +1879,11 @@ msgid ""
msgstr ""
#. module: sale
+#: view:sale.order.line:0
+msgid "Sale order lines done"
+msgstr ""
+
+#. module: sale
#: field:sale.order.line,th_weight:0
msgid "Weight"
msgstr "Svoris"
@@ -1693,7 +1902,6 @@ msgstr ""
#. module: sale
#: field:sale.config.picking_policy,config_logo:0
-#: field:sale.installer,config_logo:0
msgid "Image"
msgstr ""
@@ -1723,8 +1931,8 @@ msgid "Salesman"
msgstr "Pardavėjas"
#. module: sale
-#: model:process.node,note:sale.process_node_saleorder0
-msgid "Drives procurement and invoicing"
+#: model:ir.actions.act_window,name:sale.action_order_tree
+msgid "Old Quotations"
msgstr ""
#. module: sale
@@ -1733,7 +1941,7 @@ msgid "Untaxed Amount"
msgstr "Suma be mokesčių"
#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:163
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:170
#: model:ir.actions.act_window,name:sale.action_view_sale_advance_payment_inv
#: view:sale.advance.payment.inv:0
#: view:sale.order:0
@@ -1742,7 +1950,7 @@ msgid "Advance Invoice"
msgstr "Avanso sąskaita faktūra"
#. module: sale
-#: code:addons/sale/sale.py:591
+#: code:addons/sale/sale.py:624
#, python-format
msgid "The sales order '%s' has been cancelled."
msgstr ""
@@ -1777,19 +1985,19 @@ msgid "Packings"
msgstr ""
#. module: sale
-#: field:sale.config.picking_policy,progress:0
-#: field:sale.installer,progress:0
-msgid "Configuration Progress"
+#: view:sale.order.line:0
+msgid "Sale Order Lines ready to be invoiced"
msgstr ""
#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_product_tree
-msgid "Product sales"
-msgstr "Produkto pardavimai"
+#: view:sale.report:0
+msgid "Sales order created in last month"
+msgstr ""
#. module: sale
-#: field:sale.order,date_order:0
-msgid "Ordered Date"
+#: model:ir.actions.act_window,name:sale.action_email_templates
+#: model:ir.ui.menu,name:sale.menu_email_templates
+msgid "Email Templates"
msgstr ""
#. module: sale
@@ -1800,13 +2008,14 @@ msgid "Sales Orders"
msgstr "Pardavimų užsakymai"
#. module: sale
-#: selection:sale.config.picking_policy,picking_policy:0
-msgid "Direct Delivery"
-msgstr "Tiesioginis pristatymas"
+#: model:ir.model,name:sale.model_sale_shop
+#: view:sale.shop:0
+msgid "Sales Shop"
+msgstr ""
#. module: sale
-#: field:sale.installer,sale_journal:0
-msgid "Invoicing journals"
+#: selection:sale.report,month:0
+msgid "November"
msgstr ""
#. module: sale
@@ -1815,18 +2024,12 @@ msgid "Advance Product"
msgstr "Avansinės prekės"
#. module: sale
-#: view:sale.report:0
-#: field:sale.report,shipped_qty_1:0
-msgid "Shipped Qty"
-msgstr ""
-
-#. module: sale
-#: view:sale.open.invoice:0
-msgid "You invoice has been successfully created!"
-msgstr ""
+#: view:sale.order:0
+msgid "Compute"
+msgstr "Skaičiuoti"
#. module: sale
-#: code:addons/sale/sale.py:585
+#: code:addons/sale/sale.py:618
#, python-format
msgid "You must first cancel all invoices attached to this sales order."
msgstr ""
@@ -1837,33 +2040,27 @@ msgid "January"
msgstr ""
#. module: sale
-#: view:sale.installer:0
-msgid "Configure Your Sales Management Application"
-msgstr ""
-
-#. module: sale
#: model:ir.actions.act_window,name:sale.action_order_tree4
msgid "Sales Order in Progress"
msgstr "Vykdomi pardavimų užsakymai"
#. module: sale
-#: field:sale.installer,sale_layout:0
-msgid "Sales Order Layout Improvement"
+#: help:sale.order,origin:0
+msgid "Reference of the document that generated this sales order request."
msgstr ""
#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:63
-#, python-format
-msgid "Error"
-msgstr "Klaida"
-
-#. module: sale
#: view:sale.report:0
#: field:sale.report,delay:0
msgid "Commitment Delay"
msgstr ""
#. module: sale
+#: selection:sale.order,order_policy:0
+msgid "Deliver & invoice on demand"
+msgstr ""
+
+#. module: sale
#: model:process.node,note:sale.process_node_saleprocurement0
msgid ""
"One Procurement order for each sales order line and for each of the "
@@ -1886,13 +2083,12 @@ msgid "Confirmed sales order to invoice."
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:290
-#, python-format
-msgid "Cannot delete Sales Order(s) which are already confirmed !"
+#: view:sale.order:0
+msgid "Sales Order that haven't yet been confirmed"
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:316
+#: code:addons/sale/sale.py:322
#, python-format
msgid "The sales order '%s' has been set in draft state."
msgstr ""
@@ -1903,24 +2099,19 @@ msgid "from stock"
msgstr "Iš sandėlio"
#. module: sale
-#: field:sale.config.picking_policy,order_policy:0
-msgid "Shipping Default Policy"
-msgstr "Pristatymų numatytosios taisyklės"
-
-#. module: sale
#: view:sale.open.invoice:0
msgid "Close"
msgstr "Uždaryta"
#. module: sale
-#: field:sale.order,shipped:0
-msgid "Delivered"
+#: code:addons/sale/sale.py:1248
+#, python-format
+msgid "No Pricelist ! : "
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:1115
-#, python-format
-msgid "Not enough stock !"
+#: field:sale.order,shipped:0
+msgid "Delivered"
msgstr ""
#. module: sale
@@ -1929,11 +2120,6 @@ msgid "You must assign a production lot for this product"
msgstr ""
#. module: sale
-#: field:sale.order.line,sequence:0
-msgid "Layout Sequence"
-msgstr ""
-
-#. module: sale
#: model:ir.actions.act_window,help:sale.action_shop_form
msgid ""
"If you have more than one shop reselling your company products, you can "
@@ -1960,11 +2146,6 @@ msgid "May"
msgstr ""
#. module: sale
-#: help:sale.installer,sale_order_dates:0
-msgid "Adds commitment, requested and effective dates on Sales Orders."
-msgstr ""
-
-#. module: sale
#: view:sale.order:0
#: field:sale.order,partner_id:0
#: field:sale.order.line,order_partner_id:0
@@ -1972,23 +2153,11 @@ msgid "Customer"
msgstr "Klientas"
#. module: sale
-#: model:product.template,name:sale.advance_product_0_product_template
-msgid "Advance"
-msgstr ""
-
-#. module: sale
#: selection:sale.report,month:0
msgid "February"
msgstr ""
#. module: sale
-#: help:sale.installer,sale_journal:0
-msgid ""
-"Allows you to group and invoice your delivery orders according to different "
-"invoicing types: daily, weekly, etc."
-msgstr ""
-
-#. module: sale
#: selection:sale.report,month:0
msgid "April"
msgstr ""
@@ -1999,11 +2168,6 @@ msgid "Accounting"
msgstr "Sąskaita"
#. module: sale
-#: field:sale.config.picking_policy,step:0
-msgid "Steps To Deliver a Sales Order"
-msgstr ""
-
-#. module: sale
#: view:sale.order:0
#: view:sale.order.line:0
msgid "Search Sales Order"
@@ -2015,18 +2179,18 @@ msgid "Sales Order Requisition"
msgstr ""
#. module: sale
+#: code:addons/sale/sale.py:1242
+#, python-format
+msgid "Not enough stock ! : "
+msgstr ""
+
+#. module: sale
#: report:sale.order:0
#: field:sale.order,payment_term:0
msgid "Payment Term"
msgstr "Mokėjimo terminas"
#. module: sale
-#: help:sale.installer,sale_layout:0
-msgid ""
-"Provides some features to improve the layout of the Sales Order reports."
-msgstr ""
-
-#. module: sale
#: model:ir.actions.act_window,help:sale.action_order_report_all
msgid ""
"This report performs analysis on your quotations and sales orders. Analysis "
@@ -2058,6 +2222,9 @@ msgstr ""
msgid "Invoice Based on Deliveries"
msgstr "Sąskaita faktūra iš pristatymo užsakymo"
+#~ msgid "Partial Delivery"
+#~ msgstr "Dalinis pristatymas"
+
#~ msgid "Origin"
#~ msgstr "Kilmė"
@@ -2070,18 +2237,21 @@ msgstr "Sąskaita faktūra iš pristatymo užsakymo"
#~ msgid "Sales orders"
#~ msgstr "Pardavimų užsakymai"
-#~ msgid "My Quotations"
-#~ msgstr "Mano pasiūlymai"
-
#~ msgid "Canceled"
#~ msgstr "Atšaukta"
#~ msgid "Status"
#~ msgstr "Būsena"
+#~ msgid "Product sales"
+#~ msgstr "Produkto pardavimai"
+
#~ msgid "Sequence"
#~ msgstr "Seka"
+#~ msgid "Delivery Order Only"
+#~ msgstr "Tik pristatymo užsakymas"
+
#~ msgid "Other data"
#~ msgstr "Kiti duomenys"
@@ -2091,6 +2261,9 @@ msgstr "Sąskaita faktūra iš pristatymo užsakymo"
#~ msgid "Sales order"
#~ msgstr "Pardavimų užsakymas"
+#~ msgid "Sales Management"
+#~ msgstr "Pardavimų valdymas"
+
#~ msgid "Error: Invalid ean code"
#~ msgstr "Klaida: Netinkamas EAN kodas"
@@ -2129,9 +2302,15 @@ msgstr "Sąskaita faktūra iš pristatymo užsakymo"
#~ msgid "Invoice after delivery"
#~ msgstr "Automatinis s/f sukūrimas po pristatymo"
+#~ msgid "Shipping Policy"
+#~ msgstr "Dokumentų generavimo metodas"
+
#~ msgid "Outgoing Products"
#~ msgstr "Siunčiamos prekės"
+#~ msgid "All at Once"
+#~ msgstr "Viskas iš karto"
+
#~ msgid "Procurement is created after confirmation of sale order."
#~ msgstr ""
#~ "Planinis užsakymas yra sukuriamas po pardavimo užsakymo patvirtinimo."
@@ -2192,6 +2371,9 @@ msgstr "Sąskaita faktūra iš pristatymo užsakymo"
#~ "Kai pasirenkate dokumentų generavimo metodą \"Automatinis sąskaitos faktūros "
#~ "išrašymas po pristatymo\", ji automatiškai bus sukurta po pristatymo."
+#~ msgid "Complete Delivery"
+#~ msgstr "Pilnas pristatymas"
+
#~ msgid "Manual Description"
#~ msgstr "Rankinis deklaravimas"
@@ -2249,6 +2431,9 @@ msgstr "Sąskaita faktūra iš pristatymo užsakymo"
#~ msgid "Manages the delivery and invoicing progress"
#~ msgstr "Valdyti pristatymo ir pajamavimo progresą."
+#~ msgid "Shipping Default Policy"
+#~ msgstr "Pristatymų numatytosios taisyklės"
+
#, python-format
#~ msgid "Could not cancel sale order !"
#~ msgstr "Negalima atšaukti pardavimo užsakymo!"
@@ -2306,6 +2491,9 @@ msgstr "Sąskaita faktūra iš pristatymo užsakymo"
#~ msgid "Procurement Corrected"
#~ msgstr "Planinių užsakymų ištaisymas"
+#~ msgid "Shipping & Manual Invoice"
+#~ msgstr "Pristatymas ir rankinis s/f sukūrimas"
+
#~ msgid "Sale Procurement"
#~ msgstr "Planiniai užsakymai"
@@ -2330,6 +2518,9 @@ msgstr "Sąskaita faktūra iš pristatymo užsakymo"
#~ msgid "Sale Pricelists"
#~ msgstr "Pardavimų kainoraščiai"
+#~ msgid "Direct Delivery"
+#~ msgstr "Tiesioginis pristatymas"
+
#~ msgid ""
#~ "Invoice is created when 'Create Invoice' is being clicked after confirming "
#~ "the sale order. This transaction moves the sale order to invoices."
@@ -2456,6 +2647,9 @@ msgstr "Sąskaita faktūra iš pristatymo užsakymo"
#~ msgid "Related invoices"
#~ msgstr "Susijusios sąskaitos faktūros"
+#~ msgid "Payment Before Delivery"
+#~ msgstr "Apmokėjimas prieš pristatymą"
+
#~ msgid ""
#~ "This is the list of invoices that have been generated for this sale order. "
#~ "The same sale order may have been invoiced in several times (by line for "
diff --git a/addons/sale/i18n/lv.po b/addons/sale/i18n/lv.po
index d44bd5d38d1..581e9ee01aa 100644
--- a/addons/sale/i18n/lv.po
+++ b/addons/sale/i18n/lv.po
@@ -7,25 +7,32 @@ msgid ""
msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-01-11 11:16+0000\n"
+"POT-Creation-Date: 2011-12-22 18:43+0000\n"
"PO-Revision-Date: 2009-09-08 12:39+0000\n"
"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
"Language-Team: Latvian <lv@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-05 05:16+0000\n"
-"X-Generator: Launchpad (build 14231)\n"
+"X-Launchpad-Export-Date: 2011-12-23 06:46+0000\n"
+"X-Generator: Launchpad (build 14560)\n"
#. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_sales_by_salesman
-msgid "Sales by Salesman in last 90 days"
+#: field:sale.config.picking_policy,timesheet:0
+msgid "Based on Timesheet"
msgstr ""
#. module: sale
-#: help:sale.installer,delivery:0
-msgid "Allows you to compute delivery costs on your quotations."
+#: view:sale.order.line:0
+msgid ""
+"Sale Order Lines that are confirmed, done or in exception state and haven't "
+"yet been invoiced"
+msgstr ""
+
+#. module: sale
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_sales_by_salesman
+msgid "Sales by Salesman in last 90 days"
msgstr ""
#. module: sale
@@ -36,6 +43,11 @@ msgid ""
msgstr ""
#. module: sale
+#: view:sale.order:0
+msgid "UoS"
+msgstr ""
+
+#. module: sale
#: help:sale.order,partner_shipping_id:0
msgid "Shipping address for current sales order."
msgstr ""
@@ -59,22 +71,12 @@ msgid "Cancel Order"
msgstr "Atcelt Pasūtījumu"
#. module: sale
-#: view:sale.config.picking_policy:0
-msgid "Configure Sales Order Logistics"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:603
+#: code:addons/sale/sale.py:638
#, python-format
msgid "The quotation '%s' has been converted to a sales order."
msgstr ""
#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Payment Before Delivery"
-msgstr "Apmaksa pirms Piegādes"
-
-#. module: sale
#: code:addons/sale/wizard/sale_make_invoice.py:42
#, python-format
msgid "Warning !"
@@ -91,12 +93,6 @@ msgid "Drives procurement orders for every sales order line."
msgstr ""
#. module: sale
-#: selection:sale.config.picking_policy,picking_policy:0
-msgid "All at Once"
-msgstr "Visu kopā"
-
-#. module: sale
-#: field:sale.order,project_id:0
#: view:sale.report:0
#: field:sale.report,analytic_account_id:0
#: field:sale.shop,project_id:0
@@ -112,6 +108,15 @@ msgid ""
msgstr ""
#. module: sale
+#: code:addons/sale/sale.py:295
+#, python-format
+msgid ""
+"In order to delete a confirmed sale order, you must cancel it before ! To "
+"cancel a sale order, you must first cancel related picking or delivery "
+"orders."
+msgstr ""
+
+#. module: sale
#: model:process.node,name:sale.process_node_saleprocurement0
msgid "Procurement Order"
msgstr ""
@@ -123,6 +128,11 @@ msgid "Partner"
msgstr ""
#. module: sale
+#: selection:sale.order,order_policy:0
+msgid "Invoice based on deliveries"
+msgstr ""
+
+#. module: sale
#: view:sale.order:0
msgid "Order Line"
msgstr "Pasūtījuma pozīcija"
@@ -155,8 +165,13 @@ msgid "Default Payment Term"
msgstr "Apmaksas termiņš pēc noklusējuma"
#. module: sale
-#: model:ir.actions.act_window,name:sale.action_config_picking_policy
-msgid "Configure Picking Policy for Sales Order"
+#: field:sale.config.picking_policy,deli_orders:0
+msgid "Based on Delivery Orders"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.picking_policy,time_unit:0
+msgid "Main Working Time Unit"
msgstr ""
#. module: sale
@@ -173,9 +188,10 @@ msgid "Disc.(%)"
msgstr "Atlaide %"
#. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_forceassignation0
-msgid "Force Assignation"
-msgstr "Piespiedu Nodošana"
+#: view:sale.report:0
+#: field:sale.report,price_total:0
+msgid "Total Price"
+msgstr ""
#. module: sale
#: help:sale.make.invoice,grouped:0
@@ -183,6 +199,11 @@ msgid "Check the box to group the invoices for the same customers"
msgstr ""
#. module: sale
+#: view:sale.order:0
+msgid "My Sale Orders"
+msgstr ""
+
+#. module: sale
#: selection:sale.order,invoice_quantity:0
msgid "Ordered Quantities"
msgstr "Pasūtītais Daudzums"
@@ -221,13 +242,24 @@ msgid ""
msgstr ""
#. module: sale
+#: field:sale.config.picking_policy,task_work:0
+msgid "Based on Tasks' Work"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
+msgid "Quotations and Sales"
+msgstr ""
+
+#. module: sale
#: model:ir.model,name:sale.model_sale_make_invoice
msgid "Sales Make Invoice"
msgstr ""
#. module: sale
-#: view:sale.order:0
-msgid "Recreate Packing"
+#: code:addons/sale/sale.py:330
+#, python-format
+msgid "Pricelist Warning!"
msgstr ""
#. module: sale
@@ -236,9 +268,9 @@ msgid "Discount (%)"
msgstr "Atlaide %"
#. module: sale
-#: help:res.company,security_lead:0
-msgid ""
-"This is the days added to what you promise to customers for security purpose"
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_quotation_for_sale
+msgid "My Quotations"
msgstr ""
#. module: sale
@@ -264,7 +296,22 @@ msgid "Shop Name"
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:1014
+#: help:sale.order,order_policy:0
+msgid ""
+"The Invoice Policy is used to synchronise invoice and delivery operations.\n"
+" - The 'Pay before delivery' choice will first generate the invoice and "
+"then generate the picking order after the payment of this invoice.\n"
+" - The 'Deliver & Invoice on demand' will create the picking order directly "
+"and wait for the user to manually click on the 'Invoice' button to generate "
+"the draft invoice based on the sale order or the sale order lines.\n"
+" - The 'Invoice on order after delivery' choice will generate the draft "
+"invoice based on sales order after all picking lists have been finished.\n"
+" - The 'Invoice based on deliveries' choice is used to create an invoice "
+"during the picking process."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:1158
#, python-format
msgid "No Customer Defined !"
msgstr ""
@@ -275,9 +322,12 @@ msgid "Sales in Exception"
msgstr ""
#. module: sale
-#: view:sale.order:0
-msgid "Set to Draft"
-msgstr "Atzīmēt kā Melnrakstu"
+#: code:addons/sale/sale.py:1145
+#: code:addons/sale/sale.py:1264
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:70
+#, python-format
+msgid "Configuration Error !"
+msgstr ""
#. module: sale
#: view:sale.order:0
@@ -285,22 +335,7 @@ msgid "Conditions"
msgstr ""
#. module: sale
-#: help:sale.order,order_policy:0
-msgid ""
-"The Shipping Policy is used to synchronise invoice and delivery operations.\n"
-" - The 'Pay Before delivery' choice will first generate the invoice and "
-"then generate the picking order after the payment of this invoice.\n"
-" - The 'Shipping & Manual Invoice' will create the picking order directly "
-"and wait for the user to manually click on the 'Invoice' button to generate "
-"the draft invoice.\n"
-" - The 'Invoice On Order After Delivery' choice will generate the draft "
-"invoice based on sales order after all picking lists have been finished.\n"
-" - The 'Invoice From The Picking' choice is used to create an invoice "
-"during the picking process."
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:939
+#: code:addons/sale/sale.py:1034
#, python-format
msgid ""
"There is no income category account defined in default Properties for "
@@ -308,8 +343,8 @@ msgid ""
msgstr ""
#. module: sale
-#: view:sale.installer:0
-msgid "Configure"
+#: selection:sale.report,month:0
+msgid "August"
msgstr ""
#. module: sale
@@ -318,7 +353,7 @@ msgid "You try to assign a lot which is not from the same product"
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:620
+#: code:addons/sale/sale.py:655
#, python-format
msgid "invalid mode for test_state"
msgstr "nepareizs režīms test_state"
@@ -329,7 +364,7 @@ msgid "June"
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:584
+#: code:addons/sale/sale.py:617
#, python-format
msgid "Could not cancel this sales order !"
msgstr ""
@@ -350,8 +385,12 @@ msgid "October"
msgstr ""
#. module: sale
+#: sql_constraint:stock.picking:0
+msgid "Reference must be unique per Company!"
+msgstr ""
+
+#. module: sale
#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_quotation_for_sale
#: view:sale.order:0
#: view:sale.report:0
msgid "Quotations"
@@ -363,11 +402,6 @@ msgid "Pricelist for current sales order."
msgstr ""
#. module: sale
-#: selection:sale.config.picking_policy,step:0
-msgid "Delivery Order Only"
-msgstr "Piegādes Pasūtījums Tikai"
-
-#. module: sale
#: report:sale.order:0
msgid "TVA :"
msgstr ""
@@ -392,6 +426,7 @@ msgstr "Fiskālā Pozīcija"
#. module: sale
#: view:sale.order:0
#: view:sale.order.line:0
+#: field:sale.report,product_uom:0
msgid "UoM"
msgstr "mērv."
@@ -414,13 +449,19 @@ msgid ""
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:971
+#: code:addons/sale/sale.py:1061
+#, python-format
+msgid "You cannot cancel a sale order line that has already been invoiced!"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:1066
#, python-format
msgid "You must first cancel stock moves attached to this sales order line."
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:1042
+#: code:addons/sale/sale.py:1134
#, python-format
msgid "(n/a)"
msgstr ""
@@ -454,13 +495,35 @@ msgid "Notes"
msgstr "Piezīmes"
#. module: sale
+#: sql_constraint:res.company:0
+msgid "The company name must be unique !"
+msgstr ""
+
+#. module: sale
#: help:sale.order,partner_invoice_id:0
msgid "Invoice address for current sales order."
msgstr ""
#. module: sale
-#: view:sale.installer:0
-msgid "Enhance your core Sales Application with additional functionalities."
+#: view:sale.report:0
+msgid "Month-1"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered month of the sales order"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:504
+#, python-format
+msgid ""
+"You cannot group sales having different currencies for the same partner."
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,picking_policy:0
+msgid "Deliver each product when available"
msgstr ""
#. module: sale
@@ -480,18 +543,40 @@ msgid "Confirmation Date"
msgstr ""
#. module: sale
+#: field:sale.order,incoterm:0
+msgid "Incoterm"
+msgstr "Inkoterms"
+
+#. module: sale
#: field:sale.order.line,address_allotment_id:0
msgid "Allotment Partner"
msgstr "Daļas Partneris"
#. module: sale
-#: sql_constraint:sale.order:0
-msgid "Order Reference must be unique !"
+#: selection:sale.report,month:0
+msgid "March"
msgstr ""
#. module: sale
-#: selection:sale.report,month:0
-msgid "March"
+#: constraint:stock.move:0
+msgid "You can not move products from or to a location of the type view."
+msgstr ""
+
+#. module: sale
+#: field:sale.config.picking_policy,sale_orders:0
+msgid "Based on Sales Orders"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,state:0
+msgid ""
+"Givwizard = self.browse(cr, uid, ids)[0]es the state of the quotation or "
+"sales order. \n"
+"The exception state is automatically set when a cancel operation occurs in "
+"the invoice validation (Invoice Exception) or in the picking list process "
+"(Shipping Exception). \n"
+"The 'Waiting Schedule' state is set when the invoice is confirmed but "
+"waiting for the scheduler to run on the order date."
msgstr ""
#. module: sale
@@ -510,6 +595,11 @@ msgid "Invoice address :"
msgstr "Rēķina adrese:"
#. module: sale
+#: field:sale.order.line,sequence:0
+msgid "Line Sequence"
+msgstr ""
+
+#. module: sale
#: model:process.transition,note:sale.process_transition_saleorderprocurement0
msgid ""
"For every sales order line, a procurement order is created to supply the "
@@ -556,11 +646,6 @@ msgid "Sales Order Line"
msgstr ""
#. module: sale
-#: view:sale.config.picking_policy:0
-msgid "Setup your sales workflow and default values."
-msgstr ""
-
-#. module: sale
#: field:sale.shop,warehouse_id:0
msgid "Warehouse"
msgstr "Noliktava"
@@ -597,6 +682,11 @@ msgid "Creation Date"
msgstr ""
#. module: sale
+#: model:ir.ui.menu,name:sale.menu_sales_configuration_misc
+msgid "Miscellaneous"
+msgstr ""
+
+#. module: sale
#: model:ir.actions.act_window,name:sale.action_order_line_tree3
msgid "Uninvoiced and Delivered Lines"
msgstr ""
@@ -612,14 +702,19 @@ msgid "My Sales"
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:290
-#: code:addons/sale/sale.py:966
-#: code:addons/sale/sale.py:1165
+#: code:addons/sale/sale.py:295
+#: code:addons/sale/sale.py:1061
+#: code:addons/sale/sale.py:1290
#, python-format
msgid "Invalid action !"
msgstr "Nepareiza darbība!"
#. module: sale
+#: view:sale.order:0
+msgid "Extra Info"
+msgstr "Papildus Info"
+
+#. module: sale
#: field:sale.order,pricelist_id:0
#: field:sale.report,pricelist_id:0
#: field:sale.shop,pricelist_id:0
@@ -633,13 +728,21 @@ msgid "# of Qty"
msgstr ""
#. module: sale
+#: code:addons/sale/sale.py:1314
+#, python-format
+msgid "Hour"
+msgstr ""
+
+#. module: sale
#: view:sale.order:0
msgid "Order Date"
msgstr ""
#. module: sale
#: view:sale.order.line:0
+#: view:sale.report:0
#: field:sale.report,shipped:0
+#: field:sale.report,shipped_qty_1:0
msgid "Shipped"
msgstr ""
@@ -649,8 +752,8 @@ msgid "All Quotations"
msgstr ""
#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Invoice On Order After Delivery"
+#: view:sale.config.picking_policy:0
+msgid "Options"
msgstr ""
#. module: sale
@@ -659,6 +762,20 @@ msgid "September"
msgstr ""
#. module: sale
+#: code:addons/sale/sale.py:632
+#, python-format
+msgid "You cannot confirm a sale order which has no line."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:1246
+#, python-format
+msgid ""
+"You have to select a pricelist or a customer in the sales form !\n"
+"Please set one before choosing a product."
+msgstr ""
+
+#. module: sale
#: view:sale.report:0
#: field:sale.report,categ_id:0
msgid "Category of Product"
@@ -675,11 +792,6 @@ msgid "Stock Moves"
msgstr "Preču kustība Noliktavā"
#. module: sale
-#: view:sale.report:0
-msgid " Year "
-msgstr ""
-
-#. module: sale
#: field:sale.order,state:0
#: field:sale.report,state:0
msgid "Order State"
@@ -697,7 +809,7 @@ msgid "Sales By Month"
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:970
+#: code:addons/sale/sale.py:1065
#, python-format
msgid "Could not cancel sales order line!"
msgstr ""
@@ -730,42 +842,19 @@ msgid ""
msgstr ""
#. module: sale
-#: view:sale.report:0
-msgid "Extended Filters..."
+#: field:sale.order,date_order:0
+msgid "Date"
msgstr ""
#. module: sale
-#: model:ir.module.module,description:sale.module_meta_information
-msgid ""
-"\n"
-" The base module to manage quotations and sales orders.\n"
-"\n"
-" * Workflow with validation steps:\n"
-" - Quotation -> Sales order -> Invoice\n"
-" * Invoicing methods:\n"
-" - Invoice on order (before or after shipping)\n"
-" - Invoice on delivery\n"
-" - Invoice on timesheets\n"
-" - Advance invoice\n"
-" * Partners preferences (shipping, invoicing, incoterm, ...)\n"
-" * Products stocks and prices\n"
-" * Delivery methods:\n"
-" - all at once, multi-parcel\n"
-" - delivery costs\n"
-" * Dashboard for salesman that includes:\n"
-" * Your open quotations\n"
-" * Top 10 sales of the month\n"
-" * Cases statistics\n"
-" * Graph of sales by product\n"
-" * Graph of cases of the month\n"
-" "
+#: view:sale.report:0
+msgid "Extended Filters..."
msgstr ""
#. module: sale
-#: model:ir.model,name:sale.model_sale_shop
-#: view:sale.shop:0
-msgid "Sales Shop"
-msgstr ""
+#: selection:sale.order.line,state:0
+msgid "Exception"
+msgstr "Kļūda"
#. module: sale
#: model:ir.model,name:sale.model_res_company
@@ -773,8 +862,9 @@ msgid "Companies"
msgstr ""
#. module: sale
-#: selection:sale.report,month:0
-msgid "November"
+#: code:addons/sale/sale.py:1259
+#, python-format
+msgid "No valid pricelist line found ! :"
msgstr ""
#. module: sale
@@ -783,8 +873,8 @@ msgid "History"
msgstr "Vēsture"
#. module: sale
-#: field:sale.config.picking_policy,picking_policy:0
-msgid "Picking Default Policy"
+#: selection:sale.order,order_policy:0
+msgid "Invoice on order after delivery"
msgstr ""
#. module: sale
@@ -807,13 +897,12 @@ msgid ""
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:966
-#, python-format
-msgid "You cannot cancel a sales order line that has already been invoiced !"
+#: help:res.company,security_lead:0
+msgid ""
+"This is the days added to what you promise to customers for security purpose"
msgstr ""
#. module: sale
-#: view:sale.order:0
#: view:sale.order.line:0
msgid "Qty"
msgstr "Sk."
@@ -824,6 +913,11 @@ msgid "References"
msgstr ""
#. module: sale
+#: view:sale.order.line:0
+msgid "My Sales Order Lines"
+msgstr ""
+
+#. module: sale
#: model:process.transition.action,name:sale.process_transition_action_cancel0
#: model:process.transition.action,name:sale.process_transition_action_cancel1
#: model:process.transition.action,name:sale.process_transition_action_cancel2
@@ -835,16 +929,11 @@ msgid "Cancel"
msgstr "Atcelt"
#. module: sale
-#: field:sale.installer,sale_order_dates:0
-msgid "Sales Order Dates"
+#: sql_constraint:sale.order:0
+msgid "Order Reference must be unique per Company!"
msgstr ""
#. module: sale
-#: selection:sale.order.line,state:0
-msgid "Exception"
-msgstr "Kļūda"
-
-#. module: sale
#: model:process.transition,name:sale.process_transition_invoice0
#: model:process.transition,name:sale.process_transition_invoiceafterdelivery0
#: model:process.transition.action,name:sale.process_transition_action_createinvoice0
@@ -854,19 +943,19 @@ msgid "Create Invoice"
msgstr "Izveidot Rēķinu"
#. module: sale
-#: field:sale.installer,sale_margin:0
-msgid "Margins in Sales Orders"
+#: view:sale.order:0
+msgid "Total Tax Excluded"
msgstr ""
#. module: sale
-#: view:sale.order:0
-msgid "Total Tax Excluded"
+#: view:sale.order.line:0
+msgid "Order reference"
msgstr ""
#. module: sale
-#: view:sale.order:0
-msgid "Compute"
-msgstr "Aprēķināt"
+#: view:sale.open.invoice:0
+msgid "You invoice has been successfully created!"
+msgstr ""
#. module: sale
#: view:sale.report:0
@@ -885,23 +974,20 @@ msgid "Open Invoice"
msgstr ""
#. module: sale
-#: report:sale.order:0
-#: view:sale.order.line:0
-msgid "Price"
-msgstr "Cena"
+#: model:ir.actions.server,name:sale.ir_actions_server_edi_sale
+msgid "Auto-email confirmed sale orders"
+msgstr ""
#. module: sale
-#: model:ir.actions.act_window,name:sale.action_sale_installer
-#: view:sale.config.picking_policy:0
-#: view:sale.installer:0
-msgid "Sales Application Configuration"
+#: code:addons/sale/sale.py:413
+#, python-format
+msgid "There is no sales journal defined for this company: \"%s\" (id:%d)"
msgstr ""
#. module: sale
-#: view:sale.report:0
-#: field:sale.report,price_total:0
-msgid "Total Price"
-msgstr ""
+#: model:process.transition.action,name:sale.process_transition_action_forceassignation0
+msgid "Force Assignation"
+msgstr "Piespiedu Nodošana"
#. module: sale
#: selection:sale.order.line,type:0
@@ -914,6 +1000,11 @@ msgid "Based on the shipped or on the ordered quantities."
msgstr ""
#. module: sale
+#: selection:sale.order,picking_policy:0
+msgid "Deliver all products at once"
+msgstr ""
+
+#. module: sale
#: field:sale.order,picking_ids:0
msgid "Related Picking"
msgstr ""
@@ -945,8 +1036,14 @@ msgid "Create Delivery Order"
msgstr ""
#. module: sale
-#: field:sale.installer,delivery:0
-msgid "Delivery Costs"
+#: code:addons/sale/sale.py:1290
+#, python-format
+msgid "Cannot delete a sales order line which is in state '%s'!"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Qty(UoS)"
msgstr ""
#. module: sale
@@ -961,13 +1058,13 @@ msgstr ""
#. module: sale
#: view:sale.report:0
-msgid "Sales by Product Category"
+msgid "Ordered date of the sales order"
msgstr ""
#. module: sale
-#: selection:sale.order,picking_policy:0
-msgid "Partial Delivery"
-msgstr "Daļēja piegāde"
+#: view:sale.report:0
+msgid "Sales by Product Category"
+msgstr ""
#. module: sale
#: model:process.transition,name:sale.process_transition_confirmquotation0
@@ -975,9 +1072,10 @@ msgid "Confirm Quotation"
msgstr "Apstiprināt Pasūtījumu"
#. module: sale
-#: help:sale.order,origin:0
-msgid "Reference of the document that generated this sales order request."
-msgstr ""
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:63
+#, python-format
+msgid "Error"
+msgstr "Klūda"
#. module: sale
#: view:sale.order:0
@@ -1009,20 +1107,14 @@ msgid "Procurement Method"
msgstr ""
#. module: sale
-#: view:sale.config.picking_policy:0
-#: view:sale.installer:0
-msgid "title"
-msgstr ""
-
-#. module: sale
#: model:process.node,name:sale.process_node_packinglist0
msgid "Pick List"
msgstr ""
#. module: sale
#: view:sale.order:0
-msgid "Order date"
-msgstr ""
+msgid "Set to Draft"
+msgstr "Atzīmēt kā Melnrakstu"
#. module: sale
#: model:process.node,note:sale.process_node_packinglist0
@@ -1030,6 +1122,85 @@ msgid "Document of the move to the output or to the customer."
msgstr ""
#. module: sale
+#: model:email.template,body_text:sale.email_template_edi_sale
+msgid ""
+"\n"
+"Hello${object.partner_order_id.name and ' ' or "
+"''}${object.partner_order_id.name or ''},\n"
+"\n"
+"Here is your order confirmation for ${object.partner_id.name}:\n"
+" | Order number: *${object.name}*\n"
+" | Order total: *${object.amount_total} "
+"${object.pricelist_id.currency_id.name}*\n"
+" | Order date: ${object.date_order}\n"
+" % if object.origin:\n"
+" | Order reference: ${object.origin}\n"
+" % endif\n"
+" % if object.client_order_ref:\n"
+" | Your reference: ${object.client_order_ref}<br />\n"
+" % endif\n"
+" | Your contact: ${object.user_id.name} ${object.user_id.user_email "
+"and '<%s>'%(object.user_id.user_email) or ''}\n"
+"\n"
+"You can view the order confirmation, download it and even pay online using "
+"the following link:\n"
+" ${ctx.get('edi_web_url_view') or 'n/a'}\n"
+"\n"
+"% if object.order_policy in ('prepaid','manual') and "
+"object.company_id.paypal_account:\n"
+"<% \n"
+"comp_name = quote(object.company_id.name)\n"
+"order_name = quote(object.name)\n"
+"paypal_account = quote(object.company_id.paypal_account)\n"
+"order_amount = quote(str(object.amount_total))\n"
+"cur_name = quote(object.pricelist_id.currency_id.name)\n"
+"paypal_url = \"https://www.paypal.com/cgi-"
+"bin/webscr?cmd=_xclick&business=%s&item_name=%s%%20Order%%20%s&invoice=%s&amo"
+"unt=%s\" \\\n"
+" "
+"\"&currency_code=%s&button_subtype=services&no_note=1&bn=OpenERP_Order_PayNow"
+"_%s\" % \\\n"
+" "
+"(paypal_account,comp_name,order_name,order_name,order_amount,cur_name,cur_nam"
+"e)\n"
+"%>\n"
+"It is also possible to directly pay with Paypal:\n"
+" ${paypal_url}\n"
+"% endif\n"
+"\n"
+"If you have any question, do not hesitate to contact us.\n"
+"\n"
+"\n"
+"Thank you for choosing ${object.company_id.name}!\n"
+"\n"
+"\n"
+"--\n"
+"${object.user_id.name} ${object.user_id.user_email and "
+"'<%s>'%(object.user_id.user_email) or ''}\n"
+"${object.company_id.name}\n"
+"% if object.company_id.street:\n"
+"${object.company_id.street or ''}\n"
+"% endif\n"
+"% if object.company_id.street2:\n"
+"${object.company_id.street2}\n"
+"% endif\n"
+"% if object.company_id.city or object.company_id.zip:\n"
+"${object.company_id.zip or ''} ${object.company_id.city or ''}\n"
+"% endif\n"
+"% if object.company_id.country_id:\n"
+"${object.company_id.state_id and ('%s, ' % object.company_id.state_id.name) "
+"or ''} ${object.company_id.country_id.name or ''}\n"
+"% endif\n"
+"% if object.company_id.phone:\n"
+"Phone: ${object.company_id.phone}\n"
+"% endif\n"
+"% if object.company_id.website:\n"
+"${object.company_id.website or ''}\n"
+"% endif\n"
+" "
+msgstr ""
+
+#. module: sale
#: model:process.transition.action,name:sale.process_transition_action_validate0
msgid "Validate"
msgstr "Apstiprināt"
@@ -1052,9 +1223,9 @@ msgid "Taxes"
msgstr "Nodokļi"
#. module: sale
-#: field:sale.order,order_policy:0
-msgid "Shipping Policy"
-msgstr "Piegādes noteikumi"
+#: view:sale.order:0
+msgid "Sales Order ready to be invoiced"
+msgstr ""
#. module: sale
#: help:sale.order,create_date:0
@@ -1073,9 +1244,9 @@ msgid "Create Invoices"
msgstr ""
#. module: sale
-#: view:sale.order:0
-msgid "Extra Info"
-msgstr "Papildus Info"
+#: view:sale.report:0
+msgid "Sales order created in current month"
+msgstr ""
#. module: sale
#: report:sale.order:0
@@ -1083,11 +1254,24 @@ msgid "Fax :"
msgstr "Fakss:"
#. module: sale
+#: help:sale.order.line,type:0
+msgid ""
+"If 'on order', it triggers a procurement when the sale order is confirmed to "
+"create a task, purchase order or manufacturing order linked to this sale "
+"order line."
+msgstr ""
+
+#. module: sale
#: field:sale.advance.payment.inv,amount:0
msgid "Advance Amount"
msgstr ""
#. module: sale
+#: field:sale.config.picking_policy,charge_delivery:0
+msgid "Do you charge the delivery?"
+msgstr ""
+
+#. module: sale
#: selection:sale.order,invoice_quantity:0
msgid "Shipped Quantities"
msgstr "Piegādātais Daudzums"
@@ -1098,25 +1282,45 @@ msgid "Invoice Based on Sales Orders"
msgstr "Rēķins pēc Tirdzniecības Pasūtījuma"
#. module: sale
+#: code:addons/sale/sale.py:331
+#, python-format
+msgid ""
+"If you change the pricelist of this order (and eventually the currency), "
+"prices of existing order lines will not be updated."
+msgstr ""
+
+#. module: sale
#: model:ir.model,name:sale.model_stock_picking
msgid "Picking List"
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:387
-#: code:addons/sale/sale.py:920
-#: code:addons/sale/sale.py:938
+#: code:addons/sale/sale.py:412
+#: code:addons/sale/sale.py:503
+#: code:addons/sale/sale.py:632
+#: code:addons/sale/sale.py:1015
+#: code:addons/sale/sale.py:1033
#, python-format
msgid "Error !"
msgstr "Kļūda!"
#. module: sale
-#: code:addons/sale/sale.py:570
+#: code:addons/sale/sale.py:603
#, python-format
msgid "Could not cancel sales order !"
msgstr ""
#. module: sale
+#: view:sale.order:0
+msgid "Qty(UoM)"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered Year of the sales order"
+msgstr ""
+
+#. module: sale
#: selection:sale.report,month:0
msgid "July"
msgstr ""
@@ -1133,35 +1337,25 @@ msgid "Shipping Exception"
msgstr "Piegādes kļūda"
#. module: sale
-#: field:sale.make.invoice,grouped:0
-msgid "Group the invoices"
-msgstr "Grupēt rēķinus"
-
-#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Shipping & Manual Invoice"
-msgstr "Piegāde un Manuāls Rēķins"
-
-#. module: sale
-#: code:addons/sale/sale.py:1051
+#: code:addons/sale/sale.py:1143
#, python-format
-msgid "Picking Information !"
+msgid "Picking Information ! : "
msgstr ""
#. module: sale
-#: view:sale.report:0
-#: field:sale.report,month:0
-msgid "Month"
-msgstr ""
+#: field:sale.make.invoice,grouped:0
+msgid "Group the invoices"
+msgstr "Grupēt rēķinus"
#. module: sale
-#: model:ir.module.module,shortdesc:sale.module_meta_information
-msgid "Sales Management"
-msgstr "Tirdzniecības Vadība"
+#: field:sale.order,order_policy:0
+msgid "Invoice Policy"
+msgstr ""
#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Invoice From The Picking"
+#: model:ir.actions.act_window,name:sale.action_config_picking_policy
+#: view:sale.config.picking_policy:0
+msgid "Setup your Invoicing Method"
msgstr ""
#. module: sale
@@ -1171,27 +1365,30 @@ msgstr ""
#. module: sale
#: view:sale.report:0
-#: field:sale.report,uom_name:0
msgid "Reference UoM"
msgstr ""
#. module: sale
+#: view:sale.config.picking_policy:0
+msgid ""
+"This tool will help you to install the right module and configure the system "
+"according to the method you use to invoice your customers."
+msgstr ""
+
+#. module: sale
#: model:ir.model,name:sale.model_sale_order_line_make_invoice
msgid "Sale OrderLine Make_invoice"
msgstr ""
#. module: sale
-#: help:sale.config.picking_policy,step:0
-msgid ""
-"By default, OpenERP is able to manage complex routing and paths of products "
-"in your warehouse and partner locations. This will configure the most common "
-"and simple methods to deliver products to the customer in one or two "
-"operations by the worker."
-msgstr ""
+#: selection:sale.order,state:0
+#: selection:sale.report,state:0
+msgid "Invoice Exception"
+msgstr "Rēķina kļūda"
#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_tree
-msgid "Old Quotations"
+#: model:process.node,note:sale.process_node_saleorder0
+msgid "Drives procurement and invoicing"
msgstr ""
#. module: sale
@@ -1207,6 +1404,22 @@ msgid "Sales Analysis"
msgstr ""
#. module: sale
+#: code:addons/sale/sale.py:1138
+#, python-format
+msgid ""
+"You selected a quantity of %d Units.\n"
+"But it's not compatible with the selected packaging.\n"
+"Here is a proposition of quantities according to the packaging:\n"
+"EAN: %s Quantity: %s Type of ul: %s"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Recreate Packing"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
#: field:sale.order.line,property_ids:0
msgid "Properties"
msgstr ""
@@ -1233,7 +1446,17 @@ msgid ""
msgstr ""
#. module: sale
-#: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
+#: view:sale.order.line:0
+msgid "Confirmed sale order lines, not yet delivered"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:473
+#, python-format
+msgid "Customer Invoices"
+msgstr ""
+
+#. module: sale
#: model:process.process,name:sale.process_process_salesprocess0
#: view:sale.order:0
#: view:sale.report:0
@@ -1255,18 +1478,13 @@ msgid "Done"
msgstr "Pabeigts"
#. module: sale
-#: model:ir.model,name:sale.model_sale_installer
-msgid "sale.installer"
-msgstr ""
-
-#. module: sale
#: model:process.node,name:sale.process_node_invoice0
#: model:process.node,name:sale.process_node_invoiceafterdelivery0
msgid "Invoice"
msgstr "Rēķins"
#. module: sale
-#: code:addons/sale/sale.py:1014
+#: code:addons/sale/sale.py:1158
#, python-format
msgid ""
"You have to select a customer in the sales form !\n"
@@ -1274,11 +1492,6 @@ msgid ""
msgstr ""
#. module: sale
-#: selection:sale.config.picking_policy,step:0
-msgid "Picking List & Delivery Order"
-msgstr ""
-
-#. module: sale
#: field:sale.order,origin:0
msgid "Source Document"
msgstr ""
@@ -1304,7 +1517,7 @@ msgid "The amount without tax."
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:571
+#: code:addons/sale/sale.py:604
#, python-format
msgid "You must first cancel all picking attached to this sales order."
msgstr ""
@@ -1315,9 +1528,15 @@ msgid "Sales Advance Payment Invoice"
msgstr ""
#. module: sale
-#: field:sale.order,incoterm:0
-msgid "Incoterm"
-msgstr "Inkoterms"
+#: view:sale.report:0
+#: field:sale.report,month:0
+msgid "Month"
+msgstr ""
+
+#. module: sale
+#: model:email.template,subject:sale.email_template_edi_sale
+msgid "${object.company_id.name} Order (Ref ${object.name or 'n/a' })"
+msgstr ""
#. module: sale
#: view:sale.order.line:0
@@ -1328,11 +1547,6 @@ msgid "Product"
msgstr "Produkts"
#. module: sale
-#: model:ir.ui.menu,name:sale.menu_invoiced
-msgid "Invoicing"
-msgstr ""
-
-#. module: sale
#: model:process.transition.action,name:sale.process_transition_action_cancelassignation0
msgid "Cancel Assignation"
msgstr "Atcelt preču nodošanu"
@@ -1343,14 +1557,10 @@ msgid "sale.config.picking_policy"
msgstr "sale.config.picking_policy"
#. module: sale
-#: help:sale.order,state:0
-msgid ""
-"Gives the state of the quotation or sales order. \n"
-"The exception state is automatically set when a cancel operation occurs in "
-"the invoice validation (Invoice Exception) or in the picking list process "
-"(Shipping Exception). \n"
-"The 'Waiting Schedule' state is set when the invoice is confirmed but "
-"waiting for the scheduler to run on the date 'Ordered Date'."
+#: view:account.invoice.report:0
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_turnover_by_month
+msgid "Monthly Turnover"
msgstr ""
#. module: sale
@@ -1369,7 +1579,6 @@ msgid "Product UoS"
msgstr ""
#. module: sale
-#: selection:sale.order,state:0
#: selection:sale.report,state:0
msgid "Manual In Progress"
msgstr ""
@@ -1390,7 +1599,8 @@ msgid "Order"
msgstr "Pasūtījums"
#. module: sale
-#: code:addons/sale/sale.py:921
+#: code:addons/sale/sale.py:1016
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:71
#, python-format
msgid "There is no income account defined for this product: \"%s\" (id:%d)"
msgstr ""
@@ -1410,7 +1620,7 @@ msgid ""
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:1116
+#: code:addons/sale/sale.py:1238
#, python-format
msgid ""
"You plan to sell %.2f %s but you only have %.2f %s available !\n"
@@ -1439,10 +1649,10 @@ msgid "Total"
msgstr "Kopā"
#. module: sale
-#: code:addons/sale/sale.py:388
-#, python-format
-msgid "There is no sales journal defined for this company: \"%s\" (id:%d)"
-msgstr ""
+#: report:sale.order:0
+#: view:sale.order.line:0
+msgid "Price"
+msgstr "Cena"
#. module: sale
#: model:process.transition,note:sale.process_transition_deliver0
@@ -1453,9 +1663,14 @@ msgid ""
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:1165
-#, python-format
-msgid "Cannot delete a sales order line which is %s !"
+#: selection:sale.order,order_policy:0
+msgid "Pay before delivery"
+msgstr ""
+
+#. module: sale
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.open_board_sales
+msgid "Sales Dashboard"
msgstr ""
#. module: sale
@@ -1467,6 +1682,7 @@ msgstr ""
#. module: sale
#: view:sale.order:0
+#: selection:sale.order,state:0
#: view:sale.order.line:0
msgid "To Invoice"
msgstr ""
@@ -1477,6 +1693,11 @@ msgid "Date on which sales order is confirmed."
msgstr ""
#. module: sale
+#: field:sale.order,project_id:0
+msgid "Contract/Analytic Account"
+msgstr ""
+
+#. module: sale
#: field:sale.order,company_id:0
#: field:sale.order.line,company_id:0
#: view:sale.report:0
@@ -1496,22 +1717,17 @@ msgid "The amount to be invoiced in advance."
msgstr ""
#. module: sale
-#: selection:sale.order,state:0
-#: selection:sale.report,state:0
-msgid "Invoice Exception"
-msgstr "Rēķina kļūda"
-
-#. module: sale
-#: help:sale.order,picking_ids:0
+#: code:addons/sale/sale.py:1256
+#, python-format
msgid ""
-"This is a list of picking that has been generated for this sales order."
+"Couldn't find a pricelist line matching this product and quantity.\n"
+"You have to change either the product, the quantity or the pricelist."
msgstr ""
#. module: sale
-#: help:sale.installer,sale_margin:0
+#: help:sale.order,picking_ids:0
msgid ""
-"Gives the margin of profitability by calculating the difference between Unit "
-"Price and Cost Price."
+"This is a list of picking that has been generated for this sales order."
msgstr ""
#. module: sale
@@ -1533,6 +1749,11 @@ msgid "Cancelled"
msgstr ""
#. module: sale
+#: view:sale.order.line:0
+msgid "Sales Order Lines related to a Sales Order of mine"
+msgstr ""
+
+#. module: sale
#: model:ir.actions.act_window,name:sale.action_shop_form
#: model:ir.ui.menu,name:sale.menu_action_shop_form
#: field:sale.order,shop_id:0
@@ -1542,17 +1763,12 @@ msgid "Shop"
msgstr "Veikals"
#. module: sale
-#: view:sale.report:0
-msgid " Month "
-msgstr ""
-
-#. module: sale
#: field:sale.report,date_confirm:0
msgid "Date Confirm"
msgstr ""
#. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:111
+#: code:addons/sale/wizard/sale_line_invoice.py:113
#, python-format
msgid "Warning"
msgstr ""
@@ -1564,17 +1780,6 @@ msgid "Sales by Month"
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:1045
-#, python-format
-msgid ""
-"You selected a quantity of %d Units.\n"
-"But it's not compatible with the selected packaging.\n"
-"Here is a proposition of quantities according to the packaging:\n"
-"\n"
-"EAN: %s Quantity: %s Type of ul: %s"
-msgstr ""
-
-#. module: sale
#: model:ir.model,name:sale.model_sale_order
#: model:process.node,name:sale.process_node_order0
#: model:process.node,name:sale.process_node_saleorder0
@@ -1590,6 +1795,11 @@ msgid "Quantity (UoS)"
msgstr ""
#. module: sale
+#: view:sale.order.line:0
+msgid "Sale Order Lines that are in 'done' state"
+msgstr ""
+
+#. module: sale
#: model:process.transition,note:sale.process_transition_packing0
msgid ""
"The Pick List form is created as soon as the sales order is confirmed, in "
@@ -1604,6 +1814,11 @@ msgid "Confirmed"
msgstr "Apstiprināts"
#. module: sale
+#: field:sale.config.picking_policy,order_policy:0
+msgid "Main Method Based On"
+msgstr ""
+
+#. module: sale
#: model:process.transition.action,name:sale.process_transition_action_confirm0
msgid "Confirm"
msgstr "Apstiprināt"
@@ -1626,6 +1841,7 @@ msgid "Invoice Lines"
msgstr "Rēķina pozīcijas"
#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_product_tree
#: view:sale.order:0
#: view:sale.order.line:0
msgid "Sales Order Lines"
@@ -1642,30 +1858,18 @@ msgid "Configuration"
msgstr "Konfigurācija"
#. module: sale
-#: selection:sale.order,picking_policy:0
-msgid "Complete Delivery"
-msgstr "Pilna Piegāde"
-
-#. module: sale
-#: view:sale.report:0
-msgid " Month-1 "
-msgstr ""
-
-#. module: sale
-#: help:sale.config.picking_policy,picking_policy:0
-msgid ""
-"The Shipping Policy is used to configure per order if you want to deliver as "
-"soon as possible when one product is available or you wait that all products "
-"are available.."
+#: code:addons/sale/edi/sale_order.py:146
+#, python-format
+msgid "EDI Pricelist (%s)"
msgstr ""
#. module: sale
-#: selection:sale.report,month:0
-msgid "August"
+#: view:sale.report:0
+msgid "Sales order created in current year"
msgstr ""
#. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:111
+#: code:addons/sale/wizard/sale_line_invoice.py:113
#, python-format
msgid ""
"Invoice cannot be created for this Sales Order Line due to one of the "
@@ -1675,6 +1879,11 @@ msgid ""
msgstr ""
#. module: sale
+#: view:sale.order.line:0
+msgid "Sale order lines done"
+msgstr ""
+
+#. module: sale
#: field:sale.order.line,th_weight:0
msgid "Weight"
msgstr "Svars"
@@ -1693,7 +1902,6 @@ msgstr ""
#. module: sale
#: field:sale.config.picking_policy,config_logo:0
-#: field:sale.installer,config_logo:0
msgid "Image"
msgstr ""
@@ -1723,8 +1931,8 @@ msgid "Salesman"
msgstr "Pārdošanas menedžeris"
#. module: sale
-#: model:process.node,note:sale.process_node_saleorder0
-msgid "Drives procurement and invoicing"
+#: model:ir.actions.act_window,name:sale.action_order_tree
+msgid "Old Quotations"
msgstr ""
#. module: sale
@@ -1733,7 +1941,7 @@ msgid "Untaxed Amount"
msgstr "Summa bez nodokļiem"
#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:163
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:170
#: model:ir.actions.act_window,name:sale.action_view_sale_advance_payment_inv
#: view:sale.advance.payment.inv:0
#: view:sale.order:0
@@ -1742,7 +1950,7 @@ msgid "Advance Invoice"
msgstr "Priekšapmaksas Rēķins"
#. module: sale
-#: code:addons/sale/sale.py:591
+#: code:addons/sale/sale.py:624
#, python-format
msgid "The sales order '%s' has been cancelled."
msgstr ""
@@ -1777,19 +1985,19 @@ msgid "Packings"
msgstr ""
#. module: sale
-#: field:sale.config.picking_policy,progress:0
-#: field:sale.installer,progress:0
-msgid "Configuration Progress"
+#: view:sale.order.line:0
+msgid "Sale Order Lines ready to be invoiced"
msgstr ""
#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_product_tree
-msgid "Product sales"
-msgstr "Preču tirdzniecība"
+#: view:sale.report:0
+msgid "Sales order created in last month"
+msgstr ""
#. module: sale
-#: field:sale.order,date_order:0
-msgid "Ordered Date"
+#: model:ir.actions.act_window,name:sale.action_email_templates
+#: model:ir.ui.menu,name:sale.menu_email_templates
+msgid "Email Templates"
msgstr ""
#. module: sale
@@ -1800,13 +2008,14 @@ msgid "Sales Orders"
msgstr "Tirdzniecības Pasūtījumi"
#. module: sale
-#: selection:sale.config.picking_policy,picking_policy:0
-msgid "Direct Delivery"
-msgstr "Tiešā Piegāde"
+#: model:ir.model,name:sale.model_sale_shop
+#: view:sale.shop:0
+msgid "Sales Shop"
+msgstr ""
#. module: sale
-#: field:sale.installer,sale_journal:0
-msgid "Invoicing journals"
+#: selection:sale.report,month:0
+msgid "November"
msgstr ""
#. module: sale
@@ -1815,18 +2024,12 @@ msgid "Advance Product"
msgstr ""
#. module: sale
-#: view:sale.report:0
-#: field:sale.report,shipped_qty_1:0
-msgid "Shipped Qty"
-msgstr ""
-
-#. module: sale
-#: view:sale.open.invoice:0
-msgid "You invoice has been successfully created!"
-msgstr ""
+#: view:sale.order:0
+msgid "Compute"
+msgstr "Aprēķināt"
#. module: sale
-#: code:addons/sale/sale.py:585
+#: code:addons/sale/sale.py:618
#, python-format
msgid "You must first cancel all invoices attached to this sales order."
msgstr ""
@@ -1837,33 +2040,27 @@ msgid "January"
msgstr ""
#. module: sale
-#: view:sale.installer:0
-msgid "Configure Your Sales Management Application"
-msgstr ""
-
-#. module: sale
#: model:ir.actions.act_window,name:sale.action_order_tree4
msgid "Sales Order in Progress"
msgstr "Tirdzniecības pasūtījuma progress"
#. module: sale
-#: field:sale.installer,sale_layout:0
-msgid "Sales Order Layout Improvement"
+#: help:sale.order,origin:0
+msgid "Reference of the document that generated this sales order request."
msgstr ""
#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:63
-#, python-format
-msgid "Error"
-msgstr "Klūda"
-
-#. module: sale
#: view:sale.report:0
#: field:sale.report,delay:0
msgid "Commitment Delay"
msgstr ""
#. module: sale
+#: selection:sale.order,order_policy:0
+msgid "Deliver & invoice on demand"
+msgstr ""
+
+#. module: sale
#: model:process.node,note:sale.process_node_saleprocurement0
msgid ""
"One Procurement order for each sales order line and for each of the "
@@ -1886,13 +2083,12 @@ msgid "Confirmed sales order to invoice."
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:290
-#, python-format
-msgid "Cannot delete Sales Order(s) which are already confirmed !"
+#: view:sale.order:0
+msgid "Sales Order that haven't yet been confirmed"
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:316
+#: code:addons/sale/sale.py:322
#, python-format
msgid "The sales order '%s' has been set in draft state."
msgstr ""
@@ -1903,24 +2099,19 @@ msgid "from stock"
msgstr "no noliktavā esošajām precēm"
#. module: sale
-#: field:sale.config.picking_policy,order_policy:0
-msgid "Shipping Default Policy"
-msgstr "Standarta Piegādes Noteikumi"
-
-#. module: sale
#: view:sale.open.invoice:0
msgid "Close"
msgstr "Aizvērt"
#. module: sale
-#: field:sale.order,shipped:0
-msgid "Delivered"
+#: code:addons/sale/sale.py:1248
+#, python-format
+msgid "No Pricelist ! : "
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:1115
-#, python-format
-msgid "Not enough stock !"
+#: field:sale.order,shipped:0
+msgid "Delivered"
msgstr ""
#. module: sale
@@ -1929,11 +2120,6 @@ msgid "You must assign a production lot for this product"
msgstr ""
#. module: sale
-#: field:sale.order.line,sequence:0
-msgid "Layout Sequence"
-msgstr ""
-
-#. module: sale
#: model:ir.actions.act_window,help:sale.action_shop_form
msgid ""
"If you have more than one shop reselling your company products, you can "
@@ -1960,11 +2146,6 @@ msgid "May"
msgstr ""
#. module: sale
-#: help:sale.installer,sale_order_dates:0
-msgid "Adds commitment, requested and effective dates on Sales Orders."
-msgstr ""
-
-#. module: sale
#: view:sale.order:0
#: field:sale.order,partner_id:0
#: field:sale.order.line,order_partner_id:0
@@ -1972,23 +2153,11 @@ msgid "Customer"
msgstr "Klients"
#. module: sale
-#: model:product.template,name:sale.advance_product_0_product_template
-msgid "Advance"
-msgstr ""
-
-#. module: sale
#: selection:sale.report,month:0
msgid "February"
msgstr ""
#. module: sale
-#: help:sale.installer,sale_journal:0
-msgid ""
-"Allows you to group and invoice your delivery orders according to different "
-"invoicing types: daily, weekly, etc."
-msgstr ""
-
-#. module: sale
#: selection:sale.report,month:0
msgid "April"
msgstr ""
@@ -1999,11 +2168,6 @@ msgid "Accounting"
msgstr ""
#. module: sale
-#: field:sale.config.picking_policy,step:0
-msgid "Steps To Deliver a Sales Order"
-msgstr ""
-
-#. module: sale
#: view:sale.order:0
#: view:sale.order.line:0
msgid "Search Sales Order"
@@ -2015,18 +2179,18 @@ msgid "Sales Order Requisition"
msgstr ""
#. module: sale
+#: code:addons/sale/sale.py:1242
+#, python-format
+msgid "Not enough stock ! : "
+msgstr ""
+
+#. module: sale
#: report:sale.order:0
#: field:sale.order,payment_term:0
msgid "Payment Term"
msgstr "Apmaksas Noteikumi"
#. module: sale
-#: help:sale.installer,sale_layout:0
-msgid ""
-"Provides some features to improve the layout of the Sales Order reports."
-msgstr ""
-
-#. module: sale
#: model:ir.actions.act_window,help:sale.action_order_report_all
msgid ""
"This report performs analysis on your quotations and sales orders. Analysis "
@@ -2061,6 +2225,9 @@ msgstr "Rēķins pēc Piegādes"
#~ msgid "Recreate Procurement"
#~ msgstr "Veidot Iepirkumu no jauna"
+#~ msgid "Partial Delivery"
+#~ msgstr "Daļēja piegāde"
+
#~ msgid "You invoice has been successfully created !"
#~ msgstr "Rēķins ir sekmīgi izveidots!"
@@ -2073,6 +2240,9 @@ msgstr "Rēķins pēc Piegādes"
#~ msgid "Manual Designation"
#~ msgstr "Manuāls Norīkojums"
+#~ msgid "Shipping Policy"
+#~ msgstr "Piegādes noteikumi"
+
#~ msgid "Invoice after delivery"
#~ msgstr "Rēķins pēc piegādes"
@@ -2082,6 +2252,9 @@ msgstr "Rēķins pēc Piegādes"
#~ msgid "Procurement is created after confirmation of sale order."
#~ msgstr "Iepirkums tiks izveidots pēc Pasūtījuma apstiprināšanas."
+#~ msgid "All at Once"
+#~ msgstr "Visu kopā"
+
#~ msgid "Reference"
#~ msgstr "Atsauce"
@@ -2117,6 +2290,9 @@ msgstr "Rēķins pēc Piegādes"
#~ msgstr ""
#~ "Vispirms ir jāatceļ visi tirdzniecības pasūtījumam pievienotie rēķini."
+#~ msgid "Complete Delivery"
+#~ msgstr "Pilna Piegāde"
+
#~ msgid "Total amount"
#~ msgstr "Kopējais daudzums"
@@ -2138,6 +2314,9 @@ msgstr "Rēķins pēc Piegādes"
#~ msgid "Packing Default Policy"
#~ msgstr "Standarta noteikumi iepakošanai"
+#~ msgid "Shipping Default Policy"
+#~ msgstr "Standarta Piegādes Noteikumi"
+
#, python-format
#~ msgid "Could not cancel sale order !"
#~ msgstr "Nevar atcelt tirdzniecības pasūtījumu!"
@@ -2169,6 +2348,9 @@ msgstr "Rēķins pēc Piegādes"
#~ msgid "Packing Policy"
#~ msgstr "Iepakošanas Noteikumi"
+#~ msgid "Product sales"
+#~ msgstr "Preču tirdzniecība"
+
#~ msgid "Our Salesman"
#~ msgstr "Mūsu tirdzniecības menedžeris"
@@ -2181,9 +2363,15 @@ msgstr "Rēķins pēc Piegādes"
#~ msgid "Sale Pricelists"
#~ msgstr "Tirdzniecības Cenuzīmes"
+#~ msgid "Direct Delivery"
+#~ msgstr "Tiešā Piegāde"
+
#~ msgid "Make Invoice"
#~ msgstr "Izveidot Rēķinu"
+#~ msgid "Delivery Order Only"
+#~ msgstr "Piegādes Pasūtījums Tikai"
+
#~ msgid "Sales order lines"
#~ msgstr "Tirdzniecības pasūtījuma pozīcijas"
@@ -2199,6 +2387,9 @@ msgstr "Rēķins pēc Piegādes"
#~ msgid "Advance Payment"
#~ msgstr "Priekšapmaksa"
+#~ msgid "Shipping & Manual Invoice"
+#~ msgstr "Piegāde un Manuāls Rēķins"
+
#~ msgid "Sale Invoice"
#~ msgstr "Rēķins"
@@ -2226,6 +2417,9 @@ msgstr "Rēķins pēc Piegādes"
#~ msgid "Open Advance Invoice"
#~ msgstr "Atvērt Priekšapmaksas rēķinu"
+#~ msgid "Sales Management"
+#~ msgstr "Tirdzniecības Vadība"
+
#~ msgid "Deliver"
#~ msgstr "Nosūtīt"
@@ -2252,6 +2446,9 @@ msgstr "Rēķins pēc Piegādes"
#~ msgid "Related invoices"
#~ msgstr "Saistītie Rēķini"
+#~ msgid "Payment Before Delivery"
+#~ msgstr "Apmaksa pirms Piegādes"
+
#~ msgid "Delivery Delay"
#~ msgstr "Piegādes kavējums"
diff --git a/addons/sale/i18n/mn.po b/addons/sale/i18n/mn.po
index 8b4c3f30555..4fd0bef38c2 100644
--- a/addons/sale/i18n/mn.po
+++ b/addons/sale/i18n/mn.po
@@ -7,27 +7,33 @@ msgid ""
msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-01-11 11:16+0000\n"
+"POT-Creation-Date: 2011-12-22 18:43+0000\n"
"PO-Revision-Date: 2010-12-14 21:28+0000\n"
"Last-Translator: Christophe (OpenERP) <Unknown>\n"
"Language-Team: Mongolian <mn@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-05 05:16+0000\n"
-"X-Generator: Launchpad (build 14231)\n"
+"X-Launchpad-Export-Date: 2011-12-23 06:46+0000\n"
+"X-Generator: Launchpad (build 14560)\n"
#. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_sales_by_salesman
-msgid "Sales by Salesman in last 90 days"
+#: field:sale.config.picking_policy,timesheet:0
+msgid "Based on Timesheet"
msgstr ""
#. module: sale
-#: help:sale.installer,delivery:0
-msgid "Allows you to compute delivery costs on your quotations."
+#: view:sale.order.line:0
+msgid ""
+"Sale Order Lines that are confirmed, done or in exception state and haven't "
+"yet been invoiced"
+msgstr ""
+
+#. module: sale
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_sales_by_salesman
+msgid "Sales by Salesman in last 90 days"
msgstr ""
-"Танд үнийн санал дээр хүргэлтийн өртөгийг нэмж тооцоолох боломж олгоно."
#. module: sale
#: help:sale.order,picking_policy:0
@@ -39,6 +45,11 @@ msgstr ""
"бол хэсэгчилсэн хүргэлтийг сонго"
#. module: sale
+#: view:sale.order:0
+msgid "UoS"
+msgstr ""
+
+#. module: sale
#: help:sale.order,partner_shipping_id:0
msgid "Shipping address for current sales order."
msgstr ""
@@ -62,22 +73,12 @@ msgid "Cancel Order"
msgstr "Захиалга цуцлах"
#. module: sale
-#: view:sale.config.picking_policy:0
-msgid "Configure Sales Order Logistics"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:603
+#: code:addons/sale/sale.py:638
#, python-format
msgid "The quotation '%s' has been converted to a sales order."
msgstr ""
#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Payment Before Delivery"
-msgstr "Хүргэлтээс өмнө төлбөр хийх"
-
-#. module: sale
#: code:addons/sale/wizard/sale_make_invoice.py:42
#, python-format
msgid "Warning !"
@@ -94,12 +95,6 @@ msgid "Drives procurement orders for every sales order line."
msgstr ""
#. module: sale
-#: selection:sale.config.picking_policy,picking_policy:0
-msgid "All at Once"
-msgstr "Бүтэн хүргэлт"
-
-#. module: sale
-#: field:sale.order,project_id:0
#: view:sale.report:0
#: field:sale.report,analytic_account_id:0
#: field:sale.shop,project_id:0
@@ -115,6 +110,15 @@ msgid ""
msgstr ""
#. module: sale
+#: code:addons/sale/sale.py:295
+#, python-format
+msgid ""
+"In order to delete a confirmed sale order, you must cancel it before ! To "
+"cancel a sale order, you must first cancel related picking or delivery "
+"orders."
+msgstr ""
+
+#. module: sale
#: model:process.node,name:sale.process_node_saleprocurement0
msgid "Procurement Order"
msgstr "Нөхөн дүүргэлтийн захиалга"
@@ -126,6 +130,11 @@ msgid "Partner"
msgstr "Харилцагч"
#. module: sale
+#: selection:sale.order,order_policy:0
+msgid "Invoice based on deliveries"
+msgstr ""
+
+#. module: sale
#: view:sale.order:0
msgid "Order Line"
msgstr "Захиалгын мөр"
@@ -163,9 +172,14 @@ msgid "Default Payment Term"
msgstr "Үндсэн төлбөрийн нөхцөл"
#. module: sale
-#: model:ir.actions.act_window,name:sale.action_config_picking_policy
-msgid "Configure Picking Policy for Sales Order"
-msgstr "Борлуулалтын захиалгын түүврийн аргын тохиргоо"
+#: field:sale.config.picking_policy,deli_orders:0
+msgid "Based on Delivery Orders"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.picking_policy,time_unit:0
+msgid "Main Working Time Unit"
+msgstr ""
#. module: sale
#: view:sale.order:0
@@ -181,9 +195,10 @@ msgid "Disc.(%)"
msgstr "Хөнг.(%)"
#. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_forceassignation0
-msgid "Force Assignation"
-msgstr "Хөдөлгөөн Төлөвлөлт"
+#: view:sale.report:0
+#: field:sale.report,price_total:0
+msgid "Total Price"
+msgstr "Нийт Үнэ"
#. module: sale
#: help:sale.make.invoice,grouped:0
@@ -191,6 +206,11 @@ msgid "Check the box to group the invoices for the same customers"
msgstr "Ижил үйлчлүүлэгчийн захиалгыг бүлэглэж нэхэмжлэх бол сонго"
#. module: sale
+#: view:sale.order:0
+msgid "My Sale Orders"
+msgstr ""
+
+#. module: sale
#: selection:sale.order,invoice_quantity:0
msgid "Ordered Quantities"
msgstr "Захиалсан тоо хэмжээ"
@@ -232,13 +252,24 @@ msgstr ""
"автоматаар үүснэ."
#. module: sale
+#: field:sale.config.picking_policy,task_work:0
+msgid "Based on Tasks' Work"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
+msgid "Quotations and Sales"
+msgstr ""
+
+#. module: sale
#: model:ir.model,name:sale.model_sale_make_invoice
msgid "Sales Make Invoice"
msgstr ""
#. module: sale
-#: view:sale.order:0
-msgid "Recreate Packing"
+#: code:addons/sale/sale.py:330
+#, python-format
+msgid "Pricelist Warning!"
msgstr ""
#. module: sale
@@ -247,10 +278,10 @@ msgid "Discount (%)"
msgstr "Хөнгөлөлт (%)"
#. module: sale
-#: help:res.company,security_lead:0
-msgid ""
-"This is the days added to what you promise to customers for security purpose"
-msgstr "Энэ бол та үйлчлүүлэгчдээ амласан хугацааны нийлбэр юм"
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_quotation_for_sale
+msgid "My Quotations"
+msgstr "Миний ханш"
#. module: sale
#: view:board.board:0
@@ -275,7 +306,22 @@ msgid "Shop Name"
msgstr "Дэлгүүрийн нэр"
#. module: sale
-#: code:addons/sale/sale.py:1014
+#: help:sale.order,order_policy:0
+msgid ""
+"The Invoice Policy is used to synchronise invoice and delivery operations.\n"
+" - The 'Pay before delivery' choice will first generate the invoice and "
+"then generate the picking order after the payment of this invoice.\n"
+" - The 'Deliver & Invoice on demand' will create the picking order directly "
+"and wait for the user to manually click on the 'Invoice' button to generate "
+"the draft invoice based on the sale order or the sale order lines.\n"
+" - The 'Invoice on order after delivery' choice will generate the draft "
+"invoice based on sales order after all picking lists have been finished.\n"
+" - The 'Invoice based on deliveries' choice is used to create an invoice "
+"during the picking process."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:1158
#, python-format
msgid "No Customer Defined !"
msgstr "Үйлчлүүлэгч алга !"
@@ -286,9 +332,12 @@ msgid "Sales in Exception"
msgstr "Саатаж буй захиалга"
#. module: sale
-#: view:sale.order:0
-msgid "Set to Draft"
-msgstr "Ноороглох"
+#: code:addons/sale/sale.py:1145
+#: code:addons/sale/sale.py:1264
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:70
+#, python-format
+msgid "Configuration Error !"
+msgstr ""
#. module: sale
#: view:sale.order:0
@@ -296,22 +345,7 @@ msgid "Conditions"
msgstr "Нөхцөлүүд"
#. module: sale
-#: help:sale.order,order_policy:0
-msgid ""
-"The Shipping Policy is used to synchronise invoice and delivery operations.\n"
-" - The 'Pay Before delivery' choice will first generate the invoice and "
-"then generate the picking order after the payment of this invoice.\n"
-" - The 'Shipping & Manual Invoice' will create the picking order directly "
-"and wait for the user to manually click on the 'Invoice' button to generate "
-"the draft invoice.\n"
-" - The 'Invoice On Order After Delivery' choice will generate the draft "
-"invoice based on sales order after all picking lists have been finished.\n"
-" - The 'Invoice From The Picking' choice is used to create an invoice "
-"during the picking process."
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:939
+#: code:addons/sale/sale.py:1034
#, python-format
msgid ""
"There is no income category account defined in default Properties for "
@@ -321,9 +355,9 @@ msgstr ""
"тодорхойлогдоогүй байна !"
#. module: sale
-#: view:sale.installer:0
-msgid "Configure"
-msgstr ""
+#: selection:sale.report,month:0
+msgid "August"
+msgstr "Наймдугаар сар"
#. module: sale
#: constraint:stock.move:0
@@ -331,7 +365,7 @@ msgid "You try to assign a lot which is not from the same product"
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:620
+#: code:addons/sale/sale.py:655
#, python-format
msgid "invalid mode for test_state"
msgstr "тохирохгүй төлөв байна"
@@ -342,7 +376,7 @@ msgid "June"
msgstr "Зургадугаар сар"
#. module: sale
-#: code:addons/sale/sale.py:584
+#: code:addons/sale/sale.py:617
#, python-format
msgid "Could not cancel this sales order !"
msgstr ""
@@ -363,8 +397,12 @@ msgid "October"
msgstr "10 сар"
#. module: sale
+#: sql_constraint:stock.picking:0
+msgid "Reference must be unique per Company!"
+msgstr ""
+
+#. module: sale
#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_quotation_for_sale
#: view:sale.order:0
#: view:sale.report:0
msgid "Quotations"
@@ -376,11 +414,6 @@ msgid "Pricelist for current sales order."
msgstr ""
#. module: sale
-#: selection:sale.config.picking_policy,step:0
-msgid "Delivery Order Only"
-msgstr "Зөвхөн хүргэх захиалга"
-
-#. module: sale
#: report:sale.order:0
msgid "TVA :"
msgstr "НӨАТ :"
@@ -405,6 +438,7 @@ msgstr "Санхүүгийн орлуулалт"
#. module: sale
#: view:sale.order:0
#: view:sale.order.line:0
+#: field:sale.report,product_uom:0
msgid "UoM"
msgstr "Х.н"
@@ -427,13 +461,19 @@ msgid ""
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:971
+#: code:addons/sale/sale.py:1061
+#, python-format
+msgid "You cannot cancel a sale order line that has already been invoiced!"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:1066
#, python-format
msgid "You must first cancel stock moves attached to this sales order line."
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:1042
+#: code:addons/sale/sale.py:1134
#, python-format
msgid "(n/a)"
msgstr ""
@@ -469,13 +509,35 @@ msgid "Notes"
msgstr "Тэмдэглэл"
#. module: sale
+#: sql_constraint:res.company:0
+msgid "The company name must be unique !"
+msgstr ""
+
+#. module: sale
#: help:sale.order,partner_invoice_id:0
msgid "Invoice address for current sales order."
msgstr ""
#. module: sale
-#: view:sale.installer:0
-msgid "Enhance your core Sales Application with additional functionalities."
+#: view:sale.report:0
+msgid "Month-1"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered month of the sales order"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:504
+#, python-format
+msgid ""
+"You cannot group sales having different currencies for the same partner."
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,picking_policy:0
+msgid "Deliver each product when available"
msgstr ""
#. module: sale
@@ -495,21 +557,43 @@ msgid "Confirmation Date"
msgstr "Баталгаажсан огноо"
#. module: sale
+#: field:sale.order,incoterm:0
+msgid "Incoterm"
+msgstr "Худалдааны нөхцөл"
+
+#. module: sale
#: field:sale.order.line,address_allotment_id:0
msgid "Allotment Partner"
msgstr "Хоёрдогч хүргэх хаяг"
#. module: sale
-#: sql_constraint:sale.order:0
-msgid "Order Reference must be unique !"
-msgstr ""
-
-#. module: sale
#: selection:sale.report,month:0
msgid "March"
msgstr "3 сар"
#. module: sale
+#: constraint:stock.move:0
+msgid "You can not move products from or to a location of the type view."
+msgstr ""
+
+#. module: sale
+#: field:sale.config.picking_policy,sale_orders:0
+msgid "Based on Sales Orders"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,state:0
+msgid ""
+"Givwizard = self.browse(cr, uid, ids)[0]es the state of the quotation or "
+"sales order. \n"
+"The exception state is automatically set when a cancel operation occurs in "
+"the invoice validation (Invoice Exception) or in the picking list process "
+"(Shipping Exception). \n"
+"The 'Waiting Schedule' state is set when the invoice is confirmed but "
+"waiting for the scheduler to run on the order date."
+msgstr ""
+
+#. module: sale
#: help:sale.order,amount_total:0
msgid "The total amount."
msgstr ""
@@ -525,6 +609,11 @@ msgid "Invoice address :"
msgstr "Нэхэмжлэх хаяг :"
#. module: sale
+#: field:sale.order.line,sequence:0
+msgid "Line Sequence"
+msgstr ""
+
+#. module: sale
#: model:process.transition,note:sale.process_transition_saleorderprocurement0
msgid ""
"For every sales order line, a procurement order is created to supply the "
@@ -571,11 +660,6 @@ msgid "Sales Order Line"
msgstr ""
#. module: sale
-#: view:sale.config.picking_policy:0
-msgid "Setup your sales workflow and default values."
-msgstr ""
-
-#. module: sale
#: field:sale.shop,warehouse_id:0
msgid "Warehouse"
msgstr "Агуулах"
@@ -612,6 +696,11 @@ msgid "Creation Date"
msgstr "Үүсгэсэн огноо"
#. module: sale
+#: model:ir.ui.menu,name:sale.menu_sales_configuration_misc
+msgid "Miscellaneous"
+msgstr ""
+
+#. module: sale
#: model:ir.actions.act_window,name:sale.action_order_line_tree3
msgid "Uninvoiced and Delivered Lines"
msgstr "Нэхэмжлээгүй бөгөөд хүргэгдсэн захиалгууд"
@@ -627,14 +716,19 @@ msgid "My Sales"
msgstr "Миний борлуулалт"
#. module: sale
-#: code:addons/sale/sale.py:290
-#: code:addons/sale/sale.py:966
-#: code:addons/sale/sale.py:1165
+#: code:addons/sale/sale.py:295
+#: code:addons/sale/sale.py:1061
+#: code:addons/sale/sale.py:1290
#, python-format
msgid "Invalid action !"
msgstr "Хүчингүй үйлдэл !"
#. module: sale
+#: view:sale.order:0
+msgid "Extra Info"
+msgstr "Нэмэлт мэдээлэл"
+
+#. module: sale
#: field:sale.order,pricelist_id:0
#: field:sale.report,pricelist_id:0
#: field:sale.shop,pricelist_id:0
@@ -648,13 +742,21 @@ msgid "# of Qty"
msgstr "Нийт тоо хэмжээ"
#. module: sale
+#: code:addons/sale/sale.py:1314
+#, python-format
+msgid "Hour"
+msgstr ""
+
+#. module: sale
#: view:sale.order:0
msgid "Order Date"
msgstr "Огноо"
#. module: sale
#: view:sale.order.line:0
+#: view:sale.report:0
#: field:sale.report,shipped:0
+#: field:sale.report,shipped_qty_1:0
msgid "Shipped"
msgstr "Хүргэгдсэн"
@@ -664,8 +766,8 @@ msgid "All Quotations"
msgstr "Бүх үнийн санал"
#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Invoice On Order After Delivery"
+#: view:sale.config.picking_policy:0
+msgid "Options"
msgstr ""
#. module: sale
@@ -674,6 +776,20 @@ msgid "September"
msgstr "9 сар"
#. module: sale
+#: code:addons/sale/sale.py:632
+#, python-format
+msgid "You cannot confirm a sale order which has no line."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:1246
+#, python-format
+msgid ""
+"You have to select a pricelist or a customer in the sales form !\n"
+"Please set one before choosing a product."
+msgstr ""
+
+#. module: sale
#: view:sale.report:0
#: field:sale.report,categ_id:0
msgid "Category of Product"
@@ -690,11 +806,6 @@ msgid "Stock Moves"
msgstr "Барааны хөдөлгөөн"
#. module: sale
-#: view:sale.report:0
-msgid " Year "
-msgstr " Жил "
-
-#. module: sale
#: field:sale.order,state:0
#: field:sale.report,state:0
msgid "Order State"
@@ -712,7 +823,7 @@ msgid "Sales By Month"
msgstr "Борлуулалт сараар"
#. module: sale
-#: code:addons/sale/sale.py:970
+#: code:addons/sale/sale.py:1065
#, python-format
msgid "Could not cancel sales order line!"
msgstr ""
@@ -745,42 +856,19 @@ msgid ""
msgstr ""
#. module: sale
+#: field:sale.order,date_order:0
+msgid "Date"
+msgstr ""
+
+#. module: sale
#: view:sale.report:0
msgid "Extended Filters..."
msgstr "Өргөтгөсөн хайлт..."
#. module: sale
-#: model:ir.module.module,description:sale.module_meta_information
-msgid ""
-"\n"
-" The base module to manage quotations and sales orders.\n"
-"\n"
-" * Workflow with validation steps:\n"
-" - Quotation -> Sales order -> Invoice\n"
-" * Invoicing methods:\n"
-" - Invoice on order (before or after shipping)\n"
-" - Invoice on delivery\n"
-" - Invoice on timesheets\n"
-" - Advance invoice\n"
-" * Partners preferences (shipping, invoicing, incoterm, ...)\n"
-" * Products stocks and prices\n"
-" * Delivery methods:\n"
-" - all at once, multi-parcel\n"
-" - delivery costs\n"
-" * Dashboard for salesman that includes:\n"
-" * Your open quotations\n"
-" * Top 10 sales of the month\n"
-" * Cases statistics\n"
-" * Graph of sales by product\n"
-" * Graph of cases of the month\n"
-" "
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_shop
-#: view:sale.shop:0
-msgid "Sales Shop"
-msgstr ""
+#: selection:sale.order.line,state:0
+msgid "Exception"
+msgstr "Алдаа"
#. module: sale
#: model:ir.model,name:sale.model_res_company
@@ -788,9 +876,10 @@ msgid "Companies"
msgstr "Компаниуд"
#. module: sale
-#: selection:sale.report,month:0
-msgid "November"
-msgstr "Арван нэгдүгээр сар"
+#: code:addons/sale/sale.py:1259
+#, python-format
+msgid "No valid pricelist line found ! :"
+msgstr ""
#. module: sale
#: view:sale.order:0
@@ -798,9 +887,9 @@ msgid "History"
msgstr "Түүх"
#. module: sale
-#: field:sale.config.picking_policy,picking_policy:0
-msgid "Picking Default Policy"
-msgstr "Түүврийн үндсэн арга"
+#: selection:sale.order,order_policy:0
+msgid "Invoice on order after delivery"
+msgstr ""
#. module: sale
#: help:sale.order,invoice_ids:0
@@ -822,13 +911,12 @@ msgid ""
msgstr "Захиалга өгсөн хүний нэр, хаяг."
#. module: sale
-#: code:addons/sale/sale.py:966
-#, python-format
-msgid "You cannot cancel a sales order line that has already been invoiced !"
-msgstr ""
+#: help:res.company,security_lead:0
+msgid ""
+"This is the days added to what you promise to customers for security purpose"
+msgstr "Энэ бол та үйлчлүүлэгчдээ амласан хугацааны нийлбэр юм"
#. module: sale
-#: view:sale.order:0
#: view:sale.order.line:0
msgid "Qty"
msgstr "Тоо хэмжээ"
@@ -839,6 +927,11 @@ msgid "References"
msgstr "Лавлагаа"
#. module: sale
+#: view:sale.order.line:0
+msgid "My Sales Order Lines"
+msgstr ""
+
+#. module: sale
#: model:process.transition.action,name:sale.process_transition_action_cancel0
#: model:process.transition.action,name:sale.process_transition_action_cancel1
#: model:process.transition.action,name:sale.process_transition_action_cancel2
@@ -850,14 +943,9 @@ msgid "Cancel"
msgstr "Цуцлах"
#. module: sale
-#: field:sale.installer,sale_order_dates:0
-msgid "Sales Order Dates"
-msgstr "Борлуулалтын захиалгын огноо"
-
-#. module: sale
-#: selection:sale.order.line,state:0
-msgid "Exception"
-msgstr "Алдаа"
+#: sql_constraint:sale.order:0
+msgid "Order Reference must be unique per Company!"
+msgstr ""
#. module: sale
#: model:process.transition,name:sale.process_transition_invoice0
@@ -869,19 +957,19 @@ msgid "Create Invoice"
msgstr "Нэхэмжлэл үүсгэх"
#. module: sale
-#: field:sale.installer,sale_margin:0
-msgid "Margins in Sales Orders"
-msgstr "Борлуулалтын захиалгын зөрүү"
-
-#. module: sale
#: view:sale.order:0
msgid "Total Tax Excluded"
msgstr "Татваргүй нийлбэр"
#. module: sale
-#: view:sale.order:0
-msgid "Compute"
-msgstr "Тооцоолох"
+#: view:sale.order.line:0
+msgid "Order reference"
+msgstr ""
+
+#. module: sale
+#: view:sale.open.invoice:0
+msgid "You invoice has been successfully created!"
+msgstr "Таны нэхэмжлэл амжилттай үүслээ!"
#. module: sale
#: view:sale.report:0
@@ -900,23 +988,20 @@ msgid "Open Invoice"
msgstr "Нэхэмжлэл нээх"
#. module: sale
-#: report:sale.order:0
-#: view:sale.order.line:0
-msgid "Price"
-msgstr "Үнэ"
+#: model:ir.actions.server,name:sale.ir_actions_server_edi_sale
+msgid "Auto-email confirmed sale orders"
+msgstr ""
#. module: sale
-#: model:ir.actions.act_window,name:sale.action_sale_installer
-#: view:sale.config.picking_policy:0
-#: view:sale.installer:0
-msgid "Sales Application Configuration"
-msgstr "Борлуулалтын модулийн тохиргоо"
+#: code:addons/sale/sale.py:413
+#, python-format
+msgid "There is no sales journal defined for this company: \"%s\" (id:%d)"
+msgstr ""
#. module: sale
-#: view:sale.report:0
-#: field:sale.report,price_total:0
-msgid "Total Price"
-msgstr "Нийт Үнэ"
+#: model:process.transition.action,name:sale.process_transition_action_forceassignation0
+msgid "Force Assignation"
+msgstr "Хөдөлгөөн Төлөвлөлт"
#. module: sale
#: selection:sale.order.line,type:0
@@ -929,6 +1014,11 @@ msgid "Based on the shipped or on the ordered quantities."
msgstr "Хүргэгдсэн эсвэл захиалсан тоо хэмжээн дээр үндэслэнэ."
#. module: sale
+#: selection:sale.order,picking_policy:0
+msgid "Deliver all products at once"
+msgstr ""
+
+#. module: sale
#: field:sale.order,picking_ids:0
msgid "Related Picking"
msgstr "Холбогдох хүргэлт"
@@ -960,9 +1050,15 @@ msgid "Create Delivery Order"
msgstr "Хүргэлтийн захиалга үүсгэх"
#. module: sale
-#: field:sale.installer,delivery:0
-msgid "Delivery Costs"
-msgstr "Хүргэлтийн өртөг"
+#: code:addons/sale/sale.py:1290
+#, python-format
+msgid "Cannot delete a sales order line which is in state '%s'!"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Qty(UoS)"
+msgstr ""
#. module: sale
#: view:sale.order:0
@@ -976,13 +1072,13 @@ msgstr "Хүргэлтийн баримт үүсгэх"
#. module: sale
#: view:sale.report:0
-msgid "Sales by Product Category"
-msgstr "Борлуулалт, барааны ангилалаар"
+msgid "Ordered date of the sales order"
+msgstr ""
#. module: sale
-#: selection:sale.order,picking_policy:0
-msgid "Partial Delivery"
-msgstr "Хэсэгчилсэн хүргэлт"
+#: view:sale.report:0
+msgid "Sales by Product Category"
+msgstr "Борлуулалт, барааны ангилалаар"
#. module: sale
#: model:process.transition,name:sale.process_transition_confirmquotation0
@@ -990,9 +1086,10 @@ msgid "Confirm Quotation"
msgstr "Үнийн саналыг батлах"
#. module: sale
-#: help:sale.order,origin:0
-msgid "Reference of the document that generated this sales order request."
-msgstr ""
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:63
+#, python-format
+msgid "Error"
+msgstr "Алдаа"
#. module: sale
#: view:sale.order:0
@@ -1024,20 +1121,14 @@ msgid "Procurement Method"
msgstr "Нөхөн дүүргэх хэлбэр"
#. module: sale
-#: view:sale.config.picking_policy:0
-#: view:sale.installer:0
-msgid "title"
-msgstr "гарчиг"
-
-#. module: sale
#: model:process.node,name:sale.process_node_packinglist0
msgid "Pick List"
msgstr "Хүргэлтийн баримт"
#. module: sale
#: view:sale.order:0
-msgid "Order date"
-msgstr "Захиалах огноо"
+msgid "Set to Draft"
+msgstr "Ноороглох"
#. module: sale
#: model:process.node,note:sale.process_node_packinglist0
@@ -1045,6 +1136,85 @@ msgid "Document of the move to the output or to the customer."
msgstr ""
#. module: sale
+#: model:email.template,body_text:sale.email_template_edi_sale
+msgid ""
+"\n"
+"Hello${object.partner_order_id.name and ' ' or "
+"''}${object.partner_order_id.name or ''},\n"
+"\n"
+"Here is your order confirmation for ${object.partner_id.name}:\n"
+" | Order number: *${object.name}*\n"
+" | Order total: *${object.amount_total} "
+"${object.pricelist_id.currency_id.name}*\n"
+" | Order date: ${object.date_order}\n"
+" % if object.origin:\n"
+" | Order reference: ${object.origin}\n"
+" % endif\n"
+" % if object.client_order_ref:\n"
+" | Your reference: ${object.client_order_ref}<br />\n"
+" % endif\n"
+" | Your contact: ${object.user_id.name} ${object.user_id.user_email "
+"and '<%s>'%(object.user_id.user_email) or ''}\n"
+"\n"
+"You can view the order confirmation, download it and even pay online using "
+"the following link:\n"
+" ${ctx.get('edi_web_url_view') or 'n/a'}\n"
+"\n"
+"% if object.order_policy in ('prepaid','manual') and "
+"object.company_id.paypal_account:\n"
+"<% \n"
+"comp_name = quote(object.company_id.name)\n"
+"order_name = quote(object.name)\n"
+"paypal_account = quote(object.company_id.paypal_account)\n"
+"order_amount = quote(str(object.amount_total))\n"
+"cur_name = quote(object.pricelist_id.currency_id.name)\n"
+"paypal_url = \"https://www.paypal.com/cgi-"
+"bin/webscr?cmd=_xclick&business=%s&item_name=%s%%20Order%%20%s&invoice=%s&amo"
+"unt=%s\" \\\n"
+" "
+"\"&currency_code=%s&button_subtype=services&no_note=1&bn=OpenERP_Order_PayNow"
+"_%s\" % \\\n"
+" "
+"(paypal_account,comp_name,order_name,order_name,order_amount,cur_name,cur_nam"
+"e)\n"
+"%>\n"
+"It is also possible to directly pay with Paypal:\n"
+" ${paypal_url}\n"
+"% endif\n"
+"\n"
+"If you have any question, do not hesitate to contact us.\n"
+"\n"
+"\n"
+"Thank you for choosing ${object.company_id.name}!\n"
+"\n"
+"\n"
+"--\n"
+"${object.user_id.name} ${object.user_id.user_email and "
+"'<%s>'%(object.user_id.user_email) or ''}\n"
+"${object.company_id.name}\n"
+"% if object.company_id.street:\n"
+"${object.company_id.street or ''}\n"
+"% endif\n"
+"% if object.company_id.street2:\n"
+"${object.company_id.street2}\n"
+"% endif\n"
+"% if object.company_id.city or object.company_id.zip:\n"
+"${object.company_id.zip or ''} ${object.company_id.city or ''}\n"
+"% endif\n"
+"% if object.company_id.country_id:\n"
+"${object.company_id.state_id and ('%s, ' % object.company_id.state_id.name) "
+"or ''} ${object.company_id.country_id.name or ''}\n"
+"% endif\n"
+"% if object.company_id.phone:\n"
+"Phone: ${object.company_id.phone}\n"
+"% endif\n"
+"% if object.company_id.website:\n"
+"${object.company_id.website or ''}\n"
+"% endif\n"
+" "
+msgstr ""
+
+#. module: sale
#: model:process.transition.action,name:sale.process_transition_action_validate0
msgid "Validate"
msgstr "Батлах"
@@ -1067,9 +1237,9 @@ msgid "Taxes"
msgstr "Татвар"
#. module: sale
-#: field:sale.order,order_policy:0
-msgid "Shipping Policy"
-msgstr "Захиалга гүйцэтгэх арга"
+#: view:sale.order:0
+msgid "Sales Order ready to be invoiced"
+msgstr ""
#. module: sale
#: help:sale.order,create_date:0
@@ -1088,9 +1258,9 @@ msgid "Create Invoices"
msgstr "Нэхэмжлэл үүсгэх"
#. module: sale
-#: view:sale.order:0
-msgid "Extra Info"
-msgstr "Нэмэлт мэдээлэл"
+#: view:sale.report:0
+msgid "Sales order created in current month"
+msgstr ""
#. module: sale
#: report:sale.order:0
@@ -1098,11 +1268,24 @@ msgid "Fax :"
msgstr "Факс:"
#. module: sale
+#: help:sale.order.line,type:0
+msgid ""
+"If 'on order', it triggers a procurement when the sale order is confirmed to "
+"create a task, purchase order or manufacturing order linked to this sale "
+"order line."
+msgstr ""
+
+#. module: sale
#: field:sale.advance.payment.inv,amount:0
msgid "Advance Amount"
msgstr "Урьдчилгаа дүн"
#. module: sale
+#: field:sale.config.picking_policy,charge_delivery:0
+msgid "Do you charge the delivery?"
+msgstr ""
+
+#. module: sale
#: selection:sale.order,invoice_quantity:0
msgid "Shipped Quantities"
msgstr "Тээвэрлэсэн тоо"
@@ -1113,25 +1296,45 @@ msgid "Invoice Based on Sales Orders"
msgstr "Захиалга дээр үндэслэсэн нэхэмжлэл"
#. module: sale
+#: code:addons/sale/sale.py:331
+#, python-format
+msgid ""
+"If you change the pricelist of this order (and eventually the currency), "
+"prices of existing order lines will not be updated."
+msgstr ""
+
+#. module: sale
#: model:ir.model,name:sale.model_stock_picking
msgid "Picking List"
msgstr "Агуулахын баримт"
#. module: sale
-#: code:addons/sale/sale.py:387
-#: code:addons/sale/sale.py:920
-#: code:addons/sale/sale.py:938
+#: code:addons/sale/sale.py:412
+#: code:addons/sale/sale.py:503
+#: code:addons/sale/sale.py:632
+#: code:addons/sale/sale.py:1015
+#: code:addons/sale/sale.py:1033
#, python-format
msgid "Error !"
msgstr "Алдаа !"
#. module: sale
-#: code:addons/sale/sale.py:570
+#: code:addons/sale/sale.py:603
#, python-format
msgid "Could not cancel sales order !"
msgstr ""
#. module: sale
+#: view:sale.order:0
+msgid "Qty(UoM)"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered Year of the sales order"
+msgstr ""
+
+#. module: sale
#: selection:sale.report,month:0
msgid "July"
msgstr "7 сар"
@@ -1148,35 +1351,25 @@ msgid "Shipping Exception"
msgstr "Хүргэлтийн саатал"
#. module: sale
-#: field:sale.make.invoice,grouped:0
-msgid "Group the invoices"
-msgstr "Нэхэмжлэлийг бүлэглэх"
-
-#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Shipping & Manual Invoice"
-msgstr "Хүргэлтийн дараа нэхэмжлэлийг гараар үүсгэх"
-
-#. module: sale
-#: code:addons/sale/sale.py:1051
+#: code:addons/sale/sale.py:1143
#, python-format
-msgid "Picking Information !"
-msgstr "Түүврийн мэдээлэл !"
+msgid "Picking Information ! : "
+msgstr ""
#. module: sale
-#: view:sale.report:0
-#: field:sale.report,month:0
-msgid "Month"
-msgstr "Сар"
+#: field:sale.make.invoice,grouped:0
+msgid "Group the invoices"
+msgstr "Нэхэмжлэлийг бүлэглэх"
#. module: sale
-#: model:ir.module.module,shortdesc:sale.module_meta_information
-msgid "Sales Management"
-msgstr "Борлуулалтын менежмент"
+#: field:sale.order,order_policy:0
+msgid "Invoice Policy"
+msgstr ""
#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Invoice From The Picking"
+#: model:ir.actions.act_window,name:sale.action_config_picking_policy
+#: view:sale.config.picking_policy:0
+msgid "Setup your Invoicing Method"
msgstr ""
#. module: sale
@@ -1186,28 +1379,31 @@ msgstr "Нягтлан бодогчоор хянагдана."
#. module: sale
#: view:sale.report:0
-#: field:sale.report,uom_name:0
msgid "Reference UoM"
msgstr ""
#. module: sale
+#: view:sale.config.picking_policy:0
+msgid ""
+"This tool will help you to install the right module and configure the system "
+"according to the method you use to invoice your customers."
+msgstr ""
+
+#. module: sale
#: model:ir.model,name:sale.model_sale_order_line_make_invoice
msgid "Sale OrderLine Make_invoice"
msgstr ""
#. module: sale
-#: help:sale.config.picking_policy,step:0
-msgid ""
-"By default, OpenERP is able to manage complex routing and paths of products "
-"in your warehouse and partner locations. This will configure the most common "
-"and simple methods to deliver products to the customer in one or two "
-"operations by the worker."
-msgstr ""
+#: selection:sale.order,state:0
+#: selection:sale.report,state:0
+msgid "Invoice Exception"
+msgstr "Нэхэмжлэлийн алдаа"
#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_tree
-msgid "Old Quotations"
-msgstr "Хуучин үнийн санал"
+#: model:process.node,note:sale.process_node_saleorder0
+msgid "Drives procurement and invoicing"
+msgstr "Нөхөн дүүргэлт хийх болон нэхэмжлэх"
#. module: sale
#: field:sale.order,invoiced:0
@@ -1222,6 +1418,22 @@ msgid "Sales Analysis"
msgstr "Борлуулалтын шинжилгээ"
#. module: sale
+#: code:addons/sale/sale.py:1138
+#, python-format
+msgid ""
+"You selected a quantity of %d Units.\n"
+"But it's not compatible with the selected packaging.\n"
+"Here is a proposition of quantities according to the packaging:\n"
+"EAN: %s Quantity: %s Type of ul: %s"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Recreate Packing"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
#: field:sale.order.line,property_ids:0
msgid "Properties"
msgstr "Шинж чанар"
@@ -1254,7 +1466,17 @@ msgstr ""
"боломжтой."
#. module: sale
-#: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
+#: view:sale.order.line:0
+msgid "Confirmed sale order lines, not yet delivered"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:473
+#, python-format
+msgid "Customer Invoices"
+msgstr ""
+
+#. module: sale
#: model:process.process,name:sale.process_process_salesprocess0
#: view:sale.order:0
#: view:sale.report:0
@@ -1276,18 +1498,13 @@ msgid "Done"
msgstr "Дууссан"
#. module: sale
-#: model:ir.model,name:sale.model_sale_installer
-msgid "sale.installer"
-msgstr "sale.installer"
-
-#. module: sale
#: model:process.node,name:sale.process_node_invoice0
#: model:process.node,name:sale.process_node_invoiceafterdelivery0
msgid "Invoice"
msgstr "Нэхэмжлэл"
#. module: sale
-#: code:addons/sale/sale.py:1014
+#: code:addons/sale/sale.py:1158
#, python-format
msgid ""
"You have to select a customer in the sales form !\n"
@@ -1295,11 +1512,6 @@ msgid ""
msgstr ""
#. module: sale
-#: selection:sale.config.picking_policy,step:0
-msgid "Picking List & Delivery Order"
-msgstr "Түүврийн жагсаалт ба Хүргэлтийн захиалга"
-
-#. module: sale
#: field:sale.order,origin:0
msgid "Source Document"
msgstr ""
@@ -1325,7 +1537,7 @@ msgid "The amount without tax."
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:571
+#: code:addons/sale/sale.py:604
#, python-format
msgid "You must first cancel all picking attached to this sales order."
msgstr ""
@@ -1336,9 +1548,15 @@ msgid "Sales Advance Payment Invoice"
msgstr ""
#. module: sale
-#: field:sale.order,incoterm:0
-msgid "Incoterm"
-msgstr "Худалдааны нөхцөл"
+#: view:sale.report:0
+#: field:sale.report,month:0
+msgid "Month"
+msgstr "Сар"
+
+#. module: sale
+#: model:email.template,subject:sale.email_template_edi_sale
+msgid "${object.company_id.name} Order (Ref ${object.name or 'n/a' })"
+msgstr ""
#. module: sale
#: view:sale.order.line:0
@@ -1349,11 +1567,6 @@ msgid "Product"
msgstr "Бараа"
#. module: sale
-#: model:ir.ui.menu,name:sale.menu_invoiced
-msgid "Invoicing"
-msgstr "Нэхэмжлэл"
-
-#. module: sale
#: model:process.transition.action,name:sale.process_transition_action_cancelassignation0
msgid "Cancel Assignation"
msgstr "Эрх шилжүүлэхийг цуцлах"
@@ -1364,14 +1577,10 @@ msgid "sale.config.picking_policy"
msgstr "sale.config.picking_policy"
#. module: sale
-#: help:sale.order,state:0
-msgid ""
-"Gives the state of the quotation or sales order. \n"
-"The exception state is automatically set when a cancel operation occurs in "
-"the invoice validation (Invoice Exception) or in the picking list process "
-"(Shipping Exception). \n"
-"The 'Waiting Schedule' state is set when the invoice is confirmed but "
-"waiting for the scheduler to run on the date 'Ordered Date'."
+#: view:account.invoice.report:0
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_turnover_by_month
+msgid "Monthly Turnover"
msgstr ""
#. module: sale
@@ -1390,7 +1599,6 @@ msgid "Product UoS"
msgstr "Хоёрдогч хэмжих нэгж"
#. module: sale
-#: selection:sale.order,state:0
#: selection:sale.report,state:0
msgid "Manual In Progress"
msgstr "Захиалгыг бэлтгэж байна"
@@ -1411,7 +1619,8 @@ msgid "Order"
msgstr "Захиалга"
#. module: sale
-#: code:addons/sale/sale.py:921
+#: code:addons/sale/sale.py:1016
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:71
#, python-format
msgid "There is no income account defined for this product: \"%s\" (id:%d)"
msgstr ""
@@ -1431,7 +1640,7 @@ msgid ""
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:1116
+#: code:addons/sale/sale.py:1238
#, python-format
msgid ""
"You plan to sell %.2f %s but you only have %.2f %s available !\n"
@@ -1460,10 +1669,10 @@ msgid "Total"
msgstr "Нийт"
#. module: sale
-#: code:addons/sale/sale.py:388
-#, python-format
-msgid "There is no sales journal defined for this company: \"%s\" (id:%d)"
-msgstr ""
+#: report:sale.order:0
+#: view:sale.order.line:0
+msgid "Price"
+msgstr "Үнэ"
#. module: sale
#: model:process.transition,note:sale.process_transition_deliver0
@@ -1474,9 +1683,14 @@ msgid ""
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:1165
-#, python-format
-msgid "Cannot delete a sales order line which is %s !"
+#: selection:sale.order,order_policy:0
+msgid "Pay before delivery"
+msgstr ""
+
+#. module: sale
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.open_board_sales
+msgid "Sales Dashboard"
msgstr ""
#. module: sale
@@ -1488,6 +1702,7 @@ msgstr "Нэхэмжлэл үүсгэх"
#. module: sale
#: view:sale.order:0
+#: selection:sale.order,state:0
#: view:sale.order.line:0
msgid "To Invoice"
msgstr "Нэхэмжлэх"
@@ -1498,6 +1713,11 @@ msgid "Date on which sales order is confirmed."
msgstr ""
#. module: sale
+#: field:sale.order,project_id:0
+msgid "Contract/Analytic Account"
+msgstr ""
+
+#. module: sale
#: field:sale.order,company_id:0
#: field:sale.order.line,company_id:0
#: view:sale.report:0
@@ -1517,22 +1737,17 @@ msgid "The amount to be invoiced in advance."
msgstr "Урьдчилгаа нэхэмжлэх дүн."
#. module: sale
-#: selection:sale.order,state:0
-#: selection:sale.report,state:0
-msgid "Invoice Exception"
-msgstr "Нэхэмжлэлийн алдаа"
-
-#. module: sale
-#: help:sale.order,picking_ids:0
+#: code:addons/sale/sale.py:1256
+#, python-format
msgid ""
-"This is a list of picking that has been generated for this sales order."
+"Couldn't find a pricelist line matching this product and quantity.\n"
+"You have to change either the product, the quantity or the pricelist."
msgstr ""
#. module: sale
-#: help:sale.installer,sale_margin:0
+#: help:sale.order,picking_ids:0
msgid ""
-"Gives the margin of profitability by calculating the difference between Unit "
-"Price and Cost Price."
+"This is a list of picking that has been generated for this sales order."
msgstr ""
#. module: sale
@@ -1554,6 +1769,11 @@ msgid "Cancelled"
msgstr "Цуцалсан"
#. module: sale
+#: view:sale.order.line:0
+msgid "Sales Order Lines related to a Sales Order of mine"
+msgstr ""
+
+#. module: sale
#: model:ir.actions.act_window,name:sale.action_shop_form
#: model:ir.ui.menu,name:sale.menu_action_shop_form
#: field:sale.order,shop_id:0
@@ -1563,17 +1783,12 @@ msgid "Shop"
msgstr "Дэлгүүр"
#. module: sale
-#: view:sale.report:0
-msgid " Month "
-msgstr " Сар "
-
-#. module: sale
#: field:sale.report,date_confirm:0
msgid "Date Confirm"
msgstr "Батлах огноо"
#. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:111
+#: code:addons/sale/wizard/sale_line_invoice.py:113
#, python-format
msgid "Warning"
msgstr "Сануулга"
@@ -1585,17 +1800,6 @@ msgid "Sales by Month"
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:1045
-#, python-format
-msgid ""
-"You selected a quantity of %d Units.\n"
-"But it's not compatible with the selected packaging.\n"
-"Here is a proposition of quantities according to the packaging:\n"
-"\n"
-"EAN: %s Quantity: %s Type of ul: %s"
-msgstr ""
-
-#. module: sale
#: model:ir.model,name:sale.model_sale_order
#: model:process.node,name:sale.process_node_order0
#: model:process.node,name:sale.process_node_saleorder0
@@ -1611,6 +1815,11 @@ msgid "Quantity (UoS)"
msgstr "Хоёрдогч тоо хэмжээ"
#. module: sale
+#: view:sale.order.line:0
+msgid "Sale Order Lines that are in 'done' state"
+msgstr ""
+
+#. module: sale
#: model:process.transition,note:sale.process_transition_packing0
msgid ""
"The Pick List form is created as soon as the sales order is confirmed, in "
@@ -1625,6 +1834,11 @@ msgid "Confirmed"
msgstr "Батлагдсан"
#. module: sale
+#: field:sale.config.picking_policy,order_policy:0
+msgid "Main Method Based On"
+msgstr ""
+
+#. module: sale
#: model:process.transition.action,name:sale.process_transition_action_confirm0
msgid "Confirm"
msgstr "Батлах"
@@ -1647,6 +1861,7 @@ msgid "Invoice Lines"
msgstr "Нэхэмжлэлийн мөрүүд"
#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_product_tree
#: view:sale.order:0
#: view:sale.order.line:0
msgid "Sales Order Lines"
@@ -1663,33 +1878,18 @@ msgid "Configuration"
msgstr "Тохиргоо"
#. module: sale
-#: selection:sale.order,picking_policy:0
-msgid "Complete Delivery"
-msgstr "Бүрэн хүргэлт"
+#: code:addons/sale/edi/sale_order.py:146
+#, python-format
+msgid "EDI Pricelist (%s)"
+msgstr ""
#. module: sale
#: view:sale.report:0
-msgid " Month-1 "
-msgstr " Сар-1 "
-
-#. module: sale
-#: help:sale.config.picking_policy,picking_policy:0
-msgid ""
-"The Shipping Policy is used to configure per order if you want to deliver as "
-"soon as possible when one product is available or you wait that all products "
-"are available.."
+msgid "Sales order created in current year"
msgstr ""
-"Захиалга гүйцэтгэх арга нь захиалсан тоо хэмжээг бүрэн бэлтгэж дуустал "
-"хүргэлтийг хүлээлгэх, эсвэл хүлээлгүйгээр байгаа нөөцийг хүргэх зэргийг "
-"тохируулна."
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "August"
-msgstr "Наймдугаар сар"
#. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:111
+#: code:addons/sale/wizard/sale_line_invoice.py:113
#, python-format
msgid ""
"Invoice cannot be created for this Sales Order Line due to one of the "
@@ -1699,6 +1899,11 @@ msgid ""
msgstr ""
#. module: sale
+#: view:sale.order.line:0
+msgid "Sale order lines done"
+msgstr ""
+
+#. module: sale
#: field:sale.order.line,th_weight:0
msgid "Weight"
msgstr "Жин"
@@ -1717,7 +1922,6 @@ msgstr "12 сар"
#. module: sale
#: field:sale.config.picking_policy,config_logo:0
-#: field:sale.installer,config_logo:0
msgid "Image"
msgstr "Зураг"
@@ -1747,9 +1951,9 @@ msgid "Salesman"
msgstr "Борлуулагч"
#. module: sale
-#: model:process.node,note:sale.process_node_saleorder0
-msgid "Drives procurement and invoicing"
-msgstr "Нөхөн дүүргэлт хийх болон нэхэмжлэх"
+#: model:ir.actions.act_window,name:sale.action_order_tree
+msgid "Old Quotations"
+msgstr "Хуучин үнийн санал"
#. module: sale
#: field:sale.order,amount_untaxed:0
@@ -1757,7 +1961,7 @@ msgid "Untaxed Amount"
msgstr "Татваргүй дүн"
#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:163
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:170
#: model:ir.actions.act_window,name:sale.action_view_sale_advance_payment_inv
#: view:sale.advance.payment.inv:0
#: view:sale.order:0
@@ -1766,7 +1970,7 @@ msgid "Advance Invoice"
msgstr "Урьдчилгаа нэхэмжлэл"
#. module: sale
-#: code:addons/sale/sale.py:591
+#: code:addons/sale/sale.py:624
#, python-format
msgid "The sales order '%s' has been cancelled."
msgstr ""
@@ -1801,20 +2005,20 @@ msgid "Packings"
msgstr ""
#. module: sale
-#: field:sale.config.picking_policy,progress:0
-#: field:sale.installer,progress:0
-msgid "Configuration Progress"
-msgstr "Тохиргооны явц"
+#: view:sale.order.line:0
+msgid "Sale Order Lines ready to be invoiced"
+msgstr ""
#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_product_tree
-msgid "Product sales"
-msgstr "Бүтээгдэхүүний борлуулалт"
+#: view:sale.report:0
+msgid "Sales order created in last month"
+msgstr ""
#. module: sale
-#: field:sale.order,date_order:0
-msgid "Ordered Date"
-msgstr "Захиалсан огноо"
+#: model:ir.actions.act_window,name:sale.action_email_templates
+#: model:ir.ui.menu,name:sale.menu_email_templates
+msgid "Email Templates"
+msgstr ""
#. module: sale
#: model:ir.actions.act_window,name:sale.action_order_form
@@ -1824,14 +2028,15 @@ msgid "Sales Orders"
msgstr "Борлуулалтын захиалга"
#. module: sale
-#: selection:sale.config.picking_policy,picking_policy:0
-msgid "Direct Delivery"
-msgstr "Шууд хүргэлт"
+#: model:ir.model,name:sale.model_sale_shop
+#: view:sale.shop:0
+msgid "Sales Shop"
+msgstr ""
#. module: sale
-#: field:sale.installer,sale_journal:0
-msgid "Invoicing journals"
-msgstr "Нэхэмжлэлийн журналууд"
+#: selection:sale.report,month:0
+msgid "November"
+msgstr "Арван нэгдүгээр сар"
#. module: sale
#: field:sale.advance.payment.inv,product_id:0
@@ -1839,18 +2044,12 @@ msgid "Advance Product"
msgstr "Урьдчилгаа"
#. module: sale
-#: view:sale.report:0
-#: field:sale.report,shipped_qty_1:0
-msgid "Shipped Qty"
-msgstr "Хүргэгдсэн тоо"
-
-#. module: sale
-#: view:sale.open.invoice:0
-msgid "You invoice has been successfully created!"
-msgstr "Таны нэхэмжлэл амжилттай үүслээ!"
+#: view:sale.order:0
+msgid "Compute"
+msgstr "Тооцоолох"
#. module: sale
-#: code:addons/sale/sale.py:585
+#: code:addons/sale/sale.py:618
#, python-format
msgid "You must first cancel all invoices attached to this sales order."
msgstr ""
@@ -1861,33 +2060,27 @@ msgid "January"
msgstr "1 сар"
#. module: sale
-#: view:sale.installer:0
-msgid "Configure Your Sales Management Application"
-msgstr ""
-
-#. module: sale
#: model:ir.actions.act_window,name:sale.action_order_tree4
msgid "Sales Order in Progress"
msgstr "Хийгдэж байгаа захиалга"
#. module: sale
-#: field:sale.installer,sale_layout:0
-msgid "Sales Order Layout Improvement"
+#: help:sale.order,origin:0
+msgid "Reference of the document that generated this sales order request."
msgstr ""
#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:63
-#, python-format
-msgid "Error"
-msgstr "Алдаа"
-
-#. module: sale
#: view:sale.report:0
#: field:sale.report,delay:0
msgid "Commitment Delay"
msgstr "Баталгаажсан дундаж хугацаа"
#. module: sale
+#: selection:sale.order,order_policy:0
+msgid "Deliver & invoice on demand"
+msgstr ""
+
+#. module: sale
#: model:process.node,note:sale.process_node_saleprocurement0
msgid ""
"One Procurement order for each sales order line and for each of the "
@@ -1910,13 +2103,12 @@ msgid "Confirmed sales order to invoice."
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:290
-#, python-format
-msgid "Cannot delete Sales Order(s) which are already confirmed !"
+#: view:sale.order:0
+msgid "Sales Order that haven't yet been confirmed"
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:316
+#: code:addons/sale/sale.py:322
#, python-format
msgid "The sales order '%s' has been set in draft state."
msgstr ""
@@ -1927,37 +2119,27 @@ msgid "from stock"
msgstr "Агуулахаас"
#. module: sale
-#: field:sale.config.picking_policy,order_policy:0
-msgid "Shipping Default Policy"
-msgstr "Захиалга гүйцэтгэх үндсэн арга"
-
-#. module: sale
#: view:sale.open.invoice:0
msgid "Close"
msgstr "Хаах"
#. module: sale
+#: code:addons/sale/sale.py:1248
+#, python-format
+msgid "No Pricelist ! : "
+msgstr ""
+
+#. module: sale
#: field:sale.order,shipped:0
msgid "Delivered"
msgstr "Хүргэгдсэн"
#. module: sale
-#: code:addons/sale/sale.py:1115
-#, python-format
-msgid "Not enough stock !"
-msgstr "Агуулах хангалтгүй !"
-
-#. module: sale
#: constraint:stock.move:0
msgid "You must assign a production lot for this product"
msgstr ""
#. module: sale
-#: field:sale.order.line,sequence:0
-msgid "Layout Sequence"
-msgstr ""
-
-#. module: sale
#: model:ir.actions.act_window,help:sale.action_shop_form
msgid ""
"If you have more than one shop reselling your company products, you can "
@@ -1984,11 +2166,6 @@ msgid "May"
msgstr "5 сар"
#. module: sale
-#: help:sale.installer,sale_order_dates:0
-msgid "Adds commitment, requested and effective dates on Sales Orders."
-msgstr "Adds commitment, requested and effective dates on Sales Orders."
-
-#. module: sale
#: view:sale.order:0
#: field:sale.order,partner_id:0
#: field:sale.order.line,order_partner_id:0
@@ -1996,23 +2173,11 @@ msgid "Customer"
msgstr "Үйлчлүүлэгч"
#. module: sale
-#: model:product.template,name:sale.advance_product_0_product_template
-msgid "Advance"
-msgstr ""
-
-#. module: sale
#: selection:sale.report,month:0
msgid "February"
msgstr "2 сар"
#. module: sale
-#: help:sale.installer,sale_journal:0
-msgid ""
-"Allows you to group and invoice your delivery orders according to different "
-"invoicing types: daily, weekly, etc."
-msgstr ""
-
-#. module: sale
#: selection:sale.report,month:0
msgid "April"
msgstr "4 сар"
@@ -2023,11 +2188,6 @@ msgid "Accounting"
msgstr "Данс бүртгэл"
#. module: sale
-#: field:sale.config.picking_policy,step:0
-msgid "Steps To Deliver a Sales Order"
-msgstr ""
-
-#. module: sale
#: view:sale.order:0
#: view:sale.order.line:0
msgid "Search Sales Order"
@@ -2039,18 +2199,18 @@ msgid "Sales Order Requisition"
msgstr ""
#. module: sale
+#: code:addons/sale/sale.py:1242
+#, python-format
+msgid "Not enough stock ! : "
+msgstr ""
+
+#. module: sale
#: report:sale.order:0
#: field:sale.order,payment_term:0
msgid "Payment Term"
msgstr "Төлбөрийн нөхцөл"
#. module: sale
-#: help:sale.installer,sale_layout:0
-msgid ""
-"Provides some features to improve the layout of the Sales Order reports."
-msgstr "Борлуулалтын захиалгын хуудас хэвлэлтэнд зарим боломжыг нэмэгдүүлнэ."
-
-#. module: sale
#: model:ir.actions.act_window,help:sale.action_order_report_all
msgid ""
"This report performs analysis on your quotations and sales orders. Analysis "
@@ -2157,6 +2317,9 @@ msgstr "Хүргэлт дээр үндэслэн нэхэмжлэх"
#~ msgid "Draft Invoice"
#~ msgstr "Ноорог нэхэмжлэл"
+#~ msgid "Sales Management"
+#~ msgstr "Борлуулалтын менежмент"
+
#~ msgid "Order Ref"
#~ msgstr "Захиалга реф"
@@ -2175,6 +2338,9 @@ msgstr "Хүргэлт дээр үндэслэн нэхэмжлэх"
#~ msgid "Packing Policy"
#~ msgstr "Савлах бодлого"
+#~ msgid "Product sales"
+#~ msgstr "Бүтээгдэхүүний борлуулалт"
+
#~ msgid "Create Advance Invoice"
#~ msgstr "Урьдчилсан нэхэмжлэл үүсгэх"
@@ -2252,6 +2418,9 @@ msgstr "Хүргэлт дээр үндэслэн нэхэмжлэх"
#~ msgstr ""
#~ "Алдаа: Үндсэн нэгж худалдан авах нэгж хоёул нэг ангилалд хамаарах ёстой."
+#~ msgid "Delivery Order Only"
+#~ msgstr "Зөвхөн хүргэх захиалга"
+
#~ msgid "Sales Configuration"
#~ msgstr "Борлуулалтын тохиргоо"
@@ -2289,9 +2458,6 @@ msgstr "Хүргэлт дээр үндэслэн нэхэмжлэх"
#~ "суурилан гаргах хэрэгтэй. Хэрэв бүтээгдэхүүн үйлчилгээ бол тээвэрлэгдсэн тоо "
#~ "хэмжээ нь холбоотой дааллгавар дээр зарцуулсан цаг болно."
-#~ msgid "My Quotations"
-#~ msgstr "Миний ханш"
-
#~ msgid ""
#~ "When you select Shipping Ploicy = 'Automatic Invoice after delivery' , it "
#~ "will automatic create after delivery."
@@ -2344,10 +2510,23 @@ msgstr "Хүргэлт дээр үндэслэн нэхэмжлэх"
#~ msgid "Make invoices"
#~ msgstr "Нэхэмжлэл үүсгэх"
+#~ msgid "Payment Before Delivery"
+#~ msgstr "Хүргэлтээс өмнө төлбөр хийх"
+
+#~ msgid "All at Once"
+#~ msgstr "Бүтэн хүргэлт"
+
+#~ msgid "Configure Picking Policy for Sales Order"
+#~ msgstr "Борлуулалтын захиалгын түүврийн аргын тохиргоо"
+
#, python-format
#~ msgid "Could not cancel sale order !"
#~ msgstr "Борлуулалтын захиалгыг цуцалж болохгүй !"
+#~ msgid "Allows you to compute delivery costs on your quotations."
+#~ msgstr ""
+#~ "Танд үнийн санал дээр хүргэлтийн өртөгийг нэмж тооцоолох боломж олгоно."
+
#~ msgid "Our Salesman"
#~ msgstr "Манай борлуулагч"
@@ -2372,18 +2551,86 @@ msgstr "Хүргэлт дээр үндэслэн нэхэмжлэх"
#~ msgstr "Батлагдсан төлөвтэй борлуулалтын захиалгыг устгах боломжгүй !"
#~ msgid ""
+#~ "Provides some features to improve the layout of the Sales Order reports."
+#~ msgstr "Борлуулалтын захиалгын хуудас хэвлэлтэнд зарим боломжыг нэмэгдүүлнэ."
+
+#~ msgid " Year "
+#~ msgstr " Жил "
+
+#~ msgid "Sales Order Dates"
+#~ msgstr "Борлуулалтын захиалгын огноо"
+
+#~ msgid "Margins in Sales Orders"
+#~ msgstr "Борлуулалтын захиалгын зөрүү"
+
+#~ msgid "Sales Application Configuration"
+#~ msgstr "Борлуулалтын модулийн тохиргоо"
+
+#~ msgid "Delivery Costs"
+#~ msgstr "Хүргэлтийн өртөг"
+
+#~ msgid "Partial Delivery"
+#~ msgstr "Хэсэгчилсэн хүргэлт"
+
+#~ msgid "title"
+#~ msgstr "гарчиг"
+
+#~ msgid "Order date"
+#~ msgstr "Захиалах огноо"
+
+#~ msgid ""
#~ "This is the list of picking list that have been generated for this invoice"
#~ msgstr ""
#~ "Энэ дэлгэц нь сонгосон нэхэмжлэлийн эх баримт бүхий агуулахын баримтын "
#~ "жагсаалт юм"
+#~ msgid "Shipping Policy"
+#~ msgstr "Захиалга гүйцэтгэх арга"
+
+#~ msgid "Shipping & Manual Invoice"
+#~ msgstr "Хүргэлтийн дараа нэхэмжлэлийг гараар үүсгэх"
+
+#, python-format
+#~ msgid "Picking Information !"
+#~ msgstr "Түүврийн мэдээлэл !"
+
+#~ msgid "sale.installer"
+#~ msgstr "sale.installer"
+
+#~ msgid "Picking List & Delivery Order"
+#~ msgstr "Түүврийн жагсаалт ба Хүргэлтийн захиалга"
+
+#~ msgid "Shipping Default Policy"
+#~ msgstr "Захиалга гүйцэтгэх үндсэн арга"
+
+#~ msgid "Invoicing"
+#~ msgstr "Нэхэмжлэл"
+
#, python-format
#~ msgid "You must first cancel all invoices attached to this sale order."
#~ msgstr "Та эхлээд уг захиалгатай холбоотой нэхэмжлэлүүдийг цуцлах хэрэгтэй."
+#~ msgid " Month "
+#~ msgstr " Сар "
+
#~ msgid "Invoice on Order After Delivery"
#~ msgstr "Хүргэлтийн дараа захиалга дээр үндэслэн нэхэмжлэх"
+#~ msgid "Complete Delivery"
+#~ msgstr "Бүрэн хүргэлт"
+
+#~ msgid " Month-1 "
+#~ msgstr " Сар-1 "
+
+#~ msgid ""
+#~ "The Shipping Policy is used to configure per order if you want to deliver as "
+#~ "soon as possible when one product is available or you wait that all products "
+#~ "are available.."
+#~ msgstr ""
+#~ "Захиалга гүйцэтгэх арга нь захиалсан тоо хэмжээг бүрэн бэлтгэж дуустал "
+#~ "хүргэлтийг хүлээлгэх, эсвэл хүлээлгүйгээр байгаа нөөцийг хүргэх зэргийг "
+#~ "тохируулна."
+
#~ msgid ""
#~ "This is the list of invoices that have been generated for this sale order. "
#~ "The same sale order may have been invoiced in several times (by line for "
@@ -2392,5 +2639,30 @@ msgstr "Хүргэлт дээр үндэслэн нэхэмжлэх"
#~ "Энэ бол захиалгад зориулан үүсгэсэн нэхэмжлэлийн жагсаалт юм. Нэг захиалгыг "
#~ "хэд хэдэн удаа нэхэмжилж болно (жишээ нь мөр бүрээр)."
+#~ msgid "Configuration Progress"
+#~ msgstr "Тохиргооны явц"
+
+#~ msgid "Ordered Date"
+#~ msgstr "Захиалсан огноо"
+
+#~ msgid "Direct Delivery"
+#~ msgstr "Шууд хүргэлт"
+
+#~ msgid "Invoicing journals"
+#~ msgstr "Нэхэмжлэлийн журналууд"
+
+#~ msgid "Shipped Qty"
+#~ msgstr "Хүргэгдсэн тоо"
+
+#, python-format
+#~ msgid "Not enough stock !"
+#~ msgstr "Агуулах хангалтгүй !"
+
#~ msgid "Sale Order Lines"
#~ msgstr "Захиалгын мөрүүд"
+
+#~ msgid "Adds commitment, requested and effective dates on Sales Orders."
+#~ msgstr "Adds commitment, requested and effective dates on Sales Orders."
+
+#~ msgid "Picking Default Policy"
+#~ msgstr "Түүврийн үндсэн арга"
diff --git a/addons/sale/i18n/nb.po b/addons/sale/i18n/nb.po
index e5fbb3ce43a..6eb5d3ce59f 100644
--- a/addons/sale/i18n/nb.po
+++ b/addons/sale/i18n/nb.po
@@ -7,15 +7,27 @@ msgid ""
msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-01-11 11:16+0000\n"
+"POT-Creation-Date: 2011-12-22 18:43+0000\n"
"PO-Revision-Date: 2011-03-31 12:10+0000\n"
"Last-Translator: Rolv Råen (adEgo) <Unknown>\n"
"Language-Team: Norwegian Bokmal <nb@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-05 05:16+0000\n"
-"X-Generator: Launchpad (build 14231)\n"
+"X-Launchpad-Export-Date: 2011-12-23 06:46+0000\n"
+"X-Generator: Launchpad (build 14560)\n"
+
+#. module: sale
+#: field:sale.config.picking_policy,timesheet:0
+msgid "Based on Timesheet"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid ""
+"Sale Order Lines that are confirmed, done or in exception state and haven't "
+"yet been invoiced"
+msgstr ""
#. module: sale
#: view:board.board:0
@@ -24,11 +36,6 @@ msgid "Sales by Salesman in last 90 days"
msgstr "Salg pr. selger de siste 90 dager"
#. module: sale
-#: help:sale.installer,delivery:0
-msgid "Allows you to compute delivery costs on your quotations."
-msgstr ""
-
-#. module: sale
#: help:sale.order,picking_policy:0
msgid ""
"If you don't have enough stock available to deliver all at once, do you "
@@ -38,6 +45,11 @@ msgstr ""
"akseptere delleveringer eller ikke?"
#. module: sale
+#: view:sale.order:0
+msgid "UoS"
+msgstr ""
+
+#. module: sale
#: help:sale.order,partner_shipping_id:0
msgid "Shipping address for current sales order."
msgstr ""
@@ -61,22 +73,12 @@ msgid "Cancel Order"
msgstr "Kanseller ordre"
#. module: sale
-#: view:sale.config.picking_policy:0
-msgid "Configure Sales Order Logistics"
-msgstr "Konfigurer salgsordre logistikk"
-
-#. module: sale
-#: code:addons/sale/sale.py:603
+#: code:addons/sale/sale.py:638
#, python-format
msgid "The quotation '%s' has been converted to a sales order."
msgstr "Tilbudet '%s' har blitt konvertert til en salgsordre."
#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Payment Before Delivery"
-msgstr "Betaling før levering"
-
-#. module: sale
#: code:addons/sale/wizard/sale_make_invoice.py:42
#, python-format
msgid "Warning !"
@@ -93,12 +95,6 @@ msgid "Drives procurement orders for every sales order line."
msgstr ""
#. module: sale
-#: selection:sale.config.picking_policy,picking_policy:0
-msgid "All at Once"
-msgstr "Alt på en gang"
-
-#. module: sale
-#: field:sale.order,project_id:0
#: view:sale.report:0
#: field:sale.report,analytic_account_id:0
#: field:sale.shop,project_id:0
@@ -114,6 +110,15 @@ msgid ""
msgstr ""
#. module: sale
+#: code:addons/sale/sale.py:295
+#, python-format
+msgid ""
+"In order to delete a confirmed sale order, you must cancel it before ! To "
+"cancel a sale order, you must first cancel related picking or delivery "
+"orders."
+msgstr ""
+
+#. module: sale
#: model:process.node,name:sale.process_node_saleprocurement0
msgid "Procurement Order"
msgstr "Innkjøpsordre"
@@ -125,6 +130,11 @@ msgid "Partner"
msgstr ""
#. module: sale
+#: selection:sale.order,order_policy:0
+msgid "Invoice based on deliveries"
+msgstr ""
+
+#. module: sale
#: view:sale.order:0
msgid "Order Line"
msgstr "Ordrelinje"
@@ -162,9 +172,14 @@ msgid "Default Payment Term"
msgstr "Default betalingsbetingelse"
#. module: sale
-#: model:ir.actions.act_window,name:sale.action_config_picking_policy
-msgid "Configure Picking Policy for Sales Order"
-msgstr "Konfigurer plukkerutine for salgsordre"
+#: field:sale.config.picking_policy,deli_orders:0
+msgid "Based on Delivery Orders"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.picking_policy,time_unit:0
+msgid "Main Working Time Unit"
+msgstr ""
#. module: sale
#: view:sale.order:0
@@ -180,9 +195,10 @@ msgid "Disc.(%)"
msgstr "Rabatt(%)"
#. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_forceassignation0
-msgid "Force Assignation"
-msgstr "Tvangsfordeling"
+#: view:sale.report:0
+#: field:sale.report,price_total:0
+msgid "Total Price"
+msgstr "Totalpris"
#. module: sale
#: help:sale.make.invoice,grouped:0
@@ -190,6 +206,11 @@ msgid "Check the box to group the invoices for the same customers"
msgstr ""
#. module: sale
+#: view:sale.order:0
+msgid "My Sale Orders"
+msgstr ""
+
+#. module: sale
#: selection:sale.order,invoice_quantity:0
msgid "Ordered Quantities"
msgstr "Bestilt kvantum"
@@ -228,13 +249,24 @@ msgid ""
msgstr ""
#. module: sale
+#: field:sale.config.picking_policy,task_work:0
+msgid "Based on Tasks' Work"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
+msgid "Quotations and Sales"
+msgstr ""
+
+#. module: sale
#: model:ir.model,name:sale.model_sale_make_invoice
msgid "Sales Make Invoice"
msgstr "Salg oppretter faktura"
#. module: sale
-#: view:sale.order:0
-msgid "Recreate Packing"
+#: code:addons/sale/sale.py:330
+#, python-format
+msgid "Pricelist Warning!"
msgstr ""
#. module: sale
@@ -243,10 +275,10 @@ msgid "Discount (%)"
msgstr "Rabatt (%)"
#. module: sale
-#: help:res.company,security_lead:0
-msgid ""
-"This is the days added to what you promise to customers for security purpose"
-msgstr ""
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_quotation_for_sale
+msgid "My Quotations"
+msgstr "Mine tilbud"
#. module: sale
#: view:board.board:0
@@ -271,7 +303,22 @@ msgid "Shop Name"
msgstr "Butikknavn"
#. module: sale
-#: code:addons/sale/sale.py:1014
+#: help:sale.order,order_policy:0
+msgid ""
+"The Invoice Policy is used to synchronise invoice and delivery operations.\n"
+" - The 'Pay before delivery' choice will first generate the invoice and "
+"then generate the picking order after the payment of this invoice.\n"
+" - The 'Deliver & Invoice on demand' will create the picking order directly "
+"and wait for the user to manually click on the 'Invoice' button to generate "
+"the draft invoice based on the sale order or the sale order lines.\n"
+" - The 'Invoice on order after delivery' choice will generate the draft "
+"invoice based on sales order after all picking lists have been finished.\n"
+" - The 'Invoice based on deliveries' choice is used to create an invoice "
+"during the picking process."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:1158
#, python-format
msgid "No Customer Defined !"
msgstr "Ingen kunde definert!"
@@ -282,9 +329,12 @@ msgid "Sales in Exception"
msgstr "Salg med unntak"
#. module: sale
-#: view:sale.order:0
-msgid "Set to Draft"
-msgstr "Sett til forslag"
+#: code:addons/sale/sale.py:1145
+#: code:addons/sale/sale.py:1264
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:70
+#, python-format
+msgid "Configuration Error !"
+msgstr ""
#. module: sale
#: view:sale.order:0
@@ -292,33 +342,7 @@ msgid "Conditions"
msgstr "Vilkår"
#. module: sale
-#: help:sale.order,order_policy:0
-msgid ""
-"The Shipping Policy is used to synchronise invoice and delivery operations.\n"
-" - The 'Pay Before delivery' choice will first generate the invoice and "
-"then generate the picking order after the payment of this invoice.\n"
-" - The 'Shipping & Manual Invoice' will create the picking order directly "
-"and wait for the user to manually click on the 'Invoice' button to generate "
-"the draft invoice.\n"
-" - The 'Invoice On Order After Delivery' choice will generate the draft "
-"invoice based on sales order after all picking lists have been finished.\n"
-" - The 'Invoice From The Picking' choice is used to create an invoice "
-"during the picking process."
-msgstr ""
-"Forsendelsesprinsippene blir brukt for å synkronisere fakturering og "
-"levering.\n"
-" - Valget \"Betal før levering\" vil først danne faktura og så lage "
-"pakkseddel etter betaling av fakturaen.\n"
-" - Vaget \"Forsendelse og manuell faktura\" vil lage pakkeordre med en gang "
-"og avvente at \"Faktura\"-valget blir tastet slik at fakturautkast blir "
-"laget.\n"
-" - Valget \"Faktura av ordre etter levering\" vil lage fakturautkast basert "
-"på salgsordre etter at pakkseddel har blitt dannet.\n"
-" - Valget \"Faktura fra pakking\" blir benyttet til å lage en faktura under "
-"pakkearbeidet."
-
-#. module: sale
-#: code:addons/sale/sale.py:939
+#: code:addons/sale/sale.py:1034
#, python-format
msgid ""
"There is no income category account defined in default Properties for "
@@ -328,9 +352,9 @@ msgstr ""
"produkt eller skattemessig behandling er ikke definert!"
#. module: sale
-#: view:sale.installer:0
-msgid "Configure"
-msgstr "Konfigurer"
+#: selection:sale.report,month:0
+msgid "August"
+msgstr "August"
#. module: sale
#: constraint:stock.move:0
@@ -338,7 +362,7 @@ msgid "You try to assign a lot which is not from the same product"
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:620
+#: code:addons/sale/sale.py:655
#, python-format
msgid "invalid mode for test_state"
msgstr "Ugyldig form for test_state"
@@ -349,7 +373,7 @@ msgid "June"
msgstr "Juni"
#. module: sale
-#: code:addons/sale/sale.py:584
+#: code:addons/sale/sale.py:617
#, python-format
msgid "Could not cancel this sales order !"
msgstr "Kunne ikke kansellere denne salgsordren!"
@@ -370,8 +394,12 @@ msgid "October"
msgstr "Oktober"
#. module: sale
+#: sql_constraint:stock.picking:0
+msgid "Reference must be unique per Company!"
+msgstr ""
+
+#. module: sale
#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_quotation_for_sale
#: view:sale.order:0
#: view:sale.report:0
msgid "Quotations"
@@ -383,11 +411,6 @@ msgid "Pricelist for current sales order."
msgstr ""
#. module: sale
-#: selection:sale.config.picking_policy,step:0
-msgid "Delivery Order Only"
-msgstr "Kun leveringsordre"
-
-#. module: sale
#: report:sale.order:0
msgid "TVA :"
msgstr "MVA:"
@@ -413,6 +436,7 @@ msgstr "Skattemessig posisjon"
#. module: sale
#: view:sale.order:0
#: view:sale.order.line:0
+#: field:sale.report,product_uom:0
msgid "UoM"
msgstr "Måleenhet"
@@ -435,13 +459,19 @@ msgid ""
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:971
+#: code:addons/sale/sale.py:1061
+#, python-format
+msgid "You cannot cancel a sale order line that has already been invoiced!"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:1066
#, python-format
msgid "You must first cancel stock moves attached to this sales order line."
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:1042
+#: code:addons/sale/sale.py:1134
#, python-format
msgid "(n/a)"
msgstr ""
@@ -475,13 +505,35 @@ msgid "Notes"
msgstr "Notater"
#. module: sale
+#: sql_constraint:res.company:0
+msgid "The company name must be unique !"
+msgstr ""
+
+#. module: sale
#: help:sale.order,partner_invoice_id:0
msgid "Invoice address for current sales order."
msgstr ""
#. module: sale
-#: view:sale.installer:0
-msgid "Enhance your core Sales Application with additional functionalities."
+#: view:sale.report:0
+msgid "Month-1"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered month of the sales order"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:504
+#, python-format
+msgid ""
+"You cannot group sales having different currencies for the same partner."
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,picking_policy:0
+msgid "Deliver each product when available"
msgstr ""
#. module: sale
@@ -501,21 +553,43 @@ msgid "Confirmation Date"
msgstr "Bekreftet dato"
#. module: sale
+#: field:sale.order,incoterm:0
+msgid "Incoterm"
+msgstr "Incoterm"
+
+#. module: sale
#: field:sale.order.line,address_allotment_id:0
msgid "Allotment Partner"
msgstr "Delpartner"
#. module: sale
-#: sql_constraint:sale.order:0
-msgid "Order Reference must be unique !"
-msgstr "Ordrereferanse må være unik !"
-
-#. module: sale
#: selection:sale.report,month:0
msgid "March"
msgstr ""
#. module: sale
+#: constraint:stock.move:0
+msgid "You can not move products from or to a location of the type view."
+msgstr ""
+
+#. module: sale
+#: field:sale.config.picking_policy,sale_orders:0
+msgid "Based on Sales Orders"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,state:0
+msgid ""
+"Givwizard = self.browse(cr, uid, ids)[0]es the state of the quotation or "
+"sales order. \n"
+"The exception state is automatically set when a cancel operation occurs in "
+"the invoice validation (Invoice Exception) or in the picking list process "
+"(Shipping Exception). \n"
+"The 'Waiting Schedule' state is set when the invoice is confirmed but "
+"waiting for the scheduler to run on the order date."
+msgstr ""
+
+#. module: sale
#: help:sale.order,amount_total:0
msgid "The total amount."
msgstr "Totalbeløp."
@@ -531,6 +605,11 @@ msgid "Invoice address :"
msgstr "Fakturaadresse:"
#. module: sale
+#: field:sale.order.line,sequence:0
+msgid "Line Sequence"
+msgstr ""
+
+#. module: sale
#: model:process.transition,note:sale.process_transition_saleorderprocurement0
msgid ""
"For every sales order line, a procurement order is created to supply the "
@@ -577,11 +656,6 @@ msgid "Sales Order Line"
msgstr "Salgsordrelinje"
#. module: sale
-#: view:sale.config.picking_policy:0
-msgid "Setup your sales workflow and default values."
-msgstr ""
-
-#. module: sale
#: field:sale.shop,warehouse_id:0
msgid "Warehouse"
msgstr "Lager"
@@ -618,6 +692,11 @@ msgid "Creation Date"
msgstr "Opprettet dato"
#. module: sale
+#: model:ir.ui.menu,name:sale.menu_sales_configuration_misc
+msgid "Miscellaneous"
+msgstr ""
+
+#. module: sale
#: model:ir.actions.act_window,name:sale.action_order_line_tree3
msgid "Uninvoiced and Delivered Lines"
msgstr "Ufakturerte og leverte linjer"
@@ -633,14 +712,19 @@ msgid "My Sales"
msgstr "Mine salg"
#. module: sale
-#: code:addons/sale/sale.py:290
-#: code:addons/sale/sale.py:966
-#: code:addons/sale/sale.py:1165
+#: code:addons/sale/sale.py:295
+#: code:addons/sale/sale.py:1061
+#: code:addons/sale/sale.py:1290
#, python-format
msgid "Invalid action !"
msgstr "Ugyldig handling!"
#. module: sale
+#: view:sale.order:0
+msgid "Extra Info"
+msgstr "Ekstrainformasjon"
+
+#. module: sale
#: field:sale.order,pricelist_id:0
#: field:sale.report,pricelist_id:0
#: field:sale.shop,pricelist_id:0
@@ -654,13 +738,21 @@ msgid "# of Qty"
msgstr ""
#. module: sale
+#: code:addons/sale/sale.py:1314
+#, python-format
+msgid "Hour"
+msgstr ""
+
+#. module: sale
#: view:sale.order:0
msgid "Order Date"
msgstr "Ordredato"
#. module: sale
#: view:sale.order.line:0
+#: view:sale.report:0
#: field:sale.report,shipped:0
+#: field:sale.report,shipped_qty_1:0
msgid "Shipped"
msgstr ""
@@ -670,9 +762,9 @@ msgid "All Quotations"
msgstr "Alle tilbud"
#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Invoice On Order After Delivery"
-msgstr "Faktura ved ordre etter levering"
+#: view:sale.config.picking_policy:0
+msgid "Options"
+msgstr ""
#. module: sale
#: selection:sale.report,month:0
@@ -680,6 +772,20 @@ msgid "September"
msgstr "September"
#. module: sale
+#: code:addons/sale/sale.py:632
+#, python-format
+msgid "You cannot confirm a sale order which has no line."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:1246
+#, python-format
+msgid ""
+"You have to select a pricelist or a customer in the sales form !\n"
+"Please set one before choosing a product."
+msgstr ""
+
+#. module: sale
#: view:sale.report:0
#: field:sale.report,categ_id:0
msgid "Category of Product"
@@ -696,11 +802,6 @@ msgid "Stock Moves"
msgstr "Lagerbevegelser"
#. module: sale
-#: view:sale.report:0
-msgid " Year "
-msgstr " År "
-
-#. module: sale
#: field:sale.order,state:0
#: field:sale.report,state:0
msgid "Order State"
@@ -718,7 +819,7 @@ msgid "Sales By Month"
msgstr "Salg pr. måned"
#. module: sale
-#: code:addons/sale/sale.py:970
+#: code:addons/sale/sale.py:1065
#, python-format
msgid "Could not cancel sales order line!"
msgstr "Kunne ikke kansellere salgsordrelinje!"
@@ -751,58 +852,19 @@ msgid ""
msgstr ""
#. module: sale
+#: field:sale.order,date_order:0
+msgid "Date"
+msgstr ""
+
+#. module: sale
#: view:sale.report:0
msgid "Extended Filters..."
msgstr "Utvidede filter..."
#. module: sale
-#: model:ir.module.module,description:sale.module_meta_information
-msgid ""
-"\n"
-" The base module to manage quotations and sales orders.\n"
-"\n"
-" * Workflow with validation steps:\n"
-" - Quotation -> Sales order -> Invoice\n"
-" * Invoicing methods:\n"
-" - Invoice on order (before or after shipping)\n"
-" - Invoice on delivery\n"
-" - Invoice on timesheets\n"
-" - Advance invoice\n"
-" * Partners preferences (shipping, invoicing, incoterm, ...)\n"
-" * Products stocks and prices\n"
-" * Delivery methods:\n"
-" - all at once, multi-parcel\n"
-" - delivery costs\n"
-" * Dashboard for salesman that includes:\n"
-" * Your open quotations\n"
-" * Top 10 sales of the month\n"
-" * Cases statistics\n"
-" * Graph of sales by product\n"
-" * Graph of cases of the month\n"
-" "
-msgstr ""
-"\n"
-" Basismodulen for å håndtere tilbud og salsgordre. \n"
-"\n"
-" * Arbeidsflyt med with valideringskontroll:\n"
-" - Tilbudd -> Salgsordre -> Faktura\n"
-" * Faktureringsmetoder:\n"
-" - Faktura ved ordre (før eller etter forsendelse)\n"
-" - Faktura ved levering\n"
-" - Faktura ved timelister\n"
-" - Forskuddsfaktura\n"
-" * Klients preferanser (forsendelse, fakturering, incoterms, ...)\n"
-" * Produksjonslagre og priser\n"
-" * Leveringsmåter:\n"
-" - alt på en gang, delleveringl\n"
-" - leveringskostnader\n"
-" "
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_shop
-#: view:sale.shop:0
-msgid "Sales Shop"
-msgstr ""
+#: selection:sale.order.line,state:0
+msgid "Exception"
+msgstr "Unntak"
#. module: sale
#: model:ir.model,name:sale.model_res_company
@@ -810,9 +872,10 @@ msgid "Companies"
msgstr "Firmaer"
#. module: sale
-#: selection:sale.report,month:0
-msgid "November"
-msgstr "November"
+#: code:addons/sale/sale.py:1259
+#, python-format
+msgid "No valid pricelist line found ! :"
+msgstr ""
#. module: sale
#: view:sale.order:0
@@ -820,8 +883,8 @@ msgid "History"
msgstr "Forløp"
#. module: sale
-#: field:sale.config.picking_policy,picking_policy:0
-msgid "Picking Default Policy"
+#: selection:sale.order,order_policy:0
+msgid "Invoice on order after delivery"
msgstr ""
#. module: sale
@@ -846,14 +909,12 @@ msgid ""
msgstr "Navn og adresse på kontakten som ba om ordre eller tilbud"
#. module: sale
-#: code:addons/sale/sale.py:966
-#, python-format
-msgid "You cannot cancel a sales order line that has already been invoiced !"
+#: help:res.company,security_lead:0
+msgid ""
+"This is the days added to what you promise to customers for security purpose"
msgstr ""
-"Du kan ikke kansellere en salsgordrelinje som allerede har blitt fakturert!"
#. module: sale
-#: view:sale.order:0
#: view:sale.order.line:0
msgid "Qty"
msgstr "Kvt"
@@ -864,6 +925,11 @@ msgid "References"
msgstr "Referanse"
#. module: sale
+#: view:sale.order.line:0
+msgid "My Sales Order Lines"
+msgstr ""
+
+#. module: sale
#: model:process.transition.action,name:sale.process_transition_action_cancel0
#: model:process.transition.action,name:sale.process_transition_action_cancel1
#: model:process.transition.action,name:sale.process_transition_action_cancel2
@@ -875,14 +941,9 @@ msgid "Cancel"
msgstr "Kanseller"
#. module: sale
-#: field:sale.installer,sale_order_dates:0
-msgid "Sales Order Dates"
-msgstr "Salgsordredatoer"
-
-#. module: sale
-#: selection:sale.order.line,state:0
-msgid "Exception"
-msgstr "Unntak"
+#: sql_constraint:sale.order:0
+msgid "Order Reference must be unique per Company!"
+msgstr ""
#. module: sale
#: model:process.transition,name:sale.process_transition_invoice0
@@ -894,19 +955,19 @@ msgid "Create Invoice"
msgstr "Lag faktura"
#. module: sale
-#: field:sale.installer,sale_margin:0
-msgid "Margins in Sales Orders"
+#: view:sale.order:0
+msgid "Total Tax Excluded"
msgstr ""
#. module: sale
-#: view:sale.order:0
-msgid "Total Tax Excluded"
+#: view:sale.order.line:0
+msgid "Order reference"
msgstr ""
#. module: sale
-#: view:sale.order:0
-msgid "Compute"
-msgstr "Beregn"
+#: view:sale.open.invoice:0
+msgid "You invoice has been successfully created!"
+msgstr "Din faktura er blitt opprettet!"
#. module: sale
#: view:sale.report:0
@@ -925,23 +986,20 @@ msgid "Open Invoice"
msgstr ""
#. module: sale
-#: report:sale.order:0
-#: view:sale.order.line:0
-msgid "Price"
-msgstr "Pris"
+#: model:ir.actions.server,name:sale.ir_actions_server_edi_sale
+msgid "Auto-email confirmed sale orders"
+msgstr ""
#. module: sale
-#: model:ir.actions.act_window,name:sale.action_sale_installer
-#: view:sale.config.picking_policy:0
-#: view:sale.installer:0
-msgid "Sales Application Configuration"
-msgstr "Salgskonfigurering"
+#: code:addons/sale/sale.py:413
+#, python-format
+msgid "There is no sales journal defined for this company: \"%s\" (id:%d)"
+msgstr ""
#. module: sale
-#: view:sale.report:0
-#: field:sale.report,price_total:0
-msgid "Total Price"
-msgstr "Totalpris"
+#: model:process.transition.action,name:sale.process_transition_action_forceassignation0
+msgid "Force Assignation"
+msgstr "Tvangsfordeling"
#. module: sale
#: selection:sale.order.line,type:0
@@ -954,6 +1012,11 @@ msgid "Based on the shipped or on the ordered quantities."
msgstr ""
#. module: sale
+#: selection:sale.order,picking_policy:0
+msgid "Deliver all products at once"
+msgstr ""
+
+#. module: sale
#: field:sale.order,picking_ids:0
msgid "Related Picking"
msgstr ""
@@ -985,9 +1048,15 @@ msgid "Create Delivery Order"
msgstr "Opprett leveringsordre"
#. module: sale
-#: field:sale.installer,delivery:0
-msgid "Delivery Costs"
-msgstr "Leveringskostnader"
+#: code:addons/sale/sale.py:1290
+#, python-format
+msgid "Cannot delete a sales order line which is in state '%s'!"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Qty(UoS)"
+msgstr ""
#. module: sale
#: view:sale.order:0
@@ -1001,13 +1070,13 @@ msgstr "Opprett plukkliste"
#. module: sale
#: view:sale.report:0
-msgid "Sales by Product Category"
+msgid "Ordered date of the sales order"
msgstr ""
#. module: sale
-#: selection:sale.order,picking_policy:0
-msgid "Partial Delivery"
-msgstr "Dellevering"
+#: view:sale.report:0
+msgid "Sales by Product Category"
+msgstr ""
#. module: sale
#: model:process.transition,name:sale.process_transition_confirmquotation0
@@ -1015,9 +1084,10 @@ msgid "Confirm Quotation"
msgstr "Bekreft tilbudet"
#. module: sale
-#: help:sale.order,origin:0
-msgid "Reference of the document that generated this sales order request."
-msgstr ""
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:63
+#, python-format
+msgid "Error"
+msgstr "Feil"
#. module: sale
#: view:sale.order:0
@@ -1049,20 +1119,14 @@ msgid "Procurement Method"
msgstr "Innkjøpsmetode"
#. module: sale
-#: view:sale.config.picking_policy:0
-#: view:sale.installer:0
-msgid "title"
-msgstr "tittel"
-
-#. module: sale
#: model:process.node,name:sale.process_node_packinglist0
msgid "Pick List"
msgstr "Plukkliste"
#. module: sale
#: view:sale.order:0
-msgid "Order date"
-msgstr "Ordredato"
+msgid "Set to Draft"
+msgstr "Sett til forslag"
#. module: sale
#: model:process.node,note:sale.process_node_packinglist0
@@ -1070,6 +1134,85 @@ msgid "Document of the move to the output or to the customer."
msgstr ""
#. module: sale
+#: model:email.template,body_text:sale.email_template_edi_sale
+msgid ""
+"\n"
+"Hello${object.partner_order_id.name and ' ' or "
+"''}${object.partner_order_id.name or ''},\n"
+"\n"
+"Here is your order confirmation for ${object.partner_id.name}:\n"
+" | Order number: *${object.name}*\n"
+" | Order total: *${object.amount_total} "
+"${object.pricelist_id.currency_id.name}*\n"
+" | Order date: ${object.date_order}\n"
+" % if object.origin:\n"
+" | Order reference: ${object.origin}\n"
+" % endif\n"
+" % if object.client_order_ref:\n"
+" | Your reference: ${object.client_order_ref}<br />\n"
+" % endif\n"
+" | Your contact: ${object.user_id.name} ${object.user_id.user_email "
+"and '<%s>'%(object.user_id.user_email) or ''}\n"
+"\n"
+"You can view the order confirmation, download it and even pay online using "
+"the following link:\n"
+" ${ctx.get('edi_web_url_view') or 'n/a'}\n"
+"\n"
+"% if object.order_policy in ('prepaid','manual') and "
+"object.company_id.paypal_account:\n"
+"<% \n"
+"comp_name = quote(object.company_id.name)\n"
+"order_name = quote(object.name)\n"
+"paypal_account = quote(object.company_id.paypal_account)\n"
+"order_amount = quote(str(object.amount_total))\n"
+"cur_name = quote(object.pricelist_id.currency_id.name)\n"
+"paypal_url = \"https://www.paypal.com/cgi-"
+"bin/webscr?cmd=_xclick&business=%s&item_name=%s%%20Order%%20%s&invoice=%s&amo"
+"unt=%s\" \\\n"
+" "
+"\"&currency_code=%s&button_subtype=services&no_note=1&bn=OpenERP_Order_PayNow"
+"_%s\" % \\\n"
+" "
+"(paypal_account,comp_name,order_name,order_name,order_amount,cur_name,cur_nam"
+"e)\n"
+"%>\n"
+"It is also possible to directly pay with Paypal:\n"
+" ${paypal_url}\n"
+"% endif\n"
+"\n"
+"If you have any question, do not hesitate to contact us.\n"
+"\n"
+"\n"
+"Thank you for choosing ${object.company_id.name}!\n"
+"\n"
+"\n"
+"--\n"
+"${object.user_id.name} ${object.user_id.user_email and "
+"'<%s>'%(object.user_id.user_email) or ''}\n"
+"${object.company_id.name}\n"
+"% if object.company_id.street:\n"
+"${object.company_id.street or ''}\n"
+"% endif\n"
+"% if object.company_id.street2:\n"
+"${object.company_id.street2}\n"
+"% endif\n"
+"% if object.company_id.city or object.company_id.zip:\n"
+"${object.company_id.zip or ''} ${object.company_id.city or ''}\n"
+"% endif\n"
+"% if object.company_id.country_id:\n"
+"${object.company_id.state_id and ('%s, ' % object.company_id.state_id.name) "
+"or ''} ${object.company_id.country_id.name or ''}\n"
+"% endif\n"
+"% if object.company_id.phone:\n"
+"Phone: ${object.company_id.phone}\n"
+"% endif\n"
+"% if object.company_id.website:\n"
+"${object.company_id.website or ''}\n"
+"% endif\n"
+" "
+msgstr ""
+
+#. module: sale
#: model:process.transition.action,name:sale.process_transition_action_validate0
msgid "Validate"
msgstr "Valider"
@@ -1092,9 +1235,9 @@ msgid "Taxes"
msgstr "Avgifter"
#. module: sale
-#: field:sale.order,order_policy:0
-msgid "Shipping Policy"
-msgstr "Forsendelsesprinsipp"
+#: view:sale.order:0
+msgid "Sales Order ready to be invoiced"
+msgstr ""
#. module: sale
#: help:sale.order,create_date:0
@@ -1113,9 +1256,9 @@ msgid "Create Invoices"
msgstr "Lag faktura"
#. module: sale
-#: view:sale.order:0
-msgid "Extra Info"
-msgstr "Ekstrainformasjon"
+#: view:sale.report:0
+msgid "Sales order created in current month"
+msgstr ""
#. module: sale
#: report:sale.order:0
@@ -1123,11 +1266,24 @@ msgid "Fax :"
msgstr "Fax:"
#. module: sale
+#: help:sale.order.line,type:0
+msgid ""
+"If 'on order', it triggers a procurement when the sale order is confirmed to "
+"create a task, purchase order or manufacturing order linked to this sale "
+"order line."
+msgstr ""
+
+#. module: sale
#: field:sale.advance.payment.inv,amount:0
msgid "Advance Amount"
msgstr ""
#. module: sale
+#: field:sale.config.picking_policy,charge_delivery:0
+msgid "Do you charge the delivery?"
+msgstr ""
+
+#. module: sale
#: selection:sale.order,invoice_quantity:0
msgid "Shipped Quantities"
msgstr "Levert kvantum"
@@ -1138,25 +1294,45 @@ msgid "Invoice Based on Sales Orders"
msgstr "Faktura basert på salgsordre"
#. module: sale
+#: code:addons/sale/sale.py:331
+#, python-format
+msgid ""
+"If you change the pricelist of this order (and eventually the currency), "
+"prices of existing order lines will not be updated."
+msgstr ""
+
+#. module: sale
#: model:ir.model,name:sale.model_stock_picking
msgid "Picking List"
msgstr "Plukkliste"
#. module: sale
-#: code:addons/sale/sale.py:387
-#: code:addons/sale/sale.py:920
-#: code:addons/sale/sale.py:938
+#: code:addons/sale/sale.py:412
+#: code:addons/sale/sale.py:503
+#: code:addons/sale/sale.py:632
+#: code:addons/sale/sale.py:1015
+#: code:addons/sale/sale.py:1033
#, python-format
msgid "Error !"
msgstr "Feil!"
#. module: sale
-#: code:addons/sale/sale.py:570
+#: code:addons/sale/sale.py:603
#, python-format
msgid "Could not cancel sales order !"
msgstr "Kunne ikke kansellere salgsordre!"
#. module: sale
+#: view:sale.order:0
+msgid "Qty(UoM)"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered Year of the sales order"
+msgstr ""
+
+#. module: sale
#: selection:sale.report,month:0
msgid "July"
msgstr "Juli"
@@ -1173,36 +1349,26 @@ msgid "Shipping Exception"
msgstr "Forendelsesunntak"
#. module: sale
-#: field:sale.make.invoice,grouped:0
-msgid "Group the invoices"
-msgstr "Gruppering av fakturaer"
-
-#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Shipping & Manual Invoice"
-msgstr "Forsendelse og manuell faktura"
-
-#. module: sale
-#: code:addons/sale/sale.py:1051
+#: code:addons/sale/sale.py:1143
#, python-format
-msgid "Picking Information !"
-msgstr "Plukkinformasjon !"
+msgid "Picking Information ! : "
+msgstr ""
#. module: sale
-#: view:sale.report:0
-#: field:sale.report,month:0
-msgid "Month"
-msgstr "Måned"
+#: field:sale.make.invoice,grouped:0
+msgid "Group the invoices"
+msgstr "Gruppering av fakturaer"
#. module: sale
-#: model:ir.module.module,shortdesc:sale.module_meta_information
-msgid "Sales Management"
-msgstr "Salgsledelse"
+#: field:sale.order,order_policy:0
+msgid "Invoice Policy"
+msgstr ""
#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Invoice From The Picking"
-msgstr "Faktura fra plukking"
+#: model:ir.actions.act_window,name:sale.action_config_picking_policy
+#: view:sale.config.picking_policy:0
+msgid "Setup your Invoicing Method"
+msgstr ""
#. module: sale
#: model:process.node,note:sale.process_node_invoice0
@@ -1211,32 +1377,31 @@ msgstr ""
#. module: sale
#: view:sale.report:0
-#: field:sale.report,uom_name:0
msgid "Reference UoM"
msgstr ""
#. module: sale
+#: view:sale.config.picking_policy:0
+msgid ""
+"This tool will help you to install the right module and configure the system "
+"according to the method you use to invoice your customers."
+msgstr ""
+
+#. module: sale
#: model:ir.model,name:sale.model_sale_order_line_make_invoice
msgid "Sale OrderLine Make_invoice"
msgstr ""
#. module: sale
-#: help:sale.config.picking_policy,step:0
-msgid ""
-"By default, OpenERP is able to manage complex routing and paths of products "
-"in your warehouse and partner locations. This will configure the most common "
-"and simple methods to deliver products to the customer in one or two "
-"operations by the worker."
-msgstr ""
-"Som standard, er OpenERP i stand til å håndtere kompleks ruting og baner av "
-"produkter på ditt lager og hos klientens lokasjoner. Dette er med på å lage "
-"den mest benyttede og enkleste måte å levere produkter til kunden på med et "
-"fåtall av operasjoner."
+#: selection:sale.order,state:0
+#: selection:sale.report,state:0
+msgid "Invoice Exception"
+msgstr "Fakturaunntak"
#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_tree
-msgid "Old Quotations"
-msgstr "Gamle tilbud"
+#: model:process.node,note:sale.process_node_saleorder0
+msgid "Drives procurement and invoicing"
+msgstr ""
#. module: sale
#: field:sale.order,invoiced:0
@@ -1251,6 +1416,22 @@ msgid "Sales Analysis"
msgstr ""
#. module: sale
+#: code:addons/sale/sale.py:1138
+#, python-format
+msgid ""
+"You selected a quantity of %d Units.\n"
+"But it's not compatible with the selected packaging.\n"
+"Here is a proposition of quantities according to the packaging:\n"
+"EAN: %s Quantity: %s Type of ul: %s"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Recreate Packing"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
#: field:sale.order.line,property_ids:0
msgid "Properties"
msgstr "Egenskaper"
@@ -1277,7 +1458,17 @@ msgid ""
msgstr ""
#. module: sale
-#: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
+#: view:sale.order.line:0
+msgid "Confirmed sale order lines, not yet delivered"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:473
+#, python-format
+msgid "Customer Invoices"
+msgstr ""
+
+#. module: sale
#: model:process.process,name:sale.process_process_salesprocess0
#: view:sale.order:0
#: view:sale.report:0
@@ -1299,18 +1490,13 @@ msgid "Done"
msgstr "Fullført"
#. module: sale
-#: model:ir.model,name:sale.model_sale_installer
-msgid "sale.installer"
-msgstr "sale.installer"
-
-#. module: sale
#: model:process.node,name:sale.process_node_invoice0
#: model:process.node,name:sale.process_node_invoiceafterdelivery0
msgid "Invoice"
msgstr "Faktura"
#. module: sale
-#: code:addons/sale/sale.py:1014
+#: code:addons/sale/sale.py:1158
#, python-format
msgid ""
"You have to select a customer in the sales form !\n"
@@ -1318,11 +1504,6 @@ msgid ""
msgstr ""
#. module: sale
-#: selection:sale.config.picking_policy,step:0
-msgid "Picking List & Delivery Order"
-msgstr ""
-
-#. module: sale
#: field:sale.order,origin:0
msgid "Source Document"
msgstr "Kildedokument"
@@ -1348,7 +1529,7 @@ msgid "The amount without tax."
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:571
+#: code:addons/sale/sale.py:604
#, python-format
msgid "You must first cancel all picking attached to this sales order."
msgstr ""
@@ -1359,9 +1540,15 @@ msgid "Sales Advance Payment Invoice"
msgstr ""
#. module: sale
-#: field:sale.order,incoterm:0
-msgid "Incoterm"
-msgstr "Incoterm"
+#: view:sale.report:0
+#: field:sale.report,month:0
+msgid "Month"
+msgstr "Måned"
+
+#. module: sale
+#: model:email.template,subject:sale.email_template_edi_sale
+msgid "${object.company_id.name} Order (Ref ${object.name or 'n/a' })"
+msgstr ""
#. module: sale
#: view:sale.order.line:0
@@ -1372,11 +1559,6 @@ msgid "Product"
msgstr "Produkt"
#. module: sale
-#: model:ir.ui.menu,name:sale.menu_invoiced
-msgid "Invoicing"
-msgstr "Fakturering"
-
-#. module: sale
#: model:process.transition.action,name:sale.process_transition_action_cancelassignation0
msgid "Cancel Assignation"
msgstr "Kanseller avtale"
@@ -1387,21 +1569,11 @@ msgid "sale.config.picking_policy"
msgstr "sale.config.picking_policy"
#. module: sale
-#: help:sale.order,state:0
-msgid ""
-"Gives the state of the quotation or sales order. \n"
-"The exception state is automatically set when a cancel operation occurs in "
-"the invoice validation (Invoice Exception) or in the picking list process "
-"(Shipping Exception). \n"
-"The 'Waiting Schedule' state is set when the invoice is confirmed but "
-"waiting for the scheduler to run on the date 'Ordered Date'."
+#: view:account.invoice.report:0
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_turnover_by_month
+msgid "Monthly Turnover"
msgstr ""
-"Gir status på tilbudet eller salgsordren.\n"
-"Unntaksstatus blir automatisk satt når en kanseleringssituasjon oppstår ved "
-"fakturakontrollen (fakturaunntak) eller i pakkseddel prosessen "
-"(forsendelsesunntak). \n"
-"\"Ventestatus\" blir satt når fakturaen er bekreftet men avventer kjøring av "
-"fordelingsjobben på dato for \"Dato bestilt\"."
#. module: sale
#: field:sale.order,invoice_quantity:0
@@ -1419,7 +1591,6 @@ msgid "Product UoS"
msgstr "Produkt salgsenhet"
#. module: sale
-#: selection:sale.order,state:0
#: selection:sale.report,state:0
msgid "Manual In Progress"
msgstr "Manuell i arbeid"
@@ -1440,7 +1611,8 @@ msgid "Order"
msgstr "Ordre"
#. module: sale
-#: code:addons/sale/sale.py:921
+#: code:addons/sale/sale.py:1016
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:71
#, python-format
msgid "There is no income account defined for this product: \"%s\" (id:%d)"
msgstr ""
@@ -1461,7 +1633,7 @@ msgid ""
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:1116
+#: code:addons/sale/sale.py:1238
#, python-format
msgid ""
"You plan to sell %.2f %s but you only have %.2f %s available !\n"
@@ -1490,10 +1662,10 @@ msgid "Total"
msgstr "Total"
#. module: sale
-#: code:addons/sale/sale.py:388
-#, python-format
-msgid "There is no sales journal defined for this company: \"%s\" (id:%d)"
-msgstr ""
+#: report:sale.order:0
+#: view:sale.order.line:0
+msgid "Price"
+msgstr "Pris"
#. module: sale
#: model:process.transition,note:sale.process_transition_deliver0
@@ -1504,10 +1676,15 @@ msgid ""
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:1165
-#, python-format
-msgid "Cannot delete a sales order line which is %s !"
-msgstr "Kan ikke slette en salgsordrelinje som er %s!"
+#: selection:sale.order,order_policy:0
+msgid "Pay before delivery"
+msgstr ""
+
+#. module: sale
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.open_board_sales
+msgid "Sales Dashboard"
+msgstr ""
#. module: sale
#: model:ir.actions.act_window,name:sale.action_sale_order_make_invoice
@@ -1518,6 +1695,7 @@ msgstr "Lag fakturaer"
#. module: sale
#: view:sale.order:0
+#: selection:sale.order,state:0
#: view:sale.order.line:0
msgid "To Invoice"
msgstr "Å fakturere"
@@ -1528,6 +1706,11 @@ msgid "Date on which sales order is confirmed."
msgstr ""
#. module: sale
+#: field:sale.order,project_id:0
+msgid "Contract/Analytic Account"
+msgstr ""
+
+#. module: sale
#: field:sale.order,company_id:0
#: field:sale.order.line,company_id:0
#: view:sale.report:0
@@ -1547,10 +1730,12 @@ msgid "The amount to be invoiced in advance."
msgstr ""
#. module: sale
-#: selection:sale.order,state:0
-#: selection:sale.report,state:0
-msgid "Invoice Exception"
-msgstr "Fakturaunntak"
+#: code:addons/sale/sale.py:1256
+#, python-format
+msgid ""
+"Couldn't find a pricelist line matching this product and quantity.\n"
+"You have to change either the product, the quantity or the pricelist."
+msgstr ""
#. module: sale
#: help:sale.order,picking_ids:0
@@ -1559,13 +1744,6 @@ msgid ""
msgstr "Dette er plukklisten som har blitt laget for denne salgsordren."
#. module: sale
-#: help:sale.installer,sale_margin:0
-msgid ""
-"Gives the margin of profitability by calculating the difference between Unit "
-"Price and Cost Price."
-msgstr ""
-
-#. module: sale
#: view:sale.make.invoice:0
#: view:sale.order.line.make.invoice:0
msgid "Create invoices"
@@ -1584,6 +1762,11 @@ msgid "Cancelled"
msgstr "Kansellert"
#. module: sale
+#: view:sale.order.line:0
+msgid "Sales Order Lines related to a Sales Order of mine"
+msgstr ""
+
+#. module: sale
#: model:ir.actions.act_window,name:sale.action_shop_form
#: model:ir.ui.menu,name:sale.menu_action_shop_form
#: field:sale.order,shop_id:0
@@ -1593,17 +1776,12 @@ msgid "Shop"
msgstr "Handle"
#. module: sale
-#: view:sale.report:0
-msgid " Month "
-msgstr ""
-
-#. module: sale
#: field:sale.report,date_confirm:0
msgid "Date Confirm"
msgstr ""
#. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:111
+#: code:addons/sale/wizard/sale_line_invoice.py:113
#, python-format
msgid "Warning"
msgstr "Varsel"
@@ -1615,17 +1793,6 @@ msgid "Sales by Month"
msgstr "Salg pr. måned"
#. module: sale
-#: code:addons/sale/sale.py:1045
-#, python-format
-msgid ""
-"You selected a quantity of %d Units.\n"
-"But it's not compatible with the selected packaging.\n"
-"Here is a proposition of quantities according to the packaging:\n"
-"\n"
-"EAN: %s Quantity: %s Type of ul: %s"
-msgstr ""
-
-#. module: sale
#: model:ir.model,name:sale.model_sale_order
#: model:process.node,name:sale.process_node_order0
#: model:process.node,name:sale.process_node_saleorder0
@@ -1641,6 +1808,11 @@ msgid "Quantity (UoS)"
msgstr "Kvantum (salgsenhet)"
#. module: sale
+#: view:sale.order.line:0
+msgid "Sale Order Lines that are in 'done' state"
+msgstr ""
+
+#. module: sale
#: model:process.transition,note:sale.process_transition_packing0
msgid ""
"The Pick List form is created as soon as the sales order is confirmed, in "
@@ -1655,6 +1827,11 @@ msgid "Confirmed"
msgstr "Bekreftet"
#. module: sale
+#: field:sale.config.picking_policy,order_policy:0
+msgid "Main Method Based On"
+msgstr ""
+
+#. module: sale
#: model:process.transition.action,name:sale.process_transition_action_confirm0
msgid "Confirm"
msgstr "Bekreft"
@@ -1677,6 +1854,7 @@ msgid "Invoice Lines"
msgstr "Fakturalinjer"
#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_product_tree
#: view:sale.order:0
#: view:sale.order.line:0
msgid "Sales Order Lines"
@@ -1693,30 +1871,18 @@ msgid "Configuration"
msgstr "Konfigurasjon"
#. module: sale
-#: selection:sale.order,picking_policy:0
-msgid "Complete Delivery"
-msgstr "Komplett levering"
-
-#. module: sale
-#: view:sale.report:0
-msgid " Month-1 "
+#: code:addons/sale/edi/sale_order.py:146
+#, python-format
+msgid "EDI Pricelist (%s)"
msgstr ""
#. module: sale
-#: help:sale.config.picking_policy,picking_policy:0
-msgid ""
-"The Shipping Policy is used to configure per order if you want to deliver as "
-"soon as possible when one product is available or you wait that all products "
-"are available.."
+#: view:sale.report:0
+msgid "Sales order created in current year"
msgstr ""
#. module: sale
-#: selection:sale.report,month:0
-msgid "August"
-msgstr "August"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:111
+#: code:addons/sale/wizard/sale_line_invoice.py:113
#, python-format
msgid ""
"Invoice cannot be created for this Sales Order Line due to one of the "
@@ -1726,6 +1892,11 @@ msgid ""
msgstr ""
#. module: sale
+#: view:sale.order.line:0
+msgid "Sale order lines done"
+msgstr ""
+
+#. module: sale
#: field:sale.order.line,th_weight:0
msgid "Weight"
msgstr "Vekt"
@@ -1744,7 +1915,6 @@ msgstr "Desember"
#. module: sale
#: field:sale.config.picking_policy,config_logo:0
-#: field:sale.installer,config_logo:0
msgid "Image"
msgstr ""
@@ -1774,9 +1944,9 @@ msgid "Salesman"
msgstr "Salgsperson"
#. module: sale
-#: model:process.node,note:sale.process_node_saleorder0
-msgid "Drives procurement and invoicing"
-msgstr ""
+#: model:ir.actions.act_window,name:sale.action_order_tree
+msgid "Old Quotations"
+msgstr "Gamle tilbud"
#. module: sale
#: field:sale.order,amount_untaxed:0
@@ -1784,7 +1954,7 @@ msgid "Untaxed Amount"
msgstr "Ikke avgiftsberegnet beløp"
#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:163
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:170
#: model:ir.actions.act_window,name:sale.action_view_sale_advance_payment_inv
#: view:sale.advance.payment.inv:0
#: view:sale.order:0
@@ -1793,7 +1963,7 @@ msgid "Advance Invoice"
msgstr "Forskuddsfaktura"
#. module: sale
-#: code:addons/sale/sale.py:591
+#: code:addons/sale/sale.py:624
#, python-format
msgid "The sales order '%s' has been cancelled."
msgstr ""
@@ -1828,19 +1998,19 @@ msgid "Packings"
msgstr ""
#. module: sale
-#: field:sale.config.picking_policy,progress:0
-#: field:sale.installer,progress:0
-msgid "Configuration Progress"
+#: view:sale.order.line:0
+msgid "Sale Order Lines ready to be invoiced"
msgstr ""
#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_product_tree
-msgid "Product sales"
-msgstr "Produktsalg"
+#: view:sale.report:0
+msgid "Sales order created in last month"
+msgstr ""
#. module: sale
-#: field:sale.order,date_order:0
-msgid "Ordered Date"
+#: model:ir.actions.act_window,name:sale.action_email_templates
+#: model:ir.ui.menu,name:sale.menu_email_templates
+msgid "Email Templates"
msgstr ""
#. module: sale
@@ -1851,14 +2021,15 @@ msgid "Sales Orders"
msgstr "Salgsordre"
#. module: sale
-#: selection:sale.config.picking_policy,picking_policy:0
-msgid "Direct Delivery"
-msgstr "Direkte levering"
+#: model:ir.model,name:sale.model_sale_shop
+#: view:sale.shop:0
+msgid "Sales Shop"
+msgstr ""
#. module: sale
-#: field:sale.installer,sale_journal:0
-msgid "Invoicing journals"
-msgstr "Fakturajournaler"
+#: selection:sale.report,month:0
+msgid "November"
+msgstr "November"
#. module: sale
#: field:sale.advance.payment.inv,product_id:0
@@ -1866,18 +2037,12 @@ msgid "Advance Product"
msgstr ""
#. module: sale
-#: view:sale.report:0
-#: field:sale.report,shipped_qty_1:0
-msgid "Shipped Qty"
-msgstr ""
-
-#. module: sale
-#: view:sale.open.invoice:0
-msgid "You invoice has been successfully created!"
-msgstr "Din faktura er blitt opprettet!"
+#: view:sale.order:0
+msgid "Compute"
+msgstr "Beregn"
#. module: sale
-#: code:addons/sale/sale.py:585
+#: code:addons/sale/sale.py:618
#, python-format
msgid "You must first cancel all invoices attached to this sales order."
msgstr ""
@@ -1889,33 +2054,27 @@ msgid "January"
msgstr "Januar"
#. module: sale
-#: view:sale.installer:0
-msgid "Configure Your Sales Management Application"
-msgstr ""
-
-#. module: sale
#: model:ir.actions.act_window,name:sale.action_order_tree4
msgid "Sales Order in Progress"
msgstr "Salgsordre i arbeid"
#. module: sale
-#: field:sale.installer,sale_layout:0
-msgid "Sales Order Layout Improvement"
+#: help:sale.order,origin:0
+msgid "Reference of the document that generated this sales order request."
msgstr ""
#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:63
-#, python-format
-msgid "Error"
-msgstr "Feil"
-
-#. module: sale
#: view:sale.report:0
#: field:sale.report,delay:0
msgid "Commitment Delay"
msgstr ""
#. module: sale
+#: selection:sale.order,order_policy:0
+msgid "Deliver & invoice on demand"
+msgstr ""
+
+#. module: sale
#: model:process.node,note:sale.process_node_saleprocurement0
msgid ""
"One Procurement order for each sales order line and for each of the "
@@ -1938,13 +2097,12 @@ msgid "Confirmed sales order to invoice."
msgstr "Bekrefte salgsordre som skal faktureres"
#. module: sale
-#: code:addons/sale/sale.py:290
-#, python-format
-msgid "Cannot delete Sales Order(s) which are already confirmed !"
-msgstr "Kan ikke slette salgsordre som allerede er bekreftet!"
+#: view:sale.order:0
+msgid "Sales Order that haven't yet been confirmed"
+msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:316
+#: code:addons/sale/sale.py:322
#, python-format
msgid "The sales order '%s' has been set in draft state."
msgstr ""
@@ -1955,37 +2113,27 @@ msgid "from stock"
msgstr "fra lager"
#. module: sale
-#: field:sale.config.picking_policy,order_policy:0
-msgid "Shipping Default Policy"
-msgstr "Standard forsendelsesprinsipp"
-
-#. module: sale
#: view:sale.open.invoice:0
msgid "Close"
msgstr "Lukke"
#. module: sale
+#: code:addons/sale/sale.py:1248
+#, python-format
+msgid "No Pricelist ! : "
+msgstr ""
+
+#. module: sale
#: field:sale.order,shipped:0
msgid "Delivered"
msgstr "Levert"
#. module: sale
-#: code:addons/sale/sale.py:1115
-#, python-format
-msgid "Not enough stock !"
-msgstr "Ikke nok på lager !"
-
-#. module: sale
#: constraint:stock.move:0
msgid "You must assign a production lot for this product"
msgstr ""
#. module: sale
-#: field:sale.order.line,sequence:0
-msgid "Layout Sequence"
-msgstr ""
-
-#. module: sale
#: model:ir.actions.act_window,help:sale.action_shop_form
msgid ""
"If you have more than one shop reselling your company products, you can "
@@ -2012,11 +2160,6 @@ msgid "May"
msgstr "Mai"
#. module: sale
-#: help:sale.installer,sale_order_dates:0
-msgid "Adds commitment, requested and effective dates on Sales Orders."
-msgstr ""
-
-#. module: sale
#: view:sale.order:0
#: field:sale.order,partner_id:0
#: field:sale.order.line,order_partner_id:0
@@ -2024,23 +2167,11 @@ msgid "Customer"
msgstr "Kunde"
#. module: sale
-#: model:product.template,name:sale.advance_product_0_product_template
-msgid "Advance"
-msgstr ""
-
-#. module: sale
#: selection:sale.report,month:0
msgid "February"
msgstr "Februar"
#. module: sale
-#: help:sale.installer,sale_journal:0
-msgid ""
-"Allows you to group and invoice your delivery orders according to different "
-"invoicing types: daily, weekly, etc."
-msgstr ""
-
-#. module: sale
#: selection:sale.report,month:0
msgid "April"
msgstr "April"
@@ -2051,11 +2182,6 @@ msgid "Accounting"
msgstr "Bokføring"
#. module: sale
-#: field:sale.config.picking_policy,step:0
-msgid "Steps To Deliver a Sales Order"
-msgstr "Steg for å levere en salgsordre"
-
-#. module: sale
#: view:sale.order:0
#: view:sale.order.line:0
msgid "Search Sales Order"
@@ -2067,18 +2193,18 @@ msgid "Sales Order Requisition"
msgstr ""
#. module: sale
+#: code:addons/sale/sale.py:1242
+#, python-format
+msgid "Not enough stock ! : "
+msgstr ""
+
+#. module: sale
#: report:sale.order:0
#: field:sale.order,payment_term:0
msgid "Payment Term"
msgstr "Betalingsbetingelse"
#. module: sale
-#: help:sale.installer,sale_layout:0
-msgid ""
-"Provides some features to improve the layout of the Sales Order reports."
-msgstr ""
-
-#. module: sale
#: model:ir.actions.act_window,help:sale.action_order_report_all
msgid ""
"This report performs analysis on your quotations and sales orders. Analysis "
@@ -2110,6 +2236,199 @@ msgstr "År"
msgid "Invoice Based on Deliveries"
msgstr "Faktura basert på leveringer"
+#~ msgid "Configure Sales Order Logistics"
+#~ msgstr "Konfigurer salgsordre logistikk"
+
+#~ msgid "Payment Before Delivery"
+#~ msgstr "Betaling før levering"
+
+#~ msgid "All at Once"
+#~ msgstr "Alt på en gang"
+
+#~ msgid "Configure Picking Policy for Sales Order"
+#~ msgstr "Konfigurer plukkerutine for salgsordre"
+
+#~ msgid ""
+#~ "The Shipping Policy is used to synchronise invoice and delivery operations.\n"
+#~ " - The 'Pay Before delivery' choice will first generate the invoice and "
+#~ "then generate the picking order after the payment of this invoice.\n"
+#~ " - The 'Shipping & Manual Invoice' will create the picking order directly "
+#~ "and wait for the user to manually click on the 'Invoice' button to generate "
+#~ "the draft invoice.\n"
+#~ " - The 'Invoice On Order After Delivery' choice will generate the draft "
+#~ "invoice based on sales order after all picking lists have been finished.\n"
+#~ " - The 'Invoice From The Picking' choice is used to create an invoice "
+#~ "during the picking process."
+#~ msgstr ""
+#~ "Forsendelsesprinsippene blir brukt for å synkronisere fakturering og "
+#~ "levering.\n"
+#~ " - Valget \"Betal før levering\" vil først danne faktura og så lage "
+#~ "pakkseddel etter betaling av fakturaen.\n"
+#~ " - Vaget \"Forsendelse og manuell faktura\" vil lage pakkeordre med en gang "
+#~ "og avvente at \"Faktura\"-valget blir tastet slik at fakturautkast blir "
+#~ "laget.\n"
+#~ " - Valget \"Faktura av ordre etter levering\" vil lage fakturautkast basert "
+#~ "på salgsordre etter at pakkseddel har blitt dannet.\n"
+#~ " - Valget \"Faktura fra pakking\" blir benyttet til å lage en faktura under "
+#~ "pakkearbeidet."
+
+#~ msgid "Configure"
+#~ msgstr "Konfigurer"
+
+#~ msgid "Delivery Order Only"
+#~ msgstr "Kun leveringsordre"
+
+#~ msgid "Order Reference must be unique !"
+#~ msgstr "Ordrereferanse må være unik !"
+
+#~ msgid "Invoice On Order After Delivery"
+#~ msgstr "Faktura ved ordre etter levering"
+
+#~ msgid " Year "
+#~ msgstr " År "
+
+#~ msgid ""
+#~ "\n"
+#~ " The base module to manage quotations and sales orders.\n"
+#~ "\n"
+#~ " * Workflow with validation steps:\n"
+#~ " - Quotation -> Sales order -> Invoice\n"
+#~ " * Invoicing methods:\n"
+#~ " - Invoice on order (before or after shipping)\n"
+#~ " - Invoice on delivery\n"
+#~ " - Invoice on timesheets\n"
+#~ " - Advance invoice\n"
+#~ " * Partners preferences (shipping, invoicing, incoterm, ...)\n"
+#~ " * Products stocks and prices\n"
+#~ " * Delivery methods:\n"
+#~ " - all at once, multi-parcel\n"
+#~ " - delivery costs\n"
+#~ " * Dashboard for salesman that includes:\n"
+#~ " * Your open quotations\n"
+#~ " * Top 10 sales of the month\n"
+#~ " * Cases statistics\n"
+#~ " * Graph of sales by product\n"
+#~ " * Graph of cases of the month\n"
+#~ " "
+#~ msgstr ""
+#~ "\n"
+#~ " Basismodulen for å håndtere tilbud og salsgordre. \n"
+#~ "\n"
+#~ " * Arbeidsflyt med with valideringskontroll:\n"
+#~ " - Tilbudd -> Salgsordre -> Faktura\n"
+#~ " * Faktureringsmetoder:\n"
+#~ " - Faktura ved ordre (før eller etter forsendelse)\n"
+#~ " - Faktura ved levering\n"
+#~ " - Faktura ved timelister\n"
+#~ " - Forskuddsfaktura\n"
+#~ " * Klients preferanser (forsendelse, fakturering, incoterms, ...)\n"
+#~ " * Produksjonslagre og priser\n"
+#~ " * Leveringsmåter:\n"
+#~ " - alt på en gang, delleveringl\n"
+#~ " - leveringskostnader\n"
+#~ " "
+
+#, python-format
+#~ msgid "You cannot cancel a sales order line that has already been invoiced !"
+#~ msgstr ""
+#~ "Du kan ikke kansellere en salsgordrelinje som allerede har blitt fakturert!"
+
+#~ msgid "Sales Order Dates"
+#~ msgstr "Salgsordredatoer"
+
+#~ msgid "Sales Application Configuration"
+#~ msgstr "Salgskonfigurering"
+
+#~ msgid "Delivery Costs"
+#~ msgstr "Leveringskostnader"
+
+#~ msgid "Partial Delivery"
+#~ msgstr "Dellevering"
+
+#~ msgid "title"
+#~ msgstr "tittel"
+
+#~ msgid "Order date"
+#~ msgstr "Ordredato"
+
+#~ msgid "Shipping Policy"
+#~ msgstr "Forsendelsesprinsipp"
+
+#~ msgid "Shipping & Manual Invoice"
+#~ msgstr "Forsendelse og manuell faktura"
+
+#, python-format
+#~ msgid "Picking Information !"
+#~ msgstr "Plukkinformasjon !"
+
+#~ msgid "Sales Management"
+#~ msgstr "Salgsledelse"
+
+#~ msgid "Invoice From The Picking"
+#~ msgstr "Faktura fra plukking"
+
+#~ msgid ""
+#~ "By default, OpenERP is able to manage complex routing and paths of products "
+#~ "in your warehouse and partner locations. This will configure the most common "
+#~ "and simple methods to deliver products to the customer in one or two "
+#~ "operations by the worker."
+#~ msgstr ""
+#~ "Som standard, er OpenERP i stand til å håndtere kompleks ruting og baner av "
+#~ "produkter på ditt lager og hos klientens lokasjoner. Dette er med på å lage "
+#~ "den mest benyttede og enkleste måte å levere produkter til kunden på med et "
+#~ "fåtall av operasjoner."
+
+#~ msgid "sale.installer"
+#~ msgstr "sale.installer"
+
+#~ msgid "Invoicing"
+#~ msgstr "Fakturering"
+
+#~ msgid ""
+#~ "Gives the state of the quotation or sales order. \n"
+#~ "The exception state is automatically set when a cancel operation occurs in "
+#~ "the invoice validation (Invoice Exception) or in the picking list process "
+#~ "(Shipping Exception). \n"
+#~ "The 'Waiting Schedule' state is set when the invoice is confirmed but "
+#~ "waiting for the scheduler to run on the date 'Ordered Date'."
+#~ msgstr ""
+#~ "Gir status på tilbudet eller salgsordren.\n"
+#~ "Unntaksstatus blir automatisk satt når en kanseleringssituasjon oppstår ved "
+#~ "fakturakontrollen (fakturaunntak) eller i pakkseddel prosessen "
+#~ "(forsendelsesunntak). \n"
+#~ "\"Ventestatus\" blir satt når fakturaen er bekreftet men avventer kjøring av "
+#~ "fordelingsjobben på dato for \"Dato bestilt\"."
+
+#, python-format
+#~ msgid "Cannot delete a sales order line which is %s !"
+#~ msgstr "Kan ikke slette en salgsordrelinje som er %s!"
+
+#~ msgid "Complete Delivery"
+#~ msgstr "Komplett levering"
+
+#~ msgid "Product sales"
+#~ msgstr "Produktsalg"
+
+#~ msgid "Direct Delivery"
+#~ msgstr "Direkte levering"
+
+#~ msgid "Invoicing journals"
+#~ msgstr "Fakturajournaler"
+
+#, python-format
+#~ msgid "Cannot delete Sales Order(s) which are already confirmed !"
+#~ msgstr "Kan ikke slette salgsordre som allerede er bekreftet!"
+
+#~ msgid "Shipping Default Policy"
+#~ msgstr "Standard forsendelsesprinsipp"
+
+#, python-format
+#~ msgid "Not enough stock !"
+#~ msgstr "Ikke nok på lager !"
+
+#~ msgid "Steps To Deliver a Sales Order"
+#~ msgstr "Steg for å levere en salgsordre"
+
#~ msgid "Invalid model name in the action definition."
#~ msgstr "Ugyldig modellnavn i aksjonsdefinisjonen."
@@ -2182,9 +2501,6 @@ msgstr "Faktura basert på leveringer"
#~ msgid "Draft Invoice"
#~ msgstr "Fakturautkast"
-#~ msgid "My Quotations"
-#~ msgstr "Mine tilbud"
-
#~ msgid "Manages the delivery and invoicing progress"
#~ msgstr "Håndterer lverings -og faktureringsframdriften"
diff --git a/addons/sale/i18n/nl.po b/addons/sale/i18n/nl.po
index 54faceb55d8..e6417f8ed31 100644
--- a/addons/sale/i18n/nl.po
+++ b/addons/sale/i18n/nl.po
@@ -6,15 +6,27 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2011-01-11 11:16+0000\n"
+"POT-Creation-Date: 2011-12-22 18:43+0000\n"
"PO-Revision-Date: 2011-01-17 16:37+0000\n"
"Last-Translator: Douwe Wullink (Dypalio) <Unknown>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-05 05:16+0000\n"
-"X-Generator: Launchpad (build 14231)\n"
+"X-Launchpad-Export-Date: 2011-12-23 06:46+0000\n"
+"X-Generator: Launchpad (build 14560)\n"
+
+#. module: sale
+#: field:sale.config.picking_policy,timesheet:0
+msgid "Based on Timesheet"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid ""
+"Sale Order Lines that are confirmed, done or in exception state and haven't "
+"yet been invoiced"
+msgstr ""
#. module: sale
#: view:board.board:0
@@ -23,11 +35,6 @@ msgid "Sales by Salesman in last 90 days"
msgstr "Omzet per verkoper in de laatste 90 dagen"
#. module: sale
-#: help:sale.installer,delivery:0
-msgid "Allows you to compute delivery costs on your quotations."
-msgstr "Geeft de mogelijkheid om verzendkosten te berekenen op offertes"
-
-#. module: sale
#: help:sale.order,picking_policy:0
msgid ""
"If you don't have enough stock available to deliver all at once, do you "
@@ -37,6 +44,11 @@ msgstr ""
"er dan deelleveringen geaccepteerd?"
#. module: sale
+#: view:sale.order:0
+msgid "UoS"
+msgstr ""
+
+#. module: sale
#: help:sale.order,partner_shipping_id:0
msgid "Shipping address for current sales order."
msgstr "Afleveradres voor de huidige verkooporder."
@@ -60,22 +72,12 @@ msgid "Cancel Order"
msgstr "Annuleer order"
#. module: sale
-#: view:sale.config.picking_policy:0
-msgid "Configure Sales Order Logistics"
-msgstr "Verkooporder logistiek configureren"
-
-#. module: sale
-#: code:addons/sale/sale.py:603
+#: code:addons/sale/sale.py:638
#, python-format
msgid "The quotation '%s' has been converted to a sales order."
msgstr "De offerte '%s' is omgezet in een verkooporder."
#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Payment Before Delivery"
-msgstr "Vooruitbetaling"
-
-#. module: sale
#: code:addons/sale/wizard/sale_make_invoice.py:42
#, python-format
msgid "Warning !"
@@ -92,12 +94,6 @@ msgid "Drives procurement orders for every sales order line."
msgstr "Stuurt verwervingsopdrachten aan voor elke verkooporderregel."
#. module: sale
-#: selection:sale.config.picking_policy,picking_policy:0
-msgid "All at Once"
-msgstr "Complete leveringen"
-
-#. module: sale
-#: field:sale.order,project_id:0
#: view:sale.report:0
#: field:sale.report,analytic_account_id:0
#: field:sale.shop,project_id:0
@@ -116,6 +112,15 @@ msgstr ""
"u factureert vanaf leveringen of als u alle verkopen factureert."
#. module: sale
+#: code:addons/sale/sale.py:295
+#, python-format
+msgid ""
+"In order to delete a confirmed sale order, you must cancel it before ! To "
+"cancel a sale order, you must first cancel related picking or delivery "
+"orders."
+msgstr ""
+
+#. module: sale
#: model:process.node,name:sale.process_node_saleprocurement0
msgid "Procurement Order"
msgstr "Verwervingsopdracht"
@@ -127,6 +132,11 @@ msgid "Partner"
msgstr "Relatie"
#. module: sale
+#: selection:sale.order,order_policy:0
+msgid "Invoice based on deliveries"
+msgstr ""
+
+#. module: sale
#: view:sale.order:0
msgid "Order Line"
msgstr "Orderregel"
@@ -171,9 +181,14 @@ msgid "Default Payment Term"
msgstr "Std. betalingstermijn"
#. module: sale
-#: model:ir.actions.act_window,name:sale.action_config_picking_policy
-msgid "Configure Picking Policy for Sales Order"
-msgstr "Verzamelbeleid voor verkooporder configureren."
+#: field:sale.config.picking_policy,deli_orders:0
+msgid "Based on Delivery Orders"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.picking_policy,time_unit:0
+msgid "Main Working Time Unit"
+msgstr ""
#. module: sale
#: view:sale.order:0
@@ -189,9 +204,10 @@ msgid "Disc.(%)"
msgstr "Korting. (%)"
#. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_forceassignation0
-msgid "Force Assignation"
-msgstr "Forceer toewijzing"
+#: view:sale.report:0
+#: field:sale.report,price_total:0
+msgid "Total Price"
+msgstr "Totaalprijs"
#. module: sale
#: help:sale.make.invoice,grouped:0
@@ -199,6 +215,11 @@ msgid "Check the box to group the invoices for the same customers"
msgstr "Zet aan om de facturen voor dezelfde klanten te groeperen."
#. module: sale
+#: view:sale.order:0
+msgid "My Sale Orders"
+msgstr ""
+
+#. module: sale
#: selection:sale.order,invoice_quantity:0
msgid "Ordered Quantities"
msgstr "Bestelde hoeveelheden"
@@ -239,14 +260,25 @@ msgstr ""
"pakbon' of 'Factuur van order na levering' is."
#. module: sale
+#: field:sale.config.picking_policy,task_work:0
+msgid "Based on Tasks' Work"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
+msgid "Quotations and Sales"
+msgstr ""
+
+#. module: sale
#: model:ir.model,name:sale.model_sale_make_invoice
msgid "Sales Make Invoice"
msgstr "Verkoopfactuur maken"
#. module: sale
-#: view:sale.order:0
-msgid "Recreate Packing"
-msgstr "Pakbon opnieuw maken"
+#: code:addons/sale/sale.py:330
+#, python-format
+msgid "Pricelist Warning!"
+msgstr ""
#. module: sale
#: field:sale.order.line,discount:0
@@ -254,12 +286,10 @@ msgid "Discount (%)"
msgstr "Korting (%)"
#. module: sale
-#: help:res.company,security_lead:0
-msgid ""
-"This is the days added to what you promise to customers for security purpose"
-msgstr ""
-"Dit is het aantal dagen dat als veiligheidsmarge wordt toegevoegd aan de "
-"beloofde levertijd."
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_quotation_for_sale
+msgid "My Quotations"
+msgstr "Mijn offerte-aanvragen"
#. module: sale
#: view:board.board:0
@@ -284,7 +314,22 @@ msgid "Shop Name"
msgstr "Naam verkooppunt"
#. module: sale
-#: code:addons/sale/sale.py:1014
+#: help:sale.order,order_policy:0
+msgid ""
+"The Invoice Policy is used to synchronise invoice and delivery operations.\n"
+" - The 'Pay before delivery' choice will first generate the invoice and "
+"then generate the picking order after the payment of this invoice.\n"
+" - The 'Deliver & Invoice on demand' will create the picking order directly "
+"and wait for the user to manually click on the 'Invoice' button to generate "
+"the draft invoice based on the sale order or the sale order lines.\n"
+" - The 'Invoice on order after delivery' choice will generate the draft "
+"invoice based on sales order after all picking lists have been finished.\n"
+" - The 'Invoice based on deliveries' choice is used to create an invoice "
+"during the picking process."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:1158
#, python-format
msgid "No Customer Defined !"
msgstr "Geen klant opgegeven!"
@@ -295,9 +340,12 @@ msgid "Sales in Exception"
msgstr "Verkooporders met uitgestelde levering"
#. module: sale
-#: view:sale.order:0
-msgid "Set to Draft"
-msgstr "Naar Concept"
+#: code:addons/sale/sale.py:1145
+#: code:addons/sale/sale.py:1264
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:70
+#, python-format
+msgid "Configuration Error !"
+msgstr ""
#. module: sale
#: view:sale.order:0
@@ -305,33 +353,7 @@ msgid "Conditions"
msgstr "Voorwaarden"
#. module: sale
-#: help:sale.order,order_policy:0
-msgid ""
-"The Shipping Policy is used to synchronise invoice and delivery operations.\n"
-" - The 'Pay Before delivery' choice will first generate the invoice and "
-"then generate the picking order after the payment of this invoice.\n"
-" - The 'Shipping & Manual Invoice' will create the picking order directly "
-"and wait for the user to manually click on the 'Invoice' button to generate "
-"the draft invoice.\n"
-" - The 'Invoice On Order After Delivery' choice will generate the draft "
-"invoice based on sales order after all picking lists have been finished.\n"
-" - The 'Invoice From The Picking' choice is used to create an invoice "
-"during the picking process."
-msgstr ""
-"Het leveringsbeleid wordt gebruikt om facturatie en leverings bewerkingen te "
-"synchroniseren.\n"
-" - De 'Vooruitbetaling' keuze genereert eerst de factuur en genereert de "
-"pakbon na betaling van de factuur.\n"
-" - De 'Leveren & Handmatig factureren' keuze maakt de pakbon direct en "
-"wacht met het genereren van een concept factuur totdat de gebruiker de "
-"'Factureren' knop drukt.\n"
-" - De 'Factuur op order na levering' keuze genereert de concept factuur "
-"gebaseerd op de verkooporder nadat alle pakbonnen gereed zijn. \n"
-" - De 'Factuur van pakbon' keuze wordt gebruikt om een factuur te maken "
-"gedurende het verzamel proces."
-
-#. module: sale
-#: code:addons/sale/sale.py:939
+#: code:addons/sale/sale.py:1034
#, python-format
msgid ""
"There is no income category account defined in default Properties for "
@@ -341,9 +363,9 @@ msgstr ""
"eigenschappen van product categorie of fiscale situatie niet gedefinieerd !"
#. module: sale
-#: view:sale.installer:0
-msgid "Configure"
-msgstr "Configureren"
+#: selection:sale.report,month:0
+msgid "August"
+msgstr "Augustus"
#. module: sale
#: constraint:stock.move:0
@@ -352,7 +374,7 @@ msgstr ""
"U probeert een partij toe te wijzen die niet van hetzelfde product is."
#. module: sale
-#: code:addons/sale/sale.py:620
+#: code:addons/sale/sale.py:655
#, python-format
msgid "invalid mode for test_state"
msgstr "invalid mode for test_state"
@@ -363,7 +385,7 @@ msgid "June"
msgstr "Juni"
#. module: sale
-#: code:addons/sale/sale.py:584
+#: code:addons/sale/sale.py:617
#, python-format
msgid "Could not cancel this sales order !"
msgstr "Kon deze verkooporder niet annuleren !"
@@ -384,8 +406,12 @@ msgid "October"
msgstr "Oktober"
#. module: sale
+#: sql_constraint:stock.picking:0
+msgid "Reference must be unique per Company!"
+msgstr ""
+
+#. module: sale
#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_quotation_for_sale
#: view:sale.order:0
#: view:sale.report:0
msgid "Quotations"
@@ -397,11 +423,6 @@ msgid "Pricelist for current sales order."
msgstr "Prijslijst voor actuele verkooporder"
#. module: sale
-#: selection:sale.config.picking_policy,step:0
-msgid "Delivery Order Only"
-msgstr "Alleen leveringsopdracht"
-
-#. module: sale
#: report:sale.order:0
msgid "TVA :"
msgstr "BTW :"
@@ -428,6 +449,7 @@ msgstr "Fiscale situatie"
#. module: sale
#: view:sale.order:0
#: view:sale.order.line:0
+#: field:sale.report,product_uom:0
msgid "UoM"
msgstr "Eenheid"
@@ -452,7 +474,13 @@ msgstr ""
"'Loopt' of 'Loopt handmatig'."
#. module: sale
-#: code:addons/sale/sale.py:971
+#: code:addons/sale/sale.py:1061
+#, python-format
+msgid "You cannot cancel a sale order line that has already been invoiced!"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:1066
#, python-format
msgid "You must first cancel stock moves attached to this sales order line."
msgstr ""
@@ -460,7 +488,7 @@ msgstr ""
"verkooporderregel."
#. module: sale
-#: code:addons/sale/sale.py:1042
+#: code:addons/sale/sale.py:1134
#, python-format
msgid "(n/a)"
msgstr "(n.b.)"
@@ -498,14 +526,36 @@ msgid "Notes"
msgstr "Opmerkingen"
#. module: sale
+#: sql_constraint:res.company:0
+msgid "The company name must be unique !"
+msgstr ""
+
+#. module: sale
#: help:sale.order,partner_invoice_id:0
msgid "Invoice address for current sales order."
msgstr "Factuuradres van actuele verkooporder."
#. module: sale
-#: view:sale.installer:0
-msgid "Enhance your core Sales Application with additional functionalities."
-msgstr "De basis verkoop applicatie verbeteren met aanvullende functies."
+#: view:sale.report:0
+msgid "Month-1"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered month of the sales order"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:504
+#, python-format
+msgid ""
+"You cannot group sales having different currencies for the same partner."
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,picking_policy:0
+msgid "Deliver each product when available"
+msgstr ""
#. module: sale
#: field:sale.order,invoiced_rate:0
@@ -524,21 +574,43 @@ msgid "Confirmation Date"
msgstr "Datum bevestigd"
#. module: sale
+#: field:sale.order,incoterm:0
+msgid "Incoterm"
+msgstr "Leveringsconditie"
+
+#. module: sale
#: field:sale.order.line,address_allotment_id:0
msgid "Allotment Partner"
msgstr "Toewijzing relatie"
#. module: sale
-#: sql_constraint:sale.order:0
-msgid "Order Reference must be unique !"
-msgstr "Orderreferentie moet uniek zijn!"
-
-#. module: sale
#: selection:sale.report,month:0
msgid "March"
msgstr "Maart"
#. module: sale
+#: constraint:stock.move:0
+msgid "You can not move products from or to a location of the type view."
+msgstr ""
+
+#. module: sale
+#: field:sale.config.picking_policy,sale_orders:0
+msgid "Based on Sales Orders"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,state:0
+msgid ""
+"Givwizard = self.browse(cr, uid, ids)[0]es the state of the quotation or "
+"sales order. \n"
+"The exception state is automatically set when a cancel operation occurs in "
+"the invoice validation (Invoice Exception) or in the picking list process "
+"(Shipping Exception). \n"
+"The 'Waiting Schedule' state is set when the invoice is confirmed but "
+"waiting for the scheduler to run on the order date."
+msgstr ""
+
+#. module: sale
#: help:sale.order,amount_total:0
msgid "The total amount."
msgstr "Het totaalbedrag."
@@ -554,6 +626,11 @@ msgid "Invoice address :"
msgstr "Factuuradres:"
#. module: sale
+#: field:sale.order.line,sequence:0
+msgid "Line Sequence"
+msgstr ""
+
+#. module: sale
#: model:process.transition,note:sale.process_transition_saleorderprocurement0
msgid ""
"For every sales order line, a procurement order is created to supply the "
@@ -604,11 +681,6 @@ msgid "Sales Order Line"
msgstr "Verkooporderregel"
#. module: sale
-#: view:sale.config.picking_policy:0
-msgid "Setup your sales workflow and default values."
-msgstr "Stel uw verkoop workflow en standaard waarden in."
-
-#. module: sale
#: field:sale.shop,warehouse_id:0
msgid "Warehouse"
msgstr "Magazijn"
@@ -645,6 +717,11 @@ msgid "Creation Date"
msgstr "Datum gemaakt"
#. module: sale
+#: model:ir.ui.menu,name:sale.menu_sales_configuration_misc
+msgid "Miscellaneous"
+msgstr ""
+
+#. module: sale
#: model:ir.actions.act_window,name:sale.action_order_line_tree3
msgid "Uninvoiced and Delivered Lines"
msgstr "Nog te factureren en geleverde regels"
@@ -660,14 +737,19 @@ msgid "My Sales"
msgstr "Mijn verkopen"
#. module: sale
-#: code:addons/sale/sale.py:290
-#: code:addons/sale/sale.py:966
-#: code:addons/sale/sale.py:1165
+#: code:addons/sale/sale.py:295
+#: code:addons/sale/sale.py:1061
+#: code:addons/sale/sale.py:1290
#, python-format
msgid "Invalid action !"
msgstr "Foutieve handeling!"
#. module: sale
+#: view:sale.order:0
+msgid "Extra Info"
+msgstr "Extra info"
+
+#. module: sale
#: field:sale.order,pricelist_id:0
#: field:sale.report,pricelist_id:0
#: field:sale.shop,pricelist_id:0
@@ -681,13 +763,21 @@ msgid "# of Qty"
msgstr "# Aantal"
#. module: sale
+#: code:addons/sale/sale.py:1314
+#, python-format
+msgid "Hour"
+msgstr ""
+
+#. module: sale
#: view:sale.order:0
msgid "Order Date"
msgstr "Orderdatum"
#. module: sale
#: view:sale.order.line:0
+#: view:sale.report:0
#: field:sale.report,shipped:0
+#: field:sale.report,shipped_qty_1:0
msgid "Shipped"
msgstr "Verzonden"
@@ -697,9 +787,9 @@ msgid "All Quotations"
msgstr "Offerte-aanvragen"
#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Invoice On Order After Delivery"
-msgstr "Factuur op order na levering"
+#: view:sale.config.picking_policy:0
+msgid "Options"
+msgstr ""
#. module: sale
#: selection:sale.report,month:0
@@ -707,6 +797,20 @@ msgid "September"
msgstr "September"
#. module: sale
+#: code:addons/sale/sale.py:632
+#, python-format
+msgid "You cannot confirm a sale order which has no line."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:1246
+#, python-format
+msgid ""
+"You have to select a pricelist or a customer in the sales form !\n"
+"Please set one before choosing a product."
+msgstr ""
+
+#. module: sale
#: view:sale.report:0
#: field:sale.report,categ_id:0
msgid "Category of Product"
@@ -723,11 +827,6 @@ msgid "Stock Moves"
msgstr "Goederenstromen"
#. module: sale
-#: view:sale.report:0
-msgid " Year "
-msgstr " Jaar "
-
-#. module: sale
#: field:sale.order,state:0
#: field:sale.report,state:0
msgid "Order State"
@@ -745,7 +844,7 @@ msgid "Sales By Month"
msgstr "Omzet per maand"
#. module: sale
-#: code:addons/sale/sale.py:970
+#: code:addons/sale/sale.py:1065
#, python-format
msgid "Could not cancel sales order line!"
msgstr "Kan verkooporderregel niet annuleren !"
@@ -780,64 +879,19 @@ msgstr ""
"bijgewerkt als de planning heeft loopt."
#. module: sale
+#: field:sale.order,date_order:0
+msgid "Date"
+msgstr ""
+
+#. module: sale
#: view:sale.report:0
msgid "Extended Filters..."
msgstr "Uitgebreide filters..."
#. module: sale
-#: model:ir.module.module,description:sale.module_meta_information
-msgid ""
-"\n"
-" The base module to manage quotations and sales orders.\n"
-"\n"
-" * Workflow with validation steps:\n"
-" - Quotation -> Sales order -> Invoice\n"
-" * Invoicing methods:\n"
-" - Invoice on order (before or after shipping)\n"
-" - Invoice on delivery\n"
-" - Invoice on timesheets\n"
-" - Advance invoice\n"
-" * Partners preferences (shipping, invoicing, incoterm, ...)\n"
-" * Products stocks and prices\n"
-" * Delivery methods:\n"
-" - all at once, multi-parcel\n"
-" - delivery costs\n"
-" * Dashboard for salesman that includes:\n"
-" * Your open quotations\n"
-" * Top 10 sales of the month\n"
-" * Cases statistics\n"
-" * Graph of sales by product\n"
-" * Graph of cases of the month\n"
-" "
-msgstr ""
-"\n"
-" De basis module om offertes en verkooporders te beheren.\n"
-"\n"
-" * Workflow met validatie stappen:\n"
-" - Offerte -> Verkooporder -> Factuur\n"
-" * Facturatie methodes:\n"
-" - Factuur bij order (voor of na levering)\n"
-" - Factuur bij levering\n"
-" - Factuur bij urenstaten\n"
-" - Voorschotfactuur\n"
-" * Relatie voorkeuren (levering, facturatie, voorwaarden, ...)\n"
-" * Product voorraad en prijzen\n"
-" * Levering methodes:\n"
-" - complete leveringen, deelleveringen\n"
-" - verzendkosten\n"
-" * Dashboard voor verkoper die bevat:\n"
-" * Uw open offertes\n"
-" * Top 10 verkopen deze maand\n"
-" * Dossier statistieken\n"
-" * Grafiek van omzet per product\n"
-" * Grafiek van dossiers per maand\n"
-" "
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_shop
-#: view:sale.shop:0
-msgid "Sales Shop"
-msgstr "Verkoopfiliaal"
+#: selection:sale.order.line,state:0
+msgid "Exception"
+msgstr "Uitzondering"
#. module: sale
#: model:ir.model,name:sale.model_res_company
@@ -845,9 +899,10 @@ msgid "Companies"
msgstr "Bedrijven"
#. module: sale
-#: selection:sale.report,month:0
-msgid "November"
-msgstr "November"
+#: code:addons/sale/sale.py:1259
+#, python-format
+msgid "No valid pricelist line found ! :"
+msgstr ""
#. module: sale
#: view:sale.order:0
@@ -855,9 +910,9 @@ msgid "History"
msgstr "Historie"
#. module: sale
-#: field:sale.config.picking_policy,picking_policy:0
-msgid "Picking Default Policy"
-msgstr "Standaard verzamelbeleid"
+#: selection:sale.order,order_policy:0
+msgid "Invoice on order after delivery"
+msgstr ""
#. module: sale
#: help:sale.order,invoice_ids:0
@@ -884,13 +939,14 @@ msgstr ""
"heeft."
#. module: sale
-#: code:addons/sale/sale.py:966
-#, python-format
-msgid "You cannot cancel a sales order line that has already been invoiced !"
-msgstr "U kunt geen verkooporderregel annuleren die al gefactureerd is!"
+#: help:res.company,security_lead:0
+msgid ""
+"This is the days added to what you promise to customers for security purpose"
+msgstr ""
+"Dit is het aantal dagen dat als veiligheidsmarge wordt toegevoegd aan de "
+"beloofde levertijd."
#. module: sale
-#: view:sale.order:0
#: view:sale.order.line:0
msgid "Qty"
msgstr "Hvhd"
@@ -901,6 +957,11 @@ msgid "References"
msgstr "Referenties"
#. module: sale
+#: view:sale.order.line:0
+msgid "My Sales Order Lines"
+msgstr ""
+
+#. module: sale
#: model:process.transition.action,name:sale.process_transition_action_cancel0
#: model:process.transition.action,name:sale.process_transition_action_cancel1
#: model:process.transition.action,name:sale.process_transition_action_cancel2
@@ -912,14 +973,9 @@ msgid "Cancel"
msgstr "Annuleer"
#. module: sale
-#: field:sale.installer,sale_order_dates:0
-msgid "Sales Order Dates"
-msgstr "Verkooporder data"
-
-#. module: sale
-#: selection:sale.order.line,state:0
-msgid "Exception"
-msgstr "Uitzondering"
+#: sql_constraint:sale.order:0
+msgid "Order Reference must be unique per Company!"
+msgstr ""
#. module: sale
#: model:process.transition,name:sale.process_transition_invoice0
@@ -931,19 +987,19 @@ msgid "Create Invoice"
msgstr "Maak factuur"
#. module: sale
-#: field:sale.installer,sale_margin:0
-msgid "Margins in Sales Orders"
-msgstr "Merges in verkooporders"
-
-#. module: sale
#: view:sale.order:0
msgid "Total Tax Excluded"
msgstr "Totaal excl. BTW"
#. module: sale
-#: view:sale.order:0
-msgid "Compute"
-msgstr "Bereken"
+#: view:sale.order.line:0
+msgid "Order reference"
+msgstr ""
+
+#. module: sale
+#: view:sale.open.invoice:0
+msgid "You invoice has been successfully created!"
+msgstr "De factuur is met succes gemaakt!"
#. module: sale
#: view:sale.report:0
@@ -962,23 +1018,21 @@ msgid "Open Invoice"
msgstr "Openstaande factuur"
#. module: sale
-#: report:sale.order:0
-#: view:sale.order.line:0
-msgid "Price"
-msgstr "Prijs"
+#: model:ir.actions.server,name:sale.ir_actions_server_edi_sale
+msgid "Auto-email confirmed sale orders"
+msgstr ""
#. module: sale
-#: model:ir.actions.act_window,name:sale.action_sale_installer
-#: view:sale.config.picking_policy:0
-#: view:sale.installer:0
-msgid "Sales Application Configuration"
-msgstr "Verkoop applicatie configuratie"
+#: code:addons/sale/sale.py:413
+#, python-format
+msgid "There is no sales journal defined for this company: \"%s\" (id:%d)"
+msgstr ""
+"Er is geen verkoopdagboek gedefinieerd voor dit bedrijf: \"%s\" (id:%d)"
#. module: sale
-#: view:sale.report:0
-#: field:sale.report,price_total:0
-msgid "Total Price"
-msgstr "Totaalprijs"
+#: model:process.transition.action,name:sale.process_transition_action_forceassignation0
+msgid "Force Assignation"
+msgstr "Forceer toewijzing"
#. module: sale
#: selection:sale.order.line,type:0
@@ -991,6 +1045,11 @@ msgid "Based on the shipped or on the ordered quantities."
msgstr "Gebaseerd op de geleverde of bestelde hoeveelheden."
#. module: sale
+#: selection:sale.order,picking_policy:0
+msgid "Deliver all products at once"
+msgstr ""
+
+#. module: sale
#: field:sale.order,picking_ids:0
msgid "Related Picking"
msgstr "Gekoppelde picking"
@@ -1022,9 +1081,15 @@ msgid "Create Delivery Order"
msgstr "Afleveropdracht maken"
#. module: sale
-#: field:sale.installer,delivery:0
-msgid "Delivery Costs"
-msgstr "Afleveringskosten"
+#: code:addons/sale/sale.py:1290
+#, python-format
+msgid "Cannot delete a sales order line which is in state '%s'!"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Qty(UoS)"
+msgstr ""
#. module: sale
#: view:sale.order:0
@@ -1038,13 +1103,13 @@ msgstr "Picklijst maken"
#. module: sale
#: view:sale.report:0
-msgid "Sales by Product Category"
-msgstr "Omzet per product categorie"
+msgid "Ordered date of the sales order"
+msgstr ""
#. module: sale
-#: selection:sale.order,picking_policy:0
-msgid "Partial Delivery"
-msgstr "Deellevering"
+#: view:sale.report:0
+msgid "Sales by Product Category"
+msgstr "Omzet per product categorie"
#. module: sale
#: model:process.transition,name:sale.process_transition_confirmquotation0
@@ -1052,10 +1117,10 @@ msgid "Confirm Quotation"
msgstr "Bevestig offerte-aanvraag"
#. module: sale
-#: help:sale.order,origin:0
-msgid "Reference of the document that generated this sales order request."
-msgstr ""
-"Referentie van het document dat deze verkooporder aanvraag genereerde."
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:63
+#, python-format
+msgid "Error"
+msgstr "Fout"
#. module: sale
#: view:sale.order:0
@@ -1087,20 +1152,14 @@ msgid "Procurement Method"
msgstr "Verwervingswijze"
#. module: sale
-#: view:sale.config.picking_policy:0
-#: view:sale.installer:0
-msgid "title"
-msgstr "titel"
-
-#. module: sale
#: model:process.node,name:sale.process_node_packinglist0
msgid "Pick List"
msgstr "Picklijst"
#. module: sale
#: view:sale.order:0
-msgid "Order date"
-msgstr "Orderdatum"
+msgid "Set to Draft"
+msgstr "Naar Concept"
#. module: sale
#: model:process.node,note:sale.process_node_packinglist0
@@ -1108,6 +1167,85 @@ msgid "Document of the move to the output or to the customer."
msgstr "Document van de mutatie naar de expeditie of naar de klant."
#. module: sale
+#: model:email.template,body_text:sale.email_template_edi_sale
+msgid ""
+"\n"
+"Hello${object.partner_order_id.name and ' ' or "
+"''}${object.partner_order_id.name or ''},\n"
+"\n"
+"Here is your order confirmation for ${object.partner_id.name}:\n"
+" | Order number: *${object.name}*\n"
+" | Order total: *${object.amount_total} "
+"${object.pricelist_id.currency_id.name}*\n"
+" | Order date: ${object.date_order}\n"
+" % if object.origin:\n"
+" | Order reference: ${object.origin}\n"
+" % endif\n"
+" % if object.client_order_ref:\n"
+" | Your reference: ${object.client_order_ref}<br />\n"
+" % endif\n"
+" | Your contact: ${object.user_id.name} ${object.user_id.user_email "
+"and '<%s>'%(object.user_id.user_email) or ''}\n"
+"\n"
+"You can view the order confirmation, download it and even pay online using "
+"the following link:\n"
+" ${ctx.get('edi_web_url_view') or 'n/a'}\n"
+"\n"
+"% if object.order_policy in ('prepaid','manual') and "
+"object.company_id.paypal_account:\n"
+"<% \n"
+"comp_name = quote(object.company_id.name)\n"
+"order_name = quote(object.name)\n"
+"paypal_account = quote(object.company_id.paypal_account)\n"
+"order_amount = quote(str(object.amount_total))\n"
+"cur_name = quote(object.pricelist_id.currency_id.name)\n"
+"paypal_url = \"https://www.paypal.com/cgi-"
+"bin/webscr?cmd=_xclick&business=%s&item_name=%s%%20Order%%20%s&invoice=%s&amo"
+"unt=%s\" \\\n"
+" "
+"\"&currency_code=%s&button_subtype=services&no_note=1&bn=OpenERP_Order_PayNow"
+"_%s\" % \\\n"
+" "
+"(paypal_account,comp_name,order_name,order_name,order_amount,cur_name,cur_nam"
+"e)\n"
+"%>\n"
+"It is also possible to directly pay with Paypal:\n"
+" ${paypal_url}\n"
+"% endif\n"
+"\n"
+"If you have any question, do not hesitate to contact us.\n"
+"\n"
+"\n"
+"Thank you for choosing ${object.company_id.name}!\n"
+"\n"
+"\n"
+"--\n"
+"${object.user_id.name} ${object.user_id.user_email and "
+"'<%s>'%(object.user_id.user_email) or ''}\n"
+"${object.company_id.name}\n"
+"% if object.company_id.street:\n"
+"${object.company_id.street or ''}\n"
+"% endif\n"
+"% if object.company_id.street2:\n"
+"${object.company_id.street2}\n"
+"% endif\n"
+"% if object.company_id.city or object.company_id.zip:\n"
+"${object.company_id.zip or ''} ${object.company_id.city or ''}\n"
+"% endif\n"
+"% if object.company_id.country_id:\n"
+"${object.company_id.state_id and ('%s, ' % object.company_id.state_id.name) "
+"or ''} ${object.company_id.country_id.name or ''}\n"
+"% endif\n"
+"% if object.company_id.phone:\n"
+"Phone: ${object.company_id.phone}\n"
+"% endif\n"
+"% if object.company_id.website:\n"
+"${object.company_id.website or ''}\n"
+"% endif\n"
+" "
+msgstr ""
+
+#. module: sale
#: model:process.transition.action,name:sale.process_transition_action_validate0
msgid "Validate"
msgstr "Bevestig"
@@ -1130,9 +1268,9 @@ msgid "Taxes"
msgstr "Belastingen"
#. module: sale
-#: field:sale.order,order_policy:0
-msgid "Shipping Policy"
-msgstr "Behandelwijze"
+#: view:sale.order:0
+msgid "Sales Order ready to be invoiced"
+msgstr ""
#. module: sale
#: help:sale.order,create_date:0
@@ -1151,9 +1289,9 @@ msgid "Create Invoices"
msgstr "Facturen maken"
#. module: sale
-#: view:sale.order:0
-msgid "Extra Info"
-msgstr "Extra info"
+#: view:sale.report:0
+msgid "Sales order created in current month"
+msgstr ""
#. module: sale
#: report:sale.order:0
@@ -1161,11 +1299,24 @@ msgid "Fax :"
msgstr "Fax :"
#. module: sale
+#: help:sale.order.line,type:0
+msgid ""
+"If 'on order', it triggers a procurement when the sale order is confirmed to "
+"create a task, purchase order or manufacturing order linked to this sale "
+"order line."
+msgstr ""
+
+#. module: sale
#: field:sale.advance.payment.inv,amount:0
msgid "Advance Amount"
msgstr "Voorschotbedrag"
#. module: sale
+#: field:sale.config.picking_policy,charge_delivery:0
+msgid "Do you charge the delivery?"
+msgstr ""
+
+#. module: sale
#: selection:sale.order,invoice_quantity:0
msgid "Shipped Quantities"
msgstr "Verzonden hoeveelheden"
@@ -1176,25 +1327,45 @@ msgid "Invoice Based on Sales Orders"
msgstr "Factuur gebaseerd op verkooporders."
#. module: sale
+#: code:addons/sale/sale.py:331
+#, python-format
+msgid ""
+"If you change the pricelist of this order (and eventually the currency), "
+"prices of existing order lines will not be updated."
+msgstr ""
+
+#. module: sale
#: model:ir.model,name:sale.model_stock_picking
msgid "Picking List"
msgstr "Picklijst"
#. module: sale
-#: code:addons/sale/sale.py:387
-#: code:addons/sale/sale.py:920
-#: code:addons/sale/sale.py:938
+#: code:addons/sale/sale.py:412
+#: code:addons/sale/sale.py:503
+#: code:addons/sale/sale.py:632
+#: code:addons/sale/sale.py:1015
+#: code:addons/sale/sale.py:1033
#, python-format
msgid "Error !"
msgstr "Fout !"
#. module: sale
-#: code:addons/sale/sale.py:570
+#: code:addons/sale/sale.py:603
#, python-format
msgid "Could not cancel sales order !"
msgstr "Kan verkooporder niet annuleren !"
#. module: sale
+#: view:sale.order:0
+msgid "Qty(UoM)"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered Year of the sales order"
+msgstr ""
+
+#. module: sale
#: selection:sale.report,month:0
msgid "July"
msgstr "Juli"
@@ -1211,36 +1382,26 @@ msgid "Shipping Exception"
msgstr "Verzenduitzondering"
#. module: sale
-#: field:sale.make.invoice,grouped:0
-msgid "Group the invoices"
-msgstr "Groepeer de facturen"
-
-#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Shipping & Manual Invoice"
-msgstr "Verzenden & handmatig factureren"
-
-#. module: sale
-#: code:addons/sale/sale.py:1051
+#: code:addons/sale/sale.py:1143
#, python-format
-msgid "Picking Information !"
-msgstr "Picking informatie !"
+msgid "Picking Information ! : "
+msgstr ""
#. module: sale
-#: view:sale.report:0
-#: field:sale.report,month:0
-msgid "Month"
-msgstr "Maand"
+#: field:sale.make.invoice,grouped:0
+msgid "Group the invoices"
+msgstr "Groepeer de facturen"
#. module: sale
-#: model:ir.module.module,shortdesc:sale.module_meta_information
-msgid "Sales Management"
-msgstr "Verkoopbeheer"
+#: field:sale.order,order_policy:0
+msgid "Invoice Policy"
+msgstr ""
#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Invoice From The Picking"
-msgstr "Factuur van pakbon"
+#: model:ir.actions.act_window,name:sale.action_config_picking_policy
+#: view:sale.config.picking_policy:0
+msgid "Setup your Invoicing Method"
+msgstr ""
#. module: sale
#: model:process.node,note:sale.process_node_invoice0
@@ -1249,32 +1410,31 @@ msgstr "Te controleren door de boekhouder."
#. module: sale
#: view:sale.report:0
-#: field:sale.report,uom_name:0
msgid "Reference UoM"
msgstr "Referentie eenheid"
#. module: sale
+#: view:sale.config.picking_policy:0
+msgid ""
+"This tool will help you to install the right module and configure the system "
+"according to the method you use to invoice your customers."
+msgstr ""
+
+#. module: sale
#: model:ir.model,name:sale.model_sale_order_line_make_invoice
msgid "Sale OrderLine Make_invoice"
msgstr "Verkooporderregel factuur maken"
#. module: sale
-#: help:sale.config.picking_policy,step:0
-msgid ""
-"By default, OpenERP is able to manage complex routing and paths of products "
-"in your warehouse and partner locations. This will configure the most common "
-"and simple methods to deliver products to the customer in one or two "
-"operations by the worker."
-msgstr ""
-"OpenERP is standaard in staat om complexe routing paden voor producten in uw "
-"magazijn en relatie locaties te beheren. Dit zal de meest algemene en "
-"eenvoudige methodes voor product levering aan klanten configureren voor één "
-"of twee bewerkingen door de medewerker."
+#: selection:sale.order,state:0
+#: selection:sale.report,state:0
+msgid "Invoice Exception"
+msgstr "Factuur uitzondering"
#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_tree
-msgid "Old Quotations"
-msgstr "Oude offertes"
+#: model:process.node,note:sale.process_node_saleorder0
+msgid "Drives procurement and invoicing"
+msgstr "Stuurt verwerving en facturatie aan"
#. module: sale
#: field:sale.order,invoiced:0
@@ -1289,6 +1449,22 @@ msgid "Sales Analysis"
msgstr "Verkoop analyse"
#. module: sale
+#: code:addons/sale/sale.py:1138
+#, python-format
+msgid ""
+"You selected a quantity of %d Units.\n"
+"But it's not compatible with the selected packaging.\n"
+"Here is a proposition of quantities according to the packaging:\n"
+"EAN: %s Quantity: %s Type of ul: %s"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Recreate Packing"
+msgstr "Pakbon opnieuw maken"
+
+#. module: sale
+#: view:sale.order:0
#: field:sale.order.line,property_ids:0
msgid "Properties"
msgstr "Waarden"
@@ -1320,7 +1496,17 @@ msgstr ""
"leveringen."
#. module: sale
-#: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
+#: view:sale.order.line:0
+msgid "Confirmed sale order lines, not yet delivered"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:473
+#, python-format
+msgid "Customer Invoices"
+msgstr ""
+
+#. module: sale
#: model:process.process,name:sale.process_process_salesprocess0
#: view:sale.order:0
#: view:sale.report:0
@@ -1342,18 +1528,13 @@ msgid "Done"
msgstr "Gereed"
#. module: sale
-#: model:ir.model,name:sale.model_sale_installer
-msgid "sale.installer"
-msgstr "sale.installer"
-
-#. module: sale
#: model:process.node,name:sale.process_node_invoice0
#: model:process.node,name:sale.process_node_invoiceafterdelivery0
msgid "Invoice"
msgstr "Factuur"
#. module: sale
-#: code:addons/sale/sale.py:1014
+#: code:addons/sale/sale.py:1158
#, python-format
msgid ""
"You have to select a customer in the sales form !\n"
@@ -1363,11 +1544,6 @@ msgstr ""
"Kies eerst een klant voordat u een product kiest."
#. module: sale
-#: selection:sale.config.picking_policy,step:0
-msgid "Picking List & Delivery Order"
-msgstr "Picklijst en afleveropdracht"
-
-#. module: sale
#: field:sale.order,origin:0
msgid "Source Document"
msgstr "Bron document"
@@ -1393,7 +1569,7 @@ msgid "The amount without tax."
msgstr "Het bedrag zonder BTW."
#. module: sale
-#: code:addons/sale/sale.py:571
+#: code:addons/sale/sale.py:604
#, python-format
msgid "You must first cancel all picking attached to this sales order."
msgstr "U moet eerst alle picking bij deze verkooporder annuleren."
@@ -1404,9 +1580,15 @@ msgid "Sales Advance Payment Invoice"
msgstr "Verkoop vooruibetaling factuur"
#. module: sale
-#: field:sale.order,incoterm:0
-msgid "Incoterm"
-msgstr "Leveringsconditie"
+#: view:sale.report:0
+#: field:sale.report,month:0
+msgid "Month"
+msgstr "Maand"
+
+#. module: sale
+#: model:email.template,subject:sale.email_template_edi_sale
+msgid "${object.company_id.name} Order (Ref ${object.name or 'n/a' })"
+msgstr ""
#. module: sale
#: view:sale.order.line:0
@@ -1417,11 +1599,6 @@ msgid "Product"
msgstr "Product"
#. module: sale
-#: model:ir.ui.menu,name:sale.menu_invoiced
-msgid "Invoicing"
-msgstr "Facturatie"
-
-#. module: sale
#: model:process.transition.action,name:sale.process_transition_action_cancelassignation0
msgid "Cancel Assignation"
msgstr "Annuleer toewijzing"
@@ -1432,21 +1609,11 @@ msgid "sale.config.picking_policy"
msgstr "sale.config.picking_policy"
#. module: sale
-#: help:sale.order,state:0
-msgid ""
-"Gives the state of the quotation or sales order. \n"
-"The exception state is automatically set when a cancel operation occurs in "
-"the invoice validation (Invoice Exception) or in the picking list process "
-"(Shipping Exception). \n"
-"The 'Waiting Schedule' state is set when the invoice is confirmed but "
-"waiting for the scheduler to run on the date 'Ordered Date'."
+#: view:account.invoice.report:0
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_turnover_by_month
+msgid "Monthly Turnover"
msgstr ""
-"Geeft de status van de offerte of verkooporder. \n"
-"De uitzondering status wordt automatisch gezet als een annuleer bewerking "
-"voorkomt in de factuur validatie (Factuur uitzondering) of in het licklijst "
-"proces (Levering uitzondering). \n"
-"De 'Wacht Planning' status wordt gezet als de factuur is bevestigd maar "
-"wacht op de planning te lopen op de 'Bestelde datum'."
#. module: sale
#: field:sale.order,invoice_quantity:0
@@ -1464,7 +1631,6 @@ msgid "Product UoS"
msgstr "Artikel UoS"
#. module: sale
-#: selection:sale.order,state:0
#: selection:sale.report,state:0
msgid "Manual In Progress"
msgstr "Handmatig in behandeling"
@@ -1485,7 +1651,8 @@ msgid "Order"
msgstr "Order"
#. module: sale
-#: code:addons/sale/sale.py:921
+#: code:addons/sale/sale.py:1016
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:71
#, python-format
msgid "There is no income account defined for this product: \"%s\" (id:%d)"
msgstr ""
@@ -1510,7 +1677,7 @@ msgstr ""
"verkoper."
#. module: sale
-#: code:addons/sale/sale.py:1116
+#: code:addons/sale/sale.py:1238
#, python-format
msgid ""
"You plan to sell %.2f %s but you only have %.2f %s available !\n"
@@ -1541,11 +1708,10 @@ msgid "Total"
msgstr "Totaal"
#. module: sale
-#: code:addons/sale/sale.py:388
-#, python-format
-msgid "There is no sales journal defined for this company: \"%s\" (id:%d)"
-msgstr ""
-"Er is geen verkoopdagboek gedefinieerd voor dit bedrijf: \"%s\" (id:%d)"
+#: report:sale.order:0
+#: view:sale.order.line:0
+msgid "Price"
+msgstr "Prijs"
#. module: sale
#: model:process.transition,note:sale.process_transition_deliver0
@@ -1559,10 +1725,15 @@ msgstr ""
"handmatig of automatisch."
#. module: sale
-#: code:addons/sale/sale.py:1165
-#, python-format
-msgid "Cannot delete a sales order line which is %s !"
-msgstr "Kan geen verkooporderregel verwijderen die %s is !"
+#: selection:sale.order,order_policy:0
+msgid "Pay before delivery"
+msgstr ""
+
+#. module: sale
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.open_board_sales
+msgid "Sales Dashboard"
+msgstr ""
#. module: sale
#: model:ir.actions.act_window,name:sale.action_sale_order_make_invoice
@@ -1573,6 +1744,7 @@ msgstr "Maak facturen"
#. module: sale
#: view:sale.order:0
+#: selection:sale.order,state:0
#: view:sale.order.line:0
msgid "To Invoice"
msgstr "Te factureren"
@@ -1583,6 +1755,11 @@ msgid "Date on which sales order is confirmed."
msgstr "Datum waarop de verkooporder is bevestigd."
#. module: sale
+#: field:sale.order,project_id:0
+msgid "Contract/Analytic Account"
+msgstr ""
+
+#. module: sale
#: field:sale.order,company_id:0
#: field:sale.order.line,company_id:0
#: view:sale.report:0
@@ -1602,10 +1779,12 @@ msgid "The amount to be invoiced in advance."
msgstr "Het bedrag dat vooruit gefactureerd wordt."
#. module: sale
-#: selection:sale.order,state:0
-#: selection:sale.report,state:0
-msgid "Invoice Exception"
-msgstr "Factuur uitzondering"
+#: code:addons/sale/sale.py:1256
+#, python-format
+msgid ""
+"Couldn't find a pricelist line matching this product and quantity.\n"
+"You have to change either the product, the quantity or the pricelist."
+msgstr ""
#. module: sale
#: help:sale.order,picking_ids:0
@@ -1614,15 +1793,6 @@ msgid ""
msgstr "Dit is de picklijst die door de verkooporder is gegenereerd."
#. module: sale
-#: help:sale.installer,sale_margin:0
-msgid ""
-"Gives the margin of profitability by calculating the difference between Unit "
-"Price and Cost Price."
-msgstr ""
-"Geeft de marge van winstgevendheid door het verschil te berekenen tussen "
-"stuksprijs en kostprijs."
-
-#. module: sale
#: view:sale.make.invoice:0
#: view:sale.order.line.make.invoice:0
msgid "Create invoices"
@@ -1641,6 +1811,11 @@ msgid "Cancelled"
msgstr "Geannuleerd"
#. module: sale
+#: view:sale.order.line:0
+msgid "Sales Order Lines related to a Sales Order of mine"
+msgstr ""
+
+#. module: sale
#: model:ir.actions.act_window,name:sale.action_shop_form
#: model:ir.ui.menu,name:sale.menu_action_shop_form
#: field:sale.order,shop_id:0
@@ -1650,17 +1825,12 @@ msgid "Shop"
msgstr "Verkooppunten"
#. module: sale
-#: view:sale.report:0
-msgid " Month "
-msgstr " Maand "
-
-#. module: sale
#: field:sale.report,date_confirm:0
msgid "Date Confirm"
msgstr "Datum bevestigd"
#. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:111
+#: code:addons/sale/wizard/sale_line_invoice.py:113
#, python-format
msgid "Warning"
msgstr "Waarschuwing"
@@ -1672,22 +1842,6 @@ msgid "Sales by Month"
msgstr "Omzet per maand"
#. module: sale
-#: code:addons/sale/sale.py:1045
-#, python-format
-msgid ""
-"You selected a quantity of %d Units.\n"
-"But it's not compatible with the selected packaging.\n"
-"Here is a proposition of quantities according to the packaging:\n"
-"\n"
-"EAN: %s Quantity: %s Type of ul: %s"
-msgstr ""
-"U heeft een aantal van %d stuks geselecteerd.\n"
-"Dat is echter niet verenigbaar met de geselecteerde verpakking.\n"
-"Hier is een voorstel van aantallen volgens de verpakking:\n"
-"\n"
-"EAN: %s Aantal: %s Soort: %s"
-
-#. module: sale
#: model:ir.model,name:sale.model_sale_order
#: model:process.node,name:sale.process_node_order0
#: model:process.node,name:sale.process_node_saleorder0
@@ -1703,6 +1857,11 @@ msgid "Quantity (UoS)"
msgstr "Aantal (UoS)"
#. module: sale
+#: view:sale.order.line:0
+msgid "Sale Order Lines that are in 'done' state"
+msgstr ""
+
+#. module: sale
#: model:process.transition,note:sale.process_transition_packing0
msgid ""
"The Pick List form is created as soon as the sales order is confirmed, in "
@@ -1721,6 +1880,11 @@ msgid "Confirmed"
msgstr "Bevestigd"
#. module: sale
+#: field:sale.config.picking_policy,order_policy:0
+msgid "Main Method Based On"
+msgstr ""
+
+#. module: sale
#: model:process.transition.action,name:sale.process_transition_action_confirm0
msgid "Confirm"
msgstr "Bevestig"
@@ -1743,6 +1907,7 @@ msgid "Invoice Lines"
msgstr "Factuurregels"
#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_product_tree
#: view:sale.order:0
#: view:sale.order.line:0
msgid "Sales Order Lines"
@@ -1759,32 +1924,18 @@ msgid "Configuration"
msgstr "Instellingen"
#. module: sale
-#: selection:sale.order,picking_policy:0
-msgid "Complete Delivery"
-msgstr "Complete zending"
+#: code:addons/sale/edi/sale_order.py:146
+#, python-format
+msgid "EDI Pricelist (%s)"
+msgstr ""
#. module: sale
#: view:sale.report:0
-msgid " Month-1 "
-msgstr " Maand-1 "
-
-#. module: sale
-#: help:sale.config.picking_policy,picking_policy:0
-msgid ""
-"The Shipping Policy is used to configure per order if you want to deliver as "
-"soon as possible when one product is available or you wait that all products "
-"are available.."
+msgid "Sales order created in current year"
msgstr ""
-"Het afleverbeleid wordt gebruikt om per order te configureren of zo snel "
-"mogelijk wordt geleverd of wordt gewacht tot alle producten beschikbaar zijn."
#. module: sale
-#: selection:sale.report,month:0
-msgid "August"
-msgstr "Augustus"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:111
+#: code:addons/sale/wizard/sale_line_invoice.py:113
#, python-format
msgid ""
"Invoice cannot be created for this Sales Order Line due to one of the "
@@ -1798,6 +1949,11 @@ msgstr ""
"2. de verkooporderregel is al gefactureerd!"
#. module: sale
+#: view:sale.order.line:0
+msgid "Sale order lines done"
+msgstr ""
+
+#. module: sale
#: field:sale.order.line,th_weight:0
msgid "Weight"
msgstr "Gewicht"
@@ -1816,7 +1972,6 @@ msgstr "December"
#. module: sale
#: field:sale.config.picking_policy,config_logo:0
-#: field:sale.installer,config_logo:0
msgid "Image"
msgstr "Afbeelding"
@@ -1849,9 +2004,9 @@ msgid "Salesman"
msgstr "Verkoper"
#. module: sale
-#: model:process.node,note:sale.process_node_saleorder0
-msgid "Drives procurement and invoicing"
-msgstr "Stuurt verwerving en facturatie aan"
+#: model:ir.actions.act_window,name:sale.action_order_tree
+msgid "Old Quotations"
+msgstr "Oude offertes"
#. module: sale
#: field:sale.order,amount_untaxed:0
@@ -1859,7 +2014,7 @@ msgid "Untaxed Amount"
msgstr "Netto Bedrag"
#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:163
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:170
#: model:ir.actions.act_window,name:sale.action_view_sale_advance_payment_inv
#: view:sale.advance.payment.inv:0
#: view:sale.order:0
@@ -1868,7 +2023,7 @@ msgid "Advance Invoice"
msgstr "Vooruitbetalen"
#. module: sale
-#: code:addons/sale/sale.py:591
+#: code:addons/sale/sale.py:624
#, python-format
msgid "The sales order '%s' has been cancelled."
msgstr "De verkooporder '%s' is geannuleerd."
@@ -1913,20 +2068,20 @@ msgid "Packings"
msgstr "Verpakkingen"
#. module: sale
-#: field:sale.config.picking_policy,progress:0
-#: field:sale.installer,progress:0
-msgid "Configuration Progress"
-msgstr "Configuratievoortgang"
+#: view:sale.order.line:0
+msgid "Sale Order Lines ready to be invoiced"
+msgstr ""
#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_product_tree
-msgid "Product sales"
-msgstr "Productverkopen"
+#: view:sale.report:0
+msgid "Sales order created in last month"
+msgstr ""
#. module: sale
-#: field:sale.order,date_order:0
-msgid "Ordered Date"
-msgstr "Datum besteld"
+#: model:ir.actions.act_window,name:sale.action_email_templates
+#: model:ir.ui.menu,name:sale.menu_email_templates
+msgid "Email Templates"
+msgstr ""
#. module: sale
#: model:ir.actions.act_window,name:sale.action_order_form
@@ -1936,14 +2091,15 @@ msgid "Sales Orders"
msgstr "Verkooporders"
#. module: sale
-#: selection:sale.config.picking_policy,picking_policy:0
-msgid "Direct Delivery"
-msgstr "Deelleveringen"
+#: model:ir.model,name:sale.model_sale_shop
+#: view:sale.shop:0
+msgid "Sales Shop"
+msgstr "Verkoopfiliaal"
#. module: sale
-#: field:sale.installer,sale_journal:0
-msgid "Invoicing journals"
-msgstr "Facturatie dagboek"
+#: selection:sale.report,month:0
+msgid "November"
+msgstr "November"
#. module: sale
#: field:sale.advance.payment.inv,product_id:0
@@ -1951,18 +2107,12 @@ msgid "Advance Product"
msgstr "Voorlopig product"
#. module: sale
-#: view:sale.report:0
-#: field:sale.report,shipped_qty_1:0
-msgid "Shipped Qty"
-msgstr "Geleverd aantal"
-
-#. module: sale
-#: view:sale.open.invoice:0
-msgid "You invoice has been successfully created!"
-msgstr "De factuur is met succes gemaakt!"
+#: view:sale.order:0
+msgid "Compute"
+msgstr "Bereken"
#. module: sale
-#: code:addons/sale/sale.py:585
+#: code:addons/sale/sale.py:618
#, python-format
msgid "You must first cancel all invoices attached to this sales order."
msgstr ""
@@ -1975,25 +2125,15 @@ msgid "January"
msgstr "Januari"
#. module: sale
-#: view:sale.installer:0
-msgid "Configure Your Sales Management Application"
-msgstr "Uw verkoopbeheer applicatie configureren"
-
-#. module: sale
#: model:ir.actions.act_window,name:sale.action_order_tree4
msgid "Sales Order in Progress"
msgstr "Lopende verkooporders"
#. module: sale
-#: field:sale.installer,sale_layout:0
-msgid "Sales Order Layout Improvement"
-msgstr "Verkooporder layout verbetering"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:63
-#, python-format
-msgid "Error"
-msgstr "Fout"
+#: help:sale.order,origin:0
+msgid "Reference of the document that generated this sales order request."
+msgstr ""
+"Referentie van het document dat deze verkooporder aanvraag genereerde."
#. module: sale
#: view:sale.report:0
@@ -2002,6 +2142,11 @@ msgid "Commitment Delay"
msgstr "Toezegging vertraging"
#. module: sale
+#: selection:sale.order,order_policy:0
+msgid "Deliver & invoice on demand"
+msgstr ""
+
+#. module: sale
#: model:process.node,note:sale.process_node_saleprocurement0
msgid ""
"One Procurement order for each sales order line and for each of the "
@@ -2026,13 +2171,12 @@ msgid "Confirmed sales order to invoice."
msgstr "Bevestigde verkooporder naar factuur."
#. module: sale
-#: code:addons/sale/sale.py:290
-#, python-format
-msgid "Cannot delete Sales Order(s) which are already confirmed !"
-msgstr "Kan geen verkooporder(s) verwijderen die al bevestigd zijn !"
+#: view:sale.order:0
+msgid "Sales Order that haven't yet been confirmed"
+msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:316
+#: code:addons/sale/sale.py:322
#, python-format
msgid "The sales order '%s' has been set in draft state."
msgstr "De verkooporder '%s' is in status concept gezet."
@@ -2043,37 +2187,27 @@ msgid "from stock"
msgstr "Uit Voorraad"
#. module: sale
-#: field:sale.config.picking_policy,order_policy:0
-msgid "Shipping Default Policy"
-msgstr "Standaard verzendmethode"
-
-#. module: sale
#: view:sale.open.invoice:0
msgid "Close"
msgstr "Sluiten"
#. module: sale
+#: code:addons/sale/sale.py:1248
+#, python-format
+msgid "No Pricelist ! : "
+msgstr ""
+
+#. module: sale
#: field:sale.order,shipped:0
msgid "Delivered"
msgstr "Geleverd"
#. module: sale
-#: code:addons/sale/sale.py:1115
-#, python-format
-msgid "Not enough stock !"
-msgstr "Niet genoeg voorraad !"
-
-#. module: sale
#: constraint:stock.move:0
msgid "You must assign a production lot for this product"
msgstr "U moet een productie partij toewijzen voor dit product"
#. module: sale
-#: field:sale.order.line,sequence:0
-msgid "Layout Sequence"
-msgstr "Layout volgorde"
-
-#. module: sale
#: model:ir.actions.act_window,help:sale.action_shop_form
msgid ""
"If you have more than one shop reselling your company products, you can "
@@ -2104,12 +2238,6 @@ msgid "May"
msgstr "Mei"
#. module: sale
-#: help:sale.installer,sale_order_dates:0
-msgid "Adds commitment, requested and effective dates on Sales Orders."
-msgstr ""
-"Voegt toegezegde, gevraagde en werkelijke data toe aan verkooporders."
-
-#. module: sale
#: view:sale.order:0
#: field:sale.order,partner_id:0
#: field:sale.order.line,order_partner_id:0
@@ -2117,25 +2245,11 @@ msgid "Customer"
msgstr "Klant"
#. module: sale
-#: model:product.template,name:sale.advance_product_0_product_template
-msgid "Advance"
-msgstr "Voorschot"
-
-#. module: sale
#: selection:sale.report,month:0
msgid "February"
msgstr "Februari"
#. module: sale
-#: help:sale.installer,sale_journal:0
-msgid ""
-"Allows you to group and invoice your delivery orders according to different "
-"invoicing types: daily, weekly, etc."
-msgstr ""
-"Laat u afleveropdrachten groeperen en factureren volgens de verschillende "
-"factuursoorten: dagelijks, wekelijks, etc."
-
-#. module: sale
#: selection:sale.report,month:0
msgid "April"
msgstr "April"
@@ -2146,11 +2260,6 @@ msgid "Accounting"
msgstr "Boekhouding"
#. module: sale
-#: field:sale.config.picking_policy,step:0
-msgid "Steps To Deliver a Sales Order"
-msgstr "Stappen om een verkooporder te leveren."
-
-#. module: sale
#: view:sale.order:0
#: view:sale.order.line:0
msgid "Search Sales Order"
@@ -2162,20 +2271,18 @@ msgid "Sales Order Requisition"
msgstr "Verkooporder aanvraag"
#. module: sale
+#: code:addons/sale/sale.py:1242
+#, python-format
+msgid "Not enough stock ! : "
+msgstr ""
+
+#. module: sale
#: report:sale.order:0
#: field:sale.order,payment_term:0
msgid "Payment Term"
msgstr "Betalingsconditie"
#. module: sale
-#: help:sale.installer,sale_layout:0
-msgid ""
-"Provides some features to improve the layout of the Sales Order reports."
-msgstr ""
-"Biedt een aantal functies om de layout van de verkooporder overzichten te "
-"verbeteren."
-
-#. module: sale
#: model:ir.actions.act_window,help:sale.action_order_report_all
msgid ""
"This report performs analysis on your quotations and sales orders. Analysis "
@@ -2212,6 +2319,9 @@ msgstr "Jaar"
msgid "Invoice Based on Deliveries"
msgstr "Facturatie gebaseer op leveringen"
+#~ msgid "Partial Delivery"
+#~ msgstr "Deellevering"
+
#~ msgid "Recreate Procurement"
#~ msgstr "Vraag opnieuw aan"
@@ -2356,12 +2466,12 @@ msgstr "Facturatie gebaseer op leveringen"
#~ msgid "Procurement for each line"
#~ msgstr "Levering voor elke regel"
-#~ msgid "My Quotations"
-#~ msgstr "Mijn offerte-aanvragen"
-
#~ msgid "Packing Default Policy"
#~ msgstr "Standaard verpakmethode"
+#~ msgid "Shipping Default Policy"
+#~ msgstr "Standaard verzendmethode"
+
#, python-format
#~ msgid "Could not cancel sale order !"
#~ msgstr "Verkooporder kan niet geannuleerd worden!"
@@ -2393,6 +2503,9 @@ msgstr "Facturatie gebaseer op leveringen"
#~ msgid "Procurement Corrected"
#~ msgstr "Aangepaste levering"
+#~ msgid "Shipping & Manual Invoice"
+#~ msgstr "Verzenden & handmatig factureren"
+
#~ msgid "Sale Procurement"
#~ msgstr "Uitlevering verkoop"
@@ -2405,6 +2518,9 @@ msgstr "Facturatie gebaseer op leveringen"
#~ msgid "Packing Policy"
#~ msgstr "Pakbonnen instellingen"
+#~ msgid "Product sales"
+#~ msgstr "Productverkopen"
+
#~ msgid "Our Salesman"
#~ msgstr "Onze verkoper"
@@ -2431,6 +2547,9 @@ msgstr "Facturatie gebaseer op leveringen"
#~ msgid "Make Invoice"
#~ msgstr "Maak factuur"
+#~ msgid "Delivery Order Only"
+#~ msgstr "Alleen leveringsopdracht"
+
#~ msgid "Sales order lines"
#~ msgstr "Verkooporderregels"
@@ -2488,6 +2607,9 @@ msgstr "Facturatie gebaseer op leveringen"
#~ msgid "Open Advance Invoice"
#~ msgstr "Open vooruitgefactureerde factuur"
+#~ msgid "Sales Management"
+#~ msgstr "Verkoopbeheer"
+
#~ msgid "Deliver"
#~ msgstr "Lever"
@@ -2586,3 +2708,274 @@ msgstr "Facturatie gebaseer op leveringen"
#~ msgid "Related Packing"
#~ msgstr "Gerelateerde verzending"
+
+#~ msgid "Configure Sales Order Logistics"
+#~ msgstr "Verkooporder logistiek configureren"
+
+#~ msgid "Payment Before Delivery"
+#~ msgstr "Vooruitbetaling"
+
+#~ msgid "Configure Picking Policy for Sales Order"
+#~ msgstr "Verzamelbeleid voor verkooporder configureren."
+
+#~ msgid "Configure"
+#~ msgstr "Configureren"
+
+#~ msgid ""
+#~ "The Shipping Policy is used to synchronise invoice and delivery operations.\n"
+#~ " - The 'Pay Before delivery' choice will first generate the invoice and "
+#~ "then generate the picking order after the payment of this invoice.\n"
+#~ " - The 'Shipping & Manual Invoice' will create the picking order directly "
+#~ "and wait for the user to manually click on the 'Invoice' button to generate "
+#~ "the draft invoice.\n"
+#~ " - The 'Invoice On Order After Delivery' choice will generate the draft "
+#~ "invoice based on sales order after all picking lists have been finished.\n"
+#~ " - The 'Invoice From The Picking' choice is used to create an invoice "
+#~ "during the picking process."
+#~ msgstr ""
+#~ "Het leveringsbeleid wordt gebruikt om facturatie en leverings bewerkingen te "
+#~ "synchroniseren.\n"
+#~ " - De 'Vooruitbetaling' keuze genereert eerst de factuur en genereert de "
+#~ "pakbon na betaling van de factuur.\n"
+#~ " - De 'Leveren & Handmatig factureren' keuze maakt de pakbon direct en "
+#~ "wacht met het genereren van een concept factuur totdat de gebruiker de "
+#~ "'Factureren' knop drukt.\n"
+#~ " - De 'Factuur op order na levering' keuze genereert de concept factuur "
+#~ "gebaseerd op de verkooporder nadat alle pakbonnen gereed zijn. \n"
+#~ " - De 'Factuur van pakbon' keuze wordt gebruikt om een factuur te maken "
+#~ "gedurende het verzamel proces."
+
+#~ msgid "Enhance your core Sales Application with additional functionalities."
+#~ msgstr "De basis verkoop applicatie verbeteren met aanvullende functies."
+
+#~ msgid "Setup your sales workflow and default values."
+#~ msgstr "Stel uw verkoop workflow en standaard waarden in."
+
+#~ msgid "Order Reference must be unique !"
+#~ msgstr "Orderreferentie moet uniek zijn!"
+
+#~ msgid "Invoice On Order After Delivery"
+#~ msgstr "Factuur op order na levering"
+
+#~ msgid " Year "
+#~ msgstr " Jaar "
+
+#~ msgid "Sales Order Dates"
+#~ msgstr "Verkooporder data"
+
+#~ msgid "Margins in Sales Orders"
+#~ msgstr "Merges in verkooporders"
+
+#~ msgid "Picking Default Policy"
+#~ msgstr "Standaard verzamelbeleid"
+
+#, python-format
+#~ msgid "You cannot cancel a sales order line that has already been invoiced !"
+#~ msgstr "U kunt geen verkooporderregel annuleren die al gefactureerd is!"
+
+#~ msgid "Sales Application Configuration"
+#~ msgstr "Verkoop applicatie configuratie"
+
+#~ msgid "Delivery Costs"
+#~ msgstr "Afleveringskosten"
+
+#~ msgid "title"
+#~ msgstr "titel"
+
+#~ msgid "Order date"
+#~ msgstr "Orderdatum"
+
+#, python-format
+#~ msgid "Picking Information !"
+#~ msgstr "Picking informatie !"
+
+#~ msgid "Invoice From The Picking"
+#~ msgstr "Factuur van pakbon"
+
+#~ msgid "sale.installer"
+#~ msgstr "sale.installer"
+
+#~ msgid ""
+#~ "By default, OpenERP is able to manage complex routing and paths of products "
+#~ "in your warehouse and partner locations. This will configure the most common "
+#~ "and simple methods to deliver products to the customer in one or two "
+#~ "operations by the worker."
+#~ msgstr ""
+#~ "OpenERP is standaard in staat om complexe routing paden voor producten in uw "
+#~ "magazijn en relatie locaties te beheren. Dit zal de meest algemene en "
+#~ "eenvoudige methodes voor product levering aan klanten configureren voor één "
+#~ "of twee bewerkingen door de medewerker."
+
+#~ msgid ""
+#~ "Gives the state of the quotation or sales order. \n"
+#~ "The exception state is automatically set when a cancel operation occurs in "
+#~ "the invoice validation (Invoice Exception) or in the picking list process "
+#~ "(Shipping Exception). \n"
+#~ "The 'Waiting Schedule' state is set when the invoice is confirmed but "
+#~ "waiting for the scheduler to run on the date 'Ordered Date'."
+#~ msgstr ""
+#~ "Geeft de status van de offerte of verkooporder. \n"
+#~ "De uitzondering status wordt automatisch gezet als een annuleer bewerking "
+#~ "voorkomt in de factuur validatie (Factuur uitzondering) of in het licklijst "
+#~ "proces (Levering uitzondering). \n"
+#~ "De 'Wacht Planning' status wordt gezet als de factuur is bevestigd maar "
+#~ "wacht op de planning te lopen op de 'Bestelde datum'."
+
+#~ msgid "Picking List & Delivery Order"
+#~ msgstr "Picklijst en afleveropdracht"
+
+#~ msgid "Invoicing"
+#~ msgstr "Facturatie"
+
+#, python-format
+#~ msgid "Cannot delete a sales order line which is %s !"
+#~ msgstr "Kan geen verkooporderregel verwijderen die %s is !"
+
+#~ msgid ""
+#~ "Gives the margin of profitability by calculating the difference between Unit "
+#~ "Price and Cost Price."
+#~ msgstr ""
+#~ "Geeft de marge van winstgevendheid door het verschil te berekenen tussen "
+#~ "stuksprijs en kostprijs."
+
+#~ msgid " Month "
+#~ msgstr " Maand "
+
+#~ msgid ""
+#~ "The Shipping Policy is used to configure per order if you want to deliver as "
+#~ "soon as possible when one product is available or you wait that all products "
+#~ "are available.."
+#~ msgstr ""
+#~ "Het afleverbeleid wordt gebruikt om per order te configureren of zo snel "
+#~ "mogelijk wordt geleverd of wordt gewacht tot alle producten beschikbaar zijn."
+
+#~ msgid " Month-1 "
+#~ msgstr " Maand-1 "
+
+#, python-format
+#~ msgid ""
+#~ "You selected a quantity of %d Units.\n"
+#~ "But it's not compatible with the selected packaging.\n"
+#~ "Here is a proposition of quantities according to the packaging:\n"
+#~ "\n"
+#~ "EAN: %s Quantity: %s Type of ul: %s"
+#~ msgstr ""
+#~ "U heeft een aantal van %d stuks geselecteerd.\n"
+#~ "Dat is echter niet verenigbaar met de geselecteerde verpakking.\n"
+#~ "Hier is een voorstel van aantallen volgens de verpakking:\n"
+#~ "\n"
+#~ "EAN: %s Aantal: %s Soort: %s"
+
+#~ msgid "Configure Your Sales Management Application"
+#~ msgstr "Uw verkoopbeheer applicatie configureren"
+
+#~ msgid "Invoicing journals"
+#~ msgstr "Facturatie dagboek"
+
+#~ msgid "Sales Order Layout Improvement"
+#~ msgstr "Verkooporder layout verbetering"
+
+#~ msgid "Ordered Date"
+#~ msgstr "Datum besteld"
+
+#~ msgid "Configuration Progress"
+#~ msgstr "Configuratievoortgang"
+
+#~ msgid "Shipped Qty"
+#~ msgstr "Geleverd aantal"
+
+#, python-format
+#~ msgid "Not enough stock !"
+#~ msgstr "Niet genoeg voorraad !"
+
+#~ msgid "Layout Sequence"
+#~ msgstr "Layout volgorde"
+
+#, python-format
+#~ msgid "Cannot delete Sales Order(s) which are already confirmed !"
+#~ msgstr "Kan geen verkooporder(s) verwijderen die al bevestigd zijn !"
+
+#~ msgid "Adds commitment, requested and effective dates on Sales Orders."
+#~ msgstr ""
+#~ "Voegt toegezegde, gevraagde en werkelijke data toe aan verkooporders."
+
+#~ msgid ""
+#~ "Allows you to group and invoice your delivery orders according to different "
+#~ "invoicing types: daily, weekly, etc."
+#~ msgstr ""
+#~ "Laat u afleveropdrachten groeperen en factureren volgens de verschillende "
+#~ "factuursoorten: dagelijks, wekelijks, etc."
+
+#~ msgid "Advance"
+#~ msgstr "Voorschot"
+
+#~ msgid "Steps To Deliver a Sales Order"
+#~ msgstr "Stappen om een verkooporder te leveren."
+
+#~ msgid ""
+#~ "Provides some features to improve the layout of the Sales Order reports."
+#~ msgstr ""
+#~ "Biedt een aantal functies om de layout van de verkooporder overzichten te "
+#~ "verbeteren."
+
+#~ msgid "Direct Delivery"
+#~ msgstr "Deelleveringen"
+
+#~ msgid ""
+#~ "\n"
+#~ " The base module to manage quotations and sales orders.\n"
+#~ "\n"
+#~ " * Workflow with validation steps:\n"
+#~ " - Quotation -> Sales order -> Invoice\n"
+#~ " * Invoicing methods:\n"
+#~ " - Invoice on order (before or after shipping)\n"
+#~ " - Invoice on delivery\n"
+#~ " - Invoice on timesheets\n"
+#~ " - Advance invoice\n"
+#~ " * Partners preferences (shipping, invoicing, incoterm, ...)\n"
+#~ " * Products stocks and prices\n"
+#~ " * Delivery methods:\n"
+#~ " - all at once, multi-parcel\n"
+#~ " - delivery costs\n"
+#~ " * Dashboard for salesman that includes:\n"
+#~ " * Your open quotations\n"
+#~ " * Top 10 sales of the month\n"
+#~ " * Cases statistics\n"
+#~ " * Graph of sales by product\n"
+#~ " * Graph of cases of the month\n"
+#~ " "
+#~ msgstr ""
+#~ "\n"
+#~ " De basis module om offertes en verkooporders te beheren.\n"
+#~ "\n"
+#~ " * Workflow met validatie stappen:\n"
+#~ " - Offerte -> Verkooporder -> Factuur\n"
+#~ " * Facturatie methodes:\n"
+#~ " - Factuur bij order (voor of na levering)\n"
+#~ " - Factuur bij levering\n"
+#~ " - Factuur bij urenstaten\n"
+#~ " - Voorschotfactuur\n"
+#~ " * Relatie voorkeuren (levering, facturatie, voorwaarden, ...)\n"
+#~ " * Product voorraad en prijzen\n"
+#~ " * Levering methodes:\n"
+#~ " - complete leveringen, deelleveringen\n"
+#~ " - verzendkosten\n"
+#~ " * Dashboard voor verkoper die bevat:\n"
+#~ " * Uw open offertes\n"
+#~ " * Top 10 verkopen deze maand\n"
+#~ " * Dossier statistieken\n"
+#~ " * Grafiek van omzet per product\n"
+#~ " * Grafiek van dossiers per maand\n"
+#~ " "
+
+#~ msgid "All at Once"
+#~ msgstr "Complete leveringen"
+
+#~ msgid "Allows you to compute delivery costs on your quotations."
+#~ msgstr "Geeft de mogelijkheid om verzendkosten te berekenen op offertes"
+
+#~ msgid "Shipping Policy"
+#~ msgstr "Behandelwijze"
+
+#~ msgid "Complete Delivery"
+#~ msgstr "Complete zending"
diff --git a/addons/sale/i18n/oc.po b/addons/sale/i18n/oc.po
index b40a8630c3d..656d17044ae 100644
--- a/addons/sale/i18n/oc.po
+++ b/addons/sale/i18n/oc.po
@@ -7,25 +7,32 @@ msgid ""
msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-01-11 11:16+0000\n"
+"POT-Creation-Date: 2011-12-22 18:43+0000\n"
"PO-Revision-Date: 2011-11-20 09:33+0000\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: Occitan (post 1500) <oc@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-21 05:22+0000\n"
-"X-Generator: Launchpad (build 14299)\n"
+"X-Launchpad-Export-Date: 2011-12-23 06:46+0000\n"
+"X-Generator: Launchpad (build 14560)\n"
#. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_sales_by_salesman
-msgid "Sales by Salesman in last 90 days"
+#: field:sale.config.picking_policy,timesheet:0
+msgid "Based on Timesheet"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid ""
+"Sale Order Lines that are confirmed, done or in exception state and haven't "
+"yet been invoiced"
msgstr ""
#. module: sale
-#: help:sale.installer,delivery:0
-msgid "Allows you to compute delivery costs on your quotations."
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_sales_by_salesman
+msgid "Sales by Salesman in last 90 days"
msgstr ""
#. module: sale
@@ -36,6 +43,11 @@ msgid ""
msgstr ""
#. module: sale
+#: view:sale.order:0
+msgid "UoS"
+msgstr ""
+
+#. module: sale
#: help:sale.order,partner_shipping_id:0
msgid "Shipping address for current sales order."
msgstr ""
@@ -59,22 +71,12 @@ msgid "Cancel Order"
msgstr ""
#. module: sale
-#: view:sale.config.picking_policy:0
-msgid "Configure Sales Order Logistics"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:603
+#: code:addons/sale/sale.py:638
#, python-format
msgid "The quotation '%s' has been converted to a sales order."
msgstr ""
#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Payment Before Delivery"
-msgstr ""
-
-#. module: sale
#: code:addons/sale/wizard/sale_make_invoice.py:42
#, python-format
msgid "Warning !"
@@ -91,12 +93,6 @@ msgid "Drives procurement orders for every sales order line."
msgstr ""
#. module: sale
-#: selection:sale.config.picking_policy,picking_policy:0
-msgid "All at Once"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,project_id:0
#: view:sale.report:0
#: field:sale.report,analytic_account_id:0
#: field:sale.shop,project_id:0
@@ -112,6 +108,15 @@ msgid ""
msgstr ""
#. module: sale
+#: code:addons/sale/sale.py:295
+#, python-format
+msgid ""
+"In order to delete a confirmed sale order, you must cancel it before ! To "
+"cancel a sale order, you must first cancel related picking or delivery "
+"orders."
+msgstr ""
+
+#. module: sale
#: model:process.node,name:sale.process_node_saleprocurement0
msgid "Procurement Order"
msgstr ""
@@ -123,6 +128,11 @@ msgid "Partner"
msgstr ""
#. module: sale
+#: selection:sale.order,order_policy:0
+msgid "Invoice based on deliveries"
+msgstr ""
+
+#. module: sale
#: view:sale.order:0
msgid "Order Line"
msgstr ""
@@ -155,8 +165,13 @@ msgid "Default Payment Term"
msgstr ""
#. module: sale
-#: model:ir.actions.act_window,name:sale.action_config_picking_policy
-msgid "Configure Picking Policy for Sales Order"
+#: field:sale.config.picking_policy,deli_orders:0
+msgid "Based on Delivery Orders"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.picking_policy,time_unit:0
+msgid "Main Working Time Unit"
msgstr ""
#. module: sale
@@ -173,8 +188,9 @@ msgid "Disc.(%)"
msgstr ""
#. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_forceassignation0
-msgid "Force Assignation"
+#: view:sale.report:0
+#: field:sale.report,price_total:0
+msgid "Total Price"
msgstr ""
#. module: sale
@@ -183,6 +199,11 @@ msgid "Check the box to group the invoices for the same customers"
msgstr ""
#. module: sale
+#: view:sale.order:0
+msgid "My Sale Orders"
+msgstr ""
+
+#. module: sale
#: selection:sale.order,invoice_quantity:0
msgid "Ordered Quantities"
msgstr ""
@@ -221,13 +242,24 @@ msgid ""
msgstr ""
#. module: sale
+#: field:sale.config.picking_policy,task_work:0
+msgid "Based on Tasks' Work"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
+msgid "Quotations and Sales"
+msgstr ""
+
+#. module: sale
#: model:ir.model,name:sale.model_sale_make_invoice
msgid "Sales Make Invoice"
msgstr ""
#. module: sale
-#: view:sale.order:0
-msgid "Recreate Packing"
+#: code:addons/sale/sale.py:330
+#, python-format
+msgid "Pricelist Warning!"
msgstr ""
#. module: sale
@@ -236,9 +268,9 @@ msgid "Discount (%)"
msgstr ""
#. module: sale
-#: help:res.company,security_lead:0
-msgid ""
-"This is the days added to what you promise to customers for security purpose"
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_quotation_for_sale
+msgid "My Quotations"
msgstr ""
#. module: sale
@@ -264,7 +296,22 @@ msgid "Shop Name"
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:1014
+#: help:sale.order,order_policy:0
+msgid ""
+"The Invoice Policy is used to synchronise invoice and delivery operations.\n"
+" - The 'Pay before delivery' choice will first generate the invoice and "
+"then generate the picking order after the payment of this invoice.\n"
+" - The 'Deliver & Invoice on demand' will create the picking order directly "
+"and wait for the user to manually click on the 'Invoice' button to generate "
+"the draft invoice based on the sale order or the sale order lines.\n"
+" - The 'Invoice on order after delivery' choice will generate the draft "
+"invoice based on sales order after all picking lists have been finished.\n"
+" - The 'Invoice based on deliveries' choice is used to create an invoice "
+"during the picking process."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:1158
#, python-format
msgid "No Customer Defined !"
msgstr ""
@@ -275,8 +322,11 @@ msgid "Sales in Exception"
msgstr ""
#. module: sale
-#: view:sale.order:0
-msgid "Set to Draft"
+#: code:addons/sale/sale.py:1145
+#: code:addons/sale/sale.py:1264
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:70
+#, python-format
+msgid "Configuration Error !"
msgstr ""
#. module: sale
@@ -285,22 +335,7 @@ msgid "Conditions"
msgstr ""
#. module: sale
-#: help:sale.order,order_policy:0
-msgid ""
-"The Shipping Policy is used to synchronise invoice and delivery operations.\n"
-" - The 'Pay Before delivery' choice will first generate the invoice and "
-"then generate the picking order after the payment of this invoice.\n"
-" - The 'Shipping & Manual Invoice' will create the picking order directly "
-"and wait for the user to manually click on the 'Invoice' button to generate "
-"the draft invoice.\n"
-" - The 'Invoice On Order After Delivery' choice will generate the draft "
-"invoice based on sales order after all picking lists have been finished.\n"
-" - The 'Invoice From The Picking' choice is used to create an invoice "
-"during the picking process."
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:939
+#: code:addons/sale/sale.py:1034
#, python-format
msgid ""
"There is no income category account defined in default Properties for "
@@ -308,8 +343,8 @@ msgid ""
msgstr ""
#. module: sale
-#: view:sale.installer:0
-msgid "Configure"
+#: selection:sale.report,month:0
+msgid "August"
msgstr ""
#. module: sale
@@ -318,7 +353,7 @@ msgid "You try to assign a lot which is not from the same product"
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:620
+#: code:addons/sale/sale.py:655
#, python-format
msgid "invalid mode for test_state"
msgstr ""
@@ -329,7 +364,7 @@ msgid "June"
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:584
+#: code:addons/sale/sale.py:617
#, python-format
msgid "Could not cancel this sales order !"
msgstr ""
@@ -350,8 +385,12 @@ msgid "October"
msgstr ""
#. module: sale
+#: sql_constraint:stock.picking:0
+msgid "Reference must be unique per Company!"
+msgstr ""
+
+#. module: sale
#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_quotation_for_sale
#: view:sale.order:0
#: view:sale.report:0
msgid "Quotations"
@@ -363,11 +402,6 @@ msgid "Pricelist for current sales order."
msgstr ""
#. module: sale
-#: selection:sale.config.picking_policy,step:0
-msgid "Delivery Order Only"
-msgstr ""
-
-#. module: sale
#: report:sale.order:0
msgid "TVA :"
msgstr ""
@@ -392,6 +426,7 @@ msgstr ""
#. module: sale
#: view:sale.order:0
#: view:sale.order.line:0
+#: field:sale.report,product_uom:0
msgid "UoM"
msgstr ""
@@ -414,13 +449,19 @@ msgid ""
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:971
+#: code:addons/sale/sale.py:1061
+#, python-format
+msgid "You cannot cancel a sale order line that has already been invoiced!"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:1066
#, python-format
msgid "You must first cancel stock moves attached to this sales order line."
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:1042
+#: code:addons/sale/sale.py:1134
#, python-format
msgid "(n/a)"
msgstr ""
@@ -454,13 +495,35 @@ msgid "Notes"
msgstr ""
#. module: sale
+#: sql_constraint:res.company:0
+msgid "The company name must be unique !"
+msgstr ""
+
+#. module: sale
#: help:sale.order,partner_invoice_id:0
msgid "Invoice address for current sales order."
msgstr ""
#. module: sale
-#: view:sale.installer:0
-msgid "Enhance your core Sales Application with additional functionalities."
+#: view:sale.report:0
+msgid "Month-1"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered month of the sales order"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:504
+#, python-format
+msgid ""
+"You cannot group sales having different currencies for the same partner."
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,picking_policy:0
+msgid "Deliver each product when available"
msgstr ""
#. module: sale
@@ -480,13 +543,13 @@ msgid "Confirmation Date"
msgstr ""
#. module: sale
-#: field:sale.order.line,address_allotment_id:0
-msgid "Allotment Partner"
+#: field:sale.order,incoterm:0
+msgid "Incoterm"
msgstr ""
#. module: sale
-#: sql_constraint:sale.order:0
-msgid "Order Reference must be unique !"
+#: field:sale.order.line,address_allotment_id:0
+msgid "Allotment Partner"
msgstr ""
#. module: sale
@@ -495,6 +558,28 @@ msgid "March"
msgstr ""
#. module: sale
+#: constraint:stock.move:0
+msgid "You can not move products from or to a location of the type view."
+msgstr ""
+
+#. module: sale
+#: field:sale.config.picking_policy,sale_orders:0
+msgid "Based on Sales Orders"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,state:0
+msgid ""
+"Givwizard = self.browse(cr, uid, ids)[0]es the state of the quotation or "
+"sales order. \n"
+"The exception state is automatically set when a cancel operation occurs in "
+"the invoice validation (Invoice Exception) or in the picking list process "
+"(Shipping Exception). \n"
+"The 'Waiting Schedule' state is set when the invoice is confirmed but "
+"waiting for the scheduler to run on the order date."
+msgstr ""
+
+#. module: sale
#: help:sale.order,amount_total:0
msgid "The total amount."
msgstr ""
@@ -510,6 +595,11 @@ msgid "Invoice address :"
msgstr ""
#. module: sale
+#: field:sale.order.line,sequence:0
+msgid "Line Sequence"
+msgstr ""
+
+#. module: sale
#: model:process.transition,note:sale.process_transition_saleorderprocurement0
msgid ""
"For every sales order line, a procurement order is created to supply the "
@@ -556,11 +646,6 @@ msgid "Sales Order Line"
msgstr ""
#. module: sale
-#: view:sale.config.picking_policy:0
-msgid "Setup your sales workflow and default values."
-msgstr ""
-
-#. module: sale
#: field:sale.shop,warehouse_id:0
msgid "Warehouse"
msgstr ""
@@ -597,6 +682,11 @@ msgid "Creation Date"
msgstr ""
#. module: sale
+#: model:ir.ui.menu,name:sale.menu_sales_configuration_misc
+msgid "Miscellaneous"
+msgstr ""
+
+#. module: sale
#: model:ir.actions.act_window,name:sale.action_order_line_tree3
msgid "Uninvoiced and Delivered Lines"
msgstr ""
@@ -612,14 +702,19 @@ msgid "My Sales"
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:290
-#: code:addons/sale/sale.py:966
-#: code:addons/sale/sale.py:1165
+#: code:addons/sale/sale.py:295
+#: code:addons/sale/sale.py:1061
+#: code:addons/sale/sale.py:1290
#, python-format
msgid "Invalid action !"
msgstr ""
#. module: sale
+#: view:sale.order:0
+msgid "Extra Info"
+msgstr ""
+
+#. module: sale
#: field:sale.order,pricelist_id:0
#: field:sale.report,pricelist_id:0
#: field:sale.shop,pricelist_id:0
@@ -633,13 +728,21 @@ msgid "# of Qty"
msgstr ""
#. module: sale
+#: code:addons/sale/sale.py:1314
+#, python-format
+msgid "Hour"
+msgstr ""
+
+#. module: sale
#: view:sale.order:0
msgid "Order Date"
msgstr ""
#. module: sale
#: view:sale.order.line:0
+#: view:sale.report:0
#: field:sale.report,shipped:0
+#: field:sale.report,shipped_qty_1:0
msgid "Shipped"
msgstr ""
@@ -649,8 +752,8 @@ msgid "All Quotations"
msgstr ""
#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Invoice On Order After Delivery"
+#: view:sale.config.picking_policy:0
+msgid "Options"
msgstr ""
#. module: sale
@@ -659,6 +762,20 @@ msgid "September"
msgstr ""
#. module: sale
+#: code:addons/sale/sale.py:632
+#, python-format
+msgid "You cannot confirm a sale order which has no line."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:1246
+#, python-format
+msgid ""
+"You have to select a pricelist or a customer in the sales form !\n"
+"Please set one before choosing a product."
+msgstr ""
+
+#. module: sale
#: view:sale.report:0
#: field:sale.report,categ_id:0
msgid "Category of Product"
@@ -675,11 +792,6 @@ msgid "Stock Moves"
msgstr ""
#. module: sale
-#: view:sale.report:0
-msgid " Year "
-msgstr ""
-
-#. module: sale
#: field:sale.order,state:0
#: field:sale.report,state:0
msgid "Order State"
@@ -697,7 +809,7 @@ msgid "Sales By Month"
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:970
+#: code:addons/sale/sale.py:1065
#, python-format
msgid "Could not cancel sales order line!"
msgstr ""
@@ -730,41 +842,18 @@ msgid ""
msgstr ""
#. module: sale
-#: view:sale.report:0
-msgid "Extended Filters..."
+#: field:sale.order,date_order:0
+msgid "Date"
msgstr ""
#. module: sale
-#: model:ir.module.module,description:sale.module_meta_information
-msgid ""
-"\n"
-" The base module to manage quotations and sales orders.\n"
-"\n"
-" * Workflow with validation steps:\n"
-" - Quotation -> Sales order -> Invoice\n"
-" * Invoicing methods:\n"
-" - Invoice on order (before or after shipping)\n"
-" - Invoice on delivery\n"
-" - Invoice on timesheets\n"
-" - Advance invoice\n"
-" * Partners preferences (shipping, invoicing, incoterm, ...)\n"
-" * Products stocks and prices\n"
-" * Delivery methods:\n"
-" - all at once, multi-parcel\n"
-" - delivery costs\n"
-" * Dashboard for salesman that includes:\n"
-" * Your open quotations\n"
-" * Top 10 sales of the month\n"
-" * Cases statistics\n"
-" * Graph of sales by product\n"
-" * Graph of cases of the month\n"
-" "
+#: view:sale.report:0
+msgid "Extended Filters..."
msgstr ""
#. module: sale
-#: model:ir.model,name:sale.model_sale_shop
-#: view:sale.shop:0
-msgid "Sales Shop"
+#: selection:sale.order.line,state:0
+msgid "Exception"
msgstr ""
#. module: sale
@@ -773,8 +862,9 @@ msgid "Companies"
msgstr ""
#. module: sale
-#: selection:sale.report,month:0
-msgid "November"
+#: code:addons/sale/sale.py:1259
+#, python-format
+msgid "No valid pricelist line found ! :"
msgstr ""
#. module: sale
@@ -783,8 +873,8 @@ msgid "History"
msgstr ""
#. module: sale
-#: field:sale.config.picking_policy,picking_policy:0
-msgid "Picking Default Policy"
+#: selection:sale.order,order_policy:0
+msgid "Invoice on order after delivery"
msgstr ""
#. module: sale
@@ -807,13 +897,12 @@ msgid ""
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:966
-#, python-format
-msgid "You cannot cancel a sales order line that has already been invoiced !"
+#: help:res.company,security_lead:0
+msgid ""
+"This is the days added to what you promise to customers for security purpose"
msgstr ""
#. module: sale
-#: view:sale.order:0
#: view:sale.order.line:0
msgid "Qty"
msgstr ""
@@ -824,6 +913,11 @@ msgid "References"
msgstr ""
#. module: sale
+#: view:sale.order.line:0
+msgid "My Sales Order Lines"
+msgstr ""
+
+#. module: sale
#: model:process.transition.action,name:sale.process_transition_action_cancel0
#: model:process.transition.action,name:sale.process_transition_action_cancel1
#: model:process.transition.action,name:sale.process_transition_action_cancel2
@@ -835,13 +929,8 @@ msgid "Cancel"
msgstr ""
#. module: sale
-#: field:sale.installer,sale_order_dates:0
-msgid "Sales Order Dates"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order.line,state:0
-msgid "Exception"
+#: sql_constraint:sale.order:0
+msgid "Order Reference must be unique per Company!"
msgstr ""
#. module: sale
@@ -854,18 +943,18 @@ msgid "Create Invoice"
msgstr ""
#. module: sale
-#: field:sale.installer,sale_margin:0
-msgid "Margins in Sales Orders"
+#: view:sale.order:0
+msgid "Total Tax Excluded"
msgstr ""
#. module: sale
-#: view:sale.order:0
-msgid "Total Tax Excluded"
+#: view:sale.order.line:0
+msgid "Order reference"
msgstr ""
#. module: sale
-#: view:sale.order:0
-msgid "Compute"
+#: view:sale.open.invoice:0
+msgid "You invoice has been successfully created!"
msgstr ""
#. module: sale
@@ -885,22 +974,19 @@ msgid "Open Invoice"
msgstr ""
#. module: sale
-#: report:sale.order:0
-#: view:sale.order.line:0
-msgid "Price"
+#: model:ir.actions.server,name:sale.ir_actions_server_edi_sale
+msgid "Auto-email confirmed sale orders"
msgstr ""
#. module: sale
-#: model:ir.actions.act_window,name:sale.action_sale_installer
-#: view:sale.config.picking_policy:0
-#: view:sale.installer:0
-msgid "Sales Application Configuration"
+#: code:addons/sale/sale.py:413
+#, python-format
+msgid "There is no sales journal defined for this company: \"%s\" (id:%d)"
msgstr ""
#. module: sale
-#: view:sale.report:0
-#: field:sale.report,price_total:0
-msgid "Total Price"
+#: model:process.transition.action,name:sale.process_transition_action_forceassignation0
+msgid "Force Assignation"
msgstr ""
#. module: sale
@@ -914,6 +1000,11 @@ msgid "Based on the shipped or on the ordered quantities."
msgstr ""
#. module: sale
+#: selection:sale.order,picking_policy:0
+msgid "Deliver all products at once"
+msgstr ""
+
+#. module: sale
#: field:sale.order,picking_ids:0
msgid "Related Picking"
msgstr ""
@@ -945,8 +1036,14 @@ msgid "Create Delivery Order"
msgstr ""
#. module: sale
-#: field:sale.installer,delivery:0
-msgid "Delivery Costs"
+#: code:addons/sale/sale.py:1290
+#, python-format
+msgid "Cannot delete a sales order line which is in state '%s'!"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Qty(UoS)"
msgstr ""
#. module: sale
@@ -961,12 +1058,12 @@ msgstr ""
#. module: sale
#: view:sale.report:0
-msgid "Sales by Product Category"
+msgid "Ordered date of the sales order"
msgstr ""
#. module: sale
-#: selection:sale.order,picking_policy:0
-msgid "Partial Delivery"
+#: view:sale.report:0
+msgid "Sales by Product Category"
msgstr ""
#. module: sale
@@ -975,8 +1072,9 @@ msgid "Confirm Quotation"
msgstr ""
#. module: sale
-#: help:sale.order,origin:0
-msgid "Reference of the document that generated this sales order request."
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:63
+#, python-format
+msgid "Error"
msgstr ""
#. module: sale
@@ -1009,19 +1107,13 @@ msgid "Procurement Method"
msgstr ""
#. module: sale
-#: view:sale.config.picking_policy:0
-#: view:sale.installer:0
-msgid "title"
-msgstr ""
-
-#. module: sale
#: model:process.node,name:sale.process_node_packinglist0
msgid "Pick List"
msgstr ""
#. module: sale
#: view:sale.order:0
-msgid "Order date"
+msgid "Set to Draft"
msgstr ""
#. module: sale
@@ -1030,6 +1122,85 @@ msgid "Document of the move to the output or to the customer."
msgstr ""
#. module: sale
+#: model:email.template,body_text:sale.email_template_edi_sale
+msgid ""
+"\n"
+"Hello${object.partner_order_id.name and ' ' or "
+"''}${object.partner_order_id.name or ''},\n"
+"\n"
+"Here is your order confirmation for ${object.partner_id.name}:\n"
+" | Order number: *${object.name}*\n"
+" | Order total: *${object.amount_total} "
+"${object.pricelist_id.currency_id.name}*\n"
+" | Order date: ${object.date_order}\n"
+" % if object.origin:\n"
+" | Order reference: ${object.origin}\n"
+" % endif\n"
+" % if object.client_order_ref:\n"
+" | Your reference: ${object.client_order_ref}<br />\n"
+" % endif\n"
+" | Your contact: ${object.user_id.name} ${object.user_id.user_email "
+"and '<%s>'%(object.user_id.user_email) or ''}\n"
+"\n"
+"You can view the order confirmation, download it and even pay online using "
+"the following link:\n"
+" ${ctx.get('edi_web_url_view') or 'n/a'}\n"
+"\n"
+"% if object.order_policy in ('prepaid','manual') and "
+"object.company_id.paypal_account:\n"
+"<% \n"
+"comp_name = quote(object.company_id.name)\n"
+"order_name = quote(object.name)\n"
+"paypal_account = quote(object.company_id.paypal_account)\n"
+"order_amount = quote(str(object.amount_total))\n"
+"cur_name = quote(object.pricelist_id.currency_id.name)\n"
+"paypal_url = \"https://www.paypal.com/cgi-"
+"bin/webscr?cmd=_xclick&business=%s&item_name=%s%%20Order%%20%s&invoice=%s&amo"
+"unt=%s\" \\\n"
+" "
+"\"&currency_code=%s&button_subtype=services&no_note=1&bn=OpenERP_Order_PayNow"
+"_%s\" % \\\n"
+" "
+"(paypal_account,comp_name,order_name,order_name,order_amount,cur_name,cur_nam"
+"e)\n"
+"%>\n"
+"It is also possible to directly pay with Paypal:\n"
+" ${paypal_url}\n"
+"% endif\n"
+"\n"
+"If you have any question, do not hesitate to contact us.\n"
+"\n"
+"\n"
+"Thank you for choosing ${object.company_id.name}!\n"
+"\n"
+"\n"
+"--\n"
+"${object.user_id.name} ${object.user_id.user_email and "
+"'<%s>'%(object.user_id.user_email) or ''}\n"
+"${object.company_id.name}\n"
+"% if object.company_id.street:\n"
+"${object.company_id.street or ''}\n"
+"% endif\n"
+"% if object.company_id.street2:\n"
+"${object.company_id.street2}\n"
+"% endif\n"
+"% if object.company_id.city or object.company_id.zip:\n"
+"${object.company_id.zip or ''} ${object.company_id.city or ''}\n"
+"% endif\n"
+"% if object.company_id.country_id:\n"
+"${object.company_id.state_id and ('%s, ' % object.company_id.state_id.name) "
+"or ''} ${object.company_id.country_id.name or ''}\n"
+"% endif\n"
+"% if object.company_id.phone:\n"
+"Phone: ${object.company_id.phone}\n"
+"% endif\n"
+"% if object.company_id.website:\n"
+"${object.company_id.website or ''}\n"
+"% endif\n"
+" "
+msgstr ""
+
+#. module: sale
#: model:process.transition.action,name:sale.process_transition_action_validate0
msgid "Validate"
msgstr ""
@@ -1052,8 +1223,8 @@ msgid "Taxes"
msgstr ""
#. module: sale
-#: field:sale.order,order_policy:0
-msgid "Shipping Policy"
+#: view:sale.order:0
+msgid "Sales Order ready to be invoiced"
msgstr ""
#. module: sale
@@ -1073,8 +1244,8 @@ msgid "Create Invoices"
msgstr ""
#. module: sale
-#: view:sale.order:0
-msgid "Extra Info"
+#: view:sale.report:0
+msgid "Sales order created in current month"
msgstr ""
#. module: sale
@@ -1083,11 +1254,24 @@ msgid "Fax :"
msgstr ""
#. module: sale
+#: help:sale.order.line,type:0
+msgid ""
+"If 'on order', it triggers a procurement when the sale order is confirmed to "
+"create a task, purchase order or manufacturing order linked to this sale "
+"order line."
+msgstr ""
+
+#. module: sale
#: field:sale.advance.payment.inv,amount:0
msgid "Advance Amount"
msgstr ""
#. module: sale
+#: field:sale.config.picking_policy,charge_delivery:0
+msgid "Do you charge the delivery?"
+msgstr ""
+
+#. module: sale
#: selection:sale.order,invoice_quantity:0
msgid "Shipped Quantities"
msgstr ""
@@ -1098,25 +1282,45 @@ msgid "Invoice Based on Sales Orders"
msgstr ""
#. module: sale
+#: code:addons/sale/sale.py:331
+#, python-format
+msgid ""
+"If you change the pricelist of this order (and eventually the currency), "
+"prices of existing order lines will not be updated."
+msgstr ""
+
+#. module: sale
#: model:ir.model,name:sale.model_stock_picking
msgid "Picking List"
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:387
-#: code:addons/sale/sale.py:920
-#: code:addons/sale/sale.py:938
+#: code:addons/sale/sale.py:412
+#: code:addons/sale/sale.py:503
+#: code:addons/sale/sale.py:632
+#: code:addons/sale/sale.py:1015
+#: code:addons/sale/sale.py:1033
#, python-format
msgid "Error !"
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:570
+#: code:addons/sale/sale.py:603
#, python-format
msgid "Could not cancel sales order !"
msgstr ""
#. module: sale
+#: view:sale.order:0
+msgid "Qty(UoM)"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered Year of the sales order"
+msgstr ""
+
+#. module: sale
#: selection:sale.report,month:0
msgid "July"
msgstr ""
@@ -1133,35 +1337,25 @@ msgid "Shipping Exception"
msgstr ""
#. module: sale
-#: field:sale.make.invoice,grouped:0
-msgid "Group the invoices"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Shipping & Manual Invoice"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:1051
+#: code:addons/sale/sale.py:1143
#, python-format
-msgid "Picking Information !"
+msgid "Picking Information ! : "
msgstr ""
#. module: sale
-#: view:sale.report:0
-#: field:sale.report,month:0
-msgid "Month"
+#: field:sale.make.invoice,grouped:0
+msgid "Group the invoices"
msgstr ""
#. module: sale
-#: model:ir.module.module,shortdesc:sale.module_meta_information
-msgid "Sales Management"
+#: field:sale.order,order_policy:0
+msgid "Invoice Policy"
msgstr ""
#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Invoice From The Picking"
+#: model:ir.actions.act_window,name:sale.action_config_picking_policy
+#: view:sale.config.picking_policy:0
+msgid "Setup your Invoicing Method"
msgstr ""
#. module: sale
@@ -1171,27 +1365,30 @@ msgstr ""
#. module: sale
#: view:sale.report:0
-#: field:sale.report,uom_name:0
msgid "Reference UoM"
msgstr ""
#. module: sale
+#: view:sale.config.picking_policy:0
+msgid ""
+"This tool will help you to install the right module and configure the system "
+"according to the method you use to invoice your customers."
+msgstr ""
+
+#. module: sale
#: model:ir.model,name:sale.model_sale_order_line_make_invoice
msgid "Sale OrderLine Make_invoice"
msgstr ""
#. module: sale
-#: help:sale.config.picking_policy,step:0
-msgid ""
-"By default, OpenERP is able to manage complex routing and paths of products "
-"in your warehouse and partner locations. This will configure the most common "
-"and simple methods to deliver products to the customer in one or two "
-"operations by the worker."
+#: selection:sale.order,state:0
+#: selection:sale.report,state:0
+msgid "Invoice Exception"
msgstr ""
#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_tree
-msgid "Old Quotations"
+#: model:process.node,note:sale.process_node_saleorder0
+msgid "Drives procurement and invoicing"
msgstr ""
#. module: sale
@@ -1207,6 +1404,22 @@ msgid "Sales Analysis"
msgstr ""
#. module: sale
+#: code:addons/sale/sale.py:1138
+#, python-format
+msgid ""
+"You selected a quantity of %d Units.\n"
+"But it's not compatible with the selected packaging.\n"
+"Here is a proposition of quantities according to the packaging:\n"
+"EAN: %s Quantity: %s Type of ul: %s"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Recreate Packing"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
#: field:sale.order.line,property_ids:0
msgid "Properties"
msgstr ""
@@ -1233,7 +1446,17 @@ msgid ""
msgstr ""
#. module: sale
-#: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
+#: view:sale.order.line:0
+msgid "Confirmed sale order lines, not yet delivered"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:473
+#, python-format
+msgid "Customer Invoices"
+msgstr ""
+
+#. module: sale
#: model:process.process,name:sale.process_process_salesprocess0
#: view:sale.order:0
#: view:sale.report:0
@@ -1255,18 +1478,13 @@ msgid "Done"
msgstr ""
#. module: sale
-#: model:ir.model,name:sale.model_sale_installer
-msgid "sale.installer"
-msgstr ""
-
-#. module: sale
#: model:process.node,name:sale.process_node_invoice0
#: model:process.node,name:sale.process_node_invoiceafterdelivery0
msgid "Invoice"
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:1014
+#: code:addons/sale/sale.py:1158
#, python-format
msgid ""
"You have to select a customer in the sales form !\n"
@@ -1274,11 +1492,6 @@ msgid ""
msgstr ""
#. module: sale
-#: selection:sale.config.picking_policy,step:0
-msgid "Picking List & Delivery Order"
-msgstr ""
-
-#. module: sale
#: field:sale.order,origin:0
msgid "Source Document"
msgstr ""
@@ -1304,7 +1517,7 @@ msgid "The amount without tax."
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:571
+#: code:addons/sale/sale.py:604
#, python-format
msgid "You must first cancel all picking attached to this sales order."
msgstr ""
@@ -1315,8 +1528,14 @@ msgid "Sales Advance Payment Invoice"
msgstr ""
#. module: sale
-#: field:sale.order,incoterm:0
-msgid "Incoterm"
+#: view:sale.report:0
+#: field:sale.report,month:0
+msgid "Month"
+msgstr ""
+
+#. module: sale
+#: model:email.template,subject:sale.email_template_edi_sale
+msgid "${object.company_id.name} Order (Ref ${object.name or 'n/a' })"
msgstr ""
#. module: sale
@@ -1328,11 +1547,6 @@ msgid "Product"
msgstr ""
#. module: sale
-#: model:ir.ui.menu,name:sale.menu_invoiced
-msgid "Invoicing"
-msgstr ""
-
-#. module: sale
#: model:process.transition.action,name:sale.process_transition_action_cancelassignation0
msgid "Cancel Assignation"
msgstr ""
@@ -1343,14 +1557,10 @@ msgid "sale.config.picking_policy"
msgstr ""
#. module: sale
-#: help:sale.order,state:0
-msgid ""
-"Gives the state of the quotation or sales order. \n"
-"The exception state is automatically set when a cancel operation occurs in "
-"the invoice validation (Invoice Exception) or in the picking list process "
-"(Shipping Exception). \n"
-"The 'Waiting Schedule' state is set when the invoice is confirmed but "
-"waiting for the scheduler to run on the date 'Ordered Date'."
+#: view:account.invoice.report:0
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_turnover_by_month
+msgid "Monthly Turnover"
msgstr ""
#. module: sale
@@ -1369,7 +1579,6 @@ msgid "Product UoS"
msgstr ""
#. module: sale
-#: selection:sale.order,state:0
#: selection:sale.report,state:0
msgid "Manual In Progress"
msgstr ""
@@ -1390,7 +1599,8 @@ msgid "Order"
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:921
+#: code:addons/sale/sale.py:1016
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:71
#, python-format
msgid "There is no income account defined for this product: \"%s\" (id:%d)"
msgstr ""
@@ -1410,7 +1620,7 @@ msgid ""
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:1116
+#: code:addons/sale/sale.py:1238
#, python-format
msgid ""
"You plan to sell %.2f %s but you only have %.2f %s available !\n"
@@ -1439,9 +1649,9 @@ msgid "Total"
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:388
-#, python-format
-msgid "There is no sales journal defined for this company: \"%s\" (id:%d)"
+#: report:sale.order:0
+#: view:sale.order.line:0
+msgid "Price"
msgstr ""
#. module: sale
@@ -1453,9 +1663,14 @@ msgid ""
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:1165
-#, python-format
-msgid "Cannot delete a sales order line which is %s !"
+#: selection:sale.order,order_policy:0
+msgid "Pay before delivery"
+msgstr ""
+
+#. module: sale
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.open_board_sales
+msgid "Sales Dashboard"
msgstr ""
#. module: sale
@@ -1467,6 +1682,7 @@ msgstr ""
#. module: sale
#: view:sale.order:0
+#: selection:sale.order,state:0
#: view:sale.order.line:0
msgid "To Invoice"
msgstr ""
@@ -1477,6 +1693,11 @@ msgid "Date on which sales order is confirmed."
msgstr ""
#. module: sale
+#: field:sale.order,project_id:0
+msgid "Contract/Analytic Account"
+msgstr ""
+
+#. module: sale
#: field:sale.order,company_id:0
#: field:sale.order.line,company_id:0
#: view:sale.report:0
@@ -1496,9 +1717,11 @@ msgid "The amount to be invoiced in advance."
msgstr ""
#. module: sale
-#: selection:sale.order,state:0
-#: selection:sale.report,state:0
-msgid "Invoice Exception"
+#: code:addons/sale/sale.py:1256
+#, python-format
+msgid ""
+"Couldn't find a pricelist line matching this product and quantity.\n"
+"You have to change either the product, the quantity or the pricelist."
msgstr ""
#. module: sale
@@ -1508,13 +1731,6 @@ msgid ""
msgstr ""
#. module: sale
-#: help:sale.installer,sale_margin:0
-msgid ""
-"Gives the margin of profitability by calculating the difference between Unit "
-"Price and Cost Price."
-msgstr ""
-
-#. module: sale
#: view:sale.make.invoice:0
#: view:sale.order.line.make.invoice:0
msgid "Create invoices"
@@ -1533,6 +1749,11 @@ msgid "Cancelled"
msgstr ""
#. module: sale
+#: view:sale.order.line:0
+msgid "Sales Order Lines related to a Sales Order of mine"
+msgstr ""
+
+#. module: sale
#: model:ir.actions.act_window,name:sale.action_shop_form
#: model:ir.ui.menu,name:sale.menu_action_shop_form
#: field:sale.order,shop_id:0
@@ -1542,17 +1763,12 @@ msgid "Shop"
msgstr ""
#. module: sale
-#: view:sale.report:0
-msgid " Month "
-msgstr ""
-
-#. module: sale
#: field:sale.report,date_confirm:0
msgid "Date Confirm"
msgstr ""
#. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:111
+#: code:addons/sale/wizard/sale_line_invoice.py:113
#, python-format
msgid "Warning"
msgstr ""
@@ -1564,17 +1780,6 @@ msgid "Sales by Month"
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:1045
-#, python-format
-msgid ""
-"You selected a quantity of %d Units.\n"
-"But it's not compatible with the selected packaging.\n"
-"Here is a proposition of quantities according to the packaging:\n"
-"\n"
-"EAN: %s Quantity: %s Type of ul: %s"
-msgstr ""
-
-#. module: sale
#: model:ir.model,name:sale.model_sale_order
#: model:process.node,name:sale.process_node_order0
#: model:process.node,name:sale.process_node_saleorder0
@@ -1590,6 +1795,11 @@ msgid "Quantity (UoS)"
msgstr ""
#. module: sale
+#: view:sale.order.line:0
+msgid "Sale Order Lines that are in 'done' state"
+msgstr ""
+
+#. module: sale
#: model:process.transition,note:sale.process_transition_packing0
msgid ""
"The Pick List form is created as soon as the sales order is confirmed, in "
@@ -1604,6 +1814,11 @@ msgid "Confirmed"
msgstr ""
#. module: sale
+#: field:sale.config.picking_policy,order_policy:0
+msgid "Main Method Based On"
+msgstr ""
+
+#. module: sale
#: model:process.transition.action,name:sale.process_transition_action_confirm0
msgid "Confirm"
msgstr ""
@@ -1626,6 +1841,7 @@ msgid "Invoice Lines"
msgstr ""
#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_product_tree
#: view:sale.order:0
#: view:sale.order.line:0
msgid "Sales Order Lines"
@@ -1642,30 +1858,18 @@ msgid "Configuration"
msgstr ""
#. module: sale
-#: selection:sale.order,picking_policy:0
-msgid "Complete Delivery"
+#: code:addons/sale/edi/sale_order.py:146
+#, python-format
+msgid "EDI Pricelist (%s)"
msgstr ""
#. module: sale
#: view:sale.report:0
-msgid " Month-1 "
-msgstr ""
-
-#. module: sale
-#: help:sale.config.picking_policy,picking_policy:0
-msgid ""
-"The Shipping Policy is used to configure per order if you want to deliver as "
-"soon as possible when one product is available or you wait that all products "
-"are available.."
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "August"
+msgid "Sales order created in current year"
msgstr ""
#. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:111
+#: code:addons/sale/wizard/sale_line_invoice.py:113
#, python-format
msgid ""
"Invoice cannot be created for this Sales Order Line due to one of the "
@@ -1675,6 +1879,11 @@ msgid ""
msgstr ""
#. module: sale
+#: view:sale.order.line:0
+msgid "Sale order lines done"
+msgstr ""
+
+#. module: sale
#: field:sale.order.line,th_weight:0
msgid "Weight"
msgstr ""
@@ -1693,7 +1902,6 @@ msgstr ""
#. module: sale
#: field:sale.config.picking_policy,config_logo:0
-#: field:sale.installer,config_logo:0
msgid "Image"
msgstr ""
@@ -1723,8 +1931,8 @@ msgid "Salesman"
msgstr ""
#. module: sale
-#: model:process.node,note:sale.process_node_saleorder0
-msgid "Drives procurement and invoicing"
+#: model:ir.actions.act_window,name:sale.action_order_tree
+msgid "Old Quotations"
msgstr ""
#. module: sale
@@ -1733,7 +1941,7 @@ msgid "Untaxed Amount"
msgstr ""
#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:163
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:170
#: model:ir.actions.act_window,name:sale.action_view_sale_advance_payment_inv
#: view:sale.advance.payment.inv:0
#: view:sale.order:0
@@ -1742,7 +1950,7 @@ msgid "Advance Invoice"
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:591
+#: code:addons/sale/sale.py:624
#, python-format
msgid "The sales order '%s' has been cancelled."
msgstr ""
@@ -1777,19 +1985,19 @@ msgid "Packings"
msgstr ""
#. module: sale
-#: field:sale.config.picking_policy,progress:0
-#: field:sale.installer,progress:0
-msgid "Configuration Progress"
+#: view:sale.order.line:0
+msgid "Sale Order Lines ready to be invoiced"
msgstr ""
#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_product_tree
-msgid "Product sales"
+#: view:sale.report:0
+msgid "Sales order created in last month"
msgstr ""
#. module: sale
-#: field:sale.order,date_order:0
-msgid "Ordered Date"
+#: model:ir.actions.act_window,name:sale.action_email_templates
+#: model:ir.ui.menu,name:sale.menu_email_templates
+msgid "Email Templates"
msgstr ""
#. module: sale
@@ -1800,13 +2008,14 @@ msgid "Sales Orders"
msgstr ""
#. module: sale
-#: selection:sale.config.picking_policy,picking_policy:0
-msgid "Direct Delivery"
+#: model:ir.model,name:sale.model_sale_shop
+#: view:sale.shop:0
+msgid "Sales Shop"
msgstr ""
#. module: sale
-#: field:sale.installer,sale_journal:0
-msgid "Invoicing journals"
+#: selection:sale.report,month:0
+msgid "November"
msgstr ""
#. module: sale
@@ -1815,18 +2024,12 @@ msgid "Advance Product"
msgstr ""
#. module: sale
-#: view:sale.report:0
-#: field:sale.report,shipped_qty_1:0
-msgid "Shipped Qty"
-msgstr ""
-
-#. module: sale
-#: view:sale.open.invoice:0
-msgid "You invoice has been successfully created!"
+#: view:sale.order:0
+msgid "Compute"
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:585
+#: code:addons/sale/sale.py:618
#, python-format
msgid "You must first cancel all invoices attached to this sales order."
msgstr ""
@@ -1837,24 +2040,13 @@ msgid "January"
msgstr ""
#. module: sale
-#: view:sale.installer:0
-msgid "Configure Your Sales Management Application"
-msgstr ""
-
-#. module: sale
#: model:ir.actions.act_window,name:sale.action_order_tree4
msgid "Sales Order in Progress"
msgstr ""
#. module: sale
-#: field:sale.installer,sale_layout:0
-msgid "Sales Order Layout Improvement"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:63
-#, python-format
-msgid "Error"
+#: help:sale.order,origin:0
+msgid "Reference of the document that generated this sales order request."
msgstr ""
#. module: sale
@@ -1864,6 +2056,11 @@ msgid "Commitment Delay"
msgstr ""
#. module: sale
+#: selection:sale.order,order_policy:0
+msgid "Deliver & invoice on demand"
+msgstr ""
+
+#. module: sale
#: model:process.node,note:sale.process_node_saleprocurement0
msgid ""
"One Procurement order for each sales order line and for each of the "
@@ -1886,13 +2083,12 @@ msgid "Confirmed sales order to invoice."
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:290
-#, python-format
-msgid "Cannot delete Sales Order(s) which are already confirmed !"
+#: view:sale.order:0
+msgid "Sales Order that haven't yet been confirmed"
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:316
+#: code:addons/sale/sale.py:322
#, python-format
msgid "The sales order '%s' has been set in draft state."
msgstr ""
@@ -1903,24 +2099,19 @@ msgid "from stock"
msgstr ""
#. module: sale
-#: field:sale.config.picking_policy,order_policy:0
-msgid "Shipping Default Policy"
-msgstr ""
-
-#. module: sale
#: view:sale.open.invoice:0
msgid "Close"
msgstr ""
#. module: sale
-#: field:sale.order,shipped:0
-msgid "Delivered"
+#: code:addons/sale/sale.py:1248
+#, python-format
+msgid "No Pricelist ! : "
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:1115
-#, python-format
-msgid "Not enough stock !"
+#: field:sale.order,shipped:0
+msgid "Delivered"
msgstr ""
#. module: sale
@@ -1929,11 +2120,6 @@ msgid "You must assign a production lot for this product"
msgstr ""
#. module: sale
-#: field:sale.order.line,sequence:0
-msgid "Layout Sequence"
-msgstr ""
-
-#. module: sale
#: model:ir.actions.act_window,help:sale.action_shop_form
msgid ""
"If you have more than one shop reselling your company products, you can "
@@ -1960,11 +2146,6 @@ msgid "May"
msgstr ""
#. module: sale
-#: help:sale.installer,sale_order_dates:0
-msgid "Adds commitment, requested and effective dates on Sales Orders."
-msgstr ""
-
-#. module: sale
#: view:sale.order:0
#: field:sale.order,partner_id:0
#: field:sale.order.line,order_partner_id:0
@@ -1972,23 +2153,11 @@ msgid "Customer"
msgstr ""
#. module: sale
-#: model:product.template,name:sale.advance_product_0_product_template
-msgid "Advance"
-msgstr ""
-
-#. module: sale
#: selection:sale.report,month:0
msgid "February"
msgstr ""
#. module: sale
-#: help:sale.installer,sale_journal:0
-msgid ""
-"Allows you to group and invoice your delivery orders according to different "
-"invoicing types: daily, weekly, etc."
-msgstr ""
-
-#. module: sale
#: selection:sale.report,month:0
msgid "April"
msgstr ""
@@ -1999,11 +2168,6 @@ msgid "Accounting"
msgstr ""
#. module: sale
-#: field:sale.config.picking_policy,step:0
-msgid "Steps To Deliver a Sales Order"
-msgstr ""
-
-#. module: sale
#: view:sale.order:0
#: view:sale.order.line:0
msgid "Search Sales Order"
@@ -2015,18 +2179,18 @@ msgid "Sales Order Requisition"
msgstr ""
#. module: sale
+#: code:addons/sale/sale.py:1242
+#, python-format
+msgid "Not enough stock ! : "
+msgstr ""
+
+#. module: sale
#: report:sale.order:0
#: field:sale.order,payment_term:0
msgid "Payment Term"
msgstr "Relambi de pagament"
#. module: sale
-#: help:sale.installer,sale_layout:0
-msgid ""
-"Provides some features to improve the layout of the Sales Order reports."
-msgstr ""
-
-#. module: sale
#: model:ir.actions.act_window,help:sale.action_order_report_all
msgid ""
"This report performs analysis on your quotations and sales orders. Analysis "
diff --git a/addons/sale/i18n/pl.po b/addons/sale/i18n/pl.po
index 555390a6dda..3de72152e96 100644
--- a/addons/sale/i18n/pl.po
+++ b/addons/sale/i18n/pl.po
@@ -6,15 +6,27 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2011-01-11 11:16+0000\n"
+"POT-Creation-Date: 2011-12-22 18:43+0000\n"
"PO-Revision-Date: 2011-01-25 20:58+0000\n"
"Last-Translator: Grzegorz Grzelak (OpenGLOBE.pl) <grzegorz@openglobe.pl>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-05 05:16+0000\n"
-"X-Generator: Launchpad (build 14231)\n"
+"X-Launchpad-Export-Date: 2011-12-23 06:46+0000\n"
+"X-Generator: Launchpad (build 14560)\n"
+
+#. module: sale
+#: field:sale.config.picking_policy,timesheet:0
+msgid "Based on Timesheet"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid ""
+"Sale Order Lines that are confirmed, done or in exception state and haven't "
+"yet been invoiced"
+msgstr ""
#. module: sale
#: view:board.board:0
@@ -23,11 +35,6 @@ msgid "Sales by Salesman in last 90 days"
msgstr "Sprzedaż wg sprzedawców w ostatnich 90 dniach"
#. module: sale
-#: help:sale.installer,delivery:0
-msgid "Allows you to compute delivery costs on your quotations."
-msgstr "Pozwala obliczyć koszt dostawy do oferty"
-
-#. module: sale
#: help:sale.order,picking_policy:0
msgid ""
"If you don't have enough stock available to deliver all at once, do you "
@@ -37,6 +44,11 @@ msgstr ""
"czy akceptujesz dostawę częściową?"
#. module: sale
+#: view:sale.order:0
+msgid "UoS"
+msgstr ""
+
+#. module: sale
#: help:sale.order,partner_shipping_id:0
msgid "Shipping address for current sales order."
msgstr "Adres wysyłki dla tego zamówienia sprzedaży."
@@ -60,22 +72,12 @@ msgid "Cancel Order"
msgstr "Anuluj zamówienie"
#. module: sale
-#: view:sale.config.picking_policy:0
-msgid "Configure Sales Order Logistics"
-msgstr "Konfiguruj logistykę zamówień sprzedaży"
-
-#. module: sale
-#: code:addons/sale/sale.py:603
+#: code:addons/sale/sale.py:638
#, python-format
msgid "The quotation '%s' has been converted to a sales order."
msgstr "Oferta '%s' została skonwertowana do zamówienia sprzedaży."
#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Payment Before Delivery"
-msgstr "Płatność przed dostawą"
-
-#. module: sale
#: code:addons/sale/wizard/sale_make_invoice.py:42
#, python-format
msgid "Warning !"
@@ -92,12 +94,6 @@ msgid "Drives procurement orders for every sales order line."
msgstr "Sporządza zapotrzebowania dla każdej pozycji zamówienia sprzedaży."
#. module: sale
-#: selection:sale.config.picking_policy,picking_policy:0
-msgid "All at Once"
-msgstr "Wszystko naraz"
-
-#. module: sale
-#: field:sale.order,project_id:0
#: view:sale.report:0
#: field:sale.report,analytic_account_id:0
#: field:sale.shop,project_id:0
@@ -116,6 +112,15 @@ msgstr ""
"jeśli fakturujesz wg wydań lub jeśli fakturujesz zbiorczo."
#. module: sale
+#: code:addons/sale/sale.py:295
+#, python-format
+msgid ""
+"In order to delete a confirmed sale order, you must cancel it before ! To "
+"cancel a sale order, you must first cancel related picking or delivery "
+"orders."
+msgstr ""
+
+#. module: sale
#: model:process.node,name:sale.process_node_saleprocurement0
msgid "Procurement Order"
msgstr "Zapotrzebowanie"
@@ -127,6 +132,11 @@ msgid "Partner"
msgstr ""
#. module: sale
+#: selection:sale.order,order_policy:0
+msgid "Invoice based on deliveries"
+msgstr ""
+
+#. module: sale
#: view:sale.order:0
msgid "Order Line"
msgstr "Pozycja zamówienia"
@@ -170,9 +180,14 @@ msgid "Default Payment Term"
msgstr "Domyślne warunki płatności"
#. module: sale
-#: model:ir.actions.act_window,name:sale.action_config_picking_policy
-msgid "Configure Picking Policy for Sales Order"
-msgstr "Konfiguruj politykę pobierania dla zamówień sprzedaży"
+#: field:sale.config.picking_policy,deli_orders:0
+msgid "Based on Delivery Orders"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.picking_policy,time_unit:0
+msgid "Main Working Time Unit"
+msgstr ""
#. module: sale
#: view:sale.order:0
@@ -188,9 +203,10 @@ msgid "Disc.(%)"
msgstr "Up.(%)"
#. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_forceassignation0
-msgid "Force Assignation"
-msgstr "Wymuś przypisanie"
+#: view:sale.report:0
+#: field:sale.report,price_total:0
+msgid "Total Price"
+msgstr "Pełna cena"
#. module: sale
#: help:sale.make.invoice,grouped:0
@@ -198,6 +214,11 @@ msgid "Check the box to group the invoices for the same customers"
msgstr "Zaznacz tę opcję, aby grupować faktury dla tych samych klientów"
#. module: sale
+#: view:sale.order:0
+msgid "My Sale Orders"
+msgstr ""
+
+#. module: sale
#: selection:sale.order,invoice_quantity:0
msgid "Ordered Quantities"
msgstr "Zamówione ilości"
@@ -238,14 +259,25 @@ msgstr ""
"pobrania' lub 'Faktura z zamówienia po wysyłce'."
#. module: sale
+#: field:sale.config.picking_policy,task_work:0
+msgid "Based on Tasks' Work"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
+msgid "Quotations and Sales"
+msgstr ""
+
+#. module: sale
#: model:ir.model,name:sale.model_sale_make_invoice
msgid "Sales Make Invoice"
msgstr "Sprzedaż tworzy fakturę"
#. module: sale
-#: view:sale.order:0
-msgid "Recreate Packing"
-msgstr "Ponownie utwórz pobranie"
+#: code:addons/sale/sale.py:330
+#, python-format
+msgid "Pricelist Warning!"
+msgstr ""
#. module: sale
#: field:sale.order.line,discount:0
@@ -253,12 +285,10 @@ msgid "Discount (%)"
msgstr "Upust (%)"
#. module: sale
-#: help:res.company,security_lead:0
-msgid ""
-"This is the days added to what you promise to customers for security purpose"
-msgstr ""
-"To są dni dodane do twojej obietnicy klientowi na wszelki wypadek (wysyłka "
-"nastąpi o tyle dni wcześniej)."
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_quotation_for_sale
+msgid "My Quotations"
+msgstr "Moje oferty"
#. module: sale
#: view:board.board:0
@@ -283,7 +313,22 @@ msgid "Shop Name"
msgstr "Nazwa sklepu"
#. module: sale
-#: code:addons/sale/sale.py:1014
+#: help:sale.order,order_policy:0
+msgid ""
+"The Invoice Policy is used to synchronise invoice and delivery operations.\n"
+" - The 'Pay before delivery' choice will first generate the invoice and "
+"then generate the picking order after the payment of this invoice.\n"
+" - The 'Deliver & Invoice on demand' will create the picking order directly "
+"and wait for the user to manually click on the 'Invoice' button to generate "
+"the draft invoice based on the sale order or the sale order lines.\n"
+" - The 'Invoice on order after delivery' choice will generate the draft "
+"invoice based on sales order after all picking lists have been finished.\n"
+" - The 'Invoice based on deliveries' choice is used to create an invoice "
+"during the picking process."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:1158
#, python-format
msgid "No Customer Defined !"
msgstr "Nie zdefiniowano żadnego klienta !"
@@ -294,9 +339,12 @@ msgid "Sales in Exception"
msgstr "Sprzedaże w stanie wyjątku"
#. module: sale
-#: view:sale.order:0
-msgid "Set to Draft"
-msgstr "Ustaw na projekt"
+#: code:addons/sale/sale.py:1145
+#: code:addons/sale/sale.py:1264
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:70
+#, python-format
+msgid "Configuration Error !"
+msgstr ""
#. module: sale
#: view:sale.order:0
@@ -304,32 +352,7 @@ msgid "Conditions"
msgstr "Warunki"
#. module: sale
-#: help:sale.order,order_policy:0
-msgid ""
-"The Shipping Policy is used to synchronise invoice and delivery operations.\n"
-" - The 'Pay Before delivery' choice will first generate the invoice and "
-"then generate the picking order after the payment of this invoice.\n"
-" - The 'Shipping & Manual Invoice' will create the picking order directly "
-"and wait for the user to manually click on the 'Invoice' button to generate "
-"the draft invoice.\n"
-" - The 'Invoice On Order After Delivery' choice will generate the draft "
-"invoice based on sales order after all picking lists have been finished.\n"
-" - The 'Invoice From The Picking' choice is used to create an invoice "
-"during the picking process."
-msgstr ""
-"Zasady wysyłki są stosowane do synchronizowania operacji fakturowania z "
-"wydaniami.\n"
-" - 'Płatność przed wydaniem' najpierw wygeneruje fakturę, a pobranie po "
-"zapłaceniu faktury.\n"
-" - 'Wydanie i ręczna faktura' wygeneruje pobranie od razu i poczeka aż "
-"użytkownik utworzy fakturę przyciskiem.\n"
-" - 'Faktura wg zamówienia po wydaniu' wygeneruje projekt faktury wg "
-"zamówienia po wykonaniu wszystkich pobrań.\n"
-" - 'Faktura z pobrania' jest stosowana do generowania faktury w trakcie "
-"pobrania."
-
-#. module: sale
-#: code:addons/sale/sale.py:939
+#: code:addons/sale/sale.py:1034
#, python-format
msgid ""
"There is no income category account defined in default Properties for "
@@ -339,9 +362,9 @@ msgstr ""
"nie zdefiniowano Obszaru podatkowego !"
#. module: sale
-#: view:sale.installer:0
-msgid "Configure"
-msgstr "Konfiguruj"
+#: selection:sale.report,month:0
+msgid "August"
+msgstr "Sierpień"
#. module: sale
#: constraint:stock.move:0
@@ -349,7 +372,7 @@ msgid "You try to assign a lot which is not from the same product"
msgstr "Próbujesz powiązać z numerem partii z innego produktu"
#. module: sale
-#: code:addons/sale/sale.py:620
+#: code:addons/sale/sale.py:655
#, python-format
msgid "invalid mode for test_state"
msgstr ""
@@ -360,7 +383,7 @@ msgid "June"
msgstr "Czerwiec"
#. module: sale
-#: code:addons/sale/sale.py:584
+#: code:addons/sale/sale.py:617
#, python-format
msgid "Could not cancel this sales order !"
msgstr "Nie można anulowac tego zamówienia sprzedaży !"
@@ -381,8 +404,12 @@ msgid "October"
msgstr "Październik"
#. module: sale
+#: sql_constraint:stock.picking:0
+msgid "Reference must be unique per Company!"
+msgstr ""
+
+#. module: sale
#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_quotation_for_sale
#: view:sale.order:0
#: view:sale.report:0
msgid "Quotations"
@@ -394,11 +421,6 @@ msgid "Pricelist for current sales order."
msgstr "Cennik dla tego zamówienia sprzedaży."
#. module: sale
-#: selection:sale.config.picking_policy,step:0
-msgid "Delivery Order Only"
-msgstr "Tylko zamówienia dostawy"
-
-#. module: sale
#: report:sale.order:0
msgid "TVA :"
msgstr "NIP :"
@@ -424,6 +446,7 @@ msgstr "Obszar podatkowy"
#. module: sale
#: view:sale.order:0
#: view:sale.order.line:0
+#: field:sale.report,product_uom:0
msgid "UoM"
msgstr "JM"
@@ -448,7 +471,13 @@ msgstr ""
"toku' lub 'Ręczne w toku'."
#. module: sale
-#: code:addons/sale/sale.py:971
+#: code:addons/sale/sale.py:1061
+#, python-format
+msgid "You cannot cancel a sale order line that has already been invoiced!"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:1066
#, python-format
msgid "You must first cancel stock moves attached to this sales order line."
msgstr ""
@@ -456,7 +485,7 @@ msgstr ""
"zamówienia sprzedaży."
#. module: sale
-#: code:addons/sale/sale.py:1042
+#: code:addons/sale/sale.py:1134
#, python-format
msgid "(n/a)"
msgstr "(nd.)"
@@ -494,15 +523,36 @@ msgid "Notes"
msgstr "Notatki"
#. module: sale
+#: sql_constraint:res.company:0
+msgid "The company name must be unique !"
+msgstr ""
+
+#. module: sale
#: help:sale.order,partner_invoice_id:0
msgid "Invoice address for current sales order."
msgstr "Adres do faktury dla tego zamówienia sprzedaży."
#. module: sale
-#: view:sale.installer:0
-msgid "Enhance your core Sales Application with additional functionalities."
+#: view:sale.report:0
+msgid "Month-1"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered month of the sales order"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:504
+#, python-format
+msgid ""
+"You cannot group sales having different currencies for the same partner."
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,picking_policy:0
+msgid "Deliver each product when available"
msgstr ""
-"Rozszerz swoją podstawową aplikację sprzedaży o dodatkowe funkcjonalności."
#. module: sale
#: field:sale.order,invoiced_rate:0
@@ -521,21 +571,43 @@ msgid "Confirmation Date"
msgstr "Data potwierdzenia"
#. module: sale
+#: field:sale.order,incoterm:0
+msgid "Incoterm"
+msgstr "Incoterm"
+
+#. module: sale
#: field:sale.order.line,address_allotment_id:0
msgid "Allotment Partner"
msgstr "Partner współpracujący"
#. module: sale
-#: sql_constraint:sale.order:0
-msgid "Order Reference must be unique !"
-msgstr "Numer zamówienia musi być unikalny !"
-
-#. module: sale
#: selection:sale.report,month:0
msgid "March"
msgstr "Marzec"
#. module: sale
+#: constraint:stock.move:0
+msgid "You can not move products from or to a location of the type view."
+msgstr ""
+
+#. module: sale
+#: field:sale.config.picking_policy,sale_orders:0
+msgid "Based on Sales Orders"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,state:0
+msgid ""
+"Givwizard = self.browse(cr, uid, ids)[0]es the state of the quotation or "
+"sales order. \n"
+"The exception state is automatically set when a cancel operation occurs in "
+"the invoice validation (Invoice Exception) or in the picking list process "
+"(Shipping Exception). \n"
+"The 'Waiting Schedule' state is set when the invoice is confirmed but "
+"waiting for the scheduler to run on the order date."
+msgstr ""
+
+#. module: sale
#: help:sale.order,amount_total:0
msgid "The total amount."
msgstr "Suma kwot"
@@ -551,6 +623,11 @@ msgid "Invoice address :"
msgstr "Adres do faktury :"
#. module: sale
+#: field:sale.order.line,sequence:0
+msgid "Line Sequence"
+msgstr ""
+
+#. module: sale
#: model:process.transition,note:sale.process_transition_saleorderprocurement0
msgid ""
"For every sales order line, a procurement order is created to supply the "
@@ -602,11 +679,6 @@ msgid "Sales Order Line"
msgstr "Pozycja zamówienia sprzedaży"
#. module: sale
-#: view:sale.config.picking_policy:0
-msgid "Setup your sales workflow and default values."
-msgstr "Ustaw obieg sprzedaży i wartości domyślne."
-
-#. module: sale
#: field:sale.shop,warehouse_id:0
msgid "Warehouse"
msgstr "Magazyn"
@@ -643,6 +715,11 @@ msgid "Creation Date"
msgstr "Data utworzenia"
#. module: sale
+#: model:ir.ui.menu,name:sale.menu_sales_configuration_misc
+msgid "Miscellaneous"
+msgstr ""
+
+#. module: sale
#: model:ir.actions.act_window,name:sale.action_order_line_tree3
msgid "Uninvoiced and Delivered Lines"
msgstr "Pozycje dostarczone i niezafakturowane"
@@ -658,14 +735,19 @@ msgid "My Sales"
msgstr "Moja sprzedaż"
#. module: sale
-#: code:addons/sale/sale.py:290
-#: code:addons/sale/sale.py:966
-#: code:addons/sale/sale.py:1165
+#: code:addons/sale/sale.py:295
+#: code:addons/sale/sale.py:1061
+#: code:addons/sale/sale.py:1290
#, python-format
msgid "Invalid action !"
msgstr "Niedozwolona akcja !"
#. module: sale
+#: view:sale.order:0
+msgid "Extra Info"
+msgstr "Dodatkowe informacje"
+
+#. module: sale
#: field:sale.order,pricelist_id:0
#: field:sale.report,pricelist_id:0
#: field:sale.shop,pricelist_id:0
@@ -679,13 +761,21 @@ msgid "# of Qty"
msgstr "# Ilości"
#. module: sale
+#: code:addons/sale/sale.py:1314
+#, python-format
+msgid "Hour"
+msgstr ""
+
+#. module: sale
#: view:sale.order:0
msgid "Order Date"
msgstr "Data zamówienia"
#. module: sale
#: view:sale.order.line:0
+#: view:sale.report:0
#: field:sale.report,shipped:0
+#: field:sale.report,shipped_qty_1:0
msgid "Shipped"
msgstr "Wysłano"
@@ -695,9 +785,9 @@ msgid "All Quotations"
msgstr "Wszystkie oferty"
#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Invoice On Order After Delivery"
-msgstr "Faktura wg zamówienia po wydaniu"
+#: view:sale.config.picking_policy:0
+msgid "Options"
+msgstr ""
#. module: sale
#: selection:sale.report,month:0
@@ -705,6 +795,20 @@ msgid "September"
msgstr "Wrzesień"
#. module: sale
+#: code:addons/sale/sale.py:632
+#, python-format
+msgid "You cannot confirm a sale order which has no line."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:1246
+#, python-format
+msgid ""
+"You have to select a pricelist or a customer in the sales form !\n"
+"Please set one before choosing a product."
+msgstr ""
+
+#. module: sale
#: view:sale.report:0
#: field:sale.report,categ_id:0
msgid "Category of Product"
@@ -721,11 +825,6 @@ msgid "Stock Moves"
msgstr "Przesunięcia zapasów"
#. module: sale
-#: view:sale.report:0
-msgid " Year "
-msgstr " Rok "
-
-#. module: sale
#: field:sale.order,state:0
#: field:sale.report,state:0
msgid "Order State"
@@ -743,7 +842,7 @@ msgid "Sales By Month"
msgstr "Sprzedaż wg miesięcy"
#. module: sale
-#: code:addons/sale/sale.py:970
+#: code:addons/sale/sale.py:1065
#, python-format
msgid "Could not cancel sales order line!"
msgstr "Nie mozna anulować pozycji zamówienia sprzedaży!"
@@ -778,64 +877,19 @@ msgstr ""
"jeśli jest stosowany planista."
#. module: sale
+#: field:sale.order,date_order:0
+msgid "Date"
+msgstr ""
+
+#. module: sale
#: view:sale.report:0
msgid "Extended Filters..."
msgstr "Rozszerzone filtry..."
#. module: sale
-#: model:ir.module.module,description:sale.module_meta_information
-msgid ""
-"\n"
-" The base module to manage quotations and sales orders.\n"
-"\n"
-" * Workflow with validation steps:\n"
-" - Quotation -> Sales order -> Invoice\n"
-" * Invoicing methods:\n"
-" - Invoice on order (before or after shipping)\n"
-" - Invoice on delivery\n"
-" - Invoice on timesheets\n"
-" - Advance invoice\n"
-" * Partners preferences (shipping, invoicing, incoterm, ...)\n"
-" * Products stocks and prices\n"
-" * Delivery methods:\n"
-" - all at once, multi-parcel\n"
-" - delivery costs\n"
-" * Dashboard for salesman that includes:\n"
-" * Your open quotations\n"
-" * Top 10 sales of the month\n"
-" * Cases statistics\n"
-" * Graph of sales by product\n"
-" * Graph of cases of the month\n"
-" "
-msgstr ""
-"\n"
-" Podstawowy moduł do zarządzania ofertami i zamówieniami sprzedaży.\n"
-"\n"
-" * Obieg z krokami zatwierdzania:\n"
-" - Oferta -> Zamowienie sprzedaży -> Faktura\n"
-" * Metody fakturowania:\n"
-" - Faktura wg zamówienia (przed lub po wydaniu)\n"
-" - Faktura wg wydania\n"
-" - Faktura wg karty czasu pracy\n"
-" - Faktura zaliczkowa\n"
-" * Ustawienia dla partnerów (wydania, fakturowanie, incoterm, ...)\n"
-" * Stany zapasów i cenniki\n"
-" * Metody wydań/dostaw:\n"
-" - kompletne, częściowe\n"
-" - koszty dostaw\n"
-" * Konsola dla sprzedawcy:\n"
-" * Otwarte oferty\n"
-" * Największe sprzedaże w miesiącu\n"
-" * Statystyka spraw\n"
-" * Wykres sprzedaży\n"
-" * Wykres spraw\n"
-" "
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_shop
-#: view:sale.shop:0
-msgid "Sales Shop"
-msgstr "Sklep sprzedaży"
+#: selection:sale.order.line,state:0
+msgid "Exception"
+msgstr "Wyjątek"
#. module: sale
#: model:ir.model,name:sale.model_res_company
@@ -843,9 +897,10 @@ msgid "Companies"
msgstr "Firmy"
#. module: sale
-#: selection:sale.report,month:0
-msgid "November"
-msgstr "Listopad"
+#: code:addons/sale/sale.py:1259
+#, python-format
+msgid "No valid pricelist line found ! :"
+msgstr ""
#. module: sale
#: view:sale.order:0
@@ -853,9 +908,9 @@ msgid "History"
msgstr "Historia"
#. module: sale
-#: field:sale.config.picking_policy,picking_policy:0
-msgid "Picking Default Policy"
-msgstr "Zasady pobrań"
+#: selection:sale.order,order_policy:0
+msgid "Invoice on order after delivery"
+msgstr ""
#. module: sale
#: help:sale.order,invoice_ids:0
@@ -879,15 +934,14 @@ msgid ""
msgstr "Nazwisko i kontakt do osoby, która zamawiała lub poprosiła o ofertę."
#. module: sale
-#: code:addons/sale/sale.py:966
-#, python-format
-msgid "You cannot cancel a sales order line that has already been invoiced !"
+#: help:res.company,security_lead:0
+msgid ""
+"This is the days added to what you promise to customers for security purpose"
msgstr ""
-"Nie możesz anulować pozycji zamówienia sprzedaży, które zostało już "
-"zafakturowane!"
+"To są dni dodane do twojej obietnicy klientowi na wszelki wypadek (wysyłka "
+"nastąpi o tyle dni wcześniej)."
#. module: sale
-#: view:sale.order:0
#: view:sale.order.line:0
msgid "Qty"
msgstr "Il."
@@ -898,6 +952,11 @@ msgid "References"
msgstr "Odnośniki"
#. module: sale
+#: view:sale.order.line:0
+msgid "My Sales Order Lines"
+msgstr ""
+
+#. module: sale
#: model:process.transition.action,name:sale.process_transition_action_cancel0
#: model:process.transition.action,name:sale.process_transition_action_cancel1
#: model:process.transition.action,name:sale.process_transition_action_cancel2
@@ -909,14 +968,9 @@ msgid "Cancel"
msgstr "Anuluj"
#. module: sale
-#: field:sale.installer,sale_order_dates:0
-msgid "Sales Order Dates"
-msgstr "Daty zamówienia sprzedaży"
-
-#. module: sale
-#: selection:sale.order.line,state:0
-msgid "Exception"
-msgstr "Wyjątek"
+#: sql_constraint:sale.order:0
+msgid "Order Reference must be unique per Company!"
+msgstr ""
#. module: sale
#: model:process.transition,name:sale.process_transition_invoice0
@@ -928,19 +982,19 @@ msgid "Create Invoice"
msgstr "Utwórz fakturę"
#. module: sale
-#: field:sale.installer,sale_margin:0
-msgid "Margins in Sales Orders"
-msgstr "Marże w zamówieniach sprzedaży"
-
-#. module: sale
#: view:sale.order:0
msgid "Total Tax Excluded"
msgstr "Suma bez podatku"
#. module: sale
-#: view:sale.order:0
-msgid "Compute"
-msgstr "Oblicz"
+#: view:sale.order.line:0
+msgid "Order reference"
+msgstr ""
+
+#. module: sale
+#: view:sale.open.invoice:0
+msgid "You invoice has been successfully created!"
+msgstr "Faktura została utworzona"
#. module: sale
#: view:sale.report:0
@@ -959,23 +1013,20 @@ msgid "Open Invoice"
msgstr "Otwórz fakturę"
#. module: sale
-#: report:sale.order:0
-#: view:sale.order.line:0
-msgid "Price"
-msgstr "Cena"
+#: model:ir.actions.server,name:sale.ir_actions_server_edi_sale
+msgid "Auto-email confirmed sale orders"
+msgstr ""
#. module: sale
-#: model:ir.actions.act_window,name:sale.action_sale_installer
-#: view:sale.config.picking_policy:0
-#: view:sale.installer:0
-msgid "Sales Application Configuration"
-msgstr "Konfiguracja aplikacji sprzedażowej"
+#: code:addons/sale/sale.py:413
+#, python-format
+msgid "There is no sales journal defined for this company: \"%s\" (id:%d)"
+msgstr "Brak zdefiniowanego dziennika sprzedaży w tej firmie: \"%s\" (id:%d)"
#. module: sale
-#: view:sale.report:0
-#: field:sale.report,price_total:0
-msgid "Total Price"
-msgstr "Pełna cena"
+#: model:process.transition.action,name:sale.process_transition_action_forceassignation0
+msgid "Force Assignation"
+msgstr "Wymuś przypisanie"
#. module: sale
#: selection:sale.order.line,type:0
@@ -988,6 +1039,11 @@ msgid "Based on the shipped or on the ordered quantities."
msgstr "Oparte o wysłane lub zamówione ilości"
#. module: sale
+#: selection:sale.order,picking_policy:0
+msgid "Deliver all products at once"
+msgstr ""
+
+#. module: sale
#: field:sale.order,picking_ids:0
msgid "Related Picking"
msgstr "Powiązane pobranie"
@@ -1019,9 +1075,15 @@ msgid "Create Delivery Order"
msgstr "Utwórz zamówienie dostawy"
#. module: sale
-#: field:sale.installer,delivery:0
-msgid "Delivery Costs"
-msgstr "Koszt dostawy"
+#: code:addons/sale/sale.py:1290
+#, python-format
+msgid "Cannot delete a sales order line which is in state '%s'!"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Qty(UoS)"
+msgstr ""
#. module: sale
#: view:sale.order:0
@@ -1035,13 +1097,13 @@ msgstr "Utwórz pobranie"
#. module: sale
#: view:sale.report:0
-msgid "Sales by Product Category"
-msgstr "Sprzedaż wg kategorii produktu"
+msgid "Ordered date of the sales order"
+msgstr ""
#. module: sale
-#: selection:sale.order,picking_policy:0
-msgid "Partial Delivery"
-msgstr "Dostawa częściowa"
+#: view:sale.report:0
+msgid "Sales by Product Category"
+msgstr "Sprzedaż wg kategorii produktu"
#. module: sale
#: model:process.transition,name:sale.process_transition_confirmquotation0
@@ -1049,9 +1111,10 @@ msgid "Confirm Quotation"
msgstr "Potwierdź ofertę"
#. module: sale
-#: help:sale.order,origin:0
-msgid "Reference of the document that generated this sales order request."
-msgstr "Odnośnik do dokumentu, który wygenerował to zapytanie ofertowe."
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:63
+#, python-format
+msgid "Error"
+msgstr "Błąd"
#. module: sale
#: view:sale.order:0
@@ -1083,20 +1146,14 @@ msgid "Procurement Method"
msgstr "Metoda zapotrzebowania"
#. module: sale
-#: view:sale.config.picking_policy:0
-#: view:sale.installer:0
-msgid "title"
-msgstr "tytuł"
-
-#. module: sale
#: model:process.node,name:sale.process_node_packinglist0
msgid "Pick List"
msgstr "Pobranie"
#. module: sale
#: view:sale.order:0
-msgid "Order date"
-msgstr "Data zamówienia"
+msgid "Set to Draft"
+msgstr "Ustaw na projekt"
#. module: sale
#: model:process.node,note:sale.process_node_packinglist0
@@ -1104,6 +1161,85 @@ msgid "Document of the move to the output or to the customer."
msgstr "Dokument przesunięcia do klienta."
#. module: sale
+#: model:email.template,body_text:sale.email_template_edi_sale
+msgid ""
+"\n"
+"Hello${object.partner_order_id.name and ' ' or "
+"''}${object.partner_order_id.name or ''},\n"
+"\n"
+"Here is your order confirmation for ${object.partner_id.name}:\n"
+" | Order number: *${object.name}*\n"
+" | Order total: *${object.amount_total} "
+"${object.pricelist_id.currency_id.name}*\n"
+" | Order date: ${object.date_order}\n"
+" % if object.origin:\n"
+" | Order reference: ${object.origin}\n"
+" % endif\n"
+" % if object.client_order_ref:\n"
+" | Your reference: ${object.client_order_ref}<br />\n"
+" % endif\n"
+" | Your contact: ${object.user_id.name} ${object.user_id.user_email "
+"and '<%s>'%(object.user_id.user_email) or ''}\n"
+"\n"
+"You can view the order confirmation, download it and even pay online using "
+"the following link:\n"
+" ${ctx.get('edi_web_url_view') or 'n/a'}\n"
+"\n"
+"% if object.order_policy in ('prepaid','manual') and "
+"object.company_id.paypal_account:\n"
+"<% \n"
+"comp_name = quote(object.company_id.name)\n"
+"order_name = quote(object.name)\n"
+"paypal_account = quote(object.company_id.paypal_account)\n"
+"order_amount = quote(str(object.amount_total))\n"
+"cur_name = quote(object.pricelist_id.currency_id.name)\n"
+"paypal_url = \"https://www.paypal.com/cgi-"
+"bin/webscr?cmd=_xclick&business=%s&item_name=%s%%20Order%%20%s&invoice=%s&amo"
+"unt=%s\" \\\n"
+" "
+"\"&currency_code=%s&button_subtype=services&no_note=1&bn=OpenERP_Order_PayNow"
+"_%s\" % \\\n"
+" "
+"(paypal_account,comp_name,order_name,order_name,order_amount,cur_name,cur_nam"
+"e)\n"
+"%>\n"
+"It is also possible to directly pay with Paypal:\n"
+" ${paypal_url}\n"
+"% endif\n"
+"\n"
+"If you have any question, do not hesitate to contact us.\n"
+"\n"
+"\n"
+"Thank you for choosing ${object.company_id.name}!\n"
+"\n"
+"\n"
+"--\n"
+"${object.user_id.name} ${object.user_id.user_email and "
+"'<%s>'%(object.user_id.user_email) or ''}\n"
+"${object.company_id.name}\n"
+"% if object.company_id.street:\n"
+"${object.company_id.street or ''}\n"
+"% endif\n"
+"% if object.company_id.street2:\n"
+"${object.company_id.street2}\n"
+"% endif\n"
+"% if object.company_id.city or object.company_id.zip:\n"
+"${object.company_id.zip or ''} ${object.company_id.city or ''}\n"
+"% endif\n"
+"% if object.company_id.country_id:\n"
+"${object.company_id.state_id and ('%s, ' % object.company_id.state_id.name) "
+"or ''} ${object.company_id.country_id.name or ''}\n"
+"% endif\n"
+"% if object.company_id.phone:\n"
+"Phone: ${object.company_id.phone}\n"
+"% endif\n"
+"% if object.company_id.website:\n"
+"${object.company_id.website or ''}\n"
+"% endif\n"
+" "
+msgstr ""
+
+#. module: sale
#: model:process.transition.action,name:sale.process_transition_action_validate0
msgid "Validate"
msgstr "Zatwierdź"
@@ -1126,9 +1262,9 @@ msgid "Taxes"
msgstr "Podatki"
#. module: sale
-#: field:sale.order,order_policy:0
-msgid "Shipping Policy"
-msgstr "Zasady wysyłki"
+#: view:sale.order:0
+msgid "Sales Order ready to be invoiced"
+msgstr ""
#. module: sale
#: help:sale.order,create_date:0
@@ -1147,9 +1283,9 @@ msgid "Create Invoices"
msgstr "Utwórz faktury"
#. module: sale
-#: view:sale.order:0
-msgid "Extra Info"
-msgstr "Dodatkowe informacje"
+#: view:sale.report:0
+msgid "Sales order created in current month"
+msgstr ""
#. module: sale
#: report:sale.order:0
@@ -1157,11 +1293,24 @@ msgid "Fax :"
msgstr "Faks :"
#. module: sale
+#: help:sale.order.line,type:0
+msgid ""
+"If 'on order', it triggers a procurement when the sale order is confirmed to "
+"create a task, purchase order or manufacturing order linked to this sale "
+"order line."
+msgstr ""
+
+#. module: sale
#: field:sale.advance.payment.inv,amount:0
msgid "Advance Amount"
msgstr "Kwota zaliczki"
#. module: sale
+#: field:sale.config.picking_policy,charge_delivery:0
+msgid "Do you charge the delivery?"
+msgstr ""
+
+#. module: sale
#: selection:sale.order,invoice_quantity:0
msgid "Shipped Quantities"
msgstr "Wysyłane ilości"
@@ -1172,25 +1321,45 @@ msgid "Invoice Based on Sales Orders"
msgstr "Faktura wg zamówień sprzedaży"
#. module: sale
+#: code:addons/sale/sale.py:331
+#, python-format
+msgid ""
+"If you change the pricelist of this order (and eventually the currency), "
+"prices of existing order lines will not be updated."
+msgstr ""
+
+#. module: sale
#: model:ir.model,name:sale.model_stock_picking
msgid "Picking List"
msgstr "Pobranie"
#. module: sale
-#: code:addons/sale/sale.py:387
-#: code:addons/sale/sale.py:920
-#: code:addons/sale/sale.py:938
+#: code:addons/sale/sale.py:412
+#: code:addons/sale/sale.py:503
+#: code:addons/sale/sale.py:632
+#: code:addons/sale/sale.py:1015
+#: code:addons/sale/sale.py:1033
#, python-format
msgid "Error !"
msgstr "Błąd !"
#. module: sale
-#: code:addons/sale/sale.py:570
+#: code:addons/sale/sale.py:603
#, python-format
msgid "Could not cancel sales order !"
msgstr "Nie mozna anulować zamówienia sprzedaży !"
#. module: sale
+#: view:sale.order:0
+msgid "Qty(UoM)"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered Year of the sales order"
+msgstr ""
+
+#. module: sale
#: selection:sale.report,month:0
msgid "July"
msgstr "Lipiec"
@@ -1207,36 +1376,26 @@ msgid "Shipping Exception"
msgstr "Wyjątek wysyłki"
#. module: sale
-#: field:sale.make.invoice,grouped:0
-msgid "Group the invoices"
-msgstr "Grupuj faktury"
-
-#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Shipping & Manual Invoice"
-msgstr "Wysyłka i ręczna faktura"
-
-#. module: sale
-#: code:addons/sale/sale.py:1051
+#: code:addons/sale/sale.py:1143
#, python-format
-msgid "Picking Information !"
-msgstr "Inofrmacja pobrania !"
+msgid "Picking Information ! : "
+msgstr ""
#. module: sale
-#: view:sale.report:0
-#: field:sale.report,month:0
-msgid "Month"
-msgstr "Miesiąc"
+#: field:sale.make.invoice,grouped:0
+msgid "Group the invoices"
+msgstr "Grupuj faktury"
#. module: sale
-#: model:ir.module.module,shortdesc:sale.module_meta_information
-msgid "Sales Management"
-msgstr "Sprzedaż"
+#: field:sale.order,order_policy:0
+msgid "Invoice Policy"
+msgstr ""
#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Invoice From The Picking"
-msgstr "Faktura z pobrania"
+#: model:ir.actions.act_window,name:sale.action_config_picking_policy
+#: view:sale.config.picking_policy:0
+msgid "Setup your Invoicing Method"
+msgstr ""
#. module: sale
#: model:process.node,note:sale.process_node_invoice0
@@ -1245,31 +1404,31 @@ msgstr "Do sprawdzenia przez księgowego."
#. module: sale
#: view:sale.report:0
-#: field:sale.report,uom_name:0
msgid "Reference UoM"
msgstr "Referencyjna JM"
#. module: sale
+#: view:sale.config.picking_policy:0
+msgid ""
+"This tool will help you to install the right module and configure the system "
+"according to the method you use to invoice your customers."
+msgstr ""
+
+#. module: sale
#: model:ir.model,name:sale.model_sale_order_line_make_invoice
msgid "Sale OrderLine Make_invoice"
msgstr ""
#. module: sale
-#: help:sale.config.picking_policy,step:0
-msgid ""
-"By default, OpenERP is able to manage complex routing and paths of products "
-"in your warehouse and partner locations. This will configure the most common "
-"and simple methods to deliver products to the customer in one or two "
-"operations by the worker."
-msgstr ""
-"OpenERP może obsługiwać złożone obiegi produktów w twoim magazynie i "
-"magazynach klientów. To jest konfiguracja najprostszej metody wydania "
-"produktów w jednej lub dwóch operacjach."
+#: selection:sale.order,state:0
+#: selection:sale.report,state:0
+msgid "Invoice Exception"
+msgstr "Wyjątek faktury"
#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_tree
-msgid "Old Quotations"
-msgstr "Poprzednie oferty"
+#: model:process.node,note:sale.process_node_saleorder0
+msgid "Drives procurement and invoicing"
+msgstr "Steruje zapotrzebowaniami i fakturowaniem"
#. module: sale
#: field:sale.order,invoiced:0
@@ -1284,6 +1443,22 @@ msgid "Sales Analysis"
msgstr "Analiza Sprzedaży"
#. module: sale
+#: code:addons/sale/sale.py:1138
+#, python-format
+msgid ""
+"You selected a quantity of %d Units.\n"
+"But it's not compatible with the selected packaging.\n"
+"Here is a proposition of quantities according to the packaging:\n"
+"EAN: %s Quantity: %s Type of ul: %s"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Recreate Packing"
+msgstr "Ponownie utwórz pobranie"
+
+#. module: sale
+#: view:sale.order:0
#: field:sale.order.line,property_ids:0
msgid "Properties"
msgstr "Właściwości"
@@ -1314,7 +1489,17 @@ msgstr ""
"Możesz generować faktury na podstawie zamówień lub na podstawie wydań."
#. module: sale
-#: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
+#: view:sale.order.line:0
+msgid "Confirmed sale order lines, not yet delivered"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:473
+#, python-format
+msgid "Customer Invoices"
+msgstr ""
+
+#. module: sale
#: model:process.process,name:sale.process_process_salesprocess0
#: view:sale.order:0
#: view:sale.report:0
@@ -1336,18 +1521,13 @@ msgid "Done"
msgstr "Wykonano"
#. module: sale
-#: model:ir.model,name:sale.model_sale_installer
-msgid "sale.installer"
-msgstr ""
-
-#. module: sale
#: model:process.node,name:sale.process_node_invoice0
#: model:process.node,name:sale.process_node_invoiceafterdelivery0
msgid "Invoice"
msgstr "Faktura"
#. module: sale
-#: code:addons/sale/sale.py:1014
+#: code:addons/sale/sale.py:1158
#, python-format
msgid ""
"You have to select a customer in the sales form !\n"
@@ -1357,11 +1537,6 @@ msgstr ""
"Wybierz klienta przed wybraniem produktu."
#. module: sale
-#: selection:sale.config.picking_policy,step:0
-msgid "Picking List & Delivery Order"
-msgstr "Pobranie i zamówienie wysyłki"
-
-#. module: sale
#: field:sale.order,origin:0
msgid "Source Document"
msgstr "Dokument źródłowy"
@@ -1387,7 +1562,7 @@ msgid "The amount without tax."
msgstr "Kwota bez podatku"
#. module: sale
-#: code:addons/sale/sale.py:571
+#: code:addons/sale/sale.py:604
#, python-format
msgid "You must first cancel all picking attached to this sales order."
msgstr ""
@@ -1400,9 +1575,15 @@ msgid "Sales Advance Payment Invoice"
msgstr "Zaliczkowa faktura sprzedaży"
#. module: sale
-#: field:sale.order,incoterm:0
-msgid "Incoterm"
-msgstr "Incoterm"
+#: view:sale.report:0
+#: field:sale.report,month:0
+msgid "Month"
+msgstr "Miesiąc"
+
+#. module: sale
+#: model:email.template,subject:sale.email_template_edi_sale
+msgid "${object.company_id.name} Order (Ref ${object.name or 'n/a' })"
+msgstr ""
#. module: sale
#: view:sale.order.line:0
@@ -1413,11 +1594,6 @@ msgid "Product"
msgstr "Produkt"
#. module: sale
-#: model:ir.ui.menu,name:sale.menu_invoiced
-msgid "Invoicing"
-msgstr "Fakturowanie"
-
-#. module: sale
#: model:process.transition.action,name:sale.process_transition_action_cancelassignation0
msgid "Cancel Assignation"
msgstr "Anuluj przypisanie"
@@ -1428,20 +1604,11 @@ msgid "sale.config.picking_policy"
msgstr ""
#. module: sale
-#: help:sale.order,state:0
-msgid ""
-"Gives the state of the quotation or sales order. \n"
-"The exception state is automatically set when a cancel operation occurs in "
-"the invoice validation (Invoice Exception) or in the picking list process "
-"(Shipping Exception). \n"
-"The 'Waiting Schedule' state is set when the invoice is confirmed but "
-"waiting for the scheduler to run on the date 'Ordered Date'."
+#: view:account.invoice.report:0
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_turnover_by_month
+msgid "Monthly Turnover"
msgstr ""
-"Pokazuje stan oferty lub zamówienia sprzedaży. \n"
-"Stan wyjątku jest ustawiany, kiedy wystąpi anulowanie w fakturze (Wyjątek "
-"faktury) lub w pobraniu (Wyjątek pobrania). \n"
-"Stan 'Czeka na planowanie' jest ustawiany, gdy faktura jest potwierdzona, "
-"ale czeka na planistę uruhcamianego w dacie 'Data zamówienia'."
#. module: sale
#: field:sale.order,invoice_quantity:0
@@ -1459,7 +1626,6 @@ msgid "Product UoS"
msgstr "JS produktu"
#. module: sale
-#: selection:sale.order,state:0
#: selection:sale.report,state:0
msgid "Manual In Progress"
msgstr "Ręcznie w toku"
@@ -1480,7 +1646,8 @@ msgid "Order"
msgstr "Kolejność"
#. module: sale
-#: code:addons/sale/sale.py:921
+#: code:addons/sale/sale.py:1016
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:71
#, python-format
msgid "There is no income account defined for this product: \"%s\" (id:%d)"
msgstr "Brak konta dochodu dla produktu: \"%s\" (id:%d)"
@@ -1504,7 +1671,7 @@ msgstr ""
"zamówienia."
#. module: sale
-#: code:addons/sale/sale.py:1116
+#: code:addons/sale/sale.py:1238
#, python-format
msgid ""
"You plan to sell %.2f %s but you only have %.2f %s available !\n"
@@ -1535,10 +1702,10 @@ msgid "Total"
msgstr "Suma"
#. module: sale
-#: code:addons/sale/sale.py:388
-#, python-format
-msgid "There is no sales journal defined for this company: \"%s\" (id:%d)"
-msgstr "Brak zdefiniowanego dziennika sprzedaży w tej firmie: \"%s\" (id:%d)"
+#: report:sale.order:0
+#: view:sale.order.line:0
+msgid "Price"
+msgstr "Cena"
#. module: sale
#: model:process.transition,note:sale.process_transition_deliver0
@@ -1551,10 +1718,15 @@ msgstr ""
"wydań a klientem może być wykonane ręcznie lub automatycznie."
#. module: sale
-#: code:addons/sale/sale.py:1165
-#, python-format
-msgid "Cannot delete a sales order line which is %s !"
-msgstr "Nie mozna usuwac pozycji zamówienia sprzedaży, które jest %s !"
+#: selection:sale.order,order_policy:0
+msgid "Pay before delivery"
+msgstr ""
+
+#. module: sale
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.open_board_sales
+msgid "Sales Dashboard"
+msgstr ""
#. module: sale
#: model:ir.actions.act_window,name:sale.action_sale_order_make_invoice
@@ -1565,6 +1737,7 @@ msgstr "Utwórz faktury"
#. module: sale
#: view:sale.order:0
+#: selection:sale.order,state:0
#: view:sale.order.line:0
msgid "To Invoice"
msgstr "Do zafakturowania"
@@ -1575,6 +1748,11 @@ msgid "Date on which sales order is confirmed."
msgstr "Data potwierdzenia zamówienia sprzedaży."
#. module: sale
+#: field:sale.order,project_id:0
+msgid "Contract/Analytic Account"
+msgstr ""
+
+#. module: sale
#: field:sale.order,company_id:0
#: field:sale.order.line,company_id:0
#: view:sale.report:0
@@ -1594,10 +1772,12 @@ msgid "The amount to be invoiced in advance."
msgstr "Kwota do zafakturowania z góry."
#. module: sale
-#: selection:sale.order,state:0
-#: selection:sale.report,state:0
-msgid "Invoice Exception"
-msgstr "Wyjątek faktury"
+#: code:addons/sale/sale.py:1256
+#, python-format
+msgid ""
+"Couldn't find a pricelist line matching this product and quantity.\n"
+"You have to change either the product, the quantity or the pricelist."
+msgstr ""
#. module: sale
#: help:sale.order,picking_ids:0
@@ -1606,14 +1786,6 @@ msgid ""
msgstr "To jest lista pobrań wygenerowana dla tego zamówienia sprzedaży."
#. module: sale
-#: help:sale.installer,sale_margin:0
-msgid ""
-"Gives the margin of profitability by calculating the difference between Unit "
-"Price and Cost Price."
-msgstr ""
-"Pokazuje marżę obliczając różnicę pomiędzy Ceną jednostkową a Ceną kosztową."
-
-#. module: sale
#: view:sale.make.invoice:0
#: view:sale.order.line.make.invoice:0
msgid "Create invoices"
@@ -1632,6 +1804,11 @@ msgid "Cancelled"
msgstr "Anulowano"
#. module: sale
+#: view:sale.order.line:0
+msgid "Sales Order Lines related to a Sales Order of mine"
+msgstr ""
+
+#. module: sale
#: model:ir.actions.act_window,name:sale.action_shop_form
#: model:ir.ui.menu,name:sale.menu_action_shop_form
#: field:sale.order,shop_id:0
@@ -1641,17 +1818,12 @@ msgid "Shop"
msgstr "Sklep"
#. module: sale
-#: view:sale.report:0
-msgid " Month "
-msgstr " Miesiąc "
-
-#. module: sale
#: field:sale.report,date_confirm:0
msgid "Date Confirm"
msgstr "Data potwierdzenia"
#. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:111
+#: code:addons/sale/wizard/sale_line_invoice.py:113
#, python-format
msgid "Warning"
msgstr "Ostrzeżenie"
@@ -1663,22 +1835,6 @@ msgid "Sales by Month"
msgstr "Sprzedaż wg miesięcy"
#. module: sale
-#: code:addons/sale/sale.py:1045
-#, python-format
-msgid ""
-"You selected a quantity of %d Units.\n"
-"But it's not compatible with the selected packaging.\n"
-"Here is a proposition of quantities according to the packaging:\n"
-"\n"
-"EAN: %s Quantity: %s Type of ul: %s"
-msgstr ""
-"Wybrałeś ilość %d jednostek.\n"
-"Ale to jest niezgodne z wybranym opakowaniem.\n"
-"Oto propozycja ilości zgodna z opakowaniem:\n"
-"\n"
-"EAN: %s Ilość: %s Typ JL: %s"
-
-#. module: sale
#: model:ir.model,name:sale.model_sale_order
#: model:process.node,name:sale.process_node_order0
#: model:process.node,name:sale.process_node_saleorder0
@@ -1694,6 +1850,11 @@ msgid "Quantity (UoS)"
msgstr "Ilość (JS)"
#. module: sale
+#: view:sale.order.line:0
+msgid "Sale Order Lines that are in 'done' state"
+msgstr ""
+
+#. module: sale
#: model:process.transition,note:sale.process_transition_packing0
msgid ""
"The Pick List form is created as soon as the sales order is confirmed, in "
@@ -1710,6 +1871,11 @@ msgid "Confirmed"
msgstr "Potwierdzone"
#. module: sale
+#: field:sale.config.picking_policy,order_policy:0
+msgid "Main Method Based On"
+msgstr ""
+
+#. module: sale
#: model:process.transition.action,name:sale.process_transition_action_confirm0
msgid "Confirm"
msgstr "Potwierdź"
@@ -1732,6 +1898,7 @@ msgid "Invoice Lines"
msgstr "Pozycje faktury"
#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_product_tree
#: view:sale.order:0
#: view:sale.order.line:0
msgid "Sales Order Lines"
@@ -1748,33 +1915,18 @@ msgid "Configuration"
msgstr "Konfiguracja"
#. module: sale
-#: selection:sale.order,picking_policy:0
-msgid "Complete Delivery"
-msgstr "Dostawa kompletna"
+#: code:addons/sale/edi/sale_order.py:146
+#, python-format
+msgid "EDI Pricelist (%s)"
+msgstr ""
#. module: sale
#: view:sale.report:0
-msgid " Month-1 "
-msgstr " Miesiąc-1 "
-
-#. module: sale
-#: help:sale.config.picking_policy,picking_policy:0
-msgid ""
-"The Shipping Policy is used to configure per order if you want to deliver as "
-"soon as possible when one product is available or you wait that all products "
-"are available.."
+msgid "Sales order created in current year"
msgstr ""
-"Zasady wydań są stosowane do decydowania, czy chcesz wydawać produkty "
-"natychmiast kiedy część ich jest dostępna, czy chcesz czekać, aż wszystkie "
-"produkty z zamówienia będą dostępne."
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "August"
-msgstr "Sierpień"
#. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:111
+#: code:addons/sale/wizard/sale_line_invoice.py:113
#, python-format
msgid ""
"Invoice cannot be created for this Sales Order Line due to one of the "
@@ -1788,6 +1940,11 @@ msgstr ""
"2.Pozycja jest już zafakturowana!"
#. module: sale
+#: view:sale.order.line:0
+msgid "Sale order lines done"
+msgstr ""
+
+#. module: sale
#: field:sale.order.line,th_weight:0
msgid "Weight"
msgstr "Waga"
@@ -1806,7 +1963,6 @@ msgstr "Grudzień"
#. module: sale
#: field:sale.config.picking_policy,config_logo:0
-#: field:sale.installer,config_logo:0
msgid "Image"
msgstr "Obraz"
@@ -1840,9 +1996,9 @@ msgid "Salesman"
msgstr "Sprzedawca"
#. module: sale
-#: model:process.node,note:sale.process_node_saleorder0
-msgid "Drives procurement and invoicing"
-msgstr "Steruje zapotrzebowaniami i fakturowaniem"
+#: model:ir.actions.act_window,name:sale.action_order_tree
+msgid "Old Quotations"
+msgstr "Poprzednie oferty"
#. module: sale
#: field:sale.order,amount_untaxed:0
@@ -1850,7 +2006,7 @@ msgid "Untaxed Amount"
msgstr "Kwota bez podatku"
#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:163
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:170
#: model:ir.actions.act_window,name:sale.action_view_sale_advance_payment_inv
#: view:sale.advance.payment.inv:0
#: view:sale.order:0
@@ -1859,7 +2015,7 @@ msgid "Advance Invoice"
msgstr "Faktura zaliczkowa"
#. module: sale
-#: code:addons/sale/sale.py:591
+#: code:addons/sale/sale.py:624
#, python-format
msgid "The sales order '%s' has been cancelled."
msgstr "Zamówienie sprzedaży '%s' zostało anulowane."
@@ -1902,20 +2058,20 @@ msgid "Packings"
msgstr "Pobrania"
#. module: sale
-#: field:sale.config.picking_policy,progress:0
-#: field:sale.installer,progress:0
-msgid "Configuration Progress"
-msgstr "Postęp konfiguracji"
+#: view:sale.order.line:0
+msgid "Sale Order Lines ready to be invoiced"
+msgstr ""
#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_product_tree
-msgid "Product sales"
-msgstr "Sprzedaż produktu"
+#: view:sale.report:0
+msgid "Sales order created in last month"
+msgstr ""
#. module: sale
-#: field:sale.order,date_order:0
-msgid "Ordered Date"
-msgstr "Data zamówienia"
+#: model:ir.actions.act_window,name:sale.action_email_templates
+#: model:ir.ui.menu,name:sale.menu_email_templates
+msgid "Email Templates"
+msgstr ""
#. module: sale
#: model:ir.actions.act_window,name:sale.action_order_form
@@ -1925,14 +2081,15 @@ msgid "Sales Orders"
msgstr "Zamówienia sprzedaży"
#. module: sale
-#: selection:sale.config.picking_policy,picking_policy:0
-msgid "Direct Delivery"
-msgstr "Dostawa bezpośrednia"
+#: model:ir.model,name:sale.model_sale_shop
+#: view:sale.shop:0
+msgid "Sales Shop"
+msgstr "Sklep sprzedaży"
#. module: sale
-#: field:sale.installer,sale_journal:0
-msgid "Invoicing journals"
-msgstr "Dzienniki fakturowania"
+#: selection:sale.report,month:0
+msgid "November"
+msgstr "Listopad"
#. module: sale
#: field:sale.advance.payment.inv,product_id:0
@@ -1940,18 +2097,12 @@ msgid "Advance Product"
msgstr "Produkt - zaliczka"
#. module: sale
-#: view:sale.report:0
-#: field:sale.report,shipped_qty_1:0
-msgid "Shipped Qty"
-msgstr "Wydana ilość"
-
-#. module: sale
-#: view:sale.open.invoice:0
-msgid "You invoice has been successfully created!"
-msgstr "Faktura została utworzona"
+#: view:sale.order:0
+msgid "Compute"
+msgstr "Oblicz"
#. module: sale
-#: code:addons/sale/sale.py:585
+#: code:addons/sale/sale.py:618
#, python-format
msgid "You must first cancel all invoices attached to this sales order."
msgstr "Musisz najpierw anulować wszystkie faktury do zamówienia."
@@ -1962,25 +2113,14 @@ msgid "January"
msgstr "Styczeń"
#. module: sale
-#: view:sale.installer:0
-msgid "Configure Your Sales Management Application"
-msgstr "Konfiguruj aplikację sprzedaży"
-
-#. module: sale
#: model:ir.actions.act_window,name:sale.action_order_tree4
msgid "Sales Order in Progress"
msgstr "Zam. sprzedaży w trakcie przetwarzania"
#. module: sale
-#: field:sale.installer,sale_layout:0
-msgid "Sales Order Layout Improvement"
-msgstr "Modyfikacja układu zamówień sprzedaży"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:63
-#, python-format
-msgid "Error"
-msgstr "Błąd"
+#: help:sale.order,origin:0
+msgid "Reference of the document that generated this sales order request."
+msgstr "Odnośnik do dokumentu, który wygenerował to zapytanie ofertowe."
#. module: sale
#: view:sale.report:0
@@ -1989,6 +2129,11 @@ msgid "Commitment Delay"
msgstr "Opóźnienie dostawy"
#. module: sale
+#: selection:sale.order,order_policy:0
+msgid "Deliver & invoice on demand"
+msgstr ""
+
+#. module: sale
#: model:process.node,note:sale.process_node_saleprocurement0
msgid ""
"One Procurement order for each sales order line and for each of the "
@@ -2013,13 +2158,12 @@ msgid "Confirmed sales order to invoice."
msgstr "Poztwierdzone zamówienia sprzedaży do fakturowania."
#. module: sale
-#: code:addons/sale/sale.py:290
-#, python-format
-msgid "Cannot delete Sales Order(s) which are already confirmed !"
-msgstr "Nie można usunąć Zamówienia sprzedaży, ktore zostało potwierdzone !"
+#: view:sale.order:0
+msgid "Sales Order that haven't yet been confirmed"
+msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:316
+#: code:addons/sale/sale.py:322
#, python-format
msgid "The sales order '%s' has been set in draft state."
msgstr "Zamówienie sprzedaży '%s' zostało ustawione na stan 'Projekt'."
@@ -2030,37 +2174,27 @@ msgid "from stock"
msgstr "z zapasu"
#. module: sale
-#: field:sale.config.picking_policy,order_policy:0
-msgid "Shipping Default Policy"
-msgstr "Domyślne zasady wysyłki"
-
-#. module: sale
#: view:sale.open.invoice:0
msgid "Close"
msgstr "Zamknij"
#. module: sale
+#: code:addons/sale/sale.py:1248
+#, python-format
+msgid "No Pricelist ! : "
+msgstr ""
+
+#. module: sale
#: field:sale.order,shipped:0
msgid "Delivered"
msgstr "Dostarczone"
#. module: sale
-#: code:addons/sale/sale.py:1115
-#, python-format
-msgid "Not enough stock !"
-msgstr "Brak zapasu !"
-
-#. module: sale
#: constraint:stock.move:0
msgid "You must assign a production lot for this product"
msgstr "Musisz podać nr partii dla tego produktu"
#. module: sale
-#: field:sale.order.line,sequence:0
-msgid "Layout Sequence"
-msgstr "Porządek pozycji"
-
-#. module: sale
#: model:ir.actions.act_window,help:sale.action_shop_form
msgid ""
"If you have more than one shop reselling your company products, you can "
@@ -2090,11 +2224,6 @@ msgid "May"
msgstr "Maj"
#. module: sale
-#: help:sale.installer,sale_order_dates:0
-msgid "Adds commitment, requested and effective dates on Sales Orders."
-msgstr "Dodaje do zamówienia daty dostawy, spodziewaną i efektywną."
-
-#. module: sale
#: view:sale.order:0
#: field:sale.order,partner_id:0
#: field:sale.order.line,order_partner_id:0
@@ -2102,25 +2231,11 @@ msgid "Customer"
msgstr "Klient"
#. module: sale
-#: model:product.template,name:sale.advance_product_0_product_template
-msgid "Advance"
-msgstr "Zaliczka"
-
-#. module: sale
#: selection:sale.report,month:0
msgid "February"
msgstr "Luty"
#. module: sale
-#: help:sale.installer,sale_journal:0
-msgid ""
-"Allows you to group and invoice your delivery orders according to different "
-"invoicing types: daily, weekly, etc."
-msgstr ""
-"Pozwala grupować i fakturować twoje dostawy według różnych typów: dziennie, "
-"tygodniowo itd."
-
-#. module: sale
#: selection:sale.report,month:0
msgid "April"
msgstr "Kwiecień"
@@ -2131,11 +2246,6 @@ msgid "Accounting"
msgstr "Księgowość"
#. module: sale
-#: field:sale.config.picking_policy,step:0
-msgid "Steps To Deliver a Sales Order"
-msgstr "Kroki dostawy Zamówienia sprzedaży"
-
-#. module: sale
#: view:sale.order:0
#: view:sale.order.line:0
msgid "Search Sales Order"
@@ -2147,18 +2257,18 @@ msgid "Sales Order Requisition"
msgstr "Zlecenie zamówienia sprzedaży"
#. module: sale
+#: code:addons/sale/sale.py:1242
+#, python-format
+msgid "Not enough stock ! : "
+msgstr ""
+
+#. module: sale
#: report:sale.order:0
#: field:sale.order,payment_term:0
msgid "Payment Term"
msgstr "Warunki płatności"
#. module: sale
-#: help:sale.installer,sale_layout:0
-msgid ""
-"Provides some features to improve the layout of the Sales Order reports."
-msgstr "Umożliwia modyfikację układu Zamówienia sprzedaży"
-
-#. module: sale
#: model:ir.actions.act_window,help:sale.action_order_report_all
msgid ""
"This report performs analysis on your quotations and sales orders. Analysis "
@@ -2266,6 +2376,9 @@ msgstr "Faktura wg dostaw"
#~ msgid "You invoice has been successfully created !"
#~ msgstr "Twoja faktura została poprawnie utworzona"
+#~ msgid "Partial Delivery"
+#~ msgstr "Dostawa częściowa"
+
#~ msgid "Delivery, from the warehouse to the customer."
#~ msgstr "Dostawa z magazynu do klienta"
@@ -2278,6 +2391,9 @@ msgstr "Faktura wg dostaw"
#~ msgid "Origin"
#~ msgstr "Pochodzenie"
+#~ msgid "Shipping Policy"
+#~ msgstr "Zasady wysyłki"
+
#~ msgid "Net Price"
#~ msgstr "Cena netto"
@@ -2292,6 +2408,9 @@ msgstr "Faktura wg dostaw"
#~ msgstr ""
#~ "Musisz anulować wszystkie faktury związane z tym zamówieniem sprzedaży"
+#~ msgid "Complete Delivery"
+#~ msgstr "Dostawa kompletna"
+
#~ msgid "Invoice on Order After Delivery"
#~ msgstr "Faktura po dostawie wg zamówienia"
@@ -2301,8 +2420,8 @@ msgstr "Faktura wg dostaw"
#~ msgid "Sale Shop"
#~ msgstr "Sklep sprzedaży"
-#~ msgid "My Quotations"
-#~ msgstr "Moje oferty"
+#~ msgid "Shipping Default Policy"
+#~ msgstr "Domyślne zasady wysyłki"
#, python-format
#~ msgid "Could not cancel sale order !"
@@ -2321,6 +2440,9 @@ msgstr "Faktura wg dostaw"
#~ msgid "Sales Process"
#~ msgstr "Proces sprzedaży"
+#~ msgid "Product sales"
+#~ msgstr "Sprzedaż produktu"
+
#~ msgid "Configure Sale Order Logistic"
#~ msgstr "Konfiguruj ligistykę zamówienia sprzedaży"
@@ -2336,6 +2458,9 @@ msgstr "Faktura wg dostaw"
#~ msgid "Open Advance Invoice"
#~ msgstr "Otwarte faktury płatne z góry"
+#~ msgid "Sales Management"
+#~ msgstr "Sprzedaż"
+
#~ msgid "Make invoices"
#~ msgstr "Utwórz faktury"
@@ -2366,6 +2491,9 @@ msgstr "Faktura wg dostaw"
#~ "Zamówienie sprzedaży może być fakturowane wielokrotnie (np. każda pozycja "
#~ "oddzielnie)"
+#~ msgid "Payment Before Delivery"
+#~ msgstr "Płatność przed dostawą"
+
#~ msgid "Invoice Corrected"
#~ msgstr "Faktura poprawiona"
@@ -2381,6 +2509,9 @@ msgstr "Faktura wg dostaw"
#~ msgid "Recreate Procurement"
#~ msgstr "Utwórz nabycie od nowa"
+#~ msgid "All at Once"
+#~ msgstr "Wszystko naraz"
+
#~ msgid "Manual Description"
#~ msgstr "Opis ręczny"
@@ -2403,6 +2534,12 @@ msgstr "Faktura wg dostaw"
#~ "W zamówieniu sprzedaży, nabycie dla każdej pozycji. Ono wchodzi do "
#~ "zamówienia nabycia"
+#~ msgid "Direct Delivery"
+#~ msgstr "Dostawa bezpośrednia"
+
+#~ msgid "Delivery Order Only"
+#~ msgstr "Tylko zamówienia dostawy"
+
#~ msgid "Sequence"
#~ msgstr "Numeracja"
@@ -2469,6 +2606,9 @@ msgstr "Faktura wg dostaw"
#~ msgid "Sale Procurement"
#~ msgstr "Nabycie dla sprzedaży"
+#~ msgid "Shipping & Manual Invoice"
+#~ msgstr "Wysyłka i ręczna faktura"
+
#~ msgid "Quotation (A sale order in draft state)"
#~ msgstr "Oferta (zamówienie sprzedaży w stanie Projekt)"
@@ -2587,10 +2727,38 @@ msgstr "Faktura wg dostaw"
#~ " - 'Faktura z wydania' utworzy fakturę w trakcie wykonywania wydania "
#~ "zewnętrznego."
+#~ msgid "Allows you to compute delivery costs on your quotations."
+#~ msgstr "Pozwala obliczyć koszt dostawy do oferty"
+
+#~ msgid "Configure Picking Policy for Sales Order"
+#~ msgstr "Konfiguruj politykę pobierania dla zamówień sprzedaży"
+
+#~ msgid " Year "
+#~ msgstr " Rok "
+
+#~ msgid "Sales Order Dates"
+#~ msgstr "Daty zamówienia sprzedaży"
+
+#~ msgid "Margins in Sales Orders"
+#~ msgstr "Marże w zamówieniach sprzedaży"
+
+#~ msgid "Sales Application Configuration"
+#~ msgstr "Konfiguracja aplikacji sprzedażowej"
+
+#~ msgid "Delivery Costs"
+#~ msgstr "Koszt dostawy"
+
#~ msgid ""
#~ "This is the list of picking list that have been generated for this invoice"
#~ msgstr "To pobranie zostało utworzone dla tej faktury"
+#~ msgid "Order date"
+#~ msgstr "Data zamówienia"
+
+#, python-format
+#~ msgid "Picking Information !"
+#~ msgstr "Inofrmacja pobrania !"
+
#, python-format
#~ msgid "You must first cancel all packing attached to this sale order."
#~ msgstr ""
@@ -2625,3 +2793,225 @@ msgstr "Faktura wg dostaw"
#~ msgid "Invoice based on packing lists"
#~ msgstr "Faktura wg pobrania"
+
+#~ msgid "Invoicing"
+#~ msgstr "Fakturowanie"
+
+#~ msgid ""
+#~ "Provides some features to improve the layout of the Sales Order reports."
+#~ msgstr "Umożliwia modyfikację układu Zamówienia sprzedaży"
+
+#~ msgid "Sales Order Layout Improvement"
+#~ msgstr "Modyfikacja układu zamówień sprzedaży"
+
+#~ msgid "Configure"
+#~ msgstr "Konfiguruj"
+
+#~ msgid "Configure Sales Order Logistics"
+#~ msgstr "Konfiguruj logistykę zamówień sprzedaży"
+
+#~ msgid ""
+#~ "The Shipping Policy is used to synchronise invoice and delivery operations.\n"
+#~ " - The 'Pay Before delivery' choice will first generate the invoice and "
+#~ "then generate the picking order after the payment of this invoice.\n"
+#~ " - The 'Shipping & Manual Invoice' will create the picking order directly "
+#~ "and wait for the user to manually click on the 'Invoice' button to generate "
+#~ "the draft invoice.\n"
+#~ " - The 'Invoice On Order After Delivery' choice will generate the draft "
+#~ "invoice based on sales order after all picking lists have been finished.\n"
+#~ " - The 'Invoice From The Picking' choice is used to create an invoice "
+#~ "during the picking process."
+#~ msgstr ""
+#~ "Zasady wysyłki są stosowane do synchronizowania operacji fakturowania z "
+#~ "wydaniami.\n"
+#~ " - 'Płatność przed wydaniem' najpierw wygeneruje fakturę, a pobranie po "
+#~ "zapłaceniu faktury.\n"
+#~ " - 'Wydanie i ręczna faktura' wygeneruje pobranie od razu i poczeka aż "
+#~ "użytkownik utworzy fakturę przyciskiem.\n"
+#~ " - 'Faktura wg zamówienia po wydaniu' wygeneruje projekt faktury wg "
+#~ "zamówienia po wykonaniu wszystkich pobrań.\n"
+#~ " - 'Faktura z pobrania' jest stosowana do generowania faktury w trakcie "
+#~ "pobrania."
+
+#~ msgid "Enhance your core Sales Application with additional functionalities."
+#~ msgstr ""
+#~ "Rozszerz swoją podstawową aplikację sprzedaży o dodatkowe funkcjonalności."
+
+#~ msgid "Invoice On Order After Delivery"
+#~ msgstr "Faktura wg zamówienia po wydaniu"
+
+#~ msgid "Picking Default Policy"
+#~ msgstr "Zasady pobrań"
+
+#, python-format
+#~ msgid "You cannot cancel a sales order line that has already been invoiced !"
+#~ msgstr ""
+#~ "Nie możesz anulować pozycji zamówienia sprzedaży, które zostało już "
+#~ "zafakturowane!"
+
+#~ msgid "Invoice From The Picking"
+#~ msgstr "Faktura z pobrania"
+
+#~ msgid "Picking List & Delivery Order"
+#~ msgstr "Pobranie i zamówienie wysyłki"
+
+#, python-format
+#~ msgid "Cannot delete a sales order line which is %s !"
+#~ msgstr "Nie mozna usuwac pozycji zamówienia sprzedaży, które jest %s !"
+
+#~ msgid " Month "
+#~ msgstr " Miesiąc "
+
+#~ msgid " Month-1 "
+#~ msgstr " Miesiąc-1 "
+
+#~ msgid "Invoicing journals"
+#~ msgstr "Dzienniki fakturowania"
+
+#~ msgid "Ordered Date"
+#~ msgstr "Data zamówienia"
+
+#~ msgid "Configuration Progress"
+#~ msgstr "Postęp konfiguracji"
+
+#~ msgid "Shipped Qty"
+#~ msgstr "Wydana ilość"
+
+#, python-format
+#~ msgid "Not enough stock !"
+#~ msgstr "Brak zapasu !"
+
+#~ msgid "Setup your sales workflow and default values."
+#~ msgstr "Ustaw obieg sprzedaży i wartości domyślne."
+
+#~ msgid "Order Reference must be unique !"
+#~ msgstr "Numer zamówienia musi być unikalny !"
+
+#~ msgid ""
+#~ "\n"
+#~ " The base module to manage quotations and sales orders.\n"
+#~ "\n"
+#~ " * Workflow with validation steps:\n"
+#~ " - Quotation -> Sales order -> Invoice\n"
+#~ " * Invoicing methods:\n"
+#~ " - Invoice on order (before or after shipping)\n"
+#~ " - Invoice on delivery\n"
+#~ " - Invoice on timesheets\n"
+#~ " - Advance invoice\n"
+#~ " * Partners preferences (shipping, invoicing, incoterm, ...)\n"
+#~ " * Products stocks and prices\n"
+#~ " * Delivery methods:\n"
+#~ " - all at once, multi-parcel\n"
+#~ " - delivery costs\n"
+#~ " * Dashboard for salesman that includes:\n"
+#~ " * Your open quotations\n"
+#~ " * Top 10 sales of the month\n"
+#~ " * Cases statistics\n"
+#~ " * Graph of sales by product\n"
+#~ " * Graph of cases of the month\n"
+#~ " "
+#~ msgstr ""
+#~ "\n"
+#~ " Podstawowy moduł do zarządzania ofertami i zamówieniami sprzedaży.\n"
+#~ "\n"
+#~ " * Obieg z krokami zatwierdzania:\n"
+#~ " - Oferta -> Zamowienie sprzedaży -> Faktura\n"
+#~ " * Metody fakturowania:\n"
+#~ " - Faktura wg zamówienia (przed lub po wydaniu)\n"
+#~ " - Faktura wg wydania\n"
+#~ " - Faktura wg karty czasu pracy\n"
+#~ " - Faktura zaliczkowa\n"
+#~ " * Ustawienia dla partnerów (wydania, fakturowanie, incoterm, ...)\n"
+#~ " * Stany zapasów i cenniki\n"
+#~ " * Metody wydań/dostaw:\n"
+#~ " - kompletne, częściowe\n"
+#~ " - koszty dostaw\n"
+#~ " * Konsola dla sprzedawcy:\n"
+#~ " * Otwarte oferty\n"
+#~ " * Największe sprzedaże w miesiącu\n"
+#~ " * Statystyka spraw\n"
+#~ " * Wykres sprzedaży\n"
+#~ " * Wykres spraw\n"
+#~ " "
+
+#~ msgid ""
+#~ "By default, OpenERP is able to manage complex routing and paths of products "
+#~ "in your warehouse and partner locations. This will configure the most common "
+#~ "and simple methods to deliver products to the customer in one or two "
+#~ "operations by the worker."
+#~ msgstr ""
+#~ "OpenERP może obsługiwać złożone obiegi produktów w twoim magazynie i "
+#~ "magazynach klientów. To jest konfiguracja najprostszej metody wydania "
+#~ "produktów w jednej lub dwóch operacjach."
+
+#~ msgid ""
+#~ "Gives the margin of profitability by calculating the difference between Unit "
+#~ "Price and Cost Price."
+#~ msgstr ""
+#~ "Pokazuje marżę obliczając różnicę pomiędzy Ceną jednostkową a Ceną kosztową."
+
+#~ msgid ""
+#~ "Gives the state of the quotation or sales order. \n"
+#~ "The exception state is automatically set when a cancel operation occurs in "
+#~ "the invoice validation (Invoice Exception) or in the picking list process "
+#~ "(Shipping Exception). \n"
+#~ "The 'Waiting Schedule' state is set when the invoice is confirmed but "
+#~ "waiting for the scheduler to run on the date 'Ordered Date'."
+#~ msgstr ""
+#~ "Pokazuje stan oferty lub zamówienia sprzedaży. \n"
+#~ "Stan wyjątku jest ustawiany, kiedy wystąpi anulowanie w fakturze (Wyjątek "
+#~ "faktury) lub w pobraniu (Wyjątek pobrania). \n"
+#~ "Stan 'Czeka na planowanie' jest ustawiany, gdy faktura jest potwierdzona, "
+#~ "ale czeka na planistę uruhcamianego w dacie 'Data zamówienia'."
+
+#, python-format
+#~ msgid ""
+#~ "You selected a quantity of %d Units.\n"
+#~ "But it's not compatible with the selected packaging.\n"
+#~ "Here is a proposition of quantities according to the packaging:\n"
+#~ "\n"
+#~ "EAN: %s Quantity: %s Type of ul: %s"
+#~ msgstr ""
+#~ "Wybrałeś ilość %d jednostek.\n"
+#~ "Ale to jest niezgodne z wybranym opakowaniem.\n"
+#~ "Oto propozycja ilości zgodna z opakowaniem:\n"
+#~ "\n"
+#~ "EAN: %s Ilość: %s Typ JL: %s"
+
+#~ msgid "Configure Your Sales Management Application"
+#~ msgstr "Konfiguruj aplikację sprzedaży"
+
+#~ msgid "Adds commitment, requested and effective dates on Sales Orders."
+#~ msgstr "Dodaje do zamówienia daty dostawy, spodziewaną i efektywną."
+
+#~ msgid ""
+#~ "Allows you to group and invoice your delivery orders according to different "
+#~ "invoicing types: daily, weekly, etc."
+#~ msgstr ""
+#~ "Pozwala grupować i fakturować twoje dostawy według różnych typów: dziennie, "
+#~ "tygodniowo itd."
+
+#~ msgid "Layout Sequence"
+#~ msgstr "Porządek pozycji"
+
+#, python-format
+#~ msgid "Cannot delete Sales Order(s) which are already confirmed !"
+#~ msgstr "Nie można usunąć Zamówienia sprzedaży, ktore zostało potwierdzone !"
+
+#~ msgid "Steps To Deliver a Sales Order"
+#~ msgstr "Kroki dostawy Zamówienia sprzedaży"
+
+#~ msgid "title"
+#~ msgstr "tytuł"
+
+#~ msgid ""
+#~ "The Shipping Policy is used to configure per order if you want to deliver as "
+#~ "soon as possible when one product is available or you wait that all products "
+#~ "are available.."
+#~ msgstr ""
+#~ "Zasady wydań są stosowane do decydowania, czy chcesz wydawać produkty "
+#~ "natychmiast kiedy część ich jest dostępna, czy chcesz czekać, aż wszystkie "
+#~ "produkty z zamówienia będą dostępne."
+
+#~ msgid "Advance"
+#~ msgstr "Zaliczka"
diff --git a/addons/sale/i18n/pt.po b/addons/sale/i18n/pt.po
index 58356e0183f..cf7fde8db52 100644
--- a/addons/sale/i18n/pt.po
+++ b/addons/sale/i18n/pt.po
@@ -6,15 +6,27 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2011-01-11 11:16+0000\n"
+"POT-Creation-Date: 2011-12-22 18:43+0000\n"
"PO-Revision-Date: 2010-12-19 11:38+0000\n"
"Last-Translator: OpenERP Administrators <Unknown>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-05 05:17+0000\n"
-"X-Generator: Launchpad (build 14231)\n"
+"X-Launchpad-Export-Date: 2011-12-23 06:47+0000\n"
+"X-Generator: Launchpad (build 14560)\n"
+
+#. module: sale
+#: field:sale.config.picking_policy,timesheet:0
+msgid "Based on Timesheet"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid ""
+"Sale Order Lines that are confirmed, done or in exception state and haven't "
+"yet been invoiced"
+msgstr ""
#. module: sale
#: view:board.board:0
@@ -23,11 +35,6 @@ msgid "Sales by Salesman in last 90 days"
msgstr "Vendas por vendedor nos últimos 90 dias"
#. module: sale
-#: help:sale.installer,delivery:0
-msgid "Allows you to compute delivery costs on your quotations."
-msgstr "Permite calcular os custos de entrega nas cotações."
-
-#. module: sale
#: help:sale.order,picking_policy:0
msgid ""
"If you don't have enough stock available to deliver all at once, do you "
@@ -37,6 +44,11 @@ msgstr ""
"entrega parcial ou não?"
#. module: sale
+#: view:sale.order:0
+msgid "UoS"
+msgstr ""
+
+#. module: sale
#: help:sale.order,partner_shipping_id:0
msgid "Shipping address for current sales order."
msgstr "Endereço de entrega para esta ordem de venda."
@@ -60,22 +72,12 @@ msgid "Cancel Order"
msgstr "Cancelar Ordem de Venda"
#. module: sale
-#: view:sale.config.picking_policy:0
-msgid "Configure Sales Order Logistics"
-msgstr "Configurar logística das ordens de venda"
-
-#. module: sale
-#: code:addons/sale/sale.py:603
+#: code:addons/sale/sale.py:638
#, python-format
msgid "The quotation '%s' has been converted to a sales order."
msgstr "A cotação '%s' foi convertida numa ordem de venda."
#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Payment Before Delivery"
-msgstr "Pagamento Antes da Entrega"
-
-#. module: sale
#: code:addons/sale/wizard/sale_make_invoice.py:42
#, python-format
msgid "Warning !"
@@ -92,12 +94,6 @@ msgid "Drives procurement orders for every sales order line."
msgstr ""
#. module: sale
-#: selection:sale.config.picking_policy,picking_policy:0
-msgid "All at Once"
-msgstr "Tudo de uma vez"
-
-#. module: sale
-#: field:sale.order,project_id:0
#: view:sale.report:0
#: field:sale.report,analytic_account_id:0
#: field:sale.shop,project_id:0
@@ -117,6 +113,15 @@ msgstr ""
"pela totalidade da encomenda."
#. module: sale
+#: code:addons/sale/sale.py:295
+#, python-format
+msgid ""
+"In order to delete a confirmed sale order, you must cancel it before ! To "
+"cancel a sale order, you must first cancel related picking or delivery "
+"orders."
+msgstr ""
+
+#. module: sale
#: model:process.node,name:sale.process_node_saleprocurement0
msgid "Procurement Order"
msgstr "Ordem de aprovisionamento"
@@ -128,6 +133,11 @@ msgid "Partner"
msgstr "Parceiro"
#. module: sale
+#: selection:sale.order,order_policy:0
+msgid "Invoice based on deliveries"
+msgstr ""
+
+#. module: sale
#: view:sale.order:0
msgid "Order Line"
msgstr "Linha de Ordem de Venda"
@@ -165,9 +175,14 @@ msgid "Default Payment Term"
msgstr "Termos de Pagamento Padrão"
#. module: sale
-#: model:ir.actions.act_window,name:sale.action_config_picking_policy
-msgid "Configure Picking Policy for Sales Order"
-msgstr "Configure a política de recolhas das ordens de venda"
+#: field:sale.config.picking_policy,deli_orders:0
+msgid "Based on Delivery Orders"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.picking_policy,time_unit:0
+msgid "Main Working Time Unit"
+msgstr ""
#. module: sale
#: view:sale.order:0
@@ -183,9 +198,10 @@ msgid "Disc.(%)"
msgstr "Desc.(%)"
#. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_forceassignation0
-msgid "Force Assignation"
-msgstr "Forçar Atribuição"
+#: view:sale.report:0
+#: field:sale.report,price_total:0
+msgid "Total Price"
+msgstr "Preço Total"
#. module: sale
#: help:sale.make.invoice,grouped:0
@@ -193,6 +209,11 @@ msgid "Check the box to group the invoices for the same customers"
msgstr "Marque a caixa para agrupar as faturas para o mesmo cliente"
#. module: sale
+#: view:sale.order:0
+msgid "My Sale Orders"
+msgstr ""
+
+#. module: sale
#: selection:sale.order,invoice_quantity:0
msgid "Ordered Quantities"
msgstr "Quantidades Pedidas"
@@ -233,14 +254,25 @@ msgstr ""
"baseada na recolha' ou 'fatura baseada na ordem após entrega'."
#. module: sale
+#: field:sale.config.picking_policy,task_work:0
+msgid "Based on Tasks' Work"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
+msgid "Quotations and Sales"
+msgstr ""
+
+#. module: sale
#: model:ir.model,name:sale.model_sale_make_invoice
msgid "Sales Make Invoice"
msgstr ""
#. module: sale
-#: view:sale.order:0
-msgid "Recreate Packing"
-msgstr "Recriar embalagem"
+#: code:addons/sale/sale.py:330
+#, python-format
+msgid "Pricelist Warning!"
+msgstr ""
#. module: sale
#: field:sale.order.line,discount:0
@@ -248,12 +280,10 @@ msgid "Discount (%)"
msgstr "Desconto (%)"
#. module: sale
-#: help:res.company,security_lead:0
-msgid ""
-"This is the days added to what you promise to customers for security purpose"
-msgstr ""
-"Estes são os dias adicionados aos que prometeu aos clientes para fins de "
-"segurança"
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_quotation_for_sale
+msgid "My Quotations"
+msgstr "Minhas Cotações"
#. module: sale
#: view:board.board:0
@@ -278,7 +308,22 @@ msgid "Shop Name"
msgstr "Nome da Loja"
#. module: sale
-#: code:addons/sale/sale.py:1014
+#: help:sale.order,order_policy:0
+msgid ""
+"The Invoice Policy is used to synchronise invoice and delivery operations.\n"
+" - The 'Pay before delivery' choice will first generate the invoice and "
+"then generate the picking order after the payment of this invoice.\n"
+" - The 'Deliver & Invoice on demand' will create the picking order directly "
+"and wait for the user to manually click on the 'Invoice' button to generate "
+"the draft invoice based on the sale order or the sale order lines.\n"
+" - The 'Invoice on order after delivery' choice will generate the draft "
+"invoice based on sales order after all picking lists have been finished.\n"
+" - The 'Invoice based on deliveries' choice is used to create an invoice "
+"during the picking process."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:1158
#, python-format
msgid "No Customer Defined !"
msgstr "Nenhum Cliente Definido !"
@@ -289,9 +334,12 @@ msgid "Sales in Exception"
msgstr "Excepção de Vendas"
#. module: sale
-#: view:sale.order:0
-msgid "Set to Draft"
-msgstr "Definir como Rascunho"
+#: code:addons/sale/sale.py:1145
+#: code:addons/sale/sale.py:1264
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:70
+#, python-format
+msgid "Configuration Error !"
+msgstr ""
#. module: sale
#: view:sale.order:0
@@ -299,22 +347,7 @@ msgid "Conditions"
msgstr "Condições"
#. module: sale
-#: help:sale.order,order_policy:0
-msgid ""
-"The Shipping Policy is used to synchronise invoice and delivery operations.\n"
-" - The 'Pay Before delivery' choice will first generate the invoice and "
-"then generate the picking order after the payment of this invoice.\n"
-" - The 'Shipping & Manual Invoice' will create the picking order directly "
-"and wait for the user to manually click on the 'Invoice' button to generate "
-"the draft invoice.\n"
-" - The 'Invoice On Order After Delivery' choice will generate the draft "
-"invoice based on sales order after all picking lists have been finished.\n"
-" - The 'Invoice From The Picking' choice is used to create an invoice "
-"during the picking process."
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:939
+#: code:addons/sale/sale.py:1034
#, python-format
msgid ""
"There is no income category account defined in default Properties for "
@@ -324,9 +357,9 @@ msgstr ""
"para a categoria de artigo ou a posição fiscal não está definida!"
#. module: sale
-#: view:sale.installer:0
-msgid "Configure"
-msgstr "Configurar"
+#: selection:sale.report,month:0
+msgid "August"
+msgstr "Agosto"
#. module: sale
#: constraint:stock.move:0
@@ -334,7 +367,7 @@ msgid "You try to assign a lot which is not from the same product"
msgstr "Está a tentar associar a um lote, que não é do mesmo artigo."
#. module: sale
-#: code:addons/sale/sale.py:620
+#: code:addons/sale/sale.py:655
#, python-format
msgid "invalid mode for test_state"
msgstr "metodo inválido para test_state"
@@ -345,7 +378,7 @@ msgid "June"
msgstr "Junho"
#. module: sale
-#: code:addons/sale/sale.py:584
+#: code:addons/sale/sale.py:617
#, python-format
msgid "Could not cancel this sales order !"
msgstr "Não foi possível cancelar esta ordem de venda!"
@@ -366,8 +399,12 @@ msgid "October"
msgstr "Outubro"
#. module: sale
+#: sql_constraint:stock.picking:0
+msgid "Reference must be unique per Company!"
+msgstr ""
+
+#. module: sale
#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_quotation_for_sale
#: view:sale.order:0
#: view:sale.report:0
msgid "Quotations"
@@ -379,11 +416,6 @@ msgid "Pricelist for current sales order."
msgstr "Lista de Preços para esta ordem de venda."
#. module: sale
-#: selection:sale.config.picking_policy,step:0
-msgid "Delivery Order Only"
-msgstr "Somente Entregar Ordem de Venda"
-
-#. module: sale
#: report:sale.order:0
msgid "TVA :"
msgstr "IVA :"
@@ -410,6 +442,7 @@ msgstr "Posição Fiscal"
#. module: sale
#: view:sale.order:0
#: view:sale.order.line:0
+#: field:sale.report,product_uom:0
msgid "UoM"
msgstr "UoM"
@@ -432,7 +465,13 @@ msgid ""
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:971
+#: code:addons/sale/sale.py:1061
+#, python-format
+msgid "You cannot cancel a sale order line that has already been invoiced!"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:1066
#, python-format
msgid "You must first cancel stock moves attached to this sales order line."
msgstr ""
@@ -440,7 +479,7 @@ msgstr ""
"ordem de venda."
#. module: sale
-#: code:addons/sale/sale.py:1042
+#: code:addons/sale/sale.py:1134
#, python-format
msgid "(n/a)"
msgstr "(n/d)"
@@ -474,13 +513,35 @@ msgid "Notes"
msgstr "Notas"
#. module: sale
+#: sql_constraint:res.company:0
+msgid "The company name must be unique !"
+msgstr ""
+
+#. module: sale
#: help:sale.order,partner_invoice_id:0
msgid "Invoice address for current sales order."
msgstr "Morada de facturação para esta ordem de venda."
#. module: sale
-#: view:sale.installer:0
-msgid "Enhance your core Sales Application with additional functionalities."
+#: view:sale.report:0
+msgid "Month-1"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered month of the sales order"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:504
+#, python-format
+msgid ""
+"You cannot group sales having different currencies for the same partner."
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,picking_policy:0
+msgid "Deliver each product when available"
msgstr ""
#. module: sale
@@ -500,21 +561,43 @@ msgid "Confirmation Date"
msgstr "Data de confirmação"
#. module: sale
+#: field:sale.order,incoterm:0
+msgid "Incoterm"
+msgstr "Incoterm"
+
+#. module: sale
#: field:sale.order.line,address_allotment_id:0
msgid "Allotment Partner"
msgstr "Parceiro do lote"
#. module: sale
-#: sql_constraint:sale.order:0
-msgid "Order Reference must be unique !"
-msgstr ""
-
-#. module: sale
#: selection:sale.report,month:0
msgid "March"
msgstr "Março"
#. module: sale
+#: constraint:stock.move:0
+msgid "You can not move products from or to a location of the type view."
+msgstr ""
+
+#. module: sale
+#: field:sale.config.picking_policy,sale_orders:0
+msgid "Based on Sales Orders"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,state:0
+msgid ""
+"Givwizard = self.browse(cr, uid, ids)[0]es the state of the quotation or "
+"sales order. \n"
+"The exception state is automatically set when a cancel operation occurs in "
+"the invoice validation (Invoice Exception) or in the picking list process "
+"(Shipping Exception). \n"
+"The 'Waiting Schedule' state is set when the invoice is confirmed but "
+"waiting for the scheduler to run on the order date."
+msgstr ""
+
+#. module: sale
#: help:sale.order,amount_total:0
msgid "The total amount."
msgstr "Montante total."
@@ -530,6 +613,11 @@ msgid "Invoice address :"
msgstr "Endereço da Factura :"
#. module: sale
+#: field:sale.order.line,sequence:0
+msgid "Line Sequence"
+msgstr ""
+
+#. module: sale
#: model:process.transition,note:sale.process_transition_saleorderprocurement0
msgid ""
"For every sales order line, a procurement order is created to supply the "
@@ -576,11 +664,6 @@ msgid "Sales Order Line"
msgstr "Linha da ordem de venda"
#. module: sale
-#: view:sale.config.picking_policy:0
-msgid "Setup your sales workflow and default values."
-msgstr "Configure o seu fluxo de vendas e os valores pre-definidos."
-
-#. module: sale
#: field:sale.shop,warehouse_id:0
msgid "Warehouse"
msgstr "Armazém"
@@ -617,6 +700,11 @@ msgid "Creation Date"
msgstr "Data de criação"
#. module: sale
+#: model:ir.ui.menu,name:sale.menu_sales_configuration_misc
+msgid "Miscellaneous"
+msgstr ""
+
+#. module: sale
#: model:ir.actions.act_window,name:sale.action_order_line_tree3
msgid "Uninvoiced and Delivered Lines"
msgstr "Linhas não Facturadas e Entregues"
@@ -632,14 +720,19 @@ msgid "My Sales"
msgstr "As minhas vendas"
#. module: sale
-#: code:addons/sale/sale.py:290
-#: code:addons/sale/sale.py:966
-#: code:addons/sale/sale.py:1165
+#: code:addons/sale/sale.py:295
+#: code:addons/sale/sale.py:1061
+#: code:addons/sale/sale.py:1290
#, python-format
msgid "Invalid action !"
msgstr "Acção inválida !"
#. module: sale
+#: view:sale.order:0
+msgid "Extra Info"
+msgstr "Informação Extra"
+
+#. module: sale
#: field:sale.order,pricelist_id:0
#: field:sale.report,pricelist_id:0
#: field:sale.shop,pricelist_id:0
@@ -653,13 +746,21 @@ msgid "# of Qty"
msgstr "Qtd"
#. module: sale
+#: code:addons/sale/sale.py:1314
+#, python-format
+msgid "Hour"
+msgstr ""
+
+#. module: sale
#: view:sale.order:0
msgid "Order Date"
msgstr "Data da ordem"
#. module: sale
#: view:sale.order.line:0
+#: view:sale.report:0
#: field:sale.report,shipped:0
+#: field:sale.report,shipped_qty_1:0
msgid "Shipped"
msgstr "Enviado"
@@ -669,8 +770,8 @@ msgid "All Quotations"
msgstr "Todas as cotações"
#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Invoice On Order After Delivery"
+#: view:sale.config.picking_policy:0
+msgid "Options"
msgstr ""
#. module: sale
@@ -679,6 +780,20 @@ msgid "September"
msgstr "Setembro"
#. module: sale
+#: code:addons/sale/sale.py:632
+#, python-format
+msgid "You cannot confirm a sale order which has no line."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:1246
+#, python-format
+msgid ""
+"You have to select a pricelist or a customer in the sales form !\n"
+"Please set one before choosing a product."
+msgstr ""
+
+#. module: sale
#: view:sale.report:0
#: field:sale.report,categ_id:0
msgid "Category of Product"
@@ -695,11 +810,6 @@ msgid "Stock Moves"
msgstr "Movimentos de Stock"
#. module: sale
-#: view:sale.report:0
-msgid " Year "
-msgstr " Ano "
-
-#. module: sale
#: field:sale.order,state:0
#: field:sale.report,state:0
msgid "Order State"
@@ -717,7 +827,7 @@ msgid "Sales By Month"
msgstr "Vendas, por mês"
#. module: sale
-#: code:addons/sale/sale.py:970
+#: code:addons/sale/sale.py:1065
#, python-format
msgid "Could not cancel sales order line!"
msgstr "Não foi possível cancelar a linha da ordem de venda."
@@ -750,42 +860,19 @@ msgid ""
msgstr ""
#. module: sale
+#: field:sale.order,date_order:0
+msgid "Date"
+msgstr ""
+
+#. module: sale
#: view:sale.report:0
msgid "Extended Filters..."
msgstr "Filtros avançados"
#. module: sale
-#: model:ir.module.module,description:sale.module_meta_information
-msgid ""
-"\n"
-" The base module to manage quotations and sales orders.\n"
-"\n"
-" * Workflow with validation steps:\n"
-" - Quotation -> Sales order -> Invoice\n"
-" * Invoicing methods:\n"
-" - Invoice on order (before or after shipping)\n"
-" - Invoice on delivery\n"
-" - Invoice on timesheets\n"
-" - Advance invoice\n"
-" * Partners preferences (shipping, invoicing, incoterm, ...)\n"
-" * Products stocks and prices\n"
-" * Delivery methods:\n"
-" - all at once, multi-parcel\n"
-" - delivery costs\n"
-" * Dashboard for salesman that includes:\n"
-" * Your open quotations\n"
-" * Top 10 sales of the month\n"
-" * Cases statistics\n"
-" * Graph of sales by product\n"
-" * Graph of cases of the month\n"
-" "
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_shop
-#: view:sale.shop:0
-msgid "Sales Shop"
-msgstr "Loja"
+#: selection:sale.order.line,state:0
+msgid "Exception"
+msgstr "Excepção"
#. module: sale
#: model:ir.model,name:sale.model_res_company
@@ -793,9 +880,10 @@ msgid "Companies"
msgstr "Empresas"
#. module: sale
-#: selection:sale.report,month:0
-msgid "November"
-msgstr "Novembro"
+#: code:addons/sale/sale.py:1259
+#, python-format
+msgid "No valid pricelist line found ! :"
+msgstr ""
#. module: sale
#: view:sale.order:0
@@ -803,8 +891,8 @@ msgid "History"
msgstr "Histórico"
#. module: sale
-#: field:sale.config.picking_policy,picking_policy:0
-msgid "Picking Default Policy"
+#: selection:sale.order,order_policy:0
+msgid "Invoice on order after delivery"
msgstr ""
#. module: sale
@@ -831,13 +919,14 @@ msgstr ""
"O nome e a morada do contacto que fez uma encomenda ou pediu uma cotação"
#. module: sale
-#: code:addons/sale/sale.py:966
-#, python-format
-msgid "You cannot cancel a sales order line that has already been invoiced !"
-msgstr "Não pode cancelar uma linha de ordem de venda já facturada!"
+#: help:res.company,security_lead:0
+msgid ""
+"This is the days added to what you promise to customers for security purpose"
+msgstr ""
+"Estes são os dias adicionados aos que prometeu aos clientes para fins de "
+"segurança"
#. module: sale
-#: view:sale.order:0
#: view:sale.order.line:0
msgid "Qty"
msgstr "Quantidade"
@@ -848,6 +937,11 @@ msgid "References"
msgstr "Referências"
#. module: sale
+#: view:sale.order.line:0
+msgid "My Sales Order Lines"
+msgstr ""
+
+#. module: sale
#: model:process.transition.action,name:sale.process_transition_action_cancel0
#: model:process.transition.action,name:sale.process_transition_action_cancel1
#: model:process.transition.action,name:sale.process_transition_action_cancel2
@@ -859,14 +953,9 @@ msgid "Cancel"
msgstr "Cancelar"
#. module: sale
-#: field:sale.installer,sale_order_dates:0
-msgid "Sales Order Dates"
-msgstr "Datas da Ordem de Vendas"
-
-#. module: sale
-#: selection:sale.order.line,state:0
-msgid "Exception"
-msgstr "Excepção"
+#: sql_constraint:sale.order:0
+msgid "Order Reference must be unique per Company!"
+msgstr ""
#. module: sale
#: model:process.transition,name:sale.process_transition_invoice0
@@ -878,19 +967,19 @@ msgid "Create Invoice"
msgstr "Criar Factura"
#. module: sale
-#: field:sale.installer,sale_margin:0
-msgid "Margins in Sales Orders"
-msgstr "Fusão de ordens de vendas"
-
-#. module: sale
#: view:sale.order:0
msgid "Total Tax Excluded"
msgstr "Total sem impostos"
#. module: sale
-#: view:sale.order:0
-msgid "Compute"
-msgstr "Calcular"
+#: view:sale.order.line:0
+msgid "Order reference"
+msgstr ""
+
+#. module: sale
+#: view:sale.open.invoice:0
+msgid "You invoice has been successfully created!"
+msgstr "A sua fatura foi criada com êxito!"
#. module: sale
#: view:sale.report:0
@@ -909,23 +998,20 @@ msgid "Open Invoice"
msgstr "Abrir fatura"
#. module: sale
-#: report:sale.order:0
-#: view:sale.order.line:0
-msgid "Price"
-msgstr "Preço"
+#: model:ir.actions.server,name:sale.ir_actions_server_edi_sale
+msgid "Auto-email confirmed sale orders"
+msgstr ""
#. module: sale
-#: model:ir.actions.act_window,name:sale.action_sale_installer
-#: view:sale.config.picking_policy:0
-#: view:sale.installer:0
-msgid "Sales Application Configuration"
-msgstr "Configuração da Aplicação de Vendas"
+#: code:addons/sale/sale.py:413
+#, python-format
+msgid "There is no sales journal defined for this company: \"%s\" (id:%d)"
+msgstr ""
#. module: sale
-#: view:sale.report:0
-#: field:sale.report,price_total:0
-msgid "Total Price"
-msgstr "Preço Total"
+#: model:process.transition.action,name:sale.process_transition_action_forceassignation0
+msgid "Force Assignation"
+msgstr "Forçar Atribuição"
#. module: sale
#: selection:sale.order.line,type:0
@@ -938,6 +1024,11 @@ msgid "Based on the shipped or on the ordered quantities."
msgstr "Baseado nas quantidades expedidas ou nas da ordem de venda."
#. module: sale
+#: selection:sale.order,picking_policy:0
+msgid "Deliver all products at once"
+msgstr ""
+
+#. module: sale
#: field:sale.order,picking_ids:0
msgid "Related Picking"
msgstr ""
@@ -969,9 +1060,15 @@ msgid "Create Delivery Order"
msgstr "Criar ordem de entrega"
#. module: sale
-#: field:sale.installer,delivery:0
-msgid "Delivery Costs"
-msgstr "Custos de expedição"
+#: code:addons/sale/sale.py:1290
+#, python-format
+msgid "Cannot delete a sales order line which is in state '%s'!"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Qty(UoS)"
+msgstr ""
#. module: sale
#: view:sale.order:0
@@ -985,13 +1082,13 @@ msgstr ""
#. module: sale
#: view:sale.report:0
-msgid "Sales by Product Category"
-msgstr "Vendas, por categoria de artigo"
+msgid "Ordered date of the sales order"
+msgstr ""
#. module: sale
-#: selection:sale.order,picking_policy:0
-msgid "Partial Delivery"
-msgstr "Entrega Parcial"
+#: view:sale.report:0
+msgid "Sales by Product Category"
+msgstr "Vendas, por categoria de artigo"
#. module: sale
#: model:process.transition,name:sale.process_transition_confirmquotation0
@@ -999,9 +1096,10 @@ msgid "Confirm Quotation"
msgstr "Confirmar cotação"
#. module: sale
-#: help:sale.order,origin:0
-msgid "Reference of the document that generated this sales order request."
-msgstr ""
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:63
+#, python-format
+msgid "Error"
+msgstr "Erro"
#. module: sale
#: view:sale.order:0
@@ -1033,20 +1131,14 @@ msgid "Procurement Method"
msgstr "Método de aprovisionamento"
#. module: sale
-#: view:sale.config.picking_policy:0
-#: view:sale.installer:0
-msgid "title"
-msgstr "título"
-
-#. module: sale
#: model:process.node,name:sale.process_node_packinglist0
msgid "Pick List"
msgstr ""
#. module: sale
#: view:sale.order:0
-msgid "Order date"
-msgstr "Data da ordem"
+msgid "Set to Draft"
+msgstr "Definir como Rascunho"
#. module: sale
#: model:process.node,note:sale.process_node_packinglist0
@@ -1054,6 +1146,85 @@ msgid "Document of the move to the output or to the customer."
msgstr ""
#. module: sale
+#: model:email.template,body_text:sale.email_template_edi_sale
+msgid ""
+"\n"
+"Hello${object.partner_order_id.name and ' ' or "
+"''}${object.partner_order_id.name or ''},\n"
+"\n"
+"Here is your order confirmation for ${object.partner_id.name}:\n"
+" | Order number: *${object.name}*\n"
+" | Order total: *${object.amount_total} "
+"${object.pricelist_id.currency_id.name}*\n"
+" | Order date: ${object.date_order}\n"
+" % if object.origin:\n"
+" | Order reference: ${object.origin}\n"
+" % endif\n"
+" % if object.client_order_ref:\n"
+" | Your reference: ${object.client_order_ref}<br />\n"
+" % endif\n"
+" | Your contact: ${object.user_id.name} ${object.user_id.user_email "
+"and '<%s>'%(object.user_id.user_email) or ''}\n"
+"\n"
+"You can view the order confirmation, download it and even pay online using "
+"the following link:\n"
+" ${ctx.get('edi_web_url_view') or 'n/a'}\n"
+"\n"
+"% if object.order_policy in ('prepaid','manual') and "
+"object.company_id.paypal_account:\n"
+"<% \n"
+"comp_name = quote(object.company_id.name)\n"
+"order_name = quote(object.name)\n"
+"paypal_account = quote(object.company_id.paypal_account)\n"
+"order_amount = quote(str(object.amount_total))\n"
+"cur_name = quote(object.pricelist_id.currency_id.name)\n"
+"paypal_url = \"https://www.paypal.com/cgi-"
+"bin/webscr?cmd=_xclick&business=%s&item_name=%s%%20Order%%20%s&invoice=%s&amo"
+"unt=%s\" \\\n"
+" "
+"\"&currency_code=%s&button_subtype=services&no_note=1&bn=OpenERP_Order_PayNow"
+"_%s\" % \\\n"
+" "
+"(paypal_account,comp_name,order_name,order_name,order_amount,cur_name,cur_nam"
+"e)\n"
+"%>\n"
+"It is also possible to directly pay with Paypal:\n"
+" ${paypal_url}\n"
+"% endif\n"
+"\n"
+"If you have any question, do not hesitate to contact us.\n"
+"\n"
+"\n"
+"Thank you for choosing ${object.company_id.name}!\n"
+"\n"
+"\n"
+"--\n"
+"${object.user_id.name} ${object.user_id.user_email and "
+"'<%s>'%(object.user_id.user_email) or ''}\n"
+"${object.company_id.name}\n"
+"% if object.company_id.street:\n"
+"${object.company_id.street or ''}\n"
+"% endif\n"
+"% if object.company_id.street2:\n"
+"${object.company_id.street2}\n"
+"% endif\n"
+"% if object.company_id.city or object.company_id.zip:\n"
+"${object.company_id.zip or ''} ${object.company_id.city or ''}\n"
+"% endif\n"
+"% if object.company_id.country_id:\n"
+"${object.company_id.state_id and ('%s, ' % object.company_id.state_id.name) "
+"or ''} ${object.company_id.country_id.name or ''}\n"
+"% endif\n"
+"% if object.company_id.phone:\n"
+"Phone: ${object.company_id.phone}\n"
+"% endif\n"
+"% if object.company_id.website:\n"
+"${object.company_id.website or ''}\n"
+"% endif\n"
+" "
+msgstr ""
+
+#. module: sale
#: model:process.transition.action,name:sale.process_transition_action_validate0
msgid "Validate"
msgstr "Validar"
@@ -1076,9 +1247,9 @@ msgid "Taxes"
msgstr "Impostos"
#. module: sale
-#: field:sale.order,order_policy:0
-msgid "Shipping Policy"
-msgstr "Política de expedição"
+#: view:sale.order:0
+msgid "Sales Order ready to be invoiced"
+msgstr ""
#. module: sale
#: help:sale.order,create_date:0
@@ -1097,9 +1268,9 @@ msgid "Create Invoices"
msgstr "Criar faturas"
#. module: sale
-#: view:sale.order:0
-msgid "Extra Info"
-msgstr "Informação Extra"
+#: view:sale.report:0
+msgid "Sales order created in current month"
+msgstr ""
#. module: sale
#: report:sale.order:0
@@ -1107,11 +1278,24 @@ msgid "Fax :"
msgstr "Fax:"
#. module: sale
+#: help:sale.order.line,type:0
+msgid ""
+"If 'on order', it triggers a procurement when the sale order is confirmed to "
+"create a task, purchase order or manufacturing order linked to this sale "
+"order line."
+msgstr ""
+
+#. module: sale
#: field:sale.advance.payment.inv,amount:0
msgid "Advance Amount"
msgstr ""
#. module: sale
+#: field:sale.config.picking_policy,charge_delivery:0
+msgid "Do you charge the delivery?"
+msgstr ""
+
+#. module: sale
#: selection:sale.order,invoice_quantity:0
msgid "Shipped Quantities"
msgstr "Quantidades Enviadas"
@@ -1122,25 +1306,45 @@ msgid "Invoice Based on Sales Orders"
msgstr "Factura Baseada nas Ordens de Vendas"
#. module: sale
+#: code:addons/sale/sale.py:331
+#, python-format
+msgid ""
+"If you change the pricelist of this order (and eventually the currency), "
+"prices of existing order lines will not be updated."
+msgstr ""
+
+#. module: sale
#: model:ir.model,name:sale.model_stock_picking
msgid "Picking List"
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:387
-#: code:addons/sale/sale.py:920
-#: code:addons/sale/sale.py:938
+#: code:addons/sale/sale.py:412
+#: code:addons/sale/sale.py:503
+#: code:addons/sale/sale.py:632
+#: code:addons/sale/sale.py:1015
+#: code:addons/sale/sale.py:1033
#, python-format
msgid "Error !"
msgstr "Erro !"
#. module: sale
-#: code:addons/sale/sale.py:570
+#: code:addons/sale/sale.py:603
#, python-format
msgid "Could not cancel sales order !"
msgstr "Não foi possível cancelar a ordem de venda!"
#. module: sale
+#: view:sale.order:0
+msgid "Qty(UoM)"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered Year of the sales order"
+msgstr ""
+
+#. module: sale
#: selection:sale.report,month:0
msgid "July"
msgstr "Julho"
@@ -1157,35 +1361,25 @@ msgid "Shipping Exception"
msgstr "Excepção de Expedição"
#. module: sale
-#: field:sale.make.invoice,grouped:0
-msgid "Group the invoices"
-msgstr "Agrupar as facturas"
-
-#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Shipping & Manual Invoice"
-msgstr "Expedição e Factura Manual"
-
-#. module: sale
-#: code:addons/sale/sale.py:1051
+#: code:addons/sale/sale.py:1143
#, python-format
-msgid "Picking Information !"
+msgid "Picking Information ! : "
msgstr ""
#. module: sale
-#: view:sale.report:0
-#: field:sale.report,month:0
-msgid "Month"
-msgstr "Mês"
+#: field:sale.make.invoice,grouped:0
+msgid "Group the invoices"
+msgstr "Agrupar as facturas"
#. module: sale
-#: model:ir.module.module,shortdesc:sale.module_meta_information
-msgid "Sales Management"
-msgstr "Gestão de Vendas"
+#: field:sale.order,order_policy:0
+msgid "Invoice Policy"
+msgstr ""
#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Invoice From The Picking"
+#: model:ir.actions.act_window,name:sale.action_config_picking_policy
+#: view:sale.config.picking_policy:0
+msgid "Setup your Invoicing Method"
msgstr ""
#. module: sale
@@ -1195,28 +1389,31 @@ msgstr "A ser revisto pelo contabilista"
#. module: sale
#: view:sale.report:0
-#: field:sale.report,uom_name:0
msgid "Reference UoM"
msgstr ""
#. module: sale
+#: view:sale.config.picking_policy:0
+msgid ""
+"This tool will help you to install the right module and configure the system "
+"according to the method you use to invoice your customers."
+msgstr ""
+
+#. module: sale
#: model:ir.model,name:sale.model_sale_order_line_make_invoice
msgid "Sale OrderLine Make_invoice"
msgstr ""
#. module: sale
-#: help:sale.config.picking_policy,step:0
-msgid ""
-"By default, OpenERP is able to manage complex routing and paths of products "
-"in your warehouse and partner locations. This will configure the most common "
-"and simple methods to deliver products to the customer in one or two "
-"operations by the worker."
-msgstr ""
+#: selection:sale.order,state:0
+#: selection:sale.report,state:0
+msgid "Invoice Exception"
+msgstr "Excepção da Factura"
#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_tree
-msgid "Old Quotations"
-msgstr "Cotações antigas"
+#: model:process.node,note:sale.process_node_saleorder0
+msgid "Drives procurement and invoicing"
+msgstr ""
#. module: sale
#: field:sale.order,invoiced:0
@@ -1231,6 +1428,22 @@ msgid "Sales Analysis"
msgstr "Análise de vendas"
#. module: sale
+#: code:addons/sale/sale.py:1138
+#, python-format
+msgid ""
+"You selected a quantity of %d Units.\n"
+"But it's not compatible with the selected packaging.\n"
+"Here is a proposition of quantities according to the packaging:\n"
+"EAN: %s Quantity: %s Type of ul: %s"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Recreate Packing"
+msgstr "Recriar embalagem"
+
+#. module: sale
+#: view:sale.order:0
#: field:sale.order.line,property_ids:0
msgid "Properties"
msgstr "Propriedades"
@@ -1257,7 +1470,17 @@ msgid ""
msgstr "Pode gerar facturas baseadas em ordens de venda ou em envios."
#. module: sale
-#: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
+#: view:sale.order.line:0
+msgid "Confirmed sale order lines, not yet delivered"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:473
+#, python-format
+msgid "Customer Invoices"
+msgstr ""
+
+#. module: sale
#: model:process.process,name:sale.process_process_salesprocess0
#: view:sale.order:0
#: view:sale.report:0
@@ -1279,18 +1502,13 @@ msgid "Done"
msgstr "Concluído"
#. module: sale
-#: model:ir.model,name:sale.model_sale_installer
-msgid "sale.installer"
-msgstr "sale.installer"
-
-#. module: sale
#: model:process.node,name:sale.process_node_invoice0
#: model:process.node,name:sale.process_node_invoiceafterdelivery0
msgid "Invoice"
msgstr "Factura"
#. module: sale
-#: code:addons/sale/sale.py:1014
+#: code:addons/sale/sale.py:1158
#, python-format
msgid ""
"You have to select a customer in the sales form !\n"
@@ -1298,11 +1516,6 @@ msgid ""
msgstr ""
#. module: sale
-#: selection:sale.config.picking_policy,step:0
-msgid "Picking List & Delivery Order"
-msgstr ""
-
-#. module: sale
#: field:sale.order,origin:0
msgid "Source Document"
msgstr ""
@@ -1328,7 +1541,7 @@ msgid "The amount without tax."
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:571
+#: code:addons/sale/sale.py:604
#, python-format
msgid "You must first cancel all picking attached to this sales order."
msgstr ""
@@ -1339,9 +1552,15 @@ msgid "Sales Advance Payment Invoice"
msgstr ""
#. module: sale
-#: field:sale.order,incoterm:0
-msgid "Incoterm"
-msgstr "Incoterm"
+#: view:sale.report:0
+#: field:sale.report,month:0
+msgid "Month"
+msgstr "Mês"
+
+#. module: sale
+#: model:email.template,subject:sale.email_template_edi_sale
+msgid "${object.company_id.name} Order (Ref ${object.name or 'n/a' })"
+msgstr ""
#. module: sale
#: view:sale.order.line:0
@@ -1352,11 +1571,6 @@ msgid "Product"
msgstr "Artigo"
#. module: sale
-#: model:ir.ui.menu,name:sale.menu_invoiced
-msgid "Invoicing"
-msgstr "Faturação"
-
-#. module: sale
#: model:process.transition.action,name:sale.process_transition_action_cancelassignation0
msgid "Cancel Assignation"
msgstr "Cancelar Atribuição"
@@ -1367,14 +1581,10 @@ msgid "sale.config.picking_policy"
msgstr "sale.config.picking_policy"
#. module: sale
-#: help:sale.order,state:0
-msgid ""
-"Gives the state of the quotation or sales order. \n"
-"The exception state is automatically set when a cancel operation occurs in "
-"the invoice validation (Invoice Exception) or in the picking list process "
-"(Shipping Exception). \n"
-"The 'Waiting Schedule' state is set when the invoice is confirmed but "
-"waiting for the scheduler to run on the date 'Ordered Date'."
+#: view:account.invoice.report:0
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_turnover_by_month
+msgid "Monthly Turnover"
msgstr ""
#. module: sale
@@ -1393,7 +1603,6 @@ msgid "Product UoS"
msgstr "UdV do artigo"
#. module: sale
-#: selection:sale.order,state:0
#: selection:sale.report,state:0
msgid "Manual In Progress"
msgstr "Manual em Progresso"
@@ -1414,7 +1623,8 @@ msgid "Order"
msgstr "Ordem"
#. module: sale
-#: code:addons/sale/sale.py:921
+#: code:addons/sale/sale.py:1016
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:71
#, python-format
msgid "There is no income account defined for this product: \"%s\" (id:%d)"
msgstr ""
@@ -1434,7 +1644,7 @@ msgid ""
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:1116
+#: code:addons/sale/sale.py:1238
#, python-format
msgid ""
"You plan to sell %.2f %s but you only have %.2f %s available !\n"
@@ -1463,10 +1673,10 @@ msgid "Total"
msgstr "Total"
#. module: sale
-#: code:addons/sale/sale.py:388
-#, python-format
-msgid "There is no sales journal defined for this company: \"%s\" (id:%d)"
-msgstr ""
+#: report:sale.order:0
+#: view:sale.order.line:0
+msgid "Price"
+msgstr "Preço"
#. module: sale
#: model:process.transition,note:sale.process_transition_deliver0
@@ -1477,9 +1687,14 @@ msgid ""
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:1165
-#, python-format
-msgid "Cannot delete a sales order line which is %s !"
+#: selection:sale.order,order_policy:0
+msgid "Pay before delivery"
+msgstr ""
+
+#. module: sale
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.open_board_sales
+msgid "Sales Dashboard"
msgstr ""
#. module: sale
@@ -1491,6 +1706,7 @@ msgstr "Criar faturas"
#. module: sale
#: view:sale.order:0
+#: selection:sale.order,state:0
#: view:sale.order.line:0
msgid "To Invoice"
msgstr "Para faturar"
@@ -1501,6 +1717,11 @@ msgid "Date on which sales order is confirmed."
msgstr ""
#. module: sale
+#: field:sale.order,project_id:0
+msgid "Contract/Analytic Account"
+msgstr ""
+
+#. module: sale
#: field:sale.order,company_id:0
#: field:sale.order.line,company_id:0
#: view:sale.report:0
@@ -1520,22 +1741,17 @@ msgid "The amount to be invoiced in advance."
msgstr ""
#. module: sale
-#: selection:sale.order,state:0
-#: selection:sale.report,state:0
-msgid "Invoice Exception"
-msgstr "Excepção da Factura"
-
-#. module: sale
-#: help:sale.order,picking_ids:0
+#: code:addons/sale/sale.py:1256
+#, python-format
msgid ""
-"This is a list of picking that has been generated for this sales order."
+"Couldn't find a pricelist line matching this product and quantity.\n"
+"You have to change either the product, the quantity or the pricelist."
msgstr ""
#. module: sale
-#: help:sale.installer,sale_margin:0
+#: help:sale.order,picking_ids:0
msgid ""
-"Gives the margin of profitability by calculating the difference between Unit "
-"Price and Cost Price."
+"This is a list of picking that has been generated for this sales order."
msgstr ""
#. module: sale
@@ -1557,6 +1773,11 @@ msgid "Cancelled"
msgstr "Cancelada"
#. module: sale
+#: view:sale.order.line:0
+msgid "Sales Order Lines related to a Sales Order of mine"
+msgstr ""
+
+#. module: sale
#: model:ir.actions.act_window,name:sale.action_shop_form
#: model:ir.ui.menu,name:sale.menu_action_shop_form
#: field:sale.order,shop_id:0
@@ -1566,17 +1787,12 @@ msgid "Shop"
msgstr "Loja"
#. module: sale
-#: view:sale.report:0
-msgid " Month "
-msgstr " Mês "
-
-#. module: sale
#: field:sale.report,date_confirm:0
msgid "Date Confirm"
msgstr ""
#. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:111
+#: code:addons/sale/wizard/sale_line_invoice.py:113
#, python-format
msgid "Warning"
msgstr "Aviso!"
@@ -1588,17 +1804,6 @@ msgid "Sales by Month"
msgstr "Vendas, por mês"
#. module: sale
-#: code:addons/sale/sale.py:1045
-#, python-format
-msgid ""
-"You selected a quantity of %d Units.\n"
-"But it's not compatible with the selected packaging.\n"
-"Here is a proposition of quantities according to the packaging:\n"
-"\n"
-"EAN: %s Quantity: %s Type of ul: %s"
-msgstr ""
-
-#. module: sale
#: model:ir.model,name:sale.model_sale_order
#: model:process.node,name:sale.process_node_order0
#: model:process.node,name:sale.process_node_saleorder0
@@ -1614,6 +1819,11 @@ msgid "Quantity (UoS)"
msgstr "Quantidade (UoS)"
#. module: sale
+#: view:sale.order.line:0
+msgid "Sale Order Lines that are in 'done' state"
+msgstr ""
+
+#. module: sale
#: model:process.transition,note:sale.process_transition_packing0
msgid ""
"The Pick List form is created as soon as the sales order is confirmed, in "
@@ -1628,6 +1838,11 @@ msgid "Confirmed"
msgstr "Confirmado"
#. module: sale
+#: field:sale.config.picking_policy,order_policy:0
+msgid "Main Method Based On"
+msgstr ""
+
+#. module: sale
#: model:process.transition.action,name:sale.process_transition_action_confirm0
msgid "Confirm"
msgstr "Confirmar"
@@ -1650,6 +1865,7 @@ msgid "Invoice Lines"
msgstr "Linhas da Factura"
#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_product_tree
#: view:sale.order:0
#: view:sale.order.line:0
msgid "Sales Order Lines"
@@ -1666,30 +1882,18 @@ msgid "Configuration"
msgstr "Configuração"
#. module: sale
-#: selection:sale.order,picking_policy:0
-msgid "Complete Delivery"
-msgstr "Entrega total"
-
-#. module: sale
-#: view:sale.report:0
-msgid " Month-1 "
+#: code:addons/sale/edi/sale_order.py:146
+#, python-format
+msgid "EDI Pricelist (%s)"
msgstr ""
#. module: sale
-#: help:sale.config.picking_policy,picking_policy:0
-msgid ""
-"The Shipping Policy is used to configure per order if you want to deliver as "
-"soon as possible when one product is available or you wait that all products "
-"are available.."
+#: view:sale.report:0
+msgid "Sales order created in current year"
msgstr ""
#. module: sale
-#: selection:sale.report,month:0
-msgid "August"
-msgstr "Agosto"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:111
+#: code:addons/sale/wizard/sale_line_invoice.py:113
#, python-format
msgid ""
"Invoice cannot be created for this Sales Order Line due to one of the "
@@ -1699,6 +1903,11 @@ msgid ""
msgstr ""
#. module: sale
+#: view:sale.order.line:0
+msgid "Sale order lines done"
+msgstr ""
+
+#. module: sale
#: field:sale.order.line,th_weight:0
msgid "Weight"
msgstr "Peso"
@@ -1717,7 +1926,6 @@ msgstr "Dezembro"
#. module: sale
#: field:sale.config.picking_policy,config_logo:0
-#: field:sale.installer,config_logo:0
msgid "Image"
msgstr "Imagem"
@@ -1747,9 +1955,9 @@ msgid "Salesman"
msgstr "Vendedor"
#. module: sale
-#: model:process.node,note:sale.process_node_saleorder0
-msgid "Drives procurement and invoicing"
-msgstr ""
+#: model:ir.actions.act_window,name:sale.action_order_tree
+msgid "Old Quotations"
+msgstr "Cotações antigas"
#. module: sale
#: field:sale.order,amount_untaxed:0
@@ -1757,7 +1965,7 @@ msgid "Untaxed Amount"
msgstr "Montante Não Tributado"
#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:163
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:170
#: model:ir.actions.act_window,name:sale.action_view_sale_advance_payment_inv
#: view:sale.advance.payment.inv:0
#: view:sale.order:0
@@ -1766,7 +1974,7 @@ msgid "Advance Invoice"
msgstr "Adiantamento da Factura"
#. module: sale
-#: code:addons/sale/sale.py:591
+#: code:addons/sale/sale.py:624
#, python-format
msgid "The sales order '%s' has been cancelled."
msgstr ""
@@ -1801,20 +2009,20 @@ msgid "Packings"
msgstr ""
#. module: sale
-#: field:sale.config.picking_policy,progress:0
-#: field:sale.installer,progress:0
-msgid "Configuration Progress"
-msgstr "Progresso da configuração"
+#: view:sale.order.line:0
+msgid "Sale Order Lines ready to be invoiced"
+msgstr ""
#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_product_tree
-msgid "Product sales"
-msgstr "Venda de artigos"
+#: view:sale.report:0
+msgid "Sales order created in last month"
+msgstr ""
#. module: sale
-#: field:sale.order,date_order:0
-msgid "Ordered Date"
-msgstr "Data da Ordem"
+#: model:ir.actions.act_window,name:sale.action_email_templates
+#: model:ir.ui.menu,name:sale.menu_email_templates
+msgid "Email Templates"
+msgstr ""
#. module: sale
#: model:ir.actions.act_window,name:sale.action_order_form
@@ -1824,14 +2032,15 @@ msgid "Sales Orders"
msgstr "Ordens de Vendas"
#. module: sale
-#: selection:sale.config.picking_policy,picking_policy:0
-msgid "Direct Delivery"
-msgstr "Entrega Directa"
+#: model:ir.model,name:sale.model_sale_shop
+#: view:sale.shop:0
+msgid "Sales Shop"
+msgstr "Loja"
#. module: sale
-#: field:sale.installer,sale_journal:0
-msgid "Invoicing journals"
-msgstr ""
+#: selection:sale.report,month:0
+msgid "November"
+msgstr "Novembro"
#. module: sale
#: field:sale.advance.payment.inv,product_id:0
@@ -1839,18 +2048,12 @@ msgid "Advance Product"
msgstr "Artigo \"Adiantamento\""
#. module: sale
-#: view:sale.report:0
-#: field:sale.report,shipped_qty_1:0
-msgid "Shipped Qty"
-msgstr "Qtd Enviada"
-
-#. module: sale
-#: view:sale.open.invoice:0
-msgid "You invoice has been successfully created!"
-msgstr "A sua fatura foi criada com êxito!"
+#: view:sale.order:0
+msgid "Compute"
+msgstr "Calcular"
#. module: sale
-#: code:addons/sale/sale.py:585
+#: code:addons/sale/sale.py:618
#, python-format
msgid "You must first cancel all invoices attached to this sales order."
msgstr ""
@@ -1861,33 +2064,27 @@ msgid "January"
msgstr "Janeiro"
#. module: sale
-#: view:sale.installer:0
-msgid "Configure Your Sales Management Application"
-msgstr ""
-
-#. module: sale
#: model:ir.actions.act_window,name:sale.action_order_tree4
msgid "Sales Order in Progress"
msgstr "Ordem de Venda em Progresso"
#. module: sale
-#: field:sale.installer,sale_layout:0
-msgid "Sales Order Layout Improvement"
+#: help:sale.order,origin:0
+msgid "Reference of the document that generated this sales order request."
msgstr ""
#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:63
-#, python-format
-msgid "Error"
-msgstr "Erro"
-
-#. module: sale
#: view:sale.report:0
#: field:sale.report,delay:0
msgid "Commitment Delay"
msgstr ""
#. module: sale
+#: selection:sale.order,order_policy:0
+msgid "Deliver & invoice on demand"
+msgstr ""
+
+#. module: sale
#: model:process.node,note:sale.process_node_saleprocurement0
msgid ""
"One Procurement order for each sales order line and for each of the "
@@ -1910,13 +2107,12 @@ msgid "Confirmed sales order to invoice."
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:290
-#, python-format
-msgid "Cannot delete Sales Order(s) which are already confirmed !"
+#: view:sale.order:0
+msgid "Sales Order that haven't yet been confirmed"
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:316
+#: code:addons/sale/sale.py:322
#, python-format
msgid "The sales order '%s' has been set in draft state."
msgstr ""
@@ -1927,37 +2123,27 @@ msgid "from stock"
msgstr "do stock"
#. module: sale
-#: field:sale.config.picking_policy,order_policy:0
-msgid "Shipping Default Policy"
-msgstr "Política de Expedição Padrão"
-
-#. module: sale
#: view:sale.open.invoice:0
msgid "Close"
msgstr "Fechar"
#. module: sale
+#: code:addons/sale/sale.py:1248
+#, python-format
+msgid "No Pricelist ! : "
+msgstr ""
+
+#. module: sale
#: field:sale.order,shipped:0
msgid "Delivered"
msgstr "Entregue"
#. module: sale
-#: code:addons/sale/sale.py:1115
-#, python-format
-msgid "Not enough stock !"
-msgstr "Stock insuficiente!"
-
-#. module: sale
#: constraint:stock.move:0
msgid "You must assign a production lot for this product"
msgstr "Tem de associar um lote de produção a este artigo"
#. module: sale
-#: field:sale.order.line,sequence:0
-msgid "Layout Sequence"
-msgstr ""
-
-#. module: sale
#: model:ir.actions.act_window,help:sale.action_shop_form
msgid ""
"If you have more than one shop reselling your company products, you can "
@@ -1984,11 +2170,6 @@ msgid "May"
msgstr "Maio"
#. module: sale
-#: help:sale.installer,sale_order_dates:0
-msgid "Adds commitment, requested and effective dates on Sales Orders."
-msgstr ""
-
-#. module: sale
#: view:sale.order:0
#: field:sale.order,partner_id:0
#: field:sale.order.line,order_partner_id:0
@@ -1996,23 +2177,11 @@ msgid "Customer"
msgstr "Cliente"
#. module: sale
-#: model:product.template,name:sale.advance_product_0_product_template
-msgid "Advance"
-msgstr ""
-
-#. module: sale
#: selection:sale.report,month:0
msgid "February"
msgstr "Fevereiro"
#. module: sale
-#: help:sale.installer,sale_journal:0
-msgid ""
-"Allows you to group and invoice your delivery orders according to different "
-"invoicing types: daily, weekly, etc."
-msgstr ""
-
-#. module: sale
#: selection:sale.report,month:0
msgid "April"
msgstr "Abril"
@@ -2023,11 +2192,6 @@ msgid "Accounting"
msgstr "Contabilidade"
#. module: sale
-#: field:sale.config.picking_policy,step:0
-msgid "Steps To Deliver a Sales Order"
-msgstr ""
-
-#. module: sale
#: view:sale.order:0
#: view:sale.order.line:0
msgid "Search Sales Order"
@@ -2039,18 +2203,18 @@ msgid "Sales Order Requisition"
msgstr ""
#. module: sale
+#: code:addons/sale/sale.py:1242
+#, python-format
+msgid "Not enough stock ! : "
+msgstr ""
+
+#. module: sale
#: report:sale.order:0
#: field:sale.order,payment_term:0
msgid "Payment Term"
msgstr "Termo do Pagamento"
#. module: sale
-#: help:sale.installer,sale_layout:0
-msgid ""
-"Provides some features to improve the layout of the Sales Order reports."
-msgstr ""
-
-#. module: sale
#: model:ir.actions.act_window,help:sale.action_order_report_all
msgid ""
"This report performs analysis on your quotations and sales orders. Analysis "
@@ -2112,9 +2276,6 @@ msgstr "Factura Baseada em Entregas"
#~ msgid "Payment accounts"
#~ msgstr "Contas de Pagamento"
-#~ msgid "My Quotations"
-#~ msgstr "Minhas Cotações"
-
#~ msgid "Canceled"
#~ msgstr "Cancelado"
@@ -2136,6 +2297,9 @@ msgstr "Factura Baseada em Entregas"
#~ msgid "Sales order"
#~ msgstr "Ordem de Venda"
+#~ msgid "Sales Management"
+#~ msgstr "Gestão de Vendas"
+
#~ msgid "Make invoices"
#~ msgstr "Criar Facturas"
@@ -2173,12 +2337,18 @@ msgstr "Factura Baseada em Entregas"
#~ "This is the list of picking list that have been generated for this invoice"
#~ msgstr "Esta é a lista de recolha gerada para esta factura"
+#~ msgid "All at Once"
+#~ msgstr "Tudo de uma vez"
+
#~ msgid "Customer Ref"
#~ msgstr "Ref do Cliente"
#~ msgid "Sales Configuration"
#~ msgstr "Configuração das Vendas"
+#~ msgid "Partial Delivery"
+#~ msgstr "Entrega Parcial"
+
#~ msgid "Steps To Deliver a Sale Order"
#~ msgstr "Etapas para Entregar uma Ordem de Venda"
@@ -2318,6 +2488,9 @@ msgstr "Factura Baseada em Entregas"
#~ msgid "Manages the delivery and invoicing progress"
#~ msgstr "Gere a entrega e o processo de facturação"
+#~ msgid "Shipping Default Policy"
+#~ msgstr "Política de Expedição Padrão"
+
#, python-format
#~ msgid "Could not cancel sale order !"
#~ msgstr "Não foi possível cancelar esta ordem de venda !"
@@ -2392,6 +2565,9 @@ msgstr "Factura Baseada em Entregas"
#~ msgid "Sale Pricelists"
#~ msgstr "Lista de Preços de Venda"
+#~ msgid "Direct Delivery"
+#~ msgstr "Entrega Directa"
+
#~ msgid ""
#~ "Invoice is created when 'Create Invoice' is being clicked after confirming "
#~ "the sale order. This transaction moves the sale order to invoices."
@@ -2402,6 +2578,9 @@ msgstr "Factura Baseada em Entregas"
#~ msgid "Make Invoice"
#~ msgstr "Criar Factura"
+#~ msgid "Delivery Order Only"
+#~ msgstr "Somente Entregar Ordem de Venda"
+
#~ msgid "Sales order lines"
#~ msgstr "Linhas da ordens de vendas"
@@ -2510,6 +2689,58 @@ msgstr "Factura Baseada em Entregas"
#~ msgid "Related invoices"
#~ msgstr "Facturas Relacionadas"
+#~ msgid "Payment Before Delivery"
+#~ msgstr "Pagamento Antes da Entrega"
+
+#~ msgid " Year "
+#~ msgstr " Ano "
+
+#~ msgid "Delivery Costs"
+#~ msgstr "Custos de expedição"
+
+#~ msgid "title"
+#~ msgstr "título"
+
+#~ msgid "Invoicing"
+#~ msgstr "Faturação"
+
+#~ msgid "sale.installer"
+#~ msgstr "sale.installer"
+
+#~ msgid " Month "
+#~ msgstr " Mês "
+
+#~ msgid "Configuration Progress"
+#~ msgstr "Progresso da configuração"
+
+#~ msgid "Margins in Sales Orders"
+#~ msgstr "Fusão de ordens de vendas"
+
+#, python-format
+#~ msgid "Not enough stock !"
+#~ msgstr "Stock insuficiente!"
+
+#~ msgid "Configure Sales Order Logistics"
+#~ msgstr "Configurar logística das ordens de venda"
+
+#~ msgid "Configure Picking Policy for Sales Order"
+#~ msgstr "Configure a política de recolhas das ordens de venda"
+
+#~ msgid "Setup your sales workflow and default values."
+#~ msgstr "Configure o seu fluxo de vendas e os valores pre-definidos."
+
+#~ msgid "Sales Order Dates"
+#~ msgstr "Datas da Ordem de Vendas"
+
+#~ msgid "Sales Application Configuration"
+#~ msgstr "Configuração da Aplicação de Vendas"
+
+#~ msgid "Shipping Policy"
+#~ msgstr "Política de expedição"
+
+#~ msgid "Product sales"
+#~ msgstr "Venda de artigos"
+
#, python-format
#~ msgid ""
#~ "You have to select a customer in the sale form !\n"
@@ -2517,3 +2748,31 @@ msgstr "Factura Baseada em Entregas"
#~ msgstr ""
#~ "Tem que seleccionar um cliente no formulário de venda !\n"
#~ "Por favor, defina um cliente antes de escolher um artigo."
+
+#~ msgid "Complete Delivery"
+#~ msgstr "Entrega total"
+
+#~ msgid "Invoice On Order After Delivery"
+#~ msgstr "Fatura baseada na ordem após entrega"
+
+#~ msgid "Configure"
+#~ msgstr "Configurar"
+
+#~ msgid "Shipping & Manual Invoice"
+#~ msgstr "Expedição e Factura Manual"
+
+#, python-format
+#~ msgid "You cannot cancel a sales order line that has already been invoiced !"
+#~ msgstr "Não pode cancelar uma linha de ordem de venda já facturada!"
+
+#~ msgid "Allows you to compute delivery costs on your quotations."
+#~ msgstr "Permite calcular os custos de entrega nas cotações."
+
+#~ msgid "Order date"
+#~ msgstr "Data da ordem"
+
+#~ msgid "Ordered Date"
+#~ msgstr "Data da Ordem"
+
+#~ msgid "Shipped Qty"
+#~ msgstr "Qtd Enviada"
diff --git a/addons/sale/i18n/pt_BR.po b/addons/sale/i18n/pt_BR.po
index 21079eeb134..4c217ef2980 100644
--- a/addons/sale/i18n/pt_BR.po
+++ b/addons/sale/i18n/pt_BR.po
@@ -7,15 +7,27 @@ msgid ""
msgstr ""
"Project-Id-Version: pt_BR\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2011-01-11 11:16+0000\n"
+"POT-Creation-Date: 2011-12-22 18:43+0000\n"
"PO-Revision-Date: 2011-02-06 01:00+0000\n"
"Last-Translator: Luiz Fernando M.França <Unknown>\n"
"Language-Team: <pt@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-05 05:17+0000\n"
-"X-Generator: Launchpad (build 14231)\n"
+"X-Launchpad-Export-Date: 2011-12-23 06:47+0000\n"
+"X-Generator: Launchpad (build 14560)\n"
+
+#. module: sale
+#: field:sale.config.picking_policy,timesheet:0
+msgid "Based on Timesheet"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid ""
+"Sale Order Lines that are confirmed, done or in exception state and haven't "
+"yet been invoiced"
+msgstr ""
#. module: sale
#: view:board.board:0
@@ -24,11 +36,6 @@ msgid "Sales by Salesman in last 90 days"
msgstr "Vendas por Vendedor nos últimos 90 dias"
#. module: sale
-#: help:sale.installer,delivery:0
-msgid "Allows you to compute delivery costs on your quotations."
-msgstr "Habilita você a calcular custos de entrega em suas cotações."
-
-#. module: sale
#: help:sale.order,picking_policy:0
msgid ""
"If you don't have enough stock available to deliver all at once, do you "
@@ -38,6 +45,11 @@ msgstr ""
"embarques parciais?"
#. module: sale
+#: view:sale.order:0
+msgid "UoS"
+msgstr ""
+
+#. module: sale
#: help:sale.order,partner_shipping_id:0
msgid "Shipping address for current sales order."
msgstr "Endereço de entrega para o pedido de venda atual."
@@ -61,22 +73,12 @@ msgid "Cancel Order"
msgstr "Cancelar Pedido"
#. module: sale
-#: view:sale.config.picking_policy:0
-msgid "Configure Sales Order Logistics"
-msgstr "Configura a Logística dos Pedidos de Venda"
-
-#. module: sale
-#: code:addons/sale/sale.py:603
+#: code:addons/sale/sale.py:638
#, python-format
msgid "The quotation '%s' has been converted to a sales order."
msgstr "A cotação '%s' foi convertida em um pedido de venda."
#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Payment Before Delivery"
-msgstr "Pagamento Antes da Entrega"
-
-#. module: sale
#: code:addons/sale/wizard/sale_make_invoice.py:42
#, python-format
msgid "Warning !"
@@ -93,12 +95,6 @@ msgid "Drives procurement orders for every sales order line."
msgstr "Comanda os pedidos de aquisição para cada linha do pedido de venda."
#. module: sale
-#: selection:sale.config.picking_policy,picking_policy:0
-msgid "All at Once"
-msgstr "Partida única"
-
-#. module: sale
-#: field:sale.order,project_id:0
#: view:sale.report:0
#: field:sale.report,analytic_account_id:0
#: field:sale.shop,project_id:0
@@ -118,6 +114,15 @@ msgstr ""
"fatura completamente as vendas."
#. module: sale
+#: code:addons/sale/sale.py:295
+#, python-format
+msgid ""
+"In order to delete a confirmed sale order, you must cancel it before ! To "
+"cancel a sale order, you must first cancel related picking or delivery "
+"orders."
+msgstr ""
+
+#. module: sale
#: model:process.node,name:sale.process_node_saleprocurement0
msgid "Procurement Order"
msgstr "Ordem de Compra"
@@ -129,6 +134,11 @@ msgid "Partner"
msgstr "Parceiro"
#. module: sale
+#: selection:sale.order,order_policy:0
+msgid "Invoice based on deliveries"
+msgstr ""
+
+#. module: sale
#: view:sale.order:0
msgid "Order Line"
msgstr "Item da Ordem"
@@ -174,9 +184,14 @@ msgid "Default Payment Term"
msgstr "Condição de Pagamento Padrão"
#. module: sale
-#: model:ir.actions.act_window,name:sale.action_config_picking_policy
-msgid "Configure Picking Policy for Sales Order"
-msgstr "Configure a Diretiva de Seleção dos Pedidos de Venda"
+#: field:sale.config.picking_policy,deli_orders:0
+msgid "Based on Delivery Orders"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.picking_policy,time_unit:0
+msgid "Main Working Time Unit"
+msgstr ""
#. module: sale
#: view:sale.order:0
@@ -192,9 +207,10 @@ msgid "Disc.(%)"
msgstr "Desc. (%)"
#. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_forceassignation0
-msgid "Force Assignation"
-msgstr "Forçar Atribuição"
+#: view:sale.report:0
+#: field:sale.report,price_total:0
+msgid "Total Price"
+msgstr "Preço Total"
#. module: sale
#: help:sale.make.invoice,grouped:0
@@ -202,6 +218,11 @@ msgid "Check the box to group the invoices for the same customers"
msgstr "Marque a caixa para agrupar as faturas do mesmo cliente"
#. module: sale
+#: view:sale.order:0
+msgid "My Sale Orders"
+msgstr ""
+
+#. module: sale
#: selection:sale.order,invoice_quantity:0
msgid "Ordered Quantities"
msgstr "Quantidades Pedidas"
@@ -242,14 +263,25 @@ msgstr ""
"Fatura' ou 'Fatura na ordem após entrega'."
#. module: sale
+#: field:sale.config.picking_policy,task_work:0
+msgid "Based on Tasks' Work"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
+msgid "Quotations and Sales"
+msgstr ""
+
+#. module: sale
#: model:ir.model,name:sale.model_sale_make_invoice
msgid "Sales Make Invoice"
msgstr ""
#. module: sale
-#: view:sale.order:0
-msgid "Recreate Packing"
-msgstr "Recriar Embalagem"
+#: code:addons/sale/sale.py:330
+#, python-format
+msgid "Pricelist Warning!"
+msgstr ""
#. module: sale
#: field:sale.order.line,discount:0
@@ -257,12 +289,10 @@ msgid "Discount (%)"
msgstr "Desconto (%)"
#. module: sale
-#: help:res.company,security_lead:0
-msgid ""
-"This is the days added to what you promise to customers for security purpose"
-msgstr ""
-"Esta é a adição de dias aos que você promete para clientes, para fins de "
-"segurança."
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_quotation_for_sale
+msgid "My Quotations"
+msgstr "Minhas Cotações"
#. module: sale
#: view:board.board:0
@@ -287,7 +317,22 @@ msgid "Shop Name"
msgstr "Nome da Loja"
#. module: sale
-#: code:addons/sale/sale.py:1014
+#: help:sale.order,order_policy:0
+msgid ""
+"The Invoice Policy is used to synchronise invoice and delivery operations.\n"
+" - The 'Pay before delivery' choice will first generate the invoice and "
+"then generate the picking order after the payment of this invoice.\n"
+" - The 'Deliver & Invoice on demand' will create the picking order directly "
+"and wait for the user to manually click on the 'Invoice' button to generate "
+"the draft invoice based on the sale order or the sale order lines.\n"
+" - The 'Invoice on order after delivery' choice will generate the draft "
+"invoice based on sales order after all picking lists have been finished.\n"
+" - The 'Invoice based on deliveries' choice is used to create an invoice "
+"during the picking process."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:1158
#, python-format
msgid "No Customer Defined !"
msgstr "Sem Cliente definido!"
@@ -298,9 +343,12 @@ msgid "Sales in Exception"
msgstr "Vendas em Exceção"
#. module: sale
-#: view:sale.order:0
-msgid "Set to Draft"
-msgstr "Definir como Rascunho"
+#: code:addons/sale/sale.py:1145
+#: code:addons/sale/sale.py:1264
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:70
+#, python-format
+msgid "Configuration Error !"
+msgstr ""
#. module: sale
#: view:sale.order:0
@@ -308,34 +356,7 @@ msgid "Conditions"
msgstr "Condições"
#. module: sale
-#: help:sale.order,order_policy:0
-msgid ""
-"The Shipping Policy is used to synchronise invoice and delivery operations.\n"
-" - The 'Pay Before delivery' choice will first generate the invoice and "
-"then generate the picking order after the payment of this invoice.\n"
-" - The 'Shipping & Manual Invoice' will create the picking order directly "
-"and wait for the user to manually click on the 'Invoice' button to generate "
-"the draft invoice.\n"
-" - The 'Invoice On Order After Delivery' choice will generate the draft "
-"invoice based on sales order after all picking lists have been finished.\n"
-" - The 'Invoice From The Picking' choice is used to create an invoice "
-"during the picking process."
-msgstr ""
-"A Política de Envio é usada para sincronizar faturas e operações de "
-"entrega.\n"
-" - A opção 'Pagar Antes da Entrega' vai gerar primeiro a fatura e, então, "
-"gerar o pedido de separação após o pagamento desta fatura.\n"
-" - A opção 'Envio com Fatura Manual' vai criar o pedido de separação "
-"diretamente e esperar que o usuário, manualmente, clique no botão 'Faturar' "
-"para gerar a fatura provisória.\n"
-" - A opção 'Faturar no Pedido Após Entrega' vai gerar a fatura provisória "
-"baseada no pedido de venda após todas as listas de separação serem "
-"finalizadas.\n"
-" - A opção 'Faturar a partir da Separação' é usada para criar uma fatura "
-"durante o processo de separação."
-
-#. module: sale
-#: code:addons/sale/sale.py:939
+#: code:addons/sale/sale.py:1034
#, python-format
msgid ""
"There is no income category account defined in default Properties for "
@@ -345,9 +366,9 @@ msgstr ""
"para a Categoria de Produto ou a Posição Fiscal não está definida !"
#. module: sale
-#: view:sale.installer:0
-msgid "Configure"
-msgstr "Configurar"
+#: selection:sale.report,month:0
+msgid "August"
+msgstr "Agosto"
#. module: sale
#: constraint:stock.move:0
@@ -355,7 +376,7 @@ msgid "You try to assign a lot which is not from the same product"
msgstr "Você tentou atribuir um lote que não é do mesmo produto"
#. module: sale
-#: code:addons/sale/sale.py:620
+#: code:addons/sale/sale.py:655
#, python-format
msgid "invalid mode for test_state"
msgstr "Modo inválido para test_state"
@@ -366,7 +387,7 @@ msgid "June"
msgstr "Junho"
#. module: sale
-#: code:addons/sale/sale.py:584
+#: code:addons/sale/sale.py:617
#, python-format
msgid "Could not cancel this sales order !"
msgstr "Este pedido de venda não pode ser cancelado !"
@@ -387,8 +408,12 @@ msgid "October"
msgstr "Outubro"
#. module: sale
+#: sql_constraint:stock.picking:0
+msgid "Reference must be unique per Company!"
+msgstr ""
+
+#. module: sale
#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_quotation_for_sale
#: view:sale.order:0
#: view:sale.report:0
msgid "Quotations"
@@ -400,11 +425,6 @@ msgid "Pricelist for current sales order."
msgstr "Lista de preços para o pedido de venda atual."
#. module: sale
-#: selection:sale.config.picking_policy,step:0
-msgid "Delivery Order Only"
-msgstr "Somente solicitações de entrega"
-
-#. module: sale
#: report:sale.order:0
msgid "TVA :"
msgstr "Imposto:"
@@ -431,6 +451,7 @@ msgstr "Posição Fiscal"
#. module: sale
#: view:sale.order:0
#: view:sale.order.line:0
+#: field:sale.report,product_uom:0
msgid "UoM"
msgstr "UdM"
@@ -455,7 +476,13 @@ msgstr ""
"progresso' ou 'Manual em progresso'."
#. module: sale
-#: code:addons/sale/sale.py:971
+#: code:addons/sale/sale.py:1061
+#, python-format
+msgid "You cannot cancel a sale order line that has already been invoiced!"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:1066
#, python-format
msgid "You must first cancel stock moves attached to this sales order line."
msgstr ""
@@ -463,7 +490,7 @@ msgstr ""
"esta linha de pedido de venda."
#. module: sale
-#: code:addons/sale/sale.py:1042
+#: code:addons/sale/sale.py:1134
#, python-format
msgid "(n/a)"
msgstr "(n/a)"
@@ -501,15 +528,36 @@ msgid "Notes"
msgstr "Anotações"
#. module: sale
+#: sql_constraint:res.company:0
+msgid "The company name must be unique !"
+msgstr ""
+
+#. module: sale
#: help:sale.order,partner_invoice_id:0
msgid "Invoice address for current sales order."
msgstr "Endereço de fatura para o pedido de venda atual."
#. module: sale
-#: view:sale.installer:0
-msgid "Enhance your core Sales Application with additional functionalities."
+#: view:sale.report:0
+msgid "Month-1"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered month of the sales order"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:504
+#, python-format
+msgid ""
+"You cannot group sales having different currencies for the same partner."
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,picking_policy:0
+msgid "Deliver each product when available"
msgstr ""
-"Melhora o núcleo do Sistema de Vendas com funcionalidades adicionais."
#. module: sale
#: field:sale.order,invoiced_rate:0
@@ -528,21 +576,43 @@ msgid "Confirmation Date"
msgstr "Data de Confirmação"
#. module: sale
+#: field:sale.order,incoterm:0
+msgid "Incoterm"
+msgstr "Forma de Entrega"
+
+#. module: sale
#: field:sale.order.line,address_allotment_id:0
msgid "Allotment Partner"
msgstr "Parceiro designado"
#. module: sale
-#: sql_constraint:sale.order:0
-msgid "Order Reference must be unique !"
-msgstr "Referência de Pedido deve ser única !"
-
-#. module: sale
#: selection:sale.report,month:0
msgid "March"
msgstr "Março"
#. module: sale
+#: constraint:stock.move:0
+msgid "You can not move products from or to a location of the type view."
+msgstr ""
+
+#. module: sale
+#: field:sale.config.picking_policy,sale_orders:0
+msgid "Based on Sales Orders"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,state:0
+msgid ""
+"Givwizard = self.browse(cr, uid, ids)[0]es the state of the quotation or "
+"sales order. \n"
+"The exception state is automatically set when a cancel operation occurs in "
+"the invoice validation (Invoice Exception) or in the picking list process "
+"(Shipping Exception). \n"
+"The 'Waiting Schedule' state is set when the invoice is confirmed but "
+"waiting for the scheduler to run on the order date."
+msgstr ""
+
+#. module: sale
#: help:sale.order,amount_total:0
msgid "The total amount."
msgstr "Montante total."
@@ -558,6 +628,11 @@ msgid "Invoice address :"
msgstr "Endereço de Faturamento :"
#. module: sale
+#: field:sale.order.line,sequence:0
+msgid "Line Sequence"
+msgstr ""
+
+#. module: sale
#: model:process.transition,note:sale.process_transition_saleorderprocurement0
msgid ""
"For every sales order line, a procurement order is created to supply the "
@@ -608,11 +683,6 @@ msgid "Sales Order Line"
msgstr "Linha de Pedido de Vendas"
#. module: sale
-#: view:sale.config.picking_policy:0
-msgid "Setup your sales workflow and default values."
-msgstr "Configure seu workflow de vendas e os valores padrões."
-
-#. module: sale
#: field:sale.shop,warehouse_id:0
msgid "Warehouse"
msgstr "Estoque"
@@ -649,6 +719,11 @@ msgid "Creation Date"
msgstr "Data de Criação"
#. module: sale
+#: model:ir.ui.menu,name:sale.menu_sales_configuration_misc
+msgid "Miscellaneous"
+msgstr ""
+
+#. module: sale
#: model:ir.actions.act_window,name:sale.action_order_line_tree3
msgid "Uninvoiced and Delivered Lines"
msgstr "Itens Entregues e não Faturados."
@@ -664,14 +739,19 @@ msgid "My Sales"
msgstr "Minhas Vendas"
#. module: sale
-#: code:addons/sale/sale.py:290
-#: code:addons/sale/sale.py:966
-#: code:addons/sale/sale.py:1165
+#: code:addons/sale/sale.py:295
+#: code:addons/sale/sale.py:1061
+#: code:addons/sale/sale.py:1290
#, python-format
msgid "Invalid action !"
msgstr "Ação inválida !"
#. module: sale
+#: view:sale.order:0
+msgid "Extra Info"
+msgstr "Informações Adicionais"
+
+#. module: sale
#: field:sale.order,pricelist_id:0
#: field:sale.report,pricelist_id:0
#: field:sale.shop,pricelist_id:0
@@ -685,13 +765,21 @@ msgid "# of Qty"
msgstr "# de Qtd"
#. module: sale
+#: code:addons/sale/sale.py:1314
+#, python-format
+msgid "Hour"
+msgstr ""
+
+#. module: sale
#: view:sale.order:0
msgid "Order Date"
msgstr "Data da Ordem"
#. module: sale
#: view:sale.order.line:0
+#: view:sale.report:0
#: field:sale.report,shipped:0
+#: field:sale.report,shipped_qty_1:0
msgid "Shipped"
msgstr "Enviado"
@@ -701,9 +789,9 @@ msgid "All Quotations"
msgstr "Todas as Cotações"
#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Invoice On Order After Delivery"
-msgstr "Faturamento no Pedido Após Entrega"
+#: view:sale.config.picking_policy:0
+msgid "Options"
+msgstr ""
#. module: sale
#: selection:sale.report,month:0
@@ -711,6 +799,20 @@ msgid "September"
msgstr "Setembro"
#. module: sale
+#: code:addons/sale/sale.py:632
+#, python-format
+msgid "You cannot confirm a sale order which has no line."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:1246
+#, python-format
+msgid ""
+"You have to select a pricelist or a customer in the sales form !\n"
+"Please set one before choosing a product."
+msgstr ""
+
+#. module: sale
#: view:sale.report:0
#: field:sale.report,categ_id:0
msgid "Category of Product"
@@ -727,11 +829,6 @@ msgid "Stock Moves"
msgstr "Movimentações de Estoque"
#. module: sale
-#: view:sale.report:0
-msgid " Year "
-msgstr " Ano "
-
-#. module: sale
#: field:sale.order,state:0
#: field:sale.report,state:0
msgid "Order State"
@@ -749,7 +846,7 @@ msgid "Sales By Month"
msgstr "Vendas por Mês"
#. module: sale
-#: code:addons/sale/sale.py:970
+#: code:addons/sale/sale.py:1065
#, python-format
msgid "Could not cancel sales order line!"
msgstr "A linha do pedido de venda não pode ser cancelada!"
@@ -784,64 +881,19 @@ msgstr ""
"o agendamento for executado."
#. module: sale
+#: field:sale.order,date_order:0
+msgid "Date"
+msgstr ""
+
+#. module: sale
#: view:sale.report:0
msgid "Extended Filters..."
msgstr "Filtros Extendidos..."
#. module: sale
-#: model:ir.module.module,description:sale.module_meta_information
-msgid ""
-"\n"
-" The base module to manage quotations and sales orders.\n"
-"\n"
-" * Workflow with validation steps:\n"
-" - Quotation -> Sales order -> Invoice\n"
-" * Invoicing methods:\n"
-" - Invoice on order (before or after shipping)\n"
-" - Invoice on delivery\n"
-" - Invoice on timesheets\n"
-" - Advance invoice\n"
-" * Partners preferences (shipping, invoicing, incoterm, ...)\n"
-" * Products stocks and prices\n"
-" * Delivery methods:\n"
-" - all at once, multi-parcel\n"
-" - delivery costs\n"
-" * Dashboard for salesman that includes:\n"
-" * Your open quotations\n"
-" * Top 10 sales of the month\n"
-" * Cases statistics\n"
-" * Graph of sales by product\n"
-" * Graph of cases of the month\n"
-" "
-msgstr ""
-"\n"
-" Módulo base para gerenciar cotações e pedidos de venda.\n"
-"\n"
-" * Workflow com passos de validação:\n"
-" - Cotação -> Pedido de venda -> Faturamento\n"
-" * Métodos de faturamento:\n"
-" - Faturamento no pedido (antes ou depois do envio)\n"
-" - Faturamento na entrega\n"
-" - Faturamento no apontamento\n"
-" - Adiantamento de fatura\n"
-" * Preferências de parceiros (envio, faturamento, Inconterm, ...)\n"
-" * Estoques e preços de produtos\n"
-" * Métodos de entrega:\n"
-" - Tudo de uma vez, parcelado\n"
-" - Custos de entrega\n"
-" * Painel para vendedores que incluem:\n"
-" - Suas cotações abertas\n"
-" - 10 maiores vendas do mês\n"
-" - Estatística de casos\n"
-" - Gráfico de vendas por produtos\n"
-" - Gráfico de casos do mês\n"
-" "
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_shop
-#: view:sale.shop:0
-msgid "Sales Shop"
-msgstr "Loja de Vendas"
+#: selection:sale.order.line,state:0
+msgid "Exception"
+msgstr "Pendência"
#. module: sale
#: model:ir.model,name:sale.model_res_company
@@ -849,9 +901,10 @@ msgid "Companies"
msgstr "Empresas"
#. module: sale
-#: selection:sale.report,month:0
-msgid "November"
-msgstr "Novembro"
+#: code:addons/sale/sale.py:1259
+#, python-format
+msgid "No valid pricelist line found ! :"
+msgstr ""
#. module: sale
#: view:sale.order:0
@@ -859,9 +912,9 @@ msgid "History"
msgstr "Histórico"
#. module: sale
-#: field:sale.config.picking_policy,picking_policy:0
-msgid "Picking Default Policy"
-msgstr "Politica de Separação Padrão"
+#: selection:sale.order,order_policy:0
+msgid "Invoice on order after delivery"
+msgstr ""
#. module: sale
#: help:sale.order,invoice_ids:0
@@ -885,14 +938,14 @@ msgid ""
msgstr "O nome e endereço do contato que requisitou a ordem ou cotação."
#. module: sale
-#: code:addons/sale/sale.py:966
-#, python-format
-msgid "You cannot cancel a sales order line that has already been invoiced !"
+#: help:res.company,security_lead:0
+msgid ""
+"This is the days added to what you promise to customers for security purpose"
msgstr ""
-"Você não pode cancelar linhas de pedido de venda que já foram faturadas!"
+"Esta é a adição de dias aos que você promete para clientes, para fins de "
+"segurança."
#. module: sale
-#: view:sale.order:0
#: view:sale.order.line:0
msgid "Qty"
msgstr "Qtd"
@@ -903,6 +956,11 @@ msgid "References"
msgstr "Referências"
#. module: sale
+#: view:sale.order.line:0
+msgid "My Sales Order Lines"
+msgstr ""
+
+#. module: sale
#: model:process.transition.action,name:sale.process_transition_action_cancel0
#: model:process.transition.action,name:sale.process_transition_action_cancel1
#: model:process.transition.action,name:sale.process_transition_action_cancel2
@@ -914,14 +972,9 @@ msgid "Cancel"
msgstr "Cancelar"
#. module: sale
-#: field:sale.installer,sale_order_dates:0
-msgid "Sales Order Dates"
-msgstr "Datas para Pedidos de Venda"
-
-#. module: sale
-#: selection:sale.order.line,state:0
-msgid "Exception"
-msgstr "Pendência"
+#: sql_constraint:sale.order:0
+msgid "Order Reference must be unique per Company!"
+msgstr ""
#. module: sale
#: model:process.transition,name:sale.process_transition_invoice0
@@ -933,19 +986,19 @@ msgid "Create Invoice"
msgstr "Criar Nota Fiscal"
#. module: sale
-#: field:sale.installer,sale_margin:0
-msgid "Margins in Sales Orders"
-msgstr "Margens em Pedidos de Venda"
-
-#. module: sale
#: view:sale.order:0
msgid "Total Tax Excluded"
msgstr "Total de Impostos Excluídos"
#. module: sale
-#: view:sale.order:0
-msgid "Compute"
-msgstr "Calcular"
+#: view:sale.order.line:0
+msgid "Order reference"
+msgstr ""
+
+#. module: sale
+#: view:sale.open.invoice:0
+msgid "You invoice has been successfully created!"
+msgstr "Sua Nota Fiscal foi criada com sucesso!"
#. module: sale
#: view:sale.report:0
@@ -964,23 +1017,21 @@ msgid "Open Invoice"
msgstr "Nota Fiscal Aberta"
#. module: sale
-#: report:sale.order:0
-#: view:sale.order.line:0
-msgid "Price"
-msgstr "Preço"
+#: model:ir.actions.server,name:sale.ir_actions_server_edi_sale
+msgid "Auto-email confirmed sale orders"
+msgstr ""
#. module: sale
-#: model:ir.actions.act_window,name:sale.action_sale_installer
-#: view:sale.config.picking_policy:0
-#: view:sale.installer:0
-msgid "Sales Application Configuration"
-msgstr "Configuração da Aplicação de Vendas"
+#: code:addons/sale/sale.py:413
+#, python-format
+msgid "There is no sales journal defined for this company: \"%s\" (id:%d)"
+msgstr ""
+"Não há nenhum diário de vendas definido para esta empresa: \"%s\" (id:%d)"
#. module: sale
-#: view:sale.report:0
-#: field:sale.report,price_total:0
-msgid "Total Price"
-msgstr "Preço Total"
+#: model:process.transition.action,name:sale.process_transition_action_forceassignation0
+msgid "Force Assignation"
+msgstr "Forçar Atribuição"
#. module: sale
#: selection:sale.order.line,type:0
@@ -993,6 +1044,11 @@ msgid "Based on the shipped or on the ordered quantities."
msgstr "Baseado no embarque ou nas quantidades pedidas."
#. module: sale
+#: selection:sale.order,picking_policy:0
+msgid "Deliver all products at once"
+msgstr ""
+
+#. module: sale
#: field:sale.order,picking_ids:0
msgid "Related Picking"
msgstr "Separações Relacionadas"
@@ -1024,9 +1080,15 @@ msgid "Create Delivery Order"
msgstr "Criar Ordem de Entrega"
#. module: sale
-#: field:sale.installer,delivery:0
-msgid "Delivery Costs"
-msgstr "Custos de Entrega"
+#: code:addons/sale/sale.py:1290
+#, python-format
+msgid "Cannot delete a sales order line which is in state '%s'!"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Qty(UoS)"
+msgstr ""
#. module: sale
#: view:sale.order:0
@@ -1040,13 +1102,13 @@ msgstr "Criar lista de Opções"
#. module: sale
#: view:sale.report:0
-msgid "Sales by Product Category"
-msgstr "Vendas por Categoria de Produto"
+msgid "Ordered date of the sales order"
+msgstr ""
#. module: sale
-#: selection:sale.order,picking_policy:0
-msgid "Partial Delivery"
-msgstr "Entrega Parcial"
+#: view:sale.report:0
+msgid "Sales by Product Category"
+msgstr "Vendas por Categoria de Produto"
#. module: sale
#: model:process.transition,name:sale.process_transition_confirmquotation0
@@ -1054,10 +1116,10 @@ msgid "Confirm Quotation"
msgstr "Confirmar Cotação"
#. module: sale
-#: help:sale.order,origin:0
-msgid "Reference of the document that generated this sales order request."
-msgstr ""
-"Referência para o documento que gerou esta solicitação de pedido de venda."
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:63
+#, python-format
+msgid "Error"
+msgstr "Erro"
#. module: sale
#: view:sale.order:0
@@ -1089,20 +1151,14 @@ msgid "Procurement Method"
msgstr "Método de Aquisição"
#. module: sale
-#: view:sale.config.picking_policy:0
-#: view:sale.installer:0
-msgid "title"
-msgstr "título"
-
-#. module: sale
#: model:process.node,name:sale.process_node_packinglist0
msgid "Pick List"
msgstr "Lista de Seleção"
#. module: sale
#: view:sale.order:0
-msgid "Order date"
-msgstr "Data do Pedido"
+msgid "Set to Draft"
+msgstr "Definir como Rascunho"
#. module: sale
#: model:process.node,note:sale.process_node_packinglist0
@@ -1110,6 +1166,85 @@ msgid "Document of the move to the output or to the customer."
msgstr "Documento de movimento para a saída ou para o cliente."
#. module: sale
+#: model:email.template,body_text:sale.email_template_edi_sale
+msgid ""
+"\n"
+"Hello${object.partner_order_id.name and ' ' or "
+"''}${object.partner_order_id.name or ''},\n"
+"\n"
+"Here is your order confirmation for ${object.partner_id.name}:\n"
+" | Order number: *${object.name}*\n"
+" | Order total: *${object.amount_total} "
+"${object.pricelist_id.currency_id.name}*\n"
+" | Order date: ${object.date_order}\n"
+" % if object.origin:\n"
+" | Order reference: ${object.origin}\n"
+" % endif\n"
+" % if object.client_order_ref:\n"
+" | Your reference: ${object.client_order_ref}<br />\n"
+" % endif\n"
+" | Your contact: ${object.user_id.name} ${object.user_id.user_email "
+"and '<%s>'%(object.user_id.user_email) or ''}\n"
+"\n"
+"You can view the order confirmation, download it and even pay online using "
+"the following link:\n"
+" ${ctx.get('edi_web_url_view') or 'n/a'}\n"
+"\n"
+"% if object.order_policy in ('prepaid','manual') and "
+"object.company_id.paypal_account:\n"
+"<% \n"
+"comp_name = quote(object.company_id.name)\n"
+"order_name = quote(object.name)\n"
+"paypal_account = quote(object.company_id.paypal_account)\n"
+"order_amount = quote(str(object.amount_total))\n"
+"cur_name = quote(object.pricelist_id.currency_id.name)\n"
+"paypal_url = \"https://www.paypal.com/cgi-"
+"bin/webscr?cmd=_xclick&business=%s&item_name=%s%%20Order%%20%s&invoice=%s&amo"
+"unt=%s\" \\\n"
+" "
+"\"&currency_code=%s&button_subtype=services&no_note=1&bn=OpenERP_Order_PayNow"
+"_%s\" % \\\n"
+" "
+"(paypal_account,comp_name,order_name,order_name,order_amount,cur_name,cur_nam"
+"e)\n"
+"%>\n"
+"It is also possible to directly pay with Paypal:\n"
+" ${paypal_url}\n"
+"% endif\n"
+"\n"
+"If you have any question, do not hesitate to contact us.\n"
+"\n"
+"\n"
+"Thank you for choosing ${object.company_id.name}!\n"
+"\n"
+"\n"
+"--\n"
+"${object.user_id.name} ${object.user_id.user_email and "
+"'<%s>'%(object.user_id.user_email) or ''}\n"
+"${object.company_id.name}\n"
+"% if object.company_id.street:\n"
+"${object.company_id.street or ''}\n"
+"% endif\n"
+"% if object.company_id.street2:\n"
+"${object.company_id.street2}\n"
+"% endif\n"
+"% if object.company_id.city or object.company_id.zip:\n"
+"${object.company_id.zip or ''} ${object.company_id.city or ''}\n"
+"% endif\n"
+"% if object.company_id.country_id:\n"
+"${object.company_id.state_id and ('%s, ' % object.company_id.state_id.name) "
+"or ''} ${object.company_id.country_id.name or ''}\n"
+"% endif\n"
+"% if object.company_id.phone:\n"
+"Phone: ${object.company_id.phone}\n"
+"% endif\n"
+"% if object.company_id.website:\n"
+"${object.company_id.website or ''}\n"
+"% endif\n"
+" "
+msgstr ""
+
+#. module: sale
#: model:process.transition.action,name:sale.process_transition_action_validate0
msgid "Validate"
msgstr "Validar"
@@ -1132,9 +1267,9 @@ msgid "Taxes"
msgstr "Impostos"
#. module: sale
-#: field:sale.order,order_policy:0
-msgid "Shipping Policy"
-msgstr "Política de Embarque"
+#: view:sale.order:0
+msgid "Sales Order ready to be invoiced"
+msgstr ""
#. module: sale
#: help:sale.order,create_date:0
@@ -1153,9 +1288,9 @@ msgid "Create Invoices"
msgstr "Criar Notas Fiscais"
#. module: sale
-#: view:sale.order:0
-msgid "Extra Info"
-msgstr "Informações Adicionais"
+#: view:sale.report:0
+msgid "Sales order created in current month"
+msgstr ""
#. module: sale
#: report:sale.order:0
@@ -1163,11 +1298,24 @@ msgid "Fax :"
msgstr "Fax :"
#. module: sale
+#: help:sale.order.line,type:0
+msgid ""
+"If 'on order', it triggers a procurement when the sale order is confirmed to "
+"create a task, purchase order or manufacturing order linked to this sale "
+"order line."
+msgstr ""
+
+#. module: sale
#: field:sale.advance.payment.inv,amount:0
msgid "Advance Amount"
msgstr "Montante de Adiantamento"
#. module: sale
+#: field:sale.config.picking_policy,charge_delivery:0
+msgid "Do you charge the delivery?"
+msgstr ""
+
+#. module: sale
#: selection:sale.order,invoice_quantity:0
msgid "Shipped Quantities"
msgstr "Quantidade Enbarcada"
@@ -1178,25 +1326,45 @@ msgid "Invoice Based on Sales Orders"
msgstr "Notas Fiscais Baseadas em Pedidos de Venda"
#. module: sale
+#: code:addons/sale/sale.py:331
+#, python-format
+msgid ""
+"If you change the pricelist of this order (and eventually the currency), "
+"prices of existing order lines will not be updated."
+msgstr ""
+
+#. module: sale
#: model:ir.model,name:sale.model_stock_picking
msgid "Picking List"
msgstr "Lista de Separação"
#. module: sale
-#: code:addons/sale/sale.py:387
-#: code:addons/sale/sale.py:920
-#: code:addons/sale/sale.py:938
+#: code:addons/sale/sale.py:412
+#: code:addons/sale/sale.py:503
+#: code:addons/sale/sale.py:632
+#: code:addons/sale/sale.py:1015
+#: code:addons/sale/sale.py:1033
#, python-format
msgid "Error !"
msgstr "Erro !"
#. module: sale
-#: code:addons/sale/sale.py:570
+#: code:addons/sale/sale.py:603
#, python-format
msgid "Could not cancel sales order !"
msgstr "Pedido de venda nao pode ser cancelado !"
#. module: sale
+#: view:sale.order:0
+msgid "Qty(UoM)"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered Year of the sales order"
+msgstr ""
+
+#. module: sale
#: selection:sale.report,month:0
msgid "July"
msgstr "Julho"
@@ -1213,36 +1381,26 @@ msgid "Shipping Exception"
msgstr "Pendência no Embarque"
#. module: sale
-#: field:sale.make.invoice,grouped:0
-msgid "Group the invoices"
-msgstr "Agrupar Notas Fiscais"
-
-#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Shipping & Manual Invoice"
-msgstr "Embarque & Fatutamento Manual"
-
-#. module: sale
-#: code:addons/sale/sale.py:1051
+#: code:addons/sale/sale.py:1143
#, python-format
-msgid "Picking Information !"
-msgstr "Coletar Informação !"
+msgid "Picking Information ! : "
+msgstr ""
#. module: sale
-#: view:sale.report:0
-#: field:sale.report,month:0
-msgid "Month"
-msgstr "Mês"
+#: field:sale.make.invoice,grouped:0
+msgid "Group the invoices"
+msgstr "Agrupar Notas Fiscais"
#. module: sale
-#: model:ir.module.module,shortdesc:sale.module_meta_information
-msgid "Sales Management"
-msgstr "Vendas"
+#: field:sale.order,order_policy:0
+msgid "Invoice Policy"
+msgstr ""
#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Invoice From The Picking"
-msgstr "Faturar a partir da Separação"
+#: model:ir.actions.act_window,name:sale.action_config_picking_policy
+#: view:sale.config.picking_policy:0
+msgid "Setup your Invoicing Method"
+msgstr ""
#. module: sale
#: model:process.node,note:sale.process_node_invoice0
@@ -1251,32 +1409,31 @@ msgstr "Aguardando revisão do contador."
#. module: sale
#: view:sale.report:0
-#: field:sale.report,uom_name:0
msgid "Reference UoM"
msgstr "UdM Referencial"
#. module: sale
+#: view:sale.config.picking_policy:0
+msgid ""
+"This tool will help you to install the right module and configure the system "
+"according to the method you use to invoice your customers."
+msgstr ""
+
+#. module: sale
#: model:ir.model,name:sale.model_sale_order_line_make_invoice
msgid "Sale OrderLine Make_invoice"
msgstr "Item de Pedido gerar Nota Fiscal"
#. module: sale
-#: help:sale.config.picking_policy,step:0
-msgid ""
-"By default, OpenERP is able to manage complex routing and paths of products "
-"in your warehouse and partner locations. This will configure the most common "
-"and simple methods to deliver products to the customer in one or two "
-"operations by the worker."
-msgstr ""
-"Por padrão OpenERP é capaz de gerenciar roteamentos complexos e caminhos de "
-"produtos em seu estoque e nos parceiros. Isso irá configurar o método mais "
-"comum e simples de enviar produtos para os clientes em uma ou duas operações "
-"pelo operador."
+#: selection:sale.order,state:0
+#: selection:sale.report,state:0
+msgid "Invoice Exception"
+msgstr "Exceção de Faturamento"
#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_tree
-msgid "Old Quotations"
-msgstr "Cotações Anteriores"
+#: model:process.node,note:sale.process_node_saleorder0
+msgid "Drives procurement and invoicing"
+msgstr "Avançar Compras e Notas Fiscais"
#. module: sale
#: field:sale.order,invoiced:0
@@ -1291,6 +1448,22 @@ msgid "Sales Analysis"
msgstr "Análise de Vendas"
#. module: sale
+#: code:addons/sale/sale.py:1138
+#, python-format
+msgid ""
+"You selected a quantity of %d Units.\n"
+"But it's not compatible with the selected packaging.\n"
+"Here is a proposition of quantities according to the packaging:\n"
+"EAN: %s Quantity: %s Type of ul: %s"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Recreate Packing"
+msgstr "Recriar Embalagem"
+
+#. module: sale
+#: view:sale.order:0
#: field:sale.order.line,property_ids:0
msgid "Properties"
msgstr "Propriedades"
@@ -1322,7 +1495,17 @@ msgstr ""
"embarques."
#. module: sale
-#: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
+#: view:sale.order.line:0
+msgid "Confirmed sale order lines, not yet delivered"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:473
+#, python-format
+msgid "Customer Invoices"
+msgstr ""
+
+#. module: sale
#: model:process.process,name:sale.process_process_salesprocess0
#: view:sale.order:0
#: view:sale.report:0
@@ -1344,18 +1527,13 @@ msgid "Done"
msgstr "Concluído"
#. module: sale
-#: model:ir.model,name:sale.model_sale_installer
-msgid "sale.installer"
-msgstr "vendas.instalador"
-
-#. module: sale
#: model:process.node,name:sale.process_node_invoice0
#: model:process.node,name:sale.process_node_invoiceafterdelivery0
msgid "Invoice"
msgstr "Fatura"
#. module: sale
-#: code:addons/sale/sale.py:1014
+#: code:addons/sale/sale.py:1158
#, python-format
msgid ""
"You have to select a customer in the sales form !\n"
@@ -1365,11 +1543,6 @@ msgstr ""
"Por favor, selecione um cliente antes de escolher o produto."
#. module: sale
-#: selection:sale.config.picking_policy,step:0
-msgid "Picking List & Delivery Order"
-msgstr "Lista de Separação & Ordem de Entrega"
-
-#. module: sale
#: field:sale.order,origin:0
msgid "Source Document"
msgstr "Documento de Origem"
@@ -1395,7 +1568,7 @@ msgid "The amount without tax."
msgstr "Montante sem impostos."
#. module: sale
-#: code:addons/sale/sale.py:571
+#: code:addons/sale/sale.py:604
#, python-format
msgid "You must first cancel all picking attached to this sales order."
msgstr ""
@@ -1408,9 +1581,15 @@ msgid "Sales Advance Payment Invoice"
msgstr "Fatura de Vendas com Pagamento Antecipado"
#. module: sale
-#: field:sale.order,incoterm:0
-msgid "Incoterm"
-msgstr "Forma de Entrega"
+#: view:sale.report:0
+#: field:sale.report,month:0
+msgid "Month"
+msgstr "Mês"
+
+#. module: sale
+#: model:email.template,subject:sale.email_template_edi_sale
+msgid "${object.company_id.name} Order (Ref ${object.name or 'n/a' })"
+msgstr ""
#. module: sale
#: view:sale.order.line:0
@@ -1421,11 +1600,6 @@ msgid "Product"
msgstr "Produto"
#. module: sale
-#: model:ir.ui.menu,name:sale.menu_invoiced
-msgid "Invoicing"
-msgstr "Faturamento"
-
-#. module: sale
#: model:process.transition.action,name:sale.process_transition_action_cancelassignation0
msgid "Cancel Assignation"
msgstr "Cancelar Designação"
@@ -1436,14 +1610,10 @@ msgid "sale.config.picking_policy"
msgstr "vendas.config.politica_escolha"
#. module: sale
-#: help:sale.order,state:0
-msgid ""
-"Gives the state of the quotation or sales order. \n"
-"The exception state is automatically set when a cancel operation occurs in "
-"the invoice validation (Invoice Exception) or in the picking list process "
-"(Shipping Exception). \n"
-"The 'Waiting Schedule' state is set when the invoice is confirmed but "
-"waiting for the scheduler to run on the date 'Ordered Date'."
+#: view:account.invoice.report:0
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_turnover_by_month
+msgid "Monthly Turnover"
msgstr ""
#. module: sale
@@ -1462,7 +1632,6 @@ msgid "Product UoS"
msgstr "UdS Produto"
#. module: sale
-#: selection:sale.order,state:0
#: selection:sale.report,state:0
msgid "Manual In Progress"
msgstr "Manual em Progresso"
@@ -1483,7 +1652,8 @@ msgid "Order"
msgstr "Pedido"
#. module: sale
-#: code:addons/sale/sale.py:921
+#: code:addons/sale/sale.py:1016
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:71
#, python-format
msgid "There is no income account defined for this product: \"%s\" (id:%d)"
msgstr "Não há conta de entrada definida para este produto:\"%s\" (id:%d)"
@@ -1507,7 +1677,7 @@ msgstr ""
"vendendor."
#. module: sale
-#: code:addons/sale/sale.py:1116
+#: code:addons/sale/sale.py:1238
#, python-format
msgid ""
"You plan to sell %.2f %s but you only have %.2f %s available !\n"
@@ -1538,11 +1708,10 @@ msgid "Total"
msgstr "Total"
#. module: sale
-#: code:addons/sale/sale.py:388
-#, python-format
-msgid "There is no sales journal defined for this company: \"%s\" (id:%d)"
-msgstr ""
-"Não há nenhum diário de vendas definido para esta empresa: \"%s\" (id:%d)"
+#: report:sale.order:0
+#: view:sale.order.line:0
+msgid "Price"
+msgstr "Preço"
#. module: sale
#: model:process.transition,note:sale.process_transition_deliver0
@@ -1556,10 +1725,15 @@ msgstr ""
"automaticamente."
#. module: sale
-#: code:addons/sale/sale.py:1165
-#, python-format
-msgid "Cannot delete a sales order line which is %s !"
-msgstr "Não se pode excluir uma linha de pedido de venda que estiver %s !"
+#: selection:sale.order,order_policy:0
+msgid "Pay before delivery"
+msgstr ""
+
+#. module: sale
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.open_board_sales
+msgid "Sales Dashboard"
+msgstr ""
#. module: sale
#: model:ir.actions.act_window,name:sale.action_sale_order_make_invoice
@@ -1570,6 +1744,7 @@ msgstr "Gerar Nota Fiscal"
#. module: sale
#: view:sale.order:0
+#: selection:sale.order,state:0
#: view:sale.order.line:0
msgid "To Invoice"
msgstr "Para Faturar"
@@ -1580,6 +1755,11 @@ msgid "Date on which sales order is confirmed."
msgstr "Data na qual o pedido de venda é confirmado."
#. module: sale
+#: field:sale.order,project_id:0
+msgid "Contract/Analytic Account"
+msgstr ""
+
+#. module: sale
#: field:sale.order,company_id:0
#: field:sale.order.line,company_id:0
#: view:sale.report:0
@@ -1599,10 +1779,12 @@ msgid "The amount to be invoiced in advance."
msgstr "O montante a ser faturado antecipadamente."
#. module: sale
-#: selection:sale.order,state:0
-#: selection:sale.report,state:0
-msgid "Invoice Exception"
-msgstr "Exceção de Faturamento"
+#: code:addons/sale/sale.py:1256
+#, python-format
+msgid ""
+"Couldn't find a pricelist line matching this product and quantity.\n"
+"You have to change either the product, the quantity or the pricelist."
+msgstr ""
#. module: sale
#: help:sale.order,picking_ids:0
@@ -1612,15 +1794,6 @@ msgstr ""
"Esta é a lista de separação que foi gerada para este pedido de venda."
#. module: sale
-#: help:sale.installer,sale_margin:0
-msgid ""
-"Gives the margin of profitability by calculating the difference between Unit "
-"Price and Cost Price."
-msgstr ""
-"Fornece a margem de rentabilidade calculando a diferença entre o preço "
-"unitário e o preço de custo."
-
-#. module: sale
#: view:sale.make.invoice:0
#: view:sale.order.line.make.invoice:0
msgid "Create invoices"
@@ -1639,6 +1812,11 @@ msgid "Cancelled"
msgstr "Cancelada"
#. module: sale
+#: view:sale.order.line:0
+msgid "Sales Order Lines related to a Sales Order of mine"
+msgstr ""
+
+#. module: sale
#: model:ir.actions.act_window,name:sale.action_shop_form
#: model:ir.ui.menu,name:sale.menu_action_shop_form
#: field:sale.order,shop_id:0
@@ -1648,17 +1826,12 @@ msgid "Shop"
msgstr "Estabelecimento"
#. module: sale
-#: view:sale.report:0
-msgid " Month "
-msgstr " Mês "
-
-#. module: sale
#: field:sale.report,date_confirm:0
msgid "Date Confirm"
msgstr "Data de Confirmação"
#. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:111
+#: code:addons/sale/wizard/sale_line_invoice.py:113
#, python-format
msgid "Warning"
msgstr "Aviso"
@@ -1670,22 +1843,6 @@ msgid "Sales by Month"
msgstr "Vendas por Mês"
#. module: sale
-#: code:addons/sale/sale.py:1045
-#, python-format
-msgid ""
-"You selected a quantity of %d Units.\n"
-"But it's not compatible with the selected packaging.\n"
-"Here is a proposition of quantities according to the packaging:\n"
-"\n"
-"EAN: %s Quantity: %s Type of ul: %s"
-msgstr ""
-"Você selecionou a quantidade de %d Unidades.\n"
-"Mas isto não é compatível a embalagem selecionada.\n"
-"Aqui está uma proposta de quantidade de acordo com a embalagem:\n"
-"\n"
-"EAN: %s Quantidade: %s Tipo de ul: %s"
-
-#. module: sale
#: model:ir.model,name:sale.model_sale_order
#: model:process.node,name:sale.process_node_order0
#: model:process.node,name:sale.process_node_saleorder0
@@ -1701,6 +1858,11 @@ msgid "Quantity (UoS)"
msgstr "Quantidade (UdS)"
#. module: sale
+#: view:sale.order.line:0
+msgid "Sale Order Lines that are in 'done' state"
+msgstr ""
+
+#. module: sale
#: model:process.transition,note:sale.process_transition_packing0
msgid ""
"The Pick List form is created as soon as the sales order is confirmed, in "
@@ -1719,6 +1881,11 @@ msgid "Confirmed"
msgstr "Confirmada"
#. module: sale
+#: field:sale.config.picking_policy,order_policy:0
+msgid "Main Method Based On"
+msgstr ""
+
+#. module: sale
#: model:process.transition.action,name:sale.process_transition_action_confirm0
msgid "Confirm"
msgstr "Confirmar"
@@ -1741,6 +1908,7 @@ msgid "Invoice Lines"
msgstr "Linhas da Nota Fiscal"
#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_product_tree
#: view:sale.order:0
#: view:sale.order.line:0
msgid "Sales Order Lines"
@@ -1757,33 +1925,18 @@ msgid "Configuration"
msgstr "Configuração"
#. module: sale
-#: selection:sale.order,picking_policy:0
-msgid "Complete Delivery"
-msgstr "Entrega Completa"
+#: code:addons/sale/edi/sale_order.py:146
+#, python-format
+msgid "EDI Pricelist (%s)"
+msgstr ""
#. module: sale
#: view:sale.report:0
-msgid " Month-1 "
-msgstr " Mês-1 "
-
-#. module: sale
-#: help:sale.config.picking_policy,picking_policy:0
-msgid ""
-"The Shipping Policy is used to configure per order if you want to deliver as "
-"soon as possible when one product is available or you wait that all products "
-"are available.."
+msgid "Sales order created in current year"
msgstr ""
-"A Política de Embarque é usada para configurar, por pedido, se você quer "
-"entregar o mais rápido possível quando um produto está disponível ou você "
-"vai esperar que todos os produtos estejam disponíveis.."
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "August"
-msgstr "Agosto"
#. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:111
+#: code:addons/sale/wizard/sale_line_invoice.py:113
#, python-format
msgid ""
"Invoice cannot be created for this Sales Order Line due to one of the "
@@ -1797,6 +1950,11 @@ msgstr ""
"1.A Linha do Pedido de Venda está faturado!"
#. module: sale
+#: view:sale.order.line:0
+msgid "Sale order lines done"
+msgstr ""
+
+#. module: sale
#: field:sale.order.line,th_weight:0
msgid "Weight"
msgstr "Peso"
@@ -1815,7 +1973,6 @@ msgstr "Dezembro"
#. module: sale
#: field:sale.config.picking_policy,config_logo:0
-#: field:sale.installer,config_logo:0
msgid "Image"
msgstr "Imagem"
@@ -1848,9 +2005,9 @@ msgid "Salesman"
msgstr "Representante"
#. module: sale
-#: model:process.node,note:sale.process_node_saleorder0
-msgid "Drives procurement and invoicing"
-msgstr "Avançar Compras e Notas Fiscais"
+#: model:ir.actions.act_window,name:sale.action_order_tree
+msgid "Old Quotations"
+msgstr "Cotações Anteriores"
#. module: sale
#: field:sale.order,amount_untaxed:0
@@ -1858,7 +2015,7 @@ msgid "Untaxed Amount"
msgstr "Total de Mercadorias"
#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:163
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:170
#: model:ir.actions.act_window,name:sale.action_view_sale_advance_payment_inv
#: view:sale.advance.payment.inv:0
#: view:sale.order:0
@@ -1867,7 +2024,7 @@ msgid "Advance Invoice"
msgstr "Avançar Fatura"
#. module: sale
-#: code:addons/sale/sale.py:591
+#: code:addons/sale/sale.py:624
#, python-format
msgid "The sales order '%s' has been cancelled."
msgstr "O pedido de venda '%s' foi cancelado."
@@ -1912,20 +2069,20 @@ msgid "Packings"
msgstr "Separação"
#. module: sale
-#: field:sale.config.picking_policy,progress:0
-#: field:sale.installer,progress:0
-msgid "Configuration Progress"
-msgstr "Configuração em Progresso"
+#: view:sale.order.line:0
+msgid "Sale Order Lines ready to be invoiced"
+msgstr ""
#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_product_tree
-msgid "Product sales"
-msgstr "Vendas de Produtos"
+#: view:sale.report:0
+msgid "Sales order created in last month"
+msgstr ""
#. module: sale
-#: field:sale.order,date_order:0
-msgid "Ordered Date"
-msgstr "Data da Ordem"
+#: model:ir.actions.act_window,name:sale.action_email_templates
+#: model:ir.ui.menu,name:sale.menu_email_templates
+msgid "Email Templates"
+msgstr ""
#. module: sale
#: model:ir.actions.act_window,name:sale.action_order_form
@@ -1935,14 +2092,15 @@ msgid "Sales Orders"
msgstr "Pedidos de Venda"
#. module: sale
-#: selection:sale.config.picking_policy,picking_policy:0
-msgid "Direct Delivery"
-msgstr "Entrega Direta"
+#: model:ir.model,name:sale.model_sale_shop
+#: view:sale.shop:0
+msgid "Sales Shop"
+msgstr "Loja de Vendas"
#. module: sale
-#: field:sale.installer,sale_journal:0
-msgid "Invoicing journals"
-msgstr "Diários de Faturamento"
+#: selection:sale.report,month:0
+msgid "November"
+msgstr "Novembro"
#. module: sale
#: field:sale.advance.payment.inv,product_id:0
@@ -1950,18 +2108,12 @@ msgid "Advance Product"
msgstr "Avançar o Produto"
#. module: sale
-#: view:sale.report:0
-#: field:sale.report,shipped_qty_1:0
-msgid "Shipped Qty"
-msgstr "Qtd Embarcada"
-
-#. module: sale
-#: view:sale.open.invoice:0
-msgid "You invoice has been successfully created!"
-msgstr "Sua Nota Fiscal foi criada com sucesso!"
+#: view:sale.order:0
+msgid "Compute"
+msgstr "Calcular"
#. module: sale
-#: code:addons/sale/sale.py:585
+#: code:addons/sale/sale.py:618
#, python-format
msgid "You must first cancel all invoices attached to this sales order."
msgstr ""
@@ -1974,25 +2126,15 @@ msgid "January"
msgstr "Janeiro"
#. module: sale
-#: view:sale.installer:0
-msgid "Configure Your Sales Management Application"
-msgstr "Configure seu Sistema de Gerenciamento de Vendas"
-
-#. module: sale
#: model:ir.actions.act_window,name:sale.action_order_tree4
msgid "Sales Order in Progress"
msgstr "Pedido de Venda em Processamento"
#. module: sale
-#: field:sale.installer,sale_layout:0
-msgid "Sales Order Layout Improvement"
-msgstr "Aperfeiçoamento da Apresentação do Pedido de Venda"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:63
-#, python-format
-msgid "Error"
-msgstr "Erro"
+#: help:sale.order,origin:0
+msgid "Reference of the document that generated this sales order request."
+msgstr ""
+"Referência para o documento que gerou esta solicitação de pedido de venda."
#. module: sale
#: view:sale.report:0
@@ -2001,6 +2143,11 @@ msgid "Commitment Delay"
msgstr "Compromisso Atrasado"
#. module: sale
+#: selection:sale.order,order_policy:0
+msgid "Deliver & invoice on demand"
+msgstr ""
+
+#. module: sale
#: model:process.node,note:sale.process_node_saleprocurement0
msgid ""
"One Procurement order for each sales order line and for each of the "
@@ -2025,13 +2172,12 @@ msgid "Confirmed sales order to invoice."
msgstr "Pedidos de venda confirmados para faturamento."
#. module: sale
-#: code:addons/sale/sale.py:290
-#, python-format
-msgid "Cannot delete Sales Order(s) which are already confirmed !"
-msgstr "Pedidos de Venda confirmados não podem ser cancelados !"
+#: view:sale.order:0
+msgid "Sales Order that haven't yet been confirmed"
+msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:316
+#: code:addons/sale/sale.py:322
#, python-format
msgid "The sales order '%s' has been set in draft state."
msgstr "O pedido de venda '%s' foi colocado em status provisório."
@@ -2042,37 +2188,27 @@ msgid "from stock"
msgstr "do estoque"
#. module: sale
-#: field:sale.config.picking_policy,order_policy:0
-msgid "Shipping Default Policy"
-msgstr "Politica Padrão de Embarque"
-
-#. module: sale
#: view:sale.open.invoice:0
msgid "Close"
msgstr "Encerrar"
#. module: sale
+#: code:addons/sale/sale.py:1248
+#, python-format
+msgid "No Pricelist ! : "
+msgstr ""
+
+#. module: sale
#: field:sale.order,shipped:0
msgid "Delivered"
msgstr "Entregue"
#. module: sale
-#: code:addons/sale/sale.py:1115
-#, python-format
-msgid "Not enough stock !"
-msgstr "Sem estoque suficiente !"
-
-#. module: sale
#: constraint:stock.move:0
msgid "You must assign a production lot for this product"
msgstr "Você deve atribuir um lote de produção para este produto."
#. module: sale
-#: field:sale.order.line,sequence:0
-msgid "Layout Sequence"
-msgstr "Sequência do Layout"
-
-#. module: sale
#: model:ir.actions.act_window,help:sale.action_shop_form
msgid ""
"If you have more than one shop reselling your company products, you can "
@@ -2103,12 +2239,6 @@ msgid "May"
msgstr "maiio"
#. module: sale
-#: help:sale.installer,sale_order_dates:0
-msgid "Adds commitment, requested and effective dates on Sales Orders."
-msgstr ""
-"Adiciona compromisso, datas solicitadas e efetivas nos Pedidos de Venda."
-
-#. module: sale
#: view:sale.order:0
#: field:sale.order,partner_id:0
#: field:sale.order.line,order_partner_id:0
@@ -2116,25 +2246,11 @@ msgid "Customer"
msgstr "Cliente"
#. module: sale
-#: model:product.template,name:sale.advance_product_0_product_template
-msgid "Advance"
-msgstr "Avançar"
-
-#. module: sale
#: selection:sale.report,month:0
msgid "February"
msgstr "Fereveiro"
#. module: sale
-#: help:sale.installer,sale_journal:0
-msgid ""
-"Allows you to group and invoice your delivery orders according to different "
-"invoicing types: daily, weekly, etc."
-msgstr ""
-"Permite a você agrupar e faturar suas ordem de entrega de acordo com "
-"diferentes tipos de faturamento: diário, semanal, etc."
-
-#. module: sale
#: selection:sale.report,month:0
msgid "April"
msgstr "Abril"
@@ -2145,11 +2261,6 @@ msgid "Accounting"
msgstr "Contabilidade"
#. module: sale
-#: field:sale.config.picking_policy,step:0
-msgid "Steps To Deliver a Sales Order"
-msgstr "Passos para a Entrega de um Pedido de Venda."
-
-#. module: sale
#: view:sale.order:0
#: view:sale.order.line:0
msgid "Search Sales Order"
@@ -2161,20 +2272,18 @@ msgid "Sales Order Requisition"
msgstr "Solicitação para Pedido de Venda"
#. module: sale
+#: code:addons/sale/sale.py:1242
+#, python-format
+msgid "Not enough stock ! : "
+msgstr ""
+
+#. module: sale
#: report:sale.order:0
#: field:sale.order,payment_term:0
msgid "Payment Term"
msgstr "Forma de Pagamento"
#. module: sale
-#: help:sale.installer,sale_layout:0
-msgid ""
-"Provides some features to improve the layout of the Sales Order reports."
-msgstr ""
-"Fornece alguns recursos para melhorar a apresentação dos relatórios de "
-"Pedidos de Venda."
-
-#. module: sale
#: model:ir.actions.act_window,help:sale.action_order_report_all
msgid ""
"This report performs analysis on your quotations and sales orders. Analysis "
@@ -2217,6 +2326,9 @@ msgstr "Notas Fiscais Baseadas nas Entregas"
#~ msgid "Automatic Declaration"
#~ msgstr "Declaração Automática"
+#~ msgid "Shipping Policy"
+#~ msgstr "Política de Embarque"
+
#~ msgid "Payment accounts"
#~ msgstr "Pagamentos de Contas"
@@ -2252,6 +2364,9 @@ msgstr "Notas Fiscais Baseadas nas Entregas"
#~ msgid "Other data"
#~ msgstr "Outros dados"
+#~ msgid "Partial Delivery"
+#~ msgstr "Entrega Parcial"
+
#~ msgid "You invoice has been successfully created !"
#~ msgstr "Sua fatura foi criada com sucesso !"
@@ -2272,9 +2387,6 @@ msgstr "Notas Fiscais Baseadas nas Entregas"
#~ msgstr ""
#~ "Primeiro deve cancelar todas as faturas associadas a esta Ordem de Compra."
-#~ msgid "My Quotations"
-#~ msgstr "Minhas Cotações"
-
#~ msgid "Packing Default Policy"
#~ msgstr "Política Padrão de Empacotamento"
@@ -2330,33 +2442,66 @@ msgstr "Notas Fiscais Baseadas nas Entregas"
#~ msgstr ""
#~ "Não é possível deletar Ordem(ns) de Venda que já está(ão) confirmada(s)!"
+#~ msgid "Payment Before Delivery"
+#~ msgstr "Pagamento Antes da Entrega"
+
#~ msgid "Error: Invalid ean code"
#~ msgstr "Erro: Código EAN inválido"
#~ msgid "Delivery, from the warehouse to the customer."
#~ msgstr "Entregue, do depósito para o cliente"
+#~ msgid "title"
+#~ msgstr "título"
+
#~ msgid "Purchase Pricelists"
#~ msgstr "Lista de Preço de Compras"
+#~ msgid "Complete Delivery"
+#~ msgstr "Entrega Completa"
+
#~ msgid "Sales orders"
#~ msgstr "Ordens de Venda"
+#~ msgid "Configuration Progress"
+#~ msgstr "Configuração em Progresso"
+
+#~ msgid "Shipping Default Policy"
+#~ msgstr "Politica Padrão de Embarque"
+
+#~ msgid "Sales Management"
+#~ msgstr "Vendas"
+
#~ msgid "Our Salesman"
#~ msgstr "Nosso Representante"
+#~ msgid "Shipping & Manual Invoice"
+#~ msgstr "Embarque & Fatutamento Manual"
+
#~ msgid "Invalid model name in the action definition."
#~ msgstr "Nome do modelo inválido na definição da ação."
+#~ msgid "Ordered Date"
+#~ msgstr "Data da Ordem"
+
#~ msgid "Sale Pricelists"
#~ msgstr "Lista de Preço para Vendas"
+#~ msgid "Direct Delivery"
+#~ msgstr "Entrega Direta"
+
#~ msgid "Sales order lines"
#~ msgstr "Linhas da Ordem de Venda"
#~ msgid "Sale Shop"
#~ msgstr "Estabelecimento de Venda"
+#~ msgid "Picking List & Delivery Order"
+#~ msgstr "Lista de Separação & Ordem de Entrega"
+
+#~ msgid "Shipped Qty"
+#~ msgstr "Qtd Embarcada"
+
#~ msgid "Sale Order Lines"
#~ msgstr "Linhas da Ordem de Venda"
@@ -2372,6 +2517,9 @@ msgstr "Notas Fiscais Baseadas nas Entregas"
#~ msgid "Payment Terms"
#~ msgstr "Forma de Pagamento"
+#~ msgid "Picking Default Policy"
+#~ msgstr "Politica de Separação Padrão"
+
#~ msgid "Steps To Deliver a Sale Order"
#~ msgstr "Etapas para entrega de um pedido/ordem de venda"
@@ -2384,6 +2532,9 @@ msgstr "Notas Fiscais Baseadas nas Entregas"
#~ msgid "Procurement is created after confirmation of sale order."
#~ msgstr "Aquisição criada depois da confirmação do pedido"
+#~ msgid "All at Once"
+#~ msgstr "Partida única"
+
#~ msgid ""
#~ "The sale order will automatically create the invoice proposition (draft "
#~ "invoice). Ordered and delivered quantities may not be the same. You have to "
@@ -2414,6 +2565,9 @@ msgstr "Notas Fiscais Baseadas nas Entregas"
#~ msgid "Procurement Corrected"
#~ msgstr "Processo de Aquisição Corrigido"
+#~ msgid "Product sales"
+#~ msgstr "Vendas de Produtos"
+
#~ msgid ""
#~ "Gives the state of the quotation or sale order. The exception state is "
#~ "automatically set when a cancel operation occurs in the invoice validation "
@@ -2511,6 +2665,9 @@ msgstr "Notas Fiscais Baseadas nas Entregas"
#~ "A Fatura é criada quando 'Criar Fatura' for clicada depois de confirmado o "
#~ "pedido de venda. Esta transação move o pedido de venda para faturas."
+#~ msgid "Delivery Order Only"
+#~ msgstr "Somente solicitações de entrega"
+
#~ msgid ""
#~ "The Object name must start with x_ and not contain any special character !"
#~ msgstr ""
@@ -2520,6 +2677,9 @@ msgstr "Notas Fiscais Baseadas nas Entregas"
#~ msgid "Advance Payment"
#~ msgstr "Pagamento Antecipado"
+#~ msgid "Allows you to compute delivery costs on your quotations."
+#~ msgstr "Habilita você a calcular custos de entrega em suas cotações."
+
#, python-format
#~ msgid "You cannot cancel a sale order line that has already been invoiced !"
#~ msgstr ""
@@ -2531,16 +2691,86 @@ msgstr "Notas Fiscais Baseadas nas Entregas"
#~ "Please set one customer before choosing a product."
#~ msgstr "Você precisa selecionar um cliente no formulário de vendas !"
+#~ msgid " Year "
+#~ msgstr " Ano "
+
#~ msgid "Sale Order Line"
#~ msgstr "Itens de Pedidos"
+#~ msgid "Sales Application Configuration"
+#~ msgstr "Configuração da Aplicação de Vendas"
+
+#~ msgid "Delivery Costs"
+#~ msgstr "Custos de Entrega"
+
#~ msgid "Sale Order"
#~ msgstr "Pedido de Venda"
+#, python-format
+#~ msgid "Picking Information !"
+#~ msgstr "Coletar Informação !"
+
+#~ msgid "Invoicing"
+#~ msgstr "Faturamento"
+
+#~ msgid " Month "
+#~ msgstr " Mês "
+
+#~ msgid "sale.installer"
+#~ msgstr "vendas.instalador"
+
+#~ msgid " Month-1 "
+#~ msgstr " Mês-1 "
+
+#, python-format
+#~ msgid "Not enough stock !"
+#~ msgstr "Sem estoque suficiente !"
+
+#~ msgid "Invoicing journals"
+#~ msgstr "Diários de Faturamento"
+
#~ msgid "Invoice on Order After Delivery"
#~ msgstr "Faturamento do Pedido após a entrega"
#~ msgid ""
+#~ "Gives the margin of profitability by calculating the difference between Unit "
+#~ "Price and Cost Price."
+#~ msgstr ""
+#~ "Fornece a margem de rentabilidade calculando a diferença entre o preço "
+#~ "unitário e o preço de custo."
+
+#~ msgid ""
+#~ "The Shipping Policy is used to configure per order if you want to deliver as "
+#~ "soon as possible when one product is available or you wait that all products "
+#~ "are available.."
+#~ msgstr ""
+#~ "A Política de Embarque é usada para configurar, por pedido, se você quer "
+#~ "entregar o mais rápido possível quando um produto está disponível ou você "
+#~ "vai esperar que todos os produtos estejam disponíveis.."
+
+#~ msgid "Adds commitment, requested and effective dates on Sales Orders."
+#~ msgstr ""
+#~ "Adiciona compromisso, datas solicitadas e efetivas nos Pedidos de Venda."
+
+#~ msgid ""
+#~ "Allows you to group and invoice your delivery orders according to different "
+#~ "invoicing types: daily, weekly, etc."
+#~ msgstr ""
+#~ "Permite a você agrupar e faturar suas ordem de entrega de acordo com "
+#~ "diferentes tipos de faturamento: diário, semanal, etc."
+
+#~ msgid ""
+#~ "By default, OpenERP is able to manage complex routing and paths of products "
+#~ "in your warehouse and partner locations. This will configure the most common "
+#~ "and simple methods to deliver products to the customer in one or two "
+#~ "operations by the worker."
+#~ msgstr ""
+#~ "Por padrão OpenERP é capaz de gerenciar roteamentos complexos e caminhos de "
+#~ "produtos em seu estoque e nos parceiros. Isso irá configurar o método mais "
+#~ "comum e simples de enviar produtos para os clientes em uma ou duas operações "
+#~ "pelo operador."
+
+#~ msgid ""
#~ "Error: The default UOM and the purchase UOM must be in the same category."
#~ msgstr ""
#~ "Erro: A unidade padrão e a unidade de compra devem ser da mesma categoria."
@@ -2548,3 +2778,157 @@ msgstr "Notas Fiscais Baseadas nas Entregas"
#~ msgid "Error: UOS must be in a different category than the UOM"
#~ msgstr ""
#~ "Erro: Unidade de venda deve ser de categoria diferente da unidade de medida"
+
+#~ msgid "Configure"
+#~ msgstr "Configurar"
+
+#~ msgid "Order Reference must be unique !"
+#~ msgstr "Referência de Pedido deve ser única !"
+
+#~ msgid "Enhance your core Sales Application with additional functionalities."
+#~ msgstr ""
+#~ "Melhora o núcleo do Sistema de Vendas com funcionalidades adicionais."
+
+#, python-format
+#~ msgid "You cannot cancel a sales order line that has already been invoiced !"
+#~ msgstr ""
+#~ "Você não pode cancelar linhas de pedido de venda que já foram faturadas!"
+
+#~ msgid "Invoice From The Picking"
+#~ msgstr "Faturar a partir da Separação"
+
+#~ msgid "Advance"
+#~ msgstr "Avançar"
+
+#~ msgid "Layout Sequence"
+#~ msgstr "Sequência do Layout"
+
+#~ msgid "Steps To Deliver a Sales Order"
+#~ msgstr "Passos para a Entrega de um Pedido de Venda."
+
+#~ msgid "Setup your sales workflow and default values."
+#~ msgstr "Configure seu workflow de vendas e os valores padrões."
+
+#~ msgid "Invoice On Order After Delivery"
+#~ msgstr "Faturamento no Pedido Após Entrega"
+
+#~ msgid "Configure Your Sales Management Application"
+#~ msgstr "Configure seu Sistema de Gerenciamento de Vendas"
+
+#, python-format
+#~ msgid "Cannot delete Sales Order(s) which are already confirmed !"
+#~ msgstr "Pedidos de Venda confirmados não podem ser cancelados !"
+
+#, python-format
+#~ msgid "Cannot delete a sales order line which is %s !"
+#~ msgstr "Não se pode excluir uma linha de pedido de venda que estiver %s !"
+
+#, python-format
+#~ msgid ""
+#~ "You selected a quantity of %d Units.\n"
+#~ "But it's not compatible with the selected packaging.\n"
+#~ "Here is a proposition of quantities according to the packaging:\n"
+#~ "\n"
+#~ "EAN: %s Quantity: %s Type of ul: %s"
+#~ msgstr ""
+#~ "Você selecionou a quantidade de %d Unidades.\n"
+#~ "Mas isto não é compatível a embalagem selecionada.\n"
+#~ "Aqui está uma proposta de quantidade de acordo com a embalagem:\n"
+#~ "\n"
+#~ "EAN: %s Quantidade: %s Tipo de ul: %s"
+
+#~ msgid ""
+#~ "\n"
+#~ " The base module to manage quotations and sales orders.\n"
+#~ "\n"
+#~ " * Workflow with validation steps:\n"
+#~ " - Quotation -> Sales order -> Invoice\n"
+#~ " * Invoicing methods:\n"
+#~ " - Invoice on order (before or after shipping)\n"
+#~ " - Invoice on delivery\n"
+#~ " - Invoice on timesheets\n"
+#~ " - Advance invoice\n"
+#~ " * Partners preferences (shipping, invoicing, incoterm, ...)\n"
+#~ " * Products stocks and prices\n"
+#~ " * Delivery methods:\n"
+#~ " - all at once, multi-parcel\n"
+#~ " - delivery costs\n"
+#~ " * Dashboard for salesman that includes:\n"
+#~ " * Your open quotations\n"
+#~ " * Top 10 sales of the month\n"
+#~ " * Cases statistics\n"
+#~ " * Graph of sales by product\n"
+#~ " * Graph of cases of the month\n"
+#~ " "
+#~ msgstr ""
+#~ "\n"
+#~ " Módulo base para gerenciar cotações e pedidos de venda.\n"
+#~ "\n"
+#~ " * Workflow com passos de validação:\n"
+#~ " - Cotação -> Pedido de venda -> Faturamento\n"
+#~ " * Métodos de faturamento:\n"
+#~ " - Faturamento no pedido (antes ou depois do envio)\n"
+#~ " - Faturamento na entrega\n"
+#~ " - Faturamento no apontamento\n"
+#~ " - Adiantamento de fatura\n"
+#~ " * Preferências de parceiros (envio, faturamento, Inconterm, ...)\n"
+#~ " * Estoques e preços de produtos\n"
+#~ " * Métodos de entrega:\n"
+#~ " - Tudo de uma vez, parcelado\n"
+#~ " - Custos de entrega\n"
+#~ " * Painel para vendedores que incluem:\n"
+#~ " - Suas cotações abertas\n"
+#~ " - 10 maiores vendas do mês\n"
+#~ " - Estatística de casos\n"
+#~ " - Gráfico de vendas por produtos\n"
+#~ " - Gráfico de casos do mês\n"
+#~ " "
+
+#~ msgid ""
+#~ "The Shipping Policy is used to synchronise invoice and delivery operations.\n"
+#~ " - The 'Pay Before delivery' choice will first generate the invoice and "
+#~ "then generate the picking order after the payment of this invoice.\n"
+#~ " - The 'Shipping & Manual Invoice' will create the picking order directly "
+#~ "and wait for the user to manually click on the 'Invoice' button to generate "
+#~ "the draft invoice.\n"
+#~ " - The 'Invoice On Order After Delivery' choice will generate the draft "
+#~ "invoice based on sales order after all picking lists have been finished.\n"
+#~ " - The 'Invoice From The Picking' choice is used to create an invoice "
+#~ "during the picking process."
+#~ msgstr ""
+#~ "A Política de Envio é usada para sincronizar faturas e operações de "
+#~ "entrega.\n"
+#~ " - A opção 'Pagar Antes da Entrega' vai gerar primeiro a fatura e, então, "
+#~ "gerar o pedido de separação após o pagamento desta fatura.\n"
+#~ " - A opção 'Envio com Fatura Manual' vai criar o pedido de separação "
+#~ "diretamente e esperar que o usuário, manualmente, clique no botão 'Faturar' "
+#~ "para gerar a fatura provisória.\n"
+#~ " - A opção 'Faturar no Pedido Após Entrega' vai gerar a fatura provisória "
+#~ "baseada no pedido de venda após todas as listas de separação serem "
+#~ "finalizadas.\n"
+#~ " - A opção 'Faturar a partir da Separação' é usada para criar uma fatura "
+#~ "durante o processo de separação."
+
+#~ msgid "Configure Sales Order Logistics"
+#~ msgstr "Configura a Logística dos Pedidos de Venda"
+
+#~ msgid "Configure Picking Policy for Sales Order"
+#~ msgstr "Configure a Diretiva de Seleção dos Pedidos de Venda"
+
+#~ msgid "Sales Order Dates"
+#~ msgstr "Datas para Pedidos de Venda"
+
+#~ msgid "Margins in Sales Orders"
+#~ msgstr "Margens em Pedidos de Venda"
+
+#~ msgid "Sales Order Layout Improvement"
+#~ msgstr "Aperfeiçoamento da Apresentação do Pedido de Venda"
+
+#~ msgid ""
+#~ "Provides some features to improve the layout of the Sales Order reports."
+#~ msgstr ""
+#~ "Fornece alguns recursos para melhorar a apresentação dos relatórios de "
+#~ "Pedidos de Venda."
+
+#~ msgid "Order date"
+#~ msgstr "Data do Pedido"
diff --git a/addons/sale/i18n/ro.po b/addons/sale/i18n/ro.po
index 22eea5bf0cc..5cd91eaa4fc 100644
--- a/addons/sale/i18n/ro.po
+++ b/addons/sale/i18n/ro.po
@@ -6,15 +6,27 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2011-01-11 11:16+0000\n"
+"POT-Creation-Date: 2011-12-22 18:43+0000\n"
"PO-Revision-Date: 2011-03-17 08:17+0000\n"
"Last-Translator: Dorin <dhongu@gmail.com>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-05 05:17+0000\n"
-"X-Generator: Launchpad (build 14231)\n"
+"X-Launchpad-Export-Date: 2011-12-23 06:47+0000\n"
+"X-Generator: Launchpad (build 14560)\n"
+
+#. module: sale
+#: field:sale.config.picking_policy,timesheet:0
+msgid "Based on Timesheet"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid ""
+"Sale Order Lines that are confirmed, done or in exception state and haven't "
+"yet been invoiced"
+msgstr ""
#. module: sale
#: view:board.board:0
@@ -23,12 +35,6 @@ msgid "Sales by Salesman in last 90 days"
msgstr "Vânzări pe Vânzător în ultimele 90 de zile"
#. module: sale
-#: help:sale.installer,delivery:0
-msgid "Allows you to compute delivery costs on your quotations."
-msgstr ""
-"Vă permite să calculaţi costurile de livrare la ofertele dumneavoastră."
-
-#. module: sale
#: help:sale.order,picking_policy:0
msgid ""
"If you don't have enough stock available to deliver all at once, do you "
@@ -38,6 +44,11 @@ msgstr ""
"transporturile parţiale sau nu?"
#. module: sale
+#: view:sale.order:0
+msgid "UoS"
+msgstr ""
+
+#. module: sale
#: help:sale.order,partner_shipping_id:0
msgid "Shipping address for current sales order."
msgstr "Adresa de expediere pentru comanda curentă de vânzări."
@@ -61,22 +72,12 @@ msgid "Cancel Order"
msgstr "Anulează comanda"
#. module: sale
-#: view:sale.config.picking_policy:0
-msgid "Configure Sales Order Logistics"
-msgstr "Configurează Logistica Ordinului de vânzare"
-
-#. module: sale
-#: code:addons/sale/sale.py:603
+#: code:addons/sale/sale.py:638
#, python-format
msgid "The quotation '%s' has been converted to a sales order."
msgstr "Oferta '% s' a fost convertită la o comandă de vânzări."
#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Payment Before Delivery"
-msgstr "Plata înainte de livrare"
-
-#. module: sale
#: code:addons/sale/wizard/sale_make_invoice.py:42
#, python-format
msgid "Warning !"
@@ -95,12 +96,6 @@ msgstr ""
"vânzări."
#. module: sale
-#: selection:sale.config.picking_policy,picking_policy:0
-msgid "All at Once"
-msgstr "Toate deodată"
-
-#. module: sale
-#: field:sale.order,project_id:0
#: view:sale.report:0
#: field:sale.report,analytic_account_id:0
#: field:sale.shop,project_id:0
@@ -120,6 +115,15 @@ msgstr ""
"dacă facturaţi vânzările total."
#. module: sale
+#: code:addons/sale/sale.py:295
+#, python-format
+msgid ""
+"In order to delete a confirmed sale order, you must cancel it before ! To "
+"cancel a sale order, you must first cancel related picking or delivery "
+"orders."
+msgstr ""
+
+#. module: sale
#: model:process.node,name:sale.process_node_saleprocurement0
msgid "Procurement Order"
msgstr "Ordin de aprovizionare"
@@ -131,6 +135,11 @@ msgid "Partner"
msgstr "Partener"
#. module: sale
+#: selection:sale.order,order_policy:0
+msgid "Invoice based on deliveries"
+msgstr ""
+
+#. module: sale
#: view:sale.order:0
msgid "Order Line"
msgstr "Poziţie comandă"
@@ -176,9 +185,14 @@ msgid "Default Payment Term"
msgstr "Termen de plată implicit"
#. module: sale
-#: model:ir.actions.act_window,name:sale.action_config_picking_policy
-msgid "Configure Picking Policy for Sales Order"
-msgstr "Configurează politica de preluare pentru Ordinul de vânzare"
+#: field:sale.config.picking_policy,deli_orders:0
+msgid "Based on Delivery Orders"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.picking_policy,time_unit:0
+msgid "Main Working Time Unit"
+msgstr ""
#. module: sale
#: view:sale.order:0
@@ -194,9 +208,10 @@ msgid "Disc.(%)"
msgstr "Disc.(%)"
#. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_forceassignation0
-msgid "Force Assignation"
-msgstr "Forţează atribuirea"
+#: view:sale.report:0
+#: field:sale.report,price_total:0
+msgid "Total Price"
+msgstr "Preţ Total"
#. module: sale
#: help:sale.make.invoice,grouped:0
@@ -204,6 +219,11 @@ msgid "Check the box to group the invoices for the same customers"
msgstr "Bifaţi casuţa pentru a grupa facturile pentru aceiaşi clienţi"
#. module: sale
+#: view:sale.order:0
+msgid "My Sale Orders"
+msgstr ""
+
+#. module: sale
#: selection:sale.order,invoice_quantity:0
msgid "Ordered Quantities"
msgstr "Cantităţi comandate"
@@ -245,14 +265,25 @@ msgstr ""
"livrare\"."
#. module: sale
+#: field:sale.config.picking_policy,task_work:0
+msgid "Based on Tasks' Work"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
+msgid "Quotations and Sales"
+msgstr ""
+
+#. module: sale
#: model:ir.model,name:sale.model_sale_make_invoice
msgid "Sales Make Invoice"
msgstr ""
#. module: sale
-#: view:sale.order:0
-msgid "Recreate Packing"
-msgstr "Recreează livrarea"
+#: code:addons/sale/sale.py:330
+#, python-format
+msgid "Pricelist Warning!"
+msgstr ""
#. module: sale
#: field:sale.order.line,discount:0
@@ -260,12 +291,10 @@ msgid "Discount (%)"
msgstr "Discount (%)"
#. module: sale
-#: help:res.company,security_lead:0
-msgid ""
-"This is the days added to what you promise to customers for security purpose"
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_quotation_for_sale
+msgid "My Quotations"
msgstr ""
-"Aceasta sunt zilele adăugate la ceea ce ati promis clienţilor cu scopul de "
-"siguranţă"
#. module: sale
#: view:board.board:0
@@ -290,7 +319,22 @@ msgid "Shop Name"
msgstr "Numele Magazinului"
#. module: sale
-#: code:addons/sale/sale.py:1014
+#: help:sale.order,order_policy:0
+msgid ""
+"The Invoice Policy is used to synchronise invoice and delivery operations.\n"
+" - The 'Pay before delivery' choice will first generate the invoice and "
+"then generate the picking order after the payment of this invoice.\n"
+" - The 'Deliver & Invoice on demand' will create the picking order directly "
+"and wait for the user to manually click on the 'Invoice' button to generate "
+"the draft invoice based on the sale order or the sale order lines.\n"
+" - The 'Invoice on order after delivery' choice will generate the draft "
+"invoice based on sales order after all picking lists have been finished.\n"
+" - The 'Invoice based on deliveries' choice is used to create an invoice "
+"during the picking process."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:1158
#, python-format
msgid "No Customer Defined !"
msgstr "Nici un client definit !"
@@ -301,9 +345,12 @@ msgid "Sales in Exception"
msgstr "Vânzări în stare de excepţie"
#. module: sale
-#: view:sale.order:0
-msgid "Set to Draft"
-msgstr "Schimbă în ciornă"
+#: code:addons/sale/sale.py:1145
+#: code:addons/sale/sale.py:1264
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:70
+#, python-format
+msgid "Configuration Error !"
+msgstr ""
#. module: sale
#: view:sale.order:0
@@ -311,34 +358,7 @@ msgid "Conditions"
msgstr "Condiţii"
#. module: sale
-#: help:sale.order,order_policy:0
-msgid ""
-"The Shipping Policy is used to synchronise invoice and delivery operations.\n"
-" - The 'Pay Before delivery' choice will first generate the invoice and "
-"then generate the picking order after the payment of this invoice.\n"
-" - The 'Shipping & Manual Invoice' will create the picking order directly "
-"and wait for the user to manually click on the 'Invoice' button to generate "
-"the draft invoice.\n"
-" - The 'Invoice On Order After Delivery' choice will generate the draft "
-"invoice based on sales order after all picking lists have been finished.\n"
-" - The 'Invoice From The Picking' choice is used to create an invoice "
-"during the picking process."
-msgstr ""
-"Politica de expediere este folosită pentru a sincroniza operaţiunile de "
-"facturare şi de livrare.\n"
-" - alegerea 'Plata Înainte de Livrare' va genera prima dată factura şi apoi "
-"pentru va genera ordinul pentru preluare după plata acestei facturi.\n"
-" - 'Transport & Factură Manual' va crea ordinul pentru preluare direct şi "
-"aşteptaţi pentru ca utilizatorul să actioneze manual butonul 'factură' "
-"pentru a genera factura proformă.\n"
-" - alegerea 'Factura pe Ordine După Livrare' va genera factura proformă "
-"bazată pe ordinul de vânzare după toate listele pentru preluare au fost "
-"terminate.\n"
-" - alegerea 'Factura de la Preluare' este utilizat pentru a crea o factură "
-"în timpul procesului de preluare."
-
-#. module: sale
-#: code:addons/sale/sale.py:939
+#: code:addons/sale/sale.py:1034
#, python-format
msgid ""
"There is no income category account defined in default Properties for "
@@ -348,9 +368,9 @@ msgstr ""
"Proprietăţi pentru Categoria de produse sau Poziţia fiscală nu este definită!"
#. module: sale
-#: view:sale.installer:0
-msgid "Configure"
-msgstr "Configurează"
+#: selection:sale.report,month:0
+msgid "August"
+msgstr "August"
#. module: sale
#: constraint:stock.move:0
@@ -358,7 +378,7 @@ msgid "You try to assign a lot which is not from the same product"
msgstr "Încercaţi să atribuiţi un lot care nu este din acelaşi produs"
#. module: sale
-#: code:addons/sale/sale.py:620
+#: code:addons/sale/sale.py:655
#, python-format
msgid "invalid mode for test_state"
msgstr "mod invalid pentru test_state"
@@ -369,7 +389,7 @@ msgid "June"
msgstr "Iunie"
#. module: sale
-#: code:addons/sale/sale.py:584
+#: code:addons/sale/sale.py:617
#, python-format
msgid "Could not cancel this sales order !"
msgstr "Nu se poate anula acest ordin de vânzare !"
@@ -390,8 +410,12 @@ msgid "October"
msgstr "Octombrie"
#. module: sale
+#: sql_constraint:stock.picking:0
+msgid "Reference must be unique per Company!"
+msgstr ""
+
+#. module: sale
#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_quotation_for_sale
#: view:sale.order:0
#: view:sale.report:0
msgid "Quotations"
@@ -403,11 +427,6 @@ msgid "Pricelist for current sales order."
msgstr "Lista de preţuri pentru comanda curentă de vânzări."
#. module: sale
-#: selection:sale.config.picking_policy,step:0
-msgid "Delivery Order Only"
-msgstr "Doar ordin de livrare"
-
-#. module: sale
#: report:sale.order:0
msgid "TVA :"
msgstr "TVA :"
@@ -433,6 +452,7 @@ msgstr "Poziţie fiscală"
#. module: sale
#: view:sale.order:0
#: view:sale.order.line:0
+#: field:sale.report,product_uom:0
msgid "UoM"
msgstr "UM"
@@ -457,7 +477,13 @@ msgstr ""
"'Manual în curs de desfăşurare'."
#. module: sale
-#: code:addons/sale/sale.py:971
+#: code:addons/sale/sale.py:1061
+#, python-format
+msgid "You cannot cancel a sale order line that has already been invoiced!"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:1066
#, python-format
msgid "You must first cancel stock moves attached to this sales order line."
msgstr ""
@@ -465,7 +491,7 @@ msgstr ""
"comandă de vânzări."
#. module: sale
-#: code:addons/sale/sale.py:1042
+#: code:addons/sale/sale.py:1134
#, python-format
msgid "(n/a)"
msgstr "indisponibil"
@@ -504,15 +530,36 @@ msgid "Notes"
msgstr "Notiţe"
#. module: sale
+#: sql_constraint:res.company:0
+msgid "The company name must be unique !"
+msgstr ""
+
+#. module: sale
#: help:sale.order,partner_invoice_id:0
msgid "Invoice address for current sales order."
msgstr "Adresa de facturare pentru comanda curentă de vânzări."
#. module: sale
-#: view:sale.installer:0
-msgid "Enhance your core Sales Application with additional functionalities."
+#: view:sale.report:0
+msgid "Month-1"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered month of the sales order"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:504
+#, python-format
+msgid ""
+"You cannot group sales having different currencies for the same partner."
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,picking_policy:0
+msgid "Deliver each product when available"
msgstr ""
-"Îmbunătățește nucleul Aplicație de Vânzări cu funcționalități adiționale."
#. module: sale
#: field:sale.order,invoiced_rate:0
@@ -531,21 +578,43 @@ msgid "Confirmation Date"
msgstr "Data confirmării"
#. module: sale
+#: field:sale.order,incoterm:0
+msgid "Incoterm"
+msgstr "INCOTERM"
+
+#. module: sale
#: field:sale.order.line,address_allotment_id:0
msgid "Allotment Partner"
msgstr "Alocare per partener"
#. module: sale
-#: sql_constraint:sale.order:0
-msgid "Order Reference must be unique !"
-msgstr "Numărul comenzii trebuie să fie unic!"
-
-#. module: sale
#: selection:sale.report,month:0
msgid "March"
msgstr "Martie"
#. module: sale
+#: constraint:stock.move:0
+msgid "You can not move products from or to a location of the type view."
+msgstr ""
+
+#. module: sale
+#: field:sale.config.picking_policy,sale_orders:0
+msgid "Based on Sales Orders"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,state:0
+msgid ""
+"Givwizard = self.browse(cr, uid, ids)[0]es the state of the quotation or "
+"sales order. \n"
+"The exception state is automatically set when a cancel operation occurs in "
+"the invoice validation (Invoice Exception) or in the picking list process "
+"(Shipping Exception). \n"
+"The 'Waiting Schedule' state is set when the invoice is confirmed but "
+"waiting for the scheduler to run on the order date."
+msgstr ""
+
+#. module: sale
#: help:sale.order,amount_total:0
msgid "The total amount."
msgstr "Suma totală."
@@ -561,6 +630,11 @@ msgid "Invoice address :"
msgstr "Adresă facturare:"
#. module: sale
+#: field:sale.order.line,sequence:0
+msgid "Line Sequence"
+msgstr ""
+
+#. module: sale
#: model:process.transition,note:sale.process_transition_saleorderprocurement0
msgid ""
"For every sales order line, a procurement order is created to supply the "
@@ -611,11 +685,6 @@ msgid "Sales Order Line"
msgstr "Linie comandă de vânzare"
#. module: sale
-#: view:sale.config.picking_policy:0
-msgid "Setup your sales workflow and default values."
-msgstr "Configurează de fluxul de lucru al vânzărilor şi valorile implicite."
-
-#. module: sale
#: field:sale.shop,warehouse_id:0
msgid "Warehouse"
msgstr "Depozit"
@@ -652,6 +721,11 @@ msgid "Creation Date"
msgstr "Data creării"
#. module: sale
+#: model:ir.ui.menu,name:sale.menu_sales_configuration_misc
+msgid "Miscellaneous"
+msgstr ""
+
+#. module: sale
#: model:ir.actions.act_window,name:sale.action_order_line_tree3
msgid "Uninvoiced and Delivered Lines"
msgstr "Poziţii nefacturate şi livrate"
@@ -667,14 +741,19 @@ msgid "My Sales"
msgstr "Vânzările mele"
#. module: sale
-#: code:addons/sale/sale.py:290
-#: code:addons/sale/sale.py:966
-#: code:addons/sale/sale.py:1165
+#: code:addons/sale/sale.py:295
+#: code:addons/sale/sale.py:1061
+#: code:addons/sale/sale.py:1290
#, python-format
msgid "Invalid action !"
msgstr "Acţiune invalidă!"
#. module: sale
+#: view:sale.order:0
+msgid "Extra Info"
+msgstr "Informaţii suplimentare"
+
+#. module: sale
#: field:sale.order,pricelist_id:0
#: field:sale.report,pricelist_id:0
#: field:sale.shop,pricelist_id:0
@@ -688,13 +767,21 @@ msgid "# of Qty"
msgstr "# de cant."
#. module: sale
+#: code:addons/sale/sale.py:1314
+#, python-format
+msgid "Hour"
+msgstr ""
+
+#. module: sale
#: view:sale.order:0
msgid "Order Date"
msgstr "Data comenzii"
#. module: sale
#: view:sale.order.line:0
+#: view:sale.report:0
#: field:sale.report,shipped:0
+#: field:sale.report,shipped_qty_1:0
msgid "Shipped"
msgstr "Expediat"
@@ -704,9 +791,9 @@ msgid "All Quotations"
msgstr "Toate ofertele"
#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Invoice On Order After Delivery"
-msgstr "Facturează pe comandă după livrare"
+#: view:sale.config.picking_policy:0
+msgid "Options"
+msgstr ""
#. module: sale
#: selection:sale.report,month:0
@@ -714,6 +801,20 @@ msgid "September"
msgstr "Septembrie"
#. module: sale
+#: code:addons/sale/sale.py:632
+#, python-format
+msgid "You cannot confirm a sale order which has no line."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:1246
+#, python-format
+msgid ""
+"You have to select a pricelist or a customer in the sales form !\n"
+"Please set one before choosing a product."
+msgstr ""
+
+#. module: sale
#: view:sale.report:0
#: field:sale.report,categ_id:0
msgid "Category of Product"
@@ -730,11 +831,6 @@ msgid "Stock Moves"
msgstr "Mişcări stoc"
#. module: sale
-#: view:sale.report:0
-msgid " Year "
-msgstr " Anul "
-
-#. module: sale
#: field:sale.order,state:0
#: field:sale.report,state:0
msgid "Order State"
@@ -752,7 +848,7 @@ msgid "Sales By Month"
msgstr "Vânzările realizate per Luna"
#. module: sale
-#: code:addons/sale/sale.py:970
+#: code:addons/sale/sale.py:1065
#, python-format
msgid "Could not cancel sales order line!"
msgstr "Nu se poate anula linie de comandă de vânzări!"
@@ -787,64 +883,19 @@ msgstr ""
"actualizat numai după ce programatorul (le) au fost lansate."
#. module: sale
+#: field:sale.order,date_order:0
+msgid "Date"
+msgstr ""
+
+#. module: sale
#: view:sale.report:0
msgid "Extended Filters..."
msgstr "Filtre extinse..."
#. module: sale
-#: model:ir.module.module,description:sale.module_meta_information
-msgid ""
-"\n"
-" The base module to manage quotations and sales orders.\n"
-"\n"
-" * Workflow with validation steps:\n"
-" - Quotation -> Sales order -> Invoice\n"
-" * Invoicing methods:\n"
-" - Invoice on order (before or after shipping)\n"
-" - Invoice on delivery\n"
-" - Invoice on timesheets\n"
-" - Advance invoice\n"
-" * Partners preferences (shipping, invoicing, incoterm, ...)\n"
-" * Products stocks and prices\n"
-" * Delivery methods:\n"
-" - all at once, multi-parcel\n"
-" - delivery costs\n"
-" * Dashboard for salesman that includes:\n"
-" * Your open quotations\n"
-" * Top 10 sales of the month\n"
-" * Cases statistics\n"
-" * Graph of sales by product\n"
-" * Graph of cases of the month\n"
-" "
-msgstr ""
-"\n"
-" Modulul de bază pentru a gestiona ofertele şi comenzile de vânzări.\n"
-"\n"
-" * Fluxul de lucru cu paşi de validare:\n"
-" - Oferta -> Ordin vânzări -> Factura\n"
-" * Metode facturare :\n"
-" - Factura la comanda (înainte sau după livrare)\n"
-" - Factura la livrare\n"
-" - Factura pe pontaje\n"
-" - Factura avans\n"
-" * Preferinţe partneri (transport, facturare, Incoterm, ...)\n"
-" * Stocurile de produse şi preţuri\n"
-" * Metode de livrare:\n"
-" - toate dintr-o dată, multi-parcela\n"
-" - costurile de livrare\n"
-" Tabloul de bord pentru agentul de vânzări, care include:\n"
-" * Ofertele dvs. deschise\n"
-" * Top 10 vânzări ale lunii\n"
-" * Statistici cazuri \n"
-" * Graficul vânzărilor pe produs\n"
-" * Graficul de cazuri ale lunii\n"
-" "
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_shop
-#: view:sale.shop:0
-msgid "Sales Shop"
-msgstr "Magazin Vânzări"
+#: selection:sale.order.line,state:0
+msgid "Exception"
+msgstr "Excepţie"
#. module: sale
#: model:ir.model,name:sale.model_res_company
@@ -852,9 +903,10 @@ msgid "Companies"
msgstr "Companii"
#. module: sale
-#: selection:sale.report,month:0
-msgid "November"
-msgstr "Noiembrie"
+#: code:addons/sale/sale.py:1259
+#, python-format
+msgid "No valid pricelist line found ! :"
+msgstr ""
#. module: sale
#: view:sale.order:0
@@ -862,9 +914,9 @@ msgid "History"
msgstr "Istoric"
#. module: sale
-#: field:sale.config.picking_policy,picking_policy:0
-msgid "Picking Default Policy"
-msgstr "Politica de preluare implicită"
+#: selection:sale.order,order_policy:0
+msgid "Invoice on order after delivery"
+msgstr ""
#. module: sale
#: help:sale.order,invoice_ids:0
@@ -889,14 +941,14 @@ msgid ""
msgstr "Numele şi adresa contactului care a solicitat comandă sau ofertă."
#. module: sale
-#: code:addons/sale/sale.py:966
-#, python-format
-msgid "You cannot cancel a sales order line that has already been invoiced !"
+#: help:res.company,security_lead:0
+msgid ""
+"This is the days added to what you promise to customers for security purpose"
msgstr ""
-"Nu poți anula o linie de comandă de vânzări care a fost deja facturată!"
+"Aceasta sunt zilele adăugate la ceea ce ati promis clienţilor cu scopul de "
+"siguranţă"
#. module: sale
-#: view:sale.order:0
#: view:sale.order.line:0
msgid "Qty"
msgstr "Cant."
@@ -907,6 +959,11 @@ msgid "References"
msgstr "Referinţe"
#. module: sale
+#: view:sale.order.line:0
+msgid "My Sales Order Lines"
+msgstr ""
+
+#. module: sale
#: model:process.transition.action,name:sale.process_transition_action_cancel0
#: model:process.transition.action,name:sale.process_transition_action_cancel1
#: model:process.transition.action,name:sale.process_transition_action_cancel2
@@ -918,14 +975,9 @@ msgid "Cancel"
msgstr "Renunță"
#. module: sale
-#: field:sale.installer,sale_order_dates:0
-msgid "Sales Order Dates"
-msgstr "Date comenzi de vânzări"
-
-#. module: sale
-#: selection:sale.order.line,state:0
-msgid "Exception"
-msgstr "Excepţie"
+#: sql_constraint:sale.order:0
+msgid "Order Reference must be unique per Company!"
+msgstr ""
#. module: sale
#: model:process.transition,name:sale.process_transition_invoice0
@@ -937,19 +989,19 @@ msgid "Create Invoice"
msgstr "Creare factură"
#. module: sale
-#: field:sale.installer,sale_margin:0
-msgid "Margins in Sales Orders"
-msgstr "Margini în Comenzi Vânzări"
-
-#. module: sale
#: view:sale.order:0
msgid "Total Tax Excluded"
msgstr "Total impozit exclus"
#. module: sale
-#: view:sale.order:0
-msgid "Compute"
-msgstr "Calculează"
+#: view:sale.order.line:0
+msgid "Order reference"
+msgstr ""
+
+#. module: sale
+#: view:sale.open.invoice:0
+msgid "You invoice has been successfully created!"
+msgstr "Factura dvs. a fost creată cu succes!"
#. module: sale
#: view:sale.report:0
@@ -968,23 +1020,22 @@ msgid "Open Invoice"
msgstr "Deschide factură"
#. module: sale
-#: report:sale.order:0
-#: view:sale.order.line:0
-msgid "Price"
-msgstr "Preţ"
+#: model:ir.actions.server,name:sale.ir_actions_server_edi_sale
+msgid "Auto-email confirmed sale orders"
+msgstr ""
#. module: sale
-#: model:ir.actions.act_window,name:sale.action_sale_installer
-#: view:sale.config.picking_policy:0
-#: view:sale.installer:0
-msgid "Sales Application Configuration"
-msgstr "Configuraţia Aplicaţiei de Vânzări"
+#: code:addons/sale/sale.py:413
+#, python-format
+msgid "There is no sales journal defined for this company: \"%s\" (id:%d)"
+msgstr ""
+"Nu există nici un jurnal de vânzări definit pentru această societate: \"%s\" "
+"(id:%d)"
#. module: sale
-#: view:sale.report:0
-#: field:sale.report,price_total:0
-msgid "Total Price"
-msgstr "Preţ Total"
+#: model:process.transition.action,name:sale.process_transition_action_forceassignation0
+msgid "Force Assignation"
+msgstr "Forţează atribuirea"
#. module: sale
#: selection:sale.order.line,type:0
@@ -997,6 +1048,11 @@ msgid "Based on the shipped or on the ordered quantities."
msgstr "Pe baza cantităţilor expediate sau comandate."
#. module: sale
+#: selection:sale.order,picking_policy:0
+msgid "Deliver all products at once"
+msgstr ""
+
+#. module: sale
#: field:sale.order,picking_ids:0
msgid "Related Picking"
msgstr "Preluari asociate"
@@ -1028,9 +1084,15 @@ msgid "Create Delivery Order"
msgstr "Creaţi Ordinului de livrare"
#. module: sale
-#: field:sale.installer,delivery:0
-msgid "Delivery Costs"
-msgstr "Costuri livrare"
+#: code:addons/sale/sale.py:1290
+#, python-format
+msgid "Cannot delete a sales order line which is in state '%s'!"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Qty(UoS)"
+msgstr ""
#. module: sale
#: view:sale.order:0
@@ -1044,13 +1106,13 @@ msgstr "Creaţi Lista de preluare"
#. module: sale
#: view:sale.report:0
-msgid "Sales by Product Category"
-msgstr "Vânzările pe categorii de produse"
+msgid "Ordered date of the sales order"
+msgstr ""
#. module: sale
-#: selection:sale.order,picking_policy:0
-msgid "Partial Delivery"
-msgstr "Livrare parţială"
+#: view:sale.report:0
+msgid "Sales by Product Category"
+msgstr "Vânzările pe categorii de produse"
#. module: sale
#: model:process.transition,name:sale.process_transition_confirmquotation0
@@ -1058,11 +1120,10 @@ msgid "Confirm Quotation"
msgstr "Confirmare ofertă"
#. module: sale
-#: help:sale.order,origin:0
-msgid "Reference of the document that generated this sales order request."
-msgstr ""
-"Referinţă a documentului care a generat această solicitare comandă de "
-"vânzări."
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:63
+#, python-format
+msgid "Error"
+msgstr "Eroare"
#. module: sale
#: view:sale.order:0
@@ -1094,20 +1155,14 @@ msgid "Procurement Method"
msgstr "Metodă de aprovizionare"
#. module: sale
-#: view:sale.config.picking_policy:0
-#: view:sale.installer:0
-msgid "title"
-msgstr "titlu"
-
-#. module: sale
#: model:process.node,name:sale.process_node_packinglist0
msgid "Pick List"
msgstr "Listă Preluare"
#. module: sale
#: view:sale.order:0
-msgid "Order date"
-msgstr "Data comenzii"
+msgid "Set to Draft"
+msgstr "Schimbă în ciornă"
#. module: sale
#: model:process.node,note:sale.process_node_packinglist0
@@ -1115,6 +1170,85 @@ msgid "Document of the move to the output or to the customer."
msgstr "Documentul miscării spre ieşire sau spre client."
#. module: sale
+#: model:email.template,body_text:sale.email_template_edi_sale
+msgid ""
+"\n"
+"Hello${object.partner_order_id.name and ' ' or "
+"''}${object.partner_order_id.name or ''},\n"
+"\n"
+"Here is your order confirmation for ${object.partner_id.name}:\n"
+" | Order number: *${object.name}*\n"
+" | Order total: *${object.amount_total} "
+"${object.pricelist_id.currency_id.name}*\n"
+" | Order date: ${object.date_order}\n"
+" % if object.origin:\n"
+" | Order reference: ${object.origin}\n"
+" % endif\n"
+" % if object.client_order_ref:\n"
+" | Your reference: ${object.client_order_ref}<br />\n"
+" % endif\n"
+" | Your contact: ${object.user_id.name} ${object.user_id.user_email "
+"and '<%s>'%(object.user_id.user_email) or ''}\n"
+"\n"
+"You can view the order confirmation, download it and even pay online using "
+"the following link:\n"
+" ${ctx.get('edi_web_url_view') or 'n/a'}\n"
+"\n"
+"% if object.order_policy in ('prepaid','manual') and "
+"object.company_id.paypal_account:\n"
+"<% \n"
+"comp_name = quote(object.company_id.name)\n"
+"order_name = quote(object.name)\n"
+"paypal_account = quote(object.company_id.paypal_account)\n"
+"order_amount = quote(str(object.amount_total))\n"
+"cur_name = quote(object.pricelist_id.currency_id.name)\n"
+"paypal_url = \"https://www.paypal.com/cgi-"
+"bin/webscr?cmd=_xclick&business=%s&item_name=%s%%20Order%%20%s&invoice=%s&amo"
+"unt=%s\" \\\n"
+" "
+"\"&currency_code=%s&button_subtype=services&no_note=1&bn=OpenERP_Order_PayNow"
+"_%s\" % \\\n"
+" "
+"(paypal_account,comp_name,order_name,order_name,order_amount,cur_name,cur_nam"
+"e)\n"
+"%>\n"
+"It is also possible to directly pay with Paypal:\n"
+" ${paypal_url}\n"
+"% endif\n"
+"\n"
+"If you have any question, do not hesitate to contact us.\n"
+"\n"
+"\n"
+"Thank you for choosing ${object.company_id.name}!\n"
+"\n"
+"\n"
+"--\n"
+"${object.user_id.name} ${object.user_id.user_email and "
+"'<%s>'%(object.user_id.user_email) or ''}\n"
+"${object.company_id.name}\n"
+"% if object.company_id.street:\n"
+"${object.company_id.street or ''}\n"
+"% endif\n"
+"% if object.company_id.street2:\n"
+"${object.company_id.street2}\n"
+"% endif\n"
+"% if object.company_id.city or object.company_id.zip:\n"
+"${object.company_id.zip or ''} ${object.company_id.city or ''}\n"
+"% endif\n"
+"% if object.company_id.country_id:\n"
+"${object.company_id.state_id and ('%s, ' % object.company_id.state_id.name) "
+"or ''} ${object.company_id.country_id.name or ''}\n"
+"% endif\n"
+"% if object.company_id.phone:\n"
+"Phone: ${object.company_id.phone}\n"
+"% endif\n"
+"% if object.company_id.website:\n"
+"${object.company_id.website or ''}\n"
+"% endif\n"
+" "
+msgstr ""
+
+#. module: sale
#: model:process.transition.action,name:sale.process_transition_action_validate0
msgid "Validate"
msgstr "Valideaza"
@@ -1137,9 +1271,9 @@ msgid "Taxes"
msgstr "Taxe"
#. module: sale
-#: field:sale.order,order_policy:0
-msgid "Shipping Policy"
-msgstr "Politica de expediere"
+#: view:sale.order:0
+msgid "Sales Order ready to be invoiced"
+msgstr ""
#. module: sale
#: help:sale.order,create_date:0
@@ -1158,9 +1292,9 @@ msgid "Create Invoices"
msgstr "Crează facturi"
#. module: sale
-#: view:sale.order:0
-msgid "Extra Info"
-msgstr "Informaţii suplimentare"
+#: view:sale.report:0
+msgid "Sales order created in current month"
+msgstr ""
#. module: sale
#: report:sale.order:0
@@ -1168,11 +1302,24 @@ msgid "Fax :"
msgstr "Fax :"
#. module: sale
+#: help:sale.order.line,type:0
+msgid ""
+"If 'on order', it triggers a procurement when the sale order is confirmed to "
+"create a task, purchase order or manufacturing order linked to this sale "
+"order line."
+msgstr ""
+
+#. module: sale
#: field:sale.advance.payment.inv,amount:0
msgid "Advance Amount"
msgstr "Suma avans"
#. module: sale
+#: field:sale.config.picking_policy,charge_delivery:0
+msgid "Do you charge the delivery?"
+msgstr ""
+
+#. module: sale
#: selection:sale.order,invoice_quantity:0
msgid "Shipped Quantities"
msgstr "Cantităţi expediate"
@@ -1183,25 +1330,45 @@ msgid "Invoice Based on Sales Orders"
msgstr "Facturare pe baza comenzilor de vânzări"
#. module: sale
+#: code:addons/sale/sale.py:331
+#, python-format
+msgid ""
+"If you change the pricelist of this order (and eventually the currency), "
+"prices of existing order lines will not be updated."
+msgstr ""
+
+#. module: sale
#: model:ir.model,name:sale.model_stock_picking
msgid "Picking List"
msgstr "Listă preluare"
#. module: sale
-#: code:addons/sale/sale.py:387
-#: code:addons/sale/sale.py:920
-#: code:addons/sale/sale.py:938
+#: code:addons/sale/sale.py:412
+#: code:addons/sale/sale.py:503
+#: code:addons/sale/sale.py:632
+#: code:addons/sale/sale.py:1015
+#: code:addons/sale/sale.py:1033
#, python-format
msgid "Error !"
msgstr "Eroare !"
#. module: sale
-#: code:addons/sale/sale.py:570
+#: code:addons/sale/sale.py:603
#, python-format
msgid "Could not cancel sales order !"
msgstr "Nu se poate anula comanda de vânzare!"
#. module: sale
+#: view:sale.order:0
+msgid "Qty(UoM)"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered Year of the sales order"
+msgstr ""
+
+#. module: sale
#: selection:sale.report,month:0
msgid "July"
msgstr "Iulie"
@@ -1218,36 +1385,26 @@ msgid "Shipping Exception"
msgstr "Excepţie la expediere"
#. module: sale
-#: field:sale.make.invoice,grouped:0
-msgid "Group the invoices"
-msgstr "Grupează facturile"
-
-#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Shipping & Manual Invoice"
-msgstr "Livrare şi facturare manuală"
-
-#. module: sale
-#: code:addons/sale/sale.py:1051
+#: code:addons/sale/sale.py:1143
#, python-format
-msgid "Picking Information !"
-msgstr "Informatii Preluare !"
+msgid "Picking Information ! : "
+msgstr ""
#. module: sale
-#: view:sale.report:0
-#: field:sale.report,month:0
-msgid "Month"
-msgstr "Lună"
+#: field:sale.make.invoice,grouped:0
+msgid "Group the invoices"
+msgstr "Grupează facturile"
#. module: sale
-#: model:ir.module.module,shortdesc:sale.module_meta_information
-msgid "Sales Management"
-msgstr "Gestionare vânzări"
+#: field:sale.order,order_policy:0
+msgid "Invoice Policy"
+msgstr ""
#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Invoice From The Picking"
-msgstr "Factura de la Preluare"
+#: model:ir.actions.act_window,name:sale.action_config_picking_policy
+#: view:sale.config.picking_policy:0
+msgid "Setup your Invoicing Method"
+msgstr ""
#. module: sale
#: model:process.node,note:sale.process_node_invoice0
@@ -1256,32 +1413,31 @@ msgstr "Spre a fi revizuită de contabil."
#. module: sale
#: view:sale.report:0
-#: field:sale.report,uom_name:0
msgid "Reference UoM"
msgstr "UM de referinţă"
#. module: sale
+#: view:sale.config.picking_policy:0
+msgid ""
+"This tool will help you to install the right module and configure the system "
+"according to the method you use to invoice your customers."
+msgstr ""
+
+#. module: sale
#: model:ir.model,name:sale.model_sale_order_line_make_invoice
msgid "Sale OrderLine Make_invoice"
msgstr ""
#. module: sale
-#: help:sale.config.picking_policy,step:0
-msgid ""
-"By default, OpenERP is able to manage complex routing and paths of products "
-"in your warehouse and partner locations. This will configure the most common "
-"and simple methods to deliver products to the customer in one or two "
-"operations by the worker."
-msgstr ""
-"În mod implicit, OpenERP este capabil de a gestiona rute şi căi complexe ale "
-"produselor in depozit si la sediile partenerilor sai. Aceasta va configura "
-"metodele cele mai comune şi simple pentru a livra produse la client în una "
-"sau două operaţiuni de către lucrător."
+#: selection:sale.order,state:0
+#: selection:sale.report,state:0
+msgid "Invoice Exception"
+msgstr "Excepţie la facturare"
#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_tree
-msgid "Old Quotations"
-msgstr "Ofertele vechi"
+#: model:process.node,note:sale.process_node_saleorder0
+msgid "Drives procurement and invoicing"
+msgstr "Conduce aprovizionarea şi facturarea"
#. module: sale
#: field:sale.order,invoiced:0
@@ -1296,6 +1452,22 @@ msgid "Sales Analysis"
msgstr "Analiza vânzărilor"
#. module: sale
+#: code:addons/sale/sale.py:1138
+#, python-format
+msgid ""
+"You selected a quantity of %d Units.\n"
+"But it's not compatible with the selected packaging.\n"
+"Here is a proposition of quantities according to the packaging:\n"
+"EAN: %s Quantity: %s Type of ul: %s"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Recreate Packing"
+msgstr "Recreează livrarea"
+
+#. module: sale
+#: view:sale.order:0
#: field:sale.order.line,property_ids:0
msgid "Properties"
msgstr "Proprietăţi"
@@ -1327,7 +1499,17 @@ msgstr ""
"Puteţi genera facturi pe baza comenzilor de vânzări sau pe baza livrărilor."
#. module: sale
-#: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
+#: view:sale.order.line:0
+msgid "Confirmed sale order lines, not yet delivered"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:473
+#, python-format
+msgid "Customer Invoices"
+msgstr ""
+
+#. module: sale
#: model:process.process,name:sale.process_process_salesprocess0
#: view:sale.order:0
#: view:sale.report:0
@@ -1349,18 +1531,13 @@ msgid "Done"
msgstr "Efectuat"
#. module: sale
-#: model:ir.model,name:sale.model_sale_installer
-msgid "sale.installer"
-msgstr "sale.installer"
-
-#. module: sale
#: model:process.node,name:sale.process_node_invoice0
#: model:process.node,name:sale.process_node_invoiceafterdelivery0
msgid "Invoice"
msgstr "Factură"
#. module: sale
-#: code:addons/sale/sale.py:1014
+#: code:addons/sale/sale.py:1158
#, python-format
msgid ""
"You have to select a customer in the sales form !\n"
@@ -1370,11 +1547,6 @@ msgstr ""
"Vă rugăm să setaţi un client înainte de a alege un produs."
#. module: sale
-#: selection:sale.config.picking_policy,step:0
-msgid "Picking List & Delivery Order"
-msgstr "Lista preluare & Ordin de livrare"
-
-#. module: sale
#: field:sale.order,origin:0
msgid "Source Document"
msgstr "Document sursă"
@@ -1400,7 +1572,7 @@ msgid "The amount without tax."
msgstr "Suma fără taxa."
#. module: sale
-#: code:addons/sale/sale.py:571
+#: code:addons/sale/sale.py:604
#, python-format
msgid "You must first cancel all picking attached to this sales order."
msgstr ""
@@ -1413,9 +1585,15 @@ msgid "Sales Advance Payment Invoice"
msgstr "Vânzări Factură cu Plata în avans"
#. module: sale
-#: field:sale.order,incoterm:0
-msgid "Incoterm"
-msgstr "INCOTERM"
+#: view:sale.report:0
+#: field:sale.report,month:0
+msgid "Month"
+msgstr "Lună"
+
+#. module: sale
+#: model:email.template,subject:sale.email_template_edi_sale
+msgid "${object.company_id.name} Order (Ref ${object.name or 'n/a' })"
+msgstr ""
#. module: sale
#: view:sale.order.line:0
@@ -1426,11 +1604,6 @@ msgid "Product"
msgstr "Produs"
#. module: sale
-#: model:ir.ui.menu,name:sale.menu_invoiced
-msgid "Invoicing"
-msgstr "Facturare"
-
-#. module: sale
#: model:process.transition.action,name:sale.process_transition_action_cancelassignation0
msgid "Cancel Assignation"
msgstr "Anulare atribuire"
@@ -1441,22 +1614,11 @@ msgid "sale.config.picking_policy"
msgstr "sale.config.picking_policy"
#. module: sale
-#: help:sale.order,state:0
-msgid ""
-"Gives the state of the quotation or sales order. \n"
-"The exception state is automatically set when a cancel operation occurs in "
-"the invoice validation (Invoice Exception) or in the picking list process "
-"(Shipping Exception). \n"
-"The 'Waiting Schedule' state is set when the invoice is confirmed but "
-"waiting for the scheduler to run on the date 'Ordered Date'."
+#: view:account.invoice.report:0
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_turnover_by_month
+msgid "Monthly Turnover"
msgstr ""
-"Arată starea ofertei sau comenzii de vânzări. \n"
-"Starea de exceptie este setată automat atunci când o operaţiune de anulare "
-"apare în procesul de validare factură (Excepţie la facturare ) sau în "
-"procesul de Lista preluare (Excepţie de expediere). \n"
-"Starea 'Aşteptare programare' este setat atunci când factura este "
-"confirmată, dar se aşteaptă Programatorul să ruleze pe data 'Data la care s-"
-"a efectuat comanda'."
#. module: sale
#: field:sale.order,invoice_quantity:0
@@ -1474,7 +1636,6 @@ msgid "Product UoS"
msgstr "UdV produs"
#. module: sale
-#: selection:sale.order,state:0
#: selection:sale.report,state:0
msgid "Manual In Progress"
msgstr "Manual - în curs"
@@ -1495,7 +1656,8 @@ msgid "Order"
msgstr "Comandă"
#. module: sale
-#: code:addons/sale/sale.py:921
+#: code:addons/sale/sale.py:1016
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:71
#, python-format
msgid "There is no income account defined for this product: \"%s\" (id:%d)"
msgstr ""
@@ -1521,7 +1683,7 @@ msgstr ""
"de vânzător."
#. module: sale
-#: code:addons/sale/sale.py:1116
+#: code:addons/sale/sale.py:1238
#, python-format
msgid ""
"You plan to sell %.2f %s but you only have %.2f %s available !\n"
@@ -1552,12 +1714,10 @@ msgid "Total"
msgstr "Total"
#. module: sale
-#: code:addons/sale/sale.py:388
-#, python-format
-msgid "There is no sales journal defined for this company: \"%s\" (id:%d)"
-msgstr ""
-"Nu există nici un jurnal de vânzări definit pentru această societate: \"%s\" "
-"(id:%d)"
+#: report:sale.order:0
+#: view:sale.order.line:0
+msgid "Price"
+msgstr "Preţ"
#. module: sale
#: model:process.transition,note:sale.process_transition_deliver0
@@ -1570,10 +1730,15 @@ msgstr ""
"client se face prin Comanda de livrare manual sau automat."
#. module: sale
-#: code:addons/sale/sale.py:1165
-#, python-format
-msgid "Cannot delete a sales order line which is %s !"
-msgstr "Nu se poate şterge o linie de comandă de vânzări, care este %s !"
+#: selection:sale.order,order_policy:0
+msgid "Pay before delivery"
+msgstr ""
+
+#. module: sale
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.open_board_sales
+msgid "Sales Dashboard"
+msgstr ""
#. module: sale
#: model:ir.actions.act_window,name:sale.action_sale_order_make_invoice
@@ -1584,6 +1749,7 @@ msgstr "Crează facturi"
#. module: sale
#: view:sale.order:0
+#: selection:sale.order,state:0
#: view:sale.order.line:0
msgid "To Invoice"
msgstr "De facturat"
@@ -1594,6 +1760,11 @@ msgid "Date on which sales order is confirmed."
msgstr "Data la care ordinul de vânzare este confirmat."
#. module: sale
+#: field:sale.order,project_id:0
+msgid "Contract/Analytic Account"
+msgstr ""
+
+#. module: sale
#: field:sale.order,company_id:0
#: field:sale.order.line,company_id:0
#: view:sale.report:0
@@ -1613,10 +1784,12 @@ msgid "The amount to be invoiced in advance."
msgstr "Suma care urmează să fie facturate în avans."
#. module: sale
-#: selection:sale.order,state:0
-#: selection:sale.report,state:0
-msgid "Invoice Exception"
-msgstr "Excepţie la facturare"
+#: code:addons/sale/sale.py:1256
+#, python-format
+msgid ""
+"Couldn't find a pricelist line matching this product and quantity.\n"
+"You have to change either the product, the quantity or the pricelist."
+msgstr ""
#. module: sale
#: help:sale.order,picking_ids:0
@@ -1627,15 +1800,6 @@ msgstr ""
"vânzări."
#. module: sale
-#: help:sale.installer,sale_margin:0
-msgid ""
-"Gives the margin of profitability by calculating the difference between Unit "
-"Price and Cost Price."
-msgstr ""
-"Oferă marja de profitabilitate, prin calcularea diferenţei dintre Preţ "
-"unitar şi preţul de cost."
-
-#. module: sale
#: view:sale.make.invoice:0
#: view:sale.order.line.make.invoice:0
msgid "Create invoices"
@@ -1654,6 +1818,11 @@ msgid "Cancelled"
msgstr "Anulat"
#. module: sale
+#: view:sale.order.line:0
+msgid "Sales Order Lines related to a Sales Order of mine"
+msgstr ""
+
+#. module: sale
#: model:ir.actions.act_window,name:sale.action_shop_form
#: model:ir.ui.menu,name:sale.menu_action_shop_form
#: field:sale.order,shop_id:0
@@ -1663,17 +1832,12 @@ msgid "Shop"
msgstr "Magazin"
#. module: sale
-#: view:sale.report:0
-msgid " Month "
-msgstr " Lună "
-
-#. module: sale
#: field:sale.report,date_confirm:0
msgid "Date Confirm"
msgstr "Confirmarea datei"
#. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:111
+#: code:addons/sale/wizard/sale_line_invoice.py:113
#, python-format
msgid "Warning"
msgstr "Avertisment"
@@ -1685,22 +1849,6 @@ msgid "Sales by Month"
msgstr "Vânzări pe Luna"
#. module: sale
-#: code:addons/sale/sale.py:1045
-#, python-format
-msgid ""
-"You selected a quantity of %d Units.\n"
-"But it's not compatible with the selected packaging.\n"
-"Here is a proposition of quantities according to the packaging:\n"
-"\n"
-"EAN: %s Quantity: %s Type of ul: %s"
-msgstr ""
-"Aţi selectat o cantitate de %d Unităţi.\n"
-"Dar nu este compatibilă cu ambalajul selectat.\n"
-"Aici este o propunere de cantităţi în funcţie de ambalaj:\n"
-"\n"
-"EAN: %s Cantitate: %s Tip de UL: %s"
-
-#. module: sale
#: model:ir.model,name:sale.model_sale_order
#: model:process.node,name:sale.process_node_order0
#: model:process.node,name:sale.process_node_saleorder0
@@ -1716,6 +1864,11 @@ msgid "Quantity (UoS)"
msgstr "Cantitate (UoS)"
#. module: sale
+#: view:sale.order.line:0
+msgid "Sale Order Lines that are in 'done' state"
+msgstr ""
+
+#. module: sale
#: model:process.transition,note:sale.process_transition_packing0
msgid ""
"The Pick List form is created as soon as the sales order is confirmed, in "
@@ -1735,6 +1888,11 @@ msgid "Confirmed"
msgstr "Confirmat"
#. module: sale
+#: field:sale.config.picking_policy,order_policy:0
+msgid "Main Method Based On"
+msgstr ""
+
+#. module: sale
#: model:process.transition.action,name:sale.process_transition_action_confirm0
msgid "Confirm"
msgstr "Confirmă"
@@ -1757,6 +1915,7 @@ msgid "Invoice Lines"
msgstr "Poziţii factură"
#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_product_tree
#: view:sale.order:0
#: view:sale.order.line:0
msgid "Sales Order Lines"
@@ -1773,33 +1932,18 @@ msgid "Configuration"
msgstr "Configuraţie"
#. module: sale
-#: selection:sale.order,picking_policy:0
-msgid "Complete Delivery"
-msgstr "Livrare completă"
+#: code:addons/sale/edi/sale_order.py:146
+#, python-format
+msgid "EDI Pricelist (%s)"
+msgstr ""
#. module: sale
#: view:sale.report:0
-msgid " Month-1 "
-msgstr " Luna-1 "
-
-#. module: sale
-#: help:sale.config.picking_policy,picking_policy:0
-msgid ""
-"The Shipping Policy is used to configure per order if you want to deliver as "
-"soon as possible when one product is available or you wait that all products "
-"are available.."
+msgid "Sales order created in current year"
msgstr ""
-"Politica de expediere este utilizată pentru a configura pe comandă, dacă "
-"doriţi să livreze cât mai curând posibil, atunci când un produs este "
-"disponibil sau să aşteptaţi ca toate produsele să fie disponibile."
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "August"
-msgstr "August"
#. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:111
+#: code:addons/sale/wizard/sale_line_invoice.py:113
#, python-format
msgid ""
"Invoice cannot be created for this Sales Order Line due to one of the "
@@ -1814,6 +1958,11 @@ msgstr ""
"2. Linie de Comandă de Vânzări este facturată!"
#. module: sale
+#: view:sale.order.line:0
+msgid "Sale order lines done"
+msgstr ""
+
+#. module: sale
#: field:sale.order.line,th_weight:0
msgid "Weight"
msgstr "Greutate"
@@ -1832,7 +1981,6 @@ msgstr "Decembrie"
#. module: sale
#: field:sale.config.picking_policy,config_logo:0
-#: field:sale.installer,config_logo:0
msgid "Image"
msgstr "Imagine"
@@ -1865,9 +2013,9 @@ msgid "Salesman"
msgstr "Agent de vânzări"
#. module: sale
-#: model:process.node,note:sale.process_node_saleorder0
-msgid "Drives procurement and invoicing"
-msgstr "Conduce aprovizionarea şi facturarea"
+#: model:ir.actions.act_window,name:sale.action_order_tree
+msgid "Old Quotations"
+msgstr "Ofertele vechi"
#. module: sale
#: field:sale.order,amount_untaxed:0
@@ -1875,7 +2023,7 @@ msgid "Untaxed Amount"
msgstr "Total fara taxe"
#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:163
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:170
#: model:ir.actions.act_window,name:sale.action_view_sale_advance_payment_inv
#: view:sale.advance.payment.inv:0
#: view:sale.order:0
@@ -1884,7 +2032,7 @@ msgid "Advance Invoice"
msgstr "Factura avans"
#. module: sale
-#: code:addons/sale/sale.py:591
+#: code:addons/sale/sale.py:624
#, python-format
msgid "The sales order '%s' has been cancelled."
msgstr "Comanda de vânzare '%s' a fost anulată."
@@ -1929,20 +2077,20 @@ msgid "Packings"
msgstr "Pachete"
#. module: sale
-#: field:sale.config.picking_policy,progress:0
-#: field:sale.installer,progress:0
-msgid "Configuration Progress"
-msgstr "Progres Configurare"
+#: view:sale.order.line:0
+msgid "Sale Order Lines ready to be invoiced"
+msgstr ""
#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_product_tree
-msgid "Product sales"
-msgstr "Vînzări produs"
+#: view:sale.report:0
+msgid "Sales order created in last month"
+msgstr ""
#. module: sale
-#: field:sale.order,date_order:0
-msgid "Ordered Date"
-msgstr "Data la care a fost comandat"
+#: model:ir.actions.act_window,name:sale.action_email_templates
+#: model:ir.ui.menu,name:sale.menu_email_templates
+msgid "Email Templates"
+msgstr ""
#. module: sale
#: model:ir.actions.act_window,name:sale.action_order_form
@@ -1952,14 +2100,15 @@ msgid "Sales Orders"
msgstr "Comenzi Vânzare"
#. module: sale
-#: selection:sale.config.picking_policy,picking_policy:0
-msgid "Direct Delivery"
-msgstr "Livrare directă"
+#: model:ir.model,name:sale.model_sale_shop
+#: view:sale.shop:0
+msgid "Sales Shop"
+msgstr "Magazin Vânzări"
#. module: sale
-#: field:sale.installer,sale_journal:0
-msgid "Invoicing journals"
-msgstr "Jurnale facturare"
+#: selection:sale.report,month:0
+msgid "November"
+msgstr "Noiembrie"
#. module: sale
#: field:sale.advance.payment.inv,product_id:0
@@ -1967,18 +2116,12 @@ msgid "Advance Product"
msgstr "Avans de mărfuri"
#. module: sale
-#: view:sale.report:0
-#: field:sale.report,shipped_qty_1:0
-msgid "Shipped Qty"
-msgstr "Cantitate expediată"
-
-#. module: sale
-#: view:sale.open.invoice:0
-msgid "You invoice has been successfully created!"
-msgstr "Factura dvs. a fost creată cu succes!"
+#: view:sale.order:0
+msgid "Compute"
+msgstr "Calculează"
#. module: sale
-#: code:addons/sale/sale.py:585
+#: code:addons/sale/sale.py:618
#, python-format
msgid "You must first cancel all invoices attached to this sales order."
msgstr ""
@@ -1991,25 +2134,16 @@ msgid "January"
msgstr "Ianuarie"
#. module: sale
-#: view:sale.installer:0
-msgid "Configure Your Sales Management Application"
-msgstr "Configurarea aplicaţiei de Management al vânzărilor"
-
-#. module: sale
#: model:ir.actions.act_window,name:sale.action_order_tree4
msgid "Sales Order in Progress"
msgstr "Comenzi de vânzare în curs"
#. module: sale
-#: field:sale.installer,sale_layout:0
-msgid "Sales Order Layout Improvement"
-msgstr "Îmbunătăţirea aspectului Comenzii de vânzare"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:63
-#, python-format
-msgid "Error"
-msgstr "Eroare"
+#: help:sale.order,origin:0
+msgid "Reference of the document that generated this sales order request."
+msgstr ""
+"Referinţă a documentului care a generat această solicitare comandă de "
+"vânzări."
#. module: sale
#: view:sale.report:0
@@ -2018,6 +2152,11 @@ msgid "Commitment Delay"
msgstr ""
#. module: sale
+#: selection:sale.order,order_policy:0
+msgid "Deliver & invoice on demand"
+msgstr ""
+
+#. module: sale
#: model:process.node,note:sale.process_node_saleprocurement0
msgid ""
"One Procurement order for each sales order line and for each of the "
@@ -2042,13 +2181,12 @@ msgid "Confirmed sales order to invoice."
msgstr "Comandă de vânzări confirmată a fi facturată."
#. module: sale
-#: code:addons/sale/sale.py:290
-#, python-format
-msgid "Cannot delete Sales Order(s) which are already confirmed !"
-msgstr "Nu se poate șterge Comanda(e) de vânzare, care are deja confirmare!"
+#: view:sale.order:0
+msgid "Sales Order that haven't yet been confirmed"
+msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:316
+#: code:addons/sale/sale.py:322
#, python-format
msgid "The sales order '%s' has been set in draft state."
msgstr "Comanda de vânzare '%s' a fost stabilită la starea de ciornă."
@@ -2059,37 +2197,27 @@ msgid "from stock"
msgstr "din stoc"
#. module: sale
-#: field:sale.config.picking_policy,order_policy:0
-msgid "Shipping Default Policy"
-msgstr "Metoda implicită de livrare"
-
-#. module: sale
#: view:sale.open.invoice:0
msgid "Close"
msgstr "Închide"
#. module: sale
+#: code:addons/sale/sale.py:1248
+#, python-format
+msgid "No Pricelist ! : "
+msgstr ""
+
+#. module: sale
#: field:sale.order,shipped:0
msgid "Delivered"
msgstr "Livrat"
#. module: sale
-#: code:addons/sale/sale.py:1115
-#, python-format
-msgid "Not enough stock !"
-msgstr "Stoc insuficient!"
-
-#. module: sale
#: constraint:stock.move:0
msgid "You must assign a production lot for this product"
msgstr "Trebuie să atribuiţi un lot de producţie pentru acest produs"
#. module: sale
-#: field:sale.order.line,sequence:0
-msgid "Layout Sequence"
-msgstr "Secvență ordonare"
-
-#. module: sale
#: model:ir.actions.act_window,help:sale.action_shop_form
msgid ""
"If you have more than one shop reselling your company products, you can "
@@ -2121,12 +2249,6 @@ msgid "May"
msgstr "Mai"
#. module: sale
-#: help:sale.installer,sale_order_dates:0
-msgid "Adds commitment, requested and effective dates on Sales Orders."
-msgstr ""
-"Adaugă angajament, datele solicitate şi efective pe comenzile de vânzări."
-
-#. module: sale
#: view:sale.order:0
#: field:sale.order,partner_id:0
#: field:sale.order.line,order_partner_id:0
@@ -2134,25 +2256,11 @@ msgid "Customer"
msgstr "Client"
#. module: sale
-#: model:product.template,name:sale.advance_product_0_product_template
-msgid "Advance"
-msgstr "Avans"
-
-#. module: sale
#: selection:sale.report,month:0
msgid "February"
msgstr "Februarie"
#. module: sale
-#: help:sale.installer,sale_journal:0
-msgid ""
-"Allows you to group and invoice your delivery orders according to different "
-"invoicing types: daily, weekly, etc."
-msgstr ""
-"Vă permite să gruparea şi facturarea ordinelor de livrare în funcţie de "
-"tipuri diferite de facturare: zilnic, saptamanal, etc"
-
-#. module: sale
#: selection:sale.report,month:0
msgid "April"
msgstr "Aprilie"
@@ -2163,11 +2271,6 @@ msgid "Accounting"
msgstr "Contabilitate"
#. module: sale
-#: field:sale.config.picking_policy,step:0
-msgid "Steps To Deliver a Sales Order"
-msgstr "Paşi pentru a livra o comandă de vânzări"
-
-#. module: sale
#: view:sale.order:0
#: view:sale.order.line:0
msgid "Search Sales Order"
@@ -2179,20 +2282,18 @@ msgid "Sales Order Requisition"
msgstr "Necesar comenzi vânzare"
#. module: sale
+#: code:addons/sale/sale.py:1242
+#, python-format
+msgid "Not enough stock ! : "
+msgstr ""
+
+#. module: sale
#: report:sale.order:0
#: field:sale.order,payment_term:0
msgid "Payment Term"
msgstr "Termen de plată"
#. module: sale
-#: help:sale.installer,sale_layout:0
-msgid ""
-"Provides some features to improve the layout of the Sales Order reports."
-msgstr ""
-"Oferă câteva facilități de îmbunătățire a aspectului raportului Comenzii de "
-"Vânzare"
-
-#. module: sale
#: model:ir.actions.act_window,help:sale.action_order_report_all
msgid ""
"This report performs analysis on your quotations and sales orders. Analysis "
@@ -2231,12 +2332,18 @@ msgstr "An"
msgid "Invoice Based on Deliveries"
msgstr "Factură bazată pe livrări"
+#~ msgid "Partial Delivery"
+#~ msgstr "Livrare parţială"
+
#~ msgid "Origin"
#~ msgstr "Origine"
#~ msgid "Packing"
#~ msgstr "Împachetare"
+#~ msgid "Complete Delivery"
+#~ msgstr "Livrare completă"
+
#~ msgid "Sales orders"
#~ msgstr "Comenzi vânzare"
@@ -2255,6 +2362,9 @@ msgstr "Factură bazată pe livrări"
#~ msgid "All Sales Order"
#~ msgstr "Toate comenzile de vânzare"
+#~ msgid "Direct Delivery"
+#~ msgstr "Livrare directă"
+
#~ msgid "Outgoing Products"
#~ msgstr "Produse ieşite"
@@ -2313,6 +2423,12 @@ msgstr "Factură bazată pe livrări"
#~ msgstr ""
#~ "Trebuie mai întâi să anulaţi toate facturile ataşate acestei comenzi."
+#~ msgid "Shipping Default Policy"
+#~ msgstr "Metoda implicită de livrare"
+
+#~ msgid "Delivery Order Only"
+#~ msgstr "Doar ordin de livrare"
+
#, python-format
#~ msgid "Could not cancel this sale order !"
#~ msgstr "Nu se poate anula această comandă!"
@@ -2330,12 +2446,18 @@ msgstr "Factură bazată pe livrări"
#~ msgid "Sales order"
#~ msgstr "Comenzi"
+#~ msgid "Payment Before Delivery"
+#~ msgstr "Plata înainte de livrare"
+
#~ msgid "Sale Pricelists"
#~ msgstr "Listă de preţuri de catalog"
#~ msgid "Invoice on Order After Delivery"
#~ msgstr "Facturare pe baza unei comenzi livrate"
+#~ msgid "Shipping & Manual Invoice"
+#~ msgstr "Livrare şi facturare manuală"
+
#~ msgid "Recreate Procurement"
#~ msgstr "Recrează achiziţia"
@@ -2364,6 +2486,9 @@ msgstr "Factură bazată pe livrări"
#~ msgid "Procurement is created after confirmation of sale order."
#~ msgstr "Achiziţia este creată după confirmarea comenzii."
+#~ msgid "All at Once"
+#~ msgstr "Toate deodată"
+
#~ msgid "Purchase Pricelists"
#~ msgstr "Lista de preţuri aprovizionare"
@@ -2398,8 +2523,279 @@ msgstr "Factură bazată pe livrări"
#~ msgid "Steps To Deliver a Sale Order"
#~ msgstr "Paşi pentru livrarea unei comenzi de vânzare"
+#~ msgid "Configure Sales Order Logistics"
+#~ msgstr "Configurează Logistica Ordinului de vânzare"
+
+#~ msgid "Allows you to compute delivery costs on your quotations."
+#~ msgstr ""
+#~ "Vă permite să calculaţi costurile de livrare la ofertele dumneavoastră."
+
+#~ msgid "Configure"
+#~ msgstr "Configurează"
+
+#~ msgid ""
+#~ "The Shipping Policy is used to synchronise invoice and delivery operations.\n"
+#~ " - The 'Pay Before delivery' choice will first generate the invoice and "
+#~ "then generate the picking order after the payment of this invoice.\n"
+#~ " - The 'Shipping & Manual Invoice' will create the picking order directly "
+#~ "and wait for the user to manually click on the 'Invoice' button to generate "
+#~ "the draft invoice.\n"
+#~ " - The 'Invoice On Order After Delivery' choice will generate the draft "
+#~ "invoice based on sales order after all picking lists have been finished.\n"
+#~ " - The 'Invoice From The Picking' choice is used to create an invoice "
+#~ "during the picking process."
+#~ msgstr ""
+#~ "Politica de expediere este folosită pentru a sincroniza operaţiunile de "
+#~ "facturare şi de livrare.\n"
+#~ " - alegerea 'Plata Înainte de Livrare' va genera prima dată factura şi apoi "
+#~ "pentru va genera ordinul pentru preluare după plata acestei facturi.\n"
+#~ " - 'Transport & Factură Manual' va crea ordinul pentru preluare direct şi "
+#~ "aşteptaţi pentru ca utilizatorul să actioneze manual butonul 'factură' "
+#~ "pentru a genera factura proformă.\n"
+#~ " - alegerea 'Factura pe Ordine După Livrare' va genera factura proformă "
+#~ "bazată pe ordinul de vânzare după toate listele pentru preluare au fost "
+#~ "terminate.\n"
+#~ " - alegerea 'Factura de la Preluare' este utilizat pentru a crea o factură "
+#~ "în timpul procesului de preluare."
+
+#~ msgid " Year "
+#~ msgstr " Anul "
+
+#~ msgid "Delivery Costs"
+#~ msgstr "Costuri livrare"
+
+#~ msgid "Shipping Policy"
+#~ msgstr "Politica de expediere"
+
+#~ msgid "title"
+#~ msgstr "titlu"
+
+#~ msgid "Sales Management"
+#~ msgstr "Gestionare vânzări"
+
+#~ msgid "Invoicing"
+#~ msgstr "Facturare"
+
+#~ msgid " Month "
+#~ msgstr " Lună "
+
+#~ msgid " Month-1 "
+#~ msgstr " Luna-1 "
+
+#~ msgid "Product sales"
+#~ msgstr "Vînzări produs"
+
+#~ msgid "Configuration Progress"
+#~ msgstr "Progres Configurare"
+
+#~ msgid "Shipped Qty"
+#~ msgstr "Cantitate expediată"
+
+#, python-format
+#~ msgid "Not enough stock !"
+#~ msgstr "Stoc insuficient!"
+
+#~ msgid "Advance"
+#~ msgstr "Avans"
+
+#~ msgid "Setup your sales workflow and default values."
+#~ msgstr "Configurează de fluxul de lucru al vânzărilor şi valorile implicite."
+
+#~ msgid "Invoice On Order After Delivery"
+#~ msgstr "Facturează pe comandă după livrare"
+
+#~ msgid ""
+#~ "\n"
+#~ " The base module to manage quotations and sales orders.\n"
+#~ "\n"
+#~ " * Workflow with validation steps:\n"
+#~ " - Quotation -> Sales order -> Invoice\n"
+#~ " * Invoicing methods:\n"
+#~ " - Invoice on order (before or after shipping)\n"
+#~ " - Invoice on delivery\n"
+#~ " - Invoice on timesheets\n"
+#~ " - Advance invoice\n"
+#~ " * Partners preferences (shipping, invoicing, incoterm, ...)\n"
+#~ " * Products stocks and prices\n"
+#~ " * Delivery methods:\n"
+#~ " - all at once, multi-parcel\n"
+#~ " - delivery costs\n"
+#~ " * Dashboard for salesman that includes:\n"
+#~ " * Your open quotations\n"
+#~ " * Top 10 sales of the month\n"
+#~ " * Cases statistics\n"
+#~ " * Graph of sales by product\n"
+#~ " * Graph of cases of the month\n"
+#~ " "
+#~ msgstr ""
+#~ "\n"
+#~ " Modulul de bază pentru a gestiona ofertele şi comenzile de vânzări.\n"
+#~ "\n"
+#~ " * Fluxul de lucru cu paşi de validare:\n"
+#~ " - Oferta -> Ordin vânzări -> Factura\n"
+#~ " * Metode facturare :\n"
+#~ " - Factura la comanda (înainte sau după livrare)\n"
+#~ " - Factura la livrare\n"
+#~ " - Factura pe pontaje\n"
+#~ " - Factura avans\n"
+#~ " * Preferinţe partneri (transport, facturare, Incoterm, ...)\n"
+#~ " * Stocurile de produse şi preţuri\n"
+#~ " * Metode de livrare:\n"
+#~ " - toate dintr-o dată, multi-parcela\n"
+#~ " - costurile de livrare\n"
+#~ " Tabloul de bord pentru agentul de vânzări, care include:\n"
+#~ " * Ofertele dvs. deschise\n"
+#~ " * Top 10 vânzări ale lunii\n"
+#~ " * Statistici cazuri \n"
+#~ " * Graficul vânzărilor pe produs\n"
+#~ " * Graficul de cazuri ale lunii\n"
+#~ " "
+
+#~ msgid "Sales Order Dates"
+#~ msgstr "Date comenzi de vânzări"
+
+#~ msgid "Margins in Sales Orders"
+#~ msgstr "Margini în Comenzi Vânzări"
+
+#~ msgid "Sales Application Configuration"
+#~ msgstr "Configuraţia Aplicaţiei de Vânzări"
+
+#~ msgid "Picking Default Policy"
+#~ msgstr "Politica de preluare implicită"
+
+#~ msgid "Picking List & Delivery Order"
+#~ msgstr "Lista preluare & Ordin de livrare"
+
+#~ msgid ""
+#~ "Gives the state of the quotation or sales order. \n"
+#~ "The exception state is automatically set when a cancel operation occurs in "
+#~ "the invoice validation (Invoice Exception) or in the picking list process "
+#~ "(Shipping Exception). \n"
+#~ "The 'Waiting Schedule' state is set when the invoice is confirmed but "
+#~ "waiting for the scheduler to run on the date 'Ordered Date'."
+#~ msgstr ""
+#~ "Arată starea ofertei sau comenzii de vânzări. \n"
+#~ "Starea de exceptie este setată automat atunci când o operaţiune de anulare "
+#~ "apare în procesul de validare factură (Excepţie la facturare ) sau în "
+#~ "procesul de Lista preluare (Excepţie de expediere). \n"
+#~ "Starea 'Aşteptare programare' este setat atunci când factura este "
+#~ "confirmată, dar se aşteaptă Programatorul să ruleze pe data 'Data la care s-"
+#~ "a efectuat comanda'."
+
+#, python-format
+#~ msgid "Cannot delete a sales order line which is %s !"
+#~ msgstr "Nu se poate şterge o linie de comandă de vânzări, care este %s !"
+
+#~ msgid ""
+#~ "Gives the margin of profitability by calculating the difference between Unit "
+#~ "Price and Cost Price."
+#~ msgstr ""
+#~ "Oferă marja de profitabilitate, prin calcularea diferenţei dintre Preţ "
+#~ "unitar şi preţul de cost."
+
+#, python-format
+#~ msgid "Picking Information !"
+#~ msgstr "Informatii Preluare !"
+
+#~ msgid ""
+#~ "The Shipping Policy is used to configure per order if you want to deliver as "
+#~ "soon as possible when one product is available or you wait that all products "
+#~ "are available.."
+#~ msgstr ""
+#~ "Politica de expediere este utilizată pentru a configura pe comandă, dacă "
+#~ "doriţi să livreze cât mai curând posibil, atunci când un produs este "
+#~ "disponibil sau să aşteptaţi ca toate produsele să fie disponibile."
+
+#~ msgid "Configure Your Sales Management Application"
+#~ msgstr "Configurarea aplicaţiei de Management al vânzărilor"
+
+#~ msgid "Invoicing journals"
+#~ msgstr "Jurnale facturare"
+
+#~ msgid "Ordered Date"
+#~ msgstr "Data la care a fost comandat"
+
+#~ msgid "Adds commitment, requested and effective dates on Sales Orders."
+#~ msgstr ""
+#~ "Adaugă angajament, datele solicitate şi efective pe comenzile de vânzări."
+
+#~ msgid "Configure Picking Policy for Sales Order"
+#~ msgstr "Configurează politica de preluare pentru Ordinul de vânzare"
+
+#~ msgid "Invoice From The Picking"
+#~ msgstr "Factura de la Preluare"
+
+#~ msgid "Order date"
+#~ msgstr "Data comenzii"
+
+#~ msgid ""
+#~ "By default, OpenERP is able to manage complex routing and paths of products "
+#~ "in your warehouse and partner locations. This will configure the most common "
+#~ "and simple methods to deliver products to the customer in one or two "
+#~ "operations by the worker."
+#~ msgstr ""
+#~ "În mod implicit, OpenERP este capabil de a gestiona rute şi căi complexe ale "
+#~ "produselor in depozit si la sediile partenerilor sai. Aceasta va configura "
+#~ "metodele cele mai comune şi simple pentru a livra produse la client în una "
+#~ "sau două operaţiuni de către lucrător."
+
+#~ msgid ""
+#~ "Allows you to group and invoice your delivery orders according to different "
+#~ "invoicing types: daily, weekly, etc."
+#~ msgstr ""
+#~ "Vă permite să gruparea şi facturarea ordinelor de livrare în funcţie de "
+#~ "tipuri diferite de facturare: zilnic, saptamanal, etc"
+
+#, python-format
+#~ msgid ""
+#~ "You selected a quantity of %d Units.\n"
+#~ "But it's not compatible with the selected packaging.\n"
+#~ "Here is a proposition of quantities according to the packaging:\n"
+#~ "\n"
+#~ "EAN: %s Quantity: %s Type of ul: %s"
+#~ msgstr ""
+#~ "Aţi selectat o cantitate de %d Unităţi.\n"
+#~ "Dar nu este compatibilă cu ambalajul selectat.\n"
+#~ "Aici este o propunere de cantităţi în funcţie de ambalaj:\n"
+#~ "\n"
+#~ "EAN: %s Cantitate: %s Tip de UL: %s"
+
+#~ msgid "Steps To Deliver a Sales Order"
+#~ msgstr "Paşi pentru a livra o comandă de vânzări"
+
+#~ msgid "Layout Sequence"
+#~ msgstr "Secvență ordonare"
+
+#~ msgid "Order Reference must be unique !"
+#~ msgstr "Numărul comenzii trebuie să fie unic!"
+
#~ msgid "Procure Method"
#~ msgstr "Metoda de aprovizionare"
#~ msgid "Payment accounts"
#~ msgstr "Conturi de plată"
+
+#~ msgid "sale.installer"
+#~ msgstr "sale.installer"
+
+#~ msgid "Enhance your core Sales Application with additional functionalities."
+#~ msgstr ""
+#~ "Îmbunătățește nucleul Aplicație de Vânzări cu funcționalități adiționale."
+
+#, python-format
+#~ msgid "You cannot cancel a sales order line that has already been invoiced !"
+#~ msgstr ""
+#~ "Nu poți anula o linie de comandă de vânzări care a fost deja facturată!"
+
+#~ msgid "Sales Order Layout Improvement"
+#~ msgstr "Îmbunătăţirea aspectului Comenzii de vânzare"
+
+#, python-format
+#~ msgid "Cannot delete Sales Order(s) which are already confirmed !"
+#~ msgstr "Nu se poate șterge Comanda(e) de vânzare, care are deja confirmare!"
+
+#~ msgid ""
+#~ "Provides some features to improve the layout of the Sales Order reports."
+#~ msgstr ""
+#~ "Oferă câteva facilități de îmbunătățire a aspectului raportului Comenzii de "
+#~ "Vânzare"
diff --git a/addons/sale/i18n/ru.po b/addons/sale/i18n/ru.po
index c33e157940a..a032b43a34d 100644
--- a/addons/sale/i18n/ru.po
+++ b/addons/sale/i18n/ru.po
@@ -6,15 +6,27 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2011-01-11 11:16+0000\n"
+"POT-Creation-Date: 2011-12-22 18:43+0000\n"
"PO-Revision-Date: 2011-04-21 13:03+0000\n"
"Last-Translator: Stanislav Hanzhin <Unknown>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-05 05:17+0000\n"
-"X-Generator: Launchpad (build 14231)\n"
+"X-Launchpad-Export-Date: 2011-12-23 06:47+0000\n"
+"X-Generator: Launchpad (build 14560)\n"
+
+#. module: sale
+#: field:sale.config.picking_policy,timesheet:0
+msgid "Based on Timesheet"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid ""
+"Sale Order Lines that are confirmed, done or in exception state and haven't "
+"yet been invoiced"
+msgstr ""
#. module: sale
#: view:board.board:0
@@ -23,11 +35,6 @@ msgid "Sales by Salesman in last 90 days"
msgstr "Продажи по менеджеру за 90 дней"
#. module: sale
-#: help:sale.installer,delivery:0
-msgid "Allows you to compute delivery costs on your quotations."
-msgstr "Позволяет рассчитать стоимость доставки по вашему предложению."
-
-#. module: sale
#: help:sale.order,picking_policy:0
msgid ""
"If you don't have enough stock available to deliver all at once, do you "
@@ -37,6 +44,11 @@ msgstr ""
"ли вы частичную доставку?"
#. module: sale
+#: view:sale.order:0
+msgid "UoS"
+msgstr ""
+
+#. module: sale
#: help:sale.order,partner_shipping_id:0
msgid "Shipping address for current sales order."
msgstr "Адрес доставки для текущего заказа на продажу."
@@ -60,22 +72,12 @@ msgid "Cancel Order"
msgstr "Отменить заказа"
#. module: sale
-#: view:sale.config.picking_policy:0
-msgid "Configure Sales Order Logistics"
-msgstr "Настройка логистики заказа на продажу"
-
-#. module: sale
-#: code:addons/sale/sale.py:603
+#: code:addons/sale/sale.py:638
#, python-format
msgid "The quotation '%s' has been converted to a sales order."
msgstr "Запрос цен '%s' был преобразован в заказ на продажу"
#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Payment Before Delivery"
-msgstr "Платеж перед доставкой"
-
-#. module: sale
#: code:addons/sale/wizard/sale_make_invoice.py:42
#, python-format
msgid "Warning !"
@@ -93,12 +95,6 @@ msgstr ""
"Управление заказами на снабжение для каждой позиции заказа на продажу."
#. module: sale
-#: selection:sale.config.picking_policy,picking_policy:0
-msgid "All at Once"
-msgstr "Все за раз"
-
-#. module: sale
-#: field:sale.order,project_id:0
#: view:sale.report:0
#: field:sale.report,analytic_account_id:0
#: field:sale.shop,project_id:0
@@ -118,6 +114,15 @@ msgstr ""
"вы выставляете счета на весь заказ на продажу."
#. module: sale
+#: code:addons/sale/sale.py:295
+#, python-format
+msgid ""
+"In order to delete a confirmed sale order, you must cancel it before ! To "
+"cancel a sale order, you must first cancel related picking or delivery "
+"orders."
+msgstr ""
+
+#. module: sale
#: model:process.node,name:sale.process_node_saleprocurement0
msgid "Procurement Order"
msgstr "Заказ на закупку"
@@ -129,6 +134,11 @@ msgid "Partner"
msgstr "Контрагент"
#. module: sale
+#: selection:sale.order,order_policy:0
+msgid "Invoice based on deliveries"
+msgstr ""
+
+#. module: sale
#: view:sale.order:0
msgid "Order Line"
msgstr "Позиция заказа"
@@ -174,9 +184,14 @@ msgid "Default Payment Term"
msgstr "Условия платежа по умолчанию"
#. module: sale
-#: model:ir.actions.act_window,name:sale.action_config_picking_policy
-msgid "Configure Picking Policy for Sales Order"
-msgstr "Настроить политику комплектования для заказа на продажу"
+#: field:sale.config.picking_policy,deli_orders:0
+msgid "Based on Delivery Orders"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.picking_policy,time_unit:0
+msgid "Main Working Time Unit"
+msgstr ""
#. module: sale
#: view:sale.order:0
@@ -192,9 +207,10 @@ msgid "Disc.(%)"
msgstr "Дисконт (%)"
#. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_forceassignation0
-msgid "Force Assignation"
-msgstr "Назначить насильно"
+#: view:sale.report:0
+#: field:sale.report,price_total:0
+msgid "Total Price"
+msgstr "Итоговая цена"
#. module: sale
#: help:sale.make.invoice,grouped:0
@@ -202,6 +218,11 @@ msgid "Check the box to group the invoices for the same customers"
msgstr "Отметьте для группирования счетов по заказчикам"
#. module: sale
+#: view:sale.order:0
+msgid "My Sale Orders"
+msgstr ""
+
+#. module: sale
#: selection:sale.order,invoice_quantity:0
msgid "Ordered Quantities"
msgstr "Заказанное кол-во"
@@ -242,14 +263,25 @@ msgstr ""
"комплектования\" или \"Счет на заказ после доставки\"."
#. module: sale
+#: field:sale.config.picking_policy,task_work:0
+msgid "Based on Tasks' Work"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
+msgid "Quotations and Sales"
+msgstr ""
+
+#. module: sale
#: model:ir.model,name:sale.model_sale_make_invoice
msgid "Sales Make Invoice"
msgstr "Продажи - создать счет"
#. module: sale
-#: view:sale.order:0
-msgid "Recreate Packing"
-msgstr "Восстановить упаковку"
+#: code:addons/sale/sale.py:330
+#, python-format
+msgid "Pricelist Warning!"
+msgstr ""
#. module: sale
#: field:sale.order.line,discount:0
@@ -257,10 +289,10 @@ msgid "Discount (%)"
msgstr "Скидка (%)"
#. module: sale
-#: help:res.company,security_lead:0
-msgid ""
-"This is the days added to what you promise to customers for security purpose"
-msgstr "Это количество дней, добавляемых к обещанному сроку для надежности"
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_quotation_for_sale
+msgid "My Quotations"
+msgstr "Мои предложения"
#. module: sale
#: view:board.board:0
@@ -285,7 +317,22 @@ msgid "Shop Name"
msgstr "Название магазина"
#. module: sale
-#: code:addons/sale/sale.py:1014
+#: help:sale.order,order_policy:0
+msgid ""
+"The Invoice Policy is used to synchronise invoice and delivery operations.\n"
+" - The 'Pay before delivery' choice will first generate the invoice and "
+"then generate the picking order after the payment of this invoice.\n"
+" - The 'Deliver & Invoice on demand' will create the picking order directly "
+"and wait for the user to manually click on the 'Invoice' button to generate "
+"the draft invoice based on the sale order or the sale order lines.\n"
+" - The 'Invoice on order after delivery' choice will generate the draft "
+"invoice based on sales order after all picking lists have been finished.\n"
+" - The 'Invoice based on deliveries' choice is used to create an invoice "
+"during the picking process."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:1158
#, python-format
msgid "No Customer Defined !"
msgstr "Заказчик не определен !"
@@ -296,9 +343,12 @@ msgid "Sales in Exception"
msgstr "Продажи в состоянии \"Исключение\""
#. module: sale
-#: view:sale.order:0
-msgid "Set to Draft"
-msgstr "Установить в 'Черновик'"
+#: code:addons/sale/sale.py:1145
+#: code:addons/sale/sale.py:1264
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:70
+#, python-format
+msgid "Configuration Error !"
+msgstr ""
#. module: sale
#: view:sale.order:0
@@ -306,32 +356,7 @@ msgid "Conditions"
msgstr "Условия"
#. module: sale
-#: help:sale.order,order_policy:0
-msgid ""
-"The Shipping Policy is used to synchronise invoice and delivery operations.\n"
-" - The 'Pay Before delivery' choice will first generate the invoice and "
-"then generate the picking order after the payment of this invoice.\n"
-" - The 'Shipping & Manual Invoice' will create the picking order directly "
-"and wait for the user to manually click on the 'Invoice' button to generate "
-"the draft invoice.\n"
-" - The 'Invoice On Order After Delivery' choice will generate the draft "
-"invoice based on sales order after all picking lists have been finished.\n"
-" - The 'Invoice From The Picking' choice is used to create an invoice "
-"during the picking process."
-msgstr ""
-"Политика доставки используется для синхронизации выставления счетов и "
-"операций по доставке.\n"
-" - \"Платеж перед доставкой\" - сначала создается счет, а после оплаты "
-"этого счета создается комплектовочный лист.\n"
-" - \"Доставка & счет вручную\" - сразу создается комплектовочный лист, "
-"после этого ожидается, что пользователь вручную нажмет на кнопку \"Счет\" "
-"для создания черновика счета.\n"
-" - \"Счет на заказ после доставки\" - черновик счета генерируется из заказа "
-"на продажу, после того, как все комплектовочные листы будут завершены.\n"
-" - \"Счет из комплектования\" - счет создается в процессе комплектования."
-
-#. module: sale
-#: code:addons/sale/sale.py:939
+#: code:addons/sale/sale.py:1034
#, python-format
msgid ""
"There is no income category account defined in default Properties for "
@@ -341,9 +366,9 @@ msgstr ""
"не определена система налогообложения !"
#. module: sale
-#: view:sale.installer:0
-msgid "Configure"
-msgstr "Настройка"
+#: selection:sale.report,month:0
+msgid "August"
+msgstr "Август"
#. module: sale
#: constraint:stock.move:0
@@ -351,7 +376,7 @@ msgid "You try to assign a lot which is not from the same product"
msgstr "Вы пытаетесь назначит партию состоящую из другой продукции"
#. module: sale
-#: code:addons/sale/sale.py:620
+#: code:addons/sale/sale.py:655
#, python-format
msgid "invalid mode for test_state"
msgstr "неверный режим для test_state"
@@ -362,7 +387,7 @@ msgid "June"
msgstr "Июнь"
#. module: sale
-#: code:addons/sale/sale.py:584
+#: code:addons/sale/sale.py:617
#, python-format
msgid "Could not cancel this sales order !"
msgstr "Нельзя отменить этот заказ на продажу !"
@@ -383,8 +408,12 @@ msgid "October"
msgstr "Октябрь"
#. module: sale
+#: sql_constraint:stock.picking:0
+msgid "Reference must be unique per Company!"
+msgstr ""
+
+#. module: sale
#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_quotation_for_sale
#: view:sale.order:0
#: view:sale.report:0
msgid "Quotations"
@@ -396,11 +425,6 @@ msgid "Pricelist for current sales order."
msgstr "Каталог для текущего заказа на продажу."
#. module: sale
-#: selection:sale.config.picking_policy,step:0
-msgid "Delivery Order Only"
-msgstr "Только заказ на доставку"
-
-#. module: sale
#: report:sale.order:0
msgid "TVA :"
msgstr "НДС"
@@ -426,6 +450,7 @@ msgstr "Налоговая позиция"
#. module: sale
#: view:sale.order:0
#: view:sale.order.line:0
+#: field:sale.report,product_uom:0
msgid "UoM"
msgstr "Ед. изм."
@@ -450,7 +475,13 @@ msgstr ""
"процессе' или 'В процессе вручную'."
#. module: sale
-#: code:addons/sale/sale.py:971
+#: code:addons/sale/sale.py:1061
+#, python-format
+msgid "You cannot cancel a sale order line that has already been invoiced!"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:1066
#, python-format
msgid "You must first cancel stock moves attached to this sales order line."
msgstr ""
@@ -458,7 +489,7 @@ msgstr ""
"на продажу."
#. module: sale
-#: code:addons/sale/sale.py:1042
+#: code:addons/sale/sale.py:1134
#, python-format
msgid "(n/a)"
msgstr "(нет)"
@@ -497,14 +528,36 @@ msgid "Notes"
msgstr "Примечания"
#. module: sale
+#: sql_constraint:res.company:0
+msgid "The company name must be unique !"
+msgstr ""
+
+#. module: sale
#: help:sale.order,partner_invoice_id:0
msgid "Invoice address for current sales order."
msgstr "Адрес счета для текущего заказа на продажу."
#. module: sale
-#: view:sale.installer:0
-msgid "Enhance your core Sales Application with additional functionalities."
-msgstr "Расширяет модуль продаж дополнительными функциями."
+#: view:sale.report:0
+msgid "Month-1"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered month of the sales order"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:504
+#, python-format
+msgid ""
+"You cannot group sales having different currencies for the same partner."
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,picking_policy:0
+msgid "Deliver each product when available"
+msgstr ""
#. module: sale
#: field:sale.order,invoiced_rate:0
@@ -523,21 +576,43 @@ msgid "Confirmation Date"
msgstr "Дата подтверждения"
#. module: sale
+#: field:sale.order,incoterm:0
+msgid "Incoterm"
+msgstr "Инкотерм"
+
+#. module: sale
#: field:sale.order.line,address_allotment_id:0
msgid "Allotment Partner"
msgstr "Долевой участник"
#. module: sale
-#: sql_constraint:sale.order:0
-msgid "Order Reference must be unique !"
-msgstr "Ссылка на заказ должна быть уникальной !"
-
-#. module: sale
#: selection:sale.report,month:0
msgid "March"
msgstr "Март"
#. module: sale
+#: constraint:stock.move:0
+msgid "You can not move products from or to a location of the type view."
+msgstr ""
+
+#. module: sale
+#: field:sale.config.picking_policy,sale_orders:0
+msgid "Based on Sales Orders"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,state:0
+msgid ""
+"Givwizard = self.browse(cr, uid, ids)[0]es the state of the quotation or "
+"sales order. \n"
+"The exception state is automatically set when a cancel operation occurs in "
+"the invoice validation (Invoice Exception) or in the picking list process "
+"(Shipping Exception). \n"
+"The 'Waiting Schedule' state is set when the invoice is confirmed but "
+"waiting for the scheduler to run on the order date."
+msgstr ""
+
+#. module: sale
#: help:sale.order,amount_total:0
msgid "The total amount."
msgstr "Общая сумма."
@@ -553,6 +628,11 @@ msgid "Invoice address :"
msgstr "Адрес счета:"
#. module: sale
+#: field:sale.order.line,sequence:0
+msgid "Line Sequence"
+msgstr ""
+
+#. module: sale
#: model:process.transition,note:sale.process_transition_saleorderprocurement0
msgid ""
"For every sales order line, a procurement order is created to supply the "
@@ -604,11 +684,6 @@ msgid "Sales Order Line"
msgstr "Позиция заказа на продажу"
#. module: sale
-#: view:sale.config.picking_policy:0
-msgid "Setup your sales workflow and default values."
-msgstr "Настройте рабочий процесс продаж и значения по умолчанию."
-
-#. module: sale
#: field:sale.shop,warehouse_id:0
msgid "Warehouse"
msgstr "Склад"
@@ -645,6 +720,11 @@ msgid "Creation Date"
msgstr "Дата создания"
#. module: sale
+#: model:ir.ui.menu,name:sale.menu_sales_configuration_misc
+msgid "Miscellaneous"
+msgstr ""
+
+#. module: sale
#: model:ir.actions.act_window,name:sale.action_order_line_tree3
msgid "Uninvoiced and Delivered Lines"
msgstr "Позиции, поставленные без выставления счета"
@@ -660,14 +740,19 @@ msgid "My Sales"
msgstr "Мои продажи"
#. module: sale
-#: code:addons/sale/sale.py:290
-#: code:addons/sale/sale.py:966
-#: code:addons/sale/sale.py:1165
+#: code:addons/sale/sale.py:295
+#: code:addons/sale/sale.py:1061
+#: code:addons/sale/sale.py:1290
#, python-format
msgid "Invalid action !"
msgstr "Неверное действие !"
#. module: sale
+#: view:sale.order:0
+msgid "Extra Info"
+msgstr "Доп. информация"
+
+#. module: sale
#: field:sale.order,pricelist_id:0
#: field:sale.report,pricelist_id:0
#: field:sale.shop,pricelist_id:0
@@ -681,13 +766,21 @@ msgid "# of Qty"
msgstr "Кол-во"
#. module: sale
+#: code:addons/sale/sale.py:1314
+#, python-format
+msgid "Hour"
+msgstr ""
+
+#. module: sale
#: view:sale.order:0
msgid "Order Date"
msgstr "Дата заказа"
#. module: sale
#: view:sale.order.line:0
+#: view:sale.report:0
#: field:sale.report,shipped:0
+#: field:sale.report,shipped_qty_1:0
msgid "Shipped"
msgstr "Доставлено"
@@ -697,9 +790,9 @@ msgid "All Quotations"
msgstr "Все предложения"
#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Invoice On Order After Delivery"
-msgstr "Счет на заказ после доставки"
+#: view:sale.config.picking_policy:0
+msgid "Options"
+msgstr ""
#. module: sale
#: selection:sale.report,month:0
@@ -707,6 +800,20 @@ msgid "September"
msgstr "Сентябрь"
#. module: sale
+#: code:addons/sale/sale.py:632
+#, python-format
+msgid "You cannot confirm a sale order which has no line."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:1246
+#, python-format
+msgid ""
+"You have to select a pricelist or a customer in the sales form !\n"
+"Please set one before choosing a product."
+msgstr ""
+
+#. module: sale
#: view:sale.report:0
#: field:sale.report,categ_id:0
msgid "Category of Product"
@@ -723,11 +830,6 @@ msgid "Stock Moves"
msgstr "Движение запасов"
#. module: sale
-#: view:sale.report:0
-msgid " Year "
-msgstr " Год "
-
-#. module: sale
#: field:sale.order,state:0
#: field:sale.report,state:0
msgid "Order State"
@@ -745,7 +847,7 @@ msgid "Sales By Month"
msgstr "Продажи по месяцу"
#. module: sale
-#: code:addons/sale/sale.py:970
+#: code:addons/sale/sale.py:1065
#, python-format
msgid "Could not cancel sales order line!"
msgstr "Нельзя отменить позицию заказа на продажу!"
@@ -780,66 +882,19 @@ msgstr ""
"после запуска планировщика."
#. module: sale
+#: field:sale.order,date_order:0
+msgid "Date"
+msgstr ""
+
+#. module: sale
#: view:sale.report:0
msgid "Extended Filters..."
msgstr "Расширенные фильтры..."
#. module: sale
-#: model:ir.module.module,description:sale.module_meta_information
-msgid ""
-"\n"
-" The base module to manage quotations and sales orders.\n"
-"\n"
-" * Workflow with validation steps:\n"
-" - Quotation -> Sales order -> Invoice\n"
-" * Invoicing methods:\n"
-" - Invoice on order (before or after shipping)\n"
-" - Invoice on delivery\n"
-" - Invoice on timesheets\n"
-" - Advance invoice\n"
-" * Partners preferences (shipping, invoicing, incoterm, ...)\n"
-" * Products stocks and prices\n"
-" * Delivery methods:\n"
-" - all at once, multi-parcel\n"
-" - delivery costs\n"
-" * Dashboard for salesman that includes:\n"
-" * Your open quotations\n"
-" * Top 10 sales of the month\n"
-" * Cases statistics\n"
-" * Graph of sales by product\n"
-" * Graph of cases of the month\n"
-" "
-msgstr ""
-"\n"
-" Базовый модуль для управления коммерческими предложениями и заказами на "
-"продажу.\n"
-"\n"
-" * Рабочий процесс по шагам:\n"
-" - Предложение -> Заказ на продажу -> Счет\n"
-" * Методы выставления счетов:\n"
-" - Счет по заказу (перед отгрузкой или после)\n"
-" - Счет по доставке\n"
-" - Счет по затратам времени\n"
-" - Счет на аванс\n"
-" * Предпочтения контрагентов (доставка, выставление счетов, ИНКОТЕРМ, "
-"...)\n"
-" * Товарные запасы и цены\n"
-" * Методы доставки:\n"
-" - всё за раз, несколько раз\n"
-" - стоимость доставки\n"
-" * Панель для менеджера продаж содержит:\n"
-" * Ваши открытые предложения\n"
-" * 10 лучших продаж месяца\n"
-" * Статистика \n"
-" * График продаж ТМЦ\n"
-" * График сделок месяца\n"
-" "
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_shop
-#: view:sale.shop:0
-msgid "Sales Shop"
-msgstr "Магазин"
+#: selection:sale.order.line,state:0
+msgid "Exception"
+msgstr "Исключение"
#. module: sale
#: model:ir.model,name:sale.model_res_company
@@ -847,9 +902,10 @@ msgid "Companies"
msgstr "Компании"
#. module: sale
-#: selection:sale.report,month:0
-msgid "November"
-msgstr "Ноябрь"
+#: code:addons/sale/sale.py:1259
+#, python-format
+msgid "No valid pricelist line found ! :"
+msgstr ""
#. module: sale
#: view:sale.order:0
@@ -857,9 +913,9 @@ msgid "History"
msgstr "Журнал"
#. module: sale
-#: field:sale.config.picking_policy,picking_policy:0
-msgid "Picking Default Policy"
-msgstr "Политика комплектования по умолчанию"
+#: selection:sale.order,order_policy:0
+msgid "Invoice on order after delivery"
+msgstr ""
#. module: sale
#: help:sale.order,invoice_ids:0
@@ -883,14 +939,12 @@ msgid ""
msgstr "Имя и адрес контакта запросившего заказ или предложение."
#. module: sale
-#: code:addons/sale/sale.py:966
-#, python-format
-msgid "You cannot cancel a sales order line that has already been invoiced !"
-msgstr ""
-"Нельзя отменить позицию заказа на продажу на которую был выставлен счет !"
+#: help:res.company,security_lead:0
+msgid ""
+"This is the days added to what you promise to customers for security purpose"
+msgstr "Это количество дней, добавляемых к обещанному сроку для надежности"
#. module: sale
-#: view:sale.order:0
#: view:sale.order.line:0
msgid "Qty"
msgstr "Кол-во"
@@ -901,6 +955,11 @@ msgid "References"
msgstr "Ссылки"
#. module: sale
+#: view:sale.order.line:0
+msgid "My Sales Order Lines"
+msgstr ""
+
+#. module: sale
#: model:process.transition.action,name:sale.process_transition_action_cancel0
#: model:process.transition.action,name:sale.process_transition_action_cancel1
#: model:process.transition.action,name:sale.process_transition_action_cancel2
@@ -912,14 +971,9 @@ msgid "Cancel"
msgstr "Отмена"
#. module: sale
-#: field:sale.installer,sale_order_dates:0
-msgid "Sales Order Dates"
-msgstr "Даты заказа на продажу"
-
-#. module: sale
-#: selection:sale.order.line,state:0
-msgid "Exception"
-msgstr "Исключение"
+#: sql_constraint:sale.order:0
+msgid "Order Reference must be unique per Company!"
+msgstr ""
#. module: sale
#: model:process.transition,name:sale.process_transition_invoice0
@@ -931,19 +985,19 @@ msgid "Create Invoice"
msgstr "Создать счет"
#. module: sale
-#: field:sale.installer,sale_margin:0
-msgid "Margins in Sales Orders"
-msgstr "Прибыль в заказах на продажу"
-
-#. module: sale
#: view:sale.order:0
msgid "Total Tax Excluded"
msgstr "Всего без налогов"
#. module: sale
-#: view:sale.order:0
-msgid "Compute"
-msgstr "Вычислить"
+#: view:sale.order.line:0
+msgid "Order reference"
+msgstr ""
+
+#. module: sale
+#: view:sale.open.invoice:0
+msgid "You invoice has been successfully created!"
+msgstr "Ваш счет был успешно создан!"
#. module: sale
#: view:sale.report:0
@@ -962,23 +1016,20 @@ msgid "Open Invoice"
msgstr "Открыть счет"
#. module: sale
-#: report:sale.order:0
-#: view:sale.order.line:0
-msgid "Price"
-msgstr "Цена"
+#: model:ir.actions.server,name:sale.ir_actions_server_edi_sale
+msgid "Auto-email confirmed sale orders"
+msgstr ""
#. module: sale
-#: model:ir.actions.act_window,name:sale.action_sale_installer
-#: view:sale.config.picking_policy:0
-#: view:sale.installer:0
-msgid "Sales Application Configuration"
-msgstr "Настройка продаж"
+#: code:addons/sale/sale.py:413
+#, python-format
+msgid "There is no sales journal defined for this company: \"%s\" (id:%d)"
+msgstr "Не определен журнал продаж для этой компании: \"%s\" (id:%d)"
#. module: sale
-#: view:sale.report:0
-#: field:sale.report,price_total:0
-msgid "Total Price"
-msgstr "Итоговая цена"
+#: model:process.transition.action,name:sale.process_transition_action_forceassignation0
+msgid "Force Assignation"
+msgstr "Назначить насильно"
#. module: sale
#: selection:sale.order.line,type:0
@@ -991,6 +1042,11 @@ msgid "Based on the shipped or on the ordered quantities."
msgstr "На основании отгруженного или заказанного количества."
#. module: sale
+#: selection:sale.order,picking_policy:0
+msgid "Deliver all products at once"
+msgstr ""
+
+#. module: sale
#: field:sale.order,picking_ids:0
msgid "Related Picking"
msgstr "Связанное комплектование"
@@ -1022,9 +1078,15 @@ msgid "Create Delivery Order"
msgstr "Создать заказ на доставку"
#. module: sale
-#: field:sale.installer,delivery:0
-msgid "Delivery Costs"
-msgstr "Стоимость доставки"
+#: code:addons/sale/sale.py:1290
+#, python-format
+msgid "Cannot delete a sales order line which is in state '%s'!"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Qty(UoS)"
+msgstr ""
#. module: sale
#: view:sale.order:0
@@ -1038,13 +1100,13 @@ msgstr "Создать комплектовочный лист"
#. module: sale
#: view:sale.report:0
-msgid "Sales by Product Category"
-msgstr "Продажи по категориям продукции"
+msgid "Ordered date of the sales order"
+msgstr ""
#. module: sale
-#: selection:sale.order,picking_policy:0
-msgid "Partial Delivery"
-msgstr "Частичная доставка"
+#: view:sale.report:0
+msgid "Sales by Product Category"
+msgstr "Продажи по категориям продукции"
#. module: sale
#: model:process.transition,name:sale.process_transition_confirmquotation0
@@ -1052,9 +1114,10 @@ msgid "Confirm Quotation"
msgstr "Подтвердить предложение цен"
#. module: sale
-#: help:sale.order,origin:0
-msgid "Reference of the document that generated this sales order request."
-msgstr "Ссылка на документ который создал запрос на этот заказ на продажу."
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:63
+#, python-format
+msgid "Error"
+msgstr "Ошибка"
#. module: sale
#: view:sale.order:0
@@ -1086,20 +1149,14 @@ msgid "Procurement Method"
msgstr "Метод снабжения"
#. module: sale
-#: view:sale.config.picking_policy:0
-#: view:sale.installer:0
-msgid "title"
-msgstr ""
-
-#. module: sale
#: model:process.node,name:sale.process_node_packinglist0
msgid "Pick List"
msgstr "Комплектовочный лист"
#. module: sale
#: view:sale.order:0
-msgid "Order date"
-msgstr "Дата заказа"
+msgid "Set to Draft"
+msgstr "Установить в 'Черновик'"
#. module: sale
#: model:process.node,note:sale.process_node_packinglist0
@@ -1107,6 +1164,85 @@ msgid "Document of the move to the output or to the customer."
msgstr "Документ перемещения на выход или заказчику."
#. module: sale
+#: model:email.template,body_text:sale.email_template_edi_sale
+msgid ""
+"\n"
+"Hello${object.partner_order_id.name and ' ' or "
+"''}${object.partner_order_id.name or ''},\n"
+"\n"
+"Here is your order confirmation for ${object.partner_id.name}:\n"
+" | Order number: *${object.name}*\n"
+" | Order total: *${object.amount_total} "
+"${object.pricelist_id.currency_id.name}*\n"
+" | Order date: ${object.date_order}\n"
+" % if object.origin:\n"
+" | Order reference: ${object.origin}\n"
+" % endif\n"
+" % if object.client_order_ref:\n"
+" | Your reference: ${object.client_order_ref}<br />\n"
+" % endif\n"
+" | Your contact: ${object.user_id.name} ${object.user_id.user_email "
+"and '<%s>'%(object.user_id.user_email) or ''}\n"
+"\n"
+"You can view the order confirmation, download it and even pay online using "
+"the following link:\n"
+" ${ctx.get('edi_web_url_view') or 'n/a'}\n"
+"\n"
+"% if object.order_policy in ('prepaid','manual') and "
+"object.company_id.paypal_account:\n"
+"<% \n"
+"comp_name = quote(object.company_id.name)\n"
+"order_name = quote(object.name)\n"
+"paypal_account = quote(object.company_id.paypal_account)\n"
+"order_amount = quote(str(object.amount_total))\n"
+"cur_name = quote(object.pricelist_id.currency_id.name)\n"
+"paypal_url = \"https://www.paypal.com/cgi-"
+"bin/webscr?cmd=_xclick&business=%s&item_name=%s%%20Order%%20%s&invoice=%s&amo"
+"unt=%s\" \\\n"
+" "
+"\"&currency_code=%s&button_subtype=services&no_note=1&bn=OpenERP_Order_PayNow"
+"_%s\" % \\\n"
+" "
+"(paypal_account,comp_name,order_name,order_name,order_amount,cur_name,cur_nam"
+"e)\n"
+"%>\n"
+"It is also possible to directly pay with Paypal:\n"
+" ${paypal_url}\n"
+"% endif\n"
+"\n"
+"If you have any question, do not hesitate to contact us.\n"
+"\n"
+"\n"
+"Thank you for choosing ${object.company_id.name}!\n"
+"\n"
+"\n"
+"--\n"
+"${object.user_id.name} ${object.user_id.user_email and "
+"'<%s>'%(object.user_id.user_email) or ''}\n"
+"${object.company_id.name}\n"
+"% if object.company_id.street:\n"
+"${object.company_id.street or ''}\n"
+"% endif\n"
+"% if object.company_id.street2:\n"
+"${object.company_id.street2}\n"
+"% endif\n"
+"% if object.company_id.city or object.company_id.zip:\n"
+"${object.company_id.zip or ''} ${object.company_id.city or ''}\n"
+"% endif\n"
+"% if object.company_id.country_id:\n"
+"${object.company_id.state_id and ('%s, ' % object.company_id.state_id.name) "
+"or ''} ${object.company_id.country_id.name or ''}\n"
+"% endif\n"
+"% if object.company_id.phone:\n"
+"Phone: ${object.company_id.phone}\n"
+"% endif\n"
+"% if object.company_id.website:\n"
+"${object.company_id.website or ''}\n"
+"% endif\n"
+" "
+msgstr ""
+
+#. module: sale
#: model:process.transition.action,name:sale.process_transition_action_validate0
msgid "Validate"
msgstr "Утвердить"
@@ -1129,9 +1265,9 @@ msgid "Taxes"
msgstr "Налоги"
#. module: sale
-#: field:sale.order,order_policy:0
-msgid "Shipping Policy"
-msgstr "Политика доставки"
+#: view:sale.order:0
+msgid "Sales Order ready to be invoiced"
+msgstr ""
#. module: sale
#: help:sale.order,create_date:0
@@ -1150,9 +1286,9 @@ msgid "Create Invoices"
msgstr "Создать счета"
#. module: sale
-#: view:sale.order:0
-msgid "Extra Info"
-msgstr "Доп. информация"
+#: view:sale.report:0
+msgid "Sales order created in current month"
+msgstr ""
#. module: sale
#: report:sale.order:0
@@ -1160,11 +1296,24 @@ msgid "Fax :"
msgstr "Факс :"
#. module: sale
+#: help:sale.order.line,type:0
+msgid ""
+"If 'on order', it triggers a procurement when the sale order is confirmed to "
+"create a task, purchase order or manufacturing order linked to this sale "
+"order line."
+msgstr ""
+
+#. module: sale
#: field:sale.advance.payment.inv,amount:0
msgid "Advance Amount"
msgstr "Сумма аванса"
#. module: sale
+#: field:sale.config.picking_policy,charge_delivery:0
+msgid "Do you charge the delivery?"
+msgstr ""
+
+#. module: sale
#: selection:sale.order,invoice_quantity:0
msgid "Shipped Quantities"
msgstr "Отправленное количество"
@@ -1175,25 +1324,45 @@ msgid "Invoice Based on Sales Orders"
msgstr "Счет, основанный на заказе на продажу"
#. module: sale
+#: code:addons/sale/sale.py:331
+#, python-format
+msgid ""
+"If you change the pricelist of this order (and eventually the currency), "
+"prices of existing order lines will not be updated."
+msgstr ""
+
+#. module: sale
#: model:ir.model,name:sale.model_stock_picking
msgid "Picking List"
msgstr "Комплектовочный лист"
#. module: sale
-#: code:addons/sale/sale.py:387
-#: code:addons/sale/sale.py:920
-#: code:addons/sale/sale.py:938
+#: code:addons/sale/sale.py:412
+#: code:addons/sale/sale.py:503
+#: code:addons/sale/sale.py:632
+#: code:addons/sale/sale.py:1015
+#: code:addons/sale/sale.py:1033
#, python-format
msgid "Error !"
msgstr "Ошибка !"
#. module: sale
-#: code:addons/sale/sale.py:570
+#: code:addons/sale/sale.py:603
#, python-format
msgid "Could not cancel sales order !"
msgstr "Нельзя отменить заказ на продажу !"
#. module: sale
+#: view:sale.order:0
+msgid "Qty(UoM)"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered Year of the sales order"
+msgstr ""
+
+#. module: sale
#: selection:sale.report,month:0
msgid "July"
msgstr "Июль"
@@ -1210,36 +1379,26 @@ msgid "Shipping Exception"
msgstr "Исключение при доставке"
#. module: sale
-#: field:sale.make.invoice,grouped:0
-msgid "Group the invoices"
-msgstr "Сгруппировать счета"
-
-#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Shipping & Manual Invoice"
-msgstr "Доставка & счет вручную"
-
-#. module: sale
-#: code:addons/sale/sale.py:1051
+#: code:addons/sale/sale.py:1143
#, python-format
-msgid "Picking Information !"
-msgstr "Комплектовочная информация !"
+msgid "Picking Information ! : "
+msgstr ""
#. module: sale
-#: view:sale.report:0
-#: field:sale.report,month:0
-msgid "Month"
-msgstr "Месяц"
+#: field:sale.make.invoice,grouped:0
+msgid "Group the invoices"
+msgstr "Сгруппировать счета"
#. module: sale
-#: model:ir.module.module,shortdesc:sale.module_meta_information
-msgid "Sales Management"
-msgstr "Управление продажами"
+#: field:sale.order,order_policy:0
+msgid "Invoice Policy"
+msgstr ""
#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Invoice From The Picking"
-msgstr "Счет из комплектования"
+#: model:ir.actions.act_window,name:sale.action_config_picking_policy
+#: view:sale.config.picking_policy:0
+msgid "Setup your Invoicing Method"
+msgstr ""
#. module: sale
#: model:process.node,note:sale.process_node_invoice0
@@ -1248,32 +1407,31 @@ msgstr "Будет проверено бухгалтером"
#. module: sale
#: view:sale.report:0
-#: field:sale.report,uom_name:0
msgid "Reference UoM"
msgstr ""
#. module: sale
+#: view:sale.config.picking_policy:0
+msgid ""
+"This tool will help you to install the right module and configure the system "
+"according to the method you use to invoice your customers."
+msgstr ""
+
+#. module: sale
#: model:ir.model,name:sale.model_sale_order_line_make_invoice
msgid "Sale OrderLine Make_invoice"
msgstr ""
#. module: sale
-#: help:sale.config.picking_policy,step:0
-msgid ""
-"By default, OpenERP is able to manage complex routing and paths of products "
-"in your warehouse and partner locations. This will configure the most common "
-"and simple methods to deliver products to the customer in one or two "
-"operations by the worker."
-msgstr ""
-"По умолчанию Open ERP в состоянии управлять сложными маршрутами и путями ТМЦ "
-"на ваш склад и в места хранения контрагентов. Это позволит настроить "
-"наиболее общие и простые методы доставки ТМЦ до заказчика за одно или два "
-"действия."
+#: selection:sale.order,state:0
+#: selection:sale.report,state:0
+msgid "Invoice Exception"
+msgstr "Исключение счета"
#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_tree
-msgid "Old Quotations"
-msgstr "Старые предложения"
+#: model:process.node,note:sale.process_node_saleorder0
+msgid "Drives procurement and invoicing"
+msgstr "Управлять снабжением и выставлением счетов"
#. module: sale
#: field:sale.order,invoiced:0
@@ -1288,6 +1446,22 @@ msgid "Sales Analysis"
msgstr "Анализ продаж"
#. module: sale
+#: code:addons/sale/sale.py:1138
+#, python-format
+msgid ""
+"You selected a quantity of %d Units.\n"
+"But it's not compatible with the selected packaging.\n"
+"Here is a proposition of quantities according to the packaging:\n"
+"EAN: %s Quantity: %s Type of ul: %s"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Recreate Packing"
+msgstr "Восстановить упаковку"
+
+#. module: sale
+#: view:sale.order:0
#: field:sale.order.line,property_ids:0
msgid "Properties"
msgstr "Свойства"
@@ -1318,7 +1492,17 @@ msgstr ""
"Вы можете создать счет на основе заказов на продажу или на основе доставок."
#. module: sale
-#: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
+#: view:sale.order.line:0
+msgid "Confirmed sale order lines, not yet delivered"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:473
+#, python-format
+msgid "Customer Invoices"
+msgstr ""
+
+#. module: sale
#: model:process.process,name:sale.process_process_salesprocess0
#: view:sale.order:0
#: view:sale.report:0
@@ -1340,18 +1524,13 @@ msgid "Done"
msgstr "Сделано"
#. module: sale
-#: model:ir.model,name:sale.model_sale_installer
-msgid "sale.installer"
-msgstr "sale.installer"
-
-#. module: sale
#: model:process.node,name:sale.process_node_invoice0
#: model:process.node,name:sale.process_node_invoiceafterdelivery0
msgid "Invoice"
msgstr "Счет"
#. module: sale
-#: code:addons/sale/sale.py:1014
+#: code:addons/sale/sale.py:1158
#, python-format
msgid ""
"You have to select a customer in the sales form !\n"
@@ -1361,11 +1540,6 @@ msgstr ""
"Пожалуйста выберите заказчика перед выбором ТМЦ."
#. module: sale
-#: selection:sale.config.picking_policy,step:0
-msgid "Picking List & Delivery Order"
-msgstr "Комплектовочный лист & Заказ на доставку"
-
-#. module: sale
#: field:sale.order,origin:0
msgid "Source Document"
msgstr "Документ-источник"
@@ -1391,7 +1565,7 @@ msgid "The amount without tax."
msgstr "Сумма без налога."
#. module: sale
-#: code:addons/sale/sale.py:571
+#: code:addons/sale/sale.py:604
#, python-format
msgid "You must first cancel all picking attached to this sales order."
msgstr ""
@@ -1404,9 +1578,15 @@ msgid "Sales Advance Payment Invoice"
msgstr "Счет на авансовый платеж"
#. module: sale
-#: field:sale.order,incoterm:0
-msgid "Incoterm"
-msgstr "Инкотерм"
+#: view:sale.report:0
+#: field:sale.report,month:0
+msgid "Month"
+msgstr "Месяц"
+
+#. module: sale
+#: model:email.template,subject:sale.email_template_edi_sale
+msgid "${object.company_id.name} Order (Ref ${object.name or 'n/a' })"
+msgstr ""
#. module: sale
#: view:sale.order.line:0
@@ -1417,11 +1597,6 @@ msgid "Product"
msgstr "ТМЦ"
#. module: sale
-#: model:ir.ui.menu,name:sale.menu_invoiced
-msgid "Invoicing"
-msgstr "Выставление счетов"
-
-#. module: sale
#: model:process.transition.action,name:sale.process_transition_action_cancelassignation0
msgid "Cancel Assignation"
msgstr "Отменить назначение"
@@ -1432,21 +1607,11 @@ msgid "sale.config.picking_policy"
msgstr "sale.config.picking_policy"
#. module: sale
-#: help:sale.order,state:0
-msgid ""
-"Gives the state of the quotation or sales order. \n"
-"The exception state is automatically set when a cancel operation occurs in "
-"the invoice validation (Invoice Exception) or in the picking list process "
-"(Shipping Exception). \n"
-"The 'Waiting Schedule' state is set when the invoice is confirmed but "
-"waiting for the scheduler to run on the date 'Ordered Date'."
+#: view:account.invoice.report:0
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_turnover_by_month
+msgid "Monthly Turnover"
msgstr ""
-"Состояние предложения цен или заказа на покупку. \n"
-"Состояние \"Исключение\" автоматически устанавливается при отмене в процессе "
-"утверждения счета (исключение счета) или при обработке комплектовочного "
-"листа (исключение при доставке). \n"
-"Состояние \"Ожидание планировщика\" устанавливается при подтверждении счета "
-"и ожидании запуска планировщика по дате \"Дата заказа\"."
#. module: sale
#: field:sale.order,invoice_quantity:0
@@ -1464,7 +1629,6 @@ msgid "Product UoS"
msgstr "Вторая ед. изм."
#. module: sale
-#: selection:sale.order,state:0
#: selection:sale.report,state:0
msgid "Manual In Progress"
msgstr "В процессе вручную"
@@ -1485,7 +1649,8 @@ msgid "Order"
msgstr "Заказ"
#. module: sale
-#: code:addons/sale/sale.py:921
+#: code:addons/sale/sale.py:1016
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:71
#, python-format
msgid "There is no income account defined for this product: \"%s\" (id:%d)"
msgstr "Не определен счет доходов для ТМЦ: \"%s\" (id:%d)"
@@ -1509,7 +1674,7 @@ msgstr ""
"подтвержден менеджером продаж."
#. module: sale
-#: code:addons/sale/sale.py:1116
+#: code:addons/sale/sale.py:1238
#, python-format
msgid ""
"You plan to sell %.2f %s but you only have %.2f %s available !\n"
@@ -1540,10 +1705,10 @@ msgid "Total"
msgstr "Всего"
#. module: sale
-#: code:addons/sale/sale.py:388
-#, python-format
-msgid "There is no sales journal defined for this company: \"%s\" (id:%d)"
-msgstr "Не определен журнал продаж для этой компании: \"%s\" (id:%d)"
+#: report:sale.order:0
+#: view:sale.order.line:0
+msgid "Price"
+msgstr "Цена"
#. module: sale
#: model:process.transition,note:sale.process_transition_deliver0
@@ -1557,10 +1722,15 @@ msgstr ""
"или автоматически."
#. module: sale
-#: code:addons/sale/sale.py:1165
-#, python-format
-msgid "Cannot delete a sales order line which is %s !"
-msgstr "Нельзя удалить позицию заказа на продажу: %s !"
+#: selection:sale.order,order_policy:0
+msgid "Pay before delivery"
+msgstr ""
+
+#. module: sale
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.open_board_sales
+msgid "Sales Dashboard"
+msgstr ""
#. module: sale
#: model:ir.actions.act_window,name:sale.action_sale_order_make_invoice
@@ -1571,6 +1741,7 @@ msgstr "Сформировать счета"
#. module: sale
#: view:sale.order:0
+#: selection:sale.order,state:0
#: view:sale.order.line:0
msgid "To Invoice"
msgstr "В счет"
@@ -1581,6 +1752,11 @@ msgid "Date on which sales order is confirmed."
msgstr "Дата подтверждения заказа на продажу."
#. module: sale
+#: field:sale.order,project_id:0
+msgid "Contract/Analytic Account"
+msgstr ""
+
+#. module: sale
#: field:sale.order,company_id:0
#: field:sale.order.line,company_id:0
#: view:sale.report:0
@@ -1600,10 +1776,12 @@ msgid "The amount to be invoiced in advance."
msgstr "Сумма аванса в выставляемом счете."
#. module: sale
-#: selection:sale.order,state:0
-#: selection:sale.report,state:0
-msgid "Invoice Exception"
-msgstr "Исключение счета"
+#: code:addons/sale/sale.py:1256
+#, python-format
+msgid ""
+"Couldn't find a pricelist line matching this product and quantity.\n"
+"You have to change either the product, the quantity or the pricelist."
+msgstr ""
#. module: sale
#: help:sale.order,picking_ids:0
@@ -1612,13 +1790,6 @@ msgid ""
msgstr "Это комплектовочный лист созданный для этого заказа на продажу."
#. module: sale
-#: help:sale.installer,sale_margin:0
-msgid ""
-"Gives the margin of profitability by calculating the difference between Unit "
-"Price and Cost Price."
-msgstr "Дает прибыль вычитая себестоимость из цены за единицу продукции."
-
-#. module: sale
#: view:sale.make.invoice:0
#: view:sale.order.line.make.invoice:0
msgid "Create invoices"
@@ -1637,6 +1808,11 @@ msgid "Cancelled"
msgstr "Отменено"
#. module: sale
+#: view:sale.order.line:0
+msgid "Sales Order Lines related to a Sales Order of mine"
+msgstr ""
+
+#. module: sale
#: model:ir.actions.act_window,name:sale.action_shop_form
#: model:ir.ui.menu,name:sale.menu_action_shop_form
#: field:sale.order,shop_id:0
@@ -1646,17 +1822,12 @@ msgid "Shop"
msgstr "Магазин"
#. module: sale
-#: view:sale.report:0
-msgid " Month "
-msgstr " Месяц "
-
-#. module: sale
#: field:sale.report,date_confirm:0
msgid "Date Confirm"
msgstr "Дата подтверждения"
#. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:111
+#: code:addons/sale/wizard/sale_line_invoice.py:113
#, python-format
msgid "Warning"
msgstr "Внимание"
@@ -1668,22 +1839,6 @@ msgid "Sales by Month"
msgstr "Продажи по месяцу"
#. module: sale
-#: code:addons/sale/sale.py:1045
-#, python-format
-msgid ""
-"You selected a quantity of %d Units.\n"
-"But it's not compatible with the selected packaging.\n"
-"Here is a proposition of quantities according to the packaging:\n"
-"\n"
-"EAN: %s Quantity: %s Type of ul: %s"
-msgstr ""
-"Вы выбрали количество %d единиц.\n"
-"Это несовместимо с выбранной упаковкой.\n"
-"Предложение по количеству в соответствии с упаковкой:\n"
-"\n"
-"Штрих-код: %s количество: %s Type of ul: %s"
-
-#. module: sale
#: model:ir.model,name:sale.model_sale_order
#: model:process.node,name:sale.process_node_order0
#: model:process.node,name:sale.process_node_saleorder0
@@ -1699,6 +1854,11 @@ msgid "Quantity (UoS)"
msgstr "Количество (UoS)"
#. module: sale
+#: view:sale.order.line:0
+msgid "Sale Order Lines that are in 'done' state"
+msgstr ""
+
+#. module: sale
#: model:process.transition,note:sale.process_transition_packing0
msgid ""
"The Pick List form is created as soon as the sales order is confirmed, in "
@@ -1718,6 +1878,11 @@ msgid "Confirmed"
msgstr "Подтвержден"
#. module: sale
+#: field:sale.config.picking_policy,order_policy:0
+msgid "Main Method Based On"
+msgstr ""
+
+#. module: sale
#: model:process.transition.action,name:sale.process_transition_action_confirm0
msgid "Confirm"
msgstr "Подтвердить"
@@ -1740,6 +1905,7 @@ msgid "Invoice Lines"
msgstr "Позиции счета"
#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_product_tree
#: view:sale.order:0
#: view:sale.order.line:0
msgid "Sales Order Lines"
@@ -1756,32 +1922,18 @@ msgid "Configuration"
msgstr "Настройки"
#. module: sale
-#: selection:sale.order,picking_policy:0
-msgid "Complete Delivery"
-msgstr "Доставка целиком"
+#: code:addons/sale/edi/sale_order.py:146
+#, python-format
+msgid "EDI Pricelist (%s)"
+msgstr ""
#. module: sale
#: view:sale.report:0
-msgid " Month-1 "
-msgstr " Месяц-1 "
-
-#. module: sale
-#: help:sale.config.picking_policy,picking_policy:0
-msgid ""
-"The Shipping Policy is used to configure per order if you want to deliver as "
-"soon as possible when one product is available or you wait that all products "
-"are available.."
+msgid "Sales order created in current year"
msgstr ""
-"Политика доставки должна быть настроена по заказу, если вы хотите доставлять "
-"как можно скорее каждый товар или вы ждете все товары ..."
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "August"
-msgstr "Август"
#. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:111
+#: code:addons/sale/wizard/sale_line_invoice.py:113
#, python-format
msgid ""
"Invoice cannot be created for this Sales Order Line due to one of the "
@@ -1794,6 +1946,11 @@ msgstr ""
"2. Счет на эту позицию заказа на продажу уже выставлен!"
#. module: sale
+#: view:sale.order.line:0
+msgid "Sale order lines done"
+msgstr ""
+
+#. module: sale
#: field:sale.order.line,th_weight:0
msgid "Weight"
msgstr "Вес"
@@ -1812,7 +1969,6 @@ msgstr "Декабрь"
#. module: sale
#: field:sale.config.picking_policy,config_logo:0
-#: field:sale.installer,config_logo:0
msgid "Image"
msgstr "Изображение"
@@ -1845,9 +2001,9 @@ msgid "Salesman"
msgstr "Менеджер продаж"
#. module: sale
-#: model:process.node,note:sale.process_node_saleorder0
-msgid "Drives procurement and invoicing"
-msgstr "Управлять снабжением и выставлением счетов"
+#: model:ir.actions.act_window,name:sale.action_order_tree
+msgid "Old Quotations"
+msgstr "Старые предложения"
#. module: sale
#: field:sale.order,amount_untaxed:0
@@ -1855,7 +2011,7 @@ msgid "Untaxed Amount"
msgstr "Сумма до налогов"
#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:163
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:170
#: model:ir.actions.act_window,name:sale.action_view_sale_advance_payment_inv
#: view:sale.advance.payment.inv:0
#: view:sale.order:0
@@ -1864,7 +2020,7 @@ msgid "Advance Invoice"
msgstr "Счет на предоплату"
#. module: sale
-#: code:addons/sale/sale.py:591
+#: code:addons/sale/sale.py:624
#, python-format
msgid "The sales order '%s' has been cancelled."
msgstr "Заказ на продажу '%s' был отменен."
@@ -1906,20 +2062,20 @@ msgid "Packings"
msgstr "Упаковки"
#. module: sale
-#: field:sale.config.picking_policy,progress:0
-#: field:sale.installer,progress:0
-msgid "Configuration Progress"
-msgstr "Настройка выполняется"
+#: view:sale.order.line:0
+msgid "Sale Order Lines ready to be invoiced"
+msgstr ""
#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_product_tree
-msgid "Product sales"
-msgstr "Продажи продукции"
+#: view:sale.report:0
+msgid "Sales order created in last month"
+msgstr ""
#. module: sale
-#: field:sale.order,date_order:0
-msgid "Ordered Date"
-msgstr "Дата заказа"
+#: model:ir.actions.act_window,name:sale.action_email_templates
+#: model:ir.ui.menu,name:sale.menu_email_templates
+msgid "Email Templates"
+msgstr ""
#. module: sale
#: model:ir.actions.act_window,name:sale.action_order_form
@@ -1929,14 +2085,15 @@ msgid "Sales Orders"
msgstr "Заказы"
#. module: sale
-#: selection:sale.config.picking_policy,picking_policy:0
-msgid "Direct Delivery"
-msgstr "Прямая доставка"
+#: model:ir.model,name:sale.model_sale_shop
+#: view:sale.shop:0
+msgid "Sales Shop"
+msgstr "Магазин"
#. module: sale
-#: field:sale.installer,sale_journal:0
-msgid "Invoicing journals"
-msgstr "Журналы счетов"
+#: selection:sale.report,month:0
+msgid "November"
+msgstr "Ноябрь"
#. module: sale
#: field:sale.advance.payment.inv,product_id:0
@@ -1944,18 +2101,12 @@ msgid "Advance Product"
msgstr "Продвижение продукта"
#. module: sale
-#: view:sale.report:0
-#: field:sale.report,shipped_qty_1:0
-msgid "Shipped Qty"
-msgstr "Доставленное кол-во"
-
-#. module: sale
-#: view:sale.open.invoice:0
-msgid "You invoice has been successfully created!"
-msgstr "Ваш счет был успешно создан!"
+#: view:sale.order:0
+msgid "Compute"
+msgstr "Вычислить"
#. module: sale
-#: code:addons/sale/sale.py:585
+#: code:addons/sale/sale.py:618
#, python-format
msgid "You must first cancel all invoices attached to this sales order."
msgstr ""
@@ -1967,25 +2118,14 @@ msgid "January"
msgstr "Январь"
#. module: sale
-#: view:sale.installer:0
-msgid "Configure Your Sales Management Application"
-msgstr "Настройка модуля управления продажами"
-
-#. module: sale
#: model:ir.actions.act_window,name:sale.action_order_tree4
msgid "Sales Order in Progress"
msgstr "Заказы в процессе выполнения"
#. module: sale
-#: field:sale.installer,sale_layout:0
-msgid "Sales Order Layout Improvement"
-msgstr "Улучшение шаблонов заказов на продажу"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:63
-#, python-format
-msgid "Error"
-msgstr "Ошибка"
+#: help:sale.order,origin:0
+msgid "Reference of the document that generated this sales order request."
+msgstr "Ссылка на документ который создал запрос на этот заказ на продажу."
#. module: sale
#: view:sale.report:0
@@ -1994,6 +2134,11 @@ msgid "Commitment Delay"
msgstr "Задержка по обязательствам"
#. module: sale
+#: selection:sale.order,order_policy:0
+msgid "Deliver & invoice on demand"
+msgstr ""
+
+#. module: sale
#: model:process.node,note:sale.process_node_saleprocurement0
msgid ""
"One Procurement order for each sales order line and for each of the "
@@ -2018,13 +2163,12 @@ msgid "Confirmed sales order to invoice."
msgstr "Подтвержденный заказ на продажу в счет"
#. module: sale
-#: code:addons/sale/sale.py:290
-#, python-format
-msgid "Cannot delete Sales Order(s) which are already confirmed !"
-msgstr "Нельзя удалить подтвержденные заказы на продажу !"
+#: view:sale.order:0
+msgid "Sales Order that haven't yet been confirmed"
+msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:316
+#: code:addons/sale/sale.py:322
#, python-format
msgid "The sales order '%s' has been set in draft state."
msgstr "Заказ на продажу '%s' был установлен а состояние \"Черновик\"."
@@ -2035,37 +2179,27 @@ msgid "from stock"
msgstr "из запасов"
#. module: sale
-#: field:sale.config.picking_policy,order_policy:0
-msgid "Shipping Default Policy"
-msgstr "Политика доставки по умолчанию"
-
-#. module: sale
#: view:sale.open.invoice:0
msgid "Close"
msgstr "Закрыть"
#. module: sale
+#: code:addons/sale/sale.py:1248
+#, python-format
+msgid "No Pricelist ! : "
+msgstr ""
+
+#. module: sale
#: field:sale.order,shipped:0
msgid "Delivered"
msgstr "Доставлено"
#. module: sale
-#: code:addons/sale/sale.py:1115
-#, python-format
-msgid "Not enough stock !"
-msgstr "Запасов не достаточно !"
-
-#. module: sale
#: constraint:stock.move:0
msgid "You must assign a production lot for this product"
msgstr "Вы должны назначить партию изделий для данной ТМЦ"
#. module: sale
-#: field:sale.order.line,sequence:0
-msgid "Layout Sequence"
-msgstr "Последовательность размещения"
-
-#. module: sale
#: model:ir.actions.act_window,help:sale.action_shop_form
msgid ""
"If you have more than one shop reselling your company products, you can "
@@ -2096,13 +2230,6 @@ msgid "May"
msgstr "Май"
#. module: sale
-#: help:sale.installer,sale_order_dates:0
-msgid "Adds commitment, requested and effective dates on Sales Orders."
-msgstr ""
-"Добавить обязательства, вступление в силу и требуемые даты по заказу на "
-"продажу."
-
-#. module: sale
#: view:sale.order:0
#: field:sale.order,partner_id:0
#: field:sale.order.line,order_partner_id:0
@@ -2110,26 +2237,11 @@ msgid "Customer"
msgstr "Клиент"
#. module: sale
-#: model:product.template,name:sale.advance_product_0_product_template
-msgid "Advance"
-msgstr ""
-
-#. module: sale
#: selection:sale.report,month:0
msgid "February"
msgstr "Февраль"
#. module: sale
-#: help:sale.installer,sale_journal:0
-msgid ""
-"Allows you to group and invoice your delivery orders according to different "
-"invoicing types: daily, weekly, etc."
-msgstr ""
-"Позволяет вам группировать и выставлять счета по вашим заказам на доставку в "
-"соответствии с различными критериями выставления счетов: ежедневно, "
-"еженедельно и т.д."
-
-#. module: sale
#: selection:sale.report,month:0
msgid "April"
msgstr "Апрель"
@@ -2140,11 +2252,6 @@ msgid "Accounting"
msgstr "Бухгалтерия"
#. module: sale
-#: field:sale.config.picking_policy,step:0
-msgid "Steps To Deliver a Sales Order"
-msgstr "Шаги по доставке заказа на продажу"
-
-#. module: sale
#: view:sale.order:0
#: view:sale.order.line:0
msgid "Search Sales Order"
@@ -2156,20 +2263,18 @@ msgid "Sales Order Requisition"
msgstr "Запрос заказа на продажу"
#. module: sale
+#: code:addons/sale/sale.py:1242
+#, python-format
+msgid "Not enough stock ! : "
+msgstr ""
+
+#. module: sale
#: report:sale.order:0
#: field:sale.order,payment_term:0
msgid "Payment Term"
msgstr "Условия оплаты"
#. module: sale
-#: help:sale.installer,sale_layout:0
-msgid ""
-"Provides some features to improve the layout of the Sales Order reports."
-msgstr ""
-"Предоставляет некоторые возможности для улучшения шаблона отчета заказа на "
-"продажу."
-
-#. module: sale
#: model:ir.actions.act_window,help:sale.action_order_report_all
msgid ""
"This report performs analysis on your quotations and sales orders. Analysis "
@@ -2222,9 +2327,6 @@ msgstr "Счет основанный на доставках"
#~ msgid "Invalid XML for View Architecture!"
#~ msgstr "Неправильный XML для просмотра архитектуры!"
-#~ msgid "My Quotations"
-#~ msgstr "Мои предложения"
-
#~ msgid "Canceled"
#~ msgstr "Отменено"
@@ -2237,6 +2339,9 @@ msgstr "Счет основанный на доставках"
#~ msgid "Status"
#~ msgstr "Статус"
+#~ msgid "Product sales"
+#~ msgstr "Продажи продукции"
+
#~ msgid "Our Salesman"
#~ msgstr "Наш менеджер продаж"
@@ -2270,6 +2375,9 @@ msgstr "Счет основанный на доставках"
#~ msgid "Sales order"
#~ msgstr "Заказ"
+#~ msgid "Sales Management"
+#~ msgstr "Управление продажами"
+
#~ msgid "Sale Order Line"
#~ msgstr "Позиция заказа"
@@ -2317,9 +2425,15 @@ msgstr "Счет основанный на доставках"
#~ msgid "Recreate Procurement"
#~ msgstr "Рекреационная поставка"
+#~ msgid "Partial Delivery"
+#~ msgstr "Частичная доставка"
+
#~ msgid "Invoice after delivery"
#~ msgstr "Счет после доставки"
+#~ msgid "All at Once"
+#~ msgstr "Все за раз"
+
#~ msgid "Invalid model name in the action definition."
#~ msgstr "Недопустимое имя модели в определении действия."
@@ -2351,6 +2465,9 @@ msgstr "Счет основанный на доставках"
#~ msgid "Outgoing Products"
#~ msgstr "Изделия к отправке"
+#~ msgid "Shipping Policy"
+#~ msgstr "Политика доставки"
+
#~ msgid "Procurement is created after confirmation of sale order."
#~ msgstr "Снабжение осуществляется после подтверждения заказа на продажу."
@@ -2382,6 +2499,9 @@ msgstr "Счет основанный на доставках"
#~ msgid "My sales order waiting Invoice"
#~ msgstr "Мои заказы на продажу, ожидающие счета."
+#~ msgid "Complete Delivery"
+#~ msgstr "Доставка целиком"
+
#~ msgid "Sale Order Procurement"
#~ msgstr "Заказ на продажу - снабжение"
@@ -2429,12 +2549,18 @@ msgstr "Счет основанный на доставках"
#~ msgid "Sales Configuration"
#~ msgstr "Настройка продаж"
+#~ msgid "Shipping & Manual Invoice"
+#~ msgstr "Доставка & счет вручную"
+
#~ msgid "Sale Procurement"
#~ msgstr "Снабжение продаж"
#~ msgid "One procurement for each product."
#~ msgstr "Одна закупка для каждого товара."
+#~ msgid "Direct Delivery"
+#~ msgstr "Прямая доставка"
+
#~ msgid "Sale Pricelists"
#~ msgstr "Каталоги продаж"
@@ -2451,6 +2577,47 @@ msgstr "Счет основанный на доставках"
#~ "Когда кнопка подтверждения будет нажата, состояние изменится с \"Черновик\" "
#~ "на \"Вручную\". Предложение цен превратится в заказ на продажу."
+#~ msgid ""
+#~ "The Shipping Policy is used to configure per order if you want to deliver as "
+#~ "soon as possible when one product is available or you wait that all products "
+#~ "are available.."
+#~ msgstr ""
+#~ "Политика доставки должна быть настроена по заказу, если вы хотите доставлять "
+#~ "как можно скорее каждый товар или вы ждете все товары ..."
+
+#~ msgid "Shipping Default Policy"
+#~ msgstr "Политика доставки по умолчанию"
+
+#~ msgid "Payment Before Delivery"
+#~ msgstr "Платеж перед доставкой"
+
+#~ msgid "Delivery Order Only"
+#~ msgstr "Только заказ на доставку"
+
+#~ msgid "Delivery Costs"
+#~ msgstr "Стоимость доставки"
+
+#~ msgid ""
+#~ "Allows you to group and invoice your delivery orders according to different "
+#~ "invoicing types: daily, weekly, etc."
+#~ msgstr ""
+#~ "Позволяет вам группировать и выставлять счета по вашим заказам на доставку в "
+#~ "соответствии с различными критериями выставления счетов: ежедневно, "
+#~ "еженедельно и т.д."
+
+#~ msgid "Allows you to compute delivery costs on your quotations."
+#~ msgstr "Позволяет рассчитать стоимость доставки по вашему предложению."
+
+#, python-format
+#~ msgid "Picking Information !"
+#~ msgstr "Комплектовочная информация !"
+
+#~ msgid "Picking List & Delivery Order"
+#~ msgstr "Комплектовочный лист & Заказ на доставку"
+
+#~ msgid "Configure Picking Policy for Sales Order"
+#~ msgstr "Настроить политику комплектования для заказа на продажу"
+
#~ msgid "Invoice on Order After Delivery"
#~ msgstr "Счет на заказ после доставки"
@@ -2481,7 +2648,227 @@ msgstr "Счет основанный на доставках"
#~ msgid "Cannot delete Sale Order(s) which are already confirmed !"
#~ msgstr "Нельзя удалить подтвержденный заказ на продажу !"
+#~ msgid " Year "
+#~ msgstr " Год "
+
+#~ msgid "Sales Order Dates"
+#~ msgstr "Даты заказа на продажу"
+
+#~ msgid "Order date"
+#~ msgstr "Дата заказа"
+
+#~ msgid "Invoicing"
+#~ msgstr "Выставление счетов"
+
+#~ msgid " Month "
+#~ msgstr " Месяц "
+
#, python-format
#~ msgid "You must first cancel all invoices attached to this sale order."
#~ msgstr ""
#~ "Сначала вы должны отменить все счета связанные с этим заказом на продажу."
+
+#~ msgid " Month-1 "
+#~ msgstr " Месяц-1 "
+
+#~ msgid "Ordered Date"
+#~ msgstr "Дата заказа"
+
+#~ msgid "Configuration Progress"
+#~ msgstr "Настройка выполняется"
+
+#~ msgid "Shipped Qty"
+#~ msgstr "Доставленное кол-во"
+
+#~ msgid "Adds commitment, requested and effective dates on Sales Orders."
+#~ msgstr ""
+#~ "Добавить обязательства, вступление в силу и требуемые даты по заказу на "
+#~ "продажу."
+
+#, python-format
+#~ msgid "Not enough stock !"
+#~ msgstr "Запасов не достаточно !"
+
+#~ msgid "Invoicing journals"
+#~ msgstr "Журналы счетов"
+
+#~ msgid ""
+#~ "Gives the margin of profitability by calculating the difference between Unit "
+#~ "Price and Cost Price."
+#~ msgstr "Дает прибыль вычитая себестоимость из цены за единицу продукции."
+
+#~ msgid "Margins in Sales Orders"
+#~ msgstr "Прибыль в заказах на продажу"
+
+#~ msgid ""
+#~ "Provides some features to improve the layout of the Sales Order reports."
+#~ msgstr ""
+#~ "Предоставляет некоторые возможности для улучшения шаблона отчета заказа на "
+#~ "продажу."
+
+#~ msgid "Sales Order Layout Improvement"
+#~ msgstr "Улучшение шаблонов заказов на продажу"
+
+#~ msgid "Sales Application Configuration"
+#~ msgstr "Настройка продаж"
+
+#~ msgid "sale.installer"
+#~ msgstr "sale.installer"
+
+#~ msgid "Configure"
+#~ msgstr "Настройка"
+
+#~ msgid "Setup your sales workflow and default values."
+#~ msgstr "Настройте рабочий процесс продаж и значения по умолчанию."
+
+#~ msgid "Invoice On Order After Delivery"
+#~ msgstr "Счет на заказ после доставки"
+
+#, python-format
+#~ msgid "You cannot cancel a sales order line that has already been invoiced !"
+#~ msgstr ""
+#~ "Нельзя отменить позицию заказа на продажу на которую был выставлен счет !"
+
+#~ msgid "Invoice From The Picking"
+#~ msgstr "Счет из комплектования"
+
+#, python-format
+#~ msgid "Cannot delete a sales order line which is %s !"
+#~ msgstr "Нельзя удалить позицию заказа на продажу: %s !"
+
+#~ msgid "Configure Your Sales Management Application"
+#~ msgstr "Настройка модуля управления продажами"
+
+#~ msgid "Layout Sequence"
+#~ msgstr "Последовательность размещения"
+
+#, python-format
+#~ msgid "Cannot delete Sales Order(s) which are already confirmed !"
+#~ msgstr "Нельзя удалить подтвержденные заказы на продажу !"
+
+#~ msgid "Configure Sales Order Logistics"
+#~ msgstr "Настройка логистики заказа на продажу"
+
+#~ msgid "Order Reference must be unique !"
+#~ msgstr "Ссылка на заказ должна быть уникальной !"
+
+#~ msgid "Enhance your core Sales Application with additional functionalities."
+#~ msgstr "Расширяет модуль продаж дополнительными функциями."
+
+#, python-format
+#~ msgid ""
+#~ "You selected a quantity of %d Units.\n"
+#~ "But it's not compatible with the selected packaging.\n"
+#~ "Here is a proposition of quantities according to the packaging:\n"
+#~ "\n"
+#~ "EAN: %s Quantity: %s Type of ul: %s"
+#~ msgstr ""
+#~ "Вы выбрали количество %d единиц.\n"
+#~ "Это несовместимо с выбранной упаковкой.\n"
+#~ "Предложение по количеству в соответствии с упаковкой:\n"
+#~ "\n"
+#~ "Штрих-код: %s количество: %s Type of ul: %s"
+
+#~ msgid "Steps To Deliver a Sales Order"
+#~ msgstr "Шаги по доставке заказа на продажу"
+
+#~ msgid "Picking Default Policy"
+#~ msgstr "Политика комплектования по умолчанию"
+
+#~ msgid ""
+#~ "Gives the state of the quotation or sales order. \n"
+#~ "The exception state is automatically set when a cancel operation occurs in "
+#~ "the invoice validation (Invoice Exception) or in the picking list process "
+#~ "(Shipping Exception). \n"
+#~ "The 'Waiting Schedule' state is set when the invoice is confirmed but "
+#~ "waiting for the scheduler to run on the date 'Ordered Date'."
+#~ msgstr ""
+#~ "Состояние предложения цен или заказа на покупку. \n"
+#~ "Состояние \"Исключение\" автоматически устанавливается при отмене в процессе "
+#~ "утверждения счета (исключение счета) или при обработке комплектовочного "
+#~ "листа (исключение при доставке). \n"
+#~ "Состояние \"Ожидание планировщика\" устанавливается при подтверждении счета "
+#~ "и ожидании запуска планировщика по дате \"Дата заказа\"."
+
+#~ msgid ""
+#~ "The Shipping Policy is used to synchronise invoice and delivery operations.\n"
+#~ " - The 'Pay Before delivery' choice will first generate the invoice and "
+#~ "then generate the picking order after the payment of this invoice.\n"
+#~ " - The 'Shipping & Manual Invoice' will create the picking order directly "
+#~ "and wait for the user to manually click on the 'Invoice' button to generate "
+#~ "the draft invoice.\n"
+#~ " - The 'Invoice On Order After Delivery' choice will generate the draft "
+#~ "invoice based on sales order after all picking lists have been finished.\n"
+#~ " - The 'Invoice From The Picking' choice is used to create an invoice "
+#~ "during the picking process."
+#~ msgstr ""
+#~ "Политика доставки используется для синхронизации выставления счетов и "
+#~ "операций по доставке.\n"
+#~ " - \"Платеж перед доставкой\" - сначала создается счет, а после оплаты "
+#~ "этого счета создается комплектовочный лист.\n"
+#~ " - \"Доставка & счет вручную\" - сразу создается комплектовочный лист, "
+#~ "после этого ожидается, что пользователь вручную нажмет на кнопку \"Счет\" "
+#~ "для создания черновика счета.\n"
+#~ " - \"Счет на заказ после доставки\" - черновик счета генерируется из заказа "
+#~ "на продажу, после того, как все комплектовочные листы будут завершены.\n"
+#~ " - \"Счет из комплектования\" - счет создается в процессе комплектования."
+
+#~ msgid ""
+#~ "By default, OpenERP is able to manage complex routing and paths of products "
+#~ "in your warehouse and partner locations. This will configure the most common "
+#~ "and simple methods to deliver products to the customer in one or two "
+#~ "operations by the worker."
+#~ msgstr ""
+#~ "По умолчанию Open ERP в состоянии управлять сложными маршрутами и путями ТМЦ "
+#~ "на ваш склад и в места хранения контрагентов. Это позволит настроить "
+#~ "наиболее общие и простые методы доставки ТМЦ до заказчика за одно или два "
+#~ "действия."
+
+#~ msgid ""
+#~ "\n"
+#~ " The base module to manage quotations and sales orders.\n"
+#~ "\n"
+#~ " * Workflow with validation steps:\n"
+#~ " - Quotation -> Sales order -> Invoice\n"
+#~ " * Invoicing methods:\n"
+#~ " - Invoice on order (before or after shipping)\n"
+#~ " - Invoice on delivery\n"
+#~ " - Invoice on timesheets\n"
+#~ " - Advance invoice\n"
+#~ " * Partners preferences (shipping, invoicing, incoterm, ...)\n"
+#~ " * Products stocks and prices\n"
+#~ " * Delivery methods:\n"
+#~ " - all at once, multi-parcel\n"
+#~ " - delivery costs\n"
+#~ " * Dashboard for salesman that includes:\n"
+#~ " * Your open quotations\n"
+#~ " * Top 10 sales of the month\n"
+#~ " * Cases statistics\n"
+#~ " * Graph of sales by product\n"
+#~ " * Graph of cases of the month\n"
+#~ " "
+#~ msgstr ""
+#~ "\n"
+#~ " Базовый модуль для управления коммерческими предложениями и заказами на "
+#~ "продажу.\n"
+#~ "\n"
+#~ " * Рабочий процесс по шагам:\n"
+#~ " - Предложение -> Заказ на продажу -> Счет\n"
+#~ " * Методы выставления счетов:\n"
+#~ " - Счет по заказу (перед отгрузкой или после)\n"
+#~ " - Счет по доставке\n"
+#~ " - Счет по затратам времени\n"
+#~ " - Счет на аванс\n"
+#~ " * Предпочтения контрагентов (доставка, выставление счетов, ИНКОТЕРМ, "
+#~ "...)\n"
+#~ " * Товарные запасы и цены\n"
+#~ " * Методы доставки:\n"
+#~ " - всё за раз, несколько раз\n"
+#~ " - стоимость доставки\n"
+#~ " * Панель для менеджера продаж содержит:\n"
+#~ " * Ваши открытые предложения\n"
+#~ " * 10 лучших продаж месяца\n"
+#~ " * Статистика \n"
+#~ " * График продаж ТМЦ\n"
+#~ " * График сделок месяца\n"
+#~ " "
diff --git a/addons/sale/i18n/sk.po b/addons/sale/i18n/sk.po
index f1735eb9cb0..80a6266eac9 100644
--- a/addons/sale/i18n/sk.po
+++ b/addons/sale/i18n/sk.po
@@ -7,15 +7,27 @@ msgid ""
msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-01-11 11:16+0000\n"
+"POT-Creation-Date: 2011-12-22 18:43+0000\n"
"PO-Revision-Date: 2010-08-03 06:39+0000\n"
"Last-Translator: Peter Kohaut <peter.kohaut@gmail.com>\n"
"Language-Team: Slovak <sk@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-05 05:17+0000\n"
-"X-Generator: Launchpad (build 14231)\n"
+"X-Launchpad-Export-Date: 2011-12-23 06:47+0000\n"
+"X-Generator: Launchpad (build 14560)\n"
+
+#. module: sale
+#: field:sale.config.picking_policy,timesheet:0
+msgid "Based on Timesheet"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid ""
+"Sale Order Lines that are confirmed, done or in exception state and haven't "
+"yet been invoiced"
+msgstr ""
#. module: sale
#: view:board.board:0
@@ -24,11 +36,6 @@ msgid "Sales by Salesman in last 90 days"
msgstr "Predaj podľa obchodníka za posledných 90 dní"
#. module: sale
-#: help:sale.installer,delivery:0
-msgid "Allows you to compute delivery costs on your quotations."
-msgstr ""
-
-#. module: sale
#: help:sale.order,picking_policy:0
msgid ""
"If you don't have enough stock available to deliver all at once, do you "
@@ -36,6 +43,11 @@ msgid ""
msgstr ""
#. module: sale
+#: view:sale.order:0
+msgid "UoS"
+msgstr ""
+
+#. module: sale
#: help:sale.order,partner_shipping_id:0
msgid "Shipping address for current sales order."
msgstr "Dodacia adresa pre aktuálne objednávky predaja."
@@ -59,22 +71,12 @@ msgid "Cancel Order"
msgstr "Zrušiť objednávku"
#. module: sale
-#: view:sale.config.picking_policy:0
-msgid "Configure Sales Order Logistics"
-msgstr "Nastavenie logistiky objednávok predaja"
-
-#. module: sale
-#: code:addons/sale/sale.py:603
+#: code:addons/sale/sale.py:638
#, python-format
msgid "The quotation '%s' has been converted to a sales order."
msgstr "Cenová ponuka '%s' bola prevedená na objednávku predaja."
#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Payment Before Delivery"
-msgstr "Platba pred dodaním"
-
-#. module: sale
#: code:addons/sale/wizard/sale_make_invoice.py:42
#, python-format
msgid "Warning !"
@@ -91,12 +93,6 @@ msgid "Drives procurement orders for every sales order line."
msgstr ""
#. module: sale
-#: selection:sale.config.picking_policy,picking_policy:0
-msgid "All at Once"
-msgstr "Všetky naraz"
-
-#. module: sale
-#: field:sale.order,project_id:0
#: view:sale.report:0
#: field:sale.report,analytic_account_id:0
#: field:sale.shop,project_id:0
@@ -112,6 +108,15 @@ msgid ""
msgstr ""
#. module: sale
+#: code:addons/sale/sale.py:295
+#, python-format
+msgid ""
+"In order to delete a confirmed sale order, you must cancel it before ! To "
+"cancel a sale order, you must first cancel related picking or delivery "
+"orders."
+msgstr ""
+
+#. module: sale
#: model:process.node,name:sale.process_node_saleprocurement0
msgid "Procurement Order"
msgstr ""
@@ -123,6 +128,11 @@ msgid "Partner"
msgstr "Partner"
#. module: sale
+#: selection:sale.order,order_policy:0
+msgid "Invoice based on deliveries"
+msgstr ""
+
+#. module: sale
#: view:sale.order:0
msgid "Order Line"
msgstr ""
@@ -162,8 +172,13 @@ msgid "Default Payment Term"
msgstr "Predvolené platobné podmienky"
#. module: sale
-#: model:ir.actions.act_window,name:sale.action_config_picking_policy
-msgid "Configure Picking Policy for Sales Order"
+#: field:sale.config.picking_policy,deli_orders:0
+msgid "Based on Delivery Orders"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.picking_policy,time_unit:0
+msgid "Main Working Time Unit"
msgstr ""
#. module: sale
@@ -180,9 +195,10 @@ msgid "Disc.(%)"
msgstr "Zľava(%)"
#. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_forceassignation0
-msgid "Force Assignation"
-msgstr ""
+#: view:sale.report:0
+#: field:sale.report,price_total:0
+msgid "Total Price"
+msgstr "Celková cena"
#. module: sale
#: help:sale.make.invoice,grouped:0
@@ -190,6 +206,11 @@ msgid "Check the box to group the invoices for the same customers"
msgstr ""
#. module: sale
+#: view:sale.order:0
+msgid "My Sale Orders"
+msgstr ""
+
+#. module: sale
#: selection:sale.order,invoice_quantity:0
msgid "Ordered Quantities"
msgstr "Objednané množstvo"
@@ -228,13 +249,24 @@ msgid ""
msgstr ""
#. module: sale
+#: field:sale.config.picking_policy,task_work:0
+msgid "Based on Tasks' Work"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
+msgid "Quotations and Sales"
+msgstr ""
+
+#. module: sale
#: model:ir.model,name:sale.model_sale_make_invoice
msgid "Sales Make Invoice"
msgstr ""
#. module: sale
-#: view:sale.order:0
-msgid "Recreate Packing"
+#: code:addons/sale/sale.py:330
+#, python-format
+msgid "Pricelist Warning!"
msgstr ""
#. module: sale
@@ -243,9 +275,9 @@ msgid "Discount (%)"
msgstr "Zľava (%)"
#. module: sale
-#: help:res.company,security_lead:0
-msgid ""
-"This is the days added to what you promise to customers for security purpose"
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_quotation_for_sale
+msgid "My Quotations"
msgstr ""
#. module: sale
@@ -271,7 +303,22 @@ msgid "Shop Name"
msgstr "Názov obchodu"
#. module: sale
-#: code:addons/sale/sale.py:1014
+#: help:sale.order,order_policy:0
+msgid ""
+"The Invoice Policy is used to synchronise invoice and delivery operations.\n"
+" - The 'Pay before delivery' choice will first generate the invoice and "
+"then generate the picking order after the payment of this invoice.\n"
+" - The 'Deliver & Invoice on demand' will create the picking order directly "
+"and wait for the user to manually click on the 'Invoice' button to generate "
+"the draft invoice based on the sale order or the sale order lines.\n"
+" - The 'Invoice on order after delivery' choice will generate the draft "
+"invoice based on sales order after all picking lists have been finished.\n"
+" - The 'Invoice based on deliveries' choice is used to create an invoice "
+"during the picking process."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:1158
#, python-format
msgid "No Customer Defined !"
msgstr "Nie je definovaný zákazník !"
@@ -282,9 +329,12 @@ msgid "Sales in Exception"
msgstr ""
#. module: sale
-#: view:sale.order:0
-msgid "Set to Draft"
-msgstr "Nastaviť ako návr"
+#: code:addons/sale/sale.py:1145
+#: code:addons/sale/sale.py:1264
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:70
+#, python-format
+msgid "Configuration Error !"
+msgstr ""
#. module: sale
#: view:sale.order:0
@@ -292,22 +342,7 @@ msgid "Conditions"
msgstr "Podmienky"
#. module: sale
-#: help:sale.order,order_policy:0
-msgid ""
-"The Shipping Policy is used to synchronise invoice and delivery operations.\n"
-" - The 'Pay Before delivery' choice will first generate the invoice and "
-"then generate the picking order after the payment of this invoice.\n"
-" - The 'Shipping & Manual Invoice' will create the picking order directly "
-"and wait for the user to manually click on the 'Invoice' button to generate "
-"the draft invoice.\n"
-" - The 'Invoice On Order After Delivery' choice will generate the draft "
-"invoice based on sales order after all picking lists have been finished.\n"
-" - The 'Invoice From The Picking' choice is used to create an invoice "
-"during the picking process."
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:939
+#: code:addons/sale/sale.py:1034
#, python-format
msgid ""
"There is no income category account defined in default Properties for "
@@ -315,9 +350,9 @@ msgid ""
msgstr ""
#. module: sale
-#: view:sale.installer:0
-msgid "Configure"
-msgstr "Nastaviť"
+#: selection:sale.report,month:0
+msgid "August"
+msgstr "August"
#. module: sale
#: constraint:stock.move:0
@@ -325,7 +360,7 @@ msgid "You try to assign a lot which is not from the same product"
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:620
+#: code:addons/sale/sale.py:655
#, python-format
msgid "invalid mode for test_state"
msgstr "neplatný režim pre test_state"
@@ -336,7 +371,7 @@ msgid "June"
msgstr "Jún"
#. module: sale
-#: code:addons/sale/sale.py:584
+#: code:addons/sale/sale.py:617
#, python-format
msgid "Could not cancel this sales order !"
msgstr "Nemôžete zrušiť objednávku predaja !"
@@ -357,8 +392,12 @@ msgid "October"
msgstr "Október"
#. module: sale
+#: sql_constraint:stock.picking:0
+msgid "Reference must be unique per Company!"
+msgstr ""
+
+#. module: sale
#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_quotation_for_sale
#: view:sale.order:0
#: view:sale.report:0
msgid "Quotations"
@@ -370,11 +409,6 @@ msgid "Pricelist for current sales order."
msgstr "Cenník pre bežné objednávky predaja."
#. module: sale
-#: selection:sale.config.picking_policy,step:0
-msgid "Delivery Order Only"
-msgstr "Dodanie len podľa objednávky"
-
-#. module: sale
#: report:sale.order:0
msgid "TVA :"
msgstr "TVA :"
@@ -400,6 +434,7 @@ msgstr "Fiškálna pozícia"
#. module: sale
#: view:sale.order:0
#: view:sale.order.line:0
+#: field:sale.report,product_uom:0
msgid "UoM"
msgstr "Jednotka"
@@ -422,13 +457,19 @@ msgid ""
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:971
+#: code:addons/sale/sale.py:1061
+#, python-format
+msgid "You cannot cancel a sale order line that has already been invoiced!"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:1066
#, python-format
msgid "You must first cancel stock moves attached to this sales order line."
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:1042
+#: code:addons/sale/sale.py:1134
#, python-format
msgid "(n/a)"
msgstr "(n/a)"
@@ -462,13 +503,35 @@ msgid "Notes"
msgstr "Poznámky"
#. module: sale
+#: sql_constraint:res.company:0
+msgid "The company name must be unique !"
+msgstr ""
+
+#. module: sale
#: help:sale.order,partner_invoice_id:0
msgid "Invoice address for current sales order."
msgstr "Fakturačná adresa pre aktuálnu objednávku predaja."
#. module: sale
-#: view:sale.installer:0
-msgid "Enhance your core Sales Application with additional functionalities."
+#: view:sale.report:0
+msgid "Month-1"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered month of the sales order"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:504
+#, python-format
+msgid ""
+"You cannot group sales having different currencies for the same partner."
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,picking_policy:0
+msgid "Deliver each product when available"
msgstr ""
#. module: sale
@@ -488,21 +551,43 @@ msgid "Confirmation Date"
msgstr "Dátum potvrdenia"
#. module: sale
+#: field:sale.order,incoterm:0
+msgid "Incoterm"
+msgstr ""
+
+#. module: sale
#: field:sale.order.line,address_allotment_id:0
msgid "Allotment Partner"
msgstr "Pridelenie partnera"
#. module: sale
-#: sql_constraint:sale.order:0
-msgid "Order Reference must be unique !"
-msgstr ""
-
-#. module: sale
#: selection:sale.report,month:0
msgid "March"
msgstr "Marec"
#. module: sale
+#: constraint:stock.move:0
+msgid "You can not move products from or to a location of the type view."
+msgstr ""
+
+#. module: sale
+#: field:sale.config.picking_policy,sale_orders:0
+msgid "Based on Sales Orders"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,state:0
+msgid ""
+"Givwizard = self.browse(cr, uid, ids)[0]es the state of the quotation or "
+"sales order. \n"
+"The exception state is automatically set when a cancel operation occurs in "
+"the invoice validation (Invoice Exception) or in the picking list process "
+"(Shipping Exception). \n"
+"The 'Waiting Schedule' state is set when the invoice is confirmed but "
+"waiting for the scheduler to run on the order date."
+msgstr ""
+
+#. module: sale
#: help:sale.order,amount_total:0
msgid "The total amount."
msgstr "Celková suma."
@@ -518,6 +603,11 @@ msgid "Invoice address :"
msgstr "Fakturačná adresa:"
#. module: sale
+#: field:sale.order.line,sequence:0
+msgid "Line Sequence"
+msgstr ""
+
+#. module: sale
#: model:process.transition,note:sale.process_transition_saleorderprocurement0
msgid ""
"For every sales order line, a procurement order is created to supply the "
@@ -564,11 +654,6 @@ msgid "Sales Order Line"
msgstr "Položka objednávky"
#. module: sale
-#: view:sale.config.picking_policy:0
-msgid "Setup your sales workflow and default values."
-msgstr "Nastaviť workflow predaja a predvolené hodnoty."
-
-#. module: sale
#: field:sale.shop,warehouse_id:0
msgid "Warehouse"
msgstr "Sklad"
@@ -605,6 +690,11 @@ msgid "Creation Date"
msgstr "Dátum vytvorenia"
#. module: sale
+#: model:ir.ui.menu,name:sale.menu_sales_configuration_misc
+msgid "Miscellaneous"
+msgstr ""
+
+#. module: sale
#: model:ir.actions.act_window,name:sale.action_order_line_tree3
msgid "Uninvoiced and Delivered Lines"
msgstr "Nevyfakturované a dodané položky"
@@ -620,14 +710,19 @@ msgid "My Sales"
msgstr "Môj predaj"
#. module: sale
-#: code:addons/sale/sale.py:290
-#: code:addons/sale/sale.py:966
-#: code:addons/sale/sale.py:1165
+#: code:addons/sale/sale.py:295
+#: code:addons/sale/sale.py:1061
+#: code:addons/sale/sale.py:1290
#, python-format
msgid "Invalid action !"
msgstr "Neplatná akcia!"
#. module: sale
+#: view:sale.order:0
+msgid "Extra Info"
+msgstr "Ďalšie informácie"
+
+#. module: sale
#: field:sale.order,pricelist_id:0
#: field:sale.report,pricelist_id:0
#: field:sale.shop,pricelist_id:0
@@ -641,13 +736,21 @@ msgid "# of Qty"
msgstr "# z množ."
#. module: sale
+#: code:addons/sale/sale.py:1314
+#, python-format
+msgid "Hour"
+msgstr ""
+
+#. module: sale
#: view:sale.order:0
msgid "Order Date"
msgstr "Dátum objednávky"
#. module: sale
#: view:sale.order.line:0
+#: view:sale.report:0
#: field:sale.report,shipped:0
+#: field:sale.report,shipped_qty_1:0
msgid "Shipped"
msgstr "Dodané"
@@ -657,8 +760,8 @@ msgid "All Quotations"
msgstr "Všetky cenové ponuky"
#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Invoice On Order After Delivery"
+#: view:sale.config.picking_policy:0
+msgid "Options"
msgstr ""
#. module: sale
@@ -667,6 +770,20 @@ msgid "September"
msgstr "September"
#. module: sale
+#: code:addons/sale/sale.py:632
+#, python-format
+msgid "You cannot confirm a sale order which has no line."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:1246
+#, python-format
+msgid ""
+"You have to select a pricelist or a customer in the sales form !\n"
+"Please set one before choosing a product."
+msgstr ""
+
+#. module: sale
#: view:sale.report:0
#: field:sale.report,categ_id:0
msgid "Category of Product"
@@ -683,11 +800,6 @@ msgid "Stock Moves"
msgstr ""
#. module: sale
-#: view:sale.report:0
-msgid " Year "
-msgstr " Rok "
-
-#. module: sale
#: field:sale.order,state:0
#: field:sale.report,state:0
msgid "Order State"
@@ -705,7 +817,7 @@ msgid "Sales By Month"
msgstr "Predaj za mesiac"
#. module: sale
-#: code:addons/sale/sale.py:970
+#: code:addons/sale/sale.py:1065
#, python-format
msgid "Could not cancel sales order line!"
msgstr "Nie je možné zrušiť položku na objednávke!"
@@ -738,42 +850,19 @@ msgid ""
msgstr ""
#. module: sale
+#: field:sale.order,date_order:0
+msgid "Date"
+msgstr ""
+
+#. module: sale
#: view:sale.report:0
msgid "Extended Filters..."
msgstr "Rozšírené filtre..."
#. module: sale
-#: model:ir.module.module,description:sale.module_meta_information
-msgid ""
-"\n"
-" The base module to manage quotations and sales orders.\n"
-"\n"
-" * Workflow with validation steps:\n"
-" - Quotation -> Sales order -> Invoice\n"
-" * Invoicing methods:\n"
-" - Invoice on order (before or after shipping)\n"
-" - Invoice on delivery\n"
-" - Invoice on timesheets\n"
-" - Advance invoice\n"
-" * Partners preferences (shipping, invoicing, incoterm, ...)\n"
-" * Products stocks and prices\n"
-" * Delivery methods:\n"
-" - all at once, multi-parcel\n"
-" - delivery costs\n"
-" * Dashboard for salesman that includes:\n"
-" * Your open quotations\n"
-" * Top 10 sales of the month\n"
-" * Cases statistics\n"
-" * Graph of sales by product\n"
-" * Graph of cases of the month\n"
-" "
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_shop
-#: view:sale.shop:0
-msgid "Sales Shop"
-msgstr ""
+#: selection:sale.order.line,state:0
+msgid "Exception"
+msgstr "Výnimka"
#. module: sale
#: model:ir.model,name:sale.model_res_company
@@ -781,9 +870,10 @@ msgid "Companies"
msgstr "Spoločnosti"
#. module: sale
-#: selection:sale.report,month:0
-msgid "November"
-msgstr "November"
+#: code:addons/sale/sale.py:1259
+#, python-format
+msgid "No valid pricelist line found ! :"
+msgstr ""
#. module: sale
#: view:sale.order:0
@@ -791,8 +881,8 @@ msgid "History"
msgstr "História"
#. module: sale
-#: field:sale.config.picking_policy,picking_policy:0
-msgid "Picking Default Policy"
+#: selection:sale.order,order_policy:0
+msgid "Invoice on order after delivery"
msgstr ""
#. module: sale
@@ -817,13 +907,12 @@ msgstr ""
"ponuku."
#. module: sale
-#: code:addons/sale/sale.py:966
-#, python-format
-msgid "You cannot cancel a sales order line that has already been invoiced !"
+#: help:res.company,security_lead:0
+msgid ""
+"This is the days added to what you promise to customers for security purpose"
msgstr ""
#. module: sale
-#: view:sale.order:0
#: view:sale.order.line:0
msgid "Qty"
msgstr "Množ."
@@ -834,6 +923,11 @@ msgid "References"
msgstr "Odkazy"
#. module: sale
+#: view:sale.order.line:0
+msgid "My Sales Order Lines"
+msgstr ""
+
+#. module: sale
#: model:process.transition.action,name:sale.process_transition_action_cancel0
#: model:process.transition.action,name:sale.process_transition_action_cancel1
#: model:process.transition.action,name:sale.process_transition_action_cancel2
@@ -845,14 +939,9 @@ msgid "Cancel"
msgstr "Zrušené"
#. module: sale
-#: field:sale.installer,sale_order_dates:0
-msgid "Sales Order Dates"
-msgstr "Termíny objednávok predaja"
-
-#. module: sale
-#: selection:sale.order.line,state:0
-msgid "Exception"
-msgstr "Výnimka"
+#: sql_constraint:sale.order:0
+msgid "Order Reference must be unique per Company!"
+msgstr ""
#. module: sale
#: model:process.transition,name:sale.process_transition_invoice0
@@ -864,19 +953,19 @@ msgid "Create Invoice"
msgstr "Vytvoriť faktúru"
#. module: sale
-#: field:sale.installer,sale_margin:0
-msgid "Margins in Sales Orders"
-msgstr "Marža v objednávke predaja"
-
-#. module: sale
#: view:sale.order:0
msgid "Total Tax Excluded"
msgstr ""
#. module: sale
-#: view:sale.order:0
-msgid "Compute"
-msgstr "Vypočítať"
+#: view:sale.order.line:0
+msgid "Order reference"
+msgstr ""
+
+#. module: sale
+#: view:sale.open.invoice:0
+msgid "You invoice has been successfully created!"
+msgstr "Faktúra bola úspešne vytvorená !"
#. module: sale
#: view:sale.report:0
@@ -895,23 +984,21 @@ msgid "Open Invoice"
msgstr ""
#. module: sale
-#: report:sale.order:0
-#: view:sale.order.line:0
-msgid "Price"
-msgstr "Cena"
+#: model:ir.actions.server,name:sale.ir_actions_server_edi_sale
+msgid "Auto-email confirmed sale orders"
+msgstr ""
#. module: sale
-#: model:ir.actions.act_window,name:sale.action_sale_installer
-#: view:sale.config.picking_policy:0
-#: view:sale.installer:0
-msgid "Sales Application Configuration"
+#: code:addons/sale/sale.py:413
+#, python-format
+msgid "There is no sales journal defined for this company: \"%s\" (id:%d)"
msgstr ""
+"Nie je stanovené žiadne účtovanie pre túto spoločnosť: \"%s\" (id:%d)"
#. module: sale
-#: view:sale.report:0
-#: field:sale.report,price_total:0
-msgid "Total Price"
-msgstr "Celková cena"
+#: model:process.transition.action,name:sale.process_transition_action_forceassignation0
+msgid "Force Assignation"
+msgstr ""
#. module: sale
#: selection:sale.order.line,type:0
@@ -924,6 +1011,11 @@ msgid "Based on the shipped or on the ordered quantities."
msgstr "Na základe odoslaného alebo objednaného množstva."
#. module: sale
+#: selection:sale.order,picking_policy:0
+msgid "Deliver all products at once"
+msgstr ""
+
+#. module: sale
#: field:sale.order,picking_ids:0
msgid "Related Picking"
msgstr ""
@@ -955,9 +1047,15 @@ msgid "Create Delivery Order"
msgstr ""
#. module: sale
-#: field:sale.installer,delivery:0
-msgid "Delivery Costs"
-msgstr "Náklady na doručenie"
+#: code:addons/sale/sale.py:1290
+#, python-format
+msgid "Cannot delete a sales order line which is in state '%s'!"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Qty(UoS)"
+msgstr ""
#. module: sale
#: view:sale.order:0
@@ -971,13 +1069,13 @@ msgstr ""
#. module: sale
#: view:sale.report:0
-msgid "Sales by Product Category"
-msgstr "Predaj podľa kategórie produktov"
+msgid "Ordered date of the sales order"
+msgstr ""
#. module: sale
-#: selection:sale.order,picking_policy:0
-msgid "Partial Delivery"
-msgstr "Čiastočné dodania"
+#: view:sale.report:0
+msgid "Sales by Product Category"
+msgstr "Predaj podľa kategórie produktov"
#. module: sale
#: model:process.transition,name:sale.process_transition_confirmquotation0
@@ -985,9 +1083,10 @@ msgid "Confirm Quotation"
msgstr "Potvrdiť cenovú ponuku"
#. module: sale
-#: help:sale.order,origin:0
-msgid "Reference of the document that generated this sales order request."
-msgstr ""
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:63
+#, python-format
+msgid "Error"
+msgstr "Chyba"
#. module: sale
#: view:sale.order:0
@@ -1019,20 +1118,14 @@ msgid "Procurement Method"
msgstr ""
#. module: sale
-#: view:sale.config.picking_policy:0
-#: view:sale.installer:0
-msgid "title"
-msgstr "titul"
-
-#. module: sale
#: model:process.node,name:sale.process_node_packinglist0
msgid "Pick List"
msgstr ""
#. module: sale
#: view:sale.order:0
-msgid "Order date"
-msgstr "Dátum objednávky"
+msgid "Set to Draft"
+msgstr "Nastaviť ako návr"
#. module: sale
#: model:process.node,note:sale.process_node_packinglist0
@@ -1040,6 +1133,85 @@ msgid "Document of the move to the output or to the customer."
msgstr ""
#. module: sale
+#: model:email.template,body_text:sale.email_template_edi_sale
+msgid ""
+"\n"
+"Hello${object.partner_order_id.name and ' ' or "
+"''}${object.partner_order_id.name or ''},\n"
+"\n"
+"Here is your order confirmation for ${object.partner_id.name}:\n"
+" | Order number: *${object.name}*\n"
+" | Order total: *${object.amount_total} "
+"${object.pricelist_id.currency_id.name}*\n"
+" | Order date: ${object.date_order}\n"
+" % if object.origin:\n"
+" | Order reference: ${object.origin}\n"
+" % endif\n"
+" % if object.client_order_ref:\n"
+" | Your reference: ${object.client_order_ref}<br />\n"
+" % endif\n"
+" | Your contact: ${object.user_id.name} ${object.user_id.user_email "
+"and '<%s>'%(object.user_id.user_email) or ''}\n"
+"\n"
+"You can view the order confirmation, download it and even pay online using "
+"the following link:\n"
+" ${ctx.get('edi_web_url_view') or 'n/a'}\n"
+"\n"
+"% if object.order_policy in ('prepaid','manual') and "
+"object.company_id.paypal_account:\n"
+"<% \n"
+"comp_name = quote(object.company_id.name)\n"
+"order_name = quote(object.name)\n"
+"paypal_account = quote(object.company_id.paypal_account)\n"
+"order_amount = quote(str(object.amount_total))\n"
+"cur_name = quote(object.pricelist_id.currency_id.name)\n"
+"paypal_url = \"https://www.paypal.com/cgi-"
+"bin/webscr?cmd=_xclick&business=%s&item_name=%s%%20Order%%20%s&invoice=%s&amo"
+"unt=%s\" \\\n"
+" "
+"\"&currency_code=%s&button_subtype=services&no_note=1&bn=OpenERP_Order_PayNow"
+"_%s\" % \\\n"
+" "
+"(paypal_account,comp_name,order_name,order_name,order_amount,cur_name,cur_nam"
+"e)\n"
+"%>\n"
+"It is also possible to directly pay with Paypal:\n"
+" ${paypal_url}\n"
+"% endif\n"
+"\n"
+"If you have any question, do not hesitate to contact us.\n"
+"\n"
+"\n"
+"Thank you for choosing ${object.company_id.name}!\n"
+"\n"
+"\n"
+"--\n"
+"${object.user_id.name} ${object.user_id.user_email and "
+"'<%s>'%(object.user_id.user_email) or ''}\n"
+"${object.company_id.name}\n"
+"% if object.company_id.street:\n"
+"${object.company_id.street or ''}\n"
+"% endif\n"
+"% if object.company_id.street2:\n"
+"${object.company_id.street2}\n"
+"% endif\n"
+"% if object.company_id.city or object.company_id.zip:\n"
+"${object.company_id.zip or ''} ${object.company_id.city or ''}\n"
+"% endif\n"
+"% if object.company_id.country_id:\n"
+"${object.company_id.state_id and ('%s, ' % object.company_id.state_id.name) "
+"or ''} ${object.company_id.country_id.name or ''}\n"
+"% endif\n"
+"% if object.company_id.phone:\n"
+"Phone: ${object.company_id.phone}\n"
+"% endif\n"
+"% if object.company_id.website:\n"
+"${object.company_id.website or ''}\n"
+"% endif\n"
+" "
+msgstr ""
+
+#. module: sale
#: model:process.transition.action,name:sale.process_transition_action_validate0
msgid "Validate"
msgstr "Overenie"
@@ -1062,9 +1234,9 @@ msgid "Taxes"
msgstr "Dane"
#. module: sale
-#: field:sale.order,order_policy:0
-msgid "Shipping Policy"
-msgstr "Podmienky dopravy"
+#: view:sale.order:0
+msgid "Sales Order ready to be invoiced"
+msgstr ""
#. module: sale
#: help:sale.order,create_date:0
@@ -1083,9 +1255,9 @@ msgid "Create Invoices"
msgstr "Vytvorenie faktúr"
#. module: sale
-#: view:sale.order:0
-msgid "Extra Info"
-msgstr "Ďalšie informácie"
+#: view:sale.report:0
+msgid "Sales order created in current month"
+msgstr ""
#. module: sale
#: report:sale.order:0
@@ -1093,11 +1265,24 @@ msgid "Fax :"
msgstr "Fax :"
#. module: sale
+#: help:sale.order.line,type:0
+msgid ""
+"If 'on order', it triggers a procurement when the sale order is confirmed to "
+"create a task, purchase order or manufacturing order linked to this sale "
+"order line."
+msgstr ""
+
+#. module: sale
#: field:sale.advance.payment.inv,amount:0
msgid "Advance Amount"
msgstr "Záloha vo výške"
#. module: sale
+#: field:sale.config.picking_policy,charge_delivery:0
+msgid "Do you charge the delivery?"
+msgstr ""
+
+#. module: sale
#: selection:sale.order,invoice_quantity:0
msgid "Shipped Quantities"
msgstr "Dodané množstvo"
@@ -1108,25 +1293,45 @@ msgid "Invoice Based on Sales Orders"
msgstr "Fakturácia na základe objednávky predaja"
#. module: sale
+#: code:addons/sale/sale.py:331
+#, python-format
+msgid ""
+"If you change the pricelist of this order (and eventually the currency), "
+"prices of existing order lines will not be updated."
+msgstr ""
+
+#. module: sale
#: model:ir.model,name:sale.model_stock_picking
msgid "Picking List"
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:387
-#: code:addons/sale/sale.py:920
-#: code:addons/sale/sale.py:938
+#: code:addons/sale/sale.py:412
+#: code:addons/sale/sale.py:503
+#: code:addons/sale/sale.py:632
+#: code:addons/sale/sale.py:1015
+#: code:addons/sale/sale.py:1033
#, python-format
msgid "Error !"
msgstr "Chyba !"
#. module: sale
-#: code:addons/sale/sale.py:570
+#: code:addons/sale/sale.py:603
#, python-format
msgid "Could not cancel sales order !"
msgstr "Nemôžem zrušiť objednávku predaja !"
#. module: sale
+#: view:sale.order:0
+msgid "Qty(UoM)"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered Year of the sales order"
+msgstr ""
+
+#. module: sale
#: selection:sale.report,month:0
msgid "July"
msgstr "Júl"
@@ -1143,35 +1348,25 @@ msgid "Shipping Exception"
msgstr "Výnimka prepravy"
#. module: sale
-#: field:sale.make.invoice,grouped:0
-msgid "Group the invoices"
-msgstr "Skupina faktúr"
-
-#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Shipping & Manual Invoice"
-msgstr "Doprava a manuálna faktúra"
-
-#. module: sale
-#: code:addons/sale/sale.py:1051
+#: code:addons/sale/sale.py:1143
#, python-format
-msgid "Picking Information !"
+msgid "Picking Information ! : "
msgstr ""
#. module: sale
-#: view:sale.report:0
-#: field:sale.report,month:0
-msgid "Month"
-msgstr "Mesiac"
+#: field:sale.make.invoice,grouped:0
+msgid "Group the invoices"
+msgstr "Skupina faktúr"
#. module: sale
-#: model:ir.module.module,shortdesc:sale.module_meta_information
-msgid "Sales Management"
-msgstr "Správa predaja"
+#: field:sale.order,order_policy:0
+msgid "Invoice Policy"
+msgstr ""
#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Invoice From The Picking"
+#: model:ir.actions.act_window,name:sale.action_config_picking_policy
+#: view:sale.config.picking_policy:0
+msgid "Setup your Invoicing Method"
msgstr ""
#. module: sale
@@ -1181,28 +1376,31 @@ msgstr ""
#. module: sale
#: view:sale.report:0
-#: field:sale.report,uom_name:0
msgid "Reference UoM"
msgstr "Referencie MJ"
#. module: sale
+#: view:sale.config.picking_policy:0
+msgid ""
+"This tool will help you to install the right module and configure the system "
+"according to the method you use to invoice your customers."
+msgstr ""
+
+#. module: sale
#: model:ir.model,name:sale.model_sale_order_line_make_invoice
msgid "Sale OrderLine Make_invoice"
msgstr ""
#. module: sale
-#: help:sale.config.picking_policy,step:0
-msgid ""
-"By default, OpenERP is able to manage complex routing and paths of products "
-"in your warehouse and partner locations. This will configure the most common "
-"and simple methods to deliver products to the customer in one or two "
-"operations by the worker."
+#: selection:sale.order,state:0
+#: selection:sale.report,state:0
+msgid "Invoice Exception"
msgstr ""
#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_tree
-msgid "Old Quotations"
-msgstr "Staré ponuky"
+#: model:process.node,note:sale.process_node_saleorder0
+msgid "Drives procurement and invoicing"
+msgstr ""
#. module: sale
#: field:sale.order,invoiced:0
@@ -1217,6 +1415,22 @@ msgid "Sales Analysis"
msgstr "Analýza predaja"
#. module: sale
+#: code:addons/sale/sale.py:1138
+#, python-format
+msgid ""
+"You selected a quantity of %d Units.\n"
+"But it's not compatible with the selected packaging.\n"
+"Here is a proposition of quantities according to the packaging:\n"
+"EAN: %s Quantity: %s Type of ul: %s"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Recreate Packing"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
#: field:sale.order.line,property_ids:0
msgid "Properties"
msgstr "Možnosti"
@@ -1245,7 +1459,17 @@ msgstr ""
"dodania."
#. module: sale
-#: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
+#: view:sale.order.line:0
+msgid "Confirmed sale order lines, not yet delivered"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:473
+#, python-format
+msgid "Customer Invoices"
+msgstr ""
+
+#. module: sale
#: model:process.process,name:sale.process_process_salesprocess0
#: view:sale.order:0
#: view:sale.report:0
@@ -1267,18 +1491,13 @@ msgid "Done"
msgstr "Hotovo"
#. module: sale
-#: model:ir.model,name:sale.model_sale_installer
-msgid "sale.installer"
-msgstr "sale.installer"
-
-#. module: sale
#: model:process.node,name:sale.process_node_invoice0
#: model:process.node,name:sale.process_node_invoiceafterdelivery0
msgid "Invoice"
msgstr "Faktúra"
#. module: sale
-#: code:addons/sale/sale.py:1014
+#: code:addons/sale/sale.py:1158
#, python-format
msgid ""
"You have to select a customer in the sales form !\n"
@@ -1288,11 +1507,6 @@ msgstr ""
"Prosím nastavte aspoň jedného zákazníka pred výberom produktu."
#. module: sale
-#: selection:sale.config.picking_policy,step:0
-msgid "Picking List & Delivery Order"
-msgstr ""
-
-#. module: sale
#: field:sale.order,origin:0
msgid "Source Document"
msgstr "Zdrojový dokument"
@@ -1318,7 +1532,7 @@ msgid "The amount without tax."
msgstr "Suma bez dane."
#. module: sale
-#: code:addons/sale/sale.py:571
+#: code:addons/sale/sale.py:604
#, python-format
msgid "You must first cancel all picking attached to this sales order."
msgstr ""
@@ -1329,8 +1543,14 @@ msgid "Sales Advance Payment Invoice"
msgstr "Zálohová faktúra predaja"
#. module: sale
-#: field:sale.order,incoterm:0
-msgid "Incoterm"
+#: view:sale.report:0
+#: field:sale.report,month:0
+msgid "Month"
+msgstr "Mesiac"
+
+#. module: sale
+#: model:email.template,subject:sale.email_template_edi_sale
+msgid "${object.company_id.name} Order (Ref ${object.name or 'n/a' })"
msgstr ""
#. module: sale
@@ -1342,11 +1562,6 @@ msgid "Product"
msgstr "Produkt"
#. module: sale
-#: model:ir.ui.menu,name:sale.menu_invoiced
-msgid "Invoicing"
-msgstr "Fakturácia"
-
-#. module: sale
#: model:process.transition.action,name:sale.process_transition_action_cancelassignation0
msgid "Cancel Assignation"
msgstr ""
@@ -1357,14 +1572,10 @@ msgid "sale.config.picking_policy"
msgstr "sale.config.picking_policy"
#. module: sale
-#: help:sale.order,state:0
-msgid ""
-"Gives the state of the quotation or sales order. \n"
-"The exception state is automatically set when a cancel operation occurs in "
-"the invoice validation (Invoice Exception) or in the picking list process "
-"(Shipping Exception). \n"
-"The 'Waiting Schedule' state is set when the invoice is confirmed but "
-"waiting for the scheduler to run on the date 'Ordered Date'."
+#: view:account.invoice.report:0
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_turnover_by_month
+msgid "Monthly Turnover"
msgstr ""
#. module: sale
@@ -1383,7 +1594,6 @@ msgid "Product UoS"
msgstr ""
#. module: sale
-#: selection:sale.order,state:0
#: selection:sale.report,state:0
msgid "Manual In Progress"
msgstr "manuálne spracovanie"
@@ -1404,7 +1614,8 @@ msgid "Order"
msgstr "Poradie"
#. module: sale
-#: code:addons/sale/sale.py:921
+#: code:addons/sale/sale.py:1016
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:71
#, python-format
msgid "There is no income account defined for this product: \"%s\" (id:%d)"
msgstr ""
@@ -1425,7 +1636,7 @@ msgid ""
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:1116
+#: code:addons/sale/sale.py:1238
#, python-format
msgid ""
"You plan to sell %.2f %s but you only have %.2f %s available !\n"
@@ -1456,11 +1667,10 @@ msgid "Total"
msgstr "Celkom"
#. module: sale
-#: code:addons/sale/sale.py:388
-#, python-format
-msgid "There is no sales journal defined for this company: \"%s\" (id:%d)"
-msgstr ""
-"Nie je stanovené žiadne účtovanie pre túto spoločnosť: \"%s\" (id:%d)"
+#: report:sale.order:0
+#: view:sale.order.line:0
+msgid "Price"
+msgstr "Cena"
#. module: sale
#: model:process.transition,note:sale.process_transition_deliver0
@@ -1471,9 +1681,14 @@ msgid ""
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:1165
-#, python-format
-msgid "Cannot delete a sales order line which is %s !"
+#: selection:sale.order,order_policy:0
+msgid "Pay before delivery"
+msgstr ""
+
+#. module: sale
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.open_board_sales
+msgid "Sales Dashboard"
msgstr ""
#. module: sale
@@ -1485,6 +1700,7 @@ msgstr ""
#. module: sale
#: view:sale.order:0
+#: selection:sale.order,state:0
#: view:sale.order.line:0
msgid "To Invoice"
msgstr ""
@@ -1495,6 +1711,11 @@ msgid "Date on which sales order is confirmed."
msgstr ""
#. module: sale
+#: field:sale.order,project_id:0
+msgid "Contract/Analytic Account"
+msgstr ""
+
+#. module: sale
#: field:sale.order,company_id:0
#: field:sale.order.line,company_id:0
#: view:sale.report:0
@@ -1514,9 +1735,11 @@ msgid "The amount to be invoiced in advance."
msgstr "Suma, ktorá bude fakturovaná vopred."
#. module: sale
-#: selection:sale.order,state:0
-#: selection:sale.report,state:0
-msgid "Invoice Exception"
+#: code:addons/sale/sale.py:1256
+#, python-format
+msgid ""
+"Couldn't find a pricelist line matching this product and quantity.\n"
+"You have to change either the product, the quantity or the pricelist."
msgstr ""
#. module: sale
@@ -1526,13 +1749,6 @@ msgid ""
msgstr ""
#. module: sale
-#: help:sale.installer,sale_margin:0
-msgid ""
-"Gives the margin of profitability by calculating the difference between Unit "
-"Price and Cost Price."
-msgstr ""
-
-#. module: sale
#: view:sale.make.invoice:0
#: view:sale.order.line.make.invoice:0
msgid "Create invoices"
@@ -1551,6 +1767,11 @@ msgid "Cancelled"
msgstr "Zrušená"
#. module: sale
+#: view:sale.order.line:0
+msgid "Sales Order Lines related to a Sales Order of mine"
+msgstr ""
+
+#. module: sale
#: model:ir.actions.act_window,name:sale.action_shop_form
#: model:ir.ui.menu,name:sale.menu_action_shop_form
#: field:sale.order,shop_id:0
@@ -1560,17 +1781,12 @@ msgid "Shop"
msgstr "Obchod"
#. module: sale
-#: view:sale.report:0
-msgid " Month "
-msgstr " Mesiac "
-
-#. module: sale
#: field:sale.report,date_confirm:0
msgid "Date Confirm"
msgstr "Dátum potvrdenia"
#. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:111
+#: code:addons/sale/wizard/sale_line_invoice.py:113
#, python-format
msgid "Warning"
msgstr "Upozornenie"
@@ -1582,22 +1798,6 @@ msgid "Sales by Month"
msgstr "Predaj za mesiac"
#. module: sale
-#: code:addons/sale/sale.py:1045
-#, python-format
-msgid ""
-"You selected a quantity of %d Units.\n"
-"But it's not compatible with the selected packaging.\n"
-"Here is a proposition of quantities according to the packaging:\n"
-"\n"
-"EAN: %s Quantity: %s Type of ul: %s"
-msgstr ""
-"Vybrali ste množstvo %d .\n"
-"Ale to nie je kompatibilné s vybraným balením.\n"
-"Je tu problém v množstve podľa údajov za obale:\n"
-"\n"
-"EAN: %s Množstvo: %s Typ ul: %s"
-
-#. module: sale
#: model:ir.model,name:sale.model_sale_order
#: model:process.node,name:sale.process_node_order0
#: model:process.node,name:sale.process_node_saleorder0
@@ -1613,6 +1813,11 @@ msgid "Quantity (UoS)"
msgstr "Množstvo (UoS)"
#. module: sale
+#: view:sale.order.line:0
+msgid "Sale Order Lines that are in 'done' state"
+msgstr ""
+
+#. module: sale
#: model:process.transition,note:sale.process_transition_packing0
msgid ""
"The Pick List form is created as soon as the sales order is confirmed, in "
@@ -1627,6 +1832,11 @@ msgid "Confirmed"
msgstr "Potvrdené"
#. module: sale
+#: field:sale.config.picking_policy,order_policy:0
+msgid "Main Method Based On"
+msgstr ""
+
+#. module: sale
#: model:process.transition.action,name:sale.process_transition_action_confirm0
msgid "Confirm"
msgstr "Potvrdiť"
@@ -1649,6 +1859,7 @@ msgid "Invoice Lines"
msgstr "Položky faktúry"
#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_product_tree
#: view:sale.order:0
#: view:sale.order.line:0
msgid "Sales Order Lines"
@@ -1665,30 +1876,18 @@ msgid "Configuration"
msgstr "Konfigurácia"
#. module: sale
-#: selection:sale.order,picking_policy:0
-msgid "Complete Delivery"
-msgstr "Kompletná dodávka"
+#: code:addons/sale/edi/sale_order.py:146
+#, python-format
+msgid "EDI Pricelist (%s)"
+msgstr ""
#. module: sale
#: view:sale.report:0
-msgid " Month-1 "
-msgstr " Mesiac-1 "
-
-#. module: sale
-#: help:sale.config.picking_policy,picking_policy:0
-msgid ""
-"The Shipping Policy is used to configure per order if you want to deliver as "
-"soon as possible when one product is available or you wait that all products "
-"are available.."
+msgid "Sales order created in current year"
msgstr ""
#. module: sale
-#: selection:sale.report,month:0
-msgid "August"
-msgstr "August"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:111
+#: code:addons/sale/wizard/sale_line_invoice.py:113
#, python-format
msgid ""
"Invoice cannot be created for this Sales Order Line due to one of the "
@@ -1702,6 +1901,11 @@ msgstr ""
"2. Riadok v objednávke je účtovaný!"
#. module: sale
+#: view:sale.order.line:0
+msgid "Sale order lines done"
+msgstr ""
+
+#. module: sale
#: field:sale.order.line,th_weight:0
msgid "Weight"
msgstr "Hmotnosť"
@@ -1720,7 +1924,6 @@ msgstr "December"
#. module: sale
#: field:sale.config.picking_policy,config_logo:0
-#: field:sale.installer,config_logo:0
msgid "Image"
msgstr "Obrázok"
@@ -1750,9 +1953,9 @@ msgid "Salesman"
msgstr "Obchodník"
#. module: sale
-#: model:process.node,note:sale.process_node_saleorder0
-msgid "Drives procurement and invoicing"
-msgstr ""
+#: model:ir.actions.act_window,name:sale.action_order_tree
+msgid "Old Quotations"
+msgstr "Staré ponuky"
#. module: sale
#: field:sale.order,amount_untaxed:0
@@ -1760,7 +1963,7 @@ msgid "Untaxed Amount"
msgstr "Suma bez DPH"
#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:163
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:170
#: model:ir.actions.act_window,name:sale.action_view_sale_advance_payment_inv
#: view:sale.advance.payment.inv:0
#: view:sale.order:0
@@ -1769,7 +1972,7 @@ msgid "Advance Invoice"
msgstr "Zálohová faktúra"
#. module: sale
-#: code:addons/sale/sale.py:591
+#: code:addons/sale/sale.py:624
#, python-format
msgid "The sales order '%s' has been cancelled."
msgstr "'%s' objednávok predaja bolo zrušených."
@@ -1804,20 +2007,20 @@ msgid "Packings"
msgstr "Balenia"
#. module: sale
-#: field:sale.config.picking_policy,progress:0
-#: field:sale.installer,progress:0
-msgid "Configuration Progress"
-msgstr "Priebeh nastavenia"
+#: view:sale.order.line:0
+msgid "Sale Order Lines ready to be invoiced"
+msgstr ""
#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_product_tree
-msgid "Product sales"
-msgstr "Predaj produktu"
+#: view:sale.report:0
+msgid "Sales order created in last month"
+msgstr ""
#. module: sale
-#: field:sale.order,date_order:0
-msgid "Ordered Date"
-msgstr "Dátum objednania"
+#: model:ir.actions.act_window,name:sale.action_email_templates
+#: model:ir.ui.menu,name:sale.menu_email_templates
+msgid "Email Templates"
+msgstr ""
#. module: sale
#: model:ir.actions.act_window,name:sale.action_order_form
@@ -1827,14 +2030,15 @@ msgid "Sales Orders"
msgstr "Objednávky predaja"
#. module: sale
-#: selection:sale.config.picking_policy,picking_policy:0
-msgid "Direct Delivery"
+#: model:ir.model,name:sale.model_sale_shop
+#: view:sale.shop:0
+msgid "Sales Shop"
msgstr ""
#. module: sale
-#: field:sale.installer,sale_journal:0
-msgid "Invoicing journals"
-msgstr "Účtovanie faktúr"
+#: selection:sale.report,month:0
+msgid "November"
+msgstr "November"
#. module: sale
#: field:sale.advance.payment.inv,product_id:0
@@ -1842,18 +2046,12 @@ msgid "Advance Product"
msgstr ""
#. module: sale
-#: view:sale.report:0
-#: field:sale.report,shipped_qty_1:0
-msgid "Shipped Qty"
-msgstr "Dodávané množ."
-
-#. module: sale
-#: view:sale.open.invoice:0
-msgid "You invoice has been successfully created!"
-msgstr "Faktúra bola úspešne vytvorená !"
+#: view:sale.order:0
+msgid "Compute"
+msgstr "Vypočítať"
#. module: sale
-#: code:addons/sale/sale.py:585
+#: code:addons/sale/sale.py:618
#, python-format
msgid "You must first cancel all invoices attached to this sales order."
msgstr ""
@@ -1865,33 +2063,27 @@ msgid "January"
msgstr "Január"
#. module: sale
-#: view:sale.installer:0
-msgid "Configure Your Sales Management Application"
-msgstr ""
-
-#. module: sale
#: model:ir.actions.act_window,name:sale.action_order_tree4
msgid "Sales Order in Progress"
msgstr "Objednávka v spracovaní"
#. module: sale
-#: field:sale.installer,sale_layout:0
-msgid "Sales Order Layout Improvement"
+#: help:sale.order,origin:0
+msgid "Reference of the document that generated this sales order request."
msgstr ""
#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:63
-#, python-format
-msgid "Error"
-msgstr "Chyba"
-
-#. module: sale
#: view:sale.report:0
#: field:sale.report,delay:0
msgid "Commitment Delay"
msgstr ""
#. module: sale
+#: selection:sale.order,order_policy:0
+msgid "Deliver & invoice on demand"
+msgstr ""
+
+#. module: sale
#: model:process.node,note:sale.process_node_saleprocurement0
msgid ""
"One Procurement order for each sales order line and for each of the "
@@ -1914,13 +2106,12 @@ msgid "Confirmed sales order to invoice."
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:290
-#, python-format
-msgid "Cannot delete Sales Order(s) which are already confirmed !"
-msgstr "Nemôžete mazať objednávku(y), ktoré sú už potvrdené!"
+#: view:sale.order:0
+msgid "Sales Order that haven't yet been confirmed"
+msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:316
+#: code:addons/sale/sale.py:322
#, python-format
msgid "The sales order '%s' has been set in draft state."
msgstr ""
@@ -1931,37 +2122,27 @@ msgid "from stock"
msgstr "zo skladu"
#. module: sale
-#: field:sale.config.picking_policy,order_policy:0
-msgid "Shipping Default Policy"
-msgstr "Prednastavené podmienky dodania"
-
-#. module: sale
#: view:sale.open.invoice:0
msgid "Close"
msgstr "Zatvoriť"
#. module: sale
+#: code:addons/sale/sale.py:1248
+#, python-format
+msgid "No Pricelist ! : "
+msgstr ""
+
+#. module: sale
#: field:sale.order,shipped:0
msgid "Delivered"
msgstr "Dodané"
#. module: sale
-#: code:addons/sale/sale.py:1115
-#, python-format
-msgid "Not enough stock !"
-msgstr "Nie je dostatok zásob!"
-
-#. module: sale
#: constraint:stock.move:0
msgid "You must assign a production lot for this product"
msgstr ""
#. module: sale
-#: field:sale.order.line,sequence:0
-msgid "Layout Sequence"
-msgstr ""
-
-#. module: sale
#: model:ir.actions.act_window,help:sale.action_shop_form
msgid ""
"If you have more than one shop reselling your company products, you can "
@@ -1992,11 +2173,6 @@ msgid "May"
msgstr "Máj"
#. module: sale
-#: help:sale.installer,sale_order_dates:0
-msgid "Adds commitment, requested and effective dates on Sales Orders."
-msgstr ""
-
-#. module: sale
#: view:sale.order:0
#: field:sale.order,partner_id:0
#: field:sale.order.line,order_partner_id:0
@@ -2004,23 +2180,11 @@ msgid "Customer"
msgstr "Zákazník"
#. module: sale
-#: model:product.template,name:sale.advance_product_0_product_template
-msgid "Advance"
-msgstr ""
-
-#. module: sale
#: selection:sale.report,month:0
msgid "February"
msgstr "Február"
#. module: sale
-#: help:sale.installer,sale_journal:0
-msgid ""
-"Allows you to group and invoice your delivery orders according to different "
-"invoicing types: daily, weekly, etc."
-msgstr ""
-
-#. module: sale
#: selection:sale.report,month:0
msgid "April"
msgstr "Apríl"
@@ -2031,11 +2195,6 @@ msgid "Accounting"
msgstr "Účtovníctvo"
#. module: sale
-#: field:sale.config.picking_policy,step:0
-msgid "Steps To Deliver a Sales Order"
-msgstr ""
-
-#. module: sale
#: view:sale.order:0
#: view:sale.order.line:0
msgid "Search Sales Order"
@@ -2047,20 +2206,18 @@ msgid "Sales Order Requisition"
msgstr ""
#. module: sale
+#: code:addons/sale/sale.py:1242
+#, python-format
+msgid "Not enough stock ! : "
+msgstr ""
+
+#. module: sale
#: report:sale.order:0
#: field:sale.order,payment_term:0
msgid "Payment Term"
msgstr "Termín úhrady"
#. module: sale
-#: help:sale.installer,sale_layout:0
-msgid ""
-"Provides some features to improve the layout of the Sales Order reports."
-msgstr ""
-"Poskytuje niektoré funkcie pre zlepšenie rozloženia reportu pre objednávky "
-"predaja."
-
-#. module: sale
#: model:ir.actions.act_window,help:sale.action_order_report_all
msgid ""
"This report performs analysis on your quotations and sales orders. Analysis "
@@ -2097,6 +2254,9 @@ msgstr "Rok"
msgid "Invoice Based on Deliveries"
msgstr ""
+#~ msgid "Partial Delivery"
+#~ msgstr "Čiastočné dodania"
+
#~ msgid "Invalid model name in the action definition."
#~ msgstr "Neplatný názov modelu v akcii definície."
@@ -2109,12 +2269,21 @@ msgstr ""
#~ msgid "Invoice after delivery"
#~ msgstr "Faktúra po doručení"
+#~ msgid "Shipping Policy"
+#~ msgstr "Podmienky dopravy"
+
+#~ msgid "All at Once"
+#~ msgstr "Všetky naraz"
+
#~ msgid "Procure Method"
#~ msgstr "Metóda obstarania"
#~ msgid "My sales order waiting Invoice"
#~ msgstr "Moje predajné objednávky čakajúce na faktúru"
+#~ msgid "Complete Delivery"
+#~ msgstr "Kompletná dodávka"
+
#~ msgid "Packing"
#~ msgstr "Balenie"
@@ -2130,9 +2299,18 @@ msgstr ""
#~ msgid "Packing Default Policy"
#~ msgstr "Prednastavené podmienky balenia"
+#~ msgid "Shipping Default Policy"
+#~ msgstr "Prednastavené podmienky dodania"
+
+#~ msgid "Sales Management"
+#~ msgstr "Správa predaja"
+
#~ msgid "Sales Configuration"
#~ msgstr "Konfigurácia predaja"
+#~ msgid "Shipping & Manual Invoice"
+#~ msgstr "Doprava a manuálna faktúra"
+
#~ msgid "Status"
#~ msgstr "Stav"
@@ -2141,3 +2319,91 @@ msgstr ""
#~ msgid "Invalid XML for View Architecture!"
#~ msgstr "Neplatné XML pre zobrazenie architektúry!"
+
+#~ msgid "Configure Sales Order Logistics"
+#~ msgstr "Nastavenie logistiky objednávok predaja"
+
+#~ msgid "Payment Before Delivery"
+#~ msgstr "Platba pred dodaním"
+
+#~ msgid "Configure"
+#~ msgstr "Nastaviť"
+
+#~ msgid "Delivery Order Only"
+#~ msgstr "Dodanie len podľa objednávky"
+
+#~ msgid "Setup your sales workflow and default values."
+#~ msgstr "Nastaviť workflow predaja a predvolené hodnoty."
+
+#~ msgid " Year "
+#~ msgstr " Rok "
+
+#~ msgid "Sales Order Dates"
+#~ msgstr "Termíny objednávok predaja"
+
+#~ msgid "Margins in Sales Orders"
+#~ msgstr "Marža v objednávke predaja"
+
+#~ msgid "title"
+#~ msgstr "titul"
+
+#~ msgid "sale.installer"
+#~ msgstr "sale.installer"
+
+#~ msgid "Invoicing"
+#~ msgstr "Fakturácia"
+
+#~ msgid " Month "
+#~ msgstr " Mesiac "
+
+#~ msgid " Month-1 "
+#~ msgstr " Mesiac-1 "
+
+#~ msgid "Product sales"
+#~ msgstr "Predaj produktu"
+
+#~ msgid "Configuration Progress"
+#~ msgstr "Priebeh nastavenia"
+
+#~ msgid "Shipped Qty"
+#~ msgstr "Dodávané množ."
+
+#, python-format
+#~ msgid "Not enough stock !"
+#~ msgstr "Nie je dostatok zásob!"
+
+#, python-format
+#~ msgid "Cannot delete Sales Order(s) which are already confirmed !"
+#~ msgstr "Nemôžete mazať objednávku(y), ktoré sú už potvrdené!"
+
+#~ msgid "Delivery Costs"
+#~ msgstr "Náklady na doručenie"
+
+#~ msgid "Order date"
+#~ msgstr "Dátum objednávky"
+
+#~ msgid "Ordered Date"
+#~ msgstr "Dátum objednania"
+
+#, python-format
+#~ msgid ""
+#~ "You selected a quantity of %d Units.\n"
+#~ "But it's not compatible with the selected packaging.\n"
+#~ "Here is a proposition of quantities according to the packaging:\n"
+#~ "\n"
+#~ "EAN: %s Quantity: %s Type of ul: %s"
+#~ msgstr ""
+#~ "Vybrali ste množstvo %d .\n"
+#~ "Ale to nie je kompatibilné s vybraným balením.\n"
+#~ "Je tu problém v množstve podľa údajov za obale:\n"
+#~ "\n"
+#~ "EAN: %s Množstvo: %s Typ ul: %s"
+
+#~ msgid "Invoicing journals"
+#~ msgstr "Účtovanie faktúr"
+
+#~ msgid ""
+#~ "Provides some features to improve the layout of the Sales Order reports."
+#~ msgstr ""
+#~ "Poskytuje niektoré funkcie pre zlepšenie rozloženia reportu pre objednávky "
+#~ "predaja."
diff --git a/addons/sale/i18n/sl.po b/addons/sale/i18n/sl.po
index 587455e36e8..73fae53d713 100644
--- a/addons/sale/i18n/sl.po
+++ b/addons/sale/i18n/sl.po
@@ -6,15 +6,27 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2011-01-11 11:16+0000\n"
+"POT-Creation-Date: 2011-12-22 18:43+0000\n"
"PO-Revision-Date: 2010-12-14 21:38+0000\n"
"Last-Translator: Christophe (OpenERP) <Unknown>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-05 05:17+0000\n"
-"X-Generator: Launchpad (build 14231)\n"
+"X-Launchpad-Export-Date: 2011-12-23 06:47+0000\n"
+"X-Generator: Launchpad (build 14560)\n"
+
+#. module: sale
+#: field:sale.config.picking_policy,timesheet:0
+msgid "Based on Timesheet"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid ""
+"Sale Order Lines that are confirmed, done or in exception state and haven't "
+"yet been invoiced"
+msgstr ""
#. module: sale
#: view:board.board:0
@@ -23,11 +35,6 @@ msgid "Sales by Salesman in last 90 days"
msgstr "Prodaja po prodajalec v zadnjih 90 dneh"
#. module: sale
-#: help:sale.installer,delivery:0
-msgid "Allows you to compute delivery costs on your quotations."
-msgstr ""
-
-#. module: sale
#: help:sale.order,picking_policy:0
msgid ""
"If you don't have enough stock available to deliver all at once, do you "
@@ -37,9 +44,14 @@ msgstr ""
"delnimi pošiljkami ?"
#. module: sale
+#: view:sale.order:0
+msgid "UoS"
+msgstr ""
+
+#. module: sale
#: help:sale.order,partner_shipping_id:0
msgid "Shipping address for current sales order."
-msgstr ""
+msgstr "Naslov dostave za tekočo prodajo."
#. module: sale
#: field:sale.advance.payment.inv,qtty:0
@@ -60,26 +72,16 @@ msgid "Cancel Order"
msgstr "Prekliči nalog"
#. module: sale
-#: view:sale.config.picking_policy:0
-msgid "Configure Sales Order Logistics"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:603
+#: code:addons/sale/sale.py:638
#, python-format
msgid "The quotation '%s' has been converted to a sales order."
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Payment Before Delivery"
-msgstr ""
+msgstr "Ponudba '%s' je bila pretvorjena v prodajni nalog"
#. module: sale
#: code:addons/sale/wizard/sale_make_invoice.py:42
#, python-format
msgid "Warning !"
-msgstr ""
+msgstr "Opozorilo !"
#. module: sale
#: report:sale.order:0
@@ -92,12 +94,6 @@ msgid "Drives procurement orders for every sales order line."
msgstr ""
#. module: sale
-#: selection:sale.config.picking_policy,picking_policy:0
-msgid "All at Once"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,project_id:0
#: view:sale.report:0
#: field:sale.report,analytic_account_id:0
#: field:sale.shop,project_id:0
@@ -113,14 +109,28 @@ msgid ""
msgstr ""
#. module: sale
+#: code:addons/sale/sale.py:295
+#, python-format
+msgid ""
+"In order to delete a confirmed sale order, you must cancel it before ! To "
+"cancel a sale order, you must first cancel related picking or delivery "
+"orders."
+msgstr ""
+
+#. module: sale
#: model:process.node,name:sale.process_node_saleprocurement0
msgid "Procurement Order"
-msgstr ""
+msgstr "Javna naročila"
#. module: sale
#: view:sale.report:0
#: field:sale.report,partner_id:0
msgid "Partner"
+msgstr "Stranka"
+
+#. module: sale
+#: selection:sale.order,order_policy:0
+msgid "Invoice based on deliveries"
msgstr ""
#. module: sale
@@ -156,8 +166,13 @@ msgid "Default Payment Term"
msgstr "Privzeti plačilni pogoji"
#. module: sale
-#: model:ir.actions.act_window,name:sale.action_config_picking_policy
-msgid "Configure Picking Policy for Sales Order"
+#: field:sale.config.picking_policy,deli_orders:0
+msgid "Based on Delivery Orders"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.picking_policy,time_unit:0
+msgid "Main Working Time Unit"
msgstr ""
#. module: sale
@@ -166,17 +181,18 @@ msgstr ""
#: field:sale.order.line,state:0
#: view:sale.report:0
msgid "State"
-msgstr ""
+msgstr "Država"
#. module: sale
#: report:sale.order:0
msgid "Disc.(%)"
-msgstr ""
+msgstr "Pop. (%)"
#. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_forceassignation0
-msgid "Force Assignation"
-msgstr ""
+#: view:sale.report:0
+#: field:sale.report,price_total:0
+msgid "Total Price"
+msgstr "Skupna cena"
#. module: sale
#: help:sale.make.invoice,grouped:0
@@ -184,6 +200,11 @@ msgid "Check the box to group the invoices for the same customers"
msgstr ""
#. module: sale
+#: view:sale.order:0
+msgid "My Sale Orders"
+msgstr ""
+
+#. module: sale
#: selection:sale.order,invoice_quantity:0
msgid "Ordered Quantities"
msgstr "Naročene količine"
@@ -191,7 +212,7 @@ msgstr "Naročene količine"
#. module: sale
#: view:sale.report:0
msgid "Sales by Salesman"
-msgstr ""
+msgstr "Prodaja po prodajalcu"
#. module: sale
#: field:sale.order.line,move_ids:0
@@ -207,12 +228,12 @@ msgstr "Sklic naloga"
#. module: sale
#: view:sale.order:0
msgid "Other Information"
-msgstr ""
+msgstr "Ostale Podrobnosti"
#. module: sale
#: view:sale.order:0
msgid "Dates"
-msgstr ""
+msgstr "Datumi"
#. module: sale
#: model:process.transition,note:sale.process_transition_invoiceafterdelivery0
@@ -222,13 +243,24 @@ msgid ""
msgstr ""
#. module: sale
+#: field:sale.config.picking_policy,task_work:0
+msgid "Based on Tasks' Work"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
+msgid "Quotations and Sales"
+msgstr ""
+
+#. module: sale
#: model:ir.model,name:sale.model_sale_make_invoice
msgid "Sales Make Invoice"
msgstr ""
#. module: sale
-#: view:sale.order:0
-msgid "Recreate Packing"
+#: code:addons/sale/sale.py:330
+#, python-format
+msgid "Pricelist Warning!"
msgstr ""
#. module: sale
@@ -237,10 +269,10 @@ msgid "Discount (%)"
msgstr "Popust (%)"
#. module: sale
-#: help:res.company,security_lead:0
-msgid ""
-"This is the days added to what you promise to customers for security purpose"
-msgstr ""
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_quotation_for_sale
+msgid "My Quotations"
+msgstr "Moje ponudbe"
#. module: sale
#: view:board.board:0
@@ -252,7 +284,7 @@ msgstr ""
#. module: sale
#: field:sale.order.line,product_packaging:0
msgid "Packaging"
-msgstr ""
+msgstr "Pakiranje"
#. module: sale
#: model:process.transition,name:sale.process_transition_saleinvoice0
@@ -262,13 +294,28 @@ msgstr ""
#. module: sale
#: field:sale.shop,name:0
msgid "Shop Name"
+msgstr "Ime trgovine"
+
+#. module: sale
+#: help:sale.order,order_policy:0
+msgid ""
+"The Invoice Policy is used to synchronise invoice and delivery operations.\n"
+" - The 'Pay before delivery' choice will first generate the invoice and "
+"then generate the picking order after the payment of this invoice.\n"
+" - The 'Deliver & Invoice on demand' will create the picking order directly "
+"and wait for the user to manually click on the 'Invoice' button to generate "
+"the draft invoice based on the sale order or the sale order lines.\n"
+" - The 'Invoice on order after delivery' choice will generate the draft "
+"invoice based on sales order after all picking lists have been finished.\n"
+" - The 'Invoice based on deliveries' choice is used to create an invoice "
+"during the picking process."
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:1014
+#: code:addons/sale/sale.py:1158
#, python-format
msgid "No Customer Defined !"
-msgstr ""
+msgstr "Ni določene stranke !"
#. module: sale
#: model:ir.actions.act_window,name:sale.action_order_tree2
@@ -276,32 +323,20 @@ msgid "Sales in Exception"
msgstr "Prodaja v izjemah"
#. module: sale
-#: view:sale.order:0
-msgid "Set to Draft"
-msgstr "Preklopi v pripravo"
+#: code:addons/sale/sale.py:1145
+#: code:addons/sale/sale.py:1264
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:70
+#, python-format
+msgid "Configuration Error !"
+msgstr ""
#. module: sale
#: view:sale.order:0
msgid "Conditions"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,order_policy:0
-msgid ""
-"The Shipping Policy is used to synchronise invoice and delivery operations.\n"
-" - The 'Pay Before delivery' choice will first generate the invoice and "
-"then generate the picking order after the payment of this invoice.\n"
-" - The 'Shipping & Manual Invoice' will create the picking order directly "
-"and wait for the user to manually click on the 'Invoice' button to generate "
-"the draft invoice.\n"
-" - The 'Invoice On Order After Delivery' choice will generate the draft "
-"invoice based on sales order after all picking lists have been finished.\n"
-" - The 'Invoice From The Picking' choice is used to create an invoice "
-"during the picking process."
-msgstr ""
+msgstr "Pogoji"
#. module: sale
-#: code:addons/sale/sale.py:939
+#: code:addons/sale/sale.py:1034
#, python-format
msgid ""
"There is no income category account defined in default Properties for "
@@ -309,8 +344,8 @@ msgid ""
msgstr ""
#. module: sale
-#: view:sale.installer:0
-msgid "Configure"
+#: selection:sale.report,month:0
+msgid "August"
msgstr ""
#. module: sale
@@ -319,7 +354,7 @@ msgid "You try to assign a lot which is not from the same product"
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:620
+#: code:addons/sale/sale.py:655
#, python-format
msgid "invalid mode for test_state"
msgstr ""
@@ -327,13 +362,13 @@ msgstr ""
#. module: sale
#: selection:sale.report,month:0
msgid "June"
-msgstr ""
+msgstr "Junij"
#. module: sale
-#: code:addons/sale/sale.py:584
+#: code:addons/sale/sale.py:617
#, python-format
msgid "Could not cancel this sales order !"
-msgstr ""
+msgstr "Ni bilo mogoče preklicati prodaje!"
#. module: sale
#: model:ir.model,name:sale.model_sale_report
@@ -348,15 +383,19 @@ msgstr ""
#. module: sale
#: selection:sale.report,month:0
msgid "October"
+msgstr "Oktober"
+
+#. module: sale
+#: sql_constraint:stock.picking:0
+msgid "Reference must be unique per Company!"
msgstr ""
#. module: sale
#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_quotation_for_sale
#: view:sale.order:0
#: view:sale.report:0
msgid "Quotations"
-msgstr ""
+msgstr "Ponudbe"
#. module: sale
#: help:sale.order,pricelist_id:0
@@ -364,11 +403,6 @@ msgid "Pricelist for current sales order."
msgstr ""
#. module: sale
-#: selection:sale.config.picking_policy,step:0
-msgid "Delivery Order Only"
-msgstr ""
-
-#. module: sale
#: report:sale.order:0
msgid "TVA :"
msgstr ""
@@ -383,7 +417,7 @@ msgstr ""
#. module: sale
#: report:sale.order:0
msgid "Quotation Date"
-msgstr ""
+msgstr "Datum Povpraševanja"
#. module: sale
#: field:sale.order,fiscal_position:0
@@ -393,13 +427,14 @@ msgstr ""
#. module: sale
#: view:sale.order:0
#: view:sale.order.line:0
+#: field:sale.report,product_uom:0
msgid "UoM"
msgstr "ME"
#. module: sale
#: field:sale.order.line,number_packages:0
msgid "Number Packages"
-msgstr ""
+msgstr "Število paketov"
#. module: sale
#: selection:sale.order,state:0
@@ -415,13 +450,19 @@ msgid ""
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:971
+#: code:addons/sale/sale.py:1061
+#, python-format
+msgid "You cannot cancel a sale order line that has already been invoiced!"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:1066
#, python-format
msgid "You must first cancel stock moves attached to this sales order line."
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:1042
+#: code:addons/sale/sale.py:1134
#, python-format
msgid "(n/a)"
msgstr ""
@@ -436,7 +477,7 @@ msgstr ""
#. module: sale
#: report:sale.order:0
msgid "Tel. :"
-msgstr ""
+msgstr "Tel. :"
#. module: sale
#: code:addons/sale/wizard/sale_make_invoice_advance.py:64
@@ -455,13 +496,35 @@ msgid "Notes"
msgstr "Opombe"
#. module: sale
+#: sql_constraint:res.company:0
+msgid "The company name must be unique !"
+msgstr ""
+
+#. module: sale
#: help:sale.order,partner_invoice_id:0
msgid "Invoice address for current sales order."
msgstr ""
#. module: sale
-#: view:sale.installer:0
-msgid "Enhance your core Sales Application with additional functionalities."
+#: view:sale.report:0
+msgid "Month-1"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered month of the sales order"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:504
+#, python-format
+msgid ""
+"You cannot group sales having different currencies for the same partner."
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,picking_policy:0
+msgid "Deliver each product when available"
msgstr ""
#. module: sale
@@ -481,29 +544,51 @@ msgid "Confirmation Date"
msgstr ""
#. module: sale
+#: field:sale.order,incoterm:0
+msgid "Incoterm"
+msgstr "Incoterm"
+
+#. module: sale
#: field:sale.order.line,address_allotment_id:0
msgid "Allotment Partner"
msgstr "Področni partner"
#. module: sale
-#: sql_constraint:sale.order:0
-msgid "Order Reference must be unique !"
+#: selection:sale.report,month:0
+msgid "March"
+msgstr "Marec"
+
+#. module: sale
+#: constraint:stock.move:0
+msgid "You can not move products from or to a location of the type view."
msgstr ""
#. module: sale
-#: selection:sale.report,month:0
-msgid "March"
+#: field:sale.config.picking_policy,sale_orders:0
+msgid "Based on Sales Orders"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,state:0
+msgid ""
+"Givwizard = self.browse(cr, uid, ids)[0]es the state of the quotation or "
+"sales order. \n"
+"The exception state is automatically set when a cancel operation occurs in "
+"the invoice validation (Invoice Exception) or in the picking list process "
+"(Shipping Exception). \n"
+"The 'Waiting Schedule' state is set when the invoice is confirmed but "
+"waiting for the scheduler to run on the order date."
msgstr ""
#. module: sale
#: help:sale.order,amount_total:0
msgid "The total amount."
-msgstr ""
+msgstr "Skupni znesek"
#. module: sale
#: field:sale.order.line,price_subtotal:0
msgid "Subtotal"
-msgstr "Delna vsota"
+msgstr ""
#. module: sale
#: report:sale.order:0
@@ -511,6 +596,11 @@ msgid "Invoice address :"
msgstr "Naslov za račun:"
#. module: sale
+#: field:sale.order.line,sequence:0
+msgid "Line Sequence"
+msgstr ""
+
+#. module: sale
#: model:process.transition,note:sale.process_transition_saleorderprocurement0
msgid ""
"For every sales order line, a procurement order is created to supply the "
@@ -537,7 +627,7 @@ msgstr ""
#. module: sale
#: model:ir.actions.report.xml,name:sale.report_sale_order
msgid "Quotation / Order"
-msgstr ""
+msgstr "Povpraševanje / Naročilo"
#. module: sale
#: view:sale.report:0
@@ -557,11 +647,6 @@ msgid "Sales Order Line"
msgstr ""
#. module: sale
-#: view:sale.config.picking_policy:0
-msgid "Setup your sales workflow and default values."
-msgstr ""
-
-#. module: sale
#: field:sale.shop,warehouse_id:0
msgid "Warehouse"
msgstr "Skladišče"
@@ -569,7 +654,7 @@ msgstr "Skladišče"
#. module: sale
#: report:sale.order:0
msgid "Order N°"
-msgstr ""
+msgstr "Naročilo št."
#. module: sale
#: field:sale.order,order_line:0
@@ -585,7 +670,7 @@ msgstr "Neobdavčen znesek"
#: model:ir.actions.act_window,name:sale.action_order_line_tree2
#: model:ir.ui.menu,name:sale.menu_invoicing_sales_order_lines
msgid "Lines to Invoice"
-msgstr ""
+msgstr "Vrstice za fakturiranje"
#. module: sale
#: field:sale.order.line,product_uom_qty:0
@@ -598,6 +683,11 @@ msgid "Creation Date"
msgstr ""
#. module: sale
+#: model:ir.ui.menu,name:sale.menu_sales_configuration_misc
+msgid "Miscellaneous"
+msgstr ""
+
+#. module: sale
#: model:ir.actions.act_window,name:sale.action_order_line_tree3
msgid "Uninvoiced and Delivered Lines"
msgstr "Nezaračunane in dostavljene postavke"
@@ -610,15 +700,20 @@ msgstr "Skupaj:"
#. module: sale
#: view:sale.report:0
msgid "My Sales"
-msgstr ""
+msgstr "Moja Prodaja"
#. module: sale
-#: code:addons/sale/sale.py:290
-#: code:addons/sale/sale.py:966
-#: code:addons/sale/sale.py:1165
+#: code:addons/sale/sale.py:295
+#: code:addons/sale/sale.py:1061
+#: code:addons/sale/sale.py:1290
#, python-format
msgid "Invalid action !"
-msgstr ""
+msgstr "Nepravilno dejanje!"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Extra Info"
+msgstr "Dodatne informacije"
#. module: sale
#: field:sale.order,pricelist_id:0
@@ -631,18 +726,26 @@ msgstr "Cenik"
#: view:sale.report:0
#: field:sale.report,product_uom_qty:0
msgid "# of Qty"
+msgstr "# od Kos"
+
+#. module: sale
+#: code:addons/sale/sale.py:1314
+#, python-format
+msgid "Hour"
msgstr ""
#. module: sale
#: view:sale.order:0
msgid "Order Date"
-msgstr ""
+msgstr "Datum naročila"
#. module: sale
#: view:sale.order.line:0
+#: view:sale.report:0
#: field:sale.report,shipped:0
+#: field:sale.report,shipped_qty_1:0
msgid "Shipped"
-msgstr ""
+msgstr "Poslano"
#. module: sale
#: model:ir.actions.act_window,name:sale.action_order_tree5
@@ -650,25 +753,39 @@ msgid "All Quotations"
msgstr "Vse ponudbe"
#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Invoice On Order After Delivery"
+#: view:sale.config.picking_policy:0
+msgid "Options"
msgstr ""
#. module: sale
#: selection:sale.report,month:0
msgid "September"
+msgstr "September"
+
+#. module: sale
+#: code:addons/sale/sale.py:632
+#, python-format
+msgid "You cannot confirm a sale order which has no line."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:1246
+#, python-format
+msgid ""
+"You have to select a pricelist or a customer in the sales form !\n"
+"Please set one before choosing a product."
msgstr ""
#. module: sale
#: view:sale.report:0
#: field:sale.report,categ_id:0
msgid "Category of Product"
-msgstr ""
+msgstr "Kategorija artiklov"
#. module: sale
#: report:sale.order:0
msgid "Taxes :"
-msgstr ""
+msgstr "Davki :"
#. module: sale
#: view:sale.order:0
@@ -676,11 +793,6 @@ msgid "Stock Moves"
msgstr "Premiki zaloge"
#. module: sale
-#: view:sale.report:0
-msgid " Year "
-msgstr ""
-
-#. module: sale
#: field:sale.order,state:0
#: field:sale.report,state:0
msgid "Order State"
@@ -690,23 +802,23 @@ msgstr "Stanje naloga"
#: view:sale.make.invoice:0
#: view:sale.order.line.make.invoice:0
msgid "Do you really want to create the invoice(s) ?"
-msgstr ""
+msgstr "Ali res želite ustvariti račun(e) ?"
#. module: sale
#: view:sale.report:0
msgid "Sales By Month"
-msgstr ""
+msgstr "Prodaja po mesecih"
#. module: sale
-#: code:addons/sale/sale.py:970
+#: code:addons/sale/sale.py:1065
#, python-format
msgid "Could not cancel sales order line!"
-msgstr ""
+msgstr "Ni bilo mogoče preklicati prodaje!"
#. module: sale
#: field:res.company,security_lead:0
msgid "Security Days"
-msgstr ""
+msgstr "Varnostni Dnevi"
#. module: sale
#: model:process.transition,name:sale.process_transition_saleorderprocurement0
@@ -716,7 +828,7 @@ msgstr ""
#. module: sale
#: view:sale.order:0
msgid "Create Final Invoice"
-msgstr ""
+msgstr "Ustvari končno fakturo"
#. module: sale
#: field:sale.order,partner_shipping_id:0
@@ -731,51 +843,29 @@ msgid ""
msgstr ""
#. module: sale
-#: view:sale.report:0
-msgid "Extended Filters..."
+#: field:sale.order,date_order:0
+msgid "Date"
msgstr ""
#. module: sale
-#: model:ir.module.module,description:sale.module_meta_information
-msgid ""
-"\n"
-" The base module to manage quotations and sales orders.\n"
-"\n"
-" * Workflow with validation steps:\n"
-" - Quotation -> Sales order -> Invoice\n"
-" * Invoicing methods:\n"
-" - Invoice on order (before or after shipping)\n"
-" - Invoice on delivery\n"
-" - Invoice on timesheets\n"
-" - Advance invoice\n"
-" * Partners preferences (shipping, invoicing, incoterm, ...)\n"
-" * Products stocks and prices\n"
-" * Delivery methods:\n"
-" - all at once, multi-parcel\n"
-" - delivery costs\n"
-" * Dashboard for salesman that includes:\n"
-" * Your open quotations\n"
-" * Top 10 sales of the month\n"
-" * Cases statistics\n"
-" * Graph of sales by product\n"
-" * Graph of cases of the month\n"
-" "
+#: view:sale.report:0
+msgid "Extended Filters..."
msgstr ""
#. module: sale
-#: model:ir.model,name:sale.model_sale_shop
-#: view:sale.shop:0
-msgid "Sales Shop"
-msgstr ""
+#: selection:sale.order.line,state:0
+msgid "Exception"
+msgstr "Izjema"
#. module: sale
#: model:ir.model,name:sale.model_res_company
msgid "Companies"
-msgstr ""
+msgstr "Podjetja"
#. module: sale
-#: selection:sale.report,month:0
-msgid "November"
+#: code:addons/sale/sale.py:1259
+#, python-format
+msgid "No valid pricelist line found ! :"
msgstr ""
#. module: sale
@@ -784,8 +874,8 @@ msgid "History"
msgstr "Zgodovina"
#. module: sale
-#: field:sale.config.picking_policy,picking_policy:0
-msgid "Picking Default Policy"
+#: selection:sale.order,order_policy:0
+msgid "Invoice on order after delivery"
msgstr ""
#. module: sale
@@ -805,16 +895,15 @@ msgstr "Vaš sklic"
#: help:sale.order,partner_order_id:0
msgid ""
"The name and address of the contact who requested the order or quotation."
-msgstr ""
+msgstr "Ime in naslov kontaktne osebe, ki zahteva naročilo ali ponudbo."
#. module: sale
-#: code:addons/sale/sale.py:966
-#, python-format
-msgid "You cannot cancel a sales order line that has already been invoiced !"
+#: help:res.company,security_lead:0
+msgid ""
+"This is the days added to what you promise to customers for security purpose"
msgstr ""
#. module: sale
-#: view:sale.order:0
#: view:sale.order.line:0
msgid "Qty"
msgstr "Kol."
@@ -822,6 +911,11 @@ msgstr "Kol."
#. module: sale
#: view:sale.order:0
msgid "References"
+msgstr "Reference"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "My Sales Order Lines"
msgstr ""
#. module: sale
@@ -836,13 +930,8 @@ msgid "Cancel"
msgstr "Prekliči"
#. module: sale
-#: field:sale.installer,sale_order_dates:0
-msgid "Sales Order Dates"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order.line,state:0
-msgid "Exception"
+#: sql_constraint:sale.order:0
+msgid "Order Reference must be unique per Company!"
msgstr ""
#. module: sale
@@ -855,24 +944,24 @@ msgid "Create Invoice"
msgstr "Ustvari račun"
#. module: sale
-#: field:sale.installer,sale_margin:0
-msgid "Margins in Sales Orders"
-msgstr ""
-
-#. module: sale
#: view:sale.order:0
msgid "Total Tax Excluded"
+msgstr "Davek ni vključen"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Order reference"
msgstr ""
#. module: sale
-#: view:sale.order:0
-msgid "Compute"
-msgstr "Izračunaj"
+#: view:sale.open.invoice:0
+msgid "You invoice has been successfully created!"
+msgstr ""
#. module: sale
#: view:sale.report:0
msgid "Sales by Partner"
-msgstr ""
+msgstr "Prodaja po Partnerju"
#. module: sale
#: field:sale.order,partner_order_id:0
@@ -883,26 +972,23 @@ msgstr "Stik za naročilo"
#: model:ir.actions.act_window,name:sale.action_view_sale_open_invoice
#: view:sale.open.invoice:0
msgid "Open Invoice"
-msgstr ""
+msgstr "Odpri račun"
#. module: sale
-#: report:sale.order:0
-#: view:sale.order.line:0
-msgid "Price"
-msgstr "Cena"
+#: model:ir.actions.server,name:sale.ir_actions_server_edi_sale
+msgid "Auto-email confirmed sale orders"
+msgstr ""
#. module: sale
-#: model:ir.actions.act_window,name:sale.action_sale_installer
-#: view:sale.config.picking_policy:0
-#: view:sale.installer:0
-msgid "Sales Application Configuration"
+#: code:addons/sale/sale.py:413
+#, python-format
+msgid "There is no sales journal defined for this company: \"%s\" (id:%d)"
msgstr ""
#. module: sale
-#: view:sale.report:0
-#: field:sale.report,price_total:0
-msgid "Total Price"
-msgstr "Skupna cena"
+#: model:process.transition.action,name:sale.process_transition_action_forceassignation0
+msgid "Force Assignation"
+msgstr ""
#. module: sale
#: selection:sale.order.line,type:0
@@ -912,6 +998,11 @@ msgstr "na nalogu"
#. module: sale
#: model:process.node,note:sale.process_node_invoiceafterdelivery0
msgid "Based on the shipped or on the ordered quantities."
+msgstr "Na podlagi poslane ali naročene količine."
+
+#. module: sale
+#: selection:sale.order,picking_policy:0
+msgid "Deliver all products at once"
msgstr ""
#. module: sale
@@ -933,7 +1024,7 @@ msgstr "Naslov za odpremo:"
#: view:board.board:0
#: model:ir.actions.act_window,name:sale.action_sales_by_partner
msgid "Sales per Customer in last 90 days"
-msgstr ""
+msgstr "Prodaja po stranki v zadnjih 90 dneh"
#. module: sale
#: model:process.node,note:sale.process_node_quotation0
@@ -943,41 +1034,48 @@ msgstr ""
#. module: sale
#: model:process.transition,name:sale.process_transition_deliver0
msgid "Create Delivery Order"
+msgstr "Ustvari nalog za dostavo"
+
+#. module: sale
+#: code:addons/sale/sale.py:1290
+#, python-format
+msgid "Cannot delete a sales order line which is in state '%s'!"
msgstr ""
#. module: sale
-#: field:sale.installer,delivery:0
-msgid "Delivery Costs"
+#: view:sale.order:0
+msgid "Qty(UoS)"
msgstr ""
#. module: sale
#: view:sale.order:0
msgid "Total Tax Included"
-msgstr ""
+msgstr "Davek vključen"
#. module: sale
#: model:process.transition,name:sale.process_transition_packing0
msgid "Create Pick List"
-msgstr ""
+msgstr "Ustvari Prevzemni Seznam"
#. module: sale
#: view:sale.report:0
-msgid "Sales by Product Category"
+msgid "Ordered date of the sales order"
msgstr ""
#. module: sale
-#: selection:sale.order,picking_policy:0
-msgid "Partial Delivery"
-msgstr ""
+#: view:sale.report:0
+msgid "Sales by Product Category"
+msgstr "Prodaja po Produktnih Skupinah"
#. module: sale
#: model:process.transition,name:sale.process_transition_confirmquotation0
msgid "Confirm Quotation"
-msgstr ""
+msgstr "Potrdi Ponudbo"
#. module: sale
-#: help:sale.order,origin:0
-msgid "Reference of the document that generated this sales order request."
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:63
+#, python-format
+msgid "Error"
msgstr ""
#. module: sale
@@ -985,7 +1083,7 @@ msgstr ""
#: view:sale.order.line:0
#: view:sale.report:0
msgid "Group By..."
-msgstr ""
+msgstr "Združi po ..."
#. module: sale
#: view:sale.order:0
@@ -1010,20 +1108,14 @@ msgid "Procurement Method"
msgstr ""
#. module: sale
-#: view:sale.config.picking_policy:0
-#: view:sale.installer:0
-msgid "title"
-msgstr ""
-
-#. module: sale
#: model:process.node,name:sale.process_node_packinglist0
msgid "Pick List"
msgstr ""
#. module: sale
#: view:sale.order:0
-msgid "Order date"
-msgstr ""
+msgid "Set to Draft"
+msgstr "Preklopi v pripravo"
#. module: sale
#: model:process.node,note:sale.process_node_packinglist0
@@ -1031,9 +1123,88 @@ msgid "Document of the move to the output or to the customer."
msgstr ""
#. module: sale
+#: model:email.template,body_text:sale.email_template_edi_sale
+msgid ""
+"\n"
+"Hello${object.partner_order_id.name and ' ' or "
+"''}${object.partner_order_id.name or ''},\n"
+"\n"
+"Here is your order confirmation for ${object.partner_id.name}:\n"
+" | Order number: *${object.name}*\n"
+" | Order total: *${object.amount_total} "
+"${object.pricelist_id.currency_id.name}*\n"
+" | Order date: ${object.date_order}\n"
+" % if object.origin:\n"
+" | Order reference: ${object.origin}\n"
+" % endif\n"
+" % if object.client_order_ref:\n"
+" | Your reference: ${object.client_order_ref}<br />\n"
+" % endif\n"
+" | Your contact: ${object.user_id.name} ${object.user_id.user_email "
+"and '<%s>'%(object.user_id.user_email) or ''}\n"
+"\n"
+"You can view the order confirmation, download it and even pay online using "
+"the following link:\n"
+" ${ctx.get('edi_web_url_view') or 'n/a'}\n"
+"\n"
+"% if object.order_policy in ('prepaid','manual') and "
+"object.company_id.paypal_account:\n"
+"<% \n"
+"comp_name = quote(object.company_id.name)\n"
+"order_name = quote(object.name)\n"
+"paypal_account = quote(object.company_id.paypal_account)\n"
+"order_amount = quote(str(object.amount_total))\n"
+"cur_name = quote(object.pricelist_id.currency_id.name)\n"
+"paypal_url = \"https://www.paypal.com/cgi-"
+"bin/webscr?cmd=_xclick&business=%s&item_name=%s%%20Order%%20%s&invoice=%s&amo"
+"unt=%s\" \\\n"
+" "
+"\"&currency_code=%s&button_subtype=services&no_note=1&bn=OpenERP_Order_PayNow"
+"_%s\" % \\\n"
+" "
+"(paypal_account,comp_name,order_name,order_name,order_amount,cur_name,cur_nam"
+"e)\n"
+"%>\n"
+"It is also possible to directly pay with Paypal:\n"
+" ${paypal_url}\n"
+"% endif\n"
+"\n"
+"If you have any question, do not hesitate to contact us.\n"
+"\n"
+"\n"
+"Thank you for choosing ${object.company_id.name}!\n"
+"\n"
+"\n"
+"--\n"
+"${object.user_id.name} ${object.user_id.user_email and "
+"'<%s>'%(object.user_id.user_email) or ''}\n"
+"${object.company_id.name}\n"
+"% if object.company_id.street:\n"
+"${object.company_id.street or ''}\n"
+"% endif\n"
+"% if object.company_id.street2:\n"
+"${object.company_id.street2}\n"
+"% endif\n"
+"% if object.company_id.city or object.company_id.zip:\n"
+"${object.company_id.zip or ''} ${object.company_id.city or ''}\n"
+"% endif\n"
+"% if object.company_id.country_id:\n"
+"${object.company_id.state_id and ('%s, ' % object.company_id.state_id.name) "
+"or ''} ${object.company_id.country_id.name or ''}\n"
+"% endif\n"
+"% if object.company_id.phone:\n"
+"Phone: ${object.company_id.phone}\n"
+"% endif\n"
+"% if object.company_id.website:\n"
+"${object.company_id.website or ''}\n"
+"% endif\n"
+" "
+msgstr ""
+
+#. module: sale
#: model:process.transition.action,name:sale.process_transition_action_validate0
msgid "Validate"
-msgstr ""
+msgstr "Potrdi"
#. module: sale
#: view:sale.order:0
@@ -1053,34 +1224,42 @@ msgid "Taxes"
msgstr "Davki"
#. module: sale
-#: field:sale.order,order_policy:0
-msgid "Shipping Policy"
-msgstr "Pravilnik odpreme"
+#: view:sale.order:0
+msgid "Sales Order ready to be invoiced"
+msgstr ""
#. module: sale
#: help:sale.order,create_date:0
msgid "Date on which sales order is created."
-msgstr ""
+msgstr "Datum ko je prodajni dokument kreiran"
#. module: sale
#: model:ir.model,name:sale.model_stock_move
msgid "Stock Move"
-msgstr ""
+msgstr "Prenos zaloge"
#. module: sale
#: view:sale.make.invoice:0
#: view:sale.order.line.make.invoice:0
msgid "Create Invoices"
-msgstr ""
+msgstr "Izdelaj račune"
#. module: sale
-#: view:sale.order:0
-msgid "Extra Info"
-msgstr "Dodatne informacije"
+#: view:sale.report:0
+msgid "Sales order created in current month"
+msgstr ""
#. module: sale
#: report:sale.order:0
msgid "Fax :"
+msgstr "Faks:"
+
+#. module: sale
+#: help:sale.order.line,type:0
+msgid ""
+"If 'on order', it triggers a procurement when the sale order is confirmed to "
+"create a task, purchase order or manufacturing order linked to this sale "
+"order line."
msgstr ""
#. module: sale
@@ -1089,6 +1268,11 @@ msgid "Advance Amount"
msgstr ""
#. module: sale
+#: field:sale.config.picking_policy,charge_delivery:0
+msgid "Do you charge the delivery?"
+msgstr ""
+
+#. module: sale
#: selection:sale.order,invoice_quantity:0
msgid "Shipped Quantities"
msgstr "Odpremljene količine"
@@ -1099,28 +1283,48 @@ msgid "Invoice Based on Sales Orders"
msgstr ""
#. module: sale
+#: code:addons/sale/sale.py:331
+#, python-format
+msgid ""
+"If you change the pricelist of this order (and eventually the currency), "
+"prices of existing order lines will not be updated."
+msgstr ""
+
+#. module: sale
#: model:ir.model,name:sale.model_stock_picking
msgid "Picking List"
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:387
-#: code:addons/sale/sale.py:920
-#: code:addons/sale/sale.py:938
+#: code:addons/sale/sale.py:412
+#: code:addons/sale/sale.py:503
+#: code:addons/sale/sale.py:632
+#: code:addons/sale/sale.py:1015
+#: code:addons/sale/sale.py:1033
#, python-format
msgid "Error !"
-msgstr ""
+msgstr "Napaka !"
#. module: sale
-#: code:addons/sale/sale.py:570
+#: code:addons/sale/sale.py:603
#, python-format
msgid "Could not cancel sales order !"
+msgstr "Ni bilo mogoče preklicati prodajnega naročila!"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Qty(UoM)"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered Year of the sales order"
msgstr ""
#. module: sale
#: selection:sale.report,month:0
msgid "July"
-msgstr ""
+msgstr "Julij"
#. module: sale
#: field:sale.order.line,procurement_id:0
@@ -1134,65 +1338,58 @@ msgid "Shipping Exception"
msgstr "Izjema pri odpremi"
#. module: sale
-#: field:sale.make.invoice,grouped:0
-msgid "Group the invoices"
-msgstr "Združi račune"
-
-#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Shipping & Manual Invoice"
-msgstr "Odprema in ročna izdaja računa"
-
-#. module: sale
-#: code:addons/sale/sale.py:1051
+#: code:addons/sale/sale.py:1143
#, python-format
-msgid "Picking Information !"
+msgid "Picking Information ! : "
msgstr ""
#. module: sale
-#: view:sale.report:0
-#: field:sale.report,month:0
-msgid "Month"
-msgstr "Mesec"
+#: field:sale.make.invoice,grouped:0
+msgid "Group the invoices"
+msgstr "Združi račune"
#. module: sale
-#: model:ir.module.module,shortdesc:sale.module_meta_information
-msgid "Sales Management"
-msgstr "Upravljanje prodaje"
+#: field:sale.order,order_policy:0
+msgid "Invoice Policy"
+msgstr ""
#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Invoice From The Picking"
+#: model:ir.actions.act_window,name:sale.action_config_picking_policy
+#: view:sale.config.picking_policy:0
+msgid "Setup your Invoicing Method"
msgstr ""
#. module: sale
#: model:process.node,note:sale.process_node_invoice0
msgid "To be reviewed by the accountant."
-msgstr ""
+msgstr "Za pregledat s strani računovodstva."
#. module: sale
#: view:sale.report:0
-#: field:sale.report,uom_name:0
msgid "Reference UoM"
msgstr ""
#. module: sale
+#: view:sale.config.picking_policy:0
+msgid ""
+"This tool will help you to install the right module and configure the system "
+"according to the method you use to invoice your customers."
+msgstr ""
+
+#. module: sale
#: model:ir.model,name:sale.model_sale_order_line_make_invoice
msgid "Sale OrderLine Make_invoice"
msgstr ""
#. module: sale
-#: help:sale.config.picking_policy,step:0
-msgid ""
-"By default, OpenERP is able to manage complex routing and paths of products "
-"in your warehouse and partner locations. This will configure the most common "
-"and simple methods to deliver products to the customer in one or two "
-"operations by the worker."
-msgstr ""
+#: selection:sale.order,state:0
+#: selection:sale.report,state:0
+msgid "Invoice Exception"
+msgstr "Izjema računa"
#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_tree
-msgid "Old Quotations"
+#: model:process.node,note:sale.process_node_saleorder0
+msgid "Drives procurement and invoicing"
msgstr ""
#. module: sale
@@ -1205,9 +1402,25 @@ msgstr "Plačano"
#: model:ir.ui.menu,name:sale.menu_report_product_all
#: view:sale.report:0
msgid "Sales Analysis"
+msgstr "Prodajne Analize"
+
+#. module: sale
+#: code:addons/sale/sale.py:1138
+#, python-format
+msgid ""
+"You selected a quantity of %d Units.\n"
+"But it's not compatible with the selected packaging.\n"
+"Here is a proposition of quantities according to the packaging:\n"
+"EAN: %s Quantity: %s Type of ul: %s"
msgstr ""
#. module: sale
+#: view:sale.order:0
+msgid "Recreate Packing"
+msgstr "Ponovno pakiranje"
+
+#. module: sale
+#: view:sale.order:0
#: field:sale.order.line,property_ids:0
msgid "Properties"
msgstr "Karakteristike"
@@ -1234,7 +1447,17 @@ msgid ""
msgstr ""
#. module: sale
-#: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
+#: view:sale.order.line:0
+msgid "Confirmed sale order lines, not yet delivered"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:473
+#, python-format
+msgid "Customer Invoices"
+msgstr ""
+
+#. module: sale
#: model:process.process,name:sale.process_process_salesprocess0
#: view:sale.order:0
#: view:sale.report:0
@@ -1256,38 +1479,30 @@ msgid "Done"
msgstr "Opravljeno"
#. module: sale
-#: model:ir.model,name:sale.model_sale_installer
-msgid "sale.installer"
-msgstr ""
-
-#. module: sale
#: model:process.node,name:sale.process_node_invoice0
#: model:process.node,name:sale.process_node_invoiceafterdelivery0
msgid "Invoice"
msgstr "Račun"
#. module: sale
-#: code:addons/sale/sale.py:1014
+#: code:addons/sale/sale.py:1158
#, python-format
msgid ""
"You have to select a customer in the sales form !\n"
"Please set one customer before choosing a product."
msgstr ""
-
-#. module: sale
-#: selection:sale.config.picking_policy,step:0
-msgid "Picking List & Delivery Order"
-msgstr ""
+"Morate izbrati stranko v prodajnem nalogu !\n"
+"Prosim izberi stranko pred izbiro artikla."
#. module: sale
#: field:sale.order,origin:0
msgid "Source Document"
-msgstr ""
+msgstr "Izvorni dokument"
#. module: sale
#: view:sale.order.line:0
msgid "To Do"
-msgstr ""
+msgstr "Za narediti"
#. module: sale
#: field:sale.order,picking_policy:0
@@ -1302,10 +1517,10 @@ msgstr ""
#. module: sale
#: help:sale.order,amount_untaxed:0
msgid "The amount without tax."
-msgstr ""
+msgstr "Znesek brez davka."
#. module: sale
-#: code:addons/sale/sale.py:571
+#: code:addons/sale/sale.py:604
#, python-format
msgid "You must first cancel all picking attached to this sales order."
msgstr ""
@@ -1313,12 +1528,18 @@ msgstr ""
#. module: sale
#: model:ir.model,name:sale.model_sale_advance_payment_inv
msgid "Sales Advance Payment Invoice"
-msgstr ""
+msgstr "Prodaja Predplačilo Računa"
#. module: sale
-#: field:sale.order,incoterm:0
-msgid "Incoterm"
-msgstr "Incoterm"
+#: view:sale.report:0
+#: field:sale.report,month:0
+msgid "Month"
+msgstr "Mesec"
+
+#. module: sale
+#: model:email.template,subject:sale.email_template_edi_sale
+msgid "${object.company_id.name} Order (Ref ${object.name or 'n/a' })"
+msgstr ""
#. module: sale
#: view:sale.order.line:0
@@ -1329,14 +1550,9 @@ msgid "Product"
msgstr "Proizvod"
#. module: sale
-#: model:ir.ui.menu,name:sale.menu_invoiced
-msgid "Invoicing"
-msgstr ""
-
-#. module: sale
#: model:process.transition.action,name:sale.process_transition_action_cancelassignation0
msgid "Cancel Assignation"
-msgstr ""
+msgstr "Prekliči Dodelitev"
#. module: sale
#: model:ir.model,name:sale.model_sale_config_picking_policy
@@ -1344,14 +1560,10 @@ msgid "sale.config.picking_policy"
msgstr "sale.config.picking_policy"
#. module: sale
-#: help:sale.order,state:0
-msgid ""
-"Gives the state of the quotation or sales order. \n"
-"The exception state is automatically set when a cancel operation occurs in "
-"the invoice validation (Invoice Exception) or in the picking list process "
-"(Shipping Exception). \n"
-"The 'Waiting Schedule' state is set when the invoice is confirmed but "
-"waiting for the scheduler to run on the date 'Ordered Date'."
+#: view:account.invoice.report:0
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_turnover_by_month
+msgid "Monthly Turnover"
msgstr ""
#. module: sale
@@ -1370,7 +1582,6 @@ msgid "Product UoS"
msgstr ""
#. module: sale
-#: selection:sale.order,state:0
#: selection:sale.report,state:0
msgid "Manual In Progress"
msgstr ""
@@ -1391,7 +1602,8 @@ msgid "Order"
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:921
+#: code:addons/sale/sale.py:1016
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:71
#, python-format
msgid "There is no income account defined for this product: \"%s\" (id:%d)"
msgstr ""
@@ -1411,7 +1623,7 @@ msgid ""
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:1116
+#: code:addons/sale/sale.py:1238
#, python-format
msgid ""
"You plan to sell %.2f %s but you only have %.2f %s available !\n"
@@ -1440,10 +1652,10 @@ msgid "Total"
msgstr "Skupaj"
#. module: sale
-#: code:addons/sale/sale.py:388
-#, python-format
-msgid "There is no sales journal defined for this company: \"%s\" (id:%d)"
-msgstr ""
+#: report:sale.order:0
+#: view:sale.order.line:0
+msgid "Price"
+msgstr "Cena"
#. module: sale
#: model:process.transition,note:sale.process_transition_deliver0
@@ -1454,9 +1666,14 @@ msgid ""
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:1165
-#, python-format
-msgid "Cannot delete a sales order line which is %s !"
+#: selection:sale.order,order_policy:0
+msgid "Pay before delivery"
+msgstr ""
+
+#. module: sale
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.open_board_sales
+msgid "Sales Dashboard"
msgstr ""
#. module: sale
@@ -1468,6 +1685,7 @@ msgstr ""
#. module: sale
#: view:sale.order:0
+#: selection:sale.order,state:0
#: view:sale.order.line:0
msgid "To Invoice"
msgstr ""
@@ -1478,6 +1696,11 @@ msgid "Date on which sales order is confirmed."
msgstr ""
#. module: sale
+#: field:sale.order,project_id:0
+msgid "Contract/Analytic Account"
+msgstr ""
+
+#. module: sale
#: field:sale.order,company_id:0
#: field:sale.order.line,company_id:0
#: view:sale.report:0
@@ -1497,22 +1720,17 @@ msgid "The amount to be invoiced in advance."
msgstr ""
#. module: sale
-#: selection:sale.order,state:0
-#: selection:sale.report,state:0
-msgid "Invoice Exception"
-msgstr "Izjema računa"
-
-#. module: sale
-#: help:sale.order,picking_ids:0
+#: code:addons/sale/sale.py:1256
+#, python-format
msgid ""
-"This is a list of picking that has been generated for this sales order."
+"Couldn't find a pricelist line matching this product and quantity.\n"
+"You have to change either the product, the quantity or the pricelist."
msgstr ""
#. module: sale
-#: help:sale.installer,sale_margin:0
+#: help:sale.order,picking_ids:0
msgid ""
-"Gives the margin of profitability by calculating the difference between Unit "
-"Price and Cost Price."
+"This is a list of picking that has been generated for this sales order."
msgstr ""
#. module: sale
@@ -1534,6 +1752,11 @@ msgid "Cancelled"
msgstr ""
#. module: sale
+#: view:sale.order.line:0
+msgid "Sales Order Lines related to a Sales Order of mine"
+msgstr ""
+
+#. module: sale
#: model:ir.actions.act_window,name:sale.action_shop_form
#: model:ir.ui.menu,name:sale.menu_action_shop_form
#: field:sale.order,shop_id:0
@@ -1543,17 +1766,12 @@ msgid "Shop"
msgstr "Trgovina"
#. module: sale
-#: view:sale.report:0
-msgid " Month "
-msgstr ""
-
-#. module: sale
#: field:sale.report,date_confirm:0
msgid "Date Confirm"
msgstr ""
#. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:111
+#: code:addons/sale/wizard/sale_line_invoice.py:113
#, python-format
msgid "Warning"
msgstr ""
@@ -1565,17 +1783,6 @@ msgid "Sales by Month"
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:1045
-#, python-format
-msgid ""
-"You selected a quantity of %d Units.\n"
-"But it's not compatible with the selected packaging.\n"
-"Here is a proposition of quantities according to the packaging:\n"
-"\n"
-"EAN: %s Quantity: %s Type of ul: %s"
-msgstr ""
-
-#. module: sale
#: model:ir.model,name:sale.model_sale_order
#: model:process.node,name:sale.process_node_order0
#: model:process.node,name:sale.process_node_saleorder0
@@ -1591,6 +1798,11 @@ msgid "Quantity (UoS)"
msgstr ""
#. module: sale
+#: view:sale.order.line:0
+msgid "Sale Order Lines that are in 'done' state"
+msgstr ""
+
+#. module: sale
#: model:process.transition,note:sale.process_transition_packing0
msgid ""
"The Pick List form is created as soon as the sales order is confirmed, in "
@@ -1605,6 +1817,11 @@ msgid "Confirmed"
msgstr "Potrjeno"
#. module: sale
+#: field:sale.config.picking_policy,order_policy:0
+msgid "Main Method Based On"
+msgstr ""
+
+#. module: sale
#: model:process.transition.action,name:sale.process_transition_action_confirm0
msgid "Confirm"
msgstr "Potrdi"
@@ -1627,6 +1844,7 @@ msgid "Invoice Lines"
msgstr "Postavke računa"
#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_product_tree
#: view:sale.order:0
#: view:sale.order.line:0
msgid "Sales Order Lines"
@@ -1643,30 +1861,18 @@ msgid "Configuration"
msgstr "Konfiguracija"
#. module: sale
-#: selection:sale.order,picking_policy:0
-msgid "Complete Delivery"
+#: code:addons/sale/edi/sale_order.py:146
+#, python-format
+msgid "EDI Pricelist (%s)"
msgstr ""
#. module: sale
#: view:sale.report:0
-msgid " Month-1 "
-msgstr ""
-
-#. module: sale
-#: help:sale.config.picking_policy,picking_policy:0
-msgid ""
-"The Shipping Policy is used to configure per order if you want to deliver as "
-"soon as possible when one product is available or you wait that all products "
-"are available.."
+msgid "Sales order created in current year"
msgstr ""
#. module: sale
-#: selection:sale.report,month:0
-msgid "August"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:111
+#: code:addons/sale/wizard/sale_line_invoice.py:113
#, python-format
msgid ""
"Invoice cannot be created for this Sales Order Line due to one of the "
@@ -1676,6 +1882,11 @@ msgid ""
msgstr ""
#. module: sale
+#: view:sale.order.line:0
+msgid "Sale order lines done"
+msgstr ""
+
+#. module: sale
#: field:sale.order.line,th_weight:0
msgid "Weight"
msgstr "Teža"
@@ -1694,7 +1905,6 @@ msgstr ""
#. module: sale
#: field:sale.config.picking_policy,config_logo:0
-#: field:sale.installer,config_logo:0
msgid "Image"
msgstr ""
@@ -1724,9 +1934,9 @@ msgid "Salesman"
msgstr "Prodajalec"
#. module: sale
-#: model:process.node,note:sale.process_node_saleorder0
-msgid "Drives procurement and invoicing"
-msgstr ""
+#: model:ir.actions.act_window,name:sale.action_order_tree
+msgid "Old Quotations"
+msgstr "Stare Ponudbe"
#. module: sale
#: field:sale.order,amount_untaxed:0
@@ -1734,7 +1944,7 @@ msgid "Untaxed Amount"
msgstr "Neobdavčen znesek"
#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:163
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:170
#: model:ir.actions.act_window,name:sale.action_view_sale_advance_payment_inv
#: view:sale.advance.payment.inv:0
#: view:sale.order:0
@@ -1743,7 +1953,7 @@ msgid "Advance Invoice"
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:591
+#: code:addons/sale/sale.py:624
#, python-format
msgid "The sales order '%s' has been cancelled."
msgstr ""
@@ -1778,19 +1988,19 @@ msgid "Packings"
msgstr ""
#. module: sale
-#: field:sale.config.picking_policy,progress:0
-#: field:sale.installer,progress:0
-msgid "Configuration Progress"
+#: view:sale.order.line:0
+msgid "Sale Order Lines ready to be invoiced"
msgstr ""
#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_product_tree
-msgid "Product sales"
-msgstr "Prodaja proizvodov"
+#: view:sale.report:0
+msgid "Sales order created in last month"
+msgstr ""
#. module: sale
-#: field:sale.order,date_order:0
-msgid "Ordered Date"
+#: model:ir.actions.act_window,name:sale.action_email_templates
+#: model:ir.ui.menu,name:sale.menu_email_templates
+msgid "Email Templates"
msgstr ""
#. module: sale
@@ -1801,14 +2011,15 @@ msgid "Sales Orders"
msgstr "Prodajni nalogi"
#. module: sale
-#: selection:sale.config.picking_policy,picking_policy:0
-msgid "Direct Delivery"
-msgstr "Direktna dostava"
+#: model:ir.model,name:sale.model_sale_shop
+#: view:sale.shop:0
+msgid "Sales Shop"
+msgstr "Prodajna Trgovina"
#. module: sale
-#: field:sale.installer,sale_journal:0
-msgid "Invoicing journals"
-msgstr ""
+#: selection:sale.report,month:0
+msgid "November"
+msgstr "November"
#. module: sale
#: field:sale.advance.payment.inv,product_id:0
@@ -1816,18 +2027,12 @@ msgid "Advance Product"
msgstr ""
#. module: sale
-#: view:sale.report:0
-#: field:sale.report,shipped_qty_1:0
-msgid "Shipped Qty"
-msgstr ""
-
-#. module: sale
-#: view:sale.open.invoice:0
-msgid "You invoice has been successfully created!"
-msgstr ""
+#: view:sale.order:0
+msgid "Compute"
+msgstr "Izračunaj"
#. module: sale
-#: code:addons/sale/sale.py:585
+#: code:addons/sale/sale.py:618
#, python-format
msgid "You must first cancel all invoices attached to this sales order."
msgstr ""
@@ -1838,24 +2043,13 @@ msgid "January"
msgstr ""
#. module: sale
-#: view:sale.installer:0
-msgid "Configure Your Sales Management Application"
-msgstr ""
-
-#. module: sale
#: model:ir.actions.act_window,name:sale.action_order_tree4
msgid "Sales Order in Progress"
msgstr "Prodajni nalogi v teku"
#. module: sale
-#: field:sale.installer,sale_layout:0
-msgid "Sales Order Layout Improvement"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:63
-#, python-format
-msgid "Error"
+#: help:sale.order,origin:0
+msgid "Reference of the document that generated this sales order request."
msgstr ""
#. module: sale
@@ -1865,6 +2059,11 @@ msgid "Commitment Delay"
msgstr ""
#. module: sale
+#: selection:sale.order,order_policy:0
+msgid "Deliver & invoice on demand"
+msgstr ""
+
+#. module: sale
#: model:process.node,note:sale.process_node_saleprocurement0
msgid ""
"One Procurement order for each sales order line and for each of the "
@@ -1887,13 +2086,12 @@ msgid "Confirmed sales order to invoice."
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:290
-#, python-format
-msgid "Cannot delete Sales Order(s) which are already confirmed !"
+#: view:sale.order:0
+msgid "Sales Order that haven't yet been confirmed"
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:316
+#: code:addons/sale/sale.py:322
#, python-format
msgid "The sales order '%s' has been set in draft state."
msgstr ""
@@ -1904,24 +2102,19 @@ msgid "from stock"
msgstr "iz zaloge"
#. module: sale
-#: field:sale.config.picking_policy,order_policy:0
-msgid "Shipping Default Policy"
-msgstr ""
-
-#. module: sale
#: view:sale.open.invoice:0
msgid "Close"
msgstr ""
#. module: sale
-#: field:sale.order,shipped:0
-msgid "Delivered"
+#: code:addons/sale/sale.py:1248
+#, python-format
+msgid "No Pricelist ! : "
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:1115
-#, python-format
-msgid "Not enough stock !"
+#: field:sale.order,shipped:0
+msgid "Delivered"
msgstr ""
#. module: sale
@@ -1930,11 +2123,6 @@ msgid "You must assign a production lot for this product"
msgstr ""
#. module: sale
-#: field:sale.order.line,sequence:0
-msgid "Layout Sequence"
-msgstr ""
-
-#. module: sale
#: model:ir.actions.act_window,help:sale.action_shop_form
msgid ""
"If you have more than one shop reselling your company products, you can "
@@ -1961,11 +2149,6 @@ msgid "May"
msgstr ""
#. module: sale
-#: help:sale.installer,sale_order_dates:0
-msgid "Adds commitment, requested and effective dates on Sales Orders."
-msgstr ""
-
-#. module: sale
#: view:sale.order:0
#: field:sale.order,partner_id:0
#: field:sale.order.line,order_partner_id:0
@@ -1973,23 +2156,11 @@ msgid "Customer"
msgstr "Kupec"
#. module: sale
-#: model:product.template,name:sale.advance_product_0_product_template
-msgid "Advance"
-msgstr ""
-
-#. module: sale
#: selection:sale.report,month:0
msgid "February"
msgstr ""
#. module: sale
-#: help:sale.installer,sale_journal:0
-msgid ""
-"Allows you to group and invoice your delivery orders according to different "
-"invoicing types: daily, weekly, etc."
-msgstr ""
-
-#. module: sale
#: selection:sale.report,month:0
msgid "April"
msgstr ""
@@ -2000,11 +2171,6 @@ msgid "Accounting"
msgstr ""
#. module: sale
-#: field:sale.config.picking_policy,step:0
-msgid "Steps To Deliver a Sales Order"
-msgstr ""
-
-#. module: sale
#: view:sale.order:0
#: view:sale.order.line:0
msgid "Search Sales Order"
@@ -2016,18 +2182,18 @@ msgid "Sales Order Requisition"
msgstr ""
#. module: sale
+#: code:addons/sale/sale.py:1242
+#, python-format
+msgid "Not enough stock ! : "
+msgstr ""
+
+#. module: sale
#: report:sale.order:0
#: field:sale.order,payment_term:0
msgid "Payment Term"
msgstr "Plačilni pogoj"
#. module: sale
-#: help:sale.installer,sale_layout:0
-msgid ""
-"Provides some features to improve the layout of the Sales Order reports."
-msgstr ""
-
-#. module: sale
#: model:ir.actions.act_window,help:sale.action_order_report_all
msgid ""
"This report performs analysis on your quotations and sales orders. Analysis "
@@ -2062,6 +2228,9 @@ msgstr ""
#~ msgid "Set Default"
#~ msgstr "Nastavi privzeto"
+#~ msgid "Sales Management"
+#~ msgstr "Upravljanje prodaje"
+
#~ msgid "Manual Designation"
#~ msgstr "Ročno označevanje"
@@ -2075,6 +2244,9 @@ msgstr ""
#~ "This is the list of picking list that have been generated for this invoice"
#~ msgstr "To je seznam prevzemnih listov, ki so bili narejeni za ta račun"
+#~ msgid "Shipping Policy"
+#~ msgstr "Pravilnik odpreme"
+
#~ msgid "Origin"
#~ msgstr "Izvor"
@@ -2129,9 +2301,6 @@ msgstr ""
#~ msgid "Sales Order To Be Invoiced"
#~ msgstr "Prodajni nalog za zaračunat"
-#~ msgid "My Quotations"
-#~ msgstr "Moje ponudbe"
-
#~ msgid "Canceled"
#~ msgstr "Stornirano"
@@ -2148,18 +2317,27 @@ msgstr ""
#~ msgid "Procurement Corrected"
#~ msgstr "Nabava popravljena"
+#~ msgid "Shipping & Manual Invoice"
+#~ msgstr "Odprema in ročna izdaja računa"
+
#~ msgid "Status"
#~ msgstr "Stanje"
#~ msgid "Packing Policy"
#~ msgstr "Pravilnik pakiranja"
+#~ msgid "Product sales"
+#~ msgstr "Prodaja proizvodov"
+
#~ msgid "Our Salesman"
#~ msgstr "Naš prodajalec"
#~ msgid "Sale Order"
#~ msgstr "Prodajni nalog"
+#~ msgid "Direct Delivery"
+#~ msgstr "Direktna dostava"
+
#~ msgid "Sales order lines"
#~ msgstr "Postavke prodajnega naloga"
@@ -2233,3 +2411,43 @@ msgstr ""
#~ msgid "Invalid model name in the action definition."
#~ msgstr "Napačno ime modela v definiciji dejanja."
+
+#~ msgid "All at Once"
+#~ msgstr "Vse na enkrat"
+
+#~ msgid "Payment Before Delivery"
+#~ msgstr "Plačilo pred dobavo"
+
+#~ msgid "Configure Sales Order Logistics"
+#~ msgstr "Konfiguracija Logistike Prodajih Nalogov"
+
+#~ msgid "Configure"
+#~ msgstr "Nastavitve"
+
+#~ msgid "Margins in Sales Orders"
+#~ msgstr "Marža pri prodaji"
+
+#~ msgid " Year "
+#~ msgstr " Leto "
+
+#, python-format
+#~ msgid "You cannot cancel a sales order line that has already been invoiced !"
+#~ msgstr "Ne morete preklicati prodaje, ki je že bila fakturirana !"
+
+#~ msgid "Partial Delivery"
+#~ msgstr "Delna Dostava"
+
+#~ msgid "Delivery Costs"
+#~ msgstr "Stroški Dostave"
+
+#~ msgid "title"
+#~ msgstr "naslov"
+
+#~ msgid "Order date"
+#~ msgstr "Datum naročila"
+
+#~ msgid "sale.installer"
+#~ msgstr "prodaja.namestitev"
+
+#~ msgid "Invoicing"
+#~ msgstr "Izdajanje računov"
diff --git a/addons/sale/i18n/sq.po b/addons/sale/i18n/sq.po
index 77375c47fdc..0561da4612d 100644
--- a/addons/sale/i18n/sq.po
+++ b/addons/sale/i18n/sq.po
@@ -7,25 +7,32 @@ msgid ""
msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-01-11 11:16+0000\n"
+"POT-Creation-Date: 2011-12-22 18:43+0000\n"
"PO-Revision-Date: 2010-08-02 14:34+0000\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: Albanian <sq@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-05 05:16+0000\n"
-"X-Generator: Launchpad (build 14231)\n"
+"X-Launchpad-Export-Date: 2011-12-23 06:46+0000\n"
+"X-Generator: Launchpad (build 14560)\n"
#. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_sales_by_salesman
-msgid "Sales by Salesman in last 90 days"
+#: field:sale.config.picking_policy,timesheet:0
+msgid "Based on Timesheet"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid ""
+"Sale Order Lines that are confirmed, done or in exception state and haven't "
+"yet been invoiced"
msgstr ""
#. module: sale
-#: help:sale.installer,delivery:0
-msgid "Allows you to compute delivery costs on your quotations."
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_sales_by_salesman
+msgid "Sales by Salesman in last 90 days"
msgstr ""
#. module: sale
@@ -36,6 +43,11 @@ msgid ""
msgstr ""
#. module: sale
+#: view:sale.order:0
+msgid "UoS"
+msgstr ""
+
+#. module: sale
#: help:sale.order,partner_shipping_id:0
msgid "Shipping address for current sales order."
msgstr ""
@@ -59,22 +71,12 @@ msgid "Cancel Order"
msgstr ""
#. module: sale
-#: view:sale.config.picking_policy:0
-msgid "Configure Sales Order Logistics"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:603
+#: code:addons/sale/sale.py:638
#, python-format
msgid "The quotation '%s' has been converted to a sales order."
msgstr ""
#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Payment Before Delivery"
-msgstr ""
-
-#. module: sale
#: code:addons/sale/wizard/sale_make_invoice.py:42
#, python-format
msgid "Warning !"
@@ -91,12 +93,6 @@ msgid "Drives procurement orders for every sales order line."
msgstr ""
#. module: sale
-#: selection:sale.config.picking_policy,picking_policy:0
-msgid "All at Once"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,project_id:0
#: view:sale.report:0
#: field:sale.report,analytic_account_id:0
#: field:sale.shop,project_id:0
@@ -112,6 +108,15 @@ msgid ""
msgstr ""
#. module: sale
+#: code:addons/sale/sale.py:295
+#, python-format
+msgid ""
+"In order to delete a confirmed sale order, you must cancel it before ! To "
+"cancel a sale order, you must first cancel related picking or delivery "
+"orders."
+msgstr ""
+
+#. module: sale
#: model:process.node,name:sale.process_node_saleprocurement0
msgid "Procurement Order"
msgstr ""
@@ -123,6 +128,11 @@ msgid "Partner"
msgstr ""
#. module: sale
+#: selection:sale.order,order_policy:0
+msgid "Invoice based on deliveries"
+msgstr ""
+
+#. module: sale
#: view:sale.order:0
msgid "Order Line"
msgstr ""
@@ -155,8 +165,13 @@ msgid "Default Payment Term"
msgstr ""
#. module: sale
-#: model:ir.actions.act_window,name:sale.action_config_picking_policy
-msgid "Configure Picking Policy for Sales Order"
+#: field:sale.config.picking_policy,deli_orders:0
+msgid "Based on Delivery Orders"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.picking_policy,time_unit:0
+msgid "Main Working Time Unit"
msgstr ""
#. module: sale
@@ -173,8 +188,9 @@ msgid "Disc.(%)"
msgstr ""
#. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_forceassignation0
-msgid "Force Assignation"
+#: view:sale.report:0
+#: field:sale.report,price_total:0
+msgid "Total Price"
msgstr ""
#. module: sale
@@ -183,6 +199,11 @@ msgid "Check the box to group the invoices for the same customers"
msgstr ""
#. module: sale
+#: view:sale.order:0
+msgid "My Sale Orders"
+msgstr ""
+
+#. module: sale
#: selection:sale.order,invoice_quantity:0
msgid "Ordered Quantities"
msgstr ""
@@ -221,13 +242,24 @@ msgid ""
msgstr ""
#. module: sale
+#: field:sale.config.picking_policy,task_work:0
+msgid "Based on Tasks' Work"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
+msgid "Quotations and Sales"
+msgstr ""
+
+#. module: sale
#: model:ir.model,name:sale.model_sale_make_invoice
msgid "Sales Make Invoice"
msgstr ""
#. module: sale
-#: view:sale.order:0
-msgid "Recreate Packing"
+#: code:addons/sale/sale.py:330
+#, python-format
+msgid "Pricelist Warning!"
msgstr ""
#. module: sale
@@ -236,9 +268,9 @@ msgid "Discount (%)"
msgstr ""
#. module: sale
-#: help:res.company,security_lead:0
-msgid ""
-"This is the days added to what you promise to customers for security purpose"
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_quotation_for_sale
+msgid "My Quotations"
msgstr ""
#. module: sale
@@ -264,7 +296,22 @@ msgid "Shop Name"
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:1014
+#: help:sale.order,order_policy:0
+msgid ""
+"The Invoice Policy is used to synchronise invoice and delivery operations.\n"
+" - The 'Pay before delivery' choice will first generate the invoice and "
+"then generate the picking order after the payment of this invoice.\n"
+" - The 'Deliver & Invoice on demand' will create the picking order directly "
+"and wait for the user to manually click on the 'Invoice' button to generate "
+"the draft invoice based on the sale order or the sale order lines.\n"
+" - The 'Invoice on order after delivery' choice will generate the draft "
+"invoice based on sales order after all picking lists have been finished.\n"
+" - The 'Invoice based on deliveries' choice is used to create an invoice "
+"during the picking process."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:1158
#, python-format
msgid "No Customer Defined !"
msgstr ""
@@ -275,8 +322,11 @@ msgid "Sales in Exception"
msgstr ""
#. module: sale
-#: view:sale.order:0
-msgid "Set to Draft"
+#: code:addons/sale/sale.py:1145
+#: code:addons/sale/sale.py:1264
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:70
+#, python-format
+msgid "Configuration Error !"
msgstr ""
#. module: sale
@@ -285,22 +335,7 @@ msgid "Conditions"
msgstr ""
#. module: sale
-#: help:sale.order,order_policy:0
-msgid ""
-"The Shipping Policy is used to synchronise invoice and delivery operations.\n"
-" - The 'Pay Before delivery' choice will first generate the invoice and "
-"then generate the picking order after the payment of this invoice.\n"
-" - The 'Shipping & Manual Invoice' will create the picking order directly "
-"and wait for the user to manually click on the 'Invoice' button to generate "
-"the draft invoice.\n"
-" - The 'Invoice On Order After Delivery' choice will generate the draft "
-"invoice based on sales order after all picking lists have been finished.\n"
-" - The 'Invoice From The Picking' choice is used to create an invoice "
-"during the picking process."
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:939
+#: code:addons/sale/sale.py:1034
#, python-format
msgid ""
"There is no income category account defined in default Properties for "
@@ -308,8 +343,8 @@ msgid ""
msgstr ""
#. module: sale
-#: view:sale.installer:0
-msgid "Configure"
+#: selection:sale.report,month:0
+msgid "August"
msgstr ""
#. module: sale
@@ -318,7 +353,7 @@ msgid "You try to assign a lot which is not from the same product"
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:620
+#: code:addons/sale/sale.py:655
#, python-format
msgid "invalid mode for test_state"
msgstr ""
@@ -329,7 +364,7 @@ msgid "June"
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:584
+#: code:addons/sale/sale.py:617
#, python-format
msgid "Could not cancel this sales order !"
msgstr ""
@@ -350,8 +385,12 @@ msgid "October"
msgstr ""
#. module: sale
+#: sql_constraint:stock.picking:0
+msgid "Reference must be unique per Company!"
+msgstr ""
+
+#. module: sale
#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_quotation_for_sale
#: view:sale.order:0
#: view:sale.report:0
msgid "Quotations"
@@ -363,11 +402,6 @@ msgid "Pricelist for current sales order."
msgstr ""
#. module: sale
-#: selection:sale.config.picking_policy,step:0
-msgid "Delivery Order Only"
-msgstr ""
-
-#. module: sale
#: report:sale.order:0
msgid "TVA :"
msgstr ""
@@ -392,6 +426,7 @@ msgstr ""
#. module: sale
#: view:sale.order:0
#: view:sale.order.line:0
+#: field:sale.report,product_uom:0
msgid "UoM"
msgstr ""
@@ -414,13 +449,19 @@ msgid ""
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:971
+#: code:addons/sale/sale.py:1061
+#, python-format
+msgid "You cannot cancel a sale order line that has already been invoiced!"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:1066
#, python-format
msgid "You must first cancel stock moves attached to this sales order line."
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:1042
+#: code:addons/sale/sale.py:1134
#, python-format
msgid "(n/a)"
msgstr ""
@@ -454,13 +495,35 @@ msgid "Notes"
msgstr ""
#. module: sale
+#: sql_constraint:res.company:0
+msgid "The company name must be unique !"
+msgstr ""
+
+#. module: sale
#: help:sale.order,partner_invoice_id:0
msgid "Invoice address for current sales order."
msgstr ""
#. module: sale
-#: view:sale.installer:0
-msgid "Enhance your core Sales Application with additional functionalities."
+#: view:sale.report:0
+msgid "Month-1"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered month of the sales order"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:504
+#, python-format
+msgid ""
+"You cannot group sales having different currencies for the same partner."
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,picking_policy:0
+msgid "Deliver each product when available"
msgstr ""
#. module: sale
@@ -480,13 +543,13 @@ msgid "Confirmation Date"
msgstr ""
#. module: sale
-#: field:sale.order.line,address_allotment_id:0
-msgid "Allotment Partner"
+#: field:sale.order,incoterm:0
+msgid "Incoterm"
msgstr ""
#. module: sale
-#: sql_constraint:sale.order:0
-msgid "Order Reference must be unique !"
+#: field:sale.order.line,address_allotment_id:0
+msgid "Allotment Partner"
msgstr ""
#. module: sale
@@ -495,6 +558,28 @@ msgid "March"
msgstr ""
#. module: sale
+#: constraint:stock.move:0
+msgid "You can not move products from or to a location of the type view."
+msgstr ""
+
+#. module: sale
+#: field:sale.config.picking_policy,sale_orders:0
+msgid "Based on Sales Orders"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,state:0
+msgid ""
+"Givwizard = self.browse(cr, uid, ids)[0]es the state of the quotation or "
+"sales order. \n"
+"The exception state is automatically set when a cancel operation occurs in "
+"the invoice validation (Invoice Exception) or in the picking list process "
+"(Shipping Exception). \n"
+"The 'Waiting Schedule' state is set when the invoice is confirmed but "
+"waiting for the scheduler to run on the order date."
+msgstr ""
+
+#. module: sale
#: help:sale.order,amount_total:0
msgid "The total amount."
msgstr ""
@@ -510,6 +595,11 @@ msgid "Invoice address :"
msgstr ""
#. module: sale
+#: field:sale.order.line,sequence:0
+msgid "Line Sequence"
+msgstr ""
+
+#. module: sale
#: model:process.transition,note:sale.process_transition_saleorderprocurement0
msgid ""
"For every sales order line, a procurement order is created to supply the "
@@ -556,11 +646,6 @@ msgid "Sales Order Line"
msgstr ""
#. module: sale
-#: view:sale.config.picking_policy:0
-msgid "Setup your sales workflow and default values."
-msgstr ""
-
-#. module: sale
#: field:sale.shop,warehouse_id:0
msgid "Warehouse"
msgstr ""
@@ -597,6 +682,11 @@ msgid "Creation Date"
msgstr ""
#. module: sale
+#: model:ir.ui.menu,name:sale.menu_sales_configuration_misc
+msgid "Miscellaneous"
+msgstr ""
+
+#. module: sale
#: model:ir.actions.act_window,name:sale.action_order_line_tree3
msgid "Uninvoiced and Delivered Lines"
msgstr ""
@@ -612,14 +702,19 @@ msgid "My Sales"
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:290
-#: code:addons/sale/sale.py:966
-#: code:addons/sale/sale.py:1165
+#: code:addons/sale/sale.py:295
+#: code:addons/sale/sale.py:1061
+#: code:addons/sale/sale.py:1290
#, python-format
msgid "Invalid action !"
msgstr ""
#. module: sale
+#: view:sale.order:0
+msgid "Extra Info"
+msgstr ""
+
+#. module: sale
#: field:sale.order,pricelist_id:0
#: field:sale.report,pricelist_id:0
#: field:sale.shop,pricelist_id:0
@@ -633,13 +728,21 @@ msgid "# of Qty"
msgstr ""
#. module: sale
+#: code:addons/sale/sale.py:1314
+#, python-format
+msgid "Hour"
+msgstr ""
+
+#. module: sale
#: view:sale.order:0
msgid "Order Date"
msgstr ""
#. module: sale
#: view:sale.order.line:0
+#: view:sale.report:0
#: field:sale.report,shipped:0
+#: field:sale.report,shipped_qty_1:0
msgid "Shipped"
msgstr ""
@@ -649,8 +752,8 @@ msgid "All Quotations"
msgstr ""
#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Invoice On Order After Delivery"
+#: view:sale.config.picking_policy:0
+msgid "Options"
msgstr ""
#. module: sale
@@ -659,6 +762,20 @@ msgid "September"
msgstr ""
#. module: sale
+#: code:addons/sale/sale.py:632
+#, python-format
+msgid "You cannot confirm a sale order which has no line."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:1246
+#, python-format
+msgid ""
+"You have to select a pricelist or a customer in the sales form !\n"
+"Please set one before choosing a product."
+msgstr ""
+
+#. module: sale
#: view:sale.report:0
#: field:sale.report,categ_id:0
msgid "Category of Product"
@@ -675,11 +792,6 @@ msgid "Stock Moves"
msgstr ""
#. module: sale
-#: view:sale.report:0
-msgid " Year "
-msgstr ""
-
-#. module: sale
#: field:sale.order,state:0
#: field:sale.report,state:0
msgid "Order State"
@@ -697,7 +809,7 @@ msgid "Sales By Month"
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:970
+#: code:addons/sale/sale.py:1065
#, python-format
msgid "Could not cancel sales order line!"
msgstr ""
@@ -730,41 +842,18 @@ msgid ""
msgstr ""
#. module: sale
-#: view:sale.report:0
-msgid "Extended Filters..."
+#: field:sale.order,date_order:0
+msgid "Date"
msgstr ""
#. module: sale
-#: model:ir.module.module,description:sale.module_meta_information
-msgid ""
-"\n"
-" The base module to manage quotations and sales orders.\n"
-"\n"
-" * Workflow with validation steps:\n"
-" - Quotation -> Sales order -> Invoice\n"
-" * Invoicing methods:\n"
-" - Invoice on order (before or after shipping)\n"
-" - Invoice on delivery\n"
-" - Invoice on timesheets\n"
-" - Advance invoice\n"
-" * Partners preferences (shipping, invoicing, incoterm, ...)\n"
-" * Products stocks and prices\n"
-" * Delivery methods:\n"
-" - all at once, multi-parcel\n"
-" - delivery costs\n"
-" * Dashboard for salesman that includes:\n"
-" * Your open quotations\n"
-" * Top 10 sales of the month\n"
-" * Cases statistics\n"
-" * Graph of sales by product\n"
-" * Graph of cases of the month\n"
-" "
+#: view:sale.report:0
+msgid "Extended Filters..."
msgstr ""
#. module: sale
-#: model:ir.model,name:sale.model_sale_shop
-#: view:sale.shop:0
-msgid "Sales Shop"
+#: selection:sale.order.line,state:0
+msgid "Exception"
msgstr ""
#. module: sale
@@ -773,8 +862,9 @@ msgid "Companies"
msgstr ""
#. module: sale
-#: selection:sale.report,month:0
-msgid "November"
+#: code:addons/sale/sale.py:1259
+#, python-format
+msgid "No valid pricelist line found ! :"
msgstr ""
#. module: sale
@@ -783,8 +873,8 @@ msgid "History"
msgstr ""
#. module: sale
-#: field:sale.config.picking_policy,picking_policy:0
-msgid "Picking Default Policy"
+#: selection:sale.order,order_policy:0
+msgid "Invoice on order after delivery"
msgstr ""
#. module: sale
@@ -807,13 +897,12 @@ msgid ""
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:966
-#, python-format
-msgid "You cannot cancel a sales order line that has already been invoiced !"
+#: help:res.company,security_lead:0
+msgid ""
+"This is the days added to what you promise to customers for security purpose"
msgstr ""
#. module: sale
-#: view:sale.order:0
#: view:sale.order.line:0
msgid "Qty"
msgstr ""
@@ -824,6 +913,11 @@ msgid "References"
msgstr ""
#. module: sale
+#: view:sale.order.line:0
+msgid "My Sales Order Lines"
+msgstr ""
+
+#. module: sale
#: model:process.transition.action,name:sale.process_transition_action_cancel0
#: model:process.transition.action,name:sale.process_transition_action_cancel1
#: model:process.transition.action,name:sale.process_transition_action_cancel2
@@ -835,13 +929,8 @@ msgid "Cancel"
msgstr ""
#. module: sale
-#: field:sale.installer,sale_order_dates:0
-msgid "Sales Order Dates"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order.line,state:0
-msgid "Exception"
+#: sql_constraint:sale.order:0
+msgid "Order Reference must be unique per Company!"
msgstr ""
#. module: sale
@@ -854,18 +943,18 @@ msgid "Create Invoice"
msgstr ""
#. module: sale
-#: field:sale.installer,sale_margin:0
-msgid "Margins in Sales Orders"
+#: view:sale.order:0
+msgid "Total Tax Excluded"
msgstr ""
#. module: sale
-#: view:sale.order:0
-msgid "Total Tax Excluded"
+#: view:sale.order.line:0
+msgid "Order reference"
msgstr ""
#. module: sale
-#: view:sale.order:0
-msgid "Compute"
+#: view:sale.open.invoice:0
+msgid "You invoice has been successfully created!"
msgstr ""
#. module: sale
@@ -885,22 +974,19 @@ msgid "Open Invoice"
msgstr ""
#. module: sale
-#: report:sale.order:0
-#: view:sale.order.line:0
-msgid "Price"
+#: model:ir.actions.server,name:sale.ir_actions_server_edi_sale
+msgid "Auto-email confirmed sale orders"
msgstr ""
#. module: sale
-#: model:ir.actions.act_window,name:sale.action_sale_installer
-#: view:sale.config.picking_policy:0
-#: view:sale.installer:0
-msgid "Sales Application Configuration"
+#: code:addons/sale/sale.py:413
+#, python-format
+msgid "There is no sales journal defined for this company: \"%s\" (id:%d)"
msgstr ""
#. module: sale
-#: view:sale.report:0
-#: field:sale.report,price_total:0
-msgid "Total Price"
+#: model:process.transition.action,name:sale.process_transition_action_forceassignation0
+msgid "Force Assignation"
msgstr ""
#. module: sale
@@ -914,6 +1000,11 @@ msgid "Based on the shipped or on the ordered quantities."
msgstr ""
#. module: sale
+#: selection:sale.order,picking_policy:0
+msgid "Deliver all products at once"
+msgstr ""
+
+#. module: sale
#: field:sale.order,picking_ids:0
msgid "Related Picking"
msgstr ""
@@ -945,8 +1036,14 @@ msgid "Create Delivery Order"
msgstr ""
#. module: sale
-#: field:sale.installer,delivery:0
-msgid "Delivery Costs"
+#: code:addons/sale/sale.py:1290
+#, python-format
+msgid "Cannot delete a sales order line which is in state '%s'!"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Qty(UoS)"
msgstr ""
#. module: sale
@@ -961,12 +1058,12 @@ msgstr ""
#. module: sale
#: view:sale.report:0
-msgid "Sales by Product Category"
+msgid "Ordered date of the sales order"
msgstr ""
#. module: sale
-#: selection:sale.order,picking_policy:0
-msgid "Partial Delivery"
+#: view:sale.report:0
+msgid "Sales by Product Category"
msgstr ""
#. module: sale
@@ -975,8 +1072,9 @@ msgid "Confirm Quotation"
msgstr ""
#. module: sale
-#: help:sale.order,origin:0
-msgid "Reference of the document that generated this sales order request."
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:63
+#, python-format
+msgid "Error"
msgstr ""
#. module: sale
@@ -1009,19 +1107,13 @@ msgid "Procurement Method"
msgstr ""
#. module: sale
-#: view:sale.config.picking_policy:0
-#: view:sale.installer:0
-msgid "title"
-msgstr ""
-
-#. module: sale
#: model:process.node,name:sale.process_node_packinglist0
msgid "Pick List"
msgstr ""
#. module: sale
#: view:sale.order:0
-msgid "Order date"
+msgid "Set to Draft"
msgstr ""
#. module: sale
@@ -1030,6 +1122,85 @@ msgid "Document of the move to the output or to the customer."
msgstr ""
#. module: sale
+#: model:email.template,body_text:sale.email_template_edi_sale
+msgid ""
+"\n"
+"Hello${object.partner_order_id.name and ' ' or "
+"''}${object.partner_order_id.name or ''},\n"
+"\n"
+"Here is your order confirmation for ${object.partner_id.name}:\n"
+" | Order number: *${object.name}*\n"
+" | Order total: *${object.amount_total} "
+"${object.pricelist_id.currency_id.name}*\n"
+" | Order date: ${object.date_order}\n"
+" % if object.origin:\n"
+" | Order reference: ${object.origin}\n"
+" % endif\n"
+" % if object.client_order_ref:\n"
+" | Your reference: ${object.client_order_ref}<br />\n"
+" % endif\n"
+" | Your contact: ${object.user_id.name} ${object.user_id.user_email "
+"and '<%s>'%(object.user_id.user_email) or ''}\n"
+"\n"
+"You can view the order confirmation, download it and even pay online using "
+"the following link:\n"
+" ${ctx.get('edi_web_url_view') or 'n/a'}\n"
+"\n"
+"% if object.order_policy in ('prepaid','manual') and "
+"object.company_id.paypal_account:\n"
+"<% \n"
+"comp_name = quote(object.company_id.name)\n"
+"order_name = quote(object.name)\n"
+"paypal_account = quote(object.company_id.paypal_account)\n"
+"order_amount = quote(str(object.amount_total))\n"
+"cur_name = quote(object.pricelist_id.currency_id.name)\n"
+"paypal_url = \"https://www.paypal.com/cgi-"
+"bin/webscr?cmd=_xclick&business=%s&item_name=%s%%20Order%%20%s&invoice=%s&amo"
+"unt=%s\" \\\n"
+" "
+"\"&currency_code=%s&button_subtype=services&no_note=1&bn=OpenERP_Order_PayNow"
+"_%s\" % \\\n"
+" "
+"(paypal_account,comp_name,order_name,order_name,order_amount,cur_name,cur_nam"
+"e)\n"
+"%>\n"
+"It is also possible to directly pay with Paypal:\n"
+" ${paypal_url}\n"
+"% endif\n"
+"\n"
+"If you have any question, do not hesitate to contact us.\n"
+"\n"
+"\n"
+"Thank you for choosing ${object.company_id.name}!\n"
+"\n"
+"\n"
+"--\n"
+"${object.user_id.name} ${object.user_id.user_email and "
+"'<%s>'%(object.user_id.user_email) or ''}\n"
+"${object.company_id.name}\n"
+"% if object.company_id.street:\n"
+"${object.company_id.street or ''}\n"
+"% endif\n"
+"% if object.company_id.street2:\n"
+"${object.company_id.street2}\n"
+"% endif\n"
+"% if object.company_id.city or object.company_id.zip:\n"
+"${object.company_id.zip or ''} ${object.company_id.city or ''}\n"
+"% endif\n"
+"% if object.company_id.country_id:\n"
+"${object.company_id.state_id and ('%s, ' % object.company_id.state_id.name) "
+"or ''} ${object.company_id.country_id.name or ''}\n"
+"% endif\n"
+"% if object.company_id.phone:\n"
+"Phone: ${object.company_id.phone}\n"
+"% endif\n"
+"% if object.company_id.website:\n"
+"${object.company_id.website or ''}\n"
+"% endif\n"
+" "
+msgstr ""
+
+#. module: sale
#: model:process.transition.action,name:sale.process_transition_action_validate0
msgid "Validate"
msgstr ""
@@ -1052,8 +1223,8 @@ msgid "Taxes"
msgstr ""
#. module: sale
-#: field:sale.order,order_policy:0
-msgid "Shipping Policy"
+#: view:sale.order:0
+msgid "Sales Order ready to be invoiced"
msgstr ""
#. module: sale
@@ -1073,8 +1244,8 @@ msgid "Create Invoices"
msgstr ""
#. module: sale
-#: view:sale.order:0
-msgid "Extra Info"
+#: view:sale.report:0
+msgid "Sales order created in current month"
msgstr ""
#. module: sale
@@ -1083,11 +1254,24 @@ msgid "Fax :"
msgstr ""
#. module: sale
+#: help:sale.order.line,type:0
+msgid ""
+"If 'on order', it triggers a procurement when the sale order is confirmed to "
+"create a task, purchase order or manufacturing order linked to this sale "
+"order line."
+msgstr ""
+
+#. module: sale
#: field:sale.advance.payment.inv,amount:0
msgid "Advance Amount"
msgstr ""
#. module: sale
+#: field:sale.config.picking_policy,charge_delivery:0
+msgid "Do you charge the delivery?"
+msgstr ""
+
+#. module: sale
#: selection:sale.order,invoice_quantity:0
msgid "Shipped Quantities"
msgstr ""
@@ -1098,25 +1282,45 @@ msgid "Invoice Based on Sales Orders"
msgstr ""
#. module: sale
+#: code:addons/sale/sale.py:331
+#, python-format
+msgid ""
+"If you change the pricelist of this order (and eventually the currency), "
+"prices of existing order lines will not be updated."
+msgstr ""
+
+#. module: sale
#: model:ir.model,name:sale.model_stock_picking
msgid "Picking List"
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:387
-#: code:addons/sale/sale.py:920
-#: code:addons/sale/sale.py:938
+#: code:addons/sale/sale.py:412
+#: code:addons/sale/sale.py:503
+#: code:addons/sale/sale.py:632
+#: code:addons/sale/sale.py:1015
+#: code:addons/sale/sale.py:1033
#, python-format
msgid "Error !"
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:570
+#: code:addons/sale/sale.py:603
#, python-format
msgid "Could not cancel sales order !"
msgstr ""
#. module: sale
+#: view:sale.order:0
+msgid "Qty(UoM)"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered Year of the sales order"
+msgstr ""
+
+#. module: sale
#: selection:sale.report,month:0
msgid "July"
msgstr ""
@@ -1133,35 +1337,25 @@ msgid "Shipping Exception"
msgstr ""
#. module: sale
-#: field:sale.make.invoice,grouped:0
-msgid "Group the invoices"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Shipping & Manual Invoice"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:1051
+#: code:addons/sale/sale.py:1143
#, python-format
-msgid "Picking Information !"
+msgid "Picking Information ! : "
msgstr ""
#. module: sale
-#: view:sale.report:0
-#: field:sale.report,month:0
-msgid "Month"
+#: field:sale.make.invoice,grouped:0
+msgid "Group the invoices"
msgstr ""
#. module: sale
-#: model:ir.module.module,shortdesc:sale.module_meta_information
-msgid "Sales Management"
+#: field:sale.order,order_policy:0
+msgid "Invoice Policy"
msgstr ""
#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Invoice From The Picking"
+#: model:ir.actions.act_window,name:sale.action_config_picking_policy
+#: view:sale.config.picking_policy:0
+msgid "Setup your Invoicing Method"
msgstr ""
#. module: sale
@@ -1171,27 +1365,30 @@ msgstr ""
#. module: sale
#: view:sale.report:0
-#: field:sale.report,uom_name:0
msgid "Reference UoM"
msgstr ""
#. module: sale
+#: view:sale.config.picking_policy:0
+msgid ""
+"This tool will help you to install the right module and configure the system "
+"according to the method you use to invoice your customers."
+msgstr ""
+
+#. module: sale
#: model:ir.model,name:sale.model_sale_order_line_make_invoice
msgid "Sale OrderLine Make_invoice"
msgstr ""
#. module: sale
-#: help:sale.config.picking_policy,step:0
-msgid ""
-"By default, OpenERP is able to manage complex routing and paths of products "
-"in your warehouse and partner locations. This will configure the most common "
-"and simple methods to deliver products to the customer in one or two "
-"operations by the worker."
+#: selection:sale.order,state:0
+#: selection:sale.report,state:0
+msgid "Invoice Exception"
msgstr ""
#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_tree
-msgid "Old Quotations"
+#: model:process.node,note:sale.process_node_saleorder0
+msgid "Drives procurement and invoicing"
msgstr ""
#. module: sale
@@ -1207,6 +1404,22 @@ msgid "Sales Analysis"
msgstr ""
#. module: sale
+#: code:addons/sale/sale.py:1138
+#, python-format
+msgid ""
+"You selected a quantity of %d Units.\n"
+"But it's not compatible with the selected packaging.\n"
+"Here is a proposition of quantities according to the packaging:\n"
+"EAN: %s Quantity: %s Type of ul: %s"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Recreate Packing"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
#: field:sale.order.line,property_ids:0
msgid "Properties"
msgstr ""
@@ -1233,7 +1446,17 @@ msgid ""
msgstr ""
#. module: sale
-#: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
+#: view:sale.order.line:0
+msgid "Confirmed sale order lines, not yet delivered"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:473
+#, python-format
+msgid "Customer Invoices"
+msgstr ""
+
+#. module: sale
#: model:process.process,name:sale.process_process_salesprocess0
#: view:sale.order:0
#: view:sale.report:0
@@ -1255,18 +1478,13 @@ msgid "Done"
msgstr ""
#. module: sale
-#: model:ir.model,name:sale.model_sale_installer
-msgid "sale.installer"
-msgstr ""
-
-#. module: sale
#: model:process.node,name:sale.process_node_invoice0
#: model:process.node,name:sale.process_node_invoiceafterdelivery0
msgid "Invoice"
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:1014
+#: code:addons/sale/sale.py:1158
#, python-format
msgid ""
"You have to select a customer in the sales form !\n"
@@ -1274,11 +1492,6 @@ msgid ""
msgstr ""
#. module: sale
-#: selection:sale.config.picking_policy,step:0
-msgid "Picking List & Delivery Order"
-msgstr ""
-
-#. module: sale
#: field:sale.order,origin:0
msgid "Source Document"
msgstr ""
@@ -1304,7 +1517,7 @@ msgid "The amount without tax."
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:571
+#: code:addons/sale/sale.py:604
#, python-format
msgid "You must first cancel all picking attached to this sales order."
msgstr ""
@@ -1315,8 +1528,14 @@ msgid "Sales Advance Payment Invoice"
msgstr ""
#. module: sale
-#: field:sale.order,incoterm:0
-msgid "Incoterm"
+#: view:sale.report:0
+#: field:sale.report,month:0
+msgid "Month"
+msgstr ""
+
+#. module: sale
+#: model:email.template,subject:sale.email_template_edi_sale
+msgid "${object.company_id.name} Order (Ref ${object.name or 'n/a' })"
msgstr ""
#. module: sale
@@ -1328,11 +1547,6 @@ msgid "Product"
msgstr ""
#. module: sale
-#: model:ir.ui.menu,name:sale.menu_invoiced
-msgid "Invoicing"
-msgstr ""
-
-#. module: sale
#: model:process.transition.action,name:sale.process_transition_action_cancelassignation0
msgid "Cancel Assignation"
msgstr ""
@@ -1343,14 +1557,10 @@ msgid "sale.config.picking_policy"
msgstr ""
#. module: sale
-#: help:sale.order,state:0
-msgid ""
-"Gives the state of the quotation or sales order. \n"
-"The exception state is automatically set when a cancel operation occurs in "
-"the invoice validation (Invoice Exception) or in the picking list process "
-"(Shipping Exception). \n"
-"The 'Waiting Schedule' state is set when the invoice is confirmed but "
-"waiting for the scheduler to run on the date 'Ordered Date'."
+#: view:account.invoice.report:0
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_turnover_by_month
+msgid "Monthly Turnover"
msgstr ""
#. module: sale
@@ -1369,7 +1579,6 @@ msgid "Product UoS"
msgstr ""
#. module: sale
-#: selection:sale.order,state:0
#: selection:sale.report,state:0
msgid "Manual In Progress"
msgstr ""
@@ -1390,7 +1599,8 @@ msgid "Order"
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:921
+#: code:addons/sale/sale.py:1016
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:71
#, python-format
msgid "There is no income account defined for this product: \"%s\" (id:%d)"
msgstr ""
@@ -1410,7 +1620,7 @@ msgid ""
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:1116
+#: code:addons/sale/sale.py:1238
#, python-format
msgid ""
"You plan to sell %.2f %s but you only have %.2f %s available !\n"
@@ -1439,9 +1649,9 @@ msgid "Total"
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:388
-#, python-format
-msgid "There is no sales journal defined for this company: \"%s\" (id:%d)"
+#: report:sale.order:0
+#: view:sale.order.line:0
+msgid "Price"
msgstr ""
#. module: sale
@@ -1453,9 +1663,14 @@ msgid ""
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:1165
-#, python-format
-msgid "Cannot delete a sales order line which is %s !"
+#: selection:sale.order,order_policy:0
+msgid "Pay before delivery"
+msgstr ""
+
+#. module: sale
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.open_board_sales
+msgid "Sales Dashboard"
msgstr ""
#. module: sale
@@ -1467,6 +1682,7 @@ msgstr ""
#. module: sale
#: view:sale.order:0
+#: selection:sale.order,state:0
#: view:sale.order.line:0
msgid "To Invoice"
msgstr ""
@@ -1477,6 +1693,11 @@ msgid "Date on which sales order is confirmed."
msgstr ""
#. module: sale
+#: field:sale.order,project_id:0
+msgid "Contract/Analytic Account"
+msgstr ""
+
+#. module: sale
#: field:sale.order,company_id:0
#: field:sale.order.line,company_id:0
#: view:sale.report:0
@@ -1496,9 +1717,11 @@ msgid "The amount to be invoiced in advance."
msgstr ""
#. module: sale
-#: selection:sale.order,state:0
-#: selection:sale.report,state:0
-msgid "Invoice Exception"
+#: code:addons/sale/sale.py:1256
+#, python-format
+msgid ""
+"Couldn't find a pricelist line matching this product and quantity.\n"
+"You have to change either the product, the quantity or the pricelist."
msgstr ""
#. module: sale
@@ -1508,13 +1731,6 @@ msgid ""
msgstr ""
#. module: sale
-#: help:sale.installer,sale_margin:0
-msgid ""
-"Gives the margin of profitability by calculating the difference between Unit "
-"Price and Cost Price."
-msgstr ""
-
-#. module: sale
#: view:sale.make.invoice:0
#: view:sale.order.line.make.invoice:0
msgid "Create invoices"
@@ -1533,6 +1749,11 @@ msgid "Cancelled"
msgstr ""
#. module: sale
+#: view:sale.order.line:0
+msgid "Sales Order Lines related to a Sales Order of mine"
+msgstr ""
+
+#. module: sale
#: model:ir.actions.act_window,name:sale.action_shop_form
#: model:ir.ui.menu,name:sale.menu_action_shop_form
#: field:sale.order,shop_id:0
@@ -1542,17 +1763,12 @@ msgid "Shop"
msgstr ""
#. module: sale
-#: view:sale.report:0
-msgid " Month "
-msgstr ""
-
-#. module: sale
#: field:sale.report,date_confirm:0
msgid "Date Confirm"
msgstr ""
#. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:111
+#: code:addons/sale/wizard/sale_line_invoice.py:113
#, python-format
msgid "Warning"
msgstr ""
@@ -1564,17 +1780,6 @@ msgid "Sales by Month"
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:1045
-#, python-format
-msgid ""
-"You selected a quantity of %d Units.\n"
-"But it's not compatible with the selected packaging.\n"
-"Here is a proposition of quantities according to the packaging:\n"
-"\n"
-"EAN: %s Quantity: %s Type of ul: %s"
-msgstr ""
-
-#. module: sale
#: model:ir.model,name:sale.model_sale_order
#: model:process.node,name:sale.process_node_order0
#: model:process.node,name:sale.process_node_saleorder0
@@ -1590,6 +1795,11 @@ msgid "Quantity (UoS)"
msgstr ""
#. module: sale
+#: view:sale.order.line:0
+msgid "Sale Order Lines that are in 'done' state"
+msgstr ""
+
+#. module: sale
#: model:process.transition,note:sale.process_transition_packing0
msgid ""
"The Pick List form is created as soon as the sales order is confirmed, in "
@@ -1604,6 +1814,11 @@ msgid "Confirmed"
msgstr ""
#. module: sale
+#: field:sale.config.picking_policy,order_policy:0
+msgid "Main Method Based On"
+msgstr ""
+
+#. module: sale
#: model:process.transition.action,name:sale.process_transition_action_confirm0
msgid "Confirm"
msgstr ""
@@ -1626,6 +1841,7 @@ msgid "Invoice Lines"
msgstr ""
#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_product_tree
#: view:sale.order:0
#: view:sale.order.line:0
msgid "Sales Order Lines"
@@ -1642,30 +1858,18 @@ msgid "Configuration"
msgstr ""
#. module: sale
-#: selection:sale.order,picking_policy:0
-msgid "Complete Delivery"
+#: code:addons/sale/edi/sale_order.py:146
+#, python-format
+msgid "EDI Pricelist (%s)"
msgstr ""
#. module: sale
#: view:sale.report:0
-msgid " Month-1 "
-msgstr ""
-
-#. module: sale
-#: help:sale.config.picking_policy,picking_policy:0
-msgid ""
-"The Shipping Policy is used to configure per order if you want to deliver as "
-"soon as possible when one product is available or you wait that all products "
-"are available.."
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "August"
+msgid "Sales order created in current year"
msgstr ""
#. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:111
+#: code:addons/sale/wizard/sale_line_invoice.py:113
#, python-format
msgid ""
"Invoice cannot be created for this Sales Order Line due to one of the "
@@ -1675,6 +1879,11 @@ msgid ""
msgstr ""
#. module: sale
+#: view:sale.order.line:0
+msgid "Sale order lines done"
+msgstr ""
+
+#. module: sale
#: field:sale.order.line,th_weight:0
msgid "Weight"
msgstr ""
@@ -1693,7 +1902,6 @@ msgstr ""
#. module: sale
#: field:sale.config.picking_policy,config_logo:0
-#: field:sale.installer,config_logo:0
msgid "Image"
msgstr ""
@@ -1723,8 +1931,8 @@ msgid "Salesman"
msgstr ""
#. module: sale
-#: model:process.node,note:sale.process_node_saleorder0
-msgid "Drives procurement and invoicing"
+#: model:ir.actions.act_window,name:sale.action_order_tree
+msgid "Old Quotations"
msgstr ""
#. module: sale
@@ -1733,7 +1941,7 @@ msgid "Untaxed Amount"
msgstr ""
#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:163
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:170
#: model:ir.actions.act_window,name:sale.action_view_sale_advance_payment_inv
#: view:sale.advance.payment.inv:0
#: view:sale.order:0
@@ -1742,7 +1950,7 @@ msgid "Advance Invoice"
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:591
+#: code:addons/sale/sale.py:624
#, python-format
msgid "The sales order '%s' has been cancelled."
msgstr ""
@@ -1777,19 +1985,19 @@ msgid "Packings"
msgstr ""
#. module: sale
-#: field:sale.config.picking_policy,progress:0
-#: field:sale.installer,progress:0
-msgid "Configuration Progress"
+#: view:sale.order.line:0
+msgid "Sale Order Lines ready to be invoiced"
msgstr ""
#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_product_tree
-msgid "Product sales"
+#: view:sale.report:0
+msgid "Sales order created in last month"
msgstr ""
#. module: sale
-#: field:sale.order,date_order:0
-msgid "Ordered Date"
+#: model:ir.actions.act_window,name:sale.action_email_templates
+#: model:ir.ui.menu,name:sale.menu_email_templates
+msgid "Email Templates"
msgstr ""
#. module: sale
@@ -1800,13 +2008,14 @@ msgid "Sales Orders"
msgstr ""
#. module: sale
-#: selection:sale.config.picking_policy,picking_policy:0
-msgid "Direct Delivery"
+#: model:ir.model,name:sale.model_sale_shop
+#: view:sale.shop:0
+msgid "Sales Shop"
msgstr ""
#. module: sale
-#: field:sale.installer,sale_journal:0
-msgid "Invoicing journals"
+#: selection:sale.report,month:0
+msgid "November"
msgstr ""
#. module: sale
@@ -1815,18 +2024,12 @@ msgid "Advance Product"
msgstr ""
#. module: sale
-#: view:sale.report:0
-#: field:sale.report,shipped_qty_1:0
-msgid "Shipped Qty"
-msgstr ""
-
-#. module: sale
-#: view:sale.open.invoice:0
-msgid "You invoice has been successfully created!"
+#: view:sale.order:0
+msgid "Compute"
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:585
+#: code:addons/sale/sale.py:618
#, python-format
msgid "You must first cancel all invoices attached to this sales order."
msgstr ""
@@ -1837,24 +2040,13 @@ msgid "January"
msgstr ""
#. module: sale
-#: view:sale.installer:0
-msgid "Configure Your Sales Management Application"
-msgstr ""
-
-#. module: sale
#: model:ir.actions.act_window,name:sale.action_order_tree4
msgid "Sales Order in Progress"
msgstr ""
#. module: sale
-#: field:sale.installer,sale_layout:0
-msgid "Sales Order Layout Improvement"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:63
-#, python-format
-msgid "Error"
+#: help:sale.order,origin:0
+msgid "Reference of the document that generated this sales order request."
msgstr ""
#. module: sale
@@ -1864,6 +2056,11 @@ msgid "Commitment Delay"
msgstr ""
#. module: sale
+#: selection:sale.order,order_policy:0
+msgid "Deliver & invoice on demand"
+msgstr ""
+
+#. module: sale
#: model:process.node,note:sale.process_node_saleprocurement0
msgid ""
"One Procurement order for each sales order line and for each of the "
@@ -1886,13 +2083,12 @@ msgid "Confirmed sales order to invoice."
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:290
-#, python-format
-msgid "Cannot delete Sales Order(s) which are already confirmed !"
+#: view:sale.order:0
+msgid "Sales Order that haven't yet been confirmed"
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:316
+#: code:addons/sale/sale.py:322
#, python-format
msgid "The sales order '%s' has been set in draft state."
msgstr ""
@@ -1903,24 +2099,19 @@ msgid "from stock"
msgstr ""
#. module: sale
-#: field:sale.config.picking_policy,order_policy:0
-msgid "Shipping Default Policy"
-msgstr ""
-
-#. module: sale
#: view:sale.open.invoice:0
msgid "Close"
msgstr ""
#. module: sale
-#: field:sale.order,shipped:0
-msgid "Delivered"
+#: code:addons/sale/sale.py:1248
+#, python-format
+msgid "No Pricelist ! : "
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:1115
-#, python-format
-msgid "Not enough stock !"
+#: field:sale.order,shipped:0
+msgid "Delivered"
msgstr ""
#. module: sale
@@ -1929,11 +2120,6 @@ msgid "You must assign a production lot for this product"
msgstr ""
#. module: sale
-#: field:sale.order.line,sequence:0
-msgid "Layout Sequence"
-msgstr ""
-
-#. module: sale
#: model:ir.actions.act_window,help:sale.action_shop_form
msgid ""
"If you have more than one shop reselling your company products, you can "
@@ -1960,11 +2146,6 @@ msgid "May"
msgstr ""
#. module: sale
-#: help:sale.installer,sale_order_dates:0
-msgid "Adds commitment, requested and effective dates on Sales Orders."
-msgstr ""
-
-#. module: sale
#: view:sale.order:0
#: field:sale.order,partner_id:0
#: field:sale.order.line,order_partner_id:0
@@ -1972,23 +2153,11 @@ msgid "Customer"
msgstr ""
#. module: sale
-#: model:product.template,name:sale.advance_product_0_product_template
-msgid "Advance"
-msgstr ""
-
-#. module: sale
#: selection:sale.report,month:0
msgid "February"
msgstr ""
#. module: sale
-#: help:sale.installer,sale_journal:0
-msgid ""
-"Allows you to group and invoice your delivery orders according to different "
-"invoicing types: daily, weekly, etc."
-msgstr ""
-
-#. module: sale
#: selection:sale.report,month:0
msgid "April"
msgstr ""
@@ -1999,11 +2168,6 @@ msgid "Accounting"
msgstr ""
#. module: sale
-#: field:sale.config.picking_policy,step:0
-msgid "Steps To Deliver a Sales Order"
-msgstr ""
-
-#. module: sale
#: view:sale.order:0
#: view:sale.order.line:0
msgid "Search Sales Order"
@@ -2015,15 +2179,15 @@ msgid "Sales Order Requisition"
msgstr ""
#. module: sale
-#: report:sale.order:0
-#: field:sale.order,payment_term:0
-msgid "Payment Term"
+#: code:addons/sale/sale.py:1242
+#, python-format
+msgid "Not enough stock ! : "
msgstr ""
#. module: sale
-#: help:sale.installer,sale_layout:0
-msgid ""
-"Provides some features to improve the layout of the Sales Order reports."
+#: report:sale.order:0
+#: field:sale.order,payment_term:0
+msgid "Payment Term"
msgstr ""
#. module: sale
diff --git a/addons/sale/i18n/sr.po b/addons/sale/i18n/sr.po
index be97164df8d..fb2be757dcc 100644
--- a/addons/sale/i18n/sr.po
+++ b/addons/sale/i18n/sr.po
@@ -7,15 +7,27 @@ msgid ""
msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-01-11 11:16+0000\n"
+"POT-Creation-Date: 2011-12-22 18:43+0000\n"
"PO-Revision-Date: 2010-12-15 21:07+0000\n"
"Last-Translator: qdp (OpenERP) <qdp-launchpad@tinyerp.com>\n"
"Language-Team: Serbian <sr@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-05 05:17+0000\n"
-"X-Generator: Launchpad (build 14231)\n"
+"X-Launchpad-Export-Date: 2011-12-23 06:47+0000\n"
+"X-Generator: Launchpad (build 14560)\n"
+
+#. module: sale
+#: field:sale.config.picking_policy,timesheet:0
+msgid "Based on Timesheet"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid ""
+"Sale Order Lines that are confirmed, done or in exception state and haven't "
+"yet been invoiced"
+msgstr ""
#. module: sale
#: view:board.board:0
@@ -24,11 +36,6 @@ msgid "Sales by Salesman in last 90 days"
msgstr ""
#. module: sale
-#: help:sale.installer,delivery:0
-msgid "Allows you to compute delivery costs on your quotations."
-msgstr "Omogucava ti da izracunas troskove isporuke po tvojim upitima"
-
-#. module: sale
#: help:sale.order,picking_policy:0
msgid ""
"If you don't have enough stock available to deliver all at once, do you "
@@ -38,6 +45,11 @@ msgstr ""
"parcijalne isporuke ili ne?"
#. module: sale
+#: view:sale.order:0
+msgid "UoS"
+msgstr ""
+
+#. module: sale
#: help:sale.order,partner_shipping_id:0
msgid "Shipping address for current sales order."
msgstr ""
@@ -61,22 +73,12 @@ msgid "Cancel Order"
msgstr "Poništite nalog"
#. module: sale
-#: view:sale.config.picking_policy:0
-msgid "Configure Sales Order Logistics"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:603
+#: code:addons/sale/sale.py:638
#, python-format
msgid "The quotation '%s' has been converted to a sales order."
msgstr ""
#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Payment Before Delivery"
-msgstr "Plaćanje pre isporuke"
-
-#. module: sale
#: code:addons/sale/wizard/sale_make_invoice.py:42
#, python-format
msgid "Warning !"
@@ -93,12 +95,6 @@ msgid "Drives procurement orders for every sales order line."
msgstr ""
#. module: sale
-#: selection:sale.config.picking_policy,picking_policy:0
-msgid "All at Once"
-msgstr "Sve odjednom"
-
-#. module: sale
-#: field:sale.order,project_id:0
#: view:sale.report:0
#: field:sale.report,analytic_account_id:0
#: field:sale.shop,project_id:0
@@ -114,6 +110,15 @@ msgid ""
msgstr ""
#. module: sale
+#: code:addons/sale/sale.py:295
+#, python-format
+msgid ""
+"In order to delete a confirmed sale order, you must cancel it before ! To "
+"cancel a sale order, you must first cancel related picking or delivery "
+"orders."
+msgstr ""
+
+#. module: sale
#: model:process.node,name:sale.process_node_saleprocurement0
msgid "Procurement Order"
msgstr "Nalog za Nabavku"
@@ -125,6 +130,11 @@ msgid "Partner"
msgstr "Partner"
#. module: sale
+#: selection:sale.order,order_policy:0
+msgid "Invoice based on deliveries"
+msgstr ""
+
+#. module: sale
#: view:sale.order:0
msgid "Order Line"
msgstr "Stavke naloga"
@@ -162,9 +172,14 @@ msgid "Default Payment Term"
msgstr "Podrazumevani uslovi plaćanja"
#. module: sale
-#: model:ir.actions.act_window,name:sale.action_config_picking_policy
-msgid "Configure Picking Policy for Sales Order"
-msgstr "Konfigurisi Izbornu politiku za Prodajne Naloge"
+#: field:sale.config.picking_policy,deli_orders:0
+msgid "Based on Delivery Orders"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.picking_policy,time_unit:0
+msgid "Main Working Time Unit"
+msgstr ""
#. module: sale
#: view:sale.order:0
@@ -180,9 +195,10 @@ msgid "Disc.(%)"
msgstr "Popust (%)"
#. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_forceassignation0
-msgid "Force Assignation"
-msgstr "Prinudni prenos"
+#: view:sale.report:0
+#: field:sale.report,price_total:0
+msgid "Total Price"
+msgstr "Ukupna Cena"
#. module: sale
#: help:sale.make.invoice,grouped:0
@@ -190,6 +206,11 @@ msgid "Check the box to group the invoices for the same customers"
msgstr "Cekiraj ovu kucicu da grupises fakture za iste klijente."
#. module: sale
+#: view:sale.order:0
+msgid "My Sale Orders"
+msgstr ""
+
+#. module: sale
#: selection:sale.order,invoice_quantity:0
msgid "Ordered Quantities"
msgstr "Narucene Kolicine"
@@ -230,13 +251,24 @@ msgstr ""
"Izvora' ili ' faktura na zahtev nakon isporuke'."
#. module: sale
+#: field:sale.config.picking_policy,task_work:0
+msgid "Based on Tasks' Work"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
+msgid "Quotations and Sales"
+msgstr ""
+
+#. module: sale
#: model:ir.model,name:sale.model_sale_make_invoice
msgid "Sales Make Invoice"
msgstr ""
#. module: sale
-#: view:sale.order:0
-msgid "Recreate Packing"
+#: code:addons/sale/sale.py:330
+#, python-format
+msgid "Pricelist Warning!"
msgstr ""
#. module: sale
@@ -245,11 +277,10 @@ msgid "Discount (%)"
msgstr "Popust (%)"
#. module: sale
-#: help:res.company,security_lead:0
-msgid ""
-"This is the days added to what you promise to customers for security purpose"
-msgstr ""
-"Ovo su dani dodati onome sto su obecao klijentima iz sigurnosnih razloga."
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_quotation_for_sale
+msgid "My Quotations"
+msgstr "Moja ponuda"
#. module: sale
#: view:board.board:0
@@ -274,7 +305,22 @@ msgid "Shop Name"
msgstr "Ime prodavnice"
#. module: sale
-#: code:addons/sale/sale.py:1014
+#: help:sale.order,order_policy:0
+msgid ""
+"The Invoice Policy is used to synchronise invoice and delivery operations.\n"
+" - The 'Pay before delivery' choice will first generate the invoice and "
+"then generate the picking order after the payment of this invoice.\n"
+" - The 'Deliver & Invoice on demand' will create the picking order directly "
+"and wait for the user to manually click on the 'Invoice' button to generate "
+"the draft invoice based on the sale order or the sale order lines.\n"
+" - The 'Invoice on order after delivery' choice will generate the draft "
+"invoice based on sales order after all picking lists have been finished.\n"
+" - The 'Invoice based on deliveries' choice is used to create an invoice "
+"during the picking process."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:1158
#, python-format
msgid "No Customer Defined !"
msgstr "Kupac nije definisan!"
@@ -285,9 +331,12 @@ msgid "Sales in Exception"
msgstr "Prodaje izuzeci"
#. module: sale
-#: view:sale.order:0
-msgid "Set to Draft"
-msgstr "Postavi u Pripremu"
+#: code:addons/sale/sale.py:1145
+#: code:addons/sale/sale.py:1264
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:70
+#, python-format
+msgid "Configuration Error !"
+msgstr ""
#. module: sale
#: view:sale.order:0
@@ -295,22 +344,7 @@ msgid "Conditions"
msgstr "Uslovi"
#. module: sale
-#: help:sale.order,order_policy:0
-msgid ""
-"The Shipping Policy is used to synchronise invoice and delivery operations.\n"
-" - The 'Pay Before delivery' choice will first generate the invoice and "
-"then generate the picking order after the payment of this invoice.\n"
-" - The 'Shipping & Manual Invoice' will create the picking order directly "
-"and wait for the user to manually click on the 'Invoice' button to generate "
-"the draft invoice.\n"
-" - The 'Invoice On Order After Delivery' choice will generate the draft "
-"invoice based on sales order after all picking lists have been finished.\n"
-" - The 'Invoice From The Picking' choice is used to create an invoice "
-"during the picking process."
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:939
+#: code:addons/sale/sale.py:1034
#, python-format
msgid ""
"There is no income category account defined in default Properties for "
@@ -320,9 +354,9 @@ msgstr ""
"Kategoriju Proizvoda ili nije definisana Fiskalna Pozicija !"
#. module: sale
-#: view:sale.installer:0
-msgid "Configure"
-msgstr ""
+#: selection:sale.report,month:0
+msgid "August"
+msgstr "Avgust"
#. module: sale
#: constraint:stock.move:0
@@ -330,7 +364,7 @@ msgid "You try to assign a lot which is not from the same product"
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:620
+#: code:addons/sale/sale.py:655
#, python-format
msgid "invalid mode for test_state"
msgstr "pogrešan mod za test_state"
@@ -341,7 +375,7 @@ msgid "June"
msgstr "Jun"
#. module: sale
-#: code:addons/sale/sale.py:584
+#: code:addons/sale/sale.py:617
#, python-format
msgid "Could not cancel this sales order !"
msgstr ""
@@ -362,8 +396,12 @@ msgid "October"
msgstr "Oktobar"
#. module: sale
+#: sql_constraint:stock.picking:0
+msgid "Reference must be unique per Company!"
+msgstr ""
+
+#. module: sale
#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_quotation_for_sale
#: view:sale.order:0
#: view:sale.report:0
msgid "Quotations"
@@ -375,11 +413,6 @@ msgid "Pricelist for current sales order."
msgstr ""
#. module: sale
-#: selection:sale.config.picking_policy,step:0
-msgid "Delivery Order Only"
-msgstr "Isključivo nalog za isporuku"
-
-#. module: sale
#: report:sale.order:0
msgid "TVA :"
msgstr "TVA:"
@@ -404,6 +437,7 @@ msgstr "Fiskalna pozicija"
#. module: sale
#: view:sale.order:0
#: view:sale.order.line:0
+#: field:sale.report,product_uom:0
msgid "UoM"
msgstr "JM"
@@ -426,13 +460,19 @@ msgid ""
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:971
+#: code:addons/sale/sale.py:1061
+#, python-format
+msgid "You cannot cancel a sale order line that has already been invoiced!"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:1066
#, python-format
msgid "You must first cancel stock moves attached to this sales order line."
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:1042
+#: code:addons/sale/sale.py:1134
#, python-format
msgid "(n/a)"
msgstr ""
@@ -468,13 +508,35 @@ msgid "Notes"
msgstr "Beleške"
#. module: sale
+#: sql_constraint:res.company:0
+msgid "The company name must be unique !"
+msgstr ""
+
+#. module: sale
#: help:sale.order,partner_invoice_id:0
msgid "Invoice address for current sales order."
msgstr ""
#. module: sale
-#: view:sale.installer:0
-msgid "Enhance your core Sales Application with additional functionalities."
+#: view:sale.report:0
+msgid "Month-1"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered month of the sales order"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:504
+#, python-format
+msgid ""
+"You cannot group sales having different currencies for the same partner."
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,picking_policy:0
+msgid "Deliver each product when available"
msgstr ""
#. module: sale
@@ -494,21 +556,43 @@ msgid "Confirmation Date"
msgstr "Datum Potvrde"
#. module: sale
+#: field:sale.order,incoterm:0
+msgid "Incoterm"
+msgstr "Incoterm"
+
+#. module: sale
#: field:sale.order.line,address_allotment_id:0
msgid "Allotment Partner"
msgstr "Dodeljivanje partnera"
#. module: sale
-#: sql_constraint:sale.order:0
-msgid "Order Reference must be unique !"
-msgstr ""
-
-#. module: sale
#: selection:sale.report,month:0
msgid "March"
msgstr "Mart"
#. module: sale
+#: constraint:stock.move:0
+msgid "You can not move products from or to a location of the type view."
+msgstr ""
+
+#. module: sale
+#: field:sale.config.picking_policy,sale_orders:0
+msgid "Based on Sales Orders"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,state:0
+msgid ""
+"Givwizard = self.browse(cr, uid, ids)[0]es the state of the quotation or "
+"sales order. \n"
+"The exception state is automatically set when a cancel operation occurs in "
+"the invoice validation (Invoice Exception) or in the picking list process "
+"(Shipping Exception). \n"
+"The 'Waiting Schedule' state is set when the invoice is confirmed but "
+"waiting for the scheduler to run on the order date."
+msgstr ""
+
+#. module: sale
#: help:sale.order,amount_total:0
msgid "The total amount."
msgstr ""
@@ -524,6 +608,11 @@ msgid "Invoice address :"
msgstr "Adresa računa:"
#. module: sale
+#: field:sale.order.line,sequence:0
+msgid "Line Sequence"
+msgstr ""
+
+#. module: sale
#: model:process.transition,note:sale.process_transition_saleorderprocurement0
msgid ""
"For every sales order line, a procurement order is created to supply the "
@@ -570,11 +659,6 @@ msgid "Sales Order Line"
msgstr ""
#. module: sale
-#: view:sale.config.picking_policy:0
-msgid "Setup your sales workflow and default values."
-msgstr ""
-
-#. module: sale
#: field:sale.shop,warehouse_id:0
msgid "Warehouse"
msgstr "Skladište"
@@ -611,6 +695,11 @@ msgid "Creation Date"
msgstr "datum Kreacije"
#. module: sale
+#: model:ir.ui.menu,name:sale.menu_sales_configuration_misc
+msgid "Miscellaneous"
+msgstr ""
+
+#. module: sale
#: model:ir.actions.act_window,name:sale.action_order_line_tree3
msgid "Uninvoiced and Delivered Lines"
msgstr "Stavke za koje ne postoji račun a isporučene su"
@@ -626,14 +715,19 @@ msgid "My Sales"
msgstr "Moje Prodaje"
#. module: sale
-#: code:addons/sale/sale.py:290
-#: code:addons/sale/sale.py:966
-#: code:addons/sale/sale.py:1165
+#: code:addons/sale/sale.py:295
+#: code:addons/sale/sale.py:1061
+#: code:addons/sale/sale.py:1290
#, python-format
msgid "Invalid action !"
msgstr "Neispravna akcija!"
#. module: sale
+#: view:sale.order:0
+msgid "Extra Info"
+msgstr "Dodatne informacije"
+
+#. module: sale
#: field:sale.order,pricelist_id:0
#: field:sale.report,pricelist_id:0
#: field:sale.shop,pricelist_id:0
@@ -647,13 +741,21 @@ msgid "# of Qty"
msgstr "# Kol"
#. module: sale
+#: code:addons/sale/sale.py:1314
+#, python-format
+msgid "Hour"
+msgstr ""
+
+#. module: sale
#: view:sale.order:0
msgid "Order Date"
msgstr "Datum Naloga"
#. module: sale
#: view:sale.order.line:0
+#: view:sale.report:0
#: field:sale.report,shipped:0
+#: field:sale.report,shipped_qty_1:0
msgid "Shipped"
msgstr "Isporuceno"
@@ -663,8 +765,8 @@ msgid "All Quotations"
msgstr "Sve ponude"
#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Invoice On Order After Delivery"
+#: view:sale.config.picking_policy:0
+msgid "Options"
msgstr ""
#. module: sale
@@ -673,6 +775,20 @@ msgid "September"
msgstr "Septembar"
#. module: sale
+#: code:addons/sale/sale.py:632
+#, python-format
+msgid "You cannot confirm a sale order which has no line."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:1246
+#, python-format
+msgid ""
+"You have to select a pricelist or a customer in the sales form !\n"
+"Please set one before choosing a product."
+msgstr ""
+
+#. module: sale
#: view:sale.report:0
#: field:sale.report,categ_id:0
msgid "Category of Product"
@@ -689,11 +805,6 @@ msgid "Stock Moves"
msgstr "POmeranje Lagera"
#. module: sale
-#: view:sale.report:0
-msgid " Year "
-msgstr " Godina "
-
-#. module: sale
#: field:sale.order,state:0
#: field:sale.report,state:0
msgid "Order State"
@@ -711,7 +822,7 @@ msgid "Sales By Month"
msgstr "Mesecna Prodaja"
#. module: sale
-#: code:addons/sale/sale.py:970
+#: code:addons/sale/sale.py:1065
#, python-format
msgid "Could not cancel sales order line!"
msgstr ""
@@ -744,42 +855,19 @@ msgid ""
msgstr ""
#. module: sale
+#: field:sale.order,date_order:0
+msgid "Date"
+msgstr ""
+
+#. module: sale
#: view:sale.report:0
msgid "Extended Filters..."
msgstr "Prosireni Filteri"
#. module: sale
-#: model:ir.module.module,description:sale.module_meta_information
-msgid ""
-"\n"
-" The base module to manage quotations and sales orders.\n"
-"\n"
-" * Workflow with validation steps:\n"
-" - Quotation -> Sales order -> Invoice\n"
-" * Invoicing methods:\n"
-" - Invoice on order (before or after shipping)\n"
-" - Invoice on delivery\n"
-" - Invoice on timesheets\n"
-" - Advance invoice\n"
-" * Partners preferences (shipping, invoicing, incoterm, ...)\n"
-" * Products stocks and prices\n"
-" * Delivery methods:\n"
-" - all at once, multi-parcel\n"
-" - delivery costs\n"
-" * Dashboard for salesman that includes:\n"
-" * Your open quotations\n"
-" * Top 10 sales of the month\n"
-" * Cases statistics\n"
-" * Graph of sales by product\n"
-" * Graph of cases of the month\n"
-" "
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_shop
-#: view:sale.shop:0
-msgid "Sales Shop"
-msgstr ""
+#: selection:sale.order.line,state:0
+msgid "Exception"
+msgstr "Izuzetak"
#. module: sale
#: model:ir.model,name:sale.model_res_company
@@ -787,9 +875,10 @@ msgid "Companies"
msgstr "Preduzeca"
#. module: sale
-#: selection:sale.report,month:0
-msgid "November"
-msgstr "Novembar"
+#: code:addons/sale/sale.py:1259
+#, python-format
+msgid "No valid pricelist line found ! :"
+msgstr ""
#. module: sale
#: view:sale.order:0
@@ -797,9 +886,9 @@ msgid "History"
msgstr "Arhiva"
#. module: sale
-#: field:sale.config.picking_policy,picking_policy:0
-msgid "Picking Default Policy"
-msgstr "Podrazumevana Izborna Politika"
+#: selection:sale.order,order_policy:0
+msgid "Invoice on order after delivery"
+msgstr ""
#. module: sale
#: help:sale.order,invoice_ids:0
@@ -821,13 +910,13 @@ msgid ""
msgstr "Ime i aadresa kontakta koji je zatrazio upit ili Narudzbu."
#. module: sale
-#: code:addons/sale/sale.py:966
-#, python-format
-msgid "You cannot cancel a sales order line that has already been invoiced !"
+#: help:res.company,security_lead:0
+msgid ""
+"This is the days added to what you promise to customers for security purpose"
msgstr ""
+"Ovo su dani dodati onome sto su obecao klijentima iz sigurnosnih razloga."
#. module: sale
-#: view:sale.order:0
#: view:sale.order.line:0
msgid "Qty"
msgstr "Kol"
@@ -838,6 +927,11 @@ msgid "References"
msgstr "Reference"
#. module: sale
+#: view:sale.order.line:0
+msgid "My Sales Order Lines"
+msgstr ""
+
+#. module: sale
#: model:process.transition.action,name:sale.process_transition_action_cancel0
#: model:process.transition.action,name:sale.process_transition_action_cancel1
#: model:process.transition.action,name:sale.process_transition_action_cancel2
@@ -849,14 +943,9 @@ msgid "Cancel"
msgstr "Otkaži"
#. module: sale
-#: field:sale.installer,sale_order_dates:0
-msgid "Sales Order Dates"
-msgstr "Datumi Prodajnih Naloga"
-
-#. module: sale
-#: selection:sale.order.line,state:0
-msgid "Exception"
-msgstr "Izuzetak"
+#: sql_constraint:sale.order:0
+msgid "Order Reference must be unique per Company!"
+msgstr ""
#. module: sale
#: model:process.transition,name:sale.process_transition_invoice0
@@ -868,19 +957,19 @@ msgid "Create Invoice"
msgstr "Kreiranje računa"
#. module: sale
-#: field:sale.installer,sale_margin:0
-msgid "Margins in Sales Orders"
-msgstr "Marze u Prodajnim nalozima"
-
-#. module: sale
#: view:sale.order:0
msgid "Total Tax Excluded"
msgstr "ukupno iskljucenih poreza"
#. module: sale
-#: view:sale.order:0
-msgid "Compute"
-msgstr "Izračunavanje"
+#: view:sale.order.line:0
+msgid "Order reference"
+msgstr ""
+
+#. module: sale
+#: view:sale.open.invoice:0
+msgid "You invoice has been successfully created!"
+msgstr "Vasa faktura je uspesno kreirana!"
#. module: sale
#: view:sale.report:0
@@ -899,23 +988,20 @@ msgid "Open Invoice"
msgstr "Ovori Fakturu"
#. module: sale
-#: report:sale.order:0
-#: view:sale.order.line:0
-msgid "Price"
-msgstr "Cena"
+#: model:ir.actions.server,name:sale.ir_actions_server_edi_sale
+msgid "Auto-email confirmed sale orders"
+msgstr ""
#. module: sale
-#: model:ir.actions.act_window,name:sale.action_sale_installer
-#: view:sale.config.picking_policy:0
-#: view:sale.installer:0
-msgid "Sales Application Configuration"
-msgstr "POdesavanje Aplikacije Prodaje"
+#: code:addons/sale/sale.py:413
+#, python-format
+msgid "There is no sales journal defined for this company: \"%s\" (id:%d)"
+msgstr ""
#. module: sale
-#: view:sale.report:0
-#: field:sale.report,price_total:0
-msgid "Total Price"
-msgstr "Ukupna Cena"
+#: model:process.transition.action,name:sale.process_transition_action_forceassignation0
+msgid "Force Assignation"
+msgstr "Prinudni prenos"
#. module: sale
#: selection:sale.order.line,type:0
@@ -928,6 +1014,11 @@ msgid "Based on the shipped or on the ordered quantities."
msgstr "Bazirano na isporucenim ili narucenim kolicinama."
#. module: sale
+#: selection:sale.order,picking_policy:0
+msgid "Deliver all products at once"
+msgstr ""
+
+#. module: sale
#: field:sale.order,picking_ids:0
msgid "Related Picking"
msgstr "Relacioni Izbor"
@@ -959,9 +1050,15 @@ msgid "Create Delivery Order"
msgstr "Kreiraj Dostavni Nalog"
#. module: sale
-#: field:sale.installer,delivery:0
-msgid "Delivery Costs"
-msgstr "Trosak Dostave"
+#: code:addons/sale/sale.py:1290
+#, python-format
+msgid "Cannot delete a sales order line which is in state '%s'!"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Qty(UoS)"
+msgstr ""
#. module: sale
#: view:sale.order:0
@@ -975,13 +1072,13 @@ msgstr "Kreiranje Izborne liste"
#. module: sale
#: view:sale.report:0
-msgid "Sales by Product Category"
-msgstr "Prodaja po kategoriji Proizvoda"
+msgid "Ordered date of the sales order"
+msgstr ""
#. module: sale
-#: selection:sale.order,picking_policy:0
-msgid "Partial Delivery"
-msgstr "Parcijalna isporuka"
+#: view:sale.report:0
+msgid "Sales by Product Category"
+msgstr "Prodaja po kategoriji Proizvoda"
#. module: sale
#: model:process.transition,name:sale.process_transition_confirmquotation0
@@ -989,9 +1086,10 @@ msgid "Confirm Quotation"
msgstr "Potvrđivanje ponude"
#. module: sale
-#: help:sale.order,origin:0
-msgid "Reference of the document that generated this sales order request."
-msgstr ""
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:63
+#, python-format
+msgid "Error"
+msgstr "Greška"
#. module: sale
#: view:sale.order:0
@@ -1023,20 +1121,14 @@ msgid "Procurement Method"
msgstr "Metod Nabavke"
#. module: sale
-#: view:sale.config.picking_policy:0
-#: view:sale.installer:0
-msgid "title"
-msgstr "Naslov"
-
-#. module: sale
#: model:process.node,name:sale.process_node_packinglist0
msgid "Pick List"
msgstr "Izborna Lista"
#. module: sale
#: view:sale.order:0
-msgid "Order date"
-msgstr "Naruceno Dana"
+msgid "Set to Draft"
+msgstr "Postavi u Pripremu"
#. module: sale
#: model:process.node,note:sale.process_node_packinglist0
@@ -1044,6 +1136,85 @@ msgid "Document of the move to the output or to the customer."
msgstr "Dokumenat za pomeranje na izlaz ili za kupca."
#. module: sale
+#: model:email.template,body_text:sale.email_template_edi_sale
+msgid ""
+"\n"
+"Hello${object.partner_order_id.name and ' ' or "
+"''}${object.partner_order_id.name or ''},\n"
+"\n"
+"Here is your order confirmation for ${object.partner_id.name}:\n"
+" | Order number: *${object.name}*\n"
+" | Order total: *${object.amount_total} "
+"${object.pricelist_id.currency_id.name}*\n"
+" | Order date: ${object.date_order}\n"
+" % if object.origin:\n"
+" | Order reference: ${object.origin}\n"
+" % endif\n"
+" % if object.client_order_ref:\n"
+" | Your reference: ${object.client_order_ref}<br />\n"
+" % endif\n"
+" | Your contact: ${object.user_id.name} ${object.user_id.user_email "
+"and '<%s>'%(object.user_id.user_email) or ''}\n"
+"\n"
+"You can view the order confirmation, download it and even pay online using "
+"the following link:\n"
+" ${ctx.get('edi_web_url_view') or 'n/a'}\n"
+"\n"
+"% if object.order_policy in ('prepaid','manual') and "
+"object.company_id.paypal_account:\n"
+"<% \n"
+"comp_name = quote(object.company_id.name)\n"
+"order_name = quote(object.name)\n"
+"paypal_account = quote(object.company_id.paypal_account)\n"
+"order_amount = quote(str(object.amount_total))\n"
+"cur_name = quote(object.pricelist_id.currency_id.name)\n"
+"paypal_url = \"https://www.paypal.com/cgi-"
+"bin/webscr?cmd=_xclick&business=%s&item_name=%s%%20Order%%20%s&invoice=%s&amo"
+"unt=%s\" \\\n"
+" "
+"\"&currency_code=%s&button_subtype=services&no_note=1&bn=OpenERP_Order_PayNow"
+"_%s\" % \\\n"
+" "
+"(paypal_account,comp_name,order_name,order_name,order_amount,cur_name,cur_nam"
+"e)\n"
+"%>\n"
+"It is also possible to directly pay with Paypal:\n"
+" ${paypal_url}\n"
+"% endif\n"
+"\n"
+"If you have any question, do not hesitate to contact us.\n"
+"\n"
+"\n"
+"Thank you for choosing ${object.company_id.name}!\n"
+"\n"
+"\n"
+"--\n"
+"${object.user_id.name} ${object.user_id.user_email and "
+"'<%s>'%(object.user_id.user_email) or ''}\n"
+"${object.company_id.name}\n"
+"% if object.company_id.street:\n"
+"${object.company_id.street or ''}\n"
+"% endif\n"
+"% if object.company_id.street2:\n"
+"${object.company_id.street2}\n"
+"% endif\n"
+"% if object.company_id.city or object.company_id.zip:\n"
+"${object.company_id.zip or ''} ${object.company_id.city or ''}\n"
+"% endif\n"
+"% if object.company_id.country_id:\n"
+"${object.company_id.state_id and ('%s, ' % object.company_id.state_id.name) "
+"or ''} ${object.company_id.country_id.name or ''}\n"
+"% endif\n"
+"% if object.company_id.phone:\n"
+"Phone: ${object.company_id.phone}\n"
+"% endif\n"
+"% if object.company_id.website:\n"
+"${object.company_id.website or ''}\n"
+"% endif\n"
+" "
+msgstr ""
+
+#. module: sale
#: model:process.transition.action,name:sale.process_transition_action_validate0
msgid "Validate"
msgstr "Provera"
@@ -1066,9 +1237,9 @@ msgid "Taxes"
msgstr "Porezi"
#. module: sale
-#: field:sale.order,order_policy:0
-msgid "Shipping Policy"
-msgstr "Opcije transporta"
+#: view:sale.order:0
+msgid "Sales Order ready to be invoiced"
+msgstr ""
#. module: sale
#: help:sale.order,create_date:0
@@ -1087,9 +1258,9 @@ msgid "Create Invoices"
msgstr "Kreiraj Fakture"
#. module: sale
-#: view:sale.order:0
-msgid "Extra Info"
-msgstr "Dodatne informacije"
+#: view:sale.report:0
+msgid "Sales order created in current month"
+msgstr ""
#. module: sale
#: report:sale.order:0
@@ -1097,11 +1268,24 @@ msgid "Fax :"
msgstr "Faks:"
#. module: sale
+#: help:sale.order.line,type:0
+msgid ""
+"If 'on order', it triggers a procurement when the sale order is confirmed to "
+"create a task, purchase order or manufacturing order linked to this sale "
+"order line."
+msgstr ""
+
+#. module: sale
#: field:sale.advance.payment.inv,amount:0
msgid "Advance Amount"
msgstr "Napredni Iznos"
#. module: sale
+#: field:sale.config.picking_policy,charge_delivery:0
+msgid "Do you charge the delivery?"
+msgstr ""
+
+#. module: sale
#: selection:sale.order,invoice_quantity:0
msgid "Shipped Quantities"
msgstr "Isporučene količine"
@@ -1112,25 +1296,45 @@ msgid "Invoice Based on Sales Orders"
msgstr "Račun kreiran na osnovu naloga za prodaju"
#. module: sale
+#: code:addons/sale/sale.py:331
+#, python-format
+msgid ""
+"If you change the pricelist of this order (and eventually the currency), "
+"prices of existing order lines will not be updated."
+msgstr ""
+
+#. module: sale
#: model:ir.model,name:sale.model_stock_picking
msgid "Picking List"
msgstr "Izborna lista"
#. module: sale
-#: code:addons/sale/sale.py:387
-#: code:addons/sale/sale.py:920
-#: code:addons/sale/sale.py:938
+#: code:addons/sale/sale.py:412
+#: code:addons/sale/sale.py:503
+#: code:addons/sale/sale.py:632
+#: code:addons/sale/sale.py:1015
+#: code:addons/sale/sale.py:1033
#, python-format
msgid "Error !"
msgstr "Greška!"
#. module: sale
-#: code:addons/sale/sale.py:570
+#: code:addons/sale/sale.py:603
#, python-format
msgid "Could not cancel sales order !"
msgstr ""
#. module: sale
+#: view:sale.order:0
+msgid "Qty(UoM)"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered Year of the sales order"
+msgstr ""
+
+#. module: sale
#: selection:sale.report,month:0
msgid "July"
msgstr "Juli"
@@ -1147,35 +1351,25 @@ msgid "Shipping Exception"
msgstr "Izuzeci kod transporta"
#. module: sale
-#: field:sale.make.invoice,grouped:0
-msgid "Group the invoices"
-msgstr "Grupisanje računa"
-
-#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Shipping & Manual Invoice"
-msgstr "Isporuka & Račun"
-
-#. module: sale
-#: code:addons/sale/sale.py:1051
+#: code:addons/sale/sale.py:1143
#, python-format
-msgid "Picking Information !"
-msgstr "Informacije Izbora"
+msgid "Picking Information ! : "
+msgstr ""
#. module: sale
-#: view:sale.report:0
-#: field:sale.report,month:0
-msgid "Month"
-msgstr "Mesec"
+#: field:sale.make.invoice,grouped:0
+msgid "Group the invoices"
+msgstr "Grupisanje računa"
#. module: sale
-#: model:ir.module.module,shortdesc:sale.module_meta_information
-msgid "Sales Management"
-msgstr "Menadžment prodaje"
+#: field:sale.order,order_policy:0
+msgid "Invoice Policy"
+msgstr ""
#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Invoice From The Picking"
+#: model:ir.actions.act_window,name:sale.action_config_picking_policy
+#: view:sale.config.picking_policy:0
+msgid "Setup your Invoicing Method"
msgstr ""
#. module: sale
@@ -1185,32 +1379,31 @@ msgstr "Da bude pregledano od strane racunovodje."
#. module: sale
#: view:sale.report:0
-#: field:sale.report,uom_name:0
msgid "Reference UoM"
msgstr ""
#. module: sale
+#: view:sale.config.picking_policy:0
+msgid ""
+"This tool will help you to install the right module and configure the system "
+"according to the method you use to invoice your customers."
+msgstr ""
+
+#. module: sale
#: model:ir.model,name:sale.model_sale_order_line_make_invoice
msgid "Sale OrderLine Make_invoice"
msgstr "Prodajna linija naloga Napravi_fakturu"
#. module: sale
-#: help:sale.config.picking_policy,step:0
-msgid ""
-"By default, OpenERP is able to manage complex routing and paths of products "
-"in your warehouse and partner locations. This will configure the most common "
-"and simple methods to deliver products to the customer in one or two "
-"operations by the worker."
-msgstr ""
-"Podrazumevano, OpenERP je sposoban da upravlja kompleksnim rutiranjima i "
-"putanjama u tvom skladistu i lokacijama partnera, Ovo ce podesiti najcesce i "
-"proste metode za isporuku proizvoda klijentima u samo jednoj ili dve "
-"operacije radnika."
+#: selection:sale.order,state:0
+#: selection:sale.report,state:0
+msgid "Invoice Exception"
+msgstr "Računi izuzeci"
#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_tree
-msgid "Old Quotations"
-msgstr "Stari Upiti"
+#: model:process.node,note:sale.process_node_saleorder0
+msgid "Drives procurement and invoicing"
+msgstr "Pogoni nabavke i fakturiranja"
#. module: sale
#: field:sale.order,invoiced:0
@@ -1225,6 +1418,22 @@ msgid "Sales Analysis"
msgstr "Analiza prodaje"
#. module: sale
+#: code:addons/sale/sale.py:1138
+#, python-format
+msgid ""
+"You selected a quantity of %d Units.\n"
+"But it's not compatible with the selected packaging.\n"
+"Here is a proposition of quantities according to the packaging:\n"
+"EAN: %s Quantity: %s Type of ul: %s"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Recreate Packing"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
#: field:sale.order.line,property_ids:0
msgid "Properties"
msgstr "Osobine"
@@ -1255,7 +1464,17 @@ msgstr ""
"Mozes kreirati fakture bazirane na prodajnim nalozima pri isporukama."
#. module: sale
-#: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
+#: view:sale.order.line:0
+msgid "Confirmed sale order lines, not yet delivered"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:473
+#, python-format
+msgid "Customer Invoices"
+msgstr ""
+
+#. module: sale
#: model:process.process,name:sale.process_process_salesprocess0
#: view:sale.order:0
#: view:sale.report:0
@@ -1277,18 +1496,13 @@ msgid "Done"
msgstr "Urađeno"
#. module: sale
-#: model:ir.model,name:sale.model_sale_installer
-msgid "sale.installer"
-msgstr "sale.installer"
-
-#. module: sale
#: model:process.node,name:sale.process_node_invoice0
#: model:process.node,name:sale.process_node_invoiceafterdelivery0
msgid "Invoice"
msgstr "Račun"
#. module: sale
-#: code:addons/sale/sale.py:1014
+#: code:addons/sale/sale.py:1158
#, python-format
msgid ""
"You have to select a customer in the sales form !\n"
@@ -1296,11 +1510,6 @@ msgid ""
msgstr ""
#. module: sale
-#: selection:sale.config.picking_policy,step:0
-msgid "Picking List & Delivery Order"
-msgstr "Izborna Lista & Nalog Dostave"
-
-#. module: sale
#: field:sale.order,origin:0
msgid "Source Document"
msgstr ""
@@ -1326,7 +1535,7 @@ msgid "The amount without tax."
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:571
+#: code:addons/sale/sale.py:604
#, python-format
msgid "You must first cancel all picking attached to this sales order."
msgstr ""
@@ -1337,9 +1546,15 @@ msgid "Sales Advance Payment Invoice"
msgstr ""
#. module: sale
-#: field:sale.order,incoterm:0
-msgid "Incoterm"
-msgstr "Incoterm"
+#: view:sale.report:0
+#: field:sale.report,month:0
+msgid "Month"
+msgstr "Mesec"
+
+#. module: sale
+#: model:email.template,subject:sale.email_template_edi_sale
+msgid "${object.company_id.name} Order (Ref ${object.name or 'n/a' })"
+msgstr ""
#. module: sale
#: view:sale.order.line:0
@@ -1350,11 +1565,6 @@ msgid "Product"
msgstr "Proizvod"
#. module: sale
-#: model:ir.ui.menu,name:sale.menu_invoiced
-msgid "Invoicing"
-msgstr "Fakturisanje"
-
-#. module: sale
#: model:process.transition.action,name:sale.process_transition_action_cancelassignation0
msgid "Cancel Assignation"
msgstr "Otkazivanje prenosa"
@@ -1365,14 +1575,10 @@ msgid "sale.config.picking_policy"
msgstr "sale.config.picking_policy"
#. module: sale
-#: help:sale.order,state:0
-msgid ""
-"Gives the state of the quotation or sales order. \n"
-"The exception state is automatically set when a cancel operation occurs in "
-"the invoice validation (Invoice Exception) or in the picking list process "
-"(Shipping Exception). \n"
-"The 'Waiting Schedule' state is set when the invoice is confirmed but "
-"waiting for the scheduler to run on the date 'Ordered Date'."
+#: view:account.invoice.report:0
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_turnover_by_month
+msgid "Monthly Turnover"
msgstr ""
#. module: sale
@@ -1391,7 +1597,6 @@ msgid "Product UoS"
msgstr "Proizvod UoS"
#. module: sale
-#: selection:sale.order,state:0
#: selection:sale.report,state:0
msgid "Manual In Progress"
msgstr "U toku"
@@ -1412,7 +1617,8 @@ msgid "Order"
msgstr "Nalog"
#. module: sale
-#: code:addons/sale/sale.py:921
+#: code:addons/sale/sale.py:1016
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:71
#, python-format
msgid "There is no income account defined for this product: \"%s\" (id:%d)"
msgstr ""
@@ -1432,7 +1638,7 @@ msgid ""
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:1116
+#: code:addons/sale/sale.py:1238
#, python-format
msgid ""
"You plan to sell %.2f %s but you only have %.2f %s available !\n"
@@ -1463,10 +1669,10 @@ msgid "Total"
msgstr "Ukupno"
#. module: sale
-#: code:addons/sale/sale.py:388
-#, python-format
-msgid "There is no sales journal defined for this company: \"%s\" (id:%d)"
-msgstr ""
+#: report:sale.order:0
+#: view:sale.order.line:0
+msgid "Price"
+msgstr "Cena"
#. module: sale
#: model:process.transition,note:sale.process_transition_deliver0
@@ -1479,9 +1685,14 @@ msgstr ""
"potrosaca je yradjena kroz Nalog Isporuke rucno ili automatski."
#. module: sale
-#: code:addons/sale/sale.py:1165
-#, python-format
-msgid "Cannot delete a sales order line which is %s !"
+#: selection:sale.order,order_policy:0
+msgid "Pay before delivery"
+msgstr ""
+
+#. module: sale
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.open_board_sales
+msgid "Sales Dashboard"
msgstr ""
#. module: sale
@@ -1493,6 +1704,7 @@ msgstr "Napravi Fakture"
#. module: sale
#: view:sale.order:0
+#: selection:sale.order,state:0
#: view:sale.order.line:0
msgid "To Invoice"
msgstr "Za Fakturu"
@@ -1503,6 +1715,11 @@ msgid "Date on which sales order is confirmed."
msgstr ""
#. module: sale
+#: field:sale.order,project_id:0
+msgid "Contract/Analytic Account"
+msgstr ""
+
+#. module: sale
#: field:sale.order,company_id:0
#: field:sale.order.line,company_id:0
#: view:sale.report:0
@@ -1522,25 +1739,18 @@ msgid "The amount to be invoiced in advance."
msgstr "Iznos koji bi trebalo unapred fakturisati"
#. module: sale
-#: selection:sale.order,state:0
-#: selection:sale.report,state:0
-msgid "Invoice Exception"
-msgstr "Računi izuzeci"
-
-#. module: sale
-#: help:sale.order,picking_ids:0
+#: code:addons/sale/sale.py:1256
+#, python-format
msgid ""
-"This is a list of picking that has been generated for this sales order."
+"Couldn't find a pricelist line matching this product and quantity.\n"
+"You have to change either the product, the quantity or the pricelist."
msgstr ""
#. module: sale
-#: help:sale.installer,sale_margin:0
+#: help:sale.order,picking_ids:0
msgid ""
-"Gives the margin of profitability by calculating the difference between Unit "
-"Price and Cost Price."
+"This is a list of picking that has been generated for this sales order."
msgstr ""
-"Daje marzu profitabilnosti kalkulacijom razlike izmedju jedinicne cene i "
-"nabavne cene."
#. module: sale
#: view:sale.make.invoice:0
@@ -1561,6 +1771,11 @@ msgid "Cancelled"
msgstr "Otkazano"
#. module: sale
+#: view:sale.order.line:0
+msgid "Sales Order Lines related to a Sales Order of mine"
+msgstr ""
+
+#. module: sale
#: model:ir.actions.act_window,name:sale.action_shop_form
#: model:ir.ui.menu,name:sale.menu_action_shop_form
#: field:sale.order,shop_id:0
@@ -1570,17 +1785,12 @@ msgid "Shop"
msgstr "Prodavnica"
#. module: sale
-#: view:sale.report:0
-msgid " Month "
-msgstr " Mesec "
-
-#. module: sale
#: field:sale.report,date_confirm:0
msgid "Date Confirm"
msgstr "Datum potvrdjivanja"
#. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:111
+#: code:addons/sale/wizard/sale_line_invoice.py:113
#, python-format
msgid "Warning"
msgstr "Upozorenje"
@@ -1592,17 +1802,6 @@ msgid "Sales by Month"
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:1045
-#, python-format
-msgid ""
-"You selected a quantity of %d Units.\n"
-"But it's not compatible with the selected packaging.\n"
-"Here is a proposition of quantities according to the packaging:\n"
-"\n"
-"EAN: %s Quantity: %s Type of ul: %s"
-msgstr ""
-
-#. module: sale
#: model:ir.model,name:sale.model_sale_order
#: model:process.node,name:sale.process_node_order0
#: model:process.node,name:sale.process_node_saleorder0
@@ -1618,6 +1817,11 @@ msgid "Quantity (UoS)"
msgstr "Količina (UoS)"
#. module: sale
+#: view:sale.order.line:0
+msgid "Sale Order Lines that are in 'done' state"
+msgstr ""
+
+#. module: sale
#: model:process.transition,note:sale.process_transition_packing0
msgid ""
"The Pick List form is created as soon as the sales order is confirmed, in "
@@ -1632,6 +1836,11 @@ msgid "Confirmed"
msgstr "Potvrđeno"
#. module: sale
+#: field:sale.config.picking_policy,order_policy:0
+msgid "Main Method Based On"
+msgstr ""
+
+#. module: sale
#: model:process.transition.action,name:sale.process_transition_action_confirm0
msgid "Confirm"
msgstr "Potvrda"
@@ -1654,6 +1863,7 @@ msgid "Invoice Lines"
msgstr "Stavke računa"
#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_product_tree
#: view:sale.order:0
#: view:sale.order.line:0
msgid "Sales Order Lines"
@@ -1670,33 +1880,18 @@ msgid "Configuration"
msgstr "Konfiguracija"
#. module: sale
-#: selection:sale.order,picking_policy:0
-msgid "Complete Delivery"
-msgstr "Kompletna isporuka"
+#: code:addons/sale/edi/sale_order.py:146
+#, python-format
+msgid "EDI Pricelist (%s)"
+msgstr ""
#. module: sale
#: view:sale.report:0
-msgid " Month-1 "
-msgstr " Mesec-1 "
-
-#. module: sale
-#: help:sale.config.picking_policy,picking_policy:0
-msgid ""
-"The Shipping Policy is used to configure per order if you want to deliver as "
-"soon as possible when one product is available or you wait that all products "
-"are available.."
+msgid "Sales order created in current year"
msgstr ""
-"Politika dostave je uzeta za konfigurisanje po narudzbi ako zelis da izvrsis "
-"sto je pre moguce kolke god je proizvod dostupan ili ces sacekati dok svi "
-"naruceni proizvodi budu dostupni. ( Na lageru)"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "August"
-msgstr "Avgust"
#. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:111
+#: code:addons/sale/wizard/sale_line_invoice.py:113
#, python-format
msgid ""
"Invoice cannot be created for this Sales Order Line due to one of the "
@@ -1706,6 +1901,11 @@ msgid ""
msgstr ""
#. module: sale
+#: view:sale.order.line:0
+msgid "Sale order lines done"
+msgstr ""
+
+#. module: sale
#: field:sale.order.line,th_weight:0
msgid "Weight"
msgstr "Težina"
@@ -1724,7 +1924,6 @@ msgstr "Decembar"
#. module: sale
#: field:sale.config.picking_policy,config_logo:0
-#: field:sale.installer,config_logo:0
msgid "Image"
msgstr "Slika"
@@ -1754,9 +1953,9 @@ msgid "Salesman"
msgstr "Prodavac"
#. module: sale
-#: model:process.node,note:sale.process_node_saleorder0
-msgid "Drives procurement and invoicing"
-msgstr "Pogoni nabavke i fakturiranja"
+#: model:ir.actions.act_window,name:sale.action_order_tree
+msgid "Old Quotations"
+msgstr "Stari Upiti"
#. module: sale
#: field:sale.order,amount_untaxed:0
@@ -1764,7 +1963,7 @@ msgid "Untaxed Amount"
msgstr "Neoporezovani iznos"
#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:163
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:170
#: model:ir.actions.act_window,name:sale.action_view_sale_advance_payment_inv
#: view:sale.advance.payment.inv:0
#: view:sale.order:0
@@ -1773,7 +1972,7 @@ msgid "Advance Invoice"
msgstr "Račun unapred"
#. module: sale
-#: code:addons/sale/sale.py:591
+#: code:addons/sale/sale.py:624
#, python-format
msgid "The sales order '%s' has been cancelled."
msgstr ""
@@ -1808,20 +2007,20 @@ msgid "Packings"
msgstr ""
#. module: sale
-#: field:sale.config.picking_policy,progress:0
-#: field:sale.installer,progress:0
-msgid "Configuration Progress"
-msgstr "Konfiguracioni Progres"
+#: view:sale.order.line:0
+msgid "Sale Order Lines ready to be invoiced"
+msgstr ""
#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_product_tree
-msgid "Product sales"
-msgstr "Prodaja proizvoda"
+#: view:sale.report:0
+msgid "Sales order created in last month"
+msgstr ""
#. module: sale
-#: field:sale.order,date_order:0
-msgid "Ordered Date"
-msgstr "Naruceno Dana"
+#: model:ir.actions.act_window,name:sale.action_email_templates
+#: model:ir.ui.menu,name:sale.menu_email_templates
+msgid "Email Templates"
+msgstr ""
#. module: sale
#: model:ir.actions.act_window,name:sale.action_order_form
@@ -1831,14 +2030,15 @@ msgid "Sales Orders"
msgstr "Nalozi za prodaju"
#. module: sale
-#: selection:sale.config.picking_policy,picking_policy:0
-msgid "Direct Delivery"
-msgstr "Direktna isporuka"
+#: model:ir.model,name:sale.model_sale_shop
+#: view:sale.shop:0
+msgid "Sales Shop"
+msgstr ""
#. module: sale
-#: field:sale.installer,sale_journal:0
-msgid "Invoicing journals"
-msgstr "Dnevnici Faktura"
+#: selection:sale.report,month:0
+msgid "November"
+msgstr "Novembar"
#. module: sale
#: field:sale.advance.payment.inv,product_id:0
@@ -1846,18 +2046,12 @@ msgid "Advance Product"
msgstr "Unapređeni proizvod"
#. module: sale
-#: view:sale.report:0
-#: field:sale.report,shipped_qty_1:0
-msgid "Shipped Qty"
-msgstr "Isporucena Kolicina"
-
-#. module: sale
-#: view:sale.open.invoice:0
-msgid "You invoice has been successfully created!"
-msgstr "Vasa faktura je uspesno kreirana!"
+#: view:sale.order:0
+msgid "Compute"
+msgstr "Izračunavanje"
#. module: sale
-#: code:addons/sale/sale.py:585
+#: code:addons/sale/sale.py:618
#, python-format
msgid "You must first cancel all invoices attached to this sales order."
msgstr ""
@@ -1868,25 +2062,14 @@ msgid "January"
msgstr "Januar"
#. module: sale
-#: view:sale.installer:0
-msgid "Configure Your Sales Management Application"
-msgstr ""
-
-#. module: sale
#: model:ir.actions.act_window,name:sale.action_order_tree4
msgid "Sales Order in Progress"
msgstr "Nalog za prodaju u toku"
#. module: sale
-#: field:sale.installer,sale_layout:0
-msgid "Sales Order Layout Improvement"
-msgstr "Unapredjenje izgleda Prodajnog naloga"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:63
-#, python-format
-msgid "Error"
-msgstr "Greška"
+#: help:sale.order,origin:0
+msgid "Reference of the document that generated this sales order request."
+msgstr ""
#. module: sale
#: view:sale.report:0
@@ -1895,6 +2078,11 @@ msgid "Commitment Delay"
msgstr "Kasnjenje Komitenta"
#. module: sale
+#: selection:sale.order,order_policy:0
+msgid "Deliver & invoice on demand"
+msgstr ""
+
+#. module: sale
#: model:process.node,note:sale.process_node_saleprocurement0
msgid ""
"One Procurement order for each sales order line and for each of the "
@@ -1917,13 +2105,12 @@ msgid "Confirmed sales order to invoice."
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:290
-#, python-format
-msgid "Cannot delete Sales Order(s) which are already confirmed !"
+#: view:sale.order:0
+msgid "Sales Order that haven't yet been confirmed"
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:316
+#: code:addons/sale/sale.py:322
#, python-format
msgid "The sales order '%s' has been set in draft state."
msgstr ""
@@ -1934,37 +2121,27 @@ msgid "from stock"
msgstr "od akcije"
#. module: sale
-#: field:sale.config.picking_policy,order_policy:0
-msgid "Shipping Default Policy"
-msgstr "Podrazumevane opcije za isporuku"
-
-#. module: sale
#: view:sale.open.invoice:0
msgid "Close"
msgstr "Zatvaranje"
#. module: sale
+#: code:addons/sale/sale.py:1248
+#, python-format
+msgid "No Pricelist ! : "
+msgstr ""
+
+#. module: sale
#: field:sale.order,shipped:0
msgid "Delivered"
msgstr "Isporuceno"
#. module: sale
-#: code:addons/sale/sale.py:1115
-#, python-format
-msgid "Not enough stock !"
-msgstr "Nema dovoljno mesta na lageru !"
-
-#. module: sale
#: constraint:stock.move:0
msgid "You must assign a production lot for this product"
msgstr ""
#. module: sale
-#: field:sale.order.line,sequence:0
-msgid "Layout Sequence"
-msgstr ""
-
-#. module: sale
#: model:ir.actions.act_window,help:sale.action_shop_form
msgid ""
"If you have more than one shop reselling your company products, you can "
@@ -1991,11 +2168,6 @@ msgid "May"
msgstr "Maj"
#. module: sale
-#: help:sale.installer,sale_order_dates:0
-msgid "Adds commitment, requested and effective dates on Sales Orders."
-msgstr "Dodaj komitenta, zahtevanog i efektivnog datuma Prodajnog Naloga."
-
-#. module: sale
#: view:sale.order:0
#: field:sale.order,partner_id:0
#: field:sale.order.line,order_partner_id:0
@@ -2003,25 +2175,11 @@ msgid "Customer"
msgstr "Kupac"
#. module: sale
-#: model:product.template,name:sale.advance_product_0_product_template
-msgid "Advance"
-msgstr ""
-
-#. module: sale
#: selection:sale.report,month:0
msgid "February"
msgstr "Februar"
#. module: sale
-#: help:sale.installer,sale_journal:0
-msgid ""
-"Allows you to group and invoice your delivery orders according to different "
-"invoicing types: daily, weekly, etc."
-msgstr ""
-"Omogucava ti da grupiras i fakturises tvoje naloge Dostave uzimajuci u obzir "
-"razlicite tipove faktura: dnevno, nedeljno, etc."
-
-#. module: sale
#: selection:sale.report,month:0
msgid "April"
msgstr "April"
@@ -2032,11 +2190,6 @@ msgid "Accounting"
msgstr "Računovodstvo"
#. module: sale
-#: field:sale.config.picking_policy,step:0
-msgid "Steps To Deliver a Sales Order"
-msgstr ""
-
-#. module: sale
#: view:sale.order:0
#: view:sale.order.line:0
msgid "Search Sales Order"
@@ -2048,19 +2201,18 @@ msgid "Sales Order Requisition"
msgstr ""
#. module: sale
+#: code:addons/sale/sale.py:1242
+#, python-format
+msgid "Not enough stock ! : "
+msgstr ""
+
+#. module: sale
#: report:sale.order:0
#: field:sale.order,payment_term:0
msgid "Payment Term"
msgstr "Uslovi plaćanja"
#. module: sale
-#: help:sale.installer,sale_layout:0
-msgid ""
-"Provides some features to improve the layout of the Sales Order reports."
-msgstr ""
-"Daje neke mogucnosti za unapredjenje izgleda Izvestaja Prodajnih Naloga"
-
-#. module: sale
#: model:ir.actions.act_window,help:sale.action_order_report_all
msgid ""
"This report performs analysis on your quotations and sales orders. Analysis "
@@ -2092,6 +2244,9 @@ msgstr "Godina"
msgid "Invoice Based on Deliveries"
msgstr "Račun na osnovu isporuke"
+#~ msgid "Partial Delivery"
+#~ msgstr "Parcijalna isporuka"
+
#~ msgid "Steps To Deliver a Sale Order"
#~ msgstr "Koraci za dostavu naloga za prodaju"
@@ -2131,6 +2286,9 @@ msgstr "Račun na osnovu isporuke"
#~ msgid "Invoice after delivery"
#~ msgstr "Račun nakon isporuke"
+#~ msgid "Shipping Policy"
+#~ msgstr "Opcije transporta"
+
#~ msgid "Origin"
#~ msgstr "Početak"
@@ -2140,6 +2298,9 @@ msgstr "Račun na osnovu isporuke"
#~ msgid "Reference"
#~ msgstr "Veza"
+#~ msgid "All at Once"
+#~ msgstr "Sve odjednom"
+
#~ msgid "Procurement is created after confirmation of sale order."
#~ msgstr "Nabavka je nastala nakon potvrde naloga za prodaju."
@@ -2208,6 +2369,9 @@ msgstr "Račun na osnovu isporuke"
#~ "Kada izaberete pravilo dostave = 'Automatski račun nakon isporuke' , tada će "
#~ "se automatski kreirati posle isporuke."
+#~ msgid "Complete Delivery"
+#~ msgstr "Kompletna isporuka"
+
#~ msgid "Manual Description"
#~ msgstr "Opis"
@@ -2254,15 +2418,15 @@ msgstr "Račun na osnovu isporuke"
#~ msgid "Procurement for each line"
#~ msgstr "Izvršavanje za svaku stavku"
-#~ msgid "My Quotations"
-#~ msgstr "Moja ponuda"
-
#~ msgid "Packing Default Policy"
#~ msgstr "Podrazumevane opcije za pakovanje"
#~ msgid "Manages the delivery and invoicing progress"
#~ msgstr "Upravljanje napredovanjem isporuke i računima"
+#~ msgid "Shipping Default Policy"
+#~ msgstr "Podrazumevane opcije za isporuku"
+
#, python-format
#~ msgid "Could not cancel sale order !"
#~ msgstr "Ne možete da otkažete nalog za prodaju!"
@@ -2320,6 +2484,9 @@ msgstr "Račun na osnovu isporuke"
#~ msgid "Procurement Corrected"
#~ msgstr "Ispravljene nabavke"
+#~ msgid "Shipping & Manual Invoice"
+#~ msgstr "Isporuka & Račun"
+
#~ msgid "Configure Sale Order Logistic"
#~ msgstr "Konfigurisanje logistike naloga za prodaju"
@@ -2329,6 +2496,9 @@ msgstr "Račun na osnovu isporuke"
#~ msgid "Packing Policy"
#~ msgstr "Opcije otpreme"
+#~ msgid "Product sales"
+#~ msgstr "Prodaja proizvoda"
+
#~ msgid "Our Salesman"
#~ msgstr "Naš prodavac"
@@ -2344,6 +2514,9 @@ msgstr "Račun na osnovu isporuke"
#~ msgid "Sale Pricelists"
#~ msgstr "Cenovnik prodaje"
+#~ msgid "Direct Delivery"
+#~ msgstr "Direktna isporuka"
+
#~ msgid ""
#~ "Invoice is created when 'Create Invoice' is being clicked after confirming "
#~ "the sale order. This transaction moves the sale order to invoices."
@@ -2351,6 +2524,9 @@ msgstr "Račun na osnovu isporuke"
#~ "Račun je kreiran kada je kliknuto 'Kreiranje račun' nakon potvrde naloga za "
#~ "prodaju. Ovaj proces prenosi nalog za prodaju do računa."
+#~ msgid "Delivery Order Only"
+#~ msgstr "Isključivo nalog za isporuku"
+
#~ msgid "Sales order lines"
#~ msgstr "Stavke naloga za prodaju"
@@ -2426,6 +2602,9 @@ msgstr "Račun na osnovu isporuke"
#~ msgid "Open Advance Invoice"
#~ msgstr "Otvaranje računa unapred"
+#~ msgid "Sales Management"
+#~ msgstr "Menadžment prodaje"
+
#~ msgid "Deliver"
#~ msgstr "Isporuka"
@@ -2485,6 +2664,9 @@ msgstr "Račun na osnovu isporuke"
#~ msgid "Related invoices"
#~ msgstr "Povezani računi"
+#~ msgid "Payment Before Delivery"
+#~ msgstr "Plaćanje pre isporuke"
+
#~ msgid ""
#~ "This is the list of invoices that have been generated for this sale order. "
#~ "The same sale order may have been invoiced in several times (by line for "
@@ -2503,9 +2685,15 @@ msgstr "Račun na osnovu isporuke"
#~ msgid "Make Invoice"
#~ msgstr "Kreiraj račun"
+#~ msgid "Allows you to compute delivery costs on your quotations."
+#~ msgstr "Omogucava ti da izracunas troskove isporuke po tvojim upitima"
+
#~ msgid "Invalid model name in the action definition."
#~ msgstr "Neispravno ime modela u definiciji akcije."
+#~ msgid "Configure Picking Policy for Sales Order"
+#~ msgstr "Konfigurisi Izbornu politiku za Prodajne Naloge"
+
#~ msgid "Error: UOS must be in a different category than the UOM"
#~ msgstr ""
#~ "Greska : JU (JedinicaUsluge) mora da bude u razlicitoj kategoriji od JM ( "
@@ -2514,5 +2702,109 @@ msgstr "Račun na osnovu isporuke"
#~ msgid "Error: Invalid ean code"
#~ msgstr "Greska: Neispravan EAN kod"
+#~ msgid ""
+#~ "Provides some features to improve the layout of the Sales Order reports."
+#~ msgstr ""
+#~ "Daje neke mogucnosti za unapredjenje izgleda Izvestaja Prodajnih Naloga"
+
+#~ msgid " Year "
+#~ msgstr " Godina "
+
+#~ msgid "Sales Order Dates"
+#~ msgstr "Datumi Prodajnih Naloga"
+
+#~ msgid "Margins in Sales Orders"
+#~ msgstr "Marze u Prodajnim nalozima"
+
+#~ msgid "Sales Application Configuration"
+#~ msgstr "POdesavanje Aplikacije Prodaje"
+
+#~ msgid "Delivery Costs"
+#~ msgstr "Trosak Dostave"
+
#~ msgid "Recreate Procurement"
#~ msgstr "Ponovi Nabavku"
+
+#~ msgid "Order date"
+#~ msgstr "Naruceno Dana"
+
+#~ msgid "title"
+#~ msgstr "Naslov"
+
+#, python-format
+#~ msgid "Picking Information !"
+#~ msgstr "Informacije Izbora"
+
+#~ msgid ""
+#~ "By default, OpenERP is able to manage complex routing and paths of products "
+#~ "in your warehouse and partner locations. This will configure the most common "
+#~ "and simple methods to deliver products to the customer in one or two "
+#~ "operations by the worker."
+#~ msgstr ""
+#~ "Podrazumevano, OpenERP je sposoban da upravlja kompleksnim rutiranjima i "
+#~ "putanjama u tvom skladistu i lokacijama partnera, Ovo ce podesiti najcesce i "
+#~ "proste metode za isporuku proizvoda klijentima u samo jednoj ili dve "
+#~ "operacije radnika."
+
+#~ msgid "sale.installer"
+#~ msgstr "sale.installer"
+
+#~ msgid "Picking List & Delivery Order"
+#~ msgstr "Izborna Lista & Nalog Dostave"
+
+#~ msgid "Invoicing"
+#~ msgstr "Fakturisanje"
+
+#~ msgid ""
+#~ "Gives the margin of profitability by calculating the difference between Unit "
+#~ "Price and Cost Price."
+#~ msgstr ""
+#~ "Daje marzu profitabilnosti kalkulacijom razlike izmedju jedinicne cene i "
+#~ "nabavne cene."
+
+#~ msgid " Month "
+#~ msgstr " Mesec "
+
+#~ msgid " Month-1 "
+#~ msgstr " Mesec-1 "
+
+#~ msgid ""
+#~ "The Shipping Policy is used to configure per order if you want to deliver as "
+#~ "soon as possible when one product is available or you wait that all products "
+#~ "are available.."
+#~ msgstr ""
+#~ "Politika dostave je uzeta za konfigurisanje po narudzbi ako zelis da izvrsis "
+#~ "sto je pre moguce kolke god je proizvod dostupan ili ces sacekati dok svi "
+#~ "naruceni proizvodi budu dostupni. ( Na lageru)"
+
+#~ msgid "Invoicing journals"
+#~ msgstr "Dnevnici Faktura"
+
+#~ msgid "Ordered Date"
+#~ msgstr "Naruceno Dana"
+
+#~ msgid "Configuration Progress"
+#~ msgstr "Konfiguracioni Progres"
+
+#~ msgid "Shipped Qty"
+#~ msgstr "Isporucena Kolicina"
+
+#~ msgid "Sales Order Layout Improvement"
+#~ msgstr "Unapredjenje izgleda Prodajnog naloga"
+
+#, python-format
+#~ msgid "Not enough stock !"
+#~ msgstr "Nema dovoljno mesta na lageru !"
+
+#~ msgid "Adds commitment, requested and effective dates on Sales Orders."
+#~ msgstr "Dodaj komitenta, zahtevanog i efektivnog datuma Prodajnog Naloga."
+
+#~ msgid ""
+#~ "Allows you to group and invoice your delivery orders according to different "
+#~ "invoicing types: daily, weekly, etc."
+#~ msgstr ""
+#~ "Omogucava ti da grupiras i fakturises tvoje naloge Dostave uzimajuci u obzir "
+#~ "razlicite tipove faktura: dnevno, nedeljno, etc."
+
+#~ msgid "Picking Default Policy"
+#~ msgstr "Podrazumevana Izborna Politika"
diff --git a/addons/sale/i18n/sr@latin.po b/addons/sale/i18n/sr@latin.po
index 79790d77d96..98ebbb1206c 100644
--- a/addons/sale/i18n/sr@latin.po
+++ b/addons/sale/i18n/sr@latin.po
@@ -7,15 +7,27 @@ msgid ""
msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-01-11 11:16+0000\n"
+"POT-Creation-Date: 2011-12-22 18:43+0000\n"
"PO-Revision-Date: 2010-12-23 11:16+0000\n"
"Last-Translator: qdp (OpenERP) <qdp-launchpad@tinyerp.com>\n"
"Language-Team: Serbian <sr@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-05 05:17+0000\n"
-"X-Generator: Launchpad (build 14231)\n"
+"X-Launchpad-Export-Date: 2011-12-23 06:47+0000\n"
+"X-Generator: Launchpad (build 14560)\n"
+
+#. module: sale
+#: field:sale.config.picking_policy,timesheet:0
+msgid "Based on Timesheet"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid ""
+"Sale Order Lines that are confirmed, done or in exception state and haven't "
+"yet been invoiced"
+msgstr ""
#. module: sale
#: view:board.board:0
@@ -24,11 +36,6 @@ msgid "Sales by Salesman in last 90 days"
msgstr ""
#. module: sale
-#: help:sale.installer,delivery:0
-msgid "Allows you to compute delivery costs on your quotations."
-msgstr "Omogucava ti da izracunas troskove isporuke po tvojim upitima"
-
-#. module: sale
#: help:sale.order,picking_policy:0
msgid ""
"If you don't have enough stock available to deliver all at once, do you "
@@ -38,6 +45,11 @@ msgstr ""
"parcijalne isporuke ili ne?"
#. module: sale
+#: view:sale.order:0
+msgid "UoS"
+msgstr ""
+
+#. module: sale
#: help:sale.order,partner_shipping_id:0
msgid "Shipping address for current sales order."
msgstr ""
@@ -61,22 +73,12 @@ msgid "Cancel Order"
msgstr "Poništite nalog"
#. module: sale
-#: view:sale.config.picking_policy:0
-msgid "Configure Sales Order Logistics"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:603
+#: code:addons/sale/sale.py:638
#, python-format
msgid "The quotation '%s' has been converted to a sales order."
msgstr ""
#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Payment Before Delivery"
-msgstr "Plaćanje pre isporuke"
-
-#. module: sale
#: code:addons/sale/wizard/sale_make_invoice.py:42
#, python-format
msgid "Warning !"
@@ -93,12 +95,6 @@ msgid "Drives procurement orders for every sales order line."
msgstr ""
#. module: sale
-#: selection:sale.config.picking_policy,picking_policy:0
-msgid "All at Once"
-msgstr "Sve odjednom"
-
-#. module: sale
-#: field:sale.order,project_id:0
#: view:sale.report:0
#: field:sale.report,analytic_account_id:0
#: field:sale.shop,project_id:0
@@ -114,6 +110,15 @@ msgid ""
msgstr ""
#. module: sale
+#: code:addons/sale/sale.py:295
+#, python-format
+msgid ""
+"In order to delete a confirmed sale order, you must cancel it before ! To "
+"cancel a sale order, you must first cancel related picking or delivery "
+"orders."
+msgstr ""
+
+#. module: sale
#: model:process.node,name:sale.process_node_saleprocurement0
msgid "Procurement Order"
msgstr "Nalog za Nabavku"
@@ -125,6 +130,11 @@ msgid "Partner"
msgstr "Partner"
#. module: sale
+#: selection:sale.order,order_policy:0
+msgid "Invoice based on deliveries"
+msgstr ""
+
+#. module: sale
#: view:sale.order:0
msgid "Order Line"
msgstr "Stavke naloga"
@@ -162,9 +172,14 @@ msgid "Default Payment Term"
msgstr "Podrazumevani uslovi plaćanja"
#. module: sale
-#: model:ir.actions.act_window,name:sale.action_config_picking_policy
-msgid "Configure Picking Policy for Sales Order"
-msgstr "Konfigurisi Izbornu politiku za Prodajne Naloge"
+#: field:sale.config.picking_policy,deli_orders:0
+msgid "Based on Delivery Orders"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.picking_policy,time_unit:0
+msgid "Main Working Time Unit"
+msgstr ""
#. module: sale
#: view:sale.order:0
@@ -180,9 +195,10 @@ msgid "Disc.(%)"
msgstr "Popust (%)"
#. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_forceassignation0
-msgid "Force Assignation"
-msgstr "Prinudni prenos"
+#: view:sale.report:0
+#: field:sale.report,price_total:0
+msgid "Total Price"
+msgstr "Ukupna Cena"
#. module: sale
#: help:sale.make.invoice,grouped:0
@@ -190,6 +206,11 @@ msgid "Check the box to group the invoices for the same customers"
msgstr "Cekiraj ovu kucicu da grupises fakture za iste klijente."
#. module: sale
+#: view:sale.order:0
+msgid "My Sale Orders"
+msgstr ""
+
+#. module: sale
#: selection:sale.order,invoice_quantity:0
msgid "Ordered Quantities"
msgstr "Narucene Kolicine"
@@ -230,13 +251,24 @@ msgstr ""
"Izvora' ili ' faktura na zahtev nakon isporuke'."
#. module: sale
+#: field:sale.config.picking_policy,task_work:0
+msgid "Based on Tasks' Work"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
+msgid "Quotations and Sales"
+msgstr ""
+
+#. module: sale
#: model:ir.model,name:sale.model_sale_make_invoice
msgid "Sales Make Invoice"
msgstr ""
#. module: sale
-#: view:sale.order:0
-msgid "Recreate Packing"
+#: code:addons/sale/sale.py:330
+#, python-format
+msgid "Pricelist Warning!"
msgstr ""
#. module: sale
@@ -245,11 +277,10 @@ msgid "Discount (%)"
msgstr "Popust (%)"
#. module: sale
-#: help:res.company,security_lead:0
-msgid ""
-"This is the days added to what you promise to customers for security purpose"
-msgstr ""
-"Ovo su dani dodati onome sto su obecao klijentima iz sigurnosnih razloga."
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_quotation_for_sale
+msgid "My Quotations"
+msgstr "Moja ponuda"
#. module: sale
#: view:board.board:0
@@ -274,7 +305,22 @@ msgid "Shop Name"
msgstr "Ime prodavnice"
#. module: sale
-#: code:addons/sale/sale.py:1014
+#: help:sale.order,order_policy:0
+msgid ""
+"The Invoice Policy is used to synchronise invoice and delivery operations.\n"
+" - The 'Pay before delivery' choice will first generate the invoice and "
+"then generate the picking order after the payment of this invoice.\n"
+" - The 'Deliver & Invoice on demand' will create the picking order directly "
+"and wait for the user to manually click on the 'Invoice' button to generate "
+"the draft invoice based on the sale order or the sale order lines.\n"
+" - The 'Invoice on order after delivery' choice will generate the draft "
+"invoice based on sales order after all picking lists have been finished.\n"
+" - The 'Invoice based on deliveries' choice is used to create an invoice "
+"during the picking process."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:1158
#, python-format
msgid "No Customer Defined !"
msgstr "Kupac nije definisan!"
@@ -285,9 +331,12 @@ msgid "Sales in Exception"
msgstr "Prodaje izuzeci"
#. module: sale
-#: view:sale.order:0
-msgid "Set to Draft"
-msgstr "Postavi u Pripremu"
+#: code:addons/sale/sale.py:1145
+#: code:addons/sale/sale.py:1264
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:70
+#, python-format
+msgid "Configuration Error !"
+msgstr ""
#. module: sale
#: view:sale.order:0
@@ -295,22 +344,7 @@ msgid "Conditions"
msgstr "Uslovi"
#. module: sale
-#: help:sale.order,order_policy:0
-msgid ""
-"The Shipping Policy is used to synchronise invoice and delivery operations.\n"
-" - The 'Pay Before delivery' choice will first generate the invoice and "
-"then generate the picking order after the payment of this invoice.\n"
-" - The 'Shipping & Manual Invoice' will create the picking order directly "
-"and wait for the user to manually click on the 'Invoice' button to generate "
-"the draft invoice.\n"
-" - The 'Invoice On Order After Delivery' choice will generate the draft "
-"invoice based on sales order after all picking lists have been finished.\n"
-" - The 'Invoice From The Picking' choice is used to create an invoice "
-"during the picking process."
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:939
+#: code:addons/sale/sale.py:1034
#, python-format
msgid ""
"There is no income category account defined in default Properties for "
@@ -320,9 +354,9 @@ msgstr ""
"Kategoriju Proizvoda ili nije definisana Fiskalna Pozicija !"
#. module: sale
-#: view:sale.installer:0
-msgid "Configure"
-msgstr ""
+#: selection:sale.report,month:0
+msgid "August"
+msgstr "Avgust"
#. module: sale
#: constraint:stock.move:0
@@ -330,7 +364,7 @@ msgid "You try to assign a lot which is not from the same product"
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:620
+#: code:addons/sale/sale.py:655
#, python-format
msgid "invalid mode for test_state"
msgstr "pogrešan mod za test_state"
@@ -341,7 +375,7 @@ msgid "June"
msgstr "Jun"
#. module: sale
-#: code:addons/sale/sale.py:584
+#: code:addons/sale/sale.py:617
#, python-format
msgid "Could not cancel this sales order !"
msgstr ""
@@ -362,8 +396,12 @@ msgid "October"
msgstr "Oktobar"
#. module: sale
+#: sql_constraint:stock.picking:0
+msgid "Reference must be unique per Company!"
+msgstr ""
+
+#. module: sale
#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_quotation_for_sale
#: view:sale.order:0
#: view:sale.report:0
msgid "Quotations"
@@ -375,11 +413,6 @@ msgid "Pricelist for current sales order."
msgstr ""
#. module: sale
-#: selection:sale.config.picking_policy,step:0
-msgid "Delivery Order Only"
-msgstr "Isključivo nalog za isporuku"
-
-#. module: sale
#: report:sale.order:0
msgid "TVA :"
msgstr "TVA:"
@@ -404,6 +437,7 @@ msgstr "Fiskalna pozicija"
#. module: sale
#: view:sale.order:0
#: view:sale.order.line:0
+#: field:sale.report,product_uom:0
msgid "UoM"
msgstr "JM"
@@ -426,13 +460,19 @@ msgid ""
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:971
+#: code:addons/sale/sale.py:1061
+#, python-format
+msgid "You cannot cancel a sale order line that has already been invoiced!"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:1066
#, python-format
msgid "You must first cancel stock moves attached to this sales order line."
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:1042
+#: code:addons/sale/sale.py:1134
#, python-format
msgid "(n/a)"
msgstr ""
@@ -468,13 +508,35 @@ msgid "Notes"
msgstr "Beleške"
#. module: sale
+#: sql_constraint:res.company:0
+msgid "The company name must be unique !"
+msgstr ""
+
+#. module: sale
#: help:sale.order,partner_invoice_id:0
msgid "Invoice address for current sales order."
msgstr ""
#. module: sale
-#: view:sale.installer:0
-msgid "Enhance your core Sales Application with additional functionalities."
+#: view:sale.report:0
+msgid "Month-1"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered month of the sales order"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:504
+#, python-format
+msgid ""
+"You cannot group sales having different currencies for the same partner."
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,picking_policy:0
+msgid "Deliver each product when available"
msgstr ""
#. module: sale
@@ -494,21 +556,43 @@ msgid "Confirmation Date"
msgstr "Datum Potvrde"
#. module: sale
+#: field:sale.order,incoterm:0
+msgid "Incoterm"
+msgstr "Incoterm"
+
+#. module: sale
#: field:sale.order.line,address_allotment_id:0
msgid "Allotment Partner"
msgstr "Dodeljivanje partnera"
#. module: sale
-#: sql_constraint:sale.order:0
-msgid "Order Reference must be unique !"
-msgstr ""
-
-#. module: sale
#: selection:sale.report,month:0
msgid "March"
msgstr "Mart"
#. module: sale
+#: constraint:stock.move:0
+msgid "You can not move products from or to a location of the type view."
+msgstr ""
+
+#. module: sale
+#: field:sale.config.picking_policy,sale_orders:0
+msgid "Based on Sales Orders"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,state:0
+msgid ""
+"Givwizard = self.browse(cr, uid, ids)[0]es the state of the quotation or "
+"sales order. \n"
+"The exception state is automatically set when a cancel operation occurs in "
+"the invoice validation (Invoice Exception) or in the picking list process "
+"(Shipping Exception). \n"
+"The 'Waiting Schedule' state is set when the invoice is confirmed but "
+"waiting for the scheduler to run on the order date."
+msgstr ""
+
+#. module: sale
#: help:sale.order,amount_total:0
msgid "The total amount."
msgstr ""
@@ -524,6 +608,11 @@ msgid "Invoice address :"
msgstr "Adresa računa:"
#. module: sale
+#: field:sale.order.line,sequence:0
+msgid "Line Sequence"
+msgstr ""
+
+#. module: sale
#: model:process.transition,note:sale.process_transition_saleorderprocurement0
msgid ""
"For every sales order line, a procurement order is created to supply the "
@@ -570,11 +659,6 @@ msgid "Sales Order Line"
msgstr ""
#. module: sale
-#: view:sale.config.picking_policy:0
-msgid "Setup your sales workflow and default values."
-msgstr ""
-
-#. module: sale
#: field:sale.shop,warehouse_id:0
msgid "Warehouse"
msgstr "Skladište"
@@ -611,6 +695,11 @@ msgid "Creation Date"
msgstr "datum Kreacije"
#. module: sale
+#: model:ir.ui.menu,name:sale.menu_sales_configuration_misc
+msgid "Miscellaneous"
+msgstr ""
+
+#. module: sale
#: model:ir.actions.act_window,name:sale.action_order_line_tree3
msgid "Uninvoiced and Delivered Lines"
msgstr "Stavke za koje ne postoji račun a isporučene su"
@@ -626,14 +715,19 @@ msgid "My Sales"
msgstr "Moje Prodaje"
#. module: sale
-#: code:addons/sale/sale.py:290
-#: code:addons/sale/sale.py:966
-#: code:addons/sale/sale.py:1165
+#: code:addons/sale/sale.py:295
+#: code:addons/sale/sale.py:1061
+#: code:addons/sale/sale.py:1290
#, python-format
msgid "Invalid action !"
msgstr "Neispravna akcija!"
#. module: sale
+#: view:sale.order:0
+msgid "Extra Info"
+msgstr "Dodatne informacije"
+
+#. module: sale
#: field:sale.order,pricelist_id:0
#: field:sale.report,pricelist_id:0
#: field:sale.shop,pricelist_id:0
@@ -647,13 +741,21 @@ msgid "# of Qty"
msgstr "# Kol"
#. module: sale
+#: code:addons/sale/sale.py:1314
+#, python-format
+msgid "Hour"
+msgstr ""
+
+#. module: sale
#: view:sale.order:0
msgid "Order Date"
msgstr "Datum Naloga"
#. module: sale
#: view:sale.order.line:0
+#: view:sale.report:0
#: field:sale.report,shipped:0
+#: field:sale.report,shipped_qty_1:0
msgid "Shipped"
msgstr "Isporuceno"
@@ -663,8 +765,8 @@ msgid "All Quotations"
msgstr "Sve ponude"
#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Invoice On Order After Delivery"
+#: view:sale.config.picking_policy:0
+msgid "Options"
msgstr ""
#. module: sale
@@ -673,6 +775,20 @@ msgid "September"
msgstr "Septembar"
#. module: sale
+#: code:addons/sale/sale.py:632
+#, python-format
+msgid "You cannot confirm a sale order which has no line."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:1246
+#, python-format
+msgid ""
+"You have to select a pricelist or a customer in the sales form !\n"
+"Please set one before choosing a product."
+msgstr ""
+
+#. module: sale
#: view:sale.report:0
#: field:sale.report,categ_id:0
msgid "Category of Product"
@@ -689,11 +805,6 @@ msgid "Stock Moves"
msgstr "POmeranje Lagera"
#. module: sale
-#: view:sale.report:0
-msgid " Year "
-msgstr " Godina "
-
-#. module: sale
#: field:sale.order,state:0
#: field:sale.report,state:0
msgid "Order State"
@@ -711,7 +822,7 @@ msgid "Sales By Month"
msgstr "Mesecna Prodaja"
#. module: sale
-#: code:addons/sale/sale.py:970
+#: code:addons/sale/sale.py:1065
#, python-format
msgid "Could not cancel sales order line!"
msgstr ""
@@ -744,42 +855,19 @@ msgid ""
msgstr ""
#. module: sale
+#: field:sale.order,date_order:0
+msgid "Date"
+msgstr ""
+
+#. module: sale
#: view:sale.report:0
msgid "Extended Filters..."
msgstr "Prosireni Filteri"
#. module: sale
-#: model:ir.module.module,description:sale.module_meta_information
-msgid ""
-"\n"
-" The base module to manage quotations and sales orders.\n"
-"\n"
-" * Workflow with validation steps:\n"
-" - Quotation -> Sales order -> Invoice\n"
-" * Invoicing methods:\n"
-" - Invoice on order (before or after shipping)\n"
-" - Invoice on delivery\n"
-" - Invoice on timesheets\n"
-" - Advance invoice\n"
-" * Partners preferences (shipping, invoicing, incoterm, ...)\n"
-" * Products stocks and prices\n"
-" * Delivery methods:\n"
-" - all at once, multi-parcel\n"
-" - delivery costs\n"
-" * Dashboard for salesman that includes:\n"
-" * Your open quotations\n"
-" * Top 10 sales of the month\n"
-" * Cases statistics\n"
-" * Graph of sales by product\n"
-" * Graph of cases of the month\n"
-" "
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_shop
-#: view:sale.shop:0
-msgid "Sales Shop"
-msgstr ""
+#: selection:sale.order.line,state:0
+msgid "Exception"
+msgstr "Izuzetak"
#. module: sale
#: model:ir.model,name:sale.model_res_company
@@ -787,9 +875,10 @@ msgid "Companies"
msgstr "Preduzeca"
#. module: sale
-#: selection:sale.report,month:0
-msgid "November"
-msgstr "Novembar"
+#: code:addons/sale/sale.py:1259
+#, python-format
+msgid "No valid pricelist line found ! :"
+msgstr ""
#. module: sale
#: view:sale.order:0
@@ -797,9 +886,9 @@ msgid "History"
msgstr "Arhiva"
#. module: sale
-#: field:sale.config.picking_policy,picking_policy:0
-msgid "Picking Default Policy"
-msgstr "Podrazumevana Izborna Politika"
+#: selection:sale.order,order_policy:0
+msgid "Invoice on order after delivery"
+msgstr ""
#. module: sale
#: help:sale.order,invoice_ids:0
@@ -821,13 +910,13 @@ msgid ""
msgstr "Ime i aadresa kontakta koji je zatrazio upit ili Narudzbu."
#. module: sale
-#: code:addons/sale/sale.py:966
-#, python-format
-msgid "You cannot cancel a sales order line that has already been invoiced !"
+#: help:res.company,security_lead:0
+msgid ""
+"This is the days added to what you promise to customers for security purpose"
msgstr ""
+"Ovo su dani dodati onome sto su obecao klijentima iz sigurnosnih razloga."
#. module: sale
-#: view:sale.order:0
#: view:sale.order.line:0
msgid "Qty"
msgstr "Kol"
@@ -838,6 +927,11 @@ msgid "References"
msgstr "Reference"
#. module: sale
+#: view:sale.order.line:0
+msgid "My Sales Order Lines"
+msgstr ""
+
+#. module: sale
#: model:process.transition.action,name:sale.process_transition_action_cancel0
#: model:process.transition.action,name:sale.process_transition_action_cancel1
#: model:process.transition.action,name:sale.process_transition_action_cancel2
@@ -849,14 +943,9 @@ msgid "Cancel"
msgstr "Otkaži"
#. module: sale
-#: field:sale.installer,sale_order_dates:0
-msgid "Sales Order Dates"
-msgstr "Datumi Prodajnih Naloga"
-
-#. module: sale
-#: selection:sale.order.line,state:0
-msgid "Exception"
-msgstr "Izuzetak"
+#: sql_constraint:sale.order:0
+msgid "Order Reference must be unique per Company!"
+msgstr ""
#. module: sale
#: model:process.transition,name:sale.process_transition_invoice0
@@ -868,19 +957,19 @@ msgid "Create Invoice"
msgstr "Kreiranje računa"
#. module: sale
-#: field:sale.installer,sale_margin:0
-msgid "Margins in Sales Orders"
-msgstr "Marze u Prodajnim nalozima"
-
-#. module: sale
#: view:sale.order:0
msgid "Total Tax Excluded"
msgstr "ukupno iskljucenih poreza"
#. module: sale
-#: view:sale.order:0
-msgid "Compute"
-msgstr "Izračunavanje"
+#: view:sale.order.line:0
+msgid "Order reference"
+msgstr ""
+
+#. module: sale
+#: view:sale.open.invoice:0
+msgid "You invoice has been successfully created!"
+msgstr "Vasa faktura je uspesno kreirana!"
#. module: sale
#: view:sale.report:0
@@ -899,23 +988,20 @@ msgid "Open Invoice"
msgstr "Ovori Fakturu"
#. module: sale
-#: report:sale.order:0
-#: view:sale.order.line:0
-msgid "Price"
-msgstr "Cena"
+#: model:ir.actions.server,name:sale.ir_actions_server_edi_sale
+msgid "Auto-email confirmed sale orders"
+msgstr ""
#. module: sale
-#: model:ir.actions.act_window,name:sale.action_sale_installer
-#: view:sale.config.picking_policy:0
-#: view:sale.installer:0
-msgid "Sales Application Configuration"
-msgstr "POdesavanje Aplikacije Prodaje"
+#: code:addons/sale/sale.py:413
+#, python-format
+msgid "There is no sales journal defined for this company: \"%s\" (id:%d)"
+msgstr ""
#. module: sale
-#: view:sale.report:0
-#: field:sale.report,price_total:0
-msgid "Total Price"
-msgstr "Ukupna Cena"
+#: model:process.transition.action,name:sale.process_transition_action_forceassignation0
+msgid "Force Assignation"
+msgstr "Prinudni prenos"
#. module: sale
#: selection:sale.order.line,type:0
@@ -928,6 +1014,11 @@ msgid "Based on the shipped or on the ordered quantities."
msgstr "Bazirano na isporucenim ili narucenim kolicinama."
#. module: sale
+#: selection:sale.order,picking_policy:0
+msgid "Deliver all products at once"
+msgstr ""
+
+#. module: sale
#: field:sale.order,picking_ids:0
msgid "Related Picking"
msgstr "Relacioni Izbor"
@@ -959,9 +1050,15 @@ msgid "Create Delivery Order"
msgstr "Kreiraj Dostavni Nalog"
#. module: sale
-#: field:sale.installer,delivery:0
-msgid "Delivery Costs"
-msgstr "Trosak Dostave"
+#: code:addons/sale/sale.py:1290
+#, python-format
+msgid "Cannot delete a sales order line which is in state '%s'!"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Qty(UoS)"
+msgstr ""
#. module: sale
#: view:sale.order:0
@@ -975,13 +1072,13 @@ msgstr "Kreiranje Izborne liste"
#. module: sale
#: view:sale.report:0
-msgid "Sales by Product Category"
-msgstr "Prodaja po kategoriji Proizvoda"
+msgid "Ordered date of the sales order"
+msgstr ""
#. module: sale
-#: selection:sale.order,picking_policy:0
-msgid "Partial Delivery"
-msgstr "Parcijalna isporuka"
+#: view:sale.report:0
+msgid "Sales by Product Category"
+msgstr "Prodaja po kategoriji Proizvoda"
#. module: sale
#: model:process.transition,name:sale.process_transition_confirmquotation0
@@ -989,9 +1086,10 @@ msgid "Confirm Quotation"
msgstr "Potvrđivanje ponude"
#. module: sale
-#: help:sale.order,origin:0
-msgid "Reference of the document that generated this sales order request."
-msgstr ""
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:63
+#, python-format
+msgid "Error"
+msgstr "Greška"
#. module: sale
#: view:sale.order:0
@@ -1023,20 +1121,14 @@ msgid "Procurement Method"
msgstr "Metod Nabavke"
#. module: sale
-#: view:sale.config.picking_policy:0
-#: view:sale.installer:0
-msgid "title"
-msgstr "Naslov"
-
-#. module: sale
#: model:process.node,name:sale.process_node_packinglist0
msgid "Pick List"
msgstr "Izborna Lista"
#. module: sale
#: view:sale.order:0
-msgid "Order date"
-msgstr "Naruceno Dana"
+msgid "Set to Draft"
+msgstr "Postavi u Pripremu"
#. module: sale
#: model:process.node,note:sale.process_node_packinglist0
@@ -1044,6 +1136,85 @@ msgid "Document of the move to the output or to the customer."
msgstr "Dokumenat za pomeranje na izlaz ili za kupca."
#. module: sale
+#: model:email.template,body_text:sale.email_template_edi_sale
+msgid ""
+"\n"
+"Hello${object.partner_order_id.name and ' ' or "
+"''}${object.partner_order_id.name or ''},\n"
+"\n"
+"Here is your order confirmation for ${object.partner_id.name}:\n"
+" | Order number: *${object.name}*\n"
+" | Order total: *${object.amount_total} "
+"${object.pricelist_id.currency_id.name}*\n"
+" | Order date: ${object.date_order}\n"
+" % if object.origin:\n"
+" | Order reference: ${object.origin}\n"
+" % endif\n"
+" % if object.client_order_ref:\n"
+" | Your reference: ${object.client_order_ref}<br />\n"
+" % endif\n"
+" | Your contact: ${object.user_id.name} ${object.user_id.user_email "
+"and '<%s>'%(object.user_id.user_email) or ''}\n"
+"\n"
+"You can view the order confirmation, download it and even pay online using "
+"the following link:\n"
+" ${ctx.get('edi_web_url_view') or 'n/a'}\n"
+"\n"
+"% if object.order_policy in ('prepaid','manual') and "
+"object.company_id.paypal_account:\n"
+"<% \n"
+"comp_name = quote(object.company_id.name)\n"
+"order_name = quote(object.name)\n"
+"paypal_account = quote(object.company_id.paypal_account)\n"
+"order_amount = quote(str(object.amount_total))\n"
+"cur_name = quote(object.pricelist_id.currency_id.name)\n"
+"paypal_url = \"https://www.paypal.com/cgi-"
+"bin/webscr?cmd=_xclick&business=%s&item_name=%s%%20Order%%20%s&invoice=%s&amo"
+"unt=%s\" \\\n"
+" "
+"\"&currency_code=%s&button_subtype=services&no_note=1&bn=OpenERP_Order_PayNow"
+"_%s\" % \\\n"
+" "
+"(paypal_account,comp_name,order_name,order_name,order_amount,cur_name,cur_nam"
+"e)\n"
+"%>\n"
+"It is also possible to directly pay with Paypal:\n"
+" ${paypal_url}\n"
+"% endif\n"
+"\n"
+"If you have any question, do not hesitate to contact us.\n"
+"\n"
+"\n"
+"Thank you for choosing ${object.company_id.name}!\n"
+"\n"
+"\n"
+"--\n"
+"${object.user_id.name} ${object.user_id.user_email and "
+"'<%s>'%(object.user_id.user_email) or ''}\n"
+"${object.company_id.name}\n"
+"% if object.company_id.street:\n"
+"${object.company_id.street or ''}\n"
+"% endif\n"
+"% if object.company_id.street2:\n"
+"${object.company_id.street2}\n"
+"% endif\n"
+"% if object.company_id.city or object.company_id.zip:\n"
+"${object.company_id.zip or ''} ${object.company_id.city or ''}\n"
+"% endif\n"
+"% if object.company_id.country_id:\n"
+"${object.company_id.state_id and ('%s, ' % object.company_id.state_id.name) "
+"or ''} ${object.company_id.country_id.name or ''}\n"
+"% endif\n"
+"% if object.company_id.phone:\n"
+"Phone: ${object.company_id.phone}\n"
+"% endif\n"
+"% if object.company_id.website:\n"
+"${object.company_id.website or ''}\n"
+"% endif\n"
+" "
+msgstr ""
+
+#. module: sale
#: model:process.transition.action,name:sale.process_transition_action_validate0
msgid "Validate"
msgstr "Provera"
@@ -1066,9 +1237,9 @@ msgid "Taxes"
msgstr "Porezi"
#. module: sale
-#: field:sale.order,order_policy:0
-msgid "Shipping Policy"
-msgstr "Opcije transporta"
+#: view:sale.order:0
+msgid "Sales Order ready to be invoiced"
+msgstr ""
#. module: sale
#: help:sale.order,create_date:0
@@ -1087,9 +1258,9 @@ msgid "Create Invoices"
msgstr "Kreiraj Fakture"
#. module: sale
-#: view:sale.order:0
-msgid "Extra Info"
-msgstr "Dodatne informacije"
+#: view:sale.report:0
+msgid "Sales order created in current month"
+msgstr ""
#. module: sale
#: report:sale.order:0
@@ -1097,11 +1268,24 @@ msgid "Fax :"
msgstr "Faks:"
#. module: sale
+#: help:sale.order.line,type:0
+msgid ""
+"If 'on order', it triggers a procurement when the sale order is confirmed to "
+"create a task, purchase order or manufacturing order linked to this sale "
+"order line."
+msgstr ""
+
+#. module: sale
#: field:sale.advance.payment.inv,amount:0
msgid "Advance Amount"
msgstr "Napredni Iznos"
#. module: sale
+#: field:sale.config.picking_policy,charge_delivery:0
+msgid "Do you charge the delivery?"
+msgstr ""
+
+#. module: sale
#: selection:sale.order,invoice_quantity:0
msgid "Shipped Quantities"
msgstr "Isporučene količine"
@@ -1112,25 +1296,45 @@ msgid "Invoice Based on Sales Orders"
msgstr "Račun kreiran na osnovu naloga za prodaju"
#. module: sale
+#: code:addons/sale/sale.py:331
+#, python-format
+msgid ""
+"If you change the pricelist of this order (and eventually the currency), "
+"prices of existing order lines will not be updated."
+msgstr ""
+
+#. module: sale
#: model:ir.model,name:sale.model_stock_picking
msgid "Picking List"
msgstr "Izborna lista"
#. module: sale
-#: code:addons/sale/sale.py:387
-#: code:addons/sale/sale.py:920
-#: code:addons/sale/sale.py:938
+#: code:addons/sale/sale.py:412
+#: code:addons/sale/sale.py:503
+#: code:addons/sale/sale.py:632
+#: code:addons/sale/sale.py:1015
+#: code:addons/sale/sale.py:1033
#, python-format
msgid "Error !"
msgstr "Greška!"
#. module: sale
-#: code:addons/sale/sale.py:570
+#: code:addons/sale/sale.py:603
#, python-format
msgid "Could not cancel sales order !"
msgstr ""
#. module: sale
+#: view:sale.order:0
+msgid "Qty(UoM)"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered Year of the sales order"
+msgstr ""
+
+#. module: sale
#: selection:sale.report,month:0
msgid "July"
msgstr "Juli"
@@ -1147,35 +1351,25 @@ msgid "Shipping Exception"
msgstr "Izuzeci kod transporta"
#. module: sale
-#: field:sale.make.invoice,grouped:0
-msgid "Group the invoices"
-msgstr "Grupisanje računa"
-
-#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Shipping & Manual Invoice"
-msgstr "Isporuka & Račun"
-
-#. module: sale
-#: code:addons/sale/sale.py:1051
+#: code:addons/sale/sale.py:1143
#, python-format
-msgid "Picking Information !"
-msgstr "Informacije Izbora"
+msgid "Picking Information ! : "
+msgstr ""
#. module: sale
-#: view:sale.report:0
-#: field:sale.report,month:0
-msgid "Month"
-msgstr "Mesec"
+#: field:sale.make.invoice,grouped:0
+msgid "Group the invoices"
+msgstr "Grupisanje računa"
#. module: sale
-#: model:ir.module.module,shortdesc:sale.module_meta_information
-msgid "Sales Management"
-msgstr "Menadžment prodaje"
+#: field:sale.order,order_policy:0
+msgid "Invoice Policy"
+msgstr ""
#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Invoice From The Picking"
+#: model:ir.actions.act_window,name:sale.action_config_picking_policy
+#: view:sale.config.picking_policy:0
+msgid "Setup your Invoicing Method"
msgstr ""
#. module: sale
@@ -1185,32 +1379,31 @@ msgstr "Da bude pregledano od strane racunovodje."
#. module: sale
#: view:sale.report:0
-#: field:sale.report,uom_name:0
msgid "Reference UoM"
msgstr ""
#. module: sale
+#: view:sale.config.picking_policy:0
+msgid ""
+"This tool will help you to install the right module and configure the system "
+"according to the method you use to invoice your customers."
+msgstr ""
+
+#. module: sale
#: model:ir.model,name:sale.model_sale_order_line_make_invoice
msgid "Sale OrderLine Make_invoice"
msgstr "Prodajna linija naloga Napravi_fakturu"
#. module: sale
-#: help:sale.config.picking_policy,step:0
-msgid ""
-"By default, OpenERP is able to manage complex routing and paths of products "
-"in your warehouse and partner locations. This will configure the most common "
-"and simple methods to deliver products to the customer in one or two "
-"operations by the worker."
-msgstr ""
-"Podrazumevano, OpenERP je sposoban da upravlja kompleksnim rutiranjima i "
-"putanjama u tvom skladistu i lokacijama partnera, Ovo ce podesiti najcesce i "
-"proste metode za isporuku proizvoda klijentima u samo jednoj ili dve "
-"operacije radnika."
+#: selection:sale.order,state:0
+#: selection:sale.report,state:0
+msgid "Invoice Exception"
+msgstr "Računi izuzeci"
#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_tree
-msgid "Old Quotations"
-msgstr "Stari Upiti"
+#: model:process.node,note:sale.process_node_saleorder0
+msgid "Drives procurement and invoicing"
+msgstr "Pogoni nabavke i fakturiranja"
#. module: sale
#: field:sale.order,invoiced:0
@@ -1225,6 +1418,22 @@ msgid "Sales Analysis"
msgstr "Analiza prodaje"
#. module: sale
+#: code:addons/sale/sale.py:1138
+#, python-format
+msgid ""
+"You selected a quantity of %d Units.\n"
+"But it's not compatible with the selected packaging.\n"
+"Here is a proposition of quantities according to the packaging:\n"
+"EAN: %s Quantity: %s Type of ul: %s"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Recreate Packing"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
#: field:sale.order.line,property_ids:0
msgid "Properties"
msgstr "Osobine"
@@ -1255,7 +1464,17 @@ msgstr ""
"Mozes kreirati fakture bazirane na prodajnim nalozima pri isporukama."
#. module: sale
-#: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
+#: view:sale.order.line:0
+msgid "Confirmed sale order lines, not yet delivered"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:473
+#, python-format
+msgid "Customer Invoices"
+msgstr ""
+
+#. module: sale
#: model:process.process,name:sale.process_process_salesprocess0
#: view:sale.order:0
#: view:sale.report:0
@@ -1277,18 +1496,13 @@ msgid "Done"
msgstr "Urađeno"
#. module: sale
-#: model:ir.model,name:sale.model_sale_installer
-msgid "sale.installer"
-msgstr "sale.installer"
-
-#. module: sale
#: model:process.node,name:sale.process_node_invoice0
#: model:process.node,name:sale.process_node_invoiceafterdelivery0
msgid "Invoice"
msgstr "Račun"
#. module: sale
-#: code:addons/sale/sale.py:1014
+#: code:addons/sale/sale.py:1158
#, python-format
msgid ""
"You have to select a customer in the sales form !\n"
@@ -1296,11 +1510,6 @@ msgid ""
msgstr ""
#. module: sale
-#: selection:sale.config.picking_policy,step:0
-msgid "Picking List & Delivery Order"
-msgstr "Izborna Lista & Nalog Dostave"
-
-#. module: sale
#: field:sale.order,origin:0
msgid "Source Document"
msgstr ""
@@ -1326,7 +1535,7 @@ msgid "The amount without tax."
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:571
+#: code:addons/sale/sale.py:604
#, python-format
msgid "You must first cancel all picking attached to this sales order."
msgstr ""
@@ -1337,9 +1546,15 @@ msgid "Sales Advance Payment Invoice"
msgstr ""
#. module: sale
-#: field:sale.order,incoterm:0
-msgid "Incoterm"
-msgstr "Incoterm"
+#: view:sale.report:0
+#: field:sale.report,month:0
+msgid "Month"
+msgstr "Mesec"
+
+#. module: sale
+#: model:email.template,subject:sale.email_template_edi_sale
+msgid "${object.company_id.name} Order (Ref ${object.name or 'n/a' })"
+msgstr ""
#. module: sale
#: view:sale.order.line:0
@@ -1350,11 +1565,6 @@ msgid "Product"
msgstr "Proizvod"
#. module: sale
-#: model:ir.ui.menu,name:sale.menu_invoiced
-msgid "Invoicing"
-msgstr "Fakturisanje"
-
-#. module: sale
#: model:process.transition.action,name:sale.process_transition_action_cancelassignation0
msgid "Cancel Assignation"
msgstr "Otkazivanje prenosa"
@@ -1365,14 +1575,10 @@ msgid "sale.config.picking_policy"
msgstr "sale.config.picking_policy"
#. module: sale
-#: help:sale.order,state:0
-msgid ""
-"Gives the state of the quotation or sales order. \n"
-"The exception state is automatically set when a cancel operation occurs in "
-"the invoice validation (Invoice Exception) or in the picking list process "
-"(Shipping Exception). \n"
-"The 'Waiting Schedule' state is set when the invoice is confirmed but "
-"waiting for the scheduler to run on the date 'Ordered Date'."
+#: view:account.invoice.report:0
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_turnover_by_month
+msgid "Monthly Turnover"
msgstr ""
#. module: sale
@@ -1391,7 +1597,6 @@ msgid "Product UoS"
msgstr "Proizvod UoS"
#. module: sale
-#: selection:sale.order,state:0
#: selection:sale.report,state:0
msgid "Manual In Progress"
msgstr "U toku"
@@ -1412,7 +1617,8 @@ msgid "Order"
msgstr "Nalog"
#. module: sale
-#: code:addons/sale/sale.py:921
+#: code:addons/sale/sale.py:1016
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:71
#, python-format
msgid "There is no income account defined for this product: \"%s\" (id:%d)"
msgstr ""
@@ -1432,7 +1638,7 @@ msgid ""
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:1116
+#: code:addons/sale/sale.py:1238
#, python-format
msgid ""
"You plan to sell %.2f %s but you only have %.2f %s available !\n"
@@ -1463,10 +1669,10 @@ msgid "Total"
msgstr "Ukupno"
#. module: sale
-#: code:addons/sale/sale.py:388
-#, python-format
-msgid "There is no sales journal defined for this company: \"%s\" (id:%d)"
-msgstr ""
+#: report:sale.order:0
+#: view:sale.order.line:0
+msgid "Price"
+msgstr "Cena"
#. module: sale
#: model:process.transition,note:sale.process_transition_deliver0
@@ -1479,9 +1685,14 @@ msgstr ""
"potrosaca je yradjena kroz Nalog Isporuke rucno ili automatski."
#. module: sale
-#: code:addons/sale/sale.py:1165
-#, python-format
-msgid "Cannot delete a sales order line which is %s !"
+#: selection:sale.order,order_policy:0
+msgid "Pay before delivery"
+msgstr ""
+
+#. module: sale
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.open_board_sales
+msgid "Sales Dashboard"
msgstr ""
#. module: sale
@@ -1493,6 +1704,7 @@ msgstr "Napravi Fakture"
#. module: sale
#: view:sale.order:0
+#: selection:sale.order,state:0
#: view:sale.order.line:0
msgid "To Invoice"
msgstr "Za Fakturu"
@@ -1503,6 +1715,11 @@ msgid "Date on which sales order is confirmed."
msgstr ""
#. module: sale
+#: field:sale.order,project_id:0
+msgid "Contract/Analytic Account"
+msgstr ""
+
+#. module: sale
#: field:sale.order,company_id:0
#: field:sale.order.line,company_id:0
#: view:sale.report:0
@@ -1522,25 +1739,18 @@ msgid "The amount to be invoiced in advance."
msgstr "Iznos koji bi trebalo unapred fakturisati"
#. module: sale
-#: selection:sale.order,state:0
-#: selection:sale.report,state:0
-msgid "Invoice Exception"
-msgstr "Računi izuzeci"
-
-#. module: sale
-#: help:sale.order,picking_ids:0
+#: code:addons/sale/sale.py:1256
+#, python-format
msgid ""
-"This is a list of picking that has been generated for this sales order."
+"Couldn't find a pricelist line matching this product and quantity.\n"
+"You have to change either the product, the quantity or the pricelist."
msgstr ""
#. module: sale
-#: help:sale.installer,sale_margin:0
+#: help:sale.order,picking_ids:0
msgid ""
-"Gives the margin of profitability by calculating the difference between Unit "
-"Price and Cost Price."
+"This is a list of picking that has been generated for this sales order."
msgstr ""
-"Daje marzu profitabilnosti kalkulacijom razlike izmedju jedinicne cene i "
-"nabavne cene."
#. module: sale
#: view:sale.make.invoice:0
@@ -1561,6 +1771,11 @@ msgid "Cancelled"
msgstr "Otkazano"
#. module: sale
+#: view:sale.order.line:0
+msgid "Sales Order Lines related to a Sales Order of mine"
+msgstr ""
+
+#. module: sale
#: model:ir.actions.act_window,name:sale.action_shop_form
#: model:ir.ui.menu,name:sale.menu_action_shop_form
#: field:sale.order,shop_id:0
@@ -1570,17 +1785,12 @@ msgid "Shop"
msgstr "Prodavnica"
#. module: sale
-#: view:sale.report:0
-msgid " Month "
-msgstr " Mesec "
-
-#. module: sale
#: field:sale.report,date_confirm:0
msgid "Date Confirm"
msgstr "Datum potvrdjivanja"
#. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:111
+#: code:addons/sale/wizard/sale_line_invoice.py:113
#, python-format
msgid "Warning"
msgstr "Upozorenje"
@@ -1592,17 +1802,6 @@ msgid "Sales by Month"
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:1045
-#, python-format
-msgid ""
-"You selected a quantity of %d Units.\n"
-"But it's not compatible with the selected packaging.\n"
-"Here is a proposition of quantities according to the packaging:\n"
-"\n"
-"EAN: %s Quantity: %s Type of ul: %s"
-msgstr ""
-
-#. module: sale
#: model:ir.model,name:sale.model_sale_order
#: model:process.node,name:sale.process_node_order0
#: model:process.node,name:sale.process_node_saleorder0
@@ -1618,6 +1817,11 @@ msgid "Quantity (UoS)"
msgstr "Količina (UoS)"
#. module: sale
+#: view:sale.order.line:0
+msgid "Sale Order Lines that are in 'done' state"
+msgstr ""
+
+#. module: sale
#: model:process.transition,note:sale.process_transition_packing0
msgid ""
"The Pick List form is created as soon as the sales order is confirmed, in "
@@ -1632,6 +1836,11 @@ msgid "Confirmed"
msgstr "Potvrđeno"
#. module: sale
+#: field:sale.config.picking_policy,order_policy:0
+msgid "Main Method Based On"
+msgstr ""
+
+#. module: sale
#: model:process.transition.action,name:sale.process_transition_action_confirm0
msgid "Confirm"
msgstr "Potvrda"
@@ -1654,6 +1863,7 @@ msgid "Invoice Lines"
msgstr "Stavke računa"
#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_product_tree
#: view:sale.order:0
#: view:sale.order.line:0
msgid "Sales Order Lines"
@@ -1670,33 +1880,18 @@ msgid "Configuration"
msgstr "Konfiguracija"
#. module: sale
-#: selection:sale.order,picking_policy:0
-msgid "Complete Delivery"
-msgstr "Kompletna isporuka"
+#: code:addons/sale/edi/sale_order.py:146
+#, python-format
+msgid "EDI Pricelist (%s)"
+msgstr ""
#. module: sale
#: view:sale.report:0
-msgid " Month-1 "
-msgstr " Mesec-1 "
-
-#. module: sale
-#: help:sale.config.picking_policy,picking_policy:0
-msgid ""
-"The Shipping Policy is used to configure per order if you want to deliver as "
-"soon as possible when one product is available or you wait that all products "
-"are available.."
+msgid "Sales order created in current year"
msgstr ""
-"Politika dostave je uzeta za konfigurisanje po narudzbi ako zelis da izvrsis "
-"sto je pre moguce kolke god je proizvod dostupan ili ces sacekati dok svi "
-"naruceni proizvodi budu dostupni. ( Na lageru)"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "August"
-msgstr "Avgust"
#. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:111
+#: code:addons/sale/wizard/sale_line_invoice.py:113
#, python-format
msgid ""
"Invoice cannot be created for this Sales Order Line due to one of the "
@@ -1706,6 +1901,11 @@ msgid ""
msgstr ""
#. module: sale
+#: view:sale.order.line:0
+msgid "Sale order lines done"
+msgstr ""
+
+#. module: sale
#: field:sale.order.line,th_weight:0
msgid "Weight"
msgstr "Težina"
@@ -1724,7 +1924,6 @@ msgstr "Decembar"
#. module: sale
#: field:sale.config.picking_policy,config_logo:0
-#: field:sale.installer,config_logo:0
msgid "Image"
msgstr "Slika"
@@ -1754,9 +1953,9 @@ msgid "Salesman"
msgstr "Prodavac"
#. module: sale
-#: model:process.node,note:sale.process_node_saleorder0
-msgid "Drives procurement and invoicing"
-msgstr "Pogoni nabavke i fakturiranja"
+#: model:ir.actions.act_window,name:sale.action_order_tree
+msgid "Old Quotations"
+msgstr "Stari Upiti"
#. module: sale
#: field:sale.order,amount_untaxed:0
@@ -1764,7 +1963,7 @@ msgid "Untaxed Amount"
msgstr "Neoporezovani iznos"
#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:163
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:170
#: model:ir.actions.act_window,name:sale.action_view_sale_advance_payment_inv
#: view:sale.advance.payment.inv:0
#: view:sale.order:0
@@ -1773,7 +1972,7 @@ msgid "Advance Invoice"
msgstr "Račun unapred"
#. module: sale
-#: code:addons/sale/sale.py:591
+#: code:addons/sale/sale.py:624
#, python-format
msgid "The sales order '%s' has been cancelled."
msgstr ""
@@ -1808,20 +2007,20 @@ msgid "Packings"
msgstr ""
#. module: sale
-#: field:sale.config.picking_policy,progress:0
-#: field:sale.installer,progress:0
-msgid "Configuration Progress"
-msgstr "Konfiguracioni Progres"
+#: view:sale.order.line:0
+msgid "Sale Order Lines ready to be invoiced"
+msgstr ""
#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_product_tree
-msgid "Product sales"
-msgstr "Prodaja proizvoda"
+#: view:sale.report:0
+msgid "Sales order created in last month"
+msgstr ""
#. module: sale
-#: field:sale.order,date_order:0
-msgid "Ordered Date"
-msgstr "Naruceno Dana"
+#: model:ir.actions.act_window,name:sale.action_email_templates
+#: model:ir.ui.menu,name:sale.menu_email_templates
+msgid "Email Templates"
+msgstr ""
#. module: sale
#: model:ir.actions.act_window,name:sale.action_order_form
@@ -1831,14 +2030,15 @@ msgid "Sales Orders"
msgstr "Nalozi za prodaju"
#. module: sale
-#: selection:sale.config.picking_policy,picking_policy:0
-msgid "Direct Delivery"
-msgstr "Direktna isporuka"
+#: model:ir.model,name:sale.model_sale_shop
+#: view:sale.shop:0
+msgid "Sales Shop"
+msgstr ""
#. module: sale
-#: field:sale.installer,sale_journal:0
-msgid "Invoicing journals"
-msgstr "Dnevnici Faktura"
+#: selection:sale.report,month:0
+msgid "November"
+msgstr "Novembar"
#. module: sale
#: field:sale.advance.payment.inv,product_id:0
@@ -1846,18 +2046,12 @@ msgid "Advance Product"
msgstr "Unapređeni proizvod"
#. module: sale
-#: view:sale.report:0
-#: field:sale.report,shipped_qty_1:0
-msgid "Shipped Qty"
-msgstr "Isporucena Kolicina"
-
-#. module: sale
-#: view:sale.open.invoice:0
-msgid "You invoice has been successfully created!"
-msgstr "Vasa faktura je uspesno kreirana!"
+#: view:sale.order:0
+msgid "Compute"
+msgstr "Izračunavanje"
#. module: sale
-#: code:addons/sale/sale.py:585
+#: code:addons/sale/sale.py:618
#, python-format
msgid "You must first cancel all invoices attached to this sales order."
msgstr ""
@@ -1868,25 +2062,14 @@ msgid "January"
msgstr "Januar"
#. module: sale
-#: view:sale.installer:0
-msgid "Configure Your Sales Management Application"
-msgstr ""
-
-#. module: sale
#: model:ir.actions.act_window,name:sale.action_order_tree4
msgid "Sales Order in Progress"
msgstr "Nalog za prodaju u toku"
#. module: sale
-#: field:sale.installer,sale_layout:0
-msgid "Sales Order Layout Improvement"
-msgstr "Unapredjenje izgleda Prodajnog naloga"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:63
-#, python-format
-msgid "Error"
-msgstr "Greška"
+#: help:sale.order,origin:0
+msgid "Reference of the document that generated this sales order request."
+msgstr ""
#. module: sale
#: view:sale.report:0
@@ -1895,6 +2078,11 @@ msgid "Commitment Delay"
msgstr "Kasnjenje Komitenta"
#. module: sale
+#: selection:sale.order,order_policy:0
+msgid "Deliver & invoice on demand"
+msgstr ""
+
+#. module: sale
#: model:process.node,note:sale.process_node_saleprocurement0
msgid ""
"One Procurement order for each sales order line and for each of the "
@@ -1917,13 +2105,12 @@ msgid "Confirmed sales order to invoice."
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:290
-#, python-format
-msgid "Cannot delete Sales Order(s) which are already confirmed !"
+#: view:sale.order:0
+msgid "Sales Order that haven't yet been confirmed"
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:316
+#: code:addons/sale/sale.py:322
#, python-format
msgid "The sales order '%s' has been set in draft state."
msgstr ""
@@ -1934,37 +2121,27 @@ msgid "from stock"
msgstr "od akcije"
#. module: sale
-#: field:sale.config.picking_policy,order_policy:0
-msgid "Shipping Default Policy"
-msgstr "Podrazumevane opcije za isporuku"
-
-#. module: sale
#: view:sale.open.invoice:0
msgid "Close"
msgstr "Zatvaranje"
#. module: sale
+#: code:addons/sale/sale.py:1248
+#, python-format
+msgid "No Pricelist ! : "
+msgstr ""
+
+#. module: sale
#: field:sale.order,shipped:0
msgid "Delivered"
msgstr "Isporuceno"
#. module: sale
-#: code:addons/sale/sale.py:1115
-#, python-format
-msgid "Not enough stock !"
-msgstr "Nema dovoljno mesta na lageru !"
-
-#. module: sale
#: constraint:stock.move:0
msgid "You must assign a production lot for this product"
msgstr ""
#. module: sale
-#: field:sale.order.line,sequence:0
-msgid "Layout Sequence"
-msgstr ""
-
-#. module: sale
#: model:ir.actions.act_window,help:sale.action_shop_form
msgid ""
"If you have more than one shop reselling your company products, you can "
@@ -1991,11 +2168,6 @@ msgid "May"
msgstr "Maj"
#. module: sale
-#: help:sale.installer,sale_order_dates:0
-msgid "Adds commitment, requested and effective dates on Sales Orders."
-msgstr "Dodaj komitenta, zahtevanog i efektivnog datuma Prodajnog Naloga."
-
-#. module: sale
#: view:sale.order:0
#: field:sale.order,partner_id:0
#: field:sale.order.line,order_partner_id:0
@@ -2003,25 +2175,11 @@ msgid "Customer"
msgstr "Kupac"
#. module: sale
-#: model:product.template,name:sale.advance_product_0_product_template
-msgid "Advance"
-msgstr ""
-
-#. module: sale
#: selection:sale.report,month:0
msgid "February"
msgstr "Februar"
#. module: sale
-#: help:sale.installer,sale_journal:0
-msgid ""
-"Allows you to group and invoice your delivery orders according to different "
-"invoicing types: daily, weekly, etc."
-msgstr ""
-"Omogucava ti da grupiras i fakturises tvoje naloge Dostave uzimajuci u obzir "
-"razlicite tipove faktura: dnevno, nedeljno, etc."
-
-#. module: sale
#: selection:sale.report,month:0
msgid "April"
msgstr "April"
@@ -2032,11 +2190,6 @@ msgid "Accounting"
msgstr "Računovodstvo"
#. module: sale
-#: field:sale.config.picking_policy,step:0
-msgid "Steps To Deliver a Sales Order"
-msgstr ""
-
-#. module: sale
#: view:sale.order:0
#: view:sale.order.line:0
msgid "Search Sales Order"
@@ -2048,19 +2201,18 @@ msgid "Sales Order Requisition"
msgstr ""
#. module: sale
+#: code:addons/sale/sale.py:1242
+#, python-format
+msgid "Not enough stock ! : "
+msgstr ""
+
+#. module: sale
#: report:sale.order:0
#: field:sale.order,payment_term:0
msgid "Payment Term"
msgstr "Uslovi plaćanja"
#. module: sale
-#: help:sale.installer,sale_layout:0
-msgid ""
-"Provides some features to improve the layout of the Sales Order reports."
-msgstr ""
-"Daje neke mogucnosti za unapredjenje izgleda Izvestaja Prodajnih Naloga"
-
-#. module: sale
#: model:ir.actions.act_window,help:sale.action_order_report_all
msgid ""
"This report performs analysis on your quotations and sales orders. Analysis "
@@ -2095,6 +2247,15 @@ msgstr "Račun na osnovu isporuke"
#~ msgid "Invalid model name in the action definition."
#~ msgstr "Neispravno ime modela u definiciji akcije."
+#~ msgid "Payment Before Delivery"
+#~ msgstr "Plaćanje pre isporuke"
+
+#~ msgid "All at Once"
+#~ msgstr "Sve odjednom"
+
+#~ msgid "Configure Picking Policy for Sales Order"
+#~ msgstr "Konfigurisi Izbornu politiku za Prodajne Naloge"
+
#~ msgid "Error: UOS must be in a different category than the UOM"
#~ msgstr ""
#~ "Greska : JU (JedinicaUsluge) mora da bude u razlicitoj kategoriji od JM ( "
@@ -2104,9 +2265,15 @@ msgstr "Račun na osnovu isporuke"
#~ msgid "Could not cancel sale order !"
#~ msgstr "Ne možete da otkažete nalog za prodaju!"
+#~ msgid "Allows you to compute delivery costs on your quotations."
+#~ msgstr "Omogucava ti da izracunas troskove isporuke po tvojim upitima"
+
#~ msgid "Our Salesman"
#~ msgstr "Naš prodavac"
+#~ msgid "Delivery Order Only"
+#~ msgstr "Isključivo nalog za isporuku"
+
#, python-format
#~ msgid "You cannot cancel a sale order line that has already been invoiced !"
#~ msgstr ""
@@ -2126,15 +2293,44 @@ msgstr "Račun na osnovu isporuke"
#~ msgid "Cannot delete Sale Order(s) which are already confirmed !"
#~ msgstr "Ne možete da obrišete nalog(e) za kupovinu koji su već potvrđeni!"
+#~ msgid ""
+#~ "Provides some features to improve the layout of the Sales Order reports."
+#~ msgstr ""
+#~ "Daje neke mogucnosti za unapredjenje izgleda Izvestaja Prodajnih Naloga"
+
#~ msgid "Invalid XML for View Architecture!"
#~ msgstr "Nevažeći XML za pregled arhitekture"
+#~ msgid " Year "
+#~ msgstr " Godina "
+
+#~ msgid "Sales Order Dates"
+#~ msgstr "Datumi Prodajnih Naloga"
+
#~ msgid "Sale Order Line"
#~ msgstr "Stavke naloga za prodaju"
+#~ msgid "Margins in Sales Orders"
+#~ msgstr "Marze u Prodajnim nalozima"
+
+#~ msgid "Sales Application Configuration"
+#~ msgstr "POdesavanje Aplikacije Prodaje"
+
#~ msgid "Sale Pricelists"
#~ msgstr "Cenovnik prodaje"
+#~ msgid "Delivery Costs"
+#~ msgstr "Trosak Dostave"
+
+#~ msgid "Partial Delivery"
+#~ msgstr "Parcijalna isporuka"
+
+#~ msgid "title"
+#~ msgstr "Naslov"
+
+#~ msgid "Order date"
+#~ msgstr "Naruceno Dana"
+
#~ msgid ""
#~ "This is the list of picking list that have been generated for this invoice"
#~ msgstr "Ovo je spisak izbornih lista koji su generisani za ovaj račun"
@@ -2142,6 +2338,19 @@ msgstr "Račun na osnovu isporuke"
#~ msgid "Sale Order"
#~ msgstr "Nalog za prodaju"
+#~ msgid "Shipping Policy"
+#~ msgstr "Opcije transporta"
+
+#~ msgid "Shipping & Manual Invoice"
+#~ msgstr "Isporuka & Račun"
+
+#, python-format
+#~ msgid "Picking Information !"
+#~ msgstr "Informacije Izbora"
+
+#~ msgid "Sales Management"
+#~ msgstr "Menadžment prodaje"
+
#~ msgid ""
#~ "Error: The default UOM and the purchase UOM must be in the same category."
#~ msgstr ""
@@ -2149,20 +2358,68 @@ msgstr "Račun na osnovu isporuke"
#~ "kategoriji."
#~ msgid ""
+#~ "By default, OpenERP is able to manage complex routing and paths of products "
+#~ "in your warehouse and partner locations. This will configure the most common "
+#~ "and simple methods to deliver products to the customer in one or two "
+#~ "operations by the worker."
+#~ msgstr ""
+#~ "Podrazumevano, OpenERP je sposoban da upravlja kompleksnim rutiranjima i "
+#~ "putanjama u tvom skladistu i lokacijama partnera, Ovo ce podesiti najcesce i "
+#~ "proste metode za isporuku proizvoda klijentima u samo jednoj ili dve "
+#~ "operacije radnika."
+
+#~ msgid "sale.installer"
+#~ msgstr "sale.installer"
+
+#~ msgid "Picking List & Delivery Order"
+#~ msgstr "Izborna Lista & Nalog Dostave"
+
+#~ msgid ""
#~ "The Object name must start with x_ and not contain any special character !"
#~ msgstr ""
#~ "Ime objekta mora da počinje sa x_ i ne sme da sadrži specijalne karaktere !"
+#~ msgid "Shipping Default Policy"
+#~ msgstr "Podrazumevane opcije za isporuku"
+
+#~ msgid "Invoicing"
+#~ msgstr "Fakturisanje"
+
#~ msgid "Steps To Deliver a Sale Order"
#~ msgstr "Koraci za dostavu naloga za prodaju"
+#~ msgid ""
+#~ "Gives the margin of profitability by calculating the difference between Unit "
+#~ "Price and Cost Price."
+#~ msgstr ""
+#~ "Daje marzu profitabilnosti kalkulacijom razlike izmedju jedinicne cene i "
+#~ "nabavne cene."
+
#, python-format
#~ msgid "You must first cancel all invoices attached to this sale order."
#~ msgstr "Poništite sve račune koji su vezani za ovaj nalog za prodaju."
+#~ msgid " Month "
+#~ msgstr " Mesec "
+
#~ msgid "Invoice on Order After Delivery"
#~ msgstr "Račun na bazi Naloga posle isporuke"
+#~ msgid "Complete Delivery"
+#~ msgstr "Kompletna isporuka"
+
+#~ msgid " Month-1 "
+#~ msgstr " Mesec-1 "
+
+#~ msgid ""
+#~ "The Shipping Policy is used to configure per order if you want to deliver as "
+#~ "soon as possible when one product is available or you wait that all products "
+#~ "are available.."
+#~ msgstr ""
+#~ "Politika dostave je uzeta za konfigurisanje po narudzbi ako zelis da izvrsis "
+#~ "sto je pre moguce kolke god je proizvod dostupan ili ces sacekati dok svi "
+#~ "naruceni proizvodi budu dostupni. ( Na lageru)"
+
#, python-format
#~ msgid ""
#~ "You have to select a customer in the sale form !\n"
@@ -2180,15 +2437,53 @@ msgstr "Račun na osnovu isporuke"
#~ "je za jedan nalog za prodaju pravljeno više računa (za svaku stavku na "
#~ "primer)."
+#~ msgid "Configuration Progress"
+#~ msgstr "Konfiguracioni Progres"
+
+#~ msgid "Product sales"
+#~ msgstr "Prodaja proizvoda"
+
+#~ msgid "Ordered Date"
+#~ msgstr "Naruceno Dana"
+
#~ msgid "Payment Terms"
#~ msgstr "Uslovi plaćanja"
+#~ msgid "Direct Delivery"
+#~ msgstr "Direktna isporuka"
+
+#~ msgid "Invoicing journals"
+#~ msgstr "Dnevnici Faktura"
+
+#~ msgid "Shipped Qty"
+#~ msgstr "Isporucena Kolicina"
+
+#~ msgid "Sales Order Layout Improvement"
+#~ msgstr "Unapredjenje izgleda Prodajnog naloga"
+
#~ msgid "Sale Shop"
#~ msgstr "Prodavnica"
+#, python-format
+#~ msgid "Not enough stock !"
+#~ msgstr "Nema dovoljno mesta na lageru !"
+
#~ msgid "Sale Order Lines"
#~ msgstr "Stavke naloga za prodaju"
+#~ msgid "Adds commitment, requested and effective dates on Sales Orders."
+#~ msgstr "Dodaj komitenta, zahtevanog i efektivnog datuma Prodajnog Naloga."
+
+#~ msgid ""
+#~ "Allows you to group and invoice your delivery orders according to different "
+#~ "invoicing types: daily, weekly, etc."
+#~ msgstr ""
+#~ "Omogucava ti da grupiras i fakturises tvoje naloge Dostave uzimajuci u obzir "
+#~ "razlicite tipove faktura: dnevno, nedeljno, etc."
+
+#~ msgid "Picking Default Policy"
+#~ msgstr "Podrazumevana Izborna Politika"
+
#~ msgid "You invoice has been successfully created !"
#~ msgstr "Vaš račun je uspešno kreiran !"
@@ -2323,9 +2618,6 @@ msgstr "Račun na osnovu isporuke"
#~ msgid "Procurement for each line"
#~ msgstr "Izvršavanje za svaku stavku"
-#~ msgid "My Quotations"
-#~ msgstr "Moja ponuda"
-
#~ msgid "Packing Default Policy"
#~ msgstr "Podrazumevane opcije za pakovanje"
diff --git a/addons/sale/i18n/sv.po b/addons/sale/i18n/sv.po
index 2d49a6362f0..8b56ab5d85a 100644
--- a/addons/sale/i18n/sv.po
+++ b/addons/sale/i18n/sv.po
@@ -6,15 +6,27 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 5.0.14\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2011-01-11 11:16+0000\n"
+"POT-Creation-Date: 2011-12-22 18:43+0000\n"
"PO-Revision-Date: 2011-01-21 21:13+0000\n"
"Last-Translator: Magnus Brandt (mba), Aspirix AB <Unknown>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-05 05:17+0000\n"
-"X-Generator: Launchpad (build 14231)\n"
+"X-Launchpad-Export-Date: 2011-12-23 06:47+0000\n"
+"X-Generator: Launchpad (build 14560)\n"
+
+#. module: sale
+#: field:sale.config.picking_policy,timesheet:0
+msgid "Based on Timesheet"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid ""
+"Sale Order Lines that are confirmed, done or in exception state and haven't "
+"yet been invoiced"
+msgstr ""
#. module: sale
#: view:board.board:0
@@ -23,11 +35,6 @@ msgid "Sales by Salesman in last 90 days"
msgstr "Försäljning per försäljare senaste 90 dagar"
#. module: sale
-#: help:sale.installer,delivery:0
-msgid "Allows you to compute delivery costs on your quotations."
-msgstr "Ger dig möjlighet att beräkna fraktkostnader på dina offerter."
-
-#. module: sale
#: help:sale.order,picking_policy:0
msgid ""
"If you don't have enough stock available to deliver all at once, do you "
@@ -37,6 +44,11 @@ msgstr ""
"gång, accepterar ni delleveranser?"
#. module: sale
+#: view:sale.order:0
+msgid "UoS"
+msgstr ""
+
+#. module: sale
#: help:sale.order,partner_shipping_id:0
msgid "Shipping address for current sales order."
msgstr "Leveransadress för kundordern"
@@ -60,22 +72,12 @@ msgid "Cancel Order"
msgstr "Avbryt order"
#. module: sale
-#: view:sale.config.picking_policy:0
-msgid "Configure Sales Order Logistics"
-msgstr "Konfigurering av kundorderlogistik"
-
-#. module: sale
-#: code:addons/sale/sale.py:603
+#: code:addons/sale/sale.py:638
#, python-format
msgid "The quotation '%s' has been converted to a sales order."
msgstr ""
#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Payment Before Delivery"
-msgstr "Betalning före leverans"
-
-#. module: sale
#: code:addons/sale/wizard/sale_make_invoice.py:42
#, python-format
msgid "Warning !"
@@ -92,12 +94,6 @@ msgid "Drives procurement orders for every sales order line."
msgstr ""
#. module: sale
-#: selection:sale.config.picking_policy,picking_policy:0
-msgid "All at Once"
-msgstr "Samlad leverans"
-
-#. module: sale
-#: field:sale.order,project_id:0
#: view:sale.report:0
#: field:sale.report,analytic_account_id:0
#: field:sale.shop,project_id:0
@@ -113,6 +109,15 @@ msgid ""
msgstr ""
#. module: sale
+#: code:addons/sale/sale.py:295
+#, python-format
+msgid ""
+"In order to delete a confirmed sale order, you must cancel it before ! To "
+"cancel a sale order, you must first cancel related picking or delivery "
+"orders."
+msgstr ""
+
+#. module: sale
#: model:process.node,name:sale.process_node_saleprocurement0
msgid "Procurement Order"
msgstr "Inköpsorder"
@@ -124,6 +129,11 @@ msgid "Partner"
msgstr "Partner"
#. module: sale
+#: selection:sale.order,order_policy:0
+msgid "Invoice based on deliveries"
+msgstr ""
+
+#. module: sale
#: view:sale.order:0
msgid "Order Line"
msgstr "Orderrad"
@@ -163,9 +173,14 @@ msgid "Default Payment Term"
msgstr "Standard betalningsvillkor"
#. module: sale
-#: model:ir.actions.act_window,name:sale.action_config_picking_policy
-msgid "Configure Picking Policy for Sales Order"
-msgstr "Konfigurerar plockpolicyn för försäljningsorder"
+#: field:sale.config.picking_policy,deli_orders:0
+msgid "Based on Delivery Orders"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.picking_policy,time_unit:0
+msgid "Main Working Time Unit"
+msgstr ""
#. module: sale
#: view:sale.order:0
@@ -181,9 +196,10 @@ msgid "Disc.(%)"
msgstr "Rab.(%)"
#. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_forceassignation0
-msgid "Force Assignation"
-msgstr "Force Assignation"
+#: view:sale.report:0
+#: field:sale.report,price_total:0
+msgid "Total Price"
+msgstr "Totalt belopp"
#. module: sale
#: help:sale.make.invoice,grouped:0
@@ -191,6 +207,11 @@ msgid "Check the box to group the invoices for the same customers"
msgstr "Markera checkboxen för att gruppera fakturorna per kund."
#. module: sale
+#: view:sale.order:0
+msgid "My Sale Orders"
+msgstr ""
+
+#. module: sale
#: selection:sale.order,invoice_quantity:0
msgid "Ordered Quantities"
msgstr "Beställt antal"
@@ -231,14 +252,25 @@ msgstr ""
"eller 'fakturera från order efter leverans'."
#. module: sale
+#: field:sale.config.picking_policy,task_work:0
+msgid "Based on Tasks' Work"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
+msgid "Quotations and Sales"
+msgstr ""
+
+#. module: sale
#: model:ir.model,name:sale.model_sale_make_invoice
msgid "Sales Make Invoice"
msgstr ""
#. module: sale
-#: view:sale.order:0
-msgid "Recreate Packing"
-msgstr "Återskapa plocklista"
+#: code:addons/sale/sale.py:330
+#, python-format
+msgid "Pricelist Warning!"
+msgstr ""
#. module: sale
#: field:sale.order.line,discount:0
@@ -246,12 +278,10 @@ msgid "Discount (%)"
msgstr "Rabatt (%)"
#. module: sale
-#: help:res.company,security_lead:0
-msgid ""
-"This is the days added to what you promise to customers for security purpose"
-msgstr ""
-"Det här är det antal dagar som du lägger till det datum som du lovat kunden "
-"av säkerhetsskäl"
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_quotation_for_sale
+msgid "My Quotations"
+msgstr "Mina offerter"
#. module: sale
#: view:board.board:0
@@ -276,7 +306,22 @@ msgid "Shop Name"
msgstr "Butiksnamn"
#. module: sale
-#: code:addons/sale/sale.py:1014
+#: help:sale.order,order_policy:0
+msgid ""
+"The Invoice Policy is used to synchronise invoice and delivery operations.\n"
+" - The 'Pay before delivery' choice will first generate the invoice and "
+"then generate the picking order after the payment of this invoice.\n"
+" - The 'Deliver & Invoice on demand' will create the picking order directly "
+"and wait for the user to manually click on the 'Invoice' button to generate "
+"the draft invoice based on the sale order or the sale order lines.\n"
+" - The 'Invoice on order after delivery' choice will generate the draft "
+"invoice based on sales order after all picking lists have been finished.\n"
+" - The 'Invoice based on deliveries' choice is used to create an invoice "
+"during the picking process."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:1158
#, python-format
msgid "No Customer Defined !"
msgstr "No Customer Defined !"
@@ -287,9 +332,12 @@ msgid "Sales in Exception"
msgstr "Kundorder med fel"
#. module: sale
-#: view:sale.order:0
-msgid "Set to Draft"
-msgstr "Sätt till preliminär"
+#: code:addons/sale/sale.py:1145
+#: code:addons/sale/sale.py:1264
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:70
+#, python-format
+msgid "Configuration Error !"
+msgstr ""
#. module: sale
#: view:sale.order:0
@@ -297,22 +345,7 @@ msgid "Conditions"
msgstr "Villkor"
#. module: sale
-#: help:sale.order,order_policy:0
-msgid ""
-"The Shipping Policy is used to synchronise invoice and delivery operations.\n"
-" - The 'Pay Before delivery' choice will first generate the invoice and "
-"then generate the picking order after the payment of this invoice.\n"
-" - The 'Shipping & Manual Invoice' will create the picking order directly "
-"and wait for the user to manually click on the 'Invoice' button to generate "
-"the draft invoice.\n"
-" - The 'Invoice On Order After Delivery' choice will generate the draft "
-"invoice based on sales order after all picking lists have been finished.\n"
-" - The 'Invoice From The Picking' choice is used to create an invoice "
-"during the picking process."
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:939
+#: code:addons/sale/sale.py:1034
#, python-format
msgid ""
"There is no income category account defined in default Properties for "
@@ -322,9 +355,9 @@ msgstr ""
"Product Category or Fiscal Position is not defined !"
#. module: sale
-#: view:sale.installer:0
-msgid "Configure"
-msgstr "Konfigurera"
+#: selection:sale.report,month:0
+msgid "August"
+msgstr "Augusti"
#. module: sale
#: constraint:stock.move:0
@@ -332,7 +365,7 @@ msgid "You try to assign a lot which is not from the same product"
msgstr "Du försöker tilldela ett parti som inte är från samma produkt."
#. module: sale
-#: code:addons/sale/sale.py:620
+#: code:addons/sale/sale.py:655
#, python-format
msgid "invalid mode for test_state"
msgstr "invalid mode for test_state"
@@ -343,7 +376,7 @@ msgid "June"
msgstr "Juni"
#. module: sale
-#: code:addons/sale/sale.py:584
+#: code:addons/sale/sale.py:617
#, python-format
msgid "Could not cancel this sales order !"
msgstr "Kunde inte avbryta kundordern !"
@@ -364,8 +397,12 @@ msgid "October"
msgstr "Oktober"
#. module: sale
+#: sql_constraint:stock.picking:0
+msgid "Reference must be unique per Company!"
+msgstr ""
+
+#. module: sale
#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_quotation_for_sale
#: view:sale.order:0
#: view:sale.report:0
msgid "Quotations"
@@ -377,11 +414,6 @@ msgid "Pricelist for current sales order."
msgstr "Prislista till kundordern."
#. module: sale
-#: selection:sale.config.picking_policy,step:0
-msgid "Delivery Order Only"
-msgstr "Endast leveransorder"
-
-#. module: sale
#: report:sale.order:0
msgid "TVA :"
msgstr "Moms :"
@@ -406,6 +438,7 @@ msgstr "Fiscal Position"
#. module: sale
#: view:sale.order:0
#: view:sale.order.line:0
+#: field:sale.report,product_uom:0
msgid "UoM"
msgstr "Enhet"
@@ -428,13 +461,19 @@ msgid ""
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:971
+#: code:addons/sale/sale.py:1061
+#, python-format
+msgid "You cannot cancel a sale order line that has already been invoiced!"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:1066
#, python-format
msgid "You must first cancel stock moves attached to this sales order line."
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:1042
+#: code:addons/sale/sale.py:1134
#, python-format
msgid "(n/a)"
msgstr "(n/a)"
@@ -468,16 +507,36 @@ msgid "Notes"
msgstr "Anteckningar"
#. module: sale
+#: sql_constraint:res.company:0
+msgid "The company name must be unique !"
+msgstr ""
+
+#. module: sale
#: help:sale.order,partner_invoice_id:0
msgid "Invoice address for current sales order."
msgstr "Fakturaadress för kundordern."
#. module: sale
-#: view:sale.installer:0
-msgid "Enhance your core Sales Application with additional functionalities."
+#: view:sale.report:0
+msgid "Month-1"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered month of the sales order"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:504
+#, python-format
+msgid ""
+"You cannot group sales having different currencies for the same partner."
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,picking_policy:0
+msgid "Deliver each product when available"
msgstr ""
-"Förstärk den grundläggande försäljningsapplikationen med ytterligare "
-"funktionalitet."
#. module: sale
#: field:sale.order,invoiced_rate:0
@@ -496,21 +555,43 @@ msgid "Confirmation Date"
msgstr "Bekräftat Datum"
#. module: sale
+#: field:sale.order,incoterm:0
+msgid "Incoterm"
+msgstr "Incoterm"
+
+#. module: sale
#: field:sale.order.line,address_allotment_id:0
msgid "Allotment Partner"
msgstr "Andelsföretag"
#. module: sale
-#: sql_constraint:sale.order:0
-msgid "Order Reference must be unique !"
-msgstr "Orderreferensen måste vara unik !"
-
-#. module: sale
#: selection:sale.report,month:0
msgid "March"
msgstr "Mars"
#. module: sale
+#: constraint:stock.move:0
+msgid "You can not move products from or to a location of the type view."
+msgstr ""
+
+#. module: sale
+#: field:sale.config.picking_policy,sale_orders:0
+msgid "Based on Sales Orders"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,state:0
+msgid ""
+"Givwizard = self.browse(cr, uid, ids)[0]es the state of the quotation or "
+"sales order. \n"
+"The exception state is automatically set when a cancel operation occurs in "
+"the invoice validation (Invoice Exception) or in the picking list process "
+"(Shipping Exception). \n"
+"The 'Waiting Schedule' state is set when the invoice is confirmed but "
+"waiting for the scheduler to run on the order date."
+msgstr ""
+
+#. module: sale
#: help:sale.order,amount_total:0
msgid "The total amount."
msgstr ""
@@ -526,6 +607,11 @@ msgid "Invoice address :"
msgstr "Fakturaadress :"
#. module: sale
+#: field:sale.order.line,sequence:0
+msgid "Line Sequence"
+msgstr ""
+
+#. module: sale
#: model:process.transition,note:sale.process_transition_saleorderprocurement0
msgid ""
"For every sales order line, a procurement order is created to supply the "
@@ -572,11 +658,6 @@ msgid "Sales Order Line"
msgstr "Orderrad"
#. module: sale
-#: view:sale.config.picking_policy:0
-msgid "Setup your sales workflow and default values."
-msgstr "Konfigurera ditt försäljningsarbetsflöde och standard värden"
-
-#. module: sale
#: field:sale.shop,warehouse_id:0
msgid "Warehouse"
msgstr "Lager"
@@ -613,6 +694,11 @@ msgid "Creation Date"
msgstr "Skapad datum"
#. module: sale
+#: model:ir.ui.menu,name:sale.menu_sales_configuration_misc
+msgid "Miscellaneous"
+msgstr ""
+
+#. module: sale
#: model:ir.actions.act_window,name:sale.action_order_line_tree3
msgid "Uninvoiced and Delivered Lines"
msgstr "Ej fakturerade med levererade rader"
@@ -628,14 +714,19 @@ msgid "My Sales"
msgstr "Min försäljning"
#. module: sale
-#: code:addons/sale/sale.py:290
-#: code:addons/sale/sale.py:966
-#: code:addons/sale/sale.py:1165
+#: code:addons/sale/sale.py:295
+#: code:addons/sale/sale.py:1061
+#: code:addons/sale/sale.py:1290
#, python-format
msgid "Invalid action !"
msgstr "Invalid action !"
#. module: sale
+#: view:sale.order:0
+msgid "Extra Info"
+msgstr "Tilläggsinformation"
+
+#. module: sale
#: field:sale.order,pricelist_id:0
#: field:sale.report,pricelist_id:0
#: field:sale.shop,pricelist_id:0
@@ -649,13 +740,21 @@ msgid "# of Qty"
msgstr ""
#. module: sale
+#: code:addons/sale/sale.py:1314
+#, python-format
+msgid "Hour"
+msgstr ""
+
+#. module: sale
#: view:sale.order:0
msgid "Order Date"
msgstr "Orderdatum"
#. module: sale
#: view:sale.order.line:0
+#: view:sale.report:0
#: field:sale.report,shipped:0
+#: field:sale.report,shipped_qty_1:0
msgid "Shipped"
msgstr "Levererad"
@@ -665,8 +764,8 @@ msgid "All Quotations"
msgstr "Alla offerter"
#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Invoice On Order After Delivery"
+#: view:sale.config.picking_policy:0
+msgid "Options"
msgstr ""
#. module: sale
@@ -675,6 +774,20 @@ msgid "September"
msgstr "September"
#. module: sale
+#: code:addons/sale/sale.py:632
+#, python-format
+msgid "You cannot confirm a sale order which has no line."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:1246
+#, python-format
+msgid ""
+"You have to select a pricelist or a customer in the sales form !\n"
+"Please set one before choosing a product."
+msgstr ""
+
+#. module: sale
#: view:sale.report:0
#: field:sale.report,categ_id:0
msgid "Category of Product"
@@ -691,11 +804,6 @@ msgid "Stock Moves"
msgstr "Lagertransaktioner"
#. module: sale
-#: view:sale.report:0
-msgid " Year "
-msgstr " År "
-
-#. module: sale
#: field:sale.order,state:0
#: field:sale.report,state:0
msgid "Order State"
@@ -713,7 +821,7 @@ msgid "Sales By Month"
msgstr "Försäljning per månad"
#. module: sale
-#: code:addons/sale/sale.py:970
+#: code:addons/sale/sale.py:1065
#, python-format
msgid "Could not cancel sales order line!"
msgstr ""
@@ -748,64 +856,19 @@ msgstr ""
"schemalagda åtgärder är sjösatta."
#. module: sale
+#: field:sale.order,date_order:0
+msgid "Date"
+msgstr ""
+
+#. module: sale
#: view:sale.report:0
msgid "Extended Filters..."
msgstr "Utökade filter..."
#. module: sale
-#: model:ir.module.module,description:sale.module_meta_information
-msgid ""
-"\n"
-" The base module to manage quotations and sales orders.\n"
-"\n"
-" * Workflow with validation steps:\n"
-" - Quotation -> Sales order -> Invoice\n"
-" * Invoicing methods:\n"
-" - Invoice on order (before or after shipping)\n"
-" - Invoice on delivery\n"
-" - Invoice on timesheets\n"
-" - Advance invoice\n"
-" * Partners preferences (shipping, invoicing, incoterm, ...)\n"
-" * Products stocks and prices\n"
-" * Delivery methods:\n"
-" - all at once, multi-parcel\n"
-" - delivery costs\n"
-" * Dashboard for salesman that includes:\n"
-" * Your open quotations\n"
-" * Top 10 sales of the month\n"
-" * Cases statistics\n"
-" * Graph of sales by product\n"
-" * Graph of cases of the month\n"
-" "
-msgstr ""
-"\n"
-" Basmodulen för hantering av offerter och kundorder.\n"
-"Arbetsflöde med bekräftelser i flera steg:\n"
-" - Offert -> kundorder -> faktura\n"
-" - Faktureringsmetoder:\n"
-" - Fakturera en order (före eller efter frakt)\n"
-" - Fakturering vid leverans\n"
-" - Fakturering av tid\n"
-" - Avancerade fakturor\n"
-" - Företagsval (frakt, faktueringsmetod, internationella handelstermer "
-"(incoterm), etc)\n"
-" - Produkter, lager och priser\n"
-" - Leveransmetoder\n"
-" - Allt vid ett tillfälle / delleveranser\n"
-" - Leveranskostnader\n"
-" - Översiktspanel för säljare\n"
-" - Aktuella offerter\n"
-" - Top tio ordrar denna månad\n"
-" - Statistik över utfall\n"
-" - Grafer över försäljning per produkt\n"
-" - Grafer över utfall i månaden\n"
-" "
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_shop
-#: view:sale.shop:0
-msgid "Sales Shop"
-msgstr ""
+#: selection:sale.order.line,state:0
+msgid "Exception"
+msgstr "Undantag"
#. module: sale
#: model:ir.model,name:sale.model_res_company
@@ -813,9 +876,10 @@ msgid "Companies"
msgstr "Företag"
#. module: sale
-#: selection:sale.report,month:0
-msgid "November"
-msgstr "November"
+#: code:addons/sale/sale.py:1259
+#, python-format
+msgid "No valid pricelist line found ! :"
+msgstr ""
#. module: sale
#: view:sale.order:0
@@ -823,9 +887,9 @@ msgid "History"
msgstr "Historik"
#. module: sale
-#: field:sale.config.picking_policy,picking_policy:0
-msgid "Picking Default Policy"
-msgstr "Standard packningsprincip"
+#: selection:sale.order,order_policy:0
+msgid "Invoice on order after delivery"
+msgstr ""
#. module: sale
#: help:sale.order,invoice_ids:0
@@ -848,13 +912,14 @@ msgstr ""
"Namet och adressen för den kontakt som begärde ordern eller offerten."
#. module: sale
-#: code:addons/sale/sale.py:966
-#, python-format
-msgid "You cannot cancel a sales order line that has already been invoiced !"
-msgstr "Du kan inte avbryta en orderrad som har blivit fakturerad !"
+#: help:res.company,security_lead:0
+msgid ""
+"This is the days added to what you promise to customers for security purpose"
+msgstr ""
+"Det här är det antal dagar som du lägger till det datum som du lovat kunden "
+"av säkerhetsskäl"
#. module: sale
-#: view:sale.order:0
#: view:sale.order.line:0
msgid "Qty"
msgstr "Antal"
@@ -865,6 +930,11 @@ msgid "References"
msgstr "Referenser"
#. module: sale
+#: view:sale.order.line:0
+msgid "My Sales Order Lines"
+msgstr ""
+
+#. module: sale
#: model:process.transition.action,name:sale.process_transition_action_cancel0
#: model:process.transition.action,name:sale.process_transition_action_cancel1
#: model:process.transition.action,name:sale.process_transition_action_cancel2
@@ -876,14 +946,9 @@ msgid "Cancel"
msgstr "Avbryt"
#. module: sale
-#: field:sale.installer,sale_order_dates:0
-msgid "Sales Order Dates"
-msgstr "Kundorderdatum"
-
-#. module: sale
-#: selection:sale.order.line,state:0
-msgid "Exception"
-msgstr "Undantag"
+#: sql_constraint:sale.order:0
+msgid "Order Reference must be unique per Company!"
+msgstr ""
#. module: sale
#: model:process.transition,name:sale.process_transition_invoice0
@@ -895,19 +960,19 @@ msgid "Create Invoice"
msgstr "Skapa faktura"
#. module: sale
-#: field:sale.installer,sale_margin:0
-msgid "Margins in Sales Orders"
-msgstr "Marginaler på kundordern"
-
-#. module: sale
#: view:sale.order:0
msgid "Total Tax Excluded"
msgstr "Exklusive moms"
#. module: sale
-#: view:sale.order:0
-msgid "Compute"
-msgstr "Beräkna"
+#: view:sale.order.line:0
+msgid "Order reference"
+msgstr ""
+
+#. module: sale
+#: view:sale.open.invoice:0
+msgid "You invoice has been successfully created!"
+msgstr "Dina faktura har blivit skapad!"
#. module: sale
#: view:sale.report:0
@@ -926,23 +991,22 @@ msgid "Open Invoice"
msgstr "Öppen faktura"
#. module: sale
-#: report:sale.order:0
-#: view:sale.order.line:0
-msgid "Price"
-msgstr "Pris"
+#: model:ir.actions.server,name:sale.ir_actions_server_edi_sale
+msgid "Auto-email confirmed sale orders"
+msgstr ""
#. module: sale
-#: model:ir.actions.act_window,name:sale.action_sale_installer
-#: view:sale.config.picking_policy:0
-#: view:sale.installer:0
-msgid "Sales Application Configuration"
-msgstr "Konfigurering av Försäljningsapplikationen"
+#: code:addons/sale/sale.py:413
+#, python-format
+msgid "There is no sales journal defined for this company: \"%s\" (id:%d)"
+msgstr ""
+"Det finns ingen försäljningsjournal definierad för det hör företaget: \"%s\" "
+"(id:%d)"
#. module: sale
-#: view:sale.report:0
-#: field:sale.report,price_total:0
-msgid "Total Price"
-msgstr "Totalt belopp"
+#: model:process.transition.action,name:sale.process_transition_action_forceassignation0
+msgid "Force Assignation"
+msgstr "Force Assignation"
#. module: sale
#: selection:sale.order.line,type:0
@@ -955,6 +1019,11 @@ msgid "Based on the shipped or on the ordered quantities."
msgstr "Baserat på levererade eller beställda antal."
#. module: sale
+#: selection:sale.order,picking_policy:0
+msgid "Deliver all products at once"
+msgstr ""
+
+#. module: sale
#: field:sale.order,picking_ids:0
msgid "Related Picking"
msgstr "Relaterad plockning"
@@ -986,9 +1055,15 @@ msgid "Create Delivery Order"
msgstr "Skapa leveransorder"
#. module: sale
-#: field:sale.installer,delivery:0
-msgid "Delivery Costs"
-msgstr "Leveranskostnad"
+#: code:addons/sale/sale.py:1290
+#, python-format
+msgid "Cannot delete a sales order line which is in state '%s'!"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Qty(UoS)"
+msgstr ""
#. module: sale
#: view:sale.order:0
@@ -1002,13 +1077,13 @@ msgstr "Skapa plocklista"
#. module: sale
#: view:sale.report:0
-msgid "Sales by Product Category"
-msgstr "Försäljning per produktkategori"
+msgid "Ordered date of the sales order"
+msgstr ""
#. module: sale
-#: selection:sale.order,picking_policy:0
-msgid "Partial Delivery"
-msgstr "Delleverans"
+#: view:sale.report:0
+msgid "Sales by Product Category"
+msgstr "Försäljning per produktkategori"
#. module: sale
#: model:process.transition,name:sale.process_transition_confirmquotation0
@@ -1016,9 +1091,10 @@ msgid "Confirm Quotation"
msgstr "Godkänn offert"
#. module: sale
-#: help:sale.order,origin:0
-msgid "Reference of the document that generated this sales order request."
-msgstr ""
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:63
+#, python-format
+msgid "Error"
+msgstr "Error"
#. module: sale
#: view:sale.order:0
@@ -1050,20 +1126,14 @@ msgid "Procurement Method"
msgstr "Anskaffningsmetod"
#. module: sale
-#: view:sale.config.picking_policy:0
-#: view:sale.installer:0
-msgid "title"
-msgstr "titel"
-
-#. module: sale
#: model:process.node,name:sale.process_node_packinglist0
msgid "Pick List"
msgstr "Plocklista"
#. module: sale
#: view:sale.order:0
-msgid "Order date"
-msgstr "Orderdaturm"
+msgid "Set to Draft"
+msgstr "Sätt till preliminär"
#. module: sale
#: model:process.node,note:sale.process_node_packinglist0
@@ -1071,6 +1141,85 @@ msgid "Document of the move to the output or to the customer."
msgstr ""
#. module: sale
+#: model:email.template,body_text:sale.email_template_edi_sale
+msgid ""
+"\n"
+"Hello${object.partner_order_id.name and ' ' or "
+"''}${object.partner_order_id.name or ''},\n"
+"\n"
+"Here is your order confirmation for ${object.partner_id.name}:\n"
+" | Order number: *${object.name}*\n"
+" | Order total: *${object.amount_total} "
+"${object.pricelist_id.currency_id.name}*\n"
+" | Order date: ${object.date_order}\n"
+" % if object.origin:\n"
+" | Order reference: ${object.origin}\n"
+" % endif\n"
+" % if object.client_order_ref:\n"
+" | Your reference: ${object.client_order_ref}<br />\n"
+" % endif\n"
+" | Your contact: ${object.user_id.name} ${object.user_id.user_email "
+"and '<%s>'%(object.user_id.user_email) or ''}\n"
+"\n"
+"You can view the order confirmation, download it and even pay online using "
+"the following link:\n"
+" ${ctx.get('edi_web_url_view') or 'n/a'}\n"
+"\n"
+"% if object.order_policy in ('prepaid','manual') and "
+"object.company_id.paypal_account:\n"
+"<% \n"
+"comp_name = quote(object.company_id.name)\n"
+"order_name = quote(object.name)\n"
+"paypal_account = quote(object.company_id.paypal_account)\n"
+"order_amount = quote(str(object.amount_total))\n"
+"cur_name = quote(object.pricelist_id.currency_id.name)\n"
+"paypal_url = \"https://www.paypal.com/cgi-"
+"bin/webscr?cmd=_xclick&business=%s&item_name=%s%%20Order%%20%s&invoice=%s&amo"
+"unt=%s\" \\\n"
+" "
+"\"&currency_code=%s&button_subtype=services&no_note=1&bn=OpenERP_Order_PayNow"
+"_%s\" % \\\n"
+" "
+"(paypal_account,comp_name,order_name,order_name,order_amount,cur_name,cur_nam"
+"e)\n"
+"%>\n"
+"It is also possible to directly pay with Paypal:\n"
+" ${paypal_url}\n"
+"% endif\n"
+"\n"
+"If you have any question, do not hesitate to contact us.\n"
+"\n"
+"\n"
+"Thank you for choosing ${object.company_id.name}!\n"
+"\n"
+"\n"
+"--\n"
+"${object.user_id.name} ${object.user_id.user_email and "
+"'<%s>'%(object.user_id.user_email) or ''}\n"
+"${object.company_id.name}\n"
+"% if object.company_id.street:\n"
+"${object.company_id.street or ''}\n"
+"% endif\n"
+"% if object.company_id.street2:\n"
+"${object.company_id.street2}\n"
+"% endif\n"
+"% if object.company_id.city or object.company_id.zip:\n"
+"${object.company_id.zip or ''} ${object.company_id.city or ''}\n"
+"% endif\n"
+"% if object.company_id.country_id:\n"
+"${object.company_id.state_id and ('%s, ' % object.company_id.state_id.name) "
+"or ''} ${object.company_id.country_id.name or ''}\n"
+"% endif\n"
+"% if object.company_id.phone:\n"
+"Phone: ${object.company_id.phone}\n"
+"% endif\n"
+"% if object.company_id.website:\n"
+"${object.company_id.website or ''}\n"
+"% endif\n"
+" "
+msgstr ""
+
+#. module: sale
#: model:process.transition.action,name:sale.process_transition_action_validate0
msgid "Validate"
msgstr "Validera"
@@ -1093,9 +1242,9 @@ msgid "Taxes"
msgstr "Moms"
#. module: sale
-#: field:sale.order,order_policy:0
-msgid "Shipping Policy"
-msgstr "Leveransvillkor"
+#: view:sale.order:0
+msgid "Sales Order ready to be invoiced"
+msgstr ""
#. module: sale
#: help:sale.order,create_date:0
@@ -1114,9 +1263,9 @@ msgid "Create Invoices"
msgstr "Skapa fakturor"
#. module: sale
-#: view:sale.order:0
-msgid "Extra Info"
-msgstr "Tilläggsinformation"
+#: view:sale.report:0
+msgid "Sales order created in current month"
+msgstr ""
#. module: sale
#: report:sale.order:0
@@ -1124,11 +1273,24 @@ msgid "Fax :"
msgstr "Fax :"
#. module: sale
+#: help:sale.order.line,type:0
+msgid ""
+"If 'on order', it triggers a procurement when the sale order is confirmed to "
+"create a task, purchase order or manufacturing order linked to this sale "
+"order line."
+msgstr ""
+
+#. module: sale
#: field:sale.advance.payment.inv,amount:0
msgid "Advance Amount"
msgstr ""
#. module: sale
+#: field:sale.config.picking_policy,charge_delivery:0
+msgid "Do you charge the delivery?"
+msgstr ""
+
+#. module: sale
#: selection:sale.order,invoice_quantity:0
msgid "Shipped Quantities"
msgstr "Levererat antal"
@@ -1139,25 +1301,45 @@ msgid "Invoice Based on Sales Orders"
msgstr "Fakturera utgående från kundorder"
#. module: sale
+#: code:addons/sale/sale.py:331
+#, python-format
+msgid ""
+"If you change the pricelist of this order (and eventually the currency), "
+"prices of existing order lines will not be updated."
+msgstr ""
+
+#. module: sale
#: model:ir.model,name:sale.model_stock_picking
msgid "Picking List"
msgstr "Plocklista"
#. module: sale
-#: code:addons/sale/sale.py:387
-#: code:addons/sale/sale.py:920
-#: code:addons/sale/sale.py:938
+#: code:addons/sale/sale.py:412
+#: code:addons/sale/sale.py:503
+#: code:addons/sale/sale.py:632
+#: code:addons/sale/sale.py:1015
+#: code:addons/sale/sale.py:1033
#, python-format
msgid "Error !"
msgstr "Fel !"
#. module: sale
-#: code:addons/sale/sale.py:570
+#: code:addons/sale/sale.py:603
#, python-format
msgid "Could not cancel sales order !"
msgstr "Kunde inte avbryta kundordern !"
#. module: sale
+#: view:sale.order:0
+msgid "Qty(UoM)"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered Year of the sales order"
+msgstr ""
+
+#. module: sale
#: selection:sale.report,month:0
msgid "July"
msgstr "Juli"
@@ -1174,36 +1356,26 @@ msgid "Shipping Exception"
msgstr "Leveransundantag"
#. module: sale
-#: field:sale.make.invoice,grouped:0
-msgid "Group the invoices"
-msgstr "Gruppera fakturorna"
-
-#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Shipping & Manual Invoice"
-msgstr "Leverans och manuell faktura"
-
-#. module: sale
-#: code:addons/sale/sale.py:1051
+#: code:addons/sale/sale.py:1143
#, python-format
-msgid "Picking Information !"
-msgstr "Plockinformation !"
+msgid "Picking Information ! : "
+msgstr ""
#. module: sale
-#: view:sale.report:0
-#: field:sale.report,month:0
-msgid "Month"
-msgstr "Månad"
+#: field:sale.make.invoice,grouped:0
+msgid "Group the invoices"
+msgstr "Gruppera fakturorna"
#. module: sale
-#: model:ir.module.module,shortdesc:sale.module_meta_information
-msgid "Sales Management"
-msgstr "Säljhantering"
+#: field:sale.order,order_policy:0
+msgid "Invoice Policy"
+msgstr ""
#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Invoice From The Picking"
-msgstr "Fakturera från plockningen"
+#: model:ir.actions.act_window,name:sale.action_config_picking_policy
+#: view:sale.config.picking_policy:0
+msgid "Setup your Invoicing Method"
+msgstr ""
#. module: sale
#: model:process.node,note:sale.process_node_invoice0
@@ -1212,28 +1384,31 @@ msgstr ""
#. module: sale
#: view:sale.report:0
-#: field:sale.report,uom_name:0
msgid "Reference UoM"
msgstr "Referens UOM"
#. module: sale
+#: view:sale.config.picking_policy:0
+msgid ""
+"This tool will help you to install the right module and configure the system "
+"according to the method you use to invoice your customers."
+msgstr ""
+
+#. module: sale
#: model:ir.model,name:sale.model_sale_order_line_make_invoice
msgid "Sale OrderLine Make_invoice"
msgstr ""
#. module: sale
-#: help:sale.config.picking_policy,step:0
-msgid ""
-"By default, OpenERP is able to manage complex routing and paths of products "
-"in your warehouse and partner locations. This will configure the most common "
-"and simple methods to deliver products to the customer in one or two "
-"operations by the worker."
-msgstr ""
+#: selection:sale.order,state:0
+#: selection:sale.report,state:0
+msgid "Invoice Exception"
+msgstr "Fakturaundantag"
#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_tree
-msgid "Old Quotations"
-msgstr "Gamla offerters"
+#: model:process.node,note:sale.process_node_saleorder0
+msgid "Drives procurement and invoicing"
+msgstr "Styr anskaffning och fakturering"
#. module: sale
#: field:sale.order,invoiced:0
@@ -1248,6 +1423,22 @@ msgid "Sales Analysis"
msgstr "Försäljningsanalys"
#. module: sale
+#: code:addons/sale/sale.py:1138
+#, python-format
+msgid ""
+"You selected a quantity of %d Units.\n"
+"But it's not compatible with the selected packaging.\n"
+"Here is a proposition of quantities according to the packaging:\n"
+"EAN: %s Quantity: %s Type of ul: %s"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Recreate Packing"
+msgstr "Återskapa plocklista"
+
+#. module: sale
+#: view:sale.order:0
#: field:sale.order.line,property_ids:0
msgid "Properties"
msgstr "Egenskaper"
@@ -1278,7 +1469,17 @@ msgstr ""
"Du kan skapa fakturor baserat på kundorder eller baserat på leveranser."
#. module: sale
-#: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
+#: view:sale.order.line:0
+msgid "Confirmed sale order lines, not yet delivered"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:473
+#, python-format
+msgid "Customer Invoices"
+msgstr ""
+
+#. module: sale
#: model:process.process,name:sale.process_process_salesprocess0
#: view:sale.order:0
#: view:sale.report:0
@@ -1300,18 +1501,13 @@ msgid "Done"
msgstr "Klar"
#. module: sale
-#: model:ir.model,name:sale.model_sale_installer
-msgid "sale.installer"
-msgstr "sale.installer"
-
-#. module: sale
#: model:process.node,name:sale.process_node_invoice0
#: model:process.node,name:sale.process_node_invoiceafterdelivery0
msgid "Invoice"
msgstr "Faktura"
#. module: sale
-#: code:addons/sale/sale.py:1014
+#: code:addons/sale/sale.py:1158
#, python-format
msgid ""
"You have to select a customer in the sales form !\n"
@@ -1321,11 +1517,6 @@ msgstr ""
"Välj en kund innan du väljer en produkt."
#. module: sale
-#: selection:sale.config.picking_policy,step:0
-msgid "Picking List & Delivery Order"
-msgstr "Plocklista och leveransorder"
-
-#. module: sale
#: field:sale.order,origin:0
msgid "Source Document"
msgstr "Källdokument"
@@ -1351,7 +1542,7 @@ msgid "The amount without tax."
msgstr "Summa utan moms."
#. module: sale
-#: code:addons/sale/sale.py:571
+#: code:addons/sale/sale.py:604
#, python-format
msgid "You must first cancel all picking attached to this sales order."
msgstr "Du måste först avbryta all plockning bifogad till denna kundorder."
@@ -1362,9 +1553,15 @@ msgid "Sales Advance Payment Invoice"
msgstr ""
#. module: sale
-#: field:sale.order,incoterm:0
-msgid "Incoterm"
-msgstr "Incoterm"
+#: view:sale.report:0
+#: field:sale.report,month:0
+msgid "Month"
+msgstr "Månad"
+
+#. module: sale
+#: model:email.template,subject:sale.email_template_edi_sale
+msgid "${object.company_id.name} Order (Ref ${object.name or 'n/a' })"
+msgstr ""
#. module: sale
#: view:sale.order.line:0
@@ -1375,11 +1572,6 @@ msgid "Product"
msgstr "Produkt"
#. module: sale
-#: model:ir.ui.menu,name:sale.menu_invoiced
-msgid "Invoicing"
-msgstr "Fakturering"
-
-#. module: sale
#: model:process.transition.action,name:sale.process_transition_action_cancelassignation0
msgid "Cancel Assignation"
msgstr "Cancel Assignation"
@@ -1390,14 +1582,10 @@ msgid "sale.config.picking_policy"
msgstr "sale.config.picking_policy"
#. module: sale
-#: help:sale.order,state:0
-msgid ""
-"Gives the state of the quotation or sales order. \n"
-"The exception state is automatically set when a cancel operation occurs in "
-"the invoice validation (Invoice Exception) or in the picking list process "
-"(Shipping Exception). \n"
-"The 'Waiting Schedule' state is set when the invoice is confirmed but "
-"waiting for the scheduler to run on the date 'Ordered Date'."
+#: view:account.invoice.report:0
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_turnover_by_month
+msgid "Monthly Turnover"
msgstr ""
#. module: sale
@@ -1416,7 +1604,6 @@ msgid "Product UoS"
msgstr "Produkt"
#. module: sale
-#: selection:sale.order,state:0
#: selection:sale.report,state:0
msgid "Manual In Progress"
msgstr "Manuell pågående"
@@ -1437,7 +1624,8 @@ msgid "Order"
msgstr "Order"
#. module: sale
-#: code:addons/sale/sale.py:921
+#: code:addons/sale/sale.py:1016
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:71
#, python-format
msgid "There is no income account defined for this product: \"%s\" (id:%d)"
msgstr "Det finns inget intäktskonto för denna produkt: \"%s\" (id:%d)"
@@ -1457,7 +1645,7 @@ msgid ""
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:1116
+#: code:addons/sale/sale.py:1238
#, python-format
msgid ""
"You plan to sell %.2f %s but you only have %.2f %s available !\n"
@@ -1486,12 +1674,10 @@ msgid "Total"
msgstr "Total"
#. module: sale
-#: code:addons/sale/sale.py:388
-#, python-format
-msgid "There is no sales journal defined for this company: \"%s\" (id:%d)"
-msgstr ""
-"Det finns ingen försäljningsjournal definierad för det hör företaget: \"%s\" "
-"(id:%d)"
+#: report:sale.order:0
+#: view:sale.order.line:0
+msgid "Price"
+msgstr "Pris"
#. module: sale
#: model:process.transition,note:sale.process_transition_deliver0
@@ -1502,9 +1688,14 @@ msgid ""
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:1165
-#, python-format
-msgid "Cannot delete a sales order line which is %s !"
+#: selection:sale.order,order_policy:0
+msgid "Pay before delivery"
+msgstr ""
+
+#. module: sale
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.open_board_sales
+msgid "Sales Dashboard"
msgstr ""
#. module: sale
@@ -1516,6 +1707,7 @@ msgstr "Skapa fakturor"
#. module: sale
#: view:sale.order:0
+#: selection:sale.order,state:0
#: view:sale.order.line:0
msgid "To Invoice"
msgstr "Att fakturera"
@@ -1526,6 +1718,11 @@ msgid "Date on which sales order is confirmed."
msgstr "Datum när kundordern är bekräftad."
#. module: sale
+#: field:sale.order,project_id:0
+msgid "Contract/Analytic Account"
+msgstr ""
+
+#. module: sale
#: field:sale.order,company_id:0
#: field:sale.order.line,company_id:0
#: view:sale.report:0
@@ -1545,10 +1742,12 @@ msgid "The amount to be invoiced in advance."
msgstr "Det belopp som skall förskottsfaktureras."
#. module: sale
-#: selection:sale.order,state:0
-#: selection:sale.report,state:0
-msgid "Invoice Exception"
-msgstr "Fakturaundantag"
+#: code:addons/sale/sale.py:1256
+#, python-format
+msgid ""
+"Couldn't find a pricelist line matching this product and quantity.\n"
+"You have to change either the product, the quantity or the pricelist."
+msgstr ""
#. module: sale
#: help:sale.order,picking_ids:0
@@ -1557,13 +1756,6 @@ msgid ""
msgstr "Det här plocklistan är skapad för denna kundorder."
#. module: sale
-#: help:sale.installer,sale_margin:0
-msgid ""
-"Gives the margin of profitability by calculating the difference between Unit "
-"Price and Cost Price."
-msgstr "Beräknar marginalen som differensen mellan styckpris och kostpris."
-
-#. module: sale
#: view:sale.make.invoice:0
#: view:sale.order.line.make.invoice:0
msgid "Create invoices"
@@ -1582,6 +1774,11 @@ msgid "Cancelled"
msgstr "Cancelled"
#. module: sale
+#: view:sale.order.line:0
+msgid "Sales Order Lines related to a Sales Order of mine"
+msgstr ""
+
+#. module: sale
#: model:ir.actions.act_window,name:sale.action_shop_form
#: model:ir.ui.menu,name:sale.menu_action_shop_form
#: field:sale.order,shop_id:0
@@ -1591,17 +1788,12 @@ msgid "Shop"
msgstr "Försäljningställe"
#. module: sale
-#: view:sale.report:0
-msgid " Month "
-msgstr " Månad "
-
-#. module: sale
#: field:sale.report,date_confirm:0
msgid "Date Confirm"
msgstr "Bekräfta Datum"
#. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:111
+#: code:addons/sale/wizard/sale_line_invoice.py:113
#, python-format
msgid "Warning"
msgstr "Warning"
@@ -1613,17 +1805,6 @@ msgid "Sales by Month"
msgstr "Försäljning per månad"
#. module: sale
-#: code:addons/sale/sale.py:1045
-#, python-format
-msgid ""
-"You selected a quantity of %d Units.\n"
-"But it's not compatible with the selected packaging.\n"
-"Here is a proposition of quantities according to the packaging:\n"
-"\n"
-"EAN: %s Quantity: %s Type of ul: %s"
-msgstr ""
-
-#. module: sale
#: model:ir.model,name:sale.model_sale_order
#: model:process.node,name:sale.process_node_order0
#: model:process.node,name:sale.process_node_saleorder0
@@ -1639,6 +1820,11 @@ msgid "Quantity (UoS)"
msgstr "Antal"
#. module: sale
+#: view:sale.order.line:0
+msgid "Sale Order Lines that are in 'done' state"
+msgstr ""
+
+#. module: sale
#: model:process.transition,note:sale.process_transition_packing0
msgid ""
"The Pick List form is created as soon as the sales order is confirmed, in "
@@ -1653,6 +1839,11 @@ msgid "Confirmed"
msgstr "Bekräftad"
#. module: sale
+#: field:sale.config.picking_policy,order_policy:0
+msgid "Main Method Based On"
+msgstr ""
+
+#. module: sale
#: model:process.transition.action,name:sale.process_transition_action_confirm0
msgid "Confirm"
msgstr "Bekräfta"
@@ -1675,6 +1866,7 @@ msgid "Invoice Lines"
msgstr "Fakturarader"
#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_product_tree
#: view:sale.order:0
#: view:sale.order.line:0
msgid "Sales Order Lines"
@@ -1691,30 +1883,18 @@ msgid "Configuration"
msgstr "Konfiguration"
#. module: sale
-#: selection:sale.order,picking_policy:0
-msgid "Complete Delivery"
-msgstr "Komplett leverans"
+#: code:addons/sale/edi/sale_order.py:146
+#, python-format
+msgid "EDI Pricelist (%s)"
+msgstr ""
#. module: sale
#: view:sale.report:0
-msgid " Month-1 "
-msgstr " Månad-1 "
-
-#. module: sale
-#: help:sale.config.picking_policy,picking_policy:0
-msgid ""
-"The Shipping Policy is used to configure per order if you want to deliver as "
-"soon as possible when one product is available or you wait that all products "
-"are available.."
+msgid "Sales order created in current year"
msgstr ""
#. module: sale
-#: selection:sale.report,month:0
-msgid "August"
-msgstr "Augusti"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:111
+#: code:addons/sale/wizard/sale_line_invoice.py:113
#, python-format
msgid ""
"Invoice cannot be created for this Sales Order Line due to one of the "
@@ -1724,6 +1904,11 @@ msgid ""
msgstr ""
#. module: sale
+#: view:sale.order.line:0
+msgid "Sale order lines done"
+msgstr ""
+
+#. module: sale
#: field:sale.order.line,th_weight:0
msgid "Weight"
msgstr "Vikt"
@@ -1742,7 +1927,6 @@ msgstr "December"
#. module: sale
#: field:sale.config.picking_policy,config_logo:0
-#: field:sale.installer,config_logo:0
msgid "Image"
msgstr "Bild"
@@ -1772,9 +1956,9 @@ msgid "Salesman"
msgstr "Säljare"
#. module: sale
-#: model:process.node,note:sale.process_node_saleorder0
-msgid "Drives procurement and invoicing"
-msgstr "Styr anskaffning och fakturering"
+#: model:ir.actions.act_window,name:sale.action_order_tree
+msgid "Old Quotations"
+msgstr "Gamla offerters"
#. module: sale
#: field:sale.order,amount_untaxed:0
@@ -1782,7 +1966,7 @@ msgid "Untaxed Amount"
msgstr "Belopp ex. moms"
#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:163
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:170
#: model:ir.actions.act_window,name:sale.action_view_sale_advance_payment_inv
#: view:sale.advance.payment.inv:0
#: view:sale.order:0
@@ -1791,7 +1975,7 @@ msgid "Advance Invoice"
msgstr "Avancerad faktura"
#. module: sale
-#: code:addons/sale/sale.py:591
+#: code:addons/sale/sale.py:624
#, python-format
msgid "The sales order '%s' has been cancelled."
msgstr "Försäljningsordern '%s' har annullerats."
@@ -1826,20 +2010,20 @@ msgid "Packings"
msgstr ""
#. module: sale
-#: field:sale.config.picking_policy,progress:0
-#: field:sale.installer,progress:0
-msgid "Configuration Progress"
-msgstr "Konfigurationsförlopp"
+#: view:sale.order.line:0
+msgid "Sale Order Lines ready to be invoiced"
+msgstr ""
#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_product_tree
-msgid "Product sales"
-msgstr "Produktförsäljning"
+#: view:sale.report:0
+msgid "Sales order created in last month"
+msgstr ""
#. module: sale
-#: field:sale.order,date_order:0
-msgid "Ordered Date"
-msgstr "Beställd datum"
+#: model:ir.actions.act_window,name:sale.action_email_templates
+#: model:ir.ui.menu,name:sale.menu_email_templates
+msgid "Email Templates"
+msgstr ""
#. module: sale
#: model:ir.actions.act_window,name:sale.action_order_form
@@ -1849,14 +2033,15 @@ msgid "Sales Orders"
msgstr "Kundorder"
#. module: sale
-#: selection:sale.config.picking_policy,picking_policy:0
-msgid "Direct Delivery"
+#: model:ir.model,name:sale.model_sale_shop
+#: view:sale.shop:0
+msgid "Sales Shop"
msgstr ""
#. module: sale
-#: field:sale.installer,sale_journal:0
-msgid "Invoicing journals"
-msgstr "Fakturajournaler"
+#: selection:sale.report,month:0
+msgid "November"
+msgstr "November"
#. module: sale
#: field:sale.advance.payment.inv,product_id:0
@@ -1864,18 +2049,12 @@ msgid "Advance Product"
msgstr "Avancerad produkt"
#. module: sale
-#: view:sale.report:0
-#: field:sale.report,shipped_qty_1:0
-msgid "Shipped Qty"
-msgstr ""
-
-#. module: sale
-#: view:sale.open.invoice:0
-msgid "You invoice has been successfully created!"
-msgstr "Dina faktura har blivit skapad!"
+#: view:sale.order:0
+msgid "Compute"
+msgstr "Beräkna"
#. module: sale
-#: code:addons/sale/sale.py:585
+#: code:addons/sale/sale.py:618
#, python-format
msgid "You must first cancel all invoices attached to this sales order."
msgstr ""
@@ -1886,25 +2065,14 @@ msgid "January"
msgstr "Januari"
#. module: sale
-#: view:sale.installer:0
-msgid "Configure Your Sales Management Application"
-msgstr "Konfigurera din försäljningsapplikation"
-
-#. module: sale
#: model:ir.actions.act_window,name:sale.action_order_tree4
msgid "Sales Order in Progress"
msgstr "Pågående kundorder"
#. module: sale
-#: field:sale.installer,sale_layout:0
-msgid "Sales Order Layout Improvement"
-msgstr "Förbättringar av säljorderlayouten"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:63
-#, python-format
-msgid "Error"
-msgstr "Error"
+#: help:sale.order,origin:0
+msgid "Reference of the document that generated this sales order request."
+msgstr ""
#. module: sale
#: view:sale.report:0
@@ -1913,6 +2081,11 @@ msgid "Commitment Delay"
msgstr ""
#. module: sale
+#: selection:sale.order,order_policy:0
+msgid "Deliver & invoice on demand"
+msgstr ""
+
+#. module: sale
#: model:process.node,note:sale.process_node_saleprocurement0
msgid ""
"One Procurement order for each sales order line and for each of the "
@@ -1935,13 +2108,12 @@ msgid "Confirmed sales order to invoice."
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:290
-#, python-format
-msgid "Cannot delete Sales Order(s) which are already confirmed !"
+#: view:sale.order:0
+msgid "Sales Order that haven't yet been confirmed"
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:316
+#: code:addons/sale/sale.py:322
#, python-format
msgid "The sales order '%s' has been set in draft state."
msgstr ""
@@ -1952,37 +2124,27 @@ msgid "from stock"
msgstr "från lager"
#. module: sale
-#: field:sale.config.picking_policy,order_policy:0
-msgid "Shipping Default Policy"
-msgstr "Standard leveransvillkor"
-
-#. module: sale
#: view:sale.open.invoice:0
msgid "Close"
msgstr "Stäng"
#. module: sale
+#: code:addons/sale/sale.py:1248
+#, python-format
+msgid "No Pricelist ! : "
+msgstr ""
+
+#. module: sale
#: field:sale.order,shipped:0
msgid "Delivered"
msgstr "Levererad"
#. module: sale
-#: code:addons/sale/sale.py:1115
-#, python-format
-msgid "Not enough stock !"
-msgstr ""
-
-#. module: sale
#: constraint:stock.move:0
msgid "You must assign a production lot for this product"
msgstr ""
#. module: sale
-#: field:sale.order.line,sequence:0
-msgid "Layout Sequence"
-msgstr ""
-
-#. module: sale
#: model:ir.actions.act_window,help:sale.action_shop_form
msgid ""
"If you have more than one shop reselling your company products, you can "
@@ -2009,13 +2171,6 @@ msgid "May"
msgstr "Maj"
#. module: sale
-#: help:sale.installer,sale_order_dates:0
-msgid "Adds commitment, requested and effective dates on Sales Orders."
-msgstr ""
-"Lägger till datum för överenskommelser, önskad och verkliga datum på "
-"säljordrarna."
-
-#. module: sale
#: view:sale.order:0
#: field:sale.order,partner_id:0
#: field:sale.order.line,order_partner_id:0
@@ -2023,25 +2178,11 @@ msgid "Customer"
msgstr "Kund"
#. module: sale
-#: model:product.template,name:sale.advance_product_0_product_template
-msgid "Advance"
-msgstr ""
-
-#. module: sale
#: selection:sale.report,month:0
msgid "February"
msgstr "Februari"
#. module: sale
-#: help:sale.installer,sale_journal:0
-msgid ""
-"Allows you to group and invoice your delivery orders according to different "
-"invoicing types: daily, weekly, etc."
-msgstr ""
-"Ger möjlighet att gruppera och fakturera leveranser på olika fakturatyper; "
-"dagligen, veckovis etc."
-
-#. module: sale
#: selection:sale.report,month:0
msgid "April"
msgstr "April"
@@ -2052,11 +2193,6 @@ msgid "Accounting"
msgstr "Redovisning"
#. module: sale
-#: field:sale.config.picking_policy,step:0
-msgid "Steps To Deliver a Sales Order"
-msgstr "Steg för att leverera en kundorder"
-
-#. module: sale
#: view:sale.order:0
#: view:sale.order.line:0
msgid "Search Sales Order"
@@ -2068,18 +2204,18 @@ msgid "Sales Order Requisition"
msgstr ""
#. module: sale
+#: code:addons/sale/sale.py:1242
+#, python-format
+msgid "Not enough stock ! : "
+msgstr ""
+
+#. module: sale
#: report:sale.order:0
#: field:sale.order,payment_term:0
msgid "Payment Term"
msgstr "Betalningsvillkor"
#. module: sale
-#: help:sale.installer,sale_layout:0
-msgid ""
-"Provides some features to improve the layout of the Sales Order reports."
-msgstr "Nya funktioner som utökar layouten på säljorderrapporterna."
-
-#. module: sale
#: model:ir.actions.act_window,help:sale.action_order_report_all
msgid ""
"This report performs analysis on your quotations and sales orders. Analysis "
@@ -2125,6 +2261,12 @@ msgstr "Fakturera utgående ifrån leveranser"
#~ msgstr ""
#~ "Objektnamnet måste börja med x_ och får inte innehålla några specialtecken!"
+#~ msgid "Sales Management"
+#~ msgstr "Säljhantering"
+
+#~ msgid "Partial Delivery"
+#~ msgstr "Delleverans"
+
#~ msgid "Make Invoice"
#~ msgstr "Skapa faktura"
@@ -2146,6 +2288,9 @@ msgstr "Fakturera utgående ifrån leveranser"
#~ msgid "Manual Description"
#~ msgstr "Manuell beskrivning"
+#~ msgid "Complete Delivery"
+#~ msgstr "Komplett leverans"
+
#~ msgid "Customer Ref"
#~ msgstr "Kundreferens"
@@ -2164,9 +2309,6 @@ msgstr "Fakturera utgående ifrån leveranser"
#~ msgid "Sales Order To Be Invoiced"
#~ msgstr "Kundorder som skall faktureras"
-#~ msgid "My Quotations"
-#~ msgstr "Mina offerter"
-
#~ msgid "Draft Invoice"
#~ msgstr "Preliminär faktura"
@@ -2200,6 +2342,9 @@ msgstr "Fakturera utgående ifrån leveranser"
#~ msgid "Related invoices"
#~ msgstr "Relaterade fakturor"
+#~ msgid "Payment Before Delivery"
+#~ msgstr "Betalning före leverans"
+
#~ msgid "Delivery Delay"
#~ msgstr "Leveransförsening"
@@ -2233,6 +2378,9 @@ msgstr "Fakturera utgående ifrån leveranser"
#~ msgid "Sales Process"
#~ msgstr "Kundorderprocess"
+#~ msgid "Delivery Order Only"
+#~ msgstr "Endast leveransorder"
+
#~ msgid "Sales order lines"
#~ msgstr "Kundorderrader"
@@ -2280,6 +2428,12 @@ msgstr "Fakturera utgående ifrån leveranser"
#~ msgid "After confirming order, Create the invoice."
#~ msgstr "Godkänn kundorder, skapa faktura."
+#~ msgid "Shipping Policy"
+#~ msgstr "Leveransvillkor"
+
+#~ msgid "Shipping Default Policy"
+#~ msgstr "Standard leveransvillkor"
+
#~ msgid "Packing Policy"
#~ msgstr "Packvillkor"
@@ -2316,9 +2470,15 @@ msgstr "Fakturera utgående ifrån leveranser"
#~ msgid "Configure Sale Order Logistic"
#~ msgstr "Konfigurera kundorder logistik"
+#~ msgid "Shipping & Manual Invoice"
+#~ msgstr "Leverans och manuell faktura"
+
#~ msgid "Sale Procurement"
#~ msgstr "Kundorder anskaffning"
+#~ msgid "Product sales"
+#~ msgstr "Produktförsäljning"
+
#~ msgid "One procurement for each product."
#~ msgstr "En anskaffning för varje produkt"
@@ -2509,3 +2669,165 @@ msgstr "Fakturera utgående ifrån leveranser"
#~ msgid "Error: UOS must be in a different category than the UOM"
#~ msgstr "Fel: Säljenhet måste tillhöra en annan kategori än standardenhet"
+
+#~ msgid "Configure Picking Policy for Sales Order"
+#~ msgstr "Konfigurerar plockpolicyn för försäljningsorder"
+
+#~ msgid "Setup your sales workflow and default values."
+#~ msgstr "Konfigurera ditt försäljningsarbetsflöde och standard värden"
+
+#~ msgid " Year "
+#~ msgstr " År "
+
+#~ msgid "Margins in Sales Orders"
+#~ msgstr "Marginaler på kundordern"
+
+#~ msgid "title"
+#~ msgstr "titel"
+
+#~ msgid "Delivery Costs"
+#~ msgstr "Leveranskostnad"
+
+#~ msgid "Order date"
+#~ msgstr "Orderdaturm"
+
+#, python-format
+#~ msgid "Picking Information !"
+#~ msgstr "Plockinformation !"
+
+#~ msgid "Picking List & Delivery Order"
+#~ msgstr "Plocklista och leveransorder"
+
+#~ msgid "Invoicing"
+#~ msgstr "Fakturering"
+
+#~ msgid " Month "
+#~ msgstr " Månad "
+
+#~ msgid "Configure"
+#~ msgstr "Konfigurera"
+
+#~ msgid "Order Reference must be unique !"
+#~ msgstr "Orderreferensen måste vara unik !"
+
+#, python-format
+#~ msgid "You cannot cancel a sales order line that has already been invoiced !"
+#~ msgstr "Du kan inte avbryta en orderrad som har blivit fakturerad !"
+
+#~ msgid "Invoice From The Picking"
+#~ msgstr "Fakturera från plockningen"
+
+#~ msgid "sale.installer"
+#~ msgstr "sale.installer"
+
+#~ msgid " Month-1 "
+#~ msgstr " Månad-1 "
+
+#~ msgid "Configuration Progress"
+#~ msgstr "Konfigurationsförlopp"
+
+#~ msgid "Invoicing journals"
+#~ msgstr "Fakturajournaler"
+
+#~ msgid "Ordered Date"
+#~ msgstr "Beställd datum"
+
+#~ msgid "Enhance your core Sales Application with additional functionalities."
+#~ msgstr ""
+#~ "Förstärk den grundläggande försäljningsapplikationen med ytterligare "
+#~ "funktionalitet."
+
+#~ msgid "Sales Order Layout Improvement"
+#~ msgstr "Förbättringar av säljorderlayouten"
+
+#~ msgid ""
+#~ "Provides some features to improve the layout of the Sales Order reports."
+#~ msgstr "Nya funktioner som utökar layouten på säljorderrapporterna."
+
+#~ msgid "Sales Order Dates"
+#~ msgstr "Kundorderdatum"
+
+#~ msgid "Adds commitment, requested and effective dates on Sales Orders."
+#~ msgstr ""
+#~ "Lägger till datum för överenskommelser, önskad och verkliga datum på "
+#~ "säljordrarna."
+
+#~ msgid ""
+#~ "Gives the margin of profitability by calculating the difference between Unit "
+#~ "Price and Cost Price."
+#~ msgstr "Beräknar marginalen som differensen mellan styckpris och kostpris."
+
+#~ msgid ""
+#~ "Allows you to group and invoice your delivery orders according to different "
+#~ "invoicing types: daily, weekly, etc."
+#~ msgstr ""
+#~ "Ger möjlighet att gruppera och fakturera leveranser på olika fakturatyper; "
+#~ "dagligen, veckovis etc."
+
+#~ msgid "Configure Your Sales Management Application"
+#~ msgstr "Konfigurera din försäljningsapplikation"
+
+#~ msgid "Configure Sales Order Logistics"
+#~ msgstr "Konfigurering av kundorderlogistik"
+
+#~ msgid "Picking Default Policy"
+#~ msgstr "Standard packningsprincip"
+
+#~ msgid "All at Once"
+#~ msgstr "Samlad leverans"
+
+#~ msgid "Steps To Deliver a Sales Order"
+#~ msgstr "Steg för att leverera en kundorder"
+
+#~ msgid ""
+#~ "\n"
+#~ " The base module to manage quotations and sales orders.\n"
+#~ "\n"
+#~ " * Workflow with validation steps:\n"
+#~ " - Quotation -> Sales order -> Invoice\n"
+#~ " * Invoicing methods:\n"
+#~ " - Invoice on order (before or after shipping)\n"
+#~ " - Invoice on delivery\n"
+#~ " - Invoice on timesheets\n"
+#~ " - Advance invoice\n"
+#~ " * Partners preferences (shipping, invoicing, incoterm, ...)\n"
+#~ " * Products stocks and prices\n"
+#~ " * Delivery methods:\n"
+#~ " - all at once, multi-parcel\n"
+#~ " - delivery costs\n"
+#~ " * Dashboard for salesman that includes:\n"
+#~ " * Your open quotations\n"
+#~ " * Top 10 sales of the month\n"
+#~ " * Cases statistics\n"
+#~ " * Graph of sales by product\n"
+#~ " * Graph of cases of the month\n"
+#~ " "
+#~ msgstr ""
+#~ "\n"
+#~ " Basmodulen för hantering av offerter och kundorder.\n"
+#~ "Arbetsflöde med bekräftelser i flera steg:\n"
+#~ " - Offert -> kundorder -> faktura\n"
+#~ " - Faktureringsmetoder:\n"
+#~ " - Fakturera en order (före eller efter frakt)\n"
+#~ " - Fakturering vid leverans\n"
+#~ " - Fakturering av tid\n"
+#~ " - Avancerade fakturor\n"
+#~ " - Företagsval (frakt, faktueringsmetod, internationella handelstermer "
+#~ "(incoterm), etc)\n"
+#~ " - Produkter, lager och priser\n"
+#~ " - Leveransmetoder\n"
+#~ " - Allt vid ett tillfälle / delleveranser\n"
+#~ " - Leveranskostnader\n"
+#~ " - Översiktspanel för säljare\n"
+#~ " - Aktuella offerter\n"
+#~ " - Top tio ordrar denna månad\n"
+#~ " - Statistik över utfall\n"
+#~ " - Grafer över försäljning per produkt\n"
+#~ " - Grafer över utfall i månaden\n"
+#~ " "
+
+#~ msgid "Allows you to compute delivery costs on your quotations."
+#~ msgstr "Ger dig möjlighet att beräkna fraktkostnader på dina offerter."
+
+#~ msgid "Sales Application Configuration"
+#~ msgstr "Konfigurering av Försäljningsapplikationen"
diff --git a/addons/sale/i18n/th.po b/addons/sale/i18n/th.po
index 65504fbc687..ce77d12efc4 100644
--- a/addons/sale/i18n/th.po
+++ b/addons/sale/i18n/th.po
@@ -7,15 +7,27 @@ msgid ""
msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-01-11 11:16+0000\n"
+"POT-Creation-Date: 2011-12-22 18:43+0000\n"
"PO-Revision-Date: 2011-01-16 14:25+0000\n"
"Last-Translator: Rungsan Suyala <rungsan@gmail.com>\n"
"Language-Team: Thai <th@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-05 05:17+0000\n"
-"X-Generator: Launchpad (build 14231)\n"
+"X-Launchpad-Export-Date: 2011-12-23 06:47+0000\n"
+"X-Generator: Launchpad (build 14560)\n"
+
+#. module: sale
+#: field:sale.config.picking_policy,timesheet:0
+msgid "Based on Timesheet"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid ""
+"Sale Order Lines that are confirmed, done or in exception state and haven't "
+"yet been invoiced"
+msgstr ""
#. module: sale
#: view:board.board:0
@@ -24,11 +36,6 @@ msgid "Sales by Salesman in last 90 days"
msgstr "ขายโดยพนักงานขายใน 90 วันที่ผ่านมา"
#. module: sale
-#: help:sale.installer,delivery:0
-msgid "Allows you to compute delivery costs on your quotations."
-msgstr "อนุญาตให้คำนวณค่าจัดส่งในใบเสนอาราคา"
-
-#. module: sale
#: help:sale.order,picking_policy:0
msgid ""
"If you don't have enough stock available to deliver all at once, do you "
@@ -36,6 +43,11 @@ msgid ""
msgstr ""
#. module: sale
+#: view:sale.order:0
+msgid "UoS"
+msgstr ""
+
+#. module: sale
#: help:sale.order,partner_shipping_id:0
msgid "Shipping address for current sales order."
msgstr "ทีอยู่ในการจัดส่งสำหรับการสั่งซื้อครั้งนี้"
@@ -59,22 +71,12 @@ msgid "Cancel Order"
msgstr "ยกเลิกคำสั่งซื้อ"
#. module: sale
-#: view:sale.config.picking_policy:0
-msgid "Configure Sales Order Logistics"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:603
+#: code:addons/sale/sale.py:638
#, python-format
msgid "The quotation '%s' has been converted to a sales order."
msgstr ""
#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Payment Before Delivery"
-msgstr "ชำระเงินก่อนจัดส่ง"
-
-#. module: sale
#: code:addons/sale/wizard/sale_make_invoice.py:42
#, python-format
msgid "Warning !"
@@ -91,12 +93,6 @@ msgid "Drives procurement orders for every sales order line."
msgstr ""
#. module: sale
-#: selection:sale.config.picking_policy,picking_policy:0
-msgid "All at Once"
-msgstr "ทั้วหมดในครั้งเดียว"
-
-#. module: sale
-#: field:sale.order,project_id:0
#: view:sale.report:0
#: field:sale.report,analytic_account_id:0
#: field:sale.shop,project_id:0
@@ -112,6 +108,15 @@ msgid ""
msgstr ""
#. module: sale
+#: code:addons/sale/sale.py:295
+#, python-format
+msgid ""
+"In order to delete a confirmed sale order, you must cancel it before ! To "
+"cancel a sale order, you must first cancel related picking or delivery "
+"orders."
+msgstr ""
+
+#. module: sale
#: model:process.node,name:sale.process_node_saleprocurement0
msgid "Procurement Order"
msgstr "ใบสั่งซื้อ"
@@ -123,6 +128,11 @@ msgid "Partner"
msgstr "พาร์ตเนอร์"
#. module: sale
+#: selection:sale.order,order_policy:0
+msgid "Invoice based on deliveries"
+msgstr ""
+
+#. module: sale
#: view:sale.order:0
msgid "Order Line"
msgstr "รายการสั่งสินค้า"
@@ -155,8 +165,13 @@ msgid "Default Payment Term"
msgstr "เงื่อนไขการชำระเงินปรกติ"
#. module: sale
-#: model:ir.actions.act_window,name:sale.action_config_picking_policy
-msgid "Configure Picking Policy for Sales Order"
+#: field:sale.config.picking_policy,deli_orders:0
+msgid "Based on Delivery Orders"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.picking_policy,time_unit:0
+msgid "Main Working Time Unit"
msgstr ""
#. module: sale
@@ -173,9 +188,10 @@ msgid "Disc.(%)"
msgstr "ส่วนลด (%)"
#. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_forceassignation0
-msgid "Force Assignation"
-msgstr ""
+#: view:sale.report:0
+#: field:sale.report,price_total:0
+msgid "Total Price"
+msgstr "ราคารวม"
#. module: sale
#: help:sale.make.invoice,grouped:0
@@ -183,6 +199,11 @@ msgid "Check the box to group the invoices for the same customers"
msgstr ""
#. module: sale
+#: view:sale.order:0
+msgid "My Sale Orders"
+msgstr ""
+
+#. module: sale
#: selection:sale.order,invoice_quantity:0
msgid "Ordered Quantities"
msgstr "จำนวนที่สั่งซื้อ"
@@ -221,13 +242,24 @@ msgid ""
msgstr ""
#. module: sale
+#: field:sale.config.picking_policy,task_work:0
+msgid "Based on Tasks' Work"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
+msgid "Quotations and Sales"
+msgstr ""
+
+#. module: sale
#: model:ir.model,name:sale.model_sale_make_invoice
msgid "Sales Make Invoice"
msgstr ""
#. module: sale
-#: view:sale.order:0
-msgid "Recreate Packing"
+#: code:addons/sale/sale.py:330
+#, python-format
+msgid "Pricelist Warning!"
msgstr ""
#. module: sale
@@ -236,9 +268,9 @@ msgid "Discount (%)"
msgstr "ส่วนลด (%)"
#. module: sale
-#: help:res.company,security_lead:0
-msgid ""
-"This is the days added to what you promise to customers for security purpose"
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_quotation_for_sale
+msgid "My Quotations"
msgstr ""
#. module: sale
@@ -264,7 +296,22 @@ msgid "Shop Name"
msgstr "ชื่อร้าน"
#. module: sale
-#: code:addons/sale/sale.py:1014
+#: help:sale.order,order_policy:0
+msgid ""
+"The Invoice Policy is used to synchronise invoice and delivery operations.\n"
+" - The 'Pay before delivery' choice will first generate the invoice and "
+"then generate the picking order after the payment of this invoice.\n"
+" - The 'Deliver & Invoice on demand' will create the picking order directly "
+"and wait for the user to manually click on the 'Invoice' button to generate "
+"the draft invoice based on the sale order or the sale order lines.\n"
+" - The 'Invoice on order after delivery' choice will generate the draft "
+"invoice based on sales order after all picking lists have been finished.\n"
+" - The 'Invoice based on deliveries' choice is used to create an invoice "
+"during the picking process."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:1158
#, python-format
msgid "No Customer Defined !"
msgstr "ไม่ได้ระบุลูกค้า !"
@@ -275,9 +322,12 @@ msgid "Sales in Exception"
msgstr "ยกเว้นการขาย"
#. module: sale
-#: view:sale.order:0
-msgid "Set to Draft"
-msgstr "กำหนดให้เป็นแบบร่าง"
+#: code:addons/sale/sale.py:1145
+#: code:addons/sale/sale.py:1264
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:70
+#, python-format
+msgid "Configuration Error !"
+msgstr ""
#. module: sale
#: view:sale.order:0
@@ -285,22 +335,7 @@ msgid "Conditions"
msgstr "เงื่อนไข"
#. module: sale
-#: help:sale.order,order_policy:0
-msgid ""
-"The Shipping Policy is used to synchronise invoice and delivery operations.\n"
-" - The 'Pay Before delivery' choice will first generate the invoice and "
-"then generate the picking order after the payment of this invoice.\n"
-" - The 'Shipping & Manual Invoice' will create the picking order directly "
-"and wait for the user to manually click on the 'Invoice' button to generate "
-"the draft invoice.\n"
-" - The 'Invoice On Order After Delivery' choice will generate the draft "
-"invoice based on sales order after all picking lists have been finished.\n"
-" - The 'Invoice From The Picking' choice is used to create an invoice "
-"during the picking process."
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:939
+#: code:addons/sale/sale.py:1034
#, python-format
msgid ""
"There is no income category account defined in default Properties for "
@@ -308,9 +343,9 @@ msgid ""
msgstr ""
#. module: sale
-#: view:sale.installer:0
-msgid "Configure"
-msgstr "ตั้งค่า"
+#: selection:sale.report,month:0
+msgid "August"
+msgstr ""
#. module: sale
#: constraint:stock.move:0
@@ -318,7 +353,7 @@ msgid "You try to assign a lot which is not from the same product"
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:620
+#: code:addons/sale/sale.py:655
#, python-format
msgid "invalid mode for test_state"
msgstr ""
@@ -329,7 +364,7 @@ msgid "June"
msgstr "มิถุนายน"
#. module: sale
-#: code:addons/sale/sale.py:584
+#: code:addons/sale/sale.py:617
#, python-format
msgid "Could not cancel this sales order !"
msgstr "ไม่สามารถยกเลิกใบสั่งขายนี้ได้ !"
@@ -350,8 +385,12 @@ msgid "October"
msgstr "ตุลาคม"
#. module: sale
+#: sql_constraint:stock.picking:0
+msgid "Reference must be unique per Company!"
+msgstr ""
+
+#. module: sale
#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_quotation_for_sale
#: view:sale.order:0
#: view:sale.report:0
msgid "Quotations"
@@ -363,11 +402,6 @@ msgid "Pricelist for current sales order."
msgstr "รายการราคาสำหรับใบขายนี้"
#. module: sale
-#: selection:sale.config.picking_policy,step:0
-msgid "Delivery Order Only"
-msgstr ""
-
-#. module: sale
#: report:sale.order:0
msgid "TVA :"
msgstr ""
@@ -392,6 +426,7 @@ msgstr ""
#. module: sale
#: view:sale.order:0
#: view:sale.order.line:0
+#: field:sale.report,product_uom:0
msgid "UoM"
msgstr "หน่วยนับ"
@@ -414,13 +449,19 @@ msgid ""
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:971
+#: code:addons/sale/sale.py:1061
+#, python-format
+msgid "You cannot cancel a sale order line that has already been invoiced!"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:1066
#, python-format
msgid "You must first cancel stock moves attached to this sales order line."
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:1042
+#: code:addons/sale/sale.py:1134
#, python-format
msgid "(n/a)"
msgstr ""
@@ -454,13 +495,35 @@ msgid "Notes"
msgstr "บันทึก"
#. module: sale
+#: sql_constraint:res.company:0
+msgid "The company name must be unique !"
+msgstr ""
+
+#. module: sale
#: help:sale.order,partner_invoice_id:0
msgid "Invoice address for current sales order."
msgstr "ที่อยู่ใบแจ้งหนี้สำหรับใบสั่งขายนี้"
#. module: sale
-#: view:sale.installer:0
-msgid "Enhance your core Sales Application with additional functionalities."
+#: view:sale.report:0
+msgid "Month-1"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered month of the sales order"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:504
+#, python-format
+msgid ""
+"You cannot group sales having different currencies for the same partner."
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,picking_policy:0
+msgid "Deliver each product when available"
msgstr ""
#. module: sale
@@ -480,13 +543,13 @@ msgid "Confirmation Date"
msgstr "วันที่ยืนยัน"
#. module: sale
-#: field:sale.order.line,address_allotment_id:0
-msgid "Allotment Partner"
+#: field:sale.order,incoterm:0
+msgid "Incoterm"
msgstr ""
#. module: sale
-#: sql_constraint:sale.order:0
-msgid "Order Reference must be unique !"
+#: field:sale.order.line,address_allotment_id:0
+msgid "Allotment Partner"
msgstr ""
#. module: sale
@@ -495,6 +558,28 @@ msgid "March"
msgstr "มีนาคม"
#. module: sale
+#: constraint:stock.move:0
+msgid "You can not move products from or to a location of the type view."
+msgstr ""
+
+#. module: sale
+#: field:sale.config.picking_policy,sale_orders:0
+msgid "Based on Sales Orders"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,state:0
+msgid ""
+"Givwizard = self.browse(cr, uid, ids)[0]es the state of the quotation or "
+"sales order. \n"
+"The exception state is automatically set when a cancel operation occurs in "
+"the invoice validation (Invoice Exception) or in the picking list process "
+"(Shipping Exception). \n"
+"The 'Waiting Schedule' state is set when the invoice is confirmed but "
+"waiting for the scheduler to run on the order date."
+msgstr ""
+
+#. module: sale
#: help:sale.order,amount_total:0
msgid "The total amount."
msgstr "รวมทั้งหมด"
@@ -510,6 +595,11 @@ msgid "Invoice address :"
msgstr "ที่อยู่ใบแจ้งหนี้ :"
#. module: sale
+#: field:sale.order.line,sequence:0
+msgid "Line Sequence"
+msgstr ""
+
+#. module: sale
#: model:process.transition,note:sale.process_transition_saleorderprocurement0
msgid ""
"For every sales order line, a procurement order is created to supply the "
@@ -556,11 +646,6 @@ msgid "Sales Order Line"
msgstr "รายการใบสั่งขาย"
#. module: sale
-#: view:sale.config.picking_policy:0
-msgid "Setup your sales workflow and default values."
-msgstr ""
-
-#. module: sale
#: field:sale.shop,warehouse_id:0
msgid "Warehouse"
msgstr "คลังสินค้า"
@@ -597,6 +682,11 @@ msgid "Creation Date"
msgstr "วันที่สร้าง"
#. module: sale
+#: model:ir.ui.menu,name:sale.menu_sales_configuration_misc
+msgid "Miscellaneous"
+msgstr ""
+
+#. module: sale
#: model:ir.actions.act_window,name:sale.action_order_line_tree3
msgid "Uninvoiced and Delivered Lines"
msgstr "รายการที่ยังไม่ได้จัดส่งและแจ้งหนี้"
@@ -612,14 +702,19 @@ msgid "My Sales"
msgstr "การขายของฉัน"
#. module: sale
-#: code:addons/sale/sale.py:290
-#: code:addons/sale/sale.py:966
-#: code:addons/sale/sale.py:1165
+#: code:addons/sale/sale.py:295
+#: code:addons/sale/sale.py:1061
+#: code:addons/sale/sale.py:1290
#, python-format
msgid "Invalid action !"
msgstr ""
#. module: sale
+#: view:sale.order:0
+msgid "Extra Info"
+msgstr "ข้อมูลเพิ่มเติม"
+
+#. module: sale
#: field:sale.order,pricelist_id:0
#: field:sale.report,pricelist_id:0
#: field:sale.shop,pricelist_id:0
@@ -633,13 +728,21 @@ msgid "# of Qty"
msgstr ""
#. module: sale
+#: code:addons/sale/sale.py:1314
+#, python-format
+msgid "Hour"
+msgstr ""
+
+#. module: sale
#: view:sale.order:0
msgid "Order Date"
msgstr "วันที่สั่งซื้อ"
#. module: sale
#: view:sale.order.line:0
+#: view:sale.report:0
#: field:sale.report,shipped:0
+#: field:sale.report,shipped_qty_1:0
msgid "Shipped"
msgstr "จัดส่งแล้ว"
@@ -649,8 +752,8 @@ msgid "All Quotations"
msgstr "ใบเสนอราคาทั้งหมด"
#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Invoice On Order After Delivery"
+#: view:sale.config.picking_policy:0
+msgid "Options"
msgstr ""
#. module: sale
@@ -659,6 +762,20 @@ msgid "September"
msgstr "กันยายน"
#. module: sale
+#: code:addons/sale/sale.py:632
+#, python-format
+msgid "You cannot confirm a sale order which has no line."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:1246
+#, python-format
+msgid ""
+"You have to select a pricelist or a customer in the sales form !\n"
+"Please set one before choosing a product."
+msgstr ""
+
+#. module: sale
#: view:sale.report:0
#: field:sale.report,categ_id:0
msgid "Category of Product"
@@ -675,11 +792,6 @@ msgid "Stock Moves"
msgstr "ย้ายสต๊อก"
#. module: sale
-#: view:sale.report:0
-msgid " Year "
-msgstr ""
-
-#. module: sale
#: field:sale.order,state:0
#: field:sale.report,state:0
msgid "Order State"
@@ -697,7 +809,7 @@ msgid "Sales By Month"
msgstr "การขายรายเดือน"
#. module: sale
-#: code:addons/sale/sale.py:970
+#: code:addons/sale/sale.py:1065
#, python-format
msgid "Could not cancel sales order line!"
msgstr "ไม่สามารถยกเลิกรายการรับคำสั่งซื้อ"
@@ -730,42 +842,19 @@ msgid ""
msgstr ""
#. module: sale
-#: view:sale.report:0
-msgid "Extended Filters..."
+#: field:sale.order,date_order:0
+msgid "Date"
msgstr ""
#. module: sale
-#: model:ir.module.module,description:sale.module_meta_information
-msgid ""
-"\n"
-" The base module to manage quotations and sales orders.\n"
-"\n"
-" * Workflow with validation steps:\n"
-" - Quotation -> Sales order -> Invoice\n"
-" * Invoicing methods:\n"
-" - Invoice on order (before or after shipping)\n"
-" - Invoice on delivery\n"
-" - Invoice on timesheets\n"
-" - Advance invoice\n"
-" * Partners preferences (shipping, invoicing, incoterm, ...)\n"
-" * Products stocks and prices\n"
-" * Delivery methods:\n"
-" - all at once, multi-parcel\n"
-" - delivery costs\n"
-" * Dashboard for salesman that includes:\n"
-" * Your open quotations\n"
-" * Top 10 sales of the month\n"
-" * Cases statistics\n"
-" * Graph of sales by product\n"
-" * Graph of cases of the month\n"
-" "
+#: view:sale.report:0
+msgid "Extended Filters..."
msgstr ""
#. module: sale
-#: model:ir.model,name:sale.model_sale_shop
-#: view:sale.shop:0
-msgid "Sales Shop"
-msgstr "ร้าน"
+#: selection:sale.order.line,state:0
+msgid "Exception"
+msgstr "ยกเว้น"
#. module: sale
#: model:ir.model,name:sale.model_res_company
@@ -773,9 +862,10 @@ msgid "Companies"
msgstr "บริษัท"
#. module: sale
-#: selection:sale.report,month:0
-msgid "November"
-msgstr "พฤศจิกายน"
+#: code:addons/sale/sale.py:1259
+#, python-format
+msgid "No valid pricelist line found ! :"
+msgstr ""
#. module: sale
#: view:sale.order:0
@@ -783,8 +873,8 @@ msgid "History"
msgstr "ประวัติ"
#. module: sale
-#: field:sale.config.picking_policy,picking_policy:0
-msgid "Picking Default Policy"
+#: selection:sale.order,order_policy:0
+msgid "Invoice on order after delivery"
msgstr ""
#. module: sale
@@ -807,13 +897,12 @@ msgid ""
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:966
-#, python-format
-msgid "You cannot cancel a sales order line that has already been invoiced !"
+#: help:res.company,security_lead:0
+msgid ""
+"This is the days added to what you promise to customers for security purpose"
msgstr ""
#. module: sale
-#: view:sale.order:0
#: view:sale.order.line:0
msgid "Qty"
msgstr "ปริมาณ"
@@ -824,6 +913,11 @@ msgid "References"
msgstr "ข้อมูลอ้างอิง"
#. module: sale
+#: view:sale.order.line:0
+msgid "My Sales Order Lines"
+msgstr ""
+
+#. module: sale
#: model:process.transition.action,name:sale.process_transition_action_cancel0
#: model:process.transition.action,name:sale.process_transition_action_cancel1
#: model:process.transition.action,name:sale.process_transition_action_cancel2
@@ -835,14 +929,9 @@ msgid "Cancel"
msgstr "ยกเลิก"
#. module: sale
-#: field:sale.installer,sale_order_dates:0
-msgid "Sales Order Dates"
-msgstr "วันที่รับคำสั่งซื้อ"
-
-#. module: sale
-#: selection:sale.order.line,state:0
-msgid "Exception"
-msgstr "ยกเว้น"
+#: sql_constraint:sale.order:0
+msgid "Order Reference must be unique per Company!"
+msgstr ""
#. module: sale
#: model:process.transition,name:sale.process_transition_invoice0
@@ -854,19 +943,19 @@ msgid "Create Invoice"
msgstr "สร้างใบแจ้งหนี้"
#. module: sale
-#: field:sale.installer,sale_margin:0
-msgid "Margins in Sales Orders"
-msgstr ""
-
-#. module: sale
#: view:sale.order:0
msgid "Total Tax Excluded"
msgstr "รวมทั้งหมด ไม่รวมภาษี"
#. module: sale
-#: view:sale.order:0
-msgid "Compute"
-msgstr "คำนวณ"
+#: view:sale.order.line:0
+msgid "Order reference"
+msgstr ""
+
+#. module: sale
+#: view:sale.open.invoice:0
+msgid "You invoice has been successfully created!"
+msgstr ""
#. module: sale
#: view:sale.report:0
@@ -885,23 +974,20 @@ msgid "Open Invoice"
msgstr ""
#. module: sale
-#: report:sale.order:0
-#: view:sale.order.line:0
-msgid "Price"
-msgstr "ราคา"
+#: model:ir.actions.server,name:sale.ir_actions_server_edi_sale
+msgid "Auto-email confirmed sale orders"
+msgstr ""
#. module: sale
-#: model:ir.actions.act_window,name:sale.action_sale_installer
-#: view:sale.config.picking_policy:0
-#: view:sale.installer:0
-msgid "Sales Application Configuration"
+#: code:addons/sale/sale.py:413
+#, python-format
+msgid "There is no sales journal defined for this company: \"%s\" (id:%d)"
msgstr ""
#. module: sale
-#: view:sale.report:0
-#: field:sale.report,price_total:0
-msgid "Total Price"
-msgstr "ราคารวม"
+#: model:process.transition.action,name:sale.process_transition_action_forceassignation0
+msgid "Force Assignation"
+msgstr ""
#. module: sale
#: selection:sale.order.line,type:0
@@ -914,6 +1000,11 @@ msgid "Based on the shipped or on the ordered quantities."
msgstr ""
#. module: sale
+#: selection:sale.order,picking_policy:0
+msgid "Deliver all products at once"
+msgstr ""
+
+#. module: sale
#: field:sale.order,picking_ids:0
msgid "Related Picking"
msgstr ""
@@ -945,9 +1036,15 @@ msgid "Create Delivery Order"
msgstr "สร้างใบส่งสินค้า"
#. module: sale
-#: field:sale.installer,delivery:0
-msgid "Delivery Costs"
-msgstr "ค่าจัดส่ง"
+#: code:addons/sale/sale.py:1290
+#, python-format
+msgid "Cannot delete a sales order line which is in state '%s'!"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Qty(UoS)"
+msgstr ""
#. module: sale
#: view:sale.order:0
@@ -961,13 +1058,13 @@ msgstr ""
#. module: sale
#: view:sale.report:0
-msgid "Sales by Product Category"
-msgstr "การขายตามประเภทสินค้า"
+msgid "Ordered date of the sales order"
+msgstr ""
#. module: sale
-#: selection:sale.order,picking_policy:0
-msgid "Partial Delivery"
-msgstr "จัดส่งบางส่วน"
+#: view:sale.report:0
+msgid "Sales by Product Category"
+msgstr "การขายตามประเภทสินค้า"
#. module: sale
#: model:process.transition,name:sale.process_transition_confirmquotation0
@@ -975,8 +1072,9 @@ msgid "Confirm Quotation"
msgstr "ยืนยันใบเสนอราคา"
#. module: sale
-#: help:sale.order,origin:0
-msgid "Reference of the document that generated this sales order request."
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:63
+#, python-format
+msgid "Error"
msgstr ""
#. module: sale
@@ -1009,20 +1107,14 @@ msgid "Procurement Method"
msgstr "วิธีการจัดซื้อ"
#. module: sale
-#: view:sale.config.picking_policy:0
-#: view:sale.installer:0
-msgid "title"
-msgstr "คำนำหน้าชื่อ"
-
-#. module: sale
#: model:process.node,name:sale.process_node_packinglist0
msgid "Pick List"
msgstr ""
#. module: sale
#: view:sale.order:0
-msgid "Order date"
-msgstr "วันที่สั่งซื้อ"
+msgid "Set to Draft"
+msgstr "กำหนดให้เป็นแบบร่าง"
#. module: sale
#: model:process.node,note:sale.process_node_packinglist0
@@ -1030,6 +1122,85 @@ msgid "Document of the move to the output or to the customer."
msgstr ""
#. module: sale
+#: model:email.template,body_text:sale.email_template_edi_sale
+msgid ""
+"\n"
+"Hello${object.partner_order_id.name and ' ' or "
+"''}${object.partner_order_id.name or ''},\n"
+"\n"
+"Here is your order confirmation for ${object.partner_id.name}:\n"
+" | Order number: *${object.name}*\n"
+" | Order total: *${object.amount_total} "
+"${object.pricelist_id.currency_id.name}*\n"
+" | Order date: ${object.date_order}\n"
+" % if object.origin:\n"
+" | Order reference: ${object.origin}\n"
+" % endif\n"
+" % if object.client_order_ref:\n"
+" | Your reference: ${object.client_order_ref}<br />\n"
+" % endif\n"
+" | Your contact: ${object.user_id.name} ${object.user_id.user_email "
+"and '<%s>'%(object.user_id.user_email) or ''}\n"
+"\n"
+"You can view the order confirmation, download it and even pay online using "
+"the following link:\n"
+" ${ctx.get('edi_web_url_view') or 'n/a'}\n"
+"\n"
+"% if object.order_policy in ('prepaid','manual') and "
+"object.company_id.paypal_account:\n"
+"<% \n"
+"comp_name = quote(object.company_id.name)\n"
+"order_name = quote(object.name)\n"
+"paypal_account = quote(object.company_id.paypal_account)\n"
+"order_amount = quote(str(object.amount_total))\n"
+"cur_name = quote(object.pricelist_id.currency_id.name)\n"
+"paypal_url = \"https://www.paypal.com/cgi-"
+"bin/webscr?cmd=_xclick&business=%s&item_name=%s%%20Order%%20%s&invoice=%s&amo"
+"unt=%s\" \\\n"
+" "
+"\"&currency_code=%s&button_subtype=services&no_note=1&bn=OpenERP_Order_PayNow"
+"_%s\" % \\\n"
+" "
+"(paypal_account,comp_name,order_name,order_name,order_amount,cur_name,cur_nam"
+"e)\n"
+"%>\n"
+"It is also possible to directly pay with Paypal:\n"
+" ${paypal_url}\n"
+"% endif\n"
+"\n"
+"If you have any question, do not hesitate to contact us.\n"
+"\n"
+"\n"
+"Thank you for choosing ${object.company_id.name}!\n"
+"\n"
+"\n"
+"--\n"
+"${object.user_id.name} ${object.user_id.user_email and "
+"'<%s>'%(object.user_id.user_email) or ''}\n"
+"${object.company_id.name}\n"
+"% if object.company_id.street:\n"
+"${object.company_id.street or ''}\n"
+"% endif\n"
+"% if object.company_id.street2:\n"
+"${object.company_id.street2}\n"
+"% endif\n"
+"% if object.company_id.city or object.company_id.zip:\n"
+"${object.company_id.zip or ''} ${object.company_id.city or ''}\n"
+"% endif\n"
+"% if object.company_id.country_id:\n"
+"${object.company_id.state_id and ('%s, ' % object.company_id.state_id.name) "
+"or ''} ${object.company_id.country_id.name or ''}\n"
+"% endif\n"
+"% if object.company_id.phone:\n"
+"Phone: ${object.company_id.phone}\n"
+"% endif\n"
+"% if object.company_id.website:\n"
+"${object.company_id.website or ''}\n"
+"% endif\n"
+" "
+msgstr ""
+
+#. module: sale
#: model:process.transition.action,name:sale.process_transition_action_validate0
msgid "Validate"
msgstr "ตรวจสอบ"
@@ -1052,8 +1223,8 @@ msgid "Taxes"
msgstr "ภาษี"
#. module: sale
-#: field:sale.order,order_policy:0
-msgid "Shipping Policy"
+#: view:sale.order:0
+msgid "Sales Order ready to be invoiced"
msgstr ""
#. module: sale
@@ -1073,9 +1244,9 @@ msgid "Create Invoices"
msgstr ""
#. module: sale
-#: view:sale.order:0
-msgid "Extra Info"
-msgstr "ข้อมูลเพิ่มเติม"
+#: view:sale.report:0
+msgid "Sales order created in current month"
+msgstr ""
#. module: sale
#: report:sale.order:0
@@ -1083,11 +1254,24 @@ msgid "Fax :"
msgstr "โทรสาร :"
#. module: sale
+#: help:sale.order.line,type:0
+msgid ""
+"If 'on order', it triggers a procurement when the sale order is confirmed to "
+"create a task, purchase order or manufacturing order linked to this sale "
+"order line."
+msgstr ""
+
+#. module: sale
#: field:sale.advance.payment.inv,amount:0
msgid "Advance Amount"
msgstr ""
#. module: sale
+#: field:sale.config.picking_policy,charge_delivery:0
+msgid "Do you charge the delivery?"
+msgstr ""
+
+#. module: sale
#: selection:sale.order,invoice_quantity:0
msgid "Shipped Quantities"
msgstr ""
@@ -1098,25 +1282,45 @@ msgid "Invoice Based on Sales Orders"
msgstr ""
#. module: sale
+#: code:addons/sale/sale.py:331
+#, python-format
+msgid ""
+"If you change the pricelist of this order (and eventually the currency), "
+"prices of existing order lines will not be updated."
+msgstr ""
+
+#. module: sale
#: model:ir.model,name:sale.model_stock_picking
msgid "Picking List"
msgstr "ใบรายการรับ/จ่ายสินค้า"
#. module: sale
-#: code:addons/sale/sale.py:387
-#: code:addons/sale/sale.py:920
-#: code:addons/sale/sale.py:938
+#: code:addons/sale/sale.py:412
+#: code:addons/sale/sale.py:503
+#: code:addons/sale/sale.py:632
+#: code:addons/sale/sale.py:1015
+#: code:addons/sale/sale.py:1033
#, python-format
msgid "Error !"
msgstr "ผิดพลาด !"
#. module: sale
-#: code:addons/sale/sale.py:570
+#: code:addons/sale/sale.py:603
#, python-format
msgid "Could not cancel sales order !"
msgstr "ไม่สามารถยกเลิกใบสั่งขายได้"
#. module: sale
+#: view:sale.order:0
+msgid "Qty(UoM)"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered Year of the sales order"
+msgstr ""
+
+#. module: sale
#: selection:sale.report,month:0
msgid "July"
msgstr "กรกฎาคม"
@@ -1133,35 +1337,25 @@ msgid "Shipping Exception"
msgstr ""
#. module: sale
-#: field:sale.make.invoice,grouped:0
-msgid "Group the invoices"
+#: code:addons/sale/sale.py:1143
+#, python-format
+msgid "Picking Information ! : "
msgstr ""
#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Shipping & Manual Invoice"
+#: field:sale.make.invoice,grouped:0
+msgid "Group the invoices"
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:1051
-#, python-format
-msgid "Picking Information !"
+#: field:sale.order,order_policy:0
+msgid "Invoice Policy"
msgstr ""
#. module: sale
-#: view:sale.report:0
-#: field:sale.report,month:0
-msgid "Month"
-msgstr "เดือน"
-
-#. module: sale
-#: model:ir.module.module,shortdesc:sale.module_meta_information
-msgid "Sales Management"
-msgstr "การบริหารการขาย"
-
-#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Invoice From The Picking"
+#: model:ir.actions.act_window,name:sale.action_config_picking_policy
+#: view:sale.config.picking_policy:0
+msgid "Setup your Invoicing Method"
msgstr ""
#. module: sale
@@ -1171,28 +1365,31 @@ msgstr ""
#. module: sale
#: view:sale.report:0
-#: field:sale.report,uom_name:0
msgid "Reference UoM"
msgstr "หน่วยอ้างอิง"
#. module: sale
+#: view:sale.config.picking_policy:0
+msgid ""
+"This tool will help you to install the right module and configure the system "
+"according to the method you use to invoice your customers."
+msgstr ""
+
+#. module: sale
#: model:ir.model,name:sale.model_sale_order_line_make_invoice
msgid "Sale OrderLine Make_invoice"
msgstr ""
#. module: sale
-#: help:sale.config.picking_policy,step:0
-msgid ""
-"By default, OpenERP is able to manage complex routing and paths of products "
-"in your warehouse and partner locations. This will configure the most common "
-"and simple methods to deliver products to the customer in one or two "
-"operations by the worker."
+#: selection:sale.order,state:0
+#: selection:sale.report,state:0
+msgid "Invoice Exception"
msgstr ""
#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_tree
-msgid "Old Quotations"
-msgstr "ใบเสนอราคาเก่า"
+#: model:process.node,note:sale.process_node_saleorder0
+msgid "Drives procurement and invoicing"
+msgstr ""
#. module: sale
#: field:sale.order,invoiced:0
@@ -1207,6 +1404,22 @@ msgid "Sales Analysis"
msgstr "วิเคราะห์การขาย"
#. module: sale
+#: code:addons/sale/sale.py:1138
+#, python-format
+msgid ""
+"You selected a quantity of %d Units.\n"
+"But it's not compatible with the selected packaging.\n"
+"Here is a proposition of quantities according to the packaging:\n"
+"EAN: %s Quantity: %s Type of ul: %s"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Recreate Packing"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
#: field:sale.order.line,property_ids:0
msgid "Properties"
msgstr "คุณสมบัติ"
@@ -1233,7 +1446,17 @@ msgid ""
msgstr ""
#. module: sale
-#: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
+#: view:sale.order.line:0
+msgid "Confirmed sale order lines, not yet delivered"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:473
+#, python-format
+msgid "Customer Invoices"
+msgstr ""
+
+#. module: sale
#: model:process.process,name:sale.process_process_salesprocess0
#: view:sale.order:0
#: view:sale.report:0
@@ -1255,18 +1478,13 @@ msgid "Done"
msgstr "เสร็จแล้ว"
#. module: sale
-#: model:ir.model,name:sale.model_sale_installer
-msgid "sale.installer"
-msgstr ""
-
-#. module: sale
#: model:process.node,name:sale.process_node_invoice0
#: model:process.node,name:sale.process_node_invoiceafterdelivery0
msgid "Invoice"
msgstr "ใบแจ้งหนี้"
#. module: sale
-#: code:addons/sale/sale.py:1014
+#: code:addons/sale/sale.py:1158
#, python-format
msgid ""
"You have to select a customer in the sales form !\n"
@@ -1274,11 +1492,6 @@ msgid ""
msgstr ""
#. module: sale
-#: selection:sale.config.picking_policy,step:0
-msgid "Picking List & Delivery Order"
-msgstr ""
-
-#. module: sale
#: field:sale.order,origin:0
msgid "Source Document"
msgstr ""
@@ -1304,7 +1517,7 @@ msgid "The amount without tax."
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:571
+#: code:addons/sale/sale.py:604
#, python-format
msgid "You must first cancel all picking attached to this sales order."
msgstr ""
@@ -1315,8 +1528,14 @@ msgid "Sales Advance Payment Invoice"
msgstr ""
#. module: sale
-#: field:sale.order,incoterm:0
-msgid "Incoterm"
+#: view:sale.report:0
+#: field:sale.report,month:0
+msgid "Month"
+msgstr "เดือน"
+
+#. module: sale
+#: model:email.template,subject:sale.email_template_edi_sale
+msgid "${object.company_id.name} Order (Ref ${object.name or 'n/a' })"
msgstr ""
#. module: sale
@@ -1328,11 +1547,6 @@ msgid "Product"
msgstr ""
#. module: sale
-#: model:ir.ui.menu,name:sale.menu_invoiced
-msgid "Invoicing"
-msgstr ""
-
-#. module: sale
#: model:process.transition.action,name:sale.process_transition_action_cancelassignation0
msgid "Cancel Assignation"
msgstr ""
@@ -1343,14 +1557,10 @@ msgid "sale.config.picking_policy"
msgstr ""
#. module: sale
-#: help:sale.order,state:0
-msgid ""
-"Gives the state of the quotation or sales order. \n"
-"The exception state is automatically set when a cancel operation occurs in "
-"the invoice validation (Invoice Exception) or in the picking list process "
-"(Shipping Exception). \n"
-"The 'Waiting Schedule' state is set when the invoice is confirmed but "
-"waiting for the scheduler to run on the date 'Ordered Date'."
+#: view:account.invoice.report:0
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_turnover_by_month
+msgid "Monthly Turnover"
msgstr ""
#. module: sale
@@ -1369,7 +1579,6 @@ msgid "Product UoS"
msgstr ""
#. module: sale
-#: selection:sale.order,state:0
#: selection:sale.report,state:0
msgid "Manual In Progress"
msgstr ""
@@ -1390,7 +1599,8 @@ msgid "Order"
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:921
+#: code:addons/sale/sale.py:1016
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:71
#, python-format
msgid "There is no income account defined for this product: \"%s\" (id:%d)"
msgstr ""
@@ -1410,7 +1620,7 @@ msgid ""
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:1116
+#: code:addons/sale/sale.py:1238
#, python-format
msgid ""
"You plan to sell %.2f %s but you only have %.2f %s available !\n"
@@ -1439,10 +1649,10 @@ msgid "Total"
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:388
-#, python-format
-msgid "There is no sales journal defined for this company: \"%s\" (id:%d)"
-msgstr ""
+#: report:sale.order:0
+#: view:sale.order.line:0
+msgid "Price"
+msgstr "ราคา"
#. module: sale
#: model:process.transition,note:sale.process_transition_deliver0
@@ -1453,9 +1663,14 @@ msgid ""
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:1165
-#, python-format
-msgid "Cannot delete a sales order line which is %s !"
+#: selection:sale.order,order_policy:0
+msgid "Pay before delivery"
+msgstr ""
+
+#. module: sale
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.open_board_sales
+msgid "Sales Dashboard"
msgstr ""
#. module: sale
@@ -1467,6 +1682,7 @@ msgstr ""
#. module: sale
#: view:sale.order:0
+#: selection:sale.order,state:0
#: view:sale.order.line:0
msgid "To Invoice"
msgstr ""
@@ -1477,6 +1693,11 @@ msgid "Date on which sales order is confirmed."
msgstr ""
#. module: sale
+#: field:sale.order,project_id:0
+msgid "Contract/Analytic Account"
+msgstr ""
+
+#. module: sale
#: field:sale.order,company_id:0
#: field:sale.order.line,company_id:0
#: view:sale.report:0
@@ -1496,9 +1717,11 @@ msgid "The amount to be invoiced in advance."
msgstr ""
#. module: sale
-#: selection:sale.order,state:0
-#: selection:sale.report,state:0
-msgid "Invoice Exception"
+#: code:addons/sale/sale.py:1256
+#, python-format
+msgid ""
+"Couldn't find a pricelist line matching this product and quantity.\n"
+"You have to change either the product, the quantity or the pricelist."
msgstr ""
#. module: sale
@@ -1508,13 +1731,6 @@ msgid ""
msgstr ""
#. module: sale
-#: help:sale.installer,sale_margin:0
-msgid ""
-"Gives the margin of profitability by calculating the difference between Unit "
-"Price and Cost Price."
-msgstr ""
-
-#. module: sale
#: view:sale.make.invoice:0
#: view:sale.order.line.make.invoice:0
msgid "Create invoices"
@@ -1533,6 +1749,11 @@ msgid "Cancelled"
msgstr ""
#. module: sale
+#: view:sale.order.line:0
+msgid "Sales Order Lines related to a Sales Order of mine"
+msgstr ""
+
+#. module: sale
#: model:ir.actions.act_window,name:sale.action_shop_form
#: model:ir.ui.menu,name:sale.menu_action_shop_form
#: field:sale.order,shop_id:0
@@ -1542,17 +1763,12 @@ msgid "Shop"
msgstr ""
#. module: sale
-#: view:sale.report:0
-msgid " Month "
-msgstr ""
-
-#. module: sale
#: field:sale.report,date_confirm:0
msgid "Date Confirm"
msgstr ""
#. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:111
+#: code:addons/sale/wizard/sale_line_invoice.py:113
#, python-format
msgid "Warning"
msgstr ""
@@ -1564,17 +1780,6 @@ msgid "Sales by Month"
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:1045
-#, python-format
-msgid ""
-"You selected a quantity of %d Units.\n"
-"But it's not compatible with the selected packaging.\n"
-"Here is a proposition of quantities according to the packaging:\n"
-"\n"
-"EAN: %s Quantity: %s Type of ul: %s"
-msgstr ""
-
-#. module: sale
#: model:ir.model,name:sale.model_sale_order
#: model:process.node,name:sale.process_node_order0
#: model:process.node,name:sale.process_node_saleorder0
@@ -1590,6 +1795,11 @@ msgid "Quantity (UoS)"
msgstr ""
#. module: sale
+#: view:sale.order.line:0
+msgid "Sale Order Lines that are in 'done' state"
+msgstr ""
+
+#. module: sale
#: model:process.transition,note:sale.process_transition_packing0
msgid ""
"The Pick List form is created as soon as the sales order is confirmed, in "
@@ -1604,6 +1814,11 @@ msgid "Confirmed"
msgstr ""
#. module: sale
+#: field:sale.config.picking_policy,order_policy:0
+msgid "Main Method Based On"
+msgstr ""
+
+#. module: sale
#: model:process.transition.action,name:sale.process_transition_action_confirm0
msgid "Confirm"
msgstr ""
@@ -1626,6 +1841,7 @@ msgid "Invoice Lines"
msgstr ""
#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_product_tree
#: view:sale.order:0
#: view:sale.order.line:0
msgid "Sales Order Lines"
@@ -1642,30 +1858,18 @@ msgid "Configuration"
msgstr ""
#. module: sale
-#: selection:sale.order,picking_policy:0
-msgid "Complete Delivery"
+#: code:addons/sale/edi/sale_order.py:146
+#, python-format
+msgid "EDI Pricelist (%s)"
msgstr ""
#. module: sale
#: view:sale.report:0
-msgid " Month-1 "
-msgstr ""
-
-#. module: sale
-#: help:sale.config.picking_policy,picking_policy:0
-msgid ""
-"The Shipping Policy is used to configure per order if you want to deliver as "
-"soon as possible when one product is available or you wait that all products "
-"are available.."
+msgid "Sales order created in current year"
msgstr ""
#. module: sale
-#: selection:sale.report,month:0
-msgid "August"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:111
+#: code:addons/sale/wizard/sale_line_invoice.py:113
#, python-format
msgid ""
"Invoice cannot be created for this Sales Order Line due to one of the "
@@ -1675,6 +1879,11 @@ msgid ""
msgstr ""
#. module: sale
+#: view:sale.order.line:0
+msgid "Sale order lines done"
+msgstr ""
+
+#. module: sale
#: field:sale.order.line,th_weight:0
msgid "Weight"
msgstr ""
@@ -1693,7 +1902,6 @@ msgstr ""
#. module: sale
#: field:sale.config.picking_policy,config_logo:0
-#: field:sale.installer,config_logo:0
msgid "Image"
msgstr ""
@@ -1723,9 +1931,9 @@ msgid "Salesman"
msgstr ""
#. module: sale
-#: model:process.node,note:sale.process_node_saleorder0
-msgid "Drives procurement and invoicing"
-msgstr ""
+#: model:ir.actions.act_window,name:sale.action_order_tree
+msgid "Old Quotations"
+msgstr "ใบเสนอราคาเก่า"
#. module: sale
#: field:sale.order,amount_untaxed:0
@@ -1733,7 +1941,7 @@ msgid "Untaxed Amount"
msgstr ""
#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:163
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:170
#: model:ir.actions.act_window,name:sale.action_view_sale_advance_payment_inv
#: view:sale.advance.payment.inv:0
#: view:sale.order:0
@@ -1742,7 +1950,7 @@ msgid "Advance Invoice"
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:591
+#: code:addons/sale/sale.py:624
#, python-format
msgid "The sales order '%s' has been cancelled."
msgstr ""
@@ -1777,19 +1985,19 @@ msgid "Packings"
msgstr ""
#. module: sale
-#: field:sale.config.picking_policy,progress:0
-#: field:sale.installer,progress:0
-msgid "Configuration Progress"
+#: view:sale.order.line:0
+msgid "Sale Order Lines ready to be invoiced"
msgstr ""
#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_product_tree
-msgid "Product sales"
+#: view:sale.report:0
+msgid "Sales order created in last month"
msgstr ""
#. module: sale
-#: field:sale.order,date_order:0
-msgid "Ordered Date"
+#: model:ir.actions.act_window,name:sale.action_email_templates
+#: model:ir.ui.menu,name:sale.menu_email_templates
+msgid "Email Templates"
msgstr ""
#. module: sale
@@ -1800,14 +2008,15 @@ msgid "Sales Orders"
msgstr ""
#. module: sale
-#: selection:sale.config.picking_policy,picking_policy:0
-msgid "Direct Delivery"
-msgstr ""
+#: model:ir.model,name:sale.model_sale_shop
+#: view:sale.shop:0
+msgid "Sales Shop"
+msgstr "ร้าน"
#. module: sale
-#: field:sale.installer,sale_journal:0
-msgid "Invoicing journals"
-msgstr ""
+#: selection:sale.report,month:0
+msgid "November"
+msgstr "พฤศจิกายน"
#. module: sale
#: field:sale.advance.payment.inv,product_id:0
@@ -1815,18 +2024,12 @@ msgid "Advance Product"
msgstr ""
#. module: sale
-#: view:sale.report:0
-#: field:sale.report,shipped_qty_1:0
-msgid "Shipped Qty"
-msgstr ""
-
-#. module: sale
-#: view:sale.open.invoice:0
-msgid "You invoice has been successfully created!"
-msgstr ""
+#: view:sale.order:0
+msgid "Compute"
+msgstr "คำนวณ"
#. module: sale
-#: code:addons/sale/sale.py:585
+#: code:addons/sale/sale.py:618
#, python-format
msgid "You must first cancel all invoices attached to this sales order."
msgstr ""
@@ -1837,24 +2040,13 @@ msgid "January"
msgstr ""
#. module: sale
-#: view:sale.installer:0
-msgid "Configure Your Sales Management Application"
-msgstr ""
-
-#. module: sale
#: model:ir.actions.act_window,name:sale.action_order_tree4
msgid "Sales Order in Progress"
msgstr ""
#. module: sale
-#: field:sale.installer,sale_layout:0
-msgid "Sales Order Layout Improvement"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:63
-#, python-format
-msgid "Error"
+#: help:sale.order,origin:0
+msgid "Reference of the document that generated this sales order request."
msgstr ""
#. module: sale
@@ -1864,6 +2056,11 @@ msgid "Commitment Delay"
msgstr ""
#. module: sale
+#: selection:sale.order,order_policy:0
+msgid "Deliver & invoice on demand"
+msgstr ""
+
+#. module: sale
#: model:process.node,note:sale.process_node_saleprocurement0
msgid ""
"One Procurement order for each sales order line and for each of the "
@@ -1886,13 +2083,12 @@ msgid "Confirmed sales order to invoice."
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:290
-#, python-format
-msgid "Cannot delete Sales Order(s) which are already confirmed !"
+#: view:sale.order:0
+msgid "Sales Order that haven't yet been confirmed"
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:316
+#: code:addons/sale/sale.py:322
#, python-format
msgid "The sales order '%s' has been set in draft state."
msgstr ""
@@ -1903,24 +2099,19 @@ msgid "from stock"
msgstr ""
#. module: sale
-#: field:sale.config.picking_policy,order_policy:0
-msgid "Shipping Default Policy"
-msgstr ""
-
-#. module: sale
#: view:sale.open.invoice:0
msgid "Close"
msgstr ""
#. module: sale
-#: field:sale.order,shipped:0
-msgid "Delivered"
+#: code:addons/sale/sale.py:1248
+#, python-format
+msgid "No Pricelist ! : "
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:1115
-#, python-format
-msgid "Not enough stock !"
+#: field:sale.order,shipped:0
+msgid "Delivered"
msgstr ""
#. module: sale
@@ -1929,11 +2120,6 @@ msgid "You must assign a production lot for this product"
msgstr ""
#. module: sale
-#: field:sale.order.line,sequence:0
-msgid "Layout Sequence"
-msgstr ""
-
-#. module: sale
#: model:ir.actions.act_window,help:sale.action_shop_form
msgid ""
"If you have more than one shop reselling your company products, you can "
@@ -1960,11 +2146,6 @@ msgid "May"
msgstr ""
#. module: sale
-#: help:sale.installer,sale_order_dates:0
-msgid "Adds commitment, requested and effective dates on Sales Orders."
-msgstr ""
-
-#. module: sale
#: view:sale.order:0
#: field:sale.order,partner_id:0
#: field:sale.order.line,order_partner_id:0
@@ -1972,23 +2153,11 @@ msgid "Customer"
msgstr ""
#. module: sale
-#: model:product.template,name:sale.advance_product_0_product_template
-msgid "Advance"
-msgstr ""
-
-#. module: sale
#: selection:sale.report,month:0
msgid "February"
msgstr ""
#. module: sale
-#: help:sale.installer,sale_journal:0
-msgid ""
-"Allows you to group and invoice your delivery orders according to different "
-"invoicing types: daily, weekly, etc."
-msgstr ""
-
-#. module: sale
#: selection:sale.report,month:0
msgid "April"
msgstr ""
@@ -1999,11 +2168,6 @@ msgid "Accounting"
msgstr ""
#. module: sale
-#: field:sale.config.picking_policy,step:0
-msgid "Steps To Deliver a Sales Order"
-msgstr ""
-
-#. module: sale
#: view:sale.order:0
#: view:sale.order.line:0
msgid "Search Sales Order"
@@ -2015,15 +2179,15 @@ msgid "Sales Order Requisition"
msgstr ""
#. module: sale
-#: report:sale.order:0
-#: field:sale.order,payment_term:0
-msgid "Payment Term"
+#: code:addons/sale/sale.py:1242
+#, python-format
+msgid "Not enough stock ! : "
msgstr ""
#. module: sale
-#: help:sale.installer,sale_layout:0
-msgid ""
-"Provides some features to improve the layout of the Sales Order reports."
+#: report:sale.order:0
+#: field:sale.order,payment_term:0
+msgid "Payment Term"
msgstr ""
#. module: sale
@@ -2057,3 +2221,33 @@ msgstr ""
#: selection:sale.config.picking_policy,order_policy:0
msgid "Invoice Based on Deliveries"
msgstr ""
+
+#~ msgid "Allows you to compute delivery costs on your quotations."
+#~ msgstr "อนุญาตให้คำนวณค่าจัดส่งในใบเสนอาราคา"
+
+#~ msgid "Payment Before Delivery"
+#~ msgstr "ชำระเงินก่อนจัดส่ง"
+
+#~ msgid "All at Once"
+#~ msgstr "ทั้วหมดในครั้งเดียว"
+
+#~ msgid "Configure"
+#~ msgstr "ตั้งค่า"
+
+#~ msgid "Sales Order Dates"
+#~ msgstr "วันที่รับคำสั่งซื้อ"
+
+#~ msgid "Delivery Costs"
+#~ msgstr "ค่าจัดส่ง"
+
+#~ msgid "Partial Delivery"
+#~ msgstr "จัดส่งบางส่วน"
+
+#~ msgid "Order date"
+#~ msgstr "วันที่สั่งซื้อ"
+
+#~ msgid "title"
+#~ msgstr "คำนำหน้าชื่อ"
+
+#~ msgid "Sales Management"
+#~ msgstr "การบริหารการขาย"
diff --git a/addons/sale/i18n/tlh.po b/addons/sale/i18n/tlh.po
index 526ba7d785e..abd5a953a90 100644
--- a/addons/sale/i18n/tlh.po
+++ b/addons/sale/i18n/tlh.po
@@ -6,25 +6,32 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2011-01-11 11:16+0000\n"
+"POT-Creation-Date: 2011-12-22 18:43+0000\n"
"PO-Revision-Date: 2009-02-03 06:26+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-05 05:17+0000\n"
-"X-Generator: Launchpad (build 14231)\n"
+"X-Launchpad-Export-Date: 2011-12-23 06:47+0000\n"
+"X-Generator: Launchpad (build 14560)\n"
#. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_sales_by_salesman
-msgid "Sales by Salesman in last 90 days"
+#: field:sale.config.picking_policy,timesheet:0
+msgid "Based on Timesheet"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid ""
+"Sale Order Lines that are confirmed, done or in exception state and haven't "
+"yet been invoiced"
msgstr ""
#. module: sale
-#: help:sale.installer,delivery:0
-msgid "Allows you to compute delivery costs on your quotations."
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_sales_by_salesman
+msgid "Sales by Salesman in last 90 days"
msgstr ""
#. module: sale
@@ -35,6 +42,11 @@ msgid ""
msgstr ""
#. module: sale
+#: view:sale.order:0
+msgid "UoS"
+msgstr ""
+
+#. module: sale
#: help:sale.order,partner_shipping_id:0
msgid "Shipping address for current sales order."
msgstr ""
@@ -58,22 +70,12 @@ msgid "Cancel Order"
msgstr ""
#. module: sale
-#: view:sale.config.picking_policy:0
-msgid "Configure Sales Order Logistics"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:603
+#: code:addons/sale/sale.py:638
#, python-format
msgid "The quotation '%s' has been converted to a sales order."
msgstr ""
#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Payment Before Delivery"
-msgstr ""
-
-#. module: sale
#: code:addons/sale/wizard/sale_make_invoice.py:42
#, python-format
msgid "Warning !"
@@ -90,12 +92,6 @@ msgid "Drives procurement orders for every sales order line."
msgstr ""
#. module: sale
-#: selection:sale.config.picking_policy,picking_policy:0
-msgid "All at Once"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,project_id:0
#: view:sale.report:0
#: field:sale.report,analytic_account_id:0
#: field:sale.shop,project_id:0
@@ -111,6 +107,15 @@ msgid ""
msgstr ""
#. module: sale
+#: code:addons/sale/sale.py:295
+#, python-format
+msgid ""
+"In order to delete a confirmed sale order, you must cancel it before ! To "
+"cancel a sale order, you must first cancel related picking or delivery "
+"orders."
+msgstr ""
+
+#. module: sale
#: model:process.node,name:sale.process_node_saleprocurement0
msgid "Procurement Order"
msgstr ""
@@ -122,6 +127,11 @@ msgid "Partner"
msgstr ""
#. module: sale
+#: selection:sale.order,order_policy:0
+msgid "Invoice based on deliveries"
+msgstr ""
+
+#. module: sale
#: view:sale.order:0
msgid "Order Line"
msgstr ""
@@ -154,8 +164,13 @@ msgid "Default Payment Term"
msgstr ""
#. module: sale
-#: model:ir.actions.act_window,name:sale.action_config_picking_policy
-msgid "Configure Picking Policy for Sales Order"
+#: field:sale.config.picking_policy,deli_orders:0
+msgid "Based on Delivery Orders"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.picking_policy,time_unit:0
+msgid "Main Working Time Unit"
msgstr ""
#. module: sale
@@ -172,8 +187,9 @@ msgid "Disc.(%)"
msgstr ""
#. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_forceassignation0
-msgid "Force Assignation"
+#: view:sale.report:0
+#: field:sale.report,price_total:0
+msgid "Total Price"
msgstr ""
#. module: sale
@@ -182,6 +198,11 @@ msgid "Check the box to group the invoices for the same customers"
msgstr ""
#. module: sale
+#: view:sale.order:0
+msgid "My Sale Orders"
+msgstr ""
+
+#. module: sale
#: selection:sale.order,invoice_quantity:0
msgid "Ordered Quantities"
msgstr ""
@@ -220,13 +241,24 @@ msgid ""
msgstr ""
#. module: sale
+#: field:sale.config.picking_policy,task_work:0
+msgid "Based on Tasks' Work"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
+msgid "Quotations and Sales"
+msgstr ""
+
+#. module: sale
#: model:ir.model,name:sale.model_sale_make_invoice
msgid "Sales Make Invoice"
msgstr ""
#. module: sale
-#: view:sale.order:0
-msgid "Recreate Packing"
+#: code:addons/sale/sale.py:330
+#, python-format
+msgid "Pricelist Warning!"
msgstr ""
#. module: sale
@@ -235,9 +267,9 @@ msgid "Discount (%)"
msgstr ""
#. module: sale
-#: help:res.company,security_lead:0
-msgid ""
-"This is the days added to what you promise to customers for security purpose"
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_quotation_for_sale
+msgid "My Quotations"
msgstr ""
#. module: sale
@@ -263,7 +295,22 @@ msgid "Shop Name"
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:1014
+#: help:sale.order,order_policy:0
+msgid ""
+"The Invoice Policy is used to synchronise invoice and delivery operations.\n"
+" - The 'Pay before delivery' choice will first generate the invoice and "
+"then generate the picking order after the payment of this invoice.\n"
+" - The 'Deliver & Invoice on demand' will create the picking order directly "
+"and wait for the user to manually click on the 'Invoice' button to generate "
+"the draft invoice based on the sale order or the sale order lines.\n"
+" - The 'Invoice on order after delivery' choice will generate the draft "
+"invoice based on sales order after all picking lists have been finished.\n"
+" - The 'Invoice based on deliveries' choice is used to create an invoice "
+"during the picking process."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:1158
#, python-format
msgid "No Customer Defined !"
msgstr ""
@@ -274,8 +321,11 @@ msgid "Sales in Exception"
msgstr ""
#. module: sale
-#: view:sale.order:0
-msgid "Set to Draft"
+#: code:addons/sale/sale.py:1145
+#: code:addons/sale/sale.py:1264
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:70
+#, python-format
+msgid "Configuration Error !"
msgstr ""
#. module: sale
@@ -284,22 +334,7 @@ msgid "Conditions"
msgstr ""
#. module: sale
-#: help:sale.order,order_policy:0
-msgid ""
-"The Shipping Policy is used to synchronise invoice and delivery operations.\n"
-" - The 'Pay Before delivery' choice will first generate the invoice and "
-"then generate the picking order after the payment of this invoice.\n"
-" - The 'Shipping & Manual Invoice' will create the picking order directly "
-"and wait for the user to manually click on the 'Invoice' button to generate "
-"the draft invoice.\n"
-" - The 'Invoice On Order After Delivery' choice will generate the draft "
-"invoice based on sales order after all picking lists have been finished.\n"
-" - The 'Invoice From The Picking' choice is used to create an invoice "
-"during the picking process."
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:939
+#: code:addons/sale/sale.py:1034
#, python-format
msgid ""
"There is no income category account defined in default Properties for "
@@ -307,8 +342,8 @@ msgid ""
msgstr ""
#. module: sale
-#: view:sale.installer:0
-msgid "Configure"
+#: selection:sale.report,month:0
+msgid "August"
msgstr ""
#. module: sale
@@ -317,7 +352,7 @@ msgid "You try to assign a lot which is not from the same product"
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:620
+#: code:addons/sale/sale.py:655
#, python-format
msgid "invalid mode for test_state"
msgstr ""
@@ -328,7 +363,7 @@ msgid "June"
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:584
+#: code:addons/sale/sale.py:617
#, python-format
msgid "Could not cancel this sales order !"
msgstr ""
@@ -349,8 +384,12 @@ msgid "October"
msgstr ""
#. module: sale
+#: sql_constraint:stock.picking:0
+msgid "Reference must be unique per Company!"
+msgstr ""
+
+#. module: sale
#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_quotation_for_sale
#: view:sale.order:0
#: view:sale.report:0
msgid "Quotations"
@@ -362,11 +401,6 @@ msgid "Pricelist for current sales order."
msgstr ""
#. module: sale
-#: selection:sale.config.picking_policy,step:0
-msgid "Delivery Order Only"
-msgstr ""
-
-#. module: sale
#: report:sale.order:0
msgid "TVA :"
msgstr ""
@@ -391,6 +425,7 @@ msgstr ""
#. module: sale
#: view:sale.order:0
#: view:sale.order.line:0
+#: field:sale.report,product_uom:0
msgid "UoM"
msgstr ""
@@ -413,13 +448,19 @@ msgid ""
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:971
+#: code:addons/sale/sale.py:1061
+#, python-format
+msgid "You cannot cancel a sale order line that has already been invoiced!"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:1066
#, python-format
msgid "You must first cancel stock moves attached to this sales order line."
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:1042
+#: code:addons/sale/sale.py:1134
#, python-format
msgid "(n/a)"
msgstr ""
@@ -453,13 +494,35 @@ msgid "Notes"
msgstr ""
#. module: sale
+#: sql_constraint:res.company:0
+msgid "The company name must be unique !"
+msgstr ""
+
+#. module: sale
#: help:sale.order,partner_invoice_id:0
msgid "Invoice address for current sales order."
msgstr ""
#. module: sale
-#: view:sale.installer:0
-msgid "Enhance your core Sales Application with additional functionalities."
+#: view:sale.report:0
+msgid "Month-1"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered month of the sales order"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:504
+#, python-format
+msgid ""
+"You cannot group sales having different currencies for the same partner."
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,picking_policy:0
+msgid "Deliver each product when available"
msgstr ""
#. module: sale
@@ -479,13 +542,13 @@ msgid "Confirmation Date"
msgstr ""
#. module: sale
-#: field:sale.order.line,address_allotment_id:0
-msgid "Allotment Partner"
+#: field:sale.order,incoterm:0
+msgid "Incoterm"
msgstr ""
#. module: sale
-#: sql_constraint:sale.order:0
-msgid "Order Reference must be unique !"
+#: field:sale.order.line,address_allotment_id:0
+msgid "Allotment Partner"
msgstr ""
#. module: sale
@@ -494,6 +557,28 @@ msgid "March"
msgstr ""
#. module: sale
+#: constraint:stock.move:0
+msgid "You can not move products from or to a location of the type view."
+msgstr ""
+
+#. module: sale
+#: field:sale.config.picking_policy,sale_orders:0
+msgid "Based on Sales Orders"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,state:0
+msgid ""
+"Givwizard = self.browse(cr, uid, ids)[0]es the state of the quotation or "
+"sales order. \n"
+"The exception state is automatically set when a cancel operation occurs in "
+"the invoice validation (Invoice Exception) or in the picking list process "
+"(Shipping Exception). \n"
+"The 'Waiting Schedule' state is set when the invoice is confirmed but "
+"waiting for the scheduler to run on the order date."
+msgstr ""
+
+#. module: sale
#: help:sale.order,amount_total:0
msgid "The total amount."
msgstr ""
@@ -509,6 +594,11 @@ msgid "Invoice address :"
msgstr ""
#. module: sale
+#: field:sale.order.line,sequence:0
+msgid "Line Sequence"
+msgstr ""
+
+#. module: sale
#: model:process.transition,note:sale.process_transition_saleorderprocurement0
msgid ""
"For every sales order line, a procurement order is created to supply the "
@@ -555,11 +645,6 @@ msgid "Sales Order Line"
msgstr ""
#. module: sale
-#: view:sale.config.picking_policy:0
-msgid "Setup your sales workflow and default values."
-msgstr ""
-
-#. module: sale
#: field:sale.shop,warehouse_id:0
msgid "Warehouse"
msgstr ""
@@ -596,6 +681,11 @@ msgid "Creation Date"
msgstr ""
#. module: sale
+#: model:ir.ui.menu,name:sale.menu_sales_configuration_misc
+msgid "Miscellaneous"
+msgstr ""
+
+#. module: sale
#: model:ir.actions.act_window,name:sale.action_order_line_tree3
msgid "Uninvoiced and Delivered Lines"
msgstr ""
@@ -611,14 +701,19 @@ msgid "My Sales"
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:290
-#: code:addons/sale/sale.py:966
-#: code:addons/sale/sale.py:1165
+#: code:addons/sale/sale.py:295
+#: code:addons/sale/sale.py:1061
+#: code:addons/sale/sale.py:1290
#, python-format
msgid "Invalid action !"
msgstr ""
#. module: sale
+#: view:sale.order:0
+msgid "Extra Info"
+msgstr ""
+
+#. module: sale
#: field:sale.order,pricelist_id:0
#: field:sale.report,pricelist_id:0
#: field:sale.shop,pricelist_id:0
@@ -632,13 +727,21 @@ msgid "# of Qty"
msgstr ""
#. module: sale
+#: code:addons/sale/sale.py:1314
+#, python-format
+msgid "Hour"
+msgstr ""
+
+#. module: sale
#: view:sale.order:0
msgid "Order Date"
msgstr ""
#. module: sale
#: view:sale.order.line:0
+#: view:sale.report:0
#: field:sale.report,shipped:0
+#: field:sale.report,shipped_qty_1:0
msgid "Shipped"
msgstr ""
@@ -648,8 +751,8 @@ msgid "All Quotations"
msgstr ""
#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Invoice On Order After Delivery"
+#: view:sale.config.picking_policy:0
+msgid "Options"
msgstr ""
#. module: sale
@@ -658,6 +761,20 @@ msgid "September"
msgstr ""
#. module: sale
+#: code:addons/sale/sale.py:632
+#, python-format
+msgid "You cannot confirm a sale order which has no line."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:1246
+#, python-format
+msgid ""
+"You have to select a pricelist or a customer in the sales form !\n"
+"Please set one before choosing a product."
+msgstr ""
+
+#. module: sale
#: view:sale.report:0
#: field:sale.report,categ_id:0
msgid "Category of Product"
@@ -674,11 +791,6 @@ msgid "Stock Moves"
msgstr ""
#. module: sale
-#: view:sale.report:0
-msgid " Year "
-msgstr ""
-
-#. module: sale
#: field:sale.order,state:0
#: field:sale.report,state:0
msgid "Order State"
@@ -696,7 +808,7 @@ msgid "Sales By Month"
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:970
+#: code:addons/sale/sale.py:1065
#, python-format
msgid "Could not cancel sales order line!"
msgstr ""
@@ -729,41 +841,18 @@ msgid ""
msgstr ""
#. module: sale
-#: view:sale.report:0
-msgid "Extended Filters..."
+#: field:sale.order,date_order:0
+msgid "Date"
msgstr ""
#. module: sale
-#: model:ir.module.module,description:sale.module_meta_information
-msgid ""
-"\n"
-" The base module to manage quotations and sales orders.\n"
-"\n"
-" * Workflow with validation steps:\n"
-" - Quotation -> Sales order -> Invoice\n"
-" * Invoicing methods:\n"
-" - Invoice on order (before or after shipping)\n"
-" - Invoice on delivery\n"
-" - Invoice on timesheets\n"
-" - Advance invoice\n"
-" * Partners preferences (shipping, invoicing, incoterm, ...)\n"
-" * Products stocks and prices\n"
-" * Delivery methods:\n"
-" - all at once, multi-parcel\n"
-" - delivery costs\n"
-" * Dashboard for salesman that includes:\n"
-" * Your open quotations\n"
-" * Top 10 sales of the month\n"
-" * Cases statistics\n"
-" * Graph of sales by product\n"
-" * Graph of cases of the month\n"
-" "
+#: view:sale.report:0
+msgid "Extended Filters..."
msgstr ""
#. module: sale
-#: model:ir.model,name:sale.model_sale_shop
-#: view:sale.shop:0
-msgid "Sales Shop"
+#: selection:sale.order.line,state:0
+msgid "Exception"
msgstr ""
#. module: sale
@@ -772,8 +861,9 @@ msgid "Companies"
msgstr ""
#. module: sale
-#: selection:sale.report,month:0
-msgid "November"
+#: code:addons/sale/sale.py:1259
+#, python-format
+msgid "No valid pricelist line found ! :"
msgstr ""
#. module: sale
@@ -782,8 +872,8 @@ msgid "History"
msgstr ""
#. module: sale
-#: field:sale.config.picking_policy,picking_policy:0
-msgid "Picking Default Policy"
+#: selection:sale.order,order_policy:0
+msgid "Invoice on order after delivery"
msgstr ""
#. module: sale
@@ -806,13 +896,12 @@ msgid ""
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:966
-#, python-format
-msgid "You cannot cancel a sales order line that has already been invoiced !"
+#: help:res.company,security_lead:0
+msgid ""
+"This is the days added to what you promise to customers for security purpose"
msgstr ""
#. module: sale
-#: view:sale.order:0
#: view:sale.order.line:0
msgid "Qty"
msgstr ""
@@ -823,6 +912,11 @@ msgid "References"
msgstr ""
#. module: sale
+#: view:sale.order.line:0
+msgid "My Sales Order Lines"
+msgstr ""
+
+#. module: sale
#: model:process.transition.action,name:sale.process_transition_action_cancel0
#: model:process.transition.action,name:sale.process_transition_action_cancel1
#: model:process.transition.action,name:sale.process_transition_action_cancel2
@@ -834,13 +928,8 @@ msgid "Cancel"
msgstr ""
#. module: sale
-#: field:sale.installer,sale_order_dates:0
-msgid "Sales Order Dates"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order.line,state:0
-msgid "Exception"
+#: sql_constraint:sale.order:0
+msgid "Order Reference must be unique per Company!"
msgstr ""
#. module: sale
@@ -853,18 +942,18 @@ msgid "Create Invoice"
msgstr ""
#. module: sale
-#: field:sale.installer,sale_margin:0
-msgid "Margins in Sales Orders"
+#: view:sale.order:0
+msgid "Total Tax Excluded"
msgstr ""
#. module: sale
-#: view:sale.order:0
-msgid "Total Tax Excluded"
+#: view:sale.order.line:0
+msgid "Order reference"
msgstr ""
#. module: sale
-#: view:sale.order:0
-msgid "Compute"
+#: view:sale.open.invoice:0
+msgid "You invoice has been successfully created!"
msgstr ""
#. module: sale
@@ -884,22 +973,19 @@ msgid "Open Invoice"
msgstr ""
#. module: sale
-#: report:sale.order:0
-#: view:sale.order.line:0
-msgid "Price"
+#: model:ir.actions.server,name:sale.ir_actions_server_edi_sale
+msgid "Auto-email confirmed sale orders"
msgstr ""
#. module: sale
-#: model:ir.actions.act_window,name:sale.action_sale_installer
-#: view:sale.config.picking_policy:0
-#: view:sale.installer:0
-msgid "Sales Application Configuration"
+#: code:addons/sale/sale.py:413
+#, python-format
+msgid "There is no sales journal defined for this company: \"%s\" (id:%d)"
msgstr ""
#. module: sale
-#: view:sale.report:0
-#: field:sale.report,price_total:0
-msgid "Total Price"
+#: model:process.transition.action,name:sale.process_transition_action_forceassignation0
+msgid "Force Assignation"
msgstr ""
#. module: sale
@@ -913,6 +999,11 @@ msgid "Based on the shipped or on the ordered quantities."
msgstr ""
#. module: sale
+#: selection:sale.order,picking_policy:0
+msgid "Deliver all products at once"
+msgstr ""
+
+#. module: sale
#: field:sale.order,picking_ids:0
msgid "Related Picking"
msgstr ""
@@ -944,8 +1035,14 @@ msgid "Create Delivery Order"
msgstr ""
#. module: sale
-#: field:sale.installer,delivery:0
-msgid "Delivery Costs"
+#: code:addons/sale/sale.py:1290
+#, python-format
+msgid "Cannot delete a sales order line which is in state '%s'!"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Qty(UoS)"
msgstr ""
#. module: sale
@@ -960,12 +1057,12 @@ msgstr ""
#. module: sale
#: view:sale.report:0
-msgid "Sales by Product Category"
+msgid "Ordered date of the sales order"
msgstr ""
#. module: sale
-#: selection:sale.order,picking_policy:0
-msgid "Partial Delivery"
+#: view:sale.report:0
+msgid "Sales by Product Category"
msgstr ""
#. module: sale
@@ -974,8 +1071,9 @@ msgid "Confirm Quotation"
msgstr ""
#. module: sale
-#: help:sale.order,origin:0
-msgid "Reference of the document that generated this sales order request."
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:63
+#, python-format
+msgid "Error"
msgstr ""
#. module: sale
@@ -1008,19 +1106,13 @@ msgid "Procurement Method"
msgstr ""
#. module: sale
-#: view:sale.config.picking_policy:0
-#: view:sale.installer:0
-msgid "title"
-msgstr ""
-
-#. module: sale
#: model:process.node,name:sale.process_node_packinglist0
msgid "Pick List"
msgstr ""
#. module: sale
#: view:sale.order:0
-msgid "Order date"
+msgid "Set to Draft"
msgstr ""
#. module: sale
@@ -1029,6 +1121,85 @@ msgid "Document of the move to the output or to the customer."
msgstr ""
#. module: sale
+#: model:email.template,body_text:sale.email_template_edi_sale
+msgid ""
+"\n"
+"Hello${object.partner_order_id.name and ' ' or "
+"''}${object.partner_order_id.name or ''},\n"
+"\n"
+"Here is your order confirmation for ${object.partner_id.name}:\n"
+" | Order number: *${object.name}*\n"
+" | Order total: *${object.amount_total} "
+"${object.pricelist_id.currency_id.name}*\n"
+" | Order date: ${object.date_order}\n"
+" % if object.origin:\n"
+" | Order reference: ${object.origin}\n"
+" % endif\n"
+" % if object.client_order_ref:\n"
+" | Your reference: ${object.client_order_ref}<br />\n"
+" % endif\n"
+" | Your contact: ${object.user_id.name} ${object.user_id.user_email "
+"and '<%s>'%(object.user_id.user_email) or ''}\n"
+"\n"
+"You can view the order confirmation, download it and even pay online using "
+"the following link:\n"
+" ${ctx.get('edi_web_url_view') or 'n/a'}\n"
+"\n"
+"% if object.order_policy in ('prepaid','manual') and "
+"object.company_id.paypal_account:\n"
+"<% \n"
+"comp_name = quote(object.company_id.name)\n"
+"order_name = quote(object.name)\n"
+"paypal_account = quote(object.company_id.paypal_account)\n"
+"order_amount = quote(str(object.amount_total))\n"
+"cur_name = quote(object.pricelist_id.currency_id.name)\n"
+"paypal_url = \"https://www.paypal.com/cgi-"
+"bin/webscr?cmd=_xclick&business=%s&item_name=%s%%20Order%%20%s&invoice=%s&amo"
+"unt=%s\" \\\n"
+" "
+"\"&currency_code=%s&button_subtype=services&no_note=1&bn=OpenERP_Order_PayNow"
+"_%s\" % \\\n"
+" "
+"(paypal_account,comp_name,order_name,order_name,order_amount,cur_name,cur_nam"
+"e)\n"
+"%>\n"
+"It is also possible to directly pay with Paypal:\n"
+" ${paypal_url}\n"
+"% endif\n"
+"\n"
+"If you have any question, do not hesitate to contact us.\n"
+"\n"
+"\n"
+"Thank you for choosing ${object.company_id.name}!\n"
+"\n"
+"\n"
+"--\n"
+"${object.user_id.name} ${object.user_id.user_email and "
+"'<%s>'%(object.user_id.user_email) or ''}\n"
+"${object.company_id.name}\n"
+"% if object.company_id.street:\n"
+"${object.company_id.street or ''}\n"
+"% endif\n"
+"% if object.company_id.street2:\n"
+"${object.company_id.street2}\n"
+"% endif\n"
+"% if object.company_id.city or object.company_id.zip:\n"
+"${object.company_id.zip or ''} ${object.company_id.city or ''}\n"
+"% endif\n"
+"% if object.company_id.country_id:\n"
+"${object.company_id.state_id and ('%s, ' % object.company_id.state_id.name) "
+"or ''} ${object.company_id.country_id.name or ''}\n"
+"% endif\n"
+"% if object.company_id.phone:\n"
+"Phone: ${object.company_id.phone}\n"
+"% endif\n"
+"% if object.company_id.website:\n"
+"${object.company_id.website or ''}\n"
+"% endif\n"
+" "
+msgstr ""
+
+#. module: sale
#: model:process.transition.action,name:sale.process_transition_action_validate0
msgid "Validate"
msgstr ""
@@ -1051,8 +1222,8 @@ msgid "Taxes"
msgstr ""
#. module: sale
-#: field:sale.order,order_policy:0
-msgid "Shipping Policy"
+#: view:sale.order:0
+msgid "Sales Order ready to be invoiced"
msgstr ""
#. module: sale
@@ -1072,8 +1243,8 @@ msgid "Create Invoices"
msgstr ""
#. module: sale
-#: view:sale.order:0
-msgid "Extra Info"
+#: view:sale.report:0
+msgid "Sales order created in current month"
msgstr ""
#. module: sale
@@ -1082,11 +1253,24 @@ msgid "Fax :"
msgstr ""
#. module: sale
+#: help:sale.order.line,type:0
+msgid ""
+"If 'on order', it triggers a procurement when the sale order is confirmed to "
+"create a task, purchase order or manufacturing order linked to this sale "
+"order line."
+msgstr ""
+
+#. module: sale
#: field:sale.advance.payment.inv,amount:0
msgid "Advance Amount"
msgstr ""
#. module: sale
+#: field:sale.config.picking_policy,charge_delivery:0
+msgid "Do you charge the delivery?"
+msgstr ""
+
+#. module: sale
#: selection:sale.order,invoice_quantity:0
msgid "Shipped Quantities"
msgstr ""
@@ -1097,25 +1281,45 @@ msgid "Invoice Based on Sales Orders"
msgstr ""
#. module: sale
+#: code:addons/sale/sale.py:331
+#, python-format
+msgid ""
+"If you change the pricelist of this order (and eventually the currency), "
+"prices of existing order lines will not be updated."
+msgstr ""
+
+#. module: sale
#: model:ir.model,name:sale.model_stock_picking
msgid "Picking List"
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:387
-#: code:addons/sale/sale.py:920
-#: code:addons/sale/sale.py:938
+#: code:addons/sale/sale.py:412
+#: code:addons/sale/sale.py:503
+#: code:addons/sale/sale.py:632
+#: code:addons/sale/sale.py:1015
+#: code:addons/sale/sale.py:1033
#, python-format
msgid "Error !"
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:570
+#: code:addons/sale/sale.py:603
#, python-format
msgid "Could not cancel sales order !"
msgstr ""
#. module: sale
+#: view:sale.order:0
+msgid "Qty(UoM)"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered Year of the sales order"
+msgstr ""
+
+#. module: sale
#: selection:sale.report,month:0
msgid "July"
msgstr ""
@@ -1132,35 +1336,25 @@ msgid "Shipping Exception"
msgstr ""
#. module: sale
-#: field:sale.make.invoice,grouped:0
-msgid "Group the invoices"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Shipping & Manual Invoice"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:1051
+#: code:addons/sale/sale.py:1143
#, python-format
-msgid "Picking Information !"
+msgid "Picking Information ! : "
msgstr ""
#. module: sale
-#: view:sale.report:0
-#: field:sale.report,month:0
-msgid "Month"
+#: field:sale.make.invoice,grouped:0
+msgid "Group the invoices"
msgstr ""
#. module: sale
-#: model:ir.module.module,shortdesc:sale.module_meta_information
-msgid "Sales Management"
+#: field:sale.order,order_policy:0
+msgid "Invoice Policy"
msgstr ""
#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Invoice From The Picking"
+#: model:ir.actions.act_window,name:sale.action_config_picking_policy
+#: view:sale.config.picking_policy:0
+msgid "Setup your Invoicing Method"
msgstr ""
#. module: sale
@@ -1170,27 +1364,30 @@ msgstr ""
#. module: sale
#: view:sale.report:0
-#: field:sale.report,uom_name:0
msgid "Reference UoM"
msgstr ""
#. module: sale
+#: view:sale.config.picking_policy:0
+msgid ""
+"This tool will help you to install the right module and configure the system "
+"according to the method you use to invoice your customers."
+msgstr ""
+
+#. module: sale
#: model:ir.model,name:sale.model_sale_order_line_make_invoice
msgid "Sale OrderLine Make_invoice"
msgstr ""
#. module: sale
-#: help:sale.config.picking_policy,step:0
-msgid ""
-"By default, OpenERP is able to manage complex routing and paths of products "
-"in your warehouse and partner locations. This will configure the most common "
-"and simple methods to deliver products to the customer in one or two "
-"operations by the worker."
+#: selection:sale.order,state:0
+#: selection:sale.report,state:0
+msgid "Invoice Exception"
msgstr ""
#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_tree
-msgid "Old Quotations"
+#: model:process.node,note:sale.process_node_saleorder0
+msgid "Drives procurement and invoicing"
msgstr ""
#. module: sale
@@ -1206,6 +1403,22 @@ msgid "Sales Analysis"
msgstr ""
#. module: sale
+#: code:addons/sale/sale.py:1138
+#, python-format
+msgid ""
+"You selected a quantity of %d Units.\n"
+"But it's not compatible with the selected packaging.\n"
+"Here is a proposition of quantities according to the packaging:\n"
+"EAN: %s Quantity: %s Type of ul: %s"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Recreate Packing"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
#: field:sale.order.line,property_ids:0
msgid "Properties"
msgstr ""
@@ -1232,7 +1445,17 @@ msgid ""
msgstr ""
#. module: sale
-#: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
+#: view:sale.order.line:0
+msgid "Confirmed sale order lines, not yet delivered"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:473
+#, python-format
+msgid "Customer Invoices"
+msgstr ""
+
+#. module: sale
#: model:process.process,name:sale.process_process_salesprocess0
#: view:sale.order:0
#: view:sale.report:0
@@ -1254,18 +1477,13 @@ msgid "Done"
msgstr ""
#. module: sale
-#: model:ir.model,name:sale.model_sale_installer
-msgid "sale.installer"
-msgstr ""
-
-#. module: sale
#: model:process.node,name:sale.process_node_invoice0
#: model:process.node,name:sale.process_node_invoiceafterdelivery0
msgid "Invoice"
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:1014
+#: code:addons/sale/sale.py:1158
#, python-format
msgid ""
"You have to select a customer in the sales form !\n"
@@ -1273,11 +1491,6 @@ msgid ""
msgstr ""
#. module: sale
-#: selection:sale.config.picking_policy,step:0
-msgid "Picking List & Delivery Order"
-msgstr ""
-
-#. module: sale
#: field:sale.order,origin:0
msgid "Source Document"
msgstr ""
@@ -1303,7 +1516,7 @@ msgid "The amount without tax."
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:571
+#: code:addons/sale/sale.py:604
#, python-format
msgid "You must first cancel all picking attached to this sales order."
msgstr ""
@@ -1314,8 +1527,14 @@ msgid "Sales Advance Payment Invoice"
msgstr ""
#. module: sale
-#: field:sale.order,incoterm:0
-msgid "Incoterm"
+#: view:sale.report:0
+#: field:sale.report,month:0
+msgid "Month"
+msgstr ""
+
+#. module: sale
+#: model:email.template,subject:sale.email_template_edi_sale
+msgid "${object.company_id.name} Order (Ref ${object.name or 'n/a' })"
msgstr ""
#. module: sale
@@ -1327,11 +1546,6 @@ msgid "Product"
msgstr ""
#. module: sale
-#: model:ir.ui.menu,name:sale.menu_invoiced
-msgid "Invoicing"
-msgstr ""
-
-#. module: sale
#: model:process.transition.action,name:sale.process_transition_action_cancelassignation0
msgid "Cancel Assignation"
msgstr ""
@@ -1342,14 +1556,10 @@ msgid "sale.config.picking_policy"
msgstr ""
#. module: sale
-#: help:sale.order,state:0
-msgid ""
-"Gives the state of the quotation or sales order. \n"
-"The exception state is automatically set when a cancel operation occurs in "
-"the invoice validation (Invoice Exception) or in the picking list process "
-"(Shipping Exception). \n"
-"The 'Waiting Schedule' state is set when the invoice is confirmed but "
-"waiting for the scheduler to run on the date 'Ordered Date'."
+#: view:account.invoice.report:0
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_turnover_by_month
+msgid "Monthly Turnover"
msgstr ""
#. module: sale
@@ -1368,7 +1578,6 @@ msgid "Product UoS"
msgstr ""
#. module: sale
-#: selection:sale.order,state:0
#: selection:sale.report,state:0
msgid "Manual In Progress"
msgstr ""
@@ -1389,7 +1598,8 @@ msgid "Order"
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:921
+#: code:addons/sale/sale.py:1016
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:71
#, python-format
msgid "There is no income account defined for this product: \"%s\" (id:%d)"
msgstr ""
@@ -1409,7 +1619,7 @@ msgid ""
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:1116
+#: code:addons/sale/sale.py:1238
#, python-format
msgid ""
"You plan to sell %.2f %s but you only have %.2f %s available !\n"
@@ -1438,9 +1648,9 @@ msgid "Total"
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:388
-#, python-format
-msgid "There is no sales journal defined for this company: \"%s\" (id:%d)"
+#: report:sale.order:0
+#: view:sale.order.line:0
+msgid "Price"
msgstr ""
#. module: sale
@@ -1452,9 +1662,14 @@ msgid ""
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:1165
-#, python-format
-msgid "Cannot delete a sales order line which is %s !"
+#: selection:sale.order,order_policy:0
+msgid "Pay before delivery"
+msgstr ""
+
+#. module: sale
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.open_board_sales
+msgid "Sales Dashboard"
msgstr ""
#. module: sale
@@ -1466,6 +1681,7 @@ msgstr ""
#. module: sale
#: view:sale.order:0
+#: selection:sale.order,state:0
#: view:sale.order.line:0
msgid "To Invoice"
msgstr ""
@@ -1476,6 +1692,11 @@ msgid "Date on which sales order is confirmed."
msgstr ""
#. module: sale
+#: field:sale.order,project_id:0
+msgid "Contract/Analytic Account"
+msgstr ""
+
+#. module: sale
#: field:sale.order,company_id:0
#: field:sale.order.line,company_id:0
#: view:sale.report:0
@@ -1495,9 +1716,11 @@ msgid "The amount to be invoiced in advance."
msgstr ""
#. module: sale
-#: selection:sale.order,state:0
-#: selection:sale.report,state:0
-msgid "Invoice Exception"
+#: code:addons/sale/sale.py:1256
+#, python-format
+msgid ""
+"Couldn't find a pricelist line matching this product and quantity.\n"
+"You have to change either the product, the quantity or the pricelist."
msgstr ""
#. module: sale
@@ -1507,13 +1730,6 @@ msgid ""
msgstr ""
#. module: sale
-#: help:sale.installer,sale_margin:0
-msgid ""
-"Gives the margin of profitability by calculating the difference between Unit "
-"Price and Cost Price."
-msgstr ""
-
-#. module: sale
#: view:sale.make.invoice:0
#: view:sale.order.line.make.invoice:0
msgid "Create invoices"
@@ -1532,6 +1748,11 @@ msgid "Cancelled"
msgstr ""
#. module: sale
+#: view:sale.order.line:0
+msgid "Sales Order Lines related to a Sales Order of mine"
+msgstr ""
+
+#. module: sale
#: model:ir.actions.act_window,name:sale.action_shop_form
#: model:ir.ui.menu,name:sale.menu_action_shop_form
#: field:sale.order,shop_id:0
@@ -1541,17 +1762,12 @@ msgid "Shop"
msgstr ""
#. module: sale
-#: view:sale.report:0
-msgid " Month "
-msgstr ""
-
-#. module: sale
#: field:sale.report,date_confirm:0
msgid "Date Confirm"
msgstr ""
#. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:111
+#: code:addons/sale/wizard/sale_line_invoice.py:113
#, python-format
msgid "Warning"
msgstr ""
@@ -1563,17 +1779,6 @@ msgid "Sales by Month"
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:1045
-#, python-format
-msgid ""
-"You selected a quantity of %d Units.\n"
-"But it's not compatible with the selected packaging.\n"
-"Here is a proposition of quantities according to the packaging:\n"
-"\n"
-"EAN: %s Quantity: %s Type of ul: %s"
-msgstr ""
-
-#. module: sale
#: model:ir.model,name:sale.model_sale_order
#: model:process.node,name:sale.process_node_order0
#: model:process.node,name:sale.process_node_saleorder0
@@ -1589,6 +1794,11 @@ msgid "Quantity (UoS)"
msgstr ""
#. module: sale
+#: view:sale.order.line:0
+msgid "Sale Order Lines that are in 'done' state"
+msgstr ""
+
+#. module: sale
#: model:process.transition,note:sale.process_transition_packing0
msgid ""
"The Pick List form is created as soon as the sales order is confirmed, in "
@@ -1603,6 +1813,11 @@ msgid "Confirmed"
msgstr ""
#. module: sale
+#: field:sale.config.picking_policy,order_policy:0
+msgid "Main Method Based On"
+msgstr ""
+
+#. module: sale
#: model:process.transition.action,name:sale.process_transition_action_confirm0
msgid "Confirm"
msgstr ""
@@ -1625,6 +1840,7 @@ msgid "Invoice Lines"
msgstr ""
#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_product_tree
#: view:sale.order:0
#: view:sale.order.line:0
msgid "Sales Order Lines"
@@ -1641,30 +1857,18 @@ msgid "Configuration"
msgstr ""
#. module: sale
-#: selection:sale.order,picking_policy:0
-msgid "Complete Delivery"
+#: code:addons/sale/edi/sale_order.py:146
+#, python-format
+msgid "EDI Pricelist (%s)"
msgstr ""
#. module: sale
#: view:sale.report:0
-msgid " Month-1 "
-msgstr ""
-
-#. module: sale
-#: help:sale.config.picking_policy,picking_policy:0
-msgid ""
-"The Shipping Policy is used to configure per order if you want to deliver as "
-"soon as possible when one product is available or you wait that all products "
-"are available.."
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "August"
+msgid "Sales order created in current year"
msgstr ""
#. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:111
+#: code:addons/sale/wizard/sale_line_invoice.py:113
#, python-format
msgid ""
"Invoice cannot be created for this Sales Order Line due to one of the "
@@ -1674,6 +1878,11 @@ msgid ""
msgstr ""
#. module: sale
+#: view:sale.order.line:0
+msgid "Sale order lines done"
+msgstr ""
+
+#. module: sale
#: field:sale.order.line,th_weight:0
msgid "Weight"
msgstr ""
@@ -1692,7 +1901,6 @@ msgstr ""
#. module: sale
#: field:sale.config.picking_policy,config_logo:0
-#: field:sale.installer,config_logo:0
msgid "Image"
msgstr ""
@@ -1722,8 +1930,8 @@ msgid "Salesman"
msgstr ""
#. module: sale
-#: model:process.node,note:sale.process_node_saleorder0
-msgid "Drives procurement and invoicing"
+#: model:ir.actions.act_window,name:sale.action_order_tree
+msgid "Old Quotations"
msgstr ""
#. module: sale
@@ -1732,7 +1940,7 @@ msgid "Untaxed Amount"
msgstr ""
#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:163
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:170
#: model:ir.actions.act_window,name:sale.action_view_sale_advance_payment_inv
#: view:sale.advance.payment.inv:0
#: view:sale.order:0
@@ -1741,7 +1949,7 @@ msgid "Advance Invoice"
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:591
+#: code:addons/sale/sale.py:624
#, python-format
msgid "The sales order '%s' has been cancelled."
msgstr ""
@@ -1776,19 +1984,19 @@ msgid "Packings"
msgstr ""
#. module: sale
-#: field:sale.config.picking_policy,progress:0
-#: field:sale.installer,progress:0
-msgid "Configuration Progress"
+#: view:sale.order.line:0
+msgid "Sale Order Lines ready to be invoiced"
msgstr ""
#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_product_tree
-msgid "Product sales"
+#: view:sale.report:0
+msgid "Sales order created in last month"
msgstr ""
#. module: sale
-#: field:sale.order,date_order:0
-msgid "Ordered Date"
+#: model:ir.actions.act_window,name:sale.action_email_templates
+#: model:ir.ui.menu,name:sale.menu_email_templates
+msgid "Email Templates"
msgstr ""
#. module: sale
@@ -1799,13 +2007,14 @@ msgid "Sales Orders"
msgstr ""
#. module: sale
-#: selection:sale.config.picking_policy,picking_policy:0
-msgid "Direct Delivery"
+#: model:ir.model,name:sale.model_sale_shop
+#: view:sale.shop:0
+msgid "Sales Shop"
msgstr ""
#. module: sale
-#: field:sale.installer,sale_journal:0
-msgid "Invoicing journals"
+#: selection:sale.report,month:0
+msgid "November"
msgstr ""
#. module: sale
@@ -1814,18 +2023,12 @@ msgid "Advance Product"
msgstr ""
#. module: sale
-#: view:sale.report:0
-#: field:sale.report,shipped_qty_1:0
-msgid "Shipped Qty"
-msgstr ""
-
-#. module: sale
-#: view:sale.open.invoice:0
-msgid "You invoice has been successfully created!"
+#: view:sale.order:0
+msgid "Compute"
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:585
+#: code:addons/sale/sale.py:618
#, python-format
msgid "You must first cancel all invoices attached to this sales order."
msgstr ""
@@ -1836,24 +2039,13 @@ msgid "January"
msgstr ""
#. module: sale
-#: view:sale.installer:0
-msgid "Configure Your Sales Management Application"
-msgstr ""
-
-#. module: sale
#: model:ir.actions.act_window,name:sale.action_order_tree4
msgid "Sales Order in Progress"
msgstr ""
#. module: sale
-#: field:sale.installer,sale_layout:0
-msgid "Sales Order Layout Improvement"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:63
-#, python-format
-msgid "Error"
+#: help:sale.order,origin:0
+msgid "Reference of the document that generated this sales order request."
msgstr ""
#. module: sale
@@ -1863,6 +2055,11 @@ msgid "Commitment Delay"
msgstr ""
#. module: sale
+#: selection:sale.order,order_policy:0
+msgid "Deliver & invoice on demand"
+msgstr ""
+
+#. module: sale
#: model:process.node,note:sale.process_node_saleprocurement0
msgid ""
"One Procurement order for each sales order line and for each of the "
@@ -1885,13 +2082,12 @@ msgid "Confirmed sales order to invoice."
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:290
-#, python-format
-msgid "Cannot delete Sales Order(s) which are already confirmed !"
+#: view:sale.order:0
+msgid "Sales Order that haven't yet been confirmed"
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:316
+#: code:addons/sale/sale.py:322
#, python-format
msgid "The sales order '%s' has been set in draft state."
msgstr ""
@@ -1902,24 +2098,19 @@ msgid "from stock"
msgstr ""
#. module: sale
-#: field:sale.config.picking_policy,order_policy:0
-msgid "Shipping Default Policy"
-msgstr ""
-
-#. module: sale
#: view:sale.open.invoice:0
msgid "Close"
msgstr ""
#. module: sale
-#: field:sale.order,shipped:0
-msgid "Delivered"
+#: code:addons/sale/sale.py:1248
+#, python-format
+msgid "No Pricelist ! : "
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:1115
-#, python-format
-msgid "Not enough stock !"
+#: field:sale.order,shipped:0
+msgid "Delivered"
msgstr ""
#. module: sale
@@ -1928,11 +2119,6 @@ msgid "You must assign a production lot for this product"
msgstr ""
#. module: sale
-#: field:sale.order.line,sequence:0
-msgid "Layout Sequence"
-msgstr ""
-
-#. module: sale
#: model:ir.actions.act_window,help:sale.action_shop_form
msgid ""
"If you have more than one shop reselling your company products, you can "
@@ -1959,11 +2145,6 @@ msgid "May"
msgstr ""
#. module: sale
-#: help:sale.installer,sale_order_dates:0
-msgid "Adds commitment, requested and effective dates on Sales Orders."
-msgstr ""
-
-#. module: sale
#: view:sale.order:0
#: field:sale.order,partner_id:0
#: field:sale.order.line,order_partner_id:0
@@ -1971,23 +2152,11 @@ msgid "Customer"
msgstr ""
#. module: sale
-#: model:product.template,name:sale.advance_product_0_product_template
-msgid "Advance"
-msgstr ""
-
-#. module: sale
#: selection:sale.report,month:0
msgid "February"
msgstr ""
#. module: sale
-#: help:sale.installer,sale_journal:0
-msgid ""
-"Allows you to group and invoice your delivery orders according to different "
-"invoicing types: daily, weekly, etc."
-msgstr ""
-
-#. module: sale
#: selection:sale.report,month:0
msgid "April"
msgstr ""
@@ -1998,11 +2167,6 @@ msgid "Accounting"
msgstr ""
#. module: sale
-#: field:sale.config.picking_policy,step:0
-msgid "Steps To Deliver a Sales Order"
-msgstr ""
-
-#. module: sale
#: view:sale.order:0
#: view:sale.order.line:0
msgid "Search Sales Order"
@@ -2014,15 +2178,15 @@ msgid "Sales Order Requisition"
msgstr ""
#. module: sale
-#: report:sale.order:0
-#: field:sale.order,payment_term:0
-msgid "Payment Term"
+#: code:addons/sale/sale.py:1242
+#, python-format
+msgid "Not enough stock ! : "
msgstr ""
#. module: sale
-#: help:sale.installer,sale_layout:0
-msgid ""
-"Provides some features to improve the layout of the Sales Order reports."
+#: report:sale.order:0
+#: field:sale.order,payment_term:0
+msgid "Payment Term"
msgstr ""
#. module: sale
diff --git a/addons/sale/i18n/tr.po b/addons/sale/i18n/tr.po
index 69f28e05c2e..cad470e2f89 100644
--- a/addons/sale/i18n/tr.po
+++ b/addons/sale/i18n/tr.po
@@ -6,15 +6,27 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2011-01-11 11:16+0000\n"
+"POT-Creation-Date: 2011-12-22 18:43+0000\n"
"PO-Revision-Date: 2011-06-10 19:46+0000\n"
"Last-Translator: Ayhan KIZILTAN <Unknown>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-05 05:17+0000\n"
-"X-Generator: Launchpad (build 14231)\n"
+"X-Launchpad-Export-Date: 2011-12-23 06:47+0000\n"
+"X-Generator: Launchpad (build 14560)\n"
+
+#. module: sale
+#: field:sale.config.picking_policy,timesheet:0
+msgid "Based on Timesheet"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid ""
+"Sale Order Lines that are confirmed, done or in exception state and haven't "
+"yet been invoiced"
+msgstr ""
#. module: sale
#: view:board.board:0
@@ -23,11 +35,6 @@ msgid "Sales by Salesman in last 90 days"
msgstr "Satış elemanına göre son 90 gündeki satışlar"
#. module: sale
-#: help:sale.installer,delivery:0
-msgid "Allows you to compute delivery costs on your quotations."
-msgstr "Teklifinizdeki teslimat maliyetlerini hesaplamanızı sağlar."
-
-#. module: sale
#: help:sale.order,picking_policy:0
msgid ""
"If you don't have enough stock available to deliver all at once, do you "
@@ -37,6 +44,11 @@ msgstr ""
"kabul eder misiniz ?"
#. module: sale
+#: view:sale.order:0
+msgid "UoS"
+msgstr ""
+
+#. module: sale
#: help:sale.order,partner_shipping_id:0
msgid "Shipping address for current sales order."
msgstr "Seçili satış siparişi için teslimat adresi"
@@ -60,22 +72,12 @@ msgid "Cancel Order"
msgstr "Siparişi İptal Et"
#. module: sale
-#: view:sale.config.picking_policy:0
-msgid "Configure Sales Order Logistics"
-msgstr "Satış Siparişi Lojistiğini Yapılandır"
-
-#. module: sale
-#: code:addons/sale/sale.py:603
+#: code:addons/sale/sale.py:638
#, python-format
msgid "The quotation '%s' has been converted to a sales order."
msgstr "'%s' Teklifi satış siparişine çevrildi."
#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Payment Before Delivery"
-msgstr "Teslimat Öncesi Ödeme"
-
-#. module: sale
#: code:addons/sale/wizard/sale_make_invoice.py:42
#, python-format
msgid "Warning !"
@@ -92,12 +94,6 @@ msgid "Drives procurement orders for every sales order line."
msgstr "Her Satış siparişi kalemi için üretim emirlerini sürer."
#. module: sale
-#: selection:sale.config.picking_policy,picking_policy:0
-msgid "All at Once"
-msgstr "Tek Seferde"
-
-#. module: sale
-#: field:sale.order,project_id:0
#: view:sale.report:0
#: field:sale.report,analytic_account_id:0
#: field:sale.shop,project_id:0
@@ -117,6 +113,15 @@ msgstr ""
"kullanıyorsanız bu listeye gereksiniminiz bulunmuyor."
#. module: sale
+#: code:addons/sale/sale.py:295
+#, python-format
+msgid ""
+"In order to delete a confirmed sale order, you must cancel it before ! To "
+"cancel a sale order, you must first cancel related picking or delivery "
+"orders."
+msgstr ""
+
+#. module: sale
#: model:process.node,name:sale.process_node_saleprocurement0
msgid "Procurement Order"
msgstr "Satınalma Siparişi"
@@ -128,6 +133,11 @@ msgid "Partner"
msgstr "İş ortağı"
#. module: sale
+#: selection:sale.order,order_policy:0
+msgid "Invoice based on deliveries"
+msgstr ""
+
+#. module: sale
#: view:sale.order:0
msgid "Order Line"
msgstr "Sipariş Kalemi"
@@ -170,9 +180,14 @@ msgid "Default Payment Term"
msgstr "Öntanımlı Ödeme Şartı"
#. module: sale
-#: model:ir.actions.act_window,name:sale.action_config_picking_policy
-msgid "Configure Picking Policy for Sales Order"
-msgstr "Satış Siparişleri için Paketleme Politikasını Yapılandır"
+#: field:sale.config.picking_policy,deli_orders:0
+msgid "Based on Delivery Orders"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.picking_policy,time_unit:0
+msgid "Main Working Time Unit"
+msgstr ""
#. module: sale
#: view:sale.order:0
@@ -188,9 +203,10 @@ msgid "Disc.(%)"
msgstr "İnd.(%)"
#. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_forceassignation0
-msgid "Force Assignation"
-msgstr "Güç Tahsisi"
+#: view:sale.report:0
+#: field:sale.report,price_total:0
+msgid "Total Price"
+msgstr "Toplam Fiyat"
#. module: sale
#: help:sale.make.invoice,grouped:0
@@ -198,6 +214,11 @@ msgid "Check the box to group the invoices for the same customers"
msgstr "Aynı müşteriye ait faturaları gruplamak için işaretleyin"
#. module: sale
+#: view:sale.order:0
+msgid "My Sale Orders"
+msgstr ""
+
+#. module: sale
#: selection:sale.order,invoice_quantity:0
msgid "Ordered Quantities"
msgstr "Sipariş alınan miktar"
@@ -238,14 +259,25 @@ msgstr ""
"siparişten faturalama' ise faturalar otomatikman yaratılacak."
#. module: sale
+#: field:sale.config.picking_policy,task_work:0
+msgid "Based on Tasks' Work"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
+msgid "Quotations and Sales"
+msgstr ""
+
+#. module: sale
#: model:ir.model,name:sale.model_sale_make_invoice
msgid "Sales Make Invoice"
msgstr "Satış faturalarını oluştur"
#. module: sale
-#: view:sale.order:0
-msgid "Recreate Packing"
-msgstr "Paketlemeyi yeniden oluştur"
+#: code:addons/sale/sale.py:330
+#, python-format
+msgid "Pricelist Warning!"
+msgstr ""
#. module: sale
#: field:sale.order.line,discount:0
@@ -253,12 +285,10 @@ msgid "Discount (%)"
msgstr "İndirim (%)"
#. module: sale
-#: help:res.company,security_lead:0
-msgid ""
-"This is the days added to what you promise to customers for security purpose"
-msgstr ""
-"Bu bölüm, güvenli olması için müşterilere söz verilecek teslimat süresine "
-"eklenecek gün sayısı."
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_quotation_for_sale
+msgid "My Quotations"
+msgstr "Tekliflerim (Bana Ait)"
#. module: sale
#: view:board.board:0
@@ -283,7 +313,22 @@ msgid "Shop Name"
msgstr "Mağaza Adı"
#. module: sale
-#: code:addons/sale/sale.py:1014
+#: help:sale.order,order_policy:0
+msgid ""
+"The Invoice Policy is used to synchronise invoice and delivery operations.\n"
+" - The 'Pay before delivery' choice will first generate the invoice and "
+"then generate the picking order after the payment of this invoice.\n"
+" - The 'Deliver & Invoice on demand' will create the picking order directly "
+"and wait for the user to manually click on the 'Invoice' button to generate "
+"the draft invoice based on the sale order or the sale order lines.\n"
+" - The 'Invoice on order after delivery' choice will generate the draft "
+"invoice based on sales order after all picking lists have been finished.\n"
+" - The 'Invoice based on deliveries' choice is used to create an invoice "
+"during the picking process."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:1158
#, python-format
msgid "No Customer Defined !"
msgstr "Herhangi bir müşteri tanımlanmadı !"
@@ -294,9 +339,12 @@ msgid "Sales in Exception"
msgstr "İstisnai Satışlar"
#. module: sale
-#: view:sale.order:0
-msgid "Set to Draft"
-msgstr "Taslağa Ayarla"
+#: code:addons/sale/sale.py:1145
+#: code:addons/sale/sale.py:1264
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:70
+#, python-format
+msgid "Configuration Error !"
+msgstr ""
#. module: sale
#: view:sale.order:0
@@ -304,33 +352,7 @@ msgid "Conditions"
msgstr "Koşullar"
#. module: sale
-#: help:sale.order,order_policy:0
-msgid ""
-"The Shipping Policy is used to synchronise invoice and delivery operations.\n"
-" - The 'Pay Before delivery' choice will first generate the invoice and "
-"then generate the picking order after the payment of this invoice.\n"
-" - The 'Shipping & Manual Invoice' will create the picking order directly "
-"and wait for the user to manually click on the 'Invoice' button to generate "
-"the draft invoice.\n"
-" - The 'Invoice On Order After Delivery' choice will generate the draft "
-"invoice based on sales order after all picking lists have been finished.\n"
-" - The 'Invoice From The Picking' choice is used to create an invoice "
-"during the picking process."
-msgstr ""
-"Gönderim Politikası faturalama ve teslimat işlemlerinin senkronize edilmesi "
-"için kullanılır. \n"
-" \"Teslimattan önce ödeme\" seçeneği önce fatura oluşturur, faturanın "
-"ödenmesinden sonra teslim fişini oluşturur. \n"
-" \"Gönderim ve elle faturalama\" sistem önce direkt olarak teslim fişini "
-"oluşturur, ve kullanıcının \"faturala\" düğmesine basıp taslak fatura "
-"oluşturmasını bekler.\n"
-" \"Teslimatlar sonrası Faturalama\" seçeneği satış siparişine dayanarak, "
-"bütün paketleme listeleri bittikten sonra taslak fatura oluşturacaktır.\n"
-" \"Paketlemeyi baz alan Fatura\" seçeneği paketleme süreci sırasında fatura "
-"oluşturmak için kullanılır."
-
-#. module: sale
-#: code:addons/sale/sale.py:939
+#: code:addons/sale/sale.py:1034
#, python-format
msgid ""
"There is no income category account defined in default Properties for "
@@ -340,9 +362,9 @@ msgstr ""
"Konum tanımlanmamış !"
#. module: sale
-#: view:sale.installer:0
-msgid "Configure"
-msgstr "Yapılandır"
+#: selection:sale.report,month:0
+msgid "August"
+msgstr "Ağustos"
#. module: sale
#: constraint:stock.move:0
@@ -350,7 +372,7 @@ msgid "You try to assign a lot which is not from the same product"
msgstr "Aynı üründen olmayan bir parti atamaya çalışıyorsunuz"
#. module: sale
-#: code:addons/sale/sale.py:620
+#: code:addons/sale/sale.py:655
#, python-format
msgid "invalid mode for test_state"
msgstr "test_durumu için geçersiz mod"
@@ -361,7 +383,7 @@ msgid "June"
msgstr "Haziran"
#. module: sale
-#: code:addons/sale/sale.py:584
+#: code:addons/sale/sale.py:617
#, python-format
msgid "Could not cancel this sales order !"
msgstr "Bu sipariş iptal edilemiyor!"
@@ -382,8 +404,12 @@ msgid "October"
msgstr "Ekim"
#. module: sale
+#: sql_constraint:stock.picking:0
+msgid "Reference must be unique per Company!"
+msgstr ""
+
+#. module: sale
#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_quotation_for_sale
#: view:sale.order:0
#: view:sale.report:0
msgid "Quotations"
@@ -395,11 +421,6 @@ msgid "Pricelist for current sales order."
msgstr "Şu andaki sipariş için geçerli olan fiyat listesi"
#. module: sale
-#: selection:sale.config.picking_policy,step:0
-msgid "Delivery Order Only"
-msgstr "Sadece Teslim Belgesi"
-
-#. module: sale
#: report:sale.order:0
msgid "TVA :"
msgstr "TVA :"
@@ -426,6 +447,7 @@ msgstr "Mali Durum"
#. module: sale
#: view:sale.order:0
#: view:sale.order.line:0
+#: field:sale.report,product_uom:0
msgid "UoM"
msgstr "Ölçü Birimi"
@@ -450,7 +472,13 @@ msgstr ""
"olarak değiştirildi."
#. module: sale
-#: code:addons/sale/sale.py:971
+#: code:addons/sale/sale.py:1061
+#, python-format
+msgid "You cannot cancel a sale order line that has already been invoiced!"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:1066
#, python-format
msgid "You must first cancel stock moves attached to this sales order line."
msgstr ""
@@ -458,7 +486,7 @@ msgstr ""
"etmelisiniz."
#. module: sale
-#: code:addons/sale/sale.py:1042
+#: code:addons/sale/sale.py:1134
#, python-format
msgid "(n/a)"
msgstr "Uygulanabilir değil"
@@ -496,14 +524,36 @@ msgid "Notes"
msgstr "Notlar"
#. module: sale
+#: sql_constraint:res.company:0
+msgid "The company name must be unique !"
+msgstr ""
+
+#. module: sale
#: help:sale.order,partner_invoice_id:0
msgid "Invoice address for current sales order."
msgstr "Şu anki sipariş için fatura adresi."
#. module: sale
-#: view:sale.installer:0
-msgid "Enhance your core Sales Application with additional functionalities."
-msgstr "Temel Satış Uygulamasını ek işlevlerle geliştirin."
+#: view:sale.report:0
+msgid "Month-1"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered month of the sales order"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:504
+#, python-format
+msgid ""
+"You cannot group sales having different currencies for the same partner."
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,picking_policy:0
+msgid "Deliver each product when available"
+msgstr ""
#. module: sale
#: field:sale.order,invoiced_rate:0
@@ -522,21 +572,43 @@ msgid "Confirmation Date"
msgstr "Onaylanma Tarihi"
#. module: sale
+#: field:sale.order,incoterm:0
+msgid "Incoterm"
+msgstr "Teslim Sekli"
+
+#. module: sale
#: field:sale.order.line,address_allotment_id:0
msgid "Allotment Partner"
msgstr "Tahsisli Paydaş"
#. module: sale
-#: sql_constraint:sale.order:0
-msgid "Order Reference must be unique !"
-msgstr "Sipariş numarasının referans no'su kendine özgü olmalı!"
-
-#. module: sale
#: selection:sale.report,month:0
msgid "March"
msgstr "Mart"
#. module: sale
+#: constraint:stock.move:0
+msgid "You can not move products from or to a location of the type view."
+msgstr ""
+
+#. module: sale
+#: field:sale.config.picking_policy,sale_orders:0
+msgid "Based on Sales Orders"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,state:0
+msgid ""
+"Givwizard = self.browse(cr, uid, ids)[0]es the state of the quotation or "
+"sales order. \n"
+"The exception state is automatically set when a cancel operation occurs in "
+"the invoice validation (Invoice Exception) or in the picking list process "
+"(Shipping Exception). \n"
+"The 'Waiting Schedule' state is set when the invoice is confirmed but "
+"waiting for the scheduler to run on the order date."
+msgstr ""
+
+#. module: sale
#: help:sale.order,amount_total:0
msgid "The total amount."
msgstr "Toplam Miktar"
@@ -552,6 +624,11 @@ msgid "Invoice address :"
msgstr "Fatura Adresi:"
#. module: sale
+#: field:sale.order.line,sequence:0
+msgid "Line Sequence"
+msgstr ""
+
+#. module: sale
#: model:process.transition,note:sale.process_transition_saleorderprocurement0
msgid ""
"For every sales order line, a procurement order is created to supply the "
@@ -602,11 +679,6 @@ msgid "Sales Order Line"
msgstr "Satış Siparişi Kalemi"
#. module: sale
-#: view:sale.config.picking_policy:0
-msgid "Setup your sales workflow and default values."
-msgstr "Satış iş akışı ve varsayılan değerleri düzenle"
-
-#. module: sale
#: field:sale.shop,warehouse_id:0
msgid "Warehouse"
msgstr "Depo"
@@ -643,6 +715,11 @@ msgid "Creation Date"
msgstr "Oluşturulma Tarihi"
#. module: sale
+#: model:ir.ui.menu,name:sale.menu_sales_configuration_misc
+msgid "Miscellaneous"
+msgstr ""
+
+#. module: sale
#: model:ir.actions.act_window,name:sale.action_order_line_tree3
msgid "Uninvoiced and Delivered Lines"
msgstr "Teslim edilmiş ve Faturalanmamış Kalemler"
@@ -658,14 +735,19 @@ msgid "My Sales"
msgstr "Benim Satışlarım"
#. module: sale
-#: code:addons/sale/sale.py:290
-#: code:addons/sale/sale.py:966
-#: code:addons/sale/sale.py:1165
+#: code:addons/sale/sale.py:295
+#: code:addons/sale/sale.py:1061
+#: code:addons/sale/sale.py:1290
#, python-format
msgid "Invalid action !"
msgstr "Geçersiz İşlem !"
#. module: sale
+#: view:sale.order:0
+msgid "Extra Info"
+msgstr "İlave Bilgi"
+
+#. module: sale
#: field:sale.order,pricelist_id:0
#: field:sale.report,pricelist_id:0
#: field:sale.shop,pricelist_id:0
@@ -679,13 +761,21 @@ msgid "# of Qty"
msgstr "Adet"
#. module: sale
+#: code:addons/sale/sale.py:1314
+#, python-format
+msgid "Hour"
+msgstr ""
+
+#. module: sale
#: view:sale.order:0
msgid "Order Date"
msgstr "Sipariş Tarihi"
#. module: sale
#: view:sale.order.line:0
+#: view:sale.report:0
#: field:sale.report,shipped:0
+#: field:sale.report,shipped_qty_1:0
msgid "Shipped"
msgstr "Gönderildi"
@@ -695,9 +785,9 @@ msgid "All Quotations"
msgstr "Tüm Teklifler"
#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Invoice On Order After Delivery"
-msgstr "Teslimat sonrası fatura"
+#: view:sale.config.picking_policy:0
+msgid "Options"
+msgstr ""
#. module: sale
#: selection:sale.report,month:0
@@ -705,6 +795,20 @@ msgid "September"
msgstr "Eylül"
#. module: sale
+#: code:addons/sale/sale.py:632
+#, python-format
+msgid "You cannot confirm a sale order which has no line."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:1246
+#, python-format
+msgid ""
+"You have to select a pricelist or a customer in the sales form !\n"
+"Please set one before choosing a product."
+msgstr ""
+
+#. module: sale
#: view:sale.report:0
#: field:sale.report,categ_id:0
msgid "Category of Product"
@@ -721,11 +825,6 @@ msgid "Stock Moves"
msgstr "Stok Hareketi"
#. module: sale
-#: view:sale.report:0
-msgid " Year "
-msgstr " Yıl "
-
-#. module: sale
#: field:sale.order,state:0
#: field:sale.report,state:0
msgid "Order State"
@@ -743,7 +842,7 @@ msgid "Sales By Month"
msgstr "Aylık Satışlar"
#. module: sale
-#: code:addons/sale/sale.py:970
+#: code:addons/sale/sale.py:1065
#, python-format
msgid "Could not cancel sales order line!"
msgstr "Satış sipariş kalemleri iptal edilemiyor!"
@@ -778,64 +877,19 @@ msgstr ""
"başlatıldığı zaman güncellenir."
#. module: sale
+#: field:sale.order,date_order:0
+msgid "Date"
+msgstr ""
+
+#. module: sale
#: view:sale.report:0
msgid "Extended Filters..."
msgstr "Genişletilmiş Filtreler"
#. module: sale
-#: model:ir.module.module,description:sale.module_meta_information
-msgid ""
-"\n"
-" The base module to manage quotations and sales orders.\n"
-"\n"
-" * Workflow with validation steps:\n"
-" - Quotation -> Sales order -> Invoice\n"
-" * Invoicing methods:\n"
-" - Invoice on order (before or after shipping)\n"
-" - Invoice on delivery\n"
-" - Invoice on timesheets\n"
-" - Advance invoice\n"
-" * Partners preferences (shipping, invoicing, incoterm, ...)\n"
-" * Products stocks and prices\n"
-" * Delivery methods:\n"
-" - all at once, multi-parcel\n"
-" - delivery costs\n"
-" * Dashboard for salesman that includes:\n"
-" * Your open quotations\n"
-" * Top 10 sales of the month\n"
-" * Cases statistics\n"
-" * Graph of sales by product\n"
-" * Graph of cases of the month\n"
-" "
-msgstr ""
-"\n"
-" Temel modül fiyat teklifleri ve satış siparişlerini yönetir.\n"
-"\n"
-" *Doğrulama adımlarıyla iş akışı:\n"
-" - Fiyat teklifi - Satış Siparişi - Fatura\n"
-" *Faturalama yöntemleri:\n"
-" Sipariş üzerine fatura (ürünler gönderilmeden önce ya da sonra)\n"
-" Teslimat üzerine fatura\n"
-" Zaman çizelgesine göre fatura\n"
-" Peşin fatura\n"
-" * İş ortaklarının tercihleri (nakliye, faturalama, teslim şekli, ...)\n"
-" * Ürün stok ve fiyatları\n"
-" * Gönderim yöntemleri:\n"
-" - hepsi bir arada, birden fazla paket halinde\n"
-" - nakliye ücreti\n"
-" * Satıcının panosu:\n"
-" * Açık fiyat teklifleri\n"
-" * Ayın ilk 10 satışı\n"
-" * Alımların istatistiği\n"
-" * Ürüne göre satışların grafiği\n"
-" * Aya göre satışların grafiği\n"
-" "
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_shop
-#: view:sale.shop:0
-msgid "Sales Shop"
-msgstr "Satış Ofisi"
+#: selection:sale.order.line,state:0
+msgid "Exception"
+msgstr "İstisna"
#. module: sale
#: model:ir.model,name:sale.model_res_company
@@ -843,9 +897,10 @@ msgid "Companies"
msgstr "Şirketler"
#. module: sale
-#: selection:sale.report,month:0
-msgid "November"
-msgstr "Kasım"
+#: code:addons/sale/sale.py:1259
+#, python-format
+msgid "No valid pricelist line found ! :"
+msgstr ""
#. module: sale
#: view:sale.order:0
@@ -853,9 +908,9 @@ msgid "History"
msgstr "Geçmiş"
#. module: sale
-#: field:sale.config.picking_policy,picking_policy:0
-msgid "Picking Default Policy"
-msgstr "Öntanımlı Paketleme Politikası"
+#: selection:sale.order,order_policy:0
+msgid "Invoice on order after delivery"
+msgstr ""
#. module: sale
#: help:sale.order,invoice_ids:0
@@ -879,13 +934,14 @@ msgid ""
msgstr "Sipariş ya da fiyat teklifini isteyen kişinin isim ve adresi."
#. module: sale
-#: code:addons/sale/sale.py:966
-#, python-format
-msgid "You cannot cancel a sales order line that has already been invoiced !"
-msgstr "Faturalanmış olan satış sipariş kalemini iptal edemezsiniz !"
+#: help:res.company,security_lead:0
+msgid ""
+"This is the days added to what you promise to customers for security purpose"
+msgstr ""
+"Bu bölüm, güvenli olması için müşterilere söz verilecek teslimat süresine "
+"eklenecek gün sayısı."
#. module: sale
-#: view:sale.order:0
#: view:sale.order.line:0
msgid "Qty"
msgstr "Mik."
@@ -896,6 +952,11 @@ msgid "References"
msgstr "Referanslar"
#. module: sale
+#: view:sale.order.line:0
+msgid "My Sales Order Lines"
+msgstr ""
+
+#. module: sale
#: model:process.transition.action,name:sale.process_transition_action_cancel0
#: model:process.transition.action,name:sale.process_transition_action_cancel1
#: model:process.transition.action,name:sale.process_transition_action_cancel2
@@ -907,14 +968,9 @@ msgid "Cancel"
msgstr "İptal"
#. module: sale
-#: field:sale.installer,sale_order_dates:0
-msgid "Sales Order Dates"
-msgstr "Satış Sipariş Günü"
-
-#. module: sale
-#: selection:sale.order.line,state:0
-msgid "Exception"
-msgstr "İstisna"
+#: sql_constraint:sale.order:0
+msgid "Order Reference must be unique per Company!"
+msgstr ""
#. module: sale
#: model:process.transition,name:sale.process_transition_invoice0
@@ -926,19 +982,19 @@ msgid "Create Invoice"
msgstr "Fatura Oluştur"
#. module: sale
-#: field:sale.installer,sale_margin:0
-msgid "Margins in Sales Orders"
-msgstr "Satış sipariş sınırları"
-
-#. module: sale
#: view:sale.order:0
msgid "Total Tax Excluded"
msgstr "KDV'siz Toplam"
#. module: sale
-#: view:sale.order:0
-msgid "Compute"
-msgstr "Hesapla"
+#: view:sale.order.line:0
+msgid "Order reference"
+msgstr ""
+
+#. module: sale
+#: view:sale.open.invoice:0
+msgid "You invoice has been successfully created!"
+msgstr "Faturanız başarıyla oluşturuldu!"
#. module: sale
#: view:sale.report:0
@@ -957,23 +1013,20 @@ msgid "Open Invoice"
msgstr "Açık Fatura"
#. module: sale
-#: report:sale.order:0
-#: view:sale.order.line:0
-msgid "Price"
-msgstr "Fiyat"
+#: model:ir.actions.server,name:sale.ir_actions_server_edi_sale
+msgid "Auto-email confirmed sale orders"
+msgstr ""
#. module: sale
-#: model:ir.actions.act_window,name:sale.action_sale_installer
-#: view:sale.config.picking_policy:0
-#: view:sale.installer:0
-msgid "Sales Application Configuration"
-msgstr "Satış Uygulaması Kurulumu"
+#: code:addons/sale/sale.py:413
+#, python-format
+msgid "There is no sales journal defined for this company: \"%s\" (id:%d)"
+msgstr "Bu şirket için satış belgesi bulunmuyor: \"%s\" (id:%d)"
#. module: sale
-#: view:sale.report:0
-#: field:sale.report,price_total:0
-msgid "Total Price"
-msgstr "Toplam Fiyat"
+#: model:process.transition.action,name:sale.process_transition_action_forceassignation0
+msgid "Force Assignation"
+msgstr "Güç Tahsisi"
#. module: sale
#: selection:sale.order.line,type:0
@@ -986,6 +1039,11 @@ msgid "Based on the shipped or on the ordered quantities."
msgstr "Gönderilen ya da sipariş edilen miktar esas alındı."
#. module: sale
+#: selection:sale.order,picking_policy:0
+msgid "Deliver all products at once"
+msgstr ""
+
+#. module: sale
#: field:sale.order,picking_ids:0
msgid "Related Picking"
msgstr "İlgili paketleme"
@@ -1017,9 +1075,15 @@ msgid "Create Delivery Order"
msgstr "Nakliye Siparişi oluştur"
#. module: sale
-#: field:sale.installer,delivery:0
-msgid "Delivery Costs"
-msgstr "Navlun"
+#: code:addons/sale/sale.py:1290
+#, python-format
+msgid "Cannot delete a sales order line which is in state '%s'!"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Qty(UoS)"
+msgstr ""
#. module: sale
#: view:sale.order:0
@@ -1033,13 +1097,13 @@ msgstr "Paketleme listesi oluştur"
#. module: sale
#: view:sale.report:0
-msgid "Sales by Product Category"
-msgstr "Ürün Kategorisine göre satışlar"
+msgid "Ordered date of the sales order"
+msgstr ""
#. module: sale
-#: selection:sale.order,picking_policy:0
-msgid "Partial Delivery"
-msgstr "Kısmi Teslimat"
+#: view:sale.report:0
+msgid "Sales by Product Category"
+msgstr "Ürün Kategorisine göre satışlar"
#. module: sale
#: model:process.transition,name:sale.process_transition_confirmquotation0
@@ -1047,9 +1111,10 @@ msgid "Confirm Quotation"
msgstr "Teklifi Onayla"
#. module: sale
-#: help:sale.order,origin:0
-msgid "Reference of the document that generated this sales order request."
-msgstr "Bu satış siparişi isteğini oluşturan belgenin referans numarası"
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:63
+#, python-format
+msgid "Error"
+msgstr "Hata"
#. module: sale
#: view:sale.order:0
@@ -1081,20 +1146,14 @@ msgid "Procurement Method"
msgstr "Satınalma Yöntemi"
#. module: sale
-#: view:sale.config.picking_policy:0
-#: view:sale.installer:0
-msgid "title"
-msgstr "başlık"
-
-#. module: sale
#: model:process.node,name:sale.process_node_packinglist0
msgid "Pick List"
msgstr "Seçim Listesi"
#. module: sale
#: view:sale.order:0
-msgid "Order date"
-msgstr "Sipariş Tarihi"
+msgid "Set to Draft"
+msgstr "Taslağa Ayarla"
#. module: sale
#: model:process.node,note:sale.process_node_packinglist0
@@ -1102,6 +1161,85 @@ msgid "Document of the move to the output or to the customer."
msgstr "Çıkışa ya da müşteriyeyapılan hareket belgesi."
#. module: sale
+#: model:email.template,body_text:sale.email_template_edi_sale
+msgid ""
+"\n"
+"Hello${object.partner_order_id.name and ' ' or "
+"''}${object.partner_order_id.name or ''},\n"
+"\n"
+"Here is your order confirmation for ${object.partner_id.name}:\n"
+" | Order number: *${object.name}*\n"
+" | Order total: *${object.amount_total} "
+"${object.pricelist_id.currency_id.name}*\n"
+" | Order date: ${object.date_order}\n"
+" % if object.origin:\n"
+" | Order reference: ${object.origin}\n"
+" % endif\n"
+" % if object.client_order_ref:\n"
+" | Your reference: ${object.client_order_ref}<br />\n"
+" % endif\n"
+" | Your contact: ${object.user_id.name} ${object.user_id.user_email "
+"and '<%s>'%(object.user_id.user_email) or ''}\n"
+"\n"
+"You can view the order confirmation, download it and even pay online using "
+"the following link:\n"
+" ${ctx.get('edi_web_url_view') or 'n/a'}\n"
+"\n"
+"% if object.order_policy in ('prepaid','manual') and "
+"object.company_id.paypal_account:\n"
+"<% \n"
+"comp_name = quote(object.company_id.name)\n"
+"order_name = quote(object.name)\n"
+"paypal_account = quote(object.company_id.paypal_account)\n"
+"order_amount = quote(str(object.amount_total))\n"
+"cur_name = quote(object.pricelist_id.currency_id.name)\n"
+"paypal_url = \"https://www.paypal.com/cgi-"
+"bin/webscr?cmd=_xclick&business=%s&item_name=%s%%20Order%%20%s&invoice=%s&amo"
+"unt=%s\" \\\n"
+" "
+"\"&currency_code=%s&button_subtype=services&no_note=1&bn=OpenERP_Order_PayNow"
+"_%s\" % \\\n"
+" "
+"(paypal_account,comp_name,order_name,order_name,order_amount,cur_name,cur_nam"
+"e)\n"
+"%>\n"
+"It is also possible to directly pay with Paypal:\n"
+" ${paypal_url}\n"
+"% endif\n"
+"\n"
+"If you have any question, do not hesitate to contact us.\n"
+"\n"
+"\n"
+"Thank you for choosing ${object.company_id.name}!\n"
+"\n"
+"\n"
+"--\n"
+"${object.user_id.name} ${object.user_id.user_email and "
+"'<%s>'%(object.user_id.user_email) or ''}\n"
+"${object.company_id.name}\n"
+"% if object.company_id.street:\n"
+"${object.company_id.street or ''}\n"
+"% endif\n"
+"% if object.company_id.street2:\n"
+"${object.company_id.street2}\n"
+"% endif\n"
+"% if object.company_id.city or object.company_id.zip:\n"
+"${object.company_id.zip or ''} ${object.company_id.city or ''}\n"
+"% endif\n"
+"% if object.company_id.country_id:\n"
+"${object.company_id.state_id and ('%s, ' % object.company_id.state_id.name) "
+"or ''} ${object.company_id.country_id.name or ''}\n"
+"% endif\n"
+"% if object.company_id.phone:\n"
+"Phone: ${object.company_id.phone}\n"
+"% endif\n"
+"% if object.company_id.website:\n"
+"${object.company_id.website or ''}\n"
+"% endif\n"
+" "
+msgstr ""
+
+#. module: sale
#: model:process.transition.action,name:sale.process_transition_action_validate0
msgid "Validate"
msgstr "Doğrula"
@@ -1124,9 +1262,9 @@ msgid "Taxes"
msgstr "Vergiler"
#. module: sale
-#: field:sale.order,order_policy:0
-msgid "Shipping Policy"
-msgstr "Sevkiyat Politikası"
+#: view:sale.order:0
+msgid "Sales Order ready to be invoiced"
+msgstr ""
#. module: sale
#: help:sale.order,create_date:0
@@ -1145,9 +1283,9 @@ msgid "Create Invoices"
msgstr "Faturaları Oluştur"
#. module: sale
-#: view:sale.order:0
-msgid "Extra Info"
-msgstr "İlave Bilgi"
+#: view:sale.report:0
+msgid "Sales order created in current month"
+msgstr ""
#. module: sale
#: report:sale.order:0
@@ -1155,11 +1293,24 @@ msgid "Fax :"
msgstr "Faks:"
#. module: sale
+#: help:sale.order.line,type:0
+msgid ""
+"If 'on order', it triggers a procurement when the sale order is confirmed to "
+"create a task, purchase order or manufacturing order linked to this sale "
+"order line."
+msgstr ""
+
+#. module: sale
#: field:sale.advance.payment.inv,amount:0
msgid "Advance Amount"
msgstr "Peşin Miktar"
#. module: sale
+#: field:sale.config.picking_policy,charge_delivery:0
+msgid "Do you charge the delivery?"
+msgstr ""
+
+#. module: sale
#: selection:sale.order,invoice_quantity:0
msgid "Shipped Quantities"
msgstr "Gönderilen Miktar"
@@ -1170,25 +1321,45 @@ msgid "Invoice Based on Sales Orders"
msgstr "Satış Siparişleri Bağlı Fatura"
#. module: sale
+#: code:addons/sale/sale.py:331
+#, python-format
+msgid ""
+"If you change the pricelist of this order (and eventually the currency), "
+"prices of existing order lines will not be updated."
+msgstr ""
+
+#. module: sale
#: model:ir.model,name:sale.model_stock_picking
msgid "Picking List"
msgstr "Paketleme Listesi"
#. module: sale
-#: code:addons/sale/sale.py:387
-#: code:addons/sale/sale.py:920
-#: code:addons/sale/sale.py:938
+#: code:addons/sale/sale.py:412
+#: code:addons/sale/sale.py:503
+#: code:addons/sale/sale.py:632
+#: code:addons/sale/sale.py:1015
+#: code:addons/sale/sale.py:1033
#, python-format
msgid "Error !"
msgstr "Hata !"
#. module: sale
-#: code:addons/sale/sale.py:570
+#: code:addons/sale/sale.py:603
#, python-format
msgid "Could not cancel sales order !"
msgstr "Satış siparişini iptal edemiyor !"
#. module: sale
+#: view:sale.order:0
+msgid "Qty(UoM)"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered Year of the sales order"
+msgstr ""
+
+#. module: sale
#: selection:sale.report,month:0
msgid "July"
msgstr "Temmuz"
@@ -1205,36 +1376,26 @@ msgid "Shipping Exception"
msgstr "Hatalı Gönderim"
#. module: sale
-#: field:sale.make.invoice,grouped:0
-msgid "Group the invoices"
-msgstr "Faturaları Gruplandır"
-
-#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Shipping & Manual Invoice"
-msgstr "İrsaliye & Manuel Fatura"
-
-#. module: sale
-#: code:addons/sale/sale.py:1051
+#: code:addons/sale/sale.py:1143
#, python-format
-msgid "Picking Information !"
-msgstr "Paketleme Bilgisi !"
+msgid "Picking Information ! : "
+msgstr ""
#. module: sale
-#: view:sale.report:0
-#: field:sale.report,month:0
-msgid "Month"
-msgstr "Ay"
+#: field:sale.make.invoice,grouped:0
+msgid "Group the invoices"
+msgstr "Faturaları Gruplandır"
#. module: sale
-#: model:ir.module.module,shortdesc:sale.module_meta_information
-msgid "Sales Management"
-msgstr "Satış Yönetimi"
+#: field:sale.order,order_policy:0
+msgid "Invoice Policy"
+msgstr ""
#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Invoice From The Picking"
-msgstr "Paketlenenden fatura"
+#: model:ir.actions.act_window,name:sale.action_config_picking_policy
+#: view:sale.config.picking_policy:0
+msgid "Setup your Invoicing Method"
+msgstr ""
#. module: sale
#: model:process.node,note:sale.process_node_invoice0
@@ -1243,31 +1404,31 @@ msgstr "Muhasebeci tarafından görülecek."
#. module: sale
#: view:sale.report:0
-#: field:sale.report,uom_name:0
msgid "Reference UoM"
msgstr "Kullanılan ölçü birimi"
#. module: sale
+#: view:sale.config.picking_policy:0
+msgid ""
+"This tool will help you to install the right module and configure the system "
+"according to the method you use to invoice your customers."
+msgstr ""
+
+#. module: sale
#: model:ir.model,name:sale.model_sale_order_line_make_invoice
msgid "Sale OrderLine Make_invoice"
msgstr "Satış SiparişSatırı Fatura_Kes"
#. module: sale
-#: help:sale.config.picking_policy,step:0
-msgid ""
-"By default, OpenERP is able to manage complex routing and paths of products "
-"in your warehouse and partner locations. This will configure the most common "
-"and simple methods to deliver products to the customer in one or two "
-"operations by the worker."
-msgstr ""
-"OpenERP öntanımlı olarak, deponuzdaki ürünler ve iş ortağı konumları gibi "
-"karmaşık konuları yönetebilmektedir. Bu da çalışanların ürünleri bir iki "
-"basit işlem ve yöntemle müşteriye ulaştırabilmesine imkan sağlar."
+#: selection:sale.order,state:0
+#: selection:sale.report,state:0
+msgid "Invoice Exception"
+msgstr "Kuraldışı Fatura"
#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_tree
-msgid "Old Quotations"
-msgstr "Eski fiyat teklifleri"
+#: model:process.node,note:sale.process_node_saleorder0
+msgid "Drives procurement and invoicing"
+msgstr "Tedarik ve faturalamayı yönetir"
#. module: sale
#: field:sale.order,invoiced:0
@@ -1282,6 +1443,22 @@ msgid "Sales Analysis"
msgstr "Satış Analizi"
#. module: sale
+#: code:addons/sale/sale.py:1138
+#, python-format
+msgid ""
+"You selected a quantity of %d Units.\n"
+"But it's not compatible with the selected packaging.\n"
+"Here is a proposition of quantities according to the packaging:\n"
+"EAN: %s Quantity: %s Type of ul: %s"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Recreate Packing"
+msgstr "Paketlemeyi yeniden oluştur"
+
+#. module: sale
+#: view:sale.order:0
#: field:sale.order.line,property_ids:0
msgid "Properties"
msgstr "Özellikler"
@@ -1314,7 +1491,17 @@ msgstr ""
"oluşturabilirsiniz."
#. module: sale
-#: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
+#: view:sale.order.line:0
+msgid "Confirmed sale order lines, not yet delivered"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:473
+#, python-format
+msgid "Customer Invoices"
+msgstr ""
+
+#. module: sale
#: model:process.process,name:sale.process_process_salesprocess0
#: view:sale.order:0
#: view:sale.report:0
@@ -1336,18 +1523,13 @@ msgid "Done"
msgstr "Bitti"
#. module: sale
-#: model:ir.model,name:sale.model_sale_installer
-msgid "sale.installer"
-msgstr "satış.kurucu"
-
-#. module: sale
#: model:process.node,name:sale.process_node_invoice0
#: model:process.node,name:sale.process_node_invoiceafterdelivery0
msgid "Invoice"
msgstr "Fatura"
#. module: sale
-#: code:addons/sale/sale.py:1014
+#: code:addons/sale/sale.py:1158
#, python-format
msgid ""
"You have to select a customer in the sales form !\n"
@@ -1357,11 +1539,6 @@ msgstr ""
"Lütfen ürün seçmeden önce bir müşteri seçiniz."
#. module: sale
-#: selection:sale.config.picking_policy,step:0
-msgid "Picking List & Delivery Order"
-msgstr "Paketleme listesi& Dağıtım Sırası"
-
-#. module: sale
#: field:sale.order,origin:0
msgid "Source Document"
msgstr "Kaynak Belge"
@@ -1387,7 +1564,7 @@ msgid "The amount without tax."
msgstr "KDV'siz tutar"
#. module: sale
-#: code:addons/sale/sale.py:571
+#: code:addons/sale/sale.py:604
#, python-format
msgid "You must first cancel all picking attached to this sales order."
msgstr ""
@@ -1399,9 +1576,15 @@ msgid "Sales Advance Payment Invoice"
msgstr "Peşin Ödemeli Satış Faturası"
#. module: sale
-#: field:sale.order,incoterm:0
-msgid "Incoterm"
-msgstr "Teslim Sekli"
+#: view:sale.report:0
+#: field:sale.report,month:0
+msgid "Month"
+msgstr "Ay"
+
+#. module: sale
+#: model:email.template,subject:sale.email_template_edi_sale
+msgid "${object.company_id.name} Order (Ref ${object.name or 'n/a' })"
+msgstr ""
#. module: sale
#: view:sale.order.line:0
@@ -1412,11 +1595,6 @@ msgid "Product"
msgstr "Ürün"
#. module: sale
-#: model:ir.ui.menu,name:sale.menu_invoiced
-msgid "Invoicing"
-msgstr "Faturalama"
-
-#. module: sale
#: model:process.transition.action,name:sale.process_transition_action_cancelassignation0
msgid "Cancel Assignation"
msgstr "Atamayı iptal et"
@@ -1427,15 +1605,11 @@ msgid "sale.config.picking_policy"
msgstr "satış.kurulum.paketleme_politikası"
#. module: sale
-#: help:sale.order,state:0
-msgid ""
-"Gives the state of the quotation or sales order. \n"
-"The exception state is automatically set when a cancel operation occurs in "
-"the invoice validation (Invoice Exception) or in the picking list process "
-"(Shipping Exception). \n"
-"The 'Waiting Schedule' state is set when the invoice is confirmed but "
-"waiting for the scheduler to run on the date 'Ordered Date'."
-msgstr "Fiyat teklifi ve satış siparişinin durumu ile ilgili bilgi verir."
+#: view:account.invoice.report:0
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_turnover_by_month
+msgid "Monthly Turnover"
+msgstr ""
#. module: sale
#: field:sale.order,invoice_quantity:0
@@ -1453,7 +1627,6 @@ msgid "Product UoS"
msgstr "Stok 2.Birim"
#. module: sale
-#: selection:sale.order,state:0
#: selection:sale.report,state:0
msgid "Manual In Progress"
msgstr "Manuel İşlem Devam Ediyor"
@@ -1474,7 +1647,8 @@ msgid "Order"
msgstr "Sipariş"
#. module: sale
-#: code:addons/sale/sale.py:921
+#: code:addons/sale/sale.py:1016
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:71
#, python-format
msgid "There is no income account defined for this product: \"%s\" (id:%d)"
msgstr "Bu ürün için tanımlanmış gelir hesabı bulunmuyor: \"%s\" (id:%d)"
@@ -1498,7 +1672,7 @@ msgstr ""
"olarak hazırlanır."
#. module: sale
-#: code:addons/sale/sale.py:1116
+#: code:addons/sale/sale.py:1238
#, python-format
msgid ""
"You plan to sell %.2f %s but you only have %.2f %s available !\n"
@@ -1529,10 +1703,10 @@ msgid "Total"
msgstr "Başlık:"
#. module: sale
-#: code:addons/sale/sale.py:388
-#, python-format
-msgid "There is no sales journal defined for this company: \"%s\" (id:%d)"
-msgstr "Bu şirket için satış belgesi bulunmuyor: \"%s\" (id:%d)"
+#: report:sale.order:0
+#: view:sale.order.line:0
+msgid "Price"
+msgstr "Fiyat"
#. module: sale
#: model:process.transition,note:sale.process_transition_deliver0
@@ -1543,10 +1717,15 @@ msgid ""
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:1165
-#, python-format
-msgid "Cannot delete a sales order line which is %s !"
-msgstr "%s olan satış sipariş kalemini silemezsiniz!"
+#: selection:sale.order,order_policy:0
+msgid "Pay before delivery"
+msgstr ""
+
+#. module: sale
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.open_board_sales
+msgid "Sales Dashboard"
+msgstr ""
#. module: sale
#: model:ir.actions.act_window,name:sale.action_sale_order_make_invoice
@@ -1557,6 +1736,7 @@ msgstr "Faturaları hazırla"
#. module: sale
#: view:sale.order:0
+#: selection:sale.order,state:0
#: view:sale.order.line:0
msgid "To Invoice"
msgstr "Faturalama"
@@ -1567,6 +1747,11 @@ msgid "Date on which sales order is confirmed."
msgstr "Satış siparişinin onaylandığı tarih."
#. module: sale
+#: field:sale.order,project_id:0
+msgid "Contract/Analytic Account"
+msgstr ""
+
+#. module: sale
#: field:sale.order,company_id:0
#: field:sale.order.line,company_id:0
#: view:sale.report:0
@@ -1586,10 +1771,12 @@ msgid "The amount to be invoiced in advance."
msgstr "Önceden faturalanacak miktar."
#. module: sale
-#: selection:sale.order,state:0
-#: selection:sale.report,state:0
-msgid "Invoice Exception"
-msgstr "Kuraldışı Fatura"
+#: code:addons/sale/sale.py:1256
+#, python-format
+msgid ""
+"Couldn't find a pricelist line matching this product and quantity.\n"
+"You have to change either the product, the quantity or the pricelist."
+msgstr ""
#. module: sale
#: help:sale.order,picking_ids:0
@@ -1599,15 +1786,6 @@ msgstr ""
"Bu liste, bu satış siparişi listesi için oluşturulan paketleme listesidir."
#. module: sale
-#: help:sale.installer,sale_margin:0
-msgid ""
-"Gives the margin of profitability by calculating the difference between Unit "
-"Price and Cost Price."
-msgstr ""
-"Birim satış fiyatı ve maliyeti arasındaki farkı hesaplayarak kar marjını "
-"verir."
-
-#. module: sale
#: view:sale.make.invoice:0
#: view:sale.order.line.make.invoice:0
msgid "Create invoices"
@@ -1626,6 +1804,11 @@ msgid "Cancelled"
msgstr "İptal edildi"
#. module: sale
+#: view:sale.order.line:0
+msgid "Sales Order Lines related to a Sales Order of mine"
+msgstr ""
+
+#. module: sale
#: model:ir.actions.act_window,name:sale.action_shop_form
#: model:ir.ui.menu,name:sale.menu_action_shop_form
#: field:sale.order,shop_id:0
@@ -1635,17 +1818,12 @@ msgid "Shop"
msgstr "İş Yeri"
#. module: sale
-#: view:sale.report:0
-msgid " Month "
-msgstr " Ay "
-
-#. module: sale
#: field:sale.report,date_confirm:0
msgid "Date Confirm"
msgstr "Tarih Onay"
#. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:111
+#: code:addons/sale/wizard/sale_line_invoice.py:113
#, python-format
msgid "Warning"
msgstr "Uyarı"
@@ -1657,17 +1835,6 @@ msgid "Sales by Month"
msgstr "Aylık Satışlar"
#. module: sale
-#: code:addons/sale/sale.py:1045
-#, python-format
-msgid ""
-"You selected a quantity of %d Units.\n"
-"But it's not compatible with the selected packaging.\n"
-"Here is a proposition of quantities according to the packaging:\n"
-"\n"
-"EAN: %s Quantity: %s Type of ul: %s"
-msgstr ""
-
-#. module: sale
#: model:ir.model,name:sale.model_sale_order
#: model:process.node,name:sale.process_node_order0
#: model:process.node,name:sale.process_node_saleorder0
@@ -1683,6 +1850,11 @@ msgid "Quantity (UoS)"
msgstr "Miktar (2.Br.)"
#. module: sale
+#: view:sale.order.line:0
+msgid "Sale Order Lines that are in 'done' state"
+msgstr ""
+
+#. module: sale
#: model:process.transition,note:sale.process_transition_packing0
msgid ""
"The Pick List form is created as soon as the sales order is confirmed, in "
@@ -1701,6 +1873,11 @@ msgid "Confirmed"
msgstr "Onaylandı"
#. module: sale
+#: field:sale.config.picking_policy,order_policy:0
+msgid "Main Method Based On"
+msgstr ""
+
+#. module: sale
#: model:process.transition.action,name:sale.process_transition_action_confirm0
msgid "Confirm"
msgstr "Onayla"
@@ -1723,6 +1900,7 @@ msgid "Invoice Lines"
msgstr "Fatura Kalemleri"
#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_product_tree
#: view:sale.order:0
#: view:sale.order.line:0
msgid "Sales Order Lines"
@@ -1739,33 +1917,18 @@ msgid "Configuration"
msgstr "Kurulum"
#. module: sale
-#: selection:sale.order,picking_policy:0
-msgid "Complete Delivery"
-msgstr "Tam Teslimat"
+#: code:addons/sale/edi/sale_order.py:146
+#, python-format
+msgid "EDI Pricelist (%s)"
+msgstr ""
#. module: sale
#: view:sale.report:0
-msgid " Month-1 "
-msgstr " Ay-1 "
-
-#. module: sale
-#: help:sale.config.picking_policy,picking_policy:0
-msgid ""
-"The Shipping Policy is used to configure per order if you want to deliver as "
-"soon as possible when one product is available or you wait that all products "
-"are available.."
+msgid "Sales order created in current year"
msgstr ""
-"Gönderim kuralı her sipariş için yapılandırılır, siparişin hazır olan "
-"ürünlerinin gönderimini bir an önce gerçekleştirmek istiyorsanız ya da bütün "
-"ürünlerin hazır olmasını bekleyecekseniz.."
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "August"
-msgstr "Ağustos"
#. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:111
+#: code:addons/sale/wizard/sale_line_invoice.py:113
#, python-format
msgid ""
"Invoice cannot be created for this Sales Order Line due to one of the "
@@ -1780,6 +1943,11 @@ msgstr ""
"2.Satış sipariş kalemi zaten faturalanmıştır."
#. module: sale
+#: view:sale.order.line:0
+msgid "Sale order lines done"
+msgstr ""
+
+#. module: sale
#: field:sale.order.line,th_weight:0
msgid "Weight"
msgstr "Ağırlık"
@@ -1798,7 +1966,6 @@ msgstr "Aralık"
#. module: sale
#: field:sale.config.picking_policy,config_logo:0
-#: field:sale.installer,config_logo:0
msgid "Image"
msgstr "Resim"
@@ -1831,9 +1998,9 @@ msgid "Salesman"
msgstr "Satış Temsilcisi"
#. module: sale
-#: model:process.node,note:sale.process_node_saleorder0
-msgid "Drives procurement and invoicing"
-msgstr "Tedarik ve faturalamayı yönetir"
+#: model:ir.actions.act_window,name:sale.action_order_tree
+msgid "Old Quotations"
+msgstr "Eski fiyat teklifleri"
#. module: sale
#: field:sale.order,amount_untaxed:0
@@ -1841,7 +2008,7 @@ msgid "Untaxed Amount"
msgstr "Tutar"
#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:163
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:170
#: model:ir.actions.act_window,name:sale.action_view_sale_advance_payment_inv
#: view:sale.advance.payment.inv:0
#: view:sale.order:0
@@ -1850,7 +2017,7 @@ msgid "Advance Invoice"
msgstr "Fatura Peşinatı"
#. module: sale
-#: code:addons/sale/sale.py:591
+#: code:addons/sale/sale.py:624
#, python-format
msgid "The sales order '%s' has been cancelled."
msgstr "'%s' satış siparişi iptal edilmiştir."
@@ -1895,20 +2062,20 @@ msgid "Packings"
msgstr "Paketleme"
#. module: sale
-#: field:sale.config.picking_policy,progress:0
-#: field:sale.installer,progress:0
-msgid "Configuration Progress"
-msgstr "Yapılandırma gidişatı"
+#: view:sale.order.line:0
+msgid "Sale Order Lines ready to be invoiced"
+msgstr ""
#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_product_tree
-msgid "Product sales"
-msgstr "Ürün Satışları"
+#: view:sale.report:0
+msgid "Sales order created in last month"
+msgstr ""
#. module: sale
-#: field:sale.order,date_order:0
-msgid "Ordered Date"
-msgstr "Sipariş Edilen Tarih"
+#: model:ir.actions.act_window,name:sale.action_email_templates
+#: model:ir.ui.menu,name:sale.menu_email_templates
+msgid "Email Templates"
+msgstr ""
#. module: sale
#: model:ir.actions.act_window,name:sale.action_order_form
@@ -1918,14 +2085,15 @@ msgid "Sales Orders"
msgstr "Satış Siparişleri"
#. module: sale
-#: selection:sale.config.picking_policy,picking_policy:0
-msgid "Direct Delivery"
-msgstr "Direk Teslimat"
+#: model:ir.model,name:sale.model_sale_shop
+#: view:sale.shop:0
+msgid "Sales Shop"
+msgstr "Satış Ofisi"
#. module: sale
-#: field:sale.installer,sale_journal:0
-msgid "Invoicing journals"
-msgstr "Faturalama Yevmiyeleri"
+#: selection:sale.report,month:0
+msgid "November"
+msgstr "Kasım"
#. module: sale
#: field:sale.advance.payment.inv,product_id:0
@@ -1933,18 +2101,12 @@ msgid "Advance Product"
msgstr "Gelişmiş Ürün"
#. module: sale
-#: view:sale.report:0
-#: field:sale.report,shipped_qty_1:0
-msgid "Shipped Qty"
-msgstr "Gönderilen Miktar"
-
-#. module: sale
-#: view:sale.open.invoice:0
-msgid "You invoice has been successfully created!"
-msgstr "Faturanız başarıyla oluşturuldu!"
+#: view:sale.order:0
+msgid "Compute"
+msgstr "Hesapla"
#. module: sale
-#: code:addons/sale/sale.py:585
+#: code:addons/sale/sale.py:618
#, python-format
msgid "You must first cancel all invoices attached to this sales order."
msgstr ""
@@ -1956,25 +2118,14 @@ msgid "January"
msgstr "Ocak"
#. module: sale
-#: view:sale.installer:0
-msgid "Configure Your Sales Management Application"
-msgstr "Satış Yönetimi Uygulamasını Kurun"
-
-#. module: sale
#: model:ir.actions.act_window,name:sale.action_order_tree4
msgid "Sales Order in Progress"
msgstr "İşlemdeki Satış Siparişleri"
#. module: sale
-#: field:sale.installer,sale_layout:0
-msgid "Sales Order Layout Improvement"
-msgstr "Satış Sipariş Planlama Geliştirme"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:63
-#, python-format
-msgid "Error"
-msgstr "Hata"
+#: help:sale.order,origin:0
+msgid "Reference of the document that generated this sales order request."
+msgstr "Bu satış siparişi isteğini oluşturan belgenin referans numarası"
#. module: sale
#: view:sale.report:0
@@ -1983,6 +2134,11 @@ msgid "Commitment Delay"
msgstr "Teslimatta gecikme"
#. module: sale
+#: selection:sale.order,order_policy:0
+msgid "Deliver & invoice on demand"
+msgstr ""
+
+#. module: sale
#: model:process.node,note:sale.process_node_saleprocurement0
msgid ""
"One Procurement order for each sales order line and for each of the "
@@ -2005,13 +2161,12 @@ msgid "Confirmed sales order to invoice."
msgstr "Faturalanacak onaylanmış satış siparişi"
#. module: sale
-#: code:addons/sale/sale.py:290
-#, python-format
-msgid "Cannot delete Sales Order(s) which are already confirmed !"
-msgstr "Onaylanmış satış sipariş(ler)ini silemezsiniz!"
+#: view:sale.order:0
+msgid "Sales Order that haven't yet been confirmed"
+msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:316
+#: code:addons/sale/sale.py:322
#, python-format
msgid "The sales order '%s' has been set in draft state."
msgstr "'%s' satış siparişi taslak durumuna ayarlanmıştır."
@@ -2022,37 +2177,27 @@ msgid "from stock"
msgstr "Stoktan"
#. module: sale
-#: field:sale.config.picking_policy,order_policy:0
-msgid "Shipping Default Policy"
-msgstr "Öntanımlı Nakliye Politikası"
-
-#. module: sale
#: view:sale.open.invoice:0
msgid "Close"
msgstr "Kapat"
#. module: sale
+#: code:addons/sale/sale.py:1248
+#, python-format
+msgid "No Pricelist ! : "
+msgstr ""
+
+#. module: sale
#: field:sale.order,shipped:0
msgid "Delivered"
msgstr "Sevk edildi"
#. module: sale
-#: code:addons/sale/sale.py:1115
-#, python-format
-msgid "Not enough stock !"
-msgstr "Yeterli stok yok !"
-
-#. module: sale
#: constraint:stock.move:0
msgid "You must assign a production lot for this product"
msgstr "Bu ürün için üretim planı yapmalısınız"
#. module: sale
-#: field:sale.order.line,sequence:0
-msgid "Layout Sequence"
-msgstr "Yerleşim Sırası"
-
-#. module: sale
#: model:ir.actions.act_window,help:sale.action_shop_form
msgid ""
"If you have more than one shop reselling your company products, you can "
@@ -2081,11 +2226,6 @@ msgid "May"
msgstr "Mayıs"
#. module: sale
-#: help:sale.installer,sale_order_dates:0
-msgid "Adds commitment, requested and effective dates on Sales Orders."
-msgstr "Satış Siparişlerine taahhüt, istenen ve yürürlük tarihlerini ekler."
-
-#. module: sale
#: view:sale.order:0
#: field:sale.order,partner_id:0
#: field:sale.order.line,order_partner_id:0
@@ -2093,25 +2233,11 @@ msgid "Customer"
msgstr "Müşteri"
#. module: sale
-#: model:product.template,name:sale.advance_product_0_product_template
-msgid "Advance"
-msgstr "Gelişmiş"
-
-#. module: sale
#: selection:sale.report,month:0
msgid "February"
msgstr "Şubat"
#. module: sale
-#: help:sale.installer,sale_journal:0
-msgid ""
-"Allows you to group and invoice your delivery orders according to different "
-"invoicing types: daily, weekly, etc."
-msgstr ""
-"Farklı faturalama çeşitlerine göre teslim fişlerini gruplamanıza ve "
-"faturalamanıza izin verir: günlük, haftalık, vb."
-
-#. module: sale
#: selection:sale.report,month:0
msgid "April"
msgstr "Nisan"
@@ -2122,11 +2248,6 @@ msgid "Accounting"
msgstr "Muhasebe"
#. module: sale
-#: field:sale.config.picking_policy,step:0
-msgid "Steps To Deliver a Sales Order"
-msgstr "Satış siparişinin teslimine kadar olan basamaklar"
-
-#. module: sale
#: view:sale.order:0
#: view:sale.order.line:0
msgid "Search Sales Order"
@@ -2138,20 +2259,18 @@ msgid "Sales Order Requisition"
msgstr "Satış Siparişi İsteği"
#. module: sale
+#: code:addons/sale/sale.py:1242
+#, python-format
+msgid "Not enough stock ! : "
+msgstr ""
+
+#. module: sale
#: report:sale.order:0
#: field:sale.order,payment_term:0
msgid "Payment Term"
msgstr "Ödeme Vadesi"
#. module: sale
-#: help:sale.installer,sale_layout:0
-msgid ""
-"Provides some features to improve the layout of the Sales Order reports."
-msgstr ""
-"Satış siparişi raporlarının düzenlemesini geliştirmek için bazı özelikler "
-"sağlar."
-
-#. module: sale
#: model:ir.actions.act_window,help:sale.action_order_report_all
msgid ""
"This report performs analysis on your quotations and sales orders. Analysis "
@@ -2189,6 +2308,9 @@ msgstr "Yıl"
msgid "Invoice Based on Deliveries"
msgstr "Teslimatlara Bağlı Fatura"
+#~ msgid "Partial Delivery"
+#~ msgstr "Kısmi Teslimat"
+
#~ msgid "You invoice has been successfully created !"
#~ msgstr "Fatura başarıyla oluşturuldu !"
@@ -2198,6 +2320,9 @@ msgstr "Teslimatlara Bağlı Fatura"
#~ msgid "Net Price"
#~ msgstr "Net Fiyat"
+#~ msgid "All at Once"
+#~ msgstr "Tek Seferde"
+
#~ msgid "Procure Method"
#~ msgstr "Tedarik Yöntemi"
@@ -2246,12 +2371,18 @@ msgstr "Teslimatlara Bağlı Fatura"
#~ msgid "Invoice after delivery"
#~ msgstr "Teslimat Sonrası Fatura Çıkar"
+#~ msgid "Shipping Policy"
+#~ msgstr "Sevkiyat Politikası"
+
#~ msgid "My sales order in progress"
#~ msgstr "İşlemdeki Satış Siparişlerim (Bana Ait)"
#~ msgid "My sales order waiting Invoice"
#~ msgstr "Fatura Bekleyen Satış Siparişlerim (Bana Ait)"
+#~ msgid "Complete Delivery"
+#~ msgstr "Tam Teslimat"
+
#~ msgid "Sale Order Procurement"
#~ msgstr "Satış Sipariş Satınalması"
@@ -2282,15 +2413,15 @@ msgstr "Teslimatlara Bağlı Fatura"
#~ msgid "Procurement for each line"
#~ msgstr "Her Kalemi için Satınalma"
-#~ msgid "My Quotations"
-#~ msgstr "Tekliflerim (Bana Ait)"
-
#~ msgid "Packing Default Policy"
#~ msgstr "Paketleme Varsayılan Politikası"
#~ msgid "Manages the delivery and invoicing progress"
#~ msgstr "Teslimat ve Faturalama İşlemlerini Yönet"
+#~ msgid "Sales Management"
+#~ msgstr "Satış Yönetimi"
+
#~ msgid "Order Ref"
#~ msgstr "Sipariş Ref."
@@ -2309,6 +2440,9 @@ msgstr "Teslimatlara Bağlı Fatura"
#~ msgid "Procurement Corrected"
#~ msgstr "Düzeltilen Satınalma"
+#~ msgid "Shipping & Manual Invoice"
+#~ msgstr "İrsaliye & Manuel Fatura"
+
#~ msgid "Sale Procurement"
#~ msgstr "Satış Satınalması"
@@ -2321,6 +2455,9 @@ msgstr "Teslimatlara Bağlı Fatura"
#~ msgid "Packing Policy"
#~ msgstr "Sevkiyat Paketleme Politikası"
+#~ msgid "Product sales"
+#~ msgstr "Ürün Satışları"
+
#~ msgid "Our Salesman"
#~ msgstr "S. Temsilcisi"
@@ -2333,6 +2470,9 @@ msgstr "Teslimatlara Bağlı Fatura"
#~ msgid "Sale Pricelists"
#~ msgstr "Satış Fiyat Listeleri"
+#~ msgid "Direct Delivery"
+#~ msgstr "Direk Teslimat"
+
#~ msgid "Sales order lines"
#~ msgstr "Satış Sipariş Kalemleri"
@@ -2411,6 +2551,250 @@ msgstr "Teslimatlara Bağlı Fatura"
#~ msgid "Procurement is created after confirmation of sale order."
#~ msgstr "Satış emrinin doğrulanmasından sonra satınalma oluşturulur."
+#~ msgid "Shipping Default Policy"
+#~ msgstr "Öntanımlı Nakliye Politikası"
+
#~ msgid ""
#~ "The Object name must start with x_ and not contain any special character !"
#~ msgstr "Nesne adı x_ ile başlamalı ve özel karakterler içermemelidir!"
+
+#~ msgid "Configure Picking Policy for Sales Order"
+#~ msgstr "Satış Siparişleri için Paketleme Politikasını Yapılandır"
+
+#~ msgid "Configure"
+#~ msgstr "Yapılandır"
+
+#~ msgid "Order Reference must be unique !"
+#~ msgstr "Sipariş numarasının referans no'su kendine özgü olmalı!"
+
+#~ msgid "Enhance your core Sales Application with additional functionalities."
+#~ msgstr "Temel Satış Uygulamasını ek işlevlerle geliştirin."
+
+#~ msgid "Setup your sales workflow and default values."
+#~ msgstr "Satış iş akışı ve varsayılan değerleri düzenle"
+
+#~ msgid " Year "
+#~ msgstr " Yıl "
+
+#~ msgid "Sales Order Dates"
+#~ msgstr "Satış Sipariş Günü"
+
+#~ msgid "Margins in Sales Orders"
+#~ msgstr "Satış sipariş sınırları"
+
+#~ msgid "Sales Application Configuration"
+#~ msgstr "Satış Uygulaması Kurulumu"
+
+#~ msgid "Delivery Costs"
+#~ msgstr "Navlun"
+
+#~ msgid "title"
+#~ msgstr "başlık"
+
+#~ msgid "Order date"
+#~ msgstr "Sipariş Tarihi"
+
+#~ msgid "Delivery Order Only"
+#~ msgstr "Sadece Teslim Belgesi"
+
+#~ msgid "Picking Default Policy"
+#~ msgstr "Öntanımlı Paketleme Politikası"
+
+#, python-format
+#~ msgid "You cannot cancel a sales order line that has already been invoiced !"
+#~ msgstr "Faturalanmış olan satış sipariş kalemini iptal edemezsiniz !"
+
+#~ msgid "Invoice On Order After Delivery"
+#~ msgstr "Teslimat sonrası fatura"
+
+#~ msgid ""
+#~ "\n"
+#~ " The base module to manage quotations and sales orders.\n"
+#~ "\n"
+#~ " * Workflow with validation steps:\n"
+#~ " - Quotation -> Sales order -> Invoice\n"
+#~ " * Invoicing methods:\n"
+#~ " - Invoice on order (before or after shipping)\n"
+#~ " - Invoice on delivery\n"
+#~ " - Invoice on timesheets\n"
+#~ " - Advance invoice\n"
+#~ " * Partners preferences (shipping, invoicing, incoterm, ...)\n"
+#~ " * Products stocks and prices\n"
+#~ " * Delivery methods:\n"
+#~ " - all at once, multi-parcel\n"
+#~ " - delivery costs\n"
+#~ " * Dashboard for salesman that includes:\n"
+#~ " * Your open quotations\n"
+#~ " * Top 10 sales of the month\n"
+#~ " * Cases statistics\n"
+#~ " * Graph of sales by product\n"
+#~ " * Graph of cases of the month\n"
+#~ " "
+#~ msgstr ""
+#~ "\n"
+#~ " Temel modül fiyat teklifleri ve satış siparişlerini yönetir.\n"
+#~ "\n"
+#~ " *Doğrulama adımlarıyla iş akışı:\n"
+#~ " - Fiyat teklifi - Satış Siparişi - Fatura\n"
+#~ " *Faturalama yöntemleri:\n"
+#~ " Sipariş üzerine fatura (ürünler gönderilmeden önce ya da sonra)\n"
+#~ " Teslimat üzerine fatura\n"
+#~ " Zaman çizelgesine göre fatura\n"
+#~ " Peşin fatura\n"
+#~ " * İş ortaklarının tercihleri (nakliye, faturalama, teslim şekli, ...)\n"
+#~ " * Ürün stok ve fiyatları\n"
+#~ " * Gönderim yöntemleri:\n"
+#~ " - hepsi bir arada, birden fazla paket halinde\n"
+#~ " - nakliye ücreti\n"
+#~ " * Satıcının panosu:\n"
+#~ " * Açık fiyat teklifleri\n"
+#~ " * Ayın ilk 10 satışı\n"
+#~ " * Alımların istatistiği\n"
+#~ " * Ürüne göre satışların grafiği\n"
+#~ " * Aya göre satışların grafiği\n"
+#~ " "
+
+#, python-format
+#~ msgid "Picking Information !"
+#~ msgstr "Paketleme Bilgisi !"
+
+#~ msgid "Invoice From The Picking"
+#~ msgstr "Paketlenenden fatura"
+
+#~ msgid ""
+#~ "By default, OpenERP is able to manage complex routing and paths of products "
+#~ "in your warehouse and partner locations. This will configure the most common "
+#~ "and simple methods to deliver products to the customer in one or two "
+#~ "operations by the worker."
+#~ msgstr ""
+#~ "OpenERP öntanımlı olarak, deponuzdaki ürünler ve iş ortağı konumları gibi "
+#~ "karmaşık konuları yönetebilmektedir. Bu da çalışanların ürünleri bir iki "
+#~ "basit işlem ve yöntemle müşteriye ulaştırabilmesine imkan sağlar."
+
+#~ msgid "Invoicing"
+#~ msgstr "Faturalama"
+
+#~ msgid " Month "
+#~ msgstr " Ay "
+
+#~ msgid ""
+#~ "The Shipping Policy is used to configure per order if you want to deliver as "
+#~ "soon as possible when one product is available or you wait that all products "
+#~ "are available.."
+#~ msgstr ""
+#~ "Gönderim kuralı her sipariş için yapılandırılır, siparişin hazır olan "
+#~ "ürünlerinin gönderimini bir an önce gerçekleştirmek istiyorsanız ya da bütün "
+#~ "ürünlerin hazır olmasını bekleyecekseniz.."
+
+#~ msgid " Month-1 "
+#~ msgstr " Ay-1 "
+
+#~ msgid "Payment Before Delivery"
+#~ msgstr "Teslimat Öncesi Ödeme"
+
+#~ msgid ""
+#~ "The Shipping Policy is used to synchronise invoice and delivery operations.\n"
+#~ " - The 'Pay Before delivery' choice will first generate the invoice and "
+#~ "then generate the picking order after the payment of this invoice.\n"
+#~ " - The 'Shipping & Manual Invoice' will create the picking order directly "
+#~ "and wait for the user to manually click on the 'Invoice' button to generate "
+#~ "the draft invoice.\n"
+#~ " - The 'Invoice On Order After Delivery' choice will generate the draft "
+#~ "invoice based on sales order after all picking lists have been finished.\n"
+#~ " - The 'Invoice From The Picking' choice is used to create an invoice "
+#~ "during the picking process."
+#~ msgstr ""
+#~ "Gönderim Politikası faturalama ve teslimat işlemlerinin senkronize edilmesi "
+#~ "için kullanılır. \n"
+#~ " \"Teslimattan önce ödeme\" seçeneği önce fatura oluşturur, faturanın "
+#~ "ödenmesinden sonra teslim fişini oluşturur. \n"
+#~ " \"Gönderim ve elle faturalama\" sistem önce direkt olarak teslim fişini "
+#~ "oluşturur, ve kullanıcının \"faturala\" düğmesine basıp taslak fatura "
+#~ "oluşturmasını bekler.\n"
+#~ " \"Teslimatlar sonrası Faturalama\" seçeneği satış siparişine dayanarak, "
+#~ "bütün paketleme listeleri bittikten sonra taslak fatura oluşturacaktır.\n"
+#~ " \"Paketlemeyi baz alan Fatura\" seçeneği paketleme süreci sırasında fatura "
+#~ "oluşturmak için kullanılır."
+
+#~ msgid "Picking List & Delivery Order"
+#~ msgstr "Paketleme listesi& Dağıtım Sırası"
+
+#~ msgid ""
+#~ "Gives the state of the quotation or sales order. \n"
+#~ "The exception state is automatically set when a cancel operation occurs in "
+#~ "the invoice validation (Invoice Exception) or in the picking list process "
+#~ "(Shipping Exception). \n"
+#~ "The 'Waiting Schedule' state is set when the invoice is confirmed but "
+#~ "waiting for the scheduler to run on the date 'Ordered Date'."
+#~ msgstr "Fiyat teklifi ve satış siparişinin durumu ile ilgili bilgi verir."
+
+#, python-format
+#~ msgid "Cannot delete a sales order line which is %s !"
+#~ msgstr "%s olan satış sipariş kalemini silemezsiniz!"
+
+#~ msgid ""
+#~ "Gives the margin of profitability by calculating the difference between Unit "
+#~ "Price and Cost Price."
+#~ msgstr ""
+#~ "Birim satış fiyatı ve maliyeti arasındaki farkı hesaplayarak kar marjını "
+#~ "verir."
+
+#~ msgid "Ordered Date"
+#~ msgstr "Sipariş Edilen Tarih"
+
+#~ msgid "Configuration Progress"
+#~ msgstr "Yapılandırma gidişatı"
+
+#~ msgid "Shipped Qty"
+#~ msgstr "Gönderilen Miktar"
+
+#~ msgid "Configure Your Sales Management Application"
+#~ msgstr "Satış Yönetimi Uygulamasını Kurun"
+
+#~ msgid "Sales Order Layout Improvement"
+#~ msgstr "Satış Sipariş Planlama Geliştirme"
+
+#, python-format
+#~ msgid "Not enough stock !"
+#~ msgstr "Yeterli stok yok !"
+
+#, python-format
+#~ msgid "Cannot delete Sales Order(s) which are already confirmed !"
+#~ msgstr "Onaylanmış satış sipariş(ler)ini silemezsiniz!"
+
+#~ msgid ""
+#~ "Allows you to group and invoice your delivery orders according to different "
+#~ "invoicing types: daily, weekly, etc."
+#~ msgstr ""
+#~ "Farklı faturalama çeşitlerine göre teslim fişlerini gruplamanıza ve "
+#~ "faturalamanıza izin verir: günlük, haftalık, vb."
+
+#~ msgid "Steps To Deliver a Sales Order"
+#~ msgstr "Satış siparişinin teslimine kadar olan basamaklar"
+
+#~ msgid ""
+#~ "Provides some features to improve the layout of the Sales Order reports."
+#~ msgstr ""
+#~ "Satış siparişi raporlarının düzenlemesini geliştirmek için bazı özelikler "
+#~ "sağlar."
+
+#~ msgid "Invoicing journals"
+#~ msgstr "Faturalama Yevmiyeleri"
+
+#~ msgid "Layout Sequence"
+#~ msgstr "Yerleşim Sırası"
+
+#~ msgid "Advance"
+#~ msgstr "Gelişmiş"
+
+#~ msgid "sale.installer"
+#~ msgstr "satış.kurucu"
+
+#~ msgid "Configure Sales Order Logistics"
+#~ msgstr "Satış Siparişi Lojistiğini Yapılandır"
+
+#~ msgid "Allows you to compute delivery costs on your quotations."
+#~ msgstr "Teklifinizdeki teslimat maliyetlerini hesaplamanızı sağlar."
+
+#~ msgid "Adds commitment, requested and effective dates on Sales Orders."
+#~ msgstr "Satış Siparişlerine taahhüt, istenen ve yürürlük tarihlerini ekler."
diff --git a/addons/sale/i18n/uk.po b/addons/sale/i18n/uk.po
index 7173d92c6e0..cd6ce452997 100644
--- a/addons/sale/i18n/uk.po
+++ b/addons/sale/i18n/uk.po
@@ -6,25 +6,32 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2011-01-11 11:16+0000\n"
+"POT-Creation-Date: 2011-12-22 18:43+0000\n"
"PO-Revision-Date: 2010-12-15 20:52+0000\n"
"Last-Translator: Jay Vora <Unknown>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-05 05:17+0000\n"
-"X-Generator: Launchpad (build 14231)\n"
+"X-Launchpad-Export-Date: 2011-12-23 06:47+0000\n"
+"X-Generator: Launchpad (build 14560)\n"
#. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_sales_by_salesman
-msgid "Sales by Salesman in last 90 days"
+#: field:sale.config.picking_policy,timesheet:0
+msgid "Based on Timesheet"
msgstr ""
#. module: sale
-#: help:sale.installer,delivery:0
-msgid "Allows you to compute delivery costs on your quotations."
+#: view:sale.order.line:0
+msgid ""
+"Sale Order Lines that are confirmed, done or in exception state and haven't "
+"yet been invoiced"
+msgstr ""
+
+#. module: sale
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_sales_by_salesman
+msgid "Sales by Salesman in last 90 days"
msgstr ""
#. module: sale
@@ -35,6 +42,11 @@ msgid ""
msgstr ""
#. module: sale
+#: view:sale.order:0
+msgid "UoS"
+msgstr ""
+
+#. module: sale
#: help:sale.order,partner_shipping_id:0
msgid "Shipping address for current sales order."
msgstr ""
@@ -58,22 +70,12 @@ msgid "Cancel Order"
msgstr "Скасувати заявку"
#. module: sale
-#: view:sale.config.picking_policy:0
-msgid "Configure Sales Order Logistics"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:603
+#: code:addons/sale/sale.py:638
#, python-format
msgid "The quotation '%s' has been converted to a sales order."
msgstr ""
#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Payment Before Delivery"
-msgstr ""
-
-#. module: sale
#: code:addons/sale/wizard/sale_make_invoice.py:42
#, python-format
msgid "Warning !"
@@ -90,12 +92,6 @@ msgid "Drives procurement orders for every sales order line."
msgstr ""
#. module: sale
-#: selection:sale.config.picking_policy,picking_policy:0
-msgid "All at Once"
-msgstr "Todo a la vez"
-
-#. module: sale
-#: field:sale.order,project_id:0
#: view:sale.report:0
#: field:sale.report,analytic_account_id:0
#: field:sale.shop,project_id:0
@@ -111,6 +107,15 @@ msgid ""
msgstr ""
#. module: sale
+#: code:addons/sale/sale.py:295
+#, python-format
+msgid ""
+"In order to delete a confirmed sale order, you must cancel it before ! To "
+"cancel a sale order, you must first cancel related picking or delivery "
+"orders."
+msgstr ""
+
+#. module: sale
#: model:process.node,name:sale.process_node_saleprocurement0
msgid "Procurement Order"
msgstr ""
@@ -122,6 +127,11 @@ msgid "Partner"
msgstr ""
#. module: sale
+#: selection:sale.order,order_policy:0
+msgid "Invoice based on deliveries"
+msgstr ""
+
+#. module: sale
#: view:sale.order:0
msgid "Order Line"
msgstr "Рядок заявки"
@@ -154,8 +164,13 @@ msgid "Default Payment Term"
msgstr "Типовий термін оплати"
#. module: sale
-#: model:ir.actions.act_window,name:sale.action_config_picking_policy
-msgid "Configure Picking Policy for Sales Order"
+#: field:sale.config.picking_policy,deli_orders:0
+msgid "Based on Delivery Orders"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.picking_policy,time_unit:0
+msgid "Main Working Time Unit"
msgstr ""
#. module: sale
@@ -172,8 +187,9 @@ msgid "Disc.(%)"
msgstr ""
#. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_forceassignation0
-msgid "Force Assignation"
+#: view:sale.report:0
+#: field:sale.report,price_total:0
+msgid "Total Price"
msgstr ""
#. module: sale
@@ -182,6 +198,11 @@ msgid "Check the box to group the invoices for the same customers"
msgstr ""
#. module: sale
+#: view:sale.order:0
+msgid "My Sale Orders"
+msgstr ""
+
+#. module: sale
#: selection:sale.order,invoice_quantity:0
msgid "Ordered Quantities"
msgstr "Замовлена кількість"
@@ -220,13 +241,24 @@ msgid ""
msgstr ""
#. module: sale
+#: field:sale.config.picking_policy,task_work:0
+msgid "Based on Tasks' Work"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
+msgid "Quotations and Sales"
+msgstr ""
+
+#. module: sale
#: model:ir.model,name:sale.model_sale_make_invoice
msgid "Sales Make Invoice"
msgstr ""
#. module: sale
-#: view:sale.order:0
-msgid "Recreate Packing"
+#: code:addons/sale/sale.py:330
+#, python-format
+msgid "Pricelist Warning!"
msgstr ""
#. module: sale
@@ -235,10 +267,10 @@ msgid "Discount (%)"
msgstr "Знижка (%)"
#. module: sale
-#: help:res.company,security_lead:0
-msgid ""
-"This is the days added to what you promise to customers for security purpose"
-msgstr ""
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_quotation_for_sale
+msgid "My Quotations"
+msgstr "Мої пропозиції"
#. module: sale
#: view:board.board:0
@@ -263,7 +295,22 @@ msgid "Shop Name"
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:1014
+#: help:sale.order,order_policy:0
+msgid ""
+"The Invoice Policy is used to synchronise invoice and delivery operations.\n"
+" - The 'Pay before delivery' choice will first generate the invoice and "
+"then generate the picking order after the payment of this invoice.\n"
+" - The 'Deliver & Invoice on demand' will create the picking order directly "
+"and wait for the user to manually click on the 'Invoice' button to generate "
+"the draft invoice based on the sale order or the sale order lines.\n"
+" - The 'Invoice on order after delivery' choice will generate the draft "
+"invoice based on sales order after all picking lists have been finished.\n"
+" - The 'Invoice based on deliveries' choice is used to create an invoice "
+"during the picking process."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:1158
#, python-format
msgid "No Customer Defined !"
msgstr ""
@@ -274,9 +321,12 @@ msgid "Sales in Exception"
msgstr ""
#. module: sale
-#: view:sale.order:0
-msgid "Set to Draft"
-msgstr "Зробити чорновиком"
+#: code:addons/sale/sale.py:1145
+#: code:addons/sale/sale.py:1264
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:70
+#, python-format
+msgid "Configuration Error !"
+msgstr ""
#. module: sale
#: view:sale.order:0
@@ -284,22 +334,7 @@ msgid "Conditions"
msgstr ""
#. module: sale
-#: help:sale.order,order_policy:0
-msgid ""
-"The Shipping Policy is used to synchronise invoice and delivery operations.\n"
-" - The 'Pay Before delivery' choice will first generate the invoice and "
-"then generate the picking order after the payment of this invoice.\n"
-" - The 'Shipping & Manual Invoice' will create the picking order directly "
-"and wait for the user to manually click on the 'Invoice' button to generate "
-"the draft invoice.\n"
-" - The 'Invoice On Order After Delivery' choice will generate the draft "
-"invoice based on sales order after all picking lists have been finished.\n"
-" - The 'Invoice From The Picking' choice is used to create an invoice "
-"during the picking process."
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:939
+#: code:addons/sale/sale.py:1034
#, python-format
msgid ""
"There is no income category account defined in default Properties for "
@@ -307,8 +342,8 @@ msgid ""
msgstr ""
#. module: sale
-#: view:sale.installer:0
-msgid "Configure"
+#: selection:sale.report,month:0
+msgid "August"
msgstr ""
#. module: sale
@@ -317,7 +352,7 @@ msgid "You try to assign a lot which is not from the same product"
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:620
+#: code:addons/sale/sale.py:655
#, python-format
msgid "invalid mode for test_state"
msgstr ""
@@ -328,7 +363,7 @@ msgid "June"
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:584
+#: code:addons/sale/sale.py:617
#, python-format
msgid "Could not cancel this sales order !"
msgstr ""
@@ -349,8 +384,12 @@ msgid "October"
msgstr ""
#. module: sale
+#: sql_constraint:stock.picking:0
+msgid "Reference must be unique per Company!"
+msgstr ""
+
+#. module: sale
#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_quotation_for_sale
#: view:sale.order:0
#: view:sale.report:0
msgid "Quotations"
@@ -362,11 +401,6 @@ msgid "Pricelist for current sales order."
msgstr ""
#. module: sale
-#: selection:sale.config.picking_policy,step:0
-msgid "Delivery Order Only"
-msgstr ""
-
-#. module: sale
#: report:sale.order:0
msgid "TVA :"
msgstr ""
@@ -391,6 +425,7 @@ msgstr ""
#. module: sale
#: view:sale.order:0
#: view:sale.order.line:0
+#: field:sale.report,product_uom:0
msgid "UoM"
msgstr "ОВ"
@@ -413,13 +448,19 @@ msgid ""
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:971
+#: code:addons/sale/sale.py:1061
+#, python-format
+msgid "You cannot cancel a sale order line that has already been invoiced!"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:1066
#, python-format
msgid "You must first cancel stock moves attached to this sales order line."
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:1042
+#: code:addons/sale/sale.py:1134
#, python-format
msgid "(n/a)"
msgstr ""
@@ -453,13 +494,35 @@ msgid "Notes"
msgstr "Примітки"
#. module: sale
+#: sql_constraint:res.company:0
+msgid "The company name must be unique !"
+msgstr ""
+
+#. module: sale
#: help:sale.order,partner_invoice_id:0
msgid "Invoice address for current sales order."
msgstr ""
#. module: sale
-#: view:sale.installer:0
-msgid "Enhance your core Sales Application with additional functionalities."
+#: view:sale.report:0
+msgid "Month-1"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered month of the sales order"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:504
+#, python-format
+msgid ""
+"You cannot group sales having different currencies for the same partner."
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,picking_policy:0
+msgid "Deliver each product when available"
msgstr ""
#. module: sale
@@ -479,18 +542,40 @@ msgid "Confirmation Date"
msgstr ""
#. module: sale
+#: field:sale.order,incoterm:0
+msgid "Incoterm"
+msgstr "Incoterm"
+
+#. module: sale
#: field:sale.order.line,address_allotment_id:0
msgid "Allotment Partner"
msgstr "Партнер у долі"
#. module: sale
-#: sql_constraint:sale.order:0
-msgid "Order Reference must be unique !"
+#: selection:sale.report,month:0
+msgid "March"
msgstr ""
#. module: sale
-#: selection:sale.report,month:0
-msgid "March"
+#: constraint:stock.move:0
+msgid "You can not move products from or to a location of the type view."
+msgstr ""
+
+#. module: sale
+#: field:sale.config.picking_policy,sale_orders:0
+msgid "Based on Sales Orders"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,state:0
+msgid ""
+"Givwizard = self.browse(cr, uid, ids)[0]es the state of the quotation or "
+"sales order. \n"
+"The exception state is automatically set when a cancel operation occurs in "
+"the invoice validation (Invoice Exception) or in the picking list process "
+"(Shipping Exception). \n"
+"The 'Waiting Schedule' state is set when the invoice is confirmed but "
+"waiting for the scheduler to run on the order date."
msgstr ""
#. module: sale
@@ -509,6 +594,11 @@ msgid "Invoice address :"
msgstr "Адреса інвойса:"
#. module: sale
+#: field:sale.order.line,sequence:0
+msgid "Line Sequence"
+msgstr ""
+
+#. module: sale
#: model:process.transition,note:sale.process_transition_saleorderprocurement0
msgid ""
"For every sales order line, a procurement order is created to supply the "
@@ -555,11 +645,6 @@ msgid "Sales Order Line"
msgstr ""
#. module: sale
-#: view:sale.config.picking_policy:0
-msgid "Setup your sales workflow and default values."
-msgstr ""
-
-#. module: sale
#: field:sale.shop,warehouse_id:0
msgid "Warehouse"
msgstr "Склад"
@@ -596,6 +681,11 @@ msgid "Creation Date"
msgstr ""
#. module: sale
+#: model:ir.ui.menu,name:sale.menu_sales_configuration_misc
+msgid "Miscellaneous"
+msgstr ""
+
+#. module: sale
#: model:ir.actions.act_window,name:sale.action_order_line_tree3
msgid "Uninvoiced and Delivered Lines"
msgstr "Незаінвойсовані і доставлені позиції"
@@ -611,14 +701,19 @@ msgid "My Sales"
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:290
-#: code:addons/sale/sale.py:966
-#: code:addons/sale/sale.py:1165
+#: code:addons/sale/sale.py:295
+#: code:addons/sale/sale.py:1061
+#: code:addons/sale/sale.py:1290
#, python-format
msgid "Invalid action !"
msgstr "Невірна дія !"
#. module: sale
+#: view:sale.order:0
+msgid "Extra Info"
+msgstr "Додаткова інформація"
+
+#. module: sale
#: field:sale.order,pricelist_id:0
#: field:sale.report,pricelist_id:0
#: field:sale.shop,pricelist_id:0
@@ -632,13 +727,21 @@ msgid "# of Qty"
msgstr ""
#. module: sale
+#: code:addons/sale/sale.py:1314
+#, python-format
+msgid "Hour"
+msgstr ""
+
+#. module: sale
#: view:sale.order:0
msgid "Order Date"
msgstr ""
#. module: sale
#: view:sale.order.line:0
+#: view:sale.report:0
#: field:sale.report,shipped:0
+#: field:sale.report,shipped_qty_1:0
msgid "Shipped"
msgstr ""
@@ -648,8 +751,8 @@ msgid "All Quotations"
msgstr "Всі пропозиції"
#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Invoice On Order After Delivery"
+#: view:sale.config.picking_policy:0
+msgid "Options"
msgstr ""
#. module: sale
@@ -658,6 +761,20 @@ msgid "September"
msgstr ""
#. module: sale
+#: code:addons/sale/sale.py:632
+#, python-format
+msgid "You cannot confirm a sale order which has no line."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:1246
+#, python-format
+msgid ""
+"You have to select a pricelist or a customer in the sales form !\n"
+"Please set one before choosing a product."
+msgstr ""
+
+#. module: sale
#: view:sale.report:0
#: field:sale.report,categ_id:0
msgid "Category of Product"
@@ -674,11 +791,6 @@ msgid "Stock Moves"
msgstr "Складські Переміщення"
#. module: sale
-#: view:sale.report:0
-msgid " Year "
-msgstr ""
-
-#. module: sale
#: field:sale.order,state:0
#: field:sale.report,state:0
msgid "Order State"
@@ -696,7 +808,7 @@ msgid "Sales By Month"
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:970
+#: code:addons/sale/sale.py:1065
#, python-format
msgid "Could not cancel sales order line!"
msgstr ""
@@ -729,41 +841,18 @@ msgid ""
msgstr ""
#. module: sale
-#: view:sale.report:0
-msgid "Extended Filters..."
+#: field:sale.order,date_order:0
+msgid "Date"
msgstr ""
#. module: sale
-#: model:ir.module.module,description:sale.module_meta_information
-msgid ""
-"\n"
-" The base module to manage quotations and sales orders.\n"
-"\n"
-" * Workflow with validation steps:\n"
-" - Quotation -> Sales order -> Invoice\n"
-" * Invoicing methods:\n"
-" - Invoice on order (before or after shipping)\n"
-" - Invoice on delivery\n"
-" - Invoice on timesheets\n"
-" - Advance invoice\n"
-" * Partners preferences (shipping, invoicing, incoterm, ...)\n"
-" * Products stocks and prices\n"
-" * Delivery methods:\n"
-" - all at once, multi-parcel\n"
-" - delivery costs\n"
-" * Dashboard for salesman that includes:\n"
-" * Your open quotations\n"
-" * Top 10 sales of the month\n"
-" * Cases statistics\n"
-" * Graph of sales by product\n"
-" * Graph of cases of the month\n"
-" "
+#: view:sale.report:0
+msgid "Extended Filters..."
msgstr ""
#. module: sale
-#: model:ir.model,name:sale.model_sale_shop
-#: view:sale.shop:0
-msgid "Sales Shop"
+#: selection:sale.order.line,state:0
+msgid "Exception"
msgstr ""
#. module: sale
@@ -772,8 +861,9 @@ msgid "Companies"
msgstr ""
#. module: sale
-#: selection:sale.report,month:0
-msgid "November"
+#: code:addons/sale/sale.py:1259
+#, python-format
+msgid "No valid pricelist line found ! :"
msgstr ""
#. module: sale
@@ -782,8 +872,8 @@ msgid "History"
msgstr "Історія"
#. module: sale
-#: field:sale.config.picking_policy,picking_policy:0
-msgid "Picking Default Policy"
+#: selection:sale.order,order_policy:0
+msgid "Invoice on order after delivery"
msgstr ""
#. module: sale
@@ -806,13 +896,12 @@ msgid ""
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:966
-#, python-format
-msgid "You cannot cancel a sales order line that has already been invoiced !"
+#: help:res.company,security_lead:0
+msgid ""
+"This is the days added to what you promise to customers for security purpose"
msgstr ""
#. module: sale
-#: view:sale.order:0
#: view:sale.order.line:0
msgid "Qty"
msgstr "К-сть"
@@ -823,6 +912,11 @@ msgid "References"
msgstr ""
#. module: sale
+#: view:sale.order.line:0
+msgid "My Sales Order Lines"
+msgstr ""
+
+#. module: sale
#: model:process.transition.action,name:sale.process_transition_action_cancel0
#: model:process.transition.action,name:sale.process_transition_action_cancel1
#: model:process.transition.action,name:sale.process_transition_action_cancel2
@@ -834,13 +928,8 @@ msgid "Cancel"
msgstr "Скасувати"
#. module: sale
-#: field:sale.installer,sale_order_dates:0
-msgid "Sales Order Dates"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order.line,state:0
-msgid "Exception"
+#: sql_constraint:sale.order:0
+msgid "Order Reference must be unique per Company!"
msgstr ""
#. module: sale
@@ -853,19 +942,19 @@ msgid "Create Invoice"
msgstr "Створити інвойс"
#. module: sale
-#: field:sale.installer,sale_margin:0
-msgid "Margins in Sales Orders"
+#: view:sale.order:0
+msgid "Total Tax Excluded"
msgstr ""
#. module: sale
-#: view:sale.order:0
-msgid "Total Tax Excluded"
+#: view:sale.order.line:0
+msgid "Order reference"
msgstr ""
#. module: sale
-#: view:sale.order:0
-msgid "Compute"
-msgstr "Розрахувати"
+#: view:sale.open.invoice:0
+msgid "You invoice has been successfully created!"
+msgstr ""
#. module: sale
#: view:sale.report:0
@@ -884,22 +973,19 @@ msgid "Open Invoice"
msgstr ""
#. module: sale
-#: report:sale.order:0
-#: view:sale.order.line:0
-msgid "Price"
-msgstr "Ціна"
+#: model:ir.actions.server,name:sale.ir_actions_server_edi_sale
+msgid "Auto-email confirmed sale orders"
+msgstr ""
#. module: sale
-#: model:ir.actions.act_window,name:sale.action_sale_installer
-#: view:sale.config.picking_policy:0
-#: view:sale.installer:0
-msgid "Sales Application Configuration"
+#: code:addons/sale/sale.py:413
+#, python-format
+msgid "There is no sales journal defined for this company: \"%s\" (id:%d)"
msgstr ""
#. module: sale
-#: view:sale.report:0
-#: field:sale.report,price_total:0
-msgid "Total Price"
+#: model:process.transition.action,name:sale.process_transition_action_forceassignation0
+msgid "Force Assignation"
msgstr ""
#. module: sale
@@ -913,6 +999,11 @@ msgid "Based on the shipped or on the ordered quantities."
msgstr ""
#. module: sale
+#: selection:sale.order,picking_policy:0
+msgid "Deliver all products at once"
+msgstr ""
+
+#. module: sale
#: field:sale.order,picking_ids:0
msgid "Related Picking"
msgstr ""
@@ -944,8 +1035,14 @@ msgid "Create Delivery Order"
msgstr ""
#. module: sale
-#: field:sale.installer,delivery:0
-msgid "Delivery Costs"
+#: code:addons/sale/sale.py:1290
+#, python-format
+msgid "Cannot delete a sales order line which is in state '%s'!"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Qty(UoS)"
msgstr ""
#. module: sale
@@ -960,12 +1057,12 @@ msgstr ""
#. module: sale
#: view:sale.report:0
-msgid "Sales by Product Category"
+msgid "Ordered date of the sales order"
msgstr ""
#. module: sale
-#: selection:sale.order,picking_policy:0
-msgid "Partial Delivery"
+#: view:sale.report:0
+msgid "Sales by Product Category"
msgstr ""
#. module: sale
@@ -974,8 +1071,9 @@ msgid "Confirm Quotation"
msgstr "Підтвердити Пропозицію"
#. module: sale
-#: help:sale.order,origin:0
-msgid "Reference of the document that generated this sales order request."
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:63
+#, python-format
+msgid "Error"
msgstr ""
#. module: sale
@@ -1008,20 +1106,14 @@ msgid "Procurement Method"
msgstr ""
#. module: sale
-#: view:sale.config.picking_policy:0
-#: view:sale.installer:0
-msgid "title"
-msgstr ""
-
-#. module: sale
#: model:process.node,name:sale.process_node_packinglist0
msgid "Pick List"
msgstr ""
#. module: sale
#: view:sale.order:0
-msgid "Order date"
-msgstr ""
+msgid "Set to Draft"
+msgstr "Зробити чорновиком"
#. module: sale
#: model:process.node,note:sale.process_node_packinglist0
@@ -1029,6 +1121,85 @@ msgid "Document of the move to the output or to the customer."
msgstr ""
#. module: sale
+#: model:email.template,body_text:sale.email_template_edi_sale
+msgid ""
+"\n"
+"Hello${object.partner_order_id.name and ' ' or "
+"''}${object.partner_order_id.name or ''},\n"
+"\n"
+"Here is your order confirmation for ${object.partner_id.name}:\n"
+" | Order number: *${object.name}*\n"
+" | Order total: *${object.amount_total} "
+"${object.pricelist_id.currency_id.name}*\n"
+" | Order date: ${object.date_order}\n"
+" % if object.origin:\n"
+" | Order reference: ${object.origin}\n"
+" % endif\n"
+" % if object.client_order_ref:\n"
+" | Your reference: ${object.client_order_ref}<br />\n"
+" % endif\n"
+" | Your contact: ${object.user_id.name} ${object.user_id.user_email "
+"and '<%s>'%(object.user_id.user_email) or ''}\n"
+"\n"
+"You can view the order confirmation, download it and even pay online using "
+"the following link:\n"
+" ${ctx.get('edi_web_url_view') or 'n/a'}\n"
+"\n"
+"% if object.order_policy in ('prepaid','manual') and "
+"object.company_id.paypal_account:\n"
+"<% \n"
+"comp_name = quote(object.company_id.name)\n"
+"order_name = quote(object.name)\n"
+"paypal_account = quote(object.company_id.paypal_account)\n"
+"order_amount = quote(str(object.amount_total))\n"
+"cur_name = quote(object.pricelist_id.currency_id.name)\n"
+"paypal_url = \"https://www.paypal.com/cgi-"
+"bin/webscr?cmd=_xclick&business=%s&item_name=%s%%20Order%%20%s&invoice=%s&amo"
+"unt=%s\" \\\n"
+" "
+"\"&currency_code=%s&button_subtype=services&no_note=1&bn=OpenERP_Order_PayNow"
+"_%s\" % \\\n"
+" "
+"(paypal_account,comp_name,order_name,order_name,order_amount,cur_name,cur_nam"
+"e)\n"
+"%>\n"
+"It is also possible to directly pay with Paypal:\n"
+" ${paypal_url}\n"
+"% endif\n"
+"\n"
+"If you have any question, do not hesitate to contact us.\n"
+"\n"
+"\n"
+"Thank you for choosing ${object.company_id.name}!\n"
+"\n"
+"\n"
+"--\n"
+"${object.user_id.name} ${object.user_id.user_email and "
+"'<%s>'%(object.user_id.user_email) or ''}\n"
+"${object.company_id.name}\n"
+"% if object.company_id.street:\n"
+"${object.company_id.street or ''}\n"
+"% endif\n"
+"% if object.company_id.street2:\n"
+"${object.company_id.street2}\n"
+"% endif\n"
+"% if object.company_id.city or object.company_id.zip:\n"
+"${object.company_id.zip or ''} ${object.company_id.city or ''}\n"
+"% endif\n"
+"% if object.company_id.country_id:\n"
+"${object.company_id.state_id and ('%s, ' % object.company_id.state_id.name) "
+"or ''} ${object.company_id.country_id.name or ''}\n"
+"% endif\n"
+"% if object.company_id.phone:\n"
+"Phone: ${object.company_id.phone}\n"
+"% endif\n"
+"% if object.company_id.website:\n"
+"${object.company_id.website or ''}\n"
+"% endif\n"
+" "
+msgstr ""
+
+#. module: sale
#: model:process.transition.action,name:sale.process_transition_action_validate0
msgid "Validate"
msgstr "Підтвердити"
@@ -1051,9 +1222,9 @@ msgid "Taxes"
msgstr "Податки"
#. module: sale
-#: field:sale.order,order_policy:0
-msgid "Shipping Policy"
-msgstr "Політика постачання"
+#: view:sale.order:0
+msgid "Sales Order ready to be invoiced"
+msgstr ""
#. module: sale
#: help:sale.order,create_date:0
@@ -1072,9 +1243,9 @@ msgid "Create Invoices"
msgstr ""
#. module: sale
-#: view:sale.order:0
-msgid "Extra Info"
-msgstr "Додаткова інформація"
+#: view:sale.report:0
+msgid "Sales order created in current month"
+msgstr ""
#. module: sale
#: report:sale.order:0
@@ -1082,11 +1253,24 @@ msgid "Fax :"
msgstr ""
#. module: sale
+#: help:sale.order.line,type:0
+msgid ""
+"If 'on order', it triggers a procurement when the sale order is confirmed to "
+"create a task, purchase order or manufacturing order linked to this sale "
+"order line."
+msgstr ""
+
+#. module: sale
#: field:sale.advance.payment.inv,amount:0
msgid "Advance Amount"
msgstr ""
#. module: sale
+#: field:sale.config.picking_policy,charge_delivery:0
+msgid "Do you charge the delivery?"
+msgstr ""
+
+#. module: sale
#: selection:sale.order,invoice_quantity:0
msgid "Shipped Quantities"
msgstr "Відвантажена кількість"
@@ -1097,25 +1281,45 @@ msgid "Invoice Based on Sales Orders"
msgstr ""
#. module: sale
+#: code:addons/sale/sale.py:331
+#, python-format
+msgid ""
+"If you change the pricelist of this order (and eventually the currency), "
+"prices of existing order lines will not be updated."
+msgstr ""
+
+#. module: sale
#: model:ir.model,name:sale.model_stock_picking
msgid "Picking List"
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:387
-#: code:addons/sale/sale.py:920
-#: code:addons/sale/sale.py:938
+#: code:addons/sale/sale.py:412
+#: code:addons/sale/sale.py:503
+#: code:addons/sale/sale.py:632
+#: code:addons/sale/sale.py:1015
+#: code:addons/sale/sale.py:1033
#, python-format
msgid "Error !"
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:570
+#: code:addons/sale/sale.py:603
#, python-format
msgid "Could not cancel sales order !"
msgstr ""
#. module: sale
+#: view:sale.order:0
+msgid "Qty(UoM)"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered Year of the sales order"
+msgstr ""
+
+#. module: sale
#: selection:sale.report,month:0
msgid "July"
msgstr ""
@@ -1132,35 +1336,25 @@ msgid "Shipping Exception"
msgstr "Виключення з доставки"
#. module: sale
-#: field:sale.make.invoice,grouped:0
-msgid "Group the invoices"
-msgstr "Групувати інвойси"
-
-#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Shipping & Manual Invoice"
-msgstr "Відвантаження і інвойс вручну"
-
-#. module: sale
-#: code:addons/sale/sale.py:1051
+#: code:addons/sale/sale.py:1143
#, python-format
-msgid "Picking Information !"
+msgid "Picking Information ! : "
msgstr ""
#. module: sale
-#: view:sale.report:0
-#: field:sale.report,month:0
-msgid "Month"
-msgstr ""
+#: field:sale.make.invoice,grouped:0
+msgid "Group the invoices"
+msgstr "Групувати інвойси"
#. module: sale
-#: model:ir.module.module,shortdesc:sale.module_meta_information
-msgid "Sales Management"
-msgstr "Продажі"
+#: field:sale.order,order_policy:0
+msgid "Invoice Policy"
+msgstr ""
#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Invoice From The Picking"
+#: model:ir.actions.act_window,name:sale.action_config_picking_policy
+#: view:sale.config.picking_policy:0
+msgid "Setup your Invoicing Method"
msgstr ""
#. module: sale
@@ -1170,27 +1364,30 @@ msgstr ""
#. module: sale
#: view:sale.report:0
-#: field:sale.report,uom_name:0
msgid "Reference UoM"
msgstr ""
#. module: sale
+#: view:sale.config.picking_policy:0
+msgid ""
+"This tool will help you to install the right module and configure the system "
+"according to the method you use to invoice your customers."
+msgstr ""
+
+#. module: sale
#: model:ir.model,name:sale.model_sale_order_line_make_invoice
msgid "Sale OrderLine Make_invoice"
msgstr ""
#. module: sale
-#: help:sale.config.picking_policy,step:0
-msgid ""
-"By default, OpenERP is able to manage complex routing and paths of products "
-"in your warehouse and partner locations. This will configure the most common "
-"and simple methods to deliver products to the customer in one or two "
-"operations by the worker."
-msgstr ""
+#: selection:sale.order,state:0
+#: selection:sale.report,state:0
+msgid "Invoice Exception"
+msgstr "Виключення з інвойса"
#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_tree
-msgid "Old Quotations"
+#: model:process.node,note:sale.process_node_saleorder0
+msgid "Drives procurement and invoicing"
msgstr ""
#. module: sale
@@ -1206,6 +1403,22 @@ msgid "Sales Analysis"
msgstr ""
#. module: sale
+#: code:addons/sale/sale.py:1138
+#, python-format
+msgid ""
+"You selected a quantity of %d Units.\n"
+"But it's not compatible with the selected packaging.\n"
+"Here is a proposition of quantities according to the packaging:\n"
+"EAN: %s Quantity: %s Type of ul: %s"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Recreate Packing"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
#: field:sale.order.line,property_ids:0
msgid "Properties"
msgstr "Властивості"
@@ -1232,7 +1445,17 @@ msgid ""
msgstr ""
#. module: sale
-#: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
+#: view:sale.order.line:0
+msgid "Confirmed sale order lines, not yet delivered"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:473
+#, python-format
+msgid "Customer Invoices"
+msgstr ""
+
+#. module: sale
#: model:process.process,name:sale.process_process_salesprocess0
#: view:sale.order:0
#: view:sale.report:0
@@ -1254,18 +1477,13 @@ msgid "Done"
msgstr "Виконано"
#. module: sale
-#: model:ir.model,name:sale.model_sale_installer
-msgid "sale.installer"
-msgstr ""
-
-#. module: sale
#: model:process.node,name:sale.process_node_invoice0
#: model:process.node,name:sale.process_node_invoiceafterdelivery0
msgid "Invoice"
msgstr "Інвойс"
#. module: sale
-#: code:addons/sale/sale.py:1014
+#: code:addons/sale/sale.py:1158
#, python-format
msgid ""
"You have to select a customer in the sales form !\n"
@@ -1273,11 +1491,6 @@ msgid ""
msgstr ""
#. module: sale
-#: selection:sale.config.picking_policy,step:0
-msgid "Picking List & Delivery Order"
-msgstr ""
-
-#. module: sale
#: field:sale.order,origin:0
msgid "Source Document"
msgstr ""
@@ -1303,7 +1516,7 @@ msgid "The amount without tax."
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:571
+#: code:addons/sale/sale.py:604
#, python-format
msgid "You must first cancel all picking attached to this sales order."
msgstr ""
@@ -1314,9 +1527,15 @@ msgid "Sales Advance Payment Invoice"
msgstr ""
#. module: sale
-#: field:sale.order,incoterm:0
-msgid "Incoterm"
-msgstr "Incoterm"
+#: view:sale.report:0
+#: field:sale.report,month:0
+msgid "Month"
+msgstr ""
+
+#. module: sale
+#: model:email.template,subject:sale.email_template_edi_sale
+msgid "${object.company_id.name} Order (Ref ${object.name or 'n/a' })"
+msgstr ""
#. module: sale
#: view:sale.order.line:0
@@ -1327,11 +1546,6 @@ msgid "Product"
msgstr "Продукт"
#. module: sale
-#: model:ir.ui.menu,name:sale.menu_invoiced
-msgid "Invoicing"
-msgstr ""
-
-#. module: sale
#: model:process.transition.action,name:sale.process_transition_action_cancelassignation0
msgid "Cancel Assignation"
msgstr ""
@@ -1342,14 +1556,10 @@ msgid "sale.config.picking_policy"
msgstr ""
#. module: sale
-#: help:sale.order,state:0
-msgid ""
-"Gives the state of the quotation or sales order. \n"
-"The exception state is automatically set when a cancel operation occurs in "
-"the invoice validation (Invoice Exception) or in the picking list process "
-"(Shipping Exception). \n"
-"The 'Waiting Schedule' state is set when the invoice is confirmed but "
-"waiting for the scheduler to run on the date 'Ordered Date'."
+#: view:account.invoice.report:0
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_turnover_by_month
+msgid "Monthly Turnover"
msgstr ""
#. module: sale
@@ -1368,7 +1578,6 @@ msgid "Product UoS"
msgstr ""
#. module: sale
-#: selection:sale.order,state:0
#: selection:sale.report,state:0
msgid "Manual In Progress"
msgstr ""
@@ -1389,7 +1598,8 @@ msgid "Order"
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:921
+#: code:addons/sale/sale.py:1016
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:71
#, python-format
msgid "There is no income account defined for this product: \"%s\" (id:%d)"
msgstr ""
@@ -1409,7 +1619,7 @@ msgid ""
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:1116
+#: code:addons/sale/sale.py:1238
#, python-format
msgid ""
"You plan to sell %.2f %s but you only have %.2f %s available !\n"
@@ -1438,10 +1648,10 @@ msgid "Total"
msgstr "Разом"
#. module: sale
-#: code:addons/sale/sale.py:388
-#, python-format
-msgid "There is no sales journal defined for this company: \"%s\" (id:%d)"
-msgstr ""
+#: report:sale.order:0
+#: view:sale.order.line:0
+msgid "Price"
+msgstr "Ціна"
#. module: sale
#: model:process.transition,note:sale.process_transition_deliver0
@@ -1452,9 +1662,14 @@ msgid ""
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:1165
-#, python-format
-msgid "Cannot delete a sales order line which is %s !"
+#: selection:sale.order,order_policy:0
+msgid "Pay before delivery"
+msgstr ""
+
+#. module: sale
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.open_board_sales
+msgid "Sales Dashboard"
msgstr ""
#. module: sale
@@ -1466,6 +1681,7 @@ msgstr ""
#. module: sale
#: view:sale.order:0
+#: selection:sale.order,state:0
#: view:sale.order.line:0
msgid "To Invoice"
msgstr ""
@@ -1476,6 +1692,11 @@ msgid "Date on which sales order is confirmed."
msgstr ""
#. module: sale
+#: field:sale.order,project_id:0
+msgid "Contract/Analytic Account"
+msgstr ""
+
+#. module: sale
#: field:sale.order,company_id:0
#: field:sale.order.line,company_id:0
#: view:sale.report:0
@@ -1495,22 +1716,17 @@ msgid "The amount to be invoiced in advance."
msgstr ""
#. module: sale
-#: selection:sale.order,state:0
-#: selection:sale.report,state:0
-msgid "Invoice Exception"
-msgstr "Виключення з інвойса"
-
-#. module: sale
-#: help:sale.order,picking_ids:0
+#: code:addons/sale/sale.py:1256
+#, python-format
msgid ""
-"This is a list of picking that has been generated for this sales order."
+"Couldn't find a pricelist line matching this product and quantity.\n"
+"You have to change either the product, the quantity or the pricelist."
msgstr ""
#. module: sale
-#: help:sale.installer,sale_margin:0
+#: help:sale.order,picking_ids:0
msgid ""
-"Gives the margin of profitability by calculating the difference between Unit "
-"Price and Cost Price."
+"This is a list of picking that has been generated for this sales order."
msgstr ""
#. module: sale
@@ -1532,6 +1748,11 @@ msgid "Cancelled"
msgstr ""
#. module: sale
+#: view:sale.order.line:0
+msgid "Sales Order Lines related to a Sales Order of mine"
+msgstr ""
+
+#. module: sale
#: model:ir.actions.act_window,name:sale.action_shop_form
#: model:ir.ui.menu,name:sale.menu_action_shop_form
#: field:sale.order,shop_id:0
@@ -1541,17 +1762,12 @@ msgid "Shop"
msgstr "Торгова точка"
#. module: sale
-#: view:sale.report:0
-msgid " Month "
-msgstr ""
-
-#. module: sale
#: field:sale.report,date_confirm:0
msgid "Date Confirm"
msgstr ""
#. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:111
+#: code:addons/sale/wizard/sale_line_invoice.py:113
#, python-format
msgid "Warning"
msgstr ""
@@ -1563,17 +1779,6 @@ msgid "Sales by Month"
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:1045
-#, python-format
-msgid ""
-"You selected a quantity of %d Units.\n"
-"But it's not compatible with the selected packaging.\n"
-"Here is a proposition of quantities according to the packaging:\n"
-"\n"
-"EAN: %s Quantity: %s Type of ul: %s"
-msgstr ""
-
-#. module: sale
#: model:ir.model,name:sale.model_sale_order
#: model:process.node,name:sale.process_node_order0
#: model:process.node,name:sale.process_node_saleorder0
@@ -1589,6 +1794,11 @@ msgid "Quantity (UoS)"
msgstr ""
#. module: sale
+#: view:sale.order.line:0
+msgid "Sale Order Lines that are in 'done' state"
+msgstr ""
+
+#. module: sale
#: model:process.transition,note:sale.process_transition_packing0
msgid ""
"The Pick List form is created as soon as the sales order is confirmed, in "
@@ -1603,6 +1813,11 @@ msgid "Confirmed"
msgstr "Затверджено"
#. module: sale
+#: field:sale.config.picking_policy,order_policy:0
+msgid "Main Method Based On"
+msgstr ""
+
+#. module: sale
#: model:process.transition.action,name:sale.process_transition_action_confirm0
msgid "Confirm"
msgstr "Підтвердити"
@@ -1625,6 +1840,7 @@ msgid "Invoice Lines"
msgstr "Рядки інвойса"
#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_product_tree
#: view:sale.order:0
#: view:sale.order.line:0
msgid "Sales Order Lines"
@@ -1641,30 +1857,18 @@ msgid "Configuration"
msgstr "Налаштування"
#. module: sale
-#: selection:sale.order,picking_policy:0
-msgid "Complete Delivery"
+#: code:addons/sale/edi/sale_order.py:146
+#, python-format
+msgid "EDI Pricelist (%s)"
msgstr ""
#. module: sale
#: view:sale.report:0
-msgid " Month-1 "
+msgid "Sales order created in current year"
msgstr ""
#. module: sale
-#: help:sale.config.picking_policy,picking_policy:0
-msgid ""
-"The Shipping Policy is used to configure per order if you want to deliver as "
-"soon as possible when one product is available or you wait that all products "
-"are available.."
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "August"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:111
+#: code:addons/sale/wizard/sale_line_invoice.py:113
#, python-format
msgid ""
"Invoice cannot be created for this Sales Order Line due to one of the "
@@ -1674,6 +1878,11 @@ msgid ""
msgstr ""
#. module: sale
+#: view:sale.order.line:0
+msgid "Sale order lines done"
+msgstr ""
+
+#. module: sale
#: field:sale.order.line,th_weight:0
msgid "Weight"
msgstr "Вага"
@@ -1692,7 +1901,6 @@ msgstr ""
#. module: sale
#: field:sale.config.picking_policy,config_logo:0
-#: field:sale.installer,config_logo:0
msgid "Image"
msgstr ""
@@ -1722,8 +1930,8 @@ msgid "Salesman"
msgstr "Продавець"
#. module: sale
-#: model:process.node,note:sale.process_node_saleorder0
-msgid "Drives procurement and invoicing"
+#: model:ir.actions.act_window,name:sale.action_order_tree
+msgid "Old Quotations"
msgstr ""
#. module: sale
@@ -1732,7 +1940,7 @@ msgid "Untaxed Amount"
msgstr "Неоподаткована сума"
#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:163
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:170
#: model:ir.actions.act_window,name:sale.action_view_sale_advance_payment_inv
#: view:sale.advance.payment.inv:0
#: view:sale.order:0
@@ -1741,7 +1949,7 @@ msgid "Advance Invoice"
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:591
+#: code:addons/sale/sale.py:624
#, python-format
msgid "The sales order '%s' has been cancelled."
msgstr ""
@@ -1776,19 +1984,19 @@ msgid "Packings"
msgstr ""
#. module: sale
-#: field:sale.config.picking_policy,progress:0
-#: field:sale.installer,progress:0
-msgid "Configuration Progress"
+#: view:sale.order.line:0
+msgid "Sale Order Lines ready to be invoiced"
msgstr ""
#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_product_tree
-msgid "Product sales"
-msgstr "Продажі продуктів"
+#: view:sale.report:0
+msgid "Sales order created in last month"
+msgstr ""
#. module: sale
-#: field:sale.order,date_order:0
-msgid "Ordered Date"
+#: model:ir.actions.act_window,name:sale.action_email_templates
+#: model:ir.ui.menu,name:sale.menu_email_templates
+msgid "Email Templates"
msgstr ""
#. module: sale
@@ -1799,13 +2007,14 @@ msgid "Sales Orders"
msgstr "Замовлення на Продаж"
#. module: sale
-#: selection:sale.config.picking_policy,picking_policy:0
-msgid "Direct Delivery"
-msgstr "Пряма Доставка"
+#: model:ir.model,name:sale.model_sale_shop
+#: view:sale.shop:0
+msgid "Sales Shop"
+msgstr ""
#. module: sale
-#: field:sale.installer,sale_journal:0
-msgid "Invoicing journals"
+#: selection:sale.report,month:0
+msgid "November"
msgstr ""
#. module: sale
@@ -1814,18 +2023,12 @@ msgid "Advance Product"
msgstr ""
#. module: sale
-#: view:sale.report:0
-#: field:sale.report,shipped_qty_1:0
-msgid "Shipped Qty"
-msgstr ""
-
-#. module: sale
-#: view:sale.open.invoice:0
-msgid "You invoice has been successfully created!"
-msgstr ""
+#: view:sale.order:0
+msgid "Compute"
+msgstr "Розрахувати"
#. module: sale
-#: code:addons/sale/sale.py:585
+#: code:addons/sale/sale.py:618
#, python-format
msgid "You must first cancel all invoices attached to this sales order."
msgstr ""
@@ -1836,24 +2039,13 @@ msgid "January"
msgstr ""
#. module: sale
-#: view:sale.installer:0
-msgid "Configure Your Sales Management Application"
-msgstr ""
-
-#. module: sale
#: model:ir.actions.act_window,name:sale.action_order_tree4
msgid "Sales Order in Progress"
msgstr "Замовлення на Продаж на Виконанні"
#. module: sale
-#: field:sale.installer,sale_layout:0
-msgid "Sales Order Layout Improvement"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:63
-#, python-format
-msgid "Error"
+#: help:sale.order,origin:0
+msgid "Reference of the document that generated this sales order request."
msgstr ""
#. module: sale
@@ -1863,6 +2055,11 @@ msgid "Commitment Delay"
msgstr ""
#. module: sale
+#: selection:sale.order,order_policy:0
+msgid "Deliver & invoice on demand"
+msgstr ""
+
+#. module: sale
#: model:process.node,note:sale.process_node_saleprocurement0
msgid ""
"One Procurement order for each sales order line and for each of the "
@@ -1885,13 +2082,12 @@ msgid "Confirmed sales order to invoice."
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:290
-#, python-format
-msgid "Cannot delete Sales Order(s) which are already confirmed !"
+#: view:sale.order:0
+msgid "Sales Order that haven't yet been confirmed"
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:316
+#: code:addons/sale/sale.py:322
#, python-format
msgid "The sales order '%s' has been set in draft state."
msgstr ""
@@ -1902,24 +2098,19 @@ msgid "from stock"
msgstr "зі складу"
#. module: sale
-#: field:sale.config.picking_policy,order_policy:0
-msgid "Shipping Default Policy"
-msgstr ""
-
-#. module: sale
#: view:sale.open.invoice:0
msgid "Close"
msgstr ""
#. module: sale
-#: field:sale.order,shipped:0
-msgid "Delivered"
+#: code:addons/sale/sale.py:1248
+#, python-format
+msgid "No Pricelist ! : "
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:1115
-#, python-format
-msgid "Not enough stock !"
+#: field:sale.order,shipped:0
+msgid "Delivered"
msgstr ""
#. module: sale
@@ -1928,11 +2119,6 @@ msgid "You must assign a production lot for this product"
msgstr ""
#. module: sale
-#: field:sale.order.line,sequence:0
-msgid "Layout Sequence"
-msgstr ""
-
-#. module: sale
#: model:ir.actions.act_window,help:sale.action_shop_form
msgid ""
"If you have more than one shop reselling your company products, you can "
@@ -1959,11 +2145,6 @@ msgid "May"
msgstr ""
#. module: sale
-#: help:sale.installer,sale_order_dates:0
-msgid "Adds commitment, requested and effective dates on Sales Orders."
-msgstr ""
-
-#. module: sale
#: view:sale.order:0
#: field:sale.order,partner_id:0
#: field:sale.order.line,order_partner_id:0
@@ -1971,23 +2152,11 @@ msgid "Customer"
msgstr "Клієнт"
#. module: sale
-#: model:product.template,name:sale.advance_product_0_product_template
-msgid "Advance"
-msgstr ""
-
-#. module: sale
#: selection:sale.report,month:0
msgid "February"
msgstr ""
#. module: sale
-#: help:sale.installer,sale_journal:0
-msgid ""
-"Allows you to group and invoice your delivery orders according to different "
-"invoicing types: daily, weekly, etc."
-msgstr ""
-
-#. module: sale
#: selection:sale.report,month:0
msgid "April"
msgstr ""
@@ -1998,11 +2167,6 @@ msgid "Accounting"
msgstr ""
#. module: sale
-#: field:sale.config.picking_policy,step:0
-msgid "Steps To Deliver a Sales Order"
-msgstr ""
-
-#. module: sale
#: view:sale.order:0
#: view:sale.order.line:0
msgid "Search Sales Order"
@@ -2014,18 +2178,18 @@ msgid "Sales Order Requisition"
msgstr ""
#. module: sale
+#: code:addons/sale/sale.py:1242
+#, python-format
+msgid "Not enough stock ! : "
+msgstr ""
+
+#. module: sale
#: report:sale.order:0
#: field:sale.order,payment_term:0
msgid "Payment Term"
msgstr "Термін Оплати"
#. module: sale
-#: help:sale.installer,sale_layout:0
-msgid ""
-"Provides some features to improve the layout of the Sales Order reports."
-msgstr ""
-
-#. module: sale
#: model:ir.actions.act_window,help:sale.action_order_report_all
msgid ""
"This report performs analysis on your quotations and sales orders. Analysis "
@@ -2095,12 +2259,18 @@ msgstr ""
#~ msgid "Manual Designation"
#~ msgstr "Ручне позначення"
+#~ msgid "Shipping Policy"
+#~ msgstr "Політика постачання"
+
#~ msgid "Origin"
#~ msgstr "Походження"
#~ msgid "Reference"
#~ msgstr "Стосуєтья"
+#~ msgid "All at Once"
+#~ msgstr "Todo a la vez"
+
#~ msgid "Procure Method"
#~ msgstr "Метод постачання"
@@ -2146,9 +2316,6 @@ msgstr ""
#~ msgid "Sales Order To Be Invoiced"
#~ msgstr "Заявка на продаж для інвойсування"
-#~ msgid "My Quotations"
-#~ msgstr "Мої пропозиції"
-
#~ msgid "Canceled"
#~ msgstr "Скасовано"
@@ -2161,18 +2328,27 @@ msgstr ""
#~ msgid "Procurement Corrected"
#~ msgstr "Постачання відкориговано"
+#~ msgid "Shipping & Manual Invoice"
+#~ msgstr "Відвантаження і інвойс вручну"
+
#~ msgid "Status"
#~ msgstr "Статус"
#~ msgid "Packing Policy"
#~ msgstr "Політика пакування"
+#~ msgid "Product sales"
+#~ msgstr "Продажі продуктів"
+
#~ msgid "Our Salesman"
#~ msgstr "Наш Менеджер"
#~ msgid "Sale Order"
#~ msgstr "Заявка на продаж"
+#~ msgid "Direct Delivery"
+#~ msgstr "Пряма Доставка"
+
#~ msgid "Make Invoice"
#~ msgstr "Виписати інвойс"
@@ -2202,6 +2378,9 @@ msgstr ""
#~ msgid "Sales order"
#~ msgstr "Замовлення на продаж"
+#~ msgid "Sales Management"
+#~ msgstr "Продажі"
+
#~ msgid "Sale Order Line"
#~ msgstr "Рядок заявки на продаж"
diff --git a/addons/sale/i18n/vi.po b/addons/sale/i18n/vi.po
index b0acd9ac8a3..62c329bf1fc 100644
--- a/addons/sale/i18n/vi.po
+++ b/addons/sale/i18n/vi.po
@@ -7,15 +7,27 @@ msgid ""
msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2011-01-11 11:16+0000\n"
+"POT-Creation-Date: 2011-12-22 18:43+0000\n"
"PO-Revision-Date: 2011-05-04 19:22+0000\n"
"Last-Translator: OpenBMS JSC <Unknown>\n"
"Language-Team: Vietnamese <vi@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-05 05:17+0000\n"
-"X-Generator: Launchpad (build 14231)\n"
+"X-Launchpad-Export-Date: 2011-12-23 06:47+0000\n"
+"X-Generator: Launchpad (build 14560)\n"
+
+#. module: sale
+#: field:sale.config.picking_policy,timesheet:0
+msgid "Based on Timesheet"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid ""
+"Sale Order Lines that are confirmed, done or in exception state and haven't "
+"yet been invoiced"
+msgstr ""
#. module: sale
#: view:board.board:0
@@ -24,11 +36,6 @@ msgid "Sales by Salesman in last 90 days"
msgstr "Đơn hàng xếp theo người bán"
#. module: sale
-#: help:sale.installer,delivery:0
-msgid "Allows you to compute delivery costs on your quotations."
-msgstr "Cho phép bạn tính toán chi phí giao hàng trên Đơn chào hàng của bạn"
-
-#. module: sale
#: help:sale.order,picking_policy:0
msgid ""
"If you don't have enough stock available to deliver all at once, do you "
@@ -38,6 +45,11 @@ msgstr ""
"hàng từng phần hay không?"
#. module: sale
+#: view:sale.order:0
+msgid "UoS"
+msgstr ""
+
+#. module: sale
#: help:sale.order,partner_shipping_id:0
msgid "Shipping address for current sales order."
msgstr "Địa chỉ chuyển hàng cho đơn hàng hiện tại"
@@ -61,22 +73,12 @@ msgid "Cancel Order"
msgstr "Huỷ Đơn đặt hàng"
#. module: sale
-#: view:sale.config.picking_policy:0
-msgid "Configure Sales Order Logistics"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:603
+#: code:addons/sale/sale.py:638
#, python-format
msgid "The quotation '%s' has been converted to a sales order."
msgstr "Đơn chào hàng '%s' đã được chuyển thành Đơn đặt hàng"
#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Payment Before Delivery"
-msgstr "Thanh toán trước giao hàng"
-
-#. module: sale
#: code:addons/sale/wizard/sale_make_invoice.py:42
#, python-format
msgid "Warning !"
@@ -93,12 +95,6 @@ msgid "Drives procurement orders for every sales order line."
msgstr ""
#. module: sale
-#: selection:sale.config.picking_policy,picking_policy:0
-msgid "All at Once"
-msgstr "Toàn bộ một lần"
-
-#. module: sale
-#: field:sale.order,project_id:0
#: view:sale.report:0
#: field:sale.report,analytic_account_id:0
#: field:sale.shop,project_id:0
@@ -114,6 +110,15 @@ msgid ""
msgstr ""
#. module: sale
+#: code:addons/sale/sale.py:295
+#, python-format
+msgid ""
+"In order to delete a confirmed sale order, you must cancel it before ! To "
+"cancel a sale order, you must first cancel related picking or delivery "
+"orders."
+msgstr ""
+
+#. module: sale
#: model:process.node,name:sale.process_node_saleprocurement0
msgid "Procurement Order"
msgstr "Lệnh Mua sắm"
@@ -125,6 +130,11 @@ msgid "Partner"
msgstr "Đối tác"
#. module: sale
+#: selection:sale.order,order_policy:0
+msgid "Invoice based on deliveries"
+msgstr ""
+
+#. module: sale
#: view:sale.order:0
msgid "Order Line"
msgstr "Sản phẩm đặt hàng"
@@ -164,8 +174,13 @@ msgid "Default Payment Term"
msgstr "Điều khoản thanh toán mặc định"
#. module: sale
-#: model:ir.actions.act_window,name:sale.action_config_picking_policy
-msgid "Configure Picking Policy for Sales Order"
+#: field:sale.config.picking_policy,deli_orders:0
+msgid "Based on Delivery Orders"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.picking_policy,time_unit:0
+msgid "Main Working Time Unit"
msgstr ""
#. module: sale
@@ -182,9 +197,10 @@ msgid "Disc.(%)"
msgstr "Chiết khấu.(%)"
#. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_forceassignation0
-msgid "Force Assignation"
-msgstr "Buộc phải uỷ thác"
+#: view:sale.report:0
+#: field:sale.report,price_total:0
+msgid "Total Price"
+msgstr "Giá tổng"
#. module: sale
#: help:sale.make.invoice,grouped:0
@@ -192,6 +208,11 @@ msgid "Check the box to group the invoices for the same customers"
msgstr "Đánh dấu để nhóm hóa đơn theo khách hàng"
#. module: sale
+#: view:sale.order:0
+msgid "My Sale Orders"
+msgstr ""
+
+#. module: sale
#: selection:sale.order,invoice_quantity:0
msgid "Ordered Quantities"
msgstr "Số lượng chào hàng"
@@ -230,13 +251,24 @@ msgid ""
msgstr ""
#. module: sale
+#: field:sale.config.picking_policy,task_work:0
+msgid "Based on Tasks' Work"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
+msgid "Quotations and Sales"
+msgstr ""
+
+#. module: sale
#: model:ir.model,name:sale.model_sale_make_invoice
msgid "Sales Make Invoice"
msgstr "Làm hóa đơn bán hàng"
#. module: sale
-#: view:sale.order:0
-msgid "Recreate Packing"
+#: code:addons/sale/sale.py:330
+#, python-format
+msgid "Pricelist Warning!"
msgstr ""
#. module: sale
@@ -245,10 +277,10 @@ msgid "Discount (%)"
msgstr "Chiết khấu (%)"
#. module: sale
-#: help:res.company,security_lead:0
-msgid ""
-"This is the days added to what you promise to customers for security purpose"
-msgstr ""
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_quotation_for_sale
+msgid "My Quotations"
+msgstr "Báo giá của tôi"
#. module: sale
#: view:board.board:0
@@ -273,7 +305,22 @@ msgid "Shop Name"
msgstr "Tên cửa hàng"
#. module: sale
-#: code:addons/sale/sale.py:1014
+#: help:sale.order,order_policy:0
+msgid ""
+"The Invoice Policy is used to synchronise invoice and delivery operations.\n"
+" - The 'Pay before delivery' choice will first generate the invoice and "
+"then generate the picking order after the payment of this invoice.\n"
+" - The 'Deliver & Invoice on demand' will create the picking order directly "
+"and wait for the user to manually click on the 'Invoice' button to generate "
+"the draft invoice based on the sale order or the sale order lines.\n"
+" - The 'Invoice on order after delivery' choice will generate the draft "
+"invoice based on sales order after all picking lists have been finished.\n"
+" - The 'Invoice based on deliveries' choice is used to create an invoice "
+"during the picking process."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:1158
#, python-format
msgid "No Customer Defined !"
msgstr "Không có khách hàng được thiết lập!"
@@ -284,9 +331,12 @@ msgid "Sales in Exception"
msgstr "Bán hàng thuộc ngoại lệ"
#. module: sale
-#: view:sale.order:0
-msgid "Set to Draft"
-msgstr "Đặt thành dự thảo"
+#: code:addons/sale/sale.py:1145
+#: code:addons/sale/sale.py:1264
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:70
+#, python-format
+msgid "Configuration Error !"
+msgstr ""
#. module: sale
#: view:sale.order:0
@@ -294,22 +344,7 @@ msgid "Conditions"
msgstr "Điều kiện"
#. module: sale
-#: help:sale.order,order_policy:0
-msgid ""
-"The Shipping Policy is used to synchronise invoice and delivery operations.\n"
-" - The 'Pay Before delivery' choice will first generate the invoice and "
-"then generate the picking order after the payment of this invoice.\n"
-" - The 'Shipping & Manual Invoice' will create the picking order directly "
-"and wait for the user to manually click on the 'Invoice' button to generate "
-"the draft invoice.\n"
-" - The 'Invoice On Order After Delivery' choice will generate the draft "
-"invoice based on sales order after all picking lists have been finished.\n"
-" - The 'Invoice From The Picking' choice is used to create an invoice "
-"during the picking process."
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:939
+#: code:addons/sale/sale.py:1034
#, python-format
msgid ""
"There is no income category account defined in default Properties for "
@@ -319,9 +354,9 @@ msgstr ""
"cho loại sản phẩm hoặc chức vụ tài chính không được thiết lập!"
#. module: sale
-#: view:sale.installer:0
-msgid "Configure"
-msgstr "Cấu hình"
+#: selection:sale.report,month:0
+msgid "August"
+msgstr "Tháng Tám"
#. module: sale
#: constraint:stock.move:0
@@ -329,7 +364,7 @@ msgid "You try to assign a lot which is not from the same product"
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:620
+#: code:addons/sale/sale.py:655
#, python-format
msgid "invalid mode for test_state"
msgstr "hình thức không hợp lệ cho trạng thái kiểm tra"
@@ -340,7 +375,7 @@ msgid "June"
msgstr "Tháng Sáu"
#. module: sale
-#: code:addons/sale/sale.py:584
+#: code:addons/sale/sale.py:617
#, python-format
msgid "Could not cancel this sales order !"
msgstr "Không thể hủy hóa đơn bán hàng này"
@@ -361,8 +396,12 @@ msgid "October"
msgstr "Tháng Mười"
#. module: sale
+#: sql_constraint:stock.picking:0
+msgid "Reference must be unique per Company!"
+msgstr ""
+
+#. module: sale
#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_quotation_for_sale
#: view:sale.order:0
#: view:sale.report:0
msgid "Quotations"
@@ -374,11 +413,6 @@ msgid "Pricelist for current sales order."
msgstr "Bảng giá cho đơn hàng hiện tại"
#. module: sale
-#: selection:sale.config.picking_policy,step:0
-msgid "Delivery Order Only"
-msgstr "Chỉ yêu cầu giao hàng"
-
-#. module: sale
#: report:sale.order:0
msgid "TVA :"
msgstr "TVA :"
@@ -404,6 +438,7 @@ msgstr "Chức vụ tài chính"
#. module: sale
#: view:sale.order:0
#: view:sale.order.line:0
+#: field:sale.report,product_uom:0
msgid "UoM"
msgstr "Đơn vị đo"
@@ -428,13 +463,19 @@ msgstr ""
"\"Đang tiến hành\" hoặc \"Tiến hàng thủ công\"."
#. module: sale
-#: code:addons/sale/sale.py:971
+#: code:addons/sale/sale.py:1061
+#, python-format
+msgid "You cannot cancel a sale order line that has already been invoiced!"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:1066
#, python-format
msgid "You must first cancel stock moves attached to this sales order line."
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:1042
+#: code:addons/sale/sale.py:1134
#, python-format
msgid "(n/a)"
msgstr "(n/a)"
@@ -468,13 +509,35 @@ msgid "Notes"
msgstr "Ghi chú"
#. module: sale
+#: sql_constraint:res.company:0
+msgid "The company name must be unique !"
+msgstr ""
+
+#. module: sale
#: help:sale.order,partner_invoice_id:0
msgid "Invoice address for current sales order."
msgstr ""
#. module: sale
-#: view:sale.installer:0
-msgid "Enhance your core Sales Application with additional functionalities."
+#: view:sale.report:0
+msgid "Month-1"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered month of the sales order"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:504
+#, python-format
+msgid ""
+"You cannot group sales having different currencies for the same partner."
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,picking_policy:0
+msgid "Deliver each product when available"
msgstr ""
#. module: sale
@@ -494,21 +557,43 @@ msgid "Confirmation Date"
msgstr "Ngày xác nhận"
#. module: sale
+#: field:sale.order,incoterm:0
+msgid "Incoterm"
+msgstr "Incoterm"
+
+#. module: sale
#: field:sale.order.line,address_allotment_id:0
msgid "Allotment Partner"
msgstr "Đối tác phân phối"
#. module: sale
-#: sql_constraint:sale.order:0
-msgid "Order Reference must be unique !"
-msgstr ""
-
-#. module: sale
#: selection:sale.report,month:0
msgid "March"
msgstr "Tháng Ba"
#. module: sale
+#: constraint:stock.move:0
+msgid "You can not move products from or to a location of the type view."
+msgstr ""
+
+#. module: sale
+#: field:sale.config.picking_policy,sale_orders:0
+msgid "Based on Sales Orders"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,state:0
+msgid ""
+"Givwizard = self.browse(cr, uid, ids)[0]es the state of the quotation or "
+"sales order. \n"
+"The exception state is automatically set when a cancel operation occurs in "
+"the invoice validation (Invoice Exception) or in the picking list process "
+"(Shipping Exception). \n"
+"The 'Waiting Schedule' state is set when the invoice is confirmed but "
+"waiting for the scheduler to run on the order date."
+msgstr ""
+
+#. module: sale
#: help:sale.order,amount_total:0
msgid "The total amount."
msgstr "Tổng số tiền."
@@ -524,6 +609,11 @@ msgid "Invoice address :"
msgstr "Địa chỉ hóa đơn:"
#. module: sale
+#: field:sale.order.line,sequence:0
+msgid "Line Sequence"
+msgstr ""
+
+#. module: sale
#: model:process.transition,note:sale.process_transition_saleorderprocurement0
msgid ""
"For every sales order line, a procurement order is created to supply the "
@@ -570,11 +660,6 @@ msgid "Sales Order Line"
msgstr ""
#. module: sale
-#: view:sale.config.picking_policy:0
-msgid "Setup your sales workflow and default values."
-msgstr ""
-
-#. module: sale
#: field:sale.shop,warehouse_id:0
msgid "Warehouse"
msgstr "Kho hàng"
@@ -611,6 +696,11 @@ msgid "Creation Date"
msgstr "Ngày tạo"
#. module: sale
+#: model:ir.ui.menu,name:sale.menu_sales_configuration_misc
+msgid "Miscellaneous"
+msgstr ""
+
+#. module: sale
#: model:ir.actions.act_window,name:sale.action_order_line_tree3
msgid "Uninvoiced and Delivered Lines"
msgstr "Sản phẩm không xuất hóa đơn và đã giao hàng"
@@ -626,14 +716,19 @@ msgid "My Sales"
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:290
-#: code:addons/sale/sale.py:966
-#: code:addons/sale/sale.py:1165
+#: code:addons/sale/sale.py:295
+#: code:addons/sale/sale.py:1061
+#: code:addons/sale/sale.py:1290
#, python-format
msgid "Invalid action !"
msgstr "Hành động không hợp lệ!"
#. module: sale
+#: view:sale.order:0
+msgid "Extra Info"
+msgstr "Thông tin bổ sung"
+
+#. module: sale
#: field:sale.order,pricelist_id:0
#: field:sale.report,pricelist_id:0
#: field:sale.shop,pricelist_id:0
@@ -647,13 +742,21 @@ msgid "# of Qty"
msgstr ""
#. module: sale
+#: code:addons/sale/sale.py:1314
+#, python-format
+msgid "Hour"
+msgstr ""
+
+#. module: sale
#: view:sale.order:0
msgid "Order Date"
msgstr "Ngày đặt hàng"
#. module: sale
#: view:sale.order.line:0
+#: view:sale.report:0
#: field:sale.report,shipped:0
+#: field:sale.report,shipped_qty_1:0
msgid "Shipped"
msgstr ""
@@ -663,8 +766,8 @@ msgid "All Quotations"
msgstr "Tất cả báo giá"
#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Invoice On Order After Delivery"
+#: view:sale.config.picking_policy:0
+msgid "Options"
msgstr ""
#. module: sale
@@ -673,6 +776,20 @@ msgid "September"
msgstr "Tháng Chín"
#. module: sale
+#: code:addons/sale/sale.py:632
+#, python-format
+msgid "You cannot confirm a sale order which has no line."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:1246
+#, python-format
+msgid ""
+"You have to select a pricelist or a customer in the sales form !\n"
+"Please set one before choosing a product."
+msgstr ""
+
+#. module: sale
#: view:sale.report:0
#: field:sale.report,categ_id:0
msgid "Category of Product"
@@ -689,11 +806,6 @@ msgid "Stock Moves"
msgstr "Dịch chuyển hàng tồn kho"
#. module: sale
-#: view:sale.report:0
-msgid " Year "
-msgstr " Năm "
-
-#. module: sale
#: field:sale.order,state:0
#: field:sale.report,state:0
msgid "Order State"
@@ -711,7 +823,7 @@ msgid "Sales By Month"
msgstr "Doanh số theo tháng"
#. module: sale
-#: code:addons/sale/sale.py:970
+#: code:addons/sale/sale.py:1065
#, python-format
msgid "Could not cancel sales order line!"
msgstr ""
@@ -744,42 +856,19 @@ msgid ""
msgstr ""
#. module: sale
+#: field:sale.order,date_order:0
+msgid "Date"
+msgstr ""
+
+#. module: sale
#: view:sale.report:0
msgid "Extended Filters..."
msgstr "Bộ lọc mở rộng..."
#. module: sale
-#: model:ir.module.module,description:sale.module_meta_information
-msgid ""
-"\n"
-" The base module to manage quotations and sales orders.\n"
-"\n"
-" * Workflow with validation steps:\n"
-" - Quotation -> Sales order -> Invoice\n"
-" * Invoicing methods:\n"
-" - Invoice on order (before or after shipping)\n"
-" - Invoice on delivery\n"
-" - Invoice on timesheets\n"
-" - Advance invoice\n"
-" * Partners preferences (shipping, invoicing, incoterm, ...)\n"
-" * Products stocks and prices\n"
-" * Delivery methods:\n"
-" - all at once, multi-parcel\n"
-" - delivery costs\n"
-" * Dashboard for salesman that includes:\n"
-" * Your open quotations\n"
-" * Top 10 sales of the month\n"
-" * Cases statistics\n"
-" * Graph of sales by product\n"
-" * Graph of cases of the month\n"
-" "
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_shop
-#: view:sale.shop:0
-msgid "Sales Shop"
-msgstr ""
+#: selection:sale.order.line,state:0
+msgid "Exception"
+msgstr "Ngoại lệ"
#. module: sale
#: model:ir.model,name:sale.model_res_company
@@ -787,9 +876,10 @@ msgid "Companies"
msgstr "Các công ty"
#. module: sale
-#: selection:sale.report,month:0
-msgid "November"
-msgstr "Tháng Mười một"
+#: code:addons/sale/sale.py:1259
+#, python-format
+msgid "No valid pricelist line found ! :"
+msgstr ""
#. module: sale
#: view:sale.order:0
@@ -797,8 +887,8 @@ msgid "History"
msgstr "Lịch sử"
#. module: sale
-#: field:sale.config.picking_policy,picking_policy:0
-msgid "Picking Default Policy"
+#: selection:sale.order,order_policy:0
+msgid "Invoice on order after delivery"
msgstr ""
#. module: sale
@@ -821,13 +911,12 @@ msgid ""
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:966
-#, python-format
-msgid "You cannot cancel a sales order line that has already been invoiced !"
+#: help:res.company,security_lead:0
+msgid ""
+"This is the days added to what you promise to customers for security purpose"
msgstr ""
#. module: sale
-#: view:sale.order:0
#: view:sale.order.line:0
msgid "Qty"
msgstr "Số lượng"
@@ -838,6 +927,11 @@ msgid "References"
msgstr "Các tham chiếu"
#. module: sale
+#: view:sale.order.line:0
+msgid "My Sales Order Lines"
+msgstr ""
+
+#. module: sale
#: model:process.transition.action,name:sale.process_transition_action_cancel0
#: model:process.transition.action,name:sale.process_transition_action_cancel1
#: model:process.transition.action,name:sale.process_transition_action_cancel2
@@ -849,16 +943,11 @@ msgid "Cancel"
msgstr "Hủy"
#. module: sale
-#: field:sale.installer,sale_order_dates:0
-msgid "Sales Order Dates"
+#: sql_constraint:sale.order:0
+msgid "Order Reference must be unique per Company!"
msgstr ""
#. module: sale
-#: selection:sale.order.line,state:0
-msgid "Exception"
-msgstr "Ngoại lệ"
-
-#. module: sale
#: model:process.transition,name:sale.process_transition_invoice0
#: model:process.transition,name:sale.process_transition_invoiceafterdelivery0
#: model:process.transition.action,name:sale.process_transition_action_createinvoice0
@@ -868,19 +957,19 @@ msgid "Create Invoice"
msgstr "Tạo hóa đơn"
#. module: sale
-#: field:sale.installer,sale_margin:0
-msgid "Margins in Sales Orders"
+#: view:sale.order:0
+msgid "Total Tax Excluded"
msgstr ""
#. module: sale
-#: view:sale.order:0
-msgid "Total Tax Excluded"
+#: view:sale.order.line:0
+msgid "Order reference"
msgstr ""
#. module: sale
-#: view:sale.order:0
-msgid "Compute"
-msgstr "Tính"
+#: view:sale.open.invoice:0
+msgid "You invoice has been successfully created!"
+msgstr ""
#. module: sale
#: view:sale.report:0
@@ -899,23 +988,20 @@ msgid "Open Invoice"
msgstr ""
#. module: sale
-#: report:sale.order:0
-#: view:sale.order.line:0
-msgid "Price"
-msgstr "Giá"
+#: model:ir.actions.server,name:sale.ir_actions_server_edi_sale
+msgid "Auto-email confirmed sale orders"
+msgstr ""
#. module: sale
-#: model:ir.actions.act_window,name:sale.action_sale_installer
-#: view:sale.config.picking_policy:0
-#: view:sale.installer:0
-msgid "Sales Application Configuration"
+#: code:addons/sale/sale.py:413
+#, python-format
+msgid "There is no sales journal defined for this company: \"%s\" (id:%d)"
msgstr ""
#. module: sale
-#: view:sale.report:0
-#: field:sale.report,price_total:0
-msgid "Total Price"
-msgstr "Giá tổng"
+#: model:process.transition.action,name:sale.process_transition_action_forceassignation0
+msgid "Force Assignation"
+msgstr "Buộc phải uỷ thác"
#. module: sale
#: selection:sale.order.line,type:0
@@ -928,6 +1014,11 @@ msgid "Based on the shipped or on the ordered quantities."
msgstr ""
#. module: sale
+#: selection:sale.order,picking_policy:0
+msgid "Deliver all products at once"
+msgstr ""
+
+#. module: sale
#: field:sale.order,picking_ids:0
msgid "Related Picking"
msgstr ""
@@ -959,9 +1050,15 @@ msgid "Create Delivery Order"
msgstr ""
#. module: sale
-#: field:sale.installer,delivery:0
-msgid "Delivery Costs"
-msgstr "Chi phí giao hàng"
+#: code:addons/sale/sale.py:1290
+#, python-format
+msgid "Cannot delete a sales order line which is in state '%s'!"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Qty(UoS)"
+msgstr ""
#. module: sale
#: view:sale.order:0
@@ -975,13 +1072,13 @@ msgstr ""
#. module: sale
#: view:sale.report:0
-msgid "Sales by Product Category"
+msgid "Ordered date of the sales order"
msgstr ""
#. module: sale
-#: selection:sale.order,picking_policy:0
-msgid "Partial Delivery"
-msgstr "Giao hàng từng phần"
+#: view:sale.report:0
+msgid "Sales by Product Category"
+msgstr ""
#. module: sale
#: model:process.transition,name:sale.process_transition_confirmquotation0
@@ -989,9 +1086,10 @@ msgid "Confirm Quotation"
msgstr "Xác nhận báo giá"
#. module: sale
-#: help:sale.order,origin:0
-msgid "Reference of the document that generated this sales order request."
-msgstr ""
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:63
+#, python-format
+msgid "Error"
+msgstr "Lỗi"
#. module: sale
#: view:sale.order:0
@@ -1023,20 +1121,14 @@ msgid "Procurement Method"
msgstr "Phương pháp mua hàng"
#. module: sale
-#: view:sale.config.picking_policy:0
-#: view:sale.installer:0
-msgid "title"
-msgstr ""
-
-#. module: sale
#: model:process.node,name:sale.process_node_packinglist0
msgid "Pick List"
msgstr ""
#. module: sale
#: view:sale.order:0
-msgid "Order date"
-msgstr "Ngày đặt hàng"
+msgid "Set to Draft"
+msgstr "Đặt thành dự thảo"
#. module: sale
#: model:process.node,note:sale.process_node_packinglist0
@@ -1044,6 +1136,85 @@ msgid "Document of the move to the output or to the customer."
msgstr ""
#. module: sale
+#: model:email.template,body_text:sale.email_template_edi_sale
+msgid ""
+"\n"
+"Hello${object.partner_order_id.name and ' ' or "
+"''}${object.partner_order_id.name or ''},\n"
+"\n"
+"Here is your order confirmation for ${object.partner_id.name}:\n"
+" | Order number: *${object.name}*\n"
+" | Order total: *${object.amount_total} "
+"${object.pricelist_id.currency_id.name}*\n"
+" | Order date: ${object.date_order}\n"
+" % if object.origin:\n"
+" | Order reference: ${object.origin}\n"
+" % endif\n"
+" % if object.client_order_ref:\n"
+" | Your reference: ${object.client_order_ref}<br />\n"
+" % endif\n"
+" | Your contact: ${object.user_id.name} ${object.user_id.user_email "
+"and '<%s>'%(object.user_id.user_email) or ''}\n"
+"\n"
+"You can view the order confirmation, download it and even pay online using "
+"the following link:\n"
+" ${ctx.get('edi_web_url_view') or 'n/a'}\n"
+"\n"
+"% if object.order_policy in ('prepaid','manual') and "
+"object.company_id.paypal_account:\n"
+"<% \n"
+"comp_name = quote(object.company_id.name)\n"
+"order_name = quote(object.name)\n"
+"paypal_account = quote(object.company_id.paypal_account)\n"
+"order_amount = quote(str(object.amount_total))\n"
+"cur_name = quote(object.pricelist_id.currency_id.name)\n"
+"paypal_url = \"https://www.paypal.com/cgi-"
+"bin/webscr?cmd=_xclick&business=%s&item_name=%s%%20Order%%20%s&invoice=%s&amo"
+"unt=%s\" \\\n"
+" "
+"\"&currency_code=%s&button_subtype=services&no_note=1&bn=OpenERP_Order_PayNow"
+"_%s\" % \\\n"
+" "
+"(paypal_account,comp_name,order_name,order_name,order_amount,cur_name,cur_nam"
+"e)\n"
+"%>\n"
+"It is also possible to directly pay with Paypal:\n"
+" ${paypal_url}\n"
+"% endif\n"
+"\n"
+"If you have any question, do not hesitate to contact us.\n"
+"\n"
+"\n"
+"Thank you for choosing ${object.company_id.name}!\n"
+"\n"
+"\n"
+"--\n"
+"${object.user_id.name} ${object.user_id.user_email and "
+"'<%s>'%(object.user_id.user_email) or ''}\n"
+"${object.company_id.name}\n"
+"% if object.company_id.street:\n"
+"${object.company_id.street or ''}\n"
+"% endif\n"
+"% if object.company_id.street2:\n"
+"${object.company_id.street2}\n"
+"% endif\n"
+"% if object.company_id.city or object.company_id.zip:\n"
+"${object.company_id.zip or ''} ${object.company_id.city or ''}\n"
+"% endif\n"
+"% if object.company_id.country_id:\n"
+"${object.company_id.state_id and ('%s, ' % object.company_id.state_id.name) "
+"or ''} ${object.company_id.country_id.name or ''}\n"
+"% endif\n"
+"% if object.company_id.phone:\n"
+"Phone: ${object.company_id.phone}\n"
+"% endif\n"
+"% if object.company_id.website:\n"
+"${object.company_id.website or ''}\n"
+"% endif\n"
+" "
+msgstr ""
+
+#. module: sale
#: model:process.transition.action,name:sale.process_transition_action_validate0
msgid "Validate"
msgstr "Xác nhận"
@@ -1066,9 +1237,9 @@ msgid "Taxes"
msgstr "Thuế"
#. module: sale
-#: field:sale.order,order_policy:0
-msgid "Shipping Policy"
-msgstr "Chính sách vận chuyển"
+#: view:sale.order:0
+msgid "Sales Order ready to be invoiced"
+msgstr ""
#. module: sale
#: help:sale.order,create_date:0
@@ -1087,9 +1258,9 @@ msgid "Create Invoices"
msgstr "Tạo các hóa đơn"
#. module: sale
-#: view:sale.order:0
-msgid "Extra Info"
-msgstr "Thông tin bổ sung"
+#: view:sale.report:0
+msgid "Sales order created in current month"
+msgstr ""
#. module: sale
#: report:sale.order:0
@@ -1097,11 +1268,24 @@ msgid "Fax :"
msgstr "Fax :"
#. module: sale
+#: help:sale.order.line,type:0
+msgid ""
+"If 'on order', it triggers a procurement when the sale order is confirmed to "
+"create a task, purchase order or manufacturing order linked to this sale "
+"order line."
+msgstr ""
+
+#. module: sale
#: field:sale.advance.payment.inv,amount:0
msgid "Advance Amount"
msgstr ""
#. module: sale
+#: field:sale.config.picking_policy,charge_delivery:0
+msgid "Do you charge the delivery?"
+msgstr ""
+
+#. module: sale
#: selection:sale.order,invoice_quantity:0
msgid "Shipped Quantities"
msgstr "Số lượng vận chuyển"
@@ -1112,25 +1296,45 @@ msgid "Invoice Based on Sales Orders"
msgstr "Hóa đơn dựa trên đơn chào hàng"
#. module: sale
+#: code:addons/sale/sale.py:331
+#, python-format
+msgid ""
+"If you change the pricelist of this order (and eventually the currency), "
+"prices of existing order lines will not be updated."
+msgstr ""
+
+#. module: sale
#: model:ir.model,name:sale.model_stock_picking
msgid "Picking List"
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:387
-#: code:addons/sale/sale.py:920
-#: code:addons/sale/sale.py:938
+#: code:addons/sale/sale.py:412
+#: code:addons/sale/sale.py:503
+#: code:addons/sale/sale.py:632
+#: code:addons/sale/sale.py:1015
+#: code:addons/sale/sale.py:1033
#, python-format
msgid "Error !"
msgstr "Lỗi!"
#. module: sale
-#: code:addons/sale/sale.py:570
+#: code:addons/sale/sale.py:603
#, python-format
msgid "Could not cancel sales order !"
msgstr ""
#. module: sale
+#: view:sale.order:0
+msgid "Qty(UoM)"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered Year of the sales order"
+msgstr ""
+
+#. module: sale
#: selection:sale.report,month:0
msgid "July"
msgstr "Tháng Bảy"
@@ -1147,35 +1351,25 @@ msgid "Shipping Exception"
msgstr "Vận chuyển ngoại lệ"
#. module: sale
-#: field:sale.make.invoice,grouped:0
-msgid "Group the invoices"
-msgstr "Phân loại hóa đơn"
-
-#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Shipping & Manual Invoice"
-msgstr "Vận chuyển & Hóa đơn thủ công"
-
-#. module: sale
-#: code:addons/sale/sale.py:1051
+#: code:addons/sale/sale.py:1143
#, python-format
-msgid "Picking Information !"
+msgid "Picking Information ! : "
msgstr ""
#. module: sale
-#: view:sale.report:0
-#: field:sale.report,month:0
-msgid "Month"
-msgstr "Tháng"
+#: field:sale.make.invoice,grouped:0
+msgid "Group the invoices"
+msgstr "Phân loại hóa đơn"
#. module: sale
-#: model:ir.module.module,shortdesc:sale.module_meta_information
-msgid "Sales Management"
-msgstr "Quản lý bán hàng"
+#: field:sale.order,order_policy:0
+msgid "Invoice Policy"
+msgstr ""
#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Invoice From The Picking"
+#: model:ir.actions.act_window,name:sale.action_config_picking_policy
+#: view:sale.config.picking_policy:0
+msgid "Setup your Invoicing Method"
msgstr ""
#. module: sale
@@ -1185,28 +1379,31 @@ msgstr "Chờ kế toán viên xem xét"
#. module: sale
#: view:sale.report:0
-#: field:sale.report,uom_name:0
msgid "Reference UoM"
msgstr "ĐVĐ Tham chiếu"
#. module: sale
+#: view:sale.config.picking_policy:0
+msgid ""
+"This tool will help you to install the right module and configure the system "
+"according to the method you use to invoice your customers."
+msgstr ""
+
+#. module: sale
#: model:ir.model,name:sale.model_sale_order_line_make_invoice
msgid "Sale OrderLine Make_invoice"
msgstr ""
#. module: sale
-#: help:sale.config.picking_policy,step:0
-msgid ""
-"By default, OpenERP is able to manage complex routing and paths of products "
-"in your warehouse and partner locations. This will configure the most common "
-"and simple methods to deliver products to the customer in one or two "
-"operations by the worker."
-msgstr ""
+#: selection:sale.order,state:0
+#: selection:sale.report,state:0
+msgid "Invoice Exception"
+msgstr "Hóa đơn ngoại lệ"
#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_tree
-msgid "Old Quotations"
-msgstr "Báo giá cũ"
+#: model:process.node,note:sale.process_node_saleorder0
+msgid "Drives procurement and invoicing"
+msgstr ""
#. module: sale
#: field:sale.order,invoiced:0
@@ -1221,6 +1418,22 @@ msgid "Sales Analysis"
msgstr "Phân tích Bán hàng"
#. module: sale
+#: code:addons/sale/sale.py:1138
+#, python-format
+msgid ""
+"You selected a quantity of %d Units.\n"
+"But it's not compatible with the selected packaging.\n"
+"Here is a proposition of quantities according to the packaging:\n"
+"EAN: %s Quantity: %s Type of ul: %s"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Recreate Packing"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
#: field:sale.order.line,property_ids:0
msgid "Properties"
msgstr "Đặc tính"
@@ -1247,7 +1460,17 @@ msgid ""
msgstr ""
#. module: sale
-#: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
+#: view:sale.order.line:0
+msgid "Confirmed sale order lines, not yet delivered"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:473
+#, python-format
+msgid "Customer Invoices"
+msgstr ""
+
+#. module: sale
#: model:process.process,name:sale.process_process_salesprocess0
#: view:sale.order:0
#: view:sale.report:0
@@ -1269,18 +1492,13 @@ msgid "Done"
msgstr "Hoàn thành"
#. module: sale
-#: model:ir.model,name:sale.model_sale_installer
-msgid "sale.installer"
-msgstr "sale.installer"
-
-#. module: sale
#: model:process.node,name:sale.process_node_invoice0
#: model:process.node,name:sale.process_node_invoiceafterdelivery0
msgid "Invoice"
msgstr "Hóa đơn"
#. module: sale
-#: code:addons/sale/sale.py:1014
+#: code:addons/sale/sale.py:1158
#, python-format
msgid ""
"You have to select a customer in the sales form !\n"
@@ -1288,11 +1506,6 @@ msgid ""
msgstr ""
#. module: sale
-#: selection:sale.config.picking_policy,step:0
-msgid "Picking List & Delivery Order"
-msgstr ""
-
-#. module: sale
#: field:sale.order,origin:0
msgid "Source Document"
msgstr ""
@@ -1318,7 +1531,7 @@ msgid "The amount without tax."
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:571
+#: code:addons/sale/sale.py:604
#, python-format
msgid "You must first cancel all picking attached to this sales order."
msgstr ""
@@ -1329,9 +1542,15 @@ msgid "Sales Advance Payment Invoice"
msgstr ""
#. module: sale
-#: field:sale.order,incoterm:0
-msgid "Incoterm"
-msgstr "Incoterm"
+#: view:sale.report:0
+#: field:sale.report,month:0
+msgid "Month"
+msgstr "Tháng"
+
+#. module: sale
+#: model:email.template,subject:sale.email_template_edi_sale
+msgid "${object.company_id.name} Order (Ref ${object.name or 'n/a' })"
+msgstr ""
#. module: sale
#: view:sale.order.line:0
@@ -1342,11 +1561,6 @@ msgid "Product"
msgstr "Sản phẩm"
#. module: sale
-#: model:ir.ui.menu,name:sale.menu_invoiced
-msgid "Invoicing"
-msgstr "Hóa đơn"
-
-#. module: sale
#: model:process.transition.action,name:sale.process_transition_action_cancelassignation0
msgid "Cancel Assignation"
msgstr "Hủy phân phối"
@@ -1357,14 +1571,10 @@ msgid "sale.config.picking_policy"
msgstr "sale.config.picking_policy"
#. module: sale
-#: help:sale.order,state:0
-msgid ""
-"Gives the state of the quotation or sales order. \n"
-"The exception state is automatically set when a cancel operation occurs in "
-"the invoice validation (Invoice Exception) or in the picking list process "
-"(Shipping Exception). \n"
-"The 'Waiting Schedule' state is set when the invoice is confirmed but "
-"waiting for the scheduler to run on the date 'Ordered Date'."
+#: view:account.invoice.report:0
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_turnover_by_month
+msgid "Monthly Turnover"
msgstr ""
#. module: sale
@@ -1383,7 +1593,6 @@ msgid "Product UoS"
msgstr "Đơn vị bán của sản phẩm"
#. module: sale
-#: selection:sale.order,state:0
#: selection:sale.report,state:0
msgid "Manual In Progress"
msgstr "Đang thực hiện thủ công"
@@ -1404,7 +1613,8 @@ msgid "Order"
msgstr "Đơn đặt hàng"
#. module: sale
-#: code:addons/sale/sale.py:921
+#: code:addons/sale/sale.py:1016
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:71
#, python-format
msgid "There is no income account defined for this product: \"%s\" (id:%d)"
msgstr ""
@@ -1424,7 +1634,7 @@ msgid ""
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:1116
+#: code:addons/sale/sale.py:1238
#, python-format
msgid ""
"You plan to sell %.2f %s but you only have %.2f %s available !\n"
@@ -1453,10 +1663,10 @@ msgid "Total"
msgstr "Tổng"
#. module: sale
-#: code:addons/sale/sale.py:388
-#, python-format
-msgid "There is no sales journal defined for this company: \"%s\" (id:%d)"
-msgstr ""
+#: report:sale.order:0
+#: view:sale.order.line:0
+msgid "Price"
+msgstr "Giá"
#. module: sale
#: model:process.transition,note:sale.process_transition_deliver0
@@ -1467,9 +1677,14 @@ msgid ""
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:1165
-#, python-format
-msgid "Cannot delete a sales order line which is %s !"
+#: selection:sale.order,order_policy:0
+msgid "Pay before delivery"
+msgstr ""
+
+#. module: sale
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.open_board_sales
+msgid "Sales Dashboard"
msgstr ""
#. module: sale
@@ -1481,6 +1696,7 @@ msgstr ""
#. module: sale
#: view:sale.order:0
+#: selection:sale.order,state:0
#: view:sale.order.line:0
msgid "To Invoice"
msgstr ""
@@ -1491,6 +1707,11 @@ msgid "Date on which sales order is confirmed."
msgstr ""
#. module: sale
+#: field:sale.order,project_id:0
+msgid "Contract/Analytic Account"
+msgstr ""
+
+#. module: sale
#: field:sale.order,company_id:0
#: field:sale.order.line,company_id:0
#: view:sale.report:0
@@ -1510,22 +1731,17 @@ msgid "The amount to be invoiced in advance."
msgstr ""
#. module: sale
-#: selection:sale.order,state:0
-#: selection:sale.report,state:0
-msgid "Invoice Exception"
-msgstr "Hóa đơn ngoại lệ"
-
-#. module: sale
-#: help:sale.order,picking_ids:0
+#: code:addons/sale/sale.py:1256
+#, python-format
msgid ""
-"This is a list of picking that has been generated for this sales order."
+"Couldn't find a pricelist line matching this product and quantity.\n"
+"You have to change either the product, the quantity or the pricelist."
msgstr ""
#. module: sale
-#: help:sale.installer,sale_margin:0
+#: help:sale.order,picking_ids:0
msgid ""
-"Gives the margin of profitability by calculating the difference between Unit "
-"Price and Cost Price."
+"This is a list of picking that has been generated for this sales order."
msgstr ""
#. module: sale
@@ -1547,6 +1763,11 @@ msgid "Cancelled"
msgstr "Hủy"
#. module: sale
+#: view:sale.order.line:0
+msgid "Sales Order Lines related to a Sales Order of mine"
+msgstr ""
+
+#. module: sale
#: model:ir.actions.act_window,name:sale.action_shop_form
#: model:ir.ui.menu,name:sale.menu_action_shop_form
#: field:sale.order,shop_id:0
@@ -1556,17 +1777,12 @@ msgid "Shop"
msgstr "Cửa hàng"
#. module: sale
-#: view:sale.report:0
-msgid " Month "
-msgstr " Tháng "
-
-#. module: sale
#: field:sale.report,date_confirm:0
msgid "Date Confirm"
msgstr "Ngày xác nhận"
#. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:111
+#: code:addons/sale/wizard/sale_line_invoice.py:113
#, python-format
msgid "Warning"
msgstr "Cảnh báo"
@@ -1578,17 +1794,6 @@ msgid "Sales by Month"
msgstr "Doanh thu theo tháng"
#. module: sale
-#: code:addons/sale/sale.py:1045
-#, python-format
-msgid ""
-"You selected a quantity of %d Units.\n"
-"But it's not compatible with the selected packaging.\n"
-"Here is a proposition of quantities according to the packaging:\n"
-"\n"
-"EAN: %s Quantity: %s Type of ul: %s"
-msgstr ""
-
-#. module: sale
#: model:ir.model,name:sale.model_sale_order
#: model:process.node,name:sale.process_node_order0
#: model:process.node,name:sale.process_node_saleorder0
@@ -1604,6 +1809,11 @@ msgid "Quantity (UoS)"
msgstr "Số lượng (Đơn vị bán)"
#. module: sale
+#: view:sale.order.line:0
+msgid "Sale Order Lines that are in 'done' state"
+msgstr ""
+
+#. module: sale
#: model:process.transition,note:sale.process_transition_packing0
msgid ""
"The Pick List form is created as soon as the sales order is confirmed, in "
@@ -1618,6 +1828,11 @@ msgid "Confirmed"
msgstr "Đã xác nhận"
#. module: sale
+#: field:sale.config.picking_policy,order_policy:0
+msgid "Main Method Based On"
+msgstr ""
+
+#. module: sale
#: model:process.transition.action,name:sale.process_transition_action_confirm0
msgid "Confirm"
msgstr "Xác nhận"
@@ -1640,6 +1855,7 @@ msgid "Invoice Lines"
msgstr "Sản phẩm lập hóa đơn"
#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_product_tree
#: view:sale.order:0
#: view:sale.order.line:0
msgid "Sales Order Lines"
@@ -1656,30 +1872,18 @@ msgid "Configuration"
msgstr "Cấu hình"
#. module: sale
-#: selection:sale.order,picking_policy:0
-msgid "Complete Delivery"
-msgstr "Hoàn tất giao hàng"
+#: code:addons/sale/edi/sale_order.py:146
+#, python-format
+msgid "EDI Pricelist (%s)"
+msgstr ""
#. module: sale
#: view:sale.report:0
-msgid " Month-1 "
-msgstr " Tháng-1 "
-
-#. module: sale
-#: help:sale.config.picking_policy,picking_policy:0
-msgid ""
-"The Shipping Policy is used to configure per order if you want to deliver as "
-"soon as possible when one product is available or you wait that all products "
-"are available.."
+msgid "Sales order created in current year"
msgstr ""
#. module: sale
-#: selection:sale.report,month:0
-msgid "August"
-msgstr "Tháng Tám"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:111
+#: code:addons/sale/wizard/sale_line_invoice.py:113
#, python-format
msgid ""
"Invoice cannot be created for this Sales Order Line due to one of the "
@@ -1689,6 +1893,11 @@ msgid ""
msgstr ""
#. module: sale
+#: view:sale.order.line:0
+msgid "Sale order lines done"
+msgstr ""
+
+#. module: sale
#: field:sale.order.line,th_weight:0
msgid "Weight"
msgstr "Khối lượng"
@@ -1707,7 +1916,6 @@ msgstr "Tháng Mười hai"
#. module: sale
#: field:sale.config.picking_policy,config_logo:0
-#: field:sale.installer,config_logo:0
msgid "Image"
msgstr "Hình ảnh"
@@ -1737,9 +1945,9 @@ msgid "Salesman"
msgstr "Nhân viên bán hàng"
#. module: sale
-#: model:process.node,note:sale.process_node_saleorder0
-msgid "Drives procurement and invoicing"
-msgstr ""
+#: model:ir.actions.act_window,name:sale.action_order_tree
+msgid "Old Quotations"
+msgstr "Báo giá cũ"
#. module: sale
#: field:sale.order,amount_untaxed:0
@@ -1747,7 +1955,7 @@ msgid "Untaxed Amount"
msgstr "Số tiền không chịu thuế"
#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:163
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:170
#: model:ir.actions.act_window,name:sale.action_view_sale_advance_payment_inv
#: view:sale.advance.payment.inv:0
#: view:sale.order:0
@@ -1756,7 +1964,7 @@ msgid "Advance Invoice"
msgstr "Hóa đơn ứng trước"
#. module: sale
-#: code:addons/sale/sale.py:591
+#: code:addons/sale/sale.py:624
#, python-format
msgid "The sales order '%s' has been cancelled."
msgstr ""
@@ -1791,20 +1999,20 @@ msgid "Packings"
msgstr ""
#. module: sale
-#: field:sale.config.picking_policy,progress:0
-#: field:sale.installer,progress:0
-msgid "Configuration Progress"
-msgstr "Tiến trình Cấu hình"
+#: view:sale.order.line:0
+msgid "Sale Order Lines ready to be invoiced"
+msgstr ""
#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_product_tree
-msgid "Product sales"
-msgstr "Bán sản phẩm"
+#: view:sale.report:0
+msgid "Sales order created in last month"
+msgstr ""
#. module: sale
-#: field:sale.order,date_order:0
-msgid "Ordered Date"
-msgstr "Ngày Đặt hàng"
+#: model:ir.actions.act_window,name:sale.action_email_templates
+#: model:ir.ui.menu,name:sale.menu_email_templates
+msgid "Email Templates"
+msgstr ""
#. module: sale
#: model:ir.actions.act_window,name:sale.action_order_form
@@ -1814,14 +2022,15 @@ msgid "Sales Orders"
msgstr "Đơn chào hàng"
#. module: sale
-#: selection:sale.config.picking_policy,picking_policy:0
-msgid "Direct Delivery"
-msgstr "Giao hàng trực tiếp"
+#: model:ir.model,name:sale.model_sale_shop
+#: view:sale.shop:0
+msgid "Sales Shop"
+msgstr ""
#. module: sale
-#: field:sale.installer,sale_journal:0
-msgid "Invoicing journals"
-msgstr ""
+#: selection:sale.report,month:0
+msgid "November"
+msgstr "Tháng Mười một"
#. module: sale
#: field:sale.advance.payment.inv,product_id:0
@@ -1829,18 +2038,12 @@ msgid "Advance Product"
msgstr ""
#. module: sale
-#: view:sale.report:0
-#: field:sale.report,shipped_qty_1:0
-msgid "Shipped Qty"
-msgstr ""
-
-#. module: sale
-#: view:sale.open.invoice:0
-msgid "You invoice has been successfully created!"
-msgstr ""
+#: view:sale.order:0
+msgid "Compute"
+msgstr "Tính"
#. module: sale
-#: code:addons/sale/sale.py:585
+#: code:addons/sale/sale.py:618
#, python-format
msgid "You must first cancel all invoices attached to this sales order."
msgstr ""
@@ -1851,33 +2054,27 @@ msgid "January"
msgstr "Tháng Một"
#. module: sale
-#: view:sale.installer:0
-msgid "Configure Your Sales Management Application"
-msgstr ""
-
-#. module: sale
#: model:ir.actions.act_window,name:sale.action_order_tree4
msgid "Sales Order in Progress"
msgstr "Đơn chào hàng đang được thực hiện"
#. module: sale
-#: field:sale.installer,sale_layout:0
-msgid "Sales Order Layout Improvement"
+#: help:sale.order,origin:0
+msgid "Reference of the document that generated this sales order request."
msgstr ""
#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:63
-#, python-format
-msgid "Error"
-msgstr "Lỗi"
-
-#. module: sale
#: view:sale.report:0
#: field:sale.report,delay:0
msgid "Commitment Delay"
msgstr ""
#. module: sale
+#: selection:sale.order,order_policy:0
+msgid "Deliver & invoice on demand"
+msgstr ""
+
+#. module: sale
#: model:process.node,note:sale.process_node_saleprocurement0
msgid ""
"One Procurement order for each sales order line and for each of the "
@@ -1900,13 +2097,12 @@ msgid "Confirmed sales order to invoice."
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:290
-#, python-format
-msgid "Cannot delete Sales Order(s) which are already confirmed !"
+#: view:sale.order:0
+msgid "Sales Order that haven't yet been confirmed"
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:316
+#: code:addons/sale/sale.py:322
#, python-format
msgid "The sales order '%s' has been set in draft state."
msgstr ""
@@ -1917,37 +2113,27 @@ msgid "from stock"
msgstr "theo nhu cầu dự báo"
#. module: sale
-#: field:sale.config.picking_policy,order_policy:0
-msgid "Shipping Default Policy"
-msgstr "Chính sách vận chuyển mặc định"
-
-#. module: sale
#: view:sale.open.invoice:0
msgid "Close"
msgstr "Đóng"
#. module: sale
+#: code:addons/sale/sale.py:1248
+#, python-format
+msgid "No Pricelist ! : "
+msgstr ""
+
+#. module: sale
#: field:sale.order,shipped:0
msgid "Delivered"
msgstr "Đã giao hàng"
#. module: sale
-#: code:addons/sale/sale.py:1115
-#, python-format
-msgid "Not enough stock !"
-msgstr ""
-
-#. module: sale
#: constraint:stock.move:0
msgid "You must assign a production lot for this product"
msgstr ""
#. module: sale
-#: field:sale.order.line,sequence:0
-msgid "Layout Sequence"
-msgstr ""
-
-#. module: sale
#: model:ir.actions.act_window,help:sale.action_shop_form
msgid ""
"If you have more than one shop reselling your company products, you can "
@@ -1974,11 +2160,6 @@ msgid "May"
msgstr "Tháng Năm"
#. module: sale
-#: help:sale.installer,sale_order_dates:0
-msgid "Adds commitment, requested and effective dates on Sales Orders."
-msgstr ""
-
-#. module: sale
#: view:sale.order:0
#: field:sale.order,partner_id:0
#: field:sale.order.line,order_partner_id:0
@@ -1986,23 +2167,11 @@ msgid "Customer"
msgstr "Khách hàng"
#. module: sale
-#: model:product.template,name:sale.advance_product_0_product_template
-msgid "Advance"
-msgstr ""
-
-#. module: sale
#: selection:sale.report,month:0
msgid "February"
msgstr "Tháng Hai"
#. module: sale
-#: help:sale.installer,sale_journal:0
-msgid ""
-"Allows you to group and invoice your delivery orders according to different "
-"invoicing types: daily, weekly, etc."
-msgstr ""
-
-#. module: sale
#: selection:sale.report,month:0
msgid "April"
msgstr "Tháng Tư"
@@ -2013,11 +2182,6 @@ msgid "Accounting"
msgstr "Kế toán"
#. module: sale
-#: field:sale.config.picking_policy,step:0
-msgid "Steps To Deliver a Sales Order"
-msgstr ""
-
-#. module: sale
#: view:sale.order:0
#: view:sale.order.line:0
msgid "Search Sales Order"
@@ -2029,18 +2193,18 @@ msgid "Sales Order Requisition"
msgstr ""
#. module: sale
+#: code:addons/sale/sale.py:1242
+#, python-format
+msgid "Not enough stock ! : "
+msgstr ""
+
+#. module: sale
#: report:sale.order:0
#: field:sale.order,payment_term:0
msgid "Payment Term"
msgstr "Điều khoản thanh toán"
#. module: sale
-#: help:sale.installer,sale_layout:0
-msgid ""
-"Provides some features to improve the layout of the Sales Order reports."
-msgstr ""
-
-#. module: sale
#: model:ir.actions.act_window,help:sale.action_order_report_all
msgid ""
"This report performs analysis on your quotations and sales orders. Analysis "
@@ -2072,6 +2236,9 @@ msgstr "Năm"
msgid "Invoice Based on Deliveries"
msgstr "Hóa đơn dựa theo việc giao hàng"
+#~ msgid "Partial Delivery"
+#~ msgstr "Giao hàng từng phần"
+
#~ msgid "Automatic Declaration"
#~ msgstr "Khai báo tự động"
@@ -2161,6 +2328,9 @@ msgstr "Hóa đơn dựa theo việc giao hàng"
#~ msgid "Invoice after delivery"
#~ msgstr "Hóa đơn sau giao hàng"
+#~ msgid "Shipping Policy"
+#~ msgstr "Chính sách vận chuyển"
+
#~ msgid "Origin"
#~ msgstr "Xuất xứ"
@@ -2170,6 +2340,9 @@ msgstr "Hóa đơn dựa theo việc giao hàng"
#~ msgid "Reference"
#~ msgstr "Tham chiếu"
+#~ msgid "All at Once"
+#~ msgstr "Toàn bộ một lần"
+
#~ msgid "One procurement for each product."
#~ msgstr "Một thu mua hàng cho mỗi sản phẩm."
@@ -2219,6 +2392,9 @@ msgstr "Hóa đơn dựa theo việc giao hàng"
#~ msgid "Related Packing"
#~ msgstr "Bao bì đóng gói liên quan"
+#~ msgid "Complete Delivery"
+#~ msgstr "Hoàn tất giao hàng"
+
#~ msgid "Customer Ref"
#~ msgstr "Số tham chiếu khách hàng"
@@ -2228,19 +2404,22 @@ msgstr "Hóa đơn dựa theo việc giao hàng"
#~ msgid "Draft Invoice"
#~ msgstr "Hóa đơn dự thảo"
-#~ msgid "My Quotations"
-#~ msgstr "Báo giá của tôi"
-
#~ msgid "Packing Default Policy"
#~ msgstr "Chính sách đóng gói mặc định"
#~ msgid "Manages the delivery and invoicing progress"
#~ msgstr "Quản lý tiến độ giao hàng và lập hóa đơn"
+#~ msgid "Shipping Default Policy"
+#~ msgstr "Chính sách vận chuyển mặc định"
+
#, python-format
#~ msgid "Could not cancel sale order !"
#~ msgstr "Không thể hủy đơn chào hàng!"
+#~ msgid "Sales Management"
+#~ msgstr "Quản lý bán hàng"
+
#~ msgid "Order Ref"
#~ msgstr "Số tham chiếu đặt hàng"
@@ -2273,6 +2452,9 @@ msgstr "Hóa đơn dựa theo việc giao hàng"
#~ msgid "Procurement Corrected"
#~ msgstr "Thu mua hàng được điều chỉnh đúng"
+#~ msgid "Shipping & Manual Invoice"
+#~ msgstr "Vận chuyển & Hóa đơn thủ công"
+
#~ msgid "Sale Procurement"
#~ msgstr "Bán hang Thu mua hàng"
@@ -2285,6 +2467,9 @@ msgstr "Hóa đơn dựa theo việc giao hàng"
#~ msgid "Packing Policy"
#~ msgstr "Chính sách đóng gói bao bì"
+#~ msgid "Product sales"
+#~ msgstr "Bán sản phẩm"
+
#~ msgid "Our Salesman"
#~ msgstr "Nhân viên bán hàng của chúng tôi"
@@ -2297,6 +2482,9 @@ msgstr "Hóa đơn dựa theo việc giao hàng"
#~ msgid "Sale Pricelists"
#~ msgstr "Bảng giá bán hàng"
+#~ msgid "Direct Delivery"
+#~ msgstr "Giao hàng trực tiếp"
+
#, python-format
#~ msgid ""
#~ "You cannot make an advance on a sale order that is defined as 'Automatic "
@@ -2305,6 +2493,9 @@ msgstr "Hóa đơn dựa theo việc giao hàng"
#~ "Bạn không thể thực hiện ứng trước đối với một đơn chào hàng đã được định "
#~ "nghĩa là 'Lập hóa đơn tự động sau khi giao hàng'."
+#~ msgid "Delivery Order Only"
+#~ msgstr "Chỉ yêu cầu giao hàng"
+
#~ msgid "Sales order lines"
#~ msgstr "Sản phẩm đơn chào hàng"
@@ -2439,6 +2630,9 @@ msgstr "Hóa đơn dựa theo việc giao hàng"
#~ msgid "Related invoices"
#~ msgstr "Các hóa đơn liên quan"
+#~ msgid "Payment Before Delivery"
+#~ msgstr "Thanh toán trước giao hàng"
+
#~ msgid ""
#~ "This is the list of invoices that have been generated for this sale order. "
#~ "The same sale order may have been invoiced in several times (by line for "
@@ -2460,3 +2654,36 @@ msgstr "Hóa đơn dựa theo việc giao hàng"
#~ msgid "Error: Invalid ean code"
#~ msgstr "Lỗi: mã EAN không hợp lệ"
+
+#~ msgid " Year "
+#~ msgstr " Năm "
+
+#~ msgid " Month "
+#~ msgstr " Tháng "
+
+#~ msgid " Month-1 "
+#~ msgstr " Tháng-1 "
+
+#~ msgid "Order date"
+#~ msgstr "Ngày đặt hàng"
+
+#~ msgid "Invoicing"
+#~ msgstr "Hóa đơn"
+
+#~ msgid "Allows you to compute delivery costs on your quotations."
+#~ msgstr "Cho phép bạn tính toán chi phí giao hàng trên Đơn chào hàng của bạn"
+
+#~ msgid "Configure"
+#~ msgstr "Cấu hình"
+
+#~ msgid "Delivery Costs"
+#~ msgstr "Chi phí giao hàng"
+
+#~ msgid "sale.installer"
+#~ msgstr "sale.installer"
+
+#~ msgid "Ordered Date"
+#~ msgstr "Ngày Đặt hàng"
+
+#~ msgid "Configuration Progress"
+#~ msgstr "Tiến trình Cấu hình"
diff --git a/addons/sale/i18n/zh_CN.po b/addons/sale/i18n/zh_CN.po
index afe17921e8a..cbb77135e1d 100644
--- a/addons/sale/i18n/zh_CN.po
+++ b/addons/sale/i18n/zh_CN.po
@@ -6,15 +6,27 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2011-01-11 11:16+0000\n"
+"POT-Creation-Date: 2011-12-22 18:43+0000\n"
"PO-Revision-Date: 2011-01-28 02:08+0000\n"
"Last-Translator: Wei \"oldrev\" Li <oldrev@gmail.com>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-05 05:17+0000\n"
-"X-Generator: Launchpad (build 14231)\n"
+"X-Launchpad-Export-Date: 2011-12-23 06:47+0000\n"
+"X-Generator: Launchpad (build 14560)\n"
+
+#. module: sale
+#: field:sale.config.picking_policy,timesheet:0
+msgid "Based on Timesheet"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid ""
+"Sale Order Lines that are confirmed, done or in exception state and haven't "
+"yet been invoiced"
+msgstr ""
#. module: sale
#: view:board.board:0
@@ -23,11 +35,6 @@ msgid "Sales by Salesman in last 90 days"
msgstr "销售员最近 90 天销售情况"
#. module: sale
-#: help:sale.installer,delivery:0
-msgid "Allows you to compute delivery costs on your quotations."
-msgstr "允许你计算和报价相关的运费"
-
-#. module: sale
#: help:sale.order,picking_policy:0
msgid ""
"If you don't have enough stock available to deliver all at once, do you "
@@ -35,6 +42,11 @@ msgid ""
msgstr "如果库存不够一次全部交货,你是否接受部分交货?"
#. module: sale
+#: view:sale.order:0
+msgid "UoS"
+msgstr ""
+
+#. module: sale
#: help:sale.order,partner_shipping_id:0
msgid "Shipping address for current sales order."
msgstr "当前销售订单的送货地址。"
@@ -58,22 +70,12 @@ msgid "Cancel Order"
msgstr "取消订单"
#. module: sale
-#: view:sale.config.picking_policy:0
-msgid "Configure Sales Order Logistics"
-msgstr "设置销售单物流信息"
-
-#. module: sale
-#: code:addons/sale/sale.py:603
+#: code:addons/sale/sale.py:638
#, python-format
msgid "The quotation '%s' has been converted to a sales order."
msgstr "报价单“%s”将转换为销售单。"
#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Payment Before Delivery"
-msgstr "款到发货"
-
-#. module: sale
#: code:addons/sale/wizard/sale_make_invoice.py:42
#, python-format
msgid "Warning !"
@@ -90,12 +92,6 @@ msgid "Drives procurement orders for every sales order line."
msgstr "由销售订单明细产生的采购订单。"
#. module: sale
-#: selection:sale.config.picking_policy,picking_policy:0
-msgid "All at Once"
-msgstr "所有一起"
-
-#. module: sale
-#: field:sale.order,project_id:0
#: view:sale.report:0
#: field:sale.report,analytic_account_id:0
#: field:sale.shop,project_id:0
@@ -111,6 +107,15 @@ msgid ""
msgstr "要开票的销售订单明细列表。你可以按照销售订单明细分别开票。如果按发货单开票,或者按销售订单统一开票的话,你不需要这个列表。"
#. module: sale
+#: code:addons/sale/sale.py:295
+#, python-format
+msgid ""
+"In order to delete a confirmed sale order, you must cancel it before ! To "
+"cancel a sale order, you must first cancel related picking or delivery "
+"orders."
+msgstr ""
+
+#. module: sale
#: model:process.node,name:sale.process_node_saleprocurement0
msgid "Procurement Order"
msgstr "采购订单"
@@ -122,6 +127,11 @@ msgid "Partner"
msgstr "合作伙伴"
#. module: sale
+#: selection:sale.order,order_policy:0
+msgid "Invoice based on deliveries"
+msgstr ""
+
+#. module: sale
#: view:sale.order:0
msgid "Order Line"
msgstr "采购订单明细"
@@ -159,9 +169,14 @@ msgid "Default Payment Term"
msgstr "默认付款条件"
#. module: sale
-#: model:ir.actions.act_window,name:sale.action_config_picking_policy
-msgid "Configure Picking Policy for Sales Order"
-msgstr "设置销售订单的提货政策"
+#: field:sale.config.picking_policy,deli_orders:0
+msgid "Based on Delivery Orders"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.picking_policy,time_unit:0
+msgid "Main Working Time Unit"
+msgstr ""
#. module: sale
#: view:sale.order:0
@@ -169,7 +184,7 @@ msgstr "设置销售订单的提货政策"
#: field:sale.order.line,state:0
#: view:sale.report:0
msgid "State"
-msgstr "州"
+msgstr "状态"
#. module: sale
#: report:sale.order:0
@@ -177,9 +192,10 @@ msgid "Disc.(%)"
msgstr "折扣(%)"
#. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_forceassignation0
-msgid "Force Assignation"
-msgstr "强制指定"
+#: view:sale.report:0
+#: field:sale.report,price_total:0
+msgid "Total Price"
+msgstr "价格合计"
#. module: sale
#: help:sale.make.invoice,grouped:0
@@ -187,6 +203,11 @@ msgid "Check the box to group the invoices for the same customers"
msgstr "选择此项,发票将会按客户分组。"
#. module: sale
+#: view:sale.order:0
+msgid "My Sale Orders"
+msgstr ""
+
+#. module: sale
#: selection:sale.order,invoice_quantity:0
msgid "Ordered Quantities"
msgstr "已订数量"
@@ -225,14 +246,25 @@ msgid ""
msgstr "如果运送方式是‘提货后开票’或者‘发货后开票’, 系统将会自己创建发票。"
#. module: sale
+#: field:sale.config.picking_policy,task_work:0
+msgid "Based on Tasks' Work"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
+msgid "Quotations and Sales"
+msgstr ""
+
+#. module: sale
#: model:ir.model,name:sale.model_sale_make_invoice
msgid "Sales Make Invoice"
msgstr "销售生成发票"
#. module: sale
-#: view:sale.order:0
-msgid "Recreate Packing"
-msgstr "重建装箱单"
+#: code:addons/sale/sale.py:330
+#, python-format
+msgid "Pricelist Warning!"
+msgstr ""
#. module: sale
#: field:sale.order.line,discount:0
@@ -240,10 +272,10 @@ msgid "Discount (%)"
msgstr "折扣(%)"
#. module: sale
-#: help:res.company,security_lead:0
-msgid ""
-"This is the days added to what you promise to customers for security purpose"
-msgstr "基于安全的目的在承诺客户的时间的基础上需要增加的天数"
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_quotation_for_sale
+msgid "My Quotations"
+msgstr "我的报价单"
#. module: sale
#: view:board.board:0
@@ -268,7 +300,22 @@ msgid "Shop Name"
msgstr "商店名"
#. module: sale
-#: code:addons/sale/sale.py:1014
+#: help:sale.order,order_policy:0
+msgid ""
+"The Invoice Policy is used to synchronise invoice and delivery operations.\n"
+" - The 'Pay before delivery' choice will first generate the invoice and "
+"then generate the picking order after the payment of this invoice.\n"
+" - The 'Deliver & Invoice on demand' will create the picking order directly "
+"and wait for the user to manually click on the 'Invoice' button to generate "
+"the draft invoice based on the sale order or the sale order lines.\n"
+" - The 'Invoice on order after delivery' choice will generate the draft "
+"invoice based on sales order after all picking lists have been finished.\n"
+" - The 'Invoice based on deliveries' choice is used to create an invoice "
+"during the picking process."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:1158
#, python-format
msgid "No Customer Defined !"
msgstr "客户没有定义 !"
@@ -279,9 +326,12 @@ msgid "Sales in Exception"
msgstr "销售异常"
#. module: sale
-#: view:sale.order:0
-msgid "Set to Draft"
-msgstr "设为报价单"
+#: code:addons/sale/sale.py:1145
+#: code:addons/sale/sale.py:1264
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:70
+#, python-format
+msgid "Configuration Error !"
+msgstr ""
#. module: sale
#: view:sale.order:0
@@ -289,27 +339,7 @@ msgid "Conditions"
msgstr "条款"
#. module: sale
-#: help:sale.order,order_policy:0
-msgid ""
-"The Shipping Policy is used to synchronise invoice and delivery operations.\n"
-" - The 'Pay Before delivery' choice will first generate the invoice and "
-"then generate the picking order after the payment of this invoice.\n"
-" - The 'Shipping & Manual Invoice' will create the picking order directly "
-"and wait for the user to manually click on the 'Invoice' button to generate "
-"the draft invoice.\n"
-" - The 'Invoice On Order After Delivery' choice will generate the draft "
-"invoice based on sales order after all picking lists have been finished.\n"
-" - The 'Invoice From The Picking' choice is used to create an invoice "
-"during the picking process."
-msgstr ""
-"运送方式是用于同步发票和发货操作的。\n"
-" - ‘款到发货’选项是先生成发票,然后当收到发票的付款后生成装箱单。\n"
-" - ‘运送并且手工开票’是直接创建装箱单,并且等待用户手工点击‘开票’按钮生成发票草稿。\n"
-" - ‘先发货后开票’选项是在所有装箱单完成之后根据销售订单生成发票草稿。\n"
-" - ‘按装箱单开票’选项是在分拣的过程中生成发票。"
-
-#. module: sale
-#: code:addons/sale/sale.py:939
+#: code:addons/sale/sale.py:1034
#, python-format
msgid ""
"There is no income category account defined in default Properties for "
@@ -317,9 +347,9 @@ msgid ""
msgstr "没有为产品类别定义缺省的收入类科目,或者没有定义财务结构 !"
#. module: sale
-#: view:sale.installer:0
-msgid "Configure"
-msgstr "设置"
+#: selection:sale.report,month:0
+msgid "August"
+msgstr "8月"
#. module: sale
#: constraint:stock.move:0
@@ -327,7 +357,7 @@ msgid "You try to assign a lot which is not from the same product"
msgstr "你尝试分配一个来自其它产品的批次"
#. module: sale
-#: code:addons/sale/sale.py:620
+#: code:addons/sale/sale.py:655
#, python-format
msgid "invalid mode for test_state"
msgstr "test_state的模式无效"
@@ -338,7 +368,7 @@ msgid "June"
msgstr "6月"
#. module: sale
-#: code:addons/sale/sale.py:584
+#: code:addons/sale/sale.py:617
#, python-format
msgid "Could not cancel this sales order !"
msgstr "不能取消此销售订单 !"
@@ -359,8 +389,12 @@ msgid "October"
msgstr "10月"
#. module: sale
+#: sql_constraint:stock.picking:0
+msgid "Reference must be unique per Company!"
+msgstr ""
+
+#. module: sale
#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_quotation_for_sale
#: view:sale.order:0
#: view:sale.report:0
msgid "Quotations"
@@ -372,11 +406,6 @@ msgid "Pricelist for current sales order."
msgstr "当前销售订单的价格表。"
#. module: sale
-#: selection:sale.config.picking_policy,step:0
-msgid "Delivery Order Only"
-msgstr "只有送货单"
-
-#. module: sale
#: report:sale.order:0
msgid "TVA :"
msgstr "增值税:"
@@ -401,6 +430,7 @@ msgstr "财务结构"
#. module: sale
#: view:sale.order:0
#: view:sale.order.line:0
+#: field:sale.report,product_uom:0
msgid "UoM"
msgstr "计量单位"
@@ -423,13 +453,19 @@ msgid ""
msgstr "业务员确认报价。销售订单的状态变成‘进度’或‘手工进度’。"
#. module: sale
-#: code:addons/sale/sale.py:971
+#: code:addons/sale/sale.py:1061
+#, python-format
+msgid "You cannot cancel a sale order line that has already been invoiced!"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:1066
#, python-format
msgid "You must first cancel stock moves attached to this sales order line."
msgstr "你必须先取消所有附加在此销售订单明细上的库存调拨。"
#. module: sale
-#: code:addons/sale/sale.py:1042
+#: code:addons/sale/sale.py:1134
#, python-format
msgid "(n/a)"
msgstr "(n/a)"
@@ -463,14 +499,36 @@ msgid "Notes"
msgstr "备注"
#. module: sale
+#: sql_constraint:res.company:0
+msgid "The company name must be unique !"
+msgstr ""
+
+#. module: sale
#: help:sale.order,partner_invoice_id:0
msgid "Invoice address for current sales order."
msgstr "当前销售订单的发票地址。"
#. module: sale
-#: view:sale.installer:0
-msgid "Enhance your core Sales Application with additional functionalities."
-msgstr "通过额外的功能增强你的核心销售应用程序。"
+#: view:sale.report:0
+msgid "Month-1"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered month of the sales order"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:504
+#, python-format
+msgid ""
+"You cannot group sales having different currencies for the same partner."
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,picking_policy:0
+msgid "Deliver each product when available"
+msgstr ""
#. module: sale
#: field:sale.order,invoiced_rate:0
@@ -489,21 +547,43 @@ msgid "Confirmation Date"
msgstr "确认日期"
#. module: sale
+#: field:sale.order,incoterm:0
+msgid "Incoterm"
+msgstr "贸易术语"
+
+#. module: sale
#: field:sale.order.line,address_allotment_id:0
msgid "Allotment Partner"
msgstr "分配给业务伙伴"
#. module: sale
-#: sql_constraint:sale.order:0
-msgid "Order Reference must be unique !"
-msgstr "单号必须唯一!"
-
-#. module: sale
#: selection:sale.report,month:0
msgid "March"
msgstr "3月"
#. module: sale
+#: constraint:stock.move:0
+msgid "You can not move products from or to a location of the type view."
+msgstr ""
+
+#. module: sale
+#: field:sale.config.picking_policy,sale_orders:0
+msgid "Based on Sales Orders"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,state:0
+msgid ""
+"Givwizard = self.browse(cr, uid, ids)[0]es the state of the quotation or "
+"sales order. \n"
+"The exception state is automatically set when a cancel operation occurs in "
+"the invoice validation (Invoice Exception) or in the picking list process "
+"(Shipping Exception). \n"
+"The 'Waiting Schedule' state is set when the invoice is confirmed but "
+"waiting for the scheduler to run on the order date."
+msgstr ""
+
+#. module: sale
#: help:sale.order,amount_total:0
msgid "The total amount."
msgstr "总金额。"
@@ -519,6 +599,11 @@ msgid "Invoice address :"
msgstr "发票地址:"
#. module: sale
+#: field:sale.order.line,sequence:0
+msgid "Line Sequence"
+msgstr ""
+
+#. module: sale
#: model:process.transition,note:sale.process_transition_saleorderprocurement0
msgid ""
"For every sales order line, a procurement order is created to supply the "
@@ -565,11 +650,6 @@ msgid "Sales Order Line"
msgstr "销售订单明细"
#. module: sale
-#: view:sale.config.picking_policy:0
-msgid "Setup your sales workflow and default values."
-msgstr "设置你的销售流程和默认值。"
-
-#. module: sale
#: field:sale.shop,warehouse_id:0
msgid "Warehouse"
msgstr "仓库"
@@ -606,6 +686,11 @@ msgid "Creation Date"
msgstr "创建日期"
#. module: sale
+#: model:ir.ui.menu,name:sale.menu_sales_configuration_misc
+msgid "Miscellaneous"
+msgstr ""
+
+#. module: sale
#: model:ir.actions.act_window,name:sale.action_order_line_tree3
msgid "Uninvoiced and Delivered Lines"
msgstr "未开票已送货明细"
@@ -621,14 +706,19 @@ msgid "My Sales"
msgstr "我的销售订单"
#. module: sale
-#: code:addons/sale/sale.py:290
-#: code:addons/sale/sale.py:966
-#: code:addons/sale/sale.py:1165
+#: code:addons/sale/sale.py:295
+#: code:addons/sale/sale.py:1061
+#: code:addons/sale/sale.py:1290
#, python-format
msgid "Invalid action !"
msgstr "无效动作!"
#. module: sale
+#: view:sale.order:0
+msgid "Extra Info"
+msgstr "额外信息"
+
+#. module: sale
#: field:sale.order,pricelist_id:0
#: field:sale.report,pricelist_id:0
#: field:sale.shop,pricelist_id:0
@@ -642,13 +732,21 @@ msgid "# of Qty"
msgstr "数量#"
#. module: sale
+#: code:addons/sale/sale.py:1314
+#, python-format
+msgid "Hour"
+msgstr ""
+
+#. module: sale
#: view:sale.order:0
msgid "Order Date"
msgstr "订单日期"
#. module: sale
#: view:sale.order.line:0
+#: view:sale.report:0
#: field:sale.report,shipped:0
+#: field:sale.report,shipped_qty_1:0
msgid "Shipped"
msgstr "已运送"
@@ -658,9 +756,9 @@ msgid "All Quotations"
msgstr "所有报价单"
#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Invoice On Order After Delivery"
-msgstr "发货后开票"
+#: view:sale.config.picking_policy:0
+msgid "Options"
+msgstr ""
#. module: sale
#: selection:sale.report,month:0
@@ -668,6 +766,20 @@ msgid "September"
msgstr "9月"
#. module: sale
+#: code:addons/sale/sale.py:632
+#, python-format
+msgid "You cannot confirm a sale order which has no line."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:1246
+#, python-format
+msgid ""
+"You have to select a pricelist or a customer in the sales form !\n"
+"Please set one before choosing a product."
+msgstr ""
+
+#. module: sale
#: view:sale.report:0
#: field:sale.report,categ_id:0
msgid "Category of Product"
@@ -684,11 +796,6 @@ msgid "Stock Moves"
msgstr "库存调拨"
#. module: sale
-#: view:sale.report:0
-msgid " Year "
-msgstr " 年 "
-
-#. module: sale
#: field:sale.order,state:0
#: field:sale.report,state:0
msgid "Order State"
@@ -706,7 +813,7 @@ msgid "Sales By Month"
msgstr "月销售情况"
#. module: sale
-#: code:addons/sale/sale.py:970
+#: code:addons/sale/sale.py:1065
#, python-format
msgid "Could not cancel sales order line!"
msgstr "不能取消销售明细!"
@@ -739,62 +846,19 @@ msgid ""
msgstr "它表示销售订单已经发货了。只有运行日程表(scheduler)后这个字段才会被修改。"
#. module: sale
+#: field:sale.order,date_order:0
+msgid "Date"
+msgstr ""
+
+#. module: sale
#: view:sale.report:0
msgid "Extended Filters..."
msgstr "扩展过滤器..."
#. module: sale
-#: model:ir.module.module,description:sale.module_meta_information
-msgid ""
-"\n"
-" The base module to manage quotations and sales orders.\n"
-"\n"
-" * Workflow with validation steps:\n"
-" - Quotation -> Sales order -> Invoice\n"
-" * Invoicing methods:\n"
-" - Invoice on order (before or after shipping)\n"
-" - Invoice on delivery\n"
-" - Invoice on timesheets\n"
-" - Advance invoice\n"
-" * Partners preferences (shipping, invoicing, incoterm, ...)\n"
-" * Products stocks and prices\n"
-" * Delivery methods:\n"
-" - all at once, multi-parcel\n"
-" - delivery costs\n"
-" * Dashboard for salesman that includes:\n"
-" * Your open quotations\n"
-" * Top 10 sales of the month\n"
-" * Cases statistics\n"
-" * Graph of sales by product\n"
-" * Graph of cases of the month\n"
-" "
-msgstr ""
-"\n"
-" 管理报价单和销售订单的基础模块。\n"
-" * 工作流和验证步骤: - 报价 -> 销售订单 -> 开票\n"
-" * 开票方式:\n"
-" - 按订单开票(运送前或后)\n"
-" - 按发货单开票 - 按工时单开票\n"
-" - 预付款发票\n"
-" * 业务伙伴首选项(运送,开票方式...)\n"
-" * 产品库存与价格\n"
-" * 送货方式:\n"
-" - 所有一起,多个包裹\n"
-" - 交货成本\n"
-"\n"
-" * 业务员控制台包括:\n"
-" * 你的未关闭报价单\n"
-" * 月销售前10\n"
-" * 业务个案统计\n"
-" * 产品销售图表\n"
-" * 月业务个案图表\n"
-" "
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_shop
-#: view:sale.shop:0
-msgid "Sales Shop"
-msgstr "销售店"
+#: selection:sale.order.line,state:0
+msgid "Exception"
+msgstr "异常"
#. module: sale
#: model:ir.model,name:sale.model_res_company
@@ -802,9 +866,10 @@ msgid "Companies"
msgstr "公司"
#. module: sale
-#: selection:sale.report,month:0
-msgid "November"
-msgstr "11月"
+#: code:addons/sale/sale.py:1259
+#, python-format
+msgid "No valid pricelist line found ! :"
+msgstr ""
#. module: sale
#: view:sale.order:0
@@ -812,9 +877,9 @@ msgid "History"
msgstr "日志"
#. module: sale
-#: field:sale.config.picking_policy,picking_policy:0
-msgid "Picking Default Policy"
-msgstr "默认分拣方式"
+#: selection:sale.order,order_policy:0
+msgid "Invoice on order after delivery"
+msgstr ""
#. module: sale
#: help:sale.order,invoice_ids:0
@@ -836,13 +901,12 @@ msgid ""
msgstr "订单或报价请求人的姓名和地址。"
#. module: sale
-#: code:addons/sale/sale.py:966
-#, python-format
-msgid "You cannot cancel a sales order line that has already been invoiced !"
-msgstr "你不能取消已开票的销售订单 !"
+#: help:res.company,security_lead:0
+msgid ""
+"This is the days added to what you promise to customers for security purpose"
+msgstr "基于安全的目的在承诺客户的时间的基础上需要增加的天数"
#. module: sale
-#: view:sale.order:0
#: view:sale.order.line:0
msgid "Qty"
msgstr "数量"
@@ -853,6 +917,11 @@ msgid "References"
msgstr "引用"
#. module: sale
+#: view:sale.order.line:0
+msgid "My Sales Order Lines"
+msgstr ""
+
+#. module: sale
#: model:process.transition.action,name:sale.process_transition_action_cancel0
#: model:process.transition.action,name:sale.process_transition_action_cancel1
#: model:process.transition.action,name:sale.process_transition_action_cancel2
@@ -864,14 +933,9 @@ msgid "Cancel"
msgstr "取消"
#. module: sale
-#: field:sale.installer,sale_order_dates:0
-msgid "Sales Order Dates"
-msgstr "销售订单日期"
-
-#. module: sale
-#: selection:sale.order.line,state:0
-msgid "Exception"
-msgstr "异常"
+#: sql_constraint:sale.order:0
+msgid "Order Reference must be unique per Company!"
+msgstr ""
#. module: sale
#: model:process.transition,name:sale.process_transition_invoice0
@@ -883,19 +947,19 @@ msgid "Create Invoice"
msgstr "创建发票"
#. module: sale
-#: field:sale.installer,sale_margin:0
-msgid "Margins in Sales Orders"
-msgstr "销售订单利润"
-
-#. module: sale
#: view:sale.order:0
msgid "Total Tax Excluded"
msgstr "不含税总金额"
#. module: sale
-#: view:sale.order:0
-msgid "Compute"
-msgstr "计算"
+#: view:sale.order.line:0
+msgid "Order reference"
+msgstr ""
+
+#. module: sale
+#: view:sale.open.invoice:0
+msgid "You invoice has been successfully created!"
+msgstr "发票创建成功!"
#. module: sale
#: view:sale.report:0
@@ -914,23 +978,20 @@ msgid "Open Invoice"
msgstr "未结发票"
#. module: sale
-#: report:sale.order:0
-#: view:sale.order.line:0
-msgid "Price"
-msgstr "价格"
+#: model:ir.actions.server,name:sale.ir_actions_server_edi_sale
+msgid "Auto-email confirmed sale orders"
+msgstr ""
#. module: sale
-#: model:ir.actions.act_window,name:sale.action_sale_installer
-#: view:sale.config.picking_policy:0
-#: view:sale.installer:0
-msgid "Sales Application Configuration"
-msgstr "销售应用程序设置"
+#: code:addons/sale/sale.py:413
+#, python-format
+msgid "There is no sales journal defined for this company: \"%s\" (id:%d)"
+msgstr "没有为此公司定义销售账簿: \\\"%s\\\" (id:%d)"
#. module: sale
-#: view:sale.report:0
-#: field:sale.report,price_total:0
-msgid "Total Price"
-msgstr "价格合计"
+#: model:process.transition.action,name:sale.process_transition_action_forceassignation0
+msgid "Force Assignation"
+msgstr "强制指定"
#. module: sale
#: selection:sale.order.line,type:0
@@ -943,6 +1004,11 @@ msgid "Based on the shipped or on the ordered quantities."
msgstr "基于已运送或被订购的数据。"
#. module: sale
+#: selection:sale.order,picking_policy:0
+msgid "Deliver all products at once"
+msgstr ""
+
+#. module: sale
#: field:sale.order,picking_ids:0
msgid "Related Picking"
msgstr "装箱单"
@@ -974,9 +1040,15 @@ msgid "Create Delivery Order"
msgstr "创建发货单"
#. module: sale
-#: field:sale.installer,delivery:0
-msgid "Delivery Costs"
-msgstr "交货成本"
+#: code:addons/sale/sale.py:1290
+#, python-format
+msgid "Cannot delete a sales order line which is in state '%s'!"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Qty(UoS)"
+msgstr ""
#. module: sale
#: view:sale.order:0
@@ -990,13 +1062,13 @@ msgstr "创建分拣单"
#. module: sale
#: view:sale.report:0
-msgid "Sales by Product Category"
-msgstr "按产品类别的销售情况"
+msgid "Ordered date of the sales order"
+msgstr ""
#. module: sale
-#: selection:sale.order,picking_policy:0
-msgid "Partial Delivery"
-msgstr "部分交付"
+#: view:sale.report:0
+msgid "Sales by Product Category"
+msgstr "按产品类别的销售情况"
#. module: sale
#: model:process.transition,name:sale.process_transition_confirmquotation0
@@ -1004,9 +1076,10 @@ msgid "Confirm Quotation"
msgstr "确认报价单"
#. module: sale
-#: help:sale.order,origin:0
-msgid "Reference of the document that generated this sales order request."
-msgstr "生成此销售订单请求的单据"
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:63
+#, python-format
+msgid "Error"
+msgstr "错误"
#. module: sale
#: view:sale.order:0
@@ -1038,20 +1111,14 @@ msgid "Procurement Method"
msgstr "采购方式"
#. module: sale
-#: view:sale.config.picking_policy:0
-#: view:sale.installer:0
-msgid "title"
-msgstr "标题"
-
-#. module: sale
#: model:process.node,name:sale.process_node_packinglist0
msgid "Pick List"
msgstr "分拣单"
#. module: sale
#: view:sale.order:0
-msgid "Order date"
-msgstr "订单日期"
+msgid "Set to Draft"
+msgstr "设为报价单"
#. module: sale
#: model:process.node,note:sale.process_node_packinglist0
@@ -1059,6 +1126,85 @@ msgid "Document of the move to the output or to the customer."
msgstr "调拨出去或调拨给客户的单据"
#. module: sale
+#: model:email.template,body_text:sale.email_template_edi_sale
+msgid ""
+"\n"
+"Hello${object.partner_order_id.name and ' ' or "
+"''}${object.partner_order_id.name or ''},\n"
+"\n"
+"Here is your order confirmation for ${object.partner_id.name}:\n"
+" | Order number: *${object.name}*\n"
+" | Order total: *${object.amount_total} "
+"${object.pricelist_id.currency_id.name}*\n"
+" | Order date: ${object.date_order}\n"
+" % if object.origin:\n"
+" | Order reference: ${object.origin}\n"
+" % endif\n"
+" % if object.client_order_ref:\n"
+" | Your reference: ${object.client_order_ref}<br />\n"
+" % endif\n"
+" | Your contact: ${object.user_id.name} ${object.user_id.user_email "
+"and '<%s>'%(object.user_id.user_email) or ''}\n"
+"\n"
+"You can view the order confirmation, download it and even pay online using "
+"the following link:\n"
+" ${ctx.get('edi_web_url_view') or 'n/a'}\n"
+"\n"
+"% if object.order_policy in ('prepaid','manual') and "
+"object.company_id.paypal_account:\n"
+"<% \n"
+"comp_name = quote(object.company_id.name)\n"
+"order_name = quote(object.name)\n"
+"paypal_account = quote(object.company_id.paypal_account)\n"
+"order_amount = quote(str(object.amount_total))\n"
+"cur_name = quote(object.pricelist_id.currency_id.name)\n"
+"paypal_url = \"https://www.paypal.com/cgi-"
+"bin/webscr?cmd=_xclick&business=%s&item_name=%s%%20Order%%20%s&invoice=%s&amo"
+"unt=%s\" \\\n"
+" "
+"\"&currency_code=%s&button_subtype=services&no_note=1&bn=OpenERP_Order_PayNow"
+"_%s\" % \\\n"
+" "
+"(paypal_account,comp_name,order_name,order_name,order_amount,cur_name,cur_nam"
+"e)\n"
+"%>\n"
+"It is also possible to directly pay with Paypal:\n"
+" ${paypal_url}\n"
+"% endif\n"
+"\n"
+"If you have any question, do not hesitate to contact us.\n"
+"\n"
+"\n"
+"Thank you for choosing ${object.company_id.name}!\n"
+"\n"
+"\n"
+"--\n"
+"${object.user_id.name} ${object.user_id.user_email and "
+"'<%s>'%(object.user_id.user_email) or ''}\n"
+"${object.company_id.name}\n"
+"% if object.company_id.street:\n"
+"${object.company_id.street or ''}\n"
+"% endif\n"
+"% if object.company_id.street2:\n"
+"${object.company_id.street2}\n"
+"% endif\n"
+"% if object.company_id.city or object.company_id.zip:\n"
+"${object.company_id.zip or ''} ${object.company_id.city or ''}\n"
+"% endif\n"
+"% if object.company_id.country_id:\n"
+"${object.company_id.state_id and ('%s, ' % object.company_id.state_id.name) "
+"or ''} ${object.company_id.country_id.name or ''}\n"
+"% endif\n"
+"% if object.company_id.phone:\n"
+"Phone: ${object.company_id.phone}\n"
+"% endif\n"
+"% if object.company_id.website:\n"
+"${object.company_id.website or ''}\n"
+"% endif\n"
+" "
+msgstr ""
+
+#. module: sale
#: model:process.transition.action,name:sale.process_transition_action_validate0
msgid "Validate"
msgstr "确认"
@@ -1081,9 +1227,9 @@ msgid "Taxes"
msgstr "税款"
#. module: sale
-#: field:sale.order,order_policy:0
-msgid "Shipping Policy"
-msgstr "运送方式"
+#: view:sale.order:0
+msgid "Sales Order ready to be invoiced"
+msgstr ""
#. module: sale
#: help:sale.order,create_date:0
@@ -1102,9 +1248,9 @@ msgid "Create Invoices"
msgstr "生成发票"
#. module: sale
-#: view:sale.order:0
-msgid "Extra Info"
-msgstr "额外信息"
+#: view:sale.report:0
+msgid "Sales order created in current month"
+msgstr ""
#. module: sale
#: report:sale.order:0
@@ -1112,11 +1258,24 @@ msgid "Fax :"
msgstr "传真:"
#. module: sale
+#: help:sale.order.line,type:0
+msgid ""
+"If 'on order', it triggers a procurement when the sale order is confirmed to "
+"create a task, purchase order or manufacturing order linked to this sale "
+"order line."
+msgstr ""
+
+#. module: sale
#: field:sale.advance.payment.inv,amount:0
msgid "Advance Amount"
msgstr "预付款总额"
#. module: sale
+#: field:sale.config.picking_policy,charge_delivery:0
+msgid "Do you charge the delivery?"
+msgstr ""
+
+#. module: sale
#: selection:sale.order,invoice_quantity:0
msgid "Shipped Quantities"
msgstr "已运数量"
@@ -1127,25 +1286,45 @@ msgid "Invoice Based on Sales Orders"
msgstr "基于销售订单开票"
#. module: sale
+#: code:addons/sale/sale.py:331
+#, python-format
+msgid ""
+"If you change the pricelist of this order (and eventually the currency), "
+"prices of existing order lines will not be updated."
+msgstr ""
+
+#. module: sale
#: model:ir.model,name:sale.model_stock_picking
msgid "Picking List"
msgstr "装箱单"
#. module: sale
-#: code:addons/sale/sale.py:387
-#: code:addons/sale/sale.py:920
-#: code:addons/sale/sale.py:938
+#: code:addons/sale/sale.py:412
+#: code:addons/sale/sale.py:503
+#: code:addons/sale/sale.py:632
+#: code:addons/sale/sale.py:1015
+#: code:addons/sale/sale.py:1033
#, python-format
msgid "Error !"
msgstr "错误!"
#. module: sale
-#: code:addons/sale/sale.py:570
+#: code:addons/sale/sale.py:603
#, python-format
msgid "Could not cancel sales order !"
msgstr "不能取消销售订单 !"
#. module: sale
+#: view:sale.order:0
+msgid "Qty(UoM)"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered Year of the sales order"
+msgstr ""
+
+#. module: sale
#: selection:sale.report,month:0
msgid "July"
msgstr "7月"
@@ -1162,36 +1341,26 @@ msgid "Shipping Exception"
msgstr "运送异常"
#. module: sale
-#: field:sale.make.invoice,grouped:0
-msgid "Group the invoices"
-msgstr "发票组"
-
-#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Shipping & Manual Invoice"
-msgstr "发货和手工发票"
-
-#. module: sale
-#: code:addons/sale/sale.py:1051
+#: code:addons/sale/sale.py:1143
#, python-format
-msgid "Picking Information !"
-msgstr "装箱单信息 !"
+msgid "Picking Information ! : "
+msgstr ""
#. module: sale
-#: view:sale.report:0
-#: field:sale.report,month:0
-msgid "Month"
-msgstr "月"
+#: field:sale.make.invoice,grouped:0
+msgid "Group the invoices"
+msgstr "发票组"
#. module: sale
-#: model:ir.module.module,shortdesc:sale.module_meta_information
-msgid "Sales Management"
-msgstr "销售管理"
+#: field:sale.order,order_policy:0
+msgid "Invoice Policy"
+msgstr ""
#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Invoice From The Picking"
-msgstr "来自装箱单的发票"
+#: model:ir.actions.act_window,name:sale.action_config_picking_policy
+#: view:sale.config.picking_policy:0
+msgid "Setup your Invoicing Method"
+msgstr ""
#. module: sale
#: model:process.node,note:sale.process_node_invoice0
@@ -1200,29 +1369,31 @@ msgstr "等待会计审核。"
#. module: sale
#: view:sale.report:0
-#: field:sale.report,uom_name:0
msgid "Reference UoM"
msgstr "参考计量单位(UoM)"
#. module: sale
+#: view:sale.config.picking_policy:0
+msgid ""
+"This tool will help you to install the right module and configure the system "
+"according to the method you use to invoice your customers."
+msgstr ""
+
+#. module: sale
#: model:ir.model,name:sale.model_sale_order_line_make_invoice
msgid "Sale OrderLine Make_invoice"
msgstr "销售订单明细开票"
#. module: sale
-#: help:sale.config.picking_policy,step:0
-msgid ""
-"By default, OpenERP is able to manage complex routing and paths of products "
-"in your warehouse and partner locations. This will configure the most common "
-"and simple methods to deliver products to the customer in one or two "
-"operations by the worker."
-msgstr ""
-"默认情况下,OpenERP能够管理仓库和业务伙伴库位之间复杂的路线和路径。此设置能够配置最常用、最简单的方式来发货给各户,员工只需1或2个操作。"
+#: selection:sale.order,state:0
+#: selection:sale.report,state:0
+msgid "Invoice Exception"
+msgstr "发票异常"
#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_tree
-msgid "Old Quotations"
-msgstr "老的报价单"
+#: model:process.node,note:sale.process_node_saleorder0
+msgid "Drives procurement and invoicing"
+msgstr "促使采购和开票"
#. module: sale
#: field:sale.order,invoiced:0
@@ -1237,6 +1408,22 @@ msgid "Sales Analysis"
msgstr "销售分析表"
#. module: sale
+#: code:addons/sale/sale.py:1138
+#, python-format
+msgid ""
+"You selected a quantity of %d Units.\n"
+"But it's not compatible with the selected packaging.\n"
+"Here is a proposition of quantities according to the packaging:\n"
+"EAN: %s Quantity: %s Type of ul: %s"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Recreate Packing"
+msgstr "重建装箱单"
+
+#. module: sale
+#: view:sale.order:0
#: field:sale.order.line,property_ids:0
msgid "Properties"
msgstr "属性"
@@ -1263,7 +1450,17 @@ msgid ""
msgstr "你可以根据销售订单或运输单生成发票。"
#. module: sale
-#: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
+#: view:sale.order.line:0
+msgid "Confirmed sale order lines, not yet delivered"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:473
+#, python-format
+msgid "Customer Invoices"
+msgstr ""
+
+#. module: sale
#: model:process.process,name:sale.process_process_salesprocess0
#: view:sale.order:0
#: view:sale.report:0
@@ -1285,18 +1482,13 @@ msgid "Done"
msgstr "完成"
#. module: sale
-#: model:ir.model,name:sale.model_sale_installer
-msgid "sale.installer"
-msgstr "sale.installer"
-
-#. module: sale
#: model:process.node,name:sale.process_node_invoice0
#: model:process.node,name:sale.process_node_invoiceafterdelivery0
msgid "Invoice"
msgstr "发票"
#. module: sale
-#: code:addons/sale/sale.py:1014
+#: code:addons/sale/sale.py:1158
#, python-format
msgid ""
"You have to select a customer in the sales form !\n"
@@ -1306,11 +1498,6 @@ msgstr ""
"请在选择产品之前设置1个客户。"
#. module: sale
-#: selection:sale.config.picking_policy,step:0
-msgid "Picking List & Delivery Order"
-msgstr "装箱单 & 发货单"
-
-#. module: sale
#: field:sale.order,origin:0
msgid "Source Document"
msgstr "源文档"
@@ -1336,7 +1523,7 @@ msgid "The amount without tax."
msgstr "除税后总额。"
#. module: sale
-#: code:addons/sale/sale.py:571
+#: code:addons/sale/sale.py:604
#, python-format
msgid "You must first cancel all picking attached to this sales order."
msgstr "你必须先取消销售订单上的所有装箱单。"
@@ -1347,9 +1534,15 @@ msgid "Sales Advance Payment Invoice"
msgstr "销售预付发票"
#. module: sale
-#: field:sale.order,incoterm:0
-msgid "Incoterm"
-msgstr "贸易术语"
+#: view:sale.report:0
+#: field:sale.report,month:0
+msgid "Month"
+msgstr "月"
+
+#. module: sale
+#: model:email.template,subject:sale.email_template_edi_sale
+msgid "${object.company_id.name} Order (Ref ${object.name or 'n/a' })"
+msgstr ""
#. module: sale
#: view:sale.order.line:0
@@ -1360,11 +1553,6 @@ msgid "Product"
msgstr "产品"
#. module: sale
-#: model:ir.ui.menu,name:sale.menu_invoiced
-msgid "Invoicing"
-msgstr "开发票"
-
-#. module: sale
#: model:process.transition.action,name:sale.process_transition_action_cancelassignation0
msgid "Cancel Assignation"
msgstr "取消指定"
@@ -1375,18 +1563,11 @@ msgid "sale.config.picking_policy"
msgstr "sale.config.picking_policy"
#. module: sale
-#: help:sale.order,state:0
-msgid ""
-"Gives the state of the quotation or sales order. \n"
-"The exception state is automatically set when a cancel operation occurs in "
-"the invoice validation (Invoice Exception) or in the picking list process "
-"(Shipping Exception). \n"
-"The 'Waiting Schedule' state is set when the invoice is confirmed but "
-"waiting for the scheduler to run on the date 'Ordered Date'."
+#: view:account.invoice.report:0
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_turnover_by_month
+msgid "Monthly Turnover"
msgstr ""
-"指定报价单或销售订单的状态\n"
-"当发票验证被取消(发票异常),或取消装箱单里的产品(运输异常)的时候,会被设置为异常状态。\n"
-"当发票被确认但在“订单日期”那天正等待日程安排会被设置为‘等待日程安排’状态。"
#. module: sale
#: field:sale.order,invoice_quantity:0
@@ -1404,7 +1585,6 @@ msgid "Product UoS"
msgstr "产品销售单位"
#. module: sale
-#: selection:sale.order,state:0
#: selection:sale.report,state:0
msgid "Manual In Progress"
msgstr "手动进展"
@@ -1425,7 +1605,8 @@ msgid "Order"
msgstr "订单"
#. module: sale
-#: code:addons/sale/sale.py:921
+#: code:addons/sale/sale.py:1016
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:71
#, python-format
msgid "There is no income account defined for this product: \"%s\" (id:%d)"
msgstr "没有为此产品定义收入类科目: \\\"%s\\\" (id:%d)"
@@ -1447,7 +1628,7 @@ msgstr ""
"因此,一旦销售订单被业务员确认,就会为它生产发票或者发货单。"
#. module: sale
-#: code:addons/sale/sale.py:1116
+#: code:addons/sale/sale.py:1238
#, python-format
msgid ""
"You plan to sell %.2f %s but you only have %.2f %s available !\n"
@@ -1478,10 +1659,10 @@ msgid "Total"
msgstr "合计"
#. module: sale
-#: code:addons/sale/sale.py:388
-#, python-format
-msgid "There is no sales journal defined for this company: \"%s\" (id:%d)"
-msgstr "没有为此公司定义销售账簿: \\\"%s\\\" (id:%d)"
+#: report:sale.order:0
+#: view:sale.order.line:0
+msgid "Price"
+msgstr "价格"
#. module: sale
#: model:process.transition,note:sale.process_transition_deliver0
@@ -1492,10 +1673,15 @@ msgid ""
msgstr "根据出库库位的设置,出库和客户之间的库存转移是通过发货单手工或自动完成的。"
#. module: sale
-#: code:addons/sale/sale.py:1165
-#, python-format
-msgid "Cannot delete a sales order line which is %s !"
-msgstr "不能删除 %s的销售订单明细 !"
+#: selection:sale.order,order_policy:0
+msgid "Pay before delivery"
+msgstr ""
+
+#. module: sale
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.open_board_sales
+msgid "Sales Dashboard"
+msgstr ""
#. module: sale
#: model:ir.actions.act_window,name:sale.action_sale_order_make_invoice
@@ -1506,6 +1692,7 @@ msgstr "生成发票"
#. module: sale
#: view:sale.order:0
+#: selection:sale.order,state:0
#: view:sale.order.line:0
msgid "To Invoice"
msgstr "开票"
@@ -1516,6 +1703,11 @@ msgid "Date on which sales order is confirmed."
msgstr "销售订单的日期已确认。"
#. module: sale
+#: field:sale.order,project_id:0
+msgid "Contract/Analytic Account"
+msgstr ""
+
+#. module: sale
#: field:sale.order,company_id:0
#: field:sale.order.line,company_id:0
#: view:sale.report:0
@@ -1535,10 +1727,12 @@ msgid "The amount to be invoiced in advance."
msgstr "预付款发票金额"
#. module: sale
-#: selection:sale.order,state:0
-#: selection:sale.report,state:0
-msgid "Invoice Exception"
-msgstr "发票异常"
+#: code:addons/sale/sale.py:1256
+#, python-format
+msgid ""
+"Couldn't find a pricelist line matching this product and quantity.\n"
+"You have to change either the product, the quantity or the pricelist."
+msgstr ""
#. module: sale
#: help:sale.order,picking_ids:0
@@ -1547,13 +1741,6 @@ msgid ""
msgstr "此销售订单的装箱单。"
#. module: sale
-#: help:sale.installer,sale_margin:0
-msgid ""
-"Gives the margin of profitability by calculating the difference between Unit "
-"Price and Cost Price."
-msgstr "通过单价和成本价之间的差价设定利润率。"
-
-#. module: sale
#: view:sale.make.invoice:0
#: view:sale.order.line.make.invoice:0
msgid "Create invoices"
@@ -1572,6 +1759,11 @@ msgid "Cancelled"
msgstr "已取消"
#. module: sale
+#: view:sale.order.line:0
+msgid "Sales Order Lines related to a Sales Order of mine"
+msgstr ""
+
+#. module: sale
#: model:ir.actions.act_window,name:sale.action_shop_form
#: model:ir.ui.menu,name:sale.menu_action_shop_form
#: field:sale.order,shop_id:0
@@ -1581,17 +1773,12 @@ msgid "Shop"
msgstr "商店"
#. module: sale
-#: view:sale.report:0
-msgid " Month "
-msgstr " 月 "
-
-#. module: sale
#: field:sale.report,date_confirm:0
msgid "Date Confirm"
msgstr "确认日期"
#. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:111
+#: code:addons/sale/wizard/sale_line_invoice.py:113
#, python-format
msgid "Warning"
msgstr "警告"
@@ -1603,22 +1790,6 @@ msgid "Sales by Month"
msgstr "月销售情况"
#. module: sale
-#: code:addons/sale/sale.py:1045
-#, python-format
-msgid ""
-"You selected a quantity of %d Units.\n"
-"But it's not compatible with the selected packaging.\n"
-"Here is a proposition of quantities according to the packaging:\n"
-"\n"
-"EAN: %s Quantity: %s Type of ul: %s"
-msgstr ""
-"你选中了%d单位的数量。\n"
-"但是它和选中的装箱单不一致。\n"
-"根据装箱单它的数量应该是:\n"
-"\n"
-"EAN:%s 数量:%s ul类型:%s"
-
-#. module: sale
#: model:ir.model,name:sale.model_sale_order
#: model:process.node,name:sale.process_node_order0
#: model:process.node,name:sale.process_node_saleorder0
@@ -1634,6 +1805,11 @@ msgid "Quantity (UoS)"
msgstr "数量(销售单位)"
#. module: sale
+#: view:sale.order.line:0
+msgid "Sale Order Lines that are in 'done' state"
+msgstr ""
+
+#. module: sale
#: model:process.transition,note:sale.process_transition_packing0
msgid ""
"The Pick List form is created as soon as the sales order is confirmed, in "
@@ -1648,6 +1824,11 @@ msgid "Confirmed"
msgstr "已确认"
#. module: sale
+#: field:sale.config.picking_policy,order_policy:0
+msgid "Main Method Based On"
+msgstr ""
+
+#. module: sale
#: model:process.transition.action,name:sale.process_transition_action_confirm0
msgid "Confirm"
msgstr "确认"
@@ -1670,6 +1851,7 @@ msgid "Invoice Lines"
msgstr "发票行"
#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_product_tree
#: view:sale.order:0
#: view:sale.order.line:0
msgid "Sales Order Lines"
@@ -1686,30 +1868,18 @@ msgid "Configuration"
msgstr "设置"
#. module: sale
-#: selection:sale.order,picking_policy:0
-msgid "Complete Delivery"
-msgstr "完成送货"
+#: code:addons/sale/edi/sale_order.py:146
+#, python-format
+msgid "EDI Pricelist (%s)"
+msgstr ""
#. module: sale
#: view:sale.report:0
-msgid " Month-1 "
-msgstr " 上月 "
-
-#. module: sale
-#: help:sale.config.picking_policy,picking_policy:0
-msgid ""
-"The Shipping Policy is used to configure per order if you want to deliver as "
-"soon as possible when one product is available or you wait that all products "
-"are available.."
-msgstr "运输方式是用于设置每张销售订单是否有一个产品有效时尽可能早发货,还是等所有产品都准备好了才尽可能早发货。"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "August"
-msgstr "8月"
+msgid "Sales order created in current year"
+msgstr ""
#. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:111
+#: code:addons/sale/wizard/sale_line_invoice.py:113
#, python-format
msgid ""
"Invoice cannot be created for this Sales Order Line due to one of the "
@@ -1722,6 +1892,11 @@ msgstr ""
"2. 销售订单明细已经开票!"
#. module: sale
+#: view:sale.order.line:0
+msgid "Sale order lines done"
+msgstr ""
+
+#. module: sale
#: field:sale.order.line,th_weight:0
msgid "Weight"
msgstr "重量"
@@ -1740,7 +1915,6 @@ msgstr "12月"
#. module: sale
#: field:sale.config.picking_policy,config_logo:0
-#: field:sale.installer,config_logo:0
msgid "Image"
msgstr "图像"
@@ -1770,9 +1944,9 @@ msgid "Salesman"
msgstr "业务员"
#. module: sale
-#: model:process.node,note:sale.process_node_saleorder0
-msgid "Drives procurement and invoicing"
-msgstr "促使采购和开票"
+#: model:ir.actions.act_window,name:sale.action_order_tree
+msgid "Old Quotations"
+msgstr "老的报价单"
#. module: sale
#: field:sale.order,amount_untaxed:0
@@ -1780,7 +1954,7 @@ msgid "Untaxed Amount"
msgstr "未完税金额"
#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:163
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:170
#: model:ir.actions.act_window,name:sale.action_view_sale_advance_payment_inv
#: view:sale.advance.payment.inv:0
#: view:sale.order:0
@@ -1789,7 +1963,7 @@ msgid "Advance Invoice"
msgstr "预付款发票"
#. module: sale
-#: code:addons/sale/sale.py:591
+#: code:addons/sale/sale.py:624
#, python-format
msgid "The sales order '%s' has been cancelled."
msgstr "销售订单'%s'已被取消。"
@@ -1829,20 +2003,20 @@ msgid "Packings"
msgstr "装箱单"
#. module: sale
-#: field:sale.config.picking_policy,progress:0
-#: field:sale.installer,progress:0
-msgid "Configuration Progress"
-msgstr "设置进度"
+#: view:sale.order.line:0
+msgid "Sale Order Lines ready to be invoiced"
+msgstr ""
#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_product_tree
-msgid "Product sales"
-msgstr "产品销售"
+#: view:sale.report:0
+msgid "Sales order created in last month"
+msgstr ""
#. module: sale
-#: field:sale.order,date_order:0
-msgid "Ordered Date"
-msgstr "订购日期"
+#: model:ir.actions.act_window,name:sale.action_email_templates
+#: model:ir.ui.menu,name:sale.menu_email_templates
+msgid "Email Templates"
+msgstr ""
#. module: sale
#: model:ir.actions.act_window,name:sale.action_order_form
@@ -1852,14 +2026,15 @@ msgid "Sales Orders"
msgstr "销售订单"
#. module: sale
-#: selection:sale.config.picking_policy,picking_policy:0
-msgid "Direct Delivery"
-msgstr "直接送货"
+#: model:ir.model,name:sale.model_sale_shop
+#: view:sale.shop:0
+msgid "Sales Shop"
+msgstr "销售店"
#. module: sale
-#: field:sale.installer,sale_journal:0
-msgid "Invoicing journals"
-msgstr "开票日志"
+#: selection:sale.report,month:0
+msgid "November"
+msgstr "11月"
#. module: sale
#: field:sale.advance.payment.inv,product_id:0
@@ -1867,18 +2042,12 @@ msgid "Advance Product"
msgstr "预付产品"
#. module: sale
-#: view:sale.report:0
-#: field:sale.report,shipped_qty_1:0
-msgid "Shipped Qty"
-msgstr "交货数量"
-
-#. module: sale
-#: view:sale.open.invoice:0
-msgid "You invoice has been successfully created!"
-msgstr "发票创建成功!"
+#: view:sale.order:0
+msgid "Compute"
+msgstr "计算"
#. module: sale
-#: code:addons/sale/sale.py:585
+#: code:addons/sale/sale.py:618
#, python-format
msgid "You must first cancel all invoices attached to this sales order."
msgstr "你必须先取消销售订单的所有发票。"
@@ -1889,25 +2058,14 @@ msgid "January"
msgstr "1月"
#. module: sale
-#: view:sale.installer:0
-msgid "Configure Your Sales Management Application"
-msgstr "设置销售管理应用程序"
-
-#. module: sale
#: model:ir.actions.act_window,name:sale.action_order_tree4
msgid "Sales Order in Progress"
msgstr "销售订单进展"
#. module: sale
-#: field:sale.installer,sale_layout:0
-msgid "Sales Order Layout Improvement"
-msgstr "改善销售订单样式"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:63
-#, python-format
-msgid "Error"
-msgstr "错误"
+#: help:sale.order,origin:0
+msgid "Reference of the document that generated this sales order request."
+msgstr "生成此销售订单请求的单据"
#. module: sale
#: view:sale.report:0
@@ -1916,6 +2074,11 @@ msgid "Commitment Delay"
msgstr "承诺延迟"
#. module: sale
+#: selection:sale.order,order_policy:0
+msgid "Deliver & invoice on demand"
+msgstr ""
+
+#. module: sale
#: model:process.node,note:sale.process_node_saleprocurement0
msgid ""
"One Procurement order for each sales order line and for each of the "
@@ -1938,13 +2101,12 @@ msgid "Confirmed sales order to invoice."
msgstr "确认的销售订单开票。"
#. module: sale
-#: code:addons/sale/sale.py:290
-#, python-format
-msgid "Cannot delete Sales Order(s) which are already confirmed !"
-msgstr "不能删除已被确认的销售订单 !"
+#: view:sale.order:0
+msgid "Sales Order that haven't yet been confirmed"
+msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:316
+#: code:addons/sale/sale.py:322
#, python-format
msgid "The sales order '%s' has been set in draft state."
msgstr "销售订单'%s'已经被设为草稿状态。"
@@ -1955,37 +2117,27 @@ msgid "from stock"
msgstr "来自库存"
#. module: sale
-#: field:sale.config.picking_policy,order_policy:0
-msgid "Shipping Default Policy"
-msgstr "默认运送方式"
-
-#. module: sale
#: view:sale.open.invoice:0
msgid "Close"
msgstr "关闭"
#. module: sale
+#: code:addons/sale/sale.py:1248
+#, python-format
+msgid "No Pricelist ! : "
+msgstr ""
+
+#. module: sale
#: field:sale.order,shipped:0
msgid "Delivered"
msgstr "已交货"
#. module: sale
-#: code:addons/sale/sale.py:1115
-#, python-format
-msgid "Not enough stock !"
-msgstr "库存不足 !"
-
-#. module: sale
#: constraint:stock.move:0
msgid "You must assign a production lot for this product"
msgstr "你必须为产品安排生产批次"
#. module: sale
-#: field:sale.order.line,sequence:0
-msgid "Layout Sequence"
-msgstr "样式序列号"
-
-#. module: sale
#: model:ir.actions.act_window,help:sale.action_shop_form
msgid ""
"If you have more than one shop reselling your company products, you can "
@@ -2014,11 +2166,6 @@ msgid "May"
msgstr "5月"
#. module: sale
-#: help:sale.installer,sale_order_dates:0
-msgid "Adds commitment, requested and effective dates on Sales Orders."
-msgstr "为销售订单添加承诺,申请和生效日期。"
-
-#. module: sale
#: view:sale.order:0
#: field:sale.order,partner_id:0
#: field:sale.order.line,order_partner_id:0
@@ -2026,23 +2173,11 @@ msgid "Customer"
msgstr "客户"
#. module: sale
-#: model:product.template,name:sale.advance_product_0_product_template
-msgid "Advance"
-msgstr "预支"
-
-#. module: sale
#: selection:sale.report,month:0
msgid "February"
msgstr "2月"
#. module: sale
-#: help:sale.installer,sale_journal:0
-msgid ""
-"Allows you to group and invoice your delivery orders according to different "
-"invoicing types: daily, weekly, etc."
-msgstr "允许你对你的发货单根据不同开票类型:每天,每周等,进行分组和开票。"
-
-#. module: sale
#: selection:sale.report,month:0
msgid "April"
msgstr "4月"
@@ -2053,11 +2188,6 @@ msgid "Accounting"
msgstr "会计"
#. module: sale
-#: field:sale.config.picking_policy,step:0
-msgid "Steps To Deliver a Sales Order"
-msgstr "销售订单发货步骤"
-
-#. module: sale
#: view:sale.order:0
#: view:sale.order.line:0
msgid "Search Sales Order"
@@ -2069,18 +2199,18 @@ msgid "Sales Order Requisition"
msgstr "销售订单申请"
#. module: sale
+#: code:addons/sale/sale.py:1242
+#, python-format
+msgid "Not enough stock ! : "
+msgstr ""
+
+#. module: sale
#: report:sale.order:0
#: field:sale.order,payment_term:0
msgid "Payment Term"
msgstr "付款条件"
#. module: sale
-#: help:sale.installer,sale_layout:0
-msgid ""
-"Provides some features to improve the layout of the Sales Order reports."
-msgstr "提供一些新的功能来改善销售订单报表的样式。"
-
-#. module: sale
#: model:ir.actions.act_window,help:sale.action_order_report_all
msgid ""
"This report performs analysis on your quotations and sales orders. Analysis "
@@ -2136,9 +2266,6 @@ msgstr "发票基于送货单"
#~ msgid "Sales orders"
#~ msgstr "销售订单"
-#~ msgid "My Quotations"
-#~ msgstr "我的报价单"
-
#~ msgid "Canceled"
#~ msgstr "已取消"
@@ -2157,6 +2284,9 @@ msgstr "发票基于送货单"
#~ msgid "Sales order"
#~ msgstr "销售订单"
+#~ msgid "Sales Management"
+#~ msgstr "销售管理"
+
#~ msgid "Sale Order Line"
#~ msgstr "销售订单明细"
@@ -2208,6 +2338,9 @@ msgstr "发票基于送货单"
#~ msgid "Create Advance Invoice"
#~ msgstr "创建预付款发票"
+#~ msgid "Delivery Order Only"
+#~ msgstr "只有送货单"
+
#~ msgid "Sale Invoice"
#~ msgstr "销售发票"
@@ -2227,6 +2360,9 @@ msgstr "发票基于送货单"
#~ msgid "Automatic Declaration"
#~ msgstr "一般信息"
+#~ msgid "Partial Delivery"
+#~ msgstr "部分交付"
+
#~ msgid "Invalid model name in the action definition."
#~ msgstr "在这动作定义中有无效的模块名"
@@ -2251,9 +2387,15 @@ msgstr "发票基于送货单"
#~ "is, quotation is moved to sale order."
#~ msgstr "当点击确认按钮草稿状态将转为手动.报价单转为销售订单."
+#~ msgid "Shipping Policy"
+#~ msgstr "运送方式"
+
#~ msgid "Outgoing Products"
#~ msgstr "发出的产品"
+#~ msgid "All at Once"
+#~ msgstr "所有一起"
+
#~ msgid "Procurement is created after confirmation of sale order."
#~ msgstr "确认销售订单后创建产品需求"
@@ -2282,6 +2424,9 @@ msgstr "发票基于送货单"
#~ "will automatic create after delivery."
#~ msgstr "当你选择运送方式=‘送货后自动产生发票’.将在送货后自动创建发票."
+#~ msgid "Complete Delivery"
+#~ msgstr "完成送货"
+
#~ msgid "Sale Order Procurement"
#~ msgstr "销售单产品需求"
@@ -2315,6 +2460,9 @@ msgstr "发票基于送货单"
#~ msgid "Packing Default Policy"
#~ msgstr "包装默认方式"
+#~ msgid "Shipping Default Policy"
+#~ msgstr "默认运送方式"
+
#~ msgid ""
#~ "In sale order , procuerement for each line and it comes into the procurement "
#~ "order"
@@ -2344,6 +2492,9 @@ msgstr "发票基于送货单"
#~ msgid "Packing Policy"
#~ msgstr "包装方式"
+#~ msgid "Product sales"
+#~ msgstr "产品销售"
+
#~ msgid "Our Salesman"
#~ msgstr "业务员"
@@ -2353,6 +2504,9 @@ msgstr "发票基于送货单"
#~ msgid "Sale Pricelists"
#~ msgstr "销售价格表"
+#~ msgid "Direct Delivery"
+#~ msgstr "直接送货"
+
#~ msgid ""
#~ "Invoice is created when 'Create Invoice' is being clicked after confirming "
#~ "the sale order. This transaction moves the sale order to invoices."
@@ -2453,6 +2607,245 @@ msgstr "发票基于送货单"
#~ msgid "Sale Order line"
#~ msgstr "销售订单明细"
+#~ msgid "Shipping & Manual Invoice"
+#~ msgstr "发货和手工发票"
+
#, python-format
#~ msgid "You must first cancel all invoices attached to this sale order."
#~ msgstr "您必须先取消所有和这个订单相关的发票。"
+
+#~ msgid "Allows you to compute delivery costs on your quotations."
+#~ msgstr "允许你计算和报价相关的运费"
+
+#~ msgid "Payment Before Delivery"
+#~ msgstr "款到发货"
+
+#~ msgid "Order Reference must be unique !"
+#~ msgstr "单号必须唯一!"
+
+#~ msgid "Enhance your core Sales Application with additional functionalities."
+#~ msgstr "通过额外的功能增强你的核心销售应用程序。"
+
+#~ msgid "Setup your sales workflow and default values."
+#~ msgstr "设置你的销售流程和默认值。"
+
+#~ msgid "Invoice On Order After Delivery"
+#~ msgstr "发货后开票"
+
+#~ msgid " Year "
+#~ msgstr " 年 "
+
+#~ msgid "Picking Default Policy"
+#~ msgstr "默认分拣方式"
+
+#~ msgid "Sales Order Dates"
+#~ msgstr "销售订单日期"
+
+#, python-format
+#~ msgid "You cannot cancel a sales order line that has already been invoiced !"
+#~ msgstr "你不能取消已开票的销售订单 !"
+
+#~ msgid "Delivery Costs"
+#~ msgstr "交货成本"
+
+#~ msgid "title"
+#~ msgstr "标题"
+
+#~ msgid "Order date"
+#~ msgstr "订单日期"
+
+#~ msgid "Invoicing"
+#~ msgstr "开发票"
+
+#, python-format
+#~ msgid "Cannot delete a sales order line which is %s !"
+#~ msgstr "不能删除 %s的销售订单明细 !"
+
+#~ msgid ""
+#~ "Gives the margin of profitability by calculating the difference between Unit "
+#~ "Price and Cost Price."
+#~ msgstr "通过单价和成本价之间的差价设定利润率。"
+
+#~ msgid " Month "
+#~ msgstr " 月 "
+
+#~ msgid " Month-1 "
+#~ msgstr " 上月 "
+
+#~ msgid "Ordered Date"
+#~ msgstr "订购日期"
+
+#~ msgid "Shipped Qty"
+#~ msgstr "交货数量"
+
+#~ msgid "Sales Order Layout Improvement"
+#~ msgstr "改善销售订单样式"
+
+#, python-format
+#~ msgid "Not enough stock !"
+#~ msgstr "库存不足 !"
+
+#, python-format
+#~ msgid "Cannot delete Sales Order(s) which are already confirmed !"
+#~ msgstr "不能删除已被确认的销售订单 !"
+
+#~ msgid "Advance"
+#~ msgstr "预支"
+
+#~ msgid "Layout Sequence"
+#~ msgstr "样式序列号"
+
+#~ msgid "sale.installer"
+#~ msgstr "sale.installer"
+
+#~ msgid "Steps To Deliver a Sales Order"
+#~ msgstr "销售订单发货步骤"
+
+#~ msgid ""
+#~ "Provides some features to improve the layout of the Sales Order reports."
+#~ msgstr "提供一些新的功能来改善销售订单报表的样式。"
+
+#~ msgid "Invoicing journals"
+#~ msgstr "开票日志"
+
+#, python-format
+#~ msgid ""
+#~ "You selected a quantity of %d Units.\n"
+#~ "But it's not compatible with the selected packaging.\n"
+#~ "Here is a proposition of quantities according to the packaging:\n"
+#~ "\n"
+#~ "EAN: %s Quantity: %s Type of ul: %s"
+#~ msgstr ""
+#~ "你选中了%d单位的数量。\n"
+#~ "但是它和选中的装箱单不一致。\n"
+#~ "根据装箱单它的数量应该是:\n"
+#~ "\n"
+#~ "EAN:%s 数量:%s ul类型:%s"
+
+#~ msgid "Adds commitment, requested and effective dates on Sales Orders."
+#~ msgstr "为销售订单添加承诺,申请和生效日期。"
+
+#~ msgid ""
+#~ "Allows you to group and invoice your delivery orders according to different "
+#~ "invoicing types: daily, weekly, etc."
+#~ msgstr "允许你对你的发货单根据不同开票类型:每天,每周等,进行分组和开票。"
+
+#~ msgid ""
+#~ "The Shipping Policy is used to synchronise invoice and delivery operations.\n"
+#~ " - The 'Pay Before delivery' choice will first generate the invoice and "
+#~ "then generate the picking order after the payment of this invoice.\n"
+#~ " - The 'Shipping & Manual Invoice' will create the picking order directly "
+#~ "and wait for the user to manually click on the 'Invoice' button to generate "
+#~ "the draft invoice.\n"
+#~ " - The 'Invoice On Order After Delivery' choice will generate the draft "
+#~ "invoice based on sales order after all picking lists have been finished.\n"
+#~ " - The 'Invoice From The Picking' choice is used to create an invoice "
+#~ "during the picking process."
+#~ msgstr ""
+#~ "运送方式是用于同步发票和发货操作的。\n"
+#~ " - ‘款到发货’选项是先生成发票,然后当收到发票的付款后生成装箱单。\n"
+#~ " - ‘运送并且手工开票’是直接创建装箱单,并且等待用户手工点击‘开票’按钮生成发票草稿。\n"
+#~ " - ‘先发货后开票’选项是在所有装箱单完成之后根据销售订单生成发票草稿。\n"
+#~ " - ‘按装箱单开票’选项是在分拣的过程中生成发票。"
+
+#~ msgid "Margins in Sales Orders"
+#~ msgstr "销售订单利润"
+
+#~ msgid ""
+#~ "\n"
+#~ " The base module to manage quotations and sales orders.\n"
+#~ "\n"
+#~ " * Workflow with validation steps:\n"
+#~ " - Quotation -> Sales order -> Invoice\n"
+#~ " * Invoicing methods:\n"
+#~ " - Invoice on order (before or after shipping)\n"
+#~ " - Invoice on delivery\n"
+#~ " - Invoice on timesheets\n"
+#~ " - Advance invoice\n"
+#~ " * Partners preferences (shipping, invoicing, incoterm, ...)\n"
+#~ " * Products stocks and prices\n"
+#~ " * Delivery methods:\n"
+#~ " - all at once, multi-parcel\n"
+#~ " - delivery costs\n"
+#~ " * Dashboard for salesman that includes:\n"
+#~ " * Your open quotations\n"
+#~ " * Top 10 sales of the month\n"
+#~ " * Cases statistics\n"
+#~ " * Graph of sales by product\n"
+#~ " * Graph of cases of the month\n"
+#~ " "
+#~ msgstr ""
+#~ "\n"
+#~ " 管理报价单和销售订单的基础模块。\n"
+#~ " * 工作流和验证步骤: - 报价 -> 销售订单 -> 开票\n"
+#~ " * 开票方式:\n"
+#~ " - 按订单开票(运送前或后)\n"
+#~ " - 按发货单开票 - 按工时单开票\n"
+#~ " - 预付款发票\n"
+#~ " * 业务伙伴首选项(运送,开票方式...)\n"
+#~ " * 产品库存与价格\n"
+#~ " * 送货方式:\n"
+#~ " - 所有一起,多个包裹\n"
+#~ " - 交货成本\n"
+#~ "\n"
+#~ " * 业务员控制台包括:\n"
+#~ " * 你的未关闭报价单\n"
+#~ " * 月销售前10\n"
+#~ " * 业务个案统计\n"
+#~ " * 产品销售图表\n"
+#~ " * 月业务个案图表\n"
+#~ " "
+
+#~ msgid ""
+#~ "Gives the state of the quotation or sales order. \n"
+#~ "The exception state is automatically set when a cancel operation occurs in "
+#~ "the invoice validation (Invoice Exception) or in the picking list process "
+#~ "(Shipping Exception). \n"
+#~ "The 'Waiting Schedule' state is set when the invoice is confirmed but "
+#~ "waiting for the scheduler to run on the date 'Ordered Date'."
+#~ msgstr ""
+#~ "指定报价单或销售订单的状态\n"
+#~ "当发票验证被取消(发票异常),或取消装箱单里的产品(运输异常)的时候,会被设置为异常状态。\n"
+#~ "当发票被确认但在“订单日期”那天正等待日程安排会被设置为‘等待日程安排’状态。"
+
+#~ msgid "Configure Your Sales Management Application"
+#~ msgstr "设置销售管理应用程序"
+
+#~ msgid ""
+#~ "The Shipping Policy is used to configure per order if you want to deliver as "
+#~ "soon as possible when one product is available or you wait that all products "
+#~ "are available.."
+#~ msgstr "运输方式是用于设置每张销售订单是否有一个产品有效时尽可能早发货,还是等所有产品都准备好了才尽可能早发货。"
+
+#~ msgid "Configure"
+#~ msgstr "设置"
+
+#~ msgid "Configuration Progress"
+#~ msgstr "设置进度"
+
+#~ msgid "Configure Sales Order Logistics"
+#~ msgstr "设置销售单物流信息"
+
+#~ msgid "Sales Application Configuration"
+#~ msgstr "销售应用程序设置"
+
+#~ msgid "Configure Picking Policy for Sales Order"
+#~ msgstr "设置销售订单的提货政策"
+
+#~ msgid ""
+#~ "By default, OpenERP is able to manage complex routing and paths of products "
+#~ "in your warehouse and partner locations. This will configure the most common "
+#~ "and simple methods to deliver products to the customer in one or two "
+#~ "operations by the worker."
+#~ msgstr ""
+#~ "默认情况下,OpenERP能够管理仓库和业务伙伴库位之间复杂的路线和路径。此设置能够配置最常用、最简单的方式来发货给各户,员工只需1或2个操作。"
+
+#, python-format
+#~ msgid "Picking Information !"
+#~ msgstr "装箱单信息 !"
+
+#~ msgid "Invoice From The Picking"
+#~ msgstr "来自装箱单的发票"
+
+#~ msgid "Picking List & Delivery Order"
+#~ msgstr "装箱单 & 发货单"
diff --git a/addons/sale/i18n/zh_TW.po b/addons/sale/i18n/zh_TW.po
index 6f56f744f9c..a9608b4bcc9 100644
--- a/addons/sale/i18n/zh_TW.po
+++ b/addons/sale/i18n/zh_TW.po
@@ -6,25 +6,32 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2011-01-11 11:16+0000\n"
+"POT-Creation-Date: 2011-12-22 18:43+0000\n"
"PO-Revision-Date: 2010-08-07 04:21+0000\n"
"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-05 05:17+0000\n"
-"X-Generator: Launchpad (build 14231)\n"
+"X-Launchpad-Export-Date: 2011-12-23 06:47+0000\n"
+"X-Generator: Launchpad (build 14560)\n"
#. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_sales_by_salesman
-msgid "Sales by Salesman in last 90 days"
+#: field:sale.config.picking_policy,timesheet:0
+msgid "Based on Timesheet"
msgstr ""
#. module: sale
-#: help:sale.installer,delivery:0
-msgid "Allows you to compute delivery costs on your quotations."
+#: view:sale.order.line:0
+msgid ""
+"Sale Order Lines that are confirmed, done or in exception state and haven't "
+"yet been invoiced"
+msgstr ""
+
+#. module: sale
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_sales_by_salesman
+msgid "Sales by Salesman in last 90 days"
msgstr ""
#. module: sale
@@ -35,6 +42,11 @@ msgid ""
msgstr "如庫存不足以一次過交貨,是否接受部份交貨?"
#. module: sale
+#: view:sale.order:0
+msgid "UoS"
+msgstr ""
+
+#. module: sale
#: help:sale.order,partner_shipping_id:0
msgid "Shipping address for current sales order."
msgstr ""
@@ -58,22 +70,12 @@ msgid "Cancel Order"
msgstr "取消訂單"
#. module: sale
-#: view:sale.config.picking_policy:0
-msgid "Configure Sales Order Logistics"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:603
+#: code:addons/sale/sale.py:638
#, python-format
msgid "The quotation '%s' has been converted to a sales order."
msgstr ""
#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Payment Before Delivery"
-msgstr "交貨前先付款"
-
-#. module: sale
#: code:addons/sale/wizard/sale_make_invoice.py:42
#, python-format
msgid "Warning !"
@@ -90,12 +92,6 @@ msgid "Drives procurement orders for every sales order line."
msgstr ""
#. module: sale
-#: selection:sale.config.picking_policy,picking_policy:0
-msgid "All at Once"
-msgstr "一次過"
-
-#. module: sale
-#: field:sale.order,project_id:0
#: view:sale.report:0
#: field:sale.report,analytic_account_id:0
#: field:sale.shop,project_id:0
@@ -111,6 +107,15 @@ msgid ""
msgstr ""
#. module: sale
+#: code:addons/sale/sale.py:295
+#, python-format
+msgid ""
+"In order to delete a confirmed sale order, you must cancel it before ! To "
+"cancel a sale order, you must first cancel related picking or delivery "
+"orders."
+msgstr ""
+
+#. module: sale
#: model:process.node,name:sale.process_node_saleprocurement0
msgid "Procurement Order"
msgstr ""
@@ -122,6 +127,11 @@ msgid "Partner"
msgstr ""
#. module: sale
+#: selection:sale.order,order_policy:0
+msgid "Invoice based on deliveries"
+msgstr ""
+
+#. module: sale
#: view:sale.order:0
msgid "Order Line"
msgstr "訂單明細"
@@ -154,8 +164,13 @@ msgid "Default Payment Term"
msgstr "標準付款條件"
#. module: sale
-#: model:ir.actions.act_window,name:sale.action_config_picking_policy
-msgid "Configure Picking Policy for Sales Order"
+#: field:sale.config.picking_policy,deli_orders:0
+msgid "Based on Delivery Orders"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.picking_policy,time_unit:0
+msgid "Main Working Time Unit"
msgstr ""
#. module: sale
@@ -172,9 +187,10 @@ msgid "Disc.(%)"
msgstr "折扣(%)"
#. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_forceassignation0
-msgid "Force Assignation"
-msgstr "強制指定"
+#: view:sale.report:0
+#: field:sale.report,price_total:0
+msgid "Total Price"
+msgstr ""
#. module: sale
#: help:sale.make.invoice,grouped:0
@@ -182,6 +198,11 @@ msgid "Check the box to group the invoices for the same customers"
msgstr ""
#. module: sale
+#: view:sale.order:0
+msgid "My Sale Orders"
+msgstr ""
+
+#. module: sale
#: selection:sale.order,invoice_quantity:0
msgid "Ordered Quantities"
msgstr "已訂數量"
@@ -220,13 +241,24 @@ msgid ""
msgstr ""
#. module: sale
+#: field:sale.config.picking_policy,task_work:0
+msgid "Based on Tasks' Work"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
+msgid "Quotations and Sales"
+msgstr ""
+
+#. module: sale
#: model:ir.model,name:sale.model_sale_make_invoice
msgid "Sales Make Invoice"
msgstr ""
#. module: sale
-#: view:sale.order:0
-msgid "Recreate Packing"
+#: code:addons/sale/sale.py:330
+#, python-format
+msgid "Pricelist Warning!"
msgstr ""
#. module: sale
@@ -235,10 +267,10 @@ msgid "Discount (%)"
msgstr "折扣(%)"
#. module: sale
-#: help:res.company,security_lead:0
-msgid ""
-"This is the days added to what you promise to customers for security purpose"
-msgstr ""
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_quotation_for_sale
+msgid "My Quotations"
+msgstr "我的報價單"
#. module: sale
#: view:board.board:0
@@ -263,7 +295,22 @@ msgid "Shop Name"
msgstr "商店名稱"
#. module: sale
-#: code:addons/sale/sale.py:1014
+#: help:sale.order,order_policy:0
+msgid ""
+"The Invoice Policy is used to synchronise invoice and delivery operations.\n"
+" - The 'Pay before delivery' choice will first generate the invoice and "
+"then generate the picking order after the payment of this invoice.\n"
+" - The 'Deliver & Invoice on demand' will create the picking order directly "
+"and wait for the user to manually click on the 'Invoice' button to generate "
+"the draft invoice based on the sale order or the sale order lines.\n"
+" - The 'Invoice on order after delivery' choice will generate the draft "
+"invoice based on sales order after all picking lists have been finished.\n"
+" - The 'Invoice based on deliveries' choice is used to create an invoice "
+"during the picking process."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:1158
#, python-format
msgid "No Customer Defined !"
msgstr "未定義客戶 !"
@@ -274,9 +321,12 @@ msgid "Sales in Exception"
msgstr "銷售異常情況"
#. module: sale
-#: view:sale.order:0
-msgid "Set to Draft"
-msgstr "設為草稿"
+#: code:addons/sale/sale.py:1145
+#: code:addons/sale/sale.py:1264
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:70
+#, python-format
+msgid "Configuration Error !"
+msgstr ""
#. module: sale
#: view:sale.order:0
@@ -284,22 +334,7 @@ msgid "Conditions"
msgstr ""
#. module: sale
-#: help:sale.order,order_policy:0
-msgid ""
-"The Shipping Policy is used to synchronise invoice and delivery operations.\n"
-" - The 'Pay Before delivery' choice will first generate the invoice and "
-"then generate the picking order after the payment of this invoice.\n"
-" - The 'Shipping & Manual Invoice' will create the picking order directly "
-"and wait for the user to manually click on the 'Invoice' button to generate "
-"the draft invoice.\n"
-" - The 'Invoice On Order After Delivery' choice will generate the draft "
-"invoice based on sales order after all picking lists have been finished.\n"
-" - The 'Invoice From The Picking' choice is used to create an invoice "
-"during the picking process."
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:939
+#: code:addons/sale/sale.py:1034
#, python-format
msgid ""
"There is no income category account defined in default Properties for "
@@ -307,8 +342,8 @@ msgid ""
msgstr ""
#. module: sale
-#: view:sale.installer:0
-msgid "Configure"
+#: selection:sale.report,month:0
+msgid "August"
msgstr ""
#. module: sale
@@ -317,7 +352,7 @@ msgid "You try to assign a lot which is not from the same product"
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:620
+#: code:addons/sale/sale.py:655
#, python-format
msgid "invalid mode for test_state"
msgstr ""
@@ -328,7 +363,7 @@ msgid "June"
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:584
+#: code:addons/sale/sale.py:617
#, python-format
msgid "Could not cancel this sales order !"
msgstr ""
@@ -349,8 +384,12 @@ msgid "October"
msgstr ""
#. module: sale
+#: sql_constraint:stock.picking:0
+msgid "Reference must be unique per Company!"
+msgstr ""
+
+#. module: sale
#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_quotation_for_sale
#: view:sale.order:0
#: view:sale.report:0
msgid "Quotations"
@@ -362,11 +401,6 @@ msgid "Pricelist for current sales order."
msgstr ""
#. module: sale
-#: selection:sale.config.picking_policy,step:0
-msgid "Delivery Order Only"
-msgstr "只交貨單"
-
-#. module: sale
#: report:sale.order:0
msgid "TVA :"
msgstr "增值稅(TVA) :"
@@ -391,6 +425,7 @@ msgstr ""
#. module: sale
#: view:sale.order:0
#: view:sale.order.line:0
+#: field:sale.report,product_uom:0
msgid "UoM"
msgstr "量度單位(UoM)"
@@ -413,13 +448,19 @@ msgid ""
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:971
+#: code:addons/sale/sale.py:1061
+#, python-format
+msgid "You cannot cancel a sale order line that has already been invoiced!"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:1066
#, python-format
msgid "You must first cancel stock moves attached to this sales order line."
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:1042
+#: code:addons/sale/sale.py:1134
#, python-format
msgid "(n/a)"
msgstr ""
@@ -453,13 +494,35 @@ msgid "Notes"
msgstr "備註"
#. module: sale
+#: sql_constraint:res.company:0
+msgid "The company name must be unique !"
+msgstr ""
+
+#. module: sale
#: help:sale.order,partner_invoice_id:0
msgid "Invoice address for current sales order."
msgstr ""
#. module: sale
-#: view:sale.installer:0
-msgid "Enhance your core Sales Application with additional functionalities."
+#: view:sale.report:0
+msgid "Month-1"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered month of the sales order"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:504
+#, python-format
+msgid ""
+"You cannot group sales having different currencies for the same partner."
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,picking_policy:0
+msgid "Deliver each product when available"
msgstr ""
#. module: sale
@@ -479,18 +542,40 @@ msgid "Confirmation Date"
msgstr ""
#. module: sale
+#: field:sale.order,incoterm:0
+msgid "Incoterm"
+msgstr "國際商業用語"
+
+#. module: sale
#: field:sale.order.line,address_allotment_id:0
msgid "Allotment Partner"
msgstr ""
#. module: sale
-#: sql_constraint:sale.order:0
-msgid "Order Reference must be unique !"
+#: selection:sale.report,month:0
+msgid "March"
msgstr ""
#. module: sale
-#: selection:sale.report,month:0
-msgid "March"
+#: constraint:stock.move:0
+msgid "You can not move products from or to a location of the type view."
+msgstr ""
+
+#. module: sale
+#: field:sale.config.picking_policy,sale_orders:0
+msgid "Based on Sales Orders"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,state:0
+msgid ""
+"Givwizard = self.browse(cr, uid, ids)[0]es the state of the quotation or "
+"sales order. \n"
+"The exception state is automatically set when a cancel operation occurs in "
+"the invoice validation (Invoice Exception) or in the picking list process "
+"(Shipping Exception). \n"
+"The 'Waiting Schedule' state is set when the invoice is confirmed but "
+"waiting for the scheduler to run on the order date."
msgstr ""
#. module: sale
@@ -509,6 +594,11 @@ msgid "Invoice address :"
msgstr "發票地址 :"
#. module: sale
+#: field:sale.order.line,sequence:0
+msgid "Line Sequence"
+msgstr ""
+
+#. module: sale
#: model:process.transition,note:sale.process_transition_saleorderprocurement0
msgid ""
"For every sales order line, a procurement order is created to supply the "
@@ -555,11 +645,6 @@ msgid "Sales Order Line"
msgstr ""
#. module: sale
-#: view:sale.config.picking_policy:0
-msgid "Setup your sales workflow and default values."
-msgstr ""
-
-#. module: sale
#: field:sale.shop,warehouse_id:0
msgid "Warehouse"
msgstr "倉庫"
@@ -596,6 +681,11 @@ msgid "Creation Date"
msgstr ""
#. module: sale
+#: model:ir.ui.menu,name:sale.menu_sales_configuration_misc
+msgid "Miscellaneous"
+msgstr ""
+
+#. module: sale
#: model:ir.actions.act_window,name:sale.action_order_line_tree3
msgid "Uninvoiced and Delivered Lines"
msgstr "未開票運貨明細"
@@ -611,14 +701,19 @@ msgid "My Sales"
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:290
-#: code:addons/sale/sale.py:966
-#: code:addons/sale/sale.py:1165
+#: code:addons/sale/sale.py:295
+#: code:addons/sale/sale.py:1061
+#: code:addons/sale/sale.py:1290
#, python-format
msgid "Invalid action !"
msgstr "無效動作!"
#. module: sale
+#: view:sale.order:0
+msgid "Extra Info"
+msgstr "額外訊息"
+
+#. module: sale
#: field:sale.order,pricelist_id:0
#: field:sale.report,pricelist_id:0
#: field:sale.shop,pricelist_id:0
@@ -632,13 +727,21 @@ msgid "# of Qty"
msgstr ""
#. module: sale
+#: code:addons/sale/sale.py:1314
+#, python-format
+msgid "Hour"
+msgstr ""
+
+#. module: sale
#: view:sale.order:0
msgid "Order Date"
msgstr ""
#. module: sale
#: view:sale.order.line:0
+#: view:sale.report:0
#: field:sale.report,shipped:0
+#: field:sale.report,shipped_qty_1:0
msgid "Shipped"
msgstr ""
@@ -648,8 +751,8 @@ msgid "All Quotations"
msgstr "所有報價單"
#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Invoice On Order After Delivery"
+#: view:sale.config.picking_policy:0
+msgid "Options"
msgstr ""
#. module: sale
@@ -658,6 +761,20 @@ msgid "September"
msgstr ""
#. module: sale
+#: code:addons/sale/sale.py:632
+#, python-format
+msgid "You cannot confirm a sale order which has no line."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:1246
+#, python-format
+msgid ""
+"You have to select a pricelist or a customer in the sales form !\n"
+"Please set one before choosing a product."
+msgstr ""
+
+#. module: sale
#: view:sale.report:0
#: field:sale.report,categ_id:0
msgid "Category of Product"
@@ -674,11 +791,6 @@ msgid "Stock Moves"
msgstr "庫存調動"
#. module: sale
-#: view:sale.report:0
-msgid " Year "
-msgstr ""
-
-#. module: sale
#: field:sale.order,state:0
#: field:sale.report,state:0
msgid "Order State"
@@ -696,7 +808,7 @@ msgid "Sales By Month"
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:970
+#: code:addons/sale/sale.py:1065
#, python-format
msgid "Could not cancel sales order line!"
msgstr ""
@@ -729,42 +841,19 @@ msgid ""
msgstr ""
#. module: sale
-#: view:sale.report:0
-msgid "Extended Filters..."
+#: field:sale.order,date_order:0
+msgid "Date"
msgstr ""
#. module: sale
-#: model:ir.module.module,description:sale.module_meta_information
-msgid ""
-"\n"
-" The base module to manage quotations and sales orders.\n"
-"\n"
-" * Workflow with validation steps:\n"
-" - Quotation -> Sales order -> Invoice\n"
-" * Invoicing methods:\n"
-" - Invoice on order (before or after shipping)\n"
-" - Invoice on delivery\n"
-" - Invoice on timesheets\n"
-" - Advance invoice\n"
-" * Partners preferences (shipping, invoicing, incoterm, ...)\n"
-" * Products stocks and prices\n"
-" * Delivery methods:\n"
-" - all at once, multi-parcel\n"
-" - delivery costs\n"
-" * Dashboard for salesman that includes:\n"
-" * Your open quotations\n"
-" * Top 10 sales of the month\n"
-" * Cases statistics\n"
-" * Graph of sales by product\n"
-" * Graph of cases of the month\n"
-" "
+#: view:sale.report:0
+msgid "Extended Filters..."
msgstr ""
#. module: sale
-#: model:ir.model,name:sale.model_sale_shop
-#: view:sale.shop:0
-msgid "Sales Shop"
-msgstr ""
+#: selection:sale.order.line,state:0
+msgid "Exception"
+msgstr "異常情況"
#. module: sale
#: model:ir.model,name:sale.model_res_company
@@ -772,8 +861,9 @@ msgid "Companies"
msgstr ""
#. module: sale
-#: selection:sale.report,month:0
-msgid "November"
+#: code:addons/sale/sale.py:1259
+#, python-format
+msgid "No valid pricelist line found ! :"
msgstr ""
#. module: sale
@@ -782,8 +872,8 @@ msgid "History"
msgstr "歷史記錄"
#. module: sale
-#: field:sale.config.picking_policy,picking_policy:0
-msgid "Picking Default Policy"
+#: selection:sale.order,order_policy:0
+msgid "Invoice on order after delivery"
msgstr ""
#. module: sale
@@ -806,13 +896,12 @@ msgid ""
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:966
-#, python-format
-msgid "You cannot cancel a sales order line that has already been invoiced !"
+#: help:res.company,security_lead:0
+msgid ""
+"This is the days added to what you promise to customers for security purpose"
msgstr ""
#. module: sale
-#: view:sale.order:0
#: view:sale.order.line:0
msgid "Qty"
msgstr "數量"
@@ -823,6 +912,11 @@ msgid "References"
msgstr ""
#. module: sale
+#: view:sale.order.line:0
+msgid "My Sales Order Lines"
+msgstr ""
+
+#. module: sale
#: model:process.transition.action,name:sale.process_transition_action_cancel0
#: model:process.transition.action,name:sale.process_transition_action_cancel1
#: model:process.transition.action,name:sale.process_transition_action_cancel2
@@ -834,16 +928,11 @@ msgid "Cancel"
msgstr "取消"
#. module: sale
-#: field:sale.installer,sale_order_dates:0
-msgid "Sales Order Dates"
+#: sql_constraint:sale.order:0
+msgid "Order Reference must be unique per Company!"
msgstr ""
#. module: sale
-#: selection:sale.order.line,state:0
-msgid "Exception"
-msgstr "異常情況"
-
-#. module: sale
#: model:process.transition,name:sale.process_transition_invoice0
#: model:process.transition,name:sale.process_transition_invoiceafterdelivery0
#: model:process.transition.action,name:sale.process_transition_action_createinvoice0
@@ -853,19 +942,19 @@ msgid "Create Invoice"
msgstr "開立發票"
#. module: sale
-#: field:sale.installer,sale_margin:0
-msgid "Margins in Sales Orders"
+#: view:sale.order:0
+msgid "Total Tax Excluded"
msgstr ""
#. module: sale
-#: view:sale.order:0
-msgid "Total Tax Excluded"
+#: view:sale.order.line:0
+msgid "Order reference"
msgstr ""
#. module: sale
-#: view:sale.order:0
-msgid "Compute"
-msgstr "計算"
+#: view:sale.open.invoice:0
+msgid "You invoice has been successfully created!"
+msgstr ""
#. module: sale
#: view:sale.report:0
@@ -884,23 +973,20 @@ msgid "Open Invoice"
msgstr ""
#. module: sale
-#: report:sale.order:0
-#: view:sale.order.line:0
-msgid "Price"
-msgstr "價格"
+#: model:ir.actions.server,name:sale.ir_actions_server_edi_sale
+msgid "Auto-email confirmed sale orders"
+msgstr ""
#. module: sale
-#: model:ir.actions.act_window,name:sale.action_sale_installer
-#: view:sale.config.picking_policy:0
-#: view:sale.installer:0
-msgid "Sales Application Configuration"
+#: code:addons/sale/sale.py:413
+#, python-format
+msgid "There is no sales journal defined for this company: \"%s\" (id:%d)"
msgstr ""
#. module: sale
-#: view:sale.report:0
-#: field:sale.report,price_total:0
-msgid "Total Price"
-msgstr ""
+#: model:process.transition.action,name:sale.process_transition_action_forceassignation0
+msgid "Force Assignation"
+msgstr "強制指定"
#. module: sale
#: selection:sale.order.line,type:0
@@ -913,6 +999,11 @@ msgid "Based on the shipped or on the ordered quantities."
msgstr ""
#. module: sale
+#: selection:sale.order,picking_policy:0
+msgid "Deliver all products at once"
+msgstr ""
+
+#. module: sale
#: field:sale.order,picking_ids:0
msgid "Related Picking"
msgstr ""
@@ -944,8 +1035,14 @@ msgid "Create Delivery Order"
msgstr ""
#. module: sale
-#: field:sale.installer,delivery:0
-msgid "Delivery Costs"
+#: code:addons/sale/sale.py:1290
+#, python-format
+msgid "Cannot delete a sales order line which is in state '%s'!"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Qty(UoS)"
msgstr ""
#. module: sale
@@ -960,13 +1057,13 @@ msgstr ""
#. module: sale
#: view:sale.report:0
-msgid "Sales by Product Category"
+msgid "Ordered date of the sales order"
msgstr ""
#. module: sale
-#: selection:sale.order,picking_policy:0
-msgid "Partial Delivery"
-msgstr "部份交貨"
+#: view:sale.report:0
+msgid "Sales by Product Category"
+msgstr ""
#. module: sale
#: model:process.transition,name:sale.process_transition_confirmquotation0
@@ -974,9 +1071,10 @@ msgid "Confirm Quotation"
msgstr "確認報價"
#. module: sale
-#: help:sale.order,origin:0
-msgid "Reference of the document that generated this sales order request."
-msgstr ""
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:63
+#, python-format
+msgid "Error"
+msgstr "錯誤"
#. module: sale
#: view:sale.order:0
@@ -1008,20 +1106,14 @@ msgid "Procurement Method"
msgstr ""
#. module: sale
-#: view:sale.config.picking_policy:0
-#: view:sale.installer:0
-msgid "title"
-msgstr ""
-
-#. module: sale
#: model:process.node,name:sale.process_node_packinglist0
msgid "Pick List"
msgstr ""
#. module: sale
#: view:sale.order:0
-msgid "Order date"
-msgstr ""
+msgid "Set to Draft"
+msgstr "設為草稿"
#. module: sale
#: model:process.node,note:sale.process_node_packinglist0
@@ -1029,6 +1121,85 @@ msgid "Document of the move to the output or to the customer."
msgstr ""
#. module: sale
+#: model:email.template,body_text:sale.email_template_edi_sale
+msgid ""
+"\n"
+"Hello${object.partner_order_id.name and ' ' or "
+"''}${object.partner_order_id.name or ''},\n"
+"\n"
+"Here is your order confirmation for ${object.partner_id.name}:\n"
+" | Order number: *${object.name}*\n"
+" | Order total: *${object.amount_total} "
+"${object.pricelist_id.currency_id.name}*\n"
+" | Order date: ${object.date_order}\n"
+" % if object.origin:\n"
+" | Order reference: ${object.origin}\n"
+" % endif\n"
+" % if object.client_order_ref:\n"
+" | Your reference: ${object.client_order_ref}<br />\n"
+" % endif\n"
+" | Your contact: ${object.user_id.name} ${object.user_id.user_email "
+"and '<%s>'%(object.user_id.user_email) or ''}\n"
+"\n"
+"You can view the order confirmation, download it and even pay online using "
+"the following link:\n"
+" ${ctx.get('edi_web_url_view') or 'n/a'}\n"
+"\n"
+"% if object.order_policy in ('prepaid','manual') and "
+"object.company_id.paypal_account:\n"
+"<% \n"
+"comp_name = quote(object.company_id.name)\n"
+"order_name = quote(object.name)\n"
+"paypal_account = quote(object.company_id.paypal_account)\n"
+"order_amount = quote(str(object.amount_total))\n"
+"cur_name = quote(object.pricelist_id.currency_id.name)\n"
+"paypal_url = \"https://www.paypal.com/cgi-"
+"bin/webscr?cmd=_xclick&business=%s&item_name=%s%%20Order%%20%s&invoice=%s&amo"
+"unt=%s\" \\\n"
+" "
+"\"&currency_code=%s&button_subtype=services&no_note=1&bn=OpenERP_Order_PayNow"
+"_%s\" % \\\n"
+" "
+"(paypal_account,comp_name,order_name,order_name,order_amount,cur_name,cur_nam"
+"e)\n"
+"%>\n"
+"It is also possible to directly pay with Paypal:\n"
+" ${paypal_url}\n"
+"% endif\n"
+"\n"
+"If you have any question, do not hesitate to contact us.\n"
+"\n"
+"\n"
+"Thank you for choosing ${object.company_id.name}!\n"
+"\n"
+"\n"
+"--\n"
+"${object.user_id.name} ${object.user_id.user_email and "
+"'<%s>'%(object.user_id.user_email) or ''}\n"
+"${object.company_id.name}\n"
+"% if object.company_id.street:\n"
+"${object.company_id.street or ''}\n"
+"% endif\n"
+"% if object.company_id.street2:\n"
+"${object.company_id.street2}\n"
+"% endif\n"
+"% if object.company_id.city or object.company_id.zip:\n"
+"${object.company_id.zip or ''} ${object.company_id.city or ''}\n"
+"% endif\n"
+"% if object.company_id.country_id:\n"
+"${object.company_id.state_id and ('%s, ' % object.company_id.state_id.name) "
+"or ''} ${object.company_id.country_id.name or ''}\n"
+"% endif\n"
+"% if object.company_id.phone:\n"
+"Phone: ${object.company_id.phone}\n"
+"% endif\n"
+"% if object.company_id.website:\n"
+"${object.company_id.website or ''}\n"
+"% endif\n"
+" "
+msgstr ""
+
+#. module: sale
#: model:process.transition.action,name:sale.process_transition_action_validate0
msgid "Validate"
msgstr "審核"
@@ -1051,9 +1222,9 @@ msgid "Taxes"
msgstr "稅"
#. module: sale
-#: field:sale.order,order_policy:0
-msgid "Shipping Policy"
-msgstr "貨運規則"
+#: view:sale.order:0
+msgid "Sales Order ready to be invoiced"
+msgstr ""
#. module: sale
#: help:sale.order,create_date:0
@@ -1072,9 +1243,9 @@ msgid "Create Invoices"
msgstr ""
#. module: sale
-#: view:sale.order:0
-msgid "Extra Info"
-msgstr "額外訊息"
+#: view:sale.report:0
+msgid "Sales order created in current month"
+msgstr ""
#. module: sale
#: report:sale.order:0
@@ -1082,11 +1253,24 @@ msgid "Fax :"
msgstr "傳真 :"
#. module: sale
+#: help:sale.order.line,type:0
+msgid ""
+"If 'on order', it triggers a procurement when the sale order is confirmed to "
+"create a task, purchase order or manufacturing order linked to this sale "
+"order line."
+msgstr ""
+
+#. module: sale
#: field:sale.advance.payment.inv,amount:0
msgid "Advance Amount"
msgstr ""
#. module: sale
+#: field:sale.config.picking_policy,charge_delivery:0
+msgid "Do you charge the delivery?"
+msgstr ""
+
+#. module: sale
#: selection:sale.order,invoice_quantity:0
msgid "Shipped Quantities"
msgstr "已運送數量"
@@ -1097,25 +1281,45 @@ msgid "Invoice Based on Sales Orders"
msgstr "基於銷貨單的發票"
#. module: sale
+#: code:addons/sale/sale.py:331
+#, python-format
+msgid ""
+"If you change the pricelist of this order (and eventually the currency), "
+"prices of existing order lines will not be updated."
+msgstr ""
+
+#. module: sale
#: model:ir.model,name:sale.model_stock_picking
msgid "Picking List"
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:387
-#: code:addons/sale/sale.py:920
-#: code:addons/sale/sale.py:938
+#: code:addons/sale/sale.py:412
+#: code:addons/sale/sale.py:503
+#: code:addons/sale/sale.py:632
+#: code:addons/sale/sale.py:1015
+#: code:addons/sale/sale.py:1033
#, python-format
msgid "Error !"
msgstr "錯誤 !"
#. module: sale
-#: code:addons/sale/sale.py:570
+#: code:addons/sale/sale.py:603
#, python-format
msgid "Could not cancel sales order !"
msgstr ""
#. module: sale
+#: view:sale.order:0
+msgid "Qty(UoM)"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered Year of the sales order"
+msgstr ""
+
+#. module: sale
#: selection:sale.report,month:0
msgid "July"
msgstr ""
@@ -1132,35 +1336,25 @@ msgid "Shipping Exception"
msgstr "貨運異常情況"
#. module: sale
-#: field:sale.make.invoice,grouped:0
-msgid "Group the invoices"
-msgstr "發票分類"
-
-#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Shipping & Manual Invoice"
-msgstr "貨運 及 手動發票"
-
-#. module: sale
-#: code:addons/sale/sale.py:1051
+#: code:addons/sale/sale.py:1143
#, python-format
-msgid "Picking Information !"
+msgid "Picking Information ! : "
msgstr ""
#. module: sale
-#: view:sale.report:0
-#: field:sale.report,month:0
-msgid "Month"
-msgstr ""
+#: field:sale.make.invoice,grouped:0
+msgid "Group the invoices"
+msgstr "發票分類"
#. module: sale
-#: model:ir.module.module,shortdesc:sale.module_meta_information
-msgid "Sales Management"
-msgstr "業務管理"
+#: field:sale.order,order_policy:0
+msgid "Invoice Policy"
+msgstr ""
#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Invoice From The Picking"
+#: model:ir.actions.act_window,name:sale.action_config_picking_policy
+#: view:sale.config.picking_policy:0
+msgid "Setup your Invoicing Method"
msgstr ""
#. module: sale
@@ -1170,27 +1364,30 @@ msgstr ""
#. module: sale
#: view:sale.report:0
-#: field:sale.report,uom_name:0
msgid "Reference UoM"
msgstr ""
#. module: sale
+#: view:sale.config.picking_policy:0
+msgid ""
+"This tool will help you to install the right module and configure the system "
+"according to the method you use to invoice your customers."
+msgstr ""
+
+#. module: sale
#: model:ir.model,name:sale.model_sale_order_line_make_invoice
msgid "Sale OrderLine Make_invoice"
msgstr ""
#. module: sale
-#: help:sale.config.picking_policy,step:0
-msgid ""
-"By default, OpenERP is able to manage complex routing and paths of products "
-"in your warehouse and partner locations. This will configure the most common "
-"and simple methods to deliver products to the customer in one or two "
-"operations by the worker."
-msgstr ""
+#: selection:sale.order,state:0
+#: selection:sale.report,state:0
+msgid "Invoice Exception"
+msgstr "發票異常情況"
#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_tree
-msgid "Old Quotations"
+#: model:process.node,note:sale.process_node_saleorder0
+msgid "Drives procurement and invoicing"
msgstr ""
#. module: sale
@@ -1206,6 +1403,22 @@ msgid "Sales Analysis"
msgstr ""
#. module: sale
+#: code:addons/sale/sale.py:1138
+#, python-format
+msgid ""
+"You selected a quantity of %d Units.\n"
+"But it's not compatible with the selected packaging.\n"
+"Here is a proposition of quantities according to the packaging:\n"
+"EAN: %s Quantity: %s Type of ul: %s"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Recreate Packing"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
#: field:sale.order.line,property_ids:0
msgid "Properties"
msgstr ""
@@ -1232,7 +1445,17 @@ msgid ""
msgstr ""
#. module: sale
-#: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
+#: view:sale.order.line:0
+msgid "Confirmed sale order lines, not yet delivered"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:473
+#, python-format
+msgid "Customer Invoices"
+msgstr ""
+
+#. module: sale
#: model:process.process,name:sale.process_process_salesprocess0
#: view:sale.order:0
#: view:sale.report:0
@@ -1254,18 +1477,13 @@ msgid "Done"
msgstr "完成"
#. module: sale
-#: model:ir.model,name:sale.model_sale_installer
-msgid "sale.installer"
-msgstr ""
-
-#. module: sale
#: model:process.node,name:sale.process_node_invoice0
#: model:process.node,name:sale.process_node_invoiceafterdelivery0
msgid "Invoice"
msgstr "發票"
#. module: sale
-#: code:addons/sale/sale.py:1014
+#: code:addons/sale/sale.py:1158
#, python-format
msgid ""
"You have to select a customer in the sales form !\n"
@@ -1273,11 +1491,6 @@ msgid ""
msgstr ""
#. module: sale
-#: selection:sale.config.picking_policy,step:0
-msgid "Picking List & Delivery Order"
-msgstr ""
-
-#. module: sale
#: field:sale.order,origin:0
msgid "Source Document"
msgstr ""
@@ -1303,7 +1516,7 @@ msgid "The amount without tax."
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:571
+#: code:addons/sale/sale.py:604
#, python-format
msgid "You must first cancel all picking attached to this sales order."
msgstr ""
@@ -1314,9 +1527,15 @@ msgid "Sales Advance Payment Invoice"
msgstr ""
#. module: sale
-#: field:sale.order,incoterm:0
-msgid "Incoterm"
-msgstr "國際商業用語"
+#: view:sale.report:0
+#: field:sale.report,month:0
+msgid "Month"
+msgstr ""
+
+#. module: sale
+#: model:email.template,subject:sale.email_template_edi_sale
+msgid "${object.company_id.name} Order (Ref ${object.name or 'n/a' })"
+msgstr ""
#. module: sale
#: view:sale.order.line:0
@@ -1327,11 +1546,6 @@ msgid "Product"
msgstr "產品"
#. module: sale
-#: model:ir.ui.menu,name:sale.menu_invoiced
-msgid "Invoicing"
-msgstr ""
-
-#. module: sale
#: model:process.transition.action,name:sale.process_transition_action_cancelassignation0
msgid "Cancel Assignation"
msgstr "取消指派"
@@ -1342,14 +1556,10 @@ msgid "sale.config.picking_policy"
msgstr ""
#. module: sale
-#: help:sale.order,state:0
-msgid ""
-"Gives the state of the quotation or sales order. \n"
-"The exception state is automatically set when a cancel operation occurs in "
-"the invoice validation (Invoice Exception) or in the picking list process "
-"(Shipping Exception). \n"
-"The 'Waiting Schedule' state is set when the invoice is confirmed but "
-"waiting for the scheduler to run on the date 'Ordered Date'."
+#: view:account.invoice.report:0
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_turnover_by_month
+msgid "Monthly Turnover"
msgstr ""
#. module: sale
@@ -1368,7 +1578,6 @@ msgid "Product UoS"
msgstr ""
#. module: sale
-#: selection:sale.order,state:0
#: selection:sale.report,state:0
msgid "Manual In Progress"
msgstr "手動進行中"
@@ -1389,7 +1598,8 @@ msgid "Order"
msgstr "訂單"
#. module: sale
-#: code:addons/sale/sale.py:921
+#: code:addons/sale/sale.py:1016
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:71
#, python-format
msgid "There is no income account defined for this product: \"%s\" (id:%d)"
msgstr ""
@@ -1409,7 +1619,7 @@ msgid ""
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:1116
+#: code:addons/sale/sale.py:1238
#, python-format
msgid ""
"You plan to sell %.2f %s but you only have %.2f %s available !\n"
@@ -1438,10 +1648,10 @@ msgid "Total"
msgstr "總計"
#. module: sale
-#: code:addons/sale/sale.py:388
-#, python-format
-msgid "There is no sales journal defined for this company: \"%s\" (id:%d)"
-msgstr ""
+#: report:sale.order:0
+#: view:sale.order.line:0
+msgid "Price"
+msgstr "價格"
#. module: sale
#: model:process.transition,note:sale.process_transition_deliver0
@@ -1452,9 +1662,14 @@ msgid ""
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:1165
-#, python-format
-msgid "Cannot delete a sales order line which is %s !"
+#: selection:sale.order,order_policy:0
+msgid "Pay before delivery"
+msgstr ""
+
+#. module: sale
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.open_board_sales
+msgid "Sales Dashboard"
msgstr ""
#. module: sale
@@ -1466,6 +1681,7 @@ msgstr ""
#. module: sale
#: view:sale.order:0
+#: selection:sale.order,state:0
#: view:sale.order.line:0
msgid "To Invoice"
msgstr ""
@@ -1476,6 +1692,11 @@ msgid "Date on which sales order is confirmed."
msgstr ""
#. module: sale
+#: field:sale.order,project_id:0
+msgid "Contract/Analytic Account"
+msgstr ""
+
+#. module: sale
#: field:sale.order,company_id:0
#: field:sale.order.line,company_id:0
#: view:sale.report:0
@@ -1495,22 +1716,17 @@ msgid "The amount to be invoiced in advance."
msgstr ""
#. module: sale
-#: selection:sale.order,state:0
-#: selection:sale.report,state:0
-msgid "Invoice Exception"
-msgstr "發票異常情況"
-
-#. module: sale
-#: help:sale.order,picking_ids:0
+#: code:addons/sale/sale.py:1256
+#, python-format
msgid ""
-"This is a list of picking that has been generated for this sales order."
+"Couldn't find a pricelist line matching this product and quantity.\n"
+"You have to change either the product, the quantity or the pricelist."
msgstr ""
#. module: sale
-#: help:sale.installer,sale_margin:0
+#: help:sale.order,picking_ids:0
msgid ""
-"Gives the margin of profitability by calculating the difference between Unit "
-"Price and Cost Price."
+"This is a list of picking that has been generated for this sales order."
msgstr ""
#. module: sale
@@ -1532,6 +1748,11 @@ msgid "Cancelled"
msgstr ""
#. module: sale
+#: view:sale.order.line:0
+msgid "Sales Order Lines related to a Sales Order of mine"
+msgstr ""
+
+#. module: sale
#: model:ir.actions.act_window,name:sale.action_shop_form
#: model:ir.ui.menu,name:sale.menu_action_shop_form
#: field:sale.order,shop_id:0
@@ -1541,17 +1762,12 @@ msgid "Shop"
msgstr "商店"
#. module: sale
-#: view:sale.report:0
-msgid " Month "
-msgstr ""
-
-#. module: sale
#: field:sale.report,date_confirm:0
msgid "Date Confirm"
msgstr ""
#. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:111
+#: code:addons/sale/wizard/sale_line_invoice.py:113
#, python-format
msgid "Warning"
msgstr ""
@@ -1563,17 +1779,6 @@ msgid "Sales by Month"
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:1045
-#, python-format
-msgid ""
-"You selected a quantity of %d Units.\n"
-"But it's not compatible with the selected packaging.\n"
-"Here is a proposition of quantities according to the packaging:\n"
-"\n"
-"EAN: %s Quantity: %s Type of ul: %s"
-msgstr ""
-
-#. module: sale
#: model:ir.model,name:sale.model_sale_order
#: model:process.node,name:sale.process_node_order0
#: model:process.node,name:sale.process_node_saleorder0
@@ -1589,6 +1794,11 @@ msgid "Quantity (UoS)"
msgstr "數量 (UoS)"
#. module: sale
+#: view:sale.order.line:0
+msgid "Sale Order Lines that are in 'done' state"
+msgstr ""
+
+#. module: sale
#: model:process.transition,note:sale.process_transition_packing0
msgid ""
"The Pick List form is created as soon as the sales order is confirmed, in "
@@ -1603,6 +1813,11 @@ msgid "Confirmed"
msgstr "確認"
#. module: sale
+#: field:sale.config.picking_policy,order_policy:0
+msgid "Main Method Based On"
+msgstr ""
+
+#. module: sale
#: model:process.transition.action,name:sale.process_transition_action_confirm0
msgid "Confirm"
msgstr "確認"
@@ -1625,6 +1840,7 @@ msgid "Invoice Lines"
msgstr "發票明細"
#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_product_tree
#: view:sale.order:0
#: view:sale.order.line:0
msgid "Sales Order Lines"
@@ -1641,30 +1857,18 @@ msgid "Configuration"
msgstr "設定"
#. module: sale
-#: selection:sale.order,picking_policy:0
-msgid "Complete Delivery"
-msgstr "已完成交貨"
-
-#. module: sale
-#: view:sale.report:0
-msgid " Month-1 "
-msgstr ""
-
-#. module: sale
-#: help:sale.config.picking_policy,picking_policy:0
-msgid ""
-"The Shipping Policy is used to configure per order if you want to deliver as "
-"soon as possible when one product is available or you wait that all products "
-"are available.."
+#: code:addons/sale/edi/sale_order.py:146
+#, python-format
+msgid "EDI Pricelist (%s)"
msgstr ""
#. module: sale
-#: selection:sale.report,month:0
-msgid "August"
+#: view:sale.report:0
+msgid "Sales order created in current year"
msgstr ""
#. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:111
+#: code:addons/sale/wizard/sale_line_invoice.py:113
#, python-format
msgid ""
"Invoice cannot be created for this Sales Order Line due to one of the "
@@ -1674,6 +1878,11 @@ msgid ""
msgstr ""
#. module: sale
+#: view:sale.order.line:0
+msgid "Sale order lines done"
+msgstr ""
+
+#. module: sale
#: field:sale.order.line,th_weight:0
msgid "Weight"
msgstr "重量"
@@ -1692,7 +1901,6 @@ msgstr ""
#. module: sale
#: field:sale.config.picking_policy,config_logo:0
-#: field:sale.installer,config_logo:0
msgid "Image"
msgstr ""
@@ -1722,8 +1930,8 @@ msgid "Salesman"
msgstr "業務員"
#. module: sale
-#: model:process.node,note:sale.process_node_saleorder0
-msgid "Drives procurement and invoicing"
+#: model:ir.actions.act_window,name:sale.action_order_tree
+msgid "Old Quotations"
msgstr ""
#. module: sale
@@ -1732,7 +1940,7 @@ msgid "Untaxed Amount"
msgstr "未完稅金額"
#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:163
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:170
#: model:ir.actions.act_window,name:sale.action_view_sale_advance_payment_inv
#: view:sale.advance.payment.inv:0
#: view:sale.order:0
@@ -1741,7 +1949,7 @@ msgid "Advance Invoice"
msgstr "先開發票"
#. module: sale
-#: code:addons/sale/sale.py:591
+#: code:addons/sale/sale.py:624
#, python-format
msgid "The sales order '%s' has been cancelled."
msgstr ""
@@ -1776,19 +1984,19 @@ msgid "Packings"
msgstr ""
#. module: sale
-#: field:sale.config.picking_policy,progress:0
-#: field:sale.installer,progress:0
-msgid "Configuration Progress"
+#: view:sale.order.line:0
+msgid "Sale Order Lines ready to be invoiced"
msgstr ""
#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_product_tree
-msgid "Product sales"
-msgstr "商品銷售"
+#: view:sale.report:0
+msgid "Sales order created in last month"
+msgstr ""
#. module: sale
-#: field:sale.order,date_order:0
-msgid "Ordered Date"
+#: model:ir.actions.act_window,name:sale.action_email_templates
+#: model:ir.ui.menu,name:sale.menu_email_templates
+msgid "Email Templates"
msgstr ""
#. module: sale
@@ -1799,13 +2007,14 @@ msgid "Sales Orders"
msgstr "銷貨單"
#. module: sale
-#: selection:sale.config.picking_policy,picking_policy:0
-msgid "Direct Delivery"
-msgstr "直接交貨"
+#: model:ir.model,name:sale.model_sale_shop
+#: view:sale.shop:0
+msgid "Sales Shop"
+msgstr ""
#. module: sale
-#: field:sale.installer,sale_journal:0
-msgid "Invoicing journals"
+#: selection:sale.report,month:0
+msgid "November"
msgstr ""
#. module: sale
@@ -1814,18 +2023,12 @@ msgid "Advance Product"
msgstr ""
#. module: sale
-#: view:sale.report:0
-#: field:sale.report,shipped_qty_1:0
-msgid "Shipped Qty"
-msgstr ""
-
-#. module: sale
-#: view:sale.open.invoice:0
-msgid "You invoice has been successfully created!"
-msgstr ""
+#: view:sale.order:0
+msgid "Compute"
+msgstr "計算"
#. module: sale
-#: code:addons/sale/sale.py:585
+#: code:addons/sale/sale.py:618
#, python-format
msgid "You must first cancel all invoices attached to this sales order."
msgstr ""
@@ -1836,33 +2039,27 @@ msgid "January"
msgstr ""
#. module: sale
-#: view:sale.installer:0
-msgid "Configure Your Sales Management Application"
-msgstr ""
-
-#. module: sale
#: model:ir.actions.act_window,name:sale.action_order_tree4
msgid "Sales Order in Progress"
msgstr "處理中的銷貨單"
#. module: sale
-#: field:sale.installer,sale_layout:0
-msgid "Sales Order Layout Improvement"
+#: help:sale.order,origin:0
+msgid "Reference of the document that generated this sales order request."
msgstr ""
#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:63
-#, python-format
-msgid "Error"
-msgstr "錯誤"
-
-#. module: sale
#: view:sale.report:0
#: field:sale.report,delay:0
msgid "Commitment Delay"
msgstr ""
#. module: sale
+#: selection:sale.order,order_policy:0
+msgid "Deliver & invoice on demand"
+msgstr ""
+
+#. module: sale
#: model:process.node,note:sale.process_node_saleprocurement0
msgid ""
"One Procurement order for each sales order line and for each of the "
@@ -1885,13 +2082,12 @@ msgid "Confirmed sales order to invoice."
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:290
-#, python-format
-msgid "Cannot delete Sales Order(s) which are already confirmed !"
+#: view:sale.order:0
+msgid "Sales Order that haven't yet been confirmed"
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:316
+#: code:addons/sale/sale.py:322
#, python-format
msgid "The sales order '%s' has been set in draft state."
msgstr ""
@@ -1902,24 +2098,19 @@ msgid "from stock"
msgstr "自庫存"
#. module: sale
-#: field:sale.config.picking_policy,order_policy:0
-msgid "Shipping Default Policy"
-msgstr "標準貨運規則"
-
-#. module: sale
#: view:sale.open.invoice:0
msgid "Close"
msgstr "關閉"
#. module: sale
-#: field:sale.order,shipped:0
-msgid "Delivered"
+#: code:addons/sale/sale.py:1248
+#, python-format
+msgid "No Pricelist ! : "
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:1115
-#, python-format
-msgid "Not enough stock !"
+#: field:sale.order,shipped:0
+msgid "Delivered"
msgstr ""
#. module: sale
@@ -1928,11 +2119,6 @@ msgid "You must assign a production lot for this product"
msgstr ""
#. module: sale
-#: field:sale.order.line,sequence:0
-msgid "Layout Sequence"
-msgstr ""
-
-#. module: sale
#: model:ir.actions.act_window,help:sale.action_shop_form
msgid ""
"If you have more than one shop reselling your company products, you can "
@@ -1959,11 +2145,6 @@ msgid "May"
msgstr ""
#. module: sale
-#: help:sale.installer,sale_order_dates:0
-msgid "Adds commitment, requested and effective dates on Sales Orders."
-msgstr ""
-
-#. module: sale
#: view:sale.order:0
#: field:sale.order,partner_id:0
#: field:sale.order.line,order_partner_id:0
@@ -1971,23 +2152,11 @@ msgid "Customer"
msgstr "客戶"
#. module: sale
-#: model:product.template,name:sale.advance_product_0_product_template
-msgid "Advance"
-msgstr ""
-
-#. module: sale
#: selection:sale.report,month:0
msgid "February"
msgstr ""
#. module: sale
-#: help:sale.installer,sale_journal:0
-msgid ""
-"Allows you to group and invoice your delivery orders according to different "
-"invoicing types: daily, weekly, etc."
-msgstr ""
-
-#. module: sale
#: selection:sale.report,month:0
msgid "April"
msgstr ""
@@ -1998,11 +2167,6 @@ msgid "Accounting"
msgstr ""
#. module: sale
-#: field:sale.config.picking_policy,step:0
-msgid "Steps To Deliver a Sales Order"
-msgstr ""
-
-#. module: sale
#: view:sale.order:0
#: view:sale.order.line:0
msgid "Search Sales Order"
@@ -2014,18 +2178,18 @@ msgid "Sales Order Requisition"
msgstr ""
#. module: sale
+#: code:addons/sale/sale.py:1242
+#, python-format
+msgid "Not enough stock ! : "
+msgstr ""
+
+#. module: sale
#: report:sale.order:0
#: field:sale.order,payment_term:0
msgid "Payment Term"
msgstr "付款條件"
#. module: sale
-#: help:sale.installer,sale_layout:0
-msgid ""
-"Provides some features to improve the layout of the Sales Order reports."
-msgstr ""
-
-#. module: sale
#: model:ir.actions.act_window,help:sale.action_order_report_all
msgid ""
"This report performs analysis on your quotations and sales orders. Analysis "
@@ -2069,6 +2233,9 @@ msgstr "根據交貨的發票"
#~ msgid "Origin"
#~ msgstr "來源"
+#~ msgid "Shipping Policy"
+#~ msgstr "貨運規則"
+
#~ msgid "Reference"
#~ msgstr "參考"
@@ -2093,9 +2260,6 @@ msgstr "根據交貨的發票"
#~ msgid "Draft Invoice"
#~ msgstr "發票草稿"
-#~ msgid "My Quotations"
-#~ msgstr "我的報價單"
-
#~ msgid "Packing Default Policy"
#~ msgstr "標準包裝規則"
@@ -2105,9 +2269,15 @@ msgstr "根據交貨的發票"
#~ msgid "Sales Configuration"
#~ msgstr "銷售設定"
+#~ msgid "Product sales"
+#~ msgstr "商品銷售"
+
#~ msgid "Recreate Procurement"
#~ msgstr "重新建立採購"
+#~ msgid "Partial Delivery"
+#~ msgstr "部份交貨"
+
#~ msgid "Invalid model name in the action definition."
#~ msgstr "動作定義之模型名稱無效。"
@@ -2120,6 +2290,9 @@ msgstr "根據交貨的發票"
#~ msgid "Invoice after delivery"
#~ msgstr "交貨後開立發票"
+#~ msgid "All at Once"
+#~ msgstr "一次過"
+
#~ msgid "Outgoing Products"
#~ msgstr "外送貨物"
@@ -2133,6 +2306,9 @@ msgstr "根據交貨的發票"
#~ msgid "Packing"
#~ msgstr "包裝"
+#~ msgid "Complete Delivery"
+#~ msgstr "已完成交貨"
+
#~ msgid "Related Packing"
#~ msgstr "相關包裝"
@@ -2148,6 +2324,9 @@ msgstr "根據交貨的發票"
#~ msgid "Advance Payment"
#~ msgstr "先行付款"
+#~ msgid "Payment Before Delivery"
+#~ msgstr "交貨前先付款"
+
#~ msgid "Payment Terms"
#~ msgstr "付款條件"
@@ -2163,6 +2342,9 @@ msgstr "根據交貨的發票"
#~ msgid "Manages the delivery and invoicing progress"
#~ msgstr "管理貨運與開立發票進度"
+#~ msgid "Shipping Default Policy"
+#~ msgstr "標準貨運規則"
+
#~ msgid "Configure Picking Policy for Sale Order"
#~ msgstr "為銷貨單設定提貨規則"
@@ -2196,6 +2378,9 @@ msgstr "根據交貨的發票"
#~ msgid "Sale Order"
#~ msgstr "銷貨單"
+#~ msgid "Delivery Order Only"
+#~ msgstr "只交貨單"
+
#~ msgid "Configure Sale Order Logistic"
#~ msgstr "設定銷貨單物流"
@@ -2247,12 +2432,18 @@ msgstr "根據交貨的發票"
#~ msgid "Procurement Corrected"
#~ msgstr "已修正採購"
+#~ msgid "Shipping & Manual Invoice"
+#~ msgstr "貨運 及 手動發票"
+
#~ msgid "Sale Procurement"
#~ msgstr "銷售採購"
#~ msgid "Our Salesman"
#~ msgstr "我們的業務員"
+#~ msgid "Direct Delivery"
+#~ msgstr "直接交貨"
+
#~ msgid "Make Invoice"
#~ msgstr "開立發票"
@@ -2278,6 +2469,9 @@ msgstr "根據交貨的發票"
#~ msgid "Sale Invoice"
#~ msgstr "銷售發票"
+#~ msgid "Sales Management"
+#~ msgstr "業務管理"
+
#~ msgid "Invoice from the Packing"
#~ msgstr "根據包裝的發票"