summaryrefslogtreecommitdiff
path: root/addons/purchase
diff options
context:
space:
mode:
authorLaunchpad Translations on behalf of openerp <>2012-12-24 04:40:35 +0000
committerLaunchpad Translations on behalf of openerp <>2012-12-24 04:40:35 +0000
commit94afe1ccef4ffa84abcbb6e753beacf91f91ec1b (patch)
treea76d3ef7c026861d42912a5c99ead9004954ff24 /addons/purchase
parentc5e5201546cb520e2b0c9a20754a82f515b311bc (diff)
Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20121222060744-44at9lbhw0npx5h6 bzr revid: launchpad_translations_on_behalf_of_openerp-20121223044213-e86qkwoh0uo3cjti bzr revid: launchpad_translations_on_behalf_of_openerp-20121224044035-1y0s4fc6ns7ytko6
Diffstat (limited to 'addons/purchase')
-rw-r--r--addons/purchase/i18n/ar.po452
-rw-r--r--addons/purchase/i18n/bg.po438
-rw-r--r--addons/purchase/i18n/bs.po434
-rw-r--r--addons/purchase/i18n/ca.po452
-rw-r--r--addons/purchase/i18n/cs.po443
-rw-r--r--addons/purchase/i18n/da.po432
-rw-r--r--addons/purchase/i18n/de.po558
-rw-r--r--addons/purchase/i18n/el.po434
-rw-r--r--addons/purchase/i18n/en_GB.po452
-rw-r--r--addons/purchase/i18n/es.po641
-rw-r--r--addons/purchase/i18n/es_AR.po434
-rw-r--r--addons/purchase/i18n/es_CL.po454
-rw-r--r--addons/purchase/i18n/es_CR.po452
-rw-r--r--addons/purchase/i18n/es_EC.po452
-rw-r--r--addons/purchase/i18n/et.po502
-rw-r--r--addons/purchase/i18n/fi.po452
-rw-r--r--addons/purchase/i18n/fr.po454
-rw-r--r--addons/purchase/i18n/gl.po432
-rw-r--r--addons/purchase/i18n/hr.po456
-rw-r--r--addons/purchase/i18n/hu.po454
-rw-r--r--addons/purchase/i18n/id.po454
-rw-r--r--addons/purchase/i18n/it.po554
-rw-r--r--addons/purchase/i18n/ja.po448
-rw-r--r--addons/purchase/i18n/ko.po434
-rw-r--r--addons/purchase/i18n/lt.po434
-rw-r--r--addons/purchase/i18n/lv.po443
-rw-r--r--addons/purchase/i18n/mn.po454
-rw-r--r--addons/purchase/i18n/nb.po452
-rw-r--r--addons/purchase/i18n/nl.po478
-rw-r--r--addons/purchase/i18n/nl_BE.po454
-rw-r--r--addons/purchase/i18n/pl.po481
-rw-r--r--addons/purchase/i18n/pt.po452
-rw-r--r--addons/purchase/i18n/pt_BR.po646
-rw-r--r--addons/purchase/i18n/ro.po454
-rw-r--r--addons/purchase/i18n/ru.po468
-rw-r--r--addons/purchase/i18n/sk.po434
-rw-r--r--addons/purchase/i18n/sl.po455
-rw-r--r--addons/purchase/i18n/sq.po432
-rw-r--r--addons/purchase/i18n/sr.po434
-rw-r--r--addons/purchase/i18n/sr@latin.po434
-rw-r--r--addons/purchase/i18n/sv.po511
-rw-r--r--addons/purchase/i18n/th.po450
-rw-r--r--addons/purchase/i18n/tlh.po432
-rw-r--r--addons/purchase/i18n/tr.po452
-rw-r--r--addons/purchase/i18n/uk.po432
-rw-r--r--addons/purchase/i18n/vi.po432
-rw-r--r--addons/purchase/i18n/zh_CN.po460
-rw-r--r--addons/purchase/i18n/zh_TW.po432
48 files changed, 10735 insertions, 11439 deletions
diff --git a/addons/purchase/i18n/ar.po b/addons/purchase/i18n/ar.po
index db6adc807b6..1a0bffb7efb 100644
--- a/addons/purchase/i18n/ar.po
+++ b/addons/purchase/i18n/ar.po
@@ -6,15 +6,15 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 5.0.4\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
"PO-Revision-Date: 2012-10-08 16:00+0000\n"
"Last-Translator: kifcaliph <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: 2012-12-04 05:11+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:18+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
#. module: purchase
#: model:res.groups,name:purchase.group_analytic_accounting
@@ -60,11 +60,6 @@ msgstr ""
"للمنتجات المختارة/الكميات."
#. module: purchase
-#: model:ir.actions.server,name:purchase.actions_server_purchase_order_read
-msgid "Purchase: Mark read"
-msgstr ""
-
-#. module: purchase
#: view:purchase.report:0
#: field:purchase.report,day:0
msgid "Day"
@@ -105,16 +100,13 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:973
-#: code:addons/purchase/purchase.py:988
-#: code:addons/purchase/purchase.py:991
-#: code:addons/purchase/wizard/purchase_order_group.py:47
+#: code:addons/purchase/purchase.py:1024
#, python-format
-msgid "Warning!"
+msgid "Configuration Error!"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:573
+#: code:addons/purchase/purchase.py:587
#, python-format
msgid "You must first cancel all receptions related to this purchase order."
msgstr "يجب عليك أولا إلغاء جميع حفلات الاستقبال المتعلقة بهذا أمر الشراء."
@@ -131,10 +123,10 @@ msgid "Purchase-Standard Price"
msgstr "الشراء-السعر المثالي"
#. module: purchase
-#: report:purchase.order:0
-#: field:purchase.report,validator:0
-msgid "Validated By"
-msgstr "تحقق من صلاحيته بواسطة"
+#: code:addons/purchase/purchase.py:1011
+#, python-format
+msgid "No supplier defined for this product !"
+msgstr ""
#. module: purchase
#: model:ir.actions.act_window,help:purchase.action_picking_tree4_picking_to_invoice
@@ -157,12 +149,6 @@ msgid "Average Price"
msgstr "متوسط السعر"
#. module: purchase
-#: code:addons/purchase/purchase.py:830
-#, python-format
-msgid "Invoice <b>paid</b>."
-msgstr ""
-
-#. module: purchase
#: view:purchase.order:0
msgid "Purchase order which are in the exception state"
msgstr "أمر الشراء التي هي في حالة استثناء"
@@ -232,7 +218,7 @@ msgid ""
msgstr "تم حسابها كأدنى حد للتاريخ المجدول لكل منتجات خطوط امر الشراء."
#. module: purchase
-#: code:addons/purchase/purchase.py:255
+#: code:addons/purchase/purchase.py:260
#, python-format
msgid "In order to delete a purchase order, you must cancel it first."
msgstr ""
@@ -258,29 +244,12 @@ msgid "Total Untaxed amount"
msgstr "كمية مادون الضرائب الكلية"
#. module: purchase
-#: model:ir.ui.menu,name:purchase.menu_purchase_uom_categ_form_action
-msgid "Unit of Measure Categories"
-msgstr ""
-
-#. module: purchase
#: view:purchase.report:0
#: field:purchase.report,category_id:0
msgid "Category"
msgstr "فئة"
#. module: purchase
-#: view:purchase.order:0
-msgid "Quotation "
-msgstr ""
-
-#. module: purchase
-#: code:addons/purchase/purchase.py:810
-#, python-format
-msgid ""
-"Quotation for <em>%s</em> <b>converted</b> to a Purchase Order of %s %s."
-msgstr ""
-
-#. module: purchase
#: model:process.transition,note:purchase.process_transition_purchaseinvoice0
msgid ""
"A purchase order generates a supplier invoice, as soon as it is confirmed by "
@@ -348,14 +317,16 @@ msgid "October"
msgstr "أكتوبر"
#. module: purchase
-#: code:addons/purchase/purchase.py:837
+#: code:addons/purchase/purchase.py:1024
#, python-format
-msgid "Purchase Order for <em>%s</em> <b>cancelled</b>."
+msgid ""
+"The product \"%s\" has been defined with your company as reseller which "
+"seems to be a configuration error!"
msgstr ""
#. module: purchase
-#: field:purchase.order,message_summary:0
-msgid "Summary"
+#: view:product.product:0
+msgid "When you sell this service to a customer,"
msgstr ""
#. module: purchase
@@ -384,12 +355,6 @@ msgid "Quantity"
msgstr "كمية"
#. module: purchase
-#: code:addons/purchase/purchase.py:819
-#, python-format
-msgid "Shipment <em>%s</em> <b>scheduled</b> for %s."
-msgstr ""
-
-#. module: purchase
#: field:purchase.order,fiscal_position:0
msgid "Fiscal Position"
msgstr "الوضع المالي"
@@ -447,12 +412,6 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:824
-#, python-format
-msgid "Draft Invoice of %s %s is <b>waiting for validation</b>."
-msgstr ""
-
-#. module: purchase
#: model:ir.actions.act_window,help:purchase.purchase_line_form_action2
msgid ""
"<p>\n"
@@ -473,6 +432,11 @@ msgid "Scheduled Date"
msgstr "تاريخ مجدول"
#. module: purchase
+#: field:purchase.order,currency_id:0
+msgid "Currency"
+msgstr ""
+
+#. module: purchase
#: field:purchase.order,journal_id:0
msgid "Journal"
msgstr "اليومية"
@@ -505,6 +469,19 @@ msgid "Incoming Products"
msgstr ""
#. module: purchase
+#: view:purchase.order:0
+msgid "Request for Quotation "
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,partner_ref:0
+msgid ""
+"Reference of the sales order or quotation sent by your supplier. It's mainly "
+"used to do the matching when you receive the products as this reference is "
+"usually written on the delivery order sent by your supplier."
+msgstr ""
+
+#. module: purchase
#: view:purchase.config.settings:0
#: view:purchase.order.group:0
#: view:purchase.order.line_invoice:0
@@ -527,6 +504,11 @@ msgstr ""
"يمكن للفاتورة ايضًا ان تُجمع من المحاسب (التحكم في الفاتورة=يدوي)."
#. module: purchase
+#: model:mail.message.subtype,name:purchase.mt_rfq_approved
+msgid "RFQ Approved"
+msgstr ""
+
+#. module: purchase
#: view:purchase.config.settings:0
msgid "Apply"
msgstr ""
@@ -546,6 +528,11 @@ msgstr ""
"المطلوبة) امر شراء مؤكد."
#. module: purchase
+#: model:mail.message.subtype,name:purchase.mt_rfq_confirmed
+msgid "RFQ Confirmed"
+msgstr ""
+
+#. module: purchase
#: view:purchase.order:0
msgid "Customer Address"
msgstr ""
@@ -570,7 +557,7 @@ msgid "Supplier"
msgstr "مورِّد"
#. module: purchase
-#: code:addons/purchase/purchase.py:508
+#: code:addons/purchase/purchase.py:525
#, python-format
msgid "Define expense account for this company: \"%s\" (id:%d)."
msgstr ""
@@ -594,7 +581,6 @@ msgstr "المجموع الفرعي"
#. module: purchase
#: field:purchase.order,shipped:0
-#: field:purchase.order,shipped_rate:0
msgid "Received"
msgstr "تاريخ التلقي"
@@ -636,13 +622,20 @@ msgid "Invoices and Receptions"
msgstr ""
#. module: purchase
+#: model:process.transition,note:purchase.process_transition_packinginvoice0
+msgid ""
+"A Pick list generates an invoice. Depending on the Invoicing control of the "
+"sales order, the invoice is based on delivered or on ordered quantities."
+msgstr ""
+
+#. module: purchase
#: view:purchase.report:0
#: field:purchase.report,nbr:0
msgid "# of Lines"
msgstr "عدد السطور"
#. module: purchase
-#: code:addons/purchase/wizard/purchase_line_invoice.py:110
+#: code:addons/purchase/wizard/purchase_line_invoice.py:106
#, python-format
msgid "Define expense account for this product: \"%s\" (id:%d)."
msgstr ""
@@ -663,8 +656,8 @@ msgid "It indicates that a picking has been done"
msgstr "توضح انه قد تم عمل الاختيار"
#. module: purchase
-#: code:addons/purchase/purchase.py:565
-#: code:addons/purchase/purchase.py:572
+#: code:addons/purchase/purchase.py:579
+#: code:addons/purchase/purchase.py:586
#, python-format
msgid "Unable to cancel this purchase order."
msgstr ""
@@ -729,6 +722,15 @@ msgid "Draft PO"
msgstr ""
#. module: purchase
+#: code:addons/purchase/purchase.py:941
+#: code:addons/purchase/purchase.py:956
+#: code:addons/purchase/purchase.py:960
+#: code:addons/purchase/wizard/purchase_order_group.py:47
+#, python-format
+msgid "Warning!"
+msgstr ""
+
+#. module: purchase
#: model:process.node,name:purchase.process_node_draftpurchaseorder0
#: model:process.node,name:purchase.process_node_draftpurchaseorder1
msgid "RFQ"
@@ -760,6 +762,11 @@ msgid "The tax amount"
msgstr "كمية الضرائب"
#. module: purchase
+#: field:purchase.order,shipped_rate:0
+msgid "Received Ratio"
+msgstr ""
+
+#. module: purchase
#: selection:purchase.report,month:0
msgid "September"
msgstr "سبتمبر"
@@ -791,7 +798,7 @@ msgid "Stock Moves"
msgstr "حركات الأسهم"
#. module: purchase
-#: code:addons/purchase/purchase.py:1158
+#: code:addons/purchase/purchase.py:1156
#, python-format
msgid "Draft Purchase Order created"
msgstr ""
@@ -812,11 +819,6 @@ msgid "Terms and Conditions"
msgstr ""
#. module: purchase
-#: field:purchase.order,currency_id:0
-msgid "unknown"
-msgstr ""
-
-#. module: purchase
#: help:purchase.order,date_order:0
msgid "Date on which this document has been created."
msgstr "تاريخ انشاء هذه الوثيقة."
@@ -910,12 +912,6 @@ msgid "Cancel"
msgstr "إلغاء"
#. module: purchase
-#: field:purchase.order,message_comment_ids:0
-#: help:purchase.order,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
-#. module: purchase
#: sql_constraint:purchase.order:0
msgid "Order Reference must be unique per Company!"
msgstr "مرجع الأمر يجب أن يكون فريداً لكل شركة علي حدا!"
@@ -949,14 +945,89 @@ msgid "Date Approved"
msgstr "تاريخ الموافقة"
#. module: purchase
-#: code:addons/purchase/purchase.py:806
-#, python-format
-msgid "Request for quotation <b>created</b>."
+#: view:product.product:0
+msgid "a draft purchase order"
msgstr ""
#. module: purchase
-#: view:product.product:0
-msgid "a draft purchase order"
+#: model:email.template,body_html:purchase.email_template_edi_purchase
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: #FFF; \">\n"
+"\n"
+" <p>Hello$ ${object.partner_id.name},</p>\n"
+" \n"
+" <p>Here is a ${object.state in ('draft', 'sent') and 'request for "
+"quotation' or 'purchase order confirmation'} from ${object.company_id.name}: "
+"</p>\n"
+" \n"
+" <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
+" &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
+" &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
+" &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
+"${object.pricelist_id.currency_id.name}</strong><br />\n"
+" &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
+" % if object.origin:\n"
+" &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
+" % endif\n"
+" % if object.partner_ref:\n"
+" &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
+" % endif\n"
+" % if object.validator:\n"
+" &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.validator.email "
+"or ''}?subject=Order%20${object.name}\">${object.validator.name}</a>\n"
+" % endif\n"
+" </p>\n"
+"\n"
+" <br/>\n"
+" <p>If you have any question, do not hesitate to contact us.</p>\n"
+" <p>Thank you!</p>\n"
+" <br/>\n"
+" <br/>\n"
+" <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
+"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
+"background-repeat: repeat no-repeat;\">\n"
+" <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
+"#DDD;\">\n"
+" <strong style=\"text-"
+"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
+" </div>\n"
+" <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
+"16px; background-color: #F2F2F2;\">\n"
+" <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
+" % if object.company_id.street:\n"
+" ${object.company_id.street}<br/>\n"
+" % endif\n"
+" % if object.company_id.street2:\n"
+" ${object.company_id.street2}<br/>\n"
+" % endif\n"
+" % if object.company_id.city or object.company_id.zip:\n"
+" ${object.company_id.zip} ${object.company_id.city}<br/>\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 ''}<br/>\n"
+" % endif\n"
+" </span>\n"
+" % if object.company_id.phone:\n"
+" <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
+"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
+"0px; padding-left: 0px; \">\n"
+" Phone:&nbsp; ${object.company_id.phone}\n"
+" </div>\n"
+" % endif\n"
+" % if object.company_id.website:\n"
+" <div>\n"
+" Web :&nbsp;<a "
+"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
+" </div>\n"
+" %endif\n"
+" <p></p>\n"
+" </div>\n"
+"</div>\n"
+" "
msgstr ""
#. module: purchase
@@ -998,17 +1069,12 @@ msgid "Outgoing Mails"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:437
+#: code:addons/purchase/purchase.py:456
#, python-format
msgid "You cannot confirm a purchase order without any purchase order line."
msgstr ""
#. module: purchase
-#: model:ir.actions.server,name:purchase.actions_server_purchase_order_unread
-msgid "Purchase: Mark unread"
-msgstr ""
-
-#. module: purchase
#: help:purchase.order,message_ids:0
msgid "Messages and communication history"
msgstr ""
@@ -1020,7 +1086,7 @@ msgid "Destination Warehouse"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:973
+#: code:addons/purchase/purchase.py:941
#, python-format
msgid ""
"Selected Unit of Measure does not belong to the same category as the product "
@@ -1028,6 +1094,11 @@ msgid ""
msgstr ""
#. module: purchase
+#: view:purchase.order.line_invoice:0
+msgid "Select an Open Sales Order"
+msgstr ""
+
+#. module: purchase
#: model:ir.ui.menu,name:purchase.menu_purchase_unit_measure_purchase
#: model:ir.ui.menu,name:purchase.menu_purchase_uom_form_action
msgid "Units of Measure"
@@ -1039,18 +1110,12 @@ msgid "Manage pricelist per supplier"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:833
-#, python-format
-msgid "Purchase Order has been set to <b>draft</b>."
-msgstr ""
-
-#. module: purchase
#: view:board.board:0
msgid "Purchase Dashboard"
msgstr "لوحة قيادة الشراء"
#. module: purchase
-#: code:addons/purchase/purchase.py:566
+#: code:addons/purchase/purchase.py:580
#, python-format
msgid "First cancel all receptions related to this purchase order."
msgstr ""
@@ -1089,9 +1154,9 @@ msgid "Unread Messages"
msgstr ""
#. module: purchase
-#: view:purchase.order.line_invoice:0
-msgid "Select an Open Sale Order"
-msgstr "حدد امر بيع مفتوحة"
+#: model:ir.ui.menu,name:purchase.menu_purchase_uom_categ_form_action
+msgid "Unit of Measure Categories"
+msgstr ""
#. module: purchase
#: view:purchase.order:0
@@ -1099,6 +1164,13 @@ msgid "Set to Draft"
msgstr "حفظ كمسودة"
#. module: purchase
+#: help:purchase.order,origin:0
+msgid ""
+"Reference of the document that generated this purchase order request; a "
+"sales order or an internal procurement request."
+msgstr ""
+
+#. module: purchase
#: view:purchase.order.line:0
msgid "Notes"
msgstr "ملاحظات"
@@ -1128,7 +1200,7 @@ msgid "Stock Move"
msgstr "حركة مخزن"
#. module: purchase
-#: code:addons/purchase/purchase.py:255
+#: code:addons/purchase/purchase.py:260
#, python-format
msgid "Invalid Action!"
msgstr ""
@@ -1230,7 +1302,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:310
+#: code:addons/purchase/purchase.py:320
#, python-format
msgid "Please create Invoices."
msgstr ""
@@ -1320,7 +1392,7 @@ msgid "Purchase Order Line Make Invoice"
msgstr "يقوم خط امر الشراء بعمل الفاتورة"
#. module: purchase
-#: code:addons/purchase/purchase.py:1133
+#: code:addons/purchase/purchase.py:1141
#, python-format
msgid "PO: %s"
msgstr ""
@@ -1331,7 +1403,7 @@ msgid "Send by EMail"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:498
+#: code:addons/purchase/purchase.py:515
#, python-format
msgid "Define purchase journal for this company: \"%s\" (id:%d)."
msgstr ""
@@ -1342,9 +1414,9 @@ msgid "Purchase Order "
msgstr ""
#. module: purchase
-#: view:purchase.order.line:0
-msgid "Manual Invoices"
-msgstr "الفواتير اليدوية"
+#: help:purchase.config.settings,group_costing_method:0
+msgid "Allows you to compute product cost price based on average cost."
+msgstr ""
#. module: purchase
#: model:ir.actions.act_window,name:purchase.action_purchase_configuration
@@ -1498,8 +1570,8 @@ msgid "Compute product cost price based on average cost"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:340
-#: code:addons/purchase/wizard/purchase_line_invoice.py:141
+#: code:addons/purchase/purchase.py:350
+#: code:addons/purchase/wizard/purchase_line_invoice.py:137
#: model:ir.actions.act_window,name:purchase.act_res_partner_2_supplier_invoices
#: view:res.partner:0
#, python-format
@@ -1611,8 +1683,9 @@ msgid "Open Purchase Menu"
msgstr ""
#. module: purchase
-#: model:ir.model,name:purchase.model_mail_compose_message
-msgid "Email composition wizard"
+#: code:addons/purchase/purchase.py:1028
+#, python-format
+msgid "No address defined for the supplier"
msgstr ""
#. module: purchase
@@ -1684,11 +1757,11 @@ msgid "Purchase Order"
msgstr "أمر الشراء"
#. module: purchase
-#: code:addons/purchase/purchase.py:310
-#: code:addons/purchase/purchase.py:437
-#: code:addons/purchase/purchase.py:497
-#: code:addons/purchase/purchase.py:508
-#: code:addons/purchase/wizard/purchase_line_invoice.py:109
+#: code:addons/purchase/purchase.py:320
+#: code:addons/purchase/purchase.py:456
+#: code:addons/purchase/purchase.py:514
+#: code:addons/purchase/purchase.py:525
+#: code:addons/purchase/wizard/purchase_line_invoice.py:105
#, python-format
msgid "Error!"
msgstr ""
@@ -1710,15 +1783,6 @@ msgid ""
msgstr ""
#. module: purchase
-#: model:process.transition,note:purchase.process_transition_packinginvoice0
-msgid ""
-"A Pick list generates an invoice. Depending on the Invoicing control of the "
-"sale order, the invoice is based on delivered or on ordered quantities."
-msgstr ""
-"تجمع القائمة المختاره الفاتورة. بالاعتماد على تحكم فاتورة امر البيع, تعتمد "
-"الفاتورة على التسليم او الكمية المأمور بها."
-
-#. module: purchase
#: selection:purchase.order,state:0
#: selection:purchase.order.line,state:0
#: selection:purchase.report,state:0
@@ -1731,9 +1795,8 @@ msgid "# of Purchase Order"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:827
-#, python-format
-msgid "Shipment <b>received</b>."
+#: model:ir.model,name:purchase.model_mail_compose_message
+msgid "Email composition wizard"
msgstr ""
#. module: purchase
@@ -1821,7 +1884,7 @@ msgid "RFQ_${(object.name or '').replace('/','_')}"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:988
+#: code:addons/purchase/purchase.py:956
#, python-format
msgid "The selected supplier only sells this product by %s"
msgstr "يقوم بالبيع لهذا المنتج المود المختار فقط بواسطة %s"
@@ -1867,6 +1930,12 @@ msgid "Outgoing products to invoice"
msgstr "المنتجات الصادرة للفاتورة"
#. module: purchase
+#: report:purchase.order:0
+#: field:purchase.report,validator:0
+msgid "Validated By"
+msgstr "تحقق من صلاحيته بواسطة"
+
+#. module: purchase
#: view:purchase.report:0
#: field:purchase.report,delay_pass:0
msgid "Days to Deliver"
@@ -1956,9 +2025,9 @@ msgid "November"
msgstr "نوفمبر"
#. module: purchase
-#: help:purchase.config.settings,group_costing_method:0
-msgid "Allows you to compute product cost price based on average cost."
-msgstr ""
+#: view:purchase.order.line:0
+msgid "Manual Invoices"
+msgstr "الفواتير اليدوية"
#. module: purchase
#: report:purchase.order:0
@@ -1981,13 +2050,6 @@ msgid ""
msgstr ""
#. module: purchase
-#: help:purchase.order,origin:0
-msgid ""
-"Reference of the document that generated this purchase order request; a sale "
-"order or an internal procurement request."
-msgstr ""
-
-#. module: purchase
#: model:ir.ui.menu,name:purchase.menu_partner_categories_in_form
msgid "Partner Categories"
msgstr "فئات الشركاء"
@@ -2008,89 +2070,6 @@ msgid "Invoicing Settings"
msgstr ""
#. module: purchase
-#: model:email.template,body_html:purchase.email_template_edi_purchase
-msgid ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"\n"
-" <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
-"or ''},</p>\n"
-" \n"
-" <p>Here is a ${object.state in ('draft', 'sent') and 'request for "
-"quotation' or 'purchase order confirmation'} from ${object.company_id.name}: "
-"</p>\n"
-" \n"
-" <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
-" &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
-" &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
-" &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
-"${object.pricelist_id.currency_id.name}</strong><br />\n"
-" &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
-" % if object.origin:\n"
-" &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
-" % endif\n"
-" % if object.partner_ref:\n"
-" &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
-" % endif\n"
-" % if object.validator:\n"
-" &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.validator.email "
-"or ''}?subject=Order%20${object.name}\">${object.validator.name}</a>\n"
-" % endif\n"
-" </p>\n"
-"\n"
-" <br/>\n"
-" <p>If you have any question, do not hesitate to contact us.</p>\n"
-" <p>Thank you!</p>\n"
-" <br/>\n"
-" <br/>\n"
-" <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
-"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
-"background-repeat: repeat no-repeat;\">\n"
-" <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
-"#FFF;\">\n"
-" <strong style=\"text-"
-"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
-" </div>\n"
-" <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
-"16px; background-color: #F2F2F2;\">\n"
-" <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
-" % if object.company_id.street:\n"
-" ${object.company_id.street}<br/>\n"
-" % endif\n"
-" % if object.company_id.street2:\n"
-" ${object.company_id.street2}<br/>\n"
-" % endif\n"
-" % if object.company_id.city or object.company_id.zip:\n"
-" ${object.company_id.zip} ${object.company_id.city}<br/>\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 ''}<br/>\n"
-" % endif\n"
-" </span>\n"
-" % if object.company_id.phone:\n"
-" <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
-"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
-"0px; padding-left: 0px; \">\n"
-" Phone:&nbsp; ${object.company_id.phone}\n"
-" </div>\n"
-" % endif\n"
-" % if object.company_id.website:\n"
-" <div>\n"
-" Web :&nbsp;<a "
-"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
-" </div>\n"
-" %endif\n"
-" <p></p>\n"
-" </div>\n"
-"</div>\n"
-" "
-msgstr ""
-
-#. module: purchase
#: model:ir.actions.act_window,name:purchase.action_purchase_order_by_user_all
msgid "Total Orders by User per month"
msgstr "الأوامر الكلية للمستخدم عن كل شهر"
@@ -2101,21 +2080,19 @@ msgid "Based on incoming shipments"
msgstr ""
#. module: purchase
+#: code:addons/purchase/purchase.py:1018
+#, python-format
+msgid "No default supplier defined for this product"
+msgstr ""
+
+#. module: purchase
#: view:purchase.report:0
#: field:purchase.report,warehouse_id:0
msgid "Warehouse"
msgstr "المخزن"
#. module: purchase
-#: help:purchase.order,partner_ref:0
-msgid ""
-"Reference of the sale order or quotation sent by your supplier. It's mainly "
-"used to do the matching when you receive the products as this reference is "
-"usually written on the delivery order sent by your supplier."
-msgstr ""
-
-#. module: purchase
-#: code:addons/purchase/purchase.py:991
+#: code:addons/purchase/purchase.py:960
#, python-format
msgid ""
"The selected supplier has a minimal quantity set to %s %s, you should not "
@@ -2195,8 +2172,8 @@ msgstr ""
" "
#. module: purchase
-#: view:product.product:0
-msgid "When you sell this service to a customer,"
+#: field:purchase.order,message_summary:0
+msgid "Summary"
msgstr ""
#. module: purchase
@@ -2206,6 +2183,11 @@ msgid "Pricelist Versions"
msgstr "اصدارات قائمة الاسعار"
#. module: purchase
+#: field:purchase.order,payment_term_id:0
+msgid "Payment Term"
+msgstr ""
+
+#. module: purchase
#: view:purchase.order:0
msgid "Purchase orders which are in draft state"
msgstr ""
@@ -2372,6 +2354,9 @@ msgstr "الطلبيّات"
#~ "النتجات, الخ. لكل امر شراء, يمكنك متابعة البضاعة المستلمة, والتحكم في فواتير "
#~ "المورد."
+#~ msgid "Select an Open Sale Order"
+#~ msgstr "حدد امر بيع مفتوحة"
+
#, python-format
#~ msgid "No Pricelist !"
#~ msgstr "لا يوجد قائمة اسعار !"
@@ -2399,6 +2384,13 @@ msgstr "الطلبيّات"
#~ msgid "Approve Purchase"
#~ msgstr "اقبل الشراء"
+#~ msgid ""
+#~ "A Pick list generates an invoice. Depending on the Invoicing control of the "
+#~ "sale order, the invoice is based on delivered or on ordered quantities."
+#~ msgstr ""
+#~ "تجمع القائمة المختاره الفاتورة. بالاعتماد على تحكم فاتورة امر البيع, تعتمد "
+#~ "الفاتورة على التسليم او الكمية المأمور بها."
+
#, python-format
#~ msgid "Purchase amount over the limit"
#~ msgstr "كمية الشراء تخطت الحد المسموح"
diff --git a/addons/purchase/i18n/bg.po b/addons/purchase/i18n/bg.po
index bb7c13b1de4..10770f4890b 100644
--- a/addons/purchase/i18n/bg.po
+++ b/addons/purchase/i18n/bg.po
@@ -6,15 +6,15 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
"PO-Revision-Date: 2011-11-07 12:53+0000\n"
"Last-Translator: Boris <boris.t.ivanov@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: 2012-12-04 05:11+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:19+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
#. module: purchase
#: model:res.groups,name:purchase.group_analytic_accounting
@@ -60,11 +60,6 @@ msgstr ""
"изчислява доставната цена за избраните продукти / количества."
#. module: purchase
-#: model:ir.actions.server,name:purchase.actions_server_purchase_order_read
-msgid "Purchase: Mark read"
-msgstr ""
-
-#. module: purchase
#: view:purchase.report:0
#: field:purchase.report,day:0
msgid "Day"
@@ -105,16 +100,13 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:973
-#: code:addons/purchase/purchase.py:988
-#: code:addons/purchase/purchase.py:991
-#: code:addons/purchase/wizard/purchase_order_group.py:47
+#: code:addons/purchase/purchase.py:1024
#, python-format
-msgid "Warning!"
+msgid "Configuration Error!"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:573
+#: code:addons/purchase/purchase.py:587
#, python-format
msgid "You must first cancel all receptions related to this purchase order."
msgstr ""
@@ -131,10 +123,10 @@ msgid "Purchase-Standard Price"
msgstr ""
#. module: purchase
-#: report:purchase.order:0
-#: field:purchase.report,validator:0
-msgid "Validated By"
-msgstr "Проверрено от"
+#: code:addons/purchase/purchase.py:1011
+#, python-format
+msgid "No supplier defined for this product !"
+msgstr ""
#. module: purchase
#: model:ir.actions.act_window,help:purchase.action_picking_tree4_picking_to_invoice
@@ -157,12 +149,6 @@ msgid "Average Price"
msgstr "Средна цена"
#. module: purchase
-#: code:addons/purchase/purchase.py:830
-#, python-format
-msgid "Invoice <b>paid</b>."
-msgstr ""
-
-#. module: purchase
#: view:purchase.order:0
msgid "Purchase order which are in the exception state"
msgstr ""
@@ -232,7 +218,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:255
+#: code:addons/purchase/purchase.py:260
#, python-format
msgid "In order to delete a purchase order, you must cancel it first."
msgstr ""
@@ -258,29 +244,12 @@ msgid "Total Untaxed amount"
msgstr "Общо без данък"
#. module: purchase
-#: model:ir.ui.menu,name:purchase.menu_purchase_uom_categ_form_action
-msgid "Unit of Measure Categories"
-msgstr ""
-
-#. module: purchase
#: view:purchase.report:0
#: field:purchase.report,category_id:0
msgid "Category"
msgstr "Категория"
#. module: purchase
-#: view:purchase.order:0
-msgid "Quotation "
-msgstr ""
-
-#. module: purchase
-#: code:addons/purchase/purchase.py:810
-#, python-format
-msgid ""
-"Quotation for <em>%s</em> <b>converted</b> to a Purchase Order of %s %s."
-msgstr ""
-
-#. module: purchase
#: model:process.transition,note:purchase.process_transition_purchaseinvoice0
msgid ""
"A purchase order generates a supplier invoice, as soon as it is confirmed by "
@@ -345,14 +314,16 @@ msgid "October"
msgstr "Октомври"
#. module: purchase
-#: code:addons/purchase/purchase.py:837
+#: code:addons/purchase/purchase.py:1024
#, python-format
-msgid "Purchase Order for <em>%s</em> <b>cancelled</b>."
+msgid ""
+"The product \"%s\" has been defined with your company as reseller which "
+"seems to be a configuration error!"
msgstr ""
#. module: purchase
-#: field:purchase.order,message_summary:0
-msgid "Summary"
+#: view:product.product:0
+msgid "When you sell this service to a customer,"
msgstr ""
#. module: purchase
@@ -381,12 +352,6 @@ msgid "Quantity"
msgstr "Количество"
#. module: purchase
-#: code:addons/purchase/purchase.py:819
-#, python-format
-msgid "Shipment <em>%s</em> <b>scheduled</b> for %s."
-msgstr ""
-
-#. module: purchase
#: field:purchase.order,fiscal_position:0
msgid "Fiscal Position"
msgstr ""
@@ -444,12 +409,6 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:824
-#, python-format
-msgid "Draft Invoice of %s %s is <b>waiting for validation</b>."
-msgstr ""
-
-#. module: purchase
#: model:ir.actions.act_window,help:purchase.purchase_line_form_action2
msgid ""
"<p>\n"
@@ -470,6 +429,11 @@ msgid "Scheduled Date"
msgstr "Планирана дата"
#. module: purchase
+#: field:purchase.order,currency_id:0
+msgid "Currency"
+msgstr ""
+
+#. module: purchase
#: field:purchase.order,journal_id:0
msgid "Journal"
msgstr ""
@@ -502,6 +466,19 @@ msgid "Incoming Products"
msgstr ""
#. module: purchase
+#: view:purchase.order:0
+msgid "Request for Quotation "
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,partner_ref:0
+msgid ""
+"Reference of the sales order or quotation sent by your supplier. It's mainly "
+"used to do the matching when you receive the products as this reference is "
+"usually written on the delivery order sent by your supplier."
+msgstr ""
+
+#. module: purchase
#: view:purchase.config.settings:0
#: view:purchase.order.group:0
#: view:purchase.order.line_invoice:0
@@ -522,6 +499,11 @@ msgid ""
msgstr ""
#. module: purchase
+#: model:mail.message.subtype,name:purchase.mt_rfq_approved
+msgid "RFQ Approved"
+msgstr ""
+
+#. module: purchase
#: view:purchase.config.settings:0
msgid "Apply"
msgstr ""
@@ -541,6 +523,11 @@ msgstr ""
"става потвърена Поръчка."
#. module: purchase
+#: model:mail.message.subtype,name:purchase.mt_rfq_confirmed
+msgid "RFQ Confirmed"
+msgstr ""
+
+#. module: purchase
#: view:purchase.order:0
msgid "Customer Address"
msgstr ""
@@ -565,7 +552,7 @@ msgid "Supplier"
msgstr "Доставчик"
#. module: purchase
-#: code:addons/purchase/purchase.py:508
+#: code:addons/purchase/purchase.py:525
#, python-format
msgid "Define expense account for this company: \"%s\" (id:%d)."
msgstr ""
@@ -589,7 +576,6 @@ msgstr "Междинна сума"
#. module: purchase
#: field:purchase.order,shipped:0
-#: field:purchase.order,shipped_rate:0
msgid "Received"
msgstr "Получена"
@@ -631,13 +617,20 @@ msgid "Invoices and Receptions"
msgstr ""
#. module: purchase
+#: model:process.transition,note:purchase.process_transition_packinginvoice0
+msgid ""
+"A Pick list generates an invoice. Depending on the Invoicing control of the "
+"sales order, the invoice is based on delivered or on ordered quantities."
+msgstr ""
+
+#. module: purchase
#: view:purchase.report:0
#: field:purchase.report,nbr:0
msgid "# of Lines"
msgstr "# от редове"
#. module: purchase
-#: code:addons/purchase/wizard/purchase_line_invoice.py:110
+#: code:addons/purchase/wizard/purchase_line_invoice.py:106
#, python-format
msgid "Define expense account for this product: \"%s\" (id:%d)."
msgstr ""
@@ -658,8 +651,8 @@ msgid "It indicates that a picking has been done"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:565
-#: code:addons/purchase/purchase.py:572
+#: code:addons/purchase/purchase.py:579
+#: code:addons/purchase/purchase.py:586
#, python-format
msgid "Unable to cancel this purchase order."
msgstr ""
@@ -722,6 +715,15 @@ msgid "Draft PO"
msgstr ""
#. module: purchase
+#: code:addons/purchase/purchase.py:941
+#: code:addons/purchase/purchase.py:956
+#: code:addons/purchase/purchase.py:960
+#: code:addons/purchase/wizard/purchase_order_group.py:47
+#, python-format
+msgid "Warning!"
+msgstr ""
+
+#. module: purchase
#: model:process.node,name:purchase.process_node_draftpurchaseorder0
#: model:process.node,name:purchase.process_node_draftpurchaseorder1
msgid "RFQ"
@@ -753,6 +755,11 @@ msgid "The tax amount"
msgstr "Стойност на данъка"
#. module: purchase
+#: field:purchase.order,shipped_rate:0
+msgid "Received Ratio"
+msgstr ""
+
+#. module: purchase
#: selection:purchase.report,month:0
msgid "September"
msgstr "Септември"
@@ -784,7 +791,7 @@ msgid "Stock Moves"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1158
+#: code:addons/purchase/purchase.py:1156
#, python-format
msgid "Draft Purchase Order created"
msgstr ""
@@ -805,11 +812,6 @@ msgid "Terms and Conditions"
msgstr ""
#. module: purchase
-#: field:purchase.order,currency_id:0
-msgid "unknown"
-msgstr ""
-
-#. module: purchase
#: help:purchase.order,date_order:0
msgid "Date on which this document has been created."
msgstr "Дата на създаване на документа"
@@ -903,12 +905,6 @@ msgid "Cancel"
msgstr "Откажи"
#. module: purchase
-#: field:purchase.order,message_comment_ids:0
-#: help:purchase.order,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
-#. module: purchase
#: sql_constraint:purchase.order:0
msgid "Order Reference must be unique per Company!"
msgstr ""
@@ -942,14 +938,89 @@ msgid "Date Approved"
msgstr "Одобрен на дата"
#. module: purchase
-#: code:addons/purchase/purchase.py:806
-#, python-format
-msgid "Request for quotation <b>created</b>."
+#: view:product.product:0
+msgid "a draft purchase order"
msgstr ""
#. module: purchase
-#: view:product.product:0
-msgid "a draft purchase order"
+#: model:email.template,body_html:purchase.email_template_edi_purchase
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: #FFF; \">\n"
+"\n"
+" <p>Hello$ ${object.partner_id.name},</p>\n"
+" \n"
+" <p>Here is a ${object.state in ('draft', 'sent') and 'request for "
+"quotation' or 'purchase order confirmation'} from ${object.company_id.name}: "
+"</p>\n"
+" \n"
+" <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
+" &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
+" &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
+" &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
+"${object.pricelist_id.currency_id.name}</strong><br />\n"
+" &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
+" % if object.origin:\n"
+" &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
+" % endif\n"
+" % if object.partner_ref:\n"
+" &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
+" % endif\n"
+" % if object.validator:\n"
+" &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.validator.email "
+"or ''}?subject=Order%20${object.name}\">${object.validator.name}</a>\n"
+" % endif\n"
+" </p>\n"
+"\n"
+" <br/>\n"
+" <p>If you have any question, do not hesitate to contact us.</p>\n"
+" <p>Thank you!</p>\n"
+" <br/>\n"
+" <br/>\n"
+" <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
+"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
+"background-repeat: repeat no-repeat;\">\n"
+" <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
+"#DDD;\">\n"
+" <strong style=\"text-"
+"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
+" </div>\n"
+" <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
+"16px; background-color: #F2F2F2;\">\n"
+" <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
+" % if object.company_id.street:\n"
+" ${object.company_id.street}<br/>\n"
+" % endif\n"
+" % if object.company_id.street2:\n"
+" ${object.company_id.street2}<br/>\n"
+" % endif\n"
+" % if object.company_id.city or object.company_id.zip:\n"
+" ${object.company_id.zip} ${object.company_id.city}<br/>\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 ''}<br/>\n"
+" % endif\n"
+" </span>\n"
+" % if object.company_id.phone:\n"
+" <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
+"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
+"0px; padding-left: 0px; \">\n"
+" Phone:&nbsp; ${object.company_id.phone}\n"
+" </div>\n"
+" % endif\n"
+" % if object.company_id.website:\n"
+" <div>\n"
+" Web :&nbsp;<a "
+"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
+" </div>\n"
+" %endif\n"
+" <p></p>\n"
+" </div>\n"
+"</div>\n"
+" "
msgstr ""
#. module: purchase
@@ -989,17 +1060,12 @@ msgid "Outgoing Mails"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:437
+#: code:addons/purchase/purchase.py:456
#, python-format
msgid "You cannot confirm a purchase order without any purchase order line."
msgstr ""
#. module: purchase
-#: model:ir.actions.server,name:purchase.actions_server_purchase_order_unread
-msgid "Purchase: Mark unread"
-msgstr ""
-
-#. module: purchase
#: help:purchase.order,message_ids:0
msgid "Messages and communication history"
msgstr ""
@@ -1011,7 +1077,7 @@ msgid "Destination Warehouse"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:973
+#: code:addons/purchase/purchase.py:941
#, python-format
msgid ""
"Selected Unit of Measure does not belong to the same category as the product "
@@ -1019,6 +1085,11 @@ msgid ""
msgstr ""
#. module: purchase
+#: view:purchase.order.line_invoice:0
+msgid "Select an Open Sales Order"
+msgstr ""
+
+#. module: purchase
#: model:ir.ui.menu,name:purchase.menu_purchase_unit_measure_purchase
#: model:ir.ui.menu,name:purchase.menu_purchase_uom_form_action
msgid "Units of Measure"
@@ -1030,18 +1101,12 @@ msgid "Manage pricelist per supplier"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:833
-#, python-format
-msgid "Purchase Order has been set to <b>draft</b>."
-msgstr ""
-
-#. module: purchase
#: view:board.board:0
msgid "Purchase Dashboard"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:566
+#: code:addons/purchase/purchase.py:580
#, python-format
msgid "First cancel all receptions related to this purchase order."
msgstr ""
@@ -1080,8 +1145,8 @@ msgid "Unread Messages"
msgstr ""
#. module: purchase
-#: view:purchase.order.line_invoice:0
-msgid "Select an Open Sale Order"
+#: model:ir.ui.menu,name:purchase.menu_purchase_uom_categ_form_action
+msgid "Unit of Measure Categories"
msgstr ""
#. module: purchase
@@ -1090,6 +1155,13 @@ msgid "Set to Draft"
msgstr "Пращане в проект"
#. module: purchase
+#: help:purchase.order,origin:0
+msgid ""
+"Reference of the document that generated this purchase order request; a "
+"sales order or an internal procurement request."
+msgstr ""
+
+#. module: purchase
#: view:purchase.order.line:0
msgid "Notes"
msgstr "Бележки"
@@ -1119,7 +1191,7 @@ msgid "Stock Move"
msgstr "Движение в склад"
#. module: purchase
-#: code:addons/purchase/purchase.py:255
+#: code:addons/purchase/purchase.py:260
#, python-format
msgid "Invalid Action!"
msgstr ""
@@ -1218,7 +1290,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:310
+#: code:addons/purchase/purchase.py:320
#, python-format
msgid "Please create Invoices."
msgstr ""
@@ -1308,7 +1380,7 @@ msgid "Purchase Order Line Make Invoice"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1133
+#: code:addons/purchase/purchase.py:1141
#, python-format
msgid "PO: %s"
msgstr ""
@@ -1319,7 +1391,7 @@ msgid "Send by EMail"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:498
+#: code:addons/purchase/purchase.py:515
#, python-format
msgid "Define purchase journal for this company: \"%s\" (id:%d)."
msgstr ""
@@ -1330,9 +1402,9 @@ msgid "Purchase Order "
msgstr ""
#. module: purchase
-#: view:purchase.order.line:0
-msgid "Manual Invoices"
-msgstr "Ръчно издадени фактури"
+#: help:purchase.config.settings,group_costing_method:0
+msgid "Allows you to compute product cost price based on average cost."
+msgstr ""
#. module: purchase
#: model:ir.actions.act_window,name:purchase.action_purchase_configuration
@@ -1486,8 +1558,8 @@ msgid "Compute product cost price based on average cost"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:340
-#: code:addons/purchase/wizard/purchase_line_invoice.py:141
+#: code:addons/purchase/purchase.py:350
+#: code:addons/purchase/wizard/purchase_line_invoice.py:137
#: model:ir.actions.act_window,name:purchase.act_res_partner_2_supplier_invoices
#: view:res.partner:0
#, python-format
@@ -1599,8 +1671,9 @@ msgid "Open Purchase Menu"
msgstr ""
#. module: purchase
-#: model:ir.model,name:purchase.model_mail_compose_message
-msgid "Email composition wizard"
+#: code:addons/purchase/purchase.py:1028
+#, python-format
+msgid "No address defined for the supplier"
msgstr ""
#. module: purchase
@@ -1673,11 +1746,11 @@ msgid "Purchase Order"
msgstr "Поръчка за покупка"
#. module: purchase
-#: code:addons/purchase/purchase.py:310
-#: code:addons/purchase/purchase.py:437
-#: code:addons/purchase/purchase.py:497
-#: code:addons/purchase/purchase.py:508
-#: code:addons/purchase/wizard/purchase_line_invoice.py:109
+#: code:addons/purchase/purchase.py:320
+#: code:addons/purchase/purchase.py:456
+#: code:addons/purchase/purchase.py:514
+#: code:addons/purchase/purchase.py:525
+#: code:addons/purchase/wizard/purchase_line_invoice.py:105
#, python-format
msgid "Error!"
msgstr ""
@@ -1699,13 +1772,6 @@ msgid ""
msgstr ""
#. module: purchase
-#: model:process.transition,note:purchase.process_transition_packinginvoice0
-msgid ""
-"A Pick list generates an invoice. Depending on the Invoicing control of the "
-"sale order, the invoice is based on delivered or on ordered quantities."
-msgstr ""
-
-#. module: purchase
#: selection:purchase.order,state:0
#: selection:purchase.order.line,state:0
#: selection:purchase.report,state:0
@@ -1718,9 +1784,8 @@ msgid "# of Purchase Order"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:827
-#, python-format
-msgid "Shipment <b>received</b>."
+#: model:ir.model,name:purchase.model_mail_compose_message
+msgid "Email composition wizard"
msgstr ""
#. module: purchase
@@ -1804,7 +1869,7 @@ msgid "RFQ_${(object.name or '').replace('/','_')}"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:988
+#: code:addons/purchase/purchase.py:956
#, python-format
msgid "The selected supplier only sells this product by %s"
msgstr ""
@@ -1850,6 +1915,12 @@ msgid "Outgoing products to invoice"
msgstr ""
#. module: purchase
+#: report:purchase.order:0
+#: field:purchase.report,validator:0
+msgid "Validated By"
+msgstr "Проверрено от"
+
+#. module: purchase
#: view:purchase.report:0
#: field:purchase.report,delay_pass:0
msgid "Days to Deliver"
@@ -1939,9 +2010,9 @@ msgid "November"
msgstr "Ноември"
#. module: purchase
-#: help:purchase.config.settings,group_costing_method:0
-msgid "Allows you to compute product cost price based on average cost."
-msgstr ""
+#: view:purchase.order.line:0
+msgid "Manual Invoices"
+msgstr "Ръчно издадени фактури"
#. module: purchase
#: report:purchase.order:0
@@ -1964,13 +2035,6 @@ msgid ""
msgstr ""
#. module: purchase
-#: help:purchase.order,origin:0
-msgid ""
-"Reference of the document that generated this purchase order request; a sale "
-"order or an internal procurement request."
-msgstr ""
-
-#. module: purchase
#: model:ir.ui.menu,name:purchase.menu_partner_categories_in_form
msgid "Partner Categories"
msgstr ""
@@ -1991,89 +2055,6 @@ msgid "Invoicing Settings"
msgstr ""
#. module: purchase
-#: model:email.template,body_html:purchase.email_template_edi_purchase
-msgid ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"\n"
-" <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
-"or ''},</p>\n"
-" \n"
-" <p>Here is a ${object.state in ('draft', 'sent') and 'request for "
-"quotation' or 'purchase order confirmation'} from ${object.company_id.name}: "
-"</p>\n"
-" \n"
-" <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
-" &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
-" &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
-" &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
-"${object.pricelist_id.currency_id.name}</strong><br />\n"
-" &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
-" % if object.origin:\n"
-" &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
-" % endif\n"
-" % if object.partner_ref:\n"
-" &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
-" % endif\n"
-" % if object.validator:\n"
-" &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.validator.email "
-"or ''}?subject=Order%20${object.name}\">${object.validator.name}</a>\n"
-" % endif\n"
-" </p>\n"
-"\n"
-" <br/>\n"
-" <p>If you have any question, do not hesitate to contact us.</p>\n"
-" <p>Thank you!</p>\n"
-" <br/>\n"
-" <br/>\n"
-" <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
-"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
-"background-repeat: repeat no-repeat;\">\n"
-" <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
-"#FFF;\">\n"
-" <strong style=\"text-"
-"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
-" </div>\n"
-" <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
-"16px; background-color: #F2F2F2;\">\n"
-" <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
-" % if object.company_id.street:\n"
-" ${object.company_id.street}<br/>\n"
-" % endif\n"
-" % if object.company_id.street2:\n"
-" ${object.company_id.street2}<br/>\n"
-" % endif\n"
-" % if object.company_id.city or object.company_id.zip:\n"
-" ${object.company_id.zip} ${object.company_id.city}<br/>\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 ''}<br/>\n"
-" % endif\n"
-" </span>\n"
-" % if object.company_id.phone:\n"
-" <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
-"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
-"0px; padding-left: 0px; \">\n"
-" Phone:&nbsp; ${object.company_id.phone}\n"
-" </div>\n"
-" % endif\n"
-" % if object.company_id.website:\n"
-" <div>\n"
-" Web :&nbsp;<a "
-"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
-" </div>\n"
-" %endif\n"
-" <p></p>\n"
-" </div>\n"
-"</div>\n"
-" "
-msgstr ""
-
-#. module: purchase
#: model:ir.actions.act_window,name:purchase.action_purchase_order_by_user_all
msgid "Total Orders by User per month"
msgstr "Общо поръчки по клиент за месец"
@@ -2084,21 +2065,19 @@ msgid "Based on incoming shipments"
msgstr ""
#. module: purchase
+#: code:addons/purchase/purchase.py:1018
+#, python-format
+msgid "No default supplier defined for this product"
+msgstr ""
+
+#. module: purchase
#: view:purchase.report:0
#: field:purchase.report,warehouse_id:0
msgid "Warehouse"
msgstr "Склад"
#. module: purchase
-#: help:purchase.order,partner_ref:0
-msgid ""
-"Reference of the sale order or quotation sent by your supplier. It's mainly "
-"used to do the matching when you receive the products as this reference is "
-"usually written on the delivery order sent by your supplier."
-msgstr ""
-
-#. module: purchase
-#: code:addons/purchase/purchase.py:991
+#: code:addons/purchase/purchase.py:960
#, python-format
msgid ""
"The selected supplier has a minimal quantity set to %s %s, you should not "
@@ -2171,8 +2150,8 @@ msgid ""
msgstr ""
#. module: purchase
-#: view:product.product:0
-msgid "When you sell this service to a customer,"
+#: field:purchase.order,message_summary:0
+msgid "Summary"
msgstr ""
#. module: purchase
@@ -2182,6 +2161,11 @@ msgid "Pricelist Versions"
msgstr "Версии на ценова листа"
#. module: purchase
+#: field:purchase.order,payment_term_id:0
+msgid "Payment Term"
+msgstr ""
+
+#. module: purchase
#: view:purchase.order:0
msgid "Purchase orders which are in draft state"
msgstr ""
diff --git a/addons/purchase/i18n/bs.po b/addons/purchase/i18n/bs.po
index 418f915a6bf..59f6fe18ec8 100644
--- a/addons/purchase/i18n/bs.po
+++ b/addons/purchase/i18n/bs.po
@@ -6,15 +6,15 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
"PO-Revision-Date: 2012-05-10 17:22+0000\n"
"Last-Translator: adnan <adnankraljic@yahoo.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: 2012-12-04 05:11+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:18+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
#. module: purchase
#: model:res.groups,name:purchase.group_analytic_accounting
@@ -60,11 +60,6 @@ msgstr ""
"izračunava nabavnu cijenu za odabrane proizvode i količinu."
#. module: purchase
-#: model:ir.actions.server,name:purchase.actions_server_purchase_order_read
-msgid "Purchase: Mark read"
-msgstr ""
-
-#. module: purchase
#: view:purchase.report:0
#: field:purchase.report,day:0
msgid "Day"
@@ -105,16 +100,13 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:973
-#: code:addons/purchase/purchase.py:988
-#: code:addons/purchase/purchase.py:991
-#: code:addons/purchase/wizard/purchase_order_group.py:47
+#: code:addons/purchase/purchase.py:1024
#, python-format
-msgid "Warning!"
+msgid "Configuration Error!"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:573
+#: code:addons/purchase/purchase.py:587
#, python-format
msgid "You must first cancel all receptions related to this purchase order."
msgstr ""
@@ -131,10 +123,10 @@ msgid "Purchase-Standard Price"
msgstr ""
#. module: purchase
-#: report:purchase.order:0
-#: field:purchase.report,validator:0
-msgid "Validated By"
-msgstr "Potvrđeno od"
+#: code:addons/purchase/purchase.py:1011
+#, python-format
+msgid "No supplier defined for this product !"
+msgstr ""
#. module: purchase
#: model:ir.actions.act_window,help:purchase.action_picking_tree4_picking_to_invoice
@@ -157,12 +149,6 @@ msgid "Average Price"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:830
-#, python-format
-msgid "Invoice <b>paid</b>."
-msgstr ""
-
-#. module: purchase
#: view:purchase.order:0
msgid "Purchase order which are in the exception state"
msgstr ""
@@ -234,7 +220,7 @@ msgstr ""
"svim nabavnim nalozima."
#. module: purchase
-#: code:addons/purchase/purchase.py:255
+#: code:addons/purchase/purchase.py:260
#, python-format
msgid "In order to delete a purchase order, you must cancel it first."
msgstr ""
@@ -260,29 +246,12 @@ msgid "Total Untaxed amount"
msgstr ""
#. module: purchase
-#: model:ir.ui.menu,name:purchase.menu_purchase_uom_categ_form_action
-msgid "Unit of Measure Categories"
-msgstr ""
-
-#. module: purchase
#: view:purchase.report:0
#: field:purchase.report,category_id:0
msgid "Category"
msgstr ""
#. module: purchase
-#: view:purchase.order:0
-msgid "Quotation "
-msgstr ""
-
-#. module: purchase
-#: code:addons/purchase/purchase.py:810
-#, python-format
-msgid ""
-"Quotation for <em>%s</em> <b>converted</b> to a Purchase Order of %s %s."
-msgstr ""
-
-#. module: purchase
#: model:process.transition,note:purchase.process_transition_purchaseinvoice0
msgid ""
"A purchase order generates a supplier invoice, as soon as it is confirmed by "
@@ -347,14 +316,16 @@ msgid "October"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:837
+#: code:addons/purchase/purchase.py:1024
#, python-format
-msgid "Purchase Order for <em>%s</em> <b>cancelled</b>."
+msgid ""
+"The product \"%s\" has been defined with your company as reseller which "
+"seems to be a configuration error!"
msgstr ""
#. module: purchase
-#: field:purchase.order,message_summary:0
-msgid "Summary"
+#: view:product.product:0
+msgid "When you sell this service to a customer,"
msgstr ""
#. module: purchase
@@ -383,12 +354,6 @@ msgid "Quantity"
msgstr "Količina"
#. module: purchase
-#: code:addons/purchase/purchase.py:819
-#, python-format
-msgid "Shipment <em>%s</em> <b>scheduled</b> for %s."
-msgstr ""
-
-#. module: purchase
#: field:purchase.order,fiscal_position:0
msgid "Fiscal Position"
msgstr "Fiskalna pozicija"
@@ -446,12 +411,6 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:824
-#, python-format
-msgid "Draft Invoice of %s %s is <b>waiting for validation</b>."
-msgstr ""
-
-#. module: purchase
#: model:ir.actions.act_window,help:purchase.purchase_line_form_action2
msgid ""
"<p>\n"
@@ -472,6 +431,11 @@ msgid "Scheduled Date"
msgstr ""
#. module: purchase
+#: field:purchase.order,currency_id:0
+msgid "Currency"
+msgstr ""
+
+#. module: purchase
#: field:purchase.order,journal_id:0
msgid "Journal"
msgstr ""
@@ -504,6 +468,19 @@ msgid "Incoming Products"
msgstr ""
#. module: purchase
+#: view:purchase.order:0
+msgid "Request for Quotation "
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,partner_ref:0
+msgid ""
+"Reference of the sales order or quotation sent by your supplier. It's mainly "
+"used to do the matching when you receive the products as this reference is "
+"usually written on the delivery order sent by your supplier."
+msgstr ""
+
+#. module: purchase
#: view:purchase.config.settings:0
#: view:purchase.order.group:0
#: view:purchase.order.line_invoice:0
@@ -524,6 +501,11 @@ msgid ""
msgstr ""
#. module: purchase
+#: model:mail.message.subtype,name:purchase.mt_rfq_approved
+msgid "RFQ Approved"
+msgstr ""
+
+#. module: purchase
#: view:purchase.config.settings:0
msgid "Apply"
msgstr ""
@@ -541,6 +523,11 @@ msgid ""
msgstr ""
#. module: purchase
+#: model:mail.message.subtype,name:purchase.mt_rfq_confirmed
+msgid "RFQ Confirmed"
+msgstr ""
+
+#. module: purchase
#: view:purchase.order:0
msgid "Customer Address"
msgstr ""
@@ -565,7 +552,7 @@ msgid "Supplier"
msgstr "Dobavljač"
#. module: purchase
-#: code:addons/purchase/purchase.py:508
+#: code:addons/purchase/purchase.py:525
#, python-format
msgid "Define expense account for this company: \"%s\" (id:%d)."
msgstr ""
@@ -589,7 +576,6 @@ msgstr "Sub-ukupno"
#. module: purchase
#: field:purchase.order,shipped:0
-#: field:purchase.order,shipped_rate:0
msgid "Received"
msgstr "Primljeno"
@@ -631,13 +617,20 @@ msgid "Invoices and Receptions"
msgstr ""
#. module: purchase
+#: model:process.transition,note:purchase.process_transition_packinginvoice0
+msgid ""
+"A Pick list generates an invoice. Depending on the Invoicing control of the "
+"sales order, the invoice is based on delivered or on ordered quantities."
+msgstr ""
+
+#. module: purchase
#: view:purchase.report:0
#: field:purchase.report,nbr:0
msgid "# of Lines"
msgstr ""
#. module: purchase
-#: code:addons/purchase/wizard/purchase_line_invoice.py:110
+#: code:addons/purchase/wizard/purchase_line_invoice.py:106
#, python-format
msgid "Define expense account for this product: \"%s\" (id:%d)."
msgstr ""
@@ -658,8 +651,8 @@ msgid "It indicates that a picking has been done"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:565
-#: code:addons/purchase/purchase.py:572
+#: code:addons/purchase/purchase.py:579
+#: code:addons/purchase/purchase.py:586
#, python-format
msgid "Unable to cancel this purchase order."
msgstr ""
@@ -722,6 +715,15 @@ msgid "Draft PO"
msgstr ""
#. module: purchase
+#: code:addons/purchase/purchase.py:941
+#: code:addons/purchase/purchase.py:956
+#: code:addons/purchase/purchase.py:960
+#: code:addons/purchase/wizard/purchase_order_group.py:47
+#, python-format
+msgid "Warning!"
+msgstr ""
+
+#. module: purchase
#: model:process.node,name:purchase.process_node_draftpurchaseorder0
#: model:process.node,name:purchase.process_node_draftpurchaseorder1
msgid "RFQ"
@@ -753,6 +755,11 @@ msgid "The tax amount"
msgstr ""
#. module: purchase
+#: field:purchase.order,shipped_rate:0
+msgid "Received Ratio"
+msgstr ""
+
+#. module: purchase
#: selection:purchase.report,month:0
msgid "September"
msgstr ""
@@ -784,7 +791,7 @@ msgid "Stock Moves"
msgstr "Kretanje zaliha"
#. module: purchase
-#: code:addons/purchase/purchase.py:1158
+#: code:addons/purchase/purchase.py:1156
#, python-format
msgid "Draft Purchase Order created"
msgstr ""
@@ -805,11 +812,6 @@ msgid "Terms and Conditions"
msgstr ""
#. module: purchase
-#: field:purchase.order,currency_id:0
-msgid "unknown"
-msgstr ""
-
-#. module: purchase
#: help:purchase.order,date_order:0
msgid "Date on which this document has been created."
msgstr "Datum kreiranja dokumenta"
@@ -903,12 +905,6 @@ msgid "Cancel"
msgstr "Odustani"
#. module: purchase
-#: field:purchase.order,message_comment_ids:0
-#: help:purchase.order,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
-#. module: purchase
#: sql_constraint:purchase.order:0
msgid "Order Reference must be unique per Company!"
msgstr ""
@@ -942,14 +938,89 @@ msgid "Date Approved"
msgstr "Datum odobrenja"
#. module: purchase
-#: code:addons/purchase/purchase.py:806
-#, python-format
-msgid "Request for quotation <b>created</b>."
+#: view:product.product:0
+msgid "a draft purchase order"
msgstr ""
#. module: purchase
-#: view:product.product:0
-msgid "a draft purchase order"
+#: model:email.template,body_html:purchase.email_template_edi_purchase
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: #FFF; \">\n"
+"\n"
+" <p>Hello$ ${object.partner_id.name},</p>\n"
+" \n"
+" <p>Here is a ${object.state in ('draft', 'sent') and 'request for "
+"quotation' or 'purchase order confirmation'} from ${object.company_id.name}: "
+"</p>\n"
+" \n"
+" <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
+" &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
+" &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
+" &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
+"${object.pricelist_id.currency_id.name}</strong><br />\n"
+" &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
+" % if object.origin:\n"
+" &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
+" % endif\n"
+" % if object.partner_ref:\n"
+" &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
+" % endif\n"
+" % if object.validator:\n"
+" &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.validator.email "
+"or ''}?subject=Order%20${object.name}\">${object.validator.name}</a>\n"
+" % endif\n"
+" </p>\n"
+"\n"
+" <br/>\n"
+" <p>If you have any question, do not hesitate to contact us.</p>\n"
+" <p>Thank you!</p>\n"
+" <br/>\n"
+" <br/>\n"
+" <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
+"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
+"background-repeat: repeat no-repeat;\">\n"
+" <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
+"#DDD;\">\n"
+" <strong style=\"text-"
+"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
+" </div>\n"
+" <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
+"16px; background-color: #F2F2F2;\">\n"
+" <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
+" % if object.company_id.street:\n"
+" ${object.company_id.street}<br/>\n"
+" % endif\n"
+" % if object.company_id.street2:\n"
+" ${object.company_id.street2}<br/>\n"
+" % endif\n"
+" % if object.company_id.city or object.company_id.zip:\n"
+" ${object.company_id.zip} ${object.company_id.city}<br/>\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 ''}<br/>\n"
+" % endif\n"
+" </span>\n"
+" % if object.company_id.phone:\n"
+" <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
+"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
+"0px; padding-left: 0px; \">\n"
+" Phone:&nbsp; ${object.company_id.phone}\n"
+" </div>\n"
+" % endif\n"
+" % if object.company_id.website:\n"
+" <div>\n"
+" Web :&nbsp;<a "
+"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
+" </div>\n"
+" %endif\n"
+" <p></p>\n"
+" </div>\n"
+"</div>\n"
+" "
msgstr ""
#. module: purchase
@@ -989,17 +1060,12 @@ msgid "Outgoing Mails"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:437
+#: code:addons/purchase/purchase.py:456
#, python-format
msgid "You cannot confirm a purchase order without any purchase order line."
msgstr ""
#. module: purchase
-#: model:ir.actions.server,name:purchase.actions_server_purchase_order_unread
-msgid "Purchase: Mark unread"
-msgstr ""
-
-#. module: purchase
#: help:purchase.order,message_ids:0
msgid "Messages and communication history"
msgstr ""
@@ -1011,7 +1077,7 @@ msgid "Destination Warehouse"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:973
+#: code:addons/purchase/purchase.py:941
#, python-format
msgid ""
"Selected Unit of Measure does not belong to the same category as the product "
@@ -1019,6 +1085,11 @@ msgid ""
msgstr ""
#. module: purchase
+#: view:purchase.order.line_invoice:0
+msgid "Select an Open Sales Order"
+msgstr ""
+
+#. module: purchase
#: model:ir.ui.menu,name:purchase.menu_purchase_unit_measure_purchase
#: model:ir.ui.menu,name:purchase.menu_purchase_uom_form_action
msgid "Units of Measure"
@@ -1030,18 +1101,12 @@ msgid "Manage pricelist per supplier"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:833
-#, python-format
-msgid "Purchase Order has been set to <b>draft</b>."
-msgstr ""
-
-#. module: purchase
#: view:board.board:0
msgid "Purchase Dashboard"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:566
+#: code:addons/purchase/purchase.py:580
#, python-format
msgid "First cancel all receptions related to this purchase order."
msgstr ""
@@ -1080,8 +1145,8 @@ msgid "Unread Messages"
msgstr ""
#. module: purchase
-#: view:purchase.order.line_invoice:0
-msgid "Select an Open Sale Order"
+#: model:ir.ui.menu,name:purchase.menu_purchase_uom_categ_form_action
+msgid "Unit of Measure Categories"
msgstr ""
#. module: purchase
@@ -1090,6 +1155,13 @@ msgid "Set to Draft"
msgstr "podesi kao draft"
#. module: purchase
+#: help:purchase.order,origin:0
+msgid ""
+"Reference of the document that generated this purchase order request; a "
+"sales order or an internal procurement request."
+msgstr ""
+
+#. module: purchase
#: view:purchase.order.line:0
msgid "Notes"
msgstr "Napomene"
@@ -1119,7 +1191,7 @@ msgid "Stock Move"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:255
+#: code:addons/purchase/purchase.py:260
#, python-format
msgid "Invalid Action!"
msgstr ""
@@ -1218,7 +1290,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:310
+#: code:addons/purchase/purchase.py:320
#, python-format
msgid "Please create Invoices."
msgstr ""
@@ -1308,7 +1380,7 @@ msgid "Purchase Order Line Make Invoice"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1133
+#: code:addons/purchase/purchase.py:1141
#, python-format
msgid "PO: %s"
msgstr ""
@@ -1319,7 +1391,7 @@ msgid "Send by EMail"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:498
+#: code:addons/purchase/purchase.py:515
#, python-format
msgid "Define purchase journal for this company: \"%s\" (id:%d)."
msgstr ""
@@ -1330,8 +1402,8 @@ msgid "Purchase Order "
msgstr ""
#. module: purchase
-#: view:purchase.order.line:0
-msgid "Manual Invoices"
+#: help:purchase.config.settings,group_costing_method:0
+msgid "Allows you to compute product cost price based on average cost."
msgstr ""
#. module: purchase
@@ -1486,8 +1558,8 @@ msgid "Compute product cost price based on average cost"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:340
-#: code:addons/purchase/wizard/purchase_line_invoice.py:141
+#: code:addons/purchase/purchase.py:350
+#: code:addons/purchase/wizard/purchase_line_invoice.py:137
#: model:ir.actions.act_window,name:purchase.act_res_partner_2_supplier_invoices
#: view:res.partner:0
#, python-format
@@ -1599,8 +1671,9 @@ msgid "Open Purchase Menu"
msgstr ""
#. module: purchase
-#: model:ir.model,name:purchase.model_mail_compose_message
-msgid "Email composition wizard"
+#: code:addons/purchase/purchase.py:1028
+#, python-format
+msgid "No address defined for the supplier"
msgstr ""
#. module: purchase
@@ -1673,11 +1746,11 @@ msgid "Purchase Order"
msgstr "Nabavni nalog"
#. module: purchase
-#: code:addons/purchase/purchase.py:310
-#: code:addons/purchase/purchase.py:437
-#: code:addons/purchase/purchase.py:497
-#: code:addons/purchase/purchase.py:508
-#: code:addons/purchase/wizard/purchase_line_invoice.py:109
+#: code:addons/purchase/purchase.py:320
+#: code:addons/purchase/purchase.py:456
+#: code:addons/purchase/purchase.py:514
+#: code:addons/purchase/purchase.py:525
+#: code:addons/purchase/wizard/purchase_line_invoice.py:105
#, python-format
msgid "Error!"
msgstr ""
@@ -1699,13 +1772,6 @@ msgid ""
msgstr ""
#. module: purchase
-#: model:process.transition,note:purchase.process_transition_packinginvoice0
-msgid ""
-"A Pick list generates an invoice. Depending on the Invoicing control of the "
-"sale order, the invoice is based on delivered or on ordered quantities."
-msgstr ""
-
-#. module: purchase
#: selection:purchase.order,state:0
#: selection:purchase.order.line,state:0
#: selection:purchase.report,state:0
@@ -1718,9 +1784,8 @@ msgid "# of Purchase Order"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:827
-#, python-format
-msgid "Shipment <b>received</b>."
+#: model:ir.model,name:purchase.model_mail_compose_message
+msgid "Email composition wizard"
msgstr ""
#. module: purchase
@@ -1804,7 +1869,7 @@ msgid "RFQ_${(object.name or '').replace('/','_')}"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:988
+#: code:addons/purchase/purchase.py:956
#, python-format
msgid "The selected supplier only sells this product by %s"
msgstr ""
@@ -1850,6 +1915,12 @@ msgid "Outgoing products to invoice"
msgstr ""
#. module: purchase
+#: report:purchase.order:0
+#: field:purchase.report,validator:0
+msgid "Validated By"
+msgstr "Potvrđeno od"
+
+#. module: purchase
#: view:purchase.report:0
#: field:purchase.report,delay_pass:0
msgid "Days to Deliver"
@@ -1939,8 +2010,8 @@ msgid "November"
msgstr ""
#. module: purchase
-#: help:purchase.config.settings,group_costing_method:0
-msgid "Allows you to compute product cost price based on average cost."
+#: view:purchase.order.line:0
+msgid "Manual Invoices"
msgstr ""
#. module: purchase
@@ -1964,13 +2035,6 @@ msgid ""
msgstr ""
#. module: purchase
-#: help:purchase.order,origin:0
-msgid ""
-"Reference of the document that generated this purchase order request; a sale "
-"order or an internal procurement request."
-msgstr ""
-
-#. module: purchase
#: model:ir.ui.menu,name:purchase.menu_partner_categories_in_form
msgid "Partner Categories"
msgstr ""
@@ -1991,89 +2055,6 @@ msgid "Invoicing Settings"
msgstr ""
#. module: purchase
-#: model:email.template,body_html:purchase.email_template_edi_purchase
-msgid ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"\n"
-" <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
-"or ''},</p>\n"
-" \n"
-" <p>Here is a ${object.state in ('draft', 'sent') and 'request for "
-"quotation' or 'purchase order confirmation'} from ${object.company_id.name}: "
-"</p>\n"
-" \n"
-" <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
-" &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
-" &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
-" &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
-"${object.pricelist_id.currency_id.name}</strong><br />\n"
-" &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
-" % if object.origin:\n"
-" &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
-" % endif\n"
-" % if object.partner_ref:\n"
-" &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
-" % endif\n"
-" % if object.validator:\n"
-" &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.validator.email "
-"or ''}?subject=Order%20${object.name}\">${object.validator.name}</a>\n"
-" % endif\n"
-" </p>\n"
-"\n"
-" <br/>\n"
-" <p>If you have any question, do not hesitate to contact us.</p>\n"
-" <p>Thank you!</p>\n"
-" <br/>\n"
-" <br/>\n"
-" <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
-"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
-"background-repeat: repeat no-repeat;\">\n"
-" <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
-"#FFF;\">\n"
-" <strong style=\"text-"
-"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
-" </div>\n"
-" <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
-"16px; background-color: #F2F2F2;\">\n"
-" <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
-" % if object.company_id.street:\n"
-" ${object.company_id.street}<br/>\n"
-" % endif\n"
-" % if object.company_id.street2:\n"
-" ${object.company_id.street2}<br/>\n"
-" % endif\n"
-" % if object.company_id.city or object.company_id.zip:\n"
-" ${object.company_id.zip} ${object.company_id.city}<br/>\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 ''}<br/>\n"
-" % endif\n"
-" </span>\n"
-" % if object.company_id.phone:\n"
-" <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
-"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
-"0px; padding-left: 0px; \">\n"
-" Phone:&nbsp; ${object.company_id.phone}\n"
-" </div>\n"
-" % endif\n"
-" % if object.company_id.website:\n"
-" <div>\n"
-" Web :&nbsp;<a "
-"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
-" </div>\n"
-" %endif\n"
-" <p></p>\n"
-" </div>\n"
-"</div>\n"
-" "
-msgstr ""
-
-#. module: purchase
#: model:ir.actions.act_window,name:purchase.action_purchase_order_by_user_all
msgid "Total Orders by User per month"
msgstr ""
@@ -2084,21 +2065,19 @@ msgid "Based on incoming shipments"
msgstr ""
#. module: purchase
+#: code:addons/purchase/purchase.py:1018
+#, python-format
+msgid "No default supplier defined for this product"
+msgstr ""
+
+#. module: purchase
#: view:purchase.report:0
#: field:purchase.report,warehouse_id:0
msgid "Warehouse"
msgstr "Skladište"
#. module: purchase
-#: help:purchase.order,partner_ref:0
-msgid ""
-"Reference of the sale order or quotation sent by your supplier. It's mainly "
-"used to do the matching when you receive the products as this reference is "
-"usually written on the delivery order sent by your supplier."
-msgstr ""
-
-#. module: purchase
-#: code:addons/purchase/purchase.py:991
+#: code:addons/purchase/purchase.py:960
#, python-format
msgid ""
"The selected supplier has a minimal quantity set to %s %s, you should not "
@@ -2171,8 +2150,8 @@ msgid ""
msgstr ""
#. module: purchase
-#: view:product.product:0
-msgid "When you sell this service to a customer,"
+#: field:purchase.order,message_summary:0
+msgid "Summary"
msgstr ""
#. module: purchase
@@ -2182,6 +2161,11 @@ msgid "Pricelist Versions"
msgstr ""
#. module: purchase
+#: field:purchase.order,payment_term_id:0
+msgid "Payment Term"
+msgstr ""
+
+#. module: purchase
#: view:purchase.order:0
msgid "Purchase orders which are in draft state"
msgstr ""
diff --git a/addons/purchase/i18n/ca.po b/addons/purchase/i18n/ca.po
index d771625cf1b..56dcca01d3d 100644
--- a/addons/purchase/i18n/ca.po
+++ b/addons/purchase/i18n/ca.po
@@ -6,15 +6,15 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
"PO-Revision-Date: 2011-11-07 12:44+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: 2012-12-04 05:11+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:19+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
#. module: purchase
#: model:res.groups,name:purchase.group_analytic_accounting
@@ -60,11 +60,6 @@ msgstr ""
"el preu del proveïdor pels productes/quantitats seleccionats."
#. module: purchase
-#: model:ir.actions.server,name:purchase.actions_server_purchase_order_read
-msgid "Purchase: Mark read"
-msgstr ""
-
-#. module: purchase
#: view:purchase.report:0
#: field:purchase.report,day:0
msgid "Day"
@@ -105,16 +100,13 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:973
-#: code:addons/purchase/purchase.py:988
-#: code:addons/purchase/purchase.py:991
-#: code:addons/purchase/wizard/purchase_order_group.py:47
+#: code:addons/purchase/purchase.py:1024
#, python-format
-msgid "Warning!"
+msgid "Configuration Error!"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:573
+#: code:addons/purchase/purchase.py:587
#, python-format
msgid "You must first cancel all receptions related to this purchase order."
msgstr ""
@@ -131,10 +123,10 @@ msgid "Purchase-Standard Price"
msgstr "Preu compra-estàndard"
#. module: purchase
-#: report:purchase.order:0
-#: field:purchase.report,validator:0
-msgid "Validated By"
-msgstr "Validat per"
+#: code:addons/purchase/purchase.py:1011
+#, python-format
+msgid "No supplier defined for this product !"
+msgstr ""
#. module: purchase
#: model:ir.actions.act_window,help:purchase.action_picking_tree4_picking_to_invoice
@@ -157,12 +149,6 @@ msgid "Average Price"
msgstr "Preu mitjà"
#. module: purchase
-#: code:addons/purchase/purchase.py:830
-#, python-format
-msgid "Invoice <b>paid</b>."
-msgstr ""
-
-#. module: purchase
#: view:purchase.order:0
msgid "Purchase order which are in the exception state"
msgstr ""
@@ -234,7 +220,7 @@ msgstr ""
"les línies de la comanda de compra."
#. module: purchase
-#: code:addons/purchase/purchase.py:255
+#: code:addons/purchase/purchase.py:260
#, python-format
msgid "In order to delete a purchase order, you must cancel it first."
msgstr ""
@@ -260,29 +246,12 @@ msgid "Total Untaxed amount"
msgstr "Total import base"
#. module: purchase
-#: model:ir.ui.menu,name:purchase.menu_purchase_uom_categ_form_action
-msgid "Unit of Measure Categories"
-msgstr ""
-
-#. module: purchase
#: view:purchase.report:0
#: field:purchase.report,category_id:0
msgid "Category"
msgstr "Categoria"
#. module: purchase
-#: view:purchase.order:0
-msgid "Quotation "
-msgstr ""
-
-#. module: purchase
-#: code:addons/purchase/purchase.py:810
-#, python-format
-msgid ""
-"Quotation for <em>%s</em> <b>converted</b> to a Purchase Order of %s %s."
-msgstr ""
-
-#. module: purchase
#: model:process.transition,note:purchase.process_transition_purchaseinvoice0
msgid ""
"A purchase order generates a supplier invoice, as soon as it is confirmed by "
@@ -350,14 +319,16 @@ msgid "October"
msgstr "Octubre"
#. module: purchase
-#: code:addons/purchase/purchase.py:837
+#: code:addons/purchase/purchase.py:1024
#, python-format
-msgid "Purchase Order for <em>%s</em> <b>cancelled</b>."
+msgid ""
+"The product \"%s\" has been defined with your company as reseller which "
+"seems to be a configuration error!"
msgstr ""
#. module: purchase
-#: field:purchase.order,message_summary:0
-msgid "Summary"
+#: view:product.product:0
+msgid "When you sell this service to a customer,"
msgstr ""
#. module: purchase
@@ -386,12 +357,6 @@ msgid "Quantity"
msgstr "Quantitat"
#. module: purchase
-#: code:addons/purchase/purchase.py:819
-#, python-format
-msgid "Shipment <em>%s</em> <b>scheduled</b> for %s."
-msgstr ""
-
-#. module: purchase
#: field:purchase.order,fiscal_position:0
msgid "Fiscal Position"
msgstr "Posició fiscal"
@@ -449,12 +414,6 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:824
-#, python-format
-msgid "Draft Invoice of %s %s is <b>waiting for validation</b>."
-msgstr ""
-
-#. module: purchase
#: model:ir.actions.act_window,help:purchase.purchase_line_form_action2
msgid ""
"<p>\n"
@@ -475,6 +434,11 @@ msgid "Scheduled Date"
msgstr "Data planificada"
#. module: purchase
+#: field:purchase.order,currency_id:0
+msgid "Currency"
+msgstr ""
+
+#. module: purchase
#: field:purchase.order,journal_id:0
msgid "Journal"
msgstr ""
@@ -507,6 +471,19 @@ msgid "Incoming Products"
msgstr ""
#. module: purchase
+#: view:purchase.order:0
+msgid "Request for Quotation "
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,partner_ref:0
+msgid ""
+"Reference of the sales order or quotation sent by your supplier. It's mainly "
+"used to do the matching when you receive the products as this reference is "
+"usually written on the delivery order sent by your supplier."
+msgstr ""
+
+#. module: purchase
#: view:purchase.config.settings:0
#: view:purchase.order.group:0
#: view:purchase.order.line_invoice:0
@@ -530,6 +507,11 @@ msgstr ""
"pel comptable (control facturació = Manual)."
#. module: purchase
+#: model:mail.message.subtype,name:purchase.mt_rfq_approved
+msgid "RFQ Approved"
+msgstr ""
+
+#. module: purchase
#: view:purchase.config.settings:0
msgid "Apply"
msgstr ""
@@ -550,6 +532,11 @@ msgstr ""
"compra confirmada."
#. module: purchase
+#: model:mail.message.subtype,name:purchase.mt_rfq_confirmed
+msgid "RFQ Confirmed"
+msgstr ""
+
+#. module: purchase
#: view:purchase.order:0
msgid "Customer Address"
msgstr ""
@@ -574,7 +561,7 @@ msgid "Supplier"
msgstr "Proveïdor"
#. module: purchase
-#: code:addons/purchase/purchase.py:508
+#: code:addons/purchase/purchase.py:525
#, python-format
msgid "Define expense account for this company: \"%s\" (id:%d)."
msgstr ""
@@ -598,7 +585,6 @@ msgstr "Subtotal"
#. module: purchase
#: field:purchase.order,shipped:0
-#: field:purchase.order,shipped_rate:0
msgid "Received"
msgstr "Rebuda"
@@ -640,13 +626,20 @@ msgid "Invoices and Receptions"
msgstr ""
#. module: purchase
+#: model:process.transition,note:purchase.process_transition_packinginvoice0
+msgid ""
+"A Pick list generates an invoice. Depending on the Invoicing control of the "
+"sales order, the invoice is based on delivered or on ordered quantities."
+msgstr ""
+
+#. module: purchase
#: view:purchase.report:0
#: field:purchase.report,nbr:0
msgid "# of Lines"
msgstr "# de línies"
#. module: purchase
-#: code:addons/purchase/wizard/purchase_line_invoice.py:110
+#: code:addons/purchase/wizard/purchase_line_invoice.py:106
#, python-format
msgid "Define expense account for this product: \"%s\" (id:%d)."
msgstr ""
@@ -667,8 +660,8 @@ msgid "It indicates that a picking has been done"
msgstr "Indica que un albarà ha estat realitzat."
#. module: purchase
-#: code:addons/purchase/purchase.py:565
-#: code:addons/purchase/purchase.py:572
+#: code:addons/purchase/purchase.py:579
+#: code:addons/purchase/purchase.py:586
#, python-format
msgid "Unable to cancel this purchase order."
msgstr ""
@@ -733,6 +726,15 @@ msgid "Draft PO"
msgstr ""
#. module: purchase
+#: code:addons/purchase/purchase.py:941
+#: code:addons/purchase/purchase.py:956
+#: code:addons/purchase/purchase.py:960
+#: code:addons/purchase/wizard/purchase_order_group.py:47
+#, python-format
+msgid "Warning!"
+msgstr ""
+
+#. module: purchase
#: model:process.node,name:purchase.process_node_draftpurchaseorder0
#: model:process.node,name:purchase.process_node_draftpurchaseorder1
msgid "RFQ"
@@ -764,6 +766,11 @@ msgid "The tax amount"
msgstr "Import dels impostos."
#. module: purchase
+#: field:purchase.order,shipped_rate:0
+msgid "Received Ratio"
+msgstr ""
+
+#. module: purchase
#: selection:purchase.report,month:0
msgid "September"
msgstr "Setembre"
@@ -795,7 +802,7 @@ msgid "Stock Moves"
msgstr "Moviments d'estoc"
#. module: purchase
-#: code:addons/purchase/purchase.py:1158
+#: code:addons/purchase/purchase.py:1156
#, python-format
msgid "Draft Purchase Order created"
msgstr ""
@@ -816,11 +823,6 @@ msgid "Terms and Conditions"
msgstr ""
#. module: purchase
-#: field:purchase.order,currency_id:0
-msgid "unknown"
-msgstr ""
-
-#. module: purchase
#: help:purchase.order,date_order:0
msgid "Date on which this document has been created."
msgstr "Data de la creació d'aquest document."
@@ -914,12 +916,6 @@ msgid "Cancel"
msgstr "Cancel·la"
#. module: purchase
-#: field:purchase.order,message_comment_ids:0
-#: help:purchase.order,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
-#. module: purchase
#: sql_constraint:purchase.order:0
msgid "Order Reference must be unique per Company!"
msgstr ""
@@ -953,14 +949,89 @@ msgid "Date Approved"
msgstr "Data aprovació"
#. module: purchase
-#: code:addons/purchase/purchase.py:806
-#, python-format
-msgid "Request for quotation <b>created</b>."
+#: view:product.product:0
+msgid "a draft purchase order"
msgstr ""
#. module: purchase
-#: view:product.product:0
-msgid "a draft purchase order"
+#: model:email.template,body_html:purchase.email_template_edi_purchase
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: #FFF; \">\n"
+"\n"
+" <p>Hello$ ${object.partner_id.name},</p>\n"
+" \n"
+" <p>Here is a ${object.state in ('draft', 'sent') and 'request for "
+"quotation' or 'purchase order confirmation'} from ${object.company_id.name}: "
+"</p>\n"
+" \n"
+" <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
+" &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
+" &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
+" &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
+"${object.pricelist_id.currency_id.name}</strong><br />\n"
+" &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
+" % if object.origin:\n"
+" &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
+" % endif\n"
+" % if object.partner_ref:\n"
+" &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
+" % endif\n"
+" % if object.validator:\n"
+" &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.validator.email "
+"or ''}?subject=Order%20${object.name}\">${object.validator.name}</a>\n"
+" % endif\n"
+" </p>\n"
+"\n"
+" <br/>\n"
+" <p>If you have any question, do not hesitate to contact us.</p>\n"
+" <p>Thank you!</p>\n"
+" <br/>\n"
+" <br/>\n"
+" <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
+"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
+"background-repeat: repeat no-repeat;\">\n"
+" <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
+"#DDD;\">\n"
+" <strong style=\"text-"
+"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
+" </div>\n"
+" <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
+"16px; background-color: #F2F2F2;\">\n"
+" <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
+" % if object.company_id.street:\n"
+" ${object.company_id.street}<br/>\n"
+" % endif\n"
+" % if object.company_id.street2:\n"
+" ${object.company_id.street2}<br/>\n"
+" % endif\n"
+" % if object.company_id.city or object.company_id.zip:\n"
+" ${object.company_id.zip} ${object.company_id.city}<br/>\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 ''}<br/>\n"
+" % endif\n"
+" </span>\n"
+" % if object.company_id.phone:\n"
+" <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
+"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
+"0px; padding-left: 0px; \">\n"
+" Phone:&nbsp; ${object.company_id.phone}\n"
+" </div>\n"
+" % endif\n"
+" % if object.company_id.website:\n"
+" <div>\n"
+" Web :&nbsp;<a "
+"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
+" </div>\n"
+" %endif\n"
+" <p></p>\n"
+" </div>\n"
+"</div>\n"
+" "
msgstr ""
#. module: purchase
@@ -1003,17 +1074,12 @@ msgid "Outgoing Mails"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:437
+#: code:addons/purchase/purchase.py:456
#, python-format
msgid "You cannot confirm a purchase order without any purchase order line."
msgstr ""
#. module: purchase
-#: model:ir.actions.server,name:purchase.actions_server_purchase_order_unread
-msgid "Purchase: Mark unread"
-msgstr ""
-
-#. module: purchase
#: help:purchase.order,message_ids:0
msgid "Messages and communication history"
msgstr ""
@@ -1025,7 +1091,7 @@ msgid "Destination Warehouse"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:973
+#: code:addons/purchase/purchase.py:941
#, python-format
msgid ""
"Selected Unit of Measure does not belong to the same category as the product "
@@ -1033,6 +1099,11 @@ msgid ""
msgstr ""
#. module: purchase
+#: view:purchase.order.line_invoice:0
+msgid "Select an Open Sales Order"
+msgstr ""
+
+#. module: purchase
#: model:ir.ui.menu,name:purchase.menu_purchase_unit_measure_purchase
#: model:ir.ui.menu,name:purchase.menu_purchase_uom_form_action
msgid "Units of Measure"
@@ -1044,18 +1115,12 @@ msgid "Manage pricelist per supplier"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:833
-#, python-format
-msgid "Purchase Order has been set to <b>draft</b>."
-msgstr ""
-
-#. module: purchase
#: view:board.board:0
msgid "Purchase Dashboard"
msgstr "Taulell de compres"
#. module: purchase
-#: code:addons/purchase/purchase.py:566
+#: code:addons/purchase/purchase.py:580
#, python-format
msgid "First cancel all receptions related to this purchase order."
msgstr ""
@@ -1094,9 +1159,9 @@ msgid "Unread Messages"
msgstr ""
#. module: purchase
-#: view:purchase.order.line_invoice:0
-msgid "Select an Open Sale Order"
-msgstr "Seleccioneu una comanda de venda oberta"
+#: model:ir.ui.menu,name:purchase.menu_purchase_uom_categ_form_action
+msgid "Unit of Measure Categories"
+msgstr ""
#. module: purchase
#: view:purchase.order:0
@@ -1104,6 +1169,13 @@ msgid "Set to Draft"
msgstr "Canvia a esborrany"
#. module: purchase
+#: help:purchase.order,origin:0
+msgid ""
+"Reference of the document that generated this purchase order request; a "
+"sales order or an internal procurement request."
+msgstr ""
+
+#. module: purchase
#: view:purchase.order.line:0
msgid "Notes"
msgstr "Notes"
@@ -1133,7 +1205,7 @@ msgid "Stock Move"
msgstr "Moviment d'estoc"
#. module: purchase
-#: code:addons/purchase/purchase.py:255
+#: code:addons/purchase/purchase.py:260
#, python-format
msgid "Invalid Action!"
msgstr ""
@@ -1235,7 +1307,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:310
+#: code:addons/purchase/purchase.py:320
#, python-format
msgid "Please create Invoices."
msgstr ""
@@ -1326,7 +1398,7 @@ msgid "Purchase Order Line Make Invoice"
msgstr "Línia comanda de compra realitza factura"
#. module: purchase
-#: code:addons/purchase/purchase.py:1133
+#: code:addons/purchase/purchase.py:1141
#, python-format
msgid "PO: %s"
msgstr ""
@@ -1337,7 +1409,7 @@ msgid "Send by EMail"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:498
+#: code:addons/purchase/purchase.py:515
#, python-format
msgid "Define purchase journal for this company: \"%s\" (id:%d)."
msgstr ""
@@ -1348,9 +1420,9 @@ msgid "Purchase Order "
msgstr ""
#. module: purchase
-#: view:purchase.order.line:0
-msgid "Manual Invoices"
-msgstr "Factures manuals"
+#: help:purchase.config.settings,group_costing_method:0
+msgid "Allows you to compute product cost price based on average cost."
+msgstr ""
#. module: purchase
#: model:ir.actions.act_window,name:purchase.action_purchase_configuration
@@ -1504,8 +1576,8 @@ msgid "Compute product cost price based on average cost"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:340
-#: code:addons/purchase/wizard/purchase_line_invoice.py:141
+#: code:addons/purchase/purchase.py:350
+#: code:addons/purchase/wizard/purchase_line_invoice.py:137
#: model:ir.actions.act_window,name:purchase.act_res_partner_2_supplier_invoices
#: view:res.partner:0
#, python-format
@@ -1617,8 +1689,9 @@ msgid "Open Purchase Menu"
msgstr ""
#. module: purchase
-#: model:ir.model,name:purchase.model_mail_compose_message
-msgid "Email composition wizard"
+#: code:addons/purchase/purchase.py:1028
+#, python-format
+msgid "No address defined for the supplier"
msgstr ""
#. module: purchase
@@ -1691,11 +1764,11 @@ msgid "Purchase Order"
msgstr "Comanda de compra"
#. module: purchase
-#: code:addons/purchase/purchase.py:310
-#: code:addons/purchase/purchase.py:437
-#: code:addons/purchase/purchase.py:497
-#: code:addons/purchase/purchase.py:508
-#: code:addons/purchase/wizard/purchase_line_invoice.py:109
+#: code:addons/purchase/purchase.py:320
+#: code:addons/purchase/purchase.py:456
+#: code:addons/purchase/purchase.py:514
+#: code:addons/purchase/purchase.py:525
+#: code:addons/purchase/wizard/purchase_line_invoice.py:105
#, python-format
msgid "Error!"
msgstr ""
@@ -1717,15 +1790,6 @@ msgid ""
msgstr ""
#. module: purchase
-#: model:process.transition,note:purchase.process_transition_packinginvoice0
-msgid ""
-"A Pick list generates an invoice. Depending on the Invoicing control of the "
-"sale order, the invoice is based on delivered or on ordered quantities."
-msgstr ""
-"Un albarà genera una factura. Segons el control de facturació en la comanda "
-"de venda, la factura es basa en les quantitats enviades o demandades."
-
-#. module: purchase
#: selection:purchase.order,state:0
#: selection:purchase.order.line,state:0
#: selection:purchase.report,state:0
@@ -1738,9 +1802,8 @@ msgid "# of Purchase Order"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:827
-#, python-format
-msgid "Shipment <b>received</b>."
+#: model:ir.model,name:purchase.model_mail_compose_message
+msgid "Email composition wizard"
msgstr ""
#. module: purchase
@@ -1831,7 +1894,7 @@ msgid "RFQ_${(object.name or '').replace('/','_')}"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:988
+#: code:addons/purchase/purchase.py:956
#, python-format
msgid "The selected supplier only sells this product by %s"
msgstr "El proveïdor seleccionat només ven aquest producte per %s"
@@ -1877,6 +1940,12 @@ msgid "Outgoing products to invoice"
msgstr "Productes sortints a facturar"
#. module: purchase
+#: report:purchase.order:0
+#: field:purchase.report,validator:0
+msgid "Validated By"
+msgstr "Validat per"
+
+#. module: purchase
#: view:purchase.report:0
#: field:purchase.report,delay_pass:0
msgid "Days to Deliver"
@@ -1966,9 +2035,9 @@ msgid "November"
msgstr "Novembre"
#. module: purchase
-#: help:purchase.config.settings,group_costing_method:0
-msgid "Allows you to compute product cost price based on average cost."
-msgstr ""
+#: view:purchase.order.line:0
+msgid "Manual Invoices"
+msgstr "Factures manuals"
#. module: purchase
#: report:purchase.order:0
@@ -1991,13 +2060,6 @@ msgid ""
msgstr ""
#. module: purchase
-#: help:purchase.order,origin:0
-msgid ""
-"Reference of the document that generated this purchase order request; a sale "
-"order or an internal procurement request."
-msgstr ""
-
-#. module: purchase
#: model:ir.ui.menu,name:purchase.menu_partner_categories_in_form
msgid "Partner Categories"
msgstr ""
@@ -2018,89 +2080,6 @@ msgid "Invoicing Settings"
msgstr ""
#. module: purchase
-#: model:email.template,body_html:purchase.email_template_edi_purchase
-msgid ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"\n"
-" <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
-"or ''},</p>\n"
-" \n"
-" <p>Here is a ${object.state in ('draft', 'sent') and 'request for "
-"quotation' or 'purchase order confirmation'} from ${object.company_id.name}: "
-"</p>\n"
-" \n"
-" <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
-" &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
-" &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
-" &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
-"${object.pricelist_id.currency_id.name}</strong><br />\n"
-" &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
-" % if object.origin:\n"
-" &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
-" % endif\n"
-" % if object.partner_ref:\n"
-" &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
-" % endif\n"
-" % if object.validator:\n"
-" &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.validator.email "
-"or ''}?subject=Order%20${object.name}\">${object.validator.name}</a>\n"
-" % endif\n"
-" </p>\n"
-"\n"
-" <br/>\n"
-" <p>If you have any question, do not hesitate to contact us.</p>\n"
-" <p>Thank you!</p>\n"
-" <br/>\n"
-" <br/>\n"
-" <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
-"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
-"background-repeat: repeat no-repeat;\">\n"
-" <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
-"#FFF;\">\n"
-" <strong style=\"text-"
-"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
-" </div>\n"
-" <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
-"16px; background-color: #F2F2F2;\">\n"
-" <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
-" % if object.company_id.street:\n"
-" ${object.company_id.street}<br/>\n"
-" % endif\n"
-" % if object.company_id.street2:\n"
-" ${object.company_id.street2}<br/>\n"
-" % endif\n"
-" % if object.company_id.city or object.company_id.zip:\n"
-" ${object.company_id.zip} ${object.company_id.city}<br/>\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 ''}<br/>\n"
-" % endif\n"
-" </span>\n"
-" % if object.company_id.phone:\n"
-" <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
-"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
-"0px; padding-left: 0px; \">\n"
-" Phone:&nbsp; ${object.company_id.phone}\n"
-" </div>\n"
-" % endif\n"
-" % if object.company_id.website:\n"
-" <div>\n"
-" Web :&nbsp;<a "
-"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
-" </div>\n"
-" %endif\n"
-" <p></p>\n"
-" </div>\n"
-"</div>\n"
-" "
-msgstr ""
-
-#. module: purchase
#: model:ir.actions.act_window,name:purchase.action_purchase_order_by_user_all
msgid "Total Orders by User per month"
msgstr "Total comandes per usuari mensual"
@@ -2111,21 +2090,19 @@ msgid "Based on incoming shipments"
msgstr ""
#. module: purchase
+#: code:addons/purchase/purchase.py:1018
+#, python-format
+msgid "No default supplier defined for this product"
+msgstr ""
+
+#. module: purchase
#: view:purchase.report:0
#: field:purchase.report,warehouse_id:0
msgid "Warehouse"
msgstr "Magatzem"
#. module: purchase
-#: help:purchase.order,partner_ref:0
-msgid ""
-"Reference of the sale order or quotation sent by your supplier. It's mainly "
-"used to do the matching when you receive the products as this reference is "
-"usually written on the delivery order sent by your supplier."
-msgstr ""
-
-#. module: purchase
-#: code:addons/purchase/purchase.py:991
+#: code:addons/purchase/purchase.py:960
#, python-format
msgid ""
"The selected supplier has a minimal quantity set to %s %s, you should not "
@@ -2210,8 +2187,8 @@ msgstr ""
" "
#. module: purchase
-#: view:product.product:0
-msgid "When you sell this service to a customer,"
+#: field:purchase.order,message_summary:0
+msgid "Summary"
msgstr ""
#. module: purchase
@@ -2221,6 +2198,11 @@ msgid "Pricelist Versions"
msgstr "Versions de llista de preus"
#. module: purchase
+#: field:purchase.order,payment_term_id:0
+msgid "Payment Term"
+msgstr ""
+
+#. module: purchase
#: view:purchase.order:0
msgid "Purchase orders which are in draft state"
msgstr ""
@@ -2648,6 +2630,16 @@ msgstr "Comandes"
#~ msgid "Current purchases"
#~ msgstr "Compres actuals"
+#~ msgid "Select an Open Sale Order"
+#~ msgstr "Seleccioneu una comanda de venda oberta"
+
+#~ msgid ""
+#~ "A Pick list generates an invoice. Depending on the Invoicing control of the "
+#~ "sale order, the invoice is based on delivered or on ordered quantities."
+#~ msgstr ""
+#~ "Un albarà genera una factura. Segons el control de facturació en la comanda "
+#~ "de venda, la factura es basa en les quantitats enviades o demandades."
+
#, python-format
#~ msgid "Purchase amount over the limit"
#~ msgstr "Import de la compra per sobre del límit"
diff --git a/addons/purchase/i18n/cs.po b/addons/purchase/i18n/cs.po
index 0a7dd310fb2..00e4aac2a12 100644
--- a/addons/purchase/i18n/cs.po
+++ b/addons/purchase/i18n/cs.po
@@ -6,15 +6,15 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
"PO-Revision-Date: 2011-11-07 12:54+0000\n"
"Last-Translator: Jiří Hajda <robie@centrum.cz>\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: 2012-12-04 05:11+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:19+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
"X-Poedit-Language: Czech\n"
#. module: purchase
@@ -61,11 +61,6 @@ msgstr ""
"dodavatele pro vybrané výrobky/množství."
#. module: purchase
-#: model:ir.actions.server,name:purchase.actions_server_purchase_order_read
-msgid "Purchase: Mark read"
-msgstr ""
-
-#. module: purchase
#: view:purchase.report:0
#: field:purchase.report,day:0
msgid "Day"
@@ -106,16 +101,13 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:973
-#: code:addons/purchase/purchase.py:988
-#: code:addons/purchase/purchase.py:991
-#: code:addons/purchase/wizard/purchase_order_group.py:47
+#: code:addons/purchase/purchase.py:1024
#, python-format
-msgid "Warning!"
+msgid "Configuration Error!"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:573
+#: code:addons/purchase/purchase.py:587
#, python-format
msgid "You must first cancel all receptions related to this purchase order."
msgstr ""
@@ -132,10 +124,10 @@ msgid "Purchase-Standard Price"
msgstr "Standardní ceny nákupů"
#. module: purchase
-#: report:purchase.order:0
-#: field:purchase.report,validator:0
-msgid "Validated By"
-msgstr "Zkontrolováno"
+#: code:addons/purchase/purchase.py:1011
+#, python-format
+msgid "No supplier defined for this product !"
+msgstr ""
#. module: purchase
#: model:ir.actions.act_window,help:purchase.action_picking_tree4_picking_to_invoice
@@ -158,12 +150,6 @@ msgid "Average Price"
msgstr "Průměrná cena"
#. module: purchase
-#: code:addons/purchase/purchase.py:830
-#, python-format
-msgid "Invoice <b>paid</b>."
-msgstr ""
-
-#. module: purchase
#: view:purchase.order:0
msgid "Purchase order which are in the exception state"
msgstr ""
@@ -235,7 +221,7 @@ msgstr ""
"prodejní objednávky."
#. module: purchase
-#: code:addons/purchase/purchase.py:255
+#: code:addons/purchase/purchase.py:260
#, python-format
msgid "In order to delete a purchase order, you must cancel it first."
msgstr ""
@@ -261,29 +247,12 @@ msgid "Total Untaxed amount"
msgstr "Celková částka bez daně"
#. module: purchase
-#: model:ir.ui.menu,name:purchase.menu_purchase_uom_categ_form_action
-msgid "Unit of Measure Categories"
-msgstr ""
-
-#. module: purchase
#: view:purchase.report:0
#: field:purchase.report,category_id:0
msgid "Category"
msgstr "Kategorie"
#. module: purchase
-#: view:purchase.order:0
-msgid "Quotation "
-msgstr ""
-
-#. module: purchase
-#: code:addons/purchase/purchase.py:810
-#, python-format
-msgid ""
-"Quotation for <em>%s</em> <b>converted</b> to a Purchase Order of %s %s."
-msgstr ""
-
-#. module: purchase
#: model:process.transition,note:purchase.process_transition_purchaseinvoice0
msgid ""
"A purchase order generates a supplier invoice, as soon as it is confirmed by "
@@ -348,14 +317,16 @@ msgid "October"
msgstr "Říjen"
#. module: purchase
-#: code:addons/purchase/purchase.py:837
+#: code:addons/purchase/purchase.py:1024
#, python-format
-msgid "Purchase Order for <em>%s</em> <b>cancelled</b>."
+msgid ""
+"The product \"%s\" has been defined with your company as reseller which "
+"seems to be a configuration error!"
msgstr ""
#. module: purchase
-#: field:purchase.order,message_summary:0
-msgid "Summary"
+#: view:product.product:0
+msgid "When you sell this service to a customer,"
msgstr ""
#. module: purchase
@@ -384,12 +355,6 @@ msgid "Quantity"
msgstr "Množství"
#. module: purchase
-#: code:addons/purchase/purchase.py:819
-#, python-format
-msgid "Shipment <em>%s</em> <b>scheduled</b> for %s."
-msgstr ""
-
-#. module: purchase
#: field:purchase.order,fiscal_position:0
msgid "Fiscal Position"
msgstr "Finanční pozice"
@@ -447,12 +412,6 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:824
-#, python-format
-msgid "Draft Invoice of %s %s is <b>waiting for validation</b>."
-msgstr ""
-
-#. module: purchase
#: model:ir.actions.act_window,help:purchase.purchase_line_form_action2
msgid ""
"<p>\n"
@@ -473,6 +432,11 @@ msgid "Scheduled Date"
msgstr "Plánovaný datum"
#. module: purchase
+#: field:purchase.order,currency_id:0
+msgid "Currency"
+msgstr ""
+
+#. module: purchase
#: field:purchase.order,journal_id:0
msgid "Journal"
msgstr ""
@@ -505,6 +469,19 @@ msgid "Incoming Products"
msgstr ""
#. module: purchase
+#: view:purchase.order:0
+msgid "Request for Quotation "
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,partner_ref:0
+msgid ""
+"Reference of the sales order or quotation sent by your supplier. It's mainly "
+"used to do the matching when you receive the products as this reference is "
+"usually written on the delivery order sent by your supplier."
+msgstr ""
+
+#. module: purchase
#: view:purchase.config.settings:0
#: view:purchase.order.group:0
#: view:purchase.order.line_invoice:0
@@ -528,6 +505,11 @@ msgstr ""
"fakturace = Ruční)."
#. module: purchase
+#: model:mail.message.subtype,name:purchase.mt_rfq_approved
+msgid "RFQ Approved"
+msgstr ""
+
+#. module: purchase
#: view:purchase.config.settings:0
msgid "Apply"
msgstr ""
@@ -547,6 +529,11 @@ msgstr ""
"potvrzenou nákupní objednávkou."
#. module: purchase
+#: model:mail.message.subtype,name:purchase.mt_rfq_confirmed
+msgid "RFQ Confirmed"
+msgstr ""
+
+#. module: purchase
#: view:purchase.order:0
msgid "Customer Address"
msgstr ""
@@ -571,7 +558,7 @@ msgid "Supplier"
msgstr "Dodavatel"
#. module: purchase
-#: code:addons/purchase/purchase.py:508
+#: code:addons/purchase/purchase.py:525
#, python-format
msgid "Define expense account for this company: \"%s\" (id:%d)."
msgstr ""
@@ -595,7 +582,6 @@ msgstr "Mezivýsledek"
#. module: purchase
#: field:purchase.order,shipped:0
-#: field:purchase.order,shipped_rate:0
msgid "Received"
msgstr "Obdrženo"
@@ -637,13 +623,20 @@ msgid "Invoices and Receptions"
msgstr ""
#. module: purchase
+#: model:process.transition,note:purchase.process_transition_packinginvoice0
+msgid ""
+"A Pick list generates an invoice. Depending on the Invoicing control of the "
+"sales order, the invoice is based on delivered or on ordered quantities."
+msgstr ""
+
+#. module: purchase
#: view:purchase.report:0
#: field:purchase.report,nbr:0
msgid "# of Lines"
msgstr "# z řádek"
#. module: purchase
-#: code:addons/purchase/wizard/purchase_line_invoice.py:110
+#: code:addons/purchase/wizard/purchase_line_invoice.py:106
#, python-format
msgid "Define expense account for this product: \"%s\" (id:%d)."
msgstr ""
@@ -664,8 +657,8 @@ msgid "It indicates that a picking has been done"
msgstr "Indikuje, že navádění bylo dokončeno"
#. module: purchase
-#: code:addons/purchase/purchase.py:565
-#: code:addons/purchase/purchase.py:572
+#: code:addons/purchase/purchase.py:579
+#: code:addons/purchase/purchase.py:586
#, python-format
msgid "Unable to cancel this purchase order."
msgstr ""
@@ -730,6 +723,15 @@ msgid "Draft PO"
msgstr ""
#. module: purchase
+#: code:addons/purchase/purchase.py:941
+#: code:addons/purchase/purchase.py:956
+#: code:addons/purchase/purchase.py:960
+#: code:addons/purchase/wizard/purchase_order_group.py:47
+#, python-format
+msgid "Warning!"
+msgstr ""
+
+#. module: purchase
#: model:process.node,name:purchase.process_node_draftpurchaseorder0
#: model:process.node,name:purchase.process_node_draftpurchaseorder1
msgid "RFQ"
@@ -761,6 +763,11 @@ msgid "The tax amount"
msgstr "Částka daně"
#. module: purchase
+#: field:purchase.order,shipped_rate:0
+msgid "Received Ratio"
+msgstr ""
+
+#. module: purchase
#: selection:purchase.report,month:0
msgid "September"
msgstr "Září"
@@ -792,7 +799,7 @@ msgid "Stock Moves"
msgstr "Skladové pohyby"
#. module: purchase
-#: code:addons/purchase/purchase.py:1158
+#: code:addons/purchase/purchase.py:1156
#, python-format
msgid "Draft Purchase Order created"
msgstr ""
@@ -813,11 +820,6 @@ msgid "Terms and Conditions"
msgstr ""
#. module: purchase
-#: field:purchase.order,currency_id:0
-msgid "unknown"
-msgstr ""
-
-#. module: purchase
#: help:purchase.order,date_order:0
msgid "Date on which this document has been created."
msgstr "Datum vytvoření dokumentu"
@@ -911,12 +913,6 @@ msgid "Cancel"
msgstr "Zrušit"
#. module: purchase
-#: field:purchase.order,message_comment_ids:0
-#: help:purchase.order,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
-#. module: purchase
#: sql_constraint:purchase.order:0
msgid "Order Reference must be unique per Company!"
msgstr ""
@@ -950,14 +946,89 @@ msgid "Date Approved"
msgstr "Datum schválení"
#. module: purchase
-#: code:addons/purchase/purchase.py:806
-#, python-format
-msgid "Request for quotation <b>created</b>."
+#: view:product.product:0
+msgid "a draft purchase order"
msgstr ""
#. module: purchase
-#: view:product.product:0
-msgid "a draft purchase order"
+#: model:email.template,body_html:purchase.email_template_edi_purchase
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: #FFF; \">\n"
+"\n"
+" <p>Hello$ ${object.partner_id.name},</p>\n"
+" \n"
+" <p>Here is a ${object.state in ('draft', 'sent') and 'request for "
+"quotation' or 'purchase order confirmation'} from ${object.company_id.name}: "
+"</p>\n"
+" \n"
+" <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
+" &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
+" &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
+" &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
+"${object.pricelist_id.currency_id.name}</strong><br />\n"
+" &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
+" % if object.origin:\n"
+" &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
+" % endif\n"
+" % if object.partner_ref:\n"
+" &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
+" % endif\n"
+" % if object.validator:\n"
+" &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.validator.email "
+"or ''}?subject=Order%20${object.name}\">${object.validator.name}</a>\n"
+" % endif\n"
+" </p>\n"
+"\n"
+" <br/>\n"
+" <p>If you have any question, do not hesitate to contact us.</p>\n"
+" <p>Thank you!</p>\n"
+" <br/>\n"
+" <br/>\n"
+" <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
+"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
+"background-repeat: repeat no-repeat;\">\n"
+" <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
+"#DDD;\">\n"
+" <strong style=\"text-"
+"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
+" </div>\n"
+" <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
+"16px; background-color: #F2F2F2;\">\n"
+" <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
+" % if object.company_id.street:\n"
+" ${object.company_id.street}<br/>\n"
+" % endif\n"
+" % if object.company_id.street2:\n"
+" ${object.company_id.street2}<br/>\n"
+" % endif\n"
+" % if object.company_id.city or object.company_id.zip:\n"
+" ${object.company_id.zip} ${object.company_id.city}<br/>\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 ''}<br/>\n"
+" % endif\n"
+" </span>\n"
+" % if object.company_id.phone:\n"
+" <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
+"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
+"0px; padding-left: 0px; \">\n"
+" Phone:&nbsp; ${object.company_id.phone}\n"
+" </div>\n"
+" % endif\n"
+" % if object.company_id.website:\n"
+" <div>\n"
+" Web :&nbsp;<a "
+"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
+" </div>\n"
+" %endif\n"
+" <p></p>\n"
+" </div>\n"
+"</div>\n"
+" "
msgstr ""
#. module: purchase
@@ -999,17 +1070,12 @@ msgid "Outgoing Mails"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:437
+#: code:addons/purchase/purchase.py:456
#, python-format
msgid "You cannot confirm a purchase order without any purchase order line."
msgstr ""
#. module: purchase
-#: model:ir.actions.server,name:purchase.actions_server_purchase_order_unread
-msgid "Purchase: Mark unread"
-msgstr ""
-
-#. module: purchase
#: help:purchase.order,message_ids:0
msgid "Messages and communication history"
msgstr ""
@@ -1021,7 +1087,7 @@ msgid "Destination Warehouse"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:973
+#: code:addons/purchase/purchase.py:941
#, python-format
msgid ""
"Selected Unit of Measure does not belong to the same category as the product "
@@ -1029,6 +1095,11 @@ msgid ""
msgstr ""
#. module: purchase
+#: view:purchase.order.line_invoice:0
+msgid "Select an Open Sales Order"
+msgstr ""
+
+#. module: purchase
#: model:ir.ui.menu,name:purchase.menu_purchase_unit_measure_purchase
#: model:ir.ui.menu,name:purchase.menu_purchase_uom_form_action
msgid "Units of Measure"
@@ -1040,18 +1111,12 @@ msgid "Manage pricelist per supplier"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:833
-#, python-format
-msgid "Purchase Order has been set to <b>draft</b>."
-msgstr ""
-
-#. module: purchase
#: view:board.board:0
msgid "Purchase Dashboard"
msgstr "Nástěnka nákupu"
#. module: purchase
-#: code:addons/purchase/purchase.py:566
+#: code:addons/purchase/purchase.py:580
#, python-format
msgid "First cancel all receptions related to this purchase order."
msgstr ""
@@ -1090,9 +1155,9 @@ msgid "Unread Messages"
msgstr ""
#. module: purchase
-#: view:purchase.order.line_invoice:0
-msgid "Select an Open Sale Order"
-msgstr "VYberte otevřenou prodejní objednávku"
+#: model:ir.ui.menu,name:purchase.menu_purchase_uom_categ_form_action
+msgid "Unit of Measure Categories"
+msgstr ""
#. module: purchase
#: view:purchase.order:0
@@ -1100,6 +1165,13 @@ msgid "Set to Draft"
msgstr "Nastavit na koncept"
#. module: purchase
+#: help:purchase.order,origin:0
+msgid ""
+"Reference of the document that generated this purchase order request; a "
+"sales order or an internal procurement request."
+msgstr ""
+
+#. module: purchase
#: view:purchase.order.line:0
msgid "Notes"
msgstr "Poznámky"
@@ -1129,7 +1201,7 @@ msgid "Stock Move"
msgstr "Přesun zásob"
#. module: purchase
-#: code:addons/purchase/purchase.py:255
+#: code:addons/purchase/purchase.py:260
#, python-format
msgid "Invalid Action!"
msgstr ""
@@ -1228,7 +1300,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:310
+#: code:addons/purchase/purchase.py:320
#, python-format
msgid "Please create Invoices."
msgstr ""
@@ -1318,7 +1390,7 @@ msgid "Purchase Order Line Make Invoice"
msgstr "Řádek nákupní objednávky vytváří fakturu"
#. module: purchase
-#: code:addons/purchase/purchase.py:1133
+#: code:addons/purchase/purchase.py:1141
#, python-format
msgid "PO: %s"
msgstr ""
@@ -1329,7 +1401,7 @@ msgid "Send by EMail"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:498
+#: code:addons/purchase/purchase.py:515
#, python-format
msgid "Define purchase journal for this company: \"%s\" (id:%d)."
msgstr ""
@@ -1340,9 +1412,9 @@ msgid "Purchase Order "
msgstr ""
#. module: purchase
-#: view:purchase.order.line:0
-msgid "Manual Invoices"
-msgstr "Ruční faktury"
+#: help:purchase.config.settings,group_costing_method:0
+msgid "Allows you to compute product cost price based on average cost."
+msgstr ""
#. module: purchase
#: model:ir.actions.act_window,name:purchase.action_purchase_configuration
@@ -1496,8 +1568,8 @@ msgid "Compute product cost price based on average cost"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:340
-#: code:addons/purchase/wizard/purchase_line_invoice.py:141
+#: code:addons/purchase/purchase.py:350
+#: code:addons/purchase/wizard/purchase_line_invoice.py:137
#: model:ir.actions.act_window,name:purchase.act_res_partner_2_supplier_invoices
#: view:res.partner:0
#, python-format
@@ -1609,8 +1681,9 @@ msgid "Open Purchase Menu"
msgstr ""
#. module: purchase
-#: model:ir.model,name:purchase.model_mail_compose_message
-msgid "Email composition wizard"
+#: code:addons/purchase/purchase.py:1028
+#, python-format
+msgid "No address defined for the supplier"
msgstr ""
#. module: purchase
@@ -1682,11 +1755,11 @@ msgid "Purchase Order"
msgstr "Nákupní příkaz"
#. module: purchase
-#: code:addons/purchase/purchase.py:310
-#: code:addons/purchase/purchase.py:437
-#: code:addons/purchase/purchase.py:497
-#: code:addons/purchase/purchase.py:508
-#: code:addons/purchase/wizard/purchase_line_invoice.py:109
+#: code:addons/purchase/purchase.py:320
+#: code:addons/purchase/purchase.py:456
+#: code:addons/purchase/purchase.py:514
+#: code:addons/purchase/purchase.py:525
+#: code:addons/purchase/wizard/purchase_line_invoice.py:105
#, python-format
msgid "Error!"
msgstr ""
@@ -1708,13 +1781,6 @@ msgid ""
msgstr ""
#. module: purchase
-#: model:process.transition,note:purchase.process_transition_packinginvoice0
-msgid ""
-"A Pick list generates an invoice. Depending on the Invoicing control of the "
-"sale order, the invoice is based on delivered or on ordered quantities."
-msgstr ""
-
-#. module: purchase
#: selection:purchase.order,state:0
#: selection:purchase.order.line,state:0
#: selection:purchase.report,state:0
@@ -1727,9 +1793,8 @@ msgid "# of Purchase Order"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:827
-#, python-format
-msgid "Shipment <b>received</b>."
+#: model:ir.model,name:purchase.model_mail_compose_message
+msgid "Email composition wizard"
msgstr ""
#. module: purchase
@@ -1816,7 +1881,7 @@ msgid "RFQ_${(object.name or '').replace('/','_')}"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:988
+#: code:addons/purchase/purchase.py:956
#, python-format
msgid "The selected supplier only sells this product by %s"
msgstr "Vybraný dodavatel prodává pouze tento výrobek po %s"
@@ -1862,6 +1927,12 @@ msgid "Outgoing products to invoice"
msgstr "Odchozí výrobky k fakturaci"
#. module: purchase
+#: report:purchase.order:0
+#: field:purchase.report,validator:0
+msgid "Validated By"
+msgstr "Zkontrolováno"
+
+#. module: purchase
#: view:purchase.report:0
#: field:purchase.report,delay_pass:0
msgid "Days to Deliver"
@@ -1951,9 +2022,9 @@ msgid "November"
msgstr "Listopad"
#. module: purchase
-#: help:purchase.config.settings,group_costing_method:0
-msgid "Allows you to compute product cost price based on average cost."
-msgstr ""
+#: view:purchase.order.line:0
+msgid "Manual Invoices"
+msgstr "Ruční faktury"
#. module: purchase
#: report:purchase.order:0
@@ -1976,13 +2047,6 @@ msgid ""
msgstr ""
#. module: purchase
-#: help:purchase.order,origin:0
-msgid ""
-"Reference of the document that generated this purchase order request; a sale "
-"order or an internal procurement request."
-msgstr ""
-
-#. module: purchase
#: model:ir.ui.menu,name:purchase.menu_partner_categories_in_form
msgid "Partner Categories"
msgstr ""
@@ -2003,89 +2067,6 @@ msgid "Invoicing Settings"
msgstr ""
#. module: purchase
-#: model:email.template,body_html:purchase.email_template_edi_purchase
-msgid ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"\n"
-" <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
-"or ''},</p>\n"
-" \n"
-" <p>Here is a ${object.state in ('draft', 'sent') and 'request for "
-"quotation' or 'purchase order confirmation'} from ${object.company_id.name}: "
-"</p>\n"
-" \n"
-" <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
-" &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
-" &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
-" &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
-"${object.pricelist_id.currency_id.name}</strong><br />\n"
-" &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
-" % if object.origin:\n"
-" &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
-" % endif\n"
-" % if object.partner_ref:\n"
-" &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
-" % endif\n"
-" % if object.validator:\n"
-" &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.validator.email "
-"or ''}?subject=Order%20${object.name}\">${object.validator.name}</a>\n"
-" % endif\n"
-" </p>\n"
-"\n"
-" <br/>\n"
-" <p>If you have any question, do not hesitate to contact us.</p>\n"
-" <p>Thank you!</p>\n"
-" <br/>\n"
-" <br/>\n"
-" <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
-"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
-"background-repeat: repeat no-repeat;\">\n"
-" <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
-"#FFF;\">\n"
-" <strong style=\"text-"
-"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
-" </div>\n"
-" <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
-"16px; background-color: #F2F2F2;\">\n"
-" <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
-" % if object.company_id.street:\n"
-" ${object.company_id.street}<br/>\n"
-" % endif\n"
-" % if object.company_id.street2:\n"
-" ${object.company_id.street2}<br/>\n"
-" % endif\n"
-" % if object.company_id.city or object.company_id.zip:\n"
-" ${object.company_id.zip} ${object.company_id.city}<br/>\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 ''}<br/>\n"
-" % endif\n"
-" </span>\n"
-" % if object.company_id.phone:\n"
-" <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
-"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
-"0px; padding-left: 0px; \">\n"
-" Phone:&nbsp; ${object.company_id.phone}\n"
-" </div>\n"
-" % endif\n"
-" % if object.company_id.website:\n"
-" <div>\n"
-" Web :&nbsp;<a "
-"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
-" </div>\n"
-" %endif\n"
-" <p></p>\n"
-" </div>\n"
-"</div>\n"
-" "
-msgstr ""
-
-#. module: purchase
#: model:ir.actions.act_window,name:purchase.action_purchase_order_by_user_all
msgid "Total Orders by User per month"
msgstr "Celkem objednávek podle uživatele podle měsíce"
@@ -2096,21 +2077,19 @@ msgid "Based on incoming shipments"
msgstr ""
#. module: purchase
+#: code:addons/purchase/purchase.py:1018
+#, python-format
+msgid "No default supplier defined for this product"
+msgstr ""
+
+#. module: purchase
#: view:purchase.report:0
#: field:purchase.report,warehouse_id:0
msgid "Warehouse"
msgstr "Sklad"
#. module: purchase
-#: help:purchase.order,partner_ref:0
-msgid ""
-"Reference of the sale order or quotation sent by your supplier. It's mainly "
-"used to do the matching when you receive the products as this reference is "
-"usually written on the delivery order sent by your supplier."
-msgstr ""
-
-#. module: purchase
-#: code:addons/purchase/purchase.py:991
+#: code:addons/purchase/purchase.py:960
#, python-format
msgid ""
"The selected supplier has a minimal quantity set to %s %s, you should not "
@@ -2183,8 +2162,8 @@ msgid ""
msgstr ""
#. module: purchase
-#: view:product.product:0
-msgid "When you sell this service to a customer,"
+#: field:purchase.order,message_summary:0
+msgid "Summary"
msgstr ""
#. module: purchase
@@ -2194,6 +2173,11 @@ msgid "Pricelist Versions"
msgstr "Verze ceníku"
#. module: purchase
+#: field:purchase.order,payment_term_id:0
+msgid "Payment Term"
+msgstr ""
+
+#. module: purchase
#: view:purchase.order:0
msgid "Purchase orders which are in draft state"
msgstr ""
@@ -2269,6 +2253,9 @@ msgstr "Objednávky"
#~ msgid "No Pricelist !"
#~ msgstr "Žádný ceník !"
+#~ msgid "Select an Open Sale Order"
+#~ msgstr "VYberte otevřenou prodejní objednávku"
+
#~ msgid "Current purchases"
#~ msgstr "Aktuální nákupy"
diff --git a/addons/purchase/i18n/da.po b/addons/purchase/i18n/da.po
index 75c16de1fa0..31b5c1249bb 100644
--- a/addons/purchase/i18n/da.po
+++ b/addons/purchase/i18n/da.po
@@ -7,15 +7,15 @@ msgid ""
msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
"PO-Revision-Date: 2011-11-08 22:35+0000\n"
"Last-Translator: OpenERP Danmark / Henning Dinsen <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: 2012-12-04 05:11+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:19+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
#. module: purchase
#: model:res.groups,name:purchase.group_analytic_accounting
@@ -59,11 +59,6 @@ msgid ""
msgstr ""
#. module: purchase
-#: model:ir.actions.server,name:purchase.actions_server_purchase_order_read
-msgid "Purchase: Mark read"
-msgstr ""
-
-#. module: purchase
#: view:purchase.report:0
#: field:purchase.report,day:0
msgid "Day"
@@ -104,16 +99,13 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:973
-#: code:addons/purchase/purchase.py:988
-#: code:addons/purchase/purchase.py:991
-#: code:addons/purchase/wizard/purchase_order_group.py:47
+#: code:addons/purchase/purchase.py:1024
#, python-format
-msgid "Warning!"
+msgid "Configuration Error!"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:573
+#: code:addons/purchase/purchase.py:587
#, python-format
msgid "You must first cancel all receptions related to this purchase order."
msgstr ""
@@ -130,9 +122,9 @@ msgid "Purchase-Standard Price"
msgstr ""
#. module: purchase
-#: report:purchase.order:0
-#: field:purchase.report,validator:0
-msgid "Validated By"
+#: code:addons/purchase/purchase.py:1011
+#, python-format
+msgid "No supplier defined for this product !"
msgstr ""
#. module: purchase
@@ -156,12 +148,6 @@ msgid "Average Price"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:830
-#, python-format
-msgid "Invoice <b>paid</b>."
-msgstr ""
-
-#. module: purchase
#: view:purchase.order:0
msgid "Purchase order which are in the exception state"
msgstr ""
@@ -231,7 +217,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:255
+#: code:addons/purchase/purchase.py:260
#, python-format
msgid "In order to delete a purchase order, you must cancel it first."
msgstr ""
@@ -257,29 +243,12 @@ msgid "Total Untaxed amount"
msgstr ""
#. module: purchase
-#: model:ir.ui.menu,name:purchase.menu_purchase_uom_categ_form_action
-msgid "Unit of Measure Categories"
-msgstr ""
-
-#. module: purchase
#: view:purchase.report:0
#: field:purchase.report,category_id:0
msgid "Category"
msgstr "Kategori"
#. module: purchase
-#: view:purchase.order:0
-msgid "Quotation "
-msgstr ""
-
-#. module: purchase
-#: code:addons/purchase/purchase.py:810
-#, python-format
-msgid ""
-"Quotation for <em>%s</em> <b>converted</b> to a Purchase Order of %s %s."
-msgstr ""
-
-#. module: purchase
#: model:process.transition,note:purchase.process_transition_purchaseinvoice0
msgid ""
"A purchase order generates a supplier invoice, as soon as it is confirmed by "
@@ -344,14 +313,16 @@ msgid "October"
msgstr "Oktober"
#. module: purchase
-#: code:addons/purchase/purchase.py:837
+#: code:addons/purchase/purchase.py:1024
#, python-format
-msgid "Purchase Order for <em>%s</em> <b>cancelled</b>."
+msgid ""
+"The product \"%s\" has been defined with your company as reseller which "
+"seems to be a configuration error!"
msgstr ""
#. module: purchase
-#: field:purchase.order,message_summary:0
-msgid "Summary"
+#: view:product.product:0
+msgid "When you sell this service to a customer,"
msgstr ""
#. module: purchase
@@ -380,12 +351,6 @@ msgid "Quantity"
msgstr "Antal"
#. module: purchase
-#: code:addons/purchase/purchase.py:819
-#, python-format
-msgid "Shipment <em>%s</em> <b>scheduled</b> for %s."
-msgstr ""
-
-#. module: purchase
#: field:purchase.order,fiscal_position:0
msgid "Fiscal Position"
msgstr ""
@@ -443,12 +408,6 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:824
-#, python-format
-msgid "Draft Invoice of %s %s is <b>waiting for validation</b>."
-msgstr ""
-
-#. module: purchase
#: model:ir.actions.act_window,help:purchase.purchase_line_form_action2
msgid ""
"<p>\n"
@@ -469,6 +428,11 @@ msgid "Scheduled Date"
msgstr ""
#. module: purchase
+#: field:purchase.order,currency_id:0
+msgid "Currency"
+msgstr ""
+
+#. module: purchase
#: field:purchase.order,journal_id:0
msgid "Journal"
msgstr ""
@@ -501,6 +465,19 @@ msgid "Incoming Products"
msgstr ""
#. module: purchase
+#: view:purchase.order:0
+msgid "Request for Quotation "
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,partner_ref:0
+msgid ""
+"Reference of the sales order or quotation sent by your supplier. It's mainly "
+"used to do the matching when you receive the products as this reference is "
+"usually written on the delivery order sent by your supplier."
+msgstr ""
+
+#. module: purchase
#: view:purchase.config.settings:0
#: view:purchase.order.group:0
#: view:purchase.order.line_invoice:0
@@ -521,6 +498,11 @@ msgid ""
msgstr ""
#. module: purchase
+#: model:mail.message.subtype,name:purchase.mt_rfq_approved
+msgid "RFQ Approved"
+msgstr ""
+
+#. module: purchase
#: view:purchase.config.settings:0
msgid "Apply"
msgstr ""
@@ -538,6 +520,11 @@ msgid ""
msgstr ""
#. module: purchase
+#: model:mail.message.subtype,name:purchase.mt_rfq_confirmed
+msgid "RFQ Confirmed"
+msgstr ""
+
+#. module: purchase
#: view:purchase.order:0
msgid "Customer Address"
msgstr ""
@@ -562,7 +549,7 @@ msgid "Supplier"
msgstr "Leverandør"
#. module: purchase
-#: code:addons/purchase/purchase.py:508
+#: code:addons/purchase/purchase.py:525
#, python-format
msgid "Define expense account for this company: \"%s\" (id:%d)."
msgstr ""
@@ -586,7 +573,6 @@ msgstr "Subtotal"
#. module: purchase
#: field:purchase.order,shipped:0
-#: field:purchase.order,shipped_rate:0
msgid "Received"
msgstr "Modtaget"
@@ -628,13 +614,20 @@ msgid "Invoices and Receptions"
msgstr ""
#. module: purchase
+#: model:process.transition,note:purchase.process_transition_packinginvoice0
+msgid ""
+"A Pick list generates an invoice. Depending on the Invoicing control of the "
+"sales order, the invoice is based on delivered or on ordered quantities."
+msgstr ""
+
+#. module: purchase
#: view:purchase.report:0
#: field:purchase.report,nbr:0
msgid "# of Lines"
msgstr ""
#. module: purchase
-#: code:addons/purchase/wizard/purchase_line_invoice.py:110
+#: code:addons/purchase/wizard/purchase_line_invoice.py:106
#, python-format
msgid "Define expense account for this product: \"%s\" (id:%d)."
msgstr ""
@@ -655,8 +648,8 @@ msgid "It indicates that a picking has been done"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:565
-#: code:addons/purchase/purchase.py:572
+#: code:addons/purchase/purchase.py:579
+#: code:addons/purchase/purchase.py:586
#, python-format
msgid "Unable to cancel this purchase order."
msgstr ""
@@ -719,6 +712,15 @@ msgid "Draft PO"
msgstr ""
#. module: purchase
+#: code:addons/purchase/purchase.py:941
+#: code:addons/purchase/purchase.py:956
+#: code:addons/purchase/purchase.py:960
+#: code:addons/purchase/wizard/purchase_order_group.py:47
+#, python-format
+msgid "Warning!"
+msgstr ""
+
+#. module: purchase
#: model:process.node,name:purchase.process_node_draftpurchaseorder0
#: model:process.node,name:purchase.process_node_draftpurchaseorder1
msgid "RFQ"
@@ -750,6 +752,11 @@ msgid "The tax amount"
msgstr ""
#. module: purchase
+#: field:purchase.order,shipped_rate:0
+msgid "Received Ratio"
+msgstr ""
+
+#. module: purchase
#: selection:purchase.report,month:0
msgid "September"
msgstr "September"
@@ -781,7 +788,7 @@ msgid "Stock Moves"
msgstr "Lagerflytning"
#. module: purchase
-#: code:addons/purchase/purchase.py:1158
+#: code:addons/purchase/purchase.py:1156
#, python-format
msgid "Draft Purchase Order created"
msgstr ""
@@ -802,11 +809,6 @@ msgid "Terms and Conditions"
msgstr ""
#. module: purchase
-#: field:purchase.order,currency_id:0
-msgid "unknown"
-msgstr ""
-
-#. module: purchase
#: help:purchase.order,date_order:0
msgid "Date on which this document has been created."
msgstr ""
@@ -900,12 +902,6 @@ msgid "Cancel"
msgstr ""
#. module: purchase
-#: field:purchase.order,message_comment_ids:0
-#: help:purchase.order,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
-#. module: purchase
#: sql_constraint:purchase.order:0
msgid "Order Reference must be unique per Company!"
msgstr ""
@@ -939,14 +935,89 @@ msgid "Date Approved"
msgstr "Godkendelsesdato"
#. module: purchase
-#: code:addons/purchase/purchase.py:806
-#, python-format
-msgid "Request for quotation <b>created</b>."
+#: view:product.product:0
+msgid "a draft purchase order"
msgstr ""
#. module: purchase
-#: view:product.product:0
-msgid "a draft purchase order"
+#: model:email.template,body_html:purchase.email_template_edi_purchase
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: #FFF; \">\n"
+"\n"
+" <p>Hello$ ${object.partner_id.name},</p>\n"
+" \n"
+" <p>Here is a ${object.state in ('draft', 'sent') and 'request for "
+"quotation' or 'purchase order confirmation'} from ${object.company_id.name}: "
+"</p>\n"
+" \n"
+" <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
+" &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
+" &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
+" &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
+"${object.pricelist_id.currency_id.name}</strong><br />\n"
+" &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
+" % if object.origin:\n"
+" &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
+" % endif\n"
+" % if object.partner_ref:\n"
+" &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
+" % endif\n"
+" % if object.validator:\n"
+" &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.validator.email "
+"or ''}?subject=Order%20${object.name}\">${object.validator.name}</a>\n"
+" % endif\n"
+" </p>\n"
+"\n"
+" <br/>\n"
+" <p>If you have any question, do not hesitate to contact us.</p>\n"
+" <p>Thank you!</p>\n"
+" <br/>\n"
+" <br/>\n"
+" <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
+"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
+"background-repeat: repeat no-repeat;\">\n"
+" <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
+"#DDD;\">\n"
+" <strong style=\"text-"
+"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
+" </div>\n"
+" <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
+"16px; background-color: #F2F2F2;\">\n"
+" <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
+" % if object.company_id.street:\n"
+" ${object.company_id.street}<br/>\n"
+" % endif\n"
+" % if object.company_id.street2:\n"
+" ${object.company_id.street2}<br/>\n"
+" % endif\n"
+" % if object.company_id.city or object.company_id.zip:\n"
+" ${object.company_id.zip} ${object.company_id.city}<br/>\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 ''}<br/>\n"
+" % endif\n"
+" </span>\n"
+" % if object.company_id.phone:\n"
+" <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
+"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
+"0px; padding-left: 0px; \">\n"
+" Phone:&nbsp; ${object.company_id.phone}\n"
+" </div>\n"
+" % endif\n"
+" % if object.company_id.website:\n"
+" <div>\n"
+" Web :&nbsp;<a "
+"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
+" </div>\n"
+" %endif\n"
+" <p></p>\n"
+" </div>\n"
+"</div>\n"
+" "
msgstr ""
#. module: purchase
@@ -986,17 +1057,12 @@ msgid "Outgoing Mails"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:437
+#: code:addons/purchase/purchase.py:456
#, python-format
msgid "You cannot confirm a purchase order without any purchase order line."
msgstr ""
#. module: purchase
-#: model:ir.actions.server,name:purchase.actions_server_purchase_order_unread
-msgid "Purchase: Mark unread"
-msgstr ""
-
-#. module: purchase
#: help:purchase.order,message_ids:0
msgid "Messages and communication history"
msgstr ""
@@ -1008,7 +1074,7 @@ msgid "Destination Warehouse"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:973
+#: code:addons/purchase/purchase.py:941
#, python-format
msgid ""
"Selected Unit of Measure does not belong to the same category as the product "
@@ -1016,6 +1082,11 @@ msgid ""
msgstr ""
#. module: purchase
+#: view:purchase.order.line_invoice:0
+msgid "Select an Open Sales Order"
+msgstr ""
+
+#. module: purchase
#: model:ir.ui.menu,name:purchase.menu_purchase_unit_measure_purchase
#: model:ir.ui.menu,name:purchase.menu_purchase_uom_form_action
msgid "Units of Measure"
@@ -1027,18 +1098,12 @@ msgid "Manage pricelist per supplier"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:833
-#, python-format
-msgid "Purchase Order has been set to <b>draft</b>."
-msgstr ""
-
-#. module: purchase
#: view:board.board:0
msgid "Purchase Dashboard"
msgstr "Indkøb oversigt"
#. module: purchase
-#: code:addons/purchase/purchase.py:566
+#: code:addons/purchase/purchase.py:580
#, python-format
msgid "First cancel all receptions related to this purchase order."
msgstr ""
@@ -1077,8 +1142,8 @@ msgid "Unread Messages"
msgstr ""
#. module: purchase
-#: view:purchase.order.line_invoice:0
-msgid "Select an Open Sale Order"
+#: model:ir.ui.menu,name:purchase.menu_purchase_uom_categ_form_action
+msgid "Unit of Measure Categories"
msgstr ""
#. module: purchase
@@ -1087,6 +1152,13 @@ msgid "Set to Draft"
msgstr ""
#. module: purchase
+#: help:purchase.order,origin:0
+msgid ""
+"Reference of the document that generated this purchase order request; a "
+"sales order or an internal procurement request."
+msgstr ""
+
+#. module: purchase
#: view:purchase.order.line:0
msgid "Notes"
msgstr "Noter"
@@ -1116,7 +1188,7 @@ msgid "Stock Move"
msgstr "Lager flytning"
#. module: purchase
-#: code:addons/purchase/purchase.py:255
+#: code:addons/purchase/purchase.py:260
#, python-format
msgid "Invalid Action!"
msgstr ""
@@ -1215,7 +1287,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:310
+#: code:addons/purchase/purchase.py:320
#, python-format
msgid "Please create Invoices."
msgstr ""
@@ -1305,7 +1377,7 @@ msgid "Purchase Order Line Make Invoice"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1133
+#: code:addons/purchase/purchase.py:1141
#, python-format
msgid "PO: %s"
msgstr ""
@@ -1316,7 +1388,7 @@ msgid "Send by EMail"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:498
+#: code:addons/purchase/purchase.py:515
#, python-format
msgid "Define purchase journal for this company: \"%s\" (id:%d)."
msgstr ""
@@ -1327,8 +1399,8 @@ msgid "Purchase Order "
msgstr ""
#. module: purchase
-#: view:purchase.order.line:0
-msgid "Manual Invoices"
+#: help:purchase.config.settings,group_costing_method:0
+msgid "Allows you to compute product cost price based on average cost."
msgstr ""
#. module: purchase
@@ -1483,8 +1555,8 @@ msgid "Compute product cost price based on average cost"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:340
-#: code:addons/purchase/wizard/purchase_line_invoice.py:141
+#: code:addons/purchase/purchase.py:350
+#: code:addons/purchase/wizard/purchase_line_invoice.py:137
#: model:ir.actions.act_window,name:purchase.act_res_partner_2_supplier_invoices
#: view:res.partner:0
#, python-format
@@ -1596,8 +1668,9 @@ msgid "Open Purchase Menu"
msgstr ""
#. module: purchase
-#: model:ir.model,name:purchase.model_mail_compose_message
-msgid "Email composition wizard"
+#: code:addons/purchase/purchase.py:1028
+#, python-format
+msgid "No address defined for the supplier"
msgstr ""
#. module: purchase
@@ -1668,11 +1741,11 @@ msgid "Purchase Order"
msgstr "Indkøbsordre"
#. module: purchase
-#: code:addons/purchase/purchase.py:310
-#: code:addons/purchase/purchase.py:437
-#: code:addons/purchase/purchase.py:497
-#: code:addons/purchase/purchase.py:508
-#: code:addons/purchase/wizard/purchase_line_invoice.py:109
+#: code:addons/purchase/purchase.py:320
+#: code:addons/purchase/purchase.py:456
+#: code:addons/purchase/purchase.py:514
+#: code:addons/purchase/purchase.py:525
+#: code:addons/purchase/wizard/purchase_line_invoice.py:105
#, python-format
msgid "Error!"
msgstr ""
@@ -1694,13 +1767,6 @@ msgid ""
msgstr ""
#. module: purchase
-#: model:process.transition,note:purchase.process_transition_packinginvoice0
-msgid ""
-"A Pick list generates an invoice. Depending on the Invoicing control of the "
-"sale order, the invoice is based on delivered or on ordered quantities."
-msgstr ""
-
-#. module: purchase
#: selection:purchase.order,state:0
#: selection:purchase.order.line,state:0
#: selection:purchase.report,state:0
@@ -1713,9 +1779,8 @@ msgid "# of Purchase Order"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:827
-#, python-format
-msgid "Shipment <b>received</b>."
+#: model:ir.model,name:purchase.model_mail_compose_message
+msgid "Email composition wizard"
msgstr ""
#. module: purchase
@@ -1799,7 +1864,7 @@ msgid "RFQ_${(object.name or '').replace('/','_')}"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:988
+#: code:addons/purchase/purchase.py:956
#, python-format
msgid "The selected supplier only sells this product by %s"
msgstr ""
@@ -1845,6 +1910,12 @@ msgid "Outgoing products to invoice"
msgstr ""
#. module: purchase
+#: report:purchase.order:0
+#: field:purchase.report,validator:0
+msgid "Validated By"
+msgstr ""
+
+#. module: purchase
#: view:purchase.report:0
#: field:purchase.report,delay_pass:0
msgid "Days to Deliver"
@@ -1934,8 +2005,8 @@ msgid "November"
msgstr "November"
#. module: purchase
-#: help:purchase.config.settings,group_costing_method:0
-msgid "Allows you to compute product cost price based on average cost."
+#: view:purchase.order.line:0
+msgid "Manual Invoices"
msgstr ""
#. module: purchase
@@ -1959,13 +2030,6 @@ msgid ""
msgstr ""
#. module: purchase
-#: help:purchase.order,origin:0
-msgid ""
-"Reference of the document that generated this purchase order request; a sale "
-"order or an internal procurement request."
-msgstr ""
-
-#. module: purchase
#: model:ir.ui.menu,name:purchase.menu_partner_categories_in_form
msgid "Partner Categories"
msgstr ""
@@ -1986,89 +2050,6 @@ msgid "Invoicing Settings"
msgstr ""
#. module: purchase
-#: model:email.template,body_html:purchase.email_template_edi_purchase
-msgid ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"\n"
-" <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
-"or ''},</p>\n"
-" \n"
-" <p>Here is a ${object.state in ('draft', 'sent') and 'request for "
-"quotation' or 'purchase order confirmation'} from ${object.company_id.name}: "
-"</p>\n"
-" \n"
-" <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
-" &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
-" &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
-" &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
-"${object.pricelist_id.currency_id.name}</strong><br />\n"
-" &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
-" % if object.origin:\n"
-" &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
-" % endif\n"
-" % if object.partner_ref:\n"
-" &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
-" % endif\n"
-" % if object.validator:\n"
-" &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.validator.email "
-"or ''}?subject=Order%20${object.name}\">${object.validator.name}</a>\n"
-" % endif\n"
-" </p>\n"
-"\n"
-" <br/>\n"
-" <p>If you have any question, do not hesitate to contact us.</p>\n"
-" <p>Thank you!</p>\n"
-" <br/>\n"
-" <br/>\n"
-" <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
-"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
-"background-repeat: repeat no-repeat;\">\n"
-" <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
-"#FFF;\">\n"
-" <strong style=\"text-"
-"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
-" </div>\n"
-" <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
-"16px; background-color: #F2F2F2;\">\n"
-" <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
-" % if object.company_id.street:\n"
-" ${object.company_id.street}<br/>\n"
-" % endif\n"
-" % if object.company_id.street2:\n"
-" ${object.company_id.street2}<br/>\n"
-" % endif\n"
-" % if object.company_id.city or object.company_id.zip:\n"
-" ${object.company_id.zip} ${object.company_id.city}<br/>\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 ''}<br/>\n"
-" % endif\n"
-" </span>\n"
-" % if object.company_id.phone:\n"
-" <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
-"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
-"0px; padding-left: 0px; \">\n"
-" Phone:&nbsp; ${object.company_id.phone}\n"
-" </div>\n"
-" % endif\n"
-" % if object.company_id.website:\n"
-" <div>\n"
-" Web :&nbsp;<a "
-"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
-" </div>\n"
-" %endif\n"
-" <p></p>\n"
-" </div>\n"
-"</div>\n"
-" "
-msgstr ""
-
-#. module: purchase
#: model:ir.actions.act_window,name:purchase.action_purchase_order_by_user_all
msgid "Total Orders by User per month"
msgstr ""
@@ -2079,21 +2060,19 @@ msgid "Based on incoming shipments"
msgstr ""
#. module: purchase
+#: code:addons/purchase/purchase.py:1018
+#, python-format
+msgid "No default supplier defined for this product"
+msgstr ""
+
+#. module: purchase
#: view:purchase.report:0
#: field:purchase.report,warehouse_id:0
msgid "Warehouse"
msgstr "Lagersted"
#. module: purchase
-#: help:purchase.order,partner_ref:0
-msgid ""
-"Reference of the sale order or quotation sent by your supplier. It's mainly "
-"used to do the matching when you receive the products as this reference is "
-"usually written on the delivery order sent by your supplier."
-msgstr ""
-
-#. module: purchase
-#: code:addons/purchase/purchase.py:991
+#: code:addons/purchase/purchase.py:960
#, python-format
msgid ""
"The selected supplier has a minimal quantity set to %s %s, you should not "
@@ -2166,8 +2145,8 @@ msgid ""
msgstr ""
#. module: purchase
-#: view:product.product:0
-msgid "When you sell this service to a customer,"
+#: field:purchase.order,message_summary:0
+msgid "Summary"
msgstr ""
#. module: purchase
@@ -2177,6 +2156,11 @@ msgid "Pricelist Versions"
msgstr ""
#. module: purchase
+#: field:purchase.order,payment_term_id:0
+msgid "Payment Term"
+msgstr ""
+
+#. module: purchase
#: view:purchase.order:0
msgid "Purchase orders which are in draft state"
msgstr ""
diff --git a/addons/purchase/i18n/de.po b/addons/purchase/i18n/de.po
index 6a3359707e7..9e6638e27fe 100644
--- a/addons/purchase/i18n/de.po
+++ b/addons/purchase/i18n/de.po
@@ -6,14 +6,14 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
-"PO-Revision-Date: 2012-12-18 06:16+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
+"PO-Revision-Date: 2012-12-21 13:33+0000\n"
+"Last-Translator: Thorsten Vocks <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: 2012-12-19 05:15+0000\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:19+0000\n"
"X-Generator: Launchpad (build 16378)\n"
#. module: purchase
@@ -68,11 +68,6 @@ msgstr ""
"unter Berücksichtigung der Bestellmenge errechnet."
#. module: purchase
-#: model:ir.actions.server,name:purchase.actions_server_purchase_order_read
-msgid "Purchase: Mark read"
-msgstr "Einkauf: Markiere als gelesen"
-
-#. module: purchase
#: view:purchase.report:0
#: field:purchase.report,day:0
msgid "Day"
@@ -116,16 +111,13 @@ msgstr ""
"weiterzuarbeiten."
#. module: purchase
-#: code:addons/purchase/purchase.py:973
-#: code:addons/purchase/purchase.py:988
-#: code:addons/purchase/purchase.py:991
-#: code:addons/purchase/wizard/purchase_order_group.py:47
+#: code:addons/purchase/purchase.py:1024
#, python-format
-msgid "Warning!"
-msgstr "Warnung !"
+msgid "Configuration Error!"
+msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:573
+#: code:addons/purchase/purchase.py:587
#, python-format
msgid "You must first cancel all receptions related to this purchase order."
msgstr "Sie müssen vorab alle Warenineingänge dieses Auftrags stornieren."
@@ -142,10 +134,10 @@ msgid "Purchase-Standard Price"
msgstr "Diff. zu Standardpreis"
#. module: purchase
-#: report:purchase.order:0
-#: field:purchase.report,validator:0
-msgid "Validated By"
-msgstr "Geprüft durch"
+#: code:addons/purchase/purchase.py:1011
+#, python-format
+msgid "No supplier defined for this product !"
+msgstr ""
#. module: purchase
#: model:ir.actions.act_window,help:purchase.action_picking_tree4_picking_to_invoice
@@ -178,12 +170,6 @@ msgid "Average Price"
msgstr "Durchschnittspreis"
#. module: purchase
-#: code:addons/purchase/purchase.py:830
-#, python-format
-msgid "Invoice <b>paid</b>."
-msgstr "Rechnung ist <b>bezahlt</b>"
-
-#. module: purchase
#: view:purchase.order:0
msgid "Purchase order which are in the exception state"
msgstr "Einkaufsaufträge im Ausnahmenzustand"
@@ -257,7 +243,7 @@ msgstr ""
"Anlieferung."
#. module: purchase
-#: code:addons/purchase/purchase.py:255
+#: code:addons/purchase/purchase.py:260
#, python-format
msgid "In order to delete a purchase order, you must cancel it first."
msgstr "Um eine Bestellung zu löschen, muss sie zunächst storniert werden."
@@ -283,29 +269,12 @@ msgid "Total Untaxed amount"
msgstr "Nettobetrag"
#. module: purchase
-#: model:ir.ui.menu,name:purchase.menu_purchase_uom_categ_form_action
-msgid "Unit of Measure Categories"
-msgstr "Einheiten Kategorien"
-
-#. module: purchase
#: view:purchase.report:0
#: field:purchase.report,category_id:0
msgid "Category"
msgstr "Kategorie"
#. module: purchase
-#: view:purchase.order:0
-msgid "Quotation "
-msgstr "Angebot "
-
-#. module: purchase
-#: code:addons/purchase/purchase.py:810
-#, python-format
-msgid ""
-"Quotation for <em>%s</em> <b>converted</b> to a Purchase Order of %s %s."
-msgstr "Angebot <em>%s</em> <b>wurde umgewandelt </b> in Bestellung %s %s."
-
-#. module: purchase
#: model:process.transition,note:purchase.process_transition_purchaseinvoice0
msgid ""
"A purchase order generates a supplier invoice, as soon as it is confirmed by "
@@ -391,15 +360,17 @@ msgid "October"
msgstr "Oktober"
#. module: purchase
-#: code:addons/purchase/purchase.py:837
+#: code:addons/purchase/purchase.py:1024
#, python-format
-msgid "Purchase Order for <em>%s</em> <b>cancelled</b>."
-msgstr "Bestellung für <em>%s</em> <b>wurde abgebrochen</b>."
+msgid ""
+"The product \"%s\" has been defined with your company as reseller which "
+"seems to be a configuration error!"
+msgstr ""
#. module: purchase
-#: field:purchase.order,message_summary:0
-msgid "Summary"
-msgstr "Zusammenfassung"
+#: view:product.product:0
+msgid "When you sell this service to a customer,"
+msgstr "Wenn Sie diese Dienstleistung verkaufen,"
#. module: purchase
#: model:process.transition,note:purchase.process_transition_createpackinglist0
@@ -427,12 +398,6 @@ msgid "Quantity"
msgstr "Menge"
#. module: purchase
-#: code:addons/purchase/purchase.py:819
-#, python-format
-msgid "Shipment <em>%s</em> <b>scheduled</b> for %s."
-msgstr "Lieferung <em>%s</em> <b>wurde eingeplant</b> für %s."
-
-#. module: purchase
#: field:purchase.order,fiscal_position:0
msgid "Fiscal Position"
msgstr "Steuerliche Zuordnung"
@@ -506,12 +471,6 @@ msgstr ""
"Unternehmen erfolgt."
#. module: purchase
-#: code:addons/purchase/purchase.py:824
-#, python-format
-msgid "Draft Invoice of %s %s is <b>waiting for validation</b>."
-msgstr "Entwurf der Rechnung vom %s %s <b>erwartet Validierung</b>."
-
-#. module: purchase
#: model:ir.actions.act_window,help:purchase.purchase_line_form_action2
msgid ""
"<p>\n"
@@ -540,6 +499,11 @@ msgid "Scheduled Date"
msgstr "Geplantes Datum"
#. module: purchase
+#: field:purchase.order,currency_id:0
+msgid "Currency"
+msgstr ""
+
+#. module: purchase
#: field:purchase.order,journal_id:0
msgid "Journal"
msgstr "Journal"
@@ -572,6 +536,19 @@ msgid "Incoming Products"
msgstr "von Lieferscheinen"
#. module: purchase
+#: view:purchase.order:0
+msgid "Request for Quotation "
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,partner_ref:0
+msgid ""
+"Reference of the sales order or quotation sent by your supplier. It's mainly "
+"used to do the matching when you receive the products as this reference is "
+"usually written on the delivery order sent by your supplier."
+msgstr ""
+
+#. module: purchase
#: view:purchase.config.settings:0
#: view:purchase.order.group:0
#: view:purchase.order.line_invoice:0
@@ -596,6 +573,11 @@ msgstr ""
"= Manuelle Rechnung)."
#. module: purchase
+#: model:mail.message.subtype,name:purchase.mt_rfq_approved
+msgid "RFQ Approved"
+msgstr ""
+
+#. module: purchase
#: view:purchase.config.settings:0
msgid "Apply"
msgstr "Anwenden"
@@ -615,6 +597,11 @@ msgstr ""
"zunächst bestätigen. Erst hierdurch ensteht auch eine Bestellung."
#. module: purchase
+#: model:mail.message.subtype,name:purchase.mt_rfq_confirmed
+msgid "RFQ Confirmed"
+msgstr ""
+
+#. module: purchase
#: view:purchase.order:0
msgid "Customer Address"
msgstr "Kundenanschrift"
@@ -639,7 +626,7 @@ msgid "Supplier"
msgstr "Lieferant"
#. module: purchase
-#: code:addons/purchase/purchase.py:508
+#: code:addons/purchase/purchase.py:525
#, python-format
msgid "Define expense account for this company: \"%s\" (id:%d)."
msgstr ""
@@ -664,7 +651,6 @@ msgstr "Zwischensumme"
#. module: purchase
#: field:purchase.order,shipped:0
-#: field:purchase.order,shipped_rate:0
msgid "Received"
msgstr "Empfangen"
@@ -718,13 +704,20 @@ msgid "Invoices and Receptions"
msgstr "Rechnungen und Lieferscheine"
#. module: purchase
+#: model:process.transition,note:purchase.process_transition_packinginvoice0
+msgid ""
+"A Pick list generates an invoice. Depending on the Invoicing control of the "
+"sales order, the invoice is based on delivered or on ordered quantities."
+msgstr ""
+
+#. module: purchase
#: view:purchase.report:0
#: field:purchase.report,nbr:0
msgid "# of Lines"
msgstr "Anzahl Positionen"
#. module: purchase
-#: code:addons/purchase/wizard/purchase_line_invoice.py:110
+#: code:addons/purchase/wizard/purchase_line_invoice.py:106
#, python-format
msgid "Define expense account for this product: \"%s\" (id:%d)."
msgstr ""
@@ -746,8 +739,8 @@ msgid "It indicates that a picking has been done"
msgstr "Es wird angezeigt, dass ein Lieferauftrag ansteht"
#. module: purchase
-#: code:addons/purchase/purchase.py:565
-#: code:addons/purchase/purchase.py:572
+#: code:addons/purchase/purchase.py:579
+#: code:addons/purchase/purchase.py:586
#, python-format
msgid "Unable to cancel this purchase order."
msgstr "Es ist nicht möglich diese Bestellung abzubrechen."
@@ -815,6 +808,15 @@ msgid "Draft PO"
msgstr "Entwurf Bestellung"
#. module: purchase
+#: code:addons/purchase/purchase.py:941
+#: code:addons/purchase/purchase.py:956
+#: code:addons/purchase/purchase.py:960
+#: code:addons/purchase/wizard/purchase_order_group.py:47
+#, python-format
+msgid "Warning!"
+msgstr "Warnung !"
+
+#. module: purchase
#: model:process.node,name:purchase.process_node_draftpurchaseorder0
#: model:process.node,name:purchase.process_node_draftpurchaseorder1
msgid "RFQ"
@@ -846,6 +848,11 @@ msgid "The tax amount"
msgstr "Der Steuerbetrag"
#. module: purchase
+#: field:purchase.order,shipped_rate:0
+msgid "Received Ratio"
+msgstr ""
+
+#. module: purchase
#: selection:purchase.report,month:0
msgid "September"
msgstr "September"
@@ -877,7 +884,7 @@ msgid "Stock Moves"
msgstr "Lagerbuchungen"
#. module: purchase
-#: code:addons/purchase/purchase.py:1158
+#: code:addons/purchase/purchase.py:1156
#, python-format
msgid "Draft Purchase Order created"
msgstr "Entwurf für Bestellung wurde erstellt"
@@ -898,11 +905,6 @@ msgid "Terms and Conditions"
msgstr "Bedingungen und Konditionen"
#. module: purchase
-#: field:purchase.order,currency_id:0
-msgid "unknown"
-msgstr "unbekannt"
-
-#. module: purchase
#: help:purchase.order,date_order:0
msgid "Date on which this document has been created."
msgstr "Erstellungsdatum des Belegs"
@@ -996,12 +998,6 @@ msgid "Cancel"
msgstr "Abbrechen"
#. module: purchase
-#: field:purchase.order,message_comment_ids:0
-#: help:purchase.order,message_comment_ids:0
-msgid "Comments and emails"
-msgstr "Kommentare und E-Mails"
-
-#. module: purchase
#: sql_constraint:purchase.order:0
msgid "Order Reference must be unique per Company!"
msgstr "Die Bestellreferenz muss je Firma eindeutig sein"
@@ -1035,17 +1031,92 @@ msgid "Date Approved"
msgstr "Datum Genehmigung"
#. module: purchase
-#: code:addons/purchase/purchase.py:806
-#, python-format
-msgid "Request for quotation <b>created</b>."
-msgstr "Angebotsanfrage <b>wurde erstellt</b>."
-
-#. module: purchase
#: view:product.product:0
msgid "a draft purchase order"
msgstr "eine Bestellung im Entwurf"
#. module: purchase
+#: model:email.template,body_html:purchase.email_template_edi_purchase
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: #FFF; \">\n"
+"\n"
+" <p>Hello$ ${object.partner_id.name},</p>\n"
+" \n"
+" <p>Here is a ${object.state in ('draft', 'sent') and 'request for "
+"quotation' or 'purchase order confirmation'} from ${object.company_id.name}: "
+"</p>\n"
+" \n"
+" <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
+" &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
+" &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
+" &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
+"${object.pricelist_id.currency_id.name}</strong><br />\n"
+" &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
+" % if object.origin:\n"
+" &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
+" % endif\n"
+" % if object.partner_ref:\n"
+" &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
+" % endif\n"
+" % if object.validator:\n"
+" &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.validator.email "
+"or ''}?subject=Order%20${object.name}\">${object.validator.name}</a>\n"
+" % endif\n"
+" </p>\n"
+"\n"
+" <br/>\n"
+" <p>If you have any question, do not hesitate to contact us.</p>\n"
+" <p>Thank you!</p>\n"
+" <br/>\n"
+" <br/>\n"
+" <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
+"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
+"background-repeat: repeat no-repeat;\">\n"
+" <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
+"#DDD;\">\n"
+" <strong style=\"text-"
+"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
+" </div>\n"
+" <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
+"16px; background-color: #F2F2F2;\">\n"
+" <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
+" % if object.company_id.street:\n"
+" ${object.company_id.street}<br/>\n"
+" % endif\n"
+" % if object.company_id.street2:\n"
+" ${object.company_id.street2}<br/>\n"
+" % endif\n"
+" % if object.company_id.city or object.company_id.zip:\n"
+" ${object.company_id.zip} ${object.company_id.city}<br/>\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 ''}<br/>\n"
+" % endif\n"
+" </span>\n"
+" % if object.company_id.phone:\n"
+" <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
+"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
+"0px; padding-left: 0px; \">\n"
+" Phone:&nbsp; ${object.company_id.phone}\n"
+" </div>\n"
+" % endif\n"
+" % if object.company_id.website:\n"
+" <div>\n"
+" Web :&nbsp;<a "
+"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
+" </div>\n"
+" %endif\n"
+" <p></p>\n"
+" </div>\n"
+"</div>\n"
+" "
+msgstr ""
+
+#. module: purchase
#: view:purchase.report:0
msgid "Order of Year"
msgstr "Bestellungen des Jahres"
@@ -1090,18 +1161,13 @@ msgid "Outgoing Mails"
msgstr "Postausgang"
#. module: purchase
-#: code:addons/purchase/purchase.py:437
+#: code:addons/purchase/purchase.py:456
#, python-format
msgid "You cannot confirm a purchase order without any purchase order line."
msgstr ""
"Sie können keine Bestellung ohne erfasste Bestellpositionen bestätigen."
#. module: purchase
-#: model:ir.actions.server,name:purchase.actions_server_purchase_order_unread
-msgid "Purchase: Mark unread"
-msgstr "Einkauf: Markiere als gelesen"
-
-#. module: purchase
#: help:purchase.order,message_ids:0
msgid "Messages and communication history"
msgstr "Nachrichten und Kommunikations-Historie"
@@ -1113,7 +1179,7 @@ msgid "Destination Warehouse"
msgstr "Ziellager"
#. module: purchase
-#: code:addons/purchase/purchase.py:973
+#: code:addons/purchase/purchase.py:941
#, python-format
msgid ""
"Selected Unit of Measure does not belong to the same category as the product "
@@ -1123,6 +1189,11 @@ msgstr ""
"wie die Produkt Einheit."
#. module: purchase
+#: view:purchase.order.line_invoice:0
+msgid "Select an Open Sales Order"
+msgstr ""
+
+#. module: purchase
#: model:ir.ui.menu,name:purchase.menu_purchase_unit_measure_purchase
#: model:ir.ui.menu,name:purchase.menu_purchase_uom_form_action
msgid "Units of Measure"
@@ -1134,18 +1205,12 @@ msgid "Manage pricelist per supplier"
msgstr "Verwalte einzelne Preislisten für Lieferanten"
#. module: purchase
-#: code:addons/purchase/purchase.py:833
-#, python-format
-msgid "Purchase Order has been set to <b>draft</b>."
-msgstr "Bestellung ist im Status <b>Entwurf</b>."
-
-#. module: purchase
#: view:board.board:0
msgid "Purchase Dashboard"
msgstr "Anzeigetafel Einkauf"
#. module: purchase
-#: code:addons/purchase/purchase.py:566
+#: code:addons/purchase/purchase.py:580
#, python-format
msgid "First cancel all receptions related to this purchase order."
msgstr ""
@@ -1185,9 +1250,9 @@ msgid "Unread Messages"
msgstr "Ungelesene Mitteilungen"
#. module: purchase
-#: view:purchase.order.line_invoice:0
-msgid "Select an Open Sale Order"
-msgstr "Wähle offenen Verkauf"
+#: model:ir.ui.menu,name:purchase.menu_purchase_uom_categ_form_action
+msgid "Unit of Measure Categories"
+msgstr "Einheiten Kategorien"
#. module: purchase
#: view:purchase.order:0
@@ -1195,6 +1260,13 @@ msgid "Set to Draft"
msgstr "Setze auf Entwurf"
#. module: purchase
+#: help:purchase.order,origin:0
+msgid ""
+"Reference of the document that generated this purchase order request; a "
+"sales order or an internal procurement request."
+msgstr ""
+
+#. module: purchase
#: view:purchase.order.line:0
msgid "Notes"
msgstr "Bemerkungen"
@@ -1221,10 +1293,10 @@ msgstr "Produkte"
#. module: purchase
#: model:ir.model,name:purchase.model_stock_move
msgid "Stock Move"
-msgstr "Lieferung"
+msgstr "Lagerbuchung"
#. module: purchase
-#: code:addons/purchase/purchase.py:255
+#: code:addons/purchase/purchase.py:260
#, python-format
msgid "Invalid Action!"
msgstr "Ungültige Aktion!"
@@ -1332,7 +1404,7 @@ msgstr ""
" Bestellung"
#. module: purchase
-#: code:addons/purchase/purchase.py:310
+#: code:addons/purchase/purchase.py:320
#, python-format
msgid "Please create Invoices."
msgstr "Bitte erstellen Sie Abrechnung."
@@ -1436,7 +1508,7 @@ msgid "Purchase Order Line Make Invoice"
msgstr "Rechnungserstellung von Bestellpositionen"
#. module: purchase
-#: code:addons/purchase/purchase.py:1133
+#: code:addons/purchase/purchase.py:1141
#, python-format
msgid "PO: %s"
msgstr "PO: %s"
@@ -1447,7 +1519,7 @@ msgid "Send by EMail"
msgstr "Per E-Mail senden"
#. module: purchase
-#: code:addons/purchase/purchase.py:498
+#: code:addons/purchase/purchase.py:515
#, python-format
msgid "Define purchase journal for this company: \"%s\" (id:%d)."
msgstr ""
@@ -1460,9 +1532,9 @@ msgid "Purchase Order "
msgstr "Bestellung "
#. module: purchase
-#: view:purchase.order.line:0
-msgid "Manual Invoices"
-msgstr "Erzeuge Rechnungen"
+#: help:purchase.config.settings,group_costing_method:0
+msgid "Allows you to compute product cost price based on average cost."
+msgstr "Anschaffungspreis aus Durchschnittspreisen errechnen lassen"
#. module: purchase
#: model:ir.actions.act_window,name:purchase.action_purchase_configuration
@@ -1631,8 +1703,8 @@ msgid "Compute product cost price based on average cost"
msgstr "Durchschnittspreise berechnen für Standard Preis"
#. module: purchase
-#: code:addons/purchase/purchase.py:340
-#: code:addons/purchase/wizard/purchase_line_invoice.py:141
+#: code:addons/purchase/purchase.py:350
+#: code:addons/purchase/wizard/purchase_line_invoice.py:137
#: model:ir.actions.act_window,name:purchase.act_res_partner_2_supplier_invoices
#: view:res.partner:0
#, python-format
@@ -1756,9 +1828,10 @@ msgid "Open Purchase Menu"
msgstr "Öffnen Einkauf Menü"
#. module: purchase
-#: model:ir.model,name:purchase.model_mail_compose_message
-msgid "Email composition wizard"
-msgstr "E-Mail Assistent"
+#: code:addons/purchase/purchase.py:1028
+#, python-format
+msgid "No address defined for the supplier"
+msgstr ""
#. module: purchase
#: field:purchase.order,company_id:0
@@ -1807,7 +1880,7 @@ msgstr "von vorab Rechnungsentwürfen"
#: model:ir.actions.act_window,name:purchase.action_stock_move_report_po
#: model:ir.ui.menu,name:purchase.menu_action_stock_move_report_po
msgid "Receptions Analysis"
-msgstr "Statistik Zugangslieferungen"
+msgstr "Statistik Wareneingang"
#. module: purchase
#: field:purchase.order,message_ids:0
@@ -1830,11 +1903,11 @@ msgid "Purchase Order"
msgstr "Bestellung"
#. module: purchase
-#: code:addons/purchase/purchase.py:310
-#: code:addons/purchase/purchase.py:437
-#: code:addons/purchase/purchase.py:497
-#: code:addons/purchase/purchase.py:508
-#: code:addons/purchase/wizard/purchase_line_invoice.py:109
+#: code:addons/purchase/purchase.py:320
+#: code:addons/purchase/purchase.py:456
+#: code:addons/purchase/purchase.py:514
+#: code:addons/purchase/purchase.py:525
+#: code:addons/purchase/wizard/purchase_line_invoice.py:105
#, python-format
msgid "Error!"
msgstr "Fehler!"
@@ -1864,16 +1937,6 @@ msgstr ""
"auf 'Fehler' (Sonderfall / Exception)."
#. module: purchase
-#: model:process.transition,note:purchase.process_transition_packinginvoice0
-msgid ""
-"A Pick list generates an invoice. Depending on the Invoicing control of the "
-"sale order, the invoice is based on delivered or on ordered quantities."
-msgstr ""
-"Ein Lieferauftrag erzeugt eine Rechnung. Abhängig von der Einstellung zum "
-"Zeitpunkt der Erstellung der Ausgangsrechnung, basiert die Rechnung auf "
-"entweder gelieferten oder bestellten Mengen."
-
-#. module: purchase
#: selection:purchase.order,state:0
#: selection:purchase.order.line,state:0
#: selection:purchase.report,state:0
@@ -1886,10 +1949,9 @@ msgid "# of Purchase Order"
msgstr "Anzahl Bestellungen"
#. module: purchase
-#: code:addons/purchase/purchase.py:827
-#, python-format
-msgid "Shipment <b>received</b>."
-msgstr "Lieferung <b> erhalten</b>"
+#: model:ir.model,name:purchase.model_mail_compose_message
+msgid "Email composition wizard"
+msgstr "E-Mail Assistent"
#. module: purchase
#: report:purchase.quotation:0
@@ -1984,7 +2046,7 @@ msgid "RFQ_${(object.name or '').replace('/','_')}"
msgstr "RFQ_${(object.name or '').replace('/','_')}"
#. module: purchase
-#: code:addons/purchase/purchase.py:988
+#: code:addons/purchase/purchase.py:956
#, python-format
msgid "The selected supplier only sells this product by %s"
msgstr ""
@@ -2035,6 +2097,12 @@ msgid "Outgoing products to invoice"
msgstr "Rechnungserstellung für Auslieferungen"
#. module: purchase
+#: report:purchase.order:0
+#: field:purchase.report,validator:0
+msgid "Validated By"
+msgstr "Geprüft durch"
+
+#. module: purchase
#: view:purchase.report:0
#: field:purchase.report,delay_pass:0
msgid "Days to Deliver"
@@ -2124,9 +2192,9 @@ msgid "November"
msgstr "November"
#. module: purchase
-#: help:purchase.config.settings,group_costing_method:0
-msgid "Allows you to compute product cost price based on average cost."
-msgstr "Anschaffungspreis aus Durchschnittspreisen errechnen lassen"
+#: view:purchase.order.line:0
+msgid "Manual Invoices"
+msgstr "Erzeuge Rechnungen"
#. module: purchase
#: report:purchase.order:0
@@ -2155,15 +2223,6 @@ msgstr ""
"Lieferschein bestätigt haben."
#. module: purchase
-#: help:purchase.order,origin:0
-msgid ""
-"Reference of the document that generated this purchase order request; a sale "
-"order or an internal procurement request."
-msgstr ""
-"Referenz zu Beleg, der die Angebotsanfrage ausgelöst hat, i.d.R. ist dies "
-"ein Verkauf oder eine Bedarfsberechnung."
-
-#. module: purchase
#: model:ir.ui.menu,name:purchase.menu_partner_categories_in_form
msgid "Partner Categories"
msgstr "Lieferanten Kategorien"
@@ -2184,168 +2243,6 @@ msgid "Invoicing Settings"
msgstr "Einstellungen zur Rechnungserstellung"
#. module: purchase
-#: model:email.template,body_html:purchase.email_template_edi_purchase
-msgid ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"\n"
-" <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
-"or ''},</p>\n"
-" \n"
-" <p>Here is a ${object.state in ('draft', 'sent') and 'request for "
-"quotation' or 'purchase order confirmation'} from ${object.company_id.name}: "
-"</p>\n"
-" \n"
-" <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
-" &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
-" &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
-" &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
-"${object.pricelist_id.currency_id.name}</strong><br />\n"
-" &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
-" % if object.origin:\n"
-" &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
-" % endif\n"
-" % if object.partner_ref:\n"
-" &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
-" % endif\n"
-" % if object.validator:\n"
-" &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.validator.email "
-"or ''}?subject=Order%20${object.name}\">${object.validator.name}</a>\n"
-" % endif\n"
-" </p>\n"
-"\n"
-" <br/>\n"
-" <p>If you have any question, do not hesitate to contact us.</p>\n"
-" <p>Thank you!</p>\n"
-" <br/>\n"
-" <br/>\n"
-" <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
-"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
-"background-repeat: repeat no-repeat;\">\n"
-" <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
-"#FFF;\">\n"
-" <strong style=\"text-"
-"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
-" </div>\n"
-" <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
-"16px; background-color: #F2F2F2;\">\n"
-" <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
-" % if object.company_id.street:\n"
-" ${object.company_id.street}<br/>\n"
-" % endif\n"
-" % if object.company_id.street2:\n"
-" ${object.company_id.street2}<br/>\n"
-" % endif\n"
-" % if object.company_id.city or object.company_id.zip:\n"
-" ${object.company_id.zip} ${object.company_id.city}<br/>\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 ''}<br/>\n"
-" % endif\n"
-" </span>\n"
-" % if object.company_id.phone:\n"
-" <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
-"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
-"0px; padding-left: 0px; \">\n"
-" Phone:&nbsp; ${object.company_id.phone}\n"
-" </div>\n"
-" % endif\n"
-" % if object.company_id.website:\n"
-" <div>\n"
-" Web :&nbsp;<a "
-"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
-" </div>\n"
-" %endif\n"
-" <p></p>\n"
-" </div>\n"
-"</div>\n"
-" "
-msgstr ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"\n"
-" <p>Hallo${object.partner_id.name and ' ' or ''}${object.partner_id.name "
-"or ''},</p>\n"
-" \n"
-" <p>hier finden Sie den Beleg${object.state in ('draft', 'sent') and "
-"'request for quotation' or 'purchase order confirmation'} von "
-"${object.company_id.name}: </p>\n"
-" \n"
-" <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
-" &nbsp;&nbsp;<strong>REFERENZEN</strong><br />\n"
-" &nbsp;&nbsp;Bestellnummer: <strong>${object.name}</strong><br />\n"
-" &nbsp;&nbsp;Bestellbetrag: <strong>${object.amount_total} "
-"${object.pricelist_id.currency_id.name}</strong><br />\n"
-" &nbsp;&nbsp;Bestelldatum: ${object.date_order}<br />\n"
-" % if object.origin:\n"
-" &nbsp;&nbsp;Unsere Referenz: ${object.origin}<br />\n"
-" % endif\n"
-" % if object.partner_ref:\n"
-" &nbsp;&nbsp;Ihre Referenz: ${object.partner_ref}<br />\n"
-" % endif\n"
-" % if object.validator:\n"
-" &nbsp;&nbsp;Ihr Ansprechpartner: <a "
-"href=\"mailto:${object.validator.email or "
-"''}?Betreff=Order%20${object.name}\">${object.validator.name}</a>\n"
-" % endif\n"
-" </p>\n"
-"\n"
-" <br/>\n"
-" <p>Bei Fragen, zögern Sie bitte nicht, uns zu kontaktieren!</p>\n"
-" <p>Vielen Dank!</p>\n"
-" <br/>\n"
-" <br/>\n"
-" <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
-"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
-"background-repeat: repeat no-repeat;\">\n"
-" <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
-"#FFF;\">\n"
-" <strong style=\"text-"
-"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
-" </div>\n"
-" <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
-"16px; background-color: #F2F2F2;\">\n"
-" <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
-" % if object.company_id.street:\n"
-" ${object.company_id.street}<br/>\n"
-" % endif\n"
-" % if object.company_id.street2:\n"
-" ${object.company_id.street2}<br/>\n"
-" % endif\n"
-" % if object.company_id.city or object.company_id.zip:\n"
-" ${object.company_id.zip} ${object.company_id.city}<br/>\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 ''}<br/>\n"
-" % endif\n"
-" </span>\n"
-" % if object.company_id.phone:\n"
-" <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
-"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
-"0px; padding-left: 0px; \">\n"
-" Telefon:&nbsp; ${object.company_id.phone}\n"
-" </div>\n"
-" % endif\n"
-" % if object.company_id.website:\n"
-" <div>\n"
-" Homepage :&nbsp;<a "
-"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
-" </div>\n"
-" %endif\n"
-" <p></p>\n"
-" </div>\n"
-"</div>\n"
-" "
-
-#. module: purchase
#: model:ir.actions.act_window,name:purchase.action_purchase_order_by_user_all
msgid "Total Orders by User per month"
msgstr "Bestellungen nach Benutzer pro Monat"
@@ -2356,24 +2253,19 @@ msgid "Based on incoming shipments"
msgstr "von Lieferscheinen"
#. module: purchase
+#: code:addons/purchase/purchase.py:1018
+#, python-format
+msgid "No default supplier defined for this product"
+msgstr ""
+
+#. module: purchase
#: view:purchase.report:0
#: field:purchase.report,warehouse_id:0
msgid "Warehouse"
msgstr "Lager"
#. module: purchase
-#: help:purchase.order,partner_ref:0
-msgid ""
-"Reference of the sale order or quotation sent by your supplier. It's mainly "
-"used to do the matching when you receive the products as this reference is "
-"usually written on the delivery order sent by your supplier."
-msgstr ""
-"Referenz des Angebots durch Ihren Lieferanten. Hauptsächlich wird diese "
-"Referenz benötigt, damit dann eine Zuordnung zum Eingangslieferschein "
-"möglich ist, oder später bei der Bezahlung verwendet werden kann."
-
-#. module: purchase
-#: code:addons/purchase/purchase.py:991
+#: code:addons/purchase/purchase.py:960
#, python-format
msgid ""
"The selected supplier has a minimal quantity set to %s %s, you should not "
@@ -2459,9 +2351,9 @@ msgstr ""
" "
#. module: purchase
-#: view:product.product:0
-msgid "When you sell this service to a customer,"
-msgstr "Wenn Sie diese Dienstleistung verkaufen,"
+#: field:purchase.order,message_summary:0
+msgid "Summary"
+msgstr "Zusammenfassung"
#. module: purchase
#: model:ir.actions.act_window,name:purchase.purchase_pricelist_version_action
@@ -2470,6 +2362,11 @@ msgid "Pricelist Versions"
msgstr "Preislisten Versionen"
#. module: purchase
+#: field:purchase.order,payment_term_id:0
+msgid "Payment Term"
+msgstr ""
+
+#. module: purchase
#: view:purchase.order:0
msgid "Purchase orders which are in draft state"
msgstr "Bestellungen im Entwurf"
@@ -2856,6 +2753,14 @@ msgstr "Bestellungen"
#~ "Bitte nehmen Sie diese Eintragung vor, bevor Sie die Produkte für die "
#~ "Auftragspositionen wählen."
+#~ msgid ""
+#~ "A Pick list generates an invoice. Depending on the Invoicing control of the "
+#~ "sale order, the invoice is based on delivered or on ordered quantities."
+#~ msgstr ""
+#~ "Ein Lieferauftrag erzeugt eine Rechnung. Abhängig von der Einstellung zum "
+#~ "Zeitpunkt der Erstellung der Ausgangsrechnung, basiert die Rechnung auf "
+#~ "entweder gelieferten oder bestellten Mengen."
+
#, python-format
#~ msgid "Purchase amount over the limit"
#~ msgstr "Beschaffungswert übersteigt Limit"
@@ -3517,3 +3422,6 @@ msgstr "Bestellungen"
#~ msgid "Pre-Generate Draft Invoices based on Purchase Orders"
#~ msgstr "Erzeuge vorab Rechnungsentwürfe aufgrund der Einkaufsaufträge"
+
+#~ msgid "Select an Open Sale Order"
+#~ msgstr "Wähle offenen Verkauf"
diff --git a/addons/purchase/i18n/el.po b/addons/purchase/i18n/el.po
index 3d80a149762..a3bd1344baf 100644
--- a/addons/purchase/i18n/el.po
+++ b/addons/purchase/i18n/el.po
@@ -6,15 +6,15 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
"PO-Revision-Date: 2012-05-10 18:22+0000\n"
"Last-Translator: Raphael Collet (OpenERP) <Unknown>\n"
"Language-Team: nls@hellug.gr <nls@hellug.gr>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:11+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:19+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
"X-Poedit-Country: GREECE\n"
"X-Poedit-Language: Greek\n"
"X-Poedit-SourceCharset: utf-8\n"
@@ -64,11 +64,6 @@ msgstr ""
"προϊόντα/ποσότητες."
#. module: purchase
-#: model:ir.actions.server,name:purchase.actions_server_purchase_order_read
-msgid "Purchase: Mark read"
-msgstr ""
-
-#. module: purchase
#: view:purchase.report:0
#: field:purchase.report,day:0
msgid "Day"
@@ -109,16 +104,13 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:973
-#: code:addons/purchase/purchase.py:988
-#: code:addons/purchase/purchase.py:991
-#: code:addons/purchase/wizard/purchase_order_group.py:47
+#: code:addons/purchase/purchase.py:1024
#, python-format
-msgid "Warning!"
+msgid "Configuration Error!"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:573
+#: code:addons/purchase/purchase.py:587
#, python-format
msgid "You must first cancel all receptions related to this purchase order."
msgstr ""
@@ -135,10 +127,10 @@ msgid "Purchase-Standard Price"
msgstr ""
#. module: purchase
-#: report:purchase.order:0
-#: field:purchase.report,validator:0
-msgid "Validated By"
-msgstr "Επικυρωμένο Από"
+#: code:addons/purchase/purchase.py:1011
+#, python-format
+msgid "No supplier defined for this product !"
+msgstr ""
#. module: purchase
#: model:ir.actions.act_window,help:purchase.action_picking_tree4_picking_to_invoice
@@ -161,12 +153,6 @@ msgid "Average Price"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:830
-#, python-format
-msgid "Invoice <b>paid</b>."
-msgstr ""
-
-#. module: purchase
#: view:purchase.order:0
msgid "Purchase order which are in the exception state"
msgstr ""
@@ -238,7 +224,7 @@ msgstr ""
"γραμμές παραγγελίας."
#. module: purchase
-#: code:addons/purchase/purchase.py:255
+#: code:addons/purchase/purchase.py:260
#, python-format
msgid "In order to delete a purchase order, you must cancel it first."
msgstr ""
@@ -264,29 +250,12 @@ msgid "Total Untaxed amount"
msgstr ""
#. module: purchase
-#: model:ir.ui.menu,name:purchase.menu_purchase_uom_categ_form_action
-msgid "Unit of Measure Categories"
-msgstr ""
-
-#. module: purchase
#: view:purchase.report:0
#: field:purchase.report,category_id:0
msgid "Category"
msgstr ""
#. module: purchase
-#: view:purchase.order:0
-msgid "Quotation "
-msgstr ""
-
-#. module: purchase
-#: code:addons/purchase/purchase.py:810
-#, python-format
-msgid ""
-"Quotation for <em>%s</em> <b>converted</b> to a Purchase Order of %s %s."
-msgstr ""
-
-#. module: purchase
#: model:process.transition,note:purchase.process_transition_purchaseinvoice0
msgid ""
"A purchase order generates a supplier invoice, as soon as it is confirmed by "
@@ -351,14 +320,16 @@ msgid "October"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:837
+#: code:addons/purchase/purchase.py:1024
#, python-format
-msgid "Purchase Order for <em>%s</em> <b>cancelled</b>."
+msgid ""
+"The product \"%s\" has been defined with your company as reseller which "
+"seems to be a configuration error!"
msgstr ""
#. module: purchase
-#: field:purchase.order,message_summary:0
-msgid "Summary"
+#: view:product.product:0
+msgid "When you sell this service to a customer,"
msgstr ""
#. module: purchase
@@ -387,12 +358,6 @@ msgid "Quantity"
msgstr "Ποσότητα"
#. module: purchase
-#: code:addons/purchase/purchase.py:819
-#, python-format
-msgid "Shipment <em>%s</em> <b>scheduled</b> for %s."
-msgstr ""
-
-#. module: purchase
#: field:purchase.order,fiscal_position:0
msgid "Fiscal Position"
msgstr "Φορολογική Θέση"
@@ -450,12 +415,6 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:824
-#, python-format
-msgid "Draft Invoice of %s %s is <b>waiting for validation</b>."
-msgstr ""
-
-#. module: purchase
#: model:ir.actions.act_window,help:purchase.purchase_line_form_action2
msgid ""
"<p>\n"
@@ -476,6 +435,11 @@ msgid "Scheduled Date"
msgstr ""
#. module: purchase
+#: field:purchase.order,currency_id:0
+msgid "Currency"
+msgstr ""
+
+#. module: purchase
#: field:purchase.order,journal_id:0
msgid "Journal"
msgstr ""
@@ -508,6 +472,19 @@ msgid "Incoming Products"
msgstr ""
#. module: purchase
+#: view:purchase.order:0
+msgid "Request for Quotation "
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,partner_ref:0
+msgid ""
+"Reference of the sales order or quotation sent by your supplier. It's mainly "
+"used to do the matching when you receive the products as this reference is "
+"usually written on the delivery order sent by your supplier."
+msgstr ""
+
+#. module: purchase
#: view:purchase.config.settings:0
#: view:purchase.order.group:0
#: view:purchase.order.line_invoice:0
@@ -528,6 +505,11 @@ msgid ""
msgstr ""
#. module: purchase
+#: model:mail.message.subtype,name:purchase.mt_rfq_approved
+msgid "RFQ Approved"
+msgstr ""
+
+#. module: purchase
#: view:purchase.config.settings:0
msgid "Apply"
msgstr ""
@@ -545,6 +527,11 @@ msgid ""
msgstr ""
#. module: purchase
+#: model:mail.message.subtype,name:purchase.mt_rfq_confirmed
+msgid "RFQ Confirmed"
+msgstr ""
+
+#. module: purchase
#: view:purchase.order:0
msgid "Customer Address"
msgstr ""
@@ -569,7 +556,7 @@ msgid "Supplier"
msgstr "Προμηθευτής"
#. module: purchase
-#: code:addons/purchase/purchase.py:508
+#: code:addons/purchase/purchase.py:525
#, python-format
msgid "Define expense account for this company: \"%s\" (id:%d)."
msgstr ""
@@ -593,7 +580,6 @@ msgstr "Σύνολο"
#. module: purchase
#: field:purchase.order,shipped:0
-#: field:purchase.order,shipped_rate:0
msgid "Received"
msgstr "Παραλήφθηκε"
@@ -635,13 +621,20 @@ msgid "Invoices and Receptions"
msgstr ""
#. module: purchase
+#: model:process.transition,note:purchase.process_transition_packinginvoice0
+msgid ""
+"A Pick list generates an invoice. Depending on the Invoicing control of the "
+"sales order, the invoice is based on delivered or on ordered quantities."
+msgstr ""
+
+#. module: purchase
#: view:purchase.report:0
#: field:purchase.report,nbr:0
msgid "# of Lines"
msgstr ""
#. module: purchase
-#: code:addons/purchase/wizard/purchase_line_invoice.py:110
+#: code:addons/purchase/wizard/purchase_line_invoice.py:106
#, python-format
msgid "Define expense account for this product: \"%s\" (id:%d)."
msgstr ""
@@ -662,8 +655,8 @@ msgid "It indicates that a picking has been done"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:565
-#: code:addons/purchase/purchase.py:572
+#: code:addons/purchase/purchase.py:579
+#: code:addons/purchase/purchase.py:586
#, python-format
msgid "Unable to cancel this purchase order."
msgstr ""
@@ -726,6 +719,15 @@ msgid "Draft PO"
msgstr ""
#. module: purchase
+#: code:addons/purchase/purchase.py:941
+#: code:addons/purchase/purchase.py:956
+#: code:addons/purchase/purchase.py:960
+#: code:addons/purchase/wizard/purchase_order_group.py:47
+#, python-format
+msgid "Warning!"
+msgstr ""
+
+#. module: purchase
#: model:process.node,name:purchase.process_node_draftpurchaseorder0
#: model:process.node,name:purchase.process_node_draftpurchaseorder1
msgid "RFQ"
@@ -757,6 +759,11 @@ msgid "The tax amount"
msgstr ""
#. module: purchase
+#: field:purchase.order,shipped_rate:0
+msgid "Received Ratio"
+msgstr ""
+
+#. module: purchase
#: selection:purchase.report,month:0
msgid "September"
msgstr ""
@@ -788,7 +795,7 @@ msgid "Stock Moves"
msgstr "Κινήσεις Αποθέματος"
#. module: purchase
-#: code:addons/purchase/purchase.py:1158
+#: code:addons/purchase/purchase.py:1156
#, python-format
msgid "Draft Purchase Order created"
msgstr ""
@@ -809,11 +816,6 @@ msgid "Terms and Conditions"
msgstr ""
#. module: purchase
-#: field:purchase.order,currency_id:0
-msgid "unknown"
-msgstr ""
-
-#. module: purchase
#: help:purchase.order,date_order:0
msgid "Date on which this document has been created."
msgstr "Ημερομηνία δημιουργίας εγγράφου."
@@ -907,12 +909,6 @@ msgid "Cancel"
msgstr "Ακύρωση"
#. module: purchase
-#: field:purchase.order,message_comment_ids:0
-#: help:purchase.order,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
-#. module: purchase
#: sql_constraint:purchase.order:0
msgid "Order Reference must be unique per Company!"
msgstr ""
@@ -946,14 +942,89 @@ msgid "Date Approved"
msgstr "Ημερ/νία Έγκρισης"
#. module: purchase
-#: code:addons/purchase/purchase.py:806
-#, python-format
-msgid "Request for quotation <b>created</b>."
+#: view:product.product:0
+msgid "a draft purchase order"
msgstr ""
#. module: purchase
-#: view:product.product:0
-msgid "a draft purchase order"
+#: model:email.template,body_html:purchase.email_template_edi_purchase
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: #FFF; \">\n"
+"\n"
+" <p>Hello$ ${object.partner_id.name},</p>\n"
+" \n"
+" <p>Here is a ${object.state in ('draft', 'sent') and 'request for "
+"quotation' or 'purchase order confirmation'} from ${object.company_id.name}: "
+"</p>\n"
+" \n"
+" <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
+" &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
+" &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
+" &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
+"${object.pricelist_id.currency_id.name}</strong><br />\n"
+" &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
+" % if object.origin:\n"
+" &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
+" % endif\n"
+" % if object.partner_ref:\n"
+" &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
+" % endif\n"
+" % if object.validator:\n"
+" &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.validator.email "
+"or ''}?subject=Order%20${object.name}\">${object.validator.name}</a>\n"
+" % endif\n"
+" </p>\n"
+"\n"
+" <br/>\n"
+" <p>If you have any question, do not hesitate to contact us.</p>\n"
+" <p>Thank you!</p>\n"
+" <br/>\n"
+" <br/>\n"
+" <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
+"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
+"background-repeat: repeat no-repeat;\">\n"
+" <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
+"#DDD;\">\n"
+" <strong style=\"text-"
+"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
+" </div>\n"
+" <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
+"16px; background-color: #F2F2F2;\">\n"
+" <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
+" % if object.company_id.street:\n"
+" ${object.company_id.street}<br/>\n"
+" % endif\n"
+" % if object.company_id.street2:\n"
+" ${object.company_id.street2}<br/>\n"
+" % endif\n"
+" % if object.company_id.city or object.company_id.zip:\n"
+" ${object.company_id.zip} ${object.company_id.city}<br/>\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 ''}<br/>\n"
+" % endif\n"
+" </span>\n"
+" % if object.company_id.phone:\n"
+" <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
+"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
+"0px; padding-left: 0px; \">\n"
+" Phone:&nbsp; ${object.company_id.phone}\n"
+" </div>\n"
+" % endif\n"
+" % if object.company_id.website:\n"
+" <div>\n"
+" Web :&nbsp;<a "
+"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
+" </div>\n"
+" %endif\n"
+" <p></p>\n"
+" </div>\n"
+"</div>\n"
+" "
msgstr ""
#. module: purchase
@@ -993,17 +1064,12 @@ msgid "Outgoing Mails"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:437
+#: code:addons/purchase/purchase.py:456
#, python-format
msgid "You cannot confirm a purchase order without any purchase order line."
msgstr ""
#. module: purchase
-#: model:ir.actions.server,name:purchase.actions_server_purchase_order_unread
-msgid "Purchase: Mark unread"
-msgstr ""
-
-#. module: purchase
#: help:purchase.order,message_ids:0
msgid "Messages and communication history"
msgstr ""
@@ -1015,7 +1081,7 @@ msgid "Destination Warehouse"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:973
+#: code:addons/purchase/purchase.py:941
#, python-format
msgid ""
"Selected Unit of Measure does not belong to the same category as the product "
@@ -1023,6 +1089,11 @@ msgid ""
msgstr ""
#. module: purchase
+#: view:purchase.order.line_invoice:0
+msgid "Select an Open Sales Order"
+msgstr ""
+
+#. module: purchase
#: model:ir.ui.menu,name:purchase.menu_purchase_unit_measure_purchase
#: model:ir.ui.menu,name:purchase.menu_purchase_uom_form_action
msgid "Units of Measure"
@@ -1034,18 +1105,12 @@ msgid "Manage pricelist per supplier"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:833
-#, python-format
-msgid "Purchase Order has been set to <b>draft</b>."
-msgstr ""
-
-#. module: purchase
#: view:board.board:0
msgid "Purchase Dashboard"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:566
+#: code:addons/purchase/purchase.py:580
#, python-format
msgid "First cancel all receptions related to this purchase order."
msgstr ""
@@ -1084,8 +1149,8 @@ msgid "Unread Messages"
msgstr ""
#. module: purchase
-#: view:purchase.order.line_invoice:0
-msgid "Select an Open Sale Order"
+#: model:ir.ui.menu,name:purchase.menu_purchase_uom_categ_form_action
+msgid "Unit of Measure Categories"
msgstr ""
#. module: purchase
@@ -1094,6 +1159,13 @@ msgid "Set to Draft"
msgstr "Ορισμός σε Πρόχειρη"
#. module: purchase
+#: help:purchase.order,origin:0
+msgid ""
+"Reference of the document that generated this purchase order request; a "
+"sales order or an internal procurement request."
+msgstr ""
+
+#. module: purchase
#: view:purchase.order.line:0
msgid "Notes"
msgstr "Σημειώσεις"
@@ -1123,7 +1195,7 @@ msgid "Stock Move"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:255
+#: code:addons/purchase/purchase.py:260
#, python-format
msgid "Invalid Action!"
msgstr ""
@@ -1222,7 +1294,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:310
+#: code:addons/purchase/purchase.py:320
#, python-format
msgid "Please create Invoices."
msgstr ""
@@ -1312,7 +1384,7 @@ msgid "Purchase Order Line Make Invoice"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1133
+#: code:addons/purchase/purchase.py:1141
#, python-format
msgid "PO: %s"
msgstr ""
@@ -1323,7 +1395,7 @@ msgid "Send by EMail"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:498
+#: code:addons/purchase/purchase.py:515
#, python-format
msgid "Define purchase journal for this company: \"%s\" (id:%d)."
msgstr ""
@@ -1334,8 +1406,8 @@ msgid "Purchase Order "
msgstr ""
#. module: purchase
-#: view:purchase.order.line:0
-msgid "Manual Invoices"
+#: help:purchase.config.settings,group_costing_method:0
+msgid "Allows you to compute product cost price based on average cost."
msgstr ""
#. module: purchase
@@ -1490,8 +1562,8 @@ msgid "Compute product cost price based on average cost"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:340
-#: code:addons/purchase/wizard/purchase_line_invoice.py:141
+#: code:addons/purchase/purchase.py:350
+#: code:addons/purchase/wizard/purchase_line_invoice.py:137
#: model:ir.actions.act_window,name:purchase.act_res_partner_2_supplier_invoices
#: view:res.partner:0
#, python-format
@@ -1603,8 +1675,9 @@ msgid "Open Purchase Menu"
msgstr ""
#. module: purchase
-#: model:ir.model,name:purchase.model_mail_compose_message
-msgid "Email composition wizard"
+#: code:addons/purchase/purchase.py:1028
+#, python-format
+msgid "No address defined for the supplier"
msgstr ""
#. module: purchase
@@ -1677,11 +1750,11 @@ msgid "Purchase Order"
msgstr "Παραγγελία Αγοράς"
#. module: purchase
-#: code:addons/purchase/purchase.py:310
-#: code:addons/purchase/purchase.py:437
-#: code:addons/purchase/purchase.py:497
-#: code:addons/purchase/purchase.py:508
-#: code:addons/purchase/wizard/purchase_line_invoice.py:109
+#: code:addons/purchase/purchase.py:320
+#: code:addons/purchase/purchase.py:456
+#: code:addons/purchase/purchase.py:514
+#: code:addons/purchase/purchase.py:525
+#: code:addons/purchase/wizard/purchase_line_invoice.py:105
#, python-format
msgid "Error!"
msgstr ""
@@ -1703,13 +1776,6 @@ msgid ""
msgstr ""
#. module: purchase
-#: model:process.transition,note:purchase.process_transition_packinginvoice0
-msgid ""
-"A Pick list generates an invoice. Depending on the Invoicing control of the "
-"sale order, the invoice is based on delivered or on ordered quantities."
-msgstr ""
-
-#. module: purchase
#: selection:purchase.order,state:0
#: selection:purchase.order.line,state:0
#: selection:purchase.report,state:0
@@ -1722,9 +1788,8 @@ msgid "# of Purchase Order"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:827
-#, python-format
-msgid "Shipment <b>received</b>."
+#: model:ir.model,name:purchase.model_mail_compose_message
+msgid "Email composition wizard"
msgstr ""
#. module: purchase
@@ -1808,7 +1873,7 @@ msgid "RFQ_${(object.name or '').replace('/','_')}"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:988
+#: code:addons/purchase/purchase.py:956
#, python-format
msgid "The selected supplier only sells this product by %s"
msgstr ""
@@ -1854,6 +1919,12 @@ msgid "Outgoing products to invoice"
msgstr ""
#. module: purchase
+#: report:purchase.order:0
+#: field:purchase.report,validator:0
+msgid "Validated By"
+msgstr "Επικυρωμένο Από"
+
+#. module: purchase
#: view:purchase.report:0
#: field:purchase.report,delay_pass:0
msgid "Days to Deliver"
@@ -1943,8 +2014,8 @@ msgid "November"
msgstr ""
#. module: purchase
-#: help:purchase.config.settings,group_costing_method:0
-msgid "Allows you to compute product cost price based on average cost."
+#: view:purchase.order.line:0
+msgid "Manual Invoices"
msgstr ""
#. module: purchase
@@ -1968,13 +2039,6 @@ msgid ""
msgstr ""
#. module: purchase
-#: help:purchase.order,origin:0
-msgid ""
-"Reference of the document that generated this purchase order request; a sale "
-"order or an internal procurement request."
-msgstr ""
-
-#. module: purchase
#: model:ir.ui.menu,name:purchase.menu_partner_categories_in_form
msgid "Partner Categories"
msgstr ""
@@ -1995,89 +2059,6 @@ msgid "Invoicing Settings"
msgstr ""
#. module: purchase
-#: model:email.template,body_html:purchase.email_template_edi_purchase
-msgid ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"\n"
-" <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
-"or ''},</p>\n"
-" \n"
-" <p>Here is a ${object.state in ('draft', 'sent') and 'request for "
-"quotation' or 'purchase order confirmation'} from ${object.company_id.name}: "
-"</p>\n"
-" \n"
-" <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
-" &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
-" &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
-" &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
-"${object.pricelist_id.currency_id.name}</strong><br />\n"
-" &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
-" % if object.origin:\n"
-" &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
-" % endif\n"
-" % if object.partner_ref:\n"
-" &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
-" % endif\n"
-" % if object.validator:\n"
-" &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.validator.email "
-"or ''}?subject=Order%20${object.name}\">${object.validator.name}</a>\n"
-" % endif\n"
-" </p>\n"
-"\n"
-" <br/>\n"
-" <p>If you have any question, do not hesitate to contact us.</p>\n"
-" <p>Thank you!</p>\n"
-" <br/>\n"
-" <br/>\n"
-" <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
-"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
-"background-repeat: repeat no-repeat;\">\n"
-" <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
-"#FFF;\">\n"
-" <strong style=\"text-"
-"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
-" </div>\n"
-" <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
-"16px; background-color: #F2F2F2;\">\n"
-" <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
-" % if object.company_id.street:\n"
-" ${object.company_id.street}<br/>\n"
-" % endif\n"
-" % if object.company_id.street2:\n"
-" ${object.company_id.street2}<br/>\n"
-" % endif\n"
-" % if object.company_id.city or object.company_id.zip:\n"
-" ${object.company_id.zip} ${object.company_id.city}<br/>\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 ''}<br/>\n"
-" % endif\n"
-" </span>\n"
-" % if object.company_id.phone:\n"
-" <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
-"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
-"0px; padding-left: 0px; \">\n"
-" Phone:&nbsp; ${object.company_id.phone}\n"
-" </div>\n"
-" % endif\n"
-" % if object.company_id.website:\n"
-" <div>\n"
-" Web :&nbsp;<a "
-"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
-" </div>\n"
-" %endif\n"
-" <p></p>\n"
-" </div>\n"
-"</div>\n"
-" "
-msgstr ""
-
-#. module: purchase
#: model:ir.actions.act_window,name:purchase.action_purchase_order_by_user_all
msgid "Total Orders by User per month"
msgstr ""
@@ -2088,21 +2069,19 @@ msgid "Based on incoming shipments"
msgstr ""
#. module: purchase
+#: code:addons/purchase/purchase.py:1018
+#, python-format
+msgid "No default supplier defined for this product"
+msgstr ""
+
+#. module: purchase
#: view:purchase.report:0
#: field:purchase.report,warehouse_id:0
msgid "Warehouse"
msgstr "Αποθήκη"
#. module: purchase
-#: help:purchase.order,partner_ref:0
-msgid ""
-"Reference of the sale order or quotation sent by your supplier. It's mainly "
-"used to do the matching when you receive the products as this reference is "
-"usually written on the delivery order sent by your supplier."
-msgstr ""
-
-#. module: purchase
-#: code:addons/purchase/purchase.py:991
+#: code:addons/purchase/purchase.py:960
#, python-format
msgid ""
"The selected supplier has a minimal quantity set to %s %s, you should not "
@@ -2175,8 +2154,8 @@ msgid ""
msgstr ""
#. module: purchase
-#: view:product.product:0
-msgid "When you sell this service to a customer,"
+#: field:purchase.order,message_summary:0
+msgid "Summary"
msgstr ""
#. module: purchase
@@ -2186,6 +2165,11 @@ msgid "Pricelist Versions"
msgstr ""
#. module: purchase
+#: field:purchase.order,payment_term_id:0
+msgid "Payment Term"
+msgstr ""
+
+#. module: purchase
#: view:purchase.order:0
msgid "Purchase orders which are in draft state"
msgstr ""
diff --git a/addons/purchase/i18n/en_GB.po b/addons/purchase/i18n/en_GB.po
index 977841deaf8..82173e89394 100644
--- a/addons/purchase/i18n/en_GB.po
+++ b/addons/purchase/i18n/en_GB.po
@@ -7,15 +7,15 @@ msgid ""
msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
"PO-Revision-Date: 2012-05-10 17:31+0000\n"
"Last-Translator: Raphael Collet (OpenERP) <Unknown>\n"
"Language-Team: English (United Kingdom) <en_GB@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: 2012-12-04 05:12+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:20+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
#. module: purchase
#: model:res.groups,name:purchase.group_analytic_accounting
@@ -61,11 +61,6 @@ msgstr ""
"computes the supplier price for the selected products/quantities."
#. module: purchase
-#: model:ir.actions.server,name:purchase.actions_server_purchase_order_read
-msgid "Purchase: Mark read"
-msgstr ""
-
-#. module: purchase
#: view:purchase.report:0
#: field:purchase.report,day:0
msgid "Day"
@@ -106,16 +101,13 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:973
-#: code:addons/purchase/purchase.py:988
-#: code:addons/purchase/purchase.py:991
-#: code:addons/purchase/wizard/purchase_order_group.py:47
+#: code:addons/purchase/purchase.py:1024
#, python-format
-msgid "Warning!"
+msgid "Configuration Error!"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:573
+#: code:addons/purchase/purchase.py:587
#, python-format
msgid "You must first cancel all receptions related to this purchase order."
msgstr "You must first cancel all receptions related to this purchase order."
@@ -132,10 +124,10 @@ msgid "Purchase-Standard Price"
msgstr ""
#. module: purchase
-#: report:purchase.order:0
-#: field:purchase.report,validator:0
-msgid "Validated By"
-msgstr "Validated By"
+#: code:addons/purchase/purchase.py:1011
+#, python-format
+msgid "No supplier defined for this product !"
+msgstr ""
#. module: purchase
#: model:ir.actions.act_window,help:purchase.action_picking_tree4_picking_to_invoice
@@ -158,12 +150,6 @@ msgid "Average Price"
msgstr "Average Price"
#. module: purchase
-#: code:addons/purchase/purchase.py:830
-#, python-format
-msgid "Invoice <b>paid</b>."
-msgstr ""
-
-#. module: purchase
#: view:purchase.order:0
msgid "Purchase order which are in the exception state"
msgstr "Purchase order which are in the exception state"
@@ -235,7 +221,7 @@ msgstr ""
"products."
#. module: purchase
-#: code:addons/purchase/purchase.py:255
+#: code:addons/purchase/purchase.py:260
#, python-format
msgid "In order to delete a purchase order, you must cancel it first."
msgstr ""
@@ -261,29 +247,12 @@ msgid "Total Untaxed amount"
msgstr "Total Untaxed amount"
#. module: purchase
-#: model:ir.ui.menu,name:purchase.menu_purchase_uom_categ_form_action
-msgid "Unit of Measure Categories"
-msgstr ""
-
-#. module: purchase
#: view:purchase.report:0
#: field:purchase.report,category_id:0
msgid "Category"
msgstr "Category"
#. module: purchase
-#: view:purchase.order:0
-msgid "Quotation "
-msgstr ""
-
-#. module: purchase
-#: code:addons/purchase/purchase.py:810
-#, python-format
-msgid ""
-"Quotation for <em>%s</em> <b>converted</b> to a Purchase Order of %s %s."
-msgstr ""
-
-#. module: purchase
#: model:process.transition,note:purchase.process_transition_purchaseinvoice0
msgid ""
"A purchase order generates a supplier invoice, as soon as it is confirmed by "
@@ -351,14 +320,16 @@ msgid "October"
msgstr "October"
#. module: purchase
-#: code:addons/purchase/purchase.py:837
+#: code:addons/purchase/purchase.py:1024
#, python-format
-msgid "Purchase Order for <em>%s</em> <b>cancelled</b>."
+msgid ""
+"The product \"%s\" has been defined with your company as reseller which "
+"seems to be a configuration error!"
msgstr ""
#. module: purchase
-#: field:purchase.order,message_summary:0
-msgid "Summary"
+#: view:product.product:0
+msgid "When you sell this service to a customer,"
msgstr ""
#. module: purchase
@@ -387,12 +358,6 @@ msgid "Quantity"
msgstr "Quantity"
#. module: purchase
-#: code:addons/purchase/purchase.py:819
-#, python-format
-msgid "Shipment <em>%s</em> <b>scheduled</b> for %s."
-msgstr ""
-
-#. module: purchase
#: field:purchase.order,fiscal_position:0
msgid "Fiscal Position"
msgstr "Fiscal Position"
@@ -450,12 +415,6 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:824
-#, python-format
-msgid "Draft Invoice of %s %s is <b>waiting for validation</b>."
-msgstr ""
-
-#. module: purchase
#: model:ir.actions.act_window,help:purchase.purchase_line_form_action2
msgid ""
"<p>\n"
@@ -476,6 +435,11 @@ msgid "Scheduled Date"
msgstr ""
#. module: purchase
+#: field:purchase.order,currency_id:0
+msgid "Currency"
+msgstr ""
+
+#. module: purchase
#: field:purchase.order,journal_id:0
msgid "Journal"
msgstr ""
@@ -508,6 +472,19 @@ msgid "Incoming Products"
msgstr ""
#. module: purchase
+#: view:purchase.order:0
+msgid "Request for Quotation "
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,partner_ref:0
+msgid ""
+"Reference of the sales order or quotation sent by your supplier. It's mainly "
+"used to do the matching when you receive the products as this reference is "
+"usually written on the delivery order sent by your supplier."
+msgstr ""
+
+#. module: purchase
#: view:purchase.config.settings:0
#: view:purchase.order.group:0
#: view:purchase.order.line_invoice:0
@@ -531,6 +508,11 @@ msgstr ""
"accountant (Invoice control = Manual)."
#. module: purchase
+#: model:mail.message.subtype,name:purchase.mt_rfq_approved
+msgid "RFQ Approved"
+msgstr ""
+
+#. module: purchase
#: view:purchase.config.settings:0
msgid "Apply"
msgstr ""
@@ -550,6 +532,11 @@ msgstr ""
"becomes a confirmed Purchase Order."
#. module: purchase
+#: model:mail.message.subtype,name:purchase.mt_rfq_confirmed
+msgid "RFQ Confirmed"
+msgstr ""
+
+#. module: purchase
#: view:purchase.order:0
msgid "Customer Address"
msgstr ""
@@ -574,7 +561,7 @@ msgid "Supplier"
msgstr "Supplier"
#. module: purchase
-#: code:addons/purchase/purchase.py:508
+#: code:addons/purchase/purchase.py:525
#, python-format
msgid "Define expense account for this company: \"%s\" (id:%d)."
msgstr ""
@@ -598,7 +585,6 @@ msgstr "Subtotal"
#. module: purchase
#: field:purchase.order,shipped:0
-#: field:purchase.order,shipped_rate:0
msgid "Received"
msgstr "Received"
@@ -640,13 +626,20 @@ msgid "Invoices and Receptions"
msgstr ""
#. module: purchase
+#: model:process.transition,note:purchase.process_transition_packinginvoice0
+msgid ""
+"A Pick list generates an invoice. Depending on the Invoicing control of the "
+"sales order, the invoice is based on delivered or on ordered quantities."
+msgstr ""
+
+#. module: purchase
#: view:purchase.report:0
#: field:purchase.report,nbr:0
msgid "# of Lines"
msgstr "# of Lines"
#. module: purchase
-#: code:addons/purchase/wizard/purchase_line_invoice.py:110
+#: code:addons/purchase/wizard/purchase_line_invoice.py:106
#, python-format
msgid "Define expense account for this product: \"%s\" (id:%d)."
msgstr ""
@@ -667,8 +660,8 @@ msgid "It indicates that a picking has been done"
msgstr "It indicates that a picking has been done"
#. module: purchase
-#: code:addons/purchase/purchase.py:565
-#: code:addons/purchase/purchase.py:572
+#: code:addons/purchase/purchase.py:579
+#: code:addons/purchase/purchase.py:586
#, python-format
msgid "Unable to cancel this purchase order."
msgstr ""
@@ -733,6 +726,15 @@ msgid "Draft PO"
msgstr ""
#. module: purchase
+#: code:addons/purchase/purchase.py:941
+#: code:addons/purchase/purchase.py:956
+#: code:addons/purchase/purchase.py:960
+#: code:addons/purchase/wizard/purchase_order_group.py:47
+#, python-format
+msgid "Warning!"
+msgstr ""
+
+#. module: purchase
#: model:process.node,name:purchase.process_node_draftpurchaseorder0
#: model:process.node,name:purchase.process_node_draftpurchaseorder1
msgid "RFQ"
@@ -764,6 +766,11 @@ msgid "The tax amount"
msgstr "The tax amount"
#. module: purchase
+#: field:purchase.order,shipped_rate:0
+msgid "Received Ratio"
+msgstr ""
+
+#. module: purchase
#: selection:purchase.report,month:0
msgid "September"
msgstr "September"
@@ -795,7 +802,7 @@ msgid "Stock Moves"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1158
+#: code:addons/purchase/purchase.py:1156
#, python-format
msgid "Draft Purchase Order created"
msgstr ""
@@ -816,11 +823,6 @@ msgid "Terms and Conditions"
msgstr ""
#. module: purchase
-#: field:purchase.order,currency_id:0
-msgid "unknown"
-msgstr ""
-
-#. module: purchase
#: help:purchase.order,date_order:0
msgid "Date on which this document has been created."
msgstr "Date on which this document has been created."
@@ -914,12 +916,6 @@ msgid "Cancel"
msgstr "Cancel"
#. module: purchase
-#: field:purchase.order,message_comment_ids:0
-#: help:purchase.order,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
-#. module: purchase
#: sql_constraint:purchase.order:0
msgid "Order Reference must be unique per Company!"
msgstr "Order Reference must be unique per Company!"
@@ -953,14 +949,89 @@ msgid "Date Approved"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:806
-#, python-format
-msgid "Request for quotation <b>created</b>."
+#: view:product.product:0
+msgid "a draft purchase order"
msgstr ""
#. module: purchase
-#: view:product.product:0
-msgid "a draft purchase order"
+#: model:email.template,body_html:purchase.email_template_edi_purchase
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: #FFF; \">\n"
+"\n"
+" <p>Hello$ ${object.partner_id.name},</p>\n"
+" \n"
+" <p>Here is a ${object.state in ('draft', 'sent') and 'request for "
+"quotation' or 'purchase order confirmation'} from ${object.company_id.name}: "
+"</p>\n"
+" \n"
+" <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
+" &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
+" &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
+" &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
+"${object.pricelist_id.currency_id.name}</strong><br />\n"
+" &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
+" % if object.origin:\n"
+" &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
+" % endif\n"
+" % if object.partner_ref:\n"
+" &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
+" % endif\n"
+" % if object.validator:\n"
+" &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.validator.email "
+"or ''}?subject=Order%20${object.name}\">${object.validator.name}</a>\n"
+" % endif\n"
+" </p>\n"
+"\n"
+" <br/>\n"
+" <p>If you have any question, do not hesitate to contact us.</p>\n"
+" <p>Thank you!</p>\n"
+" <br/>\n"
+" <br/>\n"
+" <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
+"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
+"background-repeat: repeat no-repeat;\">\n"
+" <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
+"#DDD;\">\n"
+" <strong style=\"text-"
+"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
+" </div>\n"
+" <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
+"16px; background-color: #F2F2F2;\">\n"
+" <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
+" % if object.company_id.street:\n"
+" ${object.company_id.street}<br/>\n"
+" % endif\n"
+" % if object.company_id.street2:\n"
+" ${object.company_id.street2}<br/>\n"
+" % endif\n"
+" % if object.company_id.city or object.company_id.zip:\n"
+" ${object.company_id.zip} ${object.company_id.city}<br/>\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 ''}<br/>\n"
+" % endif\n"
+" </span>\n"
+" % if object.company_id.phone:\n"
+" <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
+"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
+"0px; padding-left: 0px; \">\n"
+" Phone:&nbsp; ${object.company_id.phone}\n"
+" </div>\n"
+" % endif\n"
+" % if object.company_id.website:\n"
+" <div>\n"
+" Web :&nbsp;<a "
+"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
+" </div>\n"
+" %endif\n"
+" <p></p>\n"
+" </div>\n"
+"</div>\n"
+" "
msgstr ""
#. module: purchase
@@ -1000,17 +1071,12 @@ msgid "Outgoing Mails"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:437
+#: code:addons/purchase/purchase.py:456
#, python-format
msgid "You cannot confirm a purchase order without any purchase order line."
msgstr ""
#. module: purchase
-#: model:ir.actions.server,name:purchase.actions_server_purchase_order_unread
-msgid "Purchase: Mark unread"
-msgstr ""
-
-#. module: purchase
#: help:purchase.order,message_ids:0
msgid "Messages and communication history"
msgstr ""
@@ -1022,7 +1088,7 @@ msgid "Destination Warehouse"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:973
+#: code:addons/purchase/purchase.py:941
#, python-format
msgid ""
"Selected Unit of Measure does not belong to the same category as the product "
@@ -1030,6 +1096,11 @@ msgid ""
msgstr ""
#. module: purchase
+#: view:purchase.order.line_invoice:0
+msgid "Select an Open Sales Order"
+msgstr ""
+
+#. module: purchase
#: model:ir.ui.menu,name:purchase.menu_purchase_unit_measure_purchase
#: model:ir.ui.menu,name:purchase.menu_purchase_uom_form_action
msgid "Units of Measure"
@@ -1041,18 +1112,12 @@ msgid "Manage pricelist per supplier"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:833
-#, python-format
-msgid "Purchase Order has been set to <b>draft</b>."
-msgstr ""
-
-#. module: purchase
#: view:board.board:0
msgid "Purchase Dashboard"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:566
+#: code:addons/purchase/purchase.py:580
#, python-format
msgid "First cancel all receptions related to this purchase order."
msgstr ""
@@ -1091,9 +1156,9 @@ msgid "Unread Messages"
msgstr ""
#. module: purchase
-#: view:purchase.order.line_invoice:0
-msgid "Select an Open Sale Order"
-msgstr "Select an Open Sale Order"
+#: model:ir.ui.menu,name:purchase.menu_purchase_uom_categ_form_action
+msgid "Unit of Measure Categories"
+msgstr ""
#. module: purchase
#: view:purchase.order:0
@@ -1101,6 +1166,13 @@ msgid "Set to Draft"
msgstr "Set to Draft"
#. module: purchase
+#: help:purchase.order,origin:0
+msgid ""
+"Reference of the document that generated this purchase order request; a "
+"sales order or an internal procurement request."
+msgstr ""
+
+#. module: purchase
#: view:purchase.order.line:0
msgid "Notes"
msgstr "Notes"
@@ -1130,7 +1202,7 @@ msgid "Stock Move"
msgstr "Stock Move"
#. module: purchase
-#: code:addons/purchase/purchase.py:255
+#: code:addons/purchase/purchase.py:260
#, python-format
msgid "Invalid Action!"
msgstr ""
@@ -1232,7 +1304,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:310
+#: code:addons/purchase/purchase.py:320
#, python-format
msgid "Please create Invoices."
msgstr ""
@@ -1322,7 +1394,7 @@ msgid "Purchase Order Line Make Invoice"
msgstr "Purchase Order Line Make Invoice"
#. module: purchase
-#: code:addons/purchase/purchase.py:1133
+#: code:addons/purchase/purchase.py:1141
#, python-format
msgid "PO: %s"
msgstr "PO: %s"
@@ -1333,7 +1405,7 @@ msgid "Send by EMail"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:498
+#: code:addons/purchase/purchase.py:515
#, python-format
msgid "Define purchase journal for this company: \"%s\" (id:%d)."
msgstr ""
@@ -1344,9 +1416,9 @@ msgid "Purchase Order "
msgstr ""
#. module: purchase
-#: view:purchase.order.line:0
-msgid "Manual Invoices"
-msgstr "Manual Invoices"
+#: help:purchase.config.settings,group_costing_method:0
+msgid "Allows you to compute product cost price based on average cost."
+msgstr ""
#. module: purchase
#: model:ir.actions.act_window,name:purchase.action_purchase_configuration
@@ -1500,8 +1572,8 @@ msgid "Compute product cost price based on average cost"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:340
-#: code:addons/purchase/wizard/purchase_line_invoice.py:141
+#: code:addons/purchase/purchase.py:350
+#: code:addons/purchase/wizard/purchase_line_invoice.py:137
#: model:ir.actions.act_window,name:purchase.act_res_partner_2_supplier_invoices
#: view:res.partner:0
#, python-format
@@ -1613,8 +1685,9 @@ msgid "Open Purchase Menu"
msgstr ""
#. module: purchase
-#: model:ir.model,name:purchase.model_mail_compose_message
-msgid "Email composition wizard"
+#: code:addons/purchase/purchase.py:1028
+#, python-format
+msgid "No address defined for the supplier"
msgstr ""
#. module: purchase
@@ -1687,11 +1760,11 @@ msgid "Purchase Order"
msgstr "Purchase Order"
#. module: purchase
-#: code:addons/purchase/purchase.py:310
-#: code:addons/purchase/purchase.py:437
-#: code:addons/purchase/purchase.py:497
-#: code:addons/purchase/purchase.py:508
-#: code:addons/purchase/wizard/purchase_line_invoice.py:109
+#: code:addons/purchase/purchase.py:320
+#: code:addons/purchase/purchase.py:456
+#: code:addons/purchase/purchase.py:514
+#: code:addons/purchase/purchase.py:525
+#: code:addons/purchase/wizard/purchase_line_invoice.py:105
#, python-format
msgid "Error!"
msgstr ""
@@ -1713,15 +1786,6 @@ msgid ""
msgstr ""
#. module: purchase
-#: model:process.transition,note:purchase.process_transition_packinginvoice0
-msgid ""
-"A Pick list generates an invoice. Depending on the Invoicing control of the "
-"sale order, the invoice is based on delivered or on ordered quantities."
-msgstr ""
-"A Pick list generates an invoice. Depending on the Invoicing control of the "
-"sale order, the invoice is based on delivered or on ordered quantities."
-
-#. module: purchase
#: selection:purchase.order,state:0
#: selection:purchase.order.line,state:0
#: selection:purchase.report,state:0
@@ -1734,9 +1798,8 @@ msgid "# of Purchase Order"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:827
-#, python-format
-msgid "Shipment <b>received</b>."
+#: model:ir.model,name:purchase.model_mail_compose_message
+msgid "Email composition wizard"
msgstr ""
#. module: purchase
@@ -1826,7 +1889,7 @@ msgid "RFQ_${(object.name or '').replace('/','_')}"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:988
+#: code:addons/purchase/purchase.py:956
#, python-format
msgid "The selected supplier only sells this product by %s"
msgstr "The selected supplier only sells this product by %s"
@@ -1872,6 +1935,12 @@ msgid "Outgoing products to invoice"
msgstr "Outgoing products to invoice"
#. module: purchase
+#: report:purchase.order:0
+#: field:purchase.report,validator:0
+msgid "Validated By"
+msgstr "Validated By"
+
+#. module: purchase
#: view:purchase.report:0
#: field:purchase.report,delay_pass:0
msgid "Days to Deliver"
@@ -1961,9 +2030,9 @@ msgid "November"
msgstr "November"
#. module: purchase
-#: help:purchase.config.settings,group_costing_method:0
-msgid "Allows you to compute product cost price based on average cost."
-msgstr ""
+#: view:purchase.order.line:0
+msgid "Manual Invoices"
+msgstr "Manual Invoices"
#. module: purchase
#: report:purchase.order:0
@@ -1986,13 +2055,6 @@ msgid ""
msgstr ""
#. module: purchase
-#: help:purchase.order,origin:0
-msgid ""
-"Reference of the document that generated this purchase order request; a sale "
-"order or an internal procurement request."
-msgstr ""
-
-#. module: purchase
#: model:ir.ui.menu,name:purchase.menu_partner_categories_in_form
msgid "Partner Categories"
msgstr "Partner Categories"
@@ -2013,89 +2075,6 @@ msgid "Invoicing Settings"
msgstr ""
#. module: purchase
-#: model:email.template,body_html:purchase.email_template_edi_purchase
-msgid ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"\n"
-" <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
-"or ''},</p>\n"
-" \n"
-" <p>Here is a ${object.state in ('draft', 'sent') and 'request for "
-"quotation' or 'purchase order confirmation'} from ${object.company_id.name}: "
-"</p>\n"
-" \n"
-" <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
-" &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
-" &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
-" &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
-"${object.pricelist_id.currency_id.name}</strong><br />\n"
-" &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
-" % if object.origin:\n"
-" &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
-" % endif\n"
-" % if object.partner_ref:\n"
-" &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
-" % endif\n"
-" % if object.validator:\n"
-" &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.validator.email "
-"or ''}?subject=Order%20${object.name}\">${object.validator.name}</a>\n"
-" % endif\n"
-" </p>\n"
-"\n"
-" <br/>\n"
-" <p>If you have any question, do not hesitate to contact us.</p>\n"
-" <p>Thank you!</p>\n"
-" <br/>\n"
-" <br/>\n"
-" <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
-"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
-"background-repeat: repeat no-repeat;\">\n"
-" <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
-"#FFF;\">\n"
-" <strong style=\"text-"
-"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
-" </div>\n"
-" <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
-"16px; background-color: #F2F2F2;\">\n"
-" <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
-" % if object.company_id.street:\n"
-" ${object.company_id.street}<br/>\n"
-" % endif\n"
-" % if object.company_id.street2:\n"
-" ${object.company_id.street2}<br/>\n"
-" % endif\n"
-" % if object.company_id.city or object.company_id.zip:\n"
-" ${object.company_id.zip} ${object.company_id.city}<br/>\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 ''}<br/>\n"
-" % endif\n"
-" </span>\n"
-" % if object.company_id.phone:\n"
-" <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
-"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
-"0px; padding-left: 0px; \">\n"
-" Phone:&nbsp; ${object.company_id.phone}\n"
-" </div>\n"
-" % endif\n"
-" % if object.company_id.website:\n"
-" <div>\n"
-" Web :&nbsp;<a "
-"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
-" </div>\n"
-" %endif\n"
-" <p></p>\n"
-" </div>\n"
-"</div>\n"
-" "
-msgstr ""
-
-#. module: purchase
#: model:ir.actions.act_window,name:purchase.action_purchase_order_by_user_all
msgid "Total Orders by User per month"
msgstr "Total Orders by User per month"
@@ -2106,21 +2085,19 @@ msgid "Based on incoming shipments"
msgstr ""
#. module: purchase
+#: code:addons/purchase/purchase.py:1018
+#, python-format
+msgid "No default supplier defined for this product"
+msgstr ""
+
+#. module: purchase
#: view:purchase.report:0
#: field:purchase.report,warehouse_id:0
msgid "Warehouse"
msgstr "Warehouse"
#. module: purchase
-#: help:purchase.order,partner_ref:0
-msgid ""
-"Reference of the sale order or quotation sent by your supplier. It's mainly "
-"used to do the matching when you receive the products as this reference is "
-"usually written on the delivery order sent by your supplier."
-msgstr ""
-
-#. module: purchase
-#: code:addons/purchase/purchase.py:991
+#: code:addons/purchase/purchase.py:960
#, python-format
msgid ""
"The selected supplier has a minimal quantity set to %s %s, you should not "
@@ -2193,8 +2170,8 @@ msgid ""
msgstr ""
#. module: purchase
-#: view:product.product:0
-msgid "When you sell this service to a customer,"
+#: field:purchase.order,message_summary:0
+msgid "Summary"
msgstr ""
#. module: purchase
@@ -2204,6 +2181,11 @@ msgid "Pricelist Versions"
msgstr ""
#. module: purchase
+#: field:purchase.order,payment_term_id:0
+msgid "Payment Term"
+msgstr ""
+
+#. module: purchase
#: view:purchase.order:0
msgid "Purchase orders which are in draft state"
msgstr ""
@@ -2326,6 +2308,13 @@ msgstr ""
#~ msgid "Origin"
#~ msgstr "Origin"
+#~ msgid ""
+#~ "A Pick list generates an invoice. Depending on the Invoicing control of the "
+#~ "sale order, the invoice is based on delivered or on ordered quantities."
+#~ msgstr ""
+#~ "A Pick list generates an invoice. Depending on the Invoicing control of the "
+#~ "sale order, the invoice is based on delivered or on ordered quantities."
+
#~ msgid "Convert to Purchase Order"
#~ msgstr "Convert to Purchase Order"
@@ -2573,6 +2562,9 @@ msgstr ""
#~ msgid "Current purchases"
#~ msgstr "Current purchases"
+#~ msgid "Select an Open Sale Order"
+#~ msgstr "Select an Open Sale Order"
+
#, python-format
#~ msgid "Purchase amount over the limit"
#~ msgstr "Purchase amount over the limit"
diff --git a/addons/purchase/i18n/es.po b/addons/purchase/i18n/es.po
index eb860f07acb..1b45ca9f48f 100644
--- a/addons/purchase/i18n/es.po
+++ b/addons/purchase/i18n/es.po
@@ -6,14 +6,14 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
-"PO-Revision-Date: 2012-12-18 17:43+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
+"PO-Revision-Date: 2012-12-22 23:11+0000\n"
"Last-Translator: Pedro Manuel Baeza <pedro.baeza@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: 2012-12-19 05:15+0000\n"
+"X-Launchpad-Export-Date: 2012-12-24 04:39+0000\n"
"X-Generator: Launchpad (build 16378)\n"
#. module: purchase
@@ -65,11 +65,6 @@ msgstr ""
"el precio del proveedor para los productos/cantidades seleccionados."
#. module: purchase
-#: model:ir.actions.server,name:purchase.actions_server_purchase_order_read
-msgid "Purchase: Mark read"
-msgstr "Compras: Marcar como leídos"
-
-#. module: purchase
#: view:purchase.report:0
#: field:purchase.report,day:0
msgid "Day"
@@ -112,16 +107,13 @@ msgstr ""
"directamente en formato HTML para poder ser insertado en las vistas kanban."
#. module: purchase
-#: code:addons/purchase/purchase.py:973
-#: code:addons/purchase/purchase.py:988
-#: code:addons/purchase/purchase.py:991
-#: code:addons/purchase/wizard/purchase_order_group.py:47
+#: code:addons/purchase/purchase.py:1024
#, python-format
-msgid "Warning!"
-msgstr "¡Advertencia!"
+msgid "Configuration Error!"
+msgstr "¡Error de configuración!"
#. module: purchase
-#: code:addons/purchase/purchase.py:573
+#: code:addons/purchase/purchase.py:587
#, python-format
msgid "You must first cancel all receptions related to this purchase order."
msgstr ""
@@ -140,10 +132,10 @@ msgid "Purchase-Standard Price"
msgstr "Precio compra-estándar"
#. module: purchase
-#: report:purchase.order:0
-#: field:purchase.report,validator:0
-msgid "Validated By"
-msgstr "Validado por"
+#: code:addons/purchase/purchase.py:1011
+#, python-format
+msgid "No supplier defined for this product !"
+msgstr "¡No se ha definido un proveedor para este producto!"
#. module: purchase
#: model:ir.actions.act_window,help:purchase.action_picking_tree4_picking_to_invoice
@@ -173,12 +165,6 @@ msgid "Average Price"
msgstr "Precio medio"
#. module: purchase
-#: code:addons/purchase/purchase.py:830
-#, python-format
-msgid "Invoice <b>paid</b>."
-msgstr "Factura <b>pagada</b>."
-
-#. module: purchase
#: view:purchase.order:0
msgid "Purchase order which are in the exception state"
msgstr "Pedidos de compra que están en estado de excepción"
@@ -252,7 +238,7 @@ msgstr ""
"las líneas del pedido de compra."
#. module: purchase
-#: code:addons/purchase/purchase.py:255
+#: code:addons/purchase/purchase.py:260
#, python-format
msgid "In order to delete a purchase order, you must cancel it first."
msgstr "Para borrar un pedido de compra, debe cancelarlo primero."
@@ -278,30 +264,12 @@ msgid "Total Untaxed amount"
msgstr "Total importe base"
#. module: purchase
-#: model:ir.ui.menu,name:purchase.menu_purchase_uom_categ_form_action
-msgid "Unit of Measure Categories"
-msgstr "Categorías de las unidades de medida"
-
-#. module: purchase
#: view:purchase.report:0
#: field:purchase.report,category_id:0
msgid "Category"
msgstr "Categoría"
#. module: purchase
-#: view:purchase.order:0
-msgid "Quotation "
-msgstr "Presupuesto "
-
-#. module: purchase
-#: code:addons/purchase/purchase.py:810
-#, python-format
-msgid ""
-"Quotation for <em>%s</em> <b>converted</b> to a Purchase Order of %s %s."
-msgstr ""
-"Presupuesto para <em>%s</em> <b>convertido</b> a pedido de compra de %s %s."
-
-#. module: purchase
#: model:process.transition,note:purchase.process_transition_purchaseinvoice0
msgid ""
"A purchase order generates a supplier invoice, as soon as it is confirmed by "
@@ -381,15 +349,19 @@ msgid "October"
msgstr "Octubre"
#. module: purchase
-#: code:addons/purchase/purchase.py:837
+#: code:addons/purchase/purchase.py:1024
#, python-format
-msgid "Purchase Order for <em>%s</em> <b>cancelled</b>."
-msgstr "El pedido de compra para <em>%s</em> ha sido <b>cancelado</b>."
+msgid ""
+"The product \"%s\" has been defined with your company as reseller which "
+"seems to be a configuration error!"
+msgstr ""
+"¡El producto \"%s\" ha sido definido con su compañía como distribuidor, lo "
+"que debe ser un error de configuración!"
#. module: purchase
-#: field:purchase.order,message_summary:0
-msgid "Summary"
-msgstr "Resumen"
+#: view:product.product:0
+msgid "When you sell this service to a customer,"
+msgstr "Cuando vende este servicio al cliente,"
#. module: purchase
#: model:process.transition,note:purchase.process_transition_createpackinglist0
@@ -417,12 +389,6 @@ msgid "Quantity"
msgstr "Cantidad"
#. module: purchase
-#: code:addons/purchase/purchase.py:819
-#, python-format
-msgid "Shipment <em>%s</em> <b>scheduled</b> for %s."
-msgstr "Envío <em>%s</em> <b>programado</b> para %s."
-
-#. module: purchase
#: field:purchase.order,fiscal_position:0
msgid "Fiscal Position"
msgstr "Posición fiscal"
@@ -491,13 +457,6 @@ msgstr ""
"compañía."
#. module: purchase
-#: code:addons/purchase/purchase.py:824
-#, python-format
-msgid "Draft Invoice of %s %s is <b>waiting for validation</b>."
-msgstr ""
-"La factura en borrador de %s %s esta <b>esperando para validación</b>."
-
-#. module: purchase
#: model:ir.actions.act_window,help:purchase.purchase_line_form_action2
msgid ""
"<p>\n"
@@ -525,6 +484,11 @@ msgid "Scheduled Date"
msgstr "Fecha planificada"
#. module: purchase
+#: field:purchase.order,currency_id:0
+msgid "Currency"
+msgstr "Moneda"
+
+#. module: purchase
#: field:purchase.order,journal_id:0
msgid "Journal"
msgstr "Diario"
@@ -557,6 +521,23 @@ msgid "Incoming Products"
msgstr "Productos a recibir"
#. module: purchase
+#: view:purchase.order:0
+msgid "Request for Quotation "
+msgstr "Solicitud de presupuesto "
+
+#. module: purchase
+#: help:purchase.order,partner_ref:0
+msgid ""
+"Reference of the sales order or quotation sent by your supplier. It's mainly "
+"used to do the matching when you receive the products as this reference is "
+"usually written on the delivery order sent by your supplier."
+msgstr ""
+"Referencia del pedido de venta o presupuesto enviado a su proveedor. Se usa "
+"principalmente para casar documentos cuando recibe los productos, ya que "
+"esta referencia se suele escribir en la orden de entrega enviada por su "
+"proveedor."
+
+#. module: purchase
#: view:purchase.config.settings:0
#: view:purchase.order.group:0
#: view:purchase.order.line_invoice:0
@@ -580,6 +561,11 @@ msgstr ""
"manualmente por el contable (control facturación = Manual)."
#. module: purchase
+#: model:mail.message.subtype,name:purchase.mt_rfq_approved
+msgid "RFQ Approved"
+msgstr "SdP aprobada"
+
+#. module: purchase
#: view:purchase.config.settings:0
msgid "Apply"
msgstr "Aplicar"
@@ -600,6 +586,11 @@ msgstr ""
"confirmado."
#. module: purchase
+#: model:mail.message.subtype,name:purchase.mt_rfq_confirmed
+msgid "RFQ Confirmed"
+msgstr "SdP confirmada"
+
+#. module: purchase
#: view:purchase.order:0
msgid "Customer Address"
msgstr "Dirección de cliente"
@@ -624,7 +615,7 @@ msgid "Supplier"
msgstr "Proveedor"
#. module: purchase
-#: code:addons/purchase/purchase.py:508
+#: code:addons/purchase/purchase.py:525
#, python-format
msgid "Define expense account for this company: \"%s\" (id:%d)."
msgstr "Defina la cuenta de gastos para esta compañía: \"%s\" (id:%d)."
@@ -648,7 +639,6 @@ msgstr "Subtotal"
#. module: purchase
#: field:purchase.order,shipped:0
-#: field:purchase.order,shipped_rate:0
msgid "Received"
msgstr "Recibido"
@@ -699,13 +689,23 @@ msgid "Invoices and Receptions"
msgstr "Facturas y recepciones"
#. module: purchase
+#: model:process.transition,note:purchase.process_transition_packinginvoice0
+msgid ""
+"A Pick list generates an invoice. Depending on the Invoicing control of the "
+"sales order, the invoice is based on delivered or on ordered quantities."
+msgstr ""
+"Un albarán genera una factura. Dependiendo del control de facturación del "
+"pedido de venta, la factura está basada en la cantidad entregada o en la del "
+"pedido."
+
+#. module: purchase
#: view:purchase.report:0
#: field:purchase.report,nbr:0
msgid "# of Lines"
msgstr "Nº de líneas"
#. module: purchase
-#: code:addons/purchase/wizard/purchase_line_invoice.py:110
+#: code:addons/purchase/wizard/purchase_line_invoice.py:106
#, python-format
msgid "Define expense account for this product: \"%s\" (id:%d)."
msgstr "Defina la cuenta de gastos para este producto:\"%s\" (id:%d)."
@@ -726,8 +726,8 @@ msgid "It indicates that a picking has been done"
msgstr "Indica que un albarán ha sido realizado."
#. module: purchase
-#: code:addons/purchase/purchase.py:565
-#: code:addons/purchase/purchase.py:572
+#: code:addons/purchase/purchase.py:579
+#: code:addons/purchase/purchase.py:586
#, python-format
msgid "Unable to cancel this purchase order."
msgstr "No se ha podido cancelar este pedido de compra."
@@ -794,6 +794,15 @@ msgid "Draft PO"
msgstr "OC en borrador"
#. module: purchase
+#: code:addons/purchase/purchase.py:941
+#: code:addons/purchase/purchase.py:956
+#: code:addons/purchase/purchase.py:960
+#: code:addons/purchase/wizard/purchase_order_group.py:47
+#, python-format
+msgid "Warning!"
+msgstr "¡Advertencia!"
+
+#. module: purchase
#: model:process.node,name:purchase.process_node_draftpurchaseorder0
#: model:process.node,name:purchase.process_node_draftpurchaseorder1
msgid "RFQ"
@@ -825,6 +834,11 @@ msgid "The tax amount"
msgstr "El importe de los impuestos."
#. module: purchase
+#: field:purchase.order,shipped_rate:0
+msgid "Received Ratio"
+msgstr "Proporción recibida"
+
+#. module: purchase
#: selection:purchase.report,month:0
msgid "September"
msgstr "Septiembre"
@@ -856,7 +870,7 @@ msgid "Stock Moves"
msgstr "Movimientos de stock"
#. module: purchase
-#: code:addons/purchase/purchase.py:1158
+#: code:addons/purchase/purchase.py:1156
#, python-format
msgid "Draft Purchase Order created"
msgstr "Pedido de compra en borrador creado"
@@ -877,11 +891,6 @@ msgid "Terms and Conditions"
msgstr "Términos y condiciones"
#. module: purchase
-#: field:purchase.order,currency_id:0
-msgid "unknown"
-msgstr "desconocido"
-
-#. module: purchase
#: help:purchase.order,date_order:0
msgid "Date on which this document has been created."
msgstr "Fecha de la creación de este documento."
@@ -975,12 +984,6 @@ msgid "Cancel"
msgstr "Cancelar"
#. module: purchase
-#: field:purchase.order,message_comment_ids:0
-#: help:purchase.order,message_comment_ids:0
-msgid "Comments and emails"
-msgstr "Comentarios y correos"
-
-#. module: purchase
#: sql_constraint:purchase.order:0
msgid "Order Reference must be unique per Company!"
msgstr "¡La referencia de la compra debe ser única por compañía!"
@@ -1014,17 +1017,168 @@ msgid "Date Approved"
msgstr "Fecha aprobación"
#. module: purchase
-#: code:addons/purchase/purchase.py:806
-#, python-format
-msgid "Request for quotation <b>created</b>."
-msgstr "Solicitud de presupuesto <b>creada</b>."
-
-#. module: purchase
#: view:product.product:0
msgid "a draft purchase order"
msgstr "un pedido de compra en borrador"
#. module: purchase
+#: model:email.template,body_html:purchase.email_template_edi_purchase
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: #FFF; \">\n"
+"\n"
+" <p>Hello$ ${object.partner_id.name},</p>\n"
+" \n"
+" <p>Here is a ${object.state in ('draft', 'sent') and 'request for "
+"quotation' or 'purchase order confirmation'} from ${object.company_id.name}: "
+"</p>\n"
+" \n"
+" <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
+" &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
+" &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
+" &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
+"${object.pricelist_id.currency_id.name}</strong><br />\n"
+" &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
+" % if object.origin:\n"
+" &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
+" % endif\n"
+" % if object.partner_ref:\n"
+" &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
+" % endif\n"
+" % if object.validator:\n"
+" &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.validator.email "
+"or ''}?subject=Order%20${object.name}\">${object.validator.name}</a>\n"
+" % endif\n"
+" </p>\n"
+"\n"
+" <br/>\n"
+" <p>If you have any question, do not hesitate to contact us.</p>\n"
+" <p>Thank you!</p>\n"
+" <br/>\n"
+" <br/>\n"
+" <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
+"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
+"background-repeat: repeat no-repeat;\">\n"
+" <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
+"#DDD;\">\n"
+" <strong style=\"text-"
+"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
+" </div>\n"
+" <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
+"16px; background-color: #F2F2F2;\">\n"
+" <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
+" % if object.company_id.street:\n"
+" ${object.company_id.street}<br/>\n"
+" % endif\n"
+" % if object.company_id.street2:\n"
+" ${object.company_id.street2}<br/>\n"
+" % endif\n"
+" % if object.company_id.city or object.company_id.zip:\n"
+" ${object.company_id.zip} ${object.company_id.city}<br/>\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 ''}<br/>\n"
+" % endif\n"
+" </span>\n"
+" % if object.company_id.phone:\n"
+" <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
+"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
+"0px; padding-left: 0px; \">\n"
+" Phone:&nbsp; ${object.company_id.phone}\n"
+" </div>\n"
+" % endif\n"
+" % if object.company_id.website:\n"
+" <div>\n"
+" Web :&nbsp;<a "
+"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
+" </div>\n"
+" %endif\n"
+" <p></p>\n"
+" </div>\n"
+"</div>\n"
+" "
+msgstr ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: #FFF; \">\n"
+"\n"
+" <p>Hola ${object.partner_id.name},</p>\n"
+" \n"
+" <p>Aquí tiene ${object.state in ('draft', 'sent') 'una solicitud de "
+"presupuesto' or 'la confirmación del pedido de compra'} de "
+"${object.company_id.name}: </p>\n"
+" \n"
+" <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
+" &nbsp;&nbsp;<strong>REFERENCIAS</strong><br />\n"
+" &nbsp;&nbsp;Nº de pedido: <strong>${object.name}</strong><br />\n"
+" &nbsp;&nbsp;Total del pedido: <strong>${object.amount_total} "
+"${object.pricelist_id.currency_id.name}</strong><br />\n"
+" &nbsp;&nbsp;Fecha del pedido: ${object.date_order}<br />\n"
+" % if object.origin:\n"
+" &nbsp;&nbsp;Referencia del pedido: ${object.origin}<br />\n"
+" % endif\n"
+" % if object.partner_ref:\n"
+" &nbsp;&nbsp;Su referencia: ${object.partner_ref}<br />\n"
+" % endif\n"
+" % if object.validator:\n"
+" &nbsp;&nbsp;Su contacto: <a href=\"mailto:${object.validator.email or "
+"''}?subject=Pedido%20${object.name}\">${object.validator.name}</a>\n"
+" % endif\n"
+" </p>\n"
+"\n"
+" <br/>\n"
+" <p>Si tiene alguna pregunta, no dude en contactarnos.</p>\n"
+" <p>¡Gracias!</p>\n"
+" <br/>\n"
+" <br/>\n"
+" <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
+"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
+"background-repeat: repeat no-repeat;\">\n"
+" <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
+"#DDD;\">\n"
+" <strong style=\"text-"
+"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
+" </div>\n"
+" <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
+"16px; background-color: #F2F2F2;\">\n"
+" <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
+" % if object.company_id.street:\n"
+" ${object.company_id.street}<br/>\n"
+" % endif\n"
+" % if object.company_id.street2:\n"
+" ${object.company_id.street2}<br/>\n"
+" % endif\n"
+" % if object.company_id.city or object.company_id.zip:\n"
+" ${object.company_id.zip} ${object.company_id.city}<br/>\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 ''}<br/>\n"
+" % endif\n"
+" </span>\n"
+" % if object.company_id.phone:\n"
+" <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
+"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
+"0px; padding-left: 0px; \">\n"
+" Teléfono:&nbsp; ${object.company_id.phone}\n"
+" </div>\n"
+" % endif\n"
+" % if object.company_id.website:\n"
+" <div>\n"
+" Web :&nbsp;<a "
+"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
+" </div>\n"
+" %endif\n"
+" <p></p>\n"
+" </div>\n"
+"</div>\n"
+" "
+
+#. module: purchase
#: view:purchase.report:0
msgid "Order of Year"
msgstr "Pedidos del año"
@@ -1067,17 +1221,12 @@ msgid "Outgoing Mails"
msgstr "Correos salientes"
#. module: purchase
-#: code:addons/purchase/purchase.py:437
+#: code:addons/purchase/purchase.py:456
#, python-format
msgid "You cannot confirm a purchase order without any purchase order line."
msgstr "No puede confirmar un pedido de compra que no tiene líneas."
#. module: purchase
-#: model:ir.actions.server,name:purchase.actions_server_purchase_order_unread
-msgid "Purchase: Mark unread"
-msgstr "Compras: Marcar como no leído"
-
-#. module: purchase
#: help:purchase.order,message_ids:0
msgid "Messages and communication history"
msgstr "Mensajes e historial de comunicación"
@@ -1089,7 +1238,7 @@ msgid "Destination Warehouse"
msgstr "Almacén destino"
#. module: purchase
-#: code:addons/purchase/purchase.py:973
+#: code:addons/purchase/purchase.py:941
#, python-format
msgid ""
"Selected Unit of Measure does not belong to the same category as the product "
@@ -1099,6 +1248,11 @@ msgstr ""
"unidad de medida del producto."
#. module: purchase
+#: view:purchase.order.line_invoice:0
+msgid "Select an Open Sales Order"
+msgstr "Seleccione un pedido de venta abierto"
+
+#. module: purchase
#: model:ir.ui.menu,name:purchase.menu_purchase_unit_measure_purchase
#: model:ir.ui.menu,name:purchase.menu_purchase_uom_form_action
msgid "Units of Measure"
@@ -1110,18 +1264,12 @@ msgid "Manage pricelist per supplier"
msgstr "Gestionar tarifas por proveedor"
#. module: purchase
-#: code:addons/purchase/purchase.py:833
-#, python-format
-msgid "Purchase Order has been set to <b>draft</b>."
-msgstr "El pedido de compra se ha establecido como <b>borrador</b>."
-
-#. module: purchase
#: view:board.board:0
msgid "Purchase Dashboard"
msgstr "Tablero de compras"
#. module: purchase
-#: code:addons/purchase/purchase.py:566
+#: code:addons/purchase/purchase.py:580
#, python-format
msgid "First cancel all receptions related to this purchase order."
msgstr ""
@@ -1161,9 +1309,9 @@ msgid "Unread Messages"
msgstr "Mensajes sin leer"
#. module: purchase
-#: view:purchase.order.line_invoice:0
-msgid "Select an Open Sale Order"
-msgstr "Seleccionar un pedido de compra abierto"
+#: model:ir.ui.menu,name:purchase.menu_purchase_uom_categ_form_action
+msgid "Unit of Measure Categories"
+msgstr "Categorías de las unidades de medida"
#. module: purchase
#: view:purchase.order:0
@@ -1171,6 +1319,15 @@ msgid "Set to Draft"
msgstr "Cambiar a borrador"
#. module: purchase
+#: help:purchase.order,origin:0
+msgid ""
+"Reference of the document that generated this purchase order request; a "
+"sales order or an internal procurement request."
+msgstr ""
+"Referencia del documento que generó esta solicitud de pedido de compra; un "
+"pedido de venta o una petición interna de abastecimiento."
+
+#. module: purchase
#: view:purchase.order.line:0
msgid "Notes"
msgstr "Notas"
@@ -1200,7 +1357,7 @@ msgid "Stock Move"
msgstr "Moviemiento de stock"
#. module: purchase
-#: code:addons/purchase/purchase.py:255
+#: code:addons/purchase/purchase.py:260
#, python-format
msgid "Invalid Action!"
msgstr "¡Acción no válida!"
@@ -1306,7 +1463,7 @@ msgid ""
msgstr "un pedido de compra en borrador"
#. module: purchase
-#: code:addons/purchase/purchase.py:310
+#: code:addons/purchase/purchase.py:320
#, python-format
msgid "Please create Invoices."
msgstr "Por favor, cree facturas."
@@ -1404,7 +1561,7 @@ msgid "Purchase Order Line Make Invoice"
msgstr "Línea pedido de compra realiza factura"
#. module: purchase
-#: code:addons/purchase/purchase.py:1133
+#: code:addons/purchase/purchase.py:1141
#, python-format
msgid "PO: %s"
msgstr "PC: %s"
@@ -1415,7 +1572,7 @@ msgid "Send by EMail"
msgstr "Enviar por correo electrónico"
#. module: purchase
-#: code:addons/purchase/purchase.py:498
+#: code:addons/purchase/purchase.py:515
#, python-format
msgid "Define purchase journal for this company: \"%s\" (id:%d)."
msgstr "Defina el diario de compras para esta compañía: \"%s\" (id: %d)."
@@ -1426,9 +1583,10 @@ msgid "Purchase Order "
msgstr "Pedido de compra "
#. module: purchase
-#: view:purchase.order.line:0
-msgid "Manual Invoices"
-msgstr "Facturas manuales"
+#: help:purchase.config.settings,group_costing_method:0
+msgid "Allows you to compute product cost price based on average cost."
+msgstr ""
+"Permite calcular el precio de coste del producto basado en el coste medio."
#. module: purchase
#: model:ir.actions.act_window,name:purchase.action_purchase_configuration
@@ -1595,8 +1753,8 @@ msgid "Compute product cost price based on average cost"
msgstr "Calcular precio de coste del producto basado en el coste medio"
#. module: purchase
-#: code:addons/purchase/purchase.py:340
-#: code:addons/purchase/wizard/purchase_line_invoice.py:141
+#: code:addons/purchase/purchase.py:350
+#: code:addons/purchase/wizard/purchase_line_invoice.py:137
#: model:ir.actions.act_window,name:purchase.act_res_partner_2_supplier_invoices
#: view:res.partner:0
#, python-format
@@ -1720,9 +1878,10 @@ msgid "Open Purchase Menu"
msgstr "Abrir menú 'Compras'"
#. module: purchase
-#: model:ir.model,name:purchase.model_mail_compose_message
-msgid "Email composition wizard"
-msgstr "Asistente de redacción de correo electrónico."
+#: code:addons/purchase/purchase.py:1028
+#, python-format
+msgid "No address defined for the supplier"
+msgstr "No se ha definido una dirección para el proveedor"
#. module: purchase
#: field:purchase.order,company_id:0
@@ -1794,11 +1953,11 @@ msgid "Purchase Order"
msgstr "Pedido de compra"
#. module: purchase
-#: code:addons/purchase/purchase.py:310
-#: code:addons/purchase/purchase.py:437
-#: code:addons/purchase/purchase.py:497
-#: code:addons/purchase/purchase.py:508
-#: code:addons/purchase/wizard/purchase_line_invoice.py:109
+#: code:addons/purchase/purchase.py:320
+#: code:addons/purchase/purchase.py:456
+#: code:addons/purchase/purchase.py:514
+#: code:addons/purchase/purchase.py:525
+#: code:addons/purchase/wizard/purchase_line_invoice.py:105
#, python-format
msgid "Error!"
msgstr "¡Error!"
@@ -1827,15 +1986,6 @@ msgstr ""
"estado se convierte a en excepción."
#. module: purchase
-#: model:process.transition,note:purchase.process_transition_packinginvoice0
-msgid ""
-"A Pick list generates an invoice. Depending on the Invoicing control of the "
-"sale order, the invoice is based on delivered or on ordered quantities."
-msgstr ""
-"Un albarán genera una factura. Según el control de facturación en el pedido "
-"de venta, la factura se basa en las cantidades enviadas u ordenadas."
-
-#. module: purchase
#: selection:purchase.order,state:0
#: selection:purchase.order.line,state:0
#: selection:purchase.report,state:0
@@ -1848,10 +1998,9 @@ msgid "# of Purchase Order"
msgstr "Nº de pedido de compra"
#. module: purchase
-#: code:addons/purchase/purchase.py:827
-#, python-format
-msgid "Shipment <b>received</b>."
-msgstr "Envío <b>recibido</b>"
+#: model:ir.model,name:purchase.model_mail_compose_message
+msgid "Email composition wizard"
+msgstr "Asistente de redacción de correo electrónico."
#. module: purchase
#: report:purchase.quotation:0
@@ -1946,7 +2095,7 @@ msgid "RFQ_${(object.name or '').replace('/','_')}"
msgstr "PdO_${(object.name or '').replace('/','_')}"
#. module: purchase
-#: code:addons/purchase/purchase.py:988
+#: code:addons/purchase/purchase.py:956
#, python-format
msgid "The selected supplier only sells this product by %s"
msgstr "El proveedor seleccionado sólo vende este producto por %s"
@@ -1995,6 +2144,12 @@ msgid "Outgoing products to invoice"
msgstr "Productos salientes a facturar"
#. module: purchase
+#: report:purchase.order:0
+#: field:purchase.report,validator:0
+msgid "Validated By"
+msgstr "Validado por"
+
+#. module: purchase
#: view:purchase.report:0
#: field:purchase.report,delay_pass:0
msgid "Days to Deliver"
@@ -2084,10 +2239,9 @@ msgid "November"
msgstr "Noviembre"
#. module: purchase
-#: help:purchase.config.settings,group_costing_method:0
-msgid "Allows you to compute product cost price based on average cost."
-msgstr ""
-"Permite calcular el precio de coste del producto basado en el coste medio."
+#: view:purchase.order.line:0
+msgid "Manual Invoices"
+msgstr "Facturas manuales"
#. module: purchase
#: report:purchase.order:0
@@ -2117,15 +2271,6 @@ msgstr ""
"son validadas."
#. module: purchase
-#: help:purchase.order,origin:0
-msgid ""
-"Reference of the document that generated this purchase order request; a sale "
-"order or an internal procurement request."
-msgstr ""
-"Referencia del documento que genera esta petición de pedido de compra: un "
-"pedido de venta o una petición interna de abastecimiento."
-
-#. module: purchase
#: model:ir.ui.menu,name:purchase.menu_partner_categories_in_form
msgid "Partner Categories"
msgstr "Categorías de empresas"
@@ -2146,167 +2291,6 @@ msgid "Invoicing Settings"
msgstr "Configuración de facturación"
#. module: purchase
-#: model:email.template,body_html:purchase.email_template_edi_purchase
-msgid ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"\n"
-" <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
-"or ''},</p>\n"
-" \n"
-" <p>Here is a ${object.state in ('draft', 'sent') and 'request for "
-"quotation' or 'purchase order confirmation'} from ${object.company_id.name}: "
-"</p>\n"
-" \n"
-" <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
-" &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
-" &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
-" &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
-"${object.pricelist_id.currency_id.name}</strong><br />\n"
-" &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
-" % if object.origin:\n"
-" &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
-" % endif\n"
-" % if object.partner_ref:\n"
-" &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
-" % endif\n"
-" % if object.validator:\n"
-" &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.validator.email "
-"or ''}?subject=Order%20${object.name}\">${object.validator.name}</a>\n"
-" % endif\n"
-" </p>\n"
-"\n"
-" <br/>\n"
-" <p>If you have any question, do not hesitate to contact us.</p>\n"
-" <p>Thank you!</p>\n"
-" <br/>\n"
-" <br/>\n"
-" <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
-"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
-"background-repeat: repeat no-repeat;\">\n"
-" <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
-"#FFF;\">\n"
-" <strong style=\"text-"
-"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
-" </div>\n"
-" <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
-"16px; background-color: #F2F2F2;\">\n"
-" <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
-" % if object.company_id.street:\n"
-" ${object.company_id.street}<br/>\n"
-" % endif\n"
-" % if object.company_id.street2:\n"
-" ${object.company_id.street2}<br/>\n"
-" % endif\n"
-" % if object.company_id.city or object.company_id.zip:\n"
-" ${object.company_id.zip} ${object.company_id.city}<br/>\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 ''}<br/>\n"
-" % endif\n"
-" </span>\n"
-" % if object.company_id.phone:\n"
-" <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
-"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
-"0px; padding-left: 0px; \">\n"
-" Phone:&nbsp; ${object.company_id.phone}\n"
-" </div>\n"
-" % endif\n"
-" % if object.company_id.website:\n"
-" <div>\n"
-" Web :&nbsp;<a "
-"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
-" </div>\n"
-" %endif\n"
-" <p></p>\n"
-" </div>\n"
-"</div>\n"
-" "
-msgstr ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"\n"
-" <p>Hola ${object.partner_id.name and ' ' or ''}${object.partner_id.name "
-"or ''},</p>\n"
-" \n"
-" <p>Aquí le enviamos ${object.state in ('draft', 'sent') and 'una "
-"solicitud de presupuesto' or 'una confirmación de pedido de compra'} de "
-"${object.company_id.name}: </p>\n"
-" \n"
-" <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
-" &nbsp;&nbsp;<strong>REFERENCIAS</strong><br />\n"
-" &nbsp;&nbsp;Nº de pedido: <strong>${object.name}</strong><br />\n"
-" &nbsp;&nbsp;Total del pedido: <strong>${object.amount_total} "
-"${object.pricelist_id.currency_id.name}</strong><br />\n"
-" &nbsp;&nbsp;Fecha del pedido: ${object.date_order}<br />\n"
-" % if object.origin:\n"
-" &nbsp;&nbsp;Referencia del pedido: ${object.origin}<br />\n"
-" % endif\n"
-" % if object.partner_ref:\n"
-" &nbsp;&nbsp;Su referencia: ${object.partner_ref}<br />\n"
-" % endif\n"
-" % if object.validator:\n"
-" &nbsp;&nbsp;Su contacto: <a href=\"mailto:${object.validator.email or "
-"''}?subject=Pedido%20${object.name}\">${object.validator.name}</a>\n"
-" % endif\n"
-" </p>\n"
-"\n"
-" <br/>\n"
-" <p>Si tiene alguna duda, no dude en contactarnos.</p>\n"
-" <p>¡Gracias!</p>\n"
-" <br/>\n"
-" <br/>\n"
-" <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
-"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
-"background-repeat: repeat no-repeat;\">\n"
-" <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
-"#FFF;\">\n"
-" <strong style=\"text-"
-"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
-" </div>\n"
-" <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
-"16px; background-color: #F2F2F2;\">\n"
-" <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
-" % if object.company_id.street:\n"
-" ${object.company_id.street}<br/>\n"
-" % endif\n"
-" % if object.company_id.street2:\n"
-" ${object.company_id.street2}<br/>\n"
-" % endif\n"
-" % if object.company_id.city or object.company_id.zip:\n"
-" ${object.company_id.zip} ${object.company_id.city}<br/>\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 ''}<br/>\n"
-" % endif\n"
-" </span>\n"
-" % if object.company_id.phone:\n"
-" <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
-"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
-"0px; padding-left: 0px; \">\n"
-" Teléfono:&nbsp; ${object.company_id.phone}\n"
-" </div>\n"
-" % endif\n"
-" % if object.company_id.website:\n"
-" <div>\n"
-" Web :&nbsp;<a "
-"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
-" </div>\n"
-" %endif\n"
-" <p></p>\n"
-" </div>\n"
-"</div>\n"
-" "
-
-#. module: purchase
#: model:ir.actions.act_window,name:purchase.action_purchase_order_by_user_all
msgid "Total Orders by User per month"
msgstr "Total pedidos por usuario mensual"
@@ -2317,25 +2301,19 @@ msgid "Based on incoming shipments"
msgstr "Basado en envíos entrantes"
#. module: purchase
+#: code:addons/purchase/purchase.py:1018
+#, python-format
+msgid "No default supplier defined for this product"
+msgstr "No hay definido ningún proveedor por defecto para este producto"
+
+#. module: purchase
#: view:purchase.report:0
#: field:purchase.report,warehouse_id:0
msgid "Warehouse"
msgstr "Almacén"
#. module: purchase
-#: help:purchase.order,partner_ref:0
-msgid ""
-"Reference of the sale order or quotation sent by your supplier. It's mainly "
-"used to do the matching when you receive the products as this reference is "
-"usually written on the delivery order sent by your supplier."
-msgstr ""
-"Referencia del pedido de venta o presupuesto enviado por el proveedor. Se "
-"usa principalmente para casar documentos cuando recibe los productos, ya que "
-"esta referencia se escribe habitualmente en la orden de entrega enviada por "
-"el proveedor."
-
-#. module: purchase
-#: code:addons/purchase/purchase.py:991
+#: code:addons/purchase/purchase.py:960
#, python-format
msgid ""
"The selected supplier has a minimal quantity set to %s %s, you should not "
@@ -2422,9 +2400,9 @@ msgstr ""
" "
#. module: purchase
-#: view:product.product:0
-msgid "When you sell this service to a customer,"
-msgstr "Cuando vende este servicio al cliente,"
+#: field:purchase.order,message_summary:0
+msgid "Summary"
+msgstr "Resumen"
#. module: purchase
#: model:ir.actions.act_window,name:purchase.purchase_pricelist_version_action
@@ -2433,6 +2411,11 @@ msgid "Pricelist Versions"
msgstr "Versiones de tarifa"
#. module: purchase
+#: field:purchase.order,payment_term_id:0
+msgid "Payment Term"
+msgstr "Plazo de pago"
+
+#. module: purchase
#: view:purchase.order:0
msgid "Purchase orders which are in draft state"
msgstr "Pedidos de compra que están en estado borrador"
@@ -2847,6 +2830,9 @@ msgstr "Pedidos"
#~ msgstr ""
#~ "No puede confirmar un pedido de compra sin líneas de pedido de compra"
+#~ msgid "Select an Open Sale Order"
+#~ msgstr "Seleccionar un pedido de compra abierto"
+
#~ msgid "Do you want to generate the supplier invoices ?"
#~ msgstr "¿Desea generar las facturas de proveedor?"
@@ -2874,6 +2860,13 @@ msgstr "Pedidos"
#~ msgid "Current purchases"
#~ msgstr "Compras actuales"
+#~ msgid ""
+#~ "A Pick list generates an invoice. Depending on the Invoicing control of the "
+#~ "sale order, the invoice is based on delivered or on ordered quantities."
+#~ msgstr ""
+#~ "Un albarán genera una factura. Según el control de facturación en el pedido "
+#~ "de venta, la factura se basa en las cantidades enviadas u ordenadas."
+
#, python-format
#~ msgid "Purchase amount over the limit"
#~ msgstr "Importe de compra por encima del límite"
diff --git a/addons/purchase/i18n/es_AR.po b/addons/purchase/i18n/es_AR.po
index 84ee2f81707..8641294e97a 100644
--- a/addons/purchase/i18n/es_AR.po
+++ b/addons/purchase/i18n/es_AR.po
@@ -6,15 +6,15 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 5.0.0\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
"PO-Revision-Date: 2009-09-23 15:07+0000\n"
"Last-Translator: Julieta Catalano <jcatalano@thymbra.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: 2012-12-04 05:12+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:20+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
#. module: purchase
#: model:res.groups,name:purchase.group_analytic_accounting
@@ -61,11 +61,6 @@ msgstr ""
"seleccionados."
#. module: purchase
-#: model:ir.actions.server,name:purchase.actions_server_purchase_order_read
-msgid "Purchase: Mark read"
-msgstr ""
-
-#. module: purchase
#: view:purchase.report:0
#: field:purchase.report,day:0
msgid "Day"
@@ -106,16 +101,13 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:973
-#: code:addons/purchase/purchase.py:988
-#: code:addons/purchase/purchase.py:991
-#: code:addons/purchase/wizard/purchase_order_group.py:47
+#: code:addons/purchase/purchase.py:1024
#, python-format
-msgid "Warning!"
+msgid "Configuration Error!"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:573
+#: code:addons/purchase/purchase.py:587
#, python-format
msgid "You must first cancel all receptions related to this purchase order."
msgstr ""
@@ -132,10 +124,10 @@ msgid "Purchase-Standard Price"
msgstr ""
#. module: purchase
-#: report:purchase.order:0
-#: field:purchase.report,validator:0
-msgid "Validated By"
-msgstr "Validado por"
+#: code:addons/purchase/purchase.py:1011
+#, python-format
+msgid "No supplier defined for this product !"
+msgstr ""
#. module: purchase
#: model:ir.actions.act_window,help:purchase.action_picking_tree4_picking_to_invoice
@@ -158,12 +150,6 @@ msgid "Average Price"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:830
-#, python-format
-msgid "Invoice <b>paid</b>."
-msgstr ""
-
-#. module: purchase
#: view:purchase.order:0
msgid "Purchase order which are in the exception state"
msgstr ""
@@ -235,7 +221,7 @@ msgstr ""
"las líneas de la orden de compra"
#. module: purchase
-#: code:addons/purchase/purchase.py:255
+#: code:addons/purchase/purchase.py:260
#, python-format
msgid "In order to delete a purchase order, you must cancel it first."
msgstr ""
@@ -261,29 +247,12 @@ msgid "Total Untaxed amount"
msgstr ""
#. module: purchase
-#: model:ir.ui.menu,name:purchase.menu_purchase_uom_categ_form_action
-msgid "Unit of Measure Categories"
-msgstr ""
-
-#. module: purchase
#: view:purchase.report:0
#: field:purchase.report,category_id:0
msgid "Category"
msgstr ""
#. module: purchase
-#: view:purchase.order:0
-msgid "Quotation "
-msgstr ""
-
-#. module: purchase
-#: code:addons/purchase/purchase.py:810
-#, python-format
-msgid ""
-"Quotation for <em>%s</em> <b>converted</b> to a Purchase Order of %s %s."
-msgstr ""
-
-#. module: purchase
#: model:process.transition,note:purchase.process_transition_purchaseinvoice0
msgid ""
"A purchase order generates a supplier invoice, as soon as it is confirmed by "
@@ -348,14 +317,16 @@ msgid "October"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:837
+#: code:addons/purchase/purchase.py:1024
#, python-format
-msgid "Purchase Order for <em>%s</em> <b>cancelled</b>."
+msgid ""
+"The product \"%s\" has been defined with your company as reseller which "
+"seems to be a configuration error!"
msgstr ""
#. module: purchase
-#: field:purchase.order,message_summary:0
-msgid "Summary"
+#: view:product.product:0
+msgid "When you sell this service to a customer,"
msgstr ""
#. module: purchase
@@ -384,12 +355,6 @@ msgid "Quantity"
msgstr "Cantidad"
#. module: purchase
-#: code:addons/purchase/purchase.py:819
-#, python-format
-msgid "Shipment <em>%s</em> <b>scheduled</b> for %s."
-msgstr ""
-
-#. module: purchase
#: field:purchase.order,fiscal_position:0
msgid "Fiscal Position"
msgstr "Posición fiscal"
@@ -447,12 +412,6 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:824
-#, python-format
-msgid "Draft Invoice of %s %s is <b>waiting for validation</b>."
-msgstr ""
-
-#. module: purchase
#: model:ir.actions.act_window,help:purchase.purchase_line_form_action2
msgid ""
"<p>\n"
@@ -473,6 +432,11 @@ msgid "Scheduled Date"
msgstr ""
#. module: purchase
+#: field:purchase.order,currency_id:0
+msgid "Currency"
+msgstr ""
+
+#. module: purchase
#: field:purchase.order,journal_id:0
msgid "Journal"
msgstr ""
@@ -505,6 +469,19 @@ msgid "Incoming Products"
msgstr ""
#. module: purchase
+#: view:purchase.order:0
+msgid "Request for Quotation "
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,partner_ref:0
+msgid ""
+"Reference of the sales order or quotation sent by your supplier. It's mainly "
+"used to do the matching when you receive the products as this reference is "
+"usually written on the delivery order sent by your supplier."
+msgstr ""
+
+#. module: purchase
#: view:purchase.config.settings:0
#: view:purchase.order.group:0
#: view:purchase.order.line_invoice:0
@@ -525,6 +502,11 @@ msgid ""
msgstr ""
#. module: purchase
+#: model:mail.message.subtype,name:purchase.mt_rfq_approved
+msgid "RFQ Approved"
+msgstr ""
+
+#. module: purchase
#: view:purchase.config.settings:0
msgid "Apply"
msgstr ""
@@ -542,6 +524,11 @@ msgid ""
msgstr ""
#. module: purchase
+#: model:mail.message.subtype,name:purchase.mt_rfq_confirmed
+msgid "RFQ Confirmed"
+msgstr ""
+
+#. module: purchase
#: view:purchase.order:0
msgid "Customer Address"
msgstr ""
@@ -566,7 +553,7 @@ msgid "Supplier"
msgstr "Proveedor"
#. module: purchase
-#: code:addons/purchase/purchase.py:508
+#: code:addons/purchase/purchase.py:525
#, python-format
msgid "Define expense account for this company: \"%s\" (id:%d)."
msgstr ""
@@ -590,7 +577,6 @@ msgstr "Subtotal"
#. module: purchase
#: field:purchase.order,shipped:0
-#: field:purchase.order,shipped_rate:0
msgid "Received"
msgstr "Recibido"
@@ -632,13 +618,20 @@ msgid "Invoices and Receptions"
msgstr ""
#. module: purchase
+#: model:process.transition,note:purchase.process_transition_packinginvoice0
+msgid ""
+"A Pick list generates an invoice. Depending on the Invoicing control of the "
+"sales order, the invoice is based on delivered or on ordered quantities."
+msgstr ""
+
+#. module: purchase
#: view:purchase.report:0
#: field:purchase.report,nbr:0
msgid "# of Lines"
msgstr ""
#. module: purchase
-#: code:addons/purchase/wizard/purchase_line_invoice.py:110
+#: code:addons/purchase/wizard/purchase_line_invoice.py:106
#, python-format
msgid "Define expense account for this product: \"%s\" (id:%d)."
msgstr ""
@@ -659,8 +652,8 @@ msgid "It indicates that a picking has been done"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:565
-#: code:addons/purchase/purchase.py:572
+#: code:addons/purchase/purchase.py:579
+#: code:addons/purchase/purchase.py:586
#, python-format
msgid "Unable to cancel this purchase order."
msgstr ""
@@ -723,6 +716,15 @@ msgid "Draft PO"
msgstr ""
#. module: purchase
+#: code:addons/purchase/purchase.py:941
+#: code:addons/purchase/purchase.py:956
+#: code:addons/purchase/purchase.py:960
+#: code:addons/purchase/wizard/purchase_order_group.py:47
+#, python-format
+msgid "Warning!"
+msgstr ""
+
+#. module: purchase
#: model:process.node,name:purchase.process_node_draftpurchaseorder0
#: model:process.node,name:purchase.process_node_draftpurchaseorder1
msgid "RFQ"
@@ -754,6 +756,11 @@ msgid "The tax amount"
msgstr ""
#. module: purchase
+#: field:purchase.order,shipped_rate:0
+msgid "Received Ratio"
+msgstr ""
+
+#. module: purchase
#: selection:purchase.report,month:0
msgid "September"
msgstr ""
@@ -785,7 +792,7 @@ msgid "Stock Moves"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1158
+#: code:addons/purchase/purchase.py:1156
#, python-format
msgid "Draft Purchase Order created"
msgstr ""
@@ -806,11 +813,6 @@ msgid "Terms and Conditions"
msgstr ""
#. module: purchase
-#: field:purchase.order,currency_id:0
-msgid "unknown"
-msgstr ""
-
-#. module: purchase
#: help:purchase.order,date_order:0
msgid "Date on which this document has been created."
msgstr ""
@@ -904,12 +906,6 @@ msgid "Cancel"
msgstr "Cancelar"
#. module: purchase
-#: field:purchase.order,message_comment_ids:0
-#: help:purchase.order,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
-#. module: purchase
#: sql_constraint:purchase.order:0
msgid "Order Reference must be unique per Company!"
msgstr ""
@@ -943,14 +939,89 @@ msgid "Date Approved"
msgstr "Fecha de aprobación"
#. module: purchase
-#: code:addons/purchase/purchase.py:806
-#, python-format
-msgid "Request for quotation <b>created</b>."
+#: view:product.product:0
+msgid "a draft purchase order"
msgstr ""
#. module: purchase
-#: view:product.product:0
-msgid "a draft purchase order"
+#: model:email.template,body_html:purchase.email_template_edi_purchase
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: #FFF; \">\n"
+"\n"
+" <p>Hello$ ${object.partner_id.name},</p>\n"
+" \n"
+" <p>Here is a ${object.state in ('draft', 'sent') and 'request for "
+"quotation' or 'purchase order confirmation'} from ${object.company_id.name}: "
+"</p>\n"
+" \n"
+" <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
+" &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
+" &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
+" &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
+"${object.pricelist_id.currency_id.name}</strong><br />\n"
+" &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
+" % if object.origin:\n"
+" &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
+" % endif\n"
+" % if object.partner_ref:\n"
+" &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
+" % endif\n"
+" % if object.validator:\n"
+" &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.validator.email "
+"or ''}?subject=Order%20${object.name}\">${object.validator.name}</a>\n"
+" % endif\n"
+" </p>\n"
+"\n"
+" <br/>\n"
+" <p>If you have any question, do not hesitate to contact us.</p>\n"
+" <p>Thank you!</p>\n"
+" <br/>\n"
+" <br/>\n"
+" <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
+"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
+"background-repeat: repeat no-repeat;\">\n"
+" <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
+"#DDD;\">\n"
+" <strong style=\"text-"
+"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
+" </div>\n"
+" <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
+"16px; background-color: #F2F2F2;\">\n"
+" <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
+" % if object.company_id.street:\n"
+" ${object.company_id.street}<br/>\n"
+" % endif\n"
+" % if object.company_id.street2:\n"
+" ${object.company_id.street2}<br/>\n"
+" % endif\n"
+" % if object.company_id.city or object.company_id.zip:\n"
+" ${object.company_id.zip} ${object.company_id.city}<br/>\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 ''}<br/>\n"
+" % endif\n"
+" </span>\n"
+" % if object.company_id.phone:\n"
+" <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
+"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
+"0px; padding-left: 0px; \">\n"
+" Phone:&nbsp; ${object.company_id.phone}\n"
+" </div>\n"
+" % endif\n"
+" % if object.company_id.website:\n"
+" <div>\n"
+" Web :&nbsp;<a "
+"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
+" </div>\n"
+" %endif\n"
+" <p></p>\n"
+" </div>\n"
+"</div>\n"
+" "
msgstr ""
#. module: purchase
@@ -990,17 +1061,12 @@ msgid "Outgoing Mails"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:437
+#: code:addons/purchase/purchase.py:456
#, python-format
msgid "You cannot confirm a purchase order without any purchase order line."
msgstr ""
#. module: purchase
-#: model:ir.actions.server,name:purchase.actions_server_purchase_order_unread
-msgid "Purchase: Mark unread"
-msgstr ""
-
-#. module: purchase
#: help:purchase.order,message_ids:0
msgid "Messages and communication history"
msgstr ""
@@ -1012,7 +1078,7 @@ msgid "Destination Warehouse"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:973
+#: code:addons/purchase/purchase.py:941
#, python-format
msgid ""
"Selected Unit of Measure does not belong to the same category as the product "
@@ -1020,6 +1086,11 @@ msgid ""
msgstr ""
#. module: purchase
+#: view:purchase.order.line_invoice:0
+msgid "Select an Open Sales Order"
+msgstr ""
+
+#. module: purchase
#: model:ir.ui.menu,name:purchase.menu_purchase_unit_measure_purchase
#: model:ir.ui.menu,name:purchase.menu_purchase_uom_form_action
msgid "Units of Measure"
@@ -1031,18 +1102,12 @@ msgid "Manage pricelist per supplier"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:833
-#, python-format
-msgid "Purchase Order has been set to <b>draft</b>."
-msgstr ""
-
-#. module: purchase
#: view:board.board:0
msgid "Purchase Dashboard"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:566
+#: code:addons/purchase/purchase.py:580
#, python-format
msgid "First cancel all receptions related to this purchase order."
msgstr ""
@@ -1081,8 +1146,8 @@ msgid "Unread Messages"
msgstr ""
#. module: purchase
-#: view:purchase.order.line_invoice:0
-msgid "Select an Open Sale Order"
+#: model:ir.ui.menu,name:purchase.menu_purchase_uom_categ_form_action
+msgid "Unit of Measure Categories"
msgstr ""
#. module: purchase
@@ -1091,6 +1156,13 @@ msgid "Set to Draft"
msgstr "Establecer como borrador"
#. module: purchase
+#: help:purchase.order,origin:0
+msgid ""
+"Reference of the document that generated this purchase order request; a "
+"sales order or an internal procurement request."
+msgstr ""
+
+#. module: purchase
#: view:purchase.order.line:0
msgid "Notes"
msgstr "notas"
@@ -1120,7 +1192,7 @@ msgid "Stock Move"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:255
+#: code:addons/purchase/purchase.py:260
#, python-format
msgid "Invalid Action!"
msgstr ""
@@ -1219,7 +1291,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:310
+#: code:addons/purchase/purchase.py:320
#, python-format
msgid "Please create Invoices."
msgstr ""
@@ -1309,7 +1381,7 @@ msgid "Purchase Order Line Make Invoice"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1133
+#: code:addons/purchase/purchase.py:1141
#, python-format
msgid "PO: %s"
msgstr ""
@@ -1320,7 +1392,7 @@ msgid "Send by EMail"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:498
+#: code:addons/purchase/purchase.py:515
#, python-format
msgid "Define purchase journal for this company: \"%s\" (id:%d)."
msgstr ""
@@ -1331,8 +1403,8 @@ msgid "Purchase Order "
msgstr ""
#. module: purchase
-#: view:purchase.order.line:0
-msgid "Manual Invoices"
+#: help:purchase.config.settings,group_costing_method:0
+msgid "Allows you to compute product cost price based on average cost."
msgstr ""
#. module: purchase
@@ -1487,8 +1559,8 @@ msgid "Compute product cost price based on average cost"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:340
-#: code:addons/purchase/wizard/purchase_line_invoice.py:141
+#: code:addons/purchase/purchase.py:350
+#: code:addons/purchase/wizard/purchase_line_invoice.py:137
#: model:ir.actions.act_window,name:purchase.act_res_partner_2_supplier_invoices
#: view:res.partner:0
#, python-format
@@ -1600,8 +1672,9 @@ msgid "Open Purchase Menu"
msgstr ""
#. module: purchase
-#: model:ir.model,name:purchase.model_mail_compose_message
-msgid "Email composition wizard"
+#: code:addons/purchase/purchase.py:1028
+#, python-format
+msgid "No address defined for the supplier"
msgstr ""
#. module: purchase
@@ -1674,11 +1747,11 @@ msgid "Purchase Order"
msgstr "Orden de compra"
#. module: purchase
-#: code:addons/purchase/purchase.py:310
-#: code:addons/purchase/purchase.py:437
-#: code:addons/purchase/purchase.py:497
-#: code:addons/purchase/purchase.py:508
-#: code:addons/purchase/wizard/purchase_line_invoice.py:109
+#: code:addons/purchase/purchase.py:320
+#: code:addons/purchase/purchase.py:456
+#: code:addons/purchase/purchase.py:514
+#: code:addons/purchase/purchase.py:525
+#: code:addons/purchase/wizard/purchase_line_invoice.py:105
#, python-format
msgid "Error!"
msgstr ""
@@ -1700,13 +1773,6 @@ msgid ""
msgstr ""
#. module: purchase
-#: model:process.transition,note:purchase.process_transition_packinginvoice0
-msgid ""
-"A Pick list generates an invoice. Depending on the Invoicing control of the "
-"sale order, the invoice is based on delivered or on ordered quantities."
-msgstr ""
-
-#. module: purchase
#: selection:purchase.order,state:0
#: selection:purchase.order.line,state:0
#: selection:purchase.report,state:0
@@ -1719,9 +1785,8 @@ msgid "# of Purchase Order"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:827
-#, python-format
-msgid "Shipment <b>received</b>."
+#: model:ir.model,name:purchase.model_mail_compose_message
+msgid "Email composition wizard"
msgstr ""
#. module: purchase
@@ -1805,7 +1870,7 @@ msgid "RFQ_${(object.name or '').replace('/','_')}"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:988
+#: code:addons/purchase/purchase.py:956
#, python-format
msgid "The selected supplier only sells this product by %s"
msgstr ""
@@ -1851,6 +1916,12 @@ msgid "Outgoing products to invoice"
msgstr ""
#. module: purchase
+#: report:purchase.order:0
+#: field:purchase.report,validator:0
+msgid "Validated By"
+msgstr "Validado por"
+
+#. module: purchase
#: view:purchase.report:0
#: field:purchase.report,delay_pass:0
msgid "Days to Deliver"
@@ -1940,8 +2011,8 @@ msgid "November"
msgstr ""
#. module: purchase
-#: help:purchase.config.settings,group_costing_method:0
-msgid "Allows you to compute product cost price based on average cost."
+#: view:purchase.order.line:0
+msgid "Manual Invoices"
msgstr ""
#. module: purchase
@@ -1965,13 +2036,6 @@ msgid ""
msgstr ""
#. module: purchase
-#: help:purchase.order,origin:0
-msgid ""
-"Reference of the document that generated this purchase order request; a sale "
-"order or an internal procurement request."
-msgstr ""
-
-#. module: purchase
#: model:ir.ui.menu,name:purchase.menu_partner_categories_in_form
msgid "Partner Categories"
msgstr ""
@@ -1992,89 +2056,6 @@ msgid "Invoicing Settings"
msgstr ""
#. module: purchase
-#: model:email.template,body_html:purchase.email_template_edi_purchase
-msgid ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"\n"
-" <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
-"or ''},</p>\n"
-" \n"
-" <p>Here is a ${object.state in ('draft', 'sent') and 'request for "
-"quotation' or 'purchase order confirmation'} from ${object.company_id.name}: "
-"</p>\n"
-" \n"
-" <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
-" &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
-" &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
-" &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
-"${object.pricelist_id.currency_id.name}</strong><br />\n"
-" &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
-" % if object.origin:\n"
-" &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
-" % endif\n"
-" % if object.partner_ref:\n"
-" &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
-" % endif\n"
-" % if object.validator:\n"
-" &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.validator.email "
-"or ''}?subject=Order%20${object.name}\">${object.validator.name}</a>\n"
-" % endif\n"
-" </p>\n"
-"\n"
-" <br/>\n"
-" <p>If you have any question, do not hesitate to contact us.</p>\n"
-" <p>Thank you!</p>\n"
-" <br/>\n"
-" <br/>\n"
-" <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
-"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
-"background-repeat: repeat no-repeat;\">\n"
-" <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
-"#FFF;\">\n"
-" <strong style=\"text-"
-"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
-" </div>\n"
-" <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
-"16px; background-color: #F2F2F2;\">\n"
-" <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
-" % if object.company_id.street:\n"
-" ${object.company_id.street}<br/>\n"
-" % endif\n"
-" % if object.company_id.street2:\n"
-" ${object.company_id.street2}<br/>\n"
-" % endif\n"
-" % if object.company_id.city or object.company_id.zip:\n"
-" ${object.company_id.zip} ${object.company_id.city}<br/>\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 ''}<br/>\n"
-" % endif\n"
-" </span>\n"
-" % if object.company_id.phone:\n"
-" <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
-"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
-"0px; padding-left: 0px; \">\n"
-" Phone:&nbsp; ${object.company_id.phone}\n"
-" </div>\n"
-" % endif\n"
-" % if object.company_id.website:\n"
-" <div>\n"
-" Web :&nbsp;<a "
-"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
-" </div>\n"
-" %endif\n"
-" <p></p>\n"
-" </div>\n"
-"</div>\n"
-" "
-msgstr ""
-
-#. module: purchase
#: model:ir.actions.act_window,name:purchase.action_purchase_order_by_user_all
msgid "Total Orders by User per month"
msgstr ""
@@ -2085,21 +2066,19 @@ msgid "Based on incoming shipments"
msgstr ""
#. module: purchase
+#: code:addons/purchase/purchase.py:1018
+#, python-format
+msgid "No default supplier defined for this product"
+msgstr ""
+
+#. module: purchase
#: view:purchase.report:0
#: field:purchase.report,warehouse_id:0
msgid "Warehouse"
msgstr "Almacén"
#. module: purchase
-#: help:purchase.order,partner_ref:0
-msgid ""
-"Reference of the sale order or quotation sent by your supplier. It's mainly "
-"used to do the matching when you receive the products as this reference is "
-"usually written on the delivery order sent by your supplier."
-msgstr ""
-
-#. module: purchase
-#: code:addons/purchase/purchase.py:991
+#: code:addons/purchase/purchase.py:960
#, python-format
msgid ""
"The selected supplier has a minimal quantity set to %s %s, you should not "
@@ -2172,8 +2151,8 @@ msgid ""
msgstr ""
#. module: purchase
-#: view:product.product:0
-msgid "When you sell this service to a customer,"
+#: field:purchase.order,message_summary:0
+msgid "Summary"
msgstr ""
#. module: purchase
@@ -2183,6 +2162,11 @@ msgid "Pricelist Versions"
msgstr ""
#. module: purchase
+#: field:purchase.order,payment_term_id:0
+msgid "Payment Term"
+msgstr ""
+
+#. module: purchase
#: view:purchase.order:0
msgid "Purchase orders which are in draft state"
msgstr ""
diff --git a/addons/purchase/i18n/es_CL.po b/addons/purchase/i18n/es_CL.po
index 5d94e4f5a4d..9b673a62b1a 100644
--- a/addons/purchase/i18n/es_CL.po
+++ b/addons/purchase/i18n/es_CL.po
@@ -6,15 +6,15 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
"PO-Revision-Date: 2011-01-14 04:45+0000\n"
"Last-Translator: Carlos-smile <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: 2012-12-04 05:12+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:20+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
#. module: purchase
#: model:res.groups,name:purchase.group_analytic_accounting
@@ -60,11 +60,6 @@ msgstr ""
"el precio del proveedor para los productos/cantidades seleccionados."
#. module: purchase
-#: model:ir.actions.server,name:purchase.actions_server_purchase_order_read
-msgid "Purchase: Mark read"
-msgstr ""
-
-#. module: purchase
#: view:purchase.report:0
#: field:purchase.report,day:0
msgid "Day"
@@ -105,16 +100,13 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:973
-#: code:addons/purchase/purchase.py:988
-#: code:addons/purchase/purchase.py:991
-#: code:addons/purchase/wizard/purchase_order_group.py:47
+#: code:addons/purchase/purchase.py:1024
#, python-format
-msgid "Warning!"
+msgid "Configuration Error!"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:573
+#: code:addons/purchase/purchase.py:587
#, python-format
msgid "You must first cancel all receptions related to this purchase order."
msgstr ""
@@ -131,10 +123,10 @@ msgid "Purchase-Standard Price"
msgstr "Precio compra-estándar"
#. module: purchase
-#: report:purchase.order:0
-#: field:purchase.report,validator:0
-msgid "Validated By"
-msgstr "Validado por"
+#: code:addons/purchase/purchase.py:1011
+#, python-format
+msgid "No supplier defined for this product !"
+msgstr ""
#. module: purchase
#: model:ir.actions.act_window,help:purchase.action_picking_tree4_picking_to_invoice
@@ -157,12 +149,6 @@ msgid "Average Price"
msgstr "Precio medio"
#. module: purchase
-#: code:addons/purchase/purchase.py:830
-#, python-format
-msgid "Invoice <b>paid</b>."
-msgstr ""
-
-#. module: purchase
#: view:purchase.order:0
msgid "Purchase order which are in the exception state"
msgstr ""
@@ -234,7 +220,7 @@ msgstr ""
"las líneas del pedido de compra."
#. module: purchase
-#: code:addons/purchase/purchase.py:255
+#: code:addons/purchase/purchase.py:260
#, python-format
msgid "In order to delete a purchase order, you must cancel it first."
msgstr ""
@@ -260,29 +246,12 @@ msgid "Total Untaxed amount"
msgstr "Total importe base"
#. module: purchase
-#: model:ir.ui.menu,name:purchase.menu_purchase_uom_categ_form_action
-msgid "Unit of Measure Categories"
-msgstr ""
-
-#. module: purchase
#: view:purchase.report:0
#: field:purchase.report,category_id:0
msgid "Category"
msgstr "Categoría"
#. module: purchase
-#: view:purchase.order:0
-msgid "Quotation "
-msgstr ""
-
-#. module: purchase
-#: code:addons/purchase/purchase.py:810
-#, python-format
-msgid ""
-"Quotation for <em>%s</em> <b>converted</b> to a Purchase Order of %s %s."
-msgstr ""
-
-#. module: purchase
#: model:process.transition,note:purchase.process_transition_purchaseinvoice0
msgid ""
"A purchase order generates a supplier invoice, as soon as it is confirmed by "
@@ -350,14 +319,16 @@ msgid "October"
msgstr "Octubre"
#. module: purchase
-#: code:addons/purchase/purchase.py:837
+#: code:addons/purchase/purchase.py:1024
#, python-format
-msgid "Purchase Order for <em>%s</em> <b>cancelled</b>."
+msgid ""
+"The product \"%s\" has been defined with your company as reseller which "
+"seems to be a configuration error!"
msgstr ""
#. module: purchase
-#: field:purchase.order,message_summary:0
-msgid "Summary"
+#: view:product.product:0
+msgid "When you sell this service to a customer,"
msgstr ""
#. module: purchase
@@ -386,12 +357,6 @@ msgid "Quantity"
msgstr "Cantidad"
#. module: purchase
-#: code:addons/purchase/purchase.py:819
-#, python-format
-msgid "Shipment <em>%s</em> <b>scheduled</b> for %s."
-msgstr ""
-
-#. module: purchase
#: field:purchase.order,fiscal_position:0
msgid "Fiscal Position"
msgstr "Posición fiscal"
@@ -449,12 +414,6 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:824
-#, python-format
-msgid "Draft Invoice of %s %s is <b>waiting for validation</b>."
-msgstr ""
-
-#. module: purchase
#: model:ir.actions.act_window,help:purchase.purchase_line_form_action2
msgid ""
"<p>\n"
@@ -475,6 +434,11 @@ msgid "Scheduled Date"
msgstr "Fecha planificada"
#. module: purchase
+#: field:purchase.order,currency_id:0
+msgid "Currency"
+msgstr ""
+
+#. module: purchase
#: field:purchase.order,journal_id:0
msgid "Journal"
msgstr ""
@@ -507,6 +471,19 @@ msgid "Incoming Products"
msgstr ""
#. module: purchase
+#: view:purchase.order:0
+msgid "Request for Quotation "
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,partner_ref:0
+msgid ""
+"Reference of the sales order or quotation sent by your supplier. It's mainly "
+"used to do the matching when you receive the products as this reference is "
+"usually written on the delivery order sent by your supplier."
+msgstr ""
+
+#. module: purchase
#: view:purchase.config.settings:0
#: view:purchase.order.group:0
#: view:purchase.order.line_invoice:0
@@ -530,6 +507,11 @@ msgstr ""
"manualmente por el contable (control facturación = Manual)."
#. module: purchase
+#: model:mail.message.subtype,name:purchase.mt_rfq_approved
+msgid "RFQ Approved"
+msgstr ""
+
+#. module: purchase
#: view:purchase.config.settings:0
msgid "Apply"
msgstr ""
@@ -550,6 +532,11 @@ msgstr ""
"confirmado."
#. module: purchase
+#: model:mail.message.subtype,name:purchase.mt_rfq_confirmed
+msgid "RFQ Confirmed"
+msgstr ""
+
+#. module: purchase
#: view:purchase.order:0
msgid "Customer Address"
msgstr ""
@@ -574,7 +561,7 @@ msgid "Supplier"
msgstr "Proveedor"
#. module: purchase
-#: code:addons/purchase/purchase.py:508
+#: code:addons/purchase/purchase.py:525
#, python-format
msgid "Define expense account for this company: \"%s\" (id:%d)."
msgstr ""
@@ -598,7 +585,6 @@ msgstr "Subtotal"
#. module: purchase
#: field:purchase.order,shipped:0
-#: field:purchase.order,shipped_rate:0
msgid "Received"
msgstr "Recibido"
@@ -640,13 +626,20 @@ msgid "Invoices and Receptions"
msgstr ""
#. module: purchase
+#: model:process.transition,note:purchase.process_transition_packinginvoice0
+msgid ""
+"A Pick list generates an invoice. Depending on the Invoicing control of the "
+"sales order, the invoice is based on delivered or on ordered quantities."
+msgstr ""
+
+#. module: purchase
#: view:purchase.report:0
#: field:purchase.report,nbr:0
msgid "# of Lines"
msgstr "Nº de líneas"
#. module: purchase
-#: code:addons/purchase/wizard/purchase_line_invoice.py:110
+#: code:addons/purchase/wizard/purchase_line_invoice.py:106
#, python-format
msgid "Define expense account for this product: \"%s\" (id:%d)."
msgstr ""
@@ -667,8 +660,8 @@ msgid "It indicates that a picking has been done"
msgstr "Indica que un albarán ha sido realizado"
#. module: purchase
-#: code:addons/purchase/purchase.py:565
-#: code:addons/purchase/purchase.py:572
+#: code:addons/purchase/purchase.py:579
+#: code:addons/purchase/purchase.py:586
#, python-format
msgid "Unable to cancel this purchase order."
msgstr ""
@@ -733,6 +726,15 @@ msgid "Draft PO"
msgstr ""
#. module: purchase
+#: code:addons/purchase/purchase.py:941
+#: code:addons/purchase/purchase.py:956
+#: code:addons/purchase/purchase.py:960
+#: code:addons/purchase/wizard/purchase_order_group.py:47
+#, python-format
+msgid "Warning!"
+msgstr ""
+
+#. module: purchase
#: model:process.node,name:purchase.process_node_draftpurchaseorder0
#: model:process.node,name:purchase.process_node_draftpurchaseorder1
msgid "RFQ"
@@ -764,6 +766,11 @@ msgid "The tax amount"
msgstr "El importe de los impuestos."
#. module: purchase
+#: field:purchase.order,shipped_rate:0
+msgid "Received Ratio"
+msgstr ""
+
+#. module: purchase
#: selection:purchase.report,month:0
msgid "September"
msgstr "Septiembre"
@@ -795,7 +802,7 @@ msgid "Stock Moves"
msgstr "Movimientos de stock"
#. module: purchase
-#: code:addons/purchase/purchase.py:1158
+#: code:addons/purchase/purchase.py:1156
#, python-format
msgid "Draft Purchase Order created"
msgstr ""
@@ -816,11 +823,6 @@ msgid "Terms and Conditions"
msgstr ""
#. module: purchase
-#: field:purchase.order,currency_id:0
-msgid "unknown"
-msgstr ""
-
-#. module: purchase
#: help:purchase.order,date_order:0
msgid "Date on which this document has been created."
msgstr "Fecha de la creación de este documento."
@@ -914,12 +916,6 @@ msgid "Cancel"
msgstr "Cancelar"
#. module: purchase
-#: field:purchase.order,message_comment_ids:0
-#: help:purchase.order,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
-#. module: purchase
#: sql_constraint:purchase.order:0
msgid "Order Reference must be unique per Company!"
msgstr ""
@@ -953,14 +949,89 @@ msgid "Date Approved"
msgstr "Fecha aprobación"
#. module: purchase
-#: code:addons/purchase/purchase.py:806
-#, python-format
-msgid "Request for quotation <b>created</b>."
+#: view:product.product:0
+msgid "a draft purchase order"
msgstr ""
#. module: purchase
-#: view:product.product:0
-msgid "a draft purchase order"
+#: model:email.template,body_html:purchase.email_template_edi_purchase
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: #FFF; \">\n"
+"\n"
+" <p>Hello$ ${object.partner_id.name},</p>\n"
+" \n"
+" <p>Here is a ${object.state in ('draft', 'sent') and 'request for "
+"quotation' or 'purchase order confirmation'} from ${object.company_id.name}: "
+"</p>\n"
+" \n"
+" <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
+" &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
+" &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
+" &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
+"${object.pricelist_id.currency_id.name}</strong><br />\n"
+" &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
+" % if object.origin:\n"
+" &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
+" % endif\n"
+" % if object.partner_ref:\n"
+" &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
+" % endif\n"
+" % if object.validator:\n"
+" &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.validator.email "
+"or ''}?subject=Order%20${object.name}\">${object.validator.name}</a>\n"
+" % endif\n"
+" </p>\n"
+"\n"
+" <br/>\n"
+" <p>If you have any question, do not hesitate to contact us.</p>\n"
+" <p>Thank you!</p>\n"
+" <br/>\n"
+" <br/>\n"
+" <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
+"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
+"background-repeat: repeat no-repeat;\">\n"
+" <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
+"#DDD;\">\n"
+" <strong style=\"text-"
+"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
+" </div>\n"
+" <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
+"16px; background-color: #F2F2F2;\">\n"
+" <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
+" % if object.company_id.street:\n"
+" ${object.company_id.street}<br/>\n"
+" % endif\n"
+" % if object.company_id.street2:\n"
+" ${object.company_id.street2}<br/>\n"
+" % endif\n"
+" % if object.company_id.city or object.company_id.zip:\n"
+" ${object.company_id.zip} ${object.company_id.city}<br/>\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 ''}<br/>\n"
+" % endif\n"
+" </span>\n"
+" % if object.company_id.phone:\n"
+" <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
+"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
+"0px; padding-left: 0px; \">\n"
+" Phone:&nbsp; ${object.company_id.phone}\n"
+" </div>\n"
+" % endif\n"
+" % if object.company_id.website:\n"
+" <div>\n"
+" Web :&nbsp;<a "
+"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
+" </div>\n"
+" %endif\n"
+" <p></p>\n"
+" </div>\n"
+"</div>\n"
+" "
msgstr ""
#. module: purchase
@@ -1003,17 +1074,12 @@ msgid "Outgoing Mails"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:437
+#: code:addons/purchase/purchase.py:456
#, python-format
msgid "You cannot confirm a purchase order without any purchase order line."
msgstr ""
#. module: purchase
-#: model:ir.actions.server,name:purchase.actions_server_purchase_order_unread
-msgid "Purchase: Mark unread"
-msgstr ""
-
-#. module: purchase
#: help:purchase.order,message_ids:0
msgid "Messages and communication history"
msgstr ""
@@ -1025,7 +1091,7 @@ msgid "Destination Warehouse"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:973
+#: code:addons/purchase/purchase.py:941
#, python-format
msgid ""
"Selected Unit of Measure does not belong to the same category as the product "
@@ -1033,6 +1099,11 @@ msgid ""
msgstr ""
#. module: purchase
+#: view:purchase.order.line_invoice:0
+msgid "Select an Open Sales Order"
+msgstr ""
+
+#. module: purchase
#: model:ir.ui.menu,name:purchase.menu_purchase_unit_measure_purchase
#: model:ir.ui.menu,name:purchase.menu_purchase_uom_form_action
msgid "Units of Measure"
@@ -1044,18 +1115,12 @@ msgid "Manage pricelist per supplier"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:833
-#, python-format
-msgid "Purchase Order has been set to <b>draft</b>."
-msgstr ""
-
-#. module: purchase
#: view:board.board:0
msgid "Purchase Dashboard"
msgstr "Tablero de compras"
#. module: purchase
-#: code:addons/purchase/purchase.py:566
+#: code:addons/purchase/purchase.py:580
#, python-format
msgid "First cancel all receptions related to this purchase order."
msgstr ""
@@ -1094,9 +1159,9 @@ msgid "Unread Messages"
msgstr ""
#. module: purchase
-#: view:purchase.order.line_invoice:0
-msgid "Select an Open Sale Order"
-msgstr "Seleccionar un pedido de compra abierto"
+#: model:ir.ui.menu,name:purchase.menu_purchase_uom_categ_form_action
+msgid "Unit of Measure Categories"
+msgstr ""
#. module: purchase
#: view:purchase.order:0
@@ -1104,6 +1169,13 @@ msgid "Set to Draft"
msgstr "Cambiar a borrador"
#. module: purchase
+#: help:purchase.order,origin:0
+msgid ""
+"Reference of the document that generated this purchase order request; a "
+"sales order or an internal procurement request."
+msgstr ""
+
+#. module: purchase
#: view:purchase.order.line:0
msgid "Notes"
msgstr "Notas"
@@ -1133,7 +1205,7 @@ msgid "Stock Move"
msgstr "Moviemiento de stock"
#. module: purchase
-#: code:addons/purchase/purchase.py:255
+#: code:addons/purchase/purchase.py:260
#, python-format
msgid "Invalid Action!"
msgstr ""
@@ -1235,7 +1307,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:310
+#: code:addons/purchase/purchase.py:320
#, python-format
msgid "Please create Invoices."
msgstr ""
@@ -1325,7 +1397,7 @@ msgid "Purchase Order Line Make Invoice"
msgstr "Línea pedido de compra realiza factura"
#. module: purchase
-#: code:addons/purchase/purchase.py:1133
+#: code:addons/purchase/purchase.py:1141
#, python-format
msgid "PO: %s"
msgstr ""
@@ -1336,7 +1408,7 @@ msgid "Send by EMail"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:498
+#: code:addons/purchase/purchase.py:515
#, python-format
msgid "Define purchase journal for this company: \"%s\" (id:%d)."
msgstr ""
@@ -1347,9 +1419,9 @@ msgid "Purchase Order "
msgstr ""
#. module: purchase
-#: view:purchase.order.line:0
-msgid "Manual Invoices"
-msgstr "Facturas manuales"
+#: help:purchase.config.settings,group_costing_method:0
+msgid "Allows you to compute product cost price based on average cost."
+msgstr ""
#. module: purchase
#: model:ir.actions.act_window,name:purchase.action_purchase_configuration
@@ -1503,8 +1575,8 @@ msgid "Compute product cost price based on average cost"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:340
-#: code:addons/purchase/wizard/purchase_line_invoice.py:141
+#: code:addons/purchase/purchase.py:350
+#: code:addons/purchase/wizard/purchase_line_invoice.py:137
#: model:ir.actions.act_window,name:purchase.act_res_partner_2_supplier_invoices
#: view:res.partner:0
#, python-format
@@ -1616,8 +1688,9 @@ msgid "Open Purchase Menu"
msgstr ""
#. module: purchase
-#: model:ir.model,name:purchase.model_mail_compose_message
-msgid "Email composition wizard"
+#: code:addons/purchase/purchase.py:1028
+#, python-format
+msgid "No address defined for the supplier"
msgstr ""
#. module: purchase
@@ -1690,11 +1763,11 @@ msgid "Purchase Order"
msgstr "Pedido de compra"
#. module: purchase
-#: code:addons/purchase/purchase.py:310
-#: code:addons/purchase/purchase.py:437
-#: code:addons/purchase/purchase.py:497
-#: code:addons/purchase/purchase.py:508
-#: code:addons/purchase/wizard/purchase_line_invoice.py:109
+#: code:addons/purchase/purchase.py:320
+#: code:addons/purchase/purchase.py:456
+#: code:addons/purchase/purchase.py:514
+#: code:addons/purchase/purchase.py:525
+#: code:addons/purchase/wizard/purchase_line_invoice.py:105
#, python-format
msgid "Error!"
msgstr ""
@@ -1716,16 +1789,6 @@ msgid ""
msgstr ""
#. module: purchase
-#: model:process.transition,note:purchase.process_transition_packinginvoice0
-msgid ""
-"A Pick list generates an invoice. Depending on the Invoicing control of the "
-"sale order, the invoice is based on delivered or on ordered quantities."
-msgstr ""
-"Un ingreso de productos genera una factura. Según el control de facturación "
-"en el pedido de venta, la factura se basa en las cantidades enviadas u "
-"ordenadas."
-
-#. module: purchase
#: selection:purchase.order,state:0
#: selection:purchase.order.line,state:0
#: selection:purchase.report,state:0
@@ -1738,9 +1801,8 @@ msgid "# of Purchase Order"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:827
-#, python-format
-msgid "Shipment <b>received</b>."
+#: model:ir.model,name:purchase.model_mail_compose_message
+msgid "Email composition wizard"
msgstr ""
#. module: purchase
@@ -1831,7 +1893,7 @@ msgid "RFQ_${(object.name or '').replace('/','_')}"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:988
+#: code:addons/purchase/purchase.py:956
#, python-format
msgid "The selected supplier only sells this product by %s"
msgstr "El proveedor seleccionado sólo vende este producto por %s"
@@ -1877,6 +1939,12 @@ msgid "Outgoing products to invoice"
msgstr "Productos salientes a facturar"
#. module: purchase
+#: report:purchase.order:0
+#: field:purchase.report,validator:0
+msgid "Validated By"
+msgstr "Validado por"
+
+#. module: purchase
#: view:purchase.report:0
#: field:purchase.report,delay_pass:0
msgid "Days to Deliver"
@@ -1966,9 +2034,9 @@ msgid "November"
msgstr "Noviembre"
#. module: purchase
-#: help:purchase.config.settings,group_costing_method:0
-msgid "Allows you to compute product cost price based on average cost."
-msgstr ""
+#: view:purchase.order.line:0
+msgid "Manual Invoices"
+msgstr "Facturas manuales"
#. module: purchase
#: report:purchase.order:0
@@ -1991,13 +2059,6 @@ msgid ""
msgstr ""
#. module: purchase
-#: help:purchase.order,origin:0
-msgid ""
-"Reference of the document that generated this purchase order request; a sale "
-"order or an internal procurement request."
-msgstr ""
-
-#. module: purchase
#: model:ir.ui.menu,name:purchase.menu_partner_categories_in_form
msgid "Partner Categories"
msgstr ""
@@ -2018,89 +2079,6 @@ msgid "Invoicing Settings"
msgstr ""
#. module: purchase
-#: model:email.template,body_html:purchase.email_template_edi_purchase
-msgid ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"\n"
-" <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
-"or ''},</p>\n"
-" \n"
-" <p>Here is a ${object.state in ('draft', 'sent') and 'request for "
-"quotation' or 'purchase order confirmation'} from ${object.company_id.name}: "
-"</p>\n"
-" \n"
-" <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
-" &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
-" &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
-" &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
-"${object.pricelist_id.currency_id.name}</strong><br />\n"
-" &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
-" % if object.origin:\n"
-" &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
-" % endif\n"
-" % if object.partner_ref:\n"
-" &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
-" % endif\n"
-" % if object.validator:\n"
-" &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.validator.email "
-"or ''}?subject=Order%20${object.name}\">${object.validator.name}</a>\n"
-" % endif\n"
-" </p>\n"
-"\n"
-" <br/>\n"
-" <p>If you have any question, do not hesitate to contact us.</p>\n"
-" <p>Thank you!</p>\n"
-" <br/>\n"
-" <br/>\n"
-" <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
-"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
-"background-repeat: repeat no-repeat;\">\n"
-" <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
-"#FFF;\">\n"
-" <strong style=\"text-"
-"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
-" </div>\n"
-" <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
-"16px; background-color: #F2F2F2;\">\n"
-" <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
-" % if object.company_id.street:\n"
-" ${object.company_id.street}<br/>\n"
-" % endif\n"
-" % if object.company_id.street2:\n"
-" ${object.company_id.street2}<br/>\n"
-" % endif\n"
-" % if object.company_id.city or object.company_id.zip:\n"
-" ${object.company_id.zip} ${object.company_id.city}<br/>\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 ''}<br/>\n"
-" % endif\n"
-" </span>\n"
-" % if object.company_id.phone:\n"
-" <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
-"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
-"0px; padding-left: 0px; \">\n"
-" Phone:&nbsp; ${object.company_id.phone}\n"
-" </div>\n"
-" % endif\n"
-" % if object.company_id.website:\n"
-" <div>\n"
-" Web :&nbsp;<a "
-"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
-" </div>\n"
-" %endif\n"
-" <p></p>\n"
-" </div>\n"
-"</div>\n"
-" "
-msgstr ""
-
-#. module: purchase
#: model:ir.actions.act_window,name:purchase.action_purchase_order_by_user_all
msgid "Total Orders by User per month"
msgstr "Total pedidos por usuario mensual"
@@ -2111,21 +2089,19 @@ msgid "Based on incoming shipments"
msgstr ""
#. module: purchase
+#: code:addons/purchase/purchase.py:1018
+#, python-format
+msgid "No default supplier defined for this product"
+msgstr ""
+
+#. module: purchase
#: view:purchase.report:0
#: field:purchase.report,warehouse_id:0
msgid "Warehouse"
msgstr "Almacén"
#. module: purchase
-#: help:purchase.order,partner_ref:0
-msgid ""
-"Reference of the sale order or quotation sent by your supplier. It's mainly "
-"used to do the matching when you receive the products as this reference is "
-"usually written on the delivery order sent by your supplier."
-msgstr ""
-
-#. module: purchase
-#: code:addons/purchase/purchase.py:991
+#: code:addons/purchase/purchase.py:960
#, python-format
msgid ""
"The selected supplier has a minimal quantity set to %s %s, you should not "
@@ -2210,8 +2186,8 @@ msgstr ""
" "
#. module: purchase
-#: view:product.product:0
-msgid "When you sell this service to a customer,"
+#: field:purchase.order,message_summary:0
+msgid "Summary"
msgstr ""
#. module: purchase
@@ -2221,6 +2197,11 @@ msgid "Pricelist Versions"
msgstr "Versiones de tarifa"
#. module: purchase
+#: field:purchase.order,payment_term_id:0
+msgid "Payment Term"
+msgstr ""
+
+#. module: purchase
#: view:purchase.order:0
msgid "Purchase orders which are in draft state"
msgstr ""
@@ -2298,6 +2279,9 @@ msgstr "Pedidos"
#~ msgid "No Pricelist !"
#~ msgstr "¡No tarifa!"
+#~ msgid "Select an Open Sale Order"
+#~ msgstr "Seleccionar un pedido de compra abierto"
+
#~ msgid "Current purchases"
#~ msgstr "Compras actuales"
@@ -2960,6 +2944,14 @@ msgstr "Pedidos"
#~ msgstr "Basadas en líneas de la orden de compra"
#~ msgid ""
+#~ "A Pick list generates an invoice. Depending on the Invoicing control of the "
+#~ "sale order, the invoice is based on delivered or on ordered quantities."
+#~ msgstr ""
+#~ "Un ingreso de productos genera una factura. Según el control de facturación "
+#~ "en el pedido de venta, la factura se basa en las cantidades enviadas u "
+#~ "ordenadas."
+
+#~ msgid ""
#~ "You can create a request for quotation when you want to buy products to a "
#~ "supplier but the purchase is not confirmed yet. Use also this menu to review "
#~ "requests for quotation created automatically based on your logistic rules "
diff --git a/addons/purchase/i18n/es_CR.po b/addons/purchase/i18n/es_CR.po
index 1d97070870b..e13f1aaf631 100644
--- a/addons/purchase/i18n/es_CR.po
+++ b/addons/purchase/i18n/es_CR.po
@@ -6,15 +6,15 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
"PO-Revision-Date: 2012-02-18 21:55+0000\n"
"Last-Translator: Freddy Gonzalez <freddy.gonzalez.contreras@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: 2012-12-04 05:12+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:20+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
"Language: \n"
#. module: purchase
@@ -61,11 +61,6 @@ msgstr ""
"el precio del proveedor para los productos/cantidades seleccionados."
#. module: purchase
-#: model:ir.actions.server,name:purchase.actions_server_purchase_order_read
-msgid "Purchase: Mark read"
-msgstr ""
-
-#. module: purchase
#: view:purchase.report:0
#: field:purchase.report,day:0
msgid "Day"
@@ -106,16 +101,13 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:973
-#: code:addons/purchase/purchase.py:988
-#: code:addons/purchase/purchase.py:991
-#: code:addons/purchase/wizard/purchase_order_group.py:47
+#: code:addons/purchase/purchase.py:1024
#, python-format
-msgid "Warning!"
+msgid "Configuration Error!"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:573
+#: code:addons/purchase/purchase.py:587
#, python-format
msgid "You must first cancel all receptions related to this purchase order."
msgstr ""
@@ -134,10 +126,10 @@ msgid "Purchase-Standard Price"
msgstr "Precio compra-estándar"
#. module: purchase
-#: report:purchase.order:0
-#: field:purchase.report,validator:0
-msgid "Validated By"
-msgstr "Validado por"
+#: code:addons/purchase/purchase.py:1011
+#, python-format
+msgid "No supplier defined for this product !"
+msgstr ""
#. module: purchase
#: model:ir.actions.act_window,help:purchase.action_picking_tree4_picking_to_invoice
@@ -160,12 +152,6 @@ msgid "Average Price"
msgstr "Precio medio"
#. module: purchase
-#: code:addons/purchase/purchase.py:830
-#, python-format
-msgid "Invoice <b>paid</b>."
-msgstr ""
-
-#. module: purchase
#: view:purchase.order:0
msgid "Purchase order which are in the exception state"
msgstr "Pedidos de compra que están en estado de excepción"
@@ -237,7 +223,7 @@ msgstr ""
"las líneas del pedido de compra."
#. module: purchase
-#: code:addons/purchase/purchase.py:255
+#: code:addons/purchase/purchase.py:260
#, python-format
msgid "In order to delete a purchase order, you must cancel it first."
msgstr ""
@@ -263,29 +249,12 @@ msgid "Total Untaxed amount"
msgstr "Total importe base"
#. module: purchase
-#: model:ir.ui.menu,name:purchase.menu_purchase_uom_categ_form_action
-msgid "Unit of Measure Categories"
-msgstr ""
-
-#. module: purchase
#: view:purchase.report:0
#: field:purchase.report,category_id:0
msgid "Category"
msgstr "Categoría"
#. module: purchase
-#: view:purchase.order:0
-msgid "Quotation "
-msgstr ""
-
-#. module: purchase
-#: code:addons/purchase/purchase.py:810
-#, python-format
-msgid ""
-"Quotation for <em>%s</em> <b>converted</b> to a Purchase Order of %s %s."
-msgstr ""
-
-#. module: purchase
#: model:process.transition,note:purchase.process_transition_purchaseinvoice0
msgid ""
"A purchase order generates a supplier invoice, as soon as it is confirmed by "
@@ -353,14 +322,16 @@ msgid "October"
msgstr "Octubre"
#. module: purchase
-#: code:addons/purchase/purchase.py:837
+#: code:addons/purchase/purchase.py:1024
#, python-format
-msgid "Purchase Order for <em>%s</em> <b>cancelled</b>."
+msgid ""
+"The product \"%s\" has been defined with your company as reseller which "
+"seems to be a configuration error!"
msgstr ""
#. module: purchase
-#: field:purchase.order,message_summary:0
-msgid "Summary"
+#: view:product.product:0
+msgid "When you sell this service to a customer,"
msgstr ""
#. module: purchase
@@ -389,12 +360,6 @@ msgid "Quantity"
msgstr "Cantidad"
#. module: purchase
-#: code:addons/purchase/purchase.py:819
-#, python-format
-msgid "Shipment <em>%s</em> <b>scheduled</b> for %s."
-msgstr ""
-
-#. module: purchase
#: field:purchase.order,fiscal_position:0
msgid "Fiscal Position"
msgstr "Posición fiscal"
@@ -452,12 +417,6 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:824
-#, python-format
-msgid "Draft Invoice of %s %s is <b>waiting for validation</b>."
-msgstr ""
-
-#. module: purchase
#: model:ir.actions.act_window,help:purchase.purchase_line_form_action2
msgid ""
"<p>\n"
@@ -478,6 +437,11 @@ msgid "Scheduled Date"
msgstr "Fecha planificada"
#. module: purchase
+#: field:purchase.order,currency_id:0
+msgid "Currency"
+msgstr ""
+
+#. module: purchase
#: field:purchase.order,journal_id:0
msgid "Journal"
msgstr "Diario"
@@ -510,6 +474,19 @@ msgid "Incoming Products"
msgstr ""
#. module: purchase
+#: view:purchase.order:0
+msgid "Request for Quotation "
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,partner_ref:0
+msgid ""
+"Reference of the sales order or quotation sent by your supplier. It's mainly "
+"used to do the matching when you receive the products as this reference is "
+"usually written on the delivery order sent by your supplier."
+msgstr ""
+
+#. module: purchase
#: view:purchase.config.settings:0
#: view:purchase.order.group:0
#: view:purchase.order.line_invoice:0
@@ -533,6 +510,11 @@ msgstr ""
"manualmente por el contable (control facturación = Manual)."
#. module: purchase
+#: model:mail.message.subtype,name:purchase.mt_rfq_approved
+msgid "RFQ Approved"
+msgstr ""
+
+#. module: purchase
#: view:purchase.config.settings:0
msgid "Apply"
msgstr ""
@@ -553,6 +535,11 @@ msgstr ""
"confirmado."
#. module: purchase
+#: model:mail.message.subtype,name:purchase.mt_rfq_confirmed
+msgid "RFQ Confirmed"
+msgstr ""
+
+#. module: purchase
#: view:purchase.order:0
msgid "Customer Address"
msgstr ""
@@ -577,7 +564,7 @@ msgid "Supplier"
msgstr "Proveedor"
#. module: purchase
-#: code:addons/purchase/purchase.py:508
+#: code:addons/purchase/purchase.py:525
#, python-format
msgid "Define expense account for this company: \"%s\" (id:%d)."
msgstr ""
@@ -601,7 +588,6 @@ msgstr "Subtotal"
#. module: purchase
#: field:purchase.order,shipped:0
-#: field:purchase.order,shipped_rate:0
msgid "Received"
msgstr "Recibido"
@@ -643,13 +629,20 @@ msgid "Invoices and Receptions"
msgstr ""
#. module: purchase
+#: model:process.transition,note:purchase.process_transition_packinginvoice0
+msgid ""
+"A Pick list generates an invoice. Depending on the Invoicing control of the "
+"sales order, the invoice is based on delivered or on ordered quantities."
+msgstr ""
+
+#. module: purchase
#: view:purchase.report:0
#: field:purchase.report,nbr:0
msgid "# of Lines"
msgstr "Nº de líneas"
#. module: purchase
-#: code:addons/purchase/wizard/purchase_line_invoice.py:110
+#: code:addons/purchase/wizard/purchase_line_invoice.py:106
#, python-format
msgid "Define expense account for this product: \"%s\" (id:%d)."
msgstr ""
@@ -670,8 +663,8 @@ msgid "It indicates that a picking has been done"
msgstr "Indica que un albarán ha sido realizado."
#. module: purchase
-#: code:addons/purchase/purchase.py:565
-#: code:addons/purchase/purchase.py:572
+#: code:addons/purchase/purchase.py:579
+#: code:addons/purchase/purchase.py:586
#, python-format
msgid "Unable to cancel this purchase order."
msgstr ""
@@ -736,6 +729,15 @@ msgid "Draft PO"
msgstr ""
#. module: purchase
+#: code:addons/purchase/purchase.py:941
+#: code:addons/purchase/purchase.py:956
+#: code:addons/purchase/purchase.py:960
+#: code:addons/purchase/wizard/purchase_order_group.py:47
+#, python-format
+msgid "Warning!"
+msgstr ""
+
+#. module: purchase
#: model:process.node,name:purchase.process_node_draftpurchaseorder0
#: model:process.node,name:purchase.process_node_draftpurchaseorder1
msgid "RFQ"
@@ -767,6 +769,11 @@ msgid "The tax amount"
msgstr "El importe de los impuestos."
#. module: purchase
+#: field:purchase.order,shipped_rate:0
+msgid "Received Ratio"
+msgstr ""
+
+#. module: purchase
#: selection:purchase.report,month:0
msgid "September"
msgstr "Septiembre"
@@ -798,7 +805,7 @@ msgid "Stock Moves"
msgstr "Movimientos de stock"
#. module: purchase
-#: code:addons/purchase/purchase.py:1158
+#: code:addons/purchase/purchase.py:1156
#, python-format
msgid "Draft Purchase Order created"
msgstr ""
@@ -819,11 +826,6 @@ msgid "Terms and Conditions"
msgstr ""
#. module: purchase
-#: field:purchase.order,currency_id:0
-msgid "unknown"
-msgstr ""
-
-#. module: purchase
#: help:purchase.order,date_order:0
msgid "Date on which this document has been created."
msgstr "Fecha de la creación de este documento."
@@ -917,12 +919,6 @@ msgid "Cancel"
msgstr "Cancelar"
#. module: purchase
-#: field:purchase.order,message_comment_ids:0
-#: help:purchase.order,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
-#. module: purchase
#: sql_constraint:purchase.order:0
msgid "Order Reference must be unique per Company!"
msgstr "¡La referencia de la compra debe ser única por compañía!"
@@ -956,14 +952,89 @@ msgid "Date Approved"
msgstr "Fecha aprobación"
#. module: purchase
-#: code:addons/purchase/purchase.py:806
-#, python-format
-msgid "Request for quotation <b>created</b>."
+#: view:product.product:0
+msgid "a draft purchase order"
msgstr ""
#. module: purchase
-#: view:product.product:0
-msgid "a draft purchase order"
+#: model:email.template,body_html:purchase.email_template_edi_purchase
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: #FFF; \">\n"
+"\n"
+" <p>Hello$ ${object.partner_id.name},</p>\n"
+" \n"
+" <p>Here is a ${object.state in ('draft', 'sent') and 'request for "
+"quotation' or 'purchase order confirmation'} from ${object.company_id.name}: "
+"</p>\n"
+" \n"
+" <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
+" &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
+" &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
+" &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
+"${object.pricelist_id.currency_id.name}</strong><br />\n"
+" &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
+" % if object.origin:\n"
+" &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
+" % endif\n"
+" % if object.partner_ref:\n"
+" &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
+" % endif\n"
+" % if object.validator:\n"
+" &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.validator.email "
+"or ''}?subject=Order%20${object.name}\">${object.validator.name}</a>\n"
+" % endif\n"
+" </p>\n"
+"\n"
+" <br/>\n"
+" <p>If you have any question, do not hesitate to contact us.</p>\n"
+" <p>Thank you!</p>\n"
+" <br/>\n"
+" <br/>\n"
+" <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
+"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
+"background-repeat: repeat no-repeat;\">\n"
+" <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
+"#DDD;\">\n"
+" <strong style=\"text-"
+"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
+" </div>\n"
+" <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
+"16px; background-color: #F2F2F2;\">\n"
+" <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
+" % if object.company_id.street:\n"
+" ${object.company_id.street}<br/>\n"
+" % endif\n"
+" % if object.company_id.street2:\n"
+" ${object.company_id.street2}<br/>\n"
+" % endif\n"
+" % if object.company_id.city or object.company_id.zip:\n"
+" ${object.company_id.zip} ${object.company_id.city}<br/>\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 ''}<br/>\n"
+" % endif\n"
+" </span>\n"
+" % if object.company_id.phone:\n"
+" <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
+"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
+"0px; padding-left: 0px; \">\n"
+" Phone:&nbsp; ${object.company_id.phone}\n"
+" </div>\n"
+" % endif\n"
+" % if object.company_id.website:\n"
+" <div>\n"
+" Web :&nbsp;<a "
+"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
+" </div>\n"
+" %endif\n"
+" <p></p>\n"
+" </div>\n"
+"</div>\n"
+" "
msgstr ""
#. module: purchase
@@ -1006,17 +1077,12 @@ msgid "Outgoing Mails"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:437
+#: code:addons/purchase/purchase.py:456
#, python-format
msgid "You cannot confirm a purchase order without any purchase order line."
msgstr ""
#. module: purchase
-#: model:ir.actions.server,name:purchase.actions_server_purchase_order_unread
-msgid "Purchase: Mark unread"
-msgstr ""
-
-#. module: purchase
#: help:purchase.order,message_ids:0
msgid "Messages and communication history"
msgstr ""
@@ -1028,7 +1094,7 @@ msgid "Destination Warehouse"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:973
+#: code:addons/purchase/purchase.py:941
#, python-format
msgid ""
"Selected Unit of Measure does not belong to the same category as the product "
@@ -1036,6 +1102,11 @@ msgid ""
msgstr ""
#. module: purchase
+#: view:purchase.order.line_invoice:0
+msgid "Select an Open Sales Order"
+msgstr ""
+
+#. module: purchase
#: model:ir.ui.menu,name:purchase.menu_purchase_unit_measure_purchase
#: model:ir.ui.menu,name:purchase.menu_purchase_uom_form_action
msgid "Units of Measure"
@@ -1047,18 +1118,12 @@ msgid "Manage pricelist per supplier"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:833
-#, python-format
-msgid "Purchase Order has been set to <b>draft</b>."
-msgstr ""
-
-#. module: purchase
#: view:board.board:0
msgid "Purchase Dashboard"
msgstr "Tablero de compras"
#. module: purchase
-#: code:addons/purchase/purchase.py:566
+#: code:addons/purchase/purchase.py:580
#, python-format
msgid "First cancel all receptions related to this purchase order."
msgstr ""
@@ -1097,9 +1162,9 @@ msgid "Unread Messages"
msgstr ""
#. module: purchase
-#: view:purchase.order.line_invoice:0
-msgid "Select an Open Sale Order"
-msgstr "Seleccionar un pedido de compra abierto"
+#: model:ir.ui.menu,name:purchase.menu_purchase_uom_categ_form_action
+msgid "Unit of Measure Categories"
+msgstr ""
#. module: purchase
#: view:purchase.order:0
@@ -1107,6 +1172,13 @@ msgid "Set to Draft"
msgstr "Cambiar a borrador"
#. module: purchase
+#: help:purchase.order,origin:0
+msgid ""
+"Reference of the document that generated this purchase order request; a "
+"sales order or an internal procurement request."
+msgstr ""
+
+#. module: purchase
#: view:purchase.order.line:0
msgid "Notes"
msgstr "Notas"
@@ -1136,7 +1208,7 @@ msgid "Stock Move"
msgstr "Moviemiento de stock"
#. module: purchase
-#: code:addons/purchase/purchase.py:255
+#: code:addons/purchase/purchase.py:260
#, python-format
msgid "Invalid Action!"
msgstr ""
@@ -1238,7 +1310,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:310
+#: code:addons/purchase/purchase.py:320
#, python-format
msgid "Please create Invoices."
msgstr ""
@@ -1328,7 +1400,7 @@ msgid "Purchase Order Line Make Invoice"
msgstr "Línea pedido de compra realiza factura"
#. module: purchase
-#: code:addons/purchase/purchase.py:1133
+#: code:addons/purchase/purchase.py:1141
#, python-format
msgid "PO: %s"
msgstr "PO: %s"
@@ -1339,7 +1411,7 @@ msgid "Send by EMail"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:498
+#: code:addons/purchase/purchase.py:515
#, python-format
msgid "Define purchase journal for this company: \"%s\" (id:%d)."
msgstr ""
@@ -1350,9 +1422,9 @@ msgid "Purchase Order "
msgstr ""
#. module: purchase
-#: view:purchase.order.line:0
-msgid "Manual Invoices"
-msgstr "Facturas manuales"
+#: help:purchase.config.settings,group_costing_method:0
+msgid "Allows you to compute product cost price based on average cost."
+msgstr ""
#. module: purchase
#: model:ir.actions.act_window,name:purchase.action_purchase_configuration
@@ -1506,8 +1578,8 @@ msgid "Compute product cost price based on average cost"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:340
-#: code:addons/purchase/wizard/purchase_line_invoice.py:141
+#: code:addons/purchase/purchase.py:350
+#: code:addons/purchase/wizard/purchase_line_invoice.py:137
#: model:ir.actions.act_window,name:purchase.act_res_partner_2_supplier_invoices
#: view:res.partner:0
#, python-format
@@ -1619,8 +1691,9 @@ msgid "Open Purchase Menu"
msgstr ""
#. module: purchase
-#: model:ir.model,name:purchase.model_mail_compose_message
-msgid "Email composition wizard"
+#: code:addons/purchase/purchase.py:1028
+#, python-format
+msgid "No address defined for the supplier"
msgstr ""
#. module: purchase
@@ -1693,11 +1766,11 @@ msgid "Purchase Order"
msgstr "Pedido de compra"
#. module: purchase
-#: code:addons/purchase/purchase.py:310
-#: code:addons/purchase/purchase.py:437
-#: code:addons/purchase/purchase.py:497
-#: code:addons/purchase/purchase.py:508
-#: code:addons/purchase/wizard/purchase_line_invoice.py:109
+#: code:addons/purchase/purchase.py:320
+#: code:addons/purchase/purchase.py:456
+#: code:addons/purchase/purchase.py:514
+#: code:addons/purchase/purchase.py:525
+#: code:addons/purchase/wizard/purchase_line_invoice.py:105
#, python-format
msgid "Error!"
msgstr ""
@@ -1719,15 +1792,6 @@ msgid ""
msgstr ""
#. module: purchase
-#: model:process.transition,note:purchase.process_transition_packinginvoice0
-msgid ""
-"A Pick list generates an invoice. Depending on the Invoicing control of the "
-"sale order, the invoice is based on delivered or on ordered quantities."
-msgstr ""
-"Un albarán genera una factura. Según el control de facturación en el pedido "
-"de venta, la factura se basa en las cantidades enviadas u ordenadas."
-
-#. module: purchase
#: selection:purchase.order,state:0
#: selection:purchase.order.line,state:0
#: selection:purchase.report,state:0
@@ -1740,9 +1804,8 @@ msgid "# of Purchase Order"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:827
-#, python-format
-msgid "Shipment <b>received</b>."
+#: model:ir.model,name:purchase.model_mail_compose_message
+msgid "Email composition wizard"
msgstr ""
#. module: purchase
@@ -1833,7 +1896,7 @@ msgid "RFQ_${(object.name or '').replace('/','_')}"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:988
+#: code:addons/purchase/purchase.py:956
#, python-format
msgid "The selected supplier only sells this product by %s"
msgstr "El proveedor seleccionado sólo vende este producto por %s"
@@ -1879,6 +1942,12 @@ msgid "Outgoing products to invoice"
msgstr "Productos salientes a facturar"
#. module: purchase
+#: report:purchase.order:0
+#: field:purchase.report,validator:0
+msgid "Validated By"
+msgstr "Validado por"
+
+#. module: purchase
#: view:purchase.report:0
#: field:purchase.report,delay_pass:0
msgid "Days to Deliver"
@@ -1968,9 +2037,9 @@ msgid "November"
msgstr "Noviembre"
#. module: purchase
-#: help:purchase.config.settings,group_costing_method:0
-msgid "Allows you to compute product cost price based on average cost."
-msgstr ""
+#: view:purchase.order.line:0
+msgid "Manual Invoices"
+msgstr "Facturas manuales"
#. module: purchase
#: report:purchase.order:0
@@ -1993,13 +2062,6 @@ msgid ""
msgstr ""
#. module: purchase
-#: help:purchase.order,origin:0
-msgid ""
-"Reference of the document that generated this purchase order request; a sale "
-"order or an internal procurement request."
-msgstr ""
-
-#. module: purchase
#: model:ir.ui.menu,name:purchase.menu_partner_categories_in_form
msgid "Partner Categories"
msgstr "Categorías de empresas"
@@ -2020,89 +2082,6 @@ msgid "Invoicing Settings"
msgstr ""
#. module: purchase
-#: model:email.template,body_html:purchase.email_template_edi_purchase
-msgid ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"\n"
-" <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
-"or ''},</p>\n"
-" \n"
-" <p>Here is a ${object.state in ('draft', 'sent') and 'request for "
-"quotation' or 'purchase order confirmation'} from ${object.company_id.name}: "
-"</p>\n"
-" \n"
-" <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
-" &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
-" &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
-" &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
-"${object.pricelist_id.currency_id.name}</strong><br />\n"
-" &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
-" % if object.origin:\n"
-" &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
-" % endif\n"
-" % if object.partner_ref:\n"
-" &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
-" % endif\n"
-" % if object.validator:\n"
-" &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.validator.email "
-"or ''}?subject=Order%20${object.name}\">${object.validator.name}</a>\n"
-" % endif\n"
-" </p>\n"
-"\n"
-" <br/>\n"
-" <p>If you have any question, do not hesitate to contact us.</p>\n"
-" <p>Thank you!</p>\n"
-" <br/>\n"
-" <br/>\n"
-" <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
-"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
-"background-repeat: repeat no-repeat;\">\n"
-" <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
-"#FFF;\">\n"
-" <strong style=\"text-"
-"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
-" </div>\n"
-" <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
-"16px; background-color: #F2F2F2;\">\n"
-" <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
-" % if object.company_id.street:\n"
-" ${object.company_id.street}<br/>\n"
-" % endif\n"
-" % if object.company_id.street2:\n"
-" ${object.company_id.street2}<br/>\n"
-" % endif\n"
-" % if object.company_id.city or object.company_id.zip:\n"
-" ${object.company_id.zip} ${object.company_id.city}<br/>\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 ''}<br/>\n"
-" % endif\n"
-" </span>\n"
-" % if object.company_id.phone:\n"
-" <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
-"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
-"0px; padding-left: 0px; \">\n"
-" Phone:&nbsp; ${object.company_id.phone}\n"
-" </div>\n"
-" % endif\n"
-" % if object.company_id.website:\n"
-" <div>\n"
-" Web :&nbsp;<a "
-"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
-" </div>\n"
-" %endif\n"
-" <p></p>\n"
-" </div>\n"
-"</div>\n"
-" "
-msgstr ""
-
-#. module: purchase
#: model:ir.actions.act_window,name:purchase.action_purchase_order_by_user_all
msgid "Total Orders by User per month"
msgstr "Total pedidos por usuario mensual"
@@ -2113,21 +2092,19 @@ msgid "Based on incoming shipments"
msgstr ""
#. module: purchase
+#: code:addons/purchase/purchase.py:1018
+#, python-format
+msgid "No default supplier defined for this product"
+msgstr ""
+
+#. module: purchase
#: view:purchase.report:0
#: field:purchase.report,warehouse_id:0
msgid "Warehouse"
msgstr "Almacén"
#. module: purchase
-#: help:purchase.order,partner_ref:0
-msgid ""
-"Reference of the sale order or quotation sent by your supplier. It's mainly "
-"used to do the matching when you receive the products as this reference is "
-"usually written on the delivery order sent by your supplier."
-msgstr ""
-
-#. module: purchase
-#: code:addons/purchase/purchase.py:991
+#: code:addons/purchase/purchase.py:960
#, python-format
msgid ""
"The selected supplier has a minimal quantity set to %s %s, you should not "
@@ -2214,8 +2191,8 @@ msgstr ""
" "
#. module: purchase
-#: view:product.product:0
-msgid "When you sell this service to a customer,"
+#: field:purchase.order,message_summary:0
+msgid "Summary"
msgstr ""
#. module: purchase
@@ -2225,6 +2202,11 @@ msgid "Pricelist Versions"
msgstr "Versiones de tarifa"
#. module: purchase
+#: field:purchase.order,payment_term_id:0
+msgid "Payment Term"
+msgstr ""
+
+#. module: purchase
#: view:purchase.order:0
msgid "Purchase orders which are in draft state"
msgstr "Ordenes de compra que se encuentran en estado de borrador"
@@ -2323,6 +2305,13 @@ msgstr "Pedidos"
#~ msgid "Origin"
#~ msgstr "Origen"
+#~ msgid ""
+#~ "A Pick list generates an invoice. Depending on the Invoicing control of the "
+#~ "sale order, the invoice is based on delivered or on ordered quantities."
+#~ msgstr ""
+#~ "Un albarán genera una factura. Según el control de facturación en el pedido "
+#~ "de venta, la factura se basa en las cantidades enviadas u ordenadas."
+
#~ msgid "Convert to Purchase Order"
#~ msgstr "Convertir a pedido de compra"
@@ -2537,6 +2526,9 @@ msgstr "Pedidos"
#~ msgid "Purchase Management"
#~ msgstr "Compras"
+#~ msgid "Select an Open Sale Order"
+#~ msgstr "Seleccionar un pedido de compra abierto"
+
#~ msgid ""
#~ "unique number of the purchase order,computed automatically when the purchase "
#~ "order is created"
diff --git a/addons/purchase/i18n/es_EC.po b/addons/purchase/i18n/es_EC.po
index 8fc581321f6..9e3fb9b8df9 100644
--- a/addons/purchase/i18n/es_EC.po
+++ b/addons/purchase/i18n/es_EC.po
@@ -7,15 +7,15 @@ msgid ""
msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
"PO-Revision-Date: 2011-02-09 21:06+0000\n"
"Last-Translator: mariofabian <mcdc1983@gmail.com>\n"
"Language-Team: Spanish (Ecuador) <es_EC@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: 2012-12-04 05:12+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:20+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
#. module: purchase
#: model:res.groups,name:purchase.group_analytic_accounting
@@ -61,11 +61,6 @@ msgstr ""
"el precio del proveedor para los productos/cantidades seleccionados."
#. module: purchase
-#: model:ir.actions.server,name:purchase.actions_server_purchase_order_read
-msgid "Purchase: Mark read"
-msgstr ""
-
-#. module: purchase
#: view:purchase.report:0
#: field:purchase.report,day:0
msgid "Day"
@@ -106,16 +101,13 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:973
-#: code:addons/purchase/purchase.py:988
-#: code:addons/purchase/purchase.py:991
-#: code:addons/purchase/wizard/purchase_order_group.py:47
+#: code:addons/purchase/purchase.py:1024
#, python-format
-msgid "Warning!"
+msgid "Configuration Error!"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:573
+#: code:addons/purchase/purchase.py:587
#, python-format
msgid "You must first cancel all receptions related to this purchase order."
msgstr ""
@@ -134,10 +126,10 @@ msgid "Purchase-Standard Price"
msgstr "Precio compra-estándar"
#. module: purchase
-#: report:purchase.order:0
-#: field:purchase.report,validator:0
-msgid "Validated By"
-msgstr "Validado por"
+#: code:addons/purchase/purchase.py:1011
+#, python-format
+msgid "No supplier defined for this product !"
+msgstr ""
#. module: purchase
#: model:ir.actions.act_window,help:purchase.action_picking_tree4_picking_to_invoice
@@ -160,12 +152,6 @@ msgid "Average Price"
msgstr "Precio promedio"
#. module: purchase
-#: code:addons/purchase/purchase.py:830
-#, python-format
-msgid "Invoice <b>paid</b>."
-msgstr ""
-
-#. module: purchase
#: view:purchase.order:0
msgid "Purchase order which are in the exception state"
msgstr "Pedidos de compra que están en estado de excepción"
@@ -237,7 +223,7 @@ msgstr ""
"las líneas del pedido de compra."
#. module: purchase
-#: code:addons/purchase/purchase.py:255
+#: code:addons/purchase/purchase.py:260
#, python-format
msgid "In order to delete a purchase order, you must cancel it first."
msgstr ""
@@ -263,29 +249,12 @@ msgid "Total Untaxed amount"
msgstr "Total importe base"
#. module: purchase
-#: model:ir.ui.menu,name:purchase.menu_purchase_uom_categ_form_action
-msgid "Unit of Measure Categories"
-msgstr ""
-
-#. module: purchase
#: view:purchase.report:0
#: field:purchase.report,category_id:0
msgid "Category"
msgstr "Categoría"
#. module: purchase
-#: view:purchase.order:0
-msgid "Quotation "
-msgstr ""
-
-#. module: purchase
-#: code:addons/purchase/purchase.py:810
-#, python-format
-msgid ""
-"Quotation for <em>%s</em> <b>converted</b> to a Purchase Order of %s %s."
-msgstr ""
-
-#. module: purchase
#: model:process.transition,note:purchase.process_transition_purchaseinvoice0
msgid ""
"A purchase order generates a supplier invoice, as soon as it is confirmed by "
@@ -353,14 +322,16 @@ msgid "October"
msgstr "Octubre"
#. module: purchase
-#: code:addons/purchase/purchase.py:837
+#: code:addons/purchase/purchase.py:1024
#, python-format
-msgid "Purchase Order for <em>%s</em> <b>cancelled</b>."
+msgid ""
+"The product \"%s\" has been defined with your company as reseller which "
+"seems to be a configuration error!"
msgstr ""
#. module: purchase
-#: field:purchase.order,message_summary:0
-msgid "Summary"
+#: view:product.product:0
+msgid "When you sell this service to a customer,"
msgstr ""
#. module: purchase
@@ -389,12 +360,6 @@ msgid "Quantity"
msgstr "Cantidad"
#. module: purchase
-#: code:addons/purchase/purchase.py:819
-#, python-format
-msgid "Shipment <em>%s</em> <b>scheduled</b> for %s."
-msgstr ""
-
-#. module: purchase
#: field:purchase.order,fiscal_position:0
msgid "Fiscal Position"
msgstr "Posición fiscal"
@@ -452,12 +417,6 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:824
-#, python-format
-msgid "Draft Invoice of %s %s is <b>waiting for validation</b>."
-msgstr ""
-
-#. module: purchase
#: model:ir.actions.act_window,help:purchase.purchase_line_form_action2
msgid ""
"<p>\n"
@@ -478,6 +437,11 @@ msgid "Scheduled Date"
msgstr "Fecha programada"
#. module: purchase
+#: field:purchase.order,currency_id:0
+msgid "Currency"
+msgstr ""
+
+#. module: purchase
#: field:purchase.order,journal_id:0
msgid "Journal"
msgstr "Diario"
@@ -510,6 +474,19 @@ msgid "Incoming Products"
msgstr ""
#. module: purchase
+#: view:purchase.order:0
+msgid "Request for Quotation "
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,partner_ref:0
+msgid ""
+"Reference of the sales order or quotation sent by your supplier. It's mainly "
+"used to do the matching when you receive the products as this reference is "
+"usually written on the delivery order sent by your supplier."
+msgstr ""
+
+#. module: purchase
#: view:purchase.config.settings:0
#: view:purchase.order.group:0
#: view:purchase.order.line_invoice:0
@@ -533,6 +510,11 @@ msgstr ""
"manualmente por el contable (control facturación = Manual)."
#. module: purchase
+#: model:mail.message.subtype,name:purchase.mt_rfq_approved
+msgid "RFQ Approved"
+msgstr ""
+
+#. module: purchase
#: view:purchase.config.settings:0
msgid "Apply"
msgstr ""
@@ -553,6 +535,11 @@ msgstr ""
"confirmado."
#. module: purchase
+#: model:mail.message.subtype,name:purchase.mt_rfq_confirmed
+msgid "RFQ Confirmed"
+msgstr ""
+
+#. module: purchase
#: view:purchase.order:0
msgid "Customer Address"
msgstr ""
@@ -577,7 +564,7 @@ msgid "Supplier"
msgstr "Proveedor"
#. module: purchase
-#: code:addons/purchase/purchase.py:508
+#: code:addons/purchase/purchase.py:525
#, python-format
msgid "Define expense account for this company: \"%s\" (id:%d)."
msgstr ""
@@ -601,7 +588,6 @@ msgstr "Subtotal"
#. module: purchase
#: field:purchase.order,shipped:0
-#: field:purchase.order,shipped_rate:0
msgid "Received"
msgstr "Recibido"
@@ -643,13 +629,20 @@ msgid "Invoices and Receptions"
msgstr ""
#. module: purchase
+#: model:process.transition,note:purchase.process_transition_packinginvoice0
+msgid ""
+"A Pick list generates an invoice. Depending on the Invoicing control of the "
+"sales order, the invoice is based on delivered or on ordered quantities."
+msgstr ""
+
+#. module: purchase
#: view:purchase.report:0
#: field:purchase.report,nbr:0
msgid "# of Lines"
msgstr "Nº de líneas"
#. module: purchase
-#: code:addons/purchase/wizard/purchase_line_invoice.py:110
+#: code:addons/purchase/wizard/purchase_line_invoice.py:106
#, python-format
msgid "Define expense account for this product: \"%s\" (id:%d)."
msgstr ""
@@ -670,8 +663,8 @@ msgid "It indicates that a picking has been done"
msgstr "Indica que un albarán ha sido realizado"
#. module: purchase
-#: code:addons/purchase/purchase.py:565
-#: code:addons/purchase/purchase.py:572
+#: code:addons/purchase/purchase.py:579
+#: code:addons/purchase/purchase.py:586
#, python-format
msgid "Unable to cancel this purchase order."
msgstr ""
@@ -736,6 +729,15 @@ msgid "Draft PO"
msgstr ""
#. module: purchase
+#: code:addons/purchase/purchase.py:941
+#: code:addons/purchase/purchase.py:956
+#: code:addons/purchase/purchase.py:960
+#: code:addons/purchase/wizard/purchase_order_group.py:47
+#, python-format
+msgid "Warning!"
+msgstr ""
+
+#. module: purchase
#: model:process.node,name:purchase.process_node_draftpurchaseorder0
#: model:process.node,name:purchase.process_node_draftpurchaseorder1
msgid "RFQ"
@@ -767,6 +769,11 @@ msgid "The tax amount"
msgstr "El importe impuestos"
#. module: purchase
+#: field:purchase.order,shipped_rate:0
+msgid "Received Ratio"
+msgstr ""
+
+#. module: purchase
#: selection:purchase.report,month:0
msgid "September"
msgstr "Septiembre"
@@ -798,7 +805,7 @@ msgid "Stock Moves"
msgstr "Movimientos de stock"
#. module: purchase
-#: code:addons/purchase/purchase.py:1158
+#: code:addons/purchase/purchase.py:1156
#, python-format
msgid "Draft Purchase Order created"
msgstr ""
@@ -819,11 +826,6 @@ msgid "Terms and Conditions"
msgstr ""
#. module: purchase
-#: field:purchase.order,currency_id:0
-msgid "unknown"
-msgstr ""
-
-#. module: purchase
#: help:purchase.order,date_order:0
msgid "Date on which this document has been created."
msgstr "Fecha de la creación de este documento."
@@ -917,12 +919,6 @@ msgid "Cancel"
msgstr "Cancelar"
#. module: purchase
-#: field:purchase.order,message_comment_ids:0
-#: help:purchase.order,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
-#. module: purchase
#: sql_constraint:purchase.order:0
msgid "Order Reference must be unique per Company!"
msgstr "¡La orden de referencia debe ser única por Compañía!"
@@ -956,14 +952,89 @@ msgid "Date Approved"
msgstr "Fecha aprobación"
#. module: purchase
-#: code:addons/purchase/purchase.py:806
-#, python-format
-msgid "Request for quotation <b>created</b>."
+#: view:product.product:0
+msgid "a draft purchase order"
msgstr ""
#. module: purchase
-#: view:product.product:0
-msgid "a draft purchase order"
+#: model:email.template,body_html:purchase.email_template_edi_purchase
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: #FFF; \">\n"
+"\n"
+" <p>Hello$ ${object.partner_id.name},</p>\n"
+" \n"
+" <p>Here is a ${object.state in ('draft', 'sent') and 'request for "
+"quotation' or 'purchase order confirmation'} from ${object.company_id.name}: "
+"</p>\n"
+" \n"
+" <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
+" &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
+" &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
+" &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
+"${object.pricelist_id.currency_id.name}</strong><br />\n"
+" &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
+" % if object.origin:\n"
+" &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
+" % endif\n"
+" % if object.partner_ref:\n"
+" &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
+" % endif\n"
+" % if object.validator:\n"
+" &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.validator.email "
+"or ''}?subject=Order%20${object.name}\">${object.validator.name}</a>\n"
+" % endif\n"
+" </p>\n"
+"\n"
+" <br/>\n"
+" <p>If you have any question, do not hesitate to contact us.</p>\n"
+" <p>Thank you!</p>\n"
+" <br/>\n"
+" <br/>\n"
+" <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
+"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
+"background-repeat: repeat no-repeat;\">\n"
+" <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
+"#DDD;\">\n"
+" <strong style=\"text-"
+"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
+" </div>\n"
+" <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
+"16px; background-color: #F2F2F2;\">\n"
+" <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
+" % if object.company_id.street:\n"
+" ${object.company_id.street}<br/>\n"
+" % endif\n"
+" % if object.company_id.street2:\n"
+" ${object.company_id.street2}<br/>\n"
+" % endif\n"
+" % if object.company_id.city or object.company_id.zip:\n"
+" ${object.company_id.zip} ${object.company_id.city}<br/>\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 ''}<br/>\n"
+" % endif\n"
+" </span>\n"
+" % if object.company_id.phone:\n"
+" <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
+"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
+"0px; padding-left: 0px; \">\n"
+" Phone:&nbsp; ${object.company_id.phone}\n"
+" </div>\n"
+" % endif\n"
+" % if object.company_id.website:\n"
+" <div>\n"
+" Web :&nbsp;<a "
+"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
+" </div>\n"
+" %endif\n"
+" <p></p>\n"
+" </div>\n"
+"</div>\n"
+" "
msgstr ""
#. module: purchase
@@ -1006,17 +1077,12 @@ msgid "Outgoing Mails"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:437
+#: code:addons/purchase/purchase.py:456
#, python-format
msgid "You cannot confirm a purchase order without any purchase order line."
msgstr ""
#. module: purchase
-#: model:ir.actions.server,name:purchase.actions_server_purchase_order_unread
-msgid "Purchase: Mark unread"
-msgstr ""
-
-#. module: purchase
#: help:purchase.order,message_ids:0
msgid "Messages and communication history"
msgstr ""
@@ -1028,7 +1094,7 @@ msgid "Destination Warehouse"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:973
+#: code:addons/purchase/purchase.py:941
#, python-format
msgid ""
"Selected Unit of Measure does not belong to the same category as the product "
@@ -1036,6 +1102,11 @@ msgid ""
msgstr ""
#. module: purchase
+#: view:purchase.order.line_invoice:0
+msgid "Select an Open Sales Order"
+msgstr ""
+
+#. module: purchase
#: model:ir.ui.menu,name:purchase.menu_purchase_unit_measure_purchase
#: model:ir.ui.menu,name:purchase.menu_purchase_uom_form_action
msgid "Units of Measure"
@@ -1047,18 +1118,12 @@ msgid "Manage pricelist per supplier"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:833
-#, python-format
-msgid "Purchase Order has been set to <b>draft</b>."
-msgstr ""
-
-#. module: purchase
#: view:board.board:0
msgid "Purchase Dashboard"
msgstr "Tablero de compras"
#. module: purchase
-#: code:addons/purchase/purchase.py:566
+#: code:addons/purchase/purchase.py:580
#, python-format
msgid "First cancel all receptions related to this purchase order."
msgstr ""
@@ -1097,9 +1162,9 @@ msgid "Unread Messages"
msgstr ""
#. module: purchase
-#: view:purchase.order.line_invoice:0
-msgid "Select an Open Sale Order"
-msgstr "Seleccione una orden de venta abierta"
+#: model:ir.ui.menu,name:purchase.menu_purchase_uom_categ_form_action
+msgid "Unit of Measure Categories"
+msgstr ""
#. module: purchase
#: view:purchase.order:0
@@ -1107,6 +1172,13 @@ msgid "Set to Draft"
msgstr "Cambiar a borrador"
#. module: purchase
+#: help:purchase.order,origin:0
+msgid ""
+"Reference of the document that generated this purchase order request; a "
+"sales order or an internal procurement request."
+msgstr ""
+
+#. module: purchase
#: view:purchase.order.line:0
msgid "Notes"
msgstr "Notas"
@@ -1136,7 +1208,7 @@ msgid "Stock Move"
msgstr "Movimiento de stock"
#. module: purchase
-#: code:addons/purchase/purchase.py:255
+#: code:addons/purchase/purchase.py:260
#, python-format
msgid "Invalid Action!"
msgstr ""
@@ -1238,7 +1310,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:310
+#: code:addons/purchase/purchase.py:320
#, python-format
msgid "Please create Invoices."
msgstr ""
@@ -1328,7 +1400,7 @@ msgid "Purchase Order Line Make Invoice"
msgstr "Línea de pedido de compra realizar factura"
#. module: purchase
-#: code:addons/purchase/purchase.py:1133
+#: code:addons/purchase/purchase.py:1141
#, python-format
msgid "PO: %s"
msgstr "PO: %s"
@@ -1339,7 +1411,7 @@ msgid "Send by EMail"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:498
+#: code:addons/purchase/purchase.py:515
#, python-format
msgid "Define purchase journal for this company: \"%s\" (id:%d)."
msgstr ""
@@ -1350,9 +1422,9 @@ msgid "Purchase Order "
msgstr ""
#. module: purchase
-#: view:purchase.order.line:0
-msgid "Manual Invoices"
-msgstr "Facturas manuales"
+#: help:purchase.config.settings,group_costing_method:0
+msgid "Allows you to compute product cost price based on average cost."
+msgstr ""
#. module: purchase
#: model:ir.actions.act_window,name:purchase.action_purchase_configuration
@@ -1506,8 +1578,8 @@ msgid "Compute product cost price based on average cost"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:340
-#: code:addons/purchase/wizard/purchase_line_invoice.py:141
+#: code:addons/purchase/purchase.py:350
+#: code:addons/purchase/wizard/purchase_line_invoice.py:137
#: model:ir.actions.act_window,name:purchase.act_res_partner_2_supplier_invoices
#: view:res.partner:0
#, python-format
@@ -1619,8 +1691,9 @@ msgid "Open Purchase Menu"
msgstr ""
#. module: purchase
-#: model:ir.model,name:purchase.model_mail_compose_message
-msgid "Email composition wizard"
+#: code:addons/purchase/purchase.py:1028
+#, python-format
+msgid "No address defined for the supplier"
msgstr ""
#. module: purchase
@@ -1693,11 +1766,11 @@ msgid "Purchase Order"
msgstr "Orden de compra"
#. module: purchase
-#: code:addons/purchase/purchase.py:310
-#: code:addons/purchase/purchase.py:437
-#: code:addons/purchase/purchase.py:497
-#: code:addons/purchase/purchase.py:508
-#: code:addons/purchase/wizard/purchase_line_invoice.py:109
+#: code:addons/purchase/purchase.py:320
+#: code:addons/purchase/purchase.py:456
+#: code:addons/purchase/purchase.py:514
+#: code:addons/purchase/purchase.py:525
+#: code:addons/purchase/wizard/purchase_line_invoice.py:105
#, python-format
msgid "Error!"
msgstr ""
@@ -1719,15 +1792,6 @@ msgid ""
msgstr ""
#. module: purchase
-#: model:process.transition,note:purchase.process_transition_packinginvoice0
-msgid ""
-"A Pick list generates an invoice. Depending on the Invoicing control of the "
-"sale order, the invoice is based on delivered or on ordered quantities."
-msgstr ""
-"Un albarán genera una factura. Según el control de facturación en el pedido "
-"de venta, la factura se basa en las cantidades enviadas u ordenadas."
-
-#. module: purchase
#: selection:purchase.order,state:0
#: selection:purchase.order.line,state:0
#: selection:purchase.report,state:0
@@ -1740,9 +1804,8 @@ msgid "# of Purchase Order"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:827
-#, python-format
-msgid "Shipment <b>received</b>."
+#: model:ir.model,name:purchase.model_mail_compose_message
+msgid "Email composition wizard"
msgstr ""
#. module: purchase
@@ -1833,7 +1896,7 @@ msgid "RFQ_${(object.name or '').replace('/','_')}"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:988
+#: code:addons/purchase/purchase.py:956
#, python-format
msgid "The selected supplier only sells this product by %s"
msgstr "El proveedor seleccionado sólo vende este producto por %s"
@@ -1879,6 +1942,12 @@ msgid "Outgoing products to invoice"
msgstr "Productos salientes a facturar"
#. module: purchase
+#: report:purchase.order:0
+#: field:purchase.report,validator:0
+msgid "Validated By"
+msgstr "Validado por"
+
+#. module: purchase
#: view:purchase.report:0
#: field:purchase.report,delay_pass:0
msgid "Days to Deliver"
@@ -1968,9 +2037,9 @@ msgid "November"
msgstr "Noviembre"
#. module: purchase
-#: help:purchase.config.settings,group_costing_method:0
-msgid "Allows you to compute product cost price based on average cost."
-msgstr ""
+#: view:purchase.order.line:0
+msgid "Manual Invoices"
+msgstr "Facturas manuales"
#. module: purchase
#: report:purchase.order:0
@@ -1993,13 +2062,6 @@ msgid ""
msgstr ""
#. module: purchase
-#: help:purchase.order,origin:0
-msgid ""
-"Reference of the document that generated this purchase order request; a sale "
-"order or an internal procurement request."
-msgstr ""
-
-#. module: purchase
#: model:ir.ui.menu,name:purchase.menu_partner_categories_in_form
msgid "Partner Categories"
msgstr "Categorías de empresas"
@@ -2020,89 +2082,6 @@ msgid "Invoicing Settings"
msgstr ""
#. module: purchase
-#: model:email.template,body_html:purchase.email_template_edi_purchase
-msgid ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"\n"
-" <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
-"or ''},</p>\n"
-" \n"
-" <p>Here is a ${object.state in ('draft', 'sent') and 'request for "
-"quotation' or 'purchase order confirmation'} from ${object.company_id.name}: "
-"</p>\n"
-" \n"
-" <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
-" &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
-" &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
-" &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
-"${object.pricelist_id.currency_id.name}</strong><br />\n"
-" &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
-" % if object.origin:\n"
-" &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
-" % endif\n"
-" % if object.partner_ref:\n"
-" &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
-" % endif\n"
-" % if object.validator:\n"
-" &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.validator.email "
-"or ''}?subject=Order%20${object.name}\">${object.validator.name}</a>\n"
-" % endif\n"
-" </p>\n"
-"\n"
-" <br/>\n"
-" <p>If you have any question, do not hesitate to contact us.</p>\n"
-" <p>Thank you!</p>\n"
-" <br/>\n"
-" <br/>\n"
-" <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
-"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
-"background-repeat: repeat no-repeat;\">\n"
-" <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
-"#FFF;\">\n"
-" <strong style=\"text-"
-"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
-" </div>\n"
-" <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
-"16px; background-color: #F2F2F2;\">\n"
-" <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
-" % if object.company_id.street:\n"
-" ${object.company_id.street}<br/>\n"
-" % endif\n"
-" % if object.company_id.street2:\n"
-" ${object.company_id.street2}<br/>\n"
-" % endif\n"
-" % if object.company_id.city or object.company_id.zip:\n"
-" ${object.company_id.zip} ${object.company_id.city}<br/>\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 ''}<br/>\n"
-" % endif\n"
-" </span>\n"
-" % if object.company_id.phone:\n"
-" <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
-"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
-"0px; padding-left: 0px; \">\n"
-" Phone:&nbsp; ${object.company_id.phone}\n"
-" </div>\n"
-" % endif\n"
-" % if object.company_id.website:\n"
-" <div>\n"
-" Web :&nbsp;<a "
-"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
-" </div>\n"
-" %endif\n"
-" <p></p>\n"
-" </div>\n"
-"</div>\n"
-" "
-msgstr ""
-
-#. module: purchase
#: model:ir.actions.act_window,name:purchase.action_purchase_order_by_user_all
msgid "Total Orders by User per month"
msgstr "Total pedidos por usuario mensual"
@@ -2113,21 +2092,19 @@ msgid "Based on incoming shipments"
msgstr ""
#. module: purchase
+#: code:addons/purchase/purchase.py:1018
+#, python-format
+msgid "No default supplier defined for this product"
+msgstr ""
+
+#. module: purchase
#: view:purchase.report:0
#: field:purchase.report,warehouse_id:0
msgid "Warehouse"
msgstr "Almacén"
#. module: purchase
-#: help:purchase.order,partner_ref:0
-msgid ""
-"Reference of the sale order or quotation sent by your supplier. It's mainly "
-"used to do the matching when you receive the products as this reference is "
-"usually written on the delivery order sent by your supplier."
-msgstr ""
-
-#. module: purchase
-#: code:addons/purchase/purchase.py:991
+#: code:addons/purchase/purchase.py:960
#, python-format
msgid ""
"The selected supplier has a minimal quantity set to %s %s, you should not "
@@ -2214,8 +2191,8 @@ msgstr ""
" "
#. module: purchase
-#: view:product.product:0
-msgid "When you sell this service to a customer,"
+#: field:purchase.order,message_summary:0
+msgid "Summary"
msgstr ""
#. module: purchase
@@ -2225,6 +2202,11 @@ msgid "Pricelist Versions"
msgstr "Versiones de lista de precios"
#. module: purchase
+#: field:purchase.order,payment_term_id:0
+msgid "Payment Term"
+msgstr ""
+
+#. module: purchase
#: view:purchase.order:0
msgid "Purchase orders which are in draft state"
msgstr "Pedidos de compra en estado borrador"
@@ -2569,6 +2551,9 @@ msgstr "Pedidos"
#~ msgid "Current purchases"
#~ msgstr "Compras actuales"
+#~ msgid "Select an Open Sale Order"
+#~ msgstr "Seleccione una orden de venta abierta"
+
#, python-format
#~ msgid "Purchase order '%s' is confirmed."
#~ msgstr "Pedido de compra '%s' está confirmado."
@@ -2619,6 +2604,13 @@ msgstr "Pedidos"
#~ msgid "Origin"
#~ msgstr "Orígen"
+#~ msgid ""
+#~ "A Pick list generates an invoice. Depending on the Invoicing control of the "
+#~ "sale order, the invoice is based on delivered or on ordered quantities."
+#~ msgstr ""
+#~ "Un albarán genera una factura. Según el control de facturación en el pedido "
+#~ "de venta, la factura se basa en las cantidades enviadas u ordenadas."
+
#~ msgid "Convert to Purchase Order"
#~ msgstr "Convertir a orden de compra"
diff --git a/addons/purchase/i18n/et.po b/addons/purchase/i18n/et.po
index fc0617b74e1..e5a946f3b7c 100644
--- a/addons/purchase/i18n/et.po
+++ b/addons/purchase/i18n/et.po
@@ -6,14 +6,14 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
-"PO-Revision-Date: 2012-12-20 19:51+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
+"PO-Revision-Date: 2012-12-21 20:41+0000\n"
"Last-Translator: Ahti Hinnov <sipelgas@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: 2012-12-21 04:40+0000\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:19+0000\n"
"X-Generator: Launchpad (build 16378)\n"
#. module: purchase
@@ -37,7 +37,7 @@ msgstr ""
#. module: purchase
#: field:purchase.order,invoice_method:0
msgid "Invoicing Control"
-msgstr "Arveldamishaldus"
+msgstr "Arveldus"
#. module: purchase
#: model:ir.actions.report.xml,name:purchase.report_purchase_order
@@ -130,11 +130,6 @@ msgstr ""
"arvutab see tarnija hinna valitud toodetele/kogustele."
#. module: purchase
-#: model:ir.actions.server,name:purchase.actions_server_purchase_order_read
-msgid "Purchase: Mark read"
-msgstr ""
-
-#. module: purchase
#: view:purchase.report:0
#: field:purchase.report,day:0
msgid "Day"
@@ -155,7 +150,7 @@ msgstr ""
#: model:process.node,name:purchase.process_node_packinglist0
#: model:process.node,name:purchase.process_node_productrecept0
msgid "Incoming Products"
-msgstr "Sissetulevad Tooted"
+msgstr "Sisenevad tooted"
#. module: purchase
#: view:purchase.order:0
@@ -175,16 +170,13 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:973
-#: code:addons/purchase/purchase.py:988
-#: code:addons/purchase/purchase.py:991
-#: code:addons/purchase/wizard/purchase_order_group.py:47
+#: code:addons/purchase/purchase.py:1024
#, python-format
-msgid "Warning!"
+msgid "Configuration Error!"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:573
+#: code:addons/purchase/purchase.py:587
#, python-format
msgid "You must first cancel all receptions related to this purchase order."
msgstr ""
@@ -201,10 +193,10 @@ msgid "Purchase-Standard Price"
msgstr ""
#. module: purchase
-#: report:purchase.order:0
-#: field:purchase.report,validator:0
-msgid "Validated By"
-msgstr "Valideerija:"
+#: code:addons/purchase/purchase.py:1011
+#, python-format
+msgid "No supplier defined for this product !"
+msgstr ""
#. module: purchase
#: model:ir.actions.act_window,help:purchase.action_picking_tree4_picking_to_invoice
@@ -227,12 +219,6 @@ msgid "Average Price"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:830
-#, python-format
-msgid "Invoice <b>paid</b>."
-msgstr ""
-
-#. module: purchase
#: view:purchase.order:0
msgid "Purchase order which are in the exception state"
msgstr ""
@@ -297,7 +283,7 @@ msgstr ""
"planeeritud kuupäev."
#. module: purchase
-#: code:addons/purchase/purchase.py:255
+#: code:addons/purchase/purchase.py:260
#, python-format
msgid "In order to delete a purchase order, you must cancel it first."
msgstr ""
@@ -323,29 +309,12 @@ msgid "Total Untaxed amount"
msgstr ""
#. module: purchase
-#: model:ir.ui.menu,name:purchase.menu_purchase_uom_categ_form_action
-msgid "Unit of Measure Categories"
-msgstr ""
-
-#. module: purchase
#: view:purchase.report:0
#: field:purchase.report,category_id:0
msgid "Category"
msgstr ""
#. module: purchase
-#: view:purchase.order:0
-msgid "Quotation "
-msgstr "Pakkumine "
-
-#. module: purchase
-#: code:addons/purchase/purchase.py:810
-#, python-format
-msgid ""
-"Quotation for <em>%s</em> <b>converted</b> to a Purchase Order of %s %s."
-msgstr ""
-
-#. module: purchase
#: model:process.transition,note:purchase.process_transition_purchaseinvoice0
msgid ""
"A purchase order generates a supplier invoice, as soon as it is confirmed by "
@@ -410,14 +379,16 @@ msgid "October"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:837
+#: code:addons/purchase/purchase.py:1024
#, python-format
-msgid "Purchase Order for <em>%s</em> <b>cancelled</b>."
+msgid ""
+"The product \"%s\" has been defined with your company as reseller which "
+"seems to be a configuration error!"
msgstr ""
#. module: purchase
-#: field:purchase.order,message_summary:0
-msgid "Summary"
+#: view:product.product:0
+msgid "When you sell this service to a customer,"
msgstr ""
#. module: purchase
@@ -446,12 +417,6 @@ msgid "Quantity"
msgstr "Kogus"
#. module: purchase
-#: code:addons/purchase/purchase.py:819
-#, python-format
-msgid "Shipment <em>%s</em> <b>scheduled</b> for %s."
-msgstr ""
-
-#. module: purchase
#: field:purchase.order,fiscal_position:0
msgid "Fiscal Position"
msgstr "Finantspositsioon"
@@ -466,7 +431,7 @@ msgstr ""
#: model:ir.ui.menu,name:purchase.menu_action_picking_tree4
#: view:purchase.order:0
msgid "Incoming Shipments"
-msgstr ""
+msgstr "Sisenevad saadetised"
#. module: purchase
#: model:ir.actions.act_window,help:purchase.act_res_partner_2_supplier_invoices
@@ -499,7 +464,7 @@ msgstr "Nõutud aeg"
#: view:purchase.order:0
#: view:purchase.order.line:0
msgid "Purchase Order Lines"
-msgstr ""
+msgstr "Ostukorralduse read"
#. module: purchase
#: help:purchase.order,dest_address_id:0
@@ -509,12 +474,6 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:824
-#, python-format
-msgid "Draft Invoice of %s %s is <b>waiting for validation</b>."
-msgstr ""
-
-#. module: purchase
#: model:ir.actions.act_window,help:purchase.purchase_line_form_action2
msgid ""
"<p>\n"
@@ -535,6 +494,11 @@ msgid "Scheduled Date"
msgstr "Planeeritud kuupäev"
#. module: purchase
+#: field:purchase.order,currency_id:0
+msgid "Currency"
+msgstr ""
+
+#. module: purchase
#: field:purchase.order,journal_id:0
msgid "Journal"
msgstr ""
@@ -543,7 +507,7 @@ msgstr ""
#: view:board.board:0
#: model:ir.actions.act_window,name:purchase.purchase_draft
msgid "Request for Quotations"
-msgstr ""
+msgstr "Hinnapäringud"
#. module: purchase
#: view:purchase.order:0
@@ -554,11 +518,24 @@ msgstr ""
#: view:product.product:0
#: field:product.template,purchase_ok:0
msgid "Can be Purchased"
-msgstr ""
+msgstr "On ostetav"
#. module: purchase
#: model:ir.ui.menu,name:purchase.menu_action_picking_tree_in_move
msgid "Incoming Products"
+msgstr "Sisenevad tooted"
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Request for Quotation "
+msgstr "Hinnapäring "
+
+#. module: purchase
+#: help:purchase.order,partner_ref:0
+msgid ""
+"Reference of the sales order or quotation sent by your supplier. It's mainly "
+"used to do the matching when you receive the products as this reference is "
+"usually written on the delivery order sent by your supplier."
msgstr ""
#. module: purchase
@@ -582,14 +559,19 @@ msgid ""
msgstr ""
#. module: purchase
+#: model:mail.message.subtype,name:purchase.mt_rfq_approved
+msgid "RFQ Approved"
+msgstr ""
+
+#. module: purchase
#: view:purchase.config.settings:0
msgid "Apply"
-msgstr ""
+msgstr "Kinnita"
#. module: purchase
#: field:purchase.order,amount_untaxed:0
msgid "Untaxed Amount"
-msgstr "Maksuvaba summa"
+msgstr "Maksuta summa"
#. module: purchase
#: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0
@@ -599,6 +581,11 @@ msgid ""
msgstr ""
#. module: purchase
+#: model:mail.message.subtype,name:purchase.mt_rfq_confirmed
+msgid "RFQ Confirmed"
+msgstr ""
+
+#. module: purchase
#: view:purchase.order:0
msgid "Customer Address"
msgstr ""
@@ -623,7 +610,7 @@ msgid "Supplier"
msgstr "Tarnija"
#. module: purchase
-#: code:addons/purchase/purchase.py:508
+#: code:addons/purchase/purchase.py:525
#, python-format
msgid "Define expense account for this company: \"%s\" (id:%d)."
msgstr ""
@@ -647,7 +634,6 @@ msgstr "Vahesumma"
#. module: purchase
#: field:purchase.order,shipped:0
-#: field:purchase.order,shipped_rate:0
msgid "Received"
msgstr "Vastu võetud"
@@ -689,13 +675,20 @@ msgid "Invoices and Receptions"
msgstr ""
#. module: purchase
+#: model:process.transition,note:purchase.process_transition_packinginvoice0
+msgid ""
+"A Pick list generates an invoice. Depending on the Invoicing control of the "
+"sales order, the invoice is based on delivered or on ordered quantities."
+msgstr ""
+
+#. module: purchase
#: view:purchase.report:0
#: field:purchase.report,nbr:0
msgid "# of Lines"
msgstr ""
#. module: purchase
-#: code:addons/purchase/wizard/purchase_line_invoice.py:110
+#: code:addons/purchase/wizard/purchase_line_invoice.py:106
#, python-format
msgid "Define expense account for this product: \"%s\" (id:%d)."
msgstr ""
@@ -703,7 +696,7 @@ msgstr ""
#. module: purchase
#: view:purchase.order:0
msgid "(update)"
-msgstr ""
+msgstr "(uuenda)"
#. module: purchase
#: view:purchase.order:0
@@ -716,8 +709,8 @@ msgid "It indicates that a picking has been done"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:565
-#: code:addons/purchase/purchase.py:572
+#: code:addons/purchase/purchase.py:579
+#: code:addons/purchase/purchase.py:586
#, python-format
msgid "Unable to cancel this purchase order."
msgstr ""
@@ -777,6 +770,15 @@ msgstr "Hinnakiri"
#. module: purchase
#: selection:purchase.order,state:0
msgid "Draft PO"
+msgstr "Ostukorralduse mustand"
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:941
+#: code:addons/purchase/purchase.py:956
+#: code:addons/purchase/purchase.py:960
+#: code:addons/purchase/wizard/purchase_order_group.py:47
+#, python-format
+msgid "Warning!"
msgstr ""
#. module: purchase
@@ -811,6 +813,11 @@ msgid "The tax amount"
msgstr ""
#. module: purchase
+#: field:purchase.order,shipped_rate:0
+msgid "Received Ratio"
+msgstr ""
+
+#. module: purchase
#: selection:purchase.report,month:0
msgid "September"
msgstr ""
@@ -823,13 +830,13 @@ msgstr ""
#. module: purchase
#: report:purchase.quotation:0
msgid "Request for Quotation :"
-msgstr "Hinnapäring"
+msgstr "Hinnapäring:"
#. module: purchase
#: model:ir.actions.act_window,name:purchase.action_picking_tree4_picking_to_invoice
#: model:ir.ui.menu,name:purchase.menu_action_picking_tree4_picking_to_invoice
msgid "On Incoming Shipments"
-msgstr ""
+msgstr "Sisenevatel saadetistel"
#. module: purchase
#: report:purchase.order:0
@@ -842,7 +849,7 @@ msgid "Stock Moves"
msgstr "Lao liikumised"
#. module: purchase
-#: code:addons/purchase/purchase.py:1158
+#: code:addons/purchase/purchase.py:1156
#, python-format
msgid "Draft Purchase Order created"
msgstr ""
@@ -860,12 +867,7 @@ msgstr ""
#. module: purchase
#: field:purchase.order,notes:0
msgid "Terms and Conditions"
-msgstr ""
-
-#. module: purchase
-#: field:purchase.order,currency_id:0
-msgid "unknown"
-msgstr ""
+msgstr "Tingimused"
#. module: purchase
#: help:purchase.order,date_order:0
@@ -931,7 +933,7 @@ msgstr ""
#: model:ir.ui.menu,name:purchase.menu_purchase_config
#: view:res.partner:0
msgid "Purchases"
-msgstr ""
+msgstr "Ostud"
#. module: purchase
#: view:purchase.report:0
@@ -961,12 +963,6 @@ msgid "Cancel"
msgstr "Tühista"
#. module: purchase
-#: field:purchase.order,message_comment_ids:0
-#: help:purchase.order,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
-#. module: purchase
#: sql_constraint:purchase.order:0
msgid "Order Reference must be unique per Company!"
msgstr ""
@@ -1000,14 +996,89 @@ msgid "Date Approved"
msgstr "Heaks kiitmise kuupäev"
#. module: purchase
-#: code:addons/purchase/purchase.py:806
-#, python-format
-msgid "Request for quotation <b>created</b>."
+#: view:product.product:0
+msgid "a draft purchase order"
msgstr ""
#. module: purchase
-#: view:product.product:0
-msgid "a draft purchase order"
+#: model:email.template,body_html:purchase.email_template_edi_purchase
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: #FFF; \">\n"
+"\n"
+" <p>Hello$ ${object.partner_id.name},</p>\n"
+" \n"
+" <p>Here is a ${object.state in ('draft', 'sent') and 'request for "
+"quotation' or 'purchase order confirmation'} from ${object.company_id.name}: "
+"</p>\n"
+" \n"
+" <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
+" &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
+" &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
+" &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
+"${object.pricelist_id.currency_id.name}</strong><br />\n"
+" &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
+" % if object.origin:\n"
+" &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
+" % endif\n"
+" % if object.partner_ref:\n"
+" &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
+" % endif\n"
+" % if object.validator:\n"
+" &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.validator.email "
+"or ''}?subject=Order%20${object.name}\">${object.validator.name}</a>\n"
+" % endif\n"
+" </p>\n"
+"\n"
+" <br/>\n"
+" <p>If you have any question, do not hesitate to contact us.</p>\n"
+" <p>Thank you!</p>\n"
+" <br/>\n"
+" <br/>\n"
+" <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
+"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
+"background-repeat: repeat no-repeat;\">\n"
+" <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
+"#DDD;\">\n"
+" <strong style=\"text-"
+"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
+" </div>\n"
+" <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
+"16px; background-color: #F2F2F2;\">\n"
+" <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
+" % if object.company_id.street:\n"
+" ${object.company_id.street}<br/>\n"
+" % endif\n"
+" % if object.company_id.street2:\n"
+" ${object.company_id.street2}<br/>\n"
+" % endif\n"
+" % if object.company_id.city or object.company_id.zip:\n"
+" ${object.company_id.zip} ${object.company_id.city}<br/>\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 ''}<br/>\n"
+" % endif\n"
+" </span>\n"
+" % if object.company_id.phone:\n"
+" <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
+"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
+"0px; padding-left: 0px; \">\n"
+" Phone:&nbsp; ${object.company_id.phone}\n"
+" </div>\n"
+" % endif\n"
+" % if object.company_id.website:\n"
+" <div>\n"
+" Web :&nbsp;<a "
+"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
+" </div>\n"
+" %endif\n"
+" <p></p>\n"
+" </div>\n"
+"</div>\n"
+" "
msgstr ""
#. module: purchase
@@ -1047,17 +1118,12 @@ msgid "Outgoing Mails"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:437
+#: code:addons/purchase/purchase.py:456
#, python-format
msgid "You cannot confirm a purchase order without any purchase order line."
msgstr ""
#. module: purchase
-#: model:ir.actions.server,name:purchase.actions_server_purchase_order_unread
-msgid "Purchase: Mark unread"
-msgstr ""
-
-#. module: purchase
#: help:purchase.order,message_ids:0
msgid "Messages and communication history"
msgstr ""
@@ -1069,7 +1135,7 @@ msgid "Destination Warehouse"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:973
+#: code:addons/purchase/purchase.py:941
#, python-format
msgid ""
"Selected Unit of Measure does not belong to the same category as the product "
@@ -1077,6 +1143,11 @@ msgid ""
msgstr ""
#. module: purchase
+#: view:purchase.order.line_invoice:0
+msgid "Select an Open Sales Order"
+msgstr ""
+
+#. module: purchase
#: model:ir.ui.menu,name:purchase.menu_purchase_unit_measure_purchase
#: model:ir.ui.menu,name:purchase.menu_purchase_uom_form_action
msgid "Units of Measure"
@@ -1088,18 +1159,12 @@ msgid "Manage pricelist per supplier"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:833
-#, python-format
-msgid "Purchase Order has been set to <b>draft</b>."
-msgstr ""
-
-#. module: purchase
#: view:board.board:0
msgid "Purchase Dashboard"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:566
+#: code:addons/purchase/purchase.py:580
#, python-format
msgid "First cancel all receptions related to this purchase order."
msgstr ""
@@ -1138,8 +1203,8 @@ msgid "Unread Messages"
msgstr ""
#. module: purchase
-#: view:purchase.order.line_invoice:0
-msgid "Select an Open Sale Order"
+#: model:ir.ui.menu,name:purchase.menu_purchase_uom_categ_form_action
+msgid "Unit of Measure Categories"
msgstr ""
#. module: purchase
@@ -1148,6 +1213,13 @@ msgid "Set to Draft"
msgstr "Määra mustandiks"
#. module: purchase
+#: help:purchase.order,origin:0
+msgid ""
+"Reference of the document that generated this purchase order request; a "
+"sales order or an internal procurement request."
+msgstr ""
+
+#. module: purchase
#: view:purchase.order.line:0
msgid "Notes"
msgstr "Märkused"
@@ -1169,7 +1241,7 @@ msgstr "Maksud"
#: model:ir.ui.menu,name:purchase.menu_procurement_partner_contact_form
#: model:ir.ui.menu,name:purchase.menu_product_in_config_purchase
msgid "Products"
-msgstr ""
+msgstr "Tooted"
#. module: purchase
#: model:ir.model,name:purchase.model_stock_move
@@ -1177,7 +1249,7 @@ msgid "Stock Move"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:255
+#: code:addons/purchase/purchase.py:260
#, python-format
msgid "Invalid Action!"
msgstr ""
@@ -1197,7 +1269,7 @@ msgstr ""
#: model:process.node,note:purchase.process_node_draftpurchaseorder0
#: model:process.node,note:purchase.process_node_draftpurchaseorder1
msgid "Request for Quotations."
-msgstr ""
+msgstr "Hinnapäringud."
#. module: purchase
#: view:purchase.order:0
@@ -1251,7 +1323,7 @@ msgstr ""
#. module: purchase
#: model:process.node,name:purchase.process_node_packinginvoice0
msgid "Outgoing Products"
-msgstr ""
+msgstr "Väljuvad tooted"
#. module: purchase
#: view:product.product:0
@@ -1270,7 +1342,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:310
+#: code:addons/purchase/purchase.py:320
#, python-format
msgid "Please create Invoices."
msgstr ""
@@ -1294,12 +1366,12 @@ msgstr ""
#. module: purchase
#: view:purchase.order:0
msgid "Receive Invoice"
-msgstr ""
+msgstr "Loo arve"
#. module: purchase
#: view:purchase.order:0
msgid "Receive Products"
-msgstr ""
+msgstr "Võta vastu"
#. module: purchase
#: view:purchase.report:0
@@ -1352,7 +1424,7 @@ msgstr ""
#. module: purchase
#: model:ir.actions.act_window,name:purchase.action_view_purchase_line_invoice
msgid "Create invoices"
-msgstr ""
+msgstr "Loo arved"
#. module: purchase
#: model:ir.model,name:purchase.model_purchase_order_line_invoice
@@ -1360,7 +1432,7 @@ msgid "Purchase Order Line Make Invoice"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1133
+#: code:addons/purchase/purchase.py:1141
#, python-format
msgid "PO: %s"
msgstr ""
@@ -1371,7 +1443,7 @@ msgid "Send by EMail"
msgstr "Saada e-kirjaga"
#. module: purchase
-#: code:addons/purchase/purchase.py:498
+#: code:addons/purchase/purchase.py:515
#, python-format
msgid "Define purchase journal for this company: \"%s\" (id:%d)."
msgstr ""
@@ -1379,11 +1451,11 @@ msgstr ""
#. module: purchase
#: view:purchase.order:0
msgid "Purchase Order "
-msgstr ""
+msgstr "Ostukorraldus "
#. module: purchase
-#: view:purchase.order.line:0
-msgid "Manual Invoices"
+#: help:purchase.config.settings,group_costing_method:0
+msgid "Allows you to compute product cost price based on average cost."
msgstr ""
#. module: purchase
@@ -1406,7 +1478,7 @@ msgstr ""
#: model:ir.actions.act_window,name:purchase.purchase_line_form_action2
#: model:ir.ui.menu,name:purchase.menu_purchase_line_order_draft
msgid "On Purchase Order Lines"
-msgstr ""
+msgstr "Ostukorralduse ridadel"
#. module: purchase
#: report:purchase.quotation:0
@@ -1518,7 +1590,7 @@ msgstr ""
#: model:ir.ui.menu,name:purchase.menu_procurement_management
#: model:process.process,name:purchase.process_process_purchaseprocess0
msgid "Purchase"
-msgstr ""
+msgstr "Ostmine"
#. module: purchase
#: field:purchase.order,create_uid:0
@@ -1538,13 +1610,13 @@ msgid "Compute product cost price based on average cost"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:340
-#: code:addons/purchase/wizard/purchase_line_invoice.py:141
+#: code:addons/purchase/purchase.py:350
+#: code:addons/purchase/wizard/purchase_line_invoice.py:137
#: model:ir.actions.act_window,name:purchase.act_res_partner_2_supplier_invoices
#: view:res.partner:0
#, python-format
msgid "Supplier Invoices"
-msgstr ""
+msgstr "Ostuarved"
#. module: purchase
#: field:purchase.order,product_id:0
@@ -1569,7 +1641,7 @@ msgstr ""
#. module: purchase
#: model:ir.ui.menu,name:purchase.menu_product_by_category_purchase_form
msgid "Products by Category"
-msgstr ""
+msgstr "Tooted kategooria järgi"
#. module: purchase
#: help:purchase.order.line,state:0
@@ -1587,7 +1659,7 @@ msgstr ""
#. module: purchase
#: field:purchase.order,invoiced:0
msgid "Invoice Received"
-msgstr ""
+msgstr "Arve loodud"
#. module: purchase
#: model:process.transition.action,name:purchase.process_transition_action_approvingpurchaseorder0
@@ -1612,7 +1684,7 @@ msgstr ""
#. module: purchase
#: selection:purchase.order,invoice_method:0
msgid "Based on Purchase Order lines"
-msgstr ""
+msgstr "Ostukorralduse ridade põhjal"
#. module: purchase
#: field:purchase.order,amount_total:0
@@ -1646,8 +1718,9 @@ msgid "Open Purchase Menu"
msgstr ""
#. module: purchase
-#: model:ir.model,name:purchase.model_mail_compose_message
-msgid "Email composition wizard"
+#: code:addons/purchase/purchase.py:1028
+#, python-format
+msgid "No address defined for the supplier"
msgstr ""
#. module: purchase
@@ -1691,7 +1764,7 @@ msgstr "Vaikimisi ostuhinnakirja versioon"
#. module: purchase
#: selection:purchase.order,invoice_method:0
msgid "Based on generated draft invoice"
-msgstr ""
+msgstr "Loodud mustandarve põhjal"
#. module: purchase
#: model:ir.actions.act_window,name:purchase.action_stock_move_report_po
@@ -1705,11 +1778,11 @@ msgid "Messages"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:310
-#: code:addons/purchase/purchase.py:437
-#: code:addons/purchase/purchase.py:497
-#: code:addons/purchase/purchase.py:508
-#: code:addons/purchase/wizard/purchase_line_invoice.py:109
+#: code:addons/purchase/purchase.py:320
+#: code:addons/purchase/purchase.py:456
+#: code:addons/purchase/purchase.py:514
+#: code:addons/purchase/purchase.py:525
+#: code:addons/purchase/wizard/purchase_line_invoice.py:105
#, python-format
msgid "Error!"
msgstr ""
@@ -1731,13 +1804,6 @@ msgid ""
msgstr ""
#. module: purchase
-#: model:process.transition,note:purchase.process_transition_packinginvoice0
-msgid ""
-"A Pick list generates an invoice. Depending on the Invoicing control of the "
-"sale order, the invoice is based on delivered or on ordered quantities."
-msgstr ""
-
-#. module: purchase
#: selection:purchase.order,state:0
#: selection:purchase.order.line,state:0
#: selection:purchase.report,state:0
@@ -1750,9 +1816,8 @@ msgid "# of Purchase Order"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:827
-#, python-format
-msgid "Shipment <b>received</b>."
+#: model:ir.model,name:purchase.model_mail_compose_message
+msgid "Email composition wizard"
msgstr ""
#. module: purchase
@@ -1786,12 +1851,12 @@ msgstr "Kinnita"
#. module: purchase
#: selection:purchase.config.settings,default_invoice_method:0
msgid "Based on receptions"
-msgstr ""
+msgstr "Vastuvõtmiste põhjal"
#. module: purchase
#: field:purchase.order,partner_ref:0
msgid "Supplier Reference"
-msgstr ""
+msgstr "Tarnija viide"
#. module: purchase
#: model:process.transition,note:purchase.process_transition_productrecept0
@@ -1836,7 +1901,7 @@ msgid "RFQ_${(object.name or '').replace('/','_')}"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:988
+#: code:addons/purchase/purchase.py:956
#, python-format
msgid "The selected supplier only sells this product by %s"
msgstr ""
@@ -1882,6 +1947,12 @@ msgid "Outgoing products to invoice"
msgstr ""
#. module: purchase
+#: report:purchase.order:0
+#: field:purchase.report,validator:0
+msgid "Validated By"
+msgstr "Valideerija:"
+
+#. module: purchase
#: view:purchase.report:0
#: field:purchase.report,delay_pass:0
msgid "Days to Deliver"
@@ -1896,7 +1967,7 @@ msgstr ""
#: view:purchase.order:0
#: field:purchase.order,invoice_ids:0
msgid "Invoices"
-msgstr ""
+msgstr "Arved"
#. module: purchase
#: selection:purchase.report,month:0
@@ -1921,7 +1992,7 @@ msgstr ""
#. module: purchase
#: view:purchase.order:0
msgid "Incoming Shipments & Invoices"
-msgstr ""
+msgstr "Sisenevad saadetised ja arved"
#. module: purchase
#: selection:purchase.order,state:0
@@ -1971,8 +2042,8 @@ msgid "November"
msgstr ""
#. module: purchase
-#: help:purchase.config.settings,group_costing_method:0
-msgid "Allows you to compute product cost price based on average cost."
+#: view:purchase.order.line:0
+msgid "Manual Invoices"
msgstr ""
#. module: purchase
@@ -1991,13 +2062,6 @@ msgid ""
msgstr ""
#. module: purchase
-#: help:purchase.order,origin:0
-msgid ""
-"Reference of the document that generated this purchase order request; a sale "
-"order or an internal procurement request."
-msgstr ""
-
-#. module: purchase
#: model:ir.ui.menu,name:purchase.menu_partner_categories_in_form
msgid "Partner Categories"
msgstr ""
@@ -2010,7 +2074,7 @@ msgstr "Korralduse olek"
#. module: purchase
#: report:purchase.order:0
msgid "Request for Quotation N°"
-msgstr ""
+msgstr "Hinnapäring nr."
#. module: purchase
#: view:purchase.config.settings:0
@@ -2018,89 +2082,6 @@ msgid "Invoicing Settings"
msgstr ""
#. module: purchase
-#: model:email.template,body_html:purchase.email_template_edi_purchase
-msgid ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"\n"
-" <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
-"or ''},</p>\n"
-" \n"
-" <p>Here is a ${object.state in ('draft', 'sent') and 'request for "
-"quotation' or 'purchase order confirmation'} from ${object.company_id.name}: "
-"</p>\n"
-" \n"
-" <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
-" &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
-" &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
-" &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
-"${object.pricelist_id.currency_id.name}</strong><br />\n"
-" &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
-" % if object.origin:\n"
-" &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
-" % endif\n"
-" % if object.partner_ref:\n"
-" &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
-" % endif\n"
-" % if object.validator:\n"
-" &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.validator.email "
-"or ''}?subject=Order%20${object.name}\">${object.validator.name}</a>\n"
-" % endif\n"
-" </p>\n"
-"\n"
-" <br/>\n"
-" <p>If you have any question, do not hesitate to contact us.</p>\n"
-" <p>Thank you!</p>\n"
-" <br/>\n"
-" <br/>\n"
-" <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
-"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
-"background-repeat: repeat no-repeat;\">\n"
-" <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
-"#FFF;\">\n"
-" <strong style=\"text-"
-"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
-" </div>\n"
-" <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
-"16px; background-color: #F2F2F2;\">\n"
-" <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
-" % if object.company_id.street:\n"
-" ${object.company_id.street}<br/>\n"
-" % endif\n"
-" % if object.company_id.street2:\n"
-" ${object.company_id.street2}<br/>\n"
-" % endif\n"
-" % if object.company_id.city or object.company_id.zip:\n"
-" ${object.company_id.zip} ${object.company_id.city}<br/>\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 ''}<br/>\n"
-" % endif\n"
-" </span>\n"
-" % if object.company_id.phone:\n"
-" <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
-"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
-"0px; padding-left: 0px; \">\n"
-" Phone:&nbsp; ${object.company_id.phone}\n"
-" </div>\n"
-" % endif\n"
-" % if object.company_id.website:\n"
-" <div>\n"
-" Web :&nbsp;<a "
-"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
-" </div>\n"
-" %endif\n"
-" <p></p>\n"
-" </div>\n"
-"</div>\n"
-" "
-msgstr ""
-
-#. module: purchase
#: model:ir.actions.act_window,name:purchase.action_purchase_order_by_user_all
msgid "Total Orders by User per month"
msgstr ""
@@ -2108,6 +2089,12 @@ msgstr ""
#. module: purchase
#: selection:purchase.order,invoice_method:0
msgid "Based on incoming shipments"
+msgstr "Sisenevate saadetiste põhjal"
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:1018
+#, python-format
+msgid "No default supplier defined for this product"
msgstr ""
#. module: purchase
@@ -2117,15 +2104,7 @@ msgid "Warehouse"
msgstr "Ladu"
#. module: purchase
-#: help:purchase.order,partner_ref:0
-msgid ""
-"Reference of the sale order or quotation sent by your supplier. It's mainly "
-"used to do the matching when you receive the products as this reference is "
-"usually written on the delivery order sent by your supplier."
-msgstr ""
-
-#. module: purchase
-#: code:addons/purchase/purchase.py:991
+#: code:addons/purchase/purchase.py:960
#, python-format
msgid ""
"The selected supplier has a minimal quantity set to %s %s, you should not "
@@ -2153,7 +2132,7 @@ msgstr ""
#: model:ir.actions.act_window,name:purchase.action_invoice_pending
#: model:ir.ui.menu,name:purchase.menu_procurement_management_pending_invoice
msgid "On Draft Invoices"
-msgstr ""
+msgstr "Mustandarvetel"
#. module: purchase
#: model:ir.actions.act_window,name:purchase.action_purchase_order_report_all
@@ -2193,8 +2172,8 @@ msgid ""
msgstr ""
#. module: purchase
-#: view:product.product:0
-msgid "When you sell this service to a customer,"
+#: field:purchase.order,message_summary:0
+msgid "Summary"
msgstr ""
#. module: purchase
@@ -2204,6 +2183,11 @@ msgid "Pricelist Versions"
msgstr ""
#. module: purchase
+#: field:purchase.order,payment_term_id:0
+msgid "Payment Term"
+msgstr "Maksetingimus"
+
+#. module: purchase
#: view:purchase.order:0
msgid "Purchase orders which are in draft state"
msgstr ""
@@ -2217,7 +2201,7 @@ msgstr ""
#. module: purchase
#: selection:purchase.config.settings,default_invoice_method:0
msgid "Based on purchase order lines"
-msgstr ""
+msgstr "Ostukorralduse ridade põhjal"
#. module: purchase
#: model:ir.actions.act_window,help:purchase.act_res_partner_2_purchase_order
diff --git a/addons/purchase/i18n/fi.po b/addons/purchase/i18n/fi.po
index b321325b628..937c4febaa5 100644
--- a/addons/purchase/i18n/fi.po
+++ b/addons/purchase/i18n/fi.po
@@ -7,15 +7,15 @@ msgid ""
msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
"PO-Revision-Date: 2011-11-07 12:55+0000\n"
"Last-Translator: Fabien (Open ERP) <fp@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: 2012-12-04 05:11+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:19+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
#. module: purchase
#: model:res.groups,name:purchase.group_analytic_accounting
@@ -61,11 +61,6 @@ msgstr ""
"hinnan kyseiselle tuotteille/määrille."
#. module: purchase
-#: model:ir.actions.server,name:purchase.actions_server_purchase_order_read
-msgid "Purchase: Mark read"
-msgstr ""
-
-#. module: purchase
#: view:purchase.report:0
#: field:purchase.report,day:0
msgid "Day"
@@ -106,16 +101,13 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:973
-#: code:addons/purchase/purchase.py:988
-#: code:addons/purchase/purchase.py:991
-#: code:addons/purchase/wizard/purchase_order_group.py:47
+#: code:addons/purchase/purchase.py:1024
#, python-format
-msgid "Warning!"
+msgid "Configuration Error!"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:573
+#: code:addons/purchase/purchase.py:587
#, python-format
msgid "You must first cancel all receptions related to this purchase order."
msgstr ""
@@ -134,10 +126,10 @@ msgid "Purchase-Standard Price"
msgstr "Oston standardihinta"
#. module: purchase
-#: report:purchase.order:0
-#: field:purchase.report,validator:0
-msgid "Validated By"
-msgstr "Hyväksyjä"
+#: code:addons/purchase/purchase.py:1011
+#, python-format
+msgid "No supplier defined for this product !"
+msgstr ""
#. module: purchase
#: model:ir.actions.act_window,help:purchase.action_picking_tree4_picking_to_invoice
@@ -160,12 +152,6 @@ msgid "Average Price"
msgstr "Keskimääräinen hinta"
#. module: purchase
-#: code:addons/purchase/purchase.py:830
-#, python-format
-msgid "Invoice <b>paid</b>."
-msgstr ""
-
-#. module: purchase
#: view:purchase.order:0
msgid "Purchase order which are in the exception state"
msgstr "Ostotilaus joka on poikkeustilassa"
@@ -237,7 +223,7 @@ msgstr ""
"tuotteille."
#. module: purchase
-#: code:addons/purchase/purchase.py:255
+#: code:addons/purchase/purchase.py:260
#, python-format
msgid "In order to delete a purchase order, you must cancel it first."
msgstr ""
@@ -263,29 +249,12 @@ msgid "Total Untaxed amount"
msgstr "Veroton Summa"
#. module: purchase
-#: model:ir.ui.menu,name:purchase.menu_purchase_uom_categ_form_action
-msgid "Unit of Measure Categories"
-msgstr ""
-
-#. module: purchase
#: view:purchase.report:0
#: field:purchase.report,category_id:0
msgid "Category"
msgstr "Luokka"
#. module: purchase
-#: view:purchase.order:0
-msgid "Quotation "
-msgstr ""
-
-#. module: purchase
-#: code:addons/purchase/purchase.py:810
-#, python-format
-msgid ""
-"Quotation for <em>%s</em> <b>converted</b> to a Purchase Order of %s %s."
-msgstr ""
-
-#. module: purchase
#: model:process.transition,note:purchase.process_transition_purchaseinvoice0
msgid ""
"A purchase order generates a supplier invoice, as soon as it is confirmed by "
@@ -353,14 +322,16 @@ msgid "October"
msgstr "Lokakuu"
#. module: purchase
-#: code:addons/purchase/purchase.py:837
+#: code:addons/purchase/purchase.py:1024
#, python-format
-msgid "Purchase Order for <em>%s</em> <b>cancelled</b>."
+msgid ""
+"The product \"%s\" has been defined with your company as reseller which "
+"seems to be a configuration error!"
msgstr ""
#. module: purchase
-#: field:purchase.order,message_summary:0
-msgid "Summary"
+#: view:product.product:0
+msgid "When you sell this service to a customer,"
msgstr ""
#. module: purchase
@@ -389,12 +360,6 @@ msgid "Quantity"
msgstr "Määrä"
#. module: purchase
-#: code:addons/purchase/purchase.py:819
-#, python-format
-msgid "Shipment <em>%s</em> <b>scheduled</b> for %s."
-msgstr ""
-
-#. module: purchase
#: field:purchase.order,fiscal_position:0
msgid "Fiscal Position"
msgstr "Talouskanta"
@@ -452,12 +417,6 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:824
-#, python-format
-msgid "Draft Invoice of %s %s is <b>waiting for validation</b>."
-msgstr ""
-
-#. module: purchase
#: model:ir.actions.act_window,help:purchase.purchase_line_form_action2
msgid ""
"<p>\n"
@@ -478,6 +437,11 @@ msgid "Scheduled Date"
msgstr "Suunniteltu päivämäärä"
#. module: purchase
+#: field:purchase.order,currency_id:0
+msgid "Currency"
+msgstr ""
+
+#. module: purchase
#: field:purchase.order,journal_id:0
msgid "Journal"
msgstr "Päiväkirja"
@@ -510,6 +474,19 @@ msgid "Incoming Products"
msgstr ""
#. module: purchase
+#: view:purchase.order:0
+msgid "Request for Quotation "
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,partner_ref:0
+msgid ""
+"Reference of the sales order or quotation sent by your supplier. It's mainly "
+"used to do the matching when you receive the products as this reference is "
+"usually written on the delivery order sent by your supplier."
+msgstr ""
+
+#. module: purchase
#: view:purchase.config.settings:0
#: view:purchase.order.group:0
#: view:purchase.order.line_invoice:0
@@ -533,6 +510,11 @@ msgstr ""
"(laskujen kontrolli = manuaalinen)."
#. module: purchase
+#: model:mail.message.subtype,name:purchase.mt_rfq_approved
+msgid "RFQ Approved"
+msgstr ""
+
+#. module: purchase
#: view:purchase.config.settings:0
msgid "Apply"
msgstr ""
@@ -552,6 +534,11 @@ msgstr ""
"Tarjouspyynnöstä tulee hyväksytty ostotilaus."
#. module: purchase
+#: model:mail.message.subtype,name:purchase.mt_rfq_confirmed
+msgid "RFQ Confirmed"
+msgstr ""
+
+#. module: purchase
#: view:purchase.order:0
msgid "Customer Address"
msgstr ""
@@ -576,7 +563,7 @@ msgid "Supplier"
msgstr "Toimittaja"
#. module: purchase
-#: code:addons/purchase/purchase.py:508
+#: code:addons/purchase/purchase.py:525
#, python-format
msgid "Define expense account for this company: \"%s\" (id:%d)."
msgstr ""
@@ -600,7 +587,6 @@ msgstr "Välisumma"
#. module: purchase
#: field:purchase.order,shipped:0
-#: field:purchase.order,shipped_rate:0
msgid "Received"
msgstr "Vastaanotettu"
@@ -642,13 +628,20 @@ msgid "Invoices and Receptions"
msgstr ""
#. module: purchase
+#: model:process.transition,note:purchase.process_transition_packinginvoice0
+msgid ""
+"A Pick list generates an invoice. Depending on the Invoicing control of the "
+"sales order, the invoice is based on delivered or on ordered quantities."
+msgstr ""
+
+#. module: purchase
#: view:purchase.report:0
#: field:purchase.report,nbr:0
msgid "# of Lines"
msgstr "Rivien lukumäärä"
#. module: purchase
-#: code:addons/purchase/wizard/purchase_line_invoice.py:110
+#: code:addons/purchase/wizard/purchase_line_invoice.py:106
#, python-format
msgid "Define expense account for this product: \"%s\" (id:%d)."
msgstr ""
@@ -669,8 +662,8 @@ msgid "It indicates that a picking has been done"
msgstr "Merkitsee että keräilylista on tehty"
#. module: purchase
-#: code:addons/purchase/purchase.py:565
-#: code:addons/purchase/purchase.py:572
+#: code:addons/purchase/purchase.py:579
+#: code:addons/purchase/purchase.py:586
#, python-format
msgid "Unable to cancel this purchase order."
msgstr ""
@@ -735,6 +728,15 @@ msgid "Draft PO"
msgstr ""
#. module: purchase
+#: code:addons/purchase/purchase.py:941
+#: code:addons/purchase/purchase.py:956
+#: code:addons/purchase/purchase.py:960
+#: code:addons/purchase/wizard/purchase_order_group.py:47
+#, python-format
+msgid "Warning!"
+msgstr ""
+
+#. module: purchase
#: model:process.node,name:purchase.process_node_draftpurchaseorder0
#: model:process.node,name:purchase.process_node_draftpurchaseorder1
msgid "RFQ"
@@ -766,6 +768,11 @@ msgid "The tax amount"
msgstr "Veron määrä"
#. module: purchase
+#: field:purchase.order,shipped_rate:0
+msgid "Received Ratio"
+msgstr ""
+
+#. module: purchase
#: selection:purchase.report,month:0
msgid "September"
msgstr "Syyskuu"
@@ -797,7 +804,7 @@ msgid "Stock Moves"
msgstr "Varastosiirrot"
#. module: purchase
-#: code:addons/purchase/purchase.py:1158
+#: code:addons/purchase/purchase.py:1156
#, python-format
msgid "Draft Purchase Order created"
msgstr ""
@@ -818,11 +825,6 @@ msgid "Terms and Conditions"
msgstr ""
#. module: purchase
-#: field:purchase.order,currency_id:0
-msgid "unknown"
-msgstr ""
-
-#. module: purchase
#: help:purchase.order,date_order:0
msgid "Date on which this document has been created."
msgstr "Tämän dokumentin luontipäivämäärä"
@@ -916,12 +918,6 @@ msgid "Cancel"
msgstr "Peruuta"
#. module: purchase
-#: field:purchase.order,message_comment_ids:0
-#: help:purchase.order,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
-#. module: purchase
#: sql_constraint:purchase.order:0
msgid "Order Reference must be unique per Company!"
msgstr "Tilausviitteen tulee olla uniikki yrityskohtaisesti!"
@@ -955,14 +951,89 @@ msgid "Date Approved"
msgstr "Hyväksymispäivämäärä"
#. module: purchase
-#: code:addons/purchase/purchase.py:806
-#, python-format
-msgid "Request for quotation <b>created</b>."
+#: view:product.product:0
+msgid "a draft purchase order"
msgstr ""
#. module: purchase
-#: view:product.product:0
-msgid "a draft purchase order"
+#: model:email.template,body_html:purchase.email_template_edi_purchase
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: #FFF; \">\n"
+"\n"
+" <p>Hello$ ${object.partner_id.name},</p>\n"
+" \n"
+" <p>Here is a ${object.state in ('draft', 'sent') and 'request for "
+"quotation' or 'purchase order confirmation'} from ${object.company_id.name}: "
+"</p>\n"
+" \n"
+" <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
+" &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
+" &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
+" &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
+"${object.pricelist_id.currency_id.name}</strong><br />\n"
+" &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
+" % if object.origin:\n"
+" &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
+" % endif\n"
+" % if object.partner_ref:\n"
+" &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
+" % endif\n"
+" % if object.validator:\n"
+" &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.validator.email "
+"or ''}?subject=Order%20${object.name}\">${object.validator.name}</a>\n"
+" % endif\n"
+" </p>\n"
+"\n"
+" <br/>\n"
+" <p>If you have any question, do not hesitate to contact us.</p>\n"
+" <p>Thank you!</p>\n"
+" <br/>\n"
+" <br/>\n"
+" <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
+"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
+"background-repeat: repeat no-repeat;\">\n"
+" <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
+"#DDD;\">\n"
+" <strong style=\"text-"
+"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
+" </div>\n"
+" <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
+"16px; background-color: #F2F2F2;\">\n"
+" <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
+" % if object.company_id.street:\n"
+" ${object.company_id.street}<br/>\n"
+" % endif\n"
+" % if object.company_id.street2:\n"
+" ${object.company_id.street2}<br/>\n"
+" % endif\n"
+" % if object.company_id.city or object.company_id.zip:\n"
+" ${object.company_id.zip} ${object.company_id.city}<br/>\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 ''}<br/>\n"
+" % endif\n"
+" </span>\n"
+" % if object.company_id.phone:\n"
+" <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
+"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
+"0px; padding-left: 0px; \">\n"
+" Phone:&nbsp; ${object.company_id.phone}\n"
+" </div>\n"
+" % endif\n"
+" % if object.company_id.website:\n"
+" <div>\n"
+" Web :&nbsp;<a "
+"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
+" </div>\n"
+" %endif\n"
+" <p></p>\n"
+" </div>\n"
+"</div>\n"
+" "
msgstr ""
#. module: purchase
@@ -1004,17 +1075,12 @@ msgid "Outgoing Mails"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:437
+#: code:addons/purchase/purchase.py:456
#, python-format
msgid "You cannot confirm a purchase order without any purchase order line."
msgstr ""
#. module: purchase
-#: model:ir.actions.server,name:purchase.actions_server_purchase_order_unread
-msgid "Purchase: Mark unread"
-msgstr ""
-
-#. module: purchase
#: help:purchase.order,message_ids:0
msgid "Messages and communication history"
msgstr ""
@@ -1026,7 +1092,7 @@ msgid "Destination Warehouse"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:973
+#: code:addons/purchase/purchase.py:941
#, python-format
msgid ""
"Selected Unit of Measure does not belong to the same category as the product "
@@ -1034,6 +1100,11 @@ msgid ""
msgstr ""
#. module: purchase
+#: view:purchase.order.line_invoice:0
+msgid "Select an Open Sales Order"
+msgstr ""
+
+#. module: purchase
#: model:ir.ui.menu,name:purchase.menu_purchase_unit_measure_purchase
#: model:ir.ui.menu,name:purchase.menu_purchase_uom_form_action
msgid "Units of Measure"
@@ -1045,18 +1116,12 @@ msgid "Manage pricelist per supplier"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:833
-#, python-format
-msgid "Purchase Order has been set to <b>draft</b>."
-msgstr ""
-
-#. module: purchase
#: view:board.board:0
msgid "Purchase Dashboard"
msgstr "Hankintojen Työtila"
#. module: purchase
-#: code:addons/purchase/purchase.py:566
+#: code:addons/purchase/purchase.py:580
#, python-format
msgid "First cancel all receptions related to this purchase order."
msgstr ""
@@ -1095,9 +1160,9 @@ msgid "Unread Messages"
msgstr ""
#. module: purchase
-#: view:purchase.order.line_invoice:0
-msgid "Select an Open Sale Order"
-msgstr "Valitse Avoin Myyntitilaus"
+#: model:ir.ui.menu,name:purchase.menu_purchase_uom_categ_form_action
+msgid "Unit of Measure Categories"
+msgstr ""
#. module: purchase
#: view:purchase.order:0
@@ -1105,6 +1170,13 @@ msgid "Set to Draft"
msgstr "Aseta luonnokseksi"
#. module: purchase
+#: help:purchase.order,origin:0
+msgid ""
+"Reference of the document that generated this purchase order request; a "
+"sales order or an internal procurement request."
+msgstr ""
+
+#. module: purchase
#: view:purchase.order.line:0
msgid "Notes"
msgstr "Huomautukset"
@@ -1134,7 +1206,7 @@ msgid "Stock Move"
msgstr "Varastosiirto"
#. module: purchase
-#: code:addons/purchase/purchase.py:255
+#: code:addons/purchase/purchase.py:260
#, python-format
msgid "Invalid Action!"
msgstr ""
@@ -1236,7 +1308,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:310
+#: code:addons/purchase/purchase.py:320
#, python-format
msgid "Please create Invoices."
msgstr ""
@@ -1326,7 +1398,7 @@ msgid "Purchase Order Line Make Invoice"
msgstr "Ostotilausrivi luo laskun"
#. module: purchase
-#: code:addons/purchase/purchase.py:1133
+#: code:addons/purchase/purchase.py:1141
#, python-format
msgid "PO: %s"
msgstr ""
@@ -1337,7 +1409,7 @@ msgid "Send by EMail"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:498
+#: code:addons/purchase/purchase.py:515
#, python-format
msgid "Define purchase journal for this company: \"%s\" (id:%d)."
msgstr ""
@@ -1348,9 +1420,9 @@ msgid "Purchase Order "
msgstr ""
#. module: purchase
-#: view:purchase.order.line:0
-msgid "Manual Invoices"
-msgstr "Käsin Laskutus"
+#: help:purchase.config.settings,group_costing_method:0
+msgid "Allows you to compute product cost price based on average cost."
+msgstr ""
#. module: purchase
#: model:ir.actions.act_window,name:purchase.action_purchase_configuration
@@ -1504,8 +1576,8 @@ msgid "Compute product cost price based on average cost"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:340
-#: code:addons/purchase/wizard/purchase_line_invoice.py:141
+#: code:addons/purchase/purchase.py:350
+#: code:addons/purchase/wizard/purchase_line_invoice.py:137
#: model:ir.actions.act_window,name:purchase.act_res_partner_2_supplier_invoices
#: view:res.partner:0
#, python-format
@@ -1617,8 +1689,9 @@ msgid "Open Purchase Menu"
msgstr ""
#. module: purchase
-#: model:ir.model,name:purchase.model_mail_compose_message
-msgid "Email composition wizard"
+#: code:addons/purchase/purchase.py:1028
+#, python-format
+msgid "No address defined for the supplier"
msgstr ""
#. module: purchase
@@ -1690,11 +1763,11 @@ msgid "Purchase Order"
msgstr "Ostotilaus"
#. module: purchase
-#: code:addons/purchase/purchase.py:310
-#: code:addons/purchase/purchase.py:437
-#: code:addons/purchase/purchase.py:497
-#: code:addons/purchase/purchase.py:508
-#: code:addons/purchase/wizard/purchase_line_invoice.py:109
+#: code:addons/purchase/purchase.py:320
+#: code:addons/purchase/purchase.py:456
+#: code:addons/purchase/purchase.py:514
+#: code:addons/purchase/purchase.py:525
+#: code:addons/purchase/wizard/purchase_line_invoice.py:105
#, python-format
msgid "Error!"
msgstr ""
@@ -1716,15 +1789,6 @@ msgid ""
msgstr ""
#. module: purchase
-#: model:process.transition,note:purchase.process_transition_packinginvoice0
-msgid ""
-"A Pick list generates an invoice. Depending on the Invoicing control of the "
-"sale order, the invoice is based on delivered or on ordered quantities."
-msgstr ""
-"Keräilylista luo laskun. Riippuen myyntitilauksen kontrolleista, lasku "
-"perustuu joko toimitettuun tai tilattuun määrään"
-
-#. module: purchase
#: selection:purchase.order,state:0
#: selection:purchase.order.line,state:0
#: selection:purchase.report,state:0
@@ -1737,9 +1801,8 @@ msgid "# of Purchase Order"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:827
-#, python-format
-msgid "Shipment <b>received</b>."
+#: model:ir.model,name:purchase.model_mail_compose_message
+msgid "Email composition wizard"
msgstr ""
#. module: purchase
@@ -1828,7 +1891,7 @@ msgid "RFQ_${(object.name or '').replace('/','_')}"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:988
+#: code:addons/purchase/purchase.py:956
#, python-format
msgid "The selected supplier only sells this product by %s"
msgstr "Valittu toimittaja myy tätä tuotetta vain %s"
@@ -1874,6 +1937,12 @@ msgid "Outgoing products to invoice"
msgstr "Laskutettavat lähtevät tuotteet"
#. module: purchase
+#: report:purchase.order:0
+#: field:purchase.report,validator:0
+msgid "Validated By"
+msgstr "Hyväksyjä"
+
+#. module: purchase
#: view:purchase.report:0
#: field:purchase.report,delay_pass:0
msgid "Days to Deliver"
@@ -1963,9 +2032,9 @@ msgid "November"
msgstr "Marraskuu"
#. module: purchase
-#: help:purchase.config.settings,group_costing_method:0
-msgid "Allows you to compute product cost price based on average cost."
-msgstr ""
+#: view:purchase.order.line:0
+msgid "Manual Invoices"
+msgstr "Käsin Laskutus"
#. module: purchase
#: report:purchase.order:0
@@ -1988,13 +2057,6 @@ msgid ""
msgstr ""
#. module: purchase
-#: help:purchase.order,origin:0
-msgid ""
-"Reference of the document that generated this purchase order request; a sale "
-"order or an internal procurement request."
-msgstr ""
-
-#. module: purchase
#: model:ir.ui.menu,name:purchase.menu_partner_categories_in_form
msgid "Partner Categories"
msgstr "Kumppanien kategoriat"
@@ -2015,89 +2077,6 @@ msgid "Invoicing Settings"
msgstr ""
#. module: purchase
-#: model:email.template,body_html:purchase.email_template_edi_purchase
-msgid ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"\n"
-" <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
-"or ''},</p>\n"
-" \n"
-" <p>Here is a ${object.state in ('draft', 'sent') and 'request for "
-"quotation' or 'purchase order confirmation'} from ${object.company_id.name}: "
-"</p>\n"
-" \n"
-" <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
-" &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
-" &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
-" &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
-"${object.pricelist_id.currency_id.name}</strong><br />\n"
-" &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
-" % if object.origin:\n"
-" &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
-" % endif\n"
-" % if object.partner_ref:\n"
-" &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
-" % endif\n"
-" % if object.validator:\n"
-" &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.validator.email "
-"or ''}?subject=Order%20${object.name}\">${object.validator.name}</a>\n"
-" % endif\n"
-" </p>\n"
-"\n"
-" <br/>\n"
-" <p>If you have any question, do not hesitate to contact us.</p>\n"
-" <p>Thank you!</p>\n"
-" <br/>\n"
-" <br/>\n"
-" <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
-"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
-"background-repeat: repeat no-repeat;\">\n"
-" <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
-"#FFF;\">\n"
-" <strong style=\"text-"
-"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
-" </div>\n"
-" <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
-"16px; background-color: #F2F2F2;\">\n"
-" <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
-" % if object.company_id.street:\n"
-" ${object.company_id.street}<br/>\n"
-" % endif\n"
-" % if object.company_id.street2:\n"
-" ${object.company_id.street2}<br/>\n"
-" % endif\n"
-" % if object.company_id.city or object.company_id.zip:\n"
-" ${object.company_id.zip} ${object.company_id.city}<br/>\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 ''}<br/>\n"
-" % endif\n"
-" </span>\n"
-" % if object.company_id.phone:\n"
-" <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
-"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
-"0px; padding-left: 0px; \">\n"
-" Phone:&nbsp; ${object.company_id.phone}\n"
-" </div>\n"
-" % endif\n"
-" % if object.company_id.website:\n"
-" <div>\n"
-" Web :&nbsp;<a "
-"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
-" </div>\n"
-" %endif\n"
-" <p></p>\n"
-" </div>\n"
-"</div>\n"
-" "
-msgstr ""
-
-#. module: purchase
#: model:ir.actions.act_window,name:purchase.action_purchase_order_by_user_all
msgid "Total Orders by User per month"
msgstr "Tilaukset käyttäjittäin ja kuukausittain yhteensä"
@@ -2108,21 +2087,19 @@ msgid "Based on incoming shipments"
msgstr ""
#. module: purchase
+#: code:addons/purchase/purchase.py:1018
+#, python-format
+msgid "No default supplier defined for this product"
+msgstr ""
+
+#. module: purchase
#: view:purchase.report:0
#: field:purchase.report,warehouse_id:0
msgid "Warehouse"
msgstr "Varasto"
#. module: purchase
-#: help:purchase.order,partner_ref:0
-msgid ""
-"Reference of the sale order or quotation sent by your supplier. It's mainly "
-"used to do the matching when you receive the products as this reference is "
-"usually written on the delivery order sent by your supplier."
-msgstr ""
-
-#. module: purchase
-#: code:addons/purchase/purchase.py:991
+#: code:addons/purchase/purchase.py:960
#, python-format
msgid ""
"The selected supplier has a minimal quantity set to %s %s, you should not "
@@ -2196,8 +2173,8 @@ msgid ""
msgstr ""
#. module: purchase
-#: view:product.product:0
-msgid "When you sell this service to a customer,"
+#: field:purchase.order,message_summary:0
+msgid "Summary"
msgstr ""
#. module: purchase
@@ -2207,6 +2184,11 @@ msgid "Pricelist Versions"
msgstr "Hinnaston versiot"
#. module: purchase
+#: field:purchase.order,payment_term_id:0
+msgid "Payment Term"
+msgstr ""
+
+#. module: purchase
#: view:purchase.order:0
msgid "Purchase orders which are in draft state"
msgstr "Luonnostilassa olevat ostotilaukset"
@@ -2596,6 +2578,9 @@ msgstr "Tilaukset"
#~ msgid "Partial Picking"
#~ msgstr "Osittainen keräily"
+#~ msgid "Select an Open Sale Order"
+#~ msgstr "Valitse Avoin Myyntitilaus"
+
#~ msgid "Configuration Progress"
#~ msgstr "Määrityksen Eteneminen"
@@ -2717,6 +2702,13 @@ msgstr "Tilaukset"
#~ msgid "Current purchases"
#~ msgstr "Nykyiset hankinnat"
+#~ msgid ""
+#~ "A Pick list generates an invoice. Depending on the Invoicing control of the "
+#~ "sale order, the invoice is based on delivered or on ordered quantities."
+#~ msgstr ""
+#~ "Keräilylista luo laskun. Riippuen myyntitilauksen kontrolleista, lasku "
+#~ "perustuu joko toimitettuun tai tilattuun määrään"
+
#, python-format
#~ msgid "Purchase amount over the limit"
#~ msgstr "Ostomäärä ylittää rajan"
diff --git a/addons/purchase/i18n/fr.po b/addons/purchase/i18n/fr.po
index 01b99e9decf..652cf4345a4 100644
--- a/addons/purchase/i18n/fr.po
+++ b/addons/purchase/i18n/fr.po
@@ -6,15 +6,15 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
"PO-Revision-Date: 2012-12-15 16:28+0000\n"
"Last-Translator: LudoRA <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: 2012-12-16 04:46+0000\n"
-"X-Generator: Launchpad (build 16372)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:19+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
#. module: purchase
#: model:ir.ui.menu,name:purchase.menu_procurement_management_inventory
@@ -68,11 +68,6 @@ msgstr ""
"sélectionnés."
#. module: purchase
-#: model:ir.actions.server,name:purchase.actions_server_purchase_order_read
-msgid "Purchase: Mark read"
-msgstr ""
-
-#. module: purchase
#: view:purchase.report:0
#: field:purchase.report,day:0
msgid "Day"
@@ -106,16 +101,13 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:973
-#: code:addons/purchase/purchase.py:988
-#: code:addons/purchase/purchase.py:991
-#: code:addons/purchase/wizard/purchase_order_group.py:47
+#: code:addons/purchase/purchase.py:1024
#, python-format
-msgid "Warning!"
+msgid "Configuration Error!"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:573
+#: code:addons/purchase/purchase.py:587
#, python-format
msgid "You must first cancel all receptions related to this purchase order."
msgstr ""
@@ -133,10 +125,10 @@ msgid "Purchase-Standard Price"
msgstr "Prix standard d'achat"
#. module: purchase
-#: report:purchase.order:0
-#: field:purchase.report,validator:0
-msgid "Validated By"
-msgstr "Validée par"
+#: code:addons/purchase/purchase.py:1011
+#, python-format
+msgid "No supplier defined for this product !"
+msgstr ""
#. module: purchase
#: model:ir.actions.act_window,help:purchase.action_picking_tree4_picking_to_invoice
@@ -159,12 +151,6 @@ msgid "Average Price"
msgstr "Prix moyen"
#. module: purchase
-#: code:addons/purchase/purchase.py:830
-#, python-format
-msgid "Invoice <b>paid</b>."
-msgstr ""
-
-#. module: purchase
#: view:purchase.order:0
msgid "Purchase order which are in the exception state"
msgstr "Les bons de commande qui sont en état ​​d'exception"
@@ -238,7 +224,7 @@ msgstr ""
"de la commande d'achat."
#. module: purchase
-#: code:addons/purchase/purchase.py:255
+#: code:addons/purchase/purchase.py:260
#, python-format
msgid "In order to delete a purchase order, you must cancel it first."
msgstr ""
@@ -264,29 +250,12 @@ msgid "Total Untaxed amount"
msgstr "Montant total hors taxe"
#. module: purchase
-#: model:ir.ui.menu,name:purchase.menu_purchase_uom_categ_form_action
-msgid "Unit of Measure Categories"
-msgstr ""
-
-#. module: purchase
#: view:purchase.report:0
#: field:purchase.report,category_id:0
msgid "Category"
msgstr "Catégorie"
#. module: purchase
-#: view:purchase.order:0
-msgid "Quotation "
-msgstr ""
-
-#. module: purchase
-#: code:addons/purchase/purchase.py:810
-#, python-format
-msgid ""
-"Quotation for <em>%s</em> <b>converted</b> to a Purchase Order of %s %s."
-msgstr ""
-
-#. module: purchase
#: model:process.transition,note:purchase.process_transition_purchaseinvoice0
msgid ""
"A purchase order generates a supplier invoice, as soon as it is confirmed by "
@@ -355,14 +324,16 @@ msgid "October"
msgstr "Octobre"
#. module: purchase
-#: code:addons/purchase/purchase.py:837
+#: code:addons/purchase/purchase.py:1024
#, python-format
-msgid "Purchase Order for <em>%s</em> <b>cancelled</b>."
+msgid ""
+"The product \"%s\" has been defined with your company as reseller which "
+"seems to be a configuration error!"
msgstr ""
#. module: purchase
-#: field:purchase.order,message_summary:0
-msgid "Summary"
+#: view:product.product:0
+msgid "When you sell this service to a customer,"
msgstr ""
#. module: purchase
@@ -391,12 +362,6 @@ msgid "Quantity"
msgstr "Quantité"
#. module: purchase
-#: code:addons/purchase/purchase.py:819
-#, python-format
-msgid "Shipment <em>%s</em> <b>scheduled</b> for %s."
-msgstr ""
-
-#. module: purchase
#: field:purchase.order,fiscal_position:0
msgid "Fiscal Position"
msgstr "Position Fiscale"
@@ -454,12 +419,6 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:824
-#, python-format
-msgid "Draft Invoice of %s %s is <b>waiting for validation</b>."
-msgstr ""
-
-#. module: purchase
#: model:ir.actions.act_window,help:purchase.purchase_line_form_action2
msgid ""
"<p>\n"
@@ -480,6 +439,11 @@ msgid "Scheduled Date"
msgstr "Date prévue"
#. module: purchase
+#: field:purchase.order,currency_id:0
+msgid "Currency"
+msgstr ""
+
+#. module: purchase
#: field:purchase.order,journal_id:0
msgid "Journal"
msgstr "Journal"
@@ -512,6 +476,19 @@ msgid "Incoming Products"
msgstr ""
#. module: purchase
+#: view:purchase.order:0
+msgid "Request for Quotation "
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,partner_ref:0
+msgid ""
+"Reference of the sales order or quotation sent by your supplier. It's mainly "
+"used to do the matching when you receive the products as this reference is "
+"usually written on the delivery order sent by your supplier."
+msgstr ""
+
+#. module: purchase
#: view:purchase.config.settings:0
#: view:purchase.order.group:0
#: view:purchase.order.line_invoice:0
@@ -535,6 +512,11 @@ msgstr ""
"manuellement par le comptable (contrôle facture = \"Manuel\")"
#. module: purchase
+#: model:mail.message.subtype,name:purchase.mt_rfq_approved
+msgid "RFQ Approved"
+msgstr ""
+
+#. module: purchase
#: view:purchase.config.settings:0
msgid "Apply"
msgstr ""
@@ -555,6 +537,11 @@ msgstr ""
"commande confirmé."
#. module: purchase
+#: model:mail.message.subtype,name:purchase.mt_rfq_confirmed
+msgid "RFQ Confirmed"
+msgstr ""
+
+#. module: purchase
#: view:purchase.order:0
msgid "Customer Address"
msgstr ""
@@ -579,7 +566,7 @@ msgid "Supplier"
msgstr "Fournisseur"
#. module: purchase
-#: code:addons/purchase/purchase.py:508
+#: code:addons/purchase/purchase.py:525
#, python-format
msgid "Define expense account for this company: \"%s\" (id:%d)."
msgstr ""
@@ -603,7 +590,6 @@ msgstr "Sous-total"
#. module: purchase
#: field:purchase.order,shipped:0
-#: field:purchase.order,shipped_rate:0
msgid "Received"
msgstr "Reçu"
@@ -645,13 +631,20 @@ msgid "Invoices and Receptions"
msgstr ""
#. module: purchase
+#: model:process.transition,note:purchase.process_transition_packinginvoice0
+msgid ""
+"A Pick list generates an invoice. Depending on the Invoicing control of the "
+"sales order, the invoice is based on delivered or on ordered quantities."
+msgstr ""
+
+#. module: purchase
#: view:purchase.report:0
#: field:purchase.report,nbr:0
msgid "# of Lines"
msgstr "# de lignes"
#. module: purchase
-#: code:addons/purchase/wizard/purchase_line_invoice.py:110
+#: code:addons/purchase/wizard/purchase_line_invoice.py:106
#, python-format
msgid "Define expense account for this product: \"%s\" (id:%d)."
msgstr ""
@@ -672,8 +665,8 @@ msgid "It indicates that a picking has been done"
msgstr "Indique qu'une réception de marchandise a été effectuée."
#. module: purchase
-#: code:addons/purchase/purchase.py:565
-#: code:addons/purchase/purchase.py:572
+#: code:addons/purchase/purchase.py:579
+#: code:addons/purchase/purchase.py:586
#, python-format
msgid "Unable to cancel this purchase order."
msgstr ""
@@ -739,6 +732,15 @@ msgid "Draft PO"
msgstr ""
#. module: purchase
+#: code:addons/purchase/purchase.py:941
+#: code:addons/purchase/purchase.py:956
+#: code:addons/purchase/purchase.py:960
+#: code:addons/purchase/wizard/purchase_order_group.py:47
+#, python-format
+msgid "Warning!"
+msgstr ""
+
+#. module: purchase
#: model:process.node,name:purchase.process_node_draftpurchaseorder0
#: model:process.node,name:purchase.process_node_draftpurchaseorder1
msgid "RFQ"
@@ -770,6 +772,11 @@ msgid "The tax amount"
msgstr "Le montant des taxes"
#. module: purchase
+#: field:purchase.order,shipped_rate:0
+msgid "Received Ratio"
+msgstr ""
+
+#. module: purchase
#: selection:purchase.report,month:0
msgid "September"
msgstr "Septembre"
@@ -801,7 +808,7 @@ msgid "Stock Moves"
msgstr "Mouvements de stock"
#. module: purchase
-#: code:addons/purchase/purchase.py:1158
+#: code:addons/purchase/purchase.py:1156
#, python-format
msgid "Draft Purchase Order created"
msgstr ""
@@ -822,11 +829,6 @@ msgid "Terms and Conditions"
msgstr ""
#. module: purchase
-#: field:purchase.order,currency_id:0
-msgid "unknown"
-msgstr ""
-
-#. module: purchase
#: help:purchase.order,date_order:0
msgid "Date on which this document has been created."
msgstr "Date a laquelle ce document a été créé"
@@ -922,12 +924,6 @@ msgid "Cancel"
msgstr "Annuler"
#. module: purchase
-#: field:purchase.order,message_comment_ids:0
-#: help:purchase.order,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
-#. module: purchase
#: sql_constraint:purchase.order:0
msgid "Order Reference must be unique per Company!"
msgstr "La référence de commande doit être unique par société !"
@@ -961,14 +957,89 @@ msgid "Date Approved"
msgstr "Date approbation"
#. module: purchase
-#: code:addons/purchase/purchase.py:806
-#, python-format
-msgid "Request for quotation <b>created</b>."
+#: view:product.product:0
+msgid "a draft purchase order"
msgstr ""
#. module: purchase
-#: view:product.product:0
-msgid "a draft purchase order"
+#: model:email.template,body_html:purchase.email_template_edi_purchase
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: #FFF; \">\n"
+"\n"
+" <p>Hello$ ${object.partner_id.name},</p>\n"
+" \n"
+" <p>Here is a ${object.state in ('draft', 'sent') and 'request for "
+"quotation' or 'purchase order confirmation'} from ${object.company_id.name}: "
+"</p>\n"
+" \n"
+" <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
+" &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
+" &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
+" &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
+"${object.pricelist_id.currency_id.name}</strong><br />\n"
+" &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
+" % if object.origin:\n"
+" &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
+" % endif\n"
+" % if object.partner_ref:\n"
+" &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
+" % endif\n"
+" % if object.validator:\n"
+" &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.validator.email "
+"or ''}?subject=Order%20${object.name}\">${object.validator.name}</a>\n"
+" % endif\n"
+" </p>\n"
+"\n"
+" <br/>\n"
+" <p>If you have any question, do not hesitate to contact us.</p>\n"
+" <p>Thank you!</p>\n"
+" <br/>\n"
+" <br/>\n"
+" <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
+"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
+"background-repeat: repeat no-repeat;\">\n"
+" <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
+"#DDD;\">\n"
+" <strong style=\"text-"
+"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
+" </div>\n"
+" <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
+"16px; background-color: #F2F2F2;\">\n"
+" <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
+" % if object.company_id.street:\n"
+" ${object.company_id.street}<br/>\n"
+" % endif\n"
+" % if object.company_id.street2:\n"
+" ${object.company_id.street2}<br/>\n"
+" % endif\n"
+" % if object.company_id.city or object.company_id.zip:\n"
+" ${object.company_id.zip} ${object.company_id.city}<br/>\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 ''}<br/>\n"
+" % endif\n"
+" </span>\n"
+" % if object.company_id.phone:\n"
+" <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
+"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
+"0px; padding-left: 0px; \">\n"
+" Phone:&nbsp; ${object.company_id.phone}\n"
+" </div>\n"
+" % endif\n"
+" % if object.company_id.website:\n"
+" <div>\n"
+" Web :&nbsp;<a "
+"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
+" </div>\n"
+" %endif\n"
+" <p></p>\n"
+" </div>\n"
+"</div>\n"
+" "
msgstr ""
#. module: purchase
@@ -1011,17 +1082,12 @@ msgid "Outgoing Mails"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:437
+#: code:addons/purchase/purchase.py:456
#, python-format
msgid "You cannot confirm a purchase order without any purchase order line."
msgstr ""
#. module: purchase
-#: model:ir.actions.server,name:purchase.actions_server_purchase_order_unread
-msgid "Purchase: Mark unread"
-msgstr ""
-
-#. module: purchase
#: help:purchase.order,message_ids:0
msgid "Messages and communication history"
msgstr ""
@@ -1033,7 +1099,7 @@ msgid "Destination Warehouse"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:973
+#: code:addons/purchase/purchase.py:941
#, python-format
msgid ""
"Selected Unit of Measure does not belong to the same category as the product "
@@ -1041,6 +1107,11 @@ msgid ""
msgstr ""
#. module: purchase
+#: view:purchase.order.line_invoice:0
+msgid "Select an Open Sales Order"
+msgstr ""
+
+#. module: purchase
#: model:ir.ui.menu,name:purchase.menu_purchase_unit_measure_purchase
#: model:ir.ui.menu,name:purchase.menu_purchase_uom_form_action
msgid "Units of Measure"
@@ -1052,18 +1123,12 @@ msgid "Manage pricelist per supplier"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:833
-#, python-format
-msgid "Purchase Order has been set to <b>draft</b>."
-msgstr ""
-
-#. module: purchase
#: view:board.board:0
msgid "Purchase Dashboard"
msgstr "Tableau de bord des achats"
#. module: purchase
-#: code:addons/purchase/purchase.py:566
+#: code:addons/purchase/purchase.py:580
#, python-format
msgid "First cancel all receptions related to this purchase order."
msgstr ""
@@ -1102,9 +1167,9 @@ msgid "Unread Messages"
msgstr ""
#. module: purchase
-#: view:purchase.order.line_invoice:0
-msgid "Select an Open Sale Order"
-msgstr "Sélectionnez un bon de commande ouvert"
+#: model:ir.ui.menu,name:purchase.menu_purchase_uom_categ_form_action
+msgid "Unit of Measure Categories"
+msgstr ""
#. module: purchase
#: view:purchase.order:0
@@ -1112,6 +1177,13 @@ msgid "Set to Draft"
msgstr "Mettre en brouillon"
#. module: purchase
+#: help:purchase.order,origin:0
+msgid ""
+"Reference of the document that generated this purchase order request; a "
+"sales order or an internal procurement request."
+msgstr ""
+
+#. module: purchase
#: view:purchase.order.line:0
msgid "Notes"
msgstr "Notes"
@@ -1141,7 +1213,7 @@ msgid "Stock Move"
msgstr "Mouvement de stock"
#. module: purchase
-#: code:addons/purchase/purchase.py:255
+#: code:addons/purchase/purchase.py:260
#, python-format
msgid "Invalid Action!"
msgstr ""
@@ -1243,7 +1315,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:310
+#: code:addons/purchase/purchase.py:320
#, python-format
msgid "Please create Invoices."
msgstr ""
@@ -1333,7 +1405,7 @@ msgid "Purchase Order Line Make Invoice"
msgstr "Créer la facture des lignes de commande d'achat"
#. module: purchase
-#: code:addons/purchase/purchase.py:1133
+#: code:addons/purchase/purchase.py:1141
#, python-format
msgid "PO: %s"
msgstr "PO: %s"
@@ -1344,7 +1416,7 @@ msgid "Send by EMail"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:498
+#: code:addons/purchase/purchase.py:515
#, python-format
msgid "Define purchase journal for this company: \"%s\" (id:%d)."
msgstr ""
@@ -1355,9 +1427,9 @@ msgid "Purchase Order "
msgstr ""
#. module: purchase
-#: view:purchase.order.line:0
-msgid "Manual Invoices"
-msgstr "Factures manuelles"
+#: help:purchase.config.settings,group_costing_method:0
+msgid "Allows you to compute product cost price based on average cost."
+msgstr ""
#. module: purchase
#: model:ir.actions.act_window,name:purchase.action_purchase_configuration
@@ -1511,8 +1583,8 @@ msgid "Compute product cost price based on average cost"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:340
-#: code:addons/purchase/wizard/purchase_line_invoice.py:141
+#: code:addons/purchase/purchase.py:350
+#: code:addons/purchase/wizard/purchase_line_invoice.py:137
#: model:ir.actions.act_window,name:purchase.act_res_partner_2_supplier_invoices
#: view:res.partner:0
#, python-format
@@ -1624,8 +1696,9 @@ msgid "Open Purchase Menu"
msgstr ""
#. module: purchase
-#: model:ir.model,name:purchase.model_mail_compose_message
-msgid "Email composition wizard"
+#: code:addons/purchase/purchase.py:1028
+#, python-format
+msgid "No address defined for the supplier"
msgstr ""
#. module: purchase
@@ -1698,11 +1771,11 @@ msgid "Purchase Order"
msgstr "Bon de commande"
#. module: purchase
-#: code:addons/purchase/purchase.py:310
-#: code:addons/purchase/purchase.py:437
-#: code:addons/purchase/purchase.py:497
-#: code:addons/purchase/purchase.py:508
-#: code:addons/purchase/wizard/purchase_line_invoice.py:109
+#: code:addons/purchase/purchase.py:320
+#: code:addons/purchase/purchase.py:456
+#: code:addons/purchase/purchase.py:514
+#: code:addons/purchase/purchase.py:525
+#: code:addons/purchase/wizard/purchase_line_invoice.py:105
#, python-format
msgid "Error!"
msgstr ""
@@ -1724,16 +1797,6 @@ msgid ""
msgstr ""
#. module: purchase
-#: model:process.transition,note:purchase.process_transition_packinginvoice0
-msgid ""
-"A Pick list generates an invoice. Depending on the Invoicing control of the "
-"sale order, the invoice is based on delivered or on ordered quantities."
-msgstr ""
-"Une expédition génère une facture. En fonction du contrôle de facturation du "
-"bon de commande, la facture est basée sur les quantités livrées ou "
-"commandées."
-
-#. module: purchase
#: selection:purchase.order,state:0
#: selection:purchase.order.line,state:0
#: selection:purchase.report,state:0
@@ -1746,9 +1809,8 @@ msgid "# of Purchase Order"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:827
-#, python-format
-msgid "Shipment <b>received</b>."
+#: model:ir.model,name:purchase.model_mail_compose_message
+msgid "Email composition wizard"
msgstr ""
#. module: purchase
@@ -1839,7 +1901,7 @@ msgid "RFQ_${(object.name or '').replace('/','_')}"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:988
+#: code:addons/purchase/purchase.py:956
#, python-format
msgid "The selected supplier only sells this product by %s"
msgstr "Le fournisseur sélectionné peut seulement vendre cet article par %s"
@@ -1885,6 +1947,12 @@ msgid "Outgoing products to invoice"
msgstr "Expéditions à facturer"
#. module: purchase
+#: report:purchase.order:0
+#: field:purchase.report,validator:0
+msgid "Validated By"
+msgstr "Validée par"
+
+#. module: purchase
#: view:purchase.report:0
#: field:purchase.report,delay_pass:0
msgid "Days to Deliver"
@@ -1974,9 +2042,9 @@ msgid "November"
msgstr "Novembre"
#. module: purchase
-#: help:purchase.config.settings,group_costing_method:0
-msgid "Allows you to compute product cost price based on average cost."
-msgstr ""
+#: view:purchase.order.line:0
+msgid "Manual Invoices"
+msgstr "Factures manuelles"
#. module: purchase
#: report:purchase.order:0
@@ -1999,13 +2067,6 @@ msgid ""
msgstr ""
#. module: purchase
-#: help:purchase.order,origin:0
-msgid ""
-"Reference of the document that generated this purchase order request; a sale "
-"order or an internal procurement request."
-msgstr ""
-
-#. module: purchase
#: model:ir.ui.menu,name:purchase.menu_partner_categories_in_form
msgid "Partner Categories"
msgstr "Catégories de partenaires"
@@ -2026,89 +2087,6 @@ msgid "Invoicing Settings"
msgstr ""
#. module: purchase
-#: model:email.template,body_html:purchase.email_template_edi_purchase
-msgid ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"\n"
-" <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
-"or ''},</p>\n"
-" \n"
-" <p>Here is a ${object.state in ('draft', 'sent') and 'request for "
-"quotation' or 'purchase order confirmation'} from ${object.company_id.name}: "
-"</p>\n"
-" \n"
-" <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
-" &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
-" &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
-" &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
-"${object.pricelist_id.currency_id.name}</strong><br />\n"
-" &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
-" % if object.origin:\n"
-" &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
-" % endif\n"
-" % if object.partner_ref:\n"
-" &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
-" % endif\n"
-" % if object.validator:\n"
-" &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.validator.email "
-"or ''}?subject=Order%20${object.name}\">${object.validator.name}</a>\n"
-" % endif\n"
-" </p>\n"
-"\n"
-" <br/>\n"
-" <p>If you have any question, do not hesitate to contact us.</p>\n"
-" <p>Thank you!</p>\n"
-" <br/>\n"
-" <br/>\n"
-" <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
-"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
-"background-repeat: repeat no-repeat;\">\n"
-" <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
-"#FFF;\">\n"
-" <strong style=\"text-"
-"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
-" </div>\n"
-" <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
-"16px; background-color: #F2F2F2;\">\n"
-" <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
-" % if object.company_id.street:\n"
-" ${object.company_id.street}<br/>\n"
-" % endif\n"
-" % if object.company_id.street2:\n"
-" ${object.company_id.street2}<br/>\n"
-" % endif\n"
-" % if object.company_id.city or object.company_id.zip:\n"
-" ${object.company_id.zip} ${object.company_id.city}<br/>\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 ''}<br/>\n"
-" % endif\n"
-" </span>\n"
-" % if object.company_id.phone:\n"
-" <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
-"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
-"0px; padding-left: 0px; \">\n"
-" Phone:&nbsp; ${object.company_id.phone}\n"
-" </div>\n"
-" % endif\n"
-" % if object.company_id.website:\n"
-" <div>\n"
-" Web :&nbsp;<a "
-"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
-" </div>\n"
-" %endif\n"
-" <p></p>\n"
-" </div>\n"
-"</div>\n"
-" "
-msgstr ""
-
-#. module: purchase
#: model:ir.actions.act_window,name:purchase.action_purchase_order_by_user_all
msgid "Total Orders by User per month"
msgstr "Total des commandes par utilisateur par mois"
@@ -2119,21 +2097,19 @@ msgid "Based on incoming shipments"
msgstr ""
#. module: purchase
+#: code:addons/purchase/purchase.py:1018
+#, python-format
+msgid "No default supplier defined for this product"
+msgstr ""
+
+#. module: purchase
#: view:purchase.report:0
#: field:purchase.report,warehouse_id:0
msgid "Warehouse"
msgstr "Entrepôt"
#. module: purchase
-#: help:purchase.order,partner_ref:0
-msgid ""
-"Reference of the sale order or quotation sent by your supplier. It's mainly "
-"used to do the matching when you receive the products as this reference is "
-"usually written on the delivery order sent by your supplier."
-msgstr ""
-
-#. module: purchase
-#: code:addons/purchase/purchase.py:991
+#: code:addons/purchase/purchase.py:960
#, python-format
msgid ""
"The selected supplier has a minimal quantity set to %s %s, you should not "
@@ -2220,8 +2196,8 @@ msgstr ""
" "
#. module: purchase
-#: view:product.product:0
-msgid "When you sell this service to a customer,"
+#: field:purchase.order,message_summary:0
+msgid "Summary"
msgstr ""
#. module: purchase
@@ -2231,6 +2207,11 @@ msgid "Pricelist Versions"
msgstr "Versions de la liste de prix"
#. module: purchase
+#: field:purchase.order,payment_term_id:0
+msgid "Payment Term"
+msgstr ""
+
+#. module: purchase
#: view:purchase.order:0
msgid "Purchase orders which are in draft state"
msgstr "Bons de commande en état brouillon"
@@ -2711,6 +2692,17 @@ msgstr "Commandes"
#~ msgid "Dest. Address Contact Name"
#~ msgstr "Adresse de destination du contact"
+#~ msgid ""
+#~ "A Pick list generates an invoice. Depending on the Invoicing control of the "
+#~ "sale order, the invoice is based on delivered or on ordered quantities."
+#~ msgstr ""
+#~ "Une expédition génère une facture. En fonction du contrôle de facturation du "
+#~ "bon de commande, la facture est basée sur les quantités livrées ou "
+#~ "commandées."
+
+#~ msgid "Select an Open Sale Order"
+#~ msgstr "Sélectionnez un bon de commande ouvert"
+
#~ msgid "Approve Purchase"
#~ msgstr "Approuver l'achat"
diff --git a/addons/purchase/i18n/gl.po b/addons/purchase/i18n/gl.po
index 279c2e26061..446f0ae376d 100644
--- a/addons/purchase/i18n/gl.po
+++ b/addons/purchase/i18n/gl.po
@@ -7,15 +7,15 @@ msgid ""
msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
"PO-Revision-Date: 2010-11-02 16:55+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: 2012-12-04 05:11+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:19+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
#. module: purchase
#: model:res.groups,name:purchase.group_analytic_accounting
@@ -59,11 +59,6 @@ msgid ""
msgstr ""
#. module: purchase
-#: model:ir.actions.server,name:purchase.actions_server_purchase_order_read
-msgid "Purchase: Mark read"
-msgstr ""
-
-#. module: purchase
#: view:purchase.report:0
#: field:purchase.report,day:0
msgid "Day"
@@ -104,16 +99,13 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:973
-#: code:addons/purchase/purchase.py:988
-#: code:addons/purchase/purchase.py:991
-#: code:addons/purchase/wizard/purchase_order_group.py:47
+#: code:addons/purchase/purchase.py:1024
#, python-format
-msgid "Warning!"
+msgid "Configuration Error!"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:573
+#: code:addons/purchase/purchase.py:587
#, python-format
msgid "You must first cancel all receptions related to this purchase order."
msgstr ""
@@ -130,9 +122,9 @@ msgid "Purchase-Standard Price"
msgstr ""
#. module: purchase
-#: report:purchase.order:0
-#: field:purchase.report,validator:0
-msgid "Validated By"
+#: code:addons/purchase/purchase.py:1011
+#, python-format
+msgid "No supplier defined for this product !"
msgstr ""
#. module: purchase
@@ -156,12 +148,6 @@ msgid "Average Price"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:830
-#, python-format
-msgid "Invoice <b>paid</b>."
-msgstr ""
-
-#. module: purchase
#: view:purchase.order:0
msgid "Purchase order which are in the exception state"
msgstr ""
@@ -231,7 +217,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:255
+#: code:addons/purchase/purchase.py:260
#, python-format
msgid "In order to delete a purchase order, you must cancel it first."
msgstr ""
@@ -257,29 +243,12 @@ msgid "Total Untaxed amount"
msgstr ""
#. module: purchase
-#: model:ir.ui.menu,name:purchase.menu_purchase_uom_categ_form_action
-msgid "Unit of Measure Categories"
-msgstr ""
-
-#. module: purchase
#: view:purchase.report:0
#: field:purchase.report,category_id:0
msgid "Category"
msgstr ""
#. module: purchase
-#: view:purchase.order:0
-msgid "Quotation "
-msgstr ""
-
-#. module: purchase
-#: code:addons/purchase/purchase.py:810
-#, python-format
-msgid ""
-"Quotation for <em>%s</em> <b>converted</b> to a Purchase Order of %s %s."
-msgstr ""
-
-#. module: purchase
#: model:process.transition,note:purchase.process_transition_purchaseinvoice0
msgid ""
"A purchase order generates a supplier invoice, as soon as it is confirmed by "
@@ -344,14 +313,16 @@ msgid "October"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:837
+#: code:addons/purchase/purchase.py:1024
#, python-format
-msgid "Purchase Order for <em>%s</em> <b>cancelled</b>."
+msgid ""
+"The product \"%s\" has been defined with your company as reseller which "
+"seems to be a configuration error!"
msgstr ""
#. module: purchase
-#: field:purchase.order,message_summary:0
-msgid "Summary"
+#: view:product.product:0
+msgid "When you sell this service to a customer,"
msgstr ""
#. module: purchase
@@ -380,12 +351,6 @@ msgid "Quantity"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:819
-#, python-format
-msgid "Shipment <em>%s</em> <b>scheduled</b> for %s."
-msgstr ""
-
-#. module: purchase
#: field:purchase.order,fiscal_position:0
msgid "Fiscal Position"
msgstr ""
@@ -443,12 +408,6 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:824
-#, python-format
-msgid "Draft Invoice of %s %s is <b>waiting for validation</b>."
-msgstr ""
-
-#. module: purchase
#: model:ir.actions.act_window,help:purchase.purchase_line_form_action2
msgid ""
"<p>\n"
@@ -469,6 +428,11 @@ msgid "Scheduled Date"
msgstr ""
#. module: purchase
+#: field:purchase.order,currency_id:0
+msgid "Currency"
+msgstr ""
+
+#. module: purchase
#: field:purchase.order,journal_id:0
msgid "Journal"
msgstr ""
@@ -501,6 +465,19 @@ msgid "Incoming Products"
msgstr ""
#. module: purchase
+#: view:purchase.order:0
+msgid "Request for Quotation "
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,partner_ref:0
+msgid ""
+"Reference of the sales order or quotation sent by your supplier. It's mainly "
+"used to do the matching when you receive the products as this reference is "
+"usually written on the delivery order sent by your supplier."
+msgstr ""
+
+#. module: purchase
#: view:purchase.config.settings:0
#: view:purchase.order.group:0
#: view:purchase.order.line_invoice:0
@@ -521,6 +498,11 @@ msgid ""
msgstr ""
#. module: purchase
+#: model:mail.message.subtype,name:purchase.mt_rfq_approved
+msgid "RFQ Approved"
+msgstr ""
+
+#. module: purchase
#: view:purchase.config.settings:0
msgid "Apply"
msgstr ""
@@ -538,6 +520,11 @@ msgid ""
msgstr ""
#. module: purchase
+#: model:mail.message.subtype,name:purchase.mt_rfq_confirmed
+msgid "RFQ Confirmed"
+msgstr ""
+
+#. module: purchase
#: view:purchase.order:0
msgid "Customer Address"
msgstr ""
@@ -562,7 +549,7 @@ msgid "Supplier"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:508
+#: code:addons/purchase/purchase.py:525
#, python-format
msgid "Define expense account for this company: \"%s\" (id:%d)."
msgstr ""
@@ -586,7 +573,6 @@ msgstr ""
#. module: purchase
#: field:purchase.order,shipped:0
-#: field:purchase.order,shipped_rate:0
msgid "Received"
msgstr ""
@@ -628,13 +614,20 @@ msgid "Invoices and Receptions"
msgstr ""
#. module: purchase
+#: model:process.transition,note:purchase.process_transition_packinginvoice0
+msgid ""
+"A Pick list generates an invoice. Depending on the Invoicing control of the "
+"sales order, the invoice is based on delivered or on ordered quantities."
+msgstr ""
+
+#. module: purchase
#: view:purchase.report:0
#: field:purchase.report,nbr:0
msgid "# of Lines"
msgstr ""
#. module: purchase
-#: code:addons/purchase/wizard/purchase_line_invoice.py:110
+#: code:addons/purchase/wizard/purchase_line_invoice.py:106
#, python-format
msgid "Define expense account for this product: \"%s\" (id:%d)."
msgstr ""
@@ -655,8 +648,8 @@ msgid "It indicates that a picking has been done"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:565
-#: code:addons/purchase/purchase.py:572
+#: code:addons/purchase/purchase.py:579
+#: code:addons/purchase/purchase.py:586
#, python-format
msgid "Unable to cancel this purchase order."
msgstr ""
@@ -719,6 +712,15 @@ msgid "Draft PO"
msgstr ""
#. module: purchase
+#: code:addons/purchase/purchase.py:941
+#: code:addons/purchase/purchase.py:956
+#: code:addons/purchase/purchase.py:960
+#: code:addons/purchase/wizard/purchase_order_group.py:47
+#, python-format
+msgid "Warning!"
+msgstr ""
+
+#. module: purchase
#: model:process.node,name:purchase.process_node_draftpurchaseorder0
#: model:process.node,name:purchase.process_node_draftpurchaseorder1
msgid "RFQ"
@@ -750,6 +752,11 @@ msgid "The tax amount"
msgstr ""
#. module: purchase
+#: field:purchase.order,shipped_rate:0
+msgid "Received Ratio"
+msgstr ""
+
+#. module: purchase
#: selection:purchase.report,month:0
msgid "September"
msgstr ""
@@ -781,7 +788,7 @@ msgid "Stock Moves"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1158
+#: code:addons/purchase/purchase.py:1156
#, python-format
msgid "Draft Purchase Order created"
msgstr ""
@@ -802,11 +809,6 @@ msgid "Terms and Conditions"
msgstr ""
#. module: purchase
-#: field:purchase.order,currency_id:0
-msgid "unknown"
-msgstr ""
-
-#. module: purchase
#: help:purchase.order,date_order:0
msgid "Date on which this document has been created."
msgstr ""
@@ -900,12 +902,6 @@ msgid "Cancel"
msgstr ""
#. module: purchase
-#: field:purchase.order,message_comment_ids:0
-#: help:purchase.order,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
-#. module: purchase
#: sql_constraint:purchase.order:0
msgid "Order Reference must be unique per Company!"
msgstr ""
@@ -939,14 +935,89 @@ msgid "Date Approved"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:806
-#, python-format
-msgid "Request for quotation <b>created</b>."
+#: view:product.product:0
+msgid "a draft purchase order"
msgstr ""
#. module: purchase
-#: view:product.product:0
-msgid "a draft purchase order"
+#: model:email.template,body_html:purchase.email_template_edi_purchase
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: #FFF; \">\n"
+"\n"
+" <p>Hello$ ${object.partner_id.name},</p>\n"
+" \n"
+" <p>Here is a ${object.state in ('draft', 'sent') and 'request for "
+"quotation' or 'purchase order confirmation'} from ${object.company_id.name}: "
+"</p>\n"
+" \n"
+" <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
+" &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
+" &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
+" &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
+"${object.pricelist_id.currency_id.name}</strong><br />\n"
+" &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
+" % if object.origin:\n"
+" &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
+" % endif\n"
+" % if object.partner_ref:\n"
+" &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
+" % endif\n"
+" % if object.validator:\n"
+" &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.validator.email "
+"or ''}?subject=Order%20${object.name}\">${object.validator.name}</a>\n"
+" % endif\n"
+" </p>\n"
+"\n"
+" <br/>\n"
+" <p>If you have any question, do not hesitate to contact us.</p>\n"
+" <p>Thank you!</p>\n"
+" <br/>\n"
+" <br/>\n"
+" <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
+"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
+"background-repeat: repeat no-repeat;\">\n"
+" <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
+"#DDD;\">\n"
+" <strong style=\"text-"
+"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
+" </div>\n"
+" <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
+"16px; background-color: #F2F2F2;\">\n"
+" <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
+" % if object.company_id.street:\n"
+" ${object.company_id.street}<br/>\n"
+" % endif\n"
+" % if object.company_id.street2:\n"
+" ${object.company_id.street2}<br/>\n"
+" % endif\n"
+" % if object.company_id.city or object.company_id.zip:\n"
+" ${object.company_id.zip} ${object.company_id.city}<br/>\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 ''}<br/>\n"
+" % endif\n"
+" </span>\n"
+" % if object.company_id.phone:\n"
+" <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
+"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
+"0px; padding-left: 0px; \">\n"
+" Phone:&nbsp; ${object.company_id.phone}\n"
+" </div>\n"
+" % endif\n"
+" % if object.company_id.website:\n"
+" <div>\n"
+" Web :&nbsp;<a "
+"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
+" </div>\n"
+" %endif\n"
+" <p></p>\n"
+" </div>\n"
+"</div>\n"
+" "
msgstr ""
#. module: purchase
@@ -986,17 +1057,12 @@ msgid "Outgoing Mails"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:437
+#: code:addons/purchase/purchase.py:456
#, python-format
msgid "You cannot confirm a purchase order without any purchase order line."
msgstr ""
#. module: purchase
-#: model:ir.actions.server,name:purchase.actions_server_purchase_order_unread
-msgid "Purchase: Mark unread"
-msgstr ""
-
-#. module: purchase
#: help:purchase.order,message_ids:0
msgid "Messages and communication history"
msgstr ""
@@ -1008,7 +1074,7 @@ msgid "Destination Warehouse"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:973
+#: code:addons/purchase/purchase.py:941
#, python-format
msgid ""
"Selected Unit of Measure does not belong to the same category as the product "
@@ -1016,6 +1082,11 @@ msgid ""
msgstr ""
#. module: purchase
+#: view:purchase.order.line_invoice:0
+msgid "Select an Open Sales Order"
+msgstr ""
+
+#. module: purchase
#: model:ir.ui.menu,name:purchase.menu_purchase_unit_measure_purchase
#: model:ir.ui.menu,name:purchase.menu_purchase_uom_form_action
msgid "Units of Measure"
@@ -1027,18 +1098,12 @@ msgid "Manage pricelist per supplier"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:833
-#, python-format
-msgid "Purchase Order has been set to <b>draft</b>."
-msgstr ""
-
-#. module: purchase
#: view:board.board:0
msgid "Purchase Dashboard"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:566
+#: code:addons/purchase/purchase.py:580
#, python-format
msgid "First cancel all receptions related to this purchase order."
msgstr ""
@@ -1077,8 +1142,8 @@ msgid "Unread Messages"
msgstr ""
#. module: purchase
-#: view:purchase.order.line_invoice:0
-msgid "Select an Open Sale Order"
+#: model:ir.ui.menu,name:purchase.menu_purchase_uom_categ_form_action
+msgid "Unit of Measure Categories"
msgstr ""
#. module: purchase
@@ -1087,6 +1152,13 @@ msgid "Set to Draft"
msgstr ""
#. module: purchase
+#: help:purchase.order,origin:0
+msgid ""
+"Reference of the document that generated this purchase order request; a "
+"sales order or an internal procurement request."
+msgstr ""
+
+#. module: purchase
#: view:purchase.order.line:0
msgid "Notes"
msgstr ""
@@ -1116,7 +1188,7 @@ msgid "Stock Move"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:255
+#: code:addons/purchase/purchase.py:260
#, python-format
msgid "Invalid Action!"
msgstr ""
@@ -1215,7 +1287,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:310
+#: code:addons/purchase/purchase.py:320
#, python-format
msgid "Please create Invoices."
msgstr ""
@@ -1305,7 +1377,7 @@ msgid "Purchase Order Line Make Invoice"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1133
+#: code:addons/purchase/purchase.py:1141
#, python-format
msgid "PO: %s"
msgstr ""
@@ -1316,7 +1388,7 @@ msgid "Send by EMail"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:498
+#: code:addons/purchase/purchase.py:515
#, python-format
msgid "Define purchase journal for this company: \"%s\" (id:%d)."
msgstr ""
@@ -1327,8 +1399,8 @@ msgid "Purchase Order "
msgstr ""
#. module: purchase
-#: view:purchase.order.line:0
-msgid "Manual Invoices"
+#: help:purchase.config.settings,group_costing_method:0
+msgid "Allows you to compute product cost price based on average cost."
msgstr ""
#. module: purchase
@@ -1483,8 +1555,8 @@ msgid "Compute product cost price based on average cost"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:340
-#: code:addons/purchase/wizard/purchase_line_invoice.py:141
+#: code:addons/purchase/purchase.py:350
+#: code:addons/purchase/wizard/purchase_line_invoice.py:137
#: model:ir.actions.act_window,name:purchase.act_res_partner_2_supplier_invoices
#: view:res.partner:0
#, python-format
@@ -1596,8 +1668,9 @@ msgid "Open Purchase Menu"
msgstr ""
#. module: purchase
-#: model:ir.model,name:purchase.model_mail_compose_message
-msgid "Email composition wizard"
+#: code:addons/purchase/purchase.py:1028
+#, python-format
+msgid "No address defined for the supplier"
msgstr ""
#. module: purchase
@@ -1668,11 +1741,11 @@ msgid "Purchase Order"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:310
-#: code:addons/purchase/purchase.py:437
-#: code:addons/purchase/purchase.py:497
-#: code:addons/purchase/purchase.py:508
-#: code:addons/purchase/wizard/purchase_line_invoice.py:109
+#: code:addons/purchase/purchase.py:320
+#: code:addons/purchase/purchase.py:456
+#: code:addons/purchase/purchase.py:514
+#: code:addons/purchase/purchase.py:525
+#: code:addons/purchase/wizard/purchase_line_invoice.py:105
#, python-format
msgid "Error!"
msgstr ""
@@ -1694,13 +1767,6 @@ msgid ""
msgstr ""
#. module: purchase
-#: model:process.transition,note:purchase.process_transition_packinginvoice0
-msgid ""
-"A Pick list generates an invoice. Depending on the Invoicing control of the "
-"sale order, the invoice is based on delivered or on ordered quantities."
-msgstr ""
-
-#. module: purchase
#: selection:purchase.order,state:0
#: selection:purchase.order.line,state:0
#: selection:purchase.report,state:0
@@ -1713,9 +1779,8 @@ msgid "# of Purchase Order"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:827
-#, python-format
-msgid "Shipment <b>received</b>."
+#: model:ir.model,name:purchase.model_mail_compose_message
+msgid "Email composition wizard"
msgstr ""
#. module: purchase
@@ -1799,7 +1864,7 @@ msgid "RFQ_${(object.name or '').replace('/','_')}"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:988
+#: code:addons/purchase/purchase.py:956
#, python-format
msgid "The selected supplier only sells this product by %s"
msgstr ""
@@ -1845,6 +1910,12 @@ msgid "Outgoing products to invoice"
msgstr ""
#. module: purchase
+#: report:purchase.order:0
+#: field:purchase.report,validator:0
+msgid "Validated By"
+msgstr ""
+
+#. module: purchase
#: view:purchase.report:0
#: field:purchase.report,delay_pass:0
msgid "Days to Deliver"
@@ -1934,8 +2005,8 @@ msgid "November"
msgstr ""
#. module: purchase
-#: help:purchase.config.settings,group_costing_method:0
-msgid "Allows you to compute product cost price based on average cost."
+#: view:purchase.order.line:0
+msgid "Manual Invoices"
msgstr ""
#. module: purchase
@@ -1959,13 +2030,6 @@ msgid ""
msgstr ""
#. module: purchase
-#: help:purchase.order,origin:0
-msgid ""
-"Reference of the document that generated this purchase order request; a sale "
-"order or an internal procurement request."
-msgstr ""
-
-#. module: purchase
#: model:ir.ui.menu,name:purchase.menu_partner_categories_in_form
msgid "Partner Categories"
msgstr ""
@@ -1986,89 +2050,6 @@ msgid "Invoicing Settings"
msgstr ""
#. module: purchase
-#: model:email.template,body_html:purchase.email_template_edi_purchase
-msgid ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"\n"
-" <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
-"or ''},</p>\n"
-" \n"
-" <p>Here is a ${object.state in ('draft', 'sent') and 'request for "
-"quotation' or 'purchase order confirmation'} from ${object.company_id.name}: "
-"</p>\n"
-" \n"
-" <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
-" &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
-" &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
-" &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
-"${object.pricelist_id.currency_id.name}</strong><br />\n"
-" &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
-" % if object.origin:\n"
-" &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
-" % endif\n"
-" % if object.partner_ref:\n"
-" &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
-" % endif\n"
-" % if object.validator:\n"
-" &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.validator.email "
-"or ''}?subject=Order%20${object.name}\">${object.validator.name}</a>\n"
-" % endif\n"
-" </p>\n"
-"\n"
-" <br/>\n"
-" <p>If you have any question, do not hesitate to contact us.</p>\n"
-" <p>Thank you!</p>\n"
-" <br/>\n"
-" <br/>\n"
-" <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
-"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
-"background-repeat: repeat no-repeat;\">\n"
-" <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
-"#FFF;\">\n"
-" <strong style=\"text-"
-"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
-" </div>\n"
-" <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
-"16px; background-color: #F2F2F2;\">\n"
-" <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
-" % if object.company_id.street:\n"
-" ${object.company_id.street}<br/>\n"
-" % endif\n"
-" % if object.company_id.street2:\n"
-" ${object.company_id.street2}<br/>\n"
-" % endif\n"
-" % if object.company_id.city or object.company_id.zip:\n"
-" ${object.company_id.zip} ${object.company_id.city}<br/>\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 ''}<br/>\n"
-" % endif\n"
-" </span>\n"
-" % if object.company_id.phone:\n"
-" <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
-"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
-"0px; padding-left: 0px; \">\n"
-" Phone:&nbsp; ${object.company_id.phone}\n"
-" </div>\n"
-" % endif\n"
-" % if object.company_id.website:\n"
-" <div>\n"
-" Web :&nbsp;<a "
-"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
-" </div>\n"
-" %endif\n"
-" <p></p>\n"
-" </div>\n"
-"</div>\n"
-" "
-msgstr ""
-
-#. module: purchase
#: model:ir.actions.act_window,name:purchase.action_purchase_order_by_user_all
msgid "Total Orders by User per month"
msgstr ""
@@ -2079,21 +2060,19 @@ msgid "Based on incoming shipments"
msgstr ""
#. module: purchase
-#: view:purchase.report:0
-#: field:purchase.report,warehouse_id:0
-msgid "Warehouse"
+#: code:addons/purchase/purchase.py:1018
+#, python-format
+msgid "No default supplier defined for this product"
msgstr ""
#. module: purchase
-#: help:purchase.order,partner_ref:0
-msgid ""
-"Reference of the sale order or quotation sent by your supplier. It's mainly "
-"used to do the matching when you receive the products as this reference is "
-"usually written on the delivery order sent by your supplier."
+#: view:purchase.report:0
+#: field:purchase.report,warehouse_id:0
+msgid "Warehouse"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:991
+#: code:addons/purchase/purchase.py:960
#, python-format
msgid ""
"The selected supplier has a minimal quantity set to %s %s, you should not "
@@ -2166,8 +2145,8 @@ msgid ""
msgstr ""
#. module: purchase
-#: view:product.product:0
-msgid "When you sell this service to a customer,"
+#: field:purchase.order,message_summary:0
+msgid "Summary"
msgstr ""
#. module: purchase
@@ -2177,6 +2156,11 @@ msgid "Pricelist Versions"
msgstr ""
#. module: purchase
+#: field:purchase.order,payment_term_id:0
+msgid "Payment Term"
+msgstr ""
+
+#. module: purchase
#: view:purchase.order:0
msgid "Purchase orders which are in draft state"
msgstr ""
diff --git a/addons/purchase/i18n/hr.po b/addons/purchase/i18n/hr.po
index 800a84b4fa9..dcdb84c0359 100644
--- a/addons/purchase/i18n/hr.po
+++ b/addons/purchase/i18n/hr.po
@@ -6,14 +6,14 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 5.0.4\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
"PO-Revision-Date: 2012-12-19 20:45+0000\n"
"Last-Translator: Goran Kliska <gkliska@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: 2012-12-20 04:43+0000\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:19+0000\n"
"X-Generator: Launchpad (build 16378)\n"
#. module: purchase
@@ -60,11 +60,6 @@ msgstr ""
"odabrane proizvode/količine."
#. module: purchase
-#: model:ir.actions.server,name:purchase.actions_server_purchase_order_read
-msgid "Purchase: Mark read"
-msgstr ""
-
-#. module: purchase
#: view:purchase.report:0
#: field:purchase.report,day:0
msgid "Day"
@@ -107,16 +102,13 @@ msgstr ""
"da bi mogao biti ubačen u kanban pogled."
#. module: purchase
-#: code:addons/purchase/purchase.py:973
-#: code:addons/purchase/purchase.py:988
-#: code:addons/purchase/purchase.py:991
-#: code:addons/purchase/wizard/purchase_order_group.py:47
+#: code:addons/purchase/purchase.py:1024
#, python-format
-msgid "Warning!"
-msgstr "Upozorenje!"
+msgid "Configuration Error!"
+msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:573
+#: code:addons/purchase/purchase.py:587
#, python-format
msgid "You must first cancel all receptions related to this purchase order."
msgstr "Postoje neotkazane primke vezane na ovaj nalog."
@@ -133,10 +125,10 @@ msgid "Purchase-Standard Price"
msgstr "Uobičajena nabavna cijena"
#. module: purchase
-#: report:purchase.order:0
-#: field:purchase.report,validator:0
-msgid "Validated By"
-msgstr "Potvrđeno od strane"
+#: code:addons/purchase/purchase.py:1011
+#, python-format
+msgid "No supplier defined for this product !"
+msgstr ""
#. module: purchase
#: model:ir.actions.act_window,help:purchase.action_picking_tree4_picking_to_invoice
@@ -159,12 +151,6 @@ msgid "Average Price"
msgstr "Prosječna cijena"
#. module: purchase
-#: code:addons/purchase/purchase.py:830
-#, python-format
-msgid "Invoice <b>paid</b>."
-msgstr "Račun <b>plaćeno</b>,"
-
-#. module: purchase
#: view:purchase.order:0
msgid "Purchase order which are in the exception state"
msgstr ""
@@ -237,7 +223,7 @@ msgstr ""
"products."
#. module: purchase
-#: code:addons/purchase/purchase.py:255
+#: code:addons/purchase/purchase.py:260
#, python-format
msgid "In order to delete a purchase order, you must cancel it first."
msgstr ""
@@ -263,29 +249,12 @@ msgid "Total Untaxed amount"
msgstr "Uk. osnovica"
#. module: purchase
-#: model:ir.ui.menu,name:purchase.menu_purchase_uom_categ_form_action
-msgid "Unit of Measure Categories"
-msgstr "kategorije JM"
-
-#. module: purchase
#: view:purchase.report:0
#: field:purchase.report,category_id:0
msgid "Category"
msgstr "Grupa"
#. module: purchase
-#: view:purchase.order:0
-msgid "Quotation "
-msgstr "Ponuda "
-
-#. module: purchase
-#: code:addons/purchase/purchase.py:810
-#, python-format
-msgid ""
-"Quotation for <em>%s</em> <b>converted</b> to a Purchase Order of %s %s."
-msgstr ""
-
-#. module: purchase
#: model:process.transition,note:purchase.process_transition_purchaseinvoice0
msgid ""
"A purchase order generates a supplier invoice, as soon as it is confirmed by "
@@ -352,15 +321,17 @@ msgid "October"
msgstr "Listopad"
#. module: purchase
-#: code:addons/purchase/purchase.py:837
+#: code:addons/purchase/purchase.py:1024
#, python-format
-msgid "Purchase Order for <em>%s</em> <b>cancelled</b>."
+msgid ""
+"The product \"%s\" has been defined with your company as reseller which "
+"seems to be a configuration error!"
msgstr ""
#. module: purchase
-#: field:purchase.order,message_summary:0
-msgid "Summary"
-msgstr "Sažetak"
+#: view:product.product:0
+msgid "When you sell this service to a customer,"
+msgstr ""
#. module: purchase
#: model:process.transition,note:purchase.process_transition_createpackinglist0
@@ -388,12 +359,6 @@ msgid "Quantity"
msgstr "Količina"
#. module: purchase
-#: code:addons/purchase/purchase.py:819
-#, python-format
-msgid "Shipment <em>%s</em> <b>scheduled</b> for %s."
-msgstr ""
-
-#. module: purchase
#: field:purchase.order,fiscal_position:0
msgid "Fiscal Position"
msgstr "Fiskalna pozicija"
@@ -451,12 +416,6 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:824
-#, python-format
-msgid "Draft Invoice of %s %s is <b>waiting for validation</b>."
-msgstr ""
-
-#. module: purchase
#: model:ir.actions.act_window,help:purchase.purchase_line_form_action2
msgid ""
"<p>\n"
@@ -477,6 +436,11 @@ msgid "Scheduled Date"
msgstr "Planirani datum"
#. module: purchase
+#: field:purchase.order,currency_id:0
+msgid "Currency"
+msgstr ""
+
+#. module: purchase
#: field:purchase.order,journal_id:0
msgid "Journal"
msgstr "Dnevnik"
@@ -509,6 +473,19 @@ msgid "Incoming Products"
msgstr "Roba u dolasku"
#. module: purchase
+#: view:purchase.order:0
+msgid "Request for Quotation "
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,partner_ref:0
+msgid ""
+"Reference of the sales order or quotation sent by your supplier. It's mainly "
+"used to do the matching when you receive the products as this reference is "
+"usually written on the delivery order sent by your supplier."
+msgstr ""
+
+#. module: purchase
#: view:purchase.config.settings:0
#: view:purchase.order.group:0
#: view:purchase.order.line_invoice:0
@@ -532,6 +509,11 @@ msgstr ""
"stavki kada je 'Fakturiranje' postavljeno na 'Ručno'."
#. module: purchase
+#: model:mail.message.subtype,name:purchase.mt_rfq_approved
+msgid "RFQ Approved"
+msgstr ""
+
+#. module: purchase
#: view:purchase.config.settings:0
msgid "Apply"
msgstr "Primjeni"
@@ -551,6 +533,11 @@ msgstr ""
"becomes a confirmed Purchase Order."
#. module: purchase
+#: model:mail.message.subtype,name:purchase.mt_rfq_confirmed
+msgid "RFQ Confirmed"
+msgstr ""
+
+#. module: purchase
#: view:purchase.order:0
msgid "Customer Address"
msgstr "Adresa kupca"
@@ -575,7 +562,7 @@ msgid "Supplier"
msgstr "Dobavljač"
#. module: purchase
-#: code:addons/purchase/purchase.py:508
+#: code:addons/purchase/purchase.py:525
#, python-format
msgid "Define expense account for this company: \"%s\" (id:%d)."
msgstr ""
@@ -599,7 +586,6 @@ msgstr "Podzbroj"
#. module: purchase
#: field:purchase.order,shipped:0
-#: field:purchase.order,shipped_rate:0
msgid "Received"
msgstr "Received"
@@ -641,13 +627,20 @@ msgid "Invoices and Receptions"
msgstr "Računi i primke"
#. module: purchase
+#: model:process.transition,note:purchase.process_transition_packinginvoice0
+msgid ""
+"A Pick list generates an invoice. Depending on the Invoicing control of the "
+"sales order, the invoice is based on delivered or on ordered quantities."
+msgstr ""
+
+#. module: purchase
#: view:purchase.report:0
#: field:purchase.report,nbr:0
msgid "# of Lines"
msgstr "# linija"
#. module: purchase
-#: code:addons/purchase/wizard/purchase_line_invoice.py:110
+#: code:addons/purchase/wizard/purchase_line_invoice.py:106
#, python-format
msgid "Define expense account for this product: \"%s\" (id:%d)."
msgstr ""
@@ -668,8 +661,8 @@ msgid "It indicates that a picking has been done"
msgstr "Označava da je izvršen prijem proizvoda"
#. module: purchase
-#: code:addons/purchase/purchase.py:565
-#: code:addons/purchase/purchase.py:572
+#: code:addons/purchase/purchase.py:579
+#: code:addons/purchase/purchase.py:586
#, python-format
msgid "Unable to cancel this purchase order."
msgstr ""
@@ -734,6 +727,15 @@ msgid "Draft PO"
msgstr "Nacrt"
#. module: purchase
+#: code:addons/purchase/purchase.py:941
+#: code:addons/purchase/purchase.py:956
+#: code:addons/purchase/purchase.py:960
+#: code:addons/purchase/wizard/purchase_order_group.py:47
+#, python-format
+msgid "Warning!"
+msgstr "Upozorenje!"
+
+#. module: purchase
#: model:process.node,name:purchase.process_node_draftpurchaseorder0
#: model:process.node,name:purchase.process_node_draftpurchaseorder1
msgid "RFQ"
@@ -765,6 +767,11 @@ msgid "The tax amount"
msgstr "Iznos poreza"
#. module: purchase
+#: field:purchase.order,shipped_rate:0
+msgid "Received Ratio"
+msgstr ""
+
+#. module: purchase
#: selection:purchase.report,month:0
msgid "September"
msgstr "Rujan"
@@ -796,7 +803,7 @@ msgid "Stock Moves"
msgstr "Skladišni prijenosi"
#. module: purchase
-#: code:addons/purchase/purchase.py:1158
+#: code:addons/purchase/purchase.py:1156
#, python-format
msgid "Draft Purchase Order created"
msgstr "Nacrt naloga za nabavu kreiran"
@@ -817,11 +824,6 @@ msgid "Terms and Conditions"
msgstr "Uvjeti o korištenju"
#. module: purchase
-#: field:purchase.order,currency_id:0
-msgid "unknown"
-msgstr "nepoznato"
-
-#. module: purchase
#: help:purchase.order,date_order:0
msgid "Date on which this document has been created."
msgstr "Datum kreiranja ovog dokumenta."
@@ -915,12 +917,6 @@ msgid "Cancel"
msgstr "Odustani"
#. module: purchase
-#: field:purchase.order,message_comment_ids:0
-#: help:purchase.order,message_comment_ids:0
-msgid "Comments and emails"
-msgstr "Komentari i emailovi."
-
-#. module: purchase
#: sql_constraint:purchase.order:0
msgid "Order Reference must be unique per Company!"
msgstr "Poveznica narudžbe mora biti jedinstvena za organizaciju!"
@@ -954,14 +950,89 @@ msgid "Date Approved"
msgstr "Datum odobrenja"
#. module: purchase
-#: code:addons/purchase/purchase.py:806
-#, python-format
-msgid "Request for quotation <b>created</b>."
+#: view:product.product:0
+msgid "a draft purchase order"
msgstr ""
#. module: purchase
-#: view:product.product:0
-msgid "a draft purchase order"
+#: model:email.template,body_html:purchase.email_template_edi_purchase
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: #FFF; \">\n"
+"\n"
+" <p>Hello$ ${object.partner_id.name},</p>\n"
+" \n"
+" <p>Here is a ${object.state in ('draft', 'sent') and 'request for "
+"quotation' or 'purchase order confirmation'} from ${object.company_id.name}: "
+"</p>\n"
+" \n"
+" <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
+" &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
+" &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
+" &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
+"${object.pricelist_id.currency_id.name}</strong><br />\n"
+" &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
+" % if object.origin:\n"
+" &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
+" % endif\n"
+" % if object.partner_ref:\n"
+" &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
+" % endif\n"
+" % if object.validator:\n"
+" &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.validator.email "
+"or ''}?subject=Order%20${object.name}\">${object.validator.name}</a>\n"
+" % endif\n"
+" </p>\n"
+"\n"
+" <br/>\n"
+" <p>If you have any question, do not hesitate to contact us.</p>\n"
+" <p>Thank you!</p>\n"
+" <br/>\n"
+" <br/>\n"
+" <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
+"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
+"background-repeat: repeat no-repeat;\">\n"
+" <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
+"#DDD;\">\n"
+" <strong style=\"text-"
+"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
+" </div>\n"
+" <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
+"16px; background-color: #F2F2F2;\">\n"
+" <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
+" % if object.company_id.street:\n"
+" ${object.company_id.street}<br/>\n"
+" % endif\n"
+" % if object.company_id.street2:\n"
+" ${object.company_id.street2}<br/>\n"
+" % endif\n"
+" % if object.company_id.city or object.company_id.zip:\n"
+" ${object.company_id.zip} ${object.company_id.city}<br/>\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 ''}<br/>\n"
+" % endif\n"
+" </span>\n"
+" % if object.company_id.phone:\n"
+" <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
+"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
+"0px; padding-left: 0px; \">\n"
+" Phone:&nbsp; ${object.company_id.phone}\n"
+" </div>\n"
+" % endif\n"
+" % if object.company_id.website:\n"
+" <div>\n"
+" Web :&nbsp;<a "
+"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
+" </div>\n"
+" %endif\n"
+" <p></p>\n"
+" </div>\n"
+"</div>\n"
+" "
msgstr ""
#. module: purchase
@@ -1003,17 +1074,12 @@ msgid "Outgoing Mails"
msgstr "Odlazni mailovi"
#. module: purchase
-#: code:addons/purchase/purchase.py:437
+#: code:addons/purchase/purchase.py:456
#, python-format
msgid "You cannot confirm a purchase order without any purchase order line."
msgstr ""
#. module: purchase
-#: model:ir.actions.server,name:purchase.actions_server_purchase_order_unread
-msgid "Purchase: Mark unread"
-msgstr ""
-
-#. module: purchase
#: help:purchase.order,message_ids:0
msgid "Messages and communication history"
msgstr "Poruke i povijest"
@@ -1025,7 +1091,7 @@ msgid "Destination Warehouse"
msgstr "Ciljno skladište"
#. module: purchase
-#: code:addons/purchase/purchase.py:973
+#: code:addons/purchase/purchase.py:941
#, python-format
msgid ""
"Selected Unit of Measure does not belong to the same category as the product "
@@ -1033,6 +1099,11 @@ msgid ""
msgstr ""
#. module: purchase
+#: view:purchase.order.line_invoice:0
+msgid "Select an Open Sales Order"
+msgstr ""
+
+#. module: purchase
#: model:ir.ui.menu,name:purchase.menu_purchase_unit_measure_purchase
#: model:ir.ui.menu,name:purchase.menu_purchase_uom_form_action
msgid "Units of Measure"
@@ -1044,18 +1115,12 @@ msgid "Manage pricelist per supplier"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:833
-#, python-format
-msgid "Purchase Order has been set to <b>draft</b>."
-msgstr ""
-
-#. module: purchase
#: view:board.board:0
msgid "Purchase Dashboard"
msgstr "Upravljačka ploča nabave"
#. module: purchase
-#: code:addons/purchase/purchase.py:566
+#: code:addons/purchase/purchase.py:580
#, python-format
msgid "First cancel all receptions related to this purchase order."
msgstr ""
@@ -1094,9 +1159,9 @@ msgid "Unread Messages"
msgstr "Nepročitane poruke"
#. module: purchase
-#: view:purchase.order.line_invoice:0
-msgid "Select an Open Sale Order"
-msgstr "Odaberite otvoreni prodajni nalog"
+#: model:ir.ui.menu,name:purchase.menu_purchase_uom_categ_form_action
+msgid "Unit of Measure Categories"
+msgstr "kategorije JM"
#. module: purchase
#: view:purchase.order:0
@@ -1104,6 +1169,13 @@ msgid "Set to Draft"
msgstr "Postavi na nacrt"
#. module: purchase
+#: help:purchase.order,origin:0
+msgid ""
+"Reference of the document that generated this purchase order request; a "
+"sales order or an internal procurement request."
+msgstr ""
+
+#. module: purchase
#: view:purchase.order.line:0
msgid "Notes"
msgstr "Bilješke"
@@ -1133,7 +1205,7 @@ msgid "Stock Move"
msgstr "Skladišni prijenosi"
#. module: purchase
-#: code:addons/purchase/purchase.py:255
+#: code:addons/purchase/purchase.py:260
#, python-format
msgid "Invalid Action!"
msgstr ""
@@ -1235,7 +1307,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:310
+#: code:addons/purchase/purchase.py:320
#, python-format
msgid "Please create Invoices."
msgstr ""
@@ -1325,7 +1397,7 @@ msgid "Purchase Order Line Make Invoice"
msgstr "Kreiraj račun iz stavki naloga za nabavu"
#. module: purchase
-#: code:addons/purchase/purchase.py:1133
+#: code:addons/purchase/purchase.py:1141
#, python-format
msgid "PO: %s"
msgstr "NN: %s"
@@ -1336,7 +1408,7 @@ msgid "Send by EMail"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:498
+#: code:addons/purchase/purchase.py:515
#, python-format
msgid "Define purchase journal for this company: \"%s\" (id:%d)."
msgstr ""
@@ -1347,9 +1419,9 @@ msgid "Purchase Order "
msgstr "Nalog za nabavu "
#. module: purchase
-#: view:purchase.order.line:0
-msgid "Manual Invoices"
-msgstr "Ručni računi"
+#: help:purchase.config.settings,group_costing_method:0
+msgid "Allows you to compute product cost price based on average cost."
+msgstr ""
#. module: purchase
#: model:ir.actions.act_window,name:purchase.action_purchase_configuration
@@ -1503,8 +1575,8 @@ msgid "Compute product cost price based on average cost"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:340
-#: code:addons/purchase/wizard/purchase_line_invoice.py:141
+#: code:addons/purchase/purchase.py:350
+#: code:addons/purchase/wizard/purchase_line_invoice.py:137
#: model:ir.actions.act_window,name:purchase.act_res_partner_2_supplier_invoices
#: view:res.partner:0
#, python-format
@@ -1616,8 +1688,9 @@ msgid "Open Purchase Menu"
msgstr ""
#. module: purchase
-#: model:ir.model,name:purchase.model_mail_compose_message
-msgid "Email composition wizard"
+#: code:addons/purchase/purchase.py:1028
+#, python-format
+msgid "No address defined for the supplier"
msgstr ""
#. module: purchase
@@ -1690,11 +1763,11 @@ msgid "Purchase Order"
msgstr "Nalog za nabavu"
#. module: purchase
-#: code:addons/purchase/purchase.py:310
-#: code:addons/purchase/purchase.py:437
-#: code:addons/purchase/purchase.py:497
-#: code:addons/purchase/purchase.py:508
-#: code:addons/purchase/wizard/purchase_line_invoice.py:109
+#: code:addons/purchase/purchase.py:320
+#: code:addons/purchase/purchase.py:456
+#: code:addons/purchase/purchase.py:514
+#: code:addons/purchase/purchase.py:525
+#: code:addons/purchase/wizard/purchase_line_invoice.py:105
#, python-format
msgid "Error!"
msgstr "Greška!"
@@ -1716,15 +1789,6 @@ msgid ""
msgstr ""
#. module: purchase
-#: model:process.transition,note:purchase.process_transition_packinginvoice0
-msgid ""
-"A Pick list generates an invoice. Depending on the Invoicing control of the "
-"sale order, the invoice is based on delivered or on ordered quantities."
-msgstr ""
-"Primka generira ulazni račun. Ovisno o kontroli računa na Nalogu nabave, "
-"račun se kreira na temelju primljenih ili naručenih količina."
-
-#. module: purchase
#: selection:purchase.order,state:0
#: selection:purchase.order.line,state:0
#: selection:purchase.report,state:0
@@ -1737,9 +1801,8 @@ msgid "# of Purchase Order"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:827
-#, python-format
-msgid "Shipment <b>received</b>."
+#: model:ir.model,name:purchase.model_mail_compose_message
+msgid "Email composition wizard"
msgstr ""
#. module: purchase
@@ -1828,7 +1891,7 @@ msgid "RFQ_${(object.name or '').replace('/','_')}"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:988
+#: code:addons/purchase/purchase.py:956
#, python-format
msgid "The selected supplier only sells this product by %s"
msgstr ""
@@ -1874,6 +1937,12 @@ msgid "Outgoing products to invoice"
msgstr "Nefakturirani izlaz"
#. module: purchase
+#: report:purchase.order:0
+#: field:purchase.report,validator:0
+msgid "Validated By"
+msgstr "Potvrđeno od strane"
+
+#. module: purchase
#: view:purchase.report:0
#: field:purchase.report,delay_pass:0
msgid "Days to Deliver"
@@ -1963,9 +2032,9 @@ msgid "November"
msgstr "Studeni"
#. module: purchase
-#: help:purchase.config.settings,group_costing_method:0
-msgid "Allows you to compute product cost price based on average cost."
-msgstr ""
+#: view:purchase.order.line:0
+msgid "Manual Invoices"
+msgstr "Ručni računi"
#. module: purchase
#: report:purchase.order:0
@@ -1988,13 +2057,6 @@ msgid ""
msgstr ""
#. module: purchase
-#: help:purchase.order,origin:0
-msgid ""
-"Reference of the document that generated this purchase order request; a sale "
-"order or an internal procurement request."
-msgstr ""
-
-#. module: purchase
#: model:ir.ui.menu,name:purchase.menu_partner_categories_in_form
msgid "Partner Categories"
msgstr "Kategorije partnera"
@@ -2015,89 +2077,6 @@ msgid "Invoicing Settings"
msgstr "Postave fakturiranja"
#. module: purchase
-#: model:email.template,body_html:purchase.email_template_edi_purchase
-msgid ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"\n"
-" <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
-"or ''},</p>\n"
-" \n"
-" <p>Here is a ${object.state in ('draft', 'sent') and 'request for "
-"quotation' or 'purchase order confirmation'} from ${object.company_id.name}: "
-"</p>\n"
-" \n"
-" <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
-" &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
-" &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
-" &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
-"${object.pricelist_id.currency_id.name}</strong><br />\n"
-" &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
-" % if object.origin:\n"
-" &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
-" % endif\n"
-" % if object.partner_ref:\n"
-" &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
-" % endif\n"
-" % if object.validator:\n"
-" &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.validator.email "
-"or ''}?subject=Order%20${object.name}\">${object.validator.name}</a>\n"
-" % endif\n"
-" </p>\n"
-"\n"
-" <br/>\n"
-" <p>If you have any question, do not hesitate to contact us.</p>\n"
-" <p>Thank you!</p>\n"
-" <br/>\n"
-" <br/>\n"
-" <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
-"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
-"background-repeat: repeat no-repeat;\">\n"
-" <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
-"#FFF;\">\n"
-" <strong style=\"text-"
-"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
-" </div>\n"
-" <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
-"16px; background-color: #F2F2F2;\">\n"
-" <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
-" % if object.company_id.street:\n"
-" ${object.company_id.street}<br/>\n"
-" % endif\n"
-" % if object.company_id.street2:\n"
-" ${object.company_id.street2}<br/>\n"
-" % endif\n"
-" % if object.company_id.city or object.company_id.zip:\n"
-" ${object.company_id.zip} ${object.company_id.city}<br/>\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 ''}<br/>\n"
-" % endif\n"
-" </span>\n"
-" % if object.company_id.phone:\n"
-" <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
-"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
-"0px; padding-left: 0px; \">\n"
-" Phone:&nbsp; ${object.company_id.phone}\n"
-" </div>\n"
-" % endif\n"
-" % if object.company_id.website:\n"
-" <div>\n"
-" Web :&nbsp;<a "
-"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
-" </div>\n"
-" %endif\n"
-" <p></p>\n"
-" </div>\n"
-"</div>\n"
-" "
-msgstr ""
-
-#. module: purchase
#: model:ir.actions.act_window,name:purchase.action_purchase_order_by_user_all
msgid "Total Orders by User per month"
msgstr "Ukupno naloga po korisniku i mjesecu"
@@ -2108,21 +2087,19 @@ msgid "Based on incoming shipments"
msgstr ""
#. module: purchase
+#: code:addons/purchase/purchase.py:1018
+#, python-format
+msgid "No default supplier defined for this product"
+msgstr ""
+
+#. module: purchase
#: view:purchase.report:0
#: field:purchase.report,warehouse_id:0
msgid "Warehouse"
msgstr "Skladište"
#. module: purchase
-#: help:purchase.order,partner_ref:0
-msgid ""
-"Reference of the sale order or quotation sent by your supplier. It's mainly "
-"used to do the matching when you receive the products as this reference is "
-"usually written on the delivery order sent by your supplier."
-msgstr ""
-
-#. module: purchase
-#: code:addons/purchase/purchase.py:991
+#: code:addons/purchase/purchase.py:960
#, python-format
msgid ""
"The selected supplier has a minimal quantity set to %s %s, you should not "
@@ -2205,9 +2182,9 @@ msgstr ""
" "
#. module: purchase
-#: view:product.product:0
-msgid "When you sell this service to a customer,"
-msgstr ""
+#: field:purchase.order,message_summary:0
+msgid "Summary"
+msgstr "Sažetak"
#. module: purchase
#: model:ir.actions.act_window,name:purchase.purchase_pricelist_version_action
@@ -2216,6 +2193,11 @@ msgid "Pricelist Versions"
msgstr "Verzije cjenika"
#. module: purchase
+#: field:purchase.order,payment_term_id:0
+msgid "Payment Term"
+msgstr ""
+
+#. module: purchase
#: view:purchase.order:0
msgid "Purchase orders which are in draft state"
msgstr "Nalozi u stanju 'Nacrt'"
@@ -2322,6 +2304,13 @@ msgstr "Orders"
#~ msgid "Negotiation by Supplier"
#~ msgstr "Negotiation by Supplier"
+#~ msgid ""
+#~ "A Pick list generates an invoice. Depending on the Invoicing control of the "
+#~ "sale order, the invoice is based on delivered or on ordered quantities."
+#~ msgstr ""
+#~ "Primka generira ulazni račun. Ovisno o kontroli računa na Nalogu nabave, "
+#~ "račun se kreira na temelju primljenih ili naručenih količina."
+
#~ msgid "Convert to Purchase Order"
#~ msgstr "U nalog za nabavu"
@@ -2502,6 +2491,9 @@ msgstr "Orders"
#~ msgid "Purchase Management"
#~ msgstr "Upravljanje nabavom"
+#~ msgid "Select an Open Sale Order"
+#~ msgstr "Odaberite otvoreni prodajni nalog"
+
#~ msgid ""
#~ "unique number of the purchase order,computed automatically when the purchase "
#~ "order is created"
diff --git a/addons/purchase/i18n/hu.po b/addons/purchase/i18n/hu.po
index acb2c7854e7..d5bb15ee489 100644
--- a/addons/purchase/i18n/hu.po
+++ b/addons/purchase/i18n/hu.po
@@ -6,15 +6,15 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
"PO-Revision-Date: 2011-11-07 12:47+0000\n"
"Last-Translator: Krisztian Eyssen <krisz@eyssen.hu>\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: 2012-12-04 05:11+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:19+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
#. module: purchase
#: model:res.groups,name:purchase.group_analytic_accounting
@@ -61,11 +61,6 @@ msgstr ""
"árát."
#. module: purchase
-#: model:ir.actions.server,name:purchase.actions_server_purchase_order_read
-msgid "Purchase: Mark read"
-msgstr ""
-
-#. module: purchase
#: view:purchase.report:0
#: field:purchase.report,day:0
msgid "Day"
@@ -106,16 +101,13 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:973
-#: code:addons/purchase/purchase.py:988
-#: code:addons/purchase/purchase.py:991
-#: code:addons/purchase/wizard/purchase_order_group.py:47
+#: code:addons/purchase/purchase.py:1024
#, python-format
-msgid "Warning!"
+msgid "Configuration Error!"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:573
+#: code:addons/purchase/purchase.py:587
#, python-format
msgid "You must first cancel all receptions related to this purchase order."
msgstr ""
@@ -132,10 +124,10 @@ msgid "Purchase-Standard Price"
msgstr "Beszerzés-Standard ár"
#. module: purchase
-#: report:purchase.order:0
-#: field:purchase.report,validator:0
-msgid "Validated By"
-msgstr "Jóváhagyó"
+#: code:addons/purchase/purchase.py:1011
+#, python-format
+msgid "No supplier defined for this product !"
+msgstr ""
#. module: purchase
#: model:ir.actions.act_window,help:purchase.action_picking_tree4_picking_to_invoice
@@ -158,12 +150,6 @@ msgid "Average Price"
msgstr "Átlagár"
#. module: purchase
-#: code:addons/purchase/purchase.py:830
-#, python-format
-msgid "Invoice <b>paid</b>."
-msgstr ""
-
-#. module: purchase
#: view:purchase.order:0
msgid "Purchase order which are in the exception state"
msgstr ""
@@ -235,7 +221,7 @@ msgstr ""
"dátuma."
#. module: purchase
-#: code:addons/purchase/purchase.py:255
+#: code:addons/purchase/purchase.py:260
#, python-format
msgid "In order to delete a purchase order, you must cancel it first."
msgstr ""
@@ -261,29 +247,12 @@ msgid "Total Untaxed amount"
msgstr "Teljes nettó összeg"
#. module: purchase
-#: model:ir.ui.menu,name:purchase.menu_purchase_uom_categ_form_action
-msgid "Unit of Measure Categories"
-msgstr ""
-
-#. module: purchase
#: view:purchase.report:0
#: field:purchase.report,category_id:0
msgid "Category"
msgstr "Kategória"
#. module: purchase
-#: view:purchase.order:0
-msgid "Quotation "
-msgstr ""
-
-#. module: purchase
-#: code:addons/purchase/purchase.py:810
-#, python-format
-msgid ""
-"Quotation for <em>%s</em> <b>converted</b> to a Purchase Order of %s %s."
-msgstr ""
-
-#. module: purchase
#: model:process.transition,note:purchase.process_transition_purchaseinvoice0
msgid ""
"A purchase order generates a supplier invoice, as soon as it is confirmed by "
@@ -351,14 +320,16 @@ msgid "October"
msgstr "Október"
#. module: purchase
-#: code:addons/purchase/purchase.py:837
+#: code:addons/purchase/purchase.py:1024
#, python-format
-msgid "Purchase Order for <em>%s</em> <b>cancelled</b>."
+msgid ""
+"The product \"%s\" has been defined with your company as reseller which "
+"seems to be a configuration error!"
msgstr ""
#. module: purchase
-#: field:purchase.order,message_summary:0
-msgid "Summary"
+#: view:product.product:0
+msgid "When you sell this service to a customer,"
msgstr ""
#. module: purchase
@@ -388,12 +359,6 @@ msgid "Quantity"
msgstr "Mennyiség"
#. module: purchase
-#: code:addons/purchase/purchase.py:819
-#, python-format
-msgid "Shipment <em>%s</em> <b>scheduled</b> for %s."
-msgstr ""
-
-#. module: purchase
#: field:purchase.order,fiscal_position:0
msgid "Fiscal Position"
msgstr "ÁFA pozíció"
@@ -451,12 +416,6 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:824
-#, python-format
-msgid "Draft Invoice of %s %s is <b>waiting for validation</b>."
-msgstr ""
-
-#. module: purchase
#: model:ir.actions.act_window,help:purchase.purchase_line_form_action2
msgid ""
"<p>\n"
@@ -477,6 +436,11 @@ msgid "Scheduled Date"
msgstr "Tervezett dátum"
#. module: purchase
+#: field:purchase.order,currency_id:0
+msgid "Currency"
+msgstr ""
+
+#. module: purchase
#: field:purchase.order,journal_id:0
msgid "Journal"
msgstr ""
@@ -509,6 +473,19 @@ msgid "Incoming Products"
msgstr ""
#. module: purchase
+#: view:purchase.order:0
+msgid "Request for Quotation "
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,partner_ref:0
+msgid ""
+"Reference of the sales order or quotation sent by your supplier. It's mainly "
+"used to do the matching when you receive the products as this reference is "
+"usually written on the delivery order sent by your supplier."
+msgstr ""
+
+#. module: purchase
#: view:purchase.config.settings:0
#: view:purchase.order.group:0
#: view:purchase.order.line_invoice:0
@@ -532,6 +509,11 @@ msgstr ""
"a számlát (számlaellenőrzés = manuális)."
#. module: purchase
+#: model:mail.message.subtype,name:purchase.mt_rfq_approved
+msgid "RFQ Approved"
+msgstr ""
+
+#. module: purchase
#: view:purchase.config.settings:0
msgid "Apply"
msgstr ""
@@ -551,6 +533,11 @@ msgstr ""
"a beszállítónak. Az ajánlatkérésből jóváhagyott szállítói megrendelés lesz."
#. module: purchase
+#: model:mail.message.subtype,name:purchase.mt_rfq_confirmed
+msgid "RFQ Confirmed"
+msgstr ""
+
+#. module: purchase
#: view:purchase.order:0
msgid "Customer Address"
msgstr ""
@@ -575,7 +562,7 @@ msgid "Supplier"
msgstr "Szállító"
#. module: purchase
-#: code:addons/purchase/purchase.py:508
+#: code:addons/purchase/purchase.py:525
#, python-format
msgid "Define expense account for this company: \"%s\" (id:%d)."
msgstr ""
@@ -599,7 +586,6 @@ msgstr "Részösszeg"
#. module: purchase
#: field:purchase.order,shipped:0
-#: field:purchase.order,shipped_rate:0
msgid "Received"
msgstr "Érkeztetett"
@@ -641,13 +627,20 @@ msgid "Invoices and Receptions"
msgstr ""
#. module: purchase
+#: model:process.transition,note:purchase.process_transition_packinginvoice0
+msgid ""
+"A Pick list generates an invoice. Depending on the Invoicing control of the "
+"sales order, the invoice is based on delivered or on ordered quantities."
+msgstr ""
+
+#. module: purchase
#: view:purchase.report:0
#: field:purchase.report,nbr:0
msgid "# of Lines"
msgstr "Sorok száma"
#. module: purchase
-#: code:addons/purchase/wizard/purchase_line_invoice.py:110
+#: code:addons/purchase/wizard/purchase_line_invoice.py:106
#, python-format
msgid "Define expense account for this product: \"%s\" (id:%d)."
msgstr ""
@@ -668,8 +661,8 @@ msgid "It indicates that a picking has been done"
msgstr "Jelzi, hogy a kiszedést végrehajtották."
#. module: purchase
-#: code:addons/purchase/purchase.py:565
-#: code:addons/purchase/purchase.py:572
+#: code:addons/purchase/purchase.py:579
+#: code:addons/purchase/purchase.py:586
#, python-format
msgid "Unable to cancel this purchase order."
msgstr ""
@@ -735,6 +728,15 @@ msgid "Draft PO"
msgstr ""
#. module: purchase
+#: code:addons/purchase/purchase.py:941
+#: code:addons/purchase/purchase.py:956
+#: code:addons/purchase/purchase.py:960
+#: code:addons/purchase/wizard/purchase_order_group.py:47
+#, python-format
+msgid "Warning!"
+msgstr ""
+
+#. module: purchase
#: model:process.node,name:purchase.process_node_draftpurchaseorder0
#: model:process.node,name:purchase.process_node_draftpurchaseorder1
msgid "RFQ"
@@ -766,6 +768,11 @@ msgid "The tax amount"
msgstr "Az adó összege"
#. module: purchase
+#: field:purchase.order,shipped_rate:0
+msgid "Received Ratio"
+msgstr ""
+
+#. module: purchase
#: selection:purchase.report,month:0
msgid "September"
msgstr "Szeptember"
@@ -797,7 +804,7 @@ msgid "Stock Moves"
msgstr "Készletmozgások"
#. module: purchase
-#: code:addons/purchase/purchase.py:1158
+#: code:addons/purchase/purchase.py:1156
#, python-format
msgid "Draft Purchase Order created"
msgstr ""
@@ -818,11 +825,6 @@ msgid "Terms and Conditions"
msgstr ""
#. module: purchase
-#: field:purchase.order,currency_id:0
-msgid "unknown"
-msgstr ""
-
-#. module: purchase
#: help:purchase.order,date_order:0
msgid "Date on which this document has been created."
msgstr "Dokumentumkészítés dátuma"
@@ -917,12 +919,6 @@ msgid "Cancel"
msgstr "Mégsem"
#. module: purchase
-#: field:purchase.order,message_comment_ids:0
-#: help:purchase.order,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
-#. module: purchase
#: sql_constraint:purchase.order:0
msgid "Order Reference must be unique per Company!"
msgstr ""
@@ -956,14 +952,89 @@ msgid "Date Approved"
msgstr "Dátum jóváhagyása"
#. module: purchase
-#: code:addons/purchase/purchase.py:806
-#, python-format
-msgid "Request for quotation <b>created</b>."
+#: view:product.product:0
+msgid "a draft purchase order"
msgstr ""
#. module: purchase
-#: view:product.product:0
-msgid "a draft purchase order"
+#: model:email.template,body_html:purchase.email_template_edi_purchase
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: #FFF; \">\n"
+"\n"
+" <p>Hello$ ${object.partner_id.name},</p>\n"
+" \n"
+" <p>Here is a ${object.state in ('draft', 'sent') and 'request for "
+"quotation' or 'purchase order confirmation'} from ${object.company_id.name}: "
+"</p>\n"
+" \n"
+" <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
+" &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
+" &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
+" &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
+"${object.pricelist_id.currency_id.name}</strong><br />\n"
+" &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
+" % if object.origin:\n"
+" &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
+" % endif\n"
+" % if object.partner_ref:\n"
+" &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
+" % endif\n"
+" % if object.validator:\n"
+" &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.validator.email "
+"or ''}?subject=Order%20${object.name}\">${object.validator.name}</a>\n"
+" % endif\n"
+" </p>\n"
+"\n"
+" <br/>\n"
+" <p>If you have any question, do not hesitate to contact us.</p>\n"
+" <p>Thank you!</p>\n"
+" <br/>\n"
+" <br/>\n"
+" <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
+"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
+"background-repeat: repeat no-repeat;\">\n"
+" <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
+"#DDD;\">\n"
+" <strong style=\"text-"
+"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
+" </div>\n"
+" <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
+"16px; background-color: #F2F2F2;\">\n"
+" <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
+" % if object.company_id.street:\n"
+" ${object.company_id.street}<br/>\n"
+" % endif\n"
+" % if object.company_id.street2:\n"
+" ${object.company_id.street2}<br/>\n"
+" % endif\n"
+" % if object.company_id.city or object.company_id.zip:\n"
+" ${object.company_id.zip} ${object.company_id.city}<br/>\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 ''}<br/>\n"
+" % endif\n"
+" </span>\n"
+" % if object.company_id.phone:\n"
+" <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
+"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
+"0px; padding-left: 0px; \">\n"
+" Phone:&nbsp; ${object.company_id.phone}\n"
+" </div>\n"
+" % endif\n"
+" % if object.company_id.website:\n"
+" <div>\n"
+" Web :&nbsp;<a "
+"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
+" </div>\n"
+" %endif\n"
+" <p></p>\n"
+" </div>\n"
+"</div>\n"
+" "
msgstr ""
#. module: purchase
@@ -1006,17 +1077,12 @@ msgid "Outgoing Mails"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:437
+#: code:addons/purchase/purchase.py:456
#, python-format
msgid "You cannot confirm a purchase order without any purchase order line."
msgstr ""
#. module: purchase
-#: model:ir.actions.server,name:purchase.actions_server_purchase_order_unread
-msgid "Purchase: Mark unread"
-msgstr ""
-
-#. module: purchase
#: help:purchase.order,message_ids:0
msgid "Messages and communication history"
msgstr ""
@@ -1028,7 +1094,7 @@ msgid "Destination Warehouse"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:973
+#: code:addons/purchase/purchase.py:941
#, python-format
msgid ""
"Selected Unit of Measure does not belong to the same category as the product "
@@ -1036,6 +1102,11 @@ msgid ""
msgstr ""
#. module: purchase
+#: view:purchase.order.line_invoice:0
+msgid "Select an Open Sales Order"
+msgstr ""
+
+#. module: purchase
#: model:ir.ui.menu,name:purchase.menu_purchase_unit_measure_purchase
#: model:ir.ui.menu,name:purchase.menu_purchase_uom_form_action
msgid "Units of Measure"
@@ -1047,18 +1118,12 @@ msgid "Manage pricelist per supplier"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:833
-#, python-format
-msgid "Purchase Order has been set to <b>draft</b>."
-msgstr ""
-
-#. module: purchase
#: view:board.board:0
msgid "Purchase Dashboard"
msgstr "Beszerzési vezérlőpult"
#. module: purchase
-#: code:addons/purchase/purchase.py:566
+#: code:addons/purchase/purchase.py:580
#, python-format
msgid "First cancel all receptions related to this purchase order."
msgstr ""
@@ -1097,9 +1162,9 @@ msgid "Unread Messages"
msgstr ""
#. module: purchase
-#: view:purchase.order.line_invoice:0
-msgid "Select an Open Sale Order"
-msgstr "Nyitott vevői megrendelés kiválasztása"
+#: model:ir.ui.menu,name:purchase.menu_purchase_uom_categ_form_action
+msgid "Unit of Measure Categories"
+msgstr ""
#. module: purchase
#: view:purchase.order:0
@@ -1107,6 +1172,13 @@ msgid "Set to Draft"
msgstr "Beállítás tervezetnek"
#. module: purchase
+#: help:purchase.order,origin:0
+msgid ""
+"Reference of the document that generated this purchase order request; a "
+"sales order or an internal procurement request."
+msgstr ""
+
+#. module: purchase
#: view:purchase.order.line:0
msgid "Notes"
msgstr "Megjegyzések"
@@ -1136,7 +1208,7 @@ msgid "Stock Move"
msgstr "Készletmozgás"
#. module: purchase
-#: code:addons/purchase/purchase.py:255
+#: code:addons/purchase/purchase.py:260
#, python-format
msgid "Invalid Action!"
msgstr ""
@@ -1238,7 +1310,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:310
+#: code:addons/purchase/purchase.py:320
#, python-format
msgid "Please create Invoices."
msgstr ""
@@ -1328,7 +1400,7 @@ msgid "Purchase Order Line Make Invoice"
msgstr "Szállítói megrendelési sorokból számla készítése"
#. module: purchase
-#: code:addons/purchase/purchase.py:1133
+#: code:addons/purchase/purchase.py:1141
#, python-format
msgid "PO: %s"
msgstr ""
@@ -1339,7 +1411,7 @@ msgid "Send by EMail"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:498
+#: code:addons/purchase/purchase.py:515
#, python-format
msgid "Define purchase journal for this company: \"%s\" (id:%d)."
msgstr ""
@@ -1350,9 +1422,9 @@ msgid "Purchase Order "
msgstr ""
#. module: purchase
-#: view:purchase.order.line:0
-msgid "Manual Invoices"
-msgstr "Kézi számlák"
+#: help:purchase.config.settings,group_costing_method:0
+msgid "Allows you to compute product cost price based on average cost."
+msgstr ""
#. module: purchase
#: model:ir.actions.act_window,name:purchase.action_purchase_configuration
@@ -1506,8 +1578,8 @@ msgid "Compute product cost price based on average cost"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:340
-#: code:addons/purchase/wizard/purchase_line_invoice.py:141
+#: code:addons/purchase/purchase.py:350
+#: code:addons/purchase/wizard/purchase_line_invoice.py:137
#: model:ir.actions.act_window,name:purchase.act_res_partner_2_supplier_invoices
#: view:res.partner:0
#, python-format
@@ -1619,8 +1691,9 @@ msgid "Open Purchase Menu"
msgstr ""
#. module: purchase
-#: model:ir.model,name:purchase.model_mail_compose_message
-msgid "Email composition wizard"
+#: code:addons/purchase/purchase.py:1028
+#, python-format
+msgid "No address defined for the supplier"
msgstr ""
#. module: purchase
@@ -1693,11 +1766,11 @@ msgid "Purchase Order"
msgstr "Szállítói megrendelés"
#. module: purchase
-#: code:addons/purchase/purchase.py:310
-#: code:addons/purchase/purchase.py:437
-#: code:addons/purchase/purchase.py:497
-#: code:addons/purchase/purchase.py:508
-#: code:addons/purchase/wizard/purchase_line_invoice.py:109
+#: code:addons/purchase/purchase.py:320
+#: code:addons/purchase/purchase.py:456
+#: code:addons/purchase/purchase.py:514
+#: code:addons/purchase/purchase.py:525
+#: code:addons/purchase/wizard/purchase_line_invoice.py:105
#, python-format
msgid "Error!"
msgstr ""
@@ -1719,16 +1792,6 @@ msgid ""
msgstr ""
#. module: purchase
-#: model:process.transition,note:purchase.process_transition_packinginvoice0
-msgid ""
-"A Pick list generates an invoice. Depending on the Invoicing control of the "
-"sale order, the invoice is based on delivered or on ordered quantities."
-msgstr ""
-"A kiszedési lista létrehoz egy számlát. Az értékesítési megbízás "
-"számlaellenőrzésétől függően a számla a kiszállított vagy a megrendelt "
-"mennyiségen alapul."
-
-#. module: purchase
#: selection:purchase.order,state:0
#: selection:purchase.order.line,state:0
#: selection:purchase.report,state:0
@@ -1741,9 +1804,8 @@ msgid "# of Purchase Order"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:827
-#, python-format
-msgid "Shipment <b>received</b>."
+#: model:ir.model,name:purchase.model_mail_compose_message
+msgid "Email composition wizard"
msgstr ""
#. module: purchase
@@ -1834,7 +1896,7 @@ msgid "RFQ_${(object.name or '').replace('/','_')}"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:988
+#: code:addons/purchase/purchase.py:956
#, python-format
msgid "The selected supplier only sells this product by %s"
msgstr "A kiválasztott beszállító feltétele a termék eladására: %s"
@@ -1880,6 +1942,12 @@ msgid "Outgoing products to invoice"
msgstr "Számlázandó kimenő termékek"
#. module: purchase
+#: report:purchase.order:0
+#: field:purchase.report,validator:0
+msgid "Validated By"
+msgstr "Jóváhagyó"
+
+#. module: purchase
#: view:purchase.report:0
#: field:purchase.report,delay_pass:0
msgid "Days to Deliver"
@@ -1969,9 +2037,9 @@ msgid "November"
msgstr "November"
#. module: purchase
-#: help:purchase.config.settings,group_costing_method:0
-msgid "Allows you to compute product cost price based on average cost."
-msgstr ""
+#: view:purchase.order.line:0
+msgid "Manual Invoices"
+msgstr "Kézi számlák"
#. module: purchase
#: report:purchase.order:0
@@ -1994,13 +2062,6 @@ msgid ""
msgstr ""
#. module: purchase
-#: help:purchase.order,origin:0
-msgid ""
-"Reference of the document that generated this purchase order request; a sale "
-"order or an internal procurement request."
-msgstr ""
-
-#. module: purchase
#: model:ir.ui.menu,name:purchase.menu_partner_categories_in_form
msgid "Partner Categories"
msgstr ""
@@ -2021,89 +2082,6 @@ msgid "Invoicing Settings"
msgstr ""
#. module: purchase
-#: model:email.template,body_html:purchase.email_template_edi_purchase
-msgid ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"\n"
-" <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
-"or ''},</p>\n"
-" \n"
-" <p>Here is a ${object.state in ('draft', 'sent') and 'request for "
-"quotation' or 'purchase order confirmation'} from ${object.company_id.name}: "
-"</p>\n"
-" \n"
-" <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
-" &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
-" &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
-" &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
-"${object.pricelist_id.currency_id.name}</strong><br />\n"
-" &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
-" % if object.origin:\n"
-" &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
-" % endif\n"
-" % if object.partner_ref:\n"
-" &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
-" % endif\n"
-" % if object.validator:\n"
-" &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.validator.email "
-"or ''}?subject=Order%20${object.name}\">${object.validator.name}</a>\n"
-" % endif\n"
-" </p>\n"
-"\n"
-" <br/>\n"
-" <p>If you have any question, do not hesitate to contact us.</p>\n"
-" <p>Thank you!</p>\n"
-" <br/>\n"
-" <br/>\n"
-" <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
-"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
-"background-repeat: repeat no-repeat;\">\n"
-" <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
-"#FFF;\">\n"
-" <strong style=\"text-"
-"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
-" </div>\n"
-" <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
-"16px; background-color: #F2F2F2;\">\n"
-" <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
-" % if object.company_id.street:\n"
-" ${object.company_id.street}<br/>\n"
-" % endif\n"
-" % if object.company_id.street2:\n"
-" ${object.company_id.street2}<br/>\n"
-" % endif\n"
-" % if object.company_id.city or object.company_id.zip:\n"
-" ${object.company_id.zip} ${object.company_id.city}<br/>\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 ''}<br/>\n"
-" % endif\n"
-" </span>\n"
-" % if object.company_id.phone:\n"
-" <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
-"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
-"0px; padding-left: 0px; \">\n"
-" Phone:&nbsp; ${object.company_id.phone}\n"
-" </div>\n"
-" % endif\n"
-" % if object.company_id.website:\n"
-" <div>\n"
-" Web :&nbsp;<a "
-"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
-" </div>\n"
-" %endif\n"
-" <p></p>\n"
-" </div>\n"
-"</div>\n"
-" "
-msgstr ""
-
-#. module: purchase
#: model:ir.actions.act_window,name:purchase.action_purchase_order_by_user_all
msgid "Total Orders by User per month"
msgstr "Felhasználónkénti összes megrendelés havonta"
@@ -2114,21 +2092,19 @@ msgid "Based on incoming shipments"
msgstr ""
#. module: purchase
+#: code:addons/purchase/purchase.py:1018
+#, python-format
+msgid "No default supplier defined for this product"
+msgstr ""
+
+#. module: purchase
#: view:purchase.report:0
#: field:purchase.report,warehouse_id:0
msgid "Warehouse"
msgstr "Raktár"
#. module: purchase
-#: help:purchase.order,partner_ref:0
-msgid ""
-"Reference of the sale order or quotation sent by your supplier. It's mainly "
-"used to do the matching when you receive the products as this reference is "
-"usually written on the delivery order sent by your supplier."
-msgstr ""
-
-#. module: purchase
-#: code:addons/purchase/purchase.py:991
+#: code:addons/purchase/purchase.py:960
#, python-format
msgid ""
"The selected supplier has a minimal quantity set to %s %s, you should not "
@@ -2212,8 +2188,8 @@ msgstr ""
" "
#. module: purchase
-#: view:product.product:0
-msgid "When you sell this service to a customer,"
+#: field:purchase.order,message_summary:0
+msgid "Summary"
msgstr ""
#. module: purchase
@@ -2223,6 +2199,11 @@ msgid "Pricelist Versions"
msgstr "Árlista változatok"
#. module: purchase
+#: field:purchase.order,payment_term_id:0
+msgid "Payment Term"
+msgstr ""
+
+#. module: purchase
#: view:purchase.order:0
msgid "Purchase orders which are in draft state"
msgstr ""
@@ -2563,6 +2544,9 @@ msgstr "Megrendelések"
#~ msgid "Do you want to generate the supplier invoices ?"
#~ msgstr "El akarja készíteni a bejövő számlákat?"
+#~ msgid "Select an Open Sale Order"
+#~ msgstr "Nyitott vevői megrendelés kiválasztása"
+
#~ msgid "Error! You can not create recursive companies."
#~ msgstr "Hiba! Nem hozhat létre rekurzív vállalatokat."
@@ -2689,6 +2673,14 @@ msgstr "Megrendelések"
#~ msgid "Configure Your Purchases Management Application"
#~ msgstr "Állítsa be beszerzésmenedzsment alkalmazását"
+#~ msgid ""
+#~ "A Pick list generates an invoice. Depending on the Invoicing control of the "
+#~ "sale order, the invoice is based on delivered or on ordered quantities."
+#~ msgstr ""
+#~ "A kiszedési lista létrehoz egy számlát. Az értékesítési megbízás "
+#~ "számlaellenőrzésétől függően a számla a kiszállított vagy a megrendelt "
+#~ "mennyiségen alapul."
+
#, python-format
#~ msgid "Purchase amount over the limit"
#~ msgstr "A határértéket meghaladó beszerzési összeg"
diff --git a/addons/purchase/i18n/id.po b/addons/purchase/i18n/id.po
index c5137969528..6b347a11485 100644
--- a/addons/purchase/i18n/id.po
+++ b/addons/purchase/i18n/id.po
@@ -6,15 +6,15 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
"PO-Revision-Date: 2011-11-07 12:44+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: 2012-12-04 05:11+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:19+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
#. module: purchase
#: model:res.groups,name:purchase.group_analytic_accounting
@@ -58,11 +58,6 @@ msgid ""
msgstr ""
#. module: purchase
-#: model:ir.actions.server,name:purchase.actions_server_purchase_order_read
-msgid "Purchase: Mark read"
-msgstr ""
-
-#. module: purchase
#: view:purchase.report:0
#: field:purchase.report,day:0
msgid "Day"
@@ -103,16 +98,13 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:973
-#: code:addons/purchase/purchase.py:988
-#: code:addons/purchase/purchase.py:991
-#: code:addons/purchase/wizard/purchase_order_group.py:47
+#: code:addons/purchase/purchase.py:1024
#, python-format
-msgid "Warning!"
+msgid "Configuration Error!"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:573
+#: code:addons/purchase/purchase.py:587
#, python-format
msgid "You must first cancel all receptions related to this purchase order."
msgstr ""
@@ -129,10 +121,10 @@ msgid "Purchase-Standard Price"
msgstr "Standar Harga Pembelian"
#. module: purchase
-#: report:purchase.order:0
-#: field:purchase.report,validator:0
-msgid "Validated By"
-msgstr "Divalidasi oleh .."
+#: code:addons/purchase/purchase.py:1011
+#, python-format
+msgid "No supplier defined for this product !"
+msgstr ""
#. module: purchase
#: model:ir.actions.act_window,help:purchase.action_picking_tree4_picking_to_invoice
@@ -155,12 +147,6 @@ msgid "Average Price"
msgstr "Harga Rata-rata"
#. module: purchase
-#: code:addons/purchase/purchase.py:830
-#, python-format
-msgid "Invoice <b>paid</b>."
-msgstr ""
-
-#. module: purchase
#: view:purchase.order:0
msgid "Purchase order which are in the exception state"
msgstr ""
@@ -230,7 +216,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:255
+#: code:addons/purchase/purchase.py:260
#, python-format
msgid "In order to delete a purchase order, you must cancel it first."
msgstr ""
@@ -256,29 +242,12 @@ msgid "Total Untaxed amount"
msgstr "Jumlah total tidak kena pajak"
#. module: purchase
-#: model:ir.ui.menu,name:purchase.menu_purchase_uom_categ_form_action
-msgid "Unit of Measure Categories"
-msgstr ""
-
-#. module: purchase
#: view:purchase.report:0
#: field:purchase.report,category_id:0
msgid "Category"
msgstr "Kategori"
#. module: purchase
-#: view:purchase.order:0
-msgid "Quotation "
-msgstr ""
-
-#. module: purchase
-#: code:addons/purchase/purchase.py:810
-#, python-format
-msgid ""
-"Quotation for <em>%s</em> <b>converted</b> to a Purchase Order of %s %s."
-msgstr ""
-
-#. module: purchase
#: model:process.transition,note:purchase.process_transition_purchaseinvoice0
msgid ""
"A purchase order generates a supplier invoice, as soon as it is confirmed by "
@@ -346,14 +315,16 @@ msgid "October"
msgstr "Oktober"
#. module: purchase
-#: code:addons/purchase/purchase.py:837
+#: code:addons/purchase/purchase.py:1024
#, python-format
-msgid "Purchase Order for <em>%s</em> <b>cancelled</b>."
+msgid ""
+"The product \"%s\" has been defined with your company as reseller which "
+"seems to be a configuration error!"
msgstr ""
#. module: purchase
-#: field:purchase.order,message_summary:0
-msgid "Summary"
+#: view:product.product:0
+msgid "When you sell this service to a customer,"
msgstr ""
#. module: purchase
@@ -382,12 +353,6 @@ msgid "Quantity"
msgstr "Kuantitas"
#. module: purchase
-#: code:addons/purchase/purchase.py:819
-#, python-format
-msgid "Shipment <em>%s</em> <b>scheduled</b> for %s."
-msgstr ""
-
-#. module: purchase
#: field:purchase.order,fiscal_position:0
msgid "Fiscal Position"
msgstr "Posisi Fiskal"
@@ -445,12 +410,6 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:824
-#, python-format
-msgid "Draft Invoice of %s %s is <b>waiting for validation</b>."
-msgstr ""
-
-#. module: purchase
#: model:ir.actions.act_window,help:purchase.purchase_line_form_action2
msgid ""
"<p>\n"
@@ -471,6 +430,11 @@ msgid "Scheduled Date"
msgstr ""
#. module: purchase
+#: field:purchase.order,currency_id:0
+msgid "Currency"
+msgstr ""
+
+#. module: purchase
#: field:purchase.order,journal_id:0
msgid "Journal"
msgstr ""
@@ -503,6 +467,19 @@ msgid "Incoming Products"
msgstr ""
#. module: purchase
+#: view:purchase.order:0
+msgid "Request for Quotation "
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,partner_ref:0
+msgid ""
+"Reference of the sales order or quotation sent by your supplier. It's mainly "
+"used to do the matching when you receive the products as this reference is "
+"usually written on the delivery order sent by your supplier."
+msgstr ""
+
+#. module: purchase
#: view:purchase.config.settings:0
#: view:purchase.order.group:0
#: view:purchase.order.line_invoice:0
@@ -523,6 +500,11 @@ msgid ""
msgstr ""
#. module: purchase
+#: model:mail.message.subtype,name:purchase.mt_rfq_approved
+msgid "RFQ Approved"
+msgstr ""
+
+#. module: purchase
#: view:purchase.config.settings:0
msgid "Apply"
msgstr ""
@@ -542,6 +524,11 @@ msgstr ""
"pembelian yang telah dikonfirmasi."
#. module: purchase
+#: model:mail.message.subtype,name:purchase.mt_rfq_confirmed
+msgid "RFQ Confirmed"
+msgstr ""
+
+#. module: purchase
#: view:purchase.order:0
msgid "Customer Address"
msgstr ""
@@ -566,7 +553,7 @@ msgid "Supplier"
msgstr "Pemasok"
#. module: purchase
-#: code:addons/purchase/purchase.py:508
+#: code:addons/purchase/purchase.py:525
#, python-format
msgid "Define expense account for this company: \"%s\" (id:%d)."
msgstr ""
@@ -590,7 +577,6 @@ msgstr ""
#. module: purchase
#: field:purchase.order,shipped:0
-#: field:purchase.order,shipped_rate:0
msgid "Received"
msgstr "Diterima"
@@ -632,13 +618,20 @@ msgid "Invoices and Receptions"
msgstr ""
#. module: purchase
+#: model:process.transition,note:purchase.process_transition_packinginvoice0
+msgid ""
+"A Pick list generates an invoice. Depending on the Invoicing control of the "
+"sales order, the invoice is based on delivered or on ordered quantities."
+msgstr ""
+
+#. module: purchase
#: view:purchase.report:0
#: field:purchase.report,nbr:0
msgid "# of Lines"
msgstr ""
#. module: purchase
-#: code:addons/purchase/wizard/purchase_line_invoice.py:110
+#: code:addons/purchase/wizard/purchase_line_invoice.py:106
#, python-format
msgid "Define expense account for this product: \"%s\" (id:%d)."
msgstr ""
@@ -659,8 +652,8 @@ msgid "It indicates that a picking has been done"
msgstr "Hal ini menunjukkan bahwa pengambilan telah dilakukan"
#. module: purchase
-#: code:addons/purchase/purchase.py:565
-#: code:addons/purchase/purchase.py:572
+#: code:addons/purchase/purchase.py:579
+#: code:addons/purchase/purchase.py:586
#, python-format
msgid "Unable to cancel this purchase order."
msgstr ""
@@ -726,6 +719,15 @@ msgid "Draft PO"
msgstr ""
#. module: purchase
+#: code:addons/purchase/purchase.py:941
+#: code:addons/purchase/purchase.py:956
+#: code:addons/purchase/purchase.py:960
+#: code:addons/purchase/wizard/purchase_order_group.py:47
+#, python-format
+msgid "Warning!"
+msgstr ""
+
+#. module: purchase
#: model:process.node,name:purchase.process_node_draftpurchaseorder0
#: model:process.node,name:purchase.process_node_draftpurchaseorder1
msgid "RFQ"
@@ -757,6 +759,11 @@ msgid "The tax amount"
msgstr "Jumlah Pajak"
#. module: purchase
+#: field:purchase.order,shipped_rate:0
+msgid "Received Ratio"
+msgstr ""
+
+#. module: purchase
#: selection:purchase.report,month:0
msgid "September"
msgstr "September"
@@ -788,7 +795,7 @@ msgid "Stock Moves"
msgstr "Perpindahan Stok"
#. module: purchase
-#: code:addons/purchase/purchase.py:1158
+#: code:addons/purchase/purchase.py:1156
#, python-format
msgid "Draft Purchase Order created"
msgstr ""
@@ -809,11 +816,6 @@ msgid "Terms and Conditions"
msgstr ""
#. module: purchase
-#: field:purchase.order,currency_id:0
-msgid "unknown"
-msgstr ""
-
-#. module: purchase
#: help:purchase.order,date_order:0
msgid "Date on which this document has been created."
msgstr ""
@@ -907,12 +909,6 @@ msgid "Cancel"
msgstr "Batal"
#. module: purchase
-#: field:purchase.order,message_comment_ids:0
-#: help:purchase.order,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
-#. module: purchase
#: sql_constraint:purchase.order:0
msgid "Order Reference must be unique per Company!"
msgstr ""
@@ -946,14 +942,89 @@ msgid "Date Approved"
msgstr "Tanggal Disetujui"
#. module: purchase
-#: code:addons/purchase/purchase.py:806
-#, python-format
-msgid "Request for quotation <b>created</b>."
+#: view:product.product:0
+msgid "a draft purchase order"
msgstr ""
#. module: purchase
-#: view:product.product:0
-msgid "a draft purchase order"
+#: model:email.template,body_html:purchase.email_template_edi_purchase
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: #FFF; \">\n"
+"\n"
+" <p>Hello$ ${object.partner_id.name},</p>\n"
+" \n"
+" <p>Here is a ${object.state in ('draft', 'sent') and 'request for "
+"quotation' or 'purchase order confirmation'} from ${object.company_id.name}: "
+"</p>\n"
+" \n"
+" <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
+" &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
+" &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
+" &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
+"${object.pricelist_id.currency_id.name}</strong><br />\n"
+" &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
+" % if object.origin:\n"
+" &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
+" % endif\n"
+" % if object.partner_ref:\n"
+" &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
+" % endif\n"
+" % if object.validator:\n"
+" &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.validator.email "
+"or ''}?subject=Order%20${object.name}\">${object.validator.name}</a>\n"
+" % endif\n"
+" </p>\n"
+"\n"
+" <br/>\n"
+" <p>If you have any question, do not hesitate to contact us.</p>\n"
+" <p>Thank you!</p>\n"
+" <br/>\n"
+" <br/>\n"
+" <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
+"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
+"background-repeat: repeat no-repeat;\">\n"
+" <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
+"#DDD;\">\n"
+" <strong style=\"text-"
+"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
+" </div>\n"
+" <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
+"16px; background-color: #F2F2F2;\">\n"
+" <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
+" % if object.company_id.street:\n"
+" ${object.company_id.street}<br/>\n"
+" % endif\n"
+" % if object.company_id.street2:\n"
+" ${object.company_id.street2}<br/>\n"
+" % endif\n"
+" % if object.company_id.city or object.company_id.zip:\n"
+" ${object.company_id.zip} ${object.company_id.city}<br/>\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 ''}<br/>\n"
+" % endif\n"
+" </span>\n"
+" % if object.company_id.phone:\n"
+" <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
+"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
+"0px; padding-left: 0px; \">\n"
+" Phone:&nbsp; ${object.company_id.phone}\n"
+" </div>\n"
+" % endif\n"
+" % if object.company_id.website:\n"
+" <div>\n"
+" Web :&nbsp;<a "
+"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
+" </div>\n"
+" %endif\n"
+" <p></p>\n"
+" </div>\n"
+"</div>\n"
+" "
msgstr ""
#. module: purchase
@@ -996,17 +1067,12 @@ msgid "Outgoing Mails"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:437
+#: code:addons/purchase/purchase.py:456
#, python-format
msgid "You cannot confirm a purchase order without any purchase order line."
msgstr ""
#. module: purchase
-#: model:ir.actions.server,name:purchase.actions_server_purchase_order_unread
-msgid "Purchase: Mark unread"
-msgstr ""
-
-#. module: purchase
#: help:purchase.order,message_ids:0
msgid "Messages and communication history"
msgstr ""
@@ -1018,7 +1084,7 @@ msgid "Destination Warehouse"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:973
+#: code:addons/purchase/purchase.py:941
#, python-format
msgid ""
"Selected Unit of Measure does not belong to the same category as the product "
@@ -1026,6 +1092,11 @@ msgid ""
msgstr ""
#. module: purchase
+#: view:purchase.order.line_invoice:0
+msgid "Select an Open Sales Order"
+msgstr ""
+
+#. module: purchase
#: model:ir.ui.menu,name:purchase.menu_purchase_unit_measure_purchase
#: model:ir.ui.menu,name:purchase.menu_purchase_uom_form_action
msgid "Units of Measure"
@@ -1037,18 +1108,12 @@ msgid "Manage pricelist per supplier"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:833
-#, python-format
-msgid "Purchase Order has been set to <b>draft</b>."
-msgstr ""
-
-#. module: purchase
#: view:board.board:0
msgid "Purchase Dashboard"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:566
+#: code:addons/purchase/purchase.py:580
#, python-format
msgid "First cancel all receptions related to this purchase order."
msgstr ""
@@ -1087,9 +1152,9 @@ msgid "Unread Messages"
msgstr ""
#. module: purchase
-#: view:purchase.order.line_invoice:0
-msgid "Select an Open Sale Order"
-msgstr "Pilih Order Penjualan"
+#: model:ir.ui.menu,name:purchase.menu_purchase_uom_categ_form_action
+msgid "Unit of Measure Categories"
+msgstr ""
#. module: purchase
#: view:purchase.order:0
@@ -1097,6 +1162,13 @@ msgid "Set to Draft"
msgstr "Atur ke draft"
#. module: purchase
+#: help:purchase.order,origin:0
+msgid ""
+"Reference of the document that generated this purchase order request; a "
+"sales order or an internal procurement request."
+msgstr ""
+
+#. module: purchase
#: view:purchase.order.line:0
msgid "Notes"
msgstr "Catatan"
@@ -1126,7 +1198,7 @@ msgid "Stock Move"
msgstr "Perpindahan Stok"
#. module: purchase
-#: code:addons/purchase/purchase.py:255
+#: code:addons/purchase/purchase.py:260
#, python-format
msgid "Invalid Action!"
msgstr ""
@@ -1228,7 +1300,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:310
+#: code:addons/purchase/purchase.py:320
#, python-format
msgid "Please create Invoices."
msgstr ""
@@ -1318,7 +1390,7 @@ msgid "Purchase Order Line Make Invoice"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1133
+#: code:addons/purchase/purchase.py:1141
#, python-format
msgid "PO: %s"
msgstr ""
@@ -1329,7 +1401,7 @@ msgid "Send by EMail"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:498
+#: code:addons/purchase/purchase.py:515
#, python-format
msgid "Define purchase journal for this company: \"%s\" (id:%d)."
msgstr ""
@@ -1340,9 +1412,9 @@ msgid "Purchase Order "
msgstr ""
#. module: purchase
-#: view:purchase.order.line:0
-msgid "Manual Invoices"
-msgstr "Faktur secara manual"
+#: help:purchase.config.settings,group_costing_method:0
+msgid "Allows you to compute product cost price based on average cost."
+msgstr ""
#. module: purchase
#: model:ir.actions.act_window,name:purchase.action_purchase_configuration
@@ -1496,8 +1568,8 @@ msgid "Compute product cost price based on average cost"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:340
-#: code:addons/purchase/wizard/purchase_line_invoice.py:141
+#: code:addons/purchase/purchase.py:350
+#: code:addons/purchase/wizard/purchase_line_invoice.py:137
#: model:ir.actions.act_window,name:purchase.act_res_partner_2_supplier_invoices
#: view:res.partner:0
#, python-format
@@ -1609,8 +1681,9 @@ msgid "Open Purchase Menu"
msgstr ""
#. module: purchase
-#: model:ir.model,name:purchase.model_mail_compose_message
-msgid "Email composition wizard"
+#: code:addons/purchase/purchase.py:1028
+#, python-format
+msgid "No address defined for the supplier"
msgstr ""
#. module: purchase
@@ -1683,11 +1756,11 @@ msgid "Purchase Order"
msgstr "Order Pembelian"
#. module: purchase
-#: code:addons/purchase/purchase.py:310
-#: code:addons/purchase/purchase.py:437
-#: code:addons/purchase/purchase.py:497
-#: code:addons/purchase/purchase.py:508
-#: code:addons/purchase/wizard/purchase_line_invoice.py:109
+#: code:addons/purchase/purchase.py:320
+#: code:addons/purchase/purchase.py:456
+#: code:addons/purchase/purchase.py:514
+#: code:addons/purchase/purchase.py:525
+#: code:addons/purchase/wizard/purchase_line_invoice.py:105
#, python-format
msgid "Error!"
msgstr ""
@@ -1709,16 +1782,6 @@ msgid ""
msgstr ""
#. module: purchase
-#: model:process.transition,note:purchase.process_transition_packinginvoice0
-msgid ""
-"A Pick list generates an invoice. Depending on the Invoicing control of the "
-"sale order, the invoice is based on delivered or on ordered quantities."
-msgstr ""
-"Daftar Pengambilan untuk membuat faktur. Tergantung pada kontrol Faktur "
-"dari order penjualan, faktur berdasarkan pengiriman atau jumlah yang "
-"diminta."
-
-#. module: purchase
#: selection:purchase.order,state:0
#: selection:purchase.order.line,state:0
#: selection:purchase.report,state:0
@@ -1731,9 +1794,8 @@ msgid "# of Purchase Order"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:827
-#, python-format
-msgid "Shipment <b>received</b>."
+#: model:ir.model,name:purchase.model_mail_compose_message
+msgid "Email composition wizard"
msgstr ""
#. module: purchase
@@ -1822,7 +1884,7 @@ msgid "RFQ_${(object.name or '').replace('/','_')}"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:988
+#: code:addons/purchase/purchase.py:956
#, python-format
msgid "The selected supplier only sells this product by %s"
msgstr ""
@@ -1868,6 +1930,12 @@ msgid "Outgoing products to invoice"
msgstr ""
#. module: purchase
+#: report:purchase.order:0
+#: field:purchase.report,validator:0
+msgid "Validated By"
+msgstr "Divalidasi oleh .."
+
+#. module: purchase
#: view:purchase.report:0
#: field:purchase.report,delay_pass:0
msgid "Days to Deliver"
@@ -1957,9 +2025,9 @@ msgid "November"
msgstr "Nopember"
#. module: purchase
-#: help:purchase.config.settings,group_costing_method:0
-msgid "Allows you to compute product cost price based on average cost."
-msgstr ""
+#: view:purchase.order.line:0
+msgid "Manual Invoices"
+msgstr "Faktur secara manual"
#. module: purchase
#: report:purchase.order:0
@@ -1982,13 +2050,6 @@ msgid ""
msgstr ""
#. module: purchase
-#: help:purchase.order,origin:0
-msgid ""
-"Reference of the document that generated this purchase order request; a sale "
-"order or an internal procurement request."
-msgstr ""
-
-#. module: purchase
#: model:ir.ui.menu,name:purchase.menu_partner_categories_in_form
msgid "Partner Categories"
msgstr ""
@@ -2009,89 +2070,6 @@ msgid "Invoicing Settings"
msgstr ""
#. module: purchase
-#: model:email.template,body_html:purchase.email_template_edi_purchase
-msgid ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"\n"
-" <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
-"or ''},</p>\n"
-" \n"
-" <p>Here is a ${object.state in ('draft', 'sent') and 'request for "
-"quotation' or 'purchase order confirmation'} from ${object.company_id.name}: "
-"</p>\n"
-" \n"
-" <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
-" &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
-" &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
-" &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
-"${object.pricelist_id.currency_id.name}</strong><br />\n"
-" &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
-" % if object.origin:\n"
-" &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
-" % endif\n"
-" % if object.partner_ref:\n"
-" &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
-" % endif\n"
-" % if object.validator:\n"
-" &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.validator.email "
-"or ''}?subject=Order%20${object.name}\">${object.validator.name}</a>\n"
-" % endif\n"
-" </p>\n"
-"\n"
-" <br/>\n"
-" <p>If you have any question, do not hesitate to contact us.</p>\n"
-" <p>Thank you!</p>\n"
-" <br/>\n"
-" <br/>\n"
-" <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
-"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
-"background-repeat: repeat no-repeat;\">\n"
-" <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
-"#FFF;\">\n"
-" <strong style=\"text-"
-"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
-" </div>\n"
-" <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
-"16px; background-color: #F2F2F2;\">\n"
-" <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
-" % if object.company_id.street:\n"
-" ${object.company_id.street}<br/>\n"
-" % endif\n"
-" % if object.company_id.street2:\n"
-" ${object.company_id.street2}<br/>\n"
-" % endif\n"
-" % if object.company_id.city or object.company_id.zip:\n"
-" ${object.company_id.zip} ${object.company_id.city}<br/>\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 ''}<br/>\n"
-" % endif\n"
-" </span>\n"
-" % if object.company_id.phone:\n"
-" <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
-"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
-"0px; padding-left: 0px; \">\n"
-" Phone:&nbsp; ${object.company_id.phone}\n"
-" </div>\n"
-" % endif\n"
-" % if object.company_id.website:\n"
-" <div>\n"
-" Web :&nbsp;<a "
-"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
-" </div>\n"
-" %endif\n"
-" <p></p>\n"
-" </div>\n"
-"</div>\n"
-" "
-msgstr ""
-
-#. module: purchase
#: model:ir.actions.act_window,name:purchase.action_purchase_order_by_user_all
msgid "Total Orders by User per month"
msgstr "Jumlah Pesanan oleh Pengguna per bulan"
@@ -2102,21 +2080,19 @@ msgid "Based on incoming shipments"
msgstr ""
#. module: purchase
+#: code:addons/purchase/purchase.py:1018
+#, python-format
+msgid "No default supplier defined for this product"
+msgstr ""
+
+#. module: purchase
#: view:purchase.report:0
#: field:purchase.report,warehouse_id:0
msgid "Warehouse"
msgstr "Gudang"
#. module: purchase
-#: help:purchase.order,partner_ref:0
-msgid ""
-"Reference of the sale order or quotation sent by your supplier. It's mainly "
-"used to do the matching when you receive the products as this reference is "
-"usually written on the delivery order sent by your supplier."
-msgstr ""
-
-#. module: purchase
-#: code:addons/purchase/purchase.py:991
+#: code:addons/purchase/purchase.py:960
#, python-format
msgid ""
"The selected supplier has a minimal quantity set to %s %s, you should not "
@@ -2189,8 +2165,8 @@ msgid ""
msgstr ""
#. module: purchase
-#: view:product.product:0
-msgid "When you sell this service to a customer,"
+#: field:purchase.order,message_summary:0
+msgid "Summary"
msgstr ""
#. module: purchase
@@ -2200,6 +2176,11 @@ msgid "Pricelist Versions"
msgstr "Versi Daftar Harga"
#. module: purchase
+#: field:purchase.order,payment_term_id:0
+msgid "Payment Term"
+msgstr ""
+
+#. module: purchase
#: view:purchase.order:0
msgid "Purchase orders which are in draft state"
msgstr ""
@@ -2290,6 +2271,9 @@ msgstr ""
#~ msgid "No Pricelist !"
#~ msgstr "Tidak ada daftar harga !"
+#~ msgid "Select an Open Sale Order"
+#~ msgstr "Pilih Order Penjualan"
+
#~ msgid ""
#~ "Put an address if you want to deliver directly from the supplier to the "
#~ "customer.In this case, it will remove the warehouse link and set the "
@@ -2315,6 +2299,14 @@ msgstr ""
#~ msgid "Approve Purchase"
#~ msgstr "Pembelian disetujui"
+#~ msgid ""
+#~ "A Pick list generates an invoice. Depending on the Invoicing control of the "
+#~ "sale order, the invoice is based on delivered or on ordered quantities."
+#~ msgstr ""
+#~ "Daftar Pengambilan untuk membuat faktur. Tergantung pada kontrol Faktur "
+#~ "dari order penjualan, faktur berdasarkan pengiriman atau jumlah yang "
+#~ "diminta."
+
#, python-format
#~ msgid ""
#~ "You have to select a pricelist or a supplier in the purchase form !\n"
diff --git a/addons/purchase/i18n/it.po b/addons/purchase/i18n/it.po
index 8ee00511eb2..f055e995920 100644
--- a/addons/purchase/i18n/it.po
+++ b/addons/purchase/i18n/it.po
@@ -6,14 +6,14 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
"PO-Revision-Date: 2012-12-18 22:37+0000\n"
"Last-Translator: Sergio Corato <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: 2012-12-19 05:15+0000\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:19+0000\n"
"X-Generator: Launchpad (build 16378)\n"
#. module: purchase
@@ -65,11 +65,6 @@ msgstr ""
"il prezzo del fornitore per i prodotti e le quantità selezionate"
#. module: purchase
-#: model:ir.actions.server,name:purchase.actions_server_purchase_order_read
-msgid "Purchase: Mark read"
-msgstr "Acquisti: Segna come letto"
-
-#. module: purchase
#: view:purchase.report:0
#: field:purchase.report,day:0
msgid "Day"
@@ -112,16 +107,13 @@ msgstr ""
"direttamente in html così da poter essere inserito nelle viste kanban."
#. module: purchase
-#: code:addons/purchase/purchase.py:973
-#: code:addons/purchase/purchase.py:988
-#: code:addons/purchase/purchase.py:991
-#: code:addons/purchase/wizard/purchase_order_group.py:47
+#: code:addons/purchase/purchase.py:1024
#, python-format
-msgid "Warning!"
-msgstr "Attenzione!"
+msgid "Configuration Error!"
+msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:573
+#: code:addons/purchase/purchase.py:587
#, python-format
msgid "You must first cancel all receptions related to this purchase order."
msgstr ""
@@ -140,10 +132,10 @@ msgid "Purchase-Standard Price"
msgstr "Prezzo standard di acquisto"
#. module: purchase
-#: report:purchase.order:0
-#: field:purchase.report,validator:0
-msgid "Validated By"
-msgstr "Convalidato da"
+#: code:addons/purchase/purchase.py:1011
+#, python-format
+msgid "No supplier defined for this product !"
+msgstr ""
#. module: purchase
#: model:ir.actions.act_window,help:purchase.action_picking_tree4_picking_to_invoice
@@ -177,12 +169,6 @@ msgid "Average Price"
msgstr "Prezzo medio"
#. module: purchase
-#: code:addons/purchase/purchase.py:830
-#, python-format
-msgid "Invoice <b>paid</b>."
-msgstr "Fattura <b>pagata</b>."
-
-#. module: purchase
#: view:purchase.order:0
msgid "Purchase order which are in the exception state"
msgstr "Ordini di acquisto in stato eccezione"
@@ -256,7 +242,7 @@ msgstr ""
"ordine d'acquisto"
#. module: purchase
-#: code:addons/purchase/purchase.py:255
+#: code:addons/purchase/purchase.py:260
#, python-format
msgid "In order to delete a purchase order, you must cancel it first."
msgstr ""
@@ -283,30 +269,12 @@ msgid "Total Untaxed amount"
msgstr "Totale imponibile"
#. module: purchase
-#: model:ir.ui.menu,name:purchase.menu_purchase_uom_categ_form_action
-msgid "Unit of Measure Categories"
-msgstr "Categorie Unità di Misura"
-
-#. module: purchase
#: view:purchase.report:0
#: field:purchase.report,category_id:0
msgid "Category"
msgstr "Categoria"
#. module: purchase
-#: view:purchase.order:0
-msgid "Quotation "
-msgstr "Preventivo "
-
-#. module: purchase
-#: code:addons/purchase/purchase.py:810
-#, python-format
-msgid ""
-"Quotation for <em>%s</em> <b>converted</b> to a Purchase Order of %s %s."
-msgstr ""
-"Preventivo per <em>%s</em> <b>convertito</b> in Ordine di Acquisto per %s %s."
-
-#. module: purchase
#: model:process.transition,note:purchase.process_transition_purchaseinvoice0
msgid ""
"A purchase order generates a supplier invoice, as soon as it is confirmed by "
@@ -390,15 +358,17 @@ msgid "October"
msgstr "Ottobre"
#. module: purchase
-#: code:addons/purchase/purchase.py:837
+#: code:addons/purchase/purchase.py:1024
#, python-format
-msgid "Purchase Order for <em>%s</em> <b>cancelled</b>."
-msgstr "Ordine di Acquisto per <em>%s</em> <b>annullato</b>."
+msgid ""
+"The product \"%s\" has been defined with your company as reseller which "
+"seems to be a configuration error!"
+msgstr ""
#. module: purchase
-#: field:purchase.order,message_summary:0
-msgid "Summary"
-msgstr "Riepilogo"
+#: view:product.product:0
+msgid "When you sell this service to a customer,"
+msgstr "Quando si vende questo servizio ad un cliente,"
#. module: purchase
#: model:process.transition,note:purchase.process_transition_createpackinglist0
@@ -427,12 +397,6 @@ msgid "Quantity"
msgstr "Quantità"
#. module: purchase
-#: code:addons/purchase/purchase.py:819
-#, python-format
-msgid "Shipment <em>%s</em> <b>scheduled</b> for %s."
-msgstr "Spedizione <em>%s</em> <b>pianificata</b> per %s."
-
-#. module: purchase
#: field:purchase.order,fiscal_position:0
msgid "Fiscal Position"
msgstr "Posizione Fiscale"
@@ -504,12 +468,6 @@ msgstr ""
"azienda."
#. module: purchase
-#: code:addons/purchase/purchase.py:824
-#, python-format
-msgid "Draft Invoice of %s %s is <b>waiting for validation</b>."
-msgstr "Fattura bozza per %s %s is <b>in attesa di validazione</b>."
-
-#. module: purchase
#: model:ir.actions.act_window,help:purchase.purchase_line_form_action2
msgid ""
"<p>\n"
@@ -541,6 +499,11 @@ msgid "Scheduled Date"
msgstr "Data preventivata"
#. module: purchase
+#: field:purchase.order,currency_id:0
+msgid "Currency"
+msgstr ""
+
+#. module: purchase
#: field:purchase.order,journal_id:0
msgid "Journal"
msgstr "Sezionale"
@@ -573,6 +536,19 @@ msgid "Incoming Products"
msgstr "Prodotti in arrivo"
#. module: purchase
+#: view:purchase.order:0
+msgid "Request for Quotation "
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,partner_ref:0
+msgid ""
+"Reference of the sales order or quotation sent by your supplier. It's mainly "
+"used to do the matching when you receive the products as this reference is "
+"usually written on the delivery order sent by your supplier."
+msgstr ""
+
+#. module: purchase
#: view:purchase.config.settings:0
#: view:purchase.order.group:0
#: view:purchase.order.line_invoice:0
@@ -596,6 +572,11 @@ msgstr ""
"responsabile della contabilità (controllo fattura = Manuale)"
#. module: purchase
+#: model:mail.message.subtype,name:purchase.mt_rfq_approved
+msgid "RFQ Approved"
+msgstr ""
+
+#. module: purchase
#: view:purchase.config.settings:0
msgid "Apply"
msgstr "Applica"
@@ -615,6 +596,11 @@ msgstr ""
"fornitore. Il preventivo diverrà quindi un ordine di acquisto"
#. module: purchase
+#: model:mail.message.subtype,name:purchase.mt_rfq_confirmed
+msgid "RFQ Confirmed"
+msgstr ""
+
+#. module: purchase
#: view:purchase.order:0
msgid "Customer Address"
msgstr "Indirizzo Cliente"
@@ -639,7 +625,7 @@ msgid "Supplier"
msgstr "Fornitore"
#. module: purchase
-#: code:addons/purchase/purchase.py:508
+#: code:addons/purchase/purchase.py:525
#, python-format
msgid "Define expense account for this company: \"%s\" (id:%d)."
msgstr "Definire un conto spese per questa azienda: \"%s\" (id:%d)."
@@ -663,7 +649,6 @@ msgstr "Subtotale"
#. module: purchase
#: field:purchase.order,shipped:0
-#: field:purchase.order,shipped_rate:0
msgid "Received"
msgstr "Ricevuto"
@@ -718,13 +703,20 @@ msgid "Invoices and Receptions"
msgstr "Fatture e Arrivi"
#. module: purchase
+#: model:process.transition,note:purchase.process_transition_packinginvoice0
+msgid ""
+"A Pick list generates an invoice. Depending on the Invoicing control of the "
+"sales order, the invoice is based on delivered or on ordered quantities."
+msgstr ""
+
+#. module: purchase
#: view:purchase.report:0
#: field:purchase.report,nbr:0
msgid "# of Lines"
msgstr "Numero di linee"
#. module: purchase
-#: code:addons/purchase/wizard/purchase_line_invoice.py:110
+#: code:addons/purchase/wizard/purchase_line_invoice.py:106
#, python-format
msgid "Define expense account for this product: \"%s\" (id:%d)."
msgstr "Definire un conto spese per questo prodotto: \"%s\" (id:%d)."
@@ -745,8 +737,8 @@ msgid "It indicates that a picking has been done"
msgstr "Indica che è stato eseguito un movimento merci"
#. module: purchase
-#: code:addons/purchase/purchase.py:565
-#: code:addons/purchase/purchase.py:572
+#: code:addons/purchase/purchase.py:579
+#: code:addons/purchase/purchase.py:586
#, python-format
msgid "Unable to cancel this purchase order."
msgstr "Impossibile annullare questo ordine di acquisto."
@@ -814,6 +806,15 @@ msgid "Draft PO"
msgstr "PO Bozza"
#. module: purchase
+#: code:addons/purchase/purchase.py:941
+#: code:addons/purchase/purchase.py:956
+#: code:addons/purchase/purchase.py:960
+#: code:addons/purchase/wizard/purchase_order_group.py:47
+#, python-format
+msgid "Warning!"
+msgstr "Attenzione!"
+
+#. module: purchase
#: model:process.node,name:purchase.process_node_draftpurchaseorder0
#: model:process.node,name:purchase.process_node_draftpurchaseorder1
msgid "RFQ"
@@ -845,6 +846,11 @@ msgid "The tax amount"
msgstr "Totale imposte"
#. module: purchase
+#: field:purchase.order,shipped_rate:0
+msgid "Received Ratio"
+msgstr ""
+
+#. module: purchase
#: selection:purchase.report,month:0
msgid "September"
msgstr "Settembre"
@@ -876,7 +882,7 @@ msgid "Stock Moves"
msgstr "Movimenti di magazzino"
#. module: purchase
-#: code:addons/purchase/purchase.py:1158
+#: code:addons/purchase/purchase.py:1156
#, python-format
msgid "Draft Purchase Order created"
msgstr "Ordine di acquisto bozza creato"
@@ -897,11 +903,6 @@ msgid "Terms and Conditions"
msgstr "Termini e Condizioni"
#. module: purchase
-#: field:purchase.order,currency_id:0
-msgid "unknown"
-msgstr "sconosciuto"
-
-#. module: purchase
#: help:purchase.order,date_order:0
msgid "Date on which this document has been created."
msgstr "Data in cui questo documento è stato creato"
@@ -996,12 +997,6 @@ msgid "Cancel"
msgstr "Annulla"
#. module: purchase
-#: field:purchase.order,message_comment_ids:0
-#: help:purchase.order,message_comment_ids:0
-msgid "Comments and emails"
-msgstr "Commenti ed Email"
-
-#. module: purchase
#: sql_constraint:purchase.order:0
msgid "Order Reference must be unique per Company!"
msgstr "Il Riferimento Ordine deve essere unico per azienda!"
@@ -1035,17 +1030,92 @@ msgid "Date Approved"
msgstr "Data Approvazione"
#. module: purchase
-#: code:addons/purchase/purchase.py:806
-#, python-format
-msgid "Request for quotation <b>created</b>."
-msgstr "Richiesta di preventivo <b>creata</b>."
-
-#. module: purchase
#: view:product.product:0
msgid "a draft purchase order"
msgstr "un ordine di acquisto bozza"
#. module: purchase
+#: model:email.template,body_html:purchase.email_template_edi_purchase
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: #FFF; \">\n"
+"\n"
+" <p>Hello$ ${object.partner_id.name},</p>\n"
+" \n"
+" <p>Here is a ${object.state in ('draft', 'sent') and 'request for "
+"quotation' or 'purchase order confirmation'} from ${object.company_id.name}: "
+"</p>\n"
+" \n"
+" <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
+" &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
+" &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
+" &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
+"${object.pricelist_id.currency_id.name}</strong><br />\n"
+" &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
+" % if object.origin:\n"
+" &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
+" % endif\n"
+" % if object.partner_ref:\n"
+" &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
+" % endif\n"
+" % if object.validator:\n"
+" &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.validator.email "
+"or ''}?subject=Order%20${object.name}\">${object.validator.name}</a>\n"
+" % endif\n"
+" </p>\n"
+"\n"
+" <br/>\n"
+" <p>If you have any question, do not hesitate to contact us.</p>\n"
+" <p>Thank you!</p>\n"
+" <br/>\n"
+" <br/>\n"
+" <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
+"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
+"background-repeat: repeat no-repeat;\">\n"
+" <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
+"#DDD;\">\n"
+" <strong style=\"text-"
+"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
+" </div>\n"
+" <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
+"16px; background-color: #F2F2F2;\">\n"
+" <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
+" % if object.company_id.street:\n"
+" ${object.company_id.street}<br/>\n"
+" % endif\n"
+" % if object.company_id.street2:\n"
+" ${object.company_id.street2}<br/>\n"
+" % endif\n"
+" % if object.company_id.city or object.company_id.zip:\n"
+" ${object.company_id.zip} ${object.company_id.city}<br/>\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 ''}<br/>\n"
+" % endif\n"
+" </span>\n"
+" % if object.company_id.phone:\n"
+" <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
+"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
+"0px; padding-left: 0px; \">\n"
+" Phone:&nbsp; ${object.company_id.phone}\n"
+" </div>\n"
+" % endif\n"
+" % if object.company_id.website:\n"
+" <div>\n"
+" Web :&nbsp;<a "
+"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
+" </div>\n"
+" %endif\n"
+" <p></p>\n"
+" </div>\n"
+"</div>\n"
+" "
+msgstr ""
+
+#. module: purchase
#: view:purchase.report:0
msgid "Order of Year"
msgstr "Ordine dell'anno"
@@ -1088,17 +1158,12 @@ msgid "Outgoing Mails"
msgstr "Email in uscita"
#. module: purchase
-#: code:addons/purchase/purchase.py:437
+#: code:addons/purchase/purchase.py:456
#, python-format
msgid "You cannot confirm a purchase order without any purchase order line."
msgstr "Non è possibile confermare un ordine di acquisto senza righe."
#. module: purchase
-#: model:ir.actions.server,name:purchase.actions_server_purchase_order_unread
-msgid "Purchase: Mark unread"
-msgstr "Acquisti: Segna come letto"
-
-#. module: purchase
#: help:purchase.order,message_ids:0
msgid "Messages and communication history"
msgstr "Storico messaggi e comunicazioni"
@@ -1110,7 +1175,7 @@ msgid "Destination Warehouse"
msgstr "Magazzino di destinazione"
#. module: purchase
-#: code:addons/purchase/purchase.py:973
+#: code:addons/purchase/purchase.py:941
#, python-format
msgid ""
"Selected Unit of Measure does not belong to the same category as the product "
@@ -1120,6 +1185,11 @@ msgstr ""
"del prodotto."
#. module: purchase
+#: view:purchase.order.line_invoice:0
+msgid "Select an Open Sales Order"
+msgstr ""
+
+#. module: purchase
#: model:ir.ui.menu,name:purchase.menu_purchase_unit_measure_purchase
#: model:ir.ui.menu,name:purchase.menu_purchase_uom_form_action
msgid "Units of Measure"
@@ -1131,18 +1201,12 @@ msgid "Manage pricelist per supplier"
msgstr "Gestisce i listini prezzi per fornitore"
#. module: purchase
-#: code:addons/purchase/purchase.py:833
-#, python-format
-msgid "Purchase Order has been set to <b>draft</b>."
-msgstr "L'ordine di acquisto è stato impostato a <b>bozza</b>."
-
-#. module: purchase
#: view:board.board:0
msgid "Purchase Dashboard"
msgstr "Dashboard acquisti"
#. module: purchase
-#: code:addons/purchase/purchase.py:566
+#: code:addons/purchase/purchase.py:580
#, python-format
msgid "First cancel all receptions related to this purchase order."
msgstr ""
@@ -1182,9 +1246,9 @@ msgid "Unread Messages"
msgstr "Messaggi non letti"
#. module: purchase
-#: view:purchase.order.line_invoice:0
-msgid "Select an Open Sale Order"
-msgstr "Selezionare un ordine di vendita aperto"
+#: model:ir.ui.menu,name:purchase.menu_purchase_uom_categ_form_action
+msgid "Unit of Measure Categories"
+msgstr "Categorie Unità di Misura"
#. module: purchase
#: view:purchase.order:0
@@ -1192,6 +1256,13 @@ msgid "Set to Draft"
msgstr "Imposta come Bozza"
#. module: purchase
+#: help:purchase.order,origin:0
+msgid ""
+"Reference of the document that generated this purchase order request; a "
+"sales order or an internal procurement request."
+msgstr ""
+
+#. module: purchase
#: view:purchase.order.line:0
msgid "Notes"
msgstr "Note"
@@ -1221,7 +1292,7 @@ msgid "Stock Move"
msgstr "Movimento di magazzino"
#. module: purchase
-#: code:addons/purchase/purchase.py:255
+#: code:addons/purchase/purchase.py:260
#, python-format
msgid "Invalid Action!"
msgstr "Azione non valida!"
@@ -1327,7 +1398,7 @@ msgid ""
msgstr "un ordine di acquisto bozza"
#. module: purchase
-#: code:addons/purchase/purchase.py:310
+#: code:addons/purchase/purchase.py:320
#, python-format
msgid "Please create Invoices."
msgstr "Si prega di creare le fatture."
@@ -1434,7 +1505,7 @@ msgid "Purchase Order Line Make Invoice"
msgstr "Genera fattura da linea ordine di acquisto"
#. module: purchase
-#: code:addons/purchase/purchase.py:1133
+#: code:addons/purchase/purchase.py:1141
#, python-format
msgid "PO: %s"
msgstr "PO: %s"
@@ -1445,7 +1516,7 @@ msgid "Send by EMail"
msgstr "Invia tramite email"
#. module: purchase
-#: code:addons/purchase/purchase.py:498
+#: code:addons/purchase/purchase.py:515
#, python-format
msgid "Define purchase journal for this company: \"%s\" (id:%d)."
msgstr "Definire il sezionale acquisti per l'azienda: \"%s\" (id:%d)."
@@ -1456,9 +1527,11 @@ msgid "Purchase Order "
msgstr "Ordine d'acquisto "
#. module: purchase
-#: view:purchase.order.line:0
-msgid "Manual Invoices"
-msgstr "Fatture manuali"
+#: help:purchase.config.settings,group_costing_method:0
+msgid "Allows you to compute product cost price based on average cost."
+msgstr ""
+"Consente di calcolare il prezzo di costo del prodotto basandosi sul costo "
+"medio."
#. module: purchase
#: model:ir.actions.act_window,name:purchase.action_purchase_configuration
@@ -1628,8 +1701,8 @@ msgid "Compute product cost price based on average cost"
msgstr "Calcola il prezzo di costo del prodotto basandosi sul costo medio"
#. module: purchase
-#: code:addons/purchase/purchase.py:340
-#: code:addons/purchase/wizard/purchase_line_invoice.py:141
+#: code:addons/purchase/purchase.py:350
+#: code:addons/purchase/wizard/purchase_line_invoice.py:137
#: model:ir.actions.act_window,name:purchase.act_res_partner_2_supplier_invoices
#: view:res.partner:0
#, python-format
@@ -1752,9 +1825,10 @@ msgid "Open Purchase Menu"
msgstr "Apre Menù Acquisti"
#. module: purchase
-#: model:ir.model,name:purchase.model_mail_compose_message
-msgid "Email composition wizard"
-msgstr "Wizard composizione email"
+#: code:addons/purchase/purchase.py:1028
+#, python-format
+msgid "No address defined for the supplier"
+msgstr ""
#. module: purchase
#: field:purchase.order,company_id:0
@@ -1826,11 +1900,11 @@ msgid "Purchase Order"
msgstr "Ordine Acquisto"
#. module: purchase
-#: code:addons/purchase/purchase.py:310
-#: code:addons/purchase/purchase.py:437
-#: code:addons/purchase/purchase.py:497
-#: code:addons/purchase/purchase.py:508
-#: code:addons/purchase/wizard/purchase_line_invoice.py:109
+#: code:addons/purchase/purchase.py:320
+#: code:addons/purchase/purchase.py:456
+#: code:addons/purchase/purchase.py:514
+#: code:addons/purchase/purchase.py:525
+#: code:addons/purchase/wizard/purchase_line_invoice.py:105
#, python-format
msgid "Error!"
msgstr "Errore!"
@@ -1858,16 +1932,6 @@ msgstr ""
"ricezione merci relative vengono annullate, lo stato diventa eccezione."
#. module: purchase
-#: model:process.transition,note:purchase.process_transition_packinginvoice0
-msgid ""
-"A Pick list generates an invoice. Depending on the Invoicing control of the "
-"sale order, the invoice is based on delivered or on ordered quantities."
-msgstr ""
-"Una lista di prelievo genera una fattura. La fattura sarà riferita alle "
-"quantità spedite o a quelle ordinate, in funzione del controllo dell'ordine "
-"di vendita della fattura stessa ."
-
-#. module: purchase
#: selection:purchase.order,state:0
#: selection:purchase.order.line,state:0
#: selection:purchase.report,state:0
@@ -1880,10 +1944,9 @@ msgid "# of Purchase Order"
msgstr "# dell'ordine di acquisto"
#. module: purchase
-#: code:addons/purchase/purchase.py:827
-#, python-format
-msgid "Shipment <b>received</b>."
-msgstr "Spedizione <b>ricevuta</b>."
+#: model:ir.model,name:purchase.model_mail_compose_message
+msgid "Email composition wizard"
+msgstr "Wizard composizione email"
#. module: purchase
#: report:purchase.quotation:0
@@ -1977,7 +2040,7 @@ msgid "RFQ_${(object.name or '').replace('/','_')}"
msgstr "RFQ_${(object.name or '').replace('/','_')}"
#. module: purchase
-#: code:addons/purchase/purchase.py:988
+#: code:addons/purchase/purchase.py:956
#, python-format
msgid "The selected supplier only sells this product by %s"
msgstr "Il fornitore selezionato vende questo prodotto solo da %s"
@@ -2026,6 +2089,12 @@ msgid "Outgoing products to invoice"
msgstr "Prodotti in uscita da fatturare"
#. module: purchase
+#: report:purchase.order:0
+#: field:purchase.report,validator:0
+msgid "Validated By"
+msgstr "Convalidato da"
+
+#. module: purchase
#: view:purchase.report:0
#: field:purchase.report,delay_pass:0
msgid "Days to Deliver"
@@ -2115,11 +2184,9 @@ msgid "November"
msgstr "Novembre"
#. module: purchase
-#: help:purchase.config.settings,group_costing_method:0
-msgid "Allows you to compute product cost price based on average cost."
-msgstr ""
-"Consente di calcolare il prezzo di costo del prodotto basandosi sul costo "
-"medio."
+#: view:purchase.order.line:0
+msgid "Manual Invoices"
+msgstr "Fatture manuali"
#. module: purchase
#: report:purchase.order:0
@@ -2148,15 +2215,6 @@ msgstr ""
"ricezioni vengono validate."
#. module: purchase
-#: help:purchase.order,origin:0
-msgid ""
-"Reference of the document that generated this purchase order request; a sale "
-"order or an internal procurement request."
-msgstr ""
-"Riferimento del documento che ha generato questo ordine di acquisto; un "
-"ordine di vendita o una richiesta di approvvigionamento interna."
-
-#. module: purchase
#: model:ir.ui.menu,name:purchase.menu_partner_categories_in_form
msgid "Partner Categories"
msgstr "Categorie Partner"
@@ -2177,167 +2235,6 @@ msgid "Invoicing Settings"
msgstr "Impostazioni Fatturazione"
#. module: purchase
-#: model:email.template,body_html:purchase.email_template_edi_purchase
-msgid ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"\n"
-" <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
-"or ''},</p>\n"
-" \n"
-" <p>Here is a ${object.state in ('draft', 'sent') and 'request for "
-"quotation' or 'purchase order confirmation'} from ${object.company_id.name}: "
-"</p>\n"
-" \n"
-" <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
-" &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
-" &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
-" &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
-"${object.pricelist_id.currency_id.name}</strong><br />\n"
-" &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
-" % if object.origin:\n"
-" &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
-" % endif\n"
-" % if object.partner_ref:\n"
-" &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
-" % endif\n"
-" % if object.validator:\n"
-" &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.validator.email "
-"or ''}?subject=Order%20${object.name}\">${object.validator.name}</a>\n"
-" % endif\n"
-" </p>\n"
-"\n"
-" <br/>\n"
-" <p>If you have any question, do not hesitate to contact us.</p>\n"
-" <p>Thank you!</p>\n"
-" <br/>\n"
-" <br/>\n"
-" <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
-"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
-"background-repeat: repeat no-repeat;\">\n"
-" <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
-"#FFF;\">\n"
-" <strong style=\"text-"
-"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
-" </div>\n"
-" <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
-"16px; background-color: #F2F2F2;\">\n"
-" <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
-" % if object.company_id.street:\n"
-" ${object.company_id.street}<br/>\n"
-" % endif\n"
-" % if object.company_id.street2:\n"
-" ${object.company_id.street2}<br/>\n"
-" % endif\n"
-" % if object.company_id.city or object.company_id.zip:\n"
-" ${object.company_id.zip} ${object.company_id.city}<br/>\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 ''}<br/>\n"
-" % endif\n"
-" </span>\n"
-" % if object.company_id.phone:\n"
-" <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
-"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
-"0px; padding-left: 0px; \">\n"
-" Phone:&nbsp; ${object.company_id.phone}\n"
-" </div>\n"
-" % endif\n"
-" % if object.company_id.website:\n"
-" <div>\n"
-" Web :&nbsp;<a "
-"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
-" </div>\n"
-" %endif\n"
-" <p></p>\n"
-" </div>\n"
-"</div>\n"
-" "
-msgstr ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"\n"
-" <p>Salve ${object.partner_id.name and ' ' or ''}${object.partner_id.name "
-"or ''},</p>\n"
-" \n"
-" <p>Ecco la vostra ${object.state in ('draft', 'sent') and 'richiesta di "
-"preventivo' or \"conferma d'ordine di acquisto\"} da "
-"${object.company_id.name}: </p>\n"
-" \n"
-" <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
-" &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
-" &nbsp;&nbsp;Numero ordine: <strong>${object.name}</strong><br />\n"
-" &nbsp;&nbsp;Totale ordine: <strong>${object.amount_total} "
-"${object.pricelist_id.currency_id.name}</strong><br />\n"
-" &nbsp;&nbsp;Data ordine: ${object.date_order}<br />\n"
-" % if object.origin:\n"
-" &nbsp;&nbsp;Riferimento ordine: ${object.origin}<br />\n"
-" % endif\n"
-" % if object.partner_ref:\n"
-" &nbsp;&nbsp;Vostro rif.: ${object.partner_ref}<br />\n"
-" % endif\n"
-" % if object.validator:\n"
-" &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.validator.email "
-"or ''}?subject=Order%20${object.name}\">${object.validator.name}</a>\n"
-" % endif\n"
-" </p>\n"
-"\n"
-" <br/>\n"
-" <p>Per qualsiasi informazione non esitate a contattarci.</p>\n"
-" <p>Grazie!</p>\n"
-" <br/>\n"
-" <br/>\n"
-" <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
-"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
-"background-repeat: repeat no-repeat;\">\n"
-" <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
-"#FFF;\">\n"
-" <strong style=\"text-"
-"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
-" </div>\n"
-" <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
-"16px; background-color: #F2F2F2;\">\n"
-" <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
-" % if object.company_id.street:\n"
-" ${object.company_id.street}<br/>\n"
-" % endif\n"
-" % if object.company_id.street2:\n"
-" ${object.company_id.street2}<br/>\n"
-" % endif\n"
-" % if object.company_id.city or object.company_id.zip:\n"
-" ${object.company_id.zip} ${object.company_id.city}<br/>\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 ''}<br/>\n"
-" % endif\n"
-" </span>\n"
-" % if object.company_id.phone:\n"
-" <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
-"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
-"0px; padding-left: 0px; \">\n"
-" Phone:&nbsp; ${object.company_id.phone}\n"
-" </div>\n"
-" % endif\n"
-" % if object.company_id.website:\n"
-" <div>\n"
-" Web :&nbsp;<a "
-"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
-" </div>\n"
-" %endif\n"
-" <p></p>\n"
-" </div>\n"
-"</div>\n"
-" "
-
-#. module: purchase
#: model:ir.actions.act_window,name:purchase.action_purchase_order_by_user_all
msgid "Total Orders by User per month"
msgstr "Ordini totali per utente per mese"
@@ -2348,24 +2245,19 @@ msgid "Based on incoming shipments"
msgstr "Basato sulle spedizioni in entrata"
#. module: purchase
+#: code:addons/purchase/purchase.py:1018
+#, python-format
+msgid "No default supplier defined for this product"
+msgstr ""
+
+#. module: purchase
#: view:purchase.report:0
#: field:purchase.report,warehouse_id:0
msgid "Warehouse"
msgstr "Magazzino"
#. module: purchase
-#: help:purchase.order,partner_ref:0
-msgid ""
-"Reference of the sale order or quotation sent by your supplier. It's mainly "
-"used to do the matching when you receive the products as this reference is "
-"usually written on the delivery order sent by your supplier."
-msgstr ""
-"Riferimento dell'ordine di vendita o preventivo inviato dal fornitore. E' "
-"principalmente usato per collegare i prodotti ricevuti siccome solitamente "
-"viene scritto sul DDT."
-
-#. module: purchase
-#: code:addons/purchase/purchase.py:991
+#: code:addons/purchase/purchase.py:960
#, python-format
msgid ""
"The selected supplier has a minimal quantity set to %s %s, you should not "
@@ -2452,9 +2344,9 @@ msgstr ""
" "
#. module: purchase
-#: view:product.product:0
-msgid "When you sell this service to a customer,"
-msgstr "Quando si vende questo servizio ad un cliente,"
+#: field:purchase.order,message_summary:0
+msgid "Summary"
+msgstr "Riepilogo"
#. module: purchase
#: model:ir.actions.act_window,name:purchase.purchase_pricelist_version_action
@@ -2463,6 +2355,11 @@ msgid "Pricelist Versions"
msgstr "Versione listino prezzi"
#. module: purchase
+#: field:purchase.order,payment_term_id:0
+msgid "Payment Term"
+msgstr ""
+
+#. module: purchase
#: view:purchase.order:0
msgid "Purchase orders which are in draft state"
msgstr "Ordini d'acquisto in stato bozza"
@@ -2791,6 +2688,9 @@ msgstr "Ordini"
#~ msgid "Do you want to generate the supplier invoices ?"
#~ msgstr "Si desidera generare le fatture di acquisto?"
+#~ msgid "Select an Open Sale Order"
+#~ msgstr "Selezionare un ordine di vendita aperto"
+
#~ msgid "Current purchases"
#~ msgstr "Acquisti correnti"
@@ -2825,6 +2725,14 @@ msgstr "Ordini"
#~ msgid "Configuration Progress"
#~ msgstr "Avanzamento configurazione"
+#~ msgid ""
+#~ "A Pick list generates an invoice. Depending on the Invoicing control of the "
+#~ "sale order, the invoice is based on delivered or on ordered quantities."
+#~ msgstr ""
+#~ "Una lista di prelievo genera una fattura. La fattura sarà riferita alle "
+#~ "quantità spedite o a quelle ordinate, in funzione del controllo dell'ordine "
+#~ "di vendita della fattura stessa ."
+
#, python-format
#~ msgid "Purchase amount over the limit"
#~ msgstr "Costo d' acquisto sopra il limite consentito"
diff --git a/addons/purchase/i18n/ja.po b/addons/purchase/i18n/ja.po
index 1b61ec78e82..08e4d12838d 100644
--- a/addons/purchase/i18n/ja.po
+++ b/addons/purchase/i18n/ja.po
@@ -7,15 +7,15 @@ msgid ""
msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
"PO-Revision-Date: 2012-06-21 23:39+0000\n"
"Last-Translator: Akira Hiyama <Unknown>\n"
"Language-Team: Japanese <ja@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: 2012-12-04 05:11+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:19+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
#. module: purchase
#: model:res.groups,name:purchase.group_analytic_accounting
@@ -59,11 +59,6 @@ msgid ""
msgstr "価格リストはこの発注オーダーのために使用される通貨をセットします。また、選択した製品 / 数量の仕入先価格を計算します。"
#. module: purchase
-#: model:ir.actions.server,name:purchase.actions_server_purchase_order_read
-msgid "Purchase: Mark read"
-msgstr ""
-
-#. module: purchase
#: view:purchase.report:0
#: field:purchase.report,day:0
msgid "Day"
@@ -104,16 +99,13 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:973
-#: code:addons/purchase/purchase.py:988
-#: code:addons/purchase/purchase.py:991
-#: code:addons/purchase/wizard/purchase_order_group.py:47
+#: code:addons/purchase/purchase.py:1024
#, python-format
-msgid "Warning!"
+msgid "Configuration Error!"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:573
+#: code:addons/purchase/purchase.py:587
#, python-format
msgid "You must first cancel all receptions related to this purchase order."
msgstr "最初に、この発注オーダーに関連する全ての受領をキャンセルすべきです。"
@@ -130,10 +122,10 @@ msgid "Purchase-Standard Price"
msgstr "発注標準価格"
#. module: purchase
-#: report:purchase.order:0
-#: field:purchase.report,validator:0
-msgid "Validated By"
-msgstr "検証者"
+#: code:addons/purchase/purchase.py:1011
+#, python-format
+msgid "No supplier defined for this product !"
+msgstr ""
#. module: purchase
#: model:ir.actions.act_window,help:purchase.action_picking_tree4_picking_to_invoice
@@ -156,12 +148,6 @@ msgid "Average Price"
msgstr "平均価格"
#. module: purchase
-#: code:addons/purchase/purchase.py:830
-#, python-format
-msgid "Invoice <b>paid</b>."
-msgstr ""
-
-#. module: purchase
#: view:purchase.order:0
msgid "Purchase order which are in the exception state"
msgstr "発注オーダーは例外状態です。"
@@ -231,7 +217,7 @@ msgid ""
msgstr "これは、全発注オーダー行の製品のもっとも小さい予定日として計算されます。"
#. module: purchase
-#: code:addons/purchase/purchase.py:255
+#: code:addons/purchase/purchase.py:260
#, python-format
msgid "In order to delete a purchase order, you must cancel it first."
msgstr ""
@@ -257,29 +243,12 @@ msgid "Total Untaxed amount"
msgstr "税抜合計"
#. module: purchase
-#: model:ir.ui.menu,name:purchase.menu_purchase_uom_categ_form_action
-msgid "Unit of Measure Categories"
-msgstr ""
-
-#. module: purchase
#: view:purchase.report:0
#: field:purchase.report,category_id:0
msgid "Category"
msgstr "分類"
#. module: purchase
-#: view:purchase.order:0
-msgid "Quotation "
-msgstr ""
-
-#. module: purchase
-#: code:addons/purchase/purchase.py:810
-#, python-format
-msgid ""
-"Quotation for <em>%s</em> <b>converted</b> to a Purchase Order of %s %s."
-msgstr ""
-
-#. module: purchase
#: model:process.transition,note:purchase.process_transition_purchaseinvoice0
msgid ""
"A purchase order generates a supplier invoice, as soon as it is confirmed by "
@@ -345,14 +314,16 @@ msgid "October"
msgstr "10月"
#. module: purchase
-#: code:addons/purchase/purchase.py:837
+#: code:addons/purchase/purchase.py:1024
#, python-format
-msgid "Purchase Order for <em>%s</em> <b>cancelled</b>."
+msgid ""
+"The product \"%s\" has been defined with your company as reseller which "
+"seems to be a configuration error!"
msgstr ""
#. module: purchase
-#: field:purchase.order,message_summary:0
-msgid "Summary"
+#: view:product.product:0
+msgid "When you sell this service to a customer,"
msgstr ""
#. module: purchase
@@ -381,12 +352,6 @@ msgid "Quantity"
msgstr "数量"
#. module: purchase
-#: code:addons/purchase/purchase.py:819
-#, python-format
-msgid "Shipment <em>%s</em> <b>scheduled</b> for %s."
-msgstr ""
-
-#. module: purchase
#: field:purchase.order,fiscal_position:0
msgid "Fiscal Position"
msgstr "会計ポジション"
@@ -444,12 +409,6 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:824
-#, python-format
-msgid "Draft Invoice of %s %s is <b>waiting for validation</b>."
-msgstr ""
-
-#. module: purchase
#: model:ir.actions.act_window,help:purchase.purchase_line_form_action2
msgid ""
"<p>\n"
@@ -470,6 +429,11 @@ msgid "Scheduled Date"
msgstr "予定日"
#. module: purchase
+#: field:purchase.order,currency_id:0
+msgid "Currency"
+msgstr ""
+
+#. module: purchase
#: field:purchase.order,journal_id:0
msgid "Journal"
msgstr "仕訳帳"
@@ -502,6 +466,19 @@ msgid "Incoming Products"
msgstr ""
#. module: purchase
+#: view:purchase.order:0
+msgid "Request for Quotation "
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,partner_ref:0
+msgid ""
+"Reference of the sales order or quotation sent by your supplier. It's mainly "
+"used to do the matching when you receive the products as this reference is "
+"usually written on the delivery order sent by your supplier."
+msgstr ""
+
+#. module: purchase
#: view:purchase.config.settings:0
#: view:purchase.order.group:0
#: view:purchase.order.line_invoice:0
@@ -523,6 +500,11 @@ msgstr ""
"発注オーダーの請求書制御がオーダー時である場合は、請求書は自動的に作成されます。請求書は会計士により、手動で生成することもできます(請求書制御を手動)。"
#. module: purchase
+#: model:mail.message.subtype,name:purchase.mt_rfq_approved
+msgid "RFQ Approved"
+msgstr ""
+
+#. module: purchase
#: view:purchase.config.settings:0
msgid "Apply"
msgstr ""
@@ -540,6 +522,11 @@ msgid ""
msgstr "買い手は仕入先に送られる前に見積依頼(RFQ)を承認しなければなりません。見積依頼(RFQ)は確認された発注オーダーになります。"
#. module: purchase
+#: model:mail.message.subtype,name:purchase.mt_rfq_confirmed
+msgid "RFQ Confirmed"
+msgstr ""
+
+#. module: purchase
#: view:purchase.order:0
msgid "Customer Address"
msgstr ""
@@ -564,7 +551,7 @@ msgid "Supplier"
msgstr "仕入先"
#. module: purchase
-#: code:addons/purchase/purchase.py:508
+#: code:addons/purchase/purchase.py:525
#, python-format
msgid "Define expense account for this company: \"%s\" (id:%d)."
msgstr ""
@@ -588,7 +575,6 @@ msgstr "小計"
#. module: purchase
#: field:purchase.order,shipped:0
-#: field:purchase.order,shipped_rate:0
msgid "Received"
msgstr "受信済"
@@ -630,13 +616,20 @@ msgid "Invoices and Receptions"
msgstr ""
#. module: purchase
+#: model:process.transition,note:purchase.process_transition_packinginvoice0
+msgid ""
+"A Pick list generates an invoice. Depending on the Invoicing control of the "
+"sales order, the invoice is based on delivered or on ordered quantities."
+msgstr ""
+
+#. module: purchase
#: view:purchase.report:0
#: field:purchase.report,nbr:0
msgid "# of Lines"
msgstr "行数"
#. module: purchase
-#: code:addons/purchase/wizard/purchase_line_invoice.py:110
+#: code:addons/purchase/wizard/purchase_line_invoice.py:106
#, python-format
msgid "Define expense account for this product: \"%s\" (id:%d)."
msgstr ""
@@ -657,8 +650,8 @@ msgid "It indicates that a picking has been done"
msgstr "それは集荷は行われたことを示しています。"
#. module: purchase
-#: code:addons/purchase/purchase.py:565
-#: code:addons/purchase/purchase.py:572
+#: code:addons/purchase/purchase.py:579
+#: code:addons/purchase/purchase.py:586
#, python-format
msgid "Unable to cancel this purchase order."
msgstr ""
@@ -721,6 +714,15 @@ msgid "Draft PO"
msgstr ""
#. module: purchase
+#: code:addons/purchase/purchase.py:941
+#: code:addons/purchase/purchase.py:956
+#: code:addons/purchase/purchase.py:960
+#: code:addons/purchase/wizard/purchase_order_group.py:47
+#, python-format
+msgid "Warning!"
+msgstr ""
+
+#. module: purchase
#: model:process.node,name:purchase.process_node_draftpurchaseorder0
#: model:process.node,name:purchase.process_node_draftpurchaseorder1
msgid "RFQ"
@@ -752,6 +754,11 @@ msgid "The tax amount"
msgstr "税金額"
#. module: purchase
+#: field:purchase.order,shipped_rate:0
+msgid "Received Ratio"
+msgstr ""
+
+#. module: purchase
#: selection:purchase.report,month:0
msgid "September"
msgstr "9月"
@@ -783,7 +790,7 @@ msgid "Stock Moves"
msgstr "在庫移動"
#. module: purchase
-#: code:addons/purchase/purchase.py:1158
+#: code:addons/purchase/purchase.py:1156
#, python-format
msgid "Draft Purchase Order created"
msgstr ""
@@ -804,11 +811,6 @@ msgid "Terms and Conditions"
msgstr ""
#. module: purchase
-#: field:purchase.order,currency_id:0
-msgid "unknown"
-msgstr ""
-
-#. module: purchase
#: help:purchase.order,date_order:0
msgid "Date on which this document has been created."
msgstr "このドキュメントの作成日"
@@ -902,12 +904,6 @@ msgid "Cancel"
msgstr "キャンセル"
#. module: purchase
-#: field:purchase.order,message_comment_ids:0
-#: help:purchase.order,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
-#. module: purchase
#: sql_constraint:purchase.order:0
msgid "Order Reference must be unique per Company!"
msgstr "オーダー参照は、会社ごとに固有でなければなりません。"
@@ -941,14 +937,89 @@ msgid "Date Approved"
msgstr "承認日"
#. module: purchase
-#: code:addons/purchase/purchase.py:806
-#, python-format
-msgid "Request for quotation <b>created</b>."
+#: view:product.product:0
+msgid "a draft purchase order"
msgstr ""
#. module: purchase
-#: view:product.product:0
-msgid "a draft purchase order"
+#: model:email.template,body_html:purchase.email_template_edi_purchase
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: #FFF; \">\n"
+"\n"
+" <p>Hello$ ${object.partner_id.name},</p>\n"
+" \n"
+" <p>Here is a ${object.state in ('draft', 'sent') and 'request for "
+"quotation' or 'purchase order confirmation'} from ${object.company_id.name}: "
+"</p>\n"
+" \n"
+" <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
+" &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
+" &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
+" &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
+"${object.pricelist_id.currency_id.name}</strong><br />\n"
+" &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
+" % if object.origin:\n"
+" &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
+" % endif\n"
+" % if object.partner_ref:\n"
+" &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
+" % endif\n"
+" % if object.validator:\n"
+" &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.validator.email "
+"or ''}?subject=Order%20${object.name}\">${object.validator.name}</a>\n"
+" % endif\n"
+" </p>\n"
+"\n"
+" <br/>\n"
+" <p>If you have any question, do not hesitate to contact us.</p>\n"
+" <p>Thank you!</p>\n"
+" <br/>\n"
+" <br/>\n"
+" <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
+"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
+"background-repeat: repeat no-repeat;\">\n"
+" <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
+"#DDD;\">\n"
+" <strong style=\"text-"
+"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
+" </div>\n"
+" <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
+"16px; background-color: #F2F2F2;\">\n"
+" <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
+" % if object.company_id.street:\n"
+" ${object.company_id.street}<br/>\n"
+" % endif\n"
+" % if object.company_id.street2:\n"
+" ${object.company_id.street2}<br/>\n"
+" % endif\n"
+" % if object.company_id.city or object.company_id.zip:\n"
+" ${object.company_id.zip} ${object.company_id.city}<br/>\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 ''}<br/>\n"
+" % endif\n"
+" </span>\n"
+" % if object.company_id.phone:\n"
+" <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
+"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
+"0px; padding-left: 0px; \">\n"
+" Phone:&nbsp; ${object.company_id.phone}\n"
+" </div>\n"
+" % endif\n"
+" % if object.company_id.website:\n"
+" <div>\n"
+" Web :&nbsp;<a "
+"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
+" </div>\n"
+" %endif\n"
+" <p></p>\n"
+" </div>\n"
+"</div>\n"
+" "
msgstr ""
#. module: purchase
@@ -988,17 +1059,12 @@ msgid "Outgoing Mails"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:437
+#: code:addons/purchase/purchase.py:456
#, python-format
msgid "You cannot confirm a purchase order without any purchase order line."
msgstr ""
#. module: purchase
-#: model:ir.actions.server,name:purchase.actions_server_purchase_order_unread
-msgid "Purchase: Mark unread"
-msgstr ""
-
-#. module: purchase
#: help:purchase.order,message_ids:0
msgid "Messages and communication history"
msgstr ""
@@ -1010,7 +1076,7 @@ msgid "Destination Warehouse"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:973
+#: code:addons/purchase/purchase.py:941
#, python-format
msgid ""
"Selected Unit of Measure does not belong to the same category as the product "
@@ -1018,6 +1084,11 @@ msgid ""
msgstr ""
#. module: purchase
+#: view:purchase.order.line_invoice:0
+msgid "Select an Open Sales Order"
+msgstr ""
+
+#. module: purchase
#: model:ir.ui.menu,name:purchase.menu_purchase_unit_measure_purchase
#: model:ir.ui.menu,name:purchase.menu_purchase_uom_form_action
msgid "Units of Measure"
@@ -1029,18 +1100,12 @@ msgid "Manage pricelist per supplier"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:833
-#, python-format
-msgid "Purchase Order has been set to <b>draft</b>."
-msgstr ""
-
-#. module: purchase
#: view:board.board:0
msgid "Purchase Dashboard"
msgstr "発注ダッシュボード"
#. module: purchase
-#: code:addons/purchase/purchase.py:566
+#: code:addons/purchase/purchase.py:580
#, python-format
msgid "First cancel all receptions related to this purchase order."
msgstr ""
@@ -1079,9 +1144,9 @@ msgid "Unread Messages"
msgstr ""
#. module: purchase
-#: view:purchase.order.line_invoice:0
-msgid "Select an Open Sale Order"
-msgstr "開いている受注オーダーの選択"
+#: model:ir.ui.menu,name:purchase.menu_purchase_uom_categ_form_action
+msgid "Unit of Measure Categories"
+msgstr ""
#. module: purchase
#: view:purchase.order:0
@@ -1089,6 +1154,13 @@ msgid "Set to Draft"
msgstr "ドラフトに設定"
#. module: purchase
+#: help:purchase.order,origin:0
+msgid ""
+"Reference of the document that generated this purchase order request; a "
+"sales order or an internal procurement request."
+msgstr ""
+
+#. module: purchase
#: view:purchase.order.line:0
msgid "Notes"
msgstr "注記"
@@ -1118,7 +1190,7 @@ msgid "Stock Move"
msgstr "在庫移動"
#. module: purchase
-#: code:addons/purchase/purchase.py:255
+#: code:addons/purchase/purchase.py:260
#, python-format
msgid "Invalid Action!"
msgstr ""
@@ -1218,7 +1290,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:310
+#: code:addons/purchase/purchase.py:320
#, python-format
msgid "Please create Invoices."
msgstr ""
@@ -1308,7 +1380,7 @@ msgid "Purchase Order Line Make Invoice"
msgstr "発注オーダー行は請求書を作成します。"
#. module: purchase
-#: code:addons/purchase/purchase.py:1133
+#: code:addons/purchase/purchase.py:1141
#, python-format
msgid "PO: %s"
msgstr "発注オーダー:%s"
@@ -1319,7 +1391,7 @@ msgid "Send by EMail"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:498
+#: code:addons/purchase/purchase.py:515
#, python-format
msgid "Define purchase journal for this company: \"%s\" (id:%d)."
msgstr ""
@@ -1330,9 +1402,9 @@ msgid "Purchase Order "
msgstr ""
#. module: purchase
-#: view:purchase.order.line:0
-msgid "Manual Invoices"
-msgstr "手動作成請求書"
+#: help:purchase.config.settings,group_costing_method:0
+msgid "Allows you to compute product cost price based on average cost."
+msgstr ""
#. module: purchase
#: model:ir.actions.act_window,name:purchase.action_purchase_configuration
@@ -1486,8 +1558,8 @@ msgid "Compute product cost price based on average cost"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:340
-#: code:addons/purchase/wizard/purchase_line_invoice.py:141
+#: code:addons/purchase/purchase.py:350
+#: code:addons/purchase/wizard/purchase_line_invoice.py:137
#: model:ir.actions.act_window,name:purchase.act_res_partner_2_supplier_invoices
#: view:res.partner:0
#, python-format
@@ -1599,8 +1671,9 @@ msgid "Open Purchase Menu"
msgstr ""
#. module: purchase
-#: model:ir.model,name:purchase.model_mail_compose_message
-msgid "Email composition wizard"
+#: code:addons/purchase/purchase.py:1028
+#, python-format
+msgid "No address defined for the supplier"
msgstr ""
#. module: purchase
@@ -1671,11 +1744,11 @@ msgid "Purchase Order"
msgstr "発注オーダー"
#. module: purchase
-#: code:addons/purchase/purchase.py:310
-#: code:addons/purchase/purchase.py:437
-#: code:addons/purchase/purchase.py:497
-#: code:addons/purchase/purchase.py:508
-#: code:addons/purchase/wizard/purchase_line_invoice.py:109
+#: code:addons/purchase/purchase.py:320
+#: code:addons/purchase/purchase.py:456
+#: code:addons/purchase/purchase.py:514
+#: code:addons/purchase/purchase.py:525
+#: code:addons/purchase/wizard/purchase_line_invoice.py:105
#, python-format
msgid "Error!"
msgstr ""
@@ -1697,13 +1770,6 @@ msgid ""
msgstr ""
#. module: purchase
-#: model:process.transition,note:purchase.process_transition_packinginvoice0
-msgid ""
-"A Pick list generates an invoice. Depending on the Invoicing control of the "
-"sale order, the invoice is based on delivered or on ordered quantities."
-msgstr "集荷リストは請求書を作成します。受注オーダーの請求書制御に依存する請求書は、配信またはオーダー数量に基づいています。"
-
-#. module: purchase
#: selection:purchase.order,state:0
#: selection:purchase.order.line,state:0
#: selection:purchase.report,state:0
@@ -1716,9 +1782,8 @@ msgid "# of Purchase Order"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:827
-#, python-format
-msgid "Shipment <b>received</b>."
+#: model:ir.model,name:purchase.model_mail_compose_message
+msgid "Email composition wizard"
msgstr ""
#. module: purchase
@@ -1803,7 +1868,7 @@ msgid "RFQ_${(object.name or '').replace('/','_')}"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:988
+#: code:addons/purchase/purchase.py:956
#, python-format
msgid "The selected supplier only sells this product by %s"
msgstr "選択仕入先は%s によりこの製品のみを売ります。"
@@ -1849,6 +1914,12 @@ msgid "Outgoing products to invoice"
msgstr "請求するための出庫製品"
#. module: purchase
+#: report:purchase.order:0
+#: field:purchase.report,validator:0
+msgid "Validated By"
+msgstr "検証者"
+
+#. module: purchase
#: view:purchase.report:0
#: field:purchase.report,delay_pass:0
msgid "Days to Deliver"
@@ -1938,9 +2009,9 @@ msgid "November"
msgstr "11月"
#. module: purchase
-#: help:purchase.config.settings,group_costing_method:0
-msgid "Allows you to compute product cost price based on average cost."
-msgstr ""
+#: view:purchase.order.line:0
+msgid "Manual Invoices"
+msgstr "手動作成請求書"
#. module: purchase
#: report:purchase.order:0
@@ -1963,13 +2034,6 @@ msgid ""
msgstr ""
#. module: purchase
-#: help:purchase.order,origin:0
-msgid ""
-"Reference of the document that generated this purchase order request; a sale "
-"order or an internal procurement request."
-msgstr ""
-
-#. module: purchase
#: model:ir.ui.menu,name:purchase.menu_partner_categories_in_form
msgid "Partner Categories"
msgstr "パートナ分類"
@@ -1990,89 +2054,6 @@ msgid "Invoicing Settings"
msgstr ""
#. module: purchase
-#: model:email.template,body_html:purchase.email_template_edi_purchase
-msgid ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"\n"
-" <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
-"or ''},</p>\n"
-" \n"
-" <p>Here is a ${object.state in ('draft', 'sent') and 'request for "
-"quotation' or 'purchase order confirmation'} from ${object.company_id.name}: "
-"</p>\n"
-" \n"
-" <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
-" &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
-" &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
-" &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
-"${object.pricelist_id.currency_id.name}</strong><br />\n"
-" &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
-" % if object.origin:\n"
-" &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
-" % endif\n"
-" % if object.partner_ref:\n"
-" &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
-" % endif\n"
-" % if object.validator:\n"
-" &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.validator.email "
-"or ''}?subject=Order%20${object.name}\">${object.validator.name}</a>\n"
-" % endif\n"
-" </p>\n"
-"\n"
-" <br/>\n"
-" <p>If you have any question, do not hesitate to contact us.</p>\n"
-" <p>Thank you!</p>\n"
-" <br/>\n"
-" <br/>\n"
-" <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
-"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
-"background-repeat: repeat no-repeat;\">\n"
-" <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
-"#FFF;\">\n"
-" <strong style=\"text-"
-"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
-" </div>\n"
-" <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
-"16px; background-color: #F2F2F2;\">\n"
-" <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
-" % if object.company_id.street:\n"
-" ${object.company_id.street}<br/>\n"
-" % endif\n"
-" % if object.company_id.street2:\n"
-" ${object.company_id.street2}<br/>\n"
-" % endif\n"
-" % if object.company_id.city or object.company_id.zip:\n"
-" ${object.company_id.zip} ${object.company_id.city}<br/>\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 ''}<br/>\n"
-" % endif\n"
-" </span>\n"
-" % if object.company_id.phone:\n"
-" <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
-"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
-"0px; padding-left: 0px; \">\n"
-" Phone:&nbsp; ${object.company_id.phone}\n"
-" </div>\n"
-" % endif\n"
-" % if object.company_id.website:\n"
-" <div>\n"
-" Web :&nbsp;<a "
-"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
-" </div>\n"
-" %endif\n"
-" <p></p>\n"
-" </div>\n"
-"</div>\n"
-" "
-msgstr ""
-
-#. module: purchase
#: model:ir.actions.act_window,name:purchase.action_purchase_order_by_user_all
msgid "Total Orders by User per month"
msgstr "ユーザの月別合計オーダー"
@@ -2083,21 +2064,19 @@ msgid "Based on incoming shipments"
msgstr ""
#. module: purchase
+#: code:addons/purchase/purchase.py:1018
+#, python-format
+msgid "No default supplier defined for this product"
+msgstr ""
+
+#. module: purchase
#: view:purchase.report:0
#: field:purchase.report,warehouse_id:0
msgid "Warehouse"
msgstr "倉庫"
#. module: purchase
-#: help:purchase.order,partner_ref:0
-msgid ""
-"Reference of the sale order or quotation sent by your supplier. It's mainly "
-"used to do the matching when you receive the products as this reference is "
-"usually written on the delivery order sent by your supplier."
-msgstr ""
-
-#. module: purchase
-#: code:addons/purchase/purchase.py:991
+#: code:addons/purchase/purchase.py:960
#, python-format
msgid ""
"The selected supplier has a minimal quantity set to %s %s, you should not "
@@ -2180,8 +2159,8 @@ msgstr ""
" "
#. module: purchase
-#: view:product.product:0
-msgid "When you sell this service to a customer,"
+#: field:purchase.order,message_summary:0
+msgid "Summary"
msgstr ""
#. module: purchase
@@ -2191,6 +2170,11 @@ msgid "Pricelist Versions"
msgstr "価格リストバージョン"
#. module: purchase
+#: field:purchase.order,payment_term_id:0
+msgid "Payment Term"
+msgstr ""
+
+#. module: purchase
#: view:purchase.order:0
msgid "Purchase orders which are in draft state"
msgstr "ドラフト状態の発注オーダー"
@@ -2347,6 +2331,11 @@ msgstr "オーダー"
#~ msgid "Set the Default Invoicing Control Method"
#~ msgstr "デフォルト請求書制御方法をセット"
+#~ msgid ""
+#~ "A Pick list generates an invoice. Depending on the Invoicing control of the "
+#~ "sale order, the invoice is based on delivered or on ordered quantities."
+#~ msgstr "集荷リストは請求書を作成します。受注オーダーの請求書制御に依存する請求書は、配信またはオーダー数量に基づいています。"
+
#~ msgid "Default Invoicing Control Method"
#~ msgstr "デフォルト請求書制御方法"
@@ -2722,6 +2711,9 @@ msgstr "オーダー"
#~ msgid "Order in current year"
#~ msgstr "今年のオーダー"
+#~ msgid "Select an Open Sale Order"
+#~ msgstr "開いている受注オーダーの選択"
+
#~ msgid ""
#~ "unique number of the purchase order,computed automatically when the purchase "
#~ "order is created"
diff --git a/addons/purchase/i18n/ko.po b/addons/purchase/i18n/ko.po
index 56dc478101f..b0506fd5eb3 100644
--- a/addons/purchase/i18n/ko.po
+++ b/addons/purchase/i18n/ko.po
@@ -7,15 +7,15 @@ msgid ""
msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
"PO-Revision-Date: 2012-05-10 18:31+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: 2012-12-04 05:11+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:19+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
#. module: purchase
#: model:res.groups,name:purchase.group_analytic_accounting
@@ -59,11 +59,6 @@ msgid ""
msgstr "가격리스트는 이 구매 주문에 이용되는 통화를 설정하며, 선택된 상품/수량에 대해 공급자 가격을 계산합니다."
#. module: purchase
-#: model:ir.actions.server,name:purchase.actions_server_purchase_order_read
-msgid "Purchase: Mark read"
-msgstr ""
-
-#. module: purchase
#: view:purchase.report:0
#: field:purchase.report,day:0
msgid "Day"
@@ -104,16 +99,13 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:973
-#: code:addons/purchase/purchase.py:988
-#: code:addons/purchase/purchase.py:991
-#: code:addons/purchase/wizard/purchase_order_group.py:47
+#: code:addons/purchase/purchase.py:1024
#, python-format
-msgid "Warning!"
+msgid "Configuration Error!"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:573
+#: code:addons/purchase/purchase.py:587
#, python-format
msgid "You must first cancel all receptions related to this purchase order."
msgstr ""
@@ -130,10 +122,10 @@ msgid "Purchase-Standard Price"
msgstr ""
#. module: purchase
-#: report:purchase.order:0
-#: field:purchase.report,validator:0
-msgid "Validated By"
-msgstr "검증한 이"
+#: code:addons/purchase/purchase.py:1011
+#, python-format
+msgid "No supplier defined for this product !"
+msgstr ""
#. module: purchase
#: model:ir.actions.act_window,help:purchase.action_picking_tree4_picking_to_invoice
@@ -156,12 +148,6 @@ msgid "Average Price"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:830
-#, python-format
-msgid "Invoice <b>paid</b>."
-msgstr ""
-
-#. module: purchase
#: view:purchase.order:0
msgid "Purchase order which are in the exception state"
msgstr ""
@@ -231,7 +217,7 @@ msgid ""
msgstr "이것은 모든 구매 주문 라인 상품의 최소 스케줄 날짜로 계산됩니다."
#. module: purchase
-#: code:addons/purchase/purchase.py:255
+#: code:addons/purchase/purchase.py:260
#, python-format
msgid "In order to delete a purchase order, you must cancel it first."
msgstr ""
@@ -257,29 +243,12 @@ msgid "Total Untaxed amount"
msgstr ""
#. module: purchase
-#: model:ir.ui.menu,name:purchase.menu_purchase_uom_categ_form_action
-msgid "Unit of Measure Categories"
-msgstr ""
-
-#. module: purchase
#: view:purchase.report:0
#: field:purchase.report,category_id:0
msgid "Category"
msgstr ""
#. module: purchase
-#: view:purchase.order:0
-msgid "Quotation "
-msgstr ""
-
-#. module: purchase
-#: code:addons/purchase/purchase.py:810
-#, python-format
-msgid ""
-"Quotation for <em>%s</em> <b>converted</b> to a Purchase Order of %s %s."
-msgstr ""
-
-#. module: purchase
#: model:process.transition,note:purchase.process_transition_purchaseinvoice0
msgid ""
"A purchase order generates a supplier invoice, as soon as it is confirmed by "
@@ -344,14 +313,16 @@ msgid "October"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:837
+#: code:addons/purchase/purchase.py:1024
#, python-format
-msgid "Purchase Order for <em>%s</em> <b>cancelled</b>."
+msgid ""
+"The product \"%s\" has been defined with your company as reseller which "
+"seems to be a configuration error!"
msgstr ""
#. module: purchase
-#: field:purchase.order,message_summary:0
-msgid "Summary"
+#: view:product.product:0
+msgid "When you sell this service to a customer,"
msgstr ""
#. module: purchase
@@ -380,12 +351,6 @@ msgid "Quantity"
msgstr "수량"
#. module: purchase
-#: code:addons/purchase/purchase.py:819
-#, python-format
-msgid "Shipment <em>%s</em> <b>scheduled</b> for %s."
-msgstr ""
-
-#. module: purchase
#: field:purchase.order,fiscal_position:0
msgid "Fiscal Position"
msgstr "회계 포지션"
@@ -443,12 +408,6 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:824
-#, python-format
-msgid "Draft Invoice of %s %s is <b>waiting for validation</b>."
-msgstr ""
-
-#. module: purchase
#: model:ir.actions.act_window,help:purchase.purchase_line_form_action2
msgid ""
"<p>\n"
@@ -469,6 +428,11 @@ msgid "Scheduled Date"
msgstr ""
#. module: purchase
+#: field:purchase.order,currency_id:0
+msgid "Currency"
+msgstr ""
+
+#. module: purchase
#: field:purchase.order,journal_id:0
msgid "Journal"
msgstr ""
@@ -501,6 +465,19 @@ msgid "Incoming Products"
msgstr ""
#. module: purchase
+#: view:purchase.order:0
+msgid "Request for Quotation "
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,partner_ref:0
+msgid ""
+"Reference of the sales order or quotation sent by your supplier. It's mainly "
+"used to do the matching when you receive the products as this reference is "
+"usually written on the delivery order sent by your supplier."
+msgstr ""
+
+#. module: purchase
#: view:purchase.config.settings:0
#: view:purchase.order.group:0
#: view:purchase.order.line_invoice:0
@@ -521,6 +498,11 @@ msgid ""
msgstr ""
#. module: purchase
+#: model:mail.message.subtype,name:purchase.mt_rfq_approved
+msgid "RFQ Approved"
+msgstr ""
+
+#. module: purchase
#: view:purchase.config.settings:0
msgid "Apply"
msgstr ""
@@ -538,6 +520,11 @@ msgid ""
msgstr ""
#. module: purchase
+#: model:mail.message.subtype,name:purchase.mt_rfq_confirmed
+msgid "RFQ Confirmed"
+msgstr ""
+
+#. module: purchase
#: view:purchase.order:0
msgid "Customer Address"
msgstr ""
@@ -562,7 +549,7 @@ msgid "Supplier"
msgstr "공급자"
#. module: purchase
-#: code:addons/purchase/purchase.py:508
+#: code:addons/purchase/purchase.py:525
#, python-format
msgid "Define expense account for this company: \"%s\" (id:%d)."
msgstr ""
@@ -586,7 +573,6 @@ msgstr "소계"
#. module: purchase
#: field:purchase.order,shipped:0
-#: field:purchase.order,shipped_rate:0
msgid "Received"
msgstr "수령함"
@@ -628,13 +614,20 @@ msgid "Invoices and Receptions"
msgstr ""
#. module: purchase
+#: model:process.transition,note:purchase.process_transition_packinginvoice0
+msgid ""
+"A Pick list generates an invoice. Depending on the Invoicing control of the "
+"sales order, the invoice is based on delivered or on ordered quantities."
+msgstr ""
+
+#. module: purchase
#: view:purchase.report:0
#: field:purchase.report,nbr:0
msgid "# of Lines"
msgstr ""
#. module: purchase
-#: code:addons/purchase/wizard/purchase_line_invoice.py:110
+#: code:addons/purchase/wizard/purchase_line_invoice.py:106
#, python-format
msgid "Define expense account for this product: \"%s\" (id:%d)."
msgstr ""
@@ -655,8 +648,8 @@ msgid "It indicates that a picking has been done"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:565
-#: code:addons/purchase/purchase.py:572
+#: code:addons/purchase/purchase.py:579
+#: code:addons/purchase/purchase.py:586
#, python-format
msgid "Unable to cancel this purchase order."
msgstr ""
@@ -719,6 +712,15 @@ msgid "Draft PO"
msgstr ""
#. module: purchase
+#: code:addons/purchase/purchase.py:941
+#: code:addons/purchase/purchase.py:956
+#: code:addons/purchase/purchase.py:960
+#: code:addons/purchase/wizard/purchase_order_group.py:47
+#, python-format
+msgid "Warning!"
+msgstr ""
+
+#. module: purchase
#: model:process.node,name:purchase.process_node_draftpurchaseorder0
#: model:process.node,name:purchase.process_node_draftpurchaseorder1
msgid "RFQ"
@@ -750,6 +752,11 @@ msgid "The tax amount"
msgstr ""
#. module: purchase
+#: field:purchase.order,shipped_rate:0
+msgid "Received Ratio"
+msgstr ""
+
+#. module: purchase
#: selection:purchase.report,month:0
msgid "September"
msgstr ""
@@ -781,7 +788,7 @@ msgid "Stock Moves"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1158
+#: code:addons/purchase/purchase.py:1156
#, python-format
msgid "Draft Purchase Order created"
msgstr ""
@@ -802,11 +809,6 @@ msgid "Terms and Conditions"
msgstr ""
#. module: purchase
-#: field:purchase.order,currency_id:0
-msgid "unknown"
-msgstr ""
-
-#. module: purchase
#: help:purchase.order,date_order:0
msgid "Date on which this document has been created."
msgstr ""
@@ -900,12 +902,6 @@ msgid "Cancel"
msgstr "취소"
#. module: purchase
-#: field:purchase.order,message_comment_ids:0
-#: help:purchase.order,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
-#. module: purchase
#: sql_constraint:purchase.order:0
msgid "Order Reference must be unique per Company!"
msgstr ""
@@ -939,14 +935,89 @@ msgid "Date Approved"
msgstr "승인된 날짜"
#. module: purchase
-#: code:addons/purchase/purchase.py:806
-#, python-format
-msgid "Request for quotation <b>created</b>."
+#: view:product.product:0
+msgid "a draft purchase order"
msgstr ""
#. module: purchase
-#: view:product.product:0
-msgid "a draft purchase order"
+#: model:email.template,body_html:purchase.email_template_edi_purchase
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: #FFF; \">\n"
+"\n"
+" <p>Hello$ ${object.partner_id.name},</p>\n"
+" \n"
+" <p>Here is a ${object.state in ('draft', 'sent') and 'request for "
+"quotation' or 'purchase order confirmation'} from ${object.company_id.name}: "
+"</p>\n"
+" \n"
+" <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
+" &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
+" &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
+" &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
+"${object.pricelist_id.currency_id.name}</strong><br />\n"
+" &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
+" % if object.origin:\n"
+" &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
+" % endif\n"
+" % if object.partner_ref:\n"
+" &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
+" % endif\n"
+" % if object.validator:\n"
+" &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.validator.email "
+"or ''}?subject=Order%20${object.name}\">${object.validator.name}</a>\n"
+" % endif\n"
+" </p>\n"
+"\n"
+" <br/>\n"
+" <p>If you have any question, do not hesitate to contact us.</p>\n"
+" <p>Thank you!</p>\n"
+" <br/>\n"
+" <br/>\n"
+" <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
+"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
+"background-repeat: repeat no-repeat;\">\n"
+" <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
+"#DDD;\">\n"
+" <strong style=\"text-"
+"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
+" </div>\n"
+" <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
+"16px; background-color: #F2F2F2;\">\n"
+" <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
+" % if object.company_id.street:\n"
+" ${object.company_id.street}<br/>\n"
+" % endif\n"
+" % if object.company_id.street2:\n"
+" ${object.company_id.street2}<br/>\n"
+" % endif\n"
+" % if object.company_id.city or object.company_id.zip:\n"
+" ${object.company_id.zip} ${object.company_id.city}<br/>\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 ''}<br/>\n"
+" % endif\n"
+" </span>\n"
+" % if object.company_id.phone:\n"
+" <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
+"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
+"0px; padding-left: 0px; \">\n"
+" Phone:&nbsp; ${object.company_id.phone}\n"
+" </div>\n"
+" % endif\n"
+" % if object.company_id.website:\n"
+" <div>\n"
+" Web :&nbsp;<a "
+"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
+" </div>\n"
+" %endif\n"
+" <p></p>\n"
+" </div>\n"
+"</div>\n"
+" "
msgstr ""
#. module: purchase
@@ -986,17 +1057,12 @@ msgid "Outgoing Mails"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:437
+#: code:addons/purchase/purchase.py:456
#, python-format
msgid "You cannot confirm a purchase order without any purchase order line."
msgstr ""
#. module: purchase
-#: model:ir.actions.server,name:purchase.actions_server_purchase_order_unread
-msgid "Purchase: Mark unread"
-msgstr ""
-
-#. module: purchase
#: help:purchase.order,message_ids:0
msgid "Messages and communication history"
msgstr ""
@@ -1008,7 +1074,7 @@ msgid "Destination Warehouse"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:973
+#: code:addons/purchase/purchase.py:941
#, python-format
msgid ""
"Selected Unit of Measure does not belong to the same category as the product "
@@ -1016,6 +1082,11 @@ msgid ""
msgstr ""
#. module: purchase
+#: view:purchase.order.line_invoice:0
+msgid "Select an Open Sales Order"
+msgstr ""
+
+#. module: purchase
#: model:ir.ui.menu,name:purchase.menu_purchase_unit_measure_purchase
#: model:ir.ui.menu,name:purchase.menu_purchase_uom_form_action
msgid "Units of Measure"
@@ -1027,18 +1098,12 @@ msgid "Manage pricelist per supplier"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:833
-#, python-format
-msgid "Purchase Order has been set to <b>draft</b>."
-msgstr ""
-
-#. module: purchase
#: view:board.board:0
msgid "Purchase Dashboard"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:566
+#: code:addons/purchase/purchase.py:580
#, python-format
msgid "First cancel all receptions related to this purchase order."
msgstr ""
@@ -1077,8 +1142,8 @@ msgid "Unread Messages"
msgstr ""
#. module: purchase
-#: view:purchase.order.line_invoice:0
-msgid "Select an Open Sale Order"
+#: model:ir.ui.menu,name:purchase.menu_purchase_uom_categ_form_action
+msgid "Unit of Measure Categories"
msgstr ""
#. module: purchase
@@ -1087,6 +1152,13 @@ msgid "Set to Draft"
msgstr "초안으로 설정"
#. module: purchase
+#: help:purchase.order,origin:0
+msgid ""
+"Reference of the document that generated this purchase order request; a "
+"sales order or an internal procurement request."
+msgstr ""
+
+#. module: purchase
#: view:purchase.order.line:0
msgid "Notes"
msgstr "노트"
@@ -1116,7 +1188,7 @@ msgid "Stock Move"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:255
+#: code:addons/purchase/purchase.py:260
#, python-format
msgid "Invalid Action!"
msgstr ""
@@ -1215,7 +1287,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:310
+#: code:addons/purchase/purchase.py:320
#, python-format
msgid "Please create Invoices."
msgstr ""
@@ -1305,7 +1377,7 @@ msgid "Purchase Order Line Make Invoice"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1133
+#: code:addons/purchase/purchase.py:1141
#, python-format
msgid "PO: %s"
msgstr ""
@@ -1316,7 +1388,7 @@ msgid "Send by EMail"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:498
+#: code:addons/purchase/purchase.py:515
#, python-format
msgid "Define purchase journal for this company: \"%s\" (id:%d)."
msgstr ""
@@ -1327,8 +1399,8 @@ msgid "Purchase Order "
msgstr ""
#. module: purchase
-#: view:purchase.order.line:0
-msgid "Manual Invoices"
+#: help:purchase.config.settings,group_costing_method:0
+msgid "Allows you to compute product cost price based on average cost."
msgstr ""
#. module: purchase
@@ -1483,8 +1555,8 @@ msgid "Compute product cost price based on average cost"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:340
-#: code:addons/purchase/wizard/purchase_line_invoice.py:141
+#: code:addons/purchase/purchase.py:350
+#: code:addons/purchase/wizard/purchase_line_invoice.py:137
#: model:ir.actions.act_window,name:purchase.act_res_partner_2_supplier_invoices
#: view:res.partner:0
#, python-format
@@ -1596,8 +1668,9 @@ msgid "Open Purchase Menu"
msgstr ""
#. module: purchase
-#: model:ir.model,name:purchase.model_mail_compose_message
-msgid "Email composition wizard"
+#: code:addons/purchase/purchase.py:1028
+#, python-format
+msgid "No address defined for the supplier"
msgstr ""
#. module: purchase
@@ -1668,11 +1741,11 @@ msgid "Purchase Order"
msgstr "구매 주문"
#. module: purchase
-#: code:addons/purchase/purchase.py:310
-#: code:addons/purchase/purchase.py:437
-#: code:addons/purchase/purchase.py:497
-#: code:addons/purchase/purchase.py:508
-#: code:addons/purchase/wizard/purchase_line_invoice.py:109
+#: code:addons/purchase/purchase.py:320
+#: code:addons/purchase/purchase.py:456
+#: code:addons/purchase/purchase.py:514
+#: code:addons/purchase/purchase.py:525
+#: code:addons/purchase/wizard/purchase_line_invoice.py:105
#, python-format
msgid "Error!"
msgstr ""
@@ -1694,13 +1767,6 @@ msgid ""
msgstr ""
#. module: purchase
-#: model:process.transition,note:purchase.process_transition_packinginvoice0
-msgid ""
-"A Pick list generates an invoice. Depending on the Invoicing control of the "
-"sale order, the invoice is based on delivered or on ordered quantities."
-msgstr ""
-
-#. module: purchase
#: selection:purchase.order,state:0
#: selection:purchase.order.line,state:0
#: selection:purchase.report,state:0
@@ -1713,9 +1779,8 @@ msgid "# of Purchase Order"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:827
-#, python-format
-msgid "Shipment <b>received</b>."
+#: model:ir.model,name:purchase.model_mail_compose_message
+msgid "Email composition wizard"
msgstr ""
#. module: purchase
@@ -1799,7 +1864,7 @@ msgid "RFQ_${(object.name or '').replace('/','_')}"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:988
+#: code:addons/purchase/purchase.py:956
#, python-format
msgid "The selected supplier only sells this product by %s"
msgstr ""
@@ -1845,6 +1910,12 @@ msgid "Outgoing products to invoice"
msgstr ""
#. module: purchase
+#: report:purchase.order:0
+#: field:purchase.report,validator:0
+msgid "Validated By"
+msgstr "검증한 이"
+
+#. module: purchase
#: view:purchase.report:0
#: field:purchase.report,delay_pass:0
msgid "Days to Deliver"
@@ -1934,8 +2005,8 @@ msgid "November"
msgstr ""
#. module: purchase
-#: help:purchase.config.settings,group_costing_method:0
-msgid "Allows you to compute product cost price based on average cost."
+#: view:purchase.order.line:0
+msgid "Manual Invoices"
msgstr ""
#. module: purchase
@@ -1959,13 +2030,6 @@ msgid ""
msgstr ""
#. module: purchase
-#: help:purchase.order,origin:0
-msgid ""
-"Reference of the document that generated this purchase order request; a sale "
-"order or an internal procurement request."
-msgstr ""
-
-#. module: purchase
#: model:ir.ui.menu,name:purchase.menu_partner_categories_in_form
msgid "Partner Categories"
msgstr ""
@@ -1986,89 +2050,6 @@ msgid "Invoicing Settings"
msgstr ""
#. module: purchase
-#: model:email.template,body_html:purchase.email_template_edi_purchase
-msgid ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"\n"
-" <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
-"or ''},</p>\n"
-" \n"
-" <p>Here is a ${object.state in ('draft', 'sent') and 'request for "
-"quotation' or 'purchase order confirmation'} from ${object.company_id.name}: "
-"</p>\n"
-" \n"
-" <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
-" &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
-" &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
-" &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
-"${object.pricelist_id.currency_id.name}</strong><br />\n"
-" &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
-" % if object.origin:\n"
-" &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
-" % endif\n"
-" % if object.partner_ref:\n"
-" &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
-" % endif\n"
-" % if object.validator:\n"
-" &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.validator.email "
-"or ''}?subject=Order%20${object.name}\">${object.validator.name}</a>\n"
-" % endif\n"
-" </p>\n"
-"\n"
-" <br/>\n"
-" <p>If you have any question, do not hesitate to contact us.</p>\n"
-" <p>Thank you!</p>\n"
-" <br/>\n"
-" <br/>\n"
-" <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
-"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
-"background-repeat: repeat no-repeat;\">\n"
-" <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
-"#FFF;\">\n"
-" <strong style=\"text-"
-"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
-" </div>\n"
-" <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
-"16px; background-color: #F2F2F2;\">\n"
-" <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
-" % if object.company_id.street:\n"
-" ${object.company_id.street}<br/>\n"
-" % endif\n"
-" % if object.company_id.street2:\n"
-" ${object.company_id.street2}<br/>\n"
-" % endif\n"
-" % if object.company_id.city or object.company_id.zip:\n"
-" ${object.company_id.zip} ${object.company_id.city}<br/>\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 ''}<br/>\n"
-" % endif\n"
-" </span>\n"
-" % if object.company_id.phone:\n"
-" <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
-"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
-"0px; padding-left: 0px; \">\n"
-" Phone:&nbsp; ${object.company_id.phone}\n"
-" </div>\n"
-" % endif\n"
-" % if object.company_id.website:\n"
-" <div>\n"
-" Web :&nbsp;<a "
-"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
-" </div>\n"
-" %endif\n"
-" <p></p>\n"
-" </div>\n"
-"</div>\n"
-" "
-msgstr ""
-
-#. module: purchase
#: model:ir.actions.act_window,name:purchase.action_purchase_order_by_user_all
msgid "Total Orders by User per month"
msgstr ""
@@ -2079,21 +2060,19 @@ msgid "Based on incoming shipments"
msgstr ""
#. module: purchase
+#: code:addons/purchase/purchase.py:1018
+#, python-format
+msgid "No default supplier defined for this product"
+msgstr ""
+
+#. module: purchase
#: view:purchase.report:0
#: field:purchase.report,warehouse_id:0
msgid "Warehouse"
msgstr "창고"
#. module: purchase
-#: help:purchase.order,partner_ref:0
-msgid ""
-"Reference of the sale order or quotation sent by your supplier. It's mainly "
-"used to do the matching when you receive the products as this reference is "
-"usually written on the delivery order sent by your supplier."
-msgstr ""
-
-#. module: purchase
-#: code:addons/purchase/purchase.py:991
+#: code:addons/purchase/purchase.py:960
#, python-format
msgid ""
"The selected supplier has a minimal quantity set to %s %s, you should not "
@@ -2166,8 +2145,8 @@ msgid ""
msgstr ""
#. module: purchase
-#: view:product.product:0
-msgid "When you sell this service to a customer,"
+#: field:purchase.order,message_summary:0
+msgid "Summary"
msgstr ""
#. module: purchase
@@ -2177,6 +2156,11 @@ msgid "Pricelist Versions"
msgstr ""
#. module: purchase
+#: field:purchase.order,payment_term_id:0
+msgid "Payment Term"
+msgstr ""
+
+#. module: purchase
#: view:purchase.order:0
msgid "Purchase orders which are in draft state"
msgstr ""
diff --git a/addons/purchase/i18n/lt.po b/addons/purchase/i18n/lt.po
index c38cb805acf..b5214864b74 100644
--- a/addons/purchase/i18n/lt.po
+++ b/addons/purchase/i18n/lt.po
@@ -6,15 +6,15 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
"PO-Revision-Date: 2012-05-10 18:09+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: 2012-12-04 05:12+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:19+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
#. module: purchase
#: model:res.groups,name:purchase.group_analytic_accounting
@@ -58,11 +58,6 @@ msgid ""
msgstr ""
#. module: purchase
-#: model:ir.actions.server,name:purchase.actions_server_purchase_order_read
-msgid "Purchase: Mark read"
-msgstr ""
-
-#. module: purchase
#: view:purchase.report:0
#: field:purchase.report,day:0
msgid "Day"
@@ -103,16 +98,13 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:973
-#: code:addons/purchase/purchase.py:988
-#: code:addons/purchase/purchase.py:991
-#: code:addons/purchase/wizard/purchase_order_group.py:47
+#: code:addons/purchase/purchase.py:1024
#, python-format
-msgid "Warning!"
+msgid "Configuration Error!"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:573
+#: code:addons/purchase/purchase.py:587
#, python-format
msgid "You must first cancel all receptions related to this purchase order."
msgstr ""
@@ -129,10 +121,10 @@ msgid "Purchase-Standard Price"
msgstr ""
#. module: purchase
-#: report:purchase.order:0
-#: field:purchase.report,validator:0
-msgid "Validated By"
-msgstr "Patvirtintas"
+#: code:addons/purchase/purchase.py:1011
+#, python-format
+msgid "No supplier defined for this product !"
+msgstr ""
#. module: purchase
#: model:ir.actions.act_window,help:purchase.action_picking_tree4_picking_to_invoice
@@ -155,12 +147,6 @@ msgid "Average Price"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:830
-#, python-format
-msgid "Invoice <b>paid</b>."
-msgstr ""
-
-#. module: purchase
#: view:purchase.order:0
msgid "Purchase order which are in the exception state"
msgstr ""
@@ -230,7 +216,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:255
+#: code:addons/purchase/purchase.py:260
#, python-format
msgid "In order to delete a purchase order, you must cancel it first."
msgstr ""
@@ -256,29 +242,12 @@ msgid "Total Untaxed amount"
msgstr ""
#. module: purchase
-#: model:ir.ui.menu,name:purchase.menu_purchase_uom_categ_form_action
-msgid "Unit of Measure Categories"
-msgstr ""
-
-#. module: purchase
#: view:purchase.report:0
#: field:purchase.report,category_id:0
msgid "Category"
msgstr ""
#. module: purchase
-#: view:purchase.order:0
-msgid "Quotation "
-msgstr ""
-
-#. module: purchase
-#: code:addons/purchase/purchase.py:810
-#, python-format
-msgid ""
-"Quotation for <em>%s</em> <b>converted</b> to a Purchase Order of %s %s."
-msgstr ""
-
-#. module: purchase
#: model:process.transition,note:purchase.process_transition_purchaseinvoice0
msgid ""
"A purchase order generates a supplier invoice, as soon as it is confirmed by "
@@ -343,14 +312,16 @@ msgid "October"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:837
+#: code:addons/purchase/purchase.py:1024
#, python-format
-msgid "Purchase Order for <em>%s</em> <b>cancelled</b>."
+msgid ""
+"The product \"%s\" has been defined with your company as reseller which "
+"seems to be a configuration error!"
msgstr ""
#. module: purchase
-#: field:purchase.order,message_summary:0
-msgid "Summary"
+#: view:product.product:0
+msgid "When you sell this service to a customer,"
msgstr ""
#. module: purchase
@@ -379,12 +350,6 @@ msgid "Quantity"
msgstr "Kiekis"
#. module: purchase
-#: code:addons/purchase/purchase.py:819
-#, python-format
-msgid "Shipment <em>%s</em> <b>scheduled</b> for %s."
-msgstr ""
-
-#. module: purchase
#: field:purchase.order,fiscal_position:0
msgid "Fiscal Position"
msgstr "Fiskalinė pozicija"
@@ -442,12 +407,6 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:824
-#, python-format
-msgid "Draft Invoice of %s %s is <b>waiting for validation</b>."
-msgstr ""
-
-#. module: purchase
#: model:ir.actions.act_window,help:purchase.purchase_line_form_action2
msgid ""
"<p>\n"
@@ -468,6 +427,11 @@ msgid "Scheduled Date"
msgstr ""
#. module: purchase
+#: field:purchase.order,currency_id:0
+msgid "Currency"
+msgstr ""
+
+#. module: purchase
#: field:purchase.order,journal_id:0
msgid "Journal"
msgstr ""
@@ -500,6 +464,19 @@ msgid "Incoming Products"
msgstr ""
#. module: purchase
+#: view:purchase.order:0
+msgid "Request for Quotation "
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,partner_ref:0
+msgid ""
+"Reference of the sales order or quotation sent by your supplier. It's mainly "
+"used to do the matching when you receive the products as this reference is "
+"usually written on the delivery order sent by your supplier."
+msgstr ""
+
+#. module: purchase
#: view:purchase.config.settings:0
#: view:purchase.order.group:0
#: view:purchase.order.line_invoice:0
@@ -520,6 +497,11 @@ msgid ""
msgstr ""
#. module: purchase
+#: model:mail.message.subtype,name:purchase.mt_rfq_approved
+msgid "RFQ Approved"
+msgstr ""
+
+#. module: purchase
#: view:purchase.config.settings:0
msgid "Apply"
msgstr ""
@@ -537,6 +519,11 @@ msgid ""
msgstr ""
#. module: purchase
+#: model:mail.message.subtype,name:purchase.mt_rfq_confirmed
+msgid "RFQ Confirmed"
+msgstr ""
+
+#. module: purchase
#: view:purchase.order:0
msgid "Customer Address"
msgstr ""
@@ -561,7 +548,7 @@ msgid "Supplier"
msgstr "Tiekėjas"
#. module: purchase
-#: code:addons/purchase/purchase.py:508
+#: code:addons/purchase/purchase.py:525
#, python-format
msgid "Define expense account for this company: \"%s\" (id:%d)."
msgstr ""
@@ -585,7 +572,6 @@ msgstr "Tarpinė suma"
#. module: purchase
#: field:purchase.order,shipped:0
-#: field:purchase.order,shipped_rate:0
msgid "Received"
msgstr "Gauta"
@@ -627,13 +613,20 @@ msgid "Invoices and Receptions"
msgstr ""
#. module: purchase
+#: model:process.transition,note:purchase.process_transition_packinginvoice0
+msgid ""
+"A Pick list generates an invoice. Depending on the Invoicing control of the "
+"sales order, the invoice is based on delivered or on ordered quantities."
+msgstr ""
+
+#. module: purchase
#: view:purchase.report:0
#: field:purchase.report,nbr:0
msgid "# of Lines"
msgstr ""
#. module: purchase
-#: code:addons/purchase/wizard/purchase_line_invoice.py:110
+#: code:addons/purchase/wizard/purchase_line_invoice.py:106
#, python-format
msgid "Define expense account for this product: \"%s\" (id:%d)."
msgstr ""
@@ -654,8 +647,8 @@ msgid "It indicates that a picking has been done"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:565
-#: code:addons/purchase/purchase.py:572
+#: code:addons/purchase/purchase.py:579
+#: code:addons/purchase/purchase.py:586
#, python-format
msgid "Unable to cancel this purchase order."
msgstr ""
@@ -718,6 +711,15 @@ msgid "Draft PO"
msgstr ""
#. module: purchase
+#: code:addons/purchase/purchase.py:941
+#: code:addons/purchase/purchase.py:956
+#: code:addons/purchase/purchase.py:960
+#: code:addons/purchase/wizard/purchase_order_group.py:47
+#, python-format
+msgid "Warning!"
+msgstr ""
+
+#. module: purchase
#: model:process.node,name:purchase.process_node_draftpurchaseorder0
#: model:process.node,name:purchase.process_node_draftpurchaseorder1
msgid "RFQ"
@@ -749,6 +751,11 @@ msgid "The tax amount"
msgstr ""
#. module: purchase
+#: field:purchase.order,shipped_rate:0
+msgid "Received Ratio"
+msgstr ""
+
+#. module: purchase
#: selection:purchase.report,month:0
msgid "September"
msgstr ""
@@ -780,7 +787,7 @@ msgid "Stock Moves"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1158
+#: code:addons/purchase/purchase.py:1156
#, python-format
msgid "Draft Purchase Order created"
msgstr ""
@@ -801,11 +808,6 @@ msgid "Terms and Conditions"
msgstr ""
#. module: purchase
-#: field:purchase.order,currency_id:0
-msgid "unknown"
-msgstr ""
-
-#. module: purchase
#: help:purchase.order,date_order:0
msgid "Date on which this document has been created."
msgstr ""
@@ -899,12 +901,6 @@ msgid "Cancel"
msgstr "Atšaukti"
#. module: purchase
-#: field:purchase.order,message_comment_ids:0
-#: help:purchase.order,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
-#. module: purchase
#: sql_constraint:purchase.order:0
msgid "Order Reference must be unique per Company!"
msgstr ""
@@ -938,14 +934,89 @@ msgid "Date Approved"
msgstr "Patvirtinimo data"
#. module: purchase
-#: code:addons/purchase/purchase.py:806
-#, python-format
-msgid "Request for quotation <b>created</b>."
+#: view:product.product:0
+msgid "a draft purchase order"
msgstr ""
#. module: purchase
-#: view:product.product:0
-msgid "a draft purchase order"
+#: model:email.template,body_html:purchase.email_template_edi_purchase
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: #FFF; \">\n"
+"\n"
+" <p>Hello$ ${object.partner_id.name},</p>\n"
+" \n"
+" <p>Here is a ${object.state in ('draft', 'sent') and 'request for "
+"quotation' or 'purchase order confirmation'} from ${object.company_id.name}: "
+"</p>\n"
+" \n"
+" <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
+" &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
+" &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
+" &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
+"${object.pricelist_id.currency_id.name}</strong><br />\n"
+" &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
+" % if object.origin:\n"
+" &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
+" % endif\n"
+" % if object.partner_ref:\n"
+" &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
+" % endif\n"
+" % if object.validator:\n"
+" &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.validator.email "
+"or ''}?subject=Order%20${object.name}\">${object.validator.name}</a>\n"
+" % endif\n"
+" </p>\n"
+"\n"
+" <br/>\n"
+" <p>If you have any question, do not hesitate to contact us.</p>\n"
+" <p>Thank you!</p>\n"
+" <br/>\n"
+" <br/>\n"
+" <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
+"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
+"background-repeat: repeat no-repeat;\">\n"
+" <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
+"#DDD;\">\n"
+" <strong style=\"text-"
+"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
+" </div>\n"
+" <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
+"16px; background-color: #F2F2F2;\">\n"
+" <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
+" % if object.company_id.street:\n"
+" ${object.company_id.street}<br/>\n"
+" % endif\n"
+" % if object.company_id.street2:\n"
+" ${object.company_id.street2}<br/>\n"
+" % endif\n"
+" % if object.company_id.city or object.company_id.zip:\n"
+" ${object.company_id.zip} ${object.company_id.city}<br/>\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 ''}<br/>\n"
+" % endif\n"
+" </span>\n"
+" % if object.company_id.phone:\n"
+" <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
+"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
+"0px; padding-left: 0px; \">\n"
+" Phone:&nbsp; ${object.company_id.phone}\n"
+" </div>\n"
+" % endif\n"
+" % if object.company_id.website:\n"
+" <div>\n"
+" Web :&nbsp;<a "
+"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
+" </div>\n"
+" %endif\n"
+" <p></p>\n"
+" </div>\n"
+"</div>\n"
+" "
msgstr ""
#. module: purchase
@@ -985,17 +1056,12 @@ msgid "Outgoing Mails"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:437
+#: code:addons/purchase/purchase.py:456
#, python-format
msgid "You cannot confirm a purchase order without any purchase order line."
msgstr ""
#. module: purchase
-#: model:ir.actions.server,name:purchase.actions_server_purchase_order_unread
-msgid "Purchase: Mark unread"
-msgstr ""
-
-#. module: purchase
#: help:purchase.order,message_ids:0
msgid "Messages and communication history"
msgstr ""
@@ -1007,7 +1073,7 @@ msgid "Destination Warehouse"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:973
+#: code:addons/purchase/purchase.py:941
#, python-format
msgid ""
"Selected Unit of Measure does not belong to the same category as the product "
@@ -1015,6 +1081,11 @@ msgid ""
msgstr ""
#. module: purchase
+#: view:purchase.order.line_invoice:0
+msgid "Select an Open Sales Order"
+msgstr ""
+
+#. module: purchase
#: model:ir.ui.menu,name:purchase.menu_purchase_unit_measure_purchase
#: model:ir.ui.menu,name:purchase.menu_purchase_uom_form_action
msgid "Units of Measure"
@@ -1026,18 +1097,12 @@ msgid "Manage pricelist per supplier"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:833
-#, python-format
-msgid "Purchase Order has been set to <b>draft</b>."
-msgstr ""
-
-#. module: purchase
#: view:board.board:0
msgid "Purchase Dashboard"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:566
+#: code:addons/purchase/purchase.py:580
#, python-format
msgid "First cancel all receptions related to this purchase order."
msgstr ""
@@ -1076,8 +1141,8 @@ msgid "Unread Messages"
msgstr ""
#. module: purchase
-#: view:purchase.order.line_invoice:0
-msgid "Select an Open Sale Order"
+#: model:ir.ui.menu,name:purchase.menu_purchase_uom_categ_form_action
+msgid "Unit of Measure Categories"
msgstr ""
#. module: purchase
@@ -1086,6 +1151,13 @@ msgid "Set to Draft"
msgstr "Nustatyti kaip juodraštį"
#. module: purchase
+#: help:purchase.order,origin:0
+msgid ""
+"Reference of the document that generated this purchase order request; a "
+"sales order or an internal procurement request."
+msgstr ""
+
+#. module: purchase
#: view:purchase.order.line:0
msgid "Notes"
msgstr "Pastabos"
@@ -1115,7 +1187,7 @@ msgid "Stock Move"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:255
+#: code:addons/purchase/purchase.py:260
#, python-format
msgid "Invalid Action!"
msgstr ""
@@ -1214,7 +1286,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:310
+#: code:addons/purchase/purchase.py:320
#, python-format
msgid "Please create Invoices."
msgstr ""
@@ -1304,7 +1376,7 @@ msgid "Purchase Order Line Make Invoice"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1133
+#: code:addons/purchase/purchase.py:1141
#, python-format
msgid "PO: %s"
msgstr ""
@@ -1315,7 +1387,7 @@ msgid "Send by EMail"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:498
+#: code:addons/purchase/purchase.py:515
#, python-format
msgid "Define purchase journal for this company: \"%s\" (id:%d)."
msgstr ""
@@ -1326,8 +1398,8 @@ msgid "Purchase Order "
msgstr ""
#. module: purchase
-#: view:purchase.order.line:0
-msgid "Manual Invoices"
+#: help:purchase.config.settings,group_costing_method:0
+msgid "Allows you to compute product cost price based on average cost."
msgstr ""
#. module: purchase
@@ -1482,8 +1554,8 @@ msgid "Compute product cost price based on average cost"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:340
-#: code:addons/purchase/wizard/purchase_line_invoice.py:141
+#: code:addons/purchase/purchase.py:350
+#: code:addons/purchase/wizard/purchase_line_invoice.py:137
#: model:ir.actions.act_window,name:purchase.act_res_partner_2_supplier_invoices
#: view:res.partner:0
#, python-format
@@ -1595,8 +1667,9 @@ msgid "Open Purchase Menu"
msgstr ""
#. module: purchase
-#: model:ir.model,name:purchase.model_mail_compose_message
-msgid "Email composition wizard"
+#: code:addons/purchase/purchase.py:1028
+#, python-format
+msgid "No address defined for the supplier"
msgstr ""
#. module: purchase
@@ -1669,11 +1742,11 @@ msgid "Purchase Order"
msgstr "Pirkimo užsakymas"
#. module: purchase
-#: code:addons/purchase/purchase.py:310
-#: code:addons/purchase/purchase.py:437
-#: code:addons/purchase/purchase.py:497
-#: code:addons/purchase/purchase.py:508
-#: code:addons/purchase/wizard/purchase_line_invoice.py:109
+#: code:addons/purchase/purchase.py:320
+#: code:addons/purchase/purchase.py:456
+#: code:addons/purchase/purchase.py:514
+#: code:addons/purchase/purchase.py:525
+#: code:addons/purchase/wizard/purchase_line_invoice.py:105
#, python-format
msgid "Error!"
msgstr ""
@@ -1695,13 +1768,6 @@ msgid ""
msgstr ""
#. module: purchase
-#: model:process.transition,note:purchase.process_transition_packinginvoice0
-msgid ""
-"A Pick list generates an invoice. Depending on the Invoicing control of the "
-"sale order, the invoice is based on delivered or on ordered quantities."
-msgstr ""
-
-#. module: purchase
#: selection:purchase.order,state:0
#: selection:purchase.order.line,state:0
#: selection:purchase.report,state:0
@@ -1714,9 +1780,8 @@ msgid "# of Purchase Order"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:827
-#, python-format
-msgid "Shipment <b>received</b>."
+#: model:ir.model,name:purchase.model_mail_compose_message
+msgid "Email composition wizard"
msgstr ""
#. module: purchase
@@ -1800,7 +1865,7 @@ msgid "RFQ_${(object.name or '').replace('/','_')}"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:988
+#: code:addons/purchase/purchase.py:956
#, python-format
msgid "The selected supplier only sells this product by %s"
msgstr ""
@@ -1846,6 +1911,12 @@ msgid "Outgoing products to invoice"
msgstr ""
#. module: purchase
+#: report:purchase.order:0
+#: field:purchase.report,validator:0
+msgid "Validated By"
+msgstr "Patvirtintas"
+
+#. module: purchase
#: view:purchase.report:0
#: field:purchase.report,delay_pass:0
msgid "Days to Deliver"
@@ -1935,8 +2006,8 @@ msgid "November"
msgstr ""
#. module: purchase
-#: help:purchase.config.settings,group_costing_method:0
-msgid "Allows you to compute product cost price based on average cost."
+#: view:purchase.order.line:0
+msgid "Manual Invoices"
msgstr ""
#. module: purchase
@@ -1960,13 +2031,6 @@ msgid ""
msgstr ""
#. module: purchase
-#: help:purchase.order,origin:0
-msgid ""
-"Reference of the document that generated this purchase order request; a sale "
-"order or an internal procurement request."
-msgstr ""
-
-#. module: purchase
#: model:ir.ui.menu,name:purchase.menu_partner_categories_in_form
msgid "Partner Categories"
msgstr ""
@@ -1987,89 +2051,6 @@ msgid "Invoicing Settings"
msgstr ""
#. module: purchase
-#: model:email.template,body_html:purchase.email_template_edi_purchase
-msgid ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"\n"
-" <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
-"or ''},</p>\n"
-" \n"
-" <p>Here is a ${object.state in ('draft', 'sent') and 'request for "
-"quotation' or 'purchase order confirmation'} from ${object.company_id.name}: "
-"</p>\n"
-" \n"
-" <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
-" &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
-" &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
-" &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
-"${object.pricelist_id.currency_id.name}</strong><br />\n"
-" &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
-" % if object.origin:\n"
-" &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
-" % endif\n"
-" % if object.partner_ref:\n"
-" &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
-" % endif\n"
-" % if object.validator:\n"
-" &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.validator.email "
-"or ''}?subject=Order%20${object.name}\">${object.validator.name}</a>\n"
-" % endif\n"
-" </p>\n"
-"\n"
-" <br/>\n"
-" <p>If you have any question, do not hesitate to contact us.</p>\n"
-" <p>Thank you!</p>\n"
-" <br/>\n"
-" <br/>\n"
-" <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
-"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
-"background-repeat: repeat no-repeat;\">\n"
-" <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
-"#FFF;\">\n"
-" <strong style=\"text-"
-"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
-" </div>\n"
-" <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
-"16px; background-color: #F2F2F2;\">\n"
-" <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
-" % if object.company_id.street:\n"
-" ${object.company_id.street}<br/>\n"
-" % endif\n"
-" % if object.company_id.street2:\n"
-" ${object.company_id.street2}<br/>\n"
-" % endif\n"
-" % if object.company_id.city or object.company_id.zip:\n"
-" ${object.company_id.zip} ${object.company_id.city}<br/>\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 ''}<br/>\n"
-" % endif\n"
-" </span>\n"
-" % if object.company_id.phone:\n"
-" <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
-"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
-"0px; padding-left: 0px; \">\n"
-" Phone:&nbsp; ${object.company_id.phone}\n"
-" </div>\n"
-" % endif\n"
-" % if object.company_id.website:\n"
-" <div>\n"
-" Web :&nbsp;<a "
-"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
-" </div>\n"
-" %endif\n"
-" <p></p>\n"
-" </div>\n"
-"</div>\n"
-" "
-msgstr ""
-
-#. module: purchase
#: model:ir.actions.act_window,name:purchase.action_purchase_order_by_user_all
msgid "Total Orders by User per month"
msgstr ""
@@ -2080,21 +2061,19 @@ msgid "Based on incoming shipments"
msgstr ""
#. module: purchase
+#: code:addons/purchase/purchase.py:1018
+#, python-format
+msgid "No default supplier defined for this product"
+msgstr ""
+
+#. module: purchase
#: view:purchase.report:0
#: field:purchase.report,warehouse_id:0
msgid "Warehouse"
msgstr "Sandėlis"
#. module: purchase
-#: help:purchase.order,partner_ref:0
-msgid ""
-"Reference of the sale order or quotation sent by your supplier. It's mainly "
-"used to do the matching when you receive the products as this reference is "
-"usually written on the delivery order sent by your supplier."
-msgstr ""
-
-#. module: purchase
-#: code:addons/purchase/purchase.py:991
+#: code:addons/purchase/purchase.py:960
#, python-format
msgid ""
"The selected supplier has a minimal quantity set to %s %s, you should not "
@@ -2167,8 +2146,8 @@ msgid ""
msgstr ""
#. module: purchase
-#: view:product.product:0
-msgid "When you sell this service to a customer,"
+#: field:purchase.order,message_summary:0
+msgid "Summary"
msgstr ""
#. module: purchase
@@ -2178,6 +2157,11 @@ msgid "Pricelist Versions"
msgstr ""
#. module: purchase
+#: field:purchase.order,payment_term_id:0
+msgid "Payment Term"
+msgstr ""
+
+#. module: purchase
#: view:purchase.order:0
msgid "Purchase orders which are in draft state"
msgstr ""
diff --git a/addons/purchase/i18n/lv.po b/addons/purchase/i18n/lv.po
index 8b781b6b96d..4a5e4d9f651 100644
--- a/addons/purchase/i18n/lv.po
+++ b/addons/purchase/i18n/lv.po
@@ -7,15 +7,15 @@ msgid ""
msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
"PO-Revision-Date: 2012-10-16 16:24+0000\n"
"Last-Translator: Vladimirs Kuzmins <Unknown>\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: 2012-12-04 05:12+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:19+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
#. module: purchase
#: model:res.groups,name:purchase.group_analytic_accounting
@@ -61,11 +61,6 @@ msgstr ""
"produktu/daudzumu un piegādes cenu."
#. module: purchase
-#: model:ir.actions.server,name:purchase.actions_server_purchase_order_read
-msgid "Purchase: Mark read"
-msgstr ""
-
-#. module: purchase
#: view:purchase.report:0
#: field:purchase.report,day:0
msgid "Day"
@@ -106,16 +101,13 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:973
-#: code:addons/purchase/purchase.py:988
-#: code:addons/purchase/purchase.py:991
-#: code:addons/purchase/wizard/purchase_order_group.py:47
+#: code:addons/purchase/purchase.py:1024
#, python-format
-msgid "Warning!"
+msgid "Configuration Error!"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:573
+#: code:addons/purchase/purchase.py:587
#, python-format
msgid "You must first cancel all receptions related to this purchase order."
msgstr ""
@@ -132,10 +124,10 @@ msgid "Purchase-Standard Price"
msgstr "Iepirkuma Standarta Cena"
#. module: purchase
-#: report:purchase.order:0
-#: field:purchase.report,validator:0
-msgid "Validated By"
-msgstr "Apstiprināja"
+#: code:addons/purchase/purchase.py:1011
+#, python-format
+msgid "No supplier defined for this product !"
+msgstr ""
#. module: purchase
#: model:ir.actions.act_window,help:purchase.action_picking_tree4_picking_to_invoice
@@ -158,12 +150,6 @@ msgid "Average Price"
msgstr "Vidējā Cena"
#. module: purchase
-#: code:addons/purchase/purchase.py:830
-#, python-format
-msgid "Invoice <b>paid</b>."
-msgstr ""
-
-#. module: purchase
#: view:purchase.order:0
msgid "Purchase order which are in the exception state"
msgstr ""
@@ -233,7 +219,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:255
+#: code:addons/purchase/purchase.py:260
#, python-format
msgid "In order to delete a purchase order, you must cancel it first."
msgstr ""
@@ -259,29 +245,12 @@ msgid "Total Untaxed amount"
msgstr "Summa bez Nodokļiem kopā"
#. module: purchase
-#: model:ir.ui.menu,name:purchase.menu_purchase_uom_categ_form_action
-msgid "Unit of Measure Categories"
-msgstr ""
-
-#. module: purchase
#: view:purchase.report:0
#: field:purchase.report,category_id:0
msgid "Category"
msgstr "Kategorija"
#. module: purchase
-#: view:purchase.order:0
-msgid "Quotation "
-msgstr ""
-
-#. module: purchase
-#: code:addons/purchase/purchase.py:810
-#, python-format
-msgid ""
-"Quotation for <em>%s</em> <b>converted</b> to a Purchase Order of %s %s."
-msgstr ""
-
-#. module: purchase
#: model:process.transition,note:purchase.process_transition_purchaseinvoice0
msgid ""
"A purchase order generates a supplier invoice, as soon as it is confirmed by "
@@ -346,14 +315,16 @@ msgid "October"
msgstr "Oktobris"
#. module: purchase
-#: code:addons/purchase/purchase.py:837
+#: code:addons/purchase/purchase.py:1024
#, python-format
-msgid "Purchase Order for <em>%s</em> <b>cancelled</b>."
+msgid ""
+"The product \"%s\" has been defined with your company as reseller which "
+"seems to be a configuration error!"
msgstr ""
#. module: purchase
-#: field:purchase.order,message_summary:0
-msgid "Summary"
+#: view:product.product:0
+msgid "When you sell this service to a customer,"
msgstr ""
#. module: purchase
@@ -383,12 +354,6 @@ msgid "Quantity"
msgstr "Skaits"
#. module: purchase
-#: code:addons/purchase/purchase.py:819
-#, python-format
-msgid "Shipment <em>%s</em> <b>scheduled</b> for %s."
-msgstr ""
-
-#. module: purchase
#: field:purchase.order,fiscal_position:0
msgid "Fiscal Position"
msgstr "Nodokļu Profils"
@@ -446,12 +411,6 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:824
-#, python-format
-msgid "Draft Invoice of %s %s is <b>waiting for validation</b>."
-msgstr ""
-
-#. module: purchase
#: model:ir.actions.act_window,help:purchase.purchase_line_form_action2
msgid ""
"<p>\n"
@@ -472,6 +431,11 @@ msgid "Scheduled Date"
msgstr "Ieplānotais Datums"
#. module: purchase
+#: field:purchase.order,currency_id:0
+msgid "Currency"
+msgstr ""
+
+#. module: purchase
#: field:purchase.order,journal_id:0
msgid "Journal"
msgstr ""
@@ -504,6 +468,19 @@ msgid "Incoming Products"
msgstr ""
#. module: purchase
+#: view:purchase.order:0
+msgid "Request for Quotation "
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,partner_ref:0
+msgid ""
+"Reference of the sales order or quotation sent by your supplier. It's mainly "
+"used to do the matching when you receive the products as this reference is "
+"usually written on the delivery order sent by your supplier."
+msgstr ""
+
+#. module: purchase
#: view:purchase.config.settings:0
#: view:purchase.order.group:0
#: view:purchase.order.line_invoice:0
@@ -524,6 +501,11 @@ msgid ""
msgstr ""
#. module: purchase
+#: model:mail.message.subtype,name:purchase.mt_rfq_approved
+msgid "RFQ Approved"
+msgstr ""
+
+#. module: purchase
#: view:purchase.config.settings:0
msgid "Apply"
msgstr ""
@@ -543,6 +525,11 @@ msgstr ""
"tāme kļūst par apstiprinātu Iepirkumu."
#. module: purchase
+#: model:mail.message.subtype,name:purchase.mt_rfq_confirmed
+msgid "RFQ Confirmed"
+msgstr ""
+
+#. module: purchase
#: view:purchase.order:0
msgid "Customer Address"
msgstr ""
@@ -567,7 +554,7 @@ msgid "Supplier"
msgstr "Piegādātājs"
#. module: purchase
-#: code:addons/purchase/purchase.py:508
+#: code:addons/purchase/purchase.py:525
#, python-format
msgid "Define expense account for this company: \"%s\" (id:%d)."
msgstr ""
@@ -591,7 +578,6 @@ msgstr "Apakšsumma kopā"
#. module: purchase
#: field:purchase.order,shipped:0
-#: field:purchase.order,shipped_rate:0
msgid "Received"
msgstr "Saņemts"
@@ -633,13 +619,20 @@ msgid "Invoices and Receptions"
msgstr ""
#. module: purchase
+#: model:process.transition,note:purchase.process_transition_packinginvoice0
+msgid ""
+"A Pick list generates an invoice. Depending on the Invoicing control of the "
+"sales order, the invoice is based on delivered or on ordered quantities."
+msgstr ""
+
+#. module: purchase
#: view:purchase.report:0
#: field:purchase.report,nbr:0
msgid "# of Lines"
msgstr "Rindu skaits"
#. module: purchase
-#: code:addons/purchase/wizard/purchase_line_invoice.py:110
+#: code:addons/purchase/wizard/purchase_line_invoice.py:106
#, python-format
msgid "Define expense account for this product: \"%s\" (id:%d)."
msgstr ""
@@ -660,8 +653,8 @@ msgid "It indicates that a picking has been done"
msgstr "Parāda, ka komplektācija ir pabeigta"
#. module: purchase
-#: code:addons/purchase/purchase.py:565
-#: code:addons/purchase/purchase.py:572
+#: code:addons/purchase/purchase.py:579
+#: code:addons/purchase/purchase.py:586
#, python-format
msgid "Unable to cancel this purchase order."
msgstr ""
@@ -724,6 +717,15 @@ msgid "Draft PO"
msgstr ""
#. module: purchase
+#: code:addons/purchase/purchase.py:941
+#: code:addons/purchase/purchase.py:956
+#: code:addons/purchase/purchase.py:960
+#: code:addons/purchase/wizard/purchase_order_group.py:47
+#, python-format
+msgid "Warning!"
+msgstr ""
+
+#. module: purchase
#: model:process.node,name:purchase.process_node_draftpurchaseorder0
#: model:process.node,name:purchase.process_node_draftpurchaseorder1
msgid "RFQ"
@@ -755,6 +757,11 @@ msgid "The tax amount"
msgstr "Nodokļa Summa"
#. module: purchase
+#: field:purchase.order,shipped_rate:0
+msgid "Received Ratio"
+msgstr ""
+
+#. module: purchase
#: selection:purchase.report,month:0
msgid "September"
msgstr "Septembris"
@@ -786,7 +793,7 @@ msgid "Stock Moves"
msgstr "Preču kustība Noliktavā"
#. module: purchase
-#: code:addons/purchase/purchase.py:1158
+#: code:addons/purchase/purchase.py:1156
#, python-format
msgid "Draft Purchase Order created"
msgstr ""
@@ -807,11 +814,6 @@ msgid "Terms and Conditions"
msgstr ""
#. module: purchase
-#: field:purchase.order,currency_id:0
-msgid "unknown"
-msgstr ""
-
-#. module: purchase
#: help:purchase.order,date_order:0
msgid "Date on which this document has been created."
msgstr "Datums, kurā izveidots dokuments."
@@ -905,12 +907,6 @@ msgid "Cancel"
msgstr "Atcelt"
#. module: purchase
-#: field:purchase.order,message_comment_ids:0
-#: help:purchase.order,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
-#. module: purchase
#: sql_constraint:purchase.order:0
msgid "Order Reference must be unique per Company!"
msgstr ""
@@ -944,14 +940,89 @@ msgid "Date Approved"
msgstr "Datums, kurā apstiprināts"
#. module: purchase
-#: code:addons/purchase/purchase.py:806
-#, python-format
-msgid "Request for quotation <b>created</b>."
+#: view:product.product:0
+msgid "a draft purchase order"
msgstr ""
#. module: purchase
-#: view:product.product:0
-msgid "a draft purchase order"
+#: model:email.template,body_html:purchase.email_template_edi_purchase
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: #FFF; \">\n"
+"\n"
+" <p>Hello$ ${object.partner_id.name},</p>\n"
+" \n"
+" <p>Here is a ${object.state in ('draft', 'sent') and 'request for "
+"quotation' or 'purchase order confirmation'} from ${object.company_id.name}: "
+"</p>\n"
+" \n"
+" <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
+" &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
+" &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
+" &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
+"${object.pricelist_id.currency_id.name}</strong><br />\n"
+" &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
+" % if object.origin:\n"
+" &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
+" % endif\n"
+" % if object.partner_ref:\n"
+" &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
+" % endif\n"
+" % if object.validator:\n"
+" &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.validator.email "
+"or ''}?subject=Order%20${object.name}\">${object.validator.name}</a>\n"
+" % endif\n"
+" </p>\n"
+"\n"
+" <br/>\n"
+" <p>If you have any question, do not hesitate to contact us.</p>\n"
+" <p>Thank you!</p>\n"
+" <br/>\n"
+" <br/>\n"
+" <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
+"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
+"background-repeat: repeat no-repeat;\">\n"
+" <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
+"#DDD;\">\n"
+" <strong style=\"text-"
+"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
+" </div>\n"
+" <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
+"16px; background-color: #F2F2F2;\">\n"
+" <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
+" % if object.company_id.street:\n"
+" ${object.company_id.street}<br/>\n"
+" % endif\n"
+" % if object.company_id.street2:\n"
+" ${object.company_id.street2}<br/>\n"
+" % endif\n"
+" % if object.company_id.city or object.company_id.zip:\n"
+" ${object.company_id.zip} ${object.company_id.city}<br/>\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 ''}<br/>\n"
+" % endif\n"
+" </span>\n"
+" % if object.company_id.phone:\n"
+" <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
+"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
+"0px; padding-left: 0px; \">\n"
+" Phone:&nbsp; ${object.company_id.phone}\n"
+" </div>\n"
+" % endif\n"
+" % if object.company_id.website:\n"
+" <div>\n"
+" Web :&nbsp;<a "
+"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
+" </div>\n"
+" %endif\n"
+" <p></p>\n"
+" </div>\n"
+"</div>\n"
+" "
msgstr ""
#. module: purchase
@@ -991,17 +1062,12 @@ msgid "Outgoing Mails"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:437
+#: code:addons/purchase/purchase.py:456
#, python-format
msgid "You cannot confirm a purchase order without any purchase order line."
msgstr ""
#. module: purchase
-#: model:ir.actions.server,name:purchase.actions_server_purchase_order_unread
-msgid "Purchase: Mark unread"
-msgstr ""
-
-#. module: purchase
#: help:purchase.order,message_ids:0
msgid "Messages and communication history"
msgstr ""
@@ -1013,7 +1079,7 @@ msgid "Destination Warehouse"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:973
+#: code:addons/purchase/purchase.py:941
#, python-format
msgid ""
"Selected Unit of Measure does not belong to the same category as the product "
@@ -1021,6 +1087,11 @@ msgid ""
msgstr ""
#. module: purchase
+#: view:purchase.order.line_invoice:0
+msgid "Select an Open Sales Order"
+msgstr ""
+
+#. module: purchase
#: model:ir.ui.menu,name:purchase.menu_purchase_unit_measure_purchase
#: model:ir.ui.menu,name:purchase.menu_purchase_uom_form_action
msgid "Units of Measure"
@@ -1032,18 +1103,12 @@ msgid "Manage pricelist per supplier"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:833
-#, python-format
-msgid "Purchase Order has been set to <b>draft</b>."
-msgstr ""
-
-#. module: purchase
#: view:board.board:0
msgid "Purchase Dashboard"
msgstr "Iepirkumu Rīku Panelis"
#. module: purchase
-#: code:addons/purchase/purchase.py:566
+#: code:addons/purchase/purchase.py:580
#, python-format
msgid "First cancel all receptions related to this purchase order."
msgstr ""
@@ -1082,9 +1147,9 @@ msgid "Unread Messages"
msgstr ""
#. module: purchase
-#: view:purchase.order.line_invoice:0
-msgid "Select an Open Sale Order"
-msgstr "Izvēlēties Aktīvu Pasūtījumu"
+#: model:ir.ui.menu,name:purchase.menu_purchase_uom_categ_form_action
+msgid "Unit of Measure Categories"
+msgstr ""
#. module: purchase
#: view:purchase.order:0
@@ -1092,6 +1157,13 @@ msgid "Set to Draft"
msgstr "Atzīmēt kā Melnrakstu"
#. module: purchase
+#: help:purchase.order,origin:0
+msgid ""
+"Reference of the document that generated this purchase order request; a "
+"sales order or an internal procurement request."
+msgstr ""
+
+#. module: purchase
#: view:purchase.order.line:0
msgid "Notes"
msgstr "Piezīmes"
@@ -1121,7 +1193,7 @@ msgid "Stock Move"
msgstr "Noliktavas Grāmatojums"
#. module: purchase
-#: code:addons/purchase/purchase.py:255
+#: code:addons/purchase/purchase.py:260
#, python-format
msgid "Invalid Action!"
msgstr ""
@@ -1220,7 +1292,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:310
+#: code:addons/purchase/purchase.py:320
#, python-format
msgid "Please create Invoices."
msgstr ""
@@ -1310,7 +1382,7 @@ msgid "Purchase Order Line Make Invoice"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1133
+#: code:addons/purchase/purchase.py:1141
#, python-format
msgid "PO: %s"
msgstr ""
@@ -1321,7 +1393,7 @@ msgid "Send by EMail"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:498
+#: code:addons/purchase/purchase.py:515
#, python-format
msgid "Define purchase journal for this company: \"%s\" (id:%d)."
msgstr ""
@@ -1332,9 +1404,9 @@ msgid "Purchase Order "
msgstr ""
#. module: purchase
-#: view:purchase.order.line:0
-msgid "Manual Invoices"
-msgstr "Manuālie Rēķini"
+#: help:purchase.config.settings,group_costing_method:0
+msgid "Allows you to compute product cost price based on average cost."
+msgstr ""
#. module: purchase
#: model:ir.actions.act_window,name:purchase.action_purchase_configuration
@@ -1488,8 +1560,8 @@ msgid "Compute product cost price based on average cost"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:340
-#: code:addons/purchase/wizard/purchase_line_invoice.py:141
+#: code:addons/purchase/purchase.py:350
+#: code:addons/purchase/wizard/purchase_line_invoice.py:137
#: model:ir.actions.act_window,name:purchase.act_res_partner_2_supplier_invoices
#: view:res.partner:0
#, python-format
@@ -1601,8 +1673,9 @@ msgid "Open Purchase Menu"
msgstr ""
#. module: purchase
-#: model:ir.model,name:purchase.model_mail_compose_message
-msgid "Email composition wizard"
+#: code:addons/purchase/purchase.py:1028
+#, python-format
+msgid "No address defined for the supplier"
msgstr ""
#. module: purchase
@@ -1673,11 +1746,11 @@ msgid "Purchase Order"
msgstr "Iepirkums"
#. module: purchase
-#: code:addons/purchase/purchase.py:310
-#: code:addons/purchase/purchase.py:437
-#: code:addons/purchase/purchase.py:497
-#: code:addons/purchase/purchase.py:508
-#: code:addons/purchase/wizard/purchase_line_invoice.py:109
+#: code:addons/purchase/purchase.py:320
+#: code:addons/purchase/purchase.py:456
+#: code:addons/purchase/purchase.py:514
+#: code:addons/purchase/purchase.py:525
+#: code:addons/purchase/wizard/purchase_line_invoice.py:105
#, python-format
msgid "Error!"
msgstr ""
@@ -1699,13 +1772,6 @@ msgid ""
msgstr ""
#. module: purchase
-#: model:process.transition,note:purchase.process_transition_packinginvoice0
-msgid ""
-"A Pick list generates an invoice. Depending on the Invoicing control of the "
-"sale order, the invoice is based on delivered or on ordered quantities."
-msgstr ""
-
-#. module: purchase
#: selection:purchase.order,state:0
#: selection:purchase.order.line,state:0
#: selection:purchase.report,state:0
@@ -1718,9 +1784,8 @@ msgid "# of Purchase Order"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:827
-#, python-format
-msgid "Shipment <b>received</b>."
+#: model:ir.model,name:purchase.model_mail_compose_message
+msgid "Email composition wizard"
msgstr ""
#. module: purchase
@@ -1804,7 +1869,7 @@ msgid "RFQ_${(object.name or '').replace('/','_')}"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:988
+#: code:addons/purchase/purchase.py:956
#, python-format
msgid "The selected supplier only sells this product by %s"
msgstr "Izvēlētais piegādātājs produktu pārdod tikai pēc %s"
@@ -1850,6 +1915,12 @@ msgid "Outgoing products to invoice"
msgstr "Izejošie produkti, par kuriem piestādīt rēķinu"
#. module: purchase
+#: report:purchase.order:0
+#: field:purchase.report,validator:0
+msgid "Validated By"
+msgstr "Apstiprināja"
+
+#. module: purchase
#: view:purchase.report:0
#: field:purchase.report,delay_pass:0
msgid "Days to Deliver"
@@ -1939,9 +2010,9 @@ msgid "November"
msgstr "Novembris"
#. module: purchase
-#: help:purchase.config.settings,group_costing_method:0
-msgid "Allows you to compute product cost price based on average cost."
-msgstr ""
+#: view:purchase.order.line:0
+msgid "Manual Invoices"
+msgstr "Manuālie Rēķini"
#. module: purchase
#: report:purchase.order:0
@@ -1964,13 +2035,6 @@ msgid ""
msgstr ""
#. module: purchase
-#: help:purchase.order,origin:0
-msgid ""
-"Reference of the document that generated this purchase order request; a sale "
-"order or an internal procurement request."
-msgstr ""
-
-#. module: purchase
#: model:ir.ui.menu,name:purchase.menu_partner_categories_in_form
msgid "Partner Categories"
msgstr ""
@@ -1991,89 +2055,6 @@ msgid "Invoicing Settings"
msgstr ""
#. module: purchase
-#: model:email.template,body_html:purchase.email_template_edi_purchase
-msgid ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"\n"
-" <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
-"or ''},</p>\n"
-" \n"
-" <p>Here is a ${object.state in ('draft', 'sent') and 'request for "
-"quotation' or 'purchase order confirmation'} from ${object.company_id.name}: "
-"</p>\n"
-" \n"
-" <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
-" &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
-" &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
-" &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
-"${object.pricelist_id.currency_id.name}</strong><br />\n"
-" &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
-" % if object.origin:\n"
-" &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
-" % endif\n"
-" % if object.partner_ref:\n"
-" &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
-" % endif\n"
-" % if object.validator:\n"
-" &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.validator.email "
-"or ''}?subject=Order%20${object.name}\">${object.validator.name}</a>\n"
-" % endif\n"
-" </p>\n"
-"\n"
-" <br/>\n"
-" <p>If you have any question, do not hesitate to contact us.</p>\n"
-" <p>Thank you!</p>\n"
-" <br/>\n"
-" <br/>\n"
-" <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
-"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
-"background-repeat: repeat no-repeat;\">\n"
-" <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
-"#FFF;\">\n"
-" <strong style=\"text-"
-"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
-" </div>\n"
-" <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
-"16px; background-color: #F2F2F2;\">\n"
-" <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
-" % if object.company_id.street:\n"
-" ${object.company_id.street}<br/>\n"
-" % endif\n"
-" % if object.company_id.street2:\n"
-" ${object.company_id.street2}<br/>\n"
-" % endif\n"
-" % if object.company_id.city or object.company_id.zip:\n"
-" ${object.company_id.zip} ${object.company_id.city}<br/>\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 ''}<br/>\n"
-" % endif\n"
-" </span>\n"
-" % if object.company_id.phone:\n"
-" <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
-"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
-"0px; padding-left: 0px; \">\n"
-" Phone:&nbsp; ${object.company_id.phone}\n"
-" </div>\n"
-" % endif\n"
-" % if object.company_id.website:\n"
-" <div>\n"
-" Web :&nbsp;<a "
-"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
-" </div>\n"
-" %endif\n"
-" <p></p>\n"
-" </div>\n"
-"</div>\n"
-" "
-msgstr ""
-
-#. module: purchase
#: model:ir.actions.act_window,name:purchase.action_purchase_order_by_user_all
msgid "Total Orders by User per month"
msgstr "Pasūtījumi kopā pēc lietotāja pa mēnešiem"
@@ -2084,21 +2065,19 @@ msgid "Based on incoming shipments"
msgstr ""
#. module: purchase
+#: code:addons/purchase/purchase.py:1018
+#, python-format
+msgid "No default supplier defined for this product"
+msgstr ""
+
+#. module: purchase
#: view:purchase.report:0
#: field:purchase.report,warehouse_id:0
msgid "Warehouse"
msgstr "Noliktava"
#. module: purchase
-#: help:purchase.order,partner_ref:0
-msgid ""
-"Reference of the sale order or quotation sent by your supplier. It's mainly "
-"used to do the matching when you receive the products as this reference is "
-"usually written on the delivery order sent by your supplier."
-msgstr ""
-
-#. module: purchase
-#: code:addons/purchase/purchase.py:991
+#: code:addons/purchase/purchase.py:960
#, python-format
msgid ""
"The selected supplier has a minimal quantity set to %s %s, you should not "
@@ -2171,8 +2150,8 @@ msgid ""
msgstr ""
#. module: purchase
-#: view:product.product:0
-msgid "When you sell this service to a customer,"
+#: field:purchase.order,message_summary:0
+msgid "Summary"
msgstr ""
#. module: purchase
@@ -2182,6 +2161,11 @@ msgid "Pricelist Versions"
msgstr "Cenrāža Versijas"
#. module: purchase
+#: field:purchase.order,payment_term_id:0
+msgid "Payment Term"
+msgstr ""
+
+#. module: purchase
#: view:purchase.order:0
msgid "Purchase orders which are in draft state"
msgstr ""
@@ -2345,6 +2329,9 @@ msgstr "Pasūtījumi"
#~ msgid "No Pricelist !"
#~ msgstr "Nav Cenrāža!"
+#~ msgid "Select an Open Sale Order"
+#~ msgstr "Izvēlēties Aktīvu Pasūtījumu"
+
#~ msgid "Reference UoM"
#~ msgstr "Atsauces Mērv."
diff --git a/addons/purchase/i18n/mn.po b/addons/purchase/i18n/mn.po
index 208edcbf7cf..3b8e9718e9f 100644
--- a/addons/purchase/i18n/mn.po
+++ b/addons/purchase/i18n/mn.po
@@ -6,15 +6,15 @@ msgid ""
msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
"PO-Revision-Date: 2012-06-20 04:05+0000\n"
"Last-Translator: Khulan Altangerel <khulancomp@gmail.com>\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: 2012-12-04 05:12+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:19+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
#. module: purchase
#: model:res.groups,name:purchase.group_analytic_accounting
@@ -60,11 +60,6 @@ msgstr ""
"бараа/тоо ширхэг дээр үндэслэн нийлүүлэгчийн үнийг тооцоолно."
#. module: purchase
-#: model:ir.actions.server,name:purchase.actions_server_purchase_order_read
-msgid "Purchase: Mark read"
-msgstr ""
-
-#. module: purchase
#: view:purchase.report:0
#: field:purchase.report,day:0
msgid "Day"
@@ -105,16 +100,13 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:973
-#: code:addons/purchase/purchase.py:988
-#: code:addons/purchase/purchase.py:991
-#: code:addons/purchase/wizard/purchase_order_group.py:47
+#: code:addons/purchase/purchase.py:1024
#, python-format
-msgid "Warning!"
+msgid "Configuration Error!"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:573
+#: code:addons/purchase/purchase.py:587
#, python-format
msgid "You must first cancel all receptions related to this purchase order."
msgstr ""
@@ -133,10 +125,10 @@ msgid "Purchase-Standard Price"
msgstr "Худалдан авалтын стандарт үнэ"
#. module: purchase
-#: report:purchase.order:0
-#: field:purchase.report,validator:0
-msgid "Validated By"
-msgstr "Баталсан"
+#: code:addons/purchase/purchase.py:1011
+#, python-format
+msgid "No supplier defined for this product !"
+msgstr ""
#. module: purchase
#: model:ir.actions.act_window,help:purchase.action_picking_tree4_picking_to_invoice
@@ -159,12 +151,6 @@ msgid "Average Price"
msgstr "Дундаж үнэ"
#. module: purchase
-#: code:addons/purchase/purchase.py:830
-#, python-format
-msgid "Invoice <b>paid</b>."
-msgstr ""
-
-#. module: purchase
#: view:purchase.order:0
msgid "Purchase order which are in the exception state"
msgstr "Худалдан авах захиалга сондгой төлөвт байна."
@@ -235,7 +221,7 @@ msgstr ""
"Захиалгын мөрүүдээс хамгийн ойрын огноог сонгож энэ огноог тооцоолно."
#. module: purchase
-#: code:addons/purchase/purchase.py:255
+#: code:addons/purchase/purchase.py:260
#, python-format
msgid "In order to delete a purchase order, you must cancel it first."
msgstr ""
@@ -261,29 +247,12 @@ msgid "Total Untaxed amount"
msgstr "Нийт татваргүй хэмжээ"
#. module: purchase
-#: model:ir.ui.menu,name:purchase.menu_purchase_uom_categ_form_action
-msgid "Unit of Measure Categories"
-msgstr ""
-
-#. module: purchase
#: view:purchase.report:0
#: field:purchase.report,category_id:0
msgid "Category"
msgstr "Ангилал"
#. module: purchase
-#: view:purchase.order:0
-msgid "Quotation "
-msgstr ""
-
-#. module: purchase
-#: code:addons/purchase/purchase.py:810
-#, python-format
-msgid ""
-"Quotation for <em>%s</em> <b>converted</b> to a Purchase Order of %s %s."
-msgstr ""
-
-#. module: purchase
#: model:process.transition,note:purchase.process_transition_purchaseinvoice0
msgid ""
"A purchase order generates a supplier invoice, as soon as it is confirmed by "
@@ -351,14 +320,16 @@ msgid "October"
msgstr "10 сар"
#. module: purchase
-#: code:addons/purchase/purchase.py:837
+#: code:addons/purchase/purchase.py:1024
#, python-format
-msgid "Purchase Order for <em>%s</em> <b>cancelled</b>."
+msgid ""
+"The product \"%s\" has been defined with your company as reseller which "
+"seems to be a configuration error!"
msgstr ""
#. module: purchase
-#: field:purchase.order,message_summary:0
-msgid "Summary"
+#: view:product.product:0
+msgid "When you sell this service to a customer,"
msgstr ""
#. module: purchase
@@ -387,12 +358,6 @@ msgid "Quantity"
msgstr "Тоо ширхэг"
#. module: purchase
-#: code:addons/purchase/purchase.py:819
-#, python-format
-msgid "Shipment <em>%s</em> <b>scheduled</b> for %s."
-msgstr ""
-
-#. module: purchase
#: field:purchase.order,fiscal_position:0
msgid "Fiscal Position"
msgstr "Санхүүгийн харгалзаа"
@@ -450,12 +415,6 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:824
-#, python-format
-msgid "Draft Invoice of %s %s is <b>waiting for validation</b>."
-msgstr ""
-
-#. module: purchase
#: model:ir.actions.act_window,help:purchase.purchase_line_form_action2
msgid ""
"<p>\n"
@@ -476,6 +435,11 @@ msgid "Scheduled Date"
msgstr "Төлөвлөгдсөн огноо"
#. module: purchase
+#: field:purchase.order,currency_id:0
+msgid "Currency"
+msgstr ""
+
+#. module: purchase
#: field:purchase.order,journal_id:0
msgid "Journal"
msgstr "Журнал"
@@ -508,6 +472,19 @@ msgid "Incoming Products"
msgstr ""
#. module: purchase
+#: view:purchase.order:0
+msgid "Request for Quotation "
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,partner_ref:0
+msgid ""
+"Reference of the sales order or quotation sent by your supplier. It's mainly "
+"used to do the matching when you receive the products as this reference is "
+"usually written on the delivery order sent by your supplier."
+msgstr ""
+
+#. module: purchase
#: view:purchase.config.settings:0
#: view:purchase.order.group:0
#: view:purchase.order.line_invoice:0
@@ -531,6 +508,11 @@ msgstr ""
"(Нэхэмжлэл хяналт = Гараар)."
#. module: purchase
+#: model:mail.message.subtype,name:purchase.mt_rfq_approved
+msgid "RFQ Approved"
+msgstr ""
+
+#. module: purchase
#: view:purchase.config.settings:0
msgid "Apply"
msgstr ""
@@ -550,6 +532,11 @@ msgstr ""
"ёстой. Үнийн саналын хүсэлт нь Худалдан Авах Захиалга болж хувирна."
#. module: purchase
+#: model:mail.message.subtype,name:purchase.mt_rfq_confirmed
+msgid "RFQ Confirmed"
+msgstr ""
+
+#. module: purchase
#: view:purchase.order:0
msgid "Customer Address"
msgstr ""
@@ -574,7 +561,7 @@ msgid "Supplier"
msgstr "Нийлүүлэгч"
#. module: purchase
-#: code:addons/purchase/purchase.py:508
+#: code:addons/purchase/purchase.py:525
#, python-format
msgid "Define expense account for this company: \"%s\" (id:%d)."
msgstr ""
@@ -598,7 +585,6 @@ msgstr "Дэд дүн"
#. module: purchase
#: field:purchase.order,shipped:0
-#: field:purchase.order,shipped_rate:0
msgid "Received"
msgstr "Ирсэн"
@@ -640,13 +626,20 @@ msgid "Invoices and Receptions"
msgstr ""
#. module: purchase
+#: model:process.transition,note:purchase.process_transition_packinginvoice0
+msgid ""
+"A Pick list generates an invoice. Depending on the Invoicing control of the "
+"sales order, the invoice is based on delivered or on ordered quantities."
+msgstr ""
+
+#. module: purchase
#: view:purchase.report:0
#: field:purchase.report,nbr:0
msgid "# of Lines"
msgstr "# Мөрийн"
#. module: purchase
-#: code:addons/purchase/wizard/purchase_line_invoice.py:110
+#: code:addons/purchase/wizard/purchase_line_invoice.py:106
#, python-format
msgid "Define expense account for this product: \"%s\" (id:%d)."
msgstr ""
@@ -667,8 +660,8 @@ msgid "It indicates that a picking has been done"
msgstr "Энэ нь барааг бүрэн хүлээж авсан эсэхийг илэрхийлнэ"
#. module: purchase
-#: code:addons/purchase/purchase.py:565
-#: code:addons/purchase/purchase.py:572
+#: code:addons/purchase/purchase.py:579
+#: code:addons/purchase/purchase.py:586
#, python-format
msgid "Unable to cancel this purchase order."
msgstr ""
@@ -733,6 +726,15 @@ msgid "Draft PO"
msgstr ""
#. module: purchase
+#: code:addons/purchase/purchase.py:941
+#: code:addons/purchase/purchase.py:956
+#: code:addons/purchase/purchase.py:960
+#: code:addons/purchase/wizard/purchase_order_group.py:47
+#, python-format
+msgid "Warning!"
+msgstr ""
+
+#. module: purchase
#: model:process.node,name:purchase.process_node_draftpurchaseorder0
#: model:process.node,name:purchase.process_node_draftpurchaseorder1
msgid "RFQ"
@@ -764,6 +766,11 @@ msgid "The tax amount"
msgstr "Татварын хэмжээ"
#. module: purchase
+#: field:purchase.order,shipped_rate:0
+msgid "Received Ratio"
+msgstr ""
+
+#. module: purchase
#: selection:purchase.report,month:0
msgid "September"
msgstr "9 сар"
@@ -795,7 +802,7 @@ msgid "Stock Moves"
msgstr "Барааны хөдөлгөөн"
#. module: purchase
-#: code:addons/purchase/purchase.py:1158
+#: code:addons/purchase/purchase.py:1156
#, python-format
msgid "Draft Purchase Order created"
msgstr ""
@@ -816,11 +823,6 @@ msgid "Terms and Conditions"
msgstr ""
#. module: purchase
-#: field:purchase.order,currency_id:0
-msgid "unknown"
-msgstr ""
-
-#. module: purchase
#: help:purchase.order,date_order:0
msgid "Date on which this document has been created."
msgstr "Энэ баримт үүссэн огноо."
@@ -914,12 +916,6 @@ msgid "Cancel"
msgstr "Цуцлах"
#. module: purchase
-#: field:purchase.order,message_comment_ids:0
-#: help:purchase.order,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
-#. module: purchase
#: sql_constraint:purchase.order:0
msgid "Order Reference must be unique per Company!"
msgstr "Захиалгын код компанийн хэмжээнд үл давхцах байх ёстой!"
@@ -953,14 +949,89 @@ msgid "Date Approved"
msgstr "Зөвшөөрсөн огноо"
#. module: purchase
-#: code:addons/purchase/purchase.py:806
-#, python-format
-msgid "Request for quotation <b>created</b>."
+#: view:product.product:0
+msgid "a draft purchase order"
msgstr ""
#. module: purchase
-#: view:product.product:0
-msgid "a draft purchase order"
+#: model:email.template,body_html:purchase.email_template_edi_purchase
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: #FFF; \">\n"
+"\n"
+" <p>Hello$ ${object.partner_id.name},</p>\n"
+" \n"
+" <p>Here is a ${object.state in ('draft', 'sent') and 'request for "
+"quotation' or 'purchase order confirmation'} from ${object.company_id.name}: "
+"</p>\n"
+" \n"
+" <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
+" &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
+" &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
+" &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
+"${object.pricelist_id.currency_id.name}</strong><br />\n"
+" &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
+" % if object.origin:\n"
+" &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
+" % endif\n"
+" % if object.partner_ref:\n"
+" &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
+" % endif\n"
+" % if object.validator:\n"
+" &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.validator.email "
+"or ''}?subject=Order%20${object.name}\">${object.validator.name}</a>\n"
+" % endif\n"
+" </p>\n"
+"\n"
+" <br/>\n"
+" <p>If you have any question, do not hesitate to contact us.</p>\n"
+" <p>Thank you!</p>\n"
+" <br/>\n"
+" <br/>\n"
+" <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
+"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
+"background-repeat: repeat no-repeat;\">\n"
+" <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
+"#DDD;\">\n"
+" <strong style=\"text-"
+"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
+" </div>\n"
+" <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
+"16px; background-color: #F2F2F2;\">\n"
+" <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
+" % if object.company_id.street:\n"
+" ${object.company_id.street}<br/>\n"
+" % endif\n"
+" % if object.company_id.street2:\n"
+" ${object.company_id.street2}<br/>\n"
+" % endif\n"
+" % if object.company_id.city or object.company_id.zip:\n"
+" ${object.company_id.zip} ${object.company_id.city}<br/>\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 ''}<br/>\n"
+" % endif\n"
+" </span>\n"
+" % if object.company_id.phone:\n"
+" <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
+"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
+"0px; padding-left: 0px; \">\n"
+" Phone:&nbsp; ${object.company_id.phone}\n"
+" </div>\n"
+" % endif\n"
+" % if object.company_id.website:\n"
+" <div>\n"
+" Web :&nbsp;<a "
+"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
+" </div>\n"
+" %endif\n"
+" <p></p>\n"
+" </div>\n"
+"</div>\n"
+" "
msgstr ""
#. module: purchase
@@ -1003,17 +1074,12 @@ msgid "Outgoing Mails"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:437
+#: code:addons/purchase/purchase.py:456
#, python-format
msgid "You cannot confirm a purchase order without any purchase order line."
msgstr ""
#. module: purchase
-#: model:ir.actions.server,name:purchase.actions_server_purchase_order_unread
-msgid "Purchase: Mark unread"
-msgstr ""
-
-#. module: purchase
#: help:purchase.order,message_ids:0
msgid "Messages and communication history"
msgstr ""
@@ -1025,7 +1091,7 @@ msgid "Destination Warehouse"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:973
+#: code:addons/purchase/purchase.py:941
#, python-format
msgid ""
"Selected Unit of Measure does not belong to the same category as the product "
@@ -1033,6 +1099,11 @@ msgid ""
msgstr ""
#. module: purchase
+#: view:purchase.order.line_invoice:0
+msgid "Select an Open Sales Order"
+msgstr ""
+
+#. module: purchase
#: model:ir.ui.menu,name:purchase.menu_purchase_unit_measure_purchase
#: model:ir.ui.menu,name:purchase.menu_purchase_uom_form_action
msgid "Units of Measure"
@@ -1044,18 +1115,12 @@ msgid "Manage pricelist per supplier"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:833
-#, python-format
-msgid "Purchase Order has been set to <b>draft</b>."
-msgstr ""
-
-#. module: purchase
#: view:board.board:0
msgid "Purchase Dashboard"
msgstr "Худалдан авалт"
#. module: purchase
-#: code:addons/purchase/purchase.py:566
+#: code:addons/purchase/purchase.py:580
#, python-format
msgid "First cancel all receptions related to this purchase order."
msgstr ""
@@ -1094,9 +1159,9 @@ msgid "Unread Messages"
msgstr ""
#. module: purchase
-#: view:purchase.order.line_invoice:0
-msgid "Select an Open Sale Order"
-msgstr "Нээлттэй борлуулалтын захиалга сонгох"
+#: model:ir.ui.menu,name:purchase.menu_purchase_uom_categ_form_action
+msgid "Unit of Measure Categories"
+msgstr ""
#. module: purchase
#: view:purchase.order:0
@@ -1104,6 +1169,13 @@ msgid "Set to Draft"
msgstr "Ноороглох"
#. module: purchase
+#: help:purchase.order,origin:0
+msgid ""
+"Reference of the document that generated this purchase order request; a "
+"sales order or an internal procurement request."
+msgstr ""
+
+#. module: purchase
#: view:purchase.order.line:0
msgid "Notes"
msgstr "Тэмдэглэл"
@@ -1133,7 +1205,7 @@ msgid "Stock Move"
msgstr "Агуулахын хөдөлгөөн"
#. module: purchase
-#: code:addons/purchase/purchase.py:255
+#: code:addons/purchase/purchase.py:260
#, python-format
msgid "Invalid Action!"
msgstr ""
@@ -1235,7 +1307,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:310
+#: code:addons/purchase/purchase.py:320
#, python-format
msgid "Please create Invoices."
msgstr ""
@@ -1326,7 +1398,7 @@ msgid "Purchase Order Line Make Invoice"
msgstr "Худалдан авалтын захиалгын мөрний нэхэмжлэл бэлдэх"
#. module: purchase
-#: code:addons/purchase/purchase.py:1133
+#: code:addons/purchase/purchase.py:1141
#, python-format
msgid "PO: %s"
msgstr "ХАЗ: %s"
@@ -1337,7 +1409,7 @@ msgid "Send by EMail"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:498
+#: code:addons/purchase/purchase.py:515
#, python-format
msgid "Define purchase journal for this company: \"%s\" (id:%d)."
msgstr ""
@@ -1348,9 +1420,9 @@ msgid "Purchase Order "
msgstr ""
#. module: purchase
-#: view:purchase.order.line:0
-msgid "Manual Invoices"
-msgstr "Нэхэмжлэх заавар"
+#: help:purchase.config.settings,group_costing_method:0
+msgid "Allows you to compute product cost price based on average cost."
+msgstr ""
#. module: purchase
#: model:ir.actions.act_window,name:purchase.action_purchase_configuration
@@ -1504,8 +1576,8 @@ msgid "Compute product cost price based on average cost"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:340
-#: code:addons/purchase/wizard/purchase_line_invoice.py:141
+#: code:addons/purchase/purchase.py:350
+#: code:addons/purchase/wizard/purchase_line_invoice.py:137
#: model:ir.actions.act_window,name:purchase.act_res_partner_2_supplier_invoices
#: view:res.partner:0
#, python-format
@@ -1617,8 +1689,9 @@ msgid "Open Purchase Menu"
msgstr ""
#. module: purchase
-#: model:ir.model,name:purchase.model_mail_compose_message
-msgid "Email composition wizard"
+#: code:addons/purchase/purchase.py:1028
+#, python-format
+msgid "No address defined for the supplier"
msgstr ""
#. module: purchase
@@ -1691,11 +1764,11 @@ msgid "Purchase Order"
msgstr "Худалдан авах захиалга"
#. module: purchase
-#: code:addons/purchase/purchase.py:310
-#: code:addons/purchase/purchase.py:437
-#: code:addons/purchase/purchase.py:497
-#: code:addons/purchase/purchase.py:508
-#: code:addons/purchase/wizard/purchase_line_invoice.py:109
+#: code:addons/purchase/purchase.py:320
+#: code:addons/purchase/purchase.py:456
+#: code:addons/purchase/purchase.py:514
+#: code:addons/purchase/purchase.py:525
+#: code:addons/purchase/wizard/purchase_line_invoice.py:105
#, python-format
msgid "Error!"
msgstr ""
@@ -1717,16 +1790,6 @@ msgid ""
msgstr ""
#. module: purchase
-#: model:process.transition,note:purchase.process_transition_packinginvoice0
-msgid ""
-"A Pick list generates an invoice. Depending on the Invoicing control of the "
-"sale order, the invoice is based on delivered or on ordered quantities."
-msgstr ""
-"Бэлтгэх жагсаалт нь нэхэмжлэлийг үүсгэдэг. Борлуулалтын захиалгын "
-"нэхэмжлэлийг хянах аргаас шалтгаалан хүргэлтээс болон захиалсан тоо "
-"хэмжээнээс нэхэмжлэл үүсдэг."
-
-#. module: purchase
#: selection:purchase.order,state:0
#: selection:purchase.order.line,state:0
#: selection:purchase.report,state:0
@@ -1739,9 +1802,8 @@ msgid "# of Purchase Order"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:827
-#, python-format
-msgid "Shipment <b>received</b>."
+#: model:ir.model,name:purchase.model_mail_compose_message
+msgid "Email composition wizard"
msgstr ""
#. module: purchase
@@ -1831,7 +1893,7 @@ msgid "RFQ_${(object.name or '').replace('/','_')}"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:988
+#: code:addons/purchase/purchase.py:956
#, python-format
msgid "The selected supplier only sells this product by %s"
msgstr "Сонгосон нийлүүлэгч нь энэ барааг зөвхөн %s-р борлуулдаг."
@@ -1877,6 +1939,12 @@ msgid "Outgoing products to invoice"
msgstr "Гарч байгаа нэхэмжлэх бараанууд"
#. module: purchase
+#: report:purchase.order:0
+#: field:purchase.report,validator:0
+msgid "Validated By"
+msgstr "Баталсан"
+
+#. module: purchase
#: view:purchase.report:0
#: field:purchase.report,delay_pass:0
msgid "Days to Deliver"
@@ -1966,9 +2034,9 @@ msgid "November"
msgstr "11 сар"
#. module: purchase
-#: help:purchase.config.settings,group_costing_method:0
-msgid "Allows you to compute product cost price based on average cost."
-msgstr ""
+#: view:purchase.order.line:0
+msgid "Manual Invoices"
+msgstr "Нэхэмжлэх заавар"
#. module: purchase
#: report:purchase.order:0
@@ -1991,13 +2059,6 @@ msgid ""
msgstr ""
#. module: purchase
-#: help:purchase.order,origin:0
-msgid ""
-"Reference of the document that generated this purchase order request; a sale "
-"order or an internal procurement request."
-msgstr ""
-
-#. module: purchase
#: model:ir.ui.menu,name:purchase.menu_partner_categories_in_form
msgid "Partner Categories"
msgstr "Харилцагчийн ангилал"
@@ -2018,89 +2079,6 @@ msgid "Invoicing Settings"
msgstr ""
#. module: purchase
-#: model:email.template,body_html:purchase.email_template_edi_purchase
-msgid ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"\n"
-" <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
-"or ''},</p>\n"
-" \n"
-" <p>Here is a ${object.state in ('draft', 'sent') and 'request for "
-"quotation' or 'purchase order confirmation'} from ${object.company_id.name}: "
-"</p>\n"
-" \n"
-" <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
-" &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
-" &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
-" &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
-"${object.pricelist_id.currency_id.name}</strong><br />\n"
-" &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
-" % if object.origin:\n"
-" &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
-" % endif\n"
-" % if object.partner_ref:\n"
-" &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
-" % endif\n"
-" % if object.validator:\n"
-" &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.validator.email "
-"or ''}?subject=Order%20${object.name}\">${object.validator.name}</a>\n"
-" % endif\n"
-" </p>\n"
-"\n"
-" <br/>\n"
-" <p>If you have any question, do not hesitate to contact us.</p>\n"
-" <p>Thank you!</p>\n"
-" <br/>\n"
-" <br/>\n"
-" <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
-"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
-"background-repeat: repeat no-repeat;\">\n"
-" <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
-"#FFF;\">\n"
-" <strong style=\"text-"
-"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
-" </div>\n"
-" <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
-"16px; background-color: #F2F2F2;\">\n"
-" <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
-" % if object.company_id.street:\n"
-" ${object.company_id.street}<br/>\n"
-" % endif\n"
-" % if object.company_id.street2:\n"
-" ${object.company_id.street2}<br/>\n"
-" % endif\n"
-" % if object.company_id.city or object.company_id.zip:\n"
-" ${object.company_id.zip} ${object.company_id.city}<br/>\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 ''}<br/>\n"
-" % endif\n"
-" </span>\n"
-" % if object.company_id.phone:\n"
-" <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
-"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
-"0px; padding-left: 0px; \">\n"
-" Phone:&nbsp; ${object.company_id.phone}\n"
-" </div>\n"
-" % endif\n"
-" % if object.company_id.website:\n"
-" <div>\n"
-" Web :&nbsp;<a "
-"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
-" </div>\n"
-" %endif\n"
-" <p></p>\n"
-" </div>\n"
-"</div>\n"
-" "
-msgstr ""
-
-#. module: purchase
#: model:ir.actions.act_window,name:purchase.action_purchase_order_by_user_all
msgid "Total Orders by User per month"
msgstr "Нийт захиалга (сар бүр хэрэглэгчээр)"
@@ -2111,21 +2089,19 @@ msgid "Based on incoming shipments"
msgstr ""
#. module: purchase
+#: code:addons/purchase/purchase.py:1018
+#, python-format
+msgid "No default supplier defined for this product"
+msgstr ""
+
+#. module: purchase
#: view:purchase.report:0
#: field:purchase.report,warehouse_id:0
msgid "Warehouse"
msgstr "Агуулах"
#. module: purchase
-#: help:purchase.order,partner_ref:0
-msgid ""
-"Reference of the sale order or quotation sent by your supplier. It's mainly "
-"used to do the matching when you receive the products as this reference is "
-"usually written on the delivery order sent by your supplier."
-msgstr ""
-
-#. module: purchase
-#: code:addons/purchase/purchase.py:991
+#: code:addons/purchase/purchase.py:960
#, python-format
msgid ""
"The selected supplier has a minimal quantity set to %s %s, you should not "
@@ -2210,8 +2186,8 @@ msgstr ""
" "
#. module: purchase
-#: view:product.product:0
-msgid "When you sell this service to a customer,"
+#: field:purchase.order,message_summary:0
+msgid "Summary"
msgstr ""
#. module: purchase
@@ -2221,6 +2197,11 @@ msgid "Pricelist Versions"
msgstr "Үнийн хувилбар"
#. module: purchase
+#: field:purchase.order,payment_term_id:0
+msgid "Payment Term"
+msgstr ""
+
+#. module: purchase
#: view:purchase.order:0
msgid "Purchase orders which are in draft state"
msgstr "Ноорог төлөвтэй худалдан авах захиалгууд"
@@ -2520,6 +2501,9 @@ msgstr "Захиалга"
#~ msgid "No Pricelist !"
#~ msgstr "Үнийн хүснэгтгүй !"
+#~ msgid "Select an Open Sale Order"
+#~ msgstr "Нээлттэй борлуулалтын захиалга сонгох"
+
#~ msgid "Current purchases"
#~ msgstr "Өнөөгийн худалдан авалт"
@@ -2760,6 +2744,14 @@ msgstr "Захиалга"
#~ msgstr "Нэхэмжлэх"
#~ msgid ""
+#~ "A Pick list generates an invoice. Depending on the Invoicing control of the "
+#~ "sale order, the invoice is based on delivered or on ordered quantities."
+#~ msgstr ""
+#~ "Бэлтгэх жагсаалт нь нэхэмжлэлийг үүсгэдэг. Борлуулалтын захиалгын "
+#~ "нэхэмжлэлийг хянах аргаас шалтгаалан хүргэлтээс болон захиалсан тоо "
+#~ "хэмжээнээс нэхэмжлэл үүсдэг."
+
+#~ msgid ""
#~ "You can create a request for quotation when you want to buy products to a "
#~ "supplier but the purchase is not confirmed yet. Use also this menu to review "
#~ "requests for quotation created automatically based on your logistic rules "
diff --git a/addons/purchase/i18n/nb.po b/addons/purchase/i18n/nb.po
index 5616b025609..83425bf0fae 100644
--- a/addons/purchase/i18n/nb.po
+++ b/addons/purchase/i18n/nb.po
@@ -7,15 +7,15 @@ msgid ""
msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
"PO-Revision-Date: 2011-04-01 12:25+0000\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\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: 2012-12-04 05:12+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:19+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
#. module: purchase
#: model:res.groups,name:purchase.group_analytic_accounting
@@ -61,11 +61,6 @@ msgstr ""
"leverandørpris for valgte produkter og mengder."
#. module: purchase
-#: model:ir.actions.server,name:purchase.actions_server_purchase_order_read
-msgid "Purchase: Mark read"
-msgstr ""
-
-#. module: purchase
#: view:purchase.report:0
#: field:purchase.report,day:0
msgid "Day"
@@ -106,16 +101,13 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:973
-#: code:addons/purchase/purchase.py:988
-#: code:addons/purchase/purchase.py:991
-#: code:addons/purchase/wizard/purchase_order_group.py:47
+#: code:addons/purchase/purchase.py:1024
#, python-format
-msgid "Warning!"
+msgid "Configuration Error!"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:573
+#: code:addons/purchase/purchase.py:587
#, python-format
msgid "You must first cancel all receptions related to this purchase order."
msgstr "Du må først kansellere alle mottak knyttet til denne innkjøpsordren"
@@ -132,10 +124,10 @@ msgid "Purchase-Standard Price"
msgstr "Innkjøp-standard pris"
#. module: purchase
-#: report:purchase.order:0
-#: field:purchase.report,validator:0
-msgid "Validated By"
-msgstr "Bekreftet av"
+#: code:addons/purchase/purchase.py:1011
+#, python-format
+msgid "No supplier defined for this product !"
+msgstr ""
#. module: purchase
#: model:ir.actions.act_window,help:purchase.action_picking_tree4_picking_to_invoice
@@ -158,12 +150,6 @@ msgid "Average Price"
msgstr "Gjennomsnittspris"
#. module: purchase
-#: code:addons/purchase/purchase.py:830
-#, python-format
-msgid "Invoice <b>paid</b>."
-msgstr ""
-
-#. module: purchase
#: view:purchase.order:0
msgid "Purchase order which are in the exception state"
msgstr "Innkjøpsordre som har en unntaksstatus"
@@ -235,7 +221,7 @@ msgstr ""
"produkter."
#. module: purchase
-#: code:addons/purchase/purchase.py:255
+#: code:addons/purchase/purchase.py:260
#, python-format
msgid "In order to delete a purchase order, you must cancel it first."
msgstr ""
@@ -262,29 +248,12 @@ msgid "Total Untaxed amount"
msgstr "Totalt ikke avg.ber. beløp"
#. module: purchase
-#: model:ir.ui.menu,name:purchase.menu_purchase_uom_categ_form_action
-msgid "Unit of Measure Categories"
-msgstr ""
-
-#. module: purchase
#: view:purchase.report:0
#: field:purchase.report,category_id:0
msgid "Category"
msgstr "Kategori"
#. module: purchase
-#: view:purchase.order:0
-msgid "Quotation "
-msgstr ""
-
-#. module: purchase
-#: code:addons/purchase/purchase.py:810
-#, python-format
-msgid ""
-"Quotation for <em>%s</em> <b>converted</b> to a Purchase Order of %s %s."
-msgstr ""
-
-#. module: purchase
#: model:process.transition,note:purchase.process_transition_purchaseinvoice0
msgid ""
"A purchase order generates a supplier invoice, as soon as it is confirmed by "
@@ -352,14 +321,16 @@ msgid "October"
msgstr "Oktober"
#. module: purchase
-#: code:addons/purchase/purchase.py:837
+#: code:addons/purchase/purchase.py:1024
#, python-format
-msgid "Purchase Order for <em>%s</em> <b>cancelled</b>."
+msgid ""
+"The product \"%s\" has been defined with your company as reseller which "
+"seems to be a configuration error!"
msgstr ""
#. module: purchase
-#: field:purchase.order,message_summary:0
-msgid "Summary"
+#: view:product.product:0
+msgid "When you sell this service to a customer,"
msgstr ""
#. module: purchase
@@ -388,12 +359,6 @@ msgid "Quantity"
msgstr "Antall"
#. module: purchase
-#: code:addons/purchase/purchase.py:819
-#, python-format
-msgid "Shipment <em>%s</em> <b>scheduled</b> for %s."
-msgstr ""
-
-#. module: purchase
#: field:purchase.order,fiscal_position:0
msgid "Fiscal Position"
msgstr "Regnskapsstatus"
@@ -451,12 +416,6 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:824
-#, python-format
-msgid "Draft Invoice of %s %s is <b>waiting for validation</b>."
-msgstr ""
-
-#. module: purchase
#: model:ir.actions.act_window,help:purchase.purchase_line_form_action2
msgid ""
"<p>\n"
@@ -477,6 +436,11 @@ msgid "Scheduled Date"
msgstr "Planlagt dato"
#. module: purchase
+#: field:purchase.order,currency_id:0
+msgid "Currency"
+msgstr ""
+
+#. module: purchase
#: field:purchase.order,journal_id:0
msgid "Journal"
msgstr "Journal"
@@ -509,6 +473,19 @@ msgid "Incoming Products"
msgstr ""
#. module: purchase
+#: view:purchase.order:0
+msgid "Request for Quotation "
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,partner_ref:0
+msgid ""
+"Reference of the sales order or quotation sent by your supplier. It's mainly "
+"used to do the matching when you receive the products as this reference is "
+"usually written on the delivery order sent by your supplier."
+msgstr ""
+
+#. module: purchase
#: view:purchase.config.settings:0
#: view:purchase.order.group:0
#: view:purchase.order.line_invoice:0
@@ -532,6 +509,11 @@ msgstr ""
"kontroll = Manuell)."
#. module: purchase
+#: model:mail.message.subtype,name:purchase.mt_rfq_approved
+msgid "RFQ Approved"
+msgstr ""
+
+#. module: purchase
#: view:purchase.config.settings:0
msgid "Apply"
msgstr ""
@@ -551,6 +533,11 @@ msgstr ""
"blir en bekreftet innkjøpsordre."
#. module: purchase
+#: model:mail.message.subtype,name:purchase.mt_rfq_confirmed
+msgid "RFQ Confirmed"
+msgstr ""
+
+#. module: purchase
#: view:purchase.order:0
msgid "Customer Address"
msgstr ""
@@ -575,7 +562,7 @@ msgid "Supplier"
msgstr "Leverandør"
#. module: purchase
-#: code:addons/purchase/purchase.py:508
+#: code:addons/purchase/purchase.py:525
#, python-format
msgid "Define expense account for this company: \"%s\" (id:%d)."
msgstr ""
@@ -599,7 +586,6 @@ msgstr "Subtotal"
#. module: purchase
#: field:purchase.order,shipped:0
-#: field:purchase.order,shipped_rate:0
msgid "Received"
msgstr "Mottatt"
@@ -641,13 +627,20 @@ msgid "Invoices and Receptions"
msgstr ""
#. module: purchase
+#: model:process.transition,note:purchase.process_transition_packinginvoice0
+msgid ""
+"A Pick list generates an invoice. Depending on the Invoicing control of the "
+"sales order, the invoice is based on delivered or on ordered quantities."
+msgstr ""
+
+#. module: purchase
#: view:purchase.report:0
#: field:purchase.report,nbr:0
msgid "# of Lines"
msgstr "# linjer"
#. module: purchase
-#: code:addons/purchase/wizard/purchase_line_invoice.py:110
+#: code:addons/purchase/wizard/purchase_line_invoice.py:106
#, python-format
msgid "Define expense account for this product: \"%s\" (id:%d)."
msgstr ""
@@ -668,8 +661,8 @@ msgid "It indicates that a picking has been done"
msgstr "det indikerer at en plukking har blitt utført"
#. module: purchase
-#: code:addons/purchase/purchase.py:565
-#: code:addons/purchase/purchase.py:572
+#: code:addons/purchase/purchase.py:579
+#: code:addons/purchase/purchase.py:586
#, python-format
msgid "Unable to cancel this purchase order."
msgstr ""
@@ -734,6 +727,15 @@ msgid "Draft PO"
msgstr ""
#. module: purchase
+#: code:addons/purchase/purchase.py:941
+#: code:addons/purchase/purchase.py:956
+#: code:addons/purchase/purchase.py:960
+#: code:addons/purchase/wizard/purchase_order_group.py:47
+#, python-format
+msgid "Warning!"
+msgstr ""
+
+#. module: purchase
#: model:process.node,name:purchase.process_node_draftpurchaseorder0
#: model:process.node,name:purchase.process_node_draftpurchaseorder1
msgid "RFQ"
@@ -765,6 +767,11 @@ msgid "The tax amount"
msgstr "Avgiftsbeløp"
#. module: purchase
+#: field:purchase.order,shipped_rate:0
+msgid "Received Ratio"
+msgstr ""
+
+#. module: purchase
#: selection:purchase.report,month:0
msgid "September"
msgstr "September"
@@ -796,7 +803,7 @@ msgid "Stock Moves"
msgstr "Lagerbevegelser"
#. module: purchase
-#: code:addons/purchase/purchase.py:1158
+#: code:addons/purchase/purchase.py:1156
#, python-format
msgid "Draft Purchase Order created"
msgstr ""
@@ -817,11 +824,6 @@ msgid "Terms and Conditions"
msgstr ""
#. module: purchase
-#: field:purchase.order,currency_id:0
-msgid "unknown"
-msgstr ""
-
-#. module: purchase
#: help:purchase.order,date_order:0
msgid "Date on which this document has been created."
msgstr "Dato for når dokumentet er opprettet"
@@ -915,12 +917,6 @@ msgid "Cancel"
msgstr "Annuler"
#. module: purchase
-#: field:purchase.order,message_comment_ids:0
-#: help:purchase.order,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
-#. module: purchase
#: sql_constraint:purchase.order:0
msgid "Order Reference must be unique per Company!"
msgstr "Ordrereferanse må være unik pr. firma!"
@@ -954,14 +950,89 @@ msgid "Date Approved"
msgstr "Godkjent dato"
#. module: purchase
-#: code:addons/purchase/purchase.py:806
-#, python-format
-msgid "Request for quotation <b>created</b>."
+#: view:product.product:0
+msgid "a draft purchase order"
msgstr ""
#. module: purchase
-#: view:product.product:0
-msgid "a draft purchase order"
+#: model:email.template,body_html:purchase.email_template_edi_purchase
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: #FFF; \">\n"
+"\n"
+" <p>Hello$ ${object.partner_id.name},</p>\n"
+" \n"
+" <p>Here is a ${object.state in ('draft', 'sent') and 'request for "
+"quotation' or 'purchase order confirmation'} from ${object.company_id.name}: "
+"</p>\n"
+" \n"
+" <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
+" &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
+" &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
+" &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
+"${object.pricelist_id.currency_id.name}</strong><br />\n"
+" &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
+" % if object.origin:\n"
+" &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
+" % endif\n"
+" % if object.partner_ref:\n"
+" &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
+" % endif\n"
+" % if object.validator:\n"
+" &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.validator.email "
+"or ''}?subject=Order%20${object.name}\">${object.validator.name}</a>\n"
+" % endif\n"
+" </p>\n"
+"\n"
+" <br/>\n"
+" <p>If you have any question, do not hesitate to contact us.</p>\n"
+" <p>Thank you!</p>\n"
+" <br/>\n"
+" <br/>\n"
+" <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
+"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
+"background-repeat: repeat no-repeat;\">\n"
+" <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
+"#DDD;\">\n"
+" <strong style=\"text-"
+"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
+" </div>\n"
+" <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
+"16px; background-color: #F2F2F2;\">\n"
+" <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
+" % if object.company_id.street:\n"
+" ${object.company_id.street}<br/>\n"
+" % endif\n"
+" % if object.company_id.street2:\n"
+" ${object.company_id.street2}<br/>\n"
+" % endif\n"
+" % if object.company_id.city or object.company_id.zip:\n"
+" ${object.company_id.zip} ${object.company_id.city}<br/>\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 ''}<br/>\n"
+" % endif\n"
+" </span>\n"
+" % if object.company_id.phone:\n"
+" <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
+"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
+"0px; padding-left: 0px; \">\n"
+" Phone:&nbsp; ${object.company_id.phone}\n"
+" </div>\n"
+" % endif\n"
+" % if object.company_id.website:\n"
+" <div>\n"
+" Web :&nbsp;<a "
+"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
+" </div>\n"
+" %endif\n"
+" <p></p>\n"
+" </div>\n"
+"</div>\n"
+" "
msgstr ""
#. module: purchase
@@ -1003,17 +1074,12 @@ msgid "Outgoing Mails"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:437
+#: code:addons/purchase/purchase.py:456
#, python-format
msgid "You cannot confirm a purchase order without any purchase order line."
msgstr ""
#. module: purchase
-#: model:ir.actions.server,name:purchase.actions_server_purchase_order_unread
-msgid "Purchase: Mark unread"
-msgstr ""
-
-#. module: purchase
#: help:purchase.order,message_ids:0
msgid "Messages and communication history"
msgstr ""
@@ -1025,7 +1091,7 @@ msgid "Destination Warehouse"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:973
+#: code:addons/purchase/purchase.py:941
#, python-format
msgid ""
"Selected Unit of Measure does not belong to the same category as the product "
@@ -1033,6 +1099,11 @@ msgid ""
msgstr ""
#. module: purchase
+#: view:purchase.order.line_invoice:0
+msgid "Select an Open Sales Order"
+msgstr ""
+
+#. module: purchase
#: model:ir.ui.menu,name:purchase.menu_purchase_unit_measure_purchase
#: model:ir.ui.menu,name:purchase.menu_purchase_uom_form_action
msgid "Units of Measure"
@@ -1044,18 +1115,12 @@ msgid "Manage pricelist per supplier"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:833
-#, python-format
-msgid "Purchase Order has been set to <b>draft</b>."
-msgstr ""
-
-#. module: purchase
#: view:board.board:0
msgid "Purchase Dashboard"
msgstr "Innkjøpskonsoll"
#. module: purchase
-#: code:addons/purchase/purchase.py:566
+#: code:addons/purchase/purchase.py:580
#, python-format
msgid "First cancel all receptions related to this purchase order."
msgstr ""
@@ -1094,9 +1159,9 @@ msgid "Unread Messages"
msgstr ""
#. module: purchase
-#: view:purchase.order.line_invoice:0
-msgid "Select an Open Sale Order"
-msgstr "Velg en åpen salgsordre"
+#: model:ir.ui.menu,name:purchase.menu_purchase_uom_categ_form_action
+msgid "Unit of Measure Categories"
+msgstr ""
#. module: purchase
#: view:purchase.order:0
@@ -1104,6 +1169,13 @@ msgid "Set to Draft"
msgstr "Sett som utkast"
#. module: purchase
+#: help:purchase.order,origin:0
+msgid ""
+"Reference of the document that generated this purchase order request; a "
+"sales order or an internal procurement request."
+msgstr ""
+
+#. module: purchase
#: view:purchase.order.line:0
msgid "Notes"
msgstr "Notater"
@@ -1133,7 +1205,7 @@ msgid "Stock Move"
msgstr "Lagerbevegelser"
#. module: purchase
-#: code:addons/purchase/purchase.py:255
+#: code:addons/purchase/purchase.py:260
#, python-format
msgid "Invalid Action!"
msgstr ""
@@ -1235,7 +1307,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:310
+#: code:addons/purchase/purchase.py:320
#, python-format
msgid "Please create Invoices."
msgstr ""
@@ -1325,7 +1397,7 @@ msgid "Purchase Order Line Make Invoice"
msgstr "Innkjøpsordrelinjer danner faktura"
#. module: purchase
-#: code:addons/purchase/purchase.py:1133
+#: code:addons/purchase/purchase.py:1141
#, python-format
msgid "PO: %s"
msgstr "PO: %s"
@@ -1336,7 +1408,7 @@ msgid "Send by EMail"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:498
+#: code:addons/purchase/purchase.py:515
#, python-format
msgid "Define purchase journal for this company: \"%s\" (id:%d)."
msgstr ""
@@ -1347,9 +1419,9 @@ msgid "Purchase Order "
msgstr ""
#. module: purchase
-#: view:purchase.order.line:0
-msgid "Manual Invoices"
-msgstr "Manuelle fakturaer"
+#: help:purchase.config.settings,group_costing_method:0
+msgid "Allows you to compute product cost price based on average cost."
+msgstr ""
#. module: purchase
#: model:ir.actions.act_window,name:purchase.action_purchase_configuration
@@ -1503,8 +1575,8 @@ msgid "Compute product cost price based on average cost"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:340
-#: code:addons/purchase/wizard/purchase_line_invoice.py:141
+#: code:addons/purchase/purchase.py:350
+#: code:addons/purchase/wizard/purchase_line_invoice.py:137
#: model:ir.actions.act_window,name:purchase.act_res_partner_2_supplier_invoices
#: view:res.partner:0
#, python-format
@@ -1616,8 +1688,9 @@ msgid "Open Purchase Menu"
msgstr ""
#. module: purchase
-#: model:ir.model,name:purchase.model_mail_compose_message
-msgid "Email composition wizard"
+#: code:addons/purchase/purchase.py:1028
+#, python-format
+msgid "No address defined for the supplier"
msgstr ""
#. module: purchase
@@ -1690,11 +1763,11 @@ msgid "Purchase Order"
msgstr "Innkjøpsordre"
#. module: purchase
-#: code:addons/purchase/purchase.py:310
-#: code:addons/purchase/purchase.py:437
-#: code:addons/purchase/purchase.py:497
-#: code:addons/purchase/purchase.py:508
-#: code:addons/purchase/wizard/purchase_line_invoice.py:109
+#: code:addons/purchase/purchase.py:320
+#: code:addons/purchase/purchase.py:456
+#: code:addons/purchase/purchase.py:514
+#: code:addons/purchase/purchase.py:525
+#: code:addons/purchase/wizard/purchase_line_invoice.py:105
#, python-format
msgid "Error!"
msgstr ""
@@ -1716,15 +1789,6 @@ msgid ""
msgstr ""
#. module: purchase
-#: model:process.transition,note:purchase.process_transition_packinginvoice0
-msgid ""
-"A Pick list generates an invoice. Depending on the Invoicing control of the "
-"sale order, the invoice is based on delivered or on ordered quantities."
-msgstr ""
-"En plukkliste danner faktura. Fakturaen baseres enten på levert eller "
-"bestilt antall avhengig av parameter for faktureringsregel på ordren."
-
-#. module: purchase
#: selection:purchase.order,state:0
#: selection:purchase.order.line,state:0
#: selection:purchase.report,state:0
@@ -1737,9 +1801,8 @@ msgid "# of Purchase Order"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:827
-#, python-format
-msgid "Shipment <b>received</b>."
+#: model:ir.model,name:purchase.model_mail_compose_message
+msgid "Email composition wizard"
msgstr ""
#. module: purchase
@@ -1828,7 +1891,7 @@ msgid "RFQ_${(object.name or '').replace('/','_')}"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:988
+#: code:addons/purchase/purchase.py:956
#, python-format
msgid "The selected supplier only sells this product by %s"
msgstr "Den valgte leverandøren selger dette produktet bare som %s"
@@ -1874,6 +1937,12 @@ msgid "Outgoing products to invoice"
msgstr "Utgående produkter til fakturering"
#. module: purchase
+#: report:purchase.order:0
+#: field:purchase.report,validator:0
+msgid "Validated By"
+msgstr "Bekreftet av"
+
+#. module: purchase
#: view:purchase.report:0
#: field:purchase.report,delay_pass:0
msgid "Days to Deliver"
@@ -1963,9 +2032,9 @@ msgid "November"
msgstr "November"
#. module: purchase
-#: help:purchase.config.settings,group_costing_method:0
-msgid "Allows you to compute product cost price based on average cost."
-msgstr ""
+#: view:purchase.order.line:0
+msgid "Manual Invoices"
+msgstr "Manuelle fakturaer"
#. module: purchase
#: report:purchase.order:0
@@ -1988,13 +2057,6 @@ msgid ""
msgstr ""
#. module: purchase
-#: help:purchase.order,origin:0
-msgid ""
-"Reference of the document that generated this purchase order request; a sale "
-"order or an internal procurement request."
-msgstr ""
-
-#. module: purchase
#: model:ir.ui.menu,name:purchase.menu_partner_categories_in_form
msgid "Partner Categories"
msgstr "Partner kategorier"
@@ -2015,89 +2077,6 @@ msgid "Invoicing Settings"
msgstr ""
#. module: purchase
-#: model:email.template,body_html:purchase.email_template_edi_purchase
-msgid ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"\n"
-" <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
-"or ''},</p>\n"
-" \n"
-" <p>Here is a ${object.state in ('draft', 'sent') and 'request for "
-"quotation' or 'purchase order confirmation'} from ${object.company_id.name}: "
-"</p>\n"
-" \n"
-" <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
-" &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
-" &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
-" &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
-"${object.pricelist_id.currency_id.name}</strong><br />\n"
-" &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
-" % if object.origin:\n"
-" &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
-" % endif\n"
-" % if object.partner_ref:\n"
-" &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
-" % endif\n"
-" % if object.validator:\n"
-" &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.validator.email "
-"or ''}?subject=Order%20${object.name}\">${object.validator.name}</a>\n"
-" % endif\n"
-" </p>\n"
-"\n"
-" <br/>\n"
-" <p>If you have any question, do not hesitate to contact us.</p>\n"
-" <p>Thank you!</p>\n"
-" <br/>\n"
-" <br/>\n"
-" <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
-"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
-"background-repeat: repeat no-repeat;\">\n"
-" <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
-"#FFF;\">\n"
-" <strong style=\"text-"
-"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
-" </div>\n"
-" <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
-"16px; background-color: #F2F2F2;\">\n"
-" <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
-" % if object.company_id.street:\n"
-" ${object.company_id.street}<br/>\n"
-" % endif\n"
-" % if object.company_id.street2:\n"
-" ${object.company_id.street2}<br/>\n"
-" % endif\n"
-" % if object.company_id.city or object.company_id.zip:\n"
-" ${object.company_id.zip} ${object.company_id.city}<br/>\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 ''}<br/>\n"
-" % endif\n"
-" </span>\n"
-" % if object.company_id.phone:\n"
-" <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
-"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
-"0px; padding-left: 0px; \">\n"
-" Phone:&nbsp; ${object.company_id.phone}\n"
-" </div>\n"
-" % endif\n"
-" % if object.company_id.website:\n"
-" <div>\n"
-" Web :&nbsp;<a "
-"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
-" </div>\n"
-" %endif\n"
-" <p></p>\n"
-" </div>\n"
-"</div>\n"
-" "
-msgstr ""
-
-#. module: purchase
#: model:ir.actions.act_window,name:purchase.action_purchase_order_by_user_all
msgid "Total Orders by User per month"
msgstr "Totalt antall ordre pr bruker pr månded"
@@ -2108,21 +2087,19 @@ msgid "Based on incoming shipments"
msgstr ""
#. module: purchase
+#: code:addons/purchase/purchase.py:1018
+#, python-format
+msgid "No default supplier defined for this product"
+msgstr ""
+
+#. module: purchase
#: view:purchase.report:0
#: field:purchase.report,warehouse_id:0
msgid "Warehouse"
msgstr "Lager"
#. module: purchase
-#: help:purchase.order,partner_ref:0
-msgid ""
-"Reference of the sale order or quotation sent by your supplier. It's mainly "
-"used to do the matching when you receive the products as this reference is "
-"usually written on the delivery order sent by your supplier."
-msgstr ""
-
-#. module: purchase
-#: code:addons/purchase/purchase.py:991
+#: code:addons/purchase/purchase.py:960
#, python-format
msgid ""
"The selected supplier has a minimal quantity set to %s %s, you should not "
@@ -2207,8 +2184,8 @@ msgstr ""
" "
#. module: purchase
-#: view:product.product:0
-msgid "When you sell this service to a customer,"
+#: field:purchase.order,message_summary:0
+msgid "Summary"
msgstr ""
#. module: purchase
@@ -2218,6 +2195,11 @@ msgid "Pricelist Versions"
msgstr "Prisliste versjoner"
#. module: purchase
+#: field:purchase.order,payment_term_id:0
+msgid "Payment Term"
+msgstr ""
+
+#. module: purchase
#: view:purchase.order:0
msgid "Purchase orders which are in draft state"
msgstr "Innkjøpsordre som er i utkaststatus"
@@ -2267,6 +2249,9 @@ msgstr "Ordre"
#~ msgid "No Pricelist !"
#~ msgstr "Ingen prisliste!"
+#~ msgid "Select an Open Sale Order"
+#~ msgstr "Velg en åpen salgsordre"
+
#~ msgid "Partial Picking"
#~ msgstr "Delvis plukking"
@@ -2689,6 +2674,13 @@ msgstr "Ordre"
#~ msgid "Incoming Shipments already processed"
#~ msgstr "Innkommende leveranse er allerede behandlet"
+#~ msgid ""
+#~ "A Pick list generates an invoice. Depending on the Invoicing control of the "
+#~ "sale order, the invoice is based on delivered or on ordered quantities."
+#~ msgstr ""
+#~ "En plukkliste danner faktura. Fakturaen baseres enten på levert eller "
+#~ "bestilt antall avhengig av parameter for faktureringsregel på ordren."
+
#, python-format
#~ msgid "You must first cancel all invoices related to this purchase order."
#~ msgstr "Du må først annullere alle fakturaer tilhørende innkjøpsordren."
diff --git a/addons/purchase/i18n/nl.po b/addons/purchase/i18n/nl.po
index 98c2cb15999..44186f01101 100644
--- a/addons/purchase/i18n/nl.po
+++ b/addons/purchase/i18n/nl.po
@@ -6,15 +6,15 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
"PO-Revision-Date: 2012-12-09 19:11+0000\n"
"Last-Translator: Erwin van der Ploeg (Endian Solutions) <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: 2012-12-10 04:37+0000\n"
-"X-Generator: Launchpad (build 16341)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:19+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
#. module: purchase
#: model:res.groups,name:purchase.group_analytic_accounting
@@ -60,11 +60,6 @@ msgstr ""
"inkoopprijs voor de geselecteerd producten."
#. module: purchase
-#: model:ir.actions.server,name:purchase.actions_server_purchase_order_read
-msgid "Purchase: Mark read"
-msgstr "Purchase: Markeer als gelezen"
-
-#. module: purchase
#: view:purchase.report:0
#: field:purchase.report,day:0
msgid "Day"
@@ -108,16 +103,13 @@ msgstr ""
"ingevoegd."
#. module: purchase
-#: code:addons/purchase/purchase.py:973
-#: code:addons/purchase/purchase.py:988
-#: code:addons/purchase/purchase.py:991
-#: code:addons/purchase/wizard/purchase_order_group.py:47
+#: code:addons/purchase/purchase.py:1024
#, python-format
-msgid "Warning!"
-msgstr "Waarschuwing!"
+msgid "Configuration Error!"
+msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:573
+#: code:addons/purchase/purchase.py:587
#, python-format
msgid "You must first cancel all receptions related to this purchase order."
msgstr ""
@@ -136,10 +128,10 @@ msgid "Purchase-Standard Price"
msgstr "Inkoop-kostprijs"
#. module: purchase
-#: report:purchase.order:0
-#: field:purchase.report,validator:0
-msgid "Validated By"
-msgstr "Goedgekeurd door"
+#: code:addons/purchase/purchase.py:1011
+#, python-format
+msgid "No supplier defined for this product !"
+msgstr ""
#. module: purchase
#: model:ir.actions.act_window,help:purchase.action_picking_tree4_picking_to_invoice
@@ -162,12 +154,6 @@ msgid "Average Price"
msgstr "Gemiddelde prijs"
#. module: purchase
-#: code:addons/purchase/purchase.py:830
-#, python-format
-msgid "Invoice <b>paid</b>."
-msgstr "Factuur <b>betaald</b>."
-
-#. module: purchase
#: view:purchase.order:0
msgid "Purchase order which are in the exception state"
msgstr "Inkooporders met fouten"
@@ -238,7 +224,7 @@ msgstr ""
"Dit is een berekende minimale geplande datum van alle inkooporderregels."
#. module: purchase
-#: code:addons/purchase/purchase.py:255
+#: code:addons/purchase/purchase.py:260
#, python-format
msgid "In order to delete a purchase order, you must cancel it first."
msgstr ""
@@ -264,29 +250,12 @@ msgid "Total Untaxed amount"
msgstr "Totaalbedrag excl. belastingen"
#. module: purchase
-#: model:ir.ui.menu,name:purchase.menu_purchase_uom_categ_form_action
-msgid "Unit of Measure Categories"
-msgstr "Maateenheid categorieën"
-
-#. module: purchase
#: view:purchase.report:0
#: field:purchase.report,category_id:0
msgid "Category"
msgstr "Categorie"
#. module: purchase
-#: view:purchase.order:0
-msgid "Quotation "
-msgstr "Offerte "
-
-#. module: purchase
-#: code:addons/purchase/purchase.py:810
-#, python-format
-msgid ""
-"Quotation for <em>%s</em> <b>converted</b> to a Purchase Order of %s %s."
-msgstr ""
-
-#. module: purchase
#: model:process.transition,note:purchase.process_transition_purchaseinvoice0
msgid ""
"A purchase order generates a supplier invoice, as soon as it is confirmed by "
@@ -354,15 +323,17 @@ msgid "October"
msgstr "Oktober"
#. module: purchase
-#: code:addons/purchase/purchase.py:837
+#: code:addons/purchase/purchase.py:1024
#, python-format
-msgid "Purchase Order for <em>%s</em> <b>cancelled</b>."
-msgstr "Inkooporder voorr <em>%s</em> <b>geannuleerd</b>."
+msgid ""
+"The product \"%s\" has been defined with your company as reseller which "
+"seems to be a configuration error!"
+msgstr ""
#. module: purchase
-#: field:purchase.order,message_summary:0
-msgid "Summary"
-msgstr "Samenvatting"
+#: view:product.product:0
+msgid "When you sell this service to a customer,"
+msgstr ""
#. module: purchase
#: model:process.transition,note:purchase.process_transition_createpackinglist0
@@ -390,12 +361,6 @@ msgid "Quantity"
msgstr "Aantal"
#. module: purchase
-#: code:addons/purchase/purchase.py:819
-#, python-format
-msgid "Shipment <em>%s</em> <b>scheduled</b> for %s."
-msgstr "Inkomende levering <em>%s</em> <b>geplant</b> for %s."
-
-#. module: purchase
#: field:purchase.order,fiscal_position:0
msgid "Fiscal Position"
msgstr "Fiscale positie"
@@ -453,12 +418,6 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:824
-#, python-format
-msgid "Draft Invoice of %s %s is <b>waiting for validation</b>."
-msgstr ""
-
-#. module: purchase
#: model:ir.actions.act_window,help:purchase.purchase_line_form_action2
msgid ""
"<p>\n"
@@ -479,6 +438,11 @@ msgid "Scheduled Date"
msgstr "Geplande datum"
#. module: purchase
+#: field:purchase.order,currency_id:0
+msgid "Currency"
+msgstr ""
+
+#. module: purchase
#: field:purchase.order,journal_id:0
msgid "Journal"
msgstr "Dagboek"
@@ -511,6 +475,19 @@ msgid "Incoming Products"
msgstr "Inkomende producten"
#. module: purchase
+#: view:purchase.order:0
+msgid "Request for Quotation "
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,partner_ref:0
+msgid ""
+"Reference of the sales order or quotation sent by your supplier. It's mainly "
+"used to do the matching when you receive the products as this reference is "
+"usually written on the delivery order sent by your supplier."
+msgstr ""
+
+#. module: purchase
#: view:purchase.config.settings:0
#: view:purchase.order.group:0
#: view:purchase.order.line_invoice:0
@@ -520,7 +497,7 @@ msgstr "of"
#. module: purchase
#: field:res.company,po_lead:0
msgid "Purchase Lead Time"
-msgstr "Voorbereidingstijd inkoop"
+msgstr "Extra dagen levertijd inkoop"
#. module: purchase
#: model:process.transition,note:purchase.process_transition_invoicefrompurchase0
@@ -534,6 +511,11 @@ msgstr ""
"door de boekhouder (Factuurinstelling = Handmatig)."
#. module: purchase
+#: model:mail.message.subtype,name:purchase.mt_rfq_approved
+msgid "RFQ Approved"
+msgstr ""
+
+#. module: purchase
#: view:purchase.config.settings:0
msgid "Apply"
msgstr "Toepassen"
@@ -554,6 +536,11 @@ msgstr ""
"inkooporder."
#. module: purchase
+#: model:mail.message.subtype,name:purchase.mt_rfq_confirmed
+msgid "RFQ Confirmed"
+msgstr ""
+
+#. module: purchase
#: view:purchase.order:0
msgid "Customer Address"
msgstr "Klant adres"
@@ -578,7 +565,7 @@ msgid "Supplier"
msgstr "Leverancier"
#. module: purchase
-#: code:addons/purchase/purchase.py:508
+#: code:addons/purchase/purchase.py:525
#, python-format
msgid "Define expense account for this company: \"%s\" (id:%d)."
msgstr ""
@@ -602,7 +589,6 @@ msgstr "Subtotaal"
#. module: purchase
#: field:purchase.order,shipped:0
-#: field:purchase.order,shipped_rate:0
msgid "Received"
msgstr "Ontvangen"
@@ -644,13 +630,20 @@ msgid "Invoices and Receptions"
msgstr "Facturen en ontvangsten"
#. module: purchase
+#: model:process.transition,note:purchase.process_transition_packinginvoice0
+msgid ""
+"A Pick list generates an invoice. Depending on the Invoicing control of the "
+"sales order, the invoice is based on delivered or on ordered quantities."
+msgstr ""
+
+#. module: purchase
#: view:purchase.report:0
#: field:purchase.report,nbr:0
msgid "# of Lines"
msgstr "# Regels"
#. module: purchase
-#: code:addons/purchase/wizard/purchase_line_invoice.py:110
+#: code:addons/purchase/wizard/purchase_line_invoice.py:106
#, python-format
msgid "Define expense account for this product: \"%s\" (id:%d)."
msgstr ""
@@ -671,8 +664,8 @@ msgid "It indicates that a picking has been done"
msgstr "Het geeft aan dat het order verzamelen is uitgevoerd"
#. module: purchase
-#: code:addons/purchase/purchase.py:565
-#: code:addons/purchase/purchase.py:572
+#: code:addons/purchase/purchase.py:579
+#: code:addons/purchase/purchase.py:586
#, python-format
msgid "Unable to cancel this purchase order."
msgstr ""
@@ -737,6 +730,15 @@ msgid "Draft PO"
msgstr "Concept inkoopporder"
#. module: purchase
+#: code:addons/purchase/purchase.py:941
+#: code:addons/purchase/purchase.py:956
+#: code:addons/purchase/purchase.py:960
+#: code:addons/purchase/wizard/purchase_order_group.py:47
+#, python-format
+msgid "Warning!"
+msgstr "Waarschuwing!"
+
+#. module: purchase
#: model:process.node,name:purchase.process_node_draftpurchaseorder0
#: model:process.node,name:purchase.process_node_draftpurchaseorder1
msgid "RFQ"
@@ -768,6 +770,11 @@ msgid "The tax amount"
msgstr "Het BTW bedrag"
#. module: purchase
+#: field:purchase.order,shipped_rate:0
+msgid "Received Ratio"
+msgstr ""
+
+#. module: purchase
#: selection:purchase.report,month:0
msgid "September"
msgstr "September"
@@ -799,7 +806,7 @@ msgid "Stock Moves"
msgstr "Goederenstromen"
#. module: purchase
-#: code:addons/purchase/purchase.py:1158
+#: code:addons/purchase/purchase.py:1156
#, python-format
msgid "Draft Purchase Order created"
msgstr "Concept inkoopporderBeheer aangemaakt."
@@ -820,11 +827,6 @@ msgid "Terms and Conditions"
msgstr "Voorwaarden"
#. module: purchase
-#: field:purchase.order,currency_id:0
-msgid "unknown"
-msgstr "onbekend"
-
-#. module: purchase
#: help:purchase.order,date_order:0
msgid "Date on which this document has been created."
msgstr "Datum waarop dit document gemaakt is."
@@ -918,12 +920,6 @@ msgid "Cancel"
msgstr "Annuleren"
#. module: purchase
-#: field:purchase.order,message_comment_ids:0
-#: help:purchase.order,message_comment_ids:0
-msgid "Comments and emails"
-msgstr "Opmerkingen en e-mails."
-
-#. module: purchase
#: sql_constraint:purchase.order:0
msgid "Order Reference must be unique per Company!"
msgstr "Orderreferentie moet uniek zijn per bedrijf!"
@@ -957,17 +953,92 @@ msgid "Date Approved"
msgstr "Datum goedgekeurd"
#. module: purchase
-#: code:addons/purchase/purchase.py:806
-#, python-format
-msgid "Request for quotation <b>created</b>."
-msgstr ""
-
-#. module: purchase
#: view:product.product:0
msgid "a draft purchase order"
msgstr "een concept inkooporder"
#. module: purchase
+#: model:email.template,body_html:purchase.email_template_edi_purchase
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: #FFF; \">\n"
+"\n"
+" <p>Hello$ ${object.partner_id.name},</p>\n"
+" \n"
+" <p>Here is a ${object.state in ('draft', 'sent') and 'request for "
+"quotation' or 'purchase order confirmation'} from ${object.company_id.name}: "
+"</p>\n"
+" \n"
+" <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
+" &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
+" &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
+" &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
+"${object.pricelist_id.currency_id.name}</strong><br />\n"
+" &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
+" % if object.origin:\n"
+" &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
+" % endif\n"
+" % if object.partner_ref:\n"
+" &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
+" % endif\n"
+" % if object.validator:\n"
+" &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.validator.email "
+"or ''}?subject=Order%20${object.name}\">${object.validator.name}</a>\n"
+" % endif\n"
+" </p>\n"
+"\n"
+" <br/>\n"
+" <p>If you have any question, do not hesitate to contact us.</p>\n"
+" <p>Thank you!</p>\n"
+" <br/>\n"
+" <br/>\n"
+" <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
+"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
+"background-repeat: repeat no-repeat;\">\n"
+" <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
+"#DDD;\">\n"
+" <strong style=\"text-"
+"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
+" </div>\n"
+" <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
+"16px; background-color: #F2F2F2;\">\n"
+" <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
+" % if object.company_id.street:\n"
+" ${object.company_id.street}<br/>\n"
+" % endif\n"
+" % if object.company_id.street2:\n"
+" ${object.company_id.street2}<br/>\n"
+" % endif\n"
+" % if object.company_id.city or object.company_id.zip:\n"
+" ${object.company_id.zip} ${object.company_id.city}<br/>\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 ''}<br/>\n"
+" % endif\n"
+" </span>\n"
+" % if object.company_id.phone:\n"
+" <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
+"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
+"0px; padding-left: 0px; \">\n"
+" Phone:&nbsp; ${object.company_id.phone}\n"
+" </div>\n"
+" % endif\n"
+" % if object.company_id.website:\n"
+" <div>\n"
+" Web :&nbsp;<a "
+"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
+" </div>\n"
+" %endif\n"
+" <p></p>\n"
+" </div>\n"
+"</div>\n"
+" "
+msgstr ""
+
+#. module: purchase
#: view:purchase.report:0
msgid "Order of Year"
msgstr "Order van jaar"
@@ -1007,17 +1078,12 @@ msgid "Outgoing Mails"
msgstr "Uitgaande E-mails"
#. module: purchase
-#: code:addons/purchase/purchase.py:437
+#: code:addons/purchase/purchase.py:456
#, python-format
msgid "You cannot confirm a purchase order without any purchase order line."
msgstr ""
#. module: purchase
-#: model:ir.actions.server,name:purchase.actions_server_purchase_order_unread
-msgid "Purchase: Mark unread"
-msgstr "Inkoop: Markeer als ongelezen"
-
-#. module: purchase
#: help:purchase.order,message_ids:0
msgid "Messages and communication history"
msgstr "Berichten en communicatie historie"
@@ -1029,7 +1095,7 @@ msgid "Destination Warehouse"
msgstr "Bestemmings magazijn"
#. module: purchase
-#: code:addons/purchase/purchase.py:973
+#: code:addons/purchase/purchase.py:941
#, python-format
msgid ""
"Selected Unit of Measure does not belong to the same category as the product "
@@ -1037,6 +1103,11 @@ msgid ""
msgstr ""
#. module: purchase
+#: view:purchase.order.line_invoice:0
+msgid "Select an Open Sales Order"
+msgstr ""
+
+#. module: purchase
#: model:ir.ui.menu,name:purchase.menu_purchase_unit_measure_purchase
#: model:ir.ui.menu,name:purchase.menu_purchase_uom_form_action
msgid "Units of Measure"
@@ -1048,18 +1119,12 @@ msgid "Manage pricelist per supplier"
msgstr "Beheer prijslijsten per leverancier"
#. module: purchase
-#: code:addons/purchase/purchase.py:833
-#, python-format
-msgid "Purchase Order has been set to <b>draft</b>."
-msgstr ""
-
-#. module: purchase
#: view:board.board:0
msgid "Purchase Dashboard"
msgstr "Inkoop dashboard"
#. module: purchase
-#: code:addons/purchase/purchase.py:566
+#: code:addons/purchase/purchase.py:580
#, python-format
msgid "First cancel all receptions related to this purchase order."
msgstr ""
@@ -1098,9 +1163,9 @@ msgid "Unread Messages"
msgstr "Ongelezen berichten"
#. module: purchase
-#: view:purchase.order.line_invoice:0
-msgid "Select an Open Sale Order"
-msgstr "Selecteer een openstaande verkooporder"
+#: model:ir.ui.menu,name:purchase.menu_purchase_uom_categ_form_action
+msgid "Unit of Measure Categories"
+msgstr "Maateenheid categorieën"
#. module: purchase
#: view:purchase.order:0
@@ -1108,6 +1173,13 @@ msgid "Set to Draft"
msgstr "Naar Concept"
#. module: purchase
+#: help:purchase.order,origin:0
+msgid ""
+"Reference of the document that generated this purchase order request; a "
+"sales order or an internal procurement request."
+msgstr ""
+
+#. module: purchase
#: view:purchase.order.line:0
msgid "Notes"
msgstr "Notities"
@@ -1137,7 +1209,7 @@ msgid "Stock Move"
msgstr "Voorraadmutatie"
#. module: purchase
-#: code:addons/purchase/purchase.py:255
+#: code:addons/purchase/purchase.py:260
#, python-format
msgid "Invalid Action!"
msgstr "Ongeldige actie!"
@@ -1239,7 +1311,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:310
+#: code:addons/purchase/purchase.py:320
#, python-format
msgid "Please create Invoices."
msgstr "Maak à.u.b. Facturen."
@@ -1329,7 +1401,7 @@ msgid "Purchase Order Line Make Invoice"
msgstr "Inkooporderregel factuur maken"
#. module: purchase
-#: code:addons/purchase/purchase.py:1133
+#: code:addons/purchase/purchase.py:1141
#, python-format
msgid "PO: %s"
msgstr "IO: %s"
@@ -1340,7 +1412,7 @@ msgid "Send by EMail"
msgstr "Stuur per -mail"
#. module: purchase
-#: code:addons/purchase/purchase.py:498
+#: code:addons/purchase/purchase.py:515
#, python-format
msgid "Define purchase journal for this company: \"%s\" (id:%d)."
msgstr ""
@@ -1351,9 +1423,9 @@ msgid "Purchase Order "
msgstr "InkoopporderBeheer "
#. module: purchase
-#: view:purchase.order.line:0
-msgid "Manual Invoices"
-msgstr "Handmatige facturen"
+#: help:purchase.config.settings,group_costing_method:0
+msgid "Allows you to compute product cost price based on average cost."
+msgstr ""
#. module: purchase
#: model:ir.actions.act_window,name:purchase.action_purchase_configuration
@@ -1507,8 +1579,8 @@ msgid "Compute product cost price based on average cost"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:340
-#: code:addons/purchase/wizard/purchase_line_invoice.py:141
+#: code:addons/purchase/purchase.py:350
+#: code:addons/purchase/wizard/purchase_line_invoice.py:137
#: model:ir.actions.act_window,name:purchase.act_res_partner_2_supplier_invoices
#: view:res.partner:0
#, python-format
@@ -1620,9 +1692,10 @@ msgid "Open Purchase Menu"
msgstr "Inkoop menu openen"
#. module: purchase
-#: model:ir.model,name:purchase.model_mail_compose_message
-msgid "Email composition wizard"
-msgstr "E-mail samenstellen wizard"
+#: code:addons/purchase/purchase.py:1028
+#, python-format
+msgid "No address defined for the supplier"
+msgstr ""
#. module: purchase
#: field:purchase.order,company_id:0
@@ -1694,11 +1767,11 @@ msgid "Purchase Order"
msgstr "Inkooporder"
#. module: purchase
-#: code:addons/purchase/purchase.py:310
-#: code:addons/purchase/purchase.py:437
-#: code:addons/purchase/purchase.py:497
-#: code:addons/purchase/purchase.py:508
-#: code:addons/purchase/wizard/purchase_line_invoice.py:109
+#: code:addons/purchase/purchase.py:320
+#: code:addons/purchase/purchase.py:456
+#: code:addons/purchase/purchase.py:514
+#: code:addons/purchase/purchase.py:525
+#: code:addons/purchase/wizard/purchase_line_invoice.py:105
#, python-format
msgid "Error!"
msgstr "Fout!"
@@ -1720,16 +1793,6 @@ msgid ""
msgstr ""
#. module: purchase
-#: model:process.transition,note:purchase.process_transition_packinginvoice0
-msgid ""
-"A Pick list generates an invoice. Depending on the Invoicing control of the "
-"sale order, the invoice is based on delivered or on ordered quantities."
-msgstr ""
-"Een pakbon genereert een factuur. Afhankelijk van de facturatieinstelling "
-"van de verkooporder, is de factuur gebaseerd op geleverde of bestelde "
-"aantallen."
-
-#. module: purchase
#: selection:purchase.order,state:0
#: selection:purchase.order.line,state:0
#: selection:purchase.report,state:0
@@ -1742,10 +1805,9 @@ msgid "# of Purchase Order"
msgstr "# inkoopporderBeheer"
#. module: purchase
-#: code:addons/purchase/purchase.py:827
-#, python-format
-msgid "Shipment <b>received</b>."
-msgstr "Inkomende levering <b>ontvangen</>"
+#: model:ir.model,name:purchase.model_mail_compose_message
+msgid "Email composition wizard"
+msgstr "E-mail samenstellen wizard"
#. module: purchase
#: report:purchase.quotation:0
@@ -1834,7 +1896,7 @@ msgid "RFQ_${(object.name or '').replace('/','_')}"
msgstr "Offerte_${(object.name or '').replace('/','_')}"
#. module: purchase
-#: code:addons/purchase/purchase.py:988
+#: code:addons/purchase/purchase.py:956
#, python-format
msgid "The selected supplier only sells this product by %s"
msgstr "De geselecteerde leverancier verkoopt dit product alleen per %s"
@@ -1880,6 +1942,12 @@ msgid "Outgoing products to invoice"
msgstr "Te factureren uitgaande producten"
#. module: purchase
+#: report:purchase.order:0
+#: field:purchase.report,validator:0
+msgid "Validated By"
+msgstr "Goedgekeurd door"
+
+#. module: purchase
#: view:purchase.report:0
#: field:purchase.report,delay_pass:0
msgid "Days to Deliver"
@@ -1969,9 +2037,9 @@ msgid "November"
msgstr "November"
#. module: purchase
-#: help:purchase.config.settings,group_costing_method:0
-msgid "Allows you to compute product cost price based on average cost."
-msgstr ""
+#: view:purchase.order.line:0
+msgid "Manual Invoices"
+msgstr "Handmatige facturen"
#. module: purchase
#: report:purchase.order:0
@@ -1994,13 +2062,6 @@ msgid ""
msgstr ""
#. module: purchase
-#: help:purchase.order,origin:0
-msgid ""
-"Reference of the document that generated this purchase order request; a sale "
-"order or an internal procurement request."
-msgstr ""
-
-#. module: purchase
#: model:ir.ui.menu,name:purchase.menu_partner_categories_in_form
msgid "Partner Categories"
msgstr "Relatie Categorieën"
@@ -2021,89 +2082,6 @@ msgid "Invoicing Settings"
msgstr "Facturering instellingen"
#. module: purchase
-#: model:email.template,body_html:purchase.email_template_edi_purchase
-msgid ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"\n"
-" <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
-"or ''},</p>\n"
-" \n"
-" <p>Here is a ${object.state in ('draft', 'sent') and 'request for "
-"quotation' or 'purchase order confirmation'} from ${object.company_id.name}: "
-"</p>\n"
-" \n"
-" <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
-" &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
-" &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
-" &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
-"${object.pricelist_id.currency_id.name}</strong><br />\n"
-" &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
-" % if object.origin:\n"
-" &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
-" % endif\n"
-" % if object.partner_ref:\n"
-" &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
-" % endif\n"
-" % if object.validator:\n"
-" &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.validator.email "
-"or ''}?subject=Order%20${object.name}\">${object.validator.name}</a>\n"
-" % endif\n"
-" </p>\n"
-"\n"
-" <br/>\n"
-" <p>If you have any question, do not hesitate to contact us.</p>\n"
-" <p>Thank you!</p>\n"
-" <br/>\n"
-" <br/>\n"
-" <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
-"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
-"background-repeat: repeat no-repeat;\">\n"
-" <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
-"#FFF;\">\n"
-" <strong style=\"text-"
-"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
-" </div>\n"
-" <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
-"16px; background-color: #F2F2F2;\">\n"
-" <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
-" % if object.company_id.street:\n"
-" ${object.company_id.street}<br/>\n"
-" % endif\n"
-" % if object.company_id.street2:\n"
-" ${object.company_id.street2}<br/>\n"
-" % endif\n"
-" % if object.company_id.city or object.company_id.zip:\n"
-" ${object.company_id.zip} ${object.company_id.city}<br/>\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 ''}<br/>\n"
-" % endif\n"
-" </span>\n"
-" % if object.company_id.phone:\n"
-" <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
-"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
-"0px; padding-left: 0px; \">\n"
-" Phone:&nbsp; ${object.company_id.phone}\n"
-" </div>\n"
-" % endif\n"
-" % if object.company_id.website:\n"
-" <div>\n"
-" Web :&nbsp;<a "
-"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
-" </div>\n"
-" %endif\n"
-" <p></p>\n"
-" </div>\n"
-"</div>\n"
-" "
-msgstr ""
-
-#. module: purchase
#: model:ir.actions.act_window,name:purchase.action_purchase_order_by_user_all
msgid "Total Orders by User per month"
msgstr "Totaal oprders op gebruiker per maand"
@@ -2114,21 +2092,19 @@ msgid "Based on incoming shipments"
msgstr ""
#. module: purchase
+#: code:addons/purchase/purchase.py:1018
+#, python-format
+msgid "No default supplier defined for this product"
+msgstr ""
+
+#. module: purchase
#: view:purchase.report:0
#: field:purchase.report,warehouse_id:0
msgid "Warehouse"
msgstr "Magazijn"
#. module: purchase
-#: help:purchase.order,partner_ref:0
-msgid ""
-"Reference of the sale order or quotation sent by your supplier. It's mainly "
-"used to do the matching when you receive the products as this reference is "
-"usually written on the delivery order sent by your supplier."
-msgstr ""
-
-#. module: purchase
-#: code:addons/purchase/purchase.py:991
+#: code:addons/purchase/purchase.py:960
#, python-format
msgid ""
"The selected supplier has a minimal quantity set to %s %s, you should not "
@@ -2210,13 +2186,13 @@ msgstr ""
" \n"
" Regels worden alleen samengevoegd als: \n"
" * Orderregels exact hetzelfde zijn behalve het product aantal en "
-"meeteenheid \n"
+"maateenheid \n"
" "
#. module: purchase
-#: view:product.product:0
-msgid "When you sell this service to a customer,"
-msgstr ""
+#: field:purchase.order,message_summary:0
+msgid "Summary"
+msgstr "Samenvatting"
#. module: purchase
#: model:ir.actions.act_window,name:purchase.purchase_pricelist_version_action
@@ -2225,6 +2201,11 @@ msgid "Pricelist Versions"
msgstr "Versies prijslijsten"
#. module: purchase
+#: field:purchase.order,payment_term_id:0
+msgid "Payment Term"
+msgstr ""
+
+#. module: purchase
#: view:purchase.order:0
msgid "Purchase orders which are in draft state"
msgstr "Inkooporders welke zich de concept fase bevinden"
@@ -2411,9 +2392,6 @@ msgstr "Orders"
#~ msgid "Confirm Purchase Order"
#~ msgstr "Bevestig Inkooporder"
-#~ msgid "Purchase Management"
-#~ msgstr "Inkoopbeheer"
-
#~ msgid "Partner Ref."
#~ msgstr "Partner Ref."
@@ -2574,6 +2552,9 @@ msgstr "Orders"
#~ msgid "Current purchases"
#~ msgstr "Actuele inkopen"
+#~ msgid "Select an Open Sale Order"
+#~ msgstr "Selecteer een openstaande verkooporder"
+
#~ msgid "Reference UoM"
#~ msgstr "Referentie eenheid"
@@ -2584,6 +2565,14 @@ msgstr "Orders"
#~ msgid "Partial Picking"
#~ msgstr "Deels gepikt"
+#~ msgid ""
+#~ "A Pick list generates an invoice. Depending on the Invoicing control of the "
+#~ "sale order, the invoice is based on delivered or on ordered quantities."
+#~ msgstr ""
+#~ "Een pakbon genereert een factuur. Afhankelijk van de facturatieinstelling "
+#~ "van de verkooporder, is de factuur gebaseerd op geleverde of bestelde "
+#~ "aantallen."
+
#, python-format
#~ msgid ""
#~ "You have to select a pricelist or a supplier in the purchase form !\n"
@@ -3240,3 +3229,6 @@ msgstr "Orders"
#~ msgid "Product UOM"
#~ msgstr "Product maateenheid"
+
+#~ msgid "Purchase Management"
+#~ msgstr "Inkoop"
diff --git a/addons/purchase/i18n/nl_BE.po b/addons/purchase/i18n/nl_BE.po
index 26ee17f71a2..56ea970f882 100644
--- a/addons/purchase/i18n/nl_BE.po
+++ b/addons/purchase/i18n/nl_BE.po
@@ -6,15 +6,15 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 5.0.0\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
"PO-Revision-Date: 2012-10-01 11:28+0000\n"
"Last-Translator: Els Van Vossel (Agaplan) <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: 2012-12-04 05:12+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:20+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
#. module: purchase
#: model:res.groups,name:purchase.group_analytic_accounting
@@ -60,11 +60,6 @@ msgstr ""
"de gekozen producten / hoeveelheden wordt hiermee berekend."
#. module: purchase
-#: model:ir.actions.server,name:purchase.actions_server_purchase_order_read
-msgid "Purchase: Mark read"
-msgstr ""
-
-#. module: purchase
#: view:purchase.report:0
#: field:purchase.report,day:0
msgid "Day"
@@ -105,16 +100,13 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:973
-#: code:addons/purchase/purchase.py:988
-#: code:addons/purchase/purchase.py:991
-#: code:addons/purchase/wizard/purchase_order_group.py:47
+#: code:addons/purchase/purchase.py:1024
#, python-format
-msgid "Warning!"
+msgid "Configuration Error!"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:573
+#: code:addons/purchase/purchase.py:587
#, python-format
msgid "You must first cancel all receptions related to this purchase order."
msgstr "U moet eerst alle ontvangsten voor deze aankooporder annuleren."
@@ -131,10 +123,10 @@ msgid "Purchase-Standard Price"
msgstr "Standaardaankooppprijs"
#. module: purchase
-#: report:purchase.order:0
-#: field:purchase.report,validator:0
-msgid "Validated By"
-msgstr "Goedgekeurd door"
+#: code:addons/purchase/purchase.py:1011
+#, python-format
+msgid "No supplier defined for this product !"
+msgstr ""
#. module: purchase
#: model:ir.actions.act_window,help:purchase.action_picking_tree4_picking_to_invoice
@@ -157,12 +149,6 @@ msgid "Average Price"
msgstr "Gemiddelde prijs"
#. module: purchase
-#: code:addons/purchase/purchase.py:830
-#, python-format
-msgid "Invoice <b>paid</b>."
-msgstr ""
-
-#. module: purchase
#: view:purchase.order:0
msgid "Purchase order which are in the exception state"
msgstr "Aankooporders waarvoor er een uitzondering is"
@@ -234,7 +220,7 @@ msgstr ""
"aankooporderlijnen."
#. module: purchase
-#: code:addons/purchase/purchase.py:255
+#: code:addons/purchase/purchase.py:260
#, python-format
msgid "In order to delete a purchase order, you must cancel it first."
msgstr ""
@@ -260,29 +246,12 @@ msgid "Total Untaxed amount"
msgstr "Totaalbedrag excl. btw"
#. module: purchase
-#: model:ir.ui.menu,name:purchase.menu_purchase_uom_categ_form_action
-msgid "Unit of Measure Categories"
-msgstr ""
-
-#. module: purchase
#: view:purchase.report:0
#: field:purchase.report,category_id:0
msgid "Category"
msgstr "Categorie"
#. module: purchase
-#: view:purchase.order:0
-msgid "Quotation "
-msgstr ""
-
-#. module: purchase
-#: code:addons/purchase/purchase.py:810
-#, python-format
-msgid ""
-"Quotation for <em>%s</em> <b>converted</b> to a Purchase Order of %s %s."
-msgstr ""
-
-#. module: purchase
#: model:process.transition,note:purchase.process_transition_purchaseinvoice0
msgid ""
"A purchase order generates a supplier invoice, as soon as it is confirmed by "
@@ -350,14 +319,16 @@ msgid "October"
msgstr "Oktober"
#. module: purchase
-#: code:addons/purchase/purchase.py:837
+#: code:addons/purchase/purchase.py:1024
#, python-format
-msgid "Purchase Order for <em>%s</em> <b>cancelled</b>."
+msgid ""
+"The product \"%s\" has been defined with your company as reseller which "
+"seems to be a configuration error!"
msgstr ""
#. module: purchase
-#: field:purchase.order,message_summary:0
-msgid "Summary"
+#: view:product.product:0
+msgid "When you sell this service to a customer,"
msgstr ""
#. module: purchase
@@ -387,12 +358,6 @@ msgid "Quantity"
msgstr "Hoeveelheid"
#. module: purchase
-#: code:addons/purchase/purchase.py:819
-#, python-format
-msgid "Shipment <em>%s</em> <b>scheduled</b> for %s."
-msgstr ""
-
-#. module: purchase
#: field:purchase.order,fiscal_position:0
msgid "Fiscal Position"
msgstr "Fiscale positie"
@@ -450,12 +415,6 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:824
-#, python-format
-msgid "Draft Invoice of %s %s is <b>waiting for validation</b>."
-msgstr ""
-
-#. module: purchase
#: model:ir.actions.act_window,help:purchase.purchase_line_form_action2
msgid ""
"<p>\n"
@@ -476,6 +435,11 @@ msgid "Scheduled Date"
msgstr "Geplande datum"
#. module: purchase
+#: field:purchase.order,currency_id:0
+msgid "Currency"
+msgstr ""
+
+#. module: purchase
#: field:purchase.order,journal_id:0
msgid "Journal"
msgstr "Journaal"
@@ -508,6 +472,19 @@ msgid "Incoming Products"
msgstr ""
#. module: purchase
+#: view:purchase.order:0
+msgid "Request for Quotation "
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,partner_ref:0
+msgid ""
+"Reference of the sales order or quotation sent by your supplier. It's mainly "
+"used to do the matching when you receive the products as this reference is "
+"usually written on the delivery order sent by your supplier."
+msgstr ""
+
+#. module: purchase
#: view:purchase.config.settings:0
#: view:purchase.order.group:0
#: view:purchase.order.line_invoice:0
@@ -531,6 +508,11 @@ msgstr ""
"boekhouder worden ingegeven (factuurcontrole = manueel)."
#. module: purchase
+#: model:mail.message.subtype,name:purchase.mt_rfq_approved
+msgid "RFQ Approved"
+msgstr ""
+
+#. module: purchase
#: view:purchase.config.settings:0
msgid "Apply"
msgstr ""
@@ -550,6 +532,11 @@ msgstr ""
"wordt gestuurd. De bestelaanvraag wordt dan een aankooporder."
#. module: purchase
+#: model:mail.message.subtype,name:purchase.mt_rfq_confirmed
+msgid "RFQ Confirmed"
+msgstr ""
+
+#. module: purchase
#: view:purchase.order:0
msgid "Customer Address"
msgstr ""
@@ -574,7 +561,7 @@ msgid "Supplier"
msgstr "Leverancier"
#. module: purchase
-#: code:addons/purchase/purchase.py:508
+#: code:addons/purchase/purchase.py:525
#, python-format
msgid "Define expense account for this company: \"%s\" (id:%d)."
msgstr ""
@@ -598,7 +585,6 @@ msgstr "Subtotaal"
#. module: purchase
#: field:purchase.order,shipped:0
-#: field:purchase.order,shipped_rate:0
msgid "Received"
msgstr "Ontvangen"
@@ -640,13 +626,20 @@ msgid "Invoices and Receptions"
msgstr ""
#. module: purchase
+#: model:process.transition,note:purchase.process_transition_packinginvoice0
+msgid ""
+"A Pick list generates an invoice. Depending on the Invoicing control of the "
+"sales order, the invoice is based on delivered or on ordered quantities."
+msgstr ""
+
+#. module: purchase
#: view:purchase.report:0
#: field:purchase.report,nbr:0
msgid "# of Lines"
msgstr "# lijnen"
#. module: purchase
-#: code:addons/purchase/wizard/purchase_line_invoice.py:110
+#: code:addons/purchase/wizard/purchase_line_invoice.py:106
#, python-format
msgid "Define expense account for this product: \"%s\" (id:%d)."
msgstr ""
@@ -667,8 +660,8 @@ msgid "It indicates that a picking has been done"
msgstr "Geeft aan dat de ontvangst is gebeurd."
#. module: purchase
-#: code:addons/purchase/purchase.py:565
-#: code:addons/purchase/purchase.py:572
+#: code:addons/purchase/purchase.py:579
+#: code:addons/purchase/purchase.py:586
#, python-format
msgid "Unable to cancel this purchase order."
msgstr ""
@@ -733,6 +726,15 @@ msgid "Draft PO"
msgstr ""
#. module: purchase
+#: code:addons/purchase/purchase.py:941
+#: code:addons/purchase/purchase.py:956
+#: code:addons/purchase/purchase.py:960
+#: code:addons/purchase/wizard/purchase_order_group.py:47
+#, python-format
+msgid "Warning!"
+msgstr ""
+
+#. module: purchase
#: model:process.node,name:purchase.process_node_draftpurchaseorder0
#: model:process.node,name:purchase.process_node_draftpurchaseorder1
msgid "RFQ"
@@ -764,6 +766,11 @@ msgid "The tax amount"
msgstr "Btw-bedrag"
#. module: purchase
+#: field:purchase.order,shipped_rate:0
+msgid "Received Ratio"
+msgstr ""
+
+#. module: purchase
#: selection:purchase.report,month:0
msgid "September"
msgstr "September"
@@ -795,7 +802,7 @@ msgid "Stock Moves"
msgstr "Voorraadbewegingen"
#. module: purchase
-#: code:addons/purchase/purchase.py:1158
+#: code:addons/purchase/purchase.py:1156
#, python-format
msgid "Draft Purchase Order created"
msgstr ""
@@ -816,11 +823,6 @@ msgid "Terms and Conditions"
msgstr ""
#. module: purchase
-#: field:purchase.order,currency_id:0
-msgid "unknown"
-msgstr ""
-
-#. module: purchase
#: help:purchase.order,date_order:0
msgid "Date on which this document has been created."
msgstr "Datum waarop het document is gemaakt."
@@ -914,12 +916,6 @@ msgid "Cancel"
msgstr "Annuleren"
#. module: purchase
-#: field:purchase.order,message_comment_ids:0
-#: help:purchase.order,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
-#. module: purchase
#: sql_constraint:purchase.order:0
msgid "Order Reference must be unique per Company!"
msgstr "De orderreferentie moet uniek zijn."
@@ -953,14 +949,89 @@ msgid "Date Approved"
msgstr "Datum goedk."
#. module: purchase
-#: code:addons/purchase/purchase.py:806
-#, python-format
-msgid "Request for quotation <b>created</b>."
+#: view:product.product:0
+msgid "a draft purchase order"
msgstr ""
#. module: purchase
-#: view:product.product:0
-msgid "a draft purchase order"
+#: model:email.template,body_html:purchase.email_template_edi_purchase
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: #FFF; \">\n"
+"\n"
+" <p>Hello$ ${object.partner_id.name},</p>\n"
+" \n"
+" <p>Here is a ${object.state in ('draft', 'sent') and 'request for "
+"quotation' or 'purchase order confirmation'} from ${object.company_id.name}: "
+"</p>\n"
+" \n"
+" <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
+" &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
+" &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
+" &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
+"${object.pricelist_id.currency_id.name}</strong><br />\n"
+" &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
+" % if object.origin:\n"
+" &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
+" % endif\n"
+" % if object.partner_ref:\n"
+" &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
+" % endif\n"
+" % if object.validator:\n"
+" &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.validator.email "
+"or ''}?subject=Order%20${object.name}\">${object.validator.name}</a>\n"
+" % endif\n"
+" </p>\n"
+"\n"
+" <br/>\n"
+" <p>If you have any question, do not hesitate to contact us.</p>\n"
+" <p>Thank you!</p>\n"
+" <br/>\n"
+" <br/>\n"
+" <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
+"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
+"background-repeat: repeat no-repeat;\">\n"
+" <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
+"#DDD;\">\n"
+" <strong style=\"text-"
+"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
+" </div>\n"
+" <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
+"16px; background-color: #F2F2F2;\">\n"
+" <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
+" % if object.company_id.street:\n"
+" ${object.company_id.street}<br/>\n"
+" % endif\n"
+" % if object.company_id.street2:\n"
+" ${object.company_id.street2}<br/>\n"
+" % endif\n"
+" % if object.company_id.city or object.company_id.zip:\n"
+" ${object.company_id.zip} ${object.company_id.city}<br/>\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 ''}<br/>\n"
+" % endif\n"
+" </span>\n"
+" % if object.company_id.phone:\n"
+" <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
+"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
+"0px; padding-left: 0px; \">\n"
+" Phone:&nbsp; ${object.company_id.phone}\n"
+" </div>\n"
+" % endif\n"
+" % if object.company_id.website:\n"
+" <div>\n"
+" Web :&nbsp;<a "
+"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
+" </div>\n"
+" %endif\n"
+" <p></p>\n"
+" </div>\n"
+"</div>\n"
+" "
msgstr ""
#. module: purchase
@@ -1003,17 +1074,12 @@ msgid "Outgoing Mails"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:437
+#: code:addons/purchase/purchase.py:456
#, python-format
msgid "You cannot confirm a purchase order without any purchase order line."
msgstr ""
#. module: purchase
-#: model:ir.actions.server,name:purchase.actions_server_purchase_order_unread
-msgid "Purchase: Mark unread"
-msgstr ""
-
-#. module: purchase
#: help:purchase.order,message_ids:0
msgid "Messages and communication history"
msgstr ""
@@ -1025,7 +1091,7 @@ msgid "Destination Warehouse"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:973
+#: code:addons/purchase/purchase.py:941
#, python-format
msgid ""
"Selected Unit of Measure does not belong to the same category as the product "
@@ -1033,6 +1099,11 @@ msgid ""
msgstr ""
#. module: purchase
+#: view:purchase.order.line_invoice:0
+msgid "Select an Open Sales Order"
+msgstr ""
+
+#. module: purchase
#: model:ir.ui.menu,name:purchase.menu_purchase_unit_measure_purchase
#: model:ir.ui.menu,name:purchase.menu_purchase_uom_form_action
msgid "Units of Measure"
@@ -1044,18 +1115,12 @@ msgid "Manage pricelist per supplier"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:833
-#, python-format
-msgid "Purchase Order has been set to <b>draft</b>."
-msgstr ""
-
-#. module: purchase
#: view:board.board:0
msgid "Purchase Dashboard"
msgstr "Aankoopdashboard"
#. module: purchase
-#: code:addons/purchase/purchase.py:566
+#: code:addons/purchase/purchase.py:580
#, python-format
msgid "First cancel all receptions related to this purchase order."
msgstr ""
@@ -1094,9 +1159,9 @@ msgid "Unread Messages"
msgstr ""
#. module: purchase
-#: view:purchase.order.line_invoice:0
-msgid "Select an Open Sale Order"
-msgstr "Kies een openstaande order"
+#: model:ir.ui.menu,name:purchase.menu_purchase_uom_categ_form_action
+msgid "Unit of Measure Categories"
+msgstr ""
#. module: purchase
#: view:purchase.order:0
@@ -1104,6 +1169,13 @@ msgid "Set to Draft"
msgstr "Terugzetten naar concept"
#. module: purchase
+#: help:purchase.order,origin:0
+msgid ""
+"Reference of the document that generated this purchase order request; a "
+"sales order or an internal procurement request."
+msgstr ""
+
+#. module: purchase
#: view:purchase.order.line:0
msgid "Notes"
msgstr "Opmerkingen"
@@ -1133,7 +1205,7 @@ msgid "Stock Move"
msgstr "Voorraadbeweging"
#. module: purchase
-#: code:addons/purchase/purchase.py:255
+#: code:addons/purchase/purchase.py:260
#, python-format
msgid "Invalid Action!"
msgstr ""
@@ -1235,7 +1307,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:310
+#: code:addons/purchase/purchase.py:320
#, python-format
msgid "Please create Invoices."
msgstr ""
@@ -1325,7 +1397,7 @@ msgid "Purchase Order Line Make Invoice"
msgstr "Factuur maken van aankooporderlijnen"
#. module: purchase
-#: code:addons/purchase/purchase.py:1133
+#: code:addons/purchase/purchase.py:1141
#, python-format
msgid "PO: %s"
msgstr "AO: %s"
@@ -1336,7 +1408,7 @@ msgid "Send by EMail"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:498
+#: code:addons/purchase/purchase.py:515
#, python-format
msgid "Define purchase journal for this company: \"%s\" (id:%d)."
msgstr ""
@@ -1347,9 +1419,9 @@ msgid "Purchase Order "
msgstr ""
#. module: purchase
-#: view:purchase.order.line:0
-msgid "Manual Invoices"
-msgstr "Manuele facturen"
+#: help:purchase.config.settings,group_costing_method:0
+msgid "Allows you to compute product cost price based on average cost."
+msgstr ""
#. module: purchase
#: model:ir.actions.act_window,name:purchase.action_purchase_configuration
@@ -1503,8 +1575,8 @@ msgid "Compute product cost price based on average cost"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:340
-#: code:addons/purchase/wizard/purchase_line_invoice.py:141
+#: code:addons/purchase/purchase.py:350
+#: code:addons/purchase/wizard/purchase_line_invoice.py:137
#: model:ir.actions.act_window,name:purchase.act_res_partner_2_supplier_invoices
#: view:res.partner:0
#, python-format
@@ -1616,8 +1688,9 @@ msgid "Open Purchase Menu"
msgstr ""
#. module: purchase
-#: model:ir.model,name:purchase.model_mail_compose_message
-msgid "Email composition wizard"
+#: code:addons/purchase/purchase.py:1028
+#, python-format
+msgid "No address defined for the supplier"
msgstr ""
#. module: purchase
@@ -1689,11 +1762,11 @@ msgid "Purchase Order"
msgstr "Aankooporder"
#. module: purchase
-#: code:addons/purchase/purchase.py:310
-#: code:addons/purchase/purchase.py:437
-#: code:addons/purchase/purchase.py:497
-#: code:addons/purchase/purchase.py:508
-#: code:addons/purchase/wizard/purchase_line_invoice.py:109
+#: code:addons/purchase/purchase.py:320
+#: code:addons/purchase/purchase.py:456
+#: code:addons/purchase/purchase.py:514
+#: code:addons/purchase/purchase.py:525
+#: code:addons/purchase/wizard/purchase_line_invoice.py:105
#, python-format
msgid "Error!"
msgstr ""
@@ -1715,16 +1788,6 @@ msgid ""
msgstr ""
#. module: purchase
-#: model:process.transition,note:purchase.process_transition_packinginvoice0
-msgid ""
-"A Pick list generates an invoice. Depending on the Invoicing control of the "
-"sale order, the invoice is based on delivered or on ordered quantities."
-msgstr ""
-"Van een ontvangst kan een factuur worden gemaakt. In functie van de keuze in "
-"de order, wordt de factuur gemaakt volgens geleverde of bestelde "
-"hoeveelheden."
-
-#. module: purchase
#: selection:purchase.order,state:0
#: selection:purchase.order.line,state:0
#: selection:purchase.report,state:0
@@ -1737,9 +1800,8 @@ msgid "# of Purchase Order"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:827
-#, python-format
-msgid "Shipment <b>received</b>."
+#: model:ir.model,name:purchase.model_mail_compose_message
+msgid "Email composition wizard"
msgstr ""
#. module: purchase
@@ -1829,7 +1891,7 @@ msgid "RFQ_${(object.name or '').replace('/','_')}"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:988
+#: code:addons/purchase/purchase.py:956
#, python-format
msgid "The selected supplier only sells this product by %s"
msgstr "De gekozen leverancier verkoopt dit product enkel per %s"
@@ -1875,6 +1937,12 @@ msgid "Outgoing products to invoice"
msgstr "Te factureren uitgaande producten"
#. module: purchase
+#: report:purchase.order:0
+#: field:purchase.report,validator:0
+msgid "Validated By"
+msgstr "Goedgekeurd door"
+
+#. module: purchase
#: view:purchase.report:0
#: field:purchase.report,delay_pass:0
msgid "Days to Deliver"
@@ -1964,9 +2032,9 @@ msgid "November"
msgstr "November"
#. module: purchase
-#: help:purchase.config.settings,group_costing_method:0
-msgid "Allows you to compute product cost price based on average cost."
-msgstr ""
+#: view:purchase.order.line:0
+msgid "Manual Invoices"
+msgstr "Manuele facturen"
#. module: purchase
#: report:purchase.order:0
@@ -1989,13 +2057,6 @@ msgid ""
msgstr ""
#. module: purchase
-#: help:purchase.order,origin:0
-msgid ""
-"Reference of the document that generated this purchase order request; a sale "
-"order or an internal procurement request."
-msgstr ""
-
-#. module: purchase
#: model:ir.ui.menu,name:purchase.menu_partner_categories_in_form
msgid "Partner Categories"
msgstr "Relatiecategorieën"
@@ -2016,89 +2077,6 @@ msgid "Invoicing Settings"
msgstr ""
#. module: purchase
-#: model:email.template,body_html:purchase.email_template_edi_purchase
-msgid ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"\n"
-" <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
-"or ''},</p>\n"
-" \n"
-" <p>Here is a ${object.state in ('draft', 'sent') and 'request for "
-"quotation' or 'purchase order confirmation'} from ${object.company_id.name}: "
-"</p>\n"
-" \n"
-" <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
-" &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
-" &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
-" &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
-"${object.pricelist_id.currency_id.name}</strong><br />\n"
-" &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
-" % if object.origin:\n"
-" &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
-" % endif\n"
-" % if object.partner_ref:\n"
-" &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
-" % endif\n"
-" % if object.validator:\n"
-" &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.validator.email "
-"or ''}?subject=Order%20${object.name}\">${object.validator.name}</a>\n"
-" % endif\n"
-" </p>\n"
-"\n"
-" <br/>\n"
-" <p>If you have any question, do not hesitate to contact us.</p>\n"
-" <p>Thank you!</p>\n"
-" <br/>\n"
-" <br/>\n"
-" <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
-"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
-"background-repeat: repeat no-repeat;\">\n"
-" <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
-"#FFF;\">\n"
-" <strong style=\"text-"
-"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
-" </div>\n"
-" <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
-"16px; background-color: #F2F2F2;\">\n"
-" <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
-" % if object.company_id.street:\n"
-" ${object.company_id.street}<br/>\n"
-" % endif\n"
-" % if object.company_id.street2:\n"
-" ${object.company_id.street2}<br/>\n"
-" % endif\n"
-" % if object.company_id.city or object.company_id.zip:\n"
-" ${object.company_id.zip} ${object.company_id.city}<br/>\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 ''}<br/>\n"
-" % endif\n"
-" </span>\n"
-" % if object.company_id.phone:\n"
-" <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
-"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
-"0px; padding-left: 0px; \">\n"
-" Phone:&nbsp; ${object.company_id.phone}\n"
-" </div>\n"
-" % endif\n"
-" % if object.company_id.website:\n"
-" <div>\n"
-" Web :&nbsp;<a "
-"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
-" </div>\n"
-" %endif\n"
-" <p></p>\n"
-" </div>\n"
-"</div>\n"
-" "
-msgstr ""
-
-#. module: purchase
#: model:ir.actions.act_window,name:purchase.action_purchase_order_by_user_all
msgid "Total Orders by User per month"
msgstr "Totaal aantal orders per gebruiker per maand"
@@ -2109,21 +2087,19 @@ msgid "Based on incoming shipments"
msgstr ""
#. module: purchase
+#: code:addons/purchase/purchase.py:1018
+#, python-format
+msgid "No default supplier defined for this product"
+msgstr ""
+
+#. module: purchase
#: view:purchase.report:0
#: field:purchase.report,warehouse_id:0
msgid "Warehouse"
msgstr "Magazijn"
#. module: purchase
-#: help:purchase.order,partner_ref:0
-msgid ""
-"Reference of the sale order or quotation sent by your supplier. It's mainly "
-"used to do the matching when you receive the products as this reference is "
-"usually written on the delivery order sent by your supplier."
-msgstr ""
-
-#. module: purchase
-#: code:addons/purchase/purchase.py:991
+#: code:addons/purchase/purchase.py:960
#, python-format
msgid ""
"The selected supplier has a minimal quantity set to %s %s, you should not "
@@ -2208,8 +2184,8 @@ msgstr ""
" "
#. module: purchase
-#: view:product.product:0
-msgid "When you sell this service to a customer,"
+#: field:purchase.order,message_summary:0
+msgid "Summary"
msgstr ""
#. module: purchase
@@ -2219,6 +2195,11 @@ msgid "Pricelist Versions"
msgstr "Prijslijstversies"
#. module: purchase
+#: field:purchase.order,payment_term_id:0
+msgid "Payment Term"
+msgstr ""
+
+#. module: purchase
#: view:purchase.order:0
msgid "Purchase orders which are in draft state"
msgstr "Aankooporders in conceptstatus"
@@ -2319,6 +2300,9 @@ msgstr "Bestellingen"
#~ msgid "No Pricelist !"
#~ msgstr "Geen prijslijst"
+#~ msgid "Select an Open Sale Order"
+#~ msgstr "Kies een openstaande order"
+
#~ msgid "Current purchases"
#~ msgstr "Huidige aankopen"
@@ -2360,6 +2344,14 @@ msgstr "Bestellingen"
#~ msgid "Configuration Progress"
#~ msgstr "Configuratievoortgang"
+#~ msgid ""
+#~ "A Pick list generates an invoice. Depending on the Invoicing control of the "
+#~ "sale order, the invoice is based on delivered or on ordered quantities."
+#~ msgstr ""
+#~ "Van een ontvangst kan een factuur worden gemaakt. In functie van de keuze in "
+#~ "de order, wordt de factuur gemaakt volgens geleverde of bestelde "
+#~ "hoeveelheden."
+
#, python-format
#~ msgid "Purchase amount over the limit"
#~ msgstr "Aankoopbedrag is groter dan de limiet."
diff --git a/addons/purchase/i18n/pl.po b/addons/purchase/i18n/pl.po
index 5dd8484adf6..eb51d4e1fa2 100644
--- a/addons/purchase/i18n/pl.po
+++ b/addons/purchase/i18n/pl.po
@@ -6,15 +6,15 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
-"PO-Revision-Date: 2012-12-15 20:16+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
+"PO-Revision-Date: 2012-12-22 15:50+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: 2012-12-16 04:46+0000\n"
-"X-Generator: Launchpad (build 16372)\n"
+"X-Launchpad-Export-Date: 2012-12-23 04:40+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
#. module: purchase
#: model:res.groups,name:purchase.group_analytic_accounting
@@ -65,11 +65,6 @@ msgstr ""
"jest obliczana z tego cennika."
#. module: purchase
-#: model:ir.actions.server,name:purchase.actions_server_purchase_order_read
-msgid "Purchase: Mark read"
-msgstr "Zakupy: Oznacz jako przeczytane"
-
-#. module: purchase
#: view:purchase.report:0
#: field:purchase.report,day:0
msgid "Day"
@@ -113,16 +108,13 @@ msgstr ""
"kanban."
#. module: purchase
-#: code:addons/purchase/purchase.py:973
-#: code:addons/purchase/purchase.py:988
-#: code:addons/purchase/purchase.py:991
-#: code:addons/purchase/wizard/purchase_order_group.py:47
+#: code:addons/purchase/purchase.py:1024
#, python-format
-msgid "Warning!"
-msgstr "Ostrzeżenie !"
+msgid "Configuration Error!"
+msgstr "Błąd konfiguracji!"
#. module: purchase
-#: code:addons/purchase/purchase.py:573
+#: code:addons/purchase/purchase.py:587
#, python-format
msgid "You must first cancel all receptions related to this purchase order."
msgstr "Musisz najpierw anulować wszystkie przyjęcia dla tego zamówienia."
@@ -139,10 +131,10 @@ msgid "Purchase-Standard Price"
msgstr "Zakup - cena standardowa"
#. module: purchase
-#: report:purchase.order:0
-#: field:purchase.report,validator:0
-msgid "Validated By"
-msgstr "Zatwierdzone przez"
+#: code:addons/purchase/purchase.py:1011
+#, python-format
+msgid "No supplier defined for this product !"
+msgstr "Nie zdefiniowano dostawcy dla tego produktu!"
#. module: purchase
#: model:ir.actions.act_window,help:purchase.action_picking_tree4_picking_to_invoice
@@ -174,12 +166,6 @@ msgid "Average Price"
msgstr "Cena przeciętna"
#. module: purchase
-#: code:addons/purchase/purchase.py:830
-#, python-format
-msgid "Invoice <b>paid</b>."
-msgstr "Faktura <b>zapłacona</b>."
-
-#. module: purchase
#: view:purchase.order:0
msgid "Purchase order which are in the exception state"
msgstr "Zamówienia zakupu, które są w stanie wyjątku"
@@ -251,7 +237,7 @@ msgstr ""
"zakupu."
#. module: purchase
-#: code:addons/purchase/purchase.py:255
+#: code:addons/purchase/purchase.py:260
#, python-format
msgid "In order to delete a purchase order, you must cancel it first."
msgstr "Aby usunąć zamówienia zakupu, to musisz je najpierw anulować."
@@ -277,30 +263,12 @@ msgid "Total Untaxed amount"
msgstr "Suma kwot netto"
#. module: purchase
-#: model:ir.ui.menu,name:purchase.menu_purchase_uom_categ_form_action
-msgid "Unit of Measure Categories"
-msgstr "Kategorie jednostek miary"
-
-#. module: purchase
#: view:purchase.report:0
#: field:purchase.report,category_id:0
msgid "Category"
msgstr "Kategoria"
#. module: purchase
-#: view:purchase.order:0
-msgid "Quotation "
-msgstr "Oferta "
-
-#. module: purchase
-#: code:addons/purchase/purchase.py:810
-#, python-format
-msgid ""
-"Quotation for <em>%s</em> <b>converted</b> to a Purchase Order of %s %s."
-msgstr ""
-"Oferta <em>%s</em> <b>skonwertowana</b> do zamówienia zakupu od %s %s."
-
-#. module: purchase
#: model:process.transition,note:purchase.process_transition_purchaseinvoice0
msgid ""
"A purchase order generates a supplier invoice, as soon as it is confirmed by "
@@ -379,15 +347,17 @@ msgid "October"
msgstr "Październik"
#. module: purchase
-#: code:addons/purchase/purchase.py:837
+#: code:addons/purchase/purchase.py:1024
#, python-format
-msgid "Purchase Order for <em>%s</em> <b>cancelled</b>."
-msgstr "Zamówienie zakupu od <em>%s</em> <b>anulowano</b>."
+msgid ""
+"The product \"%s\" has been defined with your company as reseller which "
+"seems to be a configuration error!"
+msgstr ""
#. module: purchase
-#: field:purchase.order,message_summary:0
-msgid "Summary"
-msgstr "Podsumowanie"
+#: view:product.product:0
+msgid "When you sell this service to a customer,"
+msgstr "Kiedy sprzedaż usługę klientowi"
#. module: purchase
#: model:process.transition,note:purchase.process_transition_createpackinglist0
@@ -415,12 +385,6 @@ msgid "Quantity"
msgstr "Ilość"
#. module: purchase
-#: code:addons/purchase/purchase.py:819
-#, python-format
-msgid "Shipment <em>%s</em> <b>scheduled</b> for %s."
-msgstr "Przesyłkę <em>%s</em> <b>zaplanowano</b> %s."
-
-#. module: purchase
#: field:purchase.order,fiscal_position:0
msgid "Fiscal Position"
msgstr "Obszar podatkowy"
@@ -490,12 +454,6 @@ msgstr ""
"puste, jeśli dostawa ma być do twojej firmy."
#. module: purchase
-#: code:addons/purchase/purchase.py:824
-#, python-format
-msgid "Draft Invoice of %s %s is <b>waiting for validation</b>."
-msgstr "Projekt faktury %s %s <b>oczekuje na zatwierdzenie</b>."
-
-#. module: purchase
#: model:ir.actions.act_window,help:purchase.purchase_line_form_action2
msgid ""
"<p>\n"
@@ -526,6 +484,11 @@ msgid "Scheduled Date"
msgstr "Zaplanowana data"
#. module: purchase
+#: field:purchase.order,currency_id:0
+msgid "Currency"
+msgstr "Waluta"
+
+#. module: purchase
#: field:purchase.order,journal_id:0
msgid "Journal"
msgstr "Dziennik"
@@ -558,6 +521,22 @@ msgid "Incoming Products"
msgstr "Produkty przychodzące"
#. module: purchase
+#: view:purchase.order:0
+msgid "Request for Quotation "
+msgstr "Zapytanie ofertowe "
+
+#. module: purchase
+#: help:purchase.order,partner_ref:0
+msgid ""
+"Reference of the sales order or quotation sent by your supplier. It's mainly "
+"used to do the matching when you receive the products as this reference is "
+"usually written on the delivery order sent by your supplier."
+msgstr ""
+"Odnośnik zamówienia sprzedaży lub oferty twojego dostawcy. Stosowane głównie "
+"do kojarzenia z nimi przyjęć, bo w dokumentach wysyłki dostawcy ten numer "
+"powinien być podany."
+
+#. module: purchase
#: view:purchase.config.settings:0
#: view:purchase.order.group:0
#: view:purchase.order.line_invoice:0
@@ -581,6 +560,11 @@ msgstr ""
"kiedy fakturowanie jest ustawione na 'Ręczne'."
#. module: purchase
+#: model:mail.message.subtype,name:purchase.mt_rfq_approved
+msgid "RFQ Approved"
+msgstr "Zapytanie ofertowe aprobowane."
+
+#. module: purchase
#: view:purchase.config.settings:0
msgid "Apply"
msgstr "Zastosuj"
@@ -600,6 +584,11 @@ msgstr ""
"dostawcy. Zapytanie ofertowe stanie się potwierdzonym zamówieniem zakupu."
#. module: purchase
+#: model:mail.message.subtype,name:purchase.mt_rfq_confirmed
+msgid "RFQ Confirmed"
+msgstr "Zapytanie ofertowe potwierdzone"
+
+#. module: purchase
#: view:purchase.order:0
msgid "Customer Address"
msgstr "Adres klienta"
@@ -624,7 +613,7 @@ msgid "Supplier"
msgstr "Dostawca"
#. module: purchase
-#: code:addons/purchase/purchase.py:508
+#: code:addons/purchase/purchase.py:525
#, python-format
msgid "Define expense account for this company: \"%s\" (id:%d)."
msgstr "Definiuj konto wydatków dla firmy: \"%s\" (id:%d)."
@@ -648,7 +637,6 @@ msgstr "Suma częściowa"
#. module: purchase
#: field:purchase.order,shipped:0
-#: field:purchase.order,shipped_rate:0
msgid "Received"
msgstr "Przyjęto"
@@ -700,13 +688,20 @@ msgid "Invoices and Receptions"
msgstr "faktury i rachunki"
#. module: purchase
+#: model:process.transition,note:purchase.process_transition_packinginvoice0
+msgid ""
+"A Pick list generates an invoice. Depending on the Invoicing control of the "
+"sales order, the invoice is based on delivered or on ordered quantities."
+msgstr ""
+
+#. module: purchase
#: view:purchase.report:0
#: field:purchase.report,nbr:0
msgid "# of Lines"
msgstr "# pozycji"
#. module: purchase
-#: code:addons/purchase/wizard/purchase_line_invoice.py:110
+#: code:addons/purchase/wizard/purchase_line_invoice.py:106
#, python-format
msgid "Define expense account for this product: \"%s\" (id:%d)."
msgstr "Definiuj konto wydatków dla tego produktu: \"%s\" (id:%d)."
@@ -727,8 +722,8 @@ msgid "It indicates that a picking has been done"
msgstr "To oznacza, że pobranie zostało wykonane"
#. module: purchase
-#: code:addons/purchase/purchase.py:565
-#: code:addons/purchase/purchase.py:572
+#: code:addons/purchase/purchase.py:579
+#: code:addons/purchase/purchase.py:586
#, python-format
msgid "Unable to cancel this purchase order."
msgstr "Nie mozna anulować tego zamówienia zakupu."
@@ -795,6 +790,15 @@ msgid "Draft PO"
msgstr "Projekt zamówienia"
#. module: purchase
+#: code:addons/purchase/purchase.py:941
+#: code:addons/purchase/purchase.py:956
+#: code:addons/purchase/purchase.py:960
+#: code:addons/purchase/wizard/purchase_order_group.py:47
+#, python-format
+msgid "Warning!"
+msgstr "Ostrzeżenie !"
+
+#. module: purchase
#: model:process.node,name:purchase.process_node_draftpurchaseorder0
#: model:process.node,name:purchase.process_node_draftpurchaseorder1
msgid "RFQ"
@@ -826,6 +830,11 @@ msgid "The tax amount"
msgstr "Kwota podatku"
#. module: purchase
+#: field:purchase.order,shipped_rate:0
+msgid "Received Ratio"
+msgstr "Współczynnik pobranych"
+
+#. module: purchase
#: selection:purchase.report,month:0
msgid "September"
msgstr "Wrzesień"
@@ -857,7 +866,7 @@ msgid "Stock Moves"
msgstr "Przesunięcia zapasów"
#. module: purchase
-#: code:addons/purchase/purchase.py:1158
+#: code:addons/purchase/purchase.py:1156
#, python-format
msgid "Draft Purchase Order created"
msgstr "Projekt zamówienia zakupu utworzono"
@@ -878,11 +887,6 @@ msgid "Terms and Conditions"
msgstr "Warunki i postanowienia"
#. module: purchase
-#: field:purchase.order,currency_id:0
-msgid "unknown"
-msgstr "nieznane"
-
-#. module: purchase
#: help:purchase.order,date_order:0
msgid "Date on which this document has been created."
msgstr "Data utworzenia dokumentu."
@@ -937,7 +941,7 @@ msgstr "Stosuj wiele kont analitycznych na zamówieniu"
#. module: purchase
#: view:product.product:0
msgid "will be created in order to subcontract the job"
-msgstr ""
+msgstr "będzie utworzone jako podwykonanie zadania"
#. module: purchase
#: model:ir.actions.act_window,name:purchase.action_purchase_line_product_tree
@@ -976,12 +980,6 @@ msgid "Cancel"
msgstr "Anuluj"
#. module: purchase
-#: field:purchase.order,message_comment_ids:0
-#: help:purchase.order,message_comment_ids:0
-msgid "Comments and emails"
-msgstr "Komentarze i emaile"
-
-#. module: purchase
#: sql_constraint:purchase.order:0
msgid "Order Reference must be unique per Company!"
msgstr "Odnośnik zamowienia musi być unikalny w firmie!"
@@ -1015,17 +1013,92 @@ msgid "Date Approved"
msgstr "Data aprobowania"
#. module: purchase
-#: code:addons/purchase/purchase.py:806
-#, python-format
-msgid "Request for quotation <b>created</b>."
-msgstr "zapytanie ofertowe <b>utworzone</b>."
-
-#. module: purchase
#: view:product.product:0
msgid "a draft purchase order"
msgstr "prjekt zamówienia zakupu"
#. module: purchase
+#: model:email.template,body_html:purchase.email_template_edi_purchase
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: #FFF; \">\n"
+"\n"
+" <p>Hello$ ${object.partner_id.name},</p>\n"
+" \n"
+" <p>Here is a ${object.state in ('draft', 'sent') and 'request for "
+"quotation' or 'purchase order confirmation'} from ${object.company_id.name}: "
+"</p>\n"
+" \n"
+" <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
+" &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
+" &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
+" &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
+"${object.pricelist_id.currency_id.name}</strong><br />\n"
+" &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
+" % if object.origin:\n"
+" &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
+" % endif\n"
+" % if object.partner_ref:\n"
+" &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
+" % endif\n"
+" % if object.validator:\n"
+" &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.validator.email "
+"or ''}?subject=Order%20${object.name}\">${object.validator.name}</a>\n"
+" % endif\n"
+" </p>\n"
+"\n"
+" <br/>\n"
+" <p>If you have any question, do not hesitate to contact us.</p>\n"
+" <p>Thank you!</p>\n"
+" <br/>\n"
+" <br/>\n"
+" <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
+"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
+"background-repeat: repeat no-repeat;\">\n"
+" <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
+"#DDD;\">\n"
+" <strong style=\"text-"
+"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
+" </div>\n"
+" <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
+"16px; background-color: #F2F2F2;\">\n"
+" <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
+" % if object.company_id.street:\n"
+" ${object.company_id.street}<br/>\n"
+" % endif\n"
+" % if object.company_id.street2:\n"
+" ${object.company_id.street2}<br/>\n"
+" % endif\n"
+" % if object.company_id.city or object.company_id.zip:\n"
+" ${object.company_id.zip} ${object.company_id.city}<br/>\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 ''}<br/>\n"
+" % endif\n"
+" </span>\n"
+" % if object.company_id.phone:\n"
+" <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
+"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
+"0px; padding-left: 0px; \">\n"
+" Phone:&nbsp; ${object.company_id.phone}\n"
+" </div>\n"
+" % endif\n"
+" % if object.company_id.website:\n"
+" <div>\n"
+" Web :&nbsp;<a "
+"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
+" </div>\n"
+" %endif\n"
+" <p></p>\n"
+" </div>\n"
+"</div>\n"
+" "
+msgstr ""
+
+#. module: purchase
#: view:purchase.report:0
msgid "Order of Year"
msgstr "Zamówienia z roku"
@@ -1069,17 +1142,12 @@ msgid "Outgoing Mails"
msgstr "Wychodzace"
#. module: purchase
-#: code:addons/purchase/purchase.py:437
+#: code:addons/purchase/purchase.py:456
#, python-format
msgid "You cannot confirm a purchase order without any purchase order line."
msgstr "Nie można potwierdzać zamówienia zakupu bez pozycji."
#. module: purchase
-#: model:ir.actions.server,name:purchase.actions_server_purchase_order_unread
-msgid "Purchase: Mark unread"
-msgstr "Zakupy:: Oznacz jako nieprzeczytane"
-
-#. module: purchase
#: help:purchase.order,message_ids:0
msgid "Messages and communication history"
msgstr "Wiadomości i historia komunikacji"
@@ -1091,7 +1159,7 @@ msgid "Destination Warehouse"
msgstr "Docelowy magazyn"
#. module: purchase
-#: code:addons/purchase/purchase.py:973
+#: code:addons/purchase/purchase.py:941
#, python-format
msgid ""
"Selected Unit of Measure does not belong to the same category as the product "
@@ -1101,6 +1169,11 @@ msgstr ""
"produktu."
#. module: purchase
+#: view:purchase.order.line_invoice:0
+msgid "Select an Open Sales Order"
+msgstr "Wybierz otwarte zamówienia sprzedaży"
+
+#. module: purchase
#: model:ir.ui.menu,name:purchase.menu_purchase_unit_measure_purchase
#: model:ir.ui.menu,name:purchase.menu_purchase_uom_form_action
msgid "Units of Measure"
@@ -1112,18 +1185,12 @@ msgid "Manage pricelist per supplier"
msgstr "Zarządzaj cennikami dostawców"
#. module: purchase
-#: code:addons/purchase/purchase.py:833
-#, python-format
-msgid "Purchase Order has been set to <b>draft</b>."
-msgstr "Zamowienie zakupu zostało ustawione na <b>projekt</b>."
-
-#. module: purchase
#: view:board.board:0
msgid "Purchase Dashboard"
msgstr "Konsola zakupów"
#. module: purchase
-#: code:addons/purchase/purchase.py:566
+#: code:addons/purchase/purchase.py:580
#, python-format
msgid "First cancel all receptions related to this purchase order."
msgstr "Najpierw anuluj wszystkie pobrania do tego zamówienia zakkupu."
@@ -1162,9 +1229,9 @@ msgid "Unread Messages"
msgstr "Nieprzeczytane wiadomości"
#. module: purchase
-#: view:purchase.order.line_invoice:0
-msgid "Select an Open Sale Order"
-msgstr "Wybierz otwarte zamówienie sprzedaży"
+#: model:ir.ui.menu,name:purchase.menu_purchase_uom_categ_form_action
+msgid "Unit of Measure Categories"
+msgstr "Kategorie jednostek miary"
#. module: purchase
#: view:purchase.order:0
@@ -1172,6 +1239,13 @@ msgid "Set to Draft"
msgstr "Ustaw na projekt"
#. module: purchase
+#: help:purchase.order,origin:0
+msgid ""
+"Reference of the document that generated this purchase order request; a "
+"sales order or an internal procurement request."
+msgstr ""
+
+#. module: purchase
#: view:purchase.order.line:0
msgid "Notes"
msgstr "Uwagi"
@@ -1201,7 +1275,7 @@ msgid "Stock Move"
msgstr "Przesunięcie zapasu"
#. module: purchase
-#: code:addons/purchase/purchase.py:255
+#: code:addons/purchase/purchase.py:260
#, python-format
msgid "Invalid Action!"
msgstr "Niedozwolona akcja!"
@@ -1305,7 +1379,7 @@ msgstr ""
" zamówienia zakupu"
#. module: purchase
-#: code:addons/purchase/purchase.py:310
+#: code:addons/purchase/purchase.py:320
#, python-format
msgid "Please create Invoices."
msgstr "Utwórz faktury"
@@ -1403,7 +1477,7 @@ msgid "Purchase Order Line Make Invoice"
msgstr "Pozycja zamówienia zakupu tworzy fakturę"
#. module: purchase
-#: code:addons/purchase/purchase.py:1133
+#: code:addons/purchase/purchase.py:1141
#, python-format
msgid "PO: %s"
msgstr "ZZ: %s"
@@ -1414,7 +1488,7 @@ msgid "Send by EMail"
msgstr "Wyślij mailem"
#. module: purchase
-#: code:addons/purchase/purchase.py:498
+#: code:addons/purchase/purchase.py:515
#, python-format
msgid "Define purchase journal for this company: \"%s\" (id:%d)."
msgstr "Zdefiniuj dziennik zakupów dla tej firmy: \"%s\" (id:%d)."
@@ -1425,9 +1499,9 @@ msgid "Purchase Order "
msgstr "Zamówienie zakupu "
#. module: purchase
-#: view:purchase.order.line:0
-msgid "Manual Invoices"
-msgstr "Ręczne faktury"
+#: help:purchase.config.settings,group_costing_method:0
+msgid "Allows you to compute product cost price based on average cost."
+msgstr "Pozwala obliczyć cenę produktu opartą o koszt przeciętny."
#. module: purchase
#: model:ir.actions.act_window,name:purchase.action_purchase_configuration
@@ -1592,8 +1666,8 @@ msgid "Compute product cost price based on average cost"
msgstr "Wyliczaj ceną kosztową na podstawie ceny przeciętnej"
#. module: purchase
-#: code:addons/purchase/purchase.py:340
-#: code:addons/purchase/wizard/purchase_line_invoice.py:141
+#: code:addons/purchase/purchase.py:350
+#: code:addons/purchase/wizard/purchase_line_invoice.py:137
#: model:ir.actions.act_window,name:purchase.act_res_partner_2_supplier_invoices
#: view:res.partner:0
#, python-format
@@ -1715,9 +1789,10 @@ msgid "Open Purchase Menu"
msgstr "Otwórz menu Zakupów"
#. module: purchase
-#: model:ir.model,name:purchase.model_mail_compose_message
-msgid "Email composition wizard"
-msgstr "Kreator email"
+#: code:addons/purchase/purchase.py:1028
+#, python-format
+msgid "No address defined for the supplier"
+msgstr "Nie zdefiniowano adresu dla dostawcy"
#. module: purchase
#: field:purchase.order,company_id:0
@@ -1788,11 +1863,11 @@ msgid "Purchase Order"
msgstr "Zamówienie zakupu"
#. module: purchase
-#: code:addons/purchase/purchase.py:310
-#: code:addons/purchase/purchase.py:437
-#: code:addons/purchase/purchase.py:497
-#: code:addons/purchase/purchase.py:508
-#: code:addons/purchase/wizard/purchase_line_invoice.py:109
+#: code:addons/purchase/purchase.py:320
+#: code:addons/purchase/purchase.py:456
+#: code:addons/purchase/purchase.py:514
+#: code:addons/purchase/purchase.py:525
+#: code:addons/purchase/wizard/purchase_line_invoice.py:105
#, python-format
msgid "Error!"
msgstr "Błąd!"
@@ -1814,16 +1889,6 @@ msgid ""
msgstr ""
#. module: purchase
-#: model:process.transition,note:purchase.process_transition_packinginvoice0
-msgid ""
-"A Pick list generates an invoice. Depending on the Invoicing control of the "
-"sale order, the invoice is based on delivered or on ordered quantities."
-msgstr ""
-"Pobranie tworzy fakturę. Zależnie od ustawień fakturowania zamówień "
-"sprzedaży, faktura jest tworzona na podstawie ilości wysłanych lub "
-"zamówionych."
-
-#. module: purchase
#: selection:purchase.order,state:0
#: selection:purchase.order.line,state:0
#: selection:purchase.report,state:0
@@ -1836,10 +1901,9 @@ msgid "# of Purchase Order"
msgstr "# Zamówień zakupu"
#. module: purchase
-#: code:addons/purchase/purchase.py:827
-#, python-format
-msgid "Shipment <b>received</b>."
-msgstr "Przyjęcie <b>przyjęte</b>."
+#: model:ir.model,name:purchase.model_mail_compose_message
+msgid "Email composition wizard"
+msgstr "Kreator email"
#. module: purchase
#: report:purchase.quotation:0
@@ -1926,7 +1990,7 @@ msgid "RFQ_${(object.name or '').replace('/','_')}"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:988
+#: code:addons/purchase/purchase.py:956
#, python-format
msgid "The selected supplier only sells this product by %s"
msgstr "Wybrany dostawca sprzedaje ten produkt tylko po %s"
@@ -1972,6 +2036,12 @@ msgid "Outgoing products to invoice"
msgstr "Wydawane produkty do zafakturowania"
#. module: purchase
+#: report:purchase.order:0
+#: field:purchase.report,validator:0
+msgid "Validated By"
+msgstr "Zatwierdzone przez"
+
+#. module: purchase
#: view:purchase.report:0
#: field:purchase.report,delay_pass:0
msgid "Days to Deliver"
@@ -2061,9 +2131,9 @@ msgid "November"
msgstr "Listopad"
#. module: purchase
-#: help:purchase.config.settings,group_costing_method:0
-msgid "Allows you to compute product cost price based on average cost."
-msgstr "Pozwala obliczyć cenę produktu opartą o koszt przeciętny."
+#: view:purchase.order.line:0
+msgid "Manual Invoices"
+msgstr "Ręczne faktury"
#. module: purchase
#: report:purchase.order:0
@@ -2090,15 +2160,6 @@ msgstr ""
"Na podstawie przyjęć: Pozwala fakturować przy zatwierdzaniu przyjęcia."
#. module: purchase
-#: help:purchase.order,origin:0
-msgid ""
-"Reference of the document that generated this purchase order request; a sale "
-"order or an internal procurement request."
-msgstr ""
-"Odnośnik do dokumentu, który spowodował wygenerowanie tego zamówienia "
-"zakupu, To może być zamówienie sprzedaży lub Zapotrzebowanie."
-
-#. module: purchase
#: model:ir.ui.menu,name:purchase.menu_partner_categories_in_form
msgid "Partner Categories"
msgstr "Kategorie partnera"
@@ -2119,89 +2180,6 @@ msgid "Invoicing Settings"
msgstr "Ustawienia fakturowania"
#. module: purchase
-#: model:email.template,body_html:purchase.email_template_edi_purchase
-msgid ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"\n"
-" <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
-"or ''},</p>\n"
-" \n"
-" <p>Here is a ${object.state in ('draft', 'sent') and 'request for "
-"quotation' or 'purchase order confirmation'} from ${object.company_id.name}: "
-"</p>\n"
-" \n"
-" <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
-" &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
-" &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
-" &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
-"${object.pricelist_id.currency_id.name}</strong><br />\n"
-" &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
-" % if object.origin:\n"
-" &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
-" % endif\n"
-" % if object.partner_ref:\n"
-" &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
-" % endif\n"
-" % if object.validator:\n"
-" &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.validator.email "
-"or ''}?subject=Order%20${object.name}\">${object.validator.name}</a>\n"
-" % endif\n"
-" </p>\n"
-"\n"
-" <br/>\n"
-" <p>If you have any question, do not hesitate to contact us.</p>\n"
-" <p>Thank you!</p>\n"
-" <br/>\n"
-" <br/>\n"
-" <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
-"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
-"background-repeat: repeat no-repeat;\">\n"
-" <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
-"#FFF;\">\n"
-" <strong style=\"text-"
-"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
-" </div>\n"
-" <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
-"16px; background-color: #F2F2F2;\">\n"
-" <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
-" % if object.company_id.street:\n"
-" ${object.company_id.street}<br/>\n"
-" % endif\n"
-" % if object.company_id.street2:\n"
-" ${object.company_id.street2}<br/>\n"
-" % endif\n"
-" % if object.company_id.city or object.company_id.zip:\n"
-" ${object.company_id.zip} ${object.company_id.city}<br/>\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 ''}<br/>\n"
-" % endif\n"
-" </span>\n"
-" % if object.company_id.phone:\n"
-" <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
-"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
-"0px; padding-left: 0px; \">\n"
-" Phone:&nbsp; ${object.company_id.phone}\n"
-" </div>\n"
-" % endif\n"
-" % if object.company_id.website:\n"
-" <div>\n"
-" Web :&nbsp;<a "
-"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
-" </div>\n"
-" %endif\n"
-" <p></p>\n"
-" </div>\n"
-"</div>\n"
-" "
-msgstr ""
-
-#. module: purchase
#: model:ir.actions.act_window,name:purchase.action_purchase_order_by_user_all
msgid "Total Orders by User per month"
msgstr "Suma zamówień na użytkownika na miesiąc"
@@ -2212,24 +2190,19 @@ msgid "Based on incoming shipments"
msgstr "Na podstawie przyjęć"
#. module: purchase
+#: code:addons/purchase/purchase.py:1018
+#, python-format
+msgid "No default supplier defined for this product"
+msgstr "Brak dostawcy dla tego produktu."
+
+#. module: purchase
#: view:purchase.report:0
#: field:purchase.report,warehouse_id:0
msgid "Warehouse"
msgstr "Magazyn"
#. module: purchase
-#: help:purchase.order,partner_ref:0
-msgid ""
-"Reference of the sale order or quotation sent by your supplier. It's mainly "
-"used to do the matching when you receive the products as this reference is "
-"usually written on the delivery order sent by your supplier."
-msgstr ""
-"Odnośnik zamówienia sprzedaży lub oferty przysłanej ci przez dostawcę. To "
-"jest stosowane do skojarzenia z dokumentem wydania wystawionym przez "
-"dostawcę."
-
-#. module: purchase
-#: code:addons/purchase/purchase.py:991
+#: code:addons/purchase/purchase.py:960
#, python-format
msgid ""
"The selected supplier has a minimal quantity set to %s %s, you should not "
@@ -2314,9 +2287,9 @@ msgstr ""
" "
#. module: purchase
-#: view:product.product:0
-msgid "When you sell this service to a customer,"
-msgstr "Kiedy sprzedaż usługę klientowi"
+#: field:purchase.order,message_summary:0
+msgid "Summary"
+msgstr "Podsumowanie"
#. module: purchase
#: model:ir.actions.act_window,name:purchase.purchase_pricelist_version_action
@@ -2325,6 +2298,11 @@ msgid "Pricelist Versions"
msgstr "Wersje cennika"
#. module: purchase
+#: field:purchase.order,payment_term_id:0
+msgid "Payment Term"
+msgstr "Warunki płatności"
+
+#. module: purchase
#: view:purchase.order:0
msgid "Purchase orders which are in draft state"
msgstr "Zamówienia zakupu w stanie Projekt"
@@ -2744,6 +2722,9 @@ msgstr "Zamówienia"
#~ msgid "You can not confirm purchase order without Purchase Order Lines."
#~ msgstr "Nie możesz potwierdzić zamówienia zakupu bez pozycji."
+#~ msgid "Select an Open Sale Order"
+#~ msgstr "Wybierz otwarte zamówienie sprzedaży"
+
#~ msgid "Do you want to generate the supplier invoices ?"
#~ msgstr "Chcesz generować fakturę od dostawcy ?"
@@ -2773,6 +2754,14 @@ msgstr "Zamówienia"
#~ msgid "Dest. Address Contact Name"
#~ msgstr "Nazwa kontaktu"
+#~ msgid ""
+#~ "A Pick list generates an invoice. Depending on the Invoicing control of the "
+#~ "sale order, the invoice is based on delivered or on ordered quantities."
+#~ msgstr ""
+#~ "Pobranie tworzy fakturę. Zależnie od ustawień fakturowania zamówień "
+#~ "sprzedaży, faktura jest tworzona na podstawie ilości wysłanych lub "
+#~ "zamówionych."
+
#, python-format
#~ msgid "Purchase amount over the limit"
#~ msgstr "Wartość zakupu powyżej limitu"
diff --git a/addons/purchase/i18n/pt.po b/addons/purchase/i18n/pt.po
index 709b0de7264..11571098727 100644
--- a/addons/purchase/i18n/pt.po
+++ b/addons/purchase/i18n/pt.po
@@ -6,15 +6,15 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
"PO-Revision-Date: 2012-05-10 17:34+0000\n"
"Last-Translator: Raphael Collet (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: 2012-12-04 05:12+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:19+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
#. module: purchase
#: model:res.groups,name:purchase.group_analytic_accounting
@@ -60,11 +60,6 @@ msgstr ""
"processa o preço do fornecedor para os artigos e quantidades selecionados."
#. module: purchase
-#: model:ir.actions.server,name:purchase.actions_server_purchase_order_read
-msgid "Purchase: Mark read"
-msgstr ""
-
-#. module: purchase
#: view:purchase.report:0
#: field:purchase.report,day:0
msgid "Day"
@@ -105,16 +100,13 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:973
-#: code:addons/purchase/purchase.py:988
-#: code:addons/purchase/purchase.py:991
-#: code:addons/purchase/wizard/purchase_order_group.py:47
+#: code:addons/purchase/purchase.py:1024
#, python-format
-msgid "Warning!"
+msgid "Configuration Error!"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:573
+#: code:addons/purchase/purchase.py:587
#, python-format
msgid "You must first cancel all receptions related to this purchase order."
msgstr ""
@@ -133,10 +125,10 @@ msgid "Purchase-Standard Price"
msgstr "Preço padrão de compra"
#. module: purchase
-#: report:purchase.order:0
-#: field:purchase.report,validator:0
-msgid "Validated By"
-msgstr "Validado Por"
+#: code:addons/purchase/purchase.py:1011
+#, python-format
+msgid "No supplier defined for this product !"
+msgstr ""
#. module: purchase
#: model:ir.actions.act_window,help:purchase.action_picking_tree4_picking_to_invoice
@@ -159,12 +151,6 @@ msgid "Average Price"
msgstr "Preço médio"
#. module: purchase
-#: code:addons/purchase/purchase.py:830
-#, python-format
-msgid "Invoice <b>paid</b>."
-msgstr ""
-
-#. module: purchase
#: view:purchase.order:0
msgid "Purchase order which are in the exception state"
msgstr "Ordem de compra que está no estado de excepção"
@@ -236,7 +222,7 @@ msgstr ""
"de ordens de compra"
#. module: purchase
-#: code:addons/purchase/purchase.py:255
+#: code:addons/purchase/purchase.py:260
#, python-format
msgid "In order to delete a purchase order, you must cancel it first."
msgstr ""
@@ -262,29 +248,12 @@ msgid "Total Untaxed amount"
msgstr "Total sem impostos"
#. module: purchase
-#: model:ir.ui.menu,name:purchase.menu_purchase_uom_categ_form_action
-msgid "Unit of Measure Categories"
-msgstr ""
-
-#. module: purchase
#: view:purchase.report:0
#: field:purchase.report,category_id:0
msgid "Category"
msgstr "Categori­a"
#. module: purchase
-#: view:purchase.order:0
-msgid "Quotation "
-msgstr ""
-
-#. module: purchase
-#: code:addons/purchase/purchase.py:810
-#, python-format
-msgid ""
-"Quotation for <em>%s</em> <b>converted</b> to a Purchase Order of %s %s."
-msgstr ""
-
-#. module: purchase
#: model:process.transition,note:purchase.process_transition_purchaseinvoice0
msgid ""
"A purchase order generates a supplier invoice, as soon as it is confirmed by "
@@ -352,14 +321,16 @@ msgid "October"
msgstr "Outubro"
#. module: purchase
-#: code:addons/purchase/purchase.py:837
+#: code:addons/purchase/purchase.py:1024
#, python-format
-msgid "Purchase Order for <em>%s</em> <b>cancelled</b>."
+msgid ""
+"The product \"%s\" has been defined with your company as reseller which "
+"seems to be a configuration error!"
msgstr ""
#. module: purchase
-#: field:purchase.order,message_summary:0
-msgid "Summary"
+#: view:product.product:0
+msgid "When you sell this service to a customer,"
msgstr ""
#. module: purchase
@@ -388,12 +359,6 @@ msgid "Quantity"
msgstr "Quantidade"
#. module: purchase
-#: code:addons/purchase/purchase.py:819
-#, python-format
-msgid "Shipment <em>%s</em> <b>scheduled</b> for %s."
-msgstr ""
-
-#. module: purchase
#: field:purchase.order,fiscal_position:0
msgid "Fiscal Position"
msgstr "Posição Fiscal"
@@ -451,12 +416,6 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:824
-#, python-format
-msgid "Draft Invoice of %s %s is <b>waiting for validation</b>."
-msgstr ""
-
-#. module: purchase
#: model:ir.actions.act_window,help:purchase.purchase_line_form_action2
msgid ""
"<p>\n"
@@ -477,6 +436,11 @@ msgid "Scheduled Date"
msgstr "Data programada"
#. module: purchase
+#: field:purchase.order,currency_id:0
+msgid "Currency"
+msgstr ""
+
+#. module: purchase
#: field:purchase.order,journal_id:0
msgid "Journal"
msgstr "Diário"
@@ -509,6 +473,19 @@ msgid "Incoming Products"
msgstr ""
#. module: purchase
+#: view:purchase.order:0
+msgid "Request for Quotation "
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,partner_ref:0
+msgid ""
+"Reference of the sales order or quotation sent by your supplier. It's mainly "
+"used to do the matching when you receive the products as this reference is "
+"usually written on the delivery order sent by your supplier."
+msgstr ""
+
+#. module: purchase
#: view:purchase.config.settings:0
#: view:purchase.order.group:0
#: view:purchase.order.line_invoice:0
@@ -532,6 +509,11 @@ msgstr ""
"(controlo Manual = Fatura)."
#. module: purchase
+#: model:mail.message.subtype,name:purchase.mt_rfq_approved
+msgid "RFQ Approved"
+msgstr ""
+
+#. module: purchase
#: view:purchase.config.settings:0
msgid "Apply"
msgstr ""
@@ -551,6 +533,11 @@ msgstr ""
"torna-se uma ordem de compra confirmada."
#. module: purchase
+#: model:mail.message.subtype,name:purchase.mt_rfq_confirmed
+msgid "RFQ Confirmed"
+msgstr ""
+
+#. module: purchase
#: view:purchase.order:0
msgid "Customer Address"
msgstr ""
@@ -575,7 +562,7 @@ msgid "Supplier"
msgstr "Fornecedor"
#. module: purchase
-#: code:addons/purchase/purchase.py:508
+#: code:addons/purchase/purchase.py:525
#, python-format
msgid "Define expense account for this company: \"%s\" (id:%d)."
msgstr ""
@@ -599,7 +586,6 @@ msgstr "Subtotal"
#. module: purchase
#: field:purchase.order,shipped:0
-#: field:purchase.order,shipped_rate:0
msgid "Received"
msgstr "Recebido"
@@ -641,13 +627,20 @@ msgid "Invoices and Receptions"
msgstr ""
#. module: purchase
+#: model:process.transition,note:purchase.process_transition_packinginvoice0
+msgid ""
+"A Pick list generates an invoice. Depending on the Invoicing control of the "
+"sales order, the invoice is based on delivered or on ordered quantities."
+msgstr ""
+
+#. module: purchase
#: view:purchase.report:0
#: field:purchase.report,nbr:0
msgid "# of Lines"
msgstr "# de Linhas"
#. module: purchase
-#: code:addons/purchase/wizard/purchase_line_invoice.py:110
+#: code:addons/purchase/wizard/purchase_line_invoice.py:106
#, python-format
msgid "Define expense account for this product: \"%s\" (id:%d)."
msgstr ""
@@ -668,8 +661,8 @@ msgid "It indicates that a picking has been done"
msgstr "Indica que a recepção foi concluída"
#. module: purchase
-#: code:addons/purchase/purchase.py:565
-#: code:addons/purchase/purchase.py:572
+#: code:addons/purchase/purchase.py:579
+#: code:addons/purchase/purchase.py:586
#, python-format
msgid "Unable to cancel this purchase order."
msgstr ""
@@ -734,6 +727,15 @@ msgid "Draft PO"
msgstr ""
#. module: purchase
+#: code:addons/purchase/purchase.py:941
+#: code:addons/purchase/purchase.py:956
+#: code:addons/purchase/purchase.py:960
+#: code:addons/purchase/wizard/purchase_order_group.py:47
+#, python-format
+msgid "Warning!"
+msgstr ""
+
+#. module: purchase
#: model:process.node,name:purchase.process_node_draftpurchaseorder0
#: model:process.node,name:purchase.process_node_draftpurchaseorder1
msgid "RFQ"
@@ -765,6 +767,11 @@ msgid "The tax amount"
msgstr "O montante de impostos"
#. module: purchase
+#: field:purchase.order,shipped_rate:0
+msgid "Received Ratio"
+msgstr ""
+
+#. module: purchase
#: selection:purchase.report,month:0
msgid "September"
msgstr "Setembro"
@@ -796,7 +803,7 @@ msgid "Stock Moves"
msgstr "Movimentos de stock"
#. module: purchase
-#: code:addons/purchase/purchase.py:1158
+#: code:addons/purchase/purchase.py:1156
#, python-format
msgid "Draft Purchase Order created"
msgstr ""
@@ -817,11 +824,6 @@ msgid "Terms and Conditions"
msgstr ""
#. module: purchase
-#: field:purchase.order,currency_id:0
-msgid "unknown"
-msgstr ""
-
-#. module: purchase
#: help:purchase.order,date_order:0
msgid "Date on which this document has been created."
msgstr "Data de criação deste documento."
@@ -915,12 +917,6 @@ msgid "Cancel"
msgstr "Cancelar"
#. module: purchase
-#: field:purchase.order,message_comment_ids:0
-#: help:purchase.order,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
-#. module: purchase
#: sql_constraint:purchase.order:0
msgid "Order Reference must be unique per Company!"
msgstr "Ordem de referência deve ser única por empresa!"
@@ -954,14 +950,89 @@ msgid "Date Approved"
msgstr "Data de Aprovação"
#. module: purchase
-#: code:addons/purchase/purchase.py:806
-#, python-format
-msgid "Request for quotation <b>created</b>."
+#: view:product.product:0
+msgid "a draft purchase order"
msgstr ""
#. module: purchase
-#: view:product.product:0
-msgid "a draft purchase order"
+#: model:email.template,body_html:purchase.email_template_edi_purchase
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: #FFF; \">\n"
+"\n"
+" <p>Hello$ ${object.partner_id.name},</p>\n"
+" \n"
+" <p>Here is a ${object.state in ('draft', 'sent') and 'request for "
+"quotation' or 'purchase order confirmation'} from ${object.company_id.name}: "
+"</p>\n"
+" \n"
+" <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
+" &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
+" &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
+" &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
+"${object.pricelist_id.currency_id.name}</strong><br />\n"
+" &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
+" % if object.origin:\n"
+" &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
+" % endif\n"
+" % if object.partner_ref:\n"
+" &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
+" % endif\n"
+" % if object.validator:\n"
+" &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.validator.email "
+"or ''}?subject=Order%20${object.name}\">${object.validator.name}</a>\n"
+" % endif\n"
+" </p>\n"
+"\n"
+" <br/>\n"
+" <p>If you have any question, do not hesitate to contact us.</p>\n"
+" <p>Thank you!</p>\n"
+" <br/>\n"
+" <br/>\n"
+" <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
+"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
+"background-repeat: repeat no-repeat;\">\n"
+" <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
+"#DDD;\">\n"
+" <strong style=\"text-"
+"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
+" </div>\n"
+" <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
+"16px; background-color: #F2F2F2;\">\n"
+" <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
+" % if object.company_id.street:\n"
+" ${object.company_id.street}<br/>\n"
+" % endif\n"
+" % if object.company_id.street2:\n"
+" ${object.company_id.street2}<br/>\n"
+" % endif\n"
+" % if object.company_id.city or object.company_id.zip:\n"
+" ${object.company_id.zip} ${object.company_id.city}<br/>\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 ''}<br/>\n"
+" % endif\n"
+" </span>\n"
+" % if object.company_id.phone:\n"
+" <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
+"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
+"0px; padding-left: 0px; \">\n"
+" Phone:&nbsp; ${object.company_id.phone}\n"
+" </div>\n"
+" % endif\n"
+" % if object.company_id.website:\n"
+" <div>\n"
+" Web :&nbsp;<a "
+"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
+" </div>\n"
+" %endif\n"
+" <p></p>\n"
+" </div>\n"
+"</div>\n"
+" "
msgstr ""
#. module: purchase
@@ -1004,17 +1075,12 @@ msgid "Outgoing Mails"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:437
+#: code:addons/purchase/purchase.py:456
#, python-format
msgid "You cannot confirm a purchase order without any purchase order line."
msgstr ""
#. module: purchase
-#: model:ir.actions.server,name:purchase.actions_server_purchase_order_unread
-msgid "Purchase: Mark unread"
-msgstr ""
-
-#. module: purchase
#: help:purchase.order,message_ids:0
msgid "Messages and communication history"
msgstr ""
@@ -1026,7 +1092,7 @@ msgid "Destination Warehouse"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:973
+#: code:addons/purchase/purchase.py:941
#, python-format
msgid ""
"Selected Unit of Measure does not belong to the same category as the product "
@@ -1034,6 +1100,11 @@ msgid ""
msgstr ""
#. module: purchase
+#: view:purchase.order.line_invoice:0
+msgid "Select an Open Sales Order"
+msgstr ""
+
+#. module: purchase
#: model:ir.ui.menu,name:purchase.menu_purchase_unit_measure_purchase
#: model:ir.ui.menu,name:purchase.menu_purchase_uom_form_action
msgid "Units of Measure"
@@ -1045,18 +1116,12 @@ msgid "Manage pricelist per supplier"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:833
-#, python-format
-msgid "Purchase Order has been set to <b>draft</b>."
-msgstr ""
-
-#. module: purchase
#: view:board.board:0
msgid "Purchase Dashboard"
msgstr "Painel de controlo da compra"
#. module: purchase
-#: code:addons/purchase/purchase.py:566
+#: code:addons/purchase/purchase.py:580
#, python-format
msgid "First cancel all receptions related to this purchase order."
msgstr ""
@@ -1095,9 +1160,9 @@ msgid "Unread Messages"
msgstr ""
#. module: purchase
-#: view:purchase.order.line_invoice:0
-msgid "Select an Open Sale Order"
-msgstr "Selecione uma Ordem de Venda em Aberto"
+#: model:ir.ui.menu,name:purchase.menu_purchase_uom_categ_form_action
+msgid "Unit of Measure Categories"
+msgstr ""
#. module: purchase
#: view:purchase.order:0
@@ -1105,6 +1170,13 @@ msgid "Set to Draft"
msgstr "Definir como Rascunho"
#. module: purchase
+#: help:purchase.order,origin:0
+msgid ""
+"Reference of the document that generated this purchase order request; a "
+"sales order or an internal procurement request."
+msgstr ""
+
+#. module: purchase
#: view:purchase.order.line:0
msgid "Notes"
msgstr "Notas"
@@ -1134,7 +1206,7 @@ msgid "Stock Move"
msgstr "Movimento do Stock"
#. module: purchase
-#: code:addons/purchase/purchase.py:255
+#: code:addons/purchase/purchase.py:260
#, python-format
msgid "Invalid Action!"
msgstr ""
@@ -1236,7 +1308,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:310
+#: code:addons/purchase/purchase.py:320
#, python-format
msgid "Please create Invoices."
msgstr ""
@@ -1326,7 +1398,7 @@ msgid "Purchase Order Line Make Invoice"
msgstr "Linha Ordem de Compra Faça Fatura"
#. module: purchase
-#: code:addons/purchase/purchase.py:1133
+#: code:addons/purchase/purchase.py:1141
#, python-format
msgid "PO: %s"
msgstr "PO: %s"
@@ -1337,7 +1409,7 @@ msgid "Send by EMail"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:498
+#: code:addons/purchase/purchase.py:515
#, python-format
msgid "Define purchase journal for this company: \"%s\" (id:%d)."
msgstr ""
@@ -1348,9 +1420,9 @@ msgid "Purchase Order "
msgstr ""
#. module: purchase
-#: view:purchase.order.line:0
-msgid "Manual Invoices"
-msgstr "Faturação Manual"
+#: help:purchase.config.settings,group_costing_method:0
+msgid "Allows you to compute product cost price based on average cost."
+msgstr ""
#. module: purchase
#: model:ir.actions.act_window,name:purchase.action_purchase_configuration
@@ -1504,8 +1576,8 @@ msgid "Compute product cost price based on average cost"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:340
-#: code:addons/purchase/wizard/purchase_line_invoice.py:141
+#: code:addons/purchase/purchase.py:350
+#: code:addons/purchase/wizard/purchase_line_invoice.py:137
#: model:ir.actions.act_window,name:purchase.act_res_partner_2_supplier_invoices
#: view:res.partner:0
#, python-format
@@ -1617,8 +1689,9 @@ msgid "Open Purchase Menu"
msgstr ""
#. module: purchase
-#: model:ir.model,name:purchase.model_mail_compose_message
-msgid "Email composition wizard"
+#: code:addons/purchase/purchase.py:1028
+#, python-format
+msgid "No address defined for the supplier"
msgstr ""
#. module: purchase
@@ -1691,11 +1764,11 @@ msgid "Purchase Order"
msgstr "Ordem de Compra"
#. module: purchase
-#: code:addons/purchase/purchase.py:310
-#: code:addons/purchase/purchase.py:437
-#: code:addons/purchase/purchase.py:497
-#: code:addons/purchase/purchase.py:508
-#: code:addons/purchase/wizard/purchase_line_invoice.py:109
+#: code:addons/purchase/purchase.py:320
+#: code:addons/purchase/purchase.py:456
+#: code:addons/purchase/purchase.py:514
+#: code:addons/purchase/purchase.py:525
+#: code:addons/purchase/wizard/purchase_line_invoice.py:105
#, python-format
msgid "Error!"
msgstr ""
@@ -1717,15 +1790,6 @@ msgid ""
msgstr ""
#. module: purchase
-#: model:process.transition,note:purchase.process_transition_packinginvoice0
-msgid ""
-"A Pick list generates an invoice. Depending on the Invoicing control of the "
-"sale order, the invoice is based on delivered or on ordered quantities."
-msgstr ""
-"Uma recepção, gera uma fatura. Conforme o controlo de faturação da ordem de "
-"venda, a fatura é baseada nas quantidades entregues ou nas encomendadas."
-
-#. module: purchase
#: selection:purchase.order,state:0
#: selection:purchase.order.line,state:0
#: selection:purchase.report,state:0
@@ -1738,9 +1802,8 @@ msgid "# of Purchase Order"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:827
-#, python-format
-msgid "Shipment <b>received</b>."
+#: model:ir.model,name:purchase.model_mail_compose_message
+msgid "Email composition wizard"
msgstr ""
#. module: purchase
@@ -1830,7 +1893,7 @@ msgid "RFQ_${(object.name or '').replace('/','_')}"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:988
+#: code:addons/purchase/purchase.py:956
#, python-format
msgid "The selected supplier only sells this product by %s"
msgstr "O fornecedor selecionado só vende este artigo %s"
@@ -1876,6 +1939,12 @@ msgid "Outgoing products to invoice"
msgstr "Artigos em expedição, por faturar"
#. module: purchase
+#: report:purchase.order:0
+#: field:purchase.report,validator:0
+msgid "Validated By"
+msgstr "Validado Por"
+
+#. module: purchase
#: view:purchase.report:0
#: field:purchase.report,delay_pass:0
msgid "Days to Deliver"
@@ -1965,9 +2034,9 @@ msgid "November"
msgstr "Novembro"
#. module: purchase
-#: help:purchase.config.settings,group_costing_method:0
-msgid "Allows you to compute product cost price based on average cost."
-msgstr ""
+#: view:purchase.order.line:0
+msgid "Manual Invoices"
+msgstr "Faturação Manual"
#. module: purchase
#: report:purchase.order:0
@@ -1990,13 +2059,6 @@ msgid ""
msgstr ""
#. module: purchase
-#: help:purchase.order,origin:0
-msgid ""
-"Reference of the document that generated this purchase order request; a sale "
-"order or an internal procurement request."
-msgstr ""
-
-#. module: purchase
#: model:ir.ui.menu,name:purchase.menu_partner_categories_in_form
msgid "Partner Categories"
msgstr "Categorias de parceiros"
@@ -2017,89 +2079,6 @@ msgid "Invoicing Settings"
msgstr ""
#. module: purchase
-#: model:email.template,body_html:purchase.email_template_edi_purchase
-msgid ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"\n"
-" <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
-"or ''},</p>\n"
-" \n"
-" <p>Here is a ${object.state in ('draft', 'sent') and 'request for "
-"quotation' or 'purchase order confirmation'} from ${object.company_id.name}: "
-"</p>\n"
-" \n"
-" <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
-" &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
-" &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
-" &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
-"${object.pricelist_id.currency_id.name}</strong><br />\n"
-" &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
-" % if object.origin:\n"
-" &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
-" % endif\n"
-" % if object.partner_ref:\n"
-" &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
-" % endif\n"
-" % if object.validator:\n"
-" &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.validator.email "
-"or ''}?subject=Order%20${object.name}\">${object.validator.name}</a>\n"
-" % endif\n"
-" </p>\n"
-"\n"
-" <br/>\n"
-" <p>If you have any question, do not hesitate to contact us.</p>\n"
-" <p>Thank you!</p>\n"
-" <br/>\n"
-" <br/>\n"
-" <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
-"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
-"background-repeat: repeat no-repeat;\">\n"
-" <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
-"#FFF;\">\n"
-" <strong style=\"text-"
-"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
-" </div>\n"
-" <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
-"16px; background-color: #F2F2F2;\">\n"
-" <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
-" % if object.company_id.street:\n"
-" ${object.company_id.street}<br/>\n"
-" % endif\n"
-" % if object.company_id.street2:\n"
-" ${object.company_id.street2}<br/>\n"
-" % endif\n"
-" % if object.company_id.city or object.company_id.zip:\n"
-" ${object.company_id.zip} ${object.company_id.city}<br/>\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 ''}<br/>\n"
-" % endif\n"
-" </span>\n"
-" % if object.company_id.phone:\n"
-" <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
-"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
-"0px; padding-left: 0px; \">\n"
-" Phone:&nbsp; ${object.company_id.phone}\n"
-" </div>\n"
-" % endif\n"
-" % if object.company_id.website:\n"
-" <div>\n"
-" Web :&nbsp;<a "
-"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
-" </div>\n"
-" %endif\n"
-" <p></p>\n"
-" </div>\n"
-"</div>\n"
-" "
-msgstr ""
-
-#. module: purchase
#: model:ir.actions.act_window,name:purchase.action_purchase_order_by_user_all
msgid "Total Orders by User per month"
msgstr "Total de ordens por utilizador e por mês"
@@ -2110,21 +2089,19 @@ msgid "Based on incoming shipments"
msgstr ""
#. module: purchase
+#: code:addons/purchase/purchase.py:1018
+#, python-format
+msgid "No default supplier defined for this product"
+msgstr ""
+
+#. module: purchase
#: view:purchase.report:0
#: field:purchase.report,warehouse_id:0
msgid "Warehouse"
msgstr "Armazém"
#. module: purchase
-#: help:purchase.order,partner_ref:0
-msgid ""
-"Reference of the sale order or quotation sent by your supplier. It's mainly "
-"used to do the matching when you receive the products as this reference is "
-"usually written on the delivery order sent by your supplier."
-msgstr ""
-
-#. module: purchase
-#: code:addons/purchase/purchase.py:991
+#: code:addons/purchase/purchase.py:960
#, python-format
msgid ""
"The selected supplier has a minimal quantity set to %s %s, you should not "
@@ -2210,8 +2187,8 @@ msgstr ""
" "
#. module: purchase
-#: view:product.product:0
-msgid "When you sell this service to a customer,"
+#: field:purchase.order,message_summary:0
+msgid "Summary"
msgstr ""
#. module: purchase
@@ -2221,6 +2198,11 @@ msgid "Pricelist Versions"
msgstr "Versões da Lista de Preços"
#. module: purchase
+#: field:purchase.order,payment_term_id:0
+msgid "Payment Term"
+msgstr ""
+
+#. module: purchase
#: view:purchase.order:0
msgid "Purchase orders which are in draft state"
msgstr "Ordens de compra que estão em estado de rascunho"
@@ -2967,6 +2949,13 @@ msgstr "Ordens"
#~ msgid "To Approve"
#~ msgstr "Para aprovar"
+#~ msgid ""
+#~ "A Pick list generates an invoice. Depending on the Invoicing control of the "
+#~ "sale order, the invoice is based on delivered or on ordered quantities."
+#~ msgstr ""
+#~ "Uma recepção, gera uma fatura. Conforme o controlo de faturação da ordem de "
+#~ "venda, a fatura é baseada nas quantidades entregues ou nas encomendadas."
+
#~ msgid "TVA :"
#~ msgstr "TVA :"
@@ -3220,6 +3209,9 @@ msgstr "Ordens"
#~ msgid "Order in current year"
#~ msgstr "Ordem do ano atual"
+#~ msgid "Select an Open Sale Order"
+#~ msgstr "Selecione uma Ordem de Venda em Aberto"
+
#~ msgid "Is a Back Order"
#~ msgstr "é uma Back-Order"
diff --git a/addons/purchase/i18n/pt_BR.po b/addons/purchase/i18n/pt_BR.po
index 6d3c74cec0f..e2e6611de67 100644
--- a/addons/purchase/i18n/pt_BR.po
+++ b/addons/purchase/i18n/pt_BR.po
@@ -7,15 +7,15 @@ msgid ""
msgstr ""
"Project-Id-Version: pt_BR\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
-"PO-Revision-Date: 2012-12-20 12:36+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
+"PO-Revision-Date: 2012-12-23 18:01+0000\n"
"Last-Translator: Fábio Martinelli - http://zupy.com.br "
"<webmaster@guaru.net>\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: 2012-12-21 04:40+0000\n"
+"X-Launchpad-Export-Date: 2012-12-24 04:39+0000\n"
"X-Generator: Launchpad (build 16378)\n"
#. module: purchase
@@ -67,11 +67,6 @@ msgstr ""
"calcula o preço do fornecedor para os produtos/quantidades selecionadas."
#. module: purchase
-#: model:ir.actions.server,name:purchase.actions_server_purchase_order_read
-msgid "Purchase: Mark read"
-msgstr "Compras: Marcar como lido"
-
-#. module: purchase
#: view:purchase.report:0
#: field:purchase.report,day:0
msgid "Day"
@@ -115,16 +110,13 @@ msgstr ""
"kanban."
#. module: purchase
-#: code:addons/purchase/purchase.py:973
-#: code:addons/purchase/purchase.py:988
-#: code:addons/purchase/purchase.py:991
-#: code:addons/purchase/wizard/purchase_order_group.py:47
+#: code:addons/purchase/purchase.py:1024
#, python-format
-msgid "Warning!"
-msgstr "Aviso!"
+msgid "Configuration Error!"
+msgstr "Erro de Configuração!"
#. module: purchase
-#: code:addons/purchase/purchase.py:573
+#: code:addons/purchase/purchase.py:587
#, python-format
msgid "You must first cancel all receptions related to this purchase order."
msgstr ""
@@ -143,10 +135,10 @@ msgid "Purchase-Standard Price"
msgstr "Preço Padrão de Compra"
#. module: purchase
-#: report:purchase.order:0
-#: field:purchase.report,validator:0
-msgid "Validated By"
-msgstr "Validado Por"
+#: code:addons/purchase/purchase.py:1011
+#, python-format
+msgid "No supplier defined for this product !"
+msgstr "Nenhum fornecedor definido para este produto!"
#. module: purchase
#: model:ir.actions.act_window,help:purchase.action_picking_tree4_picking_to_invoice
@@ -176,12 +168,6 @@ msgid "Average Price"
msgstr "Preço Médio"
#. module: purchase
-#: code:addons/purchase/purchase.py:830
-#, python-format
-msgid "Invoice <b>paid</b>."
-msgstr "Fatura <b>paga</b>."
-
-#. module: purchase
#: view:purchase.order:0
msgid "Purchase order which are in the exception state"
msgstr "Ordens de Compra que estão em estado de excessão"
@@ -255,7 +241,7 @@ msgstr ""
"linhas do Pedido de compra '."
#. module: purchase
-#: code:addons/purchase/purchase.py:255
+#: code:addons/purchase/purchase.py:260
#, python-format
msgid "In order to delete a purchase order, you must cancel it first."
msgstr ""
@@ -282,30 +268,12 @@ msgid "Total Untaxed amount"
msgstr "Valor Sem Imposto"
#. module: purchase
-#: model:ir.ui.menu,name:purchase.menu_purchase_uom_categ_form_action
-msgid "Unit of Measure Categories"
-msgstr "Categorias de Unidade de Medida"
-
-#. module: purchase
#: view:purchase.report:0
#: field:purchase.report,category_id:0
msgid "Category"
msgstr "Categoria"
#. module: purchase
-#: view:purchase.order:0
-msgid "Quotation "
-msgstr "Cotação "
-
-#. module: purchase
-#: code:addons/purchase/purchase.py:810
-#, python-format
-msgid ""
-"Quotation for <em>%s</em> <b>converted</b> to a Purchase Order of %s %s."
-msgstr ""
-"Cotação para <em>%s</em> <b>convertida</b> em uma Ordem de Compra de %s %s."
-
-#. module: purchase
#: model:process.transition,note:purchase.process_transition_purchaseinvoice0
msgid ""
"A purchase order generates a supplier invoice, as soon as it is confirmed by "
@@ -388,15 +356,19 @@ msgid "October"
msgstr "Outubro"
#. module: purchase
-#: code:addons/purchase/purchase.py:837
+#: code:addons/purchase/purchase.py:1024
#, python-format
-msgid "Purchase Order for <em>%s</em> <b>cancelled</b>."
-msgstr "Ordem de Compra para <em>%s</em><b>cancelada</b>."
+msgid ""
+"The product \"%s\" has been defined with your company as reseller which "
+"seems to be a configuration error!"
+msgstr ""
+"O produto \"%s\" foi definido em sua empresa como um revendedor o que parece "
+"ser um erro de configuração!"
#. module: purchase
-#: field:purchase.order,message_summary:0
-msgid "Summary"
-msgstr "Resumo"
+#: view:product.product:0
+msgid "When you sell this service to a customer,"
+msgstr "Quando você vender este serviço a um cliente,"
#. module: purchase
#: model:process.transition,note:purchase.process_transition_createpackinglist0
@@ -425,12 +397,6 @@ msgid "Quantity"
msgstr "Quantidade"
#. module: purchase
-#: code:addons/purchase/purchase.py:819
-#, python-format
-msgid "Shipment <em>%s</em> <b>scheduled</b> for %s."
-msgstr "Entrega <em>%s</em><b>agendada</b> para %s."
-
-#. module: purchase
#: field:purchase.order,fiscal_position:0
msgid "Fiscal Position"
msgstr "Posição Fiscal"
@@ -500,12 +466,6 @@ msgstr ""
"cliente. Caso contrário, mantenha vazio para entregar a sua própria empresa."
#. module: purchase
-#: code:addons/purchase/purchase.py:824
-#, python-format
-msgid "Draft Invoice of %s %s is <b>waiting for validation</b>."
-msgstr "Fatura provisória de %s %s está <b>aguardando validação</b>"
-
-#. module: purchase
#: model:ir.actions.act_window,help:purchase.purchase_line_form_action2
msgid ""
"<p>\n"
@@ -534,6 +494,11 @@ msgid "Scheduled Date"
msgstr "Data Programada"
#. module: purchase
+#: field:purchase.order,currency_id:0
+msgid "Currency"
+msgstr "Moeda"
+
+#. module: purchase
#: field:purchase.order,journal_id:0
msgid "Journal"
msgstr "Diário"
@@ -566,6 +531,23 @@ msgid "Incoming Products"
msgstr "Recebimentos de Produtos"
#. module: purchase
+#: view:purchase.order:0
+msgid "Request for Quotation "
+msgstr "Solicitar Cotação "
+
+#. module: purchase
+#: help:purchase.order,partner_ref:0
+msgid ""
+"Reference of the sales order or quotation sent by your supplier. It's mainly "
+"used to do the matching when you receive the products as this reference is "
+"usually written on the delivery order sent by your supplier."
+msgstr ""
+"Referência do pedido de venda ou cotação enviada pelo seu fornecedor. É "
+"usado principalmente para fazer a correspondência quando você recebe os "
+"produtos já que essa referência é geralmente escrita na nota de entrega "
+"enviada pelo seu fornecedor."
+
+#. module: purchase
#: view:purchase.config.settings:0
#: view:purchase.order.group:0
#: view:purchase.order.line_invoice:0
@@ -589,6 +571,11 @@ msgstr ""
"contador (Controle Fatura = Manual)."
#. module: purchase
+#: model:mail.message.subtype,name:purchase.mt_rfq_approved
+msgid "RFQ Approved"
+msgstr "RFQ Aprovada"
+
+#. module: purchase
#: view:purchase.config.settings:0
msgid "Apply"
msgstr "Aplicar"
@@ -608,6 +595,11 @@ msgstr ""
"se torna um Pedido de compra confirmado."
#. module: purchase
+#: model:mail.message.subtype,name:purchase.mt_rfq_confirmed
+msgid "RFQ Confirmed"
+msgstr "RFQ Confirmada"
+
+#. module: purchase
#: view:purchase.order:0
msgid "Customer Address"
msgstr "Endereço do Cliente"
@@ -632,7 +624,7 @@ msgid "Supplier"
msgstr "Fornecedor"
#. module: purchase
-#: code:addons/purchase/purchase.py:508
+#: code:addons/purchase/purchase.py:525
#, python-format
msgid "Define expense account for this company: \"%s\" (id:%d)."
msgstr "Defina a conta de despesas para esta empresa: \"%s\" (id:%d)."
@@ -656,7 +648,6 @@ msgstr "Subtotal"
#. module: purchase
#: field:purchase.order,shipped:0
-#: field:purchase.order,shipped_rate:0
msgid "Received"
msgstr "Recebido"
@@ -709,13 +700,23 @@ msgid "Invoices and Receptions"
msgstr "Faturas e Recebimentos"
#. module: purchase
+#: model:process.transition,note:purchase.process_transition_packinginvoice0
+msgid ""
+"A Pick list generates an invoice. Depending on the Invoicing control of the "
+"sales order, the invoice is based on delivered or on ordered quantities."
+msgstr ""
+"Uma lista de separação gera uma fatura. Dependendo do controle de "
+"faturamento no pedido de venda, a fatura é gerada com base em entregas ou em "
+"quantidades encomendadas."
+
+#. module: purchase
#: view:purchase.report:0
#: field:purchase.report,nbr:0
msgid "# of Lines"
msgstr "# de Linhas"
#. module: purchase
-#: code:addons/purchase/wizard/purchase_line_invoice.py:110
+#: code:addons/purchase/wizard/purchase_line_invoice.py:106
#, python-format
msgid "Define expense account for this product: \"%s\" (id:%d)."
msgstr "Defina a conta de despesas para este produto: \"%s\" (id:%d)."
@@ -736,8 +737,8 @@ msgid "It indicates that a picking has been done"
msgstr "Isso indica que a Separação foi Feita"
#. module: purchase
-#: code:addons/purchase/purchase.py:565
-#: code:addons/purchase/purchase.py:572
+#: code:addons/purchase/purchase.py:579
+#: code:addons/purchase/purchase.py:586
#, python-format
msgid "Unable to cancel this purchase order."
msgstr "Não foi possível cancelar esta ordem de compra."
@@ -805,6 +806,15 @@ msgid "Draft PO"
msgstr "OC Provisória"
#. module: purchase
+#: code:addons/purchase/purchase.py:941
+#: code:addons/purchase/purchase.py:956
+#: code:addons/purchase/purchase.py:960
+#: code:addons/purchase/wizard/purchase_order_group.py:47
+#, python-format
+msgid "Warning!"
+msgstr "Aviso!"
+
+#. module: purchase
#: model:process.node,name:purchase.process_node_draftpurchaseorder0
#: model:process.node,name:purchase.process_node_draftpurchaseorder1
msgid "RFQ"
@@ -836,6 +846,11 @@ msgid "The tax amount"
msgstr "O valor do Imposto"
#. module: purchase
+#: field:purchase.order,shipped_rate:0
+msgid "Received Ratio"
+msgstr "Proporção Recebida"
+
+#. module: purchase
#: selection:purchase.report,month:0
msgid "September"
msgstr "Setembro"
@@ -867,7 +882,7 @@ msgid "Stock Moves"
msgstr "Movimentação de Estoque"
#. module: purchase
-#: code:addons/purchase/purchase.py:1158
+#: code:addons/purchase/purchase.py:1156
#, python-format
msgid "Draft Purchase Order created"
msgstr "Ordem de Compra provisória gerada"
@@ -888,11 +903,6 @@ msgid "Terms and Conditions"
msgstr "Termos e Condições"
#. module: purchase
-#: field:purchase.order,currency_id:0
-msgid "unknown"
-msgstr "desconhecido"
-
-#. module: purchase
#: help:purchase.order,date_order:0
msgid "Date on which this document has been created."
msgstr "Data em que este documento foi criado."
@@ -986,12 +996,6 @@ msgid "Cancel"
msgstr "Cancelar"
#. module: purchase
-#: field:purchase.order,message_comment_ids:0
-#: help:purchase.order,message_comment_ids:0
-msgid "Comments and emails"
-msgstr "Comentários e emails"
-
-#. module: purchase
#: sql_constraint:purchase.order:0
msgid "Order Reference must be unique per Company!"
msgstr "Referência de ordem deve ser única por empresa!"
@@ -1025,17 +1029,169 @@ msgid "Date Approved"
msgstr "Data da Aprovação"
#. module: purchase
-#: code:addons/purchase/purchase.py:806
-#, python-format
-msgid "Request for quotation <b>created</b>."
-msgstr "Requisição de cotação <b>criado</b>."
-
-#. module: purchase
#: view:product.product:0
msgid "a draft purchase order"
msgstr "uma ordem de compra provisória"
#. module: purchase
+#: model:email.template,body_html:purchase.email_template_edi_purchase
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: #FFF; \">\n"
+"\n"
+" <p>Hello$ ${object.partner_id.name},</p>\n"
+" \n"
+" <p>Here is a ${object.state in ('draft', 'sent') and 'request for "
+"quotation' or 'purchase order confirmation'} from ${object.company_id.name}: "
+"</p>\n"
+" \n"
+" <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
+" &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
+" &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
+" &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
+"${object.pricelist_id.currency_id.name}</strong><br />\n"
+" &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
+" % if object.origin:\n"
+" &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
+" % endif\n"
+" % if object.partner_ref:\n"
+" &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
+" % endif\n"
+" % if object.validator:\n"
+" &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.validator.email "
+"or ''}?subject=Order%20${object.name}\">${object.validator.name}</a>\n"
+" % endif\n"
+" </p>\n"
+"\n"
+" <br/>\n"
+" <p>If you have any question, do not hesitate to contact us.</p>\n"
+" <p>Thank you!</p>\n"
+" <br/>\n"
+" <br/>\n"
+" <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
+"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
+"background-repeat: repeat no-repeat;\">\n"
+" <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
+"#DDD;\">\n"
+" <strong style=\"text-"
+"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
+" </div>\n"
+" <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
+"16px; background-color: #F2F2F2;\">\n"
+" <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
+" % if object.company_id.street:\n"
+" ${object.company_id.street}<br/>\n"
+" % endif\n"
+" % if object.company_id.street2:\n"
+" ${object.company_id.street2}<br/>\n"
+" % endif\n"
+" % if object.company_id.city or object.company_id.zip:\n"
+" ${object.company_id.zip} ${object.company_id.city}<br/>\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 ''}<br/>\n"
+" % endif\n"
+" </span>\n"
+" % if object.company_id.phone:\n"
+" <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
+"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
+"0px; padding-left: 0px; \">\n"
+" Phone:&nbsp; ${object.company_id.phone}\n"
+" </div>\n"
+" % endif\n"
+" % if object.company_id.website:\n"
+" <div>\n"
+" Web :&nbsp;<a "
+"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
+" </div>\n"
+" %endif\n"
+" <p></p>\n"
+" </div>\n"
+"</div>\n"
+" "
+msgstr ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: #FFF; \">\n"
+"\n"
+" <p>Olá ${object.partner_id.name},</p>\n"
+" \n"
+" <p>Aqui está o ${object.state in ('draft', 'sent') and 'request for "
+"quotation' or 'purchase order confirmation'} from ${object.company_id.name}: "
+"</p>\n"
+" \n"
+" <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
+" &nbsp;&nbsp;<strong>REFERENCIA</strong><br />\n"
+" &nbsp;&nbsp;Número do pedido: <strong>${object.name}</strong><br />\n"
+" &nbsp;&nbsp;Total do pedido: <strong>${object.amount_total} "
+"${object.pricelist_id.currency_id.name}</strong><br />\n"
+" &nbsp;&nbsp;Data do pedido: ${object.date_order}<br />\n"
+" % if object.origin:\n"
+" &nbsp;&nbsp;Referência do pedido: ${object.origin}<br />\n"
+" % endif\n"
+" % if object.partner_ref:\n"
+" &nbsp;&nbsp;Sua referência: ${object.partner_ref}<br />\n"
+" % endif\n"
+" % if object.validator:\n"
+" &nbsp;&nbsp;Seu contato: <a href=\"mailto:${object.validator.email or "
+"''}?subject=Order%20${object.name}\">${object.validator.name}</a>\n"
+" % endif\n"
+" </p>\n"
+"\n"
+" <br/>\n"
+" <p>Se você tiver alguma dúvida, não deixe de entrar em contato "
+"conosco.</p>\n"
+" <p>Obrigado!</p>\n"
+" <br/>\n"
+" <br/>\n"
+" <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
+"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
+"background-repeat: repeat no-repeat;\">\n"
+" <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
+"#DDD;\">\n"
+" <strong style=\"text-"
+"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
+" </div>\n"
+" <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
+"16px; background-color: #F2F2F2;\">\n"
+" <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
+" % if object.company_id.street:\n"
+" ${object.company_id.street}<br/>\n"
+" % endif\n"
+" % if object.company_id.street2:\n"
+" ${object.company_id.street2}<br/>\n"
+" % endif\n"
+" % if object.company_id.city or object.company_id.zip:\n"
+" ${object.company_id.zip} ${object.company_id.city}<br/>\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 ''}<br/>\n"
+" % endif\n"
+" </span>\n"
+" % if object.company_id.phone:\n"
+" <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
+"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
+"0px; padding-left: 0px; \">\n"
+" Fone:&nbsp; ${object.company_id.phone}\n"
+" </div>\n"
+" % endif\n"
+" % if object.company_id.website:\n"
+" <div>\n"
+" Site :&nbsp;<a "
+"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
+" </div>\n"
+" %endif\n"
+" <p></p>\n"
+" </div>\n"
+"</div>\n"
+" "
+
+#. module: purchase
#: view:purchase.report:0
msgid "Order of Year"
msgstr "Pedidos do Ano"
@@ -1079,18 +1235,13 @@ msgid "Outgoing Mails"
msgstr "E-mails Enviados"
#. module: purchase
-#: code:addons/purchase/purchase.py:437
+#: code:addons/purchase/purchase.py:456
#, python-format
msgid "You cannot confirm a purchase order without any purchase order line."
msgstr ""
"Você não pode confirmar uma ordem de compra sem nenhuma linha de compra"
#. module: purchase
-#: model:ir.actions.server,name:purchase.actions_server_purchase_order_unread
-msgid "Purchase: Mark unread"
-msgstr "Compra: Marcar não lido"
-
-#. module: purchase
#: help:purchase.order,message_ids:0
msgid "Messages and communication history"
msgstr "Histórico de mensagens e comunicação"
@@ -1102,7 +1253,7 @@ msgid "Destination Warehouse"
msgstr "Armazém de Destino"
#. module: purchase
-#: code:addons/purchase/purchase.py:973
+#: code:addons/purchase/purchase.py:941
#, python-format
msgid ""
"Selected Unit of Measure does not belong to the same category as the product "
@@ -1112,6 +1263,11 @@ msgstr ""
"Medida do produto"
#. module: purchase
+#: view:purchase.order.line_invoice:0
+msgid "Select an Open Sales Order"
+msgstr "Escolha um Pedido de Vendas Aberto"
+
+#. module: purchase
#: model:ir.ui.menu,name:purchase.menu_purchase_unit_measure_purchase
#: model:ir.ui.menu,name:purchase.menu_purchase_uom_form_action
msgid "Units of Measure"
@@ -1123,18 +1279,12 @@ msgid "Manage pricelist per supplier"
msgstr "Gerenciar lista de preços por fornecedor"
#. module: purchase
-#: code:addons/purchase/purchase.py:833
-#, python-format
-msgid "Purchase Order has been set to <b>draft</b>."
-msgstr "A Ordem de Compra foi definida como <b>provisória</b>."
-
-#. module: purchase
#: view:board.board:0
msgid "Purchase Dashboard"
msgstr "Painel de Compras"
#. module: purchase
-#: code:addons/purchase/purchase.py:566
+#: code:addons/purchase/purchase.py:580
#, python-format
msgid "First cancel all receptions related to this purchase order."
msgstr ""
@@ -1174,9 +1324,9 @@ msgid "Unread Messages"
msgstr "Mensagens não lidas"
#. module: purchase
-#: view:purchase.order.line_invoice:0
-msgid "Select an Open Sale Order"
-msgstr "Selecione um Pedido de Venda Aberto"
+#: model:ir.ui.menu,name:purchase.menu_purchase_uom_categ_form_action
+msgid "Unit of Measure Categories"
+msgstr "Categorias de Unidade de Medida"
#. module: purchase
#: view:purchase.order:0
@@ -1184,6 +1334,15 @@ msgid "Set to Draft"
msgstr "Definir como Provisório"
#. module: purchase
+#: help:purchase.order,origin:0
+msgid ""
+"Reference of the document that generated this purchase order request; a "
+"sales order or an internal procurement request."
+msgstr ""
+"Referência do documento que gerou essa solicitação de pedido de compra; um "
+"pedido de venda ou uma solicitação de aquisição interna."
+
+#. module: purchase
#: view:purchase.order.line:0
msgid "Notes"
msgstr "Observações"
@@ -1213,7 +1372,7 @@ msgid "Stock Move"
msgstr "Mov. de Estoque"
#. module: purchase
-#: code:addons/purchase/purchase.py:255
+#: code:addons/purchase/purchase.py:260
#, python-format
msgid "Invalid Action!"
msgstr "Ação Inválida!"
@@ -1320,7 +1479,7 @@ msgstr ""
"provisória"
#. module: purchase
-#: code:addons/purchase/purchase.py:310
+#: code:addons/purchase/purchase.py:320
#, python-format
msgid "Please create Invoices."
msgstr "Por favor gere as faturas."
@@ -1419,7 +1578,7 @@ msgid "Purchase Order Line Make Invoice"
msgstr "Faturar Linha Pedido de Compra"
#. module: purchase
-#: code:addons/purchase/purchase.py:1133
+#: code:addons/purchase/purchase.py:1141
#, python-format
msgid "PO: %s"
msgstr "PO: %s"
@@ -1430,7 +1589,7 @@ msgid "Send by EMail"
msgstr "Enviar por Email"
#. module: purchase
-#: code:addons/purchase/purchase.py:498
+#: code:addons/purchase/purchase.py:515
#, python-format
msgid "Define purchase journal for this company: \"%s\" (id:%d)."
msgstr "Defina o diário de compras para esta empresa \"%s\" (id:%d)."
@@ -1441,9 +1600,11 @@ msgid "Purchase Order "
msgstr "Ordem de Compra "
#. module: purchase
-#: view:purchase.order.line:0
-msgid "Manual Invoices"
-msgstr "Faturamento Manual"
+#: help:purchase.config.settings,group_costing_method:0
+msgid "Allows you to compute product cost price based on average cost."
+msgstr ""
+"Permite a você calcular o preço de custo de um produto baseado no custo "
+"médio."
#. module: purchase
#: model:ir.actions.act_window,name:purchase.action_purchase_configuration
@@ -1610,8 +1771,8 @@ msgid "Compute product cost price based on average cost"
msgstr "Cálculo do custo do produto baseado no custo médio"
#. module: purchase
-#: code:addons/purchase/purchase.py:340
-#: code:addons/purchase/wizard/purchase_line_invoice.py:141
+#: code:addons/purchase/purchase.py:350
+#: code:addons/purchase/wizard/purchase_line_invoice.py:137
#: model:ir.actions.act_window,name:purchase.act_res_partner_2_supplier_invoices
#: view:res.partner:0
#, python-format
@@ -1735,9 +1896,10 @@ msgid "Open Purchase Menu"
msgstr "Abrir Menu de Compras"
#. module: purchase
-#: model:ir.model,name:purchase.model_mail_compose_message
-msgid "Email composition wizard"
-msgstr "Assistente de composição de Email"
+#: code:addons/purchase/purchase.py:1028
+#, python-format
+msgid "No address defined for the supplier"
+msgstr "Nenhum endereço definido para o fornecedor"
#. module: purchase
#: field:purchase.order,company_id:0
@@ -1809,11 +1971,11 @@ msgid "Purchase Order"
msgstr "Ordem de Compra"
#. module: purchase
-#: code:addons/purchase/purchase.py:310
-#: code:addons/purchase/purchase.py:437
-#: code:addons/purchase/purchase.py:497
-#: code:addons/purchase/purchase.py:508
-#: code:addons/purchase/wizard/purchase_line_invoice.py:109
+#: code:addons/purchase/purchase.py:320
+#: code:addons/purchase/purchase.py:456
+#: code:addons/purchase/purchase.py:514
+#: code:addons/purchase/purchase.py:525
+#: code:addons/purchase/wizard/purchase_line_invoice.py:105
#, python-format
msgid "Error!"
msgstr "Erro!"
@@ -1842,16 +2004,6 @@ msgstr ""
"situação torna-se exceção."
#. module: purchase
-#: model:process.transition,note:purchase.process_transition_packinginvoice0
-msgid ""
-"A Pick list generates an invoice. Depending on the Invoicing control of the "
-"sale order, the invoice is based on delivered or on ordered quantities."
-msgstr ""
-"A lista de separação gera uma fatura. Dependendo do controle de faturamento "
-"do pedido de venda, a factura é baseado nas quantidades entregues ou "
-"encomendadas."
-
-#. module: purchase
#: selection:purchase.order,state:0
#: selection:purchase.order.line,state:0
#: selection:purchase.report,state:0
@@ -1864,10 +2016,9 @@ msgid "# of Purchase Order"
msgstr "# de Ordem de Compra"
#. module: purchase
-#: code:addons/purchase/purchase.py:827
-#, python-format
-msgid "Shipment <b>received</b>."
-msgstr "Recebimento <b>confirmado</b>"
+#: model:ir.model,name:purchase.model_mail_compose_message
+msgid "Email composition wizard"
+msgstr "Assistente de composição de Email"
#. module: purchase
#: report:purchase.quotation:0
@@ -1963,7 +2114,7 @@ msgid "RFQ_${(object.name or '').replace('/','_')}"
msgstr "RFQ_${(object.name or '').replace('/','_')}"
#. module: purchase
-#: code:addons/purchase/purchase.py:988
+#: code:addons/purchase/purchase.py:956
#, python-format
msgid "The selected supplier only sells this product by %s"
msgstr "O fornecedor selecionado somente vende este produto por %s"
@@ -2012,6 +2163,12 @@ msgid "Outgoing products to invoice"
msgstr "Saida Produtos a Faturar"
#. module: purchase
+#: report:purchase.order:0
+#: field:purchase.report,validator:0
+msgid "Validated By"
+msgstr "Validado Por"
+
+#. module: purchase
#: view:purchase.report:0
#: field:purchase.report,delay_pass:0
msgid "Days to Deliver"
@@ -2101,11 +2258,9 @@ msgid "November"
msgstr "Novembro"
#. module: purchase
-#: help:purchase.config.settings,group_costing_method:0
-msgid "Allows you to compute product cost price based on average cost."
-msgstr ""
-"Permite a você calcular o preço de custo de um produto baseado no custo "
-"médio."
+#: view:purchase.order.line:0
+msgid "Manual Invoices"
+msgstr "Faturamento Manual"
#. module: purchase
#: report:purchase.order:0
@@ -2134,15 +2289,6 @@ msgstr ""
"recebimentos são validados."
#. module: purchase
-#: help:purchase.order,origin:0
-msgid ""
-"Reference of the document that generated this purchase order request; a sale "
-"order or an internal procurement request."
-msgstr ""
-"Referência do documento que gerou esse pedido pedido de compra, uma ordem de "
-"venda ou uma solicitação de aquisição interna."
-
-#. module: purchase
#: model:ir.ui.menu,name:purchase.menu_partner_categories_in_form
msgid "Partner Categories"
msgstr "Categorias de Parceiros"
@@ -2163,168 +2309,6 @@ msgid "Invoicing Settings"
msgstr "Configurações de Faturamento"
#. module: purchase
-#: model:email.template,body_html:purchase.email_template_edi_purchase
-msgid ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"\n"
-" <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
-"or ''},</p>\n"
-" \n"
-" <p>Here is a ${object.state in ('draft', 'sent') and 'request for "
-"quotation' or 'purchase order confirmation'} from ${object.company_id.name}: "
-"</p>\n"
-" \n"
-" <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
-" &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
-" &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
-" &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
-"${object.pricelist_id.currency_id.name}</strong><br />\n"
-" &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
-" % if object.origin:\n"
-" &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
-" % endif\n"
-" % if object.partner_ref:\n"
-" &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
-" % endif\n"
-" % if object.validator:\n"
-" &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.validator.email "
-"or ''}?subject=Order%20${object.name}\">${object.validator.name}</a>\n"
-" % endif\n"
-" </p>\n"
-"\n"
-" <br/>\n"
-" <p>If you have any question, do not hesitate to contact us.</p>\n"
-" <p>Thank you!</p>\n"
-" <br/>\n"
-" <br/>\n"
-" <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
-"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
-"background-repeat: repeat no-repeat;\">\n"
-" <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
-"#FFF;\">\n"
-" <strong style=\"text-"
-"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
-" </div>\n"
-" <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
-"16px; background-color: #F2F2F2;\">\n"
-" <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
-" % if object.company_id.street:\n"
-" ${object.company_id.street}<br/>\n"
-" % endif\n"
-" % if object.company_id.street2:\n"
-" ${object.company_id.street2}<br/>\n"
-" % endif\n"
-" % if object.company_id.city or object.company_id.zip:\n"
-" ${object.company_id.zip} ${object.company_id.city}<br/>\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 ''}<br/>\n"
-" % endif\n"
-" </span>\n"
-" % if object.company_id.phone:\n"
-" <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
-"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
-"0px; padding-left: 0px; \">\n"
-" Phone:&nbsp; ${object.company_id.phone}\n"
-" </div>\n"
-" % endif\n"
-" % if object.company_id.website:\n"
-" <div>\n"
-" Web :&nbsp;<a "
-"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
-" </div>\n"
-" %endif\n"
-" <p></p>\n"
-" </div>\n"
-"</div>\n"
-" "
-msgstr ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"\n"
-" <p>Olá${object.partner_id.name and ' ' or ''}${object.partner_id.name or "
-"''},</p>\n"
-" \n"
-" <p>Aqui está um ${object.state in ('draft', 'sent') and 'request for "
-"quotation' or 'purchase order confirmation'} from ${object.company_id.name}: "
-"</p>\n"
-" \n"
-" <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
-" &nbsp;&nbsp;<strong>REFERENCIA</strong><br />\n"
-" &nbsp;&nbsp;Número da Ordem: <strong>${object.name}</strong><br />\n"
-" &nbsp;&nbsp;Total da Ordem: <strong>${object.amount_total} "
-"${object.pricelist_id.currency_id.name}</strong><br />\n"
-" &nbsp;&nbsp;Data da Ordem: ${object.date_order}<br />\n"
-" % if object.origin:\n"
-" &nbsp;&nbsp;Referencia da Ordem: ${object.origin}<br />\n"
-" % endif\n"
-" % if object.partner_ref:\n"
-" &nbsp;&nbsp;Sua Referencia: ${object.partner_ref}<br />\n"
-" % endif\n"
-" % if object.validator:\n"
-" &nbsp;&nbsp;Seu contato: <a href=\"mailto:${object.validator.email or "
-"''}?subject=Order%20${object.name}\">${object.validator.name}</a>\n"
-" % endif\n"
-" </p>\n"
-"\n"
-" <br/>\n"
-" <p>Se você tiver alguma dúvida não deixe de entrar em contato "
-"conosco.</p>\n"
-" <p>Obrigado!</p>\n"
-" <br/>\n"
-" <br/>\n"
-" <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
-"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
-"background-repeat: repeat no-repeat;\">\n"
-" <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
-"#FFF;\">\n"
-" <strong style=\"text-"
-"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
-" </div>\n"
-" <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
-"16px; background-color: #F2F2F2;\">\n"
-" <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
-" % if object.company_id.street:\n"
-" ${object.company_id.street}<br/>\n"
-" % endif\n"
-" % if object.company_id.street2:\n"
-" ${object.company_id.street2}<br/>\n"
-" % endif\n"
-" % if object.company_id.city or object.company_id.zip:\n"
-" ${object.company_id.zip} ${object.company_id.city}<br/>\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 ''}<br/>\n"
-" % endif\n"
-" </span>\n"
-" % if object.company_id.phone:\n"
-" <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
-"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
-"0px; padding-left: 0px; \">\n"
-" Phone:&nbsp; ${object.company_id.phone}\n"
-" </div>\n"
-" % endif\n"
-" % if object.company_id.website:\n"
-" <div>\n"
-" Web :&nbsp;<a "
-"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
-" </div>\n"
-" %endif\n"
-" <p></p>\n"
-" </div>\n"
-"</div>\n"
-" "
-
-#. module: purchase
#: model:ir.actions.act_window,name:purchase.action_purchase_order_by_user_all
msgid "Total Orders by User per month"
msgstr "Total de Pedidos por Usuário por Mês"
@@ -2335,25 +2319,19 @@ msgid "Based on incoming shipments"
msgstr "Baseado em recebimentos"
#. module: purchase
+#: code:addons/purchase/purchase.py:1018
+#, python-format
+msgid "No default supplier defined for this product"
+msgstr "Nenhum fornecedor padrão definido para este produto"
+
+#. module: purchase
#: view:purchase.report:0
#: field:purchase.report,warehouse_id:0
msgid "Warehouse"
msgstr "Armazém"
#. module: purchase
-#: help:purchase.order,partner_ref:0
-msgid ""
-"Reference of the sale order or quotation sent by your supplier. It's mainly "
-"used to do the matching when you receive the products as this reference is "
-"usually written on the delivery order sent by your supplier."
-msgstr ""
-"Referência da ordem de venda ou cotação enviada pelo seu fornecedor. É usado "
-"principalmente para fazer a correspondência no recebimento dos produtos essa "
-"referência é geralmente escrito na ordem de entrega enviada pelo seu "
-"fornecedor."
-
-#. module: purchase
-#: code:addons/purchase/purchase.py:991
+#: code:addons/purchase/purchase.py:960
#, python-format
msgid ""
"The selected supplier has a minimal quantity set to %s %s, you should not "
@@ -2439,9 +2417,9 @@ msgstr ""
" "
#. module: purchase
-#: view:product.product:0
-msgid "When you sell this service to a customer,"
-msgstr "Quando você vender este serviço a um cliente,"
+#: field:purchase.order,message_summary:0
+msgid "Summary"
+msgstr "Resumo"
#. module: purchase
#: model:ir.actions.act_window,name:purchase.purchase_pricelist_version_action
@@ -2450,6 +2428,11 @@ msgid "Pricelist Versions"
msgstr "Versões da lista"
#. module: purchase
+#: field:purchase.order,payment_term_id:0
+msgid "Payment Term"
+msgstr "Condições de Pagamento"
+
+#. module: purchase
#: view:purchase.order:0
msgid "Purchase orders which are in draft state"
msgstr "Pedidos de Compra que estão como Provisórios"
@@ -3085,6 +3068,9 @@ msgstr "Pedidos"
#~ "não foram faturadas. Quando puder lançar a fatura, você pode gerar uma "
#~ "fatura provisória com base nos itens deste menu."
+#~ msgid "Select an Open Sale Order"
+#~ msgstr "Selecione um Pedido de Venda Aberto"
+
#~ msgid ""
#~ "Put an address if you want to deliver directly from the supplier to the "
#~ "customer.In this case, it will remove the warehouse link and set the "
@@ -3094,6 +3080,14 @@ msgstr "Pedidos"
#~ "cliente. Neste caso, ele irá remover o link do armazém e definir o local do "
#~ "cliente"
+#~ msgid ""
+#~ "A Pick list generates an invoice. Depending on the Invoicing control of the "
+#~ "sale order, the invoice is based on delivered or on ordered quantities."
+#~ msgstr ""
+#~ "A lista de separação gera uma fatura. Dependendo do controle de faturamento "
+#~ "do pedido de venda, a factura é baseado nas quantidades entregues ou "
+#~ "encomendadas."
+
#~ msgid "Configuration Progress"
#~ msgstr "Progresso da Configuração"
diff --git a/addons/purchase/i18n/ro.po b/addons/purchase/i18n/ro.po
index 849a7b7c3f5..28750210ba6 100644
--- a/addons/purchase/i18n/ro.po
+++ b/addons/purchase/i18n/ro.po
@@ -6,15 +6,15 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
"PO-Revision-Date: 2012-01-29 16:12+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: 2012-12-04 05:12+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:19+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
#. module: purchase
#: model:res.groups,name:purchase.group_analytic_accounting
@@ -61,11 +61,6 @@ msgstr ""
"produsele/cantitatile selectate."
#. module: purchase
-#: model:ir.actions.server,name:purchase.actions_server_purchase_order_read
-msgid "Purchase: Mark read"
-msgstr ""
-
-#. module: purchase
#: view:purchase.report:0
#: field:purchase.report,day:0
msgid "Day"
@@ -106,16 +101,13 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:973
-#: code:addons/purchase/purchase.py:988
-#: code:addons/purchase/purchase.py:991
-#: code:addons/purchase/wizard/purchase_order_group.py:47
+#: code:addons/purchase/purchase.py:1024
#, python-format
-msgid "Warning!"
+msgid "Configuration Error!"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:573
+#: code:addons/purchase/purchase.py:587
#, python-format
msgid "You must first cancel all receptions related to this purchase order."
msgstr ""
@@ -134,10 +126,10 @@ msgid "Purchase-Standard Price"
msgstr "Pretul Standard de achizitie"
#. module: purchase
-#: report:purchase.order:0
-#: field:purchase.report,validator:0
-msgid "Validated By"
-msgstr "Validat de catre"
+#: code:addons/purchase/purchase.py:1011
+#, python-format
+msgid "No supplier defined for this product !"
+msgstr ""
#. module: purchase
#: model:ir.actions.act_window,help:purchase.action_picking_tree4_picking_to_invoice
@@ -160,12 +152,6 @@ msgid "Average Price"
msgstr "Pret mediu"
#. module: purchase
-#: code:addons/purchase/purchase.py:830
-#, python-format
-msgid "Invoice <b>paid</b>."
-msgstr ""
-
-#. module: purchase
#: view:purchase.order:0
msgid "Purchase order which are in the exception state"
msgstr "Comenzile de achizitie care se afla in stare de exceptie"
@@ -237,7 +223,7 @@ msgstr ""
"comenzilor de achizitie a produselor."
#. module: purchase
-#: code:addons/purchase/purchase.py:255
+#: code:addons/purchase/purchase.py:260
#, python-format
msgid "In order to delete a purchase order, you must cancel it first."
msgstr ""
@@ -263,29 +249,12 @@ msgid "Total Untaxed amount"
msgstr "Total suma neimpozitata"
#. module: purchase
-#: model:ir.ui.menu,name:purchase.menu_purchase_uom_categ_form_action
-msgid "Unit of Measure Categories"
-msgstr ""
-
-#. module: purchase
#: view:purchase.report:0
#: field:purchase.report,category_id:0
msgid "Category"
msgstr "Categorie"
#. module: purchase
-#: view:purchase.order:0
-msgid "Quotation "
-msgstr ""
-
-#. module: purchase
-#: code:addons/purchase/purchase.py:810
-#, python-format
-msgid ""
-"Quotation for <em>%s</em> <b>converted</b> to a Purchase Order of %s %s."
-msgstr ""
-
-#. module: purchase
#: model:process.transition,note:purchase.process_transition_purchaseinvoice0
msgid ""
"A purchase order generates a supplier invoice, as soon as it is confirmed by "
@@ -354,14 +323,16 @@ msgid "October"
msgstr "Octombrie"
#. module: purchase
-#: code:addons/purchase/purchase.py:837
+#: code:addons/purchase/purchase.py:1024
#, python-format
-msgid "Purchase Order for <em>%s</em> <b>cancelled</b>."
+msgid ""
+"The product \"%s\" has been defined with your company as reseller which "
+"seems to be a configuration error!"
msgstr ""
#. module: purchase
-#: field:purchase.order,message_summary:0
-msgid "Summary"
+#: view:product.product:0
+msgid "When you sell this service to a customer,"
msgstr ""
#. module: purchase
@@ -390,12 +361,6 @@ msgid "Quantity"
msgstr "Cantitate"
#. module: purchase
-#: code:addons/purchase/purchase.py:819
-#, python-format
-msgid "Shipment <em>%s</em> <b>scheduled</b> for %s."
-msgstr ""
-
-#. module: purchase
#: field:purchase.order,fiscal_position:0
msgid "Fiscal Position"
msgstr "Pozitie fiscala"
@@ -453,12 +418,6 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:824
-#, python-format
-msgid "Draft Invoice of %s %s is <b>waiting for validation</b>."
-msgstr ""
-
-#. module: purchase
#: model:ir.actions.act_window,help:purchase.purchase_line_form_action2
msgid ""
"<p>\n"
@@ -479,6 +438,11 @@ msgid "Scheduled Date"
msgstr "Data programata"
#. module: purchase
+#: field:purchase.order,currency_id:0
+msgid "Currency"
+msgstr ""
+
+#. module: purchase
#: field:purchase.order,journal_id:0
msgid "Journal"
msgstr "Jurnal"
@@ -511,6 +475,19 @@ msgid "Incoming Products"
msgstr ""
#. module: purchase
+#: view:purchase.order:0
+msgid "Request for Quotation "
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,partner_ref:0
+msgid ""
+"Reference of the sales order or quotation sent by your supplier. It's mainly "
+"used to do the matching when you receive the products as this reference is "
+"usually written on the delivery order sent by your supplier."
+msgstr ""
+
+#. module: purchase
#: view:purchase.config.settings:0
#: view:purchase.order.group:0
#: view:purchase.order.line_invoice:0
@@ -534,6 +511,11 @@ msgstr ""
"contabil (Controlul facturii = Manual)."
#. module: purchase
+#: model:mail.message.subtype,name:purchase.mt_rfq_approved
+msgid "RFQ Approved"
+msgstr ""
+
+#. module: purchase
#: view:purchase.config.settings:0
msgid "Apply"
msgstr ""
@@ -553,6 +535,11 @@ msgstr ""
"trimite furnizorului. CdO devine o Comanda de aprovizionare confirmata."
#. module: purchase
+#: model:mail.message.subtype,name:purchase.mt_rfq_confirmed
+msgid "RFQ Confirmed"
+msgstr ""
+
+#. module: purchase
#: view:purchase.order:0
msgid "Customer Address"
msgstr ""
@@ -577,7 +564,7 @@ msgid "Supplier"
msgstr "Furnizor"
#. module: purchase
-#: code:addons/purchase/purchase.py:508
+#: code:addons/purchase/purchase.py:525
#, python-format
msgid "Define expense account for this company: \"%s\" (id:%d)."
msgstr ""
@@ -601,7 +588,6 @@ msgstr "Subtotal"
#. module: purchase
#: field:purchase.order,shipped:0
-#: field:purchase.order,shipped_rate:0
msgid "Received"
msgstr "Primit"
@@ -643,13 +629,20 @@ msgid "Invoices and Receptions"
msgstr ""
#. module: purchase
+#: model:process.transition,note:purchase.process_transition_packinginvoice0
+msgid ""
+"A Pick list generates an invoice. Depending on the Invoicing control of the "
+"sales order, the invoice is based on delivered or on ordered quantities."
+msgstr ""
+
+#. module: purchase
#: view:purchase.report:0
#: field:purchase.report,nbr:0
msgid "# of Lines"
msgstr "# de Linii"
#. module: purchase
-#: code:addons/purchase/wizard/purchase_line_invoice.py:110
+#: code:addons/purchase/wizard/purchase_line_invoice.py:106
#, python-format
msgid "Define expense account for this product: \"%s\" (id:%d)."
msgstr ""
@@ -670,8 +663,8 @@ msgid "It indicates that a picking has been done"
msgstr "Indica faptul ca a fost efectuata o ridicare"
#. module: purchase
-#: code:addons/purchase/purchase.py:565
-#: code:addons/purchase/purchase.py:572
+#: code:addons/purchase/purchase.py:579
+#: code:addons/purchase/purchase.py:586
#, python-format
msgid "Unable to cancel this purchase order."
msgstr ""
@@ -737,6 +730,15 @@ msgid "Draft PO"
msgstr ""
#. module: purchase
+#: code:addons/purchase/purchase.py:941
+#: code:addons/purchase/purchase.py:956
+#: code:addons/purchase/purchase.py:960
+#: code:addons/purchase/wizard/purchase_order_group.py:47
+#, python-format
+msgid "Warning!"
+msgstr ""
+
+#. module: purchase
#: model:process.node,name:purchase.process_node_draftpurchaseorder0
#: model:process.node,name:purchase.process_node_draftpurchaseorder1
msgid "RFQ"
@@ -768,6 +770,11 @@ msgid "The tax amount"
msgstr "Valoare taxe"
#. module: purchase
+#: field:purchase.order,shipped_rate:0
+msgid "Received Ratio"
+msgstr ""
+
+#. module: purchase
#: selection:purchase.report,month:0
msgid "September"
msgstr "Septembrie"
@@ -799,7 +806,7 @@ msgid "Stock Moves"
msgstr "Miscari stoc"
#. module: purchase
-#: code:addons/purchase/purchase.py:1158
+#: code:addons/purchase/purchase.py:1156
#, python-format
msgid "Draft Purchase Order created"
msgstr ""
@@ -820,11 +827,6 @@ msgid "Terms and Conditions"
msgstr ""
#. module: purchase
-#: field:purchase.order,currency_id:0
-msgid "unknown"
-msgstr ""
-
-#. module: purchase
#: help:purchase.order,date_order:0
msgid "Date on which this document has been created."
msgstr "Data la care a fost creat acest document."
@@ -920,12 +922,6 @@ msgid "Cancel"
msgstr "Anuleaza"
#. module: purchase
-#: field:purchase.order,message_comment_ids:0
-#: help:purchase.order,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
-#. module: purchase
#: sql_constraint:purchase.order:0
msgid "Order Reference must be unique per Company!"
msgstr "Referinta comenzii trebuie sa fie unica per Companie!"
@@ -959,14 +955,89 @@ msgid "Date Approved"
msgstr "Data aprobata"
#. module: purchase
-#: code:addons/purchase/purchase.py:806
-#, python-format
-msgid "Request for quotation <b>created</b>."
+#: view:product.product:0
+msgid "a draft purchase order"
msgstr ""
#. module: purchase
-#: view:product.product:0
-msgid "a draft purchase order"
+#: model:email.template,body_html:purchase.email_template_edi_purchase
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: #FFF; \">\n"
+"\n"
+" <p>Hello$ ${object.partner_id.name},</p>\n"
+" \n"
+" <p>Here is a ${object.state in ('draft', 'sent') and 'request for "
+"quotation' or 'purchase order confirmation'} from ${object.company_id.name}: "
+"</p>\n"
+" \n"
+" <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
+" &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
+" &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
+" &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
+"${object.pricelist_id.currency_id.name}</strong><br />\n"
+" &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
+" % if object.origin:\n"
+" &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
+" % endif\n"
+" % if object.partner_ref:\n"
+" &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
+" % endif\n"
+" % if object.validator:\n"
+" &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.validator.email "
+"or ''}?subject=Order%20${object.name}\">${object.validator.name}</a>\n"
+" % endif\n"
+" </p>\n"
+"\n"
+" <br/>\n"
+" <p>If you have any question, do not hesitate to contact us.</p>\n"
+" <p>Thank you!</p>\n"
+" <br/>\n"
+" <br/>\n"
+" <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
+"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
+"background-repeat: repeat no-repeat;\">\n"
+" <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
+"#DDD;\">\n"
+" <strong style=\"text-"
+"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
+" </div>\n"
+" <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
+"16px; background-color: #F2F2F2;\">\n"
+" <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
+" % if object.company_id.street:\n"
+" ${object.company_id.street}<br/>\n"
+" % endif\n"
+" % if object.company_id.street2:\n"
+" ${object.company_id.street2}<br/>\n"
+" % endif\n"
+" % if object.company_id.city or object.company_id.zip:\n"
+" ${object.company_id.zip} ${object.company_id.city}<br/>\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 ''}<br/>\n"
+" % endif\n"
+" </span>\n"
+" % if object.company_id.phone:\n"
+" <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
+"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
+"0px; padding-left: 0px; \">\n"
+" Phone:&nbsp; ${object.company_id.phone}\n"
+" </div>\n"
+" % endif\n"
+" % if object.company_id.website:\n"
+" <div>\n"
+" Web :&nbsp;<a "
+"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
+" </div>\n"
+" %endif\n"
+" <p></p>\n"
+" </div>\n"
+"</div>\n"
+" "
msgstr ""
#. module: purchase
@@ -1009,17 +1080,12 @@ msgid "Outgoing Mails"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:437
+#: code:addons/purchase/purchase.py:456
#, python-format
msgid "You cannot confirm a purchase order without any purchase order line."
msgstr ""
#. module: purchase
-#: model:ir.actions.server,name:purchase.actions_server_purchase_order_unread
-msgid "Purchase: Mark unread"
-msgstr ""
-
-#. module: purchase
#: help:purchase.order,message_ids:0
msgid "Messages and communication history"
msgstr ""
@@ -1031,7 +1097,7 @@ msgid "Destination Warehouse"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:973
+#: code:addons/purchase/purchase.py:941
#, python-format
msgid ""
"Selected Unit of Measure does not belong to the same category as the product "
@@ -1039,6 +1105,11 @@ msgid ""
msgstr ""
#. module: purchase
+#: view:purchase.order.line_invoice:0
+msgid "Select an Open Sales Order"
+msgstr ""
+
+#. module: purchase
#: model:ir.ui.menu,name:purchase.menu_purchase_unit_measure_purchase
#: model:ir.ui.menu,name:purchase.menu_purchase_uom_form_action
msgid "Units of Measure"
@@ -1050,18 +1121,12 @@ msgid "Manage pricelist per supplier"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:833
-#, python-format
-msgid "Purchase Order has been set to <b>draft</b>."
-msgstr ""
-
-#. module: purchase
#: view:board.board:0
msgid "Purchase Dashboard"
msgstr "Panou de bord Achizitii"
#. module: purchase
-#: code:addons/purchase/purchase.py:566
+#: code:addons/purchase/purchase.py:580
#, python-format
msgid "First cancel all receptions related to this purchase order."
msgstr ""
@@ -1100,9 +1165,9 @@ msgid "Unread Messages"
msgstr ""
#. module: purchase
-#: view:purchase.order.line_invoice:0
-msgid "Select an Open Sale Order"
-msgstr "Selecteaza o Comanda de vanzari Deschisa"
+#: model:ir.ui.menu,name:purchase.menu_purchase_uom_categ_form_action
+msgid "Unit of Measure Categories"
+msgstr ""
#. module: purchase
#: view:purchase.order:0
@@ -1110,6 +1175,13 @@ msgid "Set to Draft"
msgstr "Seteaza ca ciorna"
#. module: purchase
+#: help:purchase.order,origin:0
+msgid ""
+"Reference of the document that generated this purchase order request; a "
+"sales order or an internal procurement request."
+msgstr ""
+
+#. module: purchase
#: view:purchase.order.line:0
msgid "Notes"
msgstr "Note"
@@ -1139,7 +1211,7 @@ msgid "Stock Move"
msgstr "Miscare stoc"
#. module: purchase
-#: code:addons/purchase/purchase.py:255
+#: code:addons/purchase/purchase.py:260
#, python-format
msgid "Invalid Action!"
msgstr ""
@@ -1241,7 +1313,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:310
+#: code:addons/purchase/purchase.py:320
#, python-format
msgid "Please create Invoices."
msgstr ""
@@ -1331,7 +1403,7 @@ msgid "Purchase Order Line Make Invoice"
msgstr "Linie comanda de achizitii Faceti factura"
#. module: purchase
-#: code:addons/purchase/purchase.py:1133
+#: code:addons/purchase/purchase.py:1141
#, python-format
msgid "PO: %s"
msgstr "PO: %s"
@@ -1342,7 +1414,7 @@ msgid "Send by EMail"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:498
+#: code:addons/purchase/purchase.py:515
#, python-format
msgid "Define purchase journal for this company: \"%s\" (id:%d)."
msgstr ""
@@ -1353,9 +1425,9 @@ msgid "Purchase Order "
msgstr ""
#. module: purchase
-#: view:purchase.order.line:0
-msgid "Manual Invoices"
-msgstr "Facturi manuale"
+#: help:purchase.config.settings,group_costing_method:0
+msgid "Allows you to compute product cost price based on average cost."
+msgstr ""
#. module: purchase
#: model:ir.actions.act_window,name:purchase.action_purchase_configuration
@@ -1509,8 +1581,8 @@ msgid "Compute product cost price based on average cost"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:340
-#: code:addons/purchase/wizard/purchase_line_invoice.py:141
+#: code:addons/purchase/purchase.py:350
+#: code:addons/purchase/wizard/purchase_line_invoice.py:137
#: model:ir.actions.act_window,name:purchase.act_res_partner_2_supplier_invoices
#: view:res.partner:0
#, python-format
@@ -1622,8 +1694,9 @@ msgid "Open Purchase Menu"
msgstr ""
#. module: purchase
-#: model:ir.model,name:purchase.model_mail_compose_message
-msgid "Email composition wizard"
+#: code:addons/purchase/purchase.py:1028
+#, python-format
+msgid "No address defined for the supplier"
msgstr ""
#. module: purchase
@@ -1696,11 +1769,11 @@ msgid "Purchase Order"
msgstr "Comanda de aprovizionare"
#. module: purchase
-#: code:addons/purchase/purchase.py:310
-#: code:addons/purchase/purchase.py:437
-#: code:addons/purchase/purchase.py:497
-#: code:addons/purchase/purchase.py:508
-#: code:addons/purchase/wizard/purchase_line_invoice.py:109
+#: code:addons/purchase/purchase.py:320
+#: code:addons/purchase/purchase.py:456
+#: code:addons/purchase/purchase.py:514
+#: code:addons/purchase/purchase.py:525
+#: code:addons/purchase/wizard/purchase_line_invoice.py:105
#, python-format
msgid "Error!"
msgstr ""
@@ -1722,16 +1795,6 @@ msgid ""
msgstr ""
#. module: purchase
-#: model:process.transition,note:purchase.process_transition_packinginvoice0
-msgid ""
-"A Pick list generates an invoice. Depending on the Invoicing control of the "
-"sale order, the invoice is based on delivered or on ordered quantities."
-msgstr ""
-"O lista de ridicare genereaza o factura. In functie de controlul facturii "
-"din comanda de vanzare, factura este bazata pe cantitatile livrate sau "
-"comandate."
-
-#. module: purchase
#: selection:purchase.order,state:0
#: selection:purchase.order.line,state:0
#: selection:purchase.report,state:0
@@ -1744,9 +1807,8 @@ msgid "# of Purchase Order"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:827
-#, python-format
-msgid "Shipment <b>received</b>."
+#: model:ir.model,name:purchase.model_mail_compose_message
+msgid "Email composition wizard"
msgstr ""
#. module: purchase
@@ -1837,7 +1899,7 @@ msgid "RFQ_${(object.name or '').replace('/','_')}"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:988
+#: code:addons/purchase/purchase.py:956
#, python-format
msgid "The selected supplier only sells this product by %s"
msgstr "Furnizorul selectat vinde acest produs doar după %s"
@@ -1883,6 +1945,12 @@ msgid "Outgoing products to invoice"
msgstr "Facturare produse iesite"
#. module: purchase
+#: report:purchase.order:0
+#: field:purchase.report,validator:0
+msgid "Validated By"
+msgstr "Validat de catre"
+
+#. module: purchase
#: view:purchase.report:0
#: field:purchase.report,delay_pass:0
msgid "Days to Deliver"
@@ -1972,9 +2040,9 @@ msgid "November"
msgstr "Noiembrie"
#. module: purchase
-#: help:purchase.config.settings,group_costing_method:0
-msgid "Allows you to compute product cost price based on average cost."
-msgstr ""
+#: view:purchase.order.line:0
+msgid "Manual Invoices"
+msgstr "Facturi manuale"
#. module: purchase
#: report:purchase.order:0
@@ -1997,13 +2065,6 @@ msgid ""
msgstr ""
#. module: purchase
-#: help:purchase.order,origin:0
-msgid ""
-"Reference of the document that generated this purchase order request; a sale "
-"order or an internal procurement request."
-msgstr ""
-
-#. module: purchase
#: model:ir.ui.menu,name:purchase.menu_partner_categories_in_form
msgid "Partner Categories"
msgstr "Categorii Partener"
@@ -2024,89 +2085,6 @@ msgid "Invoicing Settings"
msgstr ""
#. module: purchase
-#: model:email.template,body_html:purchase.email_template_edi_purchase
-msgid ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"\n"
-" <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
-"or ''},</p>\n"
-" \n"
-" <p>Here is a ${object.state in ('draft', 'sent') and 'request for "
-"quotation' or 'purchase order confirmation'} from ${object.company_id.name}: "
-"</p>\n"
-" \n"
-" <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
-" &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
-" &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
-" &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
-"${object.pricelist_id.currency_id.name}</strong><br />\n"
-" &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
-" % if object.origin:\n"
-" &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
-" % endif\n"
-" % if object.partner_ref:\n"
-" &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
-" % endif\n"
-" % if object.validator:\n"
-" &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.validator.email "
-"or ''}?subject=Order%20${object.name}\">${object.validator.name}</a>\n"
-" % endif\n"
-" </p>\n"
-"\n"
-" <br/>\n"
-" <p>If you have any question, do not hesitate to contact us.</p>\n"
-" <p>Thank you!</p>\n"
-" <br/>\n"
-" <br/>\n"
-" <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
-"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
-"background-repeat: repeat no-repeat;\">\n"
-" <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
-"#FFF;\">\n"
-" <strong style=\"text-"
-"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
-" </div>\n"
-" <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
-"16px; background-color: #F2F2F2;\">\n"
-" <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
-" % if object.company_id.street:\n"
-" ${object.company_id.street}<br/>\n"
-" % endif\n"
-" % if object.company_id.street2:\n"
-" ${object.company_id.street2}<br/>\n"
-" % endif\n"
-" % if object.company_id.city or object.company_id.zip:\n"
-" ${object.company_id.zip} ${object.company_id.city}<br/>\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 ''}<br/>\n"
-" % endif\n"
-" </span>\n"
-" % if object.company_id.phone:\n"
-" <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
-"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
-"0px; padding-left: 0px; \">\n"
-" Phone:&nbsp; ${object.company_id.phone}\n"
-" </div>\n"
-" % endif\n"
-" % if object.company_id.website:\n"
-" <div>\n"
-" Web :&nbsp;<a "
-"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
-" </div>\n"
-" %endif\n"
-" <p></p>\n"
-" </div>\n"
-"</div>\n"
-" "
-msgstr ""
-
-#. module: purchase
#: model:ir.actions.act_window,name:purchase.action_purchase_order_by_user_all
msgid "Total Orders by User per month"
msgstr "Total Comenzi după Utilizator pe luna"
@@ -2117,21 +2095,19 @@ msgid "Based on incoming shipments"
msgstr ""
#. module: purchase
+#: code:addons/purchase/purchase.py:1018
+#, python-format
+msgid "No default supplier defined for this product"
+msgstr ""
+
+#. module: purchase
#: view:purchase.report:0
#: field:purchase.report,warehouse_id:0
msgid "Warehouse"
msgstr "Depozit"
#. module: purchase
-#: help:purchase.order,partner_ref:0
-msgid ""
-"Reference of the sale order or quotation sent by your supplier. It's mainly "
-"used to do the matching when you receive the products as this reference is "
-"usually written on the delivery order sent by your supplier."
-msgstr ""
-
-#. module: purchase
-#: code:addons/purchase/purchase.py:991
+#: code:addons/purchase/purchase.py:960
#, python-format
msgid ""
"The selected supplier has a minimal quantity set to %s %s, you should not "
@@ -2218,8 +2194,8 @@ msgstr ""
" "
#. module: purchase
-#: view:product.product:0
-msgid "When you sell this service to a customer,"
+#: field:purchase.order,message_summary:0
+msgid "Summary"
msgstr ""
#. module: purchase
@@ -2229,6 +2205,11 @@ msgid "Pricelist Versions"
msgstr "Versiuni ale Listei de preturi"
#. module: purchase
+#: field:purchase.order,payment_term_id:0
+msgid "Payment Term"
+msgstr ""
+
+#. module: purchase
#: view:purchase.order:0
msgid "Purchase orders which are in draft state"
msgstr "Comenzi de achizitie care se afla in starea ciorna"
@@ -2617,6 +2598,14 @@ msgstr "Comenzi"
#~ msgid "Approve Purchase"
#~ msgstr "Aproba achizitia"
+#~ msgid ""
+#~ "A Pick list generates an invoice. Depending on the Invoicing control of the "
+#~ "sale order, the invoice is based on delivered or on ordered quantities."
+#~ msgstr ""
+#~ "O lista de ridicare genereaza o factura. In functie de controlul facturii "
+#~ "din comanda de vanzare, factura este bazata pe cantitatile livrate sau "
+#~ "comandate."
+
#~ msgid "Convert to Purchase Order"
#~ msgstr "Schimba in Comanda de Achizitionare"
@@ -2941,6 +2930,9 @@ msgstr "Comenzi"
#~ msgid "Order in current year"
#~ msgstr "Comanda din anul curent"
+#~ msgid "Select an Open Sale Order"
+#~ msgstr "Selecteaza o Comanda de vanzari Deschisa"
+
#~ msgid "Purchase Management"
#~ msgstr "Managementul achizitiilor"
diff --git a/addons/purchase/i18n/ru.po b/addons/purchase/i18n/ru.po
index e361dd3085f..fe14b630ab3 100644
--- a/addons/purchase/i18n/ru.po
+++ b/addons/purchase/i18n/ru.po
@@ -6,15 +6,15 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
"PO-Revision-Date: 2012-11-29 13:12+0000\n"
"Last-Translator: Chertykov Denis <chertykov@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: 2012-12-04 05:12+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:19+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
#. module: purchase
#: model:res.groups,name:purchase.group_analytic_accounting
@@ -60,11 +60,6 @@ msgstr ""
"рассчитывается цена поставщика для выбранной продукции / количества."
#. module: purchase
-#: model:ir.actions.server,name:purchase.actions_server_purchase_order_read
-msgid "Purchase: Mark read"
-msgstr ""
-
-#. module: purchase
#: view:purchase.report:0
#: field:purchase.report,day:0
msgid "Day"
@@ -107,16 +102,13 @@ msgstr ""
"html для возможности использования в канбан виде"
#. module: purchase
-#: code:addons/purchase/purchase.py:973
-#: code:addons/purchase/purchase.py:988
-#: code:addons/purchase/purchase.py:991
-#: code:addons/purchase/wizard/purchase_order_group.py:47
+#: code:addons/purchase/purchase.py:1024
#, python-format
-msgid "Warning!"
-msgstr "Внимание!"
+msgid "Configuration Error!"
+msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:573
+#: code:addons/purchase/purchase.py:587
#, python-format
msgid "You must first cancel all receptions related to this purchase order."
msgstr ""
@@ -135,10 +127,10 @@ msgid "Purchase-Standard Price"
msgstr "Стандартная цена закупки"
#. module: purchase
-#: report:purchase.order:0
-#: field:purchase.report,validator:0
-msgid "Validated By"
-msgstr "Утверждено"
+#: code:addons/purchase/purchase.py:1011
+#, python-format
+msgid "No supplier defined for this product !"
+msgstr ""
#. module: purchase
#: model:ir.actions.act_window,help:purchase.action_picking_tree4_picking_to_invoice
@@ -161,12 +153,6 @@ msgid "Average Price"
msgstr "Средняя цена"
#. module: purchase
-#: code:addons/purchase/purchase.py:830
-#, python-format
-msgid "Invoice <b>paid</b>."
-msgstr "Счет <b>оплачен</b>."
-
-#. module: purchase
#: view:purchase.order:0
msgid "Purchase order which are in the exception state"
msgstr "Запрос закупки, который находится в состоянии \"Исключение\""
@@ -238,7 +224,7 @@ msgstr ""
"Вычислено, как ближайшая запланированная дата из всех позиций заказа закупки"
#. module: purchase
-#: code:addons/purchase/purchase.py:255
+#: code:addons/purchase/purchase.py:260
#, python-format
msgid "In order to delete a purchase order, you must cancel it first."
msgstr "Для того, чтобы удалить заказ, сначала вы должны отменить его."
@@ -264,29 +250,12 @@ msgid "Total Untaxed amount"
msgstr "Итого без налога"
#. module: purchase
-#: model:ir.ui.menu,name:purchase.menu_purchase_uom_categ_form_action
-msgid "Unit of Measure Categories"
-msgstr "Категории единиц измерения"
-
-#. module: purchase
#: view:purchase.report:0
#: field:purchase.report,category_id:0
msgid "Category"
msgstr "Категория"
#. module: purchase
-#: view:purchase.order:0
-msgid "Quotation "
-msgstr "Предложение "
-
-#. module: purchase
-#: code:addons/purchase/purchase.py:810
-#, python-format
-msgid ""
-"Quotation for <em>%s</em> <b>converted</b> to a Purchase Order of %s %s."
-msgstr "Предложение <em>%s</em> <b>преобразовано</b> в заказ закупки %s %s."
-
-#. module: purchase
#: model:process.transition,note:purchase.process_transition_purchaseinvoice0
msgid ""
"A purchase order generates a supplier invoice, as soon as it is confirmed by "
@@ -354,15 +323,17 @@ msgid "October"
msgstr "Октябрь"
#. module: purchase
-#: code:addons/purchase/purchase.py:837
+#: code:addons/purchase/purchase.py:1024
#, python-format
-msgid "Purchase Order for <em>%s</em> <b>cancelled</b>."
-msgstr "Заказ закупки для <em>%s</em> <b>отменен</b>."
+msgid ""
+"The product \"%s\" has been defined with your company as reseller which "
+"seems to be a configuration error!"
+msgstr ""
#. module: purchase
-#: field:purchase.order,message_summary:0
-msgid "Summary"
-msgstr "Итого"
+#: view:product.product:0
+msgid "When you sell this service to a customer,"
+msgstr "Когда вы продаете эту услугу заказчику,"
#. module: purchase
#: model:process.transition,note:purchase.process_transition_createpackinglist0
@@ -390,12 +361,6 @@ msgid "Quantity"
msgstr "Количество"
#. module: purchase
-#: code:addons/purchase/purchase.py:819
-#, python-format
-msgid "Shipment <em>%s</em> <b>scheduled</b> for %s."
-msgstr "Отгрузка <em>%s</em> <b>запланирована</b> на %s."
-
-#. module: purchase
#: field:purchase.order,fiscal_position:0
msgid "Fiscal Position"
msgstr "Налоговая позиция"
@@ -455,12 +420,6 @@ msgstr ""
"Иначе, оставьте пустым для доставки в вашу компанию."
#. module: purchase
-#: code:addons/purchase/purchase.py:824
-#, python-format
-msgid "Draft Invoice of %s %s is <b>waiting for validation</b>."
-msgstr "Черновик счета %s %s <b>ожидает утверждения</b>."
-
-#. module: purchase
#: model:ir.actions.act_window,help:purchase.purchase_line_form_action2
msgid ""
"<p>\n"
@@ -481,6 +440,11 @@ msgid "Scheduled Date"
msgstr "Запланированная дата"
#. module: purchase
+#: field:purchase.order,currency_id:0
+msgid "Currency"
+msgstr ""
+
+#. module: purchase
#: field:purchase.order,journal_id:0
msgid "Journal"
msgstr "Журнал"
@@ -513,6 +477,19 @@ msgid "Incoming Products"
msgstr "Входящие товары"
#. module: purchase
+#: view:purchase.order:0
+msgid "Request for Quotation "
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,partner_ref:0
+msgid ""
+"Reference of the sales order or quotation sent by your supplier. It's mainly "
+"used to do the matching when you receive the products as this reference is "
+"usually written on the delivery order sent by your supplier."
+msgstr ""
+
+#. module: purchase
#: view:purchase.config.settings:0
#: view:purchase.order.group:0
#: view:purchase.order.line_invoice:0
@@ -536,6 +513,11 @@ msgstr ""
"'Вручную')."
#. module: purchase
+#: model:mail.message.subtype,name:purchase.mt_rfq_approved
+msgid "RFQ Approved"
+msgstr ""
+
+#. module: purchase
#: view:purchase.config.settings:0
msgid "Apply"
msgstr "Применить"
@@ -555,6 +537,11 @@ msgstr ""
"становится подтвержденным заказом закупки."
#. module: purchase
+#: model:mail.message.subtype,name:purchase.mt_rfq_confirmed
+msgid "RFQ Confirmed"
+msgstr ""
+
+#. module: purchase
#: view:purchase.order:0
msgid "Customer Address"
msgstr "Адрес заказчика"
@@ -579,7 +566,7 @@ msgid "Supplier"
msgstr "Поставщик"
#. module: purchase
-#: code:addons/purchase/purchase.py:508
+#: code:addons/purchase/purchase.py:525
#, python-format
msgid "Define expense account for this company: \"%s\" (id:%d)."
msgstr "Определить счет расходов для этой компании: \"%s\" (id:%d)."
@@ -603,7 +590,6 @@ msgstr "Подитог"
#. module: purchase
#: field:purchase.order,shipped:0
-#: field:purchase.order,shipped_rate:0
msgid "Received"
msgstr "Получено"
@@ -645,13 +631,20 @@ msgid "Invoices and Receptions"
msgstr "Счета и поступления"
#. module: purchase
+#: model:process.transition,note:purchase.process_transition_packinginvoice0
+msgid ""
+"A Pick list generates an invoice. Depending on the Invoicing control of the "
+"sales order, the invoice is based on delivered or on ordered quantities."
+msgstr ""
+
+#. module: purchase
#: view:purchase.report:0
#: field:purchase.report,nbr:0
msgid "# of Lines"
msgstr "Кол-во позиций"
#. module: purchase
-#: code:addons/purchase/wizard/purchase_line_invoice.py:110
+#: code:addons/purchase/wizard/purchase_line_invoice.py:106
#, python-format
msgid "Define expense account for this product: \"%s\" (id:%d)."
msgstr "Определить счет расходов для этого товара: \"%s\" (id:%d)."
@@ -672,8 +665,8 @@ msgid "It indicates that a picking has been done"
msgstr "Показывает, что комплектование выполнено."
#. module: purchase
-#: code:addons/purchase/purchase.py:565
-#: code:addons/purchase/purchase.py:572
+#: code:addons/purchase/purchase.py:579
+#: code:addons/purchase/purchase.py:586
#, python-format
msgid "Unable to cancel this purchase order."
msgstr "Не удалось отменить это заказ."
@@ -740,6 +733,15 @@ msgid "Draft PO"
msgstr "Черновик ЗЗ"
#. module: purchase
+#: code:addons/purchase/purchase.py:941
+#: code:addons/purchase/purchase.py:956
+#: code:addons/purchase/purchase.py:960
+#: code:addons/purchase/wizard/purchase_order_group.py:47
+#, python-format
+msgid "Warning!"
+msgstr "Внимание!"
+
+#. module: purchase
#: model:process.node,name:purchase.process_node_draftpurchaseorder0
#: model:process.node,name:purchase.process_node_draftpurchaseorder1
msgid "RFQ"
@@ -771,6 +773,11 @@ msgid "The tax amount"
msgstr "Сумма налогов"
#. module: purchase
+#: field:purchase.order,shipped_rate:0
+msgid "Received Ratio"
+msgstr ""
+
+#. module: purchase
#: selection:purchase.report,month:0
msgid "September"
msgstr "Сентябрь"
@@ -802,7 +809,7 @@ msgid "Stock Moves"
msgstr "Движение ТМЦ"
#. module: purchase
-#: code:addons/purchase/purchase.py:1158
+#: code:addons/purchase/purchase.py:1156
#, python-format
msgid "Draft Purchase Order created"
msgstr "Черновик заказа закупки создан"
@@ -823,11 +830,6 @@ msgid "Terms and Conditions"
msgstr "Условия"
#. module: purchase
-#: field:purchase.order,currency_id:0
-msgid "unknown"
-msgstr "неизвестный"
-
-#. module: purchase
#: help:purchase.order,date_order:0
msgid "Date on which this document has been created."
msgstr "Дата на которую этот документ был создан."
@@ -921,12 +923,6 @@ msgid "Cancel"
msgstr "Отмена"
#. module: purchase
-#: field:purchase.order,message_comment_ids:0
-#: help:purchase.order,message_comment_ids:0
-msgid "Comments and emails"
-msgstr "Комментарии и эл. письма"
-
-#. module: purchase
#: sql_constraint:purchase.order:0
msgid "Order Reference must be unique per Company!"
msgstr "Ссылка на заказ должны быть уникальной для каждой компании!"
@@ -960,17 +956,92 @@ msgid "Date Approved"
msgstr "Дата утверждения"
#. module: purchase
-#: code:addons/purchase/purchase.py:806
-#, python-format
-msgid "Request for quotation <b>created</b>."
-msgstr "Запрос цен <b>создан</b>."
-
-#. module: purchase
#: view:product.product:0
msgid "a draft purchase order"
msgstr "черновик заказа закупки"
#. module: purchase
+#: model:email.template,body_html:purchase.email_template_edi_purchase
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: #FFF; \">\n"
+"\n"
+" <p>Hello$ ${object.partner_id.name},</p>\n"
+" \n"
+" <p>Here is a ${object.state in ('draft', 'sent') and 'request for "
+"quotation' or 'purchase order confirmation'} from ${object.company_id.name}: "
+"</p>\n"
+" \n"
+" <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
+" &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
+" &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
+" &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
+"${object.pricelist_id.currency_id.name}</strong><br />\n"
+" &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
+" % if object.origin:\n"
+" &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
+" % endif\n"
+" % if object.partner_ref:\n"
+" &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
+" % endif\n"
+" % if object.validator:\n"
+" &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.validator.email "
+"or ''}?subject=Order%20${object.name}\">${object.validator.name}</a>\n"
+" % endif\n"
+" </p>\n"
+"\n"
+" <br/>\n"
+" <p>If you have any question, do not hesitate to contact us.</p>\n"
+" <p>Thank you!</p>\n"
+" <br/>\n"
+" <br/>\n"
+" <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
+"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
+"background-repeat: repeat no-repeat;\">\n"
+" <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
+"#DDD;\">\n"
+" <strong style=\"text-"
+"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
+" </div>\n"
+" <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
+"16px; background-color: #F2F2F2;\">\n"
+" <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
+" % if object.company_id.street:\n"
+" ${object.company_id.street}<br/>\n"
+" % endif\n"
+" % if object.company_id.street2:\n"
+" ${object.company_id.street2}<br/>\n"
+" % endif\n"
+" % if object.company_id.city or object.company_id.zip:\n"
+" ${object.company_id.zip} ${object.company_id.city}<br/>\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 ''}<br/>\n"
+" % endif\n"
+" </span>\n"
+" % if object.company_id.phone:\n"
+" <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
+"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
+"0px; padding-left: 0px; \">\n"
+" Phone:&nbsp; ${object.company_id.phone}\n"
+" </div>\n"
+" % endif\n"
+" % if object.company_id.website:\n"
+" <div>\n"
+" Web :&nbsp;<a "
+"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
+" </div>\n"
+" %endif\n"
+" <p></p>\n"
+" </div>\n"
+"</div>\n"
+" "
+msgstr ""
+
+#. module: purchase
#: view:purchase.report:0
msgid "Order of Year"
msgstr "Заказ года"
@@ -1010,17 +1081,12 @@ msgid "Outgoing Mails"
msgstr "Исходящие письма"
#. module: purchase
-#: code:addons/purchase/purchase.py:437
+#: code:addons/purchase/purchase.py:456
#, python-format
msgid "You cannot confirm a purchase order without any purchase order line."
msgstr "Вы не можете подтвердить заказ закупки без позиций заказа."
#. module: purchase
-#: model:ir.actions.server,name:purchase.actions_server_purchase_order_unread
-msgid "Purchase: Mark unread"
-msgstr ""
-
-#. module: purchase
#: help:purchase.order,message_ids:0
msgid "Messages and communication history"
msgstr "Сообщения и история общения"
@@ -1032,7 +1098,7 @@ msgid "Destination Warehouse"
msgstr "Склад назначения"
#. module: purchase
-#: code:addons/purchase/purchase.py:973
+#: code:addons/purchase/purchase.py:941
#, python-format
msgid ""
"Selected Unit of Measure does not belong to the same category as the product "
@@ -1042,6 +1108,11 @@ msgstr ""
"измерения товара."
#. module: purchase
+#: view:purchase.order.line_invoice:0
+msgid "Select an Open Sales Order"
+msgstr ""
+
+#. module: purchase
#: model:ir.ui.menu,name:purchase.menu_purchase_unit_measure_purchase
#: model:ir.ui.menu,name:purchase.menu_purchase_uom_form_action
msgid "Units of Measure"
@@ -1053,18 +1124,12 @@ msgid "Manage pricelist per supplier"
msgstr "Управление прайс-листом по поставщику"
#. module: purchase
-#: code:addons/purchase/purchase.py:833
-#, python-format
-msgid "Purchase Order has been set to <b>draft</b>."
-msgstr "Заказ закупки установлен в <b>черновик</b>."
-
-#. module: purchase
#: view:board.board:0
msgid "Purchase Dashboard"
msgstr "Панель закупок"
#. module: purchase
-#: code:addons/purchase/purchase.py:566
+#: code:addons/purchase/purchase.py:580
#, python-format
msgid "First cancel all receptions related to this purchase order."
msgstr "Сначала отмените все приходы, связанные с этим заказом закупки."
@@ -1103,9 +1168,9 @@ msgid "Unread Messages"
msgstr "Непрочитанные сообщения"
#. module: purchase
-#: view:purchase.order.line_invoice:0
-msgid "Select an Open Sale Order"
-msgstr "Выберите открытый заказ продажи"
+#: model:ir.ui.menu,name:purchase.menu_purchase_uom_categ_form_action
+msgid "Unit of Measure Categories"
+msgstr "Категории единиц измерения"
#. module: purchase
#: view:purchase.order:0
@@ -1113,6 +1178,13 @@ msgid "Set to Draft"
msgstr "Установить в 'Черновик'"
#. module: purchase
+#: help:purchase.order,origin:0
+msgid ""
+"Reference of the document that generated this purchase order request; a "
+"sales order or an internal procurement request."
+msgstr ""
+
+#. module: purchase
#: view:purchase.order.line:0
msgid "Notes"
msgstr "Примечания"
@@ -1142,7 +1214,7 @@ msgid "Stock Move"
msgstr "Перемещение ТМЦ"
#. module: purchase
-#: code:addons/purchase/purchase.py:255
+#: code:addons/purchase/purchase.py:260
#, python-format
msgid "Invalid Action!"
msgstr "Неверное действие!"
@@ -1246,7 +1318,7 @@ msgstr ""
" заказа закупки"
#. module: purchase
-#: code:addons/purchase/purchase.py:310
+#: code:addons/purchase/purchase.py:320
#, python-format
msgid "Please create Invoices."
msgstr "Пожалуйста, создайте счета"
@@ -1336,7 +1408,7 @@ msgid "Purchase Order Line Make Invoice"
msgstr "Позиция заказа закупки - Создать счет"
#. module: purchase
-#: code:addons/purchase/purchase.py:1133
+#: code:addons/purchase/purchase.py:1141
#, python-format
msgid "PO: %s"
msgstr "ЗЗ: %s"
@@ -1347,7 +1419,7 @@ msgid "Send by EMail"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:498
+#: code:addons/purchase/purchase.py:515
#, python-format
msgid "Define purchase journal for this company: \"%s\" (id:%d)."
msgstr "Определить журнал покупок для этой компании: \"%s\" (id:%d)."
@@ -1358,9 +1430,9 @@ msgid "Purchase Order "
msgstr "Заказ закупки "
#. module: purchase
-#: view:purchase.order.line:0
-msgid "Manual Invoices"
-msgstr "Счета вручную"
+#: help:purchase.config.settings,group_costing_method:0
+msgid "Allows you to compute product cost price based on average cost."
+msgstr "Позволяет рассчитать себестоимость на основе средней стоимости."
#. module: purchase
#: model:ir.actions.act_window,name:purchase.action_purchase_configuration
@@ -1515,8 +1587,8 @@ msgid "Compute product cost price based on average cost"
msgstr "Вычислить себестоимость на основе средней стоимости"
#. module: purchase
-#: code:addons/purchase/purchase.py:340
-#: code:addons/purchase/wizard/purchase_line_invoice.py:141
+#: code:addons/purchase/purchase.py:350
+#: code:addons/purchase/wizard/purchase_line_invoice.py:137
#: model:ir.actions.act_window,name:purchase.act_res_partner_2_supplier_invoices
#: view:res.partner:0
#, python-format
@@ -1628,8 +1700,9 @@ msgid "Open Purchase Menu"
msgstr "Открыть меню закупок"
#. module: purchase
-#: model:ir.model,name:purchase.model_mail_compose_message
-msgid "Email composition wizard"
+#: code:addons/purchase/purchase.py:1028
+#, python-format
+msgid "No address defined for the supplier"
msgstr ""
#. module: purchase
@@ -1702,11 +1775,11 @@ msgid "Purchase Order"
msgstr "Заказ закупки"
#. module: purchase
-#: code:addons/purchase/purchase.py:310
-#: code:addons/purchase/purchase.py:437
-#: code:addons/purchase/purchase.py:497
-#: code:addons/purchase/purchase.py:508
-#: code:addons/purchase/wizard/purchase_line_invoice.py:109
+#: code:addons/purchase/purchase.py:320
+#: code:addons/purchase/purchase.py:456
+#: code:addons/purchase/purchase.py:514
+#: code:addons/purchase/purchase.py:525
+#: code:addons/purchase/wizard/purchase_line_invoice.py:105
#, python-format
msgid "Error!"
msgstr "Ошибка!"
@@ -1728,16 +1801,6 @@ msgid ""
msgstr ""
#. module: purchase
-#: model:process.transition,note:purchase.process_transition_packinginvoice0
-msgid ""
-"A Pick list generates an invoice. Depending on the Invoicing control of the "
-"sale order, the invoice is based on delivered or on ordered quantities."
-msgstr ""
-"Комплектовочный лист создает счет. В зависимости от метода выставления счета "
-"при заказе продаж, счет основывается на отгруженном или на заказанном "
-"количестве."
-
-#. module: purchase
#: selection:purchase.order,state:0
#: selection:purchase.order.line,state:0
#: selection:purchase.report,state:0
@@ -1750,10 +1813,9 @@ msgid "# of Purchase Order"
msgstr "№ заказа закупки"
#. module: purchase
-#: code:addons/purchase/purchase.py:827
-#, python-format
-msgid "Shipment <b>received</b>."
-msgstr "Партия <b>получена</b>."
+#: model:ir.model,name:purchase.model_mail_compose_message
+msgid "Email composition wizard"
+msgstr ""
#. module: purchase
#: report:purchase.quotation:0
@@ -1842,7 +1904,7 @@ msgid "RFQ_${(object.name or '').replace('/','_')}"
msgstr "RFQ_${(object.name or '').replace('/','_')}"
#. module: purchase
-#: code:addons/purchase/purchase.py:988
+#: code:addons/purchase/purchase.py:956
#, python-format
msgid "The selected supplier only sells this product by %s"
msgstr "Выбранный поставщик продает ТМЦ только по %s"
@@ -1888,6 +1950,12 @@ msgid "Outgoing products to invoice"
msgstr "Исходящие ТМЦ в счет"
#. module: purchase
+#: report:purchase.order:0
+#: field:purchase.report,validator:0
+msgid "Validated By"
+msgstr "Утверждено"
+
+#. module: purchase
#: view:purchase.report:0
#: field:purchase.report,delay_pass:0
msgid "Days to Deliver"
@@ -1977,9 +2045,9 @@ msgid "November"
msgstr "Ноябрь"
#. module: purchase
-#: help:purchase.config.settings,group_costing_method:0
-msgid "Allows you to compute product cost price based on average cost."
-msgstr "Позволяет рассчитать себестоимость на основе средней стоимости."
+#: view:purchase.order.line:0
+msgid "Manual Invoices"
+msgstr "Счета вручную"
#. module: purchase
#: report:purchase.order:0
@@ -2002,15 +2070,6 @@ msgid ""
msgstr ""
#. module: purchase
-#: help:purchase.order,origin:0
-msgid ""
-"Reference of the document that generated this purchase order request; a sale "
-"order or an internal procurement request."
-msgstr ""
-"Ссылка на документ, который генерирует этот заказ закупки; заказ продажи или "
-"внутренний запрос снабжения."
-
-#. module: purchase
#: model:ir.ui.menu,name:purchase.menu_partner_categories_in_form
msgid "Partner Categories"
msgstr "Категории партнеров"
@@ -2031,89 +2090,6 @@ msgid "Invoicing Settings"
msgstr "Настройка счетов"
#. module: purchase
-#: model:email.template,body_html:purchase.email_template_edi_purchase
-msgid ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"\n"
-" <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
-"or ''},</p>\n"
-" \n"
-" <p>Here is a ${object.state in ('draft', 'sent') and 'request for "
-"quotation' or 'purchase order confirmation'} from ${object.company_id.name}: "
-"</p>\n"
-" \n"
-" <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
-" &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
-" &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
-" &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
-"${object.pricelist_id.currency_id.name}</strong><br />\n"
-" &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
-" % if object.origin:\n"
-" &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
-" % endif\n"
-" % if object.partner_ref:\n"
-" &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
-" % endif\n"
-" % if object.validator:\n"
-" &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.validator.email "
-"or ''}?subject=Order%20${object.name}\">${object.validator.name}</a>\n"
-" % endif\n"
-" </p>\n"
-"\n"
-" <br/>\n"
-" <p>If you have any question, do not hesitate to contact us.</p>\n"
-" <p>Thank you!</p>\n"
-" <br/>\n"
-" <br/>\n"
-" <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
-"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
-"background-repeat: repeat no-repeat;\">\n"
-" <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
-"#FFF;\">\n"
-" <strong style=\"text-"
-"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
-" </div>\n"
-" <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
-"16px; background-color: #F2F2F2;\">\n"
-" <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
-" % if object.company_id.street:\n"
-" ${object.company_id.street}<br/>\n"
-" % endif\n"
-" % if object.company_id.street2:\n"
-" ${object.company_id.street2}<br/>\n"
-" % endif\n"
-" % if object.company_id.city or object.company_id.zip:\n"
-" ${object.company_id.zip} ${object.company_id.city}<br/>\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 ''}<br/>\n"
-" % endif\n"
-" </span>\n"
-" % if object.company_id.phone:\n"
-" <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
-"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
-"0px; padding-left: 0px; \">\n"
-" Phone:&nbsp; ${object.company_id.phone}\n"
-" </div>\n"
-" % endif\n"
-" % if object.company_id.website:\n"
-" <div>\n"
-" Web :&nbsp;<a "
-"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
-" </div>\n"
-" %endif\n"
-" <p></p>\n"
-" </div>\n"
-"</div>\n"
-" "
-msgstr ""
-
-#. module: purchase
#: model:ir.actions.act_window,name:purchase.action_purchase_order_by_user_all
msgid "Total Orders by User per month"
msgstr "Всего заказов пользователя за месяц"
@@ -2124,21 +2100,19 @@ msgid "Based on incoming shipments"
msgstr "На основании поступающих грузов"
#. module: purchase
+#: code:addons/purchase/purchase.py:1018
+#, python-format
+msgid "No default supplier defined for this product"
+msgstr ""
+
+#. module: purchase
#: view:purchase.report:0
#: field:purchase.report,warehouse_id:0
msgid "Warehouse"
msgstr "Склад"
#. module: purchase
-#: help:purchase.order,partner_ref:0
-msgid ""
-"Reference of the sale order or quotation sent by your supplier. It's mainly "
-"used to do the matching when you receive the products as this reference is "
-"usually written on the delivery order sent by your supplier."
-msgstr ""
-
-#. module: purchase
-#: code:addons/purchase/purchase.py:991
+#: code:addons/purchase/purchase.py:960
#, python-format
msgid ""
"The selected supplier has a minimal quantity set to %s %s, you should not "
@@ -2223,9 +2197,9 @@ msgstr ""
" "
#. module: purchase
-#: view:product.product:0
-msgid "When you sell this service to a customer,"
-msgstr "Когда вы продаете эту услугу заказчику,"
+#: field:purchase.order,message_summary:0
+msgid "Summary"
+msgstr "Итого"
#. module: purchase
#: model:ir.actions.act_window,name:purchase.purchase_pricelist_version_action
@@ -2234,6 +2208,11 @@ msgid "Pricelist Versions"
msgstr "Версии прайс-листов"
#. module: purchase
+#: field:purchase.order,payment_term_id:0
+msgid "Payment Term"
+msgstr ""
+
+#. module: purchase
#: view:purchase.order:0
msgid "Purchase orders which are in draft state"
msgstr "Заказы закупки находящиеся в состоянии \"Черновик\""
@@ -2831,6 +2810,14 @@ msgstr "Заказы"
#~ msgid "To Approve"
#~ msgstr "На утверждение"
+#~ msgid ""
+#~ "A Pick list generates an invoice. Depending on the Invoicing control of the "
+#~ "sale order, the invoice is based on delivered or on ordered quantities."
+#~ msgstr ""
+#~ "Комплектовочный лист создает счет. В зависимости от метода выставления счета "
+#~ "при заказе продаж, счет основывается на отгруженном или на заказанном "
+#~ "количестве."
+
#~ msgid "Convert to Purchase Order"
#~ msgstr "Преобразовать в заказ закупки"
@@ -3172,6 +3159,9 @@ msgstr "Заказы"
#~ msgid "res_config_contents"
#~ msgstr "res_config_contents"
+#~ msgid "Select an Open Sale Order"
+#~ msgstr "Выберите открытый заказ продажи"
+
#~ msgid ""
#~ "unique number of the purchase order,computed automatically when the purchase "
#~ "order is created"
diff --git a/addons/purchase/i18n/sk.po b/addons/purchase/i18n/sk.po
index cfe7d868390..94e304028ab 100644
--- a/addons/purchase/i18n/sk.po
+++ b/addons/purchase/i18n/sk.po
@@ -7,15 +7,15 @@ msgid ""
msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
"PO-Revision-Date: 2011-02-21 09:22+0000\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\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: 2012-12-04 05:12+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:19+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
#. module: purchase
#: model:res.groups,name:purchase.group_analytic_accounting
@@ -59,11 +59,6 @@ msgid ""
msgstr ""
#. module: purchase
-#: model:ir.actions.server,name:purchase.actions_server_purchase_order_read
-msgid "Purchase: Mark read"
-msgstr ""
-
-#. module: purchase
#: view:purchase.report:0
#: field:purchase.report,day:0
msgid "Day"
@@ -104,16 +99,13 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:973
-#: code:addons/purchase/purchase.py:988
-#: code:addons/purchase/purchase.py:991
-#: code:addons/purchase/wizard/purchase_order_group.py:47
+#: code:addons/purchase/purchase.py:1024
#, python-format
-msgid "Warning!"
+msgid "Configuration Error!"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:573
+#: code:addons/purchase/purchase.py:587
#, python-format
msgid "You must first cancel all receptions related to this purchase order."
msgstr ""
@@ -130,10 +122,10 @@ msgid "Purchase-Standard Price"
msgstr ""
#. module: purchase
-#: report:purchase.order:0
-#: field:purchase.report,validator:0
-msgid "Validated By"
-msgstr "Overená"
+#: code:addons/purchase/purchase.py:1011
+#, python-format
+msgid "No supplier defined for this product !"
+msgstr ""
#. module: purchase
#: model:ir.actions.act_window,help:purchase.action_picking_tree4_picking_to_invoice
@@ -156,12 +148,6 @@ msgid "Average Price"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:830
-#, python-format
-msgid "Invoice <b>paid</b>."
-msgstr ""
-
-#. module: purchase
#: view:purchase.order:0
msgid "Purchase order which are in the exception state"
msgstr ""
@@ -231,7 +217,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:255
+#: code:addons/purchase/purchase.py:260
#, python-format
msgid "In order to delete a purchase order, you must cancel it first."
msgstr ""
@@ -257,29 +243,12 @@ msgid "Total Untaxed amount"
msgstr ""
#. module: purchase
-#: model:ir.ui.menu,name:purchase.menu_purchase_uom_categ_form_action
-msgid "Unit of Measure Categories"
-msgstr ""
-
-#. module: purchase
#: view:purchase.report:0
#: field:purchase.report,category_id:0
msgid "Category"
msgstr ""
#. module: purchase
-#: view:purchase.order:0
-msgid "Quotation "
-msgstr ""
-
-#. module: purchase
-#: code:addons/purchase/purchase.py:810
-#, python-format
-msgid ""
-"Quotation for <em>%s</em> <b>converted</b> to a Purchase Order of %s %s."
-msgstr ""
-
-#. module: purchase
#: model:process.transition,note:purchase.process_transition_purchaseinvoice0
msgid ""
"A purchase order generates a supplier invoice, as soon as it is confirmed by "
@@ -344,14 +313,16 @@ msgid "October"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:837
+#: code:addons/purchase/purchase.py:1024
#, python-format
-msgid "Purchase Order for <em>%s</em> <b>cancelled</b>."
+msgid ""
+"The product \"%s\" has been defined with your company as reseller which "
+"seems to be a configuration error!"
msgstr ""
#. module: purchase
-#: field:purchase.order,message_summary:0
-msgid "Summary"
+#: view:product.product:0
+msgid "When you sell this service to a customer,"
msgstr ""
#. module: purchase
@@ -380,12 +351,6 @@ msgid "Quantity"
msgstr "Množstvo"
#. module: purchase
-#: code:addons/purchase/purchase.py:819
-#, python-format
-msgid "Shipment <em>%s</em> <b>scheduled</b> for %s."
-msgstr ""
-
-#. module: purchase
#: field:purchase.order,fiscal_position:0
msgid "Fiscal Position"
msgstr ""
@@ -443,12 +408,6 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:824
-#, python-format
-msgid "Draft Invoice of %s %s is <b>waiting for validation</b>."
-msgstr ""
-
-#. module: purchase
#: model:ir.actions.act_window,help:purchase.purchase_line_form_action2
msgid ""
"<p>\n"
@@ -469,6 +428,11 @@ msgid "Scheduled Date"
msgstr ""
#. module: purchase
+#: field:purchase.order,currency_id:0
+msgid "Currency"
+msgstr ""
+
+#. module: purchase
#: field:purchase.order,journal_id:0
msgid "Journal"
msgstr ""
@@ -501,6 +465,19 @@ msgid "Incoming Products"
msgstr ""
#. module: purchase
+#: view:purchase.order:0
+msgid "Request for Quotation "
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,partner_ref:0
+msgid ""
+"Reference of the sales order or quotation sent by your supplier. It's mainly "
+"used to do the matching when you receive the products as this reference is "
+"usually written on the delivery order sent by your supplier."
+msgstr ""
+
+#. module: purchase
#: view:purchase.config.settings:0
#: view:purchase.order.group:0
#: view:purchase.order.line_invoice:0
@@ -521,6 +498,11 @@ msgid ""
msgstr ""
#. module: purchase
+#: model:mail.message.subtype,name:purchase.mt_rfq_approved
+msgid "RFQ Approved"
+msgstr ""
+
+#. module: purchase
#: view:purchase.config.settings:0
msgid "Apply"
msgstr ""
@@ -538,6 +520,11 @@ msgid ""
msgstr ""
#. module: purchase
+#: model:mail.message.subtype,name:purchase.mt_rfq_confirmed
+msgid "RFQ Confirmed"
+msgstr ""
+
+#. module: purchase
#: view:purchase.order:0
msgid "Customer Address"
msgstr ""
@@ -562,7 +549,7 @@ msgid "Supplier"
msgstr "Dodávateľ"
#. module: purchase
-#: code:addons/purchase/purchase.py:508
+#: code:addons/purchase/purchase.py:525
#, python-format
msgid "Define expense account for this company: \"%s\" (id:%d)."
msgstr ""
@@ -586,7 +573,6 @@ msgstr ""
#. module: purchase
#: field:purchase.order,shipped:0
-#: field:purchase.order,shipped_rate:0
msgid "Received"
msgstr ""
@@ -628,13 +614,20 @@ msgid "Invoices and Receptions"
msgstr ""
#. module: purchase
+#: model:process.transition,note:purchase.process_transition_packinginvoice0
+msgid ""
+"A Pick list generates an invoice. Depending on the Invoicing control of the "
+"sales order, the invoice is based on delivered or on ordered quantities."
+msgstr ""
+
+#. module: purchase
#: view:purchase.report:0
#: field:purchase.report,nbr:0
msgid "# of Lines"
msgstr ""
#. module: purchase
-#: code:addons/purchase/wizard/purchase_line_invoice.py:110
+#: code:addons/purchase/wizard/purchase_line_invoice.py:106
#, python-format
msgid "Define expense account for this product: \"%s\" (id:%d)."
msgstr ""
@@ -655,8 +648,8 @@ msgid "It indicates that a picking has been done"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:565
-#: code:addons/purchase/purchase.py:572
+#: code:addons/purchase/purchase.py:579
+#: code:addons/purchase/purchase.py:586
#, python-format
msgid "Unable to cancel this purchase order."
msgstr ""
@@ -719,6 +712,15 @@ msgid "Draft PO"
msgstr ""
#. module: purchase
+#: code:addons/purchase/purchase.py:941
+#: code:addons/purchase/purchase.py:956
+#: code:addons/purchase/purchase.py:960
+#: code:addons/purchase/wizard/purchase_order_group.py:47
+#, python-format
+msgid "Warning!"
+msgstr ""
+
+#. module: purchase
#: model:process.node,name:purchase.process_node_draftpurchaseorder0
#: model:process.node,name:purchase.process_node_draftpurchaseorder1
msgid "RFQ"
@@ -750,6 +752,11 @@ msgid "The tax amount"
msgstr ""
#. module: purchase
+#: field:purchase.order,shipped_rate:0
+msgid "Received Ratio"
+msgstr ""
+
+#. module: purchase
#: selection:purchase.report,month:0
msgid "September"
msgstr ""
@@ -781,7 +788,7 @@ msgid "Stock Moves"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1158
+#: code:addons/purchase/purchase.py:1156
#, python-format
msgid "Draft Purchase Order created"
msgstr ""
@@ -802,11 +809,6 @@ msgid "Terms and Conditions"
msgstr ""
#. module: purchase
-#: field:purchase.order,currency_id:0
-msgid "unknown"
-msgstr ""
-
-#. module: purchase
#: help:purchase.order,date_order:0
msgid "Date on which this document has been created."
msgstr ""
@@ -900,12 +902,6 @@ msgid "Cancel"
msgstr ""
#. module: purchase
-#: field:purchase.order,message_comment_ids:0
-#: help:purchase.order,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
-#. module: purchase
#: sql_constraint:purchase.order:0
msgid "Order Reference must be unique per Company!"
msgstr ""
@@ -939,14 +935,89 @@ msgid "Date Approved"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:806
-#, python-format
-msgid "Request for quotation <b>created</b>."
+#: view:product.product:0
+msgid "a draft purchase order"
msgstr ""
#. module: purchase
-#: view:product.product:0
-msgid "a draft purchase order"
+#: model:email.template,body_html:purchase.email_template_edi_purchase
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: #FFF; \">\n"
+"\n"
+" <p>Hello$ ${object.partner_id.name},</p>\n"
+" \n"
+" <p>Here is a ${object.state in ('draft', 'sent') and 'request for "
+"quotation' or 'purchase order confirmation'} from ${object.company_id.name}: "
+"</p>\n"
+" \n"
+" <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
+" &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
+" &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
+" &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
+"${object.pricelist_id.currency_id.name}</strong><br />\n"
+" &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
+" % if object.origin:\n"
+" &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
+" % endif\n"
+" % if object.partner_ref:\n"
+" &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
+" % endif\n"
+" % if object.validator:\n"
+" &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.validator.email "
+"or ''}?subject=Order%20${object.name}\">${object.validator.name}</a>\n"
+" % endif\n"
+" </p>\n"
+"\n"
+" <br/>\n"
+" <p>If you have any question, do not hesitate to contact us.</p>\n"
+" <p>Thank you!</p>\n"
+" <br/>\n"
+" <br/>\n"
+" <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
+"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
+"background-repeat: repeat no-repeat;\">\n"
+" <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
+"#DDD;\">\n"
+" <strong style=\"text-"
+"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
+" </div>\n"
+" <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
+"16px; background-color: #F2F2F2;\">\n"
+" <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
+" % if object.company_id.street:\n"
+" ${object.company_id.street}<br/>\n"
+" % endif\n"
+" % if object.company_id.street2:\n"
+" ${object.company_id.street2}<br/>\n"
+" % endif\n"
+" % if object.company_id.city or object.company_id.zip:\n"
+" ${object.company_id.zip} ${object.company_id.city}<br/>\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 ''}<br/>\n"
+" % endif\n"
+" </span>\n"
+" % if object.company_id.phone:\n"
+" <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
+"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
+"0px; padding-left: 0px; \">\n"
+" Phone:&nbsp; ${object.company_id.phone}\n"
+" </div>\n"
+" % endif\n"
+" % if object.company_id.website:\n"
+" <div>\n"
+" Web :&nbsp;<a "
+"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
+" </div>\n"
+" %endif\n"
+" <p></p>\n"
+" </div>\n"
+"</div>\n"
+" "
msgstr ""
#. module: purchase
@@ -986,17 +1057,12 @@ msgid "Outgoing Mails"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:437
+#: code:addons/purchase/purchase.py:456
#, python-format
msgid "You cannot confirm a purchase order without any purchase order line."
msgstr ""
#. module: purchase
-#: model:ir.actions.server,name:purchase.actions_server_purchase_order_unread
-msgid "Purchase: Mark unread"
-msgstr ""
-
-#. module: purchase
#: help:purchase.order,message_ids:0
msgid "Messages and communication history"
msgstr ""
@@ -1008,7 +1074,7 @@ msgid "Destination Warehouse"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:973
+#: code:addons/purchase/purchase.py:941
#, python-format
msgid ""
"Selected Unit of Measure does not belong to the same category as the product "
@@ -1016,6 +1082,11 @@ msgid ""
msgstr ""
#. module: purchase
+#: view:purchase.order.line_invoice:0
+msgid "Select an Open Sales Order"
+msgstr ""
+
+#. module: purchase
#: model:ir.ui.menu,name:purchase.menu_purchase_unit_measure_purchase
#: model:ir.ui.menu,name:purchase.menu_purchase_uom_form_action
msgid "Units of Measure"
@@ -1027,18 +1098,12 @@ msgid "Manage pricelist per supplier"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:833
-#, python-format
-msgid "Purchase Order has been set to <b>draft</b>."
-msgstr ""
-
-#. module: purchase
#: view:board.board:0
msgid "Purchase Dashboard"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:566
+#: code:addons/purchase/purchase.py:580
#, python-format
msgid "First cancel all receptions related to this purchase order."
msgstr ""
@@ -1077,8 +1142,8 @@ msgid "Unread Messages"
msgstr ""
#. module: purchase
-#: view:purchase.order.line_invoice:0
-msgid "Select an Open Sale Order"
+#: model:ir.ui.menu,name:purchase.menu_purchase_uom_categ_form_action
+msgid "Unit of Measure Categories"
msgstr ""
#. module: purchase
@@ -1087,6 +1152,13 @@ msgid "Set to Draft"
msgstr "Nastaviť ako návr"
#. module: purchase
+#: help:purchase.order,origin:0
+msgid ""
+"Reference of the document that generated this purchase order request; a "
+"sales order or an internal procurement request."
+msgstr ""
+
+#. module: purchase
#: view:purchase.order.line:0
msgid "Notes"
msgstr ""
@@ -1116,7 +1188,7 @@ msgid "Stock Move"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:255
+#: code:addons/purchase/purchase.py:260
#, python-format
msgid "Invalid Action!"
msgstr ""
@@ -1215,7 +1287,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:310
+#: code:addons/purchase/purchase.py:320
#, python-format
msgid "Please create Invoices."
msgstr ""
@@ -1305,7 +1377,7 @@ msgid "Purchase Order Line Make Invoice"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1133
+#: code:addons/purchase/purchase.py:1141
#, python-format
msgid "PO: %s"
msgstr ""
@@ -1316,7 +1388,7 @@ msgid "Send by EMail"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:498
+#: code:addons/purchase/purchase.py:515
#, python-format
msgid "Define purchase journal for this company: \"%s\" (id:%d)."
msgstr ""
@@ -1327,8 +1399,8 @@ msgid "Purchase Order "
msgstr ""
#. module: purchase
-#: view:purchase.order.line:0
-msgid "Manual Invoices"
+#: help:purchase.config.settings,group_costing_method:0
+msgid "Allows you to compute product cost price based on average cost."
msgstr ""
#. module: purchase
@@ -1483,8 +1555,8 @@ msgid "Compute product cost price based on average cost"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:340
-#: code:addons/purchase/wizard/purchase_line_invoice.py:141
+#: code:addons/purchase/purchase.py:350
+#: code:addons/purchase/wizard/purchase_line_invoice.py:137
#: model:ir.actions.act_window,name:purchase.act_res_partner_2_supplier_invoices
#: view:res.partner:0
#, python-format
@@ -1596,8 +1668,9 @@ msgid "Open Purchase Menu"
msgstr ""
#. module: purchase
-#: model:ir.model,name:purchase.model_mail_compose_message
-msgid "Email composition wizard"
+#: code:addons/purchase/purchase.py:1028
+#, python-format
+msgid "No address defined for the supplier"
msgstr ""
#. module: purchase
@@ -1668,11 +1741,11 @@ msgid "Purchase Order"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:310
-#: code:addons/purchase/purchase.py:437
-#: code:addons/purchase/purchase.py:497
-#: code:addons/purchase/purchase.py:508
-#: code:addons/purchase/wizard/purchase_line_invoice.py:109
+#: code:addons/purchase/purchase.py:320
+#: code:addons/purchase/purchase.py:456
+#: code:addons/purchase/purchase.py:514
+#: code:addons/purchase/purchase.py:525
+#: code:addons/purchase/wizard/purchase_line_invoice.py:105
#, python-format
msgid "Error!"
msgstr ""
@@ -1694,13 +1767,6 @@ msgid ""
msgstr ""
#. module: purchase
-#: model:process.transition,note:purchase.process_transition_packinginvoice0
-msgid ""
-"A Pick list generates an invoice. Depending on the Invoicing control of the "
-"sale order, the invoice is based on delivered or on ordered quantities."
-msgstr ""
-
-#. module: purchase
#: selection:purchase.order,state:0
#: selection:purchase.order.line,state:0
#: selection:purchase.report,state:0
@@ -1713,9 +1779,8 @@ msgid "# of Purchase Order"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:827
-#, python-format
-msgid "Shipment <b>received</b>."
+#: model:ir.model,name:purchase.model_mail_compose_message
+msgid "Email composition wizard"
msgstr ""
#. module: purchase
@@ -1799,7 +1864,7 @@ msgid "RFQ_${(object.name or '').replace('/','_')}"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:988
+#: code:addons/purchase/purchase.py:956
#, python-format
msgid "The selected supplier only sells this product by %s"
msgstr "Vybraný dodávateľ predáva produkt %s"
@@ -1845,6 +1910,12 @@ msgid "Outgoing products to invoice"
msgstr ""
#. module: purchase
+#: report:purchase.order:0
+#: field:purchase.report,validator:0
+msgid "Validated By"
+msgstr "Overená"
+
+#. module: purchase
#: view:purchase.report:0
#: field:purchase.report,delay_pass:0
msgid "Days to Deliver"
@@ -1934,8 +2005,8 @@ msgid "November"
msgstr ""
#. module: purchase
-#: help:purchase.config.settings,group_costing_method:0
-msgid "Allows you to compute product cost price based on average cost."
+#: view:purchase.order.line:0
+msgid "Manual Invoices"
msgstr ""
#. module: purchase
@@ -1959,13 +2030,6 @@ msgid ""
msgstr ""
#. module: purchase
-#: help:purchase.order,origin:0
-msgid ""
-"Reference of the document that generated this purchase order request; a sale "
-"order or an internal procurement request."
-msgstr ""
-
-#. module: purchase
#: model:ir.ui.menu,name:purchase.menu_partner_categories_in_form
msgid "Partner Categories"
msgstr ""
@@ -1986,89 +2050,6 @@ msgid "Invoicing Settings"
msgstr ""
#. module: purchase
-#: model:email.template,body_html:purchase.email_template_edi_purchase
-msgid ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"\n"
-" <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
-"or ''},</p>\n"
-" \n"
-" <p>Here is a ${object.state in ('draft', 'sent') and 'request for "
-"quotation' or 'purchase order confirmation'} from ${object.company_id.name}: "
-"</p>\n"
-" \n"
-" <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
-" &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
-" &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
-" &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
-"${object.pricelist_id.currency_id.name}</strong><br />\n"
-" &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
-" % if object.origin:\n"
-" &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
-" % endif\n"
-" % if object.partner_ref:\n"
-" &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
-" % endif\n"
-" % if object.validator:\n"
-" &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.validator.email "
-"or ''}?subject=Order%20${object.name}\">${object.validator.name}</a>\n"
-" % endif\n"
-" </p>\n"
-"\n"
-" <br/>\n"
-" <p>If you have any question, do not hesitate to contact us.</p>\n"
-" <p>Thank you!</p>\n"
-" <br/>\n"
-" <br/>\n"
-" <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
-"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
-"background-repeat: repeat no-repeat;\">\n"
-" <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
-"#FFF;\">\n"
-" <strong style=\"text-"
-"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
-" </div>\n"
-" <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
-"16px; background-color: #F2F2F2;\">\n"
-" <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
-" % if object.company_id.street:\n"
-" ${object.company_id.street}<br/>\n"
-" % endif\n"
-" % if object.company_id.street2:\n"
-" ${object.company_id.street2}<br/>\n"
-" % endif\n"
-" % if object.company_id.city or object.company_id.zip:\n"
-" ${object.company_id.zip} ${object.company_id.city}<br/>\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 ''}<br/>\n"
-" % endif\n"
-" </span>\n"
-" % if object.company_id.phone:\n"
-" <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
-"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
-"0px; padding-left: 0px; \">\n"
-" Phone:&nbsp; ${object.company_id.phone}\n"
-" </div>\n"
-" % endif\n"
-" % if object.company_id.website:\n"
-" <div>\n"
-" Web :&nbsp;<a "
-"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
-" </div>\n"
-" %endif\n"
-" <p></p>\n"
-" </div>\n"
-"</div>\n"
-" "
-msgstr ""
-
-#. module: purchase
#: model:ir.actions.act_window,name:purchase.action_purchase_order_by_user_all
msgid "Total Orders by User per month"
msgstr ""
@@ -2079,21 +2060,19 @@ msgid "Based on incoming shipments"
msgstr ""
#. module: purchase
-#: view:purchase.report:0
-#: field:purchase.report,warehouse_id:0
-msgid "Warehouse"
+#: code:addons/purchase/purchase.py:1018
+#, python-format
+msgid "No default supplier defined for this product"
msgstr ""
#. module: purchase
-#: help:purchase.order,partner_ref:0
-msgid ""
-"Reference of the sale order or quotation sent by your supplier. It's mainly "
-"used to do the matching when you receive the products as this reference is "
-"usually written on the delivery order sent by your supplier."
+#: view:purchase.report:0
+#: field:purchase.report,warehouse_id:0
+msgid "Warehouse"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:991
+#: code:addons/purchase/purchase.py:960
#, python-format
msgid ""
"The selected supplier has a minimal quantity set to %s %s, you should not "
@@ -2166,8 +2145,8 @@ msgid ""
msgstr ""
#. module: purchase
-#: view:product.product:0
-msgid "When you sell this service to a customer,"
+#: field:purchase.order,message_summary:0
+msgid "Summary"
msgstr ""
#. module: purchase
@@ -2177,6 +2156,11 @@ msgid "Pricelist Versions"
msgstr ""
#. module: purchase
+#: field:purchase.order,payment_term_id:0
+msgid "Payment Term"
+msgstr ""
+
+#. module: purchase
#: view:purchase.order:0
msgid "Purchase orders which are in draft state"
msgstr ""
diff --git a/addons/purchase/i18n/sl.po b/addons/purchase/i18n/sl.po
index e5470f3f92a..19a4fa5c1bb 100644
--- a/addons/purchase/i18n/sl.po
+++ b/addons/purchase/i18n/sl.po
@@ -6,14 +6,14 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
"PO-Revision-Date: 2012-12-20 10:21+0000\n"
"Last-Translator: Vida Potočnik <vida.potocnik@mentis.si>\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: 2012-12-21 04:40+0000\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:19+0000\n"
"X-Generator: Launchpad (build 16378)\n"
#. module: purchase
@@ -60,11 +60,6 @@ msgstr ""
"dobaviteljevo ceno za izbrane proizvode/količine."
#. module: purchase
-#: model:ir.actions.server,name:purchase.actions_server_purchase_order_read
-msgid "Purchase: Mark read"
-msgstr "Nabava: Označi kot prebrano"
-
-#. module: purchase
#: view:purchase.report:0
#: field:purchase.report,day:0
msgid "Day"
@@ -105,16 +100,13 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:973
-#: code:addons/purchase/purchase.py:988
-#: code:addons/purchase/purchase.py:991
-#: code:addons/purchase/wizard/purchase_order_group.py:47
+#: code:addons/purchase/purchase.py:1024
#, python-format
-msgid "Warning!"
-msgstr "Opozorilo!"
+msgid "Configuration Error!"
+msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:573
+#: code:addons/purchase/purchase.py:587
#, python-format
msgid "You must first cancel all receptions related to this purchase order."
msgstr "Najprej morate preklicati vse prevzeme, vezane na ta nabavni nalog."
@@ -131,10 +123,10 @@ msgid "Purchase-Standard Price"
msgstr "Standardna cena nabave"
#. module: purchase
-#: report:purchase.order:0
-#: field:purchase.report,validator:0
-msgid "Validated By"
-msgstr "Potrdil"
+#: code:addons/purchase/purchase.py:1011
+#, python-format
+msgid "No supplier defined for this product !"
+msgstr ""
#. module: purchase
#: model:ir.actions.act_window,help:purchase.action_picking_tree4_picking_to_invoice
@@ -157,12 +149,6 @@ msgid "Average Price"
msgstr "Povprečna cena"
#. module: purchase
-#: code:addons/purchase/purchase.py:830
-#, python-format
-msgid "Invoice <b>paid</b>."
-msgstr "Račun <b>plačan>/b>."
-
-#. module: purchase
#: view:purchase.order:0
msgid "Purchase order which are in the exception state"
msgstr "Nabavni nalogi s statusom \"izjeme\""
@@ -233,7 +219,7 @@ msgstr ""
"To se izračuna kot minimalni pričakovani datum vseh naročil artiklov."
#. module: purchase
-#: code:addons/purchase/purchase.py:255
+#: code:addons/purchase/purchase.py:260
#, python-format
msgid "In order to delete a purchase order, you must cancel it first."
msgstr "Če želite izbrisati nabavni nalog, ga morate najprej preklicati."
@@ -259,29 +245,12 @@ msgid "Total Untaxed amount"
msgstr "Skupaj brez davka"
#. module: purchase
-#: model:ir.ui.menu,name:purchase.menu_purchase_uom_categ_form_action
-msgid "Unit of Measure Categories"
-msgstr "Skupine enot mere"
-
-#. module: purchase
#: view:purchase.report:0
#: field:purchase.report,category_id:0
msgid "Category"
msgstr "Kategorija"
#. module: purchase
-#: view:purchase.order:0
-msgid "Quotation "
-msgstr "Ponudba "
-
-#. module: purchase
-#: code:addons/purchase/purchase.py:810
-#, python-format
-msgid ""
-"Quotation for <em>%s</em> <b>converted</b> to a Purchase Order of %s %s."
-msgstr "Ponudba za <em>%s</em> <b>spremenjena</b> v nabavni nalog %s %s."
-
-#. module: purchase
#: model:process.transition,note:purchase.process_transition_purchaseinvoice0
msgid ""
"A purchase order generates a supplier invoice, as soon as it is confirmed by "
@@ -346,15 +315,17 @@ msgid "October"
msgstr "Oktober"
#. module: purchase
-#: code:addons/purchase/purchase.py:837
+#: code:addons/purchase/purchase.py:1024
#, python-format
-msgid "Purchase Order for <em>%s</em> <b>cancelled</b>."
-msgstr "Nabavni nalog za <em>%s</em> <b>preklican</b>."
+msgid ""
+"The product \"%s\" has been defined with your company as reseller which "
+"seems to be a configuration error!"
+msgstr ""
#. module: purchase
-#: field:purchase.order,message_summary:0
-msgid "Summary"
-msgstr "Povzetek"
+#: view:product.product:0
+msgid "When you sell this service to a customer,"
+msgstr ""
#. module: purchase
#: model:process.transition,note:purchase.process_transition_createpackinglist0
@@ -382,12 +353,6 @@ msgid "Quantity"
msgstr "Količina"
#. module: purchase
-#: code:addons/purchase/purchase.py:819
-#, python-format
-msgid "Shipment <em>%s</em> <b>scheduled</b> for %s."
-msgstr "Pošiljka <em>%s</em> <b>načrtovana</b> za %s."
-
-#. module: purchase
#: field:purchase.order,fiscal_position:0
msgid "Fiscal Position"
msgstr "Davčna pozicija"
@@ -447,12 +412,6 @@ msgstr ""
"naslov, drugače pustite prazno."
#. module: purchase
-#: code:addons/purchase/purchase.py:824
-#, python-format
-msgid "Draft Invoice of %s %s is <b>waiting for validation</b>."
-msgstr "Osnutek računa %s %s čaka na potrditev</b>."
-
-#. module: purchase
#: model:ir.actions.act_window,help:purchase.purchase_line_form_action2
msgid ""
"<p>\n"
@@ -473,6 +432,11 @@ msgid "Scheduled Date"
msgstr "Predvideni datum"
#. module: purchase
+#: field:purchase.order,currency_id:0
+msgid "Currency"
+msgstr ""
+
+#. module: purchase
#: field:purchase.order,journal_id:0
msgid "Journal"
msgstr ""
@@ -505,6 +469,19 @@ msgid "Incoming Products"
msgstr "Naročeni produkti"
#. module: purchase
+#: view:purchase.order:0
+msgid "Request for Quotation "
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,partner_ref:0
+msgid ""
+"Reference of the sales order or quotation sent by your supplier. It's mainly "
+"used to do the matching when you receive the products as this reference is "
+"usually written on the delivery order sent by your supplier."
+msgstr ""
+
+#. module: purchase
#: view:purchase.config.settings:0
#: view:purchase.order.group:0
#: view:purchase.order.line_invoice:0
@@ -525,6 +502,11 @@ msgid ""
msgstr ""
#. module: purchase
+#: model:mail.message.subtype,name:purchase.mt_rfq_approved
+msgid "RFQ Approved"
+msgstr ""
+
+#. module: purchase
#: view:purchase.config.settings:0
msgid "Apply"
msgstr "Uporabi"
@@ -542,6 +524,11 @@ msgid ""
msgstr ""
#. module: purchase
+#: model:mail.message.subtype,name:purchase.mt_rfq_confirmed
+msgid "RFQ Confirmed"
+msgstr ""
+
+#. module: purchase
#: view:purchase.order:0
msgid "Customer Address"
msgstr "Nalov kupca"
@@ -566,7 +553,7 @@ msgid "Supplier"
msgstr "Dobavitelj"
#. module: purchase
-#: code:addons/purchase/purchase.py:508
+#: code:addons/purchase/purchase.py:525
#, python-format
msgid "Define expense account for this company: \"%s\" (id:%d)."
msgstr "Določite konto odhodkov za to podjetje: \"%s\" (id:%d)."
@@ -590,7 +577,6 @@ msgstr "Delni seštevek"
#. module: purchase
#: field:purchase.order,shipped:0
-#: field:purchase.order,shipped_rate:0
msgid "Received"
msgstr "Prejeto"
@@ -632,13 +618,20 @@ msgid "Invoices and Receptions"
msgstr "Računi in Prevzemi"
#. module: purchase
+#: model:process.transition,note:purchase.process_transition_packinginvoice0
+msgid ""
+"A Pick list generates an invoice. Depending on the Invoicing control of the "
+"sales order, the invoice is based on delivered or on ordered quantities."
+msgstr ""
+
+#. module: purchase
#: view:purchase.report:0
#: field:purchase.report,nbr:0
msgid "# of Lines"
msgstr "# št. vrstic"
#. module: purchase
-#: code:addons/purchase/wizard/purchase_line_invoice.py:110
+#: code:addons/purchase/wizard/purchase_line_invoice.py:106
#, python-format
msgid "Define expense account for this product: \"%s\" (id:%d)."
msgstr "Določite konto odhodkov za ta izdelek: \"%s\" (id:%d)."
@@ -659,8 +652,8 @@ msgid "It indicates that a picking has been done"
msgstr "Pokaže da je bilo izbiranje končano"
#. module: purchase
-#: code:addons/purchase/purchase.py:565
-#: code:addons/purchase/purchase.py:572
+#: code:addons/purchase/purchase.py:579
+#: code:addons/purchase/purchase.py:586
#, python-format
msgid "Unable to cancel this purchase order."
msgstr "Tega nabavnega naloga ni mogoče preklicati."
@@ -727,6 +720,15 @@ msgid "Draft PO"
msgstr "Osnutek nabavnega naloga"
#. module: purchase
+#: code:addons/purchase/purchase.py:941
+#: code:addons/purchase/purchase.py:956
+#: code:addons/purchase/purchase.py:960
+#: code:addons/purchase/wizard/purchase_order_group.py:47
+#, python-format
+msgid "Warning!"
+msgstr "Opozorilo!"
+
+#. module: purchase
#: model:process.node,name:purchase.process_node_draftpurchaseorder0
#: model:process.node,name:purchase.process_node_draftpurchaseorder1
msgid "RFQ"
@@ -758,6 +760,11 @@ msgid "The tax amount"
msgstr "Znesek davka"
#. module: purchase
+#: field:purchase.order,shipped_rate:0
+msgid "Received Ratio"
+msgstr ""
+
+#. module: purchase
#: selection:purchase.report,month:0
msgid "September"
msgstr "September"
@@ -789,7 +796,7 @@ msgid "Stock Moves"
msgstr "Premiki zaloge"
#. module: purchase
-#: code:addons/purchase/purchase.py:1158
+#: code:addons/purchase/purchase.py:1156
#, python-format
msgid "Draft Purchase Order created"
msgstr "Osnutek nabavnega naloga je kreiran"
@@ -810,11 +817,6 @@ msgid "Terms and Conditions"
msgstr ""
#. module: purchase
-#: field:purchase.order,currency_id:0
-msgid "unknown"
-msgstr "neznano"
-
-#. module: purchase
#: help:purchase.order,date_order:0
msgid "Date on which this document has been created."
msgstr "Datum, ko je bil ta dokument ustvarjen"
@@ -908,12 +910,6 @@ msgid "Cancel"
msgstr "Prekliči"
#. module: purchase
-#: field:purchase.order,message_comment_ids:0
-#: help:purchase.order,message_comment_ids:0
-msgid "Comments and emails"
-msgstr "Pripombe in e-pošta"
-
-#. module: purchase
#: sql_constraint:purchase.order:0
msgid "Order Reference must be unique per Company!"
msgstr "Referenca naročila za podjetje mora biti enolična"
@@ -947,17 +943,92 @@ msgid "Date Approved"
msgstr "Odobreno dne"
#. module: purchase
-#: code:addons/purchase/purchase.py:806
-#, python-format
-msgid "Request for quotation <b>created</b>."
-msgstr "Zahteva za ponudbo <b>kreirana</b>."
-
-#. module: purchase
#: view:product.product:0
msgid "a draft purchase order"
msgstr "osnutek nabavnega naloga"
#. module: purchase
+#: model:email.template,body_html:purchase.email_template_edi_purchase
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: #FFF; \">\n"
+"\n"
+" <p>Hello$ ${object.partner_id.name},</p>\n"
+" \n"
+" <p>Here is a ${object.state in ('draft', 'sent') and 'request for "
+"quotation' or 'purchase order confirmation'} from ${object.company_id.name}: "
+"</p>\n"
+" \n"
+" <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
+" &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
+" &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
+" &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
+"${object.pricelist_id.currency_id.name}</strong><br />\n"
+" &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
+" % if object.origin:\n"
+" &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
+" % endif\n"
+" % if object.partner_ref:\n"
+" &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
+" % endif\n"
+" % if object.validator:\n"
+" &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.validator.email "
+"or ''}?subject=Order%20${object.name}\">${object.validator.name}</a>\n"
+" % endif\n"
+" </p>\n"
+"\n"
+" <br/>\n"
+" <p>If you have any question, do not hesitate to contact us.</p>\n"
+" <p>Thank you!</p>\n"
+" <br/>\n"
+" <br/>\n"
+" <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
+"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
+"background-repeat: repeat no-repeat;\">\n"
+" <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
+"#DDD;\">\n"
+" <strong style=\"text-"
+"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
+" </div>\n"
+" <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
+"16px; background-color: #F2F2F2;\">\n"
+" <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
+" % if object.company_id.street:\n"
+" ${object.company_id.street}<br/>\n"
+" % endif\n"
+" % if object.company_id.street2:\n"
+" ${object.company_id.street2}<br/>\n"
+" % endif\n"
+" % if object.company_id.city or object.company_id.zip:\n"
+" ${object.company_id.zip} ${object.company_id.city}<br/>\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 ''}<br/>\n"
+" % endif\n"
+" </span>\n"
+" % if object.company_id.phone:\n"
+" <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
+"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
+"0px; padding-left: 0px; \">\n"
+" Phone:&nbsp; ${object.company_id.phone}\n"
+" </div>\n"
+" % endif\n"
+" % if object.company_id.website:\n"
+" <div>\n"
+" Web :&nbsp;<a "
+"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
+" </div>\n"
+" %endif\n"
+" <p></p>\n"
+" </div>\n"
+"</div>\n"
+" "
+msgstr ""
+
+#. module: purchase
#: view:purchase.report:0
msgid "Order of Year"
msgstr ""
@@ -996,17 +1067,12 @@ msgid "Outgoing Mails"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:437
+#: code:addons/purchase/purchase.py:456
#, python-format
msgid "You cannot confirm a purchase order without any purchase order line."
msgstr "Ne morete potrditi nabavnega naloga brez postavk."
#. module: purchase
-#: model:ir.actions.server,name:purchase.actions_server_purchase_order_unread
-msgid "Purchase: Mark unread"
-msgstr ""
-
-#. module: purchase
#: help:purchase.order,message_ids:0
msgid "Messages and communication history"
msgstr "Sporočila in zgodovina sporočil"
@@ -1018,7 +1084,7 @@ msgid "Destination Warehouse"
msgstr "Ciljno skladišče"
#. module: purchase
-#: code:addons/purchase/purchase.py:973
+#: code:addons/purchase/purchase.py:941
#, python-format
msgid ""
"Selected Unit of Measure does not belong to the same category as the product "
@@ -1026,6 +1092,11 @@ msgid ""
msgstr "Izbrana enota mere ne pripada isti skupini kot enota mere produkta."
#. module: purchase
+#: view:purchase.order.line_invoice:0
+msgid "Select an Open Sales Order"
+msgstr ""
+
+#. module: purchase
#: model:ir.ui.menu,name:purchase.menu_purchase_unit_measure_purchase
#: model:ir.ui.menu,name:purchase.menu_purchase_uom_form_action
msgid "Units of Measure"
@@ -1037,18 +1108,12 @@ msgid "Manage pricelist per supplier"
msgstr "Upravljanje cenikov po dobavitelju"
#. module: purchase
-#: code:addons/purchase/purchase.py:833
-#, python-format
-msgid "Purchase Order has been set to <b>draft</b>."
-msgstr "Nabavni nalog je bil spremenjen v <b>osnutek</b>."
-
-#. module: purchase
#: view:board.board:0
msgid "Purchase Dashboard"
msgstr "Nadzorna plošča za nakup"
#. module: purchase
-#: code:addons/purchase/purchase.py:566
+#: code:addons/purchase/purchase.py:580
#, python-format
msgid "First cancel all receptions related to this purchase order."
msgstr "Najprej prekličite vse prevzeme, vezane na ta nabavni nalog."
@@ -1087,9 +1152,9 @@ msgid "Unread Messages"
msgstr "Neprebrana sporočila"
#. module: purchase
-#: view:purchase.order.line_invoice:0
-msgid "Select an Open Sale Order"
-msgstr "Izberi odprt prodajni nalog"
+#: model:ir.ui.menu,name:purchase.menu_purchase_uom_categ_form_action
+msgid "Unit of Measure Categories"
+msgstr "Skupine enot mere"
#. module: purchase
#: view:purchase.order:0
@@ -1097,6 +1162,13 @@ msgid "Set to Draft"
msgstr "Preklopi v pripravo"
#. module: purchase
+#: help:purchase.order,origin:0
+msgid ""
+"Reference of the document that generated this purchase order request; a "
+"sales order or an internal procurement request."
+msgstr ""
+
+#. module: purchase
#: view:purchase.order.line:0
msgid "Notes"
msgstr "Opombe"
@@ -1126,7 +1198,7 @@ msgid "Stock Move"
msgstr "Prenos zaloge"
#. module: purchase
-#: code:addons/purchase/purchase.py:255
+#: code:addons/purchase/purchase.py:260
#, python-format
msgid "Invalid Action!"
msgstr ""
@@ -1230,7 +1302,7 @@ msgstr ""
" nabavnega naloga"
#. module: purchase
-#: code:addons/purchase/purchase.py:310
+#: code:addons/purchase/purchase.py:320
#, python-format
msgid "Please create Invoices."
msgstr ""
@@ -1320,7 +1392,7 @@ msgid "Purchase Order Line Make Invoice"
msgstr "Naročilo naj naredi račun"
#. module: purchase
-#: code:addons/purchase/purchase.py:1133
+#: code:addons/purchase/purchase.py:1141
#, python-format
msgid "PO: %s"
msgstr "Nabavni nalog: %s"
@@ -1331,7 +1403,7 @@ msgid "Send by EMail"
msgstr "Pošlji po e-pošti"
#. module: purchase
-#: code:addons/purchase/purchase.py:498
+#: code:addons/purchase/purchase.py:515
#, python-format
msgid "Define purchase journal for this company: \"%s\" (id:%d)."
msgstr "Določite dnevnik nabave za to podjetje: \"%s\" (id:%d)."
@@ -1342,9 +1414,9 @@ msgid "Purchase Order "
msgstr "Nabavni nalog "
#. module: purchase
-#: view:purchase.order.line:0
-msgid "Manual Invoices"
-msgstr "Ročna faktura"
+#: help:purchase.config.settings,group_costing_method:0
+msgid "Allows you to compute product cost price based on average cost."
+msgstr ""
#. module: purchase
#: model:ir.actions.act_window,name:purchase.action_purchase_configuration
@@ -1498,8 +1570,8 @@ msgid "Compute product cost price based on average cost"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:340
-#: code:addons/purchase/wizard/purchase_line_invoice.py:141
+#: code:addons/purchase/purchase.py:350
+#: code:addons/purchase/wizard/purchase_line_invoice.py:137
#: model:ir.actions.act_window,name:purchase.act_res_partner_2_supplier_invoices
#: view:res.partner:0
#, python-format
@@ -1611,9 +1683,10 @@ msgid "Open Purchase Menu"
msgstr "Odpri meni nabave"
#. module: purchase
-#: model:ir.model,name:purchase.model_mail_compose_message
-msgid "Email composition wizard"
-msgstr "Čarovnik za sestavljanje e-pošte"
+#: code:addons/purchase/purchase.py:1028
+#, python-format
+msgid "No address defined for the supplier"
+msgstr ""
#. module: purchase
#: field:purchase.order,company_id:0
@@ -1685,11 +1758,11 @@ msgid "Purchase Order"
msgstr "Nabavni nalog"
#. module: purchase
-#: code:addons/purchase/purchase.py:310
-#: code:addons/purchase/purchase.py:437
-#: code:addons/purchase/purchase.py:497
-#: code:addons/purchase/purchase.py:508
-#: code:addons/purchase/wizard/purchase_line_invoice.py:109
+#: code:addons/purchase/purchase.py:320
+#: code:addons/purchase/purchase.py:456
+#: code:addons/purchase/purchase.py:514
+#: code:addons/purchase/purchase.py:525
+#: code:addons/purchase/wizard/purchase_line_invoice.py:105
#, python-format
msgid "Error!"
msgstr "Napaka!"
@@ -1711,13 +1784,6 @@ msgid ""
msgstr ""
#. module: purchase
-#: model:process.transition,note:purchase.process_transition_packinginvoice0
-msgid ""
-"A Pick list generates an invoice. Depending on the Invoicing control of the "
-"sale order, the invoice is based on delivered or on ordered quantities."
-msgstr ""
-
-#. module: purchase
#: selection:purchase.order,state:0
#: selection:purchase.order.line,state:0
#: selection:purchase.report,state:0
@@ -1730,10 +1796,9 @@ msgid "# of Purchase Order"
msgstr "# od nabavnega naloga"
#. module: purchase
-#: code:addons/purchase/purchase.py:827
-#, python-format
-msgid "Shipment <b>received</b>."
-msgstr ""
+#: model:ir.model,name:purchase.model_mail_compose_message
+msgid "Email composition wizard"
+msgstr "Čarovnik za sestavljanje e-pošte"
#. module: purchase
#: report:purchase.quotation:0
@@ -1819,7 +1884,7 @@ msgid "RFQ_${(object.name or '').replace('/','_')}"
msgstr "Zahtevo za ponudbo_${(object.name or '').zamenja('/','_')}"
#. module: purchase
-#: code:addons/purchase/purchase.py:988
+#: code:addons/purchase/purchase.py:956
#, python-format
msgid "The selected supplier only sells this product by %s"
msgstr "Izbrani dobavitelj prodaja le ta artikel z %s"
@@ -1865,6 +1930,12 @@ msgid "Outgoing products to invoice"
msgstr "Odhodni artikli na računu"
#. module: purchase
+#: report:purchase.order:0
+#: field:purchase.report,validator:0
+msgid "Validated By"
+msgstr "Potrdil"
+
+#. module: purchase
#: view:purchase.report:0
#: field:purchase.report,delay_pass:0
msgid "Days to Deliver"
@@ -1954,9 +2025,9 @@ msgid "November"
msgstr "November"
#. module: purchase
-#: help:purchase.config.settings,group_costing_method:0
-msgid "Allows you to compute product cost price based on average cost."
-msgstr ""
+#: view:purchase.order.line:0
+msgid "Manual Invoices"
+msgstr "Ročna faktura"
#. module: purchase
#: report:purchase.order:0
@@ -1979,13 +2050,6 @@ msgid ""
msgstr ""
#. module: purchase
-#: help:purchase.order,origin:0
-msgid ""
-"Reference of the document that generated this purchase order request; a sale "
-"order or an internal procurement request."
-msgstr ""
-
-#. module: purchase
#: model:ir.ui.menu,name:purchase.menu_partner_categories_in_form
msgid "Partner Categories"
msgstr ""
@@ -2006,89 +2070,6 @@ msgid "Invoicing Settings"
msgstr "Nastavitve fakturiranja"
#. module: purchase
-#: model:email.template,body_html:purchase.email_template_edi_purchase
-msgid ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"\n"
-" <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
-"or ''},</p>\n"
-" \n"
-" <p>Here is a ${object.state in ('draft', 'sent') and 'request for "
-"quotation' or 'purchase order confirmation'} from ${object.company_id.name}: "
-"</p>\n"
-" \n"
-" <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
-" &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
-" &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
-" &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
-"${object.pricelist_id.currency_id.name}</strong><br />\n"
-" &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
-" % if object.origin:\n"
-" &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
-" % endif\n"
-" % if object.partner_ref:\n"
-" &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
-" % endif\n"
-" % if object.validator:\n"
-" &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.validator.email "
-"or ''}?subject=Order%20${object.name}\">${object.validator.name}</a>\n"
-" % endif\n"
-" </p>\n"
-"\n"
-" <br/>\n"
-" <p>If you have any question, do not hesitate to contact us.</p>\n"
-" <p>Thank you!</p>\n"
-" <br/>\n"
-" <br/>\n"
-" <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
-"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
-"background-repeat: repeat no-repeat;\">\n"
-" <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
-"#FFF;\">\n"
-" <strong style=\"text-"
-"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
-" </div>\n"
-" <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
-"16px; background-color: #F2F2F2;\">\n"
-" <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
-" % if object.company_id.street:\n"
-" ${object.company_id.street}<br/>\n"
-" % endif\n"
-" % if object.company_id.street2:\n"
-" ${object.company_id.street2}<br/>\n"
-" % endif\n"
-" % if object.company_id.city or object.company_id.zip:\n"
-" ${object.company_id.zip} ${object.company_id.city}<br/>\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 ''}<br/>\n"
-" % endif\n"
-" </span>\n"
-" % if object.company_id.phone:\n"
-" <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
-"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
-"0px; padding-left: 0px; \">\n"
-" Phone:&nbsp; ${object.company_id.phone}\n"
-" </div>\n"
-" % endif\n"
-" % if object.company_id.website:\n"
-" <div>\n"
-" Web :&nbsp;<a "
-"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
-" </div>\n"
-" %endif\n"
-" <p></p>\n"
-" </div>\n"
-"</div>\n"
-" "
-msgstr ""
-
-#. module: purchase
#: model:ir.actions.act_window,name:purchase.action_purchase_order_by_user_all
msgid "Total Orders by User per month"
msgstr "Skupna naročila za uporabnika na mesec"
@@ -2099,21 +2080,19 @@ msgid "Based on incoming shipments"
msgstr "Na osnovi prihajajočih pošiljk"
#. module: purchase
+#: code:addons/purchase/purchase.py:1018
+#, python-format
+msgid "No default supplier defined for this product"
+msgstr ""
+
+#. module: purchase
#: view:purchase.report:0
#: field:purchase.report,warehouse_id:0
msgid "Warehouse"
msgstr "Skladišče"
#. module: purchase
-#: help:purchase.order,partner_ref:0
-msgid ""
-"Reference of the sale order or quotation sent by your supplier. It's mainly "
-"used to do the matching when you receive the products as this reference is "
-"usually written on the delivery order sent by your supplier."
-msgstr ""
-
-#. module: purchase
-#: code:addons/purchase/purchase.py:991
+#: code:addons/purchase/purchase.py:960
#, python-format
msgid ""
"The selected supplier has a minimal quantity set to %s %s, you should not "
@@ -2196,9 +2175,9 @@ msgstr ""
" "
#. module: purchase
-#: view:product.product:0
-msgid "When you sell this service to a customer,"
-msgstr ""
+#: field:purchase.order,message_summary:0
+msgid "Summary"
+msgstr "Povzetek"
#. module: purchase
#: model:ir.actions.act_window,name:purchase.purchase_pricelist_version_action
@@ -2207,6 +2186,11 @@ msgid "Pricelist Versions"
msgstr "Različice cenikov"
#. module: purchase
+#: field:purchase.order,payment_term_id:0
+msgid "Payment Term"
+msgstr ""
+
+#. module: purchase
#: view:purchase.order:0
msgid "Purchase orders which are in draft state"
msgstr "Osnutki naročil"
@@ -2525,6 +2509,9 @@ msgstr "Naročila"
#~ msgid "Order Reference must be unique !"
#~ msgstr "Sklic naročila mora biti enoličen!"
+#~ msgid "Select an Open Sale Order"
+#~ msgstr "Izberi odprt prodajni nalog"
+
#~ msgid "Supplier Invoices to Receive"
#~ msgstr "Faktura dobavitelja za prejemanje"
diff --git a/addons/purchase/i18n/sq.po b/addons/purchase/i18n/sq.po
index 98cde501dab..8ceff859e02 100644
--- a/addons/purchase/i18n/sq.po
+++ b/addons/purchase/i18n/sq.po
@@ -7,15 +7,15 @@ msgid ""
msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
"PO-Revision-Date: 2010-08-10 10:20+0000\n"
"Last-Translator: mra (Open ERP) <mra@tinyerp.com>\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: 2012-12-04 05:11+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:18+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
#. module: purchase
#: model:res.groups,name:purchase.group_analytic_accounting
@@ -59,11 +59,6 @@ msgid ""
msgstr ""
#. module: purchase
-#: model:ir.actions.server,name:purchase.actions_server_purchase_order_read
-msgid "Purchase: Mark read"
-msgstr ""
-
-#. module: purchase
#: view:purchase.report:0
#: field:purchase.report,day:0
msgid "Day"
@@ -104,16 +99,13 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:973
-#: code:addons/purchase/purchase.py:988
-#: code:addons/purchase/purchase.py:991
-#: code:addons/purchase/wizard/purchase_order_group.py:47
+#: code:addons/purchase/purchase.py:1024
#, python-format
-msgid "Warning!"
+msgid "Configuration Error!"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:573
+#: code:addons/purchase/purchase.py:587
#, python-format
msgid "You must first cancel all receptions related to this purchase order."
msgstr ""
@@ -130,9 +122,9 @@ msgid "Purchase-Standard Price"
msgstr ""
#. module: purchase
-#: report:purchase.order:0
-#: field:purchase.report,validator:0
-msgid "Validated By"
+#: code:addons/purchase/purchase.py:1011
+#, python-format
+msgid "No supplier defined for this product !"
msgstr ""
#. module: purchase
@@ -156,12 +148,6 @@ msgid "Average Price"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:830
-#, python-format
-msgid "Invoice <b>paid</b>."
-msgstr ""
-
-#. module: purchase
#: view:purchase.order:0
msgid "Purchase order which are in the exception state"
msgstr ""
@@ -231,7 +217,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:255
+#: code:addons/purchase/purchase.py:260
#, python-format
msgid "In order to delete a purchase order, you must cancel it first."
msgstr ""
@@ -257,29 +243,12 @@ msgid "Total Untaxed amount"
msgstr ""
#. module: purchase
-#: model:ir.ui.menu,name:purchase.menu_purchase_uom_categ_form_action
-msgid "Unit of Measure Categories"
-msgstr ""
-
-#. module: purchase
#: view:purchase.report:0
#: field:purchase.report,category_id:0
msgid "Category"
msgstr ""
#. module: purchase
-#: view:purchase.order:0
-msgid "Quotation "
-msgstr ""
-
-#. module: purchase
-#: code:addons/purchase/purchase.py:810
-#, python-format
-msgid ""
-"Quotation for <em>%s</em> <b>converted</b> to a Purchase Order of %s %s."
-msgstr ""
-
-#. module: purchase
#: model:process.transition,note:purchase.process_transition_purchaseinvoice0
msgid ""
"A purchase order generates a supplier invoice, as soon as it is confirmed by "
@@ -344,14 +313,16 @@ msgid "October"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:837
+#: code:addons/purchase/purchase.py:1024
#, python-format
-msgid "Purchase Order for <em>%s</em> <b>cancelled</b>."
+msgid ""
+"The product \"%s\" has been defined with your company as reseller which "
+"seems to be a configuration error!"
msgstr ""
#. module: purchase
-#: field:purchase.order,message_summary:0
-msgid "Summary"
+#: view:product.product:0
+msgid "When you sell this service to a customer,"
msgstr ""
#. module: purchase
@@ -380,12 +351,6 @@ msgid "Quantity"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:819
-#, python-format
-msgid "Shipment <em>%s</em> <b>scheduled</b> for %s."
-msgstr ""
-
-#. module: purchase
#: field:purchase.order,fiscal_position:0
msgid "Fiscal Position"
msgstr ""
@@ -443,12 +408,6 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:824
-#, python-format
-msgid "Draft Invoice of %s %s is <b>waiting for validation</b>."
-msgstr ""
-
-#. module: purchase
#: model:ir.actions.act_window,help:purchase.purchase_line_form_action2
msgid ""
"<p>\n"
@@ -469,6 +428,11 @@ msgid "Scheduled Date"
msgstr ""
#. module: purchase
+#: field:purchase.order,currency_id:0
+msgid "Currency"
+msgstr ""
+
+#. module: purchase
#: field:purchase.order,journal_id:0
msgid "Journal"
msgstr ""
@@ -501,6 +465,19 @@ msgid "Incoming Products"
msgstr ""
#. module: purchase
+#: view:purchase.order:0
+msgid "Request for Quotation "
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,partner_ref:0
+msgid ""
+"Reference of the sales order or quotation sent by your supplier. It's mainly "
+"used to do the matching when you receive the products as this reference is "
+"usually written on the delivery order sent by your supplier."
+msgstr ""
+
+#. module: purchase
#: view:purchase.config.settings:0
#: view:purchase.order.group:0
#: view:purchase.order.line_invoice:0
@@ -521,6 +498,11 @@ msgid ""
msgstr ""
#. module: purchase
+#: model:mail.message.subtype,name:purchase.mt_rfq_approved
+msgid "RFQ Approved"
+msgstr ""
+
+#. module: purchase
#: view:purchase.config.settings:0
msgid "Apply"
msgstr ""
@@ -538,6 +520,11 @@ msgid ""
msgstr ""
#. module: purchase
+#: model:mail.message.subtype,name:purchase.mt_rfq_confirmed
+msgid "RFQ Confirmed"
+msgstr ""
+
+#. module: purchase
#: view:purchase.order:0
msgid "Customer Address"
msgstr ""
@@ -562,7 +549,7 @@ msgid "Supplier"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:508
+#: code:addons/purchase/purchase.py:525
#, python-format
msgid "Define expense account for this company: \"%s\" (id:%d)."
msgstr ""
@@ -586,7 +573,6 @@ msgstr ""
#. module: purchase
#: field:purchase.order,shipped:0
-#: field:purchase.order,shipped_rate:0
msgid "Received"
msgstr ""
@@ -628,13 +614,20 @@ msgid "Invoices and Receptions"
msgstr ""
#. module: purchase
+#: model:process.transition,note:purchase.process_transition_packinginvoice0
+msgid ""
+"A Pick list generates an invoice. Depending on the Invoicing control of the "
+"sales order, the invoice is based on delivered or on ordered quantities."
+msgstr ""
+
+#. module: purchase
#: view:purchase.report:0
#: field:purchase.report,nbr:0
msgid "# of Lines"
msgstr ""
#. module: purchase
-#: code:addons/purchase/wizard/purchase_line_invoice.py:110
+#: code:addons/purchase/wizard/purchase_line_invoice.py:106
#, python-format
msgid "Define expense account for this product: \"%s\" (id:%d)."
msgstr ""
@@ -655,8 +648,8 @@ msgid "It indicates that a picking has been done"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:565
-#: code:addons/purchase/purchase.py:572
+#: code:addons/purchase/purchase.py:579
+#: code:addons/purchase/purchase.py:586
#, python-format
msgid "Unable to cancel this purchase order."
msgstr ""
@@ -719,6 +712,15 @@ msgid "Draft PO"
msgstr ""
#. module: purchase
+#: code:addons/purchase/purchase.py:941
+#: code:addons/purchase/purchase.py:956
+#: code:addons/purchase/purchase.py:960
+#: code:addons/purchase/wizard/purchase_order_group.py:47
+#, python-format
+msgid "Warning!"
+msgstr ""
+
+#. module: purchase
#: model:process.node,name:purchase.process_node_draftpurchaseorder0
#: model:process.node,name:purchase.process_node_draftpurchaseorder1
msgid "RFQ"
@@ -750,6 +752,11 @@ msgid "The tax amount"
msgstr ""
#. module: purchase
+#: field:purchase.order,shipped_rate:0
+msgid "Received Ratio"
+msgstr ""
+
+#. module: purchase
#: selection:purchase.report,month:0
msgid "September"
msgstr ""
@@ -781,7 +788,7 @@ msgid "Stock Moves"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1158
+#: code:addons/purchase/purchase.py:1156
#, python-format
msgid "Draft Purchase Order created"
msgstr ""
@@ -802,11 +809,6 @@ msgid "Terms and Conditions"
msgstr ""
#. module: purchase
-#: field:purchase.order,currency_id:0
-msgid "unknown"
-msgstr ""
-
-#. module: purchase
#: help:purchase.order,date_order:0
msgid "Date on which this document has been created."
msgstr ""
@@ -900,12 +902,6 @@ msgid "Cancel"
msgstr ""
#. module: purchase
-#: field:purchase.order,message_comment_ids:0
-#: help:purchase.order,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
-#. module: purchase
#: sql_constraint:purchase.order:0
msgid "Order Reference must be unique per Company!"
msgstr ""
@@ -939,14 +935,89 @@ msgid "Date Approved"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:806
-#, python-format
-msgid "Request for quotation <b>created</b>."
+#: view:product.product:0
+msgid "a draft purchase order"
msgstr ""
#. module: purchase
-#: view:product.product:0
-msgid "a draft purchase order"
+#: model:email.template,body_html:purchase.email_template_edi_purchase
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: #FFF; \">\n"
+"\n"
+" <p>Hello$ ${object.partner_id.name},</p>\n"
+" \n"
+" <p>Here is a ${object.state in ('draft', 'sent') and 'request for "
+"quotation' or 'purchase order confirmation'} from ${object.company_id.name}: "
+"</p>\n"
+" \n"
+" <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
+" &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
+" &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
+" &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
+"${object.pricelist_id.currency_id.name}</strong><br />\n"
+" &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
+" % if object.origin:\n"
+" &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
+" % endif\n"
+" % if object.partner_ref:\n"
+" &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
+" % endif\n"
+" % if object.validator:\n"
+" &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.validator.email "
+"or ''}?subject=Order%20${object.name}\">${object.validator.name}</a>\n"
+" % endif\n"
+" </p>\n"
+"\n"
+" <br/>\n"
+" <p>If you have any question, do not hesitate to contact us.</p>\n"
+" <p>Thank you!</p>\n"
+" <br/>\n"
+" <br/>\n"
+" <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
+"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
+"background-repeat: repeat no-repeat;\">\n"
+" <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
+"#DDD;\">\n"
+" <strong style=\"text-"
+"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
+" </div>\n"
+" <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
+"16px; background-color: #F2F2F2;\">\n"
+" <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
+" % if object.company_id.street:\n"
+" ${object.company_id.street}<br/>\n"
+" % endif\n"
+" % if object.company_id.street2:\n"
+" ${object.company_id.street2}<br/>\n"
+" % endif\n"
+" % if object.company_id.city or object.company_id.zip:\n"
+" ${object.company_id.zip} ${object.company_id.city}<br/>\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 ''}<br/>\n"
+" % endif\n"
+" </span>\n"
+" % if object.company_id.phone:\n"
+" <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
+"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
+"0px; padding-left: 0px; \">\n"
+" Phone:&nbsp; ${object.company_id.phone}\n"
+" </div>\n"
+" % endif\n"
+" % if object.company_id.website:\n"
+" <div>\n"
+" Web :&nbsp;<a "
+"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
+" </div>\n"
+" %endif\n"
+" <p></p>\n"
+" </div>\n"
+"</div>\n"
+" "
msgstr ""
#. module: purchase
@@ -986,17 +1057,12 @@ msgid "Outgoing Mails"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:437
+#: code:addons/purchase/purchase.py:456
#, python-format
msgid "You cannot confirm a purchase order without any purchase order line."
msgstr ""
#. module: purchase
-#: model:ir.actions.server,name:purchase.actions_server_purchase_order_unread
-msgid "Purchase: Mark unread"
-msgstr ""
-
-#. module: purchase
#: help:purchase.order,message_ids:0
msgid "Messages and communication history"
msgstr ""
@@ -1008,7 +1074,7 @@ msgid "Destination Warehouse"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:973
+#: code:addons/purchase/purchase.py:941
#, python-format
msgid ""
"Selected Unit of Measure does not belong to the same category as the product "
@@ -1016,6 +1082,11 @@ msgid ""
msgstr ""
#. module: purchase
+#: view:purchase.order.line_invoice:0
+msgid "Select an Open Sales Order"
+msgstr ""
+
+#. module: purchase
#: model:ir.ui.menu,name:purchase.menu_purchase_unit_measure_purchase
#: model:ir.ui.menu,name:purchase.menu_purchase_uom_form_action
msgid "Units of Measure"
@@ -1027,18 +1098,12 @@ msgid "Manage pricelist per supplier"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:833
-#, python-format
-msgid "Purchase Order has been set to <b>draft</b>."
-msgstr ""
-
-#. module: purchase
#: view:board.board:0
msgid "Purchase Dashboard"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:566
+#: code:addons/purchase/purchase.py:580
#, python-format
msgid "First cancel all receptions related to this purchase order."
msgstr ""
@@ -1077,8 +1142,8 @@ msgid "Unread Messages"
msgstr ""
#. module: purchase
-#: view:purchase.order.line_invoice:0
-msgid "Select an Open Sale Order"
+#: model:ir.ui.menu,name:purchase.menu_purchase_uom_categ_form_action
+msgid "Unit of Measure Categories"
msgstr ""
#. module: purchase
@@ -1087,6 +1152,13 @@ msgid "Set to Draft"
msgstr ""
#. module: purchase
+#: help:purchase.order,origin:0
+msgid ""
+"Reference of the document that generated this purchase order request; a "
+"sales order or an internal procurement request."
+msgstr ""
+
+#. module: purchase
#: view:purchase.order.line:0
msgid "Notes"
msgstr ""
@@ -1116,7 +1188,7 @@ msgid "Stock Move"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:255
+#: code:addons/purchase/purchase.py:260
#, python-format
msgid "Invalid Action!"
msgstr ""
@@ -1215,7 +1287,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:310
+#: code:addons/purchase/purchase.py:320
#, python-format
msgid "Please create Invoices."
msgstr ""
@@ -1305,7 +1377,7 @@ msgid "Purchase Order Line Make Invoice"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1133
+#: code:addons/purchase/purchase.py:1141
#, python-format
msgid "PO: %s"
msgstr ""
@@ -1316,7 +1388,7 @@ msgid "Send by EMail"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:498
+#: code:addons/purchase/purchase.py:515
#, python-format
msgid "Define purchase journal for this company: \"%s\" (id:%d)."
msgstr ""
@@ -1327,8 +1399,8 @@ msgid "Purchase Order "
msgstr ""
#. module: purchase
-#: view:purchase.order.line:0
-msgid "Manual Invoices"
+#: help:purchase.config.settings,group_costing_method:0
+msgid "Allows you to compute product cost price based on average cost."
msgstr ""
#. module: purchase
@@ -1483,8 +1555,8 @@ msgid "Compute product cost price based on average cost"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:340
-#: code:addons/purchase/wizard/purchase_line_invoice.py:141
+#: code:addons/purchase/purchase.py:350
+#: code:addons/purchase/wizard/purchase_line_invoice.py:137
#: model:ir.actions.act_window,name:purchase.act_res_partner_2_supplier_invoices
#: view:res.partner:0
#, python-format
@@ -1596,8 +1668,9 @@ msgid "Open Purchase Menu"
msgstr ""
#. module: purchase
-#: model:ir.model,name:purchase.model_mail_compose_message
-msgid "Email composition wizard"
+#: code:addons/purchase/purchase.py:1028
+#, python-format
+msgid "No address defined for the supplier"
msgstr ""
#. module: purchase
@@ -1668,11 +1741,11 @@ msgid "Purchase Order"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:310
-#: code:addons/purchase/purchase.py:437
-#: code:addons/purchase/purchase.py:497
-#: code:addons/purchase/purchase.py:508
-#: code:addons/purchase/wizard/purchase_line_invoice.py:109
+#: code:addons/purchase/purchase.py:320
+#: code:addons/purchase/purchase.py:456
+#: code:addons/purchase/purchase.py:514
+#: code:addons/purchase/purchase.py:525
+#: code:addons/purchase/wizard/purchase_line_invoice.py:105
#, python-format
msgid "Error!"
msgstr ""
@@ -1694,13 +1767,6 @@ msgid ""
msgstr ""
#. module: purchase
-#: model:process.transition,note:purchase.process_transition_packinginvoice0
-msgid ""
-"A Pick list generates an invoice. Depending on the Invoicing control of the "
-"sale order, the invoice is based on delivered or on ordered quantities."
-msgstr ""
-
-#. module: purchase
#: selection:purchase.order,state:0
#: selection:purchase.order.line,state:0
#: selection:purchase.report,state:0
@@ -1713,9 +1779,8 @@ msgid "# of Purchase Order"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:827
-#, python-format
-msgid "Shipment <b>received</b>."
+#: model:ir.model,name:purchase.model_mail_compose_message
+msgid "Email composition wizard"
msgstr ""
#. module: purchase
@@ -1799,7 +1864,7 @@ msgid "RFQ_${(object.name or '').replace('/','_')}"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:988
+#: code:addons/purchase/purchase.py:956
#, python-format
msgid "The selected supplier only sells this product by %s"
msgstr ""
@@ -1845,6 +1910,12 @@ msgid "Outgoing products to invoice"
msgstr ""
#. module: purchase
+#: report:purchase.order:0
+#: field:purchase.report,validator:0
+msgid "Validated By"
+msgstr ""
+
+#. module: purchase
#: view:purchase.report:0
#: field:purchase.report,delay_pass:0
msgid "Days to Deliver"
@@ -1934,8 +2005,8 @@ msgid "November"
msgstr ""
#. module: purchase
-#: help:purchase.config.settings,group_costing_method:0
-msgid "Allows you to compute product cost price based on average cost."
+#: view:purchase.order.line:0
+msgid "Manual Invoices"
msgstr ""
#. module: purchase
@@ -1959,13 +2030,6 @@ msgid ""
msgstr ""
#. module: purchase
-#: help:purchase.order,origin:0
-msgid ""
-"Reference of the document that generated this purchase order request; a sale "
-"order or an internal procurement request."
-msgstr ""
-
-#. module: purchase
#: model:ir.ui.menu,name:purchase.menu_partner_categories_in_form
msgid "Partner Categories"
msgstr ""
@@ -1986,89 +2050,6 @@ msgid "Invoicing Settings"
msgstr ""
#. module: purchase
-#: model:email.template,body_html:purchase.email_template_edi_purchase
-msgid ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"\n"
-" <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
-"or ''},</p>\n"
-" \n"
-" <p>Here is a ${object.state in ('draft', 'sent') and 'request for "
-"quotation' or 'purchase order confirmation'} from ${object.company_id.name}: "
-"</p>\n"
-" \n"
-" <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
-" &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
-" &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
-" &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
-"${object.pricelist_id.currency_id.name}</strong><br />\n"
-" &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
-" % if object.origin:\n"
-" &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
-" % endif\n"
-" % if object.partner_ref:\n"
-" &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
-" % endif\n"
-" % if object.validator:\n"
-" &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.validator.email "
-"or ''}?subject=Order%20${object.name}\">${object.validator.name}</a>\n"
-" % endif\n"
-" </p>\n"
-"\n"
-" <br/>\n"
-" <p>If you have any question, do not hesitate to contact us.</p>\n"
-" <p>Thank you!</p>\n"
-" <br/>\n"
-" <br/>\n"
-" <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
-"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
-"background-repeat: repeat no-repeat;\">\n"
-" <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
-"#FFF;\">\n"
-" <strong style=\"text-"
-"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
-" </div>\n"
-" <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
-"16px; background-color: #F2F2F2;\">\n"
-" <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
-" % if object.company_id.street:\n"
-" ${object.company_id.street}<br/>\n"
-" % endif\n"
-" % if object.company_id.street2:\n"
-" ${object.company_id.street2}<br/>\n"
-" % endif\n"
-" % if object.company_id.city or object.company_id.zip:\n"
-" ${object.company_id.zip} ${object.company_id.city}<br/>\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 ''}<br/>\n"
-" % endif\n"
-" </span>\n"
-" % if object.company_id.phone:\n"
-" <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
-"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
-"0px; padding-left: 0px; \">\n"
-" Phone:&nbsp; ${object.company_id.phone}\n"
-" </div>\n"
-" % endif\n"
-" % if object.company_id.website:\n"
-" <div>\n"
-" Web :&nbsp;<a "
-"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
-" </div>\n"
-" %endif\n"
-" <p></p>\n"
-" </div>\n"
-"</div>\n"
-" "
-msgstr ""
-
-#. module: purchase
#: model:ir.actions.act_window,name:purchase.action_purchase_order_by_user_all
msgid "Total Orders by User per month"
msgstr ""
@@ -2079,21 +2060,19 @@ msgid "Based on incoming shipments"
msgstr ""
#. module: purchase
-#: view:purchase.report:0
-#: field:purchase.report,warehouse_id:0
-msgid "Warehouse"
+#: code:addons/purchase/purchase.py:1018
+#, python-format
+msgid "No default supplier defined for this product"
msgstr ""
#. module: purchase
-#: help:purchase.order,partner_ref:0
-msgid ""
-"Reference of the sale order or quotation sent by your supplier. It's mainly "
-"used to do the matching when you receive the products as this reference is "
-"usually written on the delivery order sent by your supplier."
+#: view:purchase.report:0
+#: field:purchase.report,warehouse_id:0
+msgid "Warehouse"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:991
+#: code:addons/purchase/purchase.py:960
#, python-format
msgid ""
"The selected supplier has a minimal quantity set to %s %s, you should not "
@@ -2166,8 +2145,8 @@ msgid ""
msgstr ""
#. module: purchase
-#: view:product.product:0
-msgid "When you sell this service to a customer,"
+#: field:purchase.order,message_summary:0
+msgid "Summary"
msgstr ""
#. module: purchase
@@ -2177,6 +2156,11 @@ msgid "Pricelist Versions"
msgstr ""
#. module: purchase
+#: field:purchase.order,payment_term_id:0
+msgid "Payment Term"
+msgstr ""
+
+#. module: purchase
#: view:purchase.order:0
msgid "Purchase orders which are in draft state"
msgstr ""
diff --git a/addons/purchase/i18n/sr.po b/addons/purchase/i18n/sr.po
index 77629ad5285..18ba4056a0b 100644
--- a/addons/purchase/i18n/sr.po
+++ b/addons/purchase/i18n/sr.po
@@ -7,15 +7,15 @@ msgid ""
msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
"PO-Revision-Date: 2012-05-10 17:56+0000\n"
"Last-Translator: Raphael Collet (OpenERP) <Unknown>\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: 2012-12-04 05:12+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:19+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
#. module: purchase
#: model:res.groups,name:purchase.group_analytic_accounting
@@ -61,11 +61,6 @@ msgstr ""
"izračunava nabavnu cenu za odabrane proizvode i količinu."
#. module: purchase
-#: model:ir.actions.server,name:purchase.actions_server_purchase_order_read
-msgid "Purchase: Mark read"
-msgstr ""
-
-#. module: purchase
#: view:purchase.report:0
#: field:purchase.report,day:0
msgid "Day"
@@ -106,16 +101,13 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:973
-#: code:addons/purchase/purchase.py:988
-#: code:addons/purchase/purchase.py:991
-#: code:addons/purchase/wizard/purchase_order_group.py:47
+#: code:addons/purchase/purchase.py:1024
#, python-format
-msgid "Warning!"
+msgid "Configuration Error!"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:573
+#: code:addons/purchase/purchase.py:587
#, python-format
msgid "You must first cancel all receptions related to this purchase order."
msgstr ""
@@ -132,10 +124,10 @@ msgid "Purchase-Standard Price"
msgstr ""
#. module: purchase
-#: report:purchase.order:0
-#: field:purchase.report,validator:0
-msgid "Validated By"
-msgstr "Potvrđeno od"
+#: code:addons/purchase/purchase.py:1011
+#, python-format
+msgid "No supplier defined for this product !"
+msgstr ""
#. module: purchase
#: model:ir.actions.act_window,help:purchase.action_picking_tree4_picking_to_invoice
@@ -158,12 +150,6 @@ msgid "Average Price"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:830
-#, python-format
-msgid "Invoice <b>paid</b>."
-msgstr ""
-
-#. module: purchase
#: view:purchase.order:0
msgid "Purchase order which are in the exception state"
msgstr ""
@@ -235,7 +221,7 @@ msgstr ""
"svim nabavnim nalozima."
#. module: purchase
-#: code:addons/purchase/purchase.py:255
+#: code:addons/purchase/purchase.py:260
#, python-format
msgid "In order to delete a purchase order, you must cancel it first."
msgstr ""
@@ -261,29 +247,12 @@ msgid "Total Untaxed amount"
msgstr ""
#. module: purchase
-#: model:ir.ui.menu,name:purchase.menu_purchase_uom_categ_form_action
-msgid "Unit of Measure Categories"
-msgstr ""
-
-#. module: purchase
#: view:purchase.report:0
#: field:purchase.report,category_id:0
msgid "Category"
msgstr ""
#. module: purchase
-#: view:purchase.order:0
-msgid "Quotation "
-msgstr ""
-
-#. module: purchase
-#: code:addons/purchase/purchase.py:810
-#, python-format
-msgid ""
-"Quotation for <em>%s</em> <b>converted</b> to a Purchase Order of %s %s."
-msgstr ""
-
-#. module: purchase
#: model:process.transition,note:purchase.process_transition_purchaseinvoice0
msgid ""
"A purchase order generates a supplier invoice, as soon as it is confirmed by "
@@ -348,14 +317,16 @@ msgid "October"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:837
+#: code:addons/purchase/purchase.py:1024
#, python-format
-msgid "Purchase Order for <em>%s</em> <b>cancelled</b>."
+msgid ""
+"The product \"%s\" has been defined with your company as reseller which "
+"seems to be a configuration error!"
msgstr ""
#. module: purchase
-#: field:purchase.order,message_summary:0
-msgid "Summary"
+#: view:product.product:0
+msgid "When you sell this service to a customer,"
msgstr ""
#. module: purchase
@@ -384,12 +355,6 @@ msgid "Quantity"
msgstr "Količina"
#. module: purchase
-#: code:addons/purchase/purchase.py:819
-#, python-format
-msgid "Shipment <em>%s</em> <b>scheduled</b> for %s."
-msgstr ""
-
-#. module: purchase
#: field:purchase.order,fiscal_position:0
msgid "Fiscal Position"
msgstr "Fiskalna pozicija"
@@ -447,12 +412,6 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:824
-#, python-format
-msgid "Draft Invoice of %s %s is <b>waiting for validation</b>."
-msgstr ""
-
-#. module: purchase
#: model:ir.actions.act_window,help:purchase.purchase_line_form_action2
msgid ""
"<p>\n"
@@ -473,6 +432,11 @@ msgid "Scheduled Date"
msgstr ""
#. module: purchase
+#: field:purchase.order,currency_id:0
+msgid "Currency"
+msgstr ""
+
+#. module: purchase
#: field:purchase.order,journal_id:0
msgid "Journal"
msgstr ""
@@ -505,6 +469,19 @@ msgid "Incoming Products"
msgstr ""
#. module: purchase
+#: view:purchase.order:0
+msgid "Request for Quotation "
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,partner_ref:0
+msgid ""
+"Reference of the sales order or quotation sent by your supplier. It's mainly "
+"used to do the matching when you receive the products as this reference is "
+"usually written on the delivery order sent by your supplier."
+msgstr ""
+
+#. module: purchase
#: view:purchase.config.settings:0
#: view:purchase.order.group:0
#: view:purchase.order.line_invoice:0
@@ -525,6 +502,11 @@ msgid ""
msgstr ""
#. module: purchase
+#: model:mail.message.subtype,name:purchase.mt_rfq_approved
+msgid "RFQ Approved"
+msgstr ""
+
+#. module: purchase
#: view:purchase.config.settings:0
msgid "Apply"
msgstr ""
@@ -542,6 +524,11 @@ msgid ""
msgstr ""
#. module: purchase
+#: model:mail.message.subtype,name:purchase.mt_rfq_confirmed
+msgid "RFQ Confirmed"
+msgstr ""
+
+#. module: purchase
#: view:purchase.order:0
msgid "Customer Address"
msgstr ""
@@ -566,7 +553,7 @@ msgid "Supplier"
msgstr "Dobavljač"
#. module: purchase
-#: code:addons/purchase/purchase.py:508
+#: code:addons/purchase/purchase.py:525
#, python-format
msgid "Define expense account for this company: \"%s\" (id:%d)."
msgstr ""
@@ -590,7 +577,6 @@ msgstr "Subtotal"
#. module: purchase
#: field:purchase.order,shipped:0
-#: field:purchase.order,shipped_rate:0
msgid "Received"
msgstr "Primljeno"
@@ -632,13 +618,20 @@ msgid "Invoices and Receptions"
msgstr ""
#. module: purchase
+#: model:process.transition,note:purchase.process_transition_packinginvoice0
+msgid ""
+"A Pick list generates an invoice. Depending on the Invoicing control of the "
+"sales order, the invoice is based on delivered or on ordered quantities."
+msgstr ""
+
+#. module: purchase
#: view:purchase.report:0
#: field:purchase.report,nbr:0
msgid "# of Lines"
msgstr ""
#. module: purchase
-#: code:addons/purchase/wizard/purchase_line_invoice.py:110
+#: code:addons/purchase/wizard/purchase_line_invoice.py:106
#, python-format
msgid "Define expense account for this product: \"%s\" (id:%d)."
msgstr ""
@@ -659,8 +652,8 @@ msgid "It indicates that a picking has been done"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:565
-#: code:addons/purchase/purchase.py:572
+#: code:addons/purchase/purchase.py:579
+#: code:addons/purchase/purchase.py:586
#, python-format
msgid "Unable to cancel this purchase order."
msgstr ""
@@ -723,6 +716,15 @@ msgid "Draft PO"
msgstr ""
#. module: purchase
+#: code:addons/purchase/purchase.py:941
+#: code:addons/purchase/purchase.py:956
+#: code:addons/purchase/purchase.py:960
+#: code:addons/purchase/wizard/purchase_order_group.py:47
+#, python-format
+msgid "Warning!"
+msgstr ""
+
+#. module: purchase
#: model:process.node,name:purchase.process_node_draftpurchaseorder0
#: model:process.node,name:purchase.process_node_draftpurchaseorder1
msgid "RFQ"
@@ -754,6 +756,11 @@ msgid "The tax amount"
msgstr ""
#. module: purchase
+#: field:purchase.order,shipped_rate:0
+msgid "Received Ratio"
+msgstr ""
+
+#. module: purchase
#: selection:purchase.report,month:0
msgid "September"
msgstr ""
@@ -785,7 +792,7 @@ msgid "Stock Moves"
msgstr "Kretanje zaliha"
#. module: purchase
-#: code:addons/purchase/purchase.py:1158
+#: code:addons/purchase/purchase.py:1156
#, python-format
msgid "Draft Purchase Order created"
msgstr ""
@@ -806,11 +813,6 @@ msgid "Terms and Conditions"
msgstr ""
#. module: purchase
-#: field:purchase.order,currency_id:0
-msgid "unknown"
-msgstr ""
-
-#. module: purchase
#: help:purchase.order,date_order:0
msgid "Date on which this document has been created."
msgstr "Datum kreiranja dokumenta"
@@ -904,12 +906,6 @@ msgid "Cancel"
msgstr "Odustani"
#. module: purchase
-#: field:purchase.order,message_comment_ids:0
-#: help:purchase.order,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
-#. module: purchase
#: sql_constraint:purchase.order:0
msgid "Order Reference must be unique per Company!"
msgstr ""
@@ -943,14 +939,89 @@ msgid "Date Approved"
msgstr "Datum odobrenja"
#. module: purchase
-#: code:addons/purchase/purchase.py:806
-#, python-format
-msgid "Request for quotation <b>created</b>."
+#: view:product.product:0
+msgid "a draft purchase order"
msgstr ""
#. module: purchase
-#: view:product.product:0
-msgid "a draft purchase order"
+#: model:email.template,body_html:purchase.email_template_edi_purchase
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: #FFF; \">\n"
+"\n"
+" <p>Hello$ ${object.partner_id.name},</p>\n"
+" \n"
+" <p>Here is a ${object.state in ('draft', 'sent') and 'request for "
+"quotation' or 'purchase order confirmation'} from ${object.company_id.name}: "
+"</p>\n"
+" \n"
+" <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
+" &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
+" &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
+" &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
+"${object.pricelist_id.currency_id.name}</strong><br />\n"
+" &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
+" % if object.origin:\n"
+" &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
+" % endif\n"
+" % if object.partner_ref:\n"
+" &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
+" % endif\n"
+" % if object.validator:\n"
+" &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.validator.email "
+"or ''}?subject=Order%20${object.name}\">${object.validator.name}</a>\n"
+" % endif\n"
+" </p>\n"
+"\n"
+" <br/>\n"
+" <p>If you have any question, do not hesitate to contact us.</p>\n"
+" <p>Thank you!</p>\n"
+" <br/>\n"
+" <br/>\n"
+" <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
+"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
+"background-repeat: repeat no-repeat;\">\n"
+" <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
+"#DDD;\">\n"
+" <strong style=\"text-"
+"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
+" </div>\n"
+" <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
+"16px; background-color: #F2F2F2;\">\n"
+" <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
+" % if object.company_id.street:\n"
+" ${object.company_id.street}<br/>\n"
+" % endif\n"
+" % if object.company_id.street2:\n"
+" ${object.company_id.street2}<br/>\n"
+" % endif\n"
+" % if object.company_id.city or object.company_id.zip:\n"
+" ${object.company_id.zip} ${object.company_id.city}<br/>\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 ''}<br/>\n"
+" % endif\n"
+" </span>\n"
+" % if object.company_id.phone:\n"
+" <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
+"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
+"0px; padding-left: 0px; \">\n"
+" Phone:&nbsp; ${object.company_id.phone}\n"
+" </div>\n"
+" % endif\n"
+" % if object.company_id.website:\n"
+" <div>\n"
+" Web :&nbsp;<a "
+"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
+" </div>\n"
+" %endif\n"
+" <p></p>\n"
+" </div>\n"
+"</div>\n"
+" "
msgstr ""
#. module: purchase
@@ -990,17 +1061,12 @@ msgid "Outgoing Mails"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:437
+#: code:addons/purchase/purchase.py:456
#, python-format
msgid "You cannot confirm a purchase order without any purchase order line."
msgstr ""
#. module: purchase
-#: model:ir.actions.server,name:purchase.actions_server_purchase_order_unread
-msgid "Purchase: Mark unread"
-msgstr ""
-
-#. module: purchase
#: help:purchase.order,message_ids:0
msgid "Messages and communication history"
msgstr ""
@@ -1012,7 +1078,7 @@ msgid "Destination Warehouse"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:973
+#: code:addons/purchase/purchase.py:941
#, python-format
msgid ""
"Selected Unit of Measure does not belong to the same category as the product "
@@ -1020,6 +1086,11 @@ msgid ""
msgstr ""
#. module: purchase
+#: view:purchase.order.line_invoice:0
+msgid "Select an Open Sales Order"
+msgstr ""
+
+#. module: purchase
#: model:ir.ui.menu,name:purchase.menu_purchase_unit_measure_purchase
#: model:ir.ui.menu,name:purchase.menu_purchase_uom_form_action
msgid "Units of Measure"
@@ -1031,18 +1102,12 @@ msgid "Manage pricelist per supplier"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:833
-#, python-format
-msgid "Purchase Order has been set to <b>draft</b>."
-msgstr ""
-
-#. module: purchase
#: view:board.board:0
msgid "Purchase Dashboard"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:566
+#: code:addons/purchase/purchase.py:580
#, python-format
msgid "First cancel all receptions related to this purchase order."
msgstr ""
@@ -1081,8 +1146,8 @@ msgid "Unread Messages"
msgstr ""
#. module: purchase
-#: view:purchase.order.line_invoice:0
-msgid "Select an Open Sale Order"
+#: model:ir.ui.menu,name:purchase.menu_purchase_uom_categ_form_action
+msgid "Unit of Measure Categories"
msgstr ""
#. module: purchase
@@ -1091,6 +1156,13 @@ msgid "Set to Draft"
msgstr "Postavi u 'Pripremu'"
#. module: purchase
+#: help:purchase.order,origin:0
+msgid ""
+"Reference of the document that generated this purchase order request; a "
+"sales order or an internal procurement request."
+msgstr ""
+
+#. module: purchase
#: view:purchase.order.line:0
msgid "Notes"
msgstr "Napomene"
@@ -1120,7 +1192,7 @@ msgid "Stock Move"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:255
+#: code:addons/purchase/purchase.py:260
#, python-format
msgid "Invalid Action!"
msgstr ""
@@ -1219,7 +1291,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:310
+#: code:addons/purchase/purchase.py:320
#, python-format
msgid "Please create Invoices."
msgstr ""
@@ -1309,7 +1381,7 @@ msgid "Purchase Order Line Make Invoice"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1133
+#: code:addons/purchase/purchase.py:1141
#, python-format
msgid "PO: %s"
msgstr ""
@@ -1320,7 +1392,7 @@ msgid "Send by EMail"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:498
+#: code:addons/purchase/purchase.py:515
#, python-format
msgid "Define purchase journal for this company: \"%s\" (id:%d)."
msgstr ""
@@ -1331,8 +1403,8 @@ msgid "Purchase Order "
msgstr ""
#. module: purchase
-#: view:purchase.order.line:0
-msgid "Manual Invoices"
+#: help:purchase.config.settings,group_costing_method:0
+msgid "Allows you to compute product cost price based on average cost."
msgstr ""
#. module: purchase
@@ -1487,8 +1559,8 @@ msgid "Compute product cost price based on average cost"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:340
-#: code:addons/purchase/wizard/purchase_line_invoice.py:141
+#: code:addons/purchase/purchase.py:350
+#: code:addons/purchase/wizard/purchase_line_invoice.py:137
#: model:ir.actions.act_window,name:purchase.act_res_partner_2_supplier_invoices
#: view:res.partner:0
#, python-format
@@ -1600,8 +1672,9 @@ msgid "Open Purchase Menu"
msgstr ""
#. module: purchase
-#: model:ir.model,name:purchase.model_mail_compose_message
-msgid "Email composition wizard"
+#: code:addons/purchase/purchase.py:1028
+#, python-format
+msgid "No address defined for the supplier"
msgstr ""
#. module: purchase
@@ -1674,11 +1747,11 @@ msgid "Purchase Order"
msgstr "Nabavni nalog"
#. module: purchase
-#: code:addons/purchase/purchase.py:310
-#: code:addons/purchase/purchase.py:437
-#: code:addons/purchase/purchase.py:497
-#: code:addons/purchase/purchase.py:508
-#: code:addons/purchase/wizard/purchase_line_invoice.py:109
+#: code:addons/purchase/purchase.py:320
+#: code:addons/purchase/purchase.py:456
+#: code:addons/purchase/purchase.py:514
+#: code:addons/purchase/purchase.py:525
+#: code:addons/purchase/wizard/purchase_line_invoice.py:105
#, python-format
msgid "Error!"
msgstr ""
@@ -1700,13 +1773,6 @@ msgid ""
msgstr ""
#. module: purchase
-#: model:process.transition,note:purchase.process_transition_packinginvoice0
-msgid ""
-"A Pick list generates an invoice. Depending on the Invoicing control of the "
-"sale order, the invoice is based on delivered or on ordered quantities."
-msgstr ""
-
-#. module: purchase
#: selection:purchase.order,state:0
#: selection:purchase.order.line,state:0
#: selection:purchase.report,state:0
@@ -1719,9 +1785,8 @@ msgid "# of Purchase Order"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:827
-#, python-format
-msgid "Shipment <b>received</b>."
+#: model:ir.model,name:purchase.model_mail_compose_message
+msgid "Email composition wizard"
msgstr ""
#. module: purchase
@@ -1805,7 +1870,7 @@ msgid "RFQ_${(object.name or '').replace('/','_')}"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:988
+#: code:addons/purchase/purchase.py:956
#, python-format
msgid "The selected supplier only sells this product by %s"
msgstr ""
@@ -1851,6 +1916,12 @@ msgid "Outgoing products to invoice"
msgstr ""
#. module: purchase
+#: report:purchase.order:0
+#: field:purchase.report,validator:0
+msgid "Validated By"
+msgstr "Potvrđeno od"
+
+#. module: purchase
#: view:purchase.report:0
#: field:purchase.report,delay_pass:0
msgid "Days to Deliver"
@@ -1940,8 +2011,8 @@ msgid "November"
msgstr ""
#. module: purchase
-#: help:purchase.config.settings,group_costing_method:0
-msgid "Allows you to compute product cost price based on average cost."
+#: view:purchase.order.line:0
+msgid "Manual Invoices"
msgstr ""
#. module: purchase
@@ -1965,13 +2036,6 @@ msgid ""
msgstr ""
#. module: purchase
-#: help:purchase.order,origin:0
-msgid ""
-"Reference of the document that generated this purchase order request; a sale "
-"order or an internal procurement request."
-msgstr ""
-
-#. module: purchase
#: model:ir.ui.menu,name:purchase.menu_partner_categories_in_form
msgid "Partner Categories"
msgstr ""
@@ -1992,89 +2056,6 @@ msgid "Invoicing Settings"
msgstr ""
#. module: purchase
-#: model:email.template,body_html:purchase.email_template_edi_purchase
-msgid ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"\n"
-" <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
-"or ''},</p>\n"
-" \n"
-" <p>Here is a ${object.state in ('draft', 'sent') and 'request for "
-"quotation' or 'purchase order confirmation'} from ${object.company_id.name}: "
-"</p>\n"
-" \n"
-" <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
-" &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
-" &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
-" &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
-"${object.pricelist_id.currency_id.name}</strong><br />\n"
-" &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
-" % if object.origin:\n"
-" &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
-" % endif\n"
-" % if object.partner_ref:\n"
-" &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
-" % endif\n"
-" % if object.validator:\n"
-" &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.validator.email "
-"or ''}?subject=Order%20${object.name}\">${object.validator.name}</a>\n"
-" % endif\n"
-" </p>\n"
-"\n"
-" <br/>\n"
-" <p>If you have any question, do not hesitate to contact us.</p>\n"
-" <p>Thank you!</p>\n"
-" <br/>\n"
-" <br/>\n"
-" <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
-"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
-"background-repeat: repeat no-repeat;\">\n"
-" <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
-"#FFF;\">\n"
-" <strong style=\"text-"
-"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
-" </div>\n"
-" <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
-"16px; background-color: #F2F2F2;\">\n"
-" <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
-" % if object.company_id.street:\n"
-" ${object.company_id.street}<br/>\n"
-" % endif\n"
-" % if object.company_id.street2:\n"
-" ${object.company_id.street2}<br/>\n"
-" % endif\n"
-" % if object.company_id.city or object.company_id.zip:\n"
-" ${object.company_id.zip} ${object.company_id.city}<br/>\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 ''}<br/>\n"
-" % endif\n"
-" </span>\n"
-" % if object.company_id.phone:\n"
-" <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
-"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
-"0px; padding-left: 0px; \">\n"
-" Phone:&nbsp; ${object.company_id.phone}\n"
-" </div>\n"
-" % endif\n"
-" % if object.company_id.website:\n"
-" <div>\n"
-" Web :&nbsp;<a "
-"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
-" </div>\n"
-" %endif\n"
-" <p></p>\n"
-" </div>\n"
-"</div>\n"
-" "
-msgstr ""
-
-#. module: purchase
#: model:ir.actions.act_window,name:purchase.action_purchase_order_by_user_all
msgid "Total Orders by User per month"
msgstr ""
@@ -2085,21 +2066,19 @@ msgid "Based on incoming shipments"
msgstr ""
#. module: purchase
+#: code:addons/purchase/purchase.py:1018
+#, python-format
+msgid "No default supplier defined for this product"
+msgstr ""
+
+#. module: purchase
#: view:purchase.report:0
#: field:purchase.report,warehouse_id:0
msgid "Warehouse"
msgstr "Skladište"
#. module: purchase
-#: help:purchase.order,partner_ref:0
-msgid ""
-"Reference of the sale order or quotation sent by your supplier. It's mainly "
-"used to do the matching when you receive the products as this reference is "
-"usually written on the delivery order sent by your supplier."
-msgstr ""
-
-#. module: purchase
-#: code:addons/purchase/purchase.py:991
+#: code:addons/purchase/purchase.py:960
#, python-format
msgid ""
"The selected supplier has a minimal quantity set to %s %s, you should not "
@@ -2172,8 +2151,8 @@ msgid ""
msgstr ""
#. module: purchase
-#: view:product.product:0
-msgid "When you sell this service to a customer,"
+#: field:purchase.order,message_summary:0
+msgid "Summary"
msgstr ""
#. module: purchase
@@ -2183,6 +2162,11 @@ msgid "Pricelist Versions"
msgstr ""
#. module: purchase
+#: field:purchase.order,payment_term_id:0
+msgid "Payment Term"
+msgstr ""
+
+#. module: purchase
#: view:purchase.order:0
msgid "Purchase orders which are in draft state"
msgstr ""
diff --git a/addons/purchase/i18n/sr@latin.po b/addons/purchase/i18n/sr@latin.po
index 7307cf94b96..1c78b9a63a0 100644
--- a/addons/purchase/i18n/sr@latin.po
+++ b/addons/purchase/i18n/sr@latin.po
@@ -7,15 +7,15 @@ msgid ""
msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
"PO-Revision-Date: 2012-05-10 17:36+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: 2012-12-04 05:12+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:20+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
#. module: purchase
#: model:res.groups,name:purchase.group_analytic_accounting
@@ -61,11 +61,6 @@ msgstr ""
"izračunava nabavnu cenu za odabrane proizvode i količinu."
#. module: purchase
-#: model:ir.actions.server,name:purchase.actions_server_purchase_order_read
-msgid "Purchase: Mark read"
-msgstr ""
-
-#. module: purchase
#: view:purchase.report:0
#: field:purchase.report,day:0
msgid "Day"
@@ -106,16 +101,13 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:973
-#: code:addons/purchase/purchase.py:988
-#: code:addons/purchase/purchase.py:991
-#: code:addons/purchase/wizard/purchase_order_group.py:47
+#: code:addons/purchase/purchase.py:1024
#, python-format
-msgid "Warning!"
+msgid "Configuration Error!"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:573
+#: code:addons/purchase/purchase.py:587
#, python-format
msgid "You must first cancel all receptions related to this purchase order."
msgstr ""
@@ -132,10 +124,10 @@ msgid "Purchase-Standard Price"
msgstr ""
#. module: purchase
-#: report:purchase.order:0
-#: field:purchase.report,validator:0
-msgid "Validated By"
-msgstr "Potvrđeno od"
+#: code:addons/purchase/purchase.py:1011
+#, python-format
+msgid "No supplier defined for this product !"
+msgstr ""
#. module: purchase
#: model:ir.actions.act_window,help:purchase.action_picking_tree4_picking_to_invoice
@@ -158,12 +150,6 @@ msgid "Average Price"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:830
-#, python-format
-msgid "Invoice <b>paid</b>."
-msgstr ""
-
-#. module: purchase
#: view:purchase.order:0
msgid "Purchase order which are in the exception state"
msgstr ""
@@ -235,7 +221,7 @@ msgstr ""
"svim nabavnim nalozima."
#. module: purchase
-#: code:addons/purchase/purchase.py:255
+#: code:addons/purchase/purchase.py:260
#, python-format
msgid "In order to delete a purchase order, you must cancel it first."
msgstr ""
@@ -261,29 +247,12 @@ msgid "Total Untaxed amount"
msgstr ""
#. module: purchase
-#: model:ir.ui.menu,name:purchase.menu_purchase_uom_categ_form_action
-msgid "Unit of Measure Categories"
-msgstr ""
-
-#. module: purchase
#: view:purchase.report:0
#: field:purchase.report,category_id:0
msgid "Category"
msgstr ""
#. module: purchase
-#: view:purchase.order:0
-msgid "Quotation "
-msgstr ""
-
-#. module: purchase
-#: code:addons/purchase/purchase.py:810
-#, python-format
-msgid ""
-"Quotation for <em>%s</em> <b>converted</b> to a Purchase Order of %s %s."
-msgstr ""
-
-#. module: purchase
#: model:process.transition,note:purchase.process_transition_purchaseinvoice0
msgid ""
"A purchase order generates a supplier invoice, as soon as it is confirmed by "
@@ -348,14 +317,16 @@ msgid "October"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:837
+#: code:addons/purchase/purchase.py:1024
#, python-format
-msgid "Purchase Order for <em>%s</em> <b>cancelled</b>."
+msgid ""
+"The product \"%s\" has been defined with your company as reseller which "
+"seems to be a configuration error!"
msgstr ""
#. module: purchase
-#: field:purchase.order,message_summary:0
-msgid "Summary"
+#: view:product.product:0
+msgid "When you sell this service to a customer,"
msgstr ""
#. module: purchase
@@ -384,12 +355,6 @@ msgid "Quantity"
msgstr "Količina"
#. module: purchase
-#: code:addons/purchase/purchase.py:819
-#, python-format
-msgid "Shipment <em>%s</em> <b>scheduled</b> for %s."
-msgstr ""
-
-#. module: purchase
#: field:purchase.order,fiscal_position:0
msgid "Fiscal Position"
msgstr "Fiskalna pozicija"
@@ -447,12 +412,6 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:824
-#, python-format
-msgid "Draft Invoice of %s %s is <b>waiting for validation</b>."
-msgstr ""
-
-#. module: purchase
#: model:ir.actions.act_window,help:purchase.purchase_line_form_action2
msgid ""
"<p>\n"
@@ -473,6 +432,11 @@ msgid "Scheduled Date"
msgstr ""
#. module: purchase
+#: field:purchase.order,currency_id:0
+msgid "Currency"
+msgstr ""
+
+#. module: purchase
#: field:purchase.order,journal_id:0
msgid "Journal"
msgstr ""
@@ -505,6 +469,19 @@ msgid "Incoming Products"
msgstr ""
#. module: purchase
+#: view:purchase.order:0
+msgid "Request for Quotation "
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,partner_ref:0
+msgid ""
+"Reference of the sales order or quotation sent by your supplier. It's mainly "
+"used to do the matching when you receive the products as this reference is "
+"usually written on the delivery order sent by your supplier."
+msgstr ""
+
+#. module: purchase
#: view:purchase.config.settings:0
#: view:purchase.order.group:0
#: view:purchase.order.line_invoice:0
@@ -525,6 +502,11 @@ msgid ""
msgstr ""
#. module: purchase
+#: model:mail.message.subtype,name:purchase.mt_rfq_approved
+msgid "RFQ Approved"
+msgstr ""
+
+#. module: purchase
#: view:purchase.config.settings:0
msgid "Apply"
msgstr ""
@@ -542,6 +524,11 @@ msgid ""
msgstr ""
#. module: purchase
+#: model:mail.message.subtype,name:purchase.mt_rfq_confirmed
+msgid "RFQ Confirmed"
+msgstr ""
+
+#. module: purchase
#: view:purchase.order:0
msgid "Customer Address"
msgstr ""
@@ -566,7 +553,7 @@ msgid "Supplier"
msgstr "Dobavljač"
#. module: purchase
-#: code:addons/purchase/purchase.py:508
+#: code:addons/purchase/purchase.py:525
#, python-format
msgid "Define expense account for this company: \"%s\" (id:%d)."
msgstr ""
@@ -590,7 +577,6 @@ msgstr "Subtotal"
#. module: purchase
#: field:purchase.order,shipped:0
-#: field:purchase.order,shipped_rate:0
msgid "Received"
msgstr "Primljeno"
@@ -632,13 +618,20 @@ msgid "Invoices and Receptions"
msgstr ""
#. module: purchase
+#: model:process.transition,note:purchase.process_transition_packinginvoice0
+msgid ""
+"A Pick list generates an invoice. Depending on the Invoicing control of the "
+"sales order, the invoice is based on delivered or on ordered quantities."
+msgstr ""
+
+#. module: purchase
#: view:purchase.report:0
#: field:purchase.report,nbr:0
msgid "# of Lines"
msgstr ""
#. module: purchase
-#: code:addons/purchase/wizard/purchase_line_invoice.py:110
+#: code:addons/purchase/wizard/purchase_line_invoice.py:106
#, python-format
msgid "Define expense account for this product: \"%s\" (id:%d)."
msgstr ""
@@ -659,8 +652,8 @@ msgid "It indicates that a picking has been done"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:565
-#: code:addons/purchase/purchase.py:572
+#: code:addons/purchase/purchase.py:579
+#: code:addons/purchase/purchase.py:586
#, python-format
msgid "Unable to cancel this purchase order."
msgstr ""
@@ -723,6 +716,15 @@ msgid "Draft PO"
msgstr ""
#. module: purchase
+#: code:addons/purchase/purchase.py:941
+#: code:addons/purchase/purchase.py:956
+#: code:addons/purchase/purchase.py:960
+#: code:addons/purchase/wizard/purchase_order_group.py:47
+#, python-format
+msgid "Warning!"
+msgstr ""
+
+#. module: purchase
#: model:process.node,name:purchase.process_node_draftpurchaseorder0
#: model:process.node,name:purchase.process_node_draftpurchaseorder1
msgid "RFQ"
@@ -754,6 +756,11 @@ msgid "The tax amount"
msgstr ""
#. module: purchase
+#: field:purchase.order,shipped_rate:0
+msgid "Received Ratio"
+msgstr ""
+
+#. module: purchase
#: selection:purchase.report,month:0
msgid "September"
msgstr ""
@@ -785,7 +792,7 @@ msgid "Stock Moves"
msgstr "Kretanje zaliha"
#. module: purchase
-#: code:addons/purchase/purchase.py:1158
+#: code:addons/purchase/purchase.py:1156
#, python-format
msgid "Draft Purchase Order created"
msgstr ""
@@ -806,11 +813,6 @@ msgid "Terms and Conditions"
msgstr ""
#. module: purchase
-#: field:purchase.order,currency_id:0
-msgid "unknown"
-msgstr ""
-
-#. module: purchase
#: help:purchase.order,date_order:0
msgid "Date on which this document has been created."
msgstr "Datum kreiranja dokumenta"
@@ -904,12 +906,6 @@ msgid "Cancel"
msgstr "Odustani"
#. module: purchase
-#: field:purchase.order,message_comment_ids:0
-#: help:purchase.order,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
-#. module: purchase
#: sql_constraint:purchase.order:0
msgid "Order Reference must be unique per Company!"
msgstr ""
@@ -943,14 +939,89 @@ msgid "Date Approved"
msgstr "Datum odobrenja"
#. module: purchase
-#: code:addons/purchase/purchase.py:806
-#, python-format
-msgid "Request for quotation <b>created</b>."
+#: view:product.product:0
+msgid "a draft purchase order"
msgstr ""
#. module: purchase
-#: view:product.product:0
-msgid "a draft purchase order"
+#: model:email.template,body_html:purchase.email_template_edi_purchase
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: #FFF; \">\n"
+"\n"
+" <p>Hello$ ${object.partner_id.name},</p>\n"
+" \n"
+" <p>Here is a ${object.state in ('draft', 'sent') and 'request for "
+"quotation' or 'purchase order confirmation'} from ${object.company_id.name}: "
+"</p>\n"
+" \n"
+" <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
+" &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
+" &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
+" &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
+"${object.pricelist_id.currency_id.name}</strong><br />\n"
+" &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
+" % if object.origin:\n"
+" &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
+" % endif\n"
+" % if object.partner_ref:\n"
+" &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
+" % endif\n"
+" % if object.validator:\n"
+" &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.validator.email "
+"or ''}?subject=Order%20${object.name}\">${object.validator.name}</a>\n"
+" % endif\n"
+" </p>\n"
+"\n"
+" <br/>\n"
+" <p>If you have any question, do not hesitate to contact us.</p>\n"
+" <p>Thank you!</p>\n"
+" <br/>\n"
+" <br/>\n"
+" <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
+"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
+"background-repeat: repeat no-repeat;\">\n"
+" <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
+"#DDD;\">\n"
+" <strong style=\"text-"
+"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
+" </div>\n"
+" <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
+"16px; background-color: #F2F2F2;\">\n"
+" <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
+" % if object.company_id.street:\n"
+" ${object.company_id.street}<br/>\n"
+" % endif\n"
+" % if object.company_id.street2:\n"
+" ${object.company_id.street2}<br/>\n"
+" % endif\n"
+" % if object.company_id.city or object.company_id.zip:\n"
+" ${object.company_id.zip} ${object.company_id.city}<br/>\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 ''}<br/>\n"
+" % endif\n"
+" </span>\n"
+" % if object.company_id.phone:\n"
+" <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
+"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
+"0px; padding-left: 0px; \">\n"
+" Phone:&nbsp; ${object.company_id.phone}\n"
+" </div>\n"
+" % endif\n"
+" % if object.company_id.website:\n"
+" <div>\n"
+" Web :&nbsp;<a "
+"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
+" </div>\n"
+" %endif\n"
+" <p></p>\n"
+" </div>\n"
+"</div>\n"
+" "
msgstr ""
#. module: purchase
@@ -990,17 +1061,12 @@ msgid "Outgoing Mails"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:437
+#: code:addons/purchase/purchase.py:456
#, python-format
msgid "You cannot confirm a purchase order without any purchase order line."
msgstr ""
#. module: purchase
-#: model:ir.actions.server,name:purchase.actions_server_purchase_order_unread
-msgid "Purchase: Mark unread"
-msgstr ""
-
-#. module: purchase
#: help:purchase.order,message_ids:0
msgid "Messages and communication history"
msgstr ""
@@ -1012,7 +1078,7 @@ msgid "Destination Warehouse"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:973
+#: code:addons/purchase/purchase.py:941
#, python-format
msgid ""
"Selected Unit of Measure does not belong to the same category as the product "
@@ -1020,6 +1086,11 @@ msgid ""
msgstr ""
#. module: purchase
+#: view:purchase.order.line_invoice:0
+msgid "Select an Open Sales Order"
+msgstr ""
+
+#. module: purchase
#: model:ir.ui.menu,name:purchase.menu_purchase_unit_measure_purchase
#: model:ir.ui.menu,name:purchase.menu_purchase_uom_form_action
msgid "Units of Measure"
@@ -1031,18 +1102,12 @@ msgid "Manage pricelist per supplier"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:833
-#, python-format
-msgid "Purchase Order has been set to <b>draft</b>."
-msgstr ""
-
-#. module: purchase
#: view:board.board:0
msgid "Purchase Dashboard"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:566
+#: code:addons/purchase/purchase.py:580
#, python-format
msgid "First cancel all receptions related to this purchase order."
msgstr ""
@@ -1081,8 +1146,8 @@ msgid "Unread Messages"
msgstr ""
#. module: purchase
-#: view:purchase.order.line_invoice:0
-msgid "Select an Open Sale Order"
+#: model:ir.ui.menu,name:purchase.menu_purchase_uom_categ_form_action
+msgid "Unit of Measure Categories"
msgstr ""
#. module: purchase
@@ -1091,6 +1156,13 @@ msgid "Set to Draft"
msgstr "Postavi u 'Pripremu'"
#. module: purchase
+#: help:purchase.order,origin:0
+msgid ""
+"Reference of the document that generated this purchase order request; a "
+"sales order or an internal procurement request."
+msgstr ""
+
+#. module: purchase
#: view:purchase.order.line:0
msgid "Notes"
msgstr "Napomene"
@@ -1120,7 +1192,7 @@ msgid "Stock Move"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:255
+#: code:addons/purchase/purchase.py:260
#, python-format
msgid "Invalid Action!"
msgstr ""
@@ -1219,7 +1291,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:310
+#: code:addons/purchase/purchase.py:320
#, python-format
msgid "Please create Invoices."
msgstr ""
@@ -1309,7 +1381,7 @@ msgid "Purchase Order Line Make Invoice"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1133
+#: code:addons/purchase/purchase.py:1141
#, python-format
msgid "PO: %s"
msgstr ""
@@ -1320,7 +1392,7 @@ msgid "Send by EMail"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:498
+#: code:addons/purchase/purchase.py:515
#, python-format
msgid "Define purchase journal for this company: \"%s\" (id:%d)."
msgstr ""
@@ -1331,8 +1403,8 @@ msgid "Purchase Order "
msgstr ""
#. module: purchase
-#: view:purchase.order.line:0
-msgid "Manual Invoices"
+#: help:purchase.config.settings,group_costing_method:0
+msgid "Allows you to compute product cost price based on average cost."
msgstr ""
#. module: purchase
@@ -1487,8 +1559,8 @@ msgid "Compute product cost price based on average cost"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:340
-#: code:addons/purchase/wizard/purchase_line_invoice.py:141
+#: code:addons/purchase/purchase.py:350
+#: code:addons/purchase/wizard/purchase_line_invoice.py:137
#: model:ir.actions.act_window,name:purchase.act_res_partner_2_supplier_invoices
#: view:res.partner:0
#, python-format
@@ -1600,8 +1672,9 @@ msgid "Open Purchase Menu"
msgstr ""
#. module: purchase
-#: model:ir.model,name:purchase.model_mail_compose_message
-msgid "Email composition wizard"
+#: code:addons/purchase/purchase.py:1028
+#, python-format
+msgid "No address defined for the supplier"
msgstr ""
#. module: purchase
@@ -1674,11 +1747,11 @@ msgid "Purchase Order"
msgstr "Nabavni nalog"
#. module: purchase
-#: code:addons/purchase/purchase.py:310
-#: code:addons/purchase/purchase.py:437
-#: code:addons/purchase/purchase.py:497
-#: code:addons/purchase/purchase.py:508
-#: code:addons/purchase/wizard/purchase_line_invoice.py:109
+#: code:addons/purchase/purchase.py:320
+#: code:addons/purchase/purchase.py:456
+#: code:addons/purchase/purchase.py:514
+#: code:addons/purchase/purchase.py:525
+#: code:addons/purchase/wizard/purchase_line_invoice.py:105
#, python-format
msgid "Error!"
msgstr ""
@@ -1700,13 +1773,6 @@ msgid ""
msgstr ""
#. module: purchase
-#: model:process.transition,note:purchase.process_transition_packinginvoice0
-msgid ""
-"A Pick list generates an invoice. Depending on the Invoicing control of the "
-"sale order, the invoice is based on delivered or on ordered quantities."
-msgstr ""
-
-#. module: purchase
#: selection:purchase.order,state:0
#: selection:purchase.order.line,state:0
#: selection:purchase.report,state:0
@@ -1719,9 +1785,8 @@ msgid "# of Purchase Order"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:827
-#, python-format
-msgid "Shipment <b>received</b>."
+#: model:ir.model,name:purchase.model_mail_compose_message
+msgid "Email composition wizard"
msgstr ""
#. module: purchase
@@ -1805,7 +1870,7 @@ msgid "RFQ_${(object.name or '').replace('/','_')}"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:988
+#: code:addons/purchase/purchase.py:956
#, python-format
msgid "The selected supplier only sells this product by %s"
msgstr ""
@@ -1851,6 +1916,12 @@ msgid "Outgoing products to invoice"
msgstr ""
#. module: purchase
+#: report:purchase.order:0
+#: field:purchase.report,validator:0
+msgid "Validated By"
+msgstr "Potvrđeno od"
+
+#. module: purchase
#: view:purchase.report:0
#: field:purchase.report,delay_pass:0
msgid "Days to Deliver"
@@ -1940,8 +2011,8 @@ msgid "November"
msgstr ""
#. module: purchase
-#: help:purchase.config.settings,group_costing_method:0
-msgid "Allows you to compute product cost price based on average cost."
+#: view:purchase.order.line:0
+msgid "Manual Invoices"
msgstr ""
#. module: purchase
@@ -1965,13 +2036,6 @@ msgid ""
msgstr ""
#. module: purchase
-#: help:purchase.order,origin:0
-msgid ""
-"Reference of the document that generated this purchase order request; a sale "
-"order or an internal procurement request."
-msgstr ""
-
-#. module: purchase
#: model:ir.ui.menu,name:purchase.menu_partner_categories_in_form
msgid "Partner Categories"
msgstr ""
@@ -1992,89 +2056,6 @@ msgid "Invoicing Settings"
msgstr ""
#. module: purchase
-#: model:email.template,body_html:purchase.email_template_edi_purchase
-msgid ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"\n"
-" <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
-"or ''},</p>\n"
-" \n"
-" <p>Here is a ${object.state in ('draft', 'sent') and 'request for "
-"quotation' or 'purchase order confirmation'} from ${object.company_id.name}: "
-"</p>\n"
-" \n"
-" <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
-" &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
-" &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
-" &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
-"${object.pricelist_id.currency_id.name}</strong><br />\n"
-" &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
-" % if object.origin:\n"
-" &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
-" % endif\n"
-" % if object.partner_ref:\n"
-" &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
-" % endif\n"
-" % if object.validator:\n"
-" &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.validator.email "
-"or ''}?subject=Order%20${object.name}\">${object.validator.name}</a>\n"
-" % endif\n"
-" </p>\n"
-"\n"
-" <br/>\n"
-" <p>If you have any question, do not hesitate to contact us.</p>\n"
-" <p>Thank you!</p>\n"
-" <br/>\n"
-" <br/>\n"
-" <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
-"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
-"background-repeat: repeat no-repeat;\">\n"
-" <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
-"#FFF;\">\n"
-" <strong style=\"text-"
-"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
-" </div>\n"
-" <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
-"16px; background-color: #F2F2F2;\">\n"
-" <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
-" % if object.company_id.street:\n"
-" ${object.company_id.street}<br/>\n"
-" % endif\n"
-" % if object.company_id.street2:\n"
-" ${object.company_id.street2}<br/>\n"
-" % endif\n"
-" % if object.company_id.city or object.company_id.zip:\n"
-" ${object.company_id.zip} ${object.company_id.city}<br/>\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 ''}<br/>\n"
-" % endif\n"
-" </span>\n"
-" % if object.company_id.phone:\n"
-" <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
-"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
-"0px; padding-left: 0px; \">\n"
-" Phone:&nbsp; ${object.company_id.phone}\n"
-" </div>\n"
-" % endif\n"
-" % if object.company_id.website:\n"
-" <div>\n"
-" Web :&nbsp;<a "
-"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
-" </div>\n"
-" %endif\n"
-" <p></p>\n"
-" </div>\n"
-"</div>\n"
-" "
-msgstr ""
-
-#. module: purchase
#: model:ir.actions.act_window,name:purchase.action_purchase_order_by_user_all
msgid "Total Orders by User per month"
msgstr ""
@@ -2085,21 +2066,19 @@ msgid "Based on incoming shipments"
msgstr ""
#. module: purchase
+#: code:addons/purchase/purchase.py:1018
+#, python-format
+msgid "No default supplier defined for this product"
+msgstr ""
+
+#. module: purchase
#: view:purchase.report:0
#: field:purchase.report,warehouse_id:0
msgid "Warehouse"
msgstr "Skladište"
#. module: purchase
-#: help:purchase.order,partner_ref:0
-msgid ""
-"Reference of the sale order or quotation sent by your supplier. It's mainly "
-"used to do the matching when you receive the products as this reference is "
-"usually written on the delivery order sent by your supplier."
-msgstr ""
-
-#. module: purchase
-#: code:addons/purchase/purchase.py:991
+#: code:addons/purchase/purchase.py:960
#, python-format
msgid ""
"The selected supplier has a minimal quantity set to %s %s, you should not "
@@ -2172,8 +2151,8 @@ msgid ""
msgstr ""
#. module: purchase
-#: view:product.product:0
-msgid "When you sell this service to a customer,"
+#: field:purchase.order,message_summary:0
+msgid "Summary"
msgstr ""
#. module: purchase
@@ -2183,6 +2162,11 @@ msgid "Pricelist Versions"
msgstr ""
#. module: purchase
+#: field:purchase.order,payment_term_id:0
+msgid "Payment Term"
+msgstr ""
+
+#. module: purchase
#: view:purchase.order:0
msgid "Purchase orders which are in draft state"
msgstr ""
diff --git a/addons/purchase/i18n/sv.po b/addons/purchase/i18n/sv.po
index fca89be609c..6decb677513 100644
--- a/addons/purchase/i18n/sv.po
+++ b/addons/purchase/i18n/sv.po
@@ -6,15 +6,15 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 5.0.14\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
"PO-Revision-Date: 2012-06-26 07:07+0000\n"
"Last-Translator: Anders Wallenquist <anders.wallenquist@vertel.se>\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: 2012-12-04 05:12+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:19+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
#. module: purchase
#: model:res.groups,name:purchase.group_analytic_accounting
@@ -60,11 +60,6 @@ msgstr ""
"computes the supplier price for the selected products/quantities."
#. module: purchase
-#: model:ir.actions.server,name:purchase.actions_server_purchase_order_read
-msgid "Purchase: Mark read"
-msgstr ""
-
-#. module: purchase
#: view:purchase.report:0
#: field:purchase.report,day:0
msgid "Day"
@@ -105,16 +100,13 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:973
-#: code:addons/purchase/purchase.py:988
-#: code:addons/purchase/purchase.py:991
-#: code:addons/purchase/wizard/purchase_order_group.py:47
+#: code:addons/purchase/purchase.py:1024
#, python-format
-msgid "Warning!"
+msgid "Configuration Error!"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:573
+#: code:addons/purchase/purchase.py:587
#, python-format
msgid "You must first cancel all receptions related to this purchase order."
msgstr ""
@@ -132,10 +124,10 @@ msgid "Purchase-Standard Price"
msgstr "Standardpris Inköp"
#. module: purchase
-#: report:purchase.order:0
-#: field:purchase.report,validator:0
-msgid "Validated By"
-msgstr "Validated By"
+#: code:addons/purchase/purchase.py:1011
+#, python-format
+msgid "No supplier defined for this product !"
+msgstr ""
#. module: purchase
#: model:ir.actions.act_window,help:purchase.action_picking_tree4_picking_to_invoice
@@ -158,12 +150,6 @@ msgid "Average Price"
msgstr "Snittpris"
#. module: purchase
-#: code:addons/purchase/purchase.py:830
-#, python-format
-msgid "Invoice <b>paid</b>."
-msgstr ""
-
-#. module: purchase
#: view:purchase.order:0
msgid "Purchase order which are in the exception state"
msgstr "Inköpsorder som befinner sig i undantag"
@@ -235,7 +221,7 @@ msgstr ""
"products."
#. module: purchase
-#: code:addons/purchase/purchase.py:255
+#: code:addons/purchase/purchase.py:260
#, python-format
msgid "In order to delete a purchase order, you must cancel it first."
msgstr ""
@@ -261,29 +247,12 @@ msgid "Total Untaxed amount"
msgstr "Totalt ex moms"
#. module: purchase
-#: model:ir.ui.menu,name:purchase.menu_purchase_uom_categ_form_action
-msgid "Unit of Measure Categories"
-msgstr ""
-
-#. module: purchase
#: view:purchase.report:0
#: field:purchase.report,category_id:0
msgid "Category"
msgstr "Kategori"
#. module: purchase
-#: view:purchase.order:0
-msgid "Quotation "
-msgstr ""
-
-#. module: purchase
-#: code:addons/purchase/purchase.py:810
-#, python-format
-msgid ""
-"Quotation for <em>%s</em> <b>converted</b> to a Purchase Order of %s %s."
-msgstr ""
-
-#. module: purchase
#: model:process.transition,note:purchase.process_transition_purchaseinvoice0
msgid ""
"A purchase order generates a supplier invoice, as soon as it is confirmed by "
@@ -351,14 +320,16 @@ msgid "October"
msgstr "oktober"
#. module: purchase
-#: code:addons/purchase/purchase.py:837
+#: code:addons/purchase/purchase.py:1024
#, python-format
-msgid "Purchase Order for <em>%s</em> <b>cancelled</b>."
+msgid ""
+"The product \"%s\" has been defined with your company as reseller which "
+"seems to be a configuration error!"
msgstr ""
#. module: purchase
-#: field:purchase.order,message_summary:0
-msgid "Summary"
+#: view:product.product:0
+msgid "When you sell this service to a customer,"
msgstr ""
#. module: purchase
@@ -387,15 +358,9 @@ msgid "Quantity"
msgstr "Kvantitet"
#. module: purchase
-#: code:addons/purchase/purchase.py:819
-#, python-format
-msgid "Shipment <em>%s</em> <b>scheduled</b> for %s."
-msgstr ""
-
-#. module: purchase
#: field:purchase.order,fiscal_position:0
msgid "Fiscal Position"
-msgstr "Fiscal Position"
+msgstr "Momshantering"
#. module: purchase
#: field:purchase.config.settings,default_invoice_method:0
@@ -450,12 +415,6 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:824
-#, python-format
-msgid "Draft Invoice of %s %s is <b>waiting for validation</b>."
-msgstr ""
-
-#. module: purchase
#: model:ir.actions.act_window,help:purchase.purchase_line_form_action2
msgid ""
"<p>\n"
@@ -476,6 +435,11 @@ msgid "Scheduled Date"
msgstr "Planerat datum"
#. module: purchase
+#: field:purchase.order,currency_id:0
+msgid "Currency"
+msgstr ""
+
+#. module: purchase
#: field:purchase.order,journal_id:0
msgid "Journal"
msgstr "Journal"
@@ -508,6 +472,19 @@ msgid "Incoming Products"
msgstr ""
#. module: purchase
+#: view:purchase.order:0
+msgid "Request for Quotation "
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,partner_ref:0
+msgid ""
+"Reference of the sales order or quotation sent by your supplier. It's mainly "
+"used to do the matching when you receive the products as this reference is "
+"usually written on the delivery order sent by your supplier."
+msgstr ""
+
+#. module: purchase
#: view:purchase.config.settings:0
#: view:purchase.order.group:0
#: view:purchase.order.line_invoice:0
@@ -531,6 +508,11 @@ msgstr ""
"kontroll = Manuell)."
#. module: purchase
+#: model:mail.message.subtype,name:purchase.mt_rfq_approved
+msgid "RFQ Approved"
+msgstr ""
+
+#. module: purchase
#: view:purchase.config.settings:0
msgid "Apply"
msgstr ""
@@ -550,6 +532,11 @@ msgstr ""
"Inköpsförfrågan blir då en bekräftad Inköpsorder."
#. module: purchase
+#: model:mail.message.subtype,name:purchase.mt_rfq_confirmed
+msgid "RFQ Confirmed"
+msgstr ""
+
+#. module: purchase
#: view:purchase.order:0
msgid "Customer Address"
msgstr ""
@@ -574,7 +561,7 @@ msgid "Supplier"
msgstr "Leverantör"
#. module: purchase
-#: code:addons/purchase/purchase.py:508
+#: code:addons/purchase/purchase.py:525
#, python-format
msgid "Define expense account for this company: \"%s\" (id:%d)."
msgstr ""
@@ -598,7 +585,6 @@ msgstr "Subtotal"
#. module: purchase
#: field:purchase.order,shipped:0
-#: field:purchase.order,shipped_rate:0
msgid "Received"
msgstr "Mottagen"
@@ -640,13 +626,20 @@ msgid "Invoices and Receptions"
msgstr ""
#. module: purchase
+#: model:process.transition,note:purchase.process_transition_packinginvoice0
+msgid ""
+"A Pick list generates an invoice. Depending on the Invoicing control of the "
+"sales order, the invoice is based on delivered or on ordered quantities."
+msgstr ""
+
+#. module: purchase
#: view:purchase.report:0
#: field:purchase.report,nbr:0
msgid "# of Lines"
msgstr "# Rader"
#. module: purchase
-#: code:addons/purchase/wizard/purchase_line_invoice.py:110
+#: code:addons/purchase/wizard/purchase_line_invoice.py:106
#, python-format
msgid "Define expense account for this product: \"%s\" (id:%d)."
msgstr ""
@@ -667,8 +660,8 @@ msgid "It indicates that a picking has been done"
msgstr "Anger att plockningen är klar."
#. module: purchase
-#: code:addons/purchase/purchase.py:565
-#: code:addons/purchase/purchase.py:572
+#: code:addons/purchase/purchase.py:579
+#: code:addons/purchase/purchase.py:586
#, python-format
msgid "Unable to cancel this purchase order."
msgstr ""
@@ -676,7 +669,7 @@ msgstr ""
#. module: purchase
#: model:ir.ui.menu,name:purchase.menu_procurement_management_invoice
msgid "Invoice Control"
-msgstr "Invoice Control"
+msgstr "Fakturakontroll"
#. module: purchase
#: model:ir.actions.act_window,help:purchase.action_stock_move_report_po
@@ -733,6 +726,15 @@ msgid "Draft PO"
msgstr ""
#. module: purchase
+#: code:addons/purchase/purchase.py:941
+#: code:addons/purchase/purchase.py:956
+#: code:addons/purchase/purchase.py:960
+#: code:addons/purchase/wizard/purchase_order_group.py:47
+#, python-format
+msgid "Warning!"
+msgstr ""
+
+#. module: purchase
#: model:process.node,name:purchase.process_node_draftpurchaseorder0
#: model:process.node,name:purchase.process_node_draftpurchaseorder1
msgid "RFQ"
@@ -764,6 +766,11 @@ msgid "The tax amount"
msgstr "Moms"
#. module: purchase
+#: field:purchase.order,shipped_rate:0
+msgid "Received Ratio"
+msgstr ""
+
+#. module: purchase
#: selection:purchase.report,month:0
msgid "September"
msgstr "september"
@@ -795,7 +802,7 @@ msgid "Stock Moves"
msgstr "Stock Moves"
#. module: purchase
-#: code:addons/purchase/purchase.py:1158
+#: code:addons/purchase/purchase.py:1156
#, python-format
msgid "Draft Purchase Order created"
msgstr ""
@@ -816,11 +823,6 @@ msgid "Terms and Conditions"
msgstr ""
#. module: purchase
-#: field:purchase.order,currency_id:0
-msgid "unknown"
-msgstr ""
-
-#. module: purchase
#: help:purchase.order,date_order:0
msgid "Date on which this document has been created."
msgstr "Date on which this document has been created."
@@ -914,12 +916,6 @@ msgid "Cancel"
msgstr "Avbryt"
#. module: purchase
-#: field:purchase.order,message_comment_ids:0
-#: help:purchase.order,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
-#. module: purchase
#: sql_constraint:purchase.order:0
msgid "Order Reference must be unique per Company!"
msgstr "Orderreferensen måste vara unik per bolag!"
@@ -953,14 +949,89 @@ msgid "Date Approved"
msgstr "Datum godkänd"
#. module: purchase
-#: code:addons/purchase/purchase.py:806
-#, python-format
-msgid "Request for quotation <b>created</b>."
+#: view:product.product:0
+msgid "a draft purchase order"
msgstr ""
#. module: purchase
-#: view:product.product:0
-msgid "a draft purchase order"
+#: model:email.template,body_html:purchase.email_template_edi_purchase
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: #FFF; \">\n"
+"\n"
+" <p>Hello$ ${object.partner_id.name},</p>\n"
+" \n"
+" <p>Here is a ${object.state in ('draft', 'sent') and 'request for "
+"quotation' or 'purchase order confirmation'} from ${object.company_id.name}: "
+"</p>\n"
+" \n"
+" <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
+" &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
+" &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
+" &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
+"${object.pricelist_id.currency_id.name}</strong><br />\n"
+" &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
+" % if object.origin:\n"
+" &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
+" % endif\n"
+" % if object.partner_ref:\n"
+" &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
+" % endif\n"
+" % if object.validator:\n"
+" &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.validator.email "
+"or ''}?subject=Order%20${object.name}\">${object.validator.name}</a>\n"
+" % endif\n"
+" </p>\n"
+"\n"
+" <br/>\n"
+" <p>If you have any question, do not hesitate to contact us.</p>\n"
+" <p>Thank you!</p>\n"
+" <br/>\n"
+" <br/>\n"
+" <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
+"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
+"background-repeat: repeat no-repeat;\">\n"
+" <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
+"#DDD;\">\n"
+" <strong style=\"text-"
+"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
+" </div>\n"
+" <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
+"16px; background-color: #F2F2F2;\">\n"
+" <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
+" % if object.company_id.street:\n"
+" ${object.company_id.street}<br/>\n"
+" % endif\n"
+" % if object.company_id.street2:\n"
+" ${object.company_id.street2}<br/>\n"
+" % endif\n"
+" % if object.company_id.city or object.company_id.zip:\n"
+" ${object.company_id.zip} ${object.company_id.city}<br/>\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 ''}<br/>\n"
+" % endif\n"
+" </span>\n"
+" % if object.company_id.phone:\n"
+" <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
+"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
+"0px; padding-left: 0px; \">\n"
+" Phone:&nbsp; ${object.company_id.phone}\n"
+" </div>\n"
+" % endif\n"
+" % if object.company_id.website:\n"
+" <div>\n"
+" Web :&nbsp;<a "
+"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
+" </div>\n"
+" %endif\n"
+" <p></p>\n"
+" </div>\n"
+"</div>\n"
+" "
msgstr ""
#. module: purchase
@@ -1003,17 +1074,12 @@ msgid "Outgoing Mails"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:437
+#: code:addons/purchase/purchase.py:456
#, python-format
msgid "You cannot confirm a purchase order without any purchase order line."
msgstr ""
#. module: purchase
-#: model:ir.actions.server,name:purchase.actions_server_purchase_order_unread
-msgid "Purchase: Mark unread"
-msgstr ""
-
-#. module: purchase
#: help:purchase.order,message_ids:0
msgid "Messages and communication history"
msgstr ""
@@ -1025,7 +1091,7 @@ msgid "Destination Warehouse"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:973
+#: code:addons/purchase/purchase.py:941
#, python-format
msgid ""
"Selected Unit of Measure does not belong to the same category as the product "
@@ -1033,6 +1099,11 @@ msgid ""
msgstr ""
#. module: purchase
+#: view:purchase.order.line_invoice:0
+msgid "Select an Open Sales Order"
+msgstr ""
+
+#. module: purchase
#: model:ir.ui.menu,name:purchase.menu_purchase_unit_measure_purchase
#: model:ir.ui.menu,name:purchase.menu_purchase_uom_form_action
msgid "Units of Measure"
@@ -1044,18 +1115,12 @@ msgid "Manage pricelist per supplier"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:833
-#, python-format
-msgid "Purchase Order has been set to <b>draft</b>."
-msgstr ""
-
-#. module: purchase
#: view:board.board:0
msgid "Purchase Dashboard"
msgstr "Inköpsinfopanel"
#. module: purchase
-#: code:addons/purchase/purchase.py:566
+#: code:addons/purchase/purchase.py:580
#, python-format
msgid "First cancel all receptions related to this purchase order."
msgstr ""
@@ -1094,9 +1159,9 @@ msgid "Unread Messages"
msgstr ""
#. module: purchase
-#: view:purchase.order.line_invoice:0
-msgid "Select an Open Sale Order"
-msgstr "Välj en öppen säljorder"
+#: model:ir.ui.menu,name:purchase.menu_purchase_uom_categ_form_action
+msgid "Unit of Measure Categories"
+msgstr ""
#. module: purchase
#: view:purchase.order:0
@@ -1104,6 +1169,13 @@ msgid "Set to Draft"
msgstr "Set to Draft"
#. module: purchase
+#: help:purchase.order,origin:0
+msgid ""
+"Reference of the document that generated this purchase order request; a "
+"sales order or an internal procurement request."
+msgstr ""
+
+#. module: purchase
#: view:purchase.order.line:0
msgid "Notes"
msgstr "Anteckningar"
@@ -1133,7 +1205,7 @@ msgid "Stock Move"
msgstr "Lagertransaktion"
#. module: purchase
-#: code:addons/purchase/purchase.py:255
+#: code:addons/purchase/purchase.py:260
#, python-format
msgid "Invalid Action!"
msgstr ""
@@ -1235,7 +1307,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:310
+#: code:addons/purchase/purchase.py:320
#, python-format
msgid "Please create Invoices."
msgstr ""
@@ -1325,7 +1397,7 @@ msgid "Purchase Order Line Make Invoice"
msgstr "Inköpsorderrader Tillverka Faktura"
#. module: purchase
-#: code:addons/purchase/purchase.py:1133
+#: code:addons/purchase/purchase.py:1141
#, python-format
msgid "PO: %s"
msgstr "IO: %s"
@@ -1336,7 +1408,7 @@ msgid "Send by EMail"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:498
+#: code:addons/purchase/purchase.py:515
#, python-format
msgid "Define purchase journal for this company: \"%s\" (id:%d)."
msgstr ""
@@ -1347,9 +1419,9 @@ msgid "Purchase Order "
msgstr ""
#. module: purchase
-#: view:purchase.order.line:0
-msgid "Manual Invoices"
-msgstr "Manuella fakturor"
+#: help:purchase.config.settings,group_costing_method:0
+msgid "Allows you to compute product cost price based on average cost."
+msgstr ""
#. module: purchase
#: model:ir.actions.act_window,name:purchase.action_purchase_configuration
@@ -1503,8 +1575,8 @@ msgid "Compute product cost price based on average cost"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:340
-#: code:addons/purchase/wizard/purchase_line_invoice.py:141
+#: code:addons/purchase/purchase.py:350
+#: code:addons/purchase/wizard/purchase_line_invoice.py:137
#: model:ir.actions.act_window,name:purchase.act_res_partner_2_supplier_invoices
#: view:res.partner:0
#, python-format
@@ -1557,7 +1629,7 @@ msgstr ""
#. module: purchase
#: field:purchase.order,invoice_method:0
msgid "Invoicing Control"
-msgstr "Invoicing Control"
+msgstr "Fakturagenerering"
#. module: purchase
#: model:process.transition.action,name:purchase.process_transition_action_approvingpurchaseorder0
@@ -1582,7 +1654,7 @@ msgstr "Chef"
#. module: purchase
#: selection:purchase.order,invoice_method:0
msgid "Based on Purchase Order lines"
-msgstr "Baserat på inköpsorderrader"
+msgstr "Generera faktura mot inköpsorderrader"
#. module: purchase
#: field:purchase.order,amount_total:0
@@ -1616,8 +1688,9 @@ msgid "Open Purchase Menu"
msgstr ""
#. module: purchase
-#: model:ir.model,name:purchase.model_mail_compose_message
-msgid "Email composition wizard"
+#: code:addons/purchase/purchase.py:1028
+#, python-format
+msgid "No address defined for the supplier"
msgstr ""
#. module: purchase
@@ -1661,7 +1734,7 @@ msgstr "Standardinköpsprislisteversion"
#. module: purchase
#: selection:purchase.order,invoice_method:0
msgid "Based on generated draft invoice"
-msgstr "Baserad på genererad preleminär faktura"
+msgstr "Generera fakturautkast direkt"
#. module: purchase
#: model:ir.actions.act_window,name:purchase.action_stock_move_report_po
@@ -1690,11 +1763,11 @@ msgid "Purchase Order"
msgstr "Inköpsorder"
#. module: purchase
-#: code:addons/purchase/purchase.py:310
-#: code:addons/purchase/purchase.py:437
-#: code:addons/purchase/purchase.py:497
-#: code:addons/purchase/purchase.py:508
-#: code:addons/purchase/wizard/purchase_line_invoice.py:109
+#: code:addons/purchase/purchase.py:320
+#: code:addons/purchase/purchase.py:456
+#: code:addons/purchase/purchase.py:514
+#: code:addons/purchase/purchase.py:525
+#: code:addons/purchase/wizard/purchase_line_invoice.py:105
#, python-format
msgid "Error!"
msgstr ""
@@ -1716,15 +1789,6 @@ msgid ""
msgstr ""
#. module: purchase
-#: model:process.transition,note:purchase.process_transition_packinginvoice0
-msgid ""
-"A Pick list generates an invoice. Depending on the Invoicing control of the "
-"sale order, the invoice is based on delivered or on ordered quantities."
-msgstr ""
-"En plocklista genererar en faktura. Beroende på faktureringskontrollen av "
-"försäljningen blir fakturan baserad på levererad eller beställda kvantiteter."
-
-#. module: purchase
#: selection:purchase.order,state:0
#: selection:purchase.order.line,state:0
#: selection:purchase.report,state:0
@@ -1737,9 +1801,8 @@ msgid "# of Purchase Order"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:827
-#, python-format
-msgid "Shipment <b>received</b>."
+#: model:ir.model,name:purchase.model_mail_compose_message
+msgid "Email composition wizard"
msgstr ""
#. module: purchase
@@ -1773,7 +1836,7 @@ msgstr "Bekräfta"
#. module: purchase
#: selection:purchase.config.settings,default_invoice_method:0
msgid "Based on receptions"
-msgstr "Baserad på mottagning"
+msgstr "Generera fakturautkast vid mottagning"
#. module: purchase
#: field:purchase.order,partner_ref:0
@@ -1829,7 +1892,7 @@ msgid "RFQ_${(object.name or '').replace('/','_')}"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:988
+#: code:addons/purchase/purchase.py:956
#, python-format
msgid "The selected supplier only sells this product by %s"
msgstr "Den valda leverantören säljer endast denna produkt med %s"
@@ -1875,6 +1938,12 @@ msgid "Outgoing products to invoice"
msgstr "Utlevererade produkter att fakturera"
#. module: purchase
+#: report:purchase.order:0
+#: field:purchase.report,validator:0
+msgid "Validated By"
+msgstr "Validated By"
+
+#. module: purchase
#: view:purchase.report:0
#: field:purchase.report,delay_pass:0
msgid "Days to Deliver"
@@ -1964,9 +2033,9 @@ msgid "November"
msgstr "november"
#. module: purchase
-#: help:purchase.config.settings,group_costing_method:0
-msgid "Allows you to compute product cost price based on average cost."
-msgstr ""
+#: view:purchase.order.line:0
+msgid "Manual Invoices"
+msgstr "Manuella fakturor"
#. module: purchase
#: report:purchase.order:0
@@ -1989,13 +2058,6 @@ msgid ""
msgstr ""
#. module: purchase
-#: help:purchase.order,origin:0
-msgid ""
-"Reference of the document that generated this purchase order request; a sale "
-"order or an internal procurement request."
-msgstr ""
-
-#. module: purchase
#: model:ir.ui.menu,name:purchase.menu_partner_categories_in_form
msgid "Partner Categories"
msgstr "Företagskategorier"
@@ -2016,89 +2078,6 @@ msgid "Invoicing Settings"
msgstr ""
#. module: purchase
-#: model:email.template,body_html:purchase.email_template_edi_purchase
-msgid ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"\n"
-" <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
-"or ''},</p>\n"
-" \n"
-" <p>Here is a ${object.state in ('draft', 'sent') and 'request for "
-"quotation' or 'purchase order confirmation'} from ${object.company_id.name}: "
-"</p>\n"
-" \n"
-" <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
-" &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
-" &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
-" &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
-"${object.pricelist_id.currency_id.name}</strong><br />\n"
-" &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
-" % if object.origin:\n"
-" &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
-" % endif\n"
-" % if object.partner_ref:\n"
-" &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
-" % endif\n"
-" % if object.validator:\n"
-" &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.validator.email "
-"or ''}?subject=Order%20${object.name}\">${object.validator.name}</a>\n"
-" % endif\n"
-" </p>\n"
-"\n"
-" <br/>\n"
-" <p>If you have any question, do not hesitate to contact us.</p>\n"
-" <p>Thank you!</p>\n"
-" <br/>\n"
-" <br/>\n"
-" <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
-"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
-"background-repeat: repeat no-repeat;\">\n"
-" <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
-"#FFF;\">\n"
-" <strong style=\"text-"
-"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
-" </div>\n"
-" <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
-"16px; background-color: #F2F2F2;\">\n"
-" <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
-" % if object.company_id.street:\n"
-" ${object.company_id.street}<br/>\n"
-" % endif\n"
-" % if object.company_id.street2:\n"
-" ${object.company_id.street2}<br/>\n"
-" % endif\n"
-" % if object.company_id.city or object.company_id.zip:\n"
-" ${object.company_id.zip} ${object.company_id.city}<br/>\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 ''}<br/>\n"
-" % endif\n"
-" </span>\n"
-" % if object.company_id.phone:\n"
-" <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
-"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
-"0px; padding-left: 0px; \">\n"
-" Phone:&nbsp; ${object.company_id.phone}\n"
-" </div>\n"
-" % endif\n"
-" % if object.company_id.website:\n"
-" <div>\n"
-" Web :&nbsp;<a "
-"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
-" </div>\n"
-" %endif\n"
-" <p></p>\n"
-" </div>\n"
-"</div>\n"
-" "
-msgstr ""
-
-#. module: purchase
#: model:ir.actions.act_window,name:purchase.action_purchase_order_by_user_all
msgid "Total Orders by User per month"
msgstr "Totalt order per användare per månad"
@@ -2109,21 +2088,19 @@ msgid "Based on incoming shipments"
msgstr ""
#. module: purchase
+#: code:addons/purchase/purchase.py:1018
+#, python-format
+msgid "No default supplier defined for this product"
+msgstr ""
+
+#. module: purchase
#: view:purchase.report:0
#: field:purchase.report,warehouse_id:0
msgid "Warehouse"
msgstr "Lagerhus"
#. module: purchase
-#: help:purchase.order,partner_ref:0
-msgid ""
-"Reference of the sale order or quotation sent by your supplier. It's mainly "
-"used to do the matching when you receive the products as this reference is "
-"usually written on the delivery order sent by your supplier."
-msgstr ""
-
-#. module: purchase
-#: code:addons/purchase/purchase.py:991
+#: code:addons/purchase/purchase.py:960
#, python-format
msgid ""
"The selected supplier has a minimal quantity set to %s %s, you should not "
@@ -2169,7 +2146,7 @@ msgstr "Your Order Reference"
#. module: purchase
#: report:purchase.order:0
msgid "Purchase Order Confirmation N°"
-msgstr "Purchase Order Confirmation N°"
+msgstr "InköpsOrderBekräftelse Nr"
#. module: purchase
#: view:purchase.order:0
@@ -2208,8 +2185,8 @@ msgstr ""
" "
#. module: purchase
-#: view:product.product:0
-msgid "When you sell this service to a customer,"
+#: field:purchase.order,message_summary:0
+msgid "Summary"
msgstr ""
#. module: purchase
@@ -2219,6 +2196,11 @@ msgid "Pricelist Versions"
msgstr "Prislisteversioner"
#. module: purchase
+#: field:purchase.order,payment_term_id:0
+msgid "Payment Term"
+msgstr ""
+
+#. module: purchase
#: view:purchase.order:0
msgid "Purchase orders which are in draft state"
msgstr "Beställningar som har status Utkast"
@@ -2284,9 +2266,6 @@ msgstr "Ordrar"
#~ msgid "Invalid model name in the action definition."
#~ msgstr "Invalid model name in the action definition."
-#~ msgid "Delivery"
-#~ msgstr "Delivery"
-
#, python-format
#~ msgid "No Pricelist !"
#~ msgstr "No Pricelist !"
@@ -2607,6 +2586,9 @@ msgstr "Ordrar"
#~ msgid "Current purchases"
#~ msgstr "Nuvarande inköp"
+#~ msgid "Select an Open Sale Order"
+#~ msgstr "Välj en öppen säljorder"
+
#, python-format
#~ msgid "You can not confirm purchase order without Purchase Order Lines."
#~ msgstr "Du kan inte bekräfta beställningen utan inköpsorder"
@@ -2648,9 +2630,6 @@ msgstr "Ordrar"
#~ msgid "purchase.config.wizard"
#~ msgstr "purchase.config.wizard"
-#~ msgid "Based on Receptions"
-#~ msgstr "Baserad på mottagning"
-
#~ msgid "To Approve"
#~ msgstr "Att godkänna"
@@ -2801,6 +2780,13 @@ msgstr "Ordrar"
#~ msgid "In order to delete a purchase order, it must be cancelled first!"
#~ msgstr "För att ta bort en Inköpsorder, måste den avbrytas först!"
+#~ msgid ""
+#~ "A Pick list generates an invoice. Depending on the Invoicing control of the "
+#~ "sale order, the invoice is based on delivered or on ordered quantities."
+#~ msgstr ""
+#~ "En plocklista genererar en faktura. Beroende på faktureringskontrollen av "
+#~ "försäljningen blir fakturan baserad på levererad eller beställda kvantiteter."
+
#~ msgid "Dest. Address Contact Name"
#~ msgstr "Dest. Adress Kontakt Namn"
@@ -2842,9 +2828,6 @@ msgstr "Ordrar"
#~ msgid "Unable to cancel this purchase order!"
#~ msgstr "Kan inte avbryta inköpsorder!"
-#~ msgid "Based on Purchase Order Lines"
-#~ msgstr "Baserat på inköpsorderrader"
-
#, python-format
#~ msgid "Selected UOM does not belong to the same category as the product UOM"
#~ msgstr "Vald enhet tillhör inte samma kategori som produktens enhet"
@@ -2852,19 +2835,6 @@ msgstr "Ordrar"
#~ msgid "Purchase orders which are not approved yet."
#~ msgstr "Inköpsordrar som inte är godkända ännu."
-#~ msgid ""
-#~ "Based on Purchase Order lines: place individual lines in 'Invoice Control > "
-#~ "Based on P.O. lines' from where you can selectively create an invoice.\n"
-#~ "Based on generated invoice: create a draft invoice you can validate later.\n"
-#~ "Based on receptions: let you create an invoice when receptions are validated."
-#~ msgstr ""
-#~ "Baserat på rader i inköpsorder: placera enskilda rader i 'FakturaKontroll > "
-#~ "Baserat på inköpsorderrader' från där du kan välja att skapa en faktura.\n"
-#~ "Baserat på genererad faktura: skapar ett fakturautkast som du kan godkänna "
-#~ "senare.\n"
-#~ "Baserat på mottagningar: låter dig skapa en faktura när mottagningen "
-#~ "godkänts."
-
#~ msgid "Set the Default Invoicing Control Method"
#~ msgstr "Sätt Standardmetod för FaktureringsKontroll"
@@ -3067,3 +3037,26 @@ msgstr "Ordrar"
#~ msgid "Cancel Purchase Order"
#~ msgstr "Avbryt Inköpsorder"
+
+#~ msgid ""
+#~ "Based on Purchase Order lines: place individual lines in 'Invoice Control > "
+#~ "Based on P.O. lines' from where you can selectively create an invoice.\n"
+#~ "Based on generated invoice: create a draft invoice you can validate later.\n"
+#~ "Based on receptions: let you create an invoice when receptions are validated."
+#~ msgstr ""
+#~ "Generera faktura mot inköpsorderrader: Placerar enskilda inköpsorderrader i "
+#~ "'Faktura Kontroll > Baserat på inköpsorderrader' där du sedan kan välja att "
+#~ "skapa en eller flera fakturautkast.\n"
+#~ "Generera fakturautkast direkt: Skapar ett fakturautkast när du godkänner "
+#~ "inköpsordern.\n"
+#~ "Generera fakturautkast vid mottagning: Låter dig skapa en faktura när "
+#~ "mottagningen godkänts."
+
+#~ msgid "Based on Purchase Order Lines"
+#~ msgstr "Generera faktura mot inköpsorderrader"
+
+#~ msgid "Based on Receptions"
+#~ msgstr "Generera fakturautkast vid mottagning"
+
+#~ msgid "Delivery"
+#~ msgstr "Leverans"
diff --git a/addons/purchase/i18n/th.po b/addons/purchase/i18n/th.po
index 497edff5d48..91fc7d74d29 100644
--- a/addons/purchase/i18n/th.po
+++ b/addons/purchase/i18n/th.po
@@ -7,15 +7,15 @@ msgid ""
msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
"PO-Revision-Date: 2011-01-19 11:33+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: 2012-12-04 05:12+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:20+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
#. module: purchase
#: model:res.groups,name:purchase.group_analytic_accounting
@@ -61,11 +61,6 @@ msgstr ""
"และจะคำนวณหาราคาซื้อของคู่ค้าปัจจุบันให้ตรงกับสินค้าและจำนวนที่เลือกไว้"
#. module: purchase
-#: model:ir.actions.server,name:purchase.actions_server_purchase_order_read
-msgid "Purchase: Mark read"
-msgstr ""
-
-#. module: purchase
#: view:purchase.report:0
#: field:purchase.report,day:0
msgid "Day"
@@ -106,16 +101,13 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:973
-#: code:addons/purchase/purchase.py:988
-#: code:addons/purchase/purchase.py:991
-#: code:addons/purchase/wizard/purchase_order_group.py:47
+#: code:addons/purchase/purchase.py:1024
#, python-format
-msgid "Warning!"
+msgid "Configuration Error!"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:573
+#: code:addons/purchase/purchase.py:587
#, python-format
msgid "You must first cancel all receptions related to this purchase order."
msgstr ""
@@ -132,10 +124,10 @@ msgid "Purchase-Standard Price"
msgstr ""
#. module: purchase
-#: report:purchase.order:0
-#: field:purchase.report,validator:0
-msgid "Validated By"
-msgstr "ตรวจสอบโดย"
+#: code:addons/purchase/purchase.py:1011
+#, python-format
+msgid "No supplier defined for this product !"
+msgstr ""
#. module: purchase
#: model:ir.actions.act_window,help:purchase.action_picking_tree4_picking_to_invoice
@@ -158,12 +150,6 @@ msgid "Average Price"
msgstr "ราคาเฉลี่ย"
#. module: purchase
-#: code:addons/purchase/purchase.py:830
-#, python-format
-msgid "Invoice <b>paid</b>."
-msgstr ""
-
-#. module: purchase
#: view:purchase.order:0
msgid "Purchase order which are in the exception state"
msgstr ""
@@ -233,7 +219,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:255
+#: code:addons/purchase/purchase.py:260
#, python-format
msgid "In order to delete a purchase order, you must cancel it first."
msgstr ""
@@ -259,29 +245,12 @@ msgid "Total Untaxed amount"
msgstr "รวมจำนวนเงิน(ไม่รวมภาษี)"
#. module: purchase
-#: model:ir.ui.menu,name:purchase.menu_purchase_uom_categ_form_action
-msgid "Unit of Measure Categories"
-msgstr ""
-
-#. module: purchase
#: view:purchase.report:0
#: field:purchase.report,category_id:0
msgid "Category"
msgstr "หมวดหมู่"
#. module: purchase
-#: view:purchase.order:0
-msgid "Quotation "
-msgstr ""
-
-#. module: purchase
-#: code:addons/purchase/purchase.py:810
-#, python-format
-msgid ""
-"Quotation for <em>%s</em> <b>converted</b> to a Purchase Order of %s %s."
-msgstr ""
-
-#. module: purchase
#: model:process.transition,note:purchase.process_transition_purchaseinvoice0
msgid ""
"A purchase order generates a supplier invoice, as soon as it is confirmed by "
@@ -346,14 +315,16 @@ msgid "October"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:837
+#: code:addons/purchase/purchase.py:1024
#, python-format
-msgid "Purchase Order for <em>%s</em> <b>cancelled</b>."
+msgid ""
+"The product \"%s\" has been defined with your company as reseller which "
+"seems to be a configuration error!"
msgstr ""
#. module: purchase
-#: field:purchase.order,message_summary:0
-msgid "Summary"
+#: view:product.product:0
+msgid "When you sell this service to a customer,"
msgstr ""
#. module: purchase
@@ -382,12 +353,6 @@ msgid "Quantity"
msgstr "จำนวน"
#. module: purchase
-#: code:addons/purchase/purchase.py:819
-#, python-format
-msgid "Shipment <em>%s</em> <b>scheduled</b> for %s."
-msgstr ""
-
-#. module: purchase
#: field:purchase.order,fiscal_position:0
msgid "Fiscal Position"
msgstr ""
@@ -445,12 +410,6 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:824
-#, python-format
-msgid "Draft Invoice of %s %s is <b>waiting for validation</b>."
-msgstr ""
-
-#. module: purchase
#: model:ir.actions.act_window,help:purchase.purchase_line_form_action2
msgid ""
"<p>\n"
@@ -471,6 +430,11 @@ msgid "Scheduled Date"
msgstr ""
#. module: purchase
+#: field:purchase.order,currency_id:0
+msgid "Currency"
+msgstr ""
+
+#. module: purchase
#: field:purchase.order,journal_id:0
msgid "Journal"
msgstr ""
@@ -503,6 +467,19 @@ msgid "Incoming Products"
msgstr ""
#. module: purchase
+#: view:purchase.order:0
+msgid "Request for Quotation "
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,partner_ref:0
+msgid ""
+"Reference of the sales order or quotation sent by your supplier. It's mainly "
+"used to do the matching when you receive the products as this reference is "
+"usually written on the delivery order sent by your supplier."
+msgstr ""
+
+#. module: purchase
#: view:purchase.config.settings:0
#: view:purchase.order.group:0
#: view:purchase.order.line_invoice:0
@@ -523,6 +500,11 @@ msgid ""
msgstr ""
#. module: purchase
+#: model:mail.message.subtype,name:purchase.mt_rfq_approved
+msgid "RFQ Approved"
+msgstr ""
+
+#. module: purchase
#: view:purchase.config.settings:0
msgid "Apply"
msgstr ""
@@ -542,6 +524,11 @@ msgstr ""
"จากนั้นใบแจ้งขอใบเสนอราคาจึงจะเปลี่ยนเป็นใบสั่งซื้อสถานะยืนยัน"
#. module: purchase
+#: model:mail.message.subtype,name:purchase.mt_rfq_confirmed
+msgid "RFQ Confirmed"
+msgstr ""
+
+#. module: purchase
#: view:purchase.order:0
msgid "Customer Address"
msgstr ""
@@ -566,7 +553,7 @@ msgid "Supplier"
msgstr "ผู้จัดจำหน่าย"
#. module: purchase
-#: code:addons/purchase/purchase.py:508
+#: code:addons/purchase/purchase.py:525
#, python-format
msgid "Define expense account for this company: \"%s\" (id:%d)."
msgstr ""
@@ -590,7 +577,6 @@ msgstr ""
#. module: purchase
#: field:purchase.order,shipped:0
-#: field:purchase.order,shipped_rate:0
msgid "Received"
msgstr "สินค้าที่ได้รับ"
@@ -632,13 +618,20 @@ msgid "Invoices and Receptions"
msgstr ""
#. module: purchase
+#: model:process.transition,note:purchase.process_transition_packinginvoice0
+msgid ""
+"A Pick list generates an invoice. Depending on the Invoicing control of the "
+"sales order, the invoice is based on delivered or on ordered quantities."
+msgstr ""
+
+#. module: purchase
#: view:purchase.report:0
#: field:purchase.report,nbr:0
msgid "# of Lines"
msgstr ""
#. module: purchase
-#: code:addons/purchase/wizard/purchase_line_invoice.py:110
+#: code:addons/purchase/wizard/purchase_line_invoice.py:106
#, python-format
msgid "Define expense account for this product: \"%s\" (id:%d)."
msgstr ""
@@ -659,8 +652,8 @@ msgid "It indicates that a picking has been done"
msgstr "ช่องนี้บ่งบอกถึงการจัดส่งสินค้าเสร็จสมบูรณ์"
#. module: purchase
-#: code:addons/purchase/purchase.py:565
-#: code:addons/purchase/purchase.py:572
+#: code:addons/purchase/purchase.py:579
+#: code:addons/purchase/purchase.py:586
#, python-format
msgid "Unable to cancel this purchase order."
msgstr ""
@@ -725,6 +718,15 @@ msgid "Draft PO"
msgstr ""
#. module: purchase
+#: code:addons/purchase/purchase.py:941
+#: code:addons/purchase/purchase.py:956
+#: code:addons/purchase/purchase.py:960
+#: code:addons/purchase/wizard/purchase_order_group.py:47
+#, python-format
+msgid "Warning!"
+msgstr ""
+
+#. module: purchase
#: model:process.node,name:purchase.process_node_draftpurchaseorder0
#: model:process.node,name:purchase.process_node_draftpurchaseorder1
msgid "RFQ"
@@ -756,6 +758,11 @@ msgid "The tax amount"
msgstr "จำนวนภาษี"
#. module: purchase
+#: field:purchase.order,shipped_rate:0
+msgid "Received Ratio"
+msgstr ""
+
+#. module: purchase
#: selection:purchase.report,month:0
msgid "September"
msgstr "กันยายน"
@@ -787,7 +794,7 @@ msgid "Stock Moves"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1158
+#: code:addons/purchase/purchase.py:1156
#, python-format
msgid "Draft Purchase Order created"
msgstr ""
@@ -808,11 +815,6 @@ msgid "Terms and Conditions"
msgstr ""
#. module: purchase
-#: field:purchase.order,currency_id:0
-msgid "unknown"
-msgstr ""
-
-#. module: purchase
#: help:purchase.order,date_order:0
msgid "Date on which this document has been created."
msgstr ""
@@ -906,12 +908,6 @@ msgid "Cancel"
msgstr ""
#. module: purchase
-#: field:purchase.order,message_comment_ids:0
-#: help:purchase.order,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
-#. module: purchase
#: sql_constraint:purchase.order:0
msgid "Order Reference must be unique per Company!"
msgstr ""
@@ -945,14 +941,89 @@ msgid "Date Approved"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:806
-#, python-format
-msgid "Request for quotation <b>created</b>."
+#: view:product.product:0
+msgid "a draft purchase order"
msgstr ""
#. module: purchase
-#: view:product.product:0
-msgid "a draft purchase order"
+#: model:email.template,body_html:purchase.email_template_edi_purchase
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: #FFF; \">\n"
+"\n"
+" <p>Hello$ ${object.partner_id.name},</p>\n"
+" \n"
+" <p>Here is a ${object.state in ('draft', 'sent') and 'request for "
+"quotation' or 'purchase order confirmation'} from ${object.company_id.name}: "
+"</p>\n"
+" \n"
+" <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
+" &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
+" &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
+" &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
+"${object.pricelist_id.currency_id.name}</strong><br />\n"
+" &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
+" % if object.origin:\n"
+" &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
+" % endif\n"
+" % if object.partner_ref:\n"
+" &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
+" % endif\n"
+" % if object.validator:\n"
+" &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.validator.email "
+"or ''}?subject=Order%20${object.name}\">${object.validator.name}</a>\n"
+" % endif\n"
+" </p>\n"
+"\n"
+" <br/>\n"
+" <p>If you have any question, do not hesitate to contact us.</p>\n"
+" <p>Thank you!</p>\n"
+" <br/>\n"
+" <br/>\n"
+" <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
+"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
+"background-repeat: repeat no-repeat;\">\n"
+" <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
+"#DDD;\">\n"
+" <strong style=\"text-"
+"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
+" </div>\n"
+" <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
+"16px; background-color: #F2F2F2;\">\n"
+" <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
+" % if object.company_id.street:\n"
+" ${object.company_id.street}<br/>\n"
+" % endif\n"
+" % if object.company_id.street2:\n"
+" ${object.company_id.street2}<br/>\n"
+" % endif\n"
+" % if object.company_id.city or object.company_id.zip:\n"
+" ${object.company_id.zip} ${object.company_id.city}<br/>\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 ''}<br/>\n"
+" % endif\n"
+" </span>\n"
+" % if object.company_id.phone:\n"
+" <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
+"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
+"0px; padding-left: 0px; \">\n"
+" Phone:&nbsp; ${object.company_id.phone}\n"
+" </div>\n"
+" % endif\n"
+" % if object.company_id.website:\n"
+" <div>\n"
+" Web :&nbsp;<a "
+"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
+" </div>\n"
+" %endif\n"
+" <p></p>\n"
+" </div>\n"
+"</div>\n"
+" "
msgstr ""
#. module: purchase
@@ -992,17 +1063,12 @@ msgid "Outgoing Mails"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:437
+#: code:addons/purchase/purchase.py:456
#, python-format
msgid "You cannot confirm a purchase order without any purchase order line."
msgstr ""
#. module: purchase
-#: model:ir.actions.server,name:purchase.actions_server_purchase_order_unread
-msgid "Purchase: Mark unread"
-msgstr ""
-
-#. module: purchase
#: help:purchase.order,message_ids:0
msgid "Messages and communication history"
msgstr ""
@@ -1014,7 +1080,7 @@ msgid "Destination Warehouse"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:973
+#: code:addons/purchase/purchase.py:941
#, python-format
msgid ""
"Selected Unit of Measure does not belong to the same category as the product "
@@ -1022,6 +1088,11 @@ msgid ""
msgstr ""
#. module: purchase
+#: view:purchase.order.line_invoice:0
+msgid "Select an Open Sales Order"
+msgstr ""
+
+#. module: purchase
#: model:ir.ui.menu,name:purchase.menu_purchase_unit_measure_purchase
#: model:ir.ui.menu,name:purchase.menu_purchase_uom_form_action
msgid "Units of Measure"
@@ -1033,18 +1104,12 @@ msgid "Manage pricelist per supplier"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:833
-#, python-format
-msgid "Purchase Order has been set to <b>draft</b>."
-msgstr ""
-
-#. module: purchase
#: view:board.board:0
msgid "Purchase Dashboard"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:566
+#: code:addons/purchase/purchase.py:580
#, python-format
msgid "First cancel all receptions related to this purchase order."
msgstr ""
@@ -1083,9 +1148,9 @@ msgid "Unread Messages"
msgstr ""
#. module: purchase
-#: view:purchase.order.line_invoice:0
-msgid "Select an Open Sale Order"
-msgstr "เลือกใบสั่งขายสถานะเปิด"
+#: model:ir.ui.menu,name:purchase.menu_purchase_uom_categ_form_action
+msgid "Unit of Measure Categories"
+msgstr ""
#. module: purchase
#: view:purchase.order:0
@@ -1093,6 +1158,13 @@ msgid "Set to Draft"
msgstr "กำหนดให้เป็นแบบร่าง"
#. module: purchase
+#: help:purchase.order,origin:0
+msgid ""
+"Reference of the document that generated this purchase order request; a "
+"sales order or an internal procurement request."
+msgstr ""
+
+#. module: purchase
#: view:purchase.order.line:0
msgid "Notes"
msgstr "บันทึก"
@@ -1122,7 +1194,7 @@ msgid "Stock Move"
msgstr "รายการเคลื่อนไหวสินค้า"
#. module: purchase
-#: code:addons/purchase/purchase.py:255
+#: code:addons/purchase/purchase.py:260
#, python-format
msgid "Invalid Action!"
msgstr ""
@@ -1221,7 +1293,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:310
+#: code:addons/purchase/purchase.py:320
#, python-format
msgid "Please create Invoices."
msgstr ""
@@ -1311,7 +1383,7 @@ msgid "Purchase Order Line Make Invoice"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1133
+#: code:addons/purchase/purchase.py:1141
#, python-format
msgid "PO: %s"
msgstr ""
@@ -1322,7 +1394,7 @@ msgid "Send by EMail"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:498
+#: code:addons/purchase/purchase.py:515
#, python-format
msgid "Define purchase journal for this company: \"%s\" (id:%d)."
msgstr ""
@@ -1333,8 +1405,8 @@ msgid "Purchase Order "
msgstr ""
#. module: purchase
-#: view:purchase.order.line:0
-msgid "Manual Invoices"
+#: help:purchase.config.settings,group_costing_method:0
+msgid "Allows you to compute product cost price based on average cost."
msgstr ""
#. module: purchase
@@ -1489,8 +1561,8 @@ msgid "Compute product cost price based on average cost"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:340
-#: code:addons/purchase/wizard/purchase_line_invoice.py:141
+#: code:addons/purchase/purchase.py:350
+#: code:addons/purchase/wizard/purchase_line_invoice.py:137
#: model:ir.actions.act_window,name:purchase.act_res_partner_2_supplier_invoices
#: view:res.partner:0
#, python-format
@@ -1602,8 +1674,9 @@ msgid "Open Purchase Menu"
msgstr ""
#. module: purchase
-#: model:ir.model,name:purchase.model_mail_compose_message
-msgid "Email composition wizard"
+#: code:addons/purchase/purchase.py:1028
+#, python-format
+msgid "No address defined for the supplier"
msgstr ""
#. module: purchase
@@ -1676,11 +1749,11 @@ msgid "Purchase Order"
msgstr "ใบสั่งซื้อ"
#. module: purchase
-#: code:addons/purchase/purchase.py:310
-#: code:addons/purchase/purchase.py:437
-#: code:addons/purchase/purchase.py:497
-#: code:addons/purchase/purchase.py:508
-#: code:addons/purchase/wizard/purchase_line_invoice.py:109
+#: code:addons/purchase/purchase.py:320
+#: code:addons/purchase/purchase.py:456
+#: code:addons/purchase/purchase.py:514
+#: code:addons/purchase/purchase.py:525
+#: code:addons/purchase/wizard/purchase_line_invoice.py:105
#, python-format
msgid "Error!"
msgstr ""
@@ -1702,16 +1775,6 @@ msgid ""
msgstr ""
#. module: purchase
-#: model:process.transition,note:purchase.process_transition_packinginvoice0
-msgid ""
-"A Pick list generates an invoice. Depending on the Invoicing control of the "
-"sale order, the invoice is based on delivered or on ordered quantities."
-msgstr ""
-"ใบแจ้งหนี้จะสามารถสร้างขึ้นจากใบรับ/จ่ายสินค้าได้หรือไม่ "
-"ขึ้นอยู่กับการตั้งค่าในใบสั่งขายว่าเลือกให้สร้างใบแจ้งหนี้ จากการจัดส่ง "
-"หรือเลือกจากจำนวนสินค้าที่สั่ง"
-
-#. module: purchase
#: selection:purchase.order,state:0
#: selection:purchase.order.line,state:0
#: selection:purchase.report,state:0
@@ -1724,9 +1787,8 @@ msgid "# of Purchase Order"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:827
-#, python-format
-msgid "Shipment <b>received</b>."
+#: model:ir.model,name:purchase.model_mail_compose_message
+msgid "Email composition wizard"
msgstr ""
#. module: purchase
@@ -1813,7 +1875,7 @@ msgid "RFQ_${(object.name or '').replace('/','_')}"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:988
+#: code:addons/purchase/purchase.py:956
#, python-format
msgid "The selected supplier only sells this product by %s"
msgstr ""
@@ -1859,6 +1921,12 @@ msgid "Outgoing products to invoice"
msgstr ""
#. module: purchase
+#: report:purchase.order:0
+#: field:purchase.report,validator:0
+msgid "Validated By"
+msgstr "ตรวจสอบโดย"
+
+#. module: purchase
#: view:purchase.report:0
#: field:purchase.report,delay_pass:0
msgid "Days to Deliver"
@@ -1948,8 +2016,8 @@ msgid "November"
msgstr ""
#. module: purchase
-#: help:purchase.config.settings,group_costing_method:0
-msgid "Allows you to compute product cost price based on average cost."
+#: view:purchase.order.line:0
+msgid "Manual Invoices"
msgstr ""
#. module: purchase
@@ -1973,13 +2041,6 @@ msgid ""
msgstr ""
#. module: purchase
-#: help:purchase.order,origin:0
-msgid ""
-"Reference of the document that generated this purchase order request; a sale "
-"order or an internal procurement request."
-msgstr ""
-
-#. module: purchase
#: model:ir.ui.menu,name:purchase.menu_partner_categories_in_form
msgid "Partner Categories"
msgstr ""
@@ -2000,89 +2061,6 @@ msgid "Invoicing Settings"
msgstr ""
#. module: purchase
-#: model:email.template,body_html:purchase.email_template_edi_purchase
-msgid ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"\n"
-" <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
-"or ''},</p>\n"
-" \n"
-" <p>Here is a ${object.state in ('draft', 'sent') and 'request for "
-"quotation' or 'purchase order confirmation'} from ${object.company_id.name}: "
-"</p>\n"
-" \n"
-" <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
-" &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
-" &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
-" &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
-"${object.pricelist_id.currency_id.name}</strong><br />\n"
-" &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
-" % if object.origin:\n"
-" &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
-" % endif\n"
-" % if object.partner_ref:\n"
-" &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
-" % endif\n"
-" % if object.validator:\n"
-" &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.validator.email "
-"or ''}?subject=Order%20${object.name}\">${object.validator.name}</a>\n"
-" % endif\n"
-" </p>\n"
-"\n"
-" <br/>\n"
-" <p>If you have any question, do not hesitate to contact us.</p>\n"
-" <p>Thank you!</p>\n"
-" <br/>\n"
-" <br/>\n"
-" <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
-"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
-"background-repeat: repeat no-repeat;\">\n"
-" <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
-"#FFF;\">\n"
-" <strong style=\"text-"
-"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
-" </div>\n"
-" <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
-"16px; background-color: #F2F2F2;\">\n"
-" <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
-" % if object.company_id.street:\n"
-" ${object.company_id.street}<br/>\n"
-" % endif\n"
-" % if object.company_id.street2:\n"
-" ${object.company_id.street2}<br/>\n"
-" % endif\n"
-" % if object.company_id.city or object.company_id.zip:\n"
-" ${object.company_id.zip} ${object.company_id.city}<br/>\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 ''}<br/>\n"
-" % endif\n"
-" </span>\n"
-" % if object.company_id.phone:\n"
-" <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
-"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
-"0px; padding-left: 0px; \">\n"
-" Phone:&nbsp; ${object.company_id.phone}\n"
-" </div>\n"
-" % endif\n"
-" % if object.company_id.website:\n"
-" <div>\n"
-" Web :&nbsp;<a "
-"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
-" </div>\n"
-" %endif\n"
-" <p></p>\n"
-" </div>\n"
-"</div>\n"
-" "
-msgstr ""
-
-#. module: purchase
#: model:ir.actions.act_window,name:purchase.action_purchase_order_by_user_all
msgid "Total Orders by User per month"
msgstr ""
@@ -2093,21 +2071,19 @@ msgid "Based on incoming shipments"
msgstr ""
#. module: purchase
-#: view:purchase.report:0
-#: field:purchase.report,warehouse_id:0
-msgid "Warehouse"
+#: code:addons/purchase/purchase.py:1018
+#, python-format
+msgid "No default supplier defined for this product"
msgstr ""
#. module: purchase
-#: help:purchase.order,partner_ref:0
-msgid ""
-"Reference of the sale order or quotation sent by your supplier. It's mainly "
-"used to do the matching when you receive the products as this reference is "
-"usually written on the delivery order sent by your supplier."
+#: view:purchase.report:0
+#: field:purchase.report,warehouse_id:0
+msgid "Warehouse"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:991
+#: code:addons/purchase/purchase.py:960
#, python-format
msgid ""
"The selected supplier has a minimal quantity set to %s %s, you should not "
@@ -2180,8 +2156,8 @@ msgid ""
msgstr ""
#. module: purchase
-#: view:product.product:0
-msgid "When you sell this service to a customer,"
+#: field:purchase.order,message_summary:0
+msgid "Summary"
msgstr ""
#. module: purchase
@@ -2191,6 +2167,11 @@ msgid "Pricelist Versions"
msgstr ""
#. module: purchase
+#: field:purchase.order,payment_term_id:0
+msgid "Payment Term"
+msgstr ""
+
+#. module: purchase
#: view:purchase.order:0
msgid "Purchase orders which are in draft state"
msgstr ""
@@ -2345,6 +2326,9 @@ msgstr ""
#~ msgid "No Pricelist !"
#~ msgstr "ไม่มีรายการาคา!"
+#~ msgid "Select an Open Sale Order"
+#~ msgstr "เลือกใบสั่งขายสถานะเปิด"
+
#, python-format
#~ msgid "Purchase order '%s' is confirmed."
#~ msgstr "ใบสั่งซื้อ '%s' นี้ถูกยืนยันแล้ว"
@@ -2380,6 +2364,14 @@ msgstr ""
#~ msgid "Configuration Progress"
#~ msgstr "ความก้าวหน้าการตั้งค่า"
+#~ msgid ""
+#~ "A Pick list generates an invoice. Depending on the Invoicing control of the "
+#~ "sale order, the invoice is based on delivered or on ordered quantities."
+#~ msgstr ""
+#~ "ใบแจ้งหนี้จะสามารถสร้างขึ้นจากใบรับ/จ่ายสินค้าได้หรือไม่ "
+#~ "ขึ้นอยู่กับการตั้งค่าในใบสั่งขายว่าเลือกให้สร้างใบแจ้งหนี้ จากการจัดส่ง "
+#~ "หรือเลือกจากจำนวนสินค้าที่สั่ง"
+
#~ msgid "Configure Your Purchases Management Application"
#~ msgstr "ตั้งค่าแอพพลิเคชั่นการจัดการซื้อ"
diff --git a/addons/purchase/i18n/tlh.po b/addons/purchase/i18n/tlh.po
index 724e7628feb..029aa6f19a5 100644
--- a/addons/purchase/i18n/tlh.po
+++ b/addons/purchase/i18n/tlh.po
@@ -6,15 +6,15 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
"PO-Revision-Date: 2009-02-03 06:24+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: 2012-12-04 05:12+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:20+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
#. module: purchase
#: model:res.groups,name:purchase.group_analytic_accounting
@@ -58,11 +58,6 @@ msgid ""
msgstr ""
#. module: purchase
-#: model:ir.actions.server,name:purchase.actions_server_purchase_order_read
-msgid "Purchase: Mark read"
-msgstr ""
-
-#. module: purchase
#: view:purchase.report:0
#: field:purchase.report,day:0
msgid "Day"
@@ -103,16 +98,13 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:973
-#: code:addons/purchase/purchase.py:988
-#: code:addons/purchase/purchase.py:991
-#: code:addons/purchase/wizard/purchase_order_group.py:47
+#: code:addons/purchase/purchase.py:1024
#, python-format
-msgid "Warning!"
+msgid "Configuration Error!"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:573
+#: code:addons/purchase/purchase.py:587
#, python-format
msgid "You must first cancel all receptions related to this purchase order."
msgstr ""
@@ -129,9 +121,9 @@ msgid "Purchase-Standard Price"
msgstr ""
#. module: purchase
-#: report:purchase.order:0
-#: field:purchase.report,validator:0
-msgid "Validated By"
+#: code:addons/purchase/purchase.py:1011
+#, python-format
+msgid "No supplier defined for this product !"
msgstr ""
#. module: purchase
@@ -155,12 +147,6 @@ msgid "Average Price"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:830
-#, python-format
-msgid "Invoice <b>paid</b>."
-msgstr ""
-
-#. module: purchase
#: view:purchase.order:0
msgid "Purchase order which are in the exception state"
msgstr ""
@@ -230,7 +216,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:255
+#: code:addons/purchase/purchase.py:260
#, python-format
msgid "In order to delete a purchase order, you must cancel it first."
msgstr ""
@@ -256,29 +242,12 @@ msgid "Total Untaxed amount"
msgstr ""
#. module: purchase
-#: model:ir.ui.menu,name:purchase.menu_purchase_uom_categ_form_action
-msgid "Unit of Measure Categories"
-msgstr ""
-
-#. module: purchase
#: view:purchase.report:0
#: field:purchase.report,category_id:0
msgid "Category"
msgstr ""
#. module: purchase
-#: view:purchase.order:0
-msgid "Quotation "
-msgstr ""
-
-#. module: purchase
-#: code:addons/purchase/purchase.py:810
-#, python-format
-msgid ""
-"Quotation for <em>%s</em> <b>converted</b> to a Purchase Order of %s %s."
-msgstr ""
-
-#. module: purchase
#: model:process.transition,note:purchase.process_transition_purchaseinvoice0
msgid ""
"A purchase order generates a supplier invoice, as soon as it is confirmed by "
@@ -343,14 +312,16 @@ msgid "October"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:837
+#: code:addons/purchase/purchase.py:1024
#, python-format
-msgid "Purchase Order for <em>%s</em> <b>cancelled</b>."
+msgid ""
+"The product \"%s\" has been defined with your company as reseller which "
+"seems to be a configuration error!"
msgstr ""
#. module: purchase
-#: field:purchase.order,message_summary:0
-msgid "Summary"
+#: view:product.product:0
+msgid "When you sell this service to a customer,"
msgstr ""
#. module: purchase
@@ -379,12 +350,6 @@ msgid "Quantity"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:819
-#, python-format
-msgid "Shipment <em>%s</em> <b>scheduled</b> for %s."
-msgstr ""
-
-#. module: purchase
#: field:purchase.order,fiscal_position:0
msgid "Fiscal Position"
msgstr ""
@@ -442,12 +407,6 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:824
-#, python-format
-msgid "Draft Invoice of %s %s is <b>waiting for validation</b>."
-msgstr ""
-
-#. module: purchase
#: model:ir.actions.act_window,help:purchase.purchase_line_form_action2
msgid ""
"<p>\n"
@@ -468,6 +427,11 @@ msgid "Scheduled Date"
msgstr ""
#. module: purchase
+#: field:purchase.order,currency_id:0
+msgid "Currency"
+msgstr ""
+
+#. module: purchase
#: field:purchase.order,journal_id:0
msgid "Journal"
msgstr ""
@@ -500,6 +464,19 @@ msgid "Incoming Products"
msgstr ""
#. module: purchase
+#: view:purchase.order:0
+msgid "Request for Quotation "
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,partner_ref:0
+msgid ""
+"Reference of the sales order or quotation sent by your supplier. It's mainly "
+"used to do the matching when you receive the products as this reference is "
+"usually written on the delivery order sent by your supplier."
+msgstr ""
+
+#. module: purchase
#: view:purchase.config.settings:0
#: view:purchase.order.group:0
#: view:purchase.order.line_invoice:0
@@ -520,6 +497,11 @@ msgid ""
msgstr ""
#. module: purchase
+#: model:mail.message.subtype,name:purchase.mt_rfq_approved
+msgid "RFQ Approved"
+msgstr ""
+
+#. module: purchase
#: view:purchase.config.settings:0
msgid "Apply"
msgstr ""
@@ -537,6 +519,11 @@ msgid ""
msgstr ""
#. module: purchase
+#: model:mail.message.subtype,name:purchase.mt_rfq_confirmed
+msgid "RFQ Confirmed"
+msgstr ""
+
+#. module: purchase
#: view:purchase.order:0
msgid "Customer Address"
msgstr ""
@@ -561,7 +548,7 @@ msgid "Supplier"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:508
+#: code:addons/purchase/purchase.py:525
#, python-format
msgid "Define expense account for this company: \"%s\" (id:%d)."
msgstr ""
@@ -585,7 +572,6 @@ msgstr ""
#. module: purchase
#: field:purchase.order,shipped:0
-#: field:purchase.order,shipped_rate:0
msgid "Received"
msgstr ""
@@ -627,13 +613,20 @@ msgid "Invoices and Receptions"
msgstr ""
#. module: purchase
+#: model:process.transition,note:purchase.process_transition_packinginvoice0
+msgid ""
+"A Pick list generates an invoice. Depending on the Invoicing control of the "
+"sales order, the invoice is based on delivered or on ordered quantities."
+msgstr ""
+
+#. module: purchase
#: view:purchase.report:0
#: field:purchase.report,nbr:0
msgid "# of Lines"
msgstr ""
#. module: purchase
-#: code:addons/purchase/wizard/purchase_line_invoice.py:110
+#: code:addons/purchase/wizard/purchase_line_invoice.py:106
#, python-format
msgid "Define expense account for this product: \"%s\" (id:%d)."
msgstr ""
@@ -654,8 +647,8 @@ msgid "It indicates that a picking has been done"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:565
-#: code:addons/purchase/purchase.py:572
+#: code:addons/purchase/purchase.py:579
+#: code:addons/purchase/purchase.py:586
#, python-format
msgid "Unable to cancel this purchase order."
msgstr ""
@@ -718,6 +711,15 @@ msgid "Draft PO"
msgstr ""
#. module: purchase
+#: code:addons/purchase/purchase.py:941
+#: code:addons/purchase/purchase.py:956
+#: code:addons/purchase/purchase.py:960
+#: code:addons/purchase/wizard/purchase_order_group.py:47
+#, python-format
+msgid "Warning!"
+msgstr ""
+
+#. module: purchase
#: model:process.node,name:purchase.process_node_draftpurchaseorder0
#: model:process.node,name:purchase.process_node_draftpurchaseorder1
msgid "RFQ"
@@ -749,6 +751,11 @@ msgid "The tax amount"
msgstr ""
#. module: purchase
+#: field:purchase.order,shipped_rate:0
+msgid "Received Ratio"
+msgstr ""
+
+#. module: purchase
#: selection:purchase.report,month:0
msgid "September"
msgstr ""
@@ -780,7 +787,7 @@ msgid "Stock Moves"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1158
+#: code:addons/purchase/purchase.py:1156
#, python-format
msgid "Draft Purchase Order created"
msgstr ""
@@ -801,11 +808,6 @@ msgid "Terms and Conditions"
msgstr ""
#. module: purchase
-#: field:purchase.order,currency_id:0
-msgid "unknown"
-msgstr ""
-
-#. module: purchase
#: help:purchase.order,date_order:0
msgid "Date on which this document has been created."
msgstr ""
@@ -899,12 +901,6 @@ msgid "Cancel"
msgstr ""
#. module: purchase
-#: field:purchase.order,message_comment_ids:0
-#: help:purchase.order,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
-#. module: purchase
#: sql_constraint:purchase.order:0
msgid "Order Reference must be unique per Company!"
msgstr ""
@@ -938,14 +934,89 @@ msgid "Date Approved"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:806
-#, python-format
-msgid "Request for quotation <b>created</b>."
+#: view:product.product:0
+msgid "a draft purchase order"
msgstr ""
#. module: purchase
-#: view:product.product:0
-msgid "a draft purchase order"
+#: model:email.template,body_html:purchase.email_template_edi_purchase
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: #FFF; \">\n"
+"\n"
+" <p>Hello$ ${object.partner_id.name},</p>\n"
+" \n"
+" <p>Here is a ${object.state in ('draft', 'sent') and 'request for "
+"quotation' or 'purchase order confirmation'} from ${object.company_id.name}: "
+"</p>\n"
+" \n"
+" <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
+" &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
+" &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
+" &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
+"${object.pricelist_id.currency_id.name}</strong><br />\n"
+" &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
+" % if object.origin:\n"
+" &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
+" % endif\n"
+" % if object.partner_ref:\n"
+" &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
+" % endif\n"
+" % if object.validator:\n"
+" &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.validator.email "
+"or ''}?subject=Order%20${object.name}\">${object.validator.name}</a>\n"
+" % endif\n"
+" </p>\n"
+"\n"
+" <br/>\n"
+" <p>If you have any question, do not hesitate to contact us.</p>\n"
+" <p>Thank you!</p>\n"
+" <br/>\n"
+" <br/>\n"
+" <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
+"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
+"background-repeat: repeat no-repeat;\">\n"
+" <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
+"#DDD;\">\n"
+" <strong style=\"text-"
+"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
+" </div>\n"
+" <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
+"16px; background-color: #F2F2F2;\">\n"
+" <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
+" % if object.company_id.street:\n"
+" ${object.company_id.street}<br/>\n"
+" % endif\n"
+" % if object.company_id.street2:\n"
+" ${object.company_id.street2}<br/>\n"
+" % endif\n"
+" % if object.company_id.city or object.company_id.zip:\n"
+" ${object.company_id.zip} ${object.company_id.city}<br/>\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 ''}<br/>\n"
+" % endif\n"
+" </span>\n"
+" % if object.company_id.phone:\n"
+" <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
+"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
+"0px; padding-left: 0px; \">\n"
+" Phone:&nbsp; ${object.company_id.phone}\n"
+" </div>\n"
+" % endif\n"
+" % if object.company_id.website:\n"
+" <div>\n"
+" Web :&nbsp;<a "
+"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
+" </div>\n"
+" %endif\n"
+" <p></p>\n"
+" </div>\n"
+"</div>\n"
+" "
msgstr ""
#. module: purchase
@@ -985,17 +1056,12 @@ msgid "Outgoing Mails"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:437
+#: code:addons/purchase/purchase.py:456
#, python-format
msgid "You cannot confirm a purchase order without any purchase order line."
msgstr ""
#. module: purchase
-#: model:ir.actions.server,name:purchase.actions_server_purchase_order_unread
-msgid "Purchase: Mark unread"
-msgstr ""
-
-#. module: purchase
#: help:purchase.order,message_ids:0
msgid "Messages and communication history"
msgstr ""
@@ -1007,7 +1073,7 @@ msgid "Destination Warehouse"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:973
+#: code:addons/purchase/purchase.py:941
#, python-format
msgid ""
"Selected Unit of Measure does not belong to the same category as the product "
@@ -1015,6 +1081,11 @@ msgid ""
msgstr ""
#. module: purchase
+#: view:purchase.order.line_invoice:0
+msgid "Select an Open Sales Order"
+msgstr ""
+
+#. module: purchase
#: model:ir.ui.menu,name:purchase.menu_purchase_unit_measure_purchase
#: model:ir.ui.menu,name:purchase.menu_purchase_uom_form_action
msgid "Units of Measure"
@@ -1026,18 +1097,12 @@ msgid "Manage pricelist per supplier"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:833
-#, python-format
-msgid "Purchase Order has been set to <b>draft</b>."
-msgstr ""
-
-#. module: purchase
#: view:board.board:0
msgid "Purchase Dashboard"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:566
+#: code:addons/purchase/purchase.py:580
#, python-format
msgid "First cancel all receptions related to this purchase order."
msgstr ""
@@ -1076,8 +1141,8 @@ msgid "Unread Messages"
msgstr ""
#. module: purchase
-#: view:purchase.order.line_invoice:0
-msgid "Select an Open Sale Order"
+#: model:ir.ui.menu,name:purchase.menu_purchase_uom_categ_form_action
+msgid "Unit of Measure Categories"
msgstr ""
#. module: purchase
@@ -1086,6 +1151,13 @@ msgid "Set to Draft"
msgstr ""
#. module: purchase
+#: help:purchase.order,origin:0
+msgid ""
+"Reference of the document that generated this purchase order request; a "
+"sales order or an internal procurement request."
+msgstr ""
+
+#. module: purchase
#: view:purchase.order.line:0
msgid "Notes"
msgstr ""
@@ -1115,7 +1187,7 @@ msgid "Stock Move"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:255
+#: code:addons/purchase/purchase.py:260
#, python-format
msgid "Invalid Action!"
msgstr ""
@@ -1214,7 +1286,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:310
+#: code:addons/purchase/purchase.py:320
#, python-format
msgid "Please create Invoices."
msgstr ""
@@ -1304,7 +1376,7 @@ msgid "Purchase Order Line Make Invoice"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1133
+#: code:addons/purchase/purchase.py:1141
#, python-format
msgid "PO: %s"
msgstr ""
@@ -1315,7 +1387,7 @@ msgid "Send by EMail"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:498
+#: code:addons/purchase/purchase.py:515
#, python-format
msgid "Define purchase journal for this company: \"%s\" (id:%d)."
msgstr ""
@@ -1326,8 +1398,8 @@ msgid "Purchase Order "
msgstr ""
#. module: purchase
-#: view:purchase.order.line:0
-msgid "Manual Invoices"
+#: help:purchase.config.settings,group_costing_method:0
+msgid "Allows you to compute product cost price based on average cost."
msgstr ""
#. module: purchase
@@ -1482,8 +1554,8 @@ msgid "Compute product cost price based on average cost"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:340
-#: code:addons/purchase/wizard/purchase_line_invoice.py:141
+#: code:addons/purchase/purchase.py:350
+#: code:addons/purchase/wizard/purchase_line_invoice.py:137
#: model:ir.actions.act_window,name:purchase.act_res_partner_2_supplier_invoices
#: view:res.partner:0
#, python-format
@@ -1595,8 +1667,9 @@ msgid "Open Purchase Menu"
msgstr ""
#. module: purchase
-#: model:ir.model,name:purchase.model_mail_compose_message
-msgid "Email composition wizard"
+#: code:addons/purchase/purchase.py:1028
+#, python-format
+msgid "No address defined for the supplier"
msgstr ""
#. module: purchase
@@ -1667,11 +1740,11 @@ msgid "Purchase Order"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:310
-#: code:addons/purchase/purchase.py:437
-#: code:addons/purchase/purchase.py:497
-#: code:addons/purchase/purchase.py:508
-#: code:addons/purchase/wizard/purchase_line_invoice.py:109
+#: code:addons/purchase/purchase.py:320
+#: code:addons/purchase/purchase.py:456
+#: code:addons/purchase/purchase.py:514
+#: code:addons/purchase/purchase.py:525
+#: code:addons/purchase/wizard/purchase_line_invoice.py:105
#, python-format
msgid "Error!"
msgstr ""
@@ -1693,13 +1766,6 @@ msgid ""
msgstr ""
#. module: purchase
-#: model:process.transition,note:purchase.process_transition_packinginvoice0
-msgid ""
-"A Pick list generates an invoice. Depending on the Invoicing control of the "
-"sale order, the invoice is based on delivered or on ordered quantities."
-msgstr ""
-
-#. module: purchase
#: selection:purchase.order,state:0
#: selection:purchase.order.line,state:0
#: selection:purchase.report,state:0
@@ -1712,9 +1778,8 @@ msgid "# of Purchase Order"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:827
-#, python-format
-msgid "Shipment <b>received</b>."
+#: model:ir.model,name:purchase.model_mail_compose_message
+msgid "Email composition wizard"
msgstr ""
#. module: purchase
@@ -1798,7 +1863,7 @@ msgid "RFQ_${(object.name or '').replace('/','_')}"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:988
+#: code:addons/purchase/purchase.py:956
#, python-format
msgid "The selected supplier only sells this product by %s"
msgstr ""
@@ -1844,6 +1909,12 @@ msgid "Outgoing products to invoice"
msgstr ""
#. module: purchase
+#: report:purchase.order:0
+#: field:purchase.report,validator:0
+msgid "Validated By"
+msgstr ""
+
+#. module: purchase
#: view:purchase.report:0
#: field:purchase.report,delay_pass:0
msgid "Days to Deliver"
@@ -1933,8 +2004,8 @@ msgid "November"
msgstr ""
#. module: purchase
-#: help:purchase.config.settings,group_costing_method:0
-msgid "Allows you to compute product cost price based on average cost."
+#: view:purchase.order.line:0
+msgid "Manual Invoices"
msgstr ""
#. module: purchase
@@ -1958,13 +2029,6 @@ msgid ""
msgstr ""
#. module: purchase
-#: help:purchase.order,origin:0
-msgid ""
-"Reference of the document that generated this purchase order request; a sale "
-"order or an internal procurement request."
-msgstr ""
-
-#. module: purchase
#: model:ir.ui.menu,name:purchase.menu_partner_categories_in_form
msgid "Partner Categories"
msgstr ""
@@ -1985,89 +2049,6 @@ msgid "Invoicing Settings"
msgstr ""
#. module: purchase
-#: model:email.template,body_html:purchase.email_template_edi_purchase
-msgid ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"\n"
-" <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
-"or ''},</p>\n"
-" \n"
-" <p>Here is a ${object.state in ('draft', 'sent') and 'request for "
-"quotation' or 'purchase order confirmation'} from ${object.company_id.name}: "
-"</p>\n"
-" \n"
-" <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
-" &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
-" &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
-" &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
-"${object.pricelist_id.currency_id.name}</strong><br />\n"
-" &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
-" % if object.origin:\n"
-" &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
-" % endif\n"
-" % if object.partner_ref:\n"
-" &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
-" % endif\n"
-" % if object.validator:\n"
-" &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.validator.email "
-"or ''}?subject=Order%20${object.name}\">${object.validator.name}</a>\n"
-" % endif\n"
-" </p>\n"
-"\n"
-" <br/>\n"
-" <p>If you have any question, do not hesitate to contact us.</p>\n"
-" <p>Thank you!</p>\n"
-" <br/>\n"
-" <br/>\n"
-" <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
-"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
-"background-repeat: repeat no-repeat;\">\n"
-" <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
-"#FFF;\">\n"
-" <strong style=\"text-"
-"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
-" </div>\n"
-" <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
-"16px; background-color: #F2F2F2;\">\n"
-" <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
-" % if object.company_id.street:\n"
-" ${object.company_id.street}<br/>\n"
-" % endif\n"
-" % if object.company_id.street2:\n"
-" ${object.company_id.street2}<br/>\n"
-" % endif\n"
-" % if object.company_id.city or object.company_id.zip:\n"
-" ${object.company_id.zip} ${object.company_id.city}<br/>\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 ''}<br/>\n"
-" % endif\n"
-" </span>\n"
-" % if object.company_id.phone:\n"
-" <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
-"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
-"0px; padding-left: 0px; \">\n"
-" Phone:&nbsp; ${object.company_id.phone}\n"
-" </div>\n"
-" % endif\n"
-" % if object.company_id.website:\n"
-" <div>\n"
-" Web :&nbsp;<a "
-"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
-" </div>\n"
-" %endif\n"
-" <p></p>\n"
-" </div>\n"
-"</div>\n"
-" "
-msgstr ""
-
-#. module: purchase
#: model:ir.actions.act_window,name:purchase.action_purchase_order_by_user_all
msgid "Total Orders by User per month"
msgstr ""
@@ -2078,21 +2059,19 @@ msgid "Based on incoming shipments"
msgstr ""
#. module: purchase
-#: view:purchase.report:0
-#: field:purchase.report,warehouse_id:0
-msgid "Warehouse"
+#: code:addons/purchase/purchase.py:1018
+#, python-format
+msgid "No default supplier defined for this product"
msgstr ""
#. module: purchase
-#: help:purchase.order,partner_ref:0
-msgid ""
-"Reference of the sale order or quotation sent by your supplier. It's mainly "
-"used to do the matching when you receive the products as this reference is "
-"usually written on the delivery order sent by your supplier."
+#: view:purchase.report:0
+#: field:purchase.report,warehouse_id:0
+msgid "Warehouse"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:991
+#: code:addons/purchase/purchase.py:960
#, python-format
msgid ""
"The selected supplier has a minimal quantity set to %s %s, you should not "
@@ -2165,8 +2144,8 @@ msgid ""
msgstr ""
#. module: purchase
-#: view:product.product:0
-msgid "When you sell this service to a customer,"
+#: field:purchase.order,message_summary:0
+msgid "Summary"
msgstr ""
#. module: purchase
@@ -2176,6 +2155,11 @@ msgid "Pricelist Versions"
msgstr ""
#. module: purchase
+#: field:purchase.order,payment_term_id:0
+msgid "Payment Term"
+msgstr ""
+
+#. module: purchase
#: view:purchase.order:0
msgid "Purchase orders which are in draft state"
msgstr ""
diff --git a/addons/purchase/i18n/tr.po b/addons/purchase/i18n/tr.po
index b60ee4665f2..850d73ee499 100644
--- a/addons/purchase/i18n/tr.po
+++ b/addons/purchase/i18n/tr.po
@@ -6,15 +6,15 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
"PO-Revision-Date: 2012-01-24 23:32+0000\n"
"Last-Translator: Ahmet Altınışık <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: 2012-12-04 05:12+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:20+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
#. module: purchase
#: model:res.groups,name:purchase.group_analytic_accounting
@@ -61,11 +61,6 @@ msgstr ""
"hesaplar."
#. module: purchase
-#: model:ir.actions.server,name:purchase.actions_server_purchase_order_read
-msgid "Purchase: Mark read"
-msgstr ""
-
-#. module: purchase
#: view:purchase.report:0
#: field:purchase.report,day:0
msgid "Day"
@@ -106,16 +101,13 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:973
-#: code:addons/purchase/purchase.py:988
-#: code:addons/purchase/purchase.py:991
-#: code:addons/purchase/wizard/purchase_order_group.py:47
+#: code:addons/purchase/purchase.py:1024
#, python-format
-msgid "Warning!"
+msgid "Configuration Error!"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:573
+#: code:addons/purchase/purchase.py:587
#, python-format
msgid "You must first cancel all receptions related to this purchase order."
msgstr "Önce bu satınalma emriyle ilişkili bütün alımları iptal etmelisiniz."
@@ -132,10 +124,10 @@ msgid "Purchase-Standard Price"
msgstr "Satınalma-Standart Fiyat"
#. module: purchase
-#: report:purchase.order:0
-#: field:purchase.report,validator:0
-msgid "Validated By"
-msgstr "Onaylayan"
+#: code:addons/purchase/purchase.py:1011
+#, python-format
+msgid "No supplier defined for this product !"
+msgstr ""
#. module: purchase
#: model:ir.actions.act_window,help:purchase.action_picking_tree4_picking_to_invoice
@@ -158,12 +150,6 @@ msgid "Average Price"
msgstr "Ortalama Fiyat"
#. module: purchase
-#: code:addons/purchase/purchase.py:830
-#, python-format
-msgid "Invoice <b>paid</b>."
-msgstr ""
-
-#. module: purchase
#: view:purchase.order:0
msgid "Purchase order which are in the exception state"
msgstr "İstisna durumundaki Satınalma Emirleri"
@@ -235,7 +221,7 @@ msgstr ""
"olarak hesaplar."
#. module: purchase
-#: code:addons/purchase/purchase.py:255
+#: code:addons/purchase/purchase.py:260
#, python-format
msgid "In order to delete a purchase order, you must cancel it first."
msgstr ""
@@ -261,29 +247,12 @@ msgid "Total Untaxed amount"
msgstr "Vergilendirilmemiş toplam tutar"
#. module: purchase
-#: model:ir.ui.menu,name:purchase.menu_purchase_uom_categ_form_action
-msgid "Unit of Measure Categories"
-msgstr ""
-
-#. module: purchase
#: view:purchase.report:0
#: field:purchase.report,category_id:0
msgid "Category"
msgstr "Kategori"
#. module: purchase
-#: view:purchase.order:0
-msgid "Quotation "
-msgstr ""
-
-#. module: purchase
-#: code:addons/purchase/purchase.py:810
-#, python-format
-msgid ""
-"Quotation for <em>%s</em> <b>converted</b> to a Purchase Order of %s %s."
-msgstr ""
-
-#. module: purchase
#: model:process.transition,note:purchase.process_transition_purchaseinvoice0
msgid ""
"A purchase order generates a supplier invoice, as soon as it is confirmed by "
@@ -351,14 +320,16 @@ msgid "October"
msgstr "Ekim"
#. module: purchase
-#: code:addons/purchase/purchase.py:837
+#: code:addons/purchase/purchase.py:1024
#, python-format
-msgid "Purchase Order for <em>%s</em> <b>cancelled</b>."
+msgid ""
+"The product \"%s\" has been defined with your company as reseller which "
+"seems to be a configuration error!"
msgstr ""
#. module: purchase
-#: field:purchase.order,message_summary:0
-msgid "Summary"
+#: view:product.product:0
+msgid "When you sell this service to a customer,"
msgstr ""
#. module: purchase
@@ -387,12 +358,6 @@ msgid "Quantity"
msgstr "Miktar"
#. module: purchase
-#: code:addons/purchase/purchase.py:819
-#, python-format
-msgid "Shipment <em>%s</em> <b>scheduled</b> for %s."
-msgstr ""
-
-#. module: purchase
#: field:purchase.order,fiscal_position:0
msgid "Fiscal Position"
msgstr "Mali Durum"
@@ -450,12 +415,6 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:824
-#, python-format
-msgid "Draft Invoice of %s %s is <b>waiting for validation</b>."
-msgstr ""
-
-#. module: purchase
#: model:ir.actions.act_window,help:purchase.purchase_line_form_action2
msgid ""
"<p>\n"
@@ -476,6 +435,11 @@ msgid "Scheduled Date"
msgstr "Zamanlanan Tarih"
#. module: purchase
+#: field:purchase.order,currency_id:0
+msgid "Currency"
+msgstr ""
+
+#. module: purchase
#: field:purchase.order,journal_id:0
msgid "Journal"
msgstr "Yevmiye"
@@ -508,6 +472,19 @@ msgid "Incoming Products"
msgstr ""
#. module: purchase
+#: view:purchase.order:0
+msgid "Request for Quotation "
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,partner_ref:0
+msgid ""
+"Reference of the sales order or quotation sent by your supplier. It's mainly "
+"used to do the matching when you receive the products as this reference is "
+"usually written on the delivery order sent by your supplier."
+msgstr ""
+
+#. module: purchase
#: view:purchase.config.settings:0
#: view:purchase.order.group:0
#: view:purchase.order.line_invoice:0
@@ -531,6 +508,11 @@ msgstr ""
"(Fatura kontrolü = Manuel)."
#. module: purchase
+#: model:mail.message.subtype,name:purchase.mt_rfq_approved
+msgid "RFQ Approved"
+msgstr ""
+
+#. module: purchase
#: view:purchase.config.settings:0
msgid "Apply"
msgstr ""
@@ -550,6 +532,11 @@ msgstr ""
"bir Satınalma Siparişi haline gelir."
#. module: purchase
+#: model:mail.message.subtype,name:purchase.mt_rfq_confirmed
+msgid "RFQ Confirmed"
+msgstr ""
+
+#. module: purchase
#: view:purchase.order:0
msgid "Customer Address"
msgstr ""
@@ -574,7 +561,7 @@ msgid "Supplier"
msgstr "Tedarikçi"
#. module: purchase
-#: code:addons/purchase/purchase.py:508
+#: code:addons/purchase/purchase.py:525
#, python-format
msgid "Define expense account for this company: \"%s\" (id:%d)."
msgstr ""
@@ -598,7 +585,6 @@ msgstr "Alt Toplam"
#. module: purchase
#: field:purchase.order,shipped:0
-#: field:purchase.order,shipped_rate:0
msgid "Received"
msgstr "Alınan"
@@ -640,13 +626,20 @@ msgid "Invoices and Receptions"
msgstr ""
#. module: purchase
+#: model:process.transition,note:purchase.process_transition_packinginvoice0
+msgid ""
+"A Pick list generates an invoice. Depending on the Invoicing control of the "
+"sales order, the invoice is based on delivered or on ordered quantities."
+msgstr ""
+
+#. module: purchase
#: view:purchase.report:0
#: field:purchase.report,nbr:0
msgid "# of Lines"
msgstr "Satır sayısı"
#. module: purchase
-#: code:addons/purchase/wizard/purchase_line_invoice.py:110
+#: code:addons/purchase/wizard/purchase_line_invoice.py:106
#, python-format
msgid "Define expense account for this product: \"%s\" (id:%d)."
msgstr ""
@@ -667,8 +660,8 @@ msgid "It indicates that a picking has been done"
msgstr "Bir alım gerçekleştirildiğini gösterir"
#. module: purchase
-#: code:addons/purchase/purchase.py:565
-#: code:addons/purchase/purchase.py:572
+#: code:addons/purchase/purchase.py:579
+#: code:addons/purchase/purchase.py:586
#, python-format
msgid "Unable to cancel this purchase order."
msgstr ""
@@ -734,6 +727,15 @@ msgid "Draft PO"
msgstr ""
#. module: purchase
+#: code:addons/purchase/purchase.py:941
+#: code:addons/purchase/purchase.py:956
+#: code:addons/purchase/purchase.py:960
+#: code:addons/purchase/wizard/purchase_order_group.py:47
+#, python-format
+msgid "Warning!"
+msgstr ""
+
+#. module: purchase
#: model:process.node,name:purchase.process_node_draftpurchaseorder0
#: model:process.node,name:purchase.process_node_draftpurchaseorder1
msgid "RFQ"
@@ -765,6 +767,11 @@ msgid "The tax amount"
msgstr "Vergi miktarı"
#. module: purchase
+#: field:purchase.order,shipped_rate:0
+msgid "Received Ratio"
+msgstr ""
+
+#. module: purchase
#: selection:purchase.report,month:0
msgid "September"
msgstr "Eylül"
@@ -796,7 +803,7 @@ msgid "Stock Moves"
msgstr "Stok Hareketi"
#. module: purchase
-#: code:addons/purchase/purchase.py:1158
+#: code:addons/purchase/purchase.py:1156
#, python-format
msgid "Draft Purchase Order created"
msgstr ""
@@ -817,11 +824,6 @@ msgid "Terms and Conditions"
msgstr ""
#. module: purchase
-#: field:purchase.order,currency_id:0
-msgid "unknown"
-msgstr ""
-
-#. module: purchase
#: help:purchase.order,date_order:0
msgid "Date on which this document has been created."
msgstr "Bu belgenin oluşturulduğu tarih."
@@ -916,12 +918,6 @@ msgid "Cancel"
msgstr "İptal"
#. module: purchase
-#: field:purchase.order,message_comment_ids:0
-#: help:purchase.order,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
-#. module: purchase
#: sql_constraint:purchase.order:0
msgid "Order Reference must be unique per Company!"
msgstr "Sipariş Referansı Her Şirket İçin Tekil Olmalı!"
@@ -955,14 +951,89 @@ msgid "Date Approved"
msgstr "Onaylanmış Tarih"
#. module: purchase
-#: code:addons/purchase/purchase.py:806
-#, python-format
-msgid "Request for quotation <b>created</b>."
+#: view:product.product:0
+msgid "a draft purchase order"
msgstr ""
#. module: purchase
-#: view:product.product:0
-msgid "a draft purchase order"
+#: model:email.template,body_html:purchase.email_template_edi_purchase
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: #FFF; \">\n"
+"\n"
+" <p>Hello$ ${object.partner_id.name},</p>\n"
+" \n"
+" <p>Here is a ${object.state in ('draft', 'sent') and 'request for "
+"quotation' or 'purchase order confirmation'} from ${object.company_id.name}: "
+"</p>\n"
+" \n"
+" <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
+" &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
+" &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
+" &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
+"${object.pricelist_id.currency_id.name}</strong><br />\n"
+" &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
+" % if object.origin:\n"
+" &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
+" % endif\n"
+" % if object.partner_ref:\n"
+" &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
+" % endif\n"
+" % if object.validator:\n"
+" &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.validator.email "
+"or ''}?subject=Order%20${object.name}\">${object.validator.name}</a>\n"
+" % endif\n"
+" </p>\n"
+"\n"
+" <br/>\n"
+" <p>If you have any question, do not hesitate to contact us.</p>\n"
+" <p>Thank you!</p>\n"
+" <br/>\n"
+" <br/>\n"
+" <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
+"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
+"background-repeat: repeat no-repeat;\">\n"
+" <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
+"#DDD;\">\n"
+" <strong style=\"text-"
+"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
+" </div>\n"
+" <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
+"16px; background-color: #F2F2F2;\">\n"
+" <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
+" % if object.company_id.street:\n"
+" ${object.company_id.street}<br/>\n"
+" % endif\n"
+" % if object.company_id.street2:\n"
+" ${object.company_id.street2}<br/>\n"
+" % endif\n"
+" % if object.company_id.city or object.company_id.zip:\n"
+" ${object.company_id.zip} ${object.company_id.city}<br/>\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 ''}<br/>\n"
+" % endif\n"
+" </span>\n"
+" % if object.company_id.phone:\n"
+" <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
+"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
+"0px; padding-left: 0px; \">\n"
+" Phone:&nbsp; ${object.company_id.phone}\n"
+" </div>\n"
+" % endif\n"
+" % if object.company_id.website:\n"
+" <div>\n"
+" Web :&nbsp;<a "
+"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
+" </div>\n"
+" %endif\n"
+" <p></p>\n"
+" </div>\n"
+"</div>\n"
+" "
msgstr ""
#. module: purchase
@@ -1004,17 +1075,12 @@ msgid "Outgoing Mails"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:437
+#: code:addons/purchase/purchase.py:456
#, python-format
msgid "You cannot confirm a purchase order without any purchase order line."
msgstr ""
#. module: purchase
-#: model:ir.actions.server,name:purchase.actions_server_purchase_order_unread
-msgid "Purchase: Mark unread"
-msgstr ""
-
-#. module: purchase
#: help:purchase.order,message_ids:0
msgid "Messages and communication history"
msgstr ""
@@ -1026,7 +1092,7 @@ msgid "Destination Warehouse"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:973
+#: code:addons/purchase/purchase.py:941
#, python-format
msgid ""
"Selected Unit of Measure does not belong to the same category as the product "
@@ -1034,6 +1100,11 @@ msgid ""
msgstr ""
#. module: purchase
+#: view:purchase.order.line_invoice:0
+msgid "Select an Open Sales Order"
+msgstr ""
+
+#. module: purchase
#: model:ir.ui.menu,name:purchase.menu_purchase_unit_measure_purchase
#: model:ir.ui.menu,name:purchase.menu_purchase_uom_form_action
msgid "Units of Measure"
@@ -1045,18 +1116,12 @@ msgid "Manage pricelist per supplier"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:833
-#, python-format
-msgid "Purchase Order has been set to <b>draft</b>."
-msgstr ""
-
-#. module: purchase
#: view:board.board:0
msgid "Purchase Dashboard"
msgstr "Satınalma Paneli"
#. module: purchase
-#: code:addons/purchase/purchase.py:566
+#: code:addons/purchase/purchase.py:580
#, python-format
msgid "First cancel all receptions related to this purchase order."
msgstr ""
@@ -1095,9 +1160,9 @@ msgid "Unread Messages"
msgstr ""
#. module: purchase
-#: view:purchase.order.line_invoice:0
-msgid "Select an Open Sale Order"
-msgstr "Bir Açık Satış Siparişi Seçin"
+#: model:ir.ui.menu,name:purchase.menu_purchase_uom_categ_form_action
+msgid "Unit of Measure Categories"
+msgstr ""
#. module: purchase
#: view:purchase.order:0
@@ -1105,6 +1170,13 @@ msgid "Set to Draft"
msgstr "Taslak olarak Ayarla"
#. module: purchase
+#: help:purchase.order,origin:0
+msgid ""
+"Reference of the document that generated this purchase order request; a "
+"sales order or an internal procurement request."
+msgstr ""
+
+#. module: purchase
#: view:purchase.order.line:0
msgid "Notes"
msgstr "Notlar"
@@ -1134,7 +1206,7 @@ msgid "Stock Move"
msgstr "Stok Hareketi"
#. module: purchase
-#: code:addons/purchase/purchase.py:255
+#: code:addons/purchase/purchase.py:260
#, python-format
msgid "Invalid Action!"
msgstr ""
@@ -1236,7 +1308,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:310
+#: code:addons/purchase/purchase.py:320
#, python-format
msgid "Please create Invoices."
msgstr ""
@@ -1326,7 +1398,7 @@ msgid "Purchase Order Line Make Invoice"
msgstr "Satınalma Siparişi Öğesi Faturalandırma"
#. module: purchase
-#: code:addons/purchase/purchase.py:1133
+#: code:addons/purchase/purchase.py:1141
#, python-format
msgid "PO: %s"
msgstr "SA: %s"
@@ -1337,7 +1409,7 @@ msgid "Send by EMail"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:498
+#: code:addons/purchase/purchase.py:515
#, python-format
msgid "Define purchase journal for this company: \"%s\" (id:%d)."
msgstr ""
@@ -1348,9 +1420,9 @@ msgid "Purchase Order "
msgstr ""
#. module: purchase
-#: view:purchase.order.line:0
-msgid "Manual Invoices"
-msgstr "Manuel Faturalar"
+#: help:purchase.config.settings,group_costing_method:0
+msgid "Allows you to compute product cost price based on average cost."
+msgstr ""
#. module: purchase
#: model:ir.actions.act_window,name:purchase.action_purchase_configuration
@@ -1504,8 +1576,8 @@ msgid "Compute product cost price based on average cost"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:340
-#: code:addons/purchase/wizard/purchase_line_invoice.py:141
+#: code:addons/purchase/purchase.py:350
+#: code:addons/purchase/wizard/purchase_line_invoice.py:137
#: model:ir.actions.act_window,name:purchase.act_res_partner_2_supplier_invoices
#: view:res.partner:0
#, python-format
@@ -1617,8 +1689,9 @@ msgid "Open Purchase Menu"
msgstr ""
#. module: purchase
-#: model:ir.model,name:purchase.model_mail_compose_message
-msgid "Email composition wizard"
+#: code:addons/purchase/purchase.py:1028
+#, python-format
+msgid "No address defined for the supplier"
msgstr ""
#. module: purchase
@@ -1691,11 +1764,11 @@ msgid "Purchase Order"
msgstr "Satınalma Siparişi"
#. module: purchase
-#: code:addons/purchase/purchase.py:310
-#: code:addons/purchase/purchase.py:437
-#: code:addons/purchase/purchase.py:497
-#: code:addons/purchase/purchase.py:508
-#: code:addons/purchase/wizard/purchase_line_invoice.py:109
+#: code:addons/purchase/purchase.py:320
+#: code:addons/purchase/purchase.py:456
+#: code:addons/purchase/purchase.py:514
+#: code:addons/purchase/purchase.py:525
+#: code:addons/purchase/wizard/purchase_line_invoice.py:105
#, python-format
msgid "Error!"
msgstr ""
@@ -1717,15 +1790,6 @@ msgid ""
msgstr ""
#. module: purchase
-#: model:process.transition,note:purchase.process_transition_packinginvoice0
-msgid ""
-"A Pick list generates an invoice. Depending on the Invoicing control of the "
-"sale order, the invoice is based on delivered or on ordered quantities."
-msgstr ""
-"Alım listesi bir fatura oluşturur. Satış siparişi faturalama kontrolüne "
-"bağlı olarak, fatura teslimata ya da sipariş edilen miktarlara bağlıdır."
-
-#. module: purchase
#: selection:purchase.order,state:0
#: selection:purchase.order.line,state:0
#: selection:purchase.report,state:0
@@ -1738,9 +1802,8 @@ msgid "# of Purchase Order"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:827
-#, python-format
-msgid "Shipment <b>received</b>."
+#: model:ir.model,name:purchase.model_mail_compose_message
+msgid "Email composition wizard"
msgstr ""
#. module: purchase
@@ -1830,7 +1893,7 @@ msgid "RFQ_${(object.name or '').replace('/','_')}"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:988
+#: code:addons/purchase/purchase.py:956
#, python-format
msgid "The selected supplier only sells this product by %s"
msgstr "Seçilen tedarikçi bu ürünün sadece %s'ini satar"
@@ -1876,6 +1939,12 @@ msgid "Outgoing products to invoice"
msgstr "Faturalandırılacak giden ürünler"
#. module: purchase
+#: report:purchase.order:0
+#: field:purchase.report,validator:0
+msgid "Validated By"
+msgstr "Onaylayan"
+
+#. module: purchase
#: view:purchase.report:0
#: field:purchase.report,delay_pass:0
msgid "Days to Deliver"
@@ -1965,9 +2034,9 @@ msgid "November"
msgstr "Kasım"
#. module: purchase
-#: help:purchase.config.settings,group_costing_method:0
-msgid "Allows you to compute product cost price based on average cost."
-msgstr ""
+#: view:purchase.order.line:0
+msgid "Manual Invoices"
+msgstr "Manuel Faturalar"
#. module: purchase
#: report:purchase.order:0
@@ -1990,13 +2059,6 @@ msgid ""
msgstr ""
#. module: purchase
-#: help:purchase.order,origin:0
-msgid ""
-"Reference of the document that generated this purchase order request; a sale "
-"order or an internal procurement request."
-msgstr ""
-
-#. module: purchase
#: model:ir.ui.menu,name:purchase.menu_partner_categories_in_form
msgid "Partner Categories"
msgstr "Cari Kategorileri"
@@ -2017,89 +2079,6 @@ msgid "Invoicing Settings"
msgstr ""
#. module: purchase
-#: model:email.template,body_html:purchase.email_template_edi_purchase
-msgid ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"\n"
-" <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
-"or ''},</p>\n"
-" \n"
-" <p>Here is a ${object.state in ('draft', 'sent') and 'request for "
-"quotation' or 'purchase order confirmation'} from ${object.company_id.name}: "
-"</p>\n"
-" \n"
-" <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
-" &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
-" &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
-" &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
-"${object.pricelist_id.currency_id.name}</strong><br />\n"
-" &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
-" % if object.origin:\n"
-" &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
-" % endif\n"
-" % if object.partner_ref:\n"
-" &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
-" % endif\n"
-" % if object.validator:\n"
-" &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.validator.email "
-"or ''}?subject=Order%20${object.name}\">${object.validator.name}</a>\n"
-" % endif\n"
-" </p>\n"
-"\n"
-" <br/>\n"
-" <p>If you have any question, do not hesitate to contact us.</p>\n"
-" <p>Thank you!</p>\n"
-" <br/>\n"
-" <br/>\n"
-" <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
-"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
-"background-repeat: repeat no-repeat;\">\n"
-" <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
-"#FFF;\">\n"
-" <strong style=\"text-"
-"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
-" </div>\n"
-" <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
-"16px; background-color: #F2F2F2;\">\n"
-" <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
-" % if object.company_id.street:\n"
-" ${object.company_id.street}<br/>\n"
-" % endif\n"
-" % if object.company_id.street2:\n"
-" ${object.company_id.street2}<br/>\n"
-" % endif\n"
-" % if object.company_id.city or object.company_id.zip:\n"
-" ${object.company_id.zip} ${object.company_id.city}<br/>\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 ''}<br/>\n"
-" % endif\n"
-" </span>\n"
-" % if object.company_id.phone:\n"
-" <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
-"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
-"0px; padding-left: 0px; \">\n"
-" Phone:&nbsp; ${object.company_id.phone}\n"
-" </div>\n"
-" % endif\n"
-" % if object.company_id.website:\n"
-" <div>\n"
-" Web :&nbsp;<a "
-"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
-" </div>\n"
-" %endif\n"
-" <p></p>\n"
-" </div>\n"
-"</div>\n"
-" "
-msgstr ""
-
-#. module: purchase
#: model:ir.actions.act_window,name:purchase.action_purchase_order_by_user_all
msgid "Total Orders by User per month"
msgstr "Aylık Toplam Kullanıcı Siparişi"
@@ -2110,21 +2089,19 @@ msgid "Based on incoming shipments"
msgstr ""
#. module: purchase
+#: code:addons/purchase/purchase.py:1018
+#, python-format
+msgid "No default supplier defined for this product"
+msgstr ""
+
+#. module: purchase
#: view:purchase.report:0
#: field:purchase.report,warehouse_id:0
msgid "Warehouse"
msgstr "Depo"
#. module: purchase
-#: help:purchase.order,partner_ref:0
-msgid ""
-"Reference of the sale order or quotation sent by your supplier. It's mainly "
-"used to do the matching when you receive the products as this reference is "
-"usually written on the delivery order sent by your supplier."
-msgstr ""
-
-#. module: purchase
-#: code:addons/purchase/purchase.py:991
+#: code:addons/purchase/purchase.py:960
#, python-format
msgid ""
"The selected supplier has a minimal quantity set to %s %s, you should not "
@@ -2211,8 +2188,8 @@ msgstr ""
" "
#. module: purchase
-#: view:product.product:0
-msgid "When you sell this service to a customer,"
+#: field:purchase.order,message_summary:0
+msgid "Summary"
msgstr ""
#. module: purchase
@@ -2222,6 +2199,11 @@ msgid "Pricelist Versions"
msgstr "Fiyat Listesi Sürümleri"
#. module: purchase
+#: field:purchase.order,payment_term_id:0
+msgid "Payment Term"
+msgstr ""
+
+#. module: purchase
#: view:purchase.order:0
msgid "Purchase orders which are in draft state"
msgstr "Taslak durumundaki satınalma siparişleri"
@@ -2440,6 +2422,9 @@ msgstr "Siparişler"
#~ msgid "No Pricelist !"
#~ msgstr "Fiyat listesi yok!"
+#~ msgid "Select an Open Sale Order"
+#~ msgstr "Bir Açık Satış Siparişi Seçin"
+
#~ msgid "Current purchases"
#~ msgstr "Mevcut satınalmalar"
@@ -2476,6 +2461,13 @@ msgstr "Siparişler"
#~ msgid "Configuration Progress"
#~ msgstr "Yapılandırma İlerleyişi"
+#~ msgid ""
+#~ "A Pick list generates an invoice. Depending on the Invoicing control of the "
+#~ "sale order, the invoice is based on delivered or on ordered quantities."
+#~ msgstr ""
+#~ "Alım listesi bir fatura oluşturur. Satış siparişi faturalama kontrolüne "
+#~ "bağlı olarak, fatura teslimata ya da sipariş edilen miktarlara bağlıdır."
+
#, python-format
#~ msgid "Purchase amount over the limit"
#~ msgstr "Satınalma miktarı limitin üzerinde"
diff --git a/addons/purchase/i18n/uk.po b/addons/purchase/i18n/uk.po
index 65e3eda3ecb..085010f9167 100644
--- a/addons/purchase/i18n/uk.po
+++ b/addons/purchase/i18n/uk.po
@@ -6,15 +6,15 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
"PO-Revision-Date: 2012-05-10 18:15+0000\n"
"Last-Translator: Eugene Babiy <eugene.babiy@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: 2012-12-04 05:12+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:20+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
#. module: purchase
#: model:res.groups,name:purchase.group_analytic_accounting
@@ -58,11 +58,6 @@ msgid ""
msgstr ""
#. module: purchase
-#: model:ir.actions.server,name:purchase.actions_server_purchase_order_read
-msgid "Purchase: Mark read"
-msgstr ""
-
-#. module: purchase
#: view:purchase.report:0
#: field:purchase.report,day:0
msgid "Day"
@@ -103,16 +98,13 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:973
-#: code:addons/purchase/purchase.py:988
-#: code:addons/purchase/purchase.py:991
-#: code:addons/purchase/wizard/purchase_order_group.py:47
+#: code:addons/purchase/purchase.py:1024
#, python-format
-msgid "Warning!"
+msgid "Configuration Error!"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:573
+#: code:addons/purchase/purchase.py:587
#, python-format
msgid "You must first cancel all receptions related to this purchase order."
msgstr ""
@@ -129,9 +121,9 @@ msgid "Purchase-Standard Price"
msgstr ""
#. module: purchase
-#: report:purchase.order:0
-#: field:purchase.report,validator:0
-msgid "Validated By"
+#: code:addons/purchase/purchase.py:1011
+#, python-format
+msgid "No supplier defined for this product !"
msgstr ""
#. module: purchase
@@ -155,12 +147,6 @@ msgid "Average Price"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:830
-#, python-format
-msgid "Invoice <b>paid</b>."
-msgstr ""
-
-#. module: purchase
#: view:purchase.order:0
msgid "Purchase order which are in the exception state"
msgstr ""
@@ -230,7 +216,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:255
+#: code:addons/purchase/purchase.py:260
#, python-format
msgid "In order to delete a purchase order, you must cancel it first."
msgstr ""
@@ -256,29 +242,12 @@ msgid "Total Untaxed amount"
msgstr ""
#. module: purchase
-#: model:ir.ui.menu,name:purchase.menu_purchase_uom_categ_form_action
-msgid "Unit of Measure Categories"
-msgstr ""
-
-#. module: purchase
#: view:purchase.report:0
#: field:purchase.report,category_id:0
msgid "Category"
msgstr ""
#. module: purchase
-#: view:purchase.order:0
-msgid "Quotation "
-msgstr ""
-
-#. module: purchase
-#: code:addons/purchase/purchase.py:810
-#, python-format
-msgid ""
-"Quotation for <em>%s</em> <b>converted</b> to a Purchase Order of %s %s."
-msgstr ""
-
-#. module: purchase
#: model:process.transition,note:purchase.process_transition_purchaseinvoice0
msgid ""
"A purchase order generates a supplier invoice, as soon as it is confirmed by "
@@ -343,14 +312,16 @@ msgid "October"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:837
+#: code:addons/purchase/purchase.py:1024
#, python-format
-msgid "Purchase Order for <em>%s</em> <b>cancelled</b>."
+msgid ""
+"The product \"%s\" has been defined with your company as reseller which "
+"seems to be a configuration error!"
msgstr ""
#. module: purchase
-#: field:purchase.order,message_summary:0
-msgid "Summary"
+#: view:product.product:0
+msgid "When you sell this service to a customer,"
msgstr ""
#. module: purchase
@@ -379,12 +350,6 @@ msgid "Quantity"
msgstr "Кількість"
#. module: purchase
-#: code:addons/purchase/purchase.py:819
-#, python-format
-msgid "Shipment <em>%s</em> <b>scheduled</b> for %s."
-msgstr ""
-
-#. module: purchase
#: field:purchase.order,fiscal_position:0
msgid "Fiscal Position"
msgstr ""
@@ -442,12 +407,6 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:824
-#, python-format
-msgid "Draft Invoice of %s %s is <b>waiting for validation</b>."
-msgstr ""
-
-#. module: purchase
#: model:ir.actions.act_window,help:purchase.purchase_line_form_action2
msgid ""
"<p>\n"
@@ -468,6 +427,11 @@ msgid "Scheduled Date"
msgstr ""
#. module: purchase
+#: field:purchase.order,currency_id:0
+msgid "Currency"
+msgstr ""
+
+#. module: purchase
#: field:purchase.order,journal_id:0
msgid "Journal"
msgstr ""
@@ -500,6 +464,19 @@ msgid "Incoming Products"
msgstr ""
#. module: purchase
+#: view:purchase.order:0
+msgid "Request for Quotation "
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,partner_ref:0
+msgid ""
+"Reference of the sales order or quotation sent by your supplier. It's mainly "
+"used to do the matching when you receive the products as this reference is "
+"usually written on the delivery order sent by your supplier."
+msgstr ""
+
+#. module: purchase
#: view:purchase.config.settings:0
#: view:purchase.order.group:0
#: view:purchase.order.line_invoice:0
@@ -520,6 +497,11 @@ msgid ""
msgstr ""
#. module: purchase
+#: model:mail.message.subtype,name:purchase.mt_rfq_approved
+msgid "RFQ Approved"
+msgstr ""
+
+#. module: purchase
#: view:purchase.config.settings:0
msgid "Apply"
msgstr ""
@@ -537,6 +519,11 @@ msgid ""
msgstr ""
#. module: purchase
+#: model:mail.message.subtype,name:purchase.mt_rfq_confirmed
+msgid "RFQ Confirmed"
+msgstr ""
+
+#. module: purchase
#: view:purchase.order:0
msgid "Customer Address"
msgstr ""
@@ -561,7 +548,7 @@ msgid "Supplier"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:508
+#: code:addons/purchase/purchase.py:525
#, python-format
msgid "Define expense account for this company: \"%s\" (id:%d)."
msgstr ""
@@ -585,7 +572,6 @@ msgstr "Попередня сума"
#. module: purchase
#: field:purchase.order,shipped:0
-#: field:purchase.order,shipped_rate:0
msgid "Received"
msgstr "Отримано"
@@ -627,13 +613,20 @@ msgid "Invoices and Receptions"
msgstr ""
#. module: purchase
+#: model:process.transition,note:purchase.process_transition_packinginvoice0
+msgid ""
+"A Pick list generates an invoice. Depending on the Invoicing control of the "
+"sales order, the invoice is based on delivered or on ordered quantities."
+msgstr ""
+
+#. module: purchase
#: view:purchase.report:0
#: field:purchase.report,nbr:0
msgid "# of Lines"
msgstr ""
#. module: purchase
-#: code:addons/purchase/wizard/purchase_line_invoice.py:110
+#: code:addons/purchase/wizard/purchase_line_invoice.py:106
#, python-format
msgid "Define expense account for this product: \"%s\" (id:%d)."
msgstr ""
@@ -654,8 +647,8 @@ msgid "It indicates that a picking has been done"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:565
-#: code:addons/purchase/purchase.py:572
+#: code:addons/purchase/purchase.py:579
+#: code:addons/purchase/purchase.py:586
#, python-format
msgid "Unable to cancel this purchase order."
msgstr ""
@@ -718,6 +711,15 @@ msgid "Draft PO"
msgstr ""
#. module: purchase
+#: code:addons/purchase/purchase.py:941
+#: code:addons/purchase/purchase.py:956
+#: code:addons/purchase/purchase.py:960
+#: code:addons/purchase/wizard/purchase_order_group.py:47
+#, python-format
+msgid "Warning!"
+msgstr ""
+
+#. module: purchase
#: model:process.node,name:purchase.process_node_draftpurchaseorder0
#: model:process.node,name:purchase.process_node_draftpurchaseorder1
msgid "RFQ"
@@ -749,6 +751,11 @@ msgid "The tax amount"
msgstr ""
#. module: purchase
+#: field:purchase.order,shipped_rate:0
+msgid "Received Ratio"
+msgstr ""
+
+#. module: purchase
#: selection:purchase.report,month:0
msgid "September"
msgstr ""
@@ -780,7 +787,7 @@ msgid "Stock Moves"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1158
+#: code:addons/purchase/purchase.py:1156
#, python-format
msgid "Draft Purchase Order created"
msgstr ""
@@ -801,11 +808,6 @@ msgid "Terms and Conditions"
msgstr ""
#. module: purchase
-#: field:purchase.order,currency_id:0
-msgid "unknown"
-msgstr ""
-
-#. module: purchase
#: help:purchase.order,date_order:0
msgid "Date on which this document has been created."
msgstr ""
@@ -899,12 +901,6 @@ msgid "Cancel"
msgstr "Скасувати"
#. module: purchase
-#: field:purchase.order,message_comment_ids:0
-#: help:purchase.order,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
-#. module: purchase
#: sql_constraint:purchase.order:0
msgid "Order Reference must be unique per Company!"
msgstr ""
@@ -938,14 +934,89 @@ msgid "Date Approved"
msgstr "Затверджена дата"
#. module: purchase
-#: code:addons/purchase/purchase.py:806
-#, python-format
-msgid "Request for quotation <b>created</b>."
+#: view:product.product:0
+msgid "a draft purchase order"
msgstr ""
#. module: purchase
-#: view:product.product:0
-msgid "a draft purchase order"
+#: model:email.template,body_html:purchase.email_template_edi_purchase
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: #FFF; \">\n"
+"\n"
+" <p>Hello$ ${object.partner_id.name},</p>\n"
+" \n"
+" <p>Here is a ${object.state in ('draft', 'sent') and 'request for "
+"quotation' or 'purchase order confirmation'} from ${object.company_id.name}: "
+"</p>\n"
+" \n"
+" <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
+" &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
+" &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
+" &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
+"${object.pricelist_id.currency_id.name}</strong><br />\n"
+" &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
+" % if object.origin:\n"
+" &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
+" % endif\n"
+" % if object.partner_ref:\n"
+" &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
+" % endif\n"
+" % if object.validator:\n"
+" &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.validator.email "
+"or ''}?subject=Order%20${object.name}\">${object.validator.name}</a>\n"
+" % endif\n"
+" </p>\n"
+"\n"
+" <br/>\n"
+" <p>If you have any question, do not hesitate to contact us.</p>\n"
+" <p>Thank you!</p>\n"
+" <br/>\n"
+" <br/>\n"
+" <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
+"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
+"background-repeat: repeat no-repeat;\">\n"
+" <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
+"#DDD;\">\n"
+" <strong style=\"text-"
+"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
+" </div>\n"
+" <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
+"16px; background-color: #F2F2F2;\">\n"
+" <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
+" % if object.company_id.street:\n"
+" ${object.company_id.street}<br/>\n"
+" % endif\n"
+" % if object.company_id.street2:\n"
+" ${object.company_id.street2}<br/>\n"
+" % endif\n"
+" % if object.company_id.city or object.company_id.zip:\n"
+" ${object.company_id.zip} ${object.company_id.city}<br/>\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 ''}<br/>\n"
+" % endif\n"
+" </span>\n"
+" % if object.company_id.phone:\n"
+" <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
+"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
+"0px; padding-left: 0px; \">\n"
+" Phone:&nbsp; ${object.company_id.phone}\n"
+" </div>\n"
+" % endif\n"
+" % if object.company_id.website:\n"
+" <div>\n"
+" Web :&nbsp;<a "
+"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
+" </div>\n"
+" %endif\n"
+" <p></p>\n"
+" </div>\n"
+"</div>\n"
+" "
msgstr ""
#. module: purchase
@@ -985,17 +1056,12 @@ msgid "Outgoing Mails"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:437
+#: code:addons/purchase/purchase.py:456
#, python-format
msgid "You cannot confirm a purchase order without any purchase order line."
msgstr ""
#. module: purchase
-#: model:ir.actions.server,name:purchase.actions_server_purchase_order_unread
-msgid "Purchase: Mark unread"
-msgstr ""
-
-#. module: purchase
#: help:purchase.order,message_ids:0
msgid "Messages and communication history"
msgstr ""
@@ -1007,7 +1073,7 @@ msgid "Destination Warehouse"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:973
+#: code:addons/purchase/purchase.py:941
#, python-format
msgid ""
"Selected Unit of Measure does not belong to the same category as the product "
@@ -1015,6 +1081,11 @@ msgid ""
msgstr ""
#. module: purchase
+#: view:purchase.order.line_invoice:0
+msgid "Select an Open Sales Order"
+msgstr ""
+
+#. module: purchase
#: model:ir.ui.menu,name:purchase.menu_purchase_unit_measure_purchase
#: model:ir.ui.menu,name:purchase.menu_purchase_uom_form_action
msgid "Units of Measure"
@@ -1026,18 +1097,12 @@ msgid "Manage pricelist per supplier"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:833
-#, python-format
-msgid "Purchase Order has been set to <b>draft</b>."
-msgstr ""
-
-#. module: purchase
#: view:board.board:0
msgid "Purchase Dashboard"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:566
+#: code:addons/purchase/purchase.py:580
#, python-format
msgid "First cancel all receptions related to this purchase order."
msgstr ""
@@ -1076,8 +1141,8 @@ msgid "Unread Messages"
msgstr ""
#. module: purchase
-#: view:purchase.order.line_invoice:0
-msgid "Select an Open Sale Order"
+#: model:ir.ui.menu,name:purchase.menu_purchase_uom_categ_form_action
+msgid "Unit of Measure Categories"
msgstr ""
#. module: purchase
@@ -1086,6 +1151,13 @@ msgid "Set to Draft"
msgstr ""
#. module: purchase
+#: help:purchase.order,origin:0
+msgid ""
+"Reference of the document that generated this purchase order request; a "
+"sales order or an internal procurement request."
+msgstr ""
+
+#. module: purchase
#: view:purchase.order.line:0
msgid "Notes"
msgstr "Примітки"
@@ -1115,7 +1187,7 @@ msgid "Stock Move"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:255
+#: code:addons/purchase/purchase.py:260
#, python-format
msgid "Invalid Action!"
msgstr ""
@@ -1214,7 +1286,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:310
+#: code:addons/purchase/purchase.py:320
#, python-format
msgid "Please create Invoices."
msgstr ""
@@ -1304,7 +1376,7 @@ msgid "Purchase Order Line Make Invoice"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1133
+#: code:addons/purchase/purchase.py:1141
#, python-format
msgid "PO: %s"
msgstr ""
@@ -1315,7 +1387,7 @@ msgid "Send by EMail"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:498
+#: code:addons/purchase/purchase.py:515
#, python-format
msgid "Define purchase journal for this company: \"%s\" (id:%d)."
msgstr ""
@@ -1326,8 +1398,8 @@ msgid "Purchase Order "
msgstr ""
#. module: purchase
-#: view:purchase.order.line:0
-msgid "Manual Invoices"
+#: help:purchase.config.settings,group_costing_method:0
+msgid "Allows you to compute product cost price based on average cost."
msgstr ""
#. module: purchase
@@ -1482,8 +1554,8 @@ msgid "Compute product cost price based on average cost"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:340
-#: code:addons/purchase/wizard/purchase_line_invoice.py:141
+#: code:addons/purchase/purchase.py:350
+#: code:addons/purchase/wizard/purchase_line_invoice.py:137
#: model:ir.actions.act_window,name:purchase.act_res_partner_2_supplier_invoices
#: view:res.partner:0
#, python-format
@@ -1595,8 +1667,9 @@ msgid "Open Purchase Menu"
msgstr ""
#. module: purchase
-#: model:ir.model,name:purchase.model_mail_compose_message
-msgid "Email composition wizard"
+#: code:addons/purchase/purchase.py:1028
+#, python-format
+msgid "No address defined for the supplier"
msgstr ""
#. module: purchase
@@ -1669,11 +1742,11 @@ msgid "Purchase Order"
msgstr "Заявка на придбання"
#. module: purchase
-#: code:addons/purchase/purchase.py:310
-#: code:addons/purchase/purchase.py:437
-#: code:addons/purchase/purchase.py:497
-#: code:addons/purchase/purchase.py:508
-#: code:addons/purchase/wizard/purchase_line_invoice.py:109
+#: code:addons/purchase/purchase.py:320
+#: code:addons/purchase/purchase.py:456
+#: code:addons/purchase/purchase.py:514
+#: code:addons/purchase/purchase.py:525
+#: code:addons/purchase/wizard/purchase_line_invoice.py:105
#, python-format
msgid "Error!"
msgstr ""
@@ -1695,13 +1768,6 @@ msgid ""
msgstr ""
#. module: purchase
-#: model:process.transition,note:purchase.process_transition_packinginvoice0
-msgid ""
-"A Pick list generates an invoice. Depending on the Invoicing control of the "
-"sale order, the invoice is based on delivered or on ordered quantities."
-msgstr ""
-
-#. module: purchase
#: selection:purchase.order,state:0
#: selection:purchase.order.line,state:0
#: selection:purchase.report,state:0
@@ -1714,9 +1780,8 @@ msgid "# of Purchase Order"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:827
-#, python-format
-msgid "Shipment <b>received</b>."
+#: model:ir.model,name:purchase.model_mail_compose_message
+msgid "Email composition wizard"
msgstr ""
#. module: purchase
@@ -1800,7 +1865,7 @@ msgid "RFQ_${(object.name or '').replace('/','_')}"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:988
+#: code:addons/purchase/purchase.py:956
#, python-format
msgid "The selected supplier only sells this product by %s"
msgstr ""
@@ -1846,6 +1911,12 @@ msgid "Outgoing products to invoice"
msgstr ""
#. module: purchase
+#: report:purchase.order:0
+#: field:purchase.report,validator:0
+msgid "Validated By"
+msgstr ""
+
+#. module: purchase
#: view:purchase.report:0
#: field:purchase.report,delay_pass:0
msgid "Days to Deliver"
@@ -1935,8 +2006,8 @@ msgid "November"
msgstr ""
#. module: purchase
-#: help:purchase.config.settings,group_costing_method:0
-msgid "Allows you to compute product cost price based on average cost."
+#: view:purchase.order.line:0
+msgid "Manual Invoices"
msgstr ""
#. module: purchase
@@ -1960,13 +2031,6 @@ msgid ""
msgstr ""
#. module: purchase
-#: help:purchase.order,origin:0
-msgid ""
-"Reference of the document that generated this purchase order request; a sale "
-"order or an internal procurement request."
-msgstr ""
-
-#. module: purchase
#: model:ir.ui.menu,name:purchase.menu_partner_categories_in_form
msgid "Partner Categories"
msgstr ""
@@ -1987,89 +2051,6 @@ msgid "Invoicing Settings"
msgstr ""
#. module: purchase
-#: model:email.template,body_html:purchase.email_template_edi_purchase
-msgid ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"\n"
-" <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
-"or ''},</p>\n"
-" \n"
-" <p>Here is a ${object.state in ('draft', 'sent') and 'request for "
-"quotation' or 'purchase order confirmation'} from ${object.company_id.name}: "
-"</p>\n"
-" \n"
-" <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
-" &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
-" &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
-" &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
-"${object.pricelist_id.currency_id.name}</strong><br />\n"
-" &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
-" % if object.origin:\n"
-" &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
-" % endif\n"
-" % if object.partner_ref:\n"
-" &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
-" % endif\n"
-" % if object.validator:\n"
-" &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.validator.email "
-"or ''}?subject=Order%20${object.name}\">${object.validator.name}</a>\n"
-" % endif\n"
-" </p>\n"
-"\n"
-" <br/>\n"
-" <p>If you have any question, do not hesitate to contact us.</p>\n"
-" <p>Thank you!</p>\n"
-" <br/>\n"
-" <br/>\n"
-" <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
-"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
-"background-repeat: repeat no-repeat;\">\n"
-" <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
-"#FFF;\">\n"
-" <strong style=\"text-"
-"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
-" </div>\n"
-" <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
-"16px; background-color: #F2F2F2;\">\n"
-" <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
-" % if object.company_id.street:\n"
-" ${object.company_id.street}<br/>\n"
-" % endif\n"
-" % if object.company_id.street2:\n"
-" ${object.company_id.street2}<br/>\n"
-" % endif\n"
-" % if object.company_id.city or object.company_id.zip:\n"
-" ${object.company_id.zip} ${object.company_id.city}<br/>\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 ''}<br/>\n"
-" % endif\n"
-" </span>\n"
-" % if object.company_id.phone:\n"
-" <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
-"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
-"0px; padding-left: 0px; \">\n"
-" Phone:&nbsp; ${object.company_id.phone}\n"
-" </div>\n"
-" % endif\n"
-" % if object.company_id.website:\n"
-" <div>\n"
-" Web :&nbsp;<a "
-"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
-" </div>\n"
-" %endif\n"
-" <p></p>\n"
-" </div>\n"
-"</div>\n"
-" "
-msgstr ""
-
-#. module: purchase
#: model:ir.actions.act_window,name:purchase.action_purchase_order_by_user_all
msgid "Total Orders by User per month"
msgstr ""
@@ -2080,21 +2061,19 @@ msgid "Based on incoming shipments"
msgstr ""
#. module: purchase
+#: code:addons/purchase/purchase.py:1018
+#, python-format
+msgid "No default supplier defined for this product"
+msgstr ""
+
+#. module: purchase
#: view:purchase.report:0
#: field:purchase.report,warehouse_id:0
msgid "Warehouse"
msgstr "Склад"
#. module: purchase
-#: help:purchase.order,partner_ref:0
-msgid ""
-"Reference of the sale order or quotation sent by your supplier. It's mainly "
-"used to do the matching when you receive the products as this reference is "
-"usually written on the delivery order sent by your supplier."
-msgstr ""
-
-#. module: purchase
-#: code:addons/purchase/purchase.py:991
+#: code:addons/purchase/purchase.py:960
#, python-format
msgid ""
"The selected supplier has a minimal quantity set to %s %s, you should not "
@@ -2167,8 +2146,8 @@ msgid ""
msgstr ""
#. module: purchase
-#: view:product.product:0
-msgid "When you sell this service to a customer,"
+#: field:purchase.order,message_summary:0
+msgid "Summary"
msgstr ""
#. module: purchase
@@ -2178,6 +2157,11 @@ msgid "Pricelist Versions"
msgstr ""
#. module: purchase
+#: field:purchase.order,payment_term_id:0
+msgid "Payment Term"
+msgstr ""
+
+#. module: purchase
#: view:purchase.order:0
msgid "Purchase orders which are in draft state"
msgstr ""
diff --git a/addons/purchase/i18n/vi.po b/addons/purchase/i18n/vi.po
index e0eb246f425..2011ec360fb 100644
--- a/addons/purchase/i18n/vi.po
+++ b/addons/purchase/i18n/vi.po
@@ -7,15 +7,15 @@ msgid ""
msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
"PO-Revision-Date: 2011-07-31 06:20+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: 2012-12-04 05:12+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:20+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
#. module: purchase
#: model:res.groups,name:purchase.group_analytic_accounting
@@ -59,11 +59,6 @@ msgid ""
msgstr ""
#. module: purchase
-#: model:ir.actions.server,name:purchase.actions_server_purchase_order_read
-msgid "Purchase: Mark read"
-msgstr ""
-
-#. module: purchase
#: view:purchase.report:0
#: field:purchase.report,day:0
msgid "Day"
@@ -104,16 +99,13 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:973
-#: code:addons/purchase/purchase.py:988
-#: code:addons/purchase/purchase.py:991
-#: code:addons/purchase/wizard/purchase_order_group.py:47
+#: code:addons/purchase/purchase.py:1024
#, python-format
-msgid "Warning!"
+msgid "Configuration Error!"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:573
+#: code:addons/purchase/purchase.py:587
#, python-format
msgid "You must first cancel all receptions related to this purchase order."
msgstr ""
@@ -130,9 +122,9 @@ msgid "Purchase-Standard Price"
msgstr ""
#. module: purchase
-#: report:purchase.order:0
-#: field:purchase.report,validator:0
-msgid "Validated By"
+#: code:addons/purchase/purchase.py:1011
+#, python-format
+msgid "No supplier defined for this product !"
msgstr ""
#. module: purchase
@@ -156,12 +148,6 @@ msgid "Average Price"
msgstr "Giá trung bình"
#. module: purchase
-#: code:addons/purchase/purchase.py:830
-#, python-format
-msgid "Invoice <b>paid</b>."
-msgstr ""
-
-#. module: purchase
#: view:purchase.order:0
msgid "Purchase order which are in the exception state"
msgstr ""
@@ -231,7 +217,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:255
+#: code:addons/purchase/purchase.py:260
#, python-format
msgid "In order to delete a purchase order, you must cancel it first."
msgstr ""
@@ -257,29 +243,12 @@ msgid "Total Untaxed amount"
msgstr "Tổng số tiền không thuế"
#. module: purchase
-#: model:ir.ui.menu,name:purchase.menu_purchase_uom_categ_form_action
-msgid "Unit of Measure Categories"
-msgstr ""
-
-#. module: purchase
#: view:purchase.report:0
#: field:purchase.report,category_id:0
msgid "Category"
msgstr "Loại"
#. module: purchase
-#: view:purchase.order:0
-msgid "Quotation "
-msgstr ""
-
-#. module: purchase
-#: code:addons/purchase/purchase.py:810
-#, python-format
-msgid ""
-"Quotation for <em>%s</em> <b>converted</b> to a Purchase Order of %s %s."
-msgstr ""
-
-#. module: purchase
#: model:process.transition,note:purchase.process_transition_purchaseinvoice0
msgid ""
"A purchase order generates a supplier invoice, as soon as it is confirmed by "
@@ -344,14 +313,16 @@ msgid "October"
msgstr "Tháng Mười"
#. module: purchase
-#: code:addons/purchase/purchase.py:837
+#: code:addons/purchase/purchase.py:1024
#, python-format
-msgid "Purchase Order for <em>%s</em> <b>cancelled</b>."
+msgid ""
+"The product \"%s\" has been defined with your company as reseller which "
+"seems to be a configuration error!"
msgstr ""
#. module: purchase
-#: field:purchase.order,message_summary:0
-msgid "Summary"
+#: view:product.product:0
+msgid "When you sell this service to a customer,"
msgstr ""
#. module: purchase
@@ -380,12 +351,6 @@ msgid "Quantity"
msgstr "Số lượng"
#. module: purchase
-#: code:addons/purchase/purchase.py:819
-#, python-format
-msgid "Shipment <em>%s</em> <b>scheduled</b> for %s."
-msgstr ""
-
-#. module: purchase
#: field:purchase.order,fiscal_position:0
msgid "Fiscal Position"
msgstr ""
@@ -443,12 +408,6 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:824
-#, python-format
-msgid "Draft Invoice of %s %s is <b>waiting for validation</b>."
-msgstr ""
-
-#. module: purchase
#: model:ir.actions.act_window,help:purchase.purchase_line_form_action2
msgid ""
"<p>\n"
@@ -469,6 +428,11 @@ msgid "Scheduled Date"
msgstr ""
#. module: purchase
+#: field:purchase.order,currency_id:0
+msgid "Currency"
+msgstr ""
+
+#. module: purchase
#: field:purchase.order,journal_id:0
msgid "Journal"
msgstr ""
@@ -501,6 +465,19 @@ msgid "Incoming Products"
msgstr ""
#. module: purchase
+#: view:purchase.order:0
+msgid "Request for Quotation "
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,partner_ref:0
+msgid ""
+"Reference of the sales order or quotation sent by your supplier. It's mainly "
+"used to do the matching when you receive the products as this reference is "
+"usually written on the delivery order sent by your supplier."
+msgstr ""
+
+#. module: purchase
#: view:purchase.config.settings:0
#: view:purchase.order.group:0
#: view:purchase.order.line_invoice:0
@@ -521,6 +498,11 @@ msgid ""
msgstr ""
#. module: purchase
+#: model:mail.message.subtype,name:purchase.mt_rfq_approved
+msgid "RFQ Approved"
+msgstr ""
+
+#. module: purchase
#: view:purchase.config.settings:0
msgid "Apply"
msgstr ""
@@ -538,6 +520,11 @@ msgid ""
msgstr ""
#. module: purchase
+#: model:mail.message.subtype,name:purchase.mt_rfq_confirmed
+msgid "RFQ Confirmed"
+msgstr ""
+
+#. module: purchase
#: view:purchase.order:0
msgid "Customer Address"
msgstr ""
@@ -562,7 +549,7 @@ msgid "Supplier"
msgstr "Nhà cung cấp"
#. module: purchase
-#: code:addons/purchase/purchase.py:508
+#: code:addons/purchase/purchase.py:525
#, python-format
msgid "Define expense account for this company: \"%s\" (id:%d)."
msgstr ""
@@ -586,7 +573,6 @@ msgstr "Tổng phụ"
#. module: purchase
#: field:purchase.order,shipped:0
-#: field:purchase.order,shipped_rate:0
msgid "Received"
msgstr "Đã nhận"
@@ -628,13 +614,20 @@ msgid "Invoices and Receptions"
msgstr ""
#. module: purchase
+#: model:process.transition,note:purchase.process_transition_packinginvoice0
+msgid ""
+"A Pick list generates an invoice. Depending on the Invoicing control of the "
+"sales order, the invoice is based on delivered or on ordered quantities."
+msgstr ""
+
+#. module: purchase
#: view:purchase.report:0
#: field:purchase.report,nbr:0
msgid "# of Lines"
msgstr ""
#. module: purchase
-#: code:addons/purchase/wizard/purchase_line_invoice.py:110
+#: code:addons/purchase/wizard/purchase_line_invoice.py:106
#, python-format
msgid "Define expense account for this product: \"%s\" (id:%d)."
msgstr ""
@@ -655,8 +648,8 @@ msgid "It indicates that a picking has been done"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:565
-#: code:addons/purchase/purchase.py:572
+#: code:addons/purchase/purchase.py:579
+#: code:addons/purchase/purchase.py:586
#, python-format
msgid "Unable to cancel this purchase order."
msgstr ""
@@ -719,6 +712,15 @@ msgid "Draft PO"
msgstr ""
#. module: purchase
+#: code:addons/purchase/purchase.py:941
+#: code:addons/purchase/purchase.py:956
+#: code:addons/purchase/purchase.py:960
+#: code:addons/purchase/wizard/purchase_order_group.py:47
+#, python-format
+msgid "Warning!"
+msgstr ""
+
+#. module: purchase
#: model:process.node,name:purchase.process_node_draftpurchaseorder0
#: model:process.node,name:purchase.process_node_draftpurchaseorder1
msgid "RFQ"
@@ -750,6 +752,11 @@ msgid "The tax amount"
msgstr ""
#. module: purchase
+#: field:purchase.order,shipped_rate:0
+msgid "Received Ratio"
+msgstr ""
+
+#. module: purchase
#: selection:purchase.report,month:0
msgid "September"
msgstr "Tháng Chín"
@@ -781,7 +788,7 @@ msgid "Stock Moves"
msgstr "Dịch chuyển hàng tồn kho"
#. module: purchase
-#: code:addons/purchase/purchase.py:1158
+#: code:addons/purchase/purchase.py:1156
#, python-format
msgid "Draft Purchase Order created"
msgstr ""
@@ -802,11 +809,6 @@ msgid "Terms and Conditions"
msgstr ""
#. module: purchase
-#: field:purchase.order,currency_id:0
-msgid "unknown"
-msgstr ""
-
-#. module: purchase
#: help:purchase.order,date_order:0
msgid "Date on which this document has been created."
msgstr ""
@@ -900,12 +902,6 @@ msgid "Cancel"
msgstr "Hủy bỏ"
#. module: purchase
-#: field:purchase.order,message_comment_ids:0
-#: help:purchase.order,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
-#. module: purchase
#: sql_constraint:purchase.order:0
msgid "Order Reference must be unique per Company!"
msgstr ""
@@ -939,14 +935,89 @@ msgid "Date Approved"
msgstr "Ngày được chấp thuận"
#. module: purchase
-#: code:addons/purchase/purchase.py:806
-#, python-format
-msgid "Request for quotation <b>created</b>."
+#: view:product.product:0
+msgid "a draft purchase order"
msgstr ""
#. module: purchase
-#: view:product.product:0
-msgid "a draft purchase order"
+#: model:email.template,body_html:purchase.email_template_edi_purchase
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: #FFF; \">\n"
+"\n"
+" <p>Hello$ ${object.partner_id.name},</p>\n"
+" \n"
+" <p>Here is a ${object.state in ('draft', 'sent') and 'request for "
+"quotation' or 'purchase order confirmation'} from ${object.company_id.name}: "
+"</p>\n"
+" \n"
+" <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
+" &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
+" &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
+" &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
+"${object.pricelist_id.currency_id.name}</strong><br />\n"
+" &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
+" % if object.origin:\n"
+" &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
+" % endif\n"
+" % if object.partner_ref:\n"
+" &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
+" % endif\n"
+" % if object.validator:\n"
+" &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.validator.email "
+"or ''}?subject=Order%20${object.name}\">${object.validator.name}</a>\n"
+" % endif\n"
+" </p>\n"
+"\n"
+" <br/>\n"
+" <p>If you have any question, do not hesitate to contact us.</p>\n"
+" <p>Thank you!</p>\n"
+" <br/>\n"
+" <br/>\n"
+" <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
+"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
+"background-repeat: repeat no-repeat;\">\n"
+" <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
+"#DDD;\">\n"
+" <strong style=\"text-"
+"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
+" </div>\n"
+" <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
+"16px; background-color: #F2F2F2;\">\n"
+" <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
+" % if object.company_id.street:\n"
+" ${object.company_id.street}<br/>\n"
+" % endif\n"
+" % if object.company_id.street2:\n"
+" ${object.company_id.street2}<br/>\n"
+" % endif\n"
+" % if object.company_id.city or object.company_id.zip:\n"
+" ${object.company_id.zip} ${object.company_id.city}<br/>\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 ''}<br/>\n"
+" % endif\n"
+" </span>\n"
+" % if object.company_id.phone:\n"
+" <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
+"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
+"0px; padding-left: 0px; \">\n"
+" Phone:&nbsp; ${object.company_id.phone}\n"
+" </div>\n"
+" % endif\n"
+" % if object.company_id.website:\n"
+" <div>\n"
+" Web :&nbsp;<a "
+"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
+" </div>\n"
+" %endif\n"
+" <p></p>\n"
+" </div>\n"
+"</div>\n"
+" "
msgstr ""
#. module: purchase
@@ -986,17 +1057,12 @@ msgid "Outgoing Mails"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:437
+#: code:addons/purchase/purchase.py:456
#, python-format
msgid "You cannot confirm a purchase order without any purchase order line."
msgstr ""
#. module: purchase
-#: model:ir.actions.server,name:purchase.actions_server_purchase_order_unread
-msgid "Purchase: Mark unread"
-msgstr ""
-
-#. module: purchase
#: help:purchase.order,message_ids:0
msgid "Messages and communication history"
msgstr ""
@@ -1008,7 +1074,7 @@ msgid "Destination Warehouse"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:973
+#: code:addons/purchase/purchase.py:941
#, python-format
msgid ""
"Selected Unit of Measure does not belong to the same category as the product "
@@ -1016,6 +1082,11 @@ msgid ""
msgstr ""
#. module: purchase
+#: view:purchase.order.line_invoice:0
+msgid "Select an Open Sales Order"
+msgstr ""
+
+#. module: purchase
#: model:ir.ui.menu,name:purchase.menu_purchase_unit_measure_purchase
#: model:ir.ui.menu,name:purchase.menu_purchase_uom_form_action
msgid "Units of Measure"
@@ -1027,18 +1098,12 @@ msgid "Manage pricelist per supplier"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:833
-#, python-format
-msgid "Purchase Order has been set to <b>draft</b>."
-msgstr ""
-
-#. module: purchase
#: view:board.board:0
msgid "Purchase Dashboard"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:566
+#: code:addons/purchase/purchase.py:580
#, python-format
msgid "First cancel all receptions related to this purchase order."
msgstr ""
@@ -1077,8 +1142,8 @@ msgid "Unread Messages"
msgstr ""
#. module: purchase
-#: view:purchase.order.line_invoice:0
-msgid "Select an Open Sale Order"
+#: model:ir.ui.menu,name:purchase.menu_purchase_uom_categ_form_action
+msgid "Unit of Measure Categories"
msgstr ""
#. module: purchase
@@ -1087,6 +1152,13 @@ msgid "Set to Draft"
msgstr ""
#. module: purchase
+#: help:purchase.order,origin:0
+msgid ""
+"Reference of the document that generated this purchase order request; a "
+"sales order or an internal procurement request."
+msgstr ""
+
+#. module: purchase
#: view:purchase.order.line:0
msgid "Notes"
msgstr "Ghi chú"
@@ -1116,7 +1188,7 @@ msgid "Stock Move"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:255
+#: code:addons/purchase/purchase.py:260
#, python-format
msgid "Invalid Action!"
msgstr ""
@@ -1215,7 +1287,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:310
+#: code:addons/purchase/purchase.py:320
#, python-format
msgid "Please create Invoices."
msgstr ""
@@ -1305,7 +1377,7 @@ msgid "Purchase Order Line Make Invoice"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1133
+#: code:addons/purchase/purchase.py:1141
#, python-format
msgid "PO: %s"
msgstr ""
@@ -1316,7 +1388,7 @@ msgid "Send by EMail"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:498
+#: code:addons/purchase/purchase.py:515
#, python-format
msgid "Define purchase journal for this company: \"%s\" (id:%d)."
msgstr ""
@@ -1327,8 +1399,8 @@ msgid "Purchase Order "
msgstr ""
#. module: purchase
-#: view:purchase.order.line:0
-msgid "Manual Invoices"
+#: help:purchase.config.settings,group_costing_method:0
+msgid "Allows you to compute product cost price based on average cost."
msgstr ""
#. module: purchase
@@ -1483,8 +1555,8 @@ msgid "Compute product cost price based on average cost"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:340
-#: code:addons/purchase/wizard/purchase_line_invoice.py:141
+#: code:addons/purchase/purchase.py:350
+#: code:addons/purchase/wizard/purchase_line_invoice.py:137
#: model:ir.actions.act_window,name:purchase.act_res_partner_2_supplier_invoices
#: view:res.partner:0
#, python-format
@@ -1596,8 +1668,9 @@ msgid "Open Purchase Menu"
msgstr ""
#. module: purchase
-#: model:ir.model,name:purchase.model_mail_compose_message
-msgid "Email composition wizard"
+#: code:addons/purchase/purchase.py:1028
+#, python-format
+msgid "No address defined for the supplier"
msgstr ""
#. module: purchase
@@ -1668,11 +1741,11 @@ msgid "Purchase Order"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:310
-#: code:addons/purchase/purchase.py:437
-#: code:addons/purchase/purchase.py:497
-#: code:addons/purchase/purchase.py:508
-#: code:addons/purchase/wizard/purchase_line_invoice.py:109
+#: code:addons/purchase/purchase.py:320
+#: code:addons/purchase/purchase.py:456
+#: code:addons/purchase/purchase.py:514
+#: code:addons/purchase/purchase.py:525
+#: code:addons/purchase/wizard/purchase_line_invoice.py:105
#, python-format
msgid "Error!"
msgstr ""
@@ -1694,13 +1767,6 @@ msgid ""
msgstr ""
#. module: purchase
-#: model:process.transition,note:purchase.process_transition_packinginvoice0
-msgid ""
-"A Pick list generates an invoice. Depending on the Invoicing control of the "
-"sale order, the invoice is based on delivered or on ordered quantities."
-msgstr ""
-
-#. module: purchase
#: selection:purchase.order,state:0
#: selection:purchase.order.line,state:0
#: selection:purchase.report,state:0
@@ -1713,9 +1779,8 @@ msgid "# of Purchase Order"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:827
-#, python-format
-msgid "Shipment <b>received</b>."
+#: model:ir.model,name:purchase.model_mail_compose_message
+msgid "Email composition wizard"
msgstr ""
#. module: purchase
@@ -1799,7 +1864,7 @@ msgid "RFQ_${(object.name or '').replace('/','_')}"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:988
+#: code:addons/purchase/purchase.py:956
#, python-format
msgid "The selected supplier only sells this product by %s"
msgstr ""
@@ -1845,6 +1910,12 @@ msgid "Outgoing products to invoice"
msgstr ""
#. module: purchase
+#: report:purchase.order:0
+#: field:purchase.report,validator:0
+msgid "Validated By"
+msgstr ""
+
+#. module: purchase
#: view:purchase.report:0
#: field:purchase.report,delay_pass:0
msgid "Days to Deliver"
@@ -1934,8 +2005,8 @@ msgid "November"
msgstr "Tháng Mười một"
#. module: purchase
-#: help:purchase.config.settings,group_costing_method:0
-msgid "Allows you to compute product cost price based on average cost."
+#: view:purchase.order.line:0
+msgid "Manual Invoices"
msgstr ""
#. module: purchase
@@ -1959,13 +2030,6 @@ msgid ""
msgstr ""
#. module: purchase
-#: help:purchase.order,origin:0
-msgid ""
-"Reference of the document that generated this purchase order request; a sale "
-"order or an internal procurement request."
-msgstr ""
-
-#. module: purchase
#: model:ir.ui.menu,name:purchase.menu_partner_categories_in_form
msgid "Partner Categories"
msgstr ""
@@ -1986,89 +2050,6 @@ msgid "Invoicing Settings"
msgstr ""
#. module: purchase
-#: model:email.template,body_html:purchase.email_template_edi_purchase
-msgid ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"\n"
-" <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
-"or ''},</p>\n"
-" \n"
-" <p>Here is a ${object.state in ('draft', 'sent') and 'request for "
-"quotation' or 'purchase order confirmation'} from ${object.company_id.name}: "
-"</p>\n"
-" \n"
-" <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
-" &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
-" &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
-" &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
-"${object.pricelist_id.currency_id.name}</strong><br />\n"
-" &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
-" % if object.origin:\n"
-" &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
-" % endif\n"
-" % if object.partner_ref:\n"
-" &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
-" % endif\n"
-" % if object.validator:\n"
-" &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.validator.email "
-"or ''}?subject=Order%20${object.name}\">${object.validator.name}</a>\n"
-" % endif\n"
-" </p>\n"
-"\n"
-" <br/>\n"
-" <p>If you have any question, do not hesitate to contact us.</p>\n"
-" <p>Thank you!</p>\n"
-" <br/>\n"
-" <br/>\n"
-" <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
-"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
-"background-repeat: repeat no-repeat;\">\n"
-" <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
-"#FFF;\">\n"
-" <strong style=\"text-"
-"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
-" </div>\n"
-" <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
-"16px; background-color: #F2F2F2;\">\n"
-" <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
-" % if object.company_id.street:\n"
-" ${object.company_id.street}<br/>\n"
-" % endif\n"
-" % if object.company_id.street2:\n"
-" ${object.company_id.street2}<br/>\n"
-" % endif\n"
-" % if object.company_id.city or object.company_id.zip:\n"
-" ${object.company_id.zip} ${object.company_id.city}<br/>\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 ''}<br/>\n"
-" % endif\n"
-" </span>\n"
-" % if object.company_id.phone:\n"
-" <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
-"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
-"0px; padding-left: 0px; \">\n"
-" Phone:&nbsp; ${object.company_id.phone}\n"
-" </div>\n"
-" % endif\n"
-" % if object.company_id.website:\n"
-" <div>\n"
-" Web :&nbsp;<a "
-"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
-" </div>\n"
-" %endif\n"
-" <p></p>\n"
-" </div>\n"
-"</div>\n"
-" "
-msgstr ""
-
-#. module: purchase
#: model:ir.actions.act_window,name:purchase.action_purchase_order_by_user_all
msgid "Total Orders by User per month"
msgstr ""
@@ -2079,21 +2060,19 @@ msgid "Based on incoming shipments"
msgstr ""
#. module: purchase
+#: code:addons/purchase/purchase.py:1018
+#, python-format
+msgid "No default supplier defined for this product"
+msgstr ""
+
+#. module: purchase
#: view:purchase.report:0
#: field:purchase.report,warehouse_id:0
msgid "Warehouse"
msgstr "Kho hàng"
#. module: purchase
-#: help:purchase.order,partner_ref:0
-msgid ""
-"Reference of the sale order or quotation sent by your supplier. It's mainly "
-"used to do the matching when you receive the products as this reference is "
-"usually written on the delivery order sent by your supplier."
-msgstr ""
-
-#. module: purchase
-#: code:addons/purchase/purchase.py:991
+#: code:addons/purchase/purchase.py:960
#, python-format
msgid ""
"The selected supplier has a minimal quantity set to %s %s, you should not "
@@ -2166,8 +2145,8 @@ msgid ""
msgstr ""
#. module: purchase
-#: view:product.product:0
-msgid "When you sell this service to a customer,"
+#: field:purchase.order,message_summary:0
+msgid "Summary"
msgstr ""
#. module: purchase
@@ -2177,6 +2156,11 @@ msgid "Pricelist Versions"
msgstr ""
#. module: purchase
+#: field:purchase.order,payment_term_id:0
+msgid "Payment Term"
+msgstr ""
+
+#. module: purchase
#: view:purchase.order:0
msgid "Purchase orders which are in draft state"
msgstr ""
diff --git a/addons/purchase/i18n/zh_CN.po b/addons/purchase/i18n/zh_CN.po
index f3e350c96ab..5b4c6380a9b 100644
--- a/addons/purchase/i18n/zh_CN.po
+++ b/addons/purchase/i18n/zh_CN.po
@@ -6,15 +6,15 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
"PO-Revision-Date: 2012-11-28 11:54+0000\n"
"Last-Translator: ccdos <ccdos@163.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: 2012-12-04 05:12+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:20+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
#. module: purchase
#: model:res.groups,name:purchase.group_analytic_accounting
@@ -60,11 +60,6 @@ msgid ""
msgstr "价格表设定采购订单使用的币别。它还决定选定产品/数量的供应商价格。"
#. module: purchase
-#: model:ir.actions.server,name:purchase.actions_server_purchase_order_read
-msgid "Purchase: Mark read"
-msgstr ""
-
-#. module: purchase
#: view:purchase.report:0
#: field:purchase.report,day:0
msgid "Day"
@@ -105,16 +100,13 @@ msgid ""
msgstr "保留复杂的摘要(消息数量,……等)。为了插入到看板视图,这一摘要直接是是HTML格式。"
#. module: purchase
-#: code:addons/purchase/purchase.py:973
-#: code:addons/purchase/purchase.py:988
-#: code:addons/purchase/purchase.py:991
-#: code:addons/purchase/wizard/purchase_order_group.py:47
+#: code:addons/purchase/purchase.py:1024
#, python-format
-msgid "Warning!"
-msgstr "警告!"
+msgid "Configuration Error!"
+msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:573
+#: code:addons/purchase/purchase.py:587
#, python-format
msgid "You must first cancel all receptions related to this purchase order."
msgstr "你必须首先这个采购订单相关的所有收货单。"
@@ -131,10 +123,10 @@ msgid "Purchase-Standard Price"
msgstr "采购 - 标准单价"
#. module: purchase
-#: report:purchase.order:0
-#: field:purchase.report,validator:0
-msgid "Validated By"
-msgstr "审核人"
+#: code:addons/purchase/purchase.py:1011
+#, python-format
+msgid "No supplier defined for this product !"
+msgstr ""
#. module: purchase
#: model:ir.actions.act_window,help:purchase.action_picking_tree4_picking_to_invoice
@@ -162,12 +154,6 @@ msgid "Average Price"
msgstr "均价"
#. module: purchase
-#: code:addons/purchase/purchase.py:830
-#, python-format
-msgid "Invoice <b>paid</b>."
-msgstr "发票 <b>已经支付</b>."
-
-#. module: purchase
#: view:purchase.order:0
msgid "Purchase order which are in the exception state"
msgstr "处于异常状态的采购单"
@@ -237,7 +223,7 @@ msgid ""
msgstr "计算所有采购订单明细产品的最小计划日期"
#. module: purchase
-#: code:addons/purchase/purchase.py:255
+#: code:addons/purchase/purchase.py:260
#, python-format
msgid "In order to delete a purchase order, you must cancel it first."
msgstr "要删除采购订单,你必须先取消它"
@@ -263,29 +249,12 @@ msgid "Total Untaxed amount"
msgstr "总未完税金额"
#. module: purchase
-#: model:ir.ui.menu,name:purchase.menu_purchase_uom_categ_form_action
-msgid "Unit of Measure Categories"
-msgstr "计量单位类别"
-
-#. module: purchase
#: view:purchase.report:0
#: field:purchase.report,category_id:0
msgid "Category"
msgstr "分类"
#. module: purchase
-#: view:purchase.order:0
-msgid "Quotation "
-msgstr "报价单 "
-
-#. module: purchase
-#: code:addons/purchase/purchase.py:810
-#, python-format
-msgid ""
-"Quotation for <em>%s</em> <b>converted</b> to a Purchase Order of %s %s."
-msgstr "报价单 <em>%s</em> <b>被转换为</b> 采购订单 %s %s."
-
-#. module: purchase
#: model:process.transition,note:purchase.process_transition_purchaseinvoice0
msgid ""
"A purchase order generates a supplier invoice, as soon as it is confirmed by "
@@ -359,15 +328,17 @@ msgid "October"
msgstr "10月"
#. module: purchase
-#: code:addons/purchase/purchase.py:837
+#: code:addons/purchase/purchase.py:1024
#, python-format
-msgid "Purchase Order for <em>%s</em> <b>cancelled</b>."
-msgstr "采购订单r <em>%s</em> <b>被取消</b>."
+msgid ""
+"The product \"%s\" has been defined with your company as reseller which "
+"seems to be a configuration error!"
+msgstr ""
#. module: purchase
-#: field:purchase.order,message_summary:0
-msgid "Summary"
-msgstr "摘要"
+#: view:product.product:0
+msgid "When you sell this service to a customer,"
+msgstr "当你卖 服务给客户时"
#. module: purchase
#: model:process.transition,note:purchase.process_transition_createpackinglist0
@@ -395,12 +366,6 @@ msgid "Quantity"
msgstr "数量"
#. module: purchase
-#: code:addons/purchase/purchase.py:819
-#, python-format
-msgid "Shipment <em>%s</em> <b>scheduled</b> for %s."
-msgstr "发运 <em>%s</em> <b>已排程</b> 为%s."
-
-#. module: purchase
#: field:purchase.order,fiscal_position:0
msgid "Fiscal Position"
msgstr "财务结构"
@@ -465,12 +430,6 @@ msgid ""
msgstr "如果你要直接从供应商发货给给客户,输入一个地址。否则,发给你自己公司的时候,留空。"
#. module: purchase
-#: code:addons/purchase/purchase.py:824
-#, python-format
-msgid "Draft Invoice of %s %s is <b>waiting for validation</b>."
-msgstr "发票草稿 %s %s is <b>等待核准</b>."
-
-#. module: purchase
#: model:ir.actions.act_window,help:purchase.purchase_line_form_action2
msgid ""
"<p>\n"
@@ -493,6 +452,11 @@ msgid "Scheduled Date"
msgstr "计划日期"
#. module: purchase
+#: field:purchase.order,currency_id:0
+msgid "Currency"
+msgstr ""
+
+#. module: purchase
#: field:purchase.order,journal_id:0
msgid "Journal"
msgstr "凭证簿"
@@ -525,6 +489,19 @@ msgid "Incoming Products"
msgstr "入库产品"
#. module: purchase
+#: view:purchase.order:0
+msgid "Request for Quotation "
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,partner_ref:0
+msgid ""
+"Reference of the sales order or quotation sent by your supplier. It's mainly "
+"used to do the matching when you receive the products as this reference is "
+"usually written on the delivery order sent by your supplier."
+msgstr ""
+
+#. module: purchase
#: view:purchase.config.settings:0
#: view:purchase.order.group:0
#: view:purchase.order.line_invoice:0
@@ -545,6 +522,11 @@ msgid ""
msgstr "如果采购订单的发票控制是“来自订单”发票是自动生成。发票也可以由会计人员手动产生(发票控制 = 手动)"
#. module: purchase
+#: model:mail.message.subtype,name:purchase.mt_rfq_approved
+msgid "RFQ Approved"
+msgstr ""
+
+#. module: purchase
#: view:purchase.config.settings:0
msgid "Apply"
msgstr "接受"
@@ -562,6 +544,11 @@ msgid ""
msgstr "询价单(RFQ) 必须先得到采购经理审批后才能发给供应商。 询价单能确认为采购订单。"
#. module: purchase
+#: model:mail.message.subtype,name:purchase.mt_rfq_confirmed
+msgid "RFQ Confirmed"
+msgstr ""
+
+#. module: purchase
#: view:purchase.order:0
msgid "Customer Address"
msgstr "客户地址"
@@ -586,7 +573,7 @@ msgid "Supplier"
msgstr "供应商"
#. module: purchase
-#: code:addons/purchase/purchase.py:508
+#: code:addons/purchase/purchase.py:525
#, python-format
msgid "Define expense account for this company: \"%s\" (id:%d)."
msgstr "定义这个公司的费用科目: \"%s\" (id:%d)."
@@ -610,7 +597,6 @@ msgstr "小计"
#. module: purchase
#: field:purchase.order,shipped:0
-#: field:purchase.order,shipped_rate:0
msgid "Received"
msgstr "已接收"
@@ -660,13 +646,20 @@ msgid "Invoices and Receptions"
msgstr "发票和入库单"
#. module: purchase
+#: model:process.transition,note:purchase.process_transition_packinginvoice0
+msgid ""
+"A Pick list generates an invoice. Depending on the Invoicing control of the "
+"sales order, the invoice is based on delivered or on ordered quantities."
+msgstr ""
+
+#. module: purchase
#: view:purchase.report:0
#: field:purchase.report,nbr:0
msgid "# of Lines"
msgstr "# 明细"
#. module: purchase
-#: code:addons/purchase/wizard/purchase_line_invoice.py:110
+#: code:addons/purchase/wizard/purchase_line_invoice.py:106
#, python-format
msgid "Define expense account for this product: \"%s\" (id:%d)."
msgstr "为产品: \"%s\" (id:%d) 定义费用科目。"
@@ -687,8 +680,8 @@ msgid "It indicates that a picking has been done"
msgstr "这表示装箱单已完成"
#. module: purchase
-#: code:addons/purchase/purchase.py:565
-#: code:addons/purchase/purchase.py:572
+#: code:addons/purchase/purchase.py:579
+#: code:addons/purchase/purchase.py:586
#, python-format
msgid "Unable to cancel this purchase order."
msgstr "不能取消这个采购订单"
@@ -751,6 +744,15 @@ msgid "Draft PO"
msgstr "采购订单草稿"
#. module: purchase
+#: code:addons/purchase/purchase.py:941
+#: code:addons/purchase/purchase.py:956
+#: code:addons/purchase/purchase.py:960
+#: code:addons/purchase/wizard/purchase_order_group.py:47
+#, python-format
+msgid "Warning!"
+msgstr "警告!"
+
+#. module: purchase
#: model:process.node,name:purchase.process_node_draftpurchaseorder0
#: model:process.node,name:purchase.process_node_draftpurchaseorder1
msgid "RFQ"
@@ -782,6 +784,11 @@ msgid "The tax amount"
msgstr "税金"
#. module: purchase
+#: field:purchase.order,shipped_rate:0
+msgid "Received Ratio"
+msgstr ""
+
+#. module: purchase
#: selection:purchase.report,month:0
msgid "September"
msgstr "9月"
@@ -813,7 +820,7 @@ msgid "Stock Moves"
msgstr "库存调拨"
#. module: purchase
-#: code:addons/purchase/purchase.py:1158
+#: code:addons/purchase/purchase.py:1156
#, python-format
msgid "Draft Purchase Order created"
msgstr "采购单草稿被创建"
@@ -834,11 +841,6 @@ msgid "Terms and Conditions"
msgstr "条款和条件"
#. module: purchase
-#: field:purchase.order,currency_id:0
-msgid "unknown"
-msgstr "未知"
-
-#. module: purchase
#: help:purchase.order,date_order:0
msgid "Date on which this document has been created."
msgstr "单据的创建日期"
@@ -932,12 +934,6 @@ msgid "Cancel"
msgstr "取消"
#. module: purchase
-#: field:purchase.order,message_comment_ids:0
-#: help:purchase.order,message_comment_ids:0
-msgid "Comments and emails"
-msgstr "评论和电子邮件"
-
-#. module: purchase
#: sql_constraint:purchase.order:0
msgid "Order Reference must be unique per Company!"
msgstr "采购订单号必须在一个公司范围内唯一"
@@ -971,17 +967,92 @@ msgid "Date Approved"
msgstr "审批日期"
#. module: purchase
-#: code:addons/purchase/purchase.py:806
-#, python-format
-msgid "Request for quotation <b>created</b>."
-msgstr "询价单<b>被创建</b>."
-
-#. module: purchase
#: view:product.product:0
msgid "a draft purchase order"
msgstr "一个采购订单草稿"
#. module: purchase
+#: model:email.template,body_html:purchase.email_template_edi_purchase
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: #FFF; \">\n"
+"\n"
+" <p>Hello$ ${object.partner_id.name},</p>\n"
+" \n"
+" <p>Here is a ${object.state in ('draft', 'sent') and 'request for "
+"quotation' or 'purchase order confirmation'} from ${object.company_id.name}: "
+"</p>\n"
+" \n"
+" <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
+" &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
+" &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
+" &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
+"${object.pricelist_id.currency_id.name}</strong><br />\n"
+" &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
+" % if object.origin:\n"
+" &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
+" % endif\n"
+" % if object.partner_ref:\n"
+" &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
+" % endif\n"
+" % if object.validator:\n"
+" &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.validator.email "
+"or ''}?subject=Order%20${object.name}\">${object.validator.name}</a>\n"
+" % endif\n"
+" </p>\n"
+"\n"
+" <br/>\n"
+" <p>If you have any question, do not hesitate to contact us.</p>\n"
+" <p>Thank you!</p>\n"
+" <br/>\n"
+" <br/>\n"
+" <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
+"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
+"background-repeat: repeat no-repeat;\">\n"
+" <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
+"#DDD;\">\n"
+" <strong style=\"text-"
+"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
+" </div>\n"
+" <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
+"16px; background-color: #F2F2F2;\">\n"
+" <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
+" % if object.company_id.street:\n"
+" ${object.company_id.street}<br/>\n"
+" % endif\n"
+" % if object.company_id.street2:\n"
+" ${object.company_id.street2}<br/>\n"
+" % endif\n"
+" % if object.company_id.city or object.company_id.zip:\n"
+" ${object.company_id.zip} ${object.company_id.city}<br/>\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 ''}<br/>\n"
+" % endif\n"
+" </span>\n"
+" % if object.company_id.phone:\n"
+" <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
+"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
+"0px; padding-left: 0px; \">\n"
+" Phone:&nbsp; ${object.company_id.phone}\n"
+" </div>\n"
+" % endif\n"
+" % if object.company_id.website:\n"
+" <div>\n"
+" Web :&nbsp;<a "
+"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
+" </div>\n"
+" %endif\n"
+" <p></p>\n"
+" </div>\n"
+"</div>\n"
+" "
+msgstr ""
+
+#. module: purchase
#: view:purchase.report:0
msgid "Order of Year"
msgstr "本年的订单"
@@ -1018,17 +1089,12 @@ msgid "Outgoing Mails"
msgstr "发出邮件"
#. module: purchase
-#: code:addons/purchase/purchase.py:437
+#: code:addons/purchase/purchase.py:456
#, python-format
msgid "You cannot confirm a purchase order without any purchase order line."
msgstr "你不能确认没有任何明细的采购订单"
#. module: purchase
-#: model:ir.actions.server,name:purchase.actions_server_purchase_order_unread
-msgid "Purchase: Mark unread"
-msgstr ""
-
-#. module: purchase
#: help:purchase.order,message_ids:0
msgid "Messages and communication history"
msgstr "消息和通信历史"
@@ -1040,7 +1106,7 @@ msgid "Destination Warehouse"
msgstr "目标仓库"
#. module: purchase
-#: code:addons/purchase/purchase.py:973
+#: code:addons/purchase/purchase.py:941
#, python-format
msgid ""
"Selected Unit of Measure does not belong to the same category as the product "
@@ -1048,6 +1114,11 @@ msgid ""
msgstr "选择的计量单位不属于产品的计量单位相同的分类。"
#. module: purchase
+#: view:purchase.order.line_invoice:0
+msgid "Select an Open Sales Order"
+msgstr ""
+
+#. module: purchase
#: model:ir.ui.menu,name:purchase.menu_purchase_unit_measure_purchase
#: model:ir.ui.menu,name:purchase.menu_purchase_uom_form_action
msgid "Units of Measure"
@@ -1059,18 +1130,12 @@ msgid "Manage pricelist per supplier"
msgstr "管理每个供应商的价格表"
#. module: purchase
-#: code:addons/purchase/purchase.py:833
-#, python-format
-msgid "Purchase Order has been set to <b>draft</b>."
-msgstr "采购订单被设置为“草稿”"
-
-#. module: purchase
#: view:board.board:0
msgid "Purchase Dashboard"
msgstr "采购控制台"
#. module: purchase
-#: code:addons/purchase/purchase.py:566
+#: code:addons/purchase/purchase.py:580
#, python-format
msgid "First cancel all receptions related to this purchase order."
msgstr "首先取消这个采购订单相关的入库单"
@@ -1109,9 +1174,9 @@ msgid "Unread Messages"
msgstr "未读信息"
#. module: purchase
-#: view:purchase.order.line_invoice:0
-msgid "Select an Open Sale Order"
-msgstr "选择待处理的销售订单"
+#: model:ir.ui.menu,name:purchase.menu_purchase_uom_categ_form_action
+msgid "Unit of Measure Categories"
+msgstr "计量单位类别"
#. module: purchase
#: view:purchase.order:0
@@ -1119,6 +1184,13 @@ msgid "Set to Draft"
msgstr "设为草稿"
#. module: purchase
+#: help:purchase.order,origin:0
+msgid ""
+"Reference of the document that generated this purchase order request; a "
+"sales order or an internal procurement request."
+msgstr ""
+
+#. module: purchase
#: view:purchase.order.line:0
msgid "Notes"
msgstr "备注"
@@ -1148,7 +1220,7 @@ msgid "Stock Move"
msgstr "库存调拨"
#. module: purchase
-#: code:addons/purchase/purchase.py:255
+#: code:addons/purchase/purchase.py:260
#, python-format
msgid "Invalid Action!"
msgstr "非法的动作"
@@ -1247,7 +1319,7 @@ msgid ""
msgstr "一个草稿"
#. module: purchase
-#: code:addons/purchase/purchase.py:310
+#: code:addons/purchase/purchase.py:320
#, python-format
msgid "Please create Invoices."
msgstr "请创建发票"
@@ -1344,7 +1416,7 @@ msgid "Purchase Order Line Make Invoice"
msgstr "采购订单明细生成发票"
#. module: purchase
-#: code:addons/purchase/purchase.py:1133
+#: code:addons/purchase/purchase.py:1141
#, python-format
msgid "PO: %s"
msgstr "PO: %s"
@@ -1355,7 +1427,7 @@ msgid "Send by EMail"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:498
+#: code:addons/purchase/purchase.py:515
#, python-format
msgid "Define purchase journal for this company: \"%s\" (id:%d)."
msgstr "为公司 \"%s\" (id:%d) 定义采购账簿。"
@@ -1366,9 +1438,9 @@ msgid "Purchase Order "
msgstr "采购订单 "
#. module: purchase
-#: view:purchase.order.line:0
-msgid "Manual Invoices"
-msgstr "手工发票"
+#: help:purchase.config.settings,group_costing_method:0
+msgid "Allows you to compute product cost price based on average cost."
+msgstr "允许你基于平均成本计算产品成本"
#. module: purchase
#: model:ir.actions.act_window,name:purchase.action_purchase_configuration
@@ -1531,8 +1603,8 @@ msgid "Compute product cost price based on average cost"
msgstr "基于平均成本计算产品成本"
#. module: purchase
-#: code:addons/purchase/purchase.py:340
-#: code:addons/purchase/wizard/purchase_line_invoice.py:141
+#: code:addons/purchase/purchase.py:350
+#: code:addons/purchase/wizard/purchase_line_invoice.py:137
#: model:ir.actions.act_window,name:purchase.act_res_partner_2_supplier_invoices
#: view:res.partner:0
#, python-format
@@ -1650,8 +1722,9 @@ msgid "Open Purchase Menu"
msgstr "打开采购菜单"
#. module: purchase
-#: model:ir.model,name:purchase.model_mail_compose_message
-msgid "Email composition wizard"
+#: code:addons/purchase/purchase.py:1028
+#, python-format
+msgid "No address defined for the supplier"
msgstr ""
#. module: purchase
@@ -1722,11 +1795,11 @@ msgid "Purchase Order"
msgstr "采购订单"
#. module: purchase
-#: code:addons/purchase/purchase.py:310
-#: code:addons/purchase/purchase.py:437
-#: code:addons/purchase/purchase.py:497
-#: code:addons/purchase/purchase.py:508
-#: code:addons/purchase/wizard/purchase_line_invoice.py:109
+#: code:addons/purchase/purchase.py:320
+#: code:addons/purchase/purchase.py:456
+#: code:addons/purchase/purchase.py:514
+#: code:addons/purchase/purchase.py:525
+#: code:addons/purchase/wizard/purchase_line_invoice.py:105
#, python-format
msgid "Error!"
msgstr "错误!"
@@ -1754,13 +1827,6 @@ msgstr ""
"如果在开票或者收货过程中出现了 “取消”操作,状态变成了“异常”。"
#. module: purchase
-#: model:process.transition,note:purchase.process_transition_packinginvoice0
-msgid ""
-"A Pick list generates an invoice. Depending on the Invoicing control of the "
-"sale order, the invoice is based on delivered or on ordered quantities."
-msgstr "装箱单生成发票,依据销售订单控制生成的发票,发票是基于已收货或已经下单的数量。"
-
-#. module: purchase
#: selection:purchase.order,state:0
#: selection:purchase.order.line,state:0
#: selection:purchase.report,state:0
@@ -1773,10 +1839,9 @@ msgid "# of Purchase Order"
msgstr "采购订单号"
#. module: purchase
-#: code:addons/purchase/purchase.py:827
-#, python-format
-msgid "Shipment <b>received</b>."
-msgstr "装运货物 <b>已经收到</b>."
+#: model:ir.model,name:purchase.model_mail_compose_message
+msgid "Email composition wizard"
+msgstr ""
#. module: purchase
#: report:purchase.quotation:0
@@ -1861,7 +1926,7 @@ msgid "RFQ_${(object.name or '').replace('/','_')}"
msgstr "RFQ_${(object.name or '').replace('/','_')}"
#. module: purchase
-#: code:addons/purchase/purchase.py:988
+#: code:addons/purchase/purchase.py:956
#, python-format
msgid "The selected supplier only sells this product by %s"
msgstr "选择的供应商只销售这产品 %s"
@@ -1909,6 +1974,12 @@ msgid "Outgoing products to invoice"
msgstr "出仓产品要开发票"
#. module: purchase
+#: report:purchase.order:0
+#: field:purchase.report,validator:0
+msgid "Validated By"
+msgstr "审核人"
+
+#. module: purchase
#: view:purchase.report:0
#: field:purchase.report,delay_pass:0
msgid "Days to Deliver"
@@ -1998,9 +2069,9 @@ msgid "November"
msgstr "11月"
#. module: purchase
-#: help:purchase.config.settings,group_costing_method:0
-msgid "Allows you to compute product cost price based on average cost."
-msgstr "允许你基于平均成本计算产品成本"
+#: view:purchase.order.line:0
+msgid "Manual Invoices"
+msgstr "手工发票"
#. module: purchase
#: report:purchase.order:0
@@ -2026,13 +2097,6 @@ msgstr ""
"基于收货: 收货后根据收货手动开票"
#. module: purchase
-#: help:purchase.order,origin:0
-msgid ""
-"Reference of the document that generated this purchase order request; a sale "
-"order or an internal procurement request."
-msgstr "生成这张采购订单需求、销售订单或内部请购的单据参考号。"
-
-#. module: purchase
#: model:ir.ui.menu,name:purchase.menu_partner_categories_in_form
msgid "Partner Categories"
msgstr "业务伙伴分类"
@@ -2053,89 +2117,6 @@ msgid "Invoicing Settings"
msgstr "开票设置"
#. module: purchase
-#: model:email.template,body_html:purchase.email_template_edi_purchase
-msgid ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"\n"
-" <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
-"or ''},</p>\n"
-" \n"
-" <p>Here is a ${object.state in ('draft', 'sent') and 'request for "
-"quotation' or 'purchase order confirmation'} from ${object.company_id.name}: "
-"</p>\n"
-" \n"
-" <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
-" &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
-" &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
-" &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
-"${object.pricelist_id.currency_id.name}</strong><br />\n"
-" &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
-" % if object.origin:\n"
-" &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
-" % endif\n"
-" % if object.partner_ref:\n"
-" &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
-" % endif\n"
-" % if object.validator:\n"
-" &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.validator.email "
-"or ''}?subject=Order%20${object.name}\">${object.validator.name}</a>\n"
-" % endif\n"
-" </p>\n"
-"\n"
-" <br/>\n"
-" <p>If you have any question, do not hesitate to contact us.</p>\n"
-" <p>Thank you!</p>\n"
-" <br/>\n"
-" <br/>\n"
-" <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
-"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
-"background-repeat: repeat no-repeat;\">\n"
-" <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
-"#FFF;\">\n"
-" <strong style=\"text-"
-"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
-" </div>\n"
-" <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
-"16px; background-color: #F2F2F2;\">\n"
-" <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
-" % if object.company_id.street:\n"
-" ${object.company_id.street}<br/>\n"
-" % endif\n"
-" % if object.company_id.street2:\n"
-" ${object.company_id.street2}<br/>\n"
-" % endif\n"
-" % if object.company_id.city or object.company_id.zip:\n"
-" ${object.company_id.zip} ${object.company_id.city}<br/>\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 ''}<br/>\n"
-" % endif\n"
-" </span>\n"
-" % if object.company_id.phone:\n"
-" <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
-"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
-"0px; padding-left: 0px; \">\n"
-" Phone:&nbsp; ${object.company_id.phone}\n"
-" </div>\n"
-" % endif\n"
-" % if object.company_id.website:\n"
-" <div>\n"
-" Web :&nbsp;<a "
-"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
-" </div>\n"
-" %endif\n"
-" <p></p>\n"
-" </div>\n"
-"</div>\n"
-" "
-msgstr ""
-
-#. module: purchase
#: model:ir.actions.act_window,name:purchase.action_purchase_order_by_user_all
msgid "Total Orders by User per month"
msgstr "按用户每月的订单总金额"
@@ -2146,21 +2127,19 @@ msgid "Based on incoming shipments"
msgstr "基于收货量"
#. module: purchase
+#: code:addons/purchase/purchase.py:1018
+#, python-format
+msgid "No default supplier defined for this product"
+msgstr ""
+
+#. module: purchase
#: view:purchase.report:0
#: field:purchase.report,warehouse_id:0
msgid "Warehouse"
msgstr "仓库"
#. module: purchase
-#: help:purchase.order,partner_ref:0
-msgid ""
-"Reference of the sale order or quotation sent by your supplier. It's mainly "
-"used to do the matching when you receive the products as this reference is "
-"usually written on the delivery order sent by your supplier."
-msgstr "销售单或者供应商发送的报价单的参考编号。主要 用于根据这个参考号(通常写在供应商送来的发运单上面) 查找对应的产品。"
-
-#. module: purchase
-#: code:addons/purchase/purchase.py:991
+#: code:addons/purchase/purchase.py:960
#, python-format
msgid ""
"The selected supplier has a minimal quantity set to %s %s, you should not "
@@ -2242,9 +2221,9 @@ msgstr ""
" "
#. module: purchase
-#: view:product.product:0
-msgid "When you sell this service to a customer,"
-msgstr "当你卖 服务给客户时"
+#: field:purchase.order,message_summary:0
+msgid "Summary"
+msgstr "摘要"
#. module: purchase
#: model:ir.actions.act_window,name:purchase.purchase_pricelist_version_action
@@ -2253,6 +2232,11 @@ msgid "Pricelist Versions"
msgstr "价格表版本"
#. module: purchase
+#: field:purchase.order,payment_term_id:0
+msgid "Payment Term"
+msgstr ""
+
+#. module: purchase
#: view:purchase.order:0
msgid "Purchase orders which are in draft state"
msgstr "出于草稿状态的采购单"
@@ -2814,6 +2798,9 @@ msgstr "订单"
#~ "and control the supplier invoices."
#~ msgstr "使用这菜单按单号,供应商,产品等搜索您的采购订单,您可以跟踪接收的产品和控制供应商的发票。"
+#~ msgid "Select an Open Sale Order"
+#~ msgstr "选择待处理的销售订单"
+
#~ msgid ""
#~ "Put an address if you want to deliver directly from the supplier to the "
#~ "customer.In this case, it will remove the warehouse link and set the "
@@ -2916,6 +2903,11 @@ msgstr "订单"
#~ "“已完成”状态当采购订单完成自动设置\n"
#~ "“已取消”状态当用户取消采购订单时自动设置"
+#~ msgid ""
+#~ "A Pick list generates an invoice. Depending on the Invoicing control of the "
+#~ "sale order, the invoice is based on delivered or on ordered quantities."
+#~ msgstr "装箱单生成发票,依据销售订单控制生成的发票,发票是基于已收货或已经下单的数量。"
+
#~ msgid "Delivery & Invoicing"
#~ msgstr "收货与开票"
diff --git a/addons/purchase/i18n/zh_TW.po b/addons/purchase/i18n/zh_TW.po
index 056264acaf0..a5c8eb73055 100644
--- a/addons/purchase/i18n/zh_TW.po
+++ b/addons/purchase/i18n/zh_TW.po
@@ -6,15 +6,15 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 5.0.4\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
"PO-Revision-Date: 2009-01-30 13:18+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: 2012-12-04 05:12+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:20+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
#. module: purchase
#: model:res.groups,name:purchase.group_analytic_accounting
@@ -58,11 +58,6 @@ msgid ""
msgstr ""
#. module: purchase
-#: model:ir.actions.server,name:purchase.actions_server_purchase_order_read
-msgid "Purchase: Mark read"
-msgstr ""
-
-#. module: purchase
#: view:purchase.report:0
#: field:purchase.report,day:0
msgid "Day"
@@ -103,16 +98,13 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:973
-#: code:addons/purchase/purchase.py:988
-#: code:addons/purchase/purchase.py:991
-#: code:addons/purchase/wizard/purchase_order_group.py:47
+#: code:addons/purchase/purchase.py:1024
#, python-format
-msgid "Warning!"
+msgid "Configuration Error!"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:573
+#: code:addons/purchase/purchase.py:587
#, python-format
msgid "You must first cancel all receptions related to this purchase order."
msgstr ""
@@ -129,9 +121,9 @@ msgid "Purchase-Standard Price"
msgstr ""
#. module: purchase
-#: report:purchase.order:0
-#: field:purchase.report,validator:0
-msgid "Validated By"
+#: code:addons/purchase/purchase.py:1011
+#, python-format
+msgid "No supplier defined for this product !"
msgstr ""
#. module: purchase
@@ -155,12 +147,6 @@ msgid "Average Price"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:830
-#, python-format
-msgid "Invoice <b>paid</b>."
-msgstr ""
-
-#. module: purchase
#: view:purchase.order:0
msgid "Purchase order which are in the exception state"
msgstr ""
@@ -230,7 +216,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:255
+#: code:addons/purchase/purchase.py:260
#, python-format
msgid "In order to delete a purchase order, you must cancel it first."
msgstr ""
@@ -256,29 +242,12 @@ msgid "Total Untaxed amount"
msgstr ""
#. module: purchase
-#: model:ir.ui.menu,name:purchase.menu_purchase_uom_categ_form_action
-msgid "Unit of Measure Categories"
-msgstr ""
-
-#. module: purchase
#: view:purchase.report:0
#: field:purchase.report,category_id:0
msgid "Category"
msgstr ""
#. module: purchase
-#: view:purchase.order:0
-msgid "Quotation "
-msgstr ""
-
-#. module: purchase
-#: code:addons/purchase/purchase.py:810
-#, python-format
-msgid ""
-"Quotation for <em>%s</em> <b>converted</b> to a Purchase Order of %s %s."
-msgstr ""
-
-#. module: purchase
#: model:process.transition,note:purchase.process_transition_purchaseinvoice0
msgid ""
"A purchase order generates a supplier invoice, as soon as it is confirmed by "
@@ -343,14 +312,16 @@ msgid "October"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:837
+#: code:addons/purchase/purchase.py:1024
#, python-format
-msgid "Purchase Order for <em>%s</em> <b>cancelled</b>."
+msgid ""
+"The product \"%s\" has been defined with your company as reseller which "
+"seems to be a configuration error!"
msgstr ""
#. module: purchase
-#: field:purchase.order,message_summary:0
-msgid "Summary"
+#: view:product.product:0
+msgid "When you sell this service to a customer,"
msgstr ""
#. module: purchase
@@ -379,12 +350,6 @@ msgid "Quantity"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:819
-#, python-format
-msgid "Shipment <em>%s</em> <b>scheduled</b> for %s."
-msgstr ""
-
-#. module: purchase
#: field:purchase.order,fiscal_position:0
msgid "Fiscal Position"
msgstr ""
@@ -442,12 +407,6 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:824
-#, python-format
-msgid "Draft Invoice of %s %s is <b>waiting for validation</b>."
-msgstr ""
-
-#. module: purchase
#: model:ir.actions.act_window,help:purchase.purchase_line_form_action2
msgid ""
"<p>\n"
@@ -468,6 +427,11 @@ msgid "Scheduled Date"
msgstr ""
#. module: purchase
+#: field:purchase.order,currency_id:0
+msgid "Currency"
+msgstr ""
+
+#. module: purchase
#: field:purchase.order,journal_id:0
msgid "Journal"
msgstr ""
@@ -500,6 +464,19 @@ msgid "Incoming Products"
msgstr ""
#. module: purchase
+#: view:purchase.order:0
+msgid "Request for Quotation "
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,partner_ref:0
+msgid ""
+"Reference of the sales order or quotation sent by your supplier. It's mainly "
+"used to do the matching when you receive the products as this reference is "
+"usually written on the delivery order sent by your supplier."
+msgstr ""
+
+#. module: purchase
#: view:purchase.config.settings:0
#: view:purchase.order.group:0
#: view:purchase.order.line_invoice:0
@@ -520,6 +497,11 @@ msgid ""
msgstr ""
#. module: purchase
+#: model:mail.message.subtype,name:purchase.mt_rfq_approved
+msgid "RFQ Approved"
+msgstr ""
+
+#. module: purchase
#: view:purchase.config.settings:0
msgid "Apply"
msgstr ""
@@ -537,6 +519,11 @@ msgid ""
msgstr ""
#. module: purchase
+#: model:mail.message.subtype,name:purchase.mt_rfq_confirmed
+msgid "RFQ Confirmed"
+msgstr ""
+
+#. module: purchase
#: view:purchase.order:0
msgid "Customer Address"
msgstr ""
@@ -561,7 +548,7 @@ msgid "Supplier"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:508
+#: code:addons/purchase/purchase.py:525
#, python-format
msgid "Define expense account for this company: \"%s\" (id:%d)."
msgstr ""
@@ -585,7 +572,6 @@ msgstr ""
#. module: purchase
#: field:purchase.order,shipped:0
-#: field:purchase.order,shipped_rate:0
msgid "Received"
msgstr "已发运"
@@ -627,13 +613,20 @@ msgid "Invoices and Receptions"
msgstr ""
#. module: purchase
+#: model:process.transition,note:purchase.process_transition_packinginvoice0
+msgid ""
+"A Pick list generates an invoice. Depending on the Invoicing control of the "
+"sales order, the invoice is based on delivered or on ordered quantities."
+msgstr ""
+
+#. module: purchase
#: view:purchase.report:0
#: field:purchase.report,nbr:0
msgid "# of Lines"
msgstr ""
#. module: purchase
-#: code:addons/purchase/wizard/purchase_line_invoice.py:110
+#: code:addons/purchase/wizard/purchase_line_invoice.py:106
#, python-format
msgid "Define expense account for this product: \"%s\" (id:%d)."
msgstr ""
@@ -654,8 +647,8 @@ msgid "It indicates that a picking has been done"
msgstr "代表已完成提貨"
#. module: purchase
-#: code:addons/purchase/purchase.py:565
-#: code:addons/purchase/purchase.py:572
+#: code:addons/purchase/purchase.py:579
+#: code:addons/purchase/purchase.py:586
#, python-format
msgid "Unable to cancel this purchase order."
msgstr ""
@@ -718,6 +711,15 @@ msgid "Draft PO"
msgstr ""
#. module: purchase
+#: code:addons/purchase/purchase.py:941
+#: code:addons/purchase/purchase.py:956
+#: code:addons/purchase/purchase.py:960
+#: code:addons/purchase/wizard/purchase_order_group.py:47
+#, python-format
+msgid "Warning!"
+msgstr ""
+
+#. module: purchase
#: model:process.node,name:purchase.process_node_draftpurchaseorder0
#: model:process.node,name:purchase.process_node_draftpurchaseorder1
msgid "RFQ"
@@ -749,6 +751,11 @@ msgid "The tax amount"
msgstr ""
#. module: purchase
+#: field:purchase.order,shipped_rate:0
+msgid "Received Ratio"
+msgstr ""
+
+#. module: purchase
#: selection:purchase.report,month:0
msgid "September"
msgstr ""
@@ -780,7 +787,7 @@ msgid "Stock Moves"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1158
+#: code:addons/purchase/purchase.py:1156
#, python-format
msgid "Draft Purchase Order created"
msgstr ""
@@ -801,11 +808,6 @@ msgid "Terms and Conditions"
msgstr ""
#. module: purchase
-#: field:purchase.order,currency_id:0
-msgid "unknown"
-msgstr ""
-
-#. module: purchase
#: help:purchase.order,date_order:0
msgid "Date on which this document has been created."
msgstr ""
@@ -899,12 +901,6 @@ msgid "Cancel"
msgstr "取消"
#. module: purchase
-#: field:purchase.order,message_comment_ids:0
-#: help:purchase.order,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
-#. module: purchase
#: sql_constraint:purchase.order:0
msgid "Order Reference must be unique per Company!"
msgstr ""
@@ -938,14 +934,89 @@ msgid "Date Approved"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:806
-#, python-format
-msgid "Request for quotation <b>created</b>."
+#: view:product.product:0
+msgid "a draft purchase order"
msgstr ""
#. module: purchase
-#: view:product.product:0
-msgid "a draft purchase order"
+#: model:email.template,body_html:purchase.email_template_edi_purchase
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: #FFF; \">\n"
+"\n"
+" <p>Hello$ ${object.partner_id.name},</p>\n"
+" \n"
+" <p>Here is a ${object.state in ('draft', 'sent') and 'request for "
+"quotation' or 'purchase order confirmation'} from ${object.company_id.name}: "
+"</p>\n"
+" \n"
+" <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
+" &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
+" &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
+" &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
+"${object.pricelist_id.currency_id.name}</strong><br />\n"
+" &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
+" % if object.origin:\n"
+" &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
+" % endif\n"
+" % if object.partner_ref:\n"
+" &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
+" % endif\n"
+" % if object.validator:\n"
+" &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.validator.email "
+"or ''}?subject=Order%20${object.name}\">${object.validator.name}</a>\n"
+" % endif\n"
+" </p>\n"
+"\n"
+" <br/>\n"
+" <p>If you have any question, do not hesitate to contact us.</p>\n"
+" <p>Thank you!</p>\n"
+" <br/>\n"
+" <br/>\n"
+" <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
+"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
+"background-repeat: repeat no-repeat;\">\n"
+" <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
+"#DDD;\">\n"
+" <strong style=\"text-"
+"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
+" </div>\n"
+" <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
+"16px; background-color: #F2F2F2;\">\n"
+" <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
+" % if object.company_id.street:\n"
+" ${object.company_id.street}<br/>\n"
+" % endif\n"
+" % if object.company_id.street2:\n"
+" ${object.company_id.street2}<br/>\n"
+" % endif\n"
+" % if object.company_id.city or object.company_id.zip:\n"
+" ${object.company_id.zip} ${object.company_id.city}<br/>\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 ''}<br/>\n"
+" % endif\n"
+" </span>\n"
+" % if object.company_id.phone:\n"
+" <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
+"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
+"0px; padding-left: 0px; \">\n"
+" Phone:&nbsp; ${object.company_id.phone}\n"
+" </div>\n"
+" % endif\n"
+" % if object.company_id.website:\n"
+" <div>\n"
+" Web :&nbsp;<a "
+"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
+" </div>\n"
+" %endif\n"
+" <p></p>\n"
+" </div>\n"
+"</div>\n"
+" "
msgstr ""
#. module: purchase
@@ -985,17 +1056,12 @@ msgid "Outgoing Mails"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:437
+#: code:addons/purchase/purchase.py:456
#, python-format
msgid "You cannot confirm a purchase order without any purchase order line."
msgstr ""
#. module: purchase
-#: model:ir.actions.server,name:purchase.actions_server_purchase_order_unread
-msgid "Purchase: Mark unread"
-msgstr ""
-
-#. module: purchase
#: help:purchase.order,message_ids:0
msgid "Messages and communication history"
msgstr ""
@@ -1007,7 +1073,7 @@ msgid "Destination Warehouse"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:973
+#: code:addons/purchase/purchase.py:941
#, python-format
msgid ""
"Selected Unit of Measure does not belong to the same category as the product "
@@ -1015,6 +1081,11 @@ msgid ""
msgstr ""
#. module: purchase
+#: view:purchase.order.line_invoice:0
+msgid "Select an Open Sales Order"
+msgstr ""
+
+#. module: purchase
#: model:ir.ui.menu,name:purchase.menu_purchase_unit_measure_purchase
#: model:ir.ui.menu,name:purchase.menu_purchase_uom_form_action
msgid "Units of Measure"
@@ -1026,18 +1097,12 @@ msgid "Manage pricelist per supplier"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:833
-#, python-format
-msgid "Purchase Order has been set to <b>draft</b>."
-msgstr ""
-
-#. module: purchase
#: view:board.board:0
msgid "Purchase Dashboard"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:566
+#: code:addons/purchase/purchase.py:580
#, python-format
msgid "First cancel all receptions related to this purchase order."
msgstr ""
@@ -1076,8 +1141,8 @@ msgid "Unread Messages"
msgstr ""
#. module: purchase
-#: view:purchase.order.line_invoice:0
-msgid "Select an Open Sale Order"
+#: model:ir.ui.menu,name:purchase.menu_purchase_uom_categ_form_action
+msgid "Unit of Measure Categories"
msgstr ""
#. module: purchase
@@ -1086,6 +1151,13 @@ msgid "Set to Draft"
msgstr ""
#. module: purchase
+#: help:purchase.order,origin:0
+msgid ""
+"Reference of the document that generated this purchase order request; a "
+"sales order or an internal procurement request."
+msgstr ""
+
+#. module: purchase
#: view:purchase.order.line:0
msgid "Notes"
msgstr "注解"
@@ -1115,7 +1187,7 @@ msgid "Stock Move"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:255
+#: code:addons/purchase/purchase.py:260
#, python-format
msgid "Invalid Action!"
msgstr ""
@@ -1214,7 +1286,7 @@ msgid ""
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:310
+#: code:addons/purchase/purchase.py:320
#, python-format
msgid "Please create Invoices."
msgstr ""
@@ -1304,7 +1376,7 @@ msgid "Purchase Order Line Make Invoice"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1133
+#: code:addons/purchase/purchase.py:1141
#, python-format
msgid "PO: %s"
msgstr ""
@@ -1315,7 +1387,7 @@ msgid "Send by EMail"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:498
+#: code:addons/purchase/purchase.py:515
#, python-format
msgid "Define purchase journal for this company: \"%s\" (id:%d)."
msgstr ""
@@ -1326,8 +1398,8 @@ msgid "Purchase Order "
msgstr ""
#. module: purchase
-#: view:purchase.order.line:0
-msgid "Manual Invoices"
+#: help:purchase.config.settings,group_costing_method:0
+msgid "Allows you to compute product cost price based on average cost."
msgstr ""
#. module: purchase
@@ -1482,8 +1554,8 @@ msgid "Compute product cost price based on average cost"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:340
-#: code:addons/purchase/wizard/purchase_line_invoice.py:141
+#: code:addons/purchase/purchase.py:350
+#: code:addons/purchase/wizard/purchase_line_invoice.py:137
#: model:ir.actions.act_window,name:purchase.act_res_partner_2_supplier_invoices
#: view:res.partner:0
#, python-format
@@ -1595,8 +1667,9 @@ msgid "Open Purchase Menu"
msgstr ""
#. module: purchase
-#: model:ir.model,name:purchase.model_mail_compose_message
-msgid "Email composition wizard"
+#: code:addons/purchase/purchase.py:1028
+#, python-format
+msgid "No address defined for the supplier"
msgstr ""
#. module: purchase
@@ -1667,11 +1740,11 @@ msgid "Purchase Order"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:310
-#: code:addons/purchase/purchase.py:437
-#: code:addons/purchase/purchase.py:497
-#: code:addons/purchase/purchase.py:508
-#: code:addons/purchase/wizard/purchase_line_invoice.py:109
+#: code:addons/purchase/purchase.py:320
+#: code:addons/purchase/purchase.py:456
+#: code:addons/purchase/purchase.py:514
+#: code:addons/purchase/purchase.py:525
+#: code:addons/purchase/wizard/purchase_line_invoice.py:105
#, python-format
msgid "Error!"
msgstr ""
@@ -1693,13 +1766,6 @@ msgid ""
msgstr ""
#. module: purchase
-#: model:process.transition,note:purchase.process_transition_packinginvoice0
-msgid ""
-"A Pick list generates an invoice. Depending on the Invoicing control of the "
-"sale order, the invoice is based on delivered or on ordered quantities."
-msgstr ""
-
-#. module: purchase
#: selection:purchase.order,state:0
#: selection:purchase.order.line,state:0
#: selection:purchase.report,state:0
@@ -1712,9 +1778,8 @@ msgid "# of Purchase Order"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:827
-#, python-format
-msgid "Shipment <b>received</b>."
+#: model:ir.model,name:purchase.model_mail_compose_message
+msgid "Email composition wizard"
msgstr ""
#. module: purchase
@@ -1798,7 +1863,7 @@ msgid "RFQ_${(object.name or '').replace('/','_')}"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:988
+#: code:addons/purchase/purchase.py:956
#, python-format
msgid "The selected supplier only sells this product by %s"
msgstr ""
@@ -1844,6 +1909,12 @@ msgid "Outgoing products to invoice"
msgstr ""
#. module: purchase
+#: report:purchase.order:0
+#: field:purchase.report,validator:0
+msgid "Validated By"
+msgstr ""
+
+#. module: purchase
#: view:purchase.report:0
#: field:purchase.report,delay_pass:0
msgid "Days to Deliver"
@@ -1933,8 +2004,8 @@ msgid "November"
msgstr ""
#. module: purchase
-#: help:purchase.config.settings,group_costing_method:0
-msgid "Allows you to compute product cost price based on average cost."
+#: view:purchase.order.line:0
+msgid "Manual Invoices"
msgstr ""
#. module: purchase
@@ -1958,13 +2029,6 @@ msgid ""
msgstr ""
#. module: purchase
-#: help:purchase.order,origin:0
-msgid ""
-"Reference of the document that generated this purchase order request; a sale "
-"order or an internal procurement request."
-msgstr ""
-
-#. module: purchase
#: model:ir.ui.menu,name:purchase.menu_partner_categories_in_form
msgid "Partner Categories"
msgstr ""
@@ -1985,89 +2049,6 @@ msgid "Invoicing Settings"
msgstr ""
#. module: purchase
-#: model:email.template,body_html:purchase.email_template_edi_purchase
-msgid ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"\n"
-" <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
-"or ''},</p>\n"
-" \n"
-" <p>Here is a ${object.state in ('draft', 'sent') and 'request for "
-"quotation' or 'purchase order confirmation'} from ${object.company_id.name}: "
-"</p>\n"
-" \n"
-" <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
-" &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
-" &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
-" &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
-"${object.pricelist_id.currency_id.name}</strong><br />\n"
-" &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
-" % if object.origin:\n"
-" &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
-" % endif\n"
-" % if object.partner_ref:\n"
-" &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
-" % endif\n"
-" % if object.validator:\n"
-" &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.validator.email "
-"or ''}?subject=Order%20${object.name}\">${object.validator.name}</a>\n"
-" % endif\n"
-" </p>\n"
-"\n"
-" <br/>\n"
-" <p>If you have any question, do not hesitate to contact us.</p>\n"
-" <p>Thank you!</p>\n"
-" <br/>\n"
-" <br/>\n"
-" <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
-"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
-"background-repeat: repeat no-repeat;\">\n"
-" <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
-"#FFF;\">\n"
-" <strong style=\"text-"
-"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
-" </div>\n"
-" <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
-"16px; background-color: #F2F2F2;\">\n"
-" <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
-" % if object.company_id.street:\n"
-" ${object.company_id.street}<br/>\n"
-" % endif\n"
-" % if object.company_id.street2:\n"
-" ${object.company_id.street2}<br/>\n"
-" % endif\n"
-" % if object.company_id.city or object.company_id.zip:\n"
-" ${object.company_id.zip} ${object.company_id.city}<br/>\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 ''}<br/>\n"
-" % endif\n"
-" </span>\n"
-" % if object.company_id.phone:\n"
-" <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
-"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
-"0px; padding-left: 0px; \">\n"
-" Phone:&nbsp; ${object.company_id.phone}\n"
-" </div>\n"
-" % endif\n"
-" % if object.company_id.website:\n"
-" <div>\n"
-" Web :&nbsp;<a "
-"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
-" </div>\n"
-" %endif\n"
-" <p></p>\n"
-" </div>\n"
-"</div>\n"
-" "
-msgstr ""
-
-#. module: purchase
#: model:ir.actions.act_window,name:purchase.action_purchase_order_by_user_all
msgid "Total Orders by User per month"
msgstr ""
@@ -2078,21 +2059,19 @@ msgid "Based on incoming shipments"
msgstr ""
#. module: purchase
+#: code:addons/purchase/purchase.py:1018
+#, python-format
+msgid "No default supplier defined for this product"
+msgstr ""
+
+#. module: purchase
#: view:purchase.report:0
#: field:purchase.report,warehouse_id:0
msgid "Warehouse"
msgstr "倉庫"
#. module: purchase
-#: help:purchase.order,partner_ref:0
-msgid ""
-"Reference of the sale order or quotation sent by your supplier. It's mainly "
-"used to do the matching when you receive the products as this reference is "
-"usually written on the delivery order sent by your supplier."
-msgstr ""
-
-#. module: purchase
-#: code:addons/purchase/purchase.py:991
+#: code:addons/purchase/purchase.py:960
#, python-format
msgid ""
"The selected supplier has a minimal quantity set to %s %s, you should not "
@@ -2165,8 +2144,8 @@ msgid ""
msgstr ""
#. module: purchase
-#: view:product.product:0
-msgid "When you sell this service to a customer,"
+#: field:purchase.order,message_summary:0
+msgid "Summary"
msgstr ""
#. module: purchase
@@ -2176,6 +2155,11 @@ msgid "Pricelist Versions"
msgstr ""
#. module: purchase
+#: field:purchase.order,payment_term_id:0
+msgid "Payment Term"
+msgstr ""
+
+#. module: purchase
#: view:purchase.order:0
msgid "Purchase orders which are in draft state"
msgstr ""